From 2c1062e4433dcadd5ad90a7a757235b182cab128 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 3 Mar 2010 21:12:20 +0000
Subject: [PATCH 0001/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * a first draft implementation

---
 .../org.eclipse.e4.tools.emf.ui/.classpath    |    7 +
 bundles/org.eclipse.e4.tools.emf.ui/.project  |   28 +
 .../.settings/org.eclipse.jdt.core.prefs      |    8 +
 .../.settings/org.eclipse.pde.core.prefs      |    4 +
 .../META-INF/MANIFEST.MF                      |   25 +
 .../org.eclipse.e4.tools.emf.ui/about.html    |   45 +
 .../build.properties                          |   12 +
 .../icons/application.png                     |  Bin 0 -> 464 bytes
 .../icons/application_double.png              |  Bin 0 -> 533 bytes
 .../icons/application_form.png                |  Bin 0 -> 467 bytes
 .../icons/application_form_edit.png           |  Bin 0 -> 714 bytes
 .../icons/application_view_icons.png          |  Bin 0 -> 476 bytes
 .../org.eclipse.e4.tools.emf.ui/icons/cog.png |  Bin 0 -> 512 bytes
 .../icons/package_go.png                      |  Bin 0 -> 898 bytes
 .../plugin.properties                         |    8 +
 .../tools/emf/ui/common/IModelResource.java   |   22 +
 .../tools/emf/ui/common/XMIModelResource.java |   72 ++
 .../component/AbstractComponentEditor.java    |   23 +
 .../emf/ui/internal/ShadowComposite.java      | 1094 +++++++++++++++++
 .../common/ComponentLabelProvider.java        |  141 +++
 .../emf/ui/internal/common/ModelEditor.java   |  233 ++++
 .../emf/ui/internal/common/VirtualEntry.java  |   78 ++
 .../common/component/ApplicationEditor.java   |   53 +
 .../component/ModelComponentEditor.java       |  151 +++
 .../component/ModelComponentsEditor.java      |   51 +
 .../component/PartDescriptorEditor.java       |   37 +
 .../internal/common/component/PartEditor.java |  206 ++++
 .../ui/internal/wbe/ExtensionModelEditor.java |    5 +
 .../internal/wbm/ApplicationModelEditor.java  |   16 +
 29 files changed, 2319 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/.classpath
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/.project
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.core.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/about.html
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/build.properties
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/application.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/application_double.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/application_form.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/application_form_edit.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/application_view_icons.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/cog.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/package_go.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/plugin.properties
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbe/ExtensionModelEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.classpath b/bundles/org.eclipse.e4.tools.emf.ui/.classpath
new file mode 100644
index 0000000000..304e86186a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<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.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.project b/bundles/org.eclipse.e4.tools.emf.ui/.project
new file mode 100644
index 0000000000..3848d4ae08
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.emf.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..04d8a38777
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Tue Mar 02 18:39:11 CET 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.core.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..81bd2f274f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Tue Mar 02 18:39:11 CET 2010
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..39de767f68
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
+ org.eclipse.core.databinding.property;bundle-version="1.2.100",
+ org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
+ org.eclipse.emf.databinding;bundle-version="1.2.0",
+ org.eclipse.jface.databinding;bundle-version="1.4.0",
+ org.eclipse.jface;bundle-version="3.6.0",
+ org.eclipse.emf.edit;bundle-version="2.6.0",
+ org.eclipse.equinox.common;bundle-version="3.6.0"
+Bundle-ActivationPolicy: lazy
+Import-Package: javax.inject;version="1.0.0"
+Export-Package: org.eclipse.e4.tools.emf.ui.common,
+ org.eclipse.e4.tools.emf.ui.common.component,
+ org.eclipse.e4.tools.emf.ui.internal.common;x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.component;x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.wbe;x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.wbm;x-internal:=true
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/about.html b/bundles/org.eclipse.e4.tools.emf.ui/about.html
new file mode 100644
index 0000000000..c1343aa318
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/about.html
@@ -0,0 +1,45 @@
+<!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>December 3, 2009</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  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>Silk icon set Version 1.3</h4>
+<p>
+This plugin contains icons from the Silk icon set created by Mark James. The original files can
+be found at:
+<ul>
+<a href="http://www.famfamfam.com/lab/icons/silk/">http://www.famfamfam.com/lab/icons/silk/</a></ul>
+<p>The license can be found at:</p>
+<ul>
+ <li><a href="http://creativecommons.org/licenses/by/2.5/">http://creativecommons.org/licenses/by/2.5/</a></li>
+</ul>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/build.properties b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
new file mode 100644
index 0000000000..6cf6ee0dc7
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
@@ -0,0 +1,12 @@
+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+bin.includes = .,\
+               META-INF/,\
+               plugin.properties
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/application.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/application.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dee9e366094e87db68c606d0522d72d4b939818
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzVo5|nR2Uhh
z!69yxQ5c2c_uP9SO&YLZNmxQ12)2N!!D0vs#R^Ek(4<KhK?U2XBo(z)bV&OD-#N^k
zFa|g2^C$@qp|_uYe0=@p<lF5g#|dB)n{p8c$D|4;q>8e6`gpm!y1M!N^ZV(=IC*t)
z{^;nqJv-tM$9J1L2QJ2DN!#51=1_l@G`2=6e0lehL%sic%`_4--LFM}IF!KzJCseW
zq1I3__Z40|e?qyK1__gzP(qrBf-G7SQbQ`#Lw94WVe(o`qg+f4hy;Qju)q#I(9{`%
zQmAGomzhQ!b|gq>KqL@IkO~$=Koi}a$u6d07kiS}NoYVMJjAeZpaB*;wwcDdEbK@K
zNP;B7RzhQ|H9AlUO<`J>m1(5R)Pb-iLBb@7Jp)}LHdAb-VVgYxVoTzGoqu{~a>6uj
zeqCRFI9pC#h09bGwy9;oHcp6(RB%jeY^F=Ll!S+9JkVe4nDG7tJMQiP0000<MNUMn
GLSTZz`@eVq

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/application_double.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/application_double.png
new file mode 100644
index 0000000000000000000000000000000000000000..647592f2e9265be48fdb0d1ea42363c354588c57
GIT binary patch
literal 533
zcmV+w0_y#VP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzr%6OXR5;6>
zld+0ZK^TR<nR|B$n;1b0V<n1@kWLHn4YXJUTbmVx6$`;$uyR4r$`^2p)dvtCz|JaV
zNReU%ZQPqp?#%xmi<|7;6hhnsKf}P8!{Otf@ZkBUhj;G{pZ==U!5z7ibH?S!4404@
z=1zY*%}1l@hoiT<M=Vti?+o|1I^8(vu!%a=%=UrvfLT(U{XSt+ohHThy_AX9k8f`r
z@Z`;e^#C~li)?)UI=X(GyElIR@#0@RdYAh=d;eYi?Np6M)0ZU@05QOLwsWi3+hK5Z
zqcYuUX75UK10aMzRg3CBd6bs(S-?ejlsTpIfEEwAFo*1pxno()$f-@-99+WOC@nP&
zBGBfc7*G%;kq{yw7@-h_N6OszJR9Y7Jo&bFknZO?ab<ArtPKGQfg}n+3<YHX3&LX4
z)Xf{iYF>Q&AxX;a%I->Ls?9Vv(;_9E)=9HE>13WHNsnHAS>LKQkM<dX5F<qq2{90h
zl|NIq1J-yf9~aAWrLDH#Y&~E)o*eESq}^O6%nWxYEf&p>bVH_QE8X!1!(q^p{6+N_
X4^=JUQP|Z100000NkvXXu0mjfgEH)N

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/application_form.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/application_form.png
new file mode 100644
index 0000000000000000000000000000000000000000..807b862cfc087b70dcdd971af3ac92688484e998
GIT binary patch
literal 467
zcmV;^0WAKBP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzWl2OqR2Uhh
z!Ld%0VHk$t`)xiANfSmH95k><I$^r`51xV!9D!jmggCjdIk`wm!k``j3?2%ObyEhK
zC<!u@I{bZ~hkhX>4nWfMy23V#h*$3p-!?D%AI~T5+JJ;5Qi)|`;Y?)XOj2U`VS70o
zp1%L~Y4f1;U-b7MEOk38OU$EtImvzCpiEkKCg)@3^{;h@nc_6NuOBn7?ZF9Ev4w3+
zWiSxI_v2&k@_b{1R8kdeGLx;rFK&F@c}mqZ4YwJO$7q^VC6&nL^Y#-6g9F*zM-oa=
z70W0^1X#=%!t{DQE-wCJ^Pd1r08&yFDUlL$EtoM3e+;?Hv-Nc(QI%=il9}v$`OS^N
z)(TbAG~DLw><`m+N>!Xf5_@kR0j83~eKLh5sv-%=fC#``TU}jaG#UW`VS>Ph2!jLJ
zROR&N$<c?yc2k)sMP?$2Y+EED8!K@dSy)1%I$|blvxp80x&qw|@H*2>x3B;J002ov
JPDHLkV1im=zq<ec

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/application_form_edit.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/application_form_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..af486c940c60b746d56e757686d51801bf18ae72
GIT binary patch
literal 714
zcmV;*0yX`KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!TuDShR5;6}
zlkZDYQ5eVXztG$0RWBlt>MscT0g(~ZNI{bH#Y_Utm11j?0+FF&hK-qRX-TePYY3~f
zgtoM;)~2M+AJew!(sr+7^KN&$cgxoJcJAGZGzzQ(AD(j#=leYm&p8hTfchUO*=18r
zr!~koJq|$qh+zB()q@3G>7PU6y;(H$c~Nhe#3lU)C~l9VR_BJ=;N(S}WT3GGbJ~$L
zY!^k>SWYq!Z~hmmJ4PWHsEvN4)9Gy^Z?)wOR0E3;1OdDR51!|xxx?Z3jR~6$3lGcS
zw`wrecMQ|rMHQ4-uw*icvKH@8Qe-U(ejNgB1!Gqt;e8II!iak<aNRh*Mv2u<a2&V<
zflCx3x5+@DhrrG^V`KFxn9&ZTX9n>t<iyPV>I@}570bpEkH@7b5obwc$sUX75)sc{
zLoV$^I#`Q!&qeqK<Z$cd@MvXwsD|EY#9}c-3yAYrG$v)>v2}x;Q6ZOcK?qbLvr>-a
zyc(hY)2O@Nn=hiGX9AH(WK#{q_3OcQFyqRCxB{6^XTi-jVaae3jL(UZMoZqHPUiu`
zFod;2WZ-*e#Qe)flJ*;9mgV@eat;ZSNkD%BUpZPjbEd(ZH>lOVM>tFq!k`K6p&rZ)
zt1<ne3!mMk5SGiaK6MrTyQi?aI0>2-&(V<8oA9F-Oc!oCq@PvQW{0``D3A<c!B7Ib
zdMDoADaLT~A=Ie!B<&~UW)p};#3UJP?XH&dMcECP4jb-UaBB|3T(v7TqS}ApkKMR+
wqx9g8Ol#%dtgWp$`>ONE*fZt6-G6K6?>+q?gw;DtTL1t607*qoM6N<$g3ymi=>Px#

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/application_view_icons.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/application_view_icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a93cdaa78cc42caed19920ae622af7e35f6067a
GIT binary patch
literal 476
zcmV<20VDp2P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzZb?KzR5;6}
zlif?gU=)Y_7o{kP=!2pHrIkZrGlB>yh(bgPr6Nj-nT19X7DZ8zeUKOl_Tl|>1YLMH
z=jlD?b+Sb_xgR_*#(SP~INR$20GAV7?rFuloUPPDd!HchGLr8gZI>aqRf53gD~KB}
z;7=4_D*g<@>Ld7K_aG;3>sUvEaJphdb1M87A#!by06TZW*wPh{Ku&%@CmC6|-~wsq
zjb0RsMFKOF(Fjbu5Fwh)ru|I#tR-Lz>qIaxcgh90?Z1KrCWc|y!1T|aZ~=a*-(Ag4
zSPUtVz{2m+IDzS#IpP9w-9EN;RO;3eG#U+?z$0h4Kv;Wfk8B+i3#{n6-UibhNOQqt
z?12jeFM)^6#o@C#4HjCL*d?a8z!%N)t>y1HEak5ffl*Zzs?{nz*J?G;G`=UdUjg$j
zC=)9;^k<DOUczwr90uoeY|F>AC{HL0z0x7{1P|EQ`>eA9tOij?;P^H=75o6^EkKQu
SuK{QP0000<MNUMnLSTYmlE&o#

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/cog.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/cog.png
new file mode 100644
index 0000000000000000000000000000000000000000..67de2c6ccbeac17742f56cf7391e72b2bf5033ba
GIT binary patch
literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzl1W5CR4C6?
zQB6w%VGv&Y0p9%y{*S$M5weR^mokV7i!Mcpk=YVa(4jh%5k+ND8>CQDsH?WF>AIFt
zQuJ}i;w2$ZUU#3SZ6RY0Gw;kZ&ol1~2ky^QZ(fom$=jN<T*X<otG0ao1Md*)XSSIA
z*x3T8gv)x7DUK|A#S3CA>JZt!z7w_pH~wdQ;R)Gh%BbQFCx+Nm!4SuS-vkr`vhhrX
zM*>w%e+v~?m@q~ImPAgtLkR_3U<2F8LP3W5=LJ*ZN|S5p#sf4YFr$p~Q~Z*0Ngxf2
zjk#J#<7EAlhzlrV53~GF&pIzcCN_lz9@05Ue<MwWI-*!M0jvB0F~pIke2>oUXiK%N
z#x+4o*i_c|6_Uu1+&TIho?3@y4k-#b8Y_o94zW*B3a1ne2-Y5s0uke$$|@=}OP-i=
zNYZQA=>PrZu0MfSL=b8UhD_={W4IY1{b{)U)*gc45xtL%IYLY&hF;d`@GzI&7H&D#
zh;z_BX$#hqh@q?AY3sJTod2%*Yd)_>YM0#q&ixGuh+PQsneK)F0000<MNUMnLSTXw
CAKTXe

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/package_go.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/package_go.png
new file mode 100644
index 0000000000000000000000000000000000000000..aace63ad6f91537268eb6e9bf328743da7c631c6
GIT binary patch
literal 898
zcmV-|1AY97P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#6iGxuR5;6R
zlS^n^bsUAiJDF$dG?^q#(j-kw`kbcKq??Mh=%NOp)TUG+f)YjQ!lK>yqPWur#3F*-
zi1<JR7YZ&!6DWb$Cy7a<AjV9l=}cp1nn~K2dEUAA{(nCgrCn&w`tWVOb1YS5t<3)X
zOgADQsAyD0-ijX^{(Y^U^<O|@_-M0=zM&!~8@C>-H<e}Xrbde@`k5N}c+bFSW=+7{
zNPj?8Us92`qwRg$TH?>*6GJgONgz~1E;+_Oe@~@V<gAK((KC3d@&J$+>F-1Iy-=*@
zV9T!Kgk#%59lVt}Zj7B_)9wTKYBy6YEwPxKqOdeGuEw0%cVhe}Yj*hPSBMNYZ5yz{
z4STT*%d9TVV4NauDND$z(%QKb>=kMr>ckh0lFuesOioc=Nq^^8BQNYYbk1@M%M`O?
zh?6H&UZR}Ol3%#RzJX5(MAktmg_e?7`2>w^4^!6w)4$9==U0)EV$}u1A)*bPRF?jv
zHdar4EJB1b*f+rh!M+8R1<JR_DW<Lv-f|o@Qu3<^2w(*X)NLmaiel#`kz$TO4Or#t
z;8Wh2_<@ybmG`%_Krn>59x8%Qjd0I{0j+|69pUC)f(>!P(OTs8c~;XuVtXzfO>s`m
zrjW9YI38*Yel_NvP&FVfNEx)sn-kxIx;WzEcpe*LJBYXLr(l<Od48O4n;u7v;8&4|
zFAxAC;N1bKg4lTC@KpC8Mg=1VLCLHxu(#s?MW@1%i$i=Q?P0$fxiEj>lS6I0o+c9O
z0L_4N7u$0%Dx~ks;fjYRF0OIOR}1uPI!MtibK=J3pihiBTv)jD>R%(Llj(_XFa#mG
z6Wg=#j7Q7*PFmM*W@B9!ftm;#qU}sCT;|&KtBZ%Fe#3()Pk+9@Sw&8%k=NQD>92qN
zkFT*E2S*%i&!MYvH;;DpF?sU}zb4Mlls)au3~BX$XZr12Z?_sbts>8Fec~0Xl1q`9
zxyH%T#p<5UCqrY2(J4oGEHk9ens2<Ht7p6WRODSmf-3Uii+1u$BQ;GGF@fBWdiQ((
Y0z8$>2BN3dYXATM07*qoM6N<$g3xBAZ~y=R

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties b/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties
new file mode 100644
index 0000000000..14a799fbca
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties
@@ -0,0 +1,8 @@
+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+pluginName = EMFUI Model
+providerName = www.example.org
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
new file mode 100644
index 0000000000..e47b866b8c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.common;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+public interface IModelResource {
+	public IObservableList getRoot();
+	public boolean isSaveable();
+	public IStatus save();
+	public EditingDomain getEditingDomain();
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
new file mode 100644
index 0000000000..7d7510a6d9
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.common;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+
+public class XMIModelResource implements IModelResource {
+	private EditingDomain editingDomain;
+	private Resource resource;
+
+	public XMIModelResource(String uri) {
+		ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
+				ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+		ResourceSet resourceSet = new ResourceSetImpl();
+		BasicCommandStack commandStack = new BasicCommandStack();
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory,
+				commandStack, resourceSet);
+		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
+				.put(Resource.Factory.Registry.DEFAULT_EXTENSION,
+						new XMIResourceFactoryImpl());
+		resource = resourceSet.getResource(URI.createURI(uri), true);
+	}
+
+	public IObservableList getRoot() {
+		WritableList list = new WritableList();
+		list.add(resource.getContents().get(0));
+		return list;
+	}
+
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	public boolean isSaveable() {
+		return true;
+	}
+
+	public IStatus save() {
+		Map<String, String> map = new HashMap<String, String>();
+		try {
+			resource.save(map);
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+
+		return Status.OK_STATUS;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
new file mode 100644
index 0000000000..24ba71f6bd
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.common.component;
+
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public abstract class AbstractComponentEditor {
+//	public abstract boolean canHandle(Object object);
+	public abstract Image getImage(Display display);
+	public abstract String getLabel();
+	public abstract String getDescription();
+	public abstract Composite getEditor(Composite parent, Object object);
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java
new file mode 100644
index 0000000000..ed5f6137eb
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java
@@ -0,0 +1,1094 @@
+package org.eclipse.e4.tools.emf.ui.internal;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.PaletteData;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.graphics.Region;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class ShadowComposite extends Composite {
+	// Constants for circle drawing
+	final static int LEFT_TOP = 0;
+	final static int LEFT_BOTTOM = 1;
+	final static int RIGHT_TOP = 2;
+	final static int RIGHT_BOTTOM = 3;
+
+	// drop shadow constants
+	final static int SIDE_DROP_WIDTH = 3;
+	final static int BOTTOM_DROP_WIDTH = 5;
+
+	// keylines
+	final static int OUTER_KEYLINE = 2;
+	final static int INNER_KEYLINE = 1;
+	final static int TOP_KEYLINE = 2;
+
+	static final int CORNER_SIZE = 24;
+
+	static final String E4_SHADOW_IMAGE = "org.eclipse.e4.renderer.comp_image"; //$NON-NLS-1$
+
+	int marginWidth;
+	int marginHeight;
+
+	static int[] shape;
+
+	static int[] shadow = { 0x02fefefe, 0x03fefefe, 0x05fefefe, 0x06fdfdfd,
+			0x08fdfdfd, 0x0bfcfcfc, 0x0dfcfcfc, 0x10fbfbfb, 0x13fafafa,
+			0x17f9f9f9, 0x1af9f9f9, 0x1df8f8f8, 0x20f7f7f7, 0x23f6f6f6,
+			0x26f6f6f6, 0x28f5f5f5, 0x29f5f5f5, 0x2bf4f4f4, 0x2cf4f4f4,
+			0x2df4f4f4, 0x2df4f4f4, 0x2ef4f4f4, 0x2ef4f4f4, 0x2ef4f4f4,
+			0x2ff4f4f4, 0x2ff3f3f3, 0x2ff3f3f3, 0x2ff3f3f3, 0x2ff3f3f3,
+			0x2ff3f3f3, 0x2ff3f3f3, 0x2ff3f3f3, 0x2ff3f3f3, 0x2ff3f3f3,
+			0x2ff3f3f3, 0x2ff4f4f4, 0x2ef4f4f4, 0x2ef4f4f4, 0x2ef4f4f4,
+			0x2df4f4f4, 0x2df4f4f4, 0x2cf4f4f4, 0x2bf4f4f4, 0x29f5f5f5,
+			0x28f5f5f5, 0x26f6f6f6, 0x23f6f6f6, 0x20f7f7f7, 0x1df8f8f8,
+			0x1af9f9f9, 0x17f9f9f9, 0x13fafafa, 0x10fbfbfb, 0x0dfcfcfc,
+			0x0bfcfcfc, 0x08fdfdfd, 0x06fdfdfd, 0x05fefefe, 0x03fefefe,
+			0x02fefefe, 0x03fefefe, 0x05fefefe, 0x07fdfdfd, 0x09fdfdfd,
+			0x0cfcfcfc, 0x0ffbfbfb, 0x13fafafa, 0x17f9f9f9, 0x1bf8f8f8,
+			0x1ff7f7f7, 0x23f6f6f6, 0x27f5f5f5, 0x2bf4f4f4, 0x2ff3f3f3,
+			0x32f3f3f3, 0x35f2f2f2, 0x37f1f1f1, 0x39f1f1f1, 0x3af1f1f1,
+			0x3bf0f0f0, 0x3cf0f0f0, 0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0,
+			0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0,
+			0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0,
+			0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0,
+			0x3cf0f0f0, 0x3bf0f0f0, 0x3af1f1f1, 0x39f1f1f1, 0x37f1f1f1,
+			0x35f2f2f2, 0x32f3f3f3, 0x2ff3f3f3, 0x2bf4f4f4, 0x27f5f5f5,
+			0x23f6f6f6, 0x1ff7f7f7, 0x1bf8f8f8, 0x17f9f9f9, 0x13fafafa,
+			0x0ffbfbfb, 0x0cfcfcfc, 0x09fdfdfd, 0x07fdfdfd, 0x05fefefe,
+			0x03fefefe, 0x05fefefe, 0x07fdfdfd, 0x09fdfdfd, 0x0dfcfcfc,
+			0x10fbfbfb, 0x15fafafa, 0x19f9f9f9, 0x1ef8f8f8, 0x24f6f6f6,
+			0x29f5f5f5, 0x2ff4f4f4, 0x34f2f2f2, 0x39f1f1f1, 0x3df0f0f0,
+			0x41efefef, 0x44eeeeee, 0x47ededed, 0x49ededed, 0x4bededed,
+			0x4cececec, 0x4dececec, 0x4dececec, 0x4eececec, 0x4eececec,
+			0x4eececec, 0x4eececec, 0x4eececec, 0x4fececec, 0x4fececec,
+			0x4fececec, 0x4fececec, 0x4fececec, 0x4fececec, 0x4eececec,
+			0x4eececec, 0x4eececec, 0x4eececec, 0x4eececec, 0x4dececec,
+			0x4dececec, 0x4cececec, 0x4bededed, 0x49ededed, 0x47ededed,
+			0x44eeeeee, 0x41efefef, 0x3df0f0f0, 0x39f1f1f1, 0x34f2f2f2,
+			0x2ff4f4f4, 0x29f5f5f5, 0x24f6f6f6, 0x1ef8f8f8, 0x19f9f9f9,
+			0x15fafafa, 0x10fbfbfb, 0x0dfcfcfc, 0x09fdfdfd, 0x07fdfdfd,
+			0x05fefefe, 0x07fdfdfd, 0x09fdfdfd, 0x0dfcfcfc, 0x11fbfbfb,
+			0x16fafafa, 0x1bf8f8f8, 0x21f7f7f7, 0x27f5f5f5, 0x2ef4f4f4,
+			0x35f2f2f2, 0x3cf0f0f0, 0x42efefef, 0x48ededed, 0x4dececec,
+			0x51ebebeb, 0x55eaeaea, 0x58e9e9e9, 0x5be9e9e9, 0x5de8e8e8,
+			0x5ee8e8e8, 0x5fe7e7e7, 0x60e7e7e7, 0x61e7e7e7, 0x61e7e7e7,
+			0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7,
+			0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7,
+			0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x60e7e7e7,
+			0x5fe7e7e7, 0x5ee8e8e8, 0x5de8e8e8, 0x5be9e9e9, 0x58e9e9e9,
+			0x55eaeaea, 0x51ebebeb, 0x4dececec, 0x48ededed, 0x42efefef,
+			0x3cf0f0f0, 0x35f2f2f2, 0x2ef4f4f4, 0x27f5f5f5, 0x21f7f7f7,
+			0x1bf8f8f8, 0x16fafafa, 0x11fbfbfb, 0x0dfcfcfc, 0x09fdfdfd,
+			0x07fdfdfd, 0x09fdfdfd, 0x0dfcfcfc, 0x11fbfbfb, 0x16fafafa,
+			0x1cf8f8f8, 0x23f6f6f6, 0x2af5f5f5, 0x32f3f3f3, 0x3af1f1f1,
+			0x42efefef, 0x4aededed, 0x51ebebeb, 0x58e9e9e9, 0x5ee8e8e8,
+			0x64e6e6e6, 0x68e5e5e5, 0x6ce4e4e4, 0x6ee4e4e4, 0x70e3e3e3,
+			0x72e3e3e3, 0x73e3e3e3, 0x74e2e2e2, 0x75e2e2e2, 0x75e2e2e2,
+			0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2,
+			0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2,
+			0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x74e2e2e2,
+			0x73e3e3e3, 0x72e3e3e3, 0x70e3e3e3, 0x6ee4e4e4, 0x6ce4e4e4,
+			0x68e5e5e5, 0x64e6e6e6, 0x5ee8e8e8, 0x58e9e9e9, 0x51ebebeb,
+			0x4aededed, 0x42efefef, 0x3af1f1f1, 0x32f3f3f3, 0x2af5f5f5,
+			0x23f6f6f6, 0x1cf8f8f8, 0x16fafafa, 0x11fbfbfb, 0x0dfcfcfc,
+			0x09fdfdfd, 0x0cfcfcfc, 0x10fbfbfb, 0x16fafafa, 0x1cf8f8f8,
+			0x23f6f6f6, 0x2cf4f4f4, 0x35f2f2f2, 0x3ef0f0f0, 0x48ededed,
+			0x51ebebeb, 0x5ae9e9e9, 0x62e7e7e7, 0x6ae5e5e5, 0x71e3e3e3,
+			0x77e2e2e2, 0x7be1e1e1, 0x7fe0e0e0, 0x82dfdfdf, 0x85dedede,
+			0x86dedede, 0x88dedede, 0x88dddddd, 0x89dddddd, 0x89dddddd,
+			0x89dddddd, 0x8adddddd, 0x8adddddd, 0x8adddddd, 0x8adddddd,
+			0x8adddddd, 0x8adddddd, 0x8adddddd, 0x8adddddd, 0x8adddddd,
+			0x8adddddd, 0x89dddddd, 0x89dddddd, 0x89dddddd, 0x88dddddd,
+			0x88dedede, 0x86dedede, 0x85dedede, 0x82dfdfdf, 0x7fe0e0e0,
+			0x7be1e1e1, 0x77e2e2e2, 0x71e3e3e3, 0x6ae5e5e5, 0x62e7e7e7,
+			0x5ae9e9e9, 0x51ebebeb, 0x48ededed, 0x3ef0f0f0, 0x35f2f2f2,
+			0x2cf4f4f4, 0x23f6f6f6, 0x1cf8f8f8, 0x16fafafa, 0x10fbfbfb,
+			0x0cfcfcfc, 0x0ffbfbfb, 0x14fafafa, 0x1bf8f8f8, 0x23f6f6f6,
+			0x2cf4f4f4, 0x35f2f2f2, 0x40efefef, 0x4bededed, 0x56eaeaea,
+			0x60e7e7e7, 0x6ae5e5e5, 0x74e2e2e2, 0x7ce0e0e0, 0x83dfdfdf,
+			0x8adddddd, 0x8fdcdcdc, 0x93dbdbdb, 0x96dadada, 0x98d9d9d9,
+			0x9ad9d9d9, 0x9bd9d9d9, 0x9cd8d8d8, 0x9dd8d8d8, 0x9dd8d8d8,
+			0x9dd8d8d8, 0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8,
+			0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8,
+			0x9ed8d8d8, 0x9dd8d8d8, 0x9dd8d8d8, 0x9dd8d8d8, 0x9cd8d8d8,
+			0x9bd9d9d9, 0x9ad9d9d9, 0x98d9d9d9, 0x96dadada, 0x93dbdbdb,
+			0x8fdcdcdc, 0x8adddddd, 0x83dfdfdf, 0x7ce0e0e0, 0x74e2e2e2,
+			0x6ae5e5e5, 0x60e7e7e7, 0x56eaeaea, 0x4bededed, 0x40efefef,
+			0x35f2f2f2, 0x2cf4f4f4, 0x23f6f6f6, 0x1bf8f8f8, 0x14fafafa,
+			0x0ffbfbfb, 0x13fafafa, 0x19f9f9f9, 0x21f7f7f7, 0x2af5f5f5,
+			0x35f2f2f2, 0x40efefef, 0x4cececec, 0x58e9e9e9, 0x64e6e6e6,
+			0x70e3e3e3, 0x7be1e1e1, 0x85dedede, 0x8edcdcdc, 0x96dadada,
+			0x9cd8d8d8, 0xa2d7d7d7, 0xa6d6d6d6, 0xa9d5d5d5, 0xabd5d5d5,
+			0xadd4d4d4, 0xaed4d4d4, 0xafd4d4d4, 0xb0d4d4d4, 0xb0d3d3d3,
+			0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3,
+			0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3,
+			0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d4d4d4, 0xafd4d4d4,
+			0xaed4d4d4, 0xadd4d4d4, 0xabd5d5d5, 0xa9d5d5d5, 0xa6d6d6d6,
+			0xa2d7d7d7, 0x9cd8d8d8, 0x96dadada, 0x8edcdcdc, 0x85dedede,
+			0x7be1e1e1, 0x70e3e3e3, 0x64e6e6e6, 0x58e9e9e9, 0x4cececec,
+			0x40efefef, 0x35f2f2f2, 0x2af5f5f5, 0x21f7f7f7, 0x19f9f9f9,
+			0x13fafafa, 0x16f9f9f9, 0x1ef8f8f8, 0x27f5f5f5, 0x32f3f3f3,
+			0x3ef0f0f0, 0x4bededed, 0x58e9e9e9, 0x66e6e6e6, 0x73e3e3e3,
+			0x80dfdfdf, 0x8bdddddd, 0x96dadada, 0x9fd8d8d8, 0xa7d6d6d6,
+			0xaed4d4d4, 0xb3d3d3d3, 0xb7d2d2d2, 0xbad1d1d1, 0xbdd0d0d0,
+			0xbed0d0d0, 0xc0d0d0d0, 0xc0cfcfcf, 0xc1cfcfcf, 0xc1cfcfcf,
+			0xc1cfcfcf, 0xc1cfcfcf, 0xc1cfcfcf, 0xc2cfcfcf, 0xc2cfcfcf,
+			0xc2cfcfcf, 0xc2cfcfcf, 0xc2cfcfcf, 0xc2cfcfcf, 0xc1cfcfcf,
+			0xc1cfcfcf, 0xc1cfcfcf, 0xc1cfcfcf, 0xc1cfcfcf, 0xc0cfcfcf,
+			0xc0d0d0d0, 0xbed0d0d0, 0xbdd0d0d0, 0xbad1d1d1, 0xb7d2d2d2,
+			0xb3d3d3d3, 0xaed4d4d4, 0xa7d6d6d6, 0x9fd8d8d8, 0x96dadada,
+			0x8bdddddd, 0x80dfdfdf, 0x73e3e3e3, 0x66e6e6e6, 0x58e9e9e9,
+			0x4bededed, 0x3ef0f0f0, 0x32f3f3f3, 0x27f5f5f5, 0x1ef8f8f8,
+			0x16f9f9f9, 0x1bf8f8f8, 0x24f6f6f6, 0x2ef4f4f4, 0x3af1f1f1,
+			0x47ededed, 0x56eaeaea, 0x64e6e6e6, 0x73e3e3e3, 0x81dfdfdf,
+			0x8fdcdcdc, 0x9bd9d9d9, 0xa6d6d6d6, 0xafd4d4d4, 0xb7d2d2d2,
+			0xbed0d0d0, 0xc3cfcfcf, 0xc7cecece, 0xcacdcdcd, 0xcccdcdcd,
+			0xcecccccc, 0xcfcccccc, 0xcfcccccc, 0xd0cccccc, 0xd0cccccc,
+			0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc,
+			0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc,
+			0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xcfcccccc,
+			0xcfcccccc, 0xcecccccc, 0xcccdcdcd, 0xcacdcdcd, 0xc7cecece,
+			0xc3cfcfcf, 0xbed0d0d0, 0xb7d2d2d2, 0xafd4d4d4, 0xa6d6d6d6,
+			0x9bd9d9d9, 0x8fdcdcdc, 0x81dfdfdf, 0x73e3e3e3, 0x64e6e6e6,
+			0x56eaeaea, 0x47ededed, 0x3af1f1f1, 0x2ef4f4f4, 0x24f6f6f6,
+			0x1bf8f8f8, 0x1ff7f7f7, 0x29f5f5f5, 0x35f2f2f2, 0x42efefef,
+			0x51ebebeb, 0x60e7e7e7, 0x70e3e3e3, 0x80dfdfdf, 0x8fdcdcdc,
+			0x9cd8d8d8, 0xa9d5d5d5, 0xb4d2d2d2, 0xbdd0d0d0, 0xc5cecece,
+			0xcbcdcdcd, 0xd0cccccc, 0xd4cbcbcb, 0xd7cacaca, 0xd9c9c9c9,
+			0xdac9c9c9, 0xdbc9c9c9, 0xdcc9c9c9, 0xdcc9c9c9, 0xdcc9c9c9,
+			0xddc9c9c9, 0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8,
+			0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8,
+			0xddc8c8c8, 0xddc9c9c9, 0xdcc9c9c9, 0xdcc9c9c9, 0xdcc9c9c9,
+			0xdbc9c9c9, 0xdac9c9c9, 0xd9c9c9c9, 0xd7cacaca, 0xd4cbcbcb,
+			0xd0cccccc, 0xcbcdcdcd, 0xc5cecece, 0xbdd0d0d0, 0xb4d2d2d2,
+			0xa9d5d5d5, 0x9cd8d8d8, 0x8fdcdcdc, 0x80dfdfdf, 0x70e3e3e3,
+			0x60e7e7e7, 0x51ebebeb, 0x42efefef, 0x35f2f2f2, 0x29f5f5f5,
+			0x1ff7f7f7, 0x23f6f6f6, 0x2ff4f4f4, 0x3bf0f0f0, 0x4aededed,
+			0x5ae9e9e9, 0x6ae5e5e5, 0x7be0e0e0, 0x8bdcdcdc, 0x9bd9d9d9,
+			0xa9d5d5d5, 0xb6d2d2d2, 0xc0cfcfcf, 0xcacdcdcd, 0xd1cbcbcb,
+			0xd7cacaca, 0xdcc9c9c9, 0xdfc8c8c8, 0xe1c7c7c7, 0xe3c7c7c7,
+			0xe5c7c7c7, 0xe5c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6,
+			0xe6c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6,
+			0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6,
+			0xe7c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6,
+			0xe5c6c6c6, 0xe5c7c7c7, 0xe3c7c7c7, 0xe1c7c7c7, 0xdfc8c8c8,
+			0xdcc9c9c9, 0xd7cacaca, 0xd1cbcbcb, 0xcacdcdcd, 0xc0cfcfcf,
+			0xb6d2d2d2, 0xa9d5d5d5, 0x9bd9d9d9, 0x8bdcdcdc, 0x7be0e0e0,
+			0x6ae5e5e5, 0x5ae9e9e9, 0x4aededed, 0x3bf0f0f0, 0x2ff4f4f4,
+			0x23f6f6f6, 0x27f5f5f5, 0x34f2f2f2, 0x42efefef, 0x51ebebeb,
+			0x62e7e7e7, 0x74e2e2e2, 0x85dedede, 0x96dadada, 0xa6d6d6d6,
+			0xb4d2d2d2, 0xc1cfcfcf, 0xcbcdcdcd, 0xd4cbcbcb, 0xdbc9c9c9,
+			0xe0c8c8c8, 0xe5c7c7c7, 0xe8c6c6c6, 0xeac5c5c5, 0xecc5c5c5,
+			0xedc5c5c5, 0xedc4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4,
+			0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4,
+			0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4,
+			0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4,
+			0xedc4c4c4, 0xedc5c5c5, 0xecc5c5c5, 0xeac5c5c5, 0xe8c6c6c6,
+			0xe5c7c7c7, 0xe0c8c8c8, 0xdbc9c9c9, 0xd4cbcbcb, 0xcbcdcdcd,
+			0xc1cfcfcf, 0xb4d2d2d2, 0xa6d6d6d6, 0x96dadada, 0x85dedede,
+			0x74e2e2e2, 0x62e7e7e7, 0x51ebebeb, 0x42efefef, 0x34f2f2f2,
+			0x27f5f5f5, 0x2bf4f4f4, 0x39f1f1f1, 0x47ededed, 0x58e9e9e9,
+			0x6ae5e5e5, 0x7ce0e0e0, 0x8edcdcdc, 0x9fd8d8d8, 0xafd4d4d4,
+			0xbdd0d0d0, 0xcacdcdcd, 0xd4cbcbcb, 0xdcc9c9c9, 0xe3c7c7c7,
+			0xe8c6c6c6, 0xecc5c5c5, 0xefc4c4c4, 0xf0c4c4c4, 0xf2c3c3c3,
+			0xf3c3c3c3, 0xf3c3c3c3, 0xf3c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3,
+			0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3,
+			0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3,
+			0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf3c3c3c3,
+			0xf3c3c3c3, 0xf3c3c3c3, 0xf2c3c3c3, 0xf0c4c4c4, 0xefc4c4c4,
+			0xecc5c5c5, 0xe8c6c6c6, 0xe3c7c7c7, 0xdcc9c9c9, 0xd4cbcbcb,
+			0xcacdcdcd, 0xbdd0d0d0, 0xafd4d4d4, 0x9fd8d8d8, 0x8edcdcdc,
+			0x7ce0e0e0, 0x6ae5e5e5, 0x58e9e9e9, 0x47ededed, 0x39f1f1f1,
+			0x2bf4f4f4, 0x2ff4f4f4, 0x3df0f0f0, 0x4dececec, 0x5ee8e8e8,
+			0x71e3e3e3, 0x84dfdfdf, 0x96dadada, 0xa7d6d6d6, 0xb7d2d2d2,
+			0xc5cecece, 0xd1cbcbcb, 0xdbc9c9c9, 0xe3c7c7c7, 0xe9c6c6c6,
+			0xeec4c4c4, 0xf1c4c4c4, 0xf4c3c3c3, 0xf5c2c2c2, 0xf6c2c2c2,
+			0xf7c2c2c2, 0xf7c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2,
+			0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2,
+			0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2,
+			0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2,
+			0xf7c2c2c2, 0xf7c2c2c2, 0xf6c2c2c2, 0xf5c2c2c2, 0xf4c3c3c3,
+			0xf1c4c4c4, 0xeec4c4c4, 0xe9c6c6c6, 0xe3c7c7c7, 0xdbc9c9c9,
+			0xd1cbcbcb, 0xc5cecece, 0xb7d2d2d2, 0xa7d6d6d6, 0x96dadada,
+			0x84dfdfdf, 0x71e3e3e3, 0x5ee8e8e8, 0x4dececec, 0x3df0f0f0,
+			0x2ff4f4f4, 0x32f3f3f3, 0x41efefef, 0x51ebebeb, 0x63e6e6e6,
+			0x77e2e2e2, 0x8adddddd, 0x9cd8d8d8, 0xaed4d4d4, 0xbdd0d0d0,
+			0xcbcdcdcd, 0xd7cacaca, 0xe0c7c7c7, 0xe8c6c6c6, 0xeec4c4c4,
+			0xf2c3c3c3, 0xf5c3c3c3, 0xf7c2c2c2, 0xf8c2c2c2, 0xf9c1c1c1,
+			0xfac1c1c1, 0xfac1c1c1, 0xfac1c1c1, 0xfbc1c1c1, 0xfbc1c1c1,
+			0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1,
+			0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1,
+			0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfac1c1c1,
+			0xfac1c1c1, 0xfac1c1c1, 0xf9c1c1c1, 0xf8c2c2c2, 0xf7c2c2c2,
+			0xf5c3c3c3, 0xf2c3c3c3, 0xeec4c4c4, 0xe8c6c6c6, 0xe0c7c7c7,
+			0xd7cacaca, 0xcbcdcdcd, 0xbdd0d0d0, 0xaed4d4d4, 0x9cd8d8d8,
+			0x8adddddd, 0x77e2e2e2, 0x63e6e6e6, 0x51ebebeb, 0x41efefef,
+			0x32f3f3f3, 0x34f2f2f2, 0x44eeeeee, 0x55eaeaea, 0x68e5e5e5,
+			0x7be1e1e1, 0x8fdcdcdc, 0xa1d7d7d7, 0xb3d3d3d3, 0xc2cfcfcf,
+			0xd0cbcbcb, 0xdcc9c9c9, 0xe4c6c6c6, 0xecc5c5c5, 0xf1c4c4c4,
+			0xf5c3c3c3, 0xf8c2c2c2, 0xfac1c1c1, 0xfac1c1c1, 0xfcc1c1c1,
+			0xfcc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1,
+			0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1,
+			0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1,
+			0xfdc1c1c1, 0xfdc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1,
+			0xfcc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1, 0xfac1c1c1, 0xfac1c1c1,
+			0xf8c2c2c2, 0xf5c3c3c3, 0xf1c4c4c4, 0xecc5c5c5, 0xe4c6c6c6,
+			0xdcc9c9c9, 0xd0cbcbcb, 0xc2cfcfcf, 0xb3d3d3d3, 0xa1d7d7d7,
+			0x8fdcdcdc, 0x7be1e1e1, 0x68e5e5e5, 0x55eaeaea, 0x44eeeeee,
+			0x34f2f2f2, 0x37f2f2f2, 0x47eeeeee, 0x58e9e9e9, 0x6be4e4e4,
+			0x7fe0e0e0, 0x93dbdbdb, 0xa5d6d6d6, 0xb7d2d2d2, 0xc6cecece,
+			0xd4cacaca, 0xdfc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf3c3c3c3,
+			0xf7c2c2c2, 0xfac2c2c2, 0xfbc1c1c1, 0xfcc1c1c1, 0xfdc0c0c0,
+			0xfdc0c0c0, 0xfdc0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc0c0c0, 0xfdc0c0c0, 0xfdc0c0c0, 0xfcc1c1c1, 0xfbc1c1c1,
+			0xfac2c2c2, 0xf7c2c2c2, 0xf3c3c3c3, 0xeec4c4c4, 0xe7c6c6c6,
+			0xdfc8c8c8, 0xd4cacaca, 0xc6cecece, 0xb7d2d2d2, 0xa5d6d6d6,
+			0x93dbdbdb, 0x7fe0e0e0, 0x6be4e4e4, 0x58e9e9e9, 0x47eeeeee,
+			0x37f2f2f2, 0x38f1f1f1, 0x49ededed, 0x5be9e9e9, 0x6ee4e4e4,
+			0x82dfdfdf, 0x96dadada, 0xa9d5d5d5, 0xbbd1d1d1, 0xc9cecece,
+			0xd7cacaca, 0xe2c7c7c7, 0xeac5c5c5, 0xf0c4c4c4, 0xf5c3c3c3,
+			0xf9c2c2c2, 0xfbc1c1c1, 0xfcc0c0c0, 0xfdc0c0c0, 0xfec0c0c0,
+			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfdc0c0c0, 0xfcc0c0c0,
+			0xfbc1c1c1, 0xf9c2c2c2, 0xf5c3c3c3, 0xf0c4c4c4, 0xeac5c5c5,
+			0xe2c7c7c7, 0xd7cacaca, 0xc9cecece, 0xbbd1d1d1, 0xa9d5d5d5,
+			0x96dadada, 0x82dfdfdf, 0x6ee4e4e4, 0x5be9e9e9, 0x49ededed,
+			0x38f1f1f1, 0x3af1f1f1, 0x4bededed, 0x5de8e8e8, 0x70e3e3e3,
+			0x85dedede, 0x99d9d9d9, 0xabd4d4d4, 0xbdd0d0d0, 0xcccdcdcd,
+			0xd9c9c9c9, 0xe4c7c7c7, 0xebc5c5c5, 0xf2c4c4c4, 0xf6c2c2c2,
+			0xfac1c1c1, 0xfcc1c1c1, 0xfdc0c0c0, 0xfdc0c0c0, 0xfec0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfdc0c0c0, 0xfdc0c0c0,
+			0xfcc1c1c1, 0xfac1c1c1, 0xf6c2c2c2, 0xf2c4c4c4, 0xebc5c5c5,
+			0xe4c7c7c7, 0xd9c9c9c9, 0xcccdcdcd, 0xbdd0d0d0, 0xabd4d4d4,
+			0x99d9d9d9, 0x85dedede, 0x70e3e3e3, 0x5de8e8e8, 0x4bededed,
+			0x3af1f1f1, 0x3bf1f1f1, 0x4cededed, 0x5ee8e8e8, 0x72e3e3e3,
+			0x87dedede, 0x9ad9d9d9, 0xadd4d4d4, 0xbfd0d0d0, 0xcdcdcdcd,
+			0xdac9c9c9, 0xe5c7c7c7, 0xecc4c4c4, 0xf3c3c3c3, 0xf7c2c2c2,
+			0xfac1c1c1, 0xfcc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfcc1c1c1, 0xfac1c1c1, 0xf7c2c2c2, 0xf3c3c3c3, 0xecc4c4c4,
+			0xe5c7c7c7, 0xdac9c9c9, 0xcdcdcdcd, 0xbfd0d0d0, 0xadd4d4d4,
+			0x9ad9d9d9, 0x87dedede, 0x72e3e3e3, 0x5ee8e8e8, 0x4cededed,
+			0x3bf1f1f1, 0x3cf0f0f0, 0x4dececec, 0x5fe7e7e7, 0x73e3e3e3,
+			0x88dedede, 0x9cd9d9d9, 0xaed4d4d4, 0xc0cfcfcf, 0xcecccccc,
+			0xdbc8c8c8, 0xe6c6c6c6, 0xedc4c4c4, 0xf3c3c3c3, 0xf7c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf7c2c2c2, 0xf3c3c3c3, 0xedc4c4c4,
+			0xe6c6c6c6, 0xdbc8c8c8, 0xcecccccc, 0xc0cfcfcf, 0xaed4d4d4,
+			0x9cd9d9d9, 0x88dedede, 0x73e3e3e3, 0x5fe7e7e7, 0x4dececec,
+			0x3cf0f0f0, 0x3cf0f0f0, 0x4eececec, 0x60e7e7e7, 0x74e2e2e2,
+			0x89dddddd, 0x9dd8d8d8, 0xafd3d3d3, 0xc1cfcfcf, 0xcfcccccc,
+			0xdcc8c8c8, 0xe6c6c6c6, 0xedc4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xedc4c4c4,
+			0xe6c6c6c6, 0xdcc8c8c8, 0xcfcccccc, 0xc1cfcfcf, 0xafd3d3d3,
+			0x9dd8d8d8, 0x89dddddd, 0x74e2e2e2, 0x60e7e7e7, 0x4eececec,
+			0x3cf0f0f0, 0x3cf0f0f0, 0x4eececec, 0x60e7e7e7, 0x74e2e2e2,
+			0x89dddddd, 0x9dd8d8d8, 0xafd3d3d3, 0xc1cfcfcf, 0xcfcccccc,
+			0xdcc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
+			0xe7c6c6c6, 0xdcc8c8c8, 0xcfcccccc, 0xc1cfcfcf, 0xafd3d3d3,
+			0x9dd8d8d8, 0x89dddddd, 0x74e2e2e2, 0x60e7e7e7, 0x4eececec,
+			0x3cf0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
+			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
+			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
+			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
+			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
+			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
+			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
+			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
+			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
+			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
+			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
+			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
+			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
+			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
+			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
+			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
+			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
+			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
+			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
+			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
+			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
+			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
+			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
+			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
+			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
+			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
+			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
+			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
+			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
+			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
+			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
+			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
+			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
+			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
+			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
+			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
+			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
+			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
+			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
+			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
+			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
+			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
+			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
+			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
+			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
+			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
+			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
+			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
+			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
+			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
+			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
+			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
+			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
+			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
+			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
+			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
+			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
+			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
+			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
+			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
+			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
+			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
+			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
+			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
+			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
+			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
+			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
+			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
+			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
+			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
+			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
+			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
+			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
+			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
+			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
+			0x3df0f0f0, 0x3cf0f0f0, 0x4eececec, 0x60e7e7e7, 0x74e2e2e2,
+			0x89dddddd, 0x9dd8d8d8, 0xafd3d3d3, 0xc1cfcfcf, 0xcfcccccc,
+			0xdcc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
+			0xe7c6c6c6, 0xdcc8c8c8, 0xcfcccccc, 0xc1cfcfcf, 0xafd3d3d3,
+			0x9dd8d8d8, 0x89dddddd, 0x74e2e2e2, 0x60e7e7e7, 0x4eececec,
+			0x3cf0f0f0, 0x3cf0f0f0, 0x4eececec, 0x60e7e7e7, 0x74e2e2e2,
+			0x89dddddd, 0x9dd8d8d8, 0xafd3d3d3, 0xc1cfcfcf, 0xcfcccccc,
+			0xdcc8c8c8, 0xe6c6c6c6, 0xedc4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xedc4c4c4,
+			0xe6c6c6c6, 0xdcc8c8c8, 0xcfcccccc, 0xc1cfcfcf, 0xafd3d3d3,
+			0x9dd8d8d8, 0x89dddddd, 0x74e2e2e2, 0x60e7e7e7, 0x4eececec,
+			0x3cf0f0f0, 0x3cf0f0f0, 0x4dececec, 0x5fe8e8e8, 0x73e3e3e3,
+			0x88dedede, 0x9cd9d9d9, 0xaed4d4d4, 0xc0d0d0d0, 0xcecccccc,
+			0xdbc8c8c8, 0xe6c6c6c6, 0xedc4c4c4, 0xf3c3c3c3, 0xf7c2c2c2,
+			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfdc1c1c1, 0xfbc1c1c1, 0xf7c2c2c2, 0xf3c3c3c3, 0xedc4c4c4,
+			0xe6c6c6c6, 0xdbc8c8c8, 0xcecccccc, 0xc0d0d0d0, 0xaed4d4d4,
+			0x9cd9d9d9, 0x88dedede, 0x73e3e3e3, 0x5fe8e8e8, 0x4dececec,
+			0x3cf0f0f0, 0x3bf1f1f1, 0x4cededed, 0x5ee8e8e8, 0x72e3e3e3,
+			0x86dedede, 0x9ad9d9d9, 0xadd4d4d4, 0xbfd0d0d0, 0xcdcdcdcd,
+			0xdac9c9c9, 0xe5c7c7c7, 0xecc4c4c4, 0xf2c3c3c3, 0xf7c2c2c2,
+			0xfac1c1c1, 0xfcc1c1c1, 0xfdc0c0c0, 0xfec0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
+			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfdc0c0c0,
+			0xfcc1c1c1, 0xfac1c1c1, 0xf7c2c2c2, 0xf2c3c3c3, 0xecc4c4c4,
+			0xe5c7c7c7, 0xdac9c9c9, 0xcdcdcdcd, 0xbfd0d0d0, 0xadd4d4d4,
+			0x9ad9d9d9, 0x86dedede, 0x72e3e3e3, 0x5ee8e8e8, 0x4cededed,
+			0x3bf1f1f1, 0x3af1f1f1, 0x4bededed, 0x5de8e8e8, 0x70e3e3e3,
+			0x85dedede, 0x99d9d9d9, 0xabd4d4d4, 0xbdd0d0d0, 0xcbcdcdcd,
+			0xd9c9c9c9, 0xe3c7c7c7, 0xebc5c5c5, 0xf1c4c4c4, 0xf6c3c3c3,
+			0xf9c1c1c1, 0xfcc1c1c1, 0xfdc0c0c0, 0xfdc0c0c0, 0xfec0c0c0,
+			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfdc0c0c0, 0xfdc0c0c0,
+			0xfcc1c1c1, 0xf9c1c1c1, 0xf6c3c3c3, 0xf1c4c4c4, 0xebc5c5c5,
+			0xe3c7c7c7, 0xd9c9c9c9, 0xcbcdcdcd, 0xbdd0d0d0, 0xabd4d4d4,
+			0x99d9d9d9, 0x85dedede, 0x70e3e3e3, 0x5de8e8e8, 0x4bededed,
+			0x3af1f1f1, 0x38f1f1f1, 0x49ededed, 0x5be9e9e9, 0x6ee4e4e4,
+			0x82dfdfdf, 0x96dadada, 0xa8d5d5d5, 0xbad1d1d1, 0xc9cecece,
+			0xd7cacaca, 0xe1c7c7c7, 0xe9c5c5c5, 0xf0c4c4c4, 0xf4c3c3c3,
+			0xf8c2c2c2, 0xfac2c2c2, 0xfcc1c1c1, 0xfcc0c0c0, 0xfdc0c0c0,
+			0xfdc0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
+			0xfec0c0c0, 0xfdc0c0c0, 0xfdc0c0c0, 0xfcc0c0c0, 0xfcc1c1c1,
+			0xfac2c2c2, 0xf8c2c2c2, 0xf4c3c3c3, 0xf0c4c4c4, 0xe9c5c5c5,
+			0xe1c7c7c7, 0xd7cacaca, 0xc9cecece, 0xbad1d1d1, 0xa8d5d5d5,
+			0x96dadada, 0x82dfdfdf, 0x6ee4e4e4, 0x5be9e9e9, 0x49ededed,
+			0x38f1f1f1, 0x37f2f2f2, 0x47eeeeee, 0x58e9e9e9, 0x6be5e5e5,
+			0x7fe0e0e0, 0x93dbdbdb, 0xa5d6d6d6, 0xb7d2d2d2, 0xc6cecece,
+			0xd3cacaca, 0xdec8c8c8, 0xe7c6c6c6, 0xeec5c5c5, 0xf2c3c3c3,
+			0xf6c2c2c2, 0xf9c2c2c2, 0xfac1c1c1, 0xfbc1c1c1, 0xfcc1c1c1,
+			0xfcc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1, 0xfdc1c1c1,
+			0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1,
+			0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1,
+			0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1,
+			0xfcc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1, 0xfbc1c1c1, 0xfac1c1c1,
+			0xf9c2c2c2, 0xf6c2c2c2, 0xf2c3c3c3, 0xeec5c5c5, 0xe7c6c6c6,
+			0xdec8c8c8, 0xd3cacaca, 0xc6cecece, 0xb7d2d2d2, 0xa5d6d6d6,
+			0x93dbdbdb, 0x7fe0e0e0, 0x6be5e5e5, 0x58e9e9e9, 0x47eeeeee,
+			0x37f2f2f2, 0x34f2f2f2, 0x44eeeeee, 0x55eaeaea, 0x67e5e5e5,
+			0x7be1e1e1, 0x8edcdcdc, 0xa1d7d7d7, 0xb3d3d3d3, 0xc2cfcfcf,
+			0xcfcccccc, 0xdbc9c9c9, 0xe3c7c7c7, 0xeac5c5c5, 0xf0c4c4c4,
+			0xf3c3c3c3, 0xf6c3c3c3, 0xf8c2c2c2, 0xf9c1c1c1, 0xfac1c1c1,
+			0xfac1c1c1, 0xfac1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1,
+			0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1,
+			0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1,
+			0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1,
+			0xfac1c1c1, 0xfac1c1c1, 0xfac1c1c1, 0xf9c1c1c1, 0xf8c2c2c2,
+			0xf6c3c3c3, 0xf3c3c3c3, 0xf0c4c4c4, 0xeac5c5c5, 0xe3c7c7c7,
+			0xdbc9c9c9, 0xcfcccccc, 0xc2cfcfcf, 0xb3d3d3d3, 0xa1d7d7d7,
+			0x8edcdcdc, 0x7be1e1e1, 0x67e5e5e5, 0x55eaeaea, 0x44eeeeee,
+			0x34f2f2f2, 0x32f3f3f3, 0x41efefef, 0x51ebebeb, 0x63e7e7e7,
+			0x76e2e2e2, 0x89dddddd, 0x9bd8d8d8, 0xadd4d4d4, 0xbcd1d1d1,
+			0xcacdcdcd, 0xd5cacaca, 0xdec8c8c8, 0xe6c6c6c6, 0xebc5c5c5,
+			0xf0c4c4c4, 0xf3c3c3c3, 0xf5c2c2c2, 0xf6c2c2c2, 0xf7c2c2c2,
+			0xf7c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2,
+			0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2,
+			0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2,
+			0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2,
+			0xf8c2c2c2, 0xf7c2c2c2, 0xf7c2c2c2, 0xf6c2c2c2, 0xf5c2c2c2,
+			0xf3c3c3c3, 0xf0c4c4c4, 0xebc5c5c5, 0xe6c6c6c6, 0xdec8c8c8,
+			0xd5cacaca, 0xcacdcdcd, 0xbcd1d1d1, 0xadd4d4d4, 0x9bd8d8d8,
+			0x89dddddd, 0x76e2e2e2, 0x63e7e7e7, 0x51ebebeb, 0x41efefef,
+			0x32f3f3f3, 0x2ef4f4f4, 0x3df0f0f0, 0x4cececec, 0x5ee8e8e8,
+			0x70e3e3e3, 0x83dfdfdf, 0x94dadada, 0xa6d6d6d6, 0xb5d2d2d2,
+			0xc3cfcfcf, 0xcfcccccc, 0xd8c9c9c9, 0xe0c8c8c8, 0xe6c6c6c6,
+			0xeac5c5c5, 0xeec5c5c5, 0xf0c4c4c4, 0xf1c3c3c3, 0xf3c3c3c3,
+			0xf3c3c3c3, 0xf3c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3,
+			0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3,
+			0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3,
+			0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3,
+			0xf3c3c3c3, 0xf3c3c3c3, 0xf3c3c3c3, 0xf1c3c3c3, 0xf0c4c4c4,
+			0xeec5c5c5, 0xeac5c5c5, 0xe6c6c6c6, 0xe0c8c8c8, 0xd8c9c9c9,
+			0xcfcccccc, 0xc3cfcfcf, 0xb5d2d2d2, 0xa6d6d6d6, 0x94dadada,
+			0x83dfdfdf, 0x70e3e3e3, 0x5ee8e8e8, 0x4cececec, 0x3df0f0f0,
+			0x2ef4f4f4, 0x2bf4f4f4, 0x38f1f1f1, 0x47eeeeee, 0x57e9e9e9,
+			0x69e5e5e5, 0x7be1e1e1, 0x8cdcdcdc, 0x9dd8d8d8, 0xadd4d4d4,
+			0xbbd1d1d1, 0xc7cecece, 0xd0cbcbcb, 0xd8cacaca, 0xdfc8c8c8,
+			0xe3c7c7c7, 0xe7c6c6c6, 0xeac5c5c5, 0xebc5c5c5, 0xedc5c5c5,
+			0xedc4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4,
+			0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4,
+			0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4,
+			0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4,
+			0xeec4c4c4, 0xedc4c4c4, 0xedc5c5c5, 0xebc5c5c5, 0xeac5c5c5,
+			0xe7c6c6c6, 0xe3c7c7c7, 0xdfc8c8c8, 0xd8cacaca, 0xd0cbcbcb,
+			0xc7cecece, 0xbbd1d1d1, 0xadd4d4d4, 0x9dd8d8d8, 0x8cdcdcdc,
+			0x7be1e1e1, 0x69e5e5e5, 0x57e9e9e9, 0x47eeeeee, 0x38f1f1f1,
+			0x2bf4f4f4, 0x27f5f5f5, 0x33f2f2f2, 0x41efefef, 0x50ebebeb,
+			0x61e7e7e7, 0x72e3e3e3, 0x83dedede, 0x94dadada, 0xa3d7d7d7,
+			0xb0d3d3d3, 0xbcd0d0d0, 0xc6cecece, 0xcfcccccc, 0xd5cacaca,
+			0xdac9c9c9, 0xdec8c8c8, 0xe1c7c7c7, 0xe3c7c7c7, 0xe4c7c7c7,
+			0xe5c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6,
+			0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6,
+			0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6,
+			0xe7c6c6c6, 0xe7c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6,
+			0xe6c6c6c6, 0xe5c6c6c6, 0xe4c7c7c7, 0xe3c7c7c7, 0xe1c7c7c7,
+			0xdec8c8c8, 0xdac9c9c9, 0xd5cacaca, 0xcfcccccc, 0xc6cecece,
+			0xbcd0d0d0, 0xb0d3d3d3, 0xa3d7d7d7, 0x94dadada, 0x83dedede,
+			0x72e3e3e3, 0x61e7e7e7, 0x50ebebeb, 0x41efefef, 0x33f2f2f2,
+			0x27f5f5f5, 0x23f6f6f6, 0x2ef4f4f4, 0x3bf1f1f1, 0x49ededed,
+			0x58e9e9e9, 0x68e5e5e5, 0x78e1e1e1, 0x88dddddd, 0x97dadada,
+			0xa5d6d6d6, 0xb0d3d3d3, 0xbbd1d1d1, 0xc3cfcfcf, 0xcacdcdcd,
+			0xcfcccccc, 0xd3cbcbcb, 0xd7cacaca, 0xd9c9c9c9, 0xdac9c9c9,
+			0xdbc9c9c9, 0xdcc9c9c9, 0xdcc9c9c9, 0xdcc9c9c9, 0xddc9c9c9,
+			0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8,
+			0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8,
+			0xddc8c8c8, 0xddc8c8c8, 0xddc9c9c9, 0xdcc9c9c9, 0xdcc9c9c9,
+			0xdcc9c9c9, 0xdbc9c9c9, 0xdac9c9c9, 0xd9c9c9c9, 0xd7cacaca,
+			0xd3cbcbcb, 0xcfcccccc, 0xcacdcdcd, 0xc3cfcfcf, 0xbbd1d1d1,
+			0xb0d3d3d3, 0xa5d6d6d6, 0x97dadada, 0x88dddddd, 0x78e1e1e1,
+			0x68e5e5e5, 0x58e9e9e9, 0x49ededed, 0x3bf1f1f1, 0x2ef4f4f4,
+			0x23f6f6f6, 0x1ef7f7f7, 0x28f5f5f5, 0x34f2f2f2, 0x41efefef,
+			0x4fececec, 0x5ee8e8e8, 0x6de4e4e4, 0x7ce0e0e0, 0x8adddddd,
+			0x97dadada, 0xa3d7d7d7, 0xadd4d4d4, 0xb5d2d2d2, 0xbcd1d1d1,
+			0xc2cfcfcf, 0xc6cecece, 0xc9cdcdcd, 0xcccdcdcd, 0xcdcccccc,
+			0xcecccccc, 0xcfcccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc,
+			0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc,
+			0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc,
+			0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc,
+			0xcfcccccc, 0xcecccccc, 0xcdcccccc, 0xcccdcdcd, 0xc9cdcdcd,
+			0xc6cecece, 0xc2cfcfcf, 0xbcd1d1d1, 0xb5d2d2d2, 0xadd4d4d4,
+			0xa3d7d7d7, 0x97dadada, 0x8adddddd, 0x7ce0e0e0, 0x6de4e4e4,
+			0x5ee8e8e8, 0x4fececec, 0x41efefef, 0x34f2f2f2, 0x28f5f5f5,
+			0x1ef7f7f7, 0x1af9f9f9, 0x23f6f6f6, 0x2df4f4f4, 0x39f1f1f1,
+			0x45eeeeee, 0x53ebebeb, 0x61e7e7e7, 0x6fe4e4e4, 0x7ce0e0e0,
+			0x88dddddd, 0x93dbdbdb, 0x9dd8d8d8, 0xa6d6d6d6, 0xadd4d4d4,
+			0xb2d3d3d3, 0xb7d2d2d2, 0xbad1d1d1, 0xbdd0d0d0, 0xbed0d0d0,
+			0xbfd0d0d0, 0xc0cfcfcf, 0xc1cfcfcf, 0xc1cfcfcf, 0xc1cfcfcf,
+			0xc1cfcfcf, 0xc1cfcfcf, 0xc2cfcfcf, 0xc2cfcfcf, 0xc2cfcfcf,
+			0xc2cfcfcf, 0xc2cfcfcf, 0xc2cfcfcf, 0xc2cfcfcf, 0xc2cfcfcf,
+			0xc1cfcfcf, 0xc1cfcfcf, 0xc1cfcfcf, 0xc1cfcfcf, 0xc1cfcfcf,
+			0xc0cfcfcf, 0xbfd0d0d0, 0xbed0d0d0, 0xbdd0d0d0, 0xbad1d1d1,
+			0xb7d2d2d2, 0xb2d3d3d3, 0xadd4d4d4, 0xa6d6d6d6, 0x9dd8d8d8,
+			0x93dbdbdb, 0x88dddddd, 0x7ce0e0e0, 0x6fe4e4e4, 0x61e7e7e7,
+			0x53ebebeb, 0x45eeeeee, 0x39f1f1f1, 0x2df4f4f4, 0x23f6f6f6,
+			0x1af9f9f9, 0x16fafafa, 0x1df8f8f8, 0x26f6f6f6, 0x30f3f3f3,
+			0x3cf0f0f0, 0x48ededed, 0x54eaeaea, 0x61e7e7e7, 0x6de4e4e4,
+			0x79e1e1e1, 0x83dfdfdf, 0x8ddcdcdc, 0x95dadada, 0x9bd9d9d9,
+			0xa1d7d7d7, 0xa5d6d6d6, 0xa9d5d5d5, 0xabd5d5d5, 0xadd4d4d4,
+			0xaed4d4d4, 0xafd4d4d4, 0xb0d4d4d4, 0xb0d3d3d3, 0xb0d3d3d3,
+			0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3,
+			0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3,
+			0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d4d4d4,
+			0xafd4d4d4, 0xaed4d4d4, 0xadd4d4d4, 0xabd5d5d5, 0xa9d5d5d5,
+			0xa5d6d6d6, 0xa1d7d7d7, 0x9bd9d9d9, 0x95dadada, 0x8ddcdcdc,
+			0x83dfdfdf, 0x79e1e1e1, 0x6de4e4e4, 0x61e7e7e7, 0x54eaeaea,
+			0x48ededed, 0x3cf0f0f0, 0x30f3f3f3, 0x26f6f6f6, 0x1df8f8f8,
+			0x16fafafa, 0x12fbfbfb, 0x18f9f9f9, 0x20f7f7f7, 0x28f5f5f5,
+			0x32f3f3f3, 0x3df0f0f0, 0x48ededed, 0x53eaeaea, 0x5ee8e8e8,
+			0x68e5e5e5, 0x72e3e3e3, 0x7be1e1e1, 0x82dfdfdf, 0x89dddddd,
+			0x8edcdcdc, 0x93dbdbdb, 0x96dadada, 0x98d9d9d9, 0x9ad9d9d9,
+			0x9bd9d9d9, 0x9cd8d8d8, 0x9dd8d8d8, 0x9dd8d8d8, 0x9dd8d8d8,
+			0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8,
+			0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8,
+			0x9ed8d8d8, 0x9ed8d8d8, 0x9dd8d8d8, 0x9dd8d8d8, 0x9dd8d8d8,
+			0x9cd8d8d8, 0x9bd9d9d9, 0x9ad9d9d9, 0x98d9d9d9, 0x96dadada,
+			0x93dbdbdb, 0x8edcdcdc, 0x89dddddd, 0x82dfdfdf, 0x7be1e1e1,
+			0x72e3e3e3, 0x68e5e5e5, 0x5ee8e8e8, 0x53eaeaea, 0x48ededed,
+			0x3df0f0f0, 0x32f3f3f3, 0x28f5f5f5, 0x20f7f7f7, 0x18f9f9f9,
+			0x12fbfbfb, 0x0efbfbfb, 0x14fafafa, 0x1af9f9f9, 0x21f7f7f7,
+			0x29f5f5f5, 0x32f3f3f3, 0x3cf0f0f0, 0x45eeeeee, 0x4febebeb,
+			0x58e9e9e9, 0x61e7e7e7, 0x69e5e5e5, 0x70e3e3e3, 0x76e2e2e2,
+			0x7be1e1e1, 0x7fe0e0e0, 0x82dfdfdf, 0x85dedede, 0x86dedede,
+			0x87dedede, 0x88dddddd, 0x89dddddd, 0x89dddddd, 0x89dddddd,
+			0x8adddddd, 0x8adddddd, 0x8adddddd, 0x8adddddd, 0x8adddddd,
+			0x8adddddd, 0x8adddddd, 0x8adddddd, 0x8adddddd, 0x8adddddd,
+			0x8adddddd, 0x8adddddd, 0x89dddddd, 0x89dddddd, 0x89dddddd,
+			0x88dddddd, 0x87dedede, 0x86dedede, 0x85dedede, 0x82dfdfdf,
+			0x7fe0e0e0, 0x7be1e1e1, 0x76e2e2e2, 0x70e3e3e3, 0x69e5e5e5,
+			0x61e7e7e7, 0x58e9e9e9, 0x4febebeb, 0x45eeeeee, 0x3cf0f0f0,
+			0x32f3f3f3, 0x29f5f5f5, 0x21f7f7f7, 0x1af9f9f9, 0x14fafafa,
+			0x0efbfbfb, 0x0bfcfcfc, 0x0ffbfbfb, 0x14fafafa, 0x1af8f8f8,
+			0x21f7f7f7, 0x29f5f5f5, 0x30f3f3f3, 0x39f1f1f1, 0x41efefef,
+			0x49ededed, 0x51ebebeb, 0x58e9e9e9, 0x5ee8e8e8, 0x63e6e6e6,
+			0x68e5e5e5, 0x6be4e4e4, 0x6ee4e4e4, 0x70e3e3e3, 0x72e3e3e3,
+			0x73e3e3e3, 0x74e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2,
+			0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2,
+			0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2,
+			0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2,
+			0x74e2e2e2, 0x73e3e3e3, 0x72e3e3e3, 0x70e3e3e3, 0x6ee4e4e4,
+			0x6be4e4e4, 0x68e5e5e5, 0x63e6e6e6, 0x5ee8e8e8, 0x58e9e9e9,
+			0x51ebebeb, 0x49ededed, 0x41efefef, 0x39f1f1f1, 0x30f3f3f3,
+			0x29f5f5f5, 0x21f7f7f7, 0x1af8f8f8, 0x14fafafa, 0x0ffbfbfb,
+			0x0bfcfcfc, 0x09fdfdfd, 0x0cfcfcfc, 0x10fbfbfb, 0x14fafafa,
+			0x1af9f9f9, 0x20f7f7f7, 0x26f6f6f6, 0x2df4f4f4, 0x34f2f2f2,
+			0x3bf0f0f0, 0x41efefef, 0x47ededed, 0x4cececec, 0x51ebebeb,
+			0x55eaeaea, 0x58e9e9e9, 0x5be9e9e9, 0x5de8e8e8, 0x5ee8e8e8,
+			0x5fe7e7e7, 0x60e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7,
+			0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7,
+			0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7,
+			0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7,
+			0x60e7e7e7, 0x5fe7e7e7, 0x5ee8e8e8, 0x5de8e8e8, 0x5be9e9e9,
+			0x58e9e9e9, 0x55eaeaea, 0x51ebebeb, 0x4cececec, 0x47ededed,
+			0x41efefef, 0x3bf0f0f0, 0x34f2f2f2, 0x2df4f4f4, 0x26f6f6f6,
+			0x20f7f7f7, 0x1af9f9f9, 0x14fafafa, 0x10fbfbfb, 0x0cfcfcfc,
+			0x09fdfdfd, 0x06fdfdfd, 0x09fdfdfd, 0x0cfcfcfc, 0x0ffbfbfb,
+			0x14fafafa, 0x18f9f9f9, 0x1df8f8f8, 0x23f6f6f6, 0x28f5f5f5,
+			0x2ef4f4f4, 0x33f2f2f2, 0x38f1f1f1, 0x3df0f0f0, 0x41efefef,
+			0x44eeeeee, 0x47eeeeee, 0x49ededed, 0x4bededed, 0x4cececec,
+			0x4dececec, 0x4dececec, 0x4eececec, 0x4eececec, 0x4eececec,
+			0x4eececec, 0x4eececec, 0x4fececec, 0x4fececec, 0x4fececec,
+			0x4fececec, 0x4fececec, 0x4fececec, 0x4fececec, 0x4fececec,
+			0x4eececec, 0x4eececec, 0x4eececec, 0x4eececec, 0x4eececec,
+			0x4dececec, 0x4dececec, 0x4cececec, 0x4bededed, 0x49ededed,
+			0x47eeeeee, 0x44eeeeee, 0x41efefef, 0x3df0f0f0, 0x38f1f1f1,
+			0x33f2f2f2, 0x2ef4f4f4, 0x28f5f5f5, 0x23f6f6f6, 0x1df8f8f8,
+			0x18f9f9f9, 0x14fafafa, 0x0ffbfbfb, 0x0cfcfcfc, 0x09fdfdfd,
+			0x06fdfdfd, };
+
+	Image shadowImage;
+
+	public ShadowComposite(Composite parent, int style) {
+		super(parent, style);
+		addPaintListener(new PaintListener() {
+
+			public void paintControl(PaintEvent e) {
+				Point size = getSize();
+				Rectangle bodyRect = new Rectangle(0, 0, size.x, size.y);
+				drawTabBody(e.gc, bodyRect, 0);
+				drawTabHeader(e.gc, bodyRect, 0);
+			}
+		});
+	}
+
+	@Override
+	public Rectangle getClientArea() {
+		Rectangle area = super.getClientArea();
+		return new Rectangle(15, 15, area.width - 30, area.height - 30);
+	}
+
+
+
+	void drawTabHeader(GC gc, Rectangle bounds, int state) {
+		// gc.setClipping(bounds.x, bounds.y, bounds.width,
+		// parent.getTabHeight() + 1);
+
+		int[] points = new int[1024];
+		int index = 0;
+		int radius = CORNER_SIZE / 2;
+//		int marginWidth = parent.marginWidth;
+//		int marginHeight = parent.marginHeight;
+		int delta = INNER_KEYLINE + OUTER_KEYLINE + 2 * SIDE_DROP_WIDTH + 2
+				* marginWidth;
+		int width = bounds.width - delta;
+		int height = bounds.height - INNER_KEYLINE - OUTER_KEYLINE - 2
+				* marginHeight - BOTTOM_DROP_WIDTH;
+		int circX = bounds.x + delta / 2 + radius;
+		int circY = bounds.y + radius;
+
+		// Fill in background
+		Region clipping = new Region();
+		gc.getClipping(clipping);
+		Region region = new Region();
+		region.add(shape);
+		region.intersect(clipping);
+		gc.setClipping(region);
+
+//		int header = 3; // TODO: this needs to be added to computeTrim for
+//						// HEADER
+//		Rectangle trim = computeTrim(PART_HEADER, state, 0, 0, 0, 0);
+//		trim.width = bounds.width - trim.width;
+//		trim.height = (parent.getTabHeight() + 1 + header) - trim.height;
+//		trim.x = -trim.x;
+//		trim.y = -trim.y;
+//
+//		draw(PART_BACKGROUND, SWT.NONE, trim, gc);
+
+		gc.setClipping(clipping);
+		clipping.dispose();
+		region.dispose();
+
+		int[] ltt = drawCircle(circX + 1, circY + 1, radius, LEFT_TOP);
+		System.arraycopy(ltt, 0, points, index, ltt.length);
+		index += ltt.length;
+
+		int[] lbb = drawCircle(circX + 1, circY + height - (radius * 2) - 2,
+				radius, LEFT_BOTTOM);
+		System.arraycopy(lbb, 0, points, index, lbb.length);
+		index += lbb.length;
+
+		int[] rb = drawCircle(circX + width - (radius * 2) - 2, circY + height
+				- (radius * 2) - 2, radius, RIGHT_BOTTOM);
+		System.arraycopy(rb, 0, points, index, rb.length);
+		index += rb.length;
+
+		int[] rt = drawCircle(circX + width - (radius * 2) - 2, circY + 1,
+				radius, RIGHT_TOP);
+		System.arraycopy(rt, 0, points, index, rt.length);
+		index += rt.length;
+		points[index++] = points[0];
+		points[index++] = points[1];
+
+		int[] tempPoints = new int[index];
+		System.arraycopy(points, 0, tempPoints, 0, index);
+
+		// White Keyline
+		// gc.setAntialias(SWT.ON);
+		gc.setForeground(gc.getDevice().getSystemColor(SWT.COLOR_WHITE));
+		gc.drawPolyline(tempPoints);
+
+		ltt = drawCircle(circX + 2, circY + 2, radius, LEFT_TOP);
+		System.arraycopy(ltt, 0, points, index, ltt.length);
+		gc.drawPolyline(ltt);
+
+		rt = drawCircle(circX + width - (radius * 2) - 3, circY + 2, radius,
+				RIGHT_TOP);
+		System.arraycopy(rt, 0, points, index, rt.length);
+		gc.drawPolyline(rt);
+
+		int rtLength = rt.length;
+		gc.drawLine(rt[rtLength - 2], rt[rtLength - 1], ltt[0], ltt[1]);
+
+		Color borderBlue = new Color(gc.getDevice(), 190, 216, 237);
+		gc.setForeground(borderBlue);
+		gc.drawPolyline(shape);
+		borderBlue.dispose();
+	}
+
+	void drawTabBody(GC gc, Rectangle bounds, int state) {
+		int[] points = new int[1024];
+		int index = 0;
+		int radius = CORNER_SIZE / 2;
+//		int marginWidth = parent.marginWidth;
+//		int marginHeight = parent.marginHeight;
+		int delta = INNER_KEYLINE + OUTER_KEYLINE + 2 * SIDE_DROP_WIDTH + 2
+				* marginWidth;
+		int width = bounds.width - delta;
+		int height = bounds.height - INNER_KEYLINE - OUTER_KEYLINE - 2
+				* marginHeight - BOTTOM_DROP_WIDTH;
+
+		int circX = bounds.x + delta / 2 + radius;
+		int circY = bounds.y + radius;
+
+		// Body
+		index = 0;
+		int[] ltt = drawCircle(circX, circY, radius, LEFT_TOP);
+		System.arraycopy(ltt, 0, points, index, ltt.length);
+		index += ltt.length;
+
+		int[] lbb = drawCircle(circX, circY + height - (radius * 2), radius,
+				LEFT_BOTTOM);
+		System.arraycopy(lbb, 0, points, index, lbb.length);
+		index += lbb.length;
+
+		int[] rb = drawCircle(circX + width - (radius * 2), circY + height
+				- (radius * 2), radius, RIGHT_BOTTOM);
+		System.arraycopy(rb, 0, points, index, rb.length);
+		index += rb.length;
+
+		int[] rt = drawCircle(circX + width - (radius * 2), circY, radius,
+				RIGHT_TOP);
+		System.arraycopy(rt, 0, points, index, rt.length);
+		index += rt.length;
+		points[index++] = circX;
+		points[index++] = circY - radius;
+
+		int[] tempPoints = new int[index];
+		System.arraycopy(points, 0, tempPoints, 0, index);
+		shape = tempPoints;
+		gc.fillPolygon(shape);
+
+		// Fill in parent background for non-rectangular shape
+		Region r = new Region();
+		r.add(bounds);
+		r.subtract(shape);
+		gc.setBackground(getParent().getBackground());
+		Display display = getDisplay();
+		Region clipping = new Region();
+		gc.getClipping(clipping);
+		r.intersect(clipping);
+		gc.setClipping(r);
+		Rectangle mappedBounds = display
+				.map(this, getParent(), bounds);
+		getParent().drawBackground(gc, bounds.x, bounds.y, bounds.width,
+				bounds.height, mappedBounds.x, mappedBounds.y);
+
+		// Shadow
+		drawShadow(display, bounds, gc);
+
+		gc.setClipping(clipping);
+		clipping.dispose();
+		r.dispose();
+	}
+
+	static int[] drawCircle(int xC, int yC, int r, int circlePart) {
+		int x = 0, y = r, u = 1, v = 2 * r - 1, e = 0;
+		int[] points = new int[1024];
+		int[] pointsMirror = new int[1024];
+		int loop = 0;
+		int loopMirror = 0;
+		while (x < y) {
+			if (circlePart == RIGHT_BOTTOM) {
+				points[loop++] = xC + x;
+				points[loop++] = yC + y;
+			}
+			if (circlePart == RIGHT_TOP) {
+				points[loop++] = xC + y;
+				points[loop++] = yC - x;
+			}
+			if (circlePart == LEFT_TOP) {
+				points[loop++] = xC - x;
+				points[loop++] = yC - y;
+			}
+			if (circlePart == LEFT_BOTTOM) {
+				points[loop++] = xC - y;
+				points[loop++] = yC + x;
+			}
+			x++;
+			e += u;
+			u += 2;
+			if (v < 2 * e) {
+				y--;
+				e -= v;
+				v -= 2;
+			}
+			if (x > y)
+				break;
+			if (circlePart == RIGHT_BOTTOM) {
+				pointsMirror[loopMirror++] = xC + y;
+				pointsMirror[loopMirror++] = yC + x;
+			}
+			if (circlePart == RIGHT_TOP) {
+				pointsMirror[loopMirror++] = xC + x;
+				pointsMirror[loopMirror++] = yC - y;
+			}
+			if (circlePart == LEFT_TOP) {
+				pointsMirror[loopMirror++] = xC - y;
+				pointsMirror[loopMirror++] = yC - x;
+			}
+			if (circlePart == LEFT_BOTTOM) {
+				pointsMirror[loopMirror++] = xC - x;
+				pointsMirror[loopMirror++] = yC + y;
+			}
+			// grow?
+			if ((loop + 1) > points.length) {
+				int length = points.length * 2;
+				int[] newPointTable = new int[length];
+				int[] newPointTableMirror = new int[length];
+				System.arraycopy(points, 0, newPointTable, 0, points.length);
+				points = newPointTable;
+				System.arraycopy(pointsMirror, 0, newPointTableMirror, 0,
+						pointsMirror.length);
+				pointsMirror = newPointTableMirror;
+			}
+		}
+		int[] finalArray = new int[loop + loopMirror];
+		System.arraycopy(points, 0, finalArray, 0, loop);
+		for (int i = loopMirror - 1, j = loop; i > 0; i = i - 2, j = j + 2) {
+			int tempY = pointsMirror[i];
+			int tempX = pointsMirror[i - 1];
+			finalArray[j] = tempX;
+			finalArray[j + 1] = tempY;
+		}
+		return finalArray;
+	}
+
+	void drawShadow(final Display display, Rectangle bounds, GC gc) {
+		if (shadowImage == null)
+			createShadow(display);
+		int x = bounds.x;
+		int y = bounds.y;
+		int SIZE = shadowImage.getBounds().width / 3;
+		// top left
+		gc.drawImage(shadowImage, 0, 0, SIZE, SIZE, 0, 0, SIZE, 20);
+		int fillHeight = bounds.height - SIZE * 2;
+		int fillWidth = bounds.width + 5 - SIZE * 2;
+
+		int xFill = 0;
+		for (int i = SIZE; i < fillHeight; i += SIZE) {
+			xFill = i;
+			gc.drawImage(shadowImage, 0, SIZE, SIZE, SIZE, 0, i, SIZE, SIZE);
+		}
+
+		// Pad the rest of the shadow
+		gc.drawImage(shadowImage, 0, SIZE, SIZE, fillHeight - xFill, 0, xFill
+				+ SIZE, SIZE, fillHeight - xFill);
+
+		// bl
+		gc.drawImage(shadowImage, 0, 40, 20, 20, 0, y + bounds.height - SIZE,
+				20, 20);
+		int yFill = 0;
+		for (int i = SIZE; i <= fillWidth; i += SIZE) {
+			yFill = i;
+			gc.drawImage(shadowImage, SIZE, SIZE * 2, SIZE, SIZE, i, y
+					+ bounds.height - SIZE, SIZE, SIZE);
+		}
+		// Pad the rest of the shadow
+		gc.drawImage(shadowImage, SIZE, SIZE * 2, fillWidth - yFill, SIZE,
+				yFill + SIZE, y + bounds.height - SIZE, fillWidth - yFill, SIZE);
+
+		// br
+		gc.drawImage(shadowImage, SIZE * 2, SIZE * 2, SIZE, SIZE, x
+				+ bounds.width - SIZE + 5, y + bounds.height - SIZE, SIZE, SIZE);
+
+		// tr
+		gc.drawImage(shadowImage, SIZE * 2, 0, SIZE, SIZE, x + bounds.width
+				- SIZE + 5, y, SIZE, SIZE);
+
+		xFill = 0;
+		for (int i = SIZE; i < fillHeight; i += SIZE) {
+			xFill = i;
+			gc.drawImage(shadowImage, SIZE * 2, SIZE, SIZE, SIZE, x
+					+ bounds.width - SIZE + 5, i, SIZE, SIZE);
+		}
+
+		// Pad the rest of the shadow
+		gc.drawImage(shadowImage, SIZE * 2, SIZE, SIZE, fillHeight - xFill, x
+				+ bounds.width - SIZE + 5, xFill + SIZE, SIZE, fillHeight
+				- xFill);
+	}
+
+	void createShadow(final Display display) {
+		Object obj = display.getData(E4_SHADOW_IMAGE);
+		if (obj != null) {
+			shadowImage = (Image) obj;
+		} else {
+			ImageData data = new ImageData(60, 60, 32, new PaletteData(
+					0xFF0000, 0xFF00, 0xFF));
+			for (int y = 0, index = 0; y < 60; y++) {
+				for (int x = 0; x < 60; x++) {
+					data.setPixel(x, y, shadow[index] & 0xFFFFFF);
+					data.setAlpha(x, y, (shadow[index] >> 24) & 0xFF);
+					index++;
+				}
+			}
+			shadowImage = new Image(display, data);
+			display.setData(E4_SHADOW_IMAGE, shadowImage);
+			display.disposeExec(new Runnable() {
+				public void run() {
+					Object obj = display.getData(E4_SHADOW_IMAGE);
+					if (obj != null) {
+						Image tmp = (Image) obj;
+						tmp.dispose();
+						display.setData(E4_SHADOW_IMAGE, null);
+					}
+				}
+			});
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
new file mode 100644
index 0000000000..2030f986bc
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -0,0 +1,141 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common;
+
+import org.eclipse.e4.ui.model.application.MModelComponent;
+import org.eclipse.e4.ui.model.application.MModelComponents;
+import org.eclipse.e4.ui.model.application.MPart;
+import org.eclipse.e4.ui.model.application.MPartDescriptor;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.jface.viewers.StyledString.Styler;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.TextStyle;
+
+public class ComponentLabelProvider extends StyledCellLabelProvider {
+	private Image modelComponentsImage;
+	private Image modelComonentImage;
+	private Image partsImage;
+	private Image menusImage;
+	private Image partImage;
+	private Image partDescriptorImage;
+
+	@Override
+    public void update(final ViewerCell cell) {
+		if( cell.getElement() instanceof MModelComponents ) {
+			cell.setText("Model Components");
+			if( modelComponentsImage == null ) {
+				modelComponentsImage = new Image(cell.getControl().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/application_view_icons.png"));
+			}
+			cell.setImage(modelComponentsImage);
+		} else if( cell.getElement() instanceof MModelComponent ) {
+			MModelComponent m = (MModelComponent) cell.getElement();
+			StyledString styledString = new StyledString("Model Component", null);
+			String decoration = " - " + m.getParentID();
+			Styler styler = new Styler() {
+
+				@Override
+				public void applyStyles(TextStyle textStyle) {
+					textStyle.foreground = cell.getControl().getDisplay().getSystemColor(SWT.COLOR_GRAY);
+				}
+			};
+
+	        styledString.append(decoration, styler);
+			cell.setText(styledString.getString());
+			cell.setStyleRanges(styledString.getStyleRanges());
+			if( modelComonentImage == null ) {
+				modelComonentImage = new Image(cell.getControl().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/package_go.png"));
+			}
+			cell.setImage(modelComonentImage);
+		} else if( cell.getElement() instanceof VirtualEntry<?> ) {
+			String s = cell.getElement().toString();
+			cell.setText(s);
+			if( "Parts".equals(s) ) {
+				if( partsImage == null ) {
+					partsImage = new Image(cell.getControl().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/application_double.png"));
+				}
+				cell.setImage(partsImage);
+			} else if( "Menus".equals(s) ) {
+				if( menusImage == null ) {
+					menusImage = new Image(cell.getControl().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/cog.png"));
+				}
+				cell.setImage(menusImage);
+			}
+		} else if( cell.getElement() instanceof MPart ) {
+			MPart part = (MPart) cell.getElement();
+			String label;
+			if( cell.getElement() instanceof MPartDescriptor ) {
+				label = "Part Descriptor";
+				if( partDescriptorImage == null ) {
+					partDescriptorImage = new Image(cell.getControl().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/application_form_edit.png"));
+				}
+				cell.setImage(partImage);
+			} else {
+				label = "Part";
+				if( partImage == null ) {
+					partImage = new Image(cell.getControl().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/application_form.png"));
+				}
+				cell.setImage(partImage);
+			}
+			StyledString styledString = new StyledString(label, null);
+			String decoration = " - " + part.getLabel();
+			Styler styler = new Styler() {
+
+				@Override
+				public void applyStyles(TextStyle textStyle) {
+					textStyle.foreground = cell.getControl().getDisplay().getSystemColor(SWT.COLOR_GRAY);
+				}
+			};
+
+	        styledString.append(decoration, styler);
+	        cell.setText(styledString.getString());
+			cell.setStyleRanges(styledString.getStyleRanges());
+		} else {
+			cell.setText(cell.getElement()+"");
+		}
+	}
+
+	@Override
+	public void dispose() {
+		if( modelComponentsImage != null ) {
+			modelComponentsImage.dispose();
+			modelComponentsImage = null;
+		}
+
+		if( modelComonentImage != null ) {
+			modelComonentImage.dispose();
+			modelComonentImage = null;
+		}
+
+		if( partsImage != null ) {
+			partsImage.dispose();
+			partsImage = null;
+		}
+
+		if( menusImage != null ) {
+			menusImage.dispose();
+			menusImage = null;
+		}
+
+		if( partImage != null ) {
+			partImage.dispose();
+			partImage = null;
+		}
+
+		if( partDescriptorImage != null ) {
+			partDescriptorImage.dispose();
+			partDescriptorImage = null;
+		}
+		super.dispose();
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
new file mode 100644
index 0000000000..dee4839762
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -0,0 +1,233 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ApplicationEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ModelComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ModelComponentsEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.PartDescriptorEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.PartEditor;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MModelComponent;
+import org.eclipse.e4.ui.model.application.MModelComponents;
+import org.eclipse.e4.ui.model.application.MPart;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.databinding.viewers.ObservableListTreeContentProvider;
+import org.eclipse.jface.databinding.viewers.TreeStructureAdvisor;
+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.swt.SWT;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.custom.StackLayout;
+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.swt.widgets.Label;
+
+public class ModelEditor {
+	private static final int VIRTUAL_MENU = 1;
+	private static final int VIRTUAL_PART = 2;
+	private static final int VIRTUAL_HANDLER = 3;
+	private static final int VIRTUAL_BINDING = 4;
+
+	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
+//	private List<AbstractComponentEditor> editors = new ArrayList<AbstractComponentEditor>();
+
+	private TreeViewer viewer;
+	private IModelResource modelProvider;
+
+	@Inject
+	public ModelEditor(Composite composite, IModelResource modelProvider) {
+		this.modelProvider = modelProvider;
+		registerDefaultEditors();
+		SashForm form = new SashForm(composite, SWT.HORIZONTAL);
+		form.setBackground(form.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+
+		viewer = createTreeViewerArea(form);
+
+		Composite parent = new Composite(form,SWT.NONE);
+		parent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+		FillLayout l = new FillLayout();
+		l.marginWidth=5;
+		parent.setLayout(l);
+
+		ShadowComposite editingArea = new ShadowComposite(parent,SWT.NONE);
+		GridLayout gl = new GridLayout();
+		gl.marginTop=0;
+		gl.marginHeight=0;
+		editingArea.setLayout(gl);
+		editingArea.setBackgroundMode(SWT.INHERIT_DEFAULT);
+		editingArea.setData("org.eclipse.e4.ui.css.CssClassName","contentContainer");
+
+		Composite headerContainer = new Composite(editingArea,SWT.NONE);
+		headerContainer.setBackgroundMode(SWT.INHERIT_DEFAULT);
+		headerContainer.setData("org.eclipse.e4.ui.css.CssClassName", "headerSectionContainer");
+		headerContainer.setLayout(new GridLayout(2, false));
+		headerContainer.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		final Label iconLabel = new Label(headerContainer,SWT.NONE);
+		iconLabel.setLayoutData(new GridData(20, 20));
+
+		final Label textLabel = new Label(headerContainer, SWT.NONE);
+		textLabel.setData("org.eclipse.e4.ui.css.CssClassName", "sectionHeader");
+		textLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		final Composite contentContainer = new Composite(editingArea,SWT.NONE);
+		contentContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
+		final StackLayout layout = new StackLayout();
+		contentContainer.setLayout(layout);
+
+		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+
+			public void selectionChanged(SelectionChangedEvent event) {
+				if( ! event.getSelection().isEmpty() ) {
+					IStructuredSelection s = (IStructuredSelection) event.getSelection();
+					if( s.getFirstElement() instanceof EObject ) {
+						EObject obj = (EObject) s.getFirstElement();
+						AbstractComponentEditor editor = editorMap.get(obj.eClass());
+						if( editor != null ) {
+							textLabel.setText(editor.getLabel());
+							iconLabel.setImage(editor.getImage(iconLabel.getDisplay()));
+							Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
+							comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
+							layout.topControl = comp;
+							contentContainer.layout(true);
+						}
+					}
+				}
+			}
+		});
+
+		form.setWeights(new int[] { 1 , 2 });
+	}
+
+	private TreeViewer createTreeViewerArea(Composite parent) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+		FillLayout l = new FillLayout();
+		l.marginWidth=5;
+		parent.setLayout(l);
+		ShadowComposite editingArea = new ShadowComposite(parent,SWT.NONE);
+		editingArea.setLayout(new FillLayout());
+		TreeViewer viewer = new TreeViewer(editingArea);
+		viewer.setLabelProvider(new ComponentLabelProvider());
+		ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(
+				new ObservableFactoryImpl(), new TreeStructureAdvisorImpl());
+		viewer.setContentProvider(contentProvider);
+		viewer.setInput(modelProvider.getRoot());
+
+		return viewer;
+	}
+
+	private void registerDefaultEditors() {
+		registerEditor( MApplicationPackage.Literals.APPLICATION, new ApplicationEditor());
+		registerEditor( MApplicationPackage.Literals.MODEL_COMPONENTS, new ModelComponentsEditor());
+		registerEditor( MApplicationPackage.Literals.MODEL_COMPONENT, new ModelComponentEditor());
+		registerEditor( MApplicationPackage.Literals.PART, new PartEditor());
+		registerEditor( MApplicationPackage.Literals.PART_DESCRIPTOR, new PartDescriptorEditor());
+	}
+
+	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
+		editorMap.put(eClass, editor);
+	}
+
+	private static class TreeStructureAdvisorImpl extends TreeStructureAdvisor {
+
+	}
+
+	private static class ObservableFactoryImpl implements IObservableFactory {
+		private IListProperty MODEL_COMPONENTS__COMPONENTS = EMFProperties.list(MApplicationPackage.Literals.MODEL_COMPONENTS__COMPONENTS);
+		private IListProperty MODEL_COMPONENT__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.MODEL_COMPONENT__CHILDREN);
+		private IListProperty PART__MENUS = EMFProperties.list(MApplicationPackage.Literals.PART__MENUS);
+		private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
+		private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS);
+
+		public IObservable createObservable(Object target) {
+			if( target instanceof IObservableList ) {
+				return (IObservable) target;
+			} else if( target instanceof MModelComponents ) {
+				return MODEL_COMPONENTS__COMPONENTS.observe(target);
+			} else if( target instanceof MModelComponent ) {
+				WritableList list = new WritableList();
+				list.add(new VirtualEntry<Object>( VIRTUAL_MENU, MODEL_COMPONENT__CHILDREN, target, "Menus") {
+
+					@Override
+					protected boolean accepted(Object o) {
+						return false;
+					}
+
+				});
+				list.add(new VirtualEntry<Object>( VIRTUAL_PART, MODEL_COMPONENT__CHILDREN, target, "Parts") {
+
+					@Override
+					protected boolean accepted(Object o) {
+						return o instanceof MPart;
+					}
+
+				});
+				return list;
+			} else if( target instanceof VirtualEntry<?> ) {
+				return ((VirtualEntry<?>)target).getList();
+			} else if( target instanceof MPart ) {
+				WritableList list = new WritableList();
+				list.add(new VirtualEntry<Object>( VIRTUAL_MENU, PART__MENUS, target, "Menus") {
+
+					@Override
+					protected boolean accepted(Object o) {
+						return true;
+					}
+
+				});
+
+				list.add(new VirtualEntry<Object>( VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, target, "Handlers") {
+
+					@Override
+					protected boolean accepted(Object o) {
+						return true;
+					}
+
+				});
+
+				list.add(new VirtualEntry<Object>( VIRTUAL_BINDING, BINDING_CONTAINER__BINDINGS, target, "Bindings") {
+
+					@Override
+					protected boolean accepted(Object o) {
+						return true;
+					}
+
+				});
+
+				return list;
+			}
+
+			// TODO Auto-generated method stub
+			return null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
new file mode 100644
index 0000000000..a045a7657b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.Diffs;
+import org.eclipse.core.databinding.observable.list.IListChangeListener;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.ListChangeEvent;
+import org.eclipse.core.databinding.observable.list.ListDiff;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.databinding.property.list.IListProperty;
+
+public abstract class VirtualEntry<M> {
+	private int id;
+	private Object originalParent;
+	private String label;
+	private IObservableList list;
+
+	public VirtualEntry(int id, IListProperty property, Object originalParent, String label) {
+		this.id = id;
+		this.originalParent = originalParent;
+		this.label = label;
+		this.list = new WritableList();
+		IObservableList origList = property.observe(originalParent);
+		list.addAll(cleanedList(origList));
+
+		origList.addListChangeListener(new IListChangeListener() {
+
+			public void handleListChange(ListChangeEvent event) {
+				List<Object> clean = cleanedList(event.getObservableList());
+				ListDiff diff = Diffs.computeListDiff(VirtualEntry.this.list, clean);
+				diff.applyTo(VirtualEntry.this.list);
+			}
+		});
+	}
+
+	private List<Object> cleanedList(IObservableList list) {
+		List<Object> l = new ArrayList<Object>(list.size());
+
+		for( Object o : list ) {
+			if( accepted((M) o) ) {
+				l.add(o);
+			}
+		}
+
+		return l;
+	}
+
+	protected abstract boolean accepted(M o);
+
+	public IObservableList getList() {
+		return list;
+	}
+
+	public Object getOriginalParent() {
+		return originalParent;
+	}
+
+	public int getId() {
+		return id;
+	}
+
+	@Override
+	public String toString() {
+		return label;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
new file mode 100644
index 0000000000..0e59ccdf8e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -0,0 +1,53 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class ApplicationEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private WritableValue master = new WritableValue();
+	private Image image;
+	private DataBindingContext context;
+
+	@Override
+	public Image getImage(Display display) {
+		if( image == null ) {
+			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/application.png"));
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel() {
+		return "Application";
+	}
+
+	@Override
+	public String getDescription() {
+		return "Application bla, bla, bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new DataBindingContext();
+			composite = createForm(parent,context, master);
+		}
+		master.setValue(object);
+		return composite;
+	}
+
+	protected Composite createForm(Composite parent, DataBindingContext context, IObservableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+
+		return parent;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
new file mode 100644
index 0000000000..0b7fe77d34
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -0,0 +1,151 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class ModelComponentEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private WritableValue master = new WritableValue();
+	private Image image;
+	private DataBindingContext context;
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new DataBindingContext();
+			composite = createForm(parent);
+		}
+		master.setValue(object);
+		return composite;
+	}
+
+	public void dispose() {
+		if( image != null ) {
+			image.dispose();
+			image = null;
+		}
+
+		if( composite != null ) {
+			composite.dispose();
+			composite = null;
+		}
+
+		if( context != null ) {
+			context.dispose();
+			context = null;
+		}
+	}
+
+	private Composite createForm(Composite parent) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IValueProperty textProp = WidgetProperties.text();
+
+		Label l = new Label(parent, SWT.NONE);
+		l.setText("Id");
+
+		Text t = new Text(parent, SWT.BORDER);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		t.setLayoutData(gd);
+		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));
+
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("Tags");
+
+		t = new Text(parent, SWT.BORDER);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		t.setLayoutData(gd);
+
+		l = new Label(parent, SWT.NONE);
+		ListViewer viewer = new ListViewer(parent);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		gd.heightHint = 130;
+		viewer.getList().setLayoutData(gd);
+
+
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("Parent-Id");
+
+		t = new Text(parent, SWT.BORDER);
+		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.MODEL_COMPONENT__PARENT_ID).observeDetail(master));
+
+		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+		b.setText("Find ...");
+
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("Position in Parent");
+
+		t = new Text(parent, SWT.BORDER);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		t.setLayoutData(gd);
+		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.MODEL_COMPONENT__POSITION_IN_PARENT).observeDetail(master));
+
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("Processor");
+
+		t = new Text(parent, SWT.BORDER);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		t.setLayoutData(gd);
+		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.MODEL_COMPONENT__PROCESSOR).observeDetail(master));
+
+		return parent;
+	}
+
+	@Override
+	public Image getImage(Display display) {
+		if( image == null ) {
+			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/package_go.png"));
+		}
+		return image;
+	}
+
+	@Override
+	public String getLabel() {
+		return "Model Component";
+	}
+
+	@Override
+	public String getDescription() {
+		return "The model component ... bla bla bla";
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
new file mode 100644
index 0000000000..3e036d7490
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
@@ -0,0 +1,51 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class ModelComponentsEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private WritableValue master = new WritableValue();
+	private Image image;
+	private DataBindingContext context;
+
+	@Override
+	public Image getImage(Display display) {
+		if( image == null ) {
+			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/application_view_icons.png"));
+		}
+		return image;
+	}
+
+	@Override
+	public String getLabel() {
+		return "Model Components";
+	}
+
+	@Override
+	public String getDescription() {
+		return "Some bla bla bla bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new DataBindingContext();
+			composite = createForm(parent);
+		}
+		master.setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent) {
+		parent = new Composite(parent, SWT.NONE);
+
+		return parent;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
new file mode 100644
index 0000000000..a4c5748a7e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -0,0 +1,37 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class PartDescriptorEditor extends PartEditor {
+
+	@Override
+	protected Composite createForm(Composite parent, DataBindingContext context, IObservableValue master) {
+		Composite comp = super.createForm(parent,context,master);
+
+		IValueProperty textProp = WidgetProperties.text();
+
+		Label l = new Label(parent, SWT.NONE);
+		l.setText("Label");
+
+		Text t = new Text(parent, SWT.BORDER);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		t.setLayoutData(gd);
+		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+
+		// ------------------------------------------------------------
+
+
+		return comp;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
new file mode 100644
index 0000000000..1dc0ae914c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -0,0 +1,206 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class PartEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private WritableValue master = new WritableValue();
+	private Image image;
+	private DataBindingContext context;
+
+	@Override
+	public Image getImage(Display display) {
+		if( image == null ) {
+			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/application_form.png"));
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel() {
+		return "Part Descriptor";
+	}
+
+	@Override
+	public String getDescription() {
+		return "Part Descriptor Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new DataBindingContext();
+			composite = createForm(parent,context, master);
+		}
+		master.setValue(object);
+		return composite;
+	}
+
+	protected Composite createForm(Composite parent, DataBindingContext context, IObservableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IValueProperty textProp = WidgetProperties.text();
+
+		Label l = new Label(parent, SWT.NONE);
+		l.setText("Id");
+
+		Text t = new Text(parent, SWT.BORDER);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		t.setLayoutData(gd);
+		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));
+
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("Tags");
+
+		t = new Text(parent, SWT.BORDER);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		t.setLayoutData(gd);
+
+		l = new Label(parent, SWT.NONE);
+		ListViewer viewer = new ListViewer(parent);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		gd.heightHint = 80;
+		viewer.getList().setLayoutData(gd);
+
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("Label");
+
+		t = new Text(parent, SWT.BORDER);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		t.setLayoutData(gd);
+		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("Tooltip");
+
+		t = new Text(parent, SWT.BORDER);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		t.setLayoutData(gd);
+		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("Icon URI");
+
+		t = new Text(parent, SWT.BORDER);
+		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+
+		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+		b.setText("Find ...");
+
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("Class URI");
+
+		t = new Text(parent, SWT.BORDER);
+		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
+
+		b = new Button(parent, SWT.PUSH|SWT.FLAT);
+		b.setText("Find ...");
+
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("Variables");
+
+		t = new Text(parent, SWT.BORDER);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		t.setLayoutData(gd);
+
+		l = new Label(parent, SWT.NONE);
+		viewer = new ListViewer(parent);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		gd.heightHint = 80;
+		viewer.getList().setLayoutData(gd);
+
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("Properties");
+
+		t = new Text(parent, SWT.BORDER);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		t.setLayoutData(gd);
+
+		l = new Label(parent, SWT.NONE);
+		TableViewer tableviewer = new TableViewer(parent);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		gd.heightHint = 80;
+		tableviewer.getTable().setHeaderVisible(true);
+		tableviewer.getControl().setLayoutData(gd);
+
+		TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
+		column.getColumn().setText("Key");
+		column.getColumn().setWidth(200);
+
+		column = new TableViewerColumn(tableviewer, SWT.NONE);
+		column.getColumn().setText("Value");
+		column.getColumn().setWidth(200);
+
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("");
+
+		Composite booleanContainer = new Composite(parent,SWT.NONE);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		booleanContainer.setBackgroundMode(SWT.INHERIT_DEFAULT);
+		booleanContainer.setLayoutData(gd);
+		booleanContainer.setLayout(new GridLayout(4,false));
+
+		Button checkbox = new Button(booleanContainer, SWT.CHECK);
+		checkbox.setText("to render");
+
+		checkbox = new Button(booleanContainer, SWT.CHECK);
+		checkbox.setText("on Top");
+
+		checkbox = new Button(booleanContainer, SWT.CHECK);
+		checkbox.setText("visible");
+
+		checkbox = new Button(booleanContainer, SWT.CHECK);
+		checkbox.setText("closeable");
+
+		return parent;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbe/ExtensionModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbe/ExtensionModelEditor.java
new file mode 100644
index 0000000000..34636af5e0
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbe/ExtensionModelEditor.java
@@ -0,0 +1,5 @@
+package org.eclipse.e4.tools.emf.ui.internal.wbe;
+
+public class ExtensionModelEditor {
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
new file mode 100644
index 0000000000..d140e5bddf
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -0,0 +1,16 @@
+package org.eclipse.e4.tools.emf.ui.internal.wbm;
+
+import javax.inject.Inject;
+
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.swt.widgets.Composite;
+
+public class ApplicationModelEditor extends ModelEditor {
+	@Inject
+	public ApplicationModelEditor(Composite composite,
+			IModelResource modelProvider) {
+		super(composite, modelProvider);
+	}
+
+}

From ce8afad6b956a9a7fe3d535b46c088ddec4d64c3 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 3 Mar 2010 22:42:00 +0000
Subject: [PATCH 0002/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * more editor dummies

---
 .../icons/application_xp.png                  | Bin 0 -> 426 bytes
 .../component/AbstractComponentEditor.java    |   9 +-
 .../emf/ui/internal/ShadowComposite.java      |  11 ++
 .../common/ComponentLabelProvider.java        |  83 +++++-------
 .../emf/ui/internal/common/ModelEditor.java   | 100 ++++----------
 .../common/component/ApplicationEditor.java   |  74 ++++++++++-
 .../common/component/BindingEditor.java       |  72 ++++++++++
 .../common/component/CommandEditor.java       |  72 ++++++++++
 .../common/component/HandlerEditor.java       |  72 ++++++++++
 .../component/ModelComponentEditor.java       |  43 +++++-
 .../component/ModelComponentsEditor.java      |  31 ++++-
 .../component/PartDescriptorEditor.java       |  10 ++
 .../internal/common/component/PartEditor.java |  65 ++++++++-
 .../common/component/WindowEditor.java        | 124 ++++++++++++++++++
 .../ui/internal/wbe/ExtensionModelEditor.java |  10 ++
 .../internal/wbm/ApplicationModelEditor.java  |  10 ++
 16 files changed, 654 insertions(+), 132 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/application_xp.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/application_xp.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/application_xp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d22860a3166820b8fdad71c6505a40580af14b2f
GIT binary patch
literal 426
zcmV;b0agBqP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzJV``BR5;6}
zQ$0%qQ4pNdrydDtV<-NCYedUb{tdCPu=N-C18l7&rJx`-VrL^(7HYsw5W6%&1OtA=
zI5QUayi4GUoGvU23$r^jZ(m{?|B0}7`gAongVmRJH*EkCECB{+!ZKvRBxJ)RC}Dnf
z`1UdIT`<sE&lacdy94w;Rk>wtp^MwsrC67-bFzu!t;6Q^%|k2MJ$kfh*aj@vhNOIJ
zWFxBVQIH79u!vw98!Ll~y$OKnm}QK5wtxPNU<+B6{mDR{T_7M%l&baHE>bEbHX04+
zn+OzZ0e^b{APT{9E#RmJ5)l*`)B%<Qgy5)M(!{_q24v2F<ix;Y0F7Yg4AL~M{fw3n
zB%#ykAWhRkhNLk@Rq}eh9%LgV9<~oIhudNw;s`L-{DkwfHC>#z1i)YI<iFqf2ekQ!
U`6iZuNdN!<07*qoM6N<$g3V&DDF6Tf

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 24ba71f6bd..57c8e600ab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common.component;
 
+import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -17,7 +18,11 @@
 public abstract class AbstractComponentEditor {
 //	public abstract boolean canHandle(Object object);
 	public abstract Image getImage(Display display);
-	public abstract String getLabel();
-	public abstract String getDescription();
+	public abstract String getLabel(Object element);
+	public abstract String getDetailLabel(Object element);
+
+	public abstract String getDescription(Object element);
 	public abstract Composite getEditor(Composite parent, Object object);
+	public abstract IObservableList getChildList(Object element);
+
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java
index ed5f6137eb..af103a6432 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ * 	   IBM Corporation - initial API and implementation
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index 2030f986bc..e6b497f55b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -10,10 +10,12 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.MModelComponent;
 import org.eclipse.e4.ui.model.application.MModelComponents;
 import org.eclipse.e4.ui.model.application.MPart;
 import org.eclipse.e4.ui.model.application.MPartDescriptor;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.ViewerCell;
@@ -30,33 +32,41 @@ public class ComponentLabelProvider extends StyledCellLabelProvider {
 	private Image partImage;
 	private Image partDescriptorImage;
 
+	private ModelEditor editor;
+
+	public ComponentLabelProvider(ModelEditor editor) {
+		this.editor = editor;
+	}
+
 	@Override
     public void update(final ViewerCell cell) {
-		if( cell.getElement() instanceof MModelComponents ) {
-			cell.setText("Model Components");
-			if( modelComponentsImage == null ) {
-				modelComponentsImage = new Image(cell.getControl().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/application_view_icons.png"));
-			}
-			cell.setImage(modelComponentsImage);
-		} else if( cell.getElement() instanceof MModelComponent ) {
-			MModelComponent m = (MModelComponent) cell.getElement();
-			StyledString styledString = new StyledString("Model Component", null);
-			String decoration = " - " + m.getParentID();
-			Styler styler = new Styler() {
+		if( cell.getElement() instanceof EObject ) {
 
-				@Override
-				public void applyStyles(TextStyle textStyle) {
-					textStyle.foreground = cell.getControl().getDisplay().getSystemColor(SWT.COLOR_GRAY);
-				}
-			};
+			EObject o = (EObject) cell.getElement();
+			AbstractComponentEditor elementEditor = editor.getEditor(o.eClass());
+			if( elementEditor != null ) {
+				String label = elementEditor.getLabel(o);
+				String detailText = elementEditor.getDetailLabel(o);
+				if( detailText == null ) {
+					cell.setText(label);
+				} else {
+					StyledString styledString = new StyledString(label, null);
+					Styler styler = new Styler() {
+
+						@Override
+						public void applyStyles(TextStyle textStyle) {
+							textStyle.foreground = cell.getControl().getDisplay().getSystemColor(SWT.COLOR_GRAY);
+						}
+					};
 
-	        styledString.append(decoration, styler);
-			cell.setText(styledString.getString());
-			cell.setStyleRanges(styledString.getStyleRanges());
-			if( modelComonentImage == null ) {
-				modelComonentImage = new Image(cell.getControl().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/package_go.png"));
+			        styledString.append(" - " + detailText, styler);
+					cell.setText(styledString.getString());
+					cell.setStyleRanges(styledString.getStyleRanges());
+				}
+				cell.setImage(elementEditor.getImage(cell.getControl().getDisplay()));
+			} else {
+				cell.setText(cell.getElement().toString());
 			}
-			cell.setImage(modelComonentImage);
 		} else if( cell.getElement() instanceof VirtualEntry<?> ) {
 			String s = cell.getElement().toString();
 			cell.setText(s);
@@ -71,35 +81,6 @@ public void applyStyles(TextStyle textStyle) {
 				}
 				cell.setImage(menusImage);
 			}
-		} else if( cell.getElement() instanceof MPart ) {
-			MPart part = (MPart) cell.getElement();
-			String label;
-			if( cell.getElement() instanceof MPartDescriptor ) {
-				label = "Part Descriptor";
-				if( partDescriptorImage == null ) {
-					partDescriptorImage = new Image(cell.getControl().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/application_form_edit.png"));
-				}
-				cell.setImage(partImage);
-			} else {
-				label = "Part";
-				if( partImage == null ) {
-					partImage = new Image(cell.getControl().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/application_form.png"));
-				}
-				cell.setImage(partImage);
-			}
-			StyledString styledString = new StyledString(label, null);
-			String decoration = " - " + part.getLabel();
-			Styler styler = new Styler() {
-
-				@Override
-				public void applyStyles(TextStyle textStyle) {
-					textStyle.foreground = cell.getControl().getDisplay().getSystemColor(SWT.COLOR_GRAY);
-				}
-			};
-
-	        styledString.append(decoration, styler);
-	        cell.setText(styledString.getString());
-			cell.setStyleRanges(styledString.getStyleRanges());
 		} else {
 			cell.setText(cell.getElement()+"");
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index dee4839762..ebb125c65f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -17,22 +17,20 @@
 
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ApplicationEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.BindingEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.CommandEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.HandlerEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ModelComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ModelComponentsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PartDescriptorEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PartEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MModelComponent;
-import org.eclipse.e4.ui.model.application.MModelComponents;
-import org.eclipse.e4.ui.model.application.MPart;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.viewers.ObservableListTreeContentProvider;
@@ -51,10 +49,12 @@
 import org.eclipse.swt.widgets.Label;
 
 public class ModelEditor {
-	private static final int VIRTUAL_MENU = 1;
-	private static final int VIRTUAL_PART = 2;
-	private static final int VIRTUAL_HANDLER = 3;
-	private static final int VIRTUAL_BINDING = 4;
+	public static final int VIRTUAL_MENU    = 1;
+	public static final int VIRTUAL_PART    = 2;
+	public static final int VIRTUAL_HANDLER = 3;
+	public static final int VIRTUAL_BINDING = 4;
+	public static final int VIRTUAL_COMMAND = 5;
+	public static final int VIRTUAL_WINDOWS = 6;
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 //	private List<AbstractComponentEditor> editors = new ArrayList<AbstractComponentEditor>();
@@ -73,6 +73,8 @@ public ModelEditor(Composite composite, IModelResource modelProvider) {
 
 		Composite parent = new Composite(form,SWT.NONE);
 		parent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+		parent.setBackgroundMode(SWT.INHERIT_DEFAULT);
+//		parent.setData("org.eclipse.e4.ui.css.CssClassName","contentContainer");
 		FillLayout l = new FillLayout();
 		l.marginWidth=5;
 		parent.setLayout(l);
@@ -83,7 +85,7 @@ public ModelEditor(Composite composite, IModelResource modelProvider) {
 		gl.marginHeight=0;
 		editingArea.setLayout(gl);
 		editingArea.setBackgroundMode(SWT.INHERIT_DEFAULT);
-		editingArea.setData("org.eclipse.e4.ui.css.CssClassName","contentContainer");
+//		editingArea.setData("org.eclipse.e4.ui.css.CssClassName","contentContainer");
 
 		Composite headerContainer = new Composite(editingArea,SWT.NONE);
 		headerContainer.setBackgroundMode(SWT.INHERIT_DEFAULT);
@@ -112,7 +114,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 						EObject obj = (EObject) s.getFirstElement();
 						AbstractComponentEditor editor = editorMap.get(obj.eClass());
 						if( editor != null ) {
-							textLabel.setText(editor.getLabel());
+							textLabel.setText(editor.getLabel(obj));
 							iconLabel.setImage(editor.getImage(iconLabel.getDisplay()));
 							Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
 							comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
@@ -136,7 +138,7 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		ShadowComposite editingArea = new ShadowComposite(parent,SWT.NONE);
 		editingArea.setLayout(new FillLayout());
 		TreeViewer viewer = new TreeViewer(editingArea);
-		viewer.setLabelProvider(new ComponentLabelProvider());
+		viewer.setLabelProvider(new ComponentLabelProvider(this));
 		ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(
 				new ObservableFactoryImpl(), new TreeStructureAdvisorImpl());
 		viewer.setContentProvider(contentProvider);
@@ -151,82 +153,38 @@ private void registerDefaultEditors() {
 		registerEditor( MApplicationPackage.Literals.MODEL_COMPONENT, new ModelComponentEditor());
 		registerEditor( MApplicationPackage.Literals.PART, new PartEditor());
 		registerEditor( MApplicationPackage.Literals.PART_DESCRIPTOR, new PartDescriptorEditor());
+		registerEditor( MApplicationPackage.Literals.KEY_BINDING, new BindingEditor());
+		registerEditor( MApplicationPackage.Literals.HANDLER, new HandlerEditor());
+		registerEditor( MApplicationPackage.Literals.COMMAND,new CommandEditor());
+		registerEditor( MApplicationPackage.Literals.WINDOW, new WindowEditor());
 	}
 
 	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
 		editorMap.put(eClass, editor);
 	}
 
+	public AbstractComponentEditor getEditor(EClass eClass) {
+		return editorMap.get(eClass);
+	}
+
 	private static class TreeStructureAdvisorImpl extends TreeStructureAdvisor {
 
 	}
 
-	private static class ObservableFactoryImpl implements IObservableFactory {
-		private IListProperty MODEL_COMPONENTS__COMPONENTS = EMFProperties.list(MApplicationPackage.Literals.MODEL_COMPONENTS__COMPONENTS);
-		private IListProperty MODEL_COMPONENT__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.MODEL_COMPONENT__CHILDREN);
-		private IListProperty PART__MENUS = EMFProperties.list(MApplicationPackage.Literals.PART__MENUS);
-		private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
-		private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS);
+	private class ObservableFactoryImpl implements IObservableFactory {
 
 		public IObservable createObservable(Object target) {
 			if( target instanceof IObservableList ) {
 				return (IObservable) target;
-			} else if( target instanceof MModelComponents ) {
-				return MODEL_COMPONENTS__COMPONENTS.observe(target);
-			} else if( target instanceof MModelComponent ) {
-				WritableList list = new WritableList();
-				list.add(new VirtualEntry<Object>( VIRTUAL_MENU, MODEL_COMPONENT__CHILDREN, target, "Menus") {
-
-					@Override
-					protected boolean accepted(Object o) {
-						return false;
-					}
-
-				});
-				list.add(new VirtualEntry<Object>( VIRTUAL_PART, MODEL_COMPONENT__CHILDREN, target, "Parts") {
-
-					@Override
-					protected boolean accepted(Object o) {
-						return o instanceof MPart;
-					}
-
-				});
-				return list;
 			} else if( target instanceof VirtualEntry<?> ) {
 				return ((VirtualEntry<?>)target).getList();
-			} else if( target instanceof MPart ) {
-				WritableList list = new WritableList();
-				list.add(new VirtualEntry<Object>( VIRTUAL_MENU, PART__MENUS, target, "Menus") {
-
-					@Override
-					protected boolean accepted(Object o) {
-						return true;
-					}
-
-				});
-
-				list.add(new VirtualEntry<Object>( VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, target, "Handlers") {
-
-					@Override
-					protected boolean accepted(Object o) {
-						return true;
-					}
-
-				});
-
-				list.add(new VirtualEntry<Object>( VIRTUAL_BINDING, BINDING_CONTAINER__BINDINGS, target, "Bindings") {
-
-					@Override
-					protected boolean accepted(Object o) {
-						return true;
-					}
-
-				});
-
-				return list;
+			} else {
+				AbstractComponentEditor editor = editorMap.get(((EObject)target).eClass());
+				if( editor != null ) {
+					return editor.getChildList(target);
+				}
 			}
 
-			// TODO Auto-generated method stub
 			return null;
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 0e59ccdf8e..029aac4ac7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -1,9 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
@@ -15,6 +32,11 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private Image image;
 	private DataBindingContext context;
 
+	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
+	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS);
+	private IListProperty APPLICATION__COMMANDS = EMFProperties.list(MApplicationPackage.Literals.APPLICATION__COMMANDS);
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+
 	@Override
 	public Image getImage(Display display) {
 		if( image == null ) {
@@ -25,12 +47,12 @@ public Image getImage(Display display) {
 	}
 
 	@Override
-	public String getLabel() {
+	public String getLabel(Object element) {
 		return "Application";
 	}
 
 	@Override
-	public String getDescription() {
+	public String getDescription(Object element) {
 		return "Application bla, bla, bla";
 	}
 
@@ -50,4 +72,52 @@ protected Composite createForm(Composite parent, DataBindingContext context, IOb
 		return parent;
 	}
 
+	@Override
+	public IObservableList getChildList(Object element) {
+		WritableList list = new WritableList();
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, "Handlers") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING, BINDING_CONTAINER__BINDINGS, element, "Bindings") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_COMMAND, APPLICATION__COMMANDS, element, "Commands") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_WINDOWS, ELEMENT_CONTAINER__CHILDREN, element, "Windows") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
+		return list;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingEditor.java
new file mode 100644
index 0000000000..35a44c2d7e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingEditor.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class BindingEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private WritableValue master = new WritableValue();
+	private Image image;
+	private DataBindingContext context;
+
+	@Override
+	public Image getImage(Display display) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Binding";
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Binding bla bla bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new DataBindingContext();
+			composite = createForm(parent,context, master);
+		}
+		master.setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, DataBindingContext context2,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
new file mode 100644
index 0000000000..ee262cf8f9
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class CommandEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private WritableValue master = new WritableValue();
+	private Image image;
+	private DataBindingContext context;
+
+	@Override
+	public Image getImage(Display display) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Command";
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Command bla bla bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new DataBindingContext();
+			composite = createForm(parent,context, master);
+		}
+		master.setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, DataBindingContext context2,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
new file mode 100644
index 0000000000..500dcc94d0
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class HandlerEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private WritableValue master = new WritableValue();
+	private Image image;
+	private DataBindingContext context;
+
+	@Override
+	public Image getImage(Display display) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Handler";
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Handler bla bla bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new DataBindingContext();
+			composite = createForm(parent,context, master);
+		}
+		master.setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, DataBindingContext context2,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index 0b7fe77d34..ffde3a8e5d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -11,10 +11,18 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MMenu;
+import org.eclipse.e4.ui.model.application.MModelComponent;
+import org.eclipse.e4.ui.model.application.MPart;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.viewers.ListViewer;
@@ -34,6 +42,8 @@ public class ModelComponentEditor extends AbstractComponentEditor {
 	private Image image;
 	private DataBindingContext context;
 
+	private IListProperty MODEL_COMPONENT__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.MODEL_COMPONENT__CHILDREN);
+
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
 		if( composite == null ) {
@@ -140,12 +150,41 @@ public Image getImage(Display display) {
 	}
 
 	@Override
-	public String getLabel() {
+	public String getLabel(Object element) {
 		return "Model Component";
 	}
 
 	@Override
-	public String getDescription() {
+	public String getDescription(Object element) {
 		return "The model component ... bla bla bla";
 	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		WritableList list = new WritableList();
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MENU, MODEL_COMPONENT__CHILDREN, element, "Menus") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return o instanceof MMenu;
+			}
+
+		});
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART, MODEL_COMPONENT__CHILDREN, element, "Parts") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return o instanceof MPart;
+			}
+
+		});
+		return list;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		MModelComponent o = (MModelComponent) element;
+		return "parentId: " + o.getParentID();
+	}
+
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
index 3e036d7490..5c91d8b0d2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
@@ -1,14 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 public class ModelComponentsEditor extends AbstractComponentEditor {
+	private IListProperty MODEL_COMPONENTS__COMPONENTS = EMFProperties.list(MApplicationPackage.Literals.MODEL_COMPONENTS__COMPONENTS);
+
 	private Composite composite;
 	private WritableValue master = new WritableValue();
 	private Image image;
@@ -23,12 +39,12 @@ public Image getImage(Display display) {
 	}
 
 	@Override
-	public String getLabel() {
+	public String getLabel(Object element) {
 		return "Model Components";
 	}
 
 	@Override
-	public String getDescription() {
+	public String getDescription(Object element) {
 		return "Some bla bla bla bla";
 	}
 
@@ -48,4 +64,15 @@ private Composite createForm(Composite parent) {
 		return parent;
 	}
 
+	@Override
+	public IObservableList getChildList(Object element) {
+		return MODEL_COMPONENTS__COMPONENTS.observe(element);
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index a4c5748a7e..03852d09fa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import org.eclipse.core.databinding.DataBindingContext;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 1dc0ae914c..9c964cd837 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -1,11 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MPart;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.viewers.ListViewer;
@@ -27,6 +43,11 @@ public class PartEditor extends AbstractComponentEditor {
 	private Image image;
 	private DataBindingContext context;
 
+	private IListProperty PART__MENUS = EMFProperties.list(MApplicationPackage.Literals.PART__MENUS);
+	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
+	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS);
+
+
 	@Override
 	public Image getImage(Display display) {
 		if( image == null ) {
@@ -37,12 +58,12 @@ public Image getImage(Display display) {
 	}
 
 	@Override
-	public String getLabel() {
+	public String getLabel(Object element) {
 		return "Part Descriptor";
 	}
 
 	@Override
-	public String getDescription() {
+	public String getDescription(Object element) {
 		return "Part Descriptor Bla Bla Bla Bla";
 	}
 
@@ -203,4 +224,44 @@ protected Composite createForm(Composite parent, DataBindingContext context, IOb
 
 		return parent;
 	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		WritableList list = new WritableList();
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MENU, PART__MENUS, element, "Menus") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, "Handlers") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING, BINDING_CONTAINER__BINDINGS, element, "Bindings") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
+		return list;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		MPart o = (MPart) element;
+		return o.getLabel();
+	}
+
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
new file mode 100644
index 0000000000..764933ebe0
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -0,0 +1,124 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MWindow;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class WindowEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private WritableValue master = new WritableValue();
+	private Image image;
+	private DataBindingContext context;
+
+	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
+	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS);
+	private IListProperty APPLICATION__COMMANDS = EMFProperties.list(MApplicationPackage.Literals.APPLICATION__COMMANDS);
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+
+
+	@Override
+	public Image getImage(Display display) {
+		if( image == null ) {
+			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/application_xp.png"));
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Window";
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Window bla bla bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new DataBindingContext();
+			composite = createForm(parent,context, master);
+		}
+		master.setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, DataBindingContext context2,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		WritableList list = new WritableList();
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, "Handlers") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING, BINDING_CONTAINER__BINDINGS, element, "Bindings") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_COMMAND, APPLICATION__COMMANDS, element, "Commands") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_WINDOWS, ELEMENT_CONTAINER__CHILDREN, element, "Controls") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
+		return list;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return ((MWindow)element).getLabel();
+	}
+
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbe/ExtensionModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbe/ExtensionModelEditor.java
index 34636af5e0..6ddbfedab2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbe/ExtensionModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbe/ExtensionModelEditor.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.wbe;
 
 public class ExtensionModelEditor {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index d140e5bddf..ea7dfd9e39 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.wbm;
 
 import javax.inject.Inject;

From edfa9bb068d21842ace6d15f2b878924eb329d04 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 4 Mar 2010 22:03:16 +0000
Subject: [PATCH 0003/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * more editor dummies

---
 .../icons/application_osx.png                 | Bin 0 -> 487 bytes
 .../icons/application_tile_horizontal.png     | Bin 0 -> 432 bytes
 .../icons/application_tile_vertical.png       | Bin 0 -> 492 bytes
 .../icons/brick.png                           | Bin 0 -> 452 bytes
 .../icons/brick_go.png                        | Bin 0 -> 790 bytes
 .../icons/brick_link.png                      | Bin 0 -> 764 bytes
 .../icons/lightning_go.png                    | Bin 0 -> 739 bytes
 .../icons/link.png                            | Bin 0 -> 343 bytes
 .../org.eclipse.e4.tools.emf.ui/icons/tab.png | Bin 0 -> 323 bytes
 .../component/AbstractComponentEditor.java    |   3 +-
 .../common/ComponentLabelProvider.java        |   7 +-
 .../emf/ui/internal/common/ModelEditor.java   |  17 +++-
 .../common/component/ApplicationEditor.java   |   4 +-
 .../common/component/BindingEditor.java       |   9 +-
 .../common/component/CommandEditor.java       |   9 +-
 .../component/DirectToolItemEditor.java       |  37 ++++++++
 .../component/HandledToolItemEditor.java      |  37 ++++++++
 .../common/component/HandlerEditor.java       |   8 +-
 .../component/ModelComponentEditor.java       |   2 +-
 .../component/ModelComponentsEditor.java      |   2 +-
 .../internal/common/component/PartEditor.java |   2 +-
 .../component/PartSashContainerEditor.java    |  81 ++++++++++++++++++
 .../common/component/PartStackEditor.java     |  68 +++++++++++++++
 .../common/component/ToolBarEditor.java       |  66 ++++++++++++++
 .../common/component/ToolItemEditor.java      |  75 ++++++++++++++++
 .../common/component/WindowEditor.java        |   2 +-
 .../common/component/WindowTrimEditor.java    |  67 +++++++++++++++
 27 files changed, 472 insertions(+), 24 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/application_osx.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/application_tile_horizontal.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/application_tile_vertical.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/brick.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/brick_go.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/brick_link.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/lightning_go.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/link.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/tab.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/application_osx.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/application_osx.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f022ece86d73715c7e45c6702c1c87560b8ba23
GIT binary patch
literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzc}YY;R5;6}
zlQC<QK@f(Yz1zD)@Qj6m!Ne*eYNNj(c2+j|0iuX?TCvo^PAt;I#zMOg!T(?@SSdn+
zXk+i4<hz}BW-Y#4E@@)U3=Ffd`@Hiq%%)l^r-}UL-PY#v(&EG1>-B1Y!m%PGQ6x$c
z#f<UT+FFcKjJ>9@AK!Oh=jElv$CqBcNDKEr@t}K+jhk=(*)=6Nf9`DW>GPMDbI$#A
zadnmXt6lDNZUb<A<;t-FUw3}e?RIeYl+DGjyKBH2_keLJeEzZnfaI77xnpu9N8Z+N
zyMasO8o{j_EB`gX?e`xpWGMjHYsNFdXXfXK8f13|V6NXk@}Sn*CY6Zx>=D%3-T`<7
zxtL}GCkYVlWRqqF51NHf9Yl>2gOi8|vh54F$BDrs0>$iLAcx_0<I=GLHG(`EjfPFr
z41N#)5E1(V(@7t8Gci=D^m7LfS6YAaY<)0Tcm$n6aZR^RLT1PfNw^tu$7O^&W;TrQ
dkLk4E`7e4?Wu<Lp$36f6002ovPDHLkV1iE=;2;11

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/application_tile_horizontal.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/application_tile_horizontal.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a1191c389aafecbb9493f14f13de25e34f36f71
GIT binary patch
literal 432
zcmV;h0Z;ykP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzLP<nHR5;6}
zQ?W_|K@^-^u1SLU1%813LBK+=w6PLfNtq9@vJ)j@C0JV<u+&EJ7X%9fDhfu#h{$=#
z#oOC`Z!EF_o4vwJ_1JmLn|ZriA&FTKw+^n_tIfqulCv?)GN@BnRm{gWyXg(iSDH&}
zUq5V!0%?-KieRp4v)jA3?bH4B<I2hPtJLeYXljHclmH0~M`P3*HK+ngf&`S4`k{BP
zhwbHRJhqIo@3ANUG%2AZQj_@_5Pzl$jB<$p07n-u3}Nr=Imm78UXmmtQ4KE0i3GXA
zS^z*KQX=5OoXx#J;mW4Cu(+9UQR$QtaW{=nHpP}XaNdD2MX<@_CM<4@k5H853`bD$
z4vIql6=8aNasTnD+v?;SVjYsf2b?&l6No6N>~HSm3sN|U6QrN-pa}fa=>kAy*54Rm
aM*ISgWgjfIBP3%00000<MNUMnLSTZ^J-I6Y

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/application_tile_vertical.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/application_tile_vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d40383d318918be19242b3274652567b3f0bc98
GIT binary patch
literal 492
zcmV<I0Tcd-P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzen~_@R5;6>
zld)=4K@^6+dv{}4Y=qQeVU@}tM6j^36YGGDjg6qBwU$%~R)ORVZ1Ms&K0^u{3%3Y@
zASi3DyPIt8obw-xdy|`4NnAWIGt8O8$DIG4DI$UwJ0D*?ez>}QJd2wWgoGrLH>*j=
z98)mhgioKpzkdJr=^j8I;L-Z(Zf|K&t}H=B5I{sb07Vc1ist;z*mi*qFilZT>JuWO
zErKAB$a3eP@ytuw=mWR~n@?`DXuN!PL<TVTD~lrlx)%Dqf;y!fP*vkA0Yw2&P!v$K
zx$4L0;=BY%*W4h3wQDlZZ*VmHdbt1L*8N|n;0ol9TqJYcg~{>cxWsZyk?Al4tUtK7
z)>|I1a-*~AvhwpT{I2S?3@|=ZS<NO$mpzZa_W@EcowqS1vGwfk!ZvQa`I3uhcD;z*
z%Zx_EWI4cH|5m@7@UyvhaQt($n1!v6lWLR$z72;5&$nh9ZiXkvQfhu*T_bPolN(_o
iSq;I#1^B$L|BXMFZyy3&b-lL$0000<MNUMnLSTZI#oBKG

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/brick.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/brick.png
new file mode 100644
index 0000000000000000000000000000000000000000..7851cf34c946e5667221e3478668503eb1cd733f
GIT binary patch
literal 452
zcmV;#0XzPQP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzR!KxbR2Ufr
z!9Pe;0RRW!@7<lIl3o%R*`Lh}3L0v44WhBhrLn=H)^JZ~X)lPPp*Ym3y&;EiD#3^_
z;}R2s(2l&aJKy{DeMJDQEOc(}O)|dId@(Z*AR=OUqSZ^1Bx&_tPDVr&v9i#a-8-w+
zG-X<R@>Pdwe5?6tW?r-ok|b$oDQj8FV%kZPq;(MWOV8?8;<)(iP}>h<N+(r5>NMU>
z7fbz%jjlr7h8uuoQ~J6}n}@Y@PdTk=)PxO{%7zmL?dchpZX*~n;I{!C>*(8cU;q(~
zAS%Po_@naEU!xidrBXD?;hN|x^%W|Ij)0y*r5vi|?W&Fub(NqJ@z0o=O<Ao~*SBxI
z`SL+wOarB!5l6MHf7`vAYen#UBKI<P{@6LCZG|0M`+1T_cfL~u@bp6FGkdxCW!wI8
u9^8Hp6am2FtGS=SJe+$CKoI}{0Kk9KAGswB^FYP`0000<MNUMnLSTXd=EXk%

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/brick_go.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/brick_go.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe0d33567d26b77787d8d6dc4be92f8f2d6b75db
GIT binary patch
literal 790
zcmV+x1L^#UP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!s7XXYR5;6Z
zQ(Z`tQ5ZfEM3>zp{gHSP{di*#8D&?(h#;bi2r7yUe@M_9Z^R^1th67Ma+}U=ey(q{
z%~>)Q;cRVlbJ5&n%2W)U;$S+(K9zyBt*3JiDKhoI1BdsV_j#W8ea|5PNIG0D*E5U7
z66xyd`pdxfEVk3#Z2_~{oMA8+{vd6!m|m|xvLnHN#V}P%QJ}ZC7h_{%NTpIpCX*N)
z9py20#_q7Y8;&>uWnbT_HZwDW?(S{`gFz0H$;4x6j@CIrPfw4Q0-;cdD>8V!URbSG
z=yW;`wr4TsCXq;BWMl*^N3B-t2~|o=OiaM<_ahJpa7Ct`zBU{U4GqERbi!`8L#0wB
z2(>4zt*v2UVF6Q9Q<$Ef2CWa1larf{*nVJO0ORB1u-R-J!^6X9Z*P}~(P-oZD=RBl
zUS7uR>@2tI^Z7P=z*NiL=b=!07GJ;F;BYv&+qSkgi8YWDNRou5r6t5-F+?H}uF6Vt
zyWL!|xHA_|Ew^z?c?$jZJ}#hCDkVZ^`#T<wV|8^E(P)$>hr?l%i<eQRyMPkm917Gq
zc>M7ujJ_6Bn65+CbO^3N2U=TO*NG^KHr9~2xj9}2BVoNL)#c(-Kn}D29Z&q=YesW_
z1q5#+N<<mXKi`j6ZyP*>j%go#9EE}){AAsopP$F#;vyc>dRg+DzH&5tDMkI~BGgzO
zpw?OprK=8iJM(bj2}y1~Nv&3!q0wmS>1=;_JRaOpord8@GsN$&Aq+M`<9R_z9zo%%
zMUi*~S=A(Vw36g(`wJZ%9oclg;tfR>uC^RQep3c6y*z+>+KZ4oYfzw*A+wr94_A^i
zJAS4O&<@KK3WZ%Rm%C}Ru4UKliQgCUky%9|H2LJNzi~HE%kkq?dvUOmWNnTA1HB~u
UMVP_&o&W#<07*qoM6N<$f>=0SnE(I)

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/brick_link.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/brick_link.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ebf013a23a56653655a736a7e149deb7365ea03
GIT binary patch
literal 764
zcmV<Y0t5YtP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!j!8s8R5;6R
zQq4=^Q55~b!2Ag<W<3P62<AVC7)g*?REu`A(sFPWZK_2?9|KY?Dk3XVN)jw9B3evR
z^aU<T#iERcK19Qmte-!p$x=J>&SR3v>A``^efOSo-hEdApp;^Jd;9y!%1UfzX6Bh-
z%-mbG|0Na{7Ruai_Y+DEb1s+b!<z(u6)%KZK>*9k%Q!whMxjtZKA*?o;i1g&jy0@(
zaU=-@d-h+o%gal6JRXEXA&L3<d6_G5l$8XFi;E5c9334=MZ)LvVRdyCPN!3XF>`d2
z%jIxzZ~*p9O-;EJp_Ds0If38rM<5W8ic~K>FOK&2_p!CLg^i63OioVb6k$)zWHLx3
z5;!|M!}<9+#QSi1dRlbEcxPt^;cysUuU8@%3}RwpLRIGG<|IKnoyP6$Eh3SKw7a*r
zSDXP=IYc&YZf;7@?fCe($^l9ORaJ3wbAx0uiC8QqRr$2t-Cfy8%XCI3B%pxJW>XdM
zw~zPt_s}#A@pxQ5Ly)4szaMtH9lgE1SXx@b+S(fW`ub$fYPE8J7#bSNDzme*Ub07{
zQKV8SjEs!%0@v5ql8ggm!@$6Rbi^E8vBqpRM-}l+@5OSMrl+TWj*gC^qoV@>u{fQb
zov5v?g~?>X@bEC&+uLPaQ&Ypn-y~^mZA}+f(&2EFH8eE%dU|@ENpN*_1-)L6_4Rc*
zFuq@`IjX9vp1QiaK9ZojyZhnQURP99d=u;%37VRkpwsD4U0sd3x;hEQB&e^i|3QN0
z=H|Os1fRqaw!?#igLmS4HE!G3*ce(`TF}<kCS&HrU5YiVeML}SUjDAKvhuURV7M?E
ujlV1w%Y(pUV`Jl2fiEJ~nByI5So;SIr}_C=u4<M50000<MNUMnLSTaX=VJK)

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/lightning_go.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/lightning_go.png
new file mode 100644
index 0000000000000000000000000000000000000000..29039e6a8b40f6ed99cae87f21ea8bf7650f265b
GIT binary patch
literal 739
zcmV<90v!E`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!bxA})R5;6}
zQr%0_VHAG$;bzlW%1VhfF<T-^MK?xK7LrolR75ux-F6xD0TI<j;Y|en2@wR{L}JuM
zBxq=A<&>ZgH#N0snj1RZ=5O!&o^!gea_a6n@WA=tJm=FUBKRM1W*hOrV~>U9f`~wv
z0Tu|Y=)%0J6Hoe^LggC>gr#M3MGJ%lAchdF!VuE253mxE<lp2q1hIjmcU|6~9SrFB
zbBH!ztszPy&vypa!dF;{2>F{r-t40G)#`jbf6HD_`WwU$M6V#vcM2*Q#qvS~OkA~o
z2X+9Mdw=9?o+sdf%>_z*h8O~qfunFgSf^kugh83b=D^9J(VPUr{K(}ELQD!`%%7PJ
z?Ct=T=ZB$^(QAR`p;x)CV4LkdROfK{`n>)VP_cHf(h#k|mIYVoX~ZK>M2OYH#R7NA
zC|vQRGY(=1aUytrq|_-S?Jn<b2x&NrnjmB#h5!M?FpA61*~Dmf=F>~~ebu-#6>{G$
z;Iu>2K>%<HvpYH6mC3p>gc%R!i`>EriVc(@Y%d9-x~vXMRtlG+efgGAvu^>|a(&{&
zi#?t96Q26xH5Wm`ASN&bGl?jQ3$~$m><tDcyVx?S#F=X`LR@bd1ro+YJOa%IhBY*4
zEM}IlZ^vOIb=uzly*s{vV7#q%FyFfiRxAud2Bk#-7$%S~ekLYSQdox2j~?`lcF!q;
z#x*01x78Lx>`Ow7tFbhel@i4YmQkqm)z}W~Y{bXOcjySeo>2x3)2;HwxvuqoCi6>(
zE1z8&OJ>Jv@7Yr}`zB9kxMNB&8m3!icqK{XA4Z;5)n(h+sJMkx;HE>i-atjR|2L6A
V!PJ<O$~pi5002ovPDHLkV1m^cOZxx-

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/link.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/link.png
new file mode 100644
index 0000000000000000000000000000000000000000..25eacb7c2524142262d68bf729c5e2b61adfd6d4
GIT binary patch
literal 343
zcmV-d0jU0oP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy=}AOER4C75
z_|JeJGSEqZ9d}k~>$`dXYaZs9=SbAto%g@>T~?_bH&lTUn@`uo|1bXE{eSR(<Gt!b
zH-Fsyf8_tf|2|ztY+wb3e#IZIzKhuA{U`PRr2m!wQ~!JaiP*N{Vetn;KZprkP2VS{
z`*YcU-uwUD|3m-R{<r_^&ow!{>AO)ESb=V4`uk}mK|39Px&03WLbv~pzk+s7D@lK^
zn+aB+sp)&Y_x-B3>;6ywU--WQNUr<8>TU0P-|L#1U<GQ-_6A<}Q@&(>&;A)67w(+>
pDf@fM7q9#F25QXo3rUI;002ro52U44e~JJA002ovPDHLkV1l;_q@Mr)

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/tab.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/tab.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d8207fd74e73ed0a61793834ecbd358a209b9c9
GIT binary patch
literal 323
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<@^>lFzu{fRl=l_3uX4QtyMkj+0
zY#SOnetv##&Ac*9!Aw2qzO90ukB`rtBTS+*)~sK@Qd3Wl>6w91lc$EXqw|d(p7rtj
zL#=9mJql4^&ui$IAYgxZvAe!x-T!~wAEkwbV}v;l|IpFV;kk6_P=alNz5|0Yv$3)9
z;rsjlKkS;w>nL%6C&hSi8{-+bv^22=Ol%^&FHDS$JJJrBFsN`$`tyH2>+-h(-T}M`
zbIkMa)w8ljvf0|^Ry<H-;yLEN)bYWepWZy*-`O_ocyO@!c!CdKg3MWN9tKHUz4|A&
S?{@+{$l&Sf=d#Wzp$P!M40Zhg

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 57c8e600ab..7d526c3865 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -16,8 +16,7 @@
 import org.eclipse.swt.widgets.Display;
 
 public abstract class AbstractComponentEditor {
-//	public abstract boolean canHandle(Object object);
-	public abstract Image getImage(Display display);
+	public abstract Image getImage(Object element,Display display);
 	public abstract String getLabel(Object element);
 	public abstract String getDetailLabel(Object element);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index e6b497f55b..2c87d163b8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -63,7 +63,7 @@ public void applyStyles(TextStyle textStyle) {
 					cell.setText(styledString.getString());
 					cell.setStyleRanges(styledString.getStyleRanges());
 				}
-				cell.setImage(elementEditor.getImage(cell.getControl().getDisplay()));
+				cell.setImage(elementEditor.getImage(o, cell.getControl().getDisplay()));
 			} else {
 				cell.setText(cell.getElement().toString());
 			}
@@ -75,11 +75,6 @@ public void applyStyles(TextStyle textStyle) {
 					partsImage = new Image(cell.getControl().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/application_double.png"));
 				}
 				cell.setImage(partsImage);
-			} else if( "Menus".equals(s) ) {
-				if( menusImage == null ) {
-					menusImage = new Image(cell.getControl().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/cog.png"));
-				}
-				cell.setImage(menusImage);
 			}
 		} else {
 			cell.setText(cell.getElement()+"");
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index ebb125c65f..6ed06dc54f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -24,12 +24,19 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ApplicationEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.BindingEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CommandEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectToolItemEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandlerEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ModelComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ModelComponentsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PartDescriptorEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PartEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.PartSashContainerEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.PartStackEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolBarEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowTrimEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -115,7 +122,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 						AbstractComponentEditor editor = editorMap.get(obj.eClass());
 						if( editor != null ) {
 							textLabel.setText(editor.getLabel(obj));
-							iconLabel.setImage(editor.getImage(iconLabel.getDisplay()));
+							iconLabel.setImage(editor.getImage(obj, iconLabel.getDisplay()));
 							Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
 							comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
 							layout.topControl = comp;
@@ -143,6 +150,7 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 				new ObservableFactoryImpl(), new TreeStructureAdvisorImpl());
 		viewer.setContentProvider(contentProvider);
 		viewer.setInput(modelProvider.getRoot());
+		viewer.expandAll();
 
 		return viewer;
 	}
@@ -157,6 +165,13 @@ private void registerDefaultEditors() {
 		registerEditor( MApplicationPackage.Literals.HANDLER, new HandlerEditor());
 		registerEditor( MApplicationPackage.Literals.COMMAND,new CommandEditor());
 		registerEditor( MApplicationPackage.Literals.WINDOW, new WindowEditor());
+		registerEditor( MApplicationPackage.Literals.PART_SASH_CONTAINER, new PartSashContainerEditor());
+		registerEditor( MApplicationPackage.Literals.PART_STACK, new PartStackEditor());
+		registerEditor( MApplicationPackage.Literals.WINDOW_TRIM, new WindowTrimEditor());
+		registerEditor( MApplicationPackage.Literals.TOOL_BAR, new ToolBarEditor());
+		registerEditor( MApplicationPackage.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor());
+		registerEditor( MApplicationPackage.Literals.HANDLED_TOOL_ITEM, new HandledToolItemEditor());
+		registerEditor( MApplicationPackage.Literals.TOOL_ITEM, new ToolItemEditor());
 	}
 
 	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 029aac4ac7..e7663d51f1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -38,9 +38,9 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
 	@Override
-	public Image getImage(Display display) {
+	public Image getImage(Object element, Display display) {
 		if( image == null ) {
-			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/application.png"));
+			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/application_osx.png"));
 		}
 
 		return image;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingEditor.java
index 35a44c2d7e..3ec2d4d36b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingEditor.java
@@ -26,9 +26,12 @@ public class BindingEditor extends AbstractComponentEditor {
 	private DataBindingContext context;
 
 	@Override
-	public Image getImage(Display display) {
-		// TODO Auto-generated method stub
-		return null;
+	public Image getImage(Object element, Display display) {
+		if( image == null ) {
+			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/link.png"));
+		}
+
+		return image;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index ee262cf8f9..582122a88d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -26,9 +26,12 @@ public class CommandEditor extends AbstractComponentEditor {
 	private DataBindingContext context;
 
 	@Override
-	public Image getImage(Display display) {
-		// TODO Auto-generated method stub
-		return null;
+	public Image getImage(Object element, Display display) {
+		if( image == null ) {
+			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/lightning_go.png"));
+		}
+
+		return image;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
new file mode 100644
index 0000000000..2c89d236bf
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+
+public class DirectToolItemEditor extends ToolItemEditor {
+	private Image image;
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if( image == null ) {
+			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/brick_go.png"));
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Direct Tool Item";
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Direct Tool Item bla bla bla";
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
new file mode 100644
index 0000000000..aa34b41e77
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+
+public class HandledToolItemEditor extends ToolItemEditor {
+	private Image image;
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if( image == null ) {
+			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/brick_link.png"));
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Handled Tool Item";
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Handled Tool Item bla bla bla";
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 500dcc94d0..114cfb7f37 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -26,9 +26,11 @@ public class HandlerEditor extends AbstractComponentEditor {
 	private DataBindingContext context;
 
 	@Override
-	public Image getImage(Display display) {
-		// TODO Auto-generated method stub
-		return null;
+	public Image getImage(Object element, Display display) {
+		if( image == null ) {
+			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/cog.png"));
+		}
+		return image;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index ffde3a8e5d..792df05256 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -142,7 +142,7 @@ private Composite createForm(Composite parent) {
 	}
 
 	@Override
-	public Image getImage(Display display) {
+	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/package_go.png"));
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
index 5c91d8b0d2..df3e65261b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
@@ -31,7 +31,7 @@ public class ModelComponentsEditor extends AbstractComponentEditor {
 	private DataBindingContext context;
 
 	@Override
-	public Image getImage(Display display) {
+	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/application_view_icons.png"));
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 9c964cd837..1432c066b1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -49,7 +49,7 @@ public class PartEditor extends AbstractComponentEditor {
 
 
 	@Override
-	public Image getImage(Display display) {
+	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/application_form.png"));
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
new file mode 100644
index 0000000000..8d07add564
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -0,0 +1,81 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MPartSashContainer;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class PartSashContainerEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private WritableValue master = new WritableValue();
+	private Image vImage;
+	private Image hImage;
+	private DataBindingContext context;
+
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		boolean horizontal = ((MPartSashContainer)element).isHorizontal();
+
+		if( vImage == null && ! horizontal ) {
+			vImage = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/application_tile_vertical.png"));
+		}
+
+		if( hImage == null && horizontal ) {
+			hImage = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/application_tile_horizontal.png"));
+		}
+
+		if( horizontal ) {
+			return hImage;
+		} else {
+			return vImage;
+		}
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Sash";
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Sash bla bla bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new DataBindingContext();
+			composite = createForm(parent,context, master);
+		}
+		master.setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, DataBindingContext context2,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
new file mode 100644
index 0000000000..2485db33d7
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -0,0 +1,68 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class PartStackEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private WritableValue master = new WritableValue();
+	private Image image;
+	private DataBindingContext context;
+
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if( image == null ) {
+			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/tab.png"));
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Stack";
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Stack bla bla bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new DataBindingContext();
+			composite = createForm(parent,context, master);
+		}
+		master.setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, DataBindingContext context2,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
new file mode 100644
index 0000000000..5f4c9aad4e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -0,0 +1,66 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class ToolBarEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private WritableValue master = new WritableValue();
+	private Image image;
+	private DataBindingContext context;
+
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Toolbar";
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Toolbar bla bla bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new DataBindingContext();
+			composite = createForm(parent,context, master);
+		}
+		master.setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, DataBindingContext context2,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
new file mode 100644
index 0000000000..7774e94881
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class ToolItemEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private WritableValue master = new WritableValue();
+	private Image image;
+	private DataBindingContext context;
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if( image == null ) {
+			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/brick.png"));
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Tool Item";
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Tool Item bla bla bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new DataBindingContext();
+			composite = createForm(parent,context, master);
+		}
+		master.setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, DataBindingContext context2,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 764933ebe0..f9567273e2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -39,7 +39,7 @@ public class WindowEditor extends AbstractComponentEditor {
 
 
 	@Override
-	public Image getImage(Display display) {
+	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/application_xp.png"));
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
new file mode 100644
index 0000000000..52cedcd89a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
@@ -0,0 +1,67 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class WindowTrimEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private WritableValue master = new WritableValue();
+	private Image image;
+	private DataBindingContext context;
+
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Window Trim";
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Window Trim bla bla bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new DataBindingContext();
+			composite = createForm(parent,context, master);
+		}
+		master.setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, DataBindingContext context2,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}

From e1a2e485e04c997a9c89192f8ceeb811c94088c7 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 5 Mar 2010 19:25:49 +0000
Subject: [PATCH 0004/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * fixed label

---
 .../e4/tools/emf/ui/internal/common/component/PartEditor.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 1432c066b1..9786752f8d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -59,12 +59,12 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Part Descriptor";
+		return "Part";
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "Part Descriptor Bla Bla Bla Bla";
+		return "Part Bla Bla Bla Bla";
 	}
 
 	@Override

From 5e75af9d88d76492455ffc394ebca4badf74aa5d Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 7 Mar 2010 09:30:34 +0000
Subject: [PATCH 0005/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * using icons from model.workbench.edit

---
 .../META-INF/MANIFEST.MF                      |   6 ++++--
 .../icons/application.png                     | Bin 464 -> 0 bytes
 .../icons/application_double.png              | Bin 533 -> 0 bytes
 .../icons/application_form.png                | Bin 467 -> 0 bytes
 .../icons/application_form_edit.png           | Bin 714 -> 0 bytes
 .../icons/application_osx.png                 | Bin 487 -> 0 bytes
 .../icons/application_tile_horizontal.png     | Bin 432 -> 0 bytes
 .../icons/application_tile_vertical.png       | Bin 492 -> 0 bytes
 .../icons/application_view_icons.png          | Bin 476 -> 0 bytes
 .../icons/application_xp.png                  | Bin 426 -> 0 bytes
 .../icons/brick.png                           | Bin 452 -> 0 bytes
 .../icons/brick_go.png                        | Bin 790 -> 0 bytes
 .../icons/brick_link.png                      | Bin 764 -> 0 bytes
 .../org.eclipse.e4.tools.emf.ui/icons/cog.png | Bin 512 -> 0 bytes
 .../icons/lightning_go.png                    | Bin 739 -> 0 bytes
 .../icons/link.png                            | Bin 343 -> 0 bytes
 .../icons/package_go.png                      | Bin 898 -> 0 bytes
 .../org.eclipse.e4.tools.emf.ui/icons/tab.png | Bin 323 -> 0 bytes
 .../component/AbstractComponentEditor.java    |  20 ++++++++++++++++++
 .../emf/ui/internal/common/ModelEditor.java   |   4 ++--
 .../common/component/ApplicationEditor.java   |  10 ++++++++-
 .../common/component/CommandEditor.java       |  10 ++++++++-
 .../component/DirectToolItemEditor.java       |  13 ------------
 .../component/HandledToolItemEditor.java      |  13 ------------
 .../common/component/HandlerEditor.java       |  10 ++++++++-
 ...ndingEditor.java => KeyBindingEditor.java} |  12 +++++++++--
 .../internal/common/component/PartEditor.java |  10 ++++++++-
 .../component/PartSashContainerEditor.java    |  17 +++++++++++++--
 .../common/component/PartStackEditor.java     |  10 ++++++++-
 .../common/component/ToolBarEditor.java       |  14 ++++++++++--
 .../common/component/ToolItemEditor.java      |  10 ++++++++-
 .../common/component/WindowEditor.java        |  10 ++++++++-
 32 files changed, 126 insertions(+), 43 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/application.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/application_double.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/application_form.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/application_form_edit.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/application_osx.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/application_tile_horizontal.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/application_tile_vertical.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/application_view_icons.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/application_xp.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/brick.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/brick_go.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/brick_link.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/cog.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/lightning_go.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/link.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/package_go.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/tab.png
 rename bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/{BindingEditor.java => KeyBindingEditor.java} (84%)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 39de767f68..a4ff5c96f0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -14,9 +14,11 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.jface.databinding;bundle-version="1.4.0",
  org.eclipse.jface;bundle-version="3.6.0",
  org.eclipse.emf.edit;bundle-version="2.6.0",
- org.eclipse.equinox.common;bundle-version="3.6.0"
+ org.eclipse.equinox.common;bundle-version="3.6.0",
+ org.eclipse.e4.ui.model.workbench.edit;bundle-version="0.9.1"
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.inject;version="1.0.0"
+Import-Package: javax.inject;version="1.0.0",
+ org.osgi.framework;version="1.5.0"
 Export-Package: org.eclipse.e4.tools.emf.ui.common,
  org.eclipse.e4.tools.emf.ui.common.component,
  org.eclipse.e4.tools.emf.ui.internal.common;x-internal:=true,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/application.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/application.png
deleted file mode 100644
index 1dee9e366094e87db68c606d0522d72d4b939818..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzVo5|nR2Uhh
z!69yxQ5c2c_uP9SO&YLZNmxQ12)2N!!D0vs#R^Ek(4<KhK?U2XBo(z)bV&OD-#N^k
zFa|g2^C$@qp|_uYe0=@p<lF5g#|dB)n{p8c$D|4;q>8e6`gpm!y1M!N^ZV(=IC*t)
z{^;nqJv-tM$9J1L2QJ2DN!#51=1_l@G`2=6e0lehL%sic%`_4--LFM}IF!KzJCseW
zq1I3__Z40|e?qyK1__gzP(qrBf-G7SQbQ`#Lw94WVe(o`qg+f4hy;Qju)q#I(9{`%
zQmAGomzhQ!b|gq>KqL@IkO~$=Koi}a$u6d07kiS}NoYVMJjAeZpaB*;wwcDdEbK@K
zNP;B7RzhQ|H9AlUO<`J>m1(5R)Pb-iLBb@7Jp)}LHdAb-VVgYxVoTzGoqu{~a>6uj
zeqCRFI9pC#h09bGwy9;oHcp6(RB%jeY^F=Ll!S+9JkVe4nDG7tJMQiP0000<MNUMn
GLSTZz`@eVq

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/application_double.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/application_double.png
deleted file mode 100644
index 647592f2e9265be48fdb0d1ea42363c354588c57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 533
zcmV+w0_y#VP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzr%6OXR5;6>
zld+0ZK^TR<nR|B$n;1b0V<n1@kWLHn4YXJUTbmVx6$`;$uyR4r$`^2p)dvtCz|JaV
zNReU%ZQPqp?#%xmi<|7;6hhnsKf}P8!{Otf@ZkBUhj;G{pZ==U!5z7ibH?S!4404@
z=1zY*%}1l@hoiT<M=Vti?+o|1I^8(vu!%a=%=UrvfLT(U{XSt+ohHThy_AX9k8f`r
z@Z`;e^#C~li)?)UI=X(GyElIR@#0@RdYAh=d;eYi?Np6M)0ZU@05QOLwsWi3+hK5Z
zqcYuUX75UK10aMzRg3CBd6bs(S-?ejlsTpIfEEwAFo*1pxno()$f-@-99+WOC@nP&
zBGBfc7*G%;kq{yw7@-h_N6OszJR9Y7Jo&bFknZO?ab<ArtPKGQfg}n+3<YHX3&LX4
z)Xf{iYF>Q&AxX;a%I->Ls?9Vv(;_9E)=9HE>13WHNsnHAS>LKQkM<dX5F<qq2{90h
zl|NIq1J-yf9~aAWrLDH#Y&~E)o*eESq}^O6%nWxYEf&p>bVH_QE8X!1!(q^p{6+N_
X4^=JUQP|Z100000NkvXXu0mjfgEH)N

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/application_form.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/application_form.png
deleted file mode 100644
index 807b862cfc087b70dcdd971af3ac92688484e998..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 467
zcmV;^0WAKBP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzWl2OqR2Uhh
z!Ld%0VHk$t`)xiANfSmH95k><I$^r`51xV!9D!jmggCjdIk`wm!k``j3?2%ObyEhK
zC<!u@I{bZ~hkhX>4nWfMy23V#h*$3p-!?D%AI~T5+JJ;5Qi)|`;Y?)XOj2U`VS70o
zp1%L~Y4f1;U-b7MEOk38OU$EtImvzCpiEkKCg)@3^{;h@nc_6NuOBn7?ZF9Ev4w3+
zWiSxI_v2&k@_b{1R8kdeGLx;rFK&F@c}mqZ4YwJO$7q^VC6&nL^Y#-6g9F*zM-oa=
z70W0^1X#=%!t{DQE-wCJ^Pd1r08&yFDUlL$EtoM3e+;?Hv-Nc(QI%=il9}v$`OS^N
z)(TbAG~DLw><`m+N>!Xf5_@kR0j83~eKLh5sv-%=fC#``TU}jaG#UW`VS>Ph2!jLJ
zROR&N$<c?yc2k)sMP?$2Y+EED8!K@dSy)1%I$|blvxp80x&qw|@H*2>x3B;J002ov
JPDHLkV1im=zq<ec

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/application_form_edit.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/application_form_edit.png
deleted file mode 100644
index af486c940c60b746d56e757686d51801bf18ae72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 714
zcmV;*0yX`KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!TuDShR5;6}
zlkZDYQ5eVXztG$0RWBlt>MscT0g(~ZNI{bH#Y_Utm11j?0+FF&hK-qRX-TePYY3~f
zgtoM;)~2M+AJew!(sr+7^KN&$cgxoJcJAGZGzzQ(AD(j#=leYm&p8hTfchUO*=18r
zr!~koJq|$qh+zB()q@3G>7PU6y;(H$c~Nhe#3lU)C~l9VR_BJ=;N(S}WT3GGbJ~$L
zY!^k>SWYq!Z~hmmJ4PWHsEvN4)9Gy^Z?)wOR0E3;1OdDR51!|xxx?Z3jR~6$3lGcS
zw`wrecMQ|rMHQ4-uw*icvKH@8Qe-U(ejNgB1!Gqt;e8II!iak<aNRh*Mv2u<a2&V<
zflCx3x5+@DhrrG^V`KFxn9&ZTX9n>t<iyPV>I@}570bpEkH@7b5obwc$sUX75)sc{
zLoV$^I#`Q!&qeqK<Z$cd@MvXwsD|EY#9}c-3yAYrG$v)>v2}x;Q6ZOcK?qbLvr>-a
zyc(hY)2O@Nn=hiGX9AH(WK#{q_3OcQFyqRCxB{6^XTi-jVaae3jL(UZMoZqHPUiu`
zFod;2WZ-*e#Qe)flJ*;9mgV@eat;ZSNkD%BUpZPjbEd(ZH>lOVM>tFq!k`K6p&rZ)
zt1<ne3!mMk5SGiaK6MrTyQi?aI0>2-&(V<8oA9F-Oc!oCq@PvQW{0``D3A<c!B7Ib
zdMDoADaLT~A=Ie!B<&~UW)p};#3UJP?XH&dMcECP4jb-UaBB|3T(v7TqS}ApkKMR+
wqx9g8Ol#%dtgWp$`>ONE*fZt6-G6K6?>+q?gw;DtTL1t607*qoM6N<$g3ymi=>Px#

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/application_osx.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/application_osx.png
deleted file mode 100644
index 9f022ece86d73715c7e45c6702c1c87560b8ba23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzc}YY;R5;6}
zlQC<QK@f(Yz1zD)@Qj6m!Ne*eYNNj(c2+j|0iuX?TCvo^PAt;I#zMOg!T(?@SSdn+
zXk+i4<hz}BW-Y#4E@@)U3=Ffd`@Hiq%%)l^r-}UL-PY#v(&EG1>-B1Y!m%PGQ6x$c
z#f<UT+FFcKjJ>9@AK!Oh=jElv$CqBcNDKEr@t}K+jhk=(*)=6Nf9`DW>GPMDbI$#A
zadnmXt6lDNZUb<A<;t-FUw3}e?RIeYl+DGjyKBH2_keLJeEzZnfaI77xnpu9N8Z+N
zyMasO8o{j_EB`gX?e`xpWGMjHYsNFdXXfXK8f13|V6NXk@}Sn*CY6Zx>=D%3-T`<7
zxtL}GCkYVlWRqqF51NHf9Yl>2gOi8|vh54F$BDrs0>$iLAcx_0<I=GLHG(`EjfPFr
z41N#)5E1(V(@7t8Gci=D^m7LfS6YAaY<)0Tcm$n6aZR^RLT1PfNw^tu$7O^&W;TrQ
dkLk4E`7e4?Wu<Lp$36f6002ovPDHLkV1iE=;2;11

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/application_tile_horizontal.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/application_tile_horizontal.png
deleted file mode 100644
index 8a1191c389aafecbb9493f14f13de25e34f36f71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 432
zcmV;h0Z;ykP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzLP<nHR5;6}
zQ?W_|K@^-^u1SLU1%813LBK+=w6PLfNtq9@vJ)j@C0JV<u+&EJ7X%9fDhfu#h{$=#
z#oOC`Z!EF_o4vwJ_1JmLn|ZriA&FTKw+^n_tIfqulCv?)GN@BnRm{gWyXg(iSDH&}
zUq5V!0%?-KieRp4v)jA3?bH4B<I2hPtJLeYXljHclmH0~M`P3*HK+ngf&`S4`k{BP
zhwbHRJhqIo@3ANUG%2AZQj_@_5Pzl$jB<$p07n-u3}Nr=Imm78UXmmtQ4KE0i3GXA
zS^z*KQX=5OoXx#J;mW4Cu(+9UQR$QtaW{=nHpP}XaNdD2MX<@_CM<4@k5H853`bD$
z4vIql6=8aNasTnD+v?;SVjYsf2b?&l6No6N>~HSm3sN|U6QrN-pa}fa=>kAy*54Rm
aM*ISgWgjfIBP3%00000<MNUMnLSTZ^J-I6Y

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/application_tile_vertical.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/application_tile_vertical.png
deleted file mode 100644
index 1d40383d318918be19242b3274652567b3f0bc98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 492
zcmV<I0Tcd-P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzen~_@R5;6>
zld)=4K@^6+dv{}4Y=qQeVU@}tM6j^36YGGDjg6qBwU$%~R)ORVZ1Ms&K0^u{3%3Y@
zASi3DyPIt8obw-xdy|`4NnAWIGt8O8$DIG4DI$UwJ0D*?ez>}QJd2wWgoGrLH>*j=
z98)mhgioKpzkdJr=^j8I;L-Z(Zf|K&t}H=B5I{sb07Vc1ist;z*mi*qFilZT>JuWO
zErKAB$a3eP@ytuw=mWR~n@?`DXuN!PL<TVTD~lrlx)%Dqf;y!fP*vkA0Yw2&P!v$K
zx$4L0;=BY%*W4h3wQDlZZ*VmHdbt1L*8N|n;0ol9TqJYcg~{>cxWsZyk?Al4tUtK7
z)>|I1a-*~AvhwpT{I2S?3@|=ZS<NO$mpzZa_W@EcowqS1vGwfk!ZvQa`I3uhcD;z*
z%Zx_EWI4cH|5m@7@UyvhaQt($n1!v6lWLR$z72;5&$nh9ZiXkvQfhu*T_bPolN(_o
iSq;I#1^B$L|BXMFZyy3&b-lL$0000<MNUMnLSTZI#oBKG

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/application_view_icons.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/application_view_icons.png
deleted file mode 100644
index 6a93cdaa78cc42caed19920ae622af7e35f6067a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 476
zcmV<20VDp2P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzZb?KzR5;6}
zlif?gU=)Y_7o{kP=!2pHrIkZrGlB>yh(bgPr6Nj-nT19X7DZ8zeUKOl_Tl|>1YLMH
z=jlD?b+Sb_xgR_*#(SP~INR$20GAV7?rFuloUPPDd!HchGLr8gZI>aqRf53gD~KB}
z;7=4_D*g<@>Ld7K_aG;3>sUvEaJphdb1M87A#!by06TZW*wPh{Ku&%@CmC6|-~wsq
zjb0RsMFKOF(Fjbu5Fwh)ru|I#tR-Lz>qIaxcgh90?Z1KrCWc|y!1T|aZ~=a*-(Ag4
zSPUtVz{2m+IDzS#IpP9w-9EN;RO;3eG#U+?z$0h4Kv;Wfk8B+i3#{n6-UibhNOQqt
z?12jeFM)^6#o@C#4HjCL*d?a8z!%N)t>y1HEak5ffl*Zzs?{nz*J?G;G`=UdUjg$j
zC=)9;^k<DOUczwr90uoeY|F>AC{HL0z0x7{1P|EQ`>eA9tOij?;P^H=75o6^EkKQu
SuK{QP0000<MNUMnLSTYmlE&o#

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/application_xp.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/application_xp.png
deleted file mode 100644
index d22860a3166820b8fdad71c6505a40580af14b2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 426
zcmV;b0agBqP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzJV``BR5;6}
zQ$0%qQ4pNdrydDtV<-NCYedUb{tdCPu=N-C18l7&rJx`-VrL^(7HYsw5W6%&1OtA=
zI5QUayi4GUoGvU23$r^jZ(m{?|B0}7`gAongVmRJH*EkCECB{+!ZKvRBxJ)RC}Dnf
z`1UdIT`<sE&lacdy94w;Rk>wtp^MwsrC67-bFzu!t;6Q^%|k2MJ$kfh*aj@vhNOIJ
zWFxBVQIH79u!vw98!Ll~y$OKnm}QK5wtxPNU<+B6{mDR{T_7M%l&baHE>bEbHX04+
zn+OzZ0e^b{APT{9E#RmJ5)l*`)B%<Qgy5)M(!{_q24v2F<ix;Y0F7Yg4AL~M{fw3n
zB%#ykAWhRkhNLk@Rq}eh9%LgV9<~oIhudNw;s`L-{DkwfHC>#z1i)YI<iFqf2ekQ!
U`6iZuNdN!<07*qoM6N<$g3V&DDF6Tf

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/brick.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/brick.png
deleted file mode 100644
index 7851cf34c946e5667221e3478668503eb1cd733f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 452
zcmV;#0XzPQP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzR!KxbR2Ufr
z!9Pe;0RRW!@7<lIl3o%R*`Lh}3L0v44WhBhrLn=H)^JZ~X)lPPp*Ym3y&;EiD#3^_
z;}R2s(2l&aJKy{DeMJDQEOc(}O)|dId@(Z*AR=OUqSZ^1Bx&_tPDVr&v9i#a-8-w+
zG-X<R@>Pdwe5?6tW?r-ok|b$oDQj8FV%kZPq;(MWOV8?8;<)(iP}>h<N+(r5>NMU>
z7fbz%jjlr7h8uuoQ~J6}n}@Y@PdTk=)PxO{%7zmL?dchpZX*~n;I{!C>*(8cU;q(~
zAS%Po_@naEU!xidrBXD?;hN|x^%W|Ij)0y*r5vi|?W&Fub(NqJ@z0o=O<Ao~*SBxI
z`SL+wOarB!5l6MHf7`vAYen#UBKI<P{@6LCZG|0M`+1T_cfL~u@bp6FGkdxCW!wI8
u9^8Hp6am2FtGS=SJe+$CKoI}{0Kk9KAGswB^FYP`0000<MNUMnLSTXd=EXk%

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/brick_go.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/brick_go.png
deleted file mode 100644
index fe0d33567d26b77787d8d6dc4be92f8f2d6b75db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 790
zcmV+x1L^#UP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!s7XXYR5;6Z
zQ(Z`tQ5ZfEM3>zp{gHSP{di*#8D&?(h#;bi2r7yUe@M_9Z^R^1th67Ma+}U=ey(q{
z%~>)Q;cRVlbJ5&n%2W)U;$S+(K9zyBt*3JiDKhoI1BdsV_j#W8ea|5PNIG0D*E5U7
z66xyd`pdxfEVk3#Z2_~{oMA8+{vd6!m|m|xvLnHN#V}P%QJ}ZC7h_{%NTpIpCX*N)
z9py20#_q7Y8;&>uWnbT_HZwDW?(S{`gFz0H$;4x6j@CIrPfw4Q0-;cdD>8V!URbSG
z=yW;`wr4TsCXq;BWMl*^N3B-t2~|o=OiaM<_ahJpa7Ct`zBU{U4GqERbi!`8L#0wB
z2(>4zt*v2UVF6Q9Q<$Ef2CWa1larf{*nVJO0ORB1u-R-J!^6X9Z*P}~(P-oZD=RBl
zUS7uR>@2tI^Z7P=z*NiL=b=!07GJ;F;BYv&+qSkgi8YWDNRou5r6t5-F+?H}uF6Vt
zyWL!|xHA_|Ew^z?c?$jZJ}#hCDkVZ^`#T<wV|8^E(P)$>hr?l%i<eQRyMPkm917Gq
zc>M7ujJ_6Bn65+CbO^3N2U=TO*NG^KHr9~2xj9}2BVoNL)#c(-Kn}D29Z&q=YesW_
z1q5#+N<<mXKi`j6ZyP*>j%go#9EE}){AAsopP$F#;vyc>dRg+DzH&5tDMkI~BGgzO
zpw?OprK=8iJM(bj2}y1~Nv&3!q0wmS>1=;_JRaOpord8@GsN$&Aq+M`<9R_z9zo%%
zMUi*~S=A(Vw36g(`wJZ%9oclg;tfR>uC^RQep3c6y*z+>+KZ4oYfzw*A+wr94_A^i
zJAS4O&<@KK3WZ%Rm%C}Ru4UKliQgCUky%9|H2LJNzi~HE%kkq?dvUOmWNnTA1HB~u
UMVP_&o&W#<07*qoM6N<$f>=0SnE(I)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/brick_link.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/brick_link.png
deleted file mode 100644
index 9ebf013a23a56653655a736a7e149deb7365ea03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 764
zcmV<Y0t5YtP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!j!8s8R5;6R
zQq4=^Q55~b!2Ag<W<3P62<AVC7)g*?REu`A(sFPWZK_2?9|KY?Dk3XVN)jw9B3evR
z^aU<T#iERcK19Qmte-!p$x=J>&SR3v>A``^efOSo-hEdApp;^Jd;9y!%1UfzX6Bh-
z%-mbG|0Na{7Ruai_Y+DEb1s+b!<z(u6)%KZK>*9k%Q!whMxjtZKA*?o;i1g&jy0@(
zaU=-@d-h+o%gal6JRXEXA&L3<d6_G5l$8XFi;E5c9334=MZ)LvVRdyCPN!3XF>`d2
z%jIxzZ~*p9O-;EJp_Ds0If38rM<5W8ic~K>FOK&2_p!CLg^i63OioVb6k$)zWHLx3
z5;!|M!}<9+#QSi1dRlbEcxPt^;cysUuU8@%3}RwpLRIGG<|IKnoyP6$Eh3SKw7a*r
zSDXP=IYc&YZf;7@?fCe($^l9ORaJ3wbAx0uiC8QqRr$2t-Cfy8%XCI3B%pxJW>XdM
zw~zPt_s}#A@pxQ5Ly)4szaMtH9lgE1SXx@b+S(fW`ub$fYPE8J7#bSNDzme*Ub07{
zQKV8SjEs!%0@v5ql8ggm!@$6Rbi^E8vBqpRM-}l+@5OSMrl+TWj*gC^qoV@>u{fQb
zov5v?g~?>X@bEC&+uLPaQ&Ypn-y~^mZA}+f(&2EFH8eE%dU|@ENpN*_1-)L6_4Rc*
zFuq@`IjX9vp1QiaK9ZojyZhnQURP99d=u;%37VRkpwsD4U0sd3x;hEQB&e^i|3QN0
z=H|Os1fRqaw!?#igLmS4HE!G3*ce(`TF}<kCS&HrU5YiVeML}SUjDAKvhuURV7M?E
ujlV1w%Y(pUV`Jl2fiEJ~nByI5So;SIr}_C=u4<M50000<MNUMnLSTaX=VJK)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/cog.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/cog.png
deleted file mode 100644
index 67de2c6ccbeac17742f56cf7391e72b2bf5033ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzl1W5CR4C6?
zQB6w%VGv&Y0p9%y{*S$M5weR^mokV7i!Mcpk=YVa(4jh%5k+ND8>CQDsH?WF>AIFt
zQuJ}i;w2$ZUU#3SZ6RY0Gw;kZ&ol1~2ky^QZ(fom$=jN<T*X<otG0ao1Md*)XSSIA
z*x3T8gv)x7DUK|A#S3CA>JZt!z7w_pH~wdQ;R)Gh%BbQFCx+Nm!4SuS-vkr`vhhrX
zM*>w%e+v~?m@q~ImPAgtLkR_3U<2F8LP3W5=LJ*ZN|S5p#sf4YFr$p~Q~Z*0Ngxf2
zjk#J#<7EAlhzlrV53~GF&pIzcCN_lz9@05Ue<MwWI-*!M0jvB0F~pIke2>oUXiK%N
z#x+4o*i_c|6_Uu1+&TIho?3@y4k-#b8Y_o94zW*B3a1ne2-Y5s0uke$$|@=}OP-i=
zNYZQA=>PrZu0MfSL=b8UhD_={W4IY1{b{)U)*gc45xtL%IYLY&hF;d`@GzI&7H&D#
zh;z_BX$#hqh@q?AY3sJTod2%*Yd)_>YM0#q&ixGuh+PQsneK)F0000<MNUMnLSTXw
CAKTXe

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/lightning_go.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/lightning_go.png
deleted file mode 100644
index 29039e6a8b40f6ed99cae87f21ea8bf7650f265b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 739
zcmV<90v!E`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!bxA})R5;6}
zQr%0_VHAG$;bzlW%1VhfF<T-^MK?xK7LrolR75ux-F6xD0TI<j;Y|en2@wR{L}JuM
zBxq=A<&>ZgH#N0snj1RZ=5O!&o^!gea_a6n@WA=tJm=FUBKRM1W*hOrV~>U9f`~wv
z0Tu|Y=)%0J6Hoe^LggC>gr#M3MGJ%lAchdF!VuE253mxE<lp2q1hIjmcU|6~9SrFB
zbBH!ztszPy&vypa!dF;{2>F{r-t40G)#`jbf6HD_`WwU$M6V#vcM2*Q#qvS~OkA~o
z2X+9Mdw=9?o+sdf%>_z*h8O~qfunFgSf^kugh83b=D^9J(VPUr{K(}ELQD!`%%7PJ
z?Ct=T=ZB$^(QAR`p;x)CV4LkdROfK{`n>)VP_cHf(h#k|mIYVoX~ZK>M2OYH#R7NA
zC|vQRGY(=1aUytrq|_-S?Jn<b2x&NrnjmB#h5!M?FpA61*~Dmf=F>~~ebu-#6>{G$
z;Iu>2K>%<HvpYH6mC3p>gc%R!i`>EriVc(@Y%d9-x~vXMRtlG+efgGAvu^>|a(&{&
zi#?t96Q26xH5Wm`ASN&bGl?jQ3$~$m><tDcyVx?S#F=X`LR@bd1ro+YJOa%IhBY*4
zEM}IlZ^vOIb=uzly*s{vV7#q%FyFfiRxAud2Bk#-7$%S~ekLYSQdox2j~?`lcF!q;
z#x*01x78Lx>`Ow7tFbhel@i4YmQkqm)z}W~Y{bXOcjySeo>2x3)2;HwxvuqoCi6>(
zE1z8&OJ>Jv@7Yr}`zB9kxMNB&8m3!icqK{XA4Z;5)n(h+sJMkx;HE>i-atjR|2L6A
V!PJ<O$~pi5002ovPDHLkV1m^cOZxx-

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/link.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/link.png
deleted file mode 100644
index 25eacb7c2524142262d68bf729c5e2b61adfd6d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 343
zcmV-d0jU0oP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy=}AOER4C75
z_|JeJGSEqZ9d}k~>$`dXYaZs9=SbAto%g@>T~?_bH&lTUn@`uo|1bXE{eSR(<Gt!b
zH-Fsyf8_tf|2|ztY+wb3e#IZIzKhuA{U`PRr2m!wQ~!JaiP*N{Vetn;KZprkP2VS{
z`*YcU-uwUD|3m-R{<r_^&ow!{>AO)ESb=V4`uk}mK|39Px&03WLbv~pzk+s7D@lK^
zn+aB+sp)&Y_x-B3>;6ywU--WQNUr<8>TU0P-|L#1U<GQ-_6A<}Q@&(>&;A)67w(+>
pDf@fM7q9#F25QXo3rUI;002ro52U44e~JJA002ovPDHLkV1l;_q@Mr)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/package_go.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/package_go.png
deleted file mode 100644
index aace63ad6f91537268eb6e9bf328743da7c631c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 898
zcmV-|1AY97P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#6iGxuR5;6R
zlS^n^bsUAiJDF$dG?^q#(j-kw`kbcKq??Mh=%NOp)TUG+f)YjQ!lK>yqPWur#3F*-
zi1<JR7YZ&!6DWb$Cy7a<AjV9l=}cp1nn~K2dEUAA{(nCgrCn&w`tWVOb1YS5t<3)X
zOgADQsAyD0-ijX^{(Y^U^<O|@_-M0=zM&!~8@C>-H<e}Xrbde@`k5N}c+bFSW=+7{
zNPj?8Us92`qwRg$TH?>*6GJgONgz~1E;+_Oe@~@V<gAK((KC3d@&J$+>F-1Iy-=*@
zV9T!Kgk#%59lVt}Zj7B_)9wTKYBy6YEwPxKqOdeGuEw0%cVhe}Yj*hPSBMNYZ5yz{
z4STT*%d9TVV4NauDND$z(%QKb>=kMr>ckh0lFuesOioc=Nq^^8BQNYYbk1@M%M`O?
zh?6H&UZR}Ol3%#RzJX5(MAktmg_e?7`2>w^4^!6w)4$9==U0)EV$}u1A)*bPRF?jv
zHdar4EJB1b*f+rh!M+8R1<JR_DW<Lv-f|o@Qu3<^2w(*X)NLmaiel#`kz$TO4Or#t
z;8Wh2_<@ybmG`%_Krn>59x8%Qjd0I{0j+|69pUC)f(>!P(OTs8c~;XuVtXzfO>s`m
zrjW9YI38*Yel_NvP&FVfNEx)sn-kxIx;WzEcpe*LJBYXLr(l<Od48O4n;u7v;8&4|
zFAxAC;N1bKg4lTC@KpC8Mg=1VLCLHxu(#s?MW@1%i$i=Q?P0$fxiEj>lS6I0o+c9O
z0L_4N7u$0%Dx~ks;fjYRF0OIOR}1uPI!MtibK=J3pihiBTv)jD>R%(Llj(_XFa#mG
z6Wg=#j7Q7*PFmM*W@B9!ftm;#qU}sCT;|&KtBZ%Fe#3()Pk+9@Sw&8%k=NQD>92qN
zkFT*E2S*%i&!MYvH;;DpF?sU}zb4Mlls)au3~BX$XZr12Z?_sbts>8Fec~0Xl1q`9
zxyH%T#p<5UCqrY2(J4oGEHk9ens2<Ht7p6WRODSmf-3Uii+1u$BQ;GGF@fBWdiQ((
Y0z8$>2BN3dYXATM07*qoM6N<$g3xBAZ~y=R

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/tab.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/tab.png
deleted file mode 100644
index 3d8207fd74e73ed0a61793834ecbd358a209b9c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 323
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<@^>lFzu{fRl=l_3uX4QtyMkj+0
zY#SOnetv##&Ac*9!Aw2qzO90ukB`rtBTS+*)~sK@Qd3Wl>6w91lc$EXqw|d(p7rtj
zL#=9mJql4^&ui$IAYgxZvAe!x-T!~wAEkwbV}v;l|IpFV;kk6_P=alNz5|0Yv$3)9
z;rsjlKkS;w>nL%6C&hSi8{-+bv^22=Ol%^&FHDS$JJJrBFsN`$`tyH2>+-h(-T}M`
zbIkMa)w8ljvf0|^Ry<H-;yLEN)bYWepWZy*-`O_ocyO@!c!CdKg3MWN9tKHUz4|A&
S?{@+{$l&Sf=d#Wzp$P!M40Zhg

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 7d526c3865..f5cbc2cb24 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -10,7 +10,12 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common.component;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -24,4 +29,19 @@ public abstract class AbstractComponentEditor {
 	public abstract Composite getEditor(Composite parent, Object object);
 	public abstract IObservableList getChildList(Object element);
 
+	protected Image loadSharedImage(Display d, URL path) {
+		try {
+			URL url = FileLocator.resolve(path);
+			if( url != null ) {
+				InputStream in = url.openStream();
+				Image image = new Image(d, in);
+				in.close();
+				return image;
+			}
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return null;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 6ed06dc54f..0053cfa9f5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -22,7 +22,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ApplicationEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.BindingEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.KeyBindingEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CommandEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledToolItemEditor;
@@ -161,7 +161,7 @@ private void registerDefaultEditors() {
 		registerEditor( MApplicationPackage.Literals.MODEL_COMPONENT, new ModelComponentEditor());
 		registerEditor( MApplicationPackage.Literals.PART, new PartEditor());
 		registerEditor( MApplicationPackage.Literals.PART_DESCRIPTOR, new PartDescriptorEditor());
-		registerEditor( MApplicationPackage.Literals.KEY_BINDING, new BindingEditor());
+		registerEditor( MApplicationPackage.Literals.KEY_BINDING, new KeyBindingEditor());
 		registerEditor( MApplicationPackage.Literals.HANDLER, new HandlerEditor());
 		registerEditor( MApplicationPackage.Literals.COMMAND,new CommandEditor());
 		registerEditor( MApplicationPackage.Literals.WINDOW, new WindowEditor());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index e7663d51f1..eeaceba0cb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
@@ -40,7 +43,12 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
-			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/application_osx.png"));
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Application.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}
 
 		return image;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 582122a88d..030e4bfd4c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -28,7 +31,12 @@ public class CommandEditor extends AbstractComponentEditor {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
-			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/lightning_go.png"));
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Command.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}
 
 		return image;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 2c89d236bf..f396ddbc33 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -10,20 +10,7 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
 public class DirectToolItemEditor extends ToolItemEditor {
-	private Image image;
-
-	@Override
-	public Image getImage(Object element, Display display) {
-		if( image == null ) {
-			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/brick_go.png"));
-		}
-
-		return image;
-	}
 
 	@Override
 	public String getLabel(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index aa34b41e77..31f037b725 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -10,20 +10,7 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
 public class HandledToolItemEditor extends ToolItemEditor {
-	private Image image;
-
-	@Override
-	public Image getImage(Object element, Display display) {
-		if( image == null ) {
-			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/brick_link.png"));
-		}
-
-		return image;
-	}
 
 	@Override
 	public String getLabel(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 114cfb7f37..87e1a1466e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -28,7 +31,12 @@ public class HandlerEditor extends AbstractComponentEditor {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
-			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/cog.png"));
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Handler.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}
 		return image;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
similarity index 84%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingEditor.java
rename to bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 3ec2d4d36b..797d79587e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -19,7 +22,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
-public class BindingEditor extends AbstractComponentEditor {
+public class KeyBindingEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private WritableValue master = new WritableValue();
 	private Image image;
@@ -28,7 +31,12 @@ public class BindingEditor extends AbstractComponentEditor {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
-			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/link.png"));
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/KeyBinding.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}
 
 		return image;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 9786752f8d..070ff15a56 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
@@ -51,7 +54,12 @@ public class PartEditor extends AbstractComponentEditor {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
-			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/application_form.png"));
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Part.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}
 
 		return image;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 8d07add564..28a72bab53 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -1,5 +1,8 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -27,11 +30,21 @@ public Image getImage(Object element, Display display) {
 		boolean horizontal = ((MPartSashContainer)element).isHorizontal();
 
 		if( vImage == null && ! horizontal ) {
-			vImage = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/application_tile_vertical.png"));
+			try {
+				vImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/PartSashContainer_vertical.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}
 
 		if( hImage == null && horizontal ) {
-			hImage = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/application_tile_horizontal.png"));
+			try {
+				hImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/PartSashContainer.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}
 
 		if( horizontal ) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 2485db33d7..44dbd7ef5d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -1,5 +1,8 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -23,7 +26,12 @@ public class PartStackEditor extends AbstractComponentEditor {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
-			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/tab.png"));
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/PartStack.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}
 
 		return image;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 5f4c9aad4e..3f18a01239 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -1,5 +1,8 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -22,8 +25,15 @@ public class ToolBarEditor extends AbstractComponentEditor {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		// TODO Auto-generated method stub
-		return null;
+		if( image == null ) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Toolbar.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		return image;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 7774e94881..c5df70979d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -28,7 +31,12 @@ public class ToolItemEditor extends AbstractComponentEditor {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
-			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/brick.png"));
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ToolItem.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}
 
 		return image;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index f9567273e2..dbeb0f196b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
@@ -41,7 +44,12 @@ public class WindowEditor extends AbstractComponentEditor {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
-			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/application_xp.png"));
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Window.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}
 
 		return image;

From 29d2111fe8476a2e05ea5b54f0a16692c7473688 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 7 Mar 2010 11:51:02 +0000
Subject: [PATCH 0006/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * implemented toolitem and using editing domain

---
 .../.settings/org.eclipse.jdt.core.prefs      | 260 +++++++++++++++++-
 .../.settings/org.eclipse.jdt.ui.prefs        |   4 +
 .../META-INF/MANIFEST.MF                      |   3 +-
 .../component/AbstractComponentEditor.java    |  11 +
 .../emf/ui/internal/common/ModelEditor.java   |  32 +--
 .../common/component/ApplicationEditor.java   |   7 +
 .../common/component/CommandEditor.java       |   7 +
 .../component/DirectToolItemEditor.java       |  54 ++++
 .../component/HandledToolItemEditor.java      |  55 ++++
 .../common/component/HandlerEditor.java       |   7 +
 .../common/component/KeyBindingEditor.java    |   7 +
 .../component/ModelComponentEditor.java       |  18 +-
 .../component/ModelComponentsEditor.java      |   7 +
 .../component/PartDescriptorEditor.java       |   9 +-
 .../internal/common/component/PartEditor.java | 100 ++++---
 .../component/PartSashContainerEditor.java    |   7 +
 .../common/component/PartStackEditor.java     |   7 +
 .../common/component/ToolBarEditor.java       |   7 +
 .../common/component/ToolItemEditor.java      | 136 ++++++++-
 .../common/component/WindowEditor.java        |  16 +-
 .../common/component/WindowTrimEditor.java    |  21 +-
 21 files changed, 674 insertions(+), 101 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
index 04d8a38777..44c830d92b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Tue Mar 02 18:39:11 CET 2010
+#Sun Mar 07 11:22:58 CET 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
@@ -6,3 +6,261 @@ org.eclipse.jdt.core.compiler.compliance=1.5
 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.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..87e3873ea0
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,4 @@
+#Sun Mar 07 11:22:19 CET 2010
+eclipse.preferences.version=1
+formatter_profile=_custom
+formatter_settings_version=11
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index a4ff5c96f0..91f26e4d5e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.jface;bundle-version="3.6.0",
  org.eclipse.emf.edit;bundle-version="2.6.0",
  org.eclipse.equinox.common;bundle-version="3.6.0",
- org.eclipse.e4.ui.model.workbench.edit;bundle-version="0.9.1"
+ org.eclipse.e4.ui.model.workbench.edit;bundle-version="0.9.1",
+ org.eclipse.emf.databinding.edit;bundle-version="1.2.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.osgi.framework;version="1.5.0"
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index f5cbc2cb24..76e37ceebc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -16,11 +16,22 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 public abstract class AbstractComponentEditor {
+	private EditingDomain editingDomain;
+
+	public AbstractComponentEditor(EditingDomain editingDomain) {
+		this.editingDomain = editingDomain;
+	}
+
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
 	public abstract Image getImage(Object element,Display display);
 	public abstract String getLabel(Object element);
 	public abstract String getDetailLabel(Object element);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 0053cfa9f5..011f7c0a4e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -156,22 +156,22 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 	}
 
 	private void registerDefaultEditors() {
-		registerEditor( MApplicationPackage.Literals.APPLICATION, new ApplicationEditor());
-		registerEditor( MApplicationPackage.Literals.MODEL_COMPONENTS, new ModelComponentsEditor());
-		registerEditor( MApplicationPackage.Literals.MODEL_COMPONENT, new ModelComponentEditor());
-		registerEditor( MApplicationPackage.Literals.PART, new PartEditor());
-		registerEditor( MApplicationPackage.Literals.PART_DESCRIPTOR, new PartDescriptorEditor());
-		registerEditor( MApplicationPackage.Literals.KEY_BINDING, new KeyBindingEditor());
-		registerEditor( MApplicationPackage.Literals.HANDLER, new HandlerEditor());
-		registerEditor( MApplicationPackage.Literals.COMMAND,new CommandEditor());
-		registerEditor( MApplicationPackage.Literals.WINDOW, new WindowEditor());
-		registerEditor( MApplicationPackage.Literals.PART_SASH_CONTAINER, new PartSashContainerEditor());
-		registerEditor( MApplicationPackage.Literals.PART_STACK, new PartStackEditor());
-		registerEditor( MApplicationPackage.Literals.WINDOW_TRIM, new WindowTrimEditor());
-		registerEditor( MApplicationPackage.Literals.TOOL_BAR, new ToolBarEditor());
-		registerEditor( MApplicationPackage.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor());
-		registerEditor( MApplicationPackage.Literals.HANDLED_TOOL_ITEM, new HandledToolItemEditor());
-		registerEditor( MApplicationPackage.Literals.TOOL_ITEM, new ToolItemEditor());
+		registerEditor( MApplicationPackage.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.MODEL_COMPONENTS, new ModelComponentsEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.MODEL_COMPONENT, new ModelComponentEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.PART, new PartEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.PART_DESCRIPTOR, new PartDescriptorEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.COMMAND,new CommandEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.PART_SASH_CONTAINER, new PartSashContainerEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.PART_STACK, new PartStackEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.WINDOW_TRIM, new WindowTrimEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.TOOL_BAR, new ToolBarEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.HANDLED_TOOL_ITEM, new HandledToolItemEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.TOOL_ITEM, new ToolItemEditor(modelProvider.getEditingDomain()));
 	}
 
 	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index eeaceba0cb..a3d9c923c5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -24,12 +24,14 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 public class ApplicationEditor extends AbstractComponentEditor {
+
 	private Composite composite;
 	private WritableValue master = new WritableValue();
 	private Image image;
@@ -40,6 +42,11 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private IListProperty APPLICATION__COMMANDS = EMFProperties.list(MApplicationPackage.Literals.APPLICATION__COMMANDS);
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
+	public ApplicationEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+		// TODO Auto-generated constructor stub
+	}
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 030e4bfd4c..0d4413e6f9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -17,17 +17,24 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 public class CommandEditor extends AbstractComponentEditor {
+
 	private Composite composite;
 	private WritableValue master = new WritableValue();
 	private Image image;
 	private DataBindingContext context;
 
+	public CommandEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+		// TODO Auto-generated constructor stub
+	}
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index f396ddbc33..391adf7425 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -10,7 +10,61 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
 public class DirectToolItemEditor extends ToolItemEditor {
+	private Image image;
+
+	public DirectToolItemEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if (image == null) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/DirectToolItem.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+
+	@Override
+	protected void createSubTypeFormElements(Composite parent, DataBindingContext context, WritableValue master) {
+		IValueProperty textProp = WidgetProperties.text();
+
+		Label l = new Label(parent, SWT.NONE);
+		l.setText("Class URI");
+
+		Text t = new Text(parent, SWT.BORDER);
+		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		context.bindValue(textProp.observe(t), EMFEditProperties.value( getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
+
+		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+		b.setText("Find ...");
+	}
 
 	@Override
 	public String getLabel(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 31f037b725..d26bbe0ece 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -10,7 +10,62 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
 public class HandledToolItemEditor extends ToolItemEditor {
+	private Image image;
+
+	public HandledToolItemEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if (image == null) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/HandledToolItem.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+	@Override
+	protected void createSubTypeFormElements(Composite parent, DataBindingContext context, WritableValue master) {
+		IValueProperty textProp = WidgetProperties.text();
+
+		Label l = new Label(parent, SWT.NONE);
+		l.setText("Command");
+
+		Text t = new Text(parent, SWT.BORDER);
+		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		t.setEnabled(false);
+		context.bindValue(textProp.observe(t), EMFEditProperties.value( getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLED_ITEM__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(master));
+
+		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+		b.setText("Find ...");
+	}
 
 	@Override
 	public String getLabel(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 87e1a1466e..77a46f65b9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -17,6 +17,7 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
@@ -28,6 +29,12 @@ public class HandlerEditor extends AbstractComponentEditor {
 	private Image image;
 	private DataBindingContext context;
 
+	public HandlerEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+		// TODO Auto-generated constructor stub
+	}
+
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 797d79587e..2b64686b18 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -17,17 +17,24 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 public class KeyBindingEditor extends AbstractComponentEditor {
+
 	private Composite composite;
 	private WritableValue master = new WritableValue();
 	private Image image;
 	private DataBindingContext context;
 
+	public KeyBindingEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+		// TODO Auto-generated constructor stub
+	}
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index 792df05256..4953469824 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -24,6 +24,8 @@
 import org.eclipse.e4.ui.model.application.MModelComponent;
 import org.eclipse.e4.ui.model.application.MPart;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.viewers.ListViewer;
 import org.eclipse.swt.SWT;
@@ -37,12 +39,18 @@
 import org.eclipse.swt.widgets.Text;
 
 public class ModelComponentEditor extends AbstractComponentEditor {
+
 	private Composite composite;
 	private WritableValue master = new WritableValue();
 	private Image image;
 	private DataBindingContext context;
 
-	private IListProperty MODEL_COMPONENT__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.MODEL_COMPONENT__CHILDREN);
+	private IListProperty MODEL_COMPONENT__CHILDREN = EMFProperties.list( MApplicationPackage.Literals.MODEL_COMPONENT__CHILDREN);
+
+	public ModelComponentEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+		// TODO Auto-generated constructor stub
+	}
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
@@ -84,7 +92,7 @@ private Composite createForm(Composite parent) {
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));
+		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));
 
 		// ------------------------------------------------------------
 
@@ -111,7 +119,7 @@ private Composite createForm(Composite parent) {
 
 		t = new Text(parent, SWT.BORDER);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.MODEL_COMPONENT__PARENT_ID).observeDetail(master));
+		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__PARENT_ID).observeDetail(master));
 
 		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 		b.setText("Find ...");
@@ -125,7 +133,7 @@ private Composite createForm(Composite parent) {
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.MODEL_COMPONENT__POSITION_IN_PARENT).observeDetail(master));
+		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__POSITION_IN_PARENT).observeDetail(master));
 
 		// ------------------------------------------------------------
 
@@ -136,7 +144,7 @@ private Composite createForm(Composite parent) {
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.MODEL_COMPONENT__PROCESSOR).observeDetail(master));
+		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__PROCESSOR).observeDetail(master));
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
index df3e65261b..a8292c952f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
@@ -17,12 +17,14 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 public class ModelComponentsEditor extends AbstractComponentEditor {
+
 	private IListProperty MODEL_COMPONENTS__COMPONENTS = EMFProperties.list(MApplicationPackage.Literals.MODEL_COMPONENTS__COMPONENTS);
 
 	private Composite composite;
@@ -30,6 +32,11 @@ public class ModelComponentsEditor extends AbstractComponentEditor {
 	private Image image;
 	private DataBindingContext context;
 
+	public ModelComponentsEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+		// TODO Auto-generated constructor stub
+	}
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 03852d09fa..00c1fd8213 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -14,7 +14,8 @@
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -24,6 +25,10 @@
 
 public class PartDescriptorEditor extends PartEditor {
 
+	public PartDescriptorEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+	}
+
 	@Override
 	protected Composite createForm(Composite parent, DataBindingContext context, IObservableValue master) {
 		Composite comp = super.createForm(parent,context,master);
@@ -37,7 +42,7 @@ protected Composite createForm(Composite parent, DataBindingContext context, IOb
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
 
 		// ------------------------------------------------------------
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 070ff15a56..48a7d5c836 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -26,6 +26,8 @@
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MPart;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.viewers.ListViewer;
 import org.eclipse.jface.viewers.TableViewer;
@@ -41,6 +43,7 @@
 import org.eclipse.swt.widgets.Text;
 
 public class PartEditor extends AbstractComponentEditor {
+
 	private Composite composite;
 	private WritableValue master = new WritableValue();
 	private Image image;
@@ -50,6 +53,10 @@ public class PartEditor extends AbstractComponentEditor {
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS);
 
+	public PartEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+		// TODO Auto-generated constructor stub
+	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
@@ -98,24 +105,7 @@ protected Composite createForm(Composite parent, DataBindingContext context, IOb
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));
-
-		// ------------------------------------------------------------
-
-		l = new Label(parent, SWT.NONE);
-		l.setText("Tags");
-
-		t = new Text(parent, SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
-		t.setLayoutData(gd);
-
-		l = new Label(parent, SWT.NONE);
-		ListViewer viewer = new ListViewer(parent);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
-		gd.heightHint = 80;
-		viewer.getList().setLayoutData(gd);
+		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));
 
 		// ------------------------------------------------------------
 
@@ -126,7 +116,7 @@ protected Composite createForm(Composite parent, DataBindingContext context, IOb
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
 
 		// ------------------------------------------------------------
 
@@ -137,7 +127,7 @@ protected Composite createForm(Composite parent, DataBindingContext context, IOb
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
 
 		// ------------------------------------------------------------
 
@@ -146,7 +136,7 @@ protected Composite createForm(Composite parent, DataBindingContext context, IOb
 
 		t = new Text(parent, SWT.BORDER);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
 		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 		b.setText("Find ...");
@@ -158,7 +148,7 @@ protected Composite createForm(Composite parent, DataBindingContext context, IOb
 
 		t = new Text(parent, SWT.BORDER);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		context.bindValue(textProp.observe(t), EMFProperties.value(MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
+		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
 
 		b = new Button(parent, SWT.PUSH|SWT.FLAT);
 		b.setText("Find ...");
@@ -166,14 +156,21 @@ protected Composite createForm(Composite parent, DataBindingContext context, IOb
 		// ------------------------------------------------------------
 
 		l = new Label(parent, SWT.NONE);
-		l.setText("Variables");
+		l.setText("Tags");
+		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 
-		t = new Text(parent, SWT.BORDER);
+		ListViewer viewer = new ListViewer(parent);
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
-		t.setLayoutData(gd);
+		gd.heightHint = 80;
+		viewer.getList().setLayoutData(gd);
+
+		// ------------------------------------------------------------
 
 		l = new Label(parent, SWT.NONE);
+		l.setText("Variables");
+		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+
 		viewer = new ListViewer(parent);
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
@@ -184,13 +181,8 @@ protected Composite createForm(Composite parent, DataBindingContext context, IOb
 
 		l = new Label(parent, SWT.NONE);
 		l.setText("Properties");
+		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 
-		t = new Text(parent, SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
-		t.setLayoutData(gd);
-
-		l = new Label(parent, SWT.NONE);
 		TableViewer tableviewer = new TableViewer(parent);
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
@@ -206,29 +198,29 @@ protected Composite createForm(Composite parent, DataBindingContext context, IOb
 		column.getColumn().setText("Value");
 		column.getColumn().setWidth(200);
 
-		// ------------------------------------------------------------
-
-		l = new Label(parent, SWT.NONE);
-		l.setText("");
-
-		Composite booleanContainer = new Composite(parent,SWT.NONE);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
-		booleanContainer.setBackgroundMode(SWT.INHERIT_DEFAULT);
-		booleanContainer.setLayoutData(gd);
-		booleanContainer.setLayout(new GridLayout(4,false));
-
-		Button checkbox = new Button(booleanContainer, SWT.CHECK);
-		checkbox.setText("to render");
-
-		checkbox = new Button(booleanContainer, SWT.CHECK);
-		checkbox.setText("on Top");
-
-		checkbox = new Button(booleanContainer, SWT.CHECK);
-		checkbox.setText("visible");
-
-		checkbox = new Button(booleanContainer, SWT.CHECK);
-		checkbox.setText("closeable");
+//		// ------------------------------------------------------------
+//
+//		l = new Label(parent, SWT.NONE);
+//		l.setText("");
+//
+//		Composite booleanContainer = new Composite(parent,SWT.NONE);
+//		gd = new GridData(GridData.FILL_HORIZONTAL);
+//		gd.horizontalSpan=2;
+//		booleanContainer.setBackgroundMode(SWT.INHERIT_DEFAULT);
+//		booleanContainer.setLayoutData(gd);
+//		booleanContainer.setLayout(new GridLayout(4,false));
+//
+//		Button checkbox = new Button(booleanContainer, SWT.CHECK);
+//		checkbox.setText("to render");
+//
+//		checkbox = new Button(booleanContainer, SWT.CHECK);
+//		checkbox.setText("on Top");
+//
+//		checkbox = new Button(booleanContainer, SWT.CHECK);
+//		checkbox.setText("visible");
+//
+//		checkbox = new Button(booleanContainer, SWT.CHECK);
+//		checkbox.setText("closeable");
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 28a72bab53..3c20d9927b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -11,12 +11,14 @@
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MPartSashContainer;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 public class PartSashContainerEditor extends AbstractComponentEditor {
+
 	private Composite composite;
 	private WritableValue master = new WritableValue();
 	private Image vImage;
@@ -25,6 +27,11 @@ public class PartSashContainerEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
+	public PartSashContainerEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+		// TODO Auto-generated constructor stub
+	}
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		boolean horizontal = ((MPartSashContainer)element).isHorizontal();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 44dbd7ef5d..3e1067a279 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -10,12 +10,14 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 public class PartStackEditor extends AbstractComponentEditor {
+
 	private Composite composite;
 	private WritableValue master = new WritableValue();
 	private Image image;
@@ -23,6 +25,11 @@ public class PartStackEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
+	public PartStackEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+		// TODO Auto-generated constructor stub
+	}
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 3f18a01239..e5abf9271b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -10,12 +10,14 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 public class ToolBarEditor extends AbstractComponentEditor {
+
 	private Composite composite;
 	private WritableValue master = new WritableValue();
 	private Image image;
@@ -23,6 +25,11 @@ public class ToolBarEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
+	public ToolBarEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+		// TODO Auto-generated constructor stub
+	}
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index c5df70979d..42789a9bd3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -15,12 +15,30 @@
 
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.ItemType;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MToolItem;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class ToolItemEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -28,11 +46,15 @@ public class ToolItemEditor extends AbstractComponentEditor {
 	private Image image;
 	private DataBindingContext context;
 
+	public ToolItemEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+	}
+
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ToolItem.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ToolItem_separator.gif"));
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -44,30 +66,115 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Tool Item";
+		return "Separator";
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "Tool Item bla bla bla";
+		return "Separator bla bla bla";
 	}
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new DataBindingContext();
-			composite = createForm(parent,context, master);
+			composite = createForm(parent, context, master);
 		}
 		master.setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, DataBindingContext context2,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
+	private Composite createForm(Composite parent, DataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IValueProperty textProp = WidgetProperties.text();
+
+		Label l = new Label(parent, SWT.NONE);
+		l.setText("Id");
+
+		Text t = new Text(parent, SWT.BORDER);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 2;
+		t.setLayoutData(gd);
+		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));
+
+		if( this.getClass() != ToolItemEditor.class ) {
+			createFormSubTypeForm(parent, context, master);
+		}
+
 		return parent;
 	}
 
+	private void createFormSubTypeForm(Composite parent, DataBindingContext context, WritableValue master) {
+		IValueProperty textProp = WidgetProperties.text();
+
+		// ------------------------------------------------------------
+
+		Label l = new Label(parent, SWT.NONE);
+		l.setText("Type");
+
+		StructuredViewer viewer = new ComboViewer(parent);
+		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setInput(new ItemType[] { ItemType.CHECK, ItemType.PUSH, ItemType.RADIO });
+		GridData gd = new GridData();
+		gd.horizontalSpan = 2;
+		viewer.getControl().setLayoutData(gd);
+		IObservableValue itemTypeObs = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ITEM__TYPE).observeDetail(master);
+		context.bindValue(ViewerProperties.singleSelection().observe(viewer), itemTypeObs);
+
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("Label");
+
+		Text t = new Text(parent, SWT.BORDER);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 2;
+		t.setLayoutData(gd);
+		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("Tooltip");
+
+		t = new Text(parent, SWT.BORDER);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 2;
+		t.setLayoutData(gd);
+		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("Icon URI");
+
+		t = new Text(parent, SWT.BORDER);
+		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+
+		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+		b.setText("Find ...");
+		// ------------------------------------------------------------
+		createSubTypeFormElements(parent, context, master);
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("Tags");
+		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+
+		viewer = new ListViewer(parent);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 2;
+		gd.heightHint = 80;
+		viewer.getControl().setLayoutData(gd);
+	}
+
+	protected void createSubTypeFormElements(Composite parent, DataBindingContext context, WritableValue master) {
+
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		// TODO Auto-generated method stub
@@ -76,7 +183,16 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		// TODO Auto-generated method stub
+		MToolItem item = (MToolItem) element;
+		if (item.getType() == ItemType.SEPARATOR) {
+			return null;
+		} else {
+			if (item.getLabel() != null && item.getLabel().trim().length() > 0) {
+				return item.getLabel();
+			} else if (item.getTooltip() != null && item.getTooltip().trim().length() > 0) {
+				return item.getTooltip();
+			}
+		}
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index dbeb0f196b..35b5690f5c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -24,12 +24,14 @@
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MWindow;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 public class WindowEditor extends AbstractComponentEditor {
+
 	private Composite composite;
 	private WritableValue master = new WritableValue();
 	private Image image;
@@ -37,9 +39,12 @@ public class WindowEditor extends AbstractComponentEditor {
 
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS);
-	private IListProperty APPLICATION__COMMANDS = EMFProperties.list(MApplicationPackage.Literals.APPLICATION__COMMANDS);
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
+	public WindowEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+		// TODO Auto-generated constructor stub
+	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
@@ -102,15 +107,6 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_COMMAND, APPLICATION__COMMANDS, element, "Commands") {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-
 		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_WINDOWS, ELEMENT_CONTAINER__CHILDREN, element, "Controls") {
 
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
index 52cedcd89a..dd544728c5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
@@ -1,5 +1,8 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -7,12 +10,14 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 public class WindowTrimEditor extends AbstractComponentEditor {
+
 	private Composite composite;
 	private WritableValue master = new WritableValue();
 	private Image image;
@@ -20,11 +25,23 @@ public class WindowTrimEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
+	public WindowTrimEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+		// TODO Auto-generated constructor stub
+	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		// TODO Auto-generated method stub
-		return null;
+		if( image == null ) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/WindowTrim.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
 	}
 
 	@Override

From b138387a3cfa215c648ca0e77b86cc11437f78d2 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 7 Mar 2010 11:52:38 +0000
Subject: [PATCH 0007/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * fixed copyright

---
 .../emf/ui/internal/common/ComponentLabelProvider.java |  4 ----
 .../e4/tools/emf/ui/internal/common/VirtualEntry.java  |  1 +
 .../common/component/PartSashContainerEditor.java      | 10 ++++++++++
 .../ui/internal/common/component/PartStackEditor.java  | 10 ++++++++++
 .../ui/internal/common/component/ToolBarEditor.java    | 10 ++++++++++
 .../ui/internal/common/component/WindowTrimEditor.java | 10 ++++++++++
 6 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index 2c87d163b8..5d898c46c7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -11,10 +11,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.ui.model.application.MModelComponent;
-import org.eclipse.e4.ui.model.application.MModelComponents;
-import org.eclipse.e4.ui.model.application.MPart;
-import org.eclipse.e4.ui.model.application.MPartDescriptor;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
index a045a7657b..abd4625833 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
@@ -45,6 +45,7 @@ public void handleListChange(ListChangeEvent event) {
 		});
 	}
 
+	@SuppressWarnings("unchecked")
 	private List<Object> cleanedList(IObservableList list) {
 		List<Object> l = new ArrayList<Object>(list.size());
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 3c20d9927b..be11560eae 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.net.MalformedURLException;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 3e1067a279..f350b0c743 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.net.MalformedURLException;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index e5abf9271b..e13175ed2f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.net.MalformedURLException;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
index dd544728c5..cc08c9d605 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.net.MalformedURLException;

From bd3d26c9181c7c64ec2065da623361514ff025c9 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 7 Mar 2010 15:23:27 +0000
Subject: [PATCH 0008/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * implemented tags editing * implemented handled item
 parameters editing

---
 .../icons/full/obj16/arrow_down.png           | Bin 0 -> 379 bytes
 .../icons/full/obj16/arrow_up.png             | Bin 0 -> 372 bytes
 .../icons/full/obj16/table_add.png            | Bin 0 -> 663 bytes
 .../icons/full/obj16/table_delete.png         | Bin 0 -> 660 bytes
 .../icons/full/obj16/zoom.png                 | Bin 0 -> 692 bytes
 .../component/AbstractComponentEditor.java    |  34 +++
 .../component/DirectToolItemEditor.java       |   2 +
 .../component/HandledToolItemEditor.java      | 169 +++++++++++++-
 .../common/component/ToolItemEditor.java      | 209 +++++++++++++-----
 9 files changed, 362 insertions(+), 52 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_down.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_up.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_add.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_delete.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/zoom.png

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_down.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c4e279377bf348f9cf53894e76bb673ccf067bd
GIT binary patch
literal 379
zcmV->0fhdEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz4M{{nR5;6}
zlRrxXQ4qxE#1v^2iJY~ff`1CZNGj1T;`fL}y7)m98^!M-SlC$D33d@<A$F#}dpo=P
zEUweLgj}|L!;hKWH%W{U^UPw^!{DVCV~j9$m>RB*?~^j!LKVQ>(O&A{Xr%)RXLn#U
zs4LtZ6rCMFY5|B2$)yG$6aaIF<TWBlAZP}UhET_W1ObikX!RmUE=7d84njuI2%F-d
z^dFqvoVJ^dCg=(^MVPR}e}L}w$%Ewb)LL$Vrl2d*)f7AZ&1|c;{x}s7aybtfzkbGJ
zs28Us2?qV9X!ox^sVdXK<?d^muI-x{K8B;W;q7RzOqWb*<MzeIvr-%Hcb|t<nq=NO
Z{{lQDx5sGRxEBBb002ovPDHLkV1gFGqDue(

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_up.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ebb193243780b8eb1919a51ef27c2a0d36ccec2
GIT binary patch
literal 372
zcmV-)0gL{LP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz21!IgR5;6}
zlRqy6Q540`vYCWvXEm}B(P|~^Cy|IoEL#e`l8Q`7mZ%9cl_-RWhIWVOym$XSm1biG
zZ%%tpemUpf+*SwyO*BzA+`ri=b}#!^QGmVc?Yp!+yPPJS-r!>6w#wHUuW*nL5>vZR
zlg{G&%mT~|kL3ei%GW0*UOHUMs5XI$4uxe-L?I@SAefq*207}Iqtjm#e5*fP53AiC
z)C|RQfwzxx<#_WfANRGZx{+tFDl8~Q?;~Ve=lM^*8UTTnVL?HTDz8uta0D@d28E9S
z_)i8aLz^UE6PPKy<A?-~z$(pmU_rs2BLT`V7?>mi;2GJ`34{eIia-CtfAt0H61rk0
SPTNud0000<MNUMnLSTabij-pj

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_add.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a3e5c4df145af0e4b64f5669c57419eca35bd98
GIT binary patch
literal 663
zcmV;I0%-k-P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!DM>^@R5;6}
zlTS!gQ5431?~i{f-N>j^(nf@gnz4vsG~1*?ZHy3tqD@4b(p4K*Q47IE5Jb6XVMKux
zSz4`PETXXnBWf%+CAA199Uoz1qRzYL-WG3|8Cw}$xO|**x!?Kjch9kmG5pVR0q(w9
zyl4z(#pnjDHKIXjjfh6HL5VKef+&M%{dV9~Q`7~}#`N_>t3&@%`O>}Fa6y4+9Re8t
zdK;w`N)*0U_~I8)RN<_@bpYR&iV}jrhm*U`Y^eJ3s=`-N^gu)dFp|h@h@g9a4Y^VR
zl_vl=(O$>>$$5?+s4wJ3lk@b%im{hnU9Z3wjW!0?fzdY^9LMHiGJ|D<oxe0bl>uWY
zbD??rW^(>tPcVS%SR9MiGCsAy(P-T|1*P$9I*U?zy#k}bwc+Wz1so?p2yy^dAKl^m
z`~=G@i>&!Ma%=m5);xjI7-J}N;PBpB;wg{LNU<%hjSaIT2|5l&X{c%9#mpGVPmhW9
z4qve$=sEz$wuq-Z0OBc+c*^7Xw8#6;4`|sLL2MziwF|L)Vtd*E&Ibfa1s>SY842M!
z0d_`0914f<vU8MKRdhG^0dS$?CXIDrfXbo=#;|)w6+eEi&{)5TZ*#v3vyff>#Z3A&
zsdR$=u3HQ~J58li0kE3?1v7bh<V#CV^cG(Uz7j-fe9<UTlvf-fIXyvJxSb~-hbXsP
x5+7ay+^{w}&avKYgTOhU8dw5`lGoGye*lZTFb>wSU`zl2002ovPDHLkV1n}7B%A;M

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_delete.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..b85916d921ec08675f9e41f18c0fbfd7f2124d8c
GIT binary patch
literal 660
zcmV;F0&D$=P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!CP_p=R5;6}
zlTS!hK@`S+_s)IzFG=+IkHVLfi^{Sf9!V_<grcAjAxeT4Awl7yR<6PzTSUvqb`b<p
zU|<-ODM=<hj3T2=q`8nxpDzi`KY3@)w78FVpRJ4rhL3ZG`ObH~nd4Y%`Jd$hJQ(_U
z)mmDNmCYi85zrzSBN(x0BU#&Ew8e<L?KoQ#_W;D&)~0x2^j|8sKOEbgQD8)(06kyt
zqeY{Q#utrm{1A=KoVC?=;QJ;giy-i!dB^#6RbO1u_}YXX7$X35y-u!+;KaUSR<j9o
zngHO;!7?5V&v5EMc_!DLn4xKZ7^mh})++FgAlBk3=zfz#DVN8IB#sMi`cltG609ZS
z!S+r0tonboU;$4#G{#Hm8JXo|yljnv?09Ty9<61q0xRIT(EDx{r2>Q?2k`9nO>z?V
zkm+%pXeD(;$AS7ZfflT_L=+s|TT1_EiiW!ITMXX4Mag6@HO(#LRPSW@V;_Y>1H5R6
zv<4<hAV;|l{i7*>47v{ZFFV<G?h?7<gYfD)`5TL<j>UNY*<KC^v<^IQ;qa~~gP&3y
zstpwk{Fo%Sq8g4}31^_a5+%--&;x6!t=ho%xn;JN=P@z;D>Dm}RIv2nDFsh1@_Tuj
zC17D*VH8v8SFpp^y1wjLHB#VfgRc!n3%(Jw(bShWQjmB~tT+!(MOc{COw72}B6pni
uj`Q&8s<y?ssSC<DF{A7^3!O*$^o>8!`!6#=Xdf;B0000<MNUMnLSTZ5=Ph*r

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/zoom.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/zoom.png
new file mode 100644
index 0000000000000000000000000000000000000000..908612e394525fc2e52a7e9b94689c25ce167381
GIT binary patch
literal 692
zcmV;l0!#ggP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!MoC0LR5;6x
z(o0CxK^(yG@64(#mWoThLp|674WUDA(q?t;P?ivh8yG1>m+BBgry{~j2fHLegbHP(
zrgXNbr0}2;^nywdjLjZe?uxtrd3D(pZH@fFFc0{BW_~jxoO1w7-VX;6vK@ROA$$R6
zEmo;Ht-Mj|>5jUy{bQ^V5@53LRI8AgLpUm|m+15sqcz@QtVSo|oz7ArM8?pIn+>gN
z0b=4_b5O|4A*;Q+vc9Vqr~%3V155*NV~@gTz}KSUiKB-uJzjMZ>5%Q#n24<J>H!V{
zTY(LLAE*NAHZ}C#wnj%Bw5OFIkRhkkAW#kDC3j9Wm0YXRaXlyyp>#mVfYG)eC;@ab
zDb=T-BCAY4LI(Z@GOTr2V_A{pRwSmz+8Be>CjAw(=gnbVWAeguvZa93JmL(EDxv1m
z0OP4q=fpAK1Mq!C2`OkEn37o;m#wF#(t(8Pu#S?2f#x<~4EO{@fmm`p9veD6RZ_jp
z@Au4};q&`XuKEYgIiB4((kgxOs#YdqJw0fY>9^K_agEu5+$#k;w#%I2N>n_?)YIqu
z`tq&#_^p?-%K*U0^}|7+9U(&k0?s;=r=uCZ%)H9_edH8wK}gB(nUB1FFk+2Ol%BXV
zHoFY`D~2x|2<MlV_LK*M_;d3~#G=f;nc&I5tIrih8*Bdy01TcBh4V@ad&+k0#3A|l
z={;ZHP0x8ts$yLLz{9q^VYQ@tHdhs}Ff$+VJXPD&J^o|e06<^M?m#TAFJ@<nYfaq~
aaezN5sVn;(iAePT0000<MNUMnLSTaSf<5^F

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 76e37ceebc..d96d4bff5e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -13,6 +13,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.runtime.FileLocator;
@@ -24,6 +26,21 @@
 public abstract class AbstractComponentEditor {
 	private EditingDomain editingDomain;
 
+	private static Map<Integer, Image> IMAGE_MAP = new HashMap<Integer, Image>();
+	private static final String[] IMAGES = {
+		"/icons/full/obj16/zoom.png",
+		"/icons/full/obj16/table_add.png",
+		"/icons/full/obj16/table_delete.png",
+		"/icons/full/obj16/arrow_up.png",
+		"/icons/full/obj16/arrow_down.png",
+	};
+
+	protected static final int SEARCH_IMAGE = 0;
+	protected static final int TABLE_ADD_IMAGE = 1;
+	protected static final int TABLE_DELETE_IMAGE = 2;
+	protected static final int ARROW_UP = 3;
+	protected static final int ARROW_DOWN = 4;
+
 	public AbstractComponentEditor(EditingDomain editingDomain) {
 		this.editingDomain = editingDomain;
 	}
@@ -32,6 +49,23 @@ public EditingDomain getEditingDomain() {
 		return editingDomain;
 	}
 
+	protected Image getImage( Display d, int id) {
+		Image img = IMAGE_MAP.get(id);
+		if( img == null ) {
+			try {
+				InputStream in = AbstractComponentEditor.class.getClassLoader().getResourceAsStream(IMAGES[id]);
+				img = new Image(d, in);
+				IMAGE_MAP.put(id, img);
+				in.close();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return img;
+	}
+
 	public abstract Image getImage(Object element,Display display);
 	public abstract String getLabel(Object element);
 	public abstract String getDetailLabel(Object element);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 391adf7425..0851af1f53 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -64,6 +64,8 @@ protected void createSubTypeFormElements(Composite parent, DataBindingContext co
 
 		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 		b.setText("Find ...");
+		b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index d26bbe0ece..535e52bca9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -16,14 +16,36 @@
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MHandledItem;
+import org.eclipse.e4.ui.model.application.MParameter;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.ColumnViewerEditor;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
+import org.eclipse.jface.viewers.EditingSupport;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.TableViewerEditor;
+import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -52,7 +74,7 @@ public Image getImage(Object element, Display display) {
 	}
 
 	@Override
-	protected void createSubTypeFormElements(Composite parent, DataBindingContext context, WritableValue master) {
+	protected void createSubTypeFormElements(Composite parent, DataBindingContext context, final WritableValue master) {
 		IValueProperty textProp = WidgetProperties.text();
 
 		Label l = new Label(parent, SWT.NONE);
@@ -65,6 +87,151 @@ protected void createSubTypeFormElements(Composite parent, DataBindingContext co
 
 		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 		b.setText("Find ...");
+		b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("Parameters");
+		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+
+		final TableViewer tableviewer = new TableViewer(parent);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.heightHint = 120;
+		tableviewer.getTable().setHeaderVisible(true);
+		tableviewer.getControl().setLayoutData(gd);
+		IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS);
+
+		TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
+		column.getColumn().setText("Tag");
+		column.getColumn().setWidth(200);
+		column.setEditingSupport(new EditingSupport(tableviewer) {
+			private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
+
+			@Override
+			protected void setValue(Object element, Object value) {
+				((MParameter)element).setTag((String) value);
+			}
+
+			@Override
+			protected Object getValue(Object element) {
+				String val = ((MParameter)element).getTag();
+				return val == null ? "" : val;
+			}
+
+			@Override
+			protected CellEditor getCellEditor(Object element) {
+				return cellEditor;
+			}
+
+			@Override
+			protected boolean canEdit(Object element) {
+				return true;
+			}
+		});
+
+		column = new TableViewerColumn(tableviewer, SWT.NONE);
+		column.getColumn().setText("Value");
+		column.getColumn().setWidth(200);
+		column.setEditingSupport(new EditingSupport(tableviewer) {
+			private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
+
+			@Override
+			protected void setValue(Object element, Object value) {
+				((MParameter)element).setValue((String) value);
+			}
+
+			@Override
+			protected Object getValue(Object element) {
+				String val = ((MParameter)element).getValue();
+				return val == null ? "" : val;
+			}
+
+			@Override
+			protected CellEditor getCellEditor(Object element) {
+				return cellEditor;
+			}
+
+			@Override
+			protected boolean canEdit(Object element) {
+				return true;
+			}
+		});
+
+		ColumnViewerEditorActivationStrategy editorActivationStrategy = new ColumnViewerEditorActivationStrategy(tableviewer) {
+			@Override
+			protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
+				boolean singleSelect = ((IStructuredSelection)tableviewer.getSelection()).size() == 1;
+				boolean isLeftDoubleMouseSelect = event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION && ((MouseEvent)event.sourceEvent).button == 1;
+
+				return singleSelect && (isLeftDoubleMouseSelect
+						|| event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC
+						|| event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
+			}
+		};
+		TableViewerEditor.create(tableviewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
+
+		ViewerSupport.bind(tableviewer, prop.observeDetail(master), new IValueProperty[] {
+			EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__TAG),
+			EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__VALUE)
+		});
+
+		Composite buttonComp = new Composite(parent, SWT.NONE);
+		buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+		GridLayout gl = new GridLayout();
+		gl.marginLeft=0;
+		gl.marginRight=0;
+		gl.marginWidth=0;
+		gl.marginHeight=0;
+		buttonComp.setLayout(gl);
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Up");
+		b.setImage(getImage(b.getDisplay(), ARROW_UP));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Down");
+		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Add ...");
+		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				MHandledItem item = (MHandledItem) master.getValue();
+				MParameter param = MApplicationFactory.eINSTANCE.createParameter();
+				Command cmd = AddCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS, param);
+				if( cmd.canExecute() ) {
+					getEditingDomain().getCommandStack().execute(cmd);
+				}
+				tableviewer.editElement(param, 0);
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Remove");
+		b.addSelectionListener(new SelectionAdapter() {
+
+			public void widgetSelected(SelectionEvent e) {
+				IStructuredSelection s = (IStructuredSelection) tableviewer.getSelection();
+				if( !s.isEmpty() ) {
+					MHandledItem item = (MHandledItem) master.getValue();
+					Command cmd = RemoveCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS, s.toList());
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+					}
+				}
+			}
+
+		});
+		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 42789a9bd3..f7e4a38479 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -12,6 +12,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Arrays;
 
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -20,17 +21,28 @@
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.ItemType;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MToolItem;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -99,76 +111,171 @@ private Composite createForm(Composite parent, DataBindingContext context, Writa
 		t.setLayoutData(gd);
 		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));
 
-		if( this.getClass() != ToolItemEditor.class ) {
+		if (this.getClass() != ToolItemEditor.class) {
 			createFormSubTypeForm(parent, context, master);
 		}
 
 		return parent;
 	}
 
-	private void createFormSubTypeForm(Composite parent, DataBindingContext context, WritableValue master) {
+	private void createFormSubTypeForm(Composite parent, DataBindingContext context, final WritableValue master) {
 		IValueProperty textProp = WidgetProperties.text();
 
 		// ------------------------------------------------------------
-
-		Label l = new Label(parent, SWT.NONE);
-		l.setText("Type");
-
-		StructuredViewer viewer = new ComboViewer(parent);
-		viewer.setContentProvider(new ArrayContentProvider());
-		viewer.setInput(new ItemType[] { ItemType.CHECK, ItemType.PUSH, ItemType.RADIO });
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		viewer.getControl().setLayoutData(gd);
-		IObservableValue itemTypeObs = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ITEM__TYPE).observeDetail(master);
-		context.bindValue(ViewerProperties.singleSelection().observe(viewer), itemTypeObs);
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Type");
+
+			ComboViewer viewer = new ComboViewer(parent);
+			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setInput(new ItemType[] { ItemType.CHECK, ItemType.PUSH, ItemType.RADIO });
+			GridData gd = new GridData();
+			gd.horizontalSpan = 2;
+			viewer.getControl().setLayoutData(gd);
+			IObservableValue itemTypeObs = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ITEM__TYPE).observeDetail(master);
+			context.bindValue(ViewerProperties.singleSelection().observe(viewer), itemTypeObs);
+		}
 
 		// ------------------------------------------------------------
-
-		l = new Label(parent, SWT.NONE);
-		l.setText("Label");
-
-		Text t = new Text(parent, SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Label");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+		}
 
 		// ------------------------------------------------------------
-
-		l = new Label(parent, SWT.NONE);
-		l.setText("Tooltip");
-
-		t = new Text(parent, SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Tooltip");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+		}
 
 		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Icon URI");
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+
+			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setText("Find ...");
+			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+		}
 
-		l = new Label(parent, SWT.NONE);
-		l.setText("Icon URI");
-
-		t = new Text(parent, SWT.BORDER);
-		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
-
-		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-		b.setText("Find ...");
 		// ------------------------------------------------------------
+
 		createSubTypeFormElements(parent, context, master);
+
 		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Tags");
+			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+
+			final Text tagText = new Text(parent, SWT.BORDER);
+			tagText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			tagText.addKeyListener(new KeyAdapter() {
+				@Override
+				public void keyPressed(KeyEvent e) {
+					if (e.keyCode == SWT.CR || e.keyCode == SWT.LF) {
+						handleAddText(tagText);
+					}
+				}
+			});
+
+			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setText("Add");
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					handleAddText(tagText);
+				}
+			});
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+
+			l = new Label(parent, SWT.NONE);
+			final TableViewer viewer = new TableViewer(parent);
+			viewer.setContentProvider(new ObservableListContentProvider());
+			viewer.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					return element.toString();
+				}
+			});
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 120;
+			viewer.getControl().setLayoutData(gd);
+
+			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__TAGS);
+			viewer.setInput(prop.observeDetail(master));
+
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if( ! s.isEmpty() ) {
+						MApplicationElement appEl = (MApplicationElement) master.getValue();
+						Command cmd = RemoveCommand.create(getEditingDomain(), appEl, MApplicationPackage.Literals.APPLICATION_ELEMENT__TAGS, s.toList());
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+	}
 
-		l = new Label(parent, SWT.NONE);
-		l.setText("Tags");
-		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+	private void handleAddText(Text tagText) {
+		if (tagText.getText().trim().length() > 0) {
+			String[] tags = tagText.getText().split(";");
+			for( int i = 0; i < tags.length;i++ ) {
+				tags[i] = tags[i].trim();
+			}
 
-		viewer = new ListViewer(parent);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		gd.heightHint = 80;
-		viewer.getControl().setLayoutData(gd);
+			MApplicationElement appEl = (MApplicationElement) master.getValue();
+			Command cmd = AddCommand.create(getEditingDomain(), appEl, MApplicationPackage.Literals.APPLICATION_ELEMENT__TAGS, Arrays.asList(tags));
+			if (cmd.canExecute()) {
+				getEditingDomain().getCommandStack().execute(cmd);
+			}
+			tagText.setText("");
+		}
 	}
 
 	protected void createSubTypeFormElements(Composite parent, DataBindingContext context, WritableValue master) {

From 07694b1b5b4a5670372702fa462b36307ff927b1 Mon Sep 17 00:00:00 2001
From: Boris Bokowski <bbokowski>
Date: Sun, 7 Mar 2010 16:59:29 +0000
Subject: [PATCH 0009/1286] Bug 304937 -  tooling: JDT code completion and
 templates for dependency injection

---
 .../.classpath                                |   7 +
 .../.project                                  |  28 +++
 .../.settings/org.eclipse.jdt.core.prefs      |   8 +
 .../META-INF/MANIFEST.MF                      |  12 ++
 .../build.properties                          |   7 +
 .../icons/full/elcl16/e4assist_co.gif         | Bin 0 -> 225 bytes
 .../plugin.xml                                |  47 ++++
 .../tools/jdt/templates/E4ContextType.java    |  47 ++++
 .../E4TemplateCompletionProposalComputer.java | 204 ++++++++++++++++++
 .../templates/default-e4templates.properties  |   0
 .../templates/default-e4templates.xml         |  59 +++++
 11 files changed, 419 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/.classpath
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/.project
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/build.properties
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/icons/full/elcl16/e4assist_co.gif
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.properties
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.classpath b/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
new file mode 100644
index 0000000000..64c5e31b7a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
@@ -0,0 +1,7 @@
+<?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.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.project b/bundles/org.eclipse.e4.tools.jdt.templates/.project
new file mode 100644
index 0000000000..e0303cd31a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.jdt.templates</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..5a797383d3
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Sat Mar 06 23:33:15 EST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..1a967cb340
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: e4 Templates
+Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
+ org.eclipse.ui.editors;bundle-version="3.6.0",
+ org.eclipse.jface.text;bundle-version="3.6.0",
+ org.eclipse.jdt.core;bundle-version="3.6.0",
+ org.eclipse.core.runtime;bundle-version="3.6.0"
+Export-Package: org.eclipse.e4.internal.tools.jdt.templates
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/build.properties b/bundles/org.eclipse.e4.tools.jdt.templates/build.properties
new file mode 100644
index 0000000000..3337a4a309
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               templates/,\
+               icons/
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/icons/full/elcl16/e4assist_co.gif b/bundles/org.eclipse.e4.tools.jdt.templates/icons/full/elcl16/e4assist_co.gif
new file mode 100644
index 0000000000000000000000000000000000000000..150a1f7ef5fc55282a3b7f82b54e36c25c4983f2
GIT binary patch
literal 225
zcmZ?wbhEHb6krfwIKsf-;1N(!P|;A(&`~j=qhUeAgcTDyHgrr_(J^Digc%EFOxQ7F
z#)1<w9DvLPKs4jTiWL)nT*&zGpy0=ciVGipy!i3s!;c^TaRbGlEQ|~c@(el*Kmf9n
zfi>=ddS8mBQO2r8D#m*Y&TP5#S%b}xqtT?lr=!5*Pp86^B}JTyirN=4wpbR$th>Se
z;FW^uy6A!(j!_xsZ+~c-a)Ig6``o4$i}b@BmmGU|<-bHWiq|W%wzYS(sdcL<GFSru
DzVCI|

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml b/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
new file mode 100644
index 0000000000..b3ed8606b1
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+	<extension
+		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
+		id="e4ProposalCategory"
+		name="e4 proposals">
+		<proposalCategory
+			icon="$nl$/icons/full/elcl16/e4assist_co.gif"/>
+	</extension>
+	<extension
+         point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
+         id="e4BuilderCompletionProposalComputer">
+      <javaCompletionProposalComputer
+            activate="true"
+            categoryId="org.eclipse.e4.tools.jdt.templates.e4ProposalCategory"
+            class="org.eclipse.e4.internal.tools.jdt.templates.E4TemplateCompletionProposalComputer">
+			<partition type="__dftl_partition_content_type"/>
+      </javaCompletionProposalComputer>
+    </extension>
+   <extension
+         point="org.eclipse.ui.editors.templates">
+      <contextType
+            name="e4"
+            class="org.eclipse.e4.internal.tools.jdt.templates.E4ContextType"
+            id="e4"
+            registryId="org.eclipse.jdt.ui.CompilationUnitEditor">
+      </contextType>
+      <contextType
+            name="e4 statements"
+            class="org.eclipse.e4.internal.tools.jdt.templates.E4ContextType"
+            id="e4-statements"
+            registryId="org.eclipse.jdt.ui.CompilationUnitEditor">
+      </contextType>
+      <contextType
+            name="e4 members"
+            class="org.eclipse.e4.internal.tools.jdt.templates.E4ContextType"
+            id="e4-members"
+            registryId="org.eclipse.jdt.ui.CompilationUnitEditor">
+      </contextType>
+      <include
+            file="templates/default-e4templates.xml"
+            translations="$nl$/templates/default-e4templates.properties">
+      </include>
+   </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
new file mode 100644
index 0000000000..1fdf5ff922
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     IBM Corporation - initial API and implementation (adapted from JDT's SWTContextType)
+ *******************************************************************************/
+package org.eclipse.e4.internal.tools.jdt.templates;
+
+import org.eclipse.jdt.internal.corext.template.java.AbstractJavaContextType;
+import org.eclipse.jdt.internal.corext.template.java.JavaContext;
+
+/**
+ * The context type for templates inside e4 code.
+ * The same class is used for several context types:
+ * <dl>
+ * <li>templates for all Java code locations</li>
+ * <li>templates for member locations</li>
+ * <li>templates for statement locations</li>
+ * </dl>
+ */
+public class E4ContextType extends AbstractJavaContextType {
+
+	/**
+	 * The context type id for templates working on all Java code locations in e4 projects
+	 */
+	public static final String ID_ALL= "e4"; //$NON-NLS-1$
+
+	/**
+	 * The context type id for templates working on member locations in e4 projects
+	 */
+	public static final String ID_MEMBERS= "e4-members"; //$NON-NLS-1$
+
+	/**
+	 * The context type id for templates working on statement locations in e4 projects
+	 */
+	public static final String ID_STATEMENTS= "e4-statements"; //$NON-NLS-1$
+
+	protected void initializeContext(JavaContext context) {
+		if (!getId().equals(E4ContextType.ID_ALL)) { // a specific context must also allow the templates that work everywhere
+			context.addCompatibleContextType(E4ContextType.ID_ALL);
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
new file mode 100644
index 0000000000..cadf6bfc7c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
@@ -0,0 +1,204 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     IBM Corporation - initial API and implementation (adapted from JDT's SWTTemplateCompletionProposalComputer)
+ *******************************************************************************/
+package org.eclipse.e4.internal.tools.jdt.templates;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jdt.core.CompletionContext;
+import org.eclipse.jdt.core.ElementChangedEvent;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IElementChangedListener;
+import org.eclipse.jdt.core.IJavaElementDelta;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.ui.JavaPlugin;
+import org.eclipse.jdt.internal.ui.text.java.AbstractTemplateCompletionProposalComputer;
+import org.eclipse.jdt.internal.ui.text.template.contentassist.TemplateEngine;
+import org.eclipse.jdt.ui.text.java.JavaContentAssistInvocationContext;
+import org.eclipse.jface.text.templates.ContextTypeRegistry;
+import org.eclipse.jface.text.templates.TemplateContextType;
+
+/**
+ * Computer that computes the template proposals for the E4 context type.
+ *
+ */
+public class E4TemplateCompletionProposalComputer extends AbstractTemplateCompletionProposalComputer {
+
+	/**
+	 * The name of <code>org.eclipse.e4.core.services.IDisposable</code> used to detect
+	 * if a project uses e4.
+	 */
+	private static final String E4_TYPE_NAME= "org.eclipse.e4.core.services.IDisposable"; //$NON-NLS-1$
+
+
+	/**
+	 * Listener that resets the cached java project if its build path changes.
+	 */
+	private final class BuildPathChangeListener implements IElementChangedListener {
+
+		public void elementChanged(ElementChangedEvent event) {
+			IJavaProject javaProject= getCachedJavaProject();
+			if (javaProject == null)
+				return;
+
+			IJavaElementDelta[] children= event.getDelta().getChangedChildren();
+			for (int i= 0; i < children.length; i++) {
+				IJavaElementDelta child= children[i];
+				if (javaProject.equals(child.getElement())) {
+					if (isClasspathChange(child)) {
+						setCachedJavaProject(null);
+					}
+				}
+			}
+		}
+
+		/**
+		 * Does the delta indicate a classpath change?
+		 * @param delta the delta to inspect
+		 * @return true if classpath has changed
+		 */
+		private boolean isClasspathChange(IJavaElementDelta delta) {
+			int flags= delta.getFlags();
+			if (isClasspathChangeFlag(flags))
+				return true;
+
+			if ((flags & IJavaElementDelta.F_CHILDREN) != 0) {
+				IJavaElementDelta[] children= delta.getAffectedChildren();
+				for (int i= 0; i < children.length; i++) {
+					if (isClasspathChangeFlag(children[i].getFlags()))
+						return true;
+				}
+			}
+
+			return false;
+		}
+
+		/**
+		 * Do the flags indicate a classpath change?
+		 * @param flags the flags to inspect
+		 * @return true if the flag flags a classpath change
+		 */
+		private boolean isClasspathChangeFlag(int flags) {
+			if ((flags & IJavaElementDelta.F_RESOLVED_CLASSPATH_CHANGED) != 0)
+				return true;
+
+			if ((flags & IJavaElementDelta.F_ADDED_TO_CLASSPATH) != 0)
+				return true;
+
+			if ((flags & IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) != 0)
+				return true;
+
+			if ((flags & IJavaElementDelta.F_ARCHIVE_CONTENT_CHANGED) != 0)
+				return true;
+
+			return false;
+		}
+	}
+
+
+	/**
+	 * Engine used to compute the proposals for this computer
+	 */
+	private final TemplateEngine fE4TemplateEngine;
+	private final TemplateEngine fE4MembersTemplateEngine;
+	private final TemplateEngine fE4StatementsTemplateEngine;
+
+	/**
+	 * The Java project of the compilation unit for which a template
+	 * engine has been computed last time if any
+	 */
+	private IJavaProject fCachedJavaProject;
+	/**
+	 * Is org.eclipse.e4.core.services.IDisposable on class path of <code>fJavaProject</code>. Invalid
+	 * if <code>fJavaProject</code> is <code>false</code>.
+	 */
+	private boolean fIsE4OnClasspath;
+
+	public E4TemplateCompletionProposalComputer() {
+		ContextTypeRegistry templateContextRegistry= JavaPlugin.getDefault().getTemplateContextRegistry();
+		fE4TemplateEngine= createTemplateEngine(templateContextRegistry, E4ContextType.ID_ALL);
+		fE4MembersTemplateEngine= createTemplateEngine(templateContextRegistry, E4ContextType.ID_MEMBERS);
+		fE4StatementsTemplateEngine= createTemplateEngine(templateContextRegistry, E4ContextType.ID_STATEMENTS);
+
+		JavaCore.addElementChangedListener(new BuildPathChangeListener());
+	}
+
+	private static TemplateEngine createTemplateEngine(ContextTypeRegistry templateContextRegistry, String contextTypeId) {
+		TemplateContextType contextType= templateContextRegistry.getContextType(contextTypeId);
+		Assert.isNotNull(contextType);
+		return new TemplateEngine(contextType);
+	}
+
+	protected TemplateEngine computeCompletionEngine(JavaContentAssistInvocationContext context) {
+		ICompilationUnit unit= context.getCompilationUnit();
+		if (unit == null)
+			return null;
+
+		IJavaProject javaProject= unit.getJavaProject();
+		if (javaProject == null)
+			return null;
+
+		if (isE4OnClasspath(javaProject)) {
+			CompletionContext coreContext= context.getCoreContext();
+			if (coreContext != null) {
+				int tokenLocation= coreContext.getTokenLocation();
+				if ((tokenLocation & CompletionContext.TL_MEMBER_START) != 0) {
+					return fE4MembersTemplateEngine;
+				}
+				if ((tokenLocation & CompletionContext.TL_STATEMENT_START) != 0) {
+					return fE4StatementsTemplateEngine;
+				}
+			}
+			return fE4TemplateEngine;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Tells whether E4 is on the given project's class path.
+	 * 
+	 * @param javaProject the Java project
+	 * @return <code>true</code> if the given project's class path
+	 */
+	private synchronized boolean isE4OnClasspath(IJavaProject javaProject) {
+		if (!javaProject.equals(fCachedJavaProject)) {
+			fCachedJavaProject= javaProject;
+			try {
+				IType type= javaProject.findType(E4_TYPE_NAME);
+				fIsE4OnClasspath= type != null;
+			} catch (JavaModelException e) {
+				fIsE4OnClasspath= false;
+			}
+		}
+		return fIsE4OnClasspath;
+	}
+
+	/**
+	 * Returns the cached Java project.
+	 *
+	 * @return the cached Java project or <code>null</code> if none
+	 */
+	private synchronized IJavaProject getCachedJavaProject() {
+		return fCachedJavaProject;
+	}
+
+	/**
+	 * Set the cached Java project.
+	 *
+	 * @param project or <code>null</code> to reset the cache
+	 */
+	private synchronized void setCachedJavaProject(IJavaProject project) {
+		fCachedJavaProject= project;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.properties b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
new file mode 100644
index 0000000000..33dd080869
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+/*******************************************************************************
+ * Copyright (c) 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Boris Bokowski, IBM Corporation - initial API and implementation
+ *******************************************************************************/
+-->
+
+<templates>
+
+<template name="e4-parent" description="Injected Parent Composite" id="org.eclipse.e4.tools.jdt.templates.parent" context="e4-members" enabled="true" autoinsert="false">@Inject
+Composite parent;</template>
+
+<template name="e4-preference" description="Injected Preference Value" id="org.eclipse.e4.tools.jdt.templates.preference" context="e4-members" enabled="true" autoinsert="false">@Inject
+void setPreferenceValue(@Named("preference-PREFERENCE_KEY") String preferenceValue) {
+	${cursor}
+}</template>
+
+<template name="e4-adapter" description="Injected Adapter Service" id="org.eclipse.e4.tools.jdt.templates.adapter" context="e4-members" enabled="true" autoinsert="false">@Inject
+Adapter adapter;</template>
+
+<template name="e4-preferences" description="Injected Preferences Service" id="org.eclipse.e4.tools.jdt.templates.preferences" context="e4-members" enabled="true" autoinsert="false">@Inject
+IEclipsePreferences preferences;</template>
+
+<template name="e4-statushandler" description="Injected Status Handler" id="org.eclipse.e4.tools.jdt.templates.statushandler" context="e4-members" enabled="true" autoinsert="false">@Inject
+IStatusHandler statusHandler;</template>
+
+<template name="e4-logger" description="Injected Logger" id="org.eclipse.e4.tools.jdt.templates.logger" context="e4-members" enabled="true" autoinsert="false">@Inject
+Logger logger;</template>
+
+<template name="e4-eventbroker" description="Injected Event Broker" id="org.eclipse.e4.tools.jdt.templates.eventbroker" context="e4-members" enabled="true" autoinsert="false">@Inject
+IEventBroker eventBroker;</template>
+
+<template name="e4-stylingengine" description="Injected Styling Engine" id="org.eclipse.e4.tools.jdt.templates.stylingengine" context="e4-members" enabled="true" autoinsert="false">@Inject
+IStylingEngine stylingEngine;</template>
+
+<template name="e4-event" description="Event Handler Method" id="org.eclipse.e4.tools.jdt.templates.eventhandler" context="e4-members" enabled="true" autoinsert="false">@EventHandler("some/event/topic")
+void handleSomeEvent(Payload payloadObject) {
+	${cursor}
+}</template>
+
+<template name="e4-init" description="Initialization Method" id="org.eclipse.e4.tools.jdt.templates.init" context="e4-members" enabled="true" autoinsert="false">@PostConstruct
+void init() {
+	${cursor}
+}</template>
+
+<template name="e4-dispose" description="Dispose Method" id="org.eclipse.e4.tools.jdt.templates.dispose" context="e4-members" enabled="true" autoinsert="false">@PreDestroy
+void dispose() {
+	${cursor}
+}</template>
+
+</templates>

From 0ebc285e2d2075883c62bd490f4b9d3b13c29691 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 8 Mar 2010 23:26:59 +0000
Subject: [PATCH 0010/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * some more editors started to implement

---
 .../component/AbstractComponentEditor.java    |  19 +-
 .../emf/ui/internal/common/ModelEditor.java   |   2 +-
 .../common/component/ApplicationEditor.java   |  15 +-
 .../common/component/CommandEditor.java       | 175 +++++++++++--
 .../common/component/ControlFactory.java      | 126 ++++++++++
 .../component/DirectToolItemEditor.java       |   4 +-
 .../component/HandledToolItemEditor.java      |   4 +-
 .../common/component/HandlerEditor.java       |  82 +++++-
 .../common/component/KeyBindingEditor.java    | 238 +++++++++++++++++-
 .../component/ModelComponentEditor.java       |  18 +-
 .../component/ModelComponentsEditor.java      |  10 +-
 .../component/PartDescriptorEditor.java       |   4 +-
 .../internal/common/component/PartEditor.java |  31 +--
 .../component/PartSashContainerEditor.java    |  60 ++++-
 .../common/component/PartStackEditor.java     |  13 +-
 .../common/component/ToolBarEditor.java       |  13 +-
 .../common/component/ToolItemEditor.java      | 129 +---------
 .../common/component/WindowEditor.java        |  85 ++++++-
 .../common/component/WindowTrimEditor.java    |  13 +-
 19 files changed, 791 insertions(+), 250 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index d96d4bff5e..532731877c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -17,6 +17,7 @@
 import java.util.Map;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.graphics.Image;
@@ -35,11 +36,13 @@ public abstract class AbstractComponentEditor {
 		"/icons/full/obj16/arrow_down.png",
 	};
 
-	protected static final int SEARCH_IMAGE = 0;
-	protected static final int TABLE_ADD_IMAGE = 1;
-	protected static final int TABLE_DELETE_IMAGE = 2;
-	protected static final int ARROW_UP = 3;
-	protected static final int ARROW_DOWN = 4;
+	private WritableValue master = new WritableValue();
+
+	public static final int SEARCH_IMAGE = 0;
+	public static final int TABLE_ADD_IMAGE = 1;
+	public static final int TABLE_DELETE_IMAGE = 2;
+	public static final int ARROW_UP = 3;
+	public static final int ARROW_DOWN = 4;
 
 	public AbstractComponentEditor(EditingDomain editingDomain) {
 		this.editingDomain = editingDomain;
@@ -49,7 +52,11 @@ public EditingDomain getEditingDomain() {
 		return editingDomain;
 	}
 
-	protected Image getImage( Display d, int id) {
+	public WritableValue getMaster() {
+		return master;
+	}
+
+	public Image getImage( Display d, int id) {
 		Image img = IMAGE_MAP.get(id);
 		if( img == null ) {
 			try {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 011f7c0a4e..50a8dc1286 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -144,7 +144,7 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		parent.setLayout(l);
 		ShadowComposite editingArea = new ShadowComposite(parent,SWT.NONE);
 		editingArea.setLayout(new FillLayout());
-		TreeViewer viewer = new TreeViewer(editingArea);
+		TreeViewer viewer = new TreeViewer(editingArea,SWT.FULL_SELECTION|SWT.H_SCROLL|SWT.V_SCROLL);
 		viewer.setLabelProvider(new ComponentLabelProvider(this));
 		ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(
 				new ObservableFactoryImpl(), new TreeStructureAdvisorImpl());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index a3d9c923c5..e39b37fb57 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -13,16 +13,14 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.SWT;
@@ -33,9 +31,8 @@
 public class ApplicationEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private WritableValue master = new WritableValue();
 	private Image image;
-	private DataBindingContext context;
+	private EMFDataBindingContext context;
 
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS);
@@ -74,14 +71,14 @@ public String getDescription(Object element) {
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
 		if( composite == null ) {
-			context = new DataBindingContext();
-			composite = createForm(parent,context, master);
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context);
 		}
-		master.setValue(object);
+		getMaster().setValue(object);
 		return composite;
 	}
 
-	protected Composite createForm(Composite parent, DataBindingContext context, IObservableValue master) {
+	protected Composite createForm(Composite parent, EMFDataBindingContext context) {
 		parent = new Composite(parent,SWT.NONE);
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 0d4413e6f9..6ec4b7c24c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -13,31 +13,42 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MCommand;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class CommandEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private WritableValue master = new WritableValue();
 	private Image image;
-	private DataBindingContext context;
+	private EMFDataBindingContext context;
 
 	public CommandEditor(EditingDomain editingDomain) {
 		super(editingDomain);
-		// TODO Auto-generated constructor stub
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Command.gif"));
 			} catch (MalformedURLException e) {
@@ -61,17 +72,149 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
-			context = new DataBindingContext();
-			composite = createForm(parent,context, master);
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent, context);
 		}
-		master.setValue(object);
+		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, DataBindingContext context2,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
+	private Composite createForm(Composite parent, EMFDataBindingContext context) {
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IValueProperty textProp = WidgetProperties.text();
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Name");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND__COMMAND_NAME).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Description");
+			l.setLayoutData(new GridData(GridData.BEGINNING,GridData.BEGINNING,false,false));
+
+			Text t = new Text(parent, SWT.BORDER|SWT.H_SCROLL|SWT.V_SCROLL);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			gd.heightHint=100;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND__DESCRIPTION).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Parameters");
+			l.setLayoutData(new GridData(GridData.BEGINNING,GridData.BEGINNING,false,false));
+
+			TableViewer viewer = new TableViewer(parent,SWT.FULL_SELECTION|SWT.MULTI|SWT.BORDER);
+			viewer.getTable().setHeaderVisible(true);
+
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 120;
+			viewer.getControl().setLayoutData(gd);
+
+			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+			column.getColumn().setText("Name");
+			column.getColumn().setWidth(200);
+
+			column = new TableViewerColumn(viewer, SWT.NONE);
+			column.getColumn().setText("Type-Id");
+			column.getColumn().setWidth(200);
+
+			column = new TableViewerColumn(viewer, SWT.NONE);
+			column.getColumn().setText("Optional");
+			column.getColumn().setWidth(200);
+
+			IEMFEditListProperty mProp = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.COMMAND__PARAMETERS);
+			IValueProperty[] props = {
+					EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND_PARAMETER__NAME),
+					EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND_PARAMETER__TYPE_ID),
+					EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND_PARAMETER__OPTIONAL)
+			};
+
+			ViewerSupport.bind(viewer, mProp.observeDetail(getMaster()), props);
+
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+//			b.addSelectionListener(new SelectionAdapter() {
+//				@Override
+//				public void widgetSelected(SelectionEvent e) {
+//					MHandledItem item = (MHandledItem) master.getValue();
+//					MParameter param = MApplicationFactory.eINSTANCE.createParameter();
+//					Command cmd = AddCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS, param);
+//					if( cmd.canExecute() ) {
+//						getEditingDomain().getCommandStack().execute(cmd);
+//					}
+//					tableviewer.editElement(param, 0);
+//				}
+//			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+//			b.addSelectionListener(new SelectionAdapter() {
+//
+//				public void widgetSelected(SelectionEvent e) {
+//					IStructuredSelection s = (IStructuredSelection) tableviewer.getSelection();
+//					if( !s.isEmpty() ) {
+//						MHandledItem item = (MHandledItem) master.getValue();
+//						Command cmd = RemoveCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS, s.toList());
+//						if( cmd.canExecute() ) {
+//							getEditingDomain().getCommandStack().execute(cmd);
+//						}
+//					}
+//				}
+//
+//			});
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		}
+
+		ControlFactory.createTagsWidget(parent, this);
+
 		return parent;
 	}
 
@@ -83,7 +226,11 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		// TODO Auto-generated method stub
+		MCommand cmd = (MCommand) element;
+		if (cmd.getCommandName() != null && cmd.getCommandName().trim().length() > 0) {
+			return cmd.getCommandName();
+		}
+
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
new file mode 100644
index 0000000000..3c42321410
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -0,0 +1,126 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.util.Arrays;
+
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class ControlFactory {
+	public static void createTagsWidget( Composite parent, final AbstractComponentEditor editor ) {
+		Label l = new Label(parent, SWT.NONE);
+		l.setText("Tags");
+		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+
+		final Text tagText = new Text(parent, SWT.BORDER);
+		tagText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		tagText.addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyPressed(KeyEvent e) {
+				if (e.keyCode == SWT.CR || e.keyCode == SWT.LF) {
+					handleAddText(editor, tagText);
+				}
+			}
+		});
+
+		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+		b.setText("Add");
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				handleAddText(editor, tagText);
+			}
+		});
+		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+
+		l = new Label(parent, SWT.NONE);
+		final TableViewer viewer = new TableViewer(parent);
+		viewer.setContentProvider(new ObservableListContentProvider());
+		viewer.setLabelProvider(new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				return element.toString();
+			}
+		});
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.heightHint = 120;
+		viewer.getControl().setLayoutData(gd);
+
+		IEMFEditListProperty prop = EMFEditProperties.list(editor.getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__TAGS);
+		viewer.setInput(prop.observeDetail(editor.getMaster()));
+
+		Composite buttonComp = new Composite(parent, SWT.NONE);
+		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+		GridLayout gl = new GridLayout();
+		gl.marginLeft = 0;
+		gl.marginRight = 0;
+		gl.marginWidth = 0;
+		gl.marginHeight = 0;
+		buttonComp.setLayout(gl);
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Up");
+		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_UP));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Down");
+		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_DOWN));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Remove");
+		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_DELETE_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+				if( ! s.isEmpty() ) {
+					MApplicationElement appEl = (MApplicationElement) editor.getMaster().getValue();
+					Command cmd = RemoveCommand.create(editor.getEditingDomain(), appEl, MApplicationPackage.Literals.APPLICATION_ELEMENT__TAGS, s.toList());
+					if( cmd.canExecute() ) {
+						editor.getEditingDomain().getCommandStack().execute(cmd);
+					}
+				}
+			}
+		});
+	}
+
+	private static void handleAddText( AbstractComponentEditor editor, Text tagText) {
+		if (tagText.getText().trim().length() > 0) {
+			String[] tags = tagText.getText().split(";");
+			for( int i = 0; i < tags.length;i++ ) {
+				tags[i] = tags[i].trim();
+			}
+
+			MApplicationElement appEl = (MApplicationElement) editor.getMaster().getValue();
+			Command cmd = AddCommand.create(editor.getEditingDomain(), appEl, MApplicationPackage.Literals.APPLICATION_ELEMENT__TAGS, Arrays.asList(tags));
+			if (cmd.canExecute()) {
+				editor.getEditingDomain().getCommandStack().execute(cmd);
+			}
+			tagText.setText("");
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 0851af1f53..89765f6ddd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -13,10 +13,10 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -52,7 +52,7 @@ public Image getImage(Object element, Display display) {
 
 
 	@Override
-	protected void createSubTypeFormElements(Composite parent, DataBindingContext context, WritableValue master) {
+	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, WritableValue master) {
 		IValueProperty textProp = WidgetProperties.text();
 
 		Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 535e52bca9..5b4ed386d4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -13,7 +13,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
@@ -21,6 +20,7 @@
 import org.eclipse.e4.ui.model.application.MHandledItem;
 import org.eclipse.e4.ui.model.application.MParameter;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
@@ -74,7 +74,7 @@ public Image getImage(Object element, Display display) {
 	}
 
 	@Override
-	protected void createSubTypeFormElements(Composite parent, DataBindingContext context, final WritableValue master) {
+	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, final WritableValue master) {
 		IValueProperty textProp = WidgetProperties.text();
 
 		Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 77a46f65b9..7208902935 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -13,25 +13,33 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MHandler;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class HandlerEditor extends AbstractComponentEditor {
 	private Composite composite;
-	private WritableValue master = new WritableValue();
 	private Image image;
-	private DataBindingContext context;
+	private EMFDataBindingContext context;
 
 	public HandlerEditor(EditingDomain editingDomain) {
 		super(editingDomain);
-		// TODO Auto-generated constructor stub
 	}
 
 
@@ -61,16 +69,64 @@ public String getDescription(Object element) {
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
 		if( composite == null ) {
-			context = new DataBindingContext();
-			composite = createForm(parent,context, master);
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context);
 		}
-		master.setValue(object);
+		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, DataBindingContext context2,
-			WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IValueProperty textProp = WidgetProperties.text();
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Command");
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			t.setEnabled(false);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value( getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLER__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(getMaster()));
+
+			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			b.setText("Find ...");
+			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Class URI");
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(getMaster()));
+
+			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+			b.setText("Find ...");
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+		}
+
+		ControlFactory.createTagsWidget(parent, this);
+
 		return parent;
 	}
 
@@ -82,7 +138,11 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		// TODO Auto-generated method stub
+		MHandler handler = (MHandler) element;
+		if( handler.getCommand() != null && handler.getCommand().getCommandName() != null && handler.getCommand().getCommandName().trim().length() > 0 ) {
+			return handler.getCommand().getCommandName();
+		}
+
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 2b64686b18..cbc94d2e08 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -13,22 +13,52 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MKeyBinding;
+import org.eclipse.e4.ui.model.application.MKeySequence;
+import org.eclipse.e4.ui.model.application.MParameter;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.ColumnViewerEditor;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
+import org.eclipse.jface.viewers.EditingSupport;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.TableViewerEditor;
+import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class KeyBindingEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private WritableValue master = new WritableValue();
 	private Image image;
-	private DataBindingContext context;
+	private EMFDataBindingContext context;
 
 	public KeyBindingEditor(EditingDomain editingDomain) {
 		super(editingDomain);
@@ -62,16 +92,201 @@ public String getDescription(Object element) {
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
 		if( composite == null ) {
-			context = new DataBindingContext();
-			composite = createForm(parent,context, master);
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context);
 		}
-		master.setValue(object);
+		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, DataBindingContext context2,
-			WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IValueProperty textProp = WidgetProperties.text();
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Sequence");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.KEY_SEQUENCE__KEY_SEQUENCE).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Command");
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			t.setEnabled(false);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value( getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.KEY_BINDING__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(getMaster()));
+
+			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			b.setText("Find ...");
+			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+		}
+
+		Label l = new Label(parent, SWT.NONE);
+		l.setText("Parameters");
+		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+
+		final TableViewer tableviewer = new TableViewer(parent);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.heightHint = 120;
+		tableviewer.getTable().setHeaderVisible(true);
+		tableviewer.getControl().setLayoutData(gd);
+		IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.KEY_BINDING__PARAMETERS);
+
+		TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
+		column.getColumn().setText("Tag");
+		column.getColumn().setWidth(200);
+		column.setEditingSupport(new EditingSupport(tableviewer) {
+			private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
+
+			@Override
+			protected void setValue(Object element, Object value) {
+				((MParameter)element).setTag((String) value);
+			}
+
+			@Override
+			protected Object getValue(Object element) {
+				String val = ((MParameter)element).getTag();
+				return val == null ? "" : val;
+			}
+
+			@Override
+			protected CellEditor getCellEditor(Object element) {
+				return cellEditor;
+			}
+
+			@Override
+			protected boolean canEdit(Object element) {
+				return true;
+			}
+		});
+
+		column = new TableViewerColumn(tableviewer, SWT.NONE);
+		column.getColumn().setText("Value");
+		column.getColumn().setWidth(200);
+		column.setEditingSupport(new EditingSupport(tableviewer) {
+			private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
+
+			@Override
+			protected void setValue(Object element, Object value) {
+				((MParameter)element).setValue((String) value);
+			}
+
+			@Override
+			protected Object getValue(Object element) {
+				String val = ((MParameter)element).getValue();
+				return val == null ? "" : val;
+			}
+
+			@Override
+			protected CellEditor getCellEditor(Object element) {
+				return cellEditor;
+			}
+
+			@Override
+			protected boolean canEdit(Object element) {
+				return true;
+			}
+		});
+
+		ColumnViewerEditorActivationStrategy editorActivationStrategy = new ColumnViewerEditorActivationStrategy(tableviewer) {
+			@Override
+			protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
+				boolean singleSelect = ((IStructuredSelection)tableviewer.getSelection()).size() == 1;
+				boolean isLeftDoubleMouseSelect = event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION && ((MouseEvent)event.sourceEvent).button == 1;
+
+				return singleSelect && (isLeftDoubleMouseSelect
+						|| event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC
+						|| event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
+			}
+		};
+		TableViewerEditor.create(tableviewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
+
+		ViewerSupport.bind(tableviewer, prop.observeDetail(getMaster()), new IValueProperty[] {
+			EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__TAG),
+			EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__VALUE)
+		});
+
+		Composite buttonComp = new Composite(parent, SWT.NONE);
+		buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+		GridLayout gl = new GridLayout();
+		gl.marginLeft=0;
+		gl.marginRight=0;
+		gl.marginWidth=0;
+		gl.marginHeight=0;
+		buttonComp.setLayout(gl);
+
+		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Up");
+		b.setImage(getImage(b.getDisplay(), ARROW_UP));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Down");
+		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Add ...");
+		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				MKeyBinding item = (MKeyBinding) getMaster().getValue();
+				MParameter param = MApplicationFactory.eINSTANCE.createParameter();
+				Command cmd = AddCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.KEY_BINDING__PARAMETERS, param);
+				if( cmd.canExecute() ) {
+					getEditingDomain().getCommandStack().execute(cmd);
+				}
+				tableviewer.editElement(param, 0);
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Remove");
+		b.addSelectionListener(new SelectionAdapter() {
+
+			public void widgetSelected(SelectionEvent e) {
+				IStructuredSelection s = (IStructuredSelection) tableviewer.getSelection();
+				if( !s.isEmpty() ) {
+					MKeyBinding item = (MKeyBinding) getMaster().getValue();
+					Command cmd = RemoveCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.KEY_BINDING__PARAMETERS, s.toList());
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+					}
+				}
+			}
+
+		});
+		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+		ControlFactory.createTagsWidget(parent, this);
+
 		return parent;
 	}
 
@@ -83,7 +298,10 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		// TODO Auto-generated method stub
+		MKeySequence seq = (MKeySequence) element;
+		if( seq.getKeySequence() != null && seq.getKeySequence().trim().length() > 0 ) {
+			return seq.getKeySequence();
+		}
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index 4953469824..7e0465fbd0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -10,10 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -23,6 +21,7 @@
 import org.eclipse.e4.ui.model.application.MMenu;
 import org.eclipse.e4.ui.model.application.MModelComponent;
 import org.eclipse.e4.ui.model.application.MPart;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -41,9 +40,8 @@
 public class ModelComponentEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private WritableValue master = new WritableValue();
 	private Image image;
-	private DataBindingContext context;
+	private EMFDataBindingContext context;
 
 	private IListProperty MODEL_COMPONENT__CHILDREN = EMFProperties.list( MApplicationPackage.Literals.MODEL_COMPONENT__CHILDREN);
 
@@ -55,10 +53,10 @@ public ModelComponentEditor(EditingDomain editingDomain) {
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
 		if( composite == null ) {
-			context = new DataBindingContext();
+			context = new EMFDataBindingContext();
 			composite = createForm(parent);
 		}
-		master.setValue(object);
+		getMaster().setValue(object);
 		return composite;
 	}
 
@@ -92,7 +90,7 @@ private Composite createForm(Composite parent) {
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));
+		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 
 		// ------------------------------------------------------------
 
@@ -119,7 +117,7 @@ private Composite createForm(Composite parent) {
 
 		t = new Text(parent, SWT.BORDER);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__PARENT_ID).observeDetail(master));
+		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__PARENT_ID).observeDetail(getMaster()));
 
 		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 		b.setText("Find ...");
@@ -133,7 +131,7 @@ private Composite createForm(Composite parent) {
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__POSITION_IN_PARENT).observeDetail(master));
+		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__POSITION_IN_PARENT).observeDetail(getMaster()));
 
 		// ------------------------------------------------------------
 
@@ -144,7 +142,7 @@ private Composite createForm(Composite parent) {
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__PROCESSOR).observeDetail(master));
+		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__PROCESSOR).observeDetail(getMaster()));
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
index a8292c952f..9bd3ca841f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
@@ -10,12 +10,11 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.SWT;
@@ -28,9 +27,8 @@ public class ModelComponentsEditor extends AbstractComponentEditor {
 	private IListProperty MODEL_COMPONENTS__COMPONENTS = EMFProperties.list(MApplicationPackage.Literals.MODEL_COMPONENTS__COMPONENTS);
 
 	private Composite composite;
-	private WritableValue master = new WritableValue();
 	private Image image;
-	private DataBindingContext context;
+	private EMFDataBindingContext context;
 
 	public ModelComponentsEditor(EditingDomain editingDomain) {
 		super(editingDomain);
@@ -58,10 +56,10 @@ public String getDescription(Object element) {
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
 		if( composite == null ) {
-			context = new DataBindingContext();
+			context = new EMFDataBindingContext();
 			composite = createForm(parent);
 		}
-		master.setValue(object);
+		getMaster().setValue(object);
 		return composite;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 00c1fd8213..16f14ce95b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -10,10 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -30,7 +30,7 @@ public PartDescriptorEditor(EditingDomain editingDomain) {
 	}
 
 	@Override
-	protected Composite createForm(Composite parent, DataBindingContext context, IObservableValue master) {
+	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master) {
 		Composite comp = super.createForm(parent,context,master);
 
 		IValueProperty textProp = WidgetProperties.text();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 48a7d5c836..8b3af6a580 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -13,11 +13,9 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -25,6 +23,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MPart;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -45,9 +44,8 @@
 public class PartEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private WritableValue master = new WritableValue();
 	private Image image;
-	private DataBindingContext context;
+	private EMFDataBindingContext context;
 
 	private IListProperty PART__MENUS = EMFProperties.list(MApplicationPackage.Literals.PART__MENUS);
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
@@ -55,7 +53,6 @@ public class PartEditor extends AbstractComponentEditor {
 
 	public PartEditor(EditingDomain editingDomain) {
 		super(editingDomain);
-		// TODO Auto-generated constructor stub
 	}
 
 	@Override
@@ -85,14 +82,14 @@ public String getDescription(Object element) {
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
 		if( composite == null ) {
-			context = new DataBindingContext();
-			composite = createForm(parent,context, master);
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
 		}
-		master.setValue(object);
+		getMaster().setValue(object);
 		return composite;
 	}
 
-	protected Composite createForm(Composite parent, DataBindingContext context, IObservableValue master) {
+	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master) {
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
@@ -155,23 +152,11 @@ protected Composite createForm(Composite parent, DataBindingContext context, IOb
 
 		// ------------------------------------------------------------
 
-		l = new Label(parent, SWT.NONE);
-		l.setText("Tags");
-		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
-
-		ListViewer viewer = new ListViewer(parent);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
-		gd.heightHint = 80;
-		viewer.getList().setLayoutData(gd);
-
-		// ------------------------------------------------------------
-
 		l = new Label(parent, SWT.NONE);
 		l.setText("Variables");
 		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 
-		viewer = new ListViewer(parent);
+		ListViewer viewer = new ListViewer(parent);
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		gd.heightHint = 80;
@@ -198,6 +183,8 @@ protected Composite createForm(Composite parent, DataBindingContext context, IOb
 		column.getColumn().setText("Value");
 		column.getColumn().setWidth(200);
 
+		ControlFactory.createTagsWidget(parent, this);
+
 //		// ------------------------------------------------------------
 //
 //		l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index be11560eae..3a2f63df7c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -13,27 +13,38 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MPartSashContainer;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
+import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class PartSashContainerEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private WritableValue master = new WritableValue();
 	private Image vImage;
 	private Image hImage;
-	private DataBindingContext context;
+	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
@@ -84,16 +95,51 @@ public String getDescription(Object element) {
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
 		if( composite == null ) {
-			context = new DataBindingContext();
-			composite = createForm(parent,context, master);
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
 		}
-		master.setValue(object);
+		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, DataBindingContext context2,
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
 			WritableValue master) {
 		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IValueProperty textProp = WidgetProperties.text();
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Orientation");
+
+			ComboViewer viewer = new ComboViewer(parent);
+			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					return ((Boolean)element).booleanValue() ? "Horizontal" : "Vertical";
+				}
+			});
+			viewer.setInput(new Boolean[] { Boolean.TRUE, Boolean.FALSE });
+			IViewerValueProperty vProp = ViewerProperties.singleSelection();
+			context.bindValue(vProp.observe(viewer), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.GENERIC_TILE__HORIZONTAL).observeDetail(getMaster()));
+		}
+
+
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index f350b0c743..23493d0533 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -13,12 +13,12 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.SWT;
@@ -29,9 +29,8 @@
 public class PartStackEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private WritableValue master = new WritableValue();
 	private Image image;
-	private DataBindingContext context;
+	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
@@ -67,14 +66,14 @@ public String getDescription(Object element) {
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
 		if( composite == null ) {
-			context = new DataBindingContext();
-			composite = createForm(parent,context, master);
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
 		}
-		master.setValue(object);
+		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, DataBindingContext context2,
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
 			WritableValue master) {
 		parent = new Composite(parent,SWT.NONE);
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index e13175ed2f..bdddc0c9f2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -13,12 +13,12 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.SWT;
@@ -29,9 +29,8 @@
 public class ToolBarEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private WritableValue master = new WritableValue();
 	private Image image;
-	private DataBindingContext context;
+	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
@@ -66,14 +65,14 @@ public String getDescription(Object element) {
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
 		if( composite == null ) {
-			context = new DataBindingContext();
-			composite = createForm(parent,context, master);
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
 		}
-		master.setValue(object);
+		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, DataBindingContext context2,
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
 			WritableValue master) {
 		parent = new Composite(parent,SWT.NONE);
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index f7e4a38479..d2995869ff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -12,37 +12,23 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Arrays;
 
-import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.ItemType;
-import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MToolItem;
-import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -54,9 +40,8 @@
 
 public class ToolItemEditor extends AbstractComponentEditor {
 	private Composite composite;
-	private WritableValue master = new WritableValue();
 	private Image image;
-	private DataBindingContext context;
+	private EMFDataBindingContext context;
 
 	public ToolItemEditor(EditingDomain editingDomain) {
 		super(editingDomain);
@@ -89,14 +74,14 @@ public String getDescription(Object element) {
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
 		if (composite == null) {
-			context = new DataBindingContext();
-			composite = createForm(parent, context, master);
+			context = new EMFDataBindingContext();
+			composite = createForm(parent, context, getMaster());
 		}
-		master.setValue(object);
+		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, DataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
@@ -118,7 +103,7 @@ private Composite createForm(Composite parent, DataBindingContext context, Writa
 		return parent;
 	}
 
-	private void createFormSubTypeForm(Composite parent, DataBindingContext context, final WritableValue master) {
+	private void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, final WritableValue master) {
 		IValueProperty textProp = WidgetProperties.text();
 
 		// ------------------------------------------------------------
@@ -179,106 +164,10 @@ private void createFormSubTypeForm(Composite parent, DataBindingContext context,
 
 		createSubTypeFormElements(parent, context, master);
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText("Tags");
-			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
-
-			final Text tagText = new Text(parent, SWT.BORDER);
-			tagText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			tagText.addKeyListener(new KeyAdapter() {
-				@Override
-				public void keyPressed(KeyEvent e) {
-					if (e.keyCode == SWT.CR || e.keyCode == SWT.LF) {
-						handleAddText(tagText);
-					}
-				}
-			});
-
-			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText("Add");
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					handleAddText(tagText);
-				}
-			});
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-
-			l = new Label(parent, SWT.NONE);
-			final TableViewer viewer = new TableViewer(parent);
-			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					return element.toString();
-				}
-			});
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 120;
-			viewer.getControl().setLayoutData(gd);
-
-			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__TAGS);
-			viewer.setInput(prop.observeDetail(master));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if( ! s.isEmpty() ) {
-						MApplicationElement appEl = (MApplicationElement) master.getValue();
-						Command cmd = RemoveCommand.create(getEditingDomain(), appEl, MApplicationPackage.Literals.APPLICATION_ELEMENT__TAGS, s.toList());
-						if( cmd.canExecute() ) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
-		}
-	}
-
-	private void handleAddText(Text tagText) {
-		if (tagText.getText().trim().length() > 0) {
-			String[] tags = tagText.getText().split(";");
-			for( int i = 0; i < tags.length;i++ ) {
-				tags[i] = tags[i].trim();
-			}
-
-			MApplicationElement appEl = (MApplicationElement) master.getValue();
-			Command cmd = AddCommand.create(getEditingDomain(), appEl, MApplicationPackage.Literals.APPLICATION_ELEMENT__TAGS, Arrays.asList(tags));
-			if (cmd.canExecute()) {
-				getEditingDomain().getCommandStack().execute(cmd);
-			}
-			tagText.setText("");
-		}
+		ControlFactory.createTagsWidget(parent, this);
 	}
 
-	protected void createSubTypeFormElements(Composite parent, DataBindingContext context, WritableValue master) {
+	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, WritableValue master) {
 
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 35b5690f5c..148070e7c6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -13,29 +13,35 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MWindow;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class WindowEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private WritableValue master = new WritableValue();
 	private Image image;
-	private DataBindingContext context;
+	private EMFDataBindingContext context;
 
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS);
@@ -73,16 +79,81 @@ public String getDescription(Object element) {
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
 		if( composite == null ) {
-			context = new DataBindingContext();
-			composite = createForm(parent,context, master);
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
 		}
-		master.setValue(object);
+		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, DataBindingContext context2,
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
 			WritableValue master) {
 		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IValueProperty textProp = WidgetProperties.text();
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("X");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__X).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Y");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__Y).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Width");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__WIDTH).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Height");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__HEIGHT).observeDetail(getMaster()));
+		}
+
+
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
index cc08c9d605..6325f8ee8e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
@@ -13,12 +13,12 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.SWT;
@@ -29,9 +29,8 @@
 public class WindowTrimEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private WritableValue master = new WritableValue();
 	private Image image;
-	private DataBindingContext context;
+	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
@@ -67,14 +66,14 @@ public String getDescription(Object element) {
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
 		if( composite == null ) {
-			context = new DataBindingContext();
-			composite = createForm(parent,context, master);
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
 		}
-		master.setValue(object);
+		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, DataBindingContext context2,
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
 			WritableValue master) {
 		parent = new Composite(parent,SWT.NONE);
 		return parent;

From dc69b99aa839f98921316352ffb8c41673fef364 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 9 Mar 2010 00:19:01 +0000
Subject: [PATCH 0011/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * fixed container element editing

---
 .../component/PartSashContainerEditor.java    | 49 ++++++++++++-
 .../common/component/PartStackEditor.java     | 73 ++++++++++++++++++-
 .../common/component/WindowEditor.java        |  1 +
 3 files changed, 121 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 3a2f63df7c..95c1e23bf7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -13,7 +13,11 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
@@ -23,10 +27,13 @@
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.databinding.viewers.ViewerSupport;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -102,7 +109,7 @@ public Composite getEditor(Composite parent, Object object) {
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
+	private Composite createForm(Composite parent, final EMFDataBindingContext context,
 			WritableValue master) {
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
@@ -127,6 +134,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			l.setText("Orientation");
 
 			ComboViewer viewer = new ComboViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			viewer.getControl().setLayoutData(gd);
 			viewer.setContentProvider(new ArrayContentProvider());
 			viewer.setLabelProvider(new LabelProvider() {
 				@Override
@@ -139,6 +149,43 @@ public String getText(Object element) {
 			context.bindValue(vProp.observe(viewer), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.GENERIC_TILE__HORIZONTAL).observeDetail(getMaster()));
 		}
 
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Selected Element");
+
+			ComboViewer viewer = new ComboViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			viewer.getControl().setLayoutData(gd);
+			IEMFEditListProperty listProp = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID);
+			IViewerValueProperty vProp = ViewerProperties.singleSelection();
+
+			final Binding[] binding = new Binding[1];
+			final IObservableValue uiObs = vProp.observe(viewer);
+			final IObservableValue mObs = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(getMaster());
+			getMaster().addValueChangeListener(new IValueChangeListener() {
+
+				public void handleValueChange(ValueChangeEvent event) {
+					if( binding[0] != null ) {
+						binding[0].dispose();
+					}
+
+				}
+			});
+
+			ViewerSupport.bind(viewer, listProp.observeDetail(getMaster()), valProp);
+
+			getMaster().addValueChangeListener(new IValueChangeListener() {
+
+				public void handleValueChange(ValueChangeEvent event) {
+					binding[0] = context.bindValue(uiObs, mObs);
+				}
+			});
+		}
+
+		ControlFactory.createTagsWidget(parent, this);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 23493d0533..d6f387ea34 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -13,18 +13,35 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
+import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class PartStackEditor extends AbstractComponentEditor {
 
@@ -73,9 +90,63 @@ public Composite getEditor(Composite parent, Object object) {
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
+	private Composite createForm(Composite parent, final EMFDataBindingContext context,
 			WritableValue master) {
 		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IValueProperty textProp = WidgetProperties.text();
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Selected Element");
+
+			ComboViewer viewer = new ComboViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			viewer.getControl().setLayoutData(gd);
+			IEMFEditListProperty listProp = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL);
+			IViewerValueProperty vProp = ViewerProperties.singleSelection();
+
+			final Binding[] binding = new Binding[1];
+			final IObservableValue uiObs = vProp.observe(viewer);
+			final IObservableValue mObs = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(getMaster());
+			getMaster().addValueChangeListener(new IValueChangeListener() {
+
+				public void handleValueChange(ValueChangeEvent event) {
+					if( binding[0] != null ) {
+						binding[0].dispose();
+					}
+
+				}
+			});
+
+			ViewerSupport.bind(viewer, listProp.observeDetail(getMaster()), valProp);
+
+			getMaster().addValueChangeListener(new IValueChangeListener() {
+
+				public void handleValueChange(ValueChangeEvent event) {
+					binding[0] = context.bindValue(uiObs, mObs);
+				}
+			});
+		}
+
+		ControlFactory.createTagsWidget(parent, this);
+
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 148070e7c6..dc67162560 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -153,6 +153,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__HEIGHT).observeDetail(getMaster()));
 		}
 
+		ControlFactory.createTagsWidget(parent, this);
 
 		return parent;
 	}

From 94257a4f71e8dc55d6c07e0bbb31efe6aa8743ce Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 9 Mar 2010 00:52:45 +0000
Subject: [PATCH 0012/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * some more editors

---
 .../emf/ui/internal/common/ModelEditor.java   |   6 +
 .../common/component/PartStackEditor.java     |   3 +-
 .../common/component/PerspectiveEditor.java   | 194 ++++++++++++++++++
 .../component/PerspectiveStackEditor.java     | 161 +++++++++++++++
 .../common/component/PlaceholderEditor.java   | 108 ++++++++++
 5 files changed, 470 insertions(+), 2 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 50a8dc1286..10c188e9a8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -33,6 +33,9 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PartEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PartSashContainerEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PartStackEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.PerspectiveEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.PerspectiveStackEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.PlaceholderEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolBarEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowEditor;
@@ -172,6 +175,9 @@ private void registerDefaultEditors() {
 		registerEditor( MApplicationPackage.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor(modelProvider.getEditingDomain()));
 		registerEditor( MApplicationPackage.Literals.HANDLED_TOOL_ITEM, new HandledToolItemEditor(modelProvider.getEditingDomain()));
 		registerEditor( MApplicationPackage.Literals.TOOL_ITEM, new ToolItemEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.PERSPECTIVE_STACK, new PerspectiveStackEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.PERSPECTIVE, new PerspectiveEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.PLACEHOLDER, new PlaceholderEditor(modelProvider.getEditingDomain()));
 	}
 
 	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index d6f387ea34..2b871867c7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -53,7 +53,6 @@ public class PartStackEditor extends AbstractComponentEditor {
 
 	public PartStackEditor(EditingDomain editingDomain) {
 		super(editingDomain);
-		// TODO Auto-generated constructor stub
 	}
 
 	@Override
@@ -72,7 +71,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Stack";
+		return "Part Stack";
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
new file mode 100644
index 0000000000..ed74687e2e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -0,0 +1,194 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MPerspective;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
+import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class PerspectiveEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private Image image;
+	private EMFDataBindingContext context;
+
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+
+	public PerspectiveEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if (image == null) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Perspective.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Perspective";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		MPerspective perspective = (MPerspective) element;
+		if (perspective.getLabel() != null && perspective.getLabel().trim().length() > 0) {
+			return perspective.getLabel();
+		}
+
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Perspective Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent, context, getMaster());
+		}
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IValueProperty textProp = WidgetProperties.text();
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Selected Element");
+
+			ComboViewer viewer = new ComboViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			viewer.getControl().setLayoutData(gd);
+			IEMFEditListProperty listProp = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID);
+			IViewerValueProperty vProp = ViewerProperties.singleSelection();
+
+			final Binding[] binding = new Binding[1];
+			final IObservableValue uiObs = vProp.observe(viewer);
+			final IObservableValue mObs = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(getMaster());
+			getMaster().addValueChangeListener(new IValueChangeListener() {
+
+				public void handleValueChange(ValueChangeEvent event) {
+					if (binding[0] != null) {
+						binding[0].dispose();
+					}
+
+				}
+			});
+
+			ViewerSupport.bind(viewer, listProp.observeDetail(getMaster()), valProp);
+
+			getMaster().addValueChangeListener(new IValueChangeListener() {
+
+				public void handleValueChange(ValueChangeEvent event) {
+					binding[0] = context.bindValue(uiObs, mObs);
+				}
+			});
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Label");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Tooltip");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Icon URI");
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+
+			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setText("Find ...");
+		}
+
+		ControlFactory.createTagsWidget(parent, this);
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
new file mode 100644
index 0000000000..a8b4f8e68d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -0,0 +1,161 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
+import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class PerspectiveStackEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private Image image;
+	private EMFDataBindingContext context;
+
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+
+	public PerspectiveStackEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if( image == null ) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/PerspectiveStack.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Perspective Stack";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Perspective Stack Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, final EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IValueProperty textProp = WidgetProperties.text();
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Selected Element");
+
+			ComboViewer viewer = new ComboViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			viewer.getControl().setLayoutData(gd);
+			IEMFEditListProperty listProp = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL);
+			IViewerValueProperty vProp = ViewerProperties.singleSelection();
+
+			final Binding[] binding = new Binding[1];
+			final IObservableValue uiObs = vProp.observe(viewer);
+			final IObservableValue mObs = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(getMaster());
+			getMaster().addValueChangeListener(new IValueChangeListener() {
+
+				public void handleValueChange(ValueChangeEvent event) {
+					if( binding[0] != null ) {
+						binding[0].dispose();
+					}
+
+				}
+			});
+
+			ViewerSupport.bind(viewer, listProp.observeDetail(getMaster()), valProp);
+
+			getMaster().addValueChangeListener(new IValueChangeListener() {
+
+				public void handleValueChange(ValueChangeEvent event) {
+					binding[0] = context.bindValue(uiObs, mObs);
+				}
+			});
+		}
+
+		ControlFactory.createTagsWidget(parent, this);
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
new file mode 100644
index 0000000000..fb95fa6d44
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class PlaceholderEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private Image image;
+	private EMFDataBindingContext context;
+
+	public PlaceholderEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if (image == null) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Placeholder.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Placeholder";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Placeholder Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent, context, getMaster());
+		}
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IValueProperty textProp = WidgetProperties.text();
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+		}
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return null;
+	}
+
+}

From 33887567669014d838a5a8aa0ae7c66fc6d8fa01 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 9 Mar 2010 16:44:30 +0000
Subject: [PATCH 0013/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * fixing editor ids

---
 .../common/ComponentLabelProvider.java        |   6 -
 .../emf/ui/internal/common/ModelEditor.java   |  39 +++++-
 .../common/component/CommandEditor.java       |  26 ----
 .../common/component/PlaceholderEditor.java   |  28 ++++
 .../common/component/WindowEditor.java        |  48 ++++++-
 .../component/virtual/VHandlerEditor.java     | 129 ++++++++++++++++++
 6 files changed, 234 insertions(+), 42 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index 5d898c46c7..b5633d98f2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -66,12 +66,6 @@ public void applyStyles(TextStyle textStyle) {
 		} else if( cell.getElement() instanceof VirtualEntry<?> ) {
 			String s = cell.getElement().toString();
 			cell.setText(s);
-			if( "Parts".equals(s) ) {
-				if( partsImage == null ) {
-					partsImage = new Image(cell.getControl().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/application_double.png"));
-				}
-				cell.setImage(partsImage);
-			}
 		} else {
 			cell.setText(cell.getElement()+"");
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 10c188e9a8..2321f95a7e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -40,6 +40,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowTrimEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -59,14 +60,16 @@
 import org.eclipse.swt.widgets.Label;
 
 public class ModelEditor {
-	public static final int VIRTUAL_MENU    = 1;
-	public static final int VIRTUAL_PART    = 2;
-	public static final int VIRTUAL_HANDLER = 3;
-	public static final int VIRTUAL_BINDING = 4;
-	public static final int VIRTUAL_COMMAND = 5;
-	public static final int VIRTUAL_WINDOWS = 6;
+	public static final int VIRTUAL_MENU    = 0;
+	public static final int VIRTUAL_PART    = 1;
+	public static final int VIRTUAL_HANDLER = 2;
+	public static final int VIRTUAL_BINDING = 3;
+	public static final int VIRTUAL_COMMAND = 4;
+	public static final int VIRTUAL_WINDOWS = 5;
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
+	private AbstractComponentEditor[] virtualEditors;
+
 //	private List<AbstractComponentEditor> editors = new ArrayList<AbstractComponentEditor>();
 
 	private TreeViewer viewer;
@@ -76,6 +79,7 @@ public class ModelEditor {
 	public ModelEditor(Composite composite, IModelResource modelProvider) {
 		this.modelProvider = modelProvider;
 		registerDefaultEditors();
+		registerVirtualEditors();
 		SashForm form = new SashForm(composite, SWT.HORIZONTAL);
 		form.setBackground(form.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 
@@ -131,6 +135,17 @@ public void selectionChanged(SelectionChangedEvent event) {
 							layout.topControl = comp;
 							contentContainer.layout(true);
 						}
+					} else {
+						VirtualEntry<?> entry = (VirtualEntry<?>) s.getFirstElement();
+						AbstractComponentEditor editor = virtualEditors[entry.getId()];
+						if( editor != null ) {
+							textLabel.setText(editor.getLabel(entry));
+							iconLabel.setImage(editor.getImage(entry, iconLabel.getDisplay()));
+							Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
+							comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
+							layout.topControl = comp;
+							contentContainer.layout(true);
+						}
 					}
 				}
 			}
@@ -158,6 +173,18 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		return viewer;
 	}
 
+	private void registerVirtualEditors() {
+		virtualEditors = new AbstractComponentEditor[] {
+				null, // V-Menu
+				null, // V-Part
+				new VHandlerEditor(modelProvider.getEditingDomain()),
+				null, // V-Binding
+				null, // V-Command
+				null  // Windows
+			};
+
+	}
+
 	private void registerDefaultEditors() {
 		registerEditor( MApplicationPackage.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain()));
 		registerEditor( MApplicationPackage.Literals.MODEL_COMPONENTS, new ModelComponentsEditor(modelProvider.getEditingDomain()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 6ec4b7c24c..9f448b0f2b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -180,35 +180,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			b.setText("Add ...");
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-//			b.addSelectionListener(new SelectionAdapter() {
-//				@Override
-//				public void widgetSelected(SelectionEvent e) {
-//					MHandledItem item = (MHandledItem) master.getValue();
-//					MParameter param = MApplicationFactory.eINSTANCE.createParameter();
-//					Command cmd = AddCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS, param);
-//					if( cmd.canExecute() ) {
-//						getEditingDomain().getCommandStack().execute(cmd);
-//					}
-//					tableviewer.editElement(param, 0);
-//				}
-//			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Remove");
-//			b.addSelectionListener(new SelectionAdapter() {
-//
-//				public void widgetSelected(SelectionEvent e) {
-//					IStructuredSelection s = (IStructuredSelection) tableviewer.getSelection();
-//					if( !s.isEmpty() ) {
-//						MHandledItem item = (MHandledItem) master.getValue();
-//						Command cmd = RemoveCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS, s.toList());
-//						if( cmd.canExecute() ) {
-//							getEditingDomain().getCommandStack().execute(cmd);
-//						}
-//					}
-//				}
-//
-//			});
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index fb95fa6d44..d140a66f4e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -18,8 +18,11 @@
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MPlaceholder;
+import org.eclipse.e4.ui.model.application.MUILabel;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -61,6 +64,31 @@ public String getLabel(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
+		MPlaceholder pl = (MPlaceholder) element;
+		if( pl.getRef() != null ) {
+			StringBuilder b = new StringBuilder();
+
+			b.append(((EObject)pl.getRef()).eClass().getName());
+			if( pl.getRef() instanceof MUILabel ) {
+				MUILabel label = (MUILabel) pl.getRef();
+				if( label.getLabel() != null && label.getLabel().trim().length() > 0 ) {
+					b.append(" (" + label.getLabel() + ")");
+				} else if( label.getTooltip() != null && label.getTooltip().trim().length() > 0 ) {
+					b.append(" (" + label.getTooltip() + ")");
+				} else {
+					if( pl.getRef().getId() != null && pl.getRef().getId().trim().length() > 0 ) {
+						b.append(pl.getRef().getId());
+					}
+				}
+			} else {
+				if( pl.getRef().getId() != null && pl.getRef().getId().trim().length() > 0 ) {
+					b.append(" (" + pl.getRef().getId() + ")");
+				}
+			}
+
+			return b.toString();
+		}
+
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index dc67162560..ab0da3f34b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -32,6 +32,7 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
@@ -153,6 +154,43 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__HEIGHT).observeDetail(getMaster()));
 		}
 
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Label");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Tooltip");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Icon URI");
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+
+			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setText("Find ...");
+		}
+
 		ControlFactory.createTagsWidget(parent, this);
 
 		return parent;
@@ -193,8 +231,10 @@ protected boolean accepted(Object o) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		return ((MWindow)element).getLabel();
+		MWindow window = (MWindow)element;
+		if( window.getLabel() != null && window.getLabel().trim().length() > 0 ) {
+			return window.getLabel();
+		}
+		return null;
 	}
-
-
-}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
new file mode 100644
index 0000000000..0f9c1d6e62
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -0,0 +1,129 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VHandlerEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private Image image;
+	private EMFDataBindingContext context;
+
+	public VHandlerEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Handlers";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Handlers Bla Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Handlers");
+
+			TableViewer viewer = new TableViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.getTable().setHeaderVisible(true);
+
+			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+			column.getColumn().setText("Id");
+			column.getColumn().setWidth(150);
+
+			column = new TableViewerColumn(viewer, SWT.NONE);
+			column.getColumn().setText("Command");
+			column.getColumn().setWidth(200);
+			
+			column = new TableViewerColumn(viewer, SWT.NONE);
+			column.getColumn().setText("Class");
+			column.getColumn().setWidth(300);
+			
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		}
+
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}

From 532a9678d48b90185dc4de23413c130eeabcda0a Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 9 Mar 2010 16:58:00 +0000
Subject: [PATCH 0014/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * added editor component for virtual component

---
 .../component/virtual/VHandlerEditor.java       | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 0f9c1d6e62..f393451b31 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -4,9 +4,15 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ViewerSupport;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
@@ -54,7 +60,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent,context, getMaster());
 		}
-		getMaster().setValue(object);
+		getMaster().setValue(((VirtualEntry<?>)object).getOriginalParent());
 		return composite;
 	}
 
@@ -66,6 +72,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Handlers");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			TableViewer viewer = new TableViewer(parent);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -85,6 +92,14 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			column.getColumn().setText("Class");
 			column.getColumn().setWidth(300);
 			
+			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
+			IValueProperty[] props = {
+				EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID),
+				EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLER__COMMAND, MApplicationPackage.Literals.COMMAND__COMMAND_NAME)),
+				EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI)
+			};
+			
+			ViewerSupport.bind(viewer, prop.observeDetail(getMaster()), props);
 			
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));

From f3932a744a1c7dd6a554b0431df519f4ad25b20d Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 9 Mar 2010 19:47:17 +0000
Subject: [PATCH 0015/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * adding save

---
 .../tools/emf/ui/common/IModelResource.java   |  8 +++++
 .../tools/emf/ui/common/XMIModelResource.java | 35 +++++++++++++++++++
 .../emf/ui/internal/common/ModelEditor.java   | 17 ++++++++-
 .../common/component/CommandEditor.java       |  9 ++---
 .../component/DirectToolItemEditor.java       |  6 ++--
 .../component/HandledToolItemEditor.java      |  5 +--
 .../common/component/HandlerEditor.java       | 10 +++---
 .../common/component/KeyBindingEditor.java    |  9 ++---
 .../component/ModelComponentEditor.java       | 12 +++----
 .../component/PartDescriptorEditor.java       |  6 ++--
 .../internal/common/component/PartEditor.java | 14 ++++----
 .../component/PartSashContainerEditor.java    |  6 ++--
 .../common/component/PartStackEditor.java     |  6 ++--
 .../common/component/PerspectiveEditor.java   | 12 +++----
 .../component/PerspectiveStackEditor.java     |  6 ++--
 .../common/component/PlaceholderEditor.java   |  6 ++--
 .../common/component/ToolItemEditor.java      |  5 +--
 .../common/component/WindowEditor.java        | 20 +++++------
 .../component/virtual/VHandlerEditor.java     | 24 +++++++++++--
 19 files changed, 149 insertions(+), 67 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
index e47b866b8c..c2ee571e31 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
@@ -19,4 +19,12 @@ public interface IModelResource {
 	public boolean isSaveable();
 	public IStatus save();
 	public EditingDomain getEditingDomain();
+	public boolean isDirty();
+	
+	public void addModelListener(ModelListener listener);
+	public void removeModelListener(ModelListener listener);
+	
+	public interface ModelListener {
+		public void dirtyChanged();
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
index 7d7510a6d9..1f3b4cee63 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
@@ -10,7 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
+import java.util.ArrayList;
+import java.util.EventObject;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -18,6 +21,7 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -30,12 +34,22 @@
 public class XMIModelResource implements IModelResource {
 	private EditingDomain editingDomain;
 	private Resource resource;
+	private List<ModelListener> listeners = new ArrayList<IModelResource.ModelListener>();
+	private boolean dirty;
 
 	public XMIModelResource(String uri) {
 		ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
 				ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
 		ResourceSet resourceSet = new ResourceSetImpl();
 		BasicCommandStack commandStack = new BasicCommandStack();
+		commandStack.addCommandStackListener(new CommandStackListener() {
+			
+			public void commandStackChanged(EventObject event) {
+				dirty = true;
+				System.err.println("Exec");
+				fireDirtyChanged();
+			}
+		});
 		editingDomain = new AdapterFactoryEditingDomain(adapterFactory,
 				commandStack, resourceSet);
 		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
@@ -58,10 +72,31 @@ public boolean isSaveable() {
 		return true;
 	}
 
+	public void addModelListener(ModelListener listener) {
+		listeners.add(listener);
+	}
+	
+	public void removeModelListener(ModelListener listener) {
+		listeners.remove(listener);
+	}
+	
+	public boolean isDirty() {
+		return dirty;
+	}
+	
+	private void fireDirtyChanged() {
+		for( ModelListener listener : listeners ) {
+			listener.dirtyChanged();
+		}
+	}
+	
 	public IStatus save() {
 		Map<String, String> map = new HashMap<String, String>();
 		try {
 			resource.save(map);
+			editingDomain.getCommandStack().flush();
+			dirty = false;
+			fireDirtyChanged();
 		} catch (Exception e) {
 			// TODO: handle exception
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 2321f95a7e..bb6a0be9f8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -18,6 +18,8 @@
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
@@ -49,6 +51,7 @@
 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.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
@@ -177,13 +180,17 @@ private void registerVirtualEditors() {
 		virtualEditors = new AbstractComponentEditor[] {
 				null, // V-Menu
 				null, // V-Part
-				new VHandlerEditor(modelProvider.getEditingDomain()),
+				new VHandlerEditor(modelProvider.getEditingDomain(),this),
 				null, // V-Binding
 				null, // V-Command
 				null  // Windows
 			};
 
 	}
+	
+	public void setSelection(Object element) {
+		viewer.setSelection(new StructuredSelection(element));
+	}
 
 	private void registerDefaultEditors() {
 		registerEditor( MApplicationPackage.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain()));
@@ -214,6 +221,14 @@ public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
 	public AbstractComponentEditor getEditor(EClass eClass) {
 		return editorMap.get(eClass);
 	}
+	
+	public IStatus save() {
+		if( modelProvider.isSaveable() ) {
+			return modelProvider.save();
+		}
+		
+		return Status.CANCEL_STATUS;
+	}
 
 	private static class TreeStructureAdvisorImpl extends TreeStructureAdvisor {
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 9f448b0f2b..c3c309c89e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -22,6 +22,7 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerSupport;
 import org.eclipse.jface.viewers.TableViewer;
@@ -84,7 +85,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -94,7 +95,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -106,7 +107,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND__COMMAND_NAME).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND__COMMAND_NAME).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -120,7 +121,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			gd.horizontalSpan = 2;
 			gd.heightHint=100;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND__DESCRIPTION).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND__DESCRIPTION).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 89765f6ddd..1a01b4edf7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -14,11 +14,11 @@
 import java.net.URL;
 
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
@@ -53,14 +53,14 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		IValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text();
 
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("Class URI");
 
 		Text t = new Text(parent, SWT.BORDER);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		context.bindValue(textProp.observe(t), EMFEditProperties.value( getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value( getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
 
 		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 		b.setText("Find ...");
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 5b4ed386d4..424d304177 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -27,6 +27,7 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerSupport;
 import org.eclipse.jface.viewers.CellEditor;
@@ -75,7 +76,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, final WritableValue master) {
-		IValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text();
 
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("Command");
@@ -83,7 +84,7 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 		Text t = new Text(parent, SWT.BORDER);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		t.setEnabled(false);
-		context.bindValue(textProp.observe(t), EMFEditProperties.value( getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLED_ITEM__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(master));
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value( getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLED_ITEM__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(master));
 
 		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 		b.setText("Find ...");
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 7208902935..6ae1c6e946 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -14,7 +14,6 @@
 import java.net.URL;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MHandler;
@@ -22,6 +21,7 @@
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
@@ -80,7 +80,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text();
 
 		// ------------------------------------------------------------
 		{
@@ -91,7 +91,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -102,7 +102,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEnabled(false);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value( getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLER__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value( getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLER__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(getMaster()));
 
 			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 			b.setText("Find ...");
@@ -117,7 +117,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(getMaster()));
 
 			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index cbc94d2e08..fde361baa3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -29,6 +29,7 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerSupport;
 import org.eclipse.jface.viewers.CellEditor;
@@ -103,7 +104,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text();
 
 		// ------------------------------------------------------------
 		{
@@ -114,7 +115,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -126,7 +127,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.KEY_SEQUENCE__KEY_SEQUENCE).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.KEY_SEQUENCE__KEY_SEQUENCE).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -137,7 +138,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEnabled(false);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value( getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.KEY_BINDING__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value( getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.KEY_BINDING__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(getMaster()));
 
 			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 			b.setText("Find ...");
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index 7e0465fbd0..f6e85eb945 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -13,7 +13,6 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -25,6 +24,7 @@
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.viewers.ListViewer;
 import org.eclipse.swt.SWT;
@@ -81,7 +81,7 @@ private Composite createForm(Composite parent) {
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text();
 
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("Id");
@@ -90,7 +90,7 @@ private Composite createForm(Composite parent) {
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 
 		// ------------------------------------------------------------
 
@@ -117,7 +117,7 @@ private Composite createForm(Composite parent) {
 
 		t = new Text(parent, SWT.BORDER);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__PARENT_ID).observeDetail(getMaster()));
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__PARENT_ID).observeDetail(getMaster()));
 
 		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 		b.setText("Find ...");
@@ -131,7 +131,7 @@ private Composite createForm(Composite parent) {
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__POSITION_IN_PARENT).observeDetail(getMaster()));
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__POSITION_IN_PARENT).observeDetail(getMaster()));
 
 		// ------------------------------------------------------------
 
@@ -142,7 +142,7 @@ private Composite createForm(Composite parent) {
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__PROCESSOR).observeDetail(getMaster()));
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__PROCESSOR).observeDetail(getMaster()));
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 16f14ce95b..d3ffc0a451 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -11,11 +11,11 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -33,7 +33,7 @@ public PartDescriptorEditor(EditingDomain editingDomain) {
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master) {
 		Composite comp = super.createForm(parent,context,master);
 
-		IValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text();
 
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("Label");
@@ -42,7 +42,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
 
 		// ------------------------------------------------------------
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 8b3af6a580..2eaf36585f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -17,7 +17,6 @@
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -27,6 +26,7 @@
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.viewers.ListViewer;
 import org.eclipse.jface.viewers.TableViewer;
@@ -93,7 +93,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text();
 
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("Id");
@@ -102,7 +102,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));
 
 		// ------------------------------------------------------------
 
@@ -113,7 +113,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
 
 		// ------------------------------------------------------------
 
@@ -124,7 +124,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
 
 		// ------------------------------------------------------------
 
@@ -133,7 +133,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		t = new Text(parent, SWT.BORDER);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
 		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 		b.setText("Find ...");
@@ -145,7 +145,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		t = new Text(parent, SWT.BORDER);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
 
 		b = new Button(parent, SWT.PUSH|SWT.FLAT);
 		b.setText("Find ...");
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 95c1e23bf7..c50b4b6aa5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -20,7 +20,6 @@
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MPartSashContainer;
@@ -30,6 +29,7 @@
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
@@ -114,7 +114,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text();
 
 		// ------------------------------------------------------------
 		{
@@ -125,7 +125,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 2b871867c7..21cf744f12 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -20,7 +20,6 @@
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -29,6 +28,7 @@
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
@@ -94,7 +94,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text();
 
 		// ------------------------------------------------------------
 		{
@@ -105,7 +105,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index ed74687e2e..36c0385f75 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -10,7 +10,6 @@
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MPerspective;
@@ -20,6 +19,7 @@
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
@@ -94,7 +94,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text();
 
 		// ------------------------------------------------------------
 		{
@@ -105,7 +105,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -153,7 +153,7 @@ public void handleValueChange(ValueChangeEvent event) {
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -165,7 +165,7 @@ public void handleValueChange(ValueChangeEvent event) {
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -175,7 +175,7 @@ public void handleValueChange(ValueChangeEvent event) {
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
 			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText("Find ...");
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index a8b4f8e68d..49a20efc2b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -20,7 +20,6 @@
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -29,6 +28,7 @@
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
@@ -98,7 +98,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text();
 
 		// ------------------------------------------------------------
 		{
@@ -109,7 +109,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index d140a66f4e..cc472b7109 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -15,7 +15,6 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MPlaceholder;
@@ -24,6 +23,7 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
@@ -111,7 +111,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text();
 
 		// ------------------------------------------------------------
 		{
@@ -122,7 +122,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 		}
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index d2995869ff..fe64c49a84 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -24,6 +24,7 @@
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -85,7 +86,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text();
 
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("Id");
@@ -94,7 +95,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));
 
 		if (this.getClass() != ToolItemEditor.class) {
 			createFormSubTypeForm(parent, context, master);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index ab0da3f34b..c38eeea2ae 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -17,7 +17,6 @@
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -27,6 +26,7 @@
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
@@ -92,7 +92,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text();
 
 		// ------------------------------------------------------------
 		{
@@ -103,7 +103,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -115,7 +115,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__X).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__X).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -127,7 +127,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__Y).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__Y).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -139,7 +139,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__WIDTH).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__WIDTH).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -151,7 +151,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__HEIGHT).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__HEIGHT).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -163,7 +163,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -175,7 +175,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -185,7 +185,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
 			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText("Find ...");
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index f393451b31..61d410c1c7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -4,18 +4,24 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MHandler;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerSupport;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -28,9 +34,11 @@ public class VHandlerEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
+	private ModelEditor editor;
 
-	public VHandlerEditor(EditingDomain editingDomain) {
+	public VHandlerEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
+		this.editor = editor;
 	}
 
 	@Override
@@ -124,6 +132,18 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.setText("Add ...");
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MHandler handler = MApplicationFactory.eINSTANCE.createHandler();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS, handler);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Remove");

From 278831d429281642f9780b89bc719658f0adacef Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 9 Mar 2010 19:52:18 +0000
Subject: [PATCH 0016/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * fixed to receive events from the UI-side

---
 .../ui/internal/common/component/DirectToolItemEditor.java    | 2 +-
 .../ui/internal/common/component/HandledToolItemEditor.java   | 2 +-
 .../tools/emf/ui/internal/common/component/HandlerEditor.java | 2 +-
 .../emf/ui/internal/common/component/KeyBindingEditor.java    | 2 +-
 .../ui/internal/common/component/ModelComponentEditor.java    | 2 +-
 .../ui/internal/common/component/PartDescriptorEditor.java    | 2 +-
 .../e4/tools/emf/ui/internal/common/component/PartEditor.java | 2 +-
 .../ui/internal/common/component/PartSashContainerEditor.java | 2 +-
 .../emf/ui/internal/common/component/PartStackEditor.java     | 2 +-
 .../emf/ui/internal/common/component/PerspectiveEditor.java   | 2 +-
 .../ui/internal/common/component/PerspectiveStackEditor.java  | 2 +-
 .../emf/ui/internal/common/component/PlaceholderEditor.java   | 2 +-
 .../emf/ui/internal/common/component/ToolItemEditor.java      | 4 ++--
 .../tools/emf/ui/internal/common/component/WindowEditor.java  | 2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 1a01b4edf7..183cbf2cab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -53,7 +53,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		IWidgetValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("Class URI");
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 424d304177..241e757d66 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -76,7 +76,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, final WritableValue master) {
-		IWidgetValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("Command");
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 6ae1c6e946..11a4177e55 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -80,7 +80,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IWidgetValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		// ------------------------------------------------------------
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index fde361baa3..9dc8a2d8f3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -104,7 +104,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IWidgetValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		// ------------------------------------------------------------
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index f6e85eb945..402fc5734e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -81,7 +81,7 @@ private Composite createForm(Composite parent) {
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IWidgetValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("Id");
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index d3ffc0a451..f5b9e4e50b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -33,7 +33,7 @@ public PartDescriptorEditor(EditingDomain editingDomain) {
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master) {
 		Composite comp = super.createForm(parent,context,master);
 
-		IWidgetValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("Label");
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 2eaf36585f..48e9558388 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -93,7 +93,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IWidgetValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("Id");
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index c50b4b6aa5..7c353761b3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -114,7 +114,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IWidgetValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		// ------------------------------------------------------------
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 21cf744f12..6e701c5ef9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -94,7 +94,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IWidgetValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		// ------------------------------------------------------------
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 36c0385f75..1ca98ba0ea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -94,7 +94,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IWidgetValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		// ------------------------------------------------------------
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 49a20efc2b..31624f5fc1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -98,7 +98,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IWidgetValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		// ------------------------------------------------------------
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index cc472b7109..90b8d08cc0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -111,7 +111,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IWidgetValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		// ------------------------------------------------------------
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index fe64c49a84..f9e819342e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -86,7 +86,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IWidgetValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("Id");
@@ -105,7 +105,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 	}
 
 	private void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, final WritableValue master) {
-		IValueProperty textProp = WidgetProperties.text();
+		IValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		// ------------------------------------------------------------
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index c38eeea2ae..311dbd0890 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -92,7 +92,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		IWidgetValueProperty textProp = WidgetProperties.text();
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		// ------------------------------------------------------------
 		{

From a6e33c11c00f963ead2fec188bfd5b013be98b2d Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 9 Mar 2010 20:18:18 +0000
Subject: [PATCH 0017/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * using e4-resource factory

---
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../tools/emf/ui/common/XMIModelResource.java | 107 ------------------
 2 files changed, 1 insertion(+), 108 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 91f26e4d5e..8fc35da937 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -25,4 +25,4 @@ Export-Package: org.eclipse.e4.tools.emf.ui.common,
  org.eclipse.e4.tools.emf.ui.internal.common;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.common.component;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.wbe;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.wbm;x-internal:=true
+ org.eclipse.e4.tools.emf.ui.internal.wbm;x-friends:="org.eclipse.e4.tools.emf.editor"
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
deleted file mode 100644
index 1f3b4cee63..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.common;
-
-import java.util.ArrayList;
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-
-public class XMIModelResource implements IModelResource {
-	private EditingDomain editingDomain;
-	private Resource resource;
-	private List<ModelListener> listeners = new ArrayList<IModelResource.ModelListener>();
-	private boolean dirty;
-
-	public XMIModelResource(String uri) {
-		ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
-				ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-		ResourceSet resourceSet = new ResourceSetImpl();
-		BasicCommandStack commandStack = new BasicCommandStack();
-		commandStack.addCommandStackListener(new CommandStackListener() {
-			
-			public void commandStackChanged(EventObject event) {
-				dirty = true;
-				System.err.println("Exec");
-				fireDirtyChanged();
-			}
-		});
-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory,
-				commandStack, resourceSet);
-		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
-				.put(Resource.Factory.Registry.DEFAULT_EXTENSION,
-						new XMIResourceFactoryImpl());
-		resource = resourceSet.getResource(URI.createURI(uri), true);
-	}
-
-	public IObservableList getRoot() {
-		WritableList list = new WritableList();
-		list.add(resource.getContents().get(0));
-		return list;
-	}
-
-	public EditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	public boolean isSaveable() {
-		return true;
-	}
-
-	public void addModelListener(ModelListener listener) {
-		listeners.add(listener);
-	}
-	
-	public void removeModelListener(ModelListener listener) {
-		listeners.remove(listener);
-	}
-	
-	public boolean isDirty() {
-		return dirty;
-	}
-	
-	private void fireDirtyChanged() {
-		for( ModelListener listener : listeners ) {
-			listener.dirtyChanged();
-		}
-	}
-	
-	public IStatus save() {
-		Map<String, String> map = new HashMap<String, String>();
-		try {
-			resource.save(map);
-			editingDomain.getCommandStack().flush();
-			dirty = false;
-			fireDirtyChanged();
-		} catch (Exception e) {
-			// TODO: handle exception
-		}
-
-		return Status.OK_STATUS;
-	}
-
-}

From ae793a7e96cd0917494c70109b1f63c660649630 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 9 Mar 2010 20:38:18 +0000
Subject: [PATCH 0018/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * editor for the virtual command, handler and binding
 section

---
 .../emf/ui/internal/common/ModelEditor.java   |   6 +-
 .../component/virtual/VCommandEditor.java     | 167 +++++++++++++++++
 .../component/virtual/VHandlerEditor.java     |  27 ++-
 .../component/virtual/VKeyBindingEditor.java  | 173 ++++++++++++++++++
 4 files changed, 361 insertions(+), 12 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index bb6a0be9f8..bd4f365154 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -42,7 +42,9 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowTrimEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VCommandEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VKeyBindingEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -181,8 +183,8 @@ private void registerVirtualEditors() {
 				null, // V-Menu
 				null, // V-Part
 				new VHandlerEditor(modelProvider.getEditingDomain(),this),
-				null, // V-Binding
-				null, // V-Command
+				new VKeyBindingEditor(modelProvider.getEditingDomain(), this),
+				new VCommandEditor(modelProvider.getEditingDomain(), this),
 				null  // Windows
 			};
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
new file mode 100644
index 0000000000..eddf3aa6ff
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -0,0 +1,167 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MCommand;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VCommandEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+
+	public VCommandEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Commands";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Commands Bla Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		getMaster().setValue(((VirtualEntry<?>)object).getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Commands");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			TableViewer viewer = new TableViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.getTable().setHeaderVisible(true);
+
+			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+			column.getColumn().setText("Name");
+			column.getColumn().setWidth(200);
+			
+			column = new TableViewerColumn(viewer, SWT.NONE);
+			column.getColumn().setText("Id");
+			column.getColumn().setWidth(200);
+			
+			
+			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.APPLICATION__COMMANDS);
+			IValueProperty[] props = {
+				EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID),
+				EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND__COMMAND_NAME)
+			};
+			
+			ViewerSupport.bind(viewer, prop.observeDetail(getMaster()), props);
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MCommand command = MApplicationFactory.eINSTANCE.createCommand();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.APPLICATION__COMMANDS, command);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(command);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		}
+
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 61d410c1c7..708d8a28f8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -32,7 +42,6 @@
 
 public class VHandlerEditor extends AbstractComponentEditor {
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
 
@@ -43,7 +52,6 @@ public VHandlerEditor(EditingDomain editingDomain, ModelEditor editor) {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
@@ -89,10 +97,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			viewer.getTable().setHeaderVisible(true);
 
 			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-			column.getColumn().setText("Id");
-			column.getColumn().setWidth(150);
-
-			column = new TableViewerColumn(viewer, SWT.NONE);
 			column.getColumn().setText("Command");
 			column.getColumn().setWidth(200);
 			
@@ -100,11 +104,15 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			column.getColumn().setText("Class");
 			column.getColumn().setWidth(300);
 			
+			column = new TableViewerColumn(viewer, SWT.NONE);
+			column.getColumn().setText("Id");
+			column.getColumn().setWidth(150);
+
 			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
 			IValueProperty[] props = {
-				EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID),
 				EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLER__COMMAND, MApplicationPackage.Literals.COMMAND__COMMAND_NAME)),
-				EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI)
+				EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI),
+				EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)
 			};
 			
 			ViewerSupport.bind(viewer, prop.observeDetail(getMaster()), props);
@@ -160,5 +168,4 @@ public IObservableList getChildList(Object element) {
 		// TODO Auto-generated method stub
 		return null;
 	}
-
-}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java
new file mode 100644
index 0000000000..b086f10eaa
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java
@@ -0,0 +1,173 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MKeyBinding;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VKeyBindingEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+
+	public VKeyBindingEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "KeyBindings";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "KeyBindings Bla Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		getMaster().setValue(((VirtualEntry<?>)object).getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Keybindings");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			TableViewer viewer = new TableViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.getTable().setHeaderVisible(true);
+
+			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+			column.getColumn().setText("KeySequence");
+			column.getColumn().setWidth(100);
+			
+			column = new TableViewerColumn(viewer, SWT.NONE);
+			column.getColumn().setText("Command");
+			column.getColumn().setWidth(200);
+			
+			column = new TableViewerColumn(viewer, SWT.NONE);
+			column.getColumn().setText("Id");
+			column.getColumn().setWidth(170);
+
+			
+			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS);
+			IValueProperty[] props = {
+				EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.KEY_SEQUENCE__KEY_SEQUENCE),
+				EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.KEY_BINDING__COMMAND, MApplicationPackage.Literals.COMMAND__COMMAND_NAME)),
+				EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)
+			};
+			
+			ViewerSupport.bind(viewer, prop.observeDetail(getMaster()), props);
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MKeyBinding handler = MApplicationFactory.eINSTANCE.createKeyBinding();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS, handler);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		}
+
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}

From de7003c4088b00aa5c47790b6908f4a2eb00cc19 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 9 Mar 2010 23:59:09 +0000
Subject: [PATCH 0019/1286] [Bug 304741 ] -   Optimize the workbench model
 Java-Classes * added persisted map changes

---
 .../internal/common/component/PartEditor.java | 214 ++++++++++++------
 1 file changed, 145 insertions(+), 69 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 48e9558388..340fa11e9c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -12,6 +12,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Map.Entry;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
@@ -25,9 +26,12 @@
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ListViewer;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
@@ -95,93 +99,165 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		Label l = new Label(parent, SWT.NONE);
-		l.setText("Id");
-
-		Text t = new Text(parent, SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
-		t.setLayoutData(gd);
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));
-
 		// ------------------------------------------------------------
-
-		l = new Label(parent, SWT.NONE);
-		l.setText("Label");
-
-		t = new Text(parent, SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
-		t.setLayoutData(gd);
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));			
+		}
 
 		// ------------------------------------------------------------
-
-		l = new Label(parent, SWT.NONE);
-		l.setText("Tooltip");
-
-		t = new Text(parent, SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
-		t.setLayoutData(gd);
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Label");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));			
+		}
 
 		// ------------------------------------------------------------
-
-		l = new Label(parent, SWT.NONE);
-		l.setText("Icon URI");
-
-		t = new Text(parent, SWT.BORDER);
-		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
-
-		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
-		b.setText("Find ...");
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Tooltip");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));			
+		}
 
 		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Icon URI");
 
-		l = new Label(parent, SWT.NONE);
-		l.setText("Class URI");
-
-		t = new Text(parent, SWT.BORDER);
-		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-		b = new Button(parent, SWT.PUSH|SWT.FLAT);
-		b.setText("Find ...");
+			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			b.setText("Find ...");			
+		}
 
 		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Class URI");
 
-		l = new Label(parent, SWT.NONE);
-		l.setText("Variables");
-		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
-
-		ListViewer viewer = new ListViewer(parent);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
-		gd.heightHint = 80;
-		viewer.getList().setLayoutData(gd);
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
 
+			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			b.setText("Find ...");			
+		}
+		
 		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Persited State");
+			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+
+			TableViewer tableviewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			tableviewer.setContentProvider(cp);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 80;
+			tableviewer.getControl().setLayoutData(gd);
+			
+			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
+			column.getColumn().setText("Key");
+			column.getColumn().setWidth(200);
+			column.setLabelProvider(new ColumnLabelProvider() {
+				@SuppressWarnings("unchecked")
+				@Override
+				public String getText(Object element) {
+					Entry<String, String> entry = (Entry<String, String>) element;
+					return entry.getKey();
+				}
+			});
+
+			//FIXME How can we react upon changes in the Map-Value?
+			column = new TableViewerColumn(tableviewer, SWT.NONE);
+			column.getColumn().setText("Value");
+			column.getColumn().setWidth(200);
+			column.setLabelProvider(new ColumnLabelProvider() {
+				@SuppressWarnings("unchecked")
+				@Override
+				public String getText(Object element) {
+					Entry<String, String> entry = (Entry<String, String>) element;
+					return entry.getValue();
+				}
+			});
+			
+			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__PERSISTED_STATE);
+			tableviewer.setInput(prop.observeDetail(getMaster()));
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		}
 
-		l = new Label(parent, SWT.NONE);
-		l.setText("Properties");
-		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 
-		TableViewer tableviewer = new TableViewer(parent);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
-		gd.heightHint = 80;
-		tableviewer.getTable().setHeaderVisible(true);
-		tableviewer.getControl().setLayoutData(gd);
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Variables");
+			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+
+			ListViewer viewer = new ListViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			gd.heightHint = 80;
+			viewer.getList().setLayoutData(gd);
+		}
 
-		TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-		column.getColumn().setText("Key");
-		column.getColumn().setWidth(200);
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Properties");
+			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+
+			TableViewer tableviewer = new TableViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			gd.heightHint = 80;
+			tableviewer.getTable().setHeaderVisible(true);
+			tableviewer.getControl().setLayoutData(gd);
+
+			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
+			column.getColumn().setText("Key");
+			column.getColumn().setWidth(200);
+
+			column = new TableViewerColumn(tableviewer, SWT.NONE);
+			column.getColumn().setText("Value");
+			column.getColumn().setWidth(200);
+		}
 
-		column = new TableViewerColumn(tableviewer, SWT.NONE);
-		column.getColumn().setText("Value");
-		column.getColumn().setWidth(200);
 
 		ControlFactory.createTagsWidget(parent, this);
 

From 079dc4fc54a509df4fe4f292c2eb587a37b36a15 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 10 Mar 2010 00:22:28 +0000
Subject: [PATCH 0020/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling

---
 .../e4/tools/emf/ui/internal/common/component/PartEditor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 340fa11e9c..929f17a9a9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -184,7 +184,7 @@ public String getText(Object element) {
 					Entry<String, String> entry = (Entry<String, String>) element;
 					return entry.getKey();
 				}
-			});
+			}); 
 
 			//FIXME How can we react upon changes in the Map-Value?
 			column = new TableViewerColumn(tableviewer, SWT.NONE);

From 99a244d15504762380892ee21f404b7acdae91b2 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 10 Mar 2010 23:11:05 +0000
Subject: [PATCH 0021/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * model virtual editors and some trim-editor and
 window-editor improvements

---
 .../ObservableColumnLabelProvider.java        |  94 ++++++++
 .../emf/ui/internal/common/ModelEditor.java   |   7 +-
 .../common/component/WindowEditor.java        |   2 +-
 .../common/component/WindowTrimEditor.java    |  53 ++++-
 .../component/virtual/VControlEditor.java     | 211 ++++++++++++++++++
 .../component/virtual/VWindowEditor.java      | 202 +++++++++++++++++
 6 files changed, 566 insertions(+), 3 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
new file mode 100644
index 0000000000..0647a798cd
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
@@ -0,0 +1,94 @@
+package org.eclipse.e4.tools.emf.ui.internal;
+
+import java.util.Set;
+
+import org.eclipse.core.databinding.observable.map.IMapChangeListener;
+import org.eclipse.core.databinding.observable.map.IObservableMap;
+import org.eclipse.core.databinding.observable.map.MapChangeEvent;
+import org.eclipse.jface.viewers.CellLabelProvider;
+import org.eclipse.jface.viewers.LabelProviderChangedEvent;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Image;
+
+public class ObservableColumnLabelProvider<M> extends CellLabelProvider {
+	private IObservableMap[] attributeMaps;
+
+	private IMapChangeListener mapChangeListener = new IMapChangeListener() {
+		public void handleMapChange(MapChangeEvent event) {
+			Set<?> affectedElements = event.diff.getChangedKeys();
+			LabelProviderChangedEvent newEvent = new LabelProviderChangedEvent(
+					ObservableColumnLabelProvider.this, affectedElements
+							.toArray());
+			fireLabelProviderChanged(newEvent);
+		}
+	};
+
+	/**
+	 * Creates a new label provider that tracks changes to one attribute.
+	 * 
+	 * @param attributeMap
+	 */
+	public ObservableColumnLabelProvider(IObservableMap attributeMap) {
+		this(new IObservableMap[] { attributeMap });
+	}
+
+	/**
+	 * Creates a new label provider that tracks changes to more than one
+	 * attribute. This constructor should be used by subclasses that override
+	 * {@link #update(ViewerCell)} and make use of more than one attribute.
+	 * 
+	 * @param attributeMaps
+	 */
+	protected ObservableColumnLabelProvider(IObservableMap[] attributeMaps) {
+		System.arraycopy(attributeMaps, 0,
+				this.attributeMaps = new IObservableMap[attributeMaps.length],
+				0, attributeMaps.length);
+		for (int i = 0; i < attributeMaps.length; i++) {
+			attributeMaps[i].addMapChangeListener(mapChangeListener);
+		}
+	}
+
+	public void dispose() {
+		for (int i = 0; i < attributeMaps.length; i++) {
+			attributeMaps[i].removeMapChangeListener(mapChangeListener);
+		}
+		super.dispose();
+		this.attributeMaps = null;
+		this.mapChangeListener = null;
+	}
+
+	@SuppressWarnings("unchecked")
+	public void update(ViewerCell cell) {
+		M element = (M) cell.getElement();
+		cell.setText(getText(element));
+		cell.setImage(getImage(element));
+		cell.setBackground(getBackground(element));
+		cell.setForeground(getForeground(element));
+		cell.setFont(getFont(element));
+	}
+
+	public String getText(M element) {
+		Object value = attributeMaps[0].get(element);
+		return value == null ? "" : value.toString();
+	}
+	
+	public Font getFont(M element) {
+		return null;
+	}
+
+	public Color getBackground(M element) {
+		return null;
+	}
+
+	public Color getForeground(M element) {
+		return null;
+	}
+
+
+	public Image getImage(M element) {
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index bd4f365154..4b588c6d4a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -43,8 +43,10 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowTrimEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VCommandEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VControlEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VKeyBindingEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -71,6 +73,7 @@ public class ModelEditor {
 	public static final int VIRTUAL_BINDING = 3;
 	public static final int VIRTUAL_COMMAND = 4;
 	public static final int VIRTUAL_WINDOWS = 5;
+	public static final int VIRTUAL_WINDOW_CONTROLS = 6;
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private AbstractComponentEditor[] virtualEditors;
@@ -157,6 +160,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 		});
 
 		form.setWeights(new int[] { 1 , 2 });
+		viewer.setSelection(new StructuredSelection(modelProvider.getRoot()));
 	}
 
 	private TreeViewer createTreeViewerArea(Composite parent) {
@@ -185,7 +189,8 @@ private void registerVirtualEditors() {
 				new VHandlerEditor(modelProvider.getEditingDomain(),this),
 				new VKeyBindingEditor(modelProvider.getEditingDomain(), this),
 				new VCommandEditor(modelProvider.getEditingDomain(), this),
-				null  // Windows
+				new VWindowEditor(modelProvider.getEditingDomain(), this),
+				new VControlEditor(modelProvider.getEditingDomain(), this)
 			};
 
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 311dbd0890..8f9e55849f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -217,7 +217,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_WINDOWS, ELEMENT_CONTAINER__CHILDREN, element, "Controls") {
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_WINDOW_CONTROLS, ELEMENT_CONTAINER__CHILDREN, element, "Controls") {
 
 			@Override
 			protected boolean accepted(Object o) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
index 6325f8ee8e..31dd6d0540 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
@@ -14,17 +14,31 @@
 import java.net.URL;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.ItemType;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MTrimContainer;
+import org.eclipse.e4.ui.model.application.SideValue;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class WindowTrimEditor extends AbstractComponentEditor {
 
@@ -76,6 +90,38 @@ public Composite getEditor(Composite parent, Object object) {
 	private Composite createForm(Composite parent, EMFDataBindingContext context,
 			WritableValue master) {
 		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Side");
+
+			ComboViewer viewer = new ComboViewer(parent);
+			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setInput(SideValue.values());
+			GridData gd = new GridData();
+			gd.horizontalSpan = 2;
+			viewer.getControl().setLayoutData(gd);
+			IObservableValue sideValueObs = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.TRIM_CONTAINER__SIDE).observeDetail(master);
+			context.bindValue(ViewerProperties.singleSelection().observe(viewer), sideValueObs);
+		}
+
+		
 		return parent;
 	}
 
@@ -86,7 +132,12 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		// TODO Auto-generated method stub
+		MTrimContainer<?> trim = (MTrimContainer<?>) element;
+		
+		if( trim.getSide() != null ) {
+			return trim.getSide().toString();
+		}
+		
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java
new file mode 100644
index 0000000000..a51d78954c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java
@@ -0,0 +1,211 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MPart;
+import org.eclipse.e4.ui.model.application.MPartSashContainer;
+import org.eclipse.e4.ui.model.application.MPartStack;
+import org.eclipse.e4.ui.model.application.MPerspectiveStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VControlEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+
+	public VControlEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Controls";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Controls Bla Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		getMaster().setValue(((VirtualEntry<?>)object).getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Controls");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			TableViewer viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+
+			
+			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(getMaster()));
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add Sash");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MPartSashContainer handler = MApplicationFactory.eINSTANCE.createPartSashContainer();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add PartStack");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MPartStack handler = MApplicationFactory.eINSTANCE.createPartStack();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+			
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add PerspectiveStack");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MPerspectiveStack handler = MApplicationFactory.eINSTANCE.createPerspectiveStack();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add Part");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MPart handler = MApplicationFactory.eINSTANCE.createPart();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		}
+
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
new file mode 100644
index 0000000000..3b5bf2a6a5
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -0,0 +1,202 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MWindow;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VWindowEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+
+	public VWindowEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Windows";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Windows Bla Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		getMaster().setValue(((VirtualEntry<?>)object).getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Windows");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			TableViewer viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+			
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.getTable().setHeaderVisible(true);
+
+			{
+				IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL);
+				
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Name");
+				column.getColumn().setWidth(180);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));		
+			}
+			
+			{
+				IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__X);
+
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("X");
+				column.getColumn().setWidth(80);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
+			}
+			
+			{
+				IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__Y);
+
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Y");
+				column.getColumn().setWidth(80);				
+				column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
+			}
+			
+			{
+				IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__WIDTH);
+				
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Width");
+				column.getColumn().setWidth(100);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
+			}
+			
+			{
+				IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__HEIGHT);
+				
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Height");
+				column.getColumn().setWidth(100);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
+			}
+			
+			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(getMaster()));
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MWindow handler = MApplicationFactory.eINSTANCE.createWindow();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		}
+
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
\ No newline at end of file

From 6d15c716857be02a7638a9c7dfc5fb615bcf4c38 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 10 Mar 2010 23:38:20 +0000
Subject: [PATCH 0022/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * moving trims to extra own virtual part

---
 .../emf/ui/internal/common/ModelEditor.java   |   5 +-
 .../common/component/WindowEditor.java        |  12 +-
 .../component/virtual/VControlEditor.java     |   7 +-
 .../component/virtual/VWindowTrimEditor.java  | 208 ++++++++++++++++++
 4 files changed, 228 insertions(+), 4 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 4b588c6d4a..79ae2c45c9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -47,6 +47,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VKeyBindingEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowTrimEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -74,6 +75,7 @@ public class ModelEditor {
 	public static final int VIRTUAL_COMMAND = 4;
 	public static final int VIRTUAL_WINDOWS = 5;
 	public static final int VIRTUAL_WINDOW_CONTROLS = 6;
+	public static final int VIRTUAL_WINDOW_TRIMS = 7;
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private AbstractComponentEditor[] virtualEditors;
@@ -190,7 +192,8 @@ private void registerVirtualEditors() {
 				new VKeyBindingEditor(modelProvider.getEditingDomain(), this),
 				new VCommandEditor(modelProvider.getEditingDomain(), this),
 				new VWindowEditor(modelProvider.getEditingDomain(), this),
-				new VControlEditor(modelProvider.getEditingDomain(), this)
+				new VControlEditor(modelProvider.getEditingDomain(), this),
+				new VWindowTrimEditor(modelProvider.getEditingDomain(), this)
 			};
 
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 8f9e55849f..2b5718f546 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -22,6 +22,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MWindow;
+import org.eclipse.e4.ui.model.application.MWindowTrim;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
@@ -216,12 +217,21 @@ protected boolean accepted(Object o) {
 			}
 
 		});
+		
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_WINDOW_TRIMS, ELEMENT_CONTAINER__CHILDREN, element, "Trims") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return o instanceof MWindowTrim;
+			}
+
+		});
 
 		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_WINDOW_CONTROLS, ELEMENT_CONTAINER__CHILDREN, element, "Controls") {
 
 			@Override
 			protected boolean accepted(Object o) {
-				return true;
+				return !(o instanceof MWindowTrim);
 			}
 
 		});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java
index a51d78954c..4df23d77de 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java
@@ -45,6 +45,7 @@ public class VControlEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
+	private TableViewer viewer;
 
 	public VControlEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
@@ -77,7 +78,9 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent,context, getMaster());
 		}
-		getMaster().setValue(((VirtualEntry<?>)object).getOriginalParent());
+		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
@@ -91,7 +94,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			l.setText("Controls");
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
-			TableViewer viewer = new TableViewer(parent);
+			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
 			viewer.setLabelProvider(new ComponentLabelProvider(editor));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
new file mode 100644
index 0000000000..7a8adfcbab
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -0,0 +1,208 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MPart;
+import org.eclipse.e4.ui.model.application.MPartSashContainer;
+import org.eclipse.e4.ui.model.application.MPartStack;
+import org.eclipse.e4.ui.model.application.MPerspectiveStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VWindowTrimEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+	private TableViewer viewer;
+
+	public VWindowTrimEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Window Trims";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Window Trims Bla Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Controls");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add Sash");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MPartSashContainer handler = MApplicationFactory.eINSTANCE.createPartSashContainer();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add PartStack");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MPartStack handler = MApplicationFactory.eINSTANCE.createPartStack();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+			
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add PerspectiveStack");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MPerspectiveStack handler = MApplicationFactory.eINSTANCE.createPerspectiveStack();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add Part");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MPart handler = MApplicationFactory.eINSTANCE.createPart();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		}
+
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
\ No newline at end of file

From 8b03bef34875b9b5335e58dc594a633a28857364 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 10 Mar 2010 23:39:53 +0000
Subject: [PATCH 0023/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * fixing new window trim editor

---
 .../component/virtual/VWindowTrimEditor.java  | 61 +------------------
 1 file changed, 3 insertions(+), 58 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index 7a8adfcbab..f87f30b9ae 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -18,10 +18,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MPart;
-import org.eclipse.e4.ui.model.application.MPartSashContainer;
-import org.eclipse.e4.ui.model.application.MPartStack;
-import org.eclipse.e4.ui.model.application.MPerspectiveStack;
+import org.eclipse.e4.ui.model.application.MWindowTrim;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.command.AddCommand;
@@ -119,67 +116,15 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.setText("Down");
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add Sash");
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					MPartSashContainer handler = MApplicationFactory.eINSTANCE.createPartSashContainer();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
-					
-					if( cmd.canExecute() ) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
-					}
-				}
-			});
-			
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add PartStack");
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					MPartStack handler = MApplicationFactory.eINSTANCE.createPartStack();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
-					
-					if( cmd.canExecute() ) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
-					}
-				}
-			});
-			
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add PerspectiveStack");
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					MPerspectiveStack handler = MApplicationFactory.eINSTANCE.createPerspectiveStack();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
-					
-					if( cmd.canExecute() ) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
-					}
-				}
-			});
 			
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add Part");
+			b.setText("Add Trim");
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MPart handler = MApplicationFactory.eINSTANCE.createPart();
+					MWindowTrim handler = MApplicationFactory.eINSTANCE.createWindowTrim();
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
 					
 					if( cmd.canExecute() ) {

From d9098aeef552a1293e6a2a228d273999cd7d6614 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 11 Mar 2010 21:53:21 +0000
Subject: [PATCH 0024/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * added new actions to create models

---
 .../e4/tools/emf/ui/internal/common/component/PartEditor.java   | 1 +
 .../e4/tools/emf/ui/internal/common/component/WindowEditor.java | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 929f17a9a9..4b66c2ea3e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -168,6 +168,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 
 			TableViewer tableviewer = new TableViewer(parent);
+			tableviewer.getTable().setHeaderVisible(true);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			tableviewer.setContentProvider(cp);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 2b5718f546..294fc7f4c7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -190,6 +190,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText("Find ...");
+			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 		}
 
 		ControlFactory.createTagsWidget(parent, this);

From 7ae928b5a4cd375d2277803d8d9472385aba69d4 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 11 Mar 2010 22:19:42 +0000
Subject: [PATCH 0025/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * implemented remove actions

---
 .../component/virtual/VCommandEditor.java     |  66 +++++++----
 .../component/virtual/VControlEditor.java     |  16 +++
 .../component/virtual/VHandlerEditor.java     |  75 +++++++++----
 .../component/virtual/VKeyBindingEditor.java  | 106 +++++++++++-------
 .../component/virtual/VWindowEditor.java      |  27 ++++-
 .../component/virtual/VWindowTrimEditor.java  |  16 +++
 6 files changed, 214 insertions(+), 92 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index eddf3aa6ff..3a7306a3c5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -10,22 +10,27 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.util.List;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MCommand;
+import org.eclipse.e4.ui.model.application.MHandler;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
@@ -43,6 +48,7 @@ public class VCommandEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
+	private TableViewer viewer;
 
 	public VCommandEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
@@ -75,7 +81,9 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent,context, getMaster());
 		}
-		getMaster().setValue(((VirtualEntry<?>)object).getOriginalParent());
+		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
@@ -89,29 +97,32 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			l.setText("Commands");
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
-			TableViewer viewer = new TableViewer(parent);
+			viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 			viewer.getTable().setHeaderVisible(true);
 
-			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-			column.getColumn().setText("Name");
-			column.getColumn().setWidth(200);
-			
-			column = new TableViewerColumn(viewer, SWT.NONE);
-			column.getColumn().setText("Id");
-			column.getColumn().setWidth(200);
-			
-			
-			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.APPLICATION__COMMANDS);
-			IValueProperty[] props = {
-				EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID),
-				EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND__COMMAND_NAME)
-			};
-			
-			ViewerSupport.bind(viewer, prop.observeDetail(getMaster()), props);
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID);
+					
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Name");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
 			
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND__COMMAND_NAME);
+					
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Id");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+						
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
 			GridLayout gl = new GridLayout();
@@ -152,9 +163,20 @@ public void widgetSelected(SelectionEvent e) {
 			b.setText("Remove");
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> commands = ((IStructuredSelection)viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.APPLICATION__COMMANDS, commands);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
 		}
 
-
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java
index 4df23d77de..af30d970c2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.util.List;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -27,8 +29,10 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -199,6 +203,18 @@ public void widgetSelected(SelectionEvent e) {
 			b.setText("Remove");
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> controls = ((IStructuredSelection)viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, controls);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
 		}
 
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 708d8a28f8..f93b39920d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -10,10 +10,12 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.util.List;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
@@ -23,10 +25,12 @@
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
@@ -44,6 +48,7 @@ public class VHandlerEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
+	private TableViewer viewer;
 
 	public VHandlerEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
@@ -76,7 +81,9 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent,context, getMaster());
 		}
-		getMaster().setValue(((VirtualEntry<?>)object).getOriginalParent());
+		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
@@ -90,33 +97,41 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			l.setText("Handlers");
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
-			TableViewer viewer = new TableViewer(parent);
+			viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 			viewer.getTable().setHeaderVisible(true);
 
-			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-			column.getColumn().setText("Command");
-			column.getColumn().setWidth(200);
-			
-			column = new TableViewerColumn(viewer, SWT.NONE);
-			column.getColumn().setText("Class");
-			column.getColumn().setWidth(300);
-			
-			column = new TableViewerColumn(viewer, SWT.NONE);
-			column.getColumn().setText("Id");
-			column.getColumn().setWidth(150);
-
-			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
-			IValueProperty[] props = {
-				EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLER__COMMAND, MApplicationPackage.Literals.COMMAND__COMMAND_NAME)),
-				EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI),
-				EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)
-			};
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLER__COMMAND, MApplicationPackage.Literals.COMMAND__COMMAND_NAME));
+
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Command");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
 			
-			ViewerSupport.bind(viewer, prop.observeDetail(getMaster()), props);
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI);
+
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Class");
+				column.getColumn().setWidth(300);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
 			
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID);
+
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Id");
+				column.getColumn().setWidth(150);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
 			GridLayout gl = new GridLayout();
@@ -157,6 +172,18 @@ public void widgetSelected(SelectionEvent e) {
 			b.setText("Remove");
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> handlers = ((IStructuredSelection)viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS, handlers);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
 		}
 
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java
index b086f10eaa..df1e2d2bbf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java
@@ -10,23 +10,28 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.util.List;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MHandler;
 import org.eclipse.e4.ui.model.application.MKeyBinding;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
@@ -44,6 +49,7 @@ public class VKeyBindingEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
+	private TableViewer viewer;
 
 	public VKeyBindingEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
@@ -72,17 +78,18 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			composite = createForm(parent, context, getMaster());
 		}
-		getMaster().setValue(((VirtualEntry<?>)object).getOriginalParent());
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		{
@@ -90,41 +97,49 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			l.setText("Keybindings");
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
-			TableViewer viewer = new TableViewer(parent);
+			viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 			viewer.getTable().setHeaderVisible(true);
 
-			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-			column.getColumn().setText("KeySequence");
-			column.getColumn().setWidth(100);
-			
-			column = new TableViewerColumn(viewer, SWT.NONE);
-			column.getColumn().setText("Command");
-			column.getColumn().setWidth(200);
-			
-			column = new TableViewerColumn(viewer, SWT.NONE);
-			column.getColumn().setText("Id");
-			column.getColumn().setWidth(170);
-
-			
-			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS);
-			IValueProperty[] props = {
-				EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.KEY_SEQUENCE__KEY_SEQUENCE),
-				EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.KEY_BINDING__COMMAND, MApplicationPackage.Literals.COMMAND__COMMAND_NAME)),
-				EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)
-			};
-			
-			ViewerSupport.bind(viewer, prop.observeDetail(getMaster()), props);
-			
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.KEY_SEQUENCE__KEY_SEQUENCE);
+
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("KeySequence");
+				column.getColumn().setWidth(100);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.KEY_BINDING__COMMAND, MApplicationPackage.Literals.COMMAND__COMMAND_NAME));
+
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Command");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID);
+
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Id");
+				column.getColumn().setWidth(170);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
 			GridLayout gl = new GridLayout();
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
@@ -146,8 +161,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 				public void widgetSelected(SelectionEvent e) {
 					MKeyBinding handler = MApplicationFactory.eINSTANCE.createKeyBinding();
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS, handler);
-					
-					if( cmd.canExecute() ) {
+
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 						editor.setSelection(handler);
 					}
@@ -158,9 +173,20 @@ public void widgetSelected(SelectionEvent e) {
 			b.setText("Remove");
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> keybinding = ((IStructuredSelection)viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS, keybinding);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
 		}
 
-
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 3b5bf2a6a5..aed6c06a28 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.util.List;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -22,11 +24,12 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
@@ -44,6 +47,7 @@ public class VWindowEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
+	private TableViewer viewer;
 
 	public VWindowEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
@@ -76,7 +80,9 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent,context, getMaster());
 		}
-		getMaster().setValue(((VirtualEntry<?>)object).getOriginalParent());
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
@@ -90,7 +96,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			l.setText("Windows");
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
-			TableViewer viewer = new TableViewer(parent);
+			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
 			
@@ -144,9 +150,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 				column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
 			}
 			
-			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(getMaster()));
-			
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
 			GridLayout gl = new GridLayout();
@@ -187,6 +190,18 @@ public void widgetSelected(SelectionEvent e) {
 			b.setText("Remove");
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> windows = ((IStructuredSelection)viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, windows);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
 		}
 
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index f87f30b9ae..2e3e539efe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.util.List;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -22,8 +24,10 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -138,6 +142,18 @@ public void widgetSelected(SelectionEvent e) {
 			b.setText("Remove");
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> trimElements = ((IStructuredSelection)viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, trimElements);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
 		}
 
 

From 641bf06e50acba9751d63fce894f15700bc02336 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 12 Mar 2010 00:14:38 +0000
Subject: [PATCH 0026/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * added menu implementation parts

---
 .../emf/ui/internal/common/ModelEditor.java   |  11 +-
 .../component/DirectMenuItemEditor.java       |  59 ++++
 .../component/HandledMenuItemEditor.java      |  59 ++++
 .../internal/common/component/MenuEditor.java | 267 +++++++++++++++++
 .../common/component/MenuItemEditor.java      | 273 ++++++++++++++++++
 .../common/component/WindowTrimEditor.java    |   1 -
 .../common/component/virtual/VMenuEditor.java | 168 +++++++++++
 .../component/virtual/VWindowEditor.java      | 222 +++++++-------
 8 files changed, 945 insertions(+), 115 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 79ae2c45c9..042e28c16b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -24,11 +24,15 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ApplicationEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectMenuItemEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledMenuItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.KeyBindingEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CommandEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandlerEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ModelComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ModelComponentsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PartDescriptorEditor;
@@ -46,6 +50,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VControlEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VKeyBindingEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowTrimEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
@@ -186,7 +191,7 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 
 	private void registerVirtualEditors() {
 		virtualEditors = new AbstractComponentEditor[] {
-				null, // V-Menu
+				new VMenuEditor(modelProvider.getEditingDomain(),this), // V-Menu
 				null, // V-Part
 				new VHandlerEditor(modelProvider.getEditingDomain(),this),
 				new VKeyBindingEditor(modelProvider.getEditingDomain(), this),
@@ -222,6 +227,10 @@ private void registerDefaultEditors() {
 		registerEditor( MApplicationPackage.Literals.PERSPECTIVE_STACK, new PerspectiveStackEditor(modelProvider.getEditingDomain()));
 		registerEditor( MApplicationPackage.Literals.PERSPECTIVE, new PerspectiveEditor(modelProvider.getEditingDomain()));
 		registerEditor( MApplicationPackage.Literals.PLACEHOLDER, new PlaceholderEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.MENU, new MenuEditor(modelProvider.getEditingDomain(), this));
+		registerEditor( MApplicationPackage.Literals.MENU_ITEM, new MenuItemEditor(modelProvider.getEditingDomain(), this));
+		registerEditor( MApplicationPackage.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), this));
+		registerEditor( MApplicationPackage.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this));
 	}
 
 	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
new file mode 100644
index 0000000000..59a9e66ff7
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class DirectMenuItemEditor extends MenuItemEditor {
+	private Image image;
+	
+	public DirectMenuItemEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain, editor);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if( image == null ) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/DirectMenuItem.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "DirectMenuItem";
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "DirectMenuItem bla bla bla";
+	}
+	
+	@Override
+	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
new file mode 100644
index 0000000000..a3d534cfde
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class HandledMenuItemEditor extends MenuItemEditor {
+	private Image image;
+	
+	public HandledMenuItemEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain, editor);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if( image == null ) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/HandledMenuItem.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "HandledMenuItem";
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "HandledMenuItem bla bla bla";
+	}
+	
+	@Override
+	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
new file mode 100644
index 0000000000..cfa7ca9cc2
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -0,0 +1,267 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MDirectMenuItem;
+import org.eclipse.e4.ui.model.application.MHandledMenuItem;
+import org.eclipse.e4.ui.model.application.MHandler;
+import org.eclipse.e4.ui.model.application.MMenuItem;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class MenuEditor extends AbstractComponentEditor {
+
+	private Composite composite;
+	private Image image;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+
+	public MenuEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if( image == null ) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Menu.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Menu";
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Menu bla bla bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+		}
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("MenuItems");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			
+			final TableViewer viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.getTable().setHeaderVisible(true);
+			
+			{
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Type");
+				column.getColumn().setWidth(100);
+				column.setLabelProvider(new ComponentLabelProvider(editor));
+			}
+			
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ITEM__TYPE);
+
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("ItemType");
+				column.getColumn().setWidth(100);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+			
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL);
+
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Label");
+				column.getColumn().setWidth(100);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+			
+			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(master));
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add MenuItem ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MMenuItem handler = MApplicationFactory.eINSTANCE.createMenuItem();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add Handled-MenuItem ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MHandledMenuItem handler = MApplicationFactory.eINSTANCE.createHandledMenuItem();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add Direct-MenuItem ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MDirectMenuItem handler = MApplicationFactory.eINSTANCE.createDirectMenuItem();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> keybinding = ((IStructuredSelection)viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+		
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
new file mode 100644
index 0000000000..287a145bea
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -0,0 +1,273 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MDirectMenuItem;
+import org.eclipse.e4.ui.model.application.MHandledMenuItem;
+import org.eclipse.e4.ui.model.application.MHandler;
+import org.eclipse.e4.ui.model.application.MMenuItem;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class MenuItemEditor  extends AbstractComponentEditor {
+
+	private Composite composite;
+	private Image image;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+
+	public MenuItemEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if( image == null ) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/MenuItem.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "MenuItem";
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "MenuItem bla bla bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+		}
+		
+		createFormSubTypeForm(parent, context, master);
+		
+		return parent;
+	}
+	
+	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("MenuItems");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			
+			final TableViewer viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.getTable().setHeaderVisible(true);
+			
+			{
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Type");
+				column.getColumn().setWidth(100);
+				column.setLabelProvider(new ComponentLabelProvider(editor));
+			}
+			
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ITEM__TYPE);
+
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("ItemType");
+				column.getColumn().setWidth(100);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+			
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL);
+
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Label");
+				column.getColumn().setWidth(100);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+			
+			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(master));
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add MenuItem ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MMenuItem handler = MApplicationFactory.eINSTANCE.createMenuItem();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add Handled-MenuItem ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MHandledMenuItem handler = MApplicationFactory.eINSTANCE.createHandledMenuItem();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add Direct-MenuItem ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MDirectMenuItem handler = MApplicationFactory.eINSTANCE.createDirectMenuItem();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> keybinding = ((IStructuredSelection)viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
index 31dd6d0540..33ae1f5b15 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
@@ -18,7 +18,6 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.ui.model.application.ItemType;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MTrimContainer;
 import org.eclipse.e4.ui.model.application.SideValue;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
new file mode 100644
index 0000000000..965dc168a0
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -0,0 +1,168 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MMenu;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VMenuEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+	private TableViewer viewer;
+
+	public VMenuEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Menus";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Menus Bla Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent, context, getMaster());
+		}
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+		
+		Label l = new Label(parent, SWT.NONE);
+		l.setText("Menus");
+		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+		viewer = new TableViewer(parent);
+		ObservableListContentProvider cp = new ObservableListContentProvider();
+		viewer.setContentProvider(cp);
+		
+		IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID);
+		viewer.setLabelProvider(new ObservableColumnLabelProvider<MMenu>(valProp.observeDetail(cp.getKnownElements())));
+		
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.heightHint = 300;
+		viewer.getControl().setLayoutData(gd);
+
+		Composite buttonComp = new Composite(parent, SWT.NONE);
+		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+		GridLayout gl = new GridLayout();
+		gl.marginLeft = 0;
+		gl.marginRight = 0;
+		gl.marginWidth = 0;
+		gl.marginHeight = 0;
+		buttonComp.setLayout(gl);
+
+		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Up");
+		b.setImage(getImage(b.getDisplay(), ARROW_UP));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Down");
+		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Add ...");
+		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				MMenu handler = MApplicationFactory.eINSTANCE.createMenu();
+				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.PART__MENUS, handler);
+
+				if (cmd.canExecute()) {
+					getEditingDomain().getCommandStack().execute(cmd);
+					editor.setSelection(handler);
+				}
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Remove");
+		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					List<?> windows = ((IStructuredSelection) viewer.getSelection()).toList();
+					Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.PART__MENUS, windows);
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+					}
+				}
+			}
+		});
+		
+		return parent;
+	}
+	
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index aed6c06a28..f065d0d409 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -76,9 +76,9 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			composite = createForm(parent, context, getMaster());
 		}
 		VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
@@ -86,124 +86,120 @@ public Composite getEditor(Composite parent, Object object) {
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
+		Label l = new Label(parent, SWT.NONE);
+		l.setText("Windows");
+		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+		viewer = new TableViewer(parent);
+		ObservableListContentProvider cp = new ObservableListContentProvider();
+		viewer.setContentProvider(cp);
+
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.heightHint = 300;
+		viewer.getControl().setLayoutData(gd);
+		viewer.getTable().setHeaderVisible(true);
+
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText("Windows");
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
-			viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
-			viewer.getControl().setLayoutData(gd);
-			viewer.getTable().setHeaderVisible(true);
-
-			{
-				IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL);
-				
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Name");
-				column.getColumn().setWidth(180);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));		
-			}
-			
-			{
-				IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__X);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("X");
-				column.getColumn().setWidth(80);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
-			}
-			
-			{
-				IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__Y);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Y");
-				column.getColumn().setWidth(80);				
-				column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
-			}
-			
-			{
-				IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__WIDTH);
-				
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Width");
-				column.getColumn().setWidth(100);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
-			}
-			
-			{
-				IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__HEIGHT);
-				
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Height");
-				column.getColumn().setWidth(100);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
+			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL);
+
+			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+			column.getColumn().setText("Name");
+			column.getColumn().setWidth(180);
+			column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
+		}
+
+		{
+			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__X);
+
+			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+			column.getColumn().setText("X");
+			column.getColumn().setWidth(80);
+			column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
+		}
+
+		{
+			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__Y);
+
+			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+			column.getColumn().setText("Y");
+			column.getColumn().setWidth(80);
+			column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
+		}
+
+		{
+			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__WIDTH);
+
+			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+			column.getColumn().setText("Width");
+			column.getColumn().setWidth(100);
+			column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
+		}
+
+		{
+			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__HEIGHT);
+
+			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+			column.getColumn().setText("Height");
+			column.getColumn().setWidth(100);
+			column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
+		}
+
+		Composite buttonComp = new Composite(parent, SWT.NONE);
+		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+		GridLayout gl = new GridLayout();
+		gl.marginLeft = 0;
+		gl.marginRight = 0;
+		gl.marginWidth = 0;
+		gl.marginHeight = 0;
+		buttonComp.setLayout(gl);
+
+		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Up");
+		b.setImage(getImage(b.getDisplay(), ARROW_UP));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Down");
+		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Add ...");
+		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				MWindow handler = MApplicationFactory.eINSTANCE.createWindow();
+				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+
+				if (cmd.canExecute()) {
+					getEditingDomain().getCommandStack().execute(cmd);
+					editor.setSelection(handler);
+				}
 			}
-			
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add ...");
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					MWindow handler = MApplicationFactory.eINSTANCE.createWindow();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
-					
-					if( cmd.canExecute() ) {
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Remove");
+		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					List<?> windows = ((IStructuredSelection) viewer.getSelection()).toList();
+					Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, windows);
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> windows = ((IStructuredSelection)viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, windows);
-						if( cmd.canExecute() ) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
 					}
 				}
-			});
-		}
-
+			}
+		});
 
 		return parent;
 	}

From b705e2748d674eb7a8f797994c50082e12a50686 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 13 Mar 2010 10:39:02 +0000
Subject: [PATCH 0027/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * implemented some menu details

---
 .../component/DirectMenuItemEditor.java       | 23 ++++++++
 .../internal/common/component/MenuEditor.java | 11 +---
 .../common/component/MenuItemEditor.java      | 54 +++++++++++++++----
 .../internal/common/component/PartEditor.java |  2 +
 4 files changed, 71 insertions(+), 19 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 59a9e66ff7..408a5ae179 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -15,11 +15,20 @@
 
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class DirectMenuItemEditor extends MenuItemEditor {
 	private Image image;
@@ -54,6 +63,20 @@ public String getDescription(Object element) {
 	
 	@Override
 	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Class URI");
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
+
+			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setText("Find ...");			
+		}
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index cfa7ca9cc2..aeb7bd659f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -139,7 +139,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			{
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Type");
-				column.getColumn().setWidth(100);
+				column.getColumn().setWidth(300);
 				column.setLabelProvider(new ComponentLabelProvider(editor));
 			}
 			
@@ -152,15 +152,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
 			
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Label");
-				column.getColumn().setWidth(100);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
-			
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
 			
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 287a145bea..d9b85af5c8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -27,6 +27,7 @@
 import org.eclipse.e4.ui.model.application.MHandledMenuItem;
 import org.eclipse.e4.ui.model.application.MHandler;
 import org.eclipse.e4.ui.model.application.MMenuItem;
+import org.eclipse.e4.ui.model.application.MUILabel;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -121,6 +122,45 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 		}
 		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Label");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));			
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Tooltip");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));			
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Icon URI");
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+
+			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setText("Find ...");			
+		}
+
+		
 		createFormSubTypeForm(parent, context, master);
 		
 		return parent;
@@ -147,7 +187,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			{
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Type");
-				column.getColumn().setWidth(100);
+				column.getColumn().setWidth(300);
 				column.setLabelProvider(new ComponentLabelProvider(editor));
 			}
 			
@@ -160,14 +200,6 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
 			
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Label");
-				column.getColumn().setWidth(100);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
 			
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
@@ -268,6 +300,10 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
+		MUILabel label = (MUILabel) element;
+		if( label.getLabel() != null && label.getLabel().trim().length() > 0 ) {
+			return label.getLabel();
+		}
 		return null;
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 4b66c2ea3e..6c535e8a44 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -145,6 +145,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
 			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setText("Find ...");			
 		}
 
@@ -158,6 +159,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
 
 			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setText("Find ...");			
 		}
 		

From eccd80cafc5bce2ce81ced3cb6412643d254d7eb Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 13 Mar 2010 14:45:59 +0000
Subject: [PATCH 0028/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * added support for viewer updates

---
 .../component/AbstractComponentEditor.java    |   7 ++
 .../emf/ui/internal/common/ModelEditor.java   |  72 ++++++++++-
 .../common/component/CommandEditor.java       |   8 ++
 .../common/component/HandlerEditor.java       |  27 ++--
 .../common/component/KeyBindingEditor.java    |  63 +++++-----
 .../internal/common/component/MenuEditor.java |  19 +++
 .../common/component/MenuItemEditor.java      | 119 ++++++++++++++++--
 7 files changed, 260 insertions(+), 55 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 532731877c..8a376fe144 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -18,7 +18,10 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
@@ -96,4 +99,8 @@ protected Image loadSharedImage(Display d, URL path) {
 		}
 		return null;
 	}
+	
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] {};
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 042e28c16b..f3a20636de 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,14 +10,23 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.inject.Inject;
 
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.map.IMapChangeListener;
+import org.eclipse.core.databinding.observable.map.IObservableMap;
+import org.eclipse.core.databinding.observable.map.MapChangeEvent;
 import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
+import org.eclipse.core.databinding.observable.set.ISetChangeListener;
+import org.eclipse.core.databinding.observable.set.SetChangeEvent;
+import org.eclipse.core.databinding.observable.set.WritableSet;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
@@ -54,6 +63,8 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowTrimEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.viewers.ObservableListTreeContentProvider;
@@ -84,6 +95,7 @@ public class ModelEditor {
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private AbstractComponentEditor[] virtualEditors;
+	private List<FeaturePath> labelFeaturePaths = new ArrayList<FeaturePath>();
 
 //	private List<AbstractComponentEditor> editors = new ArrayList<AbstractComponentEditor>();
 
@@ -178,11 +190,41 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		parent.setLayout(l);
 		ShadowComposite editingArea = new ShadowComposite(parent,SWT.NONE);
 		editingArea.setLayout(new FillLayout());
-		TreeViewer viewer = new TreeViewer(editingArea,SWT.FULL_SELECTION|SWT.H_SCROLL|SWT.V_SCROLL);
+		final TreeViewer viewer = new TreeViewer(editingArea,SWT.FULL_SELECTION|SWT.H_SCROLL|SWT.V_SCROLL);
 		viewer.setLabelProvider(new ComponentLabelProvider(this));
 		ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(
 				new ObservableFactoryImpl(), new TreeStructureAdvisorImpl());
 		viewer.setContentProvider(contentProvider);
+		
+		final WritableSet clearedSet = new WritableSet();
+		
+		contentProvider.getKnownElements().addSetChangeListener(new ISetChangeListener() {
+			
+			public void handleSetChange(SetChangeEvent event) {
+				for( Object o : event.diff.getAdditions() ) {
+					if( o instanceof EObject ) {
+						clearedSet.add(o);	
+					}
+				}
+				
+				for( Object o : event.diff.getRemovals() ) {
+					if( o instanceof EObject ) {
+						clearedSet.remove(o);	
+					}
+				}
+			}
+		});
+		
+		for( FeaturePath p : labelFeaturePaths ) {
+			IObservableMap map = EMFProperties.value(p).observeDetail(clearedSet);
+			map.addMapChangeListener(new IMapChangeListener() {
+				
+				public void handleMapChange(MapChangeEvent event) {
+					viewer.update(event.diff.getChangedKeys().toArray(), null);
+				}
+			});
+		}
+		
 		viewer.setInput(modelProvider.getRoot());
 		viewer.expandAll();
 
@@ -235,6 +277,34 @@ private void registerDefaultEditors() {
 
 	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
 		editorMap.put(eClass, editor);
+		
+		for( FeaturePath p : editor.getLabelProperties() ) {
+			boolean found = false;
+			for( FeaturePath tmp : labelFeaturePaths ) {
+				if( equalsPaths(p, tmp) ) {
+					found = true;
+					break;
+				}
+			}
+			
+			if( ! found ) {
+				labelFeaturePaths.add(p);
+			}
+		}
+	}
+	
+	private boolean equalsPaths(FeaturePath p1, FeaturePath p2) {
+		if( p1.getFeaturePath().length == p2.getFeaturePath().length ) {
+			for( int i = 0; i < p1.getFeaturePath().length; i++ ) {
+				if( ! p1.getFeaturePath()[i].equals(p2.getFeaturePath()[i]) ) {
+					return false;
+				}
+			}
+			
+			return true;
+		}
+		
+		return false;
 	}
 
 	public AbstractComponentEditor getEditor(EClass eClass) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index c3c309c89e..f1ee59f784 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -19,6 +19,7 @@
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MCommand;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -208,5 +209,12 @@ public String getDetailLabel(Object element) {
 
 		return null;
 	}
+	
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] {
+			FeaturePath.fromList(MApplicationPackage.Literals.COMMAND__COMMAND_NAME)	
+		};
+	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 11a4177e55..7b7ac5d7e6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -42,10 +42,9 @@ public HandlerEditor(EditingDomain editingDomain) {
 		super(editingDomain);
 	}
 
-
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Handler.gif"));
 			} catch (MalformedURLException e) {
@@ -68,16 +67,16 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context);
+			composite = createForm(parent, context);
 		}
 		getMaster().setValue(object);
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context) {
-		parent = new Composite(parent,SWT.NONE);
+		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
@@ -89,9 +88,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -102,9 +101,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEnabled(false);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value( getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLER__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLER__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(getMaster()));
 
-			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText("Find ...");
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
@@ -117,9 +116,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(getMaster()));
 
-			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 			b.setText("Find ...");
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
@@ -139,11 +138,15 @@ public IObservableList getChildList(Object element) {
 	@Override
 	public String getDetailLabel(Object element) {
 		MHandler handler = (MHandler) element;
-		if( handler.getCommand() != null && handler.getCommand().getCommandName() != null && handler.getCommand().getCommandName().trim().length() > 0 ) {
+		if (handler.getCommand() != null && handler.getCommand().getCommandName() != null && handler.getCommand().getCommandName().trim().length() > 0) {
 			return handler.getCommand().getCommandName();
 		}
 
 		return null;
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(MApplicationPackage.Literals.HANDLER__COMMAND, MApplicationPackage.Literals.COMMAND__COMMAND_NAME) };
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 9dc8a2d8f3..195137df1c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -68,7 +68,7 @@ public KeyBindingEditor(EditingDomain editingDomain) {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/KeyBinding.gif"));
 			} catch (MalformedURLException e) {
@@ -92,16 +92,16 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context);
+			composite = createForm(parent, context);
 		}
 		getMaster().setValue(object);
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context) {
-		parent = new Composite(parent,SWT.NONE);
+		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
@@ -113,9 +113,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -125,9 +125,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.KEY_SEQUENCE__KEY_SEQUENCE).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.KEY_SEQUENCE__KEY_SEQUENCE).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -138,9 +138,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEnabled(false);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value( getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.KEY_BINDING__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.KEY_BINDING__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(getMaster()));
 
-			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText("Find ...");
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
@@ -165,12 +165,12 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 
 			@Override
 			protected void setValue(Object element, Object value) {
-				((MParameter)element).setTag((String) value);
+				((MParameter) element).setTag((String) value);
 			}
 
 			@Override
 			protected Object getValue(Object element) {
-				String val = ((MParameter)element).getTag();
+				String val = ((MParameter) element).getTag();
 				return val == null ? "" : val;
 			}
 
@@ -193,12 +193,12 @@ protected boolean canEdit(Object element) {
 
 			@Override
 			protected void setValue(Object element, Object value) {
-				((MParameter)element).setValue((String) value);
+				((MParameter) element).setValue((String) value);
 			}
 
 			@Override
 			protected Object getValue(Object element) {
-				String val = ((MParameter)element).getValue();
+				String val = ((MParameter) element).getValue();
 				return val == null ? "" : val;
 			}
 
@@ -216,28 +216,23 @@ protected boolean canEdit(Object element) {
 		ColumnViewerEditorActivationStrategy editorActivationStrategy = new ColumnViewerEditorActivationStrategy(tableviewer) {
 			@Override
 			protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
-				boolean singleSelect = ((IStructuredSelection)tableviewer.getSelection()).size() == 1;
-				boolean isLeftDoubleMouseSelect = event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION && ((MouseEvent)event.sourceEvent).button == 1;
+				boolean singleSelect = ((IStructuredSelection) tableviewer.getSelection()).size() == 1;
+				boolean isLeftDoubleMouseSelect = event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION && ((MouseEvent) event.sourceEvent).button == 1;
 
-				return singleSelect && (isLeftDoubleMouseSelect
-						|| event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC
-						|| event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
+				return singleSelect && (isLeftDoubleMouseSelect || event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC || event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
 			}
 		};
 		TableViewerEditor.create(tableviewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
 
-		ViewerSupport.bind(tableviewer, prop.observeDetail(getMaster()), new IValueProperty[] {
-			EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__TAG),
-			EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__VALUE)
-		});
+		ViewerSupport.bind(tableviewer, prop.observeDetail(getMaster()), new IValueProperty[] { EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__TAG), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__VALUE) });
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
-		buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
 		GridLayout gl = new GridLayout();
-		gl.marginLeft=0;
-		gl.marginRight=0;
-		gl.marginWidth=0;
-		gl.marginHeight=0;
+		gl.marginLeft = 0;
+		gl.marginRight = 0;
+		gl.marginWidth = 0;
+		gl.marginHeight = 0;
 		buttonComp.setLayout(gl);
 
 		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
@@ -260,7 +255,7 @@ public void widgetSelected(SelectionEvent e) {
 				MKeyBinding item = (MKeyBinding) getMaster().getValue();
 				MParameter param = MApplicationFactory.eINSTANCE.createParameter();
 				Command cmd = AddCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.KEY_BINDING__PARAMETERS, param);
-				if( cmd.canExecute() ) {
+				if (cmd.canExecute()) {
 					getEditingDomain().getCommandStack().execute(cmd);
 				}
 				tableviewer.editElement(param, 0);
@@ -273,10 +268,10 @@ public void widgetSelected(SelectionEvent e) {
 
 			public void widgetSelected(SelectionEvent e) {
 				IStructuredSelection s = (IStructuredSelection) tableviewer.getSelection();
-				if( !s.isEmpty() ) {
+				if (!s.isEmpty()) {
 					MKeyBinding item = (MKeyBinding) getMaster().getValue();
 					Command cmd = RemoveCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.KEY_BINDING__PARAMETERS, s.toList());
-					if( cmd.canExecute() ) {
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 					}
 				}
@@ -300,10 +295,14 @@ public IObservableList getChildList(Object element) {
 	@Override
 	public String getDetailLabel(Object element) {
 		MKeySequence seq = (MKeySequence) element;
-		if( seq.getKeySequence() != null && seq.getKeySequence().trim().length() > 0 ) {
+		if (seq.getKeySequence() != null && seq.getKeySequence().trim().length() > 0) {
 			return seq.getKeySequence();
 		}
 		return null;
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(MApplicationPackage.Literals.KEY_SEQUENCE__KEY_SEQUENCE) };
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index aeb7bd659f..a62493c72d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -21,6 +21,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.ItemType;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MDirectMenuItem;
@@ -174,6 +175,24 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add Separator ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MMenuItem handler = MApplicationFactory.eINSTANCE.createMenuItem();
+					handler.setType(ItemType.SEPARATOR);
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+			
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Add MenuItem ...");
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index d9b85af5c8..1035aaed48 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -12,15 +12,19 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.ItemType;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MDirectMenuItem;
@@ -31,6 +35,7 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
@@ -44,6 +49,7 @@
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -58,7 +64,8 @@
 public class MenuItemEditor  extends AbstractComponentEditor {
 
 	private Composite composite;
-	private Image image;
+	private Image menuImage;
+	private Image separatorImage;
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
 
@@ -71,21 +78,41 @@ public MenuItemEditor(EditingDomain editingDomain, ModelEditor editor) {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/MenuItem.gif"));
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		MMenuItem item = (MMenuItem) element;
+		if( item.getType() == ItemType.SEPARATOR ) {
+			if( separatorImage == null ) {
+				try {
+					separatorImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/MenuItem_separator.gif"));
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+			
+			return separatorImage;
+		} else {
+			if( menuImage == null ) {
+				try {
+					menuImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/MenuItem.gif"));
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 			}
-		}
 
-		return image;
+			return menuImage;
+		}
 	}
 
 	@Override
 	public String getLabel(Object element) {
-		return "MenuItem";
+		MMenuItem item = (MMenuItem) element;
+		if( item.getType() == ItemType.SEPARATOR ) {
+			return "Separator";
+		} else {
+			return "MenuItem";	
+		}
+		
 	}
 
 	@Override
@@ -105,6 +132,53 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context,
 			WritableValue master) {
+		final Composite container = new Composite(parent, SWT.NONE);
+		final StackLayout layout = new StackLayout();
+		container.setLayout(layout);
+		
+		final Composite menuFormComposite = createMenuItemForm(container, context, master);
+		final Composite separatorComposite = createSeparatorForm(container, context, master);
+		
+		getMaster().addValueChangeListener(new IValueChangeListener() {
+			
+			public void handleValueChange(ValueChangeEvent event) {
+				MMenuItem item = (MMenuItem) event.diff.getNewValue();
+				if( item.getType() == ItemType.SEPARATOR ) {
+					layout.topControl = separatorComposite;
+				} else {
+					layout.topControl = menuFormComposite;
+				}
+				container.layout(true, true);
+			}
+		});
+		
+		return container;
+	}
+	
+	private Composite createSeparatorForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+		}
+		
+		return parent;
+	}
+	
+	private Composite createMenuItemForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
@@ -223,6 +297,24 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add Separator ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MMenuItem handler = MApplicationFactory.eINSTANCE.createMenuItem();
+					handler.setType(ItemType.SEPARATOR);
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+			
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Add MenuItem ...");
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
@@ -306,4 +398,11 @@ public String getDetailLabel(Object element) {
 		}
 		return null;
 	}
+	
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] {
+			FeaturePath.fromList(MApplicationPackage.Literals.UI_LABEL__LABEL)
+		};
+	}
 }
\ No newline at end of file

From 3653dd91f70f275cccfe026fb92de1fece3520f3 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 13 Mar 2010 15:42:14 +0000
Subject: [PATCH 0029/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * implemented property editors for commands and
 handleditems

---
 .../emf/ui/internal/common/ModelEditor.java   |   1 -
 .../common/component/CommandEditor.java       | 179 +++++++++++++--
 .../component/HandledMenuItemEditor.java      | 210 +++++++++++++++++-
 .../component/HandledToolItemEditor.java      | 129 ++++++-----
 .../common/component/MenuItemEditor.java      |   1 -
 .../internal/common/component/PartEditor.java |   7 +
 .../component/PartSashContainerEditor.java    |   7 +
 .../common/component/PartStackEditor.java     |   1 -
 .../common/component/PerspectiveEditor.java   |   8 +
 .../common/component/ToolBarEditor.java       |   1 -
 .../common/component/ToolItemEditor.java      |   8 +
 .../common/component/WindowEditor.java        |   9 +-
 .../common/component/WindowTrimEditor.java    |   8 +
 .../component/virtual/VCommandEditor.java     |   4 +-
 14 files changed, 492 insertions(+), 81 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index f3a20636de..5503557b46 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -14,7 +14,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import javax.inject.Inject;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index f1ee59f784..e418a4cf1b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -14,21 +14,40 @@
 import java.net.URL;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MCommand;
+import org.eclipse.e4.ui.model.application.MCommandParameter;
+import org.eclipse.e4.ui.model.application.MParameter;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.ColumnViewerEditor;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
+import org.eclipse.jface.viewers.ComboBoxCellEditor;
+import org.eclipse.jface.viewers.EditingSupport;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.TableViewerEditor;
+import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -131,33 +150,145 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			l.setText("Parameters");
 			l.setLayoutData(new GridData(GridData.BEGINNING,GridData.BEGINNING,false,false));
 
-			TableViewer viewer = new TableViewer(parent,SWT.FULL_SELECTION|SWT.MULTI|SWT.BORDER);
+			final TableViewer viewer = new TableViewer(parent,SWT.FULL_SELECTION|SWT.MULTI|SWT.BORDER);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
 			viewer.getTable().setHeaderVisible(true);
 
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 120;
 			viewer.getControl().setLayoutData(gd);
 
-			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-			column.getColumn().setText("Name");
-			column.getColumn().setWidth(200);
+			{
+				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND_PARAMETER__NAME);
+				
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Name");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MCommandParameter>(prop.observeDetail(cp.getKnownElements())));
+				column.setEditingSupport(new EditingSupport(viewer) {
+					private TextCellEditor editor = new TextCellEditor(viewer.getTable());
+					
+					@Override
+					protected void setValue(Object element, Object value) {
+						Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.COMMAND_PARAMETER__NAME, value);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+					
+					@Override
+					protected Object getValue(Object element) {
+						MCommandParameter obj = (MCommandParameter) element;
+						return obj.getName() != null ? obj.getName() : "";
+					}
+					
+					@Override
+					protected CellEditor getCellEditor(Object element) {
+						return editor;
+					}
+					
+					@Override
+					protected boolean canEdit(Object element) {
+						return true;
+					}
+				});
+			}
+
+			{
+				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND_PARAMETER__TYPE_ID);
+				
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Type-Id");
+				column.getColumn().setWidth(200);				
+				column.setLabelProvider(new ObservableColumnLabelProvider<MCommandParameter>(prop.observeDetail(cp.getKnownElements())));
+				column.setEditingSupport(new EditingSupport(viewer) {
+					private TextCellEditor editor = new TextCellEditor(viewer.getTable());
+					
+					@Override
+					protected void setValue(Object element, Object value) {
+						Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.COMMAND_PARAMETER__TYPE_ID, value);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+					
+					@Override
+					protected Object getValue(Object element) {
+						MCommandParameter obj = (MCommandParameter) element;
+						return obj.getTypeId() != null ? obj.getTypeId() : "";
+					}
+					
+					@Override
+					protected CellEditor getCellEditor(Object element) {
+						return editor;
+					}
+					
+					@Override
+					protected boolean canEdit(Object element) {
+						return true;
+					}
+				});
+			}
 
-			column = new TableViewerColumn(viewer, SWT.NONE);
-			column.getColumn().setText("Type-Id");
-			column.getColumn().setWidth(200);
+			{
+				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND_PARAMETER__OPTIONAL);
+				
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Optional");
+				column.getColumn().setWidth(200);				
+				column.setLabelProvider(new ObservableColumnLabelProvider<MCommandParameter>(prop.observeDetail(cp.getKnownElements())) {
+					@Override
+					public String getText(MCommandParameter element) {
+						return element.isOptional() ? "yes" : "no";
+					}
+				});
+				column.setEditingSupport(new EditingSupport(viewer) {
+					private ComboBoxCellEditor editor = new ComboBoxCellEditor(viewer.getTable(), new String[] { "yes", "no" });
+					
+					@Override
+					protected void setValue(Object element, Object value) {
+						int idx = ((Number)value).intValue();
+						Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.COMMAND_PARAMETER__OPTIONAL, idx == 0);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+					
+					@Override
+					protected Object getValue(Object element) {
+						MCommandParameter obj = (MCommandParameter) element;
+						return obj.isOptional() ? 0 : 1;
+					}
+					
+					@Override
+					protected CellEditor getCellEditor(Object element) {
+						return editor;
+					}
+					
+					@Override
+					protected boolean canEdit(Object element) {
+						return true;
+					}
+				});
+			}
 
-			column = new TableViewerColumn(viewer, SWT.NONE);
-			column.getColumn().setText("Optional");
-			column.getColumn().setWidth(200);
+			ColumnViewerEditorActivationStrategy editorActivationStrategy = new ColumnViewerEditorActivationStrategy(viewer) {
+				@Override
+				protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
+					boolean singleSelect = ((IStructuredSelection)viewer.getSelection()).size() == 1;
+					boolean isLeftDoubleMouseSelect = event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION && ((MouseEvent)event.sourceEvent).button == 1;
 
-			IEMFEditListProperty mProp = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.COMMAND__PARAMETERS);
-			IValueProperty[] props = {
-					EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND_PARAMETER__NAME),
-					EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND_PARAMETER__TYPE_ID),
-					EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND_PARAMETER__OPTIONAL)
+					return singleSelect && (isLeftDoubleMouseSelect
+							|| event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC
+							|| event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
+				}
 			};
+			TableViewerEditor.create(viewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
 
-			ViewerSupport.bind(viewer, mProp.observeDetail(getMaster()), props);
+			
+			IEMFEditListProperty mProp = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.COMMAND__PARAMETERS);
+			viewer.setInput(mProp.observeDetail(getMaster()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
@@ -182,6 +313,18 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			b.setText("Add ...");
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MCommandParameter param = MApplicationFactory.eINSTANCE.createCommandParameter();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.COMMAND__PARAMETERS, param);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						viewer.editElement(param, 0);
+					}
+				}
+			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Remove");
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index a3d534cfde..e796142c1f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -14,12 +14,47 @@
 import java.net.URL;
 
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MHandledItem;
+import org.eclipse.e4.ui.model.application.MParameter;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFValueProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.ColumnViewerEditor;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
+import org.eclipse.jface.viewers.EditingSupport;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.TableViewerEditor;
+import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class HandledMenuItemEditor extends MenuItemEditor {
 	private Image image;
@@ -53,7 +88,180 @@ public String getDescription(Object element) {
 	}
 	
 	@Override
-	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, final WritableValue master) {
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		Label l = new Label(parent, SWT.NONE);
+		l.setText("Command");
+
+		Text t = new Text(parent, SWT.BORDER);
+		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		t.setEnabled(false);
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value( getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLED_ITEM__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(master));
+
+		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+		b.setText("Find ...");
+		b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("Parameters");
+		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+
+		final TableViewer tableviewer = new TableViewer(parent);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.heightHint = 120;
+		tableviewer.getTable().setHeaderVisible(true);
+		tableviewer.getControl().setLayoutData(gd);
+		
+		ObservableListContentProvider cp = new ObservableListContentProvider();
+		tableviewer.setContentProvider(cp);
+
+		{
+			IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__TAG);
+
+			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
+			column.getColumn().setText("Tag");
+			column.getColumn().setWidth(200);
+			column.setLabelProvider(new ObservableColumnLabelProvider<MParameter>(prop.observeDetail(cp.getKnownElements())));
+			column.setEditingSupport(new EditingSupport(tableviewer) {
+				private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
+
+				@Override
+				protected void setValue(Object element, Object value) {
+					Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.PARAMETER__TAG, value);
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+					}
+				}
+
+				@Override
+				protected Object getValue(Object element) {
+					String val = ((MParameter)element).getTag();
+					return val == null ? "" : val;
+				}
+
+				@Override
+				protected CellEditor getCellEditor(Object element) {
+					return cellEditor;
+				}
+
+				@Override
+				protected boolean canEdit(Object element) {
+					return true;
+				}
+			});
+		}
+
+		{
+			IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__VALUE);
+			
+			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
+			column.getColumn().setText("Value");
+			column.getColumn().setWidth(200);
+			column.setLabelProvider(new ObservableColumnLabelProvider<MParameter>(prop.observeDetail(cp.getKnownElements())));
+			column.setEditingSupport(new EditingSupport(tableviewer) {
+				private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
+
+				@Override
+				protected void setValue(Object element, Object value) {
+					Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.PARAMETER__VALUE, value);
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+					}
+				}
+
+				@Override
+				protected Object getValue(Object element) {
+					String val = ((MParameter)element).getValue();
+					return val == null ? "" : val;
+				}
+
+				@Override
+				protected CellEditor getCellEditor(Object element) {
+					return cellEditor;
+				}
+
+				@Override
+				protected boolean canEdit(Object element) {
+					return true;
+				}
+			});
+		}
+
+
+		ColumnViewerEditorActivationStrategy editorActivationStrategy = new ColumnViewerEditorActivationStrategy(tableviewer) {
+			@Override
+			protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
+				boolean singleSelect = ((IStructuredSelection)tableviewer.getSelection()).size() == 1;
+				boolean isLeftDoubleMouseSelect = event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION && ((MouseEvent)event.sourceEvent).button == 1;
+
+				return singleSelect && (isLeftDoubleMouseSelect
+						|| event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC
+						|| event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
+			}
+		};
+		TableViewerEditor.create(tableviewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
+
+		IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS);
+		tableviewer.setInput(prop.observeDetail(master));
 		
+		Composite buttonComp = new Composite(parent, SWT.NONE);
+		buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+		GridLayout gl = new GridLayout();
+		gl.marginLeft=0;
+		gl.marginRight=0;
+		gl.marginWidth=0;
+		gl.marginHeight=0;
+		buttonComp.setLayout(gl);
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Up");
+		b.setImage(getImage(b.getDisplay(), ARROW_UP));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Down");
+		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Add ...");
+		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				MHandledItem item = (MHandledItem) master.getValue();
+				MParameter param = MApplicationFactory.eINSTANCE.createParameter();
+				Command cmd = AddCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS, param);
+				if( cmd.canExecute() ) {
+					getEditingDomain().getCommandStack().execute(cmd);
+					tableviewer.editElement(param, 0);
+				}
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Remove");
+		b.addSelectionListener(new SelectionAdapter() {
+
+			public void widgetSelected(SelectionEvent e) {
+				IStructuredSelection s = (IStructuredSelection) tableviewer.getSelection();
+				if( !s.isEmpty() ) {
+					MHandledItem item = (MHandledItem) master.getValue();
+					Command cmd = RemoveCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS, s.toList());
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+					}
+				}
+			}
+
+		});
+		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 241e757d66..be54826183 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -14,7 +14,7 @@
 import java.net.URL;
 
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MHandledItem;
@@ -22,14 +22,16 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.ColumnViewerEditor;
 import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
@@ -102,63 +104,82 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 		gd.heightHint = 120;
 		tableviewer.getTable().setHeaderVisible(true);
 		tableviewer.getControl().setLayoutData(gd);
-		IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS);
-
-		TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-		column.getColumn().setText("Tag");
-		column.getColumn().setWidth(200);
-		column.setEditingSupport(new EditingSupport(tableviewer) {
-			private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
 
-			@Override
-			protected void setValue(Object element, Object value) {
-				((MParameter)element).setTag((String) value);
-			}
+		ObservableListContentProvider cp = new ObservableListContentProvider();
+		tableviewer.setContentProvider(cp);
+		
+		{
+			IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__TAG);
+			
+			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
+			column.getColumn().setText("Tag");
+			column.getColumn().setWidth(200);
+			column.setLabelProvider(new ObservableColumnLabelProvider<MParameter>(prop.observeDetail(cp.getKnownElements())));
+			column.setEditingSupport(new EditingSupport(tableviewer) {
+				private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
+
+				@Override
+				protected void setValue(Object element, Object value) {
+					Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.PARAMETER__TAG, value);
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+					}
+				}
 
-			@Override
-			protected Object getValue(Object element) {
-				String val = ((MParameter)element).getTag();
-				return val == null ? "" : val;
-			}
+				@Override
+				protected Object getValue(Object element) {
+					String val = ((MParameter)element).getTag();
+					return val == null ? "" : val;
+				}
 
-			@Override
-			protected CellEditor getCellEditor(Object element) {
-				return cellEditor;
-			}
+				@Override
+				protected CellEditor getCellEditor(Object element) {
+					return cellEditor;
+				}
 
-			@Override
-			protected boolean canEdit(Object element) {
-				return true;
-			}
-		});
+				@Override
+				protected boolean canEdit(Object element) {
+					return true;
+				}
+			});
+		}
 
-		column = new TableViewerColumn(tableviewer, SWT.NONE);
-		column.getColumn().setText("Value");
-		column.getColumn().setWidth(200);
-		column.setEditingSupport(new EditingSupport(tableviewer) {
-			private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
+		{
+			IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__VALUE);
+			
+			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
+			column.getColumn().setText("Value");
+			column.getColumn().setWidth(200);
+			column.setLabelProvider(new ObservableColumnLabelProvider<MParameter>(prop.observeDetail(cp.getKnownElements())));
+			column.setEditingSupport(new EditingSupport(tableviewer) {
+				private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
+
+				@Override
+				protected void setValue(Object element, Object value) {
+					Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.PARAMETER__VALUE, value);
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+					}
+				}
 
-			@Override
-			protected void setValue(Object element, Object value) {
-				((MParameter)element).setValue((String) value);
-			}
+				@Override
+				protected Object getValue(Object element) {
+					String val = ((MParameter)element).getValue();
+					return val == null ? "" : val;
+				}
 
-			@Override
-			protected Object getValue(Object element) {
-				String val = ((MParameter)element).getValue();
-				return val == null ? "" : val;
-			}
+				@Override
+				protected CellEditor getCellEditor(Object element) {
+					return cellEditor;
+				}
 
-			@Override
-			protected CellEditor getCellEditor(Object element) {
-				return cellEditor;
-			}
+				@Override
+				protected boolean canEdit(Object element) {
+					return true;
+				}
+			});
+		}
 
-			@Override
-			protected boolean canEdit(Object element) {
-				return true;
-			}
-		});
 
 		ColumnViewerEditorActivationStrategy editorActivationStrategy = new ColumnViewerEditorActivationStrategy(tableviewer) {
 			@Override
@@ -173,11 +194,9 @@ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent even
 		};
 		TableViewerEditor.create(tableviewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
 
-		ViewerSupport.bind(tableviewer, prop.observeDetail(master), new IValueProperty[] {
-			EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__TAG),
-			EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__VALUE)
-		});
-
+		IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS);
+		tableviewer.setInput(prop.observeDetail(getMaster()));
+		
 		Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
 		GridLayout gl = new GridLayout();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 1035aaed48..1164cd85e1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -12,7 +12,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 6c535e8a44..9e47b65682 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -25,6 +25,7 @@
 import org.eclipse.e4.ui.model.application.MPart;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -330,4 +331,10 @@ public String getDetailLabel(Object element) {
 		return o.getLabel();
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] {
+			FeaturePath.fromList(MApplicationPackage.Literals.UI_LABEL__LABEL)	
+		};
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 7c353761b3..7336c2be68 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -25,6 +25,7 @@
 import org.eclipse.e4.ui.model.application.MPartSashContainer;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
@@ -201,4 +202,10 @@ public String getDetailLabel(Object element) {
 		return null;
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] {
+			FeaturePath.fromList(MApplicationPackage.Literals.GENERIC_TILE__HORIZONTAL)	
+		};
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 6e701c5ef9..31ab7ea114 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -156,7 +156,6 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 1ca98ba0ea..70730a4568 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -15,6 +15,7 @@
 import org.eclipse.e4.ui.model.application.MPerspective;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
@@ -75,6 +76,13 @@ public String getDetailLabel(Object element) {
 		return null;
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] {
+			FeaturePath.fromList(MApplicationPackage.Literals.UI_LABEL__LABEL)	
+		};
+	}
+	
 	@Override
 	public String getDescription(Object element) {
 		return "Perspective Bla Bla Bla";
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index bdddc0c9f2..f04d8365d7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -85,7 +85,6 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index f9e819342e..345d3b77ae 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -22,6 +22,7 @@
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MToolItem;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -193,4 +194,11 @@ public String getDetailLabel(Object element) {
 		return null;
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] {
+			FeaturePath.fromList(MApplicationPackage.Literals.UI_LABEL__LABEL),
+			FeaturePath.fromList(MApplicationPackage.Literals.UI_LABEL__TOOLTIP)
+		};
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 294fc7f4c7..8176e8d2ac 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -25,6 +25,7 @@
 import org.eclipse.e4.ui.model.application.MWindowTrim;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -51,7 +52,6 @@ public class WindowEditor extends AbstractComponentEditor {
 
 	public WindowEditor(EditingDomain editingDomain) {
 		super(editingDomain);
-		// TODO Auto-generated constructor stub
 	}
 
 	@Override
@@ -249,4 +249,11 @@ public String getDetailLabel(Object element) {
 		}
 		return null;
 	}
+	
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] {
+			FeaturePath.fromList(MApplicationPackage.Literals.UI_LABEL__LABEL)	
+		};
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
index 33ae1f5b15..bead362981 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
@@ -23,6 +23,7 @@
 import org.eclipse.e4.ui.model.application.SideValue;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -139,5 +140,12 @@ public String getDetailLabel(Object element) {
 		
 		return null;
 	}
+	
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] {
+			FeaturePath.fromList(MApplicationPackage.Literals.TRIM_CONTAINER__SIDE)	
+		};
+	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 3a7306a3c5..467d12b48c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -106,7 +106,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			viewer.getTable().setHeaderVisible(true);
 
 			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID);
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND__COMMAND_NAME);
 					
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Name");
@@ -115,7 +115,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			}
 			
 			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND__COMMAND_NAME);
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID);
 					
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Id");

From 89ee9d45d8c7ebdbfba2aa25dd02c8dcb9184774 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 14 Mar 2010 10:53:16 +0000
Subject: [PATCH 0030/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * doing adds with a dropdown

---
 .../emf/ui/internal/common/ModelEditor.java   |   2 +-
 .../common/component/CommandEditor.java       |   1 -
 .../component/PartSashContainerEditor.java    | 113 +++++++++++++++++-
 .../component/virtual/VControlEditor.java     | 104 ++++++----------
 4 files changed, 150 insertions(+), 70 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 5503557b46..a2f28595b7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -258,7 +258,7 @@ private void registerDefaultEditors() {
 		registerEditor( MApplicationPackage.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain()));
 		registerEditor( MApplicationPackage.Literals.COMMAND,new CommandEditor(modelProvider.getEditingDomain()));
 		registerEditor( MApplicationPackage.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.PART_SASH_CONTAINER, new PartSashContainerEditor(modelProvider.getEditingDomain()));
+		registerEditor( MApplicationPackage.Literals.PART_SASH_CONTAINER, new PartSashContainerEditor(modelProvider.getEditingDomain(), this));
 		registerEditor( MApplicationPackage.Literals.PART_STACK, new PartStackEditor(modelProvider.getEditingDomain()));
 		registerEditor( MApplicationPackage.Literals.WINDOW_TRIM, new WindowTrimEditor(modelProvider.getEditingDomain()));
 		registerEditor( MApplicationPackage.Literals.TOOL_BAR, new ToolBarEditor(modelProvider.getEditingDomain()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index e418a4cf1b..85b70bb6bd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -20,7 +20,6 @@
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MCommand;
 import org.eclipse.e4.ui.model.application.MCommandParameter;
-import org.eclipse.e4.ui.model.application.MParameter;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 7336c2be68..349e9f5864 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -12,6 +12,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.List;
 
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -21,27 +22,43 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MPartSashContainer;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.databinding.viewers.ViewerSupport;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
@@ -53,12 +70,13 @@ public class PartSashContainerEditor extends AbstractComponentEditor {
 	private Image vImage;
 	private Image hImage;
 	private EMFDataBindingContext context;
+	private ModelEditor editor;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
-	public PartSashContainerEditor(EditingDomain editingDomain) {
+	public PartSashContainerEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
-		// TODO Auto-generated constructor stub
+		this.editor = editor;
 	}
 
 	@Override
@@ -188,6 +206,97 @@ public void handleValueChange(ValueChangeEvent event) {
 
 		ControlFactory.createTagsWidget(parent, this);
 
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Controls");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			
+			final TableViewer viewer = new TableViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 200;
+			viewer.getControl().setLayoutData(gd);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			
+			IEMFListProperty prop = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(getMaster()));
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout(2,false);
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			
+			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					EClass eclass = (EClass) element;
+					return eclass.getName();
+				}
+			});
+			childrenDropDown.setInput(new EClass[] {
+					MApplicationPackage.Literals.PART_SASH_CONTAINER,
+					MApplicationPackage.Literals.PART_STACK,
+					MApplicationPackage.Literals.PART
+			});
+			childrenDropDown.setSelection(new StructuredSelection(MApplicationPackage.Literals.PART_SASH_CONTAINER));
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! childrenDropDown.getSelection().isEmpty() ) {
+						EClass eClass = (EClass) ((IStructuredSelection)childrenDropDown.getSelection()).getFirstElement();
+						EObject eObject = MApplicationFactory.eINSTANCE.create(eClass);
+						
+						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+						
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+							editor.setSelection(eObject);
+						}
+					}
+				}
+			});
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
+						
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+		
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java
index af30d970c2..5cd4a5a93f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java
@@ -20,19 +20,21 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MPart;
-import org.eclipse.e4.ui.model.application.MPartSashContainer;
-import org.eclipse.e4.ui.model.application.MPartStack;
-import org.eclipse.e4.ui.model.application.MPerspectiveStack;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -113,7 +115,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout();
+			GridLayout gl = new GridLayout(2,false);
 			gl.marginLeft=0;
 			gl.marginRight=0;
 			gl.marginWidth=0;
@@ -123,92 +125,62 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Up");
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Down");
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add Sash");
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					MPartSashContainer handler = MApplicationFactory.eINSTANCE.createPartSashContainer();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
-					
-					if( cmd.canExecute() ) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
-					}
-				}
-			});
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
 			
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add PartStack");
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					MPartStack handler = MApplicationFactory.eINSTANCE.createPartStack();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
-					
-					if( cmd.canExecute() ) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
-					}
+				public String getText(Object element) {
+					EClass eclass = (EClass) element;
+					return eclass.getName();
 				}
 			});
-			
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add PerspectiveStack");
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					MPerspectiveStack handler = MApplicationFactory.eINSTANCE.createPerspectiveStack();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
-					
-					if( cmd.canExecute() ) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
-					}
-				}
+			childrenDropDown.setInput(new EClass[] {
+					MApplicationPackage.Literals.PERSPECTIVE_STACK,
+					MApplicationPackage.Literals.PART_SASH_CONTAINER,
+					MApplicationPackage.Literals.PART_STACK,
+					MApplicationPackage.Literals.PART
 			});
+			childrenDropDown.setSelection(new StructuredSelection(MApplicationPackage.Literals.PERSPECTIVE_STACK));
 			
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add Part");
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MPart handler = MApplicationFactory.eINSTANCE.createPart();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
-					
-					if( cmd.canExecute() ) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
+					if( ! childrenDropDown.getSelection().isEmpty() ) {
+						EClass eClass = (EClass) ((IStructuredSelection)childrenDropDown.getSelection()).getFirstElement();
+						EObject eObject = MApplicationFactory.eINSTANCE.create(eClass);
+						
+						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+						
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+							editor.setSelection(eObject);
+						}
 					}
 				}
 			});
-
+			
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Remove");
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> controls = ((IStructuredSelection)viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, controls);
+						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
+						
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}

From 9c45b089711042ef6eb73d0e2fb51a56c480cdfe Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 14 Mar 2010 11:15:01 +0000
Subject: [PATCH 0031/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * small fix to keep the selection

---
 .../component/PartSashContainerEditor.java    | 46 +++++++++++++++++++
 .../component/virtual/VControlEditor.java     | 46 +++++++++++++++++++
 2 files changed, 92 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 349e9f5864..b815c75844 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -26,6 +26,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MElementContainer;
 import org.eclipse.e4.ui.model.application.MPartSashContainer;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -38,6 +39,7 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -235,11 +237,55 @@ public void handleValueChange(ValueChangeEvent event) {
 			b.setText("Up");
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Down");
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) + 1;
+							if( idx < container.getChildren().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
 			
 			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
 			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java
index 5cd4a5a93f..e7840fbdbc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java
@@ -20,6 +20,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MElementContainer;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
@@ -27,6 +28,7 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -126,11 +128,55 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.setText("Up");
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Down");
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) + 1;
+							if( idx < container.getChildren().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
 			
 			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
 			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));

From 4da73d0035a58f3460ef6a0eefce88ca5afbbe61 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 14 Mar 2010 11:32:03 +0000
Subject: [PATCH 0032/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * implemented menu-item move support * implemented
 menu-item adds using a dropdown

---
 .../internal/common/component/MenuEditor.java | 173 +++++++-----
 .../common/component/MenuItemEditor.java      | 246 ++++++++++--------
 2 files changed, 239 insertions(+), 180 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index a62493c72d..0ff1793cb9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -24,8 +24,7 @@
 import org.eclipse.e4.ui.model.application.ItemType;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MDirectMenuItem;
-import org.eclipse.e4.ui.model.application.MHandledMenuItem;
+import org.eclipse.e4.ui.model.application.MElementContainer;
 import org.eclipse.e4.ui.model.application.MHandler;
 import org.eclipse.e4.ui.model.application.MMenuItem;
 import org.eclipse.emf.common.command.Command;
@@ -34,13 +33,19 @@
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
@@ -64,6 +69,18 @@ public class MenuEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
+	private class Struct {
+		private final String label;
+		private final EClass eClass;
+		private final boolean separator;
+
+		public Struct(String label, EClass eClass, boolean separator) {
+			this.label = label;
+			this.eClass = eClass;
+			this.separator = separator;
+		}
+	}
+
 	public MenuEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
 		this.editor = editor;
@@ -71,7 +88,7 @@ public MenuEditor(EditingDomain editingDomain, ModelEditor editor) {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Menu.gif"));
 			} catch (MalformedURLException e) {
@@ -95,17 +112,16 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			composite = createForm(parent, context, getMaster());
 		}
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
@@ -117,17 +133,17 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("MenuItems");
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-			
+
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
@@ -136,14 +152,14 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 			viewer.getTable().setHeaderVisible(true);
-			
+
 			{
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Type");
 				column.getColumn().setWidth(300);
 				column.setLabelProvider(new ComponentLabelProvider(editor));
 			}
-			
+
 			{
 				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ITEM__TYPE);
 
@@ -152,13 +168,13 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 				column.getColumn().setWidth(100);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
-			
+
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
-			
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -168,78 +184,95 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Up");
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add Separator ...");
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MMenuItem handler = MApplicationFactory.eINSTANCE.createMenuItem();
-					handler.setType(ItemType.SEPARATOR);
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) - 1;
+							if (idx >= 0) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
 
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
+						}
 					}
 				}
 			});
-			
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add MenuItem ...");
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MMenuItem handler = MApplicationFactory.eINSTANCE.createMenuItem();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) + 1;
+							if (idx < container.getChildren().size()) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
 
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
 					}
 				}
 			});
-			
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add Handled-MenuItem ...");
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					MHandledMenuItem handler = MApplicationFactory.eINSTANCE.createHandledMenuItem();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
 
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
-					}
+			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					Struct struct = (Struct) element;
+					return struct.label;
 				}
 			});
-			
+
+			Struct defaultStruct = new Struct("MenuItem", MApplicationPackage.Literals.MENU_ITEM, false);
+			childrenDropDown.setInput(new Struct[] { new Struct("Separator", MApplicationPackage.Literals.MENU_ITEM, true), defaultStruct, new Struct("Handled MenuItem", MApplicationPackage.Literals.HANDLED_MENU_ITEM, false), new Struct("Direct MenuItem", MApplicationPackage.Literals.DIRECT_MENU_ITEM, false) });
+			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add Direct-MenuItem ...");
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MDirectMenuItem handler = MApplicationFactory.eINSTANCE.createDirectMenuItem();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+					if (!childrenDropDown.getSelection().isEmpty()) {
+						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+						EClass eClass = struct.eClass;
+						MMenuItem eObject = (MMenuItem) MApplicationFactory.eINSTANCE.create(eClass);
+
+						if (struct.separator) {
+							eObject.setType(ItemType.SEPARATOR);
+						}
+
+						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+							if (!struct.separator) {
+								editor.setSelection(eObject);
+							}
+						}
 					}
 				}
 			});
@@ -247,21 +280,21 @@ public void widgetSelected(SelectionEvent e) {
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Remove");
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> keybinding = ((IStructuredSelection)viewer.getSelection()).toList();
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
 				}
 			});
 		}
-		
+
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 1164cd85e1..cec1707f45 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -26,8 +26,7 @@
 import org.eclipse.e4.ui.model.application.ItemType;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MDirectMenuItem;
-import org.eclipse.e4.ui.model.application.MHandledMenuItem;
+import org.eclipse.e4.ui.model.application.MElementContainer;
 import org.eclipse.e4.ui.model.application.MHandler;
 import org.eclipse.e4.ui.model.application.MMenuItem;
 import org.eclipse.e4.ui.model.application.MUILabel;
@@ -38,13 +37,19 @@
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
@@ -60,7 +65,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class MenuItemEditor  extends AbstractComponentEditor {
+public class MenuItemEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private Image menuImage;
@@ -70,6 +75,18 @@ public class MenuItemEditor  extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
+	private class Struct {
+		private final String label;
+		private final EClass eClass;
+		private final boolean separator;
+
+		public Struct(String label, EClass eClass, boolean separator) {
+			this.label = label;
+			this.eClass = eClass;
+			this.separator = separator;
+		}
+	}
+
 	public MenuItemEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
 		this.editor = editor;
@@ -78,8 +95,8 @@ public MenuItemEditor(EditingDomain editingDomain, ModelEditor editor) {
 	@Override
 	public Image getImage(Object element, Display display) {
 		MMenuItem item = (MMenuItem) element;
-		if( item.getType() == ItemType.SEPARATOR ) {
-			if( separatorImage == null ) {
+		if (item.getType() == ItemType.SEPARATOR) {
+			if (separatorImage == null) {
 				try {
 					separatorImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/MenuItem_separator.gif"));
 				} catch (MalformedURLException e) {
@@ -87,10 +104,10 @@ public Image getImage(Object element, Display display) {
 					e.printStackTrace();
 				}
 			}
-			
+
 			return separatorImage;
 		} else {
-			if( menuImage == null ) {
+			if (menuImage == null) {
 				try {
 					menuImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/MenuItem.gif"));
 				} catch (MalformedURLException e) {
@@ -106,12 +123,12 @@ public Image getImage(Object element, Display display) {
 	@Override
 	public String getLabel(Object element) {
 		MMenuItem item = (MMenuItem) element;
-		if( item.getType() == ItemType.SEPARATOR ) {
+		if (item.getType() == ItemType.SEPARATOR) {
 			return "Separator";
 		} else {
-			return "MenuItem";	
+			return "MenuItem";
 		}
-		
+
 	}
 
 	@Override
@@ -121,28 +138,27 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			composite = createForm(parent, context, getMaster());
 		}
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
 		final Composite container = new Composite(parent, SWT.NONE);
 		final StackLayout layout = new StackLayout();
 		container.setLayout(layout);
-		
+
 		final Composite menuFormComposite = createMenuItemForm(container, context, master);
 		final Composite separatorComposite = createSeparatorForm(container, context, master);
-		
+
 		getMaster().addValueChangeListener(new IValueChangeListener() {
-			
+
 			public void handleValueChange(ValueChangeEvent event) {
 				MMenuItem item = (MMenuItem) event.diff.getNewValue();
-				if( item.getType() == ItemType.SEPARATOR ) {
+				if (item.getType() == ItemType.SEPARATOR) {
 					layout.topControl = separatorComposite;
 				} else {
 					layout.topControl = menuFormComposite;
@@ -150,13 +166,12 @@ public void handleValueChange(ValueChangeEvent event) {
 				container.layout(true, true);
 			}
 		});
-		
+
 		return container;
 	}
-	
-	private Composite createSeparatorForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
+
+	private Composite createSeparatorForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
@@ -168,17 +183,16 @@ private Composite createSeparatorForm(Composite parent, EMFDataBindingContext co
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 		}
-		
+
 		return parent;
 	}
-	
-	private Composite createMenuItemForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
+
+	private Composite createMenuItemForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
@@ -190,11 +204,11 @@ private Composite createMenuItemForm(Composite parent, EMFDataBindingContext con
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -202,9 +216,9 @@ private Composite createMenuItemForm(Composite parent, EMFDataBindingContext con
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));			
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -214,9 +228,9 @@ private Composite createMenuItemForm(Composite parent, EMFDataBindingContext con
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));			
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -226,28 +240,26 @@ private Composite createMenuItemForm(Composite parent, EMFDataBindingContext con
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText("Find ...");			
+			b.setText("Find ...");
 		}
 
-		
 		createFormSubTypeForm(parent, context, master);
-		
+
 		return parent;
 	}
-	
-	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		
+
+	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("MenuItems");
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-			
+
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
@@ -256,14 +268,14 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 			viewer.getTable().setHeaderVisible(true);
-			
+
 			{
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Type");
 				column.getColumn().setWidth(300);
 				column.setLabelProvider(new ComponentLabelProvider(editor));
 			}
-			
+
 			{
 				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ITEM__TYPE);
 
@@ -272,14 +284,13 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 				column.getColumn().setWidth(100);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
-			
-			
+
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
-			
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -289,78 +300,95 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Up");
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add Separator ...");
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MMenuItem handler = MApplicationFactory.eINSTANCE.createMenuItem();
-					handler.setType(ItemType.SEPARATOR);
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) - 1;
+							if (idx >= 0) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
 
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
+						}
 					}
 				}
 			});
-			
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add MenuItem ...");
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MMenuItem handler = MApplicationFactory.eINSTANCE.createMenuItem();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) + 1;
+							if (idx < container.getChildren().size()) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
 
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
+						}
 					}
 				}
 			});
-			
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add Handled-MenuItem ...");
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					MHandledMenuItem handler = MApplicationFactory.eINSTANCE.createHandledMenuItem();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
 
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
-					}
+			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					Struct struct = (Struct) element;
+					return struct.label;
 				}
 			});
-			
+
+			Struct defaultStruct = new Struct("MenuItem", MApplicationPackage.Literals.MENU_ITEM, false);
+			childrenDropDown.setInput(new Struct[] { new Struct("Separator", MApplicationPackage.Literals.MENU_ITEM, true), defaultStruct, new Struct("Handled MenuItem", MApplicationPackage.Literals.HANDLED_MENU_ITEM, false), new Struct("Direct MenuItem", MApplicationPackage.Literals.DIRECT_MENU_ITEM, false) });
+			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add Direct-MenuItem ...");
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MDirectMenuItem handler = MApplicationFactory.eINSTANCE.createDirectMenuItem();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+					if (!childrenDropDown.getSelection().isEmpty()) {
+						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+						EClass eClass = struct.eClass;
+						MMenuItem eObject = (MMenuItem) MApplicationFactory.eINSTANCE.create(eClass);
 
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
+						if (struct.separator) {
+							eObject.setType(ItemType.SEPARATOR);
+						}
+
+						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+							if (!struct.separator) {
+								editor.setSelection(eObject);
+							}
+						}
 					}
 				}
 			});
@@ -368,14 +396,14 @@ public void widgetSelected(SelectionEvent e) {
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Remove");
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> keybinding = ((IStructuredSelection)viewer.getSelection()).toList();
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
@@ -392,16 +420,14 @@ public IObservableList getChildList(Object element) {
 	@Override
 	public String getDetailLabel(Object element) {
 		MUILabel label = (MUILabel) element;
-		if( label.getLabel() != null && label.getLabel().trim().length() > 0 ) {
+		if (label.getLabel() != null && label.getLabel().trim().length() > 0) {
 			return label.getLabel();
 		}
 		return null;
 	}
-	
+
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] {
-			FeaturePath.fromList(MApplicationPackage.Literals.UI_LABEL__LABEL)
-		};
+		return new FeaturePath[] { FeaturePath.fromList(MApplicationPackage.Literals.UI_LABEL__LABEL) };
 	}
 }
\ No newline at end of file

From 46de1e5dc76f511e514fa37f8be05518e708a168 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 14 Mar 2010 11:39:27 +0000
Subject: [PATCH 0033/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * implemented window moving * reseting selection when
 removing

---
 .../component/virtual/VWindowEditor.java      | 53 ++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index f065d0d409..8dec90f559 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -20,16 +20,19 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MElementContainer;
 import org.eclipse.e4.ui.model.application.MWindow;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
@@ -161,11 +164,55 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		b.setText("Up");
 		b.setImage(getImage(b.getDisplay(), ARROW_UP));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if( ! viewer.getSelection().isEmpty() ) {
+					IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+					if( s.size() == 1 ) {
+						Object obj = s.getFirstElement();
+						MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+						int idx = container.getChildren().indexOf(obj) - 1;
+						if( idx >= 0 ) {
+							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+							
+							if( cmd.canExecute() ) {
+								getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+						
+					}
+				}
+			}
+		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText("Down");
 		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if( ! viewer.getSelection().isEmpty() ) {
+					IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+					if( s.size() == 1 ) {
+						Object obj = s.getFirstElement();
+						MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+						int idx = container.getChildren().indexOf(obj) + 1;
+						if( idx < container.getChildren().size() ) {
+							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+							
+							if( cmd.canExecute() ) {
+								getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+						
+					}
+				}
+			}
+		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText("Add ...");
@@ -193,9 +240,13 @@ public void widgetSelected(SelectionEvent e) {
 			public void widgetSelected(SelectionEvent e) {
 				if (!viewer.getSelection().isEmpty()) {
 					List<?> windows = ((IStructuredSelection) viewer.getSelection()).toList();
-					Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, windows);
+					MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+					Command cmd = RemoveCommand.create(getEditingDomain(), container, MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, windows);
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
+						if( container.getChildren().size() > 0 ) {
+							viewer.setSelection(new StructuredSelection(container.getChildren().get(0)));
+						}
 					}
 				}
 			}

From db8a52ecc2014fbcd009350b392ba7b2493e19f8 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 14 Mar 2010 11:48:58 +0000
Subject: [PATCH 0034/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * implemented move for commands, handlers and
 keybindings

---
 .../component/virtual/VCommandEditor.java     | 47 +++++++++++++++++++
 .../component/virtual/VHandlerEditor.java     | 47 +++++++++++++++++++
 .../component/virtual/VKeyBindingEditor.java  | 47 +++++++++++++++++++
 3 files changed, 141 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 467d12b48c..6dffa85080 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -18,6 +18,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MCommand;
@@ -27,10 +28,12 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
@@ -136,11 +139,55 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.setText("Up");
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MApplication container = (MApplication) getMaster().getValue();
+							int idx = container.getCommands().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.APPLICATION__COMMANDS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Down");
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MApplication container = (MApplication) getMaster().getValue();
+							int idx = container.getCommands().indexOf(obj) + 1;
+							if( idx < container.getCommands().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.APPLICATION__COMMANDS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Add ...");
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index f93b39920d..28b4d8a892 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -21,16 +21,19 @@
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MHandler;
+import org.eclipse.e4.ui.model.application.MHandlerContainer;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
@@ -145,11 +148,55 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.setText("Up");
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MHandlerContainer container = (MHandlerContainer) getMaster().getValue();
+							int idx = container.getHandlers().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Down");
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MHandlerContainer container = (MHandlerContainer) getMaster().getValue();
+							int idx = container.getHandlers().indexOf(obj) + 1;
+							if( idx < container.getHandlers().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Add ...");
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java
index df1e2d2bbf..3c3f036555 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java
@@ -20,6 +20,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MBindingContainer;
 import org.eclipse.e4.ui.model.application.MHandler;
 import org.eclipse.e4.ui.model.application.MKeyBinding;
 import org.eclipse.emf.common.command.Command;
@@ -28,10 +29,12 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
@@ -146,11 +149,55 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			b.setText("Up");
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MBindingContainer container = (MBindingContainer) getMaster().getValue();
+							int idx = container.getBindings().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Down");
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MBindingContainer container = (MBindingContainer) getMaster().getValue();
+							int idx = container.getBindings().indexOf(obj) + 1;
+							if( idx < container.getBindings().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Add ...");

From d3baff9a94b5b8e8266f8585a61a5ebf31c19f5e Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 14 Mar 2010 12:20:27 +0000
Subject: [PATCH 0035/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * implemented toolbar items

---
 .../emf/ui/internal/common/ModelEditor.java   | 177 +++++++-------
 .../common/component/ToolBarEditor.java       | 231 +++++++++++++++++-
 .../common/component/WindowTrimEditor.java    | 138 ++++++++++-
 .../component/virtual/VWindowTrimEditor.java  |  13 +-
 4 files changed, 448 insertions(+), 111 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index a2f28595b7..87602e0a28 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -83,8 +83,8 @@
 import org.eclipse.swt.widgets.Label;
 
 public class ModelEditor {
-	public static final int VIRTUAL_MENU    = 0;
-	public static final int VIRTUAL_PART    = 1;
+	public static final int VIRTUAL_MENU = 0;
+	public static final int VIRTUAL_PART = 1;
 	public static final int VIRTUAL_HANDLER = 2;
 	public static final int VIRTUAL_BINDING = 3;
 	public static final int VIRTUAL_COMMAND = 4;
@@ -96,7 +96,8 @@ public class ModelEditor {
 	private AbstractComponentEditor[] virtualEditors;
 	private List<FeaturePath> labelFeaturePaths = new ArrayList<FeaturePath>();
 
-//	private List<AbstractComponentEditor> editors = new ArrayList<AbstractComponentEditor>();
+	// private List<AbstractComponentEditor> editors = new
+	// ArrayList<AbstractComponentEditor>();
 
 	private TreeViewer viewer;
 	private IModelResource modelProvider;
@@ -111,36 +112,36 @@ public ModelEditor(Composite composite, IModelResource modelProvider) {
 
 		viewer = createTreeViewerArea(form);
 
-		Composite parent = new Composite(form,SWT.NONE);
+		Composite parent = new Composite(form, SWT.NONE);
 		parent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 		parent.setBackgroundMode(SWT.INHERIT_DEFAULT);
-//		parent.setData("org.eclipse.e4.ui.css.CssClassName","contentContainer");
+		// parent.setData("org.eclipse.e4.ui.css.CssClassName","contentContainer");
 		FillLayout l = new FillLayout();
-		l.marginWidth=5;
+		l.marginWidth = 5;
 		parent.setLayout(l);
 
-		ShadowComposite editingArea = new ShadowComposite(parent,SWT.NONE);
+		ShadowComposite editingArea = new ShadowComposite(parent, SWT.NONE);
 		GridLayout gl = new GridLayout();
-		gl.marginTop=0;
-		gl.marginHeight=0;
+		gl.marginTop = 0;
+		gl.marginHeight = 0;
 		editingArea.setLayout(gl);
 		editingArea.setBackgroundMode(SWT.INHERIT_DEFAULT);
-//		editingArea.setData("org.eclipse.e4.ui.css.CssClassName","contentContainer");
+		// editingArea.setData("org.eclipse.e4.ui.css.CssClassName","contentContainer");
 
-		Composite headerContainer = new Composite(editingArea,SWT.NONE);
+		Composite headerContainer = new Composite(editingArea, SWT.NONE);
 		headerContainer.setBackgroundMode(SWT.INHERIT_DEFAULT);
 		headerContainer.setData("org.eclipse.e4.ui.css.CssClassName", "headerSectionContainer");
 		headerContainer.setLayout(new GridLayout(2, false));
 		headerContainer.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
-		final Label iconLabel = new Label(headerContainer,SWT.NONE);
+		final Label iconLabel = new Label(headerContainer, SWT.NONE);
 		iconLabel.setLayoutData(new GridData(20, 20));
 
 		final Label textLabel = new Label(headerContainer, SWT.NONE);
 		textLabel.setData("org.eclipse.e4.ui.css.CssClassName", "sectionHeader");
 		textLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
-		final Composite contentContainer = new Composite(editingArea,SWT.NONE);
+		final Composite contentContainer = new Composite(editingArea, SWT.NONE);
 		contentContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
 		final StackLayout layout = new StackLayout();
 		contentContainer.setLayout(layout);
@@ -148,12 +149,12 @@ public ModelEditor(Composite composite, IModelResource modelProvider) {
 		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			public void selectionChanged(SelectionChangedEvent event) {
-				if( ! event.getSelection().isEmpty() ) {
+				if (!event.getSelection().isEmpty()) {
 					IStructuredSelection s = (IStructuredSelection) event.getSelection();
-					if( s.getFirstElement() instanceof EObject ) {
+					if (s.getFirstElement() instanceof EObject) {
 						EObject obj = (EObject) s.getFirstElement();
 						AbstractComponentEditor editor = editorMap.get(obj.eClass());
-						if( editor != null ) {
+						if (editor != null) {
 							textLabel.setText(editor.getLabel(obj));
 							iconLabel.setImage(editor.getImage(obj, iconLabel.getDisplay()));
 							Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
@@ -164,7 +165,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 					} else {
 						VirtualEntry<?> entry = (VirtualEntry<?>) s.getFirstElement();
 						AbstractComponentEditor editor = virtualEditors[entry.getId()];
-						if( editor != null ) {
+						if (editor != null) {
 							textLabel.setText(editor.getLabel(entry));
 							iconLabel.setImage(editor.getImage(entry, iconLabel.getDisplay()));
 							Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
@@ -177,53 +178,52 @@ public void selectionChanged(SelectionChangedEvent event) {
 			}
 		});
 
-		form.setWeights(new int[] { 1 , 2 });
+		form.setWeights(new int[] { 1, 2 });
 		viewer.setSelection(new StructuredSelection(modelProvider.getRoot()));
 	}
 
 	private TreeViewer createTreeViewerArea(Composite parent) {
-		parent = new Composite(parent,SWT.NONE);
+		parent = new Composite(parent, SWT.NONE);
 		parent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 		FillLayout l = new FillLayout();
-		l.marginWidth=5;
+		l.marginWidth = 5;
 		parent.setLayout(l);
-		ShadowComposite editingArea = new ShadowComposite(parent,SWT.NONE);
+		ShadowComposite editingArea = new ShadowComposite(parent, SWT.NONE);
 		editingArea.setLayout(new FillLayout());
-		final TreeViewer viewer = new TreeViewer(editingArea,SWT.FULL_SELECTION|SWT.H_SCROLL|SWT.V_SCROLL);
+		final TreeViewer viewer = new TreeViewer(editingArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
 		viewer.setLabelProvider(new ComponentLabelProvider(this));
-		ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(
-				new ObservableFactoryImpl(), new TreeStructureAdvisorImpl());
+		ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(new ObservableFactoryImpl(), new TreeStructureAdvisorImpl());
 		viewer.setContentProvider(contentProvider);
-		
+
 		final WritableSet clearedSet = new WritableSet();
-		
+
 		contentProvider.getKnownElements().addSetChangeListener(new ISetChangeListener() {
-			
+
 			public void handleSetChange(SetChangeEvent event) {
-				for( Object o : event.diff.getAdditions() ) {
-					if( o instanceof EObject ) {
-						clearedSet.add(o);	
+				for (Object o : event.diff.getAdditions()) {
+					if (o instanceof EObject) {
+						clearedSet.add(o);
 					}
 				}
-				
-				for( Object o : event.diff.getRemovals() ) {
-					if( o instanceof EObject ) {
-						clearedSet.remove(o);	
+
+				for (Object o : event.diff.getRemovals()) {
+					if (o instanceof EObject) {
+						clearedSet.remove(o);
 					}
 				}
 			}
 		});
-		
-		for( FeaturePath p : labelFeaturePaths ) {
+
+		for (FeaturePath p : labelFeaturePaths) {
 			IObservableMap map = EMFProperties.value(p).observeDetail(clearedSet);
 			map.addMapChangeListener(new IMapChangeListener() {
-				
+
 				public void handleMapChange(MapChangeEvent event) {
 					viewer.update(event.diff.getChangedKeys().toArray(), null);
 				}
 			});
 		}
-		
+
 		viewer.setInput(modelProvider.getRoot());
 		viewer.expandAll();
 
@@ -231,90 +231,83 @@ public void handleMapChange(MapChangeEvent event) {
 	}
 
 	private void registerVirtualEditors() {
-		virtualEditors = new AbstractComponentEditor[] {
-				new VMenuEditor(modelProvider.getEditingDomain(),this), // V-Menu
-				null, // V-Part
-				new VHandlerEditor(modelProvider.getEditingDomain(),this),
-				new VKeyBindingEditor(modelProvider.getEditingDomain(), this),
-				new VCommandEditor(modelProvider.getEditingDomain(), this),
-				new VWindowEditor(modelProvider.getEditingDomain(), this),
-				new VControlEditor(modelProvider.getEditingDomain(), this),
-				new VWindowTrimEditor(modelProvider.getEditingDomain(), this)
-			};
+		virtualEditors = new AbstractComponentEditor[] { new VMenuEditor(modelProvider.getEditingDomain(), this), // V-Menu
+		null, // V-Part
+		new VHandlerEditor(modelProvider.getEditingDomain(), this), new VKeyBindingEditor(modelProvider.getEditingDomain(), this), new VCommandEditor(modelProvider.getEditingDomain(), this), new VWindowEditor(modelProvider.getEditingDomain(), this), new VControlEditor(modelProvider.getEditingDomain(), this), new VWindowTrimEditor(modelProvider.getEditingDomain(), this) };
 
 	}
-	
+
 	public void setSelection(Object element) {
 		viewer.setSelection(new StructuredSelection(element));
 	}
 
 	private void registerDefaultEditors() {
-		registerEditor( MApplicationPackage.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.MODEL_COMPONENTS, new ModelComponentsEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.MODEL_COMPONENT, new ModelComponentEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.PART, new PartEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.PART_DESCRIPTOR, new PartDescriptorEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.COMMAND,new CommandEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.PART_SASH_CONTAINER, new PartSashContainerEditor(modelProvider.getEditingDomain(), this));
-		registerEditor( MApplicationPackage.Literals.PART_STACK, new PartStackEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.WINDOW_TRIM, new WindowTrimEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.TOOL_BAR, new ToolBarEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.HANDLED_TOOL_ITEM, new HandledToolItemEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.TOOL_ITEM, new ToolItemEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.PERSPECTIVE_STACK, new PerspectiveStackEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.PERSPECTIVE, new PerspectiveEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.PLACEHOLDER, new PlaceholderEditor(modelProvider.getEditingDomain()));
-		registerEditor( MApplicationPackage.Literals.MENU, new MenuEditor(modelProvider.getEditingDomain(), this));
-		registerEditor( MApplicationPackage.Literals.MENU_ITEM, new MenuItemEditor(modelProvider.getEditingDomain(), this));
-		registerEditor( MApplicationPackage.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), this));
-		registerEditor( MApplicationPackage.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(MApplicationPackage.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.MODEL_COMPONENTS, new ModelComponentsEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.MODEL_COMPONENT, new ModelComponentEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.PART, new PartEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.PART_DESCRIPTOR, new PartDescriptorEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.PART_SASH_CONTAINER, new PartSashContainerEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(MApplicationPackage.Literals.PART_STACK, new PartStackEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.WINDOW_TRIM, new WindowTrimEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(MApplicationPackage.Literals.TOOL_BAR, new ToolBarEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(MApplicationPackage.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.HANDLED_TOOL_ITEM, new HandledToolItemEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.TOOL_ITEM, new ToolItemEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.PERSPECTIVE_STACK, new PerspectiveStackEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.PERSPECTIVE, new PerspectiveEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.PLACEHOLDER, new PlaceholderEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.MENU, new MenuEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(MApplicationPackage.Literals.MENU_ITEM, new MenuItemEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(MApplicationPackage.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(MApplicationPackage.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this));
 	}
 
 	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
 		editorMap.put(eClass, editor);
-		
-		for( FeaturePath p : editor.getLabelProperties() ) {
+
+		for (FeaturePath p : editor.getLabelProperties()) {
 			boolean found = false;
-			for( FeaturePath tmp : labelFeaturePaths ) {
-				if( equalsPaths(p, tmp) ) {
+			for (FeaturePath tmp : labelFeaturePaths) {
+				if (equalsPaths(p, tmp)) {
 					found = true;
 					break;
 				}
 			}
-			
-			if( ! found ) {
+
+			if (!found) {
 				labelFeaturePaths.add(p);
 			}
 		}
 	}
-	
+
 	private boolean equalsPaths(FeaturePath p1, FeaturePath p2) {
-		if( p1.getFeaturePath().length == p2.getFeaturePath().length ) {
-			for( int i = 0; i < p1.getFeaturePath().length; i++ ) {
-				if( ! p1.getFeaturePath()[i].equals(p2.getFeaturePath()[i]) ) {
+		if (p1.getFeaturePath().length == p2.getFeaturePath().length) {
+			for (int i = 0; i < p1.getFeaturePath().length; i++) {
+				if (!p1.getFeaturePath()[i].equals(p2.getFeaturePath()[i])) {
 					return false;
 				}
 			}
-			
+
 			return true;
 		}
-		
+
 		return false;
 	}
 
 	public AbstractComponentEditor getEditor(EClass eClass) {
 		return editorMap.get(eClass);
 	}
-	
+
 	public IStatus save() {
-		if( modelProvider.isSaveable() ) {
+		if (modelProvider.isSaveable()) {
 			return modelProvider.save();
 		}
-		
+
 		return Status.CANCEL_STATUS;
 	}
 
@@ -325,13 +318,13 @@ private static class TreeStructureAdvisorImpl extends TreeStructureAdvisor {
 	private class ObservableFactoryImpl implements IObservableFactory {
 
 		public IObservable createObservable(Object target) {
-			if( target instanceof IObservableList ) {
+			if (target instanceof IObservableList) {
 				return (IObservable) target;
-			} else if( target instanceof VirtualEntry<?> ) {
-				return ((VirtualEntry<?>)target).getList();
+			} else if (target instanceof VirtualEntry<?>) {
+				return ((VirtualEntry<?>) target).getList();
 			} else {
-				AbstractComponentEditor editor = editorMap.get(((EObject)target).eClass());
-				if( editor != null ) {
+				AbstractComponentEditor editor = editorMap.get(((EObject) target).eClass());
+				if (editor != null) {
 					return editor.getChildList(target);
 				}
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index f04d8365d7..0a9eaebd12 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -12,31 +12,80 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.List;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.ItemType;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MElementContainer;
+import org.eclipse.e4.ui.model.application.MHandler;
+import org.eclipse.e4.ui.model.application.MMenuItem;
+import org.eclipse.e4.ui.model.application.MToolItem;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class ToolBarEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
+	private ModelEditor editor;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
-	public ToolBarEditor(EditingDomain editingDomain) {
+	private class Struct {
+		private final String label;
+		private final EClass eClass;
+		private final boolean separator;
+
+		public Struct(String label, EClass eClass, boolean separator) {
+			this.label = label;
+			this.eClass = eClass;
+			this.separator = separator;
+		}
+	}
+
+	
+	public ToolBarEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
-		// TODO Auto-generated constructor stub
+		this.editor = editor;
 	}
 
 	@Override
@@ -72,9 +121,181 @@ public Composite getEditor(Composite parent, Object object) {
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("ToolbarItems");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			final TableViewer viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.getTable().setHeaderVisible(true);
+
+			{
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Type");
+				column.getColumn().setWidth(300);
+				column.setLabelProvider(new ComponentLabelProvider(editor));
+			}
+
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ITEM__TYPE);
+
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("ItemType");
+				column.getColumn().setWidth(100);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+
+			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(master));
+
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) - 1;
+							if (idx >= 0) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) + 1;
+							if (idx < container.getChildren().size()) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					Struct struct = (Struct) element;
+					return struct.label;
+				}
+			});
+
+			Struct defaultStruct = new Struct("Handled ToolItem", MApplicationPackage.Literals.HANDLED_TOOL_ITEM, false);
+			childrenDropDown.setInput(new Struct[] { defaultStruct, new Struct("Direct ToolItem", MApplicationPackage.Literals.DIRECT_TOOL_ITEM, false), new Struct("Separator", MApplicationPackage.Literals.TOOL_ITEM, true) });
+			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!childrenDropDown.getSelection().isEmpty()) {
+						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+						EClass eClass = struct.eClass;
+						MToolItem eObject = (MToolItem) MApplicationFactory.eINSTANCE.create(eClass);
+
+						if (struct.separator) {
+							eObject.setType(ItemType.SEPARATOR);
+						}
+
+						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+							if (!struct.separator) {
+								editor.setSelection(eObject);
+							}
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
index bead362981..b95636fe5c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
@@ -12,29 +12,47 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.List;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MElementContainer;
+import org.eclipse.e4.ui.model.application.MToolBar;
 import org.eclipse.e4.ui.model.application.MTrimContainer;
 import org.eclipse.e4.ui.model.application.SideValue;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
@@ -45,12 +63,13 @@ public class WindowTrimEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
+	private ModelEditor editor;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
-	public WindowTrimEditor(EditingDomain editingDomain) {
+	public WindowTrimEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
-		// TODO Auto-generated constructor stub
+		this.editor = editor;
 	}
 
 	@Override
@@ -121,6 +140,121 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			context.bindValue(ViewerProperties.singleSelection().observe(viewer), sideValueObs);
 		}
 
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Controls");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			
+			final TableViewer viewer = new TableViewer(parent);
+			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			viewer.setContentProvider(new ObservableListContentProvider());
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			
+			IEMFListProperty prop = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(getMaster()));
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) + 1;
+							if( idx < container.getChildren().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add Toolbar");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MToolBar toolbar = MApplicationFactory.eINSTANCE.createToolBar();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(toolbar);
+					}
+				}
+			});
+			
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
+						
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
 		
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index 2e3e539efe..edb5656cd7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -110,18 +110,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			gl.marginWidth=0;
 			gl.marginHeight=0;
 			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Add Trim");
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
@@ -156,7 +146,6 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-
 		return parent;
 	}
 

From bbf2bd8ebc86572db6a4ff6a23510fd2dc6e26e3 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 14 Mar 2010 12:32:17 +0000
Subject: [PATCH 0036/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * added itemtype editing

---
 .../component/HandledMenuItemEditor.java      | 304 +++++++++---------
 .../internal/common/component/MenuEditor.java |   2 +
 .../common/component/MenuItemEditor.java      |  21 ++
 3 files changed, 175 insertions(+), 152 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index e796142c1f..adf83a1fe3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -58,14 +58,14 @@
 
 public class HandledMenuItemEditor extends MenuItemEditor {
 	private Image image;
-	
+
 	public HandledMenuItemEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/HandledMenuItem.gif"));
 			} catch (MalformedURLException e) {
@@ -86,182 +86,182 @@ public String getLabel(Object element) {
 	public String getDescription(Object element) {
 		return "HandledMenuItem bla bla bla";
 	}
-	
+
 	@Override
 	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, final WritableValue master) {
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		Label l = new Label(parent, SWT.NONE);
-		l.setText("Command");
-
-		Text t = new Text(parent, SWT.BORDER);
-		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		t.setEnabled(false);
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value( getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLED_ITEM__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(master));
-
-		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
-		b.setText("Find ...");
-		b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-
 		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Command");
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			t.setEnabled(false);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLED_ITEM__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(master));
+
+			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setText("Find ...");
+			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+		}
 
-		l = new Label(parent, SWT.NONE);
-		l.setText("Parameters");
-		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
-
-		final TableViewer tableviewer = new TableViewer(parent);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.heightHint = 120;
-		tableviewer.getTable().setHeaderVisible(true);
-		tableviewer.getControl().setLayoutData(gd);
-		
-		ObservableListContentProvider cp = new ObservableListContentProvider();
-		tableviewer.setContentProvider(cp);
-
+		// ------------------------------------------------------------
 		{
-			IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__TAG);
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Parameters");
+			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+
+			final TableViewer tableviewer = new TableViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 120;
+			tableviewer.getTable().setHeaderVisible(true);
+			tableviewer.getControl().setLayoutData(gd);
+
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			tableviewer.setContentProvider(cp);
+
+			{
+				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__TAG);
+
+				TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
+				column.getColumn().setText("Tag");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MParameter>(prop.observeDetail(cp.getKnownElements())));
+				column.setEditingSupport(new EditingSupport(tableviewer) {
+					private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
+
+					@Override
+					protected void setValue(Object element, Object value) {
+						Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.PARAMETER__TAG, value);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
 
-			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText("Tag");
-			column.getColumn().setWidth(200);
-			column.setLabelProvider(new ObservableColumnLabelProvider<MParameter>(prop.observeDetail(cp.getKnownElements())));
-			column.setEditingSupport(new EditingSupport(tableviewer) {
-				private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
+					@Override
+					protected Object getValue(Object element) {
+						String val = ((MParameter) element).getTag();
+						return val == null ? "" : val;
+					}
 
-				@Override
-				protected void setValue(Object element, Object value) {
-					Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.PARAMETER__TAG, value);
-					if( cmd.canExecute() ) {
-						getEditingDomain().getCommandStack().execute(cmd);
+					@Override
+					protected CellEditor getCellEditor(Object element) {
+						return cellEditor;
 					}
-				}
 
-				@Override
-				protected Object getValue(Object element) {
-					String val = ((MParameter)element).getTag();
-					return val == null ? "" : val;
-				}
+					@Override
+					protected boolean canEdit(Object element) {
+						return true;
+					}
+				});
+			}
 
-				@Override
-				protected CellEditor getCellEditor(Object element) {
-					return cellEditor;
-				}
+			{
+				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__VALUE);
+
+				TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
+				column.getColumn().setText("Value");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MParameter>(prop.observeDetail(cp.getKnownElements())));
+				column.setEditingSupport(new EditingSupport(tableviewer) {
+					private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
+
+					@Override
+					protected void setValue(Object element, Object value) {
+						Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.PARAMETER__VALUE, value);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
 
-				@Override
-				protected boolean canEdit(Object element) {
-					return true;
-				}
-			});
-		}
+					@Override
+					protected Object getValue(Object element) {
+						String val = ((MParameter) element).getValue();
+						return val == null ? "" : val;
+					}
 
-		{
-			IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__VALUE);
-			
-			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText("Value");
-			column.getColumn().setWidth(200);
-			column.setLabelProvider(new ObservableColumnLabelProvider<MParameter>(prop.observeDetail(cp.getKnownElements())));
-			column.setEditingSupport(new EditingSupport(tableviewer) {
-				private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
+					@Override
+					protected CellEditor getCellEditor(Object element) {
+						return cellEditor;
+					}
 
-				@Override
-				protected void setValue(Object element, Object value) {
-					Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.PARAMETER__VALUE, value);
-					if( cmd.canExecute() ) {
-						getEditingDomain().getCommandStack().execute(cmd);
+					@Override
+					protected boolean canEdit(Object element) {
+						return true;
 					}
-				}
+				});
+			}
 
+			ColumnViewerEditorActivationStrategy editorActivationStrategy = new ColumnViewerEditorActivationStrategy(tableviewer) {
 				@Override
-				protected Object getValue(Object element) {
-					String val = ((MParameter)element).getValue();
-					return val == null ? "" : val;
-				}
+				protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
+					boolean singleSelect = ((IStructuredSelection) tableviewer.getSelection()).size() == 1;
+					boolean isLeftDoubleMouseSelect = event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION && ((MouseEvent) event.sourceEvent).button == 1;
 
-				@Override
-				protected CellEditor getCellEditor(Object element) {
-					return cellEditor;
+					return singleSelect && (isLeftDoubleMouseSelect || event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC || event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
 				}
-
+			};
+			TableViewerEditor.create(tableviewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
+
+			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS);
+			tableviewer.setInput(prop.observeDetail(master));
+
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				protected boolean canEdit(Object element) {
-					return true;
-				}
-			});
-		}
-
-
-		ColumnViewerEditorActivationStrategy editorActivationStrategy = new ColumnViewerEditorActivationStrategy(tableviewer) {
-			@Override
-			protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
-				boolean singleSelect = ((IStructuredSelection)tableviewer.getSelection()).size() == 1;
-				boolean isLeftDoubleMouseSelect = event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION && ((MouseEvent)event.sourceEvent).button == 1;
-
-				return singleSelect && (isLeftDoubleMouseSelect
-						|| event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC
-						|| event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
-			}
-		};
-		TableViewerEditor.create(tableviewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
-
-		IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS);
-		tableviewer.setInput(prop.observeDetail(master));
-		
-		Composite buttonComp = new Composite(parent, SWT.NONE);
-		buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-		GridLayout gl = new GridLayout();
-		gl.marginLeft=0;
-		gl.marginRight=0;
-		gl.marginWidth=0;
-		gl.marginHeight=0;
-		buttonComp.setLayout(gl);
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Up");
-		b.setImage(getImage(b.getDisplay(), ARROW_UP));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Down");
-		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Add ...");
-		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				MHandledItem item = (MHandledItem) master.getValue();
-				MParameter param = MApplicationFactory.eINSTANCE.createParameter();
-				Command cmd = AddCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS, param);
-				if( cmd.canExecute() ) {
-					getEditingDomain().getCommandStack().execute(cmd);
-					tableviewer.editElement(param, 0);
-				}
-			}
-		});
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Remove");
-		b.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection s = (IStructuredSelection) tableviewer.getSelection();
-				if( !s.isEmpty() ) {
+				public void widgetSelected(SelectionEvent e) {
 					MHandledItem item = (MHandledItem) master.getValue();
-					Command cmd = RemoveCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS, s.toList());
-					if( cmd.canExecute() ) {
+					MParameter param = MApplicationFactory.eINSTANCE.createParameter();
+					Command cmd = AddCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS, param);
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
+						tableviewer.editElement(param, 0);
 					}
 				}
-			}
+			});
 
-		});
-		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.addSelectionListener(new SelectionAdapter() {
+
+				public void widgetSelected(SelectionEvent e) {
+					IStructuredSelection s = (IStructuredSelection) tableviewer.getSelection();
+					if (!s.isEmpty()) {
+						MHandledItem item = (MHandledItem) master.getValue();
+						Command cmd = RemoveCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS, s.toList());
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
 
+			});
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		}
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 0ff1793cb9..9cd961c986 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -294,6 +294,8 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 		}
+		
+		ControlFactory.createTagsWidget(parent, this);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index cec1707f45..b6d099e637 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -15,6 +15,7 @@
 import java.util.List;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -45,6 +46,7 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -209,6 +211,23 @@ private Composite createMenuItemForm(Composite parent, EMFDataBindingContext con
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 		}
 
+		if (this.getClass() != MenuItemEditor.class) {
+			// ------------------------------------------------------------
+			{
+				Label l = new Label(parent, SWT.NONE);
+				l.setText("Type");
+
+				ComboViewer viewer = new ComboViewer(parent);
+				viewer.setContentProvider(new ArrayContentProvider());
+				viewer.setInput(new ItemType[] { ItemType.CHECK, ItemType.PUSH, ItemType.RADIO });
+				GridData gd = new GridData();
+				gd.horizontalSpan = 2;
+				viewer.getControl().setLayoutData(gd);
+				IObservableValue itemTypeObs = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ITEM__TYPE).observeDetail(master);
+				context.bindValue(ViewerProperties.singleSelection().observe(viewer), itemTypeObs);
+			}
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -249,6 +268,8 @@ private Composite createMenuItemForm(Composite parent, EMFDataBindingContext con
 
 		createFormSubTypeForm(parent, context, master);
 
+		ControlFactory.createTagsWidget(parent, this);
+		
 		return parent;
 	}
 

From 3af890476070304ee6da4f688446c5d01a47b51c Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 14 Mar 2010 13:42:47 +0000
Subject: [PATCH 0037/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * adding 3.x Editor bundle

---
 .../.classpath                                |   7 +
 .../.project                                  |  28 ++++
 .../.settings/org.eclipse.jdt.core.prefs      |   8 +
 .../META-INF/MANIFEST.MF                      |  16 ++
 .../build.properties                          |   5 +
 .../css/default.css                           |  18 +++
 .../icons/full/obj16/Application.gif          | Bin 0 -> 1048 bytes
 .../plugin.xml                                |  16 ++
 .../emf/editor3x/E4WorkbenchModelEditor.java  | 137 ++++++++++++++++++
 .../tools/emf/editor3x/XMIModelResource.java  | 107 ++++++++++++++
 10 files changed, 342 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/.project
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/css/default.css
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/Application.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath b/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
new file mode 100644
index 0000000000..64c5e31b7a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
@@ -0,0 +1,7 @@
+<?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.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.project b/bundles/org.eclipse.e4.tools.emf.editor3x/.project
new file mode 100644
index 0000000000..281687d11a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.emf.editor3x</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..df1b497b8a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Sun Mar 14 13:37:58 CET 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..c361c5cbf1
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Editor3x
+Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
+ org.eclipse.core.runtime;bundle-version="3.6.0",
+ org.eclipse.emf.common;bundle-version="2.6.0",
+ org.eclipse.emf.edit.ui;bundle-version="2.6.0",
+ org.eclipse.core.databinding.observable;bundle-version="1.3.0",
+ org.eclipse.e4.tools.emf.ui;bundle-version="1.0.0",
+ org.eclipse.e4.ui.workbench;bundle-version="0.9.1",
+ org.eclipse.e4.ui.css.core;bundle-version="0.9.0",
+ org.eclipse.e4.ui.css.swt;bundle-version="0.9.1",
+ org.w3c.css.sac;bundle-version="1.3.0"
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
new file mode 100644
index 0000000000..e9863e281e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/css/default.css b/bundles/org.eclipse.e4.tools.emf.editor3x/css/default.css
new file mode 100644
index 0000000000..fea596f24b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/css/default.css
@@ -0,0 +1,18 @@
+.headerSectionContainer {
+	background-color: gradient #575757 #101010 100%;
+}
+
+.sectionHeader {
+	font-weight: bold;
+	font-size: 15pt;
+	color: white;
+}
+
+.subSectionHeader {
+	background-color: gradient #575757 #101010 100%;
+}
+
+
+.contentContainer {
+	background-color: #fff #fff #cccccc 20% 80%;
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/Application.gif b/bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/Application.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9246dfa126e2e4b11aba2f7b341be8187aad4ce4
GIT binary patch
literal 1048
zcmeH`Yfn-E0EQ3d2er-7#dWWFscGwGeMn=iY-w8RR7A~7A+{7$Gz23F$IYozlY=)7
zqItm!W{s#hSv9q_w(=4OY{R)Ww5-4=EIfx>=am1TAJDt!<MZj+-b)E_QPKHCfC!)f
zFqfVIrlq%1GPNm`XEdfNpYgJ>9rNPk6p9=5dQjZ$#9b)nM1H@YH{0!Q6vYw5Q_ccy
z-@T|4E3Rm>|MZlwWh+)Uv$FB6!3wsk)*N03;-zz1i`Xp;j*M};g<dI3EA7oJ>t=GB
zEI&LetEg#tJzZiTa~|aIG&y%QdHlz(4J)6&A*2H3nSAI%QBML>b-7HH#2QLvkEC)&
zD7Qzmsvc!kJroWs+8mfbRCAgtkETJS8_IJxyDrf0$CmWRmh>gD2C4UE$UM!s0m+r>
zuQyM>SzOBo^?BgzwbE)%^N7`f*%9xA$^O-Wb2R3bsn1Ugwv3*IJk?^+$Op0RWB>Fj
zZ2hgbc=Z-HZ1or|u2lrHAzs+xe6e78x9a)&%QbDo=d4b>)%gX%mQZZX?decJLa_)^
zG)pA>ni@evJ+GmjKhQ}ZRF)`PS?yAetciP<TPSVh4MBy&iXwF<eMs?_;!YV$E@cnP
z3)Kq7FhuWdV-Cuh10AKJ3UYUKY|EW1^_&!q<g8k7eqlI!8P*x6rzZL&jb#*mc_GwP
z`&7hW=239eVWgAI4Z?9=l}@WQ!7z^F!2kV2fnb*}0RXyyBOC6<Cjh^7faIzpgw{!e
zPcclBpg6W6nV6HS6CK<fbd)ld1!_M9Up#P5;0wk`;=nyo>`}X^9)>zj6m;M5eY^ri
zFs#IoPqoPhV#Jtz!Kj9z6Dfghu9Jg_9Ve*<cI12nylX!#pf{hUO4xcZG@cqhp8!MQ
zdjURdUY-pLJA6;6G16fuaGwwV>c>}UVacSl=i^3y81ma<=jy`zWA-QdcFXnTom)cU
zS<iv;^oVVpNv(%w)c%okJ2sX2_?^EsIkPEBMOrs&g^5CfA}~s0K2+&{eEaTj!6Y@t
bCtw%t3UO&lTt^H##s$`b$JR{*0zmo$RneaM

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
new file mode 100644
index 0000000000..9941bdb54e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.editors">
+      <editor
+            class="org.eclipse.e4.tools.emf.editor3x.E4WorkbenchModelEditor"
+            default="true"
+            extensions="e4xml"
+            icon="icons/full/obj16/Application.gif"
+            id="org.eclipse.e4.tools.emf.editor3x.e4wbm"
+            name="E4 Workbenchmodel Editor">
+      </editor>
+   </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
new file mode 100644
index 0000000000..3963f4578e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -0,0 +1,137 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource.ModelListener;
+import org.eclipse.e4.tools.emf.ui.internal.wbm.ApplicationModelEditor;
+import org.eclipse.e4.ui.css.core.engine.CSSEngine;
+import org.eclipse.e4.ui.css.core.engine.CSSErrorHandler;
+import org.eclipse.e4.ui.css.core.util.impl.resources.OSGiResourceLocator;
+import org.eclipse.e4.ui.css.swt.engine.CSSSWTEngineImpl;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.EditorPart;
+
+public class E4WorkbenchModelEditor extends EditorPart {
+	private XMIModelResource resource;
+	private ApplicationModelEditor editor;
+	
+	private static final String CSS_URI = "platform:/plugin/org.eclipse.e4.tools.emf.editor3x/css/default.css";
+	
+	@Override
+	public void doSave(IProgressMonitor monitor) {
+		editor.save();
+	}
+
+	@Override
+	public void doSaveAs() {
+		
+	}
+	
+	private void setupCss(Display display) {
+		CSSEngine engine = (CSSEngine) display
+				.getData("org.eclipse.e4.ui.css.core.engine");
+		
+		if( engine == null ) {
+			engine = new CSSSWTEngineImpl(display, true);
+			engine.setErrorHandler(new CSSErrorHandler() {
+				public void error(Exception e) {
+					e.printStackTrace();
+				}
+			});
+			display.setData("org.eclipse.e4.ui.css.core.engine", engine);
+			
+			try {
+				URL url = FileLocator.resolve(new URL(CSS_URI.toString()));
+				display.setData("org.eclipse.e4.ui.css.core.cssURL", url); //$NON-NLS-1$		
+
+				InputStream stream = url.openStream();
+				engine.parseStyleSheet(stream);
+				stream.close();
+			} catch (MalformedURLException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			} catch (IOException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			}
+		}
+	}
+
+	@Override
+	public void init(IEditorSite site, IEditorInput input)
+			throws PartInitException {
+		setSite(site);
+		setInput(input);
+		
+		URI resourceURI = EditUIUtil.getURI(input);
+		if( resourceURI != null ) {
+			resource = new XMIModelResource(resourceURI);
+			resource.addModelListener(new ModelListener() {
+				
+				public void dirtyChanged() {
+					firePropertyChange(PROP_DIRTY);
+				}
+			});
+		}
+	}
+
+	@Override
+	public boolean isDirty() {
+		return resource.isDirty();
+	}
+
+	@Override
+	public boolean isSaveAsAllowed() {
+		return false;
+	}
+
+	@Override
+	public void createPartControl(Composite parent) {
+		setupCss(parent.getDisplay());
+		Composite comp = new Composite(parent, SWT.NONE);
+		comp.setBackground(comp.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+		
+		FillLayout layout = new FillLayout();
+		layout.marginWidth=10;
+		layout.marginHeight=10;
+		comp.setLayout(layout);
+		
+		editor = new ApplicationModelEditor(comp, resource);
+		
+		try {
+			parent.setRedraw(false);
+			parent.reskin(SWT.ALL);
+		} finally {
+			parent.setRedraw(true);
+		}
+	}
+
+	@Override
+	public void setFocus() {
+		editor.setFocus();
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java
new file mode 100644
index 0000000000..2f717517f2
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java
@@ -0,0 +1,107 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x;
+
+import java.util.ArrayList;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.workbench.ui.internal.E4XMIResourceFactory; 
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+
+public class XMIModelResource implements IModelResource {
+	private EditingDomain editingDomain;
+	private Resource resource;
+	private List<ModelListener> listeners = new ArrayList<IModelResource.ModelListener>();
+	private boolean dirty;
+
+	public XMIModelResource(URI uri) {
+		ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
+				ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+		ResourceSet resourceSet = new ResourceSetImpl();
+		BasicCommandStack commandStack = new BasicCommandStack();
+		commandStack.addCommandStackListener(new CommandStackListener() {
+			
+			public void commandStackChanged(EventObject event) {
+				dirty = true;
+				fireDirtyChanged();
+			}
+		});
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory,
+				commandStack, resourceSet);
+		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
+				.put(Resource.Factory.Registry.DEFAULT_EXTENSION,
+						new E4XMIResourceFactory());
+		resource = resourceSet.getResource(uri, true);
+	}
+
+	public IObservableList getRoot() {
+		WritableList list = new WritableList();
+		list.add(resource.getContents().get(0));
+		return list;
+	}
+
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	public boolean isSaveable() {
+		return true;
+	}
+
+	public void addModelListener(ModelListener listener) {
+		listeners.add(listener);
+	}
+	
+	public void removeModelListener(ModelListener listener) {
+		listeners.remove(listener);
+	}
+	
+	public boolean isDirty() {
+		return dirty;
+	}
+	
+	private void fireDirtyChanged() {
+		for( ModelListener listener : listeners ) {
+			listener.dirtyChanged();
+		}
+	}
+	
+	public IStatus save() {
+		Map<String, String> map = new HashMap<String, String>();
+		try {
+			resource.save(map);
+			editingDomain.getCommandStack().flush();
+			dirty = false;
+			fireDirtyChanged();
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+
+		return Status.OK_STATUS;
+	}
+
+}

From 528dea283683a002f200431e092020ec5d693b99 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 14 Mar 2010 14:17:13 +0000
Subject: [PATCH 0038/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * adding undo/redo support

---
 .../emf/editor3x/E4WorkbenchModelEditor.java  | 78 ++++++++++++++-----
 .../e4/tools/emf/editor3x/RedoAction.java     | 72 +++++++++++++++++
 .../e4/tools/emf/editor3x/UndoAction.java     | 69 ++++++++++++++++
 .../tools/emf/editor3x/XMIModelResource.java  | 12 ++-
 .../tools/emf/ui/common/IModelResource.java   |  1 +
 .../emf/ui/internal/common/ModelEditor.java   |  5 ++
 6 files changed, 215 insertions(+), 22 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
index 3963f4578e..b3d2f279f0 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -21,7 +21,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.wbm.ApplicationModelEditor;
 import org.eclipse.e4.ui.css.core.engine.CSSEngine;
 import org.eclipse.e4.ui.css.core.engine.CSSErrorHandler;
-import org.eclipse.e4.ui.css.core.util.impl.resources.OSGiResourceLocator;
 import org.eclipse.e4.ui.css.swt.engine.CSSSWTEngineImpl;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.edit.ui.util.EditUIUtil;
@@ -32,14 +31,30 @@
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.part.EditorPart;
 
+@SuppressWarnings("restriction")
 public class E4WorkbenchModelEditor extends EditorPart {
 	private XMIModelResource resource;
 	private ApplicationModelEditor editor;
-	
+	private UndoAction undoAction;
+	private RedoAction redoAction;
+
 	private static final String CSS_URI = "platform:/plugin/org.eclipse.e4.tools.emf.editor3x/css/default.css";
-	
+
+	private ModelListener listener = new ModelListener() {
+
+		public void dirtyChanged() {
+			firePropertyChange(PROP_DIRTY);
+		}
+
+		public void commandStackChanged() {
+			// TODO Auto-generated method stub
+
+		}
+	};
+
 	@Override
 	public void doSave(IProgressMonitor monitor) {
 		editor.save();
@@ -47,14 +62,14 @@ public void doSave(IProgressMonitor monitor) {
 
 	@Override
 	public void doSaveAs() {
-		
+
 	}
-	
+
 	private void setupCss(Display display) {
 		CSSEngine engine = (CSSEngine) display
 				.getData("org.eclipse.e4.ui.css.core.engine");
-		
-		if( engine == null ) {
+
+		if (engine == null) {
 			engine = new CSSSWTEngineImpl(display, true);
 			engine.setErrorHandler(new CSSErrorHandler() {
 				public void error(Exception e) {
@@ -62,7 +77,7 @@ public void error(Exception e) {
 				}
 			});
 			display.setData("org.eclipse.e4.ui.css.core.engine", engine);
-			
+
 			try {
 				URL url = FileLocator.resolve(new URL(CSS_URI.toString()));
 				display.setData("org.eclipse.e4.ui.css.core.cssURL", url); //$NON-NLS-1$		
@@ -85,16 +100,11 @@ public void init(IEditorSite site, IEditorInput input)
 			throws PartInitException {
 		setSite(site);
 		setInput(input);
-		
+
 		URI resourceURI = EditUIUtil.getURI(input);
-		if( resourceURI != null ) {
+		if (resourceURI != null) {
 			resource = new XMIModelResource(resourceURI);
-			resource.addModelListener(new ModelListener() {
-				
-				public void dirtyChanged() {
-					firePropertyChange(PROP_DIRTY);
-				}
-			});
+			resource.addModelListener(listener);
 		}
 	}
 
@@ -113,20 +123,46 @@ public void createPartControl(Composite parent) {
 		setupCss(parent.getDisplay());
 		Composite comp = new Composite(parent, SWT.NONE);
 		comp.setBackground(comp.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-		
+
 		FillLayout layout = new FillLayout();
-		layout.marginWidth=10;
-		layout.marginHeight=10;
+		layout.marginWidth = 10;
+		layout.marginHeight = 10;
 		comp.setLayout(layout);
-		
+
 		editor = new ApplicationModelEditor(comp, resource);
-		
+
 		try {
 			parent.setRedraw(false);
 			parent.reskin(SWT.ALL);
 		} finally {
 			parent.setRedraw(true);
 		}
+
+		makeActions();
+	}
+
+	private void makeActions() {
+		undoAction = new UndoAction(resource);
+		redoAction = new RedoAction(resource);
+
+		getEditorSite().getActionBars().setGlobalActionHandler(
+				ActionFactory.UNDO.getId(), undoAction);
+		getEditorSite().getActionBars().setGlobalActionHandler(
+				ActionFactory.REDO.getId(), redoAction);
+	}
+
+	@Override
+	public void dispose() {
+		if (undoAction != null)
+			undoAction.dispose();
+
+		if (redoAction != null)
+			redoAction.dispose();
+
+		if (listener != null && resource != null)
+			resource.removeModelListener(listener);
+
+		super.dispose();
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
new file mode 100644
index 0000000000..a67480d322
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x;
+
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.jface.action.Action;
+
+
+public class RedoAction extends Action
+{
+  private final IModelResource resource;
+  private final IModelResource.ModelListener listener;
+
+  public RedoAction(IModelResource resource)
+  {
+    this.resource = resource;
+    this.listener = new IModelResource.ModelListener()
+      {
+
+        public void commandStackChanged()
+        {
+          update();
+        }
+
+		public void dirtyChanged() {
+			
+		}
+		
+      };
+    resource.addModelListener(listener);
+    update();
+  }
+
+  @Override
+  public void run()
+  {
+    if (resource.getEditingDomain().getCommandStack().canRedo())
+    {
+    	resource.getEditingDomain().getCommandStack().redo();
+    }
+  }
+
+  private void update()
+  {
+    if (resource.getEditingDomain().getCommandStack().canRedo())
+    {
+      setText("Redo " + resource.getEditingDomain().getCommandStack().getRedoCommand().getLabel());
+      setEnabled(true);
+    }
+    else
+    {
+      setText("Redo");
+      setEnabled(false);
+    }
+  }
+
+  /**
+   * Clean up
+   */
+  public void dispose()
+  {
+    resource.removeModelListener(listener);
+  }
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
new file mode 100644
index 0000000000..0d44bff024
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x;
+
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.jface.action.Action;
+
+public class UndoAction extends Action
+{
+  private final IModelResource resource;
+  private final IModelResource.ModelListener listener;
+
+  public UndoAction(IModelResource resource)
+  {
+    this.resource = resource;
+    this.listener = new IModelResource.ModelListener()
+      {
+
+        public void commandStackChanged()
+        {
+          update();
+        }
+        
+        public void dirtyChanged() {
+        }
+      };
+    resource.addModelListener(listener);
+    update();
+  }
+
+  @Override
+  public void run()
+  {
+    if (resource.getEditingDomain().getCommandStack().canUndo())
+    {
+    	resource.getEditingDomain().getCommandStack().undo();
+    }
+  }
+
+  private void update()
+  {
+    if (resource.getEditingDomain().getCommandStack().canUndo())
+    {
+      setText("Undo " + resource.getEditingDomain().getCommandStack().getUndoCommand().getLabel());
+      setEnabled(true);
+    }
+    else
+    {
+      setText("Undo");
+      setEnabled(false);
+    }
+  }
+
+  /**
+   * Clean up
+   */
+  public void dispose()
+  {
+    resource.removeModelListener(listener);
+  }
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java
index 2f717517f2..59b63ecf7c 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java
@@ -32,12 +32,14 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 
+@SuppressWarnings("restriction")
 public class XMIModelResource implements IModelResource {
 	private EditingDomain editingDomain;
 	private Resource resource;
 	private List<ModelListener> listeners = new ArrayList<IModelResource.ModelListener>();
 	private boolean dirty;
 
+	
 	public XMIModelResource(URI uri) {
 		ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
 				ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
@@ -48,6 +50,7 @@ public XMIModelResource(URI uri) {
 			public void commandStackChanged(EventObject event) {
 				dirty = true;
 				fireDirtyChanged();
+				fireCommandStackChanged();
 			}
 		});
 		editingDomain = new AdapterFactoryEditingDomain(adapterFactory,
@@ -81,7 +84,7 @@ public void removeModelListener(ModelListener listener) {
 	}
 	
 	public boolean isDirty() {
-		return dirty;
+		return dirty && getEditingDomain().getCommandStack().canUndo();
 	}
 	
 	private void fireDirtyChanged() {
@@ -90,6 +93,12 @@ private void fireDirtyChanged() {
 		}
 	}
 	
+	private void fireCommandStackChanged() {
+		for( ModelListener listener : listeners ) {
+			listener.commandStackChanged();
+		}
+	}
+	
 	public IStatus save() {
 		Map<String, String> map = new HashMap<String, String>();
 		try {
@@ -97,6 +106,7 @@ public IStatus save() {
 			editingDomain.getCommandStack().flush();
 			dirty = false;
 			fireDirtyChanged();
+			fireCommandStackChanged();
 		} catch (Exception e) {
 			// TODO: handle exception
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
index c2ee571e31..4c5d0acaa3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
@@ -26,5 +26,6 @@ public interface IModelResource {
 	
 	public interface ModelListener {
 		public void dirtyChanged();
+		public void commandStackChanged();
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 87602e0a28..21a3f0c529 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -310,6 +310,11 @@ public IStatus save() {
 
 		return Status.CANCEL_STATUS;
 	}
+	
+	public void setFocus() {
+		viewer.getControl().setFocus();
+	}
+
 
 	private static class TreeStructureAdvisorImpl extends TreeStructureAdvisor {
 

From 9719130af2c72205658bc336a1af3a3d9a37b28e Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 14 Mar 2010 16:44:05 +0000
Subject: [PATCH 0039/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * fixed build properties * using famfam icon for
 editor * fixed problems with model and modelcomponent editor

---
 .../about.html                                |  45 +++
 .../build.properties                          |   4 +-
 .../icons/full/obj16/Application.gif          | Bin 1048 -> 0 bytes
 .../full/obj16/application_view_tile.png      | Bin 0 -> 465 bytes
 .../plugin.xml                                |   2 +-
 .../emf/ui/internal/common/ModelEditor.java   |  14 +-
 .../component/ModelComponentEditor.java       |  23 +-
 .../component/ModelComponentsEditor.java      |  11 +-
 .../component/PartDescriptorEditor.java       | 310 +++++++++++++++++-
 .../component/virtual/VPartDescriptor.java    | 237 +++++++++++++
 10 files changed, 625 insertions(+), 21 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/about.html
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/Application.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/application_view_tile.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/about.html b/bundles/org.eclipse.e4.tools.emf.editor3x/about.html
new file mode 100644
index 0000000000..c1343aa318
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/about.html
@@ -0,0 +1,45 @@
+<!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>December 3, 2009</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  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>Silk icon set Version 1.3</h4>
+<p>
+This plugin contains icons from the Silk icon set created by Mark James. The original files can
+be found at:
+<ul>
+<a href="http://www.famfamfam.com/lab/icons/silk/">http://www.famfamfam.com/lab/icons/silk/</a></ul>
+<p>The license can be found at:</p>
+<ul>
+ <li><a href="http://creativecommons.org/licenses/by/2.5/">http://creativecommons.org/licenses/by/2.5/</a></li>
+</ul>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
index e9863e281e..5e4181d7c1 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
@@ -2,4 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml
+               plugin.xml,\
+               icons/,\
+               css/
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/Application.gif b/bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/Application.gif
deleted file mode 100644
index 9246dfa126e2e4b11aba2f7b341be8187aad4ce4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1048
zcmeH`Yfn-E0EQ3d2er-7#dWWFscGwGeMn=iY-w8RR7A~7A+{7$Gz23F$IYozlY=)7
zqItm!W{s#hSv9q_w(=4OY{R)Ww5-4=EIfx>=am1TAJDt!<MZj+-b)E_QPKHCfC!)f
zFqfVIrlq%1GPNm`XEdfNpYgJ>9rNPk6p9=5dQjZ$#9b)nM1H@YH{0!Q6vYw5Q_ccy
z-@T|4E3Rm>|MZlwWh+)Uv$FB6!3wsk)*N03;-zz1i`Xp;j*M};g<dI3EA7oJ>t=GB
zEI&LetEg#tJzZiTa~|aIG&y%QdHlz(4J)6&A*2H3nSAI%QBML>b-7HH#2QLvkEC)&
zD7Qzmsvc!kJroWs+8mfbRCAgtkETJS8_IJxyDrf0$CmWRmh>gD2C4UE$UM!s0m+r>
zuQyM>SzOBo^?BgzwbE)%^N7`f*%9xA$^O-Wb2R3bsn1Ugwv3*IJk?^+$Op0RWB>Fj
zZ2hgbc=Z-HZ1or|u2lrHAzs+xe6e78x9a)&%QbDo=d4b>)%gX%mQZZX?decJLa_)^
zG)pA>ni@evJ+GmjKhQ}ZRF)`PS?yAetciP<TPSVh4MBy&iXwF<eMs?_;!YV$E@cnP
z3)Kq7FhuWdV-Cuh10AKJ3UYUKY|EW1^_&!q<g8k7eqlI!8P*x6rzZL&jb#*mc_GwP
z`&7hW=239eVWgAI4Z?9=l}@WQ!7z^F!2kV2fnb*}0RXyyBOC6<Cjh^7faIzpgw{!e
zPcclBpg6W6nV6HS6CK<fbd)ld1!_M9Up#P5;0wk`;=nyo>`}X^9)>zj6m;M5eY^ri
zFs#IoPqoPhV#Jtz!Kj9z6Dfghu9Jg_9Ve*<cI12nylX!#pf{hUO4xcZG@cqhp8!MQ
zdjURdUY-pLJA6;6G16fuaGwwV>c>}UVacSl=i^3y81ma<=jy`zWA-QdcFXnTom)cU
zS<iv;^oVVpNv(%w)c%okJ2sX2_?^EsIkPEBMOrs&g^5CfA}~s0K2+&{eEaTj!6Y@t
bCtw%t3UO&lTt^H##s$`b$JR{*0zmo$RneaM

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/application_view_tile.png b/bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/application_view_tile.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bc0bd32fceb21d70368f7842a00a53d6369ba48
GIT binary patch
literal 465
zcmV;?0WSWDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzV@X6oR5;6}
zlif?gU=+sv7bPi)=!3$7q?JQqQvwMoh(bhK+J{k6%rsgQVNn!z(HBXQkd^mAH(hwA
z^Yotc=4S08nh!j@F!ub;!`WU30603a!#SmnFKE?TaOVx=ZRYd~NSn_P*eHX4{Rzai
z68Mrum`pr?uyhCB_zlR(s~YAA5Xn~cSpFUUYax26696aMv1k4Q2q33l!H$M!&p1HZ
zs?dXQ!8A(HJcd!rMboIk$jLW=EvyAdm3{&e#VDQ4W|M-siV5fsA9Db1`>zJNu3H-P
zO&@UpeyZQXi7jKe-Hk?r-sue;aDce_XqkvXP+W#F_*ot`jB?BS93Uw71|U^ZjLH<w
zh;-sq3Vy5@0GB_@0Tc0CO9QIe)}UUmTN-qU84mEqu5JAXPM->`yP%FO7U<6!nLCG}
z$SDlW<k^-FX;JQ=20hXqbO&;*_AZ;O0?VLP0(5*EI|Y0J3Jfj)lKW#`00000NkvXX
Hu0mjf{J_IH

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index 9941bdb54e..fec54cec4b 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -7,7 +7,7 @@
             class="org.eclipse.e4.tools.emf.editor3x.E4WorkbenchModelEditor"
             default="true"
             extensions="e4xml"
-            icon="icons/full/obj16/Application.gif"
+            icon="icons/full/obj16/application_view_tile.png"
             id="org.eclipse.e4.tools.emf.editor3x.e4wbm"
             name="E4 Workbenchmodel Editor">
       </editor>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 21a3f0c529..c597867342 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -59,6 +59,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VKeyBindingEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartDescriptor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowTrimEditor;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
@@ -91,6 +92,7 @@ public class ModelEditor {
 	public static final int VIRTUAL_WINDOWS = 5;
 	public static final int VIRTUAL_WINDOW_CONTROLS = 6;
 	public static final int VIRTUAL_WINDOW_TRIMS = 7;
+	public static final int VIRTUAL_PART_DESCRIPTORS = 8;
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private AbstractComponentEditor[] virtualEditors;
@@ -232,9 +234,15 @@ public void handleMapChange(MapChangeEvent event) {
 
 	private void registerVirtualEditors() {
 		virtualEditors = new AbstractComponentEditor[] { new VMenuEditor(modelProvider.getEditingDomain(), this), // V-Menu
-		null, // V-Part
-		new VHandlerEditor(modelProvider.getEditingDomain(), this), new VKeyBindingEditor(modelProvider.getEditingDomain(), this), new VCommandEditor(modelProvider.getEditingDomain(), this), new VWindowEditor(modelProvider.getEditingDomain(), this), new VControlEditor(modelProvider.getEditingDomain(), this), new VWindowTrimEditor(modelProvider.getEditingDomain(), this) };
-
+				null, // V-Part
+				new VHandlerEditor(modelProvider.getEditingDomain(), this), 
+				new VKeyBindingEditor(modelProvider.getEditingDomain(), this), 
+				new VCommandEditor(modelProvider.getEditingDomain(), this), 
+				new VWindowEditor(modelProvider.getEditingDomain(), this), 
+				new VControlEditor(modelProvider.getEditingDomain(), this), 
+				new VWindowTrimEditor(modelProvider.getEditingDomain(), this),
+				new VPartDescriptor(modelProvider.getEditingDomain(), this)
+		};
 	}
 
 	public void setSelection(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index 402fc5734e..01129c8d53 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -20,6 +23,7 @@
 import org.eclipse.e4.ui.model.application.MMenu;
 import org.eclipse.e4.ui.model.application.MModelComponent;
 import org.eclipse.e4.ui.model.application.MPart;
+import org.eclipse.e4.ui.model.application.MPartDescriptor;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
@@ -44,10 +48,10 @@ public class ModelComponentEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty MODEL_COMPONENT__CHILDREN = EMFProperties.list( MApplicationPackage.Literals.MODEL_COMPONENT__CHILDREN);
-
+	private IListProperty PART_DESCRIPTOR_CONTAINER__DESCRIPTORS = EMFProperties.list( MApplicationPackage.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS);
+	
 	public ModelComponentEditor(EditingDomain editingDomain) {
 		super(editingDomain);
-		// TODO Auto-generated constructor stub
 	}
 
 	@Override
@@ -150,7 +154,12 @@ private Composite createForm(Composite parent) {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
-			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/package_go.png"));
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ModelComponent.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}
 		return image;
 	}
@@ -183,6 +192,14 @@ protected boolean accepted(Object o) {
 				return o instanceof MPart;
 			}
 
+		});
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART_DESCRIPTORS, PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, element, "PartDescriptors") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return o instanceof MPartDescriptor;
+			}
+
 		});
 		return list;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
index 9bd3ca841f..7f72155f91 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -32,13 +35,17 @@ public class ModelComponentsEditor extends AbstractComponentEditor {
 
 	public ModelComponentsEditor(EditingDomain editingDomain) {
 		super(editingDomain);
-		// TODO Auto-generated constructor stub
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
-			image = new Image(display, getClass().getClassLoader().getResourceAsStream("/icons/application_view_icons.png"));
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ModelComponents.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}
 		return image;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index f5b9e4e50b..60ed9f92fb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -10,43 +10,331 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Map.Entry;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MPart;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class PartDescriptorEditor extends PartEditor {
+public class PartDescriptorEditor extends AbstractComponentEditor {
+
+	private Composite composite;
+	private Image image;
+	private EMFDataBindingContext context;
+
+	private IListProperty PART__MENUS = EMFProperties.list(MApplicationPackage.Literals.PART__MENUS);
+	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
+	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS);
 
 	public PartDescriptorEditor(EditingDomain editingDomain) {
 		super(editingDomain);
 	}
 
 	@Override
+	public Image getImage(Object element, Display display) {
+		if( image == null ) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Part.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "PartDescriptor";
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "PartDescriptor Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		getMaster().setValue(object);
+		return composite;
+	}
+
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master) {
-		Composite comp = super.createForm(parent,context,master);
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		Label l = new Label(parent, SWT.NONE);
-		l.setText("Label");
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));			
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Label");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));			
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Tooltip");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));			
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Icon URI");
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+
+			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setText("Find ...");			
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Class URI");
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
+
+			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setText("Find ...");			
+		}
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Persited State");
+			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+
+			TableViewer tableviewer = new TableViewer(parent);
+			tableviewer.getTable().setHeaderVisible(true);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			tableviewer.setContentProvider(cp);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 80;
+			tableviewer.getControl().setLayoutData(gd);
+			
+			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
+			column.getColumn().setText("Key");
+			column.getColumn().setWidth(200);
+			column.setLabelProvider(new ColumnLabelProvider() {
+				@SuppressWarnings("unchecked")
+				@Override
+				public String getText(Object element) {
+					Entry<String, String> entry = (Entry<String, String>) element;
+					return entry.getKey();
+				}
+			}); 
+
+			//FIXME How can we react upon changes in the Map-Value?
+			column = new TableViewerColumn(tableviewer, SWT.NONE);
+			column.getColumn().setText("Value");
+			column.getColumn().setWidth(200);
+			column.setLabelProvider(new ColumnLabelProvider() {
+				@SuppressWarnings("unchecked")
+				@Override
+				public String getText(Object element) {
+					Entry<String, String> entry = (Entry<String, String>) element;
+					return entry.getValue();
+				}
+			});
+			
+			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__PERSISTED_STATE);
+			tableviewer.setInput(prop.observeDetail(getMaster()));
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		}
+
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Variables");
+			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 
-		Text t = new Text(parent, SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
-		t.setLayoutData(gd);
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+			ListViewer viewer = new ListViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			gd.heightHint = 80;
+			viewer.getList().setLayoutData(gd);
+		}
 
 		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Properties");
+			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 
+			TableViewer tableviewer = new TableViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			gd.heightHint = 80;
+			tableviewer.getTable().setHeaderVisible(true);
+			tableviewer.getControl().setLayoutData(gd);
 
-		return comp;
+			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
+			column.getColumn().setText("Key");
+			column.getColumn().setWidth(200);
+
+			column = new TableViewerColumn(tableviewer, SWT.NONE);
+			column.getColumn().setText("Value");
+			column.getColumn().setWidth(200);
+		}
+
+
+		ControlFactory.createTagsWidget(parent, this);
+
+//		// ------------------------------------------------------------
+//
+//		l = new Label(parent, SWT.NONE);
+//		l.setText("");
+//
+//		Composite booleanContainer = new Composite(parent,SWT.NONE);
+//		gd = new GridData(GridData.FILL_HORIZONTAL);
+//		gd.horizontalSpan=2;
+//		booleanContainer.setBackgroundMode(SWT.INHERIT_DEFAULT);
+//		booleanContainer.setLayoutData(gd);
+//		booleanContainer.setLayout(new GridLayout(4,false));
+//
+//		Button checkbox = new Button(booleanContainer, SWT.CHECK);
+//		checkbox.setText("to render");
+//
+//		checkbox = new Button(booleanContainer, SWT.CHECK);
+//		checkbox.setText("on Top");
+//
+//		checkbox = new Button(booleanContainer, SWT.CHECK);
+//		checkbox.setText("visible");
+//
+//		checkbox = new Button(booleanContainer, SWT.CHECK);
+//		checkbox.setText("closeable");
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		WritableList list = new WritableList();
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MENU, PART__MENUS, element, "Menus") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, "Handlers") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING, BINDING_CONTAINER__BINDINGS, element, "Bindings") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
+		return list;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		MPart o = (MPart) element;
+		return o.getLabel();
+	}
+
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] {
+			FeaturePath.fromList(MApplicationPackage.Literals.UI_LABEL__LABEL)	
+		};
 	}
-}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
new file mode 100644
index 0000000000..db6d274a81
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -0,0 +1,237 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MCommand;
+import org.eclipse.e4.ui.model.application.MHandler;
+import org.eclipse.e4.ui.model.application.MPartDescriptor;
+import org.eclipse.e4.ui.model.application.MPartDescriptorContainer;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VPartDescriptor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+	private TableViewer viewer;
+
+	public VPartDescriptor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Part Descriptors";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Part Descriptors Bla Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Commands");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.getTable().setHeaderVisible(true);
+
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL);
+					
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Name");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+			
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PART_DESCRIPTOR__CATEGORY);
+					
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Category");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+						
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MPartDescriptorContainer container = (MPartDescriptorContainer) getMaster().getValue();
+							int idx = container.getDescriptors().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MPartDescriptorContainer container = (MPartDescriptorContainer) getMaster().getValue();
+							int idx = container.getDescriptors().indexOf(obj) + 1;
+							if( idx < container.getDescriptors().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MPartDescriptor command = MApplicationFactory.eINSTANCE.createPartDescriptor();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, command);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(command);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> commands = ((IStructuredSelection)viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, commands);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+}

From 1ac6252bf94f861ec912e5aec3457806dee29925 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 14 Mar 2010 17:12:04 +0000
Subject: [PATCH 0040/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * improved PartEditor descriptors

---
 .../component/PartDescriptorEditor.java       | 42 ++++++++++++++++++-
 .../internal/common/component/PartEditor.java | 16 +++++++
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 60ed9f92fb..d681017442 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -28,6 +28,7 @@
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -164,6 +165,44 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.setText("Find ...");			
 		}
 		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Closeable");
+
+			Button checkbox = new Button(parent, SWT.CHECK);
+			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
+			
+			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PART__CLOSEABLE);
+			IWidgetValueProperty uiProp = WidgetProperties.selection();
+			
+			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
+		}
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Multiple");
+
+			Button checkbox = new Button(parent, SWT.CHECK);
+			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
+			
+			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PART_DESCRIPTOR__ALLOW_MULTIPLE);
+			IWidgetValueProperty uiProp = WidgetProperties.selection();
+			
+			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
+		}
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Category");
+			
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL,GridData.BEGINNING, true, false, 2, 1));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PART_DESCRIPTOR__CATEGORY).observeDetail(master));
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -225,8 +264,7 @@ public String getText(Object element) {
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		}
-
-
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 9e47b65682..10c344d0c1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -28,6 +28,7 @@
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -164,6 +165,21 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.setText("Find ...");			
 		}
 		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Closeable");
+
+			Button checkbox = new Button(parent, SWT.CHECK);
+			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
+			
+			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PART__CLOSEABLE);
+			IWidgetValueProperty uiProp = WidgetProperties.selection();
+			
+			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
+		}
+
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);

From 9097a2c507a2c818c60d76683a6cc1004014c605 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 14 Mar 2010 17:16:23 +0000
Subject: [PATCH 0041/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * fixed compiler warnings * removed editor for model
 extensions

---
 .../META-INF/MANIFEST.MF                          |  1 -
 .../common/component/AbstractComponentEditor.java |  2 --
 .../common/component/virtual/VPartDescriptor.java |  2 --
 .../emf/ui/internal/wbe/ExtensionModelEditor.java | 15 ---------------
 4 files changed, 20 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbe/ExtensionModelEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 8fc35da937..885f1af4ab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -24,5 +24,4 @@ Export-Package: org.eclipse.e4.tools.emf.ui.common,
  org.eclipse.e4.tools.emf.ui.common.component,
  org.eclipse.e4.tools.emf.ui.internal.common;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.common.component;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.wbe;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.wbm;x-friends:="org.eclipse.e4.tools.emf.editor"
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 8a376fe144..662d39cecf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -18,10 +18,8 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index db6d274a81..47fcb534a5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -18,10 +18,8 @@
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MCommand;
 import org.eclipse.e4.ui.model.application.MHandler;
 import org.eclipse.e4.ui.model.application.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.MPartDescriptorContainer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbe/ExtensionModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbe/ExtensionModelEditor.java
deleted file mode 100644
index 6ddbfedab2..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbe/ExtensionModelEditor.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.wbe;
-
-public class ExtensionModelEditor {
-
-}

From fb346b8b43b08f710c4e44ed0852ad3c105760c0 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 14 Mar 2010 17:57:33 +0000
Subject: [PATCH 0042/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * model components editors improved

---
 .../emf/ui/internal/common/ModelEditor.java   |   2 +-
 .../component/ModelComponentEditor.java       |  47 +++---
 .../component/ModelComponentsEditor.java      | 148 +++++++++++++++++-
 3 files changed, 171 insertions(+), 26 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index c597867342..160c2eb515 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -251,7 +251,7 @@ public void setSelection(Object element) {
 
 	private void registerDefaultEditors() {
 		registerEditor(MApplicationPackage.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain()));
-		registerEditor(MApplicationPackage.Literals.MODEL_COMPONENTS, new ModelComponentsEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.MODEL_COMPONENTS, new ModelComponentsEditor(modelProvider.getEditingDomain(),this));
 		registerEditor(MApplicationPackage.Literals.MODEL_COMPONENT, new ModelComponentEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.PART, new PartEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.PART_DESCRIPTOR, new PartDescriptorEditor(modelProvider.getEditingDomain()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index 01129c8d53..9fcef0a2f4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -26,6 +26,7 @@
 import org.eclipse.e4.ui.model.application.MPartDescriptor;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -96,24 +97,6 @@ private Composite createForm(Composite parent) {
 		t.setLayoutData(gd);
 		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 
-		// ------------------------------------------------------------
-
-		l = new Label(parent, SWT.NONE);
-		l.setText("Tags");
-
-		t = new Text(parent, SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
-		t.setLayoutData(gd);
-
-		l = new Label(parent, SWT.NONE);
-		ListViewer viewer = new ListViewer(parent);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
-		gd.heightHint = 130;
-		viewer.getList().setLayoutData(gd);
-
-
 		// ------------------------------------------------------------
 
 		l = new Label(parent, SWT.NONE);
@@ -147,6 +130,23 @@ private Composite createForm(Composite parent) {
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
 		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__PROCESSOR).observeDetail(getMaster()));
+		
+		// ------------------------------------------------------------
+
+		l = new Label(parent, SWT.NONE);
+		l.setText("Tags");
+
+		t = new Text(parent, SWT.BORDER);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		t.setLayoutData(gd);
+
+		l = new Label(parent, SWT.NONE);
+		ListViewer viewer = new ListViewer(parent);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		gd.heightHint = 130;
+		viewer.getList().setLayoutData(gd);
 
 		return parent;
 	}
@@ -207,7 +207,16 @@ protected boolean accepted(Object o) {
 	@Override
 	public String getDetailLabel(Object element) {
 		MModelComponent o = (MModelComponent) element;
-		return "parentId: " + o.getParentID();
+		if( o.getParentID() != null ) {
+			return "parentId: " + o.getParentID();
+		}
+		return null;
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] {
+			FeaturePath.fromList(MApplicationPackage.Literals.MODEL_COMPONENT__PARENT_ID)	
+		};
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
index 7f72155f91..4e6c714512 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
@@ -12,18 +12,38 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.List;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.e4.ui.model.application.MModelComponent;
+import org.eclipse.e4.ui.model.application.MModelComponents;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
 
 public class ModelComponentsEditor extends AbstractComponentEditor {
 
@@ -31,15 +51,16 @@ public class ModelComponentsEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private Image image;
-	private EMFDataBindingContext context;
+	private ModelEditor editor;
 
-	public ModelComponentsEditor(EditingDomain editingDomain) {
+	public ModelComponentsEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
+		this.editor = editor;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ModelComponents.gif"));
 			} catch (MalformedURLException e) {
@@ -62,8 +83,7 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
-			context = new EMFDataBindingContext();
+		if (composite == null) {
 			composite = createForm(parent);
 		}
 		getMaster().setValue(object);
@@ -72,6 +92,122 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent) {
 		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Model Contributions");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			final TableViewer viewer = new TableViewer(parent);
+			viewer.setContentProvider(new ObservableListContentProvider());
+			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+
+			IEMFListProperty prop = EMFProperties.list(MApplicationPackage.Literals.MODEL_COMPONENTS__COMPONENTS);
+			viewer.setInput(prop.observeDetail(getMaster()));
+
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MModelComponents container = (MModelComponents) getMaster().getValue();
+							int idx = container.getComponents().indexOf(obj) - 1;
+							if (idx >= 0) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.MODEL_COMPONENTS__COMPONENTS, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MModelComponents container = (MModelComponents) getMaster().getValue();
+							int idx = container.getComponents().indexOf(obj) + 1;
+							if (idx < container.getComponents().size()) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.MODEL_COMPONENTS__COMPONENTS, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MModelComponent component = MApplicationFactory.eINSTANCE.createModelComponent();
+
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.MODEL_COMPONENTS__COMPONENTS, component);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(component);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.MODEL_COMPONENTS__COMPONENTS, elements);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
 
 		return parent;
 	}

From 337e157445899710194f8f5ecf3eb549c894e1b9 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 14 Mar 2010 21:38:56 +0000
Subject: [PATCH 0043/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * added handlers and binding changes

---
 .../emf/ui/internal/common/ModelEditor.java   |  3 ++-
 .../component/ModelComponentEditor.java       | 20 +++++++++++++++++++
 .../component/virtual/VCommandEditor.java     | 14 ++++++++-----
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 160c2eb515..7b26f60bf0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -93,6 +93,7 @@ public class ModelEditor {
 	public static final int VIRTUAL_WINDOW_CONTROLS = 6;
 	public static final int VIRTUAL_WINDOW_TRIMS = 7;
 	public static final int VIRTUAL_PART_DESCRIPTORS = 8;
+	public static final int VIRTUAL_MODEL_COMP_COMMANDS = 9;
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private AbstractComponentEditor[] virtualEditors;
@@ -237,7 +238,7 @@ private void registerVirtualEditors() {
 				null, // V-Part
 				new VHandlerEditor(modelProvider.getEditingDomain(), this), 
 				new VKeyBindingEditor(modelProvider.getEditingDomain(), this), 
-				new VCommandEditor(modelProvider.getEditingDomain(), this), 
+				new VCommandEditor(modelProvider.getEditingDomain(), this, MApplicationPackage.Literals.APPLICATION__COMMANDS), 
 				new VWindowEditor(modelProvider.getEditingDomain(), this), 
 				new VControlEditor(modelProvider.getEditingDomain(), this), 
 				new VWindowTrimEditor(modelProvider.getEditingDomain(), this),
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index 9fcef0a2f4..3cb5393087 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -50,6 +50,8 @@ public class ModelComponentEditor extends AbstractComponentEditor {
 
 	private IListProperty MODEL_COMPONENT__CHILDREN = EMFProperties.list( MApplicationPackage.Literals.MODEL_COMPONENT__CHILDREN);
 	private IListProperty PART_DESCRIPTOR_CONTAINER__DESCRIPTORS = EMFProperties.list( MApplicationPackage.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS);
+	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
+	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS);
 	
 	public ModelComponentEditor(EditingDomain editingDomain) {
 		super(editingDomain);
@@ -201,6 +203,24 @@ protected boolean accepted(Object o) {
 			}
 
 		});
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, "Handlers") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING, BINDING_CONTAINER__BINDINGS, element, "Bindings") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
 		return list;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 6dffa85080..26be242d71 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -27,6 +27,7 @@
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -52,10 +53,13 @@ public class VCommandEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
 	private TableViewer viewer;
+	
+	private EStructuralFeature commandsFeature;
 
-	public VCommandEditor(EditingDomain editingDomain, ModelEditor editor) {
+	public VCommandEditor(EditingDomain editingDomain, ModelEditor editor, EStructuralFeature commandsFeature) {
 		super(editingDomain);
 		this.editor = editor;
+		this.commandsFeature = commandsFeature;
 	}
 
 	@Override
@@ -149,7 +153,7 @@ public void widgetSelected(SelectionEvent e) {
 							MApplication container = (MApplication) getMaster().getValue();
 							int idx = container.getCommands().indexOf(obj) - 1;
 							if( idx >= 0 ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.APPLICATION__COMMANDS, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), commandsFeature, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -176,7 +180,7 @@ public void widgetSelected(SelectionEvent e) {
 							MApplication container = (MApplication) getMaster().getValue();
 							int idx = container.getCommands().indexOf(obj) + 1;
 							if( idx < container.getCommands().size() ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.APPLICATION__COMMANDS, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), commandsFeature, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -197,7 +201,7 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MCommand command = MApplicationFactory.eINSTANCE.createCommand();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.APPLICATION__COMMANDS, command);
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), commandsFeature, command);
 					
 					if( cmd.canExecute() ) {
 						getEditingDomain().getCommandStack().execute(cmd);
@@ -215,7 +219,7 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					if( ! viewer.getSelection().isEmpty() ) {
 						List<?> commands = ((IStructuredSelection)viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.APPLICATION__COMMANDS, commands);
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), commandsFeature, commands);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}

From f46209b8513bde30515f2c4c4caa647ed7d47453 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 15 Mar 2010 16:48:31 +0000
Subject: [PATCH 0044/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * align with keybinding changes

---
 .../emf/ui/internal/common/ModelEditor.java   |  6 +-
 .../common/component/ApplicationEditor.java   |  4 +-
 .../component/ModelComponentEditor.java       |  2 +-
 .../component/PartDescriptorEditor.java       | 10 ---
 .../internal/common/component/PartEditor.java | 10 ---
 .../common/component/WindowEditor.java        | 18 ++---
 .../virtual/VBindingTableEditor.java          | 75 +++++++++++++++++++
 .../component/virtual/VKeyBindingEditor.java  | 14 ++--
 8 files changed, 99 insertions(+), 40 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 7b26f60bf0..f32e1c9ad5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -54,6 +54,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowTrimEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VBindingTableEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VCommandEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VControlEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
@@ -94,6 +95,7 @@ public class ModelEditor {
 	public static final int VIRTUAL_WINDOW_TRIMS = 7;
 	public static final int VIRTUAL_PART_DESCRIPTORS = 8;
 	public static final int VIRTUAL_MODEL_COMP_COMMANDS = 9;
+	public static final int VIRTUAL_BINDING_TABLE = 10;
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private AbstractComponentEditor[] virtualEditors;
@@ -242,7 +244,9 @@ private void registerVirtualEditors() {
 				new VWindowEditor(modelProvider.getEditingDomain(), this), 
 				new VControlEditor(modelProvider.getEditingDomain(), this), 
 				new VWindowTrimEditor(modelProvider.getEditingDomain(), this),
-				new VPartDescriptor(modelProvider.getEditingDomain(), this)
+				new VPartDescriptor(modelProvider.getEditingDomain(), this),
+				null,
+				new VBindingTableEditor(modelProvider.getEditingDomain(), this)
 		};
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index e39b37fb57..190f096ac1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -35,7 +35,7 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
-	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS);
+	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES);
 	private IListProperty APPLICATION__COMMANDS = EMFProperties.list(MApplicationPackage.Literals.APPLICATION__COMMANDS);
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
@@ -96,7 +96,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING, BINDING_CONTAINER__BINDINGS, element, "Bindings") {
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element, "BindingTables") {
 
 			@Override
 			protected boolean accepted(Object o) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index 3cb5393087..2490d727cc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -51,7 +51,7 @@ public class ModelComponentEditor extends AbstractComponentEditor {
 	private IListProperty MODEL_COMPONENT__CHILDREN = EMFProperties.list( MApplicationPackage.Literals.MODEL_COMPONENT__CHILDREN);
 	private IListProperty PART_DESCRIPTOR_CONTAINER__DESCRIPTORS = EMFProperties.list( MApplicationPackage.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS);
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
-	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS);
+	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES);
 	
 	public ModelComponentEditor(EditingDomain editingDomain) {
 		super(editingDomain);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index d681017442..e65cd34744 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -55,7 +55,6 @@ public class PartDescriptorEditor extends AbstractComponentEditor {
 
 	private IListProperty PART__MENUS = EMFProperties.list(MApplicationPackage.Literals.PART__MENUS);
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
-	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS);
 
 	public PartDescriptorEditor(EditingDomain editingDomain) {
 		super(editingDomain);
@@ -351,15 +350,6 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING, BINDING_CONTAINER__BINDINGS, element, "Bindings") {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-
 		return list;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 10c344d0c1..eb28d707bd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -55,7 +55,6 @@ public class PartEditor extends AbstractComponentEditor {
 
 	private IListProperty PART__MENUS = EMFProperties.list(MApplicationPackage.Literals.PART__MENUS);
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
-	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS);
 
 	public PartEditor(EditingDomain editingDomain) {
 		super(editingDomain);
@@ -329,15 +328,6 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING, BINDING_CONTAINER__BINDINGS, element, "Bindings") {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-
 		return list;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 8176e8d2ac..7db1cba282 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -47,7 +47,7 @@ public class WindowEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
-	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS);
+	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES);
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
 	public WindowEditor(EditingDomain editingDomain) {
@@ -211,14 +211,14 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING, BINDING_CONTAINER__BINDINGS, element, "Bindings") {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
+//		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING, BINDING_CONTAINER__BINDINGS, element, "Bindings") {
+//
+//			@Override
+//			protected boolean accepted(Object o) {
+//				return true;
+//			}
+//
+//		});
 		
 		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_WINDOW_TRIMS, ELEMENT_CONTAINER__CHILDREN, element, "Trims") {
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
new file mode 100644
index 0000000000..93a3627ae4
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class VBindingTableEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+	
+	public VBindingTableEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+	}
+	
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+	@Override
+	public String getLabel(Object element) {
+		return "BindingTables";
+	}
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+	@Override
+	public String getDescription(Object element) {
+		return "BindingTables Bla Bla Bla Bla";
+	}
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		return composite;
+	}
+	
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+		
+		return parent;
+	}
+	
+	
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java
index 3c3f036555..4d8c82e7d6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java
@@ -20,7 +20,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MBindingContainer;
+import org.eclipse.e4.ui.model.application.MBindingTable;
 import org.eclipse.e4.ui.model.application.MHandler;
 import org.eclipse.e4.ui.model.application.MKeyBinding;
 import org.eclipse.emf.common.command.Command;
@@ -156,10 +156,10 @@ public void widgetSelected(SelectionEvent e) {
 						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
 						if( s.size() == 1 ) {
 							Object obj = s.getFirstElement();
-							MBindingContainer container = (MBindingContainer) getMaster().getValue();
+							MBindingTable container = (MBindingTable) getMaster().getValue();
 							int idx = container.getBindings().indexOf(obj) - 1;
 							if( idx >= 0 ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_TABLE__BINDINGS, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -183,10 +183,10 @@ public void widgetSelected(SelectionEvent e) {
 						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
 						if( s.size() == 1 ) {
 							Object obj = s.getFirstElement();
-							MBindingContainer container = (MBindingContainer) getMaster().getValue();
+							MBindingTable container = (MBindingTable) getMaster().getValue();
 							int idx = container.getBindings().indexOf(obj) + 1;
 							if( idx < container.getBindings().size() ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_TABLE__BINDINGS, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -207,7 +207,7 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MKeyBinding handler = MApplicationFactory.eINSTANCE.createKeyBinding();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS, handler);
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_TABLE__BINDINGS, handler);
 
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
@@ -225,7 +225,7 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					if( ! viewer.getSelection().isEmpty() ) {
 						List<?> keybinding = ((IStructuredSelection)viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDINGS, keybinding);
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_TABLE__BINDINGS, keybinding);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}

From 5486775355d443466c00cfd403c9b366a1f65434 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 15 Mar 2010 17:58:58 +0000
Subject: [PATCH 0045/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * prelimenary support for new binding model objects

---
 .../emf/ui/internal/common/ModelEditor.java   |  11 +-
 ...ingEditor.java => BindingTableEditor.java} |  77 ++++++----
 .../component/ModelComponentEditor.java       |   2 +-
 .../virtual/VBindingTableEditor.java          | 134 ++++++++++++++++++
 4 files changed, 193 insertions(+), 31 deletions(-)
 rename bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/{virtual/VKeyBindingEditor.java => BindingTableEditor.java} (83%)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index f32e1c9ad5..ac399615fc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -32,6 +32,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ApplicationEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.BindingTableEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectMenuItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledMenuItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.KeyBindingEditor;
@@ -58,7 +59,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VCommandEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VControlEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VKeyBindingEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartDescriptor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowEditor;
@@ -88,14 +88,13 @@ public class ModelEditor {
 	public static final int VIRTUAL_MENU = 0;
 	public static final int VIRTUAL_PART = 1;
 	public static final int VIRTUAL_HANDLER = 2;
-	public static final int VIRTUAL_BINDING = 3;
+	public static final int VIRTUAL_BINDING_TABLE = 3;
 	public static final int VIRTUAL_COMMAND = 4;
 	public static final int VIRTUAL_WINDOWS = 5;
 	public static final int VIRTUAL_WINDOW_CONTROLS = 6;
 	public static final int VIRTUAL_WINDOW_TRIMS = 7;
 	public static final int VIRTUAL_PART_DESCRIPTORS = 8;
 	public static final int VIRTUAL_MODEL_COMP_COMMANDS = 9;
-	public static final int VIRTUAL_BINDING_TABLE = 10;
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private AbstractComponentEditor[] virtualEditors;
@@ -239,14 +238,13 @@ private void registerVirtualEditors() {
 		virtualEditors = new AbstractComponentEditor[] { new VMenuEditor(modelProvider.getEditingDomain(), this), // V-Menu
 				null, // V-Part
 				new VHandlerEditor(modelProvider.getEditingDomain(), this), 
-				new VKeyBindingEditor(modelProvider.getEditingDomain(), this), 
+				new VBindingTableEditor(modelProvider.getEditingDomain(), this), 
 				new VCommandEditor(modelProvider.getEditingDomain(), this, MApplicationPackage.Literals.APPLICATION__COMMANDS), 
 				new VWindowEditor(modelProvider.getEditingDomain(), this), 
 				new VControlEditor(modelProvider.getEditingDomain(), this), 
 				new VWindowTrimEditor(modelProvider.getEditingDomain(), this),
 				new VPartDescriptor(modelProvider.getEditingDomain(), this),
-				null,
-				new VBindingTableEditor(modelProvider.getEditingDomain(), this)
+				null
 		};
 	}
 
@@ -278,6 +276,7 @@ private void registerDefaultEditors() {
 		registerEditor(MApplicationPackage.Literals.MENU_ITEM, new MenuItemEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(MApplicationPackage.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(MApplicationPackage.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(MApplicationPackage.Literals.BINDING_TABLE, new BindingTableEditor(modelProvider.getEditingDomain(), this));
 	}
 
 	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
similarity index 83%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java
rename to bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 4d8c82e7d6..31de9ed2f0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VKeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -8,16 +8,17 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.List;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MBindingTable;
@@ -25,7 +26,9 @@
 import org.eclipse.e4.ui.model.application.MKeyBinding;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.command.AddCommand;
@@ -48,59 +51,65 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 
-public class VKeyBindingEditor extends AbstractComponentEditor {
+public class BindingTableEditor extends AbstractComponentEditor {
+
 	private Composite composite;
+	private Image image;
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
-	private TableViewer viewer;
+	
+	private IListProperty BINDING_TABLE__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_TABLE__BINDINGS);
+
 
-	public VKeyBindingEditor(EditingDomain editingDomain, ModelEditor editor) {
+	public BindingTableEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
 		this.editor = editor;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		return null;
-	}
+		if (image == null) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/BindingTable.gif"));
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
 
-	@Override
-	public String getLabel(Object element) {
-		return "KeyBindings";
+		return image;
 	}
 
 	@Override
-	public String getDetailLabel(Object element) {
-		return null;
+	public String getLabel(Object element) {
+		return "BindingTable";
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "KeyBindings Bla Bla Bla Bla Bla";
+		return "BindingTable bla bla bla";
 	}
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent, context, getMaster());
+			composite = createForm(parent, context);
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
-		viewer.setInput(o.getList());
-		getMaster().setValue(o.getOriginalParent());
+		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
-
+		
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Keybindings");
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
-			viewer = new TableViewer(parent);
+			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
 
@@ -135,6 +144,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 				column.getColumn().setWidth(170);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
+			
+			IEMFListProperty prop = EMFProperties.list(MApplicationPackage.Literals.BINDING_TABLE__BINDINGS);
+			viewer.setInput(prop.observeDetail(getMaster()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
@@ -207,6 +219,7 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MKeyBinding handler = MApplicationFactory.eINSTANCE.createKeyBinding();
+					System.err.println(getMaster().getValue());
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_TABLE__BINDINGS, handler);
 
 					if (cmd.canExecute()) {
@@ -233,14 +246,30 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 		}
-
+		
+		
 		return parent;
 	}
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
-		return null;
+		return BINDING_TABLE__BINDINGS.observe(element);
 	}
 
+	@Override
+	public String getDetailLabel(Object element) {
+		MBindingTable cmd = (MBindingTable) element;
+		if (cmd.getBindingContextId() != null && cmd.getBindingContextId().trim().length() > 0) {
+			return cmd.getBindingContextId();
+		}
+
+		return null;
+	}
+	
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] {
+			FeaturePath.fromList(MApplicationPackage.Literals.BINDING_TABLE__BINDING_CONTEXT_ID)	
+		};
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index 2490d727cc..a7eb29f9a3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -212,7 +212,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING, BINDING_CONTAINER__BINDINGS, element, "Bindings") {
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element, "BindingTables") {
 
 			@Override
 			protected boolean accepted(Object o) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 93a3627ae4..0ae7599a7c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -10,26 +10,48 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.util.List;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MBindingContainer;
+import org.eclipse.e4.ui.model.application.MBindingTable;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
 
 public class VBindingTableEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
+	private TableViewer viewer;
 	
 	public VBindingTableEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
+		this.editor = editor;
 	}
 	
 	@Override
@@ -54,6 +76,9 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent,context, getMaster());
 		}
+		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 	
@@ -62,6 +87,115 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 		
+		Label l = new Label(parent, SWT.NONE);
+		l.setText("Binding Tables");
+		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+		
+		viewer = new TableViewer(parent);
+		ObservableListContentProvider cp = new ObservableListContentProvider();
+		viewer.setContentProvider(cp);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.heightHint = 180;
+		viewer.getControl().setLayoutData(gd);
+		viewer.setLabelProvider(new ComponentLabelProvider(editor));
+				
+		Composite buttonComp = new Composite(parent, SWT.NONE);
+		buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+		GridLayout gl = new GridLayout();
+		gl.marginLeft=0;
+		gl.marginRight=0;
+		gl.marginWidth=0;
+		gl.marginHeight=0;
+		buttonComp.setLayout(gl);
+
+		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Up");
+		b.setImage(getImage(b.getDisplay(), ARROW_UP));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if( ! viewer.getSelection().isEmpty() ) {
+					IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+					if( s.size() == 1 ) {
+						Object obj = s.getFirstElement();
+						MBindingContainer container = (MBindingContainer) getMaster().getValue();
+						int idx = container.getBindingTables().indexOf(obj) - 1;
+						if( idx >= 0 ) {
+							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES, obj, idx);
+							
+							if( cmd.canExecute() ) {
+								getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+						
+					}
+				}
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Down");
+		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if( ! viewer.getSelection().isEmpty() ) {
+					IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+					if( s.size() == 1 ) {
+						Object obj = s.getFirstElement();
+						MBindingContainer container = (MBindingContainer) getMaster().getValue();
+						int idx = container.getBindingTables().indexOf(obj) + 1;
+						if( idx < container.getBindingTables().size() ) {
+							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES, obj, idx);
+							
+							if( cmd.canExecute() ) {
+								getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+						
+					}
+				}
+			}
+		});
+		
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Add ...");
+		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				MBindingTable command = MApplicationFactory.eINSTANCE.createBindingTable();
+				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES, command);
+				
+				if( cmd.canExecute() ) {
+					getEditingDomain().getCommandStack().execute(cmd);
+					editor.setSelection(command);
+				}
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Remove");
+		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if( ! viewer.getSelection().isEmpty() ) {
+					List<?> commands = ((IStructuredSelection)viewer.getSelection()).toList();
+					Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES, commands);
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+					}
+				}
+			}
+		});
+		
 		return parent;
 	}
 	

From d71b5c29d315d6690e7614467d4dbc9673b3bbb6 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 16 Mar 2010 21:55:42 +0000
Subject: [PATCH 0046/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * more bindings support

---
 .../common/component/ApplicationEditor.java   | 105 +++++++++++++++++-
 .../common/component/ToolBarEditor.java       |   1 -
 .../common/component/WindowEditor.java        |   1 -
 3 files changed, 104 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 190f096ac1..93605892cc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -19,14 +19,30 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class ApplicationEditor extends AbstractComponentEditor {
 
@@ -79,7 +95,94 @@ public Composite getEditor(Composite parent, Object object) {
 	}
 
 	protected Composite createForm(Composite parent, EMFDataBindingContext context) {
-		parent = new Composite(parent,SWT.NONE);
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+		}
+		
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Bindings");
+			
+			final ListViewer viewer = new ListViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 200;
+			viewer.getControl().setLayoutData(gd);
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MApplication container = (MApplication) getMaster().getValue();
+							int idx = container.getCommands().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MApplication container = (MApplication) getMaster().getValue();
+							int idx = container.getCommands().indexOf(obj) + 1;
+							if( idx < container.getCommands().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+		}
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 0a9eaebd12..552d287987 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -26,7 +26,6 @@
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MElementContainer;
 import org.eclipse.e4.ui.model.application.MHandler;
-import org.eclipse.e4.ui.model.application.MMenuItem;
 import org.eclipse.e4.ui.model.application.MToolItem;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 7db1cba282..a6ccf1913f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -47,7 +47,6 @@ public class WindowEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
-	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES);
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
 	public WindowEditor(EditingDomain editingDomain) {

From eeb6d3cbfb581bc2b0e88edfb435cd586b663df5 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 16 Mar 2010 22:02:46 +0000
Subject: [PATCH 0047/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * fixed classpath

---
 bundles/org.eclipse.e4.tools.emf.ui/.classpath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.classpath b/bundles/org.eclipse.e4.tools.emf.ui/.classpath
index 304e86186a..64c5e31b7a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.classpath
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
 	<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.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

From 96ea52058c1a8bb320cf09c704599e5ba2e61a87 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 16 Mar 2010 22:03:26 +0000
Subject: [PATCH 0048/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * fixed build.properties

---
 bundles/org.eclipse.e4.tools.emf.ui/build.properties | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/build.properties b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
index 6cf6ee0dc7..4ce589ce29 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
@@ -2,11 +2,13 @@
 # <copyright>
 # </copyright>
 #
-# $Id$
+# $Id: build.properties,v 1.1 2010/03/03 21:12:20 tschindl Exp $
 
 bin.includes = .,\
                META-INF/,\
-               plugin.properties
+               plugin.properties,\
+               icons/,\
+               about.html
 jars.compile.order = .
 source.. = src/
 output.. = bin/

From aef9b90706345c2e6c6ea654799f74925ef7ca50 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 16 Mar 2010 22:07:55 +0000
Subject: [PATCH 0049/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * new feature with correct name

---
 .../.project                                  | 17 ++++++++++
 .../build.properties                          |  1 +
 .../feature.xml                               | 33 +++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 features/org.eclipse.e4.core.tools.feature/.project
 create mode 100644 features/org.eclipse.e4.core.tools.feature/build.properties
 create mode 100644 features/org.eclipse.e4.core.tools.feature/feature.xml

diff --git a/features/org.eclipse.e4.core.tools.feature/.project b/features/org.eclipse.e4.core.tools.feature/.project
new file mode 100644
index 0000000000..d0fa7e4498
--- /dev/null
+++ b/features/org.eclipse.e4.core.tools.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.core.tools.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/org.eclipse.e4.core.tools.feature/build.properties b/features/org.eclipse.e4.core.tools.feature/build.properties
new file mode 100644
index 0000000000..64f93a9f0b
--- /dev/null
+++ b/features/org.eclipse.e4.core.tools.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
new file mode 100644
index 0000000000..3518aafe7b
--- /dev/null
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.e4.core.tools.feature"
+      label="Feature"
+      version="1.0.0.qualifier">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <plugin
+         id="org.eclipse.e4.tools.emf.editor3x"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.e4.tools.emf.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

From b20d6a1ac638060b9484219bb748dc5a94dfa25b Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 16 Mar 2010 22:33:46 +0000
Subject: [PATCH 0050/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * some more binding support

---
 .../common/component/ApplicationEditor.java   | 84 ++++++++++++++++++-
 1 file changed, 80 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 93605892cc..58dfde8fba 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -12,6 +12,8 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Arrays;
+import java.util.List;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
@@ -20,19 +22,27 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -57,7 +67,6 @@ public class ApplicationEditor extends AbstractComponentEditor {
 
 	public ApplicationEditor(EditingDomain editingDomain) {
 		super(editingDomain);
-		// TODO Auto-generated constructor stub
 	}
 
 	@Override
@@ -114,12 +123,42 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Bindings");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 			
-			final ListViewer viewer = new ListViewer(parent);
+			final Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			t.addKeyListener(new KeyAdapter() {
+				@Override
+				public void keyPressed(KeyEvent e) {
+					if (e.keyCode == SWT.CR || e.keyCode == SWT.LF) {
+						handleAddText(t);
+					}
+				}
+			});
+			
+			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setText("Add");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					handleAddText(t);
+				}
+			});
+			
+			new Label(parent, SWT.NONE);
+			
+			final TableViewer viewer = new TableViewer(parent);
+			viewer.setLabelProvider(new LabelProvider());
+			viewer.setContentProvider(new ObservableListContentProvider());
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 200;
 			viewer.getControl().setLayoutData(gd);
 			
+			IEMFListProperty prop = EMFProperties.list(MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS);
+			viewer.setInput(prop.observeDetail(getMaster()));
+			
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
 			GridLayout gl = new GridLayout();
@@ -129,7 +168,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 			gl.marginHeight=0;
 			buttonComp.setLayout(gl);
 
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Up");
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
@@ -182,10 +221,47 @@ public void widgetSelected(SelectionEvent e) {
 					}
 				}
 			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						MApplication el = (MApplication) getMaster().getValue();
+						List<?> ids = ((IStructuredSelection)viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), el, MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS, ids);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+							if( el.getBindingContexts().size() > 0 ) {
+								viewer.setSelection(new StructuredSelection(el.getBindingContexts().get(0)));
+							}
+						}
+					}
+				}
+			});
 		}
 
 		return parent;
 	}
+	
+	private void handleAddText( Text tagText) {
+		if (tagText.getText().trim().length() > 0) {
+			String[] tags = tagText.getText().split(";");
+			for( int i = 0; i < tags.length;i++ ) {
+				tags[i] = tags[i].trim();
+			}
+
+			MApplicationElement appEl = (MApplicationElement) getMaster().getValue();
+			Command cmd = AddCommand.create(getEditingDomain(), appEl, MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS, Arrays.asList(tags));
+			if (cmd.canExecute()) {
+				getEditingDomain().getCommandStack().execute(cmd);
+			}
+			tagText.setText("");
+		}
+	}
 
 	@Override
 	public IObservableList getChildList(Object element) {

From 1ac9acb7a7ffaa3d52d5798e18288928a53ee964 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 16 Mar 2010 23:42:29 +0000
Subject: [PATCH 0051/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * further improvements to the binding stuff

---
 .../common/component/BindingTableEditor.java  |  29 ++
 .../virtual/VBindingTableEditor.java          | 403 +++++++++++++-----
 2 files changed, 321 insertions(+), 111 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 31de9ed2f0..382baea5f1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -35,6 +35,8 @@
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -50,6 +52,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class BindingTableEditor extends AbstractComponentEditor {
 
@@ -104,6 +107,32 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 		
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+		}
+		
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Context Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.BINDING_TABLE__BINDING_CONTEXT_ID).observeDetail(getMaster()));
+
+			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setText("Find ...");			
+		}
+		
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Keybindings");
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 0ae7599a7c..46e18f6b13 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -10,28 +10,47 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MBindingContainer;
+import org.eclipse.e4.ui.model.application.MBindingContext;
 import org.eclipse.e4.ui.model.application.MBindingTable;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.IEMFValueProperty;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.databinding.viewers.ObservableListTreeContentProvider;
+import org.eclipse.jface.databinding.viewers.TreeStructureAdvisor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.TreeViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -47,163 +66,325 @@ public class VBindingTableEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
-	private TableViewer viewer;
-	
+	private TableViewer bindingViewer;
+	private TreeViewer contextsViewer;
+
 	public VBindingTableEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
 		this.editor = editor;
 	}
-	
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		return null;
 	}
+
 	@Override
 	public String getLabel(Object element) {
-		return "BindingTables";
+		return "Binding Configuration";
 	}
+
 	@Override
 	public String getDetailLabel(Object element) {
 		return null;
 	}
+
 	@Override
 	public String getDescription(Object element) {
-		return "BindingTables Bla Bla Bla Bla";
+		return "Binding Configuration Bla Bla Bla Bla";
 	}
+
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>)object;
-		viewer.setInput(o.getList());
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		bindingViewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
-	
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
-		
-		Label l = new Label(parent, SWT.NONE);
-		l.setText("Binding Tables");
-		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-		
-		viewer = new TableViewer(parent);
-		ObservableListContentProvider cp = new ObservableListContentProvider();
-		viewer.setContentProvider(cp);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.heightHint = 180;
-		viewer.getControl().setLayoutData(gd);
-		viewer.setLabelProvider(new ComponentLabelProvider(editor));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Contexts");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			contextsViewer = new TreeViewer(parent);
+			ObservableListTreeContentProvider pv = new ObservableListTreeContentProvider(new ObservableFactoryImpl(), new TreeStructureAdvisorImpl());
+			contextsViewer.setContentProvider(pv);
+			contextsViewer.getTree().setHeaderVisible(true);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 200;
+			contextsViewer.getControl().setLayoutData(gd);
+			
+			final WritableList list = new WritableList();
+			
+			IEMFValueProperty listProp = EMFProperties.value(MApplicationPackage.Literals.BINDING_CONTAINER__ROOT_CONTEXT);
+			IObservableValue val = listProp.observeDetail(getMaster());
+			val.addValueChangeListener(new IValueChangeListener() {
+				
+				public void handleValueChange(ValueChangeEvent event) {
+					list.clear();
+					MBindingContext ctx = (MBindingContext) event.getObservableValue().getValue();
+					if( ctx != null ) {
+						list.add(ctx);	
+					}
+				}
+			});
+			
+			
+			contextsViewer.setInput(list);
+			
+			
+			{
+				IEMFValueProperty prop = EMFProperties.value(MApplicationPackage.Literals.BINDING_CONTEXT__NAME);
 				
-		Composite buttonComp = new Composite(parent, SWT.NONE);
-		buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-		GridLayout gl = new GridLayout();
-		gl.marginLeft=0;
-		gl.marginRight=0;
-		gl.marginWidth=0;
-		gl.marginHeight=0;
-		buttonComp.setLayout(gl);
-
-		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Up");
-		b.setImage(getImage(b.getDisplay(), ARROW_UP));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if( ! viewer.getSelection().isEmpty() ) {
-					IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-					if( s.size() == 1 ) {
-						Object obj = s.getFirstElement();
-						MBindingContainer container = (MBindingContainer) getMaster().getValue();
-						int idx = container.getBindingTables().indexOf(obj) - 1;
-						if( idx >= 0 ) {
-							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES, obj, idx);
-							
-							if( cmd.canExecute() ) {
-								getEditingDomain().getCommandStack().execute(cmd);
-								viewer.setSelection(new StructuredSelection(obj));
+				TreeViewerColumn column = new TreeViewerColumn(contextsViewer, SWT.NONE);
+				column.getColumn().setText("Name");
+				column.getColumn().setWidth(200);				
+				column.setLabelProvider(new ObservableColumnLabelProvider<MBindingContext>(prop.observeDetail(pv.getKnownElements())));				
+			}
+			
+			{
+				IEMFValueProperty prop = EMFProperties.value(MApplicationPackage.Literals.BINDING_CONTEXT__DESCRIPTION);
+				
+				TreeViewerColumn column = new TreeViewerColumn(contextsViewer, SWT.NONE);
+				column.getColumn().setText("Description");
+				column.getColumn().setWidth(200);				
+				column.setLabelProvider(new ObservableColumnLabelProvider<MBindingContext>(prop.observeDetail(pv.getKnownElements())));				
+			}
+			
+			{
+				IEMFValueProperty prop = EMFProperties.value(MApplicationPackage.Literals.APPLICATION_ELEMENT__ID);
+				
+				TreeViewerColumn column = new TreeViewerColumn(contextsViewer, SWT.NONE);
+				column.getColumn().setText("Id");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MBindingContext>(prop.observeDetail(pv.getKnownElements())));				
+			}
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+			
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					IStructuredSelection s = (IStructuredSelection) contextsViewer.getSelection();
+					MBindingContext context = MApplicationFactory.eINSTANCE.createBindingContext();
+					MBindingContext parentContext = null;
+					
+					if( ! s.isEmpty() ) {
+						parentContext = (MBindingContext) s.getFirstElement();
+						Command cmd = AddCommand.create(getEditingDomain(), parentContext, MApplicationPackage.Literals.BINDING_CONTEXT__CHILDREN, context);
+						
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+							contextsViewer.setSelection(new StructuredSelection(context));
+						}
+					} else if( s.isEmpty() && ((MBindingContainer)getMaster().getValue()).getRootContext() == null ) {
+						Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__ROOT_CONTEXT, context);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+							contextsViewer.setSelection(new StructuredSelection(context));
+						}
+					}
+					
+					
+				}
+			});
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					IStructuredSelection s = (IStructuredSelection) contextsViewer.getSelection();
+					if( ! s.isEmpty() ) {
+						List<Command> commands = new ArrayList<Command>();
+						
+						for( Object o : s.toArray() ) {
+							MBindingContext ctx = (MBindingContext) o;
+							EObject owner = ((EObject)ctx).eContainer();
+							if( owner instanceof MBindingContainer ) {
+								Command cmd = SetCommand.create(getEditingDomain(), owner, MApplicationPackage.Literals.BINDING_CONTAINER__ROOT_CONTEXT, null);
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									return;
+								}
+							} else {
+								commands.add(RemoveCommand.create(getEditingDomain(), owner, MApplicationPackage.Literals.BINDING_CONTEXT__CHILDREN, ctx));
 							}
 						}
 						
+						CompoundCommand cmd = new CompoundCommand(commands);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
 					}
 				}
-			}
-		});
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Down");
-		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if( ! viewer.getSelection().isEmpty() ) {
-					IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-					if( s.size() == 1 ) {
-						Object obj = s.getFirstElement();
-						MBindingContainer container = (MBindingContainer) getMaster().getValue();
-						int idx = container.getBindingTables().indexOf(obj) + 1;
-						if( idx < container.getBindingTables().size() ) {
-							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES, obj, idx);
-							
-							if( cmd.canExecute() ) {
-								getEditingDomain().getCommandStack().execute(cmd);
-								viewer.setSelection(new StructuredSelection(obj));
+			});
+		}
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Binding Tables");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			bindingViewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			bindingViewer.setContentProvider(cp);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 180;
+			bindingViewer.getControl().setLayoutData(gd);
+			bindingViewer.setLabelProvider(new ComponentLabelProvider(editor));
+
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!bindingViewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) bindingViewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MBindingContainer container = (MBindingContainer) getMaster().getValue();
+							int idx = container.getBindingTables().indexOf(obj) - 1;
+							if (idx >= 0) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									bindingViewer.setSelection(new StructuredSelection(obj));
+								}
 							}
+
 						}
-						
 					}
 				}
-			}
-		});
-		
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Add ...");
-		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				MBindingTable command = MApplicationFactory.eINSTANCE.createBindingTable();
-				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES, command);
-				
-				if( cmd.canExecute() ) {
-					getEditingDomain().getCommandStack().execute(cmd);
-					editor.setSelection(command);
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!bindingViewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) bindingViewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MBindingContainer container = (MBindingContainer) getMaster().getValue();
+							int idx = container.getBindingTables().indexOf(obj) + 1;
+							if (idx < container.getBindingTables().size()) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									bindingViewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
 				}
-			}
-		});
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Remove");
-		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if( ! viewer.getSelection().isEmpty() ) {
-					List<?> commands = ((IStructuredSelection)viewer.getSelection()).toList();
-					Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES, commands);
-					if( cmd.canExecute() ) {
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MBindingTable command = MApplicationFactory.eINSTANCE.createBindingTable();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES, command);
+
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(command);
 					}
 				}
-			}
-		});
-		
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!bindingViewer.getSelection().isEmpty()) {
+						List<?> commands = ((IStructuredSelection) bindingViewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES, commands);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+
 		return parent;
 	}
-	
-	
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
+	private class ObservableFactoryImpl implements IObservableFactory {
+		private IEMFListProperty prop = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTEXT__CHILDREN);
+		
+		public IObservable createObservable(Object target) {
+			if( target instanceof IObservableList ) {
+				return (IObservable) target;
+			}
+			return prop.observe(target);
+		}
+	}
+	
+	private class TreeStructureAdvisorImpl extends TreeStructureAdvisor {
+		
+	}
 }

From f52f55738e0888df0166b136b2d3f5588f26ca57 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 16 Mar 2010 23:50:50 +0000
Subject: [PATCH 0052/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * added editing for new binding contexts

---
 .../virtual/VBindingTableEditor.java          | 105 +++++++++++++++++-
 1 file changed, 104 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 46e18f6b13..2f9cd418dd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -46,12 +46,20 @@
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ObservableListTreeContentProvider;
 import org.eclipse.jface.databinding.viewers.TreeStructureAdvisor;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.ColumnViewerEditor;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
+import org.eclipse.jface.viewers.EditingSupport;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.TreeViewerColumn;
+import org.eclipse.jface.viewers.TreeViewerEditor;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -148,7 +156,34 @@ public void handleValueChange(ValueChangeEvent event) {
 				TreeViewerColumn column = new TreeViewerColumn(contextsViewer, SWT.NONE);
 				column.getColumn().setText("Name");
 				column.getColumn().setWidth(200);				
-				column.setLabelProvider(new ObservableColumnLabelProvider<MBindingContext>(prop.observeDetail(pv.getKnownElements())));				
+				column.setLabelProvider(new ObservableColumnLabelProvider<MBindingContext>(prop.observeDetail(pv.getKnownElements())));
+				column.setEditingSupport(new EditingSupport(contextsViewer) {
+					private TextCellEditor editor = new TextCellEditor(contextsViewer.getTree());
+					
+					@Override
+					protected void setValue(Object element, Object value) {
+						Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.BINDING_CONTEXT__NAME, value);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+					
+					@Override
+					protected Object getValue(Object element) {
+						MBindingContext ctx = (MBindingContext) element; 
+						return ctx.getName() != null ? ctx.getName() : "";
+					}
+					
+					@Override
+					protected CellEditor getCellEditor(Object element) {
+						return editor;
+					}
+					
+					@Override
+					protected boolean canEdit(Object element) {
+						return true;
+					}
+				});
 			}
 			
 			{
@@ -158,6 +193,33 @@ public void handleValueChange(ValueChangeEvent event) {
 				column.getColumn().setText("Description");
 				column.getColumn().setWidth(200);				
 				column.setLabelProvider(new ObservableColumnLabelProvider<MBindingContext>(prop.observeDetail(pv.getKnownElements())));				
+				column.setEditingSupport(new EditingSupport(contextsViewer) {
+					private TextCellEditor editor = new TextCellEditor(contextsViewer.getTree());
+					
+					@Override
+					protected void setValue(Object element, Object value) {
+						Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.BINDING_CONTEXT__DESCRIPTION, value);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+					
+					@Override
+					protected Object getValue(Object element) {
+						MBindingContext ctx = (MBindingContext) element; 
+						return ctx.getName() != null ? ctx.getDescription() : "";
+					}
+					
+					@Override
+					protected CellEditor getCellEditor(Object element) {
+						return editor;
+					}
+					
+					@Override
+					protected boolean canEdit(Object element) {
+						return true;
+					}
+				});
 			}
 			
 			{
@@ -167,8 +229,49 @@ public void handleValueChange(ValueChangeEvent event) {
 				column.getColumn().setText("Id");
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MBindingContext>(prop.observeDetail(pv.getKnownElements())));				
+				column.setEditingSupport(new EditingSupport(contextsViewer) {
+					private TextCellEditor editor = new TextCellEditor(contextsViewer.getTree());
+					
+					@Override
+					protected void setValue(Object element, Object value) {
+						Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID, value);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+					
+					@Override
+					protected Object getValue(Object element) {
+						MBindingContext ctx = (MBindingContext) element; 
+						return ctx.getName() != null ? ctx.getId() : "";
+					}
+					
+					@Override
+					protected CellEditor getCellEditor(Object element) {
+						return editor;
+					}
+					
+					@Override
+					protected boolean canEdit(Object element) {
+						return true;
+					}
+				});
 			}
 			
+			ColumnViewerEditorActivationStrategy editorActivationStrategy = new ColumnViewerEditorActivationStrategy(contextsViewer) {
+				@Override
+				protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
+					boolean singleSelect = ((IStructuredSelection)contextsViewer.getSelection()).size() == 1;
+					boolean isLeftDoubleMouseSelect = event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION && ((MouseEvent)event.sourceEvent).button == 1;
+
+					return singleSelect && (isLeftDoubleMouseSelect
+							|| event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC
+							|| event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
+				}
+			};
+			TreeViewerEditor.create(contextsViewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
+
+			
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
 			GridLayout gl = new GridLayout();

From 3c6f96c5cc5b7bc10250d21b217096747c1220d7 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 16 Mar 2010 23:56:18 +0000
Subject: [PATCH 0053/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * small editing fix

---
 .../common/component/virtual/VBindingTableEditor.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 2f9cd418dd..9c3df275a6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -207,7 +207,7 @@ protected void setValue(Object element, Object value) {
 					@Override
 					protected Object getValue(Object element) {
 						MBindingContext ctx = (MBindingContext) element; 
-						return ctx.getName() != null ? ctx.getDescription() : "";
+						return ctx.getDescription() != null ? ctx.getDescription() : "";
 					}
 					
 					@Override
@@ -243,7 +243,7 @@ protected void setValue(Object element, Object value) {
 					@Override
 					protected Object getValue(Object element) {
 						MBindingContext ctx = (MBindingContext) element; 
-						return ctx.getName() != null ? ctx.getId() : "";
+						return ctx.getId() != null ? ctx.getId() : "";
 					}
 					
 					@Override

From 2ecbd68c02bf42904c77cef7e56bbd7251863288 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 17 Mar 2010 01:08:01 +0000
Subject: [PATCH 0054/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * add support for command definition on keybinding

---
 .../META-INF/MANIFEST.MF                      |   3 +-
 .../tools/emf/ui/internal/PatternFilter.java  | 356 ++++++++++++++
 .../tools/emf/ui/internal/StringMatcher.java  | 451 ++++++++++++++++++
 .../emf/ui/internal/common/ModelEditor.java   |   2 +-
 .../common/component/KeyBindingEditor.java    |  16 +-
 .../KeyBindingCommandSelectionDialog.java     | 167 +++++++
 6 files changed, 990 insertions(+), 5 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 885f1af4ab..5ff5f9cccd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.emf.edit;bundle-version="2.6.0",
  org.eclipse.equinox.common;bundle-version="3.6.0",
  org.eclipse.e4.ui.model.workbench.edit;bundle-version="0.9.1",
- org.eclipse.emf.databinding.edit;bundle-version="1.2.0"
+ org.eclipse.emf.databinding.edit;bundle-version="1.2.0",
+ com.ibm.icu;bundle-version="4.2.1"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.osgi.framework;version="1.5.0"
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
new file mode 100644
index 0000000000..23ff9a5051
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
@@ -0,0 +1,356 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jface.viewers.AbstractTreeViewer;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+
+import com.ibm.icu.text.BreakIterator;
+
+/**
+ * A filter used in conjunction with <code>FilteredTree</code>. In order to
+ * determine if a node should be filtered it uses the content and label provider
+ * of the tree to do pattern matching on its children. This causes the entire
+ * tree structure to be realized. Note that the label provider must implement
+ * ILabelProvider.
+ * 
+ * @see org.eclipse.ui.dialogs.FilteredTree
+ * @since 3.2
+ */
+public class PatternFilter extends ViewerFilter {
+	/*
+	 * Cache of filtered elements in the tree
+	 */
+    private Map cache = new HashMap();
+    
+    /*
+     * Maps parent elements to TRUE or FALSE
+     */
+    private Map foundAnyCache = new HashMap();
+    
+    private boolean useCache = false;
+    
+	/**
+	 * Whether to include a leading wildcard for all provided patterns.  A
+	 * trailing wildcard is always included.
+	 */
+	private boolean includeLeadingWildcard = false;
+
+	/**
+	 * The string pattern matcher used for this pattern filter.  
+	 */
+    private StringMatcher matcher;
+    
+    private boolean useEarlyReturnIfMatcherIsNull = true;
+    
+    private static Object[] EMPTY = new Object[0];
+
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.viewers.ViewerFilter#filter(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object[])
+     */
+    public final Object[] filter(Viewer viewer, Object parent, Object[] elements) {
+    	// we don't want to optimize if we've extended the filter ... this
+    	// needs to be addressed in 3.4
+    	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=186404
+        if (matcher == null && useEarlyReturnIfMatcherIsNull) {
+			return elements;
+		}
+
+        if (!useCache) {
+        	return super.filter(viewer, parent, elements);
+        }
+        
+        Object[] filtered = (Object[]) cache.get(parent);
+        if (filtered == null) {
+        	Boolean foundAny = (Boolean) foundAnyCache.get(parent);
+        	if (foundAny != null && !foundAny.booleanValue()) {
+        		filtered = EMPTY;
+        	} else {
+        		filtered = super.filter(viewer, parent, elements);
+        	}
+            cache.put(parent, filtered);
+        }
+        return filtered;
+    }
+
+    /**
+     * Returns true if any of the elements makes it through the filter.
+     * This method uses caching if enabled; the computation is done in
+     * computeAnyVisible.
+     *  
+     * @param viewer
+     * @param parent
+     * @param elements the elements (must not be an empty array)
+     * @return true if any of the elements makes it through the filter.
+     */
+    private boolean isAnyVisible(Viewer viewer, Object parent, Object[] elements) {
+    	if (matcher == null) {
+    		return true;
+    	}
+    	
+    	if (!useCache) {
+    		return computeAnyVisible(viewer, elements);
+    	}
+    	
+    	Object[] filtered = (Object[]) cache.get(parent);
+    	if (filtered != null) {
+    		return filtered.length > 0;
+    	}
+    	Boolean foundAny = (Boolean) foundAnyCache.get(parent);
+    	if (foundAny == null) {
+    		foundAny = computeAnyVisible(viewer, elements) ? Boolean.TRUE : Boolean.FALSE;
+    		foundAnyCache.put(parent, foundAny);
+    	}
+    	return foundAny.booleanValue();
+    }
+
+	/**
+	 * Returns true if any of the elements makes it through the filter.
+	 * 
+	 * @param viewer the viewer
+	 * @param elements the elements to test
+	 * @return <code>true</code> if any of the elements makes it through the filter
+	 */
+	private boolean computeAnyVisible(Viewer viewer, Object[] elements) {
+		boolean elementFound = false;
+		for (int i = 0; i < elements.length && !elementFound; i++) {
+			Object element = elements[i];
+			elementFound = isElementVisible(viewer, element);
+		}
+		return elementFound;
+	}
+    
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+     */
+    public final boolean select(Viewer viewer, Object parentElement,
+			Object element) {
+        return isElementVisible(viewer, element);
+    }
+    
+    /**
+	 * Sets whether a leading wildcard should be attached to each pattern
+	 * string.
+	 * 
+	 * @param includeLeadingWildcard
+	 *            Whether a leading wildcard should be added.
+	 */
+	public final void setIncludeLeadingWildcard(
+			final boolean includeLeadingWildcard) {
+		this.includeLeadingWildcard = includeLeadingWildcard;
+	}
+
+    /**
+     * The pattern string for which this filter should select 
+     * elements in the viewer.
+     * 
+     * @param patternString
+     */
+    public void setPattern(String patternString) {
+    	// these 2 strings allow the PatternFilter to be extended in
+    	// 3.3 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=186404
+    	if ("org.eclipse.ui.keys.optimization.true".equals(patternString)) { //$NON-NLS-1$
+    		useEarlyReturnIfMatcherIsNull = true;
+    		return;
+    	} else if ("org.eclipse.ui.keys.optimization.false".equals(patternString)) { //$NON-NLS-1$
+    		useEarlyReturnIfMatcherIsNull = false;
+    		return;
+    	}
+        clearCaches();
+        if (patternString == null || patternString.equals("")) { //$NON-NLS-1$
+			matcher = null;
+		} else {
+			String pattern = patternString + "*"; //$NON-NLS-1$
+			if (includeLeadingWildcard) {
+				pattern = "*" + pattern; //$NON-NLS-1$
+			}
+			matcher = new StringMatcher(pattern, true, false);
+		}
+    }
+
+	/**
+	 * Clears the caches used for optimizing this filter. Needs to be called whenever
+	 * the tree content changes.
+	 */
+	/* package */ void clearCaches() {
+		cache.clear();
+        foundAnyCache.clear();
+	}
+
+    /**
+     * Answers whether the given String matches the pattern.
+     * 
+     * @param string the String to test
+     * 
+     * @return whether the string matches the pattern
+     */
+    private boolean match(String string) {
+    	if (matcher == null) {
+			return true;
+		}
+        return matcher.match(string);
+    }
+    
+    /**
+     * Answers whether the given element is a valid selection in 
+     * the filtered tree.  For example, if a tree has items that 
+     * are categorized, the category itself may  not be a valid 
+     * selection since it is used merely to organize the elements.
+     * 
+     * @param element
+     * @return true if this element is eligible for automatic selection
+     */
+    public boolean isElementSelectable(Object element){
+    	return element != null;
+    }
+    
+    /**
+     * Answers whether the given element in the given viewer matches
+     * the filter pattern.  This is a default implementation that will 
+     * show a leaf element in the tree based on whether the provided  
+     * filter text matches the text of the given element's text, or that 
+     * of it's children (if the element has any).  
+     * 
+     * Subclasses may override this method.
+     * 
+     * @param viewer the tree viewer in which the element resides
+     * @param element the element in the tree to check for a match
+     * 
+     * @return true if the element matches the filter pattern
+     */
+    public boolean isElementVisible(Viewer viewer, Object element){
+    	return isParentMatch(viewer, element) || isLeafMatch(viewer, element);
+    }
+    
+    /**
+     * Check if the parent (category) is a match to the filter text.  The default 
+     * behavior returns true if the element has at least one child element that is 
+     * a match with the filter text.
+     * 
+     * Subclasses may override this method.
+     * 
+     * @param viewer the viewer that contains the element
+     * @param element the tree element to check
+     * @return true if the given element has children that matches the filter text
+     */
+    protected boolean isParentMatch(Viewer viewer, Object element){
+        Object[] children = ((ITreeContentProvider) ((AbstractTreeViewer) viewer)
+                .getContentProvider()).getChildren(element);
+
+        if ((children != null) && (children.length > 0)) {
+			return isAnyVisible(viewer, element, children);
+		}	
+        return false;
+    }
+    
+    /**
+     * Check if the current (leaf) element is a match with the filter text.  
+     * The default behavior checks that the label of the element is a match. 
+     * 
+     * Subclasses should override this method.
+     * 
+     * @param viewer the viewer that contains the element
+     * @param element the tree element to check
+     * @return true if the given element's label matches the filter text
+     */
+    protected boolean isLeafMatch(Viewer viewer, Object element){
+        String labelText = ((ILabelProvider) ((StructuredViewer) viewer)
+                .getLabelProvider()).getText(element);
+        
+        if(labelText == null) {
+			return false;
+		}
+        return wordMatches(labelText);  
+    }
+    
+    /**
+     * Take the given filter text and break it down into words using a 
+     * BreakIterator.  
+     * 
+     * @param text
+     * @return an array of words
+     */
+    private String[] getWords(String text){
+    	List words = new ArrayList();
+		// Break the text up into words, separating based on whitespace and
+		// common punctuation.
+		// Previously used String.split(..., "\\W"), where "\W" is a regular
+		// expression (see the Javadoc for class Pattern).
+		// Need to avoid both String.split and regular expressions, in order to
+		// compile against JCL Foundation (bug 80053).
+		// Also need to do this in an NL-sensitive way. The use of BreakIterator
+		// was suggested in bug 90579.
+		BreakIterator iter = BreakIterator.getWordInstance();
+		iter.setText(text);
+		int i = iter.first();
+		while (i != java.text.BreakIterator.DONE && i < text.length()) {
+			int j = iter.following(i);
+			if (j == java.text.BreakIterator.DONE) {
+				j = text.length();
+			}
+			// match the word
+			if (Character.isLetterOrDigit(text.charAt(i))) {
+				String word = text.substring(i, j);
+				words.add(word);
+			}
+			i = j;
+		}
+		return (String[]) words.toArray(new String[words.size()]);
+    }
+    
+	/**
+	 * Return whether or not if any of the words in text satisfy the
+	 * match critera.
+	 * 
+	 * @param text the text to match
+	 * @return boolean <code>true</code> if one of the words in text 
+	 * 					satisifes the match criteria.
+	 */
+	protected boolean wordMatches(String text) {
+		if (text == null) {
+			return false;
+		}
+		
+		//If the whole text matches we are all set
+		if(match(text)) {
+			return true;
+		}
+		
+		// Otherwise check if any of the words of the text matches
+		String[] words = getWords(text);
+		for (int i = 0; i < words.length; i++) {
+			String word = words[i];
+			if (match(word)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Can be called by the filtered tree to turn on caching.
+	 * 
+	 * @param useCache The useCache to set.
+	 */
+	void setUseCache(boolean useCache) {
+		this.useCache = useCache;
+	}    
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
new file mode 100644
index 0000000000..ddde765f1c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
@@ -0,0 +1,451 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal;
+
+import java.util.Vector;
+
+/**
+ * A string pattern matcher, suppporting "*" and "?" wildcards.
+ */
+public class StringMatcher {
+    protected String fPattern;
+
+    protected int fLength; // pattern length
+
+    protected boolean fIgnoreWildCards;
+
+    protected boolean fIgnoreCase;
+
+    protected boolean fHasLeadingStar;
+
+    protected boolean fHasTrailingStar;
+
+    protected String fSegments[]; //the given pattern is split into * separated segments
+
+    /* boundary value beyond which we don't need to search in the text */
+    protected int fBound = 0;
+
+    protected static final char fSingleWildCard = '\u0000';
+
+    public static class Position {
+        int start; //inclusive
+
+        int end; //exclusive
+
+        public Position(int start, int end) {
+            this.start = start;
+            this.end = end;
+        }
+
+        public int getStart() {
+            return start;
+        }
+
+        public int getEnd() {
+            return end;
+        }
+    }
+
+    /**
+     * StringMatcher constructor takes in a String object that is a simple 
+     * pattern which may contain '*' for 0 and many characters and
+     * '?' for exactly one character.  
+     *
+     * Literal '*' and '?' characters must be escaped in the pattern 
+     * e.g., "\*" means literal "*", etc.
+     *
+     * Escaping any other character (including the escape character itself), 
+     * just results in that character in the pattern.
+     * e.g., "\a" means "a" and "\\" means "\"
+     *
+     * If invoking the StringMatcher with string literals in Java, don't forget
+     * escape characters are represented by "\\".
+     *
+     * @param pattern the pattern to match text against
+     * @param ignoreCase if true, case is ignored
+     * @param ignoreWildCards if true, wild cards and their escape sequences are ignored
+     * 		  (everything is taken literally).
+     */
+    public StringMatcher(String pattern, boolean ignoreCase,
+            boolean ignoreWildCards) {
+        if (pattern == null) {
+			throw new IllegalArgumentException();
+		}
+        fIgnoreCase = ignoreCase;
+        fIgnoreWildCards = ignoreWildCards;
+        fPattern = pattern;
+        fLength = pattern.length();
+
+        if (fIgnoreWildCards) {
+            parseNoWildCards();
+        } else {
+            parseWildCards();
+        }
+    }
+
+    /**
+     * Find the first occurrence of the pattern between <code>start</code)(inclusive) 
+     * and <code>end</code>(exclusive).  
+     * @param text the String object to search in 
+     * @param start the starting index of the search range, inclusive
+     * @param end the ending index of the search range, exclusive
+     * @return an <code>StringMatcher.Position</code> object that keeps the starting 
+     * (inclusive) and ending positions (exclusive) of the first occurrence of the 
+     * pattern in the specified range of the text; return null if not found or subtext
+     * is empty (start==end). A pair of zeros is returned if pattern is empty string
+     * Note that for pattern like "*abc*" with leading and trailing stars, position of "abc"
+     * is returned. For a pattern like"*??*" in text "abcdf", (1,3) is returned
+     */
+    public StringMatcher.Position find(String text, int start, int end) {
+        if (text == null) {
+			throw new IllegalArgumentException();
+		}
+
+        int tlen = text.length();
+        if (start < 0) {
+			start = 0;
+		}
+        if (end > tlen) {
+			end = tlen;
+		}
+        if (end < 0 || start >= end) {
+			return null;
+		}
+        if (fLength == 0) {
+			return new Position(start, start);
+		}
+        if (fIgnoreWildCards) {
+            int x = posIn(text, start, end);
+            if (x < 0) {
+				return null;
+			}
+            return new Position(x, x + fLength);
+        }
+
+        int segCount = fSegments.length;
+        if (segCount == 0) {
+			return new Position(start, end);
+		}
+
+        int curPos = start;
+        int matchStart = -1;
+        int i;
+        for (i = 0; i < segCount && curPos < end; ++i) {
+            String current = fSegments[i];
+            int nextMatch = regExpPosIn(text, curPos, end, current);
+            if (nextMatch < 0) {
+				return null;
+			}
+            if (i == 0) {
+				matchStart = nextMatch;
+			}
+            curPos = nextMatch + current.length();
+        }
+        if (i < segCount) {
+			return null;
+		}
+        return new Position(matchStart, curPos);
+    }
+
+    /**
+     * match the given <code>text</code> with the pattern 
+     * @return true if matched otherwise false
+     * @param text a String object 
+     */
+    public boolean match(String text) {
+    	if(text == null) {
+			return false;
+		}
+        return match(text, 0, text.length());
+    }
+
+    /**
+     * Given the starting (inclusive) and the ending (exclusive) positions in the   
+     * <code>text</code>, determine if the given substring matches with aPattern  
+     * @return true if the specified portion of the text matches the pattern
+     * @param text a String object that contains the substring to match 
+     * @param start marks the starting position (inclusive) of the substring
+     * @param end marks the ending index (exclusive) of the substring 
+     */
+    public boolean match(String text, int start, int end) {
+        if (null == text) {
+			throw new IllegalArgumentException();
+		}
+
+        if (start > end) {
+			return false;
+		}
+
+        if (fIgnoreWildCards) {
+			return (end - start == fLength)
+                    && fPattern.regionMatches(fIgnoreCase, 0, text, start,
+                            fLength);
+		}
+        int segCount = fSegments.length;
+        if (segCount == 0 && (fHasLeadingStar || fHasTrailingStar)) {
+			return true;
+		}
+        if (start == end) {
+			return fLength == 0;
+		}
+        if (fLength == 0) {
+			return start == end;
+		}
+
+        int tlen = text.length();
+        if (start < 0) {
+			start = 0;
+		}
+        if (end > tlen) {
+			end = tlen;
+		}
+
+        int tCurPos = start;
+        int bound = end - fBound;
+        if (bound < 0) {
+			return false;
+		}
+        int i = 0;
+        String current = fSegments[i];
+        int segLength = current.length();
+
+        /* process first segment */
+        if (!fHasLeadingStar) {
+            if (!regExpRegionMatches(text, start, current, 0, segLength)) {
+                return false;
+            } else {
+                ++i;
+                tCurPos = tCurPos + segLength;
+            }
+        }
+        if ((fSegments.length == 1) && (!fHasLeadingStar)
+                && (!fHasTrailingStar)) {
+            // only one segment to match, no wildcards specified
+            return tCurPos == end;
+        }
+        /* process middle segments */
+        while (i < segCount) {
+            current = fSegments[i];
+            int currentMatch;
+            int k = current.indexOf(fSingleWildCard);
+            if (k < 0) {
+                currentMatch = textPosIn(text, tCurPos, end, current);
+                if (currentMatch < 0) {
+					return false;
+				}
+            } else {
+                currentMatch = regExpPosIn(text, tCurPos, end, current);
+                if (currentMatch < 0) {
+					return false;
+				}
+            }
+            tCurPos = currentMatch + current.length();
+            i++;
+        }
+
+        /* process final segment */
+        if (!fHasTrailingStar && tCurPos != end) {
+            int clen = current.length();
+            return regExpRegionMatches(text, end - clen, current, 0, clen);
+        }
+        return i == segCount;
+    }
+
+    /**
+     * This method parses the given pattern into segments seperated by wildcard '*' characters.
+     * Since wildcards are not being used in this case, the pattern consists of a single segment.
+     */
+    private void parseNoWildCards() {
+        fSegments = new String[1];
+        fSegments[0] = fPattern;
+        fBound = fLength;
+    }
+
+    /**
+     * Parses the given pattern into segments seperated by wildcard '*' characters.
+     * @param p, a String object that is a simple regular expression with '*' and/or '?'
+     */
+    private void parseWildCards() {
+        if (fPattern.startsWith("*")) { //$NON-NLS-1$
+			fHasLeadingStar = true;
+		}
+        if (fPattern.endsWith("*")) {//$NON-NLS-1$
+            /* make sure it's not an escaped wildcard */
+            if (fLength > 1 && fPattern.charAt(fLength - 2) != '\\') {
+                fHasTrailingStar = true;
+            }
+        }
+
+        Vector temp = new Vector();
+
+        int pos = 0;
+        StringBuffer buf = new StringBuffer();
+        while (pos < fLength) {
+            char c = fPattern.charAt(pos++);
+            switch (c) {
+            case '\\':
+                if (pos >= fLength) {
+                    buf.append(c);
+                } else {
+                    char next = fPattern.charAt(pos++);
+                    /* if it's an escape sequence */
+                    if (next == '*' || next == '?' || next == '\\') {
+                        buf.append(next);
+                    } else {
+                        /* not an escape sequence, just insert literally */
+                        buf.append(c);
+                        buf.append(next);
+                    }
+                }
+                break;
+            case '*':
+                if (buf.length() > 0) {
+                    /* new segment */
+                    temp.addElement(buf.toString());
+                    fBound += buf.length();
+                    buf.setLength(0);
+                }
+                break;
+            case '?':
+                /* append special character representing single match wildcard */
+                buf.append(fSingleWildCard);
+                break;
+            default:
+                buf.append(c);
+            }
+        }
+
+        /* add last buffer to segment list */
+        if (buf.length() > 0) {
+            temp.addElement(buf.toString());
+            fBound += buf.length();
+        }
+
+        fSegments = new String[temp.size()];
+        temp.copyInto(fSegments);
+    }
+
+    /** 
+     * @param text a string which contains no wildcard
+     * @param start the starting index in the text for search, inclusive
+     * @param end the stopping point of search, exclusive
+     * @return the starting index in the text of the pattern , or -1 if not found 
+     */
+    protected int posIn(String text, int start, int end) {//no wild card in pattern
+        int max = end - fLength;
+
+        if (!fIgnoreCase) {
+            int i = text.indexOf(fPattern, start);
+            if (i == -1 || i > max) {
+				return -1;
+			}
+            return i;
+        }
+
+        for (int i = start; i <= max; ++i) {
+            if (text.regionMatches(true, i, fPattern, 0, fLength)) {
+				return i;
+			}
+        }
+
+        return -1;
+    }
+
+    /** 
+     * @param text a simple regular expression that may only contain '?'(s)
+     * @param start the starting index in the text for search, inclusive
+     * @param end the stopping point of search, exclusive
+     * @param p a simple regular expression that may contains '?'
+     * @return the starting index in the text of the pattern , or -1 if not found 
+     */
+    protected int regExpPosIn(String text, int start, int end, String p) {
+        int plen = p.length();
+
+        int max = end - plen;
+        for (int i = start; i <= max; ++i) {
+            if (regExpRegionMatches(text, i, p, 0, plen)) {
+				return i;
+			}
+        }
+        return -1;
+    }
+
+    /**
+     * 
+     * @return boolean
+     * @param text a String to match
+     * @param start int that indicates the starting index of match, inclusive
+     * @param end</code> int that indicates the ending index of match, exclusive
+     * @param p String,  String, a simple regular expression that may contain '?'
+     * @param ignoreCase boolean indicating wether code>p</code> is case sensitive
+     */
+    protected boolean regExpRegionMatches(String text, int tStart, String p,
+            int pStart, int plen) {
+        while (plen-- > 0) {
+            char tchar = text.charAt(tStart++);
+            char pchar = p.charAt(pStart++);
+
+            /* process wild cards */
+            if (!fIgnoreWildCards) {
+                /* skip single wild cards */
+                if (pchar == fSingleWildCard) {
+                    continue;
+                }
+            }
+            if (pchar == tchar) {
+				continue;
+			}
+            if (fIgnoreCase) {
+                if (Character.toUpperCase(tchar) == Character
+                        .toUpperCase(pchar)) {
+					continue;
+				}
+                // comparing after converting to upper case doesn't handle all cases;
+                // also compare after converting to lower case
+                if (Character.toLowerCase(tchar) == Character
+                        .toLowerCase(pchar)) {
+					continue;
+				}
+            }
+            return false;
+        }
+        return true;
+    }
+
+    /** 
+     * @param text the string to match
+     * @param start the starting index in the text for search, inclusive
+     * @param end the stopping point of search, exclusive
+     * @param p a pattern string that has no wildcard
+     * @return the starting index in the text of the pattern , or -1 if not found 
+     */
+    protected int textPosIn(String text, int start, int end, String p) {
+
+        int plen = p.length();
+        int max = end - plen;
+
+        if (!fIgnoreCase) {
+            int i = text.indexOf(p, start);
+            if (i == -1 || i > max) {
+				return -1;
+			}
+            return i;
+        }
+
+        for (int i = start; i <= max; ++i) {
+            if (text.regionMatches(true, i, p, 0, plen)) {
+				return i;
+			}
+        }
+
+        return -1;
+    }
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index ac399615fc..6c05ff251b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -258,7 +258,7 @@ private void registerDefaultEditors() {
 		registerEditor(MApplicationPackage.Literals.MODEL_COMPONENT, new ModelComponentEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.PART, new PartEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.PART_DESCRIPTOR, new PartDescriptorEditor(modelProvider.getEditingDomain()));
-		registerEditor(MApplicationPackage.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain(),modelProvider));
 		registerEditor(MApplicationPackage.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 195137df1c..baf05e7824 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -15,7 +15,9 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.KeyBindingCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MKeyBinding;
@@ -60,10 +62,11 @@ public class KeyBindingEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
+	private IModelResource resource;
 
-	public KeyBindingEditor(EditingDomain editingDomain) {
+	public KeyBindingEditor(EditingDomain editingDomain, IModelResource resource) {
 		super(editingDomain);
-		// TODO Auto-generated constructor stub
+		this.resource = resource;
 	}
 
 	@Override
@@ -140,10 +143,17 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			t.setEnabled(false);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.KEY_BINDING__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(getMaster()));
 
-			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText("Find ...");
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					KeyBindingCommandSelectionDialog dialog = new KeyBindingCommandSelectionDialog(b.getShell(), (MKeyBinding) getMaster().getValue(), resource);
+					dialog.open();
+				}
+			});
 		}
 
 		Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
new file mode 100644
index 0000000000..a6642e7467
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
@@ -0,0 +1,167 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MCommand;
+import org.eclipse.e4.ui.model.application.MKeyBinding;
+import org.eclipse.e4.ui.model.application.MModelComponent;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.AbstractTreeViewer;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.jface.viewers.StyledString.Styler;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.TextStyle;
+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;
+
+public class KeyBindingCommandSelectionDialog extends TitleAreaDialog {
+	private MKeyBinding binding;
+	private IModelResource resource;
+	private TableViewer viewer;
+
+	public KeyBindingCommandSelectionDialog(Shell parentShell, MKeyBinding binding, IModelResource resource) {
+		super(parentShell);
+		this.binding = binding;
+		this.resource = resource;
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite composite = (Composite) super.createDialogArea(parent);
+		getShell().setText("Keybinding Command");
+		setTitle("Keybinding-Command");
+		setMessage("Select the keybinding");
+
+		Composite container = new Composite(composite, SWT.NONE);
+		container.setLayoutData(new GridData(GridData.FILL_BOTH));
+		container.setLayout(new GridLayout(2, false));
+
+		Label l = new Label(container, SWT.NONE);
+		l.setText("Command-Id");
+
+		Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		l = new Label(container, SWT.NONE);
+		viewer = new TableViewer(container);
+		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setLabelProvider(new LabelProviderImpl());
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		
+		if( resource.getRoot().get(0) instanceof MApplication ) {
+			MApplication app = (MApplication) resource.getRoot().get(0);
+			viewer.setInput(app.getCommands());
+		} else {
+			MModelComponent comp = (MModelComponent)resource.getRoot().get(0);
+			viewer.setInput(comp.getCommands());	
+		}
+		
+
+		final PatternFilter filter = new PatternFilter() {
+			@Override
+			protected boolean isParentMatch(Viewer viewer, Object element) {
+				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);
+			}
+		};
+		viewer.addFilter(filter);
+
+		searchText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				filter.setPattern(((Text) e.widget).getText());
+				viewer.refresh();
+			}
+		});
+
+		return composite;
+	}
+
+	@Override
+	protected void okPressed() {
+		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+		if( ! s.isEmpty() ) {
+			Command cmd = SetCommand.create(resource.getEditingDomain(), binding, MApplicationPackage.Literals.KEY_BINDING__COMMAND, s.getFirstElement());
+			if( cmd.canExecute() ) {
+				resource.getEditingDomain().getCommandStack().execute(cmd);
+				super.okPressed();
+			}
+		}
+	}
+	
+	private class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
+		private Styler styler = new Styler() {
+
+			@Override
+			public void applyStyles(TextStyle textStyle) {
+				textStyle.foreground = getShell().getDisplay().getSystemColor(SWT.COLOR_GRAY);
+			}
+		};
+		
+		public void update(final ViewerCell cell) {
+			MCommand cmd = (MCommand) cell.getElement();
+			
+			StyledString styledString = new StyledString();
+			if( cmd.getCommandName() != null ) {
+				styledString.append(cmd.getCommandName());
+			}
+			if( cmd.getDescription() != null ) {
+				styledString.append(" - " + cmd.getDescription(),styler);
+			}
+			if( cmd.getId() != null ) {
+				styledString.append(" - " + cmd.getId(),styler);
+			}
+			cell.setText(styledString.getString());
+			cell.setStyleRanges(styledString.getStyleRanges());
+		}
+
+		public Image getImage(Object element) {
+			return null;
+		}
+
+		public String getText(Object element) {
+			MCommand command = (MCommand) element;
+			String s = "";
+			if( command.getCommandName() != null ) {
+				s += command.getCommandName();
+			}
+			
+			if( command.getDescription() != null ) {
+				s += " " + command.getDescription();
+			}
+			
+			if( command.getId() != null ) {
+				s += " " + command.getId();
+			}
+			
+			return s;
+		}
+	}
+}

From 79553b8afe7a6bd1f71f0653d6e04b58314de079 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 17 Mar 2010 13:46:40 +0000
Subject: [PATCH 0055/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * fixed file suffix

---
 bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index fec54cec4b..c1760d3644 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -6,7 +6,7 @@
       <editor
             class="org.eclipse.e4.tools.emf.editor3x.E4WorkbenchModelEditor"
             default="true"
-            extensions="e4xml"
+            extensions="e4xmi"
             icon="icons/full/obj16/application_view_tile.png"
             id="org.eclipse.e4.tools.emf.editor3x.e4wbm"
             name="E4 Workbenchmodel Editor">

From c596c2a64f4960b6eefb1fdf70abee55b3b3bf8f Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 17 Mar 2010 14:16:43 +0000
Subject: [PATCH 0056/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * adding support for command connecting in
 keybindings and handlers

---
 .../emf/ui/internal/common/ModelEditor.java   |   2 +-
 .../common/component/HandlerEditor.java       |  17 +-
 .../AbstractCommandSelectionDialog.java       | 177 ++++++++++++++++++
 .../HandlerCommandSelectionDialog.java        |  49 +++++
 .../KeyBindingCommandSelectionDialog.java     | 152 ++-------------
 5 files changed, 259 insertions(+), 138 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 6c05ff251b..03f1e020e1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -259,7 +259,7 @@ private void registerDefaultEditors() {
 		registerEditor(MApplicationPackage.Literals.PART, new PartEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.PART_DESCRIPTOR, new PartDescriptorEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain(),modelProvider));
-		registerEditor(MApplicationPackage.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(),modelProvider));
 		registerEditor(MApplicationPackage.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.PART_SASH_CONTAINER, new PartSashContainerEditor(modelProvider.getEditingDomain(), this));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 7b7ac5d7e6..a52beeb095 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -14,7 +14,9 @@
 import java.net.URL;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandlerCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MHandler;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -24,6 +26,8 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -37,9 +41,11 @@ public class HandlerEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
+	private IModelResource resource;
 
-	public HandlerEditor(EditingDomain editingDomain) {
+	public HandlerEditor(EditingDomain editingDomain, IModelResource resource) {
 		super(editingDomain);
+		this.resource = resource;
 	}
 
 	@Override
@@ -103,10 +109,17 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			t.setEnabled(false);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLER__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(getMaster()));
 
-			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText("Find ...");
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					HandlerCommandSelectionDialog dialog = new HandlerCommandSelectionDialog(b.getShell(), (MHandler) getMaster().getValue(), resource);
+					dialog.open();
+				}
+			});
 		}
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
new file mode 100644
index 0000000000..0e59caf02f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -0,0 +1,177 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MCommand;
+import org.eclipse.e4.ui.model.application.MModelComponent;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.AbstractTreeViewer;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.jface.viewers.StyledString.Styler;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.TextStyle;
+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;
+
+public abstract class AbstractCommandSelectionDialog extends TitleAreaDialog {
+	private IModelResource resource;
+	private TableViewer viewer;
+
+	public AbstractCommandSelectionDialog(Shell parentShell, IModelResource resource) {
+		super(parentShell);
+		this.resource = resource;
+	}
+
+	protected abstract String getShellTitle();
+	protected abstract String getDialogTitle();
+	protected abstract String getDialogMessage();
+	
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite composite = (Composite) super.createDialogArea(parent);
+		getShell().setText( getShellTitle());
+		setTitle( getDialogTitle() );
+		setMessage( getDialogMessage() );
+
+		Composite container = new Composite(composite, SWT.NONE);
+		container.setLayoutData(new GridData(GridData.FILL_BOTH));
+		container.setLayout(new GridLayout(2, false));
+
+		Label l = new Label(container, SWT.NONE);
+		l.setText("Command-Id");
+
+		Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		l = new Label(container, SWT.NONE);
+		viewer = new TableViewer(container);
+		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setLabelProvider(new LabelProviderImpl());
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+			
+			public void doubleClick(DoubleClickEvent event) {
+				okPressed();
+			}
+		});
+		
+		if( resource.getRoot().get(0) instanceof MApplication ) {
+			MApplication app = (MApplication) resource.getRoot().get(0);
+			viewer.setInput(app.getCommands());
+		} else {
+			MModelComponent comp = (MModelComponent)resource.getRoot().get(0);
+			viewer.setInput(comp.getCommands());	
+		}
+		
+
+		final PatternFilter filter = new PatternFilter() {
+			@Override
+			protected boolean isParentMatch(Viewer viewer, Object element) {
+				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);
+			}
+		};
+		viewer.addFilter(filter);
+
+		searchText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				filter.setPattern(((Text) e.widget).getText());
+				viewer.refresh();
+			}
+		});
+
+		return composite;
+	}
+
+	@Override
+	protected void okPressed() {
+		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+		if( ! s.isEmpty() ) {
+			Command cmd = createStoreCommand( resource.getEditingDomain(), (MCommand) s.getFirstElement() );
+			if( cmd.canExecute() ) {
+				resource.getEditingDomain().getCommandStack().execute(cmd);
+				super.okPressed();
+			}
+		}
+	}
+	
+	protected abstract Command createStoreCommand( EditingDomain editingDomain, MCommand command);
+	
+	private class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
+		private Styler styler = new Styler() {
+
+			@Override
+			public void applyStyles(TextStyle textStyle) {
+				textStyle.foreground = getShell().getDisplay().getSystemColor(SWT.COLOR_GRAY);
+			}
+		};
+		
+		public void update(final ViewerCell cell) {
+			MCommand cmd = (MCommand) cell.getElement();
+			
+			StyledString styledString = new StyledString();
+			if( cmd.getCommandName() != null ) {
+				styledString.append(cmd.getCommandName());
+			}
+			if( cmd.getDescription() != null ) {
+				styledString.append(" - " + cmd.getDescription(),styler);
+			}
+			if( cmd.getId() != null ) {
+				styledString.append(" - " + cmd.getId(),styler);
+			}
+			cell.setText(styledString.getString());
+			cell.setStyleRanges(styledString.getStyleRanges());
+		}
+
+		public Image getImage(Object element) {
+			return null;
+		}
+
+		public String getText(Object element) {
+			MCommand command = (MCommand) element;
+			String s = "";
+			if( command.getCommandName() != null ) {
+				s += command.getCommandName();
+			}
+			
+			if( command.getDescription() != null ) {
+				s += " " + command.getDescription();
+			}
+			
+			if( command.getId() != null ) {
+				s += " " + command.getId();
+			}
+			
+			return s;
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
new file mode 100644
index 0000000000..3532bf70d5
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MCommand;
+import org.eclipse.e4.ui.model.application.MHandler;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.widgets.Shell;
+
+public class HandlerCommandSelectionDialog extends AbstractCommandSelectionDialog {
+	private MHandler handler;
+	
+	public HandlerCommandSelectionDialog(Shell parentShell, MHandler handler, IModelResource resource) {
+		super(parentShell, resource);
+		this.handler = handler;
+	}
+	
+	@Override
+	protected String getShellTitle() {
+		return  "Handler Command";
+	}
+	
+	@Override
+	protected String getDialogTitle() {
+		return "Handler-Command";
+	}
+	
+	@Override
+	protected String getDialogMessage() {
+		return "Connect the handler to a command";
+	}
+
+	@Override
+	protected Command createStoreCommand( EditingDomain editingDomain, MCommand command) {
+		return SetCommand.create(editingDomain, handler, MApplicationPackage.Literals.HANDLER__COMMAND, command);
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
index a6642e7467..6b7ed917ce 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
@@ -11,157 +11,39 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
-import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
-import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MCommand;
 import org.eclipse.e4.ui.model.application.MKeyBinding;
-import org.eclipse.e4.ui.model.application.MModelComponent;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StyledCellLabelProvider;
-import org.eclipse.jface.viewers.StyledString;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.jface.viewers.StyledString.Styler;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.TextStyle;
-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.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
 
-public class KeyBindingCommandSelectionDialog extends TitleAreaDialog {
+public class KeyBindingCommandSelectionDialog extends AbstractCommandSelectionDialog {
 	private MKeyBinding binding;
-	private IModelResource resource;
-	private TableViewer viewer;
 
 	public KeyBindingCommandSelectionDialog(Shell parentShell, MKeyBinding binding, IModelResource resource) {
-		super(parentShell);
+		super(parentShell, resource);
 		this.binding = binding;
-		this.resource = resource;
 	}
 
 	@Override
-	protected Control createDialogArea(Composite parent) {
-		Composite composite = (Composite) super.createDialogArea(parent);
-		getShell().setText("Keybinding Command");
-		setTitle("Keybinding-Command");
-		setMessage("Select the keybinding");
-
-		Composite container = new Composite(composite, SWT.NONE);
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		container.setLayout(new GridLayout(2, false));
-
-		Label l = new Label(container, SWT.NONE);
-		l.setText("Command-Id");
-
-		Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
-		searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		l = new Label(container, SWT.NONE);
-		viewer = new TableViewer(container);
-		viewer.setContentProvider(new ArrayContentProvider());
-		viewer.setLabelProvider(new LabelProviderImpl());
-		viewer.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		if( resource.getRoot().get(0) instanceof MApplication ) {
-			MApplication app = (MApplication) resource.getRoot().get(0);
-			viewer.setInput(app.getCommands());
-		} else {
-			MModelComponent comp = (MModelComponent)resource.getRoot().get(0);
-			viewer.setInput(comp.getCommands());	
-		}
-		
-
-		final PatternFilter filter = new PatternFilter() {
-			@Override
-			protected boolean isParentMatch(Viewer viewer, Object element) {
-				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);
-			}
-		};
-		viewer.addFilter(filter);
-
-		searchText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				filter.setPattern(((Text) e.widget).getText());
-				viewer.refresh();
-			}
-		});
-
-		return composite;
+	protected String getShellTitle() {
+		return  "Keybinding Command";
 	}
-
+	
 	@Override
-	protected void okPressed() {
-		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-		if( ! s.isEmpty() ) {
-			Command cmd = SetCommand.create(resource.getEditingDomain(), binding, MApplicationPackage.Literals.KEY_BINDING__COMMAND, s.getFirstElement());
-			if( cmd.canExecute() ) {
-				resource.getEditingDomain().getCommandStack().execute(cmd);
-				super.okPressed();
-			}
-		}
+	protected String getDialogTitle() {
+		return "Keybinding-Command";
 	}
 	
-	private class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
-		private Styler styler = new Styler() {
-
-			@Override
-			public void applyStyles(TextStyle textStyle) {
-				textStyle.foreground = getShell().getDisplay().getSystemColor(SWT.COLOR_GRAY);
-			}
-		};
-		
-		public void update(final ViewerCell cell) {
-			MCommand cmd = (MCommand) cell.getElement();
-			
-			StyledString styledString = new StyledString();
-			if( cmd.getCommandName() != null ) {
-				styledString.append(cmd.getCommandName());
-			}
-			if( cmd.getDescription() != null ) {
-				styledString.append(" - " + cmd.getDescription(),styler);
-			}
-			if( cmd.getId() != null ) {
-				styledString.append(" - " + cmd.getId(),styler);
-			}
-			cell.setText(styledString.getString());
-			cell.setStyleRanges(styledString.getStyleRanges());
-		}
-
-		public Image getImage(Object element) {
-			return null;
-		}
-
-		public String getText(Object element) {
-			MCommand command = (MCommand) element;
-			String s = "";
-			if( command.getCommandName() != null ) {
-				s += command.getCommandName();
-			}
-			
-			if( command.getDescription() != null ) {
-				s += " " + command.getDescription();
-			}
-			
-			if( command.getId() != null ) {
-				s += " " + command.getId();
-			}
-			
-			return s;
-		}
+	@Override
+	protected String getDialogMessage() {
+		return "Connect the keybinding to a command";
+	}
+	
+	@Override
+	protected Command createStoreCommand( EditingDomain editingDomain, MCommand command) {
+		return SetCommand.create(editingDomain, binding, MApplicationPackage.Literals.KEY_BINDING__COMMAND, command);
 	}
-}
+}
\ No newline at end of file

From 961ad486ee258803390862437f58227590f3c6ef Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster>
Date: Wed, 17 Mar 2010 14:30:24 +0000
Subject: [PATCH 0057/1286] Bug 306200 -  [releng] add the model editor tools
 to the build

---
 .../META-INF/MANIFEST.MF                      |   4 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../build.properties                          |   3 +-
 .../feature.properties                        | 148 ++++++++
 .../feature.xml                               |  17 +-
 .../eclipse_update_120.jpg                    | Bin 0 -> 21695 bytes
 .../sourceTemplateFeature/epl-v10.html        | 328 ++++++++++++++++++
 .../sourceTemplateFeature/feature.properties  | 144 ++++++++
 .../sourceTemplateFeature/license.html        |  79 +++++
 .../sourceTemplatePlugin/build.properties     |  12 +
 10 files changed, 725 insertions(+), 12 deletions(-)
 create mode 100755 features/org.eclipse.e4.core.tools.feature/feature.properties
 create mode 100755 features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/eclipse_update_120.jpg
 create mode 100755 features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/epl-v10.html
 create mode 100755 features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/feature.properties
 create mode 100755 features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/license.html
 create mode 100755 features/org.eclipse.e4.core.tools.feature/sourceTemplatePlugin/build.properties

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index c361c5cbf1..a8b23b3c18 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor3x
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.9.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.emf.common;bundle-version="2.6.0",
  org.eclipse.emf.edit.ui;bundle-version="2.6.0",
  org.eclipse.core.databinding.observable;bundle-version="1.3.0",
- org.eclipse.e4.tools.emf.ui;bundle-version="1.0.0",
+ org.eclipse.e4.tools.emf.ui;bundle-version="0.9.0",
  org.eclipse.e4.ui.workbench;bundle-version="0.9.1",
  org.eclipse.e4.ui.css.core;bundle-version="0.9.0",
  org.eclipse.e4.ui.css.swt;bundle-version="0.9.1",
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 5ff5f9cccd..01777f6750 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 0.9.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/features/org.eclipse.e4.core.tools.feature/build.properties b/features/org.eclipse.e4.core.tools.feature/build.properties
index 64f93a9f0b..b3a611b5c9 100644
--- a/features/org.eclipse.e4.core.tools.feature/build.properties
+++ b/features/org.eclipse.e4.core.tools.feature/build.properties
@@ -1 +1,2 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.properties b/features/org.eclipse.e4.core.tools.feature/feature.properties
new file mode 100755
index 0000000000..b4f9dc8130
--- /dev/null
+++ b/features/org.eclipse.e4.core.tools.feature/feature.properties
@@ -0,0 +1,148 @@
+###############################################################################
+# Copyright (c) 2000, 2009 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the 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:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse e4 Tools (Incubation)
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+updateSiteName=The Eclipse Project Updates
+
+# "secondarySiteName" property - label for the update site
+secondaryUpdateSiteName=Ganymede Discovery Site
+
+
+# "description" property - description of the feature
+description=Eclipse e4 Multiple Programming Language
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2009 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+########### end of license property ##########################################
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 3518aafe7b..b542dc7298 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.e4.core.tools.feature"
-      label="Feature"
-      version="1.0.0.qualifier">
+      label="%featureName"
+      version="0.9.0.qualifier"
+      provider-name="%providerName">
 
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
+   <description>
+      %description
    </description>
 
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
+   <copyright>
+      %copyright
    </copyright>
 
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
+   <license url="%licenseURL">
+      %license
    </license>
 
    <plugin
diff --git a/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/eclipse_update_120.jpg
new file mode 100755
index 0000000000000000000000000000000000000000..bfdf708ad617e4974cac04cc5c1c8192b09bbeb3
GIT binary patch
literal 21695
zcmeHvcU)7=((p+_uhNSGp%(=Nr3wV321I%h5riZ_XrTltiYTH8C`eTiL3$Grl<I?2
z1#EOsngSvn=^gT&fbF^Wx%a)#`~BYgm&@;LW@l!1XJ_Z^&e;OtJ>e6uPge`61wfz>
zKnMH-2t(wlntoUZ0MOS5!~g)G0LUSX01Sj6;2!|t1W0#b0I-Mb{{cHgM85GrK^`dp
zjDh{&;{}o4g_%M4W+)aQ`Ia{W{A~pvuts93d%tREoIM6^=!C=Lyq$0!aCH;71=byn
z^YsR#4<D9MJS?jyB?mvOpeQ4wcvKF|1pu%Ike{+Wfc_}o?*Z&5yvqpyWDwXlUb0`?
z0pb4H4v5gN?ErQ1O<sru^heobF5k-glk9}Q(&Y?5v)d+Hb$tLrm<8x|QvmuBSOSF5
z2ZR7L6ciMc6f~5SGz`>K)C?^2G&J-q>`Y87Oib(yG`r#3&tBpmV+buZH7y<OK03O6
z%ye{g%*2R}c`pmYe^LOU24J87`~W`~gb#o+Kwu0I!T{K83PJ+}0ZK^<*$v;C3<C{?
zgp`b&f|80FG>1PEApjKiowyHxkU(Hi5-2G-83ief<_Jh+fRXSrN|CA=*)j2XUX~_f
zj!rE)&M&}XTx);is8?{CI=Nts$=uL9%3Fptt@w(NMyx4Xvo0Mk%hql-j9GXRQs3b-
zvZy5-mvQxJd_(8wrOc8SU8Bq94(F~VWR<?`{<0#cZQ<w}dON$Uv1e?R0f0h5X-Rfv
zA}1r2*%g6Tijf4Az>|-ORQhr>Gf{$C<F>gY0`@~*!7=J4EGX}z^MYhV0my}9>e@je
z(%I0OX0mw9@DCCGwFJUHMIiJ7G_c(|82|)Oi{wp>=YxfmePK;|DXQxvrWTTxXk~1?
z^ePNXDHa!l9_K|0#ONA>QCtjCAX6X)DN1OqMP^*#<-32yEbpl-hv8E_ysyVYi|YpH
z_wmj9%H}+7W~e)u2#VPZAEUWkNBy|qTxz9XGMk&Drkm^Fyow%MPMK>-bpS&Xm4?>n
zmzf6^OG&vOu(&oW4*kxUCj|$xJ<n0ew2}x*3=ORcbF}avA8Z}nSz=pwa5X`8+usa<
z?7cuG-6XPvQ7Pv9>aBDvD){)Bu9LyY#4lB;Z>8x;6}^~2QL_ncF9u9P<lR*GuL`w0
zSgHq8o$$oA)^(}!=jUEOSFSs)c<_TEU67z>l}h7jCzp`Rxd_to{*TD39d(hOkDJ*i
zaQgS}TVz;u%v%>46=lT9E%Ob%N{x-L^f9VqzLsoqEnjvduO#q^So|Ync**pr8uF!X
zxE_04j3~UKD9p2<&!ElsQ{ltX{I#zi4U@I5is;!e>-gw`3S_M&wAY@v-p5J8s(U-%
zc2->TfnQmrUXa$N(#enI2HWcfxoFNQ7sm;X&FBD2mwBX9lz+!(7W#)Kwwa$W{7=x~
z4WTm*3df)DozLSgI^m{&_G$NNv1cDelNL-Vkt8`;qC%=UqVSk=A??N-R~=~w$K)Dx
zAKttcbRsA(NW`dN=dpj*X*px0Am%2aqxK{dpLF&!%ge*&saCMuwq)gF2WKff)+Y!+
zpxQ<=@*=-0Y@8i|*czp$>zyxjiO33kG#6Y_oWsHXHD|}8b$vxI-I+gvBcfg)ELJb4
zqN`kul*&ZBKrag^ZJya75C@M3vY`6TJ_kO>Gv2%;_|^9k?5mmE1=7?|qr7WZmhR8`
zHe?MQI3>AiBp#a)qubs{=xksuN$>sO8>UnBbwm5}gCz0emy8dS7IrMu_lo+j(x+X}
z4sLRdg|PD&s4cYwk#KmviuD=1J@xdnsq)CgWddMY5en^LeRiA;6OlwgQ$Dpx0M-Rf
za+eer)Shv|-aXSM-^gJIxVkPiACSJHRH@TrKcN0v9E;@^gXA3%v&#ZRuVsg1N}CwR
z*~~#5-$Nx32BpJ1euoNI{X7XkQ%*_rgDiRZFPqAaQEi7Oz8vomt+#r4?WwxfC6ZTz
z@)T5?=FQ*>6VOBGsy*3?ymX7?4n;<|2CYpHY0gv9&!%wa#Wf-9*8!>%&7(TZR6_zo
zjhCCv4>lF2mqcDt;EK1pq1WQBB1-<?l~7;hOB=rK;3tnJ;^p5u;##&RUoMqB@acz^
zH*wXgF6BE;l&WCq;t(nWN}T))`7b6(o1gd7Ylemvixo-bO22$v?cW<OZ7g9ZsH8!A
z^^l-O7E<7gbVdwP5JBjEN$2L)VUbcx5pyEhVqZ+BRS<dENjAC|o%4Nk-Ph>D4ExJX
zZ`tM#xEoY>gb5VbOnKQ`(8TD<t}@>Bq~v>ARjGF!DWFV@!O}huW@xN`PLf9?4g>PX
zk@_TpyJPgeZzJ`OA0iDl^NqGQWf7-(;<O9d%_p==qx+EoKwJX$N~GPz5vM@ET~3Z4
zY3|)p7kAT?yD=C+_Ht3}rol;_$RoTb4;4t<3((!1%ex63K+?ehq_~1HI3<Gt@(q)E
zH}MBXdKYg6#@~5lb}`~VF}r21foTBn09}~B46tz``7cR?{~sE$Zla370R5&>qVogn
zx(<69q1a6mH34b?s=D`l(=j)Q{gs!Kn1mt0Xs@-zB&h#y4;5erxC3|q3qGy@20#Pi
zfD}mku3aMU_wXz3d;agV-QQmsz7xI)Nld!?xVnNr#Kw@><9yuF-Ujy0C@}RcpD_wg
zta`WYrl7axigR}a)4SmW#sU9p`Zylv_AN~m1u%AW`c5aN$-G^$D2%tc>j`f#1^H7w
zq`Nc_%?Li^y9uPmFJ+TEdf|LL{)8gKd0`!~?ihC;H!u&4rU|ihgIye$rnU3I<FqmE
z7%w|K1`Q$rQ-2T4H)g6mW+H}2LAp7@!Jq%@_QQO<Tun7CO~I<ZDVM1HKV$U09Wj5x
zklDH7P3;{2grh@Yz<d}#JkndoRR4rM4(CcNkm5V~Pt24~IIjRTSFGcAP0{Z)UgtX+
z%t?;MIN15P;z5w|9L5X(7wqQW(SK&Aws%y=x#GNjQ7*$?`Ny??5Wp<JNt`=T*OYji
zhk*~?8}r>Th%_o!(2)KKOJk42g9i0acxteVo&J%1_x%(h76#CO4+Jr{3-7&|#LtpF
z6W$${NQfK&StuA0)%NYJfj9v`P7R260oXye{kNn4+tL5B^4rn>?dbn@^nW}0|Cf&b
z-W<gX&O`uU0zMGpq(l#>fo>lTum{~gIA91kfiNC?ymukc{RJJRf6oC2)c1<pD}T?=
zBnKDzc55IEv28fv@g9njlJ4FTcElw)2^7vv($CIAQcB{mB%p-w^RPp?VDNBz4CrMk
z3x9o9Eeyw^m4z*2^bhNMsAHV4Issl7lYo<^r~ns~0$LcMLZ#%V=;!9)hQZsx{oGvL
zy%qhGg?9^A1YsgtQW(C=f_G6Cw$wL-<3ZoW1&fD+-#6mY@`vCKUUqI6U!0c<TuMS#
z7%b2W?VxC^q4ljeFr_T~O>SRbUkTqM5;!kMNht*d1<AwGlG4)RAcwfOzdPQ}Pu$&`
zAFORx46NmkY=3Gl)^fMCU`15$-KsP&-Y74u2Of)ahZC!|1ASt=vapX27Of~RC6AGp
zwL2<~b~qv@E+vIl5Vx0BkP%1Qq3op4hh^na4k%$N__r!C;PUEUS4yOOuNDqhA|@4g
zeI*l6;}{hwCCPt8fraj|8Djk~u9g~DH;lVCD58p#^x<#Z|48|BmQ(*S%P$mA1(L)z
z|DuEc1HE|s(uIHO3y=V6<%lHM8UGzYzOO+4buW2*C;!q_KX8gVSZ_Se%U?xF@}F`4
z9r5v4hks#TM9MEh6O)SIcM%4BDTsDWG_Zfd5zS>6X=#k{#<}|JGRjFye&_ua{e$<^
zU-SNo{=xf`)yy4>SCRfE!#|+^JE{W*xxeo7@1q~l1mQ|xN>SYl1AaehfR74sb3**E
zthkh%>G#bEapHCb_y+z1=l9I|I5gJ5|3At63+Io_;An}q!`uBw*?;BzUcj#C;FlRV
z!m8}<Nc`oV%P+!z<NdGofxiB~?*%uv-LYV|BlPtZHE<{&aNNTqHB|Pd6f_P6j><pZ
zKN&PyLE*?@%)c9-cbog?!u~t$MWcQ+)&pDz*qye}C`pVfhS(-=@O_o~)><@5(E;b>
zW`|e7y4g8mB%M7lj!Ke0v41V^-p~!sl;E5x`C}F)+VTH=_+820((!L~{Z`lC(!k$h
z{%u{q)%CYD@VA(MTi0)O{VfgrE#}|W^;=zkO9Ow4`L}ibR@dLsz~5s2ZC$_B^|v(e
zx0wI8)<yMm9UtQkF5dfstMr6n8cU?Qx~-wHffn+F=I(|Ajm`<II}QpS3~_VEdl_pV
zhg+Vqf|I`k4~9^JXH>u=Aa*Ek4}B9Y;^_qdsi_Y42APQP&#=<HcdnsBT*nX&|B3&P
zAO@6&7kK^vVhC~{L4&LCARGe1uD*B=BA&RP&us5PgrUU4D9m1<fFR6HgdO+bL%TeC
zuqqKoySal$KcGaJJ<x7wBHRGN*U$M7kA%QZfbg|*Sd1?ScY?5htB)HNgx5fr*$ra{
z9#h#pD<FW!pup1sB!@vfjhCshItVL)=PhU)e}V0Pf$`wk43HO4$9eego>qX1phV%|
zE`>Z?2jlCC!Q;gZ!OayrFEm^o=jLJO?hgQaZ6@Xd7>T-tgG!c_QjnDumzE%&!1*5j
zE%7_k|L{xf+dY;=quoA(u)g_;`<eMC4wnX=WCG7~!EXJ;+1~|#va0~V-un|L@BrMq
z3ITx9mS5V#O0<_>c5Sd2lmt<sKf?dW@PqST1HaTKL9FkG?%*1Ghg;x8rJ}&YDn4Ft
zZ{ki1T>Kx6_<x=87qNbk<B&1N0po>n2dgp%tqkk#2zIwS8oRr@gmwQ{J^a7S_KOTe
zaL=wmfGJ}KV78S2_O&nru$eai2@^E{vrYynkRSbag3=t^WCQ>Up0Pc<2Vs!D8~-VS
zMuADFH+J{H6rgTw3P<^Po!es}A^wm8RN&?%Gr$3G1N?vpcydh|kOPhZs(>b-3m5>V
zz$w56K!MwsZh#ly3tRv$1J{5E;1&=MBmyZw29OIp0*Zk$;18e{cnQ1)FA#JAeZVJR
z6qo|$fE8d9JgQC(p@lF(I3PR_LC8UfG(;Yv0?~w=fEYtgLC!)PA?^?#$OXt1NCYGX
zk_btK<U)!d6_8p;Go%gj0Wt)cfGj{ZpfD&6lo`qe6@p4a<)La&J*X-44Ac?o2@QaT
zKqH}dplQ&D&{AkE^fj~#`UyG(T?X$KP{UYZyfAT?JWL&C0JDNQz`S4=Vd1a@SQ_jR
ztP<7;>wtZNO~ckn$Viw-;3VQC$4GQY%t%lqo+KAZZjdCB<dBq-G>~+V43W%{?2yuu
z9w0qPsz{0?wIp>U^(DPVnn0RGT0;7Qw2O3<bcKwJjFn87OpZ*4>=c<Z*?F=XWcSGm
z$!f^j$VSMP$;rt%$Pbb$lN*rRk>km)k>4eMNM23ePCiP$MnO%%Lm^F}MPWtZP7zFz
zK#@oBoT8m#jAD~=AEh9rBBcQ(n$n*#iZX+;lCp(zlyZ}bfl8Q4naY&Pnd&mt9jZrE
zFR1#d7OAPJ`KT4Bji|BIm#FVhKc;S?9->~SVWbhGQKzw{@u7*N$)>5H`9QNsOG_(6
zt4eD{i>HmG&84lU9i&~OW1^FwL(-w?g6QtimD07-&C*lS3(~96+t3HlC(u8kZ=s*w
zN4ZaEpZY$#eHZuL+gGu#XWudd6N40k0fQUE4Te01W`=P_az-IWO-3|h2xB^9J>v)y
zjESE~oe9Nsg(-vS1=A=q8M81mlG&L#g1LbC9rGLuBg;`1a~40Adn{EfpIBk6Laazu
zSJo)jV%Bcf4K^+|H8u=e7~3PZcD7aa{p_mj81``XLiR594GuVmCWi}0G)Ec704E8j
z7^e}ZFK0663(o2N%=?e+N9_;aU%bEf0Q7*^0pkPb52PP>b6}Z^n@gL^gX=C=J=Zih
zE4M1QGj|;KbM6TqCLR?YEKeLyHP0lR1+E5nh2McUz~^`m@apjT@TT&<<K5&F<}>39
z<}2hI;HTo3=Xc<b<FDhN6W|fh7q}phFVHJUDJU=KBzRk}QE*jASja*sRH#g7T$o)L
zDI6f2FWfIeD}oU56iE~56eSat7j+T6FWM>w6_XKj61ykXau9k@_8|7){ex|XNDnC-
zazB)Is7IVeTuuC(c)s|M1gpdeiC~E`iCIYjNh`@{$wtYY!!n0m4`&?ilVX(8l?s-s
zlv<D$lSWD3lkPl1dqnF<(2?>Z^G6RJ#T-pO`d)@fMqegWrcP#CR!-JS_L1y_oPgX}
zxg@zBd1iS-`5W?03Zx3h6@nE0P*_)#Rm3Y6D}FsDe$3@q-m!5dVI_=GhSG>KpR%2D
zs`4ilxXM|T2P&Tsya+o)8e&+LUlpyIr8=f2s^+ZrP;K`3;p1M%OOCIqE2;;o*J!{r
zv^Byt-f1#wnrS9#4r=jfIcnu=&1uVMpVzL@A=S~-iPq^sav@R3T;!atoNl0QgC32Z
ziC&`K@CmUKUMDK`q58V|vHJZd1y8!4EHeNMkOr{^1BSweo`%ni$czk)?iqbCmNLFz
z+-SmNVr!CTvSNDNG|IHkOvKE`tj?U?+}b?XeAPn3BF5sArKDw`<?B<Nr?98Wt;ns+
zt+K3^PivlzKRs$KV|~rK`;71zzcbA?oHnjDRkrlDcD7H>lAg6Vn|F50&cH6sZrL7b
zpJYFWQb*lJO`%oMap(z*GA0Hy=Ai5l<1p^1>=^4f;e>EXaGJ)dV-vCS&N|L1&Z{m4
zF4-;wR}0rdHww42ZWZo~?k?^PIBuLDuFd11$2E^no{FCFo^xJ$URmA{?=#-zcxKR<
zdgCMFbJb_)oXWX-=hl49eV_O-___PN@fY(C^B)V)3dlT9avpWQ?gH<H%NK?M)dEv5
zLN3~0tPA1~3JDs$q<typGSy|5%Ws1Z2gd|2U9q@Q8NwBEDP-iT_SO7rbl1GD^@JV^
zO}S2T9ee#<*paZiVLRdI@K+IsBN8IEZlG?wx+!(@&P_t3L*%<C*{I}OWVhUJbw?wj
zb7B}`0%AsD^<zup;Bnz`OYyex%?U>nQf^b-_PPD(&WStacLna=y1SL=l-PCe_`SlU
z14&^?tM}3O+mlt3AEj`mM5Jsyz&?1Ns-0SzCX|+tPL_Ty{Y!><Mq{RYW^NW|Rz%iz
zwtM!c9OImZT)EubyaRbr`Otiy{E3Iw4_gZ~3d$deKT0iREsS^!Job4!S#-9jyI8Nd
z?uq=9M^6QxCY3OigqK1}{Y&S{oXS3xpDJ&w(5<MeJXTrqOyXJgAH09ut755&dQSB`
z<T;@_pnAE+qh`9+v38`+wyv+<vc9vysNvlUy%$X{wO-aYsx?+ODL4Jmtk_)fO8!;Z
zYuVSOZ)Dz-yp?%d@=o?$X^UJ-d8<NeWt&pl^L9jgZHGq3%T8qH>#mbsZQW+w?|ZC!
zKD|f3AOGO`VZQfV?`Gene$xK%fqerBg9irFK8k)U{3QFSYDi<~&9KRE-w0}C>a+Lf
zt<jJ#v|kd&c*b(arN{r6(3)tSJUux&<uSE6eQkzeCTUh=_UTvEuW#lo=SJtf<_QZo
z7C9EPmyRygEgLQmuDGpiu7<C1tmUlBuQzU3Y>aLCZjo=@*%sZd+|k?VC%A#9?tfl>
zQw4p2y~}TVSIhpR82U57euQ6g60dqee-QptfbjG38+cpn=jAtg@bVkz)&gWu@B-J5
zKu$qMN<s;v0<Q&9gJ?1sSpN?qNP>|=DIk;p74<#<3W0&w-(W<Epk$Oj5b$Cg11TdJ
zFF6w*Kq1AfCe6=6X>^>`PT&ZevFBxW`)EP+)S@||qh3@TwQVxOLngAp^D$`}rrw%b
za@r^nGjj{h;=1<X1@sksYzQX(NqxtNsJz3XkC=j@4pJ9%)*PL%&gXpn`~$9D3%wo|
z9v7c*`_A3OjLfX;oZP&pC8cHM6_pJyUN$y0zv}Gj?s@;A_w(qNvGIw?rR9~?we=0K
z`NZpbBrsAE5)v{pQa4a!2JpHbsT3K&$E0RNE^Wu`Npbu#e>976sy*uw$|8Z<Hg&H#
zwxQso;H^D&l*W8ov5*XhsjMbin9BP~tQMXquNlV2TrTA5uE2|;oN*aXiTC#6_b%><
zXj?eQ|G2yN^WvV4rIX+FJ2~Y|@5k2^kf*TzVRv&Ynm<geiz(__IR}I%=2gDxo!t2I
z{kmMc=Et8m#}R6gRbL0rKYB#o^RaT(nkF34I1n7$RVOu7C`JIHs-2W^_3jnqCQB+y
zrcn}k;8U^LV>UIo-BY<*?K4ZvTX=re=ARLS*4!L{xi_(-G=`DvXHEr))i2O*Ha@?y
zZa6nCdxQD2SwKKyB+U)UQ<1FEq+=N)Rzc=!+nEI5`l=NRoXJcjP}If#^{{sQggjrO
zmYCUPvIYhhZ+GnyUe#<Ho#$s1Yp*35d4vppj9S^*vZRZ9h>*xAg<{xRKh9iVok8WZ
zd)8-F-nj6%e}aEIwCdARhi0dYSGL~ybm0`FKxC5Q+vSy>6FwjReG}SpZL?K2=vz?_
z<5*;lE=PBoC|Ia3?Yxdyh(x5WY+Pav7NgfPcW-_C!gQXCcI`}|_A@@KSL_W6Bt>}{
zk4X!b@jUT}p_!wRXGh`|#>aaFUI~V-;1A6V=H=y?*_OD>(Y6wR7xYgV2lI9$?zElY
zRu)^}I%Yva`j($wfBi;O;nJt`c5<Y`!&AK$?f1zl=;HcICKua=KZnP5?VK^EmEmaD
zf2A{(cb+HbrgfA<!lK_(So(hb7y{st8qBE`#AFwQV_LU(;OOJ38~8Nx!=a3eW+c~#
z^r>{%cxe(d<6ztScpQe0$(t&VwrZ-_1l?*zJW2O{WzL#A?0zpf$wQTVx&XO#J8h&w
z?u;1_?deuGSB!){F5gKz&e?DgzloHXC~DAcbUa$Hc=pnElED@lujh+<ZD>(bnry7}
zdV+l2V&_Qf8HDp}uOprScoqkQnFumjQ_~yFwCvjo3LE=ix|!r<F)>4e`tqXs?GD{_
zAw6y3+A<MD2P*-f;6kR)Zas9{`Rs9LBaS?!C^0Lnrs|Q>j18sH+Asm=JdfObrNM8l
z8Wpd-zG1NRs%8S!8h>eqEB8J=+qtZvyMpTJ2i04LZf^7CTLhR_Z1dhfQ&_ioie>qa
z42c5q@t~IatmHvcmQ0J$)`;bmCs~SL!B@a$b+)RfYO~OX(4MOxk>|(1?fEs8I<^%{
z?lI9w55!=|`lDw?>eEGThiZ-G9TpeI9J&<~LuO#Sqs?Zla*Y6tOy?~Giq*`GcT;lm
zQOHmBZ)j&`449xA<hyeMLa%YKvim&tKg4|1&>%NzV{oKk#OE~L%O(liK4v)vsmZv{
zWBs-6m3YO~6E9IbET+M{V(rrTCaU<!?Kz1jI@PxVVH-S!k6#YFg$@UDZf!{SxfWar
ztw={?5Aon~cWiNHHy5}s**_oS3J>FFIQX)Q6ELN&(Z!d>Q^}J=1gXtx7YzuYxj9-2
zwJlC}h^@)S0aVTeKyKstyWGtuo;Mux5*+-|_Pxnk5@Yuk-oCB6Gv!a0ZEuh}E_Y1n
zMhibHsv#*kEMY3s6x+BltqFSL<p@KAN}2Np8mkBOZ6~)j0B;fg_?rdIh>>Li;5J*Y
z%$(fOZn<C?bVhyqYo7@XtZR5!yRTCeXb+NuP3=@w4~9OSX~3td99ZI?c5iz%<BuJe
zrk5~);&Zd3mpfZ|TV+~xzijN=zh*g(&}>DjboR|kpWavOt8T-Mng&H*Q_Lt0JDg{)
zd+}r0*7p7j?z*9p>iRK_rh;ZH*7iEWQHFG7Vru48<Ks2?2Z2{L!4U2S&!$+u=KW^$
zur~E{trrK3LQSeFx&nwJS~a2LVbt*X)1sU&V$*Ij7@e*5(cgU9&|7;~UQBsO(6BqF
zYn@wJ_-5&5dUWcB-%B?R>VlJe#kWNb0@Z8z)>W&f+ZZVjUu{<2nHs&I*VP)VuVkaC
z;&ji<*`(_A$-Oy*##c5~8ju9pE?33OQs^cg@EO_Pc+Gmb=wsd1AP=@3weTS%Vm2Rs
zGaU(?%*?`bUaZdYHw-rD($2n;b3SxE-92%LUC^a9p~D$p%A}M1($f$T;(yU`-8{MK
zz{Tm=ft+)1&BcQA6wuL>cM?=hufjD-1$O+wzL;hynX%A2m)Utq5h;cDW-OySN&v`B
zsTcNpwwarn|KT3OB)So)fS5XeXC>!@k+WjXreZGlyMmjabKp_=J3$9h=2irZ!hMhw
z55{BNn=P7;*j~;FijqUjT&-HasmjG_Z4x&Ahhq{4{aS?WmH}d(ds==;XDk$nOGOL?
ztzMp~c+Svq>(eroK`H^T45}gkFSoOVl||LUm&q5Z=Ztoik~>a#T>QAWl*X$|e_P$a
zbavw0wmoV}2vJ)sef8F{0Fg<{@yH@~*X#NTwwc{;f^?p-?r)skY@>O*BgzZ(%q2sf
zw+yd4zAm&mwKjK``C{>n3ypU`6WLVW&*Md|_I!7`B6Q|z8NO0uBLJ|ksX*%zhskmJ
zQ}bpe^1W9RV$!Uz%n|GZar^f#KvuGCGSkuE#VOxI8vEXlPb|>|@m8*i3(1Mnu*CVT
zofbZ0JTW!baTLoeSS2UJBApg}KCaWhXyw}QplrUN_UqJa$rqc0^Y-XGc=!7S64asq
zeQ}jlJiV7}YrW}bn{1uT>lBZ=|Cl{~{E$w0w;KPpj!ONpYyDTbJ_PKam5OljcW3tx
zIuf;fp_1}QkbraX(S^GQ2NKU{3>y2p^xrGmxH7H4`aXQ)=`vT$sR*XnHr45itqMHl
z;wCwzX@Nmsd1k8a_ti0IlAm7lThj6!9A|nu)}&B978|r$=n_YNGFEp@IIXC{%Wf;<
zv0#Lk!pH<_n-bItZnkh9kf#fOBv6|>&eYs8dbgsSgaDNCe3e`IRG<>bQhGWos-9_`
z=c{n9f21mx$aV9QNs@wko)uQaP;=QPZZ!oP#ht<(sIl|m%O`63>}5p97O;|N(pQg|
zBmf9qK8}(0bk0iq(*!`10Qf&+2s%6S;f3wu_&Yc@`Q}I4FZX0hCpaB@%v4XRWQILc
zxNKO<Z=G;x>0RQToot%Grmf71`z?+kO<m<7Yi^VH%NZ#pI=PE7<Kh*n@Jf&LqGE&!
z;$4;ac37nvc+oi*7f3!X)y-y1m$@=5BfqqSQ$HD{-LQ4~W_6_;S&G?7t9$eZZZC_C
zjJKDX*^VC=-Ip?z5oF*_b-1z6#Gp*p>Y*=nT?O_y{Yrk$&H!o!pSjLkoz=HLi2S(l
ze5r0_R%(^i$wc{~FtyJfFP}zl>k@#_;;J@P4P8&fCjt;LUVk6G@AT<<D`(W!C9wG#
z+ne@|;U7J4+diI42du^xr*9l5|Iq0<94x<dspTAh=fPM70Ro`Dt=)Ms2odET0^>d-
zyJ-JB5PIy2cVh78=GuyldzMVivIKzse9cf}hVk2m*jBl_ub)oWT8%`5gRb3L`D4(L
z;+`bG%Q2pZq)y@<j4oEN$1N+REEir3YDhUJ0I|s-HE4OrC>vk4IkhdmQ*&P9Wkzy*
zPW#h|=ju(Td;8}!zt(OM0Ijl3)J%+vNyjA*F8eT_;;3b}^_|dd+)DHeOZ@~*Ah{kN
z*CDKlE@TOukQXd~s1@#-dr4hgZ820L<E|4M!xc2|<ja_hO}g`9myRwTm3XD{M|cTn
zO_x^uX9^~cT?1V;TFxf&4XyT|k&$)0W|g>x<VljKzLW*L^5&fY_!Oc0Ar)8sjjXJ2
z&Ko3VjAEA-!d$I)^siQ^Z0tkbh|#!qpRLieEC=!+cYRq|PIds-Q=+z0=FhV|sj9q|
zcf)T$B76*YG=tja;j!T*%l?*A=AEeV^v0LZ3J)@w2yRP@lfegS1+JknN;?#*cxRJp
z!%45t3^dR7vrlAC?hlP_PiYC&WLgicG9Nq>3h#cpsD2BW<U7J=sx}I3*jOsI-H13Z
z-k-8OR7fklrA)T{?xD0>*BS+GE}Q_w=Dj*IB7Su=XnEZwsK~akcrl|puF%M!vt!<e
zD&6Og%hewD=3QcIc5VYvtJQdAqetZ(QONK&4P7JyQHZF*&Bl$!#jmDZf{u>Ljaj0C
z5*IU4mcQ=w?*y(TdQLtqG<uCC0Jf7z(3K(pJlKpt%Y}&(*c0o^jM|^dK6yxP2X*mG
z;Z_h|RXU^=CfcS(JHf>zxr%KI;fRYAN*_}umWBIVJ4x2@3ldt2-i@^d%PHBdJmch(
z;LzRV%TdQ`=-n2gXRK%<LRH;*dfNs37X$mA*X)mPY;b8WJ|29bl2P&E*}l5xh?doJ
zMNQS))<r;2)uzHqoxb(k0K{lB0hpXtW|(c<I-}x_s2Sjh@*YzIC)ghFl_ZnrB2&%H
zHaV-;w-uOiYpIescd}uJ^Gmub_t(BdLzv9wwlTXKJGuN##u6%-ofkF4Z-mHgJ>{7`
zP!bSod)Q^C@I&X=%>AYf@s~}>qqlTa0<Ohw9+jNoBCmcE<j`_|GKp?D^GegEuat%U
zF}{I@Q;L4h{E|3}o9KpklDPuG=LN6aJ~)YwEs$JUk6KYQnGL*RJ(F<TsbsGI%F1E#
zt%F+|Y5I;^LGO9ia#UXXz-pEu<I7y<PZ5CVl(o#NwZ{hxY$z^NenRfFf$y3d0oX6Q
zsxERse%X^_v1W?ny!R4M&*DzaMdjjli|lyO<n(9r+iX)V5h?SCR{E)>m3lcIn<Ut1
zWZEAg-rMOL%pO4n1fYh#aWkl(suVjFwH%bcj-M<*boh+hOUoNAqncrtXIL6)nPWT@
z%{cM-8JDy!S<+9E5`aGMoyBRE@<G$0LM@6)?UskjjMvj0gfCGFZ!bT8Ui0kgTO`Y5
zv0Qur;|3?$!`JRfMb+U6iJ=_(FLLYVV)Al~mf6Cv_SIVl&hu=lJENZst}-4oV>}$F
z$M|;hXyFXkKKH^t#`PG3>7gB_w!5o}c)cF*+b+c10iq@_cZiYz1gy524@F*y&OZXA
zWoIS}yEq)Idj)5XBLKZQ5Bb<@cJkPR{Wi{@c!glP_%4L?9OGe{;VY?Q*>Wd8PHumV
zXzFt0OqFJ<bFgCA(I!)=)G09#t(I!-s%L(qDtrRGxi#As96Hoqt)fg{VLu^z|0Rb^
zyD;Yg0-zC{($u<h#uDK;9e%Ru{jqzFooh>9=3}(Ak6dadJI+{Q*&FPya`a)COz(^I
zLy|3Jv%GAw3&;JUx3((ptR7<?kbRvmH2gZM>^h<>>UDwbF(&Ni6`|=jZqu0pov}vd
zo%O@_54AltQSz$$IOCz4Y0xt<4fhchsf(ngm}1Ax2ozT)4x)MEueZE@ogtUF3bWV*
z$Tz#9s##wkC)n5NitegZYwncExnE4WSO~h7lC~+QQ#Tds+HF1sT;E98fZ}#){dw*M
z70hN<`32=~+m24wy3|K)RCn#1eEejwF}HA;<WluWQ&r6d&r1E`Y{-ZbqHCvcE;)&M
zBDN<j?EXX2_uD}acsjQ2W&{?mTE#}j2?Uj83bL@@fNJ(#30jMtK3HzsomM`9_v{dG
z%r-&u*sgw@uRfc<+3u3GG$I?lIKfomEs8V{&L7XJ2|QKtn00JwdjEOvdB-SZb8faa
zPtLiAeFi9$=v10h@dx7%Z=SkSHM7{Lp`=W7vg2aHugRx+E_L4sQd#i5C2RhE-Rm7?
zhyLfT1hp?5HEAh{56lpU188lVhu<`Cw_RSx3vKRSx>87Jd&sHZ75TD5<4)31@16;6
z-O1X|kQq0fn{`ov)PA=ttnWX+l9gWZw8SvyL3N?g<PnaC^@Go!t8pl)Gcju(2v9X<
z9c)+1xw6!wtXQ_7qm|61Y(MeoMs6!dbr&MH8qu?5Q2Zg&S0G{h%e&(ZrX%?*<8<9u
z#G}$baBP&EctOK=h)d%uD(1muRb9Sm|AI6%G|wqs8wtaKGdJI5&h@W~)Gl+UI8CBQ
z?~m(|oV!iG(Ik?wBe=AweLH78GNSRFZN$y$q7voUC*y@lsh3`-q-WmXaM1O8SaE&i
zMrcf%h*c)rQcgm@&S3j&f(m@2oHcu%{&wLy0T|v89lL0`vG#5P9Un*ci9CCFJB4j#
zc{1GVXuRL6=Az|!JzBG4#Ym=nC{+xM)~cQ#;^Ee`qDs$nd8hDoj?pmQE0V%)0WmsB
z>C#Us9PMUJcgP>6!@upbYFy)q1BZ;U9&k`zzWb1J<eu2PJFanQ<D&RXX}l)3BUl=1
zliAUxl)$N5xY3_dO8~3}Uq6zJIqY1M94BCNC40kJ<^~;ve+wbJK>$pqWzLt!S|#BN
zP}D0+BX#tvAHRmJFjhTZdsbPYsNIq=ixOuMIC-k>{r-EAq*1V~z^jrHQ`SrO@5DAL
zBk(CUX6IOk^hXo3?Vgk_+f<5-7M<8}kFVFH5|xYPxtY*@vawAd)qa^?L=9J#lq<Ad
zp0ymrvzc2Kkb@X6E`;nv(^<|5MMUR?xufS=^OA=Zl^M5#J_beoaXaGmgU`<c?N$f?
zas&KAw|h|lt|=Y3(uzLNlTGDYWU^DUII}<U##v|Xc)$8X#oEjw?RxyAH<_)U?5Bq8
zEY9#Ae|aU9C4v=Br%X9#MgY!*co^#n_IqQ!jrOOkax&-hMry(v1<=+E_7v4UeTn9R
zogaZ6$5fyE)@&cqlaU6Nt4U_2api%FhG|6%yip$4>*|f{GH5cK#F<l~q;JwFc$6M;
z!&N*gV4~$KSFugW?%NCuh?6atKx>8%J)3B3+I}87wt1mNbL4YNZB_M$In%E;kDRFv
zyqSM(y_V<CYwfO?bo8bycb2qh+9LObLmEOm*Yrq5%V-N6AC{si4ThFC72#hb44(GO
zoSDfuG$wc<>ceQtN$$9zF6pn_1q07u;zrj8ECZ%7`bsx$t{z>exrsWfRbni2I%<-(
z@v-vEn-%xA76xtZ^sQ}8-_vKh;%>4u2wDa#-3#U6400d<Jv#}ADD>_9`JAguuNu-L
z13Yxh$Xn^>2tfFbepR&fto6x9NzfGD9^q(yp3{KBXAi_+!SpeoawaP|Ge^KEKo7H6
zWSkD{q))Jp-i>M%+eXSgE_*!scGM-YCyScN@JMUeV-<wE{-OyP?xOms(v>vnx7>V2
zf)c)pm-;p4xtNB=1<LZYsgD(|ml)QWae6hDm2Eae4}Nu8*>rPx(1{d&m4q_+qR$=`
zLUoN*%*f~P_@tUzRDG+leUT}CZOe^>p}oz>_+^nvM@L;MDqN%!$V=Z2Q%Vl}%ys`E
z>$$n!-nyc`mk-2p9sp+nMWKp-7?(~Y?R)SOX9dgNsIkCZwCS5wN$A-7a_H=3cgVdD
zzsji{9h{dVkRVh8APP$bY){6Yp7b?UGgqe6%Dd-eQlKO#CdYE(oOivDqAX9(Jv~%Q
zX%}!te=aCA)m5D92FmDR%4DPd+D6)=_GW%PrGiJNtOxFgRezp?tOTFK()sz*CG^=O
zoNZVt&1iZpma#8(^nMI8EY??6DJb}3ujOzToII2}Waah}Oqse|oB$;E$`qmI6tKBY
zIjIa?#sk9Xc{#UuL<6whIzHQ4nUKa$QO-iimLjbs+|QHMQ^`8Yl}MACoCa-dpX8n{
zQ@A?KDVs51>56fR=Fmgxv7AtS%;xkdw|o8>Lo<?X3z1!h2&h-ONH<!lsT71*Fy-WV
z92x1D_->u5U+W=#4*8Zc)BV2r+pg#@G3o9GtQ<)R3{<Z&vyD{+HB5}r*UxBNVu`&(
zzXqj#cjoi!-r~NGR@Gag(YIH0EO+V<&8-eox6d^@w<@SF$Zub(9vT-;8Gb&-_;`P|
zdn37Q(5m3k>U%Jr_Z@{j+lB9~7H`SkRg=B9{60v#>;?glDd#CO7;O{iFHOs^4G+pJ
zT-UbAUduPgJ&kzoEEv)8IkVp0KJ&aK8$*wUS+{tzEJ?>jNnDM<l|I91+S%zB7wQD*
zKfgJ>bF9tVwN3l3d-J+T_9FPnbtRR@ZCUON_|I?h>(8d<yw-f>ut>jUA{Gg7>-y(G
zt_5qsQc5HD`H#eUK5BV&jQibd@q$|}(L2|-XI0K7i4p)^wv2Xa7Y_}+6qDGU!s7cP
zQ)0M_ff3P){FTWiEy#(_;F8Cna=zwxI95z&60-7`itd(F?$qFFcO|$eF==%w?~4vx
zD@GemYUJIrF}OjaPZ~hWcjU1di*V-WC&tsS447>cZ@w_$S(6@V3!TK}FfJ}_L<N}j
z^nWB@3sBaKaE&-^*dM*As4lJ%qr0dNn%P4eq;<@@hW`GP`IXL^qILY0$z%(Ov25pn
zD%mfCZN+#y(zl|?A>vOAMccEFAf!fyaR8z(FV5*Y^^V2VY)+zcU;x7@>vJ6JE0N`D
zckJKtR}ETVxe7P#Hp?NpdmgXEXmmHM<Ly{SPm*&fHYPsi&JQXgetdqAO1@!&Ke|@g
z^x-+;o$WUGg%X|;z_3+WF<>z7L*`m5x6A{M;$O8FXX{jA^eSRhB<@UlVG6+&g20xt
z1eI{dYN3h=gvqJ%i!;ZwHJ%J~S4>3uzqXET9O;cWI2kUK_&iYV7^_MbUq{+%z{n$&
z{)unPJ6#3xQ=Xf)+)-Nd-40XsG*R_}%<i=Jt9uE+0|J2h`XH4uA9?ivd7)0)+(SOb
z@`8FA`jfX}kcZllN867+(S7kb{_ThN3rOLC=E4tcCyM`g*RGJyUA~#iGI=SwKKC%2
zKcfuEZHys8>6UWw{Cu`SBX15YO0R#^ctom`-RX`$G(7J$w-uJO&FZ5O=jrXJQmRC}
zzf4Uq`va2!-Q-xK9)@+5Ua6(tGtpz6nN1Aah2ZQ;KA<EKN8K^i!yhfXZTl55UmY+P
zWxmld)lFU~ys5ptx-mG-H<A5^a7&JtSuE&G;AUP#jkY5t!WJh<Vq@2<H+w*(MJs(?
ZUuG{-=@f&sn|lR}%x;_f*qtGK_<tfu;g<ja

literal 0
HcmV?d00001

diff --git a/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/epl-v10.html
new file mode 100755
index 0000000000..ed4b196655
--- /dev/null
+++ b/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/epl-v10.html
@@ -0,0 +1,328 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 9">
+<meta name=Originator content="Microsoft Word 9">
+<link rel=File-List
+href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+@font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";}
+@page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang=EN-US style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/feature.properties
new file mode 100755
index 0000000000..7b266ca81c
--- /dev/null
+++ b/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/feature.properties
@@ -0,0 +1,144 @@
+###############################################################################
+# Copyright (c) 2000, 2007 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the 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:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse e4 Tools Source (Incubation)
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+updateSiteName=The Eclipse Project Updates
+
+# "description" property - description of the feature
+description=Source code zips for Eclipse E4 initiative.
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2007 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+########### end of license property ##########################################
diff --git a/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/license.html b/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/license.html
new file mode 100755
index 0000000000..c6af966b61
--- /dev/null
+++ b/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/license.html
@@ -0,0 +1,79 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
+<title>Eclipse.org Software User Agreement</title>
+</head>
+
+<body lang="EN-US" link=blue vlink=purple>
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>March 17, 2005</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+   
+<h3>Applicable Licenses</h3>   
+   
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
+   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+   
+<ul>
+	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>   
+ 
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+	<li>The top-level (root) directory</li>
+	<li>Plug-in and Fragment directories</li>
+	<li>Inside Plug-ins and Fragments packaged as JARs</li>
+	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+	<li>Feature directories</li>
+</ul>
+		
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
+	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+   
+<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
+</body>
+</html>
diff --git a/features/org.eclipse.e4.core.tools.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.e4.core.tools.feature/sourceTemplatePlugin/build.properties
new file mode 100755
index 0000000000..cdb3ab38f3
--- /dev/null
+++ b/features/org.eclipse.e4.core.tools.feature/sourceTemplatePlugin/build.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2000, 2006 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the 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:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes = plugin.xml, src/**, META-INF/
+sourcePlugin = true

From 648ce470d427fc20b6ec9f98f2add627057622c9 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 17 Mar 2010 14:50:59 +0000
Subject: [PATCH 0058/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * starting to contribution class lookup

---
 bundles/org.eclipse.e4.tools.emf.ui/.project  |  5 +++
 .../META-INF/MANIFEST.MF                      |  1 +
 .../OSGI-INF/contributioncollector.xml        |  5 +++
 .../build.properties                          | 11 ++----
 .../ui/common/IClassContributionProvider.java | 35 +++++++++++++++++++
 .../common/ClassContributionCollector.java    | 23 ++++++++++++
 .../dialogs/ContributionClassDialog.java      | 32 +++++++++++++++++
 7 files changed, 104 insertions(+), 8 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.project b/bundles/org.eclipse.e4.tools.emf.ui/.project
index 3848d4ae08..b7697e08f4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.project
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.project
@@ -20,6 +20,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 01777f6750..8dc53b285b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -26,3 +26,4 @@ Export-Package: org.eclipse.e4.tools.emf.ui.common,
  org.eclipse.e4.tools.emf.ui.internal.common;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.common.component;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.wbm;x-friends:="org.eclipse.e4.tools.emf.editor"
+Service-Component: OSGI-INF/contributioncollector.xml
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml
new file mode 100644
index 0000000000..aa06561e9f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.emf.ui">
+   <implementation class="org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector"/>
+   <reference bind="addContributor" cardinality="0..n" interface="org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider" name="IClassContributionProvider" policy="dynamic" unbind="removeContributor"/>
+</scr:component>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/build.properties b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
index 4ce589ce29..d72a1c5dd5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
@@ -1,14 +1,9 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id: build.properties,v 1.1 2010/03/03 21:12:20 tschindl Exp $
-
 bin.includes = .,\
                META-INF/,\
                plugin.properties,\
                icons/,\
-               about.html
+               about.html,\
+               OSGI-INF/contributioncollector.xml
+output.. = bin/
 jars.compile.order = .
 source.. = src/
-output.. = bin/
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
new file mode 100644
index 0000000000..d3cf042ab2
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.common;
+
+import java.util.List;
+
+public interface IClassContributionProvider {
+	public class ContributionData {
+		public final String bundleName;
+		public final String className;
+		public final String sourceType;
+		public final String iconPath;
+		
+		public ContributionData(String bundleName, String className, String sourceType, String iconPath) {
+			this.bundleName = bundleName;
+			this.className = className;
+			this.sourceType = sourceType;
+			this.iconPath = iconPath;
+		}
+	}
+	
+	public class Filter {
+		private String namePattern;
+	}
+	
+	public List<ContributionData> findContribution(Filter filter);
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
new file mode 100644
index 0000000000..7e35f60a41
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common;
+
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider;
+
+public class ClassContributionCollector {
+	public void addContributor(IClassContributionProvider contributor) {
+		
+	}
+	
+	public void removeContributor(IClassContributionProvider contributor) {
+		
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
new file mode 100644
index 0000000000..d00f77e78e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+public class ContributionClassDialog extends TitleAreaDialog {
+
+	public ContributionClassDialog(Shell parentShell) {
+		super(parentShell);
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite comp = (Composite) super.createDialogArea(parent);
+		
+		
+		
+		return comp;
+	}
+}

From 1d053e66161d3739ccaec7d29e15ce6184d3c366 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 17 Mar 2010 15:05:33 +0000
Subject: [PATCH 0059/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * adding resources-plugin to deal with project
 informations, ...

---
 .../.project                                  |  5 ++
 .../META-INF/MANIFEST.MF                      |  1 +
 .../OSGI-INF/pdecontributionprovider.xml      |  4 +
 .../build.properties                          |  5 +-
 .../PDEClassContributionProvider.java         | 24 +++++
 .../e4/tools/emf/editor3x/RedoAction.java     | 90 +++++++++----------
 .../e4/tools/emf/editor3x/UndoAction.java     | 87 ++++++++----------
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../ui/common/IClassContributionProvider.java |  9 +-
 9 files changed, 126 insertions(+), 102 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.project b/bundles/org.eclipse.e4.tools.emf.editor3x/.project
index 281687d11a..6682b79ae1 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.project
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.project
@@ -20,6 +20,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index a8b23b3c18..baee77a2c8 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.ui.css.core;bundle-version="0.9.0",
  org.eclipse.e4.ui.css.swt;bundle-version="0.9.1",
  org.w3c.css.sac;bundle-version="1.3.0"
+Service-Component: OSGI-INF/pdecontributionprovider.xml
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml
new file mode 100644
index 0000000000..283568552d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.emf.editor3x">
+   <implementation class="org.eclipse.e4.tools.emf.editor3x.PDEClassContributionProvider"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
index 5e4181d7c1..b2760a07f1 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
@@ -1,7 +1,8 @@
-source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
-               css/
+               css/,\
+               OSGI-INF/pdecontributionprovider.xml
+source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
new file mode 100644
index 0000000000..bf9c5d415e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x;
+
+import java.util.List;
+
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider;
+
+public class PDEClassContributionProvider implements IClassContributionProvider {
+
+	public List<ContributionData> findContribution(Filter filter) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
index a67480d322..36c0b85a8d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
@@ -13,60 +13,50 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.jface.action.Action;
 
+public class RedoAction extends Action {
+	private final IModelResource resource;
+	private final IModelResource.ModelListener listener;
 
-public class RedoAction extends Action
-{
-  private final IModelResource resource;
-  private final IModelResource.ModelListener listener;
+	public RedoAction(IModelResource resource) {
+		this.resource = resource;
+		this.listener = new IModelResource.ModelListener() {
 
-  public RedoAction(IModelResource resource)
-  {
-    this.resource = resource;
-    this.listener = new IModelResource.ModelListener()
-      {
+			public void commandStackChanged() {
+				update();
+			}
 
-        public void commandStackChanged()
-        {
-          update();
-        }
+			public void dirtyChanged() {
 
-		public void dirtyChanged() {
-			
-		}
-		
-      };
-    resource.addModelListener(listener);
-    update();
-  }
-
-  @Override
-  public void run()
-  {
-    if (resource.getEditingDomain().getCommandStack().canRedo())
-    {
-    	resource.getEditingDomain().getCommandStack().redo();
-    }
-  }
+			}
 
-  private void update()
-  {
-    if (resource.getEditingDomain().getCommandStack().canRedo())
-    {
-      setText("Redo " + resource.getEditingDomain().getCommandStack().getRedoCommand().getLabel());
-      setEnabled(true);
-    }
-    else
-    {
-      setText("Redo");
-      setEnabled(false);
-    }
-  }
+		};
+		resource.addModelListener(listener);
+		update();
+	}
 
-  /**
-   * Clean up
-   */
-  public void dispose()
-  {
-    resource.removeModelListener(listener);
-  }
+	@Override
+	public void run() {
+		if (resource.getEditingDomain().getCommandStack().canRedo()) {
+			resource.getEditingDomain().getCommandStack().redo();
+		}
+	}
+
+	private void update() {
+		if (resource.getEditingDomain().getCommandStack().canRedo()) {
+			setText("Redo "
+					+ resource.getEditingDomain().getCommandStack()
+							.getRedoCommand().getLabel());
+			setEnabled(true);
+		} else {
+			setText("Redo");
+			setEnabled(false);
+		}
+	}
+
+	/**
+	 * Clean up
+	 */
+	public void dispose() {
+		resource.removeModelListener(listener);
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
index 0d44bff024..6988d3d117 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
@@ -13,57 +13,48 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.jface.action.Action;
 
-public class UndoAction extends Action
-{
-  private final IModelResource resource;
-  private final IModelResource.ModelListener listener;
+public class UndoAction extends Action {
+	private final IModelResource resource;
+	private final IModelResource.ModelListener listener;
 
-  public UndoAction(IModelResource resource)
-  {
-    this.resource = resource;
-    this.listener = new IModelResource.ModelListener()
-      {
+	public UndoAction(IModelResource resource) {
+		this.resource = resource;
+		this.listener = new IModelResource.ModelListener() {
 
-        public void commandStackChanged()
-        {
-          update();
-        }
-        
-        public void dirtyChanged() {
-        }
-      };
-    resource.addModelListener(listener);
-    update();
-  }
+			public void commandStackChanged() {
+				update();
+			}
 
-  @Override
-  public void run()
-  {
-    if (resource.getEditingDomain().getCommandStack().canUndo())
-    {
-    	resource.getEditingDomain().getCommandStack().undo();
-    }
-  }
+			public void dirtyChanged() {
+			}
+		};
+		resource.addModelListener(listener);
+		update();
+	}
 
-  private void update()
-  {
-    if (resource.getEditingDomain().getCommandStack().canUndo())
-    {
-      setText("Undo " + resource.getEditingDomain().getCommandStack().getUndoCommand().getLabel());
-      setEnabled(true);
-    }
-    else
-    {
-      setText("Undo");
-      setEnabled(false);
-    }
-  }
+	@Override
+	public void run() {
+		if (resource.getEditingDomain().getCommandStack().canUndo()) {
+			resource.getEditingDomain().getCommandStack().undo();
+		}
+	}
 
-  /**
-   * Clean up
-   */
-  public void dispose()
-  {
-    resource.removeModelListener(listener);
-  }
+	private void update() {
+		if (resource.getEditingDomain().getCommandStack().canUndo()) {
+			setText("Undo "
+					+ resource.getEditingDomain().getCommandStack()
+							.getUndoCommand().getLabel());
+			setEnabled(true);
+		} else {
+			setText("Undo");
+			setEnabled(false);
+		}
+	}
+
+	/**
+	 * Clean up
+	 */
+	public void dispose() {
+		resource.removeModelListener(listener);
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 8dc53b285b..7982e38c20 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.equinox.common;bundle-version="3.6.0",
  org.eclipse.e4.ui.model.workbench.edit;bundle-version="0.9.1",
  org.eclipse.emf.databinding.edit;bundle-version="1.2.0",
- com.ibm.icu;bundle-version="4.2.1"
+ com.ibm.icu;bundle-version="4.2.1",
+ org.eclipse.core.resources;bundle-version="3.6.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.osgi.framework;version="1.5.0"
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
index d3cf042ab2..37cb738a54 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
@@ -12,6 +12,8 @@
 
 import java.util.List;
 
+import org.eclipse.core.resources.IProject;
+
 public interface IClassContributionProvider {
 	public class ContributionData {
 		public final String bundleName;
@@ -28,7 +30,12 @@ public ContributionData(String bundleName, String className, String sourceType,
 	}
 	
 	public class Filter {
-		private String namePattern;
+		public IProject project;
+		public final String namePattern;
+		
+		public Filter(String namePattern) {
+			this.namePattern = namePattern;
+		}
 	}
 	
 	public List<ContributionData> findContribution(Filter filter);

From 255a7a285ab4e44dfcc198550065ce112e73cb82 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 17 Mar 2010 16:45:34 +0000
Subject: [PATCH 0060/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * using JDT to look up classes

---
 .../META-INF/MANIFEST.MF                      |   7 +-
 .../OSGI-INF/pdecontributionprovider.xml      |   5 +-
 .../emf/editor3x/E4WorkbenchModelEditor.java  |   6 +-
 .../PDEClassContributionProvider.java         |  81 +++++++++++++-
 .../META-INF/MANIFEST.MF                      |   3 +-
 .../OSGI-INF/contributioncollector.xml        |   3 +
 .../ui/common/IClassContributionProvider.java |  13 ++-
 .../common/ClassContributionCollector.java    |  18 +++-
 .../emf/ui/internal/common/ModelEditor.java   |   7 +-
 .../common/component/HandlerEditor.java       |  15 ++-
 .../dialogs/ContributionClassDialog.java      | 100 +++++++++++++++++-
 .../internal/wbm/ApplicationModelEditor.java  |   9 +-
 12 files changed, 242 insertions(+), 25 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index baee77a2c8..dd63143407 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -13,5 +13,10 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.ui.workbench;bundle-version="0.9.1",
  org.eclipse.e4.ui.css.core;bundle-version="0.9.0",
  org.eclipse.e4.ui.css.swt;bundle-version="0.9.1",
- org.w3c.css.sac;bundle-version="1.3.0"
+ org.w3c.css.sac;bundle-version="1.3.0",
+ org.eclipse.pde.core;bundle-version="3.6.0",
+ org.eclipse.core.resources;bundle-version="3.6.0",
+ org.eclipse.jdt.core;bundle-version="3.6.0",
+ org.eclipse.ui.ide;bundle-version="3.6.0"
 Service-Component: OSGI-INF/pdecontributionprovider.xml
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml
index 283568552d..dbd21aa8b9 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.emf.editor3x">
    <implementation class="org.eclipse.e4.tools.emf.editor3x.PDEClassContributionProvider"/>
-</scr:component>
\ No newline at end of file
+   <service>
+      <provide interface="org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider"/>
+   </service>
+</scr:component>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
index b3d2f279f0..e1452e8119 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -15,6 +15,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource.ModelListener;
@@ -30,6 +31,7 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.part.EditorPart;
@@ -128,8 +130,8 @@ public void createPartControl(Composite parent) {
 		layout.marginWidth = 10;
 		layout.marginHeight = 10;
 		comp.setLayout(layout);
-
-		editor = new ApplicationModelEditor(comp, resource);
+		IFileEditorInput input = (IFileEditorInput)getEditorInput();
+		editor = new ApplicationModelEditor(comp, resource, input.getFile().getProject());
 
 		try {
 			parent.setRedraw(false);
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index bf9c5d415e..f3ab1ba881 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -13,12 +13,87 @@
 import java.util.List;
 
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.search.IJavaSearchConstants;
+import org.eclipse.jdt.core.search.IJavaSearchScope;
+import org.eclipse.jdt.core.search.SearchEngine;
+import org.eclipse.jdt.core.search.SearchPattern;
+import org.eclipse.jdt.core.search.TypeNameRequestor;
+import org.eclipse.pde.internal.core.util.PDEJavaHelper;
 
 public class PDEClassContributionProvider implements IClassContributionProvider {
+	private SearchEngine searchEngine;
+	public PDEClassContributionProvider() {
+		searchEngine = new SearchEngine();
+	}
+	
+	@SuppressWarnings("restriction")
+	public void findContribution(Filter filter,  final ContributionResultHandler handler) {
+		System.err.println("Searching for: " + filter.namePattern);
+		
+		IJavaSearchScope scope = PDEJavaHelper.getSearchScope(filter.project);
+		
+		char[] packageName = null;
+		char[] typeName = null;
+		String currentContent = filter.namePattern;
+		int index = currentContent.lastIndexOf('.');
 
-	public List<ContributionData> findContribution(Filter filter) {
-		// TODO Auto-generated method stub
-		return null;
+		if (index == -1) {
+			// There is no package qualification
+			// Perform the search only on the type name
+			typeName = currentContent.toCharArray();
+		} else if ((index + 1) == currentContent.length()) {
+			// There is a package qualification and the last character is a
+			// dot
+			// Perform the search for all types under the given package
+			// Pattern for all types
+			typeName = "".toCharArray(); //$NON-NLS-1$
+			// Package name without the trailing dot
+			packageName = currentContent.substring(0, index).toCharArray();
+		} else {
+			// There is a package qualification, followed by a dot, and 
+			// a type fragment
+			// Type name without the package qualification
+			typeName = currentContent.substring(index + 1).toCharArray();
+			// Package name without the trailing dot
+			packageName = currentContent.substring(0, index).toCharArray();
+		}
+		
+//		char[] packageName = "at.bestsolution.e4.handlers".toCharArray();
+//		char[] typeName = "*".toCharArray();
+		
+		TypeNameRequestor req = new TypeNameRequestor() {
+			public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path) {
+				// Accept search results from the JDT SearchEngine
+				String cName = new String(simpleTypeName);
+				String pName = new String(packageName);
+				String label = cName + " - " + pName; //$NON-NLS-1$
+				String content = pName + "." + cName; //$NON-NLS-1$
+				System.err.println("Found: " + label + " => " + pName);
+				
+				ContributionData data = new ContributionData(null, content, "Java", null);
+				handler.result(data);
+				
+				//Image image = (Flags.isInterface(modifiers)) ? PDEPluginImages.get(PDEPluginImages.OBJ_DESC_GENERATE_INTERFACE) : PDEPluginImages.get(PDEPluginImages.OBJ_DESC_GENERATE_CLASS);
+				//addProposalToCollection(c, startOffset, length, label, content, image);
+			}
+		};
+		
+		try {
+			searchEngine.searchAllTypeNames(
+					packageName, 
+					SearchPattern.R_EXACT_MATCH, 
+					typeName, 
+					SearchPattern.R_PREFIX_MATCH, 
+					IJavaSearchConstants.CLASS, 
+					scope, 
+					req, 
+					IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, null);
+		} catch (JavaModelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 7982e38c20..d622a13711 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.e4.ui.model.workbench.edit;bundle-version="0.9.1",
  org.eclipse.emf.databinding.edit;bundle-version="1.2.0",
  com.ibm.icu;bundle-version="4.2.1",
- org.eclipse.core.resources;bundle-version="3.6.0"
+ org.eclipse.core.resources;bundle-version="3.6.0",
+ org.eclipse.e4.core.services;bundle-version="0.9.1"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.osgi.framework;version="1.5.0"
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml
index aa06561e9f..42e124fe44 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml
@@ -2,4 +2,7 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.emf.ui">
    <implementation class="org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector"/>
    <reference bind="addContributor" cardinality="0..n" interface="org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider" name="IClassContributionProvider" policy="dynamic" unbind="removeContributor"/>
+   <service>
+      <provide interface="org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector"/>
+   </service>
 </scr:component>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
index 37cb738a54..53383e00f5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
-import java.util.List;
-
 import org.eclipse.core.resources.IProject;
 
 public interface IClassContributionProvider {
@@ -30,13 +28,18 @@ public ContributionData(String bundleName, String className, String sourceType,
 	}
 	
 	public class Filter {
-		public IProject project;
+		public final IProject project;
 		public final String namePattern;
 		
-		public Filter(String namePattern) {
+		public Filter(IProject project, String namePattern) {
+			this.project = project;
 			this.namePattern = namePattern;
 		}
 	}
 	
-	public List<ContributionData> findContribution(Filter filter);
+	public interface ContributionResultHandler {
+		public void result(ContributionData data);
+	}
+	
+	public void findContribution(Filter filter, ContributionResultHandler handler);
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
index 7e35f60a41..a976bc2261 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
@@ -10,14 +10,30 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
+
+import java.util.concurrent.CopyOnWriteArrayList;
+
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionResultHandler;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
 
 public class ClassContributionCollector {
+	private CopyOnWriteArrayList<IClassContributionProvider> providers = new CopyOnWriteArrayList<IClassContributionProvider>();
+	
 	public void addContributor(IClassContributionProvider contributor) {
-		
+		System.err.println("Add Contributor: " + contributor);
+		providers.add(contributor);
 	}
 	
 	public void removeContributor(IClassContributionProvider contributor) {
+		System.err.println("Remove Contributor: " + contributor);
+		providers.remove(contributor);
+	}
+	
+	public void findContributions(Filter filter, ContributionResultHandler resultHandler) {
 		
+		for( IClassContributionProvider contributor: providers ) {
+			contributor.findContribution(filter, resultHandler);
+		}
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 03f1e020e1..d9a67c5b75 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -26,6 +26,7 @@
 import org.eclipse.core.databinding.observable.set.ISetChangeListener;
 import org.eclipse.core.databinding.observable.set.SetChangeEvent;
 import org.eclipse.core.databinding.observable.set.WritableSet;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
@@ -105,10 +106,12 @@ public class ModelEditor {
 
 	private TreeViewer viewer;
 	private IModelResource modelProvider;
+	private IProject project;
 
 	@Inject
-	public ModelEditor(Composite composite, IModelResource modelProvider) {
+	public ModelEditor(Composite composite, IModelResource modelProvider, IProject project) {
 		this.modelProvider = modelProvider;
+		this.project = project;
 		registerDefaultEditors();
 		registerVirtualEditors();
 		SashForm form = new SashForm(composite, SWT.HORIZONTAL);
@@ -259,7 +262,7 @@ private void registerDefaultEditors() {
 		registerEditor(MApplicationPackage.Literals.PART, new PartEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.PART_DESCRIPTOR, new PartDescriptorEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain(),modelProvider));
-		registerEditor(MApplicationPackage.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(),modelProvider));
+		registerEditor(MApplicationPackage.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(),modelProvider,project));
 		registerEditor(MApplicationPackage.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.PART_SASH_CONTAINER, new PartSashContainerEditor(modelProvider.getEditingDomain(), this));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index a52beeb095..14896d3312 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -14,8 +14,10 @@
 import java.net.URL;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandlerCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MHandler;
@@ -42,10 +44,12 @@ public class HandlerEditor extends AbstractComponentEditor {
 	private Image image;
 	private EMFDataBindingContext context;
 	private IModelResource resource;
+	private IProject project;
 
-	public HandlerEditor(EditingDomain editingDomain, IModelResource resource) {
+	public HandlerEditor(EditingDomain editingDomain, IModelResource resource, IProject project) {
 		super(editingDomain);
 		this.resource = resource;
+		this.project = project;
 	}
 
 	@Override
@@ -131,10 +135,17 @@ public void widgetSelected(SelectionEvent e) {
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(getMaster()));
 
-			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 			b.setText("Find ...");
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project);
+					dialog.open();
+				}
+			});
 		}
 
 		ControlFactory.createTagsWidget(parent, this);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index d00f77e78e..67a11d670f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -10,23 +10,119 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionResultHandler;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
+import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
+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.Control;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
 
 public class ContributionClassDialog extends TitleAreaDialog {
-
-	public ContributionClassDialog(Shell parentShell) {
+	private IProject project;
+	
+	public ContributionClassDialog(Shell parentShell, IProject project) {
 		super(parentShell);
+		this.project = project;
 	}
 
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite comp = (Composite) super.createDialogArea(parent);
 		
+		Composite container = new Composite(comp, SWT.NONE);
+		container.setLayoutData(new GridData(GridData.FILL_BOTH));
+		container.setLayout(new GridLayout(2,false));
+		
+		Label l = new Label(container, SWT.NONE);
+		l.setText("Classname");
+		
+		final Text t = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		
+		l = new Label(container,SWT.NONE);
+		
+		TableViewer viewer = new TableViewer(container);
+		GridData gd = new GridData(GridData.FILL_BOTH);
+		viewer.getControl().setLayoutData(gd);
+		viewer.setContentProvider(new ObservableListContentProvider());
+		viewer.setLabelProvider(new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				return ((ContributionData)element).className;
+			}
+		});
+		
+		final WritableList list = new WritableList();
+		viewer.setInput(list);
+		
+		final ClassContributionCollector collector = getCollector();
 		
+		t.addModifyListener(new ModifyListener() {
+			private ContributionResultHandlerImpl currentResultHandler;
+			
+			public void modifyText(ModifyEvent e) {
+				if( currentResultHandler != null ) {
+					currentResultHandler.cancled = true;
+				}
+				list.clear();
+				currentResultHandler = new ContributionResultHandlerImpl(list);
+				Filter filter = new Filter(project, t.getText());
+				collector.findContributions(filter, currentResultHandler);
+			}
+		});
+		
+//		collector.findContributions(new Filter(project, "at.bestsolution.e4.handlers.*"), new ContributionResultHandler() {
+//			
+//			public void result(ContributionData data) {
+//				System.err.println(data.className);
+//			}
+//		});
 		
 		return comp;
 	}
+	
+	private ClassContributionCollector getCollector() {
+		Bundle bundle = FrameworkUtil.getBundle(ContributionClassDialog.class);
+		BundleContext context = bundle.getBundleContext();
+		ServiceReference ref = context.getServiceReference(ClassContributionCollector.class.getName());
+		if( ref != null ) {
+			return (ClassContributionCollector) context.getService(ref);
+		}
+		return null;
+	}
+	
+	private class ContributionResultHandlerImpl implements ContributionResultHandler {
+		private boolean cancled = false;
+		private IObservableList list;
+		
+		public ContributionResultHandlerImpl(IObservableList list) {
+			this.list = list;
+		}
+		
+		public void result(ContributionData data) {
+			if( ! cancled ) {
+				list.add(data);
+			}
+		}
+		
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index ea7dfd9e39..51ddad58d1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -10,17 +10,16 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.wbm;
 
-import javax.inject.Inject;
-
+import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.swt.widgets.Composite;
 
 public class ApplicationModelEditor extends ModelEditor {
-	@Inject
 	public ApplicationModelEditor(Composite composite,
-			IModelResource modelProvider) {
-		super(composite, modelProvider);
+			IModelResource modelProvider, IProject project) {
+		super(composite, modelProvider, project);
 	}
 
+	
 }

From 92d4ada86634a3259a02fbc612f0069f2843cd28 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 17 Mar 2010 16:52:21 +0000
Subject: [PATCH 0061/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * removed unneeded code

---
 .../component/dialogs/ContributionClassDialog.java       | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index 67a11d670f..3743b139d2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -89,14 +89,7 @@ public void modifyText(ModifyEvent e) {
 				collector.findContributions(filter, currentResultHandler);
 			}
 		});
-		
-//		collector.findContributions(new Filter(project, "at.bestsolution.e4.handlers.*"), new ContributionResultHandler() {
-//			
-//			public void result(ContributionData data) {
-//				System.err.println(data.className);
-//			}
-//		});
-		
+				
 		return comp;
 	}
 	

From 82d9f058af71a36d5e4f40845b55223cc45e48e4 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 17 Mar 2010 17:51:42 +0000
Subject: [PATCH 0062/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * a frist working implementation for class selection

---
 .../PDEClassContributionProvider.java         |  47 ++++++++++++++++--
 .../icons/full/obj16/class_obj.gif            | Bin 0 -> 586 bytes
 .../common/ComponentLabelProvider.java        |  10 +---
 .../AbstractCommandSelectionDialog.java       |  13 +----
 .../dialogs/ContributionClassDialog.java      |  45 +++++++++++++++--
 5 files changed, 86 insertions(+), 29 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.gif

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index f3ab1ba881..7b66d31cd3 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -10,8 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.List;
+import java.util.StringTokenizer;
 
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.search.IJavaSearchConstants;
@@ -28,7 +37,7 @@ public PDEClassContributionProvider() {
 	}
 	
 	@SuppressWarnings("restriction")
-	public void findContribution(Filter filter,  final ContributionResultHandler handler) {
+	public void findContribution(final Filter filter,  final ContributionResultHandler handler) {
 		System.err.println("Searching for: " + filter.namePattern);
 		
 		IJavaSearchScope scope = PDEJavaHelper.getSearchScope(filter.project);
@@ -69,10 +78,40 @@ public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
 				String pName = new String(packageName);
 				String label = cName + " - " + pName; //$NON-NLS-1$
 				String content = pName + "." + cName; //$NON-NLS-1$
-				System.err.println("Found: " + label + " => " + pName);
 				
-				ContributionData data = new ContributionData(null, content, "Java", null);
-				handler.result(data);
+//				System.err.println("Found: " + label + " => " + pName + " => " + path);
+				
+				IResource resource = filter.project.getWorkspace().getRoot().findMember(path);
+				
+				if( resource != null ) {
+					IProject project = resource.getProject();
+					IFile f = project.getFile("/META-INF/MANIFEST.MF");
+					
+					if( f != null && f.exists() ) {
+						try {
+							InputStream s = f.getContents();
+							BufferedReader r = new BufferedReader(new InputStreamReader(s));
+							String line;
+							while( (line = r.readLine()) != null ) {
+								if( line.startsWith("Bundle-SymbolicName:") ) {
+									int start = line.indexOf(':');
+									int end = line.indexOf(';');
+									ContributionData data = new ContributionData(line.substring(start+1,end), content, "Java", null);
+									handler.result(data);
+									break;
+								}
+							}
+								
+						} catch (CoreException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						} catch (IOException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
+					}
+				}
+				
 				
 				//Image image = (Flags.isInterface(modifiers)) ? PDEPluginImages.get(PDEPluginImages.OBJ_DESC_GENERATE_INTERFACE) : PDEPluginImages.get(PDEPluginImages.OBJ_DESC_GENERATE_CLASS);
 				//addProposalToCollection(c, startOffset, length, label, content, image);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e4c2a836f83e7dc72d29873fded01e7206eba2f5
GIT binary patch
literal 586
zcmZ?wbhEHb6krfwc*ekxv!c<s$=9se-=Q<YsXNN8KQ3fOR@Cf*m^p=Yn<q4Gopkom
z6_qkOy&5;;MsLfufQUJ{vGWR(7nLtMxlXsnMX%OXzt+v54k+vCJt@I!LR|T}_8Twn
z8a23^wRl;#``dR0_3fQy*Wqv15n$II;MN!J-X9S(Eh&3>RsX(Ohwq+z^!{nkw1lu(
zDPc2HV&`P7KEHX-jYA>R6T@ewM9fTyo0E0x)!k<wUj$8y`}qA+!h+12O)Zt{8e4bt
z^z51Z;rqwPnTZ)o@)H-NC(KKmcWmLES9jAFW#uj_C|_66u(_dnV^!t4^7b9Ajhky9
zzJD-rU(e=C8}{7Xx$oBQ`NwB1I6iy#jqQi->_2wz@P-Sk|APSoeSzXn7Dfh!C<Yyn
zwV*g*U|-%4)fB}oD9JA+$lcr%#l`RFG0BmUtG7?qHzF)NEX0#%S~EAlcTnVt6@gxi
z-A(LH!7D=j10wx=oP?TLEnFg9oe#OYxjC>lGm2|QYKe-7h)T#Q@$He9j?`9AQ4ux}
zP&?5iq-<&#X{ezXX|J!t&@97aWMj6{+|Gn&T@xp-YRQ`y8=a5yFmmdtZYWsP+AXH8
bqq4{4!~q5-W`Qq@Pi$O#yuX);k--`O+yTtY

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index b5633d98f2..a06d3302e0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -47,15 +47,7 @@ public void update(final ViewerCell cell) {
 					cell.setText(label);
 				} else {
 					StyledString styledString = new StyledString(label, null);
-					Styler styler = new Styler() {
-
-						@Override
-						public void applyStyles(TextStyle textStyle) {
-							textStyle.foreground = cell.getControl().getDisplay().getSystemColor(SWT.COLOR_GRAY);
-						}
-					};
-
-			        styledString.append(" - " + detailText, styler);
+					styledString.append(" - " + detailText, StyledString.DECORATIONS_STYLER);
 					cell.setText(styledString.getString());
 					cell.setStyleRanges(styledString.getStyleRanges());
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index 0e59caf02f..9e8fb32435 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -29,12 +29,10 @@
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.jface.viewers.StyledString.Styler;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.TextStyle;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -127,13 +125,6 @@ protected void okPressed() {
 	protected abstract Command createStoreCommand( EditingDomain editingDomain, MCommand command);
 	
 	private class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
-		private Styler styler = new Styler() {
-
-			@Override
-			public void applyStyles(TextStyle textStyle) {
-				textStyle.foreground = getShell().getDisplay().getSystemColor(SWT.COLOR_GRAY);
-			}
-		};
 		
 		public void update(final ViewerCell cell) {
 			MCommand cmd = (MCommand) cell.getElement();
@@ -143,10 +134,10 @@ public void update(final ViewerCell cell) {
 				styledString.append(cmd.getCommandName());
 			}
 			if( cmd.getDescription() != null ) {
-				styledString.append(" - " + cmd.getDescription(),styler);
+				styledString.append(" - " + cmd.getDescription(),StyledString.DECORATIONS_STYLER);
 			}
 			if( cmd.getId() != null ) {
-				styledString.append(" - " + cmd.getId(),styler);
+				styledString.append(" - " + cmd.getId(),StyledString.DECORATIONS_STYLER);
 			}
 			cell.setText(styledString.getString());
 			cell.setStyleRanges(styledString.getStyleRanges());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index 3743b139d2..d0593091da 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -19,11 +19,18 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.jface.viewers.StyledString.Styler;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.TextStyle;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -38,16 +45,26 @@
 
 public class ContributionClassDialog extends TitleAreaDialog {
 	private IProject project;
+	private Image javaClassImage;
 	
 	public ContributionClassDialog(Shell parentShell, IProject project) {
 		super(parentShell);
-		this.project = project;
+		this.project = project;		
 	}
 
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite comp = (Composite) super.createDialogArea(parent);
 		
+		getShell().addDisposeListener(new DisposeListener() {
+			
+			public void widgetDisposed(DisposeEvent e) {
+				javaClassImage.dispose();
+			}
+		});
+		
+		javaClassImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/class_obj.gif"));
+		
 		Composite container = new Composite(comp, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 		container.setLayout(new GridLayout(2,false));
@@ -64,13 +81,31 @@ protected Control createDialogArea(Composite parent) {
 		GridData gd = new GridData(GridData.FILL_BOTH);
 		viewer.getControl().setLayoutData(gd);
 		viewer.setContentProvider(new ObservableListContentProvider());
-		viewer.setLabelProvider(new LabelProvider() {
+		viewer.setLabelProvider(new StyledCellLabelProvider() {
 			@Override
-			public String getText(Object element) {
-				return ((ContributionData)element).className;
+			public void update(ViewerCell cell) {
+				ContributionData data = (ContributionData) cell.getElement();
+				StyledString styledString = new StyledString(data.className, null);
+				
+				if( data.bundleName != null ) {
+					styledString.append(" - " + data.bundleName, StyledString.DECORATIONS_STYLER);
+				}
+				
+				if( data.sourceType != null ) {
+					styledString.append(" - ", StyledString.DECORATIONS_STYLER);
+					styledString.append(data.sourceType + "", StyledString.COUNTER_STYLER);
+				}
+				
+				if( data.iconPath == null ) {
+					cell.setImage(javaClassImage);
+				}
+				
+				cell.setText(styledString.getString());
+				cell.setStyleRanges(styledString.getStyleRanges());
 			}
 		});
 		
+		
 		final WritableList list = new WritableList();
 		viewer.setInput(list);
 		

From c34c3ed813ef8447a8bd8949a40a9ffbf087dac6 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 17 Mar 2010 18:07:19 +0000
Subject: [PATCH 0063/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * look and setting of command handler working

---
 .../PDEClassContributionProvider.java         |  4 +-
 .../common/component/HandlerEditor.java       |  3 +-
 .../dialogs/ContributionClassDialog.java      | 43 ++++++++++++++++---
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index 7b66d31cd3..7a205c2883 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -14,8 +14,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.List;
-import java.util.StringTokenizer;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -96,7 +94,7 @@ public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
 								if( line.startsWith("Bundle-SymbolicName:") ) {
 									int start = line.indexOf(':');
 									int end = line.indexOf(';');
-									ContributionData data = new ContributionData(line.substring(start+1,end), content, "Java", null);
+									ContributionData data = new ContributionData(line.substring(start+1,end).trim(), content, "Java", null);
 									handler.result(data);
 									break;
 								}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 14896d3312..714683ffd3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -20,6 +20,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandlerCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.MHandler;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -142,7 +143,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue());
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index d0593091da..ab0d2fb693 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -17,20 +17,26 @@
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionResultHandler;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
 import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MContribution;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.jface.viewers.StyledString.Styler;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.TextStyle;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -46,10 +52,15 @@
 public class ContributionClassDialog extends TitleAreaDialog {
 	private IProject project;
 	private Image javaClassImage;
+	private MContribution contribution;
+	private EditingDomain editingDomain;
+	private TableViewer viewer;
 	
-	public ContributionClassDialog(Shell parentShell, IProject project) {
+	public ContributionClassDialog(Shell parentShell, IProject project, EditingDomain editingDomain, MContribution contribution) {
 		super(parentShell);
-		this.project = project;		
+		this.project = project;	
+		this.contribution = contribution;
+		this.editingDomain = editingDomain;
 	}
 
 	@Override
@@ -77,7 +88,7 @@ public void widgetDisposed(DisposeEvent e) {
 		
 		l = new Label(container,SWT.NONE);
 		
-		TableViewer viewer = new TableViewer(container);
+		viewer = new TableViewer(container);
 		GridData gd = new GridData(GridData.FILL_BOTH);
 		viewer.getControl().setLayoutData(gd);
 		viewer.setContentProvider(new ObservableListContentProvider());
@@ -104,6 +115,12 @@ public void update(ViewerCell cell) {
 				cell.setStyleRanges(styledString.getStyleRanges());
 			}
 		});
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+			
+			public void doubleClick(DoubleClickEvent event) {
+				okPressed();
+			}
+		});
 		
 		
 		final WritableList list = new WritableList();
@@ -128,6 +145,20 @@ public void modifyText(ModifyEvent e) {
 		return comp;
 	}
 	
+	@Override
+	protected void okPressed() {
+		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+		if( ! s.isEmpty() ) {
+			ContributionData cd = (ContributionData) s.getFirstElement();
+			String uri = "platform:/plugin/" + cd.bundleName + "/" + cd.className;
+			Command cmd = SetCommand.create(editingDomain, contribution, MApplicationPackage.Literals.CONTRIBUTION__URI, uri);
+			if( cmd.canExecute() ) {
+				editingDomain.getCommandStack().execute(cmd);
+				super.okPressed();
+			}
+		}
+	}
+	
 	private ClassContributionCollector getCollector() {
 		Bundle bundle = FrameworkUtil.getBundle(ContributionClassDialog.class);
 		BundleContext context = bundle.getBundleContext();
@@ -153,4 +184,4 @@ public void result(ContributionData data) {
 		}
 		
 	}
-}
+}
\ No newline at end of file

From 2f4c4d7f45b15c7da6730060bfbecea78d3fc285 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 17 Mar 2010 18:15:21 +0000
Subject: [PATCH 0064/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * class look up for all MContribution-Types

---
 .../emf/ui/internal/common/ModelEditor.java   |  8 +++----
 .../component/DirectMenuItemEditor.java       | 20 ++++++++++++++---
 .../component/DirectToolItemEditor.java       | 18 +++++++++++++--
 .../component/PartDescriptorEditor.java       | 22 +++++++++++++++----
 .../internal/common/component/PartEditor.java | 20 ++++++++++++++---
 5 files changed, 72 insertions(+), 16 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index d9a67c5b75..ecdf445662 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -259,8 +259,8 @@ private void registerDefaultEditors() {
 		registerEditor(MApplicationPackage.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.MODEL_COMPONENTS, new ModelComponentsEditor(modelProvider.getEditingDomain(),this));
 		registerEditor(MApplicationPackage.Literals.MODEL_COMPONENT, new ModelComponentEditor(modelProvider.getEditingDomain()));
-		registerEditor(MApplicationPackage.Literals.PART, new PartEditor(modelProvider.getEditingDomain()));
-		registerEditor(MApplicationPackage.Literals.PART_DESCRIPTOR, new PartDescriptorEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.PART, new PartEditor(modelProvider.getEditingDomain(),project));
+		registerEditor(MApplicationPackage.Literals.PART_DESCRIPTOR, new PartDescriptorEditor(modelProvider.getEditingDomain(),project));
 		registerEditor(MApplicationPackage.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain(),modelProvider));
 		registerEditor(MApplicationPackage.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(),modelProvider,project));
 		registerEditor(MApplicationPackage.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain()));
@@ -269,7 +269,7 @@ private void registerDefaultEditors() {
 		registerEditor(MApplicationPackage.Literals.PART_STACK, new PartStackEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.WINDOW_TRIM, new WindowTrimEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(MApplicationPackage.Literals.TOOL_BAR, new ToolBarEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(MApplicationPackage.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor(modelProvider.getEditingDomain(),project));
 		registerEditor(MApplicationPackage.Literals.HANDLED_TOOL_ITEM, new HandledToolItemEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.TOOL_ITEM, new ToolItemEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.PERSPECTIVE_STACK, new PerspectiveStackEditor(modelProvider.getEditingDomain()));
@@ -278,7 +278,7 @@ private void registerDefaultEditors() {
 		registerEditor(MApplicationPackage.Literals.MENU, new MenuEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(MApplicationPackage.Literals.MENU_ITEM, new MenuItemEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(MApplicationPackage.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(MApplicationPackage.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(MApplicationPackage.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this, project));
 		registerEditor(MApplicationPackage.Literals.BINDING_TABLE, new BindingTableEditor(modelProvider.getEditingDomain(), this));
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 408a5ae179..b7065fd31f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -14,14 +14,19 @@
 import java.net.URL;
 
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
@@ -32,9 +37,11 @@
 
 public class DirectMenuItemEditor extends MenuItemEditor {
 	private Image image;
+	private IProject project;
 	
-	public DirectMenuItemEditor(EditingDomain editingDomain, ModelEditor editor) {
+	public DirectMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain, editor);
+		this.project = project;
 	}
 
 	@Override
@@ -74,9 +81,16 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
 
-			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText("Find ...");			
+			b.setText("Find ...");
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue());
+					dialog.open();
+				}
+			});
 		}
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 183cbf2cab..b076239a69 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -14,13 +14,18 @@
 import java.net.URL;
 
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
@@ -31,9 +36,11 @@
 
 public class DirectToolItemEditor extends ToolItemEditor {
 	private Image image;
+	private IProject project;
 
-	public DirectToolItemEditor(EditingDomain editingDomain) {
+	public DirectToolItemEditor(EditingDomain editingDomain, IProject project) {
 		super(editingDomain);
+		this.project = project;
 	}
 
 	@Override
@@ -62,10 +69,17 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value( getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
 
-		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+		final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 		b.setText("Find ...");
 		b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue());
+				dialog.open();
+			}
+		});
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index e65cd34744..f012cd6830 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -18,10 +18,13 @@
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.MPart;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -38,6 +41,8 @@
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -52,12 +57,14 @@ public class PartDescriptorEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
-
+	private IProject project;
+	
 	private IListProperty PART__MENUS = EMFProperties.list(MApplicationPackage.Literals.PART__MENUS);
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
 
-	public PartDescriptorEditor(EditingDomain editingDomain) {
+	public PartDescriptorEditor(EditingDomain editingDomain, IProject project) {
 		super(editingDomain);
+		this.project = project;
 	}
 
 	@Override
@@ -159,9 +166,16 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
 
-			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText("Find ...");			
+			b.setText("Find ...");
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue());
+					dialog.open();
+				}
+			});
 		}
 		
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index eb28d707bd..60d5e55052 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -18,10 +18,13 @@
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.MPart;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -38,6 +41,8 @@
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -52,12 +57,14 @@ public class PartEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
+	private IProject project;
 
 	private IListProperty PART__MENUS = EMFProperties.list(MApplicationPackage.Literals.PART__MENUS);
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
 
-	public PartEditor(EditingDomain editingDomain) {
+	public PartEditor(EditingDomain editingDomain, IProject project) {
 		super(editingDomain);
+		this.project = project;
 	}
 
 	@Override
@@ -159,9 +166,16 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
 
-			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText("Find ...");			
+			b.setText("Find ...");
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue());
+					dialog.open();
+				}
+			});
 		}
 		
 		// ------------------------------------------------------------

From bad714d14082b5325201eccf105bdd1a7bb5ceab Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 18 Mar 2010 08:32:47 +0000
Subject: [PATCH 0065/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * ensure white background

---
 .../eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java   | 1 +
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
index e1452e8119..f2ab75ca2e 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -125,6 +125,7 @@ public void createPartControl(Composite parent) {
 		setupCss(parent.getDisplay());
 		Composite comp = new Composite(parent, SWT.NONE);
 		comp.setBackground(comp.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+		comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
 
 		FillLayout layout = new FillLayout();
 		layout.marginWidth = 10;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index ecdf445662..46c6f0c99c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -192,6 +192,8 @@ public void selectionChanged(SelectionChangedEvent event) {
 	private TreeViewer createTreeViewerArea(Composite parent) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+		parent.setBackgroundMode(SWT.INHERIT_DEFAULT);
+		
 		FillLayout l = new FillLayout();
 		l.marginWidth = 5;
 		parent.setLayout(l);

From 3ff9427ab2dad851c6e80f7b08044360b52d60fa Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 18 Mar 2010 09:04:10 +0000
Subject: [PATCH 0066/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * add possibility to add parts to a part stack

---
 .../emf/ui/internal/common/ModelEditor.java   |   2 +-
 .../common/component/PartStackEditor.java     | 139 +++++++++++++++++-
 2 files changed, 139 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 46c6f0c99c..23bec3c6b4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -268,7 +268,7 @@ private void registerDefaultEditors() {
 		registerEditor(MApplicationPackage.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain()));
 		registerEditor(MApplicationPackage.Literals.PART_SASH_CONTAINER, new PartSashContainerEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(MApplicationPackage.Literals.PART_STACK, new PartStackEditor(modelProvider.getEditingDomain()));
+		registerEditor(MApplicationPackage.Literals.PART_STACK, new PartStackEditor(modelProvider.getEditingDomain(),this));
 		registerEditor(MApplicationPackage.Literals.WINDOW_TRIM, new WindowTrimEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(MApplicationPackage.Literals.TOOL_BAR, new ToolBarEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(MApplicationPackage.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor(modelProvider.getEditingDomain(),project));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 31ab7ea114..3dc0d67998 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -12,6 +12,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.List;
 
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -21,23 +22,41 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MElementContainer;
+import org.eclipse.e4.ui.model.application.MPart;
+import org.eclipse.e4.ui.model.application.MToolBar;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.databinding.viewers.ViewerSupport;
 import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
@@ -48,11 +67,13 @@ public class PartStackEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
+	private ModelEditor editor;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
 
-	public PartStackEditor(EditingDomain editingDomain) {
+	public PartStackEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
+		this.editor = editor;
 	}
 
 	@Override
@@ -143,6 +164,122 @@ public void handleValueChange(ValueChangeEvent event) {
 				}
 			});
 		}
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Parts");
+			
+			final TableViewer viewer = new TableViewer(parent);
+			viewer.setContentProvider(new ObservableListContentProvider());
+			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			
+			
+			IEMFListProperty prop = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(getMaster()));
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() { 
+				@Override
+				public void widgetSelected(SelectionEvent e) {  
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) + 1;
+							if( idx < container.getChildren().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add Part");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MPart part = MApplicationFactory.eINSTANCE.createPart();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, part);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(part);
+					}
+				}
+			});
+			
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
+						
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
 
 		ControlFactory.createTagsWidget(parent, this);
 

From a3f4ae38a14175dfa260d010d3accd570343fb90 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 18 Mar 2010 09:39:56 +0000
Subject: [PATCH 0067/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * add some description text

---
 .../common/component/dialogs/ContributionClassDialog.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index ab0d2fb693..d12ccd5362 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -67,6 +67,10 @@ public ContributionClassDialog(Shell parentShell, IProject project, EditingDomai
 	protected Control createDialogArea(Composite parent) {
 		Composite comp = (Composite) super.createDialogArea(parent);
 		
+		getShell().setText("Find Contribution Class");
+		setTitle("Find Contribution Class");
+		setMessage("Enter the name of the contributing class");
+		
 		getShell().addDisposeListener(new DisposeListener() {
 			
 			public void widgetDisposed(DisposeEvent e) {

From 235daf223d41361505adfdc4c09a34f88f69ebd8 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 18 Mar 2010 11:06:32 +0000
Subject: [PATCH 0068/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * add support for the main menu

---
 .../common/component/WindowEditor.java        | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index a6ccf1913f..4377478552 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -15,8 +15,11 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -48,6 +51,7 @@ public class WindowEditor extends AbstractComponentEditor {
 
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private IValueProperty WINDOW__MAIN_MENU = EMFProperties.value(MApplicationPackage.Literals.WINDOW__MAIN_MENU);
 
 	public WindowEditor(EditingDomain editingDomain) {
 		super(editingDomain);
@@ -200,7 +204,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		WritableList list = new WritableList();
+		final WritableList list = new WritableList();
 		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, "Handlers") {
 
 			@Override
@@ -210,15 +214,6 @@ protected boolean accepted(Object o) {
 
 		});
 
-//		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING, BINDING_CONTAINER__BINDINGS, element, "Bindings") {
-//
-//			@Override
-//			protected boolean accepted(Object o) {
-//				return true;
-//			}
-//
-//		});
-		
 		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_WINDOW_TRIMS, ELEMENT_CONTAINER__CHILDREN, element, "Trims") {
 
 			@Override
@@ -236,6 +231,24 @@ protected boolean accepted(Object o) {
 			}
 
 		});
+		
+		MWindow window = (MWindow) element;
+		if( window.getMainMenu() != null ) {
+			list.add(0,window.getMainMenu());
+		}
+		
+		WINDOW__MAIN_MENU.observe(element).addValueChangeListener(new IValueChangeListener() {
+			
+			public void handleValueChange(ValueChangeEvent event) {
+				if( event.diff.getOldValue() != null ) {
+					list.remove(event.diff.getOldValue());
+				}
+				
+				if( event.diff.getNewValue() != null ) {
+					list.add(0,event.diff.getNewValue());
+				}
+			}
+		});
 
 		return list;
 	}

From 806e90d343617c4af0c4e64f94a3648097073c06 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 18 Mar 2010 11:44:07 +0000
Subject: [PATCH 0069/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * making editor editor area scrollable * adding
 binding support to Window and Part

---
 .../css/default.css                           |   4 +
 .../emf/ui/internal/common/ModelEditor.java   |  29 +++-
 .../common/component/ApplicationEditor.java   | 159 +-----------------
 .../common/component/ControlFactory.java      | 139 ++++++++++++++-
 .../internal/common/component/PartEditor.java | 100 +++++------
 .../common/component/PartStackEditor.java     |   1 -
 .../common/component/WindowEditor.java        |   1 +
 7 files changed, 205 insertions(+), 228 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/css/default.css b/bundles/org.eclipse.e4.tools.emf.editor3x/css/default.css
index fea596f24b..751eb8fc18 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/css/default.css
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/css/default.css
@@ -16,3 +16,7 @@
 .contentContainer {
 	background-color: #fff #fff #cccccc 20% 80%;
 }
+
+.formContainer {
+	background-color: #fff;
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 23bec3c6b4..b8fa812433 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -78,7 +78,11 @@
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.custom.ScrolledComposite;
 import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -148,8 +152,24 @@ public ModelEditor(Composite composite, IModelResource modelProvider, IProject p
 		textLabel.setData("org.eclipse.e4.ui.css.CssClassName", "sectionHeader");
 		textLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
-		final Composite contentContainer = new Composite(editingArea, SWT.NONE);
-		contentContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
+		final ScrolledComposite scrolling = new ScrolledComposite(editingArea, SWT.H_SCROLL | SWT.V_SCROLL);
+		scrolling.setBackgroundMode(SWT.INHERIT_DEFAULT);
+		scrolling.setData("org.eclipse.e4.ui.css.CssClassName", "formContainer");
+		
+		final Composite contentContainer = new Composite(scrolling, SWT.NONE);
+		contentContainer.setData("org.eclipse.e4.ui.css.CssClassName", "formContainer");
+		scrolling.setExpandHorizontal(true);
+		scrolling.setExpandVertical(true);
+		scrolling.setContent(contentContainer);
+		
+		scrolling.addControlListener(new ControlAdapter() {
+			public void controlResized(ControlEvent e) {
+				Rectangle r = scrolling.getClientArea();
+				scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT));
+			}
+		});
+		
+		scrolling.setLayoutData(new GridData(GridData.FILL_BOTH));
 		final StackLayout layout = new StackLayout();
 		contentContainer.setLayout(layout);
 
@@ -181,6 +201,9 @@ public void selectionChanged(SelectionChangedEvent event) {
 							contentContainer.layout(true);
 						}
 					}
+					
+					Rectangle r = scrolling.getClientArea();
+					scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT));
 				}
 			}
 		});
@@ -191,7 +214,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 
 	private TreeViewer createTreeViewerArea(Composite parent) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+		parent.setData("org.eclipse.e4.ui.css.CssClassName", "formContainer");
 		parent.setBackgroundMode(SWT.INHERIT_DEFAULT);
 		
 		FillLayout l = new FillLayout();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 58dfde8fba..4601f74f8b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -12,8 +12,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
@@ -21,34 +19,17 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
@@ -120,149 +101,11 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
 		}
 		
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText("Bindings");
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-			
-			final Text t = new Text(parent, SWT.BORDER);
-			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			t.addKeyListener(new KeyAdapter() {
-				@Override
-				public void keyPressed(KeyEvent e) {
-					if (e.keyCode == SWT.CR || e.keyCode == SWT.LF) {
-						handleAddText(t);
-					}
-				}
-			});
-			
-			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText("Add");
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					handleAddText(t);
-				}
-			});
-			
-			new Label(parent, SWT.NONE);
-			
-			final TableViewer viewer = new TableViewer(parent);
-			viewer.setLabelProvider(new LabelProvider());
-			viewer.setContentProvider(new ObservableListContentProvider());
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 200;
-			viewer.getControl().setLayoutData(gd);
-			
-			IEMFListProperty prop = EMFProperties.list(MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS);
-			viewer.setInput(prop.observeDetail(getMaster()));
-			
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
-			buttonComp.setLayout(gl);
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
-							Object obj = s.getFirstElement();
-							MApplication container = (MApplication) getMaster().getValue();
-							int idx = container.getCommands().indexOf(obj) - 1;
-							if( idx >= 0 ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
-								
-								if( cmd.canExecute() ) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-							
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
-							Object obj = s.getFirstElement();
-							MApplication container = (MApplication) getMaster().getValue();
-							int idx = container.getCommands().indexOf(obj) + 1;
-							if( idx < container.getCommands().size() ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
-								
-								if( cmd.canExecute() ) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-							
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						MApplication el = (MApplication) getMaster().getValue();
-						List<?> ids = ((IStructuredSelection)viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), el, MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS, ids);
-						if( cmd.canExecute() ) {
-							getEditingDomain().getCommandStack().execute(cmd);
-							if( el.getBindingContexts().size() > 0 ) {
-								viewer.setSelection(new StructuredSelection(el.getBindingContexts().get(0)));
-							}
-						}
-					}
-				}
-			});
-		}
+		ControlFactory.createBindingsWidget(parent, this);
 
 		return parent;
 	}
 	
-	private void handleAddText( Text tagText) {
-		if (tagText.getText().trim().length() > 0) {
-			String[] tags = tagText.getText().split(";");
-			for( int i = 0; i < tags.length;i++ ) {
-				tags[i] = tags[i].trim();
-			}
-
-			MApplicationElement appEl = (MApplicationElement) getMaster().getValue();
-			Command cmd = AddCommand.create(getEditingDomain(), appEl, MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS, Arrays.asList(tags));
-			if (cmd.canExecute()) {
-				getEditingDomain().getCommandStack().execute(cmd);
-			}
-			tagText.setText("");
-		}
-	}
-
 	@Override
 	public IObservableList getChildList(Object element) {
 		WritableList list = new WritableList();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 3c42321410..a015606371 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -1,18 +1,25 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.Arrays;
+import java.util.List;
 
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
@@ -27,6 +34,130 @@
 import org.eclipse.swt.widgets.Text;
 
 public class ControlFactory {
+	public static void createBindingsWidget(Composite parent, final AbstractComponentEditor editor) {
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Bindings");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			
+			final Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			t.addKeyListener(new KeyAdapter() {
+				@Override
+				public void keyPressed(KeyEvent e) {
+					if (e.keyCode == SWT.CR || e.keyCode == SWT.LF) {
+						handleAddText( editor, MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS, t);
+					}
+				}
+			});
+			
+			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setText("Add");
+			b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					handleAddText( editor, MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS, t);
+				}
+			});
+			
+			new Label(parent, SWT.NONE);
+			
+			final TableViewer viewer = new TableViewer(parent);
+			viewer.setLabelProvider(new LabelProvider());
+			viewer.setContentProvider(new ObservableListContentProvider());
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 150;
+			viewer.getControl().setLayoutData(gd);
+			
+			IEMFListProperty prop = EMFProperties.list(MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS);
+			viewer.setInput(prop.observeDetail(editor.getMaster()));
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MApplication container = (MApplication) editor.getMaster().getValue();
+							int idx = container.getCommands().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									editor.getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MApplication container = (MApplication) editor.getMaster().getValue();
+							int idx = container.getCommands().indexOf(obj) + 1;
+							if( idx < container.getCommands().size() ) {
+								Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									editor.getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						MApplication el = (MApplication) editor.getMaster().getValue();
+						List<?> ids = ((IStructuredSelection)viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(editor.getEditingDomain(), el, MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS, ids);
+						if( cmd.canExecute() ) {
+							editor.getEditingDomain().getCommandStack().execute(cmd);
+							if( el.getBindingContexts().size() > 0 ) {
+								viewer.setSelection(new StructuredSelection(el.getBindingContexts().get(0)));
+							}
+						}
+					}
+				}
+			});
+	}
+	
 	public static void createTagsWidget( Composite parent, final AbstractComponentEditor editor ) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("Tags");
@@ -38,7 +169,7 @@ public static void createTagsWidget( Composite parent, final AbstractComponentEd
 			@Override
 			public void keyPressed(KeyEvent e) {
 				if (e.keyCode == SWT.CR || e.keyCode == SWT.LF) {
-					handleAddText(editor, tagText);
+					handleAddText(editor, MApplicationPackage.Literals.APPLICATION_ELEMENT__TAGS, tagText);
 				}
 			}
 		});
@@ -48,7 +179,7 @@ public void keyPressed(KeyEvent e) {
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				handleAddText(editor, tagText);
+				handleAddText(editor, MApplicationPackage.Literals.APPLICATION_ELEMENT__TAGS, tagText);
 			}
 		});
 		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
@@ -108,7 +239,7 @@ public void widgetSelected(SelectionEvent e) {
 		});
 	}
 
-	private static void handleAddText( AbstractComponentEditor editor, Text tagText) {
+	private static void handleAddText( AbstractComponentEditor editor, EStructuralFeature feature, Text tagText) {
 		if (tagText.getText().trim().length() > 0) {
 			String[] tags = tagText.getText().split(";");
 			for( int i = 0; i < tags.length;i++ ) {
@@ -116,7 +247,7 @@ private static void handleAddText( AbstractComponentEditor editor, Text tagText)
 			}
 
 			MApplicationElement appEl = (MApplicationElement) editor.getMaster().getValue();
-			Command cmd = AddCommand.create(editor.getEditingDomain(), appEl, MApplicationPackage.Literals.APPLICATION_ELEMENT__TAGS, Arrays.asList(tags));
+			Command cmd = AddCommand.create(editor.getEditingDomain(), appEl, feature, Arrays.asList(tags));
 			if (cmd.canExecute()) {
 				editor.getEditingDomain().getCommandStack().execute(cmd);
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 60d5e55052..6b65d9d085 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -192,7 +192,44 @@ public void widgetSelected(SelectionEvent e) {
 			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
 		}
 
-		
+		// ------------------------------------------------------------
+		ControlFactory.createBindingsWidget(parent, this);
+
+//		// ------------------------------------------------------------
+//		{
+//			Label l = new Label(parent, SWT.NONE);
+//			l.setText("Variables");
+//			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+//
+//			ListViewer viewer = new ListViewer(parent);
+//			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+//			gd.horizontalSpan=2;
+//			gd.heightHint = 80;
+//			viewer.getList().setLayoutData(gd);
+//		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Properties");
+			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+
+			TableViewer tableviewer = new TableViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			gd.heightHint = 80;
+			tableviewer.getTable().setHeaderVisible(true);
+			tableviewer.getControl().setLayoutData(gd);
+
+			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
+			column.getColumn().setText("Key");
+			column.getColumn().setWidth(200);
+
+			column = new TableViewerColumn(tableviewer, SWT.NONE);
+			column.getColumn().setText("Value");
+			column.getColumn().setWidth(200);
+		}
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -255,69 +292,8 @@ public String getText(Object element) {
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		}
 
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText("Variables");
-			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
-
-			ListViewer viewer = new ListViewer(parent);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
-			gd.heightHint = 80;
-			viewer.getList().setLayoutData(gd);
-		}
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText("Properties");
-			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
-
-			TableViewer tableviewer = new TableViewer(parent);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
-			gd.heightHint = 80;
-			tableviewer.getTable().setHeaderVisible(true);
-			tableviewer.getControl().setLayoutData(gd);
-
-			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText("Key");
-			column.getColumn().setWidth(200);
-
-			column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText("Value");
-			column.getColumn().setWidth(200);
-		}
-
-
 		ControlFactory.createTagsWidget(parent, this);
 
-//		// ------------------------------------------------------------
-//
-//		l = new Label(parent, SWT.NONE);
-//		l.setText("");
-//
-//		Composite booleanContainer = new Composite(parent,SWT.NONE);
-//		gd = new GridData(GridData.FILL_HORIZONTAL);
-//		gd.horizontalSpan=2;
-//		booleanContainer.setBackgroundMode(SWT.INHERIT_DEFAULT);
-//		booleanContainer.setLayoutData(gd);
-//		booleanContainer.setLayout(new GridLayout(4,false));
-//
-//		Button checkbox = new Button(booleanContainer, SWT.CHECK);
-//		checkbox.setText("to render");
-//
-//		checkbox = new Button(booleanContainer, SWT.CHECK);
-//		checkbox.setText("on Top");
-//
-//		checkbox = new Button(booleanContainer, SWT.CHECK);
-//		checkbox.setText("visible");
-//
-//		checkbox = new Button(booleanContainer, SWT.CHECK);
-//		checkbox.setText("closeable");
-
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 3dc0d67998..e6085c3b2c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -28,7 +28,6 @@
 import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MElementContainer;
 import org.eclipse.e4.ui.model.application.MPart;
-import org.eclipse.e4.ui.model.application.MToolBar;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 4377478552..222d4dcd7b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -197,6 +197,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 		}
 
+		ControlFactory.createBindingsWidget(parent, this);
 		ControlFactory.createTagsWidget(parent, this);
 
 		return parent;

From 1943a9f315b0ded7a60933242957484616daf1ba Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 18 Mar 2010 12:11:00 +0000
Subject: [PATCH 0070/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * hide probably not important parts in the model
 (need to find a way to make this configurable by the user)

---
 .../internal/common/component/PartEditor.java | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 6b65d9d085..a7c20159f7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -37,7 +37,6 @@
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.ListViewer;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
@@ -195,6 +194,7 @@ public void widgetSelected(SelectionEvent e) {
 		// ------------------------------------------------------------
 		ControlFactory.createBindingsWidget(parent, this);
 
+//TODO Does the user need to edit this?
 //		// ------------------------------------------------------------
 //		{
 //			Label l = new Label(parent, SWT.NONE);
@@ -208,27 +208,27 @@ public void widgetSelected(SelectionEvent e) {
 //			viewer.getList().setLayoutData(gd);
 //		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText("Properties");
-			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
-
-			TableViewer tableviewer = new TableViewer(parent);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
-			gd.heightHint = 80;
-			tableviewer.getTable().setHeaderVisible(true);
-			tableviewer.getControl().setLayoutData(gd);
-
-			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText("Key");
-			column.getColumn().setWidth(200);
-
-			column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText("Value");
-			column.getColumn().setWidth(200);
-		}
+//		// ------------------------------------------------------------
+//		{
+//			Label l = new Label(parent, SWT.NONE);
+//			l.setText("Properties");
+//			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+//
+//			TableViewer tableviewer = new TableViewer(parent);
+//			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+//			gd.horizontalSpan=2;
+//			gd.heightHint = 80;
+//			tableviewer.getTable().setHeaderVisible(true);
+//			tableviewer.getControl().setLayoutData(gd);
+//
+//			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
+//			column.getColumn().setText("Key");
+//			column.getColumn().setWidth(200);
+//
+//			column = new TableViewerColumn(tableviewer, SWT.NONE);
+//			column.getColumn().setText("Value");
+//			column.getColumn().setWidth(200);
+//		}
 
 		// ------------------------------------------------------------
 		{

From 8b9ffb2a00859f198057e43ca0add0d5df323375 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 18 Mar 2010 14:05:05 +0000
Subject: [PATCH 0071/1286]  Bug 306366 -  [Model] Allow ModelComponent to
 contribute KeyBindings to a BindingTable  * add support for new keybinding
 contribution

---
 .../common/ComponentLabelProvider.java        |   3 -
 .../emf/ui/internal/common/ModelEditor.java   |   5 +-
 .../component/ModelComponentEditor.java       |  41 ++-
 .../AbstractCommandSelectionDialog.java       |  13 +-
 .../virtual/VModelComponentBindingEditor.java | 237 ++++++++++++++++++
 5 files changed, 284 insertions(+), 15 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index a06d3302e0..9621c8078d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -15,10 +15,7 @@
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.jface.viewers.StyledString.Styler;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.TextStyle;
 
 public class ComponentLabelProvider extends StyledCellLabelProvider {
 	private Image modelComponentsImage;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index b8fa812433..a330295a9b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -61,6 +61,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VControlEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelComponentBindingEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartDescriptor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowTrimEditor;
@@ -100,6 +101,7 @@ public class ModelEditor {
 	public static final int VIRTUAL_WINDOW_TRIMS = 7;
 	public static final int VIRTUAL_PART_DESCRIPTORS = 8;
 	public static final int VIRTUAL_MODEL_COMP_COMMANDS = 9;
+	public static final int VIRTUAL_MODEL_COMP_BINDINGS = 10;
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private AbstractComponentEditor[] virtualEditors;
@@ -272,7 +274,8 @@ private void registerVirtualEditors() {
 				new VControlEditor(modelProvider.getEditingDomain(), this), 
 				new VWindowTrimEditor(modelProvider.getEditingDomain(), this),
 				new VPartDescriptor(modelProvider.getEditingDomain(), this),
-				null
+				new VCommandEditor(modelProvider.getEditingDomain(), this, MApplicationPackage.Literals.MODEL_COMPONENT__COMMANDS),
+				new VModelComponentBindingEditor(modelProvider.getEditingDomain(), this)
 		};
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index a7eb29f9a3..64be4f2308 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -52,6 +52,8 @@ public class ModelComponentEditor extends AbstractComponentEditor {
 	private IListProperty PART_DESCRIPTOR_CONTAINER__DESCRIPTORS = EMFProperties.list( MApplicationPackage.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS);
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES);
+	private IListProperty MODEL_COMPONENT__COMMANDS = EMFProperties.list(MApplicationPackage.Literals.MODEL_COMPONENT__COMMANDS);
+	private IListProperty MODEL_COMPONENT__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.MODEL_COMPONENT__BINDINGS);
 	
 	public ModelComponentEditor(EditingDomain editingDomain) {
 		super(editingDomain);
@@ -179,31 +181,36 @@ public String getDescription(Object element) {
 	@Override
 	public IObservableList getChildList(Object element) {
 		WritableList list = new WritableList();
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MENU, MODEL_COMPONENT__CHILDREN, element, "Menus") {
+		
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, "Handlers") {
 
 			@Override
 			protected boolean accepted(Object o) {
-				return o instanceof MMenu;
+				return true;
 			}
 
 		});
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART, MODEL_COMPONENT__CHILDREN, element, "Parts") {
+
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element, "BindingTables") {
 
 			@Override
 			protected boolean accepted(Object o) {
-				return o instanceof MPart;
+				return true;
 			}
 
 		});
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART_DESCRIPTORS, PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, element, "PartDescriptors") {
+		
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MODEL_COMP_BINDINGS, MODEL_COMPONENT__BINDINGS, element, "KeyBindings") {
 
 			@Override
 			protected boolean accepted(Object o) {
-				return o instanceof MPartDescriptor;
+				return true;
 			}
 
 		});
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, "Handlers") {
+		
+		
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MODEL_COMP_COMMANDS, MODEL_COMPONENT__COMMANDS, element, "Commands") {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -211,16 +218,32 @@ protected boolean accepted(Object o) {
 			}
 
 		});
+		
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MENU, MODEL_COMPONENT__CHILDREN, element, "Menus") {
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element, "BindingTables") {
+			@Override
+			protected boolean accepted(Object o) {
+				return o instanceof MMenu;
+			}
+
+		});
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART, MODEL_COMPONENT__CHILDREN, element, "Parts") {
 
 			@Override
 			protected boolean accepted(Object o) {
-				return true;
+				return o instanceof MPart;
 			}
 
 		});
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART_DESCRIPTORS, PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, element, "PartDescriptors") {
 
+			@Override
+			protected boolean accepted(Object o) {
+				return o instanceof MPartDescriptor;
+			}
+
+		});
+		
 		return list;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index 9e8fb32435..a2ccb384d7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -10,11 +10,16 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MCommand;
 import org.eclipse.e4.ui.model.application.MModelComponent;
+import org.eclipse.e4.ui.model.application.MModelComponents;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
@@ -87,8 +92,12 @@ public void doubleClick(DoubleClickEvent event) {
 			MApplication app = (MApplication) resource.getRoot().get(0);
 			viewer.setInput(app.getCommands());
 		} else {
-			MModelComponent comp = (MModelComponent)resource.getRoot().get(0);
-			viewer.setInput(comp.getCommands());	
+			MModelComponents components = (MModelComponents)resource.getRoot().get(0);
+			List<MCommand> commands = new ArrayList<MCommand>();
+			for( MModelComponent comp : components.getComponents() ) {
+				commands.addAll(comp.getCommands());
+			}
+			viewer.setInput(commands);	
 		}
 		
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java
new file mode 100644
index 0000000000..56599325fc
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java
@@ -0,0 +1,237 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.MBindingTable;
+import org.eclipse.e4.ui.model.application.MHandler;
+import org.eclipse.e4.ui.model.application.MKeyBinding;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VModelComponentBindingEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+	private TableViewer viewer;
+	
+	public VModelComponentBindingEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Commands";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Commands Bla Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Keybindings");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.getTable().setHeaderVisible(true);
+
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.KEY_SEQUENCE__KEY_SEQUENCE);
+
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("KeySequence");
+				column.getColumn().setWidth(100);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.KEY_BINDING__COMMAND, MApplicationPackage.Literals.COMMAND__COMMAND_NAME));
+
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Command");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID);
+
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Id");
+				column.getColumn().setWidth(170);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MBindingTable container = (MBindingTable) getMaster().getValue();
+							int idx = container.getBindings().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.MODEL_COMPONENT__BINDINGS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MBindingTable container = (MBindingTable) getMaster().getValue();
+							int idx = container.getBindings().indexOf(obj) + 1;
+							if( idx < container.getBindings().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.MODEL_COMPONENT__BINDINGS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MKeyBinding handler = MApplicationFactory.eINSTANCE.createKeyBinding();
+					System.err.println(getMaster().getValue());
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.MODEL_COMPONENT__BINDINGS, handler);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(handler);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> keybinding = ((IStructuredSelection)viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.MODEL_COMPONENT__BINDINGS, keybinding);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+		
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+}

From d4265d1fed540644875a007a47808b716f59e739 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 18 Mar 2010 15:37:45 +0000
Subject: [PATCH 0072/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * adding support for InputPart

---
 .../emf/ui/internal/common/ModelEditor.java   |  2 +
 .../common/component/InputPartEditor.java     | 55 +++++++++++++++++++
 .../internal/common/component/PartEditor.java |  6 ++
 3 files changed, 63 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index a330295a9b..47bd78b203 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -36,6 +36,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.BindingTableEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectMenuItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledMenuItemEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.InputPartEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.KeyBindingEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CommandEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectToolItemEditor;
@@ -308,6 +309,7 @@ private void registerDefaultEditors() {
 		registerEditor(MApplicationPackage.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(MApplicationPackage.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this, project));
 		registerEditor(MApplicationPackage.Literals.BINDING_TABLE, new BindingTableEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(MApplicationPackage.Literals.INPUT_PART, new InputPartEditor(modelProvider.getEditingDomain(), project));
 	}
 
 	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
new file mode 100644
index 0000000000..ff97bd39cf
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class InputPartEditor extends PartEditor {
+
+	public InputPartEditor(EditingDomain editingDomain, IProject project) {
+		super(editingDomain, project);
+	}
+
+
+	@Override
+	public String getLabel(Object element) {
+		return "InputPart";
+	}
+	
+	@Override
+	protected void createSubformElements(Composite parent, EMFDataBindingContext context, IObservableValue master) {
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("InputURI");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.INPUT__INPUT_URI).observeDetail(master));			
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index a7c20159f7..7fd167f8c2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -177,6 +177,8 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 		
+		createSubformElements(parent, context, master);
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -296,6 +298,10 @@ public String getText(Object element) {
 
 		return parent;
 	}
+	
+	protected void createSubformElements(Composite parent, EMFDataBindingContext context, IObservableValue master) {
+		
+	}
 
 	@Override
 	public IObservableList getChildList(Object element) {

From fd22422a8b5ff5130500525d8a10fd18fa039e97 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 18 Mar 2010 16:57:40 +0000
Subject: [PATCH 0073/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * adding support for live inspecting models


From 1f7c8194c3923eea3049211d211734841b15d57c Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 18 Mar 2010 16:58:05 +0000
Subject: [PATCH 0074/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * adding support for live inspecting models


From 43d17195ea08789e353365544d4f5caadff155be Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 8 Apr 2010 15:37:39 +0000
Subject: [PATCH 0075/1286] [Bug 304584] -  [Tooling] Implement
 Workbench-Model-Tooling * made e4 lowercase

---
 bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index c1760d3644..72a929d22e 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -9,7 +9,7 @@
             extensions="e4xmi"
             icon="icons/full/obj16/application_view_tile.png"
             id="org.eclipse.e4.tools.emf.editor3x.e4wbm"
-            name="E4 Workbenchmodel Editor">
+            name="e4 Workbenchmodel Editor">
       </editor>
    </extension>
 

From ad52fb12970c1b0a1f500f01e31a2515ab46ca4b Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 16 Apr 2010 15:33:38 +0000
Subject: [PATCH 0076/1286] [Bug 305586] -  [Model] Model tweaking round 3 *
 removed unneeded extension stuff


From 4ff8e5ccdf28efbe029593b2f2cfb58fb45ba30b Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 16 Apr 2010 17:28:49 +0000
Subject: [PATCH 0077/1286] [Bug 305586] -  [Model] Model tweaking round 3 *
 merging back changes to head

---
 .../icons/full/obj16/plugin.png               | Bin 0 -> 591 bytes
 .../plugin.xml                                |  26 ++
 .../wizard/BaseApplicationModelWizard.java    | 185 ++++++++++
 .../wizard/NewApplicationModelWizard.java     |  27 ++
 .../wizard/NewContributionModelWizard.java    |  27 ++
 .../emf/editor3x/wizard/NewModelFilePage.java | 198 +++++++++++
 .../.settings/org.eclipse.jdt.core.prefs      |  66 +++-
 .../META-INF/MANIFEST.MF                      |   3 +-
 .../icons/full/modelelements/BindingTable.png | Bin 0 -> 728 bytes
 .../component/AbstractComponentEditor.java    |  10 +-
 .../e4/tools/emf/ui/internal/Messages.java    | 311 +++++++++++++++++
 .../tools/emf/ui/internal/Messages.properties | 288 ++++++++++++++++
 .../ObservableColumnLabelProvider.java        |  12 +-
 .../tools/emf/ui/internal/PatternFilter.java  |   6 +-
 .../tools/emf/ui/internal/StringMatcher.java  |   2 +-
 .../common/ClassContributionCollector.java    |   2 -
 .../common/ComponentLabelProvider.java        |   4 +-
 .../emf/ui/internal/common/ModelEditor.java   | 113 +++---
 .../common/component/ApplicationEditor.java   |  46 ++-
 .../common/component/BindingTableEditor.java  |  67 ++--
 .../common/component/CommandEditor.java       |  73 ++--
 .../common/component/ControlFactory.java      |  60 ++--
 .../component/DirectMenuItemEditor.java       |  17 +-
 .../component/DirectToolItemEditor.java       |  15 +-
 .../component/HandledMenuItemEditor.java      |  78 +++--
 .../component/HandledToolItemEditor.java      | 136 ++++----
 .../common/component/HandlerEditor.java       |  31 +-
 .../common/component/InputPartEditor.java     |   9 +-
 .../common/component/KeyBindingEditor.java    |  67 ++--
 .../internal/common/component/MenuEditor.java | 100 ++++--
 .../common/component/MenuItemEditor.java      | 321 ++----------------
 .../common/component/MenuSeparatorEditor.java | 112 ++++++
 .../component/ModelComponentEditor.java       |  67 ++--
 .../component/ModelComponentsEditor.java      |  33 +-
 .../component/PartDescriptorEditor.java       | 133 ++++----
 .../internal/common/component/PartEditor.java |  76 +++--
 .../component/PartSashContainerEditor.java    |  82 +++--
 .../common/component/PartStackEditor.java     |  97 ++++--
 .../common/component/PerspectiveEditor.java   | 215 ++++++++++--
 .../component/PerspectiveStackEditor.java     | 162 ++++++++-
 .../common/component/PlaceholderEditor.java   |  29 +-
 .../common/component/ToolBarEditor.java       |  60 ++--
 .../component/ToolBarSeparatorEditor.java     | 110 ++++++
 .../common/component/ToolControlEditor.java   | 207 +++++++++++
 .../common/component/ToolItemEditor.java      |  71 +---
 ...ndowTrimEditor.java => TrimBarEditor.java} |  39 +--
 .../common/component/TrimmedWindowEditor.java |  36 ++
 .../common/component/WindowEditor.java        |  41 +--
 .../AbstractCommandSelectionDialog.java       |  11 +-
 .../dialogs/ContributionClassDialog.java      |   4 +-
 ...HandledMenuItemCommandSelectionDialog.java |  49 +++
 ...HandledToolItemCommandSelectionDialog.java |  49 +++
 .../HandlerCommandSelectionDialog.java        |   8 +-
 .../KeyBindingCommandSelectionDialog.java     |   8 +-
 .../virtual/VBindingTableEditor.java          |  84 ++---
 .../component/virtual/VCommandEditor.java     |  15 +-
 .../component/virtual/VHandlerEditor.java     |  25 +-
 .../common/component/virtual/VMenuEditor.java |  20 +-
 .../virtual/VModelComponentBindingEditor.java |  37 +-
 .../component/virtual/VPartDescriptor.java    |  25 +-
 ...lEditor.java => VWindowControlEditor.java} |  36 +-
 .../component/virtual/VWindowEditor.java      |  61 ++--
 .../component/virtual/VWindowTrimEditor.java  |  12 +-
 63 files changed, 3126 insertions(+), 1188 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/plugin.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/BaseApplicationModelWizard.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewApplicationModelWizard.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewContributionModelWizard.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewModelFilePage.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingTable.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
 rename bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/{WindowTrimEditor.java => TrimBarEditor.java} (86%)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
 rename bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/{VControlEditor.java => VWindowControlEditor.java} (86%)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/plugin.png b/bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/plugin.png
new file mode 100644
index 0000000000000000000000000000000000000000..6187b15aec001b7080b51a5f944f07591f26cc15
GIT binary patch
literal 591
zcmV-V0<iswP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz;Ymb6R5;6}
zl08V3aTLaXuVw{)TtAV-EQp(VZ&;&yOGCA^HyY7UV+BnWv^BakMQc+OB&0Z27AkkL
zxPppG-9jbH?t7kd8eTEus*7hi@aLT8f1cktNknjvIJDd2gQ>eEcNHZMNv|IbJ-M`(
zKwWL~opzjJe^WpCmV9E;(0&ut2;4va_(#>M8)>9$R5viQnf(Nkh~VM$y>J(jqb$cj
z+nL1Nm|mV)Gm|9MnHf*7Ja4OEAQz__^LRKOLEwqpiGV^^A*T=#&inGm-62Xs;dnSp
zKj&H9T*boh2<no0+=ElOJZ83sfQeG2L`y@C?#3Rz{i>i)W+(n27l!C)>fq|L%VB1i
ziC4p;NwV_}ZjW7$LRW#(_bKF#hp=!IqNO26Z*w2+LEwx{PVnZ&Sn}T;m<fe2Wm#Lz
za$)sCo<WYS+HDKB-VTSEXg%7B+({$Nn7A;{*z`8{F+2a6g_Xssq{Gq<0W(qT9zX<h
z>tzb<gWDVNaLQ|6kUI-2i;UhJKT-oRHNy~7Uq5lS^Bm=sIhHERNTM^>$;qA*nT@@+
zV5uQ@iXDTPoTbV#FRr~z04|PPh`wXTNoCm9*tG&?e3+fYl>K6+&3|Cc$KOpL`ER+_
dcRl5U#9zn6ZO}GF<yZg!002ovPDHLkV1oCe4!{5a

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index 72a929d22e..8a4c94ce26 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -12,5 +12,31 @@
             name="e4 Workbenchmodel Editor">
       </editor>
    </extension>
+   <extension
+         point="org.eclipse.ui.newWizards">
+      <wizard
+            canFinishEarly="false"
+            category="org.eclipse.e4"
+            class="org.eclipse.e4.tools.emf.editor3x.wizard.NewApplicationModelWizard"
+            hasPages="true"
+            icon="icons/full/obj16/application_view_tile.png"
+            id="org.eclipse.e4.tools.emf.editor3x.newappmodel"
+            name="New Application Model">
+      </wizard>
+ 
+      <wizard
+            canFinishEarly="false"
+            category="org.eclipse.e4"
+            class="org.eclipse.e4.tools.emf.editor3x.wizard.NewContributionModelWizard"
+            hasPages="true"
+            icon="icons/full/obj16/plugin.png"
+            id="org.eclipse.e4.tools.emf.editor3x.newmodelcontribution"
+            name="New Contribution Model">
+      </wizard>
+      <category
+            id="org.eclipse.e4"
+            name="e4">
+      </category>
+      </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/BaseApplicationModelWizard.java
new file mode 100644
index 0000000000..b8bc38accd
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/BaseApplicationModelWizard.java
@@ -0,0 +1,185 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x.wizard;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.core.runtime.CoreException;
+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.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+
+import org.eclipse.ui.*;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+public abstract class BaseApplicationModelWizard extends Wizard implements INewWizard {
+	private NewModelFilePage page;
+	private ISelection selection;
+	
+	protected IWorkbench workbench;
+
+	/**
+	 * Constructor for NewApplicationModelWizard.
+	 */
+	public BaseApplicationModelWizard() {
+		super();
+		setNeedsProgressMonitor(true);
+	}
+
+	/**
+	 * Adding the page to the wizard.
+	 */
+
+	public void addPages() {
+		page = new NewModelFilePage(selection,getDefaultFileName());
+		addPage(page);
+	}
+
+	public abstract String getDefaultFileName();
+	
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// Do the work within an operation.
+			//
+			WorkspaceModifyOperation operation =
+				new WorkspaceModifyOperation() {
+					@Override
+					protected void execute(IProgressMonitor progressMonitor) {
+						try {
+							// Create a resource set
+							//
+							ResourceSet resourceSet = new ResourceSetImpl();
+
+							// Get the URI of the model file.
+							//
+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+							// Create a resource for this file.
+							//
+							Resource resource = resourceSet.createResource(fileURI);
+
+							// Add the initial model object to the contents.
+							//
+							EObject rootObject = createInitialModel();
+							if (rootObject != null) {
+								resource.getContents().add(rootObject);
+							}
+
+							// Save the contents of the resource to the file system.
+							//
+							Map<Object, Object> options = new HashMap<Object, Object>();
+							resource.save(options);
+						}
+						catch (Exception exception) {
+							throw new RuntimeException(exception);
+						}
+						finally {
+							progressMonitor.done();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(new Runnable() {
+						 public void run() {
+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+						 }
+					 });
+			}
+
+			// Open an editor on the new file.
+			//
+			try {
+				page.openEditor
+					(new FileEditorInput(modelFile),
+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
+			}
+			catch (PartInitException exception) {
+				MessageDialog.openError(workbenchWindow.getShell(), "Could not init editor", exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			MessageDialog.openError(getShell(), "Error", exception.getMessage());
+			return false;
+		}
+	}
+	
+	protected abstract EObject createInitialModel();
+
+	private IFile getModelFile() throws CoreException {
+		String containerName = page.getContainerName();
+		String fileName = page.getFileName();
+		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+		IResource resource = root.findMember(new Path(containerName));
+		if (!resource.exists() || !(resource instanceof IContainer)) {
+			throwCoreException("Container \"" + containerName
+					+ "\" does not exist.");
+		}
+		IContainer container = (IContainer) resource;
+		return container.getFile(new Path(fileName));
+	}
+	
+	private void throwCoreException(String message) throws CoreException {
+		IStatus status = new Status(IStatus.ERROR,
+				"org.eclipse.e4.tools.emf.editor3x", IStatus.OK, message, null);
+		throw new CoreException(status);
+	}
+
+	/**
+	 * We will accept the selection in the workbench to see if we can initialize
+	 * from it.
+	 * 
+	 * @see IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
+	 */
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewApplicationModelWizard.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewApplicationModelWizard.java
new file mode 100644
index 0000000000..ed161a7e7c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewApplicationModelWizard.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x.wizard;
+
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.emf.ecore.EObject;
+
+
+public class NewApplicationModelWizard extends BaseApplicationModelWizard {
+
+	@Override
+	public String getDefaultFileName() {
+		return "Application.e4xmi";
+	}
+	
+	protected EObject createInitialModel() {
+		return (EObject) MApplicationFactory.INSTANCE.createApplication();
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewContributionModelWizard.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewContributionModelWizard.java
new file mode 100644
index 0000000000..00706fd70a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewContributionModelWizard.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x.wizard;
+
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.emf.ecore.EObject;
+
+
+public class NewContributionModelWizard extends BaseApplicationModelWizard {
+
+	@Override
+	public String getDefaultFileName() {
+		return "components.e4xmi";
+	}
+	
+	protected EObject createInitialModel() {
+		return (EObject) MApplicationFactory.INSTANCE.createModelComponents();
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewModelFilePage.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewModelFilePage.java
new file mode 100644
index 0000000000..2f60c2d8d7
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewModelFilePage.java
@@ -0,0 +1,198 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x.wizard;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.ContainerSelectionDialog;
+
+/**
+ * The "New" wizard page allows setting the container for the new file as well
+ * as the file name. The page will only accept file name without the extension
+ * OR with the extension that matches the expected one (e4xmi).
+ */
+
+public class NewModelFilePage extends WizardPage {
+	private Text containerText;
+
+	private Text fileText;
+
+	private ISelection selection;
+	
+	private String defaultFilename;
+
+	/**
+	 * Constructor for SampleNewWizardPage.
+	 * 
+	 * @param pageName
+	 */
+	public NewModelFilePage(ISelection selection, String defaultFilename) {
+		super("wizardPage");
+		setTitle("Multi-page Editor File");
+		setDescription("This wizard creates a new file with *.e4xmi extension that can be opened by a multi-page editor.");
+		this.selection = selection;
+		this.defaultFilename = defaultFilename;
+	}
+
+	/**
+	 * @see IDialogPage#createControl(Composite)
+	 */
+	public void createControl(Composite parent) {
+		Composite container = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
+		container.setLayout(layout);
+		layout.numColumns = 3;
+		layout.verticalSpacing = 9;
+		Label label = new Label(container, SWT.NULL);
+		label.setText("&Container:");
+
+		containerText = new Text(container, SWT.BORDER | SWT.SINGLE);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		containerText.setLayoutData(gd);
+		containerText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				dialogChanged();
+			}
+		});
+
+		Button button = new Button(container, SWT.PUSH);
+		button.setText("Browse...");
+		button.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				handleBrowse();
+			}
+		});
+		label = new Label(container, SWT.NULL);
+		label.setText("&File name:");
+
+		fileText = new Text(container, SWT.BORDER | SWT.SINGLE);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		fileText.setLayoutData(gd);
+		fileText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				dialogChanged();
+			}
+		});
+		initialize();
+		dialogChanged();
+		setControl(container);
+	}
+
+	/**
+	 * Tests if the current workbench selection is a suitable container to use.
+	 */
+
+	private void initialize() {
+		if (selection != null && selection.isEmpty() == false
+				&& selection instanceof IStructuredSelection) {
+			IStructuredSelection ssel = (IStructuredSelection) selection;
+			if (ssel.size() > 1)
+				return;
+			Object obj = ssel.getFirstElement();
+			if (obj instanceof IResource) {
+				IContainer container;
+				if (obj instanceof IContainer)
+					container = (IContainer) obj;
+				else
+					container = ((IResource) obj).getParent();
+				containerText.setText(container.getFullPath().toString());
+			}
+		}
+		fileText.setText(defaultFilename);
+	}
+
+	/**
+	 * Uses the standard container selection dialog to choose the new value for
+	 * the container field.
+	 */
+
+	private void handleBrowse() {
+		ContainerSelectionDialog dialog = new ContainerSelectionDialog(
+				getShell(), ResourcesPlugin.getWorkspace().getRoot(), false,
+				"Select new file container");
+		if (dialog.open() == ContainerSelectionDialog.OK) {
+			Object[] result = dialog.getResult();
+			if (result.length == 1) {
+				containerText.setText(((Path) result[0]).toString());
+			}
+		}
+	}
+
+	/**
+	 * Ensures that both text fields are set.
+	 */
+
+	private void dialogChanged() {
+		IResource container = ResourcesPlugin.getWorkspace().getRoot()
+				.findMember(new Path(getContainerName()));
+		String fileName = getFileName();
+
+		if (getContainerName().length() == 0) {
+			updateStatus("File container must be specified");
+			return;
+		}
+		if (container == null
+				|| (container.getType() & (IResource.PROJECT | IResource.FOLDER)) == 0) {
+			updateStatus("File container must exist");
+			return;
+		}
+		if (!container.isAccessible()) {
+			updateStatus("Project must be writable");
+			return;
+		}
+		if (fileName.length() == 0) {
+			updateStatus("File name must be specified");
+			return;
+		}
+		if (fileName.replace('\\', '/').indexOf('/', 1) > 0) {
+			updateStatus("File name must be valid");
+			return;
+		}
+		int dotLoc = fileName.lastIndexOf('.');
+		if (dotLoc != -1) {
+			String ext = fileName.substring(dotLoc + 1);
+			if (ext.equalsIgnoreCase("e4xmi") == false) {
+				updateStatus("File extension must be \"e4xmi\"");
+				return;
+			}
+		}
+		updateStatus(null);
+	}
+
+	private void updateStatus(String message) {
+		setErrorMessage(message);
+		setPageComplete(message == null);
+	}
+
+	public String getContainerName() {
+		return containerText.getText();
+	}
+
+	public String getFileName() {
+		return fileText.getText();
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
index 44c830d92b..47b9e1b0ba 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,74 @@
-#Sun Mar 07 11:22:58 CET 2010
+#Sun Apr 11 23:33:47 CEST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.5
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index d622a13711..9d7c30fb81 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.emf.databinding.edit;bundle-version="1.2.0",
  com.ibm.icu;bundle-version="4.2.1",
  org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.e4.core.services;bundle-version="0.9.1"
+ org.eclipse.e4.core.services;bundle-version="0.9.1",
+ org.eclipse.osgi;bundle-version="3.6.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.osgi.framework;version="1.5.0"
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingTable.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingTable.png
new file mode 100644
index 0000000000000000000000000000000000000000..decac8a62e9349cb62ef1c4ea13312bf7c7b8030
GIT binary patch
literal 728
zcmV;}0w?{6P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!YDq*vR5;6}
zlS@dHQ5462GvDZtUpgS;a|%}?2@^(TFToaq8uSoDtt5ibU8^8mSx^Rpt!mez2n4B6
zaUB$<q4=PMNj8i{<2)QkMYJ!}?><_L=-A5W!r^l6;r`F>{yEp7wdQ}83!rCswNq=_
zq*jNNQb+|tDWp_Lr4dr4g+vOCRBEEDwY1U&ptQczSefnpm(CAfhmP(LNTs|0gWq2v
zlt4&<tpv8TcXugvY8_{~ux;s16G-`Rz5MpRx?39pTgY7xq*MU(jx6p=;L?d)w$cT}
zwgAAjs(jvjO3-w!VCSrFEJ5Sx-F#_nV=sX%6-sMd2K0?CVi->P#};uo!MS~DaC{N8
zCc_0sd|7PSe?371F2g}XWgdg$NiJ9B?;%LfL$Ni4P<siq0+$m8Mk7SNO%fQIBj1}#
zbRmh)UqkPQU(Aj5<16&Cyu8AJbr03m9cD^ED74l%wP1Dj9eRD8TQ^&=EQ?4a!sz%%
zJlQ7ASFd0g2Jv{D%&93>a&qpcOjIeH(99(9V2I`$*Ld>uIkVFf6crZY_xlO|{6Tm3
z1o4FhjvYTmZOwVY;c&YXKnQ^b!l4;FIR^oF)OinK+qAT_P*qh$eSJN3b#(~arm3|Z
z0FTGx-t|Ch%1aM3{dqDqst+F{gdh+IV47xXfGi886g@AVaq&Ve(P(tTp|$4j%daEC
zmKCeXd2{W{Th5-WpxEalE7M6Lksufh;&!_!DJh|#pn%_-idb~s9v*r>=Scs~Wo2bX
zQBjfKG|hqH;^I8F+id{OrKP1dAnNsc2Y`&t%}p7L#gdj~HT(fFX--g%a!N-40000<
KMNUMnLSTZ?Bt^mi

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 662d39cecf..c9a5e8dc88 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -30,11 +30,11 @@ public abstract class AbstractComponentEditor {
 
 	private static Map<Integer, Image> IMAGE_MAP = new HashMap<Integer, Image>();
 	private static final String[] IMAGES = {
-		"/icons/full/obj16/zoom.png",
-		"/icons/full/obj16/table_add.png",
-		"/icons/full/obj16/table_delete.png",
-		"/icons/full/obj16/arrow_up.png",
-		"/icons/full/obj16/arrow_down.png",
+		"/icons/full/obj16/zoom.png", //$NON-NLS-1$
+		"/icons/full/obj16/table_add.png", //$NON-NLS-1$
+		"/icons/full/obj16/table_delete.png", //$NON-NLS-1$
+		"/icons/full/obj16/arrow_up.png", //$NON-NLS-1$
+		"/icons/full/obj16/arrow_down.png" //$NON-NLS-1$
 	};
 
 	private WritableValue master = new WritableValue();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
new file mode 100644
index 0000000000..d1602bed87
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -0,0 +1,311 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages {
+
+	public static String ApplicationEditor_Label;
+	public static String ApplicationEditor_Description;
+	public static String ApplicationEditor_Id;
+	public static String ApplicationEditor_Handlers;
+	public static String ApplicationEditor_PartDescriptors;
+	public static String ApplicationEditor_BindingTables;
+	public static String ApplicationEditor_Commands;
+	public static String ApplicationEditor_Windows;
+
+	public static String BindingTableEditor_Label;
+	public static String BindingTableEditor_Description;
+	public static String BindingTableEditor_Id;
+	public static String BindingTableEditor_ContextId;
+	public static String BindingTableEditor_Find;
+	public static String BindingTableEditor_Keybindings;
+	public static String BindingTableEditor_KeySequence;
+	public static String BindingTableEditor_Command;
+	public static String BindingTableEditor_Up;
+	public static String BindingTableEditor_Down;
+	public static String BindingTableEditor_Add;
+	public static String BindingTableEditor_Remove; 
+	
+	public static String CommandEditor_Label;
+	public static String CommandEditor_Description;
+	public static String CommandEditor_Id;
+	public static String CommandEditor_Name;
+	public static String CommandEditor_LabelDescription;
+	public static String CommandEditor_Parameters;
+	public static String CommandEditor_ParameterName;
+	public static String CommandEditor_ParameterTypeId;
+	public static String CommandEditor_ParameterOptional;
+	public static String CommandEditor_ParameterOptional_No;
+	public static String CommandEditor_ParameterOptional_Yes;
+	public static String CommandEditor_Up;
+	public static String CommandEditor_Down;
+	public static String CommandEditor_Add;
+	public static String CommandEditor_Remove;
+	
+	public static String DirectMenuItemEditor_Label;
+	public static String DirectMenuItemEditor_Description;
+	public static String DirectMenuItemEditor_ClassURI;
+	public static String DirectMenuItemEditor_Find;
+	
+	public static String ControlFactory_BindingContexts;
+	public static String ControlFactory_Add;
+	public static String ControlFactory_Up;
+	public static String ControlFactory_Down;
+	public static String ControlFactory_Remove;
+	public static String ControlFactory_Tags;
+	public static String ControlFactory_Key;
+	public static String ControlFactory_Value;
+	
+	public static String DirectToolItemEditor_ClassURI;
+	public static String DirectToolItemEditor_Find;
+	public static String DirectToolItemEditor_Label;
+	public static String DirectToolItemEditor_Description;
+	
+	public static String HandledMenuItemEditor_Label;
+	public static String HandledMenuItemEditor_Description;
+	public static String HandledMenuItemEditor_Command;
+	public static String HandledMenuItemEditor_Find;
+	public static String HandledMenuItemEditor_Parameters;
+	public static String HandledMenuItemEditor_Tag;
+	public static String HandledMenuItemEditor_Value;
+	public static String HandledMenuItemEditor_Up;
+	public static String HandledMenuItemEditor_Down;
+	public static String HandledMenuItemEditor_Add;
+	public static String HandledMenuItemEditor_Remove;
+	
+	public static String HandledToolItemEditor_Command;
+	public static String HandledToolItemEditor_Find;
+	public static String HandledToolItemEditor_Parameters;
+	public static String HandledToolItemEditor_ParametersName;
+	public static String HandledToolItemEditor_ParametersValue;
+	public static String HandledToolItemEditor_Up;
+	public static String HandledToolItemEditor_Down;
+	public static String HandledToolItemEditor_Add;
+	public static String HandledToolItemEditor_Remove;
+	public static String HandledToolItemEditor_Label;
+	public static String HandledToolItemEditor_Description;
+	
+	public static String HandlerEditor_Label;
+	public static String HandlerEditor_Description;
+	public static String HandlerEditor_Id;
+	public static String HandlerEditor_Command;
+	public static String HandlerEditor_Find;
+	public static String HandlerEditor_ClassURI;
+	
+	public static String InputPartEditor_Label;
+	public static String InputPartEditor_InputURI;
+	
+	public static String KeyBindingEditor_Label;
+	public static String KeyBindingEditor_Description;
+	public static String KeyBindingEditor_Id;
+	public static String KeyBindingEditor_Sequence;
+	public static String KeyBindingEditor_Command;
+	public static String KeyBindingEditor_Find;
+	public static String KeyBindingEditor_Parameters;
+	public static String KeyBindingEditor_ParametersKey;
+	public static String KeyBindingEditor_ParametersValue;
+	public static String KeyBindingEditor_Up;
+	public static String KeyBindingEditor_Down;
+	public static String KeyBindingEditor_Add;
+	public static String KeyBindingEditor_Remove;
+	
+	public static String MenuEditor_Label;
+	public static String MenuEditor_Description;
+	public static String MenuEditor_Id;
+	public static String MenuEditor_MenuItems;
+	public static String MenuEditor_MenuItemType;
+	public static String MenuEditor_MenuItemItemType;
+	public static String MenuEditor_Up;
+	public static String MenuEditor_Down;
+	public static String MenuEditor_HandledMenuItem;
+	public static String MenuEditor_Separator;
+	public static String MenuEditor_Menu;
+	public static String MenuEditor_DirectMenuItem;
+	public static String MenuEditor_Remove;
+	public static String MenuEditor_LabelLabel;
+	public static String MenuEditor_Tooltip;
+	public static String MenuEditor_IconURI;
+	
+	
+	public static String MenuItemEditor_Id;
+	public static String MenuItemEditor_Type;
+	public static String MenuItemEditor_Label;
+	public static String MenuItemEditor_Tooltip;
+	public static String MenuItemEditor_IconURI;
+	public static String MenuItemEditor_Find;
+	
+	public static String MenuSeparatorEditor_Label;
+	public static String MenuSeparatorEditor_Id;
+	
+	public static String ModelComponentEditor_Id;
+	public static String ModelComponentEditor_ParentId;
+	public static String ModelComponentEditor_Find;
+	public static String ModelComponentEditor_PositionInParent;
+	public static String ModelComponentEditor_Processor;
+	public static String ModelComponentEditor_Tags;
+	public static String ModelComponentEditor_Label;
+	public static String ModelComponentEditor_Description;
+	public static String ModelComponentEditor_Handlers;
+	public static String ModelComponentEditor_BindingTables;
+	public static String ModelComponentEditor_KeyBindings;
+	public static String ModelComponentEditor_Commands;
+	public static String ModelComponentEditor_Menus;
+	public static String ModelComponentEditor_Parts;
+	public static String ModelComponentEditor_PartDescriptors;
+	public static String ModelComponentEditor_DetailParentId;
+	
+	public static String ModelComponentsEditor_Label;
+	public static String ModelComponentsEditor_Description;
+	public static String ModelComponentsEditor_ModelContributions;
+	public static String ModelComponentsEditor_Up;
+	public static String ModelComponentsEditor_Down;
+	public static String ModelComponentsEditor_Add;
+	public static String ModelComponentsEditor_Remove;
+	
+	public static String PartDescriptorEditor_Label;
+	public static String PartDescriptorEditor_Descriptor;
+	public static String PartDescriptorEditor_Id;
+	public static String PartDescriptorEditor_LabelLabel;
+	public static String PartDescriptorEditor_Tooltip;
+	public static String PartDescriptorEditor_IconURI;
+	public static String PartDescriptorEditor_Find;
+	public static String PartDescriptorEditor_ClassURI;
+	public static String PartDescriptorEditor_Dirtyable;
+	public static String PartDescriptorEditor_Closeable;
+	public static String PartDescriptorEditor_Multiple;
+	public static String PartDescriptorEditor_Category;
+	public static String PartDescriptorEditor_PersitedState;
+	public static String PartDescriptorEditor_PersitedStateKey;
+	public static String PartDescriptorEditor_PersitedStateValue;
+	public static String PartDescriptorEditor_Add;
+	public static String PartDescriptorEditor_Remove;
+	public static String PartDescriptorEditor_Variables;
+	public static String PartDescriptorEditor_Properties;
+	public static String PartDescriptorEditor_PropertiesKey;
+	public static String PartDescriptorEditor_PropertiesValue;
+	public static String PartDescriptorEditor_Menus;
+	public static String PartDescriptorEditor_Handlers;
+	public static String PartDescriptorEditor_ContainerData;
+	
+	public static String PartEditor_Label;
+	public static String PartEditor_Description;
+	public static String PartEditor_Id;
+	public static String PartEditor_LabelLabel;
+	public static String PartEditor_Tooltip;
+	public static String PartEditor_IconURI;
+	public static String PartEditor_Find;
+	public static String PartEditor_ClassURI;
+	public static String PartEditor_Closeable;
+	public static String PartEditor_PersitedState;
+	public static String PartEditor_PersitedStateKey;
+	public static String PartEditor_PersitedStateValue;
+	public static String PartEditor_Add;
+	public static String PartEditor_Remove;
+	public static String PartEditor_Menus;
+	public static String PartEditor_Handlers;
+	public static String PartEditor_ContainerData;
+	
+	public static String PartSashContainerEditor_Label;
+	public static String PartSashContainerEditor_Description;
+	public static String PartSashContainerEditor_Id;
+	public static String PartSashContainerEditor_Orientation;
+	public static String PartSashContainerEditor_Vertical;
+	public static String PartSashContainerEditor_Horizontal;
+	public static String PartSashContainerEditor_SelectedElement;
+	public static String PartSashContainerEditor_Controls;
+	public static String PartSashContainerEditor_Up;
+	public static String PartSashContainerEditor_Down;
+	public static String PartSashContainerEditor_Remove;
+	public static String PartSashContainerEditor_ContainerData;
+	
+	public static String PartStackEditor_Label;
+	public static String PartStackEditor_Description;
+	public static String PartStackEditor_Id;
+	public static String PartStackEditor_SelectedElement;
+	public static String PartStackEditor_Parts;
+	public static String PartStackEditor_Up;
+	public static String PartStackEditor_Down;
+	public static String PartStackEditor_Remove;
+	public static String PartStackEditor_ContainerData;
+	
+	public static String PerspectiveEditor_Label;
+	public static String PerspectiveEditor_Description;
+	public static String PerspectiveEditor_Id;
+	public static String PerspectiveEditor_SelectedElement;
+	public static String PerspectiveEditor_Tooltip;
+	public static String PerspectiveEditor_IconURI;
+	public static String PerspectiveEditor_Find;
+	public static String PerspectiveEditor_Controls;
+	public static String PerspectiveEditor_Up;
+	public static String PerspectiveEditor_Down;
+	public static String PerspectiveEditor_Remove;
+	
+	public static String PerspectiveStackEditor_Perspectives;
+	public static String PerspectiveStackEditor_Label;
+	public static String PerspectiveStackEditor_Description;
+	public static String PerspectiveStackEditor_Id;
+	public static String PerspectiveStackEditor_SelectedElement;
+	
+	public static String PlaceholderEditor_Label;
+	public static String PlaceholderEditor_Descriptor;
+	public static String PlaceholderEditor_Id;
+	
+	public static String ToolBarEditor_Label;
+	public static String ToolBarEditor_Description;
+	public static String ToolBarEditor_Id;
+	public static String ToolBarEditor_ToolbarItems;
+	public static String ToolBarEditor_ToolbarItemsType;
+	public static String ToolBarEditor_ToolbarItemsItemType;
+	public static String ToolBarEditor_Up;
+	public static String ToolBarEditor_Down;
+	public static String ToolBarEditor_HandledToolItem;
+	public static String ToolBarEditor_DirectToolItem;
+	public static String ToolBarEditor_ToolControl;
+	public static String ToolBarEditor_Separator;
+	public static String ToolBarEditor_Remove;
+	
+	public static String ToolBarSeparatorEditor_Label;
+	public static String ToolBarSeparatorEditor_Id;
+	
+	public static String ToolControlEditor_Label;
+	public static String ToolControlEditor_Description;
+	public static String ToolControlEditor_Id;
+	public static String ToolControlEditor_ClassURI;
+	
+	public static String VBindingTableEditor_Label;
+	public static String VBindingTableEditor_Description;
+	public static String VBindingTableEditor_Contexts;
+	public static String VBindingTableEditor_Name;
+	public static String VBindingTableEditor_LabelDescription;
+	public static String VBindingTableEditor_Id;
+	public static String VBindingTableEditor_Up;
+	public static String VBindingTableEditor_Down;
+	public static String VBindingTableEditor_Add;
+	public static String VBindingTableEditor_Remove;
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	static {
+		NLS.initializeMessages(Messages.class.getName(), Messages.class);
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
new file mode 100644
index 0000000000..290dd336c7
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -0,0 +1,288 @@
+# ******************************************************************************
+# * Copyright (c) 2010 BestSolution.at and others.
+# * All rights reserved. This program and the accompanying materials
+# * are made available under the 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:
+# *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+# ******************************************************************************
+ApplicationEditor_Label=Application
+ApplicationEditor_Description=Application bla, bla, bla
+ApplicationEditor_Id=Id
+ApplicationEditor_Handlers=Handlers
+ApplicationEditor_PartDescriptors=Part Descriptors
+ApplicationEditor_BindingTables=BindingTables
+ApplicationEditor_Commands=Commands
+ApplicationEditor_Windows=Windows
+
+BindingTableEditor_Label=BindingTable
+BindingTableEditor_Description=BindingTable bla bla bla
+BindingTableEditor_Id=Id
+BindingTableEditor_ContextId=Context Id
+BindingTableEditor_Find=Find ...
+BindingTableEditor_Keybindings=Keybindings
+BindingTableEditor_KeySequence=KeySequence
+BindingTableEditor_Command=Command
+BindingTableEditor_Up=Up
+BindingTableEditor_Down=Down
+BindingTableEditor_Add=Add ...
+BindingTableEditor_Remove=Remove
+
+CommandEditor_Label=Command
+CommandEditor_Description=Command bla bla bla
+CommandEditor_Id=Id
+CommandEditor_Name=Name
+CommandEditor_LabelDescription=Description
+CommandEditor_Parameters=Parameters
+CommandEditor_ParameterName=Name
+CommandEditor_ParameterTypeId=Type-Id
+CommandEditor_ParameterOptional=Optional
+CommandEditor_ParameterOptional_Yes=yes
+CommandEditor_ParameterOptional_No=no
+CommandEditor_Up=Up
+CommandEditor_Down=Down
+CommandEditor_Add=Add ...
+CommandEditor_Remove=Remove
+
+DirectMenuItemEditor_Label=DirectMenuItem
+DirectMenuItemEditor_Description=DirectMenuItem bla bla bla
+DirectMenuItemEditor_ClassURI=Class URI
+DirectMenuItemEditor_Find=Find ...
+
+ControlFactory_BindingContexts=Binding Contexts
+ControlFactory_Add=Add ...
+ControlFactory_Up=Up
+ControlFactory_Down=Down
+ControlFactory_Remove=Remove
+ControlFactory_Tags=Tags
+ControlFactory_Key=Key
+ControlFactory_Value=Value
+
+DirectToolItemEditor_ClassURI=Class URI
+DirectToolItemEditor_Find=Find ...
+DirectToolItemEditor_Label=Direct Tool Item
+DirectToolItemEditor_Description=Direct Tool Item bla bla bla
+
+HandledMenuItemEditor_Label=HandledMenuItem
+HandledMenuItemEditor_Description=HandledMenuItem bla bla bla
+HandledMenuItemEditor_Command=Command
+HandledMenuItemEditor_Find=Find ...
+HandledMenuItemEditor_Parameters=Parameters
+HandledMenuItemEditor_Tag=Tag
+HandledMenuItemEditor_Value=Value
+HandledMenuItemEditor_Up=Up
+HandledMenuItemEditor_Down=Down
+HandledMenuItemEditor_Add=Add ...
+HandledMenuItemEditor_Remove=Remove
+
+HandledToolItemEditor_Command=Command
+HandledToolItemEditor_Find=Find ...
+HandledToolItemEditor_Parameters=Parameters
+HandledToolItemEditor_ParametersName=Name
+HandledToolItemEditor_ParametersValue=Value
+HandledToolItemEditor_Up=Up
+HandledToolItemEditor_Down=Down
+HandledToolItemEditor_Add=Add ...
+HandledToolItemEditor_Remove=Remove
+HandledToolItemEditor_Label=Handled Tool Item
+HandledToolItemEditor_Description=Handled Tool Item bla bla bla
+
+HandlerEditor_Label=Handler
+HandlerEditor_Description=Handler bla bla bla
+HandlerEditor_Id=Id
+HandlerEditor_Command=Command
+HandlerEditor_Find=Find ...
+HandlerEditor_ClassURI=Class URI
+
+InputPartEditor_Label=InputPart
+InputPartEditor_InputURI=Input URI
+
+KeyBindingEditor_Label=Binding
+KeyBindingEditor_Description=Binding bla bla bla
+KeyBindingEditor_Id=Id
+KeyBindingEditor_Sequence=Sequence
+KeyBindingEditor_Command=Command
+KeyBindingEditor_Find=Find ...
+KeyBindingEditor_Parameters=Parameters
+KeyBindingEditor_ParametersKey=Key
+KeyBindingEditor_ParametersValue=Value
+KeyBindingEditor_Up=Up
+KeyBindingEditor_Down=Down
+KeyBindingEditor_Add=Add ...
+KeyBindingEditor_Remove=Remove
+
+MenuEditor_Label=Menu
+MenuEditor_Description=Menu bla bla bla
+MenuEditor_Id=Id
+MenuEditor_MenuItems=MenuItems
+MenuEditor_MenuItemType=Type
+MenuEditor_MenuItemItemType=Item Type
+MenuEditor_Up=Up
+MenuEditor_Down=Down
+MenuEditor_HandledMenuItem=Handled MenuItem
+MenuEditor_Separator=Separator
+MenuEditor_Menu=Menu
+MenuEditor_Remove=Remove
+MenuEditor_DirectMenuItem=Direct MenuItem
+MenuEditor_LabelLabel=Label
+MenuEditor_Tooltip=Tooltip
+MenuEditor_IconURI=Icon URI
+
+MenuItemEditor_Id=Id
+MenuItemEditor_Type=Type
+MenuItemEditor_Label=Label
+MenuItemEditor_Tooltip=Tooltip
+MenuItemEditor_IconURI=Icon URI
+MenuItemEditor_Find=Find ...
+
+
+MenuSeparatorEditor_Label=Separator
+MenuSeparatorEditor_Id=Id
+
+ModelComponentEditor_Id=Id
+ModelComponentEditor_ParentId=Parent-Id
+ModelComponentEditor_Find=Find ...
+ModelComponentEditor_PositionInParent=Position in Parent
+ModelComponentEditor_Processor=Processor
+ModelComponentEditor_Tags=Tags
+ModelComponentEditor_Label=Model Component
+ModelComponentEditor_Description=The model component ... bla bla bla
+ModelComponentEditor_Handlers=Handlers
+ModelComponentEditor_BindingTables=BindingTables
+ModelComponentEditor_KeyBindings=KeyBindings
+ModelComponentEditor_Commands=Commands
+ModelComponentEditor_Menus=Menus
+ModelComponentEditor_Parts=Parts
+ModelComponentEditor_PartDescriptors=PartDescriptors
+ModelComponentEditor_DetailParentId=parentId
+
+ModelComponentsEditor_Label=Model Components
+ModelComponentsEditor_Description=Some bla bla bla bla
+ModelComponentsEditor_ModelContributions=Model Contributions
+ModelComponentsEditor_Up=Up
+ModelComponentsEditor_Down=Down
+ModelComponentsEditor_Add=Add
+ModelComponentsEditor_Remove=Remove
+
+PartDescriptorEditor_Label=PartDescriptor
+PartDescriptorEditor_Descriptor=PartDescriptor Bla Bla Bla Bla
+PartDescriptorEditor_Id=Id
+PartDescriptorEditor_LabelLabel=Label
+PartDescriptorEditor_Tooltip=Tooltip
+PartDescriptorEditor_IconURI=Icon URI
+PartDescriptorEditor_Find=Find ...
+PartDescriptorEditor_ClassURI=Class URI
+PartDescriptorEditor_Dirtyable=Dirtyable
+PartDescriptorEditor_Closeable=Closeable
+PartDescriptorEditor_Multiple=Multiple
+PartDescriptorEditor_Category=Category
+PartDescriptorEditor_PersitedState=Persited State
+PartDescriptorEditor_PersitedStateKey=Key
+PartDescriptorEditor_PersitedStateValue=Value
+PartDescriptorEditor_Add=Add ...
+PartDescriptorEditor_Remove=Remove
+PartDescriptorEditor_Variables=Variables
+PartDescriptorEditor_Properties=Properties
+PartDescriptorEditor_PropertiesKey=Key
+PartDescriptorEditor_PropertiesValue=Value
+PartDescriptorEditor_Menus=Menus
+PartDescriptorEditor_Handlers=Handlers
+PartDescriptorEditor_ContainerData=Container Data
+
+PartEditor_Label=Part
+PartEditor_Description=Part Bla Bla Bla Bla
+PartEditor_Id=Id
+PartEditor_LabelLabel=Label
+PartEditor_Tooltip=Tooltip
+PartEditor_IconURI=Icon URI
+PartEditor_Find=Find ...
+PartEditor_ClassURI=Class URI
+PartEditor_Closeable=Closeable
+PartEditor_PersitedState=Persisted State
+PartEditor_PersitedStateKey=Key
+PartEditor_PersitedStateValue=Value
+PartEditor_Add=Add ...
+PartEditor_Remove=Remove
+PartEditor_Menus=Menus
+PartEditor_Handlers=Handlers
+
+PartSashContainerEditor_Label=Sash
+PartSashContainerEditor_Description=Sash bla bla bla
+PartSashContainerEditor_Id=Id
+PartSashContainerEditor_Orientation=Orientation
+PartSashContainerEditor_Vertical=Vertical
+PartSashContainerEditor_Horizontal=Horizontal
+PartSashContainerEditor_SelectedElement=Selected Element
+PartSashContainerEditor_Controls=Controls
+PartSashContainerEditor_Up=Up
+PartSashContainerEditor_Down=Down
+PartSashContainerEditor_Remove=Remove
+PartSashContainerEditor_ContainerData=Container Data
+
+PartStackEditor_Label=Part Stack
+PartStackEditor_Description=Stack bla bla bla
+PartStackEditor_Id=Id
+PartStackEditor_SelectedElement=Selected Element
+PartStackEditor_Parts=Parts
+PartStackEditor_Up=Up
+PartStackEditor_Down=Down
+PartStackEditor_Remove=Remove
+PartStackEditor_ContainerData=Container Data
+
+PerspectiveEditor_Label=Perspective
+PerspectiveEditor_Description=Perspective Bla Bla Bla
+PerspectiveEditor_Id=Id
+PerspectiveEditor_SelectedElement=Selected Element
+PerspectiveEditor_Label=Label
+PerspectiveEditor_Tooltip=Tooltip
+PerspectiveEditor_IconURI=Icon URI
+PerspectiveEditor_Find=Find ...
+PerspectiveEditor_Controls=Controls
+PerspectiveEditor_Up=Up
+PerspectiveEditor_Down=Down
+PerspectiveEditor_Remove=Remove
+PartEditor_ContainerData=Container Data
+
+PerspectiveStackEditor_Label=Perspective Stack
+PerspectiveStackEditor_Description=Perspective Stack Bla Bla Bla
+PerspectiveStackEditor_Id=Id
+PerspectiveStackEditor_SelectedElement=Selected Element
+PerspectiveStackEditor_Perspectives=Perspectives
+
+PlaceholderEditor_Label=Placeholder
+PlaceholderEditor_Descriptor=Placeholder Bla Bla Bla Bla
+PlaceholderEditor_Id=Id
+
+ToolBarEditor_Label=Toolbar
+ToolBarEditor_Description=Toolbar bla bla bla
+ToolBarEditor_Id=Id
+ToolBarEditor_ToolbarItems=Toolbar Items
+ToolBarEditor_ToolbarItemsType=Type
+ToolBarEditor_ToolbarItemsItemType=Item-Type
+ToolBarEditor_Up=Up
+ToolBarEditor_Down=Down
+ToolBarEditor_HandledToolItem=Handled ToolItem
+ToolBarEditor_DirectToolItem=Direct ToolItem
+ToolBarEditor_ToolControl=Tool Control
+ToolBarEditor_Separator=Separator
+ToolBarEditor_Remove=Remove
+
+ToolBarSeparatorEditor_Label=Separator
+ToolBarSeparatorEditor_Id=Id
+
+ToolControlEditor_Label=ToolControl
+ToolControlEditor_Description=ToolControl bla bla bla
+ToolControlEditor_Id=Id
+
+VBindingTableEditor_Label=Binding Configuration
+VBindingTableEditor_Description=Binding Configuration Bla Bla Bla Bla
+VBindingTableEditor_Contexts=Contexts
+VBindingTableEditor_Name=Name
+VBindingTableEditor_LabelDescription=Description
+VBindingTableEditor_Id=Id
+VBindingTableEditor_Up=Up
+VBindingTableEditor_Down=Down
+VBindingTableEditor_Add=Add ...
+VBindingTableEditor_Remove=Remove
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
index 0647a798cd..c1207886cc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
 import java.util.Set;
@@ -71,7 +81,7 @@ public void update(ViewerCell cell) {
 
 	public String getText(M element) {
 		Object value = attributeMaps[0].get(element);
-		return value == null ? "" : value.toString();
+		return value == null ? "" : value.toString(); //$NON-NLS-1$
 	}
 	
 	public Font getFont(M element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
index 23ff9a5051..6fc7603db0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
@@ -38,12 +38,12 @@ public class PatternFilter extends ViewerFilter {
 	/*
 	 * Cache of filtered elements in the tree
 	 */
-    private Map cache = new HashMap();
+    private Map<Object,Object[]> cache = new HashMap<Object,Object[]>();
     
     /*
      * Maps parent elements to TRUE or FALSE
      */
-    private Map foundAnyCache = new HashMap();
+    private Map<Object,Boolean> foundAnyCache = new HashMap<Object,Boolean>();
     
     private boolean useCache = false;
     
@@ -288,7 +288,7 @@ protected boolean isLeafMatch(Viewer viewer, Object element){
      * @return an array of words
      */
     private String[] getWords(String text){
-    	List words = new ArrayList();
+    	List<String> words = new ArrayList<String>();
 		// Break the text up into words, separating based on whitespace and
 		// common punctuation.
 		// Previously used String.split(..., "\\W"), where "\W" is a regular
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
index ddde765f1c..cfd8768709 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
@@ -284,7 +284,7 @@ private void parseWildCards() {
             }
         }
 
-        Vector temp = new Vector();
+        Vector<String> temp = new Vector<String>();
 
         int pos = 0;
         StringBuffer buf = new StringBuffer();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
index a976bc2261..f7b4a5a109 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
@@ -21,12 +21,10 @@ public class ClassContributionCollector {
 	private CopyOnWriteArrayList<IClassContributionProvider> providers = new CopyOnWriteArrayList<IClassContributionProvider>();
 	
 	public void addContributor(IClassContributionProvider contributor) {
-		System.err.println("Add Contributor: " + contributor);
 		providers.add(contributor);
 	}
 	
 	public void removeContributor(IClassContributionProvider contributor) {
-		System.err.println("Remove Contributor: " + contributor);
 		providers.remove(contributor);
 	}
 	
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index 9621c8078d..1ee616330e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -44,7 +44,7 @@ public void update(final ViewerCell cell) {
 					cell.setText(label);
 				} else {
 					StyledString styledString = new StyledString(label, null);
-					styledString.append(" - " + detailText, StyledString.DECORATIONS_STYLER);
+					styledString.append(" - " + detailText, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 					cell.setText(styledString.getString());
 					cell.setStyleRanges(styledString.getStyleRanges());
 				}
@@ -56,7 +56,7 @@ public void update(final ViewerCell cell) {
 			String s = cell.getElement().toString();
 			cell.setText(s);
 		} else {
-			cell.setText(cell.getElement()+"");
+			cell.setText(cell.getElement().toString());
 		}
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 47bd78b203..eef4517ecc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -15,8 +15,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.map.IMapChangeListener;
@@ -43,7 +41,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandlerEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuSeparatorEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ModelComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ModelComponentsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PartDescriptorEditor;
@@ -54,19 +52,25 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PerspectiveStackEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PlaceholderEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolBarEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolItemEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolBarSeparatorEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolControlEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.TrimBarEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.TrimmedWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowTrimEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VBindingTableEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VCommandEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VControlEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowControlEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelComponentBindingEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartDescriptor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowTrimEditor;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.ecore.EClass;
@@ -92,17 +96,20 @@
 import org.eclipse.swt.widgets.Label;
 
 public class ModelEditor {
-	public static final int VIRTUAL_MENU = 0;
+	private static final String CSS_CLASS_KEY = "org.eclipse.e4.ui.css.CssClassName"; //$NON-NLS-1$
+	
+	public static final int VIRTUAL_PART_MENU = 0;
 	public static final int VIRTUAL_PART = 1;
 	public static final int VIRTUAL_HANDLER = 2;
 	public static final int VIRTUAL_BINDING_TABLE = 3;
 	public static final int VIRTUAL_COMMAND = 4;
 	public static final int VIRTUAL_WINDOWS = 5;
 	public static final int VIRTUAL_WINDOW_CONTROLS = 6;
-	public static final int VIRTUAL_WINDOW_TRIMS = 7;
-	public static final int VIRTUAL_PART_DESCRIPTORS = 8;
-	public static final int VIRTUAL_MODEL_COMP_COMMANDS = 9;
-	public static final int VIRTUAL_MODEL_COMP_BINDINGS = 10;
+	public static final int VIRTUAL_PART_DESCRIPTORS = 7;
+	public static final int VIRTUAL_MODEL_COMP_COMMANDS = 8;
+	public static final int VIRTUAL_MODEL_COMP_BINDINGS = 9;
+	public static final int VIRTUAL_PARTDESCRIPTOR_MENU = 10;
+	public static final int VIRTUAL_TRIMMED_WINDOW_TRIMS = 11;
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private AbstractComponentEditor[] virtualEditors;
@@ -115,7 +122,6 @@ public class ModelEditor {
 	private IModelResource modelProvider;
 	private IProject project;
 
-	@Inject
 	public ModelEditor(Composite composite, IModelResource modelProvider, IProject project) {
 		this.modelProvider = modelProvider;
 		this.project = project;
@@ -144,7 +150,7 @@ public ModelEditor(Composite composite, IModelResource modelProvider, IProject p
 
 		Composite headerContainer = new Composite(editingArea, SWT.NONE);
 		headerContainer.setBackgroundMode(SWT.INHERIT_DEFAULT);
-		headerContainer.setData("org.eclipse.e4.ui.css.CssClassName", "headerSectionContainer");
+		headerContainer.setData(CSS_CLASS_KEY, "headerSectionContainer"); //$NON-NLS-1$
 		headerContainer.setLayout(new GridLayout(2, false));
 		headerContainer.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
@@ -152,15 +158,15 @@ public ModelEditor(Composite composite, IModelResource modelProvider, IProject p
 		iconLabel.setLayoutData(new GridData(20, 20));
 
 		final Label textLabel = new Label(headerContainer, SWT.NONE);
-		textLabel.setData("org.eclipse.e4.ui.css.CssClassName", "sectionHeader");
+		textLabel.setData(CSS_CLASS_KEY, "sectionHeader"); //$NON-NLS-1$
 		textLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		final ScrolledComposite scrolling = new ScrolledComposite(editingArea, SWT.H_SCROLL | SWT.V_SCROLL);
 		scrolling.setBackgroundMode(SWT.INHERIT_DEFAULT);
-		scrolling.setData("org.eclipse.e4.ui.css.CssClassName", "formContainer");
+		scrolling.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
 		
 		final Composite contentContainer = new Composite(scrolling, SWT.NONE);
-		contentContainer.setData("org.eclipse.e4.ui.css.CssClassName", "formContainer");
+		contentContainer.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
 		scrolling.setExpandHorizontal(true);
 		scrolling.setExpandVertical(true);
 		scrolling.setContent(contentContainer);
@@ -217,7 +223,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 
 	private TreeViewer createTreeViewerArea(Composite parent) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setData("org.eclipse.e4.ui.css.CssClassName", "formContainer");
+		parent.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
 		parent.setBackgroundMode(SWT.INHERIT_DEFAULT);
 		
 		FillLayout l = new FillLayout();
@@ -266,17 +272,18 @@ public void handleMapChange(MapChangeEvent event) {
 	}
 
 	private void registerVirtualEditors() {
-		virtualEditors = new AbstractComponentEditor[] { new VMenuEditor(modelProvider.getEditingDomain(), this), // V-Menu
+		virtualEditors = new AbstractComponentEditor[] { new VMenuEditor(modelProvider.getEditingDomain(), this, BasicPackageImpl.Literals.PART__MENUS), // V-Menu
 				null, // V-Part
 				new VHandlerEditor(modelProvider.getEditingDomain(), this), 
 				new VBindingTableEditor(modelProvider.getEditingDomain(), this), 
-				new VCommandEditor(modelProvider.getEditingDomain(), this, MApplicationPackage.Literals.APPLICATION__COMMANDS), 
+				new VCommandEditor(modelProvider.getEditingDomain(), this, ApplicationPackageImpl.Literals.APPLICATION__COMMANDS), 
 				new VWindowEditor(modelProvider.getEditingDomain(), this), 
-				new VControlEditor(modelProvider.getEditingDomain(), this), 
-				new VWindowTrimEditor(modelProvider.getEditingDomain(), this),
+				new VWindowControlEditor(modelProvider.getEditingDomain(), this), 
 				new VPartDescriptor(modelProvider.getEditingDomain(), this),
-				new VCommandEditor(modelProvider.getEditingDomain(), this, MApplicationPackage.Literals.MODEL_COMPONENT__COMMANDS),
-				new VModelComponentBindingEditor(modelProvider.getEditingDomain(), this)
+				new VCommandEditor(modelProvider.getEditingDomain(), this, ApplicationPackageImpl.Literals.MODEL_COMPONENT__COMMANDS),
+				new VModelComponentBindingEditor(modelProvider.getEditingDomain(), this),
+				new VMenuEditor(modelProvider.getEditingDomain(), this, org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS),
+				new VWindowTrimEditor(modelProvider.getEditingDomain(), this)
 		};
 	}
 
@@ -285,31 +292,39 @@ public void setSelection(Object element) {
 	}
 
 	private void registerDefaultEditors() {
-		registerEditor(MApplicationPackage.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain()));
-		registerEditor(MApplicationPackage.Literals.MODEL_COMPONENTS, new ModelComponentsEditor(modelProvider.getEditingDomain(),this));
-		registerEditor(MApplicationPackage.Literals.MODEL_COMPONENT, new ModelComponentEditor(modelProvider.getEditingDomain()));
-		registerEditor(MApplicationPackage.Literals.PART, new PartEditor(modelProvider.getEditingDomain(),project));
-		registerEditor(MApplicationPackage.Literals.PART_DESCRIPTOR, new PartDescriptorEditor(modelProvider.getEditingDomain(),project));
-		registerEditor(MApplicationPackage.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain(),modelProvider));
-		registerEditor(MApplicationPackage.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(),modelProvider,project));
-		registerEditor(MApplicationPackage.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain()));
-		registerEditor(MApplicationPackage.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain()));
-		registerEditor(MApplicationPackage.Literals.PART_SASH_CONTAINER, new PartSashContainerEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(MApplicationPackage.Literals.PART_STACK, new PartStackEditor(modelProvider.getEditingDomain(),this));
-		registerEditor(MApplicationPackage.Literals.WINDOW_TRIM, new WindowTrimEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(MApplicationPackage.Literals.TOOL_BAR, new ToolBarEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(MApplicationPackage.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor(modelProvider.getEditingDomain(),project));
-		registerEditor(MApplicationPackage.Literals.HANDLED_TOOL_ITEM, new HandledToolItemEditor(modelProvider.getEditingDomain()));
-		registerEditor(MApplicationPackage.Literals.TOOL_ITEM, new ToolItemEditor(modelProvider.getEditingDomain()));
-		registerEditor(MApplicationPackage.Literals.PERSPECTIVE_STACK, new PerspectiveStackEditor(modelProvider.getEditingDomain()));
-		registerEditor(MApplicationPackage.Literals.PERSPECTIVE, new PerspectiveEditor(modelProvider.getEditingDomain()));
-		registerEditor(MApplicationPackage.Literals.PLACEHOLDER, new PlaceholderEditor(modelProvider.getEditingDomain()));
-		registerEditor(MApplicationPackage.Literals.MENU, new MenuEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(MApplicationPackage.Literals.MENU_ITEM, new MenuItemEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(MApplicationPackage.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(MApplicationPackage.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this, project));
-		registerEditor(MApplicationPackage.Literals.BINDING_TABLE, new BindingTableEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(MApplicationPackage.Literals.INPUT_PART, new InputPartEditor(modelProvider.getEditingDomain(), project));
+		registerEditor(ApplicationPackageImpl.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain()));
+		registerEditor(ApplicationPackageImpl.Literals.MODEL_COMPONENTS, new ModelComponentsEditor(modelProvider.getEditingDomain(),this));
+		registerEditor(ApplicationPackageImpl.Literals.MODEL_COMPONENT, new ModelComponentEditor(modelProvider.getEditingDomain()));
+		
+		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain(),modelProvider));
+		registerEditor(CommandsPackageImpl.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(),modelProvider,project));
+		registerEditor(CommandsPackageImpl.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain()));
+		registerEditor(CommandsPackageImpl.Literals.BINDING_TABLE, new BindingTableEditor(modelProvider.getEditingDomain(), this));
+		
+		registerEditor(MenuPackageImpl.Literals.TOOL_BAR, new ToolBarEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor(modelProvider.getEditingDomain(),project));
+		registerEditor(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, new HandledToolItemEditor(modelProvider.getEditingDomain(),modelProvider));
+		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, new ToolBarSeparatorEditor(modelProvider.getEditingDomain()));
+		registerEditor(MenuPackageImpl.Literals.TOOL_CONTROL, new ToolControlEditor(modelProvider.getEditingDomain(),project));
+		
+		registerEditor(MenuPackageImpl.Literals.MENU, new MenuEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(MenuPackageImpl.Literals.MENU_SEPARATOR, new MenuSeparatorEditor(modelProvider.getEditingDomain()));
+		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), modelProvider));
+		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this, project));
+		
+		registerEditor(BasicPackageImpl.Literals.PART, new PartEditor(modelProvider.getEditingDomain(),project));
+		registerEditor(BasicPackageImpl.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain()));
+		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW, new TrimmedWindowEditor(modelProvider.getEditingDomain()));
+		registerEditor(BasicPackageImpl.Literals.PART_SASH_CONTAINER, new PartSashContainerEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(BasicPackageImpl.Literals.PART_STACK, new PartStackEditor(modelProvider.getEditingDomain(),this));
+		registerEditor(BasicPackageImpl.Literals.INPUT_PART, new InputPartEditor(modelProvider.getEditingDomain(), project));
+		registerEditor(BasicPackageImpl.Literals.TRIM_BAR, new TrimBarEditor(modelProvider.getEditingDomain(), this));
+		
+		registerEditor(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR, new PartDescriptorEditor(modelProvider.getEditingDomain(),project));
+		
+		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, new PerspectiveStackEditor(modelProvider.getEditingDomain(),this));
+		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE, new PerspectiveEditor(modelProvider.getEditingDomain(),this));
+		registerEditor(AdvancedPackageImpl.Literals.PLACEHOLDER, new PlaceholderEditor(modelProvider.getEditingDomain()));
 	}
 
 	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 4601f74f8b..a63049b7ef 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -17,9 +17,13 @@
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
@@ -41,10 +45,11 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private Image image;
 	private EMFDataBindingContext context;
 
-	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
-	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES);
-	private IListProperty APPLICATION__COMMANDS = EMFProperties.list(MApplicationPackage.Literals.APPLICATION__COMMANDS);
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
+	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES);
+	private IListProperty APPLICATION__COMMANDS = EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__COMMANDS);
+	private IListProperty PART_DESCRIPTOR_CONTAINER__DESCRIPTORS = EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS);
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
 	public ApplicationEditor(EditingDomain editingDomain) {
 		super(editingDomain);
@@ -54,7 +59,7 @@ public ApplicationEditor(EditingDomain editingDomain) {
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Application.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Application.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -66,12 +71,12 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Application";
+		return Messages.ApplicationEditor_Label;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "Application bla, bla, bla";
+		return Messages.ApplicationEditor_Description;
 	}
 
 	@Override
@@ -92,13 +97,13 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Id");
+			l.setText(Messages.ApplicationEditor_Id);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 		
 		ControlFactory.createBindingsWidget(parent, this);
@@ -109,7 +114,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 	@Override
 	public IObservableList getChildList(Object element) {
 		WritableList list = new WritableList();
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, "Handlers") {
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.ApplicationEditor_Handlers) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -117,8 +122,17 @@ protected boolean accepted(Object o) {
 			}
 
 		});
+		
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART_DESCRIPTORS, PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, element, Messages.ApplicationEditor_PartDescriptors) {
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element, "BindingTables") {
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element, Messages.ApplicationEditor_BindingTables) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -127,7 +141,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_COMMAND, APPLICATION__COMMANDS, element, "Commands") {
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_COMMAND, APPLICATION__COMMANDS, element, Messages.ApplicationEditor_Commands) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -136,7 +150,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_WINDOWS, ELEMENT_CONTAINER__CHILDREN, element, "Windows") {
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_WINDOWS, ELEMENT_CONTAINER__CHILDREN, element, Messages.ApplicationEditor_Windows) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -150,8 +164,6 @@ protected boolean accepted(Object o) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
-
-}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 382baea5f1..a7506e0d97 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -17,13 +17,15 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MBindingTable;
-import org.eclipse.e4.ui.model.application.MHandler;
-import org.eclipse.e4.ui.model.application.MKeyBinding;
+import org.eclipse.e4.ui.model.application.commands.MBindingTable;
+import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -61,7 +63,7 @@ public class BindingTableEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
 	
-	private IListProperty BINDING_TABLE__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_TABLE__BINDINGS);
+	private IListProperty BINDING_TABLE__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
 
 
 	public BindingTableEditor(EditingDomain editingDomain, ModelEditor editor) {
@@ -73,7 +75,8 @@ public BindingTableEditor(EditingDomain editingDomain, ModelEditor editor) {
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/BindingTable.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingTable.png")); //$NON-NLS-1$
+//				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/BindingTable.gif"));
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -85,12 +88,12 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "BindingTable";
+		return Messages.BindingTableEditor_Label;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "BindingTable bla bla bla";
+		return Messages.BindingTableEditor_Description;
 	}
 
 	@Override
@@ -111,31 +114,31 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Id");
+			l.setText(Messages.BindingTableEditor_Id);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 		
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Context Id");
+			l.setText(Messages.BindingTableEditor_ContextId);
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.BINDING_TABLE__BINDING_CONTEXT_ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID).observeDetail(getMaster()));
 
 			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText("Find ...");			
+			b.setText(Messages.BindingTableEditor_Find);			
 		}
 		
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Keybindings");
+			l.setText(Messages.BindingTableEditor_Keybindings);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			final TableViewer viewer = new TableViewer(parent);
@@ -148,33 +151,33 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			viewer.getTable().setHeaderVisible(true);
 
 			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.KEY_SEQUENCE__KEY_SEQUENCE);
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_SEQUENCE__KEY_SEQUENCE);
 
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("KeySequence");
+				column.getColumn().setText(Messages.BindingTableEditor_KeySequence);
 				column.getColumn().setWidth(100);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
 
 			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.KEY_BINDING__COMMAND, MApplicationPackage.Literals.COMMAND__COMMAND_NAME));
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(CommandsPackageImpl.Literals.KEY_BINDING__COMMAND, CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME));
 
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Command");
+				column.getColumn().setText(Messages.BindingTableEditor_Command);
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
 
 			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID);
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
 
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Id");
+				column.getColumn().setText(Messages.BindingTableEditor_Id);
 				column.getColumn().setWidth(170);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
 			
-			IEMFListProperty prop = EMFProperties.list(MApplicationPackage.Literals.BINDING_TABLE__BINDINGS);
+			IEMFListProperty prop = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -187,7 +190,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.BindingTableEditor_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -200,7 +203,7 @@ public void widgetSelected(SelectionEvent e) {
 							MBindingTable container = (MBindingTable) getMaster().getValue();
 							int idx = container.getBindings().indexOf(obj) - 1;
 							if( idx >= 0 ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_TABLE__BINDINGS, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -214,7 +217,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.BindingTableEditor_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -227,7 +230,7 @@ public void widgetSelected(SelectionEvent e) {
 							MBindingTable container = (MBindingTable) getMaster().getValue();
 							int idx = container.getBindings().indexOf(obj) + 1;
 							if( idx < container.getBindings().size() ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_TABLE__BINDINGS, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -241,15 +244,15 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add ...");
+			b.setText(Messages.BindingTableEditor_Add);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MKeyBinding handler = MApplicationFactory.eINSTANCE.createKeyBinding();
+					MKeyBinding handler = MCommandsFactory.INSTANCE.createKeyBinding();
 					System.err.println(getMaster().getValue());
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_TABLE__BINDINGS, handler);
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, handler);
 
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
@@ -259,7 +262,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.BindingTableEditor_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -267,7 +270,7 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					if( ! viewer.getSelection().isEmpty() ) {
 						List<?> keybinding = ((IStructuredSelection)viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_TABLE__BINDINGS, keybinding);
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, keybinding);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -298,7 +301,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] {
-			FeaturePath.fromList(MApplicationPackage.Literals.BINDING_TABLE__BINDING_CONTEXT_ID)	
+			FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID)	
 		};
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 85b70bb6bd..d22f35d85d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -15,11 +15,13 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MCommand;
-import org.eclipse.e4.ui.model.application.MCommandParameter;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.commands.MCommandParameter;
+import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -70,7 +72,7 @@ public CommandEditor(EditingDomain editingDomain) {
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Command.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Command.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -82,12 +84,12 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Command";
+		return Messages.CommandEditor_Label;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "Command bla bla bla";
+		return Messages.CommandEditor_Description;
 	}
 
 	@Override
@@ -108,31 +110,31 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Id");
+			l.setText(Messages.CommandEditor_Id);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Name");
+			l.setText(Messages.CommandEditor_Name);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND__COMMAND_NAME).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Description");
+			l.setText(Messages.CommandEditor_LabelDescription);
 			l.setLayoutData(new GridData(GridData.BEGINNING,GridData.BEGINNING,false,false));
 
 			Text t = new Text(parent, SWT.BORDER|SWT.H_SCROLL|SWT.V_SCROLL);
@@ -140,13 +142,13 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			gd.horizontalSpan = 2;
 			gd.heightHint=100;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND__DESCRIPTION).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__DESCRIPTION).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Parameters");
+			l.setText(Messages.CommandEditor_Parameters);
 			l.setLayoutData(new GridData(GridData.BEGINNING,GridData.BEGINNING,false,false));
 
 			final TableViewer viewer = new TableViewer(parent,SWT.FULL_SELECTION|SWT.MULTI|SWT.BORDER);
@@ -159,10 +161,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			viewer.getControl().setLayoutData(gd);
 
 			{
-				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND_PARAMETER__NAME);
+				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME);
 				
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Name");
+				column.getColumn().setText(Messages.CommandEditor_ParameterName);
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MCommandParameter>(prop.observeDetail(cp.getKnownElements())));
 				column.setEditingSupport(new EditingSupport(viewer) {
@@ -170,7 +172,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 					
 					@Override
 					protected void setValue(Object element, Object value) {
-						Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.COMMAND_PARAMETER__NAME, value);
+						Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME, value);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -179,7 +181,7 @@ protected void setValue(Object element, Object value) {
 					@Override
 					protected Object getValue(Object element) {
 						MCommandParameter obj = (MCommandParameter) element;
-						return obj.getName() != null ? obj.getName() : "";
+						return obj.getName() != null ? obj.getName() : ""; //$NON-NLS-1$
 					}
 					
 					@Override
@@ -195,10 +197,10 @@ protected boolean canEdit(Object element) {
 			}
 
 			{
-				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND_PARAMETER__TYPE_ID);
+				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__TYPE_ID);
 				
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Type-Id");
+				column.getColumn().setText(Messages.CommandEditor_ParameterTypeId);
 				column.getColumn().setWidth(200);				
 				column.setLabelProvider(new ObservableColumnLabelProvider<MCommandParameter>(prop.observeDetail(cp.getKnownElements())));
 				column.setEditingSupport(new EditingSupport(viewer) {
@@ -206,7 +208,7 @@ protected boolean canEdit(Object element) {
 					
 					@Override
 					protected void setValue(Object element, Object value) {
-						Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.COMMAND_PARAMETER__TYPE_ID, value);
+						Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.COMMAND_PARAMETER__TYPE_ID, value);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -215,7 +217,7 @@ protected void setValue(Object element, Object value) {
 					@Override
 					protected Object getValue(Object element) {
 						MCommandParameter obj = (MCommandParameter) element;
-						return obj.getTypeId() != null ? obj.getTypeId() : "";
+						return obj.getTypeId() != null ? obj.getTypeId() : ""; //$NON-NLS-1$
 					}
 					
 					@Override
@@ -231,24 +233,24 @@ protected boolean canEdit(Object element) {
 			}
 
 			{
-				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND_PARAMETER__OPTIONAL);
+				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__OPTIONAL);
 				
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Optional");
+				column.getColumn().setText(Messages.CommandEditor_ParameterOptional);
 				column.getColumn().setWidth(200);				
 				column.setLabelProvider(new ObservableColumnLabelProvider<MCommandParameter>(prop.observeDetail(cp.getKnownElements())) {
 					@Override
 					public String getText(MCommandParameter element) {
-						return element.isOptional() ? "yes" : "no";
+						return element.isOptional() ? Messages.CommandEditor_ParameterOptional_Yes : Messages.CommandEditor_ParameterOptional_No;
 					}
 				});
 				column.setEditingSupport(new EditingSupport(viewer) {
-					private ComboBoxCellEditor editor = new ComboBoxCellEditor(viewer.getTable(), new String[] { "yes", "no" });
+					private ComboBoxCellEditor editor = new ComboBoxCellEditor(viewer.getTable(), new String[] { Messages.CommandEditor_ParameterOptional_Yes, Messages.CommandEditor_ParameterOptional_No });
 					
 					@Override
 					protected void setValue(Object element, Object value) {
 						int idx = ((Number)value).intValue();
-						Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.COMMAND_PARAMETER__OPTIONAL, idx == 0);
+						Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.COMMAND_PARAMETER__OPTIONAL, idx == 0);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -286,7 +288,7 @@ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent even
 			TableViewerEditor.create(viewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
 
 			
-			IEMFEditListProperty mProp = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.COMMAND__PARAMETERS);
+			IEMFEditListProperty mProp = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
 			viewer.setInput(mProp.observeDetail(getMaster()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -299,24 +301,24 @@ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent even
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.CommandEditor_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.CommandEditor_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add ...");
+			b.setText(Messages.CommandEditor_Add);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MCommandParameter param = MApplicationFactory.eINSTANCE.createCommandParameter();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.COMMAND__PARAMETERS, param);
+					MCommandParameter param = MCommandsFactory.INSTANCE.createCommandParameter();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS, param);
 					
 					if( cmd.canExecute() ) {
 						getEditingDomain().getCommandStack().execute(cmd);
@@ -326,7 +328,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.CommandEditor_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		}
@@ -338,7 +340,6 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
@@ -355,7 +356,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] {
-			FeaturePath.fromList(MApplicationPackage.Literals.COMMAND__COMMAND_NAME)	
+			FeaturePath.fromList(CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME)	
 		};
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index a015606371..b918e975c4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -1,12 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFListProperty;
@@ -36,7 +48,7 @@
 public class ControlFactory {
 	public static void createBindingsWidget(Composite parent, final AbstractComponentEditor editor) {
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Bindings");
+			l.setText(Messages.ControlFactory_BindingContexts);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 			
 			final Text t = new Text(parent, SWT.BORDER);
@@ -45,19 +57,19 @@ public static void createBindingsWidget(Composite parent, final AbstractComponen
 				@Override
 				public void keyPressed(KeyEvent e) {
 					if (e.keyCode == SWT.CR || e.keyCode == SWT.LF) {
-						handleAddText( editor, MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS, t);
+						handleAddText( editor, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, t);
 					}
 				}
 			});
 			
 			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText("Add");
+			b.setText(Messages.ControlFactory_Add);
 			b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					handleAddText( editor, MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS, t);
+					handleAddText( editor, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, t);
 				}
 			});
 			
@@ -70,7 +82,7 @@ public void widgetSelected(SelectionEvent e) {
 			gd.heightHint = 150;
 			viewer.getControl().setLayoutData(gd);
 			
-			IEMFListProperty prop = EMFProperties.list(MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS);
+			IEMFListProperty prop = EMFProperties.list(CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS);
 			viewer.setInput(prop.observeDetail(editor.getMaster()));
 			
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -83,7 +95,7 @@ public void widgetSelected(SelectionEvent e) {
 			buttonComp.setLayout(gl);
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ControlFactory_Up);
 			b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -96,7 +108,7 @@ public void widgetSelected(SelectionEvent e) {
 							MApplication container = (MApplication) editor.getMaster().getValue();
 							int idx = container.getCommands().indexOf(obj) - 1;
 							if( idx >= 0 ) {
-								Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
+								Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									editor.getEditingDomain().getCommandStack().execute(cmd);
@@ -110,7 +122,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ControlFactory_Down);
 			b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -123,7 +135,7 @@ public void widgetSelected(SelectionEvent e) {
 							MApplication container = (MApplication) editor.getMaster().getValue();
 							int idx = container.getCommands().indexOf(obj) + 1;
 							if( idx < container.getCommands().size() ) {
-								Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
+								Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									editor.getEditingDomain().getCommandStack().execute(cmd);
@@ -137,7 +149,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ControlFactory_Remove);
 			b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -146,7 +158,7 @@ public void widgetSelected(SelectionEvent e) {
 					if( ! viewer.getSelection().isEmpty() ) {
 						MApplication el = (MApplication) editor.getMaster().getValue();
 						List<?> ids = ((IStructuredSelection)viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(editor.getEditingDomain(), el, MApplicationPackage.Literals.BINDINGS__BINDING_CONTEXTS, ids);
+						Command cmd = RemoveCommand.create(editor.getEditingDomain(), el, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, ids);
 						if( cmd.canExecute() ) {
 							editor.getEditingDomain().getCommandStack().execute(cmd);
 							if( el.getBindingContexts().size() > 0 ) {
@@ -160,7 +172,7 @@ public void widgetSelected(SelectionEvent e) {
 	
 	public static void createTagsWidget( Composite parent, final AbstractComponentEditor editor ) {
 		Label l = new Label(parent, SWT.NONE);
-		l.setText("Tags");
+		l.setText(Messages.ControlFactory_Tags);
 		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 
 		final Text tagText = new Text(parent, SWT.BORDER);
@@ -169,17 +181,17 @@ public static void createTagsWidget( Composite parent, final AbstractComponentEd
 			@Override
 			public void keyPressed(KeyEvent e) {
 				if (e.keyCode == SWT.CR || e.keyCode == SWT.LF) {
-					handleAddText(editor, MApplicationPackage.Literals.APPLICATION_ELEMENT__TAGS, tagText);
+					handleAddText(editor, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, tagText);
 				}
 			}
 		});
 
 		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-		b.setText("Add");
+		b.setText(Messages.ControlFactory_Add);
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				handleAddText(editor, MApplicationPackage.Literals.APPLICATION_ELEMENT__TAGS, tagText);
+				handleAddText(editor, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, tagText);
 			}
 		});
 		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
@@ -198,7 +210,7 @@ public String getText(Object element) {
 		gd.heightHint = 120;
 		viewer.getControl().setLayoutData(gd);
 
-		IEMFEditListProperty prop = EMFEditProperties.list(editor.getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__TAGS);
+		IEMFEditListProperty prop = EMFEditProperties.list(editor.getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS);
 		viewer.setInput(prop.observeDetail(editor.getMaster()));
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -211,17 +223,17 @@ public String getText(Object element) {
 		buttonComp.setLayout(gl);
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Up");
+		b.setText(Messages.ControlFactory_Up);
 		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_UP));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Down");
+		b.setText(Messages.ControlFactory_Down);
 		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_DOWN));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Remove");
+		b.setText(Messages.ControlFactory_Remove);
 		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_DELETE_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
@@ -230,7 +242,7 @@ public void widgetSelected(SelectionEvent e) {
 				IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 				if( ! s.isEmpty() ) {
 					MApplicationElement appEl = (MApplicationElement) editor.getMaster().getValue();
-					Command cmd = RemoveCommand.create(editor.getEditingDomain(), appEl, MApplicationPackage.Literals.APPLICATION_ELEMENT__TAGS, s.toList());
+					Command cmd = RemoveCommand.create(editor.getEditingDomain(), appEl, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, s.toList());
 					if( cmd.canExecute() ) {
 						editor.getEditingDomain().getCommandStack().execute(cmd);
 					}
@@ -241,7 +253,7 @@ public void widgetSelected(SelectionEvent e) {
 
 	private static void handleAddText( AbstractComponentEditor editor, EStructuralFeature feature, Text tagText) {
 		if (tagText.getText().trim().length() > 0) {
-			String[] tags = tagText.getText().split(";");
+			String[] tags = tagText.getText().split(";"); //$NON-NLS-1$
 			for( int i = 0; i < tags.length;i++ ) {
 				tags[i] = tags[i].trim();
 			}
@@ -251,7 +263,7 @@ private static void handleAddText( AbstractComponentEditor editor, EStructuralFe
 			if (cmd.canExecute()) {
 				editor.getEditingDomain().getCommandStack().execute(cmd);
 			}
-			tagText.setText("");
+			tagText.setText(""); //$NON-NLS-1$
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index b7065fd31f..e5b37626c1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -15,10 +15,11 @@
 
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MContribution;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -40,7 +41,7 @@ public class DirectMenuItemEditor extends MenuItemEditor {
 	private IProject project;
 	
 	public DirectMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain, editor);
+		super(editingDomain);
 		this.project = project;
 	}
 
@@ -48,7 +49,7 @@ public DirectMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IPr
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/DirectMenuItem.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/DirectMenuItem.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -60,12 +61,12 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "DirectMenuItem";
+		return Messages.DirectMenuItemEditor_Label;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "DirectMenuItem bla bla bla";
+		return Messages.DirectMenuItemEditor_Description;
 	}
 	
 	@Override
@@ -75,15 +76,15 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Class URI");
+			l.setText(Messages.DirectMenuItemEditor_ClassURI);
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
 
 			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText("Find ...");
+			b.setText(Messages.DirectMenuItemEditor_Find);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index b076239a69..fd096578bc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -15,9 +15,10 @@
 
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MContribution;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -47,7 +48,7 @@ public DirectToolItemEditor(EditingDomain editingDomain, IProject project) {
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/DirectToolItem.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/DirectToolItem.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -63,14 +64,14 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		Label l = new Label(parent, SWT.NONE);
-		l.setText("Class URI");
+		l.setText(Messages.DirectToolItemEditor_ClassURI);
 
 		Text t = new Text(parent, SWT.BORDER);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value( getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value( getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
 
 		final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
-		b.setText("Find ...");
+		b.setText(Messages.DirectToolItemEditor_Find);
 		b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 		b.addSelectionListener(new SelectionAdapter() {
@@ -84,11 +85,11 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Direct Tool Item";
+		return Messages.DirectToolItemEditor_Label;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "Direct Tool Item bla bla bla";
+		return Messages.DirectToolItemEditor_Description;
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index adf83a1fe3..1689160059 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -14,12 +14,17 @@
 import java.net.URL;
 
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MHandledItem;
-import org.eclipse.e4.ui.model.application.MParameter;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledMenuItemCommandSelectionDialog;
+import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.commands.MParameter;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -58,16 +63,18 @@
 
 public class HandledMenuItemEditor extends MenuItemEditor {
 	private Image image;
+	private IModelResource resource;
 
-	public HandledMenuItemEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
+	public HandledMenuItemEditor(EditingDomain editingDomain, IModelResource resource) {
+		super(editingDomain);
+		this.resource = resource;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/HandledMenuItem.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/HandledMenuItem.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -79,12 +86,12 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "HandledMenuItem";
+		return Messages.HandledMenuItemEditor_Label;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "HandledMenuItem bla bla bla";
+		return Messages.HandledMenuItemEditor_Description;
 	}
 
 	@Override
@@ -94,23 +101,30 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Command");
+			l.setText(Messages.HandledMenuItemEditor_Command);
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEnabled(false);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLED_ITEM__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(master));
 
-			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText("Find ...");
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.HandledMenuItemEditor_Find);
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					HandledMenuItemCommandSelectionDialog dialog = new HandledMenuItemCommandSelectionDialog(b.getShell(), (MHandledItem) getMaster().getValue(), resource);
+					dialog.open();
+				}
+			});
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Parameters");
+			l.setText(Messages.HandledMenuItemEditor_Parameters);
 			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 
 			final TableViewer tableviewer = new TableViewer(parent);
@@ -123,10 +137,10 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			tableviewer.setContentProvider(cp);
 
 			{
-				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__TAG);
+				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__NAME);
 
 				TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-				column.getColumn().setText("Tag");
+				column.getColumn().setText(Messages.HandledMenuItemEditor_Tag);
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MParameter>(prop.observeDetail(cp.getKnownElements())));
 				column.setEditingSupport(new EditingSupport(tableviewer) {
@@ -134,7 +148,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 
 					@Override
 					protected void setValue(Object element, Object value) {
-						Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.PARAMETER__TAG, value);
+						Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.PARAMETER__NAME, value);
 						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -142,8 +156,8 @@ protected void setValue(Object element, Object value) {
 
 					@Override
 					protected Object getValue(Object element) {
-						String val = ((MParameter) element).getTag();
-						return val == null ? "" : val;
+						String val = ((MParameter) element).getName();
+						return val == null ? "" : val; //$NON-NLS-1$
 					}
 
 					@Override
@@ -159,10 +173,10 @@ protected boolean canEdit(Object element) {
 			}
 
 			{
-				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__VALUE);
+				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__VALUE);
 
 				TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-				column.getColumn().setText("Value");
+				column.getColumn().setText(Messages.HandledMenuItemEditor_Value);
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MParameter>(prop.observeDetail(cp.getKnownElements())));
 				column.setEditingSupport(new EditingSupport(tableviewer) {
@@ -170,7 +184,7 @@ protected boolean canEdit(Object element) {
 
 					@Override
 					protected void setValue(Object element, Object value) {
-						Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.PARAMETER__VALUE, value);
+						Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.PARAMETER__VALUE, value);
 						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -179,7 +193,7 @@ protected void setValue(Object element, Object value) {
 					@Override
 					protected Object getValue(Object element) {
 						String val = ((MParameter) element).getValue();
-						return val == null ? "" : val;
+						return val == null ? "" : val; //$NON-NLS-1$
 					}
 
 					@Override
@@ -205,7 +219,7 @@ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent even
 			};
 			TableViewerEditor.create(tableviewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
 
-			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS);
+			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
 			tableviewer.setInput(prop.observeDetail(master));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -218,25 +232,25 @@ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent even
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.HandledMenuItemEditor_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.HandledMenuItemEditor_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add ...");
+			b.setText(Messages.HandledMenuItemEditor_Add);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MHandledItem item = (MHandledItem) master.getValue();
-					MParameter param = MApplicationFactory.eINSTANCE.createParameter();
-					Command cmd = AddCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS, param);
+					MParameter param = MCommandsFactory.INSTANCE.createParameter();
+					Command cmd = AddCommand.create(getEditingDomain(), item, MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, param);
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 						tableviewer.editElement(param, 0);
@@ -245,14 +259,14 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.HandledMenuItemEditor_Remove);
 			b.addSelectionListener(new SelectionAdapter() {
 
 				public void widgetSelected(SelectionEvent e) {
 					IStructuredSelection s = (IStructuredSelection) tableviewer.getSelection();
 					if (!s.isEmpty()) {
 						MHandledItem item = (MHandledItem) master.getValue();
-						Command cmd = RemoveCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS, s.toList());
+						Command cmd = RemoveCommand.create(getEditingDomain(), item, MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, s.toList());
 						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index be54826183..a442f71d2f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -14,11 +14,17 @@
 import java.net.URL;
 
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MHandledItem;
-import org.eclipse.e4.ui.model.application.MParameter;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledToolItemCommandSelectionDialog;
+import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.commands.MParameter;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -57,16 +63,18 @@
 
 public class HandledToolItemEditor extends ToolItemEditor {
 	private Image image;
+	private IModelResource resource;
 
-	public HandledToolItemEditor(EditingDomain editingDomain) {
+	public HandledToolItemEditor(EditingDomain editingDomain, IModelResource resource) {
 		super(editingDomain);
+		this.resource = resource;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/HandledToolItem.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/HandledToolItem.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -80,23 +88,32 @@ public Image getImage(Object element, Display display) {
 	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, final WritableValue master) {
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		Label l = new Label(parent, SWT.NONE);
-		l.setText("Command");
-
-		Text t = new Text(parent, SWT.BORDER);
-		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		t.setEnabled(false);
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value( getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLED_ITEM__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(master));
-
-		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
-		b.setText("Find ...");
-		b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.HandledToolItemEditor_Command);
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			t.setEnabled(false);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(master));
+
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.HandledToolItemEditor_Find);
+			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					HandledToolItemCommandSelectionDialog dialog = new HandledToolItemCommandSelectionDialog(b.getShell(), (MHandledItem) getMaster().getValue(), resource);
+					dialog.open();
+				}
+			});
+		}
 
 		// ------------------------------------------------------------
 
-		l = new Label(parent, SWT.NONE);
-		l.setText("Parameters");
+		Label l = new Label(parent, SWT.NONE);
+		l.setText(Messages.HandledToolItemEditor_Parameters);
 		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 
 		final TableViewer tableviewer = new TableViewer(parent);
@@ -107,12 +124,12 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 
 		ObservableListContentProvider cp = new ObservableListContentProvider();
 		tableviewer.setContentProvider(cp);
-		
+
 		{
-			IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__TAG);
-			
+			IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__NAME);
+
 			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText("Tag");
+			column.getColumn().setText(Messages.HandledToolItemEditor_ParametersName);
 			column.getColumn().setWidth(200);
 			column.setLabelProvider(new ObservableColumnLabelProvider<MParameter>(prop.observeDetail(cp.getKnownElements())));
 			column.setEditingSupport(new EditingSupport(tableviewer) {
@@ -120,16 +137,16 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 
 				@Override
 				protected void setValue(Object element, Object value) {
-					Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.PARAMETER__TAG, value);
-					if( cmd.canExecute() ) {
+					Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.PARAMETER__NAME, value);
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 					}
 				}
 
 				@Override
 				protected Object getValue(Object element) {
-					String val = ((MParameter)element).getTag();
-					return val == null ? "" : val;
+					String val = ((MParameter) element).getName();
+					return val == null ? "" : val; //$NON-NLS-1$
 				}
 
 				@Override
@@ -145,10 +162,10 @@ protected boolean canEdit(Object element) {
 		}
 
 		{
-			IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__VALUE);
-			
+			IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__VALUE);
+
 			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText("Value");
+			column.getColumn().setText(Messages.HandledToolItemEditor_ParametersValue);
 			column.getColumn().setWidth(200);
 			column.setLabelProvider(new ObservableColumnLabelProvider<MParameter>(prop.observeDetail(cp.getKnownElements())));
 			column.setEditingSupport(new EditingSupport(tableviewer) {
@@ -156,16 +173,16 @@ protected boolean canEdit(Object element) {
 
 				@Override
 				protected void setValue(Object element, Object value) {
-					Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.PARAMETER__VALUE, value);
-					if( cmd.canExecute() ) {
+					Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.PARAMETER__VALUE, value);
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 					}
 				}
 
 				@Override
 				protected Object getValue(Object element) {
-					String val = ((MParameter)element).getValue();
-					return val == null ? "" : val;
+					String val = ((MParameter) element).getValue();
+					return val == null ? "" : val; //$NON-NLS-1$
 				}
 
 				@Override
@@ -180,53 +197,50 @@ protected boolean canEdit(Object element) {
 			});
 		}
 
-
 		ColumnViewerEditorActivationStrategy editorActivationStrategy = new ColumnViewerEditorActivationStrategy(tableviewer) {
 			@Override
 			protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
-				boolean singleSelect = ((IStructuredSelection)tableviewer.getSelection()).size() == 1;
-				boolean isLeftDoubleMouseSelect = event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION && ((MouseEvent)event.sourceEvent).button == 1;
+				boolean singleSelect = ((IStructuredSelection) tableviewer.getSelection()).size() == 1;
+				boolean isLeftDoubleMouseSelect = event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION && ((MouseEvent) event.sourceEvent).button == 1;
 
-				return singleSelect && (isLeftDoubleMouseSelect
-						|| event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC
-						|| event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
+				return singleSelect && (isLeftDoubleMouseSelect || event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC || event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
 			}
 		};
 		TableViewerEditor.create(tableviewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
 
-		IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS);
+		IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
 		tableviewer.setInput(prop.observeDetail(getMaster()));
-		
+
 		Composite buttonComp = new Composite(parent, SWT.NONE);
-		buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
 		GridLayout gl = new GridLayout();
-		gl.marginLeft=0;
-		gl.marginRight=0;
-		gl.marginWidth=0;
-		gl.marginHeight=0;
+		gl.marginLeft = 0;
+		gl.marginRight = 0;
+		gl.marginWidth = 0;
+		gl.marginHeight = 0;
 		buttonComp.setLayout(gl);
 
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Up");
+		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.HandledToolItemEditor_Up);
 		b.setImage(getImage(b.getDisplay(), ARROW_UP));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Down");
+		b.setText(Messages.HandledToolItemEditor_Down);
 		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Add ...");
+		b.setText(Messages.HandledToolItemEditor_Add);
 		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				MHandledItem item = (MHandledItem) master.getValue();
-				MParameter param = MApplicationFactory.eINSTANCE.createParameter();
-				Command cmd = AddCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS, param);
-				if( cmd.canExecute() ) {
+				MParameter param = MCommandsFactory.INSTANCE.createParameter();
+				Command cmd = AddCommand.create(getEditingDomain(), item, MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, param);
+				if (cmd.canExecute()) {
 					getEditingDomain().getCommandStack().execute(cmd);
 				}
 				tableviewer.editElement(param, 0);
@@ -234,15 +248,15 @@ public void widgetSelected(SelectionEvent e) {
 		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Remove");
+		b.setText(Messages.HandledToolItemEditor_Remove);
 		b.addSelectionListener(new SelectionAdapter() {
 
 			public void widgetSelected(SelectionEvent e) {
 				IStructuredSelection s = (IStructuredSelection) tableviewer.getSelection();
-				if( !s.isEmpty() ) {
+				if (!s.isEmpty()) {
 					MHandledItem item = (MHandledItem) master.getValue();
-					Command cmd = RemoveCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.HANDLED_ITEM__PARAMETERS, s.toList());
-					if( cmd.canExecute() ) {
+					Command cmd = RemoveCommand.create(getEditingDomain(), item, MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, s.toList());
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 					}
 				}
@@ -256,11 +270,11 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Handled Tool Item";
+		return Messages.HandledToolItemEditor_Label;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "Handled Tool Item bla bla bla";
+		return Messages.HandledToolItemEditor_Description;
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 714683ffd3..5507efc4c8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -17,11 +17,13 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandlerCommandSelectionDialog;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MContribution;
-import org.eclipse.e4.ui.model.application.MHandler;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
@@ -57,7 +59,7 @@ public HandlerEditor(EditingDomain editingDomain, IModelResource resource, IProj
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Handler.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Handler.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -68,12 +70,12 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Handler";
+		return Messages.HandlerEditor_Label;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "Handler bla bla bla";
+		return Messages.HandlerEditor_Description;
 	}
 
 	@Override
@@ -95,27 +97,27 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Id");
+			l.setText(Messages.HandlerEditor_Id);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Command");
+			l.setText(Messages.HandlerEditor_Command);
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEnabled(false);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLER__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(CommandsPackageImpl.Literals.HANDLER__COMMAND, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText("Find ...");
+			b.setText(Messages.HandlerEditor_Find);
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -130,15 +132,15 @@ public void widgetSelected(SelectionEvent e) {
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Class URI");
+			l.setText(Messages.HandlerEditor_ClassURI);
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
-			b.setText("Find ...");
+			b.setText(Messages.HandlerEditor_Find);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -156,7 +158,6 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
@@ -172,6 +173,6 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(MApplicationPackage.Literals.HANDLER__COMMAND, MApplicationPackage.Literals.COMMAND__COMMAND_NAME) };
+		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.HANDLER__COMMAND, CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME) };
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
index ff97bd39cf..c81967a887 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
@@ -12,7 +12,8 @@
 
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -33,7 +34,7 @@ public InputPartEditor(EditingDomain editingDomain, IProject project) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "InputPart";
+		return Messages.InputPartEditor_Label;
 	}
 	
 	@Override
@@ -43,13 +44,13 @@ protected void createSubformElements(Composite parent, EMFDataBindingContext con
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("InputURI");
+			l.setText(Messages.InputPartEditor_InputURI);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.INPUT__INPUT_URI).observeDetail(master));			
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.INPUT__INPUT_URI).observeDetail(master));			
 		}
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index baf05e7824..8ec5723aa9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -17,12 +17,14 @@
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.KeyBindingCommandSelectionDialog;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MKeyBinding;
-import org.eclipse.e4.ui.model.application.MKeySequence;
-import org.eclipse.e4.ui.model.application.MParameter;
+import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
+import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
+import org.eclipse.e4.ui.model.application.commands.MKeySequence;
+import org.eclipse.e4.ui.model.application.commands.MParameter;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -73,7 +75,7 @@ public KeyBindingEditor(EditingDomain editingDomain, IModelResource resource) {
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/KeyBinding.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/KeyBinding.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -85,12 +87,12 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Binding";
+		return Messages.KeyBindingEditor_Label;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "Binding bla bla bla";
+		return Messages.KeyBindingEditor_Description;
 	}
 
 	@Override
@@ -112,39 +114,39 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Id");
+			l.setText(Messages.KeyBindingEditor_Id);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Sequence");
+			l.setText(Messages.KeyBindingEditor_Sequence);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.KEY_SEQUENCE__KEY_SEQUENCE).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_SEQUENCE__KEY_SEQUENCE).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Command");
+			l.setText(Messages.KeyBindingEditor_Command);
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEnabled(false);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.KEY_BINDING__COMMAND, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID)).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(CommandsPackageImpl.Literals.KEY_BINDING__COMMAND, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText("Find ...");
+			b.setText(Messages.KeyBindingEditor_Find);
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -157,7 +159,7 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		Label l = new Label(parent, SWT.NONE);
-		l.setText("Parameters");
+		l.setText(Messages.KeyBindingEditor_Parameters);
 		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 
 		final TableViewer tableviewer = new TableViewer(parent);
@@ -165,23 +167,23 @@ public void widgetSelected(SelectionEvent e) {
 		gd.heightHint = 120;
 		tableviewer.getTable().setHeaderVisible(true);
 		tableviewer.getControl().setLayoutData(gd);
-		IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.KEY_BINDING__PARAMETERS);
+		IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS);
 
 		TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-		column.getColumn().setText("Tag");
+		column.getColumn().setText(Messages.KeyBindingEditor_ParametersKey);
 		column.getColumn().setWidth(200);
 		column.setEditingSupport(new EditingSupport(tableviewer) {
 			private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
 
 			@Override
 			protected void setValue(Object element, Object value) {
-				((MParameter) element).setTag((String) value);
+				((MParameter) element).setName((String) value);
 			}
 
 			@Override
 			protected Object getValue(Object element) {
-				String val = ((MParameter) element).getTag();
-				return val == null ? "" : val;
+				String val = ((MParameter) element).getName();
+				return val == null ? "" : val; //$NON-NLS-1$
 			}
 
 			@Override
@@ -196,7 +198,7 @@ protected boolean canEdit(Object element) {
 		});
 
 		column = new TableViewerColumn(tableviewer, SWT.NONE);
-		column.getColumn().setText("Value");
+		column.getColumn().setText(Messages.KeyBindingEditor_ParametersValue);
 		column.getColumn().setWidth(200);
 		column.setEditingSupport(new EditingSupport(tableviewer) {
 			private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
@@ -209,7 +211,7 @@ protected void setValue(Object element, Object value) {
 			@Override
 			protected Object getValue(Object element) {
 				String val = ((MParameter) element).getValue();
-				return val == null ? "" : val;
+				return val == null ? "" : val; //$NON-NLS-1$
 			}
 
 			@Override
@@ -234,7 +236,7 @@ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent even
 		};
 		TableViewerEditor.create(tableviewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
 
-		ViewerSupport.bind(tableviewer, prop.observeDetail(getMaster()), new IValueProperty[] { EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__TAG), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PARAMETER__VALUE) });
+		ViewerSupport.bind(tableviewer, prop.observeDetail(getMaster()), new IValueProperty[] { EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__NAME), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__VALUE) });
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
@@ -246,25 +248,25 @@ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent even
 		buttonComp.setLayout(gl);
 
 		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Up");
+		b.setText(Messages.KeyBindingEditor_Up);
 		b.setImage(getImage(b.getDisplay(), ARROW_UP));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Down");
+		b.setText(Messages.KeyBindingEditor_Down);
 		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Add ...");
+		b.setText(Messages.KeyBindingEditor_Add);
 		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				MKeyBinding item = (MKeyBinding) getMaster().getValue();
-				MParameter param = MApplicationFactory.eINSTANCE.createParameter();
-				Command cmd = AddCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.KEY_BINDING__PARAMETERS, param);
+				MParameter param = MCommandsFactory.INSTANCE.createParameter();
+				Command cmd = AddCommand.create(getEditingDomain(), item, CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS, param);
 				if (cmd.canExecute()) {
 					getEditingDomain().getCommandStack().execute(cmd);
 				}
@@ -273,14 +275,14 @@ public void widgetSelected(SelectionEvent e) {
 		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Remove");
+		b.setText(Messages.KeyBindingEditor_Remove);
 		b.addSelectionListener(new SelectionAdapter() {
 
 			public void widgetSelected(SelectionEvent e) {
 				IStructuredSelection s = (IStructuredSelection) tableviewer.getSelection();
 				if (!s.isEmpty()) {
 					MKeyBinding item = (MKeyBinding) getMaster().getValue();
-					Command cmd = RemoveCommand.create(getEditingDomain(), item, MApplicationPackage.Literals.KEY_BINDING__PARAMETERS, s.toList());
+					Command cmd = RemoveCommand.create(getEditingDomain(), item, CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS, s.toList());
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 					}
@@ -298,7 +300,6 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
@@ -313,6 +314,6 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(MApplicationPackage.Literals.KEY_SEQUENCE__KEY_SEQUENCE) };
+		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.KEY_SEQUENCE__KEY_SEQUENCE) };
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 9cd961c986..35f3aff47e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -18,15 +18,16 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.ui.model.application.ItemType;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MElementContainer;
-import org.eclipse.e4.ui.model.application.MHandler;
-import org.eclipse.e4.ui.model.application.MMenuItem;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -34,6 +35,7 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -67,7 +69,7 @@ public class MenuEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
 	private class Struct {
 		private final String label;
@@ -90,7 +92,7 @@ public MenuEditor(EditingDomain editingDomain, ModelEditor editor) {
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Menu.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Menu.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -102,12 +104,12 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Menu";
+		return Messages.MenuEditor_Label;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "Menu bla bla bla";
+		return Messages.MenuEditor_Description;
 	}
 
 	@Override
@@ -129,19 +131,57 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Id");
+			l.setText(Messages.MenuEditor_Id);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("MenuItems");
+			l.setText(Messages.MenuEditor_LabelLabel);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuEditor_Tooltip);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuEditor_IconURI);
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+
+			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setText(Messages.MenuItemEditor_Find);
+		}
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuEditor_MenuItems);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			final TableViewer viewer = new TableViewer(parent);
@@ -155,21 +195,21 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			{
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Type");
+				column.getColumn().setText(Messages.MenuEditor_MenuItemType);
 				column.getColumn().setWidth(300);
 				column.setLabelProvider(new ComponentLabelProvider(editor));
 			}
 
 			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ITEM__TYPE);
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE);
 
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("ItemType");
+				column.getColumn().setText(Messages.MenuEditor_MenuItemItemType);
 				column.getColumn().setWidth(100);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
 
-			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -182,7 +222,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.MenuEditor_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -195,7 +235,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
 							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
 
 								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -209,7 +249,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.MenuEditor_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -222,7 +262,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
 							if (idx < container.getChildren().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
 
 								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -246,8 +286,8 @@ public String getText(Object element) {
 				}
 			});
 
-			Struct defaultStruct = new Struct("MenuItem", MApplicationPackage.Literals.MENU_ITEM, false);
-			childrenDropDown.setInput(new Struct[] { new Struct("Separator", MApplicationPackage.Literals.MENU_ITEM, true), defaultStruct, new Struct("Handled MenuItem", MApplicationPackage.Literals.HANDLED_MENU_ITEM, false), new Struct("Direct MenuItem", MApplicationPackage.Literals.DIRECT_MENU_ITEM, false) });
+			Struct defaultStruct = new Struct(Messages.MenuEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
+			childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false) });
 			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
@@ -259,13 +299,9 @@ public void widgetSelected(SelectionEvent e) {
 					if (!childrenDropDown.getSelection().isEmpty()) {
 						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
 						EClass eClass = struct.eClass;
-						MMenuItem eObject = (MMenuItem) MApplicationFactory.eINSTANCE.create(eClass);
-
-						if (struct.separator) {
-							eObject.setType(ItemType.SEPARATOR);
-						}
+						MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
 
-						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
@@ -278,7 +314,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.MenuEditor_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -286,7 +322,7 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					if (!viewer.getSelection().isEmpty()) {
 						List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
 						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -295,7 +331,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 		
-		ControlFactory.createTagsWidget(parent, this);
+		ControlFactory.createTagsWidget(parent, this); 
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index b6d099e637..d1a1b68890 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -12,52 +12,27 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.List;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.ui.model.application.ItemType;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MElementContainer;
-import org.eclipse.e4.ui.model.application.MHandler;
-import org.eclipse.e4.ui.model.application.MMenuItem;
-import org.eclipse.e4.ui.model.application.MUILabel;
-import org.eclipse.emf.common.command.Command;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -67,51 +42,21 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class MenuItemEditor extends AbstractComponentEditor {
+public abstract class MenuItemEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private Image menuImage;
-	private Image separatorImage;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
-
-	private class Struct {
-		private final String label;
-		private final EClass eClass;
-		private final boolean separator;
-
-		public Struct(String label, EClass eClass, boolean separator) {
-			this.label = label;
-			this.eClass = eClass;
-			this.separator = separator;
-		}
-	}
-
-	public MenuItemEditor(EditingDomain editingDomain, ModelEditor editor) {
+	public MenuItemEditor(EditingDomain editingDomain) {
 		super(editingDomain);
-		this.editor = editor;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		MMenuItem item = (MMenuItem) element;
-		if (item.getType() == ItemType.SEPARATOR) {
-			if (separatorImage == null) {
-				try {
-					separatorImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/MenuItem_separator.gif"));
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			}
-
-			return separatorImage;
-		} else {
 			if (menuImage == null) {
 				try {
-					menuImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/MenuItem.gif"));
+					menuImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/MenuItem.gif")); //$NON-NLS-1$
 				} catch (MalformedURLException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -119,23 +64,6 @@ public Image getImage(Object element, Display display) {
 			}
 
 			return menuImage;
-		}
-	}
-
-	@Override
-	public String getLabel(Object element) {
-		MMenuItem item = (MMenuItem) element;
-		if (item.getType() == ItemType.SEPARATOR) {
-			return "Separator";
-		} else {
-			return "MenuItem";
-		}
-
-	}
-
-	@Override
-	public String getDescription(Object element) {
-		return "MenuItem bla bla bla";
 	}
 
 	@Override
@@ -149,51 +77,6 @@ public Composite getEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		final Composite container = new Composite(parent, SWT.NONE);
-		final StackLayout layout = new StackLayout();
-		container.setLayout(layout);
-
-		final Composite menuFormComposite = createMenuItemForm(container, context, master);
-		final Composite separatorComposite = createSeparatorForm(container, context, master);
-
-		getMaster().addValueChangeListener(new IValueChangeListener() {
-
-			public void handleValueChange(ValueChangeEvent event) {
-				MMenuItem item = (MMenuItem) event.diff.getNewValue();
-				if (item.getType() == ItemType.SEPARATOR) {
-					layout.topControl = separatorComposite;
-				} else {
-					layout.topControl = menuFormComposite;
-				}
-				container.layout(true, true);
-			}
-		});
-
-		return container;
-	}
-
-	private Composite createSeparatorForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
-
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText("Id");
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
-		}
-
-		return parent;
-	}
-
-	private Composite createMenuItemForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
@@ -202,20 +85,20 @@ private Composite createMenuItemForm(Composite parent, EMFDataBindingContext con
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Id");
+			l.setText(Messages.MenuItemEditor_Id);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
 		if (this.getClass() != MenuItemEditor.class) {
 			// ------------------------------------------------------------
 			{
 				Label l = new Label(parent, SWT.NONE);
-				l.setText("Type");
+				l.setText(Messages.MenuItemEditor_Type);
 
 				ComboViewer viewer = new ComboViewer(parent);
 				viewer.setContentProvider(new ArrayContentProvider());
@@ -223,7 +106,7 @@ private Composite createMenuItemForm(Composite parent, EMFDataBindingContext con
 				GridData gd = new GridData();
 				gd.horizontalSpan = 2;
 				viewer.getControl().setLayoutData(gd);
-				IObservableValue itemTypeObs = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ITEM__TYPE).observeDetail(master);
+				IObservableValue itemTypeObs = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(master);
 				context.bindValue(ViewerProperties.singleSelection().observe(viewer), itemTypeObs);
 			}
 		}
@@ -231,39 +114,39 @@ private Composite createMenuItemForm(Composite parent, EMFDataBindingContext con
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Label");
+			l.setText(Messages.MenuItemEditor_Label);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Tooltip");
+			l.setText(Messages.MenuItemEditor_Tooltip);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Icon URI");
+			l.setText(Messages.MenuItemEditor_IconURI);
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
 			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText("Find ...");
+			b.setText(Messages.MenuItemEditor_Find);
 		}
 
 		createFormSubTypeForm(parent, context, master);
@@ -273,169 +156,11 @@ private Composite createMenuItemForm(Composite parent, EMFDataBindingContext con
 		return parent;
 	}
 
-	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText("MenuItems");
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
-			final TableViewer viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
-			viewer.getControl().setLayoutData(gd);
-			viewer.getTable().setHeaderVisible(true);
-
-			{
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Type");
-				column.getColumn().setWidth(300);
-				column.setLabelProvider(new ComponentLabelProvider(editor));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ITEM__TYPE);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("ItemType");
-				column.getColumn().setWidth(100);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
-
-			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(master));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) + 1;
-							if (idx < container.getChildren().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					Struct struct = (Struct) element;
-					return struct.label;
-				}
-			});
-
-			Struct defaultStruct = new Struct("MenuItem", MApplicationPackage.Literals.MENU_ITEM, false);
-			childrenDropDown.setInput(new Struct[] { new Struct("Separator", MApplicationPackage.Literals.MENU_ITEM, true), defaultStruct, new Struct("Handled MenuItem", MApplicationPackage.Literals.HANDLED_MENU_ITEM, false), new Struct("Direct MenuItem", MApplicationPackage.Literals.DIRECT_MENU_ITEM, false) });
-			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!childrenDropDown.getSelection().isEmpty()) {
-						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-						EClass eClass = struct.eClass;
-						MMenuItem eObject = (MMenuItem) MApplicationFactory.eINSTANCE.create(eClass);
-
-						if (struct.separator) {
-							eObject.setType(ItemType.SEPARATOR);
-						}
-
-						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-							if (!struct.separator) {
-								editor.setSelection(eObject);
-							}
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
-		}
-	}
+	protected abstract void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master);
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+		return null;
 	}
 
 	@Override
@@ -449,6 +174,6 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(MApplicationPackage.Literals.UI_LABEL__LABEL) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL) };
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
new file mode 100644
index 0000000000..2f2af5925a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -0,0 +1,112 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class MenuSeparatorEditor extends AbstractComponentEditor {
+	private Image separatorImage;
+	private Composite composite;
+	private EMFDataBindingContext context;
+	
+	public MenuSeparatorEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if (separatorImage == null) {
+			try {
+				separatorImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/MenuSeparator.gif")); //$NON-NLS-1$
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return separatorImage;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.MenuSeparatorEditor_Label;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return null;
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent, context, getMaster());
+		}
+		getMaster().setValue(object);
+		return composite;
+	}
+	
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuSeparatorEditor_Id);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+		}
+		
+		//TODO Should we add visible to mimic a GroupMarker of 3.x
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index 64be4f2308..f527de9db4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -17,13 +17,16 @@
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MMenu;
 import org.eclipse.e4.ui.model.application.MModelComponent;
-import org.eclipse.e4.ui.model.application.MPart;
-import org.eclipse.e4.ui.model.application.MPartDescriptor;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
+import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -48,12 +51,12 @@ public class ModelComponentEditor extends AbstractComponentEditor {
 	private Image image;
 	private EMFDataBindingContext context;
 
-	private IListProperty MODEL_COMPONENT__CHILDREN = EMFProperties.list( MApplicationPackage.Literals.MODEL_COMPONENT__CHILDREN);
-	private IListProperty PART_DESCRIPTOR_CONTAINER__DESCRIPTORS = EMFProperties.list( MApplicationPackage.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS);
-	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
-	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES);
-	private IListProperty MODEL_COMPONENT__COMMANDS = EMFProperties.list(MApplicationPackage.Literals.MODEL_COMPONENT__COMMANDS);
-	private IListProperty MODEL_COMPONENT__BINDINGS = EMFProperties.list(MApplicationPackage.Literals.MODEL_COMPONENT__BINDINGS);
+	private IListProperty MODEL_COMPONENT__CHILDREN = EMFProperties.list( ApplicationPackageImpl.Literals.MODEL_COMPONENT__CHILDREN);
+	private IListProperty PART_DESCRIPTOR_CONTAINER__DESCRIPTORS = EMFProperties.list( BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS);
+	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
+	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES);
+	private IListProperty MODEL_COMPONENT__COMMANDS = EMFProperties.list(ApplicationPackageImpl.Literals.MODEL_COMPONENT__COMMANDS);
+	private IListProperty MODEL_COMPONENT__BINDINGS = EMFProperties.list(ApplicationPackageImpl.Literals.MODEL_COMPONENT__BINDINGS);
 	
 	public ModelComponentEditor(EditingDomain editingDomain) {
 		super(editingDomain);
@@ -93,52 +96,52 @@ private Composite createForm(Composite parent) {
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		Label l = new Label(parent, SWT.NONE);
-		l.setText("Id");
+		l.setText(Messages.ModelComponentEditor_Id);
 
 		Text t = new Text(parent, SWT.BORDER);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 
 		// ------------------------------------------------------------
 
 		l = new Label(parent, SWT.NONE);
-		l.setText("Parent-Id");
+		l.setText(Messages.ModelComponentEditor_ParentId);
 
 		t = new Text(parent, SWT.BORDER);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__PARENT_ID).observeDetail(getMaster()));
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__PARENT_ID).observeDetail(getMaster()));
 
 		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
-		b.setText("Find ...");
+		b.setText(Messages.ModelComponentEditor_Find);
 
 		// ------------------------------------------------------------
 
 		l = new Label(parent, SWT.NONE);
-		l.setText("Position in Parent");
+		l.setText(Messages.ModelComponentEditor_PositionInParent);
 
 		t = new Text(parent, SWT.BORDER);
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__POSITION_IN_PARENT).observeDetail(getMaster()));
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__POSITION_IN_PARENT).observeDetail(getMaster()));
 
 		// ------------------------------------------------------------
 
 		l = new Label(parent, SWT.NONE);
-		l.setText("Processor");
+		l.setText(Messages.ModelComponentEditor_Processor);
 
 		t = new Text(parent, SWT.BORDER);
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.MODEL_COMPONENT__PROCESSOR).observeDetail(getMaster()));
+		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__PROCESSOR).observeDetail(getMaster()));
 		
 		// ------------------------------------------------------------
 
 		l = new Label(parent, SWT.NONE);
-		l.setText("Tags");
+		l.setText(Messages.ModelComponentEditor_Tags);
 
 		t = new Text(parent, SWT.BORDER);
 		gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -159,7 +162,7 @@ private Composite createForm(Composite parent) {
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ModelComponent.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ModelComponent.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -170,19 +173,19 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Model Component";
+		return Messages.ModelComponentEditor_Label;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "The model component ... bla bla bla";
+		return Messages.ModelComponentEditor_Description;
 	}
 
 	@Override
 	public IObservableList getChildList(Object element) {
 		WritableList list = new WritableList();
 		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, "Handlers") {
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.ModelComponentEditor_Handlers) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -191,7 +194,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element, "BindingTables") {
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element, Messages.ModelComponentEditor_BindingTables) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -200,7 +203,7 @@ protected boolean accepted(Object o) {
 
 		});
 		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MODEL_COMP_BINDINGS, MODEL_COMPONENT__BINDINGS, element, "KeyBindings") {
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MODEL_COMP_BINDINGS, MODEL_COMPONENT__BINDINGS, element, Messages.ModelComponentEditor_KeyBindings) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -210,7 +213,7 @@ protected boolean accepted(Object o) {
 		});
 		
 		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MODEL_COMP_COMMANDS, MODEL_COMPONENT__COMMANDS, element, "Commands") {
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MODEL_COMP_COMMANDS, MODEL_COMPONENT__COMMANDS, element, Messages.ModelComponentEditor_Commands) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -219,7 +222,7 @@ protected boolean accepted(Object o) {
 
 		});
 		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MENU, MODEL_COMPONENT__CHILDREN, element, "Menus") {
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART_MENU, MODEL_COMPONENT__CHILDREN, element, Messages.ModelComponentEditor_Menus) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -227,7 +230,7 @@ protected boolean accepted(Object o) {
 			}
 
 		});
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART, MODEL_COMPONENT__CHILDREN, element, "Parts") {
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART, MODEL_COMPONENT__CHILDREN, element, Messages.ModelComponentEditor_Parts) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -235,7 +238,7 @@ protected boolean accepted(Object o) {
 			}
 
 		});
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART_DESCRIPTORS, PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, element, "PartDescriptors") {
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART_DESCRIPTORS, PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, element, Messages.ModelComponentEditor_PartDescriptors) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -251,7 +254,7 @@ protected boolean accepted(Object o) {
 	public String getDetailLabel(Object element) {
 		MModelComponent o = (MModelComponent) element;
 		if( o.getParentID() != null ) {
-			return "parentId: " + o.getParentID();
+			return Messages.ModelComponentEditor_DetailParentId + ": " + o.getParentID(); //$NON-NLS-1$
 		}
 		return null;
 	}
@@ -259,7 +262,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] {
-			FeaturePath.fromList(MApplicationPackage.Literals.MODEL_COMPONENT__PARENT_ID)	
+			FeaturePath.fromList(ApplicationPackageImpl.Literals.MODEL_COMPONENT__PARENT_ID)	
 		};
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
index 4e6c714512..a081f2848a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
@@ -17,12 +17,13 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MModelComponent;
 import org.eclipse.e4.ui.model.application.MModelComponents;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFListProperty;
@@ -47,7 +48,7 @@
 
 public class ModelComponentsEditor extends AbstractComponentEditor {
 
-	private IListProperty MODEL_COMPONENTS__COMPONENTS = EMFProperties.list(MApplicationPackage.Literals.MODEL_COMPONENTS__COMPONENTS);
+	private IListProperty MODEL_COMPONENTS__COMPONENTS = EMFProperties.list(ApplicationPackageImpl.Literals.MODEL_COMPONENTS__COMPONENTS);
 
 	private Composite composite;
 	private Image image;
@@ -62,7 +63,7 @@ public ModelComponentsEditor(EditingDomain editingDomain, ModelEditor editor) {
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ModelComponents.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ModelComponents.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -73,12 +74,12 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Model Components";
+		return Messages.ModelComponentsEditor_Label;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "Some bla bla bla bla";
+		return Messages.ModelComponentsEditor_Description;
 	}
 
 	@Override
@@ -96,7 +97,7 @@ private Composite createForm(Composite parent) {
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Model Contributions");
+			l.setText(Messages.ModelComponentsEditor_ModelContributions);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			final TableViewer viewer = new TableViewer(parent);
@@ -106,7 +107,7 @@ private Composite createForm(Composite parent) {
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 
-			IEMFListProperty prop = EMFProperties.list(MApplicationPackage.Literals.MODEL_COMPONENTS__COMPONENTS);
+			IEMFListProperty prop = EMFProperties.list(ApplicationPackageImpl.Literals.MODEL_COMPONENTS__COMPONENTS);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -119,7 +120,7 @@ private Composite createForm(Composite parent) {
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ModelComponentsEditor_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -132,7 +133,7 @@ public void widgetSelected(SelectionEvent e) {
 							MModelComponents container = (MModelComponents) getMaster().getValue();
 							int idx = container.getComponents().indexOf(obj) - 1;
 							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.MODEL_COMPONENTS__COMPONENTS, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENTS__COMPONENTS, obj, idx);
 
 								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -146,7 +147,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ModelComponentsEditor_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -159,7 +160,7 @@ public void widgetSelected(SelectionEvent e) {
 							MModelComponents container = (MModelComponents) getMaster().getValue();
 							int idx = container.getComponents().indexOf(obj) + 1;
 							if (idx < container.getComponents().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.MODEL_COMPONENTS__COMPONENTS, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENTS__COMPONENTS, obj, idx);
 
 								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -173,15 +174,15 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add");
+			b.setText(Messages.ModelComponentsEditor_Add);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MModelComponent component = MApplicationFactory.eINSTANCE.createModelComponent();
+					MModelComponent component = MApplicationFactory.INSTANCE.createModelComponent();
 
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.MODEL_COMPONENTS__COMPONENTS, component);
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENTS__COMPONENTS, component);
 
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
@@ -191,7 +192,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ModelComponentsEditor_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -200,7 +201,7 @@ public void widgetSelected(SelectionEvent e) {
 					if (!viewer.getSelection().isEmpty()) {
 						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
 
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.MODEL_COMPONENTS__COMPONENTS, elements);
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENTS__COMPONENTS, elements);
 						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index f012cd6830..0e603ee683 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -20,12 +20,16 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MContribution;
-import org.eclipse.e4.ui.model.application.MPart;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
+import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -59,8 +63,8 @@ public class PartDescriptorEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private IProject project;
 	
-	private IListProperty PART__MENUS = EMFProperties.list(MApplicationPackage.Literals.PART__MENUS);
-	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
+	private IListProperty PART__MENUS = EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS);
+	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 
 	public PartDescriptorEditor(EditingDomain editingDomain, IProject project) {
 		super(editingDomain);
@@ -71,7 +75,7 @@ public PartDescriptorEditor(EditingDomain editingDomain, IProject project) {
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Part.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Part.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -83,12 +87,12 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "PartDescriptor";
+		return Messages.PartDescriptorEditor_Label;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "PartDescriptor Bla Bla Bla Bla";
+		return Messages.PartDescriptorEditor_Descriptor;
 	}
 
 	@Override
@@ -110,65 +114,65 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Id");
+			l.setText(Messages.PartDescriptorEditor_Id);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));			
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));			
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Label");
+			l.setText(Messages.PartDescriptorEditor_LabelLabel);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));			
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));			
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Tooltip");
+			l.setText(Messages.PartDescriptorEditor_Tooltip);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));			
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));			
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Icon URI");
+			l.setText(Messages.PartDescriptorEditor_IconURI);
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
 			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText("Find ...");			
+			b.setText(Messages.PartDescriptorEditor_Find);			
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Class URI");
+			l.setText(Messages.PartDescriptorEditor_ClassURI);
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI).observeDetail(master));
 
 			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText("Find ...");
+			b.setText(Messages.PartDescriptorEditor_Find);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -181,12 +185,39 @@ public void widgetSelected(SelectionEvent e) {
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Closeable");
+			l.setText(Messages.PartDescriptorEditor_ContainerData);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
+		}
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.PartDescriptorEditor_Dirtyable);
+
+			Button checkbox = new Button(parent, SWT.CHECK);
+			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
+			
+			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__DIRTYABLE);
+			IWidgetValueProperty uiProp = WidgetProperties.selection();
+			
+			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
+		}
+
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.PartDescriptorEditor_Closeable);
 
 			Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
 			
-			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PART__CLOSEABLE);
+			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CLOSEABLE);
 			IWidgetValueProperty uiProp = WidgetProperties.selection();
 			
 			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
@@ -195,12 +226,12 @@ public void widgetSelected(SelectionEvent e) {
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Multiple");
+			l.setText(Messages.PartDescriptorEditor_Multiple);
 
 			Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
 			
-			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PART_DESCRIPTOR__ALLOW_MULTIPLE);
+			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__ALLOW_MULTIPLE);
 			IWidgetValueProperty uiProp = WidgetProperties.selection();
 			
 			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
@@ -209,17 +240,17 @@ public void widgetSelected(SelectionEvent e) {
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Category");
+			l.setText(Messages.PartDescriptorEditor_Category);
 			
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL,GridData.BEGINNING, true, false, 2, 1));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PART_DESCRIPTOR__CATEGORY).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CATEGORY).observeDetail(master));
 		}
 		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Persited State");
+			l.setText(Messages.PartDescriptorEditor_PersitedState);
 			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 
 			TableViewer tableviewer = new TableViewer(parent);
@@ -231,7 +262,7 @@ public void widgetSelected(SelectionEvent e) {
 			tableviewer.getControl().setLayoutData(gd);
 			
 			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText("Key");
+			column.getColumn().setText(Messages.PartDescriptorEditor_PersitedStateKey);
 			column.getColumn().setWidth(200);
 			column.setLabelProvider(new ColumnLabelProvider() {
 				@SuppressWarnings("unchecked")
@@ -244,7 +275,7 @@ public String getText(Object element) {
 
 			//FIXME How can we react upon changes in the Map-Value?
 			column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText("Value");
+			column.getColumn().setText(Messages.PartDescriptorEditor_PersitedStateValue);
 			column.getColumn().setWidth(200);
 			column.setLabelProvider(new ColumnLabelProvider() {
 				@SuppressWarnings("unchecked")
@@ -255,7 +286,7 @@ public String getText(Object element) {
 				}
 			});
 			
-			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__PERSISTED_STATE);
+			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE);
 			tableviewer.setInput(prop.observeDetail(getMaster()));
 			
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -268,12 +299,12 @@ public String getText(Object element) {
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add ...");
+			b.setText(Messages.PartDescriptorEditor_Add);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.PartDescriptorEditor_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		}
@@ -281,7 +312,7 @@ public String getText(Object element) {
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Variables");
+			l.setText(Messages.PartDescriptorEditor_Variables);
 			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 
 			ListViewer viewer = new ListViewer(parent);
@@ -294,7 +325,7 @@ public String getText(Object element) {
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Properties");
+			l.setText(Messages.PartDescriptorEditor_Properties);
 			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 
 			TableViewer tableviewer = new TableViewer(parent);
@@ -305,48 +336,24 @@ public String getText(Object element) {
 			tableviewer.getControl().setLayoutData(gd);
 
 			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText("Key");
+			column.getColumn().setText(Messages.PartDescriptorEditor_PropertiesKey);
 			column.getColumn().setWidth(200);
 
 			column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText("Value");
+			column.getColumn().setText(Messages.PartDescriptorEditor_PropertiesValue);
 			column.getColumn().setWidth(200);
 		}
 
 
 		ControlFactory.createTagsWidget(parent, this);
 
-//		// ------------------------------------------------------------
-//
-//		l = new Label(parent, SWT.NONE);
-//		l.setText("");
-//
-//		Composite booleanContainer = new Composite(parent,SWT.NONE);
-//		gd = new GridData(GridData.FILL_HORIZONTAL);
-//		gd.horizontalSpan=2;
-//		booleanContainer.setBackgroundMode(SWT.INHERIT_DEFAULT);
-//		booleanContainer.setLayoutData(gd);
-//		booleanContainer.setLayout(new GridLayout(4,false));
-//
-//		Button checkbox = new Button(booleanContainer, SWT.CHECK);
-//		checkbox.setText("to render");
-//
-//		checkbox = new Button(booleanContainer, SWT.CHECK);
-//		checkbox.setText("on Top");
-//
-//		checkbox = new Button(booleanContainer, SWT.CHECK);
-//		checkbox.setText("visible");
-//
-//		checkbox = new Button(booleanContainer, SWT.CHECK);
-//		checkbox.setText("closeable");
-
 		return parent;
 	}
 
 	@Override
 	public IObservableList getChildList(Object element) {
 		WritableList list = new WritableList();
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MENU, PART__MENUS, element, "Menus") {
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PARTDESCRIPTOR_MENU, PART__MENUS, element, Messages.PartDescriptorEditor_Menus) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -355,7 +362,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, "Handlers") {
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.PartDescriptorEditor_Handlers) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -369,14 +376,14 @@ protected boolean accepted(Object o) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MPart o = (MPart) element;
+		MPartDescriptor o = (MPartDescriptor) element;
 		return o.getLabel();
 	}
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] {
-			FeaturePath.fromList(MApplicationPackage.Literals.UI_LABEL__LABEL)	
+			FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL)	
 		};
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 7fd167f8c2..1bfedacb40 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -20,12 +20,16 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MContribution;
-import org.eclipse.e4.ui.model.application.MPart;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -58,8 +62,8 @@ public class PartEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private IProject project;
 
-	private IListProperty PART__MENUS = EMFProperties.list(MApplicationPackage.Literals.PART__MENUS);
-	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
+	private IListProperty PART__MENUS = EMFProperties.list(BasicPackageImpl.Literals.PART__MENUS);
+	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 
 	public PartEditor(EditingDomain editingDomain, IProject project) {
 		super(editingDomain);
@@ -70,7 +74,7 @@ public PartEditor(EditingDomain editingDomain, IProject project) {
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Part.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Part.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -82,12 +86,12 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Part";
+		return Messages.PartEditor_Label;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "Part Bla Bla Bla Bla";
+		return Messages.PartEditor_Description;
 	}
 
 	@Override
@@ -109,65 +113,65 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Id");
+			l.setText(Messages.PartEditor_Id);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));			
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));			
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Label");
+			l.setText(Messages.PartEditor_LabelLabel);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));			
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));			
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Tooltip");
+			l.setText(Messages.PartEditor_Tooltip);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));			
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));			
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Icon URI");
+			l.setText(Messages.PartEditor_IconURI);
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
 			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText("Find ...");			
+			b.setText(Messages.PartEditor_Find);			
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Class URI");
+			l.setText(Messages.PartEditor_ClassURI);
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
 
 			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText("Find ...");
+			b.setText(Messages.PartEditor_Find);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -177,17 +181,29 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.PartEditor_ContainerData);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
+		}
+		
 		createSubformElements(parent, context, master);
 		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Closeable");
+			l.setText(Messages.PartEditor_Closeable);
 
 			Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
 			
-			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PART__CLOSEABLE);
+			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART__CLOSEABLE);
 			IWidgetValueProperty uiProp = WidgetProperties.selection();
 			
 			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
@@ -235,7 +251,7 @@ public void widgetSelected(SelectionEvent e) {
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Persited State");
+			l.setText(Messages.PartEditor_PersitedState);
 			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 
 			TableViewer tableviewer = new TableViewer(parent);
@@ -247,7 +263,7 @@ public void widgetSelected(SelectionEvent e) {
 			tableviewer.getControl().setLayoutData(gd);
 			
 			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText("Key");
+			column.getColumn().setText(Messages.PartEditor_PersitedStateKey);
 			column.getColumn().setWidth(200);
 			column.setLabelProvider(new ColumnLabelProvider() {
 				@SuppressWarnings("unchecked")
@@ -260,7 +276,7 @@ public String getText(Object element) {
 
 			//FIXME How can we react upon changes in the Map-Value?
 			column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText("Value");
+			column.getColumn().setText(Messages.PartEditor_PersitedStateValue);
 			column.getColumn().setWidth(200);
 			column.setLabelProvider(new ColumnLabelProvider() {
 				@SuppressWarnings("unchecked")
@@ -271,7 +287,7 @@ public String getText(Object element) {
 				}
 			});
 			
-			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__PERSISTED_STATE);
+			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE);
 			tableviewer.setInput(prop.observeDetail(getMaster()));
 			
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -284,12 +300,12 @@ public String getText(Object element) {
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add ...");
+			b.setText(Messages.PartEditor_Add);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.PartEditor_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		}
@@ -306,7 +322,7 @@ protected void createSubformElements(Composite parent, EMFDataBindingContext con
 	@Override
 	public IObservableList getChildList(Object element) {
 		WritableList list = new WritableList();
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MENU, PART__MENUS, element, "Menus") {
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART_MENU, PART__MENUS, element, Messages.PartEditor_Menus) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -315,7 +331,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, "Handlers") {
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.PartEditor_Handlers) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -336,7 +352,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] {
-			FeaturePath.fromList(MApplicationPackage.Literals.UI_LABEL__LABEL)	
+			FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL)	
 		};
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index b815c75844..5ba46b78cf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -22,12 +22,14 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MElementContainer;
-import org.eclipse.e4.ui.model.application.MPartSashContainer;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -38,6 +40,7 @@
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -74,7 +77,7 @@ public class PartSashContainerEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
 	public PartSashContainerEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
@@ -87,7 +90,7 @@ public Image getImage(Object element, Display display) {
 
 		if( vImage == null && ! horizontal ) {
 			try {
-				vImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/PartSashContainer_vertical.gif"));
+				vImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/PartSashContainer_vertical.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -96,7 +99,7 @@ public Image getImage(Object element, Display display) {
 
 		if( hImage == null && horizontal ) {
 			try {
-				hImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/PartSashContainer.gif"));
+				hImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/PartSashContainer.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -112,12 +115,12 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Sash";
+		return Messages.PartSashContainerEditor_Label;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "Sash bla bla bla";
+		return Messages.PartSashContainerEditor_Description;
 	}
 
 	@Override
@@ -140,19 +143,19 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Id");
+			l.setText(Messages.PartSashContainerEditor_Id);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Orientation");
+			l.setText(Messages.PartSashContainerEditor_Orientation);
 
 			ComboViewer viewer = new ComboViewer(parent);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -162,30 +165,30 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			viewer.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
-					return ((Boolean)element).booleanValue() ? "Horizontal" : "Vertical";
+					return ((Boolean)element).booleanValue() ? Messages.PartSashContainerEditor_Horizontal : Messages.PartSashContainerEditor_Vertical;
 				}
 			});
 			viewer.setInput(new Boolean[] { Boolean.TRUE, Boolean.FALSE });
 			IViewerValueProperty vProp = ViewerProperties.singleSelection();
-			context.bindValue(vProp.observe(viewer), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.GENERIC_TILE__HORIZONTAL).observeDetail(getMaster()));
+			context.bindValue(vProp.observe(viewer), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Selected Element");
+			l.setText(Messages.PartSashContainerEditor_SelectedElement);
 
 			ComboViewer viewer = new ComboViewer(parent);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			viewer.getControl().setLayoutData(gd);
-			IEMFEditListProperty listProp = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
-			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID);
+			IEMFEditListProperty listProp = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
 			IViewerValueProperty vProp = ViewerProperties.singleSelection();
 
 			final Binding[] binding = new Binding[1];
 			final IObservableValue uiObs = vProp.observe(viewer);
-			final IObservableValue mObs = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(getMaster());
+			final IObservableValue mObs = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(getMaster());
 			getMaster().addValueChangeListener(new IValueChangeListener() {
 
 				public void handleValueChange(ValueChangeEvent event) {
@@ -205,12 +208,24 @@ public void handleValueChange(ValueChangeEvent event) {
 				}
 			});
 		}
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.PartSashContainerEditor_ContainerData);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
+		}
 
 		ControlFactory.createTagsWidget(parent, this);
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Controls");
+			l.setText(Messages.PartSashContainerEditor_Controls);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 			
 			final TableViewer viewer = new TableViewer(parent);
@@ -221,7 +236,7 @@ public void handleValueChange(ValueChangeEvent event) {
 			viewer.setContentProvider(cp);
 			viewer.setLabelProvider(new ComponentLabelProvider(editor));
 			
-			IEMFListProperty prop = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 			
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -234,7 +249,7 @@ public void handleValueChange(ValueChangeEvent event) {
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.PartSashContainerEditor_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -247,7 +262,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
 							if( idx >= 0 ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -261,7 +276,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.PartSashContainerEditor_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -274,7 +289,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
 							if( idx < container.getChildren().size() ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -298,11 +313,12 @@ public String getText(Object element) {
 				}
 			});
 			childrenDropDown.setInput(new EClass[] {
-					MApplicationPackage.Literals.PART_SASH_CONTAINER,
-					MApplicationPackage.Literals.PART_STACK,
-					MApplicationPackage.Literals.PART
+					BasicPackageImpl.Literals.PART_SASH_CONTAINER,
+					BasicPackageImpl.Literals.PART_STACK,
+					BasicPackageImpl.Literals.PART,
+					BasicPackageImpl.Literals.INPUT_PART
 			});
-			childrenDropDown.setSelection(new StructuredSelection(MApplicationPackage.Literals.PART_SASH_CONTAINER));
+			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
 			
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
@@ -312,9 +328,9 @@ public String getText(Object element) {
 				public void widgetSelected(SelectionEvent e) {
 					if( ! childrenDropDown.getSelection().isEmpty() ) {
 						EClass eClass = (EClass) ((IStructuredSelection)childrenDropDown.getSelection()).getFirstElement();
-						EObject eObject = MApplicationFactory.eINSTANCE.create(eClass);
+						EObject eObject = EcoreUtil.create(eClass);
 						
-						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 						
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
@@ -325,7 +341,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 			
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.PartSashContainerEditor_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -334,7 +350,7 @@ public void widgetSelected(SelectionEvent e) {
 					if( ! viewer.getSelection().isEmpty() ) {
 						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
 						
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -360,7 +376,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] {
-			FeaturePath.fromList(MApplicationPackage.Literals.GENERIC_TILE__HORIZONTAL)	
+			FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL)	
 		};
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index e6085c3b2c..8f6597fcf0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -22,12 +22,13 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MElementContainer;
-import org.eclipse.e4.ui.model.application.MPart;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -35,6 +36,9 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -45,8 +49,10 @@
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
@@ -68,7 +74,7 @@ public class PartStackEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
 	public PartStackEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
@@ -79,7 +85,7 @@ public PartStackEditor(EditingDomain editingDomain, ModelEditor editor) {
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/PartStack.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/PartStack.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -91,12 +97,12 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Part Stack";
+		return Messages.PartStackEditor_Label;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "Stack bla bla bla";
+		return Messages.PartStackEditor_Description;
 	}
 
 	@Override
@@ -119,31 +125,31 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Id");
+			l.setText(Messages.PartStackEditor_Id);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Selected Element");
+			l.setText(Messages.PartStackEditor_SelectedElement);
 
 			ComboViewer viewer = new ComboViewer(parent);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			viewer.getControl().setLayoutData(gd);
-			IEMFEditListProperty listProp = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
-			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL);
+			IEMFEditListProperty listProp = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL);
 			IViewerValueProperty vProp = ViewerProperties.singleSelection();
 
 			final Binding[] binding = new Binding[1];
 			final IObservableValue uiObs = vProp.observe(viewer);
-			final IObservableValue mObs = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(getMaster());
+			final IObservableValue mObs = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(getMaster());
 			getMaster().addValueChangeListener(new IValueChangeListener() {
 
 				public void handleValueChange(ValueChangeEvent event) {
@@ -167,7 +173,19 @@ public void handleValueChange(ValueChangeEvent event) {
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Parts");
+			l.setText(Messages.PartStackEditor_ContainerData);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
+		}
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.PartStackEditor_Parts);
 			
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
@@ -177,12 +195,12 @@ public void handleValueChange(ValueChangeEvent event) {
 			viewer.getControl().setLayoutData(gd);
 			
 			
-			IEMFListProperty prop = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 			
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout();
+			GridLayout gl = new GridLayout(2,false);
 			gl.marginLeft=0;
 			gl.marginRight=0;
 			gl.marginWidth=0;
@@ -190,9 +208,9 @@ public void handleValueChange(ValueChangeEvent event) {
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.PartStackEditor_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
 			b.addSelectionListener(new SelectionAdapter() { 
 				@Override
 				public void widgetSelected(SelectionEvent e) {  
@@ -203,7 +221,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
 							if( idx >= 0 ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -217,9 +235,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.PartStackEditor_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -230,7 +248,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
 							if( idx < container.getChildren().size() ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -243,35 +261,54 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 			
+			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					EClass eclass = (EClass) element;
+					return eclass.getName();
+				}
+			});
+			childrenDropDown.setInput(new EClass[] {
+					BasicPackageImpl.Literals.PART_SASH_CONTAINER,
+					BasicPackageImpl.Literals.PART_STACK,
+					BasicPackageImpl.Literals.PART,
+					BasicPackageImpl.Literals.INPUT_PART
+			});
+			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
+			
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add Part");
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MPart part = MApplicationFactory.eINSTANCE.createPart();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, part);
+					EClass eClass = (EClass) ((IStructuredSelection)childrenDropDown.getSelection()).getFirstElement();
+					EObject eObject = EcoreUtil.create(eClass);
+					
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 					
 					if( cmd.canExecute() ) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(part);
+						editor.setSelection(eObject);
 					}
 				}
 			});
 			
 			
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.PartStackEditor_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if( ! viewer.getSelection().isEmpty() ) {
 						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
 						
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 70730a4568..c2b152b1bb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -1,7 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.List;
 
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -11,22 +22,45 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MPerspective;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -40,18 +74,20 @@ public class PerspectiveEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
+	private ModelEditor editor;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
-	public PerspectiveEditor(EditingDomain editingDomain) {
+	public PerspectiveEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
+		this.editor = editor;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Perspective.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Perspective.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -63,7 +99,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Perspective";
+		return Messages.PerspectiveEditor_Label;
 	}
 
 	@Override
@@ -79,13 +115,13 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] {
-			FeaturePath.fromList(MApplicationPackage.Literals.UI_LABEL__LABEL)	
+			FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL)	
 		};
 	}
 	
 	@Override
 	public String getDescription(Object element) {
-		return "Perspective Bla Bla Bla";
+		return Messages.PerspectiveEditor_Description;
 	}
 
 	@Override
@@ -107,31 +143,31 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Id");
+			l.setText(Messages.PerspectiveEditor_Id);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Selected Element");
+			l.setText(Messages.PerspectiveEditor_SelectedElement);
 
 			ComboViewer viewer = new ComboViewer(parent);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			viewer.getControl().setLayoutData(gd);
-			IEMFEditListProperty listProp = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
-			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID);
+			IEMFEditListProperty listProp = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
 			IViewerValueProperty vProp = ViewerProperties.singleSelection();
 
 			final Binding[] binding = new Binding[1];
 			final IObservableValue uiObs = vProp.observe(viewer);
-			final IObservableValue mObs = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(getMaster());
+			final IObservableValue mObs = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(getMaster());
 			getMaster().addValueChangeListener(new IValueChangeListener() {
 
 				public void handleValueChange(ValueChangeEvent event) {
@@ -155,40 +191,177 @@ public void handleValueChange(ValueChangeEvent event) {
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Label");
+			l.setText(Messages.PerspectiveEditor_Label);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Tooltip");
+			l.setText(Messages.PerspectiveEditor_Tooltip);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Icon URI");
+			l.setText(Messages.PerspectiveEditor_IconURI);
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
 			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText("Find ...");
+			b.setText(Messages.PerspectiveEditor_Find);
 		}
 
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.PerspectiveEditor_Controls);
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			
+			final TableViewer viewer = new TableViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 200;
+			viewer.getControl().setLayoutData(gd);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			
+			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(getMaster()));
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout(2,false);
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.PerspectiveEditor_Up);
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.PerspectiveEditor_Down);
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) + 1;
+							if( idx < container.getChildren().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+			
+			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					EClass eclass = (EClass) element;
+					return eclass.getName();
+				}
+			});
+			childrenDropDown.setInput(new EClass[] {
+					BasicPackageImpl.Literals.PART_SASH_CONTAINER,
+					BasicPackageImpl.Literals.PART_STACK,
+					BasicPackageImpl.Literals.PART,
+					BasicPackageImpl.Literals.INPUT_PART,
+					AdvancedPackageImpl.Literals.PLACEHOLDER
+			});
+			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! childrenDropDown.getSelection().isEmpty() ) {
+						EClass eClass = (EClass) ((IStructuredSelection)childrenDropDown.getSelection()).getFirstElement();
+						EObject eObject = EcoreUtil.create(eClass);
+						
+						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+						
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+							editor.setSelection(eObject);
+						}
+					}
+				}
+			});
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.PerspectiveEditor_Remove);
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
+						
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+		
 		ControlFactory.createTagsWidget(parent, this);
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 31624f5fc1..276555f986 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -12,6 +12,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.List;
 
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -21,23 +22,42 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.databinding.viewers.ViewerSupport;
 import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
@@ -47,18 +67,20 @@ public class PerspectiveStackEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
+	private ModelEditor modelEditor;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
-	public PerspectiveStackEditor(EditingDomain editingDomain) {
+	public PerspectiveStackEditor(EditingDomain editingDomain, ModelEditor modelEditor) {
 		super(editingDomain);
+		this.modelEditor = modelEditor;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/PerspectiveStack.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/PerspectiveStack.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -70,7 +92,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Perspective Stack";
+		return Messages.PerspectiveStackEditor_Label;
 	}
 
 	@Override
@@ -80,7 +102,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Perspective Stack Bla Bla Bla";
+		return Messages.PerspectiveStackEditor_Description;
 	}
 
 	@Override
@@ -103,31 +125,31 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Id");
+			l.setText(Messages.PerspectiveStackEditor_Id);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Selected Element");
+			l.setText(Messages.PerspectiveStackEditor_SelectedElement);
 
 			ComboViewer viewer = new ComboViewer(parent);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			viewer.getControl().setLayoutData(gd);
-			IEMFEditListProperty listProp = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
-			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL);
+			IEMFEditListProperty listProp = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL);
 			IViewerValueProperty vProp = ViewerProperties.singleSelection();
 
 			final Binding[] binding = new Binding[1];
 			final IObservableValue uiObs = vProp.observe(viewer);
-			final IObservableValue mObs = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(getMaster());
+			final IObservableValue mObs = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(getMaster());
 			getMaster().addValueChangeListener(new IValueChangeListener() {
 
 				public void handleValueChange(ValueChangeEvent event) {
@@ -147,6 +169,122 @@ public void handleValueChange(ValueChangeEvent event) {
 				}
 			});
 		}
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.PerspectiveStackEditor_Perspectives);
+			
+			final TableViewer viewer = new TableViewer(parent);
+			viewer.setContentProvider(new ObservableListContentProvider());
+			viewer.setLabelProvider(new ComponentLabelProvider(modelEditor));
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			
+			
+			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(getMaster()));
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.PartStackEditor_Up);
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() { 
+				@Override
+				public void widgetSelected(SelectionEvent e) {  
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.PartStackEditor_Down);
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) + 1;
+							if( idx < container.getChildren().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+						
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MPerspective eObject = MAdvancedFactory.INSTANCE.createPerspective();
+					
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						modelEditor.setSelection(eObject);
+					}
+				}
+			});
+			
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.PartStackEditor_Remove);
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
+						
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
 
 		ControlFactory.createTagsWidget(parent, this);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 90b8d08cc0..690708f0b1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -16,9 +16,10 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MPlaceholder;
-import org.eclipse.e4.ui.model.application.MUILabel;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
@@ -47,7 +48,7 @@ public PlaceholderEditor(EditingDomain editingDomain) {
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Placeholder.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Placeholder.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -59,7 +60,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Placeholder";
+		return Messages.PlaceholderEditor_Label;
 	}
 
 	@Override
@@ -72,17 +73,17 @@ public String getDetailLabel(Object element) {
 			if( pl.getRef() instanceof MUILabel ) {
 				MUILabel label = (MUILabel) pl.getRef();
 				if( label.getLabel() != null && label.getLabel().trim().length() > 0 ) {
-					b.append(" (" + label.getLabel() + ")");
+					b.append(" (" + label.getLabel() + ")");  //$NON-NLS-1$//$NON-NLS-2$
 				} else if( label.getTooltip() != null && label.getTooltip().trim().length() > 0 ) {
-					b.append(" (" + label.getTooltip() + ")");
+					b.append(" (" + label.getTooltip() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 				} else {
-					if( pl.getRef().getId() != null && pl.getRef().getId().trim().length() > 0 ) {
-						b.append(pl.getRef().getId());
+					if( pl.getRef().getElementId() != null && pl.getRef().getElementId().trim().length() > 0 ) {
+						b.append(pl.getRef().getElementId());
 					}
 				}
 			} else {
-				if( pl.getRef().getId() != null && pl.getRef().getId().trim().length() > 0 ) {
-					b.append(" (" + pl.getRef().getId() + ")");
+				if( pl.getRef().getElementId() != null && pl.getRef().getElementId().trim().length() > 0 ) {
+					b.append(" (" + pl.getRef().getElementId() + ")");  //$NON-NLS-1$//$NON-NLS-2$
 				}
 			}
 
@@ -94,7 +95,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Placeholder Bla Bla Bla Bla";
+		return Messages.PlaceholderEditor_Descriptor;
 	}
 
 	@Override
@@ -116,13 +117,13 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Id");
+			l.setText(Messages.PlaceholderEditor_Id);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 552d287987..0574facaad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -18,15 +18,16 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.ui.model.application.ItemType;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MElementContainer;
-import org.eclipse.e4.ui.model.application.MHandler;
-import org.eclipse.e4.ui.model.application.MToolItem;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -34,6 +35,7 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -67,7 +69,7 @@ public class ToolBarEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
 	private class Struct {
 		private final String label;
@@ -91,7 +93,7 @@ public ToolBarEditor(EditingDomain editingDomain, ModelEditor editor) {
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Toolbar.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Toolbar.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -102,12 +104,12 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Toolbar";
+		return Messages.ToolBarEditor_Label;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "Toolbar bla bla bla";
+		return Messages.ToolBarEditor_Description;
 	}
 
 	@Override
@@ -129,19 +131,19 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Id");
+			l.setText(Messages.ToolBarEditor_Id);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("ToolbarItems");
+			l.setText(Messages.ToolBarEditor_ToolbarItems);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			final TableViewer viewer = new TableViewer(parent);
@@ -155,21 +157,21 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			{
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Type");
+				column.getColumn().setText(Messages.ToolBarEditor_ToolbarItemsType);
 				column.getColumn().setWidth(300);
 				column.setLabelProvider(new ComponentLabelProvider(editor));
 			}
 
 			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ITEM__TYPE);
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE);
 
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("ItemType");
+				column.getColumn().setText(Messages.ToolBarEditor_ToolbarItemsItemType);
 				column.getColumn().setWidth(100);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
 
-			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -182,7 +184,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ToolBarEditor_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -195,7 +197,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
 							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
 
 								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -209,7 +211,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ToolBarEditor_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -222,7 +224,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
 							if (idx < container.getChildren().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
 
 								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -246,8 +248,8 @@ public String getText(Object element) {
 				}
 			});
 
-			Struct defaultStruct = new Struct("Handled ToolItem", MApplicationPackage.Literals.HANDLED_TOOL_ITEM, false);
-			childrenDropDown.setInput(new Struct[] { defaultStruct, new Struct("Direct ToolItem", MApplicationPackage.Literals.DIRECT_TOOL_ITEM, false), new Struct("Separator", MApplicationPackage.Literals.TOOL_ITEM, true) });
+			Struct defaultStruct = new Struct(Messages.ToolBarEditor_HandledToolItem, MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
+			childrenDropDown.setInput(new Struct[] { defaultStruct, new Struct(Messages.ToolBarEditor_DirectToolItem, MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false), new Struct(Messages.ToolBarEditor_ToolControl, MenuPackageImpl.Literals.TOOL_CONTROL, false), new Struct(Messages.ToolBarEditor_Separator, MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true) });
 			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
@@ -259,13 +261,9 @@ public void widgetSelected(SelectionEvent e) {
 					if (!childrenDropDown.getSelection().isEmpty()) {
 						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
 						EClass eClass = struct.eClass;
-						MToolItem eObject = (MToolItem) MApplicationFactory.eINSTANCE.create(eClass);
+						MToolBarElement eObject = (MToolBarElement) EcoreUtil.create(eClass);
 
-						if (struct.separator) {
-							eObject.setType(ItemType.SEPARATOR);
-						}
-
-						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
@@ -278,7 +276,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ToolBarEditor_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -286,7 +284,7 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					if (!viewer.getSelection().isEmpty()) {
 						List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
 						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
new file mode 100644
index 0000000000..2ef4e6cd72
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -0,0 +1,110 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class ToolBarSeparatorEditor extends AbstractComponentEditor {
+	private Image separatorImage;
+	private Composite composite;
+	private EMFDataBindingContext context;
+	
+	public ToolBarSeparatorEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if (separatorImage == null) {
+			try {
+				separatorImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ToolBarSeparator.gif")); //$NON-NLS-1$
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return separatorImage;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.ToolBarSeparatorEditor_Label;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return null;
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent, context, getMaster());
+		}
+		getMaster().setValue(object);
+		return composite;
+	}
+	
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.ToolBarSeparatorEditor_Id);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+		}
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
new file mode 100644
index 0000000000..429fe92971
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -0,0 +1,207 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Map.Entry;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
+import org.eclipse.e4.ui.model.application.MContribution;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class ToolControlEditor extends AbstractComponentEditor {
+	private Image image;
+	private EMFDataBindingContext context;
+	private Composite composite;
+	private IProject project;
+
+	public ToolControlEditor(EditingDomain editingDomain, IProject project) {
+		super(editingDomain);
+		this.project = project;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.ToolControlEditor_Label;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return Messages.ToolControlEditor_Description;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if (image == null) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ToolControl.gif")); //$NON-NLS-1$
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent, context, getMaster());
+		}
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context2, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.ToolControlEditor_Id);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.ToolControlEditor_ClassURI);
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
+
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setText("Find ...");
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue());
+					dialog.open();
+				}
+			});
+		}
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Persited State");
+			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+
+			TableViewer tableviewer = new TableViewer(parent);
+			tableviewer.getTable().setHeaderVisible(true);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			tableviewer.setContentProvider(cp);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 80;
+			tableviewer.getControl().setLayoutData(gd);
+			
+			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
+			column.getColumn().setText("Key");
+			column.getColumn().setWidth(200);
+			column.setLabelProvider(new ColumnLabelProvider() {
+				@SuppressWarnings("unchecked")
+				@Override
+				public String getText(Object element) {
+					Entry<String, String> entry = (Entry<String, String>) element;
+					return entry.getKey();
+				}
+			}); 
+
+			//FIXME How can we react upon changes in the Map-Value?
+			column = new TableViewerColumn(tableviewer, SWT.NONE);
+			column.getColumn().setText("Value");
+			column.getColumn().setWidth(200);
+			column.setLabelProvider(new ColumnLabelProvider() {
+				@SuppressWarnings("unchecked")
+				@Override
+				public String getText(Object element) {
+					Entry<String, String> entry = (Entry<String, String>) element;
+					return entry.getValue();
+				}
+			});
+			
+			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE);
+			tableviewer.setInput(prop.observeDetail(getMaster()));
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		}
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 345d3b77ae..9bf6c0103a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -10,17 +10,16 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.ui.model.application.ItemType;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MToolItem;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
@@ -31,48 +30,21 @@
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class ToolItemEditor extends AbstractComponentEditor {
+public abstract class ToolItemEditor extends AbstractComponentEditor {
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 
 	public ToolItemEditor(EditingDomain editingDomain) {
 		super(editingDomain);
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ToolItem_separator.gif"));
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		return image;
-	}
-
-	@Override
-	public String getLabel(Object element) {
-		return "Separator";
-	}
-
-	@Override
-	public String getDescription(Object element) {
-		return "Separator bla bla bla";
-	}
-
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
 		if (composite == null) {
@@ -96,11 +68,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(master));
+		context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));
 
-		if (this.getClass() != ToolItemEditor.class) {
-			createFormSubTypeForm(parent, context, master);
-		}
+		createFormSubTypeForm(parent, context, master);
 
 		return parent;
 	}
@@ -119,7 +89,7 @@ private void createFormSubTypeForm(Composite parent, EMFDataBindingContext conte
 			GridData gd = new GridData();
 			gd.horizontalSpan = 2;
 			viewer.getControl().setLayoutData(gd);
-			IObservableValue itemTypeObs = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.ITEM__TYPE).observeDetail(master);
+			IObservableValue itemTypeObs = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(master);
 			context.bindValue(ViewerProperties.singleSelection().observe(viewer), itemTypeObs);
 		}
 
@@ -132,7 +102,7 @@ private void createFormSubTypeForm(Composite parent, EMFDataBindingContext conte
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -144,7 +114,7 @@ private void createFormSubTypeForm(Composite parent, EMFDataBindingContext conte
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -154,7 +124,7 @@ private void createFormSubTypeForm(Composite parent, EMFDataBindingContext conte
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
 			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText("Find ...");
@@ -182,23 +152,16 @@ public IObservableList getChildList(Object element) {
 	@Override
 	public String getDetailLabel(Object element) {
 		MToolItem item = (MToolItem) element;
-		if (item.getType() == ItemType.SEPARATOR) {
-			return null;
-		} else {
-			if (item.getLabel() != null && item.getLabel().trim().length() > 0) {
-				return item.getLabel();
-			} else if (item.getTooltip() != null && item.getTooltip().trim().length() > 0) {
-				return item.getTooltip();
-			}
+		if (item.getLabel() != null && item.getLabel().trim().length() > 0) {
+			return item.getLabel();
+		} else if (item.getTooltip() != null && item.getTooltip().trim().length() > 0) {
+			return item.getTooltip();
 		}
 		return null;
 	}
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] {
-			FeaturePath.fromList(MApplicationPackage.Literals.UI_LABEL__LABEL),
-			FeaturePath.fromList(MApplicationPackage.Literals.UI_LABEL__TOOLTIP)
-		};
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__TOOLTIP) };
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
similarity index 86%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
rename to bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index b95636fe5c..033eafa103 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -21,12 +21,13 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MElementContainer;
-import org.eclipse.e4.ui.model.application.MToolBar;
-import org.eclipse.e4.ui.model.application.MTrimContainer;
-import org.eclipse.e4.ui.model.application.SideValue;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer;
+import org.eclipse.e4.ui.model.application.ui.SideValue;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -58,16 +59,16 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class WindowTrimEditor extends AbstractComponentEditor {
+public class TrimBarEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
-	public WindowTrimEditor(EditingDomain editingDomain, ModelEditor editor) {
+	public TrimBarEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
 		this.editor = editor;
 	}
@@ -122,7 +123,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -136,7 +137,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData();
 			gd.horizontalSpan = 2;
 			viewer.getControl().setLayoutData(gd);
-			IObservableValue sideValueObs = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.TRIM_CONTAINER__SIDE).observeDetail(master);
+			IObservableValue sideValueObs = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TRIM_CONTAINER__SIDE).observeDetail(master);
 			context.bindValue(ViewerProperties.singleSelection().observe(viewer), sideValueObs);
 		}
 
@@ -153,7 +154,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 			
-			IEMFListProperty prop = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 			
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -179,7 +180,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
 							if( idx >= 0 ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -206,7 +207,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
 							if( idx < container.getChildren().size() ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -226,8 +227,8 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MToolBar toolbar = MApplicationFactory.eINSTANCE.createToolBar();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
+					MToolBar toolbar = MMenuFactory.INSTANCE.createToolBar();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
 					
 					if( cmd.canExecute() ) {
 						getEditingDomain().getCommandStack().execute(cmd);
@@ -247,7 +248,7 @@ public void widgetSelected(SelectionEvent e) {
 					if( ! viewer.getSelection().isEmpty() ) {
 						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
 						
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -266,7 +267,7 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MTrimContainer<?> trim = (MTrimContainer<?>) element;
+		MGenericTrimContainer<?> trim = (MGenericTrimContainer<?>) element;
 		
 		if( trim.getSide() != null ) {
 			return trim.getSide().toString();
@@ -278,7 +279,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] {
-			FeaturePath.fromList(MApplicationPackage.Literals.TRIM_CONTAINER__SIDE)	
+			FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TRIM_CONTAINER__SIDE)	
 		};
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
new file mode 100644
index 0000000000..aabc235345
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
@@ -0,0 +1,36 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+public class TrimmedWindowEditor extends WindowEditor {
+	private IListProperty TRIMMED_WINDOW__TRIM_BARS = EMFProperties.list(BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS);
+	
+	public TrimmedWindowEditor(EditingDomain editingDomain) {
+		super(editingDomain);
+	}
+
+	public IObservableList getChildList(Object element) {
+		IObservableList list = super.getChildList(element);
+		
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_TRIMMED_WINDOW_TRIMS, TRIMMED_WINDOW__TRIM_BARS, element, "TrimBars") {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+		return list;
+	}
+	
+	@Override
+	public String getLabel(Object element) {
+		return "Trimmed Window";
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 222d4dcd7b..e2d17d25b3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -23,9 +23,11 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MWindow;
-import org.eclipse.e4.ui.model.application.MWindowTrim;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -49,9 +51,10 @@ public class WindowEditor extends AbstractComponentEditor {
 	private Image image;
 	private EMFDataBindingContext context;
 
-	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS);
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private IValueProperty WINDOW__MAIN_MENU = EMFProperties.value(MApplicationPackage.Literals.WINDOW__MAIN_MENU);
+	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
+	private IListProperty WINDOW__WINDOWS = EMFProperties.list(BasicPackageImpl.Literals.WINDOW__WINDOWS);
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private IValueProperty WINDOW__MAIN_MENU = EMFProperties.value(BasicPackageImpl.Literals.WINDOW__MAIN_MENU);
 
 	public WindowEditor(EditingDomain editingDomain) {
 		super(editingDomain);
@@ -107,7 +110,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -119,7 +122,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__X).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__X).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -131,7 +134,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__Y).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__Y).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -143,7 +146,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__WIDTH).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__WIDTH).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -155,7 +158,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__HEIGHT).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__HEIGHT).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -167,7 +170,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -179,7 +182,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -189,7 +192,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
 			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText("Find ...");
@@ -214,12 +217,12 @@ protected boolean accepted(Object o) {
 			}
 
 		});
-
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_WINDOW_TRIMS, ELEMENT_CONTAINER__CHILDREN, element, "Trims") {
+		
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_WINDOWS, WINDOW__WINDOWS, element, "Windows") {
 
 			@Override
 			protected boolean accepted(Object o) {
-				return o instanceof MWindowTrim;
+				return true;
 			}
 
 		});
@@ -228,7 +231,7 @@ protected boolean accepted(Object o) {
 
 			@Override
 			protected boolean accepted(Object o) {
-				return !(o instanceof MWindowTrim);
+				return true;
 			}
 
 		});
@@ -266,7 +269,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] {
-			FeaturePath.fromList(MApplicationPackage.Literals.UI_LABEL__LABEL)	
+			FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL)	
 		};
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index a2ccb384d7..87a3710792 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -13,13 +13,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.MCommand;
 import org.eclipse.e4.ui.model.application.MModelComponent;
 import org.eclipse.e4.ui.model.application.MModelComponents;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
@@ -145,8 +144,8 @@ public void update(final ViewerCell cell) {
 			if( cmd.getDescription() != null ) {
 				styledString.append(" - " + cmd.getDescription(),StyledString.DECORATIONS_STYLER);
 			}
-			if( cmd.getId() != null ) {
-				styledString.append(" - " + cmd.getId(),StyledString.DECORATIONS_STYLER);
+			if( cmd.getElementId() != null ) {
+				styledString.append(" - " + cmd.getElementId(),StyledString.DECORATIONS_STYLER);
 			}
 			cell.setText(styledString.getString());
 			cell.setStyleRanges(styledString.getStyleRanges());
@@ -167,8 +166,8 @@ public String getText(Object element) {
 				s += " " + command.getDescription();
 			}
 			
-			if( command.getId() != null ) {
-				s += " " + command.getId();
+			if( command.getElementId() != null ) {
+				s += " " + command.getElementId();
 			}
 			
 			return s;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index d12ccd5362..e0fd19c8ad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -17,8 +17,8 @@
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionResultHandler;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
 import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
 import org.eclipse.e4.ui.model.application.MContribution;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -155,7 +155,7 @@ protected void okPressed() {
 		if( ! s.isEmpty() ) {
 			ContributionData cd = (ContributionData) s.getFirstElement();
 			String uri = "platform:/plugin/" + cd.bundleName + "/" + cd.className;
-			Command cmd = SetCommand.create(editingDomain, contribution, MApplicationPackage.Literals.CONTRIBUTION__URI, uri);
+			Command cmd = SetCommand.create(editingDomain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, uri);
 			if( cmd.canExecute() ) {
 				editingDomain.getCommandStack().execute(cmd);
 				super.okPressed();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
new file mode 100644
index 0000000000..39f72ebd90
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.widgets.Shell;
+
+public class HandledMenuItemCommandSelectionDialog extends AbstractCommandSelectionDialog {
+	private MHandledItem handler;
+	
+	public HandledMenuItemCommandSelectionDialog(Shell parentShell, MHandledItem handler, IModelResource resource) {
+		super(parentShell, resource);
+		this.handler = handler;
+	}
+	
+	@Override
+	protected String getShellTitle() {
+		return  "MenuItem Command";
+	}
+	
+	@Override
+	protected String getDialogTitle() {
+		return "MenuItem-Command";
+	}
+	
+	@Override
+	protected String getDialogMessage() {
+		return "Connect the MenuItem to a command";
+	}
+
+	@Override
+	protected Command createStoreCommand( EditingDomain editingDomain, MCommand command) {
+		return SetCommand.create(editingDomain, handler, MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND, command);
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
new file mode 100644
index 0000000000..8f9b0345d5
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.widgets.Shell;
+
+public class HandledToolItemCommandSelectionDialog extends AbstractCommandSelectionDialog {
+	private MHandledItem handler;
+	
+	public HandledToolItemCommandSelectionDialog(Shell parentShell, MHandledItem handler, IModelResource resource) {
+		super(parentShell, resource);
+		this.handler = handler;
+	}
+	
+	@Override
+	protected String getShellTitle() {
+		return  "ToolItem Command";
+	}
+	
+	@Override
+	protected String getDialogTitle() {
+		return "ToolItem-Command";
+	}
+	
+	@Override
+	protected String getDialogMessage() {
+		return "Connect the ToolItem to a command";
+	}
+
+	@Override
+	protected Command createStoreCommand( EditingDomain editingDomain, MCommand command) {
+		return SetCommand.create(editingDomain, handler, MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND, command);
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
index 3532bf70d5..ace3d85758 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
@@ -11,9 +11,9 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MCommand;
-import org.eclipse.e4.ui.model.application.MHandler;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -44,6 +44,6 @@ protected String getDialogMessage() {
 
 	@Override
 	protected Command createStoreCommand( EditingDomain editingDomain, MCommand command) {
-		return SetCommand.create(editingDomain, handler, MApplicationPackage.Literals.HANDLER__COMMAND, command);
+		return SetCommand.create(editingDomain, handler, CommandsPackageImpl.Literals.HANDLER__COMMAND, command);
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
index 6b7ed917ce..bda337ad84 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
@@ -11,9 +11,9 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MCommand;
-import org.eclipse.e4.ui.model.application.MKeyBinding;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -44,6 +44,6 @@ protected String getDialogMessage() {
 	
 	@Override
 	protected Command createStoreCommand( EditingDomain editingDomain, MCommand command) {
-		return SetCommand.create(editingDomain, binding, MApplicationPackage.Literals.KEY_BINDING__COMMAND, command);
+		return SetCommand.create(editingDomain, binding, CommandsPackageImpl.Literals.KEY_BINDING__COMMAND, command);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 9c3df275a6..fd90c78309 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -22,15 +22,17 @@
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MBindingContainer;
-import org.eclipse.e4.ui.model.application.MBindingContext;
-import org.eclipse.e4.ui.model.application.MBindingTable;
+import org.eclipse.e4.ui.model.application.commands.MBindingContext;
+import org.eclipse.e4.ui.model.application.commands.MBindingTable;
+import org.eclipse.e4.ui.model.application.commands.MBindingTableContainer;
+import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.command.CompoundCommand;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -89,7 +91,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Binding Configuration";
+		return Messages.VBindingTableEditor_Label;
 	}
 
 	@Override
@@ -99,7 +101,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Binding Configuration Bla Bla Bla Bla";
+		return Messages.VBindingTableEditor_Description;
 	}
 
 	@Override
@@ -120,7 +122,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Contexts");
+			l.setText(Messages.VBindingTableEditor_Contexts);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			contextsViewer = new TreeViewer(parent);
@@ -133,7 +135,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			
 			final WritableList list = new WritableList();
 			
-			IEMFValueProperty listProp = EMFProperties.value(MApplicationPackage.Literals.BINDING_CONTAINER__ROOT_CONTEXT);
+			IEMFValueProperty listProp = EMFProperties.value(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT);
 			IObservableValue val = listProp.observeDetail(getMaster());
 			val.addValueChangeListener(new IValueChangeListener() {
 				
@@ -151,10 +153,10 @@ public void handleValueChange(ValueChangeEvent event) {
 			
 			
 			{
-				IEMFValueProperty prop = EMFProperties.value(MApplicationPackage.Literals.BINDING_CONTEXT__NAME);
+				IEMFValueProperty prop = EMFProperties.value(CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME);
 				
 				TreeViewerColumn column = new TreeViewerColumn(contextsViewer, SWT.NONE);
-				column.getColumn().setText("Name");
+				column.getColumn().setText(Messages.VBindingTableEditor_Name);
 				column.getColumn().setWidth(200);				
 				column.setLabelProvider(new ObservableColumnLabelProvider<MBindingContext>(prop.observeDetail(pv.getKnownElements())));
 				column.setEditingSupport(new EditingSupport(contextsViewer) {
@@ -162,7 +164,7 @@ public void handleValueChange(ValueChangeEvent event) {
 					
 					@Override
 					protected void setValue(Object element, Object value) {
-						Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.BINDING_CONTEXT__NAME, value);
+						Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME, value);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -171,7 +173,7 @@ protected void setValue(Object element, Object value) {
 					@Override
 					protected Object getValue(Object element) {
 						MBindingContext ctx = (MBindingContext) element; 
-						return ctx.getName() != null ? ctx.getName() : "";
+						return ctx.getName() != null ? ctx.getName() : ""; //$NON-NLS-1$
 					}
 					
 					@Override
@@ -187,10 +189,10 @@ protected boolean canEdit(Object element) {
 			}
 			
 			{
-				IEMFValueProperty prop = EMFProperties.value(MApplicationPackage.Literals.BINDING_CONTEXT__DESCRIPTION);
+				IEMFValueProperty prop = EMFProperties.value(CommandsPackageImpl.Literals.BINDING_CONTEXT__DESCRIPTION);
 				
 				TreeViewerColumn column = new TreeViewerColumn(contextsViewer, SWT.NONE);
-				column.getColumn().setText("Description");
+				column.getColumn().setText(Messages.VBindingTableEditor_LabelDescription);
 				column.getColumn().setWidth(200);				
 				column.setLabelProvider(new ObservableColumnLabelProvider<MBindingContext>(prop.observeDetail(pv.getKnownElements())));				
 				column.setEditingSupport(new EditingSupport(contextsViewer) {
@@ -198,7 +200,7 @@ protected boolean canEdit(Object element) {
 					
 					@Override
 					protected void setValue(Object element, Object value) {
-						Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.BINDING_CONTEXT__DESCRIPTION, value);
+						Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.BINDING_CONTEXT__DESCRIPTION, value);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -207,7 +209,7 @@ protected void setValue(Object element, Object value) {
 					@Override
 					protected Object getValue(Object element) {
 						MBindingContext ctx = (MBindingContext) element; 
-						return ctx.getDescription() != null ? ctx.getDescription() : "";
+						return ctx.getDescription() != null ? ctx.getDescription() : ""; //$NON-NLS-1$
 					}
 					
 					@Override
@@ -223,10 +225,10 @@ protected boolean canEdit(Object element) {
 			}
 			
 			{
-				IEMFValueProperty prop = EMFProperties.value(MApplicationPackage.Literals.APPLICATION_ELEMENT__ID);
+				IEMFValueProperty prop = EMFProperties.value(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
 				
 				TreeViewerColumn column = new TreeViewerColumn(contextsViewer, SWT.NONE);
-				column.getColumn().setText("Id");
+				column.getColumn().setText(Messages.VBindingTableEditor_Id);
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MBindingContext>(prop.observeDetail(pv.getKnownElements())));				
 				column.setEditingSupport(new EditingSupport(contextsViewer) {
@@ -234,7 +236,7 @@ protected boolean canEdit(Object element) {
 					
 					@Override
 					protected void setValue(Object element, Object value) {
-						Command cmd = SetCommand.create(getEditingDomain(), element, MApplicationPackage.Literals.APPLICATION_ELEMENT__ID, value);
+						Command cmd = SetCommand.create(getEditingDomain(), element, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, value);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -243,7 +245,7 @@ protected void setValue(Object element, Object value) {
 					@Override
 					protected Object getValue(Object element) {
 						MBindingContext ctx = (MBindingContext) element; 
-						return ctx.getId() != null ? ctx.getId() : "";
+						return ctx.getElementId() != null ? ctx.getElementId() : ""; //$NON-NLS-1$
 					}
 					
 					@Override
@@ -269,7 +271,7 @@ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent even
 							|| event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
 				}
 			};
-			TreeViewerEditor.create(contextsViewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
+			TreeViewerEditor.create(contextsViewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR | ColumnViewerEditor.KEEP_EDITOR_ON_DOUBLE_CLICK);
 
 			
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -282,36 +284,36 @@ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent even
 			buttonComp.setLayout(gl);
 			
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.VBindingTableEditor_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.VBindingTableEditor_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add ...");
+			b.setText(Messages.VBindingTableEditor_Add);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					IStructuredSelection s = (IStructuredSelection) contextsViewer.getSelection();
-					MBindingContext context = MApplicationFactory.eINSTANCE.createBindingContext();
+					MBindingContext context = MCommandsFactory.INSTANCE.createBindingContext();
 					MBindingContext parentContext = null;
 					
 					if( ! s.isEmpty() ) {
 						parentContext = (MBindingContext) s.getFirstElement();
-						Command cmd = AddCommand.create(getEditingDomain(), parentContext, MApplicationPackage.Literals.BINDING_CONTEXT__CHILDREN, context);
+						Command cmd = AddCommand.create(getEditingDomain(), parentContext, CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN, context);
 						
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 							contextsViewer.setSelection(new StructuredSelection(context));
 						}
-					} else if( s.isEmpty() && ((MBindingContainer)getMaster().getValue()).getRootContext() == null ) {
-						Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__ROOT_CONTEXT, context);
+					} else if( s.isEmpty() && ((MBindingTableContainer)getMaster().getValue()).getRootContext() == null ) {
+						Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT, context);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 							contextsViewer.setSelection(new StructuredSelection(context));
@@ -323,7 +325,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 			
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.VBindingTableEditor_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -336,14 +338,14 @@ public void widgetSelected(SelectionEvent e) {
 						for( Object o : s.toArray() ) {
 							MBindingContext ctx = (MBindingContext) o;
 							EObject owner = ((EObject)ctx).eContainer();
-							if( owner instanceof MBindingContainer ) {
-								Command cmd = SetCommand.create(getEditingDomain(), owner, MApplicationPackage.Literals.BINDING_CONTAINER__ROOT_CONTEXT, null);
+							if( owner instanceof MBindingTableContainer ) {
+								Command cmd = SetCommand.create(getEditingDomain(), owner, CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT, null);
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									return;
 								}
 							} else {
-								commands.add(RemoveCommand.create(getEditingDomain(), owner, MApplicationPackage.Literals.BINDING_CONTEXT__CHILDREN, ctx));
+								commands.add(RemoveCommand.create(getEditingDomain(), owner, CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN, ctx));
 							}
 						}
 						
@@ -389,10 +391,10 @@ public void widgetSelected(SelectionEvent e) {
 						IStructuredSelection s = (IStructuredSelection) bindingViewer.getSelection();
 						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
-							MBindingContainer container = (MBindingContainer) getMaster().getValue();
+							MBindingTableContainer container = (MBindingTableContainer) getMaster().getValue();
 							int idx = container.getBindingTables().indexOf(obj) - 1;
 							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES, obj, idx);
 
 								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -416,10 +418,10 @@ public void widgetSelected(SelectionEvent e) {
 						IStructuredSelection s = (IStructuredSelection) bindingViewer.getSelection();
 						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
-							MBindingContainer container = (MBindingContainer) getMaster().getValue();
+							MBindingTableContainer container = (MBindingTableContainer) getMaster().getValue();
 							int idx = container.getBindingTables().indexOf(obj) + 1;
 							if (idx < container.getBindingTables().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES, obj, idx);
 
 								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -439,8 +441,8 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MBindingTable command = MApplicationFactory.eINSTANCE.createBindingTable();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES, command);
+					MBindingTable command = MCommandsFactory.INSTANCE.createBindingTable();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES, command);
 
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
@@ -458,7 +460,7 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					if (!bindingViewer.getSelection().isEmpty()) {
 						List<?> commands = ((IStructuredSelection) bindingViewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.BINDING_CONTAINER__BINDING_TABLES, commands);
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES, commands);
 						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -477,7 +479,7 @@ public IObservableList getChildList(Object element) {
 	}
 
 	private class ObservableFactoryImpl implements IObservableFactory {
-		private IEMFListProperty prop = EMFProperties.list(MApplicationPackage.Literals.BINDING_CONTEXT__CHILDREN);
+		private IEMFListProperty prop = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
 		
 		public IObservable createObservable(Object target) {
 			if( target instanceof IObservableList ) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 26be242d71..91ee4b8eba 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -19,10 +19,11 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MCommand;
-import org.eclipse.e4.ui.model.application.MHandler;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
@@ -113,7 +114,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			viewer.getTable().setHeaderVisible(true);
 
 			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.COMMAND__COMMAND_NAME);
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME);
 					
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Name");
@@ -122,7 +123,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			}
 			
 			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID);
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
 					
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Id");
@@ -200,7 +201,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MCommand command = MApplicationFactory.eINSTANCE.createCommand();
+					MCommand command = CommandsFactoryImpl.eINSTANCE.createCommand();
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), commandsFeature, command);
 					
 					if( cmd.canExecute() ) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 28b4d8a892..a522ebfb42 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -18,10 +18,11 @@
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MHandler;
-import org.eclipse.e4.ui.model.application.MHandlerContainer;
+import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.commands.MHandlerContainer;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -109,7 +110,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			viewer.getTable().setHeaderVisible(true);
 
 			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.HANDLER__COMMAND, MApplicationPackage.Literals.COMMAND__COMMAND_NAME));
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(CommandsPackageImpl.Literals.HANDLER__COMMAND, CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME));
 
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Command");
@@ -118,7 +119,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			}
 			
 			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.CONTRIBUTION__URI);
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
 
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Class");
@@ -127,7 +128,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			}
 			
 			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID);
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
 
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Id");
@@ -158,7 +159,7 @@ public void widgetSelected(SelectionEvent e) {
 							MHandlerContainer container = (MHandlerContainer) getMaster().getValue();
 							int idx = container.getHandlers().indexOf(obj) - 1;
 							if( idx >= 0 ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -185,7 +186,7 @@ public void widgetSelected(SelectionEvent e) {
 							MHandlerContainer container = (MHandlerContainer) getMaster().getValue();
 							int idx = container.getHandlers().indexOf(obj) + 1;
 							if( idx < container.getHandlers().size() ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -205,8 +206,8 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MHandler handler = MApplicationFactory.eINSTANCE.createHandler();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS, handler);
+					MHandler handler = MCommandsFactory.INSTANCE.createHandler();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, handler);
 					
 					if( cmd.canExecute() ) {
 						getEditingDomain().getCommandStack().execute(cmd);
@@ -224,7 +225,7 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					if( ! viewer.getSelection().isEmpty() ) {
 						List<?> handlers = ((IStructuredSelection)viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.HANDLER_CONTAINER__HANDLERS, handlers);
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, handlers);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 965dc168a0..4b8082506f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -18,13 +18,15 @@
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MMenu;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -47,10 +49,12 @@ public class VMenuEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
 	private TableViewer viewer;
+	private EStructuralFeature feature;
 
-	public VMenuEditor(EditingDomain editingDomain, ModelEditor editor) {
+	public VMenuEditor(EditingDomain editingDomain, ModelEditor editor, EStructuralFeature feature) {
 		super(editingDomain);
 		this.editor = editor;
+		this.feature = feature;
 	}
 
 	@Override
@@ -97,7 +101,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
 		
-		IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID);
+		IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
 		viewer.setLabelProvider(new ObservableColumnLabelProvider<MMenu>(valProp.observeDetail(cp.getKnownElements())));
 		
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -130,8 +134,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				MMenu handler = MApplicationFactory.eINSTANCE.createMenu();
-				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.PART__MENUS, handler);
+				MMenu handler = MMenuFactory.INSTANCE.createMenu();
+				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), feature, handler);
 
 				if (cmd.canExecute()) {
 					getEditingDomain().getCommandStack().execute(cmd);
@@ -149,7 +153,7 @@ public void widgetSelected(SelectionEvent e) {
 			public void widgetSelected(SelectionEvent e) {
 				if (!viewer.getSelection().isEmpty()) {
 					List<?> windows = ((IStructuredSelection) viewer.getSelection()).toList();
-					Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.PART__MENUS, windows);
+					Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART__MENUS, windows);
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java
index 56599325fc..4387053f7b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.List;
@@ -8,11 +18,12 @@
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MBindingTable;
-import org.eclipse.e4.ui.model.application.MHandler;
-import org.eclipse.e4.ui.model.application.MKeyBinding;
+import org.eclipse.e4.ui.model.application.commands.MBindingTable;
+import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -101,7 +112,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			viewer.getTable().setHeaderVisible(true);
 
 			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.KEY_SEQUENCE__KEY_SEQUENCE);
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_SEQUENCE__KEY_SEQUENCE);
 
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("KeySequence");
@@ -110,7 +121,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			}
 
 			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MApplicationPackage.Literals.KEY_BINDING__COMMAND, MApplicationPackage.Literals.COMMAND__COMMAND_NAME));
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(CommandsPackageImpl.Literals.KEY_BINDING__COMMAND, CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME));
 
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Command");
@@ -119,7 +130,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			}
 
 			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.APPLICATION_ELEMENT__ID);
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
 
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Id");
@@ -150,7 +161,7 @@ public void widgetSelected(SelectionEvent e) {
 							MBindingTable container = (MBindingTable) getMaster().getValue();
 							int idx = container.getBindings().indexOf(obj) - 1;
 							if( idx >= 0 ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.MODEL_COMPONENT__BINDINGS, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__BINDINGS, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -177,7 +188,7 @@ public void widgetSelected(SelectionEvent e) {
 							MBindingTable container = (MBindingTable) getMaster().getValue();
 							int idx = container.getBindings().indexOf(obj) + 1;
 							if( idx < container.getBindings().size() ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.MODEL_COMPONENT__BINDINGS, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__BINDINGS, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -197,9 +208,9 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MKeyBinding handler = MApplicationFactory.eINSTANCE.createKeyBinding();
+					MKeyBinding handler = MCommandsFactory.INSTANCE.createKeyBinding();
 					System.err.println(getMaster().getValue());
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.MODEL_COMPONENT__BINDINGS, handler);
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__BINDINGS, handler);
 
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
@@ -217,7 +228,7 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					if( ! viewer.getSelection().isEmpty() ) {
 						List<?> keybinding = ((IStructuredSelection)viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.MODEL_COMPONENT__BINDINGS, keybinding);
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__BINDINGS, keybinding);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index 47fcb534a5..a7a67a9fbb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -18,11 +18,12 @@
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MHandler;
-import org.eclipse.e4.ui.model.application.MPartDescriptor;
-import org.eclipse.e4.ui.model.application.MPartDescriptorContainer;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MBasicFactory;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorContainer;
+import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
@@ -109,7 +110,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			viewer.getTable().setHeaderVisible(true);
 
 			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL);
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL);
 					
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Name");
@@ -118,7 +119,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			}
 			
 			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.PART_DESCRIPTOR__CATEGORY);
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CATEGORY);
 					
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Category");
@@ -149,7 +150,7 @@ public void widgetSelected(SelectionEvent e) {
 							MPartDescriptorContainer container = (MPartDescriptorContainer) getMaster().getValue();
 							int idx = container.getDescriptors().indexOf(obj) - 1;
 							if( idx >= 0 ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -176,7 +177,7 @@ public void widgetSelected(SelectionEvent e) {
 							MPartDescriptorContainer container = (MPartDescriptorContainer) getMaster().getValue();
 							int idx = container.getDescriptors().indexOf(obj) + 1;
 							if( idx < container.getDescriptors().size() ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -196,8 +197,8 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MPartDescriptor command = MApplicationFactory.eINSTANCE.createPartDescriptor();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, command);
+					MPartDescriptor command = MBasicFactory.INSTANCE.createPartDescriptor();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, command);
 					
 					if( cmd.canExecute() ) {
 						getEditingDomain().getCommandStack().execute(cmd);
@@ -215,7 +216,7 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					if( ! viewer.getSelection().isEmpty() ) {
 						List<?> commands = ((IStructuredSelection)viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, commands);
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, commands);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
similarity index 86%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java
rename to bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index e7840fbdbc..f7d3baed80 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -18,15 +18,17 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -49,13 +51,13 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 
-public class VControlEditor extends AbstractComponentEditor {
+public class VWindowControlEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
 	private TableViewer viewer;
 
-	public VControlEditor(EditingDomain editingDomain, ModelEditor editor) {
+	public VWindowControlEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
 		this.editor = editor;
 	}
@@ -112,7 +114,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			viewer.getControl().setLayoutData(gd);
 
 			
-			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN);
+			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 			
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -138,7 +140,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
 							if( idx >= 0 ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -165,7 +167,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
 							if( idx < container.getChildren().size() ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
 								
 								if( cmd.canExecute() ) {
 									getEditingDomain().getCommandStack().execute(cmd);
@@ -189,12 +191,13 @@ public String getText(Object element) {
 				}
 			});
 			childrenDropDown.setInput(new EClass[] {
-					MApplicationPackage.Literals.PERSPECTIVE_STACK,
-					MApplicationPackage.Literals.PART_SASH_CONTAINER,
-					MApplicationPackage.Literals.PART_STACK,
-					MApplicationPackage.Literals.PART
+					AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
+					BasicPackageImpl.Literals.PART_SASH_CONTAINER,
+					BasicPackageImpl.Literals.PART_STACK,
+					BasicPackageImpl.Literals.PART,
+					BasicPackageImpl.Literals.INPUT_PART
 			});
-			childrenDropDown.setSelection(new StructuredSelection(MApplicationPackage.Literals.PERSPECTIVE_STACK));
+			childrenDropDown.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK));
 			
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
@@ -204,9 +207,10 @@ public String getText(Object element) {
 				public void widgetSelected(SelectionEvent e) {
 					if( ! childrenDropDown.getSelection().isEmpty() ) {
 						EClass eClass = (EClass) ((IStructuredSelection)childrenDropDown.getSelection()).getFirstElement();
-						EObject eObject = MApplicationFactory.eINSTANCE.create(eClass);
 						
-						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+						EObject eObject = EcoreUtil.create(eClass);
+						
+						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 						
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
@@ -226,7 +230,7 @@ public void widgetSelected(SelectionEvent e) {
 					if( ! viewer.getSelection().isEmpty() ) {
 						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
 						
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 8dec90f559..ac1aedea96 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -18,20 +18,27 @@
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MElementContainer;
-import org.eclipse.e4.ui.model.application.MWindow;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
@@ -107,7 +114,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		viewer.getTable().setHeaderVisible(true);
 
 		{
-			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.UI_LABEL__LABEL);
+			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL);
 
 			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 			column.getColumn().setText("Name");
@@ -116,7 +123,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		{
-			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__X);
+			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__X);
 
 			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 			column.getColumn().setText("X");
@@ -125,7 +132,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		{
-			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__Y);
+			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__Y);
 
 			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 			column.getColumn().setText("Y");
@@ -134,7 +141,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		{
-			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__WIDTH);
+			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__WIDTH);
 
 			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 			column.getColumn().setText("Width");
@@ -143,7 +150,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		{
-			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), MApplicationPackage.Literals.WINDOW__HEIGHT);
+			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__HEIGHT);
 
 			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 			column.getColumn().setText("Height");
@@ -153,7 +160,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		GridLayout gl = new GridLayout();
+		GridLayout gl = new GridLayout(2,false);
 		gl.marginLeft = 0;
 		gl.marginRight = 0;
 		gl.marginWidth = 0;
@@ -161,9 +168,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		buttonComp.setLayout(gl);
 
 		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		
 		b.setText("Up");
 		b.setImage(getImage(b.getDisplay(), ARROW_UP));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -174,7 +182,7 @@ public void widgetSelected(SelectionEvent e) {
 						MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 						int idx = container.getChildren().indexOf(obj) - 1;
 						if( idx >= 0 ) {
-							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
 							
 							if( cmd.canExecute() ) {
 								getEditingDomain().getCommandStack().execute(cmd);
@@ -190,7 +198,7 @@ public void widgetSelected(SelectionEvent e) {
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText("Down");
 		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -201,7 +209,7 @@ public void widgetSelected(SelectionEvent e) {
 						MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 						int idx = container.getChildren().indexOf(obj) + 1;
 						if( idx < container.getChildren().size() ) {
-							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
 							
 							if( cmd.canExecute() ) {
 								getEditingDomain().getCommandStack().execute(cmd);
@@ -214,15 +222,30 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
+		final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+		childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		childrenDropDown.setContentProvider(new ArrayContentProvider());
+		childrenDropDown.setLabelProvider(new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				EClass eclass = (EClass) element;
+				return eclass.getName();
+			}
+		});
+		childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.WINDOW, BasicPackageImpl.Literals.TRIMMED_WINDOW });
+		childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.WINDOW));
+		
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText("Add ...");
 		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				MWindow handler = MApplicationFactory.eINSTANCE.createWindow();
-				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+				EClass eClass = (EClass) ((IStructuredSelection)childrenDropDown.getSelection()).getFirstElement();
+				EObject handler = EcoreUtil.create(eClass);
+				
+				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
 
 				if (cmd.canExecute()) {
 					getEditingDomain().getCommandStack().execute(cmd);
@@ -234,14 +257,14 @@ public void widgetSelected(SelectionEvent e) {
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText("Remove");
 		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (!viewer.getSelection().isEmpty()) {
 					List<?> windows = ((IStructuredSelection) viewer.getSelection()).toList();
 					MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-					Command cmd = RemoveCommand.create(getEditingDomain(), container, MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, windows);
+					Command cmd = RemoveCommand.create(getEditingDomain(), container, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, windows);
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 						if( container.getChildren().size() > 0 ) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index edb5656cd7..9097a8ab44 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -18,9 +18,9 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MApplicationPackage;
-import org.eclipse.e4.ui.model.application.MWindowTrim;
+import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.command.AddCommand;
@@ -118,8 +118,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MWindowTrim handler = MApplicationFactory.eINSTANCE.createWindowTrim();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+					MTrimBar handler = MBasicFactory.INSTANCE.createTrimBar();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS, handler);
 					
 					if( cmd.canExecute() ) {
 						getEditingDomain().getCommandStack().execute(cmd);
@@ -137,7 +137,7 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					if( ! viewer.getSelection().isEmpty() ) {
 						List<?> trimElements = ((IStructuredSelection)viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MApplicationPackage.Literals.ELEMENT_CONTAINER__CHILDREN, trimElements);
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS, trimElements);
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}

From 107aebbdac139fc0e711aeed3f6eb813685149eb Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 19 Apr 2010 13:44:57 +0000
Subject: [PATCH 0078/1286] [Bug 309616] -  [UI][ModelEditor] No support for
 the new 'Addons' attribute in the editors

---
 .../e4/tools/emf/ui/internal/Messages.java    |  14 +-
 .../tools/emf/ui/internal/Messages.properties |   7 +-
 .../emf/ui/internal/common/ModelEditor.java   |   8 +-
 .../common/component/AddonsEditor.java        | 119 ++++++++++
 .../common/component/ApplicationEditor.java   |  10 +
 .../component/virtual/VApplicationAddons.java | 213 ++++++++++++++++++
 6 files changed, 359 insertions(+), 12 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index d1602bed87..a0e5788cf6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -22,6 +22,7 @@ public class Messages {
 	public static String ApplicationEditor_BindingTables;
 	public static String ApplicationEditor_Commands;
 	public static String ApplicationEditor_Windows;
+	public static String ApplicationEditor_Addons;
 
 	public static String BindingTableEditor_Label;
 	public static String BindingTableEditor_Description;
@@ -293,16 +294,9 @@ public class Messages {
 	public static String VBindingTableEditor_Add;
 	public static String VBindingTableEditor_Remove;
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+	public static String AddonsEditor_Id;
+	public static String AddonsEditor_ClassURI;
+	public static String AddonsEditor_Find;
 	
 	
 	static {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 290dd336c7..025e972b3b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -16,6 +16,7 @@ ApplicationEditor_PartDescriptors=Part Descriptors
 ApplicationEditor_BindingTables=BindingTables
 ApplicationEditor_Commands=Commands
 ApplicationEditor_Windows=Windows
+ApplicationEditor_Addons=Addons
 
 BindingTableEditor_Label=BindingTable
 BindingTableEditor_Description=BindingTable bla bla bla
@@ -285,4 +286,8 @@ VBindingTableEditor_Id=Id
 VBindingTableEditor_Up=Up
 VBindingTableEditor_Down=Down
 VBindingTableEditor_Add=Add ...
-VBindingTableEditor_Remove=Remove
\ No newline at end of file
+VBindingTableEditor_Remove=Remove
+
+AddonsEditor_Id=Id
+AddonsEditor_ClassURI=Class URI
+AddonsEditor_Find=Find ...
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index eef4517ecc..7c4c854e7f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -30,6 +30,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.AddonsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ApplicationEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.BindingTableEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectMenuItemEditor;
@@ -57,6 +58,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.TrimBarEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.TrimmedWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationAddons;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VBindingTableEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VCommandEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowControlEditor;
@@ -110,6 +112,7 @@ public class ModelEditor {
 	public static final int VIRTUAL_MODEL_COMP_BINDINGS = 9;
 	public static final int VIRTUAL_PARTDESCRIPTOR_MENU = 10;
 	public static final int VIRTUAL_TRIMMED_WINDOW_TRIMS = 11;
+	public static final int VIRTUAL_ADDONS = 12;
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private AbstractComponentEditor[] virtualEditors;
@@ -283,7 +286,8 @@ private void registerVirtualEditors() {
 				new VCommandEditor(modelProvider.getEditingDomain(), this, ApplicationPackageImpl.Literals.MODEL_COMPONENT__COMMANDS),
 				new VModelComponentBindingEditor(modelProvider.getEditingDomain(), this),
 				new VMenuEditor(modelProvider.getEditingDomain(), this, org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS),
-				new VWindowTrimEditor(modelProvider.getEditingDomain(), this)
+				new VWindowTrimEditor(modelProvider.getEditingDomain(), this),
+				new VApplicationAddons(modelProvider.getEditingDomain(), this)
 		};
 	}
 
@@ -295,6 +299,8 @@ private void registerDefaultEditors() {
 		registerEditor(ApplicationPackageImpl.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain()));
 		registerEditor(ApplicationPackageImpl.Literals.MODEL_COMPONENTS, new ModelComponentsEditor(modelProvider.getEditingDomain(),this));
 		registerEditor(ApplicationPackageImpl.Literals.MODEL_COMPONENT, new ModelComponentEditor(modelProvider.getEditingDomain()));
+		registerEditor(ApplicationPackageImpl.Literals.ADDON, new AddonsEditor(modelProvider.getEditingDomain(),project));
+		
 		
 		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain(),modelProvider));
 		registerEditor(CommandsPackageImpl.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(),modelProvider,project));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
new file mode 100644
index 0000000000..990de1fd77
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -0,0 +1,119 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
+import org.eclipse.e4.ui.model.application.MContribution;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class AddonsEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private IProject project;
+	
+	public AddonsEditor(EditingDomain editingDomain, IProject project) {
+		super(editingDomain);
+		this.project = project;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Addon";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		MContribution contrib = (MContribution) element;
+		if( contrib.getContributionURI() != null && contrib.getContributionURI().trim().length() > 0 ) {
+			return contrib.getContributionURI().substring(contrib.getContributionURI().lastIndexOf('/')+1);
+		}
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Addon Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context); 
+		} 
+		getMaster().setValue(object);
+		return composite;
+	}
+	
+	protected Composite createForm(Composite parent, EMFDataBindingContext context) {
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.AddonsEditor_Id);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+		}
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.AddonsEditor_ClassURI);
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()));
+
+			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setText(Messages.AddonsEditor_Find);
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue());
+					dialog.open();
+				}
+			});
+		}
+		
+//		ControlFactory.createBindingsWidget(parent, this);
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index a63049b7ef..01dddf7515 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -50,6 +50,7 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private IListProperty APPLICATION__COMMANDS = EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__COMMANDS);
 	private IListProperty PART_DESCRIPTOR_CONTAINER__DESCRIPTORS = EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS);
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private IListProperty APPLICATION__ADDONS = EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__ADDONS);
 
 	public ApplicationEditor(EditingDomain editingDomain) {
 		super(editingDomain);
@@ -114,6 +115,15 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 	@Override
 	public IObservableList getChildList(Object element) {
 		WritableList list = new WritableList();
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_ADDONS, APPLICATION__ADDONS, element, Messages.ApplicationEditor_Addons) {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+		
 		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.ApplicationEditor_Handlers) {
 
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
new file mode 100644
index 0000000000..1dcc077c47
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -0,0 +1,213 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MAddon;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VApplicationAddons extends AbstractComponentEditor {
+	private Composite composite;
+	private ModelEditor editor;
+	private TableViewer viewer;
+	private EMFDataBindingContext context;
+	
+	public VApplicationAddons(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Addons";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Addons bla bla bla bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+	
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+		
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Commands");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.getTable().setHeaderVisible(true);
+			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+						
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MApplication container = (MApplication) getMaster().getValue();
+							int idx = container.getCommands().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__ADDONS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MApplication container = (MApplication) getMaster().getValue();
+							int idx = container.getCommands().indexOf(obj) + 1;
+							if( idx < container.getCommands().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__ADDONS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MAddon command = MApplicationFactory.INSTANCE.createAddon();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__ADDONS, command);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(command);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> commands = ((IStructuredSelection)viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__ADDONS, commands);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+		
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}

From b725f38c21ac81738ffcc199cd1bc152de56077d Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 19 Apr 2010 14:25:27 +0000
Subject: [PATCH 0079/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * added new icon for addons

---
 .../icons/full/modelelements/Addons.png         | Bin 0 -> 859 bytes
 .../internal/common/component/AddonsEditor.java |  16 +++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png
new file mode 100644
index 0000000000000000000000000000000000000000..3262767cda95a217ac8d3fabf6c4bfe3514fd770
GIT binary patch
literal 859
zcmV-h1El<kP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!?MXyIR5;6R
zQ|(JraTGrHHYa*Vx;5Q=X=BBpC1l7x6fBU){s5tGLXdtQ)(0U+eGrra@gEp|+7N`<
zKagatHD8+5#IiATIkm>-)HU~Z@BQ7|ITsWqFPt%czw<ojd7g7Gr>ZJk^u%JZL0Ogu
z7-JwwQn0tTclx3}?kvID+L{XidsxQ^&e&|W7P?<rTFNyxHd^t_fMgy0{rwv!82${{
zkHB?oN??-(i`8m1pwjF0jLt++Okk}CgF*i}f_Oac69i$%ZnyJBqmd>hu`JbU6)Keq
zD2hUaNxZkB72a$%4^2)^`UtC|A7te-nGAX1Xrjep5qO>_@7ffX%SGn`-ED7gLpU5(
zk(@u5K{Og2Z)$29rKuELp-_NyIt_Job>MI~K&R7bgynLX>`sh~jA#lt3}_YQwqglZ
ztJPR4mEiF3kO&v?|I7ONdO%xaZnyg`4MVH2u&{85WF^F8xkx0!oK7d7&*!07ENT-s
zHZ~xYO7;1CzImGB_xm6GXq<Ulk_zys<24uz2C@lLQ&S30vd9~<Y0_y5HK3i-^-@n&
z7NOJZg6S<UWd@{_>~MiVV0C|gzZGQ)-QC?rN*&h*fy7fxUu2>pgCsM)-Q?tMb$Vds
z*E@*sEW?$R-d!Zlo`yI#H#gqa);3B?D6pBWXVBO67?`R6Qy3_qLZ+|_MxhlJx8`9r
z{Xs@mdTouNQ0N7+J#TJqhNGh+O#w+J@OC~45~`3D2_z=L-&zrFU%dy%Qdzg0ic~cM
z%s{~na19L&^isj*=4PpCtqL-e!E)J#V5X7%DWt(<u)>#}Pq3W$oGSy^Pc4j%jrk7_
z4xV5*S(C}slXQfB*Dx$m5ut)=uA6Vdoof#vmX1Pr{o_H2ueAT3P;2Ktrs3gX7h2gv
zE62G1jK||?p|odbXLH|f%y4eoeRKHd`|tRw^&nXM?`u5!c)i}iTrM|2E9N*Z__gcJ
lE2dmBR}@y4olxbIzJJd{=EC=vF*^VN002ovPDHLkV1lGDi4On(

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 990de1fd77..83f5f00e0f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -1,5 +1,8 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -28,6 +31,7 @@ public class AddonsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private IProject project;
+	private Image image;
 	
 	public AddonsEditor(EditingDomain editingDomain, IProject project) {
 		super(editingDomain);
@@ -36,7 +40,17 @@ public AddonsEditor(EditingDomain editingDomain, IProject project) {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		return null;
+		if( image == null ) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png")); //$NON-NLS-1$
+//				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Addons.gif")); //$NON-NLS-1$
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
 	}
 
 	@Override

From 567ff032ee7dd36e7442e5b9d1d8a3b135a2b68a Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 19 Apr 2010 14:32:21 +0000
Subject: [PATCH 0080/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * added new icon for addons

---
 .../icons/full/modelelements/Application.png      | Bin 0 -> 465 bytes
 .../icons/full/modelelements/ModelComponent.png   | Bin 0 -> 591 bytes
 .../common/component/ApplicationEditor.java       |   3 ++-
 .../common/component/ModelComponentEditor.java    |   3 ++-
 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelComponent.png

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bc0bd32fceb21d70368f7842a00a53d6369ba48
GIT binary patch
literal 465
zcmV;?0WSWDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzV@X6oR5;6}
zlif?gU=+sv7bPi)=!3$7q?JQqQvwMoh(bhK+J{k6%rsgQVNn!z(HBXQkd^mAH(hwA
z^Yotc=4S08nh!j@F!ub;!`WU30603a!#SmnFKE?TaOVx=ZRYd~NSn_P*eHX4{Rzai
z68Mrum`pr?uyhCB_zlR(s~YAA5Xn~cSpFUUYax26696aMv1k4Q2q33l!H$M!&p1HZ
zs?dXQ!8A(HJcd!rMboIk$jLW=EvyAdm3{&e#VDQ4W|M-siV5fsA9Db1`>zJNu3H-P
zO&@UpeyZQXi7jKe-Hk?r-sue;aDce_XqkvXP+W#F_*ot`jB?BS93Uw71|U^ZjLH<w
zh;-sq3Vy5@0GB_@0Tc0CO9QIe)}UUmTN-qU84mEqu5JAXPM->`yP%FO7U<6!nLCG}
z$SDlW<k^-FX;JQ=20hXqbO&;*_AZ;O0?VLP0(5*EI|Y0J3Jfj)lKW#`00000NkvXX
Hu0mjf{J_IH

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelComponent.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelComponent.png
new file mode 100644
index 0000000000000000000000000000000000000000..6187b15aec001b7080b51a5f944f07591f26cc15
GIT binary patch
literal 591
zcmV-V0<iswP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz;Ymb6R5;6}
zl08V3aTLaXuVw{)TtAV-EQp(VZ&;&yOGCA^HyY7UV+BnWv^BakMQc+OB&0Z27AkkL
zxPppG-9jbH?t7kd8eTEus*7hi@aLT8f1cktNknjvIJDd2gQ>eEcNHZMNv|IbJ-M`(
zKwWL~opzjJe^WpCmV9E;(0&ut2;4va_(#>M8)>9$R5viQnf(Nkh~VM$y>J(jqb$cj
z+nL1Nm|mV)Gm|9MnHf*7Ja4OEAQz__^LRKOLEwqpiGV^^A*T=#&inGm-62Xs;dnSp
zKj&H9T*boh2<no0+=ElOJZ83sfQeG2L`y@C?#3Rz{i>i)W+(n27l!C)>fq|L%VB1i
ziC4p;NwV_}ZjW7$LRW#(_bKF#hp=!IqNO26Z*w2+LEwx{PVnZ&Sn}T;m<fe2Wm#Lz
za$)sCo<WYS+HDKB-VTSEXg%7B+({$Nn7A;{*z`8{F+2a6g_Xssq{Gq<0W(qT9zX<h
z>tzb<gWDVNaLQ|6kUI-2i;UhJKT-oRHNy~7Uq5lS^Bm=sIhHERNTM^>$;qA*nT@@+
zV5uQ@iXDTPoTbV#FRr~z04|PPh`wXTNoCm9*tG&?e3+fYl>K6+&3|Cc$KOpL`ER+_
dcRl5U#9zn6ZO}GF<yZg!002ovPDHLkV1oCe4!{5a

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 01dddf7515..b5eb34ffc8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -60,7 +60,8 @@ public ApplicationEditor(EditingDomain editingDomain) {
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Application.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png")); //$NON-NLS-1$
+//				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Application.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index f527de9db4..003c7e8c39 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -162,7 +162,8 @@ private Composite createForm(Composite parent) {
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ModelComponent.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelComponent.png")); //$NON-NLS-1$
+//				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ModelComponent.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();

From d68c17660e75f10d55fcc2cf86b447892cae704a Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 20 Apr 2010 20:10:15 +0000
Subject: [PATCH 0081/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * remove unneeded text

---
 .../emf/ui/internal/common/component/virtual/VWindowEditor.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index ac1aedea96..065e0bbb8b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -236,7 +236,6 @@ public String getText(Object element) {
 		childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.WINDOW));
 		
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Add ...");
 		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 		b.addSelectionListener(new SelectionAdapter() {

From 67b33952339f41936f4cce53ebbe389c59e0a1a7 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 20 Apr 2010 20:51:41 +0000
Subject: [PATCH 0082/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * adding support for context menus * implemented main
 menu creation

---
 .../component/AbstractComponentEditor.java    |  7 +++
 .../e4/tools/emf/ui/internal/Messages.java    |  2 +
 .../tools/emf/ui/internal/Messages.properties |  1 +
 .../emf/ui/internal/common/ModelEditor.java   | 33 ++++++++++++
 .../internal/common/component/MenuEditor.java | 52 ++++++++++++++++---
 .../common/component/WindowEditor.java        | 32 ++++++++++++
 .../component/virtual/VApplicationAddons.java |  8 ---
 7 files changed, 120 insertions(+), 15 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index c9a5e8dc88..0b0a6b8e95 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -13,7 +13,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -21,6 +23,7 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -101,4 +104,8 @@ protected Image loadSharedImage(Display d, URL path) {
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] {};
 	}
+	
+	public List<Action> getActions(Object element) {
+		return Collections.emptyList();
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index a0e5788cf6..4a68831757 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -144,6 +144,7 @@ public class Messages {
 	public static String MenuItemEditor_Tooltip;
 	public static String MenuItemEditor_IconURI;
 	public static String MenuItemEditor_Find;
+	public static String MenuEditor_MainMenu;
 	
 	public static String MenuSeparatorEditor_Label;
 	public static String MenuSeparatorEditor_Id;
@@ -299,6 +300,7 @@ public class Messages {
 	public static String AddonsEditor_Find;
 	
 	
+	
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 025e972b3b..3aab827a7b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -130,6 +130,7 @@ MenuEditor_DirectMenuItem=Direct MenuItem
 MenuEditor_LabelLabel=Label
 MenuEditor_Tooltip=Tooltip
 MenuEditor_IconURI=Icon URI
+MenuEditor_MainMenu=Main Menu
 
 MenuItemEditor_Id=Id
 MenuItemEditor_Type=Type
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 7c4c854e7f..ba9cf65bdd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -11,6 +11,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -77,6 +78,10 @@
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.databinding.viewers.ObservableListTreeContentProvider;
 import org.eclipse.jface.databinding.viewers.TreeStructureAdvisor;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -222,6 +227,34 @@ public void selectionChanged(SelectionChangedEvent event) {
 
 		form.setWeights(new int[] { 1, 2 });
 		viewer.setSelection(new StructuredSelection(modelProvider.getRoot()));
+		
+		MenuManager mgr = new MenuManager();
+		mgr.setRemoveAllWhenShown(true);
+		mgr.addMenuListener(new IMenuListener() {
+			
+			public void menuAboutToShow(IMenuManager manager) {
+				IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+				if( ! s.isEmpty() ) {
+					List<Action> actions;
+					if( s.getFirstElement() instanceof VirtualEntry<?> ) {
+						actions = virtualEditors[((VirtualEntry<?>)s.getFirstElement()).getId()].getActions(s.getFirstElement());
+					} else {
+						EObject o = (EObject) s.getFirstElement();
+						AbstractComponentEditor editor = editorMap.get(o.eClass());
+						if( editor != null ) {
+							actions = editor.getActions(s.getFirstElement());
+						} else {
+							actions = Collections.emptyList();
+						}
+					}
+					
+					for( Action a : actions ) {
+						manager.add(a);
+					}
+				}
+			}
+		});
+		viewer.getControl().setMenu(mgr.createContextMenu(viewer.getControl()));
 	}
 
 	private TreeViewer createTreeViewerArea(Composite parent) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 35f3aff47e..aae3288881 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -25,7 +25,9 @@
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -35,6 +37,7 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
@@ -51,6 +54,7 @@
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -58,6 +62,7 @@
 import org.eclipse.swt.layout.GridLayout;
 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.Text;
@@ -70,6 +75,7 @@ public class MenuEditor extends AbstractComponentEditor {
 	private ModelEditor editor;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private StackLayout stackLayout;
 
 	private class Struct {
 		private final String label;
@@ -102,11 +108,6 @@ public Image getImage(Object element, Display display) {
 		return image;
 	}
 
-	@Override
-	public String getLabel(Object element) {
-		return Messages.MenuEditor_Label;
-	}
-
 	@Override
 	public String getDescription(Object element) {
 		return Messages.MenuEditor_Description;
@@ -116,13 +117,31 @@ public String getDescription(Object element) {
 	public Composite getEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent, context, getMaster());
+			composite = new Composite(parent, SWT.NONE);
+			stackLayout = new StackLayout();
+			composite.setLayout(stackLayout);
+			
+			createForm(composite, context, getMaster(),false);
+			createForm(composite, context, getMaster(),true);
+		}
+		EObject o = (EObject) object;
+		Control topControl;
+		if( o.eContainer() instanceof MWindow ) {
+			topControl = composite.getChildren()[1];
+		} else {
+			topControl = composite.getChildren()[0];
+		}
+		
+		if( stackLayout.topControl != topControl ) {
+			stackLayout.topControl = topControl;
+			composite.layout(true, true);
 		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean rootMenu) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
@@ -141,6 +160,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		// ------------------------------------------------------------
+		if( ! rootMenu )
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuEditor_LabelLabel);
@@ -153,6 +173,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		// ------------------------------------------------------------
+		if( ! rootMenu )
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuEditor_Tooltip);
@@ -165,6 +186,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		// ------------------------------------------------------------
+		if( ! rootMenu )
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuEditor_IconURI);
@@ -341,8 +363,24 @@ public IObservableList getChildList(Object element) {
 		return ELEMENT_CONTAINER__CHILDREN.observe(element);
 	}
 
+	@Override
+	public String getLabel(Object element) {
+		MMenu menu = (MMenu) element;
+		if( menu.getParent() == null ) {
+			EObject o = (EObject) element;
+			if( o.eContainer() instanceof MWindow ) {
+				return Messages.MenuEditor_MainMenu;
+			}
+		}
+		return Messages.MenuEditor_Label;
+	}
+	
 	@Override
 	public String getDetailLabel(Object element) {
+		MMenu menu = (MMenu) element;
+		if( menu.getLabel() != null && menu.getLabel().trim().length() > 0 ) {
+			return menu.getLabel();
+		}
 		return null;
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index e2d17d25b3..252a1a797b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -12,6 +12,8 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
@@ -25,14 +27,20 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -56,8 +64,20 @@ public class WindowEditor extends AbstractComponentEditor {
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private IValueProperty WINDOW__MAIN_MENU = EMFProperties.value(BasicPackageImpl.Literals.WINDOW__MAIN_MENU);
 
+	private Action addMainMenu; 
+	
 	public WindowEditor(EditingDomain editingDomain) {
 		super(editingDomain);
+		addMainMenu = new Action("Add Main Menu") {
+			@Override
+			public void run() {
+				MMenu menu = MMenuFactory.INSTANCE.createMenu();
+				Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__MAIN_MENU, menu);
+				if( cmd.canExecute() ) {
+					getEditingDomain().getCommandStack().execute(cmd);
+				}
+			}
+		};
 	}
 
 	@Override
@@ -272,4 +292,16 @@ public FeaturePath[] getLabelProperties() {
 			FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL)	
 		};
 	}
+	
+	@Override
+	public List<Action> getActions(Object element) {
+		List<Action> actions = new ArrayList<Action>();
+		
+		MWindow window = (MWindow) element;
+		if( window.getMainMenu() == null ) {
+			actions.add(addMainMenu);
+		}
+		
+		return actions;
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index 1dcc077c47..36dcf7ba58 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -5,22 +5,15 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MAddon;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.commands.MCommand;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
-import org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl;
-import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -29,7 +22,6 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;

From abf7dc10d0f167417169e806f89f0471fe69d631 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 21 Apr 2010 14:28:36 +0000
Subject: [PATCH 0083/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * minor problems found by findbugs

---
 .../emf/ui/internal/common/component/ControlFactory.java      | 2 +-
 .../e4/tools/emf/ui/internal/common/component/MenuEditor.java | 2 +-
 .../ui/internal/common/component/ModelComponentEditor.java    | 2 +-
 .../tools/emf/ui/internal/common/component/ToolBarEditor.java | 2 +-
 .../component/dialogs/AbstractCommandSelectionDialog.java     | 4 ++--
 .../common/component/dialogs/ContributionClassDialog.java     | 4 ++--
 .../common/component/virtual/VBindingTableEditor.java         | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index b918e975c4..688533ee26 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -197,7 +197,7 @@ public void widgetSelected(SelectionEvent e) {
 		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 
-		l = new Label(parent, SWT.NONE);
+		new Label(parent, SWT.NONE);
 		final TableViewer viewer = new TableViewer(parent);
 		viewer.setContentProvider(new ObservableListContentProvider());
 		viewer.setLabelProvider(new LabelProvider() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index aae3288881..08ecef1684 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -77,7 +77,7 @@ public class MenuEditor extends AbstractComponentEditor {
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 
-	private class Struct {
+	private static class Struct {
 		private final String label;
 		private final EClass eClass;
 		private final boolean separator;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index 003c7e8c39..b0667831ad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -148,7 +148,7 @@ private Composite createForm(Composite parent) {
 		gd.horizontalSpan=2;
 		t.setLayoutData(gd);
 
-		l = new Label(parent, SWT.NONE);
+		new Label(parent, SWT.NONE);
 		ListViewer viewer = new ListViewer(parent);
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan=2;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 0574facaad..61c8f198ee 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -71,7 +71,7 @@ public class ToolBarEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
-	private class Struct {
+	private static class Struct {
 		private final String label;
 		private final EClass eClass;
 		private final boolean separator;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index 87a3710792..d81e922808 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -75,7 +75,7 @@ protected Control createDialogArea(Composite parent) {
 		Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
-		l = new Label(container, SWT.NONE);
+		new Label(container, SWT.NONE);
 		viewer = new TableViewer(container);
 		viewer.setContentProvider(new ArrayContentProvider());
 		viewer.setLabelProvider(new LabelProviderImpl());
@@ -132,7 +132,7 @@ protected void okPressed() {
 	
 	protected abstract Command createStoreCommand( EditingDomain editingDomain, MCommand command);
 	
-	private class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
+	private static class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
 		
 		public void update(final ViewerCell cell) {
 			MCommand cmd = (MCommand) cell.getElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index e0fd19c8ad..6406389b36 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -90,7 +90,7 @@ public void widgetDisposed(DisposeEvent e) {
 		final Text t = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		
-		l = new Label(container,SWT.NONE);
+		new Label(container,SWT.NONE);
 		
 		viewer = new TableViewer(container);
 		GridData gd = new GridData(GridData.FILL_BOTH);
@@ -173,7 +173,7 @@ private ClassContributionCollector getCollector() {
 		return null;
 	}
 	
-	private class ContributionResultHandlerImpl implements ContributionResultHandler {
+	private static class ContributionResultHandlerImpl implements ContributionResultHandler {
 		private boolean cancled = false;
 		private IObservableList list;
 		
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index fd90c78309..072385c276 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -478,7 +478,7 @@ public IObservableList getChildList(Object element) {
 		return null;
 	}
 
-	private class ObservableFactoryImpl implements IObservableFactory {
+	private static class ObservableFactoryImpl implements IObservableFactory {
 		private IEMFListProperty prop = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
 		
 		public IObservable createObservable(Object target) {
@@ -489,7 +489,7 @@ public IObservable createObservable(Object target) {
 		}
 	}
 	
-	private class TreeStructureAdvisorImpl extends TreeStructureAdvisor {
+	private static class TreeStructureAdvisorImpl extends TreeStructureAdvisor {
 		
 	}
 }

From 04cce4137a103e59af8899cc517c34a826514a5d Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 21 Apr 2010 14:44:28 +0000
Subject: [PATCH 0084/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * some NLS stuff

---
 .../e4/tools/emf/ui/internal/Messages.java    |  8 ++++++--
 .../tools/emf/ui/internal/Messages.properties |  9 ++++++++-
 .../AbstractCommandSelectionDialog.java       | 13 +++++++------
 .../dialogs/ContributionClassDialog.java      | 19 ++++++++++---------
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 4a68831757..3d09b37b90 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -13,7 +13,8 @@
 import org.eclipse.osgi.util.NLS;
 
 public class Messages {
-
+	public static String AbstractCommandSelectionDialog_Label_CommandId;
+	
 	public static String ApplicationEditor_Label;
 	public static String ApplicationEditor_Description;
 	public static String ApplicationEditor_Id;
@@ -299,7 +300,10 @@ public class Messages {
 	public static String AddonsEditor_ClassURI;
 	public static String AddonsEditor_Find;
 	
-	
+	public static String ContributionClassDialog_DialogMessage;
+	public static String ContributionClassDialog_DialogTitle;
+	public static String ContributionClassDialog_Label_Classname;
+	public static String ContributionClassDialog_ShellTitle;	
 	
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 3aab827a7b..ebdb796cab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -8,6 +8,8 @@
 # * Contributors:
 # *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
 # ******************************************************************************
+AbstractCommandSelectionDialog_Label_CommandId=Command-Id
+
 ApplicationEditor_Label=Application
 ApplicationEditor_Description=Application bla, bla, bla
 ApplicationEditor_Id=Id
@@ -291,4 +293,9 @@ VBindingTableEditor_Remove=Remove
 
 AddonsEditor_Id=Id
 AddonsEditor_ClassURI=Class URI
-AddonsEditor_Find=Find ...
\ No newline at end of file
+AddonsEditor_Find=Find ...
+
+ContributionClassDialog_DialogMessage=Enter the name of the contributing class
+ContributionClassDialog_DialogTitle=Find Contribution Class
+ContributionClassDialog_Label_Classname=Classname
+ContributionClassDialog_ShellTitle=Find Contribution Class
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index d81e922808..b178f7f71b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -14,6 +14,7 @@
 import java.util.List;
 
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MModelComponent;
@@ -70,7 +71,7 @@ protected Control createDialogArea(Composite parent) {
 		container.setLayout(new GridLayout(2, false));
 
 		Label l = new Label(container, SWT.NONE);
-		l.setText("Command-Id");
+		l.setText(Messages.AbstractCommandSelectionDialog_Label_CommandId);
 
 		Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -142,10 +143,10 @@ public void update(final ViewerCell cell) {
 				styledString.append(cmd.getCommandName());
 			}
 			if( cmd.getDescription() != null ) {
-				styledString.append(" - " + cmd.getDescription(),StyledString.DECORATIONS_STYLER);
+				styledString.append(" - " + cmd.getDescription(),StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 			}
 			if( cmd.getElementId() != null ) {
-				styledString.append(" - " + cmd.getElementId(),StyledString.DECORATIONS_STYLER);
+				styledString.append(" - " + cmd.getElementId(),StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 			}
 			cell.setText(styledString.getString());
 			cell.setStyleRanges(styledString.getStyleRanges());
@@ -157,17 +158,17 @@ public Image getImage(Object element) {
 
 		public String getText(Object element) {
 			MCommand command = (MCommand) element;
-			String s = "";
+			String s = ""; //$NON-NLS-1$
 			if( command.getCommandName() != null ) {
 				s += command.getCommandName();
 			}
 			
 			if( command.getDescription() != null ) {
-				s += " " + command.getDescription();
+				s += " " + command.getDescription(); //$NON-NLS-1$
 			}
 			
 			if( command.getElementId() != null ) {
-				s += " " + command.getElementId();
+				s += " " + command.getElementId(); //$NON-NLS-1$
 			}
 			
 			return s;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index 6406389b36..175a546737 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -16,6 +16,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionResultHandler;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -67,9 +68,9 @@ public ContributionClassDialog(Shell parentShell, IProject project, EditingDomai
 	protected Control createDialogArea(Composite parent) {
 		Composite comp = (Composite) super.createDialogArea(parent);
 		
-		getShell().setText("Find Contribution Class");
-		setTitle("Find Contribution Class");
-		setMessage("Enter the name of the contributing class");
+		getShell().setText(Messages.ContributionClassDialog_ShellTitle);
+		setTitle(Messages.ContributionClassDialog_DialogTitle);
+		setMessage(Messages.ContributionClassDialog_DialogMessage);
 		
 		getShell().addDisposeListener(new DisposeListener() {
 			
@@ -78,14 +79,14 @@ public void widgetDisposed(DisposeEvent e) {
 			}
 		});
 		
-		javaClassImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/class_obj.gif"));
+		javaClassImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/class_obj.gif")); //$NON-NLS-1$
 		
 		Composite container = new Composite(comp, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 		container.setLayout(new GridLayout(2,false));
 		
 		Label l = new Label(container, SWT.NONE);
-		l.setText("Classname");
+		l.setText(Messages.ContributionClassDialog_Label_Classname);
 		
 		final Text t = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -103,12 +104,12 @@ public void update(ViewerCell cell) {
 				StyledString styledString = new StyledString(data.className, null);
 				
 				if( data.bundleName != null ) {
-					styledString.append(" - " + data.bundleName, StyledString.DECORATIONS_STYLER);
+					styledString.append(" - " + data.bundleName, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 				}
 				
 				if( data.sourceType != null ) {
-					styledString.append(" - ", StyledString.DECORATIONS_STYLER);
-					styledString.append(data.sourceType + "", StyledString.COUNTER_STYLER);
+					styledString.append(" - ", StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+					styledString.append(data.sourceType + "", StyledString.COUNTER_STYLER); //$NON-NLS-1$
 				}
 				
 				if( data.iconPath == null ) {
@@ -154,7 +155,7 @@ protected void okPressed() {
 		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 		if( ! s.isEmpty() ) {
 			ContributionData cd = (ContributionData) s.getFirstElement();
-			String uri = "platform:/plugin/" + cd.bundleName + "/" + cd.className;
+			String uri = "platform:/plugin/" + cd.bundleName + "/" + cd.className; //$NON-NLS-1$ //$NON-NLS-2$
 			Command cmd = SetCommand.create(editingDomain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, uri);
 			if( cmd.canExecute() ) {
 				editingDomain.getCommandStack().execute(cmd);

From ef4bac865d5405312872e610d87ddcfd8f0e2d45 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 22 Apr 2010 06:43:16 +0000
Subject: [PATCH 0085/1286] [Bug 309593] - [CSS] Think about theme management
 and css contribution

---
 .../.settings/org.eclipse.pde.core.prefs      |  4 ++--
 .../META-INF/MANIFEST.MF                      |  3 ++-
 .../build.properties                          |  3 ++-
 .../css/default.css                           | 22 +++++++++++++++++++
 .../org.eclipse.e4.tools.emf.ui/plugin.xml    | 11 ++++++++++
 5 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/css/default.css
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/plugin.xml

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.core.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.core.prefs
index 81bd2f274f..497f55a69b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.core.prefs
@@ -1,4 +1,4 @@
-#Tue Mar 02 18:39:11 CET 2010
+#Sun Apr 18 16:26:38 CEST 2010
 eclipse.preferences.version=1
-pluginProject.extensions=false
+pluginProject.extensions=true
 resolve.requirebundle=false
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 9d7c30fb81..2a67a7c1ab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -20,7 +20,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  com.ibm.icu;bundle-version="4.2.1",
  org.eclipse.core.resources;bundle-version="3.6.0",
  org.eclipse.e4.core.services;bundle-version="0.9.1",
- org.eclipse.osgi;bundle-version="3.6.0"
+ org.eclipse.osgi;bundle-version="3.6.0",
+ org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.osgi.framework;version="1.5.0"
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/build.properties b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
index d72a1c5dd5..e462e083a9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
@@ -3,7 +3,8 @@ bin.includes = .,\
                plugin.properties,\
                icons/,\
                about.html,\
-               OSGI-INF/contributioncollector.xml
+               OSGI-INF/contributioncollector.xml,\
+               plugin.xml
 output.. = bin/
 jars.compile.order = .
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/css/default.css b/bundles/org.eclipse.e4.tools.emf.ui/css/default.css
new file mode 100644
index 0000000000..751eb8fc18
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/css/default.css
@@ -0,0 +1,22 @@
+.headerSectionContainer {
+	background-color: gradient #575757 #101010 100%;
+}
+
+.sectionHeader {
+	font-weight: bold;
+	font-size: 15pt;
+	color: white;
+}
+
+.subSectionHeader {
+	background-color: gradient #575757 #101010 100%;
+}
+
+
+.contentContainer {
+	background-color: #fff #fff #cccccc 20% 80%;
+}
+
+.formContainer {
+	background-color: #fff;
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml b/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
new file mode 100644
index 0000000000..1b2fb64bfe
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.e4.ui.css.swt.theme">
+      <stylesheet
+            uri="css/default.css">
+      </stylesheet>
+   </extension>
+
+</plugin>

From 78f2263393f8b04244ff5a92573e4597f15dc0ca Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 22 Apr 2010 06:44:19 +0000
Subject: [PATCH 0086/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * fixed findbugs warning


From 6e1db650d5f29e51c784844d59198be89a4a4af1 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 22 Apr 2010 17:55:24 +0000
Subject: [PATCH 0087/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * remove wrong subtypes

---
 .../emf/ui/internal/common/component/PartStackEditor.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 8f6597fcf0..617eb83a32 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -27,6 +27,8 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUiFactory;
+import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -272,8 +274,8 @@ public String getText(Object element) {
 				}
 			});
 			childrenDropDown.setInput(new EClass[] {
-					BasicPackageImpl.Literals.PART_SASH_CONTAINER,
-					BasicPackageImpl.Literals.PART_STACK,
+//					BasicPackageImpl.Literals.PART_SASH_CONTAINER,
+//					BasicPackageImpl.Literals.PART_STACK,
 					BasicPackageImpl.Literals.PART,
 					BasicPackageImpl.Literals.INPUT_PART
 			});

From 78e4a92d11828b2151c020e797f939674768b8b1 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 29 Apr 2010 13:10:48 +0000
Subject: [PATCH 0088/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * use the new CSS-Theme-Features

---
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../build.properties                          |  1 -
 .../css/default.css                           | 22 ---------
 .../emf/editor3x/E4WorkbenchModelEditor.java  | 45 ++++++-------------
 .../PDEClassContributionProvider.java         | 12 ++++-
 .../tools/emf/editor3x/XMIModelResource.java  |  1 +
 6 files changed, 27 insertions(+), 57 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/css/default.css

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index dd63143407..6a47378ae0 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -17,6 +17,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.pde.core;bundle-version="3.6.0",
  org.eclipse.core.resources;bundle-version="3.6.0",
  org.eclipse.jdt.core;bundle-version="3.6.0",
- org.eclipse.ui.ide;bundle-version="3.6.0"
+ org.eclipse.ui.ide;bundle-version="3.6.0",
+ org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0"
 Service-Component: OSGI-INF/pdecontributionprovider.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
index b2760a07f1..0ba7cf565c 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
@@ -3,6 +3,5 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
-               css/,\
                OSGI-INF/pdecontributionprovider.xml
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/css/default.css b/bundles/org.eclipse.e4.tools.emf.editor3x/css/default.css
deleted file mode 100644
index 751eb8fc18..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/css/default.css
+++ /dev/null
@@ -1,22 +0,0 @@
-.headerSectionContainer {
-	background-color: gradient #575757 #101010 100%;
-}
-
-.sectionHeader {
-	font-weight: bold;
-	font-size: 15pt;
-	color: white;
-}
-
-.subSectionHeader {
-	background-color: gradient #575757 #101010 100%;
-}
-
-
-.contentContainer {
-	background-color: #fff #fff #cccccc 20% 80%;
-}
-
-.formContainer {
-	background-color: #fff;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
index f2ab75ca2e..562e917515 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -23,6 +23,8 @@
 import org.eclipse.e4.ui.css.core.engine.CSSEngine;
 import org.eclipse.e4.ui.css.core.engine.CSSErrorHandler;
 import org.eclipse.e4.ui.css.swt.engine.CSSSWTEngineImpl;
+import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
+import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.edit.ui.util.EditUIUtil;
 import org.eclipse.swt.SWT;
@@ -35,6 +37,9 @@
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.part.EditorPart;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
 
 @SuppressWarnings("restriction")
 public class E4WorkbenchModelEditor extends EditorPart {
@@ -67,36 +72,6 @@ public void doSaveAs() {
 
 	}
 
-	private void setupCss(Display display) {
-		CSSEngine engine = (CSSEngine) display
-				.getData("org.eclipse.e4.ui.css.core.engine");
-
-		if (engine == null) {
-			engine = new CSSSWTEngineImpl(display, true);
-			engine.setErrorHandler(new CSSErrorHandler() {
-				public void error(Exception e) {
-					e.printStackTrace();
-				}
-			});
-			display.setData("org.eclipse.e4.ui.css.core.engine", engine);
-
-			try {
-				URL url = FileLocator.resolve(new URL(CSS_URI.toString()));
-				display.setData("org.eclipse.e4.ui.css.core.cssURL", url); //$NON-NLS-1$		
-
-				InputStream stream = url.openStream();
-				engine.parseStyleSheet(stream);
-				stream.close();
-			} catch (MalformedURLException e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			} catch (IOException e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			}
-		}
-	}
-
 	@Override
 	public void init(IEditorSite site, IEditorInput input)
 			throws PartInitException {
@@ -122,7 +97,6 @@ public boolean isSaveAsAllowed() {
 
 	@Override
 	public void createPartControl(Composite parent) {
-		setupCss(parent.getDisplay());
 		Composite comp = new Composite(parent, SWT.NONE);
 		comp.setBackground(comp.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 		comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
@@ -142,6 +116,15 @@ public void createPartControl(Composite parent) {
 		}
 
 		makeActions();
+		Bundle b = FrameworkUtil.getBundle(E4WorkbenchModelEditor.class);
+		if( b != null ) {
+			ServiceReference ref = b.getBundleContext().getServiceReference(IThemeManager.class.getName());
+			if( ref != null ) {
+				IThemeManager mgr = (IThemeManager) b.getBundleContext().getService(ref);
+				IThemeEngine engine = mgr.getEngineForDisplay(parent.getDisplay());
+				engine.applyStyles(parent, true);
+			}			
+		}
 	}
 
 	private void makeActions() {
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index 7a205c2883..24a2afdfb1 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -74,7 +74,7 @@ public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
 				// Accept search results from the JDT SearchEngine
 				String cName = new String(simpleTypeName);
 				String pName = new String(packageName);
-				String label = cName + " - " + pName; //$NON-NLS-1$
+//				String label = cName + " - " + pName; //$NON-NLS-1$
 				String content = pName + "." + cName; //$NON-NLS-1$
 				
 //				System.err.println("Found: " + label + " => " + pName + " => " + path);
@@ -86,9 +86,10 @@ public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
 					IFile f = project.getFile("/META-INF/MANIFEST.MF");
 					
 					if( f != null && f.exists() ) {
+						BufferedReader r = null;
 						try {
 							InputStream s = f.getContents();
-							BufferedReader r = new BufferedReader(new InputStreamReader(s));
+							r = new BufferedReader(new InputStreamReader(s));
 							String line;
 							while( (line = r.readLine()) != null ) {
 								if( line.startsWith("Bundle-SymbolicName:") ) {
@@ -106,6 +107,13 @@ public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
 						} catch (IOException e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
+						} finally {
+							try {
+								r.close();
+							} catch (IOException e) {
+								// TODO Auto-generated catch block
+								e.printStackTrace();
+							}
 						}
 					}
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java
index 59b63ecf7c..deff0a449c 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java
@@ -109,6 +109,7 @@ public IStatus save() {
 			fireCommandStackChanged();
 		} catch (Exception e) {
 			// TODO: handle exception
+			e.printStackTrace();
 		}
 
 		return Status.OK_STATUS;

From 751112156144929eed7f87add95cebe17b9361d1 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 29 Apr 2010 13:11:31 +0000
Subject: [PATCH 0089/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * extracting model change commands

---
 .../common/commands/AddAddonCommand.java      | 30 ++++++++++++
 .../common/commands/MoveAddonCommand.java     | 20 ++++++++
 .../common/commands/RemoveAddonCommand.java   | 35 ++++++++++++++
 .../common/component/AddonsEditor.java        | 10 ++++
 .../component/virtual/VApplicationAddons.java | 48 +++++++++++++------
 5 files changed, 128 insertions(+), 15 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/AddAddonCommand.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/MoveAddonCommand.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/RemoveAddonCommand.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/AddAddonCommand.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/AddAddonCommand.java
new file mode 100644
index 0000000000..27cf0d5164
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/AddAddonCommand.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.commands;
+
+import org.eclipse.e4.ui.model.application.MAddon;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+public class AddAddonCommand {
+	public void execute(EditingDomain editingDomain, MApplication parent) {
+		MAddon command = MApplicationFactory.INSTANCE.createAddon();
+		Command cmd = AddCommand.create(editingDomain, parent, ApplicationPackageImpl.Literals.APPLICATION__ADDONS, command);
+		
+		if( cmd.canExecute() ) {
+			editingDomain.getCommandStack().execute(cmd);
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/MoveAddonCommand.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/MoveAddonCommand.java
new file mode 100644
index 0000000000..6c3f9889de
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/MoveAddonCommand.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.commands;
+
+import org.eclipse.e4.ui.model.application.MAddon;
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+public class MoveAddonCommand {
+	public void execute(EditingDomain editingDomain, MAddon addon, boolean up) {
+		
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/RemoveAddonCommand.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/RemoveAddonCommand.java
new file mode 100644
index 0000000000..1e71dfcb9e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/RemoveAddonCommand.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.commands;
+
+import java.util.List;
+
+import org.eclipse.e4.ui.model.application.MAddon;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+public class RemoveAddonCommand {
+	public void execute(EditingDomain editingDomain, List<MAddon> addons) {
+		EObject parent = ((EObject)addons.get(0)).eContainer();
+		for( MAddon a : addons ) {
+			if( parent != ((EObject)a).eContainer() ) {
+				throw new IllegalArgumentException("The addons all have to belong to the same parent container");
+			}
+		}
+		Command cmd = RemoveCommand.create(editingDomain, parent, ApplicationPackageImpl.Literals.APPLICATION__ADDONS, addons);
+		if( cmd.canExecute() ) {
+			editingDomain.getCommandStack().execute(cmd);
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 83f5f00e0f..77f150bd6e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.net.MalformedURLException;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index 36dcf7ba58..316d16e4d2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -1,5 +1,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -8,16 +9,17 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.common.commands.AddAddonCommand;
+import org.eclipse.e4.tools.emf.ui.internal.common.commands.RemoveAddonCommand;
 import org.eclipse.e4.ui.model.application.MAddon;
 import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -39,9 +41,21 @@ public class VApplicationAddons extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private EMFDataBindingContext context;
 	
+	private List<Action> actions = new ArrayList<Action>();
+	
+	//FIXME We need to plug this stuff into the command frameworks
+	private AddAddonCommand addAddonCommand = new AddAddonCommand();
+	private RemoveAddonCommand removeAddonCommand = new RemoveAddonCommand();
+	
 	public VApplicationAddons(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain);
 		this.editor = editor;
+		actions.add(new Action("Add Addon") {
+			@Override
+			public void run() {
+				handleAddAddon();
+			}
+		});
 	}
 
 	@Override
@@ -165,13 +179,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MAddon command = MApplicationFactory.INSTANCE.createAddon();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__ADDONS, command);
-					
-					if( cmd.canExecute() ) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(command);
-					}
+					handleAddAddon();
 				}
 			});
 
@@ -183,11 +191,7 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> commands = ((IStructuredSelection)viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__ADDONS, commands);
-						if( cmd.canExecute() ) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
+						handleRemoveAddons(((IStructuredSelection)viewer.getSelection()).toList());
 					}
 				}
 			});
@@ -195,11 +199,25 @@ public void widgetSelected(SelectionEvent e) {
 		
 		return parent;
 	}
-
+	
+	private void handleAddAddon() {
+		addAddonCommand.execute(getEditingDomain(), (MApplication) getMaster().getValue());
+	}
+	
+	private void handleRemoveAddons(List<MAddon> addons) {
+		removeAddonCommand.execute(getEditingDomain(), addons);
+	}
+	
 	@Override
 	public IObservableList getChildList(Object element) {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }

From b58beb27076a264d8ef7100a4e1e37d855ebb590 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 7 May 2010 08:15:05 +0000
Subject: [PATCH 0090/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * refactored to directly use DI in 3.x

---
 .../META-INF/MANIFEST.MF                      |   7 +-
 .../OSGI-INF/contextfunction.xml              |   8 +
 .../OSGI-INF/pdecontributionprovider.xml      |   2 +-
 .../build.properties                          |   3 +-
 .../plugin.xml                                |  16 ++
 .../emf/editor3x/E4WorkbenchModelEditor.java  | 237 +++++++++---------
 .../PDEClassContributionProvider.java         |  12 +-
 .../emf/editor3x/XMIResourceFunction.java     |  23 ++
 .../editor3x/compat/E4CompatEditorPart.java   | 108 ++++++++
 .../compat/IEclipseContextServiceFactory.java |  70 ++++++
 .../META-INF/MANIFEST.MF                      |   4 +-
 .../tools/emf/ui/common/XMIModelResource.java | 118 +++++++++
 .../emf/ui/internal/common/ModelEditor.java   |  31 ++-
 .../internal/wbm/ApplicationModelEditor.java  |   8 +-
 14 files changed, 505 insertions(+), 142 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/contextfunction.xml
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 6a47378ae0..e3e5fd0b31 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -18,6 +18,9 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.resources;bundle-version="3.6.0",
  org.eclipse.jdt.core;bundle-version="3.6.0",
  org.eclipse.ui.ide;bundle-version="3.6.0",
- org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0"
-Service-Component: OSGI-INF/pdecontributionprovider.xml
+ org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
+ org.eclipse.e4.core.contexts;bundle-version="0.9.0",
+ org.eclipse.e4.core.di;bundle-version="0.9.0",
+ org.eclipse.e4.core.services;bundle-version="0.9.1"
+Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/contextfunction.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/contextfunction.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/contextfunction.xml
new file mode 100644
index 0000000000..07c4270939
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/contextfunction.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.emf.editor3x.contextfunction">
+   <implementation class="org.eclipse.e4.tools.emf.editor3x.XMIResourceFunction"/>
+   <service>
+      <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
+   </service>
+   <property name="service.context.key" type="String" value="org.eclipse.e4.tools.emf.ui.common.IModelResource"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml
index dbd21aa8b9..ce78958efd 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.emf.editor3x">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.emf.editor3x.pdecontrib">
    <implementation class="org.eclipse.e4.tools.emf.editor3x.PDEClassContributionProvider"/>
    <service>
       <provide interface="org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider"/>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
index 0ba7cf565c..30bd06c0cf 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
@@ -3,5 +3,6 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
-               OSGI-INF/pdecontributionprovider.xml
+               OSGI-INF/pdecontributionprovider.xml,\
+               OSGI-INF/contextfunction.xml
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index 8a4c94ce26..2fa5805338 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -38,5 +38,21 @@
             name="e4">
       </category>
       </extension>
+   <extension
+         point="org.eclipse.ui.services">
+      <serviceFactory
+            factoryClass="org.eclipse.e4.tools.emf.editor3x.compat.IEclipseContextServiceFactory">
+         <service
+               serviceClass="org.eclipse.e4.core.contexts.IEclipseContext">
+         </service>
+      </serviceFactory>
+   </extension>
+   <extension
+         point="org.eclipse.ui.services">
+      <serviceFactory
+            factoryClass="org.eclipse.e4.tools.emf.editor3x.compat.IEclipseContextServiceFactory">
+         <service></service>
+      </serviceFactory>
+   </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
index 562e917515..cfbeaef289 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -10,19 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.e4.tools.emf.editor3x.compat.E4CompatEditorPart;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource.ModelListener;
 import org.eclipse.e4.tools.emf.ui.internal.wbm.ApplicationModelEditor;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.engine.CSSErrorHandler;
-import org.eclipse.e4.ui.css.swt.engine.CSSSWTEngineImpl;
 import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
 import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
 import org.eclipse.emf.common.util.URI;
@@ -30,7 +21,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.IFileEditorInput;
@@ -42,118 +32,121 @@
 import org.osgi.framework.ServiceReference;
 
 @SuppressWarnings("restriction")
-public class E4WorkbenchModelEditor extends EditorPart {
-	private XMIModelResource resource;
-	private ApplicationModelEditor editor;
-	private UndoAction undoAction;
-	private RedoAction redoAction;
-
-	private static final String CSS_URI = "platform:/plugin/org.eclipse.e4.tools.emf.editor3x/css/default.css";
-
-	private ModelListener listener = new ModelListener() {
-
-		public void dirtyChanged() {
-			firePropertyChange(PROP_DIRTY);
-		}
-
-		public void commandStackChanged() {
-			// TODO Auto-generated method stub
-
-		}
-	};
-
-	@Override
-	public void doSave(IProgressMonitor monitor) {
-		editor.save();
-	}
-
-	@Override
-	public void doSaveAs() {
-
-	}
-
-	@Override
-	public void init(IEditorSite site, IEditorInput input)
-			throws PartInitException {
-		setSite(site);
-		setInput(input);
-
-		URI resourceURI = EditUIUtil.getURI(input);
-		if (resourceURI != null) {
-			resource = new XMIModelResource(resourceURI);
-			resource.addModelListener(listener);
-		}
-	}
-
-	@Override
-	public boolean isDirty() {
-		return resource.isDirty();
-	}
-
-	@Override
-	public boolean isSaveAsAllowed() {
-		return false;
-	}
-
-	@Override
-	public void createPartControl(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		comp.setBackground(comp.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-		comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
-
-		FillLayout layout = new FillLayout();
-		layout.marginWidth = 10;
-		layout.marginHeight = 10;
-		comp.setLayout(layout);
-		IFileEditorInput input = (IFileEditorInput)getEditorInput();
-		editor = new ApplicationModelEditor(comp, resource, input.getFile().getProject());
-
-		try {
-			parent.setRedraw(false);
-			parent.reskin(SWT.ALL);
-		} finally {
-			parent.setRedraw(true);
-		}
-
-		makeActions();
-		Bundle b = FrameworkUtil.getBundle(E4WorkbenchModelEditor.class);
-		if( b != null ) {
-			ServiceReference ref = b.getBundleContext().getServiceReference(IThemeManager.class.getName());
-			if( ref != null ) {
-				IThemeManager mgr = (IThemeManager) b.getBundleContext().getService(ref);
-				IThemeEngine engine = mgr.getEngineForDisplay(parent.getDisplay());
-				engine.applyStyles(parent, true);
-			}			
-		}
-	}
-
-	private void makeActions() {
-		undoAction = new UndoAction(resource);
-		redoAction = new RedoAction(resource);
-
-		getEditorSite().getActionBars().setGlobalActionHandler(
-				ActionFactory.UNDO.getId(), undoAction);
-		getEditorSite().getActionBars().setGlobalActionHandler(
-				ActionFactory.REDO.getId(), redoAction);
-	}
-
-	@Override
-	public void dispose() {
-		if (undoAction != null)
-			undoAction.dispose();
-
-		if (redoAction != null)
-			redoAction.dispose();
-
-		if (listener != null && resource != null)
-			resource.removeModelListener(listener);
-
-		super.dispose();
-	}
+public class E4WorkbenchModelEditor extends E4CompatEditorPart {
 
-	@Override
-	public void setFocus() {
-		editor.setFocus();
+	public E4WorkbenchModelEditor() {
+		super("platform:/plugin/org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.wbm.ApplicationModelEditor");
 	}
+	
+//	private XMIModelResource resource;
+//	private ApplicationModelEditor editor;
+//	private UndoAction undoAction;
+//	private RedoAction redoAction;
+//
+//	private ModelListener listener = new ModelListener() {
+//
+//		public void dirtyChanged() {
+//			firePropertyChange(PROP_DIRTY);
+//		}
+//
+//		public void commandStackChanged() {
+//			// TODO Auto-generated method stub
+//
+//		}
+//	};
+//
+//	@Override
+//	public void doSave(IProgressMonitor monitor) {
+//		editor.doSave(monitor);
+//	}
+//
+//	@Override
+//	public void doSaveAs() {
+//
+//	}
+//
+//	@Override
+//	public void init(IEditorSite site, IEditorInput input)
+//			throws PartInitException {
+//		setSite(site);
+//		setInput(input);
+//
+//		URI resourceURI = EditUIUtil.getURI(input);
+//		if (resourceURI != null) {
+//			resource = new XMIModelResource(resourceURI);
+//			resource.addModelListener(listener);
+//		}
+//	}
+//
+//	@Override
+//	public boolean isDirty() {
+//		return resource.isDirty();
+//	}
+//
+//	@Override
+//	public boolean isSaveAsAllowed() {
+//		return false;
+//	}
+//
+//	@Override
+//	public void createPartControl(Composite parent) {
+//		Composite comp = new Composite(parent, SWT.NONE);
+//		comp.setBackground(comp.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+//		comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
+//
+//		FillLayout layout = new FillLayout();
+//		layout.marginWidth = 10;
+//		layout.marginHeight = 10;
+//		comp.setLayout(layout);
+//		IFileEditorInput input = (IFileEditorInput)getEditorInput();
+//		editor = new ApplicationModelEditor(comp, resource, input.getFile().getProject());
+//
+//		try {
+//			parent.setRedraw(false);
+//			parent.reskin(SWT.ALL);
+//		} finally {
+//			parent.setRedraw(true);
+//		}
+//
+//		makeActions();
+//		Bundle b = FrameworkUtil.getBundle(E4WorkbenchModelEditor.class);
+//		if( b != null ) {
+//			ServiceReference ref = b.getBundleContext().getServiceReference(IThemeManager.class.getName());
+//			if( ref != null ) {
+//				IThemeManager mgr = (IThemeManager) b.getBundleContext().getService(ref);
+//				IThemeEngine engine = mgr.getEngineForDisplay(parent.getDisplay());
+//				engine.applyStyles(parent, true);
+//			}			
+//		}
+//	}
+//
+//	private void makeActions() {
+//		undoAction = new UndoAction(resource);
+//		redoAction = new RedoAction(resource);
+//
+//		getEditorSite().getActionBars().setGlobalActionHandler(
+//				ActionFactory.UNDO.getId(), undoAction);
+//		getEditorSite().getActionBars().setGlobalActionHandler(
+//				ActionFactory.REDO.getId(), redoAction);
+//	}
+//
+//	@Override
+//	public void dispose() {
+//		if (undoAction != null)
+//			undoAction.dispose();
+//
+//		if (redoAction != null)
+//			redoAction.dispose();
+//
+//		if (listener != null && resource != null)
+//			resource.removeModelListener(listener);
+//
+//		super.dispose();
+//	}
+//
+//	@Override
+//	public void setFocus() {
+//		editor.setFocus();
+//	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index 24a2afdfb1..b137eb5b90 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -108,11 +108,13 @@ public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
 							// TODO Auto-generated catch block
 							e.printStackTrace();
 						} finally {
-							try {
-								r.close();
-							} catch (IOException e) {
-								// TODO Auto-generated catch block
-								e.printStackTrace();
+							if( r != null ) {
+								try {
+									r.close();
+								} catch (IOException e) {
+									// TODO Auto-generated catch block
+									e.printStackTrace();
+								}								
 							}
 						}
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
new file mode 100644
index 0000000000..77a360960d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
@@ -0,0 +1,23 @@
+package org.eclipse.e4.tools.emf.editor3x;
+
+import org.eclipse.e4.core.contexts.ContextFunction;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.common.XMIModelResource;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.ui.IEditorInput;
+
+public class XMIResourceFunction extends ContextFunction {
+
+	@Override
+	public Object compute(IEclipseContext context, Object[] arguments) {
+		final IEditorInput input = context.get(IEditorInput.class);
+		if( input != null ) {
+			URI resourceURI = EditUIUtil.getURI(input);
+			return new XMIModelResource(resourceURI);
+		}
+
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
new file mode 100644
index 0000000000..b5f9d552fd
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
@@ -0,0 +1,108 @@
+package org.eclipse.e4.tools.emf.editor3x.compat;
+
+import org.eclipse.core.runtime.IExecutableExtension;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.services.contributions.IContributionFactory;
+import org.eclipse.e4.tools.emf.editor3x.E4WorkbenchModelEditor;
+import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
+import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.EditorPart;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+
+public class E4CompatEditorPart extends EditorPart implements IExecutableExtension {
+	private Object instance;
+	private String classUri;
+	
+	//TODO can we create a context as a top-level service?
+	private IEclipseContext context;
+	
+	public E4CompatEditorPart(String classUri) {
+		this.classUri = classUri;
+	}
+	
+	@Override
+	public void doSave(IProgressMonitor monitor) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void doSaveAs() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void init(IEditorSite site, IEditorInput input)
+			throws PartInitException {
+		setSite(site);
+		setInput(input);
+		
+		IEclipseContext parentContext = (IEclipseContext) getSite().getService(IEclipseContext.class);
+		System.err.println("The parent context: " + parentContext); 
+		context = parentContext.createChild("EditPart('"+getPartName()+"')"); //$NON-NLS-1$
+		context.declareModifiable(IEditorInput.class);
+		context.declareModifiable(EditorPart.class);
+		context.set(EditorPart.class,this);
+		context.set(IEditorInput.class, input);		
+	}
+
+	@Override
+	public boolean isDirty() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean isSaveAsAllowed() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public void createPartControl(Composite parent) {
+		Composite comp = new Composite(parent, SWT.NONE);
+		comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
+
+		FillLayout layout = new FillLayout();
+		layout.marginWidth = 10;
+		layout.marginHeight = 10;
+		comp.setLayout(layout);
+		
+		context.set(Composite.class.getName(), comp);
+		IContributionFactory factory = (IContributionFactory) context.get(IContributionFactory.class);
+		instance = factory.create(classUri, context);
+		
+		Bundle b = FrameworkUtil.getBundle(E4WorkbenchModelEditor.class);
+		if( b != null ) {
+			ServiceReference ref = b.getBundleContext().getServiceReference(IThemeManager.class.getName());
+			if( ref != null ) {
+				IThemeManager mgr = (IThemeManager) b.getBundleContext().getService(ref);
+				IThemeEngine engine = mgr.getEngineForDisplay(parent.getDisplay());
+				engine.applyStyles(parent, true);
+			}			
+		}
+	}
+
+	@Override
+	public void setFocus() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void dispose() {
+		context.dispose();
+		super.dispose();
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java
new file mode 100644
index 0000000000..d3d9251455
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java
@@ -0,0 +1,70 @@
+package org.eclipse.e4.tools.emf.editor3x.compat;
+
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.RegistryFactory;
+import org.eclipse.e4.core.contexts.EclipseContextFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.services.contributions.IContributionFactory;
+import org.eclipse.e4.workbench.modeling.ESelectionService;
+import org.eclipse.e4.workbench.ui.IWorkbench;
+import org.eclipse.e4.workbench.ui.internal.ReflectionContributionFactory;
+import org.eclipse.ui.ISelectionService;
+import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.internal.services.IWorkbenchLocationService;
+import org.eclipse.ui.services.AbstractServiceFactory;
+import org.eclipse.ui.services.IServiceLocator;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+
+public class IEclipseContextServiceFactory extends AbstractServiceFactory {
+
+	public IEclipseContextServiceFactory() {
+	}
+
+	@SuppressWarnings("restriction")
+	@Override
+	public Object create(Class serviceInterface, IServiceLocator parentLocator,
+			IServiceLocator locator) {
+		if( ! IEclipseContext.class.equals(serviceInterface) ) {
+			return null;
+		}
+		
+		IWorkbenchLocationService wls = (IWorkbenchLocationService) locator.getService(IWorkbenchLocationService.class);
+		final IWorkbenchWindow window = wls.getWorkbenchWindow();
+		final IWorkbenchPartSite site = wls.getPartSite();
+
+		System.err.println("The locator: " + locator);
+		System.err.println("	Window: " + window);
+		System.err.println("	Site: " + site);
+		
+		
+		Object o = parentLocator.getService(serviceInterface);
+		
+		// This happens when we run in plain 3.x
+		// We need to create a parent service context
+		if( window == null && site == null ) {
+			Bundle bundle = FrameworkUtil.getBundle(IEclipseContextServiceFactory.class);
+			BundleContext bundleContext = bundle.getBundleContext();
+			IEclipseContext serviceContext = EclipseContextFactory.getServiceContext(bundleContext);
+
+			final IEclipseContext appContext = serviceContext.createChild("WorkbenchContext"); //$NON-NLS-1$
+			IExtensionRegistry registry = RegistryFactory.getRegistry();
+			ReflectionContributionFactory contributionFactory = new ReflectionContributionFactory(registry);
+			appContext.set(IContributionFactory.class.getName(),contributionFactory);
+			
+			return appContext;
+		} /*else if( o != null && site == null ) {
+			IEclipseContext windowContext = ((IEclipseContext)o).createChild("WindowContext("+window+")");
+//			windowContext.declareModifiable(ESelectionService.class);
+//			//FIXME This is not correct we need to use DI :-)
+//			windowContext.set(ESelectionService.class, new E4CompatSelectionService(window));
+			
+			return windowContext;
+		}*/
+		
+		return o;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 2a67a7c1ab..ce71a25a67 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -21,7 +21,9 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.core.resources;bundle-version="3.6.0",
  org.eclipse.e4.core.services;bundle-version="0.9.1",
  org.eclipse.osgi;bundle-version="3.6.0",
- org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0"
+ org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
+ org.eclipse.e4.core.di;bundle-version="0.9.0",
+ org.eclipse.e4.ui.workbench;bundle-version="0.9.1"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.osgi.framework;version="1.5.0"
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
new file mode 100644
index 0000000000..95bbb4fc9d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.common;
+
+import java.util.ArrayList;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.workbench.ui.internal.E4XMIResourceFactory; 
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+
+@SuppressWarnings("restriction")
+public class XMIModelResource implements IModelResource {
+	private EditingDomain editingDomain;
+	private Resource resource;
+	private List<ModelListener> listeners = new ArrayList<IModelResource.ModelListener>();
+	private boolean dirty;
+
+	
+	public XMIModelResource(URI uri) {
+		ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
+				ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+		ResourceSet resourceSet = new ResourceSetImpl();
+		BasicCommandStack commandStack = new BasicCommandStack();
+		commandStack.addCommandStackListener(new CommandStackListener() {
+			
+			public void commandStackChanged(EventObject event) {
+				dirty = true;
+				fireDirtyChanged();
+				fireCommandStackChanged();
+			}
+		});
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory,
+				commandStack, resourceSet);
+		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
+				.put(Resource.Factory.Registry.DEFAULT_EXTENSION,
+						new E4XMIResourceFactory());
+		resource = resourceSet.getResource(uri, true);
+	}
+
+	public IObservableList getRoot() {
+		WritableList list = new WritableList();
+		list.add(resource.getContents().get(0));
+		return list;
+	}
+
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	public boolean isSaveable() {
+		return true;
+	}
+
+	public void addModelListener(ModelListener listener) {
+		listeners.add(listener);
+	}
+	
+	public void removeModelListener(ModelListener listener) {
+		listeners.remove(listener);
+	}
+	
+	public boolean isDirty() {
+		return dirty && getEditingDomain().getCommandStack().canUndo();
+	}
+	
+	private void fireDirtyChanged() {
+		for( ModelListener listener : listeners ) {
+			listener.dirtyChanged();
+		}
+	}
+	
+	private void fireCommandStackChanged() {
+		for( ModelListener listener : listeners ) {
+			listener.commandStackChanged();
+		}
+	}
+	
+	public IStatus save() {
+		Map<String, String> map = new HashMap<String, String>();
+		try {
+			resource.save(map);
+			editingDomain.getCommandStack().flush();
+			dirty = false;
+			fireDirtyChanged();
+			fireCommandStackChanged();
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+		}
+
+		return Status.OK_STATUS;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index ba9cf65bdd..9eb0780591 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -16,6 +16,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.map.IMapChangeListener;
@@ -26,8 +28,8 @@
 import org.eclipse.core.databinding.observable.set.SetChangeEvent;
 import org.eclipse.core.databinding.observable.set.WritableSet;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
@@ -74,6 +76,7 @@
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.e4.workbench.modeling.ESelectionService;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.ecore.EClass;
@@ -129,6 +132,7 @@ public class ModelEditor {
 	private TreeViewer viewer;
 	private IModelResource modelProvider;
 	private IProject project;
+//	private ESelectionService selectionService;
 
 	public ModelEditor(Composite composite, IModelResource modelProvider, IProject project) {
 		this.modelProvider = modelProvider;
@@ -221,6 +225,11 @@ public void selectionChanged(SelectionChangedEvent event) {
 					
 					Rectangle r = scrolling.getClientArea();
 					scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT));
+					
+//					if( selectionService != null ) {
+//						selectionService.setSelection(s.getFirstElement());
+//					}
+					
 				}
 			}
 		});
@@ -257,6 +266,16 @@ public void menuAboutToShow(IMenuManager manager) {
 		viewer.getControl().setMenu(mgr.createContextMenu(viewer.getControl()));
 	}
 
+//	@Inject
+//	public void setSelectionService(ESelectionService selectionService) {
+//		this.selectionService = selectionService;
+//		if( viewer != null && ! viewer.getControl().isDisposed() ) {
+//			if( ! viewer.getSelection().isEmpty() ) {
+//				selectionService.setSelection(((IStructuredSelection)viewer.getSelection()).getFirstElement());	
+//			}
+//		}
+//	}
+	
 	private TreeViewer createTreeViewerArea(Composite parent) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
@@ -402,14 +421,12 @@ public AbstractComponentEditor getEditor(EClass eClass) {
 		return editorMap.get(eClass);
 	}
 
-	public IStatus save() {
+	public void doSave(@Optional IProgressMonitor monitor) {
 		if (modelProvider.isSaveable()) {
-			return modelProvider.save();
+			modelProvider.save();
 		}
-
-		return Status.CANCEL_STATUS;
 	}
-	
+		
 	public void setFocus() {
 		viewer.getControl().setFocus();
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index 51ddad58d1..4104bbecd2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -10,16 +10,18 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.wbm;
 
+import javax.inject.Inject;
+
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.swt.widgets.Composite;
 
 public class ApplicationModelEditor extends ModelEditor {
+	@Inject
 	public ApplicationModelEditor(Composite composite,
-			IModelResource modelProvider, IProject project) {
+			@Optional IModelResource modelProvider, @Optional IProject project) {
 		super(composite, modelProvider, project);
 	}
-
-	
 }

From c6c747155d19a16f513f923894de70ed4e73b3fa Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 7 May 2010 12:30:13 +0000
Subject: [PATCH 0091/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * no dependency on emf.ui which has an upper bound to
 3.7.0

---
 .../META-INF/MANIFEST.MF                      |  4 +-
 .../emf/editor3x/E4WorkbenchModelEditor.java  |  1 -
 .../emf/editor3x/XMIResourceFunction.java     |  2 +-
 .../e4/tools/emf/editor3x/emf/EditUIUtil.java | 87 +++++++++++++++++++
 .../META-INF/MANIFEST.MF                      |  1 -
 5 files changed, 90 insertions(+), 5 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index e3e5fd0b31..f93cda5a54 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.emf.common;bundle-version="2.6.0",
- org.eclipse.emf.edit.ui;bundle-version="2.6.0",
  org.eclipse.core.databinding.observable;bundle-version="1.3.0",
  org.eclipse.e4.tools.emf.ui;bundle-version="0.9.0",
  org.eclipse.e4.ui.workbench;bundle-version="0.9.1",
@@ -21,6 +20,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0",
- org.eclipse.e4.core.services;bundle-version="0.9.1"
+ org.eclipse.e4.core.services;bundle-version="0.9.1",
+ org.eclipse.emf.edit;bundle-version="2.6.0"
 Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/contextfunction.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
index cfbeaef289..d8b8f5919c 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -17,7 +17,6 @@
 import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
 import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.edit.ui.util.EditUIUtil;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
index 77a360960d..201d703644 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
@@ -2,9 +2,9 @@
 
 import org.eclipse.e4.core.contexts.ContextFunction;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.editor3x.emf.EditUIUtil;
 import org.eclipse.e4.tools.emf.ui.common.XMIModelResource;
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.edit.ui.util.EditUIUtil;
 import org.eclipse.ui.IEditorInput;
 
 public class XMIResourceFunction extends ContextFunction {
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java
new file mode 100644
index 0000000000..39074b0341
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java
@@ -0,0 +1,87 @@
+package org.eclipse.e4.tools.emf.editor3x.emf;
+
+import java.lang.reflect.Method;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IURIEditorInput;
+import org.osgi.framework.Bundle;
+
+public class EditUIUtil {
+	static final Class<?> FILE_CLASS;
+	static {
+		Class<?> fileClass = null;
+		try {
+			fileClass = IFile.class;
+		} catch (Throwable exception) {
+			// Ignore any exceptions and assume the class isn't available.
+		}
+		FILE_CLASS = fileClass;
+	}
+
+	static final Class<?> FILE_REVISION_CLASS;
+	static final Method FILE_REVISION_GET_URI_METHOD;
+	static {
+		Class<?> fileRevisionClass = null;
+		Method fileRevisionGetURIMethod = null;
+		Bundle bundle = Platform.getBundle("org.eclipse.team.core");
+		if (bundle != null
+				&& (bundle.getState() & (Bundle.ACTIVE | Bundle.STARTING | Bundle.RESOLVED)) != 0) {
+			try {
+				fileRevisionClass = bundle
+						.loadClass("org.eclipse.team.core.history.IFileRevision");
+				fileRevisionGetURIMethod = fileRevisionClass
+						.getMethod("getURI");
+			} catch (Throwable exeption) {
+				// Ignore any exceptions and assume the class isn't available.
+			}
+		}
+		FILE_REVISION_CLASS = fileRevisionClass;
+		FILE_REVISION_GET_URI_METHOD = fileRevisionGetURIMethod;
+	}
+
+	static final Class<?> URI_EDITOR_INPUT_CLASS;
+	static {
+		Class<?> uriEditorInputClass = null;
+		try {
+			uriEditorInputClass = IURIEditorInput.class;
+		} catch (Throwable exception) {
+			// The class is not available.
+		}
+		URI_EDITOR_INPUT_CLASS = uriEditorInputClass;
+	}
+
+	public static URI getURI(IEditorInput editorInput) {
+
+		if (FILE_CLASS != null) {
+			IFile file = (IFile) editorInput.getAdapter(FILE_CLASS);
+			if (file != null) {
+				return URI.createPlatformResourceURI(file.getFullPath()
+						.toString(), true);
+			}
+		}
+		if (FILE_REVISION_CLASS != null) {
+			Object fileRevision = editorInput.getAdapter(FILE_REVISION_CLASS);
+			if (fileRevision != null) {
+				try {
+					return URI
+							.createURI(((java.net.URI) FILE_REVISION_GET_URI_METHOD
+									.invoke(fileRevision)).toString());
+				} catch (Throwable exception) {
+					// TODO Log error
+				}
+			}
+		}
+		if (URI_EDITOR_INPUT_CLASS != null) {
+			if (editorInput instanceof IURIEditorInput) {
+				return URI.createURI(
+						((IURIEditorInput) editorInput).getURI().toString())
+						.trimFragment();
+			}
+		}
+
+		return null;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index ce71a25a67..126b5f3432 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.jface;bundle-version="3.6.0",
  org.eclipse.emf.edit;bundle-version="2.6.0",
  org.eclipse.equinox.common;bundle-version="3.6.0",
- org.eclipse.e4.ui.model.workbench.edit;bundle-version="0.9.1",
  org.eclipse.emf.databinding.edit;bundle-version="1.2.0",
  com.ibm.icu;bundle-version="4.2.1",
  org.eclipse.core.resources;bundle-version="3.6.0",

From ca0617a4572b729c282d9ee1245b9e3d265febde Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 7 May 2010 20:38:56 +0000
Subject: [PATCH 0092/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * add selection injection and delivering

---
 .../META-INF/MANIFEST.MF                      |  5 ++-
 .../OSGI-INF/selectionproviderfunction.xml    |  8 ++++
 ...ion.xml => xmiresourcecontextfunction.xml} |  0
 .../build.properties                          |  3 +-
 .../plugin.xml                                |  7 ---
 .../editor3x/compat/E4CompatEditorPart.java   | 43 +++++++++++++++++--
 .../compat/IEclipseContextServiceFactory.java | 32 ++++++++++----
 .../SelectionProviderContextFunction.java     | 29 +++++++++++++
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../ui/common/ISelectionProviderService.java  |  5 +++
 .../emf/ui/internal/common/ModelEditor.java   | 34 +++++++++------
 11 files changed, 133 insertions(+), 36 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/selectionproviderfunction.xml
 rename bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/{contextfunction.xml => xmiresourcecontextfunction.xml} (100%)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/SelectionProviderContextFunction.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index f93cda5a54..69418fc9db 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -21,6 +21,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0",
  org.eclipse.e4.core.services;bundle-version="0.9.1",
- org.eclipse.emf.edit;bundle-version="2.6.0"
-Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/contextfunction.xml
+ org.eclipse.emf.edit;bundle-version="2.6.0",
+ org.eclipse.e4.ui.services;bundle-version="0.9.1"
+Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/selectionproviderfunction.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/selectionproviderfunction.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/selectionproviderfunction.xml
new file mode 100644
index 0000000000..73d6e010dd
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/selectionproviderfunction.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.emf.editor3x.selectionprovider">
+   <implementation class="org.eclipse.e4.tools.emf.editor3x.compat.SelectionProviderContextFunction"/>
+   <service>
+      <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
+   </service>
+   <property name="service.context.key" type="String" value="org.eclipse.e4.tools.emf.ui.common.ISelectionProviderService"/>
+</scr:component>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/contextfunction.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/xmiresourcecontextfunction.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/contextfunction.xml
rename to bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/xmiresourcecontextfunction.xml
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
index 30bd06c0cf..69419d0dd0 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
@@ -4,5 +4,6 @@ bin.includes = META-INF/,\
                plugin.xml,\
                icons/,\
                OSGI-INF/pdecontributionprovider.xml,\
-               OSGI-INF/contextfunction.xml
+               OSGI-INF/xmiresourcecontextfunction.xml,\
+               OSGI-INF/selectionproviderfunction.xml
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index 2fa5805338..3859e5668b 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -47,12 +47,5 @@
          </service>
       </serviceFactory>
    </extension>
-   <extension
-         point="org.eclipse.ui.services">
-      <serviceFactory
-            factoryClass="org.eclipse.e4.tools.emf.editor3x.compat.IEclipseContextServiceFactory">
-         <service></service>
-      </serviceFactory>
-   </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
index b5f9d552fd..9368835102 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
@@ -2,17 +2,22 @@
 
 import org.eclipse.core.runtime.IExecutableExtension;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.services.contributions.IContributionFactory;
 import org.eclipse.e4.tools.emf.editor3x.E4WorkbenchModelEditor;
 import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
 import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.EditorPart;
 import org.osgi.framework.Bundle;
@@ -49,12 +54,15 @@ public void init(IEditorSite site, IEditorInput input)
 		setInput(input);
 		
 		IEclipseContext parentContext = (IEclipseContext) getSite().getService(IEclipseContext.class);
-		System.err.println("The parent context: " + parentContext); 
 		context = parentContext.createChild("EditPart('"+getPartName()+"')"); //$NON-NLS-1$
 		context.declareModifiable(IEditorInput.class);
 		context.declareModifiable(EditorPart.class);
 		context.set(EditorPart.class,this);
-		context.set(IEditorInput.class, input);		
+		context.set(IEditorInput.class, input);
+		
+		ISelectionProvider s = new SelectionProviderImpl();
+		context.set(ISelectionProvider.class, s);
+		site.setSelectionProvider(s);
 	}
 
 	@Override
@@ -103,6 +111,35 @@ public void setFocus() {
 	@Override
 	public void dispose() {
 		context.dispose();
+		context = null;
 		super.dispose();
 	}
+	
+	private class SelectionProviderImpl implements ISelectionProvider {
+		private ISelection currentSelection = StructuredSelection.EMPTY;
+		
+		private ListenerList listeners = new ListenerList();
+		
+		public void setSelection(ISelection selection) {
+			currentSelection = selection;
+			SelectionChangedEvent evt = new SelectionChangedEvent(this, selection);
+			
+			for( Object l : listeners.getListeners() ) {
+				((ISelectionChangedListener)l).selectionChanged(evt);
+			}
+		}
+				
+		public void removeSelectionChangedListener(
+				ISelectionChangedListener listener) {
+			listeners.remove(listener);
+		}
+		
+		public ISelection getSelection() {
+			return currentSelection;
+		}
+		
+		public void addSelectionChangedListener(ISelectionChangedListener listener) {
+			listeners.add(listener);
+		}
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java
index d3d9251455..69dab9c382 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java
@@ -5,10 +5,15 @@
 import org.eclipse.e4.core.contexts.EclipseContextFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.services.contributions.IContributionFactory;
+import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.e4.workbench.modeling.ESelectionService;
 import org.eclipse.e4.workbench.ui.IWorkbench;
 import org.eclipse.e4.workbench.ui.internal.ReflectionContributionFactory;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.ISelectionListener;
 import org.eclipse.ui.ISelectionService;
+import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchPartSite;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.internal.services.IWorkbenchLocationService;
@@ -55,16 +60,25 @@ public Object create(Class serviceInterface, IServiceLocator parentLocator,
 			appContext.set(IContributionFactory.class.getName(),contributionFactory);
 			
 			return appContext;
-		} /*else if( o != null && site == null ) {
-			IEclipseContext windowContext = ((IEclipseContext)o).createChild("WindowContext("+window+")");
-//			windowContext.declareModifiable(ESelectionService.class);
-//			//FIXME This is not correct we need to use DI :-)
-//			windowContext.set(ESelectionService.class, new E4CompatSelectionService(window));
-			
+		} else if( o != null && site == null ) {
+			final IEclipseContext windowContext = ((IEclipseContext)o).createChild("WindowContext("+window+")");
+			windowContext.set(ISelectionService.class, window.getSelectionService());
+			window.getSelectionService().addSelectionListener(new ISelectionListener() {
+				
+				public void selectionChanged(IWorkbenchPart part, ISelection selection) {
+					if( ! selection.isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection) selection;
+						if( s.size() == 1 ) {
+							windowContext.set(IServiceConstants.SELECTION, s.getFirstElement());	
+						} else {
+							windowContext.set(IServiceConstants.SELECTION, s.toList());
+						}
+					}
+				}
+			});
 			return windowContext;
-		}*/
+		}
 		
 		return o;
 	}
-
-}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/SelectionProviderContextFunction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/SelectionProviderContextFunction.java
new file mode 100644
index 0000000000..42b59ca15a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/SelectionProviderContextFunction.java
@@ -0,0 +1,29 @@
+package org.eclipse.e4.tools.emf.editor3x.compat;
+
+import java.util.List;
+
+import org.eclipse.e4.core.contexts.ContextFunction;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.common.ISelectionProviderService;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+
+public class SelectionProviderContextFunction extends ContextFunction {
+
+	@Override
+	public Object compute(final IEclipseContext context, Object[] arguments) {
+		return new ISelectionProviderService() {
+			
+			public void setSelection(Object selection) {
+				ISelectionProvider pv = context.get(ISelectionProvider.class);
+				
+				if( selection instanceof List<?> ) {
+					pv.setSelection(new StructuredSelection((List<?>)selection));	
+				} else {
+					pv.setSelection(new StructuredSelection(selection));
+				}
+				
+			}
+		};
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 126b5f3432..4a3d1f26ce 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -22,7 +22,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.osgi;bundle-version="3.6.0",
  org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0",
- org.eclipse.e4.ui.workbench;bundle-version="0.9.1"
+ org.eclipse.e4.ui.workbench;bundle-version="0.9.1",
+ org.eclipse.e4.ui.services;bundle-version="0.9.1"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.osgi.framework;version="1.5.0"
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java
new file mode 100644
index 0000000000..3c1d3d5fcd
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java
@@ -0,0 +1,5 @@
+package org.eclipse.e4.tools.emf.ui.common;
+
+public interface ISelectionProviderService {
+	public void setSelection(Object selection);
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 9eb0780591..cf8ddc1dcf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -17,6 +17,7 @@
 import java.util.Map;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -31,6 +32,7 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.common.ISelectionProviderService;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.AddonsEditor;
@@ -76,6 +78,7 @@
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.e4.workbench.modeling.ESelectionService;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -132,7 +135,7 @@ public class ModelEditor {
 	private TreeViewer viewer;
 	private IModelResource modelProvider;
 	private IProject project;
-//	private ESelectionService selectionService;
+	private ISelectionProviderService selectionService;
 
 	public ModelEditor(Composite composite, IModelResource modelProvider, IProject project) {
 		this.modelProvider = modelProvider;
@@ -226,9 +229,9 @@ public void selectionChanged(SelectionChangedEvent event) {
 					Rectangle r = scrolling.getClientArea();
 					scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT));
 					
-//					if( selectionService != null ) {
-//						selectionService.setSelection(s.getFirstElement());
-//					}
+					if( selectionService != null ) {
+						selectionService.setSelection(s.getFirstElement());
+					}
 					
 				}
 			}
@@ -266,15 +269,20 @@ public void menuAboutToShow(IMenuManager manager) {
 		viewer.getControl().setMenu(mgr.createContextMenu(viewer.getControl()));
 	}
 
-//	@Inject
-//	public void setSelectionService(ESelectionService selectionService) {
-//		this.selectionService = selectionService;
-//		if( viewer != null && ! viewer.getControl().isDisposed() ) {
-//			if( ! viewer.getSelection().isEmpty() ) {
-//				selectionService.setSelection(((IStructuredSelection)viewer.getSelection()).getFirstElement());	
-//			}
-//		}
-//	}
+	@Inject @Optional
+	public void setSelectionService(ISelectionProviderService selectionService) {
+		this.selectionService = selectionService;
+		if( viewer != null && ! viewer.getControl().isDisposed() ) {
+			if( ! viewer.getSelection().isEmpty() ) {
+				selectionService.setSelection(((IStructuredSelection)viewer.getSelection()).getFirstElement());	
+			}
+		}
+	}
+	
+	@Inject
+	public void updateSelection(@Optional @Named(IServiceConstants.SELECTION) Object selection ) {
+		System.err.println("The selection: " + selection);
+	}
 	
 	private TreeViewer createTreeViewerArea(Composite parent) {
 		parent = new Composite(parent, SWT.NONE);

From a7964d9ab6f92f8a099331067bc14205026fb005 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 7 May 2010 21:21:06 +0000
Subject: [PATCH 0093/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * adding dirty lifecycle support

---
 .../emf/editor3x/XMIResourceFunction.java     | 21 +++++++++++++++++--
 .../editor3x/compat/E4CompatEditorPart.java   | 13 ++++++++----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
index 201d703644..518468e103 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
@@ -2,19 +2,36 @@
 
 import org.eclipse.e4.core.contexts.ContextFunction;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.editor3x.compat.E4CompatEditorPart;
 import org.eclipse.e4.tools.emf.editor3x.emf.EditUIUtil;
 import org.eclipse.e4.tools.emf.ui.common.XMIModelResource;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource.ModelListener;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.EditorPart;
 
 public class XMIResourceFunction extends ContextFunction {
 
 	@Override
-	public Object compute(IEclipseContext context, Object[] arguments) {
+	public Object compute(final IEclipseContext context, Object[] arguments) {
 		final IEditorInput input = context.get(IEditorInput.class);
+		final E4CompatEditorPart part = (E4CompatEditorPart) context.get(EditorPart.class);
+		
 		if( input != null ) {
 			URI resourceURI = EditUIUtil.getURI(input);
-			return new XMIModelResource(resourceURI);
+			final XMIModelResource resource = new XMIModelResource(resourceURI);
+			resource.addModelListener(new ModelListener() {
+				
+				public void dirtyChanged() {
+					context.set(EditorPart.class.getName()+".dirty", resource.isDirty());
+					part.firePropertyChange(EditorPart.PROP_DIRTY);
+				}
+
+				public void commandStackChanged() {
+					
+				}
+			});
+			return resource;
 		}
 
 		return null;
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
index 9368835102..440d7d2a07 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
@@ -37,8 +37,8 @@ public E4CompatEditorPart(String classUri) {
 	
 	@Override
 	public void doSave(IProgressMonitor monitor) {
-		// TODO Auto-generated method stub
-		
+		IContributionFactory factory = (IContributionFactory) context.get(IContributionFactory.class);
+		factory.call(instance, null, "doSave", context, null);
 	}
 
 	@Override
@@ -65,10 +65,15 @@ public void init(IEditorSite site, IEditorInput input)
 		site.setSelectionProvider(s);
 	}
 
+	@Override
+	public void firePropertyChange(int propertyId) {
+		super.firePropertyChange(propertyId);
+	}
+	
 	@Override
 	public boolean isDirty() {
-		// TODO Auto-generated method stub
-		return false;
+		Boolean b = (Boolean) context.get(EditorPart.class.getName()+".dirty");
+		return b != null && b;
 	}
 
 	@Override

From e457197d9b2baaf2d2bb08a184f3c292f66ee2ce Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 14 May 2010 13:05:19 +0000
Subject: [PATCH 0094/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * fixing support for e4-compat

---
 .../editor3x/compat/E4CompatEditorPart.java   | 27 +++++++++++++++----
 .../compat/IEclipseContextServiceFactory.java |  9 +++----
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
index 440d7d2a07..b17adaa42f 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
@@ -8,6 +8,7 @@
 import org.eclipse.e4.tools.emf.editor3x.E4WorkbenchModelEditor;
 import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
 import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.ISelectionProvider;
@@ -18,6 +19,9 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.ISelectionListener;
+import org.eclipse.ui.ISelectionService;
+import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.EditorPart;
 import org.osgi.framework.Bundle;
@@ -54,15 +58,21 @@ public void init(IEditorSite site, IEditorInput input)
 		setInput(input);
 		
 		IEclipseContext parentContext = (IEclipseContext) getSite().getService(IEclipseContext.class);
-		context = parentContext.createChild("EditPart('"+getPartName()+"')"); //$NON-NLS-1$
+		
+//		System.err.println("The context" + parentContext);
+		
+		// We are in e4 Compat-Mode
+		if( parentContext.get("org.eclipse.e4.workbench.ui.IPresentationEngine") != null ) {
+			MPart p = (MPart) getSite().getService(MPart.class);
+			context = p.getContext();
+		} else {
+			context = parentContext.createChild("EditPart('"+getPartName()+"')"); //$NON-NLS-1$	
+		}
+		
 		context.declareModifiable(IEditorInput.class);
 		context.declareModifiable(EditorPart.class);
 		context.set(EditorPart.class,this);
 		context.set(IEditorInput.class, input);
-		
-		ISelectionProvider s = new SelectionProviderImpl();
-		context.set(ISelectionProvider.class, s);
-		site.setSelectionProvider(s);
 	}
 
 	@Override
@@ -84,6 +94,11 @@ public boolean isSaveAsAllowed() {
 
 	@Override
 	public void createPartControl(Composite parent) {
+		ISelectionProvider s = new SelectionProviderImpl();
+		context.set(ISelectionProvider.class, s);
+		getSite().setSelectionProvider(s);
+
+		
 		Composite comp = new Composite(parent, SWT.NONE);
 		comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
 
@@ -140,10 +155,12 @@ public void removeSelectionChangedListener(
 		}
 		
 		public ISelection getSelection() {
+			System.err.println("Selection: " + currentSelection);
 			return currentSelection;
 		}
 		
 		public void addSelectionChangedListener(ISelectionChangedListener listener) {
+			System.err.println("Adding listener: " + listener);
 			listeners.add(listener);
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java
index 69dab9c382..8380681048 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java
@@ -6,8 +6,6 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.services.contributions.IContributionFactory;
 import org.eclipse.e4.ui.services.IServiceConstants;
-import org.eclipse.e4.workbench.modeling.ESelectionService;
-import org.eclipse.e4.workbench.ui.IWorkbench;
 import org.eclipse.e4.workbench.ui.internal.ReflectionContributionFactory;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -40,10 +38,9 @@ public Object create(Class serviceInterface, IServiceLocator parentLocator,
 		final IWorkbenchWindow window = wls.getWorkbenchWindow();
 		final IWorkbenchPartSite site = wls.getPartSite();
 
-		System.err.println("The locator: " + locator);
-		System.err.println("	Window: " + window);
-		System.err.println("	Site: " + site);
-		
+//		System.err.println("The locator: " + locator);
+//		System.err.println("	Window: " + window);
+//		System.err.println("	Site: " + site);
 		
 		Object o = parentLocator.getService(serviceInterface);
 		

From e0dbdbc081c962ef2c08eed091b74ed57b30c906 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 14 May 2010 15:22:33 +0000
Subject: [PATCH 0095/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * remove unneeded selection injection

---
 .../e4/tools/emf/ui/internal/common/ModelEditor.java  | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index cf8ddc1dcf..85adc0dfc9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -17,7 +17,6 @@
 import java.util.Map;
 
 import javax.inject.Inject;
-import javax.inject.Named;
 
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -78,8 +77,6 @@
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
-import org.eclipse.e4.ui.services.IServiceConstants;
-import org.eclipse.e4.workbench.modeling.ESelectionService;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.ecore.EClass;
@@ -279,10 +276,10 @@ public void setSelectionService(ISelectionProviderService selectionService) {
 		}
 	}
 	
-	@Inject
-	public void updateSelection(@Optional @Named(IServiceConstants.SELECTION) Object selection ) {
-		System.err.println("The selection: " + selection);
-	}
+//	@Inject
+//	public void updateSelection(@Optional @Named(IServiceConstants.SELECTION) Object selection ) {
+//		System.err.println("The selection: " + selection);
+//	}
 	
 	private TreeViewer createTreeViewerArea(Composite parent) {
 		parent = new Composite(parent, SWT.NONE);

From b5e2a3df5b1a0d406a330e373a497fbb9d7022db Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 14 May 2010 17:29:00 +0000
Subject: [PATCH 0096/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * fixed problem of not passing IProject

---
 .../e4/tools/emf/editor3x/compat/E4CompatEditorPart.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
index b17adaa42f..ae098740c8 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
@@ -1,5 +1,6 @@
 package org.eclipse.e4.tools.emf.editor3x.compat;
 
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IExecutableExtension;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.ListenerList;
@@ -19,6 +20,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.ISelectionListener;
 import org.eclipse.ui.ISelectionService;
 import org.eclipse.ui.IWorkbenchPart;
@@ -71,8 +73,15 @@ public void init(IEditorSite site, IEditorInput input)
 		
 		context.declareModifiable(IEditorInput.class);
 		context.declareModifiable(EditorPart.class);
+		
 		context.set(EditorPart.class,this);
 		context.set(IEditorInput.class, input);
+		
+		if( input instanceof IFileEditorInput ) {
+			IFileEditorInput fInput = (IFileEditorInput)getEditorInput();
+			context.set(IProject.class, fInput.getFile().getProject());
+		}
+		
 	}
 
 	@Override

From bc5d0c35f82c593dd6cc0ff6aa4e798edea8a79c Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 15 May 2010 09:47:49 +0000
Subject: [PATCH 0097/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * refactored to use a hashmap for registering virtual
 editors

---
 .../emf/ui/internal/common/ModelEditor.java   | 62 ++++++++++---------
 .../emf/ui/internal/common/VirtualEntry.java  |  6 +-
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 85adc0dfc9..6c1a85359b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -108,22 +108,22 @@
 public class ModelEditor {
 	private static final String CSS_CLASS_KEY = "org.eclipse.e4.ui.css.CssClassName"; //$NON-NLS-1$
 	
-	public static final int VIRTUAL_PART_MENU = 0;
-	public static final int VIRTUAL_PART = 1;
-	public static final int VIRTUAL_HANDLER = 2;
-	public static final int VIRTUAL_BINDING_TABLE = 3;
-	public static final int VIRTUAL_COMMAND = 4;
-	public static final int VIRTUAL_WINDOWS = 5;
-	public static final int VIRTUAL_WINDOW_CONTROLS = 6;
-	public static final int VIRTUAL_PART_DESCRIPTORS = 7;
-	public static final int VIRTUAL_MODEL_COMP_COMMANDS = 8;
-	public static final int VIRTUAL_MODEL_COMP_BINDINGS = 9;
-	public static final int VIRTUAL_PARTDESCRIPTOR_MENU = 10;
-	public static final int VIRTUAL_TRIMMED_WINDOW_TRIMS = 11;
-	public static final int VIRTUAL_ADDONS = 12;
+	public static final String VIRTUAL_PART_MENU = ModelEditor.class.getName() + ".VIRTUAL_PART_MENU"; //$NON-NLS-1$
+	public static final String VIRTUAL_PART = ModelEditor.class.getName() + ".VIRTUAL_PART"; //$NON-NLS-1$
+	public static final String VIRTUAL_HANDLER = ModelEditor.class.getName() + ".VIRTUAL_HANDLER"; //$NON-NLS-1$
+	public static final String VIRTUAL_BINDING_TABLE = ModelEditor.class.getName() + ".VIRTUAL_BINDING_TABLE"; //$NON-NLS-1$
+	public static final String VIRTUAL_COMMAND = ModelEditor.class.getName() + ".VIRTUAL_BINDING_TABLE"; //$NON-NLS-1$
+	public static final String VIRTUAL_WINDOWS = ModelEditor.class.getName() + ".VIRTUAL_BINDING_TABLE"; //$NON-NLS-1$
+	public static final String VIRTUAL_WINDOW_CONTROLS = ModelEditor.class.getName() + ".VIRTUAL_BINDING_TABLE"; //$NON-NLS-1$
+	public static final String VIRTUAL_PART_DESCRIPTORS = ModelEditor.class.getName() + ".VIRTUAL_PART_DESCRIPTORS"; //$NON-NLS-1$
+	public static final String VIRTUAL_MODEL_COMP_COMMANDS = ModelEditor.class.getName() + ".VIRTUAL_PART_DESCRIPTORS"; //$NON-NLS-1$
+	public static final String VIRTUAL_MODEL_COMP_BINDINGS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_COMP_BINDINGS"; //$NON-NLS-1$
+	public static final String VIRTUAL_PARTDESCRIPTOR_MENU = ModelEditor.class.getName() + ".VIRTUAL_MODEL_COMP_BINDINGS"; //$NON-NLS-1$
+	public static final String VIRTUAL_TRIMMED_WINDOW_TRIMS = ModelEditor.class.getName() + ".VIRTUAL_TRIMMED_WINDOW_TRIMS"; //$NON-NLS-1$
+	public static final String VIRTUAL_ADDONS = ModelEditor.class.getName() + ".VIRTUAL_TRIMMED_WINDOW_TRIMS"; //$NON-NLS-1$
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
-	private AbstractComponentEditor[] virtualEditors;
+	private Map<String,AbstractComponentEditor> virtualEditors = new HashMap<String, AbstractComponentEditor>();
 	private List<FeaturePath> labelFeaturePaths = new ArrayList<FeaturePath>();
 
 	// private List<AbstractComponentEditor> editors = new
@@ -137,8 +137,12 @@ public class ModelEditor {
 	public ModelEditor(Composite composite, IModelResource modelProvider, IProject project) {
 		this.modelProvider = modelProvider;
 		this.project = project;
+		
 		registerDefaultEditors();
 		registerVirtualEditors();
+		
+		
+		
 		SashForm form = new SashForm(composite, SWT.HORIZONTAL);
 		form.setBackground(form.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 
@@ -212,7 +216,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 						}
 					} else {
 						VirtualEntry<?> entry = (VirtualEntry<?>) s.getFirstElement();
-						AbstractComponentEditor editor = virtualEditors[entry.getId()];
+						AbstractComponentEditor editor = virtualEditors.get(entry.getId());
 						if (editor != null) {
 							textLabel.setText(editor.getLabel(entry));
 							iconLabel.setImage(editor.getImage(entry, iconLabel.getDisplay()));
@@ -246,7 +250,7 @@ public void menuAboutToShow(IMenuManager manager) {
 				if( ! s.isEmpty() ) {
 					List<Action> actions;
 					if( s.getFirstElement() instanceof VirtualEntry<?> ) {
-						actions = virtualEditors[((VirtualEntry<?>)s.getFirstElement()).getId()].getActions(s.getFirstElement());
+						actions = virtualEditors.get(((VirtualEntry<?>)s.getFirstElement()).getId()).getActions(s.getFirstElement());
 					} else {
 						EObject o = (EObject) s.getFirstElement();
 						AbstractComponentEditor editor = editorMap.get(o.eClass());
@@ -332,20 +336,18 @@ public void handleMapChange(MapChangeEvent event) {
 	}
 
 	private void registerVirtualEditors() {
-		virtualEditors = new AbstractComponentEditor[] { new VMenuEditor(modelProvider.getEditingDomain(), this, BasicPackageImpl.Literals.PART__MENUS), // V-Menu
-				null, // V-Part
-				new VHandlerEditor(modelProvider.getEditingDomain(), this), 
-				new VBindingTableEditor(modelProvider.getEditingDomain(), this), 
-				new VCommandEditor(modelProvider.getEditingDomain(), this, ApplicationPackageImpl.Literals.APPLICATION__COMMANDS), 
-				new VWindowEditor(modelProvider.getEditingDomain(), this), 
-				new VWindowControlEditor(modelProvider.getEditingDomain(), this), 
-				new VPartDescriptor(modelProvider.getEditingDomain(), this),
-				new VCommandEditor(modelProvider.getEditingDomain(), this, ApplicationPackageImpl.Literals.MODEL_COMPONENT__COMMANDS),
-				new VModelComponentBindingEditor(modelProvider.getEditingDomain(), this),
-				new VMenuEditor(modelProvider.getEditingDomain(), this, org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS),
-				new VWindowTrimEditor(modelProvider.getEditingDomain(), this),
-				new VApplicationAddons(modelProvider.getEditingDomain(), this)
-		};
+		virtualEditors.put(VIRTUAL_PART_MENU, new VMenuEditor(modelProvider.getEditingDomain(), this, BasicPackageImpl.Literals.PART__MENUS));
+		virtualEditors.put(VIRTUAL_HANDLER, new VHandlerEditor(modelProvider.getEditingDomain(), this));
+		virtualEditors.put(VIRTUAL_BINDING_TABLE,new VBindingTableEditor(modelProvider.getEditingDomain(), this));
+		virtualEditors.put(VIRTUAL_COMMAND,new VCommandEditor(modelProvider.getEditingDomain(), this, ApplicationPackageImpl.Literals.APPLICATION__COMMANDS));
+		virtualEditors.put(VIRTUAL_WINDOWS, new VWindowEditor(modelProvider.getEditingDomain(), this));
+		virtualEditors.put(VIRTUAL_WINDOW_CONTROLS, new VWindowControlEditor(modelProvider.getEditingDomain(), this));
+		virtualEditors.put(VIRTUAL_PART_DESCRIPTORS, new VPartDescriptor(modelProvider.getEditingDomain(), this));
+		virtualEditors.put(VIRTUAL_MODEL_COMP_COMMANDS, new VCommandEditor(modelProvider.getEditingDomain(), this, ApplicationPackageImpl.Literals.MODEL_COMPONENT__COMMANDS));
+		virtualEditors.put(VIRTUAL_MODEL_COMP_BINDINGS, new VModelComponentBindingEditor(modelProvider.getEditingDomain(), this));
+		virtualEditors.put(VIRTUAL_PARTDESCRIPTOR_MENU, new VMenuEditor(modelProvider.getEditingDomain(), this, org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS));
+		virtualEditors.put(VIRTUAL_TRIMMED_WINDOW_TRIMS, new VWindowTrimEditor(modelProvider.getEditingDomain(), this));
+		virtualEditors.put(VIRTUAL_ADDONS, new VApplicationAddons(modelProvider.getEditingDomain(), this));
 	}
 
 	public void setSelection(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
index abd4625833..46279ef22b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
@@ -22,12 +22,12 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 
 public abstract class VirtualEntry<M> {
-	private int id;
+	private String id;
 	private Object originalParent;
 	private String label;
 	private IObservableList list;
 
-	public VirtualEntry(int id, IListProperty property, Object originalParent, String label) {
+	public VirtualEntry(String id, IListProperty property, Object originalParent, String label) {
 		this.id = id;
 		this.originalParent = originalParent;
 		this.label = label;
@@ -68,7 +68,7 @@ public Object getOriginalParent() {
 		return originalParent;
 	}
 
-	public int getId() {
+	public String getId() {
 		return id;
 	}
 

From 64030ec0821dde9ed7f6ed7d28c00ddaf17d49a4 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 15 May 2010 11:00:14 +0000
Subject: [PATCH 0098/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * started adding contributions

---
 .../META-INF/MANIFEST.MF                      |   4 +-
 .../org.eclipse.e4.tools.emf.ui/plugin.xml    |   1 +
 .../org.eclipse.e4.tools.emf.ui.editors.exsd  | 102 ++++++++++++++++++
 .../emf/ui/common/IEditorDescriptor.java      |   8 ++
 .../emf/ui/internal/common/ModelEditor.java   |  34 +++++-
 .../internal/wbm/ApplicationModelEditor.java  |   5 +-
 6 files changed, 149 insertions(+), 5 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 4a3d1f26ce..073c16d827 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -23,7 +23,9 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0",
  org.eclipse.e4.ui.workbench;bundle-version="0.9.1",
- org.eclipse.e4.ui.services;bundle-version="0.9.1"
+ org.eclipse.e4.ui.services;bundle-version="0.9.1",
+ org.eclipse.equinox.registry;bundle-version="3.5.0",
+ org.eclipse.e4.core.contexts;bundle-version="0.9.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.osgi.framework;version="1.5.0"
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml b/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
index 1b2fb64bfe..b3cd9703c8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
+   <extension-point id="org.eclipse.e4.tools.emf.ui.editors" name="Editors" schema="schema/org.eclipse.e4.tools.emf.ui.editors.exsd"/>
    <extension
          point="org.eclipse.e4.ui.css.swt.theme">
       <stylesheet
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd b/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
new file mode 100644
index 0000000000..aec2bebe99
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
@@ -0,0 +1,102 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.e4.tools.emf.ui" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.e4.tools.emf.ui" id="org.eclipse.e4.tools.emf.ui.editors" name="Editors"/>
+      </appinfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="editor" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="editor">
+      <complexType>
+         <attribute name="descriptorClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.e4.tools.emf.ui.common.IEditorDescriptor"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java
new file mode 100644
index 0000000000..de57bc4ae2
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java
@@ -0,0 +1,8 @@
+package org.eclipse.e4.tools.emf.ui.common;
+
+import org.eclipse.emf.ecore.EClass;
+
+public interface IEditorDescriptor {
+	public EClass getEClass();
+	public Class<?> getEditorClass();
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 6c1a85359b..3ae1ccddb7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -28,8 +28,17 @@
 import org.eclipse.core.databinding.observable.set.SetChangeEvent;
 import org.eclipse.core.databinding.observable.set.WritableSet;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.RegistryFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.core.services.contributions.IContributionFactory;
+import org.eclipse.e4.tools.emf.ui.common.IEditorDescriptor;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.ISelectionProviderService;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -81,6 +90,7 @@
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
@@ -133,14 +143,16 @@ public class ModelEditor {
 	private IModelResource modelProvider;
 	private IProject project;
 	private ISelectionProviderService selectionService;
+	private IEclipseContext context;
 
-	public ModelEditor(Composite composite, IModelResource modelProvider, IProject project) {
+	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project) {
 		this.modelProvider = modelProvider;
 		this.project = project;
+		this.context = context;
 		
 		registerDefaultEditors();
 		registerVirtualEditors();
-		
+		registerContributedEditors();
 		
 		
 		SashForm form = new SashForm(composite, SWT.HORIZONTAL);
@@ -353,6 +365,24 @@ private void registerVirtualEditors() {
 	public void setSelection(Object element) {
 		viewer.setSelection(new StructuredSelection(element));
 	}
+	
+	private void registerContributedEditors() {
+		IExtensionRegistry registry = RegistryFactory.getRegistry();
+		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
+		
+		for( IConfigurationElement el : extPoint.getConfigurationElements() ) {
+			try {
+				IEditorDescriptor desc = (IEditorDescriptor) el.createExecutableExtension("descriptorClass"); //$NON-NLS-1$
+				EClass eClass = desc.getEClass();
+				IContributionFactory fact = context.get(IContributionFactory.class);
+				AbstractComponentEditor editor = (AbstractComponentEditor) fact.create("platform:/plugin/"+el.getContributor().getName()+"/"+desc.getEditorClass().getName(), context); //$NON-NLS-1$ //$NON-NLS-2$
+				registerEditor(eClass, editor);
+			} catch (CoreException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+	}
 
 	private void registerDefaultEditors() {
 		registerEditor(ApplicationPackageImpl.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index 4104bbecd2..fe83cd6563 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -13,6 +13,7 @@
 import javax.inject.Inject;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
@@ -20,8 +21,8 @@
 
 public class ApplicationModelEditor extends ModelEditor {
 	@Inject
-	public ApplicationModelEditor(Composite composite,
+	public ApplicationModelEditor(Composite composite, IEclipseContext context,
 			@Optional IModelResource modelProvider, @Optional IProject project) {
-		super(composite, modelProvider, project);
+		super(composite, context, modelProvider, project);
 	}
 }

From 86060cf31cd8084e46b9c9f4e4e825238ed9c2df Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 15 May 2010 12:03:40 +0000
Subject: [PATCH 0099/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * fixed ids

---
 .../META-INF/MANIFEST.MF                      |  1 +
 .../org.eclipse.e4.tools.emf.ui.editors.exsd  | 23 +++++++
 .../emf/ui/internal/common/ModelEditor.java   | 65 +++++++++++++------
 .../component/virtual/VPartDescriptor.java    |  2 +-
 4 files changed, 69 insertions(+), 22 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 073c16d827..ed036f7e4f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -31,6 +31,7 @@ Import-Package: javax.inject;version="1.0.0",
  org.osgi.framework;version="1.5.0"
 Export-Package: org.eclipse.e4.tools.emf.ui.common,
  org.eclipse.e4.tools.emf.ui.common.component,
+ org.eclipse.e4.tools.emf.ui.internal;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.common;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.common.component;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.wbm;x-friends:="org.eclipse.e4.tools.emf.editor"
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd b/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
index aec2bebe99..352421fdf6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
+++ b/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
@@ -19,6 +19,7 @@
       <complexType>
          <sequence>
             <element ref="editor" minOccurs="1" maxOccurs="unbounded"/>
+            <element ref="virtualeditor" minOccurs="1" maxOccurs="unbounded"/>
          </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>
@@ -62,6 +63,28 @@
       </complexType>
    </element>
 
+   <element name="virtualeditor">
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn="org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor:"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
    <annotation>
       <appinfo>
          <meta.section type="since"/>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 3ae1ccddb7..9f607398a3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -30,7 +30,6 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -90,7 +89,6 @@
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
@@ -122,15 +120,15 @@ public class ModelEditor {
 	public static final String VIRTUAL_PART = ModelEditor.class.getName() + ".VIRTUAL_PART"; //$NON-NLS-1$
 	public static final String VIRTUAL_HANDLER = ModelEditor.class.getName() + ".VIRTUAL_HANDLER"; //$NON-NLS-1$
 	public static final String VIRTUAL_BINDING_TABLE = ModelEditor.class.getName() + ".VIRTUAL_BINDING_TABLE"; //$NON-NLS-1$
-	public static final String VIRTUAL_COMMAND = ModelEditor.class.getName() + ".VIRTUAL_BINDING_TABLE"; //$NON-NLS-1$
-	public static final String VIRTUAL_WINDOWS = ModelEditor.class.getName() + ".VIRTUAL_BINDING_TABLE"; //$NON-NLS-1$
-	public static final String VIRTUAL_WINDOW_CONTROLS = ModelEditor.class.getName() + ".VIRTUAL_BINDING_TABLE"; //$NON-NLS-1$
+	public static final String VIRTUAL_COMMAND = ModelEditor.class.getName() + ".VIRTUAL_COMMAND"; //$NON-NLS-1$
+	public static final String VIRTUAL_WINDOWS = ModelEditor.class.getName() + ".VIRTUAL_WINDOWS"; //$NON-NLS-1$
+	public static final String VIRTUAL_WINDOW_CONTROLS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_CONTROLS"; //$NON-NLS-1$
 	public static final String VIRTUAL_PART_DESCRIPTORS = ModelEditor.class.getName() + ".VIRTUAL_PART_DESCRIPTORS"; //$NON-NLS-1$
-	public static final String VIRTUAL_MODEL_COMP_COMMANDS = ModelEditor.class.getName() + ".VIRTUAL_PART_DESCRIPTORS"; //$NON-NLS-1$
+	public static final String VIRTUAL_MODEL_COMP_COMMANDS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_COMP_COMMANDS"; //$NON-NLS-1$
 	public static final String VIRTUAL_MODEL_COMP_BINDINGS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_COMP_BINDINGS"; //$NON-NLS-1$
-	public static final String VIRTUAL_PARTDESCRIPTOR_MENU = ModelEditor.class.getName() + ".VIRTUAL_MODEL_COMP_BINDINGS"; //$NON-NLS-1$
+	public static final String VIRTUAL_PARTDESCRIPTOR_MENU = ModelEditor.class.getName() + ".VIRTUAL_PARTDESCRIPTOR_MENU"; //$NON-NLS-1$
 	public static final String VIRTUAL_TRIMMED_WINDOW_TRIMS = ModelEditor.class.getName() + ".VIRTUAL_TRIMMED_WINDOW_TRIMS"; //$NON-NLS-1$
-	public static final String VIRTUAL_ADDONS = ModelEditor.class.getName() + ".VIRTUAL_TRIMMED_WINDOW_TRIMS"; //$NON-NLS-1$
+	public static final String VIRTUAL_ADDONS = ModelEditor.class.getName() + ".VIRTUAL_ADDONS"; //$NON-NLS-1$
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private Map<String,AbstractComponentEditor> virtualEditors = new HashMap<String, AbstractComponentEditor>();
@@ -152,8 +150,9 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 		
 		registerDefaultEditors();
 		registerVirtualEditors();
-		registerContributedEditors();
 		
+		registerContributedEditors();
+		registerContributedVirtualEditors();
 		
 		SashForm form = new SashForm(composite, SWT.HORIZONTAL);
 		form.setBackground(form.getDisplay().getSystemColor(SWT.COLOR_WHITE));
@@ -346,22 +345,42 @@ public void handleMapChange(MapChangeEvent event) {
 
 		return viewer;
 	}
+	
+	private void registerContributedVirtualEditors() {
+		IExtensionRegistry registry = RegistryFactory.getRegistry();
+		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
+		
+		for( IConfigurationElement el : extPoint.getConfigurationElements() ) {
+			if( ! "virtualeditor".equals(el.getName()) ) {
+				continue;
+			}
+			
+			IContributionFactory fact = context.get(IContributionFactory.class);
+			AbstractComponentEditor editor = (AbstractComponentEditor) fact.create("platform:/plugin/"+el.getContributor().getName()+"/"+el.getAttribute("class"), context); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			registerVirtualEditor(el.getAttribute("id"), editor); //$NON-NLS-1$
+		}
+	}
 
 	private void registerVirtualEditors() {
-		virtualEditors.put(VIRTUAL_PART_MENU, new VMenuEditor(modelProvider.getEditingDomain(), this, BasicPackageImpl.Literals.PART__MENUS));
-		virtualEditors.put(VIRTUAL_HANDLER, new VHandlerEditor(modelProvider.getEditingDomain(), this));
-		virtualEditors.put(VIRTUAL_BINDING_TABLE,new VBindingTableEditor(modelProvider.getEditingDomain(), this));
-		virtualEditors.put(VIRTUAL_COMMAND,new VCommandEditor(modelProvider.getEditingDomain(), this, ApplicationPackageImpl.Literals.APPLICATION__COMMANDS));
-		virtualEditors.put(VIRTUAL_WINDOWS, new VWindowEditor(modelProvider.getEditingDomain(), this));
-		virtualEditors.put(VIRTUAL_WINDOW_CONTROLS, new VWindowControlEditor(modelProvider.getEditingDomain(), this));
-		virtualEditors.put(VIRTUAL_PART_DESCRIPTORS, new VPartDescriptor(modelProvider.getEditingDomain(), this));
-		virtualEditors.put(VIRTUAL_MODEL_COMP_COMMANDS, new VCommandEditor(modelProvider.getEditingDomain(), this, ApplicationPackageImpl.Literals.MODEL_COMPONENT__COMMANDS));
-		virtualEditors.put(VIRTUAL_MODEL_COMP_BINDINGS, new VModelComponentBindingEditor(modelProvider.getEditingDomain(), this));
-		virtualEditors.put(VIRTUAL_PARTDESCRIPTOR_MENU, new VMenuEditor(modelProvider.getEditingDomain(), this, org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS));
-		virtualEditors.put(VIRTUAL_TRIMMED_WINDOW_TRIMS, new VWindowTrimEditor(modelProvider.getEditingDomain(), this));
-		virtualEditors.put(VIRTUAL_ADDONS, new VApplicationAddons(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_PART_MENU, new VMenuEditor(modelProvider.getEditingDomain(), this, BasicPackageImpl.Literals.PART__MENUS));
+		registerVirtualEditor(VIRTUAL_HANDLER, new VHandlerEditor(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_BINDING_TABLE,new VBindingTableEditor(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_COMMAND,new VCommandEditor(modelProvider.getEditingDomain(), this, ApplicationPackageImpl.Literals.APPLICATION__COMMANDS));
+		registerVirtualEditor(VIRTUAL_WINDOWS, new VWindowEditor(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_WINDOW_CONTROLS, new VWindowControlEditor(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_PART_DESCRIPTORS, new VPartDescriptor(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_MODEL_COMP_COMMANDS, new VCommandEditor(modelProvider.getEditingDomain(), this, ApplicationPackageImpl.Literals.MODEL_COMPONENT__COMMANDS));
+		registerVirtualEditor(VIRTUAL_MODEL_COMP_BINDINGS, new VModelComponentBindingEditor(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_PARTDESCRIPTOR_MENU, new VMenuEditor(modelProvider.getEditingDomain(), this, org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS));
+		registerVirtualEditor(VIRTUAL_TRIMMED_WINDOW_TRIMS, new VWindowTrimEditor(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_ADDONS, new VApplicationAddons(modelProvider.getEditingDomain(), this));
 	}
 
+	private void registerVirtualEditor(String id, AbstractComponentEditor editor ) {
+//		System.err.println("Registering: " + id + " => " + editor);
+		virtualEditors.put(id, editor);
+	}
+	
 	public void setSelection(Object element) {
 		viewer.setSelection(new StructuredSelection(element));
 	}
@@ -371,6 +390,10 @@ private void registerContributedEditors() {
 		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
 		
 		for( IConfigurationElement el : extPoint.getConfigurationElements() ) {
+			if( ! "editor".equals(el.getName()) ) {
+				continue;
+			}
+			
 			try {
 				IEditorDescriptor desc = (IEditorDescriptor) el.createExecutableExtension("descriptorClass"); //$NON-NLS-1$
 				EClass eClass = desc.getEClass();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index a7a67a9fbb..5e9b1b0105 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -98,7 +98,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Commands");
+			l.setText("Descriptors");
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			viewer = new TableViewer(parent);

From e14d060904ccd007850a6031e5a21b0ca493e9d6 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 15 May 2010 12:56:51 +0000
Subject: [PATCH 0100/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * allow reusing editor stuff

---
 bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 69418fc9db..e419afd5cf 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -25,3 +25,4 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.ui.services;bundle-version="0.9.1"
 Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/selectionproviderfunction.xml
 Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.e4.tools.emf.editor3x.wizard;x-internal:=true

From fc55b4e8fc82a9a99e142991fb12d0fb8d61f1ea Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 15 May 2010 12:57:24 +0000
Subject: [PATCH 0101/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * fixed problem with PartDescriptor not being an
 MContribution

---
 .../org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF |  1 +
 .../ui/internal/common/component/AddonsEditor.java   |  2 +-
 .../common/component/DirectMenuItemEditor.java       |  2 +-
 .../common/component/DirectToolItemEditor.java       |  2 +-
 .../ui/internal/common/component/HandlerEditor.java  |  2 +-
 .../common/component/PartDescriptorEditor.java       |  3 ++-
 .../emf/ui/internal/common/component/PartEditor.java |  2 +-
 .../internal/common/component/ToolControlEditor.java |  2 +-
 .../component/dialogs/ContributionClassDialog.java   | 12 +++++++-----
 9 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index ed036f7e4f..17124bd75b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -34,5 +34,6 @@ Export-Package: org.eclipse.e4.tools.emf.ui.common,
  org.eclipse.e4.tools.emf.ui.internal;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.common;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.common.component;x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.wbm;x-friends:="org.eclipse.e4.tools.emf.editor"
 Service-Component: OSGI-INF/contributioncollector.xml
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 77f150bd6e..1d18d4543c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -124,7 +124,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue());
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index e5b37626c1..1e3c331d06 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -88,7 +88,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue());
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index fd096578bc..8783f4d2e6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -77,7 +77,7 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue());
+				ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
 				dialog.open();
 			}
 		});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 5507efc4c8..f8fbf66691 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -145,7 +145,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue());
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 0e603ee683..01289815b2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -28,6 +28,7 @@
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.descriptor.basic.util.BasicAdapterFactory;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -176,7 +177,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue());
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MPartDescriptor) getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 1bfedacb40..0ae6c6630b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -175,7 +175,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue());
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 429fe92971..2c7bff92e3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -128,7 +128,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue());
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index 175a546737..1dbe714f9d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -18,9 +18,9 @@
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
-import org.eclipse.e4.ui.model.application.MContribution;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -53,15 +53,17 @@
 public class ContributionClassDialog extends TitleAreaDialog {
 	private IProject project;
 	private Image javaClassImage;
-	private MContribution contribution;
+	private MApplicationElement contribution;
 	private EditingDomain editingDomain;
 	private TableViewer viewer;
+	private EStructuralFeature feature;
 	
-	public ContributionClassDialog(Shell parentShell, IProject project, EditingDomain editingDomain, MContribution contribution) {
+	public ContributionClassDialog(Shell parentShell, IProject project, EditingDomain editingDomain, MApplicationElement contribution, EStructuralFeature feature) {
 		super(parentShell);
 		this.project = project;	
 		this.contribution = contribution;
 		this.editingDomain = editingDomain;
+		this.feature = feature;
 	}
 
 	@Override
@@ -156,7 +158,7 @@ protected void okPressed() {
 		if( ! s.isEmpty() ) {
 			ContributionData cd = (ContributionData) s.getFirstElement();
 			String uri = "platform:/plugin/" + cd.bundleName + "/" + cd.className; //$NON-NLS-1$ //$NON-NLS-2$
-			Command cmd = SetCommand.create(editingDomain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, uri);
+			Command cmd = SetCommand.create(editingDomain, contribution, feature, uri);
 			if( cmd.canExecute() ) {
 				editingDomain.getCommandStack().execute(cmd);
 				super.okPressed();

From 10eb0d74f08c92daa0f561afb278aee0b98a51e8 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 15 May 2010 13:34:25 +0000
Subject: [PATCH 0102/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * fixed translation

---
 .../src/org/eclipse/e4/tools/emf/ui/internal/Messages.java   | 5 ++++-
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.properties | 1 +
 .../emf/ui/internal/common/component/PerspectiveEditor.java  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 3d09b37b90..3570f4e557 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -244,6 +244,7 @@ public class Messages {
 	public static String PerspectiveEditor_Label;
 	public static String PerspectiveEditor_Description;
 	public static String PerspectiveEditor_Id;
+	public static String PerspectiveEditor_LabelLabel;	
 	public static String PerspectiveEditor_SelectedElement;
 	public static String PerspectiveEditor_Tooltip;
 	public static String PerspectiveEditor_IconURI;
@@ -303,7 +304,9 @@ public class Messages {
 	public static String ContributionClassDialog_DialogMessage;
 	public static String ContributionClassDialog_DialogTitle;
 	public static String ContributionClassDialog_Label_Classname;
-	public static String ContributionClassDialog_ShellTitle;	
+	public static String ContributionClassDialog_ShellTitle;
+
+	
 	
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index ebdb796cab..e1f3fa7cbd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -238,6 +238,7 @@ PartStackEditor_ContainerData=Container Data
 PerspectiveEditor_Label=Perspective
 PerspectiveEditor_Description=Perspective Bla Bla Bla
 PerspectiveEditor_Id=Id
+PerspectiveEditor_LabelLabel=Label	
 PerspectiveEditor_SelectedElement=Selected Element
 PerspectiveEditor_Label=Label
 PerspectiveEditor_Tooltip=Tooltip
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index c2b152b1bb..a583ad7c07 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -191,7 +191,7 @@ public void handleValueChange(ValueChangeEvent event) {
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PerspectiveEditor_Label);
+			l.setText(Messages.PerspectiveEditor_LabelLabel);
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);

From 32e11d4ef20c54245f2c240e1e3a307b1b0cc6eb Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 15 May 2010 14:44:54 +0000
Subject: [PATCH 0103/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * fixed with bundle name extraction

---
 .../e4/tools/emf/editor3x/PDEClassContributionProvider.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index b137eb5b90..cf55a477d1 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -95,6 +95,9 @@ public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
 								if( line.startsWith("Bundle-SymbolicName:") ) {
 									int start = line.indexOf(':');
 									int end = line.indexOf(';');
+									if( end == -1 ) {
+										end = line.length();
+									}
 									ContributionData data = new ContributionData(line.substring(start+1,end).trim(), content, "Java", null);
 									handler.result(data);
 									break;

From f1909d31866ef2832e45adb90f0618f17e27c125 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 15 May 2010 15:27:06 +0000
Subject: [PATCH 0104/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * adding support to contribute ui elements

---
 .../e4/tools/emf/ui/internal/Messages.java    |   2 +-
 .../tools/emf/ui/internal/Messages.properties |   2 +-
 .../emf/ui/internal/common/ModelEditor.java   |   4 +-
 .../component/ModelComponentEditor.java       |   5 +-
 .../virtual/VModelComponentUIEditor.java      | 265 ++++++++++++++++++
 5 files changed, 273 insertions(+), 5 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentUIEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 3570f4e557..32762c9cdd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -163,7 +163,7 @@ public class Messages {
 	public static String ModelComponentEditor_KeyBindings;
 	public static String ModelComponentEditor_Commands;
 	public static String ModelComponentEditor_Menus;
-	public static String ModelComponentEditor_Parts;
+	public static String ModelComponentEditor_UiChildren;
 	public static String ModelComponentEditor_PartDescriptors;
 	public static String ModelComponentEditor_DetailParentId;
 	
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index e1f3fa7cbd..938e2ca60e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -158,7 +158,7 @@ ModelComponentEditor_BindingTables=BindingTables
 ModelComponentEditor_KeyBindings=KeyBindings
 ModelComponentEditor_Commands=Commands
 ModelComponentEditor_Menus=Menus
-ModelComponentEditor_Parts=Parts
+ModelComponentEditor_UiChildren=UI-Children
 ModelComponentEditor_PartDescriptors=PartDescriptors
 ModelComponentEditor_DetailParentId=parentId
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 9f607398a3..24e151b4c8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -73,6 +73,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationAddons;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VBindingTableEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VCommandEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelComponentUIEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowControlEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuEditor;
@@ -117,7 +118,7 @@ public class ModelEditor {
 	private static final String CSS_CLASS_KEY = "org.eclipse.e4.ui.css.CssClassName"; //$NON-NLS-1$
 	
 	public static final String VIRTUAL_PART_MENU = ModelEditor.class.getName() + ".VIRTUAL_PART_MENU"; //$NON-NLS-1$
-	public static final String VIRTUAL_PART = ModelEditor.class.getName() + ".VIRTUAL_PART"; //$NON-NLS-1$
+	public static final String VIRTUAL_MODEL_COMPONENT_CHILDREN = ModelEditor.class.getName() + ".VIRTUAL_MODEL_COMPONENT_CHILDREN"; //$NON-NLS-1$
 	public static final String VIRTUAL_HANDLER = ModelEditor.class.getName() + ".VIRTUAL_HANDLER"; //$NON-NLS-1$
 	public static final String VIRTUAL_BINDING_TABLE = ModelEditor.class.getName() + ".VIRTUAL_BINDING_TABLE"; //$NON-NLS-1$
 	public static final String VIRTUAL_COMMAND = ModelEditor.class.getName() + ".VIRTUAL_COMMAND"; //$NON-NLS-1$
@@ -374,6 +375,7 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_PARTDESCRIPTOR_MENU, new VMenuEditor(modelProvider.getEditingDomain(), this, org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS));
 		registerVirtualEditor(VIRTUAL_TRIMMED_WINDOW_TRIMS, new VWindowTrimEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_ADDONS, new VApplicationAddons(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_MODEL_COMPONENT_CHILDREN, new VModelComponentUIEditor(modelProvider.getEditingDomain(), this));
 	}
 
 	private void registerVirtualEditor(String id, AbstractComponentEditor editor ) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index b0667831ad..19b89c0a9c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -25,6 +25,7 @@
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -231,11 +232,11 @@ protected boolean accepted(Object o) {
 			}
 
 		});
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART, MODEL_COMPONENT__CHILDREN, element, Messages.ModelComponentEditor_Parts) {
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MODEL_COMPONENT_CHILDREN, MODEL_COMPONENT__CHILDREN, element, Messages.ModelComponentEditor_UiChildren) {
 
 			@Override
 			protected boolean accepted(Object o) {
-				return o instanceof MPart;
+				return o instanceof MUIElement;
 			}
 
 		});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentUIEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentUIEditor.java
new file mode 100644
index 0000000000..0c3c40f7d5
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentUIEditor.java
@@ -0,0 +1,265 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MModelComponent;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VModelComponentUIEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+	private TableViewer viewer;
+
+	public VModelComponentUIEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "UI-Children";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "UI-Children Bla Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Children");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			
+			viewer = new TableViewer(parent);
+			viewer.setContentProvider(new ObservableListContentProvider());
+			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+						
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout(2,false);
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MModelComponent container = (MModelComponent) getMaster().getValue();
+							int idx = container.getDescriptors().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__CHILDREN, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MModelComponent container = (MModelComponent) getMaster().getValue();
+							int idx = container.getDescriptors().indexOf(obj) + 1;
+							if( idx < container.getDescriptors().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__CHILDREN, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			
+			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					EClass eclass = (EClass) element;
+					return eclass.getName();
+				}
+			});
+			childrenDropDown.setInput(new EClass[] { 
+					// Basic
+					BasicPackageImpl.Literals.PART, 
+					BasicPackageImpl.Literals.INPUT_PART, 
+					BasicPackageImpl.Literals.PART_STACK,
+					BasicPackageImpl.Literals.PART_SASH_CONTAINER,
+					BasicPackageImpl.Literals.TRIM_BAR,
+					BasicPackageImpl.Literals.TRIM_ELEMENT,
+					BasicPackageImpl.Literals.WINDOW, 
+					BasicPackageImpl.Literals.TRIMMED_WINDOW,
+					// Advanced
+					AdvancedPackageImpl.Literals.PERSPECTIVE,
+					AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
+					// Menu
+					MenuPackageImpl.Literals.MENU_SEPARATOR,
+					MenuPackageImpl.Literals.MENU,
+					MenuPackageImpl.Literals.HANDLED_MENU_ITEM,
+					MenuPackageImpl.Literals.DIRECT_MENU_ITEM,
+					MenuPackageImpl.Literals.TOOL_BAR,
+					MenuPackageImpl.Literals.HANDLED_TOOL_ITEM,
+					MenuPackageImpl.Literals.DIRECT_TOOL_ITEM,
+					MenuPackageImpl.Literals.TOOL_CONTROL,
+					MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR
+					});
+			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
+
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					EClass eClass = (EClass) ((IStructuredSelection)childrenDropDown.getSelection()).getFirstElement();
+					MUIElement obj = (MUIElement) EcoreUtil.create(eClass);
+					
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__CHILDREN, obj);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(obj);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> commands = ((IStructuredSelection)viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__CHILDREN, commands);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+}

From f8a5bd248b02389c2ffe00379e97f4c71bc231cd Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 15 May 2010 19:37:23 +0000
Subject: [PATCH 0105/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * removed wrong contribution


From 58f704a9ff773db1321d2d6f9ae61c79abc80d5b Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 15 May 2010 19:40:08 +0000
Subject: [PATCH 0106/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * started adding support for icon selection

---
 .../META-INF/MANIFEST.MF                      |   1 +
 .../internal/common/component/PartEditor.java |  13 +-
 .../AbstractCommandSelectionDialog.java       |   2 +-
 .../component/dialogs/AbstractIconDialog.java | 300 ++++++++++++++++++
 .../dialogs/PartIconDialogEditor.java         |  30 ++
 5 files changed, 343 insertions(+), 3 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 17124bd75b..49455424fa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -28,6 +28,7 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
+ org.eclipse.core.runtime.jobs,
  org.osgi.framework;version="1.5.0"
 Export-Package: org.eclipse.e4.tools.emf.ui.common,
  org.eclipse.e4.tools.emf.ui.common.component,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 0ae6c6630b..e118933576 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -24,6 +24,8 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AbstractIconDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -155,9 +157,16 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText(Messages.PartEditor_Find);			
+			b.setText(Messages.PartEditor_Find);
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), project,getEditingDomain(),(MPart) getMaster().getValue());
+					dialog.open();
+				}
+			});
 		}
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index b178f7f71b..de8ebadffe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -80,7 +80,7 @@ protected Control createDialogArea(Composite parent) {
 		viewer = new TableViewer(container);
 		viewer.setContentProvider(new ArrayContentProvider());
 		viewer.setLabelProvider(new LabelProviderImpl());
-		viewer.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
 			
 			public void doubleClick(DoubleClickEvent event) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
new file mode 100644
index 0000000000..1b978fcf30
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
@@ -0,0 +1,300 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.e4.tools.emf.ui.internal.StringMatcher;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.graphics.Image;
+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;
+
+public abstract class AbstractIconDialog extends TitleAreaDialog {
+	private TableViewer viewer;
+	private IProject project;
+	private MApplicationElement element;
+	private EStructuralFeature feature;
+	private EditingDomain editingDomain;
+	private Map<IFile, Image> icons = Collections.synchronizedMap(new HashMap<IFile, Image>());
+
+	public AbstractIconDialog(Shell parentShell, IProject project, EditingDomain editingDomain, MApplicationElement element, EStructuralFeature feature) {
+		super(parentShell);
+		this.editingDomain = editingDomain;
+		this.element = element;
+		this.feature = feature;
+		this.project = project;
+	}
+
+	protected abstract String getShellTitle();
+
+	protected abstract String getDialogTitle();
+
+	protected abstract String getDialogMessage();
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite comp = (Composite) super.createDialogArea(parent);
+
+		getShell().setText(getShellTitle());
+		setTitle(getDialogTitle());
+		setMessage(getDialogMessage());
+
+		Composite container = new Composite(comp, SWT.NONE);
+		container.setLayoutData(new GridData(GridData.FILL_BOTH));
+		container.setLayout(new GridLayout(2, false));
+
+		Label l = new Label(container, SWT.NONE);
+		l.setText("IconName");
+
+		final Text t = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		new Label(container, SWT.NONE);
+
+		viewer = new TableViewer(container);
+		GridData gd = new GridData(GridData.FILL_BOTH);
+		viewer.getControl().setLayoutData(gd);
+		viewer.setContentProvider(new ObservableListContentProvider());
+		viewer.setLabelProvider(new StyledCellLabelProvider() {
+			@Override
+			public void update(ViewerCell cell) {
+				IFile file = (IFile) cell.getElement();
+				StyledString styledString = new StyledString(file.getProjectRelativePath().toString(), null);
+
+				Image img = icons.get(file);
+				if (img == null) {
+					InputStream in = null;
+					try {
+						in = file.getContents();
+						img = new Image(cell.getControl().getDisplay(), in);
+						icons.put(file, img);
+					} catch (CoreException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					} finally {
+						if (in != null) {
+							try {
+								in.close();
+							} catch (IOException e) {
+								// TODO Auto-generated catch block
+								e.printStackTrace();
+							}
+						}
+					}
+				}
+				
+				String bundle = getBundle(file);
+				if( bundle != null ) {
+					styledString.append(" - " + bundle, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$	
+				}
+				
+				cell.setImage(img);
+				cell.setText(styledString.getString());
+				cell.setStyleRanges(styledString.getStyleRanges());
+			}
+		});
+
+		final WritableList list = new WritableList();
+		viewer.setInput(list);
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+			
+			public void doubleClick(DoubleClickEvent event) {
+				okPressed();
+			}
+		});
+
+		t.addModifyListener(new ModifyListener() {
+			private IconMatchCallback callback;
+			private Timer timer = new Timer(true);
+			private TimerTask task;
+
+			public void modifyText(ModifyEvent e) {
+				if (callback != null) {
+					callback.cancel = true;
+				}
+				if (task != null) {
+					task.cancel();
+				}
+				list.clear();
+				
+				clearImages();
+
+				callback = new IconMatchCallback(list);
+				task = new SearchThread(callback, t.getText(), project);
+				timer.schedule(task, 500);
+			}
+		});
+
+		getShell().addDisposeListener(new DisposeListener() {
+
+			public void widgetDisposed(DisposeEvent e) {
+				clearImages();
+			}
+		});
+
+		return comp;
+	}
+	
+	private void clearImages() {
+		for (Image img : icons.values()) {
+			img.dispose();
+		}
+		icons.clear();
+	}
+	
+	@Override
+	protected void okPressed() {
+		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+		if( ! s.isEmpty() ) {
+			IFile file = (IFile) s.getFirstElement();
+			String bundle = getBundle(file);
+			String uri = "platform:/plugin/"+bundle+"/"+file.getProjectRelativePath().toString();
+			Command cmd = SetCommand.create(editingDomain, element, feature, uri);
+			if( cmd.canExecute() ) {
+				editingDomain.getCommandStack().execute(cmd);
+				super.okPressed();
+			}
+		}
+	}
+
+	private String getBundle(IFile file) {
+		IProject project = file.getProject();
+		IFile f = project.getFile("/META-INF/MANIFEST.MF"); //$NON-NLS-1$
+
+		if (f != null && f.exists()) {
+			BufferedReader r = null;
+			try {
+				InputStream s = f.getContents();
+				r = new BufferedReader(new InputStreamReader(s));
+				String line;
+				while ((line = r.readLine()) != null) {
+					if (line.startsWith("Bundle-SymbolicName:")) { //$NON-NLS-1$
+						int start = line.indexOf(':');
+						int end = line.indexOf(';');
+						if (end == -1) {
+							end = line.length();
+						}
+						return line.substring(start + 1, end).trim();
+					}
+				}
+			} catch (CoreException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} finally {
+				if (r != null) {
+					try {
+						r.close();
+					} catch (IOException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+		return null;
+	}
+	
+	private class IconMatchCallback {
+		private volatile boolean cancel;
+		private IObservableList list;
+
+		private IconMatchCallback(IObservableList list) {
+			this.list = list;
+		}
+
+		public void match(final IFile file) {
+			if (!cancel) {
+				list.getRealm().exec(new Runnable() {
+
+					public void run() {
+						list.add(file);
+					}
+				});
+			}
+		}
+	}
+
+	private static class SearchThread extends TimerTask {
+		private final IconMatchCallback callback;
+		private final IProject project;
+		private final StringMatcher matcherGif;
+		private final StringMatcher matcherJpg;
+		private final StringMatcher matcherPng;
+
+		public SearchThread(IconMatchCallback callback, String pattern, IProject project) {
+			this.matcherGif = new StringMatcher("*" + pattern + "*.gif", true, false); //$NON-NLS-1$//$NON-NLS-2$
+			this.matcherJpg = new StringMatcher("*" + pattern + "*.jpg", true, false); //$NON-NLS-1$//$NON-NLS-2$
+			this.matcherPng = new StringMatcher("*" + pattern + "*.png", true, false); //$NON-NLS-1$//$NON-NLS-2$
+			this.callback = callback;
+			this.project = project;
+		}
+
+		@Override
+		public void run() {
+			try {
+				project.accept(new IResourceVisitor() {
+
+					public boolean visit(IResource resource) throws CoreException {
+						if (callback.cancel) {
+							return false;
+						}
+
+						if (resource.getType() == IResource.FOLDER || resource.getType() == IResource.PROJECT) {
+							return true;
+						} else if (resource.getType() == IResource.FILE && !resource.isLinked()) {
+							String path = resource.getProjectRelativePath().toString();
+							if (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path)) {
+								callback.match((IFile) resource);
+							}
+						}
+						return false;
+					}
+
+				});
+			} catch (CoreException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
new file mode 100644
index 0000000000..d2c0e3f8e1
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
@@ -0,0 +1,30 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.widgets.Shell;
+
+public class PartIconDialogEditor extends AbstractIconDialog {
+
+	public PartIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPart element) {
+		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+	}
+
+	@Override
+	protected String getShellTitle() {
+		return "Part Icon Search";
+	}
+
+	@Override
+	protected String getDialogTitle() {
+		return "Part Icon Search";
+	}
+
+	@Override
+	protected String getDialogMessage() {
+		return "Search for GIF, PNG and JPG icons in the current project";
+	}
+
+}

From a6c621d0b2aa8beac4223de22f4ff807265dc459 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 15 May 2010 20:08:06 +0000
Subject: [PATCH 0107/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * adding icon support to various elements

---
 .../emf/ui/internal/common/ModelEditor.java   | 146 +++++++++---------
 .../component/DirectMenuItemEditor.java       |   4 +-
 .../component/DirectToolItemEditor.java       |   4 +-
 .../component/HandledMenuItemEditor.java      |   5 +-
 .../component/HandledToolItemEditor.java      |   6 +-
 .../internal/common/component/MenuEditor.java |  15 +-
 .../common/component/MenuItemEditor.java      |  18 ++-
 .../component/PartDescriptorEditor.java       |  14 +-
 .../common/component/PerspectiveEditor.java   |  17 +-
 .../common/component/ToolItemEditor.java      |  19 ++-
 .../common/component/TrimmedWindowEditor.java |   5 +-
 .../common/component/WindowEditor.java        |  20 ++-
 .../dialogs/MenuIconDialogEditor.java         |  31 ++++
 .../dialogs/MenuItemIconDialogEditor.java     |  31 ++++
 .../PartDescriptorIconDialogEditor.java       |  31 ++++
 .../dialogs/PerspectiveIconDialogEditor.java  |  31 ++++
 .../dialogs/ToolItemIconDialogEditor.java     |  31 ++++
 .../dialogs/WindowIconDialogEditor.java       |  31 ++++
 18 files changed, 361 insertions(+), 98 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 24e151b4c8..48bc4b14eb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -116,7 +116,7 @@
 
 public class ModelEditor {
 	private static final String CSS_CLASS_KEY = "org.eclipse.e4.ui.css.CssClassName"; //$NON-NLS-1$
-	
+
 	public static final String VIRTUAL_PART_MENU = ModelEditor.class.getName() + ".VIRTUAL_PART_MENU"; //$NON-NLS-1$
 	public static final String VIRTUAL_MODEL_COMPONENT_CHILDREN = ModelEditor.class.getName() + ".VIRTUAL_MODEL_COMPONENT_CHILDREN"; //$NON-NLS-1$
 	public static final String VIRTUAL_HANDLER = ModelEditor.class.getName() + ".VIRTUAL_HANDLER"; //$NON-NLS-1$
@@ -132,7 +132,7 @@ public class ModelEditor {
 	public static final String VIRTUAL_ADDONS = ModelEditor.class.getName() + ".VIRTUAL_ADDONS"; //$NON-NLS-1$
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
-	private Map<String,AbstractComponentEditor> virtualEditors = new HashMap<String, AbstractComponentEditor>();
+	private Map<String, AbstractComponentEditor> virtualEditors = new HashMap<String, AbstractComponentEditor>();
 	private List<FeaturePath> labelFeaturePaths = new ArrayList<FeaturePath>();
 
 	// private List<AbstractComponentEditor> editors = new
@@ -148,13 +148,13 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 		this.modelProvider = modelProvider;
 		this.project = project;
 		this.context = context;
-		
+
 		registerDefaultEditors();
 		registerVirtualEditors();
-		
+
 		registerContributedEditors();
 		registerContributedVirtualEditors();
-		
+
 		SashForm form = new SashForm(composite, SWT.HORIZONTAL);
 		form.setBackground(form.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 
@@ -192,20 +192,20 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 		final ScrolledComposite scrolling = new ScrolledComposite(editingArea, SWT.H_SCROLL | SWT.V_SCROLL);
 		scrolling.setBackgroundMode(SWT.INHERIT_DEFAULT);
 		scrolling.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
-		
+
 		final Composite contentContainer = new Composite(scrolling, SWT.NONE);
 		contentContainer.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
 		scrolling.setExpandHorizontal(true);
 		scrolling.setExpandVertical(true);
 		scrolling.setContent(contentContainer);
-		
+
 		scrolling.addControlListener(new ControlAdapter() {
 			public void controlResized(ControlEvent e) {
 				Rectangle r = scrolling.getClientArea();
 				scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT));
 			}
 		});
-		
+
 		scrolling.setLayoutData(new GridData(GridData.FILL_BOTH));
 		final StackLayout layout = new StackLayout();
 		contentContainer.setLayout(layout);
@@ -238,42 +238,42 @@ public void selectionChanged(SelectionChangedEvent event) {
 							contentContainer.layout(true);
 						}
 					}
-					
+
 					Rectangle r = scrolling.getClientArea();
 					scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT));
-					
-					if( selectionService != null ) {
+
+					if (selectionService != null) {
 						selectionService.setSelection(s.getFirstElement());
 					}
-					
+
 				}
 			}
 		});
 
 		form.setWeights(new int[] { 1, 2 });
 		viewer.setSelection(new StructuredSelection(modelProvider.getRoot()));
-		
+
 		MenuManager mgr = new MenuManager();
 		mgr.setRemoveAllWhenShown(true);
 		mgr.addMenuListener(new IMenuListener() {
-			
+
 			public void menuAboutToShow(IMenuManager manager) {
 				IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-				if( ! s.isEmpty() ) {
+				if (!s.isEmpty()) {
 					List<Action> actions;
-					if( s.getFirstElement() instanceof VirtualEntry<?> ) {
-						actions = virtualEditors.get(((VirtualEntry<?>)s.getFirstElement()).getId()).getActions(s.getFirstElement());
+					if (s.getFirstElement() instanceof VirtualEntry<?>) {
+						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId()).getActions(s.getFirstElement());
 					} else {
 						EObject o = (EObject) s.getFirstElement();
 						AbstractComponentEditor editor = editorMap.get(o.eClass());
-						if( editor != null ) {
+						if (editor != null) {
 							actions = editor.getActions(s.getFirstElement());
 						} else {
 							actions = Collections.emptyList();
 						}
 					}
-					
-					for( Action a : actions ) {
+
+					for (Action a : actions) {
 						manager.add(a);
 					}
 				}
@@ -282,26 +282,28 @@ public void menuAboutToShow(IMenuManager manager) {
 		viewer.getControl().setMenu(mgr.createContextMenu(viewer.getControl()));
 	}
 
-	@Inject @Optional
+	@Inject
+	@Optional
 	public void setSelectionService(ISelectionProviderService selectionService) {
 		this.selectionService = selectionService;
-		if( viewer != null && ! viewer.getControl().isDisposed() ) {
-			if( ! viewer.getSelection().isEmpty() ) {
-				selectionService.setSelection(((IStructuredSelection)viewer.getSelection()).getFirstElement());	
+		if (viewer != null && !viewer.getControl().isDisposed()) {
+			if (!viewer.getSelection().isEmpty()) {
+				selectionService.setSelection(((IStructuredSelection) viewer.getSelection()).getFirstElement());
 			}
 		}
 	}
-	
-//	@Inject
-//	public void updateSelection(@Optional @Named(IServiceConstants.SELECTION) Object selection ) {
-//		System.err.println("The selection: " + selection);
-//	}
-	
+
+	// @Inject
+	// public void updateSelection(@Optional @Named(IServiceConstants.SELECTION)
+	// Object selection ) {
+	// System.err.println("The selection: " + selection);
+	// }
+
 	private TreeViewer createTreeViewerArea(Composite parent) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
 		parent.setBackgroundMode(SWT.INHERIT_DEFAULT);
-		
+
 		FillLayout l = new FillLayout();
 		l.marginWidth = 5;
 		parent.setLayout(l);
@@ -346,18 +348,18 @@ public void handleMapChange(MapChangeEvent event) {
 
 		return viewer;
 	}
-	
+
 	private void registerContributedVirtualEditors() {
 		IExtensionRegistry registry = RegistryFactory.getRegistry();
 		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
-		
-		for( IConfigurationElement el : extPoint.getConfigurationElements() ) {
-			if( ! "virtualeditor".equals(el.getName()) ) {
+
+		for (IConfigurationElement el : extPoint.getConfigurationElements()) {
+			if (!"virtualeditor".equals(el.getName())) {
 				continue;
 			}
-			
+
 			IContributionFactory fact = context.get(IContributionFactory.class);
-			AbstractComponentEditor editor = (AbstractComponentEditor) fact.create("platform:/plugin/"+el.getContributor().getName()+"/"+el.getAttribute("class"), context); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			AbstractComponentEditor editor = (AbstractComponentEditor) fact.create("platform:/plugin/" + el.getContributor().getName() + "/" + el.getAttribute("class"), context); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			registerVirtualEditor(el.getAttribute("id"), editor); //$NON-NLS-1$
 		}
 	}
@@ -365,8 +367,8 @@ private void registerContributedVirtualEditors() {
 	private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_PART_MENU, new VMenuEditor(modelProvider.getEditingDomain(), this, BasicPackageImpl.Literals.PART__MENUS));
 		registerVirtualEditor(VIRTUAL_HANDLER, new VHandlerEditor(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_BINDING_TABLE,new VBindingTableEditor(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_COMMAND,new VCommandEditor(modelProvider.getEditingDomain(), this, ApplicationPackageImpl.Literals.APPLICATION__COMMANDS));
+		registerVirtualEditor(VIRTUAL_BINDING_TABLE, new VBindingTableEditor(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_COMMAND, new VCommandEditor(modelProvider.getEditingDomain(), this, ApplicationPackageImpl.Literals.APPLICATION__COMMANDS));
 		registerVirtualEditor(VIRTUAL_WINDOWS, new VWindowEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_WINDOW_CONTROLS, new VWindowControlEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_PART_DESCRIPTORS, new VPartDescriptor(modelProvider.getEditingDomain(), this));
@@ -378,29 +380,29 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_MODEL_COMPONENT_CHILDREN, new VModelComponentUIEditor(modelProvider.getEditingDomain(), this));
 	}
 
-	private void registerVirtualEditor(String id, AbstractComponentEditor editor ) {
-//		System.err.println("Registering: " + id + " => " + editor);
+	private void registerVirtualEditor(String id, AbstractComponentEditor editor) {
+		// System.err.println("Registering: " + id + " => " + editor);
 		virtualEditors.put(id, editor);
 	}
-	
+
 	public void setSelection(Object element) {
 		viewer.setSelection(new StructuredSelection(element));
 	}
-	
+
 	private void registerContributedEditors() {
 		IExtensionRegistry registry = RegistryFactory.getRegistry();
 		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
-		
-		for( IConfigurationElement el : extPoint.getConfigurationElements() ) {
-			if( ! "editor".equals(el.getName()) ) {
+
+		for (IConfigurationElement el : extPoint.getConfigurationElements()) {
+			if (!"editor".equals(el.getName())) {
 				continue;
 			}
-			
+
 			try {
 				IEditorDescriptor desc = (IEditorDescriptor) el.createExecutableExtension("descriptorClass"); //$NON-NLS-1$
 				EClass eClass = desc.getEClass();
 				IContributionFactory fact = context.get(IContributionFactory.class);
-				AbstractComponentEditor editor = (AbstractComponentEditor) fact.create("platform:/plugin/"+el.getContributor().getName()+"/"+desc.getEditorClass().getName(), context); //$NON-NLS-1$ //$NON-NLS-2$
+				AbstractComponentEditor editor = (AbstractComponentEditor) fact.create("platform:/plugin/" + el.getContributor().getName() + "/" + desc.getEditorClass().getName(), context); //$NON-NLS-1$ //$NON-NLS-2$
 				registerEditor(eClass, editor);
 			} catch (CoreException e) {
 				// TODO Auto-generated catch block
@@ -411,39 +413,38 @@ private void registerContributedEditors() {
 
 	private void registerDefaultEditors() {
 		registerEditor(ApplicationPackageImpl.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain()));
-		registerEditor(ApplicationPackageImpl.Literals.MODEL_COMPONENTS, new ModelComponentsEditor(modelProvider.getEditingDomain(),this));
+		registerEditor(ApplicationPackageImpl.Literals.MODEL_COMPONENTS, new ModelComponentsEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(ApplicationPackageImpl.Literals.MODEL_COMPONENT, new ModelComponentEditor(modelProvider.getEditingDomain()));
-		registerEditor(ApplicationPackageImpl.Literals.ADDON, new AddonsEditor(modelProvider.getEditingDomain(),project));
-		
-		
-		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain(),modelProvider));
-		registerEditor(CommandsPackageImpl.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(),modelProvider,project));
+		registerEditor(ApplicationPackageImpl.Literals.ADDON, new AddonsEditor(modelProvider.getEditingDomain(), project));
+
+		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain(), modelProvider));
+		registerEditor(CommandsPackageImpl.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(), modelProvider, project));
 		registerEditor(CommandsPackageImpl.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain()));
 		registerEditor(CommandsPackageImpl.Literals.BINDING_TABLE, new BindingTableEditor(modelProvider.getEditingDomain(), this));
-		
+
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR, new ToolBarEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor(modelProvider.getEditingDomain(),project));
-		registerEditor(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, new HandledToolItemEditor(modelProvider.getEditingDomain(),modelProvider));
+		registerEditor(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor(modelProvider.getEditingDomain(), project));
+		registerEditor(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, new HandledToolItemEditor(modelProvider.getEditingDomain(), project, modelProvider));
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, new ToolBarSeparatorEditor(modelProvider.getEditingDomain()));
-		registerEditor(MenuPackageImpl.Literals.TOOL_CONTROL, new ToolControlEditor(modelProvider.getEditingDomain(),project));
-		
-		registerEditor(MenuPackageImpl.Literals.MENU, new MenuEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(MenuPackageImpl.Literals.TOOL_CONTROL, new ToolControlEditor(modelProvider.getEditingDomain(), project));
+
+		registerEditor(MenuPackageImpl.Literals.MENU, new MenuEditor(modelProvider.getEditingDomain(), project, this));
 		registerEditor(MenuPackageImpl.Literals.MENU_SEPARATOR, new MenuSeparatorEditor(modelProvider.getEditingDomain()));
-		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), modelProvider));
+		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), project, modelProvider));
 		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this, project));
-		
-		registerEditor(BasicPackageImpl.Literals.PART, new PartEditor(modelProvider.getEditingDomain(),project));
-		registerEditor(BasicPackageImpl.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain()));
-		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW, new TrimmedWindowEditor(modelProvider.getEditingDomain()));
+
+		registerEditor(BasicPackageImpl.Literals.PART, new PartEditor(modelProvider.getEditingDomain(), project));
+		registerEditor(BasicPackageImpl.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain(), project));
+		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW, new TrimmedWindowEditor(modelProvider.getEditingDomain(), project));
 		registerEditor(BasicPackageImpl.Literals.PART_SASH_CONTAINER, new PartSashContainerEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(BasicPackageImpl.Literals.PART_STACK, new PartStackEditor(modelProvider.getEditingDomain(),this));
+		registerEditor(BasicPackageImpl.Literals.PART_STACK, new PartStackEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(BasicPackageImpl.Literals.INPUT_PART, new InputPartEditor(modelProvider.getEditingDomain(), project));
 		registerEditor(BasicPackageImpl.Literals.TRIM_BAR, new TrimBarEditor(modelProvider.getEditingDomain(), this));
-		
-		registerEditor(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR, new PartDescriptorEditor(modelProvider.getEditingDomain(),project));
-		
-		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, new PerspectiveStackEditor(modelProvider.getEditingDomain(),this));
-		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE, new PerspectiveEditor(modelProvider.getEditingDomain(),this));
+
+		registerEditor(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR, new PartDescriptorEditor(modelProvider.getEditingDomain(), project));
+
+		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, new PerspectiveStackEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE, new PerspectiveEditor(modelProvider.getEditingDomain(), project, this));
 		registerEditor(AdvancedPackageImpl.Literals.PLACEHOLDER, new PlaceholderEditor(modelProvider.getEditingDomain()));
 	}
 
@@ -488,12 +489,11 @@ public void doSave(@Optional IProgressMonitor monitor) {
 			modelProvider.save();
 		}
 	}
-		
+
 	public void setFocus() {
 		viewer.getControl().setFocus();
 	}
 
-
 	private static class TreeStructureAdvisorImpl extends TreeStructureAdvisor {
 
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 1e3c331d06..e9cff25710 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -38,11 +38,9 @@
 
 public class DirectMenuItemEditor extends MenuItemEditor {
 	private Image image;
-	private IProject project;
 	
 	public DirectMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain);
-		this.project = project;
+		super(editingDomain,project);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 8783f4d2e6..af3d3c8d72 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -37,11 +37,9 @@
 
 public class DirectToolItemEditor extends ToolItemEditor {
 	private Image image;
-	private IProject project;
 
 	public DirectToolItemEditor(EditingDomain editingDomain, IProject project) {
-		super(editingDomain);
-		this.project = project;
+		super(editingDomain,project);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index 1689160059..2fe314b100 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -14,6 +14,7 @@
 import java.net.URL;
 
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
@@ -65,8 +66,8 @@ public class HandledMenuItemEditor extends MenuItemEditor {
 	private Image image;
 	private IModelResource resource;
 
-	public HandledMenuItemEditor(EditingDomain editingDomain, IModelResource resource) {
-		super(editingDomain);
+	public HandledMenuItemEditor(EditingDomain editingDomain, IProject project, IModelResource resource) {
+		super(editingDomain,project);
 		this.resource = resource;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index a442f71d2f..e8ed3a4305 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -14,12 +14,12 @@
 import java.net.URL;
 
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledToolItemCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -65,8 +65,8 @@ public class HandledToolItemEditor extends ToolItemEditor {
 	private Image image;
 	private IModelResource resource;
 
-	public HandledToolItemEditor(EditingDomain editingDomain, IModelResource resource) {
-		super(editingDomain);
+	public HandledToolItemEditor(EditingDomain editingDomain, IProject project, IModelResource resource) {
+		super(editingDomain, project);
 		this.resource = resource;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 08ecef1684..326eba354c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -17,11 +17,13 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
@@ -73,6 +75,7 @@ public class MenuEditor extends AbstractComponentEditor {
 	private Image image;
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
+	private IProject project;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
@@ -89,9 +92,10 @@ public Struct(String label, EClass eClass, boolean separator) {
 		}
 	}
 
-	public MenuEditor(EditingDomain editingDomain, ModelEditor editor) {
+	public MenuEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
 		super(editingDomain);
 		this.editor = editor;
+		this.project = project;
 	}
 
 	@Override
@@ -195,9 +199,16 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setText(Messages.MenuItemEditor_Find);
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MenuIconDialogEditor dialog = new MenuIconDialogEditor(b.getShell(), project, getEditingDomain(),(MMenu) getMaster().getValue());
+					dialog.open();
+				}
+			});			
 		}
 		
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index d1a1b68890..d346f34ec2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -16,12 +16,15 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuItemIconDialogEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -33,6 +36,8 @@
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -47,9 +52,11 @@ public abstract class MenuItemEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image menuImage;
 	private EMFDataBindingContext context;
+	protected IProject project;
 
-	public MenuItemEditor(EditingDomain editingDomain) {
+	public MenuItemEditor(EditingDomain editingDomain, IProject project) {
 		super(editingDomain);
+		this.project = project;
 	}
 
 	@Override
@@ -144,9 +151,16 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setText(Messages.MenuItemEditor_Find);
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MenuItemIconDialogEditor dialog = new MenuItemIconDialogEditor(b.getShell(), project, getEditingDomain(),(MMenuItem) getMaster().getValue());
+					dialog.open();
+				}
+			});
 		}
 
 		createFormSubTypeForm(parent, context, master);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 01289815b2..0d46e20f3e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -24,6 +24,8 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartDescriptorIconDialogEditor;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
@@ -31,6 +33,7 @@
 import org.eclipse.e4.ui.model.application.descriptor.basic.util.BasicAdapterFactory;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -157,9 +160,16 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText(Messages.PartDescriptorEditor_Find);			
+			b.setText(Messages.PartDescriptorEditor_Find);
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					PartDescriptorIconDialogEditor dialog = new PartDescriptorIconDialogEditor(b.getShell(), project, getEditingDomain(),(MPartDescriptor) getMaster().getValue());
+					dialog.open();
+				}
+			});	
 		}
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index a583ad7c07..8daad0ec50 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -21,14 +21,18 @@
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PerspectiveIconDialogEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -75,11 +79,13 @@ public class PerspectiveEditor extends AbstractComponentEditor {
 	private Image image;
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
+	private IProject project;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
-	public PerspectiveEditor(EditingDomain editingDomain, ModelEditor editor) {
+	public PerspectiveEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
 		super(editingDomain);
+		this.project = project;
 		this.editor = editor;
 	}
 
@@ -221,8 +227,15 @@ public void handleValueChange(ValueChangeEvent event) {
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.PerspectiveEditor_Find);
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					PerspectiveIconDialogEditor dialog = new PerspectiveIconDialogEditor(b.getShell(), project,getEditingDomain(),(MPerspective) getMaster().getValue());
+					dialog.open();
+				}
+			});
 		}
 
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 9bf6c0103a..39d5364320 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -14,8 +14,12 @@
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PerspectiveIconDialogEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ToolItemIconDialogEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
@@ -30,6 +34,8 @@
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -40,9 +46,11 @@
 public abstract class ToolItemEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
+	protected IProject project;
 
-	public ToolItemEditor(EditingDomain editingDomain) {
+	public ToolItemEditor(EditingDomain editingDomain, IProject project) {
 		super(editingDomain);
+		this.project = project;
 	}
 
 	@Override
@@ -126,10 +134,17 @@ private void createFormSubTypeForm(Composite parent, EMFDataBindingContext conte
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText("Find ...");
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					ToolItemIconDialogEditor dialog = new ToolItemIconDialogEditor(b.getShell(), project,getEditingDomain(),(MToolItem) getMaster().getValue());
+					dialog.open();
+				}
+			});
 		}
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
index aabc235345..4119793bab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
@@ -2,6 +2,7 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
@@ -11,8 +12,8 @@
 public class TrimmedWindowEditor extends WindowEditor {
 	private IListProperty TRIMMED_WINDOW__TRIM_BARS = EMFProperties.list(BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS);
 	
-	public TrimmedWindowEditor(EditingDomain editingDomain) {
-		super(editingDomain);
+	public TrimmedWindowEditor(EditingDomain editingDomain, IProject project) {
+		super(editingDomain,project);
 	}
 
 	public IObservableList getChildList(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 252a1a797b..0efb85904c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -22,9 +22,12 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ToolItemIconDialogEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.WindowIconDialogEditor;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
@@ -33,6 +36,7 @@
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -44,6 +48,8 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -58,6 +64,7 @@ public class WindowEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
+	private IProject project;
 
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IListProperty WINDOW__WINDOWS = EMFProperties.list(BasicPackageImpl.Literals.WINDOW__WINDOWS);
@@ -66,8 +73,9 @@ public class WindowEditor extends AbstractComponentEditor {
 
 	private Action addMainMenu; 
 	
-	public WindowEditor(EditingDomain editingDomain) {
+	public WindowEditor(EditingDomain editingDomain, IProject project) {
 		super(editingDomain);
+		this.project = project;
 		addMainMenu = new Action("Add Main Menu") {
 			@Override
 			public void run() {
@@ -214,10 +222,18 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText("Find ...");
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					WindowIconDialogEditor dialog = new WindowIconDialogEditor(b.getShell(), project,getEditingDomain(),(MWindow) getMaster().getValue());
+					dialog.open();
+				}
+			});
+
 		}
 
 		ControlFactory.createBindingsWidget(parent, this);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
new file mode 100644
index 0000000000..22a33c242f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
@@ -0,0 +1,31 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.widgets.Shell;
+
+public class MenuIconDialogEditor extends AbstractIconDialog {
+
+	public MenuIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MMenu element) {
+		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+	}
+
+	@Override
+	protected String getShellTitle() {
+		return "Menu Icon Search";
+	}
+
+	@Override
+	protected String getDialogTitle() {
+		return "Menu Icon Search";
+	}
+
+	@Override
+	protected String getDialogMessage() {
+		return "Search for GIF, PNG and JPG icons in the current project";
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
new file mode 100644
index 0000000000..74828a1774
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
@@ -0,0 +1,31 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.widgets.Shell;
+
+public class MenuItemIconDialogEditor extends AbstractIconDialog {
+
+	public MenuItemIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MMenuItem element) {
+		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+	}
+
+	@Override
+	protected String getShellTitle() {
+		return "Menu Item Icon Search";
+	}
+
+	@Override
+	protected String getDialogTitle() {
+		return "Menu Item Icon Search";
+	}
+
+	@Override
+	protected String getDialogMessage() {
+		return "Search for GIF, PNG and JPG icons in the current project";
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
new file mode 100644
index 0000000000..4d7ede72e5
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
@@ -0,0 +1,31 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.widgets.Shell;
+
+public class PartDescriptorIconDialogEditor extends AbstractIconDialog {
+
+	public PartDescriptorIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPartDescriptor element) {
+		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+	}
+
+	@Override
+	protected String getShellTitle() {
+		return "Part Descriptor Icon Search";
+	}
+
+	@Override
+	protected String getDialogTitle() {
+		return "Part Descriptor Icon Search";
+	}
+
+	@Override
+	protected String getDialogMessage() {
+		return "Search for GIF, PNG and JPG icons in the current project";
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
new file mode 100644
index 0000000000..63758b8f92
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
@@ -0,0 +1,31 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.widgets.Shell;
+
+public class PerspectiveIconDialogEditor extends AbstractIconDialog {
+
+	public PerspectiveIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPerspective element) {
+		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+	}
+
+	@Override
+	protected String getShellTitle() {
+		return "Perspective Icon Search";
+	}
+
+	@Override
+	protected String getDialogTitle() {
+		return "Perspective Icon Search";
+	}
+
+	@Override
+	protected String getDialogMessage() {
+		return "Search for GIF, PNG and JPG icons in the current project";
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
new file mode 100644
index 0000000000..8387545768
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
@@ -0,0 +1,31 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.widgets.Shell;
+
+public class ToolItemIconDialogEditor extends AbstractIconDialog {
+
+	public ToolItemIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MToolItem element) {
+		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+	}
+
+	@Override
+	protected String getShellTitle() {
+		return "ToolItem Icon Search";
+	}
+
+	@Override
+	protected String getDialogTitle() {
+		return "ToolItem Icon Search";
+	}
+
+	@Override
+	protected String getDialogMessage() {
+		return "Search for GIF, PNG and JPG icons in the current project";
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
new file mode 100644
index 0000000000..babdf30384
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
@@ -0,0 +1,31 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.widgets.Shell;
+
+public class WindowIconDialogEditor extends AbstractIconDialog {
+
+	public WindowIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MWindow element) {
+		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+	}
+
+	@Override
+	protected String getShellTitle() {
+		return "Menu Icon Search";
+	}
+
+	@Override
+	protected String getDialogTitle() {
+		return "Menu Icon Search";
+	}
+
+	@Override
+	protected String getDialogMessage() {
+		return "Search for GIF, PNG and JPG icons in the current project";
+	}
+
+}

From 6b929c1edebdc7c06d714328c7fd0c31e997d8b2 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 17 May 2010 16:03:25 +0000
Subject: [PATCH 0108/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * removed unneeded code

---
 .../emf/editor3x/E4WorkbenchModelEditor.java  | 131 ------------------
 1 file changed, 131 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
index d8b8f5919c..e3a506d645 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -10,142 +10,11 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.e4.tools.emf.editor3x.compat.E4CompatEditorPart;
-import org.eclipse.e4.tools.emf.ui.common.IModelResource.ModelListener;
-import org.eclipse.e4.tools.emf.ui.internal.wbm.ApplicationModelEditor;
-import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
-import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.part.EditorPart;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceReference;
 
-@SuppressWarnings("restriction")
 public class E4WorkbenchModelEditor extends E4CompatEditorPart {
 
 	public E4WorkbenchModelEditor() {
 		super("platform:/plugin/org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.wbm.ApplicationModelEditor");
 	}
-	
-//	private XMIModelResource resource;
-//	private ApplicationModelEditor editor;
-//	private UndoAction undoAction;
-//	private RedoAction redoAction;
-//
-//	private ModelListener listener = new ModelListener() {
-//
-//		public void dirtyChanged() {
-//			firePropertyChange(PROP_DIRTY);
-//		}
-//
-//		public void commandStackChanged() {
-//			// TODO Auto-generated method stub
-//
-//		}
-//	};
-//
-//	@Override
-//	public void doSave(IProgressMonitor monitor) {
-//		editor.doSave(monitor);
-//	}
-//
-//	@Override
-//	public void doSaveAs() {
-//
-//	}
-//
-//	@Override
-//	public void init(IEditorSite site, IEditorInput input)
-//			throws PartInitException {
-//		setSite(site);
-//		setInput(input);
-//
-//		URI resourceURI = EditUIUtil.getURI(input);
-//		if (resourceURI != null) {
-//			resource = new XMIModelResource(resourceURI);
-//			resource.addModelListener(listener);
-//		}
-//	}
-//
-//	@Override
-//	public boolean isDirty() {
-//		return resource.isDirty();
-//	}
-//
-//	@Override
-//	public boolean isSaveAsAllowed() {
-//		return false;
-//	}
-//
-//	@Override
-//	public void createPartControl(Composite parent) {
-//		Composite comp = new Composite(parent, SWT.NONE);
-//		comp.setBackground(comp.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-//		comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
-//
-//		FillLayout layout = new FillLayout();
-//		layout.marginWidth = 10;
-//		layout.marginHeight = 10;
-//		comp.setLayout(layout);
-//		IFileEditorInput input = (IFileEditorInput)getEditorInput();
-//		editor = new ApplicationModelEditor(comp, resource, input.getFile().getProject());
-//
-//		try {
-//			parent.setRedraw(false);
-//			parent.reskin(SWT.ALL);
-//		} finally {
-//			parent.setRedraw(true);
-//		}
-//
-//		makeActions();
-//		Bundle b = FrameworkUtil.getBundle(E4WorkbenchModelEditor.class);
-//		if( b != null ) {
-//			ServiceReference ref = b.getBundleContext().getServiceReference(IThemeManager.class.getName());
-//			if( ref != null ) {
-//				IThemeManager mgr = (IThemeManager) b.getBundleContext().getService(ref);
-//				IThemeEngine engine = mgr.getEngineForDisplay(parent.getDisplay());
-//				engine.applyStyles(parent, true);
-//			}			
-//		}
-//	}
-//
-//	private void makeActions() {
-//		undoAction = new UndoAction(resource);
-//		redoAction = new RedoAction(resource);
-//
-//		getEditorSite().getActionBars().setGlobalActionHandler(
-//				ActionFactory.UNDO.getId(), undoAction);
-//		getEditorSite().getActionBars().setGlobalActionHandler(
-//				ActionFactory.REDO.getId(), redoAction);
-//	}
-//
-//	@Override
-//	public void dispose() {
-//		if (undoAction != null)
-//			undoAction.dispose();
-//
-//		if (redoAction != null)
-//			redoAction.dispose();
-//
-//		if (listener != null && resource != null)
-//			resource.removeModelListener(listener);
-//
-//		super.dispose();
-//	}
-//
-//	@Override
-//	public void setFocus() {
-//		editor.setFocus();
-//	}
-
 }

From 69d174bf6589513f14843359e8229531c3d1987a Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 17 May 2010 16:10:16 +0000
Subject: [PATCH 0109/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * adding support for context variables

---
 .../e4/tools/emf/ui/internal/Messages.java    |   2 +-
 .../tools/emf/ui/internal/Messages.properties |   1 +
 .../common/component/ControlFactory.java      | 353 ++++++++++++------
 .../internal/common/component/PartEditor.java |   1 +
 .../common/component/WindowEditor.java        |   1 +
 5 files changed, 243 insertions(+), 115 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 32762c9cdd..63842cab7b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -67,6 +67,7 @@ public class Messages {
 	public static String ControlFactory_Tags;
 	public static String ControlFactory_Key;
 	public static String ControlFactory_Value;
+	public static String ControlFactory_ContextVariables;
 	
 	public static String DirectToolItemEditor_ClassURI;
 	public static String DirectToolItemEditor_Find;
@@ -305,7 +306,6 @@ public class Messages {
 	public static String ContributionClassDialog_DialogTitle;
 	public static String ContributionClassDialog_Label_Classname;
 	public static String ContributionClassDialog_ShellTitle;
-
 	
 	
 	static {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 938e2ca60e..78ac0a1453 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -62,6 +62,7 @@ ControlFactory_Remove=Remove
 ControlFactory_Tags=Tags
 ControlFactory_Key=Key
 ControlFactory_Value=Value
+ControlFactory_ContextVariables=Context Variables
 
 DirectToolItemEditor_ClassURI=Class URI
 DirectToolItemEditor_Find=Find ...
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 688533ee26..832c277f50 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -19,6 +19,7 @@
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFListProperty;
@@ -46,131 +47,255 @@
 import org.eclipse.swt.widgets.Text;
 
 public class ControlFactory {
-	public static void createBindingsWidget(Composite parent, final AbstractComponentEditor editor) {
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ControlFactory_BindingContexts);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-			
-			final Text t = new Text(parent, SWT.BORDER);
-			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			t.addKeyListener(new KeyAdapter() {
-				@Override
-				public void keyPressed(KeyEvent e) {
-					if (e.keyCode == SWT.CR || e.keyCode == SWT.LF) {
-						handleAddText( editor, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, t);
-					}
+	public static void createVariablesWidget(Composite parent, final AbstractComponentEditor editor) {
+		Label l = new Label(parent, SWT.NONE);
+		l.setText(Messages.ControlFactory_ContextVariables);
+		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+		final Text t = new Text(parent, SWT.BORDER);
+		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		t.addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyPressed(KeyEvent e) {
+				if (e.keyCode == SWT.CR || e.keyCode == SWT.LF) {
+					handleAddText(editor, UiPackageImpl.Literals.CONTEXT__VARIABLES, t);
 				}
-			});
-			
-			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ControlFactory_Add);
-			b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					handleAddText( editor, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, t);
+			}
+		});
+
+		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ControlFactory_Add);
+		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				handleAddText(editor, UiPackageImpl.Literals.CONTEXT__VARIABLES, t);
+			}
+		});
+
+		new Label(parent, SWT.NONE);
+
+		final TableViewer viewer = new TableViewer(parent);
+		viewer.setLabelProvider(new LabelProvider());
+		viewer.setContentProvider(new ObservableListContentProvider());
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.heightHint = 150;
+		viewer.getControl().setLayoutData(gd);
+
+		IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.CONTEXT__VARIABLES);
+		viewer.setInput(prop.observeDetail(editor.getMaster()));
+
+		Composite buttonComp = new Composite(parent, SWT.NONE);
+		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+		GridLayout gl = new GridLayout();
+		gl.marginLeft = 0;
+		gl.marginRight = 0;
+		gl.marginWidth = 0;
+		gl.marginHeight = 0;
+		buttonComp.setLayout(gl);
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ControlFactory_Up);
+		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_UP));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MApplication container = (MApplication) editor.getMaster().getValue();
+						int idx = container.getCommands().indexOf(obj) - 1;
+						if (idx >= 0) {
+							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), UiPackageImpl.Literals.CONTEXT__VARIABLES, obj, idx);
+
+							if (cmd.canExecute()) {
+								editor.getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+
+					}
 				}
-			});
-			
-			new Label(parent, SWT.NONE);
-			
-			final TableViewer viewer = new TableViewer(parent);
-			viewer.setLabelProvider(new LabelProvider());
-			viewer.setContentProvider(new ObservableListContentProvider());
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 150;
-			viewer.getControl().setLayoutData(gd);
-			
-			IEMFListProperty prop = EMFProperties.list(CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS);
-			viewer.setInput(prop.observeDetail(editor.getMaster()));
-			
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
-			buttonComp.setLayout(gl);
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ControlFactory_Up);
-			b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
-							Object obj = s.getFirstElement();
-							MApplication container = (MApplication) editor.getMaster().getValue();
-							int idx = container.getCommands().indexOf(obj) - 1;
-							if( idx >= 0 ) {
-								Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
-								
-								if( cmd.canExecute() ) {
-									editor.getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ControlFactory_Down);
+		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_DOWN));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MApplication container = (MApplication) editor.getMaster().getValue();
+						int idx = container.getCommands().indexOf(obj) + 1;
+						if (idx < container.getCommands().size()) {
+							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), UiPackageImpl.Literals.CONTEXT__VARIABLES, obj, idx);
+
+							if (cmd.canExecute()) {
+								editor.getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
 							}
-							
 						}
+
 					}
 				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ControlFactory_Down);
-			b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
-							Object obj = s.getFirstElement();
-							MApplication container = (MApplication) editor.getMaster().getValue();
-							int idx = container.getCommands().indexOf(obj) + 1;
-							if( idx < container.getCommands().size() ) {
-								Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
-								
-								if( cmd.canExecute() ) {
-									editor.getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ControlFactory_Remove);
+		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_DELETE_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					MApplication el = (MApplication) editor.getMaster().getValue();
+					List<?> ids = ((IStructuredSelection) viewer.getSelection()).toList();
+					Command cmd = RemoveCommand.create(editor.getEditingDomain(), el, UiPackageImpl.Literals.CONTEXT__VARIABLES, ids);
+					if (cmd.canExecute()) {
+						editor.getEditingDomain().getCommandStack().execute(cmd);
+						if (el.getBindingContexts().size() > 0) {
+							viewer.setSelection(new StructuredSelection(el.getBindingContexts().get(0)));
+						}
+					}
+				}
+			}
+		});
+	}
+
+	public static void createBindingsWidget(Composite parent, final AbstractComponentEditor editor) {
+		Label l = new Label(parent, SWT.NONE);
+		l.setText(Messages.ControlFactory_BindingContexts);
+		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+		final Text t = new Text(parent, SWT.BORDER);
+		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		t.addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyPressed(KeyEvent e) {
+				if (e.keyCode == SWT.CR || e.keyCode == SWT.LF) {
+					handleAddText(editor, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, t);
+				}
+			}
+		});
+
+		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ControlFactory_Add);
+		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				handleAddText(editor, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, t);
+			}
+		});
+
+		new Label(parent, SWT.NONE);
+
+		final TableViewer viewer = new TableViewer(parent);
+		viewer.setLabelProvider(new LabelProvider());
+		viewer.setContentProvider(new ObservableListContentProvider());
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.heightHint = 150;
+		viewer.getControl().setLayoutData(gd);
+
+		IEMFListProperty prop = EMFProperties.list(CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS);
+		viewer.setInput(prop.observeDetail(editor.getMaster()));
+
+		Composite buttonComp = new Composite(parent, SWT.NONE);
+		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+		GridLayout gl = new GridLayout();
+		gl.marginLeft = 0;
+		gl.marginRight = 0;
+		gl.marginWidth = 0;
+		gl.marginHeight = 0;
+		buttonComp.setLayout(gl);
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ControlFactory_Up);
+		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_UP));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MApplication container = (MApplication) editor.getMaster().getValue();
+						int idx = container.getCommands().indexOf(obj) - 1;
+						if (idx >= 0) {
+							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
+
+							if (cmd.canExecute()) {
+								editor.getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
 							}
-							
 						}
+
 					}
 				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ControlFactory_Remove);
-			b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						MApplication el = (MApplication) editor.getMaster().getValue();
-						List<?> ids = ((IStructuredSelection)viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(editor.getEditingDomain(), el, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, ids);
-						if( cmd.canExecute() ) {
-							editor.getEditingDomain().getCommandStack().execute(cmd);
-							if( el.getBindingContexts().size() > 0 ) {
-								viewer.setSelection(new StructuredSelection(el.getBindingContexts().get(0)));
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ControlFactory_Down);
+		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_DOWN));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MApplication container = (MApplication) editor.getMaster().getValue();
+						int idx = container.getCommands().indexOf(obj) + 1;
+						if (idx < container.getCommands().size()) {
+							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
+
+							if (cmd.canExecute()) {
+								editor.getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
 							}
 						}
+
 					}
 				}
-			});
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ControlFactory_Remove);
+		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_DELETE_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					MApplication el = (MApplication) editor.getMaster().getValue();
+					List<?> ids = ((IStructuredSelection) viewer.getSelection()).toList();
+					Command cmd = RemoveCommand.create(editor.getEditingDomain(), el, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, ids);
+					if (cmd.canExecute()) {
+						editor.getEditingDomain().getCommandStack().execute(cmd);
+						if (el.getBindingContexts().size() > 0) {
+							viewer.setSelection(new StructuredSelection(el.getBindingContexts().get(0)));
+						}
+					}
+				}
+			}
+		});
 	}
-	
-	public static void createTagsWidget( Composite parent, final AbstractComponentEditor editor ) {
+
+	public static void createTagsWidget(Composite parent, final AbstractComponentEditor editor) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(Messages.ControlFactory_Tags);
 		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
@@ -240,10 +365,10 @@ public String getText(Object element) {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-				if( ! s.isEmpty() ) {
+				if (!s.isEmpty()) {
 					MApplicationElement appEl = (MApplicationElement) editor.getMaster().getValue();
 					Command cmd = RemoveCommand.create(editor.getEditingDomain(), appEl, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, s.toList());
-					if( cmd.canExecute() ) {
+					if (cmd.canExecute()) {
 						editor.getEditingDomain().getCommandStack().execute(cmd);
 					}
 				}
@@ -251,10 +376,10 @@ public void widgetSelected(SelectionEvent e) {
 		});
 	}
 
-	private static void handleAddText( AbstractComponentEditor editor, EStructuralFeature feature, Text tagText) {
+	private static void handleAddText(AbstractComponentEditor editor, EStructuralFeature feature, Text tagText) {
 		if (tagText.getText().trim().length() > 0) {
 			String[] tags = tagText.getText().split(";"); //$NON-NLS-1$
-			for( int i = 0; i < tags.length;i++ ) {
+			for (int i = 0; i < tags.length; i++) {
 				tags[i] = tags[i].trim();
 			}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index e118933576..4317138370 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -319,6 +319,7 @@ public String getText(Object element) {
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		}
 
+		ControlFactory.createVariablesWidget(parent, this);
 		ControlFactory.createTagsWidget(parent, this);
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 0efb85904c..479e9fb077 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -237,6 +237,7 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		ControlFactory.createBindingsWidget(parent, this);
+		ControlFactory.createVariablesWidget(parent, this);
 		ControlFactory.createTagsWidget(parent, this);
 
 		return parent;

From 1480acaa183c5e05074082fdd177c90a263e6f7d Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 18 May 2010 16:42:59 +0000
Subject: [PATCH 0110/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * reacted to upstream changes

---
 .../org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java  | 2 +-
 .../emf/editor3x/compat/SelectionProviderContextFunction.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
index 518468e103..8ea8779aff 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
@@ -13,7 +13,7 @@
 public class XMIResourceFunction extends ContextFunction {
 
 	@Override
-	public Object compute(final IEclipseContext context, Object[] arguments) {
+	public Object compute(final IEclipseContext context) {
 		final IEditorInput input = context.get(IEditorInput.class);
 		final E4CompatEditorPart part = (E4CompatEditorPart) context.get(EditorPart.class);
 		
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/SelectionProviderContextFunction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/SelectionProviderContextFunction.java
index 42b59ca15a..b15003499d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/SelectionProviderContextFunction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/SelectionProviderContextFunction.java
@@ -11,7 +11,7 @@
 public class SelectionProviderContextFunction extends ContextFunction {
 
 	@Override
-	public Object compute(final IEclipseContext context, Object[] arguments) {
+	public Object compute(final IEclipseContext context) {
 		return new ISelectionProviderService() {
 			
 			public void setSelection(Object selection) {

From 4dc758983b699e76df39b104b6fb675eba95a87c Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 21 May 2010 14:26:37 +0000
Subject: [PATCH 0111/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * make the model resource none optional

---
 .../e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index fe83cd6563..cb9a0bb56b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -22,7 +22,7 @@
 public class ApplicationModelEditor extends ModelEditor {
 	@Inject
 	public ApplicationModelEditor(Composite composite, IEclipseContext context,
-			@Optional IModelResource modelProvider, @Optional IProject project) {
+			IModelResource modelProvider, @Optional IProject project) {
 		super(composite, context, modelProvider, project);
 	}
 }

From 5345f9fed285da61ccab4781a66d20aee923adc7 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 21 May 2010 14:47:10 +0000
Subject: [PATCH 0112/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * remove unneeded menu element

---
 .../common/component/ModelComponentEditor.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index 19b89c0a9c..64225b3825 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -224,14 +224,14 @@ protected boolean accepted(Object o) {
 
 		});
 		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART_MENU, MODEL_COMPONENT__CHILDREN, element, Messages.ModelComponentEditor_Menus) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return o instanceof MMenu;
-			}
-
-		});
+//		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART_MENU, MODEL_COMPONENT__CHILDREN, element, Messages.ModelComponentEditor_Menus) {
+//
+//			@Override
+//			protected boolean accepted(Object o) {
+//				return o instanceof MMenu;
+//			}
+//
+//		});
 		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MODEL_COMPONENT_CHILDREN, MODEL_COMPONENT__CHILDREN, element, Messages.ModelComponentEditor_UiChildren) {
 
 			@Override

From e2254a8dd69bfc1d4ea1c09b225f0020efcf2860 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 24 May 2010 08:47:34 +0000
Subject: [PATCH 0113/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * fixed build.properties

---
 bundles/org.eclipse.e4.tools.emf.ui/build.properties           | 3 ++-
 .../emf/ui/internal/common/component/ApplicationEditor.java    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/build.properties b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
index e462e083a9..0ab8a4447f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
@@ -4,7 +4,8 @@ bin.includes = .,\
                icons/,\
                about.html,\
                OSGI-INF/contributioncollector.xml,\
-               plugin.xml
+               plugin.xml,\
+               css/
 output.. = bin/
 jars.compile.order = .
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index b5eb34ffc8..bee39806a2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -108,6 +108,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 		
+		ControlFactory.createVariablesWidget(parent, this);
 		ControlFactory.createBindingsWidget(parent, this);
 
 		return parent;

From 85c0716692e9188b8898a7f22484ba6357ab4ab9 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 25 May 2010 15:47:56 +0000
Subject: [PATCH 0114/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * removed unneeded com.icu

---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF       | 1 -
 .../org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java    | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 49455424fa..d2a835ec48 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.emf.edit;bundle-version="2.6.0",
  org.eclipse.equinox.common;bundle-version="3.6.0",
  org.eclipse.emf.databinding.edit;bundle-version="1.2.0",
- com.ibm.icu;bundle-version="4.2.1",
  org.eclipse.core.resources;bundle-version="3.6.0",
  org.eclipse.e4.core.services;bundle-version="0.9.1",
  org.eclipse.osgi;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
index 6fc7603db0..99c8b21a78 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
+import java.text.BreakIterator;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -22,8 +23,6 @@
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 
-import com.ibm.icu.text.BreakIterator;
-
 /**
  * A filter used in conjunction with <code>FilteredTree</code>. In order to
  * determine if a node should be filtered it uses the content and label provider

From f65e3370fbf02fdda13be803c5e2567957890d7c Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 25 May 2010 15:48:31 +0000
Subject: [PATCH 0115/1286] [Bug 304584] - [Tooling] Implement
 Workbench-Model-Tooling * added elementId for command parameters

---
 .../e4/tools/emf/ui/internal/Messages.java    |  3 ++
 .../tools/emf/ui/internal/Messages.properties |  1 +
 .../common/component/CommandEditor.java       | 40 +++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 63842cab7b..f879dfc8e4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -53,6 +53,7 @@ public class Messages {
 	public static String CommandEditor_Down;
 	public static String CommandEditor_Add;
 	public static String CommandEditor_Remove;
+	public static String CommandEditor_ParameterId;
 	
 	public static String DirectMenuItemEditor_Label;
 	public static String DirectMenuItemEditor_Description;
@@ -306,6 +307,8 @@ public class Messages {
 	public static String ContributionClassDialog_DialogTitle;
 	public static String ContributionClassDialog_Label_Classname;
 	public static String ContributionClassDialog_ShellTitle;
+
+	
 	
 	
 	static {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 78ac0a1453..4e9558a9be 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -48,6 +48,7 @@ CommandEditor_Up=Up
 CommandEditor_Down=Down
 CommandEditor_Add=Add ...
 CommandEditor_Remove=Remove
+CommandEditor_ParameterId=Id
 
 DirectMenuItemEditor_Label=DirectMenuItem
 DirectMenuItemEditor_Description=DirectMenuItem bla bla bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index d22f35d85d..9f0ad33da6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -160,6 +160,46 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			gd.heightHint = 120;
 			viewer.getControl().setLayoutData(gd);
 
+			{
+				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
+				
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText(Messages.CommandEditor_ParameterId);
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MCommandParameter>(prop.observeDetail(cp.getKnownElements())));
+				column.setEditingSupport(new EditingSupport(viewer) {
+					private TextCellEditor editor = new TextCellEditor(viewer.getTable());
+					
+					@Override
+					protected void setValue(Object element, Object value) {
+						if( value.toString().trim().length() == 0 ) {
+							value = null;
+						}
+						
+						Command cmd = SetCommand.create(getEditingDomain(), element, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, value);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+					
+					@Override
+					protected Object getValue(Object element) {
+						MCommandParameter obj = (MCommandParameter) element;
+						return obj.getElementId() != null ? obj.getElementId() : ""; //$NON-NLS-1$
+					}
+					
+					@Override
+					protected CellEditor getCellEditor(Object element) {
+						return editor;
+					}
+					
+					@Override
+					protected boolean canEdit(Object element) {
+						return true;
+					}
+				});
+			}
+			
 			{
 				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME);
 				

From 34b925b1a894246747a3dc719c8473da40102b5e Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 27 May 2010 15:47:10 +0000
Subject: [PATCH 0116/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling

---
 .../tools/emf/ui/internal/common/component/ToolBarEditor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 61c8f198ee..e2020e2757 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -93,7 +93,7 @@ public ToolBarEditor(EditingDomain editingDomain, ModelEditor editor) {
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Toolbar.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ToolBar.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();

From 2dcf59f5856475a5fb6941ade9c93f2ebe0f78ca Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 2 Jun 2010 11:28:00 +0000
Subject: [PATCH 0117/1286]  Bug 315362 -  [Tooling] ClassCastException in
 WorkbenchModel Editor in 3.x host mode

---
 .../editor3x/compat/E4CompatEditorPart.java   | 10 ++++++++
 .../compat/IEclipseContextServiceFactory.java | 23 +++++++++++++++----
 .../SelectionProviderContextFunction.java     | 10 ++++++++
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
index ae098740c8..ba0d738152 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x.compat;
 
 import org.eclipse.core.resources.IProject;
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java
index 8380681048..875e826d93 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *      Simon Chemouil <eclipse@mithrandir.net> - bugfix 315362
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x.compat;
 
 import org.eclipse.core.runtime.IExtensionRegistry;
@@ -64,11 +75,15 @@ public Object create(Class serviceInterface, IServiceLocator parentLocator,
 				
 				public void selectionChanged(IWorkbenchPart part, ISelection selection) {
 					if( ! selection.isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection) selection;
-						if( s.size() == 1 ) {
-							windowContext.set(IServiceConstants.SELECTION, s.getFirstElement());	
+						if( ! (selection instanceof IStructuredSelection) ) {
+							windowContext.set(ISelection.class, selection);
 						} else {
-							windowContext.set(IServiceConstants.SELECTION, s.toList());
+							IStructuredSelection s = (IStructuredSelection) selection;
+							if( s.size() == 1 ) {
+								windowContext.set(IServiceConstants.SELECTION, s.getFirstElement());	
+							} else {
+								windowContext.set(IServiceConstants.SELECTION, s.toList());
+							}
 						}
 					}
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/SelectionProviderContextFunction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/SelectionProviderContextFunction.java
index b15003499d..e908509eec 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/SelectionProviderContextFunction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/SelectionProviderContextFunction.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x.compat;
 
 import java.util.List;

From 28cc75bdc4cf7718a6570a6311a407501648451e Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 3 Jun 2010 12:26:32 +0000
Subject: [PATCH 0118/1286]  Bug 315362 -  [Tooling] ClassCastException in
 WorkbenchModel Editor in 3.x host mode

---
 .../emf/editor3x/compat/IEclipseContextServiceFactory.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java
index 875e826d93..93f095a23f 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *      Simon Chemouil <eclipse@mithrandir.net> - bugfix 315362
+ *      ARTAL Technologies <simon.chemouil@artal.fr> - bugfix 315362
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x.compat;
 

From 019151f7b7e5dc90ea9587bf89ef7d6694c15b1b Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 3 Jun 2010 16:13:16 +0000
Subject: [PATCH 0119/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * factoring compat stuff

---
 .../org.eclipse.e4.tools.compat/.classpath    |   7 +
 bundles/org.eclipse.e4.tools.compat/.project  |  33 +++
 .../.settings/org.eclipse.jdt.core.prefs      |   8 +
 .../META-INF/MANIFEST.MF                      |  16 ++
 .../OSGI-INF/selectionproviderfunction.xml    |   8 +
 .../build.properties                          |   6 +
 .../org.eclipse.e4.tools.compat/plugin.xml    |  13 +
 .../internal/ContextServiceFactory.java       |  94 +++++++
 .../internal/DirtyProviderFunction.java       |  34 +++
 .../ReflectionContributionFactory.java        | 253 ++++++++++++++++++
 .../SelectionProviderContextFunction.java     |  39 +++
 .../e4/tools/compat/internal/Util.java        |  26 ++
 .../e4/tools/compat/parts/DIEditorPart.java   | 171 ++++++++++++
 .../compat/parts/DISaveableViewPart.java      |  42 +++
 .../e4/tools/compat/parts/DIViewPart.java     |  30 +++
 .../org.eclipse.e4.tools.services/.classpath  |   7 +
 .../org.eclipse.e4.tools.services/.project    |  28 ++
 .../.settings/org.eclipse.jdt.core.prefs      |   8 +
 .../META-INF/MANIFEST.MF                      |   7 +
 .../build.properties                          |   4 +
 .../tools/services/IDirtyProviderService.java |   5 +
 .../services/ISelectionProviderService.java   |   5 +
 22 files changed, 844 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.compat/.classpath
 create mode 100644 bundles/org.eclipse.e4.tools.compat/.project
 create mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
 create mode 100644 bundles/org.eclipse.e4.tools.compat/OSGI-INF/selectionproviderfunction.xml
 create mode 100644 bundles/org.eclipse.e4.tools.compat/build.properties
 create mode 100644 bundles/org.eclipse.e4.tools.compat/plugin.xml
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DirtyProviderFunction.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/SelectionProviderContextFunction.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/.classpath
 create mode 100644 bundles/org.eclipse.e4.tools.services/.project
 create mode 100644 bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
 create mode 100644 bundles/org.eclipse.e4.tools.services/build.properties
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ISelectionProviderService.java

diff --git a/bundles/org.eclipse.e4.tools.compat/.classpath b/bundles/org.eclipse.e4.tools.compat/.classpath
new file mode 100644
index 0000000000..64c5e31b7a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/.classpath
@@ -0,0 +1,7 @@
+<?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.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.e4.tools.compat/.project b/bundles/org.eclipse.e4.tools.compat/.project
new file mode 100644
index 0000000000..e5e9a15272
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.compat</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..4fe427185e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Mon May 31 09:52:05 CEST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..6e43c8a7ae
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Compat
+Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
+ org.eclipse.core.runtime;bundle-version="3.6.0",
+ org.eclipse.e4.core.contexts;bundle-version="0.9.0",
+ org.eclipse.e4.core.services;bundle-version="0.9.1",
+ org.eclipse.e4.ui.services;bundle-version="0.9.1",
+ org.eclipse.e4.core.di;bundle-version="0.9.0",
+ org.eclipse.e4.tools.services;bundle-version="1.0.0",
+ org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0"
+Service-Component: OSGI-INF/selectionproviderfunction.xml
+Export-Package: org.eclipse.e4.tools.compat.parts
diff --git a/bundles/org.eclipse.e4.tools.compat/OSGI-INF/selectionproviderfunction.xml b/bundles/org.eclipse.e4.tools.compat/OSGI-INF/selectionproviderfunction.xml
new file mode 100644
index 0000000000..8790308750
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/OSGI-INF/selectionproviderfunction.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.compat">
+   <implementation class="org.eclipse.e4.tools.compat.internal.SelectionProviderContextFunction"/>
+   <service>
+      <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
+   </service>
+   <property name="service.context.key" type="String" value="org.eclipse.e4.tools.services.ISelectionProviderService"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/build.properties b/bundles/org.eclipse.e4.tools.compat/build.properties
new file mode 100644
index 0000000000..4975ca25a1
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/build.properties
@@ -0,0 +1,6 @@
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               OSGI-INF/selectionproviderfunction.xml
+source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.compat/plugin.xml b/bundles/org.eclipse.e4.tools.compat/plugin.xml
new file mode 100644
index 0000000000..a839686368
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/plugin.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.services">
+      <serviceFactory
+            factoryClass="org.eclipse.e4.tools.compat.internal.ContextServiceFactory">
+         <service
+               serviceClass="org.eclipse.e4.core.contexts.IEclipseContext"></service>
+      </serviceFactory>
+   </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
new file mode 100644
index 0000000000..480448e405
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.internal;
+
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.RegistryFactory;
+import org.eclipse.e4.core.contexts.EclipseContextFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.services.contributions.IContributionFactory;
+import org.eclipse.e4.ui.services.IServiceConstants;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.ISelectionListener;
+import org.eclipse.ui.ISelectionService;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.internal.services.IWorkbenchLocationService;
+import org.eclipse.ui.services.AbstractServiceFactory;
+import org.eclipse.ui.services.IServiceLocator;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+
+@SuppressWarnings("restriction")
+public class ContextServiceFactory extends AbstractServiceFactory {
+
+	@Override
+	public Object create(Class serviceInterface, IServiceLocator parentLocator,
+			IServiceLocator locator) {
+		if( ! IEclipseContext.class.equals(serviceInterface) ) {
+			return null;
+		}
+		
+		
+		IWorkbenchLocationService wls = (IWorkbenchLocationService) locator.getService(IWorkbenchLocationService.class);
+		final IWorkbenchWindow window = wls.getWorkbenchWindow();
+		final IWorkbenchPartSite site = wls.getPartSite();
+
+//		System.err.println("The locator: " + locator);
+//		System.err.println("	Window: " + window);
+//		System.err.println("	Site: " + site);
+		
+		Object o = parentLocator.getService(serviceInterface);
+		
+		// This happens when we run in plain 3.x
+		// We need to create a parent service context
+		if( window == null && site == null ) {
+			Bundle bundle = FrameworkUtil.getBundle(ContextServiceFactory.class);
+			BundleContext bundleContext = bundle.getBundleContext();
+			IEclipseContext serviceContext = EclipseContextFactory.getServiceContext(bundleContext);
+
+			final IEclipseContext appContext = serviceContext.createChild("WorkbenchContext"); //$NON-NLS-1$
+			IExtensionRegistry registry = RegistryFactory.getRegistry();
+			ReflectionContributionFactory contributionFactory = new ReflectionContributionFactory(registry);
+			appContext.set(IContributionFactory.class.getName(),contributionFactory);
+			
+			return appContext;
+		} else if( o != null && site == null ) {
+			final IEclipseContext windowContext = ((IEclipseContext)o).createChild("WindowContext("+window+")");
+			windowContext.set(ISelectionService.class, window.getSelectionService());
+			windowContext.declareModifiable(IServiceConstants.SELECTION);
+			
+			window.getSelectionService().addSelectionListener(new ISelectionListener() {
+				
+				public void selectionChanged(IWorkbenchPart part, ISelection selection) {
+					if( ! selection.isEmpty() ) {
+						if( selection instanceof IStructuredSelection ) {
+							IStructuredSelection s = (IStructuredSelection) selection;
+							if( s.size() == 1 ) {
+								windowContext.set(IServiceConstants.SELECTION, s.getFirstElement());	
+							} else {
+								windowContext.set(IServiceConstants.SELECTION, s.toList());
+							}	
+						} else {
+							windowContext.set(IServiceConstants.SELECTION, selection);
+						}
+					}
+				}
+			});
+			return windowContext;
+		}
+		
+		return o;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DirtyProviderFunction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DirtyProviderFunction.java
new file mode 100644
index 0000000000..88d82f130c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DirtyProviderFunction.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.internal;
+
+import org.eclipse.e4.core.contexts.ContextFunction;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.compat.parts.DIEditorPart;
+import org.eclipse.e4.tools.services.IDirtyProviderService;
+import org.eclipse.ui.part.EditorPart;
+
+public class DirtyProviderFunction extends ContextFunction {
+
+	@Override
+	public Object compute(IEclipseContext context) {
+		DIEditorPart<?> part = (DIEditorPart<?>) context.get(EditorPart.class);
+		return new IDirtyProviderService() {
+
+			public void setDirtyState(boolean dirtyState) {
+				// TODO Auto-generated method stub
+				
+			}
+			
+		};
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
new file mode 100644
index 0000000000..3ac6b2d03a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
@@ -0,0 +1,253 @@
+/*******************************************************************************
+ * Copyright (c) 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     IBM Corporation - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.internal;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.InvalidRegistryObjectException;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.InjectionException;
+import org.eclipse.e4.core.services.contributions.IContributionFactory;
+import org.eclipse.e4.core.services.contributions.IContributionFactorySpi;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.packageadmin.PackageAdmin;
+
+/**
+ * Create the contribution factory.
+ */
+public class ReflectionContributionFactory implements IContributionFactory {
+
+	private IExtensionRegistry registry;
+	private Map<String, Object> languages;
+
+	static class URI {
+		private String[] segments;
+		
+		URI(String[] segments) {
+			this.segments = segments;
+		}
+		
+		public static URI createURI(String uriString) {
+			return new URI(uriString.split("/"));
+		}
+
+		public int segmentCount() {
+			return segments.length;
+		}
+
+		public String segment(int i) {
+			return segments[i];
+		}
+	}
+	
+	/**
+	 * Create a reflection factory.
+	 * 
+	 * @param registry
+	 *            to read languages.
+	 */
+	public ReflectionContributionFactory(IExtensionRegistry registry) {
+		this.registry = registry;
+		processLanguages();
+	}
+
+	public Object call(Object object, String uriString, String methodName, IEclipseContext context,
+			Object defaultValue) {
+		if (uriString != null) {
+			URI uri = URI.createURI(uriString);
+			if (uri.segmentCount() > 3) {
+				String prefix = uri.segment(2);
+				IContributionFactorySpi factory = (IContributionFactorySpi) languages.get(prefix);
+				return factory.call(object, methodName, context, defaultValue);
+			}
+		}
+
+		Method targetMethod = null;
+
+		Method[] methods = object.getClass().getMethods();
+
+		// Optimization: if there's only one method, use it.
+		if (methods.length == 1) {
+			targetMethod = methods[0];
+		} else {
+			ArrayList<Method> toSort = new ArrayList<Method>();
+
+			for (int i = 0; i < methods.length; i++) {
+				Method method = methods[i];
+
+				// Filter out non-public constructors
+				if ((method.getModifiers() & Modifier.PUBLIC) != 0
+						&& method.getName().equals(methodName)) {
+					toSort.add(method);
+				}
+			}
+
+			// Sort the methods by descending number of method
+			// arguments
+			Collections.sort(toSort, new Comparator<Method>() {
+				/*
+				 * (non-Javadoc)
+				 * 
+				 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+				 */
+				public int compare(Method m1, Method m2) {
+					int l1 = m1.getParameterTypes().length;
+					int l2 = m2.getParameterTypes().length;
+
+					return l1 - l2;
+				}
+			});
+
+			// Find the first satisfiable method
+			for (Iterator<Method> iter = toSort.iterator(); iter.hasNext() && targetMethod == null;) {
+				Method next = iter.next();
+
+				boolean satisfiable = true;
+
+				Class<?>[] params = next.getParameterTypes();
+				for (int i = 0; i < params.length && satisfiable; i++) {
+					Class<?> clazz = params[i];
+
+					if (!context.containsKey(clazz.getName())
+							&& !IEclipseContext.class.equals(clazz)) {
+						satisfiable = false;
+					}
+				}
+
+				if (satisfiable) {
+					targetMethod = next;
+				}
+			}
+		}
+
+		if (targetMethod == null) {
+			if (defaultValue != null) {
+				return defaultValue;
+			}
+			throw new RuntimeException(
+					"could not find satisfiable method " + methodName + " in class " + object.getClass()); //$NON-NLS-1$//$NON-NLS-2$
+		}
+
+		Class<?>[] paramKeys = targetMethod.getParameterTypes();
+
+		try {
+//			Activator.trace(Policy.DEBUG_CMDS, "calling: " + methodName, null); //$NON-NLS-1$
+			Object[] params = new Object[paramKeys.length];
+			for (int i = 0; i < params.length; i++) {
+				if (IEclipseContext.class.equals(paramKeys[i])) {
+					params[i] = context;
+				} else {
+					params[i] = context.get(paramKeys[i].getName());
+				}
+			}
+
+			return targetMethod.invoke(object, params);
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException(e);
+		}
+	}
+
+	public Object create(String uriString, IEclipseContext context) {
+		if (uriString == null) {
+			return null;
+		}
+		URI uri = URI.createURI(uriString);
+		Bundle bundle = getBundle(uri);
+		Object contribution;
+		if (bundle != null) {
+			contribution = createFromBundle(bundle, context, uri);
+		} else {
+			contribution = null;
+//			Activator.log(LogService.LOG_ERROR, "Unable to retrive the bundle from the URI: " //$NON-NLS-1$
+//					+ uriString);
+		}
+		return contribution;
+	}
+
+	protected Object createFromBundle(Bundle bundle, IEclipseContext context, URI uri) {
+		Object contribution;
+		if (uri.segmentCount() > 3) {
+			String prefix = uri.segment(2);
+			IContributionFactorySpi factory = (IContributionFactorySpi) languages.get(prefix);
+			StringBuffer resource = new StringBuffer(uri.segment(3));
+			for (int i = 4; i < uri.segmentCount(); i++) {
+				resource.append('/');
+				resource.append(uri.segment(i));
+			}
+			contribution = factory.create(bundle, resource.toString(), context);
+		} else {
+			String clazz = uri.segment(2);
+			try {
+				Class<?> targetClass = bundle.loadClass(clazz);
+				contribution = ContextInjectionFactory.make(targetClass, context);
+				if (contribution == null) {
+					String message = "Unable to load class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
+							+ bundle.getBundleId() + "'"; //$NON-NLS-1$
+//					Activator.log(LogService.LOG_ERROR, message, new Exception());
+				}
+			} catch (ClassNotFoundException e) {
+				contribution = null;
+				String message = "Unable to load class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
+						+ bundle.getBundleId() + "'"; //$NON-NLS-1$
+//				Activator.log(LogService.LOG_ERROR, message, e);
+			} catch (InjectionException e) {
+				contribution = null;
+				String message = "Unable to create class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
+						+ bundle.getBundleId() + "'"; //$NON-NLS-1$
+//				Activator.log(LogService.LOG_ERROR, message, e);
+			}
+		}
+		return contribution;
+	}
+
+	protected void processLanguages() {
+		languages = new HashMap<String, Object>();
+		String extId = "org.eclipse.e4.languages"; //$NON-NLS-1$
+		IConfigurationElement[] languageElements = registry.getConfigurationElementsFor(extId);
+		for (int i = 0; i < languageElements.length; i++) {
+			IConfigurationElement languageElement = languageElements[i];
+			try {
+				languages.put(languageElement.getAttribute("name"), //$NON-NLS-1$
+						languageElement.createExecutableExtension("contributionFactory")); //$NON-NLS-1$
+			} catch (InvalidRegistryObjectException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (CoreException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+	}
+
+	protected Bundle getBundle(URI platformURI) {
+		return Util.getBundle(platformURI.segment(1));
+	}
+
+	public Bundle getBundle(String uriString) {
+		URI uri = URI.createURI(uriString);
+		return getBundle(uri);
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/SelectionProviderContextFunction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/SelectionProviderContextFunction.java
new file mode 100644
index 0000000000..901627cd04
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/SelectionProviderContextFunction.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.internal;
+
+import java.util.List;
+
+import org.eclipse.e4.core.contexts.ContextFunction;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.services.ISelectionProviderService;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+
+
+public class SelectionProviderContextFunction extends ContextFunction {
+
+	@Override
+	public Object compute(final IEclipseContext context) {
+		return new ISelectionProviderService() {
+			public void setSelection(Object selection) {
+				ISelectionProvider pv = context.get(ISelectionProvider.class);
+				
+				if( selection instanceof List<?> ) {
+					pv.setSelection(new StructuredSelection((List<?>)selection));	
+				} else {
+					pv.setSelection(new StructuredSelection(selection));
+				}
+				
+			}
+		};
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java
new file mode 100644
index 0000000000..567fcc2b2f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java
@@ -0,0 +1,26 @@
+package org.eclipse.e4.tools.compat.internal;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.packageadmin.PackageAdmin;
+
+public class Util {
+	public static Bundle getBundle(String bundleName) {
+		Bundle bundle = FrameworkUtil.getBundle(Util.class);
+		BundleContext ctx = bundle.getBundleContext();
+		ServiceReference ref = bundle.getBundleContext().getServiceReference(PackageAdmin.class.getName());
+		PackageAdmin bundleAdmin = (PackageAdmin) ctx.getService(ref);
+		Bundle[] bundles = bundleAdmin.getBundles(bundleName, null);
+		if (bundles == null)
+			return null;
+		// Return the first bundle that is not installed or uninstalled
+		for (int i = 0; i < bundles.length; i++) {
+			if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
+				return bundles[i];
+			}
+		}
+		return null;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
new file mode 100644
index 0000000000..a154d288e7
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -0,0 +1,171 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.parts;
+
+import java.lang.reflect.Method;
+
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.compat.internal.Util;
+import org.eclipse.e4.ui.services.IStylingEngine;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.EditorPart;
+
+public abstract class DIEditorPart<C> extends EditorPart {
+	private IEclipseContext context;
+	private C component;
+	private Class<C> clazz;
+	private boolean dirtyState;
+	
+	public DIEditorPart(Class<C> clazz) {
+		this.clazz = clazz;
+	}
+	
+//FIXME once @Persist is out of ui.workbench
+//	@Override
+//	public void doSave(IProgressMonitor monitor) {
+//		// TODO Auto-generated method stub
+//		
+//	}
+//
+//	@Override
+//	public void doSaveAs() {
+//		// TODO Auto-generated method stub
+//	}
+
+	@Override
+	public void init(IEditorSite site, IEditorInput input)
+			throws PartInitException {
+		setSite(site);
+		setInput(input);
+		
+		IEclipseContext parentContext = (IEclipseContext) getSite().getService(IEclipseContext.class);
+		
+		// Check if running in 4.x
+		if( parentContext.get("org.eclipse.e4.workbench.ui.IPresentationEngine") != null ) {
+			// Hack to get the MPart-Context
+			try {
+				Class<?> clazz = Util.getBundle("org.eclipse.e4.ui.model").loadClass("org.eclipse.e4.ui.model.application.ui.basic.MPart");
+				Object instance = getSite().getService(clazz);
+				Method m = clazz.getMethod("getContext", new Class[0]);
+				context = (IEclipseContext) m.invoke(instance);				
+			} catch (Exception e) {
+				throw new PartInitException("Could not create context",e);
+			}
+		} else {
+			context = parentContext.createChild("EditPart('"+getPartName()+"')"); //$NON-NLS-1$	
+		}
+		
+		context.declareModifiable(IEditorInput.class);
+		context.declareModifiable(EditorPart.class);
+		
+		context.set(EditorPart.class,this);
+		context.set(IEditorInput.class, input);
+	}
+
+	
+//
+//	@Override
+//	public boolean isSaveAsAllowed() {
+//		// TODO Auto-generated method stub
+//		return false;
+//	}
+
+	@Override
+	public void createPartControl(Composite parent) {
+		ISelectionProvider s = new SelectionProviderImpl();
+		context.set(ISelectionProvider.class, s);
+		getSite().setSelectionProvider(s);
+		
+		IStylingEngine styleEngine = context.get(IStylingEngine.class);
+		Composite comp = new Composite(parent, SWT.NONE);
+		comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
+		
+		FillLayout layout = new FillLayout();
+		layout.marginWidth = 10;
+		layout.marginHeight = 10;
+		comp.setLayout(layout);
+		
+		context.set(Composite.class.getName(), comp);
+		component = ContextInjectionFactory.make(clazz, context);
+		
+		styleEngine.setClassname(comp, getSite().getId());
+	}
+	
+	public C getComponent() {
+		return component;
+	}
+	
+	public void setDirtyState(boolean dirtyState) {
+		if( dirtyState != this.dirtyState ) {
+			this.dirtyState = dirtyState;
+			firePropertyChange(PROP_DIRTY);
+		}
+	}
+	
+	@Override
+	public boolean isDirty() {
+		return dirtyState;
+	}
+	
+//FIXME Once we have an @Focus we can implement it
+//	@Override
+//	public void setFocus() {
+//		// TODO Auto-generated method stub
+//		
+//	}
+	
+	@Override
+	public void dispose() {
+		context.dispose();
+		context = null;
+		super.dispose();
+	}
+
+	private class SelectionProviderImpl implements ISelectionProvider {
+		private ISelection currentSelection = StructuredSelection.EMPTY;
+		
+		private ListenerList listeners = new ListenerList();
+		
+		public void setSelection(ISelection selection) {
+			currentSelection = selection;
+			SelectionChangedEvent evt = new SelectionChangedEvent(this, selection);
+			
+			for( Object l : listeners.getListeners() ) {
+				((ISelectionChangedListener)l).selectionChanged(evt);
+			}
+		}
+				
+		public void removeSelectionChangedListener(
+				ISelectionChangedListener listener) {
+			listeners.remove(listener);
+		}
+		
+		public ISelection getSelection() {
+			return currentSelection;
+		}
+		
+		public void addSelectionChangedListener(ISelectionChangedListener listener) {
+			listeners.add(listener);
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
new file mode 100644
index 0000000000..a55efc86f8
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.parts;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.ui.ISaveablePart;
+
+public class DISaveableViewPart extends DIViewPart implements ISaveablePart {
+
+	public void doSave(IProgressMonitor monitor) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public void doSaveAs() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public boolean isDirty() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public boolean isSaveAsAllowed() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public boolean isSaveOnCloseNeeded() {
+		// TODO Auto-generated method stub
+		return false;
+	}	
+}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
new file mode 100644
index 0000000000..876f05dbcd
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.parts;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.part.ViewPart;
+
+public class DIViewPart extends ViewPart {
+
+	@Override
+	public void createPartControl(Composite parent) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setFocus() {
+		// TODO Auto-generated method stub
+		
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.services/.classpath b/bundles/org.eclipse.e4.tools.services/.classpath
new file mode 100644
index 0000000000..64c5e31b7a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/.classpath
@@ -0,0 +1,7 @@
+<?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.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.e4.tools.services/.project b/bundles/org.eclipse.e4.tools.services/.project
new file mode 100644
index 0000000000..15c52ba19e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.services</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..199694e6da
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Wed Jun 02 16:01:21 CEST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..664eaddc1e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Services
+Bundle-SymbolicName: org.eclipse.e4.tools.services
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.e4.tools.services
diff --git a/bundles/org.eclipse.e4.tools.services/build.properties b/bundles/org.eclipse.e4.tools.services/build.properties
new file mode 100644
index 0000000000..34d2e4d2da
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java
new file mode 100644
index 0000000000..52dc193634
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java
@@ -0,0 +1,5 @@
+package org.eclipse.e4.tools.services;
+
+public interface IDirtyProviderService {
+	public void setDirtyState(boolean dirtyState);
+}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ISelectionProviderService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ISelectionProviderService.java
new file mode 100644
index 0000000000..e90d0f60bd
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ISelectionProviderService.java
@@ -0,0 +1,5 @@
+package org.eclipse.e4.tools.services;
+
+public interface ISelectionProviderService {
+	public void setSelection(Object selection);
+}

From f29d1abc4d2f9a9a8318d0091b09d4f6f46b7009 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 3 Jun 2010 16:26:30 +0000
Subject: [PATCH 0120/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * edit propagation

---
 .../org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF   |  3 ++-
 .../OSGI-INF/dirtyproviderfunction.xml                 |  8 ++++++++
 bundles/org.eclipse.e4.tools.compat/build.properties   |  3 ++-
 .../tools/compat/internal/DirtyProviderFunction.java   | 10 ++++++----
 .../eclipse/e4/tools/compat/parts/DIEditorPart.java    |  2 +-
 5 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.compat/OSGI-INF/dirtyproviderfunction.xml

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 6e43c8a7ae..356b567cb4 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -12,5 +12,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0",
  org.eclipse.e4.tools.services;bundle-version="1.0.0",
  org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0"
-Service-Component: OSGI-INF/selectionproviderfunction.xml
+Service-Component: OSGI-INF/selectionproviderfunction.xml, OSGI-INF/dirtyproviderfunction.xml
 Export-Package: org.eclipse.e4.tools.compat.parts
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.e4.tools.compat/OSGI-INF/dirtyproviderfunction.xml b/bundles/org.eclipse.e4.tools.compat/OSGI-INF/dirtyproviderfunction.xml
new file mode 100644
index 0000000000..7927e5092b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/OSGI-INF/dirtyproviderfunction.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.compat">
+   <implementation class="org.eclipse.e4.tools.compat.internal.DirtyProviderFunction"/>
+   <service>
+      <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
+   </service>
+   <property name="service.context.key" type="String" value="org.eclipse.e4.tools.services.IDirtyProviderService"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/build.properties b/bundles/org.eclipse.e4.tools.compat/build.properties
index 4975ca25a1..e56d72ba99 100644
--- a/bundles/org.eclipse.e4.tools.compat/build.properties
+++ b/bundles/org.eclipse.e4.tools.compat/build.properties
@@ -2,5 +2,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               OSGI-INF/selectionproviderfunction.xml
+               OSGI-INF/selectionproviderfunction.xml,\
+               OSGI-INF/dirtyproviderfunction.xml
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DirtyProviderFunction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DirtyProviderFunction.java
index 88d82f130c..0a459f2ac5 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DirtyProviderFunction.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DirtyProviderFunction.java
@@ -20,14 +20,16 @@ public class DirtyProviderFunction extends ContextFunction {
 
 	@Override
 	public Object compute(IEclipseContext context) {
-		DIEditorPart<?> part = (DIEditorPart<?>) context.get(EditorPart.class);
+		final DIEditorPart<?> part = (DIEditorPart<?>) context.get(EditorPart.class);
+		if( part == null ) {
+			return null;
+		}
+		
 		return new IDirtyProviderService() {
 
 			public void setDirtyState(boolean dirtyState) {
-				// TODO Auto-generated method stub
-				
+				part.setDirtyState(dirtyState);
 			}
-			
 		};
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index a154d288e7..2549071c69 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -64,7 +64,7 @@ public void init(IEditorSite site, IEditorInput input)
 		if( parentContext.get("org.eclipse.e4.workbench.ui.IPresentationEngine") != null ) {
 			// Hack to get the MPart-Context
 			try {
-				Class<?> clazz = Util.getBundle("org.eclipse.e4.ui.model").loadClass("org.eclipse.e4.ui.model.application.ui.basic.MPart");
+				Class<?> clazz = Util.getBundle("org.eclipse.e4.ui.model.workbench").loadClass("org.eclipse.e4.ui.model.application.ui.basic.MPart");
 				Object instance = getSite().getService(clazz);
 				Method m = clazz.getMethod("getContext", new Class[0]);
 				context = (IEclipseContext) m.invoke(instance);				

From c80b325a088c3f78ebcf3037bbc75a95a3f417d0 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 3 Jun 2010 16:34:33 +0000
Subject: [PATCH 0121/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed DS problem

---
 .../OSGI-INF/dirtyproviderfunction.xml                        | 4 ++--
 .../OSGI-INF/selectionproviderfunction.xml                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/OSGI-INF/dirtyproviderfunction.xml b/bundles/org.eclipse.e4.tools.compat/OSGI-INF/dirtyproviderfunction.xml
index 7927e5092b..997082069c 100644
--- a/bundles/org.eclipse.e4.tools.compat/OSGI-INF/dirtyproviderfunction.xml
+++ b/bundles/org.eclipse.e4.tools.compat/OSGI-INF/dirtyproviderfunction.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.compat">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.compat.dirtyprovider">
    <implementation class="org.eclipse.e4.tools.compat.internal.DirtyProviderFunction"/>
    <service>
       <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
    </service>
    <property name="service.context.key" type="String" value="org.eclipse.e4.tools.services.IDirtyProviderService"/>
-</scr:component>
\ No newline at end of file
+</scr:component>
diff --git a/bundles/org.eclipse.e4.tools.compat/OSGI-INF/selectionproviderfunction.xml b/bundles/org.eclipse.e4.tools.compat/OSGI-INF/selectionproviderfunction.xml
index 8790308750..15b8531d18 100644
--- a/bundles/org.eclipse.e4.tools.compat/OSGI-INF/selectionproviderfunction.xml
+++ b/bundles/org.eclipse.e4.tools.compat/OSGI-INF/selectionproviderfunction.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.compat">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.compat.selectionprovider">
    <implementation class="org.eclipse.e4.tools.compat.internal.SelectionProviderContextFunction"/>
    <service>
       <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
    </service>
    <property name="service.context.key" type="String" value="org.eclipse.e4.tools.services.ISelectionProviderService"/>
-</scr:component>
\ No newline at end of file
+</scr:component>

From ea53a6a1712b7c3a30387616d0e7c9fbb85c4ee4 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 3 Jun 2010 16:38:13 +0000
Subject: [PATCH 0122/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * adding new compat bundles

---
 .../org.eclipse.e4.core.tools.feature/feature.xml  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index b542dc7298..0f880b4302 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -31,4 +31,18 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.e4.tools.compat"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.e4.tools.services"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

From 993ecf59704bfbd7ef3b1881d5a354b5be8ebf49 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 3 Jun 2010 17:08:12 +0000
Subject: [PATCH 0123/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * setting up styling engine

---
 .../internal/ContextServiceFactory.java       | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index 480448e405..fa33b02037 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -15,9 +15,14 @@
 import org.eclipse.e4.core.contexts.EclipseContextFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.services.contributions.IContributionFactory;
+import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
+import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
 import org.eclipse.e4.ui.services.IServiceConstants;
+import org.eclipse.e4.ui.services.IStylingEngine;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Widget;
 import org.eclipse.ui.ISelectionListener;
 import org.eclipse.ui.ISelectionService;
 import org.eclipse.ui.IWorkbenchPart;
@@ -63,6 +68,27 @@ public Object create(Class serviceInterface, IServiceLocator parentLocator,
 			ReflectionContributionFactory contributionFactory = new ReflectionContributionFactory(registry);
 			appContext.set(IContributionFactory.class.getName(),contributionFactory);
 			
+			IThemeManager manager = serviceContext.get(IThemeManager.class);
+			final IThemeEngine engine = manager.getEngineForDisplay(Display.getCurrent());
+			
+			appContext.set(IStylingEngine.class, new IStylingEngine() {
+				
+				public void setClassname(Object widget, String classname) {
+					((Widget) widget).setData(
+							"org.eclipse.e4.ui.css.CssClassName", classname); //$NON-NLS-1$
+					engine.applyStyles((Widget) widget, true);
+				}
+
+				public void setId(Object widget, String id) {
+					((Widget) widget).setData("org.eclipse.e4.ui.css.id", id); //$NON-NLS-1$
+					engine.applyStyles((Widget) widget, true);
+				}
+
+				public void style(Object widget) {
+					engine.applyStyles((Widget) widget, true);
+				}
+			});
+			
 			return appContext;
 		} else if( o != null && site == null ) {
 			final IEclipseContext windowContext = ((IEclipseContext)o).createChild("WindowContext("+window+")");

From 325d42a3bd7368f18fa5f2548c30a7f39baf6a3c Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 3 Jun 2010 17:24:43 +0000
Subject: [PATCH 0124/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * using new compat implementation

---
 .../e4/tools/compat/parts/DIEditorPart.java   |   2 +-
 .../META-INF/MANIFEST.MF                      |   6 +-
 .../OSGI-INF/selectionproviderfunction.xml    |   8 -
 .../plugin.xml                                |   9 -
 .../emf/editor3x/E4WorkbenchModelEditor.java  |  29 ++-
 .../emf/editor3x/XMIResourceFunction.java     |   8 +-
 .../editor3x/compat/E4CompatEditorPart.java   | 186 ------------------
 .../compat/IEclipseContextServiceFactory.java |  96 ---------
 .../SelectionProviderContextFunction.java     |  39 ----
 .../css/default.css                           |   5 +
 10 files changed, 39 insertions(+), 349 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/selectionproviderfunction.xml
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/SelectionProviderContextFunction.java

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index 2549071c69..3f2580cb43 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -108,7 +108,7 @@ public void createPartControl(Composite parent) {
 		context.set(Composite.class.getName(), comp);
 		component = ContextInjectionFactory.make(clazz, context);
 		
-		styleEngine.setClassname(comp, getSite().getId());
+		styleEngine.setClassname(comp, getClass().getSimpleName());
 	}
 	
 	public C getComponent() {
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index e419afd5cf..db0beef847 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -22,7 +22,9 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0",
  org.eclipse.e4.core.services;bundle-version="0.9.1",
  org.eclipse.emf.edit;bundle-version="2.6.0",
- org.eclipse.e4.ui.services;bundle-version="0.9.1"
-Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/selectionproviderfunction.xml
+ org.eclipse.e4.ui.services;bundle-version="0.9.1",
+ org.eclipse.e4.tools.compat;bundle-version="1.0.0",
+ org.eclipse.e4.tools.services;bundle-version="1.0.0"
+Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.e4.tools.emf.editor3x.wizard;x-internal:=true
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/selectionproviderfunction.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/selectionproviderfunction.xml
deleted file mode 100644
index 73d6e010dd..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/selectionproviderfunction.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.emf.editor3x.selectionprovider">
-   <implementation class="org.eclipse.e4.tools.emf.editor3x.compat.SelectionProviderContextFunction"/>
-   <service>
-      <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
-   </service>
-   <property name="service.context.key" type="String" value="org.eclipse.e4.tools.emf.ui.common.ISelectionProviderService"/>
-</scr:component>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index 3859e5668b..8a4c94ce26 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -38,14 +38,5 @@
             name="e4">
       </category>
       </extension>
-   <extension
-         point="org.eclipse.ui.services">
-      <serviceFactory
-            factoryClass="org.eclipse.e4.tools.emf.editor3x.compat.IEclipseContextServiceFactory">
-         <service
-               serviceClass="org.eclipse.e4.core.contexts.IEclipseContext">
-         </service>
-      </serviceFactory>
-   </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
index e3a506d645..ec9134aeab 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -10,11 +10,34 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
-import org.eclipse.e4.tools.emf.editor3x.compat.E4CompatEditorPart;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.e4.tools.compat.parts.DIEditorPart;
+import org.eclipse.e4.tools.emf.ui.internal.wbm.ApplicationModelEditor;
 
-public class E4WorkbenchModelEditor extends E4CompatEditorPart {
+@SuppressWarnings("restriction")
+public class E4WorkbenchModelEditor extends DIEditorPart<ApplicationModelEditor> {
 
 	public E4WorkbenchModelEditor() {
-		super("platform:/plugin/org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.wbm.ApplicationModelEditor");
+		super(ApplicationModelEditor.class);
+	}
+
+	@Override
+	public void doSave(IProgressMonitor monitor) {
+		getComponent().doSave(monitor);
+	}
+
+	@Override
+	public void doSaveAs() {
+		
+	}
+
+	@Override
+	public boolean isSaveAsAllowed() {
+		return false;
+	}
+
+	@Override
+	public void setFocus() {
+		getComponent().setFocus();
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
index 8ea8779aff..b8e737b8ca 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
@@ -2,20 +2,19 @@
 
 import org.eclipse.e4.core.contexts.ContextFunction;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.tools.emf.editor3x.compat.E4CompatEditorPart;
 import org.eclipse.e4.tools.emf.editor3x.emf.EditUIUtil;
 import org.eclipse.e4.tools.emf.ui.common.XMIModelResource;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource.ModelListener;
+import org.eclipse.e4.tools.services.IDirtyProviderService;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.part.EditorPart;
 
 public class XMIResourceFunction extends ContextFunction {
 
 	@Override
 	public Object compute(final IEclipseContext context) {
 		final IEditorInput input = context.get(IEditorInput.class);
-		final E4CompatEditorPart part = (E4CompatEditorPart) context.get(EditorPart.class);
+		final IDirtyProviderService dirtyProvider = context.get(IDirtyProviderService.class);
 		
 		if( input != null ) {
 			URI resourceURI = EditUIUtil.getURI(input);
@@ -23,8 +22,7 @@ public Object compute(final IEclipseContext context) {
 			resource.addModelListener(new ModelListener() {
 				
 				public void dirtyChanged() {
-					context.set(EditorPart.class.getName()+".dirty", resource.isDirty());
-					part.firePropertyChange(EditorPart.PROP_DIRTY);
+					dirtyProvider.setDirtyState(resource.isDirty());
 				}
 
 				public void commandStackChanged() {
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
deleted file mode 100644
index ba0d738152..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.editor3x.compat;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.services.contributions.IContributionFactory;
-import org.eclipse.e4.tools.emf.editor3x.E4WorkbenchModelEditor;
-import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
-import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.EditorPart;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceReference;
-
-public class E4CompatEditorPart extends EditorPart implements IExecutableExtension {
-	private Object instance;
-	private String classUri;
-	
-	//TODO can we create a context as a top-level service?
-	private IEclipseContext context;
-	
-	public E4CompatEditorPart(String classUri) {
-		this.classUri = classUri;
-	}
-	
-	@Override
-	public void doSave(IProgressMonitor monitor) {
-		IContributionFactory factory = (IContributionFactory) context.get(IContributionFactory.class);
-		factory.call(instance, null, "doSave", context, null);
-	}
-
-	@Override
-	public void doSaveAs() {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void init(IEditorSite site, IEditorInput input)
-			throws PartInitException {
-		setSite(site);
-		setInput(input);
-		
-		IEclipseContext parentContext = (IEclipseContext) getSite().getService(IEclipseContext.class);
-		
-//		System.err.println("The context" + parentContext);
-		
-		// We are in e4 Compat-Mode
-		if( parentContext.get("org.eclipse.e4.workbench.ui.IPresentationEngine") != null ) {
-			MPart p = (MPart) getSite().getService(MPart.class);
-			context = p.getContext();
-		} else {
-			context = parentContext.createChild("EditPart('"+getPartName()+"')"); //$NON-NLS-1$	
-		}
-		
-		context.declareModifiable(IEditorInput.class);
-		context.declareModifiable(EditorPart.class);
-		
-		context.set(EditorPart.class,this);
-		context.set(IEditorInput.class, input);
-		
-		if( input instanceof IFileEditorInput ) {
-			IFileEditorInput fInput = (IFileEditorInput)getEditorInput();
-			context.set(IProject.class, fInput.getFile().getProject());
-		}
-		
-	}
-
-	@Override
-	public void firePropertyChange(int propertyId) {
-		super.firePropertyChange(propertyId);
-	}
-	
-	@Override
-	public boolean isDirty() {
-		Boolean b = (Boolean) context.get(EditorPart.class.getName()+".dirty");
-		return b != null && b;
-	}
-
-	@Override
-	public boolean isSaveAsAllowed() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public void createPartControl(Composite parent) {
-		ISelectionProvider s = new SelectionProviderImpl();
-		context.set(ISelectionProvider.class, s);
-		getSite().setSelectionProvider(s);
-
-		
-		Composite comp = new Composite(parent, SWT.NONE);
-		comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
-
-		FillLayout layout = new FillLayout();
-		layout.marginWidth = 10;
-		layout.marginHeight = 10;
-		comp.setLayout(layout);
-		
-		context.set(Composite.class.getName(), comp);
-		IContributionFactory factory = (IContributionFactory) context.get(IContributionFactory.class);
-		instance = factory.create(classUri, context);
-		
-		Bundle b = FrameworkUtil.getBundle(E4WorkbenchModelEditor.class);
-		if( b != null ) {
-			ServiceReference ref = b.getBundleContext().getServiceReference(IThemeManager.class.getName());
-			if( ref != null ) {
-				IThemeManager mgr = (IThemeManager) b.getBundleContext().getService(ref);
-				IThemeEngine engine = mgr.getEngineForDisplay(parent.getDisplay());
-				engine.applyStyles(parent, true);
-			}			
-		}
-	}
-
-	@Override
-	public void setFocus() {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void dispose() {
-		context.dispose();
-		context = null;
-		super.dispose();
-	}
-	
-	private class SelectionProviderImpl implements ISelectionProvider {
-		private ISelection currentSelection = StructuredSelection.EMPTY;
-		
-		private ListenerList listeners = new ListenerList();
-		
-		public void setSelection(ISelection selection) {
-			currentSelection = selection;
-			SelectionChangedEvent evt = new SelectionChangedEvent(this, selection);
-			
-			for( Object l : listeners.getListeners() ) {
-				((ISelectionChangedListener)l).selectionChanged(evt);
-			}
-		}
-				
-		public void removeSelectionChangedListener(
-				ISelectionChangedListener listener) {
-			listeners.remove(listener);
-		}
-		
-		public ISelection getSelection() {
-			System.err.println("Selection: " + currentSelection);
-			return currentSelection;
-		}
-		
-		public void addSelectionChangedListener(ISelectionChangedListener listener) {
-			System.err.println("Adding listener: " + listener);
-			listeners.add(listener);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java
deleted file mode 100644
index 93f095a23f..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/IEclipseContextServiceFactory.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *      ARTAL Technologies <simon.chemouil@artal.fr> - bugfix 315362
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.editor3x.compat;
-
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.RegistryFactory;
-import org.eclipse.e4.core.contexts.EclipseContextFactory;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.services.contributions.IContributionFactory;
-import org.eclipse.e4.ui.services.IServiceConstants;
-import org.eclipse.e4.workbench.ui.internal.ReflectionContributionFactory;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.internal.services.IWorkbenchLocationService;
-import org.eclipse.ui.services.AbstractServiceFactory;
-import org.eclipse.ui.services.IServiceLocator;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-
-public class IEclipseContextServiceFactory extends AbstractServiceFactory {
-
-	public IEclipseContextServiceFactory() {
-	}
-
-	@SuppressWarnings("restriction")
-	@Override
-	public Object create(Class serviceInterface, IServiceLocator parentLocator,
-			IServiceLocator locator) {
-		if( ! IEclipseContext.class.equals(serviceInterface) ) {
-			return null;
-		}
-		
-		IWorkbenchLocationService wls = (IWorkbenchLocationService) locator.getService(IWorkbenchLocationService.class);
-		final IWorkbenchWindow window = wls.getWorkbenchWindow();
-		final IWorkbenchPartSite site = wls.getPartSite();
-
-//		System.err.println("The locator: " + locator);
-//		System.err.println("	Window: " + window);
-//		System.err.println("	Site: " + site);
-		
-		Object o = parentLocator.getService(serviceInterface);
-		
-		// This happens when we run in plain 3.x
-		// We need to create a parent service context
-		if( window == null && site == null ) {
-			Bundle bundle = FrameworkUtil.getBundle(IEclipseContextServiceFactory.class);
-			BundleContext bundleContext = bundle.getBundleContext();
-			IEclipseContext serviceContext = EclipseContextFactory.getServiceContext(bundleContext);
-
-			final IEclipseContext appContext = serviceContext.createChild("WorkbenchContext"); //$NON-NLS-1$
-			IExtensionRegistry registry = RegistryFactory.getRegistry();
-			ReflectionContributionFactory contributionFactory = new ReflectionContributionFactory(registry);
-			appContext.set(IContributionFactory.class.getName(),contributionFactory);
-			
-			return appContext;
-		} else if( o != null && site == null ) {
-			final IEclipseContext windowContext = ((IEclipseContext)o).createChild("WindowContext("+window+")");
-			windowContext.set(ISelectionService.class, window.getSelectionService());
-			window.getSelectionService().addSelectionListener(new ISelectionListener() {
-				
-				public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-					if( ! selection.isEmpty() ) {
-						if( ! (selection instanceof IStructuredSelection) ) {
-							windowContext.set(ISelection.class, selection);
-						} else {
-							IStructuredSelection s = (IStructuredSelection) selection;
-							if( s.size() == 1 ) {
-								windowContext.set(IServiceConstants.SELECTION, s.getFirstElement());	
-							} else {
-								windowContext.set(IServiceConstants.SELECTION, s.toList());
-							}
-						}
-					}
-				}
-			});
-			return windowContext;
-		}
-		
-		return o;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/SelectionProviderContextFunction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/SelectionProviderContextFunction.java
deleted file mode 100644
index e908509eec..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/SelectionProviderContextFunction.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.editor3x.compat;
-
-import java.util.List;
-
-import org.eclipse.e4.core.contexts.ContextFunction;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.tools.emf.ui.common.ISelectionProviderService;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-public class SelectionProviderContextFunction extends ContextFunction {
-
-	@Override
-	public Object compute(final IEclipseContext context) {
-		return new ISelectionProviderService() {
-			
-			public void setSelection(Object selection) {
-				ISelectionProvider pv = context.get(ISelectionProvider.class);
-				
-				if( selection instanceof List<?> ) {
-					pv.setSelection(new StructuredSelection((List<?>)selection));	
-				} else {
-					pv.setSelection(new StructuredSelection(selection));
-				}
-				
-			}
-		};
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/css/default.css b/bundles/org.eclipse.e4.tools.emf.ui/css/default.css
index 751eb8fc18..2117aec750 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/css/default.css
+++ b/bundles/org.eclipse.e4.tools.emf.ui/css/default.css
@@ -19,4 +19,9 @@
 
 .formContainer {
 	background-color: #fff;
+}
+
+/* SingleSourcing Container */
+.E4WorkbenchModelEditor {
+	background-color: #fff;
 }
\ No newline at end of file

From 0e566b8c5d47bbfd85c779f0a9e5b7e9a27dd433 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 3 Jun 2010 17:52:09 +0000
Subject: [PATCH 0125/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * slight changes to dirty propagation

---
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../OSGI-INF/dirtyproviderfunction.xml        |   8 -
 .../build.properties                          |   3 +-
 .../internal/ContextServiceFactory.java       |  11 +-
 .../internal/DirtyProviderFunction.java       |  36 ---
 .../ReflectionContributionFactory.java        | 253 ------------------
 .../e4/tools/compat/parts/DIEditorPart.java   |   5 +-
 7 files changed, 10 insertions(+), 308 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/OSGI-INF/dirtyproviderfunction.xml
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DirtyProviderFunction.java
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 356b567cb4..448e0f8abe 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -12,6 +12,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0",
  org.eclipse.e4.tools.services;bundle-version="1.0.0",
  org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0"
-Service-Component: OSGI-INF/selectionproviderfunction.xml, OSGI-INF/dirtyproviderfunction.xml
+Service-Component: OSGI-INF/selectionproviderfunction.xml
 Export-Package: org.eclipse.e4.tools.compat.parts
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.e4.tools.compat/OSGI-INF/dirtyproviderfunction.xml b/bundles/org.eclipse.e4.tools.compat/OSGI-INF/dirtyproviderfunction.xml
deleted file mode 100644
index 997082069c..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/OSGI-INF/dirtyproviderfunction.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.compat.dirtyprovider">
-   <implementation class="org.eclipse.e4.tools.compat.internal.DirtyProviderFunction"/>
-   <service>
-      <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
-   </service>
-   <property name="service.context.key" type="String" value="org.eclipse.e4.tools.services.IDirtyProviderService"/>
-</scr:component>
diff --git a/bundles/org.eclipse.e4.tools.compat/build.properties b/bundles/org.eclipse.e4.tools.compat/build.properties
index e56d72ba99..4975ca25a1 100644
--- a/bundles/org.eclipse.e4.tools.compat/build.properties
+++ b/bundles/org.eclipse.e4.tools.compat/build.properties
@@ -2,6 +2,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               OSGI-INF/selectionproviderfunction.xml,\
-               OSGI-INF/dirtyproviderfunction.xml
+               OSGI-INF/selectionproviderfunction.xml
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index fa33b02037..68dce242d9 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -10,11 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.internal;
 
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.RegistryFactory;
 import org.eclipse.e4.core.contexts.EclipseContextFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.services.contributions.IContributionFactory;
 import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
 import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
 import org.eclipse.e4.ui.services.IServiceConstants;
@@ -39,7 +36,7 @@
 public class ContextServiceFactory extends AbstractServiceFactory {
 
 	@Override
-	public Object create(Class serviceInterface, IServiceLocator parentLocator,
+	public Object create(@SuppressWarnings("rawtypes") Class serviceInterface, IServiceLocator parentLocator,
 			IServiceLocator locator) {
 		if( ! IEclipseContext.class.equals(serviceInterface) ) {
 			return null;
@@ -64,9 +61,9 @@ public Object create(Class serviceInterface, IServiceLocator parentLocator,
 			IEclipseContext serviceContext = EclipseContextFactory.getServiceContext(bundleContext);
 
 			final IEclipseContext appContext = serviceContext.createChild("WorkbenchContext"); //$NON-NLS-1$
-			IExtensionRegistry registry = RegistryFactory.getRegistry();
-			ReflectionContributionFactory contributionFactory = new ReflectionContributionFactory(registry);
-			appContext.set(IContributionFactory.class.getName(),contributionFactory);
+//			IExtensionRegistry registry = RegistryFactory.getRegistry();
+//			ReflectionContributionFactory contributionFactory = new ReflectionContributionFactory(registry);
+//			appContext.set(IContributionFactory.class.getName(),contributionFactory);
 			
 			IThemeManager manager = serviceContext.get(IThemeManager.class);
 			final IThemeEngine engine = manager.getEngineForDisplay(Display.getCurrent());
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DirtyProviderFunction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DirtyProviderFunction.java
deleted file mode 100644
index 0a459f2ac5..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DirtyProviderFunction.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.compat.internal;
-
-import org.eclipse.e4.core.contexts.ContextFunction;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.tools.compat.parts.DIEditorPart;
-import org.eclipse.e4.tools.services.IDirtyProviderService;
-import org.eclipse.ui.part.EditorPart;
-
-public class DirtyProviderFunction extends ContextFunction {
-
-	@Override
-	public Object compute(IEclipseContext context) {
-		final DIEditorPart<?> part = (DIEditorPart<?>) context.get(EditorPart.class);
-		if( part == null ) {
-			return null;
-		}
-		
-		return new IDirtyProviderService() {
-
-			public void setDirtyState(boolean dirtyState) {
-				part.setDirtyState(dirtyState);
-			}
-		};
-	}
-
-}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
deleted file mode 100644
index 3ac6b2d03a..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.compat.internal;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.InvalidRegistryObjectException;
-import org.eclipse.e4.core.contexts.ContextInjectionFactory;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.di.InjectionException;
-import org.eclipse.e4.core.services.contributions.IContributionFactory;
-import org.eclipse.e4.core.services.contributions.IContributionFactorySpi;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.packageadmin.PackageAdmin;
-
-/**
- * Create the contribution factory.
- */
-public class ReflectionContributionFactory implements IContributionFactory {
-
-	private IExtensionRegistry registry;
-	private Map<String, Object> languages;
-
-	static class URI {
-		private String[] segments;
-		
-		URI(String[] segments) {
-			this.segments = segments;
-		}
-		
-		public static URI createURI(String uriString) {
-			return new URI(uriString.split("/"));
-		}
-
-		public int segmentCount() {
-			return segments.length;
-		}
-
-		public String segment(int i) {
-			return segments[i];
-		}
-	}
-	
-	/**
-	 * Create a reflection factory.
-	 * 
-	 * @param registry
-	 *            to read languages.
-	 */
-	public ReflectionContributionFactory(IExtensionRegistry registry) {
-		this.registry = registry;
-		processLanguages();
-	}
-
-	public Object call(Object object, String uriString, String methodName, IEclipseContext context,
-			Object defaultValue) {
-		if (uriString != null) {
-			URI uri = URI.createURI(uriString);
-			if (uri.segmentCount() > 3) {
-				String prefix = uri.segment(2);
-				IContributionFactorySpi factory = (IContributionFactorySpi) languages.get(prefix);
-				return factory.call(object, methodName, context, defaultValue);
-			}
-		}
-
-		Method targetMethod = null;
-
-		Method[] methods = object.getClass().getMethods();
-
-		// Optimization: if there's only one method, use it.
-		if (methods.length == 1) {
-			targetMethod = methods[0];
-		} else {
-			ArrayList<Method> toSort = new ArrayList<Method>();
-
-			for (int i = 0; i < methods.length; i++) {
-				Method method = methods[i];
-
-				// Filter out non-public constructors
-				if ((method.getModifiers() & Modifier.PUBLIC) != 0
-						&& method.getName().equals(methodName)) {
-					toSort.add(method);
-				}
-			}
-
-			// Sort the methods by descending number of method
-			// arguments
-			Collections.sort(toSort, new Comparator<Method>() {
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-				 */
-				public int compare(Method m1, Method m2) {
-					int l1 = m1.getParameterTypes().length;
-					int l2 = m2.getParameterTypes().length;
-
-					return l1 - l2;
-				}
-			});
-
-			// Find the first satisfiable method
-			for (Iterator<Method> iter = toSort.iterator(); iter.hasNext() && targetMethod == null;) {
-				Method next = iter.next();
-
-				boolean satisfiable = true;
-
-				Class<?>[] params = next.getParameterTypes();
-				for (int i = 0; i < params.length && satisfiable; i++) {
-					Class<?> clazz = params[i];
-
-					if (!context.containsKey(clazz.getName())
-							&& !IEclipseContext.class.equals(clazz)) {
-						satisfiable = false;
-					}
-				}
-
-				if (satisfiable) {
-					targetMethod = next;
-				}
-			}
-		}
-
-		if (targetMethod == null) {
-			if (defaultValue != null) {
-				return defaultValue;
-			}
-			throw new RuntimeException(
-					"could not find satisfiable method " + methodName + " in class " + object.getClass()); //$NON-NLS-1$//$NON-NLS-2$
-		}
-
-		Class<?>[] paramKeys = targetMethod.getParameterTypes();
-
-		try {
-//			Activator.trace(Policy.DEBUG_CMDS, "calling: " + methodName, null); //$NON-NLS-1$
-			Object[] params = new Object[paramKeys.length];
-			for (int i = 0; i < params.length; i++) {
-				if (IEclipseContext.class.equals(paramKeys[i])) {
-					params[i] = context;
-				} else {
-					params[i] = context.get(paramKeys[i].getName());
-				}
-			}
-
-			return targetMethod.invoke(object, params);
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new RuntimeException(e);
-		}
-	}
-
-	public Object create(String uriString, IEclipseContext context) {
-		if (uriString == null) {
-			return null;
-		}
-		URI uri = URI.createURI(uriString);
-		Bundle bundle = getBundle(uri);
-		Object contribution;
-		if (bundle != null) {
-			contribution = createFromBundle(bundle, context, uri);
-		} else {
-			contribution = null;
-//			Activator.log(LogService.LOG_ERROR, "Unable to retrive the bundle from the URI: " //$NON-NLS-1$
-//					+ uriString);
-		}
-		return contribution;
-	}
-
-	protected Object createFromBundle(Bundle bundle, IEclipseContext context, URI uri) {
-		Object contribution;
-		if (uri.segmentCount() > 3) {
-			String prefix = uri.segment(2);
-			IContributionFactorySpi factory = (IContributionFactorySpi) languages.get(prefix);
-			StringBuffer resource = new StringBuffer(uri.segment(3));
-			for (int i = 4; i < uri.segmentCount(); i++) {
-				resource.append('/');
-				resource.append(uri.segment(i));
-			}
-			contribution = factory.create(bundle, resource.toString(), context);
-		} else {
-			String clazz = uri.segment(2);
-			try {
-				Class<?> targetClass = bundle.loadClass(clazz);
-				contribution = ContextInjectionFactory.make(targetClass, context);
-				if (contribution == null) {
-					String message = "Unable to load class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
-							+ bundle.getBundleId() + "'"; //$NON-NLS-1$
-//					Activator.log(LogService.LOG_ERROR, message, new Exception());
-				}
-			} catch (ClassNotFoundException e) {
-				contribution = null;
-				String message = "Unable to load class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
-						+ bundle.getBundleId() + "'"; //$NON-NLS-1$
-//				Activator.log(LogService.LOG_ERROR, message, e);
-			} catch (InjectionException e) {
-				contribution = null;
-				String message = "Unable to create class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
-						+ bundle.getBundleId() + "'"; //$NON-NLS-1$
-//				Activator.log(LogService.LOG_ERROR, message, e);
-			}
-		}
-		return contribution;
-	}
-
-	protected void processLanguages() {
-		languages = new HashMap<String, Object>();
-		String extId = "org.eclipse.e4.languages"; //$NON-NLS-1$
-		IConfigurationElement[] languageElements = registry.getConfigurationElementsFor(extId);
-		for (int i = 0; i < languageElements.length; i++) {
-			IConfigurationElement languageElement = languageElements[i];
-			try {
-				languages.put(languageElement.getAttribute("name"), //$NON-NLS-1$
-						languageElement.createExecutableExtension("contributionFactory")); //$NON-NLS-1$
-			} catch (InvalidRegistryObjectException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-	}
-
-	protected Bundle getBundle(URI platformURI) {
-		return Util.getBundle(platformURI.segment(1));
-	}
-
-	public Bundle getBundle(String uriString) {
-		URI uri = URI.createURI(uriString);
-		return getBundle(uri);
-	}
-
-}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index 3f2580cb43..0556588db0 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -16,6 +16,7 @@
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.compat.internal.Util;
+import org.eclipse.e4.tools.services.IDirtyProviderService;
 import org.eclipse.e4.ui.services.IStylingEngine;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -30,7 +31,7 @@
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.EditorPart;
 
-public abstract class DIEditorPart<C> extends EditorPart {
+public abstract class DIEditorPart<C> extends EditorPart implements IDirtyProviderService {
 	private IEclipseContext context;
 	private C component;
 	private Class<C> clazz;
@@ -77,8 +78,10 @@ public void init(IEditorSite site, IEditorInput input)
 		
 		context.declareModifiable(IEditorInput.class);
 		context.declareModifiable(EditorPart.class);
+		context.declareModifiable(IDirtyProviderService.class);
 		
 		context.set(EditorPart.class,this);
+		context.set(IDirtyProviderService.class,this);
 		context.set(IEditorInput.class, input);
 	}
 

From b5b3edb5a87060ba1e475ca0db6d1ebe78e1966b Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 3 Jun 2010 18:34:06 +0000
Subject: [PATCH 0126/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * implemented ViewPart Injection Container

---
 .../internal/ContextServiceFactory.java       |   3 +-
 .../e4/tools/compat/internal/PartHelper.java  | 103 ++++++++++++++++++
 .../e4/tools/compat/parts/DIEditorPart.java   |  82 +-------------
 .../compat/parts/DISaveableViewPart.java      |  62 +++++++----
 .../e4/tools/compat/parts/DIViewPart.java     |  40 +++++--
 5 files changed, 183 insertions(+), 107 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index 68dce242d9..0492c6cb28 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -67,6 +67,7 @@ public Object create(@SuppressWarnings("rawtypes") Class serviceInterface, IServ
 			
 			IThemeManager manager = serviceContext.get(IThemeManager.class);
 			final IThemeEngine engine = manager.getEngineForDisplay(Display.getCurrent());
+			appContext.set(IStylingEngine.class, engine);
 			
 			appContext.set(IStylingEngine.class, new IStylingEngine() {
 				
@@ -90,8 +91,8 @@ public void style(Object widget) {
 		} else if( o != null && site == null ) {
 			final IEclipseContext windowContext = ((IEclipseContext)o).createChild("WindowContext("+window+")");
 			windowContext.set(ISelectionService.class, window.getSelectionService());
-			windowContext.declareModifiable(IServiceConstants.SELECTION);
 			
+			windowContext.declareModifiable(IServiceConstants.SELECTION);
 			window.getSelectionService().addSelectionListener(new ISelectionListener() {
 				
 				public void selectionChanged(IWorkbenchPart part, ISelection selection) {
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
new file mode 100644
index 0000000000..58484ff459
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
@@ -0,0 +1,103 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.internal;
+
+import java.lang.reflect.Method;
+
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.ui.services.IStylingEngine;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.WorkbenchPart;
+
+public class PartHelper {
+	public static IEclipseContext createPartContext(WorkbenchPart part) throws PartInitException {
+		IWorkbenchPartSite site = part.getSite();
+		IEclipseContext parentContext = (IEclipseContext) site.getService(IEclipseContext.class);
+		
+		// Check if running in 4.x
+		if( parentContext.get("org.eclipse.e4.workbench.ui.IPresentationEngine") != null ) {
+			// Hack to get the MPart-Context
+			try {
+				Class<?> clazz = Util.getBundle("org.eclipse.e4.ui.model.workbench").loadClass("org.eclipse.e4.ui.model.application.ui.basic.MPart");
+				Object instance = site.getService(clazz);
+				Method m = clazz.getMethod("getContext", new Class[0]);
+				return (IEclipseContext) m.invoke(instance);				
+			} catch (Exception e) {
+				throw new PartInitException("Could not create context",e);
+			}
+		} else {
+			return parentContext.createChild("EditPart('"+part.getPartName()+"')"); //$NON-NLS-1$	
+		}
+
+	}
+	
+	public static <C> C creatComponent(Composite parent, IEclipseContext context, Class<C> clazz, WorkbenchPart part) {
+		ISelectionProvider s = new SelectionProviderImpl();
+		context.set(ISelectionProvider.class, s);
+		part.getSite().setSelectionProvider(s);
+		
+		IStylingEngine styleEngine = context.get(IStylingEngine.class);
+		Composite comp = new Composite(parent, SWT.NONE);
+		comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
+		
+		//FIXME This should be read from the CSS
+		FillLayout layout = new FillLayout();
+		layout.marginWidth = 10;
+		layout.marginHeight = 10;
+		comp.setLayout(layout);
+		
+		context.set(Composite.class.getName(), comp);
+		C component = ContextInjectionFactory.make(clazz, context);
+		
+		styleEngine.setClassname(comp, part.getClass().getSimpleName());
+		
+		return component;
+	}
+	
+	static class SelectionProviderImpl implements ISelectionProvider {
+		private ISelection currentSelection = StructuredSelection.EMPTY;
+		
+		private ListenerList listeners = new ListenerList();
+		
+		public void setSelection(ISelection selection) {
+			currentSelection = selection;
+			SelectionChangedEvent evt = new SelectionChangedEvent(this, selection);
+			
+			for( Object l : listeners.getListeners() ) {
+				((ISelectionChangedListener)l).selectionChanged(evt);
+			}
+		}
+				
+		public void removeSelectionChangedListener(
+				ISelectionChangedListener listener) {
+			listeners.remove(listener);
+		}
+		
+		public ISelection getSelection() {
+			return currentSelection;
+		}
+		
+		public void addSelectionChangedListener(ISelectionChangedListener listener) {
+			listeners.add(listener);
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index 0556588db0..751b20a177 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -10,23 +10,13 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.parts;
 
-import java.lang.reflect.Method;
 
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.tools.compat.internal.Util;
+import org.eclipse.e4.tools.compat.internal.PartHelper;
 import org.eclipse.e4.tools.services.IDirtyProviderService;
-import org.eclipse.e4.ui.services.IStylingEngine;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.EditorPart;
@@ -59,28 +49,12 @@ public void init(IEditorSite site, IEditorInput input)
 		setSite(site);
 		setInput(input);
 		
-		IEclipseContext parentContext = (IEclipseContext) getSite().getService(IEclipseContext.class);
-		
-		// Check if running in 4.x
-		if( parentContext.get("org.eclipse.e4.workbench.ui.IPresentationEngine") != null ) {
-			// Hack to get the MPart-Context
-			try {
-				Class<?> clazz = Util.getBundle("org.eclipse.e4.ui.model.workbench").loadClass("org.eclipse.e4.ui.model.application.ui.basic.MPart");
-				Object instance = getSite().getService(clazz);
-				Method m = clazz.getMethod("getContext", new Class[0]);
-				context = (IEclipseContext) m.invoke(instance);				
-			} catch (Exception e) {
-				throw new PartInitException("Could not create context",e);
-			}
-		} else {
-			context = parentContext.createChild("EditPart('"+getPartName()+"')"); //$NON-NLS-1$	
-		}
-		
+		context = PartHelper.createPartContext(this);
 		context.declareModifiable(IEditorInput.class);
-		context.declareModifiable(EditorPart.class);
+		context.declareModifiable(IEditorPart.class);
 		context.declareModifiable(IDirtyProviderService.class);
 		
-		context.set(EditorPart.class,this);
+		context.set(IEditorPart.class,this);
 		context.set(IDirtyProviderService.class,this);
 		context.set(IEditorInput.class, input);
 	}
@@ -95,23 +69,7 @@ public void init(IEditorSite site, IEditorInput input)
 
 	@Override
 	public void createPartControl(Composite parent) {
-		ISelectionProvider s = new SelectionProviderImpl();
-		context.set(ISelectionProvider.class, s);
-		getSite().setSelectionProvider(s);
-		
-		IStylingEngine styleEngine = context.get(IStylingEngine.class);
-		Composite comp = new Composite(parent, SWT.NONE);
-		comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
-		
-		FillLayout layout = new FillLayout();
-		layout.marginWidth = 10;
-		layout.marginHeight = 10;
-		comp.setLayout(layout);
-		
-		context.set(Composite.class.getName(), comp);
-		component = ContextInjectionFactory.make(clazz, context);
-		
-		styleEngine.setClassname(comp, getClass().getSimpleName());
+		component = PartHelper.creatComponent(parent, context, clazz, this);
 	}
 	
 	public C getComponent() {
@@ -143,32 +101,4 @@ public void dispose() {
 		context = null;
 		super.dispose();
 	}
-
-	private class SelectionProviderImpl implements ISelectionProvider {
-		private ISelection currentSelection = StructuredSelection.EMPTY;
-		
-		private ListenerList listeners = new ListenerList();
-		
-		public void setSelection(ISelection selection) {
-			currentSelection = selection;
-			SelectionChangedEvent evt = new SelectionChangedEvent(this, selection);
-			
-			for( Object l : listeners.getListeners() ) {
-				((ISelectionChangedListener)l).selectionChanged(evt);
-			}
-		}
-				
-		public void removeSelectionChangedListener(
-				ISelectionChangedListener listener) {
-			listeners.remove(listener);
-		}
-		
-		public ISelection getSelection() {
-			return currentSelection;
-		}
-		
-		public void addSelectionChangedListener(ISelectionChangedListener listener) {
-			listeners.add(listener);
-		}
-	}
 }
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
index a55efc86f8..6aa27be73c 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
@@ -10,33 +10,53 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.parts;
 
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ui.ISaveablePart;
+import org.eclipse.e4.tools.services.IDirtyProviderService;
+import org.eclipse.ui.ISaveablePart2;
+import org.eclipse.ui.IViewSite;
+import org.eclipse.ui.PartInitException;
 
-public class DISaveableViewPart extends DIViewPart implements ISaveablePart {
-
-	public void doSave(IProgressMonitor monitor) {
-		// TODO Auto-generated method stub
-		
+public abstract class DISaveableViewPart<C> extends DIViewPart<C> implements ISaveablePart2, IDirtyProviderService {
+	private boolean dirtyState;
+	
+	public DISaveableViewPart(Class<C> clazz) {
+		super(clazz);
 	}
+	
+//	public void doSave(IProgressMonitor monitor) {
+//		// TODO Auto-generated method stub
+//		
+//	}
+//
+//	public void doSaveAs() {
+//		// TODO Auto-generated method stub
+//		
+//	}
 
-	public void doSaveAs() {
-		// TODO Auto-generated method stub
-		
+	public void setDirtyState(boolean dirtyState) {
+		if( dirtyState != this.dirtyState ) {
+			this.dirtyState = dirtyState;
+			firePropertyChange(PROP_DIRTY);
+		}
 	}
-
+	
 	public boolean isDirty() {
-		// TODO Auto-generated method stub
-		return false;
+		return dirtyState;
 	}
 
-	public boolean isSaveAsAllowed() {
-		// TODO Auto-generated method stub
-		return false;
+	public void init(IViewSite site) throws PartInitException {
+		super.init(site);
+		
+		getContext().declareModifiable(IDirtyProviderService.class);
+		getContext().set(IDirtyProviderService.class, this);
 	}
-
-	public boolean isSaveOnCloseNeeded() {
-		// TODO Auto-generated method stub
-		return false;
-	}	
+	
+//	public boolean isSaveAsAllowed() {
+//		// TODO Auto-generated method stub
+//		return false;
+//	}
+//
+//	public boolean isSaveOnCloseNeeded() {
+//		// TODO Auto-generated method stub
+//		return false;
+//	}	
 }
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
index 876f05dbcd..ac5fe13281 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
@@ -10,21 +10,43 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.parts;
 
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.compat.internal.PartHelper;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IViewSite;
+import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.ViewPart;
 
-public class DIViewPart extends ViewPart {
-
+public abstract class DIViewPart<C> extends ViewPart {
+	private IEclipseContext context;
+	private Class<C> clazz;
+	private C component;
+	
+	public DIViewPart(Class<C> clazz) {
+		this.clazz = clazz;
+	}
+	
 	@Override
-	public void createPartControl(Composite parent) {
-		// TODO Auto-generated method stub
+	public void init(IViewSite site) throws PartInitException {
+		super.init(site);
+		context = PartHelper.createPartContext(this);
 		
+		context.declareModifiable(IViewPart.class);
+		
+		context.set(IViewPart.class, this);
 	}
-
+	
 	@Override
-	public void setFocus() {
-		// TODO Auto-generated method stub
-		
+	public void createPartControl(Composite parent) {
+		component = PartHelper.creatComponent(parent, context, clazz, this);
 	}
 
-}
+	protected IEclipseContext getContext() {
+		return context;
+	}
+	
+	public C getComponent() {
+		return component;
+	}
+}
\ No newline at end of file

From b5a64a4a12ebc0733f08ecd5d132bdb52ddc9cc2 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 3 Jun 2010 22:32:15 +0000
Subject: [PATCH 0127/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * implementing @Persist

---
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../e4/tools/compat/parts/DIEditorPart.java   | 37 ++++++++---------
 .../compat/parts/DISaveableViewPart.java      | 40 +++++++++----------
 .../emf/editor3x/E4WorkbenchModelEditor.java  | 16 --------
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../emf/ui/internal/common/ModelEditor.java   |  2 +
 6 files changed, 44 insertions(+), 57 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 448e0f8abe..518b39dbc4 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.ui.services;bundle-version="0.9.1",
  org.eclipse.e4.core.di;bundle-version="0.9.0",
  org.eclipse.e4.tools.services;bundle-version="1.0.0",
- org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0"
+ org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
+ org.eclipse.e4.ui.di;bundle-version="0.9.0"
 Service-Component: OSGI-INF/selectionproviderfunction.xml
 Export-Package: org.eclipse.e4.tools.compat.parts
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index 751b20a177..cd805dd0ce 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -11,9 +11,12 @@
 package org.eclipse.e4.tools.compat.parts;
 
 
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.compat.internal.PartHelper;
 import org.eclipse.e4.tools.services.IDirtyProviderService;
+import org.eclipse.e4.ui.di.Persist;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
@@ -31,17 +34,22 @@ public DIEditorPart(Class<C> clazz) {
 		this.clazz = clazz;
 	}
 	
-//FIXME once @Persist is out of ui.workbench
-//	@Override
-//	public void doSave(IProgressMonitor monitor) {
-//		// TODO Auto-generated method stub
-//		
-//	}
-//
-//	@Override
-//	public void doSaveAs() {
-//		// TODO Auto-generated method stub
-//	}
+	@Override
+	public void doSave(IProgressMonitor monitor) {
+		IEclipseContext saveContext = context.createChild();
+		ContextInjectionFactory.invoke(component, Persist.class, saveContext);
+		saveContext.dispose();
+	}
+	
+	@Override
+	public void doSaveAs() {
+		
+	}
+
+	@Override
+	public boolean isSaveAsAllowed() {
+		return false;
+	}
 
 	@Override
 	public void init(IEditorSite site, IEditorInput input)
@@ -60,13 +68,6 @@ public void init(IEditorSite site, IEditorInput input)
 	}
 
 	
-//
-//	@Override
-//	public boolean isSaveAsAllowed() {
-//		// TODO Auto-generated method stub
-//		return false;
-//	}
-
 	@Override
 	public void createPartControl(Composite parent) {
 		component = PartHelper.creatComponent(parent, context, clazz, this);
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
index 6aa27be73c..b9cb94eb4c 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
@@ -10,7 +10,11 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.parts;
 
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.services.IDirtyProviderService;
+import org.eclipse.e4.ui.di.Persist;
 import org.eclipse.ui.ISaveablePart2;
 import org.eclipse.ui.IViewSite;
 import org.eclipse.ui.PartInitException;
@@ -22,15 +26,19 @@ public DISaveableViewPart(Class<C> clazz) {
 		super(clazz);
 	}
 	
-//	public void doSave(IProgressMonitor monitor) {
-//		// TODO Auto-generated method stub
-//		
-//	}
-//
-//	public void doSaveAs() {
-//		// TODO Auto-generated method stub
-//		
-//	}
+	public void doSave(IProgressMonitor monitor) {
+		IEclipseContext saveContext = getContext().createChild();
+		ContextInjectionFactory.invoke(getComponent(), Persist.class, saveContext);
+		saveContext.dispose();
+	}
+	
+	public void doSaveAs() {
+		
+	}
+
+	public boolean isSaveAsAllowed() {
+		return false;
+	}
 
 	public void setDirtyState(boolean dirtyState) {
 		if( dirtyState != this.dirtyState ) {
@@ -48,15 +56,5 @@ public void init(IViewSite site) throws PartInitException {
 		
 		getContext().declareModifiable(IDirtyProviderService.class);
 		getContext().set(IDirtyProviderService.class, this);
-	}
-	
-//	public boolean isSaveAsAllowed() {
-//		// TODO Auto-generated method stub
-//		return false;
-//	}
-//
-//	public boolean isSaveOnCloseNeeded() {
-//		// TODO Auto-generated method stub
-//		return false;
-//	}	
-}
+	}	
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
index ec9134aeab..a9544e07fe 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -10,7 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.e4.tools.compat.parts.DIEditorPart;
 import org.eclipse.e4.tools.emf.ui.internal.wbm.ApplicationModelEditor;
 
@@ -21,21 +20,6 @@ public E4WorkbenchModelEditor() {
 		super(ApplicationModelEditor.class);
 	}
 
-	@Override
-	public void doSave(IProgressMonitor monitor) {
-		getComponent().doSave(monitor);
-	}
-
-	@Override
-	public void doSaveAs() {
-		
-	}
-
-	@Override
-	public boolean isSaveAsAllowed() {
-		return false;
-	}
-
 	@Override
 	public void setFocus() {
 		getComponent().setFocus();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index d2a835ec48..b8003bef0b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -24,7 +24,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.e4.ui.workbench;bundle-version="0.9.1",
  org.eclipse.e4.ui.services;bundle-version="0.9.1",
  org.eclipse.equinox.registry;bundle-version="3.5.0",
- org.eclipse.e4.core.contexts;bundle-version="0.9.0"
+ org.eclipse.e4.core.contexts;bundle-version="0.9.0",
+ org.eclipse.e4.ui.di;bundle-version="0.9.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.runtime.jobs,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 48bc4b14eb..ab8bcd29c9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -81,6 +81,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartDescriptor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowTrimEditor;
+import org.eclipse.e4.ui.di.Persist;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
@@ -484,6 +485,7 @@ public AbstractComponentEditor getEditor(EClass eClass) {
 		return editorMap.get(eClass);
 	}
 
+	@Persist
 	public void doSave(@Optional IProgressMonitor monitor) {
 		if (modelProvider.isSaveable()) {
 			modelProvider.save();

From a9f9f3c3551ed2acb6ebd44ccf82022c7aefeefc Mon Sep 17 00:00:00 2001
From: John Arthorne <johna>
Date: Fri, 4 Jun 2010 20:22:09 +0000
Subject: [PATCH 0128/1286] Bug 315463 -  API package name cleanup

---
 .../.settings/org.eclipse.jdt.ui.prefs           |  6 +++++-
 .../e4/tools/emf/ui/common/IModelResource.java   |  1 -
 .../e4/tools/emf/ui/common/XMIModelResource.java |  7 +------
 .../component/AbstractComponentEditor.java       |  3 ---
 .../internal/ObservableColumnLabelProvider.java  |  1 -
 .../e4/tools/emf/ui/internal/PatternFilter.java  |  1 -
 .../common/ClassContributionCollector.java       |  1 -
 .../emf/ui/internal/common/ModelEditor.java      | 16 ++++++----------
 .../emf/ui/internal/common/VirtualEntry.java     |  1 -
 .../common/commands/AddAddonCommand.java         |  2 --
 .../common/commands/MoveAddonCommand.java        |  1 -
 .../common/commands/RemoveAddonCommand.java      |  3 ---
 .../internal/common/component/AddonsEditor.java  |  4 ----
 .../common/component/ApplicationEditor.java      |  5 -----
 .../common/component/BindingTableEditor.java     | 11 -----------
 .../internal/common/component/CommandEditor.java |  9 ---------
 .../common/component/ControlFactory.java         |  8 --------
 .../common/component/DirectMenuItemEditor.java   |  4 ----
 .../common/component/DirectToolItemEditor.java   |  4 ----
 .../common/component/HandledMenuItemEditor.java  | 11 -----------
 .../common/component/HandledToolItemEditor.java  | 10 ----------
 .../internal/common/component/HandlerEditor.java |  5 -----
 .../common/component/InputPartEditor.java        |  3 ---
 .../common/component/KeyBindingEditor.java       |  8 --------
 .../ui/internal/common/component/MenuEditor.java | 10 ----------
 .../common/component/MenuItemEditor.java         |  5 -----
 .../common/component/MenuSeparatorEditor.java    |  4 ----
 .../common/component/ModelComponentEditor.java   |  8 --------
 .../common/component/ModelComponentsEditor.java  |  7 -------
 .../common/component/PartDescriptorEditor.java   | 12 ------------
 .../ui/internal/common/component/PartEditor.java |  9 ---------
 .../component/PartSashContainerEditor.java       | 12 ------------
 .../common/component/PartStackEditor.java        | 13 -------------
 .../common/component/PerspectiveEditor.java      | 14 --------------
 .../common/component/PerspectiveStackEditor.java | 11 -----------
 .../common/component/PlaceholderEditor.java      |  4 ----
 .../internal/common/component/ToolBarEditor.java | 10 ----------
 .../common/component/ToolBarSeparatorEditor.java |  4 ----
 .../common/component/ToolControlEditor.java      |  5 -----
 .../common/component/ToolItemEditor.java         |  6 ------
 .../internal/common/component/TrimBarEditor.java | 10 ----------
 .../common/component/TrimmedWindowEditor.java    |  2 --
 .../internal/common/component/WindowEditor.java  | 10 ----------
 .../dialogs/AbstractCommandSelectionDialog.java  |  2 --
 .../component/dialogs/AbstractIconDialog.java    |  3 ---
 .../dialogs/ContributionClassDialog.java         |  2 --
 .../HandledMenuItemCommandSelectionDialog.java   |  2 --
 .../HandledToolItemCommandSelectionDialog.java   |  2 --
 .../dialogs/HandlerCommandSelectionDialog.java   |  2 --
 .../KeyBindingCommandSelectionDialog.java        |  2 --
 .../component/dialogs/MenuIconDialogEditor.java  |  2 --
 .../dialogs/MenuItemIconDialogEditor.java        |  2 --
 .../dialogs/PartDescriptorIconDialogEditor.java  |  2 --
 .../component/dialogs/PartIconDialogEditor.java  |  1 -
 .../dialogs/PerspectiveIconDialogEditor.java     |  2 --
 .../dialogs/ToolItemIconDialogEditor.java        |  2 --
 .../dialogs/WindowIconDialogEditor.java          |  2 --
 .../component/virtual/VApplicationAddons.java    |  5 -----
 .../component/virtual/VBindingTableEditor.java   | 10 ----------
 .../common/component/virtual/VCommandEditor.java |  8 --------
 .../common/component/virtual/VHandlerEditor.java |  9 ---------
 .../common/component/virtual/VMenuEditor.java    |  7 -------
 .../virtual/VModelComponentBindingEditor.java    |  9 ---------
 .../virtual/VModelComponentUIEditor.java         | 12 ------------
 .../component/virtual/VPartDescriptor.java       |  8 --------
 .../component/virtual/VWindowControlEditor.java  |  8 --------
 .../common/component/virtual/VWindowEditor.java  |  9 ---------
 .../component/virtual/VWindowTrimEditor.java     |  5 -----
 .../ui/internal/wbm/ApplicationModelEditor.java  |  1 -
 69 files changed, 12 insertions(+), 388 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
index 87e3873ea0..5b21ea9bc2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,8 @@
-#Sun Mar 07 11:22:19 CET 2010
+#Fri Jun 04 16:11:07 EDT 2010
 eclipse.preferences.version=1
 formatter_profile=_custom
 formatter_settings_version=11
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=;
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
index 4c5d0acaa3..9e0003b037 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
@@ -12,7 +12,6 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.edit.domain.EditingDomain;
 
 public interface IModelResource {
 	public IObservableList getRoot();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
index 95bbb4fc9d..0a943b1b8b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
@@ -15,22 +15,17 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.e4.tools.emf.ui.common.IModelResource;
-import org.eclipse.e4.workbench.ui.internal.E4XMIResourceFactory; 
+import org.eclipse.e4.ui.internal.workbench.E4XMIResourceFactory;
 import org.eclipse.emf.common.command.BasicCommandStack;
 import org.eclipse.emf.common.command.CommandStackListener;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 
 @SuppressWarnings("restriction")
 public class XMIModelResource implements IModelResource {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 0b0a6b8e95..893a4367e2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -17,12 +17,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
index c1207886cc..f5bdd1fe23 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
@@ -11,7 +11,6 @@
 package org.eclipse.e4.tools.emf.ui.internal;
 
 import java.util.Set;
-
 import org.eclipse.core.databinding.observable.map.IMapChangeListener;
 import org.eclipse.core.databinding.observable.map.IObservableMap;
 import org.eclipse.core.databinding.observable.map.MapChangeEvent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
index 99c8b21a78..fbba0c0945 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
@@ -15,7 +15,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
index f7b4a5a109..b642e95558 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
@@ -12,7 +12,6 @@
 
 
 import java.util.concurrent.CopyOnWriteArrayList;
-
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionResultHandler;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index ab8bcd29c9..4c6fdf3631 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -15,9 +15,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.map.IMapChangeListener;
@@ -45,14 +43,14 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.AddonsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ApplicationEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.BindingTableEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectMenuItemEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledMenuItemEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.InputPartEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.KeyBindingEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CommandEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectMenuItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectToolItemEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledMenuItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandlerEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.InputPartEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.KeyBindingEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuSeparatorEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ModelComponentEditor;
@@ -73,12 +71,12 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationAddons;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VBindingTableEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VCommandEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelComponentUIEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowControlEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelComponentBindingEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelComponentUIEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartDescriptor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowControlEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowTrimEditor;
 import org.eclipse.e4.ui.di.Persist;
@@ -87,8 +85,6 @@
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.action.Action;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
index 46279ef22b..024e032b85 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
@@ -12,7 +12,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.eclipse.core.databinding.observable.Diffs;
 import org.eclipse.core.databinding.observable.list.IListChangeListener;
 import org.eclipse.core.databinding.observable.list.IObservableList;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/AddAddonCommand.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/AddAddonCommand.java
index 27cf0d5164..ecc7a1d24d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/AddAddonCommand.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/AddAddonCommand.java
@@ -15,8 +15,6 @@
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 
 public class AddAddonCommand {
 	public void execute(EditingDomain editingDomain, MApplication parent) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/MoveAddonCommand.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/MoveAddonCommand.java
index 6c3f9889de..1dab6fefee 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/MoveAddonCommand.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/MoveAddonCommand.java
@@ -11,7 +11,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.commands;
 
 import org.eclipse.e4.ui.model.application.MAddon;
-import org.eclipse.emf.edit.domain.EditingDomain;
 
 public class MoveAddonCommand {
 	public void execute(EditingDomain editingDomain, MAddon addon, boolean up) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/RemoveAddonCommand.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/RemoveAddonCommand.java
index 1e71dfcb9e..8c36a3bd3e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/RemoveAddonCommand.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/RemoveAddonCommand.java
@@ -11,13 +11,10 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.commands;
 
 import java.util.List;
-
 import org.eclipse.e4.ui.model.application.MAddon;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 
 public class RemoveAddonCommand {
 	public void execute(EditingDomain editingDomain, List<MAddon> addons) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 1d18d4543c..ed15c2df62 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -12,7 +12,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -20,9 +19,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index bee39806a2..9b9fc0d48c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -12,7 +12,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -24,10 +23,6 @@
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index a7506e0d97..e17103f8d6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -13,7 +13,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -27,16 +26,6 @@
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 9f0ad33da6..02d75d4a85 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -12,7 +12,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -23,14 +22,6 @@
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFValueProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 832c277f50..f79e5015d9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -12,7 +12,6 @@
 
 import java.util.Arrays;
 import java.util.List;
-
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -21,14 +20,7 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index e9cff25710..e1f0bc53d5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -12,7 +12,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -20,9 +19,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index af3d3c8d72..a09837c22f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -12,16 +12,12 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index 2fe314b100..ad735e3ab5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -12,7 +12,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
@@ -20,22 +19,12 @@
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledMenuItemCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFValueProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index e8ed3a4305..19d78755e0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -12,7 +12,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
@@ -26,15 +25,6 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFValueProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index f8fbf66691..66e84e3059 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -12,7 +12,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
@@ -24,10 +23,6 @@
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
index c81967a887..31bef61c35 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
@@ -14,9 +14,6 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 8ec5723aa9..a249b808d5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -12,7 +12,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
@@ -26,13 +25,6 @@
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerSupport;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 326eba354c..b6e94ed4a0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -13,7 +13,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -33,18 +32,9 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index d346f34ec2..66d209eba7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -12,7 +12,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -26,10 +25,6 @@
 import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 2f2af5925a..62b6ffa94c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -12,15 +12,11 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index 64225b3825..28bf9aa889 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -12,7 +12,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -26,13 +25,6 @@
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.viewers.ListViewer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
index a081f2848a..c8726dea73 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
@@ -13,7 +13,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -25,12 +24,6 @@
 import org.eclipse.e4.ui.model.application.MModelComponents;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 0d46e20f3e..1db9b287d5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -13,7 +13,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map.Entry;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -24,23 +23,12 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartDescriptorIconDialogEditor;
-import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
-import org.eclipse.e4.ui.model.application.descriptor.basic.util.BasicAdapterFactory;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 4317138370..d18713d594 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -13,7 +13,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map.Entry;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -24,7 +23,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AbstractIconDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
@@ -32,13 +30,6 @@
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 5ba46b78cf..6818a47670 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -13,7 +13,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
-
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -31,20 +30,9 @@
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 617eb83a32..c25d3a5888 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -13,7 +13,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
-
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -27,24 +26,12 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
-import org.eclipse.e4.ui.model.application.ui.MUiFactory;
-import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 8daad0ec50..bc9a801347 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -13,7 +13,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
-
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -26,30 +25,17 @@
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PerspectiveIconDialogEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 276555f986..5200c4dcd5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -13,7 +13,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
-
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -31,16 +30,6 @@
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 690708f0b1..2fe9df0951 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -12,7 +12,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -20,10 +19,7 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index e2020e2757..3800bff2d7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -13,7 +13,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -29,17 +28,8 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 2ef4e6cd72..15a124bd1a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -12,15 +12,11 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 2c7bff92e3..0a03f37632 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -13,7 +13,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map.Entry;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
@@ -22,10 +21,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 39d5364320..9846a8bba3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -16,18 +16,12 @@
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PerspectiveIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ToolItemIconDialogEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 033eafa103..d0ab346b97 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -13,7 +13,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -29,15 +28,6 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
index 4119793bab..529b6a68cd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
@@ -6,8 +6,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.edit.domain.EditingDomain;
 
 public class TrimmedWindowEditor extends WindowEditor {
 	private IListProperty TRIMMED_WINDOW__TRIM_BARS = EMFProperties.list(BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 479e9fb077..b5bce8d2ae 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -14,7 +14,6 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
@@ -26,24 +25,15 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ToolItemIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.WindowIconDialogEditor;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index de8ebadffe..c81212cb1b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -12,7 +12,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
@@ -21,7 +20,6 @@
 import org.eclipse.e4.ui.model.application.MModelComponents;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ArrayContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
index 1b978fcf30..6f6aea3faf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
@@ -9,7 +9,6 @@
 import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.resources.IFile;
@@ -21,8 +20,6 @@
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.DoubleClickEvent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index 1dbe714f9d..850fcb8293 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -21,8 +21,6 @@
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.DoubleClickEvent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
index 39f72ebd90..2399ab8754 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
@@ -15,8 +15,6 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class HandledMenuItemCommandSelectionDialog extends AbstractCommandSelectionDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
index 8f9b0345d5..19bfac1ed2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
@@ -15,8 +15,6 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class HandledToolItemCommandSelectionDialog extends AbstractCommandSelectionDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
index ace3d85758..d2d337fb20 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
@@ -15,8 +15,6 @@
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class HandlerCommandSelectionDialog extends AbstractCommandSelectionDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
index bda337ad84..5b56af5e2e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
@@ -15,8 +15,6 @@
 import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class KeyBindingCommandSelectionDialog extends AbstractCommandSelectionDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
index 22a33c242f..e6597629ba 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
@@ -1,10 +1,8 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class MenuIconDialogEditor extends AbstractIconDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
index 74828a1774..c175ba652d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
@@ -1,10 +1,8 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class MenuItemIconDialogEditor extends AbstractIconDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
index 4d7ede72e5..b085f38889 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
@@ -2,9 +2,7 @@
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class PartDescriptorIconDialogEditor extends AbstractIconDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
index d2c0e3f8e1..b767630d25 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
@@ -3,7 +3,6 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class PartIconDialogEditor extends AbstractIconDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
index 63758b8f92..677ffc5665 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
@@ -2,9 +2,7 @@
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class PerspectiveIconDialogEditor extends AbstractIconDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
index 8387545768..45c8bd4daa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
@@ -1,10 +1,8 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class ToolItemIconDialogEditor extends AbstractIconDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
index babdf30384..b04560aa0c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
@@ -1,10 +1,8 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class WindowIconDialogEditor extends AbstractIconDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index 316d16e4d2..baca981d14 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -15,10 +14,6 @@
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 072385c276..778f31c45b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -12,7 +12,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
@@ -35,16 +34,7 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ObservableListTreeContentProvider;
 import org.eclipse.jface.databinding.viewers.TreeStructureAdvisor;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 91ee4b8eba..f865eb3bee 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -11,7 +11,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.List;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -25,14 +24,7 @@
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index a522ebfb42..cb97b728d0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -11,7 +11,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.List;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -24,14 +23,6 @@
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 4b8082506f..821fa864c2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -11,7 +11,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.List;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -23,13 +22,7 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java
index 4387053f7b..06f0433d79 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java
@@ -11,7 +11,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.List;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -25,14 +24,6 @@
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentUIEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentUIEditor.java
index 0c3c40f7d5..fecd1842c3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentUIEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentUIEditor.java
@@ -11,32 +11,21 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.List;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MModelComponent;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
@@ -44,7 +33,6 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index 5e9b1b0105..a9404ab5e1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -11,7 +11,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.List;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -25,13 +24,6 @@
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index f7d3baed80..68ec3066a9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -11,7 +11,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.List;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -23,16 +22,9 @@
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 065e0bbb8b..240e2e0a27 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -11,7 +11,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.List;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -19,21 +18,13 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
-import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index 9097a8ab44..c5c6d4ad80 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -11,7 +11,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.List;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -22,10 +21,6 @@
 import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index cb9a0bb56b..d72d0ad05d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -11,7 +11,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.wbm;
 
 import javax.inject.Inject;
-
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;

From 9eb31cd8bf673f1197ba211e151324b5455db678 Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster>
Date: Sun, 6 Jun 2010 12:59:19 +0000
Subject: [PATCH 0129/1286] Bug 315463 -  API package name cleanup Changes to
 compile in my workspace

---
 .../tools/emf/editor3x/XMIModelResource.java  |  2 +-
 .../emf/editor3x/XMIResourceFunction.java     |  2 +-
 .../wizard/BaseApplicationModelWizard.java    | 36 ++++++++++---------
 .../emf/editor3x/wizard/NewModelFilePage.java |  1 +
 .../tools/emf/ui/common/IModelResource.java   |  1 +
 .../tools/emf/ui/common/XMIModelResource.java |  3 ++
 .../component/AbstractComponentEditor.java    |  2 ++
 .../emf/ui/internal/common/ModelEditor.java   |  2 ++
 .../common/commands/AddAddonCommand.java      |  2 ++
 .../common/commands/MoveAddonCommand.java     |  1 +
 .../common/commands/RemoveAddonCommand.java   |  2 ++
 .../common/component/AddonsEditor.java        |  3 ++
 .../common/component/ApplicationEditor.java   |  4 +++
 .../common/component/BindingTableEditor.java  | 10 ++++++
 .../common/component/CommandEditor.java       |  8 +++++
 .../common/component/ControlFactory.java      |  7 ++++
 .../component/DirectMenuItemEditor.java       |  3 ++
 .../component/DirectToolItemEditor.java       |  3 ++
 .../component/HandledMenuItemEditor.java      |  9 +++++
 .../component/HandledToolItemEditor.java      |  9 +++++
 .../common/component/HandlerEditor.java       |  4 +++
 .../common/component/InputPartEditor.java     |  3 ++
 .../common/component/KeyBindingEditor.java    |  7 ++++
 .../internal/common/component/MenuEditor.java |  9 +++++
 .../common/component/MenuItemEditor.java      |  4 +++
 .../common/component/MenuSeparatorEditor.java |  3 ++
 .../component/ModelComponentEditor.java       |  5 +++
 .../component/ModelComponentsEditor.java      |  6 ++++
 .../component/PartDescriptorEditor.java       |  7 ++++
 .../internal/common/component/PartEditor.java |  7 ++++
 .../component/PartSashContainerEditor.java    | 11 ++++++
 .../common/component/PartStackEditor.java     | 10 ++++++
 .../common/component/PerspectiveEditor.java   | 11 ++++++
 .../component/PerspectiveStackEditor.java     | 10 ++++++
 .../common/component/PlaceholderEditor.java   |  3 ++
 .../common/component/ToolBarEditor.java       |  9 +++++
 .../component/ToolBarSeparatorEditor.java     |  3 ++
 .../common/component/ToolControlEditor.java   |  4 +++
 .../common/component/ToolItemEditor.java      |  4 +++
 .../common/component/TrimBarEditor.java       |  9 +++++
 .../common/component/TrimmedWindowEditor.java |  2 ++
 .../common/component/WindowEditor.java        |  6 ++++
 .../AbstractCommandSelectionDialog.java       |  1 +
 .../component/dialogs/AbstractIconDialog.java |  2 ++
 .../dialogs/ContributionClassDialog.java      |  2 ++
 ...HandledMenuItemCommandSelectionDialog.java |  2 ++
 ...HandledToolItemCommandSelectionDialog.java |  2 ++
 .../HandlerCommandSelectionDialog.java        |  2 ++
 .../KeyBindingCommandSelectionDialog.java     |  2 ++
 .../dialogs/MenuIconDialogEditor.java         |  1 +
 .../dialogs/MenuItemIconDialogEditor.java     |  1 +
 .../PartDescriptorIconDialogEditor.java       |  1 +
 .../dialogs/PartIconDialogEditor.java         |  1 +
 .../dialogs/PerspectiveIconDialogEditor.java  |  1 +
 .../dialogs/ToolItemIconDialogEditor.java     |  1 +
 .../dialogs/WindowIconDialogEditor.java       |  1 +
 .../component/virtual/VApplicationAddons.java |  3 ++
 .../virtual/VBindingTableEditor.java          |  9 +++++
 .../component/virtual/VCommandEditor.java     |  7 ++++
 .../component/virtual/VHandlerEditor.java     |  8 +++++
 .../common/component/virtual/VMenuEditor.java |  6 ++++
 .../virtual/VModelComponentBindingEditor.java |  8 +++++
 .../virtual/VModelComponentUIEditor.java      |  5 +++
 .../component/virtual/VPartDescriptor.java    |  7 ++++
 .../virtual/VWindowControlEditor.java         |  7 ++++
 .../component/virtual/VWindowEditor.java      |  7 ++++
 .../component/virtual/VWindowTrimEditor.java  |  4 +++
 67 files changed, 319 insertions(+), 19 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java
index deff0a449c..a19ed76ddb 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java
@@ -21,7 +21,7 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
-import org.eclipse.e4.workbench.ui.internal.E4XMIResourceFactory; 
+import org.eclipse.e4.ui.internal.workbench.E4XMIResourceFactory;
 import org.eclipse.emf.common.command.BasicCommandStack;
 import org.eclipse.emf.common.command.CommandStackListener;
 import org.eclipse.emf.common.util.URI;
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
index b8e737b8ca..2b64fcb824 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
@@ -3,8 +3,8 @@
 import org.eclipse.e4.core.contexts.ContextFunction;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.editor3x.emf.EditUIUtil;
-import org.eclipse.e4.tools.emf.ui.common.XMIModelResource;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource.ModelListener;
+import org.eclipse.e4.tools.emf.ui.common.XMIModelResource;
 import org.eclipse.e4.tools.services.IDirtyProviderService;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.ui.IEditorInput;
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/BaseApplicationModelWizard.java
index b8bc38accd..27d175bfab 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/BaseApplicationModelWizard.java
@@ -10,34 +10,36 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x.wizard;
 
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.*;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
 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.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.ui.*;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWizard;
+import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.part.ISetSelectionTarget;
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewModelFilePage.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewModelFilePage.java
index 2f60c2d8d7..90154bad5a 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewModelFilePage.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewModelFilePage.java
@@ -14,6 +14,7 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.dialogs.IDialogPage;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.WizardPage;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
index 9e0003b037..4c5d0acaa3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
@@ -12,6 +12,7 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.edit.domain.EditingDomain;
 
 public interface IModelResource {
 	public IObservableList getRoot();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
index 0a943b1b8b..aa8bae4b27 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
@@ -26,6 +26,9 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 
 @SuppressWarnings("restriction")
 public class XMIModelResource implements IModelResource {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 893a4367e2..feb758061f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -20,6 +20,8 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 4c6fdf3631..66e891bbb4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -85,6 +85,8 @@
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.action.Action;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/AddAddonCommand.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/AddAddonCommand.java
index ecc7a1d24d..27cf0d5164 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/AddAddonCommand.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/AddAddonCommand.java
@@ -15,6 +15,8 @@
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 
 public class AddAddonCommand {
 	public void execute(EditingDomain editingDomain, MApplication parent) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/MoveAddonCommand.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/MoveAddonCommand.java
index 1dab6fefee..6c3f9889de 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/MoveAddonCommand.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/MoveAddonCommand.java
@@ -11,6 +11,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.commands;
 
 import org.eclipse.e4.ui.model.application.MAddon;
+import org.eclipse.emf.edit.domain.EditingDomain;
 
 public class MoveAddonCommand {
 	public void execute(EditingDomain editingDomain, MAddon addon, boolean up) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/RemoveAddonCommand.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/RemoveAddonCommand.java
index 8c36a3bd3e..fed166cee0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/RemoveAddonCommand.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/RemoveAddonCommand.java
@@ -15,6 +15,8 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 
 public class RemoveAddonCommand {
 	public void execute(EditingDomain editingDomain, List<MAddon> addons) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index ed15c2df62..16d87a9c49 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -19,6 +19,9 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 9b9fc0d48c..1963b3ea76 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -23,6 +23,10 @@
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index e17103f8d6..f7a962be86 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -26,6 +26,16 @@
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 02d75d4a85..c7f4bc3132 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -22,6 +22,14 @@
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFValueProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index f79e5015d9..5a612571ad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -20,7 +20,14 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index e1f0bc53d5..00d1935f3f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -19,6 +19,9 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index a09837c22f..1fe284e840 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -18,6 +18,9 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index ad735e3ab5..1b96a69451 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -25,6 +25,15 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFValueProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 19d78755e0..bdc0808588 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -25,6 +25,15 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFValueProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 66e84e3059..0ed2eac203 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -23,6 +23,10 @@
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
index 31bef61c35..c81967a887 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
@@ -14,6 +14,9 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index a249b808d5..5fbdb5ee35 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -25,6 +25,13 @@
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerSupport;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index b6e94ed4a0..383d8aab20 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -32,9 +32,18 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 66d209eba7..0d97e1f193 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -25,6 +25,10 @@
 import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 62b6ffa94c..c8b160bcbd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -17,6 +17,9 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index 28bf9aa889..a874f540fd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -25,6 +25,11 @@
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.viewers.ListViewer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
index c8726dea73..576d71561f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
@@ -24,6 +24,12 @@
 import org.eclipse.e4.ui.model.application.MModelComponents;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 1db9b287d5..2b4e6b921c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -29,6 +29,13 @@
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index d18713d594..a154bc9fef 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -30,6 +30,13 @@
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 6818a47670..53c8881a22 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -30,9 +30,20 @@
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index c25d3a5888..be87172d3f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -29,9 +29,19 @@
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index bc9a801347..7d54cd9b47 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -33,9 +33,20 @@
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 5200c4dcd5..45d3e9163e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -30,6 +30,16 @@
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 2fe9df0951..bcc3323159 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -19,7 +19,10 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 3800bff2d7..4bd21de456 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -28,8 +28,17 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 15a124bd1a..effe2e31fd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -17,6 +17,9 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 0a03f37632..21ddb8c23d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -21,6 +21,10 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 9846a8bba3..6d2e67ddcc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -22,6 +22,10 @@
 import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index d0ab346b97..717cf6940d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -28,6 +28,15 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
index 529b6a68cd..4119793bab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
@@ -6,6 +6,8 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
 
 public class TrimmedWindowEditor extends WindowEditor {
 	private IListProperty TRIMMED_WINDOW__TRIM_BARS = EMFProperties.list(BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index b5bce8d2ae..2b9ae57de7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -34,6 +34,12 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index c81212cb1b..71e5701360 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -20,6 +20,7 @@
 import org.eclipse.e4.ui.model.application.MModelComponents;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ArrayContentProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
index 6f6aea3faf..a054c2c764 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
@@ -20,6 +20,8 @@
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.DoubleClickEvent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index 850fcb8293..1dbe714f9d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -21,6 +21,8 @@
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.DoubleClickEvent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
index 2399ab8754..39f72ebd90 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
@@ -15,6 +15,8 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class HandledMenuItemCommandSelectionDialog extends AbstractCommandSelectionDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
index 19bfac1ed2..8f9b0345d5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
@@ -15,6 +15,8 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class HandledToolItemCommandSelectionDialog extends AbstractCommandSelectionDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
index d2d337fb20..ace3d85758 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
@@ -15,6 +15,8 @@
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class HandlerCommandSelectionDialog extends AbstractCommandSelectionDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
index 5b56af5e2e..bda337ad84 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
@@ -15,6 +15,8 @@
 import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class KeyBindingCommandSelectionDialog extends AbstractCommandSelectionDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
index e6597629ba..704470cc14 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
@@ -3,6 +3,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class MenuIconDialogEditor extends AbstractIconDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
index c175ba652d..b35362f402 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
@@ -3,6 +3,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class MenuItemIconDialogEditor extends AbstractIconDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
index b085f38889..165cb83a7f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
@@ -3,6 +3,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class PartDescriptorIconDialogEditor extends AbstractIconDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
index b767630d25..d2c0e3f8e1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
@@ -3,6 +3,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class PartIconDialogEditor extends AbstractIconDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
index 677ffc5665..fecfb28384 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
@@ -3,6 +3,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class PerspectiveIconDialogEditor extends AbstractIconDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
index 45c8bd4daa..d11e1b3188 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
@@ -3,6 +3,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class ToolItemIconDialogEditor extends AbstractIconDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
index b04560aa0c..af108df53d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
@@ -3,6 +3,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class WindowIconDialogEditor extends AbstractIconDialog {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index baca981d14..bbc39d63e8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -14,6 +14,9 @@
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 778f31c45b..e2e59a00e1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -34,7 +34,16 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ObservableListTreeContentProvider;
 import org.eclipse.jface.databinding.viewers.TreeStructureAdvisor;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index f865eb3bee..277414fc32 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -24,7 +24,14 @@
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index cb97b728d0..9a6646f54c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -23,6 +23,14 @@
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 821fa864c2..ef947589a8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -22,7 +22,13 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java
index 06f0433d79..188ba6bd91 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java
@@ -24,6 +24,14 @@
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentUIEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentUIEditor.java
index fecd1842c3..ed061886f2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentUIEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentUIEditor.java
@@ -24,8 +24,13 @@
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index a9404ab5e1..455c857ae8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -24,6 +24,13 @@
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 68ec3066a9..ac3be06810 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -22,9 +22,16 @@
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 240e2e0a27..416b90ede2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -22,9 +22,16 @@
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index c5c6d4ad80..50b959eee8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -21,6 +21,10 @@
 import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;

From 45fcc9c218986eba576fe1a2ff18aeb7fabe5cdc Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 8 Jun 2010 18:44:55 +0000
Subject: [PATCH 0130/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * auto-support extended models by search for possible
 super-type-editors

---
 .../emf/ui/internal/common/ModelEditor.java     | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 66e891bbb4..cfec8245a4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -216,7 +216,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 					IStructuredSelection s = (IStructuredSelection) event.getSelection();
 					if (s.getFirstElement() instanceof EObject) {
 						EObject obj = (EObject) s.getFirstElement();
-						AbstractComponentEditor editor = editorMap.get(obj.eClass());
+						AbstractComponentEditor editor = getEditor(obj.eClass());
 						if (editor != null) {
 							textLabel.setText(editor.getLabel(obj));
 							iconLabel.setImage(editor.getImage(obj, iconLabel.getDisplay()));
@@ -264,7 +264,7 @@ public void menuAboutToShow(IMenuManager manager) {
 						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId()).getActions(s.getFirstElement());
 					} else {
 						EObject o = (EObject) s.getFirstElement();
-						AbstractComponentEditor editor = editorMap.get(o.eClass());
+						AbstractComponentEditor editor = getEditor(o.eClass());
 						if (editor != null) {
 							actions = editor.getActions(s.getFirstElement());
 						} else {
@@ -480,7 +480,16 @@ private boolean equalsPaths(FeaturePath p1, FeaturePath p2) {
 	}
 
 	public AbstractComponentEditor getEditor(EClass eClass) {
-		return editorMap.get(eClass);
+		AbstractComponentEditor editor = editorMap.get(eClass);
+		if( editor == null ) {
+			for( EClass cl : eClass.getESuperTypes() ) {
+				editor = getEditor(cl);
+				if( editor != null ) {
+					return editor;
+				}
+			}
+		}
+		return editor;
 	}
 
 	@Persist
@@ -506,7 +515,7 @@ public IObservable createObservable(Object target) {
 			} else if (target instanceof VirtualEntry<?>) {
 				return ((VirtualEntry<?>) target).getList();
 			} else {
-				AbstractComponentEditor editor = editorMap.get(((EObject) target).eClass());
+				AbstractComponentEditor editor = getEditor(((EObject) target).eClass());
 				if (editor != null) {
 					return editor.getChildList(target);
 				}

From 5e47c16b6339908cedb2de67bebd618c35f9c06b Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 8 Jun 2010 18:56:50 +0000
Subject: [PATCH 0131/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed problem with variables removing/moving

---
 .../common/component/ControlFactory.java       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 5a612571ad..ab46f1a698 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.ui.model.application.ui.MContext;
+
 import java.util.Arrays;
 import java.util.List;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -105,8 +107,8 @@ public void widgetSelected(SelectionEvent e) {
 					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 					if (s.size() == 1) {
 						Object obj = s.getFirstElement();
-						MApplication container = (MApplication) editor.getMaster().getValue();
-						int idx = container.getCommands().indexOf(obj) - 1;
+						MContext container = (MContext) editor.getMaster().getValue();
+						int idx = container.getVariables().indexOf(obj) - 1;
 						if (idx >= 0) {
 							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), UiPackageImpl.Literals.CONTEXT__VARIABLES, obj, idx);
 
@@ -132,9 +134,9 @@ public void widgetSelected(SelectionEvent e) {
 					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 					if (s.size() == 1) {
 						Object obj = s.getFirstElement();
-						MApplication container = (MApplication) editor.getMaster().getValue();
-						int idx = container.getCommands().indexOf(obj) + 1;
-						if (idx < container.getCommands().size()) {
+						MContext container = (MApplication) editor.getMaster().getValue();
+						int idx = container.getVariables().indexOf(obj) + 1;
+						if (idx < container.getVariables().size()) {
 							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), UiPackageImpl.Literals.CONTEXT__VARIABLES, obj, idx);
 
 							if (cmd.canExecute()) {
@@ -156,13 +158,13 @@ public void widgetSelected(SelectionEvent e) {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (!viewer.getSelection().isEmpty()) {
-					MApplication el = (MApplication) editor.getMaster().getValue();
+					MContext el = (MContext) editor.getMaster().getValue();
 					List<?> ids = ((IStructuredSelection) viewer.getSelection()).toList();
 					Command cmd = RemoveCommand.create(editor.getEditingDomain(), el, UiPackageImpl.Literals.CONTEXT__VARIABLES, ids);
 					if (cmd.canExecute()) {
 						editor.getEditingDomain().getCommandStack().execute(cmd);
-						if (el.getBindingContexts().size() > 0) {
-							viewer.setSelection(new StructuredSelection(el.getBindingContexts().get(0)));
+						if (el.getVariables().size() > 0) {
+							viewer.setSelection(new StructuredSelection(el.getVariables().get(0)));
 						}
 					}
 				}

From 2a2dee5ae562068beae06b8c914f22bd12865bbc Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 8 Jun 2010 19:00:37 +0000
Subject: [PATCH 0132/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed problem with binding contexts removing/moving

---
 .../internal/common/component/ControlFactory.java  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index ab46f1a698..62bdbd56c0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.ui.model.application.commands.MBindings;
+
 import org.eclipse.e4.ui.model.application.ui.MContext;
 
 import java.util.Arrays;
@@ -231,8 +233,8 @@ public void widgetSelected(SelectionEvent e) {
 					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 					if (s.size() == 1) {
 						Object obj = s.getFirstElement();
-						MApplication container = (MApplication) editor.getMaster().getValue();
-						int idx = container.getCommands().indexOf(obj) - 1;
+						MBindings container = (MBindings) editor.getMaster().getValue();
+						int idx = container.getBindingContexts().indexOf(obj) - 1;
 						if (idx >= 0) {
 							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
 
@@ -258,9 +260,9 @@ public void widgetSelected(SelectionEvent e) {
 					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 					if (s.size() == 1) {
 						Object obj = s.getFirstElement();
-						MApplication container = (MApplication) editor.getMaster().getValue();
-						int idx = container.getCommands().indexOf(obj) + 1;
-						if (idx < container.getCommands().size()) {
+						MBindings container = (MBindings) editor.getMaster().getValue();
+						int idx = container.getBindingContexts().indexOf(obj) + 1;
+						if (idx < container.getBindingContexts().size()) {
 							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
 
 							if (cmd.canExecute()) {
@@ -282,7 +284,7 @@ public void widgetSelected(SelectionEvent e) {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (!viewer.getSelection().isEmpty()) {
-					MApplication el = (MApplication) editor.getMaster().getValue();
+					MBindings el = (MBindings) editor.getMaster().getValue();
 					List<?> ids = ((IStructuredSelection) viewer.getSelection()).toList();
 					Command cmd = RemoveCommand.create(editor.getEditingDomain(), el, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, ids);
 					if (cmd.canExecute()) {

From 8a49dee2a562a0907e7ce2ac2146d00da6930b59 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 8 Jun 2010 20:04:36 +0000
Subject: [PATCH 0133/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * using new Focus-Annotation Support

---
 .../eclipse/e4/tools/compat/parts/DIEditorPart.java  | 11 +++++------
 .../eclipse/e4/tools/compat/parts/DIViewPart.java    | 12 ++++++++++++
 .../tools/emf/editor3x/E4WorkbenchModelEditor.java   |  5 -----
 .../e4/tools/emf/ui/internal/common/ModelEditor.java |  3 +++
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index cd805dd0ce..dc711b9e3c 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -16,6 +16,7 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.compat.internal.PartHelper;
 import org.eclipse.e4.tools.services.IDirtyProviderService;
+import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.di.Persist;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorInput;
@@ -89,12 +90,10 @@ public boolean isDirty() {
 		return dirtyState;
 	}
 	
-//FIXME Once we have an @Focus we can implement it
-//	@Override
-//	public void setFocus() {
-//		// TODO Auto-generated method stub
-//		
-//	}
+	@Override
+	public void setFocus() {
+		ContextInjectionFactory.invoke(component, Focus.class, context);
+	}
 	
 	@Override
 	public void dispose() {
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
index ac5fe13281..46a29f69af 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
@@ -10,8 +10,11 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.parts;
 
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.InjectionException;
 import org.eclipse.e4.tools.compat.internal.PartHelper;
+import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IViewSite;
@@ -49,4 +52,13 @@ protected IEclipseContext getContext() {
 	public C getComponent() {
 		return component;
 	}
+	
+	@Override
+	public void setFocus() {
+		try {
+			ContextInjectionFactory.invoke(component, Focus.class, context);	
+		} catch (InjectionException e) {
+			// TODO: handle exception
+		}
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
index a9544e07fe..3484bed566 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -19,9 +19,4 @@ public class E4WorkbenchModelEditor extends DIEditorPart<ApplicationModelEditor>
 	public E4WorkbenchModelEditor() {
 		super(ApplicationModelEditor.class);
 	}
-
-	@Override
-	public void setFocus() {
-		getComponent().setFocus();
-	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index cfec8245a4..d46780efa4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
+import org.eclipse.e4.ui.di.Focus;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -499,6 +501,7 @@ public void doSave(@Optional IProgressMonitor monitor) {
 		}
 	}
 
+	@Focus
 	public void setFocus() {
 		viewer.getControl().setFocus();
 	}

From f74bf4b91384149d497241b4fb640fcafacd4ce3 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 8 Jun 2010 20:35:46 +0000
Subject: [PATCH 0134/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed nls stuff

---
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index d46780efa4..60a674dadb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -355,7 +355,7 @@ private void registerContributedVirtualEditors() {
 		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
 
 		for (IConfigurationElement el : extPoint.getConfigurationElements()) {
-			if (!"virtualeditor".equals(el.getName())) {
+			if (!"virtualeditor".equals(el.getName())) { //$NON-NLS-1$
 				continue;
 			}
 
@@ -382,7 +382,6 @@ private void registerVirtualEditors() {
 	}
 
 	private void registerVirtualEditor(String id, AbstractComponentEditor editor) {
-		// System.err.println("Registering: " + id + " => " + editor);
 		virtualEditors.put(id, editor);
 	}
 
@@ -395,7 +394,7 @@ private void registerContributedEditors() {
 		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
 
 		for (IConfigurationElement el : extPoint.getConfigurationElements()) {
-			if (!"editor".equals(el.getName())) {
+			if (!"editor".equals(el.getName())) { //$NON-NLS-1$
 				continue;
 			}
 

From 0cab18532288dd4f090aa4f12a896650300de0b8 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 8 Jun 2010 21:30:52 +0000
Subject: [PATCH 0135/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * setting new context function

---
 .../tools/compat/internal/ContextServiceFactory.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index 0492c6cb28..7e557ec867 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -67,7 +67,7 @@ public Object create(@SuppressWarnings("rawtypes") Class serviceInterface, IServ
 			
 			IThemeManager manager = serviceContext.get(IThemeManager.class);
 			final IThemeEngine engine = manager.getEngineForDisplay(Display.getCurrent());
-			appContext.set(IStylingEngine.class, engine);
+			appContext.set(IThemeEngine.class, engine);
 			
 			appContext.set(IStylingEngine.class, new IStylingEngine() {
 				
@@ -92,7 +92,7 @@ public void style(Object widget) {
 			final IEclipseContext windowContext = ((IEclipseContext)o).createChild("WindowContext("+window+")");
 			windowContext.set(ISelectionService.class, window.getSelectionService());
 			
-			windowContext.declareModifiable(IServiceConstants.SELECTION);
+			windowContext.declareModifiable(IServiceConstants.ACTIVE_SELECTION);
 			window.getSelectionService().addSelectionListener(new ISelectionListener() {
 				
 				public void selectionChanged(IWorkbenchPart part, ISelection selection) {
@@ -100,12 +100,12 @@ public void selectionChanged(IWorkbenchPart part, ISelection selection) {
 						if( selection instanceof IStructuredSelection ) {
 							IStructuredSelection s = (IStructuredSelection) selection;
 							if( s.size() == 1 ) {
-								windowContext.set(IServiceConstants.SELECTION, s.getFirstElement());	
+								windowContext.set(IServiceConstants.ACTIVE_SELECTION, s.getFirstElement());	
 							} else {
-								windowContext.set(IServiceConstants.SELECTION, s.toList());
+								windowContext.set(IServiceConstants.ACTIVE_SELECTION, s.toList());
 							}	
 						} else {
-							windowContext.set(IServiceConstants.SELECTION, selection);
+							windowContext.set(IServiceConstants.ACTIVE_SELECTION, selection);
 						}
 					}
 				}

From c77276c5febdc29cfe4a60c71c7c0bd1ab1d2c88 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 9 Jun 2010 18:42:38 +0000
Subject: [PATCH 0136/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * adding support for menu contributions

---
 .../e4/tools/emf/ui/internal/Messages.java    |  18 +-
 .../tools/emf/ui/internal/Messages.properties |  16 +
 .../emf/ui/internal/common/ModelEditor.java   |  10 +-
 .../component/MenuContributionEditor.java     | 348 ++++++++++++++++++
 .../component/ModelComponentEditor.java       |  12 +
 .../virtual/VMenuContributionsEditor.java     | 254 +++++++++++++
 6 files changed, 654 insertions(+), 4 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index f879dfc8e4..a4099d53a6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -168,6 +168,7 @@ public class Messages {
 	public static String ModelComponentEditor_UiChildren;
 	public static String ModelComponentEditor_PartDescriptors;
 	public static String ModelComponentEditor_DetailParentId;
+	public static String ModelComponentEditor_MenuContributions;
 	
 	public static String ModelComponentsEditor_Label;
 	public static String ModelComponentsEditor_Description;
@@ -308,9 +309,20 @@ public class Messages {
 	public static String ContributionClassDialog_Label_Classname;
 	public static String ContributionClassDialog_ShellTitle;
 
-	
-	
-	
+	public static String MenuContributionEditor_Id;
+	public static String MenuContributionEditor_MenuItems;
+	public static String MenuContributionEditor_MenuItemType;
+	public static String MenuContributionEditor_MenuItemItemType;
+	public static String MenuContributionEditor_Up;
+	public static String MenuContributionEditor_Down;
+	public static String MenuContributionEditor_HandledMenuItem;
+	public static String MenuContributionEditor_Separator;
+	public static String MenuContributionEditor_Menu;
+	public static String MenuContributionEditor_DirectMenuItem;
+	public static String MenuContributionEditor_Remove;
+	public static String MenuContributionEditor_ParentId;
+	public static String MenuContributionEditor_Position;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 4e9558a9be..1a1f55175d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -163,6 +163,7 @@ ModelComponentEditor_Menus=Menus
 ModelComponentEditor_UiChildren=UI-Children
 ModelComponentEditor_PartDescriptors=PartDescriptors
 ModelComponentEditor_DetailParentId=parentId
+ModelComponentEditor_MenuContributions=MenuContributions
 
 ModelComponentsEditor_Label=Model Components
 ModelComponentsEditor_Description=Some bla bla bla bla
@@ -302,3 +303,18 @@ ContributionClassDialog_DialogMessage=Enter the name of the contributing class
 ContributionClassDialog_DialogTitle=Find Contribution Class
 ContributionClassDialog_Label_Classname=Classname
 ContributionClassDialog_ShellTitle=Find Contribution Class
+
+MenuContributionEditor_Id=Id
+MenuContributionEditor_MenuItems=Menu Items
+MenuContributionEditor_MenuItemType=Type
+MenuContributionEditor_MenuItemItemType=Item Type
+MenuContributionEditor_Up=Up
+MenuContributionEditor_Down=Down
+MenuContributionEditor_HandledMenuItem=Handled MenuItem
+MenuContributionEditor_Separator=Separator
+MenuContributionEditor_Menu=Menu
+MenuContributionEditor_DirectMenuItem=Direct MenuItem
+MenuContributionEditor_Remove=Remove
+MenuContributionEditor_ParentId=Parent-Id
+MenuContributionEditor_Position=Position
+
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 60a674dadb..619dc49749 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,6 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuContributionEditor;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuContributionsEditor;
+
 import org.eclipse.e4.ui.di.Focus;
 
 import java.util.ArrayList;
@@ -131,6 +135,8 @@ public class ModelEditor {
 	public static final String VIRTUAL_PARTDESCRIPTOR_MENU = ModelEditor.class.getName() + ".VIRTUAL_PARTDESCRIPTOR_MENU"; //$NON-NLS-1$
 	public static final String VIRTUAL_TRIMMED_WINDOW_TRIMS = ModelEditor.class.getName() + ".VIRTUAL_TRIMMED_WINDOW_TRIMS"; //$NON-NLS-1$
 	public static final String VIRTUAL_ADDONS = ModelEditor.class.getName() + ".VIRTUAL_ADDONS"; //$NON-NLS-1$
+	public static final String VIRTUAL_MENU_CONTRIBUTIONS = ModelEditor.class.getName() + ".VIRTUAL_MENU_CONTRIBUTIONS"; //$NON-NLS-1$
+	
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private Map<String, AbstractComponentEditor> virtualEditors = new HashMap<String, AbstractComponentEditor>();
@@ -379,6 +385,7 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_TRIMMED_WINDOW_TRIMS, new VWindowTrimEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_ADDONS, new VApplicationAddons(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_MODEL_COMPONENT_CHILDREN, new VModelComponentUIEditor(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_MENU_CONTRIBUTIONS, new VMenuContributionsEditor(modelProvider.getEditingDomain(), this));
 	}
 
 	private void registerVirtualEditor(String id, AbstractComponentEditor editor) {
@@ -432,7 +439,8 @@ private void registerDefaultEditors() {
 		registerEditor(MenuPackageImpl.Literals.MENU_SEPARATOR, new MenuSeparatorEditor(modelProvider.getEditingDomain()));
 		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), project, modelProvider));
 		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this, project));
-
+		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION, new MenuContributionEditor(modelProvider.getEditingDomain(),project, this));
+		
 		registerEditor(BasicPackageImpl.Literals.PART, new PartEditor(modelProvider.getEditingDomain(), project));
 		registerEditor(BasicPackageImpl.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain(), project));
 		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW, new TrimmedWindowEditor(modelProvider.getEditingDomain(), project));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
new file mode 100644
index 0000000000..b9b52b084b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -0,0 +1,348 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.emf.databinding.EMFProperties;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
+import java.util.List;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+import org.eclipse.swt.SWT;
+
+import org.eclipse.core.databinding.observable.value.WritableValue;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+
+public class MenuContributionEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private Image image;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+	private IProject project;
+	
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	
+	private static class Struct {
+		private final String label;
+		private final EClass eClass;
+		private final boolean separator;
+
+		public Struct(String label, EClass eClass, boolean separator) {
+			this.label = label;
+			this.eClass = eClass;
+			this.separator = separator;
+		}
+	}
+	
+	public MenuContributionEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+		this.project = project;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if( image == null ) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/MenuContribution.gif")); //$NON-NLS-1$
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Menu Contribution";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Menu Contribution Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context2, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuContributionEditor_Id);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+		}
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuContributionEditor_ParentId);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuContributionEditor_Position);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__POSITION_IN_PARENT).observeDetail(getMaster()));
+		}
+
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuContributionEditor_MenuItems);
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			final TableViewer viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.getTable().setHeaderVisible(true);
+
+			{
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText(Messages.MenuContributionEditor_MenuItemType);
+				column.getColumn().setWidth(300);
+				column.setLabelProvider(new ComponentLabelProvider(editor));
+			}
+
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE);
+
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText(Messages.MenuContributionEditor_MenuItemItemType);
+				column.getColumn().setWidth(100);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+
+			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(master));
+
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.MenuContributionEditor_Up);
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) - 1;
+							if (idx >= 0) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.MenuContributionEditor_Down);
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) + 1;
+							if (idx < container.getChildren().size()) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					Struct struct = (Struct) element;
+					return struct.label;
+				}
+			});
+
+			Struct defaultStruct = new Struct(Messages.MenuContributionEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
+			childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuContributionEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuContributionEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuContributionEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false) });
+			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!childrenDropDown.getSelection().isEmpty()) {
+						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+						EClass eClass = struct.eClass;
+						MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
+
+						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+							if (!struct.separator) {
+								editor.setSelection(eObject);
+							}
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.MenuContributionEditor_Remove);
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+		
+		ControlFactory.createTagsWidget(parent, this); 
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
index a874f540fd..ba2b27ad4a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -55,6 +57,7 @@ public class ModelComponentEditor extends AbstractComponentEditor {
 	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES);
 	private IListProperty MODEL_COMPONENT__COMMANDS = EMFProperties.list(ApplicationPackageImpl.Literals.MODEL_COMPONENT__COMMANDS);
 	private IListProperty MODEL_COMPONENT__BINDINGS = EMFProperties.list(ApplicationPackageImpl.Literals.MODEL_COMPONENT__BINDINGS);
+	private IListProperty MENU_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS);
 	
 	public ModelComponentEditor(EditingDomain editingDomain) {
 		super(editingDomain);
@@ -246,6 +249,15 @@ protected boolean accepted(Object o) {
 
 		});
 		
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MENU_CONTRIBUTIONS, MENU_CONTRIBUTIONS, element, Messages.ModelComponentEditor_MenuContributions) {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+		
 		return list;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
new file mode 100644
index 0000000000..2db0267278
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -0,0 +1,254 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
+
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+
+import java.util.List;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MBasicFactory;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorContainer;
+import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VMenuContributionsEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+	private TableViewer viewer;
+
+	public VMenuContributionsEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Menu Contributions";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Menu Contributions Bla Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Menu Contributions");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.getTable().setHeaderVisible(true);
+
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
+					
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Id");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+			
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID);
+					
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("ParentId");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+			
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__POSITION_IN_PARENT);
+					
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Position");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+						
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MMenuContributions container = (MMenuContributions) getMaster().getValue();
+							int idx = container.getMenuContributions().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MMenuContributions container = (MMenuContributions) getMaster().getValue();
+							int idx = container.getMenuContributions().indexOf(obj) + 1;
+							if( idx < container.getMenuContributions().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MMenuContribution command = MMenuFactory.INSTANCE.createMenuContribution();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS, command);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(command);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> commands = ((IStructuredSelection)viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS, commands);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+}

From 49f9e63f5347f43482c80e02bd7de4295470891d Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 9 Jun 2010 23:03:04 +0000
Subject: [PATCH 0137/1286]  Bug 316396 -  [Tooling] ModelEditor gives error
 NPE

---
 .../META-INF/MANIFEST.MF                         |  2 +-
 .../OSGI-INF/projectfunction.xml                 |  8 ++++++++
 .../build.properties                             |  3 ++-
 .../emf/editor3x/EditorProjectFunction.java      | 16 ++++++++++++++++
 .../ui/internal/wbm/ApplicationModelEditor.java  |  6 ++++--
 5 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/projectfunction.xml
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index db0beef847..e69d0595b5 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -25,6 +25,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.ui.services;bundle-version="0.9.1",
  org.eclipse.e4.tools.compat;bundle-version="1.0.0",
  org.eclipse.e4.tools.services;bundle-version="1.0.0"
-Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml
+Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/projectfunction.xml
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.e4.tools.emf.editor3x.wizard;x-internal:=true
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/projectfunction.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/projectfunction.xml
new file mode 100644
index 0000000000..ed7571e82b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/projectfunction.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.emf.editor3x.projectfunction">
+   <implementation class="org.eclipse.e4.tools.emf.editor3x.EditorProjectFunction"/>
+   <service>
+      <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
+   </service>
+   <property name="service.context.key" type="String" value="org.eclipse.e4.tools.emf.ui.editorproject"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
index 69419d0dd0..2bc1498b59 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
@@ -5,5 +5,6 @@ bin.includes = META-INF/,\
                icons/,\
                OSGI-INF/pdecontributionprovider.xml,\
                OSGI-INF/xmiresourcecontextfunction.xml,\
-               OSGI-INF/selectionproviderfunction.xml
+               OSGI-INF/selectionproviderfunction.xml,\
+               OSGI-INF/projectfunction.xml
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java
new file mode 100644
index 0000000000..0544e40d45
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java
@@ -0,0 +1,16 @@
+package org.eclipse.e4.tools.emf.editor3x;
+
+import org.eclipse.e4.core.contexts.ContextFunction;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IFileEditorInput;
+
+public class EditorProjectFunction extends ContextFunction {
+
+	@Override
+	public Object compute(IEclipseContext context) {
+		final IEditorInput input = context.get(IEditorInput.class);
+		return ((IFileEditorInput)input).getFile().getProject();
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index d72d0ad05d..c406dfc689 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.wbm;
 
+import javax.inject.Named;
+
 import javax.inject.Inject;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -21,7 +23,7 @@
 public class ApplicationModelEditor extends ModelEditor {
 	@Inject
 	public ApplicationModelEditor(Composite composite, IEclipseContext context,
-			IModelResource modelProvider, @Optional IProject project) {
+			IModelResource modelProvider, @Named("org.eclipse.e4.tools.emf.ui.editorproject") @Optional IProject project) {
 		super(composite, context, modelProvider, project);
 	}
-}
+} 

From c88b1719840d8ab94a594306f1a33bd6d0a06ef2 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 12 Jun 2010 19:56:12 +0000
Subject: [PATCH 0138/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * started adding support for new fragment
 contributions

---
 .../build.properties                          |   5 +-
 .../plugin.xml                                |   2 +-
 .../wizard/NewContributionModelWizard.java    |   6 +-
 .../e4/tools/emf/ui/internal/Messages.java    |  18 +
 .../tools/emf/ui/internal/Messages.properties |  17 +
 .../emf/ui/internal/common/ModelEditor.java   |   9 +
 .../component/ModelFragmentsEditor.java       | 231 ++++++++++++
 .../common/component/StringModelFragment.java | 332 ++++++++++++++++++
 8 files changed, 612 insertions(+), 8 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
index 2bc1498b59..4f0aef779f 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
@@ -3,8 +3,5 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
-               OSGI-INF/pdecontributionprovider.xml,\
-               OSGI-INF/xmiresourcecontextfunction.xml,\
-               OSGI-INF/selectionproviderfunction.xml,\
-               OSGI-INF/projectfunction.xml
+               OSGI-INF/
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index 8a4c94ce26..dc050c9576 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -31,7 +31,7 @@
             hasPages="true"
             icon="icons/full/obj16/plugin.png"
             id="org.eclipse.e4.tools.emf.editor3x.newmodelcontribution"
-            name="New Contribution Model">
+            name="New Model Fragment">
       </wizard>
       <category
             id="org.eclipse.e4"
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewContributionModelWizard.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewContributionModelWizard.java
index 00706fd70a..20b95dd2a8 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewContributionModelWizard.java
@@ -10,7 +10,7 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x.wizard;
 
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
 import org.eclipse.emf.ecore.EObject;
 
 
@@ -18,10 +18,10 @@ public class NewContributionModelWizard extends BaseApplicationModelWizard {
 
 	@Override
 	public String getDefaultFileName() {
-		return "components.e4xmi";
+		return "fragment.e4xmi";
 	}
 	
 	protected EObject createInitialModel() {
-		return (EObject) MApplicationFactory.INSTANCE.createModelComponents();
+		return (EObject) MFragmentFactory.INSTANCE.createModelFragments();
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index a4099d53a6..6ccea790b0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -323,6 +323,24 @@ public class Messages {
 	public static String MenuContributionEditor_ParentId;
 	public static String MenuContributionEditor_Position;
 
+	public static String ModelFragmentsEditor_ModelFragments;
+	public static String ModelFragmentsEditor_Up;
+	public static String ModelFragmentsEditor_Down;
+	public static String ModelFragmentsEditor_Add;
+	public static String ModelFragmentsEditor_Remove;
+	public static String ModelFragmentsEditor_Label;
+	public static String ModelFragmentsEditor_Description;
+
+	public static String StringModelFragment_Label;
+	public static String StringModelFragment_Description;
+	public static String StringModelFragment_Featurename;
+	public static String StringModelFragment_ParentId;
+	public static String StringModelFragment_PositionInList;
+	public static String StringModelFragment_Up;
+	public static String StringModelFragment_Down;
+	public static String StringModelFragment_Remove;
+	public static String StringModelFragment_Elements;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 1a1f55175d..63f06f3f37 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -318,3 +318,20 @@ MenuContributionEditor_Remove=Remove
 MenuContributionEditor_ParentId=Parent-Id
 MenuContributionEditor_Position=Position
 
+ModelFragmentsEditor_ModelFragments=Model Fragements
+ModelFragmentsEditor_Up=Up
+ModelFragmentsEditor_Down=Down
+ModelFragmentsEditor_Add=Add
+ModelFragmentsEditor_Remove=Remove
+ModelFragmentsEditor_Label=Label
+ModelFragmentsEditor_Description=Description
+
+StringModelFragment_Label=String Model Fragment
+StringModelFragment_Description=String Model Fragment Bla Bla Bla
+StringModelFragment_Featurename=Featurename
+StringModelFragment_ParentId=Element Id
+StringModelFragment_PositionInList=Position in list
+StringModelFragment_Up=Up
+StringModelFragment_Down=Down
+StringModelFragment_Remove=Remove
+StringModelFragment_Elements=Elements
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 619dc49749..0668cc2396 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,6 +10,12 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.StringModelFragment;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ModelFragmentsEditor;
+
+import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuContributionEditor;
 
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuContributionsEditor;
@@ -454,6 +460,9 @@ private void registerDefaultEditors() {
 		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, new PerspectiveStackEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE, new PerspectiveEditor(modelProvider.getEditingDomain(), project, this));
 		registerEditor(AdvancedPackageImpl.Literals.PLACEHOLDER, new PlaceholderEditor(modelProvider.getEditingDomain()));
+		
+		registerEditor(FragmentPackageImpl.Literals.MODEL_FRAGMENTS, new ModelFragmentsEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT, new StringModelFragment(modelProvider.getEditingDomain(),this));
 	}
 
 	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
new file mode 100644
index 0000000000..ca11efa5ad
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -0,0 +1,231 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
+
+
+import org.eclipse.e4.ui.model.fragment.MModelFragment;
+
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+
+import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class ModelFragmentsEditor extends AbstractComponentEditor {
+
+	private IListProperty MODEL_FRAGMENTS__FRAGMENTS = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
+
+	private Composite composite;
+	private Image image;
+	private ModelEditor editor;
+
+	public ModelFragmentsEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if (image == null) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ModelFragments.gif")); //$NON-NLS-1$
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.ModelFragmentsEditor_Label;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return Messages.ModelFragmentsEditor_Description;
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if (composite == null) {
+			composite = createForm(parent);
+		}
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent) {
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.ModelFragmentsEditor_ModelFragments);
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			final TableViewer viewer = new TableViewer(parent);
+			viewer.setContentProvider(new ObservableListContentProvider());
+			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+
+			IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
+			viewer.setInput(prop.observeDetail(getMaster()));
+
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelFragmentsEditor_Up);
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MModelFragments container = (MModelFragments) getMaster().getValue();
+							int idx = container.getFragments().indexOf(obj) - 1;
+							if (idx >= 0) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelFragmentsEditor_Down);
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MModelFragments container = (MModelFragments) getMaster().getValue();
+							int idx = container.getFragments().indexOf(obj) + 1;
+							if (idx < container.getFragments().size()) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelFragmentsEditor_Add);
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MModelFragment component = MFragmentFactory.INSTANCE.createStringModelFragment();
+
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, component);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(component);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelFragmentsEditor_Remove);
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, elements);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return MODEL_FRAGMENTS__FRAGMENTS.observe(element);
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
new file mode 100644
index 0000000000..5540040ca2
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -0,0 +1,332 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.emf.ecore.EPackage;
+
+import java.util.ArrayList;
+
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+
+import org.eclipse.emf.ecore.EClassifier;
+
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+
+import org.eclipse.e4.ui.model.fragment.MModelFragment;
+
+import java.util.List;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Button;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.TableViewer;
+
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+
+import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
+
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.emf.databinding.EMFProperties;
+
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+
+public class StringModelFragment extends AbstractComponentEditor {
+	private Composite composite;
+	private Image image;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+
+	private IListProperty MODEL_FRAGMENT__ELEMENTS = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
+
+	public StringModelFragment(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if (image == null) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/StringModelFragment.gif")); //$NON-NLS-1$
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.StringModelFragment_Label;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return Messages.StringModelFragment_Description;
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent);
+		}
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent) {
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.StringModelFragment_ParentId);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID).observeDetail(getMaster()));
+		}
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.StringModelFragment_Featurename);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME).observeDetail(getMaster()));
+		}
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.StringModelFragment_PositionInList);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__POSITION_IN_LIST).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.StringModelFragment_Elements);
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			final TableViewer viewer = new TableViewer(parent);
+			viewer.setContentProvider(new ObservableListContentProvider());
+			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+
+			IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
+			viewer.setInput(prop.observeDetail(getMaster()));
+
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.StringModelFragment_Up);
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MModelFragment container = (MModelFragment) getMaster().getValue();
+							int idx = container.getElements().indexOf(obj) - 1;
+							if (idx >= 0) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.StringModelFragment_Down);
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MModelFragment container = (MModelFragment) getMaster().getValue();
+							int idx = container.getElements().indexOf(obj) + 1;
+							if (idx < container.getElements().size()) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					EClass eclass = (EClass) element;
+					return eclass.getName();
+				}
+			});
+
+			List<EClass> list = new ArrayList<EClass>();
+			addClasses(ApplicationPackageImpl.eINSTANCE, list);
+
+			childrenDropDown.setInput(list);
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+					EObject eObject = EcoreUtil.create(eClass);
+
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, eObject);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(eObject);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.StringModelFragment_Remove);
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, elements);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+
+		return parent;
+	}
+	
+	public void addClasses(EPackage ePackage, List<EClass> list) {
+		for (EClassifier c : ePackage.getEClassifiers()) {
+			if (c instanceof EClass) {
+				EClass eclass = (EClass) c;
+				if ( eclass != ApplicationPackageImpl.Literals.APPLICATION && !eclass.isAbstract() && !eclass.isInterface() && eclass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT)) {
+					list.add(eclass);
+				}
+			}
+		}
+		
+		for (EPackage eSubPackage : ePackage.getESubpackages()) {
+			addClasses(eSubPackage, list);
+		}
+	}
+
+	public void dispose() {
+		if (image != null) {
+			image.dispose();
+			image = null;
+		}
+
+		if (composite != null) {
+			composite.dispose();
+			composite = null;
+		}
+
+		if (context != null) {
+			context.dispose();
+			context = null;
+		}
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return MODEL_FRAGMENT__ELEMENTS.observe(element);
+	}
+
+}

From 81830e4b547eea5e8a7f6550e88b5eac7c0a46cf Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 12 Jun 2010 21:26:14 +0000
Subject: [PATCH 0139/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * started adding support for new fragment
 contributions

---
 .../org.eclipse.e4.tools.emf.ui.editors.exsd  |  20 ++-
 .../tools/emf/ui/common/IEditorFeature.java   |  20 +++
 .../tools/emf/ui/internal/Messages.properties |   2 +-
 .../emf/ui/internal/common/ModelEditor.java   |  36 +++++
 .../common/component/ControlFactory.java      | 125 ++++++++++++++++++
 .../common/component/StringModelFragment.java |  22 +--
 .../AbstractCommandSelectionDialog.java       |  27 ++--
 7 files changed, 230 insertions(+), 22 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd b/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
index 352421fdf6..57b8c96b0d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
+++ b/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
@@ -18,8 +18,9 @@
       </annotation>
       <complexType>
          <sequence>
-            <element ref="editor" minOccurs="1" maxOccurs="unbounded"/>
-            <element ref="virtualeditor" minOccurs="1" maxOccurs="unbounded"/>
+            <element ref="editor" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="virtualeditor" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="editorfeature" minOccurs="0" maxOccurs="unbounded"/>
          </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>
@@ -85,6 +86,21 @@
       </complexType>
    </element>
 
+   <element name="editorfeature">
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.e4.tools.emf.ui.common.IEditorFeature"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
    <annotation>
       <appinfo>
          <meta.section type="since"/>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
new file mode 100644
index 0000000000..cf0411f955
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
@@ -0,0 +1,20 @@
+package org.eclipse.e4.tools.emf.ui.common;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EClass;
+
+public interface IEditorFeature {
+	public class FeatureClass {
+		public final String label;
+		public final EClass eClass;
+		
+		public FeatureClass(String label, EClass eClass) {
+			this.label = label;
+			this.eClass = eClass;
+		}
+	}
+	public List<FeatureClass> getFeatureClasses(EClass eClass, EStructuralFeature feature);
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 63f06f3f37..10a35c0bc4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -323,7 +323,7 @@ ModelFragmentsEditor_Up=Up
 ModelFragmentsEditor_Down=Down
 ModelFragmentsEditor_Add=Add
 ModelFragmentsEditor_Remove=Remove
-ModelFragmentsEditor_Label=Label
+ModelFragmentsEditor_Label=Model Fragments
 ModelFragmentsEditor_Description=Description
 
 StringModelFragment_Label=String Model Fragment
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 0668cc2396..09e4fda2b5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,6 +10,12 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
+import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.e4.tools.emf.ui.common.IEditorFeature;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.StringModelFragment;
 
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ModelFragmentsEditor;
@@ -147,6 +153,7 @@ public class ModelEditor {
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private Map<String, AbstractComponentEditor> virtualEditors = new HashMap<String, AbstractComponentEditor>();
 	private List<FeaturePath> labelFeaturePaths = new ArrayList<FeaturePath>();
+	private List<IEditorFeature> editorFeatures = new ArrayList<IEditorFeature>();
 
 	// private List<AbstractComponentEditor> editors = new
 	// ArrayList<AbstractComponentEditor>();
@@ -167,6 +174,7 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 
 		registerContributedEditors();
 		registerContributedVirtualEditors();
+		loadEditorFeatures();
 
 		SashForm form = new SashForm(composite, SWT.HORIZONTAL);
 		form.setBackground(form.getDisplay().getSystemColor(SWT.COLOR_WHITE));
@@ -295,6 +303,34 @@ public void menuAboutToShow(IMenuManager manager) {
 		viewer.getControl().setMenu(mgr.createContextMenu(viewer.getControl()));
 	}
 
+	private void loadEditorFeatures() {
+		IExtensionRegistry registry = RegistryFactory.getRegistry();
+		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
+
+		for (IConfigurationElement el : extPoint.getConfigurationElements()) {
+			if (!"editorfeature".equals(el.getName())) { //$NON-NLS-1$
+				continue;
+			}
+			
+			try {
+				editorFeatures.add((IEditorFeature) el.createExecutableExtension("class")); //$NON-NLS-1$
+			} catch (CoreException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+	}
+	
+	public List<FeatureClass> getFeatureClasses(EClass eClass, EStructuralFeature feature) {
+		List<FeatureClass> list = new ArrayList<IEditorFeature.FeatureClass>();
+		
+		for( IEditorFeature f : editorFeatures ) {
+			list.addAll(f.getFeatureClasses(eClass, feature));
+		}
+		
+		return list;
+	}
+
 	@Inject
 	@Optional
 	public void setSelectionService(ISelectionProviderService selectionService) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 62bdbd56c0..6a2c7b608a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -50,6 +50,131 @@
 import org.eclipse.swt.widgets.Text;
 
 public class ControlFactory {
+	public static void createStringListWidget(Composite parent, final AbstractComponentEditor editor, String label, final EStructuralFeature feature) {
+		Label l = new Label(parent, SWT.NONE);
+		l.setText(label);
+		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+		final Text t = new Text(parent, SWT.BORDER);
+		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		t.addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyPressed(KeyEvent e) {
+				if (e.keyCode == SWT.CR || e.keyCode == SWT.LF) {
+					handleAddText(editor, UiPackageImpl.Literals.CONTEXT__VARIABLES, t);
+				}
+			}
+		});
+
+		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ControlFactory_Add);
+		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				handleAddText(editor, feature, t);
+			}
+		});
+
+		new Label(parent, SWT.NONE);
+
+		final TableViewer viewer = new TableViewer(parent);
+		viewer.setLabelProvider(new LabelProvider());
+		viewer.setContentProvider(new ObservableListContentProvider());
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.heightHint = 150;
+		viewer.getControl().setLayoutData(gd);
+
+		IEMFListProperty prop = EMFProperties.list(feature);
+		viewer.setInput(prop.observeDetail(editor.getMaster()));
+
+		Composite buttonComp = new Composite(parent, SWT.NONE);
+		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+		GridLayout gl = new GridLayout();
+		gl.marginLeft = 0;
+		gl.marginRight = 0;
+		gl.marginWidth = 0;
+		gl.marginHeight = 0;
+		buttonComp.setLayout(gl);
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ControlFactory_Up);
+		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_UP));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MContext container = (MContext) editor.getMaster().getValue();
+						int idx = container.getVariables().indexOf(obj) - 1;
+						if (idx >= 0) {
+							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), feature, obj, idx);
+
+							if (cmd.canExecute()) {
+								editor.getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+
+					}
+				}
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ControlFactory_Down);
+		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_DOWN));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MContext container = (MApplication) editor.getMaster().getValue();
+						int idx = container.getVariables().indexOf(obj) + 1;
+						if (idx < container.getVariables().size()) {
+							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), feature, obj, idx);
+
+							if (cmd.canExecute()) {
+								editor.getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+
+					}
+				}
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ControlFactory_Remove);
+		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_DELETE_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					MContext el = (MContext) editor.getMaster().getValue();
+					List<?> ids = ((IStructuredSelection) viewer.getSelection()).toList();
+					Command cmd = RemoveCommand.create(editor.getEditingDomain(), el, feature, ids);
+					if (cmd.canExecute()) {
+						editor.getEditingDomain().getCommandStack().execute(cmd);
+						if (el.getVariables().size() > 0) {
+							viewer.setSelection(new StructuredSelection(el.getVariables().get(0)));
+						}
+					}
+				}
+			}
+		});
+	}
+	
+	
 	public static void createVariablesWidget(Composite parent, final AbstractComponentEditor editor) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(Messages.ControlFactory_ContextVariables);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 5540040ca2..95ad8e81a5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -1,5 +1,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
+
 import org.eclipse.emf.ecore.EPackage;
 
 import java.util.ArrayList;
@@ -242,15 +244,17 @@ public void widgetSelected(SelectionEvent e) {
 			childrenDropDown.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
-					EClass eclass = (EClass) element;
-					return eclass.getName();
+					FeatureClass eclass = (FeatureClass) element;
+					return eclass.label;
 				}
 			});
 
-			List<EClass> list = new ArrayList<EClass>();
+			List<FeatureClass> list = new ArrayList<FeatureClass>();
 			addClasses(ApplicationPackageImpl.eINSTANCE, list);
+			list.addAll(editor.getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
 
 			childrenDropDown.setInput(list);
+			childrenDropDown.setSelection(new StructuredSelection(list.get(0)));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
@@ -258,7 +262,7 @@ public String getText(Object element) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+					EClass eClass = ((FeatureClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement()).eClass;
 					EObject eObject = EcoreUtil.create(eClass);
 
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, eObject);
@@ -291,17 +295,17 @@ public void widgetSelected(SelectionEvent e) {
 
 		return parent;
 	}
-	
-	public void addClasses(EPackage ePackage, List<EClass> list) {
+
+	public void addClasses(EPackage ePackage, List<FeatureClass> list) {
 		for (EClassifier c : ePackage.getEClassifiers()) {
 			if (c instanceof EClass) {
 				EClass eclass = (EClass) c;
-				if ( eclass != ApplicationPackageImpl.Literals.APPLICATION && !eclass.isAbstract() && !eclass.isInterface() && eclass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT)) {
-					list.add(eclass);
+				if (eclass != ApplicationPackageImpl.Literals.APPLICATION && !eclass.isAbstract() && !eclass.isInterface() && eclass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT)) {
+					list.add(new FeatureClass(eclass.getName(), eclass));
 				}
 			}
 		}
-		
+
 		for (EPackage eSubPackage : ePackage.getESubpackages()) {
 			addClasses(eSubPackage, list);
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index 71e5701360..397cfb157c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -10,6 +10,16 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.emf.common.util.TreeIterator;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
@@ -87,19 +97,16 @@ public void doubleClick(DoubleClickEvent event) {
 			}
 		});
 		
-		if( resource.getRoot().get(0) instanceof MApplication ) {
-			MApplication app = (MApplication) resource.getRoot().get(0);
-			viewer.setInput(app.getCommands());
-		} else {
-			MModelComponents components = (MModelComponents)resource.getRoot().get(0);
-			List<MCommand> commands = new ArrayList<MCommand>();
-			for( MModelComponent comp : components.getComponents() ) {
-				commands.addAll(comp.getCommands());
+		List<EObject> commands = new ArrayList<EObject>();
+		TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject)resource.getRoot().get(0), true);
+		while( it.hasNext() ) {
+			EObject o = it.next();
+			if( o.eClass() == CommandsPackageImpl.Literals.COMMAND ) {
+				commands.add(o);
 			}
-			viewer.setInput(commands);	
 		}
+		viewer.setInput(commands);
 		
-
 		final PatternFilter filter = new PatternFilter() {
 			@Override
 			protected boolean isParentMatch(Viewer viewer, Object element) {

From 2ecca1c2dd8d3e86136bb9fddf457e723868db42 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 14 Jun 2010 20:18:35 +0000
Subject: [PATCH 0140/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling

---
 .../full/modelelements/ModelFragments.png     | Bin 0 -> 591 bytes
 .../modelelements/StringModelFragment.png     | Bin 0 -> 746 bytes
 .../icons/full/obj16/EPackage.gif             | Bin 0 -> 207 bytes
 .../icons/full/obj16/field_public_obj.gif     | Bin 0 -> 124 bytes
 .../icons/full/wizban/fieldrefact_wiz.png     | Bin 0 -> 8469 bytes
 .../e4/tools/emf/ui/internal/Messages.java    |   6 +
 .../tools/emf/ui/internal/Messages.properties |   6 +
 .../component/ModelFragmentsEditor.java       |   2 +-
 .../common/component/StringModelFragment.java |  41 +-
 .../dialogs/FeatureSelectionDialog.java       | 441 ++++++++++++++++++
 10 files changed, 490 insertions(+), 6 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelFragments.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/StringModelFragment.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/EPackage.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_public_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/fieldrefact_wiz.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelFragments.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelFragments.png
new file mode 100644
index 0000000000000000000000000000000000000000..6187b15aec001b7080b51a5f944f07591f26cc15
GIT binary patch
literal 591
zcmV-V0<iswP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz;Ymb6R5;6}
zl08V3aTLaXuVw{)TtAV-EQp(VZ&;&yOGCA^HyY7UV+BnWv^BakMQc+OB&0Z27AkkL
zxPppG-9jbH?t7kd8eTEus*7hi@aLT8f1cktNknjvIJDd2gQ>eEcNHZMNv|IbJ-M`(
zKwWL~opzjJe^WpCmV9E;(0&ut2;4va_(#>M8)>9$R5viQnf(Nkh~VM$y>J(jqb$cj
z+nL1Nm|mV)Gm|9MnHf*7Ja4OEAQz__^LRKOLEwqpiGV^^A*T=#&inGm-62Xs;dnSp
zKj&H9T*boh2<no0+=ElOJZ83sfQeG2L`y@C?#3Rz{i>i)W+(n27l!C)>fq|L%VB1i
ziC4p;NwV_}ZjW7$LRW#(_bKF#hp=!IqNO26Z*w2+LEwx{PVnZ&Sn}T;m<fe2Wm#Lz
za$)sCo<WYS+HDKB-VTSEXg%7B+({$Nn7A;{*z`8{F+2a6g_Xssq{Gq<0W(qT9zX<h
z>tzb<gWDVNaLQ|6kUI-2i;UhJKT-oRHNy~7Uq5lS^Bm=sIhHERNTM^>$;qA*nT@@+
zV5uQ@iXDTPoTbV#FRr~z04|PPh`wXTNoCm9*tG&?e3+fYl>K6+&3|Cc$KOpL`ER+_
dcRl5U#9zn6ZO}GF<yZg!002ovPDHLkV1oCe4!{5a

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/StringModelFragment.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/StringModelFragment.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6cb0ecf7ee36289d3f67967f1f730891027340d
GIT binary patch
literal 746
zcmV<G0u}v<P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!d`Uz>R5;6}
zlS^n^1r&zAJIS<_JZ9PwM^mj%n&~t%YBgvRrPZy_kfqR-WMN#1f*Td23l&14xKMCm
za3$hOD2Nb2A!@B)Qqwd=6KqpDCTSj%CLuF(bMJX{5zv&R*?2Yw4*VbI@t?rm`9D#=
zQ}KhbcPGrWsA{gN-+k2manJn#iS6Qd4qz1Xjd^m-xj<CAck5sq;QglumLrKOvBy-R
z3L-MT8z69ZKD_dtn<=V>Zf5V;e=HCauFQ?Eim0k;LPQws{c``d9jGZs8*-Q%=8j{5
zn&A$GmO@HhaW~edhnf89jMp_jNo8r6Ae?!16QGK^VQ$Q>-(n?PL0m9*5<wki&P#it
zEByoyw4WlCeTJ3kJb!&Zcy1FQ%EZzH&B+v*hE^7<OQ`GSIKIJAS>R+#7fp{m%kuR<
z*%L%GH9th-!NaLws}J7#@pUh>6qqQFp=OvXkJ}wyYwaZ6_A(oDUsEdwEKF8e4MP&O
zYW|)ph$!lcs3ImDj?45ve4O-=(}c616D04DY;1z4#HZDNc<zmFrs@IS{Gs1Pl=Qwd
zYDVlat>t<8j+`LX-b*<18HuD2tz{_<U*dcmQ8N4Q3L;7|(}Chluic<4YT)^FCl3}+
z6Wt!9ZjTeLKE~`%zfoVSX1{p*(#?B}6pJ7ze=LlUomuCFAcOj&%w7EiBc!r?h+7v&
zIU9%Mw}}4*NGzxs#e+|gDa}$i+0Wk6FHBvy$k@;_qeDM4l+AHlZRcka5q_T<K~$+;
zpC`KZE!pFzSY0gh_vLF`$Q`n|tCwqPy0)X0x5g_k9;kJ;W$I6KWbx$2ueF86zMg^c
c8~6K#yY3xm_DRFD4FCWD07*qoM6N<$g1Q!0-T(jq

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/EPackage.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/EPackage.gif
new file mode 100644
index 0000000000000000000000000000000000000000..30c5c10cc4719ad90c8d269e3b36adb1e0319e92
GIT binary patch
literal 207
zcmZ?wbhEHb6krfwIKseCY}wl7x}e2rW}W?{2%WSA;oH~b9N1cOe3Iv?9J9JvzME(J
zZ<!mkb#Cz1#j(4Vr|jKSadcPP>Em;*{{R1<fe4`ZlZBCiL6|`Yq!wf+1FO#imA;hB
zc^Rwxjzk$4Fc=@*DKqingJVTnf}AP>EgF6t%ugl;*a@gHDF}E(tZWF=JmCF-N!@Xx
chR7VYa}C7>MLhQ!z8~0lY2CXYo*WF;0D@FSb^rhX

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_public_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_public_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d4cb4254d92bcafa0341fc69e353c8cafe6944fe
GIT binary patch
literal 124
zcmZ?wbhEHb6krfw*v!Bn(B^A0Bg183N$uYG6Hly@>kKN~SlYRx@jn<aU;xFREQ|~c
zoD4c38ITzaESd%<Jy-9wczxDTkZGgf!9tcKF$s<&7O8?Q><f5{Y;&9$-^^W5;Bm!;
Hfx#L8U|}T^

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/fieldrefact_wiz.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/fieldrefact_wiz.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff2dae47294bfa02959f2cffa8857ca9a66225eb
GIT binary patch
literal 8469
zcmV+wA?n_VP)<h;3K|Lk000e1NJLTq002t>002S=1^@s6A3-Z300009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde00d`2O+f$vv5tKEQIh}w03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`
z>R<o>I+y?e7jKeZ#YO-C7BWdhK~#9!?3;OzT-SA<zkBa{ulIEZm;q+6FBAyV1WAjV
zB#Wd1mSj-{S(2H}lBtSaN~J0`oib96mttIr|1lC<wkwWemrJsvq^L423X)AphA5B{
z8Eqs%lOO?**g2Serl)(R*Z1x{`Q!C$zz`cjCjxz|dfuDvo;Urz`#a~Jd(LUaKaLg0
z?>&0Xh>#SKf(SVv<^3a;Wq^DjB|_dg$%v3z`uaN_)*n1JY(&U7A?ci?#7V{p!AkFa
z$HMyK$464mkrt6az#x)CByq97c}Kze+*e1n6A~hl6Tv72BBT+?0_swK|Biw6r++h+
zb0TR4S_FvIlvfa_%e=;Q59`mL7)v=JRuUkwgi-=I1xl{qTGuVCFMM-65FsxjzLFRc
zF{m7h^wQ_vv9P{)V8S?&ya>tjU?`<10)fcYUHiI%^}oI~kr5%QKriE=@U)^J4o}{~
z^{)$9UphGHchwXCoTnU5E6O5Q=AW)hSbz1@WX1_uh0=1K7gFFUrOG1mmO=ek!}{`f
zr?hjF1PNAh)+#o=vJ;fZwfUbvmax9^%v90|1*H~Zrt>|yrxayzs4HLdt|M6cpPkMN
zWR%E?7!-I)UmG8FRj~H#J5U5Z3hV*y0g9!3ntHQMC$s>kfv14K*uQu8Q*Q^Pzy1ES
zc0x(y&6j=!p4O`Du91&g;rf?^^f2%%gKNvh^=nFOSe+-I@-a#w2<=E1nXYqgvc~D5
zDQdIL)4->%CA24gQ1L}5i->jtPC%Rxp9|tZz$itJ2+GaB=Hk~Ee_wKR%YV1sqjax-
zMX>hlJFpA*e7U!<>!uxp?C8%inDfa822azys1Q1+bu6QEA?Id8h9+vf`s!KQt<Gon
z@7?{YZxz%xeppEf6rBT+c|hmE5>z)l@RmdQ2Y}TDb#VRm!Qy*&tl`cz847_$5JD@2
zQTzcqPH0AsMkItlC~&;eW~A2Q#OuRU#w$+&Kf8bL?wP9r^>@$B<V7Sif8%ck%V^aj
zf_EX5YYR)S0BR#}aPY=W#gE*wj*o9GurBM7GGK@w38P4Oij+|#jKWh8hK}iaNXFCT
zk^uwT2Fa}|-UIx>)qwie^D{*tb4jPGRbKrAEmV4i=N`|m>o4BEwU?h>o5rYEeoDno
z!P5$@7Imq+&y7shn3|qtc%n+BGRw?Vjq;`eyj1d`J^Kzke7PU!;GwF1@`agRSf0{d
zX&9~2T3`BoZ;ON9v+uw|CX@dB_FK2|(2f%8(jLB!K}F6HSw-XoD?;RiXO4_==+q>K
z&rDIurwM$6>gGWN7@L~KOC^b#tr=j`rOffE7puDK$o&O#lSPwSYK964v{I$m%(&3Z
zu8kQg5j+v`0Cm26A2EHs+|r-H(=gMqq_m0?LBtodA{-g2@P%(5Lp+ZSgFQU>!S$@l
z1tg6|E3i(ehmKmua&oxB>!-$x)0MeHd-fgp)%|;Se`O_5-+8GTuXvy@6-O$CF-jHX
zTE+*0a)R%icp~^Bc;|~rEp_UWNE{lxWji0;R-j}cp&;jLf+eQ+SI?f{yRVJ&t{v;x
zF<546Il-!wA)ytDcqStUkw7zY49|s}sdg9|ukqUJ=V;6|zp#Jr?oTiM5YN0^^F=7T
zZfLORycgB<lhNb9V-uyF3WcD3K(SKxPA%S6d@9TzqRAt(HE;dbo|(Pppmiu~#gDA`
z&WUdwUUy~X%_d=~vOe0$X6VoPgibg$7t)tBIDw>z{nD47KE_Mus@(ij+qq*f&-PM4
z-q#ofkrizBCarU{Lr0_INNUBFauQLXQwdHUAAV@hz5~nyd-iY)>P`IT!mvSUXQTI?
zyOml@PANd^_<U*7YTn1jG~;tn$k`uI=sbPz{pE?Tf35O~-=8<T%T?%7SnqEoQWTON
zqxFb-Bf?Yh?4~@$|9N?cLqk<|?AprvHWk^D^C%|_Q<VlzgihoLtq?g!J90Ea$6Uu!
z>sV@SizEV)fybJy19ZaZp*{N!%>4R?@BH^7QWm*5C;%(-0AdnKLBfy7rN>c9XmxsN
zwo{9smO!I>p4jy%^pAcQCSLf^1FP)XuTDMqYgfJ9vE7+DUF$$-35+6g(5W~1&f#+m
z?%K{>8}h788+;Xq3}1TYBzNAhipUC~bwt(?b|0PYu{K?2B81*eYiTw^iW>)L)lWS9
zm(L#l&L{8Q`F((F3cr|Z7g9kdr&TBE#0wkkV0LUeF+Ec!v`*Ag0KR9LZal@q|NB3&
zwQnu|;Uj-UyOWBoQ!Oe>Ev)7Wa)TuLcaqJnrgHpyH}B4WdG9x?AKQ0Tup%e4tT0lK
zP}bsUg>}NA7fzE{yPBPAvaCvZgjQ&ZBW<7)TJGM_zYx*SF9K2b7&<s|c8agRG(uoB
ztwx)U?~_`$hLMwR{NX@v`)5`a&b@E8b^P8Ro;-BpiLs%QR?3KoZ0;MZ+`i?OBbi|9
zw?|)1Wan?(_Z*exLH0iSTikKi$9eML7x|5k$O0Uef;#U!N~|HB&XVovBbt2q{=0Iy
z6VF!v$(OGfRx1)}9ZMr}R2vaSDQ0U8CTcC#Zr#B8LO{m~t(L`4do&}V9Y)x$(YtQ-
zWd7j<WIm2SPzp-r49~qhME{mGy!*!Ny64aQ#be(+_IK-EeB(@dpnrgYz5xV<L-C`R
zp6~y!-*{}tPj9>7L!Z3;=Ts_aW1UZ>`EB+-`dhr`?w@1lyYAx2gI`?mP4gzm1?D&p
z%%?N_A_hlVw<&jyeR55(_1Sanjbm2^%R0`@g#?~vqGi!ak(!tyDizsKOrTH<)!LMN
zO+9oN6)VeioumLiJT}TiwMpb;!5qgbbt0z;U3>@Gq~V^`6AYdH9Dn?+@7=Kbz4!6U
z_dP(6NFk!IXhJbW&d`j6SB@S^{o)sYmtT7SVQw0{mA#KX!h7$2keheB2i*lTU76*?
z8@3xm36T}jsep1JO+K3<ol4*tjo1jPZy?6U4-C1vv)Rq5=RS3gjr*<y*3+qW>z-p%
zE$$r1(1;u(jgbCYooG!Ty=kAxX2eWA#LxI7J&RH-C~F?p4~~vve2+vjpdDFSk)tk#
zQg4oq6CCh~pHjT?>VIaaG0nrj@NZ~zI-D3DVyZUBT&sf<jdhw*v6ue7b=+{{U98)D
z8;^edPx)^L9_9Y~9%9#y_fT)tS)I!RkW2*h6mzkvyFWb7kWK~!frr+y4ZB7a&xSZ0
z+7C!3d<yLo_pkO&{^e-6Y3y=geWlcHJn~Yd#hrsWtUx^yOuJ1dnZ!4mGnFRVI;y_K
z*9s@l4lR*m!3-nou-c)QIQhs4nR0=dwq-}D&dY~?kI8732S4;Nj-5HlSY;;mgPn-T
zX{;y&pK!Xu$W)bVuEeHIJNV!OzrxJuNp@_!i9^R<r6-kPbD<1CHj|`ZmzFv7WzJoJ
zjUw`u!?@G{=Mvi)u6xY3=kVI&q|;OVaG9|7@7?|4o_z;SCz{QTPo1r?r6<KpWA!+=
zRnT$5+1ZeSQ6xQwA|iB#P81P!eU=F9+SbQpwL#>B$X7(x@#^Ub>frz>Kf<r?=jiC`
z{QO7%87~}tiK$wR%Iqw&jV9K`ii(`Zi9+dsLSZ$bGt9j70=NFeZEV`Glfx&EFg7_#
z|AuV~{%K;W%89dKJXzMoW|#~p7c=yfGGx<90y;#ueTH^n8(ytOVr+!DsVQbE=>@-g
zC7IIS+1{T0{EL+o*}xEW|GpUsP3xFwM1;P=*C1l(xaG<cgj;UtM~GKKEAiH+6<Wq4
z$L+<l{K;Sc8UOTwkMr7@6AVp^P^rxlg^qfCj&{4%4H6YzB8T$|jE;{{C_0MyGDnX7
zJ=4V=s?{lyp25><VWP5`By0LgaUe?U7JT0j_=Z$6z-Wy!8C>s;1VFi5!WfM)2G^-l
zsb3+i{d;$RVb8t;zi^YQ-}6RA$89D+wQXrzVJ>oXY@B_F1X@<;gv*uXh_@*7A%vB9
z6YlGX(`UcNrVSgZHRm`ve1@r+X=;@krDSI2{hM$5{>I+TuP1zy9iBP6>-(=ix8rQ(
zRMKPyQF=9DtBLV_W^2<VJ%g_mMyUlwWKv1`dJD_UZY6V^KiAq&DCDs=qFx(gVs`GT
za_~P}tW2HC^m)Z8KaFV3Tq|O{5s~mT6ZJ6mRZgf!ns#UjyW4aD9((dt&W=^F&ULpy
zj?w8k?*4F=mrwnOjhokVW^{<@nQ0o8Sw8Ttf6l+Y?_YfU__@`uwK`(8CVS`RxeveZ
zhOhkMZ~pb?ZoK`z2h`^N9UOiAF!k9P0;5S7O`tVeFTxs|nBny^?KnFUIjj|u37@{6
z9KGc%xl9t@Gb|5meG2(Jxm*tGX1UZp;sRLv_wJtAv+uyY{@B>TO>6s#Q8q)+YI0<%
zMLF$rrrO4e#7YY_VHgoPS%|GpjZ~<w?#C<UX<MNYIig6YhHZ`xy+-dqFB8*~OpZ_T
z^Y{KcUOc+<l_O_XA8~?lPKte{*3DzH`#<&TU;3jP@B5igtJ13NoH+R!)oO*5X9#o*
zDq##>w+;Z1&!yNf*t@WW7KFg_Fh-M3`52>7S}orWDM%)hq|=#r!u6FaYu?%4(i|Rp
z+!(W~;5iPBHF)sGGL0zCDum857di@|C0vX<=|qmPW`qtRS~lJhw5_8#?*J9dRIA*+
z?KTdN-O5b8{S6UGJ4bd^F&vy}KmN<V{n#Jga`$^aOg6uoXMXTBm5DKuz9HosQr`Sg
zlS(J(Up*L`VLFL6`8P4U<<UG#&b3hliGVP&m&~`m>C5}~?mi9NvS;6chu7HpBPW~r
z;`5^o`f>q7)ixccXlq3(j0n5RieXtMo0iCr;tWK0>(jC^tT2jbHkxeM@BmMKufhAb
z4t!IDTs~uS%KO&8{q09Td)LjkzK=@F^7P;S4N)j0eS;E%b_OE`gTcozK60FOs|Nr$
zb8do{j#Y3Dwya;phJhYZNq>13;=J>PjH~f**P?E?fA8+k?%8*s_!F(_BZtR*w)UoI
z+PGNZX+<%#be5zRJCS29v_zr90oFkzLNl}slm{6aK1bN;;I#+Hdfr!W-?V1JIT-An
zy?eMiwYeEuo_q0!bUG2zUE5kp5h_JpE3}G}kwz)BRvbR{BK^fOtI7p-?dZW6Lpte`
z2)qkHEm7Hdc|WXEZyi<_*nix!@4%j&+19S%n#KoaBf%)49a>&FIku2Wo|$V>4;-CH
z7FNZu+2QYBoaCXKAL8K4f5MKno0yo;vk%<7<-Y)Et^CLZc6<N3kAC)F{@Pr%+0aYw
zB;MqAWJ@8xD!Zh6ulrNeUtC2h*-QVb{3Xp!t-!>I;I1Ohy4d)1accZvzQ4aXok}u1
zIY%Rvq`GD;zwyND-Aywf85+jNh7PR5O;u6jQ;c|;=WDlf|NHL1%v5I!$^Or5DCcLL
z2%b^7vFXgw*~Zq9tiP3vx0nl`PtKhkefBrEZ~MRw&P%(@Cq}K)E1KF$W_MvmInKCT
zGgw`xf3F@LJ-Bh8ueg4FiBqS>s3y|{=@c#zV3opJhiQkni7BYg;n|4d>KvQ4tU<yK
z-+p#t_TB4O{nD)ieaD=DXH*)6Zgo_v(e_)5MTX@?h?!cm<D6N@dM-`KD_N4{dz19c
z#fB4z+@)b$QN3+`m7F^__W4YH?w&igtR_S=G(64J<OHpDh?CgUBm$4Zx*}`(OQbwS
zWn_X*qj~Jz8~Pskz>OP@i4&B<XsuG0F{xOQ1%-@^&oDGHO)}x3bc}AXS`(+Yt#xG6
zNqS0Y%J~eLbb#-BD^`_bcOlmn){<57-cS7glmF`M(bJCv34h(@zA`rr6cDAc&Y_ed
zFq&$u&gA$wwMKh*Z7KUd9=iATuev3rCeNrem(hP7Cnn<>rBYDLrLeY$(Q1jB7PnmU
zrt2Bqg|rxqUQAhux1;4~c(SdX@HG*h`0r01-g$Ox>Vt2D_O2xb7NwOk`BZRdOF8@8
z$9C^}ZoclfP~Fwa*IFf<yS!?Fb&JZ%Ws>Bx$*VTIm0($SZ5{m5QBVpa0-w2W=PM$-
zvZQ$FStmv3#4IgkT~JMqRdv}Ta<Z`ek51G$b8d>jUyRD7>*uU<anaNX*>sZLQif7K
zO(q@SdFIW{@a=##I^D@RA-PihNJLT&a+fkK6PF@=Cszt9R#qzMQ!1n}W**eyP0NxA
zN+x`g^NGKUd?+U%N|}U@ce!=LOOCNhClDda%CnObxGc4JMrE(Gn(QR@StuwMGV~NP
zS8aAHg%16t%;2_uY0Hw>?)<lT$4?Cz=bRQRzKHXkb-p<9oOPZ!Nr-d4I7uj_^z`s>
zX})AB2uhod(mGO}pHkW=QObgj;)jY9%5}3gOF<=-Qd+K%)`GH7OjKqWo2)JNR?Me|
zoM5fcQ_9d=&XVxG%bW<IkPbGLl2KxXPbE&2b)p(x6h?z$UCLRPan_}swHaq!O03H`
z=aO^_pvLnu?Rvvo4qj<xbW$4=DQ#NH=%zAWOKIIw=oZ>EjnXZYX$rc7LOi1~?kai|
z7JOFs1B8)XwhB67AwwEPjw_i95lDG@Q=r10B{wI6YKu~Ji>`#|(9=ebi&BBo+SkS<
z#2H^i0&(JtbAgEXp6BP3F*!tx#NVn?S}RW(lj~ONq?@9N04q)qu|7_mpbSL5LPws_
zfx-j|Wfj;soLs1&U1mjE(Z4EB|El~o>j`lJ9&9vGC(ey1-4vy2C^O+iPj#FgpKh4r
z-u5l)n?Q4=iyS|F&htG#XN*4>MbVrMqf`_{X>n2zCp}RoO4=w&iE|!Hx`P*Hb+JEP
zP|B*nH)zvQ+O)LNZKX|9p*vdXmeaZwIn{Bf=z=CPB_?vBFBU7kHCTcY$si7;R7aGW
zcFGL3B{)`V>l0@t_3>(h#zl=fmn(?YCLKjl1Eo4j>8ADriG7-lv~|95&KKuA=bRD2
zL!6$MnJDGrt^j4V@jPv`aaxC<I}R0!=ul7{CpvPXA}81-yBMAHqGF)JHAce0>6w{T
z|MQ6_-j*h{(Wz;+75hY#o)P08@8BPw?Rc+@*7V7d3X{&obAC}+i9|9dB2F8xAp+J)
z-U(GFQeB8^WPZ~tdVU`#OB%)E<y?v9>#~R_WXaZq#YQqYZyEBmOZwUsG%f>}J8t;N
zXX~wIPJ!P|g<fF0a^912!O4Zs3DBEfMNiL~W=p3><~ruo)SNjxTw%Nu5nWcda<v{M
z5#r9e_y+UNNouh}_<UGP0G$WRGdiu6N;`4g4!aAx?qt~pdZlhYaLz6CZMh{4xEJgE
z6LBlQ?pApJ74&B<jM+w{MJUK(t6=$RqkRR+yUfk<|L;S;NgHB;_&a-V2^4_u=@f5|
zU;cj&tKPC1P|2=ecuSxZC}UKL>trm0)ofb>WI^7tqUKelt`k+Qq^u%ft_3KiP~LT<
zs%5ZR9h(9YvFWL|{Eda{O;ro9I-%1FRlF98x?WYas4PWEpa*qrz60YKl~7z?sshlF
zbxB~&wE_j;Utt#X$4Ob6uI0C?e60edl)fHe{oerq111Z&v0Gfi00000NkvXXu0mjf
DEpD2w

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 6ccea790b0..a1f393c1b8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -340,6 +340,12 @@ public class Messages {
 	public static String StringModelFragment_Down;
 	public static String StringModelFragment_Remove;
 	public static String StringModelFragment_Elements;
+	public static String StringModelFragment_Find;
+
+	public static String FeatureSelectionDialog_Filter;
+	public static String FeatureSelectionDialog_ShellTitle;
+	public static String FeatureSelectionDialog_DialogTitle;
+	public static String FeatureSelectionDialog_DialogMessage;
 
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 10a35c0bc4..65a125e299 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -335,3 +335,9 @@ StringModelFragment_Up=Up
 StringModelFragment_Down=Down
 StringModelFragment_Remove=Remove
 StringModelFragment_Elements=Elements
+StringModelFragment_Find=Find ...
+
+FeatureSelectionDialog_Filter=Filter
+FeatureSelectionDialog_ShellTitle=Find Featurename
+FeatureSelectionDialog_DialogTitle=Featurename
+FeatureSelectionDialog_DialogMessage=Find the name of the feature you want to contribute to
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index ca11efa5ad..a141bb10c4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -67,7 +67,7 @@ public ModelFragmentsEditor(EditingDomain editingDomain, ModelEditor editor) {
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ModelFragments.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelFragments.png")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 95ad8e81a5..080cb16451 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -1,5 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FeatureSelectionDialog;
+
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 
 import org.eclipse.emf.ecore.EPackage;
@@ -10,12 +24,9 @@
 
 import org.eclipse.emf.ecore.EClassifier;
 
-import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
-
 import org.eclipse.e4.ui.model.fragment.MModelFragment;
 
 import java.util.List;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -87,7 +98,7 @@ public StringModelFragment(EditingDomain editingDomain, ModelEditor editor) {
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/StringModelFragment.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/StringModelFragment.png")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -141,11 +152,31 @@ private Composite createForm(Composite parent) {
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.StringModelFragment_Featurename);
 
-			Text t = new Text(parent, SWT.BORDER);
+			Composite comp = new Composite(parent, SWT.NONE);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
+			comp.setLayoutData(gd);
+			GridLayout gl = new GridLayout(2,false);
+			gl.marginWidth=gl.marginHeight=0;
+			gl.verticalSpacing=0;
+			gl.marginLeft=gl.marginBottom=gl.marginRight=gl.marginTop=0;
+			comp.setLayout(gl);
+			
+			Text t = new Text(comp, SWT.BORDER);
+			gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME).observeDetail(getMaster()));
+			
+			final Button button = new Button(comp, SWT.PUSH | SWT.FLAT);
+			button.setText(Messages.StringModelFragment_Find);
+			button.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					FeatureSelectionDialog dialog = new FeatureSelectionDialog(button.getShell(),getEditingDomain(),(MStringModelFragment) getMaster().getValue());
+					dialog.open();
+				}
+			});
+			
 		}
 
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
new file mode 100644
index 0000000000..0b4908554f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -0,0 +1,441 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import java.text.BreakIterator;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.StringMatcher;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
+import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
+import org.eclipse.e4.ui.model.internal.ModelUtils;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.graphics.Image;
+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;
+
+@SuppressWarnings("restriction")
+public class FeatureSelectionDialog extends TitleAreaDialog {
+	private TreeViewer viewer;
+	private MStringModelFragment fragment;
+	private EditingDomain editingDomain;
+	
+	public FeatureSelectionDialog(Shell parentShell, EditingDomain editingDomain, MStringModelFragment fragment) {
+		super(parentShell);
+		this.fragment = fragment;
+		this.editingDomain = editingDomain;
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		getShell().setText(Messages.FeatureSelectionDialog_ShellTitle);
+		setTitle(Messages.FeatureSelectionDialog_DialogTitle);
+		setMessage(Messages.FeatureSelectionDialog_DialogMessage);
+		
+		
+		Composite composite = (Composite) super.createDialogArea(parent);
+		
+		final Image packageImage = new Image(getShell().getDisplay(),getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/EPackage.gif")); //$NON-NLS-1$
+		final Image classImage = new Image(getShell().getDisplay(),getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/class_obj.gif")); //$NON-NLS-1$
+		final Image featureImage = new Image(getShell().getDisplay(),getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/field_public_obj.gif")); //$NON-NLS-1$
+		final Image newTitleImage = new Image(getShell().getDisplay(),getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/fieldrefact_wiz.png")); //$NON-NLS-1$
+
+		setTitleImage(newTitleImage);
+		
+		composite.addDisposeListener(new DisposeListener() {
+			
+			public void widgetDisposed(DisposeEvent e) {
+				packageImage.dispose();
+				classImage.dispose();
+				featureImage.dispose();
+				newTitleImage.dispose();
+			}
+		});
+		
+		
+		Composite container = new Composite(composite, SWT.NONE);
+		container.setLayoutData(new GridData(GridData.FILL_BOTH));
+		container.setLayout(new GridLayout(2, false));
+
+		Label l = new Label(container, SWT.NONE);
+		l.setText(Messages.FeatureSelectionDialog_Filter);
+
+		final Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		
+		new Label(container, SWT.NONE);
+		viewer = new TreeViewer(container);
+		GridData gd = new GridData(GridData.FILL_BOTH);
+		gd.heightHint=200;
+		viewer.getControl().setLayoutData(gd);
+		viewer.setContentProvider(new ContentProviderImpl());
+		viewer.setLabelProvider(new LabelProviderImpl(packageImage,classImage,featureImage));
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+			
+			public void doubleClick(DoubleClickEvent event) {
+				okPressed();
+			}
+		});
+		viewer.setComparator(new ViewerComparator() {
+			@Override
+			public int compare(Viewer viewer, Object e1, Object e2) {
+				if( e1.getClass() == InternalPackage.class ) {
+					return ((InternalPackage)e1).ePackage.getNsURI().compareTo(((InternalPackage)e2).ePackage.getNsURI());
+				} else if( e1.getClass() == InternalClass.class ) {
+					return ((InternalClass)e1).eClass.getName().compareTo(((InternalClass)e2).eClass.getName());
+				} else if( e1.getClass() == InternalFeature.class ) {
+					return ((InternalFeature)e1).feature.getName().compareTo(((InternalFeature)e2).feature.getName());
+				}
+				return super.compare(viewer, e1, e2);
+			}
+		});
+		
+		final ViewerFilterImpl filter = new ViewerFilterImpl();
+		
+		viewer.addFilter(filter);
+		searchText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				filter.setPattern(searchText.getText());
+				viewer.refresh();
+			}
+		});
+
+		
+		viewer.setInput(loadPackages());
+		
+		return composite;
+	}
+	
+	@Override
+	protected void okPressed() {
+		IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
+		if( ! sel.isEmpty() && sel.getFirstElement().getClass() == InternalFeature.class ) {
+			InternalFeature f = (InternalFeature) sel.getFirstElement();
+			Command cmd = SetCommand.create(editingDomain, fragment, FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME, f.feature.getName());
+			
+			if( cmd.canExecute() ) {
+				editingDomain.getCommandStack().execute(cmd);
+				super.okPressed();	
+			}
+		}
+	}
+	
+	private static List<InternalPackage> loadPackages() {
+		List<InternalPackage> packs = new ArrayList<InternalPackage>();
+		
+		for( Entry<String, Object> regEntry : EPackage.Registry.INSTANCE.entrySet() ) {
+			if( regEntry.getValue() instanceof EPackage ) {
+				EPackage ePackage = (EPackage) regEntry.getValue();
+				InternalPackage iePackage = new InternalPackage(ePackage);
+				boolean found = false;
+				for( EClassifier cl : ePackage.getEClassifiers() ) {
+					if( cl instanceof EClass ) {
+						EClass eClass = (EClass) cl;
+						if( eClass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT) ) {
+							if( ! eClass.isInterface() && ! eClass.isAbstract() ) {
+								found = true;
+								InternalClass ieClass = new InternalClass(iePackage, eClass);
+								iePackage.classes.add(ieClass);
+								for( EReference f : eClass.getEAllReferences() ) {
+									ieClass.features.add(new InternalFeature(ieClass, f));
+								}
+							}
+						}
+					}
+				}
+				if( found ) {
+					packs.add(iePackage);
+				}
+			}
+		}
+		
+		return packs;
+	}
+	
+	static class ContentProviderImpl implements ITreeContentProvider {
+
+		public void dispose() {
+			
+		}
+
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+			
+		}
+
+		public Object[] getElements(Object inputElement) {
+			return ((List<?>)inputElement).toArray();
+		}
+
+		public Object[] getChildren(Object parentElement) {
+			if( parentElement.getClass() == InternalPackage.class ) {
+				return ((InternalPackage)parentElement).classes.toArray();
+			} else if( parentElement.getClass() == InternalClass.class ) {
+				return ((InternalClass)parentElement).features.toArray();
+			}
+			return new Object[0];
+		}
+
+		public Object getParent(Object element) {
+			if( element.getClass() == InternalFeature.class ) {
+				return ((InternalFeature)element).clazz;
+			} else if( element.getClass() == InternalClass.class ) {
+				return ((InternalClass)element).pack;
+			}
+			return null;
+		}
+
+		public boolean hasChildren(Object element) {
+			return getChildren(element).length > 0;
+		}
+		
+	}
+	
+	static class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
+		private final Image packageImage;
+		private final Image classImage;
+		private final Image featureImage;
+		
+		public LabelProviderImpl(Image packageImage, Image classImage, Image featureImage) {
+			this.packageImage = packageImage;
+			this.classImage = classImage;
+			this.featureImage = featureImage;
+		}
+		
+		public void update(final ViewerCell cell) {
+			if( cell.getElement().getClass() == InternalPackage.class ) {
+				InternalPackage o = (InternalPackage) cell.getElement();
+				StyledString styledString =  new StyledString(o.ePackage.getName());
+				styledString.append( " - " + o.ePackage.getNsURI(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+				cell.setText(styledString.getString());
+				cell.setStyleRanges(styledString.getStyleRanges());
+				cell.setImage(packageImage);
+			} else if( cell.getElement().getClass() == InternalClass.class ) {
+				InternalClass o = (InternalClass) cell.getElement();
+				cell.setText(o.eClass.getName());
+				cell.setImage(classImage);
+			} else {
+				InternalFeature o = (InternalFeature) cell.getElement();
+				StyledString styledString =  new StyledString(o.feature.getName());
+				
+				EClassifier type = ModelUtils.getTypeArgument(o.clazz.eClass, o.feature.getEGenericType());
+				if( o.feature.isMany() ) {
+					styledString.append(" : List<" + type.getName()+ ">", StyledString.DECORATIONS_STYLER); //$NON-NLS-1$ //$NON-NLS-2$
+				} else {
+					styledString.append(" : " + type.getName(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+				}
+				
+				cell.setText(styledString.getString());
+				cell.setStyleRanges(styledString.getStyleRanges());
+				cell.setImage(featureImage);
+			}
+		}
+
+		public Image getImage(Object element) {
+			return null;
+		}
+
+		public String getText(Object element) {
+			if( element.getClass() == InternalPackage.class ) {
+				InternalPackage o = (InternalPackage) element;
+				return o.ePackage.getName();
+			} else if( element.getClass() == InternalClass.class ) {
+				InternalClass o = (InternalClass) element;
+				return o.eClass.getName();
+			} else {
+				InternalFeature o = (InternalFeature) element;
+				return o.feature.getName();
+			}
+		}
+	}
+	
+	static class ViewerFilterImpl extends ViewerFilter {
+		private StringMatcher matcher;
+		
+		@Override
+		public boolean select(Viewer viewer, Object parentElement, Object element) {
+			
+			if( element.getClass() == InternalPackage.class ) {
+				ILabelProvider pv = (ILabelProvider) ((StructuredViewer)viewer).getLabelProvider(); 
+				for( InternalClass c : ((InternalPackage)element).classes ) {
+					if( match(pv.getText(c)) ) {
+						return true;
+					}
+				}
+				return false;
+			} else if( element.getClass() == InternalPackage.class ) {
+				ILabelProvider pv = (ILabelProvider) ((StructuredViewer)viewer).getLabelProvider(); 
+				return match(pv.getText(element));				
+			}
+			
+			return true;
+		}
+		
+		protected boolean wordMatches(String text) {
+			if (text == null) {
+				return false;
+			}
+			
+			//If the whole text matches we are all set
+			if(match(text)) {
+				return true;
+			}
+			
+			// Otherwise check if any of the words of the text matches
+			String[] words = getWords(text);
+			for (int i = 0; i < words.length; i++) {
+				String word = words[i];
+				if (match(word)) {
+					return true;
+				}
+			}
+
+			return false;
+		}
+		
+		/**
+	     * Answers whether the given String matches the pattern.
+	     * 
+	     * @param string the String to test
+	     * 
+	     * @return whether the string matches the pattern
+	     */
+	    private boolean match(String string) {
+	    	if (matcher == null) {
+				return true;
+			}
+	        return matcher.match(string);
+	    }
+	    
+	    /**
+	     * The pattern string for which this filter should select 
+	     * elements in the viewer.
+	     * 
+	     * @param patternString
+	     */
+	    public void setPattern(String patternString) {
+	    	
+	        if (patternString == null || patternString.equals("")) { //$NON-NLS-1$
+				matcher = null;
+			} else {
+				String pattern = patternString + "*"; //$NON-NLS-1$
+//				if (includeLeadingWildcard) {
+//					pattern = "*" + pattern; //$NON-NLS-1$
+//				}
+				matcher = new StringMatcher(pattern, true, false);
+			}
+	    }
+	    
+	    /**
+	     * Take the given filter text and break it down into words using a 
+	     * BreakIterator.  
+	     * 
+	     * @param text
+	     * @return an array of words
+	     */
+	    private String[] getWords(String text){
+	    	List<String> words = new ArrayList<String>();
+			// Break the text up into words, separating based on whitespace and
+			// common punctuation.
+			// Previously used String.split(..., "\\W"), where "\W" is a regular
+			// expression (see the Javadoc for class Pattern).
+			// Need to avoid both String.split and regular expressions, in order to
+			// compile against JCL Foundation (bug 80053).
+			// Also need to do this in an NL-sensitive way. The use of BreakIterator
+			// was suggested in bug 90579.
+			BreakIterator iter = BreakIterator.getWordInstance();
+			iter.setText(text);
+			int i = iter.first();
+			while (i != java.text.BreakIterator.DONE && i < text.length()) {
+				int j = iter.following(i);
+				if (j == java.text.BreakIterator.DONE) {
+					j = text.length();
+				}
+				// match the word
+				if (Character.isLetterOrDigit(text.charAt(i))) {
+					String word = text.substring(i, j);
+					words.add(word);
+				}
+				i = j;
+			}
+			return (String[]) words.toArray(new String[words.size()]);
+	    }
+	}
+	
+	static class InternalPackage {
+		final EPackage ePackage;
+		List<InternalClass> classes = new ArrayList<InternalClass>();
+		
+		public InternalPackage(EPackage ePackage) {
+			this.ePackage = ePackage;
+		}
+		
+		@Override
+		public String toString() {
+			return ePackage.toString();
+		}
+	}
+	
+	static class InternalClass {
+		final InternalPackage pack;
+		final EClass eClass;
+		List<InternalFeature> features = new ArrayList<InternalFeature>();
+		
+		public InternalClass(InternalPackage pack, EClass eClass) {
+			this.eClass = eClass;
+			this.pack = pack;
+		}
+	}
+	
+	static class InternalFeature {
+		final InternalClass clazz;
+		final EStructuralFeature feature;
+		
+		public InternalFeature(InternalClass clazz, EStructuralFeature feature) {
+			this.clazz = clazz;
+			this.feature = feature;
+		}
+		
+	}
+}

From 56804140f0619951101a18f5945d29ba33b990f3 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 15 Jun 2010 16:46:26 +0000
Subject: [PATCH 0141/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling

---
 .../META-INF/MANIFEST.MF                      |   3 +-
 .../internal/ContextServiceFactory.java       |   9 +-
 .../ReflectionContributionFactory.java        | 260 ++++++++++++++++++
 .../compat/internal/WorkbenchLogger.java      | 143 ++++++++++
 4 files changed, 411 insertions(+), 4 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 518b39dbc4..4225c5064e 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0",
  org.eclipse.e4.tools.services;bundle-version="1.0.0",
  org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
- org.eclipse.e4.ui.di;bundle-version="0.9.0"
+ org.eclipse.e4.ui.di;bundle-version="0.9.0",
+ javax.inject;bundle-version="1.0.0"
 Service-Component: OSGI-INF/selectionproviderfunction.xml
 Export-Package: org.eclipse.e4.tools.compat.parts
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index 7e557ec867..e6d3ef7682 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -10,8 +10,11 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.internal;
 
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.EclipseContextFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.services.contributions.IContributionFactory;
+import org.eclipse.e4.core.services.log.Logger;
 import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
 import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
 import org.eclipse.e4.ui.services.IServiceConstants;
@@ -61,9 +64,9 @@ public Object create(@SuppressWarnings("rawtypes") Class serviceInterface, IServ
 			IEclipseContext serviceContext = EclipseContextFactory.getServiceContext(bundleContext);
 
 			final IEclipseContext appContext = serviceContext.createChild("WorkbenchContext"); //$NON-NLS-1$
-//			IExtensionRegistry registry = RegistryFactory.getRegistry();
-//			ReflectionContributionFactory contributionFactory = new ReflectionContributionFactory(registry);
-//			appContext.set(IContributionFactory.class.getName(),contributionFactory);
+			appContext.set(Logger.class, new WorkbenchLogger());
+			IContributionFactory contributionFactory = ContextInjectionFactory.make(ReflectionContributionFactory.class, appContext);
+			appContext.set(IContributionFactory.class.getName(),contributionFactory);
 			
 			IThemeManager manager = serviceContext.get(IThemeManager.class);
 			final IThemeEngine engine = manager.getEngineForDisplay(Display.getCurrent());
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
new file mode 100644
index 0000000000..1dce9b056a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
@@ -0,0 +1,260 @@
+package org.eclipse.e4.tools.compat.internal;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.InvalidRegistryObjectException;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.InjectionException;
+import org.eclipse.e4.core.services.contributions.IContributionFactory;
+import org.eclipse.e4.core.services.contributions.IContributionFactorySpi;
+import org.eclipse.e4.core.services.log.Logger;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.packageadmin.PackageAdmin;
+
+/**
+ * Create the contribution factory.
+ */
+public class ReflectionContributionFactory implements IContributionFactory {
+
+	private IExtensionRegistry registry;
+	private Map<String, Object> languages;
+	
+	@Inject
+	private PackageAdmin packageAdmin;
+	
+	@Inject
+	private Logger logger;
+
+	/**
+	 * Create a reflection factory.
+	 * 
+	 * @param registry
+	 *            to read languages.
+	 */
+	@Inject
+	public ReflectionContributionFactory(IExtensionRegistry registry) {
+		this.registry = registry;
+		processLanguages();
+	}
+
+	public Object call(Object object, String uriString, String methodName, IEclipseContext context,
+			Object defaultValue) {
+		if (uriString != null) {
+			URI uri = new URI(uriString);
+			if (uri.segments.length > 3) {
+				String prefix = uri.segments[2];
+				IContributionFactorySpi factory = (IContributionFactorySpi) languages.get(prefix);
+				return factory.call(object, methodName, context, defaultValue);
+			}
+		}
+
+		Method targetMethod = null;
+
+		Method[] methods = object.getClass().getMethods();
+
+		// Optimization: if there's only one method, use it.
+		if (methods.length == 1) {
+			targetMethod = methods[0];
+		} else {
+			ArrayList<Method> toSort = new ArrayList<Method>();
+
+			for (int i = 0; i < methods.length; i++) {
+				Method method = methods[i];
+
+				// Filter out non-public constructors
+				if ((method.getModifiers() & Modifier.PUBLIC) != 0
+						&& method.getName().equals(methodName)) {
+					toSort.add(method);
+				}
+			}
+
+			// Sort the methods by descending number of method
+			// arguments
+			Collections.sort(toSort, new Comparator<Method>() {
+				/*
+				 * (non-Javadoc)
+				 * 
+				 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+				 */
+				public int compare(Method m1, Method m2) {
+					int l1 = m1.getParameterTypes().length;
+					int l2 = m2.getParameterTypes().length;
+
+					return l1 - l2;
+				}
+			});
+
+			// Find the first satisfiable method
+			for (Iterator<Method> iter = toSort.iterator(); iter.hasNext() && targetMethod == null;) {
+				Method next = iter.next();
+
+				boolean satisfiable = true;
+
+				Class<?>[] params = next.getParameterTypes();
+				for (int i = 0; i < params.length && satisfiable; i++) {
+					Class<?> clazz = params[i];
+
+					if (!context.containsKey(clazz.getName())
+							&& !IEclipseContext.class.equals(clazz)) {
+						satisfiable = false;
+					}
+				}
+
+				if (satisfiable) {
+					targetMethod = next;
+				}
+			}
+		}
+
+		if (targetMethod == null) {
+			if (defaultValue != null) {
+				return defaultValue;
+			}
+			throw new RuntimeException(
+					"could not find satisfiable method " + methodName + " in class " + object.getClass()); //$NON-NLS-1$//$NON-NLS-2$
+		}
+
+		Class<?>[] paramKeys = targetMethod.getParameterTypes();
+
+		try {
+			logger.debug("calling: " + methodName);
+			Object[] params = new Object[paramKeys.length];
+			for (int i = 0; i < params.length; i++) {
+				if (IEclipseContext.class.equals(paramKeys[i])) {
+					params[i] = context;
+				} else {
+					params[i] = context.get(paramKeys[i].getName());
+				}
+			}
+
+			return targetMethod.invoke(object, params);
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException(e);
+		}
+	}
+
+	public Object create(String uriString, IEclipseContext context) {
+		if (uriString == null) {
+			return null;
+		}
+		URI uri = new URI(uriString);
+		Bundle bundle = getBundle(uri);
+		Object contribution;
+		if (bundle != null) {
+			contribution = createFromBundle(bundle, context, uri);
+		} else {
+			contribution = null;
+			logger.error("Unable to retrive the bundle from the URI: "+ uriString);
+		}
+		return contribution;
+	}
+
+	protected Object createFromBundle(Bundle bundle, IEclipseContext context, URI uri) {
+		Object contribution;
+		if (uri.segments.length > 3) {
+			String prefix = uri.segments[2];
+			IContributionFactorySpi factory = (IContributionFactorySpi) languages.get(prefix);
+			StringBuffer resource = new StringBuffer(uri.segments[3]);
+			for (int i = 4; i < uri.segments.length; i++) {
+				resource.append('/');
+				resource.append(uri.segments[i]);
+			}
+			contribution = factory.create(bundle, resource.toString(), context);
+		} else {
+			String clazz = uri.segments[2];
+			try {
+				Class<?> targetClass = bundle.loadClass(clazz);
+				contribution = ContextInjectionFactory.make(targetClass, context);
+				if (contribution == null) {
+					String message = "Unable to load class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
+							+ bundle.getBundleId() + "'"; //$NON-NLS-1$
+					logger.error(message);
+				}
+			} catch (ClassNotFoundException e) {
+				contribution = null;
+				String message = "Unable to load class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
+						+ bundle.getBundleId() + "'"; //$NON-NLS-1$
+				logger.error(message);
+			} catch (InjectionException e) {
+				contribution = null;
+				String message = "Unable to create class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
+						+ bundle.getBundleId() + "'"; //$NON-NLS-1$
+				logger.error(message);
+			}
+		}
+		return contribution;
+	}
+
+	protected void processLanguages() {
+		languages = new HashMap<String, Object>();
+		String extId = "org.eclipse.e4.languages"; //$NON-NLS-1$
+		IConfigurationElement[] languageElements = registry.getConfigurationElementsFor(extId);
+		for (int i = 0; i < languageElements.length; i++) {
+			IConfigurationElement languageElement = languageElements[i];
+			try {
+				languages.put(languageElement.getAttribute("name"), //$NON-NLS-1$
+						languageElement.createExecutableExtension("contributionFactory")); //$NON-NLS-1$
+			} catch (InvalidRegistryObjectException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (CoreException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+	}
+
+	protected Bundle getBundle(URI platformURI) {
+		return getBundleForName(platformURI.segments[1]);
+	}
+
+	public Bundle getBundle(String uriString) {
+		return getBundle(new URI(uriString));
+	}
+	
+	public Bundle getBundleForName(String bundlename) {
+		if( packageAdmin == null ) {
+			Bundle bundle =  FrameworkUtil.getBundle(getClass());
+			BundleContext context = bundle.getBundleContext();
+			ServiceReference reference = context.getServiceReference(PackageAdmin.class.getName());
+			packageAdmin = (PackageAdmin) context.getService(reference);			
+		}
+		
+		Bundle[] bundles = packageAdmin.getBundles(bundlename, null);
+		if (bundles == null)
+			return null;
+		// Return the first bundle that is not installed or uninstalled
+		for (int i = 0; i < bundles.length; i++) {
+			if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
+				return bundles[i];
+			}
+		}
+		return null;
+	}
+
+	static class URI {
+		String[] segments;
+		String uri;
+		
+		private URI(String uriString) {
+			segments = uriString.substring(uriString.indexOf('/')+1).split("/");
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
new file mode 100644
index 0000000000..d5e64d8a36
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
@@ -0,0 +1,143 @@
+package org.eclipse.e4.tools.compat.internal;
+
+import java.util.ArrayList;
+import javax.inject.Inject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.e4.core.services.log.Logger;
+import org.eclipse.osgi.framework.log.FrameworkLog;
+import org.eclipse.osgi.framework.log.FrameworkLogEntry;
+import org.eclipse.osgi.service.debug.DebugOptions;
+import org.eclipse.osgi.service.debug.DebugTrace;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
+
+/**
+ * The workbench implementation of the logger service.
+ */
+public final class WorkbenchLogger extends Logger {
+	protected DebugTrace trace;
+	protected FrameworkLog log;
+	private Bundle bundle = FrameworkUtil.getBundle(WorkbenchLogger.class);
+
+	/**
+	 * Creates a new workbench logger
+	 */
+	public WorkbenchLogger() {
+		super();
+	}
+
+	public void debug(Throwable t) {
+		debug(t, null);
+	}
+
+	public void debug(Throwable t, String message) {
+		trace(t, message);
+	}
+
+	public void error(Throwable t, String message) {
+		log(new Status(IStatus.ERROR, bundle.getSymbolicName(),
+				message, t));
+	}
+
+	/**
+	 * Copied from PlatformLogWriter in core runtime.
+	 */
+	private static FrameworkLogEntry getLog(IStatus status) {
+		Throwable t = status.getException();
+		ArrayList childlist = new ArrayList();
+
+		int stackCode = t instanceof CoreException ? 1 : 0;
+		// ensure a substatus inside a CoreException is properly logged
+		if (stackCode == 1) {
+			IStatus coreStatus = ((CoreException) t).getStatus();
+			if (coreStatus != null) {
+				childlist.add(getLog(coreStatus));
+			}
+		}
+
+		if (status.isMultiStatus()) {
+			IStatus[] children = status.getChildren();
+			for (int i = 0; i < children.length; i++) {
+				childlist.add(getLog(children[i]));
+			}
+		}
+
+		FrameworkLogEntry[] children = (FrameworkLogEntry[]) (childlist.size() == 0 ? null
+				: childlist.toArray(new FrameworkLogEntry[childlist.size()]));
+
+		return new FrameworkLogEntry(status.getPlugin(), status.getSeverity(), status.getCode(),
+				status.getMessage(), stackCode, t, children);
+	}
+
+	public void info(Throwable t, String message) {
+		log(new Status(IStatus.INFO, bundle.getSymbolicName(), message,
+				t));
+	}
+
+	public boolean isDebugEnabled() {
+		return false;
+	}
+
+	public boolean isErrorEnabled() {
+		return true;
+	}
+
+	public boolean isInfoEnabled() {
+		return true;
+	}
+
+	public boolean isTraceEnabled() {
+		return false;
+	}
+
+	public boolean isWarnEnabled() {
+		return true;
+	}
+
+	private void log(IStatus status) {
+		if (log != null) {
+			log.log(getLog(status));
+		} else {
+			System.out.println(status.getMessage());
+			if (status.getException() != null)
+				status.getException().printStackTrace();
+		}
+	}
+
+	/**
+	 * Sets the debug options service for this logger.
+	 * 
+	 * @param options
+	 *            The debug options to be used by this logger
+	 */
+	@Inject
+	public void setDebugOptions(DebugOptions options) {
+		if (options != null) {
+			this.trace = options.newDebugTrace(bundle.getSymbolicName(), WorkbenchLogger.class);
+		}
+	}
+
+	/**
+	 * @param log
+	 */
+	@Inject
+	public void setFrameworkLog(FrameworkLog log) {
+		this.log = log;
+	}
+
+	public void trace(Throwable t, String message) {
+		if (trace != null) {
+			trace.trace(null, message, t);
+		} else {
+			System.out.println(message);
+			t.printStackTrace();
+		}
+	}
+
+	public void warn(Throwable t, String message) {
+		log(new Status(IStatus.WARNING, bundle.getSymbolicName(),
+				message, t));
+	}
+}
\ No newline at end of file

From f22b6a1039c7ab1818fd51d51d33f829d72ce8b5 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 15 Jun 2010 17:40:27 +0000
Subject: [PATCH 0142/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling

---
 .../common/component/StringModelFragment.java    | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 080cb16451..e6c929a377 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -10,6 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.jface.viewers.Viewer;
+
+import org.eclipse.jface.viewers.ViewerComparator;
+
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
 
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FeatureSelectionDialog;
@@ -279,13 +283,21 @@ public String getText(Object element) {
 					return eclass.label;
 				}
 			});
+			childrenDropDown.setComparator(new ViewerComparator() {
+				@Override
+				public int compare(Viewer viewer, Object e1, Object e2) {
+					FeatureClass eClass1 = (FeatureClass) e1;
+					FeatureClass eClass2 = (FeatureClass) e2;
+					return eClass1.label.compareTo(eClass2.label);
+				}
+			});
 
 			List<FeatureClass> list = new ArrayList<FeatureClass>();
 			addClasses(ApplicationPackageImpl.eINSTANCE, list);
 			list.addAll(editor.getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
-
+			
 			childrenDropDown.setInput(list);
-			childrenDropDown.setSelection(new StructuredSelection(list.get(0)));
+			childrenDropDown.getCombo().select(0);
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));

From ef9ed07e7bb254100706313e5d21ff15632e01ce Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 15 Jun 2010 21:08:11 +0000
Subject: [PATCH 0143/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling


From f70086c51800828eb8950d465ce454425c972b7c Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 16 Jun 2010 13:05:38 +0000
Subject: [PATCH 0144/1286]  Bug 315098 -  Support open-ended set of structural
 features in model components  * removing old system

---
 .../emf/ui/internal/common/ModelEditor.java   |  15 +-
 .../component/ModelComponentEditor.java       | 279 ------------------
 .../component/ModelComponentsEditor.java      | 226 --------------
 .../AbstractCommandSelectionDialog.java       |   2 -
 .../virtual/VModelComponentBindingEditor.java | 247 ----------------
 .../virtual/VModelComponentUIEditor.java      | 258 ----------------
 6 files changed, 3 insertions(+), 1024 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentUIEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 09e4fda2b5..661158062f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -71,8 +71,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.KeyBindingEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuSeparatorEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.ModelComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.ModelComponentsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PartDescriptorEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PartEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PartSashContainerEditor;
@@ -91,8 +89,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VCommandEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelComponentBindingEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelComponentUIEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartDescriptor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowControlEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowEditor;
@@ -135,15 +131,15 @@ public class ModelEditor {
 	private static final String CSS_CLASS_KEY = "org.eclipse.e4.ui.css.CssClassName"; //$NON-NLS-1$
 
 	public static final String VIRTUAL_PART_MENU = ModelEditor.class.getName() + ".VIRTUAL_PART_MENU"; //$NON-NLS-1$
-	public static final String VIRTUAL_MODEL_COMPONENT_CHILDREN = ModelEditor.class.getName() + ".VIRTUAL_MODEL_COMPONENT_CHILDREN"; //$NON-NLS-1$
+//	public static final String VIRTUAL_MODEL_COMPONENT_CHILDREN = ModelEditor.class.getName() + ".VIRTUAL_MODEL_COMPONENT_CHILDREN"; //$NON-NLS-1$
 	public static final String VIRTUAL_HANDLER = ModelEditor.class.getName() + ".VIRTUAL_HANDLER"; //$NON-NLS-1$
 	public static final String VIRTUAL_BINDING_TABLE = ModelEditor.class.getName() + ".VIRTUAL_BINDING_TABLE"; //$NON-NLS-1$
 	public static final String VIRTUAL_COMMAND = ModelEditor.class.getName() + ".VIRTUAL_COMMAND"; //$NON-NLS-1$
 	public static final String VIRTUAL_WINDOWS = ModelEditor.class.getName() + ".VIRTUAL_WINDOWS"; //$NON-NLS-1$
 	public static final String VIRTUAL_WINDOW_CONTROLS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_CONTROLS"; //$NON-NLS-1$
 	public static final String VIRTUAL_PART_DESCRIPTORS = ModelEditor.class.getName() + ".VIRTUAL_PART_DESCRIPTORS"; //$NON-NLS-1$
-	public static final String VIRTUAL_MODEL_COMP_COMMANDS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_COMP_COMMANDS"; //$NON-NLS-1$
-	public static final String VIRTUAL_MODEL_COMP_BINDINGS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_COMP_BINDINGS"; //$NON-NLS-1$
+//	public static final String VIRTUAL_MODEL_COMP_COMMANDS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_COMP_COMMANDS"; //$NON-NLS-1$
+//	public static final String VIRTUAL_MODEL_COMP_BINDINGS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_COMP_BINDINGS"; //$NON-NLS-1$
 	public static final String VIRTUAL_PARTDESCRIPTOR_MENU = ModelEditor.class.getName() + ".VIRTUAL_PARTDESCRIPTOR_MENU"; //$NON-NLS-1$
 	public static final String VIRTUAL_TRIMMED_WINDOW_TRIMS = ModelEditor.class.getName() + ".VIRTUAL_TRIMMED_WINDOW_TRIMS"; //$NON-NLS-1$
 	public static final String VIRTUAL_ADDONS = ModelEditor.class.getName() + ".VIRTUAL_ADDONS"; //$NON-NLS-1$
@@ -421,12 +417,9 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_WINDOWS, new VWindowEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_WINDOW_CONTROLS, new VWindowControlEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_PART_DESCRIPTORS, new VPartDescriptor(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_MODEL_COMP_COMMANDS, new VCommandEditor(modelProvider.getEditingDomain(), this, ApplicationPackageImpl.Literals.MODEL_COMPONENT__COMMANDS));
-		registerVirtualEditor(VIRTUAL_MODEL_COMP_BINDINGS, new VModelComponentBindingEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_PARTDESCRIPTOR_MENU, new VMenuEditor(modelProvider.getEditingDomain(), this, org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS));
 		registerVirtualEditor(VIRTUAL_TRIMMED_WINDOW_TRIMS, new VWindowTrimEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_ADDONS, new VApplicationAddons(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_MODEL_COMPONENT_CHILDREN, new VModelComponentUIEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_MENU_CONTRIBUTIONS, new VMenuContributionsEditor(modelProvider.getEditingDomain(), this));
 	}
 
@@ -462,8 +455,6 @@ private void registerContributedEditors() {
 
 	private void registerDefaultEditors() {
 		registerEditor(ApplicationPackageImpl.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain()));
-		registerEditor(ApplicationPackageImpl.Literals.MODEL_COMPONENTS, new ModelComponentsEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(ApplicationPackageImpl.Literals.MODEL_COMPONENT, new ModelComponentEditor(modelProvider.getEditingDomain()));
 		registerEditor(ApplicationPackageImpl.Literals.ADDON, new AddonsEditor(modelProvider.getEditingDomain(), project));
 
 		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain(), modelProvider));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
deleted file mode 100644
index ba2b27ad4a..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentEditor.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.component;
-
-import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.MModelComponent;
-import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
-import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
-import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-public class ModelComponentEditor extends AbstractComponentEditor {
-
-	private Composite composite;
-	private Image image;
-	private EMFDataBindingContext context;
-
-	private IListProperty MODEL_COMPONENT__CHILDREN = EMFProperties.list( ApplicationPackageImpl.Literals.MODEL_COMPONENT__CHILDREN);
-	private IListProperty PART_DESCRIPTOR_CONTAINER__DESCRIPTORS = EMFProperties.list( BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS);
-	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
-	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES);
-	private IListProperty MODEL_COMPONENT__COMMANDS = EMFProperties.list(ApplicationPackageImpl.Literals.MODEL_COMPONENT__COMMANDS);
-	private IListProperty MODEL_COMPONENT__BINDINGS = EMFProperties.list(ApplicationPackageImpl.Literals.MODEL_COMPONENT__BINDINGS);
-	private IListProperty MENU_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS);
-	
-	public ModelComponentEditor(EditingDomain editingDomain) {
-		super(editingDomain);
-	}
-
-	@Override
-	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
-			context = new EMFDataBindingContext();
-			composite = createForm(parent);
-		}
-		getMaster().setValue(object);
-		return composite;
-	}
-
-	public void dispose() {
-		if( image != null ) {
-			image.dispose();
-			image = null;
-		}
-
-		if( composite != null ) {
-			composite.dispose();
-			composite = null;
-		}
-
-		if( context != null ) {
-			context.dispose();
-			context = null;
-		}
-	}
-
-	private Composite createForm(Composite parent) {
-		parent = new Composite(parent,SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
-
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-
-		Label l = new Label(parent, SWT.NONE);
-		l.setText(Messages.ModelComponentEditor_Id);
-
-		Text t = new Text(parent, SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
-		t.setLayoutData(gd);
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-
-		// ------------------------------------------------------------
-
-		l = new Label(parent, SWT.NONE);
-		l.setText(Messages.ModelComponentEditor_ParentId);
-
-		t = new Text(parent, SWT.BORDER);
-		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__PARENT_ID).observeDetail(getMaster()));
-
-		Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
-		b.setText(Messages.ModelComponentEditor_Find);
-
-		// ------------------------------------------------------------
-
-		l = new Label(parent, SWT.NONE);
-		l.setText(Messages.ModelComponentEditor_PositionInParent);
-
-		t = new Text(parent, SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
-		t.setLayoutData(gd);
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__POSITION_IN_PARENT).observeDetail(getMaster()));
-
-		// ------------------------------------------------------------
-
-		l = new Label(parent, SWT.NONE);
-		l.setText(Messages.ModelComponentEditor_Processor);
-
-		t = new Text(parent, SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
-		t.setLayoutData(gd);
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__PROCESSOR).observeDetail(getMaster()));
-		
-		// ------------------------------------------------------------
-
-		l = new Label(parent, SWT.NONE);
-		l.setText(Messages.ModelComponentEditor_Tags);
-
-		t = new Text(parent, SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
-		t.setLayoutData(gd);
-
-		new Label(parent, SWT.NONE);
-		ListViewer viewer = new ListViewer(parent);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
-		gd.heightHint = 130;
-		viewer.getList().setLayoutData(gd);
-
-		return parent;
-	}
-
-	@Override
-	public Image getImage(Object element, Display display) {
-		if( image == null ) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelComponent.png")); //$NON-NLS-1$
-//				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ModelComponent.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		return image;
-	}
-
-	@Override
-	public String getLabel(Object element) {
-		return Messages.ModelComponentEditor_Label;
-	}
-
-	@Override
-	public String getDescription(Object element) {
-		return Messages.ModelComponentEditor_Description;
-	}
-
-	@Override
-	public IObservableList getChildList(Object element) {
-		WritableList list = new WritableList();
-		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.ModelComponentEditor_Handlers) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element, Messages.ModelComponentEditor_BindingTables) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MODEL_COMP_BINDINGS, MODEL_COMPONENT__BINDINGS, element, Messages.ModelComponentEditor_KeyBindings) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-		
-		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MODEL_COMP_COMMANDS, MODEL_COMPONENT__COMMANDS, element, Messages.ModelComponentEditor_Commands) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-		
-//		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART_MENU, MODEL_COMPONENT__CHILDREN, element, Messages.ModelComponentEditor_Menus) {
-//
-//			@Override
-//			protected boolean accepted(Object o) {
-//				return o instanceof MMenu;
-//			}
-//
-//		});
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MODEL_COMPONENT_CHILDREN, MODEL_COMPONENT__CHILDREN, element, Messages.ModelComponentEditor_UiChildren) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return o instanceof MUIElement;
-			}
-
-		});
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART_DESCRIPTORS, PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, element, Messages.ModelComponentEditor_PartDescriptors) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return o instanceof MPartDescriptor;
-			}
-
-		});
-		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MENU_CONTRIBUTIONS, MENU_CONTRIBUTIONS, element, Messages.ModelComponentEditor_MenuContributions) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-		
-		return list;
-	}
-
-	@Override
-	public String getDetailLabel(Object element) {
-		MModelComponent o = (MModelComponent) element;
-		if( o.getParentID() != null ) {
-			return Messages.ModelComponentEditor_DetailParentId + ": " + o.getParentID(); //$NON-NLS-1$
-		}
-		return null;
-	}
-
-	@Override
-	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] {
-			FeaturePath.fromList(ApplicationPackageImpl.Literals.MODEL_COMPONENT__PARENT_ID)	
-		};
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
deleted file mode 100644
index 576d71561f..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelComponentsEditor.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.component;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.MModelComponent;
-import org.eclipse.e4.ui.model.application.MModelComponents;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-
-public class ModelComponentsEditor extends AbstractComponentEditor {
-
-	private IListProperty MODEL_COMPONENTS__COMPONENTS = EMFProperties.list(ApplicationPackageImpl.Literals.MODEL_COMPONENTS__COMPONENTS);
-
-	private Composite composite;
-	private Image image;
-	private ModelEditor editor;
-
-	public ModelComponentsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
-	}
-
-	@Override
-	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ModelComponents.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		return image;
-	}
-
-	@Override
-	public String getLabel(Object element) {
-		return Messages.ModelComponentsEditor_Label;
-	}
-
-	@Override
-	public String getDescription(Object element) {
-		return Messages.ModelComponentsEditor_Description;
-	}
-
-	@Override
-	public Composite getEditor(Composite parent, Object object) {
-		if (composite == null) {
-			composite = createForm(parent);
-		}
-		getMaster().setValue(object);
-		return composite;
-	}
-
-	private Composite createForm(Composite parent) {
-		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
-
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelComponentsEditor_ModelContributions);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
-			final TableViewer viewer = new TableViewer(parent);
-			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(editor));
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
-			viewer.getControl().setLayoutData(gd);
-
-			IEMFListProperty prop = EMFProperties.list(ApplicationPackageImpl.Literals.MODEL_COMPONENTS__COMPONENTS);
-			viewer.setInput(prop.observeDetail(getMaster()));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelComponentsEditor_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MModelComponents container = (MModelComponents) getMaster().getValue();
-							int idx = container.getComponents().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENTS__COMPONENTS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelComponentsEditor_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MModelComponents container = (MModelComponents) getMaster().getValue();
-							int idx = container.getComponents().indexOf(obj) + 1;
-							if (idx < container.getComponents().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENTS__COMPONENTS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelComponentsEditor_Add);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					MModelComponent component = MApplicationFactory.INSTANCE.createModelComponent();
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENTS__COMPONENTS, component);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(component);
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelComponentsEditor_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
-
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENTS__COMPONENTS, elements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
-		}
-
-		return parent;
-	}
-
-	@Override
-	public IObservableList getChildList(Object element) {
-		return MODEL_COMPONENTS__COMPONENTS.observe(element);
-	}
-
-	@Override
-	public String getDetailLabel(Object element) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index 397cfb157c..1f84e7aaa7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -26,8 +26,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.MModelComponent;
-import org.eclipse.e4.ui.model.application.MModelComponents;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.edit.domain.EditingDomain;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java
deleted file mode 100644
index 188ba6bd91..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentBindingEditor.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
-
-import java.util.List;
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.commands.MBindingTable;
-import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
-import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
-import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-
-public class VModelComponentBindingEditor extends AbstractComponentEditor {
-	private Composite composite;
-	private EMFDataBindingContext context;
-	private ModelEditor editor;
-	private TableViewer viewer;
-	
-	public VModelComponentBindingEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
-	}
-
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
-
-	@Override
-	public String getLabel(Object element) {
-		return "Commands";
-	}
-
-	@Override
-	public String getDetailLabel(Object element) {
-		return null;
-	}
-
-	@Override
-	public String getDescription(Object element) {
-		return "Commands Bla Bla Bla Bla Bla";
-	}
-
-	@Override
-	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
-			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
-		}
-		VirtualEntry<?> o = (VirtualEntry<?>)object;
-		viewer.setInput(o.getList());
-		getMaster().setValue(o.getOriginalParent());
-		return composite;
-	}
-
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
-
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText("Keybindings");
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
-			viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
-			viewer.getControl().setLayoutData(gd);
-			viewer.getTable().setHeaderVisible(true);
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_SEQUENCE__KEY_SEQUENCE);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("KeySequence");
-				column.getColumn().setWidth(100);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(CommandsPackageImpl.Literals.KEY_BINDING__COMMAND, CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME));
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Command");
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Id");
-				column.getColumn().setWidth(170);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
-			
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
-							Object obj = s.getFirstElement();
-							MBindingTable container = (MBindingTable) getMaster().getValue();
-							int idx = container.getBindings().indexOf(obj) - 1;
-							if( idx >= 0 ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__BINDINGS, obj, idx);
-								
-								if( cmd.canExecute() ) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-							
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
-							Object obj = s.getFirstElement();
-							MBindingTable container = (MBindingTable) getMaster().getValue();
-							int idx = container.getBindings().indexOf(obj) + 1;
-							if( idx < container.getBindings().size() ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__BINDINGS, obj, idx);
-								
-								if( cmd.canExecute() ) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-							
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add ...");
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					MKeyBinding handler = MCommandsFactory.INSTANCE.createKeyBinding();
-					System.err.println(getMaster().getValue());
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__BINDINGS, handler);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> keybinding = ((IStructuredSelection)viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__BINDINGS, keybinding);
-						if( cmd.canExecute() ) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
-		}
-		
-		return parent;
-	}
-
-	@Override
-	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentUIEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentUIEditor.java
deleted file mode 100644
index ed061886f2..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelComponentUIEditor.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
-
-import java.util.List;
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.MModelComponent;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
-import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-
-public class VModelComponentUIEditor extends AbstractComponentEditor {
-	private Composite composite;
-	private EMFDataBindingContext context;
-	private ModelEditor editor;
-	private TableViewer viewer;
-
-	public VModelComponentUIEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
-	}
-
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
-
-	@Override
-	public String getLabel(Object element) {
-		return "UI-Children";
-	}
-
-	@Override
-	public String getDetailLabel(Object element) {
-		return null;
-	}
-
-	@Override
-	public String getDescription(Object element) {
-		return "UI-Children Bla Bla Bla Bla Bla";
-	}
-
-	@Override
-	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
-			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
-		}
-		VirtualEntry<?> o = (VirtualEntry<?>)object;
-		viewer.setInput(o.getList());
-		getMaster().setValue(o.getOriginalParent());
-		return composite;
-	}
-
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
-
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText("Children");
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
-			
-			viewer = new TableViewer(parent);
-			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(editor));
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
-			viewer.getControl().setLayoutData(gd);
-						
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout(2,false);
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
-							Object obj = s.getFirstElement();
-							MModelComponent container = (MModelComponent) getMaster().getValue();
-							int idx = container.getDescriptors().indexOf(obj) - 1;
-							if( idx >= 0 ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__CHILDREN, obj, idx);
-								
-								if( cmd.canExecute() ) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-							
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
-							Object obj = s.getFirstElement();
-							MModelComponent container = (MModelComponent) getMaster().getValue();
-							int idx = container.getDescriptors().indexOf(obj) + 1;
-							if( idx < container.getDescriptors().size() ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__CHILDREN, obj, idx);
-								
-								if( cmd.canExecute() ) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-							
-						}
-					}
-				}
-			});
-
-			
-			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					EClass eclass = (EClass) element;
-					return eclass.getName();
-				}
-			});
-			childrenDropDown.setInput(new EClass[] { 
-					// Basic
-					BasicPackageImpl.Literals.PART, 
-					BasicPackageImpl.Literals.INPUT_PART, 
-					BasicPackageImpl.Literals.PART_STACK,
-					BasicPackageImpl.Literals.PART_SASH_CONTAINER,
-					BasicPackageImpl.Literals.TRIM_BAR,
-					BasicPackageImpl.Literals.TRIM_ELEMENT,
-					BasicPackageImpl.Literals.WINDOW, 
-					BasicPackageImpl.Literals.TRIMMED_WINDOW,
-					// Advanced
-					AdvancedPackageImpl.Literals.PERSPECTIVE,
-					AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
-					// Menu
-					MenuPackageImpl.Literals.MENU_SEPARATOR,
-					MenuPackageImpl.Literals.MENU,
-					MenuPackageImpl.Literals.HANDLED_MENU_ITEM,
-					MenuPackageImpl.Literals.DIRECT_MENU_ITEM,
-					MenuPackageImpl.Literals.TOOL_BAR,
-					MenuPackageImpl.Literals.HANDLED_TOOL_ITEM,
-					MenuPackageImpl.Literals.DIRECT_TOOL_ITEM,
-					MenuPackageImpl.Literals.TOOL_CONTROL,
-					MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR
-					});
-			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
-
-			
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					EClass eClass = (EClass) ((IStructuredSelection)childrenDropDown.getSelection()).getFirstElement();
-					MUIElement obj = (MUIElement) EcoreUtil.create(eClass);
-					
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__CHILDREN, obj);
-					
-					if( cmd.canExecute() ) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(obj);
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> commands = ((IStructuredSelection)viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.MODEL_COMPONENT__CHILDREN, commands);
-						if( cmd.canExecute() ) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
-		}
-
-		return parent;
-	}
-
-	@Override
-	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}

From 3cc4919df9cafa6ccb9411a0b819afa057252ab1 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 21 Jun 2010 12:03:51 +0000
Subject: [PATCH 0145/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * make use of new contribution system


From ddf7f44aaa5493ebd566794c09f0600b32c4e898 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 21 Jun 2010 15:01:24 +0000
Subject: [PATCH 0146/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * adding support for shared-elements

---
 .../.settings/org.eclipse.jdt.core.prefs      |   9 +-
 .../emf/ui/internal/common/ModelEditor.java   |   7 +-
 .../common/component/WindowEditor.java        |   8 +
 .../virtual/VWindowSharedElementsEditor.java  | 253 ++++++++++++++++++
 4 files changed, 272 insertions(+), 5 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
index 47b9e1b0ba..118f2dfe61 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,12 @@
-#Sun Apr 11 23:33:47 CEST 2010
+#Mon Jun 21 15:26:11 CEST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -11,7 +15,7 @@ org.eclipse.jdt.core.compiler.problem.deadCode=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -45,6 +49,7 @@ org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 661158062f..56b641c444 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowSharedElementsEditor;
+
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -131,19 +133,17 @@ public class ModelEditor {
 	private static final String CSS_CLASS_KEY = "org.eclipse.e4.ui.css.CssClassName"; //$NON-NLS-1$
 
 	public static final String VIRTUAL_PART_MENU = ModelEditor.class.getName() + ".VIRTUAL_PART_MENU"; //$NON-NLS-1$
-//	public static final String VIRTUAL_MODEL_COMPONENT_CHILDREN = ModelEditor.class.getName() + ".VIRTUAL_MODEL_COMPONENT_CHILDREN"; //$NON-NLS-1$
 	public static final String VIRTUAL_HANDLER = ModelEditor.class.getName() + ".VIRTUAL_HANDLER"; //$NON-NLS-1$
 	public static final String VIRTUAL_BINDING_TABLE = ModelEditor.class.getName() + ".VIRTUAL_BINDING_TABLE"; //$NON-NLS-1$
 	public static final String VIRTUAL_COMMAND = ModelEditor.class.getName() + ".VIRTUAL_COMMAND"; //$NON-NLS-1$
 	public static final String VIRTUAL_WINDOWS = ModelEditor.class.getName() + ".VIRTUAL_WINDOWS"; //$NON-NLS-1$
 	public static final String VIRTUAL_WINDOW_CONTROLS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_CONTROLS"; //$NON-NLS-1$
 	public static final String VIRTUAL_PART_DESCRIPTORS = ModelEditor.class.getName() + ".VIRTUAL_PART_DESCRIPTORS"; //$NON-NLS-1$
-//	public static final String VIRTUAL_MODEL_COMP_COMMANDS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_COMP_COMMANDS"; //$NON-NLS-1$
-//	public static final String VIRTUAL_MODEL_COMP_BINDINGS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_COMP_BINDINGS"; //$NON-NLS-1$
 	public static final String VIRTUAL_PARTDESCRIPTOR_MENU = ModelEditor.class.getName() + ".VIRTUAL_PARTDESCRIPTOR_MENU"; //$NON-NLS-1$
 	public static final String VIRTUAL_TRIMMED_WINDOW_TRIMS = ModelEditor.class.getName() + ".VIRTUAL_TRIMMED_WINDOW_TRIMS"; //$NON-NLS-1$
 	public static final String VIRTUAL_ADDONS = ModelEditor.class.getName() + ".VIRTUAL_ADDONS"; //$NON-NLS-1$
 	public static final String VIRTUAL_MENU_CONTRIBUTIONS = ModelEditor.class.getName() + ".VIRTUAL_MENU_CONTRIBUTIONS"; //$NON-NLS-1$
+	public static final String VIRTUAL_WINDOW_SHARED_ELEMENTS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_SHARED_ELEMENTS"; //$NON-NLS-1$
 	
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
@@ -421,6 +421,7 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_TRIMMED_WINDOW_TRIMS, new VWindowTrimEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_ADDONS, new VApplicationAddons(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_MENU_CONTRIBUTIONS, new VMenuContributionsEditor(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_WINDOW_SHARED_ELEMENTS, new VWindowSharedElementsEditor(modelProvider.getEditingDomain(), this));
 	}
 
 	private void registerVirtualEditor(String id, AbstractComponentEditor editor) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 2b9ae57de7..254dc19754 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -65,7 +65,9 @@ public class WindowEditor extends AbstractComponentEditor {
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IListProperty WINDOW__WINDOWS = EMFProperties.list(BasicPackageImpl.Literals.WINDOW__WINDOWS);
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private IListProperty SHARED_ELEMENTS = EMFProperties.list(BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
 	private IValueProperty WINDOW__MAIN_MENU = EMFProperties.value(BasicPackageImpl.Literals.WINDOW__MAIN_MENU);
+	
 
 	private Action addMainMenu; 
 	
@@ -269,6 +271,12 @@ protected boolean accepted(Object o) {
 
 		});
 		
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_WINDOW_SHARED_ELEMENTS, SHARED_ELEMENTS, element, "Shared Elements" ) {
+			protected boolean accepted(Object o) {
+				return true;
+			}
+		});
+		
 		MWindow window = (MWindow) element;
 		if( window.getMainMenu() != null ) {
 			list.add(0,window.getMainMenu());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
new file mode 100644
index 0000000000..6cfe2aa514
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -0,0 +1,253 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import java.util.List;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Label;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.jface.viewers.TableViewer;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+
+public class VWindowSharedElementsEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+	private TableViewer viewer;
+
+	public VWindowSharedElementsEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Shared Elements";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Shared Elements Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Controls");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+
+			
+			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
+			viewer.setInput(prop.observeDetail(getMaster()));
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout(2,false);
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) + 1;
+							if( idx < container.getChildren().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+			
+			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					EClass eclass = (EClass) element;
+					return eclass.getName();
+				}
+			});
+			childrenDropDown.setInput(new EClass[] {
+					BasicPackageImpl.Literals.PART_SASH_CONTAINER,
+					BasicPackageImpl.Literals.PART,
+					BasicPackageImpl.Literals.INPUT_PART
+			});
+			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! childrenDropDown.getSelection().isEmpty() ) {
+						EClass eClass = (EClass) ((IStructuredSelection)childrenDropDown.getSelection()).getFirstElement();
+						
+						EObject eObject = EcoreUtil.create(eClass);
+						
+						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, eObject);
+						
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+							editor.setSelection(eObject);
+						}
+					}
+				}
+			});
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
+						
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, elements);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+
+
+		return parent;
+	}
+	
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}

From d11ac47dede9d21efb6ecb770838cd9a020d0055 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 21 Jun 2010 15:14:52 +0000
Subject: [PATCH 0147/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * adding placeholder support

---
 .../internal/common/component/PartSashContainerEditor.java | 5 ++++-
 .../emf/ui/internal/common/component/PartStackEditor.java  | 7 ++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 53c8881a22..6199416884 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
@@ -315,7 +317,8 @@ public String getText(Object element) {
 					BasicPackageImpl.Literals.PART_SASH_CONTAINER,
 					BasicPackageImpl.Literals.PART_STACK,
 					BasicPackageImpl.Literals.PART,
-					BasicPackageImpl.Literals.INPUT_PART
+					BasicPackageImpl.Literals.INPUT_PART,
+					AdvancedPackageImpl.Literals.PLACEHOLDER
 			});
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
 			
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index be87172d3f..53463c6c13 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
@@ -271,10 +273,9 @@ public String getText(Object element) {
 				}
 			});
 			childrenDropDown.setInput(new EClass[] {
-//					BasicPackageImpl.Literals.PART_SASH_CONTAINER,
-//					BasicPackageImpl.Literals.PART_STACK,
 					BasicPackageImpl.Literals.PART,
-					BasicPackageImpl.Literals.INPUT_PART
+					BasicPackageImpl.Literals.INPUT_PART,
+					AdvancedPackageImpl.Literals.PLACEHOLDER
 			});
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
 			

From 742e03b188101be7ac56e08ec23e59342f4d9abd Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 21 Jun 2010 16:29:53 +0000
Subject: [PATCH 0148/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * adding placeholder support

---
 .../full/modelelements/ModelComponent.png     | Bin 591 -> 0 bytes
 .../icons/full/wizban/import_wiz.png          | Bin 0 -> 6650 bytes
 .../e4/tools/emf/ui/internal/Messages.java    |   2 +
 .../tools/emf/ui/internal/Messages.properties |   2 +
 .../emf/ui/internal/common/ModelEditor.java   |   2 +-
 .../common/component/PlaceholderEditor.java   |  33 ++-
 .../dialogs/SharedElementsDialog.java         | 230 ++++++++++++++++++
 7 files changed, 265 insertions(+), 4 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelComponent.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/import_wiz.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelComponent.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelComponent.png
deleted file mode 100644
index 6187b15aec001b7080b51a5f944f07591f26cc15..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 591
zcmV-V0<iswP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz;Ymb6R5;6}
zl08V3aTLaXuVw{)TtAV-EQp(VZ&;&yOGCA^HyY7UV+BnWv^BakMQc+OB&0Z27AkkL
zxPppG-9jbH?t7kd8eTEus*7hi@aLT8f1cktNknjvIJDd2gQ>eEcNHZMNv|IbJ-M`(
zKwWL~opzjJe^WpCmV9E;(0&ut2;4va_(#>M8)>9$R5viQnf(Nkh~VM$y>J(jqb$cj
z+nL1Nm|mV)Gm|9MnHf*7Ja4OEAQz__^LRKOLEwqpiGV^^A*T=#&inGm-62Xs;dnSp
zKj&H9T*boh2<no0+=ElOJZ83sfQeG2L`y@C?#3Rz{i>i)W+(n27l!C)>fq|L%VB1i
ziC4p;NwV_}ZjW7$LRW#(_bKF#hp=!IqNO26Z*w2+LEwx{PVnZ&Sn}T;m<fe2Wm#Lz
za$)sCo<WYS+HDKB-VTSEXg%7B+({$Nn7A;{*z`8{F+2a6g_Xssq{Gq<0W(qT9zX<h
z>tzb<gWDVNaLQ|6kUI-2i;UhJKT-oRHNy~7Uq5lS^Bm=sIhHERNTM^>$;qA*nT@@+
zV5uQ@iXDTPoTbV#FRr~z04|PPh`wXTNoCm9*tG&?e3+fYl>K6+&3|Cc$KOpL`ER+_
dcRl5U#9zn6ZO}GF<yZg!002ovPDHLkV1oCe4!{5a

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/import_wiz.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/import_wiz.png
new file mode 100644
index 0000000000000000000000000000000000000000..732631c0ac7579a2823f323daa1d6e68345c9205
GIT binary patch
literal 6650
zcmV<W83pEvP)<h;3K|Lk000e1NJLTq002t>002S=1^@s6A3-Z300009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde00d`2O+f$vv5tKEQIh}w03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`
z>R<o>I+y?e7jKeZ#YO-C4;M*9K~#9!>|1S&9o2b$-ZOLOe(dhu4`UXL0fR|HN@ckT
z?GMtlB&sSEsX?Nx)JU|YQq@-dlcGrdl?bE$sFYTUP%5>eO+!;EQIVE_C@O`-BmrcI
zV;h5wiNEizy<Xe<z4v2g&Uv5yn3;QL@9uhS@2(9?MjFk`y));YdCv1b@5eb;@bhiS
z?d#8+@ko?N_LJxXQ1*Wg%L0H30Lmn)s_Y?A&VT>02kRT(J?oL^QKF>EGL=0_1WVof
zu?6d!&yAH;Q6U)+@Idx~EMDrFj}=(|^ujr#M3H142~PwdQ32TtKvsJGV*}QcFOK&q
zSrNdH01`G;1qkFa+t~16ee0$1vJwfC05G9YnLwWa!YgQN!-DnH%jW|URgwi^0umCS
z`XH#}Kl|8%_4F$jJSD3nN?l-x2nGNI<khvkp}_i&S1<IC=oP>$z(e30K|d8fSJD24
z0P8<@Uo50-3IL#sIld7LkyoZq8xpK%U%S|&M6W;$yHrR3UqpsTt{SM1G+6)r;|ZgR
zL4v_jVl9d34Jjey+Wh8660GmNK2cJlU!)x~bt}0qf*~s8%6;Aj0_*uVCaVN`gj^B^
z0emrQqfsAOu>NPyq)}p!T;BBy;2R@Dx<(q+y_vOWB)0BhlE1rNK)v+VQ~{99f~Bhg
zsYZF8Cqod(di7(~%xZ=4AJ&`kztvmuS(2k7^43~*@PFT)DiavEq(}?I6AY|}>8%<p
z(i#z80bs5kJuyBxCrY{H)Y;i@l6*)+M%SWq|F?I#O0s7qZ{~Y4M8YSzu2OJSW+>t-
z8F~OPITwE6{B&#j(D8GaoUQ-Llixe|1W9kT9eees(*po{Rvc|3Rk=pmd)1mHQgi_D
z3%8XH`JVsa)V!^~b?`K(_Mu(>{N}%0ZM(bo&zSG;o4x^9Skhf;^NduCS^2&Xjlhdk
z;?M2u-!srx`PG?*zO(Oe4a0-MBac1##<#Dut=A6B7yv^86jtoGLEstmtusDCqM*vM
zDl2Q^4MqB*Fa6fdCrYK#{a&GT;J}g5O9Doo9w2LfMULzyM|YE>yPej)B7)73m4On0
z=NTDTQ&<R5B5=xzD*K(|Cg-?GmHi}oNL1F;&5{$9zy62!g86!Lw~L!Qciz1f<5SU7
zkN??c|D<zIZ5Lp^40r>8mm{}A8Nd1B>&=nA-WwiO0!n}+lz?jI-1lS?NnaIE63G!z
zW!EwLo{PSB3UQ7F>sU}_!6|$tK`u(f^Ksld<ZZhT-tx*@XJ52YbLTIAYAeR4qo;QL
z>DEU9vm5YsCRXMn0V@McvHyb!)W$<p`!;V`4lK_|6@s!Vaiw56N6#t>&S~Hrf<^bQ
z0G3$~upavSjx)dg*)3o6gYtp>?~h=3Ab8~2?@yit3OkdyvY75=03`rL?Ehd6wefHz
zK`&mZppy`%C|S#X>o};&UUK>1cHJZRrM54AZpX;){Q8y${h)GS|NA4jIAsT(|Ix)1
zqzo`0fWiI`E}%9(huM&DPM7Ye!1F!nzuez<ioiPdS*M#+*~`mt8rKah0C?cO9ksvv
z^4-{W>n7|wJc4r<X7S?dr&F+!pMK})C~D)gsH2F{u}OrHTe7W!Zw6M94FX~vE0N=n
zQ&yEIe&}+;<xQZrtEUv~eDq77!X3A5#=iH*p>7O6*gFCMIC17Q#wRBb`xQ(~*U@UW
z(2DG0pgidnSw8S2;Kh!8vE?QuD&YFO*ODXkl_z#TA|l(IDvSWuDx%oJsY0D5N9`O{
z`P4Ii`}?Q5!h>yqcQP}(X6WG`|LYK@XQuJMuicK`o+{?*Eu5<tF&hF$4jqN4!)-SW
z;*;C&Yzw>*1fC~@&%Lte-m&wO_om=vDWNgO6hy>h?h69A`>yRT-+s&1aZ;Cd0J?-j
zSV7?ZWk%|chpHFvcWw)e0IG^=&nRl=1hex?W+1NtIMp={k0s6f017A<1N`OheFp#j
z(t7}k=qs0SX2ydR!N^Drvvcz(7JP&`W{E(2PpSkkc7E#KiRrmNzg!kfOijIW`z>3?
z*FBLYiGkiC9)93<P&dQ#>L9lxiU+fo07<;M=NMl2;RnlE`29&(;J3qsQUHAZ-kUJr
zh%i3y5ELzDrxd48oq@9sRH7AH?ARXNbKqETDDb5hfR`WXXaD|>5_6C?yCCVgwThQt
zKZ<X?u;<!U9fU-qc_Y99REiOl1=O1*Sm&Thhyb;*Y0NjGOB8KoTOx^BECn1qdJ^ZS
zCNUWe!x;y|NgO$R4D<D{&HXU4C>1KV`kp&#j8s$!5}xmSZLzkhsn-;UNFq=IoEe)#
zvuUqwiN>iSwhn*?rw-OB>diXln}l@=BZ8T^W-_=WmM@K%_WqN@=Wu+qg>$VcLPi)l
zc^n7c-j8N|9ye{h89_0CF$S&3qTu_#RPc4LD#Tj$T1C-_cp0JUjTp1@A&f|8H-ZZn
z8(7aW&5~e+k;Qx?gfZtZGrtMV(4yc^!83$&{n?}dE<GK<QvkOCz}tt$aBO4>CufMG
zr$%w&@Da>TO#)P?I*gne!SI%w;2RHNXkm=(a1MRev8?QJLS5$9-m`(e)?hhR_+Aao
z@H1$|ie_k0Z}!8vNrbV5NtWugwQH%-j4i%e@Z+cVyf==cwK@Fs=tb<^cNi06XW;oh
zjPXG#=n{{5=JW^(+wVXaSqRKFr>rdZ+F@kT3}g7lpj`6PffFc~4{Fy9EOm-A7lxoL
zz}gm~*g-@vHCx2g+zh;w_L(#22J3@bqk8--esH{2d-LLSbl<`EYk2qFpP}Fs!#5^n
zazfIuBVm_1MObg36<T<nch_<qo}6jo$nlGy0$YarP%8Scv4Tt_!s&HjR>pXdWCoyp
zF2H-oF95<s;M3S7+kQ6EEEDM2cj(09VPx-%t-~F+-Gp1WY(^A2#5U2xICkkVy-q(%
zLI=U{U}1P{GG65R|Mj__z&Ya6cW=QbwhdusHcVLM^!k9MDOhbGkeoh1aPZhT5-+7t
zcBX@mjy3}V10e9}U%cZnB_3O<#G(Y41cIJ*T2)0r!2854`Wv1p_suoz_T@Uf=iMZn
zyYtpT7$a>bqe@uE_CQ}_X5|=_6Lceq`H*=0*{}b>uI!oPXPX5k^Lm%HDOpiPdwHVo
zNzci1-a*v}O1{zk&JREMo8M8@?<j$9eEYkvw8v5ar-`szr*Q6?GmA;-FlTy6AdsAE
zS59zptYt{_6I?kbBRo}Bkt>rJBLyQ8=v8<!vQx9NX)1Po%rNJ*^KP2jCF+7f0ELy7
z6_6}zvH)MYrn363%HxZGOia%yucv0^;~2@YOwxoi>D1}*R+U7+73<sV=Mp6o-;)Xi
z=1SLZNSegDtP*<tz{;6n$||%q3!o|pVB~yQR<dUWGx3!i0Fj$Zq<|^{ct%W*k^-hS
zl^#2Kx%j*@2A%4GBVp4}B%M$6d{LiJs36&qcy0xuNRI?m($7<MNzdshnqPn7FC)I4
z;S+QTee%5#F#xJ7m|cZrUoL?2pw1U(OX6H0Mh4)LrPZPt1(O7c3TQiyYuDo?)5Q$i
z3@BB?IkpA9w<rVELU<#oi-5?yGBs<5?Rq}}SSPVni9=_irZp|6N$)PHS<?163r&(F
ztnzDr@i)(WjY!y#y%dp}X!|_n06P_pwJR=m#J#OqY5To_43)ijxYL&o7|a2O4p=0i
zRwas!gt3z_RuivWqRH8PC+|x1s$2~4&=>B>{b<J1WdO;osZMT?#U;lK(ER<#-@3R)
zdC&G?Ftq}wi@jl~ApL>3&6FHiY5Sc4ZZlMs5?e(}2?7$ftZCL`)67`4q8W-{fzTHV
zKJMJQ2|GTyB{xc3Fw*T4$-QPS`E8rEbZ%wZW9HhBC7#KyiG0PAZBukkp{W@beGK`=
z#S8k?K5q{!l@cq_iWT#OG$Uu~lg+~UxyWmDua{c}ENw4yY6AwKrxIX#wwX|$%%bqL
zEX(#B9!VIJlujhgBTZ_`**Qd#=hCP<GbJh)Jd-cM7!e2r)+u7Ah^->BuB};CJKiwx
zWzbJaL0QP~)OxK_S_JE=5=YKVPd5FL3ys3X*onLRN~sbA7XX%-W9Cu7g=W~%0JcL7
z<jW`R5F}N?H2h$$?#+~u*?p3le&;&VmjqasV^(*%Q!p4XLceY1opO>@qDe?yiB{yy
z*lg&JjMszF`Pej5M}K8y<!+Dw>AX}b;tO@FBMf3Xz;s?VXOfb7qV^;K+d1Zf8dc6@
zv+yMgKo^)_3Y>GAhCM*RlT8M!W?csm6KE=BMk%wAGb8obJ3ZM7Y7-5AB399roR7bp
zm&vs2?1ecrTOo{?1f;BEigdOoyG~w$$&3t)XVOxRf#;dTlstiF3`79uQbD#!wZPh>
z%pzjondCmt2)x|2KoD7nR^-r%EyBnmjFamywhMw%&tT9bi@Gf#O(hzRW;|A@HLZ7I
zCM=wqXawU8Yr@M-vo6W3mwtQ%jaJmj?vaaYT%v8+C}(=ZG}1RF**%j2WdM_&C&_xk
z1nV+kPWW#m|4af_b|i_&I)rgDH5XZjDAx3tlzHmS)&fULNW)QTv6@qnGbiTa!tse#
zFft$d4R?jf=pwN8zVS}+t55GOI3=EXelNPcd46)P`}1{PrFcb~5}~7vIhqrZddC{p
zKRy)(CugF<v~^e4Rlf@;1E6@<mi}D=4Bs$NxuF#Jy}l<UBjN|X*X#SH45E;cAe9s^
zl^c_H&kGiHcwVV1tU@ljS`2>Ib@wD{UNg9agjB25*@g?wwVXFP7YAo&qrz0=#Oe}#
zTh)v-0L;{F3B;gwig#62mNhTRX&os`C$gDc=4N|I!uL$Yh*Xpcmn{X#ua(N4;iZ-l
zC7FeG{nkoLj@Erfdahy9`c!)waR^tr$W;LGjg<96WTI=jFhm6XNdB|8DxlKUFXi=I
z$bVhIs<&JZAf+@qSrt$Mi04Te8)RDmRx@-SfL?&BW>m&1*&wW1idh3l7GkU#sB{I)
zhGEqLuv(ET11Kh@C#(L)!bW3N8>}c+Banf$VAMusRfk!EK?0i~Yx5r%-;<(XW3dVV
zjCEQ9aPwLLm1g`EY{1O`xMMB<RaGz&NHUqR;kN%D0C{e}kGYk<KL7v#07*qoM6N<$
Eg2}wVR{#J2

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index a1f393c1b8..183288dca6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -266,6 +266,7 @@ public class Messages {
 	public static String PlaceholderEditor_Label;
 	public static String PlaceholderEditor_Descriptor;
 	public static String PlaceholderEditor_Id;
+	public static String PlaceholderEditor_FindReference;
 	
 	public static String ToolBarEditor_Label;
 	public static String ToolBarEditor_Description;
@@ -347,6 +348,7 @@ public class Messages {
 	public static String FeatureSelectionDialog_DialogTitle;
 	public static String FeatureSelectionDialog_DialogMessage;
 
+	
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 65a125e299..58fa497251 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -262,6 +262,7 @@ PerspectiveStackEditor_Perspectives=Perspectives
 PlaceholderEditor_Label=Placeholder
 PlaceholderEditor_Descriptor=Placeholder Bla Bla Bla Bla
 PlaceholderEditor_Id=Id
+PlaceholderEditor_FindReference=Find ...
 
 ToolBarEditor_Label=Toolbar
 ToolBarEditor_Description=Toolbar bla bla bla
@@ -283,6 +284,7 @@ ToolBarSeparatorEditor_Id=Id
 ToolControlEditor_Label=ToolControl
 ToolControlEditor_Description=ToolControl bla bla bla
 ToolControlEditor_Id=Id
+ToolControlEditor_ClassURI=Class URI
 
 VBindingTableEditor_Label=Binding Configuration
 VBindingTableEditor_Description=Binding Configuration Bla Bla Bla Bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 56b641c444..d72d280599 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -487,7 +487,7 @@ private void registerDefaultEditors() {
 
 		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, new PerspectiveStackEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE, new PerspectiveEditor(modelProvider.getEditingDomain(), project, this));
-		registerEditor(AdvancedPackageImpl.Literals.PLACEHOLDER, new PlaceholderEditor(modelProvider.getEditingDomain()));
+		registerEditor(AdvancedPackageImpl.Literals.PLACEHOLDER, new PlaceholderEditor(modelProvider.getEditingDomain(),this,modelProvider));
 		
 		registerEditor(FragmentPackageImpl.Literals.MODEL_FRAGMENTS, new ModelFragmentsEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT, new StringModelFragment(modelProvider.getEditingDomain(),this));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index bcc3323159..5a79bae233 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -10,6 +10,20 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.SharedElementsDialog;
+
+import org.eclipse.swt.events.SelectionEvent;
+
+import org.eclipse.swt.events.SelectionAdapter;
+
+import org.eclipse.swt.events.SelectionAdapter;
+
+import org.eclipse.swt.widgets.Button;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -38,9 +52,13 @@ public class PlaceholderEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
-
-	public PlaceholderEditor(EditingDomain editingDomain) {
+	private IModelResource resource;
+	private ModelEditor editor;
+	
+	public PlaceholderEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource) {
 		super(editingDomain);
+		this.resource = resource;
+		this.editor = editor;
 	}
 
 	@Override
@@ -120,9 +138,18 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+			
+			final Button b = new Button(parent, SWT.PUSH);
+			b.setText(Messages.PlaceholderEditor_FindReference);
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					SharedElementsDialog dialog = new SharedElementsDialog(b.getShell(),editor,(MPlaceholder) getMaster().getValue(), resource);
+					dialog.open();
+				}
+			});
 		}
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
new file mode 100644
index 0000000000..0daebd280d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -0,0 +1,230 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+
+import org.eclipse.emf.edit.command.SetCommand;
+
+import org.eclipse.emf.common.command.Command;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+
+import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
+
+import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
+import org.eclipse.jface.viewers.AbstractTreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+
+import org.eclipse.jface.viewers.StyledString;
+
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
+
+import org.eclipse.swt.graphics.Image;
+
+import org.eclipse.jface.viewers.ViewerCell;
+
+import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
+
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+
+import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
+
+import org.eclipse.e4.ui.model.fragment.MModelFragment;
+
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+
+import java.util.ArrayList;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+
+import org.eclipse.e4.ui.model.application.MApplication;
+
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+
+import org.eclipse.jface.viewers.ArrayContentProvider;
+
+import org.eclipse.jface.viewers.TableViewer;
+
+import org.eclipse.swt.layout.GridData;
+
+import org.eclipse.swt.layout.GridLayout;
+
+import org.eclipse.swt.widgets.Text;
+
+import org.eclipse.swt.SWT;
+
+import org.eclipse.swt.widgets.Label;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+import org.eclipse.swt.widgets.Shell;
+
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+
+public class SharedElementsDialog extends TitleAreaDialog {
+	private TableViewer viewer;
+	private MPlaceholder placeholder;
+	private IModelResource resource;
+	private ModelEditor editor;
+	
+	public SharedElementsDialog(Shell parentShell, ModelEditor editor, MPlaceholder placeholder, IModelResource resource) {
+		super(parentShell);
+		this.editor = editor;
+		this.placeholder = placeholder;
+		this.resource = resource;
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite comp = (Composite) super.createDialogArea(parent);
+		
+		Composite container = new Composite(comp, SWT.NONE);
+		container.setLayout(new GridLayout(2, false));
+		container.setLayoutData(new GridData(GridData.FILL_BOTH));
+		
+		Label l = new Label(container, SWT.NONE);
+		l.setText("Name");
+		
+		Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		
+		l = new Label(container, SWT.NONE);
+		
+		viewer = new TableViewer(container);
+		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setLabelProvider(new LabelProviderImpl());
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+		
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+			
+			public void doubleClick(DoubleClickEvent event) {
+				okPressed();
+			}
+		});
+		
+		if( resource.getRoot().get(0) instanceof MApplication ) {
+			List<MUIElement> list = new ArrayList<MUIElement>();
+			for( MWindow m : ((MApplication)resource.getRoot().get(0)).getChildren() ) {
+				list.addAll(filter(m.getSharedElements()));
+			}
+			viewer.setInput(list);
+		} else if( resource.getRoot().get(0) instanceof MModelFragments ) {
+			List<MApplicationElement> list = new ArrayList<MApplicationElement>();
+			for( MModelFragment f : ((MModelFragments)resource.getRoot().get(0)).getFragments() ) {
+				if( f instanceof MStringModelFragment ) {
+					if( ((MStringModelFragment)f).getFeaturename().equals("sharedElements") ) { //$NON-NLS-1$
+						list.addAll(filter(f.getElements()));
+					}
+				}
+			}
+			viewer.setInput(list);
+		}
+		
+		final PatternFilter filter = new PatternFilter() {
+			@Override
+			protected boolean isParentMatch(Viewer viewer, Object element) {
+				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);
+			}
+		};
+		viewer.addFilter(filter);
+
+		searchText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				filter.setPattern(((Text) e.widget).getText());
+				viewer.refresh();
+			}
+		});
+		
+		return comp;
+	}
+	
+	@Override
+	protected void okPressed() {
+		if( ! viewer.getSelection().isEmpty() ) {
+			IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+			Command cmd = SetCommand.create(resource.getEditingDomain(), placeholder, AdvancedPackageImpl.Literals.PLACEHOLDER__REF, s.getFirstElement());
+			if( cmd.canExecute() ) {
+				resource.getEditingDomain().getCommandStack().execute(cmd);
+				super.okPressed();
+			}
+		}
+	}
+	
+	private static <T> List<T> filter(List<T> o) {
+		List<T> rv = new ArrayList<T>();
+		for( T i : o ) {
+			if( i instanceof MPart || i instanceof MPartSashContainer ) {
+				rv.add(i);
+			}
+		}
+		return rv;
+	}
+	
+	private class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
+		public void update(final ViewerCell cell) {
+			EObject o = (EObject) cell.getElement();
+			
+			StyledString string = new StyledString(getTypename(o));
+			
+			if( o instanceof MUILabel ) {
+				string.append(" - " + ((MUILabel)o).getLabel(), StyledString.DECORATIONS_STYLER);
+			}
+			
+			MApplicationElement el = (MApplicationElement) o;
+			string.append(" - " + el.getElementId(), StyledString.DECORATIONS_STYLER);
+			
+			cell.setText(string.getString());
+			cell.setStyleRanges(string.getStyleRanges());
+			cell.setImage(getImage(o));
+		}
+		
+		public String getText(Object element) {
+			EObject o = (EObject) element;
+			MApplicationElement el = (MApplicationElement) o;
+			
+			if( el instanceof MUILabel ) {
+				MUILabel label = (MUILabel) el;
+				return getTypename(o) + " - " + el.getElementId() + " - " + label.getLabel();
+			} else {
+				return getTypename(o) + " - " + el.getElementId() + " - ";	
+			}
+		}
+		
+		private String getTypename(EObject o) {
+			AbstractComponentEditor editor = SharedElementsDialog.this.editor.getEditor((o).eClass());
+			if( editor != null ) {
+				return editor.getLabel(o);
+			} else {
+				return o.eClass().getName();
+			}
+		}
+		
+		public Image getImage(Object element) {
+			AbstractComponentEditor editor = SharedElementsDialog.this.editor.getEditor(((EObject)element).eClass());
+			if( editor != null ) {
+				return editor.getImage(element, getShell().getDisplay());
+			}
+			return null;
+		}
+	}
+}

From 7d9b8837a505b2767c77edcbbbce5d34b49eaf2e Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster>
Date: Tue, 22 Jun 2010 19:05:29 +0000
Subject: [PATCH 0149/1286] Bug 317494 -  Add
 org.eclipse.e4.tools.emf.liveeditor adding to tools feature

---
 features/org.eclipse.e4.core.tools.feature/feature.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 0f880b4302..0106e2cb24 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -45,4 +45,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.e4.tools.emf.liveeditor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

From f0b3b7f53bf8e61867f2aaf74a08bce97371aedc Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 23 Jun 2010 14:40:26 +0000
Subject: [PATCH 0150/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * making images local to bundle and not crossloading
 them (plan is to have nicer .png-icons)

---
 .../icons/full/modelelements/Command.gif          | Bin 0 -> 495 bytes
 .../icons/full/modelelements/DirectMenuItem.gif   | Bin 0 -> 587 bytes
 .../icons/full/modelelements/DirectToolItem.gif   | Bin 0 -> 227 bytes
 .../icons/full/modelelements/HandledMenuItem.gif  | Bin 0 -> 587 bytes
 .../icons/full/modelelements/HandledToolItem.gif  | Bin 0 -> 561 bytes
 .../icons/full/modelelements/Handler.gif          | Bin 0 -> 379 bytes
 .../icons/full/modelelements/KeyBinding.gif       | Bin 0 -> 321 bytes
 .../icons/full/modelelements/Menu.gif             | Bin 0 -> 607 bytes
 .../icons/full/modelelements/MenuContribution.gif | Bin 0 -> 129 bytes
 .../icons/full/modelelements/MenuItem.gif         | Bin 0 -> 348 bytes
 .../icons/full/modelelements/MenuSeparator.gif    | Bin 0 -> 352 bytes
 .../icons/full/modelelements/Part.gif             | Bin 0 -> 342 bytes
 .../icons/full/modelelements/PartDescriptor.gif   | Bin 0 -> 361 bytes
 .../full/modelelements/PartSashContainer.gif      | Bin 0 -> 378 bytes
 .../modelelements/PartSashContainer_vertical.gif  | Bin 0 -> 347 bytes
 .../icons/full/modelelements/PartStack.gif        | Bin 0 -> 607 bytes
 .../icons/full/modelelements/Perspective.gif      | Bin 0 -> 953 bytes
 .../icons/full/modelelements/PerspectiveStack.gif | Bin 0 -> 570 bytes
 .../icons/full/modelelements/Placeholder.gif      | Bin 0 -> 145 bytes
 .../icons/full/modelelements/ToolBar.gif          | Bin 0 -> 607 bytes
 .../icons/full/modelelements/ToolBarSeparator.gif | Bin 0 -> 608 bytes
 .../icons/full/modelelements/ToolControl.gif      | Bin 0 -> 377 bytes
 .../icons/full/modelelements/Window.gif           | Bin 0 -> 358 bytes
 .../icons/full/modelelements/WindowTrim.gif       | Bin 0 -> 358 bytes
 .../internal/common/component/AddonsEditor.java   |   1 -
 .../common/component/ApplicationEditor.java       |   1 -
 .../common/component/BindingTableEditor.java      |   1 -
 .../internal/common/component/CommandEditor.java  |   2 +-
 .../common/component/DirectMenuItemEditor.java    |   2 +-
 .../common/component/DirectToolItemEditor.java    |   2 +-
 .../common/component/HandledMenuItemEditor.java   |   2 +-
 .../common/component/HandledToolItemEditor.java   |   2 +-
 .../internal/common/component/HandlerEditor.java  |   2 +-
 .../common/component/KeyBindingEditor.java        |   2 +-
 .../common/component/MenuContributionEditor.java  |   2 +-
 .../ui/internal/common/component/MenuEditor.java  |   2 +-
 .../internal/common/component/MenuItemEditor.java |   2 +-
 .../common/component/MenuSeparatorEditor.java     |   2 +-
 .../common/component/PartDescriptorEditor.java    |   2 +-
 .../ui/internal/common/component/PartEditor.java  |   2 +-
 .../common/component/PartSashContainerEditor.java |   4 ++--
 .../common/component/PartStackEditor.java         |   2 +-
 .../common/component/PerspectiveEditor.java       |   2 +-
 .../common/component/PerspectiveStackEditor.java  |   2 +-
 .../common/component/PlaceholderEditor.java       |   2 +-
 .../internal/common/component/ToolBarEditor.java  |   2 +-
 .../common/component/ToolBarSeparatorEditor.java  |   2 +-
 .../common/component/ToolControlEditor.java       |   2 +-
 .../internal/common/component/TrimBarEditor.java  |   2 +-
 .../internal/common/component/WindowEditor.java   |   2 +-
 50 files changed, 24 insertions(+), 27 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartDescriptor.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c3193fd9ef95e62945158833e9c18f3e3840934d
GIT binary patch
literal 495
zcmZ?wbhEHb6krfwc*elMo9x7&<}8rrER^9Ql;J9z;U<#lCR6AqoZ%vt?JkkyE}7$@
zSQe;M9wbxXC6ntRSLCf&>aSEDs8SWITo#~I;;&K}tWg`LSsSKZAE{FxsaqeZRvoNf
z6|7bsXwVcDvZ^q2bz#WL!q8QPp373bmZy0xO^sS#61BcGVs(+%@)W<-8F8D-eO9FU
zuS`qcUKzM9J#|xJ%ErWut;rn+S~9jJb{uGG+t=8>zp49RYtGK3z9X&uN7|>H>@3-x
zShgo|`iYLp{fQO(5@(#~n0K~&*2&I!XL=T2=<7J1)N>+n&Bgw8mnLkyGI7hbiHGh^
zKX7~6|Ns9P1`|;H$->CM5Wt`Vaug^|7}$Lp0-BmzTHD$?I=i}?<RyBVq<n>Bd&FJc
z+<9cW#4JoKZEQv5I(U^7lr=SU^hMeQRkU>V4EO{(*bPmsxcIxc9a%Yh*jOf<IC-j(
G!5RPv<cVwm

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif
new file mode 100644
index 0000000000000000000000000000000000000000..30dbf6b097d2349281ef8aa541990ac02ccd357e
GIT binary patch
literal 587
zcmZ?wbhEHb6krfwIOfM7q2sR|-me`qQ!9C;e`2jlnVnYFPR;xyx-~9(wXXWLZU%L3
z#*LoFO}>_G0d^h!b{zrfwJY8F<Gd#&<TR}fnidx{Eg@)HQepeXu$d{5GZVvRrIhz<
zO_-M!JFl>I($4fnS;>paJ0>r0o4hV#Nq+9Kg60`}vzJ%3&pA-OuA*{X<Hog<wr=R_
z*)w_DhW?$Kx_55w*}J7{@7AvU+d5Y7ID7H*k&CB~p1g2;&y7QSZtmQ7Yxmy!U+%s9
ze*5+JXCGg@`||7i=RY65fBgRC&-X8XKYsu8`P=WW-+}1QHz4`r&$l0czW@CF{pX*b
zzyACmltA$(3nK$VJ%bJd5P;%@fqg|oeN%HwYm0G5XP0rSp>O|$2}Z33-WqE1G7=(!
zKKiYC?j9a)UY=g=?mDg7uG44E7If8aHFb7&+TpO<*{p^Az`;WYo7wD-pRhL<=94pT
zX129mKZ{ROQ-!yg$@=bHb3QA-$CkJ18DG2<67`dnRaKB`W-$3`!prT)$-&9P-^^06
thl{b1qfgkcDMCV}soh!5oNI-|^Tn=>j><+^G7A%&+qk*@u`n@M0|1ELV=n*z

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b225cd5e7eff03b548ac67cf89a219a5b564ad70
GIT binary patch
literal 227
zcmZ?wbhEHb6krfwXc1%3aM)lGu)-o>gGa=IfP@th2{R%xHe_VXFlqFvD45Vu(NWNF
zprGNzga#n<!h{JsW-K_cV#SFCCzkCvaN)v*2M->+_>UJT{$ycfV323fVE_V<oeZoA
z57hfoGUsKiTIK(E--q8dT#xTm?Bh5!-D1Lm0uDtLJ9hV!lR0i2?fwT1S4OFJtZ51O
z!6P%JK%#p?gutYO>JL`zxO=l$QZPcAt)j+eHfxO>Lt|5Qv9WqeT836im$sTBgEatw
Cpl`(h

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif
new file mode 100644
index 0000000000000000000000000000000000000000..710188a996266d6a4263249d010e55bbb2f1013b
GIT binary patch
literal 587
zcmZ?wbhEHb6krfwc*Xz%|NsC0{`t@MFF^G7+xOpJzyC?EU76FgHXy#Xyk~3M<aHgB
zmVf*4=j-?1KY#s^(D5&9-&i|oXY-7`9g~;0&pEJq$Jx){e)}iZe*gLB>yJO0`A0Of
zcWPzr)Jk5d9Wzrqy#L<I@9)0+`u_9x?bqM;-v1($;VPWrCX(qUQ|Kp_?JkkyE}7$@
zSQe;M9wbxXC6ntRSLCf&>aSEDs9YAHRN}8v8LUwordb=NQy-~T9jsmztX3Xq&=eK2
zsxV|_Vd$zt&t<7m>q{e67kMpDiQ8Q6vm(`hWm@v~%D{E$shbiz4zy%!OKjiY)P1lu
zXJ=CXk@hJkJ1h4m&N|sS?@Z6)3w>LzP29SnZ{ylYJ2!Rj+}yKmL;wD59ecNQ?cLgS
z@$`|4r;h@|2OLf`ArybIFfuSCGU$Lz2gL~k`-+CdrskH`mY9ytu9((X{{9IQ;##AW
zMTLd91Uc9xBU_`{SXudarFhxc!doN6r_Y?tE*{Yu&%(mIgK0NQLW}f)1GW|i4>rpx
zom8?6Gqye@(=4Z=GTl5lBvjW*MXp(1^`WYnueV=7ps7u>!rQlc_I3`=POcs%%>rV-
zjT~Lv+$ZhnaO80A@YbASP`Qc8t;tEm$s<MaX$w~;50~zZ9Sp6UebTI~ObpflD}~-*

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ac4ff2118b48081f44e1ec0d8761ceb761f2fc4b
GIT binary patch
literal 561
zcmZ?wbhEHb6krfwc*Xz%|NsA=(9qFQ(NR$_AtPhPgb6!VtT=Ju!h;77UPL6!&~Vsb
z5wO7{VnIN{iinI21q~-EIxZA69GJ1-fJMNH9S1H5Ww;7wxQS%C$rSpDWxGq{xJ%}E
zD3%2(l?TZbc**2?$Q5}jmijA|2P&5ZD3$oDR0eC*hH2J@>C{K6RR^nA1*??@8Z<?P
ztSSsySs1#i&~sU8)cVqh)kR**Q{pz4`>aUyUzwJ?y)tlJdg`Xcjsq<j+Y;ONH+3Iu
z&DojMf24iN$<E6CiL*|2&O6hy_(I>7YZHM!0{d(T5Q;xp7#SGc8FWBy1;q&idtZZl
zQ*%peTYE=mR~H*oU;l)DHg{$L!Ra$*3h^+zvj_?=T(nr2kHwu;kbO0~uEv_xe5~$V
zf}-0+HQki8ckpq!^9pht;ZS#Wah28L;Nx`{5#+qgsb*_!=isQSBXWVC_aU#GzMg@x
tk*S4>I~(`=_ezE)X6Baiij&(Ut!(V26+{XJiX0CwQkKw>;bLL11^^5Oj}`y`

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.gif
new file mode 100644
index 0000000000000000000000000000000000000000..57f410224cf0e125fefdfbfd424b34ca32650ac4
GIT binary patch
literal 379
zcmZ?wbhEHb6krfwxXQqw(BP;BL>-Qf6T{<X<y&?58+Ul5tu5E>aP*iM?lCLeYNChZ
zME|t4Kq*J#ax2FU508od{<Ffvm&EBd7#nw3InMI%nB{K;WK47nUlQ)o;E}c@t$c0y
z+S6-yUD|c^!PU4~;T_u>@|VOltj+J(UOww!N5}U3iQCI3ZqHwGu%qFO+M$;f|G|KP
zbfEZ?g^__lk3k2d733!dwiyo73p{kh9NV1~0xTMO)-@+?HCpL1C+*_|jkQs$L%3SK
zWZD#%Uw+AK^#3sVq2$yax7_cq>g;#(C^lABHOjI%u}OEy<@M@F%Q8AK@K5dOm7mJO
z;KV30f4Z*Rd;#G}fjokO)8$r)3o+Lza0p5E$no(>iVJg;1ab?@$%#scNeOe;IkR(c
Y3G?y_b8(z@@nG_1@(Z}@>d0UX09ibCp#T5?

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d289b194fb6f9229adc4f0dc93850e926fe0da0d
GIT binary patch
literal 321
zcmZ?wbhEHb6krfwxXJ(m|NsBLaN)s+4?kYK_;BFF2iNdL6%8{QIu;x_aU-K*LP5if
zf(aW=T)6Sz#Rs7b7oiMS;S4vCOgEWAKe23gi5z#y91q2^K$!wBnOqOKB5$SgK$Xg1
zjoL8H+Ay8^NVV!<^{QacWvO1vQ+!sW`man2T$i4@DKTSPV$RN_%KeG6PIk^a)3f+O
z-<E3=fi3~Nhy+6MCkrD3gFb@}NDs(Q3~X@+rWbhVNVUtK|9GP?*U4Kc{b*LKgIn`8
z1HoPoRbe-06CPdlkX4gT@~N)kNX-<pQ@9vz`(Ml89}jCK7bh<-6IUe%9}6=tM<sg?
Z3om;mH{VQ7?n+i}b`Gwlnk9}5)&LAfXEXo+

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif
new file mode 100644
index 0000000000000000000000000000000000000000..64173281d286c3eaad051b4f19e6393d1e6f7f40
GIT binary patch
literal 607
zcmZ?wbhEHb6krfwc*el+;K8TUXMyPB{Rf{PJp6qB!KcShzMVez>D1Yer_X)7c;)NW
z>z}gnrrdw{`OVw!8M%|wvil3m=G?mb_3_iMNf~`9S^YUhGfJu!<d@DUuU%B%x~isW
zSwq{Zx|S6UZ7cU3zW?&|w@;sc#w2%CHY|Dn@kd74B=7viI^q3>(UZ&*rdcJ=uuYxi
zkTKUWW3Ef~eD~aiUImMNi<kMAEcY*69$2<QJFHhHyjL%Bf?>=g<Jif@ag)swrda}Y
zrOk3FTea)z+ZCr@ZoK&B;LUe_bFK!@yOz4*R^HmXRh#e6Ircne$&HrXk0u^^^78xt
zkH7xE{rUgHum5j;{=fS9|I45M-vC8^{eS-R|HnW7Km7Thon)5<LiX87_7$1dZG~nP
z8P-$E4JTI^wiTGot<nGg|33o_fZ|UUMh1pt1|5*upg3V*-_wxX)ZEhA*4}EWZf;>^
zZDXsWr>|ycY?5r}?BeO_=I-U~;oxZRG{e-)T*FdROIvrcfuYe1CB+>(cdGCyC`cuX
z2(y{;s<N80sxmP1vdA11;^vmWa_#En3nE-h9GvVAm>3^%GTjmp72xL)lMob_RF;;N
zOHK;>@$=Wuq~wIapj9kWlv+C-n?v{YycA+RHAT~Jj?Em4R<9X`af@trep+&Js<y99
d)W%OOr)TIy1ti_v<m&A`U1y_$lL!ZcH2~+80Q>*|

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2b6925602975de13459862ee32e1b0d97549bf67
GIT binary patch
literal 129
zcmZ?wbhEHb6krfw*vtS14M4Jip`qcxfddT<4GjN*-2XuK|Nmgt|Nocvyx7!pb7tC^
z28RQRKUo+V7&sYpKsrHYFtF$uob+71*W&e;Zz}u`3thLHvffHb@LI6&tBu~rX=+!^
W%6nF7^6M^V>~uRaQAn7P!5RPvM=;_5

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b7c3c562a84a27efbd225a694b4e00311ddd0781
GIT binary patch
literal 348
zcmZ?wbhEHb6krfwxXQrr{qvviUx4WEx9`8de*cqRyE3O~Z9sf&dC%6i$?G~ME&ul8
z&)4t2fByO-q2piJzOi=F&gL0=J0>r0pL1aKj<cV?{q|3+{r>ZhcJ!>TKmKUuAJNR-
zsg<=;D|w}M%uMa@{(CRKzx(p*`_JFEUw_|w|I6M7U$$=O+qibp&Q0ArH}`DY(7%6M
z$KEYnd$)F7JbmQi>7)Pu|7RctDE?$&WMD90&;e-z`H6w8(qTq{hmKJAi6up$DW>xR
zGFHzJ@>LQzayVeef-bE?2?rul#8{eER;-HIeB0@1NC_tkqfLT-g`jCeV^gEEjADC7
zr=qm8tg>=`R7}6Dvz*F|nJTI?C7k6KEL^nEg->MpiWPjWVhR%r71&*c6t-^L#^uVn
Md(U1@Cr1Wr0A~!CQUCw|

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif
new file mode 100644
index 0000000000000000000000000000000000000000..16d63ff2495cf72b733d25700545d6bc28b6a506
GIT binary patch
literal 352
zcmZ?wbhEHb6krfwxXQrr{qvviUx4WEx9`6NW$nLy|0AR0C#&OU<dU9VyE3O~ZF$eu
zZ$JKg{r>ysuRn>E%Mz=WB~~u=PiiS_-&i|oXY-7`#jQ&dtCprzFG{Uh)IR6H>K$jF
zz5V&|>+kPB|9t!L`@yRp4_<wL{N~5kAAi1l|IK7ockku*hp&Mm-#>l({rK&Vr|*9J
z`1NPfr0Pi%s{{NjrcWuGJ*{xg^r9uRvlh(ET|Osc$*imeGxGj}0Rsk5{K>+|z+lOs
z1CjyxiGi*5z?=dP9ii+KOE!gVv78t1VogPIrq-0BE)zdo=-PNb;X*=>L~GL;j_jDt
zw^=yDa+b0%+9cdB6pa^aY--YXwrKC@?6Oqt?dzZ5%pyHy>Qok2cJ2JA7#TKK4kab6
n#Y!5BIb4O*=M<_7xk@UkZQZ7(AmJ(?$S=O{fPjFLBZD;n(S@u*

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif
new file mode 100644
index 0000000000000000000000000000000000000000..610f58441a37376b23e26b89ccd311ebdac642b4
GIT binary patch
literal 342
zcmZ?wbhEHb6krfwxXQrLG2_651qWuVII&>Ei4{98XasZ^L`<+qnBkDIpku)Shm08-
z5fcm&CM?)-Az;RZhy^z?R^0HIaUo&FjfxF78g@LGaNxm(4?kY~`0?S#kHmP}#CXSw
z9J9hStM($J%y`>|9HWLDv&2ZpX_fl@Mf!#DR{z0(fqFpkCkrD3gBpVl$ViZ%7}$y(
zf>&-ZkdSC^KID{X<~y<Dv0|f-hG<LbX%o>7w<ST19d5o#>#A}E7wRtEQ4_ao$K@}3
z?wT|`e=e@9CR<luC@!m}(Ap*;uO{77FCncaGpSNSW}2A9y!i{}si?`#UASCMO=?D^
Vq?+P}jhi;BZQZtghngdUH2^{`bL{{C

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartDescriptor.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartDescriptor.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7a31c5065d57d40e4b01a470107951517514b531
GIT binary patch
literal 361
zcmZ?wbhEHb6krfwxXJ(m|NsC0@cH-G@4tWk`t#w-@0ag?e*X6R`_Dh$e*D%5=y1qb
z@aEGmhm097Km7dk?f08cKfnI??J?s*!;S|N4m`N<;m3;~KR*2UQBz=7oo`oNVAoz`
z)KO;LT5Qu;Xj5NcJH6I?Qnf`xj!|E^Wn!e`iZ<h=Ehf_{^_Mi8%x^NCQ*Zj<ME|BP
zgY_MTYub%gwi@>r>0jBDab;8Ht-Uo@H)R6d26iJ(Lh&aHBLjmegAPaq$WIJxZ3ku*
zc<2a4o=`D5ptFtR!it`&D!VusT^Ae8ytv}1kdx9v9j(=oZ$e#oMQ$Byk}(twZV67^
zZ!Z|+s#PiK!zfm#<*L9@)!NRX;Ht=M(BdOzz^Uk}%q~5xO`2cXRfb7PRD6}V603}>
lERV|OEh+-Cu5xT_e7pDVk#m)ol#q}*eDt{6X;()EYXHB3l%W6s

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bbbdd559a918bb27921ae8feb93d597c3c4cfb75
GIT binary patch
literal 378
zcmZ?wbhEHb6krfwxXQrr^Vh#0KmUIF@$cJ@zcmwfCsnV`Y1vfJzNNf(XZ@7DP1E+b
z%s7})HtGH6-(SA}O{iL#TDLZ{ab0ouw(N=t`BlAdKK}an_0O}nKTB%6UVixX<JaHf
z+O9XBem!~n<N5oaPv8A``SI8D_dni!`CZx2UeVBY{_XGj=H~jA=9c#QuI}my{pAz;
z%co5$UN9qP&eZ(bQwyd~DqcP(W67+n|Ns9p5CIf_vM@3*7&GXA)PnrPz&8EB%mNP`
zuH+L-f;6X0op+v9L`!&^*W4WU#;avfhr(YL{j3psyy>QD%Ty=D{`L=jry~!Aa<ZIC
z5vZ=M({j>Om5~t@6>9J7(sa^L<>ggUVxK&9nue2_s@MWCw)qRi)SZ-7`Bw7@u3E#V
z;v}ug#Kg=juyy+m2`3R%DJe!q)`N$Sh&TzWGMr=JKYN}**oo)*jhi>!?zlKISOWmH
C)28qM

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif
new file mode 100644
index 0000000000000000000000000000000000000000..013e818ecb54b04fe97baea83dc819b9688b2c24
GIT binary patch
literal 347
zcmZ?wbhEHb6krfwSZd7h^Vh#0KmUIF@$cJ@zcmwfCsnV`Y1vfJzNNf(XZ@7DP1E+b
z%s7})HtGH6-(SA}O{iL#TDLZ{ab0ouw(N=t`BlAdKK}an_0O}nKTB%6UVixX<JaHf
z+O9XBem!~n<N5oaPv8A``SI8D_dni!`CZx2UeVBY{_XGj=H~jA=9c#QuI}my{pAz;
z%co5$UN9qP&eZ(bQwyd~DqcP(W67+n|HJ{spDc_F4E78<3_t+#69Zetf%yd<I#Qi0
zMc-VVbhM?1Gu7B=;iS{gJ|EYp+@J7%8sh~HnQ3h7BD+ew9)Ggjo45aQBV$y^$qKvj
z0EWuy+WN*AepUfNHg+Kn7EUhi<izO(O=%ffIe9Z<isqEguc#8MscTq}(z2p$^|IDg
S9f2YeD(c}{I(ku#4Aua@vc`@8

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif
new file mode 100644
index 0000000000000000000000000000000000000000..edd6060d56111462e76a9d24fd82ad3987855ee4
GIT binary patch
literal 607
zcmd6k&ri~E9L7IwZ6t&-=gCl@Fz}ng*O{rIfQZ0n9qQgiHx4eH2i+R38pscsV+D(b
z)rv{3b?MM8+PbuLvHp$L0*#3{{JuXw!~Tk%`|I^Q+Y`p2$*DyXGNE4x2_csrJX?w7
z*B<6pHu7taavO;(7c!Q}0vD%@w;4a7tVw8#vO^#ZAT<qY0KYY@4p7sy1Aw}w{UPKK
zph3tHrA<m(jI}6j^A1bfjDhH=7;sL7Ae?h4ndmf2E<_!)27x0=nv|Td4#G}3i>Ff{
zcs!HjQZT`@+mG{4W2NGH{z*(b*xo6wNAD?bN~`Z*FYUd$-~3tLd%0XLt>)slGt1M9
zUZa%qpI)N>J~lXi4k3(&&z7Ejf^=UJIGIXk(!rUTAf69}=C^{g;qYwG^TJa|`JR`<
zzRKGQ_C*}ZxNc}jK{|(H+=u<n!9nNE&(-Ru0QPp-uh_fB#_Zp|Uz@|z2AgWRYO(1@
z^#)a)!nds50|V}h?*4A8+uA>gCoa3ptr6F;(d-(Tz&H9#CiUY&Wpj5cH5|2%7QP1N
vvX?Age<A8m=X#V6)w`R4jN!V{8wo5V_lwRu`bf|2yB|BMao^l~0eSuc=ppg`

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ba1a1998590c2272dc738106576ca74b9c6722a6
GIT binary patch
literal 953
zcmXYwL5L7U7=@n{QjoINA)yXxn-LQg{t1a7Se9-So#v3Y0)H$7?+Xh9g%L@y7U7f9
zpduVE1`&nerAyH3vN4B(E*(6C3Y{d4UbE#~hM6DcfB*O199(+-={>J*#%A2W|0{q5
z2na9=Py!`Uh$0lD0yR(*m8e2B8qfkQ(TFBAqXRwA6P@TnHwG{QBQb~}49~aWfD<Mx
zcpealKn57ltVKbTh>}qlMNu3TQ6p+bWmH9VG(?MN8I92t&CwA(qGxnQS9HffjEIpj
z7(+1}MmWM5W?12=V~!n(OfaD-D+{tjmdwH|%HpiZ8d)<dvns2zAzNh2Y|N%?&W`Mn
zJ+m{rvO5QIM2^hC9LnJ|(vi+I(@IYSlXwtGkkBN;0+wJ&7P5%NtY8h+WF@Ou%?7q$
zOE$8J&Fo+g_GBl!*v$cs;7AT~h{H7KppzyodeWa}hmZmVO*2%W5-O=e6{%Pis-c>y
zRF$gLpcZPWMm4Ef9qOT;>QtAyHJ}k1sX+~CScV*O%9JI0JqXi{iDc@U#TkVHmvBiJ
zy2!<@a1GaVrK?=+2DflaH@eBq?r;zHbf>%A?E#PQNDq3*W4+l7+H`v&pL74${C4i=
zw*9X=HvoU*vGuF<KY_bG!i~EhJhX7{{v)?O9B+Pe@$45Xm$v@?!=KyUes1@V+phh3
zzdn6$@0n-bIk|D^+|u&R9j|<T`q_IvKDl~j|E{f%9{zge^s&bu+VjNP<>h_HU)b^O
z%d1Zwz4gZRcTc>2{^z5se?0u#cgIgHUf|-9!*4ycw)o-)YYQ*k4E?mijc0dXdjHzK
juMT{F^|ME=TwVO~j$ck}xo@X7U4HGK>z_QZfW7|$<xs|!

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0624021bc1ecd0a712580622c66eb03987039afc
GIT binary patch
literal 570
zcmZ?wbhEHb6krfwc*ekxQ8p>RvM;ZyS2w)hAZnsX>}2zVX*MY{9n$AGWXy5Np6{A7
z-y?sKXZ|AZ!lgb%OZ-Zf`<E^YEL))+)~g%QXAnKnGJURj;<SqT4$F*r_61AJ>pScU
zmb#R!@@d@a+qgAq^3kX%M-yhBO`LtUf8Ud}=U(o-`sU!xcYbrOhA+6DwER}y+Peko
z?lx?DF#q`TtDpXV`u+d)&;Rd!{r~v;|I45M-~Rgl<<I|zFW<cW_5b(3|6l+9|MBnt
z@BjZB+Zvl%8+v;y`+6#8OfFh5GiUjnj0H1tZ{EE5|Nno6p#v0uvM@3*xH0H}oD7N+
z2KMO<ZcWWCt!?dX!otj=tm5n(+&ugOLd~)o8k$-<x+;3AYU<OPx<pu5+1NR`c=-gE
zxH;=@*}6^Nxp}kp9&MAo`*t=t=_|XsDj8}Y*S2tJcGQ<UE^nk@ZmwwR*le#ac|*)V
zM(U}tL$j^Eu!)JVm6h2?E4yat*ImNaKYvLyGwBySd0;q!{a_;_8)L+Y4T{b#0?JZc
HEDY8FkcqU&

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif
new file mode 100644
index 0000000000000000000000000000000000000000..25c66a1838d71db5fced12c0afb549a283a3b94f
GIT binary patch
literal 145
zcmZ?wbhEHb6krfw*v!CCHFGy-)C`4;xdufG9cz{ZwylWoTiv;GU*?px({>%4cj)lu
zTgMN+KJ_0A7#J87f3h$#Fz_+x0NFqj1Q-}t>@J-2T)o#K`}(bEyiFAm*A-7zn7Z9I
w>U8w;-FWB6BoSkGjROlFIlL%j^LX;mz@W*8so_9mCJR%D_w&PVtCSh60i=6AEC2ui

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif
new file mode 100644
index 0000000000000000000000000000000000000000..64173281d286c3eaad051b4f19e6393d1e6f7f40
GIT binary patch
literal 607
zcmZ?wbhEHb6krfwc*el+;K8TUXMyPB{Rf{PJp6qB!KcShzMVez>D1Yer_X)7c;)NW
z>z}gnrrdw{`OVw!8M%|wvil3m=G?mb_3_iMNf~`9S^YUhGfJu!<d@DUuU%B%x~isW
zSwq{Zx|S6UZ7cU3zW?&|w@;sc#w2%CHY|Dn@kd74B=7viI^q3>(UZ&*rdcJ=uuYxi
zkTKUWW3Ef~eD~aiUImMNi<kMAEcY*69$2<QJFHhHyjL%Bf?>=g<Jif@ag)swrda}Y
zrOk3FTea)z+ZCr@ZoK&B;LUe_bFK!@yOz4*R^HmXRh#e6Ircne$&HrXk0u^^^78xt
zkH7xE{rUgHum5j;{=fS9|I45M-vC8^{eS-R|HnW7Km7Thon)5<LiX87_7$1dZG~nP
z8P-$E4JTI^wiTGot<nGg|33o_fZ|UUMh1pt1|5*upg3V*-_wxX)ZEhA*4}EWZf;>^
zZDXsWr>|ycY?5r}?BeO_=I-U~;oxZRG{e-)T*FdROIvrcfuYe1CB+>(cdGCyC`cuX
z2(y{;s<N80sxmP1vdA11;^vmWa_#En3nE-h9GvVAm>3^%GTjmp72xL)lMob_RF;;N
zOHK;>@$=Wuq~wIapj9kWlv+C-n?v{YycA+RHAT~Jj?Em4R<9X`af@trep+&Js<y99
d)W%OOr)TIy1ti_v<m&A`U1y_$lL!ZcH2~+80Q>*|

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif
new file mode 100644
index 0000000000000000000000000000000000000000..81d54f3192b7255ee504a683afe2e25fc72a0140
GIT binary patch
literal 608
zcmZ?wbhEHb6krfwc*el+;K8TUXMyPBgNL6VKlyg*?8npRK3=@?_3HIc_aA<K^Y(j2
z?&P%W{#$pyK7RT&DWfkXtG}dbL3!<>`qou7P0JeER@JqvXlPrx@9_PXufKiz{4*xG
zqq1R%gHPG}k3U?3YO4DVR`(rfoO-aReN#r+B>SL}_Spv&oGKKZD%3q{z4I6Ag!dap
zPjbng@1DERt6;Hj@iPCC<^HA11It!ST5+7os!ltsS0}tzFLHum%p~L3$;NS$oys@3
zl&uPH+qUcK+ZCr@ZoK&B;LUe_bFK!@yOz4*)|_L{W0u@_`ThULU;p3!{Qu$C|2IGX
zU;X_5<<I|bfFi&CKmYmv<DdT@{`}8QvdaP?`|Kq9icIUaLbHkt>nY`ilPe6{3e4u#
z=>G=;23i8epDc_F3<(T6AWJ}T!oa?_A)%?crM0ao-n2czOxwcJTD?<KS5M2p$T-2)
z*~Q(}rqj;N!O`AnmYKPQj+Msbsrm+nv!tcAOPO?<NXc<YN(v|N^Rbw5s&=ZWFdSzV
zJ<Q9&A)(Z%eC6f^es(5SHib?_MkYo!rrZ1iJlwLK@`6G#B4XkRalSu)cK-Smmk=|{
zqSMGga8fh-;vB}wOF1X2`%lqm^!Ug*MK58CNu*J#=OoSGNi|cHQaQy8Lf0%=QuMS-
Pbh>_YP~;X30S0RTeCPCY

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3e53cbdc5fc65bfd4f7178bf328195067ae8b7f1
GIT binary patch
literal 377
zcmV-<0fzoZNk%w1VGsZi0M!5h_xSzx_x$+z{rC9%_4obu`2F?w{PFbr^Y;Ar`Th3z
z{B3!U@%8-h^!xAg`fz)V=<oXK@cQZR`R?=k?ehBb_WN{wis<k8?DG5S@cHre`}g_$
z?DG2W^!x7f`t|ty=<xdI@A>NS`tbGp@AUfU@cHWT`R?@ld4PxR^!k5;gnomA)#u}c
zhk%5Ke~OEHii>=Zj(3obc$JcLmXdUvm2an<Xr!8IpqOo(lyLw5{{R300000000000
z00000A^8LW0024wEC2ui01yBW000J-K%H<%EDmkRq*5ugv7XTA(<Z#JLfEV}bQ9vP
z+bvF5V@XP-3j~CQlps0bjAatlMfeOpLKDhZ7#JKB9EFA)F+wmb9Vs3s4ih8}krOXM
zEi4)h8X5;92O12WE<!6T6$q-Ss;w$QC@cg9v;hVRvmXQ~LKZ9l3IiJj1pojE1qv2I
X4=e)D(9r@9LJQW{*w{wfLqPyLJ_p1#

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif
new file mode 100644
index 0000000000000000000000000000000000000000..37aad784dd4e7aa04e1ecbfbc79e9b48c6116943
GIT binary patch
literal 358
zcmZ?wbhEHb6krfwxXQqg*tsL6dsjx^p6m&Gb0_V~pS<6_e6?rA8t<xgel_cZ>NbQm
zZi;N#65GD*$FDz^pME*>=<|~EZ+6}KaOD1{jLi@8wmmA_^|)c*)1D*Gr=NVa{_4B0
zzy5yv_2<#Ie~-WY`~2(gy>I{TfBXO7+rNk3{=NP6@8hq(Z+`uI|LgCx&eTPHv2(i<
zW_G3Qo8`TGhVS<20h^`-t(_dUd_vU!|Nj|?1ByRc7#SFh7<53&L4IOjYj&7f;Gx6C
z+s3T4Fv38pp&`LRKukmQH0$Kf3>D!Miwk`8W}kntMJu`S-iIHvRZC{S`?04}FT3$e
zgRYaFqDotPhl-w)zM^{ngo*0<P6kS<GiJ_GHE=RimS4DNvAm&^rmXa;)oY|RowVd+
gHgDM~qvfP6$G2ziK0a+Hjl)Nd9(6n6;>chP0Fl$Aa{vGU

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif
new file mode 100644
index 0000000000000000000000000000000000000000..37aad784dd4e7aa04e1ecbfbc79e9b48c6116943
GIT binary patch
literal 358
zcmZ?wbhEHb6krfwxXQqg*tsL6dsjx^p6m&Gb0_V~pS<6_e6?rA8t<xgel_cZ>NbQm
zZi;N#65GD*$FDz^pME*>=<|~EZ+6}KaOD1{jLi@8wmmA_^|)c*)1D*Gr=NVa{_4B0
zzy5yv_2<#Ie~-WY`~2(gy>I{TfBXO7+rNk3{=NP6@8hq(Z+`uI|LgCx&eTPHv2(i<
zW_G3Qo8`TGhVS<20h^`-t(_dUd_vU!|Nj|?1ByRc7#SFh7<53&L4IOjYj&7f;Gx6C
z+s3T4Fv38pp&`LRKukmQH0$Kf3>D!Miwk`8W}kntMJu`S-iIHvRZC{S`?04}FT3$e
zgRYaFqDotPhl-w)zM^{ngo*0<P6kS<GiJ_GHE=RimS4DNvAm&^rmXa;)oY|RowVd+
gHgDM~qvfP6$G2ziK0a+Hjl)Nd9(6n6;>chP0Fl$Aa{vGU

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 16d87a9c49..f84587b8b6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -52,7 +52,6 @@ public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png")); //$NON-NLS-1$
-//				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Addons.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 1963b3ea76..08c1ea03ea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -60,7 +60,6 @@ public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png")); //$NON-NLS-1$
-//				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Application.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index f7a962be86..b43fe55612 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -75,7 +75,6 @@ public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingTable.png")); //$NON-NLS-1$
-//				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/BindingTable.gif"));
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index c7f4bc3132..01d09e2d93 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -71,7 +71,7 @@ public CommandEditor(EditingDomain editingDomain) {
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Command.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 00d1935f3f..8d4f3708e1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -46,7 +46,7 @@ public DirectMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IPr
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/DirectMenuItem.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 1fe284e840..58dce81561 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -45,7 +45,7 @@ public DirectToolItemEditor(EditingDomain editingDomain, IProject project) {
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/DirectToolItem.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index 1b96a69451..332cd2f951 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -73,7 +73,7 @@ public HandledMenuItemEditor(EditingDomain editingDomain, IProject project, IMod
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/HandledMenuItem.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index bdc0808588..e6c904ed58 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -73,7 +73,7 @@ public HandledToolItemEditor(EditingDomain editingDomain, IProject project, IMod
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/HandledToolItem.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 0ed2eac203..76fe6b43cb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -58,7 +58,7 @@ public HandlerEditor(EditingDomain editingDomain, IModelResource resource, IProj
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Handler.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 5fbdb5ee35..9df457b8ff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -74,7 +74,7 @@ public KeyBindingEditor(EditingDomain editingDomain, IModelResource resource) {
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/KeyBinding.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index b9b52b084b..4eeb588c6f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -104,7 +104,7 @@ public MenuContributionEditor(EditingDomain editingDomain, IProject project, Mod
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/MenuContribution.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 383d8aab20..06e9155219 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -101,7 +101,7 @@ public MenuEditor(EditingDomain editingDomain, IProject project, ModelEditor edi
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Menu.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 0d97e1f193..25da1ff5c1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -62,7 +62,7 @@ public MenuItemEditor(EditingDomain editingDomain, IProject project) {
 	public Image getImage(Object element, Display display) {
 			if (menuImage == null) {
 				try {
-					menuImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/MenuItem.gif")); //$NON-NLS-1$
+					menuImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif")); //$NON-NLS-1$
 				} catch (MalformedURLException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index c8b160bcbd..9beed58ead 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -44,7 +44,7 @@ public MenuSeparatorEditor(EditingDomain editingDomain) {
 	public Image getImage(Object element, Display display) {
 		if (separatorImage == null) {
 			try {
-				separatorImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/MenuSeparator.gif")); //$NON-NLS-1$
+				separatorImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 2b4e6b921c..ae4239c405 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -74,7 +74,7 @@ public PartDescriptorEditor(EditingDomain editingDomain, IProject project) {
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Part.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index a154bc9fef..ede939b53d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -74,7 +74,7 @@ public PartEditor(EditingDomain editingDomain, IProject project) {
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Part.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 6199416884..f5426e3fda 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -91,7 +91,7 @@ public Image getImage(Object element, Display display) {
 
 		if( vImage == null && ! horizontal ) {
 			try {
-				vImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/PartSashContainer_vertical.gif")); //$NON-NLS-1$
+				vImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -100,7 +100,7 @@ public Image getImage(Object element, Display display) {
 
 		if( hImage == null && horizontal ) {
 			try {
-				hImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/PartSashContainer.gif")); //$NON-NLS-1$
+				hImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 53463c6c13..6d2362f751 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -86,7 +86,7 @@ public PartStackEditor(EditingDomain editingDomain, ModelEditor editor) {
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/PartStack.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 7d54cd9b47..efbb64e1f0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -90,7 +90,7 @@ public PerspectiveEditor(EditingDomain editingDomain, IProject project, ModelEdi
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Perspective.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 45d3e9163e..c5fdfd9eb1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -79,7 +79,7 @@ public PerspectiveStackEditor(EditingDomain editingDomain, ModelEditor modelEdit
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/PerspectiveStack.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 5a79bae233..5a9c4ae362 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -65,7 +65,7 @@ public PlaceholderEditor(EditingDomain editingDomain, ModelEditor editor, IModel
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Placeholder.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 4bd21de456..93d3401cb3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -92,7 +92,7 @@ public ToolBarEditor(EditingDomain editingDomain, ModelEditor editor) {
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ToolBar.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index effe2e31fd..a15848fbdb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -44,7 +44,7 @@ public ToolBarSeparatorEditor(EditingDomain editingDomain) {
 	public Image getImage(Object element, Display display) {
 		if (separatorImage == null) {
 			try {
-				separatorImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ToolBarSeparator.gif")); //$NON-NLS-1$
+				separatorImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 21ddb8c23d..ba7e3a80d9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -68,7 +68,7 @@ public String getDescription(Object element) {
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/ToolControl.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 717cf6940d..20fa76a201 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -76,7 +76,7 @@ public TrimBarEditor(EditingDomain editingDomain, ModelEditor editor) {
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/WindowTrim.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 254dc19754..5be7359726 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -90,7 +90,7 @@ public void run() {
 	public Image getImage(Object element, Display display) {
 		if( image == null ) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/Window.gif"));
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif"));
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();

From 47c84f960e21d7b19b6347b5bd0aa687f8df3fae Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 23 Jun 2010 15:28:53 +0000
Subject: [PATCH 0151/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * adding support for ToolBar and MenuContribution

---
 .../modelelements/ToolBarContribution.gif     | Bin 0 -> 129 bytes
 .../e4/tools/emf/ui/internal/Messages.java    |   3 +
 .../tools/emf/ui/internal/Messages.properties |   2 +
 .../emf/ui/internal/common/ModelEditor.java   |   8 +
 .../common/component/ApplicationEditor.java   |  20 +-
 .../component/ToolBarContributionEditor.java  | 350 ++++++++++++++++++
 .../virtual/VToolBarContributionsEditor.java  | 258 +++++++++++++
 7 files changed, 640 insertions(+), 1 deletion(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5915591825a5301b9f9a3d398baea497ef02311d
GIT binary patch
literal 129
zcmZ?wbhEHb6krfw*vtS14M4Jip`qcxfddT<4GjN*-2XuK|Nmgt|Nk#u?74Zf=ggV3
z0|y)wf3h$#FmN*HfOLY)U|`WRIO(~1uf^*x-&FV?7P@XXWxbV>;I&}kR~x;L)6}k-
WmG`XF<kwx!*y(m;qL45ngEas=zcG>k

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 183288dca6..f6bafe952a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -24,6 +24,8 @@ public class Messages {
 	public static String ApplicationEditor_Commands;
 	public static String ApplicationEditor_Windows;
 	public static String ApplicationEditor_Addons;
+	public static String ApplicationEditor_MenuContributions;
+	public static String ApplicationEditor_ToolBarContributions;
 
 	public static String BindingTableEditor_Label;
 	public static String BindingTableEditor_Description;
@@ -349,6 +351,7 @@ public class Messages {
 	public static String FeatureSelectionDialog_DialogMessage;
 
 	
+	
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 58fa497251..47c911aac9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -19,6 +19,8 @@ ApplicationEditor_BindingTables=BindingTables
 ApplicationEditor_Commands=Commands
 ApplicationEditor_Windows=Windows
 ApplicationEditor_Addons=Addons
+ApplicationEditor_MenuContributions=Menu Contributions
+ApplicationEditor_ToolBarContributions=Toolbar Contributions
 
 BindingTableEditor_Label=BindingTable
 BindingTableEditor_Description=BindingTable bla bla bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index d72d280599..633769c614 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,6 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VToolBarContributionsEditor;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolBarContributionEditor;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowSharedElementsEditor;
 
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
@@ -143,6 +147,7 @@ public class ModelEditor {
 	public static final String VIRTUAL_TRIMMED_WINDOW_TRIMS = ModelEditor.class.getName() + ".VIRTUAL_TRIMMED_WINDOW_TRIMS"; //$NON-NLS-1$
 	public static final String VIRTUAL_ADDONS = ModelEditor.class.getName() + ".VIRTUAL_ADDONS"; //$NON-NLS-1$
 	public static final String VIRTUAL_MENU_CONTRIBUTIONS = ModelEditor.class.getName() + ".VIRTUAL_MENU_CONTRIBUTIONS"; //$NON-NLS-1$
+	public static final String VIRTUAL_TOOLBAR_CONTRIBUTIONS = ModelEditor.class.getName() + ".VIRTUAL_TOOLBAR_CONTRIBUTIONS"; //$NON-NLS-1$
 	public static final String VIRTUAL_WINDOW_SHARED_ELEMENTS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_SHARED_ELEMENTS"; //$NON-NLS-1$
 	
 
@@ -421,6 +426,7 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_TRIMMED_WINDOW_TRIMS, new VWindowTrimEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_ADDONS, new VApplicationAddons(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_MENU_CONTRIBUTIONS, new VMenuContributionsEditor(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_TOOLBAR_CONTRIBUTIONS, new VToolBarContributionsEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_WINDOW_SHARED_ELEMENTS, new VWindowSharedElementsEditor(modelProvider.getEditingDomain(), this));
 	}
 
@@ -474,6 +480,8 @@ private void registerDefaultEditors() {
 		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), project, modelProvider));
 		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this, project));
 		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION, new MenuContributionEditor(modelProvider.getEditingDomain(),project, this));
+		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION, new ToolBarContributionEditor(modelProvider.getEditingDomain(),project, this));
+		
 		
 		registerEditor(BasicPackageImpl.Literals.PART, new PartEditor(modelProvider.getEditingDomain(), project));
 		registerEditor(BasicPackageImpl.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain(), project));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 08c1ea03ea..4d0fb5cd77 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -50,7 +52,9 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private IListProperty PART_DESCRIPTOR_CONTAINER__DESCRIPTORS = EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS);
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private IListProperty APPLICATION__ADDONS = EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__ADDONS);
-
+	private IListProperty MENU_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS);
+	private IListProperty TOOLBAR_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS);
+	
 	public ApplicationEditor(EditingDomain editingDomain) {
 		super(editingDomain);
 	}
@@ -168,6 +172,20 @@ protected boolean accepted(Object o) {
 			}
 
 		});
+		
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MENU_CONTRIBUTIONS, MENU_CONTRIBUTIONS,  element, Messages.ApplicationEditor_MenuContributions ) { 
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+		});
+		
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_TOOLBAR_CONTRIBUTIONS, TOOLBAR_CONTRIBUTIONS,  element, Messages.ApplicationEditor_ToolBarContributions ) { 
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+		});
 
 		return list;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
new file mode 100644
index 0000000000..977a26ca7e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -0,0 +1,350 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
+
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.emf.databinding.EMFProperties;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
+import java.util.List;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+import org.eclipse.swt.SWT;
+
+import org.eclipse.core.databinding.observable.value.WritableValue;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+
+public class ToolBarContributionEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private Image image;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+	private IProject project;
+	
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	
+	private static class Struct {
+		private final String label;
+		private final EClass eClass;
+		private final boolean separator;
+
+		public Struct(String label, EClass eClass, boolean separator) {
+			this.label = label;
+			this.eClass = eClass;
+			this.separator = separator;
+		}
+	}
+	
+	public ToolBarContributionEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+		this.project = project;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if( image == null ) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif")); //$NON-NLS-1$
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "ToolBar Contribution";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "ToolBar Contribution Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context2, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuContributionEditor_Id);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+		}
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuContributionEditor_ParentId);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__PARENT_ID).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuContributionEditor_Position);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__POSITION_IN_PARENT).observeDetail(getMaster()));
+		}
+
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.ToolBarEditor_ToolbarItems);
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			final TableViewer viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.getTable().setHeaderVisible(true);
+
+			{
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText(Messages.ToolBarEditor_ToolbarItemsType);
+				column.getColumn().setWidth(300);
+				column.setLabelProvider(new ComponentLabelProvider(editor));
+			}
+
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE);
+
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText(Messages.ToolBarEditor_ToolbarItemsItemType);
+				column.getColumn().setWidth(100);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+
+			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(master));
+
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ToolBarEditor_Up);
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) - 1;
+							if (idx >= 0) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ToolBarEditor_Down);
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) + 1;
+							if (idx < container.getChildren().size()) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					Struct struct = (Struct) element;
+					return struct.label;
+				}
+			});
+
+			Struct defaultStruct = new Struct(Messages.ToolBarEditor_HandledToolItem, MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
+			childrenDropDown.setInput(new Struct[] { defaultStruct, new Struct(Messages.ToolBarEditor_DirectToolItem, MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false), new Struct(Messages.ToolBarEditor_ToolControl, MenuPackageImpl.Literals.TOOL_CONTROL, false), new Struct(Messages.ToolBarEditor_Separator, MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true) });
+			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!childrenDropDown.getSelection().isEmpty()) {
+						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+						EClass eClass = struct.eClass;
+						MToolBarElement eObject = (MToolBarElement) EcoreUtil.create(eClass);
+
+						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+							if (!struct.separator) {
+								editor.setSelection(eObject);
+							}
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ToolBarEditor_Remove);
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+		
+		ControlFactory.createTagsWidget(parent, this); 
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
new file mode 100644
index 0000000000..6ec691383a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -0,0 +1,258 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContributions;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
+
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+
+import java.util.List;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MBasicFactory;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorContainer;
+import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VToolBarContributionsEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+	private TableViewer viewer;
+
+	public VToolBarContributionsEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "ToolBar Contributions";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "ToolBar Contributions Bla Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("ToolBar Contributions");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.getTable().setHeaderVisible(true);
+
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
+					
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Id");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+			
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__PARENT_ID);
+					
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("ParentId");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+			
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__POSITION_IN_PARENT);
+					
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Position");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+						
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MToolBarContributions container = (MToolBarContributions) getMaster().getValue();
+							int idx = container.getToolBarContributions().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MToolBarContributions container = (MToolBarContributions) getMaster().getValue();
+							int idx = container.getToolBarContributions().indexOf(obj) + 1;
+							if( idx < container.getToolBarContributions().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MToolBarContribution command = MMenuFactory.INSTANCE.createToolBarContribution();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS, command);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(command);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> commands = ((IStructuredSelection)viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS, commands);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+}

From 17c6762b4ce7df6701d5859de77b4a01ef9c5fa2 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 23 Jun 2010 16:02:00 +0000
Subject: [PATCH 0152/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * adding support for TrimContribution

---
 .../full/modelelements/TrimContribution.gif   | Bin 0 -> 129 bytes
 .../e4/tools/emf/ui/internal/Messages.java    |   2 +
 .../tools/emf/ui/internal/Messages.properties |   1 +
 .../emf/ui/internal/common/ModelEditor.java   |   7 +
 .../common/component/ApplicationEditor.java   |   8 +
 .../common/component/TrimBarEditor.java       |  35 +-
 .../component/TrimContributionEditor.java     | 331 ++++++++++++++++++
 .../virtual/VTrimContributionsEditor.java     | 262 ++++++++++++++
 8 files changed, 640 insertions(+), 6 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5915591825a5301b9f9a3d398baea497ef02311d
GIT binary patch
literal 129
zcmZ?wbhEHb6krfw*vtS14M4Jip`qcxfddT<4GjN*-2XuK|Nmgt|Nk#u?74Zf=ggV3
z0|y)wf3h$#FmN*HfOLY)U|`WRIO(~1uf^*x-&FV?7P@XXWxbV>;I&}kR~x;L)6}k-
WmG`XF<kwx!*y(m;qL45ngEas=zcG>k

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index f6bafe952a..ccfa9bbb95 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -26,6 +26,7 @@ public class Messages {
 	public static String ApplicationEditor_Addons;
 	public static String ApplicationEditor_MenuContributions;
 	public static String ApplicationEditor_ToolBarContributions;
+	public static String ApplicationEditor_TrimContributions;
 
 	public static String BindingTableEditor_Label;
 	public static String BindingTableEditor_Description;
@@ -350,6 +351,7 @@ public class Messages {
 	public static String FeatureSelectionDialog_DialogTitle;
 	public static String FeatureSelectionDialog_DialogMessage;
 
+
 	
 	
 	static {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 47c911aac9..b40306cfb9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -21,6 +21,7 @@ ApplicationEditor_Windows=Windows
 ApplicationEditor_Addons=Addons
 ApplicationEditor_MenuContributions=Menu Contributions
 ApplicationEditor_ToolBarContributions=Toolbar Contributions
+ApplicationEditor_TrimContributions=Trim Contributions
 
 BindingTableEditor_Label=BindingTable
 BindingTableEditor_Description=BindingTable bla bla bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 633769c614..e4066ed061 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,6 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.TrimContributionEditor;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VTrimContributionsEditor;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VToolBarContributionsEditor;
 
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolBarContributionEditor;
@@ -148,6 +152,7 @@ public class ModelEditor {
 	public static final String VIRTUAL_ADDONS = ModelEditor.class.getName() + ".VIRTUAL_ADDONS"; //$NON-NLS-1$
 	public static final String VIRTUAL_MENU_CONTRIBUTIONS = ModelEditor.class.getName() + ".VIRTUAL_MENU_CONTRIBUTIONS"; //$NON-NLS-1$
 	public static final String VIRTUAL_TOOLBAR_CONTRIBUTIONS = ModelEditor.class.getName() + ".VIRTUAL_TOOLBAR_CONTRIBUTIONS"; //$NON-NLS-1$
+	public static final String VIRTUAL_TRIM_CONTRIBUTIONS = ModelEditor.class.getName() + ".VIRTUAL_TRIM_CONTRIBUTIONS"; //$NON-NLS-1$
 	public static final String VIRTUAL_WINDOW_SHARED_ELEMENTS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_SHARED_ELEMENTS"; //$NON-NLS-1$
 	
 
@@ -427,6 +432,7 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_ADDONS, new VApplicationAddons(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_MENU_CONTRIBUTIONS, new VMenuContributionsEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_TOOLBAR_CONTRIBUTIONS, new VToolBarContributionsEditor(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_TRIM_CONTRIBUTIONS, new VTrimContributionsEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_WINDOW_SHARED_ELEMENTS, new VWindowSharedElementsEditor(modelProvider.getEditingDomain(), this));
 	}
 
@@ -481,6 +487,7 @@ private void registerDefaultEditors() {
 		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this, project));
 		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION, new MenuContributionEditor(modelProvider.getEditingDomain(),project, this));
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION, new ToolBarContributionEditor(modelProvider.getEditingDomain(),project, this));
+		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION, new TrimContributionEditor(modelProvider.getEditingDomain(),project, this));
 		
 		
 		registerEditor(BasicPackageImpl.Literals.PART, new PartEditor(modelProvider.getEditingDomain(), project));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 4d0fb5cd77..4ab3699fad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -54,6 +54,7 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private IListProperty APPLICATION__ADDONS = EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__ADDONS);
 	private IListProperty MENU_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS);
 	private IListProperty TOOLBAR_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS);
+	private IListProperty TRIM_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS);
 	
 	public ApplicationEditor(EditingDomain editingDomain) {
 		super(editingDomain);
@@ -186,6 +187,13 @@ protected boolean accepted(Object o) {
 				return true;
 			}
 		});
+		
+		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_TRIM_CONTRIBUTIONS, TRIM_CONTRIBUTIONS,  element, Messages.ApplicationEditor_TrimContributions ) { 
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+		});
 
 		return list;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 20fa76a201..c496fa822f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -10,6 +10,16 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.jface.viewers.LabelProvider;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
@@ -158,7 +168,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout();
+			GridLayout gl = new GridLayout(2,false);
 			gl.marginLeft=0;
 			gl.marginRight=0;
 			gl.marginWidth=0;
@@ -168,7 +178,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Up");
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -195,7 +205,7 @@ public void widgetSelected(SelectionEvent e) {
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Down");
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -219,14 +229,27 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 			
+			final ComboViewer typeViewer = new ComboViewer(buttonComp,SWT.READ_ONLY);
+			typeViewer.setContentProvider(new ArrayContentProvider());
+			typeViewer.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					return ((EClass)element).getName();
+				}
+			});
+			typeViewer.setInput(new Object[] {
+					MenuPackageImpl.Literals.TOOL_BAR,
+					MenuPackageImpl.Literals.TOOL_CONTROL
+			});
+			typeViewer.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
+			
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add Toolbar");
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MToolBar toolbar = MMenuFactory.INSTANCE.createToolBar();
+					EObject toolbar = EcoreUtil.create((EClass) ((IStructuredSelection)typeViewer.getSelection()).getFirstElement());
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
 					
 					if( cmd.canExecute() ) {
@@ -240,7 +263,7 @@ public void widgetSelected(SelectionEvent e) {
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Remove");
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
new file mode 100644
index 0000000000..62b58f7beb
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -0,0 +1,331 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
+
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.emf.databinding.EMFProperties;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
+import java.util.List;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+import org.eclipse.swt.SWT;
+
+import org.eclipse.core.databinding.observable.value.WritableValue;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+
+public class TrimContributionEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private Image image;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+	private IProject project;
+	
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	
+	private static class Struct {
+		private final String label;
+		private final EClass eClass;
+		private final boolean separator;
+
+		public Struct(String label, EClass eClass, boolean separator) {
+			this.label = label;
+			this.eClass = eClass;
+			this.separator = separator;
+		}
+	}
+	
+	public TrimContributionEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+		this.project = project;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if( image == null ) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif")); //$NON-NLS-1$
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Trim Contribution";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Trim Contribution Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context2, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuContributionEditor_Id);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+		}
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuContributionEditor_ParentId);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__PARENT_ID).observeDetail(getMaster()));
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuContributionEditor_Position);
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__POSITION_IN_PARENT).observeDetail(getMaster()));
+		}
+
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Controls");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			
+			final TableViewer viewer = new TableViewer(parent);
+			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			viewer.setContentProvider(new ObservableListContentProvider());
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			
+			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(getMaster()));
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout(2,false);
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) + 1;
+							if( idx < container.getChildren().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+			
+			final ComboViewer typeViewer = new ComboViewer(buttonComp,SWT.READ_ONLY);
+			typeViewer.setContentProvider(new ArrayContentProvider());
+			typeViewer.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					return ((EClass)element).getName();
+				}
+			});
+			typeViewer.setInput(new Object[] {
+					MenuPackageImpl.Literals.TOOL_BAR,
+					MenuPackageImpl.Literals.TOOL_CONTROL
+			});
+			typeViewer.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					EObject toolbar = EcoreUtil.create((EClass) ((IStructuredSelection)typeViewer.getSelection()).getFirstElement());
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(toolbar);
+					}
+				}
+			});
+			
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
+						
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+		
+		ControlFactory.createTagsWidget(parent, this); 
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
new file mode 100644
index 0000000000..245466d599
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -0,0 +1,262 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MTrimContributions;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContributions;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
+
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+
+import java.util.List;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MBasicFactory;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorContainer;
+import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VTrimContributionsEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private ModelEditor editor;
+	private TableViewer viewer;
+
+	public VTrimContributionsEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain);
+		this.editor = editor;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Trim Contributions";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Trim Contributions Bla Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Trim Contributions");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.getTable().setHeaderVisible(true);
+
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
+					
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Id");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+			
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__PARENT_ID);
+					
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("ParentId");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+			
+			{
+				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__POSITION_IN_PARENT);
+					
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText("Position");
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
+			}
+						
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MTrimContributions container = (MTrimContributions) getMaster().getValue();
+							int idx = container.getTrimContributions().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MTrimContributions container = (MTrimContributions) getMaster().getValue();
+							int idx = container.getTrimContributions().indexOf(obj) + 1;
+							if( idx < container.getTrimContributions().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MTrimContribution command = MMenuFactory.INSTANCE.createTrimContribution();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS, command);
+					
+					if( cmd.canExecute() ) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						editor.setSelection(command);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> commands = ((IStructuredSelection)viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS, commands);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+}

From 97091d456c1f3912b9f330e1c5286a162e370fdf Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 24 Jun 2010 10:53:16 +0000
Subject: [PATCH 0153/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * toolbar for part * main menu creation more visible
 * element container have to allow to define the selected element *
 ModelFragments miss possibility to define imports * Items don't allow to edit
 enabled and selected * HandledToolItem Parameters are not hooked up

---
 .../icons/full/obj16/headermenu.png           | Bin 0 -> 711 bytes
 .../icons/full/wizban/newclass_wiz.png        | Bin 0 -> 7824 bytes
 .../icons/full/wizban/newexp_wiz.png          | Bin 0 -> 6210 bytes
 .../icons/full/wizban/typerefact_wiz.png      | Bin 0 -> 8536 bytes
 .../eclipse/e4/tools/emf/ui/common/Util.java  |   7 +
 .../component/AbstractComponentEditor.java    |  11 +-
 .../e4/tools/emf/ui/internal/Messages.java    |   2 +
 .../tools/emf/ui/internal/Messages.properties |   1 +
 .../emf/ui/internal/common/ModelEditor.java   |  70 +++--
 .../emf/ui/internal/common/VirtualEntry.java  |  22 +-
 .../common/component/AddonsEditor.java        |  16 +-
 .../common/component/ApplicationEditor.java   |   4 +-
 .../common/component/BindingTableEditor.java  |  16 +-
 .../common/component/CommandEditor.java       |  17 +-
 .../common/component/ControlFactory.java      | 125 ++++++++
 .../component/DirectMenuItemEditor.java       |   2 +-
 .../component/DirectToolItemEditor.java       |   6 +-
 .../component/HandledMenuItemEditor.java      |   6 +-
 .../component/HandledToolItemEditor.java      |  10 +-
 .../common/component/HandlerEditor.java       |  17 +-
 .../common/component/InputPartEditor.java     |   6 +-
 .../common/component/KeyBindingEditor.java    |  17 +-
 .../component/MenuContributionEditor.java     |  19 +-
 .../internal/common/component/MenuEditor.java |  21 +-
 .../common/component/MenuItemEditor.java      |  61 +++-
 .../common/component/MenuSeparatorEditor.java |  19 +-
 .../component/ModelFragmentsEditor.java       | 206 ++++++++++++-
 .../component/PartDescriptorEditor.java       |  94 +++++-
 .../internal/common/component/PartEditor.java |  90 +++++-
 .../component/PartSashContainerEditor.java    |  53 +---
 .../common/component/PartStackEditor.java     |  53 +---
 .../common/component/PerspectiveEditor.java   |  53 +---
 .../component/PerspectiveStackEditor.java     |  56 +---
 .../common/component/PlaceholderEditor.java   |  72 ++++-
 .../common/component/StringModelFragment.java |  10 +-
 .../component/ToolBarContributionEditor.java  |  18 +-
 .../common/component/ToolBarEditor.java       |  18 +-
 .../component/ToolBarSeparatorEditor.java     |  19 +-
 .../common/component/ToolControlEditor.java   |  17 +-
 .../common/component/ToolItemEditor.java      |  57 +++-
 .../common/component/TrimBarEditor.java       |  11 +-
 .../component/TrimContributionEditor.java     |  18 +-
 .../common/component/TrimmedWindowEditor.java |   4 +-
 .../common/component/WindowEditor.java        |  75 ++++-
 .../AbstractCommandSelectionDialog.java       |  17 +-
 .../dialogs/ContributionClassDialog.java      |   4 +
 .../dialogs/FindImportElementDialog.java      |  26 ++
 .../dialogs/SharedElementsDialog.java         |   4 +
 .../component/virtual/VApplicationAddons.java |   6 +-
 .../virtual/VBindingTableEditor.java          |   8 +-
 .../component/virtual/VCommandEditor.java     |   6 +-
 .../component/virtual/VHandlerEditor.java     |   6 +-
 .../virtual/VMenuContributionsEditor.java     |   6 +-
 .../common/component/virtual/VMenuEditor.java |   6 +-
 .../virtual/VModelFragmentsEditor.java        | 233 +++++++++++++++
 .../virtual/VModelImportsEditor.java          | 277 ++++++++++++++++++
 .../component/virtual/VPartDescriptor.java    |   6 +-
 .../virtual/VToolBarContributionsEditor.java  |   6 +-
 .../virtual/VTrimContributionsEditor.java     |   6 +-
 .../virtual/VWindowControlEditor.java         |   8 +-
 .../component/virtual/VWindowEditor.java      |   6 +-
 .../virtual/VWindowSharedElementsEditor.java  |   8 +-
 .../component/virtual/VWindowTrimEditor.java  |   8 +-
 63 files changed, 1674 insertions(+), 372 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/headermenu.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newclass_wiz.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newexp_wiz.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/typerefact_wiz.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/headermenu.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/headermenu.png
new file mode 100644
index 0000000000000000000000000000000000000000..45c2900089c5b3867019ddf2d1c9c41552d66b32
GIT binary patch
literal 711
zcmV;&0yzDNP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!SxH1eR5;6}
zQeA73VHoxY^ancWw4D@m@^;YSAP9np4uTP}qAym|P6m$lk>uCxwbv=KH9zoUDon>V
zr>U<Bo72h04n!rzfhMlb%|XaUSI_-aGAUxw3pWq%&2`<^bzje;0HFAv`e%aI>xI+l
z#KOV?tXAtCMJ|^E)z;P)Ha0epPNyNuGGeh9*4Njuva*6;Fo-}P0FTGRu}4QoI5;?f
z$z&=kve_(-kB`yqcK=$PP6rN$<5RocMzvanBuNc}!7!r8WHP+bYPFEh=h197LA^$!
zfn+j?{r!DJA`y-Wg+eHo%iPh-%*<dfgH$So?d@$uqfudVa}&$U%L0)X7Z(Lu!)CJy
zL^hkvg3ssU`>WOJf!=_4JdR?q$TO(d>pTNeCUT`x=_#{;C=?2$j;X1sGkv$Py1I(P
z!$Twz39zJva5zj#0@-C@2}IWEbb{S(Co+D!Mh2YN-Q7j4Rs)eqd1+}0rBaCoa%Hv(
z_V)ImR4Tvy@g2C`Zb};S^YgG+ER-}@($Hu$P#T`&g=Gkj-rm5_>p@&oUYt1fLwX|J
ze5DHBL!@j);j;`WIfC2L1zdi5R^$Me%XOaFdp9>XM@hqIG(xY}Q_`58p2l6>Rjidv
zSo>h6-65tPLP|ZR0blt578bWNJ3BinisDB`9zE&c`pZjrU$*1q7cN?9zz+a>(-SOd
zeqB2|JMjDcJn8ZAag2?P;mWgfcq8A3P9ElDU1GT3!LQP4wNR;4n4FyKbHIS=TjBtW
t@&m3+C;j&_I88CIp4At!{qxjQ|2w4%;hGY8=Cl9+002ovPDHLkV1ip>OPc@y

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newclass_wiz.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newclass_wiz.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc123864111e5acc8a884143fbcf463cf8775588
GIT binary patch
literal 7824
zcmV;B9&h1^P)<h;3K|Lk000e1NJLTq002t>002S=1^@s6A3-Z300009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde00d`2O+f$vv5tKEQIh}w03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`
z>R<o>I+y?e7jKeZ#YO-C6Rk-^K~#9!?3-zjUB`9bf8BR^`<pjAfFXzhKmnjgg5V;S
zxKk3vDB6l&VyUu}l@F|ZNy>68f8iHfsgzQRQ=uw$99I|>Whtq$%CSV*imlBy6`3-{
zP!PcdTtt8XvCd#H%UkcexBHxYxNjZ?<ZuNfK%nnbSHHRMzP_)2_uuE7KHbmo568O4
zfBchUfht8+9Z{tQl)`_&au%QnD5+8x(TXaiweP>{VLkA_j|Zw$L@A1BNkuE7#Oq!A
zu7&mc-#k$gp{%O0LV#)w)xsNn=3NErkN*6m6{Vo6HB|y*K$SA8RlvO2=ifE3{`<G*
zYNA>;U{!%!O?3mYd5dja^02=AmvbdiawP$pOQ@t!Ghp;>v~|hC`pS3bV^!*^8X3(Y
zk%OvXD6c*Du7&kKzkeza)w(LhSHUpG&;Vl9ch>eL1?zwP;8aDGssVcz4?}1TBPxV?
z4((qOu)hAc3(-JLF~F;o6I#QV>f5tVmn5t|ePp2`O4VSjzRC(22#qmgs(Q|#ex+f3
z<432h2&0O|>ltg454|x_jOzKh=dUEJhyU($QIrv5hB4EtEqQ1RV=9=p@AG~Mu<pD6
z`aQtCz@5Mzpz%7FJ_0-m{P4jq?0xv{-sfA7F4h$)Ms-~b20~-ckBwTV?Q;Uu06q)+
z`q;$O?AGl&n3>ti)YJ^cVg+k#ehXCuPcP{(KYxs4M_=anvBR7^c61qd82J2yU)X!-
zjqde-9$U1cjH(igf{G#vqKXQLf~tnrm@!c`q9BsLFRRzCt>x_h{h(IO+d6Ns&OkE1
zamB7H8`s@*E90XZs1~ZkVUZ{ZvBnSt2EpOI!%0deDQV_NGf(O=mR3&j;&V^){8RhL
z()25@2kkF^vJ|N@rm9v3oq07Zg}@lbRWWBETwqxD-GBXEz(cb;-!r@CeK)gda+cBZ
zIOVv4!D5U(t5L-xn&Ii=G$GSAnRZFDjDBiJdWLpyndhE*lKnq@avAu|2fwiQE32RX
z&f`lZg@y>It^#@$EX54MgYax9=NDG+HbMPv6h{x;_K)vwTz}(jY@go6cx8%0SjL)&
zz(iQ`5)fesu!IAEX7F?j##pdI5cRNy7RD4Ao8G|GmJP+l`GtG0zHxMR?~hJ=>w8Zu
z*MYjOiJf#%&@->Yz>I?lb@kj^sdfGHtM@o3W!-oG^$*p?Mm}@f$3MjOsrNEnyDWz?
z0AvX0`!@6411xl3p_4AN+&h66!HXvohZ9F^E5t#8MtPE{kx8oMfIcfEiPCNrXm^`D
z^Y=gF_<>_jUw7@l`6t`9exkXmlJ%5j4RxUO8s+=~loh^pP_@t8`mwv%wP`n_r70{S
zfr+t1H2d=$ZSCV^`{!6nRN^V>g;^#lR}%*nqM!^wE1AQIqnXSx-#NtolY6PeqwLvy
zBXPM$X=DK>HLkgR4}!nu$*2C{&$ey-#D`z+dj-~%jnR_GFDGO%ZvoV2tE1HiZu;mg
zT({+BYVjC>DH56jDwZRypK)a6Daz4C8pUl?;t3*CAhZz%OJE|5$!{a-hs9}1;=26V
z)Bm13XFp9bs*(nCxabJ2r5b&g^6cO3<MiQ`uYcm>fAO2IR+d3yYs_e_9QXw(%cv5n
zY6zI{&5U^%hYwtH&$aB>w1aY79@rm?7vZV7Kd0vsHdJq-UYMa^OGLIvWD7(#CNS~P
zQmtA8MRAhhG^Le1PaKpOEpDXmyO^wwPc{=(4%1&LvhBtzXf5vj)L(t~)BFF?hyUck
zHPLwx7}L=68AvHclt@HFRU%cwSBuHMNfQrkd;d1JOwBM_t`AM0myDmD_y(Oc;qs9?
z7%R?F2}h_#qtv2t>d^%CXo6ZeMlG747L5<e1hsISk$94kXp*Jwai%Jl=MP};5DX!{
zGYwdRIAHtDSKws%xAr~trOm5fDhf=)m~)E}6^tmc^ICCU8_w&vh}Kmps}ij@>g*eN
zzQ$!Ev(vMaTsAt6B6(5e@#Ej1-A|Yuy@N_PN;#}k2^&<x2Gy`ZDX0;e0@eh%_gnL4
zO+aX3ib0hVtrwZ8?;IwZ7y`2xV^9^!jS`dZnW!H*`q%$<0IF`xJDYi^5_qBLyw;u5
zaqqRRN@<{?cQ)M_1f9PzbKOR^Pfg<SSR9Jy#l^>1Xq{&F#!pfSM=1q0ib0KXP@@o(
zF$4bd-IqAH^7ouhUg1>tWt?|33Nw_$QD#SOV5W8zhgY6v*TgM@j^w^v(ZMq{hzNo(
zxpRVrmlr<u-1GnA4|ZRDUt9ET0Ww}Fc&`O78i~Fpg>%kx!_PEkM;hbfRVt+buPFhJ
zzI51sVlT6!H&KfxiEW8OP@xo5hM+R(@#yg{bF%XS)8$=Em3J^v*oISwmyF}>7x~V?
z-zW1K<)}_Ms*_4@V9jLEK|xi>yu+!(Mux`h2uBWl|F?Hvec$iAm5zBK&H+h5<oryh
zUk}!=k8G(jUN7LZ2d01{<%JXb5ee8lvYXfziGv~qTOzilA*jDN_<8ElH1}No+Z4h&
zst&(eBxA?et#q>{FE0LsZnlDudq-7|sN}Da+!1(BlJ$v;hOzfFn1A-APtKp(`=2Hz
zu5Z1b9dcevPP8b3mGeB4w(AVR*{B@uDNe@JD+Z?tPWz<3$BT2%GgiKw(8h!&CNjC_
z3kFX0he!U1Mtm8!Z2FhPVRbOgaftdez|;}gkSoS+<jTq02BCz*55o#M15Z4Cmy-1R
zm{6&1DzpE&uYO=1NI~YcmN^|4rHsC*<2paEfP0IRF}0FKZAz*MsdhNIyg;kJ!gO^z
zp@|6XYKZ~E$<7PRbq;dP<j2XRkCQ%5(!6Mjmkh5NUe+j0v%&fN{~T(DAHWqHnak)V
z34&0Zi0O2W->~{cMTs(}Bbn1tRSLi8pme=qcx_=kq*8)R6I3liz|qBo%sVElTd*d?
znjo(S)60V^PcTv1j=_*gA5{Tz1MOGUGXOS(C@D@eoaE4)=4A*LPv$cEE~Qv0QkV!?
zezv_+M5D}U*$a{K%RAPCHEYX;DE4HU;MI^NhEuI2s__^GJNOH+gDeBU$@T#@*RRQg
zOUy6;RrLd4uLEmUg}PRaeKJXh%F42gB(;QfgY(Hw=NZvoCZ#tRhId8dpf;tiJyK0r
z>2^qcA7etS$zvd6%pkd!9|xCzhN_TCk5sy(zBecdsqc~bgj5nzpO8tPRQhC+<hAz6
zWNpbodU2#KBXb$Oem}Q&Wy`VSe=~g{(%I{JL$97x`-Bo8K(hmVpAebV8Gw1s)UxkV
z65pZk+C#Oe=3Xr~+Gp&PlMJsZnO_B#44@`wph|+198~5r`l%8XLxPfFW%-2-8#jDl
z?xKJt>PQs=wFuDb$MjtfY;h0^<(VW=zh*`rk+?2B-x>s_X3cdn^m?l{$!R*so(@1s
zZ&32rPBQvwf2b_y2dNp93w5loEO8_vn86G@b7h=lSj|w?Gi8{5GmIB6XR&vZT48jU
z>|5>F+H6Cvt~6K8z+SBm*}nAX`+Nv{btGw@%w?p`;XL?@5|%pp10X1P&A`CHh5cx5
zu7|;-s3$O%UE{a##K~_nS)IuZykVFfRh4{ZDXU?@86%%cFSlU>SgG$0LyT6ZH&B+t
z33xR~R~fl{=gA8JYdr)1WO~}u>NpbV)0I9>9EB*viRXCp&>GK{+aQ3OHhqlaE3Yuu
zIZV$t>A4nN*P`cI^n9D1Yv#3IJ(t&s@6dDY+}`>20Ae0OG}~P=mwQAL2wpOz2Q!;K
zICrtYI^?=SujlD$N=k+|eagiGU^uw&?65O#Fq{NWDXQ_2EAHd*!+%S&e>#WbR_MAW
zUAHnUJ=dh`nrnbHNqmcB71SWsT4{C2vVnnj88#5IrVxdd0~gaU{Go4hZ_*JW$q0-^
z;si|$^>Ud<4}OQ+wtZ}1ocp9EA(V*Nmih3uf5E}UXZX(kZ?bd4dzq?D69&;>N+JWB
z<vF>0f)mTfY4_Xgp565tn<na6Txyf~Y@jShp$zF!Aucp7Dp-%me1O}T&~F>!sz;*)
z-wl{()YyOM2#+8B8*ZKb2%$uzCL-`5hJeTx_*XZ6k?S{ph_65M0DBLAn?`wbuyP`#
zE@P#;f~a!!^!qtD|L8E<7tQUUS5H4pSz77foFj9da>e9cbiP2Xx@F%*1M9&r?0xdS
z`>#LbnlhU#T5L6gVuD+aiQ|A;rNsB1|5L8scvGHVCpar@9NGf!o4JSg&D_I$=O|Cl
z{g}D-5mc4w%4Vjjo7ue~&tcvD<#F0cn>Y^9f$Bs(M~*HHhM>neN2y-Grw*B~vg7uD
z{^N_v8v=hUhYP=x);fe8B`hU)il~HKK0U_M2afRN$G*tFzWv{=nfd2anm8yD+aiI9
zn5taHhqnFNI;oUAM!RbI{VaEnF&0*b!?4**Xf}H|=gFKy5z2M&a{-mg%=a22JKA!A
zqKDT@WqgSf#bxP2a?0YZLn~dJq^NORv3ZJv3;TKS$Nz!FWNzU7nsod!?QEG=wnW=4
z(e*1NzCD}*^?Zx2U!k2X(#%e=xp4){oz^gn==6FVIkHTa<sQ&E&&Y%Y>(K*cHcY?&
zdlz!|&blkodw+Byx#9MWr9et|G3xO)C1_;0r66Ac4lVUciRX^~od0+D|1w?Q#7Jcn
z5tpZ9G#$?W`qCxwgU~>_^n5c97krCXmS5uO6F*^eq)6s7UOCjH*UNCu;habDY`&sG
zc)UTpG_mj2n}6?Xt6{LNS&@FDm1oemz9RijU;*54`^G1=Wj<Y*o@gK;T5lsbq?bqL
zVQ82ft+Lo!;gJ`<&kOVW$Rwp+8bOVaNuR#&<bkGiNu)#KTSH(!UwDS+PCm&CbI&q4
zR^rghO*-uq=W|fr3tM+gFjkl$eNwsZn&0|dy|%S;Az_&}SvR~lC`aF%_}~nQUBFKr
zrgKD4uX#RekfP~yGv-crSZ*d@;IhUn<CQ5cYiwPc&E#}@j)l%VM;2eEn|6q!fXPOM
zv<3a1!+F7bMI~frW||%E+0OE#r>XiaU%Ts$Km4kQ3>R5t&Bl;7T4Ys~_1~9uu2&sG
ze5WhY50s`xKD*)0o%H-1zJ8eI$&}Q$QFX(O9tML5v^puh#L?`eYj#=a>PidcQb-&H
z)T%N4wy-eQ$2&p9fP@%IY}~MstFF9~rJo)rJ(2DE#7DpJxx8~17S@~YqS^bS6W`r^
z{n)HY!aY;7R}my*#6gY7R<SldYod%1;@DCxhm4OF8E+KwdNi-c8b#{W2yt-wWJ-I*
zqY`2%6WSV~9bxmP?Ob>DO)UQO2)(1N19#r`d-oTM<7wUr<)XA%uLAb1tFEbTbt~zf
z4YSu$j7N!sI+3jt*&30p6Nfdzpp-A!n;?(BjLl!0fPNP`EyLoRA!)~0sSw&akr^Sf
zbwXQb*Y<1K^WK{|`IBd8y>jZn2k!XKpBruLXrJleg@yH&m%vXgXXBs$(g*)*RI7e!
z=N%s<Zj|X|%XE@OlC()b>yWxGGDzxqmuC*r)RFdmE_H8EHK<rr0#pLffLdjY-MemN
zq%_9<A3RKdv9<56+rRj`jmD1lS(`jAcAEuodL^qVR7I5k^3Xr~$o%P-zqI{^yX%{;
zxdjOv?d}52?&%y@)+2KXnM-j#8+f+dyRCjn6@z#~wLHq!nVoFew1XqhJjP2;{D4Mv
z_G=%x`wzeR+7A8-z*=l(k-~(oY4qvm|9bkb9(myNN!I=3_C5Eo?b^E`gm!n4c5j(Z
zZ<%&?B?sm*oH)D}43=`S&gAGO#z!_%iL1=L{1neW{w<{M_FZ-5ul={HcKy=>>jSt*
zVZC(dSfC;WW6Vex#+$u!Q{MT8cWz9D%_4q-I6u9(d~Dkj&po{T<+;5~ZQ0G_WmhwG
z*;O<qXHj*C$}p2^jK!LOPIG}%N1tK-=(8Mq=`l7nc5?N$51-ny>AGhK?4p`*QB81K
zjcs{?Whb`n)b{!==sKsF%LRIIz<TM>u?ZEK7B3sXY{$!t_kKdWOp4FXi}&N={MhQ}
z)2z$Ob9*^)`UMu6uW-8g3e}N~R7W-r&1RakS)BhlwbBIR^~;&va2;ExuP2Vm!_>bG
zf+cLQWCFWrf?ydNEUO8Y!~~08?NTOoDanGRcHgdC2w3Y)q?;JyqB!=}SnHi%Hr|Z^
z)8b@7M2?8}BjTkdA`L`~L0GF?IeTZg>+(AzkO(Dcc2C(>cVYFBm^iF3dD9lb;4sD;
zg99>SZ5Lzu#s<q++rikDvB8QO+Y)SB)Ha>il}v0Wb*7zUws+BF9j=(2Nn2g#R4J&k
zBC5s<W8V9ch#C<Iy-29yBkwg7^^uB(B3M-kRW($Fl1@fbgB^825Y!cns%8R;S}%%M
zW4tQj)nuy1c{Q1c@m_G=BTkH8&t_dzDH>xKQN`vRWDE$c4YGWnN|0jn#S9aGA4u1%
zkuz%~9tEasttqb#2_1I)jP$)S_?3j7*#~+7p}gf3O(*dcFh#&H0Cf(#drc6S5|_wv
z7OY<12S62csHk&kJPK{;T=#xn%*tv2!TA7X3?{sURCN}tB=serkPkg`&OfcY)KoQu
zm1bfMrg1(Lb*ZZAjIs=)3gejb^JC30Fa^V<r78gHycB_r=L;0%;R2W7VS%mYJpTMQ
ivL-gh*h>-C{~rKy(Y&;(zo0t+0000<MNUMnLSTY>rc|c@

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newexp_wiz.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newexp_wiz.png
new file mode 100644
index 0000000000000000000000000000000000000000..a473ea86cc0497d99b0a46bf0ca5b96a63e6269d
GIT binary patch
literal 6210
zcmV-I7`^9-P)<h;3K|Lk000e1NJLTq002t>002S=1^@s6A3-Z300009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde00d`2O+f$vv5tKEQIh}w03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`
z>R<o>I+y?e7jKeZ#YO-C4PQw_K~#9!?3>$<UDsX5zrVHiK3AX1oN;_@d`V+sCKQ?k
zoD$lm>O-Lw6+#H{fLf^%PrLyV>Yspk;Q=85QV|azTD3H^qJh$wRBh7YG`Bi#-Na7q
z@qIiqXJ*cAU)S%;!`?GKGah?x$If`t^)P#%*?X_E&u9PEcYW7ytu6RPS+)H2m#<n9
zC6WyiH2`Jr7g&}7@&S}d)Kys}Q64`2zK8WUU%O^WRFx>HvP@-FiNb2<zHedu?Q_@5
zs;H1G5U?O?Ad7dq=6wb0@4tD&C{ZL?BVk1V5*3iU0LWU`zi(ju<9|-ol&lC~NB~(h
z)deWXI_uc+u)g&CR9T5Ek^nFZp)!G*0KyH_wPRuZ^S5snNYqLC!VD5JP&EiD!~c8V
z!upr*Oj{-EBuXn_hzObh3gqVM-chjr^@ZswiCqGiWjq9)5j3dqxP|(61gx*TIOFHh
zQ~-b#k>eRbi`<w#?MPT({q9UviCqFQT%ke&cp}mwxn)ofG_0?Gf7YmCj9_6kv6igq
zwUiKYG~f9^!upSwW=l#mM3y|$N+tJ1(4s;%-skNgSl@WLT_;c#a#aihcw$DQQ4cJv
zZ~b4}C^1Ifx$76eGe%lEB8_?=VLg9p&L`0l(A)`v2&^&EA|c?txsPoR>%U)_D-&qm
zRip)C1<iZW^oEPs&Y=G1)%kkvy6^tPt+Yhso<I0)3+si~=9>VjYl1RTm;2O0wp}xP
z@r?zeWQ&Bq*16V5MTBM5+m9XI>y01UgNa(j9kT{CC6XjH?fIVh`Ps?z?B$zD_ko7>
z-8UCZCgkwf(jH?_FoK${II&(e#ix$Rr@!~c<R5<N8`mCfcjBcK@pz-)KKaz%%b$Mc
z=(k=v?SJLcRJ;~2A>onq0LZq1^}W*zK8Y3qvsP~=0&7KX6a8w*6rMgVzyA-<o%xf~
z?{>yNdEzLJA8A1VD1o;puh_5t@8u)aviF&ZqlezSG=*1}E+#|?UzHvSpM-}M+0$(S
z>!r6kIVi46LwzevlD7?GjvunezkTZb=iWTOF#g3a9KzB4V*p!lsxUH(M-J9;vwaXh
zI6b}Z#N&q!Dseh>^i}CQg{LIQ+Xmv>N8n#R)A0ec)_X6$mAc644|%-do<8}bseQlq
ziN|nw-vnG5!D1F=F94Y0%8d%9=Xwx<i4)eHW1U1fkD~3ZSwH+~*Jmc?>jGts6pcZ7
zSf{KJ^T7k=pkVOC%ctAV^a7esedH+Sy8%3DpxQL>y&@6^lnWtL3D^g$H#~K=drPC%
z<8cJmv(nI^He!vK1LM)N|9<kFKYRV1_QL@1#PNLq71w9F_`vQGNC)Q}tcjr{jFC;>
z^Lqm8m7isxHX;MQXPP9J{nA5w&AyYbOn%|QRPgYhf9?c6u(yHlzcz^*?LOkv!Rb8u
zk<E3;!L#pfDYEXnX1)4$&ljL28v$iy*J?Vor-_L-&dvPNAAM>9PaZ4d=a(*G;^=P7
zE(AzY#UQ$jnS~-2`Z3yFV5Tz;*?eFvzX5V^5McRUfl5+%-2hEegn4r!B<p?h1Rk>+
z$+tkNC?qNBS#;#RRi50tKD+Ql7@>G#Vn4!o25Cwd0eV3KQZc=71f@a@-y>9kFfKr3
z1kI2f?0^03bKm^oTQf)M)!KF%UdgIX3&6$egTmqcb@-OJG#w#`fxWE?&P=wktL(v=
z>~iNaI}oQFRb;Vv^3|J1{_Q(IZhiDupF|j^2xGUcGZIna@VmeD2!b%dTvyQ#iHDkH
zB&kCf3yc5)3$+=nBvEW7#XJPdo2r(|SD&7Ev~}#^F_g+BZ0RxFhjMOm21W#_Q?$D&
zI)fBSAaMku6xL+GQk$i?5=ZD3Xbr(K(f-}dcL!1NLkfd1PPcthFmVb6aD8@wnS~hh
z-3X3=a|(e$oH$69nE(Mqi6V8nX%8@TS@0`Yr~AKsZ8|_dT6ho=sOSx1INc3}V7?cl
zA0$vEoD#+mLFAA+F2M?-G=sHC6EMuU@XUv5==9@goJL3RTkhJ1t(AgvjI#`ac*bn}
zd0&}wID2sxzyA0EB&i~bQ%ubTP$g6ef=E)$J1`<i9h@6UGc5k($;S@-!IO{e-?DW`
zos^xTlzW3^NdzwaS^k-TNm7=RR2n2KGY0|Y2NypN)o0IMoc`FCU%2qBF$SqqL{W;H
zbA6~PoXghCI7cLj!sW?%RmEmqsduY0E(QSpYpbB%xg3-UG*t=By^#`79oi>AUEC*}
zW5p?U8Ih`pRFs)7TD)#)tGaZ(D)F0-@2UUY*M9nJ;<8~(7&`<}7Cj;gD)NYPNS#6i
zTZ*iaI{0%}f&$i&Gaqh^svILx6M<)qY$&RGfn1(A+L$?c>H><^B8pR7xH^wUtpw+Y
z)G6Y`A&64+f&~2_fzxdO>)mUCFM_f4p08v@mE%CRn8UMDg<wNoWpYZ-|ISAazx2vm
zm(w5p<Qkj`u1)t)D*8yB!YL7_iZFKQ_G9!037qPC3+ux5&<LcluKJio6SB4Ck_)_V
zL<$@I-ua&P%H`JAzxeqNKlkwuKXkEC^#<oI&0=@60;dY63RNOb9C|^Dxo!k~&zqrO
z46^nF1Ie=TRx~XMr<F~QuO_F`>lbfU{^^$=Irf)-^`}pr><waEnd%~nU6x_Uy94JG
z{Xx8?$l7v>W^yX5lPK`+(IlF^sc_rUY0pXpvUcA6ZY55b-e|kIZeZW}*sqO;r%qok
z8By#Wt1fj6Y3h)~4n<Gio5;F+Gb&?^xjhn|lH*tfR6gZCvMk4?Dg5}eA3gk97(|?%
z3vl7mET(5Vh{6zMAE;Fgl)zZM7$&KN_YKyS>Bt9AU!&Pom^Hgqjg4oeBEZN7pp!S#
z8)ECv|HU6qyxwXQU6catZj5#(LO)F46c}$5-RD2^!8147yf{*qeW!A5CNfIwCSez6
zL>9eI?x7@AHdIl(lg|>sw^kaegd;%BJeMxp-l}sopS9@IhR+p&JbJ)8e00Bl{KeO<
z{KkAQ8Z!b*fDb=ZojdXP-nXyK+EYI`6TRLWxMXErcbnbWEUYmCrNtk%43@%k%BCvq
z-At)xr2)VnHLS(0?}=Bhm};wrh7s{J)3&7D(a!bRw3DRd@cHY3wPAt3(T;0Mlvb;e
zWLa^`65P>=X0yq@-oqs?QNna;&Mn+%>%wX<?|E-HH5V61?7D+K)d*D9^`%yJ@m{VC
zx<_T*u%_n|Lvn1jC7en&3Eat4ia<Rh*`U}OQ!;{rk`MqQ*`#4MZ^Jw$v#kISlP$Uu
z0D^4a5K!b%0zw5you~qO-(a1;cvXNUb7>cQF_L~T=<X4bqN@6tM$yaPVi*J9Q|W^=
zLR#dLfrhZ8tAMa1Z6=bYMu$vs0Z_F}($5erPT<pnS;|NVxpW^ZGZi3_WY$ySY)mep
zQwdW_5T`Oo9KtA(FiH`JG2$qN!zNeddgm`*ZRSuskVOJMvYR&`iUbSRc#R~9YET*_
z%T)S+co1ojv>;2W^fEp)Q23-40a#=`rUhsPsA}f7GI)d`)kC(tNJthz$|6`0MN$g@
zEdV2VU`h6%e8FPGfe<)CTtN`fm>!JnuwdpX(swW&N7GAH<|Ai1L5xm6lx{yl&<_!*
zt}h}zATx_p-7_rA%%C(x#Dky?C0y!S1gwY@ASh9_MAhoB{?NJRvT01!0+clXU^e~}
zb*_%ZXaPWK0m|xdu8ZnwvTXK=K2=xO%a!{^dLr5pW4aX66)|%brfZFidB${#R(h3!
zS*Rz{=||F8=%YK=$6)=<P-FnIG-M!CV@zbMZ7iK)%>YD0ASHqjk%%HzK)bm3OpNri
zh@b)BLnIM{K7lfT6ohY#?Nc>-gA~k0J4PXdA(+==yP%e`B}lXoabk>uED-co_d$|U
zkc!w2jOkEJ2V%Mu=_^cMDLtj>J7SPJ3E~uC5F>~ZB<qc=Ib^SG^pUO0v>=NRDHaMv
z6_JFbuS#nm<GFOqlUks{6U#Pr>D5_LvM8AtdCWA~k}MjLdfwD52@%jzVE{_r^ewVu
zc6j{*mxV122~WUfFAGp41)-X4BZUbS2oxrCl#X)}#!h-cBAqyuaF8{>FpQZldboAL
zdi2P_7(l%8z(PMQfe4+dq^a`=sZ-Ha08X7HY1GjwvUO6q=);gclvYWDOpjoVDT_#1
z^XcSev&*Ull7(FF>{9A@Nx*LzMdmZri^r6CCdSdFG>IylBV3dqbSf@M;bO-mO`(Z{
zE;FGzBJ0o{q=rNzn<f_+>(xnk3MN9p7)h3TrXc{({KrV{tn=sYS)08>1BC-_Iq$`^
z@;z|y%SH_&G8E<x#;B1!X-K}>Wz(q~-!tWnW<a-VxeZo7bX7n~xd+@5C;`M;DPxC}
zWw3(CSpd6`>Cl!yEk>2>kf>TMvYMG;+&U-`h_{2HY8k9Bc4Yv?tm$oi$@fl+swG%)
zqDCOiQAE^EjjCIbB^V<x4jIiFQ_o6ql<DGa11oh}0<eEnpa8(PQo#-^2Efr#zE$NL
gDTs*KiLm~E0Lh}=`b@hw{r~^~07*qoM6N<$f<4&E$^ZZW

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/typerefact_wiz.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/typerefact_wiz.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cd52a5894621f89ca0c456d3fb09fc0a2c14118
GIT binary patch
literal 8536
zcmV-eA*bGnP)<h;3K|Lk000e1NJLTq002t>002S=1^@s6A3-Z300009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde00d`2O+f$vv5tKEQIh}w03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`
z>R<o>I+y?e7jKeZ#YO-C7IjHPK~#9!?3;VAUDbKmf8SdBarQaqz8^wJfP@4>yb;1O
zel+p}8=M$pkL}hO#{+THrkxgtPXDQ9JS5{8GIi1tx05Dg+Tv#HX_`6_et?Zb3K(pj
z7D7fKfdC=t>b~Fiy!PH}ef{H{dvzr)x)KuZSY&C=?5%zG*=O(H`QG1mgnwL1uCM>~
zfK{cSsvWAd0ZH(WSdIY{0*NZ^-fKyfWbxnM^|0>#?h&g>$twl#HBql6uS83o`>uuc
zUv>;8-cwZ7NWr4ohH8AG_q?lM{pI(Ej8|e+ZBxaHfGR~)%YZER{&x+mZ~kz&&8rp#
zj4IHSrgniyPVyROJ*@x!z;NP~rX&H{6rn_+O+fS%u65SJ`qqOZkt*$~8j3a{(FE0o
zP+WZMT?^~me?MxyYP%|h<6wvgoj|1e_O5+a!TQcaqa{_!0_GSVLSTdr^#pnv*FP&@
z{qKjz!j?2e0LMvAV1#bfQ?pNJC9MDR$XLlMWkHM{XN3d;5$RUd(+2fx4eRe78#mt5
zrD(L2v6iOlb$dlr&&+2o3v1i<O>2N#f!_eOMsb1O-hPe@9GpL87w`!1jeG9edEi$8
z>b}Rv3ts6ES%{gAx8#8c-RhB3_jzx<WEn_zMsa-WMVDO8#TQ@6n)5FrjtYP$b17-w
z;J|_Xy!z^kyz$z8Dzmfq0e8HU(7yMxiFSpOdc`YvRn)Vvj}p+bQQkL?`T27fZ~d|V
zcde~z^I9hjYuolsw*dEEzWLhD_r3RHoZEdqagZPw0F<0uYot0&%}r8GYs}6$cJKTJ
zFYeqml{L~k?zwB{x6UM_`=6XJUg=UL@(N4AQq{nSbbD24LO8Rq>=K}EP0Gpty5ZBG
zDt!38pQOKiHL)oZkYI_iTEJ)lTns(}4H1)L3KMkpchS+mqA)QscFX0PyWiOP*x;@+
z0qTLLCPR>3Xu5uFeq$`&N3h074>WC*w!Gq7ZguJ7^Osu|*0$}NZY`7x_kQ%VzsctH
zA0)9Igi<D;gwX`i0)`kvgkVv%cxUlhOr9qAV2-GBj?QydGd3`C%N3h@P8-;dpPo$S
z)oT7h-UJK88oB_xETq$bWsb8^cW=I7Ggq8{C4q^s5@URkkPZ^tMQqCiCPu_!#A2{m
z6EZe7#Ngq>482-o?DZUFmP>!*GJ+_$w{_jOwSMyKRC_DxKCzdw(k&wIxMyGd0e7Bz
z`O3~KHe7@;O;eU-LS!Q%n;-}x2AszuJhST|cJF<RJ^P-br?;OtE<mg1F*`d=tzMb`
zhVBJEbgDP@&@ZMs{c)AbB_F^@`@DMoN?>i<zG;mO&8-_ZpHCbKPE)Fllte%+sCp2C
zs%O{UpYq)YzClnlTzSoPeDH>UPg|)2BL>CcG^L)`n3<j9)%|;U{+Xw?Zri@;;g*+N
zRwW;PZrXU&ZdJnN&b3C0BAR&rtBLLACF?8gYuZ@ZS0K|GKC9sBMS{3a=4v#=VkP9;
zJN}s6`yb^4AN?3tZP-G4p_{;j2+iV$*PKi%#OjGkb0l5ov1a3W?0ezmt-GIi`nhe}
zH{Et3FZsx>X`@QFK)9Tw7(--)Hvi6wl&BJ@Y5*+g`PQ!U6Kqtc<|nDm7ATuC4ObyB
z5gyOq{ov0zQrX96zj!O_R$NYGiUh<M2~cl94XO&hjCUoRmhfg6?R<mv*Ywc2;s&06
z=<$2EZQpd&J$LQA<M_M!>F()Jm2L&I*ut($|NgQhbbsW-WO2YFV8X@LSOi)=;AlM5
zatS7#qET=B;`!Qj-x<!%nOzc#B3=o-*Fcp}mEic$Y97|rrE`RupTRj#wOYa!W{6Ay
zLD=zwzht<&pO1aw7S{J(P9$XlDPep8@$-@eibo~Di;z1oxk0i5p?#J1m4jS+;})L%
z@e_ZrZTqI@7faaVznp1-Qu8KN(?&<F<J$M-g_Vdj>nzd&A+5TLEZRTjcx&s%UqbfY
zz4^NSL%)5Xuw~os>ZW~46He|l^j<^f3B2lpmpq|2j0-6hKf}oEB$aHExom>jY>eG|
zA7}4tPjmf;-_P2f3o!)E@WGWRm@bl_gV>g_Cc>DOmy`f2A%R3q@7Y*^*82#PjEk<{
zKoA9Y&wI(Ay)Y93-HY#K@yc3meK9BzhyqW0sX|+Ej?n4?G=m%k*xK5@jU=lsMJM*R
zt*-s_zpV>*Z_0D+aZcM+Nm^30>@omhk5Kb9Dt?B!Y?_&DjOlcg>2#FG9=V?lA6U=2
zb5@~vz>sIA1tMy}u^0@h(vsZy8#V}n5sUZ)pBG3v6Z$vwcLH}l@#1VK(gYP)OgWLT
zEs?OTC=13tce+ryYXX2U@Jv)6<<1?qF*^4n!XP~cj*(-}7X)+e^>khGK@yXe*XNIZ
zV^wru#oIFQ*|;)Ys}Xr+rectE0)yem{)14+x#W`7U_4G!=4y4?f({hLt3yQacsz>Y
z@aj<Y%``-PD{yQ+uvbr-r}SUi%kbWzTX#P9pTGHqn}55ML}S-H^V-u_P1ol7jrbt<
zQvJx4*T2?Cd!HS7u@w1v$pXSanW#O&S9g4kzSWoV^H-kY=Bt0}7`2-}mqq(|+l83f
z=P9qg0=NHX<;x0>{?Q@6^!sls&Z^WKL@pyW0pbIu(h)`vOw)criMEoG`5N^`g~*l3
zY=hL*nxZKdRdAZ&e1_AETr-@e<eK9($7>5Bo=Uxn1UVZwU&@7j?wfag|Msq3Z|qwc
z#);`@>p&5*-0`&?f5Db@8|H4la_hjx_KnmOtWhSa5A)R>U*pCbf1e|xhfzPY2+*<8
zBr<Q?1Q&JTCl8{@425Em($wB{?`iwdm!7QL^jD_}>ygTU-x{v2BPIkF;nguaP+{E%
zdda0iU1z9N3Uq{R)blxvSaQv<gdojW%xOyQQ!-yC^9?fJAf4aWl+2~f&Q)38wT44x
zfUp1G?_9p+>g)LO^}k1Zdly~>r-n=|^&DP$<(K8JKfGhZ6)T?P_8Y#+fw5Qk4-fna
zzj@=o<ea|q86F)(y=P!>jIl{W?iKY4B6N2Y>1;1jE*6L)i}xO>PU6!F#t2D}(_P>5
zJ1c@q9vn>944(?D?`6YmtxkF3q=IuXjp>ZA!%}Q_)ciD+MuN+VgffGb5Ktmp#7fJ<
zs^Z9TJ|*>a8m>y}s-&()>T1-p3Zs+boExv=Cr>|tk3(+%(!T%`Fg!WQYr`WnGR3JO
zj1tP_E-u<|9cwOrFT0+5gxkNpjmcVr&wuLQva0U_)H?#PhzR9Ug4brpT~(XCt~eqJ
z1FUV@Pbwn>-a}r;gdrpe<>?X5E$#lyAZz~ORAAkwN8-DyN9HgatK=qzMvMdz4PRr{
zd+L>tC@VL^2{CweM7G`xO2vSJS4XZ5Qr{qTRqAezx|^e#&oVSIM1R!J!_PfMv9pWc
z`p}KMeCPlJV`DfqIBynh=WxU0goloB;o3{M?5dAaDt55C?*dl#UBJ#)_HgOS^C=jE
z2y}OrDVIvesNM1E7*4!|m;!U{m+*Sp!&Eh+mX1@hGwV)P4K2XV#|EdaegC;@0$aS=
zwWrWtB^$Lc8Pa~S5+o^;lL9U}8m*I)Yf7dKa^Gl5lCMyA73yw|MqZ(o&r-{08Japm
zTF)699cL`7@rkV;XV=Sn7@3@8bZU~ZsR_oWCYYF>Vq$uVxoV9pSB#Aq934dwHmtjn
zo>CVtzV;GF#)i1$ob#BS8z;ynC~*}B4ox#KGRfg1lMD<`QL8pkl+YT2z*2NG)HnW9
z(%x&x!ftB5K$SLB^WibQ_$SKpHPyxO#U0sxZs|GiicYuo0JBjI)Km3ULZ{5-0eK#w
zD7jB*xGJ$NE`$$)pm?0-O&jIv)Ln(y+9X30gIwIXmjChdpYgk&`y#tueu0t6F~+86
za89XJt7N&us~{#K520GmnVGB8*T0&9frA9OBesUI@nMp{GG8zj5xP4{L{Xttwo!}-
zQ5aB&LxR9!1oD;FVnis%G>;iW7=}y@jet7^$!bYg{n`(%+}Ai#|7U$Y*HP{-GyVJw
zW?ci?>NI9TvdrUr)5AH<$bCxcYYR52p3gO<$<0#Dr>W*sjLZySUBs&g53^?NdTLpN
zgTn(%%uF*rGD48$jm_s@bZ}kIs@FF3ub7^l9W9NIzY$tvNqtD8k<#1QO;)dxHmbyd
zB{qiDy(^iT9V2#AY`X9!l0qBhQcPPZp{-P)n8d_kKwu5Vn4=!kG(iSIfB<8ohlVHo
z`csxH?zwB{ecQHgx^3X$U*5a%#!oUDPg5DK5Ui|2SRt=jyym2?MlF~nwnai)z+jqo
zi>6o1wL$8d0LSOX*s|h1{P3}#^QF&xf#>({VQOZI+3`s}b;bJ*ZTsl$caG1jdbZYx
z>g~l^*H=D1vh`2y|Kr>L;iX-xKK`*U(pl=^rM<g}j3Ks$$QnXp76Mi8J+B=cW^6*p
zoo@xPLU(78zOFKz?L`W4h&8e(9Ws<kCGsr8SPR+P?C#ui*UoQk+rDY)h426Ey+NFG
zx<RO3phSf^{AAcP;y$P0D+Ce~n2^9k3;Cf}htquFRcXwz_sAj2r7{PH2N;<cqcSnY
z?f>LvhK~e)w)?epKlZ+vk0mjs|M}Qo-S`iCcdh#PC;t`wy=!@K&vOJKgr*59ww9=6
z*yn@L-mW&1Ld<-F)rb&90ZAMZg%)FuOMzM`L%CeS*znYY(j_G9k-Sm6n}da0YZq3L
z3#&L{oXfEil52pK2F6=tkz}Dt^Pk77BXxDWbp%1c^xO<HQ`3BY^A=uu;qXjv|0nLB
z|IAf=)fM;e{?kAGn`eIbp-<oZ&j~vEc=EX?m>wS`2@Gjy$%5vq5EvSH11n7kT^%Lb
z%H@T;QA8Fh5sUN5<D>jIj=|c~?;GB8*Ul;6wr$%tb=v(aZb{4I&@oLuUcyR%)c_;G
zf(o{7qm|q=Qyq^d^>r$9=|Z|Axno271>86K<UJq!z^7)sD(%Ir=h1!t^$-8%nIC@S
z)1UkuhNdQX`mtw78x0D9r4a@sp(TqfS!nTr<<P($3Sj}~J-c2!$e|%eZ&#TOYgf?K
zQN+k%wOb;x2aGYC#0=Xhb)@e|U-4V}&bzA9t$Cf9Xo|d^Vtmj_q76pOLIS-QR=u7x
zJUGjFeU^H?&fHvu^(*?>yMJiU7e4dd|L7GfXy^GWMn3((o_$+;d-{3c;Rl(mG*A_c
z2&pxwX>O~wS@8?4VQBnyf-vIx^H*`<d3~JIS0Ii8N=dW;>UhawzPz(&xibmtp1XD)
z*tUJsZ4-|V?l>=cKc%)AW*MNCjgt8)>KhA5>q4a<^GuFq%uIT`3n-U5xOUBYo_OU&
zwr;pATeJFoU-ha*?<t1?kr63;Zp$YQ7N7g+%K7J6@J!x^VUV<2W0&l7e(pUt5t=sI
z%E_{7x75l{p(K6MShsE8bZZdB_ip&eO@zG()0M-_HAbjsQ)I3}n%7Ai8I78!UITT_
z95b*buD<BKY;N!6)z@FD-geVx|N7Oz>;8PMD&8v~YF7287bQ{kVk8f|53|K>s-YtX
z)^>OH{ccb9iiN@+i>nF<-WL{?g<7T5CDd-Iwc~-meg0te{r_&EVS9q&-$}QRT3+(N
zo*&(J@2U-(*Q~wv!=%NG$=M^!R3~U?g$4}@K~5?0gh7#2ee38jAqRIo#`i{#?74pP
zm;d#?!&_z>8Gc@NyvGlY7e-YJ<IV2zd>6Ud8Q#Bdq_*X%KH58y<Eo*HfGjCZM-Ban
zmOF(a{wej^?zwB{Bipubx@KVCvwtwK@7b@cTKAsLzSSG)?c7A^+;g!}!tB%_lGUh8
z4szfZkMhRY!9(qB=l-YP`{GX?RIhQCzp3X}M2@YyANw#z$M*8v@ymUO5mAD`U=XzR
zz`pfz&Lbl9bd~AtEYVgjki_9ad+&7A@RS>qEid_p+qQ4|v$4Z3etzuGo)0^ho#%Xh
zxvFm$F^8-P4h2DBPr20h#J~CSqYpW+o!%3_dD;bQj3g)ea&xZ>Wo2s(EBia}UYAfY
zT~H$siiMCu+>GE)WNh+xO0pKOJMVa+qRRKY>JR3JDdq<)bbi>vYteh{IYB46xSZWw
zfQ1lPVf8s(r=@nka#%;k8pbPKZ`EW#RebXYLh)Po{UkI-V!zDI&f63tkUPhoR|d)Q
zoFF**(SETSdc_(;PiK*yt}^YV0&yH*ME<`?R)+|7Nw1*<Ug<<RVQ6fdQgssF{L$)y
zF^2YXfh>2eTyG(1XsKXR4Ml`f5)&A+tiN|26UPKzS<s5p_J;FoXd-R%N@1xhs%qk)
zZ8_DNk1bE;OLYqXAPfu_t?554wOe9JFu8DrZqQbhRhJl}@ruj6q$dSy|A7Ic-rFcH
z#(CE0@g7kWpL^?D&^)H3NTJ!z5e2+7N2UDnA0JpLpX{8cTWEzf_xHas4Cpac1n-qR
z_Y{+u{+=@BVtn!-#S}XW`K8*Tq{lX?ohoVO%}hOGGFSveR5euZ6YqRMy(ZrIvN~U^
zPR<p*bLG0No#VYGsM_YYpcW7@wg_UH*B1|xi!}`~wkpOntO;sHOkKs)#RiJl(5s{%
z%R25{bwLe9JkEQ(_jn@<-FxqqEce*J;!l0}p%ju{v7if0Z;~rg^O)%jJEn>@a;XHz
zdh+J5y@;SFA~=LhjAT(*u&P?asZ;f#C<0<IQU+<v&w>d!jL8v`VN8xO%F$+VV67xx
zX|$Zf@~~VJmJzUFz?B<To!QY3rDXH;(iVYC#Z(kCp(2%B&D31OyfHXsUK^ffY5~^z
zHLE;OZ@s1$t6*DOR|g_(-g%t&)_EU!=ZflerE@;^-X-dN>~a@*=L$ae1=Xym9;?kZ
zwJNG2CU!=`=9qyv5tCYD8dhvW#nctkaK<#eN}6NR+)Hjua{%N_*r&HJ@B!*Onm*i)
zs+h4%!j~(VeRXi!?j4$BEOX7m^RhOpySv{i6jaGX6m>bO8mlqg>OG1IiuzVW*wTI9
z8fj5j=;<3V5-;)wAR3_FBch_H3SvNvl_auxo6)@Yg1(NcAAIsDo`2<)cLdhZ_&BVS
zhMM4zli=m55BH8&?7qX}GEiyIIB9P<HJ2Mz?OJS%MS|D_)`;r3w}_}0^(s~o@4c~J
zt*VMTZ@e}gfht&I5)mo-W<H3js#o#e<DJsnS5@yJBJUA=hl0I$)deF0KaxzM=4jnf
z+oEsMsACW6n|9uO?D91meQJ}jx(^OaR_%eIDLFD#p{n}k1WcBJ)v2n<eEi{@wtFR+
zk7>L=>e`Qq;QiugUQtD&&~&S+xcQOm<HoA>m<0N0B7O8cnuh(j&szH2qwi7mOaI+3
zasJ7U938)=D|taUI@762J1jrrxzq{+lbpCv^6RmdRKwY7ZdB>eqoab|Z#UW(kYJf)
z`PXHcrK4IpXoeA|1!`WZ5CqObSe3dffiz2xrwK|xtd)ebWE}&m)^HXmgPyiTE!e8F
zM5>mOtWLn52~Z+Pa283`F|g{XOMtkkdZ+)>j<Zdw7GR~BH-dDY35hyerRu0;30(?3
z$eH;Wa9|}C&Mv6}FuC&uVC9(t1rVNO74+9pvewEO{9$=$B$9<Gk+W<4zX1RWDprX1
S3qWuH0000<MNUMnLSTY>{p(=>

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
new file mode 100644
index 0000000000..06bdb50641
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -0,0 +1,7 @@
+package org.eclipse.e4.tools.emf.ui.common;
+
+public class Util {
+	public static final boolean isNullOrEmpty(String element) {
+		return element == null || element.trim().length() == 0;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index feb758061f..3df9f5032f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -47,13 +49,20 @@ public abstract class AbstractComponentEditor {
 	public static final int ARROW_UP = 3;
 	public static final int ARROW_DOWN = 4;
 
-	public AbstractComponentEditor(EditingDomain editingDomain) {
+	private ModelEditor editor;
+	
+	public AbstractComponentEditor(EditingDomain editingDomain, ModelEditor editor) {
 		this.editingDomain = editingDomain;
+		this.editor = editor;
 	}
 
 	public EditingDomain getEditingDomain() {
 		return editingDomain;
 	}
+	
+	public ModelEditor getEditor() {
+		return editor;
+	}
 
 	public WritableValue getMaster() {
 		return master;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index ccfa9bbb95..616c1b1309 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -223,6 +223,7 @@ public class Messages {
 	public static String PartEditor_Menus;
 	public static String PartEditor_Handlers;
 	public static String PartEditor_ContainerData;
+	public static String PartEditor_ToolBar;
 	
 	public static String PartSashContainerEditor_Label;
 	public static String PartSashContainerEditor_Description;
@@ -352,6 +353,7 @@ public class Messages {
 	public static String FeatureSelectionDialog_DialogMessage;
 
 
+
 	
 	
 	static {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index b40306cfb9..8be1d380f3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -217,6 +217,7 @@ PartEditor_Add=Add ...
 PartEditor_Remove=Remove
 PartEditor_Menus=Menus
 PartEditor_Handlers=Handlers
+PartEditor_ToolBar=ToolBar
 
 PartSashContainerEditor_Label=Sash
 PartSashContainerEditor_Description=Sash bla bla bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index e4066ed061..278aca833d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,6 +10,18 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelImportsEditor;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelFragmentsEditor;
+
+import org.eclipse.swt.graphics.Image;
+
+import org.eclipse.swt.widgets.ToolItem;
+
+import org.eclipse.swt.widgets.ToolBar;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.TrimContributionEditor;
 
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VTrimContributionsEditor;
@@ -154,7 +166,8 @@ public class ModelEditor {
 	public static final String VIRTUAL_TOOLBAR_CONTRIBUTIONS = ModelEditor.class.getName() + ".VIRTUAL_TOOLBAR_CONTRIBUTIONS"; //$NON-NLS-1$
 	public static final String VIRTUAL_TRIM_CONTRIBUTIONS = ModelEditor.class.getName() + ".VIRTUAL_TRIM_CONTRIBUTIONS"; //$NON-NLS-1$
 	public static final String VIRTUAL_WINDOW_SHARED_ELEMENTS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_SHARED_ELEMENTS"; //$NON-NLS-1$
-	
+	public static final String VIRTUAL_MODEL_FRAGEMENTS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_FRAGEMENTS"; //$NON-NLS-1$
+	public static final String VIRTUAL_MODEL_IMPORTS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_IMPORTS"; //$NON-NLS-1$
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private Map<String, AbstractComponentEditor> virtualEditors = new HashMap<String, AbstractComponentEditor>();
@@ -169,11 +182,15 @@ public class ModelEditor {
 	private IProject project;
 	private ISelectionProviderService selectionService;
 	private IEclipseContext context;
+	private Image toolmenuIcon;
+	private boolean fragment;
 
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project) {
 		this.modelProvider = modelProvider;
 		this.project = project;
 		this.context = context;
+		this.context.set(ModelEditor.class, this);
+		this.toolmenuIcon = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/headermenu.png"));
 
 		registerDefaultEditors();
 		registerVirtualEditors();
@@ -182,6 +199,8 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 		registerContributedVirtualEditors();
 		loadEditorFeatures();
 
+		fragment = modelProvider.getRoot().get(0) instanceof MModelFragments;
+		
 		SashForm form = new SashForm(composite, SWT.HORIZONTAL);
 		form.setBackground(form.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 
@@ -206,7 +225,7 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 		Composite headerContainer = new Composite(editingArea, SWT.NONE);
 		headerContainer.setBackgroundMode(SWT.INHERIT_DEFAULT);
 		headerContainer.setData(CSS_CLASS_KEY, "headerSectionContainer"); //$NON-NLS-1$
-		headerContainer.setLayout(new GridLayout(2, false));
+		headerContainer.setLayout(new GridLayout(3, false));
 		headerContainer.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		final Label iconLabel = new Label(headerContainer, SWT.NONE);
@@ -215,7 +234,11 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 		final Label textLabel = new Label(headerContainer, SWT.NONE);
 		textLabel.setData(CSS_CLASS_KEY, "sectionHeader"); //$NON-NLS-1$
 		textLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
+		
+//		ToolBar toolbar = new ToolBar(headerContainer, SWT.NONE);
+//		ToolItem item = new ToolItem(toolbar, SWT.PUSH);
+//		item.setImage(toolmenuIcon);
+		
 		final ScrolledComposite scrolling = new ScrolledComposite(editingArea, SWT.H_SCROLL | SWT.V_SCROLL);
 		scrolling.setBackgroundMode(SWT.INHERIT_DEFAULT);
 		scrolling.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
@@ -327,6 +350,10 @@ private void loadEditorFeatures() {
 		}
 	}
 	
+	public boolean isModelFragment() {
+		return fragment;
+	}
+	
 	public List<FeatureClass> getFeatureClasses(EClass eClass, EStructuralFeature feature) {
 		List<FeatureClass> list = new ArrayList<IEditorFeature.FeatureClass>();
 		
@@ -399,7 +426,7 @@ public void handleMapChange(MapChangeEvent event) {
 		}
 
 		viewer.setInput(modelProvider.getRoot());
-		viewer.expandAll();
+		viewer.expandToLevel(2);
 
 		return viewer;
 	}
@@ -434,6 +461,9 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_TOOLBAR_CONTRIBUTIONS, new VToolBarContributionsEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_TRIM_CONTRIBUTIONS, new VTrimContributionsEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_WINDOW_SHARED_ELEMENTS, new VWindowSharedElementsEditor(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_MODEL_FRAGEMENTS, new VModelFragmentsEditor(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_MODEL_IMPORTS, new VModelImportsEditor(modelProvider.getEditingDomain(), this));
+		
 	}
 
 	private void registerVirtualEditor(String id, AbstractComponentEditor editor) {
@@ -467,38 +497,38 @@ private void registerContributedEditors() {
 	}
 
 	private void registerDefaultEditors() {
-		registerEditor(ApplicationPackageImpl.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain()));
-		registerEditor(ApplicationPackageImpl.Literals.ADDON, new AddonsEditor(modelProvider.getEditingDomain(), project));
+		registerEditor(ApplicationPackageImpl.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain(),this));
+		registerEditor(ApplicationPackageImpl.Literals.ADDON, new AddonsEditor(modelProvider.getEditingDomain(),this, project));
 
-		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain(), modelProvider));
-		registerEditor(CommandsPackageImpl.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(), modelProvider, project));
-		registerEditor(CommandsPackageImpl.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain()));
+		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain(),this, modelProvider));
+		registerEditor(CommandsPackageImpl.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(),this, modelProvider, project));
+		registerEditor(CommandsPackageImpl.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain(),this));
 		registerEditor(CommandsPackageImpl.Literals.BINDING_TABLE, new BindingTableEditor(modelProvider.getEditingDomain(), this));
 
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR, new ToolBarEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor(modelProvider.getEditingDomain(), project));
-		registerEditor(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, new HandledToolItemEditor(modelProvider.getEditingDomain(), project, modelProvider));
-		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, new ToolBarSeparatorEditor(modelProvider.getEditingDomain()));
-		registerEditor(MenuPackageImpl.Literals.TOOL_CONTROL, new ToolControlEditor(modelProvider.getEditingDomain(), project));
+		registerEditor(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor(modelProvider.getEditingDomain(), this, project));
+		registerEditor(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, new HandledToolItemEditor(modelProvider.getEditingDomain(), this, project, modelProvider));
+		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, new ToolBarSeparatorEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(MenuPackageImpl.Literals.TOOL_CONTROL, new ToolControlEditor(modelProvider.getEditingDomain(), this, project));
 
 		registerEditor(MenuPackageImpl.Literals.MENU, new MenuEditor(modelProvider.getEditingDomain(), project, this));
-		registerEditor(MenuPackageImpl.Literals.MENU_SEPARATOR, new MenuSeparatorEditor(modelProvider.getEditingDomain()));
-		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), project, modelProvider));
+		registerEditor(MenuPackageImpl.Literals.MENU_SEPARATOR, new MenuSeparatorEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), this, project, modelProvider));
 		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this, project));
 		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION, new MenuContributionEditor(modelProvider.getEditingDomain(),project, this));
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION, new ToolBarContributionEditor(modelProvider.getEditingDomain(),project, this));
 		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION, new TrimContributionEditor(modelProvider.getEditingDomain(),project, this));
 		
 		
-		registerEditor(BasicPackageImpl.Literals.PART, new PartEditor(modelProvider.getEditingDomain(), project));
-		registerEditor(BasicPackageImpl.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain(), project));
-		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW, new TrimmedWindowEditor(modelProvider.getEditingDomain(), project));
+		registerEditor(BasicPackageImpl.Literals.PART, new PartEditor(modelProvider.getEditingDomain(), this, project));
+		registerEditor(BasicPackageImpl.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain(), this, project));
+		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW, new TrimmedWindowEditor(modelProvider.getEditingDomain(), this, project));
 		registerEditor(BasicPackageImpl.Literals.PART_SASH_CONTAINER, new PartSashContainerEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(BasicPackageImpl.Literals.PART_STACK, new PartStackEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(BasicPackageImpl.Literals.INPUT_PART, new InputPartEditor(modelProvider.getEditingDomain(), project));
+		registerEditor(BasicPackageImpl.Literals.INPUT_PART, new InputPartEditor(modelProvider.getEditingDomain(), this, project));
 		registerEditor(BasicPackageImpl.Literals.TRIM_BAR, new TrimBarEditor(modelProvider.getEditingDomain(), this));
 
-		registerEditor(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR, new PartDescriptorEditor(modelProvider.getEditingDomain(), project));
+		registerEditor(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR, new PartDescriptorEditor(modelProvider.getEditingDomain(), this, project));
 
 		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, new PerspectiveStackEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE, new PerspectiveEditor(modelProvider.getEditingDomain(), project, this));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
index 024e032b85..84d6af1a45 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
@@ -10,6 +10,12 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
+import org.eclipse.core.databinding.observable.DisposeEvent;
+import org.eclipse.core.databinding.observable.IDisposeListener;
+
+import org.eclipse.core.databinding.observable.DisposeEvent;
+import org.eclipse.core.databinding.observable.IDisposeListener;
+
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.Diffs;
@@ -31,17 +37,21 @@ public VirtualEntry(String id, IListProperty property, Object originalParent, St
 		this.originalParent = originalParent;
 		this.label = label;
 		this.list = new WritableList();
-		IObservableList origList = property.observe(originalParent);
+		final IObservableList origList = property.observe(originalParent);
 		list.addAll(cleanedList(origList));
 
-		origList.addListChangeListener(new IListChangeListener() {
+		final IListChangeListener listener = new IListChangeListener() {
 
 			public void handleListChange(ListChangeEvent event) {
-				List<Object> clean = cleanedList(event.getObservableList());
-				ListDiff diff = Diffs.computeListDiff(VirtualEntry.this.list, clean);
-				diff.applyTo(VirtualEntry.this.list);
+				if( ! VirtualEntry.this.list.isDisposed() ) {
+					List<Object> clean = cleanedList(event.getObservableList());
+					ListDiff diff = Diffs.computeListDiff(VirtualEntry.this.list, clean);
+					diff.applyTo(VirtualEntry.this.list);					
+				}
 			}
-		});
+		};
+		
+		origList.addListChangeListener(listener);
 	}
 
 	@SuppressWarnings("unchecked")
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index f84587b8b6..71789db0e9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -10,6 +10,12 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -42,8 +48,8 @@ public class AddonsEditor extends AbstractComponentEditor {
 	private IProject project;
 	private Image image;
 	
-	public AddonsEditor(EditingDomain editingDomain, IProject project) {
-		super(editingDomain);
+	public AddonsEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
+		super(editingDomain,editor);
 		this.project = project;
 	}
 
@@ -96,6 +102,12 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);
+			return parent;
+		}
+
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.AddonsEditor_Id);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 4ab3699fad..437ffc19ff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -56,8 +56,8 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private IListProperty TOOLBAR_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS);
 	private IListProperty TRIM_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS);
 	
-	public ApplicationEditor(EditingDomain editingDomain) {
-		super(editingDomain);
+	public ApplicationEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain,editor);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index b43fe55612..37f11bcba6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+import org.eclipse.emf.ecore.EObject;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
@@ -60,14 +63,12 @@ public class BindingTableEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 	
 	private IListProperty BINDING_TABLE__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
 
 
 	public BindingTableEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 	}
 
 	@Override
@@ -110,6 +111,13 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+
+		
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.BindingTableEditor_Id);
@@ -254,7 +262,7 @@ public void widgetSelected(SelectionEvent e) {
 
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
+						getEditor().setSelection(handler);
 					}
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 01d09e2d93..af5c12abc0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -10,6 +10,11 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -63,8 +68,8 @@ public class CommandEditor extends AbstractComponentEditor {
 	private Image image;
 	private EMFDataBindingContext context;
 
-	public CommandEditor(EditingDomain editingDomain) {
-		super(editingDomain);
+	public CommandEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain,editor);
 	}
 
 	@Override
@@ -106,6 +111,12 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);
+			
+			return parent;
+		}
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -117,7 +128,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 6a2c7b608a..a8f99174ef 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -10,6 +10,41 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+
+import org.eclipse.e4.tools.emf.ui.common.Util;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
+
+import org.eclipse.e4.ui.workbench.UIEvents.UILabel;
+
+import org.eclipse.core.databinding.observable.map.IObservableMap;
+
+import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
+
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+
+import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
+import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.viewers.ComboViewer;
+
 import org.eclipse.e4.ui.model.application.commands.MBindings;
 
 import org.eclipse.e4.ui.model.application.ui.MContext;
@@ -50,6 +85,96 @@
 import org.eclipse.swt.widgets.Text;
 
 public class ControlFactory {
+	public static void createFindImport(Composite parent, final AbstractComponentEditor editor, EMFDataBindingContext context) {
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+			
+		Label l = new Label(parent, SWT.NONE);
+			l.setText("Reference-Id");
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(editor.getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(editor.getMaster()));
+			
+			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			b.setText("Find ...");
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					FindImportElementDialog dialog = new FindImportElementDialog(b.getShell(), editor.getEditingDomain(), (EObject) editor.getMaster().getValue());
+					dialog.open();
+				}
+			});
+	}
+	
+	public static void createSelectedElement(Composite parent, final AbstractComponentEditor editor, final EMFDataBindingContext context, String label) {
+		Label l = new Label(parent, SWT.NONE);
+		l.setText(label);
+
+		ComboViewer viewer = new ComboViewer(parent);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
+		viewer.getControl().setLayoutData(gd);
+		IEMFEditListProperty listProp = EMFEditProperties.list(editor.getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+		IEMFEditValueProperty labelProp = EMFEditProperties.value(editor.getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL);
+		IEMFEditValueProperty idProp = EMFEditProperties.value(editor.getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
+		
+		IViewerValueProperty vProp = ViewerProperties.singleSelection();
+
+		final Binding[] binding = new Binding[1];
+		final IObservableValue uiObs = vProp.observe(viewer);
+		final IObservableValue mObs = EMFEditProperties.value(editor.getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(editor.getMaster());
+		editor.getMaster().addValueChangeListener(new IValueChangeListener() {
+
+			public void handleValueChange(ValueChangeEvent event) {
+				if( binding[0] != null ) {
+					binding[0].dispose();
+				}
+
+			}
+		});
+
+		final IObservableList list = listProp.observeDetail(editor.getMaster());
+		ObservableListContentProvider cp = new ObservableListContentProvider();
+		viewer.setContentProvider(cp);
+		IObservableMap[] attributeMaps = {
+				labelProp.observeDetail(cp.getKnownElements()),
+				idProp.observeDetail(cp.getKnownElements())
+		};
+		viewer.setLabelProvider(new ObservableMapLabelProvider(attributeMaps) {
+			@Override
+			public String getText(Object element) {
+				EObject o = (EObject) element;
+				String rv = o.eClass().getName();
+				
+				if( element instanceof MUILabel ) {
+					MUILabel label = (MUILabel) element;
+					if( ! Util.isNullOrEmpty(label.getLabel()) ) {
+						return rv + " - " + label.getLabel().trim();	
+					}
+					
+				}
+				
+				if(element instanceof MApplicationElement) {
+					MApplicationElement appEl = (MApplicationElement) element;
+					if( ! Util.isNullOrEmpty(appEl.getElementId()) ) {
+						return rv + " - " + appEl.getElementId();
+					}
+				}
+				
+				return rv + "["+list.indexOf(element)+"]";
+			}
+		});
+		viewer.setInput(list);
+		
+		editor.getMaster().addValueChangeListener(new IValueChangeListener() {
+
+			public void handleValueChange(ValueChangeEvent event) {
+				binding[0] = context.bindValue(uiObs, mObs);
+			}
+		});
+	}
+	
 	public static void createStringListWidget(Composite parent, final AbstractComponentEditor editor, String label, final EStructuralFeature feature) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 8d4f3708e1..fd3b66445e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -39,7 +39,7 @@ public class DirectMenuItemEditor extends MenuItemEditor {
 	private Image image;
 	
 	public DirectMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain,project);
+		super(editingDomain,editor, project);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 58dce81561..6e46514585 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -37,8 +39,8 @@
 public class DirectToolItemEditor extends ToolItemEditor {
 	private Image image;
 
-	public DirectToolItemEditor(EditingDomain editingDomain, IProject project) {
-		super(editingDomain,project);
+	public DirectToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
+		super(editingDomain,editor, project);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index 332cd2f951..a8ef32c707 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -64,8 +66,8 @@ public class HandledMenuItemEditor extends MenuItemEditor {
 	private Image image;
 	private IModelResource resource;
 
-	public HandledMenuItemEditor(EditingDomain editingDomain, IProject project, IModelResource resource) {
-		super(editingDomain,project);
+	public HandledMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IModelResource resource) {
+		super(editingDomain,editor,project);
 		this.resource = resource;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index e6c904ed58..5f3d845cbe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -64,8 +66,8 @@ public class HandledToolItemEditor extends ToolItemEditor {
 	private Image image;
 	private IModelResource resource;
 
-	public HandledToolItemEditor(EditingDomain editingDomain, IProject project, IModelResource resource) {
-		super(editingDomain, project);
+	public HandledToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IModelResource resource) {
+		super(editingDomain, editor, project);
 		this.resource = resource;
 	}
 
@@ -136,7 +138,7 @@ public void widgetSelected(SelectionEvent e) {
 
 				@Override
 				protected void setValue(Object element, Object value) {
-					Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.PARAMETER__NAME, value);
+					Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.PARAMETER__NAME, value);
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 					}
@@ -172,7 +174,7 @@ protected boolean canEdit(Object element) {
 
 				@Override
 				protected void setValue(Object element, Object value) {
-					Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.PARAMETER__VALUE, value);
+					Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.PARAMETER__VALUE, value);
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 76fe6b43cb..dce8bfc693 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -10,6 +10,11 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -48,8 +53,8 @@ public class HandlerEditor extends AbstractComponentEditor {
 	private IModelResource resource;
 	private IProject project;
 
-	public HandlerEditor(EditingDomain editingDomain, IModelResource resource, IProject project) {
-		super(editingDomain);
+	public HandlerEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource, IProject project) {
+		super(editingDomain,editor);
 		this.resource = resource;
 		this.project = project;
 	}
@@ -93,6 +98,12 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -104,7 +115,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
index c81967a887..7119cc4e49 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -27,8 +29,8 @@
 
 public class InputPartEditor extends PartEditor {
 
-	public InputPartEditor(EditingDomain editingDomain, IProject project) {
-		super(editingDomain, project);
+	public InputPartEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
+		super(editingDomain, editor, project);
 	}
 
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 9df457b8ff..4cdf045ece 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -10,6 +10,11 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -65,8 +70,8 @@ public class KeyBindingEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private IModelResource resource;
 
-	public KeyBindingEditor(EditingDomain editingDomain, IModelResource resource) {
-		super(editingDomain);
+	public KeyBindingEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource) {
+		super(editingDomain,editor);
 		this.resource = resource;
 	}
 
@@ -110,6 +115,12 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -121,7 +132,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 4eeb588c6f..9629abd00a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+import org.eclipse.emf.ecore.EObject;
+
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.emf.databinding.EMFProperties;
 
@@ -77,7 +80,6 @@ public class MenuContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 	private IProject project;
 	
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
@@ -95,8 +97,7 @@ public Struct(String label, EClass eClass, boolean separator) {
 	}
 	
 	public MenuContributionEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 		this.project = project;
 	}
 
@@ -145,6 +146,12 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -156,7 +163,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+				
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -201,7 +208,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText(Messages.MenuContributionEditor_MenuItemType);
 				column.getColumn().setWidth(300);
-				column.setLabelProvider(new ComponentLabelProvider(editor));
+				column.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			}
 
 			{
@@ -310,7 +317,7 @@ public void widgetSelected(SelectionEvent e) {
 						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 							if (!struct.separator) {
-								editor.setSelection(eObject);
+								getEditor().setSelection(eObject);
 							}
 						}
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 06e9155219..a4958d5b39 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
@@ -73,7 +75,6 @@ public class MenuEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 	private IProject project;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
@@ -92,8 +93,7 @@ public Struct(String label, EClass eClass, boolean separator) {
 	}
 
 	public MenuEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 		this.project = project;
 	}
 
@@ -129,7 +129,7 @@ public Composite getEditor(Composite parent, Object object) {
 		}
 		EObject o = (EObject) object;
 		Control topControl;
-		if( o.eContainer() instanceof MWindow ) {
+		if( o.eContainer() instanceof MWindow || o.eContainer() == null ) {
 			topControl = composite.getChildren()[1];
 		} else {
 			topControl = composite.getChildren()[0];
@@ -150,6 +150,12 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -161,7 +167,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-
+				
 		// ------------------------------------------------------------
 		if( ! rootMenu )
 		{
@@ -229,7 +235,7 @@ public void widgetSelected(SelectionEvent e) {
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText(Messages.MenuEditor_MenuItemType);
 				column.getColumn().setWidth(300);
-				column.setLabelProvider(new ComponentLabelProvider(editor));
+				column.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			}
 
 			{
@@ -338,7 +344,7 @@ public void widgetSelected(SelectionEvent e) {
 						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 							if (!struct.separator) {
-								editor.setSelection(eObject);
+								getEditor().setSelection(eObject);
 							}
 						}
 					}
@@ -388,6 +394,7 @@ public String getLabel(Object element) {
 	@Override
 	public String getDetailLabel(Object element) {
 		MMenu menu = (MMenu) element;
+		
 		if( menu.getLabel() != null && menu.getLabel().trim().length() > 0 ) {
 			return menu.getLabel();
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 25da1ff5c1..a8b4c89f36 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -10,6 +10,15 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.core.databinding.conversion.Converter;
+
+import org.eclipse.core.databinding.UpdateValueStrategy;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -53,8 +62,8 @@ public abstract class MenuItemEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	protected IProject project;
 
-	public MenuItemEditor(EditingDomain editingDomain, IProject project) {
-		super(editingDomain);
+	public MenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
+		super(editingDomain,editor);
 		this.project = project;
 	}
 
@@ -87,7 +96,14 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-
+		IWidgetValueProperty checkProp = WidgetProperties.selection();
+		IWidgetValueProperty enabled = WidgetProperties.enabled();
+		
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -99,7 +115,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-
+		
 		if (this.getClass() != MenuItemEditor.class) {
 			// ------------------------------------------------------------
 			{
@@ -161,6 +177,43 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 		}
+		
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Enabled");
+			
+			Button b = new Button(parent, SWT.CHECK);
+			b.setLayoutData(new GridData(GridData.BEGINNING,GridData.CENTER,false,false,2,1));
+			context.bindValue(checkProp.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__ENABLED).observeDetail(getMaster()));
+		}
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Selected");
+			
+			Button b = new Button(parent, SWT.CHECK);
+			b.setLayoutData(new GridData(GridData.BEGINNING,GridData.CENTER,false,false,2,1));
+			context.bindValue(checkProp.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__SELECTED).observeDetail(getMaster()));
+			
+			UpdateValueStrategy t2m = new UpdateValueStrategy();
+			t2m.setConverter(new Converter(boolean.class, ItemType.class) {
+
+				public Object convert(Object fromObject) {
+					return null;
+				}
+			});
+			UpdateValueStrategy m2t = new UpdateValueStrategy();
+			m2t.setConverter(new Converter(ItemType.class, boolean.class) {
+				
+				public Object convert(Object fromObject) {
+					return fromObject == ItemType.CHECK || fromObject == ItemType.RADIO;
+				}
+			});
+			
+			context.bindValue(enabled.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(getMaster()),t2m,m2t);
+
+		}
+		
 
 		createFormSubTypeForm(parent, context, master);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 9beed58ead..4040f05fce 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -10,6 +10,14 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Button;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -36,8 +44,8 @@ public class MenuSeparatorEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	
-	public MenuSeparatorEditor(EditingDomain editingDomain) {
-		super(editingDomain);
+	public MenuSeparatorEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain,editor);
 	}
 
 	@Override
@@ -85,6 +93,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -96,7 +109,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+				
 		//TODO Should we add visible to mimic a GroupMarker of 3.x
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index a141bb10c4..dd21635a31 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -10,6 +10,27 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EPackage;
+
+import java.util.ArrayList;
+import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerComparator;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+
+import org.eclipse.core.databinding.observable.list.WritableList;
+
 import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
 
 
@@ -53,14 +74,13 @@
 public class ModelFragmentsEditor extends AbstractComponentEditor {
 
 	private IListProperty MODEL_FRAGMENTS__FRAGMENTS = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
-
+	private IListProperty MODEL_FRAGMENTS__IMPORTS = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
+	
 	private Composite composite;
 	private Image image;
-	private ModelEditor editor;
 
 	public ModelFragmentsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 	}
 
 	@Override
@@ -98,6 +118,147 @@ public Composite getEditor(Composite parent, Object object) {
 	private Composite createForm(Composite parent) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
+		
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Imports");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			
+			final TableViewer viewer = new TableViewer(parent);
+			viewer.setContentProvider(new ObservableListContentProvider());
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 200;
+			viewer.getControl().setLayoutData(gd);
+			
+			IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
+			viewer.setInput(prop.observeDetail(getMaster()));
+
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MModelFragments container = (MModelFragments) getMaster().getValue();
+							int idx = container.getImports().indexOf(obj) - 1;
+							if (idx >= 0) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MModelFragments container = (MModelFragments) getMaster().getValue();
+							int idx = container.getImports().indexOf(obj) + 1;
+							if (idx < container.getImports().size()) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					FeatureClass eclass = (FeatureClass) element;
+					return eclass.label;
+				}
+			});
+			childrenDropDown.setComparator(new ViewerComparator() {
+				@Override
+				public int compare(Viewer viewer, Object e1, Object e2) {
+					FeatureClass eClass1 = (FeatureClass) e1;
+					FeatureClass eClass2 = (FeatureClass) e2;
+					return eClass1.label.compareTo(eClass2.label);
+				}
+			});
+
+			List<FeatureClass> list = new ArrayList<FeatureClass>();
+			addClasses(ApplicationPackageImpl.eINSTANCE, list);
+			list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
+			
+			childrenDropDown.setInput(list);
+			childrenDropDown.getCombo().select(0);
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					EClass eClass = ((FeatureClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement()).eClass;
+					EObject eObject = EcoreUtil.create(eClass);
+
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, eObject);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						getEditor().setSelection(eObject);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, elements);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -106,9 +267,9 @@ private Composite createForm(Composite parent) {
 
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			gd.heightHint = 200;
 			viewer.getControl().setLayoutData(gd);
 
 			IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
@@ -190,7 +351,7 @@ public void widgetSelected(SelectionEvent e) {
 
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(component);
+						getEditor().setSelection(component);
 					}
 				}
 			});
@@ -217,9 +378,38 @@ public void widgetSelected(SelectionEvent e) {
 		return parent;
 	}
 
+	public void addClasses(EPackage ePackage, List<FeatureClass> list) {
+		for (EClassifier c : ePackage.getEClassifiers()) {
+			if (c instanceof EClass) {
+				EClass eclass = (EClass) c;
+				if (eclass != ApplicationPackageImpl.Literals.APPLICATION && !eclass.isAbstract() && !eclass.isInterface() && eclass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT)) {
+					list.add(new FeatureClass(eclass.getName(), eclass));
+				}
+			}
+		}
+
+		for (EPackage eSubPackage : ePackage.getESubpackages()) {
+			addClasses(eSubPackage, list);
+		}
+	}
+	
 	@Override
 	public IObservableList getChildList(Object element) {
-		return MODEL_FRAGMENTS__FRAGMENTS.observe(element);
+		WritableList list = new WritableList();
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MODEL_IMPORTS, MODEL_FRAGMENTS__IMPORTS, element, "Imports") {
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+		});
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MODEL_FRAGEMENTS, MODEL_FRAGMENTS__FRAGMENTS, element, "Fragments") {
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+		});
+		
+		return list;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index ae4239c405..9b569d1583 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -10,6 +10,19 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.SetCommand;
+
+import org.eclipse.core.databinding.property.value.IValueProperty;
+
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map.Entry;
@@ -64,9 +77,11 @@ public class PartDescriptorEditor extends AbstractComponentEditor {
 	
 	private IListProperty PART__MENUS = EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS);
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
+	private IValueProperty PART__TOOLBAR = EMFProperties.value(BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR);
+	private Button createRemoveToolBar;
 
-	public PartDescriptorEditor(EditingDomain editingDomain, IProject project) {
-		super(editingDomain);
+	public PartDescriptorEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
+		super(editingDomain,editor);
 		this.project = project;
 	}
 
@@ -101,6 +116,7 @@ public Composite getEditor(Composite parent, Object object) {
 			composite = createForm(parent,context, getMaster());
 		}
 		getMaster().setValue(object);
+		createRemoveToolBar.setSelection(((MPartDescriptor)object).getToolbar() != null);
 		return composite;
 	}
 
@@ -110,6 +126,13 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -121,7 +144,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));			
 		}
-
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -188,6 +211,26 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.PartEditor_ToolBar);
+			
+			createRemoveToolBar = new Button(parent, SWT.CHECK);
+			createRemoveToolBar.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MPartDescriptor window = (MPartDescriptor) getMaster().getValue();
+					if( window.getToolbar() == null ) {
+						addToolBar();
+					} else {
+						removeToolBar();
+					}
+				}
+			});
+			createRemoveToolBar.setLayoutData(new GridData(GridData.BEGINNING,GridData.CENTER,false,false,2,1));
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -356,9 +399,25 @@ public String getText(Object element) {
 		return parent;
 	}
 
+	private void addToolBar() {
+		MToolBar menu = MMenuFactory.INSTANCE.createToolBar();
+		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR, menu);
+		if( cmd.canExecute() ) {
+			getEditingDomain().getCommandStack().execute(cmd);
+		}
+	}
+	
+	private void removeToolBar() {
+		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR, null);
+		if( cmd.canExecute() ) {
+			getEditingDomain().getCommandStack().execute(cmd);
+		}
+	}
+
+	
 	@Override
-	public IObservableList getChildList(Object element) {
-		WritableList list = new WritableList();
+	public IObservableList getChildList(final Object element) {
+		final WritableList list = new WritableList();
 		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PARTDESCRIPTOR_MENU, PART__MENUS, element, Messages.PartDescriptorEditor_Menus) {
 
 			@Override
@@ -377,6 +436,31 @@ protected boolean accepted(Object o) {
 
 		});
 
+		MPartDescriptor window = (MPartDescriptor) element;
+		if( window.getToolbar() != null ) {
+			list.add(0,window.getToolbar());
+		}
+		
+		PART__TOOLBAR.observe(element).addValueChangeListener(new IValueChangeListener() {
+			
+			public void handleValueChange(ValueChangeEvent event) {
+				if( event.diff.getOldValue() != null ) {
+					list.remove(event.diff.getOldValue());
+					if( getMaster().getValue() == element ) {
+						createRemoveToolBar.setSelection(false);	
+					}
+					
+				}
+				
+				if( event.diff.getNewValue() != null ) {
+					list.add(0,event.diff.getNewValue());
+					if( getMaster().getValue() == element ) {
+						createRemoveToolBar.setSelection(true);	
+					}
+				}
+			}
+		});
+		
 		return list;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index ede939b53d..f3d49c0aeb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -10,6 +10,24 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.core.databinding.property.value.IValueProperty;
+
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.SetCommand;
+
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map.Entry;
@@ -64,9 +82,12 @@ public class PartEditor extends AbstractComponentEditor {
 
 	private IListProperty PART__MENUS = EMFProperties.list(BasicPackageImpl.Literals.PART__MENUS);
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
+	private IValueProperty PART__TOOLBAR = EMFProperties.value(BasicPackageImpl.Literals.PART__TOOLBAR);
+	private Button createRemoveToolBar;
+	
 
-	public PartEditor(EditingDomain editingDomain, IProject project) {
-		super(editingDomain);
+	public PartEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
+		super(editingDomain,editor);
 		this.project = project;
 	}
 
@@ -101,6 +122,7 @@ public Composite getEditor(Composite parent, Object object) {
 			composite = createForm(parent,context, getMaster());
 		}
 		getMaster().setValue(object);
+		createRemoveToolBar.setSelection(((MPart)object).getToolbar() != null);
 		return composite;
 	}
 
@@ -110,6 +132,11 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -121,7 +148,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));			
 		}
-
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -188,6 +215,26 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.PartEditor_ToolBar);
+			
+			createRemoveToolBar = new Button(parent, SWT.CHECK);
+			createRemoveToolBar.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MPart window = (MPart) getMaster().getValue();
+					if( window.getToolbar() == null ) {
+						addToolBar();
+					} else {
+						removeToolBar();
+					}
+				}
+			});
+			createRemoveToolBar.setLayoutData(new GridData(GridData.BEGINNING,GridData.CENTER,false,false,2,1));
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -323,13 +370,28 @@ public String getText(Object element) {
 		return parent;
 	}
 	
+	private void addToolBar() {
+		MToolBar menu = MMenuFactory.INSTANCE.createToolBar();
+		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART__TOOLBAR, menu);
+		if( cmd.canExecute() ) {
+			getEditingDomain().getCommandStack().execute(cmd);
+		}
+	}
+	
+	private void removeToolBar() {
+		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART__TOOLBAR, null);
+		if( cmd.canExecute() ) {
+			getEditingDomain().getCommandStack().execute(cmd);
+		}
+	}
+	
 	protected void createSubformElements(Composite parent, EMFDataBindingContext context, IObservableValue master) {
 		
 	}
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		WritableList list = new WritableList();
+		final WritableList list = new WritableList();
 		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART_MENU, PART__MENUS, element, Messages.PartEditor_Menus) {
 
 			@Override
@@ -347,6 +409,26 @@ protected boolean accepted(Object o) {
 			}
 
 		});
+		
+		MPart window = (MPart) element;
+		if( window.getToolbar() != null ) {
+			list.add(0,window.getToolbar());
+		}
+		
+		PART__TOOLBAR.observe(element).addValueChangeListener(new IValueChangeListener() {
+			
+			public void handleValueChange(ValueChangeEvent event) {
+				if( event.diff.getOldValue() != null ) {
+					list.remove(event.diff.getOldValue());
+					createRemoveToolBar.setSelection(false);
+				}
+				
+				if( event.diff.getNewValue() != null ) {
+					list.add(0,event.diff.getNewValue());
+					createRemoveToolBar.setSelection(true);
+				}
+			}
+		});
 
 		return list;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index f5426e3fda..f1384ba72c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 
 import java.net.MalformedURLException;
@@ -76,13 +78,11 @@ public class PartSashContainerEditor extends AbstractComponentEditor {
 	private Image vImage;
 	private Image hImage;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
 	public PartSashContainerEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 	}
 
 	@Override
@@ -141,6 +141,11 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -152,7 +157,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -174,41 +179,7 @@ public String getText(Object element) {
 			context.bindValue(vProp.observe(viewer), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL).observeDetail(getMaster()));
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartSashContainerEditor_SelectedElement);
-
-			ComboViewer viewer = new ComboViewer(parent);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
-			viewer.getControl().setLayoutData(gd);
-			IEMFEditListProperty listProp = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-			IViewerValueProperty vProp = ViewerProperties.singleSelection();
-
-			final Binding[] binding = new Binding[1];
-			final IObservableValue uiObs = vProp.observe(viewer);
-			final IObservableValue mObs = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(getMaster());
-			getMaster().addValueChangeListener(new IValueChangeListener() {
-
-				public void handleValueChange(ValueChangeEvent event) {
-					if( binding[0] != null ) {
-						binding[0].dispose();
-					}
-
-				}
-			});
-
-			ViewerSupport.bind(viewer, listProp.observeDetail(getMaster()), valProp);
-
-			getMaster().addValueChangeListener(new IValueChangeListener() {
-
-				public void handleValueChange(ValueChangeEvent event) {
-					binding[0] = context.bindValue(uiObs, mObs);
-				}
-			});
-		}
+		ControlFactory.createSelectedElement(parent, this, context, Messages.PartSashContainerEditor_SelectedElement);
 		
 		// ------------------------------------------------------------
 		{
@@ -235,7 +206,7 @@ public void handleValueChange(ValueChangeEvent event) {
 			viewer.getControl().setLayoutData(gd);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
@@ -336,7 +307,7 @@ public void widgetSelected(SelectionEvent e) {
 						
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
-							editor.setSelection(eObject);
+							getEditor().setSelection(eObject);
 						}
 					}
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 6d2362f751..43567b2b24 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 
 import java.net.MalformedURLException;
@@ -73,13 +75,11 @@ public class PartStackEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
 	public PartStackEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 	}
 
 	@Override
@@ -123,6 +123,11 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -134,42 +139,8 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartStackEditor_SelectedElement);
-
-			ComboViewer viewer = new ComboViewer(parent);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
-			viewer.getControl().setLayoutData(gd);
-			IEMFEditListProperty listProp = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL);
-			IViewerValueProperty vProp = ViewerProperties.singleSelection();
-
-			final Binding[] binding = new Binding[1];
-			final IObservableValue uiObs = vProp.observe(viewer);
-			final IObservableValue mObs = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(getMaster());
-			getMaster().addValueChangeListener(new IValueChangeListener() {
-
-				public void handleValueChange(ValueChangeEvent event) {
-					if( binding[0] != null ) {
-						binding[0].dispose();
-					}
-
-				}
-			});
-
-			ViewerSupport.bind(viewer, listProp.observeDetail(getMaster()), valProp);
-
-			getMaster().addValueChangeListener(new IValueChangeListener() {
-
-				public void handleValueChange(ValueChangeEvent event) {
-					binding[0] = context.bindValue(uiObs, mObs);
-				}
-			});
-		}
+		
+		ControlFactory.createSelectedElement(parent, this, context, Messages.PartStackEditor_SelectedElement);
 		
 		// ------------------------------------------------------------
 		{
@@ -190,7 +161,7 @@ public void handleValueChange(ValueChangeEvent event) {
 			
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
@@ -292,7 +263,7 @@ public void widgetSelected(SelectionEvent e) {
 					
 					if( cmd.canExecute() ) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(eObject);
+						getEditor().setSelection(eObject);
 					}
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index efbb64e1f0..3a2798ef8b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
@@ -75,15 +77,13 @@ public class PerspectiveEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 	private IProject project;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
 	public PerspectiveEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
-		super(editingDomain);
+		super(editingDomain,editor);
 		this.project = project;
-		this.editor = editor;
 	}
 
 	@Override
@@ -143,6 +143,11 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -154,42 +159,8 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PerspectiveEditor_SelectedElement);
-
-			ComboViewer viewer = new ComboViewer(parent);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			viewer.getControl().setLayoutData(gd);
-			IEMFEditListProperty listProp = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-			IViewerValueProperty vProp = ViewerProperties.singleSelection();
-
-			final Binding[] binding = new Binding[1];
-			final IObservableValue uiObs = vProp.observe(viewer);
-			final IObservableValue mObs = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(getMaster());
-			getMaster().addValueChangeListener(new IValueChangeListener() {
-
-				public void handleValueChange(ValueChangeEvent event) {
-					if (binding[0] != null) {
-						binding[0].dispose();
-					}
-
-				}
-			});
-
-			ViewerSupport.bind(viewer, listProp.observeDetail(getMaster()), valProp);
-
-			getMaster().addValueChangeListener(new IValueChangeListener() {
-
-				public void handleValueChange(ValueChangeEvent event) {
-					binding[0] = context.bindValue(uiObs, mObs);
-				}
-			});
-		}
+		
+		ControlFactory.createSelectedElement(parent, this, context, Messages.PerspectiveEditor_SelectedElement);
 
 		// ------------------------------------------------------------
 		{
@@ -246,7 +217,7 @@ public void widgetSelected(SelectionEvent e) {
 			viewer.getControl().setLayoutData(gd);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
@@ -347,7 +318,7 @@ public void widgetSelected(SelectionEvent e) {
 						
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
-							editor.setSelection(eObject);
+							getEditor().setSelection(eObject);
 						}
 					}
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index c5fdfd9eb1..a133dd158a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+import org.eclipse.emf.ecore.EObject;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
@@ -66,13 +69,11 @@ public class PerspectiveStackEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
-	private ModelEditor modelEditor;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
-	public PerspectiveStackEditor(EditingDomain editingDomain, ModelEditor modelEditor) {
-		super(editingDomain);
-		this.modelEditor = modelEditor;
+	public PerspectiveStackEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain,editor);
 	}
 
 	@Override
@@ -121,6 +122,11 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -132,43 +138,9 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PerspectiveStackEditor_SelectedElement);
-
-			ComboViewer viewer = new ComboViewer(parent);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
-			viewer.getControl().setLayoutData(gd);
-			IEMFEditListProperty listProp = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL);
-			IViewerValueProperty vProp = ViewerProperties.singleSelection();
-
-			final Binding[] binding = new Binding[1];
-			final IObservableValue uiObs = vProp.observe(viewer);
-			final IObservableValue mObs = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(getMaster());
-			getMaster().addValueChangeListener(new IValueChangeListener() {
-
-				public void handleValueChange(ValueChangeEvent event) {
-					if( binding[0] != null ) {
-						binding[0].dispose();
-					}
-
-				}
-			});
-
-			ViewerSupport.bind(viewer, listProp.observeDetail(getMaster()), valProp);
-
-			getMaster().addValueChangeListener(new IValueChangeListener() {
-
-				public void handleValueChange(ValueChangeEvent event) {
-					binding[0] = context.bindValue(uiObs, mObs);
-				}
-			});
-		}
 		
+		ControlFactory.createSelectedElement(parent, this, context, Messages.PerspectiveStackEditor_SelectedElement);
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -176,7 +148,7 @@ public void handleValueChange(ValueChangeEvent event) {
 			
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(modelEditor));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
@@ -260,7 +232,7 @@ public void widgetSelected(SelectionEvent e) {
 					
 					if( cmd.canExecute() ) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						modelEditor.setSelection(eObject);
+						getEditor().setSelection(eObject);
 					}
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 5a9c4ae362..d721775c86 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -10,6 +10,22 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.Util;
+
+import org.eclipse.e4.ui.workbench.UIEvents.UIElement;
+
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+
+import org.eclipse.core.databinding.conversion.Converter;
+
+import org.eclipse.core.databinding.conversion.Converter;
+
+import org.eclipse.core.databinding.UpdateValueStrategy;
+
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
@@ -53,12 +69,10 @@ public class PlaceholderEditor extends AbstractComponentEditor {
 	private Image image;
 	private EMFDataBindingContext context;
 	private IModelResource resource;
-	private ModelEditor editor;
 	
 	public PlaceholderEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource) {
-		super(editingDomain);
+		super(editingDomain,editor);
 		this.resource = resource;
-		this.editor = editor;
 	}
 
 	@Override
@@ -131,6 +145,11 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -138,20 +157,61 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan=2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));			
+		}
+		
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Reference");
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setEditable(false);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 			
-			final Button b = new Button(parent, SWT.PUSH);
+			UpdateValueStrategy t2m = new UpdateValueStrategy();
+			t2m.setConverter(new Converter(String.class, MUIElement.class) {
+				
+				public Object convert(Object fromObject) {
+					return null;
+				}
+			});
+			UpdateValueStrategy m2t = new UpdateValueStrategy();
+			m2t.setConverter(new Converter(MUIElement.class,String.class) {
+				
+				public Object convert(Object fromObject) {
+					if( fromObject != null ) {
+						EObject o = (EObject) fromObject;
+						if( o instanceof MUILabel ) {
+							MUILabel label = (MUILabel) o;
+							if( ! Util.isNullOrEmpty(label.getLabel()) )  {
+								return o.eClass().getName() + " - " + label.getLabel();
+							}
+						}
+						
+						return o.eClass().getName() + " - "+((MUIElement)fromObject).getElementId();
+					}
+					return null;
+				}
+			});
+			
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), AdvancedPackageImpl.Literals.PLACEHOLDER__REF).observeDetail(getMaster()),t2m,m2t);
+			
+			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 			b.setText(Messages.PlaceholderEditor_FindReference);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					SharedElementsDialog dialog = new SharedElementsDialog(b.getShell(),editor,(MPlaceholder) getMaster().getValue(), resource);
+					SharedElementsDialog dialog = new SharedElementsDialog(b.getShell(),getEditor(),(MPlaceholder) getMaster().getValue(), resource);
 					dialog.open();
 				}
 			});
 		}
 
+		
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index e6c929a377..363b921867 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -89,13 +89,11 @@ public class StringModelFragment extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 
 	private IListProperty MODEL_FRAGMENT__ELEMENTS = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
 
 	public StringModelFragment(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 	}
 
 	@Override
@@ -202,7 +200,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
@@ -294,7 +292,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 
 			List<FeatureClass> list = new ArrayList<FeatureClass>();
 			addClasses(ApplicationPackageImpl.eINSTANCE, list);
-			list.addAll(editor.getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
+			list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
 			
 			childrenDropDown.setInput(list);
 			childrenDropDown.getCombo().select(0);
@@ -312,7 +310,7 @@ public void widgetSelected(SelectionEvent e) {
 
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(eObject);
+						getEditor().setSelection(eObject);
 					}
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 977a26ca7e..c8ab8ba3b2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+import org.eclipse.emf.ecore.EObject;
+
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
 
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -79,7 +82,6 @@ public class ToolBarContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 	private IProject project;
 	
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
@@ -97,8 +99,7 @@ public Struct(String label, EClass eClass, boolean separator) {
 	}
 	
 	public ToolBarContributionEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 		this.project = project;
 	}
 
@@ -147,6 +148,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -158,7 +164,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+				
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -203,7 +209,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText(Messages.ToolBarEditor_ToolbarItemsType);
 				column.getColumn().setWidth(300);
-				column.setLabelProvider(new ComponentLabelProvider(editor));
+				column.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			}
 
 			{
@@ -312,7 +318,7 @@ public void widgetSelected(SelectionEvent e) {
 						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 							if (!struct.separator) {
-								editor.setSelection(eObject);
+								getEditor().setSelection(eObject);
 							}
 						}
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 93d3401cb3..99c10786cc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+import org.eclipse.emf.ecore.EObject;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
@@ -66,7 +69,6 @@ public class ToolBarEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
@@ -84,8 +86,7 @@ public Struct(String label, EClass eClass, boolean separator) {
 
 	
 	public ToolBarEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 	}
 
 	@Override
@@ -127,6 +128,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -138,7 +144,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -158,7 +164,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText(Messages.ToolBarEditor_ToolbarItemsType);
 				column.getColumn().setWidth(300);
-				column.setLabelProvider(new ComponentLabelProvider(editor));
+				column.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			}
 
 			{
@@ -267,7 +273,7 @@ public void widgetSelected(SelectionEvent e) {
 						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 							if (!struct.separator) {
-								editor.setSelection(eObject);
+								getEditor().setSelection(eObject);
 							}
 						}
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index a15848fbdb..84d9570547 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -10,6 +10,14 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Button;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -36,8 +44,8 @@ public class ToolBarSeparatorEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	
-	public ToolBarSeparatorEditor(EditingDomain editingDomain) {
-		super(editingDomain);
+	public ToolBarSeparatorEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain,editor);
 	}
 
 	@Override
@@ -85,6 +93,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -96,7 +109,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-
+		
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index ba7e3a80d9..7f9674c263 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -10,6 +10,11 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map.Entry;
@@ -49,8 +54,8 @@ public class ToolControlEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private IProject project;
 
-	public ToolControlEditor(EditingDomain editingDomain, IProject project) {
-		super(editingDomain);
+	public ToolControlEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
+		super(editingDomain,editor);
 		this.project = project;
 	}
 
@@ -99,7 +104,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -111,7 +120,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));
 		}
-
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 6d2e67ddcc..0abd550d1e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -10,6 +10,14 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.core.databinding.UpdateValueStrategy;
+import org.eclipse.core.databinding.conversion.Converter;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -46,8 +54,8 @@ public abstract class ToolItemEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	protected IProject project;
 
-	public ToolItemEditor(EditingDomain editingDomain, IProject project) {
-		super(editingDomain);
+	public ToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
+		super(editingDomain, editor);
 		this.project = project;
 	}
 
@@ -67,6 +75,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("Id");
 
@@ -75,7 +88,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		gd.horizontalSpan = 2;
 		t.setLayoutData(gd);
 		context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));
-
+		
 		createFormSubTypeForm(parent, context, master);
 
 		return parent;
@@ -83,6 +96,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 	private void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, final WritableValue master) {
 		IValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		IWidgetValueProperty checkProp = WidgetProperties.selection();
+		IWidgetValueProperty enabled = WidgetProperties.enabled();
 
 		// ------------------------------------------------------------
 		{
@@ -144,6 +159,42 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 		}
+		
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Enabled");
+			
+			Button b = new Button(parent, SWT.CHECK);
+			b.setLayoutData(new GridData(GridData.BEGINNING,GridData.CENTER,false,false,2,1));
+			context.bindValue(checkProp.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__ENABLED).observeDetail(getMaster()));
+		}
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Selected");
+			
+			Button b = new Button(parent, SWT.CHECK);
+			b.setLayoutData(new GridData(GridData.BEGINNING,GridData.CENTER,false,false,2,1));
+			context.bindValue(checkProp.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__SELECTED).observeDetail(getMaster()));
+			
+			UpdateValueStrategy t2m = new UpdateValueStrategy();
+			t2m.setConverter(new Converter(boolean.class, ItemType.class) {
+
+				public Object convert(Object fromObject) {
+					return null;
+				}
+			});
+			UpdateValueStrategy m2t = new UpdateValueStrategy();
+			m2t.setConverter(new Converter(ItemType.class, boolean.class) {
+				
+				public Object convert(Object fromObject) {
+					return fromObject == ItemType.CHECK || fromObject == ItemType.RADIO;
+				}
+			});
+			
+			context.bindValue(enabled.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(getMaster()),t2m,m2t);
+
+		}
 
 		// ------------------------------------------------------------
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index c496fa822f..8b9c1af94d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+
 import org.eclipse.emf.ecore.util.EcoreUtil;
 
 import org.eclipse.emf.ecore.EObject;
@@ -78,7 +80,7 @@ public class TrimBarEditor extends AbstractComponentEditor {
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
 	public TrimBarEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
+		super(editingDomain,editor);
 		this.editor = editor;
 	}
 
@@ -123,6 +125,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -134,7 +141,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 62b58f7beb..3f1cf15d35 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+
 import org.eclipse.emf.ecore.EObject;
 
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
@@ -84,7 +86,6 @@ public class TrimContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 	private IProject project;
 	
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
@@ -102,8 +103,7 @@ public Struct(String label, EClass eClass, boolean separator) {
 	}
 	
 	public TrimContributionEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 		this.project = project;
 	}
 
@@ -151,7 +151,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -163,7 +167,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+				
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -196,7 +200,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 			
 			final TableViewer viewer = new TableViewer(parent);
-			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			viewer.setContentProvider(new ObservableListContentProvider());
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
@@ -293,7 +297,7 @@ public void widgetSelected(SelectionEvent e) {
 					
 					if( cmd.canExecute() ) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(toolbar);
+						getEditor().setSelection(toolbar);
 					}
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
index 4119793bab..9e81ea8c1e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
@@ -12,8 +12,8 @@
 public class TrimmedWindowEditor extends WindowEditor {
 	private IListProperty TRIMMED_WINDOW__TRIM_BARS = EMFProperties.list(BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS);
 	
-	public TrimmedWindowEditor(EditingDomain editingDomain, IProject project) {
-		super(editingDomain,project);
+	public TrimmedWindowEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
+		super(editingDomain,editor, project);
 	}
 
 	public IObservableList getChildList(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 5be7359726..795032b3df 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -10,6 +10,13 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.emf.edit.command.RemoveCommand;
+
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -68,20 +75,16 @@ public class WindowEditor extends AbstractComponentEditor {
 	private IListProperty SHARED_ELEMENTS = EMFProperties.list(BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
 	private IValueProperty WINDOW__MAIN_MENU = EMFProperties.value(BasicPackageImpl.Literals.WINDOW__MAIN_MENU);
 	
-
-	private Action addMainMenu; 
+	private Action addMainMenu;
+	private Button createRemoveMainMenu; 
 	
-	public WindowEditor(EditingDomain editingDomain, IProject project) {
-		super(editingDomain);
+	public WindowEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
+		super(editingDomain,editor);
 		this.project = project;
 		addMainMenu = new Action("Add Main Menu") {
 			@Override
 			public void run() {
-				MMenu menu = MMenuFactory.INSTANCE.createMenu();
-				Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__MAIN_MENU, menu);
-				if( cmd.canExecute() ) {
-					getEditingDomain().getCommandStack().execute(cmd);
-				}
+				addMenu();
 			}
 		};
 	}
@@ -117,6 +120,7 @@ public Composite getEditor(Composite parent, Object object) {
 			composite = createForm(parent,context, getMaster());
 		}
 		getMaster().setValue(object);
+		createRemoveMainMenu.setSelection(((MWindow)object).getMainMenu() != null);
 		return composite;
 	}
 
@@ -126,7 +130,12 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-
+		
+		if( getEditor().isModelFragment() ) {
+			ControlFactory.createFindImport(parent, this, context);			
+			return parent;
+		}
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -138,7 +147,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-
+		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -231,18 +240,52 @@ public void widgetSelected(SelectionEvent e) {
 					dialog.open();
 				}
 			});
-
+		}
+		
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Main Menu");
+			
+			createRemoveMainMenu = new Button(parent, SWT.CHECK);
+			createRemoveMainMenu.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MWindow window = (MWindow) getMaster().getValue();
+					if( window.getMainMenu() == null ) {
+						addMenu();
+					} else {
+						removeMenu();
+					}
+				}
+			});
+			createRemoveMainMenu.setLayoutData(new GridData(GridData.BEGINNING,GridData.CENTER,false,false,2,1));
 		}
 
+		ControlFactory.createSelectedElement(parent, this, context, "Selected Element");
 		ControlFactory.createBindingsWidget(parent, this);
 		ControlFactory.createVariablesWidget(parent, this);
 		ControlFactory.createTagsWidget(parent, this);
 
 		return parent;
 	}
+	
+	void removeMenu() {
+		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__MAIN_MENU, null);
+		if( cmd.canExecute() ) {
+			getEditingDomain().getCommandStack().execute(cmd);
+		}
+	}
+	
+	void addMenu() {
+		MMenu menu = MMenuFactory.INSTANCE.createMenu();
+		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__MAIN_MENU, menu);
+		if( cmd.canExecute() ) {
+			getEditingDomain().getCommandStack().execute(cmd);
+		}
+	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList getChildList(final Object element) {
 		final WritableList list = new WritableList();
 		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, "Handlers") {
 
@@ -287,10 +330,16 @@ protected boolean accepted(Object o) {
 			public void handleValueChange(ValueChangeEvent event) {
 				if( event.diff.getOldValue() != null ) {
 					list.remove(event.diff.getOldValue());
+					if( getMaster().getValue() == element ) {
+						createRemoveMainMenu.setSelection(false);	
+					}
 				}
 				
 				if( event.diff.getNewValue() != null ) {
 					list.add(0,event.diff.getNewValue());
+					if( getMaster().getValue() == element ) {
+						createRemoveMainMenu.setSelection(true);	
+					}
 				}
 			}
 		});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index 1f84e7aaa7..6134c2a0f1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -10,6 +10,12 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 
 import org.eclipse.emf.ecore.EObject;
@@ -72,7 +78,16 @@ protected Control createDialogArea(Composite parent) {
 		getShell().setText( getShellTitle());
 		setTitle( getDialogTitle() );
 		setMessage( getDialogMessage() );
-
+		
+		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newexp_wiz.png"));
+		setTitleImage(titleImage);
+		getShell().addDisposeListener(new DisposeListener() {
+			
+			public void widgetDisposed(DisposeEvent e) {
+				titleImage.dispose();
+			}
+		});
+		
 		Composite container = new Composite(composite, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 		container.setLayout(new GridLayout(2, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index 1dbe714f9d..005cba0506 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -74,10 +74,14 @@ protected Control createDialogArea(Composite parent) {
 		setTitle(Messages.ContributionClassDialog_DialogTitle);
 		setMessage(Messages.ContributionClassDialog_DialogMessage);
 		
+		final Image titleImage = new Image(comp.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newclass_wiz.png"));
+		setTitleImage(titleImage);
+		
 		getShell().addDisposeListener(new DisposeListener() {
 			
 			public void widgetDisposed(DisposeEvent e) {
 				javaClassImage.dispose();
+				titleImage.dispose();
 			}
 		});
 		
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
new file mode 100644
index 0000000000..5ad34a9763
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -0,0 +1,26 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.swt.widgets.Shell;
+
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+
+public class FindImportElementDialog extends TitleAreaDialog {
+	
+	public FindImportElementDialog(Shell parentShell, EditingDomain domain, EObject element) {
+		super(parentShell);
+	}
+	
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite comp = (Composite) super.createDialogArea(parent);
+		
+		return comp;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index 0daebd280d..f843431ff4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -97,6 +97,10 @@ public SharedElementsDialog(Shell parentShell, ModelEditor editor, MPlaceholder
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite comp = (Composite) super.createDialogArea(parent);
+
+		setTitle("Find Shared Elements");
+		setMessage("Find Shared Elements of an Window");
+
 		
 		Composite container = new Composite(comp, SWT.NONE);
 		container.setLayout(new GridLayout(2, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index bbc39d63e8..5b4a622efc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -35,7 +35,6 @@
 
 public class VApplicationAddons extends AbstractComponentEditor {
 	private Composite composite;
-	private ModelEditor editor;
 	private TableViewer viewer;
 	private EMFDataBindingContext context;
 	
@@ -46,8 +45,7 @@ public class VApplicationAddons extends AbstractComponentEditor {
 	private RemoveAddonCommand removeAddonCommand = new RemoveAddonCommand();
 	
 	public VApplicationAddons(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 		actions.add(new Action("Add Addon") {
 			@Override
 			public void run() {
@@ -105,7 +103,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 			viewer.getTable().setHeaderVisible(true);
-			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 						
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index e2e59a00e1..aec316a1aa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -74,13 +74,11 @@
 public class VBindingTableEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 	private TableViewer bindingViewer;
 	private TreeViewer contextsViewer;
 
 	public VBindingTableEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 	}
 
 	@Override
@@ -368,7 +366,7 @@ public void widgetSelected(SelectionEvent e) {
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 180;
 			bindingViewer.getControl().setLayoutData(gd);
-			bindingViewer.setLabelProvider(new ComponentLabelProvider(editor));
+			bindingViewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
@@ -445,7 +443,7 @@ public void widgetSelected(SelectionEvent e) {
 
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(command);
+						getEditor().setSelection(command);
 					}
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 277414fc32..156bdd2a51 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -51,14 +51,12 @@
 public class VCommandEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 	private TableViewer viewer;
 	
 	private EStructuralFeature commandsFeature;
 
 	public VCommandEditor(EditingDomain editingDomain, ModelEditor editor, EStructuralFeature commandsFeature) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 		this.commandsFeature = commandsFeature;
 	}
 
@@ -205,7 +203,7 @@ public void widgetSelected(SelectionEvent e) {
 					
 					if( cmd.canExecute() ) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(command);
+						getEditor().setSelection(command);
 					}
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 9a6646f54c..9744229f4f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -50,12 +50,10 @@
 public class VHandlerEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 	private TableViewer viewer;
 
 	public VHandlerEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 	}
 
 	@Override
@@ -210,7 +208,7 @@ public void widgetSelected(SelectionEvent e) {
 					
 					if( cmd.canExecute() ) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
+						getEditor().setSelection(handler);
 					}
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index 2db0267278..54a03e5c2c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -60,12 +60,10 @@
 public class VMenuContributionsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 	private TableViewer viewer;
 
 	public VMenuContributionsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 	}
 
 	@Override
@@ -220,7 +218,7 @@ public void widgetSelected(SelectionEvent e) {
 					
 					if( cmd.canExecute() ) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(command);
+						getEditor().setSelection(command);
 					}
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index ef947589a8..6a187c8cf2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -46,13 +46,11 @@
 public class VMenuEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 	private TableViewer viewer;
 	private EStructuralFeature feature;
 
 	public VMenuEditor(EditingDomain editingDomain, ModelEditor editor, EStructuralFeature feature) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 		this.feature = feature;
 	}
 
@@ -138,7 +136,7 @@ public void widgetSelected(SelectionEvent e) {
 
 				if (cmd.canExecute()) {
 					getEditingDomain().getCommandStack().execute(cmd);
-					editor.setSelection(handler);
+					getEditor().setSelection(handler);
 				}
 			}
 		});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
new file mode 100644
index 0000000000..22c351910c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -0,0 +1,233 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+
+import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
+
+import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
+
+import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
+
+import java.util.List;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VModelFragmentsEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private TableViewer viewer;
+
+	public VModelFragmentsEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain,editor);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Fragments";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Fragments Bla Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Fragments");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+
+			
+			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
+			viewer.setInput(prop.observeDetail(getMaster()));
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			GridLayout gl = new GridLayout(2,false);
+			gl.marginLeft=0;
+			gl.marginRight=0;
+			gl.marginWidth=0;
+			gl.marginHeight=0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MModelFragments container = (MModelFragments) getMaster().getValue();
+							int idx = container.getFragments().indexOf(obj) - 1;
+							if( idx >= 0 ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
+						if( s.size() == 1 ) {
+							Object obj = s.getFirstElement();
+							MModelFragments container = (MModelFragments) getMaster().getValue();
+							int idx = container.getFragments().indexOf(obj) + 1;
+							if( idx < container.getFragments().size() ) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, obj, idx);
+								
+								if( cmd.canExecute() ) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+							
+						}
+					}
+				}
+			});
+						
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					
+						MStringModelFragment eObject = MFragmentFactory.INSTANCE.createStringModelFragment();
+						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, eObject);
+						
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+							getEditor().setSelection(eObject);
+						}
+					
+				}
+			});
+			
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if( ! viewer.getSelection().isEmpty() ) {
+						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
+						
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, elements);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
new file mode 100644
index 0000000000..4152290714
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -0,0 +1,277 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EPackage;
+
+import java.util.ArrayList;
+import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerComparator;
+
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+
+import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
+
+import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
+
+import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
+
+import java.util.List;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VModelImportsEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private TableViewer viewer;
+
+	public VModelImportsEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain, editor);
+	}
+ 
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Imports";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Imports Bla Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if( composite == null ) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent,context, getMaster());
+		}
+		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue master) {
+		parent = new Composite(parent,SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Imports");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			
+			viewer = new TableViewer(parent);
+			viewer.setContentProvider(new ObservableListContentProvider());
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 200;
+			viewer.getControl().setLayoutData(gd);
+			
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MModelFragments container = (MModelFragments) getMaster().getValue();
+							int idx = container.getImports().indexOf(obj) - 1;
+							if (idx >= 0) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MModelFragments container = (MModelFragments) getMaster().getValue();
+							int idx = container.getImports().indexOf(obj) + 1;
+							if (idx < container.getImports().size()) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					FeatureClass eclass = (FeatureClass) element;
+					return eclass.label;
+				}
+			});
+			childrenDropDown.setComparator(new ViewerComparator() {
+				@Override
+				public int compare(Viewer viewer, Object e1, Object e2) {
+					FeatureClass eClass1 = (FeatureClass) e1;
+					FeatureClass eClass2 = (FeatureClass) e2;
+					return eClass1.label.compareTo(eClass2.label);
+				}
+			});
+
+			List<FeatureClass> list = new ArrayList<FeatureClass>();
+			addClasses(ApplicationPackageImpl.eINSTANCE, list);
+			list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
+			
+			childrenDropDown.setInput(list);
+			childrenDropDown.getCombo().select(0);
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					EClass eClass = ((FeatureClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement()).eClass;
+					EObject eObject = EcoreUtil.create(eClass);
+
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, eObject);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						getEditor().setSelection(eObject);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, elements);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+
+		return parent;
+	}
+
+	public void addClasses(EPackage ePackage, List<FeatureClass> list) {
+		for (EClassifier c : ePackage.getEClassifiers()) {
+			if (c instanceof EClass) {
+				EClass eclass = (EClass) c;
+				if (eclass != ApplicationPackageImpl.Literals.APPLICATION && !eclass.isAbstract() && !eclass.isInterface() && eclass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT)) {
+					list.add(new FeatureClass(eclass.getName(), eclass));
+				}
+			}
+		}
+
+		for (EPackage eSubPackage : ePackage.getESubpackages()) {
+			addClasses(eSubPackage, list);
+		}
+	}
+	
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index 455c857ae8..aac36fea5c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -50,12 +50,10 @@
 public class VPartDescriptor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 	private TableViewer viewer;
 
 	public VPartDescriptor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain, editor);
 	}
 
 	@Override
@@ -201,7 +199,7 @@ public void widgetSelected(SelectionEvent e) {
 					
 					if( cmd.canExecute() ) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(command);
+						getEditor().setSelection(command);
 					}
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index 6ec691383a..e1edb402f7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -64,12 +64,10 @@
 public class VToolBarContributionsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 	private TableViewer viewer;
 
 	public VToolBarContributionsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain, editor);
 	}
 
 	@Override
@@ -224,7 +222,7 @@ public void widgetSelected(SelectionEvent e) {
 					
 					if( cmd.canExecute() ) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(command);
+						getEditor().setSelection(command);
 					}
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index 245466d599..42b3bd4a4d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -68,12 +68,10 @@
 public class VTrimContributionsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 	private TableViewer viewer;
 
 	public VTrimContributionsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 	}
 
 	@Override
@@ -228,7 +226,7 @@ public void widgetSelected(SelectionEvent e) {
 					
 					if( cmd.canExecute() ) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(command);
+						getEditor().setSelection(command);
 					}
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index ac3be06810..12ce25b892 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -53,12 +53,10 @@
 public class VWindowControlEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 	private TableViewer viewer;
 
 	public VWindowControlEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 	}
 
 	@Override
@@ -106,7 +104,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
@@ -213,7 +211,7 @@ public void widgetSelected(SelectionEvent e) {
 						
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
-							editor.setSelection(eObject);
+							getEditor().setSelection(eObject);
 						}
 					}
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 416b90ede2..3f358ad029 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -54,12 +54,10 @@
 public class VWindowEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 	private TableViewer viewer;
 
 	public VWindowEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 	}
 
 	@Override
@@ -246,7 +244,7 @@ public void widgetSelected(SelectionEvent e) {
 
 				if (cmd.canExecute()) {
 					getEditingDomain().getCommandStack().execute(cmd);
-					editor.setSelection(handler);
+					getEditor().setSelection(handler);
 				}
 			}
 		});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 6cfe2aa514..253f4fe051 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -57,12 +57,10 @@
 public class VWindowSharedElementsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 	private TableViewer viewer;
 
 	public VWindowSharedElementsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 	}
 
 	@Override
@@ -110,7 +108,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
@@ -215,7 +213,7 @@ public void widgetSelected(SelectionEvent e) {
 						
 						if( cmd.canExecute() ) {
 							getEditingDomain().getCommandStack().execute(cmd);
-							editor.setSelection(eObject);
+							getEditor().setSelection(eObject);
 						}
 					}
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index 50b959eee8..1d7ea1156f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -42,12 +42,10 @@
 public class VWindowTrimEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 	private TableViewer viewer;
 
 	public VWindowTrimEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain);
-		this.editor = editor;
+		super(editingDomain,editor);
 	}
 
 	@Override
@@ -95,7 +93,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
@@ -122,7 +120,7 @@ public void widgetSelected(SelectionEvent e) {
 					
 					if( cmd.canExecute() ) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(handler);
+						getEditor().setSelection(handler);
 					}
 				}
 			});

From 017c5f85ce8345b45398b6f3be867c1be42627c1 Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster>
Date: Fri, 25 Jun 2010 17:55:10 +0000
Subject: [PATCH 0154/1286] Bug 318026 -  support ability to uninject without
 specific context Just fixed the compile error

---
 .../compat/internal/ReflectionContributionFactory.java      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
index 1dce9b056a..9e4ed7f352 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
@@ -257,4 +257,10 @@ private URI(String uriString) {
 			segments = uriString.substring(uriString.indexOf('/')+1).split("/");
 		}
 	}
+
+	public Object create(String uriString, IEclipseContext context,
+			IEclipseContext staticContext) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

From f9d939e2732e1b01bfa6c8e086cf8265e2c4bcf1 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 26 Jun 2010 13:03:44 +0000
Subject: [PATCH 0155/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixing problem with fragments (treats everything as
 import) * some minor layout improvements (everything right aligned)

---
 .../emf/editor3x/EditorProjectFunction.java   |   5 +-
 .../META-INF/MANIFEST.MF                      |   3 +-
 .../e4/tools/emf/ui/common/ImageTooltip.java  | 192 ++++++++++++
 .../eclipse/e4/tools/emf/ui/common/Util.java  |   8 +
 .../emf/ui/internal/common/ModelEditor.java   |  91 +++---
 .../common/component/AddonsEditor.java        |  44 ++-
 .../common/component/ApplicationEditor.java   |   1 +
 .../common/component/BindingTableEditor.java  |  42 ++-
 .../common/component/CommandEditor.java       |  42 ++-
 .../common/component/ControlFactory.java      |  85 +++---
 .../component/DirectMenuItemEditor.java       |   1 +
 .../component/DirectToolItemEditor.java       |   1 +
 .../component/HandledMenuItemEditor.java      |   3 +-
 .../component/HandledToolItemEditor.java      |   3 +-
 .../common/component/HandlerEditor.java       |  42 ++-
 .../common/component/InputPartEditor.java     |   1 +
 .../common/component/KeyBindingEditor.java    |  42 ++-
 .../component/MenuContributionEditor.java     |  42 ++-
 .../internal/common/component/MenuEditor.java |  42 ++-
 .../common/component/MenuItemEditor.java      |  58 +++-
 .../common/component/MenuSeparatorEditor.java |  35 ++-
 .../component/ModelFragmentsEditor.java       |   4 +-
 .../component/PartDescriptorEditor.java       |  84 ++++-
 .../internal/common/component/PartEditor.java | 286 +++++++++++-------
 .../component/PartSashContainerEditor.java    |  44 ++-
 .../common/component/PartStackEditor.java     |  39 ++-
 .../common/component/PerspectiveEditor.java   |  57 +++-
 .../component/PerspectiveStackEditor.java     |  38 ++-
 .../common/component/PlaceholderEditor.java   |  35 ++-
 .../common/component/StringModelFragment.java |   5 +-
 .../component/ToolBarContributionEditor.java  |  41 ++-
 .../common/component/ToolBarEditor.java       |  39 ++-
 .../component/ToolBarSeparatorEditor.java     |  36 ++-
 .../common/component/ToolControlEditor.java   |  39 ++-
 .../common/component/ToolItemEditor.java      |  58 +++-
 .../common/component/TrimBarEditor.java       |  42 ++-
 .../component/TrimContributionEditor.java     |  42 ++-
 .../common/component/TrimmedWindowEditor.java |  17 ++
 .../common/component/WindowEditor.java        |  74 ++++-
 .../dialogs/FindImportElementDialog.java      |  70 ++++-
 40 files changed, 1512 insertions(+), 321 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java
index 0544e40d45..c99606b515 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java
@@ -10,7 +10,10 @@ public class EditorProjectFunction extends ContextFunction {
 	@Override
 	public Object compute(IEclipseContext context) {
 		final IEditorInput input = context.get(IEditorInput.class);
-		return ((IFileEditorInput)input).getFile().getProject();
+		if( input != null ) {
+			return ((IFileEditorInput)input).getFile().getProject();	
+		}
+		return null;
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index b8003bef0b..bd341a4098 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -25,7 +25,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.e4.ui.services;bundle-version="0.9.1",
  org.eclipse.equinox.registry;bundle-version="3.5.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",
- org.eclipse.e4.ui.di;bundle-version="0.9.0"
+ org.eclipse.e4.ui.di;bundle-version="0.9.0",
+ javax.annotation;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.runtime.jobs,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
new file mode 100644
index 0000000000..87251ca5b5
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
@@ -0,0 +1,192 @@
+package org.eclipse.e4.tools.emf.ui.common;
+
+import java.io.FileNotFoundException;
+
+import java.text.DecimalFormat;
+
+import java.text.NumberFormat;
+
+import java.io.ByteArrayInputStream;
+
+import org.eclipse.swt.graphics.ImageData;
+
+import java.io.ByteArrayOutputStream;
+
+import org.eclipse.swt.layout.GridLayout;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.jface.resource.JFaceResources;
+
+import org.eclipse.swt.graphics.Image;
+
+import org.eclipse.swt.graphics.Font;
+
+import org.eclipse.swt.widgets.Label;
+
+import org.eclipse.swt.SWT;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+
+import org.eclipse.swt.widgets.Control;
+
+import org.eclipse.jface.window.ToolTip;
+
+public abstract class ImageTooltip extends ToolTip {
+	private Image image;
+	
+	public ImageTooltip(Control control) {
+		super(control);
+
+	}
+
+	@Override
+	protected boolean shouldCreateToolTip(Event event) {
+		if( getImageURI() != null ) {
+			return super.shouldCreateToolTip(event);	
+		}
+		return false;
+	}
+	
+	@Override
+	protected Composite createToolTipContentArea(Event event, Composite parent) {
+		clearResources();
+		parent = new Composite(parent, SWT.NONE);
+		parent.setBackground(event.widget.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+		parent.setBackgroundMode(SWT.INHERIT_DEFAULT);
+		parent.setLayout(new GridLayout(2, false));
+
+		URI uri = getImageURI(); 
+		
+		if( uri != null ) {
+			int fileSize = -1;
+			ByteArrayOutputStream out = null;
+			InputStream stream = null;
+			InputStream bStream = null;
+			String errorMessage = "<Unknow Error>";
+			try {
+				URL url = new URL(uri.toString());
+				stream = url.openStream();
+				
+				if( stream != null ) {
+					out = new ByteArrayOutputStream();
+					byte[] buf = new byte[1024];
+					int length;
+					while( ( length = stream.read(buf)) != -1 ) {
+						out.write(buf,0,length);
+					}
+					fileSize = out.size();
+					bStream = new ByteArrayInputStream(out.toByteArray());
+					image = new Image(parent.getDisplay(),bStream);
+				}
+			} catch (MalformedURLException e) {
+				errorMessage = e.getMessage();
+			} catch (FileNotFoundException e) {
+				if( uri.isPlatform() ) {
+					errorMessage = "File '" + e.getMessage() + "' not found in bundle '"+uri.segment(1)+"'";	
+				} else {
+					errorMessage = e.getMessage();
+				}
+			} catch (IOException e) {
+				errorMessage = e.getMessage();
+			} catch(Exception e) {
+				errorMessage = e.getMessage();
+			}finally {
+				if(out != null) {
+					try {
+						out.close();
+					} catch (IOException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				
+				if( bStream != null ) {
+					try {
+						bStream.close();
+					} catch (IOException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				
+				if( stream != null ) {
+					try {
+						stream.close();
+					} catch (IOException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+			}
+			
+			// ---------------------------------
+			Label l = new Label(parent, SWT.NONE);
+			l.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
+			l.setText("Icon:");
+			
+			l = new Label(parent,SWT.NONE);
+			if( image == null ) {
+				System.err.println(errorMessage);
+				l.setText(errorMessage);
+			} else {
+				l.setImage(image);
+			}
+
+			// ---------------------------------
+			
+			l = new Label(parent, SWT.NONE);
+			l.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
+			l.setText("Name:");
+			
+			l = new Label(parent,SWT.NONE);
+			l.setText(uri.lastSegment());
+			
+			// ---------------------------------
+			
+			l = new Label(parent, SWT.NONE);
+			l.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
+			l.setText("Dimensions:");
+			
+			l = new Label(parent,SWT.NONE);
+			if( image != null ) {
+				l.setText(image.getBounds().width + "x" + image.getBounds().height+" px");	
+			} else {
+				l.setText("0x0 px");
+			}
+			
+
+			// ---------------------------------
+			
+			l = new Label(parent, SWT.NONE);
+			l.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
+			l.setText("File-Size:");
+			
+			l = new Label(parent,SWT.NONE);
+			l.setText( new DecimalFormat("#,##0.00").format((fileSize / 1024.0)) + "KB" );			
+		}
+		
+		return parent;
+	}
+
+	@Override
+	protected void afterHideToolTip(Event event) {
+		super.afterHideToolTip(event);
+		clearResources();
+	}
+	
+	protected abstract URI getImageURI();
+	
+	private void clearResources() {
+		if( image != null ) {
+			image.dispose();
+			image = null;
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index 06bdb50641..19d535ce1f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -1,7 +1,15 @@
 package org.eclipse.e4.tools.emf.ui.common;
 
+import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
 public class Util {
 	public static final boolean isNullOrEmpty(String element) {
 		return element == null || element.trim().length() == 0;
 	}
+	
+	public static final boolean isImport(EObject object) {
+		return object.eContainingFeature() == FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 278aca833d..0874d5b5b5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,51 +10,20 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
-import org.eclipse.e4.ui.model.fragment.MModelFragments;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelImportsEditor;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelFragmentsEditor;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.swt.widgets.ToolItem;
-
-import org.eclipse.swt.widgets.ToolBar;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.TrimContributionEditor;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VTrimContributionsEditor;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VToolBarContributionsEditor;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolBarContributionEditor;
+import org.eclipse.swt.widgets.TreeItem;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowSharedElementsEditor;
-
-import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.e4.tools.emf.ui.common.IEditorFeature;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.StringModelFragment;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.ModelFragmentsEditor;
-
-import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuContributionEditor;
+import javax.annotation.PostConstruct;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuContributionsEditor;
+import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
 
-import org.eclipse.e4.ui.di.Focus;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -76,6 +45,8 @@
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.services.contributions.IContributionFactory;
 import org.eclipse.e4.tools.emf.ui.common.IEditorDescriptor;
+import org.eclipse.e4.tools.emf.ui.common.IEditorFeature;
+import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.ISelectionProviderService;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -91,8 +62,10 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandlerEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.InputPartEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.KeyBindingEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuContributionEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuSeparatorEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ModelFragmentsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PartDescriptorEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PartEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PartSashContainerEditor;
@@ -100,31 +73,44 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PerspectiveEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PerspectiveStackEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PlaceholderEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.StringModelFragment;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolBarContributionEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolBarEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolBarSeparatorEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolControlEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.TrimBarEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.TrimContributionEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.TrimmedWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationAddons;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VBindingTableEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VCommandEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuContributionsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelFragmentsEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelImportsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartDescriptor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VToolBarContributionsEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VTrimContributionsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowControlEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowSharedElementsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowTrimEditor;
+import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.di.Persist;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
@@ -182,15 +168,17 @@ public class ModelEditor {
 	private IProject project;
 	private ISelectionProviderService selectionService;
 	private IEclipseContext context;
-	private Image toolmenuIcon;
 	private boolean fragment;
 
+	@Inject
+	@Optional
+	private MPart editorPart;
+	
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project) {
 		this.modelProvider = modelProvider;
 		this.project = project;
 		this.context = context;
 		this.context.set(ModelEditor.class, this);
-		this.toolmenuIcon = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/headermenu.png"));
 
 		registerDefaultEditors();
 		registerVirtualEditors();
@@ -234,15 +222,12 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 		final Label textLabel = new Label(headerContainer, SWT.NONE);
 		textLabel.setData(CSS_CLASS_KEY, "sectionHeader"); //$NON-NLS-1$
 		textLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-//		ToolBar toolbar = new ToolBar(headerContainer, SWT.NONE);
-//		ToolItem item = new ToolItem(toolbar, SWT.PUSH);
-//		item.setImage(toolmenuIcon);
-		
+				
 		final ScrolledComposite scrolling = new ScrolledComposite(editingArea, SWT.H_SCROLL | SWT.V_SCROLL);
 		scrolling.setBackgroundMode(SWT.INHERIT_DEFAULT);
 		scrolling.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
 
+		final StackLayout layout = new StackLayout();
 		final Composite contentContainer = new Composite(scrolling, SWT.NONE);
 		contentContainer.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
 		scrolling.setExpandHorizontal(true);
@@ -251,13 +236,14 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 
 		scrolling.addControlListener(new ControlAdapter() {
 			public void controlResized(ControlEvent e) {
-				Rectangle r = scrolling.getClientArea();
-				scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT));
+				if( layout.topControl != null ) {
+					Rectangle r = scrolling.getClientArea();
+					scrolling.setMinSize(layout.topControl.computeSize(r.width, SWT.DEFAULT));	
+				}
 			}
 		});
 
 		scrolling.setLayoutData(new GridData(GridData.FILL_BOTH));
-		final StackLayout layout = new StackLayout();
 		contentContainer.setLayout(layout);
 
 		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
@@ -290,7 +276,9 @@ public void selectionChanged(SelectionChangedEvent event) {
 					}
 
 					Rectangle r = scrolling.getClientArea();
-					scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT));
+					scrolling.setMinSize(layout.topControl.computeSize(r.width, SWT.DEFAULT));
+					scrolling.setOrigin(0, 0);
+					scrolling.layout(true,true);
 
 					if (selectionService != null) {
 						selectionService.setSelection(s.getFirstElement());
@@ -354,6 +342,10 @@ public boolean isModelFragment() {
 		return fragment;
 	}
 	
+	public boolean isLiveModel() {
+		return ! modelProvider.isSaveable();
+	}
+	
 	public List<FeatureClass> getFeatureClasses(EClass eClass, EStructuralFeature feature) {
 		List<FeatureClass> list = new ArrayList<IEditorFeature.FeatureClass>();
 		
@@ -365,11 +357,10 @@ public List<FeatureClass> getFeatureClasses(EClass eClass, EStructuralFeature fe
 	}
 
 	@Inject
-	@Optional
-	public void setSelectionService(ISelectionProviderService selectionService) {
+	public void setSelectionService(@Optional ISelectionProviderService selectionService) {
 		this.selectionService = selectionService;
 		if (viewer != null && !viewer.getControl().isDisposed()) {
-			if (!viewer.getSelection().isEmpty()) {
+			if (!viewer.getSelection().isEmpty() && selectionService != null) {
 				selectionService.setSelection(((IStructuredSelection) viewer.getSelection()).getFirstElement());
 			}
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 71789db0e9..f6f381cf77 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -10,6 +10,14 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
+import org.eclipse.e4.tools.emf.ui.common.Util;
+
 import org.eclipse.emf.ecore.EObject;
 
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
@@ -47,6 +55,7 @@ public class AddonsEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private IProject project;
 	private Image image;
+	private StackLayout stackLayout;
 	
 	public AddonsEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain,editor);
@@ -88,22 +97,45 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context); 
-		} 
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 	
-	protected Composite createForm(Composite parent, EMFDataBindingContext context) {
+	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		
-		if( getEditor().isModelFragment() ) {
+		if( getEditor().isModelFragment() && isImport ) {
 			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
@@ -111,6 +143,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.AddonsEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -123,6 +156,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.AddonsEditor_ClassURI);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 437ffc19ff..abdf91432c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -103,6 +103,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ApplicationEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 37f11bcba6..bc93505433 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -10,6 +10,12 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.emf.ecore.EObject;
 
@@ -65,6 +71,7 @@ public class BindingTableEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	
 	private IListProperty BINDING_TABLE__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
+	private StackLayout stackLayout;
 
 
 	public BindingTableEditor(EditingDomain editingDomain, ModelEditor editor) {
@@ -99,28 +106,50 @@ public String getDescription(Object element) {
 	public Composite getEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent, context);
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
 		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 		
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
-
 		
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.BindingTableEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -132,6 +161,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.BindingTableEditor_ContextId);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -145,7 +175,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.BindingTableEditor_Keybindings);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
 
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index af5c12abc0..5dabe39385 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -10,6 +10,12 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.emf.ecore.EObject;
 
@@ -67,6 +73,7 @@ public class CommandEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
+	private StackLayout stackLayout;
 
 	public CommandEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain,editor);
@@ -100,19 +107,42 @@ public String getDescription(Object element) {
 	public Composite getEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent, context);
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
 		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 		
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);
 			
 			return parent;
@@ -121,6 +151,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CommandEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -133,6 +164,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CommandEditor_Name);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -145,7 +177,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CommandEditor_LabelDescription);
-			l.setLayoutData(new GridData(GridData.BEGINNING,GridData.BEGINNING,false,false));
+			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
 
 			Text t = new Text(parent, SWT.BORDER|SWT.H_SCROLL|SWT.V_SCROLL);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -159,7 +191,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CommandEditor_Parameters);
-			l.setLayoutData(new GridData(GridData.BEGINNING,GridData.BEGINNING,false,false));
+			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
 
 			final TableViewer viewer = new TableViewer(parent,SWT.FULL_SELECTION|SWT.MULTI|SWT.BORDER);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index a8f99174ef..782a1f73e4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -87,38 +87,41 @@
 public class ControlFactory {
 	public static void createFindImport(Composite parent, final AbstractComponentEditor editor, EMFDataBindingContext context) {
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-			
+
 		Label l = new Label(parent, SWT.NONE);
-			l.setText("Reference-Id");
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(editor.getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(editor.getMaster()));
-			
-			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
-			b.setText("Find ...");
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					FindImportElementDialog dialog = new FindImportElementDialog(b.getShell(), editor.getEditingDomain(), (EObject) editor.getMaster().getValue());
-					dialog.open();
-				}
-			});
+		l.setText("Reference-Id");
+		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+		Text t = new Text(parent, SWT.BORDER);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		t.setLayoutData(gd);
+		context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(editor.getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(editor.getMaster()));
+
+		final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+		b.setText("Find ...");
+		b.setImage(editor.getImage(t.getDisplay(), AbstractComponentEditor.SEARCH_IMAGE));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				FindImportElementDialog dialog = new FindImportElementDialog(b.getShell(), editor.getEditingDomain(), (EObject) editor.getMaster().getValue());
+				dialog.open();
+			}
+		});
 	}
-	
+
 	public static void createSelectedElement(Composite parent, final AbstractComponentEditor editor, final EMFDataBindingContext context, String label) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
+		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		ComboViewer viewer = new ComboViewer(parent);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=2;
+		gd.horizontalSpan = 2;
 		viewer.getControl().setLayoutData(gd);
 		IEMFEditListProperty listProp = EMFEditProperties.list(editor.getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 		IEMFEditValueProperty labelProp = EMFEditProperties.value(editor.getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL);
 		IEMFEditValueProperty idProp = EMFEditProperties.value(editor.getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-		
+
 		IViewerValueProperty vProp = ViewerProperties.singleSelection();
 
 		final Binding[] binding = new Binding[1];
@@ -127,7 +130,7 @@ public static void createSelectedElement(Composite parent, final AbstractCompone
 		editor.getMaster().addValueChangeListener(new IValueChangeListener() {
 
 			public void handleValueChange(ValueChangeEvent event) {
-				if( binding[0] != null ) {
+				if (binding[0] != null) {
 					binding[0].dispose();
 				}
 
@@ -137,36 +140,33 @@ public void handleValueChange(ValueChangeEvent event) {
 		final IObservableList list = listProp.observeDetail(editor.getMaster());
 		ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
-		IObservableMap[] attributeMaps = {
-				labelProp.observeDetail(cp.getKnownElements()),
-				idProp.observeDetail(cp.getKnownElements())
-		};
+		IObservableMap[] attributeMaps = { labelProp.observeDetail(cp.getKnownElements()), idProp.observeDetail(cp.getKnownElements()) };
 		viewer.setLabelProvider(new ObservableMapLabelProvider(attributeMaps) {
 			@Override
 			public String getText(Object element) {
 				EObject o = (EObject) element;
 				String rv = o.eClass().getName();
-				
-				if( element instanceof MUILabel ) {
+
+				if (element instanceof MUILabel) {
 					MUILabel label = (MUILabel) element;
-					if( ! Util.isNullOrEmpty(label.getLabel()) ) {
-						return rv + " - " + label.getLabel().trim();	
+					if (!Util.isNullOrEmpty(label.getLabel())) {
+						return rv + " - " + label.getLabel().trim();
 					}
-					
+
 				}
-				
-				if(element instanceof MApplicationElement) {
+
+				if (element instanceof MApplicationElement) {
 					MApplicationElement appEl = (MApplicationElement) element;
-					if( ! Util.isNullOrEmpty(appEl.getElementId()) ) {
+					if (!Util.isNullOrEmpty(appEl.getElementId())) {
 						return rv + " - " + appEl.getElementId();
 					}
 				}
-				
-				return rv + "["+list.indexOf(element)+"]";
+
+				return rv + "[" + list.indexOf(element) + "]";
 			}
 		});
 		viewer.setInput(list);
-		
+
 		editor.getMaster().addValueChangeListener(new IValueChangeListener() {
 
 			public void handleValueChange(ValueChangeEvent event) {
@@ -174,11 +174,11 @@ public void handleValueChange(ValueChangeEvent event) {
 			}
 		});
 	}
-	
+
 	public static void createStringListWidget(Composite parent, final AbstractComponentEditor editor, String label, final EStructuralFeature feature) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
-		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+		l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
 
 		final Text t = new Text(parent, SWT.BORDER);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -298,12 +298,11 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 	}
-	
-	
+
 	public static void createVariablesWidget(Composite parent, final AbstractComponentEditor editor) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(Messages.ControlFactory_ContextVariables);
-		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		final Text t = new Text(parent, SWT.BORDER);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -427,7 +426,7 @@ public void widgetSelected(SelectionEvent e) {
 	public static void createBindingsWidget(Composite parent, final AbstractComponentEditor editor) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(Messages.ControlFactory_BindingContexts);
-		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		final Text t = new Text(parent, SWT.BORDER);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -551,7 +550,7 @@ public void widgetSelected(SelectionEvent e) {
 	public static void createTagsWidget(Composite parent, final AbstractComponentEditor editor) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(Messages.ControlFactory_Tags);
-		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		final Text tagText = new Text(parent, SWT.BORDER);
 		tagText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index fd3b66445e..7ebc2b32b6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -74,6 +74,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.DirectMenuItemEditor_ClassURI);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 6e46514585..43f64ed338 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -64,6 +64,7 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(Messages.DirectToolItemEditor_ClassURI);
+		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		Text t = new Text(parent, SWT.BORDER);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index a8ef32c707..8ed2596dc2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -103,6 +103,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.HandledMenuItemEditor_Command);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -126,7 +127,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.HandledMenuItemEditor_Parameters);
-			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			final TableViewer tableviewer = new TableViewer(parent);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 5f3d845cbe..e0eb7458f7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -92,6 +92,7 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.HandledToolItemEditor_Command);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -115,7 +116,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(Messages.HandledToolItemEditor_Parameters);
-		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+		l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 		final TableViewer tableviewer = new TableViewer(parent);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index dce8bfc693..d0e07976e0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -10,6 +10,12 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.emf.ecore.EObject;
 
@@ -52,6 +58,7 @@ public class HandlerEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private IModelResource resource;
 	private IProject project;
+	private StackLayout stackLayout;
 
 	public HandlerEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource, IProject project) {
 		super(editingDomain,editor);
@@ -86,20 +93,42 @@ public String getDescription(Object element) {
 	public Composite getEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent, context);
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
 		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-
 		
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
@@ -108,7 +137,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.HandlerEditor_Id);
-
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
@@ -120,6 +150,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.HandlerEditor_Command);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -143,6 +174,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.HandlerEditor_ClassURI);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
index 7119cc4e49..b1164d29fa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
@@ -47,6 +47,7 @@ protected void createSubformElements(Composite parent, EMFDataBindingContext con
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.InputPartEditor_InputURI);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 4cdf045ece..f72445c709 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -10,6 +10,12 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.emf.ecore.EObject;
 
@@ -69,6 +75,7 @@ public class KeyBindingEditor extends AbstractComponentEditor {
 	private Image image;
 	private EMFDataBindingContext context;
 	private IModelResource resource;
+	private StackLayout stackLayout;
 
 	public KeyBindingEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource) {
 		super(editingDomain,editor);
@@ -103,20 +110,42 @@ public String getDescription(Object element) {
 	public Composite getEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent, context);
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
 		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
@@ -125,6 +154,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.KeyBindingEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -137,6 +167,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.KeyBindingEditor_Sequence);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -149,6 +180,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.KeyBindingEditor_Command);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -170,7 +202,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(Messages.KeyBindingEditor_Parameters);
-		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+		l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 		final TableViewer tableviewer = new TableViewer(parent);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 9629abd00a..d4f8ea5f5a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -10,6 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.emf.ecore.EObject;
 
@@ -83,6 +87,7 @@ public class MenuContributionEditor extends AbstractComponentEditor {
 	private IProject project;
 	
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private StackLayout stackLayout;
 	
 	private static class Struct {
 		private final String label;
@@ -132,22 +137,44 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
 		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context2, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
@@ -156,6 +183,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -168,6 +196,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_ParentId);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -180,6 +209,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_Position);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -193,7 +223,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_MenuItems);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
 
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index a4958d5b39..266b9ff1a1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -10,6 +10,12 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.e4.tools.emf.ui.common.Util;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 
 import java.net.MalformedURLException;
@@ -124,12 +130,17 @@ public Composite getEditor(Composite parent, Object object) {
 			stackLayout = new StackLayout();
 			composite.setLayout(stackLayout);
 			
-			createForm(composite, context, getMaster(),false);
-			createForm(composite, context, getMaster(),true);
+			createForm(composite, context, getMaster(),false,false);
+			createForm(composite, context, getMaster(),true,false);
+			if( getEditor().isModelFragment() ) {
+				createForm(composite, context, getMaster(),false,true);	
+			}
 		}
 		EObject o = (EObject) object;
 		Control topControl;
-		if( o.eContainer() instanceof MWindow || o.eContainer() == null ) {
+		if( Util.isImport(o) && getEditor().isModelFragment() ) {
+			topControl = composite.getChildren()[2];
+		} else if( o.eContainer() instanceof MWindow || o.eContainer() == null ) {
 			topControl = composite.getChildren()[1];
 		} else {
 			topControl = composite.getChildren()[0];
@@ -144,14 +155,13 @@ public Composite getEditor(Composite parent, Object object) {
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean rootMenu) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean rootMenu, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
@@ -160,6 +170,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -173,6 +184,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuEditor_LabelLabel);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -186,6 +198,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuEditor_Tooltip);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -199,11 +212,26 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuEditor_IconURI);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
+			new ImageTooltip(t) {
+				
+				@Override
+				protected URI getImageURI() {
+					MUILabel part = (MUILabel) getMaster().getValue();
+					String uri = part.getIconURI();
+					if( uri == null || uri.trim().length() == 0 ) {
+						return null;
+					}
+					return URI.createURI(part.getIconURI());
+				}
+			};
+
+			
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setText(Messages.MenuItemEditor_Find);
@@ -220,7 +248,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuEditor_MenuItems);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
 
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index a8b4c89f36..6a187edef1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -10,6 +10,14 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.core.databinding.conversion.Converter;
 
 import org.eclipse.core.databinding.UpdateValueStrategy;
@@ -61,6 +69,7 @@ public abstract class MenuItemEditor extends AbstractComponentEditor {
 	private Image menuImage;
 	private EMFDataBindingContext context;
 	protected IProject project;
+	private StackLayout stackLayout;
 
 	public MenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain,editor);
@@ -85,13 +94,36 @@ public Image getImage(Object element, Display display) {
 	public Composite getEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent, context, getMaster());
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
 		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
@@ -99,7 +131,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		IWidgetValueProperty checkProp = WidgetProperties.selection();
 		IWidgetValueProperty enabled = WidgetProperties.enabled();
 		
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
@@ -108,6 +140,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuItemEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -121,6 +154,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			{
 				Label l = new Label(parent, SWT.NONE);
 				l.setText(Messages.MenuItemEditor_Type);
+				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 				ComboViewer viewer = new ComboViewer(parent);
 				viewer.setContentProvider(new ArrayContentProvider());
@@ -137,6 +171,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuItemEditor_Label);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -149,6 +184,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuItemEditor_Tooltip);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -161,11 +197,25 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuItemEditor_IconURI);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
+			new ImageTooltip(t) {
+				
+				@Override
+				protected URI getImageURI() {
+					MUILabel part = (MUILabel) getMaster().getValue();
+					String uri = part.getIconURI();
+					if( uri == null || uri.trim().length() == 0 ) {
+						return null;
+					}
+					return URI.createURI(part.getIconURI());
+				}
+			};
+			
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setText(Messages.MenuItemEditor_Find);
@@ -181,6 +231,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Enabled");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 			
 			Button b = new Button(parent, SWT.CHECK);
 			b.setLayoutData(new GridData(GridData.BEGINNING,GridData.CENTER,false,false,2,1));
@@ -190,6 +241,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Selected");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 			
 			Button b = new Button(parent, SWT.CHECK);
 			b.setLayoutData(new GridData(GridData.BEGINNING,GridData.CENTER,false,false,2,1));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 4040f05fce..dbc90e44f1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -10,6 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -43,6 +47,7 @@ public class MenuSeparatorEditor extends AbstractComponentEditor {
 	private Image separatorImage;
 	private Composite composite;
 	private EMFDataBindingContext context;
+	private StackLayout stackLayout;
 	
 	public MenuSeparatorEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain,editor);
@@ -81,19 +86,42 @@ public String getDescription(Object element) {
 	public Composite getEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent, context, getMaster());
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
 		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 	
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
@@ -102,6 +130,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuSeparatorEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index dd21635a31..708cd12b60 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -122,7 +122,7 @@ private Composite createForm(Composite parent) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Imports");
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
 			
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
@@ -263,7 +263,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ModelFragmentsEditor_ModelFragments);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
 
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 9b569d1583..fe58797890 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -10,6 +10,16 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
+
+import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.emf.ecore.EObject;
 
@@ -79,6 +89,7 @@ public class PartDescriptorEditor extends AbstractComponentEditor {
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IValueProperty PART__TOOLBAR = EMFProperties.value(BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR);
 	private Button createRemoveToolBar;
+	private StackLayout stackLayout;
 
 	public PartDescriptorEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain,editor);
@@ -111,23 +122,49 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+		
+		if (createRemoveToolBar != null) {
+			createRemoveToolBar.setSelection(((MPartDescriptor) object).getToolbar() != null);
 		}
+		
 		getMaster().setValue(object);
-		createRemoveToolBar.setSelection(((MPartDescriptor)object).getToolbar() != null);
 		return composite;
 	}
 
-	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master) {
+	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
@@ -137,6 +174,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -149,6 +187,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_LabelLabel);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -161,7 +200,8 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_Tooltip);
-
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
@@ -173,11 +213,25 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_IconURI);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
+			new ImageTooltip(t) {
+				
+				@Override
+				protected URI getImageURI() {
+					MUILabel part = (MUILabel) getMaster().getValue();
+					String uri = part.getIconURI();
+					if( uri == null || uri.trim().length() == 0 ) {
+						return null;
+					}
+					return URI.createURI(part.getIconURI());
+				}
+			};
+			
 			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setText(Messages.PartDescriptorEditor_Find);
@@ -194,6 +248,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_ClassURI);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -215,6 +270,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_ToolBar);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 			
 			createRemoveToolBar = new Button(parent, SWT.CHECK);
 			createRemoveToolBar.addSelectionListener(new SelectionAdapter() {
@@ -235,6 +291,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_ContainerData);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -247,6 +304,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_Dirtyable);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
@@ -262,6 +320,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_Closeable);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
@@ -276,6 +335,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_Multiple);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
@@ -290,6 +350,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_Category);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 			
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL,GridData.BEGINNING, true, false, 2, 1));
@@ -300,7 +361,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_PersitedState);
-			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			TableViewer tableviewer = new TableViewer(parent);
 			tableviewer.getTable().setHeaderVisible(true);
@@ -362,7 +423,7 @@ public String getText(Object element) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_Variables);
-			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			ListViewer viewer = new ListViewer(parent);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -375,7 +436,7 @@ public String getText(Object element) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_Properties);
-			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			TableViewer tableviewer = new TableViewer(parent);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -418,6 +479,11 @@ private void removeToolBar() {
 	@Override
 	public IObservableList getChildList(final Object element) {
 		final WritableList list = new WritableList();
+		
+		if( getEditor().isModelFragment() && Util.isImport((EObject) element) ) {
+			return list;
+		}
+		
 		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PARTDESCRIPTOR_MENU, PART__MENUS, element, Messages.PartDescriptorEditor_Menus) {
 
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index f3d49c0aeb..d5f54996e9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -10,6 +10,26 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
+
+import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
+
+import java.io.InputStream;
+
+import java.io.IOException;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.swt.widgets.Event;
+
+import org.eclipse.jface.window.DefaultToolTip;
+
+import org.eclipse.swt.widgets.Control;
+
+import org.eclipse.e4.tools.emf.ui.common.Util;
+
+import org.eclipse.swt.custom.StackLayout;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.emf.ecore.EObject;
 
@@ -84,16 +104,16 @@ public class PartEditor extends AbstractComponentEditor {
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IValueProperty PART__TOOLBAR = EMFProperties.value(BasicPackageImpl.Literals.PART__TOOLBAR);
 	private Button createRemoveToolBar;
-	
+	private StackLayout stackLayout;
 
 	public PartEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 		this.project = project;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
@@ -117,78 +137,122 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+		
+		if (createRemoveToolBar != null) {
+			createRemoveToolBar.setSelection(((MPart) object).getToolbar() != null);
 		}
+		
 		getMaster().setValue(object);
-		createRemoveToolBar.setSelection(((MPart)object).getToolbar() != null);
+
 		return composite;
 	}
 
-	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master) {
-		parent = new Composite(parent,SWT.NONE);
+	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
+		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( getEditor().isModelFragment() ) {
-			ControlFactory.createFindImport(parent, this, context);			
-			return parent;
-		}
-		
+		 if( isImport ) {
+			 ControlFactory.createFindImport(parent, this, context);
+			 return parent;
+		 }
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_Id);
-
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));			
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_LabelLabel);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));			
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_Tooltip);
-
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));			
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_IconURI);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			new ImageTooltip(t) {
+				
+				@Override
+				protected URI getImageURI() {
+					MUILabel part = (MUILabel) getMaster().getValue();
+					String uri = part.getIconURI();
+					if( uri == null || uri.trim().length() == 0 ) {
+						return null;
+					}
+					return URI.createURI(part.getIconURI());
+				}
+			};
+			
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setText(Messages.PartEditor_Find);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), project,getEditingDomain(),(MPart) getMaster().getValue());
+					PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPart) getMaster().getValue());
 					dialog.open();
 				}
 			});
@@ -198,115 +262,122 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_ClassURI);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
 
-			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setText(Messages.PartEditor_Find);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
 					dialog.open();
 				}
 			});
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_ToolBar);
-			
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
 			createRemoveToolBar = new Button(parent, SWT.CHECK);
 			createRemoveToolBar.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MPart window = (MPart) getMaster().getValue();
-					if( window.getToolbar() == null ) {
+					if (window.getToolbar() == null) {
 						addToolBar();
 					} else {
 						removeToolBar();
 					}
 				}
 			});
-			createRemoveToolBar.setLayoutData(new GridData(GridData.BEGINNING,GridData.CENTER,false,false,2,1));
+			createRemoveToolBar.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_ContainerData);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
 		}
-		
+
 		createSubformElements(parent, context, master);
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_Closeable);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
-			
+
 			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART__CLOSEABLE);
 			IWidgetValueProperty uiProp = WidgetProperties.selection();
-			
+
 			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
 		ControlFactory.createBindingsWidget(parent, this);
 
-//TODO Does the user need to edit this?
-//		// ------------------------------------------------------------
-//		{
-//			Label l = new Label(parent, SWT.NONE);
-//			l.setText("Variables");
-//			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
-//
-//			ListViewer viewer = new ListViewer(parent);
-//			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-//			gd.horizontalSpan=2;
-//			gd.heightHint = 80;
-//			viewer.getList().setLayoutData(gd);
-//		}
-
-//		// ------------------------------------------------------------
-//		{
-//			Label l = new Label(parent, SWT.NONE);
-//			l.setText("Properties");
-//			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
-//
-//			TableViewer tableviewer = new TableViewer(parent);
-//			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-//			gd.horizontalSpan=2;
-//			gd.heightHint = 80;
-//			tableviewer.getTable().setHeaderVisible(true);
-//			tableviewer.getControl().setLayoutData(gd);
-//
-//			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-//			column.getColumn().setText("Key");
-//			column.getColumn().setWidth(200);
-//
-//			column = new TableViewerColumn(tableviewer, SWT.NONE);
-//			column.getColumn().setText("Value");
-//			column.getColumn().setWidth(200);
-//		}
+		// TODO Does the user need to edit this?
+		// // ------------------------------------------------------------
+		// {
+		// Label l = new Label(parent, SWT.NONE);
+		// l.setText("Variables");
+		// l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING,
+		// false, false));
+		//
+		// ListViewer viewer = new ListViewer(parent);
+		// GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		// gd.horizontalSpan=2;
+		// gd.heightHint = 80;
+		// viewer.getList().setLayoutData(gd);
+		// }
+
+		// // ------------------------------------------------------------
+		// {
+		// Label l = new Label(parent, SWT.NONE);
+		// l.setText("Properties");
+		// l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING,
+		// false, false));
+		//
+		// TableViewer tableviewer = new TableViewer(parent);
+		// GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		// gd.horizontalSpan=2;
+		// gd.heightHint = 80;
+		// tableviewer.getTable().setHeaderVisible(true);
+		// tableviewer.getControl().setLayoutData(gd);
+		//
+		// TableViewerColumn column = new TableViewerColumn(tableviewer,
+		// SWT.NONE);
+		// column.getColumn().setText("Key");
+		// column.getColumn().setWidth(200);
+		//
+		// column = new TableViewerColumn(tableviewer, SWT.NONE);
+		// column.getColumn().setText("Value");
+		// column.getColumn().setWidth(200);
+		// }
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_PersitedState);
-			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			TableViewer tableviewer = new TableViewer(parent);
 			tableviewer.getTable().setHeaderVisible(true);
@@ -315,7 +386,7 @@ public void widgetSelected(SelectionEvent e) {
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 80;
 			tableviewer.getControl().setLayoutData(gd);
-			
+
 			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
 			column.getColumn().setText(Messages.PartEditor_PersitedStateKey);
 			column.getColumn().setWidth(200);
@@ -326,9 +397,9 @@ public String getText(Object element) {
 					Entry<String, String> entry = (Entry<String, String>) element;
 					return entry.getKey();
 				}
-			}); 
+			});
 
-			//FIXME How can we react upon changes in the Map-Value?
+			// FIXME How can we react upon changes in the Map-Value?
 			column = new TableViewerColumn(tableviewer, SWT.NONE);
 			column.getColumn().setText(Messages.PartEditor_PersitedStateValue);
 			column.getColumn().setWidth(200);
@@ -340,17 +411,17 @@ public String getText(Object element) {
 					return entry.getValue();
 				}
 			});
-			
+
 			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE);
 			tableviewer.setInput(prop.observeDetail(getMaster()));
-			
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
 			GridLayout gl = new GridLayout();
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
@@ -369,30 +440,35 @@ public String getText(Object element) {
 
 		return parent;
 	}
-	
+
 	private void addToolBar() {
 		MToolBar menu = MMenuFactory.INSTANCE.createToolBar();
 		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART__TOOLBAR, menu);
-		if( cmd.canExecute() ) {
+		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
 	}
-	
+
 	private void removeToolBar() {
 		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART__TOOLBAR, null);
-		if( cmd.canExecute() ) {
+		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
 	}
-	
+
 	protected void createSubformElements(Composite parent, EMFDataBindingContext context, IObservableValue master) {
-		
+
 	}
 
 	@Override
 	public IObservableList getChildList(Object element) {
 		final WritableList list = new WritableList();
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART_MENU, PART__MENUS, element, Messages.PartEditor_Menus) {
+		
+		if( getEditor().isModelFragment() && Util.isImport((EObject) element) ) {
+			return list;
+		}
+		
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PART_MENU, PART__MENUS, element, Messages.PartEditor_Menus) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -401,7 +477,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.PartEditor_Handlers) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.PartEditor_Handlers) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -409,22 +485,22 @@ protected boolean accepted(Object o) {
 			}
 
 		});
-		
+
 		MPart window = (MPart) element;
-		if( window.getToolbar() != null ) {
-			list.add(0,window.getToolbar());
+		if (window.getToolbar() != null) {
+			list.add(0, window.getToolbar());
 		}
-		
+
 		PART__TOOLBAR.observe(element).addValueChangeListener(new IValueChangeListener() {
-			
+
 			public void handleValueChange(ValueChangeEvent event) {
-				if( event.diff.getOldValue() != null ) {
+				if (event.diff.getOldValue() != null) {
 					list.remove(event.diff.getOldValue());
 					createRemoveToolBar.setSelection(false);
 				}
-				
-				if( event.diff.getNewValue() != null ) {
-					list.add(0,event.diff.getNewValue());
+
+				if (event.diff.getNewValue() != null) {
+					list.add(0, event.diff.getNewValue());
 					createRemoveToolBar.setSelection(true);
 				}
 			}
@@ -441,8 +517,6 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] {
-			FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL)	
-		};
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL) };
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index f1384ba72c..a5b691fbed 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -10,6 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
@@ -80,6 +84,7 @@ public class PartSashContainerEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private StackLayout stackLayout;
 
 	public PartSashContainerEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain,editor);
@@ -126,22 +131,45 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
 		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context,
-			WritableValue master) {
+			WritableValue master, boolean isImport) {
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
@@ -150,6 +178,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartSashContainerEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -162,7 +191,8 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartSashContainerEditor_Orientation);
-
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			
 			ComboViewer viewer = new ComboViewer(parent);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
@@ -185,6 +215,7 @@ public String getText(Object element) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartSashContainerEditor_ContainerData);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -198,7 +229,7 @@ public String getText(Object element) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartSashContainerEditor_Controls);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
 			
 			final TableViewer viewer = new TableViewer(parent);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -342,7 +373,6 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 43567b2b24..7d66d1efea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -10,6 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
@@ -77,6 +81,7 @@ public class PartStackEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private StackLayout stackLayout;
 
 	public PartStackEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain,editor);
@@ -108,22 +113,45 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
 		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context,
-			WritableValue master) {
+			WritableValue master, boolean isImport) {
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
@@ -132,6 +160,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartStackEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -146,6 +175,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartStackEditor_ContainerData);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -158,6 +188,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartStackEditor_Parts);
+			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
 			
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 3a2798ef8b..19385e282d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -10,6 +10,14 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 
 import java.net.MalformedURLException;
@@ -80,6 +88,7 @@ public class PerspectiveEditor extends AbstractComponentEditor {
 	private IProject project;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private StackLayout stackLayout;
 
 	public PerspectiveEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
 		super(editingDomain,editor);
@@ -131,19 +140,42 @@ public String getDescription(Object element) {
 	public Composite getEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent, context, getMaster());
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
 		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
@@ -152,6 +184,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PerspectiveEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -166,6 +199,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PerspectiveEditor_LabelLabel);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -178,6 +212,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PerspectiveEditor_Tooltip);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -190,11 +225,25 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PerspectiveEditor_IconURI);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
+			new ImageTooltip(t) {
+				
+				@Override
+				protected URI getImageURI() {
+					MUILabel part = (MUILabel) getMaster().getValue();
+					String uri = part.getIconURI();
+					if( uri == null || uri.trim().length() == 0 ) {
+						return null;
+					}
+					return URI.createURI(part.getIconURI());
+				}
+			};
+			
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.PerspectiveEditor_Find);
 			b.addSelectionListener(new SelectionAdapter() {
@@ -209,7 +258,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PerspectiveEditor_Controls);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
 			
 			final TableViewer viewer = new TableViewer(parent);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index a133dd158a..fc674650e3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -10,6 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.emf.ecore.EObject;
 
@@ -71,6 +75,7 @@ public class PerspectiveStackEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private StackLayout stackLayout;
 
 	public PerspectiveStackEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain,editor);
@@ -107,22 +112,45 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
 		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context,
-			WritableValue master) {
+			WritableValue master, boolean isImport) {
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
@@ -131,6 +159,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PerspectiveStackEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -145,6 +174,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PerspectiveStackEditor_Perspectives);
+			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
 			
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index d721775c86..57ee751b5b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.common.Util;
 
 import org.eclipse.e4.ui.workbench.UIEvents.UIElement;
@@ -69,6 +72,7 @@ public class PlaceholderEditor extends AbstractComponentEditor {
 	private Image image;
 	private EMFDataBindingContext context;
 	private IModelResource resource;
+	private StackLayout stackLayout;
 	
 	public PlaceholderEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource) {
 		super(editingDomain,editor);
@@ -133,19 +137,42 @@ public String getDescription(Object element) {
 	public Composite getEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent, context, getMaster());
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
 		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
@@ -154,6 +181,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PlaceholderEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -166,6 +194,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Reference");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setEditable(false);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 363b921867..0bc7185bda 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -142,6 +142,7 @@ private Composite createForm(Composite parent) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.StringModelFragment_ParentId);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -153,6 +154,7 @@ private Composite createForm(Composite parent) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.StringModelFragment_Featurename);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Composite comp = new Composite(parent, SWT.NONE);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -184,6 +186,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.StringModelFragment_PositionInList);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -196,7 +199,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.StringModelFragment_Elements);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
 
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index c8ab8ba3b2..4887cdf1f0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -10,6 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.emf.ecore.EObject;
 
@@ -85,6 +89,7 @@ public class ToolBarContributionEditor extends AbstractComponentEditor {
 	private IProject project;
 	
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private StackLayout stackLayout;
 	
 	private static class Struct {
 		private final String label;
@@ -134,21 +139,44 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
 		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context2, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
@@ -157,6 +185,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -169,6 +198,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_ParentId);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -181,6 +211,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_Position);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -194,7 +225,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolBarEditor_ToolbarItems);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
 
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 99c10786cc..41e114f6af 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -10,6 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.emf.ecore.EObject;
 
@@ -71,6 +75,7 @@ public class ToolBarEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private StackLayout stackLayout;
 
 	private static class Struct {
 		private final String label;
@@ -114,21 +119,44 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
 		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
@@ -137,6 +165,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolBarEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -149,7 +178,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolBarEditor_ToolbarItems);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
 
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 84d9570547..47a639ef7a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -10,6 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -43,6 +47,7 @@ public class ToolBarSeparatorEditor extends AbstractComponentEditor {
 	private Image separatorImage;
 	private Composite composite;
 	private EMFDataBindingContext context;
+	private StackLayout stackLayout;
 	
 	public ToolBarSeparatorEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain,editor);
@@ -81,19 +86,42 @@ public String getDescription(Object element) {
 	public Composite getEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent, context, getMaster());
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
 		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 	
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
@@ -102,6 +130,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolBarSeparatorEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -115,7 +144,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 7f9674c263..dcc8a364d0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -10,6 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.emf.ecore.EObject;
 
@@ -53,6 +57,7 @@ public class ToolControlEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private Composite composite;
 	private IProject project;
+	private StackLayout stackLayout;
 
 	public ToolControlEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain,editor);
@@ -93,18 +98,42 @@ public String getDetailLabel(Object element) {
 	public Composite getEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent, context, getMaster());
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
 		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context2, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-		if( getEditor().isModelFragment() ) {
+		
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
@@ -113,6 +142,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolControlEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -125,6 +155,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolControlEditor_ClassURI);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -146,7 +177,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Persited State");
-			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			TableViewer tableviewer = new TableViewer(parent);
 			tableviewer.getTable().setHeaderVisible(true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 0abd550d1e..8376509aad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -10,6 +10,14 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.conversion.Converter;
 
@@ -53,6 +61,7 @@ public abstract class ToolItemEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	protected IProject project;
+	private StackLayout stackLayout;
 
 	public ToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain, editor);
@@ -63,25 +72,49 @@ public ToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject
 	public Composite getEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent, context, getMaster());
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
 		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
 		
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("Id");
+		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		Text t = new Text(parent, SWT.BORDER);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -103,6 +136,7 @@ private void createFormSubTypeForm(Composite parent, EMFDataBindingContext conte
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Type");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			ComboViewer viewer = new ComboViewer(parent);
 			viewer.setContentProvider(new ArrayContentProvider());
@@ -118,6 +152,7 @@ private void createFormSubTypeForm(Composite parent, EMFDataBindingContext conte
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Label");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -130,6 +165,7 @@ private void createFormSubTypeForm(Composite parent, EMFDataBindingContext conte
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Tooltip");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -142,11 +178,25 @@ private void createFormSubTypeForm(Composite parent, EMFDataBindingContext conte
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Icon URI");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
+			new ImageTooltip(t) {
+				
+				@Override
+				protected URI getImageURI() {
+					MUILabel part = (MUILabel) getMaster().getValue();
+					String uri = part.getIconURI();
+					if( uri == null || uri.trim().length() == 0 ) {
+						return null;
+					}
+					return URI.createURI(part.getIconURI());
+				}
+			};
+			
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText("Find ...");
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
@@ -163,6 +213,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Enabled");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 			
 			Button b = new Button(parent, SWT.CHECK);
 			b.setLayoutData(new GridData(GridData.BEGINNING,GridData.CENTER,false,false,2,1));
@@ -172,6 +223,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Selected");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 			
 			Button b = new Button(parent, SWT.CHECK);
 			b.setLayoutData(new GridData(GridData.BEGINNING,GridData.CENTER,false,false,2,1));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 8b9c1af94d..21a5ad7375 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -10,6 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -78,6 +82,7 @@ public class TrimBarEditor extends AbstractComponentEditor {
 	private ModelEditor editor;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private StackLayout stackLayout;
 
 	public TrimBarEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain,editor);
@@ -110,22 +115,45 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
 		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
+			WritableValue master, boolean isImport) {
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
@@ -134,7 +162,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Id");
-
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan=2;
@@ -146,6 +175,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Side");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			ComboViewer viewer = new ComboViewer(parent);
 			viewer.setContentProvider(new ArrayContentProvider());
@@ -161,7 +191,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Controls");
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
 			
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setLabelProvider(new ComponentLabelProvider(editor));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 3f1cf15d35..55bbf9d60b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -10,6 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 
 import org.eclipse.emf.ecore.EObject;
@@ -89,6 +93,7 @@ public class TrimContributionEditor extends AbstractComponentEditor {
 	private IProject project;
 	
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private StackLayout stackLayout;
 	
 	private static class Struct {
 		private final String label;
@@ -138,20 +143,44 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
 		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+		
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context2, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-		if( getEditor().isModelFragment() ) {
+
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
@@ -160,6 +189,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -172,6 +202,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_ParentId);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -184,6 +215,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_Position);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -197,7 +229,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context2, W
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Controls");
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
 			
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
index 9e81ea8c1e..b00e589e71 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
@@ -1,5 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.emf.ecore.EObject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
@@ -19,6 +32,10 @@ public TrimmedWindowEditor(EditingDomain editingDomain, ModelEditor editor, IPro
 	public IObservableList getChildList(Object element) {
 		IObservableList list = super.getChildList(element);
 		
+		if( getEditor().isModelFragment() && Util.isImport((EObject) element) ) {
+			return list;
+		}
+		
 		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_TRIMMED_WINDOW_TRIMS, TRIMMED_WINDOW__TRIM_BARS, element, "TrimBars") {
 
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 795032b3df..44363b33a2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -10,6 +10,14 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Control;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.emf.ecore.EObject;
 
@@ -76,7 +84,8 @@ public class WindowEditor extends AbstractComponentEditor {
 	private IValueProperty WINDOW__MAIN_MENU = EMFProperties.value(BasicPackageImpl.Literals.WINDOW__MAIN_MENU);
 	
 	private Action addMainMenu;
-	private Button createRemoveMainMenu; 
+	private Button createRemoveMainMenu;
+	private StackLayout stackLayout; 
 	
 	public WindowEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain,editor);
@@ -115,23 +124,50 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+		
+		if( getEditor().isModelFragment() ) {
+			Control topControl;
+			if( Util.isImport((EObject) object) ) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];				
+			}
+			
+			if( stackLayout.topControl != topControl ) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+
+		if( createRemoveMainMenu != null ) {
+			createRemoveMainMenu.setSelection(((MWindow)object).getMainMenu() != null);	
 		}
+		
 		getMaster().setValue(object);
-		createRemoveMainMenu.setSelection(((MWindow)object).getMainMenu() != null);
+		
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
+			WritableValue master, boolean isImport) {
 		parent = new Composite(parent,SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 		
-		if( getEditor().isModelFragment() ) {
+		if( isImport ) {
 			ControlFactory.createFindImport(parent, this, context);			
 			return parent;
 		}
@@ -140,6 +176,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Id");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -152,6 +189,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("X");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -164,6 +202,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Y");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -176,6 +215,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Width");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -188,6 +228,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Height");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -200,6 +241,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Label");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -212,6 +254,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Tooltip");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -224,11 +267,25 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Icon URI");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
+			new ImageTooltip(t) {
+				
+				@Override
+				protected URI getImageURI() {
+					MUILabel part = (MUILabel) getMaster().getValue();
+					String uri = part.getIconURI();
+					if( uri == null || uri.trim().length() == 0 ) {
+						return null;
+					}
+					return URI.createURI(part.getIconURI());
+				}
+			};
+			
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText("Find ...");
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
@@ -245,6 +302,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Main Menu");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 			
 			createRemoveMainMenu = new Button(parent, SWT.CHECK);
 			createRemoveMainMenu.addSelectionListener(new SelectionAdapter() {
@@ -287,6 +345,10 @@ void addMenu() {
 	@Override
 	public IObservableList getChildList(final Object element) {
 		final WritableList list = new WritableList();
+		if( getEditor().isModelFragment() && Util.isImport((EObject) element) ) {
+			return list;
+		}
+		
 		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, "Handlers") {
 
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index 5ad34a9763..9a508b9271 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -1,5 +1,29 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
+import org.eclipse.jface.viewers.TableViewer;
+
+import org.eclipse.e4.ui.model.application.MApplication;
+
+import org.eclipse.swt.widgets.Button;
+
+import org.eclipse.swt.widgets.Text;
+
+import org.eclipse.swt.layout.GridLayout;
+
+import org.eclipse.swt.widgets.Label;
+
+import org.eclipse.swt.layout.GridData;
+
+import org.eclipse.swt.SWT;
+
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+
+import org.eclipse.swt.graphics.Image;
+
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
@@ -12,15 +36,59 @@
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 
 public class FindImportElementDialog extends TitleAreaDialog {
+	private MApplication runningApp;
 	
-	public FindImportElementDialog(Shell parentShell, EditingDomain domain, EObject element) {
+	public FindImportElementDialog(Shell parentShell, EditingDomain domain, EObject element/*, MApplication runningApp*/) {
 		super(parentShell);
+		this.runningApp = runningApp;
 	}
 	
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite comp = (Composite) super.createDialogArea(parent);
 		
+		final Image titleImage = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/import_wiz.png"));
+		setTitleImage(titleImage);
+		getShell().addDisposeListener(new DisposeListener() {
+			
+			public void widgetDisposed(DisposeEvent e) {
+				titleImage.dispose();
+			}
+		});
+		
+		getShell().setText("Find Import Elements");
+		setTitle("Find Import Elements");
+		setMessage("Search for an elements whose ID you'd like to import");
+		
+		Composite container = new Composite(comp,SWT.NONE);
+		container.setLayoutData(new GridData(GridData.FILL_BOTH));
+		container.setLayout(new GridLayout(3, false));
+		
+		
+		Label l = new Label(container, SWT.NONE);
+		l.setText("Search");
+		
+		final Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		searchText.setLayoutData(gd);
+		
+		new Label(container, SWT.NONE);
+
+		l = new Label(container, SWT.NONE);
+		l.setText("File");
+		
+		Text t = new Text(container, SWT.BORDER);
+		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		t.setText("memory://running-model");
+		
+		Button b = new Button(container, SWT.PUSH);
+		b.setText("Browse");
+		
+		l = new Label(container, SWT.PUSH);
+		
+		TableViewer viewer = new TableViewer(container);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+		
 		return comp;
 	}
 }
\ No newline at end of file

From 2f659cf957a5585bf35da2f2440383c56521f618 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 26 Jun 2010 14:41:06 +0000
Subject: [PATCH 0156/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * more accurate stack layout

---
 .../e4/tools/emf/ui/common/EStackLayout.java  | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/EStackLayout.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/EStackLayout.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/EStackLayout.java
new file mode 100644
index 0000000000..2b3b836c24
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/EStackLayout.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.common;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Composite;
+
+import org.eclipse.swt.custom.StackLayout;
+
+public class EStackLayout extends StackLayout {
+	private boolean onlyVisible;
+	
+	public EStackLayout() {
+		this(true);
+	}
+	
+	public EStackLayout(boolean onlyVisible) {
+		this.onlyVisible = onlyVisible;
+	}
+	
+	@Override
+	protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) {
+		if( topControl != null && onlyVisible ) {
+			int maxWidth = 0;
+			int maxHeight = 0;
+			Point size = topControl.computeSize(wHint, hHint, flushCache);
+			maxWidth = Math.max(size.x, maxWidth);
+			maxHeight = Math.max(size.y, maxHeight);
+			int width = maxWidth + 2 * marginWidth;
+			int height = maxHeight + 2 * marginHeight;
+			if (wHint != SWT.DEFAULT) width = wHint;
+			if (hHint != SWT.DEFAULT) height = hHint;
+			return new Point(width, height);
+		}
+		return super.computeSize(composite, wHint, hHint, flushCache);
+	}
+}

From 2ab58a4fa6831aff5ea53810158bc7e8504aa469 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 26 Jun 2010 15:17:28 +0000
Subject: [PATCH 0157/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed minor layout tweaks

---
 .../.settings/org.eclipse.jdt.ui.prefs        |  55 ++++-
 .../e4/tools/emf/ui/internal/Messages.java    |  67 +++---
 .../tools/emf/ui/internal/Messages.properties |   2 +
 .../emf/ui/internal/common/ModelEditor.java   |  12 +-
 .../common/component/AddonsEditor.java        |  24 +-
 .../common/component/ApplicationEditor.java   |   3 +-
 .../common/component/BindingTableEditor.java  | 105 ++++----
 .../common/component/CommandEditor.java       |  21 +-
 .../common/component/ControlFactory.java      |  63 ++---
 .../component/DirectMenuItemEditor.java       |  17 +-
 .../common/component/HandlerEditor.java       |  21 +-
 .../common/component/KeyBindingEditor.java    |  45 ++--
 .../component/MenuContributionEditor.java     |  93 +++----
 .../internal/common/component/MenuEditor.java |  83 +++----
 .../common/component/MenuItemEditor.java      | 104 ++++----
 .../common/component/MenuSeparatorEditor.java |  51 ++--
 .../component/PartDescriptorEditor.java       | 226 ++++++++----------
 .../internal/common/component/PartEditor.java |  98 +++-----
 18 files changed, 510 insertions(+), 580 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
index 5b21ea9bc2..2e80c9eb7a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -1,8 +1,61 @@
-#Fri Jun 04 16:11:07 EDT 2010
+#Sat Jun 26 16:51:30 CEST 2010
 eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_custom
 formatter_settings_version=11
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=;
 org.eclipse.jdt.ui.ondemandthreshold=99
 org.eclipse.jdt.ui.staticondemandthreshold=99
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 616c1b1309..1460779f1c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -14,7 +14,7 @@
 
 public class Messages {
 	public static String AbstractCommandSelectionDialog_Label_CommandId;
-	
+
 	public static String ApplicationEditor_Label;
 	public static String ApplicationEditor_Description;
 	public static String ApplicationEditor_Id;
@@ -39,8 +39,8 @@ public class Messages {
 	public static String BindingTableEditor_Up;
 	public static String BindingTableEditor_Down;
 	public static String BindingTableEditor_Add;
-	public static String BindingTableEditor_Remove; 
-	
+	public static String BindingTableEditor_Remove;
+
 	public static String CommandEditor_Label;
 	public static String CommandEditor_Description;
 	public static String CommandEditor_Id;
@@ -57,12 +57,12 @@ public class Messages {
 	public static String CommandEditor_Add;
 	public static String CommandEditor_Remove;
 	public static String CommandEditor_ParameterId;
-	
+
 	public static String DirectMenuItemEditor_Label;
 	public static String DirectMenuItemEditor_Description;
 	public static String DirectMenuItemEditor_ClassURI;
 	public static String DirectMenuItemEditor_Find;
-	
+
 	public static String ControlFactory_BindingContexts;
 	public static String ControlFactory_Add;
 	public static String ControlFactory_Up;
@@ -72,12 +72,13 @@ public class Messages {
 	public static String ControlFactory_Key;
 	public static String ControlFactory_Value;
 	public static String ControlFactory_ContextVariables;
-	
+	public static String ControlFactory_AddNoEllipse;
+
 	public static String DirectToolItemEditor_ClassURI;
 	public static String DirectToolItemEditor_Find;
 	public static String DirectToolItemEditor_Label;
 	public static String DirectToolItemEditor_Description;
-	
+
 	public static String HandledMenuItemEditor_Label;
 	public static String HandledMenuItemEditor_Description;
 	public static String HandledMenuItemEditor_Command;
@@ -89,7 +90,7 @@ public class Messages {
 	public static String HandledMenuItemEditor_Down;
 	public static String HandledMenuItemEditor_Add;
 	public static String HandledMenuItemEditor_Remove;
-	
+
 	public static String HandledToolItemEditor_Command;
 	public static String HandledToolItemEditor_Find;
 	public static String HandledToolItemEditor_Parameters;
@@ -101,17 +102,17 @@ public class Messages {
 	public static String HandledToolItemEditor_Remove;
 	public static String HandledToolItemEditor_Label;
 	public static String HandledToolItemEditor_Description;
-	
+
 	public static String HandlerEditor_Label;
 	public static String HandlerEditor_Description;
 	public static String HandlerEditor_Id;
 	public static String HandlerEditor_Command;
 	public static String HandlerEditor_Find;
 	public static String HandlerEditor_ClassURI;
-	
+
 	public static String InputPartEditor_Label;
 	public static String InputPartEditor_InputURI;
-	
+
 	public static String KeyBindingEditor_Label;
 	public static String KeyBindingEditor_Description;
 	public static String KeyBindingEditor_Id;
@@ -125,7 +126,7 @@ public class Messages {
 	public static String KeyBindingEditor_Down;
 	public static String KeyBindingEditor_Add;
 	public static String KeyBindingEditor_Remove;
-	
+
 	public static String MenuEditor_Label;
 	public static String MenuEditor_Description;
 	public static String MenuEditor_Id;
@@ -142,8 +143,7 @@ public class Messages {
 	public static String MenuEditor_LabelLabel;
 	public static String MenuEditor_Tooltip;
 	public static String MenuEditor_IconURI;
-	
-	
+
 	public static String MenuItemEditor_Id;
 	public static String MenuItemEditor_Type;
 	public static String MenuItemEditor_Label;
@@ -151,10 +151,10 @@ public class Messages {
 	public static String MenuItemEditor_IconURI;
 	public static String MenuItemEditor_Find;
 	public static String MenuEditor_MainMenu;
-	
+
 	public static String MenuSeparatorEditor_Label;
 	public static String MenuSeparatorEditor_Id;
-	
+
 	public static String ModelComponentEditor_Id;
 	public static String ModelComponentEditor_ParentId;
 	public static String ModelComponentEditor_Find;
@@ -172,7 +172,7 @@ public class Messages {
 	public static String ModelComponentEditor_PartDescriptors;
 	public static String ModelComponentEditor_DetailParentId;
 	public static String ModelComponentEditor_MenuContributions;
-	
+
 	public static String ModelComponentsEditor_Label;
 	public static String ModelComponentsEditor_Description;
 	public static String ModelComponentsEditor_ModelContributions;
@@ -180,7 +180,7 @@ public class Messages {
 	public static String ModelComponentsEditor_Down;
 	public static String ModelComponentsEditor_Add;
 	public static String ModelComponentsEditor_Remove;
-	
+
 	public static String PartDescriptorEditor_Label;
 	public static String PartDescriptorEditor_Descriptor;
 	public static String PartDescriptorEditor_Id;
@@ -205,7 +205,7 @@ public class Messages {
 	public static String PartDescriptorEditor_Menus;
 	public static String PartDescriptorEditor_Handlers;
 	public static String PartDescriptorEditor_ContainerData;
-	
+
 	public static String PartEditor_Label;
 	public static String PartEditor_Description;
 	public static String PartEditor_Id;
@@ -224,7 +224,7 @@ public class Messages {
 	public static String PartEditor_Handlers;
 	public static String PartEditor_ContainerData;
 	public static String PartEditor_ToolBar;
-	
+
 	public static String PartSashContainerEditor_Label;
 	public static String PartSashContainerEditor_Description;
 	public static String PartSashContainerEditor_Id;
@@ -237,7 +237,7 @@ public class Messages {
 	public static String PartSashContainerEditor_Down;
 	public static String PartSashContainerEditor_Remove;
 	public static String PartSashContainerEditor_ContainerData;
-	
+
 	public static String PartStackEditor_Label;
 	public static String PartStackEditor_Description;
 	public static String PartStackEditor_Id;
@@ -247,11 +247,12 @@ public class Messages {
 	public static String PartStackEditor_Down;
 	public static String PartStackEditor_Remove;
 	public static String PartStackEditor_ContainerData;
-	
+	public static String PerspectiveStackEditor_Add;
+
 	public static String PerspectiveEditor_Label;
 	public static String PerspectiveEditor_Description;
 	public static String PerspectiveEditor_Id;
-	public static String PerspectiveEditor_LabelLabel;	
+	public static String PerspectiveEditor_LabelLabel;
 	public static String PerspectiveEditor_SelectedElement;
 	public static String PerspectiveEditor_Tooltip;
 	public static String PerspectiveEditor_IconURI;
@@ -260,18 +261,18 @@ public class Messages {
 	public static String PerspectiveEditor_Up;
 	public static String PerspectiveEditor_Down;
 	public static String PerspectiveEditor_Remove;
-	
+
 	public static String PerspectiveStackEditor_Perspectives;
 	public static String PerspectiveStackEditor_Label;
 	public static String PerspectiveStackEditor_Description;
 	public static String PerspectiveStackEditor_Id;
 	public static String PerspectiveStackEditor_SelectedElement;
-	
+
 	public static String PlaceholderEditor_Label;
 	public static String PlaceholderEditor_Descriptor;
 	public static String PlaceholderEditor_Id;
 	public static String PlaceholderEditor_FindReference;
-	
+
 	public static String ToolBarEditor_Label;
 	public static String ToolBarEditor_Description;
 	public static String ToolBarEditor_Id;
@@ -285,15 +286,15 @@ public class Messages {
 	public static String ToolBarEditor_ToolControl;
 	public static String ToolBarEditor_Separator;
 	public static String ToolBarEditor_Remove;
-	
+
 	public static String ToolBarSeparatorEditor_Label;
 	public static String ToolBarSeparatorEditor_Id;
-	
+
 	public static String ToolControlEditor_Label;
 	public static String ToolControlEditor_Description;
 	public static String ToolControlEditor_Id;
 	public static String ToolControlEditor_ClassURI;
-	
+
 	public static String VBindingTableEditor_Label;
 	public static String VBindingTableEditor_Description;
 	public static String VBindingTableEditor_Contexts;
@@ -304,11 +305,11 @@ public class Messages {
 	public static String VBindingTableEditor_Down;
 	public static String VBindingTableEditor_Add;
 	public static String VBindingTableEditor_Remove;
-	
+
 	public static String AddonsEditor_Id;
 	public static String AddonsEditor_ClassURI;
 	public static String AddonsEditor_Find;
-	
+
 	public static String ContributionClassDialog_DialogMessage;
 	public static String ContributionClassDialog_DialogTitle;
 	public static String ContributionClassDialog_Label_Classname;
@@ -352,10 +353,6 @@ public class Messages {
 	public static String FeatureSelectionDialog_DialogTitle;
 	public static String FeatureSelectionDialog_DialogMessage;
 
-
-
-	
-	
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 8be1d380f3..e3408ff1eb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -67,6 +67,7 @@ ControlFactory_Tags=Tags
 ControlFactory_Key=Key
 ControlFactory_Value=Value
 ControlFactory_ContextVariables=Context Variables
+ControlFactory_AddNoEllipse=Add
 
 DirectToolItemEditor_ClassURI=Class URI
 DirectToolItemEditor_Find=Find ...
@@ -262,6 +263,7 @@ PerspectiveStackEditor_Description=Perspective Stack Bla Bla Bla
 PerspectiveStackEditor_Id=Id
 PerspectiveStackEditor_SelectedElement=Selected Element
 PerspectiveStackEditor_Perspectives=Perspectives
+PerspectiveStackEditor_Add=Add ...
 
 PlaceholderEditor_Label=Placeholder
 PlaceholderEditor_Descriptor=Placeholder Bla Bla Bla Bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 0874d5b5b5..23b38b7d2d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+
 import org.eclipse.swt.widgets.TreeItem;
 
 import javax.annotation.PostConstruct;
@@ -227,7 +229,7 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 		scrolling.setBackgroundMode(SWT.INHERIT_DEFAULT);
 		scrolling.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
 
-		final StackLayout layout = new StackLayout();
+		final EStackLayout layout = new EStackLayout();
 		final Composite contentContainer = new Composite(scrolling, SWT.NONE);
 		contentContainer.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
 		scrolling.setExpandHorizontal(true);
@@ -236,10 +238,8 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 
 		scrolling.addControlListener(new ControlAdapter() {
 			public void controlResized(ControlEvent e) {
-				if( layout.topControl != null ) {
-					Rectangle r = scrolling.getClientArea();
-					scrolling.setMinSize(layout.topControl.computeSize(r.width, SWT.DEFAULT));	
-				}
+				Rectangle r = scrolling.getClientArea();
+				scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT));	
 			}
 		});
 
@@ -276,7 +276,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 					}
 
 					Rectangle r = scrolling.getClientArea();
-					scrolling.setMinSize(layout.topControl.computeSize(r.width, SWT.DEFAULT));
+					scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT));
 					scrolling.setOrigin(0, 0);
 					scrolling.layout(true,true);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index f6f381cf77..9b75c4e5a5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -10,31 +10,22 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.common.Util;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -46,6 +37,7 @@
 import org.eclipse.swt.layout.GridLayout;
 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.Text;
@@ -55,7 +47,7 @@ public class AddonsEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private IProject project;
 	private Image image;
-	private StackLayout stackLayout;
+	private EStackLayout stackLayout;
 	
 	public AddonsEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain,editor);
@@ -101,7 +93,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index abdf91432c..810c571577 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -25,6 +23,7 @@
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index bc93505433..53f4c33078 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -10,20 +10,14 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-import org.eclipse.emf.ecore.EObject;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
@@ -41,6 +35,7 @@
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -60,6 +55,7 @@
 import org.eclipse.swt.layout.GridLayout;
 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.Text;
@@ -69,13 +65,12 @@ public class BindingTableEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
-	
-	private IListProperty BINDING_TABLE__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
-	private StackLayout stackLayout;
 
+	private IListProperty BINDING_TABLE__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
+	private EStackLayout stackLayout;
 
 	public BindingTableEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
@@ -108,7 +103,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -116,21 +111,21 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
@@ -138,14 +133,14 @@ public Composite getEditor(Composite parent, Object object) {
 	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
-		
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.BindingTableEditor_Id);
@@ -155,9 +150,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.BindingTableEditor_ContextId);
@@ -165,17 +160,18 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID).observeDetail(getMaster()));
 
-			Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText(Messages.BindingTableEditor_Find);			
+			b.setText(Messages.BindingTableEditor_Find);
 		}
-		
+
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.BindingTableEditor_Keybindings);
-			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
@@ -212,7 +208,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 				column.getColumn().setWidth(170);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
-			
+
 			IEMFListProperty prop = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
@@ -232,21 +228,21 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MBindingTable container = (MBindingTable) getMaster().getValue();
 							int idx = container.getBindings().indexOf(obj) - 1;
-							if( idx >= 0 ) {
+							if (idx >= 0) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -259,21 +255,21 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MBindingTable container = (MBindingTable) getMaster().getValue();
 							int idx = container.getBindings().indexOf(obj) + 1;
-							if( idx < container.getBindings().size() ) {
+							if (idx < container.getBindings().size()) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -304,18 +300,17 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> keybinding = ((IStructuredSelection)viewer.getSelection()).toList();
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, keybinding);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
 				}
 			});
 		}
-		
-		
+
 		return parent;
 	}
 
@@ -333,11 +328,9 @@ public String getDetailLabel(Object element) {
 
 		return null;
 	}
-	
+
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] {
-			FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID)	
-		};
+		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID) };
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 5dabe39385..9c5284bfbc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -10,23 +10,16 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.MCommandParameter;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
@@ -38,6 +31,7 @@
 import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -64,6 +58,7 @@
 import org.eclipse.swt.layout.GridLayout;
 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.Text;
@@ -73,7 +68,7 @@ public class CommandEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
-	private StackLayout stackLayout;
+	private EStackLayout stackLayout;
 
 	public CommandEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain,editor);
@@ -109,7 +104,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 782a1f73e4..adb04cabea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -10,64 +10,45 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
-
-import org.eclipse.emf.edit.domain.EditingDomain;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-
+import java.util.Arrays;
+import java.util.List;
+import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-
-import org.eclipse.e4.tools.emf.ui.common.Util;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.e4.ui.model.application.ui.MUILabel;
-
-import org.eclipse.e4.ui.workbench.UIEvents.UILabel;
-
 import org.eclipse.core.databinding.observable.map.IObservableMap;
-
-import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
-
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-
-import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
-import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
-import org.eclipse.jface.databinding.viewers.ViewerProperties;
-import org.eclipse.jface.databinding.viewers.ViewerSupport;
-import org.eclipse.jface.viewers.ComboViewer;
-
-import org.eclipse.e4.ui.model.application.commands.MBindings;
-
-import org.eclipse.e4.ui.model.application.ui.MContext;
-
-import java.util.Arrays;
-import java.util.List;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.commands.MBindings;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MContext;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
+import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -178,7 +159,7 @@ public void handleValueChange(ValueChangeEvent event) {
 	public static void createStringListWidget(Composite parent, final AbstractComponentEditor editor, String label, final EStructuralFeature feature) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
-		l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
+		l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 		final Text t = new Text(parent, SWT.BORDER);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -192,7 +173,7 @@ public void keyPressed(KeyEvent e) {
 		});
 
 		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_Add);
+		b.setText(Messages.ControlFactory_AddNoEllipse);
 		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 		b.addSelectionListener(new SelectionAdapter() {
@@ -316,7 +297,7 @@ public void keyPressed(KeyEvent e) {
 		});
 
 		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_Add);
+		b.setText(Messages.ControlFactory_AddNoEllipse);
 		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 		b.addSelectionListener(new SelectionAdapter() {
@@ -440,7 +421,7 @@ public void keyPressed(KeyEvent e) {
 		});
 
 		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_Add);
+		b.setText(Messages.ControlFactory_AddNoEllipse);
 		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 		b.addSelectionListener(new SelectionAdapter() {
@@ -564,7 +545,7 @@ public void keyPressed(KeyEvent e) {
 		});
 
 		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_Add);
+		b.setText(Messages.ControlFactory_AddNoEllipse);
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 7ebc2b32b6..45998f7875 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -37,14 +37,14 @@
 
 public class DirectMenuItemEditor extends MenuItemEditor {
 	private Image image;
-	
+
 	public DirectMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain,editor, project);
+		super(editingDomain, editor, project);
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
@@ -65,11 +65,11 @@ public String getLabel(Object element) {
 	public String getDescription(Object element) {
 		return Messages.DirectMenuItemEditor_Description;
 	}
-	
+
 	@Override
 	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -78,15 +78,16 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
 
-			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setText(Messages.DirectMenuItemEditor_Find);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index d0e07976e0..3c0566e9dc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -10,24 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandlerCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
@@ -37,6 +30,7 @@
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -48,6 +42,7 @@
 import org.eclipse.swt.layout.GridLayout;
 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.Text;
@@ -58,7 +53,7 @@ public class HandlerEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private IModelResource resource;
 	private IProject project;
-	private StackLayout stackLayout;
+	private EStackLayout stackLayout;
 
 	public HandlerEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource, IProject project) {
 		super(editingDomain,editor);
@@ -95,7 +90,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index f72445c709..49e35c8694 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -10,24 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.KeyBindingCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
@@ -40,6 +33,7 @@
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -65,6 +59,7 @@
 import org.eclipse.swt.layout.GridLayout;
 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.Text;
@@ -75,10 +70,10 @@ public class KeyBindingEditor extends AbstractComponentEditor {
 	private Image image;
 	private EMFDataBindingContext context;
 	private IModelResource resource;
-	private StackLayout stackLayout;
+	private EStackLayout stackLayout;
 
 	public KeyBindingEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 		this.resource = resource;
 	}
 
@@ -112,7 +107,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -120,21 +115,21 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
@@ -145,11 +140,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -162,7 +157,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index d4f8ea5f5a..acec042efa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -10,40 +10,39 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-import org.eclipse.emf.ecore.EObject;
-
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.emf.databinding.EMFProperties;
-
 import org.eclipse.core.resources.IProject;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
-import java.util.List;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -54,41 +53,28 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-import org.eclipse.swt.SWT;
-
-import org.eclipse.core.databinding.observable.value.WritableValue;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-
-import org.eclipse.emf.edit.domain.EditingDomain;
-
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class MenuContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
 	private IProject project;
-	
+
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private StackLayout stackLayout;
-	
+	private EStackLayout stackLayout;
+
 	private static class Struct {
 		private final String label;
 		private final EClass eClass;
@@ -100,15 +86,15 @@ public Struct(String label, EClass eClass, boolean separator) {
 			this.separator = separator;
 		}
 	}
-	
+
 	public MenuContributionEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 		this.project = project;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
@@ -141,7 +127,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -149,21 +135,21 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
@@ -174,11 +160,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -191,7 +177,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-				
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -218,12 +204,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__POSITION_IN_PARENT).observeDetail(getMaster()));
 		}
 
-		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_MenuItems);
-			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
@@ -371,8 +356,8 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 		}
-		
-		ControlFactory.createTagsWidget(parent, this); 
+
+		ControlFactory.createTagsWidget(parent, this);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 266b9ff1a1..6a8f0edece 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -10,14 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
-import org.eclipse.e4.ui.model.application.ui.MUILabel;
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.e4.tools.emf.ui.common.Util;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
@@ -25,6 +17,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
@@ -34,12 +29,14 @@
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFListProperty;
@@ -63,7 +60,6 @@
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -84,7 +80,7 @@ public class MenuEditor extends AbstractComponentEditor {
 	private IProject project;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private StackLayout stackLayout;
+	private EStackLayout stackLayout;
 
 	private static class Struct {
 		private final String label;
@@ -99,7 +95,7 @@ public Struct(String label, EClass eClass, boolean separator) {
 	}
 
 	public MenuEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 		this.project = project;
 	}
 
@@ -127,30 +123,30 @@ public Composite getEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = new Composite(parent, SWT.NONE);
-			stackLayout = new StackLayout();
+			stackLayout = new EStackLayout();
 			composite.setLayout(stackLayout);
-			
-			createForm(composite, context, getMaster(),false,false);
-			createForm(composite, context, getMaster(),true,false);
-			if( getEditor().isModelFragment() ) {
-				createForm(composite, context, getMaster(),false,true);	
+
+			createForm(composite, context, getMaster(), false, false);
+			createForm(composite, context, getMaster(), true, false);
+			if (getEditor().isModelFragment()) {
+				createForm(composite, context, getMaster(), false, true);
 			}
 		}
 		EObject o = (EObject) object;
 		Control topControl;
-		if( Util.isImport(o) && getEditor().isModelFragment() ) {
+		if (Util.isImport(o) && getEditor().isModelFragment()) {
 			topControl = composite.getChildren()[2];
-		} else if( o.eContainer() instanceof MWindow || o.eContainer() == null ) {
+		} else if (o.eContainer() instanceof MWindow || o.eContainer() == null) {
 			topControl = composite.getChildren()[1];
 		} else {
 			topControl = composite.getChildren()[0];
 		}
-		
-		if( stackLayout.topControl != topControl ) {
+
+		if (stackLayout.topControl != topControl) {
 			stackLayout.topControl = topControl;
 			composite.layout(true, true);
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
@@ -161,11 +157,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( isImport ) {
+		if (isImport) {
 			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -178,10 +174,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-				
+
 		// ------------------------------------------------------------
-		if( ! rootMenu )
-		{
+		if (!rootMenu) {
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuEditor_LabelLabel);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
@@ -194,8 +189,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		// ------------------------------------------------------------
-		if( ! rootMenu )
-		{
+		if (!rootMenu) {
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuEditor_Tooltip);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
@@ -208,8 +202,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		// ------------------------------------------------------------
-		if( ! rootMenu )
-		{
+		if (!rootMenu) {
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuEditor_IconURI);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
@@ -219,36 +212,36 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
 			new ImageTooltip(t) {
-				
+
 				@Override
 				protected URI getImageURI() {
 					MUILabel part = (MUILabel) getMaster().getValue();
 					String uri = part.getIconURI();
-					if( uri == null || uri.trim().length() == 0 ) {
+					if (uri == null || uri.trim().length() == 0) {
 						return null;
 					}
 					return URI.createURI(part.getIconURI());
 				}
 			};
 
-			
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setText(Messages.MenuItemEditor_Find);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MenuIconDialogEditor dialog = new MenuIconDialogEditor(b.getShell(), project, getEditingDomain(),(MMenu) getMaster().getValue());
+					MenuIconDialogEditor dialog = new MenuIconDialogEditor(b.getShell(), project, getEditingDomain(), (MMenu) getMaster().getValue());
 					dialog.open();
 				}
-			});			
+			});
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuEditor_MenuItems);
-			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
@@ -396,8 +389,8 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 		}
-		
-		ControlFactory.createTagsWidget(parent, this); 
+
+		ControlFactory.createTagsWidget(parent, this);
 
 		return parent;
 	}
@@ -410,20 +403,20 @@ public IObservableList getChildList(Object element) {
 	@Override
 	public String getLabel(Object element) {
 		MMenu menu = (MMenu) element;
-		if( menu.getParent() == null ) {
+		if (menu.getParent() == null) {
 			EObject o = (EObject) element;
-			if( o.eContainer() instanceof MWindow ) {
+			if (o.eContainer() instanceof MWindow) {
 				return Messages.MenuEditor_MainMenu;
 			}
 		}
 		return Messages.MenuEditor_Label;
 	}
-	
+
 	@Override
 	public String getDetailLabel(Object element) {
 		MMenu menu = (MMenu) element;
-		
-		if( menu.getLabel() != null && menu.getLabel().trim().length() > 0 ) {
+
+		if (menu.getLabel() != null && menu.getLabel().trim().length() > 0) {
 			return menu.getLabel();
 		}
 		return null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 6a187edef1..e9b634d624 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -10,31 +10,20 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.core.databinding.conversion.Converter;
-
-import org.eclipse.core.databinding.UpdateValueStrategy;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
 import java.net.MalformedURLException;
 import java.net.URL;
+import org.eclipse.core.databinding.UpdateValueStrategy;
+import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuItemIconDialogEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
@@ -42,9 +31,11 @@
 import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -59,6 +50,7 @@
 import org.eclipse.swt.layout.GridLayout;
 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.Text;
@@ -69,25 +61,25 @@ public abstract class MenuItemEditor extends AbstractComponentEditor {
 	private Image menuImage;
 	private EMFDataBindingContext context;
 	protected IProject project;
-	private StackLayout stackLayout;
+	private EStackLayout stackLayout;
 
 	public MenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 		this.project = project;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-			if (menuImage == null) {
-				try {
-					menuImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif")); //$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+		if (menuImage == null) {
+			try {
+				menuImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif")); //$NON-NLS-1$
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
 			}
+		}
 
-			return menuImage;
+		return menuImage;
 	}
 
 	@Override
@@ -96,7 +88,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -104,21 +96,21 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
@@ -130,12 +122,12 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 		IWidgetValueProperty checkProp = WidgetProperties.selection();
 		IWidgetValueProperty enabled = WidgetProperties.enabled();
-		
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -148,7 +140,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+
 		if (this.getClass() != MenuItemEditor.class) {
 			// ------------------------------------------------------------
 			{
@@ -166,7 +158,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 				context.bindValue(ViewerProperties.singleSelection().observe(viewer), itemTypeObs);
 			}
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -204,37 +196,38 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
 			new ImageTooltip(t) {
-				
+
 				@Override
 				protected URI getImageURI() {
 					MUILabel part = (MUILabel) getMaster().getValue();
 					String uri = part.getIconURI();
-					if( uri == null || uri.trim().length() == 0 ) {
+					if (uri == null || uri.trim().length() == 0) {
 						return null;
 					}
 					return URI.createURI(part.getIconURI());
 				}
 			};
-			
+
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setText(Messages.MenuItemEditor_Find);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MenuItemIconDialogEditor dialog = new MenuItemIconDialogEditor(b.getShell(), project, getEditingDomain(),(MMenuItem) getMaster().getValue());
+					MenuItemIconDialogEditor dialog = new MenuItemIconDialogEditor(b.getShell(), project, getEditingDomain(), (MMenuItem) getMaster().getValue());
 					dialog.open();
 				}
 			});
 		}
-		
+
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Enabled");
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			
+
 			Button b = new Button(parent, SWT.CHECK);
-			b.setLayoutData(new GridData(GridData.BEGINNING,GridData.CENTER,false,false,2,1));
+			b.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 			context.bindValue(checkProp.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__ENABLED).observeDetail(getMaster()));
 		}
 
@@ -242,11 +235,11 @@ public void widgetSelected(SelectionEvent e) {
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Selected");
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			
+
 			Button b = new Button(parent, SWT.CHECK);
-			b.setLayoutData(new GridData(GridData.BEGINNING,GridData.CENTER,false,false,2,1));
+			b.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 			context.bindValue(checkProp.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__SELECTED).observeDetail(getMaster()));
-			
+
 			UpdateValueStrategy t2m = new UpdateValueStrategy();
 			t2m.setConverter(new Converter(boolean.class, ItemType.class) {
 
@@ -256,21 +249,20 @@ public Object convert(Object fromObject) {
 			});
 			UpdateValueStrategy m2t = new UpdateValueStrategy();
 			m2t.setConverter(new Converter(ItemType.class, boolean.class) {
-				
+
 				public Object convert(Object fromObject) {
 					return fromObject == ItemType.CHECK || fromObject == ItemType.RADIO;
 				}
 			});
-			
-			context.bindValue(enabled.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(getMaster()),t2m,m2t);
+
+			context.bindValue(enabled.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(getMaster()), t2m, m2t);
 
 		}
-		
 
 		createFormSubTypeForm(parent, context, master);
 
 		ControlFactory.createTagsWidget(parent, this);
-		
+
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index dbc90e44f1..8479ac77ea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -10,27 +10,19 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -39,6 +31,7 @@
 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.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
@@ -47,10 +40,10 @@ public class MenuSeparatorEditor extends AbstractComponentEditor {
 	private Image separatorImage;
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private StackLayout stackLayout;
-	
+	private EStackLayout stackLayout;
+
 	public MenuSeparatorEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
@@ -88,7 +81,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -96,36 +89,36 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
-	
+
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -138,8 +131,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-				
-		//TODO Should we add visible to mimic a GroupMarker of 3.x
+
+		// TODO Should we add visible to mimic a GroupMarker of 3.x
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index fe58797890..12a4911cfa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -10,37 +10,20 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.ui.model.application.ui.MUILabel;
-
-import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.SetCommand;
-
-import org.eclipse.core.databinding.property.value.IValueProperty;
-
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map.Entry;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
@@ -51,13 +34,20 @@
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -74,6 +64,7 @@
 import org.eclipse.swt.layout.GridLayout;
 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.Text;
@@ -84,21 +75,21 @@ public class PartDescriptorEditor extends AbstractComponentEditor {
 	private Image image;
 	private EMFDataBindingContext context;
 	private IProject project;
-	
+
 	private IListProperty PART__MENUS = EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS);
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IValueProperty PART__TOOLBAR = EMFProperties.value(BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR);
 	private Button createRemoveToolBar;
-	private StackLayout stackLayout;
+	private EStackLayout stackLayout;
 
 	public PartDescriptorEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 		this.project = project;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
@@ -126,7 +117,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -134,42 +125,40 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		if (createRemoveToolBar != null) {
 			createRemoveToolBar.setSelection(((MPartDescriptor) object).getToolbar() != null);
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
 
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
-		parent = new Composite(parent,SWT.NONE);
+		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
 
-		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -178,11 +167,11 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));			
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -191,9 +180,9 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));			
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -201,12 +190,12 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_Tooltip);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			
+
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));			
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -217,31 +206,32 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
 			new ImageTooltip(t) {
-				
+
 				@Override
 				protected URI getImageURI() {
 					MUILabel part = (MUILabel) getMaster().getValue();
 					String uri = part.getIconURI();
-					if( uri == null || uri.trim().length() == 0 ) {
+					if (uri == null || uri.trim().length() == 0) {
 						return null;
 					}
 					return URI.createURI(part.getIconURI());
 				}
 			};
-			
-			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setText(Messages.PartDescriptorEditor_Find);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					PartDescriptorIconDialogEditor dialog = new PartDescriptorIconDialogEditor(b.getShell(), project, getEditingDomain(),(MPartDescriptor) getMaster().getValue());
+					PartDescriptorIconDialogEditor dialog = new PartDescriptorIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPartDescriptor) getMaster().getValue());
 					dialog.open();
 				}
-			});	
+			});
 		}
 
 		// ------------------------------------------------------------
@@ -252,41 +242,42 @@ public void widgetSelected(SelectionEvent e) {
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI).observeDetail(master));
 
-			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setText(Messages.PartDescriptorEditor_Find);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MPartDescriptor) getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI);
 					dialog.open();
 				}
 			});
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_ToolBar);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			
+
 			createRemoveToolBar = new Button(parent, SWT.CHECK);
 			createRemoveToolBar.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MPartDescriptor window = (MPartDescriptor) getMaster().getValue();
-					if( window.getToolbar() == null ) {
+					if (window.getToolbar() == null) {
 						addToolBar();
 					} else {
 						removeToolBar();
 					}
 				}
 			});
-			createRemoveToolBar.setLayoutData(new GridData(GridData.BEGINNING,GridData.CENTER,false,false,2,1));
+			createRemoveToolBar.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -295,11 +286,11 @@ public void widgetSelected(SelectionEvent e) {
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -308,14 +299,13 @@ public void widgetSelected(SelectionEvent e) {
 
 			Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
-			
+
 			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__DIRTYABLE);
 			IWidgetValueProperty uiProp = WidgetProperties.selection();
-			
+
 			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
 		}
 
-		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -324,13 +314,13 @@ public void widgetSelected(SelectionEvent e) {
 
 			Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
-			
+
 			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CLOSEABLE);
 			IWidgetValueProperty uiProp = WidgetProperties.selection();
-			
+
 			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -339,24 +329,24 @@ public void widgetSelected(SelectionEvent e) {
 
 			Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
-			
+
 			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__ALLOW_MULTIPLE);
 			IWidgetValueProperty uiProp = WidgetProperties.selection();
-			
+
 			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_Category);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			
+
 			Text t = new Text(parent, SWT.BORDER);
-			t.setLayoutData(new GridData(GridData.FILL,GridData.BEGINNING, true, false, 2, 1));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CATEGORY).observeDetail(master));
+			t.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false, 2, 1));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CATEGORY).observeDetail(master));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -370,7 +360,7 @@ public void widgetSelected(SelectionEvent e) {
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 80;
 			tableviewer.getControl().setLayoutData(gd);
-			
+
 			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
 			column.getColumn().setText(Messages.PartDescriptorEditor_PersitedStateKey);
 			column.getColumn().setWidth(200);
@@ -381,9 +371,9 @@ public String getText(Object element) {
 					Entry<String, String> entry = (Entry<String, String>) element;
 					return entry.getKey();
 				}
-			}); 
+			});
 
-			//FIXME How can we react upon changes in the Map-Value?
+			// FIXME How can we react upon changes in the Map-Value?
 			column = new TableViewerColumn(tableviewer, SWT.NONE);
 			column.getColumn().setText(Messages.PartDescriptorEditor_PersitedStateValue);
 			column.getColumn().setWidth(200);
@@ -395,17 +385,17 @@ public String getText(Object element) {
 					return entry.getValue();
 				}
 			});
-			
+
 			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE);
 			tableviewer.setInput(prop.observeDetail(getMaster()));
-			
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
 			GridLayout gl = new GridLayout();
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
@@ -418,7 +408,7 @@ public String getText(Object element) {
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -427,7 +417,7 @@ public String getText(Object element) {
 
 			ListViewer viewer = new ListViewer(parent);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			gd.heightHint = 80;
 			viewer.getList().setLayoutData(gd);
 		}
@@ -440,7 +430,7 @@ public String getText(Object element) {
 
 			TableViewer tableviewer = new TableViewer(parent);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			gd.heightHint = 80;
 			tableviewer.getTable().setHeaderVisible(true);
 			tableviewer.getControl().setLayoutData(gd);
@@ -454,7 +444,6 @@ public String getText(Object element) {
 			column.getColumn().setWidth(200);
 		}
 
-
 		ControlFactory.createTagsWidget(parent, this);
 
 		return parent;
@@ -463,28 +452,27 @@ public String getText(Object element) {
 	private void addToolBar() {
 		MToolBar menu = MMenuFactory.INSTANCE.createToolBar();
 		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR, menu);
-		if( cmd.canExecute() ) {
+		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
 	}
-	
+
 	private void removeToolBar() {
 		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR, null);
-		if( cmd.canExecute() ) {
+		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
 	}
 
-	
 	@Override
 	public IObservableList getChildList(final Object element) {
 		final WritableList list = new WritableList();
-		
-		if( getEditor().isModelFragment() && Util.isImport((EObject) element) ) {
+
+		if (getEditor().isModelFragment() && Util.isImport((EObject) element)) {
 			return list;
 		}
-		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PARTDESCRIPTOR_MENU, PART__MENUS, element, Messages.PartDescriptorEditor_Menus) {
+
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PARTDESCRIPTOR_MENU, PART__MENUS, element, Messages.PartDescriptorEditor_Menus) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -493,7 +481,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.PartDescriptorEditor_Handlers) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.PartDescriptorEditor_Handlers) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -503,30 +491,30 @@ protected boolean accepted(Object o) {
 		});
 
 		MPartDescriptor window = (MPartDescriptor) element;
-		if( window.getToolbar() != null ) {
-			list.add(0,window.getToolbar());
+		if (window.getToolbar() != null) {
+			list.add(0, window.getToolbar());
 		}
-		
+
 		PART__TOOLBAR.observe(element).addValueChangeListener(new IValueChangeListener() {
-			
+
 			public void handleValueChange(ValueChangeEvent event) {
-				if( event.diff.getOldValue() != null ) {
+				if (event.diff.getOldValue() != null) {
 					list.remove(event.diff.getOldValue());
-					if( getMaster().getValue() == element ) {
-						createRemoveToolBar.setSelection(false);	
+					if (getMaster().getValue() == element) {
+						createRemoveToolBar.setSelection(false);
 					}
-					
+
 				}
-				
-				if( event.diff.getNewValue() != null ) {
-					list.add(0,event.diff.getNewValue());
-					if( getMaster().getValue() == element ) {
-						createRemoveToolBar.setSelection(true);	
+
+				if (event.diff.getNewValue() != null) {
+					list.add(0, event.diff.getNewValue());
+					if (getMaster().getValue() == element) {
+						createRemoveToolBar.setSelection(true);
 					}
 				}
 			}
 		});
-		
+
 		return list;
 	}
 
@@ -538,8 +526,6 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] {
-			FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL)	
-		};
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL) };
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index d5f54996e9..6a8463e73d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -10,52 +10,20 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.ui.model.application.ui.MUILabel;
-
-import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
-
-import java.io.InputStream;
-
-import java.io.IOException;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.swt.widgets.Event;
-
-import org.eclipse.jface.window.DefaultToolTip;
-
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.common.Util;
-
-import org.eclipse.swt.custom.StackLayout;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.core.databinding.property.value.IValueProperty;
-
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.SetCommand;
-
-import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map.Entry;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
@@ -65,15 +33,22 @@
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -89,6 +64,7 @@
 import org.eclipse.swt.layout.GridLayout;
 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.Text;
@@ -104,7 +80,7 @@ public class PartEditor extends AbstractComponentEditor {
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IValueProperty PART__TOOLBAR = EMFProperties.value(BasicPackageImpl.Literals.PART__TOOLBAR);
 	private Button createRemoveToolBar;
-	private StackLayout stackLayout;
+	private EStackLayout stackLayout;
 
 	public PartEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain, editor);
@@ -141,7 +117,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -149,25 +125,25 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		if (createRemoveToolBar != null) {
 			createRemoveToolBar.setSelection(((MPart) object).getToolbar() != null);
 		}
-		
+
 		getMaster().setValue(object);
 
 		return composite;
@@ -179,17 +155,17 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		 if( isImport ) {
-			 ControlFactory.createFindImport(parent, this, context);
-			 return parent;
-		 }
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
+			return parent;
+		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			
+
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
@@ -215,7 +191,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_Tooltip);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			
+
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
@@ -234,19 +210,20 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
 			new ImageTooltip(t) {
-				
+
 				@Override
 				protected URI getImageURI() {
 					MUILabel part = (MUILabel) getMaster().getValue();
 					String uri = part.getIconURI();
-					if( uri == null || uri.trim().length() == 0 ) {
+					if (uri == null || uri.trim().length() == 0) {
 						return null;
 					}
 					return URI.createURI(part.getIconURI());
 				}
 			};
-			
+
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setText(Messages.PartEditor_Find);
 			b.addSelectionListener(new SelectionAdapter() {
@@ -269,6 +246,7 @@ public void widgetSelected(SelectionEvent e) {
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setText(Messages.PartEditor_Find);
 			b.addSelectionListener(new SelectionAdapter() {
@@ -463,11 +441,11 @@ protected void createSubformElements(Composite parent, EMFDataBindingContext con
 	@Override
 	public IObservableList getChildList(Object element) {
 		final WritableList list = new WritableList();
-		
-		if( getEditor().isModelFragment() && Util.isImport((EObject) element) ) {
+
+		if (getEditor().isModelFragment() && Util.isImport((EObject) element)) {
 			return list;
 		}
-		
+
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PART_MENU, PART__MENUS, element, Messages.PartEditor_Menus) {
 
 			@Override

From 53aa4ff9dd0991a80a1e98e90864797f80d091de Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 26 Jun 2010 15:18:20 +0000
Subject: [PATCH 0158/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed minor layout tweaks

---
 .../internal/common/component/PartEditor.java |  39 ----
 .../component/PartSashContainerEditor.java    | 168 +++++++---------
 .../common/component/PartStackEditor.java     | 154 +++++++--------
 .../common/component/PerspectiveEditor.java   | 163 +++++++--------
 .../component/PerspectiveStackEditor.java     | 131 ++++++------
 .../common/component/PlaceholderEditor.java   | 128 +++++-------
 .../component/ToolBarContributionEditor.java  |  97 ++++-----
 .../common/component/ToolBarEditor.java       |  44 ++---
 .../component/ToolBarSeparatorEditor.java     |  49 ++---
 .../common/component/ToolControlEditor.java   |  67 +++----
 .../common/component/ToolItemEditor.java      |  74 ++++---
 .../common/component/TrimBarEditor.java       | 165 +++++++---------
 .../component/TrimContributionEditor.java     | 186 ++++++++----------
 .../common/component/WindowEditor.java        | 179 ++++++++---------
 14 files changed, 708 insertions(+), 936 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 6a8463e73d..81f3b23f52 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -312,45 +312,6 @@ public void widgetSelected(SelectionEvent e) {
 		// ------------------------------------------------------------
 		ControlFactory.createBindingsWidget(parent, this);
 
-		// TODO Does the user need to edit this?
-		// // ------------------------------------------------------------
-		// {
-		// Label l = new Label(parent, SWT.NONE);
-		// l.setText("Variables");
-		// l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING,
-		// false, false));
-		//
-		// ListViewer viewer = new ListViewer(parent);
-		// GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		// gd.horizontalSpan=2;
-		// gd.heightHint = 80;
-		// viewer.getList().setLayoutData(gd);
-		// }
-
-		// // ------------------------------------------------------------
-		// {
-		// Label l = new Label(parent, SWT.NONE);
-		// l.setText("Properties");
-		// l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING,
-		// false, false));
-		//
-		// TableViewer tableviewer = new TableViewer(parent);
-		// GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		// gd.horizontalSpan=2;
-		// gd.heightHint = 80;
-		// tableviewer.getTable().setHeaderVisible(true);
-		// tableviewer.getControl().setLayoutData(gd);
-		//
-		// TableViewerColumn column = new TableViewerColumn(tableviewer,
-		// SWT.NONE);
-		// column.getColumn().setText("Key");
-		// column.getColumn().setWidth(200);
-		//
-		// column = new TableViewerColumn(tableviewer, SWT.NONE);
-		// column.getColumn().setText("Value");
-		// column.getColumn().setWidth(200);
-		// }
-
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index a5b691fbed..ed04e02e7e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -10,30 +10,21 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-
-import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
-import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -43,8 +34,6 @@
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -57,7 +46,6 @@
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
-import org.eclipse.jface.databinding.viewers.ViewerSupport;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -72,6 +60,7 @@
 import org.eclipse.swt.layout.GridLayout;
 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.Text;
@@ -84,17 +73,17 @@ public class PartSashContainerEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private StackLayout stackLayout;
+	private EStackLayout stackLayout;
 
 	public PartSashContainerEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		boolean horizontal = ((MPartSashContainer)element).isHorizontal();
+		boolean horizontal = ((MPartSashContainer) element).isHorizontal();
 
-		if( vImage == null && ! horizontal ) {
+		if (vImage == null && !horizontal) {
 			try {
 				vImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
@@ -103,7 +92,7 @@ public Image getImage(Object element, Display display) {
 			}
 		}
 
-		if( hImage == null && horizontal ) {
+		if (hImage == null && horizontal) {
 			try {
 				hImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
@@ -112,7 +101,7 @@ public Image getImage(Object element, Display display) {
 			}
 		}
 
-		if( horizontal ) {
+		if (horizontal) {
 			return hImage;
 		} else {
 			return vImage;
@@ -135,7 +124,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -143,37 +132,36 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context,
-			WritableValue master, boolean isImport) {
-		parent = new Composite(parent,SWT.NONE);
+	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
+		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -182,26 +170,26 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartSashContainerEditor_Orientation);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			
+
 			ComboViewer viewer = new ComboViewer(parent);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			viewer.getControl().setLayoutData(gd);
 			viewer.setContentProvider(new ArrayContentProvider());
 			viewer.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
-					return ((Boolean)element).booleanValue() ? Messages.PartSashContainerEditor_Horizontal : Messages.PartSashContainerEditor_Vertical;
+					return ((Boolean) element).booleanValue() ? Messages.PartSashContainerEditor_Horizontal : Messages.PartSashContainerEditor_Vertical;
 				}
 			});
 			viewer.setInput(new Boolean[] { Boolean.TRUE, Boolean.FALSE });
@@ -210,7 +198,7 @@ public String getText(Object element) {
 		}
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PartSashContainerEditor_SelectedElement);
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -219,9 +207,9 @@ public String getText(Object element) {
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
 		}
 
 		ControlFactory.createTagsWidget(parent, this);
@@ -229,8 +217,8 @@ public String getText(Object element) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartSashContainerEditor_Controls);
-			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
-			
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+
 			final TableViewer viewer = new TableViewer(parent);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 200;
@@ -238,41 +226,41 @@ public String getText(Object element) {
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
-			
+
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
-			
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout(2,false);
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.PartSashContainerEditor_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
-							if( idx >= 0 ) {
+							if (idx >= 0) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -281,30 +269,30 @@ public void widgetSelected(SelectionEvent e) {
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.PartSashContainerEditor_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
-							if( idx < container.getChildren().size() ) {
+							if (idx < container.getChildren().size()) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
 			});
-			
+
 			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
 			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			childrenDropDown.setContentProvider(new ArrayContentProvider());
@@ -315,54 +303,48 @@ public String getText(Object element) {
 					return eclass.getName();
 				}
 			});
-			childrenDropDown.setInput(new EClass[] {
-					BasicPackageImpl.Literals.PART_SASH_CONTAINER,
-					BasicPackageImpl.Literals.PART_STACK,
-					BasicPackageImpl.Literals.PART,
-					BasicPackageImpl.Literals.INPUT_PART,
-					AdvancedPackageImpl.Literals.PLACEHOLDER
-			});
+			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.PLACEHOLDER });
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
-			
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! childrenDropDown.getSelection().isEmpty() ) {
-						EClass eClass = (EClass) ((IStructuredSelection)childrenDropDown.getSelection()).getFirstElement();
+					if (!childrenDropDown.getSelection().isEmpty()) {
+						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
 						EObject eObject = EcoreUtil.create(eClass);
-						
+
 						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-						
-						if( cmd.canExecute() ) {
+
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 							getEditor().setSelection(eObject);
 						}
 					}
 				}
 			});
-			
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.PartSashContainerEditor_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
-						
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
 				}
 			});
 		}
-		
+
 		return parent;
 	}
 
@@ -378,8 +360,6 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] {
-			FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL)	
-		};
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL) };
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 7d66d1efea..690624b177 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -10,30 +10,22 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-
-import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
-import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -41,8 +33,6 @@
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -52,10 +42,7 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.databinding.viewers.ViewerProperties;
-import org.eclipse.jface.databinding.viewers.ViewerSupport;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -63,6 +50,7 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -70,6 +58,7 @@
 import org.eclipse.swt.layout.GridLayout;
 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.Text;
@@ -84,12 +73,12 @@ public class PartStackEditor extends AbstractComponentEditor {
 	private StackLayout stackLayout;
 
 	public PartStackEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
@@ -117,7 +106,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -125,37 +114,36 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context,
-			WritableValue master, boolean isImport) {
-		parent = new Composite(parent,SWT.NONE);
+	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
+		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -164,13 +152,13 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PartStackEditor_SelectedElement);
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -179,59 +167,58 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartStackEditor_Parts);
-			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
-			
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			
-			
+
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
-			
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout(2,false);
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.PartStackEditor_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
-			b.addSelectionListener(new SelectionAdapter() { 
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {  
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
-							if( idx >= 0 ) {
+							if (idx >= 0) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -240,30 +227,30 @@ public void widgetSelected(SelectionEvent e) {
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.PartStackEditor_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
-							if( idx < container.getChildren().size() ) {
+							if (idx < container.getChildren().size()) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
 			});
-			
+
 			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
 			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			childrenDropDown.setContentProvider(new ArrayContentProvider());
@@ -274,44 +261,39 @@ public String getText(Object element) {
 					return eclass.getName();
 				}
 			});
-			childrenDropDown.setInput(new EClass[] {
-					BasicPackageImpl.Literals.PART,
-					BasicPackageImpl.Literals.INPUT_PART,
-					AdvancedPackageImpl.Literals.PLACEHOLDER
-			});
+			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.PLACEHOLDER });
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
-			
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					EClass eClass = (EClass) ((IStructuredSelection)childrenDropDown.getSelection()).getFirstElement();
+					EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
 					EObject eObject = EcoreUtil.create(eClass);
-					
+
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-					
-					if( cmd.canExecute() ) {
+
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 						getEditor().setSelection(eObject);
 					}
 				}
 			});
-			
-			
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.PartStackEditor_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
-						
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 19385e282d..d20ada0abe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -10,27 +10,16 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
-import org.eclipse.e4.ui.model.application.ui.MUILabel;
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
-import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
@@ -38,18 +27,18 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PerspectiveIconDialogEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -59,10 +48,7 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.databinding.viewers.ViewerProperties;
-import org.eclipse.jface.databinding.viewers.ViewerSupport;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -77,6 +63,7 @@
 import org.eclipse.swt.layout.GridLayout;
 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.Text;
@@ -88,10 +75,10 @@ public class PerspectiveEditor extends AbstractComponentEditor {
 	private IProject project;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private StackLayout stackLayout;
+	private EStackLayout stackLayout;
 
 	public PerspectiveEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 		this.project = project;
 	}
 
@@ -126,11 +113,9 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] {
-			FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL)	
-		};
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL) };
 	}
-	
+
 	@Override
 	public String getDescription(Object element) {
 		return Messages.PerspectiveEditor_Description;
@@ -142,7 +127,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -150,21 +135,21 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
@@ -175,11 +160,11 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -190,9 +175,9 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PerspectiveEditor_SelectedElement);
 
 		// ------------------------------------------------------------
@@ -205,7 +190,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -218,7 +203,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -229,27 +214,27 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
 			new ImageTooltip(t) {
-				
+
 				@Override
 				protected URI getImageURI() {
 					MUILabel part = (MUILabel) getMaster().getValue();
 					String uri = part.getIconURI();
-					if( uri == null || uri.trim().length() == 0 ) {
+					if (uri == null || uri.trim().length() == 0) {
 						return null;
 					}
 					return URI.createURI(part.getIconURI());
 				}
 			};
-			
+
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.PerspectiveEditor_Find);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					PerspectiveIconDialogEditor dialog = new PerspectiveIconDialogEditor(b.getShell(), project,getEditingDomain(),(MPerspective) getMaster().getValue());
+					PerspectiveIconDialogEditor dialog = new PerspectiveIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPerspective) getMaster().getValue());
 					dialog.open();
 				}
 			});
@@ -258,8 +243,8 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PerspectiveEditor_Controls);
-			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
-			
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+
 			final TableViewer viewer = new TableViewer(parent);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 200;
@@ -267,41 +252,41 @@ public void widgetSelected(SelectionEvent e) {
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
-			
+
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
-			
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout(2,false);
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.PerspectiveEditor_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
-							if( idx >= 0 ) {
+							if (idx >= 0) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -310,30 +295,30 @@ public void widgetSelected(SelectionEvent e) {
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.PerspectiveEditor_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
-							if( idx < container.getChildren().size() ) {
+							if (idx < container.getChildren().size()) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
 			});
-			
+
 			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
 			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			childrenDropDown.setContentProvider(new ArrayContentProvider());
@@ -344,54 +329,48 @@ public String getText(Object element) {
 					return eclass.getName();
 				}
 			});
-			childrenDropDown.setInput(new EClass[] {
-					BasicPackageImpl.Literals.PART_SASH_CONTAINER,
-					BasicPackageImpl.Literals.PART_STACK,
-					BasicPackageImpl.Literals.PART,
-					BasicPackageImpl.Literals.INPUT_PART,
-					AdvancedPackageImpl.Literals.PLACEHOLDER
-			});
+			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.PLACEHOLDER });
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
-			
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! childrenDropDown.getSelection().isEmpty() ) {
-						EClass eClass = (EClass) ((IStructuredSelection)childrenDropDown.getSelection()).getFirstElement();
+					if (!childrenDropDown.getSelection().isEmpty()) {
+						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
 						EObject eObject = EcoreUtil.create(eClass);
-						
+
 						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-						
-						if( cmd.canExecute() ) {
+
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 							getEditor().setSelection(eObject);
 						}
 					}
 				}
 			});
-			
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.PerspectiveEditor_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
-						
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
 				}
 			});
 		}
-		
+
 		ControlFactory.createTagsWidget(parent, this);
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index fc674650e3..110771590e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -10,23 +10,14 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-import org.eclipse.emf.ecore.EObject;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
-import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
@@ -41,19 +32,14 @@
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.databinding.viewers.ViewerProperties;
-import org.eclipse.jface.databinding.viewers.ViewerSupport;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
@@ -65,6 +51,7 @@
 import org.eclipse.swt.layout.GridLayout;
 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.Text;
@@ -75,15 +62,15 @@ public class PerspectiveStackEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private StackLayout stackLayout;
+	private EStackLayout stackLayout;
 
 	public PerspectiveStackEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
@@ -116,7 +103,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -124,37 +111,36 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context,
-			WritableValue master, boolean isImport) {
-		parent = new Composite(parent,SWT.NONE);
+	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
+		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -163,61 +149,60 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PerspectiveStackEditor_SelectedElement);
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PerspectiveStackEditor_Perspectives);
-			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
-			
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			
-			
+
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
-			
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
 			GridLayout gl = new GridLayout();
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.PartStackEditor_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() { 
+			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {  
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
-							if( idx >= 0 ) {
+							if (idx >= 0) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -230,44 +215,44 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
-							if( idx < container.getChildren().size() ) {
+							if (idx < container.getChildren().size()) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
 			});
-						
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setText(Messages.PerspectiveStackEditor_Add);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MPerspective eObject = MAdvancedFactory.INSTANCE.createPerspective();
-					
+
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-					
-					if( cmd.canExecute() ) {
+
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 						getEditor().setSelection(eObject);
 					}
 				}
 			});
-			
-			
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.PartStackEditor_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
@@ -275,11 +260,11 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
-						
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 57ee751b5b..b0571a0da3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -10,48 +10,24 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.common.Util;
-
-import org.eclipse.e4.ui.workbench.UIEvents.UIElement;
-
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
-
-import org.eclipse.core.databinding.conversion.Converter;
-
-import org.eclipse.core.databinding.conversion.Converter;
-
-import org.eclipse.core.databinding.UpdateValueStrategy;
-
-import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
-import org.eclipse.e4.tools.emf.ui.common.IModelResource;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.SharedElementsDialog;
-
-import org.eclipse.swt.events.SelectionEvent;
-
-import org.eclipse.swt.events.SelectionAdapter;
-
-import org.eclipse.swt.events.SelectionAdapter;
-
-import org.eclipse.swt.widgets.Button;
-
 import java.net.MalformedURLException;
 import java.net.URL;
+import org.eclipse.core.databinding.UpdateValueStrategy;
+import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.SharedElementsDialog;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
@@ -59,10 +35,14 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+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.Text;
@@ -72,10 +52,10 @@ public class PlaceholderEditor extends AbstractComponentEditor {
 	private Image image;
 	private EMFDataBindingContext context;
 	private IModelResource resource;
-	private StackLayout stackLayout;
-	
+	private EStackLayout stackLayout;
+
 	public PlaceholderEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 		this.resource = resource;
 	}
 
@@ -101,24 +81,24 @@ public String getLabel(Object element) {
 	@Override
 	public String getDetailLabel(Object element) {
 		MPlaceholder pl = (MPlaceholder) element;
-		if( pl.getRef() != null ) {
+		if (pl.getRef() != null) {
 			StringBuilder b = new StringBuilder();
 
-			b.append(((EObject)pl.getRef()).eClass().getName());
-			if( pl.getRef() instanceof MUILabel ) {
+			b.append(((EObject) pl.getRef()).eClass().getName());
+			if (pl.getRef() instanceof MUILabel) {
 				MUILabel label = (MUILabel) pl.getRef();
-				if( label.getLabel() != null && label.getLabel().trim().length() > 0 ) {
-					b.append(" (" + label.getLabel() + ")");  //$NON-NLS-1$//$NON-NLS-2$
-				} else if( label.getTooltip() != null && label.getTooltip().trim().length() > 0 ) {
+				if (label.getLabel() != null && label.getLabel().trim().length() > 0) {
+					b.append(" (" + label.getLabel() + ")"); //$NON-NLS-1$//$NON-NLS-2$
+				} else if (label.getTooltip() != null && label.getTooltip().trim().length() > 0) {
 					b.append(" (" + label.getTooltip() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 				} else {
-					if( pl.getRef().getElementId() != null && pl.getRef().getElementId().trim().length() > 0 ) {
+					if (pl.getRef().getElementId() != null && pl.getRef().getElementId().trim().length() > 0) {
 						b.append(pl.getRef().getElementId());
 					}
 				}
 			} else {
-				if( pl.getRef().getElementId() != null && pl.getRef().getElementId().trim().length() > 0 ) {
-					b.append(" (" + pl.getRef().getElementId() + ")");  //$NON-NLS-1$//$NON-NLS-2$
+				if (pl.getRef().getElementId() != null && pl.getRef().getElementId().trim().length() > 0) {
+					b.append(" (" + pl.getRef().getElementId() + ")"); //$NON-NLS-1$//$NON-NLS-2$
 				}
 			}
 
@@ -139,7 +119,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -147,21 +127,21 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
@@ -172,11 +152,11 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -185,11 +165,11 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));			
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -200,47 +180,47 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			t.setEditable(false);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
-			
+
 			UpdateValueStrategy t2m = new UpdateValueStrategy();
 			t2m.setConverter(new Converter(String.class, MUIElement.class) {
-				
+
 				public Object convert(Object fromObject) {
 					return null;
 				}
 			});
 			UpdateValueStrategy m2t = new UpdateValueStrategy();
-			m2t.setConverter(new Converter(MUIElement.class,String.class) {
-				
+			m2t.setConverter(new Converter(MUIElement.class, String.class) {
+
 				public Object convert(Object fromObject) {
-					if( fromObject != null ) {
+					if (fromObject != null) {
 						EObject o = (EObject) fromObject;
-						if( o instanceof MUILabel ) {
+						if (o instanceof MUILabel) {
 							MUILabel label = (MUILabel) o;
-							if( ! Util.isNullOrEmpty(label.getLabel()) )  {
+							if (!Util.isNullOrEmpty(label.getLabel())) {
 								return o.eClass().getName() + " - " + label.getLabel();
 							}
 						}
-						
-						return o.eClass().getName() + " - "+((MUIElement)fromObject).getElementId();
+
+						return o.eClass().getName() + " - " + ((MUIElement) fromObject).getElementId();
 					}
 					return null;
 				}
 			});
-			
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), AdvancedPackageImpl.Literals.PLACEHOLDER__REF).observeDetail(getMaster()),t2m,m2t);
-			
-			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+
+			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), AdvancedPackageImpl.Literals.PLACEHOLDER__REF).observeDetail(getMaster()), t2m, m2t);
+
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 			b.setText(Messages.PlaceholderEditor_FindReference);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					SharedElementsDialog dialog = new SharedElementsDialog(b.getShell(),getEditor(),(MPlaceholder) getMaster().getValue(), resource);
+					SharedElementsDialog dialog = new SharedElementsDialog(b.getShell(), getEditor(), (MPlaceholder) getMaster().getValue(), resource);
 					dialog.open();
 				}
 			});
 		}
 
-		
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 4887cdf1f0..0b0fdf2726 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -10,42 +10,39 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
-
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.emf.databinding.EMFProperties;
-
 import org.eclipse.core.resources.IProject;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
-import java.util.List;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -56,41 +53,28 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-import org.eclipse.swt.SWT;
-
-import org.eclipse.core.databinding.observable.value.WritableValue;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-
-import org.eclipse.emf.edit.domain.EditingDomain;
-
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class ToolBarContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
 	private IProject project;
-	
+
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private StackLayout stackLayout;
-	
+	private EStackLayout stackLayout;
+
 	private static class Struct {
 		private final String label;
 		private final EClass eClass;
@@ -102,15 +86,15 @@ public Struct(String label, EClass eClass, boolean separator) {
 			this.separator = separator;
 		}
 	}
-	
+
 	public ToolBarContributionEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 		this.project = project;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
@@ -143,7 +127,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -151,21 +135,21 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
@@ -176,11 +160,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -193,7 +177,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-				
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -220,12 +204,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__POSITION_IN_PARENT).observeDetail(getMaster()));
 		}
 
-		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolBarEditor_ToolbarItems);
-			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
@@ -373,8 +356,8 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 		}
-		
-		ControlFactory.createTagsWidget(parent, this); 
+
+		ControlFactory.createTagsWidget(parent, this);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 41e114f6af..8a644d3134 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -10,19 +10,14 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-import org.eclipse.emf.ecore.EObject;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
@@ -41,6 +36,7 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
@@ -64,6 +60,7 @@
 import org.eclipse.swt.layout.GridLayout;
 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.Text;
@@ -75,7 +72,7 @@ public class ToolBarEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private StackLayout stackLayout;
+	private EStackLayout stackLayout;
 
 	private static class Struct {
 		private final String label;
@@ -89,14 +86,13 @@ public Struct(String label, EClass eClass, boolean separator) {
 		}
 	}
 
-	
 	public ToolBarEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
@@ -123,7 +119,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -131,21 +127,21 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
@@ -156,11 +152,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -173,12 +169,12 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolBarEditor_ToolbarItems);
-			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 47a639ef7a..a8eeac79d9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -10,27 +10,19 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -39,6 +31,7 @@
 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.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
@@ -47,10 +40,10 @@ public class ToolBarSeparatorEditor extends AbstractComponentEditor {
 	private Image separatorImage;
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private StackLayout stackLayout;
-	
+	private EStackLayout stackLayout;
+
 	public ToolBarSeparatorEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
@@ -88,7 +81,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -96,36 +89,36 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
-	
+
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -138,7 +131,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index dcc8a364d0..f1344ce398 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -10,29 +10,24 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map.Entry;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -48,6 +43,7 @@
 import org.eclipse.swt.layout.GridLayout;
 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.Text;
@@ -57,10 +53,10 @@ public class ToolControlEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private Composite composite;
 	private IProject project;
-	private StackLayout stackLayout;
+	private EStackLayout stackLayout;
 
 	public ToolControlEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 		this.project = project;
 	}
 
@@ -100,7 +96,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -108,21 +104,21 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
@@ -132,12 +128,12 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-		
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -150,7 +146,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -162,6 +158,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setText("Find ...");
 			b.addSelectionListener(new SelectionAdapter() {
@@ -172,7 +169,7 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -186,7 +183,7 @@ public void widgetSelected(SelectionEvent e) {
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 80;
 			tableviewer.getControl().setLayoutData(gd);
-			
+
 			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
 			column.getColumn().setText("Key");
 			column.getColumn().setWidth(200);
@@ -197,9 +194,9 @@ public String getText(Object element) {
 					Entry<String, String> entry = (Entry<String, String>) element;
 					return entry.getKey();
 				}
-			}); 
+			});
 
-			//FIXME How can we react upon changes in the Map-Value?
+			// FIXME How can we react upon changes in the Map-Value?
 			column = new TableViewerColumn(tableviewer, SWT.NONE);
 			column.getColumn().setText("Value");
 			column.getColumn().setWidth(200);
@@ -211,17 +208,17 @@ public String getText(Object element) {
 					return entry.getValue();
 				}
 			});
-			
+
 			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE);
 			tableviewer.setInput(prop.observeDetail(getMaster()));
-			
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
 			GridLayout gl = new GridLayout();
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 8376509aad..94256a0d95 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -10,37 +10,30 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
-import org.eclipse.e4.ui.model.application.ui.MUILabel;
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.conversion.Converter;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ToolItemIconDialogEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -54,6 +47,7 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
@@ -61,7 +55,7 @@ public abstract class ToolItemEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	protected IProject project;
-	private StackLayout stackLayout;
+	private EStackLayout stackLayout;
 
 	public ToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain, editor);
@@ -74,7 +68,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -82,21 +76,21 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
@@ -107,11 +101,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("Id");
 		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
@@ -121,7 +115,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		gd.horizontalSpan = 2;
 		t.setLayoutData(gd);
 		context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));
-		
+
 		createFormSubTypeForm(parent, context, master);
 
 		return parent;
@@ -185,18 +179,18 @@ private void createFormSubTypeForm(Composite parent, EMFDataBindingContext conte
 			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
 			new ImageTooltip(t) {
-				
+
 				@Override
 				protected URI getImageURI() {
 					MUILabel part = (MUILabel) getMaster().getValue();
 					String uri = part.getIconURI();
-					if( uri == null || uri.trim().length() == 0 ) {
+					if (uri == null || uri.trim().length() == 0) {
 						return null;
 					}
 					return URI.createURI(part.getIconURI());
 				}
 			};
-			
+
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText("Find ...");
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
@@ -204,19 +198,19 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ToolItemIconDialogEditor dialog = new ToolItemIconDialogEditor(b.getShell(), project,getEditingDomain(),(MToolItem) getMaster().getValue());
+					ToolItemIconDialogEditor dialog = new ToolItemIconDialogEditor(b.getShell(), project, getEditingDomain(), (MToolItem) getMaster().getValue());
 					dialog.open();
 				}
 			});
 		}
-		
+
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Enabled");
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			
+
 			Button b = new Button(parent, SWT.CHECK);
-			b.setLayoutData(new GridData(GridData.BEGINNING,GridData.CENTER,false,false,2,1));
+			b.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 			context.bindValue(checkProp.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__ENABLED).observeDetail(getMaster()));
 		}
 
@@ -224,11 +218,11 @@ public void widgetSelected(SelectionEvent e) {
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Selected");
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			
+
 			Button b = new Button(parent, SWT.CHECK);
-			b.setLayoutData(new GridData(GridData.BEGINNING,GridData.CENTER,false,false,2,1));
+			b.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 			context.bindValue(checkProp.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__SELECTED).observeDetail(getMaster()));
-			
+
 			UpdateValueStrategy t2m = new UpdateValueStrategy();
 			t2m.setConverter(new Converter(boolean.class, ItemType.class) {
 
@@ -238,13 +232,13 @@ public Object convert(Object fromObject) {
 			});
 			UpdateValueStrategy m2t = new UpdateValueStrategy();
 			m2t.setConverter(new Converter(ItemType.class, boolean.class) {
-				
+
 				public Object convert(Object fromObject) {
 					return fromObject == ItemType.CHECK || fromObject == ItemType.RADIO;
 				}
 			});
-			
-			context.bindValue(enabled.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(getMaster()),t2m,m2t);
+
+			context.bindValue(enabled.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(getMaster()), t2m, m2t);
 
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 21a5ad7375..cf5520040d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -10,22 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.jface.viewers.LabelProvider;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
@@ -33,6 +17,8 @@
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
@@ -41,14 +27,16 @@
 import org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer;
 import org.eclipse.e4.ui.model.application.ui.SideValue;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -60,6 +48,7 @@
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
@@ -70,6 +59,7 @@
 import org.eclipse.swt.layout.GridLayout;
 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.Text;
@@ -82,16 +72,16 @@ public class TrimBarEditor extends AbstractComponentEditor {
 	private ModelEditor editor;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private StackLayout stackLayout;
+	private EStackLayout stackLayout;
 
 	public TrimBarEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 		this.editor = editor;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
@@ -119,7 +109,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -127,50 +117,49 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master, boolean isImport) {
-		parent = new Composite(parent,SWT.NONE);
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Id");
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			
+
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -191,49 +180,49 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Controls");
-			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
-			
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setLabelProvider(new ComponentLabelProvider(editor));
 			viewer.setContentProvider(new ObservableListContentProvider());
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			
+
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
-			
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout(2,false);
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Up");
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
-							if( idx >= 0 ) {
+							if (idx >= 0) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -242,80 +231,76 @@ public void widgetSelected(SelectionEvent e) {
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Down");
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
-							if( idx < container.getChildren().size() ) {
+							if (idx < container.getChildren().size()) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
 			});
-			
-			final ComboViewer typeViewer = new ComboViewer(buttonComp,SWT.READ_ONLY);
+
+			final ComboViewer typeViewer = new ComboViewer(buttonComp, SWT.READ_ONLY);
 			typeViewer.setContentProvider(new ArrayContentProvider());
 			typeViewer.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
-					return ((EClass)element).getName();
+					return ((EClass) element).getName();
 				}
 			});
-			typeViewer.setInput(new Object[] {
-					MenuPackageImpl.Literals.TOOL_BAR,
-					MenuPackageImpl.Literals.TOOL_CONTROL
-			});
+			typeViewer.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
 			typeViewer.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
-			
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					EObject toolbar = EcoreUtil.create((EClass) ((IStructuredSelection)typeViewer.getSelection()).getFirstElement());
+					EObject toolbar = EcoreUtil.create((EClass) ((IStructuredSelection) typeViewer.getSelection()).getFirstElement());
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
-					
-					if( cmd.canExecute() ) {
+
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 						editor.setSelection(toolbar);
 					}
 				}
 			});
-			
-			
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Remove");
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
-						
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
 				}
 			});
 		}
-		
+
 		return parent;
 	}
 
@@ -327,19 +312,17 @@ public IObservableList getChildList(Object element) {
 	@Override
 	public String getDetailLabel(Object element) {
 		MGenericTrimContainer<?> trim = (MGenericTrimContainer<?>) element;
-		
-		if( trim.getSide() != null ) {
+
+		if (trim.getSide() != null) {
 			return trim.getSide().toString();
 		}
-		
+
 		return null;
 	}
-	
+
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] {
-			FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TRIM_CONTAINER__SIDE)	
-		};
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TRIM_CONTAINER__SIDE) };
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 55bbf9d60b..b9fb8c6056 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -10,46 +10,35 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
-
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.emf.databinding.EMFProperties;
-
 import org.eclipse.core.resources.IProject;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
-import java.util.List;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -59,42 +48,28 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-import org.eclipse.swt.SWT;
-
-import org.eclipse.core.databinding.observable.value.WritableValue;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-
-import org.eclipse.emf.edit.domain.EditingDomain;
-
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class TrimContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
 	private IProject project;
-	
+
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private StackLayout stackLayout;
-	
+	private EStackLayout stackLayout;
+
 	private static class Struct {
 		private final String label;
 		private final EClass eClass;
@@ -106,15 +81,15 @@ public Struct(String label, EClass eClass, boolean separator) {
 			this.separator = separator;
 		}
 	}
-	
+
 	public TrimContributionEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 		this.project = project;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
@@ -147,7 +122,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -155,21 +130,21 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
@@ -180,11 +155,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -197,7 +172,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-				
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -224,54 +199,53 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__POSITION_IN_PARENT).observeDetail(getMaster()));
 		}
 
-		
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Controls");
-			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
-			
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			viewer.setContentProvider(new ObservableListContentProvider());
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			
+
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
-			
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout(2,false);
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Up");
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
-							if( idx >= 0 ) {
+							if (idx >= 0) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -280,81 +254,77 @@ public void widgetSelected(SelectionEvent e) {
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Down");
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
-							if( idx < container.getChildren().size() ) {
+							if (idx < container.getChildren().size()) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
 			});
-			
-			final ComboViewer typeViewer = new ComboViewer(buttonComp,SWT.READ_ONLY);
+
+			final ComboViewer typeViewer = new ComboViewer(buttonComp, SWT.READ_ONLY);
 			typeViewer.setContentProvider(new ArrayContentProvider());
 			typeViewer.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
-					return ((EClass)element).getName();
+					return ((EClass) element).getName();
 				}
 			});
-			typeViewer.setInput(new Object[] {
-					MenuPackageImpl.Literals.TOOL_BAR,
-					MenuPackageImpl.Literals.TOOL_CONTROL
-			});
+			typeViewer.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
 			typeViewer.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
-			
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					EObject toolbar = EcoreUtil.create((EClass) ((IStructuredSelection)typeViewer.getSelection()).getFirstElement());
+					EObject toolbar = EcoreUtil.create((EClass) ((IStructuredSelection) typeViewer.getSelection()).getFirstElement());
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
-					
-					if( cmd.canExecute() ) {
+
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 						getEditor().setSelection(toolbar);
 					}
 				}
 			});
-			
-			
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Remove");
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
-						
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
 				}
 			});
 		}
-		
-		ControlFactory.createTagsWidget(parent, this); 
+
+		ControlFactory.createTagsWidget(parent, this);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 44363b33a2..35e393b973 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -10,21 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
-import org.eclipse.e4.ui.model.application.ui.MUILabel;
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.edit.command.RemoveCommand;
-
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -37,22 +22,28 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.WindowIconDialogEditor;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
@@ -66,6 +57,7 @@
 import org.eclipse.swt.layout.GridLayout;
 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.Text;
@@ -82,13 +74,13 @@ public class WindowEditor extends AbstractComponentEditor {
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private IListProperty SHARED_ELEMENTS = EMFProperties.list(BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
 	private IValueProperty WINDOW__MAIN_MENU = EMFProperties.value(BasicPackageImpl.Literals.WINDOW__MAIN_MENU);
-	
+
 	private Action addMainMenu;
 	private Button createRemoveMainMenu;
-	private StackLayout stackLayout; 
-	
+	private EStackLayout stackLayout;
+
 	public WindowEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 		this.project = project;
 		addMainMenu = new Action("Add Main Menu") {
 			@Override
@@ -100,7 +92,7 @@ public void run() {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif"));
 			} catch (MalformedURLException e) {
@@ -128,7 +120,7 @@ public Composite getEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
+				stackLayout = new EStackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -136,42 +128,41 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
 
-		if( createRemoveMainMenu != null ) {
-			createRemoveMainMenu.setSelection(((MWindow)object).getMainMenu() != null);	
+		if (createRemoveMainMenu != null) {
+			createRemoveMainMenu.setSelection(((MWindow) object).getMainMenu() != null);
 		}
-		
+
 		getMaster().setValue(object);
-		
+
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master, boolean isImport) {
-		parent = new Composite(parent,SWT.NONE);
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-		
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -180,11 +171,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -193,9 +184,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__X).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__X).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -206,9 +197,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__Y).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__Y).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -219,9 +210,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__WIDTH).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__WIDTH).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -232,9 +223,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__HEIGHT).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__HEIGHT).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
@@ -247,7 +238,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -260,7 +251,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -271,21 +262,21 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
 			new ImageTooltip(t) {
-				
+
 				@Override
 				protected URI getImageURI() {
 					MUILabel part = (MUILabel) getMaster().getValue();
 					String uri = part.getIconURI();
-					if( uri == null || uri.trim().length() == 0 ) {
+					if (uri == null || uri.trim().length() == 0) {
 						return null;
 					}
 					return URI.createURI(part.getIconURI());
 				}
 			};
-			
+
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText("Find ...");
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
@@ -293,30 +284,30 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					WindowIconDialogEditor dialog = new WindowIconDialogEditor(b.getShell(), project,getEditingDomain(),(MWindow) getMaster().getValue());
+					WindowIconDialogEditor dialog = new WindowIconDialogEditor(b.getShell(), project, getEditingDomain(), (MWindow) getMaster().getValue());
 					dialog.open();
 				}
 			});
 		}
-		
+
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Main Menu");
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			
+
 			createRemoveMainMenu = new Button(parent, SWT.CHECK);
 			createRemoveMainMenu.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MWindow window = (MWindow) getMaster().getValue();
-					if( window.getMainMenu() == null ) {
+					if (window.getMainMenu() == null) {
 						addMenu();
 					} else {
 						removeMenu();
 					}
 				}
 			});
-			createRemoveMainMenu.setLayoutData(new GridData(GridData.BEGINNING,GridData.CENTER,false,false,2,1));
+			createRemoveMainMenu.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 		}
 
 		ControlFactory.createSelectedElement(parent, this, context, "Selected Element");
@@ -326,18 +317,18 @@ public void widgetSelected(SelectionEvent e) {
 
 		return parent;
 	}
-	
+
 	void removeMenu() {
 		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__MAIN_MENU, null);
-		if( cmd.canExecute() ) {
+		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
 	}
-	
+
 	void addMenu() {
 		MMenu menu = MMenuFactory.INSTANCE.createMenu();
 		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__MAIN_MENU, menu);
-		if( cmd.canExecute() ) {
+		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
 	}
@@ -345,11 +336,11 @@ void addMenu() {
 	@Override
 	public IObservableList getChildList(final Object element) {
 		final WritableList list = new WritableList();
-		if( getEditor().isModelFragment() && Util.isImport((EObject) element) ) {
+		if (getEditor().isModelFragment() && Util.isImport((EObject) element)) {
 			return list;
 		}
-		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, "Handlers") {
+
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, "Handlers") {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -357,8 +348,8 @@ protected boolean accepted(Object o) {
 			}
 
 		});
-		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_WINDOWS, WINDOW__WINDOWS, element, "Windows") {
+
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOWS, WINDOW__WINDOWS, element, "Windows") {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -367,7 +358,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_WINDOW_CONTROLS, ELEMENT_CONTAINER__CHILDREN, element, "Controls") {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_CONTROLS, ELEMENT_CONTAINER__CHILDREN, element, "Controls") {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -375,32 +366,32 @@ protected boolean accepted(Object o) {
 			}
 
 		});
-		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_WINDOW_SHARED_ELEMENTS, SHARED_ELEMENTS, element, "Shared Elements" ) {
+
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_SHARED_ELEMENTS, SHARED_ELEMENTS, element, "Shared Elements") {
 			protected boolean accepted(Object o) {
 				return true;
 			}
 		});
-		
+
 		MWindow window = (MWindow) element;
-		if( window.getMainMenu() != null ) {
-			list.add(0,window.getMainMenu());
+		if (window.getMainMenu() != null) {
+			list.add(0, window.getMainMenu());
 		}
-		
+
 		WINDOW__MAIN_MENU.observe(element).addValueChangeListener(new IValueChangeListener() {
-			
+
 			public void handleValueChange(ValueChangeEvent event) {
-				if( event.diff.getOldValue() != null ) {
+				if (event.diff.getOldValue() != null) {
 					list.remove(event.diff.getOldValue());
-					if( getMaster().getValue() == element ) {
-						createRemoveMainMenu.setSelection(false);	
+					if (getMaster().getValue() == element) {
+						createRemoveMainMenu.setSelection(false);
 					}
 				}
-				
-				if( event.diff.getNewValue() != null ) {
-					list.add(0,event.diff.getNewValue());
-					if( getMaster().getValue() == element ) {
-						createRemoveMainMenu.setSelection(true);	
+
+				if (event.diff.getNewValue() != null) {
+					list.add(0, event.diff.getNewValue());
+					if (getMaster().getValue() == element) {
+						createRemoveMainMenu.setSelection(true);
 					}
 				}
 			}
@@ -411,29 +402,27 @@ public void handleValueChange(ValueChangeEvent event) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MWindow window = (MWindow)element;
-		if( window.getLabel() != null && window.getLabel().trim().length() > 0 ) {
+		MWindow window = (MWindow) element;
+		if (window.getLabel() != null && window.getLabel().trim().length() > 0) {
 			return window.getLabel();
 		}
 		return null;
 	}
-	
+
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] {
-			FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL)	
-		};
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL) };
 	}
-	
+
 	@Override
 	public List<Action> getActions(Object element) {
 		List<Action> actions = new ArrayList<Action>();
-		
+
 		MWindow window = (MWindow) element;
-		if( window.getMainMenu() == null ) {
+		if (window.getMainMenu() == null) {
 			actions.add(addMainMenu);
 		}
-		
+
 		return actions;
 	}
 }
\ No newline at end of file

From 6898999e7c3daae7e438b93a5a170d30307b7e9a Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 26 Jun 2010 15:52:40 +0000
Subject: [PATCH 0159/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed minor layout tweaks

---
 .../component/AbstractComponentEditor.java    |  36 +-
 .../tools/emf/ui/internal/Messages.properties |   2 +-
 .../common/component/ApplicationEditor.java   |  48 +--
 .../common/component/CommandEditor.java       | 131 ++++---
 .../common/component/ControlFactory.java      | 347 +-----------------
 .../common/component/HandlerEditor.java       |  32 +-
 .../common/component/KeyBindingEditor.java    |   2 +-
 .../component/MenuContributionEditor.java     |   2 +-
 .../internal/common/component/MenuEditor.java |   2 +-
 .../common/component/MenuItemEditor.java      |   2 +-
 .../component/PartDescriptorEditor.java       |   2 +-
 .../internal/common/component/PartEditor.java |  13 +-
 .../component/PartSashContainerEditor.java    |   4 +-
 .../common/component/PartStackEditor.java     |   5 +-
 .../common/component/PerspectiveEditor.java   |   2 +-
 .../component/PerspectiveStackEditor.java     |   2 +-
 .../component/ToolBarContributionEditor.java  |   2 +-
 .../common/component/ToolItemEditor.java      |   2 +-
 .../component/TrimContributionEditor.java     |   2 +-
 .../common/component/WindowEditor.java        |   6 +-
 20 files changed, 160 insertions(+), 484 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 3df9f5032f..5ca17b80a6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common.component;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -22,6 +20,7 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
@@ -33,12 +32,11 @@ public abstract class AbstractComponentEditor {
 	private EditingDomain editingDomain;
 
 	private static Map<Integer, Image> IMAGE_MAP = new HashMap<Integer, Image>();
-	private static final String[] IMAGES = {
-		"/icons/full/obj16/zoom.png", //$NON-NLS-1$
-		"/icons/full/obj16/table_add.png", //$NON-NLS-1$
-		"/icons/full/obj16/table_delete.png", //$NON-NLS-1$
-		"/icons/full/obj16/arrow_up.png", //$NON-NLS-1$
-		"/icons/full/obj16/arrow_down.png" //$NON-NLS-1$
+	private static final String[] IMAGES = { "/icons/full/obj16/zoom.png", //$NON-NLS-1$
+	"/icons/full/obj16/table_add.png", //$NON-NLS-1$
+	"/icons/full/obj16/table_delete.png", //$NON-NLS-1$
+	"/icons/full/obj16/arrow_up.png", //$NON-NLS-1$
+	"/icons/full/obj16/arrow_down.png" //$NON-NLS-1$
 	};
 
 	private WritableValue master = new WritableValue();
@@ -49,8 +47,10 @@ public abstract class AbstractComponentEditor {
 	public static final int ARROW_UP = 3;
 	public static final int ARROW_DOWN = 4;
 
+	protected static final int VERTICAL_LIST_WIDGET_INDENT = 10;
+
 	private ModelEditor editor;
-	
+
 	public AbstractComponentEditor(EditingDomain editingDomain, ModelEditor editor) {
 		this.editingDomain = editingDomain;
 		this.editor = editor;
@@ -59,7 +59,7 @@ public AbstractComponentEditor(EditingDomain editingDomain, ModelEditor editor)
 	public EditingDomain getEditingDomain() {
 		return editingDomain;
 	}
-	
+
 	public ModelEditor getEditor() {
 		return editor;
 	}
@@ -68,9 +68,9 @@ public WritableValue getMaster() {
 		return master;
 	}
 
-	public Image getImage( Display d, int id) {
+	public Image getImage(Display d, int id) {
 		Image img = IMAGE_MAP.get(id);
-		if( img == null ) {
+		if (img == null) {
 			try {
 				InputStream in = AbstractComponentEditor.class.getClassLoader().getResourceAsStream(IMAGES[id]);
 				img = new Image(d, in);
@@ -85,18 +85,22 @@ public Image getImage( Display d, int id) {
 		return img;
 	}
 
-	public abstract Image getImage(Object element,Display display);
+	public abstract Image getImage(Object element, Display display);
+
 	public abstract String getLabel(Object element);
+
 	public abstract String getDetailLabel(Object element);
 
 	public abstract String getDescription(Object element);
+
 	public abstract Composite getEditor(Composite parent, Object object);
+
 	public abstract IObservableList getChildList(Object element);
 
 	protected Image loadSharedImage(Display d, URL path) {
 		try {
 			URL url = FileLocator.resolve(path);
-			if( url != null ) {
+			if (url != null) {
 				InputStream in = url.openStream();
 				Image image = new Image(d, in);
 				in.close();
@@ -108,11 +112,11 @@ protected Image loadSharedImage(Display d, URL path) {
 		}
 		return null;
 	}
-	
+
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] {};
 	}
-	
+
 	public List<Action> getActions(Object element) {
 		return Collections.emptyList();
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index e3408ff1eb..efb9a05514 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -79,7 +79,7 @@ HandledMenuItemEditor_Description=HandledMenuItem bla bla bla
 HandledMenuItemEditor_Command=Command
 HandledMenuItemEditor_Find=Find ...
 HandledMenuItemEditor_Parameters=Parameters
-HandledMenuItemEditor_Tag=Tag
+HandledMenuItemEditor_Tag=Name
 HandledMenuItemEditor_Value=Value
 HandledMenuItemEditor_Up=Up
 HandledMenuItemEditor_Down=Down
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 810c571577..c2bed1d240 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -54,14 +54,14 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private IListProperty MENU_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS);
 	private IListProperty TOOLBAR_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS);
 	private IListProperty TRIM_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS);
-	
+
 	public ApplicationEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
@@ -85,9 +85,9 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context);
+			composite = createForm(parent, context);
 		}
 		getMaster().setValue(object);
 		return composite;
@@ -108,19 +108,19 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
-		ControlFactory.createVariablesWidget(parent, this);
-		ControlFactory.createBindingsWidget(parent, this);
+
+		ControlFactory.createStringListWidget(parent, this, "Variables", UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, "Binding Contexts", CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
-	
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		WritableList list = new WritableList();
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_ADDONS, APPLICATION__ADDONS, element, Messages.ApplicationEditor_Addons) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_ADDONS, APPLICATION__ADDONS, element, Messages.ApplicationEditor_Addons) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -128,8 +128,8 @@ protected boolean accepted(Object o) {
 			}
 
 		});
-		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.ApplicationEditor_Handlers) {
+
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.ApplicationEditor_Handlers) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -137,8 +137,8 @@ protected boolean accepted(Object o) {
 			}
 
 		});
-		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_PART_DESCRIPTORS, PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, element, Messages.ApplicationEditor_PartDescriptors) {
+
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PART_DESCRIPTORS, PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, element, Messages.ApplicationEditor_PartDescriptors) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -147,7 +147,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element, Messages.ApplicationEditor_BindingTables) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element, Messages.ApplicationEditor_BindingTables) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -156,7 +156,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_COMMAND, APPLICATION__COMMANDS, element, Messages.ApplicationEditor_Commands) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_COMMAND, APPLICATION__COMMANDS, element, Messages.ApplicationEditor_Commands) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -165,7 +165,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_WINDOWS, ELEMENT_CONTAINER__CHILDREN, element, Messages.ApplicationEditor_Windows) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOWS, ELEMENT_CONTAINER__CHILDREN, element, Messages.ApplicationEditor_Windows) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -173,22 +173,22 @@ protected boolean accepted(Object o) {
 			}
 
 		});
-		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_MENU_CONTRIBUTIONS, MENU_CONTRIBUTIONS,  element, Messages.ApplicationEditor_MenuContributions ) { 
+
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MENU_CONTRIBUTIONS, MENU_CONTRIBUTIONS, element, Messages.ApplicationEditor_MenuContributions) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
 			}
 		});
-		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_TOOLBAR_CONTRIBUTIONS, TOOLBAR_CONTRIBUTIONS,  element, Messages.ApplicationEditor_ToolBarContributions ) { 
+
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_TOOLBAR_CONTRIBUTIONS, TOOLBAR_CONTRIBUTIONS, element, Messages.ApplicationEditor_ToolBarContributions) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
 			}
 		});
-		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_TRIM_CONTRIBUTIONS, TRIM_CONTRIBUTIONS,  element, Messages.ApplicationEditor_TrimContributions ) { 
+
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_TRIM_CONTRIBUTIONS, TRIM_CONTRIBUTIONS, element, Messages.ApplicationEditor_TrimContributions) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 9c5284bfbc..4e55a7a0fb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -71,7 +71,7 @@ public class CommandEditor extends AbstractComponentEditor {
 	private EStackLayout stackLayout;
 
 	public CommandEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
@@ -112,21 +112,21 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
@@ -136,10 +136,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-		
-		if( isImport ) {
+
+		if (isImport) {
 			ControlFactory.createFindImport(parent, this, context);
-			
+
 			return parent;
 		}
 
@@ -152,9 +152,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -165,30 +165,30 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CommandEditor_LabelDescription);
-			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
-			Text t = new Text(parent, SWT.BORDER|SWT.H_SCROLL|SWT.V_SCROLL);
+			Text t = new Text(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
-			gd.heightHint=100;
+			gd.heightHint = 100;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__DESCRIPTION).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__DESCRIPTION).observeDetail(getMaster()));
 		}
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CommandEditor_Parameters);
-			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
-			final TableViewer viewer = new TableViewer(parent,SWT.FULL_SELECTION|SWT.MULTI|SWT.BORDER);
+			final TableViewer viewer = new TableViewer(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.BORDER);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
 			viewer.getTable().setHeaderVisible(true);
@@ -199,73 +199,73 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 			{
 				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-				
+
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText(Messages.CommandEditor_ParameterId);
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MCommandParameter>(prop.observeDetail(cp.getKnownElements())));
 				column.setEditingSupport(new EditingSupport(viewer) {
 					private TextCellEditor editor = new TextCellEditor(viewer.getTable());
-					
+
 					@Override
 					protected void setValue(Object element, Object value) {
-						if( value.toString().trim().length() == 0 ) {
+						if (value.toString().trim().length() == 0) {
 							value = null;
 						}
-						
+
 						Command cmd = SetCommand.create(getEditingDomain(), element, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, value);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
-					
+
 					@Override
 					protected Object getValue(Object element) {
 						MCommandParameter obj = (MCommandParameter) element;
 						return obj.getElementId() != null ? obj.getElementId() : ""; //$NON-NLS-1$
 					}
-					
+
 					@Override
 					protected CellEditor getCellEditor(Object element) {
 						return editor;
 					}
-					
+
 					@Override
 					protected boolean canEdit(Object element) {
 						return true;
 					}
 				});
 			}
-			
+
 			{
 				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME);
-				
+
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText(Messages.CommandEditor_ParameterName);
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MCommandParameter>(prop.observeDetail(cp.getKnownElements())));
 				column.setEditingSupport(new EditingSupport(viewer) {
 					private TextCellEditor editor = new TextCellEditor(viewer.getTable());
-					
+
 					@Override
 					protected void setValue(Object element, Object value) {
 						Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME, value);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
-					
+
 					@Override
 					protected Object getValue(Object element) {
 						MCommandParameter obj = (MCommandParameter) element;
 						return obj.getName() != null ? obj.getName() : ""; //$NON-NLS-1$
 					}
-					
+
 					@Override
 					protected CellEditor getCellEditor(Object element) {
 						return editor;
 					}
-					
+
 					@Override
 					protected boolean canEdit(Object element) {
 						return true;
@@ -275,33 +275,33 @@ protected boolean canEdit(Object element) {
 
 			{
 				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__TYPE_ID);
-				
+
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText(Messages.CommandEditor_ParameterTypeId);
-				column.getColumn().setWidth(200);				
+				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MCommandParameter>(prop.observeDetail(cp.getKnownElements())));
 				column.setEditingSupport(new EditingSupport(viewer) {
 					private TextCellEditor editor = new TextCellEditor(viewer.getTable());
-					
+
 					@Override
 					protected void setValue(Object element, Object value) {
 						Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.COMMAND_PARAMETER__TYPE_ID, value);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
-					
+
 					@Override
 					protected Object getValue(Object element) {
 						MCommandParameter obj = (MCommandParameter) element;
 						return obj.getTypeId() != null ? obj.getTypeId() : ""; //$NON-NLS-1$
 					}
-					
+
 					@Override
 					protected CellEditor getCellEditor(Object element) {
 						return editor;
 					}
-					
+
 					@Override
 					protected boolean canEdit(Object element) {
 						return true;
@@ -311,10 +311,10 @@ protected boolean canEdit(Object element) {
 
 			{
 				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__OPTIONAL);
-				
+
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText(Messages.CommandEditor_ParameterOptional);
-				column.getColumn().setWidth(200);				
+				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MCommandParameter>(prop.observeDetail(cp.getKnownElements())) {
 					@Override
 					public String getText(MCommandParameter element) {
@@ -323,27 +323,27 @@ public String getText(MCommandParameter element) {
 				});
 				column.setEditingSupport(new EditingSupport(viewer) {
 					private ComboBoxCellEditor editor = new ComboBoxCellEditor(viewer.getTable(), new String[] { Messages.CommandEditor_ParameterOptional_Yes, Messages.CommandEditor_ParameterOptional_No });
-					
+
 					@Override
 					protected void setValue(Object element, Object value) {
-						int idx = ((Number)value).intValue();
+						int idx = ((Number) value).intValue();
 						Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.COMMAND_PARAMETER__OPTIONAL, idx == 0);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
-					
+
 					@Override
 					protected Object getValue(Object element) {
 						MCommandParameter obj = (MCommandParameter) element;
 						return obj.isOptional() ? 0 : 1;
 					}
-					
+
 					@Override
 					protected CellEditor getCellEditor(Object element) {
 						return editor;
 					}
-					
+
 					@Override
 					protected boolean canEdit(Object element) {
 						return true;
@@ -354,27 +354,24 @@ protected boolean canEdit(Object element) {
 			ColumnViewerEditorActivationStrategy editorActivationStrategy = new ColumnViewerEditorActivationStrategy(viewer) {
 				@Override
 				protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
-					boolean singleSelect = ((IStructuredSelection)viewer.getSelection()).size() == 1;
-					boolean isLeftDoubleMouseSelect = event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION && ((MouseEvent)event.sourceEvent).button == 1;
+					boolean singleSelect = ((IStructuredSelection) viewer.getSelection()).size() == 1;
+					boolean isLeftDoubleMouseSelect = event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION && ((MouseEvent) event.sourceEvent).button == 1;
 
-					return singleSelect && (isLeftDoubleMouseSelect
-							|| event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC
-							|| event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
+					return singleSelect && (isLeftDoubleMouseSelect || event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC || event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
 				}
 			};
 			TableViewerEditor.create(viewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
 
-			
 			IEMFEditListProperty mProp = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
 			viewer.setInput(mProp.observeDetail(getMaster()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
 			GridLayout gl = new GridLayout();
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
@@ -396,8 +393,8 @@ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent even
 				public void widgetSelected(SelectionEvent e) {
 					MCommandParameter param = MCommandsFactory.INSTANCE.createCommandParameter();
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS, param);
-					
-					if( cmd.canExecute() ) {
+
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 						viewer.editElement(param, 0);
 					}
@@ -410,7 +407,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		}
 
-		ControlFactory.createTagsWidget(parent, this);
+		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
@@ -429,12 +426,10 @@ public String getDetailLabel(Object element) {
 
 		return null;
 	}
-	
+
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] {
-			FeaturePath.fromList(CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME)	
-		};
+		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME) };
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index adb04cabea..7c12c0b296 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -24,8 +24,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
-import org.eclipse.e4.ui.model.application.commands.MBindings;
-import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MContext;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
@@ -156,13 +154,17 @@ public void handleValueChange(ValueChangeEvent event) {
 		});
 	}
 
-	public static void createStringListWidget(Composite parent, final AbstractComponentEditor editor, String label, final EStructuralFeature feature) {
+	public static void createStringListWidget(Composite parent, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
-		l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+		GridData gd = new GridData(GridData.END, GridData.BEGINNING, false, false);
+		gd.verticalIndent = vIndent;
+		l.setLayoutData(gd);
 
 		final Text t = new Text(parent, SWT.BORDER);
-		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		gd = new GridData(GridData.FILL, GridData.BEGINNING, true, false);
+		gd.verticalIndent = vIndent;
+		t.setLayoutData(gd);
 		t.addKeyListener(new KeyAdapter() {
 			@Override
 			public void keyPressed(KeyEvent e) {
@@ -175,7 +177,9 @@ public void keyPressed(KeyEvent e) {
 		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ControlFactory_AddNoEllipse);
 		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+		gd = new GridData(GridData.FILL, GridData.CENTER, false, false);
+		gd.verticalIndent = vIndent;
+		b.setLayoutData(gd);
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -188,7 +192,7 @@ public void widgetSelected(SelectionEvent e) {
 		final TableViewer viewer = new TableViewer(parent);
 		viewer.setLabelProvider(new LabelProvider());
 		viewer.setContentProvider(new ObservableListContentProvider());
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.heightHint = 150;
 		viewer.getControl().setLayoutData(gd);
 
@@ -280,335 +284,6 @@ public void widgetSelected(SelectionEvent e) {
 		});
 	}
 
-	public static void createVariablesWidget(Composite parent, final AbstractComponentEditor editor) {
-		Label l = new Label(parent, SWT.NONE);
-		l.setText(Messages.ControlFactory_ContextVariables);
-		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-		final Text t = new Text(parent, SWT.BORDER);
-		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		t.addKeyListener(new KeyAdapter() {
-			@Override
-			public void keyPressed(KeyEvent e) {
-				if (e.keyCode == SWT.CR || e.keyCode == SWT.LF) {
-					handleAddText(editor, UiPackageImpl.Literals.CONTEXT__VARIABLES, t);
-				}
-			}
-		});
-
-		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_AddNoEllipse);
-		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				handleAddText(editor, UiPackageImpl.Literals.CONTEXT__VARIABLES, t);
-			}
-		});
-
-		new Label(parent, SWT.NONE);
-
-		final TableViewer viewer = new TableViewer(parent);
-		viewer.setLabelProvider(new LabelProvider());
-		viewer.setContentProvider(new ObservableListContentProvider());
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.heightHint = 150;
-		viewer.getControl().setLayoutData(gd);
-
-		IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.CONTEXT__VARIABLES);
-		viewer.setInput(prop.observeDetail(editor.getMaster()));
-
-		Composite buttonComp = new Composite(parent, SWT.NONE);
-		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		GridLayout gl = new GridLayout();
-		gl.marginLeft = 0;
-		gl.marginRight = 0;
-		gl.marginWidth = 0;
-		gl.marginHeight = 0;
-		buttonComp.setLayout(gl);
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_Up);
-		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_UP));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						MContext container = (MContext) editor.getMaster().getValue();
-						int idx = container.getVariables().indexOf(obj) - 1;
-						if (idx >= 0) {
-							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), UiPackageImpl.Literals.CONTEXT__VARIABLES, obj, idx);
-
-							if (cmd.canExecute()) {
-								editor.getEditingDomain().getCommandStack().execute(cmd);
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
-				}
-			}
-		});
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_Down);
-		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_DOWN));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						MContext container = (MApplication) editor.getMaster().getValue();
-						int idx = container.getVariables().indexOf(obj) + 1;
-						if (idx < container.getVariables().size()) {
-							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), UiPackageImpl.Literals.CONTEXT__VARIABLES, obj, idx);
-
-							if (cmd.canExecute()) {
-								editor.getEditingDomain().getCommandStack().execute(cmd);
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
-				}
-			}
-		});
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_Remove);
-		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_DELETE_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					MContext el = (MContext) editor.getMaster().getValue();
-					List<?> ids = ((IStructuredSelection) viewer.getSelection()).toList();
-					Command cmd = RemoveCommand.create(editor.getEditingDomain(), el, UiPackageImpl.Literals.CONTEXT__VARIABLES, ids);
-					if (cmd.canExecute()) {
-						editor.getEditingDomain().getCommandStack().execute(cmd);
-						if (el.getVariables().size() > 0) {
-							viewer.setSelection(new StructuredSelection(el.getVariables().get(0)));
-						}
-					}
-				}
-			}
-		});
-	}
-
-	public static void createBindingsWidget(Composite parent, final AbstractComponentEditor editor) {
-		Label l = new Label(parent, SWT.NONE);
-		l.setText(Messages.ControlFactory_BindingContexts);
-		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-		final Text t = new Text(parent, SWT.BORDER);
-		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		t.addKeyListener(new KeyAdapter() {
-			@Override
-			public void keyPressed(KeyEvent e) {
-				if (e.keyCode == SWT.CR || e.keyCode == SWT.LF) {
-					handleAddText(editor, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, t);
-				}
-			}
-		});
-
-		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_AddNoEllipse);
-		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				handleAddText(editor, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, t);
-			}
-		});
-
-		new Label(parent, SWT.NONE);
-
-		final TableViewer viewer = new TableViewer(parent);
-		viewer.setLabelProvider(new LabelProvider());
-		viewer.setContentProvider(new ObservableListContentProvider());
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.heightHint = 150;
-		viewer.getControl().setLayoutData(gd);
-
-		IEMFListProperty prop = EMFProperties.list(CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS);
-		viewer.setInput(prop.observeDetail(editor.getMaster()));
-
-		Composite buttonComp = new Composite(parent, SWT.NONE);
-		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		GridLayout gl = new GridLayout();
-		gl.marginLeft = 0;
-		gl.marginRight = 0;
-		gl.marginWidth = 0;
-		gl.marginHeight = 0;
-		buttonComp.setLayout(gl);
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_Up);
-		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_UP));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						MBindings container = (MBindings) editor.getMaster().getValue();
-						int idx = container.getBindingContexts().indexOf(obj) - 1;
-						if (idx >= 0) {
-							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
-
-							if (cmd.canExecute()) {
-								editor.getEditingDomain().getCommandStack().execute(cmd);
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
-				}
-			}
-		});
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_Down);
-		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_DOWN));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						MBindings container = (MBindings) editor.getMaster().getValue();
-						int idx = container.getBindingContexts().indexOf(obj) + 1;
-						if (idx < container.getBindingContexts().size()) {
-							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
-
-							if (cmd.canExecute()) {
-								editor.getEditingDomain().getCommandStack().execute(cmd);
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
-				}
-			}
-		});
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_Remove);
-		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_DELETE_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					MBindings el = (MBindings) editor.getMaster().getValue();
-					List<?> ids = ((IStructuredSelection) viewer.getSelection()).toList();
-					Command cmd = RemoveCommand.create(editor.getEditingDomain(), el, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, ids);
-					if (cmd.canExecute()) {
-						editor.getEditingDomain().getCommandStack().execute(cmd);
-						if (el.getBindingContexts().size() > 0) {
-							viewer.setSelection(new StructuredSelection(el.getBindingContexts().get(0)));
-						}
-					}
-				}
-			}
-		});
-	}
-
-	public static void createTagsWidget(Composite parent, final AbstractComponentEditor editor) {
-		Label l = new Label(parent, SWT.NONE);
-		l.setText(Messages.ControlFactory_Tags);
-		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-		final Text tagText = new Text(parent, SWT.BORDER);
-		tagText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		tagText.addKeyListener(new KeyAdapter() {
-			@Override
-			public void keyPressed(KeyEvent e) {
-				if (e.keyCode == SWT.CR || e.keyCode == SWT.LF) {
-					handleAddText(editor, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, tagText);
-				}
-			}
-		});
-
-		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_AddNoEllipse);
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				handleAddText(editor, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, tagText);
-			}
-		});
-		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-
-		new Label(parent, SWT.NONE);
-		final TableViewer viewer = new TableViewer(parent);
-		viewer.setContentProvider(new ObservableListContentProvider());
-		viewer.setLabelProvider(new LabelProvider() {
-			@Override
-			public String getText(Object element) {
-				return element.toString();
-			}
-		});
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.heightHint = 120;
-		viewer.getControl().setLayoutData(gd);
-
-		IEMFEditListProperty prop = EMFEditProperties.list(editor.getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS);
-		viewer.setInput(prop.observeDetail(editor.getMaster()));
-
-		Composite buttonComp = new Composite(parent, SWT.NONE);
-		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		GridLayout gl = new GridLayout();
-		gl.marginLeft = 0;
-		gl.marginRight = 0;
-		gl.marginWidth = 0;
-		gl.marginHeight = 0;
-		buttonComp.setLayout(gl);
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_Up);
-		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_UP));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_Down);
-		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_DOWN));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_Remove);
-		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_DELETE_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-				if (!s.isEmpty()) {
-					MApplicationElement appEl = (MApplicationElement) editor.getMaster().getValue();
-					Command cmd = RemoveCommand.create(editor.getEditingDomain(), appEl, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, s.toList());
-					if (cmd.canExecute()) {
-						editor.getEditingDomain().getCommandStack().execute(cmd);
-					}
-				}
-			}
-		});
-	}
-
 	private static void handleAddText(AbstractComponentEditor editor, EStructuralFeature feature, Text tagText) {
 		if (tagText.getText().trim().length() > 0) {
 			String[] tags = tagText.getText().split(";"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 3c0566e9dc..6788e92afe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -56,7 +56,7 @@ public class HandlerEditor extends AbstractComponentEditor {
 	private EStackLayout stackLayout;
 
 	public HandlerEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource, IProject project) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 		this.resource = resource;
 		this.project = project;
 	}
@@ -98,21 +98,21 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
@@ -122,25 +122,25 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-		
-		if( isImport ) {
-			ControlFactory.createFindImport(parent, this, context);			
+
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.HandlerEditor_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			
+
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -182,13 +182,13 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
 					dialog.open();
 				}
 			});
 		}
 
-		ControlFactory.createTagsWidget(parent, this);
+		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 49e35c8694..05c8a27716 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -330,7 +330,7 @@ public void widgetSelected(SelectionEvent e) {
 		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
-		ControlFactory.createTagsWidget(parent, this);
+		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index acec042efa..8593eb2718 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -357,7 +357,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createTagsWidget(parent, this);
+		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 6a8f0edece..33d7513cdb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -390,7 +390,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createTagsWidget(parent, this);
+		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index e9b634d624..662a124d85 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -261,7 +261,7 @@ public Object convert(Object fromObject) {
 
 		createFormSubTypeForm(parent, context, master);
 
-		ControlFactory.createTagsWidget(parent, this);
+		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 12a4911cfa..8f1d50c42e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -444,7 +444,7 @@ public String getText(Object element) {
 			column.getColumn().setWidth(200);
 		}
 
-		ControlFactory.createTagsWidget(parent, this);
+		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 81f3b23f52..00e32c6653 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -310,20 +310,23 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		// ------------------------------------------------------------
-		ControlFactory.createBindingsWidget(parent, this);
+		ControlFactory.createStringListWidget(parent, this, "Binding Contexts", CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_PersitedState);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+			GridData gd = new GridData(GridData.END, GridData.BEGINNING, false, false);
+			gd.verticalIndent = VERTICAL_LIST_WIDGET_INDENT;
+			l.setLayoutData(gd);
 
 			TableViewer tableviewer = new TableViewer(parent);
 			tableviewer.getTable().setHeaderVisible(true);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			tableviewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 80;
+			gd.verticalIndent = VERTICAL_LIST_WIDGET_INDENT;
 			tableviewer.getControl().setLayoutData(gd);
 
 			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
@@ -374,8 +377,8 @@ public String getText(Object element) {
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		}
 
-		ControlFactory.createVariablesWidget(parent, this);
-		ControlFactory.createTagsWidget(parent, this);
+		ControlFactory.createStringListWidget(parent, this, "Variables", UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index ed04e02e7e..1435e6e19e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -212,8 +212,6 @@ public String getText(Object element) {
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
 		}
 
-		ControlFactory.createTagsWidget(parent, this);
-
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartSashContainerEditor_Controls);
@@ -345,6 +343,8 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 690624b177..6c82eb7bf0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -10,14 +10,13 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -301,7 +300,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createTagsWidget(parent, this);
+		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index d20ada0abe..65528d5a34 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -371,7 +371,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createTagsWidget(parent, this);
+		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 110771590e..46f968a2fc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -272,7 +272,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createTagsWidget(parent, this);
+		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 0b0fdf2726..220e61d440 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -357,7 +357,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createTagsWidget(parent, this);
+		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 94256a0d95..9d2f9401d7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -246,7 +246,7 @@ public Object convert(Object fromObject) {
 
 		createSubTypeFormElements(parent, context, master);
 
-		ControlFactory.createTagsWidget(parent, this);
+		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 	}
 
 	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, WritableValue master) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index b9fb8c6056..d3fa9a9a11 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -324,7 +324,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createTagsWidget(parent, this);
+		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 35e393b973..f025d062a4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -311,9 +311,9 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		ControlFactory.createSelectedElement(parent, this, context, "Selected Element");
-		ControlFactory.createBindingsWidget(parent, this);
-		ControlFactory.createVariablesWidget(parent, this);
-		ControlFactory.createTagsWidget(parent, this);
+		ControlFactory.createStringListWidget(parent, this, "Binding Contexts", CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, "Variables", UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}

From 8e9841a82f120acb8a3c44f184b290d51938ee24 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 26 Jun 2010 17:17:15 +0000
Subject: [PATCH 0160/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * provide logging implementations

---
 .../internal/ContextServiceFactory.java       |  5 +++++
 .../internal/DefaultLoggerProvider.java       | 20 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index e6d3ef7682..55a4242a88 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -14,6 +14,7 @@
 import org.eclipse.e4.core.contexts.EclipseContextFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.services.contributions.IContributionFactory;
+import org.eclipse.e4.core.services.log.ILoggerProvider;
 import org.eclipse.e4.core.services.log.Logger;
 import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
 import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
@@ -90,6 +91,10 @@ public void style(Object widget) {
 				}
 			});
 			
+			if( appContext.get(ILoggerProvider.class) == null ) {
+				appContext.set(ILoggerProvider.class, ContextInjectionFactory.make(DefaultLoggerProvider.class, appContext));
+			}
+			
 			return appContext;
 		} else if( o != null && site == null ) {
 			final IEclipseContext windowContext = ((IEclipseContext)o).createChild("WindowContext("+window+")");
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
new file mode 100644
index 0000000000..b3f922b062
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
@@ -0,0 +1,20 @@
+package org.eclipse.e4.tools.compat.internal;
+
+import javax.inject.Inject;
+
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.services.log.ILoggerProvider;
+import org.eclipse.e4.core.services.log.Logger;
+import org.osgi.framework.FrameworkUtil;
+
+public class DefaultLoggerProvider implements ILoggerProvider {
+	@Inject
+	private IEclipseContext context;
+
+	public Logger getClassLogger(Class<?> clazz) {
+		IEclipseContext childContext = context.createChild();
+		childContext.set("logger.bundlename", FrameworkUtil.getBundle(clazz).getSymbolicName()); //$NON-NLS-1$
+		return (Logger) ContextInjectionFactory.make(WorkbenchLogger.class, childContext);
+	}
+}
\ No newline at end of file

From ce7d22685a5076f49600cfaa5f8a5d29a82a1a61 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 26 Jun 2010 17:21:11 +0000
Subject: [PATCH 0161/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * update to latest shadow drawing code

---
 .../emf/ui/internal/ShadowComposite.java      | 1444 +++++++----------
 1 file changed, 608 insertions(+), 836 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java
index af103a6432..d6ec1ccaa3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java
@@ -11,21 +11,48 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.custom.CTabFolderRenderer;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.PaletteData;
 import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.graphics.Region;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
 
 public class ShadowComposite extends Composite {
+
+	// ================================
+	// Dummy to not modify code
+	// ================================
+	public int marginWidth = 0;
+	public int marginHeight = 0;
+
+	ShadowComposite parent;
+
+	private int getTabHeight() {
+		return 0;
+	}
+
+	private boolean getMinimized() {
+		return false;
+	}
+
+	public static final int PART_BODY = -1;
+	public static final int PART_HEADER = -2;
+	public static final int PART_BORDER = -3;
+	public static final int PART_BACKGROUND = -4;
+
 	// Constants for circle drawing
 	final static int LEFT_TOP = 0;
 	final static int LEFT_BOTTOM = 1;
@@ -34,766 +61,185 @@ public class ShadowComposite extends Composite {
 
 	// drop shadow constants
 	final static int SIDE_DROP_WIDTH = 3;
-	final static int BOTTOM_DROP_WIDTH = 5;
+	final static int BOTTOM_DROP_WIDTH = 4;
 
 	// keylines
-	final static int OUTER_KEYLINE = 2;
-	final static int INNER_KEYLINE = 1;
-	final static int TOP_KEYLINE = 2;
+	final static int OUTER_KEYLINE = 1;
+	final static int INNER_KEYLINE = 0;
+	final static int TOP_KEYLINE = 0;
 
-	static final int CORNER_SIZE = 24;
+	// Item Constants
+	static final int ITEM_TOP_MARGIN = 2;
+	static final int ITEM_BOTTOM_MARGIN = 6;
+	static final int ITEM_LEFT_MARGIN = 4;
+	static final int ITEM_RIGHT_MARGIN = 4;
+	static final int INTERNAL_SPACING = 4;
 
-	static final String E4_SHADOW_IMAGE = "org.eclipse.e4.renderer.comp_image"; //$NON-NLS-1$
-
-	int marginWidth;
-	int marginHeight;
+	static final String E4_SHADOW_IMAGE = "org.eclipse.e4.renderer.shadowcomposite_image"; //$NON-NLS-1$
 
 	static int[] shape;
 
-	static int[] shadow = { 0x02fefefe, 0x03fefefe, 0x05fefefe, 0x06fdfdfd,
-			0x08fdfdfd, 0x0bfcfcfc, 0x0dfcfcfc, 0x10fbfbfb, 0x13fafafa,
-			0x17f9f9f9, 0x1af9f9f9, 0x1df8f8f8, 0x20f7f7f7, 0x23f6f6f6,
-			0x26f6f6f6, 0x28f5f5f5, 0x29f5f5f5, 0x2bf4f4f4, 0x2cf4f4f4,
-			0x2df4f4f4, 0x2df4f4f4, 0x2ef4f4f4, 0x2ef4f4f4, 0x2ef4f4f4,
-			0x2ff4f4f4, 0x2ff3f3f3, 0x2ff3f3f3, 0x2ff3f3f3, 0x2ff3f3f3,
-			0x2ff3f3f3, 0x2ff3f3f3, 0x2ff3f3f3, 0x2ff3f3f3, 0x2ff3f3f3,
-			0x2ff3f3f3, 0x2ff4f4f4, 0x2ef4f4f4, 0x2ef4f4f4, 0x2ef4f4f4,
-			0x2df4f4f4, 0x2df4f4f4, 0x2cf4f4f4, 0x2bf4f4f4, 0x29f5f5f5,
-			0x28f5f5f5, 0x26f6f6f6, 0x23f6f6f6, 0x20f7f7f7, 0x1df8f8f8,
-			0x1af9f9f9, 0x17f9f9f9, 0x13fafafa, 0x10fbfbfb, 0x0dfcfcfc,
-			0x0bfcfcfc, 0x08fdfdfd, 0x06fdfdfd, 0x05fefefe, 0x03fefefe,
-			0x02fefefe, 0x03fefefe, 0x05fefefe, 0x07fdfdfd, 0x09fdfdfd,
-			0x0cfcfcfc, 0x0ffbfbfb, 0x13fafafa, 0x17f9f9f9, 0x1bf8f8f8,
-			0x1ff7f7f7, 0x23f6f6f6, 0x27f5f5f5, 0x2bf4f4f4, 0x2ff3f3f3,
-			0x32f3f3f3, 0x35f2f2f2, 0x37f1f1f1, 0x39f1f1f1, 0x3af1f1f1,
-			0x3bf0f0f0, 0x3cf0f0f0, 0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0,
-			0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0,
-			0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0,
-			0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0, 0x3df0f0f0,
-			0x3cf0f0f0, 0x3bf0f0f0, 0x3af1f1f1, 0x39f1f1f1, 0x37f1f1f1,
-			0x35f2f2f2, 0x32f3f3f3, 0x2ff3f3f3, 0x2bf4f4f4, 0x27f5f5f5,
-			0x23f6f6f6, 0x1ff7f7f7, 0x1bf8f8f8, 0x17f9f9f9, 0x13fafafa,
-			0x0ffbfbfb, 0x0cfcfcfc, 0x09fdfdfd, 0x07fdfdfd, 0x05fefefe,
-			0x03fefefe, 0x05fefefe, 0x07fdfdfd, 0x09fdfdfd, 0x0dfcfcfc,
-			0x10fbfbfb, 0x15fafafa, 0x19f9f9f9, 0x1ef8f8f8, 0x24f6f6f6,
-			0x29f5f5f5, 0x2ff4f4f4, 0x34f2f2f2, 0x39f1f1f1, 0x3df0f0f0,
-			0x41efefef, 0x44eeeeee, 0x47ededed, 0x49ededed, 0x4bededed,
-			0x4cececec, 0x4dececec, 0x4dececec, 0x4eececec, 0x4eececec,
-			0x4eececec, 0x4eececec, 0x4eececec, 0x4fececec, 0x4fececec,
-			0x4fececec, 0x4fececec, 0x4fececec, 0x4fececec, 0x4eececec,
-			0x4eececec, 0x4eececec, 0x4eececec, 0x4eececec, 0x4dececec,
-			0x4dececec, 0x4cececec, 0x4bededed, 0x49ededed, 0x47ededed,
-			0x44eeeeee, 0x41efefef, 0x3df0f0f0, 0x39f1f1f1, 0x34f2f2f2,
-			0x2ff4f4f4, 0x29f5f5f5, 0x24f6f6f6, 0x1ef8f8f8, 0x19f9f9f9,
-			0x15fafafa, 0x10fbfbfb, 0x0dfcfcfc, 0x09fdfdfd, 0x07fdfdfd,
-			0x05fefefe, 0x07fdfdfd, 0x09fdfdfd, 0x0dfcfcfc, 0x11fbfbfb,
-			0x16fafafa, 0x1bf8f8f8, 0x21f7f7f7, 0x27f5f5f5, 0x2ef4f4f4,
-			0x35f2f2f2, 0x3cf0f0f0, 0x42efefef, 0x48ededed, 0x4dececec,
-			0x51ebebeb, 0x55eaeaea, 0x58e9e9e9, 0x5be9e9e9, 0x5de8e8e8,
-			0x5ee8e8e8, 0x5fe7e7e7, 0x60e7e7e7, 0x61e7e7e7, 0x61e7e7e7,
-			0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7,
-			0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7,
-			0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x60e7e7e7,
-			0x5fe7e7e7, 0x5ee8e8e8, 0x5de8e8e8, 0x5be9e9e9, 0x58e9e9e9,
-			0x55eaeaea, 0x51ebebeb, 0x4dececec, 0x48ededed, 0x42efefef,
-			0x3cf0f0f0, 0x35f2f2f2, 0x2ef4f4f4, 0x27f5f5f5, 0x21f7f7f7,
-			0x1bf8f8f8, 0x16fafafa, 0x11fbfbfb, 0x0dfcfcfc, 0x09fdfdfd,
-			0x07fdfdfd, 0x09fdfdfd, 0x0dfcfcfc, 0x11fbfbfb, 0x16fafafa,
-			0x1cf8f8f8, 0x23f6f6f6, 0x2af5f5f5, 0x32f3f3f3, 0x3af1f1f1,
-			0x42efefef, 0x4aededed, 0x51ebebeb, 0x58e9e9e9, 0x5ee8e8e8,
-			0x64e6e6e6, 0x68e5e5e5, 0x6ce4e4e4, 0x6ee4e4e4, 0x70e3e3e3,
-			0x72e3e3e3, 0x73e3e3e3, 0x74e2e2e2, 0x75e2e2e2, 0x75e2e2e2,
-			0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2,
-			0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2,
-			0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x74e2e2e2,
-			0x73e3e3e3, 0x72e3e3e3, 0x70e3e3e3, 0x6ee4e4e4, 0x6ce4e4e4,
-			0x68e5e5e5, 0x64e6e6e6, 0x5ee8e8e8, 0x58e9e9e9, 0x51ebebeb,
-			0x4aededed, 0x42efefef, 0x3af1f1f1, 0x32f3f3f3, 0x2af5f5f5,
-			0x23f6f6f6, 0x1cf8f8f8, 0x16fafafa, 0x11fbfbfb, 0x0dfcfcfc,
-			0x09fdfdfd, 0x0cfcfcfc, 0x10fbfbfb, 0x16fafafa, 0x1cf8f8f8,
-			0x23f6f6f6, 0x2cf4f4f4, 0x35f2f2f2, 0x3ef0f0f0, 0x48ededed,
-			0x51ebebeb, 0x5ae9e9e9, 0x62e7e7e7, 0x6ae5e5e5, 0x71e3e3e3,
-			0x77e2e2e2, 0x7be1e1e1, 0x7fe0e0e0, 0x82dfdfdf, 0x85dedede,
-			0x86dedede, 0x88dedede, 0x88dddddd, 0x89dddddd, 0x89dddddd,
-			0x89dddddd, 0x8adddddd, 0x8adddddd, 0x8adddddd, 0x8adddddd,
-			0x8adddddd, 0x8adddddd, 0x8adddddd, 0x8adddddd, 0x8adddddd,
-			0x8adddddd, 0x89dddddd, 0x89dddddd, 0x89dddddd, 0x88dddddd,
-			0x88dedede, 0x86dedede, 0x85dedede, 0x82dfdfdf, 0x7fe0e0e0,
-			0x7be1e1e1, 0x77e2e2e2, 0x71e3e3e3, 0x6ae5e5e5, 0x62e7e7e7,
-			0x5ae9e9e9, 0x51ebebeb, 0x48ededed, 0x3ef0f0f0, 0x35f2f2f2,
-			0x2cf4f4f4, 0x23f6f6f6, 0x1cf8f8f8, 0x16fafafa, 0x10fbfbfb,
-			0x0cfcfcfc, 0x0ffbfbfb, 0x14fafafa, 0x1bf8f8f8, 0x23f6f6f6,
-			0x2cf4f4f4, 0x35f2f2f2, 0x40efefef, 0x4bededed, 0x56eaeaea,
-			0x60e7e7e7, 0x6ae5e5e5, 0x74e2e2e2, 0x7ce0e0e0, 0x83dfdfdf,
-			0x8adddddd, 0x8fdcdcdc, 0x93dbdbdb, 0x96dadada, 0x98d9d9d9,
-			0x9ad9d9d9, 0x9bd9d9d9, 0x9cd8d8d8, 0x9dd8d8d8, 0x9dd8d8d8,
-			0x9dd8d8d8, 0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8,
-			0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8,
-			0x9ed8d8d8, 0x9dd8d8d8, 0x9dd8d8d8, 0x9dd8d8d8, 0x9cd8d8d8,
-			0x9bd9d9d9, 0x9ad9d9d9, 0x98d9d9d9, 0x96dadada, 0x93dbdbdb,
-			0x8fdcdcdc, 0x8adddddd, 0x83dfdfdf, 0x7ce0e0e0, 0x74e2e2e2,
-			0x6ae5e5e5, 0x60e7e7e7, 0x56eaeaea, 0x4bededed, 0x40efefef,
-			0x35f2f2f2, 0x2cf4f4f4, 0x23f6f6f6, 0x1bf8f8f8, 0x14fafafa,
-			0x0ffbfbfb, 0x13fafafa, 0x19f9f9f9, 0x21f7f7f7, 0x2af5f5f5,
-			0x35f2f2f2, 0x40efefef, 0x4cececec, 0x58e9e9e9, 0x64e6e6e6,
-			0x70e3e3e3, 0x7be1e1e1, 0x85dedede, 0x8edcdcdc, 0x96dadada,
-			0x9cd8d8d8, 0xa2d7d7d7, 0xa6d6d6d6, 0xa9d5d5d5, 0xabd5d5d5,
-			0xadd4d4d4, 0xaed4d4d4, 0xafd4d4d4, 0xb0d4d4d4, 0xb0d3d3d3,
-			0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3,
-			0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3,
-			0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d4d4d4, 0xafd4d4d4,
-			0xaed4d4d4, 0xadd4d4d4, 0xabd5d5d5, 0xa9d5d5d5, 0xa6d6d6d6,
-			0xa2d7d7d7, 0x9cd8d8d8, 0x96dadada, 0x8edcdcdc, 0x85dedede,
-			0x7be1e1e1, 0x70e3e3e3, 0x64e6e6e6, 0x58e9e9e9, 0x4cececec,
-			0x40efefef, 0x35f2f2f2, 0x2af5f5f5, 0x21f7f7f7, 0x19f9f9f9,
-			0x13fafafa, 0x16f9f9f9, 0x1ef8f8f8, 0x27f5f5f5, 0x32f3f3f3,
-			0x3ef0f0f0, 0x4bededed, 0x58e9e9e9, 0x66e6e6e6, 0x73e3e3e3,
-			0x80dfdfdf, 0x8bdddddd, 0x96dadada, 0x9fd8d8d8, 0xa7d6d6d6,
-			0xaed4d4d4, 0xb3d3d3d3, 0xb7d2d2d2, 0xbad1d1d1, 0xbdd0d0d0,
-			0xbed0d0d0, 0xc0d0d0d0, 0xc0cfcfcf, 0xc1cfcfcf, 0xc1cfcfcf,
-			0xc1cfcfcf, 0xc1cfcfcf, 0xc1cfcfcf, 0xc2cfcfcf, 0xc2cfcfcf,
-			0xc2cfcfcf, 0xc2cfcfcf, 0xc2cfcfcf, 0xc2cfcfcf, 0xc1cfcfcf,
-			0xc1cfcfcf, 0xc1cfcfcf, 0xc1cfcfcf, 0xc1cfcfcf, 0xc0cfcfcf,
-			0xc0d0d0d0, 0xbed0d0d0, 0xbdd0d0d0, 0xbad1d1d1, 0xb7d2d2d2,
-			0xb3d3d3d3, 0xaed4d4d4, 0xa7d6d6d6, 0x9fd8d8d8, 0x96dadada,
-			0x8bdddddd, 0x80dfdfdf, 0x73e3e3e3, 0x66e6e6e6, 0x58e9e9e9,
-			0x4bededed, 0x3ef0f0f0, 0x32f3f3f3, 0x27f5f5f5, 0x1ef8f8f8,
-			0x16f9f9f9, 0x1bf8f8f8, 0x24f6f6f6, 0x2ef4f4f4, 0x3af1f1f1,
-			0x47ededed, 0x56eaeaea, 0x64e6e6e6, 0x73e3e3e3, 0x81dfdfdf,
-			0x8fdcdcdc, 0x9bd9d9d9, 0xa6d6d6d6, 0xafd4d4d4, 0xb7d2d2d2,
-			0xbed0d0d0, 0xc3cfcfcf, 0xc7cecece, 0xcacdcdcd, 0xcccdcdcd,
-			0xcecccccc, 0xcfcccccc, 0xcfcccccc, 0xd0cccccc, 0xd0cccccc,
-			0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc,
-			0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc,
-			0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xcfcccccc,
-			0xcfcccccc, 0xcecccccc, 0xcccdcdcd, 0xcacdcdcd, 0xc7cecece,
-			0xc3cfcfcf, 0xbed0d0d0, 0xb7d2d2d2, 0xafd4d4d4, 0xa6d6d6d6,
-			0x9bd9d9d9, 0x8fdcdcdc, 0x81dfdfdf, 0x73e3e3e3, 0x64e6e6e6,
-			0x56eaeaea, 0x47ededed, 0x3af1f1f1, 0x2ef4f4f4, 0x24f6f6f6,
-			0x1bf8f8f8, 0x1ff7f7f7, 0x29f5f5f5, 0x35f2f2f2, 0x42efefef,
-			0x51ebebeb, 0x60e7e7e7, 0x70e3e3e3, 0x80dfdfdf, 0x8fdcdcdc,
-			0x9cd8d8d8, 0xa9d5d5d5, 0xb4d2d2d2, 0xbdd0d0d0, 0xc5cecece,
-			0xcbcdcdcd, 0xd0cccccc, 0xd4cbcbcb, 0xd7cacaca, 0xd9c9c9c9,
-			0xdac9c9c9, 0xdbc9c9c9, 0xdcc9c9c9, 0xdcc9c9c9, 0xdcc9c9c9,
-			0xddc9c9c9, 0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8,
-			0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8,
-			0xddc8c8c8, 0xddc9c9c9, 0xdcc9c9c9, 0xdcc9c9c9, 0xdcc9c9c9,
-			0xdbc9c9c9, 0xdac9c9c9, 0xd9c9c9c9, 0xd7cacaca, 0xd4cbcbcb,
-			0xd0cccccc, 0xcbcdcdcd, 0xc5cecece, 0xbdd0d0d0, 0xb4d2d2d2,
-			0xa9d5d5d5, 0x9cd8d8d8, 0x8fdcdcdc, 0x80dfdfdf, 0x70e3e3e3,
-			0x60e7e7e7, 0x51ebebeb, 0x42efefef, 0x35f2f2f2, 0x29f5f5f5,
-			0x1ff7f7f7, 0x23f6f6f6, 0x2ff4f4f4, 0x3bf0f0f0, 0x4aededed,
-			0x5ae9e9e9, 0x6ae5e5e5, 0x7be0e0e0, 0x8bdcdcdc, 0x9bd9d9d9,
-			0xa9d5d5d5, 0xb6d2d2d2, 0xc0cfcfcf, 0xcacdcdcd, 0xd1cbcbcb,
-			0xd7cacaca, 0xdcc9c9c9, 0xdfc8c8c8, 0xe1c7c7c7, 0xe3c7c7c7,
-			0xe5c7c7c7, 0xe5c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6,
-			0xe6c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6,
-			0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6,
-			0xe7c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6,
-			0xe5c6c6c6, 0xe5c7c7c7, 0xe3c7c7c7, 0xe1c7c7c7, 0xdfc8c8c8,
-			0xdcc9c9c9, 0xd7cacaca, 0xd1cbcbcb, 0xcacdcdcd, 0xc0cfcfcf,
-			0xb6d2d2d2, 0xa9d5d5d5, 0x9bd9d9d9, 0x8bdcdcdc, 0x7be0e0e0,
-			0x6ae5e5e5, 0x5ae9e9e9, 0x4aededed, 0x3bf0f0f0, 0x2ff4f4f4,
-			0x23f6f6f6, 0x27f5f5f5, 0x34f2f2f2, 0x42efefef, 0x51ebebeb,
-			0x62e7e7e7, 0x74e2e2e2, 0x85dedede, 0x96dadada, 0xa6d6d6d6,
-			0xb4d2d2d2, 0xc1cfcfcf, 0xcbcdcdcd, 0xd4cbcbcb, 0xdbc9c9c9,
-			0xe0c8c8c8, 0xe5c7c7c7, 0xe8c6c6c6, 0xeac5c5c5, 0xecc5c5c5,
-			0xedc5c5c5, 0xedc4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4,
-			0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4,
-			0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4,
-			0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4,
-			0xedc4c4c4, 0xedc5c5c5, 0xecc5c5c5, 0xeac5c5c5, 0xe8c6c6c6,
-			0xe5c7c7c7, 0xe0c8c8c8, 0xdbc9c9c9, 0xd4cbcbcb, 0xcbcdcdcd,
-			0xc1cfcfcf, 0xb4d2d2d2, 0xa6d6d6d6, 0x96dadada, 0x85dedede,
-			0x74e2e2e2, 0x62e7e7e7, 0x51ebebeb, 0x42efefef, 0x34f2f2f2,
-			0x27f5f5f5, 0x2bf4f4f4, 0x39f1f1f1, 0x47ededed, 0x58e9e9e9,
-			0x6ae5e5e5, 0x7ce0e0e0, 0x8edcdcdc, 0x9fd8d8d8, 0xafd4d4d4,
-			0xbdd0d0d0, 0xcacdcdcd, 0xd4cbcbcb, 0xdcc9c9c9, 0xe3c7c7c7,
-			0xe8c6c6c6, 0xecc5c5c5, 0xefc4c4c4, 0xf0c4c4c4, 0xf2c3c3c3,
-			0xf3c3c3c3, 0xf3c3c3c3, 0xf3c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3,
-			0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3,
-			0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3,
-			0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf3c3c3c3,
-			0xf3c3c3c3, 0xf3c3c3c3, 0xf2c3c3c3, 0xf0c4c4c4, 0xefc4c4c4,
-			0xecc5c5c5, 0xe8c6c6c6, 0xe3c7c7c7, 0xdcc9c9c9, 0xd4cbcbcb,
-			0xcacdcdcd, 0xbdd0d0d0, 0xafd4d4d4, 0x9fd8d8d8, 0x8edcdcdc,
-			0x7ce0e0e0, 0x6ae5e5e5, 0x58e9e9e9, 0x47ededed, 0x39f1f1f1,
-			0x2bf4f4f4, 0x2ff4f4f4, 0x3df0f0f0, 0x4dececec, 0x5ee8e8e8,
-			0x71e3e3e3, 0x84dfdfdf, 0x96dadada, 0xa7d6d6d6, 0xb7d2d2d2,
-			0xc5cecece, 0xd1cbcbcb, 0xdbc9c9c9, 0xe3c7c7c7, 0xe9c6c6c6,
-			0xeec4c4c4, 0xf1c4c4c4, 0xf4c3c3c3, 0xf5c2c2c2, 0xf6c2c2c2,
-			0xf7c2c2c2, 0xf7c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2,
-			0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2,
-			0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2,
-			0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2,
-			0xf7c2c2c2, 0xf7c2c2c2, 0xf6c2c2c2, 0xf5c2c2c2, 0xf4c3c3c3,
-			0xf1c4c4c4, 0xeec4c4c4, 0xe9c6c6c6, 0xe3c7c7c7, 0xdbc9c9c9,
-			0xd1cbcbcb, 0xc5cecece, 0xb7d2d2d2, 0xa7d6d6d6, 0x96dadada,
-			0x84dfdfdf, 0x71e3e3e3, 0x5ee8e8e8, 0x4dececec, 0x3df0f0f0,
-			0x2ff4f4f4, 0x32f3f3f3, 0x41efefef, 0x51ebebeb, 0x63e6e6e6,
-			0x77e2e2e2, 0x8adddddd, 0x9cd8d8d8, 0xaed4d4d4, 0xbdd0d0d0,
-			0xcbcdcdcd, 0xd7cacaca, 0xe0c7c7c7, 0xe8c6c6c6, 0xeec4c4c4,
-			0xf2c3c3c3, 0xf5c3c3c3, 0xf7c2c2c2, 0xf8c2c2c2, 0xf9c1c1c1,
-			0xfac1c1c1, 0xfac1c1c1, 0xfac1c1c1, 0xfbc1c1c1, 0xfbc1c1c1,
-			0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1,
-			0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1,
-			0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfac1c1c1,
-			0xfac1c1c1, 0xfac1c1c1, 0xf9c1c1c1, 0xf8c2c2c2, 0xf7c2c2c2,
-			0xf5c3c3c3, 0xf2c3c3c3, 0xeec4c4c4, 0xe8c6c6c6, 0xe0c7c7c7,
-			0xd7cacaca, 0xcbcdcdcd, 0xbdd0d0d0, 0xaed4d4d4, 0x9cd8d8d8,
-			0x8adddddd, 0x77e2e2e2, 0x63e6e6e6, 0x51ebebeb, 0x41efefef,
-			0x32f3f3f3, 0x34f2f2f2, 0x44eeeeee, 0x55eaeaea, 0x68e5e5e5,
-			0x7be1e1e1, 0x8fdcdcdc, 0xa1d7d7d7, 0xb3d3d3d3, 0xc2cfcfcf,
-			0xd0cbcbcb, 0xdcc9c9c9, 0xe4c6c6c6, 0xecc5c5c5, 0xf1c4c4c4,
-			0xf5c3c3c3, 0xf8c2c2c2, 0xfac1c1c1, 0xfac1c1c1, 0xfcc1c1c1,
-			0xfcc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1,
-			0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1,
-			0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1,
-			0xfdc1c1c1, 0xfdc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1,
-			0xfcc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1, 0xfac1c1c1, 0xfac1c1c1,
-			0xf8c2c2c2, 0xf5c3c3c3, 0xf1c4c4c4, 0xecc5c5c5, 0xe4c6c6c6,
-			0xdcc9c9c9, 0xd0cbcbcb, 0xc2cfcfcf, 0xb3d3d3d3, 0xa1d7d7d7,
-			0x8fdcdcdc, 0x7be1e1e1, 0x68e5e5e5, 0x55eaeaea, 0x44eeeeee,
-			0x34f2f2f2, 0x37f2f2f2, 0x47eeeeee, 0x58e9e9e9, 0x6be4e4e4,
-			0x7fe0e0e0, 0x93dbdbdb, 0xa5d6d6d6, 0xb7d2d2d2, 0xc6cecece,
-			0xd4cacaca, 0xdfc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf3c3c3c3,
-			0xf7c2c2c2, 0xfac2c2c2, 0xfbc1c1c1, 0xfcc1c1c1, 0xfdc0c0c0,
-			0xfdc0c0c0, 0xfdc0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc0c0c0, 0xfdc0c0c0, 0xfdc0c0c0, 0xfcc1c1c1, 0xfbc1c1c1,
-			0xfac2c2c2, 0xf7c2c2c2, 0xf3c3c3c3, 0xeec4c4c4, 0xe7c6c6c6,
-			0xdfc8c8c8, 0xd4cacaca, 0xc6cecece, 0xb7d2d2d2, 0xa5d6d6d6,
-			0x93dbdbdb, 0x7fe0e0e0, 0x6be4e4e4, 0x58e9e9e9, 0x47eeeeee,
-			0x37f2f2f2, 0x38f1f1f1, 0x49ededed, 0x5be9e9e9, 0x6ee4e4e4,
-			0x82dfdfdf, 0x96dadada, 0xa9d5d5d5, 0xbbd1d1d1, 0xc9cecece,
-			0xd7cacaca, 0xe2c7c7c7, 0xeac5c5c5, 0xf0c4c4c4, 0xf5c3c3c3,
-			0xf9c2c2c2, 0xfbc1c1c1, 0xfcc0c0c0, 0xfdc0c0c0, 0xfec0c0c0,
-			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfdc0c0c0, 0xfcc0c0c0,
-			0xfbc1c1c1, 0xf9c2c2c2, 0xf5c3c3c3, 0xf0c4c4c4, 0xeac5c5c5,
-			0xe2c7c7c7, 0xd7cacaca, 0xc9cecece, 0xbbd1d1d1, 0xa9d5d5d5,
-			0x96dadada, 0x82dfdfdf, 0x6ee4e4e4, 0x5be9e9e9, 0x49ededed,
-			0x38f1f1f1, 0x3af1f1f1, 0x4bededed, 0x5de8e8e8, 0x70e3e3e3,
-			0x85dedede, 0x99d9d9d9, 0xabd4d4d4, 0xbdd0d0d0, 0xcccdcdcd,
-			0xd9c9c9c9, 0xe4c7c7c7, 0xebc5c5c5, 0xf2c4c4c4, 0xf6c2c2c2,
-			0xfac1c1c1, 0xfcc1c1c1, 0xfdc0c0c0, 0xfdc0c0c0, 0xfec0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfdc0c0c0, 0xfdc0c0c0,
-			0xfcc1c1c1, 0xfac1c1c1, 0xf6c2c2c2, 0xf2c4c4c4, 0xebc5c5c5,
-			0xe4c7c7c7, 0xd9c9c9c9, 0xcccdcdcd, 0xbdd0d0d0, 0xabd4d4d4,
-			0x99d9d9d9, 0x85dedede, 0x70e3e3e3, 0x5de8e8e8, 0x4bededed,
-			0x3af1f1f1, 0x3bf1f1f1, 0x4cededed, 0x5ee8e8e8, 0x72e3e3e3,
-			0x87dedede, 0x9ad9d9d9, 0xadd4d4d4, 0xbfd0d0d0, 0xcdcdcdcd,
-			0xdac9c9c9, 0xe5c7c7c7, 0xecc4c4c4, 0xf3c3c3c3, 0xf7c2c2c2,
-			0xfac1c1c1, 0xfcc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfcc1c1c1, 0xfac1c1c1, 0xf7c2c2c2, 0xf3c3c3c3, 0xecc4c4c4,
-			0xe5c7c7c7, 0xdac9c9c9, 0xcdcdcdcd, 0xbfd0d0d0, 0xadd4d4d4,
-			0x9ad9d9d9, 0x87dedede, 0x72e3e3e3, 0x5ee8e8e8, 0x4cededed,
-			0x3bf1f1f1, 0x3cf0f0f0, 0x4dececec, 0x5fe7e7e7, 0x73e3e3e3,
-			0x88dedede, 0x9cd9d9d9, 0xaed4d4d4, 0xc0cfcfcf, 0xcecccccc,
-			0xdbc8c8c8, 0xe6c6c6c6, 0xedc4c4c4, 0xf3c3c3c3, 0xf7c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf7c2c2c2, 0xf3c3c3c3, 0xedc4c4c4,
-			0xe6c6c6c6, 0xdbc8c8c8, 0xcecccccc, 0xc0cfcfcf, 0xaed4d4d4,
-			0x9cd9d9d9, 0x88dedede, 0x73e3e3e3, 0x5fe7e7e7, 0x4dececec,
-			0x3cf0f0f0, 0x3cf0f0f0, 0x4eececec, 0x60e7e7e7, 0x74e2e2e2,
-			0x89dddddd, 0x9dd8d8d8, 0xafd3d3d3, 0xc1cfcfcf, 0xcfcccccc,
-			0xdcc8c8c8, 0xe6c6c6c6, 0xedc4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xedc4c4c4,
-			0xe6c6c6c6, 0xdcc8c8c8, 0xcfcccccc, 0xc1cfcfcf, 0xafd3d3d3,
-			0x9dd8d8d8, 0x89dddddd, 0x74e2e2e2, 0x60e7e7e7, 0x4eececec,
-			0x3cf0f0f0, 0x3cf0f0f0, 0x4eececec, 0x60e7e7e7, 0x74e2e2e2,
-			0x89dddddd, 0x9dd8d8d8, 0xafd3d3d3, 0xc1cfcfcf, 0xcfcccccc,
-			0xdcc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
-			0xe7c6c6c6, 0xdcc8c8c8, 0xcfcccccc, 0xc1cfcfcf, 0xafd3d3d3,
-			0x9dd8d8d8, 0x89dddddd, 0x74e2e2e2, 0x60e7e7e7, 0x4eececec,
-			0x3cf0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
-			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
-			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
-			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
-			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
-			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
-			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
-			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
-			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
-			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
-			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
-			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
-			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
-			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
-			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
-			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
-			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
-			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
-			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
-			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
-			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
-			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
-			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
-			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
-			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
-			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
-			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
-			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
-			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
-			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
-			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
-			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
-			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
-			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
-			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
-			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
-			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
-			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
-			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
-			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
-			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
-			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
-			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
-			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
-			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
-			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
-			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
-			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
-			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
-			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
-			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
-			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
-			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
-			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
-			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
-			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
-			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
-			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
-			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
-			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
-			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
-			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
-			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
-			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
-			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
-			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
-			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
-			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
-			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
-			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
-			0x3df0f0f0, 0x3df0f0f0, 0x4fececec, 0x61e7e7e7, 0x75e2e2e2,
-			0x8adddddd, 0x9ed8d8d8, 0xb0d3d3d3, 0xc2cfcfcf, 0xd0cccccc,
-			0xddc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
-			0xe7c6c6c6, 0xddc8c8c8, 0xd0cccccc, 0xc2cfcfcf, 0xb0d3d3d3,
-			0x9ed8d8d8, 0x8adddddd, 0x75e2e2e2, 0x61e7e7e7, 0x4fececec,
-			0x3df0f0f0, 0x3cf0f0f0, 0x4eececec, 0x60e7e7e7, 0x74e2e2e2,
-			0x89dddddd, 0x9dd8d8d8, 0xafd3d3d3, 0xc1cfcfcf, 0xcfcccccc,
-			0xdcc8c8c8, 0xe7c6c6c6, 0xeec4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xeec4c4c4,
-			0xe7c6c6c6, 0xdcc8c8c8, 0xcfcccccc, 0xc1cfcfcf, 0xafd3d3d3,
-			0x9dd8d8d8, 0x89dddddd, 0x74e2e2e2, 0x60e7e7e7, 0x4eececec,
-			0x3cf0f0f0, 0x3cf0f0f0, 0x4eececec, 0x60e7e7e7, 0x74e2e2e2,
-			0x89dddddd, 0x9dd8d8d8, 0xafd3d3d3, 0xc1cfcfcf, 0xcfcccccc,
-			0xdcc8c8c8, 0xe6c6c6c6, 0xedc4c4c4, 0xf4c3c3c3, 0xf8c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf8c2c2c2, 0xf4c3c3c3, 0xedc4c4c4,
-			0xe6c6c6c6, 0xdcc8c8c8, 0xcfcccccc, 0xc1cfcfcf, 0xafd3d3d3,
-			0x9dd8d8d8, 0x89dddddd, 0x74e2e2e2, 0x60e7e7e7, 0x4eececec,
-			0x3cf0f0f0, 0x3cf0f0f0, 0x4dececec, 0x5fe8e8e8, 0x73e3e3e3,
-			0x88dedede, 0x9cd9d9d9, 0xaed4d4d4, 0xc0d0d0d0, 0xcecccccc,
-			0xdbc8c8c8, 0xe6c6c6c6, 0xedc4c4c4, 0xf3c3c3c3, 0xf7c2c2c2,
-			0xfbc1c1c1, 0xfdc1c1c1, 0xfec0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfdc1c1c1, 0xfbc1c1c1, 0xf7c2c2c2, 0xf3c3c3c3, 0xedc4c4c4,
-			0xe6c6c6c6, 0xdbc8c8c8, 0xcecccccc, 0xc0d0d0d0, 0xaed4d4d4,
-			0x9cd9d9d9, 0x88dedede, 0x73e3e3e3, 0x5fe8e8e8, 0x4dececec,
-			0x3cf0f0f0, 0x3bf1f1f1, 0x4cededed, 0x5ee8e8e8, 0x72e3e3e3,
-			0x86dedede, 0x9ad9d9d9, 0xadd4d4d4, 0xbfd0d0d0, 0xcdcdcdcd,
-			0xdac9c9c9, 0xe5c7c7c7, 0xecc4c4c4, 0xf2c3c3c3, 0xf7c2c2c2,
-			0xfac1c1c1, 0xfcc1c1c1, 0xfdc0c0c0, 0xfec0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0,
-			0xffc0c0c0, 0xffc0c0c0, 0xffc0c0c0, 0xfec0c0c0, 0xfdc0c0c0,
-			0xfcc1c1c1, 0xfac1c1c1, 0xf7c2c2c2, 0xf2c3c3c3, 0xecc4c4c4,
-			0xe5c7c7c7, 0xdac9c9c9, 0xcdcdcdcd, 0xbfd0d0d0, 0xadd4d4d4,
-			0x9ad9d9d9, 0x86dedede, 0x72e3e3e3, 0x5ee8e8e8, 0x4cededed,
-			0x3bf1f1f1, 0x3af1f1f1, 0x4bededed, 0x5de8e8e8, 0x70e3e3e3,
-			0x85dedede, 0x99d9d9d9, 0xabd4d4d4, 0xbdd0d0d0, 0xcbcdcdcd,
-			0xd9c9c9c9, 0xe3c7c7c7, 0xebc5c5c5, 0xf1c4c4c4, 0xf6c3c3c3,
-			0xf9c1c1c1, 0xfcc1c1c1, 0xfdc0c0c0, 0xfdc0c0c0, 0xfec0c0c0,
-			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfdc0c0c0, 0xfdc0c0c0,
-			0xfcc1c1c1, 0xf9c1c1c1, 0xf6c3c3c3, 0xf1c4c4c4, 0xebc5c5c5,
-			0xe3c7c7c7, 0xd9c9c9c9, 0xcbcdcdcd, 0xbdd0d0d0, 0xabd4d4d4,
-			0x99d9d9d9, 0x85dedede, 0x70e3e3e3, 0x5de8e8e8, 0x4bededed,
-			0x3af1f1f1, 0x38f1f1f1, 0x49ededed, 0x5be9e9e9, 0x6ee4e4e4,
-			0x82dfdfdf, 0x96dadada, 0xa8d5d5d5, 0xbad1d1d1, 0xc9cecece,
-			0xd7cacaca, 0xe1c7c7c7, 0xe9c5c5c5, 0xf0c4c4c4, 0xf4c3c3c3,
-			0xf8c2c2c2, 0xfac2c2c2, 0xfcc1c1c1, 0xfcc0c0c0, 0xfdc0c0c0,
-			0xfdc0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0, 0xfec0c0c0,
-			0xfec0c0c0, 0xfdc0c0c0, 0xfdc0c0c0, 0xfcc0c0c0, 0xfcc1c1c1,
-			0xfac2c2c2, 0xf8c2c2c2, 0xf4c3c3c3, 0xf0c4c4c4, 0xe9c5c5c5,
-			0xe1c7c7c7, 0xd7cacaca, 0xc9cecece, 0xbad1d1d1, 0xa8d5d5d5,
-			0x96dadada, 0x82dfdfdf, 0x6ee4e4e4, 0x5be9e9e9, 0x49ededed,
-			0x38f1f1f1, 0x37f2f2f2, 0x47eeeeee, 0x58e9e9e9, 0x6be5e5e5,
-			0x7fe0e0e0, 0x93dbdbdb, 0xa5d6d6d6, 0xb7d2d2d2, 0xc6cecece,
-			0xd3cacaca, 0xdec8c8c8, 0xe7c6c6c6, 0xeec5c5c5, 0xf2c3c3c3,
-			0xf6c2c2c2, 0xf9c2c2c2, 0xfac1c1c1, 0xfbc1c1c1, 0xfcc1c1c1,
-			0xfcc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1, 0xfdc1c1c1,
-			0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1,
-			0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1,
-			0xfdc1c1c1, 0xfdc1c1c1, 0xfdc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1,
-			0xfcc1c1c1, 0xfcc1c1c1, 0xfcc1c1c1, 0xfbc1c1c1, 0xfac1c1c1,
-			0xf9c2c2c2, 0xf6c2c2c2, 0xf2c3c3c3, 0xeec5c5c5, 0xe7c6c6c6,
-			0xdec8c8c8, 0xd3cacaca, 0xc6cecece, 0xb7d2d2d2, 0xa5d6d6d6,
-			0x93dbdbdb, 0x7fe0e0e0, 0x6be5e5e5, 0x58e9e9e9, 0x47eeeeee,
-			0x37f2f2f2, 0x34f2f2f2, 0x44eeeeee, 0x55eaeaea, 0x67e5e5e5,
-			0x7be1e1e1, 0x8edcdcdc, 0xa1d7d7d7, 0xb3d3d3d3, 0xc2cfcfcf,
-			0xcfcccccc, 0xdbc9c9c9, 0xe3c7c7c7, 0xeac5c5c5, 0xf0c4c4c4,
-			0xf3c3c3c3, 0xf6c3c3c3, 0xf8c2c2c2, 0xf9c1c1c1, 0xfac1c1c1,
-			0xfac1c1c1, 0xfac1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1,
-			0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1,
-			0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1,
-			0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1, 0xfbc1c1c1,
-			0xfac1c1c1, 0xfac1c1c1, 0xfac1c1c1, 0xf9c1c1c1, 0xf8c2c2c2,
-			0xf6c3c3c3, 0xf3c3c3c3, 0xf0c4c4c4, 0xeac5c5c5, 0xe3c7c7c7,
-			0xdbc9c9c9, 0xcfcccccc, 0xc2cfcfcf, 0xb3d3d3d3, 0xa1d7d7d7,
-			0x8edcdcdc, 0x7be1e1e1, 0x67e5e5e5, 0x55eaeaea, 0x44eeeeee,
-			0x34f2f2f2, 0x32f3f3f3, 0x41efefef, 0x51ebebeb, 0x63e7e7e7,
-			0x76e2e2e2, 0x89dddddd, 0x9bd8d8d8, 0xadd4d4d4, 0xbcd1d1d1,
-			0xcacdcdcd, 0xd5cacaca, 0xdec8c8c8, 0xe6c6c6c6, 0xebc5c5c5,
-			0xf0c4c4c4, 0xf3c3c3c3, 0xf5c2c2c2, 0xf6c2c2c2, 0xf7c2c2c2,
-			0xf7c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2,
-			0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2,
-			0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2,
-			0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2, 0xf8c2c2c2,
-			0xf8c2c2c2, 0xf7c2c2c2, 0xf7c2c2c2, 0xf6c2c2c2, 0xf5c2c2c2,
-			0xf3c3c3c3, 0xf0c4c4c4, 0xebc5c5c5, 0xe6c6c6c6, 0xdec8c8c8,
-			0xd5cacaca, 0xcacdcdcd, 0xbcd1d1d1, 0xadd4d4d4, 0x9bd8d8d8,
-			0x89dddddd, 0x76e2e2e2, 0x63e7e7e7, 0x51ebebeb, 0x41efefef,
-			0x32f3f3f3, 0x2ef4f4f4, 0x3df0f0f0, 0x4cececec, 0x5ee8e8e8,
-			0x70e3e3e3, 0x83dfdfdf, 0x94dadada, 0xa6d6d6d6, 0xb5d2d2d2,
-			0xc3cfcfcf, 0xcfcccccc, 0xd8c9c9c9, 0xe0c8c8c8, 0xe6c6c6c6,
-			0xeac5c5c5, 0xeec5c5c5, 0xf0c4c4c4, 0xf1c3c3c3, 0xf3c3c3c3,
-			0xf3c3c3c3, 0xf3c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3,
-			0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3,
-			0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3,
-			0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3, 0xf4c3c3c3,
-			0xf3c3c3c3, 0xf3c3c3c3, 0xf3c3c3c3, 0xf1c3c3c3, 0xf0c4c4c4,
-			0xeec5c5c5, 0xeac5c5c5, 0xe6c6c6c6, 0xe0c8c8c8, 0xd8c9c9c9,
-			0xcfcccccc, 0xc3cfcfcf, 0xb5d2d2d2, 0xa6d6d6d6, 0x94dadada,
-			0x83dfdfdf, 0x70e3e3e3, 0x5ee8e8e8, 0x4cececec, 0x3df0f0f0,
-			0x2ef4f4f4, 0x2bf4f4f4, 0x38f1f1f1, 0x47eeeeee, 0x57e9e9e9,
-			0x69e5e5e5, 0x7be1e1e1, 0x8cdcdcdc, 0x9dd8d8d8, 0xadd4d4d4,
-			0xbbd1d1d1, 0xc7cecece, 0xd0cbcbcb, 0xd8cacaca, 0xdfc8c8c8,
-			0xe3c7c7c7, 0xe7c6c6c6, 0xeac5c5c5, 0xebc5c5c5, 0xedc5c5c5,
-			0xedc4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4,
-			0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4,
-			0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4,
-			0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4, 0xeec4c4c4,
-			0xeec4c4c4, 0xedc4c4c4, 0xedc5c5c5, 0xebc5c5c5, 0xeac5c5c5,
-			0xe7c6c6c6, 0xe3c7c7c7, 0xdfc8c8c8, 0xd8cacaca, 0xd0cbcbcb,
-			0xc7cecece, 0xbbd1d1d1, 0xadd4d4d4, 0x9dd8d8d8, 0x8cdcdcdc,
-			0x7be1e1e1, 0x69e5e5e5, 0x57e9e9e9, 0x47eeeeee, 0x38f1f1f1,
-			0x2bf4f4f4, 0x27f5f5f5, 0x33f2f2f2, 0x41efefef, 0x50ebebeb,
-			0x61e7e7e7, 0x72e3e3e3, 0x83dedede, 0x94dadada, 0xa3d7d7d7,
-			0xb0d3d3d3, 0xbcd0d0d0, 0xc6cecece, 0xcfcccccc, 0xd5cacaca,
-			0xdac9c9c9, 0xdec8c8c8, 0xe1c7c7c7, 0xe3c7c7c7, 0xe4c7c7c7,
-			0xe5c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6,
-			0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6,
-			0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6, 0xe7c6c6c6,
-			0xe7c6c6c6, 0xe7c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6, 0xe6c6c6c6,
-			0xe6c6c6c6, 0xe5c6c6c6, 0xe4c7c7c7, 0xe3c7c7c7, 0xe1c7c7c7,
-			0xdec8c8c8, 0xdac9c9c9, 0xd5cacaca, 0xcfcccccc, 0xc6cecece,
-			0xbcd0d0d0, 0xb0d3d3d3, 0xa3d7d7d7, 0x94dadada, 0x83dedede,
-			0x72e3e3e3, 0x61e7e7e7, 0x50ebebeb, 0x41efefef, 0x33f2f2f2,
-			0x27f5f5f5, 0x23f6f6f6, 0x2ef4f4f4, 0x3bf1f1f1, 0x49ededed,
-			0x58e9e9e9, 0x68e5e5e5, 0x78e1e1e1, 0x88dddddd, 0x97dadada,
-			0xa5d6d6d6, 0xb0d3d3d3, 0xbbd1d1d1, 0xc3cfcfcf, 0xcacdcdcd,
-			0xcfcccccc, 0xd3cbcbcb, 0xd7cacaca, 0xd9c9c9c9, 0xdac9c9c9,
-			0xdbc9c9c9, 0xdcc9c9c9, 0xdcc9c9c9, 0xdcc9c9c9, 0xddc9c9c9,
-			0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8,
-			0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8, 0xddc8c8c8,
-			0xddc8c8c8, 0xddc8c8c8, 0xddc9c9c9, 0xdcc9c9c9, 0xdcc9c9c9,
-			0xdcc9c9c9, 0xdbc9c9c9, 0xdac9c9c9, 0xd9c9c9c9, 0xd7cacaca,
-			0xd3cbcbcb, 0xcfcccccc, 0xcacdcdcd, 0xc3cfcfcf, 0xbbd1d1d1,
-			0xb0d3d3d3, 0xa5d6d6d6, 0x97dadada, 0x88dddddd, 0x78e1e1e1,
-			0x68e5e5e5, 0x58e9e9e9, 0x49ededed, 0x3bf1f1f1, 0x2ef4f4f4,
-			0x23f6f6f6, 0x1ef7f7f7, 0x28f5f5f5, 0x34f2f2f2, 0x41efefef,
-			0x4fececec, 0x5ee8e8e8, 0x6de4e4e4, 0x7ce0e0e0, 0x8adddddd,
-			0x97dadada, 0xa3d7d7d7, 0xadd4d4d4, 0xb5d2d2d2, 0xbcd1d1d1,
-			0xc2cfcfcf, 0xc6cecece, 0xc9cdcdcd, 0xcccdcdcd, 0xcdcccccc,
-			0xcecccccc, 0xcfcccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc,
-			0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc,
-			0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc,
-			0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc, 0xd0cccccc,
-			0xcfcccccc, 0xcecccccc, 0xcdcccccc, 0xcccdcdcd, 0xc9cdcdcd,
-			0xc6cecece, 0xc2cfcfcf, 0xbcd1d1d1, 0xb5d2d2d2, 0xadd4d4d4,
-			0xa3d7d7d7, 0x97dadada, 0x8adddddd, 0x7ce0e0e0, 0x6de4e4e4,
-			0x5ee8e8e8, 0x4fececec, 0x41efefef, 0x34f2f2f2, 0x28f5f5f5,
-			0x1ef7f7f7, 0x1af9f9f9, 0x23f6f6f6, 0x2df4f4f4, 0x39f1f1f1,
-			0x45eeeeee, 0x53ebebeb, 0x61e7e7e7, 0x6fe4e4e4, 0x7ce0e0e0,
-			0x88dddddd, 0x93dbdbdb, 0x9dd8d8d8, 0xa6d6d6d6, 0xadd4d4d4,
-			0xb2d3d3d3, 0xb7d2d2d2, 0xbad1d1d1, 0xbdd0d0d0, 0xbed0d0d0,
-			0xbfd0d0d0, 0xc0cfcfcf, 0xc1cfcfcf, 0xc1cfcfcf, 0xc1cfcfcf,
-			0xc1cfcfcf, 0xc1cfcfcf, 0xc2cfcfcf, 0xc2cfcfcf, 0xc2cfcfcf,
-			0xc2cfcfcf, 0xc2cfcfcf, 0xc2cfcfcf, 0xc2cfcfcf, 0xc2cfcfcf,
-			0xc1cfcfcf, 0xc1cfcfcf, 0xc1cfcfcf, 0xc1cfcfcf, 0xc1cfcfcf,
-			0xc0cfcfcf, 0xbfd0d0d0, 0xbed0d0d0, 0xbdd0d0d0, 0xbad1d1d1,
-			0xb7d2d2d2, 0xb2d3d3d3, 0xadd4d4d4, 0xa6d6d6d6, 0x9dd8d8d8,
-			0x93dbdbdb, 0x88dddddd, 0x7ce0e0e0, 0x6fe4e4e4, 0x61e7e7e7,
-			0x53ebebeb, 0x45eeeeee, 0x39f1f1f1, 0x2df4f4f4, 0x23f6f6f6,
-			0x1af9f9f9, 0x16fafafa, 0x1df8f8f8, 0x26f6f6f6, 0x30f3f3f3,
-			0x3cf0f0f0, 0x48ededed, 0x54eaeaea, 0x61e7e7e7, 0x6de4e4e4,
-			0x79e1e1e1, 0x83dfdfdf, 0x8ddcdcdc, 0x95dadada, 0x9bd9d9d9,
-			0xa1d7d7d7, 0xa5d6d6d6, 0xa9d5d5d5, 0xabd5d5d5, 0xadd4d4d4,
-			0xaed4d4d4, 0xafd4d4d4, 0xb0d4d4d4, 0xb0d3d3d3, 0xb0d3d3d3,
-			0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3,
-			0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3,
-			0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d3d3d3, 0xb0d4d4d4,
-			0xafd4d4d4, 0xaed4d4d4, 0xadd4d4d4, 0xabd5d5d5, 0xa9d5d5d5,
-			0xa5d6d6d6, 0xa1d7d7d7, 0x9bd9d9d9, 0x95dadada, 0x8ddcdcdc,
-			0x83dfdfdf, 0x79e1e1e1, 0x6de4e4e4, 0x61e7e7e7, 0x54eaeaea,
-			0x48ededed, 0x3cf0f0f0, 0x30f3f3f3, 0x26f6f6f6, 0x1df8f8f8,
-			0x16fafafa, 0x12fbfbfb, 0x18f9f9f9, 0x20f7f7f7, 0x28f5f5f5,
-			0x32f3f3f3, 0x3df0f0f0, 0x48ededed, 0x53eaeaea, 0x5ee8e8e8,
-			0x68e5e5e5, 0x72e3e3e3, 0x7be1e1e1, 0x82dfdfdf, 0x89dddddd,
-			0x8edcdcdc, 0x93dbdbdb, 0x96dadada, 0x98d9d9d9, 0x9ad9d9d9,
-			0x9bd9d9d9, 0x9cd8d8d8, 0x9dd8d8d8, 0x9dd8d8d8, 0x9dd8d8d8,
-			0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8,
-			0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8, 0x9ed8d8d8,
-			0x9ed8d8d8, 0x9ed8d8d8, 0x9dd8d8d8, 0x9dd8d8d8, 0x9dd8d8d8,
-			0x9cd8d8d8, 0x9bd9d9d9, 0x9ad9d9d9, 0x98d9d9d9, 0x96dadada,
-			0x93dbdbdb, 0x8edcdcdc, 0x89dddddd, 0x82dfdfdf, 0x7be1e1e1,
-			0x72e3e3e3, 0x68e5e5e5, 0x5ee8e8e8, 0x53eaeaea, 0x48ededed,
-			0x3df0f0f0, 0x32f3f3f3, 0x28f5f5f5, 0x20f7f7f7, 0x18f9f9f9,
-			0x12fbfbfb, 0x0efbfbfb, 0x14fafafa, 0x1af9f9f9, 0x21f7f7f7,
-			0x29f5f5f5, 0x32f3f3f3, 0x3cf0f0f0, 0x45eeeeee, 0x4febebeb,
-			0x58e9e9e9, 0x61e7e7e7, 0x69e5e5e5, 0x70e3e3e3, 0x76e2e2e2,
-			0x7be1e1e1, 0x7fe0e0e0, 0x82dfdfdf, 0x85dedede, 0x86dedede,
-			0x87dedede, 0x88dddddd, 0x89dddddd, 0x89dddddd, 0x89dddddd,
-			0x8adddddd, 0x8adddddd, 0x8adddddd, 0x8adddddd, 0x8adddddd,
-			0x8adddddd, 0x8adddddd, 0x8adddddd, 0x8adddddd, 0x8adddddd,
-			0x8adddddd, 0x8adddddd, 0x89dddddd, 0x89dddddd, 0x89dddddd,
-			0x88dddddd, 0x87dedede, 0x86dedede, 0x85dedede, 0x82dfdfdf,
-			0x7fe0e0e0, 0x7be1e1e1, 0x76e2e2e2, 0x70e3e3e3, 0x69e5e5e5,
-			0x61e7e7e7, 0x58e9e9e9, 0x4febebeb, 0x45eeeeee, 0x3cf0f0f0,
-			0x32f3f3f3, 0x29f5f5f5, 0x21f7f7f7, 0x1af9f9f9, 0x14fafafa,
-			0x0efbfbfb, 0x0bfcfcfc, 0x0ffbfbfb, 0x14fafafa, 0x1af8f8f8,
-			0x21f7f7f7, 0x29f5f5f5, 0x30f3f3f3, 0x39f1f1f1, 0x41efefef,
-			0x49ededed, 0x51ebebeb, 0x58e9e9e9, 0x5ee8e8e8, 0x63e6e6e6,
-			0x68e5e5e5, 0x6be4e4e4, 0x6ee4e4e4, 0x70e3e3e3, 0x72e3e3e3,
-			0x73e3e3e3, 0x74e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2,
-			0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2,
-			0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2,
-			0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2, 0x75e2e2e2,
-			0x74e2e2e2, 0x73e3e3e3, 0x72e3e3e3, 0x70e3e3e3, 0x6ee4e4e4,
-			0x6be4e4e4, 0x68e5e5e5, 0x63e6e6e6, 0x5ee8e8e8, 0x58e9e9e9,
-			0x51ebebeb, 0x49ededed, 0x41efefef, 0x39f1f1f1, 0x30f3f3f3,
-			0x29f5f5f5, 0x21f7f7f7, 0x1af8f8f8, 0x14fafafa, 0x0ffbfbfb,
-			0x0bfcfcfc, 0x09fdfdfd, 0x0cfcfcfc, 0x10fbfbfb, 0x14fafafa,
-			0x1af9f9f9, 0x20f7f7f7, 0x26f6f6f6, 0x2df4f4f4, 0x34f2f2f2,
-			0x3bf0f0f0, 0x41efefef, 0x47ededed, 0x4cececec, 0x51ebebeb,
-			0x55eaeaea, 0x58e9e9e9, 0x5be9e9e9, 0x5de8e8e8, 0x5ee8e8e8,
-			0x5fe7e7e7, 0x60e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7,
-			0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7,
-			0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7,
-			0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7, 0x61e7e7e7,
-			0x60e7e7e7, 0x5fe7e7e7, 0x5ee8e8e8, 0x5de8e8e8, 0x5be9e9e9,
-			0x58e9e9e9, 0x55eaeaea, 0x51ebebeb, 0x4cececec, 0x47ededed,
-			0x41efefef, 0x3bf0f0f0, 0x34f2f2f2, 0x2df4f4f4, 0x26f6f6f6,
-			0x20f7f7f7, 0x1af9f9f9, 0x14fafafa, 0x10fbfbfb, 0x0cfcfcfc,
-			0x09fdfdfd, 0x06fdfdfd, 0x09fdfdfd, 0x0cfcfcfc, 0x0ffbfbfb,
-			0x14fafafa, 0x18f9f9f9, 0x1df8f8f8, 0x23f6f6f6, 0x28f5f5f5,
-			0x2ef4f4f4, 0x33f2f2f2, 0x38f1f1f1, 0x3df0f0f0, 0x41efefef,
-			0x44eeeeee, 0x47eeeeee, 0x49ededed, 0x4bededed, 0x4cececec,
-			0x4dececec, 0x4dececec, 0x4eececec, 0x4eececec, 0x4eececec,
-			0x4eececec, 0x4eececec, 0x4fececec, 0x4fececec, 0x4fececec,
-			0x4fececec, 0x4fececec, 0x4fececec, 0x4fececec, 0x4fececec,
-			0x4eececec, 0x4eececec, 0x4eececec, 0x4eececec, 0x4eececec,
-			0x4dececec, 0x4dececec, 0x4cececec, 0x4bededed, 0x49ededed,
-			0x47eeeeee, 0x44eeeeee, 0x41efefef, 0x3df0f0f0, 0x38f1f1f1,
-			0x33f2f2f2, 0x2ef4f4f4, 0x28f5f5f5, 0x23f6f6f6, 0x1df8f8f8,
-			0x18f9f9f9, 0x14fafafa, 0x0ffbfbfb, 0x0cfcfcfc, 0x09fdfdfd,
-			0x06fdfdfd, };
-
 	Image shadowImage;
 
+	int cornerSize = 20;
+
+	boolean shadowEnabled = true;
+	Color outerKeyline, innerKeyline;
+	Color[] activeToolbar;
+	int[] activePercents;
+	Color[] inactiveToolbar;
+	int[] inactivePercents;
+	boolean active;
+
+	private boolean drawPolyline = true;
+
 	public ShadowComposite(Composite parent, int style) {
 		super(parent, style);
-		addPaintListener(new PaintListener() {
+		this.parent = this;
+		this.outerKeyline = new Color(getDisplay(), new RGB(240, 240, 240));
+		addListener(SWT.Paint, new Listener() {
+
+			public void handleEvent(Event event) {
+				onPaint(event);
+			}
+		});
+		addListener(SWT.Dispose, new Listener() {
 
-			public void paintControl(PaintEvent e) {
-				Point size = getSize();
-				Rectangle bodyRect = new Rectangle(0, 0, size.x, size.y);
-				drawTabBody(e.gc, bodyRect, 0);
-				drawTabHeader(e.gc, bodyRect, 0);
+			public void handleEvent(Event event) {
+				outerKeyline.dispose();
 			}
 		});
+		// addPaintListener(new PaintListener() {
+		//
+		// public void paintControl(PaintEvent e) {
+		// Point size = getSize();
+		// Rectangle bodyRect = new Rectangle(0, 0, size.x, size.y);
+		// drawTabBody(e.gc, bodyRect, 0);
+		// drawTabHeader(e.gc, bodyRect, 0);
+		// }
+		// });
 	}
 
-	@Override
 	public Rectangle getClientArea() {
-		Rectangle area = super.getClientArea();
-		return new Rectangle(15, 15, area.width - 30, area.height - 30);
+		Rectangle trim = computeTrim(CTabFolderRenderer.PART_BODY, SWT.NONE, 0, 0, 0, 0);
+		// if (minimized)
+		// return new Rectangle(-trim.x, -trim.y, 0, 0);
+		Point size = getSize();
+		int width = size.x - trim.width;
+		int height = size.y - trim.height;
+		return new Rectangle(-trim.x, -trim.y, width, height);
+	}
+
+	private void onPaint(Event event) {
+		GC gc = event.gc;
+		gc.setAdvanced(true);
+
+		Color gcBackground = gc.getBackground();
+		Color gcForeground = gc.getForeground();
+
+		Point size = getSize();
+		Rectangle bodyRect = new Rectangle(0, 0, size.x, size.y);
+		draw(CTabFolderRenderer.PART_BODY, SWT.BACKGROUND | SWT.FOREGROUND, bodyRect, gc);
+
+		gc.setForeground(gcForeground);
+		gc.setBackground(gcBackground);
+
+		draw(CTabFolderRenderer.PART_HEADER, SWT.BACKGROUND | SWT.FOREGROUND, bodyRect, gc);
+
+	}
+
+	@Override
+	public Rectangle computeTrim(int x, int y, int width, int height) {
+		return computeTrim(PART_BODY, SWT.NONE, x, y, width, height);
 	}
 
+	protected Rectangle computeTrim(int part, int state, int x, int y, int width, int height) {
+		GC gc = new GC(parent);
+		gc.dispose();
+		int borderTop = TOP_KEYLINE + OUTER_KEYLINE;
+		int borderBottom = INNER_KEYLINE + OUTER_KEYLINE;
+		int marginWidth = parent.marginWidth;
+		int marginHeight = parent.marginHeight;
+		int sideDropWidth = shadowEnabled ? SIDE_DROP_WIDTH : 0;
+		switch (part) {
+		case PART_BODY:
+			x = x - marginWidth - OUTER_KEYLINE - INNER_KEYLINE - sideDropWidth - (cornerSize / 2);
+			width = width + 2 * OUTER_KEYLINE + 2 * INNER_KEYLINE + 2 * marginWidth + 2 * sideDropWidth + cornerSize;
+			int tabHeight = parent.getTabHeight() + 1; // TODO: Figure out what
+														// to do about the +1
+			// TODO: Fix
+			if (parent.getMinimized()) {
+				y = /* parent.onBottom ? y - borderTop : */y - tabHeight - borderTop - 5;
+				height = borderTop + borderBottom + tabHeight;
+			} else {
+				// y = tabFolder.onBottom ? y - marginHeight - highlight_margin
+				// - borderTop: y - marginHeight - highlight_header - tabHeight
+				// - borderTop;
+
+				y = y - marginHeight - tabHeight - borderTop - (cornerSize / 4);
+				height = height + borderBottom + borderTop + 2 * marginHeight + tabHeight + cornerSize / 2 + cornerSize / 4 + (shadowEnabled ? BOTTOM_DROP_WIDTH : 0);
+			}
+			break;
+		case PART_HEADER:
+			x = x - (INNER_KEYLINE + OUTER_KEYLINE) - sideDropWidth;
+			width = width + 2 * (INNER_KEYLINE + OUTER_KEYLINE + sideDropWidth);
+			break;
+		case PART_BORDER:
+			x = x - INNER_KEYLINE - OUTER_KEYLINE - sideDropWidth - (cornerSize / 4);
+			width = width + 2 * (INNER_KEYLINE + OUTER_KEYLINE + sideDropWidth) + cornerSize / 2;
+			y = y - borderTop;
+			height = height + borderTop + borderBottom;
+			break;
+		// default:
+		// if (0 <= part && part < parent.getItemCount()) {
+		// x = x - ITEM_LEFT_MARGIN;// - (CORNER_SIZE/2);
+		// width = width + ITEM_LEFT_MARGIN + ITEM_RIGHT_MARGIN + 1;
+		// y = y - ITEM_TOP_MARGIN;
+		// height = height + ITEM_TOP_MARGIN + ITEM_BOTTOM_MARGIN;
+		// }
+		// break;
+		}
+		return new Rectangle(x, y, width, height);
+	}
 
+	// protected void dispose() {
+	// super.dispose();
+	// }
+
+	protected void draw(int part, int state, Rectangle bounds, GC gc) {
+		switch (part) {
+		case PART_BODY:
+			this.drawTabBody(gc, bounds, state);
+			return;
+		case PART_HEADER:
+			this.drawTabHeader(gc, bounds, state);
+			return;
+			// default:
+			// if (0 <= part && part < parent.getItemCount()) {
+			// if (bounds.width == 0 || bounds.height == 0)
+			// return;
+			// if ((state & SWT.SELECTED) != 0) {
+			// drawSelectedTab(part, gc, bounds, state);
+			// state &= ~SWT.BACKGROUND;
+			// super.draw(part, state, bounds, gc);
+			// } else {
+			// drawUnselectedTab(part, gc, bounds, state);
+			// if ((state & SWT.HOT) == 0 && !active) {
+			// gc.setAdvanced(true);
+			// gc.setAlpha(0x7f);
+			// state &= ~SWT.BACKGROUND;
+			// super.draw(part, state, bounds, gc);
+			// gc.setAdvanced(false);
+			// } else {
+			// state &= ~SWT.BACKGROUND;
+			// super.draw(part, state, bounds, gc);
+			// }
+			// }
+			// return;
+			// }
+		}
+		// super.draw(part, state, bounds, gc);
+	}
 
 	void drawTabHeader(GC gc, Rectangle bounds, int state) {
 		// gc.setClipping(bounds.x, bounds.y, bounds.width,
@@ -801,14 +247,12 @@ void drawTabHeader(GC gc, Rectangle bounds, int state) {
 
 		int[] points = new int[1024];
 		int index = 0;
-		int radius = CORNER_SIZE / 2;
-//		int marginWidth = parent.marginWidth;
-//		int marginHeight = parent.marginHeight;
-		int delta = INNER_KEYLINE + OUTER_KEYLINE + 2 * SIDE_DROP_WIDTH + 2
-				* marginWidth;
+		int radius = cornerSize / 2;
+		int marginWidth = parent.marginWidth;
+		int marginHeight = parent.marginHeight;
+		int delta = INNER_KEYLINE + OUTER_KEYLINE + 2 * (shadowEnabled ? SIDE_DROP_WIDTH : 0) + 2 * marginWidth;
 		int width = bounds.width - delta;
-		int height = bounds.height - INNER_KEYLINE - OUTER_KEYLINE - 2
-				* marginHeight - BOTTOM_DROP_WIDTH;
+		int height = bounds.height - INNER_KEYLINE - OUTER_KEYLINE - 2 * marginHeight - (shadowEnabled ? BOTTOM_DROP_WIDTH : 0);
 		int circX = bounds.x + delta / 2 + radius;
 		int circY = bounds.y + radius;
 
@@ -820,15 +264,15 @@ void drawTabHeader(GC gc, Rectangle bounds, int state) {
 		region.intersect(clipping);
 		gc.setClipping(region);
 
-//		int header = 3; // TODO: this needs to be added to computeTrim for
-//						// HEADER
-//		Rectangle trim = computeTrim(PART_HEADER, state, 0, 0, 0, 0);
-//		trim.width = bounds.width - trim.width;
-//		trim.height = (parent.getTabHeight() + 1 + header) - trim.height;
-//		trim.x = -trim.x;
-//		trim.y = -trim.y;
-//
-//		draw(PART_BACKGROUND, SWT.NONE, trim, gc);
+		int header = 3; // TODO: this needs to be added to computeTrim for
+						// HEADER
+		Rectangle trim = computeTrim(PART_HEADER, state, 0, 0, 0, 0);
+		trim.width = bounds.width - trim.width;
+		trim.height = (parent.getTabHeight() + 1 + header) - trim.height;
+		trim.x = -trim.x;
+		trim.y = -trim.y;
+
+		draw(PART_BACKGROUND, SWT.NONE, trim, gc);
 
 		gc.setClipping(clipping);
 		clipping.dispose();
@@ -838,18 +282,15 @@ void drawTabHeader(GC gc, Rectangle bounds, int state) {
 		System.arraycopy(ltt, 0, points, index, ltt.length);
 		index += ltt.length;
 
-		int[] lbb = drawCircle(circX + 1, circY + height - (radius * 2) - 2,
-				radius, LEFT_BOTTOM);
+		int[] lbb = drawCircle(circX + 1, circY + height - (radius * 2) - 2, radius, LEFT_BOTTOM);
 		System.arraycopy(lbb, 0, points, index, lbb.length);
 		index += lbb.length;
 
-		int[] rb = drawCircle(circX + width - (radius * 2) - 2, circY + height
-				- (radius * 2) - 2, radius, RIGHT_BOTTOM);
+		int[] rb = drawCircle(circX + width - (radius * 2) - 2, circY + height - (radius * 2) - 2, radius, RIGHT_BOTTOM);
 		System.arraycopy(rb, 0, points, index, rb.length);
 		index += rb.length;
 
-		int[] rt = drawCircle(circX + width - (radius * 2) - 2, circY + 1,
-				radius, RIGHT_TOP);
+		int[] rt = drawCircle(circX + width - (radius * 2) - 2, circY + 1, radius, RIGHT_TOP);
 		System.arraycopy(rt, 0, points, index, rt.length);
 		index += rt.length;
 		points[index++] = points[0];
@@ -858,40 +299,25 @@ void drawTabHeader(GC gc, Rectangle bounds, int state) {
 		int[] tempPoints = new int[index];
 		System.arraycopy(points, 0, tempPoints, 0, index);
 
-		// White Keyline
-		// gc.setAntialias(SWT.ON);
-		gc.setForeground(gc.getDevice().getSystemColor(SWT.COLOR_WHITE));
-		gc.drawPolyline(tempPoints);
-
-		ltt = drawCircle(circX + 2, circY + 2, radius, LEFT_TOP);
-		System.arraycopy(ltt, 0, points, index, ltt.length);
-		gc.drawPolyline(ltt);
-
-		rt = drawCircle(circX + width - (radius * 2) - 3, circY + 2, radius,
-				RIGHT_TOP);
-		System.arraycopy(rt, 0, points, index, rt.length);
-		gc.drawPolyline(rt);
+		if (outerKeyline == null)
+			outerKeyline = gc.getDevice().getSystemColor(SWT.COLOR_BLACK);
 
-		int rtLength = rt.length;
-		gc.drawLine(rt[rtLength - 2], rt[rtLength - 1], ltt[0], ltt[1]);
+		gc.setForeground(outerKeyline);
 
-		Color borderBlue = new Color(gc.getDevice(), 190, 216, 237);
-		gc.setForeground(borderBlue);
-		gc.drawPolyline(shape);
-		borderBlue.dispose();
+		if (drawPolyline) {
+			gc.drawPolyline(shape);
+		}
 	}
 
 	void drawTabBody(GC gc, Rectangle bounds, int state) {
 		int[] points = new int[1024];
 		int index = 0;
-		int radius = CORNER_SIZE / 2;
-//		int marginWidth = parent.marginWidth;
-//		int marginHeight = parent.marginHeight;
-		int delta = INNER_KEYLINE + OUTER_KEYLINE + 2 * SIDE_DROP_WIDTH + 2
-				* marginWidth;
+		int radius = cornerSize / 2;
+		int marginWidth = parent.marginWidth;
+		int marginHeight = parent.marginHeight;
+		int delta = INNER_KEYLINE + OUTER_KEYLINE + 2 * (shadowEnabled ? SIDE_DROP_WIDTH : 0) + 2 * marginWidth;
 		int width = bounds.width - delta;
-		int height = bounds.height - INNER_KEYLINE - OUTER_KEYLINE - 2
-				* marginHeight - BOTTOM_DROP_WIDTH;
+		int height = Math.max(parent.getTabHeight() + INNER_KEYLINE + OUTER_KEYLINE + (shadowEnabled ? BOTTOM_DROP_WIDTH : 0), bounds.height - INNER_KEYLINE - OUTER_KEYLINE - 2 * marginHeight - (shadowEnabled ? BOTTOM_DROP_WIDTH : 0));
 
 		int circX = bounds.x + delta / 2 + radius;
 		int circY = bounds.y + radius;
@@ -902,18 +328,15 @@ void drawTabBody(GC gc, Rectangle bounds, int state) {
 		System.arraycopy(ltt, 0, points, index, ltt.length);
 		index += ltt.length;
 
-		int[] lbb = drawCircle(circX, circY + height - (radius * 2), radius,
-				LEFT_BOTTOM);
+		int[] lbb = drawCircle(circX, circY + height - (radius * 2), radius, LEFT_BOTTOM);
 		System.arraycopy(lbb, 0, points, index, lbb.length);
 		index += lbb.length;
 
-		int[] rb = drawCircle(circX + width - (radius * 2), circY + height
-				- (radius * 2), radius, RIGHT_BOTTOM);
+		int[] rb = drawCircle(circX + width - (radius * 2), circY + height - (radius * 2), radius, RIGHT_BOTTOM);
 		System.arraycopy(rb, 0, points, index, rb.length);
 		index += rb.length;
 
-		int[] rt = drawCircle(circX + width - (radius * 2), circY, radius,
-				RIGHT_TOP);
+		int[] rt = drawCircle(circX + width - (radius * 2), circY, radius, RIGHT_TOP);
 		System.arraycopy(rt, 0, points, index, rt.length);
 		index += rt.length;
 		points[index++] = circX;
@@ -928,25 +351,207 @@ void drawTabBody(GC gc, Rectangle bounds, int state) {
 		Region r = new Region();
 		r.add(bounds);
 		r.subtract(shape);
-		gc.setBackground(getParent().getBackground());
-		Display display = getDisplay();
+		gc.setBackground(parent.getParent().getBackground());
+		Display display = parent.getDisplay();
 		Region clipping = new Region();
 		gc.getClipping(clipping);
 		r.intersect(clipping);
 		gc.setClipping(r);
-		Rectangle mappedBounds = display
-				.map(this, getParent(), bounds);
-		getParent().drawBackground(gc, bounds.x, bounds.y, bounds.width,
-				bounds.height, mappedBounds.x, mappedBounds.y);
+		Rectangle mappedBounds = display.map(parent, parent.getParent(), bounds);
+		parent.getParent().drawBackground(gc, bounds.x, bounds.y, bounds.width, bounds.height, mappedBounds.x, mappedBounds.y);
 
 		// Shadow
-		drawShadow(display, bounds, gc);
+		if (shadowEnabled)
+			drawShadow(display, bounds, gc);
 
 		gc.setClipping(clipping);
 		clipping.dispose();
 		r.dispose();
 	}
 
+	// void drawSelectedTab(int itemIndex, GC gc, Rectangle bounds, int state) {
+	// int width = bounds.width;
+	//
+	// int[] points = new int[1024];
+	// int index = 0;
+	// int radius = cornerSize / 2;
+	// int circX = bounds.x + radius;
+	// int circY = bounds.y - 1 + radius;
+	// int selectionX1, selectionY1, selectionX2, selectionY2;
+	// if (itemIndex == 0) {
+	// circX -= 1;
+	// points[index++] = circX - radius;
+	// points[index++] = bounds.y + bounds.height;
+	//
+	// points[index++] = selectionX1 = circX - radius;
+	// points[index++] = selectionY1 = bounds.y + bounds.height;
+	// } else {
+	// points[index++] = shadowEnabled ? SIDE_DROP_WIDTH : 0 + INNER_KEYLINE +
+	// OUTER_KEYLINE;
+	// points[index++] = bounds.y + bounds.height;
+	//
+	// points[index++] = selectionX1 = bounds.x;
+	// points[index++] = selectionY1 = bounds.y + bounds.height;
+	// }
+	// int[] ltt = drawCircle(circX, circY, radius, LEFT_TOP);
+	// for (int i = 0; i < ltt.length / 2; i += 2) {
+	// int tmp = ltt[i];
+	// ltt[i] = ltt[ltt.length - i - 2];
+	// ltt[ltt.length - i - 2] = tmp;
+	// tmp = ltt[i + 1];
+	// ltt[i + 1] = ltt[ltt.length - i - 1];
+	// ltt[ltt.length - i - 1] = tmp;
+	// }
+	// System.arraycopy(ltt, 0, points, index, ltt.length);
+	// index += ltt.length;
+	//
+	// int[] rt = drawCircle(circX + width - (radius * 2), circY, radius,
+	// RIGHT_TOP);
+	// for (int i = 0; i < rt.length / 2; i += 2) {
+	// int tmp = rt[i];
+	// rt[i] = rt[rt.length - i - 2];
+	// rt[rt.length - i - 2] = tmp;
+	// tmp = rt[i + 1];
+	// rt[i + 1] = rt[rt.length - i - 1];
+	// rt[rt.length - i - 1] = tmp;
+	// }
+	// System.arraycopy(rt, 0, points, index, rt.length);
+	// index += rt.length;
+	//
+	// points[index++] = selectionX2 = bounds.width + circX - radius;
+	// points[index++] = selectionY2 = bounds.y + bounds.height;
+	//
+	// points[index++] = parent.getSize().x - (shadowEnabled ? SIDE_DROP_WIDTH :
+	// 0 + INNER_KEYLINE + OUTER_KEYLINE);
+	// points[index++] = bounds.y + bounds.height;
+	//
+	// gc.setClipping(0, bounds.y, parent.getSize().x - (shadowEnabled ?
+	// SIDE_DROP_WIDTH : 0 + INNER_KEYLINE + OUTER_KEYLINE), bounds.y +
+	// bounds.height);// bounds.height
+	// // +
+	// // 4);
+	// Color selectionFillColor =
+	// gc.getDevice().getSystemColor(SWT.COLOR_WHITE);
+	// gc.setBackground(selectionFillColor);
+	// gc.setForeground(selectionFillColor);
+	// int[] tmpPoints = new int[index];
+	// System.arraycopy(points, 0, tmpPoints, 0, index);
+	// gc.fillPolygon(tmpPoints);
+	// gc.drawLine(selectionX1, selectionY1, selectionX2, selectionY2);
+	// Color tempBorder = new Color(gc.getDevice(), 182, 188, 204);
+	// gc.setForeground(tempBorder);
+	// tempBorder.dispose();
+	// if (active)
+	// gc.drawPolyline(tmpPoints);
+	// Rectangle rect = null;
+	// gc.setClipping(rect);
+	//
+	// if (outerKeyline == null)
+	// outerKeyline = gc.getDevice().getSystemColor(SWT.COLOR_BLACK);
+	// gc.setForeground(outerKeyline);
+	// gc.drawPolyline(shape);
+	// }
+	//
+	// void drawUnselectedTab(int itemIndex, GC gc, Rectangle bounds, int state)
+	// {
+	// if ((state & SWT.HOT) != 0) {
+	// int width = bounds.width;
+	// int[] points = new int[1024];
+	// int[] inactive = new int[8];
+	// int index = 0, inactive_index = 0;
+	// int radius = cornerSize / 2;
+	// int circX = bounds.x + radius;
+	// int circY = bounds.y - 1 + radius;
+	//
+	// int leftIndex = circX;
+	// if (itemIndex == 0) {
+	// if (parent.getSelectionIndex() != 0)
+	// leftIndex -= 1;
+	// points[index++] = leftIndex - radius;
+	// points[index++] = bounds.y + bounds.height;
+	// } else {
+	// points[index++] = bounds.x;
+	// points[index++] = bounds.y + bounds.height;
+	// }
+	//
+	// if (!active) {
+	// System.arraycopy(points, 0, inactive, 0, index);
+	// inactive_index += 2;
+	// }
+	//
+	// int[] ltt = drawCircle(leftIndex, circY, radius, LEFT_TOP);
+	// for (int i = 0; i < ltt.length / 2; i += 2) {
+	// int tmp = ltt[i];
+	// ltt[i] = ltt[ltt.length - i - 2];
+	// ltt[ltt.length - i - 2] = tmp;
+	// tmp = ltt[i + 1];
+	// ltt[i + 1] = ltt[ltt.length - i - 1];
+	// ltt[ltt.length - i - 1] = tmp;
+	// }
+	// System.arraycopy(ltt, 0, points, index, ltt.length);
+	// index += ltt.length;
+	//
+	// if (!active) {
+	// System.arraycopy(ltt, 0, inactive, inactive_index, 2);
+	// inactive_index += 2;
+	// }
+	//
+	// int rightIndex = circX - 1;
+	// int[] rt = drawCircle(rightIndex + width - (radius * 2), circY, radius,
+	// RIGHT_TOP);
+	// for (int i = 0; i < rt.length / 2; i += 2) {
+	// int tmp = rt[i];
+	// rt[i] = rt[rt.length - i - 2];
+	// rt[rt.length - i - 2] = tmp;
+	// tmp = rt[i + 1];
+	// rt[i + 1] = rt[rt.length - i - 1];
+	// rt[rt.length - i - 1] = tmp;
+	// }
+	// System.arraycopy(rt, 0, points, index, rt.length);
+	// index += rt.length;
+	// if (!active) {
+	// System.arraycopy(rt, rt.length - 4, inactive, inactive_index, 2);
+	// inactive[inactive_index] -= 1;
+	// inactive_index += 2;
+	// }
+	//
+	// points[index++] = bounds.width + rightIndex - radius;
+	// points[index++] = bounds.y + bounds.height;
+	//
+	// if (!active) {
+	// System.arraycopy(points, index - 2, inactive, inactive_index, 2);
+	// inactive[inactive_index] -= 1;
+	// inactive_index += 2;
+	// }
+	//
+	// gc.setClipping(points[0], bounds.y, parent.getSize().x - (shadowEnabled ?
+	// SIDE_DROP_WIDTH : 0 + INNER_KEYLINE + OUTER_KEYLINE), bounds.y +
+	// bounds.height);// bounds.height
+	// // + 4);
+	// gc.setBackground(gc.getDevice().getSystemColor(SWT.COLOR_WHITE));
+	// int[] tmpPoints = new int[index];
+	// System.arraycopy(points, 0, tmpPoints, 0, index);
+	// gc.fillPolygon(tmpPoints);
+	// Color tempBorder = new Color(gc.getDevice(), 182, 188, 204);
+	// gc.setForeground(tempBorder);
+	// tempBorder.dispose();
+	// if (active) {
+	// gc.drawPolyline(tmpPoints);
+	// } else {
+	// gc.drawLine(inactive[0], inactive[1], inactive[2], inactive[3]);
+	// gc.drawLine(inactive[4], inactive[5], inactive[6], inactive[7]);
+	// }
+	//
+	// Rectangle rect = null;
+	// gc.setClipping(rect);
+	//
+	// if (outerKeyline == null)
+	// outerKeyline = gc.getDevice().getSystemColor(SWT.COLOR_BLACK);
+	// // gc.setForeground(outerKeyline);
+	// // gc.drawPolyline(shape);
+	// }
+	// }
+
 	static int[] drawCircle(int xC, int yC, int r, int circlePart) {
 		int x = 0, y = r, u = 1, v = 2 * r - 1, e = 0;
 		int[] points = new int[1024];
@@ -1003,8 +608,7 @@ static int[] drawCircle(int xC, int yC, int r, int circlePart) {
 				int[] newPointTableMirror = new int[length];
 				System.arraycopy(points, 0, newPointTable, 0, points.length);
 				points = newPointTable;
-				System.arraycopy(pointsMirror, 0, newPointTableMirror, 0,
-						pointsMirror.length);
+				System.arraycopy(pointsMirror, 0, newPointTableMirror, 0, pointsMirror.length);
 				pointsMirror = newPointTableMirror;
 			}
 		}
@@ -1022,56 +626,52 @@ static int[] drawCircle(int xC, int yC, int r, int circlePart) {
 	void drawShadow(final Display display, Rectangle bounds, GC gc) {
 		if (shadowImage == null)
 			createShadow(display);
+
 		int x = bounds.x;
 		int y = bounds.y;
 		int SIZE = shadowImage.getBounds().width / 3;
+
+		int height = Math.max(bounds.height, SIZE * 2);
+		int width = Math.max(bounds.width, SIZE * 2);
 		// top left
-		gc.drawImage(shadowImage, 0, 0, SIZE, SIZE, 0, 0, SIZE, 20);
-		int fillHeight = bounds.height - SIZE * 2;
-		int fillWidth = bounds.width + 5 - SIZE * 2;
+		gc.drawImage(shadowImage, 0, 0, SIZE, SIZE, 2, 10, SIZE, 20);
+		int fillHeight = height - SIZE * 2;
+		int fillWidth = width + 5 - SIZE * 2;
 
 		int xFill = 0;
 		for (int i = SIZE; i < fillHeight; i += SIZE) {
 			xFill = i;
-			gc.drawImage(shadowImage, 0, SIZE, SIZE, SIZE, 0, i, SIZE, SIZE);
+			gc.drawImage(shadowImage, 0, SIZE, SIZE, SIZE, 2, i, SIZE, SIZE);
 		}
 
 		// Pad the rest of the shadow
-		gc.drawImage(shadowImage, 0, SIZE, SIZE, fillHeight - xFill, 0, xFill
-				+ SIZE, SIZE, fillHeight - xFill);
+		gc.drawImage(shadowImage, 0, SIZE, SIZE, fillHeight - xFill, 2, xFill + SIZE, SIZE, fillHeight - xFill);
 
 		// bl
-		gc.drawImage(shadowImage, 0, 40, 20, 20, 0, y + bounds.height - SIZE,
-				20, 20);
+		gc.drawImage(shadowImage, 0, 40, 20, 20, 2, y + height - SIZE, 20, 20);
+
 		int yFill = 0;
 		for (int i = SIZE; i <= fillWidth; i += SIZE) {
 			yFill = i;
-			gc.drawImage(shadowImage, SIZE, SIZE * 2, SIZE, SIZE, i, y
-					+ bounds.height - SIZE, SIZE, SIZE);
+			gc.drawImage(shadowImage, SIZE, SIZE * 2, SIZE, SIZE, i, y + height - SIZE, SIZE, SIZE);
 		}
 		// Pad the rest of the shadow
-		gc.drawImage(shadowImage, SIZE, SIZE * 2, fillWidth - yFill, SIZE,
-				yFill + SIZE, y + bounds.height - SIZE, fillWidth - yFill, SIZE);
+		gc.drawImage(shadowImage, SIZE, SIZE * 2, fillWidth - yFill, SIZE, yFill + SIZE, y + height - SIZE, fillWidth - yFill, SIZE);
 
 		// br
-		gc.drawImage(shadowImage, SIZE * 2, SIZE * 2, SIZE, SIZE, x
-				+ bounds.width - SIZE + 5, y + bounds.height - SIZE, SIZE, SIZE);
+		gc.drawImage(shadowImage, SIZE * 2, SIZE * 2, SIZE, SIZE, x + width - SIZE - 1, y + height - SIZE, SIZE, SIZE);
 
 		// tr
-		gc.drawImage(shadowImage, SIZE * 2, 0, SIZE, SIZE, x + bounds.width
-				- SIZE + 5, y, SIZE, SIZE);
+		gc.drawImage(shadowImage, (SIZE * 2), 0, SIZE, SIZE, x + width - SIZE - 1, 10, SIZE, SIZE);
 
 		xFill = 0;
 		for (int i = SIZE; i < fillHeight; i += SIZE) {
 			xFill = i;
-			gc.drawImage(shadowImage, SIZE * 2, SIZE, SIZE, SIZE, x
-					+ bounds.width - SIZE + 5, i, SIZE, SIZE);
+			gc.drawImage(shadowImage, SIZE * 2, SIZE, SIZE, SIZE, x + width - SIZE - 1, i, SIZE, SIZE);
 		}
 
 		// Pad the rest of the shadow
-		gc.drawImage(shadowImage, SIZE * 2, SIZE, SIZE, fillHeight - xFill, x
-				+ bounds.width - SIZE + 5, xFill + SIZE, SIZE, fillHeight
-				- xFill);
+		gc.drawImage(shadowImage, SIZE * 2, SIZE, SIZE, fillHeight - xFill, x + width - SIZE - 1, xFill + SIZE, SIZE, fillHeight - xFill);
 	}
 
 	void createShadow(final Display display) {
@@ -1079,17 +679,17 @@ void createShadow(final Display display) {
 		if (obj != null) {
 			shadowImage = (Image) obj;
 		} else {
-			ImageData data = new ImageData(60, 60, 32, new PaletteData(
-					0xFF0000, 0xFF00, 0xFF));
-			for (int y = 0, index = 0; y < 60; y++) {
-				for (int x = 0; x < 60; x++) {
-					data.setPixel(x, y, shadow[index] & 0xFFFFFF);
-					data.setAlpha(x, y, (shadow[index] >> 24) & 0xFF);
-					index++;
-				}
-			}
-			shadowImage = new Image(display, data);
+			ImageData data = new ImageData(60, 60, 32, new PaletteData(0xFF0000, 0xFF00, 0xFF));
+			Image tmpImage = shadowImage = new Image(display, data);
+			GC gc = new GC(tmpImage);
+			Color shadowColor = new Color(display, new RGB(128, 128, 128));
+			gc.setBackground(shadowColor);
+			drawTabBody(gc, new Rectangle(0, 0, 60, 60), SWT.None);
+			ImageData blured = blur(tmpImage, 5, 25);
+			shadowImage = new Image(display, blured);
 			display.setData(E4_SHADOW_IMAGE, shadowImage);
+			tmpImage.dispose();
+			shadowColor.dispose();
 			display.disposeExec(new Runnable() {
 				public void run() {
 					Object obj = display.getData(E4_SHADOW_IMAGE);
@@ -1102,4 +702,176 @@ public void run() {
 			});
 		}
 	}
+
+	public ImageData blur(Image src, int radius, int sigma) {
+		float[] kernel = create1DKernel(radius, sigma);
+
+		ImageData imgPixels = src.getImageData();
+		int width = imgPixels.width;
+		int height = imgPixels.height;
+
+		int[] inPixels = new int[width * height];
+		int[] outPixels = new int[width * height];
+		int offset = 0;
+		for (int y = 0; y < height; y++) {
+			for (int x = 0; x < width; x++) {
+				RGB rgb = imgPixels.palette.getRGB(imgPixels.getPixel(x, y));
+				if (rgb.red == 255 && rgb.green == 255 && rgb.blue == 255) {
+					inPixels[offset] = (rgb.red << 16) | (rgb.green << 8) | rgb.blue;
+				} else {
+					inPixels[offset] = (imgPixels.getAlpha(x, y) << 24) | (rgb.red << 16) | (rgb.green << 8) | rgb.blue;
+				}
+				offset++;
+			}
+		}
+
+		convolve(kernel, inPixels, outPixels, width, height, true);
+		convolve(kernel, outPixels, inPixels, height, width, true);
+
+		ImageData dst = new ImageData(imgPixels.width, imgPixels.height, 24, new PaletteData(0xff0000, 0xff00, 0xff));
+
+		dst.setPixels(0, 0, inPixels.length, inPixels, 0);
+		offset = 0;
+		for (int y = 0; y < height; y++) {
+			for (int x = 0; x < width; x++) {
+				if (inPixels[offset] == -1) {
+					dst.setAlpha(x, y, 0);
+				} else {
+					int a = (inPixels[offset] >> 24) & 0xff;
+					// if (a < 150) a = 0;
+					dst.setAlpha(x, y, a);
+				}
+				offset++;
+			}
+		}
+		return dst;
+	}
+
+	private void convolve(float[] kernel, int[] inPixels, int[] outPixels, int width, int height, boolean alpha) {
+		int kernelWidth = kernel.length;
+		int kernelMid = kernelWidth / 2;
+		for (int y = 0; y < height; y++) {
+			int index = y;
+			int currentLine = y * width;
+			for (int x = 0; x < width; x++) {
+				// do point
+				float a = 0, r = 0, g = 0, b = 0;
+				for (int k = -kernelMid; k <= kernelMid; k++) {
+					float val = kernel[k + kernelMid];
+					int xcoord = x + k;
+					if (xcoord < 0)
+						xcoord = 0;
+					if (xcoord >= width)
+						xcoord = width - 1;
+					int pixel = inPixels[currentLine + xcoord];
+					// float alp = ((pixel >> 24) & 0xff);
+					a += val * ((pixel >> 24) & 0xff);
+					r += val * (((pixel >> 16) & 0xff));
+					g += val * (((pixel >> 8) & 0xff));
+					b += val * (((pixel) & 0xff));
+				}
+				int ia = alpha ? clamp((int) (a + 0.5)) : 0xff;
+				int ir = clamp((int) (r + 0.5));
+				int ig = clamp((int) (g + 0.5));
+				int ib = clamp((int) (b + 0.5));
+				outPixels[index] = (ia << 24) | (ir << 16) | (ig << 8) | ib;
+				index += height;
+			}
+		}
+
+	}
+
+	private int clamp(int value) {
+		if (value > 255)
+			return 255;
+		if (value < 0)
+			return 0;
+		return value;
+	}
+
+	private float[] create1DKernel(int radius, int sigma) {
+		// guideline: 3*sigma should be the radius
+		int size = radius * 2 + 1;
+		float[] kernel = new float[size];
+		int radiusSquare = radius * radius;
+		float sigmaSquare = 2 * sigma * sigma;
+		float piSigma = 2 * (float) Math.PI * sigma;
+		float sqrtSigmaPi2 = (float) Math.sqrt(piSigma);
+		int start = size / 2;
+		int index = 0;
+		float total = 0;
+		for (int i = -start; i <= start; i++) {
+			float d = i * i;
+			if (d > radiusSquare) {
+				kernel[index] = 0;
+			} else {
+				kernel[index] = (float) Math.exp(-(d) / sigmaSquare) / sqrtSigmaPi2;
+			}
+			total += kernel[index];
+			index++;
+		}
+		for (int i = 0; i < size; i++) {
+			kernel[i] /= total;
+		}
+		return kernel;
+	}
+
+	@Inject
+	@Optional
+	public void setCornerRadius(@Named("radius") Integer radius) {
+		cornerSize = radius.intValue();
+		parent.redraw();
+	}
+
+	@Inject
+	@Optional
+	public void setShadowVisible(@Named("shadowVisible") Boolean visible) {
+		this.shadowEnabled = visible.booleanValue();
+		parent.redraw();
+	}
+
+	@Inject
+	@Optional
+	public void setOuterKeyline(@Named("outerKeyline") Color color) {
+		this.outerKeyline = color;
+		// TODO: HACK! Should be set based on pseudo-state.
+		// setActive(!(color.getRed() == 255 && color.getGreen() == 255 &&
+		// color.getBlue() == 255));
+		parent.redraw();
+	}
+
+	@Inject
+	@Optional
+	public void setInnerKeyline(@Named("innerKeyline") Color color) {
+		this.innerKeyline = color;
+		parent.redraw();
+	}
+
+	@Inject
+	@Optional
+	public void setActiveToolbarGradient(@Named("activeToolbarColors") Color[] color, @Named("activeToolbarPercents") int[] percents) {
+		activeToolbar = color;
+		activePercents = percents;
+	}
+
+	@Inject
+	@Optional
+	public void setInactiveToolbarGradient(@Named("inactiveToolbarColors") Color[] color, @Named("inactiveToolbarPercents") int[] percents) {
+		inactiveToolbar = color;
+		inactivePercents = percents;
+	}
+
+	// public void setActive(boolean active) {
+	// this.active = active;
+	// Control topRight = parent.getTopRight();
+	// if (topRight != null) {
+	// if (active && toolbarActiveImage == null)
+	// createActiveToolbarImages(Display.getCurrent());
+	// if (!active && toolbarInactiveImage == null)
+	// createInactiveToolbarImages(Display.getCurrent());
+	// topRight.setBackgroundImage(active ? toolbarActiveImage :
+	// toolbarInactiveImage);
+	// parent.redraw();
+	// }
+	// }
 }

From 2022eb2f435e63644a4eb25f2432f8b2012dea49 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 27 Jun 2010 07:40:44 +0000
Subject: [PATCH 0162/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * align with changes in bug 284357

---
 .../ReflectionContributionFactory.java        | 167 +++++-------------
 1 file changed, 43 insertions(+), 124 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
index 9e4ed7f352..6dca4eea44 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
@@ -1,12 +1,6 @@
 package org.eclipse.e4.tools.compat.internal;
 
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 import javax.inject.Inject;
@@ -30,158 +24,76 @@
 /**
  * Create the contribution factory.
  */
+@SuppressWarnings("restriction")
 public class ReflectionContributionFactory implements IContributionFactory {
 
 	private IExtensionRegistry registry;
 	private Map<String, Object> languages;
-	
+
 	@Inject
 	private PackageAdmin packageAdmin;
 	
 	@Inject
 	private Logger logger;
-
+	
 	/**
 	 * Create a reflection factory.
 	 * 
 	 * @param registry
 	 *            to read languages.
 	 */
-	@Inject
 	public ReflectionContributionFactory(IExtensionRegistry registry) {
 		this.registry = registry;
 		processLanguages();
 	}
 
-	public Object call(Object object, String uriString, String methodName, IEclipseContext context,
-			Object defaultValue) {
-		if (uriString != null) {
-			URI uri = new URI(uriString);
-			if (uri.segments.length > 3) {
-				String prefix = uri.segments[2];
-				IContributionFactorySpi factory = (IContributionFactorySpi) languages.get(prefix);
-				return factory.call(object, methodName, context, defaultValue);
-			}
-		}
-
-		Method targetMethod = null;
-
-		Method[] methods = object.getClass().getMethods();
-
-		// Optimization: if there's only one method, use it.
-		if (methods.length == 1) {
-			targetMethod = methods[0];
-		} else {
-			ArrayList<Method> toSort = new ArrayList<Method>();
-
-			for (int i = 0; i < methods.length; i++) {
-				Method method = methods[i];
-
-				// Filter out non-public constructors
-				if ((method.getModifiers() & Modifier.PUBLIC) != 0
-						&& method.getName().equals(methodName)) {
-					toSort.add(method);
-				}
-			}
-
-			// Sort the methods by descending number of method
-			// arguments
-			Collections.sort(toSort, new Comparator<Method>() {
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-				 */
-				public int compare(Method m1, Method m2) {
-					int l1 = m1.getParameterTypes().length;
-					int l2 = m2.getParameterTypes().length;
-
-					return l1 - l2;
-				}
-			});
-
-			// Find the first satisfiable method
-			for (Iterator<Method> iter = toSort.iterator(); iter.hasNext() && targetMethod == null;) {
-				Method next = iter.next();
-
-				boolean satisfiable = true;
-
-				Class<?>[] params = next.getParameterTypes();
-				for (int i = 0; i < params.length && satisfiable; i++) {
-					Class<?> clazz = params[i];
-
-					if (!context.containsKey(clazz.getName())
-							&& !IEclipseContext.class.equals(clazz)) {
-						satisfiable = false;
-					}
-				}
-
-				if (satisfiable) {
-					targetMethod = next;
-				}
-			}
-		}
-
-		if (targetMethod == null) {
-			if (defaultValue != null) {
-				return defaultValue;
-			}
-			throw new RuntimeException(
-					"could not find satisfiable method " + methodName + " in class " + object.getClass()); //$NON-NLS-1$//$NON-NLS-2$
-		}
-
-		Class<?>[] paramKeys = targetMethod.getParameterTypes();
-
-		try {
-			logger.debug("calling: " + methodName);
-			Object[] params = new Object[paramKeys.length];
-			for (int i = 0; i < params.length; i++) {
-				if (IEclipseContext.class.equals(paramKeys[i])) {
-					params[i] = context;
-				} else {
-					params[i] = context.get(paramKeys[i].getName());
-				}
-			}
-
-			return targetMethod.invoke(object, params);
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new RuntimeException(e);
-		}
+	public Object create(String uriString, IEclipseContext context, IEclipseContext staticContext) {
+		return doCreate(uriString, context, staticContext);
 	}
 
 	public Object create(String uriString, IEclipseContext context) {
+		return doCreate(uriString, context, null);
+	}
+
+	private Object doCreate(String uriString, IEclipseContext context, IEclipseContext staticContext) {
 		if (uriString == null) {
 			return null;
 		}
-		URI uri = new URI(uriString);
+		URI uri = URI.createURI(uriString);
 		Bundle bundle = getBundle(uri);
 		Object contribution;
 		if (bundle != null) {
-			contribution = createFromBundle(bundle, context, uri);
+			contribution = createFromBundle(bundle, context, staticContext, uri);
 		} else {
 			contribution = null;
-			logger.error("Unable to retrive the bundle from the URI: "+ uriString);
+			logger.error("Unable to retrive the bundle from the URI: " //$NON-NLS-1$
+					+ uriString);
 		}
 		return contribution;
 	}
 
-	protected Object createFromBundle(Bundle bundle, IEclipseContext context, URI uri) {
+	protected Object createFromBundle(Bundle bundle, IEclipseContext context,
+			IEclipseContext staticContext, URI uri) {
 		Object contribution;
-		if (uri.segments.length > 3) {
-			String prefix = uri.segments[2];
+		if (uri.segmentCount() > 3) {
+			String prefix = uri.segment(2);
 			IContributionFactorySpi factory = (IContributionFactorySpi) languages.get(prefix);
-			StringBuffer resource = new StringBuffer(uri.segments[3]);
-			for (int i = 4; i < uri.segments.length; i++) {
+			StringBuffer resource = new StringBuffer(uri.segment(3));
+			for (int i = 4; i < uri.segmentCount(); i++) {
 				resource.append('/');
-				resource.append(uri.segments[i]);
+				resource.append(uri.segment(i));
 			}
 			contribution = factory.create(bundle, resource.toString(), context);
 		} else {
-			String clazz = uri.segments[2];
+			String clazz = uri.segment(2);
 			try {
 				Class<?> targetClass = bundle.loadClass(clazz);
-				contribution = ContextInjectionFactory.make(targetClass, context);
+				if (staticContext == null)
+					contribution = ContextInjectionFactory.make(targetClass, context);
+				else
+					contribution = ContextInjectionFactory
+							.make(targetClass, context, staticContext);
+
 				if (contribution == null) {
 					String message = "Unable to load class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
 							+ bundle.getBundleId() + "'"; //$NON-NLS-1$
@@ -191,12 +103,12 @@ protected Object createFromBundle(Bundle bundle, IEclipseContext context, URI ur
 				contribution = null;
 				String message = "Unable to load class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
 						+ bundle.getBundleId() + "'"; //$NON-NLS-1$
-				logger.error(message);
+				logger.error(e,message);
 			} catch (InjectionException e) {
 				contribution = null;
 				String message = "Unable to create class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
 						+ bundle.getBundleId() + "'"; //$NON-NLS-1$
-				logger.error(message);
+				logger.error(e, message);
 			}
 		}
 		return contribution;
@@ -221,6 +133,7 @@ protected void processLanguages() {
 		}
 	}
 
+
 	protected Bundle getBundle(URI platformURI) {
 		return getBundleForName(platformURI.segments[1]);
 	}
@@ -248,19 +161,25 @@ public Bundle getBundleForName(String bundlename) {
 		}
 		return null;
 	}
-
+	
 	static class URI {
 		String[] segments;
 		String uri;
 		
-		private URI(String uriString) {
+		URI(String uriString) {
 			segments = uriString.substring(uriString.indexOf('/')+1).split("/");
 		}
-	}
+		
+		public String segment(int i) {
+			return segments[i];
+		}
 
-	public Object create(String uriString, IEclipseContext context,
-			IEclipseContext staticContext) {
-		// TODO Auto-generated method stub
-		return null;
+		public int segmentCount() {
+			return segments.length;
+		}
+
+		static URI createURI(String uriString) {
+			return new URI(uriString);
+		}
 	}
 }

From d47225b0025f420833eeed1d86ca77349c60eb29 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 27 Jun 2010 08:10:04 +0000
Subject: [PATCH 0163/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fix incorrect drawing

---
 .../emf/ui/internal/ShadowComposite.java      | 226 +-----------------
 1 file changed, 4 insertions(+), 222 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java
index d6ec1ccaa3..8391c7a5bb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java
@@ -190,22 +190,10 @@ protected Rectangle computeTrim(int part, int state, int x, int y, int width, in
 			y = y - borderTop;
 			height = height + borderTop + borderBottom;
 			break;
-		// default:
-		// if (0 <= part && part < parent.getItemCount()) {
-		// x = x - ITEM_LEFT_MARGIN;// - (CORNER_SIZE/2);
-		// width = width + ITEM_LEFT_MARGIN + ITEM_RIGHT_MARGIN + 1;
-		// y = y - ITEM_TOP_MARGIN;
-		// height = height + ITEM_TOP_MARGIN + ITEM_BOTTOM_MARGIN;
-		// }
-		// break;
 		}
 		return new Rectangle(x, y, width, height);
 	}
 
-	// protected void dispose() {
-	// super.dispose();
-	// }
-
 	protected void draw(int part, int state, Rectangle bounds, GC gc) {
 		switch (part) {
 		case PART_BODY:
@@ -214,31 +202,7 @@ protected void draw(int part, int state, Rectangle bounds, GC gc) {
 		case PART_HEADER:
 			this.drawTabHeader(gc, bounds, state);
 			return;
-			// default:
-			// if (0 <= part && part < parent.getItemCount()) {
-			// if (bounds.width == 0 || bounds.height == 0)
-			// return;
-			// if ((state & SWT.SELECTED) != 0) {
-			// drawSelectedTab(part, gc, bounds, state);
-			// state &= ~SWT.BACKGROUND;
-			// super.draw(part, state, bounds, gc);
-			// } else {
-			// drawUnselectedTab(part, gc, bounds, state);
-			// if ((state & SWT.HOT) == 0 && !active) {
-			// gc.setAdvanced(true);
-			// gc.setAlpha(0x7f);
-			// state &= ~SWT.BACKGROUND;
-			// super.draw(part, state, bounds, gc);
-			// gc.setAdvanced(false);
-			// } else {
-			// state &= ~SWT.BACKGROUND;
-			// super.draw(part, state, bounds, gc);
-			// }
-			// }
-			// return;
-			// }
 		}
-		// super.draw(part, state, bounds, gc);
 	}
 
 	void drawTabHeader(GC gc, Rectangle bounds, int state) {
@@ -344,13 +308,12 @@ void drawTabBody(GC gc, Rectangle bounds, int state) {
 
 		int[] tempPoints = new int[index];
 		System.arraycopy(points, 0, tempPoints, 0, index);
-		shape = tempPoints;
-		gc.fillPolygon(shape);
+		gc.fillPolygon(tempPoints);
 
 		// Fill in parent background for non-rectangular shape
 		Region r = new Region();
 		r.add(bounds);
-		r.subtract(shape);
+		r.subtract(tempPoints);
 		gc.setBackground(parent.getParent().getBackground());
 		Display display = parent.getDisplay();
 		Region clipping = new Region();
@@ -367,190 +330,9 @@ void drawTabBody(GC gc, Rectangle bounds, int state) {
 		gc.setClipping(clipping);
 		clipping.dispose();
 		r.dispose();
-	}
 
-	// void drawSelectedTab(int itemIndex, GC gc, Rectangle bounds, int state) {
-	// int width = bounds.width;
-	//
-	// int[] points = new int[1024];
-	// int index = 0;
-	// int radius = cornerSize / 2;
-	// int circX = bounds.x + radius;
-	// int circY = bounds.y - 1 + radius;
-	// int selectionX1, selectionY1, selectionX2, selectionY2;
-	// if (itemIndex == 0) {
-	// circX -= 1;
-	// points[index++] = circX - radius;
-	// points[index++] = bounds.y + bounds.height;
-	//
-	// points[index++] = selectionX1 = circX - radius;
-	// points[index++] = selectionY1 = bounds.y + bounds.height;
-	// } else {
-	// points[index++] = shadowEnabled ? SIDE_DROP_WIDTH : 0 + INNER_KEYLINE +
-	// OUTER_KEYLINE;
-	// points[index++] = bounds.y + bounds.height;
-	//
-	// points[index++] = selectionX1 = bounds.x;
-	// points[index++] = selectionY1 = bounds.y + bounds.height;
-	// }
-	// int[] ltt = drawCircle(circX, circY, radius, LEFT_TOP);
-	// for (int i = 0; i < ltt.length / 2; i += 2) {
-	// int tmp = ltt[i];
-	// ltt[i] = ltt[ltt.length - i - 2];
-	// ltt[ltt.length - i - 2] = tmp;
-	// tmp = ltt[i + 1];
-	// ltt[i + 1] = ltt[ltt.length - i - 1];
-	// ltt[ltt.length - i - 1] = tmp;
-	// }
-	// System.arraycopy(ltt, 0, points, index, ltt.length);
-	// index += ltt.length;
-	//
-	// int[] rt = drawCircle(circX + width - (radius * 2), circY, radius,
-	// RIGHT_TOP);
-	// for (int i = 0; i < rt.length / 2; i += 2) {
-	// int tmp = rt[i];
-	// rt[i] = rt[rt.length - i - 2];
-	// rt[rt.length - i - 2] = tmp;
-	// tmp = rt[i + 1];
-	// rt[i + 1] = rt[rt.length - i - 1];
-	// rt[rt.length - i - 1] = tmp;
-	// }
-	// System.arraycopy(rt, 0, points, index, rt.length);
-	// index += rt.length;
-	//
-	// points[index++] = selectionX2 = bounds.width + circX - radius;
-	// points[index++] = selectionY2 = bounds.y + bounds.height;
-	//
-	// points[index++] = parent.getSize().x - (shadowEnabled ? SIDE_DROP_WIDTH :
-	// 0 + INNER_KEYLINE + OUTER_KEYLINE);
-	// points[index++] = bounds.y + bounds.height;
-	//
-	// gc.setClipping(0, bounds.y, parent.getSize().x - (shadowEnabled ?
-	// SIDE_DROP_WIDTH : 0 + INNER_KEYLINE + OUTER_KEYLINE), bounds.y +
-	// bounds.height);// bounds.height
-	// // +
-	// // 4);
-	// Color selectionFillColor =
-	// gc.getDevice().getSystemColor(SWT.COLOR_WHITE);
-	// gc.setBackground(selectionFillColor);
-	// gc.setForeground(selectionFillColor);
-	// int[] tmpPoints = new int[index];
-	// System.arraycopy(points, 0, tmpPoints, 0, index);
-	// gc.fillPolygon(tmpPoints);
-	// gc.drawLine(selectionX1, selectionY1, selectionX2, selectionY2);
-	// Color tempBorder = new Color(gc.getDevice(), 182, 188, 204);
-	// gc.setForeground(tempBorder);
-	// tempBorder.dispose();
-	// if (active)
-	// gc.drawPolyline(tmpPoints);
-	// Rectangle rect = null;
-	// gc.setClipping(rect);
-	//
-	// if (outerKeyline == null)
-	// outerKeyline = gc.getDevice().getSystemColor(SWT.COLOR_BLACK);
-	// gc.setForeground(outerKeyline);
-	// gc.drawPolyline(shape);
-	// }
-	//
-	// void drawUnselectedTab(int itemIndex, GC gc, Rectangle bounds, int state)
-	// {
-	// if ((state & SWT.HOT) != 0) {
-	// int width = bounds.width;
-	// int[] points = new int[1024];
-	// int[] inactive = new int[8];
-	// int index = 0, inactive_index = 0;
-	// int radius = cornerSize / 2;
-	// int circX = bounds.x + radius;
-	// int circY = bounds.y - 1 + radius;
-	//
-	// int leftIndex = circX;
-	// if (itemIndex == 0) {
-	// if (parent.getSelectionIndex() != 0)
-	// leftIndex -= 1;
-	// points[index++] = leftIndex - radius;
-	// points[index++] = bounds.y + bounds.height;
-	// } else {
-	// points[index++] = bounds.x;
-	// points[index++] = bounds.y + bounds.height;
-	// }
-	//
-	// if (!active) {
-	// System.arraycopy(points, 0, inactive, 0, index);
-	// inactive_index += 2;
-	// }
-	//
-	// int[] ltt = drawCircle(leftIndex, circY, radius, LEFT_TOP);
-	// for (int i = 0; i < ltt.length / 2; i += 2) {
-	// int tmp = ltt[i];
-	// ltt[i] = ltt[ltt.length - i - 2];
-	// ltt[ltt.length - i - 2] = tmp;
-	// tmp = ltt[i + 1];
-	// ltt[i + 1] = ltt[ltt.length - i - 1];
-	// ltt[ltt.length - i - 1] = tmp;
-	// }
-	// System.arraycopy(ltt, 0, points, index, ltt.length);
-	// index += ltt.length;
-	//
-	// if (!active) {
-	// System.arraycopy(ltt, 0, inactive, inactive_index, 2);
-	// inactive_index += 2;
-	// }
-	//
-	// int rightIndex = circX - 1;
-	// int[] rt = drawCircle(rightIndex + width - (radius * 2), circY, radius,
-	// RIGHT_TOP);
-	// for (int i = 0; i < rt.length / 2; i += 2) {
-	// int tmp = rt[i];
-	// rt[i] = rt[rt.length - i - 2];
-	// rt[rt.length - i - 2] = tmp;
-	// tmp = rt[i + 1];
-	// rt[i + 1] = rt[rt.length - i - 1];
-	// rt[rt.length - i - 1] = tmp;
-	// }
-	// System.arraycopy(rt, 0, points, index, rt.length);
-	// index += rt.length;
-	// if (!active) {
-	// System.arraycopy(rt, rt.length - 4, inactive, inactive_index, 2);
-	// inactive[inactive_index] -= 1;
-	// inactive_index += 2;
-	// }
-	//
-	// points[index++] = bounds.width + rightIndex - radius;
-	// points[index++] = bounds.y + bounds.height;
-	//
-	// if (!active) {
-	// System.arraycopy(points, index - 2, inactive, inactive_index, 2);
-	// inactive[inactive_index] -= 1;
-	// inactive_index += 2;
-	// }
-	//
-	// gc.setClipping(points[0], bounds.y, parent.getSize().x - (shadowEnabled ?
-	// SIDE_DROP_WIDTH : 0 + INNER_KEYLINE + OUTER_KEYLINE), bounds.y +
-	// bounds.height);// bounds.height
-	// // + 4);
-	// gc.setBackground(gc.getDevice().getSystemColor(SWT.COLOR_WHITE));
-	// int[] tmpPoints = new int[index];
-	// System.arraycopy(points, 0, tmpPoints, 0, index);
-	// gc.fillPolygon(tmpPoints);
-	// Color tempBorder = new Color(gc.getDevice(), 182, 188, 204);
-	// gc.setForeground(tempBorder);
-	// tempBorder.dispose();
-	// if (active) {
-	// gc.drawPolyline(tmpPoints);
-	// } else {
-	// gc.drawLine(inactive[0], inactive[1], inactive[2], inactive[3]);
-	// gc.drawLine(inactive[4], inactive[5], inactive[6], inactive[7]);
-	// }
-	//
-	// Rectangle rect = null;
-	// gc.setClipping(rect);
-	//
-	// if (outerKeyline == null)
-	// outerKeyline = gc.getDevice().getSystemColor(SWT.COLOR_BLACK);
-	// // gc.setForeground(outerKeyline);
-	// // gc.drawPolyline(shape);
-	// }
-	// }
+		shape = tempPoints;
+	}
 
 	static int[] drawCircle(int xC, int yC, int r, int circlePart) {
 		int x = 0, y = r, u = 1, v = 2 * r - 1, e = 0;

From 743b9a00d09d3237eeb006a3187eae15fabc580e Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 28 Jun 2010 16:05:02 +0000
Subject: [PATCH 0164/1286]  Bug 318143 -  InjectionException when opening the
 WorkbenchModel Editor

---
 .../e4/tools/compat/internal/ReflectionContributionFactory.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
index 6dca4eea44..5b61577cca 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
@@ -42,6 +42,7 @@ public class ReflectionContributionFactory implements IContributionFactory {
 	 * @param registry
 	 *            to read languages.
 	 */
+	@Inject
 	public ReflectionContributionFactory(IExtensionRegistry registry) {
 		this.registry = registry;
 		processLanguages();

From 3efd1c1314d23a5d3b085903da7afecae6f965d7 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 28 Jun 2010 17:58:12 +0000
Subject: [PATCH 0165/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * some padding for the live editor


From 6a93e7a078f579efcda252190964d5ca8d3680ff Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 28 Jun 2010 20:08:09 +0000
Subject: [PATCH 0166/1286] Bug 318236 -  [CSS] WindowMargins and CTabRendering
 not applied without a theme

---
 .../e4/tools/compat/internal/ContextServiceFactory.java      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index 55a4242a88..4db5af4305 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -35,6 +35,7 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
+import org.w3c.dom.css.CSSStyleDeclaration;
 
 @SuppressWarnings("restriction")
 public class ContextServiceFactory extends AbstractServiceFactory {
@@ -89,6 +90,10 @@ public void setId(Object widget, String id) {
 				public void style(Object widget) {
 					engine.applyStyles((Widget) widget, true);
 				}
+
+				public CSSStyleDeclaration getStyle(Object widget) {
+					return engine.getStyle((Widget) widget);
+				}
 			});
 			
 			if( appContext.get(ILoggerProvider.class) == null ) {

From 4868b3fadfe243690592e287ee346231fc8a0b87 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 29 Jun 2010 16:34:14 +0000
Subject: [PATCH 0167/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * use ALT+SHIFT+F4 for the workbench tooling


From 8f9539bb7ff91d4ddf9366ce2be18575f0aadd82 Mon Sep 17 00:00:00 2001
From: Lars Vogel <lvogel>
Date: Wed, 30 Jun 2010 10:35:54 +0000
Subject: [PATCH 0168/1286] Change shortcut for Toms live editor to
 ALT+SHIFT+F9


From 2329e503b4a75de35210c9800ee02c3e703f725e Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 3 Jul 2010 13:44:44 +0000
Subject: [PATCH 0169/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed copyright

---
 .../e4/tools/services/IDirtyProviderService.java       | 10 ++++++++++
 .../e4/tools/services/ISelectionProviderService.java   | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java
index 52dc193634..cdbd5489ed 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.services;
 
 public interface IDirtyProviderService {
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ISelectionProviderService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ISelectionProviderService.java
index e90d0f60bd..42b49e777b 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ISelectionProviderService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ISelectionProviderService.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.services;
 
 public interface ISelectionProviderService {

From 1485926c4368316bae3fa420fffaff55742d46b0 Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster>
Date: Mon, 5 Jul 2010 12:32:44 +0000
Subject: [PATCH 0170/1286] Performance improvement - "patch so that we only
 style once" from Bug 318633 - Part/editor switching is very slow Support API
 method addition

---
 .../e4/tools/compat/internal/ContextServiceFactory.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index 4db5af4305..7e782fcaa1 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -94,6 +94,14 @@ public void style(Object widget) {
 				public CSSStyleDeclaration getStyle(Object widget) {
 					return engine.getStyle((Widget) widget);
 				}
+
+				public void setClassnameAndId(Object widget, String classname,
+						String id) {
+					((Widget) widget).setData(
+							"org.eclipse.e4.ui.css.CssClassName", classname); //$NON-NLS-1$
+					((Widget) widget).setData("org.eclipse.e4.ui.css.id", id); //$NON-NLS-1$
+					engine.applyStyles((Widget) widget, true);
+				}
 			});
 			
 			if( appContext.get(ILoggerProvider.class) == null ) {

From 7e1a636834eb8af8387a93a8c8f21081b3fcbc0f Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 5 Jul 2010 12:40:32 +0000
Subject: [PATCH 0171/1286]  Bug 308439 -  Correct plugin for e4 wizards

---
 bundles/org.eclipse.e4.tools/.classpath       |   7 +
 bundles/org.eclipse.e4.tools/.jetproperties   |   4 +
 bundles/org.eclipse.e4.tools/.project         |  34 +
 .../.settings/org.eclipse.jdt.core.prefs      |   8 +
 .../org.eclipse.e4.tools/META-INF/MANIFEST.MF |  25 +
 bundles/org.eclipse.e4.tools/build.properties |   5 +
 .../icons/full/obj16/Part.gif                 | Bin 0 -> 342 bytes
 .../full/obj16/application_view_tile.png      | Bin 0 -> 465 bytes
 .../icons/full/obj16/class_obj.gif            | Bin 0 -> 586 bytes
 .../icons/full/obj16/plugin.png               | Bin 0 -> 591 bytes
 .../icons/full/wizban/newclass_wiz.png        | Bin 0 -> 7824 bytes
 .../editor3x/templates/HandlerTemplate.java   |  50 ++
 .../emf/editor3x/templates/PartTemplate.java  |  89 +++
 .../classes/templates/HandlerTemplate.java    |  50 ++
 .../classes/templates/PartTemplate.java       |  89 +++
 bundles/org.eclipse.e4.tools/plugin.xml       |  58 ++
 .../e4/internal/tools/ToolsPlugin.java        | 117 ++++
 .../wizards/classes/AbstractNewClassPage.java | 376 +++++++++++
 .../classes/AbstractNewClassWizard.java       | 144 +++++
 .../classes/NewHandlerClassWizard.java        | 133 ++++
 .../wizards/classes/NewPartClassWizard.java   | 255 ++++++++
 .../classes/templates/HandlerTemplate.java    |  50 ++
 .../classes/templates/PartTemplate.java       |  89 +++
 .../model/BaseApplicationModelWizard.java     | 187 ++++++
 .../model/NewApplicationModelWizard.java      |  27 +
 .../model/NewContributionModelWizard.java     |  27 +
 .../tools/wizards/model/NewModelFilePage.java | 199 ++++++
 .../wizards/project/E4NewProjectWizard.java   | 606 ++++++++++++++++++
 .../project/E4NewProjectWizardPage.java       |  31 +
 .../project/NewApplicationWizardPage.java     | 417 ++++++++++++
 .../wizards/project/PluginContentPage.java    | 363 +++++++++++
 .../wizards/project/ResourceLocator.java      |  52 ++
 .../wizards/project/TemplateOperation.java    | 401 ++++++++++++
 .../templates/common/$projectName$.product    |  79 +++
 .../templates/common/icons/sample.gif         | Bin 0 -> 983 bytes
 .../templates/common/icons/save_edit.gif      | Bin 0 -> 639 bytes
 .../templates/css/default.css                 |   0
 .../templates/handler.txtjet                  |  22 +
 .../templates/part.txtjet                     |  48 ++
 .../templates/src/handlers/AboutHandler.java  |  25 +
 .../templates/src/handlers/OpenHandler.java   |  33 +
 .../templates/src/handlers/QuitHandler.java   |  34 +
 .../templates/src/handlers/SaveHandler.java   |  67 ++
 43 files changed, 4201 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools/.classpath
 create mode 100644 bundles/org.eclipse.e4.tools/.jetproperties
 create mode 100644 bundles/org.eclipse.e4.tools/.project
 create mode 100644 bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
 create mode 100644 bundles/org.eclipse.e4.tools/build.properties
 create mode 100644 bundles/org.eclipse.e4.tools/icons/full/obj16/Part.gif
 create mode 100644 bundles/org.eclipse.e4.tools/icons/full/obj16/application_view_tile.png
 create mode 100644 bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools/icons/full/obj16/plugin.png
 create mode 100644 bundles/org.eclipse.e4.tools/icons/full/wizban/newclass_wiz.png
 create mode 100644 bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/HandlerTemplate.java
 create mode 100644 bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java
 create mode 100644 bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/HandlerTemplate.java
 create mode 100644 bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java
 create mode 100644 bundles/org.eclipse.e4.tools/plugin.xml
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizardPage.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/ResourceLocator.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java
 create mode 100644 bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
 create mode 100644 bundles/org.eclipse.e4.tools/templates/common/icons/sample.gif
 create mode 100644 bundles/org.eclipse.e4.tools/templates/common/icons/save_edit.gif
 create mode 100644 bundles/org.eclipse.e4.tools/templates/css/default.css
 create mode 100644 bundles/org.eclipse.e4.tools/templates/handler.txtjet
 create mode 100644 bundles/org.eclipse.e4.tools/templates/part.txtjet
 create mode 100644 bundles/org.eclipse.e4.tools/templates/src/handlers/AboutHandler.java
 create mode 100644 bundles/org.eclipse.e4.tools/templates/src/handlers/OpenHandler.java
 create mode 100644 bundles/org.eclipse.e4.tools/templates/src/handlers/QuitHandler.java
 create mode 100644 bundles/org.eclipse.e4.tools/templates/src/handlers/SaveHandler.java

diff --git a/bundles/org.eclipse.e4.tools/.classpath b/bundles/org.eclipse.e4.tools/.classpath
new file mode 100644
index 0000000000..64c5e31b7a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/.classpath
@@ -0,0 +1,7 @@
+<?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.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.e4.tools/.jetproperties b/bundles/org.eclipse.e4.tools/.jetproperties
new file mode 100644
index 0000000000..2907c83a43
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/.jetproperties
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<jet-settings>
+	<template-container>templates</template-container>	<source-container>src</source-container>
+</jet-settings>
diff --git a/bundles/org.eclipse.e4.tools/.project b/bundles/org.eclipse.e4.tools/.project
new file mode 100644
index 0000000000..62db1d2d84
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.emf.codegen.JETBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.emf.codegen.jet.IJETNature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..259614444e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Mon Jul 05 10:09:17 CEST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..756afee3b2
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tools
+Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
+Bundle-Version: 0.9.0.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
+ org.eclipse.pde.core;bundle-version="3.6.0",
+ org.eclipse.pde.ui;bundle-version="3.6.0",
+ org.eclipse.core.runtime;bundle-version="3.6.0",
+ org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
+ org.eclipse.core.resources;bundle-version="3.6.0",
+ org.eclipse.jdt.core;bundle-version="3.6.0",
+ org.eclipse.jdt.launching;bundle-version="3.5.100",
+ org.eclipse.ui.ide;bundle-version="3.6.0",
+ org.eclipse.core.databinding;bundle-version="1.3.100",
+ org.eclipse.core.databinding.beans;bundle-version="1.2.100",
+ org.eclipse.jface.databinding;bundle-version="1.4.0",
+ org.eclipse.core.databinding.property;bundle-version="1.3.0",
+ org.eclipse.jdt.ui;bundle-version="3.6.0"
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.e4.internal.tools.ToolsPlugin
+Export-Package: org.eclipse.e4.internal.tools.wizards.classes;x-internal:=true,
+ org.eclipse.e4.internal.tools.wizards.model;x-internal:=true,
+ org.eclipse.e4.internal.tools.wizards.project;x-internal:=true
diff --git a/bundles/org.eclipse.e4.tools/build.properties b/bundles/org.eclipse.e4.tools/build.properties
new file mode 100644
index 0000000000..e9863e281e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml
diff --git a/bundles/org.eclipse.e4.tools/icons/full/obj16/Part.gif b/bundles/org.eclipse.e4.tools/icons/full/obj16/Part.gif
new file mode 100644
index 0000000000000000000000000000000000000000..610f58441a37376b23e26b89ccd311ebdac642b4
GIT binary patch
literal 342
zcmZ?wbhEHb6krfwxXQrLG2_651qWuVII&>Ei4{98XasZ^L`<+qnBkDIpku)Shm08-
z5fcm&CM?)-Az;RZhy^z?R^0HIaUo&FjfxF78g@LGaNxm(4?kY~`0?S#kHmP}#CXSw
z9J9hStM($J%y`>|9HWLDv&2ZpX_fl@Mf!#DR{z0(fqFpkCkrD3gBpVl$ViZ%7}$y(
zf>&-ZkdSC^KID{X<~y<Dv0|f-hG<LbX%o>7w<ST19d5o#>#A}E7wRtEQ4_ao$K@}3
z?wT|`e=e@9CR<luC@!m}(Ap*;uO{77FCncaGpSNSW}2A9y!i{}si?`#UASCMO=?D^
Vq?+P}jhi;BZQZtghngdUH2^{`bL{{C

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools/icons/full/obj16/application_view_tile.png b/bundles/org.eclipse.e4.tools/icons/full/obj16/application_view_tile.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bc0bd32fceb21d70368f7842a00a53d6369ba48
GIT binary patch
literal 465
zcmV;?0WSWDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzV@X6oR5;6}
zlif?gU=+sv7bPi)=!3$7q?JQqQvwMoh(bhK+J{k6%rsgQVNn!z(HBXQkd^mAH(hwA
z^Yotc=4S08nh!j@F!ub;!`WU30603a!#SmnFKE?TaOVx=ZRYd~NSn_P*eHX4{Rzai
z68Mrum`pr?uyhCB_zlR(s~YAA5Xn~cSpFUUYax26696aMv1k4Q2q33l!H$M!&p1HZ
zs?dXQ!8A(HJcd!rMboIk$jLW=EvyAdm3{&e#VDQ4W|M-siV5fsA9Db1`>zJNu3H-P
zO&@UpeyZQXi7jKe-Hk?r-sue;aDce_XqkvXP+W#F_*ot`jB?BS93Uw71|U^ZjLH<w
zh;-sq3Vy5@0GB_@0Tc0CO9QIe)}UUmTN-qU84mEqu5JAXPM->`yP%FO7U<6!nLCG}
z$SDlW<k^-FX;JQ=20hXqbO&;*_AZ;O0?VLP0(5*EI|Y0J3Jfj)lKW#`00000NkvXX
Hu0mjf{J_IH

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.gif b/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e4c2a836f83e7dc72d29873fded01e7206eba2f5
GIT binary patch
literal 586
zcmZ?wbhEHb6krfwc*ekxv!c<s$=9se-=Q<YsXNN8KQ3fOR@Cf*m^p=Yn<q4Gopkom
z6_qkOy&5;;MsLfufQUJ{vGWR(7nLtMxlXsnMX%OXzt+v54k+vCJt@I!LR|T}_8Twn
z8a23^wRl;#``dR0_3fQy*Wqv15n$II;MN!J-X9S(Eh&3>RsX(Ohwq+z^!{nkw1lu(
zDPc2HV&`P7KEHX-jYA>R6T@ewM9fTyo0E0x)!k<wUj$8y`}qA+!h+12O)Zt{8e4bt
z^z51Z;rqwPnTZ)o@)H-NC(KKmcWmLES9jAFW#uj_C|_66u(_dnV^!t4^7b9Ajhky9
zzJD-rU(e=C8}{7Xx$oBQ`NwB1I6iy#jqQi->_2wz@P-Sk|APSoeSzXn7Dfh!C<Yyn
zwV*g*U|-%4)fB}oD9JA+$lcr%#l`RFG0BmUtG7?qHzF)NEX0#%S~EAlcTnVt6@gxi
z-A(LH!7D=j10wx=oP?TLEnFg9oe#OYxjC>lGm2|QYKe-7h)T#Q@$He9j?`9AQ4ux}
zP&?5iq-<&#X{ezXX|J!t&@97aWMj6{+|Gn&T@xp-YRQ`y8=a5yFmmdtZYWsP+AXH8
bqq4{4!~q5-W`Qq@Pi$O#yuX);k--`O+yTtY

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools/icons/full/obj16/plugin.png b/bundles/org.eclipse.e4.tools/icons/full/obj16/plugin.png
new file mode 100644
index 0000000000000000000000000000000000000000..6187b15aec001b7080b51a5f944f07591f26cc15
GIT binary patch
literal 591
zcmV-V0<iswP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz;Ymb6R5;6}
zl08V3aTLaXuVw{)TtAV-EQp(VZ&;&yOGCA^HyY7UV+BnWv^BakMQc+OB&0Z27AkkL
zxPppG-9jbH?t7kd8eTEus*7hi@aLT8f1cktNknjvIJDd2gQ>eEcNHZMNv|IbJ-M`(
zKwWL~opzjJe^WpCmV9E;(0&ut2;4va_(#>M8)>9$R5viQnf(Nkh~VM$y>J(jqb$cj
z+nL1Nm|mV)Gm|9MnHf*7Ja4OEAQz__^LRKOLEwqpiGV^^A*T=#&inGm-62Xs;dnSp
zKj&H9T*boh2<no0+=ElOJZ83sfQeG2L`y@C?#3Rz{i>i)W+(n27l!C)>fq|L%VB1i
ziC4p;NwV_}ZjW7$LRW#(_bKF#hp=!IqNO26Z*w2+LEwx{PVnZ&Sn}T;m<fe2Wm#Lz
za$)sCo<WYS+HDKB-VTSEXg%7B+({$Nn7A;{*z`8{F+2a6g_Xssq{Gq<0W(qT9zX<h
z>tzb<gWDVNaLQ|6kUI-2i;UhJKT-oRHNy~7Uq5lS^Bm=sIhHERNTM^>$;qA*nT@@+
zV5uQ@iXDTPoTbV#FRr~z04|PPh`wXTNoCm9*tG&?e3+fYl>K6+&3|Cc$KOpL`ER+_
dcRl5U#9zn6ZO}GF<yZg!002ovPDHLkV1oCe4!{5a

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools/icons/full/wizban/newclass_wiz.png b/bundles/org.eclipse.e4.tools/icons/full/wizban/newclass_wiz.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc123864111e5acc8a884143fbcf463cf8775588
GIT binary patch
literal 7824
zcmV;B9&h1^P)<h;3K|Lk000e1NJLTq002t>002S=1^@s6A3-Z300009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde00d`2O+f$vv5tKEQIh}w03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`
z>R<o>I+y?e7jKeZ#YO-C6Rk-^K~#9!?3-zjUB`9bf8BR^`<pjAfFXzhKmnjgg5V;S
zxKk3vDB6l&VyUu}l@F|ZNy>68f8iHfsgzQRQ=uw$99I|>Whtq$%CSV*imlBy6`3-{
zP!PcdTtt8XvCd#H%UkcexBHxYxNjZ?<ZuNfK%nnbSHHRMzP_)2_uuE7KHbmo568O4
zfBchUfht8+9Z{tQl)`_&au%QnD5+8x(TXaiweP>{VLkA_j|Zw$L@A1BNkuE7#Oq!A
zu7&mc-#k$gp{%O0LV#)w)xsNn=3NErkN*6m6{Vo6HB|y*K$SA8RlvO2=ifE3{`<G*
zYNA>;U{!%!O?3mYd5dja^02=AmvbdiawP$pOQ@t!Ghp;>v~|hC`pS3bV^!*^8X3(Y
zk%OvXD6c*Du7&kKzkeza)w(LhSHUpG&;Vl9ch>eL1?zwP;8aDGssVcz4?}1TBPxV?
z4((qOu)hAc3(-JLF~F;o6I#QV>f5tVmn5t|ePp2`O4VSjzRC(22#qmgs(Q|#ex+f3
z<432h2&0O|>ltg454|x_jOzKh=dUEJhyU($QIrv5hB4EtEqQ1RV=9=p@AG~Mu<pD6
z`aQtCz@5Mzpz%7FJ_0-m{P4jq?0xv{-sfA7F4h$)Ms-~b20~-ckBwTV?Q;Uu06q)+
z`q;$O?AGl&n3>ti)YJ^cVg+k#ehXCuPcP{(KYxs4M_=anvBR7^c61qd82J2yU)X!-
zjqde-9$U1cjH(igf{G#vqKXQLf~tnrm@!c`q9BsLFRRzCt>x_h{h(IO+d6Ns&OkE1
zamB7H8`s@*E90XZs1~ZkVUZ{ZvBnSt2EpOI!%0deDQV_NGf(O=mR3&j;&V^){8RhL
z()25@2kkF^vJ|N@rm9v3oq07Zg}@lbRWWBETwqxD-GBXEz(cb;-!r@CeK)gda+cBZ
zIOVv4!D5U(t5L-xn&Ii=G$GSAnRZFDjDBiJdWLpyndhE*lKnq@avAu|2fwiQE32RX
z&f`lZg@y>It^#@$EX54MgYax9=NDG+HbMPv6h{x;_K)vwTz}(jY@go6cx8%0SjL)&
zz(iQ`5)fesu!IAEX7F?j##pdI5cRNy7RD4Ao8G|GmJP+l`GtG0zHxMR?~hJ=>w8Zu
z*MYjOiJf#%&@->Yz>I?lb@kj^sdfGHtM@o3W!-oG^$*p?Mm}@f$3MjOsrNEnyDWz?
z0AvX0`!@6411xl3p_4AN+&h66!HXvohZ9F^E5t#8MtPE{kx8oMfIcfEiPCNrXm^`D
z^Y=gF_<>_jUw7@l`6t`9exkXmlJ%5j4RxUO8s+=~loh^pP_@t8`mwv%wP`n_r70{S
zfr+t1H2d=$ZSCV^`{!6nRN^V>g;^#lR}%*nqM!^wE1AQIqnXSx-#NtolY6PeqwLvy
zBXPM$X=DK>HLkgR4}!nu$*2C{&$ey-#D`z+dj-~%jnR_GFDGO%ZvoV2tE1HiZu;mg
zT({+BYVjC>DH56jDwZRypK)a6Daz4C8pUl?;t3*CAhZz%OJE|5$!{a-hs9}1;=26V
z)Bm13XFp9bs*(nCxabJ2r5b&g^6cO3<MiQ`uYcm>fAO2IR+d3yYs_e_9QXw(%cv5n
zY6zI{&5U^%hYwtH&$aB>w1aY79@rm?7vZV7Kd0vsHdJq-UYMa^OGLIvWD7(#CNS~P
zQmtA8MRAhhG^Le1PaKpOEpDXmyO^wwPc{=(4%1&LvhBtzXf5vj)L(t~)BFF?hyUck
zHPLwx7}L=68AvHclt@HFRU%cwSBuHMNfQrkd;d1JOwBM_t`AM0myDmD_y(Oc;qs9?
z7%R?F2}h_#qtv2t>d^%CXo6ZeMlG747L5<e1hsISk$94kXp*Jwai%Jl=MP};5DX!{
zGYwdRIAHtDSKws%xAr~trOm5fDhf=)m~)E}6^tmc^ICCU8_w&vh}Kmps}ij@>g*eN
zzQ$!Ev(vMaTsAt6B6(5e@#Ej1-A|Yuy@N_PN;#}k2^&<x2Gy`ZDX0;e0@eh%_gnL4
zO+aX3ib0hVtrwZ8?;IwZ7y`2xV^9^!jS`dZnW!H*`q%$<0IF`xJDYi^5_qBLyw;u5
zaqqRRN@<{?cQ)M_1f9PzbKOR^Pfg<SSR9Jy#l^>1Xq{&F#!pfSM=1q0ib0KXP@@o(
zF$4bd-IqAH^7ouhUg1>tWt?|33Nw_$QD#SOV5W8zhgY6v*TgM@j^w^v(ZMq{hzNo(
zxpRVrmlr<u-1GnA4|ZRDUt9ET0Ww}Fc&`O78i~Fpg>%kx!_PEkM;hbfRVt+buPFhJ
zzI51sVlT6!H&KfxiEW8OP@xo5hM+R(@#yg{bF%XS)8$=Em3J^v*oISwmyF}>7x~V?
z-zW1K<)}_Ms*_4@V9jLEK|xi>yu+!(Mux`h2uBWl|F?Hvec$iAm5zBK&H+h5<oryh
zUk}!=k8G(jUN7LZ2d01{<%JXb5ee8lvYXfziGv~qTOzilA*jDN_<8ElH1}No+Z4h&
zst&(eBxA?et#q>{FE0LsZnlDudq-7|sN}Da+!1(BlJ$v;hOzfFn1A-APtKp(`=2Hz
zu5Z1b9dcevPP8b3mGeB4w(AVR*{B@uDNe@JD+Z?tPWz<3$BT2%GgiKw(8h!&CNjC_
z3kFX0he!U1Mtm8!Z2FhPVRbOgaftdez|;}gkSoS+<jTq02BCz*55o#M15Z4Cmy-1R
zm{6&1DzpE&uYO=1NI~YcmN^|4rHsC*<2paEfP0IRF}0FKZAz*MsdhNIyg;kJ!gO^z
zp@|6XYKZ~E$<7PRbq;dP<j2XRkCQ%5(!6Mjmkh5NUe+j0v%&fN{~T(DAHWqHnak)V
z34&0Zi0O2W->~{cMTs(}Bbn1tRSLi8pme=qcx_=kq*8)R6I3liz|qBo%sVElTd*d?
znjo(S)60V^PcTv1j=_*gA5{Tz1MOGUGXOS(C@D@eoaE4)=4A*LPv$cEE~Qv0QkV!?
zezv_+M5D}U*$a{K%RAPCHEYX;DE4HU;MI^NhEuI2s__^GJNOH+gDeBU$@T#@*RRQg
zOUy6;RrLd4uLEmUg}PRaeKJXh%F42gB(;QfgY(Hw=NZvoCZ#tRhId8dpf;tiJyK0r
z>2^qcA7etS$zvd6%pkd!9|xCzhN_TCk5sy(zBecdsqc~bgj5nzpO8tPRQhC+<hAz6
zWNpbodU2#KBXb$Oem}Q&Wy`VSe=~g{(%I{JL$97x`-Bo8K(hmVpAebV8Gw1s)UxkV
z65pZk+C#Oe=3Xr~+Gp&PlMJsZnO_B#44@`wph|+198~5r`l%8XLxPfFW%-2-8#jDl
z?xKJt>PQs=wFuDb$MjtfY;h0^<(VW=zh*`rk+?2B-x>s_X3cdn^m?l{$!R*so(@1s
zZ&32rPBQvwf2b_y2dNp93w5loEO8_vn86G@b7h=lSj|w?Gi8{5GmIB6XR&vZT48jU
z>|5>F+H6Cvt~6K8z+SBm*}nAX`+Nv{btGw@%w?p`;XL?@5|%pp10X1P&A`CHh5cx5
zu7|;-s3$O%UE{a##K~_nS)IuZykVFfRh4{ZDXU?@86%%cFSlU>SgG$0LyT6ZH&B+t
z33xR~R~fl{=gA8JYdr)1WO~}u>NpbV)0I9>9EB*viRXCp&>GK{+aQ3OHhqlaE3Yuu
zIZV$t>A4nN*P`cI^n9D1Yv#3IJ(t&s@6dDY+}`>20Ae0OG}~P=mwQAL2wpOz2Q!;K
zICrtYI^?=SujlD$N=k+|eagiGU^uw&?65O#Fq{NWDXQ_2EAHd*!+%S&e>#WbR_MAW
zUAHnUJ=dh`nrnbHNqmcB71SWsT4{C2vVnnj88#5IrVxdd0~gaU{Go4hZ_*JW$q0-^
z;si|$^>Ud<4}OQ+wtZ}1ocp9EA(V*Nmih3uf5E}UXZX(kZ?bd4dzq?D69&;>N+JWB
z<vF>0f)mTfY4_Xgp565tn<na6Txyf~Y@jShp$zF!Aucp7Dp-%me1O}T&~F>!sz;*)
z-wl{()YyOM2#+8B8*ZKb2%$uzCL-`5hJeTx_*XZ6k?S{ph_65M0DBLAn?`wbuyP`#
zE@P#;f~a!!^!qtD|L8E<7tQUUS5H4pSz77foFj9da>e9cbiP2Xx@F%*1M9&r?0xdS
z`>#LbnlhU#T5L6gVuD+aiQ|A;rNsB1|5L8scvGHVCpar@9NGf!o4JSg&D_I$=O|Cl
z{g}D-5mc4w%4Vjjo7ue~&tcvD<#F0cn>Y^9f$Bs(M~*HHhM>neN2y-Grw*B~vg7uD
z{^N_v8v=hUhYP=x);fe8B`hU)il~HKK0U_M2afRN$G*tFzWv{=nfd2anm8yD+aiI9
zn5taHhqnFNI;oUAM!RbI{VaEnF&0*b!?4**Xf}H|=gFKy5z2M&a{-mg%=a22JKA!A
zqKDT@WqgSf#bxP2a?0YZLn~dJq^NORv3ZJv3;TKS$Nz!FWNzU7nsod!?QEG=wnW=4
z(e*1NzCD}*^?Zx2U!k2X(#%e=xp4){oz^gn==6FVIkHTa<sQ&E&&Y%Y>(K*cHcY?&
zdlz!|&blkodw+Byx#9MWr9et|G3xO)C1_;0r66Ac4lVUciRX^~od0+D|1w?Q#7Jcn
z5tpZ9G#$?W`qCxwgU~>_^n5c97krCXmS5uO6F*^eq)6s7UOCjH*UNCu;habDY`&sG
zc)UTpG_mj2n}6?Xt6{LNS&@FDm1oemz9RijU;*54`^G1=Wj<Y*o@gK;T5lsbq?bqL
zVQ82ft+Lo!;gJ`<&kOVW$Rwp+8bOVaNuR#&<bkGiNu)#KTSH(!UwDS+PCm&CbI&q4
zR^rghO*-uq=W|fr3tM+gFjkl$eNwsZn&0|dy|%S;Az_&}SvR~lC`aF%_}~nQUBFKr
zrgKD4uX#RekfP~yGv-crSZ*d@;IhUn<CQ5cYiwPc&E#}@j)l%VM;2eEn|6q!fXPOM
zv<3a1!+F7bMI~frW||%E+0OE#r>XiaU%Ts$Km4kQ3>R5t&Bl;7T4Ys~_1~9uu2&sG
ze5WhY50s`xKD*)0o%H-1zJ8eI$&}Q$QFX(O9tML5v^puh#L?`eYj#=a>PidcQb-&H
z)T%N4wy-eQ$2&p9fP@%IY}~MstFF9~rJo)rJ(2DE#7DpJxx8~17S@~YqS^bS6W`r^
z{n)HY!aY;7R}my*#6gY7R<SldYod%1;@DCxhm4OF8E+KwdNi-c8b#{W2yt-wWJ-I*
zqY`2%6WSV~9bxmP?Ob>DO)UQO2)(1N19#r`d-oTM<7wUr<)XA%uLAb1tFEbTbt~zf
z4YSu$j7N!sI+3jt*&30p6Nfdzpp-A!n;?(BjLl!0fPNP`EyLoRA!)~0sSw&akr^Sf
zbwXQb*Y<1K^WK{|`IBd8y>jZn2k!XKpBruLXrJleg@yH&m%vXgXXBs$(g*)*RI7e!
z=N%s<Zj|X|%XE@OlC()b>yWxGGDzxqmuC*r)RFdmE_H8EHK<rr0#pLffLdjY-MemN
zq%_9<A3RKdv9<56+rRj`jmD1lS(`jAcAEuodL^qVR7I5k^3Xr~$o%P-zqI{^yX%{;
zxdjOv?d}52?&%y@)+2KXnM-j#8+f+dyRCjn6@z#~wLHq!nVoFew1XqhJjP2;{D4Mv
z_G=%x`wzeR+7A8-z*=l(k-~(oY4qvm|9bkb9(myNN!I=3_C5Eo?b^E`gm!n4c5j(Z
zZ<%&?B?sm*oH)D}43=`S&gAGO#z!_%iL1=L{1neW{w<{M_FZ-5ul={HcKy=>>jSt*
zVZC(dSfC;WW6Vex#+$u!Q{MT8cWz9D%_4q-I6u9(d~Dkj&po{T<+;5~ZQ0G_WmhwG
z*;O<qXHj*C$}p2^jK!LOPIG}%N1tK-=(8Mq=`l7nc5?N$51-ny>AGhK?4p`*QB81K
zjcs{?Whb`n)b{!==sKsF%LRIIz<TM>u?ZEK7B3sXY{$!t_kKdWOp4FXi}&N={MhQ}
z)2z$Ob9*^)`UMu6uW-8g3e}N~R7W-r&1RakS)BhlwbBIR^~;&va2;ExuP2Vm!_>bG
zf+cLQWCFWrf?ydNEUO8Y!~~08?NTOoDanGRcHgdC2w3Y)q?;JyqB!=}SnHi%Hr|Z^
z)8b@7M2?8}BjTkdA`L`~L0GF?IeTZg>+(AzkO(Dcc2C(>cVYFBm^iF3dD9lb;4sD;
zg99>SZ5Lzu#s<q++rikDvB8QO+Y)SB)Ha>il}v0Wb*7zUws+BF9j=(2Nn2g#R4J&k
zBC5s<W8V9ch#C<Iy-29yBkwg7^^uB(B3M-kRW($Fl1@fbgB^825Y!cns%8R;S}%%M
zW4tQj)nuy1c{Q1c@m_G=BTkH8&t_dzDH>xKQN`vRWDE$c4YGWnN|0jn#S9aGA4u1%
zkuz%~9tEasttqb#2_1I)jP$)S_?3j7*#~+7p}gf3O(*dcFh#&H0Cf(#drc6S5|_wv
z7OY<12S62csHk&kJPK{;T=#xn%*tv2!TA7X3?{sURCN}tB=serkPkg`&OfcY)KoQu
zm1bfMrg1(Lb*ZZAjIs=)3gejb^JC30Fa^V<r78gHycB_r=L;0%;R2W7VS%mYJpTMQ
ivL-gh*h>-C{~rKy(Y&;(zo0t+0000<MNUMnLSTY>rc|c@

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/HandlerTemplate.java b/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/HandlerTemplate.java
new file mode 100644
index 0000000000..e969a0930a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/HandlerTemplate.java
@@ -0,0 +1,50 @@
+package org.eclipse.e4.tools.emf.editor3x.templates;
+
+import org.eclipse.e4.tools.emf.editor3x.wizard.NewHandlerClassWizard.HandlerClass;
+
+public class HandlerTemplate
+{
+  protected static String nl;
+  public static synchronized HandlerTemplate create(String lineSeparator)
+  {
+    nl = lineSeparator;
+    HandlerTemplate result = new HandlerTemplate();
+    nl = null;
+    return result;
+  }
+
+  public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+  protected final String TEXT_1 = " " + NL + "package ";
+  protected final String TEXT_2 = ";" + NL + "" + NL + "import org.eclipse.e4.core.di.annotations.Execute;";
+  protected final String TEXT_3 = NL + "import org.eclipse.e4.core.di.annotations.CanExecute;";
+  protected final String TEXT_4 = NL + NL + "public class ";
+  protected final String TEXT_5 = " {" + NL + "\t@Execute" + NL + "\tpublic void ";
+  protected final String TEXT_6 = "() {" + NL + "\t\t//TODO Your code goes here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_7 = NL + "\t" + NL + "\t@CanExecute" + NL + "\tpublic boolean ";
+  protected final String TEXT_8 = "() {" + NL + "\t\t//TODO Your code goes here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_9 = "\t" + NL + "}";
+
+  public String generate(Object argument)
+  {
+    final StringBuffer stringBuffer = new StringBuffer();
+     HandlerClass domainClass = (HandlerClass)argument; 
+    stringBuffer.append(TEXT_1);
+    stringBuffer.append( domainClass.getPackageFragment().getElementName() );
+    stringBuffer.append(TEXT_2);
+     if( domainClass.isUseCanExecute() )  { 
+    stringBuffer.append(TEXT_3);
+     } 
+    stringBuffer.append(TEXT_4);
+    stringBuffer.append( domainClass.getName() );
+    stringBuffer.append(TEXT_5);
+    stringBuffer.append( domainClass.getExecuteMethodName() );
+    stringBuffer.append(TEXT_6);
+     if( domainClass.isUseCanExecute() )  { 
+    stringBuffer.append(TEXT_7);
+    stringBuffer.append( domainClass.getCanExecuteMethodName() );
+    stringBuffer.append(TEXT_8);
+     } 
+    stringBuffer.append(TEXT_9);
+    return stringBuffer.toString();
+  }
+}
diff --git a/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java b/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java
new file mode 100644
index 0000000000..3bcf847594
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java
@@ -0,0 +1,89 @@
+package org.eclipse.e4.tools.emf.editor3x.templates;
+
+import org.eclipse.e4.tools.emf.editor3x.wizard.NewPartClassWizard.PartClass;
+
+public class PartTemplate
+{
+  protected static String nl;
+  public static synchronized PartTemplate create(String lineSeparator)
+  {
+    nl = lineSeparator;
+    PartTemplate result = new PartTemplate();
+    nl = null;
+    return result;
+  }
+
+  public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+  protected final String TEXT_1 = " " + NL + "package ";
+  protected final String TEXT_2 = ";" + NL + "" + NL + "import javax.inject.Inject;";
+  protected final String TEXT_3 = NL + "import javax.annotation.PostConstruct;";
+  protected final String TEXT_4 = NL + "import javax.annotation.PreDestroy;";
+  protected final String TEXT_5 = NL + "import org.eclipse.e4.ui.di.Focus;";
+  protected final String TEXT_6 = NL + "import org.eclipse.e4.ui.di.Persist;";
+  protected final String TEXT_7 = NL + NL + "public class ";
+  protected final String TEXT_8 = " {" + NL + "\t@Inject" + NL + "\tpublic ";
+  protected final String TEXT_9 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_10 = NL + "\t@PostConstruct" + NL + "\tpublic void ";
+  protected final String TEXT_11 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_12 = NL + "\t";
+  protected final String TEXT_13 = NL + "\t@PreDestroy" + NL + "\tpublic void ";
+  protected final String TEXT_14 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_15 = NL + "\t";
+  protected final String TEXT_16 = NL + "\t@Focus" + NL + "\tpublic void ";
+  protected final String TEXT_17 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_18 = NL + "\t";
+  protected final String TEXT_19 = NL + "\t@Persist" + NL + "\tpublic void ";
+  protected final String TEXT_20 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_21 = NL + "}";
+
+  public String generate(Object argument)
+  {
+    final StringBuffer stringBuffer = new StringBuffer();
+     PartClass domainClass = (PartClass)argument; 
+    stringBuffer.append(TEXT_1);
+    stringBuffer.append( domainClass.getPackageFragment().getElementName() );
+    stringBuffer.append(TEXT_2);
+     if( domainClass.isUsePostConstruct() ) { 
+    stringBuffer.append(TEXT_3);
+     } 
+     if( domainClass.isUsePredestroy() ) { 
+    stringBuffer.append(TEXT_4);
+     } 
+     if( domainClass.isUseFocus() ) { 
+    stringBuffer.append(TEXT_5);
+     } 
+     if( domainClass.isUsePersist() ) { 
+    stringBuffer.append(TEXT_6);
+     } 
+    stringBuffer.append(TEXT_7);
+    stringBuffer.append( domainClass.getName() );
+    stringBuffer.append(TEXT_8);
+    stringBuffer.append( domainClass.getName() );
+    stringBuffer.append(TEXT_9);
+     if( domainClass.isUsePostConstruct() ) { 
+    stringBuffer.append(TEXT_10);
+    stringBuffer.append( domainClass.getPostConstructMethodName()  );
+    stringBuffer.append(TEXT_11);
+     } 
+    stringBuffer.append(TEXT_12);
+     if( domainClass.isUsePredestroy() ) { 
+    stringBuffer.append(TEXT_13);
+    stringBuffer.append( domainClass.getPreDestroyMethodName()  );
+    stringBuffer.append(TEXT_14);
+     } 
+    stringBuffer.append(TEXT_15);
+     if( domainClass.isUseFocus() ) { 
+    stringBuffer.append(TEXT_16);
+    stringBuffer.append( domainClass.getFocusMethodName() );
+    stringBuffer.append(TEXT_17);
+     } 
+    stringBuffer.append(TEXT_18);
+     if( domainClass.isUsePersist() ) { 
+    stringBuffer.append(TEXT_19);
+    stringBuffer.append( domainClass.getPersistMethodName() );
+    stringBuffer.append(TEXT_20);
+     } 
+    stringBuffer.append(TEXT_21);
+    return stringBuffer.toString();
+  }
+}
diff --git a/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/HandlerTemplate.java b/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/HandlerTemplate.java
new file mode 100644
index 0000000000..711cdd745c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/HandlerTemplate.java
@@ -0,0 +1,50 @@
+package org.eclipse.e4.tools.internal.classes.templates;
+
+import org.eclipse.e4.tools.internal.classes.NewHandlerClassWizard.HandlerClass;
+
+public class HandlerTemplate
+{
+  protected static String nl;
+  public static synchronized HandlerTemplate create(String lineSeparator)
+  {
+    nl = lineSeparator;
+    HandlerTemplate result = new HandlerTemplate();
+    nl = null;
+    return result;
+  }
+
+  public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+  protected final String TEXT_1 = " " + NL + "package ";
+  protected final String TEXT_2 = ";" + NL + "" + NL + "import org.eclipse.e4.core.di.annotations.Execute;";
+  protected final String TEXT_3 = NL + "import org.eclipse.e4.core.di.annotations.CanExecute;";
+  protected final String TEXT_4 = NL + NL + "public class ";
+  protected final String TEXT_5 = " {" + NL + "\t@Execute" + NL + "\tpublic void ";
+  protected final String TEXT_6 = "() {" + NL + "\t\t//TODO Your code goes here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_7 = NL + "\t" + NL + "\t@CanExecute" + NL + "\tpublic boolean ";
+  protected final String TEXT_8 = "() {" + NL + "\t\t//TODO Your code goes here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_9 = "\t" + NL + "}";
+
+  public String generate(Object argument)
+  {
+    final StringBuffer stringBuffer = new StringBuffer();
+     HandlerClass domainClass = (HandlerClass)argument; 
+    stringBuffer.append(TEXT_1);
+    stringBuffer.append( domainClass.getPackageFragment().getElementName() );
+    stringBuffer.append(TEXT_2);
+     if( domainClass.isUseCanExecute() )  { 
+    stringBuffer.append(TEXT_3);
+     } 
+    stringBuffer.append(TEXT_4);
+    stringBuffer.append( domainClass.getName() );
+    stringBuffer.append(TEXT_5);
+    stringBuffer.append( domainClass.getExecuteMethodName() );
+    stringBuffer.append(TEXT_6);
+     if( domainClass.isUseCanExecute() )  { 
+    stringBuffer.append(TEXT_7);
+    stringBuffer.append( domainClass.getCanExecuteMethodName() );
+    stringBuffer.append(TEXT_8);
+     } 
+    stringBuffer.append(TEXT_9);
+    return stringBuffer.toString();
+  }
+}
diff --git a/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java b/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java
new file mode 100644
index 0000000000..d10a26816e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java
@@ -0,0 +1,89 @@
+package org.eclipse.e4.tools.internal.classes.templates;
+
+import org.eclipse.e4.tools.internal.classes.NewPartClassWizard.PartClass;
+
+public class PartTemplate
+{
+  protected static String nl;
+  public static synchronized PartTemplate create(String lineSeparator)
+  {
+    nl = lineSeparator;
+    PartTemplate result = new PartTemplate();
+    nl = null;
+    return result;
+  }
+
+  public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+  protected final String TEXT_1 = " " + NL + "package ";
+  protected final String TEXT_2 = ";" + NL + "" + NL + "import javax.inject.Inject;";
+  protected final String TEXT_3 = NL + "import javax.annotation.PostConstruct;";
+  protected final String TEXT_4 = NL + "import javax.annotation.PreDestroy;";
+  protected final String TEXT_5 = NL + "import org.eclipse.e4.ui.di.Focus;";
+  protected final String TEXT_6 = NL + "import org.eclipse.e4.ui.di.Persist;";
+  protected final String TEXT_7 = NL + NL + "public class ";
+  protected final String TEXT_8 = " {" + NL + "\t@Inject" + NL + "\tpublic ";
+  protected final String TEXT_9 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_10 = NL + "\t@PostConstruct" + NL + "\tpublic void ";
+  protected final String TEXT_11 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_12 = NL + "\t";
+  protected final String TEXT_13 = NL + "\t@PreDestroy" + NL + "\tpublic void ";
+  protected final String TEXT_14 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_15 = NL + "\t";
+  protected final String TEXT_16 = NL + "\t@Focus" + NL + "\tpublic void ";
+  protected final String TEXT_17 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_18 = NL + "\t";
+  protected final String TEXT_19 = NL + "\t@Persist" + NL + "\tpublic void ";
+  protected final String TEXT_20 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_21 = NL + "}";
+
+  public String generate(Object argument)
+  {
+    final StringBuffer stringBuffer = new StringBuffer();
+     PartClass domainClass = (PartClass)argument; 
+    stringBuffer.append(TEXT_1);
+    stringBuffer.append( domainClass.getPackageFragment().getElementName() );
+    stringBuffer.append(TEXT_2);
+     if( domainClass.isUsePostConstruct() ) { 
+    stringBuffer.append(TEXT_3);
+     } 
+     if( domainClass.isUsePredestroy() ) { 
+    stringBuffer.append(TEXT_4);
+     } 
+     if( domainClass.isUseFocus() ) { 
+    stringBuffer.append(TEXT_5);
+     } 
+     if( domainClass.isUsePersist() ) { 
+    stringBuffer.append(TEXT_6);
+     } 
+    stringBuffer.append(TEXT_7);
+    stringBuffer.append( domainClass.getName() );
+    stringBuffer.append(TEXT_8);
+    stringBuffer.append( domainClass.getName() );
+    stringBuffer.append(TEXT_9);
+     if( domainClass.isUsePostConstruct() ) { 
+    stringBuffer.append(TEXT_10);
+    stringBuffer.append( domainClass.getPostConstructMethodName()  );
+    stringBuffer.append(TEXT_11);
+     } 
+    stringBuffer.append(TEXT_12);
+     if( domainClass.isUsePredestroy() ) { 
+    stringBuffer.append(TEXT_13);
+    stringBuffer.append( domainClass.getPreDestroyMethodName()  );
+    stringBuffer.append(TEXT_14);
+     } 
+    stringBuffer.append(TEXT_15);
+     if( domainClass.isUseFocus() ) { 
+    stringBuffer.append(TEXT_16);
+    stringBuffer.append( domainClass.getFocusMethodName() );
+    stringBuffer.append(TEXT_17);
+     } 
+    stringBuffer.append(TEXT_18);
+     if( domainClass.isUsePersist() ) { 
+    stringBuffer.append(TEXT_19);
+    stringBuffer.append( domainClass.getPersistMethodName() );
+    stringBuffer.append(TEXT_20);
+     } 
+    stringBuffer.append(TEXT_21);
+    return stringBuffer.toString();
+  }
+}
diff --git a/bundles/org.eclipse.e4.tools/plugin.xml b/bundles/org.eclipse.e4.tools/plugin.xml
new file mode 100644
index 0000000000..56fd224e4e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/plugin.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.newWizards">
+      <category
+            id="org.eclipse.e4.tools"
+            name="e4">
+      </category>
+      <category
+            id="org.eclipse.e4.tools.classes"
+            name="Classes"
+            parentCategory="org.eclipse.e4.tools">
+      </category>
+      <category
+            id="org.eclipse.e4.tools.model"
+            name="Model"
+            parentCategory="org.eclipse.e4.tools">
+      </category>
+      <wizard
+            category="org.eclipse.e4.tools"
+            class="org.eclipse.e4.internal.tools.wizards.project.E4NewProjectWizard"
+            icon="platform:/plugin/org.eclipse.pde.ui/icons/etool16/newpprj_wiz.gif"
+            id="org.eclipse.e4.tools.E4NewProjectWizard"
+            name="e4 Application Project"
+            project="true">
+      </wizard>
+      <wizard
+            category="org.eclipse.e4.tools/org.eclipse.e4.tools.model"
+            class="org.eclipse.e4.internal.tools.wizards.model.NewApplicationModelWizard"
+            icon="icons/full/obj16/application_view_tile.png"
+            id="org.eclipse.e4.tools.newappmodel"
+            name="New Application Model">
+      </wizard>
+      <wizard
+            category="org.eclipse.e4.tools/org.eclipse.e4.tools.model"
+            class="org.eclipse.e4.internal.tools.wizards.model.NewContributionModelWizard"
+            icon="icons/full/obj16/plugin.png"
+            id="org.eclipse.e4.tools.newmodelfragment"
+            name="New Model Fragment">
+      </wizard>
+      <wizard
+            category="org.eclipse.e4.tools/org.eclipse.e4.tools.classes"
+            class="org.eclipse.e4.internal.tools.wizards.classes.NewHandlerClassWizard"
+            icon="icons/full/obj16/class_obj.gif"
+            id="org.eclipse.e4.tools.newhandler"
+            name="New Handler Class">
+      </wizard>
+      <wizard
+            category="org.eclipse.e4.tools/org.eclipse.e4.tools.classes"
+            class="org.eclipse.e4.internal.tools.wizards.classes.NewPartClassWizard"
+            icon="icons/full/obj16/Part.gif"
+            id="org.eclipse.e4.tools.newpart"
+            name="New Part Class">
+      </wizard>
+   </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
new file mode 100644
index 0000000000..9f80ed6bfd
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
@@ -0,0 +1,117 @@
+package org.eclipse.e4.internal.tools;
+
+import java.net.URL;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+public class ToolsPlugin extends AbstractUIPlugin {
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.e4.tools"; //$NON-NLS-1$
+
+	private static ToolsPlugin plugin;
+	
+	private ResourceLocator resourceLocator;
+	
+	/*
+	 * (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 ToolsPlugin getDefault() {
+		return plugin;
+	}
+	
+	public ResourceLocator getResourceLocator() {
+		if (resourceLocator == null) {
+			resourceLocator = new ResourceLocator() {
+				
+				public String getString(String key, Object[] substitutions,
+						boolean translate) {
+					return null;
+				}
+				
+				public String getString(String key, Object[] substitutions) {
+					return null;
+				}
+				
+				public String getString(String key, boolean translate) {
+					return null;
+				}
+				
+				public String getString(String key) {
+					return null;
+				}
+				
+				public Object getImage(String key) {
+					return null;
+				}
+				
+				public URL getBaseURL() {
+					return null;
+				}
+			};
+		}
+		return resourceLocator;
+	}
+	
+	public static void log(IStatus status, int nesting, boolean appendLogger) {
+		getDefault().getLog().log(status);
+	}
+	
+	/**
+	 * Log Throwable Error
+	 */
+	public static void logError(Throwable t) {
+		logError(t, 0, true);
+	}
+
+	public static void logError(Throwable t, boolean appendLogger) {
+		logError(t, 0, appendLogger);
+	}
+
+	public static void logError(Throwable t, int nesting) {
+		logError(t, nesting, true);
+	}
+
+	public static void logError(Throwable t, int nesting, boolean appendLogger) {
+		log(newStatus(IStatus.ERROR, t.getMessage(), t), nesting, appendLogger);
+	}
+	
+	/**
+	 * Create an IStatus
+	 * 
+	 * @return a new IStatus
+	 */
+	public static IStatus newStatus(int severity, String message,
+			Throwable exception) {
+		return new Status(severity, PLUGIN_ID, 0, message, exception);
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
new file mode 100644
index 0000000000..2452e1f963
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -0,0 +1,376 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.classes;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+
+import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.UpdateValueStrategy;
+import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.conversion.Converter;
+import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IJavaModel;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.ui.JavaPlugin;
+import org.eclipse.jdt.internal.ui.wizards.NewWizardMessages;
+import org.eclipse.jdt.internal.ui.wizards.TypedElementSelectionValidator;
+import org.eclipse.jdt.internal.ui.wizards.TypedViewerFilter;
+import org.eclipse.jdt.ui.JavaElementComparator;
+import org.eclipse.jdt.ui.JavaElementLabelProvider;
+import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.wizard.WizardPageSupport;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.ElementListSelectionDialog;
+import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
+
+public abstract class AbstractNewClassPage extends WizardPage {
+	public static class JavaClass {
+		protected PropertyChangeSupport support = new PropertyChangeSupport(this);
+
+		private IPackageFragmentRoot fragmentRoot;
+		private IPackageFragment packageFragment;
+		private String name;
+
+		public JavaClass(IPackageFragmentRoot fragmentRoot) {
+			this.fragmentRoot = fragmentRoot;
+		}
+
+		public IPackageFragmentRoot getFragmentRoot() {
+			return fragmentRoot;
+		}
+
+		public void setFragmentRoot(IPackageFragmentRoot fragmentRoot) {
+			support.firePropertyChange("fragementRoot", this.fragmentRoot, this.fragmentRoot = fragmentRoot);
+		}
+
+		public IPackageFragment getPackageFragment() {
+			return packageFragment;
+		}
+
+		public void setPackageFragment(IPackageFragment packageFragment) {
+			support.firePropertyChange("packageFragment", this.packageFragment, this.packageFragment = packageFragment);
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			support.firePropertyChange("name", this.name, this.name = name);
+		}
+
+		public void addPropertyChangeListener(PropertyChangeListener listener) {
+			support.addPropertyChangeListener(listener);
+		}
+
+		public void removePropertyChangeListener(PropertyChangeListener listener) {
+			support.removePropertyChangeListener(listener);
+		}
+	}
+
+	private JavaClass clazz;
+	private IPackageFragmentRoot froot;
+	private IWorkspaceRoot fWorkspaceRoot;
+	
+	protected AbstractNewClassPage(String pageName, String title, String description, IPackageFragmentRoot froot, IWorkspaceRoot fWorkspaceRoot) {
+		super(pageName);
+		this.froot = froot;
+		this.fWorkspaceRoot = fWorkspaceRoot;
+		
+		setTitle(title);
+		setDescription(description);
+	}
+	
+	public void createControl(Composite parent) {
+		final Image img = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newclass_wiz.png"));
+		setImageDescriptor(ImageDescriptor.createFromImage(img));
+		
+		parent.addDisposeListener(new DisposeListener() {
+			
+			public void widgetDisposed(DisposeEvent e) {
+				img.dispose();
+				setImageDescriptor(null);
+			}
+		});
+
+		parent = new Composite(parent, SWT.NULL);		
+		parent.setLayoutData(new GridData(GridData.FILL_BOTH));
+		parent.setLayout(new GridLayout(3, false));
+		
+		clazz = createInstance();
+
+		DataBindingContext dbc = new DataBindingContext();
+		WizardPageSupport.create(this, dbc);
+		
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Source folder");
+			l.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			t.setEditable(false);
+			final Binding bd = dbc.bindValue(
+					WidgetProperties.text().observe(t), 
+					BeanProperties.value("fragmentRoot").observe(clazz), 
+					new UpdateValueStrategy(), 
+					new UpdateValueStrategy().setConverter(new PackageFragmentRootToStringConverter())
+			);
+
+			Button b = new Button(parent, SWT.PUSH);
+			b.setText("Browse ...");
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					IPackageFragmentRoot root = choosePackageRoot();
+					if( root != null ) {
+						clazz.setFragmentRoot(root);	
+					}
+					bd.updateModelToTarget(); //TODO Find out why this is needed
+				}
+			});
+		}
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
+			l.setText("Package");
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setEditable(false);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			final Binding bd = dbc.bindValue(
+					WidgetProperties.text().observe(t), 
+					BeanProperties.value("packageFragment").observe(clazz),
+					new UpdateValueStrategy(), 
+					new UpdateValueStrategy().setConverter(new PackageFragmentToStringConverter())
+			);
+
+			Button b = new Button(parent, SWT.PUSH);
+			b.setText("Browse ...");
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					IPackageFragment fragment = choosePackage();
+					if( fragment != null ) {
+						clazz.setPackageFragment(fragment);	
+					}
+					bd.updateModelToTarget(); //TODO Find out why this is needed
+				}
+			});
+		}
+
+		{
+			Label l = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
+			l.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 3, 1));
+		}
+
+		{
+			IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+			Label l = new Label(parent, SWT.NONE);
+			l.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
+			l.setText("Name");
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			dbc.bindValue(textProp.observe(t), BeanProperties.value("name", String.class).observe(clazz));
+
+			new Label(parent, SWT.NONE);
+		}
+
+		{
+			Label l = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
+			l.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 3, 1));
+		}
+		
+		createFields(parent, dbc);
+		setControl(parent);
+	}
+	
+	private IPackageFragmentRoot choosePackageRoot() {
+		IJavaElement initElement= clazz.getFragmentRoot();
+		Class[] acceptedClasses= new Class[] { IPackageFragmentRoot.class, IJavaProject.class };
+		TypedElementSelectionValidator validator= new TypedElementSelectionValidator(acceptedClasses, false) {
+			public boolean isSelectedValid(Object element) {
+				try {
+					if (element instanceof IJavaProject) {
+						IJavaProject jproject= (IJavaProject)element;
+						IPath path= jproject.getProject().getFullPath();
+						return (jproject.findPackageFragmentRoot(path) != null);
+					} else if (element instanceof IPackageFragmentRoot) {
+						return (((IPackageFragmentRoot)element).getKind() == IPackageFragmentRoot.K_SOURCE);
+					}
+					return true;
+				} catch (JavaModelException e) {
+					JavaPlugin.log(e.getStatus()); // just log, no UI in validation
+				}
+				return false;
+			}
+		};
+
+		acceptedClasses= new Class[] { IJavaModel.class, IPackageFragmentRoot.class, IJavaProject.class };
+		ViewerFilter filter= new TypedViewerFilter(acceptedClasses) {
+			public boolean select(Viewer viewer, Object parent, Object element) {
+				if (element instanceof IPackageFragmentRoot) {
+					try {
+						return (((IPackageFragmentRoot)element).getKind() == IPackageFragmentRoot.K_SOURCE);
+					} catch (JavaModelException e) {
+						JavaPlugin.log(e.getStatus()); // just log, no UI in validation
+						return false;
+					}
+				}
+				return super.select(viewer, parent, element);
+			}
+		};
+
+		StandardJavaElementContentProvider provider= new StandardJavaElementContentProvider();
+		ILabelProvider labelProvider= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
+		ElementTreeSelectionDialog dialog= new ElementTreeSelectionDialog(getShell(), labelProvider, provider);
+		dialog.setValidator(validator);
+		dialog.setComparator(new JavaElementComparator());
+		dialog.setTitle(NewWizardMessages.NewContainerWizardPage_ChooseSourceContainerDialog_title);
+		dialog.setMessage(NewWizardMessages.NewContainerWizardPage_ChooseSourceContainerDialog_description);
+		dialog.addFilter(filter);
+		dialog.setInput(JavaCore.create(fWorkspaceRoot));
+		dialog.setInitialSelection(initElement);
+		dialog.setHelpAvailable(false);
+
+		if (dialog.open() == Window.OK) {
+			Object element= dialog.getFirstResult();
+			if (element instanceof IJavaProject) {
+				IJavaProject jproject= (IJavaProject)element;
+				return jproject.getPackageFragmentRoot(jproject.getProject());
+			} else if (element instanceof IPackageFragmentRoot) {
+				return (IPackageFragmentRoot)element;
+			}
+			return null;
+		}
+		return null;
+	}
+	
+	private IPackageFragment choosePackage() {
+		IJavaElement[] packages= null;
+		try {
+			if (froot != null && froot.exists()) {
+				packages= froot.getChildren();
+			}
+		} catch (JavaModelException e) {
+			e.printStackTrace();
+		}
+		if (packages == null) {
+			packages= new IJavaElement[0];
+		}
+
+		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT));
+		dialog.setIgnoreCase(false);
+		dialog.setTitle("Choose Package");
+		dialog.setMessage("Choose a Package");
+		dialog.setEmptyListMessage("You need to select a package");
+		dialog.setElements(packages);
+		dialog.setHelpAvailable(false);
+
+		IPackageFragment pack= clazz.getPackageFragment();
+		if (pack != null) {
+			dialog.setInitialSelections(new Object[] { pack });
+		}
+
+		if (dialog.open() == Window.OK) {
+			return (IPackageFragment) dialog.getFirstResult();
+		}
+		return null;
+	}
+
+	protected abstract void createFields(Composite parent, DataBindingContext dbc);
+
+	protected abstract JavaClass createInstance();
+
+	public JavaClass getClazz() {
+		return clazz;
+	}
+	
+	static class ClassnameValidator implements IValidator {
+
+		public IStatus validate(Object value) {
+			String name = value.toString();
+			char[] ar = name.toCharArray();
+			for (char c : ar) {
+				if (!Character.isJavaIdentifierPart(c)) {
+					return new Status(IStatus.ERROR, "", "'" + c + "' is not allowed in a Class-Name");
+				}
+			}
+
+			if (!Character.isJavaIdentifierStart(ar[0])) {
+				return new Status(IStatus.ERROR, "", "'" + ar[0] + "' is not allowed as the first character of a Class-Name");
+			}
+
+			return Status.OK_STATUS;
+		}
+	}
+
+	static class PackageFragmentRootToStringConverter extends Converter {
+
+		public PackageFragmentRootToStringConverter() {
+			super(IPackageFragmentRoot.class, String.class);
+		}
+
+		public Object convert(Object fromObject) {
+			IPackageFragmentRoot f = (IPackageFragmentRoot) fromObject;
+			return f.getPath().makeRelative().toString();
+		}
+	}
+	
+	static class PackageFragmentToStringConverter extends Converter {
+
+		public PackageFragmentToStringConverter() {
+			super(IPackageFragment.class, String.class);
+		}
+		
+		public Object convert(Object fromObject) {
+			System.err.println(" =======================> Converting: " + fromObject);
+			if( fromObject == null ) {
+				return "";
+			}
+			IPackageFragment f = (IPackageFragment) fromObject;
+			return f.getElementName();
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
new file mode 100644
index 0000000000..bb7178c10b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
@@ -0,0 +1,144 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.classes;
+
+import java.io.ByteArrayInputStream;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+
+public abstract class AbstractNewClassWizard extends Wizard implements INewWizard {
+	protected IPackageFragmentRoot root;
+	protected IFile file;
+	
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		root = getFragmentRoot(getInitialJavaElement(selection));
+		System.err.println("Root: " + root);
+	}
+
+	protected IJavaElement getInitialJavaElement(IStructuredSelection selection) {
+		IJavaElement jelem = null;
+		if (selection != null && !selection.isEmpty()) {
+			Object selectedElement = selection.getFirstElement();
+			if (selectedElement instanceof IAdaptable) {
+				IAdaptable adaptable = (IAdaptable) selectedElement;
+
+				jelem = (IJavaElement) adaptable.getAdapter(IJavaElement.class);
+				if (jelem == null || !jelem.exists()) {
+					jelem = null;
+					IResource resource = (IResource) adaptable
+							.getAdapter(IResource.class);
+					if (resource != null
+							&& resource.getType() != IResource.ROOT) {
+						while (jelem == null
+								&& resource.getType() != IResource.PROJECT) {
+							resource = resource.getParent();
+							jelem = (IJavaElement) resource
+									.getAdapter(IJavaElement.class);
+						}
+						if (jelem == null) {
+							jelem = JavaCore.create(resource); // java project
+						}
+					}
+				}
+			}
+		}
+
+		return jelem;
+	}
+
+	protected IPackageFragmentRoot getFragmentRoot(IJavaElement elem) {
+		IPackageFragmentRoot initRoot = null;
+		if (elem != null) {
+			initRoot = (IPackageFragmentRoot) elem
+					.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
+			try {
+				if (initRoot == null
+						|| initRoot.getKind() != IPackageFragmentRoot.K_SOURCE) {
+					IJavaProject jproject = elem.getJavaProject();
+					if (jproject != null) {
+						initRoot = null;
+						if (jproject.exists()) {
+							IPackageFragmentRoot[] roots = jproject
+									.getPackageFragmentRoots();
+							for (int i = 0; i < roots.length; i++) {
+								if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE) {
+									initRoot = roots[i];
+									break;
+								}
+							}
+						}
+						if (initRoot == null) {
+							initRoot = jproject.getPackageFragmentRoot(jproject
+									.getResource());
+						}
+					}
+				}
+			} catch (JavaModelException e) {
+				// TODO
+				e.printStackTrace();
+			}
+		}
+		return initRoot;
+	}
+
+	protected abstract String getContent();
+	
+	public JavaClass getDomainClass() {
+		return ((AbstractNewClassPage) getPages()[0]).getClazz();
+	}
+	
+	@Override
+	public boolean performFinish() {
+		JavaClass clazz = getDomainClass();
+		String content = getContent();
+		
+		IPackageFragment fragment = clazz.getPackageFragment();
+		if (fragment != null) {
+			String cuName = clazz.getName() + ".java";
+			IResource resource = fragment.getCompilationUnit(cuName)
+					.getResource();
+			file = (IFile) resource;
+			try {
+				if (!file.exists()) {
+					file.create(new ByteArrayInputStream(content.getBytes()),
+							true, null);
+				} else {
+					file.setContents(new ByteArrayInputStream(content.getBytes()),
+							IFile.FORCE | IFile.KEEP_HISTORY, null);
+				}
+			} catch (CoreException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return true;
+
+	}
+	
+	public IFile getFile() {
+		return file;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
new file mode 100644
index 0000000000..52009c9e0d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
@@ -0,0 +1,133 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.classes;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
+import org.eclipse.e4.internal.tools.wizards.classes.templates.HandlerTemplate;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class NewHandlerClassWizard extends AbstractNewClassWizard {
+	@Override
+	protected String getContent() {
+		HandlerTemplate template = new HandlerTemplate();
+		return template.generate(getDomainClass());
+	}
+	
+	@Override
+	public void addPages() {
+		addPage(new AbstractNewClassPage("Classinformation",
+				"New Handler",
+				"Create a new handler class", root, ResourcesPlugin.getWorkspace().getRoot()) {
+
+			@Override
+			protected JavaClass createInstance() {
+				return new HandlerClass(root);
+			}
+
+			@Override
+			protected void createFields(Composite parent, DataBindingContext dbc) {
+				IWidgetValueProperty textProp = WidgetProperties
+						.text(SWT.Modify);
+
+				{
+					Label l = new Label(parent, SWT.NONE);
+					l.setText("Execute Method");
+					l.setLayoutData(new GridData(GridData.END, GridData.CENTER,
+							false, false));
+
+					Text t = new Text(parent, SWT.BORDER);
+					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+					dbc.bindValue(
+							textProp.observe(t),
+							BeanProperties.value("executeMethodName").observe(
+									getClazz()));
+
+					l = new Label(parent, SWT.NONE);
+				}
+
+				{
+					Label l = new Label(parent, SWT.NONE);
+					l.setText("Can-Execute Method");
+					l.setLayoutData(new GridData(GridData.END, GridData.CENTER,
+							false, false));
+
+					Text t = new Text(parent, SWT.BORDER);
+					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+					dbc.bindValue(textProp.observe(t),
+							BeanProperties.value("canExecuteMethodName")
+									.observe(getClazz()));
+					dbc.bindValue(
+							WidgetProperties.enabled().observe(t),
+							BeanProperties.value("useCanExecute").observe(
+									getClazz()));
+
+					Button b = new Button(parent, SWT.CHECK);
+					dbc.bindValue(
+							WidgetProperties.selection().observe(b),
+							BeanProperties.value("useCanExecute").observe(
+									getClazz()));
+				}
+			}
+		});
+	}
+	
+	
+
+	public static class HandlerClass extends JavaClass {
+		private String executeMethodName = "execute";
+		private String canExecuteMethodName = "canExecute";
+		private boolean useCanExecute = false;
+
+		public HandlerClass(IPackageFragmentRoot root) {
+			super(root);
+		}
+
+		public String getExecuteMethodName() {
+			return executeMethodName;
+		}
+
+		public void setExecuteMethodName(String executeMethodName) {
+			support.firePropertyChange("executeMethodName",
+					this.executeMethodName,
+					this.executeMethodName = executeMethodName);
+		}
+
+		public String getCanExecuteMethodName() {
+			return canExecuteMethodName;
+		}
+
+		public void setCanExecuteMethodName(String canExecuteMethodName) {
+			support.firePropertyChange("canExecuteMethodName",
+					this.canExecuteMethodName,
+					this.canExecuteMethodName = canExecuteMethodName);
+		}
+
+		public boolean isUseCanExecute() {
+			return useCanExecute;
+		}
+
+		public void setUseCanExecute(boolean useCanExecute) {
+			support.firePropertyChange("useCanExecute", this.useCanExecute,
+					this.useCanExecute = useCanExecute);
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
new file mode 100644
index 0000000000..35c70947d8
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
@@ -0,0 +1,255 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.classes;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
+import org.eclipse.e4.internal.tools.wizards.classes.templates.PartTemplate;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class NewPartClassWizard extends AbstractNewClassWizard {
+
+	@Override
+	public void addPages() {
+		addPage(new AbstractNewClassPage("Classinformation", "New Part",
+				"Create a new part class", root, ResourcesPlugin.getWorkspace()
+						.getRoot()) {
+
+			@Override
+			protected void createFields(Composite parent, DataBindingContext dbc) {
+				IWidgetValueProperty textProp = WidgetProperties
+						.text(SWT.Modify);
+				IWidgetValueProperty enabledProp = WidgetProperties.enabled();
+
+				{
+					Label l = new Label(parent, SWT.NONE);
+					l.setText("PostContruct Method");
+					l.setLayoutData(new GridData(GridData.END, GridData.CENTER,
+							false, false));
+
+					Text t = new Text(parent, SWT.BORDER);
+					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+					dbc.bindValue(textProp.observe(t),
+							BeanProperties.value("postConstructMethodName")
+									.observe(getClazz()));
+					dbc.bindValue(
+							enabledProp.observe(t),
+							BeanProperties.value("usePostConstruct").observe(
+									getClazz()));
+
+					Button b = new Button(parent, SWT.CHECK);
+					dbc.bindValue(
+							WidgetProperties.selection().observe(b),
+							BeanProperties.value("usePostConstruct").observe(
+									getClazz()));
+				}
+				
+				{
+					Label l = new Label(parent, SWT.NONE);
+					l.setText("Predestroy Method");
+					l.setLayoutData(new GridData(GridData.END, GridData.CENTER,
+							false, false));
+
+					Text t = new Text(parent, SWT.BORDER);
+					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+					dbc.bindValue(textProp.observe(t),
+							BeanProperties.value("preDestroyMethodName")
+									.observe(getClazz()));
+					dbc.bindValue(
+							enabledProp.observe(t),
+							BeanProperties.value("usePredestroy").observe(
+									getClazz()));
+
+					Button b = new Button(parent, SWT.CHECK);
+					dbc.bindValue(
+							WidgetProperties.selection().observe(b),
+							BeanProperties.value("usePredestroy").observe(
+									getClazz()));
+				}
+				
+				{
+					Label l = new Label(parent, SWT.NONE);
+					l.setText("Focus Method");
+					l.setLayoutData(new GridData(GridData.END, GridData.CENTER,
+							false, false));
+
+					Text t = new Text(parent, SWT.BORDER);
+					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+					dbc.bindValue(textProp.observe(t),
+							BeanProperties.value("focusMethodName")
+									.observe(getClazz()));
+					dbc.bindValue(
+							enabledProp.observe(t),
+							BeanProperties.value("useFocus").observe(
+									getClazz()));
+
+					Button b = new Button(parent, SWT.CHECK);
+					dbc.bindValue(
+							WidgetProperties.selection().observe(b),
+							BeanProperties.value("useFocus").observe(
+									getClazz()));
+				}
+				
+				{
+					Label l = new Label(parent, SWT.NONE);
+					l.setText("Persist Method");
+					l.setLayoutData(new GridData(GridData.END, GridData.CENTER,
+							false, false));
+
+					Text t = new Text(parent, SWT.BORDER);
+					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+					dbc.bindValue(textProp.observe(t),
+							BeanProperties.value("persistMethodName")
+									.observe(getClazz()));
+					dbc.bindValue(
+							enabledProp.observe(t),
+							BeanProperties.value("usePersist").observe(
+									getClazz()));
+
+					Button b = new Button(parent, SWT.CHECK);
+					dbc.bindValue(
+							WidgetProperties.selection().observe(b),
+							BeanProperties.value("usePersist").observe(
+									getClazz()));
+				}
+			}
+
+			@Override
+			protected JavaClass createInstance() {
+				return new PartClass(root);
+			}
+
+		});
+	}
+
+	@Override
+	protected String getContent() {
+		PartTemplate template = new PartTemplate();
+		return template.generate(getDomainClass());
+	}
+
+	public static class PartClass extends JavaClass {
+		private PropertyChangeSupport support = new PropertyChangeSupport(this);
+
+		private boolean usePostConstruct;
+		private String postConstructMethodName = "postConstruct";
+
+		private boolean usePredestroy;
+		private String preDestroyMethodName = "preDestroy";
+
+		private boolean useFocus = true;
+		private String focusMethodName = "onFocus";
+
+		private boolean usePersist;
+		private String persistMethodName = "save";
+
+		public PartClass(IPackageFragmentRoot fragmentRoot) {
+			super(fragmentRoot);
+		}
+		
+		public void addPropertyChangeListener(PropertyChangeListener listener) {
+			support.addPropertyChangeListener(listener);
+		}
+
+		public void removePropertyChangeListener(PropertyChangeListener listener) {
+			support.removePropertyChangeListener(listener);
+		}
+
+		public boolean isUsePostConstruct() {
+			return usePostConstruct;
+		}
+
+		public void setUsePostConstruct(boolean usePostConstruct) {
+			support.firePropertyChange("usePostConstruct",
+					this.usePostConstruct,
+					this.usePostConstruct = usePostConstruct);
+		}
+
+		public String getPostConstructMethodName() {
+			return postConstructMethodName;
+		}
+
+		public void setPostConstructMethodName(String postConstructMethodName) {
+			support.firePropertyChange("postConstructMethodName",
+					this.postConstructMethodName,
+					this.postConstructMethodName = postConstructMethodName);
+		}
+
+		public boolean isUsePredestroy() {
+			return usePredestroy;
+		}
+
+		public void setUsePredestroy(boolean usePredestroy) {
+			support.firePropertyChange("usePredestroy", this.usePredestroy,
+					this.usePredestroy = usePredestroy);
+		}
+
+		public String getPreDestroyMethodName() {
+			return preDestroyMethodName;
+		}
+
+		public void setPreDestroyMethodName(String preDestroyMethodName) {
+			support.firePropertyChange("preDestroyMethodName",
+					this.preDestroyMethodName,
+					this.preDestroyMethodName = preDestroyMethodName);
+		}
+
+		public boolean isUseFocus() {
+			return useFocus;
+		}
+
+		public void setUseFocus(boolean useFocus) {
+			support.firePropertyChange("useFocus", this.useFocus,
+					this.useFocus = useFocus);
+		}
+
+		public String getFocusMethodName() {
+			return focusMethodName;
+		}
+
+		public void setFocusMethodName(String focusMethodName) {
+			support.firePropertyChange("focusMethodName", this.focusMethodName,
+					this.focusMethodName = focusMethodName);
+		}
+
+		public boolean isUsePersist() {
+			return usePersist;
+		}
+
+		public void setUsePersist(boolean usePersist) {
+			support.firePropertyChange("usePersist", this.usePersist,
+					this.usePersist = usePersist);
+		}
+
+		public String getPersistMethodName() {
+			return persistMethodName;
+		}
+
+		public void setPersistMethodName(String persistMethodName) {
+			support.firePropertyChange("persistMethodName",
+					this.persistMethodName,
+					this.persistMethodName = persistMethodName);
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
new file mode 100644
index 0000000000..ddf80d9149
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
@@ -0,0 +1,50 @@
+package org.eclipse.e4.internal.tools.wizards.classes.templates;
+
+import org.eclipse.e4.internal.tools.wizards.classes.NewHandlerClassWizard.HandlerClass;
+
+public class HandlerTemplate
+{
+  protected static String nl;
+  public static synchronized HandlerTemplate create(String lineSeparator)
+  {
+    nl = lineSeparator;
+    HandlerTemplate result = new HandlerTemplate();
+    nl = null;
+    return result;
+  }
+
+  public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+  protected final String TEXT_1 = " " + NL + "package ";
+  protected final String TEXT_2 = ";" + NL + "" + NL + "import org.eclipse.e4.core.di.annotations.Execute;";
+  protected final String TEXT_3 = NL + "import org.eclipse.e4.core.di.annotations.CanExecute;";
+  protected final String TEXT_4 = NL + NL + "public class ";
+  protected final String TEXT_5 = " {" + NL + "\t@Execute" + NL + "\tpublic void ";
+  protected final String TEXT_6 = "() {" + NL + "\t\t//TODO Your code goes here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_7 = NL + "\t" + NL + "\t@CanExecute" + NL + "\tpublic boolean ";
+  protected final String TEXT_8 = "() {" + NL + "\t\t//TODO Your code goes here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_9 = "\t" + NL + "}";
+
+  public String generate(Object argument)
+  {
+    final StringBuffer stringBuffer = new StringBuffer();
+     HandlerClass domainClass = (HandlerClass)argument; 
+    stringBuffer.append(TEXT_1);
+    stringBuffer.append( domainClass.getPackageFragment().getElementName() );
+    stringBuffer.append(TEXT_2);
+     if( domainClass.isUseCanExecute() )  { 
+    stringBuffer.append(TEXT_3);
+     } 
+    stringBuffer.append(TEXT_4);
+    stringBuffer.append( domainClass.getName() );
+    stringBuffer.append(TEXT_5);
+    stringBuffer.append( domainClass.getExecuteMethodName() );
+    stringBuffer.append(TEXT_6);
+     if( domainClass.isUseCanExecute() )  { 
+    stringBuffer.append(TEXT_7);
+    stringBuffer.append( domainClass.getCanExecuteMethodName() );
+    stringBuffer.append(TEXT_8);
+     } 
+    stringBuffer.append(TEXT_9);
+    return stringBuffer.toString();
+  }
+}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
new file mode 100644
index 0000000000..7180c49822
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
@@ -0,0 +1,89 @@
+package org.eclipse.e4.internal.tools.wizards.classes.templates;
+
+import org.eclipse.e4.internal.tools.wizards.classes.NewPartClassWizard.PartClass;
+
+public class PartTemplate
+{
+  protected static String nl;
+  public static synchronized PartTemplate create(String lineSeparator)
+  {
+    nl = lineSeparator;
+    PartTemplate result = new PartTemplate();
+    nl = null;
+    return result;
+  }
+
+  public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+  protected final String TEXT_1 = " " + NL + "package ";
+  protected final String TEXT_2 = ";" + NL + "" + NL + "import javax.inject.Inject;";
+  protected final String TEXT_3 = NL + "import javax.annotation.PostConstruct;";
+  protected final String TEXT_4 = NL + "import javax.annotation.PreDestroy;";
+  protected final String TEXT_5 = NL + "import org.eclipse.e4.ui.di.Focus;";
+  protected final String TEXT_6 = NL + "import org.eclipse.e4.ui.di.Persist;";
+  protected final String TEXT_7 = NL + NL + "public class ";
+  protected final String TEXT_8 = " {" + NL + "\t@Inject" + NL + "\tpublic ";
+  protected final String TEXT_9 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_10 = NL + "\t@PostConstruct" + NL + "\tpublic void ";
+  protected final String TEXT_11 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_12 = NL + "\t";
+  protected final String TEXT_13 = NL + "\t@PreDestroy" + NL + "\tpublic void ";
+  protected final String TEXT_14 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_15 = NL + "\t";
+  protected final String TEXT_16 = NL + "\t@Focus" + NL + "\tpublic void ";
+  protected final String TEXT_17 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_18 = NL + "\t";
+  protected final String TEXT_19 = NL + "\t@Persist" + NL + "\tpublic void ";
+  protected final String TEXT_20 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_21 = NL + "}";
+
+  public String generate(Object argument)
+  {
+    final StringBuffer stringBuffer = new StringBuffer();
+     PartClass domainClass = (PartClass)argument; 
+    stringBuffer.append(TEXT_1);
+    stringBuffer.append( domainClass.getPackageFragment().getElementName() );
+    stringBuffer.append(TEXT_2);
+     if( domainClass.isUsePostConstruct() ) { 
+    stringBuffer.append(TEXT_3);
+     } 
+     if( domainClass.isUsePredestroy() ) { 
+    stringBuffer.append(TEXT_4);
+     } 
+     if( domainClass.isUseFocus() ) { 
+    stringBuffer.append(TEXT_5);
+     } 
+     if( domainClass.isUsePersist() ) { 
+    stringBuffer.append(TEXT_6);
+     } 
+    stringBuffer.append(TEXT_7);
+    stringBuffer.append( domainClass.getName() );
+    stringBuffer.append(TEXT_8);
+    stringBuffer.append( domainClass.getName() );
+    stringBuffer.append(TEXT_9);
+     if( domainClass.isUsePostConstruct() ) { 
+    stringBuffer.append(TEXT_10);
+    stringBuffer.append( domainClass.getPostConstructMethodName()  );
+    stringBuffer.append(TEXT_11);
+     } 
+    stringBuffer.append(TEXT_12);
+     if( domainClass.isUsePredestroy() ) { 
+    stringBuffer.append(TEXT_13);
+    stringBuffer.append( domainClass.getPreDestroyMethodName()  );
+    stringBuffer.append(TEXT_14);
+     } 
+    stringBuffer.append(TEXT_15);
+     if( domainClass.isUseFocus() ) { 
+    stringBuffer.append(TEXT_16);
+    stringBuffer.append( domainClass.getFocusMethodName() );
+    stringBuffer.append(TEXT_17);
+     } 
+    stringBuffer.append(TEXT_18);
+     if( domainClass.isUsePersist() ) { 
+    stringBuffer.append(TEXT_19);
+    stringBuffer.append( domainClass.getPersistMethodName() );
+    stringBuffer.append(TEXT_20);
+     } 
+    stringBuffer.append(TEXT_21);
+    return stringBuffer.toString();
+  }
+}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
new file mode 100644
index 0000000000..0ec8559dd2
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -0,0 +1,187 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.model;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+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.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWizard;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+public abstract class BaseApplicationModelWizard extends Wizard implements INewWizard {
+	private NewModelFilePage page;
+	private ISelection selection;
+	
+	protected IWorkbench workbench;
+
+	/**
+	 * Constructor for NewApplicationModelWizard.
+	 */
+	public BaseApplicationModelWizard() {
+		super();
+		setNeedsProgressMonitor(true);
+	}
+
+	/**
+	 * Adding the page to the wizard.
+	 */
+
+	public void addPages() {
+		page = new NewModelFilePage(selection,getDefaultFileName());
+		addPage(page);
+	}
+
+	public abstract String getDefaultFileName();
+	
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// Do the work within an operation.
+			//
+			WorkspaceModifyOperation operation =
+				new WorkspaceModifyOperation() {
+					@Override
+					protected void execute(IProgressMonitor progressMonitor) {
+						try {
+							// Create a resource set
+							//
+							ResourceSet resourceSet = new ResourceSetImpl();
+
+							// Get the URI of the model file.
+							//
+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+							// Create a resource for this file.
+							//
+							Resource resource = resourceSet.createResource(fileURI);
+
+							// Add the initial model object to the contents.
+							//
+							EObject rootObject = createInitialModel();
+							if (rootObject != null) {
+								resource.getContents().add(rootObject);
+							}
+
+							// Save the contents of the resource to the file system.
+							//
+							Map<Object, Object> options = new HashMap<Object, Object>();
+							resource.save(options);
+						}
+						catch (Exception exception) {
+							throw new RuntimeException(exception);
+						}
+						finally {
+							progressMonitor.done();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(new Runnable() {
+						 public void run() {
+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+						 }
+					 });
+			}
+
+			// Open an editor on the new file.
+			//
+			try {
+				page.openEditor
+					(new FileEditorInput(modelFile),
+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
+			}
+			catch (PartInitException exception) {
+				MessageDialog.openError(workbenchWindow.getShell(), "Could not init editor", exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			MessageDialog.openError(getShell(), "Error", exception.getMessage());
+			return false;
+		}
+	}
+	
+	protected abstract EObject createInitialModel();
+
+	private IFile getModelFile() throws CoreException {
+		String containerName = page.getContainerName();
+		String fileName = page.getFileName();
+		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+		IResource resource = root.findMember(new Path(containerName));
+		if (!resource.exists() || !(resource instanceof IContainer)) {
+			throwCoreException("Container \"" + containerName
+					+ "\" does not exist.");
+		}
+		IContainer container = (IContainer) resource;
+		return container.getFile(new Path(fileName));
+	}
+	
+	private void throwCoreException(String message) throws CoreException {
+		IStatus status = new Status(IStatus.ERROR,
+				"org.eclipse.e4.tools.emf.editor3x", IStatus.OK, message, null);
+		throw new CoreException(status);
+	}
+
+	/**
+	 * We will accept the selection in the workbench to see if we can initialize
+	 * from it.
+	 * 
+	 * @see IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
+	 */
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
new file mode 100644
index 0000000000..c68662560b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.model;
+
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.emf.ecore.EObject;
+
+
+public class NewApplicationModelWizard extends BaseApplicationModelWizard {
+
+	@Override
+	public String getDefaultFileName() {
+		return "Application.e4xmi";
+	}
+	
+	protected EObject createInitialModel() {
+		return (EObject) MApplicationFactory.INSTANCE.createApplication();
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
new file mode 100644
index 0000000000..04d252f610
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.model;
+
+import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
+import org.eclipse.emf.ecore.EObject;
+
+
+public class NewContributionModelWizard extends BaseApplicationModelWizard {
+
+	@Override
+	public String getDefaultFileName() {
+		return "fragment.e4xmi";
+	}
+	
+	protected EObject createInitialModel() {
+		return (EObject) MFragmentFactory.INSTANCE.createModelFragments();
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
new file mode 100644
index 0000000000..b0e8fc0cdf
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
@@ -0,0 +1,199 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.model;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.dialogs.IDialogPage;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.ContainerSelectionDialog;
+
+/**
+ * The "New" wizard page allows setting the container for the new file as well
+ * as the file name. The page will only accept file name without the extension
+ * OR with the extension that matches the expected one (e4xmi).
+ */
+
+public class NewModelFilePage extends WizardPage {
+	private Text containerText;
+
+	private Text fileText;
+
+	private ISelection selection;
+	
+	private String defaultFilename;
+
+	/**
+	 * Constructor for SampleNewWizardPage.
+	 * 
+	 * @param pageName
+	 */
+	public NewModelFilePage(ISelection selection, String defaultFilename) {
+		super("wizardPage");
+		setTitle("Multi-page Editor File");
+		setDescription("This wizard creates a new file with *.e4xmi extension that can be opened by a multi-page editor.");
+		this.selection = selection;
+		this.defaultFilename = defaultFilename;
+	}
+
+	/**
+	 * @see IDialogPage#createControl(Composite)
+	 */
+	public void createControl(Composite parent) {
+		Composite container = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
+		container.setLayout(layout);
+		layout.numColumns = 3;
+		layout.verticalSpacing = 9;
+		Label label = new Label(container, SWT.NULL);
+		label.setText("&Container:");
+
+		containerText = new Text(container, SWT.BORDER | SWT.SINGLE);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		containerText.setLayoutData(gd);
+		containerText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				dialogChanged();
+			}
+		});
+
+		Button button = new Button(container, SWT.PUSH);
+		button.setText("Browse...");
+		button.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				handleBrowse();
+			}
+		});
+		label = new Label(container, SWT.NULL);
+		label.setText("&File name:");
+
+		fileText = new Text(container, SWT.BORDER | SWT.SINGLE);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		fileText.setLayoutData(gd);
+		fileText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				dialogChanged();
+			}
+		});
+		initialize();
+		dialogChanged();
+		setControl(container);
+	}
+
+	/**
+	 * Tests if the current workbench selection is a suitable container to use.
+	 */
+
+	private void initialize() {
+		if (selection != null && selection.isEmpty() == false
+				&& selection instanceof IStructuredSelection) {
+			IStructuredSelection ssel = (IStructuredSelection) selection;
+			if (ssel.size() > 1)
+				return;
+			Object obj = ssel.getFirstElement();
+			if (obj instanceof IResource) {
+				IContainer container;
+				if (obj instanceof IContainer)
+					container = (IContainer) obj;
+				else
+					container = ((IResource) obj).getParent();
+				containerText.setText(container.getFullPath().toString());
+			}
+		}
+		fileText.setText(defaultFilename);
+	}
+
+	/**
+	 * Uses the standard container selection dialog to choose the new value for
+	 * the container field.
+	 */
+
+	private void handleBrowse() {
+		ContainerSelectionDialog dialog = new ContainerSelectionDialog(
+				getShell(), ResourcesPlugin.getWorkspace().getRoot(), false,
+				"Select new file container");
+		if (dialog.open() == ContainerSelectionDialog.OK) {
+			Object[] result = dialog.getResult();
+			if (result.length == 1) {
+				containerText.setText(((Path) result[0]).toString());
+			}
+		}
+	}
+
+	/**
+	 * Ensures that both text fields are set.
+	 */
+
+	private void dialogChanged() {
+		IResource container = ResourcesPlugin.getWorkspace().getRoot()
+				.findMember(new Path(getContainerName()));
+		String fileName = getFileName();
+
+		if (getContainerName().length() == 0) {
+			updateStatus("File container must be specified");
+			return;
+		}
+		if (container == null
+				|| (container.getType() & (IResource.PROJECT | IResource.FOLDER)) == 0) {
+			updateStatus("File container must exist");
+			return;
+		}
+		if (!container.isAccessible()) {
+			updateStatus("Project must be writable");
+			return;
+		}
+		if (fileName.length() == 0) {
+			updateStatus("File name must be specified");
+			return;
+		}
+		if (fileName.replace('\\', '/').indexOf('/', 1) > 0) {
+			updateStatus("File name must be valid");
+			return;
+		}
+		int dotLoc = fileName.lastIndexOf('.');
+		if (dotLoc != -1) {
+			String ext = fileName.substring(dotLoc + 1);
+			if (ext.equalsIgnoreCase("e4xmi") == false) {
+				updateStatus("File extension must be \"e4xmi\"");
+				return;
+			}
+		}
+		updateStatus(null);
+	}
+
+	private void updateStatus(String message) {
+		setErrorMessage(message);
+		setPageComplete(message == null);
+	}
+
+	public String getContainerName() {
+		return containerText.getText();
+	}
+
+	public String getFileName() {
+		return fileText.getText();
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
new file mode 100644
index 0000000000..85a29bf619
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -0,0 +1,606 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2010 Soyatec(http://www.soyatec.com) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Soyatec - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.project;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.commands.MBindingContext;
+import org.eclipse.e4.ui.model.application.commands.MBindingTable;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
+import org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack;
+import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledToolItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
+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.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.pde.core.plugin.IPluginBase;
+import org.eclipse.pde.core.plugin.IPluginElement;
+import org.eclipse.pde.core.plugin.IPluginExtension;
+import org.eclipse.pde.core.plugin.IPluginImport;
+import org.eclipse.pde.internal.core.ICoreConstants;
+import org.eclipse.pde.internal.core.bundle.WorkspaceBundlePluginModel;
+import org.eclipse.pde.internal.core.plugin.WorkspacePluginModelBase;
+import org.eclipse.pde.internal.ui.PDEPlugin;
+import org.eclipse.pde.internal.ui.PDEUIMessages;
+import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
+import org.eclipse.pde.internal.ui.wizards.plugin.NewPluginProjectWizard;
+import org.eclipse.pde.internal.ui.wizards.plugin.NewProjectCreationOperation;
+import org.eclipse.pde.internal.ui.wizards.plugin.PluginFieldData;
+import org.eclipse.ui.IWorkingSet;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.Version;
+
+/**
+ * @author jin.liu (jin.liu@soyatec.com)
+ */
+public class E4NewProjectWizard extends NewPluginProjectWizard {
+
+	private PluginFieldData fPluginData;
+	private NewApplicationWizardPage fApplicationPage;
+	private IProjectProvider fProjectProvider;
+	private PluginContentPage fContentPage;
+
+	public E4NewProjectWizard() {
+		fPluginData = new PluginFieldData();
+	}
+
+	public void addPages() {
+		fMainPage = new E4NewProjectWizardPage(
+				"main", fPluginData, false, getSelection()); //$NON-NLS-1$
+		fMainPage.setTitle(PDEUIMessages.NewProjectWizard_MainPage_title);
+		fMainPage.setDescription(PDEUIMessages.NewProjectWizard_MainPage_desc);
+		String pname = getDefaultValue(DEF_PROJECT_NAME);
+		if (pname != null)
+			fMainPage.setInitialProjectName(pname);
+		addPage(fMainPage);
+
+		fProjectProvider = new IProjectProvider() {
+			public String getProjectName() {
+				return fMainPage.getProjectName();
+			}
+
+			public IProject getProject() {
+				return fMainPage.getProjectHandle();
+			}
+
+			public IPath getLocationPath() {
+				return fMainPage.getLocationPath();
+			}
+		};
+
+		fContentPage = new PluginContentPage(
+				"page2", fProjectProvider, fMainPage, fPluginData); //$NON-NLS-1$
+
+		fApplicationPage = new NewApplicationWizardPage(fProjectProvider);
+
+		addPage(fContentPage);
+		addPage(fApplicationPage);
+	}
+
+	@SuppressWarnings("restriction")
+	public boolean performFinish() {
+		try {
+			fMainPage.updateData();
+			fContentPage.updateData();
+			IDialogSettings settings = getDialogSettings();
+			if (settings != null) {
+				fMainPage.saveSettings(settings);
+				fContentPage.saveSettings(settings);
+			}
+			getContainer().run(
+					false,
+					true,
+					new NewProjectCreationOperation(fPluginData,
+							fProjectProvider, null) {
+						private WorkspacePluginModelBase model;
+
+						@Override
+						protected void adjustManifests(
+								IProgressMonitor monitor, IProject project,
+								IPluginBase bundle) throws CoreException {
+							super.adjustManifests(monitor, project, bundle);
+							IPluginBase pluginBase = model.getPluginBase();
+							String[] dependencyId = new String[] {
+									"javax.inject",
+									"org.eclipse.core.resources",
+									"org.eclipse.core.runtime",
+									"org.eclipse.swt",
+									"org.eclipse.core.databinding",
+									"org.eclipse.core.databinding.beans",
+									"org.eclipse.jface",
+									"org.eclipse.jface.databinding",
+									"org.eclipse.e4.ui.services",
+									"org.eclipse.e4.ui.workbench",
+									"org.eclipse.e4.core.services",
+									"org.eclipse.e4.core.di",
+									"org.eclipse.e4.core.contexts",
+									"org.eclipse.e4.ui.workbench.swt",
+									"org.eclipse.core.databinding.property",
+									"org.eclipse.e4.ui.css.core",
+									"org.w3c.css.sac",
+									"org.eclipse.e4.core.commands",
+									"org.eclipse.e4.ui.bindings" };
+							for (String id : dependencyId) {
+								Bundle dependency = Platform.getBundle(id);
+
+								IPluginImport iimport = model
+										.getPluginFactory().createImport();
+								iimport.setId(id);
+								Version version = dependency.getVersion();
+								String versionString = version.getMajor() + "."
+										+ version.getMinor() + "."
+										+ version.getMicro();
+								iimport.setVersion(versionString);
+								pluginBase.add(iimport);
+							}
+						}
+
+						@Override
+						protected void setPluginLibraries(
+								WorkspacePluginModelBase model)
+								throws CoreException {
+							this.model = model;
+							super.setPluginLibraries(model);
+						}
+					});
+
+			IWorkingSet[] workingSets = fMainPage.getSelectedWorkingSets();
+			if (workingSets.length > 0)
+				getWorkbench().getWorkingSetManager().addToWorkingSets(
+						fProjectProvider.getProject(), workingSets);
+
+			this.createProductsExtension(fProjectProvider.getProject());
+
+			this.createApplicationResources(fProjectProvider.getProject(),
+					new NullProgressMonitor());
+
+			return true;
+		} catch (InvocationTargetException e) {
+			PDEPlugin.logException(e);
+		} catch (InterruptedException e) {
+		}
+		return false;
+	}
+
+	/**
+	 * create products extension detail
+	 * 
+	 * @param project
+	 */
+	@SuppressWarnings("restriction")
+	public void createProductsExtension(IProject project) {
+		Map<String, String> map = fApplicationPage.getData();
+		if (map == null
+				|| map.get(NewApplicationWizardPage.PRODUCT_NAME) == null)
+			return;
+
+		WorkspacePluginModelBase fmodel = new WorkspaceBundlePluginModel(
+				project.getFile(ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR),
+				project.getFile(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR));
+		IPluginExtension extension = fmodel.getFactory().createExtension();
+		try {
+			String productName = map.get(NewApplicationWizardPage.PRODUCT_NAME);
+			String applicationName = map
+					.get(NewApplicationWizardPage.APPLICATION);
+
+			String xmiPath = map
+					.get(NewApplicationWizardPage.APPLICATION_XMI_PROPERTY);
+			if (xmiPath != null) {
+				xmiPath = productName + "/" + xmiPath;
+				map.put(NewApplicationWizardPage.APPLICATION_XMI_PROPERTY,
+						xmiPath);
+			}
+			String cssValue = map
+					.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
+			if (cssValue != null) {
+				cssValue = "platform:/plugin/" + productName + "/" + cssValue;
+				map.put(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY,
+						cssValue);
+			}
+
+			extension.setPoint("org.eclipse.core.runtime.products");
+			extension.setId("product");
+			IPluginElement productElement = fmodel.getFactory().createElement(
+					extension);
+
+			productElement.setName("product");
+			if (applicationName != null) {
+				productElement.setAttribute("application", applicationName);
+			} else {
+				productElement.setAttribute("application",
+						NewApplicationWizardPage.E4_APPLICATION);
+			}
+			productElement.setAttribute("name", productName);
+
+			Set<Entry<String, String>> set = map.entrySet();
+			if (set != null) {
+				Iterator<Entry<String, String>> it = set.iterator();
+				if (it != null) {
+					while (it.hasNext()) {
+						Entry<String, String> entry = it.next();
+						String value = entry.getValue();
+						if (value == null || value.trim().length() == 0) {
+							continue;
+						}
+
+						if (entry.getKey().equals(
+								NewApplicationWizardPage.PRODUCT_NAME)
+								|| entry.getKey().equals(
+										NewApplicationWizardPage.APPLICATION)) {
+							continue;
+						}
+						IPluginElement element = fmodel.getFactory()
+								.createElement(productElement);
+						element.setName("property");
+						element.setAttribute("name", entry.getKey());
+						element.setAttribute("value", value);
+						productElement.add(element);
+					}
+				}
+			}
+			extension.add(productElement);
+			fmodel.getPluginBase().add(extension);
+			fmodel.save();
+
+		} catch (CoreException e) {
+			PDEPlugin.logException(e);
+		}
+	}
+
+	/**
+	 * create products extension detail
+	 * 
+	 * @param project
+	 */
+	@SuppressWarnings("restriction")
+	public void createApplicationResources(IProject project,
+			IProgressMonitor monitor) {
+		Map<String, String> map = fApplicationPage.getData();
+		if (map == null
+				|| map.get(NewApplicationWizardPage.PRODUCT_NAME) == null)
+			return;
+
+		String projectName = map.get(NewApplicationWizardPage.PRODUCT_NAME);
+		String xmiPath = map
+				.get(NewApplicationWizardPage.APPLICATION_XMI_PROPERTY);
+
+		IJavaProject javaProject = JavaCore.create(project);
+		IPackageFragment fragment = null;
+		try {
+			for (IPackageFragment element : javaProject.getPackageFragments()) {
+				if (element.getKind() == IPackageFragmentRoot.K_SOURCE) {
+					fragment = element;
+				}
+			}
+		} catch (JavaModelException e1) {
+			e1.printStackTrace();
+		}
+
+		if (xmiPath != null && xmiPath.trim().length() > 0) {
+			// Create a resource set
+			//
+			ResourceSet resourceSet = new ResourceSetImpl();
+
+			// Get the URI of the model file.
+			//
+			URI fileURI = URI.createPlatformResourceURI(project.getName() + "/"
+					+ xmiPath, true);
+
+			// Create a resource for this file.
+			//
+			Resource resource = resourceSet.createResource(fileURI);
+
+			MApplication application = MApplicationFactory.INSTANCE
+					.createApplication();
+			
+			application.setElementId("org.eclipse.e4.ide.application");
+			
+			MBindingContext rootContext = MCommandsFactory.INSTANCE.createBindingContext();
+			rootContext.setElementId("org.eclipse.ui.contexts.dialogAndWindow");
+			rootContext.setName("In Dialog and Windows");
+			
+			MBindingContext childContext = MCommandsFactory.INSTANCE.createBindingContext();
+			childContext.setElementId("org.eclipse.ui.contexts.window");
+			childContext.setName("In Windows");
+			rootContext.getChildren().add(childContext);
+			
+			childContext = MCommandsFactory.INSTANCE.createBindingContext();
+			childContext.setElementId("org.eclipse.ui.contexts.dialog");
+			childContext.setName("In Dialogs");
+			rootContext.getChildren().add(childContext);
+			
+			application.setRootContext(rootContext);
+			application.getBindingContexts().add("org.eclipse.ui.contexts.dialogAndWindow");
+			
+			resource.getContents().add((EObject) application);
+
+			// Create Quit command
+			MCommand quitCommand = createCommand("quitCommand", "QuitHandler",
+					"Ctrl+Q", projectName, fragment, application);
+
+			MCommand openCommand = createCommand("openCommand", "OpenHandler",
+					"Ctrl+O", projectName, fragment, application);
+
+			MCommand saveCommand = createCommand("saveCommand", "SaveHandler",
+					"Ctrl+S", projectName, fragment, application);
+
+			MCommand aboutCommand = createCommand("aboutCommand",
+					"AboutHandler", "Ctrl+A", projectName, fragment,
+					application);
+
+			MTrimmedWindow mainWindow = MBasicFactory.INSTANCE.createTrimmedWindow();
+			application.getChildren().add(mainWindow);
+			{
+				mainWindow.setLabel(projectName);
+				mainWindow.setWidth(500);
+				mainWindow.setHeight(400);
+
+				// Menu
+				{
+					MMenu menu = MMenuFactory.INSTANCE.createMenu();
+					mainWindow.setMainMenu(menu);
+					menu.setElementId("menu:org.eclipse.ui.main.menu");
+
+					MMenu fileMenuItem = MMenuFactory.INSTANCE
+							.createMenu();
+					menu.getChildren().add(fileMenuItem);
+					fileMenuItem.setLabel("File");
+					{
+						MHandledMenuItem menuItemOpen = MMenuFactory.INSTANCE
+								.createHandledMenuItem();
+						fileMenuItem.getChildren().add(menuItemOpen);
+						menuItemOpen.setLabel("Open");
+						menuItemOpen.setIconURI("platform:/plugin/"
+								+ project.getName() + "/icons/sample.gif");
+						menuItemOpen.setCommand(openCommand);
+
+						MHandledMenuItem menuItemSave = MMenuFactory.INSTANCE
+								.createHandledMenuItem();
+						fileMenuItem.getChildren().add(menuItemSave);
+						menuItemSave.setLabel("Save");
+						menuItemSave.setIconURI("platform:/plugin/"
+								+ project.getName() + "/icons/save_edit.gif");
+						menuItemSave.setCommand(saveCommand);
+
+						MHandledMenuItem menuItemQuit = MMenuFactory.INSTANCE
+								.createHandledMenuItem();
+						fileMenuItem.getChildren().add(menuItemQuit);
+						menuItemQuit.setLabel("Quit");
+						menuItemQuit.setCommand(quitCommand);
+					}
+					MMenu helpMenuItem = MMenuFactory.INSTANCE
+							.createMenu();
+					menu.getChildren().add(helpMenuItem);
+					helpMenuItem.setLabel("Help");
+					{
+						MHandledMenuItem menuItemAbout = MMenuFactory.INSTANCE
+								.createHandledMenuItem();
+						helpMenuItem.getChildren().add(menuItemAbout);
+						menuItemAbout.setLabel("About");
+						menuItemAbout.setCommand(aboutCommand);
+					}
+				}
+
+				// PerspectiveStack
+				{
+					MPerspectiveStack perspectiveStack = MAdvancedFactory.INSTANCE
+							.createPerspectiveStack();
+					mainWindow.getChildren().add(perspectiveStack);
+
+					MPerspective perspective = MAdvancedFactory.INSTANCE
+							.createPerspective();
+					perspectiveStack.getChildren().add(perspective);
+					{
+						// Part Container
+						MPartSashContainer partSashContainer = MBasicFactory.INSTANCE
+								.createPartSashContainer();
+						perspective.getChildren().add(partSashContainer);
+
+						MPartStack partStack = MBasicFactory.INSTANCE
+								.createPartStack();
+						partSashContainer.getChildren().add(partStack);
+//
+//						MPart part = MApplicationFactory.eINSTANCE.createPart();
+//						partStack.getChildren().add(part);
+//						part.setLabel("Main");
+					}
+
+					// WindowTrim
+					{
+						MTrimBar trimBar = MBasicFactory.INSTANCE.createTrimBar();
+						mainWindow.getTrimBars().add(trimBar);
+
+						MToolBar toolBar = MMenuFactory.INSTANCE
+								.createToolBar();
+						toolBar.setElementId("toolbar:org.eclipse.ui.main.toolbar");
+						trimBar.getChildren().add(toolBar);
+
+						MHandledToolItem toolItemOpen = MMenuFactory.INSTANCE
+								.createHandledToolItem();
+						toolBar.getChildren().add(toolItemOpen);
+						toolItemOpen.setIconURI("platform:/plugin/"
+								+ project.getName() + "/icons/sample.gif");
+						toolItemOpen.setCommand(openCommand);
+
+						MHandledToolItem toolItemSave = MMenuFactory.INSTANCE
+								.createHandledToolItem();
+						toolBar.getChildren().add(toolItemSave);
+						toolItemSave.setIconURI("platform:/plugin/"
+								+ project.getName() + "/icons/save_edit.gif");
+						toolItemSave.setCommand(saveCommand);
+					}
+				}
+			}
+			Map<Object, Object> options = new HashMap<Object, Object>();
+			options.put(XMLResource.OPTION_ENCODING, "UTF-8");
+			try {
+				resource.save(options);
+			} catch (IOException e) {
+				PDEPlugin.logException(e);
+			}
+		}
+
+		String cssPath = map
+				.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
+		if (cssPath != null && cssPath.trim().length() > 0) {
+			IFile file = project.getFile(cssPath);
+
+			try {
+				prepareFolder(file.getParent(), monitor);
+
+				URL corePath = ResourceLocator
+						.getProjectTemplateFiles("css/default.css");
+				file.create(corePath.openStream(), true, monitor);
+			} catch (Exception e) {
+				PDEPlugin.logException(e);
+			}
+		}
+
+		// IFolder folder = project.getFolder("icons");
+		// try {
+		// folder.create(true, true, monitor);
+		// Bundle bundle = Platform
+		// .getBundle("org.eclipse.e4.tools.ui.designer");
+		//
+		// for (String fileName : new String[] { "sample.gif", "save_edit.gif"
+		// }) {
+		// URL sampleUrl = bundle.getEntry("resources/icons/" + fileName);
+		// sampleUrl = FileLocator.resolve(sampleUrl);
+		// InputStream inputStream = sampleUrl.openStream();
+		// IFile file = folder.getFile(fileName);
+		// file.create(inputStream, true, monitor);
+		// }
+		// } catch (Exception e) {
+		// PDEPlugin.logException(e);
+		// }
+
+		String template_id = "common";
+		Set<String> binaryExtentions = new HashSet<String>();
+		binaryExtentions.add(".gif");
+		binaryExtentions.add(".png");
+
+		Map<String, String> keys = new HashMap<String, String>();
+		keys.put("projectName", projectName);
+		keys.put("packageName", fragment.getElementName() + ".handlers");
+
+		try {
+			URL corePath = ResourceLocator.getProjectTemplateFiles(template_id);
+			IRunnableWithProgress op = new TemplateOperation(corePath, project,
+					keys, binaryExtentions);
+			getContainer().run(false, true, op);
+		} catch (Exception e) {
+			PDEPlugin.logException(e);
+		}
+
+		try {
+			URL corePath = ResourceLocator.getProjectTemplateFiles("src");
+			IRunnableWithProgress op = new TemplateOperation(corePath,
+					(IContainer) fragment.getResource(), keys, binaryExtentions);
+			getContainer().run(false, true, op);
+		} catch (Exception e) {
+			PDEPlugin.logException(e);
+		}
+	}
+
+	private MCommand createCommand(String name, String className,
+			String keyBinding, String projectName, IPackageFragment fragment,
+			MApplication application) {
+		MCommand command = MCommandsFactory.INSTANCE.createCommand();
+		command.setCommandName(name);
+		command.setElementId(projectName + "." + name);
+		application.getCommands().add(command);
+		{
+			// Create Quit handler for command
+			MHandler quitHandler =MCommandsFactory.INSTANCE
+					.createHandler();
+			quitHandler.setCommand(command);
+			quitHandler.setContributionURI("platform:/plugin/" + projectName + "/"
+					+ fragment.getElementName() + ".handlers." + className);
+			application.getHandlers().add(quitHandler);
+
+			MKeyBinding binding = MCommandsFactory.INSTANCE
+					.createKeyBinding();
+			binding.setKeySequence(keyBinding);
+			binding.setCommand(command);
+			List<MBindingTable> tables = application.getBindingTables();
+			if (tables.size()==0) {
+				MBindingTable table = MCommandsFactory.INSTANCE.createBindingTable();
+				table.setBindingContextId("org.eclipse.ui.contexts.dialogAndWindow");
+				tables.add(table);
+			}
+			tables.get(0).getBindings().add(binding);
+		}
+		return command;
+	}
+
+	private void prepareFolder(IContainer container, IProgressMonitor monitor)
+			throws CoreException {
+		IContainer parent = container.getParent();
+		if (parent instanceof IFolder) {
+			prepareFolder((IFolder) parent, monitor);
+		}
+		if (!container.exists() && container instanceof IFolder) {
+			IFolder folder = (IFolder) container;
+			folder.create(true, true, monitor);
+		}
+	}
+
+	public String getPluginId() {
+		return fPluginData.getId();
+	}
+
+	public String getPluginVersion() {
+		return fPluginData.getVersion();
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizardPage.java
new file mode 100644
index 0000000000..72ae3d446e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizardPage.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2010 Soyatec(http://www.soyatec.com) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Soyatec - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.project;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.pde.internal.ui.wizards.plugin.AbstractFieldData;
+import org.eclipse.swt.widgets.Composite;
+
+public class E4NewProjectWizardPage extends org.eclipse.pde.internal.ui.wizards.plugin.NewProjectCreationPage {
+
+	public E4NewProjectWizardPage(String pageName, AbstractFieldData data, boolean fragment, IStructuredSelection selection) {
+		super(pageName, data, fragment, selection);
+	}
+
+	@Override
+	public void createControl(Composite parent) {
+		super.createControl(parent);
+		fOSGIButton.setSelection(true);
+		fEclipseButton.setEnabled(false);
+		fEclipseCombo.setEnabled(false);
+	}
+}
+
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
new file mode 100644
index 0000000000..14bc00b97e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
@@ -0,0 +1,417 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2010 Soyatec (http://www.soyatec.com) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Soyatec - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.project;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.events.VerifyEvent;
+import org.eclipse.swt.events.VerifyListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.ColorDialog;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.branding.IProductConstants;
+
+/**
+ * @author jin.liu (jin.liu@soyatec.com)
+ */
+public class NewApplicationWizardPage extends WizardPage {
+	public static final String E4_APPLICATION = "org.eclipse.e4.ui.workbench.swt.E4Application";
+	public static final String APPLICATION_XMI_PROPERTY = "applicationXMI";
+	public static final String APPLICATION_CSS_PROPERTY = "applicationCSS";
+	public static final String PRODUCT_NAME = "productName";
+	public static final String APPLICATION = "application";
+
+	private final Map<String, String> data;
+
+	private IProject project;
+	private IProjectProvider projectProvider;
+	private Text proNameText;
+	private Text proApplicationText;
+	private Group propertyGroup;
+
+	private PropertyData[] PROPERTIES;
+
+	protected NewApplicationWizardPage(IProjectProvider projectProvider) {
+		super("New e4 Application Wizard Page");
+		this.projectProvider = projectProvider;
+		data = new HashMap<String, String>();
+		setTitle("e4 Application");
+		setMessage("Configure application with special values.");
+	}
+
+	public IProject getProject() {
+		if (project == null && projectProvider != null) {
+			project = projectProvider.getProject();
+		}
+		return project;
+	}
+
+	public void setProject(IProject project) {
+		this.project = project;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets
+	 * .Composite)
+	 */
+	public void createControl(Composite parent) {
+		Composite control = new Composite(parent, SWT.NONE);
+		control.setLayout(new GridLayout());
+
+		Group productGroup = createProductGroup(control);
+		productGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		propertyGroup = createPropertyGroup(control);
+		propertyGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		setControl(control);
+	}
+
+	static class PropertyData {
+		private String name;
+		private String label;
+
+		private String value;
+		private Class<?> type;
+		private boolean editable;
+
+		public PropertyData(String name, String label, String value, Class<?> type,
+				boolean editable) {
+			this.name = name;
+			this.value = value;
+			this.label = label;
+			this.type = type;
+			this.editable = editable;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public String getValue() {
+			return value;
+		}
+
+		public Class<?> getType() {
+			return type;
+		}
+
+		public boolean isEditable() {
+			return editable;
+		}
+		
+		public String getLabel() {
+			return label;
+		}
+	}
+
+	private Group createPropertyGroup(Composite control) {
+		Group group = new Group(control, SWT.NONE);
+		group.setText("Properties");
+
+		group.setLayout(new GridLayout(3, false));
+
+		return group;
+	}
+
+	private void createPropertyItem(final Composite parent,
+			final PropertyData property) {
+		Label label = new Label(parent, SWT.NONE);
+		label.setText(property.getLabel());
+		label.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_BLUE));
+		label.setToolTipText("Property \"" + property.getName() + "\"");
+		
+		final Text valueText = new Text(parent, SWT.BORDER);
+		valueText.setText(property.getValue());
+		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+		valueText.setLayoutData(gridData);
+		if (!property.isEditable()) {
+			valueText.setEditable(false);
+		}
+		valueText.addListener(SWT.Modify, new Listener() {
+			public void handleEvent(Event event) {
+				handleTextEvent(property.getName(), valueText);
+			}
+		});
+
+		if (property.getType() == Color.class
+				|| property.getType() == Rectangle.class) {
+			Button button = new Button(parent, SWT.PUSH);
+			button.setText("...");
+			button.addSelectionListener(new SelectionListener() {
+				public void widgetSelected(SelectionEvent e) {
+					handleLinkEvent(property, valueText, parent.getShell());
+				}
+
+				public void widgetDefaultSelected(SelectionEvent e) {
+				}
+			});
+		}
+		else {
+			new Label(parent, SWT.NONE);
+		}
+		data.put(property.getName(), property.getValue());
+	}
+
+	private void handleLinkEvent(PropertyData property, Text valueText,
+			Shell shell) {
+		if (property == null || valueText == null || valueText.isDisposed()) {
+			return;
+		}
+		if (property.getType() == Color.class) {
+			ColorDialog colorDialog = new ColorDialog(shell);
+			RGB selectRGB = colorDialog.open();
+			if (selectRGB != null) {
+				valueText.setText((this.hexColorConvert(Integer
+						.toHexString(selectRGB.blue))
+						+ this.hexColorConvert(Integer
+								.toHexString(selectRGB.green)) + this
+						.hexColorConvert(Integer.toHexString(selectRGB.red)))
+						.toUpperCase());
+			}
+		} else if (property.getType() == Rectangle.class) {
+			this.createRectDialog(shell, valueText).open();
+		}
+	}
+
+	/**
+	 * exchange the color pattern of hex numeric
+	 * 
+	 * @param number
+	 * @return
+	 */
+	public String hexColorConvert(String color) {
+		if (color.length() == 1) {
+			return "0" + color;
+		}
+		return color;
+	}
+
+	/**
+	 * create Rect Set dialog
+	 * 
+	 * @param parent
+	 * @param valueText
+	 * @return
+	 */
+	public Dialog createRectDialog(final Composite parent, final Text valueText) {
+		return new Dialog(parent.getShell()) {
+			Text xPointText, yPointText, widthText, heightText;
+
+			@Override
+			protected Button createButton(Composite parent, int id,
+					String label, boolean defaultButton) {
+				return super.createButton(parent, id, label, defaultButton);
+			}
+
+			@Override
+			protected Control createDialogArea(final Composite parent) {
+				Composite composite = (Composite) super
+						.createDialogArea(parent);
+				composite.getShell().setText("Set Rect");
+				Group group = new Group(composite, SWT.NONE);
+				group.setText("Rect");
+				GridLayout gridLayout = new GridLayout();
+				gridLayout.numColumns = 4;
+				group.setLayout(gridLayout);
+
+				Label xPointLabel = new Label(group, SWT.NONE);
+				xPointLabel.setText("X:");
+				xPointText = new Text(group, SWT.BORDER);
+				VerifyListener verifyListener = createVerifyListener(parent
+						.getShell());
+				xPointText.addVerifyListener(verifyListener);
+				Label yPointLabel = new Label(group, SWT.NONE);
+				yPointLabel.setText("Y:");
+				yPointText = new Text(group, SWT.BORDER);
+				yPointText.addVerifyListener(verifyListener);
+				Label widthLabel = new Label(group, SWT.NONE);
+				widthLabel.setText("Width:");
+				widthText = new Text(group, SWT.BORDER);
+				widthText.addVerifyListener(verifyListener);
+				Label heighttLabel = new Label(group, SWT.NONE);
+				heighttLabel.setText("Height:");
+				heightText = new Text(group, SWT.BORDER);
+				heightText.addVerifyListener(verifyListener);
+
+				return composite;
+			}
+
+			@Override
+			protected void buttonPressed(int buttonId) {
+				if (IDialogConstants.OK_ID == buttonId) {
+					String xPoint = xPointText.getText();
+					String yPoint = yPointText.getText();
+					String width = widthText.getText();
+					String height = heightText.getText();
+					if (xPoint.length() == 0 || yPoint.length() == 0
+							|| width.length() == 0 || height.length() == 0) {
+						MessageDialog.openWarning(parent.getShell(),
+								"Input value empty",
+								"Value shoud not be empty!");
+					} else {
+						valueText.setText(xPoint + "," + yPoint + "," + width
+								+ "," + height);
+						okPressed();
+					}
+				} else if (IDialogConstants.CANCEL_ID == buttonId) {
+					cancelPressed();
+				}
+			}
+		};
+	}
+
+	/**
+	 * create verify Listener
+	 * 
+	 * @param shell
+	 * @return
+	 */
+	public VerifyListener createVerifyListener(final Shell shell) {
+		return new VerifyListener() {
+			public void verifyText(VerifyEvent e) {
+				char c = e.character;
+				if ("0123456789".indexOf(c) == -1) {
+					e.doit = false;
+					MessageDialog.openWarning(shell, "Input value error",
+							"Only numeric is allowed!");
+					return;
+				}
+			}
+		};
+	}
+
+	private void handleTextEvent(String property, Text valueText) {
+		if (property == null || valueText == null || valueText.isDisposed()) {
+			return;
+		}
+		String value = valueText.getText();
+		if (value.equals("")) {
+			value = null;
+		}
+		data.put(property, value);
+	}
+
+	private Group createProductGroup(Composite control) {
+		Group proGroup = new Group(control, SWT.NONE);
+		proGroup.setText("Product");
+
+		proGroup.setLayout(new GridLayout(2, false));
+
+		Label proNameLabel = new Label(proGroup, SWT.NONE);
+		proNameLabel.setText("Name:*");
+
+		proNameText = new Text(proGroup, SWT.BORDER);
+		proNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		proNameText.addListener(SWT.Modify, new Listener() {
+			public void handleEvent(Event event) {
+				handleTextEvent(PRODUCT_NAME, proNameText);
+			}
+		});
+
+		Label proApplicationLabel = new Label(proGroup, SWT.NONE);
+		proApplicationLabel.setText("Application:");
+
+		proApplicationText = new Text(proGroup, SWT.BORDER);
+		proApplicationText
+				.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		proApplicationText.addListener(SWT.Modify, new Listener() {
+			public void handleEvent(Event event) {
+				handleTextEvent(APPLICATION, proApplicationText);
+			}
+		});
+		return proGroup;
+	}
+
+	protected PropertyData[] getPropertyData() {
+		if (PROPERTIES == null) {
+			PROPERTIES = new PropertyData[] {
+					new PropertyData(IProductConstants.APP_NAME, "Application Name:",
+							projectProvider.getProjectName(), String.class,
+							true),
+					new PropertyData(APPLICATION_XMI_PROPERTY, "Application UI:",
+							"Application.e4xmi", String.class, true),
+					new PropertyData(APPLICATION_CSS_PROPERTY, "CSS Style:",
+							"css/default.css", String.class, true),
+					new PropertyData(IProductConstants.ABOUT_TEXT, "About Message:", "",
+							String.class, true),
+					new PropertyData(
+							IProductConstants.STARTUP_FOREGROUND_COLOR, "Startup Foreground:", "",
+							Color.class, false),
+					new PropertyData(IProductConstants.STARTUP_MESSAGE_RECT, "Startup Message Region:",
+							"", Rectangle.class, false),
+					new PropertyData(IProductConstants.STARTUP_PROGRESS_RECT, "Startup Progress Region:",
+							"", Rectangle.class, false),
+					new PropertyData(
+							IProductConstants.PREFERENCE_CUSTOMIZATION, "Preference Customization:", "",
+							String.class, true) }; // plugin_customization.ini
+		}
+		return PROPERTIES;
+	}
+
+	@Override
+	public void setVisible(boolean visible) {
+		if (visible && PROPERTIES == null) {
+			proNameText.setText(projectProvider.getProjectName());
+
+			proApplicationText.setText(E4_APPLICATION);
+
+			for (PropertyData property : getPropertyData()) {
+				createPropertyItem(propertyGroup, property);
+			}
+			propertyGroup.getParent().layout();
+		}
+		super.setVisible(visible);
+	}
+
+	/**
+	 * @return the data
+	 */
+	public Map<String, String> getData() {
+		if (PROPERTIES == null) {
+			for (PropertyData property : getPropertyData()) {
+				data.put(property.getName(), property.getValue());
+			}
+
+			data.put(PRODUCT_NAME, projectProvider.getProjectName());
+			data.put(APPLICATION, E4_APPLICATION);
+		}
+		Map<String, String> map = new HashMap<String, String>();
+		map.putAll(data);
+		return map;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
new file mode 100644
index 0000000000..6fb9ae3f8b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
@@ -0,0 +1,363 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     IBM Corporation - initial API and implementation
+ *     Soyatec - port to e4
+ *******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.project;
+
+import java.util.Locale;
+import java.util.TreeSet;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jdt.core.JavaConventions;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.pde.internal.core.util.PDEJavaHelper;
+import org.eclipse.pde.internal.core.util.VMUtil;
+import org.eclipse.pde.internal.ui.IHelpContextIds;
+import org.eclipse.pde.internal.ui.PDEUIMessages;
+import org.eclipse.pde.internal.ui.SWTFactory;
+import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
+import org.eclipse.pde.internal.ui.wizards.plugin.AbstractFieldData;
+import org.eclipse.pde.internal.ui.wizards.plugin.ContentPage;
+import org.eclipse.pde.internal.ui.wizards.plugin.NewProjectCreationPage;
+import org.eclipse.pde.internal.ui.wizards.plugin.PluginFieldData;
+import org.eclipse.pde.internal.ui.wizards.plugin.TemplateListSelectionPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.PreferencesUtil;
+
+/**
+ * Content wizard page for the New Plugin Project wizard (page 2)
+ */
+public class PluginContentPage extends ContentPage {
+	private Text fClassText;
+	protected Button fGenerateActivator;
+	protected Button fUIPlugin;
+	private Label fClassLabel;
+	private Label fEELabel;
+	private Button fExeEnvButton;
+	private Combo fEEChoice;
+
+	/**
+	 * Button to enable API analysis for the project during project creation
+	 */
+	private Button fApiAnalysisButton;
+
+	/**
+	 * Dialog settings constants
+	 */
+	private final static String S_GENERATE_ACTIVATOR = "generateActivator"; //$NON-NLS-1$
+	private final static String S_UI_PLUGIN = "uiPlugin"; //$NON-NLS-1$
+	private final static String S_RCP_PLUGIN = "rcpPlugin"; //$NON-NLS-1$
+	private final static String S_API_ANALYSIS = "apiAnalysis"; //$NON-NLS-1$
+
+	protected final static int P_CLASS_GROUP = 2;
+	private final static String NO_EXECUTION_ENVIRONMENT = PDEUIMessages.PluginContentPage_noEE;
+
+	/**
+	 * default tText modify listener
+	 */
+	private ModifyListener classListener = new ModifyListener() {
+		public void modifyText(ModifyEvent e) {
+			if (fInitialized)
+				fChangedGroups |= P_CLASS_GROUP;
+			validatePage();
+		}
+	};
+
+	/**
+	 * Constructor
+	 * @param pageName
+	 * @param provider
+	 * @param page
+	 * @param data
+	 */
+	public PluginContentPage(String pageName, IProjectProvider provider, NewProjectCreationPage page, AbstractFieldData data) {
+		super(pageName, provider, page, data);
+		setTitle(PDEUIMessages.ContentPage_title);
+		setDescription(PDEUIMessages.ContentPage_desc);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#createControl(org.eclipse.swt.widgets.Composite)
+	 */
+	public void createControl(Composite parent) {
+		Composite container = new Composite(parent, SWT.NONE);
+		container.setLayout(new GridLayout());
+
+		createPluginPropertiesGroup(container);
+		createPluginClassGroup(container);
+
+		Dialog.applyDialogFont(container);
+		setControl(container);
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.NEW_PROJECT_REQUIRED_DATA);
+	}
+
+	/**
+	 * Creates all of the plugin properties widgets
+	 * @param container
+	 */
+	private void createPluginPropertiesGroup(Composite container) {
+		Group propertiesGroup = SWTFactory.createGroup(container, PDEUIMessages.ContentPage_pGroup, 3, 1, GridData.FILL_HORIZONTAL);
+
+		Label label = new Label(propertiesGroup, SWT.NONE);
+		label.setText(PDEUIMessages.ContentPage_pid);
+		fIdText = createText(propertiesGroup, propertiesListener, 2);
+
+		label = new Label(propertiesGroup, SWT.NONE);
+		label.setText(PDEUIMessages.ContentPage_pversion);
+		fVersionText = createText(propertiesGroup, propertiesListener, 2);
+
+		label = new Label(propertiesGroup, SWT.NONE);
+		label.setText(PDEUIMessages.ContentPage_pname);
+		fNameText = createText(propertiesGroup, propertiesListener, 2);
+
+		label = new Label(propertiesGroup, SWT.NONE);
+		label.setText(PDEUIMessages.ContentPage_pprovider);
+		fProviderText = createText(propertiesGroup, propertiesListener, 2);
+
+		createExecutionEnvironmentControls(propertiesGroup);
+	}
+
+	/**
+	 * Creates all of the EE widgets
+	 * @param container
+	 */
+	private void createExecutionEnvironmentControls(Composite container) {
+		// Create label
+		fEELabel = new Label(container, SWT.NONE);
+		fEELabel.setText(PDEUIMessages.NewProjectCreationPage_executionEnvironments_label);
+
+		// Create combo
+		fEEChoice = new Combo(container, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
+		fEEChoice.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		// Gather EEs 
+		IExecutionEnvironment[] exeEnvs = VMUtil.getExecutionEnvironments();
+		TreeSet availableEEs = new TreeSet();
+		for (int i = 0; i < exeEnvs.length; i++) {
+			availableEEs.add(exeEnvs[i].getId());
+		}
+		availableEEs.add(NO_EXECUTION_ENVIRONMENT);
+
+		// Set data 
+		fEEChoice.setItems((String[]) availableEEs.toArray(new String[availableEEs.size() - 1]));
+		fEEChoice.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				validatePage();
+			}
+		});
+
+		// Set default EE based on strict match to default VM
+		IVMInstall defaultVM = JavaRuntime.getDefaultVMInstall();
+		String[] EEChoices = fEEChoice.getItems();
+		for (int i = 0; i < EEChoices.length; i++) {
+			if (!EEChoices[i].equals(NO_EXECUTION_ENVIRONMENT)) {
+				if (VMUtil.getExecutionEnvironment(EEChoices[i]).isStrictlyCompatible(defaultVM)) {
+					fEEChoice.select(i);
+					break;
+				}
+			}
+		}
+
+		// Create button
+		fExeEnvButton = new Button(container, SWT.PUSH);
+		fExeEnvButton.setLayoutData(new GridData());
+		fExeEnvButton.setText(PDEUIMessages.NewProjectCreationPage_environmentsButton);
+		fExeEnvButton.addListener(SWT.Selection, new Listener() {
+			public void handleEvent(Event event) {
+				PreferencesUtil.createPreferenceDialogOn(getShell(), "org.eclipse.jdt.debug.ui.jreProfiles", //$NON-NLS-1$
+						new String[] {"org.eclipse.jdt.debug.ui.jreProfiles"}, null).open(); //$NON-NLS-1$ 
+			}
+		});
+	}
+
+	/**
+	 * Creates all of the plugin options widgets
+	 * @param container
+	 */
+	protected void createPluginClassGroup(Composite container) {
+		Group classGroup = SWTFactory.createGroup(container, PDEUIMessages.ContentPage_pClassGroup, 2, 1, GridData.FILL_HORIZONTAL);
+
+		IDialogSettings settings = getDialogSettings();
+
+		fGenerateActivator = SWTFactory.createCheckButton(classGroup, PDEUIMessages.ContentPage_generate, null, (settings != null) ? !settings.getBoolean(S_GENERATE_ACTIVATOR) : true, 2);
+		fGenerateActivator.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				fClassLabel.setEnabled(fGenerateActivator.getSelection());
+				fClassText.setEnabled(fGenerateActivator.getSelection());
+				updateData();
+				validatePage();
+			}
+		});
+
+		fClassLabel = new Label(classGroup, SWT.NONE);
+		fClassLabel.setText(PDEUIMessages.ContentPage_classname);
+		GridData gd = new GridData();
+		gd.horizontalIndent = 20;
+		fClassLabel.setLayoutData(gd);
+		fClassText = createText(classGroup, classListener);
+
+		fUIPlugin = SWTFactory.createCheckButton(classGroup, PDEUIMessages.ContentPage_uicontribution, null, (settings != null) ? !settings.getBoolean(S_UI_PLUGIN) : true, 2);
+		fUIPlugin.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				updateData();
+				validatePage();
+			}
+		});
+
+		fApiAnalysisButton = SWTFactory.createCheckButton(classGroup, PDEUIMessages.PluginContentPage_enable_api_analysis, null, false, 2);
+		fApiAnalysisButton.setSelection((settings != null) ? settings.getBoolean(S_API_ANALYSIS) : false);
+		fApiAnalysisButton.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				updateData();
+				validatePage();
+			}
+		});
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#updateData()
+	 */
+	public void updateData() {
+		super.updateData();
+		PluginFieldData data = (PluginFieldData) fData;
+		data.setClassname(fClassText.getText().trim());
+		data.setUIPlugin(fUIPlugin.getSelection());
+		data.setDoGenerateClass(fGenerateActivator.getSelection());
+		data.setRCPApplicationPlugin(!fData.isSimple() && !isPureOSGi());
+		data.setEnableAPITooling(fApiAnalysisButton.getSelection());
+		if (fEEChoice.isEnabled() && !fEEChoice.getText().equals(NO_EXECUTION_ENVIRONMENT)) {
+			fData.setExecutionEnvironment(fEEChoice.getText().trim());
+		} else {
+			fData.setExecutionEnvironment(null);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#setVisible(boolean)
+	 */
+	public void setVisible(boolean visible) {
+		if (visible) {
+			fMainPage.updateData();
+			fGenerateActivator.setSelection(!fData.isSimple());
+			fGenerateActivator.setEnabled(!fData.isSimple());
+			fClassLabel.setEnabled(!fData.isSimple() && fGenerateActivator.getSelection());
+			fClassText.setEnabled(!fData.isSimple() && fGenerateActivator.getSelection());
+			boolean wasUIPluginEnabled = fUIPlugin.isEnabled();
+			fUIPlugin.setEnabled(!fData.isSimple() && !isPureOSGi());
+			// if fUIPlugin is disabled, set selection to false
+			if (!fUIPlugin.isEnabled()) {
+				fUIPlugin.setSelection(false);
+			}
+			// if the fUIPlugin was disabled and is now enabled, then set the selection to true
+			else if (!wasUIPluginEnabled) {
+				fUIPlugin.setSelection(true);
+			}
+
+			// plugin class group
+			if (((fChangedGroups & P_CLASS_GROUP) == 0)) {
+				int oldfChanged = fChangedGroups;
+				fClassText.setText(computeId().replaceAll("-", "_").toLowerCase(Locale.ENGLISH) + ".Activator"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				fChangedGroups = oldfChanged;
+			}
+
+			boolean allowEESelection = !fData.isSimple() && fData.hasBundleStructure();
+			fEELabel.setEnabled(allowEESelection);
+			fEEChoice.setEnabled(allowEESelection);
+			fExeEnvButton.setEnabled(allowEESelection);
+			// API tooling only works for osgi bundles with java natures
+			fApiAnalysisButton.setEnabled(allowEESelection);
+			if (allowEESelection && getDialogSettings() != null) {
+				fApiAnalysisButton.setSelection(getDialogSettings().getBoolean(S_API_ANALYSIS));
+			} else {
+				fApiAnalysisButton.setSelection(false);
+			}
+		}
+		super.setVisible(visible);
+	}
+
+	/**
+	 * @return if the field data is using the OSGi framework
+	 */
+	private boolean isPureOSGi() {
+		return ((PluginFieldData) fData).getOSGiFramework() != null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#validatePage()
+	 */
+	protected void validatePage() {
+		String errorMessage = validateProperties();
+		if (errorMessage == null && fGenerateActivator.getSelection()) {
+			IStatus status = JavaConventions.validateJavaTypeName(fClassText.getText().trim(), PDEJavaHelper.getJavaSourceLevel(null), PDEJavaHelper.getJavaComplianceLevel(null));
+			if (status.getSeverity() == IStatus.ERROR) {
+				errorMessage = status.getMessage();
+			} else if (status.getSeverity() == IStatus.WARNING) {
+				setMessage(status.getMessage(), IMessageProvider.WARNING);
+			}
+		}
+		if (errorMessage == null) {
+			String eeid = fEEChoice.getText();
+			if (fEEChoice.isEnabled()) {
+				IExecutionEnvironment ee = VMUtil.getExecutionEnvironment(eeid);
+				if (ee != null && ee.getCompatibleVMs().length == 0) {
+					errorMessage = PDEUIMessages.NewProjectCreationPage_invalidEE;
+				}
+			}
+		}
+		setErrorMessage(errorMessage);
+		setPageComplete(errorMessage == null);
+	}
+
+	/**
+	 * Saves the current state of widgets of interest in the dialog settings for the wizard
+	 * @param settings
+	 */
+	public void saveSettings(IDialogSettings settings) {
+		settings.put(S_GENERATE_ACTIVATOR, !fGenerateActivator.getSelection());
+		if (fUIPlugin.isEnabled()) {
+			settings.put(S_UI_PLUGIN, !fUIPlugin.getSelection());
+		}
+		if (fApiAnalysisButton.isEnabled()) {
+			settings.put(S_API_ANALYSIS, fApiAnalysisButton.getSelection());
+		}
+		settings.put(S_RCP_PLUGIN, true);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
+	 */
+	public boolean canFlipToNextPage() {
+		if (getNextPage() instanceof TemplateListSelectionPage) {
+			TemplateListSelectionPage templatePage = (TemplateListSelectionPage) getNextPage();
+			return super.canFlipToNextPage() && templatePage.isAnyTemplateAvailable();
+		}
+		return super.canFlipToNextPage();
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/ResourceLocator.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/ResourceLocator.java
new file mode 100644
index 0000000000..1e2c5e29ff
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/ResourceLocator.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2010 Soyatec (http://www.soyatec.com) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Soyatec - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.project;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.e4.internal.tools.ToolsPlugin;
+
+public class ResourceLocator {
+	private static final String TEMPLATE_FOLDER = "templates";
+
+	private static ResourceLocator instance = new ResourceLocator();
+
+	private ResourceLocator() {
+	}
+
+	public static ResourceLocator getInstance() {
+		return instance;
+	}
+
+	public static URL getProjectTemplateFiles(String folder)
+			throws IOException {
+		Plugin plugin = getResorucePlugin();
+		URL installURL = plugin.getBundle().getEntry(
+				"/" + TEMPLATE_FOLDER + "/" + folder);
+		// FileLocator.toFileURL(installURL);
+		URL corePath = FileLocator.resolve(installURL);
+		return corePath;
+	}
+
+	public static URL getFile(String relativePath) throws IOException {
+		Plugin plugin = getResorucePlugin();
+		URL installURL = plugin.getBundle().getEntry(relativePath);
+		URL corePath = FileLocator.resolve(installURL);
+		return corePath;
+	}
+
+	public static Plugin getResorucePlugin() {
+		return ToolsPlugin.getDefault();
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java
new file mode 100644
index 0000000000..3546db5726
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java
@@ -0,0 +1,401 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2010 Soyatec (http://www.soyatec.com) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Soyatec - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.project;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.InvocationTargetException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.e4.internal.tools.ToolsPlugin;
+import org.eclipse.pde.internal.ui.PDEUIMessages;
+import org.eclipse.pde.ui.templates.IVariableProvider;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+public class TemplateOperation extends WorkspaceModifyOperation implements
+		IVariableProvider {
+
+	private final URL templateDirectory;
+	private final IContainer target;
+	private final Map<String, String> keys;
+	private final Set<String> binaryExtentions;
+
+	public TemplateOperation(URL source, IContainer target,
+			Map<String, String> keys, Set<String> binaryExtentions) {
+		templateDirectory = source;
+		this.binaryExtentions = binaryExtentions;
+		this.target = target;
+		this.keys = keys;
+	}
+
+	@Override
+	protected void execute(IProgressMonitor monitor) throws CoreException,
+			InvocationTargetException, InterruptedException {
+		monitor.setTaskName(PDEUIMessages.AbstractTemplateSection_generating);
+
+		if ("jar".equals(templateDirectory.getProtocol())) { //$NON-NLS-1$
+			String file = templateDirectory.getFile();
+			int exclamation = file.indexOf('!');
+			if (exclamation < 0)
+				return;
+			URL fileUrl = null;
+			try {
+				fileUrl = new URL(file.substring(0, exclamation));
+			} catch (MalformedURLException mue) {
+				ToolsPlugin.logError(mue);
+				return;
+			}
+			File pluginJar = new File(fileUrl.getFile());
+			if (!pluginJar.exists())
+				return;
+			String templateDirectory = file.substring(exclamation + 1); // "/some/path/"
+			IPath path = new Path(templateDirectory);
+			ZipFile zipFile = null;
+			try {
+				zipFile = new ZipFile(pluginJar);
+				generateFiles(zipFile, path, target, monitor);
+			} catch (ZipException ze) {
+			} catch (IOException ioe) {
+			} finally {
+				if (zipFile != null) {
+					try {
+						zipFile.close();
+					} catch (IOException e) {
+					}
+				}
+			}
+		} else if ("file".equals(templateDirectory.getProtocol())) { //$NON-NLS-1$
+			File directory = new File(templateDirectory.getFile());
+			if (!directory.exists())
+				return;
+			generateFiles(directory, target, true, monitor);
+		}
+	}
+
+	private void generateFiles(File src, IContainer dst, boolean firstLevel,
+			IProgressMonitor monitor) throws CoreException {
+		File[] members = src.listFiles();
+
+		for (int i = 0; i < members.length; i++) {
+			File member = members[i];
+			String name = member.getName();
+			if (member.isDirectory()) {
+				if (".svn".equals(name) || "cvs".equalsIgnoreCase(name))
+					continue;
+				IContainer dstContainer = null;
+
+				if (dstContainer == null) {
+					String folderName = getProcessedString(name, name);
+					dstContainer = dst.getFolder(new Path(folderName));
+				}
+				if (dstContainer != null && !dstContainer.exists())
+					((IFolder) dstContainer).create(true, true, monitor);
+				generateFiles(member, dstContainer, false, monitor);
+			} else {
+				InputStream in = null;
+				try {
+					in = new FileInputStream(member);
+					copyFile(name, in, dst, monitor);
+				} catch (IOException ioe) {
+				} finally {
+					if (in != null)
+						try {
+							in.close();
+						} catch (IOException ioe2) {
+						}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 
+	 * 
+	 * @param zipFile
+	 * @param path
+	 * @param dst
+	 * @param monitor
+	 * @throws CoreException
+	 */
+	private void generateFiles(ZipFile zipFile, IPath path, IContainer dst,
+			IProgressMonitor monitor) throws CoreException {
+		int pathLength = path.segmentCount();
+		// Immidiate children
+		Map childZipEntries = new HashMap(); // "dir/" or "dir/file.java"
+
+		for (Enumeration zipEntries = zipFile.entries(); zipEntries
+				.hasMoreElements();) {
+			ZipEntry zipEntry = (ZipEntry) zipEntries.nextElement();
+			IPath entryPath = new Path(zipEntry.getName());
+			if (entryPath.segmentCount() <= pathLength) {
+				// ancestor or current directory
+				continue;
+			}
+			if (!path.isPrefixOf(entryPath)) {
+				// not a descendant
+				continue;
+			}
+			if (entryPath.segmentCount() == pathLength + 1) {
+				childZipEntries.put(zipEntry.getName(), zipEntry);
+			} else {
+				String name = entryPath.uptoSegment(pathLength + 1)
+						.addTrailingSeparator().toString();
+				if (!childZipEntries.containsKey(name)) {
+					ZipEntry dirEntry = new ZipEntry(name);
+					childZipEntries.put(name, dirEntry);
+				}
+			}
+		}
+
+		for (Iterator it = childZipEntries.values().iterator(); it.hasNext();) {
+			ZipEntry zipEnry = (ZipEntry) it.next();
+			String name = new Path(zipEnry.getName()).lastSegment().toString();
+			if (zipEnry.isDirectory()) {
+				IContainer dstContainer = null;
+
+				if (dstContainer == null) {
+					String folderName = getProcessedString(name, name);
+					dstContainer = dst.getFolder(new Path(folderName));
+				}
+				if (dstContainer != null && !dstContainer.exists())
+					((IFolder) dstContainer).create(true, true, monitor);
+				generateFiles(zipFile, path.append(name), dstContainer, monitor);
+			} else {
+				InputStream in = null;
+				try {
+					in = zipFile.getInputStream(zipEnry);
+					copyFile(name, in, dst, monitor);
+				} catch (IOException ioe) {
+				} finally {
+					if (in != null)
+						try {
+							in.close();
+						} catch (IOException ioe2) {
+						}
+				}
+			}
+		}
+	}
+
+	private void copyFile(String fileName, InputStream input, IContainer dst,
+			IProgressMonitor monitor) throws CoreException {
+		String targetFileName = getProcessedString(fileName, fileName);
+
+		monitor.subTask(targetFileName);
+		IFile dstFile = dst.getFile(new Path(targetFileName));
+
+		try {
+			InputStream stream = isBinary(fileName) ? input
+					: getProcessedStream(fileName, input);
+			if (dstFile.exists()) {
+				dstFile.setContents(stream, true, true, monitor);
+			} else {
+				dstFile.create(stream, true, monitor);
+			}
+			stream.close();
+
+		} catch (IOException e) {
+		}
+	}
+
+	protected void copyFile(String fileName, InputStream input, IContainer dst,
+			final String destPath, IProgressMonitor monitor)
+			throws CoreException {
+		String targetFileName = null;
+		if (destPath == null) {
+			targetFileName = getProcessedString(fileName, fileName);
+		} else {
+			targetFileName = destPath;
+		}
+
+		monitor.subTask(targetFileName);
+		IFile dstFile = dst.getFile(new Path(targetFileName));
+
+		try {
+			InputStream stream = isBinary(fileName) ? input
+					: getProcessedStream(fileName, input);
+			if (dstFile.exists()) {
+				dstFile.setContents(stream, true, true, monitor);
+			} else {
+				dstFile.create(stream, true, monitor);
+			}
+			stream.close();
+
+		} catch (IOException e) {
+		}
+	}
+
+	/**
+	 * 
+	 * @param fileName
+	 * @param input
+	 * @param dst
+	 * @param basePath
+	 * @param monitor
+	 * @throws CoreException
+	 */
+	public void copyFile(String fileName, InputStream input, IContainer dst,
+			final String basePath, final String destName,
+			IProgressMonitor monitor) throws CoreException {
+		if (basePath == null || basePath.equals("")) {
+			copyFile(fileName, input, dst, monitor);
+		}
+
+		String targetFileName = destName == null ? getProcessedString(fileName,
+				fileName) : destName;
+
+		monitor.subTask(targetFileName);
+		IFile dstFile = dst.getFile(new Path(basePath + targetFileName));
+
+		try {
+			InputStream stream = isBinary(fileName) ? input
+					: getProcessedStream(fileName, input);
+			if (dstFile.exists()) {
+				dstFile.setContents(stream, true, true, monitor);
+			} else {
+				dstFile.create(stream, true, monitor);
+			}
+			stream.close();
+
+		} catch (IOException e) {
+		}
+	}
+
+	private boolean isBinary(String fileName) {
+		if (binaryExtentions == null) {
+			return false;
+		}
+
+		String ext = getfileExtention(fileName);
+		if (ext == null)
+			return false;
+		return binaryExtentions.contains(ext);
+	}
+
+	private String getfileExtention(String name) {
+		int indexOf = name.lastIndexOf('.');
+		if (indexOf == -1)
+			return null;
+		return name.substring(indexOf);
+	}
+
+	private InputStream getProcessedStream(String fileName, InputStream stream)
+			throws IOException, CoreException {
+		InputStreamReader reader = new InputStreamReader(stream);
+		int bufsize = 1024;
+		char[] cbuffer = new char[bufsize];
+		int read = 0;
+		StringBuffer keyBuffer = new StringBuffer();
+		StringBuffer outBuffer = new StringBuffer();
+
+		boolean replacementMode = false;
+		boolean almostReplacementMode = false;
+		boolean escape = false;
+		while (read != -1) {
+			read = reader.read(cbuffer);
+			for (int i = 0; i < read; i++) {
+				char c = cbuffer[i];
+
+				if (escape) {
+					StringBuffer buf = outBuffer;
+					buf.append(c);
+					escape = false;
+					continue;
+				}
+
+				if (c == '@') {
+					if (replacementMode && almostReplacementMode) {
+						almostReplacementMode = false;
+					} else if (replacementMode) {
+						replacementMode = false;
+						String key = keyBuffer.toString();
+						String value = key.length() == 0 ? "@@" //$NON-NLS-1$
+								: getReplacementString(key);
+						outBuffer.append(value);
+						keyBuffer.delete(0, keyBuffer.length());
+					} else if (almostReplacementMode) {
+						replacementMode = true;
+					} else {
+						almostReplacementMode = true;
+					}
+				} else {
+					if (replacementMode)
+						keyBuffer.append(c);
+					else {
+						if (almostReplacementMode)
+							outBuffer.append('@');
+						outBuffer.append(c);
+						almostReplacementMode = false;
+					}
+				}
+			}
+		}
+		return new ByteArrayInputStream(outBuffer.toString().getBytes());
+		// return new
+		// ByteArrayInputStream(outBuffer.toString().getBytes(project.
+		// getDefaultCharset()));
+	}
+
+	private String getProcessedString(String fileName, String source) {
+		if (source.indexOf('$') == -1)
+			return source;
+		int loc = -1;
+		StringBuffer buffer = new StringBuffer();
+		boolean replacementMode = false;
+		for (int i = 0; i < source.length(); i++) {
+			char c = source.charAt(i);
+			if (c == '$') {
+				if (replacementMode) {
+					String key = source.substring(loc, i);
+					String value = key.length() == 0 ? "$" : getReplacementString(key); //$NON-NLS-1$
+					buffer.append(value);
+					replacementMode = false;
+				} else {
+					replacementMode = true;
+					loc = i + 1;
+					continue;
+				}
+			} else if (!replacementMode)
+				buffer.append(c);
+		}
+		return buffer.toString();
+	}
+
+	public String getReplacementString(String key) {
+		String result = keys.get(key);
+		return result != null ? result : key;
+	}
+
+	public Object getValue(String variable) {
+		return getReplacementString(variable);
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product b/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
new file mode 100644
index 0000000000..d91c3d09e2
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="@@projectName@@" id="@@projectName@@.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+   </launcherArgs>
+
+   <windowImages/>
+
+   <plugins>
+      <plugin id="@@projectName@@"/>
+      <plugin id="com.ibm.icu"/>
+      <plugin id="javax.inject"/>
+      <plugin id="org.apache.batik.css"/>
+      <plugin id="org.apache.batik.util"/>
+      <plugin id="org.apache.batik.util.gui"/>
+      <plugin id="org.apache.commons.beanutils"/>
+      <plugin id="org.apache.commons.logging"/>
+      <plugin id="org.eclipse.core.commands"/>
+      <plugin id="org.eclipse.core.contenttype"/>
+      <plugin id="org.eclipse.core.databinding"/>
+      <plugin id="org.eclipse.core.databinding.beans"/>
+      <plugin id="org.eclipse.core.databinding.observable"/>
+      <plugin id="org.eclipse.core.databinding.property"/>
+      <plugin id="org.eclipse.core.expressions"/>
+      <plugin id="org.eclipse.core.filesystem"/>
+      <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.core.jobs"/>
+      <plugin id="org.eclipse.core.resources"/>
+      <plugin id="org.eclipse.core.resources.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.core.runtime"/>
+      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
+      <plugin id="org.eclipse.e4.core.commands"/>
+      <plugin id="org.eclipse.e4.core.services"/>
+      <plugin id="org.eclipse.e4.core.services.annotations" fragment="true"/>
+      <plugin id="org.eclipse.e4.ui.bindings"/>
+      <plugin id="org.eclipse.e4.ui.css.core"/>
+      <plugin id="org.eclipse.e4.ui.css.nebula"/>
+      <plugin id="org.eclipse.e4.ui.css.swt"/>
+      <plugin id="org.eclipse.e4.ui.di"/>
+      <plugin id="org.eclipse.e4.ui.model.workbench"/>
+      <plugin id="org.eclipse.e4.ui.services"/>
+      <plugin id="org.eclipse.e4.ui.workbench"/>
+      <plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
+      <plugin id="org.eclipse.e4.ui.workbench.swt"/>
+      <plugin id="org.eclipse.e4.ui.workbench3"/>
+      <plugin id="org.eclipse.emf.common"/>
+      <plugin id="org.eclipse.emf.databinding"/>
+      <plugin id="org.eclipse.emf.ecore"/>
+      <plugin id="org.eclipse.emf.ecore.change"/>
+      <plugin id="org.eclipse.emf.ecore.xmi"/>
+      <plugin id="org.eclipse.equinox.app"/>
+      <plugin id="org.eclipse.equinox.common"/>
+      <plugin id="org.eclipse.equinox.concurrent"/>
+      <plugin id="org.eclipse.equinox.ds"/>
+      <plugin id="org.eclipse.equinox.event"/>
+      <plugin id="org.eclipse.equinox.preferences"/>
+      <plugin id="org.eclipse.equinox.registry"/>
+      <plugin id="org.eclipse.equinox.util"/>
+      <plugin id="org.eclipse.jface"/>
+      <plugin id="org.eclipse.jface.databinding"/>
+      <plugin id="org.eclipse.nebula.widgets.gallery"/>
+      <plugin id="org.eclipse.osgi"/>
+      <plugin id="org.eclipse.osgi.services"/>
+      <plugin id="org.eclipse.swt"/>
+      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
+      <plugin id="org.pushingpixels.trident"/>
+      <plugin id="org.w3c.css.sac"/>
+      <plugin id="org.w3c.dom.smil"/>
+      <plugin id="org.w3c.dom.svg"/>
+   </plugins>
+
+
+</product>
diff --git a/bundles/org.eclipse.e4.tools/templates/common/icons/sample.gif b/bundles/org.eclipse.e4.tools/templates/common/icons/sample.gif
new file mode 100644
index 0000000000000000000000000000000000000000..34fb3c9d8cb7d489681b7f7aee4bdcd7eaf53610
GIT binary patch
literal 983
zcmZ?wbhEHb6krfw_|CxKYUg-n!?izO{@<MU=lrfa-=6>9*?jxd%4aX0yzy`dymabz
zw#(eg=y~&N&n)dZv2xzduG}5lraiApo3(c4*{Ylg5#|$JO_EEZ<^|a2`Z*=9ns7DV
zy=TR&gYw*7f%auV?ip3tvjRPmcdoho{K?x$_vR?C#t5&<;~V}S*>OMCr>h}%%bLZ9
zmo3`hYE<KGQ|@6^6ztNF7&tM)w`%LUlM$ZXF+LNb{aPCe*E?B9-oF0Q%eE%Wqbtg%
z@9CqD9#(CE&J!||x{C9<qx`1E1<#EMm>wTICo-TTCZwgTsC&VjZRgJ1eE#fBa^%9R
zmmfWS@;bnyJ27HWY}kxYzv(Hl>yu;FCPlAEh+34Muq-8Rb6C)<<b<V}>8qA3{r2e5
z`$vyngh#H=FWlqqvnapfc5%(!sQ4v?r7J61-&eJNEN^;KTK}T7{#i-g<Ko(f<;_oL
zEqXI)#s$xy8I>Jh%G*9vcYdwv_*~xdw!Gz4Va?T!sXyyF@8?w<>X`X=#<IVLwl(2N
zbDlnX{r~@ehEXtZA)xq^g^_`wfk6l41W=w};Ml^z$SLEoVZp&>j%uHV4GRvj@+tE@
zQ%F!a)GKcn<q;6D!JEN>^~8abN>4la1UNXVL;{ZWi)lEwyeatDu%Lr6;aASiLrXXW
z<qR}<jx?wH%UBk_m}3}x+;6r`C0o`5p=aFFG(%QJbS6DH5nx_(p~G`=8t-hw@-KTT
zjSG%3ippkO@kn%b<6zL?_~%%t)W#~L>Qm#<km7kzO+(7yLxUo7pMn=(Rpi5j!`up<
Pa}@5JsVsJ2V6X-N$YLV6

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools/templates/common/icons/save_edit.gif b/bundles/org.eclipse.e4.tools/templates/common/icons/save_edit.gif
new file mode 100644
index 0000000000000000000000000000000000000000..499dd0ca6021c351c641053be30eecb5b4a7e7e8
GIT binary patch
literal 639
zcmZ?wbhEHb6krfwc*el+<Hw(<%GJ?8R0Skg#Z|9LtX+BM@%uOLzeHE9N~l|zQokal
zVMRvM^68syZaw#D`^m?<PCwaq?&*<B&re=^dG6Nh^C0x<!>6w~t;=?ud9vy7?cE^q
z*1q%4_Md-x_|o&km!6%t_VVPl7w2!kK6mTY)%$O+-hXrZ@w-PaKBPA<&u(2-(6RIc
zNcPq9H=oX5zOnP@<=ao*J$&)u*_+SB-Al@Q7r*)NC8Bg<dEeri35y=R{a!s`(Zjdj
z-+cag`^Be+Z@<+~UU=u_r#GK}eE9tJ_RCMNKmTZ&x}bU5g3n*SwN9VkHe-IrOdy)K
z{qV8E=C-cc^EU3?-!*&Ax1T@1|NOah^SXb3e?2)r_y7O@3<Ciaf3h$#FhnrufGh{a
z2?P6`hKQ!-mewYNfKLCwo*w_s0D}l$Pfx$F88gHDrusy9Nw@@rEC~r-60p!a!o!>+
zz;2_n+r|KMbN2{G6a4_&{kGN)4gvc5juAGR#sRMOu1@w&t^vlzRuN`KMgigX?uQ4k
zYgk5@s;SFPcrC52W*VWRCnlyRuKMMRsEVpigru?tONzsU2OVNcZfg!)N^s&3;9>A!
zDQIQv=+@exGeO}YGc&uwQjf$B2b)>gB6wUn7Bn7go*uf&AmXGW<1{9LBBLK|i<A5~
bST`Jza8PJuU}Rz9@R-nWAc(1vfx#L8pLQ0s

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools/templates/css/default.css b/bundles/org.eclipse.e4.tools/templates/css/default.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/bundles/org.eclipse.e4.tools/templates/handler.txtjet b/bundles/org.eclipse.e4.tools/templates/handler.txtjet
new file mode 100644
index 0000000000..27c7d75d51
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/templates/handler.txtjet
@@ -0,0 +1,22 @@
+<%@ jet package="org.eclipse.e4.internal.tools.wizards.classes.templates" class="HandlerTemplate" imports="org.eclipse.e4.internal.tools.wizards.classes.NewHandlerClassWizard.HandlerClass" %>
+<% HandlerClass domainClass = (HandlerClass)argument; %> 
+package <%= domainClass.getPackageFragment().getElementName() %>;
+
+import org.eclipse.e4.core.di.annotations.Execute;
+<% if( domainClass.isUseCanExecute() )  { %>
+import org.eclipse.e4.core.di.annotations.CanExecute;
+<% } %>
+
+public class <%= domainClass.getName() %> {
+	@Execute
+	public void <%= domainClass.getExecuteMethodName() %>() {
+		//TODO Your code goes here
+	}
+	<% if( domainClass.isUseCanExecute() )  { %>
+	
+	@CanExecute
+	public boolean <%= domainClass.getCanExecuteMethodName() %>() {
+		//TODO Your code goes here
+	}
+	<% } %>	
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/templates/part.txtjet b/bundles/org.eclipse.e4.tools/templates/part.txtjet
new file mode 100644
index 0000000000..03a2b1b668
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/templates/part.txtjet
@@ -0,0 +1,48 @@
+<%@ jet package="org.eclipse.e4.internal.tools.wizards.classes.templates" class="PartTemplate" imports="org.eclipse.e4.internal.tools.wizards.classes.NewPartClassWizard.PartClass" %>
+<% PartClass domainClass = (PartClass)argument; %> 
+package <%= domainClass.getPackageFragment().getElementName() %>;
+
+import javax.inject.Inject;
+<% if( domainClass.isUsePostConstruct() ) { %>
+import javax.annotation.PostConstruct;
+<% } %>
+<% if( domainClass.isUsePredestroy() ) { %>
+import javax.annotation.PreDestroy;
+<% } %>
+<% if( domainClass.isUseFocus() ) { %>
+import org.eclipse.e4.ui.di.Focus;
+<% } %>
+<% if( domainClass.isUsePersist() ) { %>
+import org.eclipse.e4.ui.di.Persist;
+<% } %>
+
+public class <%= domainClass.getName() %> {
+	@Inject
+	public <%= domainClass.getName() %>() {
+		//TODO Your code here
+	}
+	<% if( domainClass.isUsePostConstruct() ) { %>
+	@PostConstruct
+	public void <%= domainClass.getPostConstructMethodName()  %>() {
+		//TODO Your code here
+	}
+	<% } %>
+	<% if( domainClass.isUsePredestroy() ) { %>
+	@PreDestroy
+	public void <%= domainClass.getPreDestroyMethodName()  %>() {
+		//TODO Your code here
+	}
+	<% } %>
+	<% if( domainClass.isUseFocus() ) { %>
+	@Focus
+	public void <%= domainClass.getFocusMethodName() %>() {
+		//TODO Your code here
+	}
+	<% } %>
+	<% if( domainClass.isUsePersist() ) { %>
+	@Persist
+	public void <%= domainClass.getPersistMethodName() %>() {
+		//TODO Your code here
+	}
+	<% } %>
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/templates/src/handlers/AboutHandler.java b/bundles/org.eclipse.e4.tools/templates/src/handlers/AboutHandler.java
new file mode 100644
index 0000000000..c9f6a86afd
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/templates/src/handlers/AboutHandler.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package @@packageName@@;
+
+import javax.inject.Named;
+
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.ui.services.IServiceConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Shell;
+
+public class AboutHandler {
+	@Execute
+	public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell) {
+		MessageDialog.openInformation(shell, "About", "e4 Application example.");
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools/templates/src/handlers/OpenHandler.java b/bundles/org.eclipse.e4.tools/templates/src/handlers/OpenHandler.java
new file mode 100644
index 0000000000..46d423cec2
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/templates/src/handlers/OpenHandler.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package @@packageName@@;
+
+import java.lang.reflect.InvocationTargetException;
+
+import javax.inject.Named;
+
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.ui.services.IServiceConstants;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Shell;
+
+public class OpenHandler {
+
+	@Execute
+	public void execute(
+			IEclipseContext context,
+			@Named(IServiceConstants.ACTIVE_SHELL) Shell shell)
+			throws InvocationTargetException, InterruptedException {
+		FileDialog dialog = new FileDialog(shell);
+		dialog.open();
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools/templates/src/handlers/QuitHandler.java b/bundles/org.eclipse.e4.tools/templates/src/handlers/QuitHandler.java
new file mode 100644
index 0000000000..0c1337bb1e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/templates/src/handlers/QuitHandler.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package @@packageName@@;
+
+import java.lang.reflect.InvocationTargetException;
+
+import javax.inject.Named;
+
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.ui.services.IServiceConstants;
+import org.eclipse.e4.ui.workbench.IWorkbench;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Shell;
+
+public class QuitHandler {
+	@Execute
+	public void execute(IWorkbench workbench, IEclipseContext context,
+			@Named(IServiceConstants.ACTIVE_SHELL) Shell shell)
+			throws InvocationTargetException, InterruptedException {
+		if (MessageDialog.openConfirm(shell, "Confirmation",
+				"Do you want to exit?")) {
+			workbench.close();
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools/templates/src/handlers/SaveHandler.java b/bundles/org.eclipse.e4.tools/templates/src/handlers/SaveHandler.java
new file mode 100644
index 0000000000..c1e49cdf9a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/templates/src/handlers/SaveHandler.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package @@packageName@@;
+
+import java.lang.reflect.InvocationTargetException;
+
+import javax.inject.Named;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.IDisposable;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.core.di.annotations.CanExecute;
+import org.eclipse.e4.ui.model.application.MContribution;
+import org.eclipse.e4.ui.model.application.ui.MDirtyable;
+import org.eclipse.e4.ui.services.IServiceConstants;
+//import org.eclipse.e4.ui.workbench.Persist;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.swt.widgets.Shell;
+
+public class SaveHandler {
+	@CanExecute
+	public boolean canExecute(
+			@Named(IServiceConstants.ACTIVE_PART) MDirtyable dirtyable) {
+		if (dirtyable == null) {
+			return false;
+		}
+		return dirtyable.isDirty();
+	}
+
+	@Execute
+	public void execute(
+			IEclipseContext context,
+			@Named(IServiceConstants.ACTIVE_SHELL) Shell shell,
+			@Named(IServiceConstants.ACTIVE_PART) final MContribution contribution)
+			throws InvocationTargetException, InterruptedException {
+		final IEclipseContext pmContext = context.createChild();
+
+		ProgressMonitorDialog dialog = new ProgressMonitorDialog(shell);
+		dialog.open();
+		dialog.run(true, true, new IRunnableWithProgress() {
+			public void run(IProgressMonitor monitor)
+					throws InvocationTargetException, InterruptedException {
+				pmContext.set(IProgressMonitor.class.getName(), monitor);
+				if (contribution != null) {
+					Object clientObject = contribution.getObject();
+//					ContextInjectionFactory.invoke(clientObject, Persist.class, //$NON-NLS-1$
+//							pmContext, null);
+				}
+			}
+		});
+
+		if (pmContext instanceof IDisposable) {
+			((IDisposable) pmContext).dispose();
+		}
+	}
+}

From 46c923d851484c84540c3475f6a6baa4af0d96d8 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 5 Jul 2010 12:53:06 +0000
Subject: [PATCH 0172/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling

---
 .../compat/internal/ClipboardServiceImpl.java |  37 ++
 .../internal/ContextServiceFactory.java       |   6 +-
 .../e4/tools/compat/internal/CopyAction.java} |  25 +-
 .../e4/tools/compat/internal/CutAction.java}  |  25 +-
 .../e4/tools/compat/internal/PartHelper.java  |  11 +-
 .../e4/tools/compat/internal/PasteAction.java |  27 ++
 .../e4/tools/compat/parts/DIEditorPart.java   |  36 ++
 .../META-INF/MANIFEST.MF                      |   5 +-
 .../icons/full/obj16/plugin.png               | Bin 591 -> 0 bytes
 .../plugin.xml                                |  33 +-
 .../emf/editor3x/E4WorkbenchModelEditor.java  |  46 +-
 .../extension/HandlerContributionEditor.java  | 101 +++++
 .../extension/PartContributionEditor.java     |  87 ++++
 .../wizard/BaseApplicationModelWizard.java    | 187 --------
 .../emf/editor3x/wizard/NewModelFilePage.java | 199 ---------
 .../META-INF/MANIFEST.MF                      |   3 +-
 .../org.eclipse.e4.tools.emf.ui.editors.exsd  |  16 +
 .../ui/common/IContributionClassCreator.java  |  13 +
 .../tools/emf/ui/common/MemoryTransfer.java   |  63 +++
 .../emf/ui/internal/common/ModelEditor.java   | 409 +++++++++++++++---
 .../emf/ui/internal/common/VirtualEntry.java  |  22 +-
 .../component/DirectMenuItemEditor.java       |  22 +-
 .../component/DirectToolItemEditor.java       |  34 +-
 .../common/component/HandlerEditor.java       |  21 +-
 .../internal/common/component/PartEditor.java |  21 +-
 .../e4/tools/services/IClipboardService.java  |  26 ++
 26 files changed, 945 insertions(+), 530 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
 rename bundles/{org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewContributionModelWizard.java => org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java} (59%)
 rename bundles/{org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewApplicationModelWizard.java => org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java} (58%)
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/plugin.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/BaseApplicationModelWizard.java
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewModelFilePage.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
new file mode 100644
index 0000000000..bd163fe044
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.internal;
+
+import org.eclipse.e4.tools.services.IClipboardService;
+
+public class ClipboardServiceImpl implements IClipboardService {
+	private Handler handler;
+	
+	public void copy() {
+		if( handler != null ) {
+			handler.copy();
+		}
+	}
+
+	public void paste() {
+		if( handler != null ) {
+			handler.paste();
+		}
+	}
+
+	public void setHandler(Handler handler) {
+		this.handler = handler;
+	}
+
+	public void cut() {
+		this.handler.cut();
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index 7e782fcaa1..632d0fbe2d 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -16,6 +16,7 @@
 import org.eclipse.e4.core.services.contributions.IContributionFactory;
 import org.eclipse.e4.core.services.log.ILoggerProvider;
 import org.eclipse.e4.core.services.log.Logger;
+import org.eclipse.e4.tools.services.IClipboardService;
 import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
 import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
 import org.eclipse.e4.ui.services.IServiceConstants;
@@ -52,10 +53,6 @@ public Object create(@SuppressWarnings("rawtypes") Class serviceInterface, IServ
 		final IWorkbenchWindow window = wls.getWorkbenchWindow();
 		final IWorkbenchPartSite site = wls.getPartSite();
 
-//		System.err.println("The locator: " + locator);
-//		System.err.println("	Window: " + window);
-//		System.err.println("	Site: " + site);
-		
 		Object o = parentLocator.getService(serviceInterface);
 		
 		// This happens when we run in plain 3.x
@@ -67,6 +64,7 @@ public Object create(@SuppressWarnings("rawtypes") Class serviceInterface, IServ
 
 			final IEclipseContext appContext = serviceContext.createChild("WorkbenchContext"); //$NON-NLS-1$
 			appContext.set(Logger.class, new WorkbenchLogger());
+			appContext.set(IClipboardService.class, new ClipboardServiceImpl());
 			IContributionFactory contributionFactory = ContextInjectionFactory.make(ReflectionContributionFactory.class, appContext);
 			appContext.set(IContributionFactory.class.getName(),contributionFactory);
 			
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewContributionModelWizard.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
similarity index 59%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewContributionModelWizard.java
rename to bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
index 20b95dd2a8..a6493fee25 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
@@ -8,20 +8,21 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
-package org.eclipse.e4.tools.emf.editor3x.wizard;
+package org.eclipse.e4.tools.compat.internal;
 
-import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
-import org.eclipse.emf.ecore.EObject;
+import org.eclipse.e4.tools.services.IClipboardService;
+import org.eclipse.jface.action.Action;
 
-
-public class NewContributionModelWizard extends BaseApplicationModelWizard {
-
-	@Override
-	public String getDefaultFileName() {
-		return "fragment.e4xmi";
+public class CopyAction extends Action {
+	private IClipboardService service;
+	
+	public CopyAction(IClipboardService service) {
+		super("Copy");
+		this.service = service;
 	}
 	
-	protected EObject createInitialModel() {
-		return (EObject) MFragmentFactory.INSTANCE.createModelFragments();
+	@Override
+	public void run() {
+		service.copy();
 	}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewApplicationModelWizard.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
similarity index 58%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewApplicationModelWizard.java
rename to bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
index ed161a7e7c..02a0c9dd35 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
@@ -8,20 +8,21 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
-package org.eclipse.e4.tools.emf.editor3x.wizard;
+package org.eclipse.e4.tools.compat.internal;
 
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.emf.ecore.EObject;
+import org.eclipse.e4.tools.services.IClipboardService;
+import org.eclipse.jface.action.Action;
 
-
-public class NewApplicationModelWizard extends BaseApplicationModelWizard {
-
-	@Override
-	public String getDefaultFileName() {
-		return "Application.e4xmi";
+public class CutAction extends Action {
+	private IClipboardService service;
+	
+	public CutAction(IClipboardService service) {
+		super("Cut");
+		this.service = service;
 	}
 	
-	protected EObject createInitialModel() {
-		return (EObject) MApplicationFactory.INSTANCE.createApplication();
+	@Override
+	public void run() {
+		service.cut();
 	}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
index 58484ff459..5c74bc6456 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
@@ -15,6 +15,7 @@
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.services.IClipboardService;
 import org.eclipse.e4.ui.services.IStylingEngine;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -34,13 +35,19 @@ public static IEclipseContext createPartContext(WorkbenchPart part) throws PartI
 		IEclipseContext parentContext = (IEclipseContext) site.getService(IEclipseContext.class);
 		
 		// Check if running in 4.x
-		if( parentContext.get("org.eclipse.e4.workbench.ui.IPresentationEngine") != null ) {
+		if( parentContext.get("org.eclipse.e4.ui.workbench.IPresentationEngine") != null ) {
 			// Hack to get the MPart-Context
 			try {
 				Class<?> clazz = Util.getBundle("org.eclipse.e4.ui.model.workbench").loadClass("org.eclipse.e4.ui.model.application.ui.basic.MPart");
 				Object instance = site.getService(clazz);
 				Method m = clazz.getMethod("getContext", new Class[0]);
-				return (IEclipseContext) m.invoke(instance);				
+				IEclipseContext ctx = (IEclipseContext) m.invoke(instance);
+				IEclipseContext rv = ctx;
+				while( ctx.getParent() != null ) {
+					ctx = ctx.getParent();
+				}
+				ctx.set(IClipboardService.class, new ClipboardServiceImpl());
+				return rv;
 			} catch (Exception e) {
 				throw new PartInitException("Could not create context",e);
 			}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
new file mode 100644
index 0000000000..9e3b40a229
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.internal;
+
+import org.eclipse.e4.tools.services.IClipboardService;
+import org.eclipse.jface.action.Action;
+
+public class PasteAction extends Action {
+	private IClipboardService service;
+	public PasteAction(IClipboardService service) {
+		super("Paste");
+		this.service = service;
+	}
+	
+	@Override
+	public void run() {
+		service.paste();
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index dc711b9e3c..f1f6838d43 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -14,15 +14,21 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.compat.internal.CopyAction;
+import org.eclipse.e4.tools.compat.internal.CutAction;
 import org.eclipse.e4.tools.compat.internal.PartHelper;
+import org.eclipse.e4.tools.compat.internal.PasteAction;
+import org.eclipse.e4.tools.services.IClipboardService;
 import org.eclipse.e4.tools.services.IDirtyProviderService;
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.di.Persist;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.part.EditorPart;
 
 public abstract class DIEditorPart<C> extends EditorPart implements IDirtyProviderService {
@@ -31,8 +37,20 @@ public abstract class DIEditorPart<C> extends EditorPart implements IDirtyProvid
 	private Class<C> clazz;
 	private boolean dirtyState;
 	
+	private int features;
+
+	protected static final int COPY = 1;
+	protected static final int PASTE = 1 << 1;
+	protected static final int CUT = 1 << 2;
+	
+	
 	public DIEditorPart(Class<C> clazz) {
+		this(clazz, SWT.NONE);
+	}
+	
+	public DIEditorPart(Class<C> clazz, int features) {
 		this.clazz = clazz;
+		this.features = features;
 	}
 	
 	@Override
@@ -72,12 +90,30 @@ public void init(IEditorSite site, IEditorInput input)
 	@Override
 	public void createPartControl(Composite parent) {
 		component = PartHelper.creatComponent(parent, context, clazz, this);
+		makeActions();
 	}
 	
 	public C getComponent() {
 		return component;
 	}
 	
+	protected void makeActions() {
+		if( (features & COPY) == COPY ) {
+			IClipboardService clipboard = context.get(IClipboardService.class);
+			getEditorSite().getActionBars().setGlobalActionHandler(ActionFactory.COPY.getId(), new CopyAction(clipboard));
+		}
+		
+		if( (features & PASTE) == PASTE ) {
+			IClipboardService clipboard = context.get(IClipboardService.class);
+			getEditorSite().getActionBars().setGlobalActionHandler(ActionFactory.PASTE.getId(), new PasteAction(clipboard));
+		}
+		
+		if( (features & CUT) == CUT ) {
+			IClipboardService clipboard = context.get(IClipboardService.class);
+			getEditorSite().getActionBars().setGlobalActionHandler(ActionFactory.CUT.getId(), new CutAction(clipboard));
+		}
+	}
+	
 	public void setDirtyState(boolean dirtyState) {
 		if( dirtyState != this.dirtyState ) {
 			this.dirtyState = dirtyState;
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index e69d0595b5..33eead93a8 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -24,7 +24,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.emf.edit;bundle-version="2.6.0",
  org.eclipse.e4.ui.services;bundle-version="0.9.1",
  org.eclipse.e4.tools.compat;bundle-version="1.0.0",
- org.eclipse.e4.tools.services;bundle-version="1.0.0"
+ org.eclipse.e4.tools.services;bundle-version="1.0.0",
+ org.eclipse.e4.tools;bundle-version="0.9.0",
+ org.eclipse.jdt.ui;bundle-version="3.6.0"
 Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/projectfunction.xml
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.e4.tools.emf.editor3x.wizard;x-internal:=true
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/plugin.png b/bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/plugin.png
deleted file mode 100644
index 6187b15aec001b7080b51a5f944f07591f26cc15..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 591
zcmV-V0<iswP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz;Ymb6R5;6}
zl08V3aTLaXuVw{)TtAV-EQp(VZ&;&yOGCA^HyY7UV+BnWv^BakMQc+OB&0Z27AkkL
zxPppG-9jbH?t7kd8eTEus*7hi@aLT8f1cktNknjvIJDd2gQ>eEcNHZMNv|IbJ-M`(
zKwWL~opzjJe^WpCmV9E;(0&ut2;4va_(#>M8)>9$R5viQnf(Nkh~VM$y>J(jqb$cj
z+nL1Nm|mV)Gm|9MnHf*7Ja4OEAQz__^LRKOLEwqpiGV^^A*T=#&inGm-62Xs;dnSp
zKj&H9T*boh2<no0+=ElOJZ83sfQeG2L`y@C?#3Rz{i>i)W+(n27l!C)>fq|L%VB1i
ziC4p;NwV_}ZjW7$LRW#(_bKF#hp=!IqNO26Z*w2+LEwx{PVnZ&Sn}T;m<fe2Wm#Lz
za$)sCo<WYS+HDKB-VTSEXg%7B+({$Nn7A;{*z`8{F+2a6g_Xssq{Gq<0W(qT9zX<h
z>tzb<gWDVNaLQ|6kUI-2i;UhJKT-oRHNy~7Uq5lS^Bm=sIhHERNTM^>$;qA*nT@@+
zV5uQ@iXDTPoTbV#FRr~z04|PPh`wXTNoCm9*tG&?e3+fYl>K6+&3|Cc$KOpL`ER+_
dcRl5U#9zn6ZO}GF<yZg!002ovPDHLkV1oCe4!{5a

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index dc050c9576..a6d28c8adf 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -13,30 +13,13 @@
       </editor>
    </extension>
    <extension
-         point="org.eclipse.ui.newWizards">
-      <wizard
-            canFinishEarly="false"
-            category="org.eclipse.e4"
-            class="org.eclipse.e4.tools.emf.editor3x.wizard.NewApplicationModelWizard"
-            hasPages="true"
-            icon="icons/full/obj16/application_view_tile.png"
-            id="org.eclipse.e4.tools.emf.editor3x.newappmodel"
-            name="New Application Model">
-      </wizard>
- 
-      <wizard
-            canFinishEarly="false"
-            category="org.eclipse.e4"
-            class="org.eclipse.e4.tools.emf.editor3x.wizard.NewContributionModelWizard"
-            hasPages="true"
-            icon="icons/full/obj16/plugin.png"
-            id="org.eclipse.e4.tools.emf.editor3x.newmodelcontribution"
-            name="New Model Fragment">
-      </wizard>
-      <category
-            id="org.eclipse.e4"
-            name="e4">
-      </category>
-      </extension>
+         point="org.eclipse.e4.tools.emf.ui.editors">
+      <contributionClassCreator
+            class="org.eclipse.e4.tools.emf.editor3x.extension.HandlerContributionEditor">
+      </contributionClassCreator>
+      <contributionClassCreator
+            class="org.eclipse.e4.tools.emf.editor3x.extension.PartContributionEditor">
+      </contributionClassCreator>
+   </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
index 3484bed566..726842fae1 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -11,12 +11,54 @@
 package org.eclipse.e4.tools.emf.editor3x;
 
 import org.eclipse.e4.tools.compat.parts.DIEditorPart;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource.ModelListener;
 import org.eclipse.e4.tools.emf.ui.internal.wbm.ApplicationModelEditor;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.actions.ActionFactory;
 
 @SuppressWarnings("restriction")
-public class E4WorkbenchModelEditor extends DIEditorPart<ApplicationModelEditor> {
+public class E4WorkbenchModelEditor extends
+		DIEditorPart<ApplicationModelEditor> {
+	private UndoAction undoAction;
+	private RedoAction redoAction;
+
+	private ModelListener listener = new ModelListener() {
+
+		public void dirtyChanged() {
+			firePropertyChange(PROP_DIRTY);
+		}
+
+		public void commandStackChanged() {
+
+		}
+	};
 
 	public E4WorkbenchModelEditor() {
-		super(ApplicationModelEditor.class);
+		super(ApplicationModelEditor.class, COPY|CUT|PASTE);
+	}
+
+	protected void makeActions() {
+		super.makeActions();
+		undoAction = new UndoAction(getComponent().getModelProvider());
+		redoAction = new RedoAction(getComponent().getModelProvider());
+
+		getEditorSite().getActionBars().setGlobalActionHandler(
+				ActionFactory.UNDO.getId(), undoAction);
+		getEditorSite().getActionBars().setGlobalActionHandler(
+				ActionFactory.REDO.getId(), redoAction);
+	}
+
+	@Override
+	public void dispose() {
+		if (undoAction != null)
+			undoAction.dispose();
+
+		if (redoAction != null)
+			redoAction.dispose();
+
+		if (listener != null && getComponent().getModelProvider() != null)
+			getComponent().getModelProvider().removeModelListener(listener);
+
+		super.dispose();
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
new file mode 100644
index 0000000000..b2bc2a31b9
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x.extension;
+
+import java.net.URL;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.e4.internal.tools.wizards.classes.NewHandlerClassWizard;
+import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
+import org.eclipse.e4.ui.model.application.MContribution;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.ui.JavaPlugin;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
+
+public class HandlerContributionEditor implements IContributionClassCreator {
+
+	public void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell) {
+		if( contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 ) {
+			NewHandlerClassWizard wizard = new NewHandlerClassWizard();
+			wizard.init( null, new StructuredSelection(project));
+			WizardDialog dialog = new WizardDialog(shell, wizard);
+			if( dialog.open() == WizardDialog.OK ) {
+				IFile f = wizard.getFile();
+				ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
+				try {
+					String packageName = el.getPackageDeclarations()[0].getElementName();
+					String className = wizard.getDomainClass().getName();
+					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "platform:/plugin/" + f.getProject().getName() + "/" + packageName+"."+className);
+					if( cmd.canExecute() ) {
+						domain.getCommandStack().execute(cmd);
+					}
+					el.open(null);
+				} catch (JavaModelException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		} else {
+			URI uri = URI.createURI(contribution.getContributionURI());
+			IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(uri.segment(1));
+			//TODO If this is not a WS-Resource we need to open differently 
+			if( p != null ) {
+				IJavaProject jp = JavaCore.create(p);
+				try {
+					IType t = jp.findType(uri.segment(2));
+					JavaUI.openInEditor(t);
+				} catch (JavaModelException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				} catch (PartInitException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+	public boolean isSupported(EClass element) {
+		return 
+			isTypeOrSuper(CommandsPackageImpl.Literals.HANDLER,element)
+			|| 
+			isTypeOrSuper(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, element)
+			||
+			isTypeOrSuper(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, element);
+	}
+	
+	private boolean isTypeOrSuper(EClass eClass, EClass element) {
+		return eClass.equals(element) || element.getEAllSuperTypes().contains(eClass);
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
new file mode 100644
index 0000000000..65195eacc6
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x.extension;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.e4.internal.tools.wizards.classes.NewPartClassWizard;
+import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
+import org.eclipse.e4.ui.model.application.MContribution;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PartInitException;
+
+public class PartContributionEditor implements IContributionClassCreator {
+
+	public void createOpen(MContribution contribution, EditingDomain domain,
+			IProject project, Shell shell) {
+		if( contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 ) {
+			NewPartClassWizard wizard = new NewPartClassWizard();
+			wizard.init( null, new StructuredSelection(project));
+			WizardDialog dialog = new WizardDialog(shell, wizard);
+			if( dialog.open() == WizardDialog.OK ) {
+				IFile f = wizard.getFile();
+				ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
+				try {
+					String packageName = el.getPackageDeclarations()[0].getElementName();
+					String className = wizard.getDomainClass().getName();
+					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "platform:/plugin/" + f.getProject().getName() + "/" + packageName+"."+className);
+					if( cmd.canExecute() ) {
+						domain.getCommandStack().execute(cmd);
+					}
+					el.open(null);
+				} catch (JavaModelException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		} else {
+			URI uri = URI.createURI(contribution.getContributionURI());
+			IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(uri.segment(1));
+			//TODO If this is not a WS-Resource we need to open differently 
+			if( p != null ) {
+				IJavaProject jp = JavaCore.create(p);
+				try {
+					IType t = jp.findType(uri.segment(2));
+					JavaUI.openInEditor(t);
+				} catch (JavaModelException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				} catch (PartInitException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+	public boolean isSupported(EClass element) {
+		return BasicPackageImpl.Literals.PART == element
+				|| element.getEAllSuperTypes().contains(
+						BasicPackageImpl.Literals.PART);
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/BaseApplicationModelWizard.java
deleted file mode 100644
index 27d175bfab..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/BaseApplicationModelWizard.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.editor3x.wizard;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-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.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWizard;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-public abstract class BaseApplicationModelWizard extends Wizard implements INewWizard {
-	private NewModelFilePage page;
-	private ISelection selection;
-	
-	protected IWorkbench workbench;
-
-	/**
-	 * Constructor for NewApplicationModelWizard.
-	 */
-	public BaseApplicationModelWizard() {
-		super();
-		setNeedsProgressMonitor(true);
-	}
-
-	/**
-	 * Adding the page to the wizard.
-	 */
-
-	public void addPages() {
-		page = new NewModelFilePage(selection,getDefaultFileName());
-		addPage(page);
-	}
-
-	public abstract String getDefaultFileName();
-	
-	@Override
-	public boolean performFinish() {
-		try {
-			// Remember the file.
-			//
-			final IFile modelFile = getModelFile();
-
-			// Do the work within an operation.
-			//
-			WorkspaceModifyOperation operation =
-				new WorkspaceModifyOperation() {
-					@Override
-					protected void execute(IProgressMonitor progressMonitor) {
-						try {
-							// Create a resource set
-							//
-							ResourceSet resourceSet = new ResourceSetImpl();
-
-							// Get the URI of the model file.
-							//
-							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
-
-							// Create a resource for this file.
-							//
-							Resource resource = resourceSet.createResource(fileURI);
-
-							// Add the initial model object to the contents.
-							//
-							EObject rootObject = createInitialModel();
-							if (rootObject != null) {
-								resource.getContents().add(rootObject);
-							}
-
-							// Save the contents of the resource to the file system.
-							//
-							Map<Object, Object> options = new HashMap<Object, Object>();
-							resource.save(options);
-						}
-						catch (Exception exception) {
-							throw new RuntimeException(exception);
-						}
-						finally {
-							progressMonitor.done();
-						}
-					}
-				};
-
-			getContainer().run(false, false, operation);
-
-			// Select the new file resource in the current view.
-			//
-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-			IWorkbenchPage page = workbenchWindow.getActivePage();
-			final IWorkbenchPart activePart = page.getActivePart();
-			if (activePart instanceof ISetSelectionTarget) {
-				final ISelection targetSelection = new StructuredSelection(modelFile);
-				getShell().getDisplay().asyncExec
-					(new Runnable() {
-						 public void run() {
-							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
-						 }
-					 });
-			}
-
-			// Open an editor on the new file.
-			//
-			try {
-				page.openEditor
-					(new FileEditorInput(modelFile),
-					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
-			}
-			catch (PartInitException exception) {
-				MessageDialog.openError(workbenchWindow.getShell(), "Could not init editor", exception.getMessage()); //$NON-NLS-1$
-				return false;
-			}
-
-			return true;
-		}
-		catch (Exception exception) {
-			MessageDialog.openError(getShell(), "Error", exception.getMessage());
-			return false;
-		}
-	}
-	
-	protected abstract EObject createInitialModel();
-
-	private IFile getModelFile() throws CoreException {
-		String containerName = page.getContainerName();
-		String fileName = page.getFileName();
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		IResource resource = root.findMember(new Path(containerName));
-		if (!resource.exists() || !(resource instanceof IContainer)) {
-			throwCoreException("Container \"" + containerName
-					+ "\" does not exist.");
-		}
-		IContainer container = (IContainer) resource;
-		return container.getFile(new Path(fileName));
-	}
-	
-	private void throwCoreException(String message) throws CoreException {
-		IStatus status = new Status(IStatus.ERROR,
-				"org.eclipse.e4.tools.emf.editor3x", IStatus.OK, message, null);
-		throw new CoreException(status);
-	}
-
-	/**
-	 * We will accept the selection in the workbench to see if we can initialize
-	 * from it.
-	 * 
-	 * @see IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.workbench = workbench;
-		this.selection = selection;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewModelFilePage.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewModelFilePage.java
deleted file mode 100644
index 90154bad5a..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/wizard/NewModelFilePage.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.editor3x.wizard;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.IDialogPage;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ContainerSelectionDialog;
-
-/**
- * The "New" wizard page allows setting the container for the new file as well
- * as the file name. The page will only accept file name without the extension
- * OR with the extension that matches the expected one (e4xmi).
- */
-
-public class NewModelFilePage extends WizardPage {
-	private Text containerText;
-
-	private Text fileText;
-
-	private ISelection selection;
-	
-	private String defaultFilename;
-
-	/**
-	 * Constructor for SampleNewWizardPage.
-	 * 
-	 * @param pageName
-	 */
-	public NewModelFilePage(ISelection selection, String defaultFilename) {
-		super("wizardPage");
-		setTitle("Multi-page Editor File");
-		setDescription("This wizard creates a new file with *.e4xmi extension that can be opened by a multi-page editor.");
-		this.selection = selection;
-		this.defaultFilename = defaultFilename;
-	}
-
-	/**
-	 * @see IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		container.setLayout(layout);
-		layout.numColumns = 3;
-		layout.verticalSpacing = 9;
-		Label label = new Label(container, SWT.NULL);
-		label.setText("&Container:");
-
-		containerText = new Text(container, SWT.BORDER | SWT.SINGLE);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		containerText.setLayoutData(gd);
-		containerText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				dialogChanged();
-			}
-		});
-
-		Button button = new Button(container, SWT.PUSH);
-		button.setText("Browse...");
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleBrowse();
-			}
-		});
-		label = new Label(container, SWT.NULL);
-		label.setText("&File name:");
-
-		fileText = new Text(container, SWT.BORDER | SWT.SINGLE);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fileText.setLayoutData(gd);
-		fileText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				dialogChanged();
-			}
-		});
-		initialize();
-		dialogChanged();
-		setControl(container);
-	}
-
-	/**
-	 * Tests if the current workbench selection is a suitable container to use.
-	 */
-
-	private void initialize() {
-		if (selection != null && selection.isEmpty() == false
-				&& selection instanceof IStructuredSelection) {
-			IStructuredSelection ssel = (IStructuredSelection) selection;
-			if (ssel.size() > 1)
-				return;
-			Object obj = ssel.getFirstElement();
-			if (obj instanceof IResource) {
-				IContainer container;
-				if (obj instanceof IContainer)
-					container = (IContainer) obj;
-				else
-					container = ((IResource) obj).getParent();
-				containerText.setText(container.getFullPath().toString());
-			}
-		}
-		fileText.setText(defaultFilename);
-	}
-
-	/**
-	 * Uses the standard container selection dialog to choose the new value for
-	 * the container field.
-	 */
-
-	private void handleBrowse() {
-		ContainerSelectionDialog dialog = new ContainerSelectionDialog(
-				getShell(), ResourcesPlugin.getWorkspace().getRoot(), false,
-				"Select new file container");
-		if (dialog.open() == ContainerSelectionDialog.OK) {
-			Object[] result = dialog.getResult();
-			if (result.length == 1) {
-				containerText.setText(((Path) result[0]).toString());
-			}
-		}
-	}
-
-	/**
-	 * Ensures that both text fields are set.
-	 */
-
-	private void dialogChanged() {
-		IResource container = ResourcesPlugin.getWorkspace().getRoot()
-				.findMember(new Path(getContainerName()));
-		String fileName = getFileName();
-
-		if (getContainerName().length() == 0) {
-			updateStatus("File container must be specified");
-			return;
-		}
-		if (container == null
-				|| (container.getType() & (IResource.PROJECT | IResource.FOLDER)) == 0) {
-			updateStatus("File container must exist");
-			return;
-		}
-		if (!container.isAccessible()) {
-			updateStatus("Project must be writable");
-			return;
-		}
-		if (fileName.length() == 0) {
-			updateStatus("File name must be specified");
-			return;
-		}
-		if (fileName.replace('\\', '/').indexOf('/', 1) > 0) {
-			updateStatus("File name must be valid");
-			return;
-		}
-		int dotLoc = fileName.lastIndexOf('.');
-		if (dotLoc != -1) {
-			String ext = fileName.substring(dotLoc + 1);
-			if (ext.equalsIgnoreCase("e4xmi") == false) {
-				updateStatus("File extension must be \"e4xmi\"");
-				return;
-			}
-		}
-		updateStatus(null);
-	}
-
-	private void updateStatus(String message) {
-		setErrorMessage(message);
-		setPageComplete(message == null);
-	}
-
-	public String getContainerName() {
-		return containerText.getText();
-	}
-
-	public String getFileName() {
-		return fileText.getText();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index bd341a4098..49f07ca6d0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -26,7 +26,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.equinox.registry;bundle-version="3.5.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",
  org.eclipse.e4.ui.di;bundle-version="0.9.0",
- javax.annotation;bundle-version="1.0.0"
+ javax.annotation;bundle-version="1.0.0",
+ org.eclipse.e4.tools.services;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.runtime.jobs,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd b/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
index 57b8c96b0d..471aa2881a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
+++ b/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
@@ -21,6 +21,7 @@
             <element ref="editor" minOccurs="0" maxOccurs="unbounded"/>
             <element ref="virtualeditor" minOccurs="0" maxOccurs="unbounded"/>
             <element ref="editorfeature" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="contributionClassCreator" minOccurs="0" maxOccurs="unbounded"/>
          </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>
@@ -101,6 +102,21 @@
       </complexType>
    </element>
 
+   <element name="contributionClassCreator">
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
    <annotation>
       <appinfo>
          <meta.section type="since"/>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
new file mode 100644
index 0000000000..d60729a6bc
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
@@ -0,0 +1,13 @@
+package org.eclipse.e4.tools.emf.ui.common;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.ui.model.application.MContribution;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.widgets.Shell;
+
+public interface IContributionClassCreator {
+	public boolean isSupported(EClass element);
+
+	public void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell);
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java
new file mode 100644
index 0000000000..4e378b5ccd
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.common;
+
+import java.util.UUID;
+import org.eclipse.swt.dnd.ByteArrayTransfer;
+import org.eclipse.swt.dnd.TransferData;
+
+public class MemoryTransfer extends ByteArrayTransfer {
+	private static final String NAME = MemoryTransfer.class.getName() + ".tranfername"; //$NON-NLS-1$
+
+	private static final int ID = registerType(NAME);
+
+	private static MemoryTransfer INSTANCE;
+
+	private String uid;
+
+	private Object object;
+
+	public static MemoryTransfer getInstance() {
+		if (INSTANCE == null) {
+			INSTANCE = new MemoryTransfer();
+		}
+		return INSTANCE;
+	}
+
+	@Override
+	protected int[] getTypeIds() {
+		return new int[] { ID };
+	}
+
+	@Override
+	protected String[] getTypeNames() {
+		return new String[] { NAME };
+	}
+
+	public void javaToNative(Object object, TransferData transferData) {
+		this.uid = UUID.randomUUID().toString();
+		this.object = object;
+		if (transferData != null) {
+			super.javaToNative(uid.getBytes(), transferData);
+		}
+	}
+
+	public Object nativeToJava(TransferData transferData) {
+		byte[] bytes = (byte[]) super.nativeToJava(transferData);
+		if (bytes == null)
+			return null;
+
+		if (new String(bytes).equals(uid)) {
+			return object;
+		}
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 23b38b7d2d..4a889e3223 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,22 +10,11 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
-
-import org.eclipse.swt.widgets.TreeItem;
-
-import javax.annotation.PostConstruct;
-
-import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
-
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -36,6 +25,7 @@
 import org.eclipse.core.databinding.observable.set.ISetChangeListener;
 import org.eclipse.core.databinding.observable.set.SetChangeEvent;
 import org.eclipse.core.databinding.observable.set.WritableSet;
+import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
@@ -46,11 +36,14 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.services.contributions.IContributionFactory;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.IEditorDescriptor;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.ISelectionProviderService;
+import org.eclipse.e4.tools.emf.ui.common.MemoryTransfer;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.AddonsEditor;
@@ -99,20 +92,36 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowSharedElementsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowTrimEditor;
+import org.eclipse.e4.tools.services.IClipboardService;
+import org.eclipse.e4.tools.services.IClipboardService.Handler;
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.di.Persist;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
+import org.eclipse.e4.ui.model.internal.ModelUtils;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFProperty;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.CommandParameter;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
@@ -124,10 +133,17 @@
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerDropAdapter;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.dnd.Clipboard;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.DragSourceAdapter;
+import org.eclipse.swt.dnd.DragSourceEvent;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.dnd.TransferData;
 import org.eclipse.swt.events.ControlAdapter;
 import org.eclipse.swt.events.ControlEvent;
 import org.eclipse.swt.graphics.Rectangle;
@@ -136,6 +152,7 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.TreeItem;
 
 public class ModelEditor {
 	private static final String CSS_CLASS_KEY = "org.eclipse.e4.ui.css.CssClassName"; //$NON-NLS-1$
@@ -161,9 +178,7 @@ public class ModelEditor {
 	private Map<String, AbstractComponentEditor> virtualEditors = new HashMap<String, AbstractComponentEditor>();
 	private List<FeaturePath> labelFeaturePaths = new ArrayList<FeaturePath>();
 	private List<IEditorFeature> editorFeatures = new ArrayList<IEditorFeature>();
-
-	// private List<AbstractComponentEditor> editors = new
-	// ArrayList<AbstractComponentEditor>();
+	private List<IContributionClassCreator> contributionCreator = new ArrayList<IContributionClassCreator>();
 
 	private TreeViewer viewer;
 	private IModelResource modelProvider;
@@ -171,11 +186,12 @@ public class ModelEditor {
 	private ISelectionProviderService selectionService;
 	private IEclipseContext context;
 	private boolean fragment;
+	private Handler clipboardHandler;
 
 	@Inject
 	@Optional
-	private MPart editorPart;
-	
+	private IClipboardService clipboardService;
+
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project) {
 		this.modelProvider = modelProvider;
 		this.project = project;
@@ -188,9 +204,10 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 		registerContributedEditors();
 		registerContributedVirtualEditors();
 		loadEditorFeatures();
+		loadContributionCreators();
 
 		fragment = modelProvider.getRoot().get(0) instanceof MModelFragments;
-		
+
 		SashForm form = new SashForm(composite, SWT.HORIZONTAL);
 		form.setBackground(form.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 
@@ -224,7 +241,7 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 		final Label textLabel = new Label(headerContainer, SWT.NONE);
 		textLabel.setData(CSS_CLASS_KEY, "sectionHeader"); //$NON-NLS-1$
 		textLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-				
+
 		final ScrolledComposite scrolling = new ScrolledComposite(editingArea, SWT.H_SCROLL | SWT.V_SCROLL);
 		scrolling.setBackgroundMode(SWT.INHERIT_DEFAULT);
 		scrolling.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
@@ -239,7 +256,7 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 		scrolling.addControlListener(new ControlAdapter() {
 			public void controlResized(ControlEvent e) {
 				Rectangle r = scrolling.getClientArea();
-				scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT));	
+				scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT));
 			}
 		});
 
@@ -278,7 +295,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 					Rectangle r = scrolling.getClientArea();
 					scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT));
 					scrolling.setOrigin(0, 0);
-					scrolling.layout(true,true);
+					scrolling.layout(true, true);
 
 					if (selectionService != null) {
 						selectionService.setSelection(s.getFirstElement());
@@ -320,6 +337,33 @@ public void menuAboutToShow(IMenuManager manager) {
 		viewer.getControl().setMenu(mgr.createContextMenu(viewer.getControl()));
 	}
 
+	private void loadContributionCreators() {
+		IExtensionRegistry registry = RegistryFactory.getRegistry();
+		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
+
+		for (IConfigurationElement el : extPoint.getConfigurationElements()) {
+			if (!"contributionClassCreator".equals(el.getName())) { //$NON-NLS-1$
+				continue;
+			}
+
+			try {
+				contributionCreator.add((IContributionClassCreator) el.createExecutableExtension("class")); //$NON-NLS-1$
+			} catch (CoreException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+	}
+
+	public IContributionClassCreator getContributionCreator(EClass eClass) {
+		for (IContributionClassCreator c : contributionCreator) {
+			if (c.isSupported(eClass)) {
+				return c;
+			}
+		}
+		return null;
+	}
+
 	private void loadEditorFeatures() {
 		IExtensionRegistry registry = RegistryFactory.getRegistry();
 		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
@@ -328,7 +372,7 @@ private void loadEditorFeatures() {
 			if (!"editorfeature".equals(el.getName())) { //$NON-NLS-1$
 				continue;
 			}
-			
+
 			try {
 				editorFeatures.add((IEditorFeature) el.createExecutableExtension("class")); //$NON-NLS-1$
 			} catch (CoreException e) {
@@ -337,22 +381,22 @@ private void loadEditorFeatures() {
 			}
 		}
 	}
-	
+
 	public boolean isModelFragment() {
 		return fragment;
 	}
-	
+
 	public boolean isLiveModel() {
-		return ! modelProvider.isSaveable();
+		return !modelProvider.isSaveable();
 	}
-	
+
 	public List<FeatureClass> getFeatureClasses(EClass eClass, EStructuralFeature feature) {
 		List<FeatureClass> list = new ArrayList<IEditorFeature.FeatureClass>();
-		
-		for( IEditorFeature f : editorFeatures ) {
+
+		for (IEditorFeature f : editorFeatures) {
 			list.addAll(f.getFeatureClasses(eClass, feature));
 		}
-		
+
 		return list;
 	}
 
@@ -366,12 +410,6 @@ public void setSelectionService(@Optional ISelectionProviderService selectionSer
 		}
 	}
 
-	// @Inject
-	// public void updateSelection(@Optional @Named(IServiceConstants.SELECTION)
-	// Object selection ) {
-	// System.err.println("The selection: " + selection);
-	// }
-
 	private TreeViewer createTreeViewerArea(Composite parent) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
@@ -418,6 +456,26 @@ public void handleMapChange(MapChangeEvent event) {
 
 		viewer.setInput(modelProvider.getRoot());
 		viewer.expandToLevel(2);
+		// ViewerDropAdapter adapter = new ViewerDropAdapter(viewer) {
+		//
+		// @Override
+		// public boolean validateDrop(Object target, int operation,
+		// TransferData transferType) {
+		// // TODO Auto-generated method stub
+		// return false;
+		// }
+		//
+		// @Override
+		// public boolean performDrop(Object data) {
+		// // TODO Auto-generated method stub
+		// return false;
+		// }
+		// };
+		// adapter.setFeedbackEnabled(true);
+
+		int ops = DND.DROP_MOVE;
+		viewer.addDragSupport(ops, new Transfer[] { MemoryTransfer.getInstance() }, new DragListener(viewer));
+		viewer.addDropSupport(ops, new Transfer[] { MemoryTransfer.getInstance() }, new DropListener(viewer, modelProvider.getEditingDomain()));
 
 		return viewer;
 	}
@@ -454,7 +512,7 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_WINDOW_SHARED_ELEMENTS, new VWindowSharedElementsEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_MODEL_FRAGEMENTS, new VModelFragmentsEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_MODEL_IMPORTS, new VModelImportsEditor(modelProvider.getEditingDomain(), this));
-		
+
 	}
 
 	private void registerVirtualEditor(String id, AbstractComponentEditor editor) {
@@ -488,12 +546,12 @@ private void registerContributedEditors() {
 	}
 
 	private void registerDefaultEditors() {
-		registerEditor(ApplicationPackageImpl.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain(),this));
-		registerEditor(ApplicationPackageImpl.Literals.ADDON, new AddonsEditor(modelProvider.getEditingDomain(),this, project));
+		registerEditor(ApplicationPackageImpl.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(ApplicationPackageImpl.Literals.ADDON, new AddonsEditor(modelProvider.getEditingDomain(), this, project));
 
-		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain(),this, modelProvider));
-		registerEditor(CommandsPackageImpl.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(),this, modelProvider, project));
-		registerEditor(CommandsPackageImpl.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain(),this));
+		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain(), this, modelProvider));
+		registerEditor(CommandsPackageImpl.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(), this, modelProvider, project));
+		registerEditor(CommandsPackageImpl.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(CommandsPackageImpl.Literals.BINDING_TABLE, new BindingTableEditor(modelProvider.getEditingDomain(), this));
 
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR, new ToolBarEditor(modelProvider.getEditingDomain(), this));
@@ -506,11 +564,10 @@ private void registerDefaultEditors() {
 		registerEditor(MenuPackageImpl.Literals.MENU_SEPARATOR, new MenuSeparatorEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), this, project, modelProvider));
 		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this, project));
-		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION, new MenuContributionEditor(modelProvider.getEditingDomain(),project, this));
-		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION, new ToolBarContributionEditor(modelProvider.getEditingDomain(),project, this));
-		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION, new TrimContributionEditor(modelProvider.getEditingDomain(),project, this));
-		
-		
+		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION, new MenuContributionEditor(modelProvider.getEditingDomain(), project, this));
+		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION, new ToolBarContributionEditor(modelProvider.getEditingDomain(), project, this));
+		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION, new TrimContributionEditor(modelProvider.getEditingDomain(), project, this));
+
 		registerEditor(BasicPackageImpl.Literals.PART, new PartEditor(modelProvider.getEditingDomain(), this, project));
 		registerEditor(BasicPackageImpl.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain(), this, project));
 		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW, new TrimmedWindowEditor(modelProvider.getEditingDomain(), this, project));
@@ -523,10 +580,10 @@ private void registerDefaultEditors() {
 
 		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, new PerspectiveStackEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE, new PerspectiveEditor(modelProvider.getEditingDomain(), project, this));
-		registerEditor(AdvancedPackageImpl.Literals.PLACEHOLDER, new PlaceholderEditor(modelProvider.getEditingDomain(),this,modelProvider));
-		
+		registerEditor(AdvancedPackageImpl.Literals.PLACEHOLDER, new PlaceholderEditor(modelProvider.getEditingDomain(), this, modelProvider));
+
 		registerEditor(FragmentPackageImpl.Literals.MODEL_FRAGMENTS, new ModelFragmentsEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT, new StringModelFragment(modelProvider.getEditingDomain(),this));
+		registerEditor(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT, new StringModelFragment(modelProvider.getEditingDomain(), this));
 	}
 
 	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
@@ -563,10 +620,10 @@ private boolean equalsPaths(FeaturePath p1, FeaturePath p2) {
 
 	public AbstractComponentEditor getEditor(EClass eClass) {
 		AbstractComponentEditor editor = editorMap.get(eClass);
-		if( editor == null ) {
-			for( EClass cl : eClass.getESuperTypes() ) {
+		if (editor == null) {
+			for (EClass cl : eClass.getESuperTypes()) {
 				editor = getEditor(cl);
-				if( editor != null ) {
+				if (editor != null) {
 					return editor;
 				}
 			}
@@ -583,14 +640,89 @@ public void doSave(@Optional IProgressMonitor monitor) {
 
 	@Focus
 	public void setFocus() {
+		if (clipboardHandler == null) {
+			clipboardHandler = new ClipboardHandler();
+		}
+		clipboardService.setHandler(clipboardHandler);
 		viewer.getControl().setFocus();
 	}
 
-	private static class TreeStructureAdvisorImpl extends TreeStructureAdvisor {
+	public IModelResource getModelProvider() {
+		return modelProvider;
+	}
+
+	class ClipboardHandler implements Handler {
+
+		public void paste() {
+			Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
+			Object o = clip.getContents(MemoryTransfer.getInstance());
+			clip.dispose();
+			if (o == null) {
+				return;
+			}
+
+			Object parent = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+
+			EStructuralFeature feature = null;
+			EObject container = null;
+			if (parent instanceof VirtualEntry<?>) {
+				VirtualEntry<?> v = (VirtualEntry<?>) parent;
+				feature = ((IEMFProperty) v.getProperty()).getStructuralFeature();
+				container = (EObject) v.getOriginalParent();
+			} else {
+				if (parent instanceof MElementContainer<?>) {
+					feature = UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN;
+					container = (EObject) parent;
+				} else if (parent instanceof EObject) {
+					container = (EObject) parent;
+					EClass eClass = container.eClass();
+
+					for (EStructuralFeature f : eClass.getEAllStructuralFeatures()) {
+						if (ModelUtils.getTypeArgument(eClass, f.getEGenericType()).isInstance(o)) {
+							feature = f;
+							break;
+						}
+					}
+				}
+			}
+
+			if (feature != null && container != null) {
+				Command cmd = AddCommand.create(getModelProvider().getEditingDomain(), container, feature, o);
+				if (cmd.canExecute()) {
+					getModelProvider().getEditingDomain().getCommandStack().execute(cmd);
+				}
+			}
+		}
+
+		public void copy() {
+			Object o = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+			if (o != null && o instanceof EObject) {
+				Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
+				clip.setContents(new Object[] { EcoreUtil.copy((EObject) o) }, new Transfer[] { MemoryTransfer.getInstance() });
+				clip.dispose();
+			}
+		}
+
+		public void cut() {
+			Object o = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+			if (o != null && o instanceof EObject) {
+				Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
+				clip.setContents(new Object[] { o }, new Transfer[] { MemoryTransfer.getInstance() });
+				clip.dispose();
+				EObject eObj = (EObject) o;
+				Command cmd = RemoveCommand.create(getModelProvider().getEditingDomain(), eObj.eContainer(), eObj.eContainingFeature(), eObj);
+				if (cmd.canExecute()) {
+					getModelProvider().getEditingDomain().getCommandStack().execute(cmd);
+				}
+			}
+		}
+	}
+
+	static class TreeStructureAdvisorImpl extends TreeStructureAdvisor {
 
 	}
 
-	private class ObservableFactoryImpl implements IObservableFactory {
+	class ObservableFactoryImpl implements IObservableFactory {
 
 		public IObservable createObservable(Object target) {
 			if (target instanceof IObservableList) {
@@ -607,4 +739,173 @@ public IObservable createObservable(Object target) {
 			return null;
 		}
 	}
+
+	static class DragListener extends DragSourceAdapter {
+		private final TreeViewer viewer;
+
+		public DragListener(TreeViewer viewer) {
+			this.viewer = viewer;
+		}
+
+		@Override
+		public void dragStart(DragSourceEvent event) {
+			IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
+			event.doit = !selection.isEmpty() && selection.getFirstElement() instanceof MApplicationElement;
+		}
+
+		@Override
+		public void dragSetData(DragSourceEvent event) {
+			IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
+			Object o = selection.getFirstElement();
+			event.data = o;
+		}
+	}
+
+	static class DropListener extends ViewerDropAdapter {
+		private EditingDomain domain;
+
+		protected DropListener(Viewer viewer, EditingDomain domain) {
+			super(viewer);
+			this.domain = domain;
+		}
+
+		@Override
+		public boolean performDrop(Object data) {
+			if (getCurrentLocation() == LOCATION_ON) {
+				EStructuralFeature feature = null;
+				EObject parent = null;
+				if (getCurrentTarget() instanceof MElementContainer<?>) {
+					feature = UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN;
+					parent = (EObject) getCurrentTarget();
+				} else if (getCurrentTarget() instanceof VirtualEntry<?>) {
+					VirtualEntry<?> entry = (VirtualEntry<?>) getCurrentTarget();
+					IListProperty prop = entry.getProperty();
+					if (prop instanceof IEMFProperty) {
+						feature = ((IEMFProperty) prop).getStructuralFeature();
+						parent = (EObject) entry.getOriginalParent();
+
+					}
+				} else if (getCurrentTarget() instanceof EObject) {
+					parent = (EObject) getCurrentTarget();
+					for (EStructuralFeature f : parent.eClass().getEAllStructuralFeatures()) {
+						EClassifier cl = ModelUtils.getTypeArgument(parent.eClass(), f.getEGenericType());
+						if (cl.isInstance(data)) {
+							feature = f;
+							break;
+						}
+					}
+				}
+
+				if (feature != null && parent != null) {
+					Command cmd = AddCommand.create(domain, parent, feature, data);
+					if (cmd.canExecute()) {
+						domain.getCommandStack().execute(cmd);
+					}
+				}
+			} else if (getCurrentLocation() == LOCATION_AFTER || getCurrentLocation() == LOCATION_BEFORE) {
+				EStructuralFeature feature = null;
+				EObject parent = null;
+
+				TreeItem item = (TreeItem) getCurrentEvent().item;
+				if (item != null) {
+					TreeItem parentItem = item.getParentItem();
+					if (item != null) {
+						if (parentItem.getData() instanceof VirtualEntry<?>) {
+							VirtualEntry<?> vE = (VirtualEntry<?>) parentItem.getData();
+							parent = (EObject) vE.getOriginalParent();
+							feature = ((IEMFProperty) vE.getProperty()).getStructuralFeature();
+						} else if (parentItem.getData() instanceof MElementContainer<?>) {
+							parent = (EObject) parentItem.getData();
+							feature = UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN;
+						} else if (parentItem.getData() instanceof EObject) {
+							parent = (EObject) parentItem.getData();
+							for (EStructuralFeature f : parent.eClass().getEAllStructuralFeatures()) {
+								EClassifier cl = ModelUtils.getTypeArgument(parent.eClass(), f.getEGenericType());
+								if (cl.isInstance(data)) {
+									feature = f;
+									break;
+								}
+							}
+						}
+					}
+				}
+
+				if (feature != null && parent != null) {
+					List<Object> list = (List<Object>) parent.eGet(feature);
+					int index = list.indexOf(getCurrentTarget());
+
+					if (index >= list.size()) {
+						index = CommandParameter.NO_INDEX;
+					}
+
+					if (parent == ((EObject) data).eContainer()) {
+						Command cmd = MoveCommand.create(domain, parent, feature, data, index);
+						if (cmd.canExecute()) {
+							domain.getCommandStack().execute(cmd);
+						}
+					} else {
+						Command cmd = AddCommand.create(domain, parent, feature, data, index);
+						if (cmd.canExecute()) {
+							domain.getCommandStack().execute(cmd);
+						}
+					}
+				}
+			}
+
+			return false;
+		}
+
+		@Override
+		public boolean validateDrop(Object target, int operation, TransferData transferType) {
+			boolean rv = false;
+			if (getSelectedObject() instanceof MApplicationElement) {
+				if (getCurrentLocation() == LOCATION_ON) {
+					rv = isValidDrop(target, (MApplicationElement) getSelectedObject(), false);
+				} else if (getCurrentLocation() == LOCATION_AFTER || getCurrentLocation() == LOCATION_BEFORE) {
+					TreeItem item = (TreeItem) getCurrentEvent().item;
+					if (item != null) {
+						item = item.getParentItem();
+						if (item != null) {
+							rv = isValidDrop(item.getData(), (MApplicationElement) getSelectedObject(), true);
+						}
+					}
+				}
+			}
+
+			return rv;
+		}
+
+		private boolean isValidDrop(Object target, MApplicationElement instance, boolean isIndex) {
+			if (target instanceof MElementContainer<?>) {
+				MElementContainer<MUIElement> container = (MElementContainer<MUIElement>) target;
+
+				if (isIndex || !container.getChildren().contains(instance)) {
+					EClassifier classifier = ModelUtils.getTypeArgument(((EObject) container).eClass(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN.getEGenericType());
+					return classifier.isInstance(instance);
+				}
+			} else if (target instanceof VirtualEntry<?>) {
+				VirtualEntry<Object> vTarget = (VirtualEntry<Object>) target;
+				if (isIndex || !vTarget.getList().contains(instance)) {
+					if (vTarget.getProperty() instanceof IEMFProperty) {
+						EStructuralFeature feature = ((IEMFProperty) vTarget.getProperty()).getStructuralFeature();
+						EObject parent = (EObject) vTarget.getOriginalParent();
+						EClassifier classifier = ModelUtils.getTypeArgument(parent.eClass(), feature.getEGenericType());
+						return classifier.isInstance(instance);
+					}
+
+				}
+			} else if (target instanceof EObject) {
+				EObject eObj = (EObject) target;
+				for (EStructuralFeature f : eObj.eClass().getEAllStructuralFeatures()) {
+					EClassifier cl = ModelUtils.getTypeArgument(eObj.eClass(), f.getEGenericType());
+					if (cl.isInstance(instance)) {
+						return true;
+					}
+				}
+			}
+
+			return false;
+		}
+	}
+
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
index 84d6af1a45..575102da79 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
@@ -10,12 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
-import org.eclipse.core.databinding.observable.DisposeEvent;
-import org.eclipse.core.databinding.observable.IDisposeListener;
-
-import org.eclipse.core.databinding.observable.DisposeEvent;
-import org.eclipse.core.databinding.observable.IDisposeListener;
-
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.Diffs;
@@ -31,11 +25,13 @@ public abstract class VirtualEntry<M> {
 	private Object originalParent;
 	private String label;
 	private IObservableList list;
+	private IListProperty property;
 
 	public VirtualEntry(String id, IListProperty property, Object originalParent, String label) {
 		this.id = id;
 		this.originalParent = originalParent;
 		this.label = label;
+		this.property = property;
 		this.list = new WritableList();
 		final IObservableList origList = property.observe(originalParent);
 		list.addAll(cleanedList(origList));
@@ -43,23 +39,27 @@ public VirtualEntry(String id, IListProperty property, Object originalParent, St
 		final IListChangeListener listener = new IListChangeListener() {
 
 			public void handleListChange(ListChangeEvent event) {
-				if( ! VirtualEntry.this.list.isDisposed() ) {
+				if (!VirtualEntry.this.list.isDisposed()) {
 					List<Object> clean = cleanedList(event.getObservableList());
 					ListDiff diff = Diffs.computeListDiff(VirtualEntry.this.list, clean);
-					diff.applyTo(VirtualEntry.this.list);					
+					diff.applyTo(VirtualEntry.this.list);
 				}
 			}
 		};
-		
+
 		origList.addListChangeListener(listener);
 	}
 
+	public IListProperty getProperty() {
+		return property;
+	}
+
 	@SuppressWarnings("unchecked")
 	private List<Object> cleanedList(IObservableList list) {
 		List<Object> l = new ArrayList<Object>(list.size());
 
-		for( Object o : list ) {
-			if( accepted((M) o) ) {
+		for (Object o : list) {
+			if (accepted((M) o)) {
 				l.add(o);
 			}
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 45998f7875..436c59b0a6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -14,11 +14,13 @@
 import java.net.URL;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -33,6 +35,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
 public class DirectMenuItemEditor extends MenuItemEditor {
@@ -72,9 +75,22 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.DirectMenuItemEditor_ClassURI);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			final IContributionClassCreator c = getEditor().getContributionCreator(MenuPackageImpl.Literals.DIRECT_MENU_ITEM);
+			if (project != null && c != null) {
+				final Link l = new Link(parent, SWT.NONE);
+				l.setText("<A>" + Messages.DirectMenuItemEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
+				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+				l.addSelectionListener(new SelectionAdapter() {
+					@Override
+					public void widgetSelected(SelectionEvent e) {
+						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, l.getShell());
+					}
+				});
+			} else {
+				Label l = new Label(parent, SWT.NONE);
+				l.setText(Messages.DirectMenuItemEditor_ClassURI);
+				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			}
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 43f64ed338..13adde111b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -10,16 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -34,13 +35,14 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
 public class DirectToolItemEditor extends ToolItemEditor {
 	private Image image;
 
 	public DirectToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain,editor, project);
+		super(editingDomain, editor, project);
 	}
 
 	@Override
@@ -57,27 +59,39 @@ public Image getImage(Object element, Display display) {
 		return image;
 	}
 
-
 	@Override
 	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, WritableValue master) {
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		Label l = new Label(parent, SWT.NONE);
-		l.setText(Messages.DirectToolItemEditor_ClassURI);
-		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+		final IContributionClassCreator c = getEditor().getContributionCreator(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM);
+		if (project != null && c != null) {
+			final Link l = new Link(parent, SWT.NONE);
+			l.setText("<A>" + Messages.DirectMenuItemEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, l.getShell());
+				}
+			});
+		} else {
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.DirectToolItemEditor_ClassURI);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+		}
 
 		Text t = new Text(parent, SWT.BORDER);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value( getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
+		context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
 
-		final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+		final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.DirectToolItemEditor_Find);
 		b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
+				ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
 				dialog.open();
 			}
 		});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 6788e92afe..4caa6b8315 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -16,6 +16,7 @@
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -45,6 +46,7 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
 public class HandlerEditor extends AbstractComponentEditor {
@@ -167,9 +169,22 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.HandlerEditor_ClassURI);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			final IContributionClassCreator c = getEditor().getContributionCreator(CommandsPackageImpl.Literals.HANDLER);
+			if (project != null && c != null) {
+				final Link l = new Link(parent, SWT.NONE);
+				l.setText("<A>" + Messages.HandlerEditor_ClassURI + "</A>");
+				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+				l.addSelectionListener(new SelectionAdapter() {
+					@Override
+					public void widgetSelected(SelectionEvent e) {
+						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, l.getShell());
+					}
+				});
+			} else {
+				Label l = new Label(parent, SWT.NONE);
+				l.setText(Messages.HandlerEditor_ClassURI);
+				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			}
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 00e32c6653..01f8d314df 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -22,6 +22,7 @@
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -67,6 +68,7 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
 public class PartEditor extends AbstractComponentEditor {
@@ -237,9 +239,22 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartEditor_ClassURI);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			final IContributionClassCreator c = getEditor().getContributionCreator(BasicPackageImpl.Literals.PART);
+			if (project != null && c != null) {
+				final Link l = new Link(parent, SWT.NONE);
+				l.setText("<A>" + Messages.PartEditor_ClassURI + "</A>");
+				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+				l.addSelectionListener(new SelectionAdapter() {
+					@Override
+					public void widgetSelected(SelectionEvent e) {
+						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, l.getShell());
+					}
+				});
+			} else {
+				Label l = new Label(parent, SWT.NONE);
+				l.setText(Messages.PartEditor_ClassURI);
+				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			}
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java
new file mode 100644
index 0000000000..2f1f796afe
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.services;
+
+public interface IClipboardService {
+	public void copy();
+	public void paste();
+	public void cut();
+	public void setHandler(Handler handler);
+	
+	public interface Handler {
+		public void paste();
+		public void copy();
+		public void cut();
+//		public boolean canCopy();
+//		public boolean canPaste();
+	}
+}

From 76696fd31ef47d2ce1ab1050b2a2fb64d17a8426 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 5 Jul 2010 12:57:57 +0000
Subject: [PATCH 0173/1286]  Bug 308439 -  Correct plugin for e4 wizards  *
 adding new bundle

---
 features/org.eclipse.e4.core.tools.feature/feature.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 0106e2cb24..1ce569e119 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -52,4 +52,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.e4.tools"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

From 77f0868b5ea3e9df95144e9e2c6e163cc6c37a02 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 5 Jul 2010 13:26:48 +0000
Subject: [PATCH 0174/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * open the created class immediately

---
 .../emf/editor3x/extension/HandlerContributionEditor.java   | 1 -
 .../emf/editor3x/extension/PartContributionEditor.java      | 1 -
 .../tools/wizards/classes/AbstractNewClassWizard.java       | 6 ++++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
index b2bc2a31b9..e90faa7331 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
@@ -60,7 +60,6 @@ public void createOpen(MContribution contribution, EditingDomain domain, IProjec
 					if( cmd.canExecute() ) {
 						domain.getCommandStack().execute(cmd);
 					}
-					el.open(null);
 				} catch (JavaModelException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
index 65195eacc6..154e887df0 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
@@ -52,7 +52,6 @@ public void createOpen(MContribution contribution, EditingDomain domain,
 					if( cmd.canExecute() ) {
 						domain.getCommandStack().execute(cmd);
 					}
-					el.open(null);
 				} catch (JavaModelException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
index bb7178c10b..2aae8de99a 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
@@ -17,6 +17,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
+import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IPackageFragment;
@@ -117,8 +118,8 @@ public boolean performFinish() {
 		IPackageFragment fragment = clazz.getPackageFragment();
 		if (fragment != null) {
 			String cuName = clazz.getName() + ".java";
-			IResource resource = fragment.getCompilationUnit(cuName)
-					.getResource();
+			ICompilationUnit unit = fragment.getCompilationUnit(cuName); 
+			IResource resource = unit.getResource();
 			file = (IFile) resource;
 			try {
 				if (!file.exists()) {
@@ -128,6 +129,7 @@ public boolean performFinish() {
 					file.setContents(new ByteArrayInputStream(content.getBytes()),
 							IFile.FORCE | IFile.KEEP_HISTORY, null);
 				}
+				unit.open(null);
 			} catch (CoreException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();

From d61a0165f9c40106909cfb2ea6a620bcf7be6648 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 5 Jul 2010 17:05:15 +0000
Subject: [PATCH 0175/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * align with other workbench wizards where labels are
 positioned to the right

---
 .../tools/wizards/classes/AbstractNewClassPage.java       | 3 ---
 .../tools/wizards/classes/NewHandlerClassWizard.java      | 4 ----
 .../tools/wizards/classes/NewPartClassWizard.java         | 8 --------
 3 files changed, 15 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index 2452e1f963..37ab73c963 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -143,7 +143,6 @@ public void widgetDisposed(DisposeEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Source folder");
-			l.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -171,7 +170,6 @@ public void widgetSelected(SelectionEvent e) {
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
 			l.setText("Package");
 
 			Text t = new Text(parent, SWT.BORDER);
@@ -207,7 +205,6 @@ public void widgetSelected(SelectionEvent e) {
 			IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 			Label l = new Label(parent, SWT.NONE);
-			l.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
 			l.setText("Name");
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
index 52009c9e0d..4fc4f47930 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
@@ -51,8 +51,6 @@ protected void createFields(Composite parent, DataBindingContext dbc) {
 				{
 					Label l = new Label(parent, SWT.NONE);
 					l.setText("Execute Method");
-					l.setLayoutData(new GridData(GridData.END, GridData.CENTER,
-							false, false));
 
 					Text t = new Text(parent, SWT.BORDER);
 					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -67,8 +65,6 @@ protected void createFields(Composite parent, DataBindingContext dbc) {
 				{
 					Label l = new Label(parent, SWT.NONE);
 					l.setText("Can-Execute Method");
-					l.setLayoutData(new GridData(GridData.END, GridData.CENTER,
-							false, false));
 
 					Text t = new Text(parent, SWT.BORDER);
 					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
index 35c70947d8..d33ffbdc7e 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
@@ -45,8 +45,6 @@ protected void createFields(Composite parent, DataBindingContext dbc) {
 				{
 					Label l = new Label(parent, SWT.NONE);
 					l.setText("PostContruct Method");
-					l.setLayoutData(new GridData(GridData.END, GridData.CENTER,
-							false, false));
 
 					Text t = new Text(parent, SWT.BORDER);
 					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -68,8 +66,6 @@ protected void createFields(Composite parent, DataBindingContext dbc) {
 				{
 					Label l = new Label(parent, SWT.NONE);
 					l.setText("Predestroy Method");
-					l.setLayoutData(new GridData(GridData.END, GridData.CENTER,
-							false, false));
 
 					Text t = new Text(parent, SWT.BORDER);
 					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -91,8 +87,6 @@ protected void createFields(Composite parent, DataBindingContext dbc) {
 				{
 					Label l = new Label(parent, SWT.NONE);
 					l.setText("Focus Method");
-					l.setLayoutData(new GridData(GridData.END, GridData.CENTER,
-							false, false));
 
 					Text t = new Text(parent, SWT.BORDER);
 					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -114,8 +108,6 @@ protected void createFields(Composite parent, DataBindingContext dbc) {
 				{
 					Label l = new Label(parent, SWT.NONE);
 					l.setText("Persist Method");
-					l.setLayoutData(new GridData(GridData.END, GridData.CENTER,
-							false, false));
 
 					Text t = new Text(parent, SWT.BORDER);
 					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

From 6cbad75f1859b4af3a6f65f1d09c3798320baa82 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 5 Jul 2010 17:46:22 +0000
Subject: [PATCH 0176/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * removed unneeded code

---
 .../ui/internal/common/component/MenuContributionEditor.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 8593eb2718..0be1b71242 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -70,7 +70,6 @@ public class MenuContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
-	private IProject project;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
@@ -89,7 +88,6 @@ public Struct(String label, EClass eClass, boolean separator) {
 
 	public MenuContributionEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
 		super(editingDomain, editor);
-		this.project = project;
 	}
 
 	@Override

From 4667478f703b792d431df8d745cae15505989c98 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 5 Jul 2010 18:11:10 +0000
Subject: [PATCH 0177/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * added better binding context handling

---
 .../full/modelelements/BindingContext.gif     | Bin 0 -> 596 bytes
 .../emf/ui/internal/common/ModelEditor.java   |   2 +
 .../common/component/ApplicationEditor.java   |  81 +++++-
 .../component/BindingContextEditor.java       | 274 ++++++++++++++++++
 .../common/component/ControlFactory.java      |  13 +
 .../virtual/VBindingTableEditor.java          | 270 +----------------
 6 files changed, 373 insertions(+), 267 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif
new file mode 100644
index 0000000000000000000000000000000000000000..50445d99b8bdd3b440f82a5bf2c706251a699db8
GIT binary patch
literal 596
zcmZ?wbhEHb6krfwc*Xz%|NsC0@Zrac7atCs_~078sG?y;L&t&xCvId^OekoWp%Ktw
z5HZ0bVTMD-0*8zl8W9r=5+)Q(*l^;)jR!A21kAV)vEW9=iW?p?E+nkDQL*7h!;S|N
z4m`L3H1Nld4?lhgWw;1uxQS%C$rSpDWxGq{xJ%}ED3%4v6nM$xdMK3#s#FGR)P|{5
z2dh^Fdo54#S&{0$GA(djdd9ZIoSjMY&h#w4(3co*n;7p{kz-bvX4PI~lo@Z^kYm)4
zW0n}{IIU8@zev9@-U{douy2MKq4<-9k%7UPK?me+P@FKZZ)|X8<QCxJ5#;6NmzD1A
zb(WA26_XT~l9u6<o!#Ti-O|?4#m_f!qO-%CRSK(Q9ahLPZrZG)rMF3L{mRXowN1^`
zb$2>DZe(OV!K$opU}&V_=xlwAb+ekWiK?cYwX@xo%}R<Yo8)bsEoE7R-mow#?2)&0
zwvy%K5Eka#^VI5#EV~AeK*59NgU#|SJP$7(Y&gKkCLs63kfq&<m5op1f%@xX6XX?~
SyJRevEIBz@qn(9`!5RQb-Jl!*

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 4a889e3223..a178632bb7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -48,6 +48,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.AddonsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ApplicationEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.BindingContextEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.BindingTableEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CommandEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectMenuItemEditor;
@@ -553,6 +554,7 @@ private void registerDefaultEditors() {
 		registerEditor(CommandsPackageImpl.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(), this, modelProvider, project));
 		registerEditor(CommandsPackageImpl.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(CommandsPackageImpl.Literals.BINDING_TABLE, new BindingTableEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(CommandsPackageImpl.Literals.BINDING_CONTEXT, new BindingContextEditor(modelProvider.getEditingDomain(), this));
 
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR, new ToolBarEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor(modelProvider.getEditingDomain(), this, project));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index c2bed1d240..3d19f4294e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -14,26 +14,37 @@
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.commands.MBindingContext;
+import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
@@ -44,6 +55,7 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
 	private EMFDataBindingContext context;
+	private Button createRemoveRootContext;
 
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES);
@@ -54,6 +66,7 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private IListProperty MENU_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS);
 	private IListProperty TOOLBAR_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS);
 	private IListProperty TRIM_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS);
+	private IValueProperty BINDING_TABLE_CONTAINER__ROOT_CONTEXT = EMFProperties.value(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT);
 
 	public ApplicationEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
@@ -90,6 +103,11 @@ public Composite getEditor(Composite parent, Object object) {
 			composite = createForm(parent, context);
 		}
 		getMaster().setValue(object);
+
+		if (createRemoveRootContext != null) {
+			createRemoveRootContext.setSelection(((MApplication) object).getRootContext() != null);
+		}
+
 		return composite;
 	}
 
@@ -111,15 +129,50 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Root Context");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			createRemoveRootContext = new Button(parent, SWT.CHECK);
+			createRemoveRootContext.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MApplication app = (MApplication) getMaster().getValue();
+					if (app.getRootContext() == null) {
+						addContext();
+					} else {
+						removeContext();
+					}
+				}
+			});
+			createRemoveRootContext.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
+		}
+
 		ControlFactory.createStringListWidget(parent, this, "Variables", UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, this, "Binding Contexts", CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
 
+	void removeContext() {
+		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT, null);
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+		}
+	}
+
+	void addContext() {
+		MBindingContext context = MCommandsFactory.INSTANCE.createBindingContext();
+		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT, context);
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+		}
+	}
+
 	@Override
-	public IObservableList getChildList(Object element) {
-		WritableList list = new WritableList();
+	public IObservableList getChildList(final Object element) {
+		final WritableList list = new WritableList();
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_ADDONS, APPLICATION__ADDONS, element, Messages.ApplicationEditor_Addons) {
 
 			@Override
@@ -195,6 +248,30 @@ protected boolean accepted(Object o) {
 			}
 		});
 
+		MApplication application = (MApplication) element;
+		if (application.getRootContext() != null) {
+			list.add(0, application.getRootContext());
+		}
+
+		BINDING_TABLE_CONTAINER__ROOT_CONTEXT.observe(element).addValueChangeListener(new IValueChangeListener() {
+
+			public void handleValueChange(ValueChangeEvent event) {
+				if (event.diff.getOldValue() != null) {
+					list.remove(event.diff.getOldValue());
+					if (getMaster().getValue() == element) {
+						createRemoveRootContext.setSelection(false);
+					}
+				}
+
+				if (event.diff.getNewValue() != null) {
+					list.add(0, event.diff.getNewValue());
+					if (getMaster().getValue() == element) {
+						createRemoveRootContext.setSelection(true);
+					}
+				}
+			}
+		});
+
 		return list;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
new file mode 100644
index 0000000000..506f378725
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -0,0 +1,274 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.commands.MBindingContext;
+import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+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;
+
+public class BindingContextEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private Image image;
+	private EMFDataBindingContext context;
+
+	private EStackLayout stackLayout;
+	private IListProperty BINDING_CONTEXT__CHILDREN = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
+
+	public BindingContextEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain, editor);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if (image == null) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif")); //$NON-NLS-1$
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Binding Context";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		MBindingContext context = (MBindingContext) element;
+		if (context.getName() != null && context.getName().trim().length() > 0) {
+			return context.getName().trim();
+		} else if (context.getElementId() != null && context.getElementId().trim().length() > 0) {
+			return context.getElementId().trim();
+		}
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Binding Context Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new EStackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+
+		if (getEditor().isModelFragment()) {
+			Control topControl;
+			if (Util.isImport((EObject) object)) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];
+			}
+
+			if (stackLayout.topControl != topControl) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
+			return parent;
+		}
+
+		ControlFactory.createTextField(parent, "Id", master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, "Name", master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME));
+		ControlFactory.createTextField(parent, "Description", master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__DESCRIPTION));
+
+		Label l = new Label(parent, SWT.NONE);
+		l.setText("Childcontexts");
+		l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+
+		final TableViewer viewer = new TableViewer(parent);
+		ObservableListContentProvider cp = new ObservableListContentProvider();
+		viewer.setContentProvider(cp);
+
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.heightHint = 300;
+		viewer.getControl().setLayoutData(gd);
+		viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+
+		IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
+		viewer.setInput(prop.observeDetail(master));
+
+		Composite buttonComp = new Composite(parent, SWT.NONE);
+		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+		GridLayout gl = new GridLayout();
+		gl.marginLeft = 0;
+		gl.marginRight = 0;
+		gl.marginWidth = 0;
+		gl.marginHeight = 0;
+		buttonComp.setLayout(gl);
+
+		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Up");
+		b.setImage(getImage(b.getDisplay(), ARROW_UP));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MBindingContext container = (MBindingContext) getMaster().getValue();
+						int idx = container.getChildren().indexOf(obj) - 1;
+						if (idx >= 0) {
+							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN, obj, idx);
+
+							if (cmd.canExecute()) {
+								getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+
+					}
+				}
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Down");
+		b.setImage(getImage(b.getDisplay(), ARROW_UP));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MBindingContext container = (MBindingContext) getMaster().getValue();
+						int idx = container.getChildren().indexOf(obj) + 1;
+						if (idx < container.getChildren().size()) {
+							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN, obj, idx);
+
+							if (cmd.canExecute()) {
+								getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+
+					}
+				}
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Add ...");
+		b.setImage(getImage(b.getDisplay(), ARROW_UP));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				MBindingContext eObject = MCommandsFactory.INSTANCE.createBindingContext();
+
+				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN, eObject);
+
+				if (cmd.canExecute()) {
+					getEditingDomain().getCommandStack().execute(cmd);
+					getEditor().setSelection(eObject);
+
+				}
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText("Remove ...");
+		b.setImage(getImage(b.getDisplay(), ARROW_UP));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
+					Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN, keybinding);
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+					}
+				}
+			}
+		});
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return BINDING_CONTEXT__CHILDREN.observe(element);
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 7c12c0b296..eda2300136 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -64,6 +64,19 @@
 import org.eclipse.swt.widgets.Text;
 
 public class ControlFactory {
+	public static void createTextField(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp) {
+		Label l = new Label(parent, SWT.NONE);
+		l.setText(label);
+		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+		Text t = new Text(parent, SWT.BORDER);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 2;
+		t.setLayoutData(gd);
+		context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master));
+
+	}
+
 	public static void createFindImport(Composite parent, final AbstractComponentEditor editor, EMFDataBindingContext context) {
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index aec316a1aa..7d66ce41f6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -10,57 +10,35 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.commands.MBindingContext;
 import org.eclipse.e4.ui.model.application.commands.MBindingTable;
 import org.eclipse.e4.ui.model.application.commands.MBindingTableContainer;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.IEMFValueProperty;
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.databinding.viewers.ObservableListTreeContentProvider;
 import org.eclipse.jface.databinding.viewers.TreeStructureAdvisor;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnViewerEditor;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
-import org.eclipse.jface.viewers.EditingSupport;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.TreeViewerColumn;
-import org.eclipse.jface.viewers.TreeViewerEditor;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -78,7 +56,7 @@ public class VBindingTableEditor extends AbstractComponentEditor {
 	private TreeViewer contextsViewer;
 
 	public VBindingTableEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
@@ -117,244 +95,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.VBindingTableEditor_Contexts);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
-			contextsViewer = new TreeViewer(parent);
-			ObservableListTreeContentProvider pv = new ObservableListTreeContentProvider(new ObservableFactoryImpl(), new TreeStructureAdvisorImpl());
-			contextsViewer.setContentProvider(pv);
-			contextsViewer.getTree().setHeaderVisible(true);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 200;
-			contextsViewer.getControl().setLayoutData(gd);
-			
-			final WritableList list = new WritableList();
-			
-			IEMFValueProperty listProp = EMFProperties.value(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT);
-			IObservableValue val = listProp.observeDetail(getMaster());
-			val.addValueChangeListener(new IValueChangeListener() {
-				
-				public void handleValueChange(ValueChangeEvent event) {
-					list.clear();
-					MBindingContext ctx = (MBindingContext) event.getObservableValue().getValue();
-					if( ctx != null ) {
-						list.add(ctx);	
-					}
-				}
-			});
-			
-			
-			contextsViewer.setInput(list);
-			
-			
-			{
-				IEMFValueProperty prop = EMFProperties.value(CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME);
-				
-				TreeViewerColumn column = new TreeViewerColumn(contextsViewer, SWT.NONE);
-				column.getColumn().setText(Messages.VBindingTableEditor_Name);
-				column.getColumn().setWidth(200);				
-				column.setLabelProvider(new ObservableColumnLabelProvider<MBindingContext>(prop.observeDetail(pv.getKnownElements())));
-				column.setEditingSupport(new EditingSupport(contextsViewer) {
-					private TextCellEditor editor = new TextCellEditor(contextsViewer.getTree());
-					
-					@Override
-					protected void setValue(Object element, Object value) {
-						Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME, value);
-						if( cmd.canExecute() ) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-					
-					@Override
-					protected Object getValue(Object element) {
-						MBindingContext ctx = (MBindingContext) element; 
-						return ctx.getName() != null ? ctx.getName() : ""; //$NON-NLS-1$
-					}
-					
-					@Override
-					protected CellEditor getCellEditor(Object element) {
-						return editor;
-					}
-					
-					@Override
-					protected boolean canEdit(Object element) {
-						return true;
-					}
-				});
-			}
-			
-			{
-				IEMFValueProperty prop = EMFProperties.value(CommandsPackageImpl.Literals.BINDING_CONTEXT__DESCRIPTION);
-				
-				TreeViewerColumn column = new TreeViewerColumn(contextsViewer, SWT.NONE);
-				column.getColumn().setText(Messages.VBindingTableEditor_LabelDescription);
-				column.getColumn().setWidth(200);				
-				column.setLabelProvider(new ObservableColumnLabelProvider<MBindingContext>(prop.observeDetail(pv.getKnownElements())));				
-				column.setEditingSupport(new EditingSupport(contextsViewer) {
-					private TextCellEditor editor = new TextCellEditor(contextsViewer.getTree());
-					
-					@Override
-					protected void setValue(Object element, Object value) {
-						Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.BINDING_CONTEXT__DESCRIPTION, value);
-						if( cmd.canExecute() ) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-					
-					@Override
-					protected Object getValue(Object element) {
-						MBindingContext ctx = (MBindingContext) element; 
-						return ctx.getDescription() != null ? ctx.getDescription() : ""; //$NON-NLS-1$
-					}
-					
-					@Override
-					protected CellEditor getCellEditor(Object element) {
-						return editor;
-					}
-					
-					@Override
-					protected boolean canEdit(Object element) {
-						return true;
-					}
-				});
-			}
-			
-			{
-				IEMFValueProperty prop = EMFProperties.value(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-				
-				TreeViewerColumn column = new TreeViewerColumn(contextsViewer, SWT.NONE);
-				column.getColumn().setText(Messages.VBindingTableEditor_Id);
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MBindingContext>(prop.observeDetail(pv.getKnownElements())));				
-				column.setEditingSupport(new EditingSupport(contextsViewer) {
-					private TextCellEditor editor = new TextCellEditor(contextsViewer.getTree());
-					
-					@Override
-					protected void setValue(Object element, Object value) {
-						Command cmd = SetCommand.create(getEditingDomain(), element, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, value);
-						if( cmd.canExecute() ) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-					
-					@Override
-					protected Object getValue(Object element) {
-						MBindingContext ctx = (MBindingContext) element; 
-						return ctx.getElementId() != null ? ctx.getElementId() : ""; //$NON-NLS-1$
-					}
-					
-					@Override
-					protected CellEditor getCellEditor(Object element) {
-						return editor;
-					}
-					
-					@Override
-					protected boolean canEdit(Object element) {
-						return true;
-					}
-				});
-			}
-			
-			ColumnViewerEditorActivationStrategy editorActivationStrategy = new ColumnViewerEditorActivationStrategy(contextsViewer) {
-				@Override
-				protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
-					boolean singleSelect = ((IStructuredSelection)contextsViewer.getSelection()).size() == 1;
-					boolean isLeftDoubleMouseSelect = event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION && ((MouseEvent)event.sourceEvent).button == 1;
-
-					return singleSelect && (isLeftDoubleMouseSelect
-							|| event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC
-							|| event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
-				}
-			};
-			TreeViewerEditor.create(contextsViewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR | ColumnViewerEditor.KEEP_EDITOR_ON_DOUBLE_CLICK);
-
-			
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-			
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.VBindingTableEditor_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.VBindingTableEditor_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.VBindingTableEditor_Add);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					IStructuredSelection s = (IStructuredSelection) contextsViewer.getSelection();
-					MBindingContext context = MCommandsFactory.INSTANCE.createBindingContext();
-					MBindingContext parentContext = null;
-					
-					if( ! s.isEmpty() ) {
-						parentContext = (MBindingContext) s.getFirstElement();
-						Command cmd = AddCommand.create(getEditingDomain(), parentContext, CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN, context);
-						
-						if( cmd.canExecute() ) {
-							getEditingDomain().getCommandStack().execute(cmd);
-							contextsViewer.setSelection(new StructuredSelection(context));
-						}
-					} else if( s.isEmpty() && ((MBindingTableContainer)getMaster().getValue()).getRootContext() == null ) {
-						Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT, context);
-						if( cmd.canExecute() ) {
-							getEditingDomain().getCommandStack().execute(cmd);
-							contextsViewer.setSelection(new StructuredSelection(context));
-						}
-					}
-					
-					
-				}
-			});
-			
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.VBindingTableEditor_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					IStructuredSelection s = (IStructuredSelection) contextsViewer.getSelection();
-					if( ! s.isEmpty() ) {
-						List<Command> commands = new ArrayList<Command>();
-						
-						for( Object o : s.toArray() ) {
-							MBindingContext ctx = (MBindingContext) o;
-							EObject owner = ((EObject)ctx).eContainer();
-							if( owner instanceof MBindingTableContainer ) {
-								Command cmd = SetCommand.create(getEditingDomain(), owner, CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT, null);
-								if( cmd.canExecute() ) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									return;
-								}
-							} else {
-								commands.add(RemoveCommand.create(getEditingDomain(), owner, CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN, ctx));
-							}
-						}
-						
-						CompoundCommand cmd = new CompoundCommand(commands);
-						if( cmd.canExecute() ) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
-		}
-
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Binding Tables");
@@ -477,16 +217,16 @@ public IObservableList getChildList(Object element) {
 
 	private static class ObservableFactoryImpl implements IObservableFactory {
 		private IEMFListProperty prop = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
-		
+
 		public IObservable createObservable(Object target) {
-			if( target instanceof IObservableList ) {
+			if (target instanceof IObservableList) {
 				return (IObservable) target;
 			}
 			return prop.observe(target);
 		}
 	}
-	
+
 	private static class TreeStructureAdvisorImpl extends TreeStructureAdvisor {
-		
+
 	}
 }

From f0cca7a923f555ea4bb3e83a618c7d928ef8fa48 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 5 Jul 2010 19:18:48 +0000
Subject: [PATCH 0178/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * cleaning up translations

---
 .../e4/tools/emf/ui/internal/Messages.java    |  91 +-------------
 .../tools/emf/ui/internal/Messages.properties |  93 ++-------------
 .../common/component/BindingTableEditor.java  |   8 +-
 .../common/component/CommandEditor.java       |   8 +-
 .../common/component/ControlFactory.java      |   8 +-
 .../component/HandledMenuItemEditor.java      |  13 +-
 .../component/HandledToolItemEditor.java      |  11 +-
 .../common/component/KeyBindingEditor.java    |   8 +-
 .../component/MenuContributionEditor.java     |   6 +-
 .../internal/common/component/MenuEditor.java |   6 +-
 .../component/ModelFragmentsEditor.java       |  77 ++++++------
 .../component/PartDescriptorEditor.java       |   6 +-
 .../internal/common/component/PartEditor.java |   6 +-
 .../component/PartSashContainerEditor.java    |   6 +-
 .../common/component/PartStackEditor.java     |   6 +-
 .../common/component/PerspectiveEditor.java   |   6 +-
 .../component/PerspectiveStackEditor.java     |   8 +-
 .../common/component/StringModelFragment.java | 112 +++++++-----------
 .../component/ToolBarContributionEditor.java  |   6 +-
 .../common/component/ToolBarEditor.java       |   6 +-
 20 files changed, 151 insertions(+), 340 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 1460779f1c..562e7a2ffb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -13,6 +13,12 @@
 import org.eclipse.osgi.util.NLS;
 
 public class Messages {
+	public static String ModelTooling_Common_Up;
+	public static String ModelTooling_Common_Down;
+	public static String ModelTooling_Common_AddEllipsis;
+	public static String ModelTooling_Common_Add;
+	public static String ModelTooling_Common_Remove;
+
 	public static String AbstractCommandSelectionDialog_Label_CommandId;
 
 	public static String ApplicationEditor_Label;
@@ -36,10 +42,6 @@ public class Messages {
 	public static String BindingTableEditor_Keybindings;
 	public static String BindingTableEditor_KeySequence;
 	public static String BindingTableEditor_Command;
-	public static String BindingTableEditor_Up;
-	public static String BindingTableEditor_Down;
-	public static String BindingTableEditor_Add;
-	public static String BindingTableEditor_Remove;
 
 	public static String CommandEditor_Label;
 	public static String CommandEditor_Description;
@@ -52,10 +54,6 @@ public class Messages {
 	public static String CommandEditor_ParameterOptional;
 	public static String CommandEditor_ParameterOptional_No;
 	public static String CommandEditor_ParameterOptional_Yes;
-	public static String CommandEditor_Up;
-	public static String CommandEditor_Down;
-	public static String CommandEditor_Add;
-	public static String CommandEditor_Remove;
 	public static String CommandEditor_ParameterId;
 
 	public static String DirectMenuItemEditor_Label;
@@ -64,15 +62,10 @@ public class Messages {
 	public static String DirectMenuItemEditor_Find;
 
 	public static String ControlFactory_BindingContexts;
-	public static String ControlFactory_Add;
-	public static String ControlFactory_Up;
-	public static String ControlFactory_Down;
-	public static String ControlFactory_Remove;
 	public static String ControlFactory_Tags;
 	public static String ControlFactory_Key;
 	public static String ControlFactory_Value;
 	public static String ControlFactory_ContextVariables;
-	public static String ControlFactory_AddNoEllipse;
 
 	public static String DirectToolItemEditor_ClassURI;
 	public static String DirectToolItemEditor_Find;
@@ -86,20 +79,12 @@ public class Messages {
 	public static String HandledMenuItemEditor_Parameters;
 	public static String HandledMenuItemEditor_Tag;
 	public static String HandledMenuItemEditor_Value;
-	public static String HandledMenuItemEditor_Up;
-	public static String HandledMenuItemEditor_Down;
-	public static String HandledMenuItemEditor_Add;
-	public static String HandledMenuItemEditor_Remove;
 
 	public static String HandledToolItemEditor_Command;
 	public static String HandledToolItemEditor_Find;
 	public static String HandledToolItemEditor_Parameters;
 	public static String HandledToolItemEditor_ParametersName;
 	public static String HandledToolItemEditor_ParametersValue;
-	public static String HandledToolItemEditor_Up;
-	public static String HandledToolItemEditor_Down;
-	public static String HandledToolItemEditor_Add;
-	public static String HandledToolItemEditor_Remove;
 	public static String HandledToolItemEditor_Label;
 	public static String HandledToolItemEditor_Description;
 
@@ -122,10 +107,6 @@ public class Messages {
 	public static String KeyBindingEditor_Parameters;
 	public static String KeyBindingEditor_ParametersKey;
 	public static String KeyBindingEditor_ParametersValue;
-	public static String KeyBindingEditor_Up;
-	public static String KeyBindingEditor_Down;
-	public static String KeyBindingEditor_Add;
-	public static String KeyBindingEditor_Remove;
 
 	public static String MenuEditor_Label;
 	public static String MenuEditor_Description;
@@ -133,13 +114,10 @@ public class Messages {
 	public static String MenuEditor_MenuItems;
 	public static String MenuEditor_MenuItemType;
 	public static String MenuEditor_MenuItemItemType;
-	public static String MenuEditor_Up;
-	public static String MenuEditor_Down;
 	public static String MenuEditor_HandledMenuItem;
 	public static String MenuEditor_Separator;
 	public static String MenuEditor_Menu;
 	public static String MenuEditor_DirectMenuItem;
-	public static String MenuEditor_Remove;
 	public static String MenuEditor_LabelLabel;
 	public static String MenuEditor_Tooltip;
 	public static String MenuEditor_IconURI;
@@ -155,32 +133,6 @@ public class Messages {
 	public static String MenuSeparatorEditor_Label;
 	public static String MenuSeparatorEditor_Id;
 
-	public static String ModelComponentEditor_Id;
-	public static String ModelComponentEditor_ParentId;
-	public static String ModelComponentEditor_Find;
-	public static String ModelComponentEditor_PositionInParent;
-	public static String ModelComponentEditor_Processor;
-	public static String ModelComponentEditor_Tags;
-	public static String ModelComponentEditor_Label;
-	public static String ModelComponentEditor_Description;
-	public static String ModelComponentEditor_Handlers;
-	public static String ModelComponentEditor_BindingTables;
-	public static String ModelComponentEditor_KeyBindings;
-	public static String ModelComponentEditor_Commands;
-	public static String ModelComponentEditor_Menus;
-	public static String ModelComponentEditor_UiChildren;
-	public static String ModelComponentEditor_PartDescriptors;
-	public static String ModelComponentEditor_DetailParentId;
-	public static String ModelComponentEditor_MenuContributions;
-
-	public static String ModelComponentsEditor_Label;
-	public static String ModelComponentsEditor_Description;
-	public static String ModelComponentsEditor_ModelContributions;
-	public static String ModelComponentsEditor_Up;
-	public static String ModelComponentsEditor_Down;
-	public static String ModelComponentsEditor_Add;
-	public static String ModelComponentsEditor_Remove;
-
 	public static String PartDescriptorEditor_Label;
 	public static String PartDescriptorEditor_Descriptor;
 	public static String PartDescriptorEditor_Id;
@@ -196,8 +148,6 @@ public class Messages {
 	public static String PartDescriptorEditor_PersitedState;
 	public static String PartDescriptorEditor_PersitedStateKey;
 	public static String PartDescriptorEditor_PersitedStateValue;
-	public static String PartDescriptorEditor_Add;
-	public static String PartDescriptorEditor_Remove;
 	public static String PartDescriptorEditor_Variables;
 	public static String PartDescriptorEditor_Properties;
 	public static String PartDescriptorEditor_PropertiesKey;
@@ -218,8 +168,6 @@ public class Messages {
 	public static String PartEditor_PersitedState;
 	public static String PartEditor_PersitedStateKey;
 	public static String PartEditor_PersitedStateValue;
-	public static String PartEditor_Add;
-	public static String PartEditor_Remove;
 	public static String PartEditor_Menus;
 	public static String PartEditor_Handlers;
 	public static String PartEditor_ContainerData;
@@ -233,9 +181,6 @@ public class Messages {
 	public static String PartSashContainerEditor_Horizontal;
 	public static String PartSashContainerEditor_SelectedElement;
 	public static String PartSashContainerEditor_Controls;
-	public static String PartSashContainerEditor_Up;
-	public static String PartSashContainerEditor_Down;
-	public static String PartSashContainerEditor_Remove;
 	public static String PartSashContainerEditor_ContainerData;
 
 	public static String PartStackEditor_Label;
@@ -243,11 +188,7 @@ public class Messages {
 	public static String PartStackEditor_Id;
 	public static String PartStackEditor_SelectedElement;
 	public static String PartStackEditor_Parts;
-	public static String PartStackEditor_Up;
-	public static String PartStackEditor_Down;
-	public static String PartStackEditor_Remove;
 	public static String PartStackEditor_ContainerData;
-	public static String PerspectiveStackEditor_Add;
 
 	public static String PerspectiveEditor_Label;
 	public static String PerspectiveEditor_Description;
@@ -258,9 +199,6 @@ public class Messages {
 	public static String PerspectiveEditor_IconURI;
 	public static String PerspectiveEditor_Find;
 	public static String PerspectiveEditor_Controls;
-	public static String PerspectiveEditor_Up;
-	public static String PerspectiveEditor_Down;
-	public static String PerspectiveEditor_Remove;
 
 	public static String PerspectiveStackEditor_Perspectives;
 	public static String PerspectiveStackEditor_Label;
@@ -279,13 +217,10 @@ public class Messages {
 	public static String ToolBarEditor_ToolbarItems;
 	public static String ToolBarEditor_ToolbarItemsType;
 	public static String ToolBarEditor_ToolbarItemsItemType;
-	public static String ToolBarEditor_Up;
-	public static String ToolBarEditor_Down;
 	public static String ToolBarEditor_HandledToolItem;
 	public static String ToolBarEditor_DirectToolItem;
 	public static String ToolBarEditor_ToolControl;
 	public static String ToolBarEditor_Separator;
-	public static String ToolBarEditor_Remove;
 
 	public static String ToolBarSeparatorEditor_Label;
 	public static String ToolBarSeparatorEditor_Id;
@@ -301,10 +236,6 @@ public class Messages {
 	public static String VBindingTableEditor_Name;
 	public static String VBindingTableEditor_LabelDescription;
 	public static String VBindingTableEditor_Id;
-	public static String VBindingTableEditor_Up;
-	public static String VBindingTableEditor_Down;
-	public static String VBindingTableEditor_Add;
-	public static String VBindingTableEditor_Remove;
 
 	public static String AddonsEditor_Id;
 	public static String AddonsEditor_ClassURI;
@@ -319,21 +250,14 @@ public class Messages {
 	public static String MenuContributionEditor_MenuItems;
 	public static String MenuContributionEditor_MenuItemType;
 	public static String MenuContributionEditor_MenuItemItemType;
-	public static String MenuContributionEditor_Up;
-	public static String MenuContributionEditor_Down;
 	public static String MenuContributionEditor_HandledMenuItem;
 	public static String MenuContributionEditor_Separator;
 	public static String MenuContributionEditor_Menu;
 	public static String MenuContributionEditor_DirectMenuItem;
-	public static String MenuContributionEditor_Remove;
 	public static String MenuContributionEditor_ParentId;
 	public static String MenuContributionEditor_Position;
 
 	public static String ModelFragmentsEditor_ModelFragments;
-	public static String ModelFragmentsEditor_Up;
-	public static String ModelFragmentsEditor_Down;
-	public static String ModelFragmentsEditor_Add;
-	public static String ModelFragmentsEditor_Remove;
 	public static String ModelFragmentsEditor_Label;
 	public static String ModelFragmentsEditor_Description;
 
@@ -342,9 +266,6 @@ public class Messages {
 	public static String StringModelFragment_Featurename;
 	public static String StringModelFragment_ParentId;
 	public static String StringModelFragment_PositionInList;
-	public static String StringModelFragment_Up;
-	public static String StringModelFragment_Down;
-	public static String StringModelFragment_Remove;
 	public static String StringModelFragment_Elements;
 	public static String StringModelFragment_Find;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index efb9a05514..d4580dfa9e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -8,6 +8,12 @@
 # * Contributors:
 # *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
 # ******************************************************************************
+ModelTooling_Common_Up=Up
+ModelTooling_Common_Down=Down
+ModelTooling_Common_AddEllipsis=Add ...
+ModelTooling_Common_Add=Add
+ModelTooling_Common_Remove=Remove
+
 AbstractCommandSelectionDialog_Label_CommandId=Command-Id
 
 ApplicationEditor_Label=Application
@@ -31,10 +37,6 @@ BindingTableEditor_Find=Find ...
 BindingTableEditor_Keybindings=Keybindings
 BindingTableEditor_KeySequence=KeySequence
 BindingTableEditor_Command=Command
-BindingTableEditor_Up=Up
-BindingTableEditor_Down=Down
-BindingTableEditor_Add=Add ...
-BindingTableEditor_Remove=Remove
 
 CommandEditor_Label=Command
 CommandEditor_Description=Command bla bla bla
@@ -47,10 +49,6 @@ CommandEditor_ParameterTypeId=Type-Id
 CommandEditor_ParameterOptional=Optional
 CommandEditor_ParameterOptional_Yes=yes
 CommandEditor_ParameterOptional_No=no
-CommandEditor_Up=Up
-CommandEditor_Down=Down
-CommandEditor_Add=Add ...
-CommandEditor_Remove=Remove
 CommandEditor_ParameterId=Id
 
 DirectMenuItemEditor_Label=DirectMenuItem
@@ -59,15 +57,10 @@ DirectMenuItemEditor_ClassURI=Class URI
 DirectMenuItemEditor_Find=Find ...
 
 ControlFactory_BindingContexts=Binding Contexts
-ControlFactory_Add=Add ...
-ControlFactory_Up=Up
-ControlFactory_Down=Down
-ControlFactory_Remove=Remove
 ControlFactory_Tags=Tags
 ControlFactory_Key=Key
 ControlFactory_Value=Value
 ControlFactory_ContextVariables=Context Variables
-ControlFactory_AddNoEllipse=Add
 
 DirectToolItemEditor_ClassURI=Class URI
 DirectToolItemEditor_Find=Find ...
@@ -81,20 +74,12 @@ HandledMenuItemEditor_Find=Find ...
 HandledMenuItemEditor_Parameters=Parameters
 HandledMenuItemEditor_Tag=Name
 HandledMenuItemEditor_Value=Value
-HandledMenuItemEditor_Up=Up
-HandledMenuItemEditor_Down=Down
-HandledMenuItemEditor_Add=Add ...
-HandledMenuItemEditor_Remove=Remove
 
 HandledToolItemEditor_Command=Command
 HandledToolItemEditor_Find=Find ...
 HandledToolItemEditor_Parameters=Parameters
 HandledToolItemEditor_ParametersName=Name
 HandledToolItemEditor_ParametersValue=Value
-HandledToolItemEditor_Up=Up
-HandledToolItemEditor_Down=Down
-HandledToolItemEditor_Add=Add ...
-HandledToolItemEditor_Remove=Remove
 HandledToolItemEditor_Label=Handled Tool Item
 HandledToolItemEditor_Description=Handled Tool Item bla bla bla
 
@@ -117,10 +102,6 @@ KeyBindingEditor_Find=Find ...
 KeyBindingEditor_Parameters=Parameters
 KeyBindingEditor_ParametersKey=Key
 KeyBindingEditor_ParametersValue=Value
-KeyBindingEditor_Up=Up
-KeyBindingEditor_Down=Down
-KeyBindingEditor_Add=Add ...
-KeyBindingEditor_Remove=Remove
 
 MenuEditor_Label=Menu
 MenuEditor_Description=Menu bla bla bla
@@ -128,12 +109,9 @@ MenuEditor_Id=Id
 MenuEditor_MenuItems=MenuItems
 MenuEditor_MenuItemType=Type
 MenuEditor_MenuItemItemType=Item Type
-MenuEditor_Up=Up
-MenuEditor_Down=Down
 MenuEditor_HandledMenuItem=Handled MenuItem
 MenuEditor_Separator=Separator
 MenuEditor_Menu=Menu
-MenuEditor_Remove=Remove
 MenuEditor_DirectMenuItem=Direct MenuItem
 MenuEditor_LabelLabel=Label
 MenuEditor_Tooltip=Tooltip
@@ -151,32 +129,6 @@ MenuItemEditor_Find=Find ...
 MenuSeparatorEditor_Label=Separator
 MenuSeparatorEditor_Id=Id
 
-ModelComponentEditor_Id=Id
-ModelComponentEditor_ParentId=Parent-Id
-ModelComponentEditor_Find=Find ...
-ModelComponentEditor_PositionInParent=Position in Parent
-ModelComponentEditor_Processor=Processor
-ModelComponentEditor_Tags=Tags
-ModelComponentEditor_Label=Model Component
-ModelComponentEditor_Description=The model component ... bla bla bla
-ModelComponentEditor_Handlers=Handlers
-ModelComponentEditor_BindingTables=BindingTables
-ModelComponentEditor_KeyBindings=KeyBindings
-ModelComponentEditor_Commands=Commands
-ModelComponentEditor_Menus=Menus
-ModelComponentEditor_UiChildren=UI-Children
-ModelComponentEditor_PartDescriptors=PartDescriptors
-ModelComponentEditor_DetailParentId=parentId
-ModelComponentEditor_MenuContributions=MenuContributions
-
-ModelComponentsEditor_Label=Model Components
-ModelComponentsEditor_Description=Some bla bla bla bla
-ModelComponentsEditor_ModelContributions=Model Contributions
-ModelComponentsEditor_Up=Up
-ModelComponentsEditor_Down=Down
-ModelComponentsEditor_Add=Add
-ModelComponentsEditor_Remove=Remove
-
 PartDescriptorEditor_Label=PartDescriptor
 PartDescriptorEditor_Descriptor=PartDescriptor Bla Bla Bla Bla
 PartDescriptorEditor_Id=Id
@@ -192,8 +144,6 @@ PartDescriptorEditor_Category=Category
 PartDescriptorEditor_PersitedState=Persited State
 PartDescriptorEditor_PersitedStateKey=Key
 PartDescriptorEditor_PersitedStateValue=Value
-PartDescriptorEditor_Add=Add ...
-PartDescriptorEditor_Remove=Remove
 PartDescriptorEditor_Variables=Variables
 PartDescriptorEditor_Properties=Properties
 PartDescriptorEditor_PropertiesKey=Key
@@ -214,10 +164,9 @@ PartEditor_Closeable=Closeable
 PartEditor_PersitedState=Persisted State
 PartEditor_PersitedStateKey=Key
 PartEditor_PersitedStateValue=Value
-PartEditor_Add=Add ...
-PartEditor_Remove=Remove
 PartEditor_Menus=Menus
 PartEditor_Handlers=Handlers
+PartEditor_ContainerData=Container Data
 PartEditor_ToolBar=ToolBar
 
 PartSashContainerEditor_Label=Sash
@@ -228,9 +177,6 @@ PartSashContainerEditor_Vertical=Vertical
 PartSashContainerEditor_Horizontal=Horizontal
 PartSashContainerEditor_SelectedElement=Selected Element
 PartSashContainerEditor_Controls=Controls
-PartSashContainerEditor_Up=Up
-PartSashContainerEditor_Down=Down
-PartSashContainerEditor_Remove=Remove
 PartSashContainerEditor_ContainerData=Container Data
 
 PartStackEditor_Label=Part Stack
@@ -238,9 +184,6 @@ PartStackEditor_Description=Stack bla bla bla
 PartStackEditor_Id=Id
 PartStackEditor_SelectedElement=Selected Element
 PartStackEditor_Parts=Parts
-PartStackEditor_Up=Up
-PartStackEditor_Down=Down
-PartStackEditor_Remove=Remove
 PartStackEditor_ContainerData=Container Data
 
 PerspectiveEditor_Label=Perspective
@@ -253,17 +196,12 @@ PerspectiveEditor_Tooltip=Tooltip
 PerspectiveEditor_IconURI=Icon URI
 PerspectiveEditor_Find=Find ...
 PerspectiveEditor_Controls=Controls
-PerspectiveEditor_Up=Up
-PerspectiveEditor_Down=Down
-PerspectiveEditor_Remove=Remove
-PartEditor_ContainerData=Container Data
 
 PerspectiveStackEditor_Label=Perspective Stack
 PerspectiveStackEditor_Description=Perspective Stack Bla Bla Bla
 PerspectiveStackEditor_Id=Id
 PerspectiveStackEditor_SelectedElement=Selected Element
 PerspectiveStackEditor_Perspectives=Perspectives
-PerspectiveStackEditor_Add=Add ...
 
 PlaceholderEditor_Label=Placeholder
 PlaceholderEditor_Descriptor=Placeholder Bla Bla Bla Bla
@@ -276,13 +214,10 @@ ToolBarEditor_Id=Id
 ToolBarEditor_ToolbarItems=Toolbar Items
 ToolBarEditor_ToolbarItemsType=Type
 ToolBarEditor_ToolbarItemsItemType=Item-Type
-ToolBarEditor_Up=Up
-ToolBarEditor_Down=Down
 ToolBarEditor_HandledToolItem=Handled ToolItem
 ToolBarEditor_DirectToolItem=Direct ToolItem
 ToolBarEditor_ToolControl=Tool Control
 ToolBarEditor_Separator=Separator
-ToolBarEditor_Remove=Remove
 
 ToolBarSeparatorEditor_Label=Separator
 ToolBarSeparatorEditor_Id=Id
@@ -298,10 +233,6 @@ VBindingTableEditor_Contexts=Contexts
 VBindingTableEditor_Name=Name
 VBindingTableEditor_LabelDescription=Description
 VBindingTableEditor_Id=Id
-VBindingTableEditor_Up=Up
-VBindingTableEditor_Down=Down
-VBindingTableEditor_Add=Add ...
-VBindingTableEditor_Remove=Remove
 
 AddonsEditor_Id=Id
 AddonsEditor_ClassURI=Class URI
@@ -316,21 +247,14 @@ MenuContributionEditor_Id=Id
 MenuContributionEditor_MenuItems=Menu Items
 MenuContributionEditor_MenuItemType=Type
 MenuContributionEditor_MenuItemItemType=Item Type
-MenuContributionEditor_Up=Up
-MenuContributionEditor_Down=Down
 MenuContributionEditor_HandledMenuItem=Handled MenuItem
 MenuContributionEditor_Separator=Separator
 MenuContributionEditor_Menu=Menu
 MenuContributionEditor_DirectMenuItem=Direct MenuItem
-MenuContributionEditor_Remove=Remove
 MenuContributionEditor_ParentId=Parent-Id
 MenuContributionEditor_Position=Position
 
 ModelFragmentsEditor_ModelFragments=Model Fragements
-ModelFragmentsEditor_Up=Up
-ModelFragmentsEditor_Down=Down
-ModelFragmentsEditor_Add=Add
-ModelFragmentsEditor_Remove=Remove
 ModelFragmentsEditor_Label=Model Fragments
 ModelFragmentsEditor_Description=Description
 
@@ -339,9 +263,6 @@ StringModelFragment_Description=String Model Fragment Bla Bla Bla
 StringModelFragment_Featurename=Featurename
 StringModelFragment_ParentId=Element Id
 StringModelFragment_PositionInList=Position in list
-StringModelFragment_Up=Up
-StringModelFragment_Down=Down
-StringModelFragment_Remove=Remove
 StringModelFragment_Elements=Elements
 StringModelFragment_Find=Find ...
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 53f4c33078..2575a50b8c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -222,7 +222,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.BindingTableEditor_Up);
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -249,7 +249,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.BindingTableEditor_Down);
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -276,7 +276,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.BindingTableEditor_Add);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -294,7 +294,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.BindingTableEditor_Remove);
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 4e55a7a0fb..817a4d3e55 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -375,17 +375,17 @@ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent even
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.CommandEditor_Up);
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.CommandEditor_Down);
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.CommandEditor_Add);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -402,7 +402,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.CommandEditor_Remove);
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index eda2300136..3ea808b921 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -188,7 +188,7 @@ public void keyPressed(KeyEvent e) {
 		});
 
 		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_AddNoEllipse);
+		b.setText(Messages.ModelTooling_Common_Add);
 		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
 		gd = new GridData(GridData.FILL, GridData.CENTER, false, false);
 		gd.verticalIndent = vIndent;
@@ -222,7 +222,7 @@ public void widgetSelected(SelectionEvent e) {
 		buttonComp.setLayout(gl);
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_Up);
+		b.setText(Messages.ModelTooling_Common_Up);
 		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_UP));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
@@ -249,7 +249,7 @@ public void widgetSelected(SelectionEvent e) {
 		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_Down);
+		b.setText(Messages.ModelTooling_Common_Down);
 		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_DOWN));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
@@ -276,7 +276,7 @@ public void widgetSelected(SelectionEvent e) {
 		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ControlFactory_Remove);
+		b.setText(Messages.ModelTooling_Common_Remove);
 		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_DELETE_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index 8ed2596dc2..a485953633 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -19,6 +17,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledMenuItemCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
@@ -67,7 +66,7 @@ public class HandledMenuItemEditor extends MenuItemEditor {
 	private IModelResource resource;
 
 	public HandledMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IModelResource resource) {
-		super(editingDomain,editor,project);
+		super(editingDomain, editor, project);
 		this.resource = resource;
 	}
 
@@ -234,17 +233,17 @@ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent even
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.HandledMenuItemEditor_Up);
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.HandledMenuItemEditor_Down);
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.HandledMenuItemEditor_Add);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -261,7 +260,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.HandledMenuItemEditor_Remove);
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.addSelectionListener(new SelectionAdapter() {
 
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index e0eb7458f7..11010d8259 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -19,6 +17,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledToolItemCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
@@ -223,17 +222,17 @@ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent even
 		buttonComp.setLayout(gl);
 
 		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.HandledToolItemEditor_Up);
+		b.setText(Messages.ModelTooling_Common_Up);
 		b.setImage(getImage(b.getDisplay(), ARROW_UP));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.HandledToolItemEditor_Down);
+		b.setText(Messages.ModelTooling_Common_Down);
 		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.HandledToolItemEditor_Add);
+		b.setText(Messages.ModelTooling_Common_AddEllipsis);
 		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
@@ -250,7 +249,7 @@ public void widgetSelected(SelectionEvent e) {
 		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.HandledToolItemEditor_Remove);
+		b.setText(Messages.ModelTooling_Common_Remove);
 		b.addSelectionListener(new SelectionAdapter() {
 
 			public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 05c8a27716..bf062fc6d6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -285,17 +285,17 @@ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent even
 		buttonComp.setLayout(gl);
 
 		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.KeyBindingEditor_Up);
+		b.setText(Messages.ModelTooling_Common_Up);
 		b.setImage(getImage(b.getDisplay(), ARROW_UP));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.KeyBindingEditor_Down);
+		b.setText(Messages.ModelTooling_Common_Down);
 		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.KeyBindingEditor_Add);
+		b.setText(Messages.ModelTooling_Common_AddEllipsis);
 		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
@@ -312,7 +312,7 @@ public void widgetSelected(SelectionEvent e) {
 		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.KeyBindingEditor_Remove);
+		b.setText(Messages.ModelTooling_Common_Remove);
 		b.addSelectionListener(new SelectionAdapter() {
 
 			public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 0be1b71242..a8b64ddf8b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -246,7 +246,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.MenuContributionEditor_Up);
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -273,7 +273,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.MenuContributionEditor_Down);
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -338,7 +338,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.MenuContributionEditor_Remove);
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 33d7513cdb..caef11f362 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -281,7 +281,7 @@ public void widgetSelected(SelectionEvent e) {
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.MenuEditor_Up);
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -308,7 +308,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.MenuEditor_Down);
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -373,7 +373,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.MenuEditor_Remove);
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index 708cd12b60..056746d27a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -10,56 +10,45 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-
-import java.util.ArrayList;
-import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-
-import org.eclipse.core.databinding.observable.list.WritableList;
-
-import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
-
-
-import org.eclipse.e4.ui.model.fragment.MModelFragment;
-
-import org.eclipse.e4.ui.model.fragment.MModelFragments;
-
-import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
-
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
+import org.eclipse.e4.ui.model.fragment.MModelFragment;
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -75,12 +64,12 @@ public class ModelFragmentsEditor extends AbstractComponentEditor {
 
 	private IListProperty MODEL_FRAGMENTS__FRAGMENTS = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
 	private IListProperty MODEL_FRAGMENTS__IMPORTS = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
-	
+
 	private Composite composite;
 	private Image image;
 
 	public ModelFragmentsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
@@ -118,19 +107,19 @@ public Composite getEditor(Composite parent, Object object) {
 	private Composite createForm(Composite parent) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
-		
+
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Imports");
-			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
-			
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 200;
 			viewer.getControl().setLayoutData(gd);
-			
+
 			IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
@@ -219,7 +208,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 			List<FeatureClass> list = new ArrayList<FeatureClass>();
 			addClasses(ApplicationPackageImpl.eINSTANCE, list);
 			list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
-			
+
 			childrenDropDown.setInput(list);
 			childrenDropDown.getCombo().select(0);
 
@@ -263,7 +252,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ModelFragmentsEditor_ModelFragments);
-			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
@@ -285,7 +274,7 @@ public void widgetSelected(SelectionEvent e) {
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelFragmentsEditor_Up);
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -312,7 +301,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelFragmentsEditor_Down);
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -339,7 +328,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelFragmentsEditor_Add);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -357,7 +346,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelFragmentsEditor_Remove);
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -392,7 +381,7 @@ public void addClasses(EPackage ePackage, List<FeatureClass> list) {
 			addClasses(eSubPackage, list);
 		}
 	}
-	
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		WritableList list = new WritableList();
@@ -408,7 +397,7 @@ protected boolean accepted(Object o) {
 				return true;
 			}
 		});
-		
+
 		return list;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 8f1d50c42e..b8f0bb6453 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -399,14 +399,16 @@ public String getText(Object element) {
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.PartDescriptorEditor_Add);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			// FIXME Implementation is missing
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.PartDescriptorEditor_Remove);
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			// FIXME Implementation is missing
 		}
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 01f8d314df..843bebdccf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -382,14 +382,16 @@ public String getText(Object element) {
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.PartEditor_Add);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			// FIXME Implementation is missing
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.PartEditor_Remove);
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			// FIXME Implementation is missing
 		}
 
 		ControlFactory.createStringListWidget(parent, this, "Variables", UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 1435e6e19e..8ac7960107 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -238,7 +238,7 @@ public String getText(Object element) {
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.PartSashContainerEditor_Up);
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -265,7 +265,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.PartSashContainerEditor_Down);
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -325,7 +325,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.PartSashContainerEditor_Remove);
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 6c82eb7bf0..f7fcc3eabb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -197,7 +197,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.PartStackEditor_Up);
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -224,7 +224,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.PartStackEditor_Down);
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -282,7 +282,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.PartStackEditor_Remove);
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 65528d5a34..d162074a25 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -266,7 +266,7 @@ public void widgetSelected(SelectionEvent e) {
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.PerspectiveEditor_Up);
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -293,7 +293,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.PerspectiveEditor_Down);
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -353,7 +353,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.PerspectiveEditor_Remove);
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 46f968a2fc..3790fb4496 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -182,7 +182,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.PartStackEditor_Up);
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -209,7 +209,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.PartStackEditor_Down);
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -237,7 +237,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setText(Messages.PerspectiveStackEditor_Add);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -254,7 +254,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.PartStackEditor_Remove);
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 0bc7185bda..460341cf82 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -10,80 +10,58 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.jface.viewers.Viewer;
-
-import org.eclipse.jface.viewers.ViewerComparator;
-
-import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FeatureSelectionDialog;
-
-import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
-
-import org.eclipse.emf.ecore.EPackage;
-
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
-
+import java.util.List;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FeatureSelectionDialog;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-
-import org.eclipse.emf.ecore.EClassifier;
-
 import org.eclipse.e4.ui.model.fragment.MModelFragment;
-
-import java.util.List;
+import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
+import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.TableViewer;
-
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;
-
-import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
-
-import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.emf.databinding.EMFProperties;
-
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.emf.edit.domain.EditingDomain;
-
-import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class StringModelFragment extends AbstractComponentEditor {
 	private Composite composite;
@@ -93,7 +71,7 @@ public class StringModelFragment extends AbstractComponentEditor {
 	private IListProperty MODEL_FRAGMENT__ELEMENTS = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
 
 	public StringModelFragment(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
@@ -160,27 +138,27 @@ private Composite createForm(Composite parent) {
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			comp.setLayoutData(gd);
-			GridLayout gl = new GridLayout(2,false);
-			gl.marginWidth=gl.marginHeight=0;
-			gl.verticalSpacing=0;
-			gl.marginLeft=gl.marginBottom=gl.marginRight=gl.marginTop=0;
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginWidth = gl.marginHeight = 0;
+			gl.verticalSpacing = 0;
+			gl.marginLeft = gl.marginBottom = gl.marginRight = gl.marginTop = 0;
 			comp.setLayout(gl);
-			
+
 			Text t = new Text(comp, SWT.BORDER);
 			gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME).observeDetail(getMaster()));
-			
+
 			final Button button = new Button(comp, SWT.PUSH | SWT.FLAT);
 			button.setText(Messages.StringModelFragment_Find);
 			button.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					FeatureSelectionDialog dialog = new FeatureSelectionDialog(button.getShell(),getEditingDomain(),(MStringModelFragment) getMaster().getValue());
+					FeatureSelectionDialog dialog = new FeatureSelectionDialog(button.getShell(), getEditingDomain(), (MStringModelFragment) getMaster().getValue());
 					dialog.open();
 				}
 			});
-			
+
 		}
 
 		{
@@ -199,7 +177,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.StringModelFragment_Elements);
-			l.setLayoutData(new GridData(GridData.END,GridData.BEGINNING,false,false));
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
@@ -221,7 +199,7 @@ public void widgetSelected(SelectionEvent e) {
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.StringModelFragment_Up);
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -248,7 +226,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.StringModelFragment_Down);
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -296,7 +274,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 			List<FeatureClass> list = new ArrayList<FeatureClass>();
 			addClasses(ApplicationPackageImpl.eINSTANCE, list);
 			list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
-			
+
 			childrenDropDown.setInput(list);
 			childrenDropDown.getCombo().select(0);
 
@@ -319,7 +297,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.StringModelFragment_Remove);
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 220e61d440..95898f7a40 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -248,7 +248,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ToolBarEditor_Up);
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -275,7 +275,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ToolBarEditor_Down);
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -340,7 +340,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ToolBarEditor_Remove);
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 8a644d3134..bf1fde9485 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -214,7 +214,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ToolBarEditor_Up);
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -241,7 +241,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ToolBarEditor_Down);
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -306,7 +306,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ToolBarEditor_Remove);
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {

From fac4211813807a47373ef45150056b367db4174f Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 5 Jul 2010 22:39:11 +0000
Subject: [PATCH 0179/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * cleaning up translations

---
 .../e4/tools/emf/ui/internal/Messages.java    | 22 +--------
 .../tools/emf/ui/internal/Messages.properties | 22 +--------
 .../common/component/AddonsEditor.java        | 45 +++++++++----------
 .../common/component/ApplicationEditor.java   |  2 +-
 .../common/component/BindingTableEditor.java  |  4 +-
 .../common/component/CommandEditor.java       |  2 +-
 .../common/component/HandlerEditor.java       |  2 +-
 .../common/component/KeyBindingEditor.java    |  2 +-
 .../component/MenuContributionEditor.java     |  2 +-
 .../internal/common/component/MenuEditor.java |  2 +-
 .../common/component/MenuItemEditor.java      |  2 +-
 .../common/component/MenuSeparatorEditor.java |  2 +-
 .../component/PartDescriptorEditor.java       |  2 +-
 .../internal/common/component/PartEditor.java |  2 +-
 .../component/PartSashContainerEditor.java    |  2 +-
 .../common/component/PartStackEditor.java     |  2 +-
 .../common/component/PerspectiveEditor.java   |  2 +-
 .../component/PerspectiveStackEditor.java     |  2 +-
 .../common/component/PlaceholderEditor.java   |  2 +-
 .../component/ToolBarContributionEditor.java  |  2 +-
 .../common/component/ToolBarEditor.java       |  2 +-
 .../component/ToolBarSeparatorEditor.java     |  2 +-
 .../common/component/ToolControlEditor.java   |  2 +-
 .../component/TrimContributionEditor.java     |  2 +-
 24 files changed, 46 insertions(+), 87 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 562e7a2ffb..d6a6cf23b0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -18,12 +18,12 @@ public class Messages {
 	public static String ModelTooling_Common_AddEllipsis;
 	public static String ModelTooling_Common_Add;
 	public static String ModelTooling_Common_Remove;
+	public static String ModelTooling_Common_Id;
 
 	public static String AbstractCommandSelectionDialog_Label_CommandId;
 
 	public static String ApplicationEditor_Label;
 	public static String ApplicationEditor_Description;
-	public static String ApplicationEditor_Id;
 	public static String ApplicationEditor_Handlers;
 	public static String ApplicationEditor_PartDescriptors;
 	public static String ApplicationEditor_BindingTables;
@@ -36,7 +36,6 @@ public class Messages {
 
 	public static String BindingTableEditor_Label;
 	public static String BindingTableEditor_Description;
-	public static String BindingTableEditor_Id;
 	public static String BindingTableEditor_ContextId;
 	public static String BindingTableEditor_Find;
 	public static String BindingTableEditor_Keybindings;
@@ -45,7 +44,6 @@ public class Messages {
 
 	public static String CommandEditor_Label;
 	public static String CommandEditor_Description;
-	public static String CommandEditor_Id;
 	public static String CommandEditor_Name;
 	public static String CommandEditor_LabelDescription;
 	public static String CommandEditor_Parameters;
@@ -90,7 +88,6 @@ public class Messages {
 
 	public static String HandlerEditor_Label;
 	public static String HandlerEditor_Description;
-	public static String HandlerEditor_Id;
 	public static String HandlerEditor_Command;
 	public static String HandlerEditor_Find;
 	public static String HandlerEditor_ClassURI;
@@ -100,7 +97,6 @@ public class Messages {
 
 	public static String KeyBindingEditor_Label;
 	public static String KeyBindingEditor_Description;
-	public static String KeyBindingEditor_Id;
 	public static String KeyBindingEditor_Sequence;
 	public static String KeyBindingEditor_Command;
 	public static String KeyBindingEditor_Find;
@@ -110,7 +106,6 @@ public class Messages {
 
 	public static String MenuEditor_Label;
 	public static String MenuEditor_Description;
-	public static String MenuEditor_Id;
 	public static String MenuEditor_MenuItems;
 	public static String MenuEditor_MenuItemType;
 	public static String MenuEditor_MenuItemItemType;
@@ -122,7 +117,6 @@ public class Messages {
 	public static String MenuEditor_Tooltip;
 	public static String MenuEditor_IconURI;
 
-	public static String MenuItemEditor_Id;
 	public static String MenuItemEditor_Type;
 	public static String MenuItemEditor_Label;
 	public static String MenuItemEditor_Tooltip;
@@ -131,11 +125,9 @@ public class Messages {
 	public static String MenuEditor_MainMenu;
 
 	public static String MenuSeparatorEditor_Label;
-	public static String MenuSeparatorEditor_Id;
 
 	public static String PartDescriptorEditor_Label;
 	public static String PartDescriptorEditor_Descriptor;
-	public static String PartDescriptorEditor_Id;
 	public static String PartDescriptorEditor_LabelLabel;
 	public static String PartDescriptorEditor_Tooltip;
 	public static String PartDescriptorEditor_IconURI;
@@ -158,7 +150,6 @@ public class Messages {
 
 	public static String PartEditor_Label;
 	public static String PartEditor_Description;
-	public static String PartEditor_Id;
 	public static String PartEditor_LabelLabel;
 	public static String PartEditor_Tooltip;
 	public static String PartEditor_IconURI;
@@ -175,7 +166,6 @@ public class Messages {
 
 	public static String PartSashContainerEditor_Label;
 	public static String PartSashContainerEditor_Description;
-	public static String PartSashContainerEditor_Id;
 	public static String PartSashContainerEditor_Orientation;
 	public static String PartSashContainerEditor_Vertical;
 	public static String PartSashContainerEditor_Horizontal;
@@ -185,14 +175,12 @@ public class Messages {
 
 	public static String PartStackEditor_Label;
 	public static String PartStackEditor_Description;
-	public static String PartStackEditor_Id;
 	public static String PartStackEditor_SelectedElement;
 	public static String PartStackEditor_Parts;
 	public static String PartStackEditor_ContainerData;
 
 	public static String PerspectiveEditor_Label;
 	public static String PerspectiveEditor_Description;
-	public static String PerspectiveEditor_Id;
 	public static String PerspectiveEditor_LabelLabel;
 	public static String PerspectiveEditor_SelectedElement;
 	public static String PerspectiveEditor_Tooltip;
@@ -203,17 +191,14 @@ public class Messages {
 	public static String PerspectiveStackEditor_Perspectives;
 	public static String PerspectiveStackEditor_Label;
 	public static String PerspectiveStackEditor_Description;
-	public static String PerspectiveStackEditor_Id;
 	public static String PerspectiveStackEditor_SelectedElement;
 
 	public static String PlaceholderEditor_Label;
 	public static String PlaceholderEditor_Descriptor;
-	public static String PlaceholderEditor_Id;
 	public static String PlaceholderEditor_FindReference;
 
 	public static String ToolBarEditor_Label;
 	public static String ToolBarEditor_Description;
-	public static String ToolBarEditor_Id;
 	public static String ToolBarEditor_ToolbarItems;
 	public static String ToolBarEditor_ToolbarItemsType;
 	public static String ToolBarEditor_ToolbarItemsItemType;
@@ -223,11 +208,9 @@ public class Messages {
 	public static String ToolBarEditor_Separator;
 
 	public static String ToolBarSeparatorEditor_Label;
-	public static String ToolBarSeparatorEditor_Id;
 
 	public static String ToolControlEditor_Label;
 	public static String ToolControlEditor_Description;
-	public static String ToolControlEditor_Id;
 	public static String ToolControlEditor_ClassURI;
 
 	public static String VBindingTableEditor_Label;
@@ -235,9 +218,7 @@ public class Messages {
 	public static String VBindingTableEditor_Contexts;
 	public static String VBindingTableEditor_Name;
 	public static String VBindingTableEditor_LabelDescription;
-	public static String VBindingTableEditor_Id;
 
-	public static String AddonsEditor_Id;
 	public static String AddonsEditor_ClassURI;
 	public static String AddonsEditor_Find;
 
@@ -246,7 +227,6 @@ public class Messages {
 	public static String ContributionClassDialog_Label_Classname;
 	public static String ContributionClassDialog_ShellTitle;
 
-	public static String MenuContributionEditor_Id;
 	public static String MenuContributionEditor_MenuItems;
 	public static String MenuContributionEditor_MenuItemType;
 	public static String MenuContributionEditor_MenuItemItemType;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index d4580dfa9e..ce6235777c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -13,12 +13,12 @@ ModelTooling_Common_Down=Down
 ModelTooling_Common_AddEllipsis=Add ...
 ModelTooling_Common_Add=Add
 ModelTooling_Common_Remove=Remove
+ModelTooling_Common_Id=Id
 
 AbstractCommandSelectionDialog_Label_CommandId=Command-Id
 
 ApplicationEditor_Label=Application
 ApplicationEditor_Description=Application bla, bla, bla
-ApplicationEditor_Id=Id
 ApplicationEditor_Handlers=Handlers
 ApplicationEditor_PartDescriptors=Part Descriptors
 ApplicationEditor_BindingTables=BindingTables
@@ -31,7 +31,6 @@ ApplicationEditor_TrimContributions=Trim Contributions
 
 BindingTableEditor_Label=BindingTable
 BindingTableEditor_Description=BindingTable bla bla bla
-BindingTableEditor_Id=Id
 BindingTableEditor_ContextId=Context Id
 BindingTableEditor_Find=Find ...
 BindingTableEditor_Keybindings=Keybindings
@@ -40,7 +39,6 @@ BindingTableEditor_Command=Command
 
 CommandEditor_Label=Command
 CommandEditor_Description=Command bla bla bla
-CommandEditor_Id=Id
 CommandEditor_Name=Name
 CommandEditor_LabelDescription=Description
 CommandEditor_Parameters=Parameters
@@ -85,7 +83,6 @@ HandledToolItemEditor_Description=Handled Tool Item bla bla bla
 
 HandlerEditor_Label=Handler
 HandlerEditor_Description=Handler bla bla bla
-HandlerEditor_Id=Id
 HandlerEditor_Command=Command
 HandlerEditor_Find=Find ...
 HandlerEditor_ClassURI=Class URI
@@ -95,7 +92,6 @@ InputPartEditor_InputURI=Input URI
 
 KeyBindingEditor_Label=Binding
 KeyBindingEditor_Description=Binding bla bla bla
-KeyBindingEditor_Id=Id
 KeyBindingEditor_Sequence=Sequence
 KeyBindingEditor_Command=Command
 KeyBindingEditor_Find=Find ...
@@ -105,7 +101,6 @@ KeyBindingEditor_ParametersValue=Value
 
 MenuEditor_Label=Menu
 MenuEditor_Description=Menu bla bla bla
-MenuEditor_Id=Id
 MenuEditor_MenuItems=MenuItems
 MenuEditor_MenuItemType=Type
 MenuEditor_MenuItemItemType=Item Type
@@ -118,7 +113,6 @@ MenuEditor_Tooltip=Tooltip
 MenuEditor_IconURI=Icon URI
 MenuEditor_MainMenu=Main Menu
 
-MenuItemEditor_Id=Id
 MenuItemEditor_Type=Type
 MenuItemEditor_Label=Label
 MenuItemEditor_Tooltip=Tooltip
@@ -127,11 +121,9 @@ MenuItemEditor_Find=Find ...
 
 
 MenuSeparatorEditor_Label=Separator
-MenuSeparatorEditor_Id=Id
 
 PartDescriptorEditor_Label=PartDescriptor
 PartDescriptorEditor_Descriptor=PartDescriptor Bla Bla Bla Bla
-PartDescriptorEditor_Id=Id
 PartDescriptorEditor_LabelLabel=Label
 PartDescriptorEditor_Tooltip=Tooltip
 PartDescriptorEditor_IconURI=Icon URI
@@ -154,7 +146,6 @@ PartDescriptorEditor_ContainerData=Container Data
 
 PartEditor_Label=Part
 PartEditor_Description=Part Bla Bla Bla Bla
-PartEditor_Id=Id
 PartEditor_LabelLabel=Label
 PartEditor_Tooltip=Tooltip
 PartEditor_IconURI=Icon URI
@@ -171,7 +162,6 @@ PartEditor_ToolBar=ToolBar
 
 PartSashContainerEditor_Label=Sash
 PartSashContainerEditor_Description=Sash bla bla bla
-PartSashContainerEditor_Id=Id
 PartSashContainerEditor_Orientation=Orientation
 PartSashContainerEditor_Vertical=Vertical
 PartSashContainerEditor_Horizontal=Horizontal
@@ -181,14 +171,12 @@ PartSashContainerEditor_ContainerData=Container Data
 
 PartStackEditor_Label=Part Stack
 PartStackEditor_Description=Stack bla bla bla
-PartStackEditor_Id=Id
 PartStackEditor_SelectedElement=Selected Element
 PartStackEditor_Parts=Parts
 PartStackEditor_ContainerData=Container Data
 
 PerspectiveEditor_Label=Perspective
 PerspectiveEditor_Description=Perspective Bla Bla Bla
-PerspectiveEditor_Id=Id
 PerspectiveEditor_LabelLabel=Label	
 PerspectiveEditor_SelectedElement=Selected Element
 PerspectiveEditor_Label=Label
@@ -199,18 +187,15 @@ PerspectiveEditor_Controls=Controls
 
 PerspectiveStackEditor_Label=Perspective Stack
 PerspectiveStackEditor_Description=Perspective Stack Bla Bla Bla
-PerspectiveStackEditor_Id=Id
 PerspectiveStackEditor_SelectedElement=Selected Element
 PerspectiveStackEditor_Perspectives=Perspectives
 
 PlaceholderEditor_Label=Placeholder
 PlaceholderEditor_Descriptor=Placeholder Bla Bla Bla Bla
-PlaceholderEditor_Id=Id
 PlaceholderEditor_FindReference=Find ...
 
 ToolBarEditor_Label=Toolbar
 ToolBarEditor_Description=Toolbar bla bla bla
-ToolBarEditor_Id=Id
 ToolBarEditor_ToolbarItems=Toolbar Items
 ToolBarEditor_ToolbarItemsType=Type
 ToolBarEditor_ToolbarItemsItemType=Item-Type
@@ -220,11 +205,9 @@ ToolBarEditor_ToolControl=Tool Control
 ToolBarEditor_Separator=Separator
 
 ToolBarSeparatorEditor_Label=Separator
-ToolBarSeparatorEditor_Id=Id
 
 ToolControlEditor_Label=ToolControl
 ToolControlEditor_Description=ToolControl bla bla bla
-ToolControlEditor_Id=Id
 ToolControlEditor_ClassURI=Class URI
 
 VBindingTableEditor_Label=Binding Configuration
@@ -232,9 +215,7 @@ VBindingTableEditor_Description=Binding Configuration Bla Bla Bla Bla
 VBindingTableEditor_Contexts=Contexts
 VBindingTableEditor_Name=Name
 VBindingTableEditor_LabelDescription=Description
-VBindingTableEditor_Id=Id
 
-AddonsEditor_Id=Id
 AddonsEditor_ClassURI=Class URI
 AddonsEditor_Find=Find ...
 
@@ -243,7 +224,6 @@ ContributionClassDialog_DialogTitle=Find Contribution Class
 ContributionClassDialog_Label_Classname=Classname
 ContributionClassDialog_ShellTitle=Find Contribution Class
 
-MenuContributionEditor_Id=Id
 MenuContributionEditor_MenuItems=Menu Items
 MenuContributionEditor_MenuItemType=Type
 MenuContributionEditor_MenuItemItemType=Item Type
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 9b75c4e5a5..33cfabc375 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -48,15 +48,15 @@ public class AddonsEditor extends AbstractComponentEditor {
 	private IProject project;
 	private Image image;
 	private EStackLayout stackLayout;
-	
+
 	public AddonsEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 		this.project = project;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if( image == null ) {
+		if (image == null) {
 			try {
 				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
@@ -76,8 +76,8 @@ public String getLabel(Object element) {
 	@Override
 	public String getDetailLabel(Object element) {
 		MContribution contrib = (MContribution) element;
-		if( contrib.getContributionURI() != null && contrib.getContributionURI().trim().length() > 0 ) {
-			return contrib.getContributionURI().substring(contrib.getContributionURI().lastIndexOf('/')+1);
+		if (contrib.getContributionURI() != null && contrib.getContributionURI().trim().length() > 0) {
+			return contrib.getContributionURI().substring(contrib.getContributionURI().lastIndexOf('/') + 1);
 		}
 		return null;
 	}
@@ -101,49 +101,48 @@ public Composite getEditor(Composite parent, Object object) {
 				composite = createForm(parent, context, getMaster(), false);
 			}
 		}
-		
-		if( getEditor().isModelFragment() ) {
+
+		if (getEditor().isModelFragment()) {
 			Control topControl;
-			if( Util.isImport((EObject) object) ) {
+			if (Util.isImport((EObject) object)) {
 				topControl = composite.getChildren()[1];
 			} else {
-				topControl = composite.getChildren()[0];				
+				topControl = composite.getChildren()[0];
 			}
-			
-			if( stackLayout.topControl != topControl ) {
+
+			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
 				composite.layout(true, true);
 			}
 		}
-		
+
 		getMaster().setValue(object);
 		return composite;
 	}
-	
+
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		
-		if( getEditor().isModelFragment() && isImport ) {
+		if (getEditor().isModelFragment() && isImport) {
 			ControlFactory.createFindImport(parent, this, context);
 			return parent;
 		}
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.AddonsEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -152,21 +151,21 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()));
 
-			final Button b = new Button(parent, SWT.PUSH|SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setText(Messages.AddonsEditor_Find);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(),project,getEditingDomain(),(MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
 					dialog.open();
 				}
 			});
 		}
-		
-//		ControlFactory.createBindingsWidget(parent, this);
+
+		// ControlFactory.createBindingsWidget(parent, this);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 3d19f4294e..b8d3d431bc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -119,7 +119,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ApplicationEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 2575a50b8c..f0a68af973 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -143,7 +143,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.BindingTableEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
@@ -204,7 +204,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
 
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText(Messages.BindingTableEditor_Id);
+				column.getColumn().setText(Messages.ModelTooling_Common_Id);
 				column.getColumn().setWidth(170);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 817a4d3e55..bf2cbff690 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -145,7 +145,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.CommandEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 4caa6b8315..b90df2b255 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -133,7 +133,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.HandlerEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index bf062fc6d6..822cb8db1a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -148,7 +148,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.KeyBindingEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index a8b64ddf8b..83d4fd7425 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -166,7 +166,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuContributionEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index caef11f362..fee9dce6f6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -165,7 +165,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 662a124d85..2029c67fa9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -131,7 +131,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuItemEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 8479ac77ea..982db2a1d0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -122,7 +122,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuSeparatorEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index b8f0bb6453..eb71055b85 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -162,7 +162,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartDescriptorEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 843bebdccf..f447bbc457 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -165,7 +165,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 8ac7960107..cade3f6e8c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -165,7 +165,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartSashContainerEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index f7fcc3eabb..30fec8bb92 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -146,7 +146,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartStackEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index d162074a25..473640cae1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -168,7 +168,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PerspectiveEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 3790fb4496..50e532ce14 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -144,7 +144,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PerspectiveStackEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index b0571a0da3..82bca30ceb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -160,7 +160,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PlaceholderEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 95898f7a40..9423592a8b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -168,7 +168,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuContributionEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index bf1fde9485..8af7fc1e2c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -160,7 +160,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ToolBarEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index a8eeac79d9..ed85e5d34a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -122,7 +122,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ToolBarSeparatorEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index f1344ce398..93ea8cf9e2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -137,7 +137,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ToolControlEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index d3fa9a9a11..6444965798 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -163,7 +163,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuContributionEditor_Id);
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);

From d5babb78ea4d6f8ebf338c945b55e2c8c549fef8 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 5 Jul 2010 23:01:35 +0000
Subject: [PATCH 0180/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * adding editor for CommandParameter

---
 .../full/modelelements/CommandParameter.gif   | Bin 0 -> 612 bytes
 .../emf/ui/internal/common/ModelEditor.java   |   2 +
 .../common/component/CommandEditor.java       | 247 +++++-------------
 .../component/CommandParameterEditor.java     | 158 +++++++++++
 4 files changed, 226 insertions(+), 181 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b7f03d5679831bf19ec4643b6e079722414aa1d8
GIT binary patch
literal 612
zcmV-q0-OCuNk%w1VGsZi0OkMyZiB9Kh_ZExvwM%XfRww0nZAsl!-}54k)_7~RhBe&
ztAnh}%iZcUZ;$f(|Jd~Z-Sz+L`Ty+t|Lyw!^!)$#{r~d(|N8#_I*M6ClU_1}Nj{ZU
zM3`Gclv_!WU9-}>Erdjey_KcUuuYd=bhLwjxQ>v)oTJXIzS_mc+{?z=%h%-EJd;jC
zmsLTMQb?LvN}F3vmR(?{a8{CIa<G4axQ%nMe@2;8L5)sMm|9YpUObIRN|RJknp<6@
zXxZl5FMK#loK#JhR$HWFDt$6Fggr%#Oi!LxRG?hI)xs}-H9n6-M36~3cRp35Tei};
zH;g+rb~;FyOge}?M3Y8rq;0UyvAEN@P@Yh&%dM@-t+&v(_4xI;(zjimSX7TsT9Q<B
zwrp{xXG(}WY@=Uqq+o2LS<BqTa;9EoqezCdZilpPmb!tGxp=zRrh&9roz-B4&MuzS
zUzopbuHJI4+;;o__WAzs{{Q&@|NsC0{{R30000000000000000A^8LW004RbEC2ui
z01yBW000NUfO>i#VN@P5H7J6Miy=aBbaQNCIwFjMDm-g$cXDrSYB?*HGG1s&d3JDV
zWn?y&IAC8}d3ktsW>q7X8ck7JwRvY_GZ~j4N<>+;S4BWQ9hWpaOjdbMMoUL7C6_-e
zQe9V5P*_1QTm}UL0RVa@Ej~j?PB$+Mmy0PR8yFlWTomX*aDadScX}2?sF0vSg$oJt
y2}%ILL4yPq7!E9WP>_NL5++D!KtZ5H1{f`<On{G|L4<l3C`gb%0ls{J0027(lNee6

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index a178632bb7..bddaaf4112 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -51,6 +51,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.BindingContextEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.BindingTableEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CommandEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.CommandParameterEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectMenuItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledMenuItemEditor;
@@ -553,6 +554,7 @@ private void registerDefaultEditors() {
 		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain(), this, modelProvider));
 		registerEditor(CommandsPackageImpl.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(), this, modelProvider, project));
 		registerEditor(CommandsPackageImpl.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(CommandsPackageImpl.Literals.COMMAND_PARAMETER, new CommandParameterEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(CommandsPackageImpl.Literals.BINDING_TABLE, new BindingTableEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(CommandsPackageImpl.Literals.BINDING_CONTEXT, new BindingContextEditor(modelProvider.getEditingDomain(), this));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index bf2cbff690..d02a3afb3d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -12,13 +12,14 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.MCommandParameter;
@@ -28,29 +29,20 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnViewerEditor;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
-import org.eclipse.jface.viewers.ComboBoxCellEditor;
-import org.eclipse.jface.viewers.EditingSupport;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.TableViewerEditor;
-import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -70,6 +62,8 @@ public class CommandEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private EStackLayout stackLayout;
 
+	private IEMFEditListProperty COMMAND__PARAMETERS = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
+
 	public CommandEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
 	}
@@ -191,177 +185,12 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			final TableViewer viewer = new TableViewer(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.BORDER);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			viewer.getTable().setHeaderVisible(true);
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 120;
 			viewer.getControl().setLayoutData(gd);
 
-			{
-				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText(Messages.CommandEditor_ParameterId);
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MCommandParameter>(prop.observeDetail(cp.getKnownElements())));
-				column.setEditingSupport(new EditingSupport(viewer) {
-					private TextCellEditor editor = new TextCellEditor(viewer.getTable());
-
-					@Override
-					protected void setValue(Object element, Object value) {
-						if (value.toString().trim().length() == 0) {
-							value = null;
-						}
-
-						Command cmd = SetCommand.create(getEditingDomain(), element, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, value);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-
-					@Override
-					protected Object getValue(Object element) {
-						MCommandParameter obj = (MCommandParameter) element;
-						return obj.getElementId() != null ? obj.getElementId() : ""; //$NON-NLS-1$
-					}
-
-					@Override
-					protected CellEditor getCellEditor(Object element) {
-						return editor;
-					}
-
-					@Override
-					protected boolean canEdit(Object element) {
-						return true;
-					}
-				});
-			}
-
-			{
-				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText(Messages.CommandEditor_ParameterName);
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MCommandParameter>(prop.observeDetail(cp.getKnownElements())));
-				column.setEditingSupport(new EditingSupport(viewer) {
-					private TextCellEditor editor = new TextCellEditor(viewer.getTable());
-
-					@Override
-					protected void setValue(Object element, Object value) {
-						Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME, value);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-
-					@Override
-					protected Object getValue(Object element) {
-						MCommandParameter obj = (MCommandParameter) element;
-						return obj.getName() != null ? obj.getName() : ""; //$NON-NLS-1$
-					}
-
-					@Override
-					protected CellEditor getCellEditor(Object element) {
-						return editor;
-					}
-
-					@Override
-					protected boolean canEdit(Object element) {
-						return true;
-					}
-				});
-			}
-
-			{
-				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__TYPE_ID);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText(Messages.CommandEditor_ParameterTypeId);
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MCommandParameter>(prop.observeDetail(cp.getKnownElements())));
-				column.setEditingSupport(new EditingSupport(viewer) {
-					private TextCellEditor editor = new TextCellEditor(viewer.getTable());
-
-					@Override
-					protected void setValue(Object element, Object value) {
-						Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.COMMAND_PARAMETER__TYPE_ID, value);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-
-					@Override
-					protected Object getValue(Object element) {
-						MCommandParameter obj = (MCommandParameter) element;
-						return obj.getTypeId() != null ? obj.getTypeId() : ""; //$NON-NLS-1$
-					}
-
-					@Override
-					protected CellEditor getCellEditor(Object element) {
-						return editor;
-					}
-
-					@Override
-					protected boolean canEdit(Object element) {
-						return true;
-					}
-				});
-			}
-
-			{
-				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__OPTIONAL);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText(Messages.CommandEditor_ParameterOptional);
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MCommandParameter>(prop.observeDetail(cp.getKnownElements())) {
-					@Override
-					public String getText(MCommandParameter element) {
-						return element.isOptional() ? Messages.CommandEditor_ParameterOptional_Yes : Messages.CommandEditor_ParameterOptional_No;
-					}
-				});
-				column.setEditingSupport(new EditingSupport(viewer) {
-					private ComboBoxCellEditor editor = new ComboBoxCellEditor(viewer.getTable(), new String[] { Messages.CommandEditor_ParameterOptional_Yes, Messages.CommandEditor_ParameterOptional_No });
-
-					@Override
-					protected void setValue(Object element, Object value) {
-						int idx = ((Number) value).intValue();
-						Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.COMMAND_PARAMETER__OPTIONAL, idx == 0);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-
-					@Override
-					protected Object getValue(Object element) {
-						MCommandParameter obj = (MCommandParameter) element;
-						return obj.isOptional() ? 0 : 1;
-					}
-
-					@Override
-					protected CellEditor getCellEditor(Object element) {
-						return editor;
-					}
-
-					@Override
-					protected boolean canEdit(Object element) {
-						return true;
-					}
-				});
-			}
-
-			ColumnViewerEditorActivationStrategy editorActivationStrategy = new ColumnViewerEditorActivationStrategy(viewer) {
-				@Override
-				protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
-					boolean singleSelect = ((IStructuredSelection) viewer.getSelection()).size() == 1;
-					boolean isLeftDoubleMouseSelect = event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION && ((MouseEvent) event.sourceEvent).button == 1;
-
-					return singleSelect && (isLeftDoubleMouseSelect || event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC || event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
-				}
-			};
-			TableViewerEditor.create(viewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
-
 			IEMFEditListProperty mProp = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
 			viewer.setInput(mProp.observeDetail(getMaster()));
 
@@ -378,11 +207,55 @@ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent even
 			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MCommand container = (MCommand) getMaster().getValue();
+							int idx = container.getParameters().indexOf(obj) - 1;
+							if (idx >= 0) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MCommand container = (MCommand) getMaster().getValue();
+							int idx = container.getParameters().indexOf(obj) + 1;
+							if (idx < container.getParameters().size()) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
@@ -396,7 +269,7 @@ public void widgetSelected(SelectionEvent e) {
 
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						viewer.editElement(param, 0);
+						getEditor().setSelection(param);
 					}
 				}
 			});
@@ -405,6 +278,18 @@ public void widgetSelected(SelectionEvent e) {
 			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS, keybinding);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
 		}
 
 		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
@@ -414,7 +299,7 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		return null;
+		return COMMAND__PARAMETERS.observe(element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
new file mode 100644
index 0000000000..d3ffd1f40c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -0,0 +1,158 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.commands.MCommandParameter;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+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;
+
+public class CommandParameterEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private Image image;
+	private EMFDataBindingContext context;
+
+	private EStackLayout stackLayout;
+
+	public CommandParameterEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain, editor);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if (image == null) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif")); //$NON-NLS-1$
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Command Parameter";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		MCommandParameter param = (MCommandParameter) element;
+		if (param.getName() != null && param.getName().trim().length() > 0) {
+			return param.getName().trim();
+		} else if (param.getElementId() != null && param.getElementId().trim().length() > 0) {
+			return param.getElementId().trim();
+		}
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Command Parameter Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new EStackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+
+		if (getEditor().isModelFragment()) {
+			Control topControl;
+			if (Util.isImport((EObject) object)) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];
+			}
+
+			if (stackLayout.topControl != topControl) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
+			return parent;
+		}
+
+		ControlFactory.createTextField(parent, "Id", master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, "Name", master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME));
+		ControlFactory.createTextField(parent, "TypeId", master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__TYPE_ID));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Optional");
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			Button checkbox = new Button(parent, SWT.CHECK);
+			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
+
+			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__OPTIONAL);
+			IWidgetValueProperty uiProp = WidgetProperties.selection();
+
+			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
+		}
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}

From ef4e0603f7eb1fd14cc3df492fb759932a1cfc66 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 5 Jul 2010 23:19:19 +0000
Subject: [PATCH 0181/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * adding editor for Parameter

---
 .../icons/full/modelelements/Parameter.gif    | Bin 0 -> 184 bytes
 .../emf/ui/internal/common/ModelEditor.java   |   2 +
 .../component/CommandParameterEditor.java     |   2 +-
 .../component/HandledMenuItemEditor.java      | 165 +++++++-----------
 .../component/HandledToolItemEditor.java      | 144 +++++----------
 .../common/component/ParameterEditor.java     | 140 +++++++++++++++
 6 files changed, 246 insertions(+), 207 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.gif
new file mode 100644
index 0000000000000000000000000000000000000000..46e9bfa668478bf74bdb6f1b9b977bf0e2ca3422
GIT binary patch
literal 184
zcmZ?wbhEHb6krfwIKsfd5IRjdeW8BIN}JmCg$s^WEIr=0<-+1aHxFNbcHzOBw-=Y)
z+Bx<3!sZJL>rc+8*w>x6r7n3(UCP?h*#H0k19cMwia%Kx85o2abU-RWb~3P<K2YgP
z$()z5iixRlMRF1kyNy_*uG%4PW`_m3D`qp4^ri?s3$T#ga6IW(gQLU^4xd9$#XJ=m
FtO5G*K4Aa=

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index bddaaf4112..4e8ac6cc59 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -63,6 +63,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuSeparatorEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ModelFragmentsEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ParameterEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PartDescriptorEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PartEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PartSashContainerEditor;
@@ -555,6 +556,7 @@ private void registerDefaultEditors() {
 		registerEditor(CommandsPackageImpl.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(), this, modelProvider, project));
 		registerEditor(CommandsPackageImpl.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(CommandsPackageImpl.Literals.COMMAND_PARAMETER, new CommandParameterEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(CommandsPackageImpl.Literals.PARAMETER, new ParameterEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(CommandsPackageImpl.Literals.BINDING_TABLE, new BindingTableEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(CommandsPackageImpl.Literals.BINDING_CONTEXT, new BindingContextEditor(modelProvider.getEditingDomain(), this));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index d3ffd1f40c..75dcbc4a42 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -53,7 +53,7 @@ public CommandParameterEditor(EditingDomain editingDomain, ModelEditor editor) {
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.gif")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index a485953633..13f1a56ec6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -12,44 +12,35 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledMenuItemCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
-import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnViewerEditor;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
-import org.eclipse.jface.viewers.EditingSupport;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.TableViewerEditor;
-import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -65,6 +56,8 @@ public class HandledMenuItemEditor extends MenuItemEditor {
 	private Image image;
 	private IModelResource resource;
 
+	private IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
+
 	public HandledMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IModelResource resource) {
 		super(editingDomain, editor, project);
 		this.resource = resource;
@@ -128,100 +121,17 @@ public void widgetSelected(SelectionEvent e) {
 			l.setText(Messages.HandledMenuItemEditor_Parameters);
 			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
-			final TableViewer tableviewer = new TableViewer(parent);
+			final TableViewer viewer = new TableViewer(parent);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 120;
-			tableviewer.getTable().setHeaderVisible(true);
-			tableviewer.getControl().setLayoutData(gd);
+			viewer.getControl().setLayoutData(gd);
 
 			ObservableListContentProvider cp = new ObservableListContentProvider();
-			tableviewer.setContentProvider(cp);
-
-			{
-				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__NAME);
-
-				TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-				column.getColumn().setText(Messages.HandledMenuItemEditor_Tag);
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MParameter>(prop.observeDetail(cp.getKnownElements())));
-				column.setEditingSupport(new EditingSupport(tableviewer) {
-					private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
-
-					@Override
-					protected void setValue(Object element, Object value) {
-						Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.PARAMETER__NAME, value);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-
-					@Override
-					protected Object getValue(Object element) {
-						String val = ((MParameter) element).getName();
-						return val == null ? "" : val; //$NON-NLS-1$
-					}
-
-					@Override
-					protected CellEditor getCellEditor(Object element) {
-						return cellEditor;
-					}
-
-					@Override
-					protected boolean canEdit(Object element) {
-						return true;
-					}
-				});
-			}
-
-			{
-				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__VALUE);
-
-				TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-				column.getColumn().setText(Messages.HandledMenuItemEditor_Value);
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MParameter>(prop.observeDetail(cp.getKnownElements())));
-				column.setEditingSupport(new EditingSupport(tableviewer) {
-					private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
-
-					@Override
-					protected void setValue(Object element, Object value) {
-						Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.PARAMETER__VALUE, value);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-
-					@Override
-					protected Object getValue(Object element) {
-						String val = ((MParameter) element).getValue();
-						return val == null ? "" : val; //$NON-NLS-1$
-					}
-
-					@Override
-					protected CellEditor getCellEditor(Object element) {
-						return cellEditor;
-					}
-
-					@Override
-					protected boolean canEdit(Object element) {
-						return true;
-					}
-				});
-			}
-
-			ColumnViewerEditorActivationStrategy editorActivationStrategy = new ColumnViewerEditorActivationStrategy(tableviewer) {
-				@Override
-				protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
-					boolean singleSelect = ((IStructuredSelection) tableviewer.getSelection()).size() == 1;
-					boolean isLeftDoubleMouseSelect = event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION && ((MouseEvent) event.sourceEvent).button == 1;
-
-					return singleSelect && (isLeftDoubleMouseSelect || event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC || event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
-				}
-			};
-			TableViewerEditor.create(tableviewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
+			viewer.setContentProvider(cp);
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
-			tableviewer.setInput(prop.observeDetail(master));
+			viewer.setInput(prop.observeDetail(master));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
@@ -236,11 +146,55 @@ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent even
 			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MHandledItem container = (MHandledItem) getMaster().getValue();
+							int idx = container.getParameters().indexOf(obj) - 1;
+							if (idx >= 0) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MHandledItem container = (MHandledItem) getMaster().getValue();
+							int idx = container.getParameters().indexOf(obj) + 1;
+							if (idx < container.getParameters().size()) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
@@ -254,7 +208,7 @@ public void widgetSelected(SelectionEvent e) {
 					Command cmd = AddCommand.create(getEditingDomain(), item, MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, param);
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						tableviewer.editElement(param, 0);
+						getEditor().setSelection(param);
 					}
 				}
 			});
@@ -264,7 +218,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 
 				public void widgetSelected(SelectionEvent e) {
-					IStructuredSelection s = (IStructuredSelection) tableviewer.getSelection();
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 					if (!s.isEmpty()) {
 						MHandledItem item = (MHandledItem) master.getValue();
 						Command cmd = RemoveCommand.create(getEditingDomain(), item, MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, s.toList());
@@ -279,4 +233,9 @@ public void widgetSelected(SelectionEvent e) {
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		}
 	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return HANDLED_ITEM__PARAMETERS.observe(element);
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 11010d8259..4ef9c0b28d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -12,44 +12,35 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledToolItemCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
-import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnViewerEditor;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
-import org.eclipse.jface.viewers.EditingSupport;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.TableViewerEditor;
-import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -64,6 +55,7 @@
 public class HandledToolItemEditor extends ToolItemEditor {
 	private Image image;
 	private IModelResource resource;
+	private IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
 
 	public HandledToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IModelResource resource) {
 		super(editingDomain, editor, project);
@@ -117,100 +109,18 @@ public void widgetSelected(SelectionEvent e) {
 		l.setText(Messages.HandledToolItemEditor_Parameters);
 		l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
-		final TableViewer tableviewer = new TableViewer(parent);
+		final TableViewer viewer = new TableViewer(parent);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.heightHint = 120;
-		tableviewer.getTable().setHeaderVisible(true);
-		tableviewer.getControl().setLayoutData(gd);
+		viewer.getTable().setHeaderVisible(true);
+		viewer.getControl().setLayoutData(gd);
 
 		ObservableListContentProvider cp = new ObservableListContentProvider();
-		tableviewer.setContentProvider(cp);
-
-		{
-			IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__NAME);
-
-			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText(Messages.HandledToolItemEditor_ParametersName);
-			column.getColumn().setWidth(200);
-			column.setLabelProvider(new ObservableColumnLabelProvider<MParameter>(prop.observeDetail(cp.getKnownElements())));
-			column.setEditingSupport(new EditingSupport(tableviewer) {
-				private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
-
-				@Override
-				protected void setValue(Object element, Object value) {
-					Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.PARAMETER__NAME, value);
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-					}
-				}
-
-				@Override
-				protected Object getValue(Object element) {
-					String val = ((MParameter) element).getName();
-					return val == null ? "" : val; //$NON-NLS-1$
-				}
-
-				@Override
-				protected CellEditor getCellEditor(Object element) {
-					return cellEditor;
-				}
-
-				@Override
-				protected boolean canEdit(Object element) {
-					return true;
-				}
-			});
-		}
-
-		{
-			IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__VALUE);
-
-			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText(Messages.HandledToolItemEditor_ParametersValue);
-			column.getColumn().setWidth(200);
-			column.setLabelProvider(new ObservableColumnLabelProvider<MParameter>(prop.observeDetail(cp.getKnownElements())));
-			column.setEditingSupport(new EditingSupport(tableviewer) {
-				private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
-
-				@Override
-				protected void setValue(Object element, Object value) {
-					Command cmd = SetCommand.create(getEditingDomain(), element, CommandsPackageImpl.Literals.PARAMETER__VALUE, value);
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-					}
-				}
-
-				@Override
-				protected Object getValue(Object element) {
-					String val = ((MParameter) element).getValue();
-					return val == null ? "" : val; //$NON-NLS-1$
-				}
-
-				@Override
-				protected CellEditor getCellEditor(Object element) {
-					return cellEditor;
-				}
-
-				@Override
-				protected boolean canEdit(Object element) {
-					return true;
-				}
-			});
-		}
-
-		ColumnViewerEditorActivationStrategy editorActivationStrategy = new ColumnViewerEditorActivationStrategy(tableviewer) {
-			@Override
-			protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
-				boolean singleSelect = ((IStructuredSelection) tableviewer.getSelection()).size() == 1;
-				boolean isLeftDoubleMouseSelect = event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION && ((MouseEvent) event.sourceEvent).button == 1;
-
-				return singleSelect && (isLeftDoubleMouseSelect || event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC || event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
-			}
-		};
-		TableViewerEditor.create(tableviewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
+		viewer.setContentProvider(cp);
+		viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 		IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
-		tableviewer.setInput(prop.observeDetail(getMaster()));
+		viewer.setInput(prop.observeDetail(getMaster()));
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
@@ -225,6 +135,28 @@ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent even
 		b.setText(Messages.ModelTooling_Common_Up);
 		b.setImage(getImage(b.getDisplay(), ARROW_UP));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MHandledItem container = (MHandledItem) getMaster().getValue();
+						int idx = container.getParameters().indexOf(obj) - 1;
+						if (idx >= 0) {
+							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, obj, idx);
+
+							if (cmd.canExecute()) {
+								getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+
+					}
+				}
+			}
+		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Down);
@@ -243,8 +175,8 @@ public void widgetSelected(SelectionEvent e) {
 				Command cmd = AddCommand.create(getEditingDomain(), item, MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, param);
 				if (cmd.canExecute()) {
 					getEditingDomain().getCommandStack().execute(cmd);
+					getEditor().setSelection(param);
 				}
-				tableviewer.editElement(param, 0);
 			}
 		});
 
@@ -253,7 +185,7 @@ public void widgetSelected(SelectionEvent e) {
 		b.addSelectionListener(new SelectionAdapter() {
 
 			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection s = (IStructuredSelection) tableviewer.getSelection();
+				IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 				if (!s.isEmpty()) {
 					MHandledItem item = (MHandledItem) master.getValue();
 					Command cmd = RemoveCommand.create(getEditingDomain(), item, MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, s.toList());
@@ -278,4 +210,10 @@ public String getLabel(Object element) {
 	public String getDescription(Object element) {
 		return Messages.HandledToolItemEditor_Description;
 	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return HANDLED_ITEM__PARAMETERS.observe(element);
+	}
+
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
new file mode 100644
index 0000000000..0048711c65
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -0,0 +1,140 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.commands.MParameter;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+
+public class ParameterEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private Image image;
+	private EMFDataBindingContext context;
+
+	private EStackLayout stackLayout;
+
+	public ParameterEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain, editor);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if (image == null) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.gif")); //$NON-NLS-1$
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Parameter";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		MParameter param = (MParameter) element;
+		if (param.getName() != null && param.getName().trim().length() > 0) {
+			return param.getName().trim();
+		} else if (param.getElementId() != null && param.getElementId().trim().length() > 0) {
+			return param.getElementId().trim();
+		}
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Parameter Bla Bla Bla Bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new EStackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+
+		if (getEditor().isModelFragment()) {
+			Control topControl;
+			if (Util.isImport((EObject) object)) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];
+			}
+
+			if (stackLayout.topControl != topControl) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+		parent = new Composite(parent, SWT.NONE);
+		parent.setLayout(new GridLayout(3, false));
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
+			return parent;
+		}
+
+		ControlFactory.createTextField(parent, "Id", master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, "Name", master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__NAME));
+		ControlFactory.createTextField(parent, "Value", master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__VALUE));
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}

From 7a1c853c907c4abbab29e4e21735db18054a0530 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 5 Jul 2010 23:24:26 +0000
Subject: [PATCH 0182/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * adding editor for Popup Menu

---
 .../emf/ui/internal/common/ModelEditor.java   |  2 ++
 .../common/component/PopupMenuEditor.java     | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 4e8ac6cc59..9ee1d2e11f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -71,6 +71,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PerspectiveEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PerspectiveStackEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PlaceholderEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.PopupMenuEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.StringModelFragment;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolBarContributionEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolBarEditor;
@@ -567,6 +568,7 @@ private void registerDefaultEditors() {
 		registerEditor(MenuPackageImpl.Literals.TOOL_CONTROL, new ToolControlEditor(modelProvider.getEditingDomain(), this, project));
 
 		registerEditor(MenuPackageImpl.Literals.MENU, new MenuEditor(modelProvider.getEditingDomain(), project, this));
+		registerEditor(MenuPackageImpl.Literals.POPUP_MENU, new PopupMenuEditor(modelProvider.getEditingDomain(), project, this));
 		registerEditor(MenuPackageImpl.Literals.MENU_SEPARATOR, new MenuSeparatorEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), this, project, modelProvider));
 		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this, project));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
new file mode 100644
index 0000000000..20bc628bb5
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+public class PopupMenuEditor extends MenuEditor {
+
+	public PopupMenuEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
+		super(editingDomain, project, editor);
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Popup Menu";
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Popup Menu Bla Bla Bla Bla";
+	}
+}

From 29ce6b3fc592dbf168ea4e7bf424f6f1f2b2951f Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 6 Jul 2010 20:12:39 +0000
Subject: [PATCH 0183/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * adding editor for Popup Menu

---
 .../ui/internal/common/component/MenuEditor.java   |  2 +-
 .../internal/common/component/PopupMenuEditor.java | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index fee9dce6f6..68a43a4030 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -151,7 +151,7 @@ public Composite getEditor(Composite parent, Object object) {
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean rootMenu, boolean isImport) {
+	protected Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean rootMenu, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
index 20bc628bb5..0199da71f0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
@@ -10,9 +10,13 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.widgets.Composite;
 
 public class PopupMenuEditor extends MenuEditor {
 
@@ -20,6 +24,16 @@ public PopupMenuEditor(EditingDomain editingDomain, IProject project, ModelEdito
 		super(editingDomain, project, editor);
 	}
 
+	@Override
+	protected Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean rootMenu, boolean isImport) {
+		Composite comp = super.createForm(parent, context, master, rootMenu, isImport);
+		if (!isImport) {
+			ControlFactory.createStringListWidget(comp, this, "Variables", UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		}
+
+		return comp;
+	}
+
 	@Override
 	public String getLabel(Object element) {
 		return "Popup Menu";

From 74b628d9aaa041ba7756352b3ae3a7655b33ad8f Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 6 Jul 2010 20:25:18 +0000
Subject: [PATCH 0184/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * adding Part properties support

---
 .../internal/common/component/PartEditor.java | 104 +++++++++++++++++-
 1 file changed, 100 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index f447bbc457..fdfd4aae45 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -33,6 +33,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationFactoryImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
@@ -41,6 +42,7 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.BasicEMap;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -49,14 +51,21 @@
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.EditingSupport;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -335,7 +344,7 @@ public void widgetSelected(SelectionEvent e) {
 			gd.verticalIndent = VERTICAL_LIST_WIDGET_INDENT;
 			l.setLayoutData(gd);
 
-			TableViewer tableviewer = new TableViewer(parent);
+			final TableViewer tableviewer = new TableViewer(parent);
 			tableviewer.getTable().setHeaderVisible(true);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			tableviewer.setContentProvider(cp);
@@ -369,10 +378,39 @@ public String getText(Object element) {
 				}
 			});
 
+			final TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
+			column.setEditingSupport(new EditingSupport(tableviewer) {
+
+				@Override
+				protected void setValue(Object element, Object value) {
+					Command cmd = SetCommand.create(getEditingDomain(), element, ApplicationPackageImpl.Literals.STRING_TO_STRING_MAP__KEY, value.toString().trim().length() == 0 ? null : value.toString());
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+					}
+				}
+
+				@SuppressWarnings("unchecked")
+				@Override
+				protected Object getValue(Object element) {
+					Entry<String, String> entry = (Entry<String, String>) element;
+					return entry.getValue() == null ? "" : entry.getValue(); //$NON-NLS-1$
+				}
+
+				@Override
+				protected CellEditor getCellEditor(Object element) {
+					return cellEditor;
+				}
+
+				@Override
+				protected boolean canEdit(Object element) {
+					return true;
+				}
+			});
+
 			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE);
 			tableviewer.setInput(prop.observeDetail(getMaster()));
 
-			Composite buttonComp = new Composite(parent, SWT.NONE);
+			final Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
 			GridLayout gl = new GridLayout();
 			gl.marginLeft = 0;
@@ -385,13 +423,71 @@ public String getText(Object element) {
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			// FIXME Implementation is missing
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					Dialog dialog = new Dialog(buttonComp.getShell()) {
+						private Text key;
+						private Text value;
+
+						@Override
+						protected Control createDialogArea(Composite parent) {
+							Composite comp = (Composite) super.createDialogArea(parent);
+							Composite container = new Composite(comp, SWT.NONE);
+							container.setLayout(new GridLayout(2, false));
+							container.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+							Label l = new Label(container, SWT.NONE);
+							l.setText("Key");
+
+							key = new Text(container, SWT.BORDER);
+							key.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+							l = new Label(container, SWT.NONE);
+							l.setText("Value");
+
+							value = new Text(container, SWT.BORDER);
+							value.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+							return comp;
+						}
+
+						@Override
+						protected void okPressed() {
+							if (key.getText().trim().length() > 0) {
+								BasicEMap.Entry<String, String> entry = (org.eclipse.emf.common.util.BasicEMap.Entry<String, String>) ApplicationFactoryImpl.eINSTANCE.createStringToStringMap();
+								entry.setHash(key.hashCode());
+								entry.setKey(key.getText());
+								entry.setValue(value.getText().trim().length() > 0 ? value.getText() : null);
+								Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, entry);
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									super.okPressed();
+								}
+							}
+						}
+					};
+					dialog.open();
+
+				}
+			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			// FIXME Implementation is missing
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					IStructuredSelection selection = (IStructuredSelection) tableviewer.getSelection();
+					if (!selection.isEmpty()) {
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, selection.toList());
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
 		}
 
 		ControlFactory.createStringListWidget(parent, this, "Variables", UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);

From 448d109f96daf55c3786872bc7b747a5a410e5f1 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 6 Jul 2010 20:42:19 +0000
Subject: [PATCH 0185/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * adding Part properties support

---
 .../common/component/ControlFactory.java      | 164 +++++++++++++++++
 .../component/PartDescriptorEditor.java       | 106 -----------
 .../internal/common/component/PartEditor.java | 172 +-----------------
 3 files changed, 166 insertions(+), 276 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 3ea808b921..58adaf7e38 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -12,6 +12,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map.Entry;
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.map.IObservableMap;
@@ -24,11 +25,13 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.impl.ApplicationFactoryImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MContext;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.BasicEMap;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFListProperty;
@@ -40,17 +43,24 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.EditingSupport;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
@@ -60,10 +70,164 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
 public class ControlFactory {
+	public static void createMapProperties(Composite parent, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
+		Label l = new Label(parent, SWT.NONE);
+		l.setText(label);
+		GridData gd = new GridData(GridData.END, GridData.BEGINNING, false, false);
+		gd.verticalIndent = vIndent;
+		l.setLayoutData(gd);
+
+		final TableViewer tableviewer = new TableViewer(parent);
+		tableviewer.getTable().setHeaderVisible(true);
+		ObservableListContentProvider cp = new ObservableListContentProvider();
+		tableviewer.setContentProvider(cp);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.heightHint = 80;
+		gd.verticalIndent = vIndent;
+		tableviewer.getControl().setLayoutData(gd);
+
+		TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
+		column.getColumn().setText("Key");
+		column.getColumn().setWidth(200);
+		column.setLabelProvider(new ColumnLabelProvider() {
+			@SuppressWarnings("unchecked")
+			@Override
+			public String getText(Object element) {
+				Entry<String, String> entry = (Entry<String, String>) element;
+				return entry.getKey();
+			}
+		});
+
+		// FIXME How can we react upon changes in the Map-Value?
+		column = new TableViewerColumn(tableviewer, SWT.NONE);
+		column.getColumn().setText("Value");
+		column.getColumn().setWidth(200);
+		column.setLabelProvider(new ColumnLabelProvider() {
+			@SuppressWarnings("unchecked")
+			@Override
+			public String getText(Object element) {
+				Entry<String, String> entry = (Entry<String, String>) element;
+				return entry.getValue();
+			}
+		});
+
+		final TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
+		column.setEditingSupport(new EditingSupport(tableviewer) {
+
+			@Override
+			protected void setValue(Object element, Object value) {
+				Command cmd = SetCommand.create(editor.getEditingDomain(), element, ApplicationPackageImpl.Literals.STRING_TO_STRING_MAP__KEY, value.toString().trim().length() == 0 ? null : value.toString());
+				if (cmd.canExecute()) {
+					editor.getEditingDomain().getCommandStack().execute(cmd);
+				}
+			}
+
+			@SuppressWarnings("unchecked")
+			@Override
+			protected Object getValue(Object element) {
+				Entry<String, String> entry = (Entry<String, String>) element;
+				return entry.getValue() == null ? "" : entry.getValue(); //$NON-NLS-1$
+			}
+
+			@Override
+			protected CellEditor getCellEditor(Object element) {
+				return cellEditor;
+			}
+
+			@Override
+			protected boolean canEdit(Object element) {
+				return true;
+			}
+		});
+
+		IEMFEditListProperty prop = EMFEditProperties.list(editor.getEditingDomain(), feature);
+		tableviewer.setInput(prop.observeDetail(editor.getMaster()));
+
+		final Composite buttonComp = new Composite(parent, SWT.NONE);
+		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+		GridLayout gl = new GridLayout();
+		gl.marginLeft = 0;
+		gl.marginRight = 0;
+		gl.marginWidth = 0;
+		gl.marginHeight = 0;
+		buttonComp.setLayout(gl);
+
+		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ModelTooling_Common_AddEllipsis);
+		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				Dialog dialog = new Dialog(buttonComp.getShell()) {
+					private Text key;
+					private Text value;
+
+					@Override
+					protected Control createDialogArea(Composite parent) {
+						Composite comp = (Composite) super.createDialogArea(parent);
+						Composite container = new Composite(comp, SWT.NONE);
+						container.setLayout(new GridLayout(2, false));
+						container.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+						Label l = new Label(container, SWT.NONE);
+						l.setText("Key");
+
+						key = new Text(container, SWT.BORDER);
+						key.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+						l = new Label(container, SWT.NONE);
+						l.setText("Value");
+
+						value = new Text(container, SWT.BORDER);
+						value.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+						return comp;
+					}
+
+					@Override
+					protected void okPressed() {
+						if (key.getText().trim().length() > 0) {
+							BasicEMap.Entry<String, String> entry = (org.eclipse.emf.common.util.BasicEMap.Entry<String, String>) ApplicationFactoryImpl.eINSTANCE.createStringToStringMap();
+							entry.setHash(key.hashCode());
+							entry.setKey(key.getText());
+							entry.setValue(value.getText().trim().length() > 0 ? value.getText() : null);
+							Command cmd = AddCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), feature, entry);
+							if (cmd.canExecute()) {
+								editor.getEditingDomain().getCommandStack().execute(cmd);
+								super.okPressed();
+							}
+						}
+					}
+				};
+				dialog.open();
+
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ModelTooling_Common_Remove);
+		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_DELETE_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				IStructuredSelection selection = (IStructuredSelection) tableviewer.getSelection();
+				if (!selection.isEmpty()) {
+					Command cmd = RemoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), feature, selection.toList());
+					if (cmd.canExecute()) {
+						editor.getEditingDomain().getCommandStack().execute(cmd);
+					}
+				}
+			}
+		});
+	}
+
 	public static void createTextField(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index eb71055b85..6ea8626355 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -12,7 +12,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Map.Entry;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -44,18 +43,12 @@
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -347,105 +340,6 @@ public void widgetSelected(SelectionEvent e) {
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CATEGORY).observeDetail(master));
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartDescriptorEditor_PersitedState);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-			TableViewer tableviewer = new TableViewer(parent);
-			tableviewer.getTable().setHeaderVisible(true);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			tableviewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 80;
-			tableviewer.getControl().setLayoutData(gd);
-
-			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText(Messages.PartDescriptorEditor_PersitedStateKey);
-			column.getColumn().setWidth(200);
-			column.setLabelProvider(new ColumnLabelProvider() {
-				@SuppressWarnings("unchecked")
-				@Override
-				public String getText(Object element) {
-					Entry<String, String> entry = (Entry<String, String>) element;
-					return entry.getKey();
-				}
-			});
-
-			// FIXME How can we react upon changes in the Map-Value?
-			column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText(Messages.PartDescriptorEditor_PersitedStateValue);
-			column.getColumn().setWidth(200);
-			column.setLabelProvider(new ColumnLabelProvider() {
-				@SuppressWarnings("unchecked")
-				@Override
-				public String getText(Object element) {
-					Entry<String, String> entry = (Entry<String, String>) element;
-					return entry.getValue();
-				}
-			});
-
-			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE);
-			tableviewer.setInput(prop.observeDetail(getMaster()));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			// FIXME Implementation is missing
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			// FIXME Implementation is missing
-		}
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartDescriptorEditor_Variables);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-			ListViewer viewer = new ListViewer(parent);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			gd.heightHint = 80;
-			viewer.getList().setLayoutData(gd);
-		}
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartDescriptorEditor_Properties);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-			TableViewer tableviewer = new TableViewer(parent);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			gd.heightHint = 80;
-			tableviewer.getTable().setHeaderVisible(true);
-			tableviewer.getControl().setLayoutData(gd);
-
-			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText(Messages.PartDescriptorEditor_PropertiesKey);
-			column.getColumn().setWidth(200);
-
-			column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText(Messages.PartDescriptorEditor_PropertiesValue);
-			column.getColumn().setWidth(200);
-		}
-
 		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index fdfd4aae45..eac5c60f48 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -12,7 +12,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Map.Entry;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -33,7 +32,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
-import org.eclipse.e4.ui.model.application.impl.ApplicationFactoryImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
@@ -42,30 +40,17 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.BasicEMap;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -335,161 +320,8 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		ControlFactory.createStringListWidget(parent, this, "Binding Contexts", CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartEditor_PersitedState);
-			GridData gd = new GridData(GridData.END, GridData.BEGINNING, false, false);
-			gd.verticalIndent = VERTICAL_LIST_WIDGET_INDENT;
-			l.setLayoutData(gd);
-
-			final TableViewer tableviewer = new TableViewer(parent);
-			tableviewer.getTable().setHeaderVisible(true);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			tableviewer.setContentProvider(cp);
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 80;
-			gd.verticalIndent = VERTICAL_LIST_WIDGET_INDENT;
-			tableviewer.getControl().setLayoutData(gd);
-
-			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText(Messages.PartEditor_PersitedStateKey);
-			column.getColumn().setWidth(200);
-			column.setLabelProvider(new ColumnLabelProvider() {
-				@SuppressWarnings("unchecked")
-				@Override
-				public String getText(Object element) {
-					Entry<String, String> entry = (Entry<String, String>) element;
-					return entry.getKey();
-				}
-			});
-
-			// FIXME How can we react upon changes in the Map-Value?
-			column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText(Messages.PartEditor_PersitedStateValue);
-			column.getColumn().setWidth(200);
-			column.setLabelProvider(new ColumnLabelProvider() {
-				@SuppressWarnings("unchecked")
-				@Override
-				public String getText(Object element) {
-					Entry<String, String> entry = (Entry<String, String>) element;
-					return entry.getValue();
-				}
-			});
-
-			final TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
-			column.setEditingSupport(new EditingSupport(tableviewer) {
-
-				@Override
-				protected void setValue(Object element, Object value) {
-					Command cmd = SetCommand.create(getEditingDomain(), element, ApplicationPackageImpl.Literals.STRING_TO_STRING_MAP__KEY, value.toString().trim().length() == 0 ? null : value.toString());
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-					}
-				}
-
-				@SuppressWarnings("unchecked")
-				@Override
-				protected Object getValue(Object element) {
-					Entry<String, String> entry = (Entry<String, String>) element;
-					return entry.getValue() == null ? "" : entry.getValue(); //$NON-NLS-1$
-				}
-
-				@Override
-				protected CellEditor getCellEditor(Object element) {
-					return cellEditor;
-				}
-
-				@Override
-				protected boolean canEdit(Object element) {
-					return true;
-				}
-			});
-
-			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE);
-			tableviewer.setInput(prop.observeDetail(getMaster()));
-
-			final Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					Dialog dialog = new Dialog(buttonComp.getShell()) {
-						private Text key;
-						private Text value;
-
-						@Override
-						protected Control createDialogArea(Composite parent) {
-							Composite comp = (Composite) super.createDialogArea(parent);
-							Composite container = new Composite(comp, SWT.NONE);
-							container.setLayout(new GridLayout(2, false));
-							container.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-							Label l = new Label(container, SWT.NONE);
-							l.setText("Key");
-
-							key = new Text(container, SWT.BORDER);
-							key.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-							l = new Label(container, SWT.NONE);
-							l.setText("Value");
-
-							value = new Text(container, SWT.BORDER);
-							value.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-							return comp;
-						}
-
-						@Override
-						protected void okPressed() {
-							if (key.getText().trim().length() > 0) {
-								BasicEMap.Entry<String, String> entry = (org.eclipse.emf.common.util.BasicEMap.Entry<String, String>) ApplicationFactoryImpl.eINSTANCE.createStringToStringMap();
-								entry.setHash(key.hashCode());
-								entry.setKey(key.getText());
-								entry.setValue(value.getText().trim().length() > 0 ? value.getText() : null);
-								Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, entry);
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									super.okPressed();
-								}
-							}
-						}
-					};
-					dialog.open();
-
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					IStructuredSelection selection = (IStructuredSelection) tableviewer.getSelection();
-					if (!selection.isEmpty()) {
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, selection.toList());
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
-		}
-
+		ControlFactory.createMapProperties(parent, this, "Persisted State", ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, this, "Context Properties", UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, this, "Variables", UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 

From 668e1046296f42e3fd8428ab483a6beb27844d1b Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 6 Jul 2010 20:50:52 +0000
Subject: [PATCH 0186/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * adding properties support

---
 .../common/component/AddonsEditor.java        |  3 +-
 .../common/component/HandlerEditor.java       |  2 +-
 .../common/component/PerspectiveEditor.java   |  2 +
 .../common/component/PopupMenuEditor.java     |  1 +
 .../common/component/ToolControlEditor.java   | 69 +------------------
 .../common/component/WindowEditor.java        |  1 +
 6 files changed, 9 insertions(+), 69 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 33cfabc375..83e387423f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -165,7 +165,8 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		// ControlFactory.createBindingsWidget(parent, this);
+		ControlFactory.createMapProperties(parent, this, "Persisted State", ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index b90df2b255..e73d1c34b2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -202,7 +202,7 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 		}
-
+		ControlFactory.createMapProperties(parent, this, "Persisted State", ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 473640cae1..713677cb5f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -371,6 +371,8 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		ControlFactory.createMapProperties(parent, this, "Context Properties", UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, "Variables", UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
index 0199da71f0..9dc6bbf464 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
@@ -28,6 +28,7 @@ public PopupMenuEditor(EditingDomain editingDomain, IProject project, ModelEdito
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean rootMenu, boolean isImport) {
 		Composite comp = super.createForm(parent, context, master, rootMenu, isImport);
 		if (!isImport) {
+			ControlFactory.createMapProperties(parent, this, "Context Properties", UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
 			ControlFactory.createStringListWidget(comp, this, "Variables", UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 93ea8cf9e2..b8aaeafde2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -12,7 +12,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Map.Entry;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
@@ -26,15 +25,10 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -170,67 +164,8 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText("Persited State");
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-			TableViewer tableviewer = new TableViewer(parent);
-			tableviewer.getTable().setHeaderVisible(true);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			tableviewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 80;
-			tableviewer.getControl().setLayoutData(gd);
-
-			TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText("Key");
-			column.getColumn().setWidth(200);
-			column.setLabelProvider(new ColumnLabelProvider() {
-				@SuppressWarnings("unchecked")
-				@Override
-				public String getText(Object element) {
-					Entry<String, String> entry = (Entry<String, String>) element;
-					return entry.getKey();
-				}
-			});
-
-			// FIXME How can we react upon changes in the Map-Value?
-			column = new TableViewerColumn(tableviewer, SWT.NONE);
-			column.getColumn().setText("Value");
-			column.getColumn().setWidth(200);
-			column.setLabelProvider(new ColumnLabelProvider() {
-				@SuppressWarnings("unchecked")
-				@Override
-				public String getText(Object element) {
-					Entry<String, String> entry = (Entry<String, String>) element;
-					return entry.getValue();
-				}
-			});
-
-			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE);
-			tableviewer.setInput(prop.observeDetail(getMaster()));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add ...");
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		}
+		ControlFactory.createMapProperties(parent, this, "Persisted State", ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index f025d062a4..c289fa23ff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -312,6 +312,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		ControlFactory.createSelectedElement(parent, this, context, "Selected Element");
 		ControlFactory.createStringListWidget(parent, this, "Binding Contexts", CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, this, "Context Properties", UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, this, "Variables", UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 

From 040ee776cdb262c9bfe00fbdf42db8cfbc46b878 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 6 Jul 2010 21:03:20 +0000
Subject: [PATCH 0187/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * adding missing rendered classes

---
 .../emf/ui/internal/common/ModelEditor.java   |  6 +++
 .../common/component/RenderedMenuEditor.java  | 27 ++++++++++++
 .../common/component/RenderedMenuItem.java    | 42 +++++++++++++++++++
 .../component/RenderedToolBarEditor.java      | 26 ++++++++++++
 4 files changed, 101 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 9ee1d2e11f..e9cbc7d446 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -72,6 +72,9 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PerspectiveStackEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PlaceholderEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PopupMenuEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.RenderedMenuEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.RenderedMenuItem;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.RenderedToolBarEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.StringModelFragment;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolBarContributionEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolBarEditor;
@@ -562,16 +565,19 @@ private void registerDefaultEditors() {
 		registerEditor(CommandsPackageImpl.Literals.BINDING_CONTEXT, new BindingContextEditor(modelProvider.getEditingDomain(), this));
 
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR, new ToolBarEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(MenuPackageImpl.Literals.RENDERED_TOOL_BAR, new RenderedToolBarEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor(modelProvider.getEditingDomain(), this, project));
 		registerEditor(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, new HandledToolItemEditor(modelProvider.getEditingDomain(), this, project, modelProvider));
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, new ToolBarSeparatorEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(MenuPackageImpl.Literals.TOOL_CONTROL, new ToolControlEditor(modelProvider.getEditingDomain(), this, project));
 
 		registerEditor(MenuPackageImpl.Literals.MENU, new MenuEditor(modelProvider.getEditingDomain(), project, this));
+		registerEditor(MenuPackageImpl.Literals.RENDERED_MENU, new RenderedMenuEditor(modelProvider.getEditingDomain(), project, this));
 		registerEditor(MenuPackageImpl.Literals.POPUP_MENU, new PopupMenuEditor(modelProvider.getEditingDomain(), project, this));
 		registerEditor(MenuPackageImpl.Literals.MENU_SEPARATOR, new MenuSeparatorEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), this, project, modelProvider));
 		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this, project));
+		registerEditor(MenuPackageImpl.Literals.RENDERED_MENU_ITEM, new RenderedMenuItem(modelProvider.getEditingDomain(), this, project));
 		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION, new MenuContributionEditor(modelProvider.getEditingDomain(), project, this));
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION, new ToolBarContributionEditor(modelProvider.getEditingDomain(), project, this));
 		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION, new TrimContributionEditor(modelProvider.getEditingDomain(), project, this));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java
new file mode 100644
index 0000000000..fdabe40bd3
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+public class RenderedMenuEditor extends MenuEditor {
+
+	public RenderedMenuEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
+		super(editingDomain, project, editor);
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Rendered Menu";
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java
new file mode 100644
index 0000000000..aeb169ad9b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.widgets.Composite;
+
+public class RenderedMenuItem extends MenuItemEditor {
+
+	public RenderedMenuItem(EditingDomain editingDomain, ModelEditor editor, IProject project) {
+		super(editingDomain, editor, project);
+	}
+
+	@Override
+	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Rendered MenuItem";
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Rendered MenuItem Bla Bla Bla Bla";
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java
new file mode 100644
index 0000000000..4cc0c20648
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+public class RenderedToolBarEditor extends ToolBarEditor {
+
+	public RenderedToolBarEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain, editor);
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Rendered ToolBar";
+	}
+}

From 102e65c93907a7218fe39b6ec824b69a93f13a17 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 6 Jul 2010 21:08:31 +0000
Subject: [PATCH 0188/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling

---
 .../tools/emf/ui/internal/common/component/ControlFactory.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 58adaf7e38..289a2e9870 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -170,6 +170,7 @@ public void widgetSelected(SelectionEvent e) {
 
 					@Override
 					protected Control createDialogArea(Composite parent) {
+						getShell().setText("Key/Value Pair");
 						Composite comp = (Composite) super.createDialogArea(parent);
 						Composite container = new Composite(comp, SWT.NONE);
 						container.setLayout(new GridLayout(2, false));

From 241b6482a1ed7d95e4efb0a49b2b4e5e58e3ef2c Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 6 Jul 2010 22:03:38 +0000
Subject: [PATCH 0189/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling

---
 .../icons/full/obj16/Addons.png                   | Bin 0 -> 859 bytes
 bundles/org.eclipse.e4.tools/plugin.xml           |   7 +++++++
 .../wizards/classes/AbstractNewClassPage.java     |   1 -
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 bundles/org.eclipse.e4.tools/icons/full/obj16/Addons.png

diff --git a/bundles/org.eclipse.e4.tools/icons/full/obj16/Addons.png b/bundles/org.eclipse.e4.tools/icons/full/obj16/Addons.png
new file mode 100644
index 0000000000000000000000000000000000000000..3262767cda95a217ac8d3fabf6c4bfe3514fd770
GIT binary patch
literal 859
zcmV-h1El<kP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!?MXyIR5;6R
zQ|(JraTGrHHYa*Vx;5Q=X=BBpC1l7x6fBU){s5tGLXdtQ)(0U+eGrra@gEp|+7N`<
zKagatHD8+5#IiATIkm>-)HU~Z@BQ7|ITsWqFPt%czw<ojd7g7Gr>ZJk^u%JZL0Ogu
z7-JwwQn0tTclx3}?kvID+L{XidsxQ^&e&|W7P?<rTFNyxHd^t_fMgy0{rwv!82${{
zkHB?oN??-(i`8m1pwjF0jLt++Okk}CgF*i}f_Oac69i$%ZnyJBqmd>hu`JbU6)Keq
zD2hUaNxZkB72a$%4^2)^`UtC|A7te-nGAX1Xrjep5qO>_@7ffX%SGn`-ED7gLpU5(
zk(@u5K{Og2Z)$29rKuELp-_NyIt_Job>MI~K&R7bgynLX>`sh~jA#lt3}_YQwqglZ
ztJPR4mEiF3kO&v?|I7ONdO%xaZnyg`4MVH2u&{85WF^F8xkx0!oK7d7&*!07ENT-s
zHZ~xYO7;1CzImGB_xm6GXq<Ulk_zys<24uz2C@lLQ&S30vd9~<Y0_y5HK3i-^-@n&
z7NOJZg6S<UWd@{_>~MiVV0C|gzZGQ)-QC?rN*&h*fy7fxUu2>pgCsM)-Q?tMb$Vds
z*E@*sEW?$R-d!Zlo`yI#H#gqa);3B?D6pBWXVBO67?`R6Qy3_qLZ+|_MxhlJx8`9r
z{Xs@mdTouNQ0N7+J#TJqhNGh+O#w+J@OC~45~`3D2_z=L-&zrFU%dy%Qdzg0ic~cM
z%s{~na19L&^isj*=4PpCtqL-e!E)J#V5X7%DWt(<u)>#}Pq3W$oGSy^Pc4j%jrk7_
z4xV5*S(C}slXQfB*Dx$m5ut)=uA6Vdoof#vmX1Pr{o_H2ueAT3P;2Ktrs3gX7h2gv
zE62G1jK||?p|odbXLH|f%y4eoeRKHd`|tRw^&nXM?`u5!c)i}iTrM|2E9N*Z__gcJ
lE2dmBR}@y4olxbIzJJd{=EC=vF*^VN002ovPDHLkV1lGDi4On(

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools/plugin.xml b/bundles/org.eclipse.e4.tools/plugin.xml
index 56fd224e4e..d00322a1c6 100644
--- a/bundles/org.eclipse.e4.tools/plugin.xml
+++ b/bundles/org.eclipse.e4.tools/plugin.xml
@@ -53,6 +53,13 @@
             id="org.eclipse.e4.tools.newpart"
             name="New Part Class">
       </wizard>
+      <wizard
+            category="org.eclipse.e4.tools/org.eclipse.e4.tools.classes"
+            class="org.eclipse.e4.internal.tools.wizards.classes.NewAddonClassWizard"
+            icon="icons/full/obj16/Addons.png"
+            id="org.eclipse.e4.tools.newaddon"
+            name="New Addon Class">
+      </wizard>
    </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index 37ab73c963..719aecf4cb 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -362,7 +362,6 @@ public PackageFragmentToStringConverter() {
 		}
 		
 		public Object convert(Object fromObject) {
-			System.err.println(" =======================> Converting: " + fromObject);
 			if( fromObject == null ) {
 				return "";
 			}

From 3e6fe6fbcb43ec5b6eae9f402548103ddff81da9 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 6 Jul 2010 22:05:13 +0000
Subject: [PATCH 0190/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling

---
 .../plugin.xml                                |  3 +
 .../extension/AddonContributionEditor.java    | 84 +++++++++++++++++++
 .../extension/HandlerContributionEditor.java  | 18 +---
 .../extension/PartContributionEditor.java     | 31 ++++---
 .../e4/tools/emf/editor3x/extension/Util.java | 19 +++++
 .../common/component/AddonsEditor.java        | 21 ++++-
 .../wizards/classes/AbstractNewClassPage.java |  5 --
 .../classes/AbstractNewClassWizard.java       |  4 +-
 .../wizards/classes/NewAddonClassWizard.java  | 44 ++++++++++
 .../classes/templates/AddonTemplate.java      | 32 +++++++
 .../templates/addon.txtjet                    | 24 ++++++
 11 files changed, 250 insertions(+), 35 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
 create mode 100644 bundles/org.eclipse.e4.tools/templates/addon.txtjet

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index a6d28c8adf..e232671bfb 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -20,6 +20,9 @@
       <contributionClassCreator
             class="org.eclipse.e4.tools.emf.editor3x.extension.PartContributionEditor">
       </contributionClassCreator>
+      <contributionClassCreator
+            class="org.eclipse.e4.tools.emf.editor3x.extension.AddonContributionEditor">
+      </contributionClassCreator>
    </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
new file mode 100644
index 0000000000..ce8de80ff3
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x.extension;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.e4.internal.tools.wizards.classes.NewAddonClassWizard;
+import org.eclipse.e4.internal.tools.wizards.classes.NewHandlerClassWizard;
+import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
+import org.eclipse.e4.ui.model.application.MContribution;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PartInitException;
+
+public class AddonContributionEditor implements IContributionClassCreator {
+
+	public boolean isSupported(EClass element) {
+		return Util.isTypeOrSuper(ApplicationPackageImpl.Literals.ADDON, element);
+	}
+
+	public void createOpen(MContribution contribution, EditingDomain domain,
+			IProject project, Shell shell) {
+		if( contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 ) {
+			NewAddonClassWizard wizard = new NewAddonClassWizard();
+			wizard.init( null, new StructuredSelection(project));
+			WizardDialog dialog = new WizardDialog(shell, wizard);
+			if( dialog.open() == WizardDialog.OK ) {
+				IFile f = wizard.getFile();
+				ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
+				try {
+					String packageName = el.getPackageDeclarations()[0].getElementName();
+					String className = wizard.getDomainClass().getName();
+					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "platform:/plugin/" + f.getProject().getName() + "/" + packageName+"."+className);
+					if( cmd.canExecute() ) {
+						domain.getCommandStack().execute(cmd);
+					}
+				} catch (JavaModelException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		} else {
+			URI uri = URI.createURI(contribution.getContributionURI());
+			IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(uri.segment(1));
+			//TODO If this is not a WS-Resource we need to open differently 
+			if( p != null ) {
+				IJavaProject jp = JavaCore.create(p);
+				try {
+					IType t = jp.findType(uri.segment(2));
+					JavaUI.openInEditor(t);
+				} catch (JavaModelException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				} catch (PartInitException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
index e90faa7331..4ebf9a28d5 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
@@ -10,16 +10,12 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x.extension;
 
-import java.net.URL;
-
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.e4.internal.tools.wizards.classes.NewHandlerClassWizard;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.ui.model.application.MContribution;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
@@ -33,15 +29,11 @@
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
 import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
 
 public class HandlerContributionEditor implements IContributionClassCreator {
 
@@ -87,14 +79,12 @@ public void createOpen(MContribution contribution, EditingDomain domain, IProjec
 
 	public boolean isSupported(EClass element) {
 		return 
-			isTypeOrSuper(CommandsPackageImpl.Literals.HANDLER,element)
+			Util.isTypeOrSuper(CommandsPackageImpl.Literals.HANDLER,element)
 			|| 
-			isTypeOrSuper(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, element)
+			Util.isTypeOrSuper(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, element)
 			||
-			isTypeOrSuper(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, element);
+			Util.isTypeOrSuper(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, element);
 	}
 	
-	private boolean isTypeOrSuper(EClass eClass, EClass element) {
-		return eClass.equals(element) || element.getEAllSuperTypes().contains(eClass);
-	}
+	
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
index 154e887df0..c6f5c3a32d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
@@ -38,18 +38,26 @@ public class PartContributionEditor implements IContributionClassCreator {
 
 	public void createOpen(MContribution contribution, EditingDomain domain,
 			IProject project, Shell shell) {
-		if( contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 ) {
+		if (contribution.getContributionURI() == null
+				|| contribution.getContributionURI().trim().length() == 0) {
 			NewPartClassWizard wizard = new NewPartClassWizard();
-			wizard.init( null, new StructuredSelection(project));
+			wizard.init(null, new StructuredSelection(project));
 			WizardDialog dialog = new WizardDialog(shell, wizard);
-			if( dialog.open() == WizardDialog.OK ) {
+			if (dialog.open() == WizardDialog.OK) {
 				IFile f = wizard.getFile();
 				ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
 				try {
-					String packageName = el.getPackageDeclarations()[0].getElementName();
+					String packageName = el.getPackageDeclarations()[0]
+							.getElementName();
 					String className = wizard.getDomainClass().getName();
-					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "platform:/plugin/" + f.getProject().getName() + "/" + packageName+"."+className);
-					if( cmd.canExecute() ) {
+					Command cmd = SetCommand
+							.create(domain,
+									contribution,
+									ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
+									"platform:/plugin/"
+											+ f.getProject().getName() + "/"
+											+ packageName + "." + className);
+					if (cmd.canExecute()) {
 						domain.getCommandStack().execute(cmd);
 					}
 				} catch (JavaModelException e) {
@@ -59,9 +67,10 @@ public void createOpen(MContribution contribution, EditingDomain domain,
 			}
 		} else {
 			URI uri = URI.createURI(contribution.getContributionURI());
-			IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(uri.segment(1));
-			//TODO If this is not a WS-Resource we need to open differently 
-			if( p != null ) {
+			IProject p = ResourcesPlugin.getWorkspace().getRoot()
+					.getProject(uri.segment(1));
+			// TODO If this is not a WS-Resource we need to open differently
+			if (p != null) {
 				IJavaProject jp = JavaCore.create(p);
 				try {
 					IType t = jp.findType(uri.segment(2));
@@ -78,9 +87,7 @@ public void createOpen(MContribution contribution, EditingDomain domain,
 	}
 
 	public boolean isSupported(EClass element) {
-		return BasicPackageImpl.Literals.PART == element
-				|| element.getEAllSuperTypes().contains(
-						BasicPackageImpl.Literals.PART);
+		return Util.isTypeOrSuper(BasicPackageImpl.Literals.PART, element);
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java
new file mode 100644
index 0000000000..f49d3b784c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x.extension;
+
+import org.eclipse.emf.ecore.EClass;
+
+public class Util {
+	public static boolean isTypeOrSuper(EClass eClass, EClass element) {
+		return eClass.equals(element) || element.getEAllSuperTypes().contains(eClass);
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 83e387423f..e946c8df8f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -16,6 +16,7 @@
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -40,6 +41,7 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
 public class AddonsEditor extends AbstractComponentEditor {
@@ -145,9 +147,22 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.AddonsEditor_ClassURI);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			final IContributionClassCreator c = getEditor().getContributionCreator(ApplicationPackageImpl.Literals.ADDON);
+			if (project != null && c != null) {
+				final Link l = new Link(parent, SWT.NONE);
+				l.setText("<A>" + Messages.PartEditor_ClassURI + "</A>");
+				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+				l.addSelectionListener(new SelectionAdapter() {
+					@Override
+					public void widgetSelected(SelectionEvent e) {
+						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, l.getShell());
+					}
+				});
+			} else {
+				Label l = new Label(parent, SWT.NONE);
+				l.setText(Messages.AddonsEditor_ClassURI);
+				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			}
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index 719aecf4cb..fe4d7f7178 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -196,11 +196,6 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		{
-			Label l = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
-			l.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 3, 1));
-		}
-
 		{
 			IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
index 2aae8de99a..16974d80e1 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
@@ -28,6 +28,8 @@
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
 
 public abstract class AbstractNewClassWizard extends Wizard implements INewWizard {
 	protected IPackageFragmentRoot root;
@@ -35,7 +37,6 @@ public abstract class AbstractNewClassWizard extends Wizard implements INewWizar
 	
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
 		root = getFragmentRoot(getInitialJavaElement(selection));
-		System.err.println("Root: " + root);
 	}
 
 	protected IJavaElement getInitialJavaElement(IStructuredSelection selection) {
@@ -129,6 +130,7 @@ public boolean performFinish() {
 					file.setContents(new ByteArrayInputStream(content.getBytes()),
 							IFile.FORCE | IFile.KEEP_HISTORY, null);
 				}
+				IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
 				unit.open(null);
 			} catch (CoreException e) {
 				// TODO Auto-generated catch block
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
new file mode 100644
index 0000000000..a7710aff75
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.classes;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.e4.internal.tools.wizards.classes.templates.AddonTemplate;
+import org.eclipse.swt.widgets.Composite;
+
+public class NewAddonClassWizard extends AbstractNewClassWizard {
+	@Override
+	public void addPages() {
+		addPage(new AbstractNewClassPage("Classinformation",
+				"New Handler",
+				"Create a new handler class", root, ResourcesPlugin.getWorkspace().getRoot()) {
+
+					@Override
+					protected void createFields(Composite parent,
+							DataBindingContext dbc) {
+					}
+
+					@Override
+					protected JavaClass createInstance() {
+						return new JavaClass(root);
+					}
+			
+		});
+	}
+	
+	@Override
+	protected String getContent() {
+		AddonTemplate template = new AddonTemplate();
+		return template.generate(getDomainClass());
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
new file mode 100644
index 0000000000..52be770c3d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
@@ -0,0 +1,32 @@
+package org.eclipse.e4.internal.tools.wizards.classes.templates;
+
+import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
+
+public class AddonTemplate
+{
+  protected static String nl;
+  public static synchronized AddonTemplate create(String lineSeparator)
+  {
+    nl = lineSeparator;
+    AddonTemplate result = new AddonTemplate();
+    nl = null;
+    return result;
+  }
+
+  public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+  protected final String TEXT_1 = " " + NL + "package ";
+  protected final String TEXT_2 = ";" + NL + "" + NL + "import javax.inject.Inject;" + NL + "import javax.annotation.PostConstruct;" + NL + "import javax.annotation.PreDestroy;" + NL + "" + NL + "import org.eclipse.e4.core.services.events.IEventBroker;" + NL + "" + NL + "public class ";
+  protected final String TEXT_3 = " {" + NL + "\t@Inject" + NL + "\tIEventBroker eventBroker;" + NL + "\t" + NL + "\t@PostConstruct" + NL + "\tvoid hookListeners() {" + NL + "\t\t// Hook event listeners" + NL + "\t}" + NL + "\t" + NL + "\t@PreDestroy" + NL + "\tvoid unhookListeners() {" + NL + "\t\t// Unhook event listeners" + NL + "\t}" + NL + "}";
+
+  public String generate(Object argument)
+  {
+    final StringBuffer stringBuffer = new StringBuffer();
+     JavaClass domainClass = (JavaClass)argument; 
+    stringBuffer.append(TEXT_1);
+    stringBuffer.append( domainClass.getPackageFragment().getElementName() );
+    stringBuffer.append(TEXT_2);
+    stringBuffer.append( domainClass.getName() );
+    stringBuffer.append(TEXT_3);
+    return stringBuffer.toString();
+  }
+}
diff --git a/bundles/org.eclipse.e4.tools/templates/addon.txtjet b/bundles/org.eclipse.e4.tools/templates/addon.txtjet
new file mode 100644
index 0000000000..32436d2b30
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/templates/addon.txtjet
@@ -0,0 +1,24 @@
+<%@ jet package="org.eclipse.e4.internal.tools.wizards.classes.templates" class="AddonTemplate" imports="org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass" %>
+<% JavaClass domainClass = (JavaClass)argument; %> 
+package <%= domainClass.getPackageFragment().getElementName() %>;
+
+import javax.inject.Inject;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+
+import org.eclipse.e4.core.services.events.IEventBroker;
+
+public class <%= domainClass.getName() %> {
+	@Inject
+	IEventBroker eventBroker;
+	
+	@PostConstruct
+	void hookListeners() {
+		// Hook event listeners
+	}
+	
+	@PreDestroy
+	void unhookListeners() {
+		// Unhook event listeners
+	}
+}
\ No newline at end of file

From 5618c47456c8f92d224ff018427f842db83f058c Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 6 Jul 2010 22:24:08 +0000
Subject: [PATCH 0191/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling

---
 .../internal/tools/wizards/classes/NewAddonClassWizard.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
index a7710aff75..fba02f96fb 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
@@ -19,8 +19,8 @@ public class NewAddonClassWizard extends AbstractNewClassWizard {
 	@Override
 	public void addPages() {
 		addPage(new AbstractNewClassPage("Classinformation",
-				"New Handler",
-				"Create a new handler class", root, ResourcesPlugin.getWorkspace().getRoot()) {
+				"New Addon",
+				"Create a new addon class", root, ResourcesPlugin.getWorkspace().getRoot()) {
 
 					@Override
 					protected void createFields(Composite parent,

From ff668f46881d7d5c559ba35aa4defe1dd101afbd Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 8 Jul 2010 09:23:12 +0000
Subject: [PATCH 0192/1286]  Bug 308439 -  Correct plugin for e4 wizards

---
 bundles/org.eclipse.e4.tools/build.properties | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/build.properties b/bundles/org.eclipse.e4.tools/build.properties
index e9863e281e..02422f7fd3 100644
--- a/bundles/org.eclipse.e4.tools/build.properties
+++ b/bundles/org.eclipse.e4.tools/build.properties
@@ -2,4 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml
+               plugin.xml,\
+               icons/,\
+               templates/

From f5b2c4e2a732e2d3bbdaa6dcca04659f9dee9e36 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 8 Jul 2010 10:28:50 +0000
Subject: [PATCH 0193/1286]  Bug 319250 -  [Model Tooling] Shortcut to open
 liveeditor only works once


From a2e3d15be79f82dcfbcdd693f8b0c5bc842ba42e Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 8 Jul 2010 15:50:25 +0000
Subject: [PATCH 0194/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * added support for model reference searching in
 workspace

---
 .../META-INF/MANIFEST.MF                      |   5 +-
 .../OSGI-INF/workspacee4xmiprovider.xml       |   7 +
 .../build.properties                          |   3 +-
 .../emf/editor3x/ModelElementProvider.java    | 109 ++++++++++
 .../OSGI-INF/contributioncollector.xml        |   1 +
 .../emf/ui/common/IModelElementProvider.java  |  26 +++
 .../common/ClassContributionCollector.java    |  35 ++-
 .../common/component/ControlFactory.java      |   2 +-
 .../dialogs/FindImportElementDialog.java      | 202 +++++++++++++-----
 9 files changed, 324 insertions(+), 66 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/workspacee4xmiprovider.xml
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelElementProvider.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 33eead93a8..f469004729 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -26,6 +26,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.tools.compat;bundle-version="1.0.0",
  org.eclipse.e4.tools.services;bundle-version="1.0.0",
  org.eclipse.e4.tools;bundle-version="0.9.0",
- org.eclipse.jdt.ui;bundle-version="3.6.0"
-Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/projectfunction.xml
+ org.eclipse.jdt.ui;bundle-version="3.6.0",
+ org.eclipse.search;bundle-version="3.6.0"
+Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/projectfunction.xml, OSGI-INF/workspacee4xmiprovider.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/workspacee4xmiprovider.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/workspacee4xmiprovider.xml
new file mode 100644
index 0000000000..cd3b8d23e9
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/workspacee4xmiprovider.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.eclipse.e4.tools.emf.editor3x.workspacee4xmiprovider">
+   <implementation class="org.eclipse.e4.tools.emf.editor3x.ModelElementProvider"/>
+   <service>
+      <provide interface="org.eclipse.e4.tools.emf.ui.common.IModelElementProvider"/>
+   </service>
+</scr:component>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
index 4f0aef779f..dadf4c01ee 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
@@ -3,5 +3,6 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
-               OSGI-INF/
+               OSGI-INF/,\
+               OSGI-INF/workspacee4xmiprovider.xml
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelElementProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelElementProvider.java
new file mode 100644
index 0000000000..f5e463bfcb
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelElementProvider.java
@@ -0,0 +1,109 @@
+package org.eclipse.e4.tools.emf.editor3x;
+
+import java.util.regex.Pattern;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
+import org.eclipse.emf.common.util.TreeIterator;
+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.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.search.core.text.TextSearchEngine;
+import org.eclipse.search.core.text.TextSearchRequestor;
+import org.eclipse.search.core.text.TextSearchScope;
+
+//FIXME In the next release we could probably use EMF-Query
+public class ModelElementProvider implements IModelElementProvider {
+	private ResourceSet resourceSet;
+
+	public void getModelElements(Filter filter, ModelResultHandler handler) {
+		if (resourceSet == null) {
+			resourceSet = new ResourceSetImpl();
+			TextSearchEngine engine = TextSearchEngine.createDefault();
+			TextSearchScope scope = TextSearchScope
+					.newSearchScope(new IResource[] { ResourcesPlugin
+							.getWorkspace().getRoot() }, Pattern
+							.compile(".+\\.e4xmi"), true);
+			engine.search(scope, new RequestorImpl(filter, handler),
+					Pattern.compile(".+\\.e4xmi"), null);
+		} else {
+			applyFilter(filter, handler);
+		}
+	}
+	
+	private void applyFilter(Filter filter, ModelResultHandler handler) {
+		for (Resource res : resourceSet.getResources()) {
+			if (res.getURI().equals(filter.object.eResource().getURI())) {
+//				System.err.println("Skipped because self");
+			} else {
+				TreeIterator<EObject> it = EcoreUtil.getAllContents(res,
+						true);
+				while (it.hasNext()) {
+					EObject o = it.next();
+					if (o.eContainingFeature() == FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
+//						System.err
+//								.println("Skipped because it is an import");
+					} else {
+						if (o.eClass().equals(filter.object.eClass())) {
+
+							if (o instanceof MApplicationElement) {
+								String elementId = ((MApplicationElement) o).getElementId();
+								if( elementId != null && elementId.trim().length() > 0 ) {
+									if( filter.elementIdPattern.matcher(elementId).matches() ) {
+										handler.result(o);
+									}										
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	class RequestorImpl extends TextSearchRequestor {
+		private final Filter filter;
+		private final ModelResultHandler handler;
+
+		public RequestorImpl(Filter filter, ModelResultHandler handler) {
+			this.filter = filter;
+			this.handler = handler;
+		}
+
+		@Override
+		public boolean acceptFile(IFile file) throws CoreException {
+			try {
+				if( file.getProject().isOpen() ) {
+					resourceSet.getResource(URI.createPlatformResourceURI("/"
+							+ file.getFullPath().makeRelative().toString(), true),
+							true);
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			return super.acceptFile(file);
+		}
+
+		@Override
+		public void endReporting() {
+			applyFilter(filter, handler);
+			super.endReporting();
+		}
+	}
+
+	public void clearCache() {
+		for (Resource r : resourceSet.getResources()) {
+			r.unload();
+		}
+		resourceSet = null;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml
index 42e124fe44..fca98c87e2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml
@@ -5,4 +5,5 @@
    <service>
       <provide interface="org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector"/>
    </service>
+   <reference bind="addModelElementContributor" cardinality="0..n" interface="org.eclipse.e4.tools.emf.ui.common.IModelElementProvider" name="IModelElementProvider" policy="dynamic" unbind="removeModelElementContributor"/>
 </scr:component>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
new file mode 100644
index 0000000000..b9f03d1af6
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
@@ -0,0 +1,26 @@
+package org.eclipse.e4.tools.emf.ui.common;
+
+import java.util.regex.Pattern;
+import org.eclipse.emf.ecore.EObject;
+
+public interface IModelElementProvider {
+	public class Filter {
+		public final EObject object;
+		public final String elementId;
+		public final Pattern elementIdPattern;
+
+		public Filter(EObject object, String elementId) {
+			this.object = object;
+			this.elementId = elementId;
+			this.elementIdPattern = Pattern.compile(".*" + elementId.replaceAll("\\.", "\\\\.") + ".*");
+		}
+	}
+
+	public interface ModelResultHandler {
+		public void result(EObject data);
+	}
+
+	public void getModelElements(Filter filter, ModelResultHandler handler);
+
+	public void clearCache();
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
index b642e95558..6862765b12 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
@@ -10,27 +10,50 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
-
 import java.util.concurrent.CopyOnWriteArrayList;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionResultHandler;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
+import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider;
+import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.ModelResultHandler;
 
 public class ClassContributionCollector {
 	private CopyOnWriteArrayList<IClassContributionProvider> providers = new CopyOnWriteArrayList<IClassContributionProvider>();
-	
+	private CopyOnWriteArrayList<IModelElementProvider> modelElementProviders = new CopyOnWriteArrayList<IModelElementProvider>();
+
 	public void addContributor(IClassContributionProvider contributor) {
 		providers.add(contributor);
 	}
-	
+
 	public void removeContributor(IClassContributionProvider contributor) {
 		providers.remove(contributor);
 	}
-	
+
+	public void addModelElementContributor(IModelElementProvider provider) {
+		modelElementProviders.add(provider);
+	}
+
+	public void removeModelElementContributor(IModelElementProvider provider) {
+		modelElementProviders.remove(provider);
+	}
+
 	public void findContributions(Filter filter, ContributionResultHandler resultHandler) {
-		
-		for( IClassContributionProvider contributor: providers ) {
+
+		for (IClassContributionProvider contributor : providers) {
 			contributor.findContribution(filter, resultHandler);
 		}
 	}
+
+	public void findModelElements(org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.Filter filter, ModelResultHandler resultHandler) {
+
+		for (IModelElementProvider contributor : modelElementProviders) {
+			contributor.getModelElements(filter, resultHandler);
+		}
+	}
+
+	public void clearModelCache() {
+		for (IModelElementProvider contributor : modelElementProviders) {
+			contributor.clearCache();
+		}
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 289a2e9870..1623bacaf4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -260,7 +260,7 @@ public static void createFindImport(Composite parent, final AbstractComponentEdi
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				FindImportElementDialog dialog = new FindImportElementDialog(b.getShell(), editor.getEditingDomain(), (EObject) editor.getMaster().getValue());
+				FindImportElementDialog dialog = new FindImportElementDialog(b.getShell(), editor, (EObject) editor.getMaster().getValue());
 				dialog.open();
 			}
 		});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index 9a508b9271..d10fbb4f7a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -1,94 +1,184 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.Filter;
+import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.ModelResultHandler;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.TableViewer;
-
-import org.eclipse.e4.ui.model.application.MApplication;
-
-import org.eclipse.swt.widgets.Button;
-
-import org.eclipse.swt.widgets.Text;
-
-import org.eclipse.swt.layout.GridLayout;
-
-import org.eclipse.swt.widgets.Label;
-
-import org.eclipse.swt.layout.GridData;
-
+import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.swt.SWT;
-
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
-
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
-
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.emf.edit.domain.EditingDomain;
-
-import org.eclipse.emf.ecore.EObject;
-
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.swt.widgets.Text;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
 
 public class FindImportElementDialog extends TitleAreaDialog {
-	private MApplication runningApp;
-	
-	public FindImportElementDialog(Shell parentShell, EditingDomain domain, EObject element/*, MApplication runningApp*/) {
+	private EObject element;
+	private AbstractComponentEditor editor;
+	private TableViewer viewer;
+
+	public FindImportElementDialog(Shell parentShell, AbstractComponentEditor editor, EObject element) {
 		super(parentShell);
-		this.runningApp = runningApp;
+		this.element = element;
+		this.editor = editor;
 	}
-	
+
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite comp = (Composite) super.createDialogArea(parent);
-		
+
 		final Image titleImage = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/import_wiz.png"));
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
-			
+
 			public void widgetDisposed(DisposeEvent e) {
 				titleImage.dispose();
 			}
 		});
-		
+
 		getShell().setText("Find Import Elements");
 		setTitle("Find Import Elements");
 		setMessage("Search for an elements whose ID you'd like to import");
-		
-		Composite container = new Composite(comp,SWT.NONE);
+
+		Composite container = new Composite(comp, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		container.setLayout(new GridLayout(3, false));
-		
-		
+		container.setLayout(new GridLayout(2, false));
+
 		Label l = new Label(container, SWT.NONE);
 		l.setText("Search");
-		
+
 		final Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		searchText.setLayoutData(gd);
-		
-		new Label(container, SWT.NONE);
-
-		l = new Label(container, SWT.NONE);
-		l.setText("File");
-		
-		Text t = new Text(container, SWT.BORDER);
-		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		t.setText("memory://running-model");
-		
-		Button b = new Button(container, SWT.PUSH);
-		b.setText("Browse");
-		
+
 		l = new Label(container, SWT.PUSH);
-		
-		TableViewer viewer = new TableViewer(container);
+
+		viewer = new TableViewer(container);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-		
+		viewer.setLabelProvider(new StyledCellLabelProvider() {
+			@Override
+			public void update(ViewerCell cell) {
+				EObject o = (EObject) cell.getElement();
+				cell.setImage(editor.getImage(o, searchText.getDisplay()));
+
+				StyledString styledString = new StyledString(editor.getLabel(o), null);
+				String detailLabel = editor.getDetailLabel(o);
+				if (detailLabel != null) {
+					styledString.append(" - " + detailLabel, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+				}
+
+				styledString.append(" - " + o.eResource().getURI(), StyledString.COUNTER_STYLER); //$NON-NLS-1$
+				cell.setStyleRanges(styledString.getStyleRanges());
+				cell.setText(styledString.getString());
+			}
+		});
+		viewer.setContentProvider(new ObservableListContentProvider());
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+
+			public void doubleClick(DoubleClickEvent event) {
+				okPressed();
+			}
+		});
+
+		final WritableList list = new WritableList();
+		viewer.setInput(list);
+
+		final ClassContributionCollector collector = getCollector();
+
+		searchText.addModifyListener(new ModifyListener() {
+			private ModelResultHandlerImpl currentResultHandler;
+
+			public void modifyText(ModifyEvent e) {
+				if (currentResultHandler != null) {
+					currentResultHandler.cancled = true;
+				}
+				list.clear();
+				currentResultHandler = new ModelResultHandlerImpl(list);
+				Filter filter = new Filter(element, searchText.getText());
+				collector.findModelElements(filter, currentResultHandler);
+			}
+		});
+
+		Button button = new Button(container, SWT.PUSH);
+		button.setText("Clear Cache");
+		button.setLayoutData(new GridData(GridData.END, GridData.CENTER, true, false, 2, 1));
+		button.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				collector.clearModelCache();
+			}
+		});
+
 		return comp;
 	}
+
+	@Override
+	protected void okPressed() {
+		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+		if (!s.isEmpty()) {
+			MApplicationElement el = (MApplicationElement) s.getFirstElement();
+			if (el.getElementId() != null && el.getElementId().trim().length() > 0) {
+				Command cmd = SetCommand.create(editor.getEditingDomain(), element, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, el.getElementId());
+				if (cmd.canExecute()) {
+					editor.getEditingDomain().getCommandStack().execute(cmd);
+				}
+			}
+			super.okPressed();
+		}
+	}
+
+	private ClassContributionCollector getCollector() {
+		Bundle bundle = FrameworkUtil.getBundle(FindImportElementDialog.class);
+		BundleContext context = bundle.getBundleContext();
+		ServiceReference ref = context.getServiceReference(ClassContributionCollector.class.getName());
+		if (ref != null) {
+			return (ClassContributionCollector) context.getService(ref);
+		}
+		return null;
+	}
+
+	private static class ModelResultHandlerImpl implements ModelResultHandler {
+		private boolean cancled = false;
+		private IObservableList list;
+
+		public ModelResultHandlerImpl(IObservableList list) {
+			this.list = list;
+		}
+
+		public void result(EObject data) {
+			if (!cancled) {
+				list.add(data);
+			}
+		}
+
+	}
 }
\ No newline at end of file

From 9774a636b3e0d5f9b0b2a41cbc4477644255e28a Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 8 Jul 2010 18:01:13 +0000
Subject: [PATCH 0195/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * added support for model reference searching in
 workspace

---
 .../META-INF/MANIFEST.MF                      |  5 ++-
 .../emf/ui/common/IModelElementProvider.java  |  2 +-
 .../dialogs/FindImportElementDialog.java      | 31 +++++++++++++++----
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index f469004729..a521ba15df 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -26,7 +26,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.tools.compat;bundle-version="1.0.0",
  org.eclipse.e4.tools.services;bundle-version="1.0.0",
  org.eclipse.e4.tools;bundle-version="0.9.0",
- org.eclipse.jdt.ui;bundle-version="3.6.0",
- org.eclipse.search;bundle-version="3.6.0"
-Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/projectfunction.xml, OSGI-INF/workspacee4xmiprovider.xml
+ org.eclipse.jdt.ui;bundle-version="3.6.0"
+Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/projectfunction.xml, OSGI-INF/pdee4xmiprovider.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
index b9f03d1af6..6c5cf3b0c6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
@@ -12,7 +12,7 @@ public class Filter {
 		public Filter(EObject object, String elementId) {
 			this.object = object;
 			this.elementId = elementId;
-			this.elementIdPattern = Pattern.compile(".*" + elementId.replaceAll("\\.", "\\\\.") + ".*");
+			this.elementIdPattern = Pattern.compile(".*" + elementId.replaceAll("\\.", "\\\\.").replaceAll("\\*", ".*") + ".*");
 		}
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index d10fbb4f7a..5eb756e889 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -90,9 +90,10 @@ public void update(ViewerCell cell) {
 				EObject o = (EObject) cell.getElement();
 				cell.setImage(editor.getImage(o, searchText.getDisplay()));
 
-				StyledString styledString = new StyledString(editor.getLabel(o), null);
+				MApplicationElement appEl = (MApplicationElement) o;
+				StyledString styledString = new StyledString(editor.getLabel(o) + " (" + appEl.getElementId() + ")", null);
 				String detailLabel = editor.getDetailLabel(o);
-				if (detailLabel != null) {
+				if (detailLabel != null && !detailLabel.equals(appEl.getElementId())) {
 					styledString.append(" - " + detailLabel, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 				}
 
@@ -122,8 +123,8 @@ public void modifyText(ModifyEvent e) {
 					currentResultHandler.cancled = true;
 				}
 				list.clear();
-				currentResultHandler = new ModelResultHandlerImpl(list);
 				Filter filter = new Filter(element, searchText.getText());
+				currentResultHandler = new ModelResultHandlerImpl(list, filter, editor);
 				collector.findModelElements(filter, currentResultHandler);
 			}
 		});
@@ -169,16 +170,34 @@ private ClassContributionCollector getCollector() {
 	private static class ModelResultHandlerImpl implements ModelResultHandler {
 		private boolean cancled = false;
 		private IObservableList list;
+		private Filter filter;
+		private AbstractComponentEditor editor;
 
-		public ModelResultHandlerImpl(IObservableList list) {
+		public ModelResultHandlerImpl(IObservableList list, Filter filter, AbstractComponentEditor editor) {
 			this.list = list;
+			this.filter = filter;
+			this.editor = editor;
 		}
 
 		public void result(EObject data) {
 			if (!cancled) {
-				list.add(data);
+				if (data instanceof MApplicationElement) {
+					String elementId = ((MApplicationElement) data).getElementId();
+					if (elementId != null && elementId.trim().length() > 0) {
+						if (filter.elementIdPattern.matcher(elementId).matches()) {
+							list.add(data);
+							return;
+						}
+					}
+
+					String label = editor.getDetailLabel(data);
+					if (label != null && label.trim().length() > 0) {
+						if (filter.elementIdPattern.matcher(label).matches()) {
+							list.add(data);
+						}
+					}
+				}
 			}
 		}
-
 	}
 }
\ No newline at end of file

From 934287024eaae60f12c9e833cc60de05d4430c2e Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 8 Jul 2010 18:06:08 +0000
Subject: [PATCH 0196/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * added support for model reference searching in
 workspace

---
 ...e4xmiprovider.xml => pdee4xmiprovider.xml} |   4 +-
 .../build.properties                          |   3 +-
 .../emf/editor3x/ModelElementProvider.java    | 109 ----------------
 .../emf/editor3x/TargetElementProviders.java  | 122 ++++++++++++++++++
 .../dialogs/FindImportElementDialog.java      |   6 +-
 5 files changed, 129 insertions(+), 115 deletions(-)
 rename bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/{workspacee4xmiprovider.xml => pdee4xmiprovider.xml} (58%)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelElementProvider.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/workspacee4xmiprovider.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdee4xmiprovider.xml
similarity index 58%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/workspacee4xmiprovider.xml
rename to bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdee4xmiprovider.xml
index cd3b8d23e9..54795752ac 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/workspacee4xmiprovider.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdee4xmiprovider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.eclipse.e4.tools.emf.editor3x.workspacee4xmiprovider">
-   <implementation class="org.eclipse.e4.tools.emf.editor3x.ModelElementProvider"/>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.eclipse.e4.tools.emf.editor3x.pdee4xmiprovider">
+   <implementation class="org.eclipse.e4.tools.emf.editor3x.TargetElementProviders"/>
    <service>
       <provide interface="org.eclipse.e4.tools.emf.ui.common.IModelElementProvider"/>
    </service>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
index dadf4c01ee..4f0aef779f 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
@@ -3,6 +3,5 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
-               OSGI-INF/,\
-               OSGI-INF/workspacee4xmiprovider.xml
+               OSGI-INF/
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelElementProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelElementProvider.java
deleted file mode 100644
index f5e463bfcb..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelElementProvider.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.eclipse.e4.tools.emf.editor3x;
-
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider;
-import org.eclipse.e4.ui.model.application.MApplicationElement;
-import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
-import org.eclipse.emf.common.util.TreeIterator;
-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.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.search.core.text.TextSearchEngine;
-import org.eclipse.search.core.text.TextSearchRequestor;
-import org.eclipse.search.core.text.TextSearchScope;
-
-//FIXME In the next release we could probably use EMF-Query
-public class ModelElementProvider implements IModelElementProvider {
-	private ResourceSet resourceSet;
-
-	public void getModelElements(Filter filter, ModelResultHandler handler) {
-		if (resourceSet == null) {
-			resourceSet = new ResourceSetImpl();
-			TextSearchEngine engine = TextSearchEngine.createDefault();
-			TextSearchScope scope = TextSearchScope
-					.newSearchScope(new IResource[] { ResourcesPlugin
-							.getWorkspace().getRoot() }, Pattern
-							.compile(".+\\.e4xmi"), true);
-			engine.search(scope, new RequestorImpl(filter, handler),
-					Pattern.compile(".+\\.e4xmi"), null);
-		} else {
-			applyFilter(filter, handler);
-		}
-	}
-	
-	private void applyFilter(Filter filter, ModelResultHandler handler) {
-		for (Resource res : resourceSet.getResources()) {
-			if (res.getURI().equals(filter.object.eResource().getURI())) {
-//				System.err.println("Skipped because self");
-			} else {
-				TreeIterator<EObject> it = EcoreUtil.getAllContents(res,
-						true);
-				while (it.hasNext()) {
-					EObject o = it.next();
-					if (o.eContainingFeature() == FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
-//						System.err
-//								.println("Skipped because it is an import");
-					} else {
-						if (o.eClass().equals(filter.object.eClass())) {
-
-							if (o instanceof MApplicationElement) {
-								String elementId = ((MApplicationElement) o).getElementId();
-								if( elementId != null && elementId.trim().length() > 0 ) {
-									if( filter.elementIdPattern.matcher(elementId).matches() ) {
-										handler.result(o);
-									}										
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	class RequestorImpl extends TextSearchRequestor {
-		private final Filter filter;
-		private final ModelResultHandler handler;
-
-		public RequestorImpl(Filter filter, ModelResultHandler handler) {
-			this.filter = filter;
-			this.handler = handler;
-		}
-
-		@Override
-		public boolean acceptFile(IFile file) throws CoreException {
-			try {
-				if( file.getProject().isOpen() ) {
-					resourceSet.getResource(URI.createPlatformResourceURI("/"
-							+ file.getFullPath().makeRelative().toString(), true),
-							true);
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-
-			return super.acceptFile(file);
-		}
-
-		@Override
-		public void endReporting() {
-			applyFilter(filter, handler);
-			super.endReporting();
-		}
-	}
-
-	public void clearCache() {
-		for (Resource r : resourceSet.getResources()) {
-			r.unload();
-		}
-		resourceSet = null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
new file mode 100644
index 0000000000..c9c753471b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
@@ -0,0 +1,122 @@
+package org.eclipse.e4.tools.emf.editor3x;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider;
+import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.Filter;
+import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.ModelResultHandler;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
+import org.eclipse.emf.common.util.TreeIterator;
+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.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.pde.core.plugin.IPluginModelBase;
+import org.eclipse.pde.internal.core.PDECore;
+import org.eclipse.pde.internal.core.PDEExtensionRegistry;
+import org.eclipse.pde.internal.core.PluginModelManager;
+
+public class TargetElementProviders implements IModelElementProvider {
+	private ResourceSet resourceSet;
+	
+	public void getModelElements(Filter filter, ModelResultHandler handler) {
+		if( resourceSet == null ) {
+			resourceSet = new ResourceSetImpl();
+			PDEExtensionRegistry reg = new PDEExtensionRegistry();
+			IExtension[] extensions = reg.findExtensions("org.eclipse.e4.workbench.model", true);
+			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+			
+			for( IExtension ext : extensions ) {
+				for( IConfigurationElement el : ext.getConfigurationElements() ) {
+					if( el.getName().equals("fragment") ) {
+						URI uri;
+//						System.err.println("Model-Ext: Checking: " + ext.getContributor().getName());
+						IProject p = root.getProject(ext.getContributor().getName());
+						if( p.exists() && p.isOpen() ) {
+							uri = URI.createPlatformResourceURI(ext.getContributor().getName() + "/" + el.getAttribute("uri"), true);	
+						} else {
+							uri = URI.createURI("platform:/plugin/" + ext.getContributor().getName() + "/" + el.getAttribute("uri") );							
+						}
+//						System.err.println(uri);
+						try {
+							resourceSet.getResource(uri, true);							
+						} catch (Exception e) {
+							e.printStackTrace();
+//							System.err.println("=============> Failing");
+						}
+
+					}
+				}
+			}
+			
+			extensions = reg.findExtensions("org.eclipse.core.runtime.products", true);
+			for( IExtension ext : extensions ) {
+				for( IConfigurationElement el : ext.getConfigurationElements() ) {
+					if( el.getName().equals("product") ) {
+						for( IConfigurationElement prop: el.getChildren("property") ) {
+							if( prop.getAttribute("name").equals("applicationXMI") ) {
+								String v = prop.getAttribute("value");
+								String[] s = v.split("/");
+								URI uri;
+//								System.err.println("Product-Ext: Checking: " + v + " => P:" +  s[0] + "");
+								IProject p = root.getProject(s[0]);
+								if( p.exists() && p.isOpen() ) {
+									uri = URI.createPlatformResourceURI(v, true );	
+								} else {
+									uri = URI.createURI("platform:/plugin/" + v );
+								}
+								
+//								System.err.println(uri);
+								try {
+									resourceSet.getResource(uri, true);							
+								} catch (Exception e) {
+									e.printStackTrace();
+//									System.err.println("=============> Failing");
+								}
+								break;
+							}
+						}
+					}
+				}
+			}			
+		}
+		
+		applyFilter(filter, handler);
+	}
+	
+	private void applyFilter(Filter filter, ModelResultHandler handler) {
+		for (Resource res : resourceSet.getResources()) {
+			if (res.getURI().equals(filter.object.eResource().getURI())) {
+//				System.err.println("Skipped because self");
+			} else {
+				TreeIterator<EObject> it = EcoreUtil.getAllContents(res,
+						true);
+				while (it.hasNext()) {
+					EObject o = it.next();
+					if (o.eContainingFeature() == FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
+//						System.err
+//								.println("Skipped because it is an import");
+					} else {
+						if (o.eClass().equals(filter.object.eClass())) {
+							handler.result(o);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	public void clearCache() {
+		for (Resource r : resourceSet.getResources()) {
+			r.unload();
+		}
+		resourceSet = null;
+	}
+	
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index 5eb756e889..0f71fd7c5f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -83,7 +83,9 @@ public void widgetDisposed(DisposeEvent e) {
 		l = new Label(container, SWT.PUSH);
 
 		viewer = new TableViewer(container);
-		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+		gd = new GridData(GridData.FILL_BOTH);
+		gd.heightHint = 200;
+		viewer.getControl().setLayoutData(gd);
 		viewer.setLabelProvider(new StyledCellLabelProvider() {
 			@Override
 			public void update(ViewerCell cell) {
@@ -191,7 +193,7 @@ public void result(EObject data) {
 					}
 
 					String label = editor.getDetailLabel(data);
-					if (label != null && label.trim().length() > 0) {
+					if (elementId != null && label != null && label.trim().length() > 0) {
 						if (filter.elementIdPattern.matcher(label).matches()) {
 							list.add(data);
 						}

From ad9de3020e3971ce58214d126175533c147aa824 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 8 Jul 2010 18:35:05 +0000
Subject: [PATCH 0197/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * added support moving entries between models

---
 .../emf/ui/internal/common/ModelEditor.java     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index e9cbc7d446..cefdeededc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -844,6 +844,16 @@ public boolean performDrop(Object data) {
 					}
 				}
 
+				if (feature == FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
+					MApplicationElement el = (MApplicationElement) EcoreUtil.create(((EObject) data).eClass());
+					el.setElementId(((MApplicationElement) data).getElementId());
+					Command cmd = AddCommand.create(domain, parent, feature, el);
+					if (cmd.canExecute()) {
+						domain.getCommandStack().execute(cmd);
+					}
+					return true;
+				}
+
 				if (feature != null && parent != null) {
 					List<Object> list = (List<Object>) parent.eGet(feature);
 					int index = list.indexOf(getCurrentTarget());
@@ -856,11 +866,18 @@ public boolean performDrop(Object data) {
 						Command cmd = MoveCommand.create(domain, parent, feature, data, index);
 						if (cmd.canExecute()) {
 							domain.getCommandStack().execute(cmd);
+							return true;
 						}
 					} else {
+						// Moving between different sources is always a copy
+						if (parent.eResource() != ((EObject) data).eResource()) {
+							data = EcoreUtil.copy((EObject) data);
+						}
+
 						Command cmd = AddCommand.create(domain, parent, feature, data, index);
 						if (cmd.canExecute()) {
 							domain.getCommandStack().execute(cmd);
+							return true;
 						}
 					}
 				}

From 2d1c27f4ef14f7d0689d047f13bbd31cd0428848 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 8 Jul 2010 18:59:21 +0000
Subject: [PATCH 0198/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed context problem

---
 .../src/org/eclipse/e4/tools/compat/internal/PartHelper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
index 5c74bc6456..aceae1ebf8 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
@@ -42,7 +42,7 @@ public static IEclipseContext createPartContext(WorkbenchPart part) throws PartI
 				Object instance = site.getService(clazz);
 				Method m = clazz.getMethod("getContext", new Class[0]);
 				IEclipseContext ctx = (IEclipseContext) m.invoke(instance);
-				IEclipseContext rv = ctx;
+				IEclipseContext rv = ctx.createChild();
 				while( ctx.getParent() != null ) {
 					ctx = ctx.getParent();
 				}

From 47476fef478c86be6b865d694d8a131fddb8ef6c Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 8 Jul 2010 20:00:00 +0000
Subject: [PATCH 0199/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * adding toberendered and visible attributes

---
 .../component/AbstractComponentEditor.java    | 38 ++++++++------
 .../common/ComponentLabelProvider.java        | 52 ++++++++++++++-----
 .../common/component/ApplicationEditor.java   |  3 ++
 .../common/component/ControlFactory.java      | 11 ++++
 .../component/MenuContributionEditor.java     |  3 ++
 .../internal/common/component/MenuEditor.java |  3 ++
 .../common/component/MenuItemEditor.java      |  3 ++
 .../internal/common/component/PartEditor.java |  3 ++
 .../component/PartSashContainerEditor.java    |  3 ++
 .../common/component/PartStackEditor.java     |  3 ++
 .../common/component/PerspectiveEditor.java   |  3 ++
 .../component/PerspectiveStackEditor.java     |  3 ++
 .../component/ToolBarContributionEditor.java  |  3 ++
 .../common/component/ToolBarEditor.java       |  3 ++
 .../component/ToolBarSeparatorEditor.java     |  4 ++
 .../common/component/ToolControlEditor.java   |  4 ++
 .../common/component/ToolItemEditor.java      |  3 ++
 .../common/component/TrimBarEditor.java       |  3 ++
 .../component/TrimContributionEditor.java     |  3 ++
 .../common/component/WindowEditor.java        |  3 ++
 20 files changed, 125 insertions(+), 29 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 5ca17b80a6..ab6a55b6b1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -14,9 +14,7 @@
 import java.io.InputStream;
 import java.net.URL;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.runtime.FileLocator;
@@ -24,6 +22,7 @@
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
+import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -31,7 +30,10 @@
 public abstract class AbstractComponentEditor {
 	private EditingDomain editingDomain;
 
-	private static Map<Integer, Image> IMAGE_MAP = new HashMap<Integer, Image>();
+	private static ImageRegistry IMG_REG = new ImageRegistry();
+	// private static Map<Integer, Image> IMAGE_MAP = new HashMap<Integer,
+	// Image>();
+
 	private static final String[] IMAGES = { "/icons/full/obj16/zoom.png", //$NON-NLS-1$
 	"/icons/full/obj16/table_add.png", //$NON-NLS-1$
 	"/icons/full/obj16/table_delete.png", //$NON-NLS-1$
@@ -69,12 +71,12 @@ public WritableValue getMaster() {
 	}
 
 	public Image getImage(Display d, int id) {
-		Image img = IMAGE_MAP.get(id);
+		Image img = IMG_REG.get(IMAGES[id]);
 		if (img == null) {
 			try {
 				InputStream in = AbstractComponentEditor.class.getClassLoader().getResourceAsStream(IMAGES[id]);
 				img = new Image(d, in);
-				IMAGE_MAP.put(id, img);
+				IMG_REG.put(IMAGES[id], img);
 				in.close();
 			} catch (IOException e) {
 				// TODO Auto-generated catch block
@@ -98,19 +100,23 @@ public Image getImage(Display d, int id) {
 	public abstract IObservableList getChildList(Object element);
 
 	protected Image loadSharedImage(Display d, URL path) {
-		try {
-			URL url = FileLocator.resolve(path);
-			if (url != null) {
-				InputStream in = url.openStream();
-				Image image = new Image(d, in);
-				in.close();
-				return image;
+		Image img = IMG_REG.get(path.toString());
+		if (img == null) {
+			try {
+				URL url = FileLocator.resolve(path);
+				if (url != null) {
+					InputStream in = url.openStream();
+					img = new Image(d, in);
+					IMG_REG.put(path.toString(), img);
+					in.close();
+				}
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
 			}
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
 		}
-		return null;
+
+		return img;
 	}
 
 	public FeaturePath[] getLabelProperties() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index 1ee616330e..9f4165c4c9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -11,11 +11,16 @@
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.StyledString.Styler;
 import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.graphics.TextStyle;
 
 public class ComponentLabelProvider extends StyledCellLabelProvider {
 	private Image modelComponentsImage;
@@ -27,23 +32,44 @@ public class ComponentLabelProvider extends StyledCellLabelProvider {
 
 	private ModelEditor editor;
 
+	private static Styler NOT_RENDERED_STYLER = new Styler() {
+		{
+			JFaceResources.getColorRegistry().put("NOT_RENDERED_STYLER", new RGB(200, 200, 200));
+		}
+
+		@Override
+		public void applyStyles(TextStyle textStyle) {
+			textStyle.foreground = JFaceResources.getColorRegistry().get("NOT_RENDERED_STYLER");
+		}
+	};
+
 	public ComponentLabelProvider(ModelEditor editor) {
 		this.editor = editor;
 	}
 
 	@Override
-    public void update(final ViewerCell cell) {
-		if( cell.getElement() instanceof EObject ) {
+	public void update(final ViewerCell cell) {
+		if (cell.getElement() instanceof EObject) {
 
 			EObject o = (EObject) cell.getElement();
 			AbstractComponentEditor elementEditor = editor.getEditor(o.eClass());
-			if( elementEditor != null ) {
+			if (elementEditor != null) {
 				String label = elementEditor.getLabel(o);
 				String detailText = elementEditor.getDetailLabel(o);
-				if( detailText == null ) {
-					cell.setText(label);
+				Styler styler = null;
+
+				if (o instanceof MUIElement) {
+					if (!((MUIElement) o).isToBeRendered()) {
+						styler = NOT_RENDERED_STYLER;
+					}
+				}
+
+				if (detailText == null) {
+					StyledString styledString = new StyledString(label, styler);
+					cell.setText(styledString.getString());
+					cell.setStyleRanges(styledString.getStyleRanges());
 				} else {
-					StyledString styledString = new StyledString(label, null);
+					StyledString styledString = new StyledString(label, styler);
 					styledString.append(" - " + detailText, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 					cell.setText(styledString.getString());
 					cell.setStyleRanges(styledString.getStyleRanges());
@@ -52,7 +78,7 @@ public void update(final ViewerCell cell) {
 			} else {
 				cell.setText(cell.getElement().toString());
 			}
-		} else if( cell.getElement() instanceof VirtualEntry<?> ) {
+		} else if (cell.getElement() instanceof VirtualEntry<?>) {
 			String s = cell.getElement().toString();
 			cell.setText(s);
 		} else {
@@ -62,32 +88,32 @@ public void update(final ViewerCell cell) {
 
 	@Override
 	public void dispose() {
-		if( modelComponentsImage != null ) {
+		if (modelComponentsImage != null) {
 			modelComponentsImage.dispose();
 			modelComponentsImage = null;
 		}
 
-		if( modelComonentImage != null ) {
+		if (modelComonentImage != null) {
 			modelComonentImage.dispose();
 			modelComonentImage = null;
 		}
 
-		if( partsImage != null ) {
+		if (partsImage != null) {
 			partsImage.dispose();
 			partsImage = null;
 		}
 
-		if( menusImage != null ) {
+		if (menusImage != null) {
 			menusImage.dispose();
 			menusImage = null;
 		}
 
-		if( partImage != null ) {
+		if (partImage != null) {
 			partImage.dispose();
 			partImage = null;
 		}
 
-		if( partDescriptorImage != null ) {
+		if (partDescriptorImage != null) {
 			partDescriptorImage.dispose();
 			partDescriptorImage = null;
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index b8d3d431bc..1b609c96a0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -149,6 +149,9 @@ public void widgetSelected(SelectionEvent e) {
 			createRemoveRootContext.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 		}
 
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+
 		ControlFactory.createStringListWidget(parent, this, "Variables", UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, this, "Binding Contexts", CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 1623bacaf4..783f3d3ac0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -477,4 +477,15 @@ private static void handleAddText(AbstractComponentEditor editor, EStructuralFea
 			tagText.setText(""); //$NON-NLS-1$
 		}
 	}
+
+	public static void createCheckBox(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty selectionProp, IEMFEditValueProperty modelProp) {
+		Label l = new Label(parent, SWT.NONE);
+		l.setText(label);
+		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+		Button t = new Button(parent, SWT.CHECK);
+		t.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
+		context.bindValue(selectionProp.observe(t), modelProp.observeDetail(master));
+
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 83d4fd7425..2eeab91cc2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -355,6 +355,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+
 		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 68a43a4030..db7589572c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -390,6 +390,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+
 		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 2029c67fa9..834022ca59 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -261,6 +261,9 @@ public Object convert(Object fromObject) {
 
 		createFormSubTypeForm(parent, context, master);
 
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+
 		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index eac5c60f48..8d7f8eb9fb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -319,6 +319,9 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		// ------------------------------------------------------------
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+
 		ControlFactory.createStringListWidget(parent, this, "Binding Contexts", CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, this, "Persisted State", ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, this, "Context Properties", UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index cade3f6e8c..ffbb5b20de 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -343,6 +343,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+
 		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 30fec8bb92..ce2e8bfa3d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -300,6 +300,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+
 		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 713677cb5f..58ab8c662b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -371,6 +371,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+
 		ControlFactory.createMapProperties(parent, this, "Context Properties", UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, this, "Variables", UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 50e532ce14..a720c365f7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -272,6 +272,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+
 		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 9423592a8b..2ea5fa8aec 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -357,6 +357,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+
 		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 8af7fc1e2c..b667d3d1dc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -323,6 +323,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index ed85e5d34a..e39e5088f9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -20,6 +20,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
@@ -132,6 +133,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index b8aaeafde2..fb93b7e6b2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -23,6 +23,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
@@ -164,6 +165,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+
 		ControlFactory.createMapProperties(parent, this, "Persisted State", ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 9d2f9401d7..3da617a176 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -246,6 +246,9 @@ public Object convert(Object fromObject) {
 
 		createSubTypeFormElements(parent, context, master);
 
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+
 		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index cf5520040d..df4c7349aa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -301,6 +301,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 6444965798..5a3d7340ab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -324,6 +324,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+
 		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index c289fa23ff..ca24845d44 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -310,6 +310,9 @@ public void widgetSelected(SelectionEvent e) {
 			createRemoveMainMenu.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 		}
 
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+
 		ControlFactory.createSelectedElement(parent, this, context, "Selected Element");
 		ControlFactory.createStringListWidget(parent, this, "Binding Contexts", CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, this, "Context Properties", UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);

From 65f16771d9f09b487566ae950beb2c6523de1696 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 8 Jul 2010 20:10:49 +0000
Subject: [PATCH 0200/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixing feature paths

---
 .../emf/ui/internal/common/component/ApplicationEditor.java | 6 ++++++
 .../internal/common/component/MenuContributionEditor.java   | 5 +++++
 .../tools/emf/ui/internal/common/component/MenuEditor.java  | 6 ++++++
 .../emf/ui/internal/common/component/MenuItemEditor.java    | 2 +-
 .../tools/emf/ui/internal/common/component/PartEditor.java  | 2 +-
 .../internal/common/component/PartSashContainerEditor.java  | 2 +-
 .../emf/ui/internal/common/component/PartStackEditor.java   | 6 ++++++
 .../emf/ui/internal/common/component/PerspectiveEditor.java | 3 +--
 .../internal/common/component/PerspectiveStackEditor.java   | 5 +++++
 .../common/component/ToolBarContributionEditor.java         | 5 +++++
 .../emf/ui/internal/common/component/ToolBarEditor.java     | 5 +++++
 .../internal/common/component/ToolBarSeparatorEditor.java   | 5 +++++
 .../emf/ui/internal/common/component/ToolControlEditor.java | 6 ++++++
 .../emf/ui/internal/common/component/ToolItemEditor.java    | 2 +-
 .../emf/ui/internal/common/component/TrimBarEditor.java     | 2 +-
 .../internal/common/component/TrimContributionEditor.java   | 5 +++++
 .../emf/ui/internal/common/component/WindowEditor.java      | 2 +-
 17 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 1b609c96a0..5e8b84e86f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -33,6 +33,7 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -282,4 +283,9 @@ public void handleValueChange(ValueChangeEvent event) {
 	public String getDetailLabel(Object element) {
 		return null;
 	}
+
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 2eeab91cc2..28807d5363 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -33,6 +33,7 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
@@ -368,4 +369,8 @@ public IObservableList getChildList(Object element) {
 		return ELEMENT_CONTAINER__CHILDREN.observe(element);
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index db7589572c..119f47080f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -39,6 +39,7 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
@@ -424,4 +425,9 @@ public String getDetailLabel(Object element) {
 		}
 		return null;
 	}
+
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 834022ca59..c24cff032b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -287,6 +287,6 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 8d7f8eb9fb..66d9dd70f8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -407,6 +407,6 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index ffbb5b20de..a24f1a6539 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -363,6 +363,6 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index ce2e8bfa3d..08875801d9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -30,6 +30,7 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
@@ -317,4 +318,9 @@ public IObservableList getChildList(Object element) {
 	public String getDetailLabel(Object element) {
 		return null;
 	}
+
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 58ab8c662b..39dcb813bd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -113,7 +113,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 	@Override
@@ -385,5 +385,4 @@ public void widgetSelected(SelectionEvent e) {
 	public IObservableList getChildList(Object element) {
 		return ELEMENT_CONTAINER__CHILDREN.observe(element);
 	}
-
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index a720c365f7..24c8701156 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -30,6 +30,7 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
@@ -285,4 +286,8 @@ public IObservableList getChildList(Object element) {
 		return ELEMENT_CONTAINER__CHILDREN.observe(element);
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 2ea5fa8aec..47b7b45623 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -33,6 +33,7 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
@@ -370,4 +371,8 @@ public IObservableList getChildList(Object element) {
 		return ELEMENT_CONTAINER__CHILDREN.observe(element);
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index b667d3d1dc..c6cf9e7711 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -32,6 +32,7 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
@@ -339,4 +340,8 @@ public String getDetailLabel(Object element) {
 		return null;
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index e39e5088f9..61d1c3717e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -22,6 +22,7 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -144,4 +145,8 @@ public IObservableList getChildList(Object element) {
 		return null;
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index fb93b7e6b2..7671ba354c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -25,6 +25,7 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -179,4 +180,9 @@ public IObservableList getChildList(Object element) {
 		// TODO Auto-generated method stub
 		return null;
 	}
+
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 3da617a176..160ce5dacc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -275,6 +275,6 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__TOOLTIP) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__TOOLTIP), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index df4c7349aa..06615f7e36 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -325,7 +325,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TRIM_CONTAINER__SIDE) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TRIM_CONTAINER__SIDE), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 5a3d7340ab..ee94d9792a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -30,6 +30,7 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
@@ -337,4 +338,8 @@ public IObservableList getChildList(Object element) {
 		return ELEMENT_CONTAINER__CHILDREN.observe(element);
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index ca24845d44..b5633c7886 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -415,7 +415,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 	@Override

From e3d56ce71ad8431e1198b2d639892124c4ff5c15 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 8 Jul 2010 20:54:11 +0000
Subject: [PATCH 0201/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * showing not rendered items in gray

---
 .../icons/full/modelelements/tbr/Addons.png   | Bin 0 -> 543 bytes
 .../full/modelelements/tbr/Application.png    | Bin 0 -> 335 bytes
 .../full/modelelements/tbr/BindingContext.gif | Bin 0 -> 994 bytes
 .../full/modelelements/tbr/BindingTable.png   | Bin 0 -> 439 bytes
 .../icons/full/modelelements/tbr/Command.gif  | Bin 0 -> 889 bytes
 .../modelelements/tbr/CommandParameter.gif    | Bin 0 -> 1009 bytes
 .../full/modelelements/tbr/DirectMenuItem.gif | Bin 0 -> 978 bytes
 .../full/modelelements/tbr/DirectToolItem.gif | Bin 0 -> 929 bytes
 .../modelelements/tbr/HandledMenuItem.gif     | Bin 0 -> 979 bytes
 .../modelelements/tbr/HandledToolItem.gif     | Bin 0 -> 960 bytes
 .../icons/full/modelelements/tbr/Handler.gif  | Bin 0 -> 982 bytes
 .../full/modelelements/tbr/KeyBinding.gif     | Bin 0 -> 917 bytes
 .../icons/full/modelelements/tbr/Menu.gif     | Bin 0 -> 981 bytes
 .../modelelements/tbr/MenuContribution.gif    | Bin 0 -> 872 bytes
 .../icons/full/modelelements/tbr/MenuItem.gif | Bin 0 -> 941 bytes
 .../full/modelelements/tbr/MenuSeparator.gif  | Bin 0 -> 945 bytes
 .../full/modelelements/tbr/ModelFragments.png | Bin 0 -> 380 bytes
 .../full/modelelements/tbr/Parameter.gif      | Bin 0 -> 877 bytes
 .../icons/full/modelelements/tbr/Part.gif     | Bin 0 -> 942 bytes
 .../full/modelelements/tbr/PartDescriptor.gif | Bin 0 -> 962 bytes
 .../modelelements/tbr/PartSashContainer.gif   | Bin 0 -> 969 bytes
 .../tbr/PartSashContainer_vertical.gif        | Bin 0 -> 937 bytes
 .../full/modelelements/tbr/PartStack.gif      | Bin 0 -> 963 bytes
 .../full/modelelements/tbr/Perspective.gif    | Bin 0 -> 953 bytes
 .../modelelements/tbr/PerspectiveStack.gif    | Bin 0 -> 964 bytes
 .../full/modelelements/tbr/Placeholder.gif    | Bin 0 -> 893 bytes
 .../modelelements/tbr/StringModelFragment.png | Bin 0 -> 442 bytes
 .../icons/full/modelelements/tbr/ToolBar.gif  | Bin 0 -> 981 bytes
 .../modelelements/tbr/ToolBarContribution.gif | Bin 0 -> 872 bytes
 .../modelelements/tbr/ToolBarSeparator.gif    | Bin 0 -> 989 bytes
 .../full/modelelements/tbr/ToolControl.gif    | Bin 0 -> 956 bytes
 .../modelelements/tbr/TrimContribution.gif    | Bin 0 -> 872 bytes
 .../icons/full/modelelements/tbr/Window.gif   | Bin 0 -> 945 bytes
 .../full/modelelements/tbr/WindowTrim.gif     | Bin 0 -> 945 bytes
 .../common/component/ApplicationEditor.java   |  32 ++++++---
 .../component/DirectMenuItemEditor.java       |  31 +++++++--
 .../component/DirectToolItemEditor.java       |  31 +++++++--
 .../component/HandledMenuItemEditor.java      |  31 +++++++--
 .../component/HandledToolItemEditor.java      |  31 +++++++--
 .../component/MenuContributionEditor.java     |  31 +++++++--
 .../internal/common/component/MenuEditor.java |  29 ++++++--
 .../common/component/MenuItemEditor.java      |  33 ++++++---
 .../internal/common/component/PartEditor.java |  31 +++++++--
 .../component/PartSashContainerEditor.java    |  63 +++++++++++++-----
 .../common/component/PartStackEditor.java     |  31 +++++++--
 .../common/component/PerspectiveEditor.java   |  31 +++++++--
 .../component/PerspectiveStackEditor.java     |  31 +++++++--
 .../component/ToolBarContributionEditor.java  |  31 +++++++--
 .../common/component/ToolBarEditor.java       |  32 +++++++--
 .../component/ToolBarSeparatorEditor.java     |  33 ++++++---
 .../common/component/ToolControlEditor.java   |  31 +++++++--
 .../common/component/TrimBarEditor.java       |  31 +++++++--
 .../component/TrimContributionEditor.java     |  31 +++++++--
 .../common/component/WindowEditor.java        |  31 +++++++--
 54 files changed, 503 insertions(+), 153 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Addons.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Application.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/BindingContext.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/BindingTable.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Command.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/CommandParameter.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectMenuItem.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectToolItem.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledMenuItem.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledToolItem.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Handler.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/KeyBinding.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Menu.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuContribution.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuItem.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuSeparator.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ModelFragments.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Parameter.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Part.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartDescriptor.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer_vertical.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartStack.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Perspective.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PerspectiveStack.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Placeholder.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/StringModelFragment.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBar.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarContribution.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarSeparator.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolControl.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/TrimContribution.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Window.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/WindowTrim.gif

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Addons.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Addons.png
new file mode 100644
index 0000000000000000000000000000000000000000..907e837f127daab508a9abf905b27ad74779346e
GIT binary patch
literal 543
zcmV+)0^t3LP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igY+6dMj*
zM2sf@00E;(L_t(2&qa|xYZGArhoASjq}U5-Pm<nM!Jyb7Q=#Y}ICRi2;M~b}7AL_5
z9SRi(@e2f}WGUz;uuu?*K`heHT0$&hu@Vza6?^TydH*>y*k}Cl3_o~;<BSiBdcmOT
z^DoXeaVoUR=D-~3?xmum*&mN}PF=jS3*Z5?s%BfaRiunWk~JzCwujsG>PXnC1WP3^
zjCDsxDJR%SbxQHPS6F&h0Uw55*C8ZP;GuxBkb&eYZ(Qn)J~UP*mQxIW*eAnfd=$sD
zo;;|4Xm08$9mHY6A&qy*<1xaOYd0JL8;2^<J@MAec)$2dhF!kguB=1#R{B~pOOA-=
z)>B9{21kww02GRdCPNaA5w*>qQ(-V0o{*)1H3sb!#TDA@vHwl=gacl!PA_YG-g6y`
z#W5hyCpubXeR%muJ)Gn>SrnEZ7%ZBUt4P0{`XFsA&auT_;su5fi)BEb&+PO~NjPAo
zI=Gwk&d-g1mlzb&l<Dws;4akUDAxV5I+#2f>)tFTto3tZrqJ54bG70Bny1`b>@P?}
hJ^$1dbf&HW{sCC=$cdRWJZ1m@002ovPDHLkV1lCq=h*-N

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Application.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Application.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4665b36ecaa9427030280927d047b0d18b4824a
GIT binary patch
literal 335
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf67>k44ofy`glX(f`FeQ1ryD<E3
z??1C2$m1;Vh%9Dc;1&j9Muu5)B!GhKC7!;n?6=rCM8pi^dhUk<g)V!#IEHAPZ@swC
zkJ(YA^<jRyuK+Kngbh=;Z^4dzj0xLku{1tpHDGCVQ1<*LSiv-}!9iewCkIE?t#>?&
z%qMg$HGU-ie9q4FqScT72hW`+6H~{3qOjX<V(B$?|L51uuf}el`0LX7pE+yiE$hGc
ze0ir;b``Jq3hs9YPv}ZiGyFEX^hi8<;!Vec3}+@9{opyAEup5c_?$%JBF;+vAK4LS
z^0qv<pe&(hb>=``idpmRgm2d$s<y0u@VltJFvNzBubK60bam;KmnEBiUNSS%y}BxQ
cndmNgiPip<>8;Bof!<^AboFyt=akR{07I{U-2eap

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/BindingContext.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/BindingContext.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1d6aefeb4d86cfc8e4d568e91d4ac0231da43dec
GIT binary patch
literal 994
zcmV<810DQFNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01yBW000QT0R8=AB83W-EL^yZQTM80Lw}1FHLAqP
z)2Uau$f(=M&>s_m1`#S8LndNGe|k8ooT5^l9+c|-$()Hsj2W5rUZ$KmlZ-E6Va(+8
zHz(%5EJzVLf)uIJmO1|97|k*h%O_D+vec8~kImGXRHj&wX^)M+HR_TvTAS?O6rT3h
z_$#B%&ar3D?C>O8X0AF!=hDSPWUsJcdtm&1Q3oh+IzWdFfAQBPtsg*${Opz4#b46T
Qpp*I=O}eyce*pmiJH6cJC;$Ke

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/BindingTable.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/BindingTable.png
new file mode 100644
index 0000000000000000000000000000000000000000..d572b27c76c114a33182dfedf0354618765b5812
GIT binary patch
literal 439
zcmV;o0Z9IdP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igY+6c-1G
zEqjju00BEmL_t(2&wbHBOH^SL#_`|Gy>S;qwwcJJXca*q2!SPuZdz!#30g!!(84}O
zE?h~gwz=>l_yr0wMg%2r5e15i!YM;r1Wk?H`@XM>8L`FCIg7J-p8t6cr<VM`a^Ag2
z^YKa)ML`r)f}j$&o{dZ19{x>(d%2tB#3tLqsjKe~=9C3F5qAb`@2Ywk0@elyZY$3O
zOnYw%th)<-oe`o;OJ-diY)Eof|0QH5Y?$a1db52>s3dhQJ6f6!-1NqlVL$yb-RKLF
zUB5lmv2W9P4`sglU}&L#<|n%zd*!2HqrQ0Qz%BQDeO~Vo_6%V`>5)mZW|W@bLXi_B
z*KK1_Wk~}a(Te-p-CFXxRgN7sJ{vcp@WYP6HJ2P~muq{q-n(yPmq#0`BNvNI{b*jh
hx$4|;_;%QNZ~_zhl$N_+B8C6}002ovPDHLkV1kwLv)ljx

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Command.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Command.gif
new file mode 100644
index 0000000000000000000000000000000000000000..86e51747ed5923db07f4d01806e0aefe01cd6bd1
GIT binary patch
literal 889
zcmV-<1BU!ZNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000P90RIUbNU)&6g9sBUTqw{D8ioSbC=+9b
zAsSu2goUY?kjyJsv1sK2GX|lUNt7s6%G4>8n1f&(If4|a(v~g=xp4X<>Pi-cSW-=~
P!jQ@oh)9zv4F~``cwDDw

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/CommandParameter.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/CommandParameter.gif
new file mode 100644
index 0000000000000000000000000000000000000000..486f025172d4a3ba0e2f3483f9cf115b734fc193
GIT binary patch
literal 1009
zcmV<N0}lL0Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008v>EC2ui01yBW000Qi0PEFLHmZ*wL8+z*T)6Pnpjpgfxw2G<
z7(;>8{*-dYFW4wnr3i()NJ){UXaD*IdqhbRsEc?6`APQgpTA|2C=I&k#ta!@HUC|!
zBlBXLG-iPQTju7Bp+6Tt-PvR8pRzo75b;TMQ5+vZ%a+NZgUC>!d!8;iIwYu`FhG$Y
zEpjA?khY5pt&Q?Sl-9jA^+s`;gs5#jQ}*~F;m5BZ61)PD#LHI(i9W@F2NxFD=G{Gf
f_sZ-83|X6HeW;P#6-?N0J#B4}AZc?KZ$JP${o?6n

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectMenuItem.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectMenuItem.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ad4c980d3a418b060b70bbda2110b73f836f7865
GIT binary patch
literal 978
zcmV;@11<bVNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01yBW000QD0R0IZNU$KmS_l&=tW|K9zK0MY(kd7$
zpC(I?6cqxrCts|BukMMwhp(i_R|Q$wyO?p~9($|`GOI_kW=&=U&FI|8bLT)Y^MVSU
z=j@N1M$QIuL5Gf|Mme55O=>gHO17(4oyn2*uWK}_{-lT<%ZJdvMvW{*Iy6wlt+%(@
zr1^*D3>r3c27YOZQ4*bc&@TO}M`)lVrc9lM`P9|jt1yNoNuG=b(IG-;`~?I6JJ3tl
A+5i9m

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectToolItem.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectToolItem.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3e30ae05adedb8753829505b5132c37c9b778a48
GIT binary patch
literal 929
zcmV;S177?`Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01yBW000Pn0R0IZNU)&6g9sBUR5*!{!-o(bPV(1B
zkfMtiGX|2<#~&R<p+brr8A=Qte`^$}TFJ7dDlu#PiBa^crp;b$a`qA<#-A2N(SioW
z+2-HBHodg?i=rr;Q>QtP7Htz{sTwU<u}00AbBMo5L&A#PI(6bfqDGM_B&v3y!GHie
DG=sin

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledMenuItem.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledMenuItem.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6465845d91b843a0c1e6569d1748f810f8a982b8
GIT binary patch
literal 979
zcmV;^11$VUNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000QE0RIUbNU$KmS_l&=tW|K9zK0MY(kd7$
zpC(I?6cqxrCts|BukMMwhp(i_R|Q$wyO?p~9($|`GOI_kW=&=U&FIwW2F=c$1I5f6
zI&Y0KF=mL48OQ}4x{GLZ`4Se!3_30Ytz_Gpjm#@pv1sK2vs9pzvuDLjqC}}urcR;6
z3{-KeE*M9SAVsRQr3=9?Pc3ob^hwl}EM5vqa*7U1swq~SMp7)PGL<QnGYbp|06X`*
B&&2=$

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledToolItem.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledToolItem.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1a4a743602b0f9db3864f8e8047365280dcbb03e
GIT binary patch
literal 960
zcmV;x13&ynNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000P`0RIUbNU)&6g9sBUR5*!{!-o(bPWsnJ
zkfMtiGX|2<=N}zKp+brr8A=SDe`^$}TB*tn8kQ@?tobKK(XX4o)+iHW2B#P?|FkHI
zMl>24UA}~cF%wOUmVZ$cg_|0V%qv*2XypPkCJIzFTEc1(Gl>$VN|`#9{5NTcTen~w
iIf4|a(v~h04RYc1Nz|1r3bCY`VrAh!DpL*y1OPj9Xv9AN

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Handler.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Handler.gif
new file mode 100644
index 0000000000000000000000000000000000000000..22b96c27f6be5346c749f0bcadf6c98c89e5daa4
GIT binary patch
literal 982
zcmV;{11bDRNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01yBW000QH0R0IZNU&hRZkpzxK{H2FH-r8(#eoH@
z)~!^M8Wz;l2NkS;uvCdu)ko97ZgD=LTJ{els+XwZJd9X~5+#-`VcE24(q9}zKyl^-
z>M4%EIB=2*YsoYl98YKjo*_eZDbr<C6`c`?CXH9C|Acv^^C)V>J$?FE6_$2TAwE63
z!6~F?sW3Tm^bC3gXJ*7akAw+>BPWofM|pY<)C7mnqfD6|5rU(bAVN0_-8h8ExnMv5
EJ5a*XvH$=8

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/KeyBinding.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/KeyBinding.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5ae4c89a5c390e01675825c713eb8ee9bce9e6f0
GIT binary patch
literal 917
zcmV;G18V$7Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000Pb0RIUbNU)&6fosqlJcve_7&8kAlF{W$
zSQv-}vuMo1#gQXOkt%KJLNLofESx@xx?(cpKq{%GSXtQe-;^m4|JBTyjFC@9$#U8`
r_Uu_SJ2?@ZOBe4MqMU%1rh5h`r=N3JkNM&02M{7VL34@~7!UwE=&QH~

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Menu.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Menu.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0153af73a851e4d3c50aea94ec723e20b04a6d60
GIT binary patch
literal 981
zcmV;`11kJSNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000QG0RIUbNU)&6g9W2Vp>ie57B6AOm`Std
zO&mG@-awLssnaM`vUL42#w=Pjj0&k(!SWCcnTc%Pz`;mnp3R##<GEY6&d|R!=E_A8
zS0`MQa7Dw36L;vRw`|#nMV%@YYST2<o;`!c6`EG9UawMYBXf=&JbU~E8dRuhpLTHL
z%8lFSU!HdM^6IU}m#;lM|KhZ}N4T)zd-&k|L(>kQK75WJM}C~<Uzp37GiyeOFdzUs
Dy<^|m

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuContribution.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuContribution.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d24701949ebb222200a7e01aff1ac41993829dca
GIT binary patch
literal 872
zcmV-u1DE_qNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000O@0RIUbNU)&6g9sBU{C8#HKwwvZIb;Z^
y;X+M-FltH&F(WXH5e;6s;t|-#iWUiW)O0c=LX8<6l1!-(qQr?bC+b8P5CA)SPM)6t

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuItem.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuItem.gif
new file mode 100644
index 0000000000000000000000000000000000000000..790a5017cb0e92de30248b62f93adc8a68f4b7fc
GIT binary patch
literal 941
zcmV;e15*4)Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000Pz0RIUbNU$KmS_l&=tW|K9zK0MY(kd7$
zpC(I?6cqxrCts|BukMMwhp(i_R|Q$wyO?p~9($|`GOI_kW=&=U&FI|8bLT)Y^MVQ;
zI&aKCF6hv))W|U@mw{HYNu8Qa+texprD)yCbt^#?x5A1QtD@i+r5Ks+LFc8Qq@-};
PMsh2uuHCx=0|Ed$YX-#h

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuSeparator.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuSeparator.gif
new file mode 100644
index 0000000000000000000000000000000000000000..52408e3e8ec0b4895caa00804a8232be4dda95fa
GIT binary patch
literal 945
zcmV;i15W%$Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01yBW000P%0R0IZNU$KmO$ZYz+*B}=zK0MYW-53|
zpC(I?6cqxrC*P%ll<?gfiLd0yN(Cj|yO?p~o_mrCLb6w{rp=m=3N{(UvuDpH1OEvf
zO0=lI8Ay{VT{^JCt*20-b||=_9ZQWI*{vuzWZgP;Uc;^%QV@)~t1i`nDX1qMy0>uA
TrOQ(g&z(DV^Ww!LFdzUs6B)#t

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ModelFragments.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ModelFragments.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebf5a85efdcc132cb677f9525df038d92368b0a1
GIT binary patch
literal 380
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf67>k44ofy`glX(f`FeQ1ryD<E3
z??1C2$m1;Vh%9Dc;1&j9Muu5)B!GhKC7!;n?6=rCL?raB7|!nkn!w=c;uxZFzIKAG
zmvf?k>-p~-T1ppJI3|~{-fXbmAh?NZy26bcH+J#gZCt=DkS%!7OT=W-f*;NXKhoYs
zNW|aEHoAJimgl)2*E0XyP4n)rc>FN^?p>n^q92P&!ZOwFuZz=Yn7h43!|g_?sK-H9
z4)=;R>dzk@zGIxcKG32=)Wt!_vD#3eJk`^k<vov}V_Qa2>Vb-+KC5_+iOMc>9~<->
z4r$J7x*Tz!kV%jyV<TIP@4o~Vv%XdVz8mrdLdX8xaItV~uCB7Td;Fg-nq~bKj;4f$
z7lkI#lX&DZKl{k1clw58O?2$r+;}<NUUrE%)8W;o`Gq{vj5G8;=GRV(v#qUTWX*2p
UZZF7`0R|6)r>mdKI;Vst04<@2_W%F@

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Parameter.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Parameter.gif
new file mode 100644
index 0000000000000000000000000000000000000000..044d786b007237b711909b28187aefa795682a46
GIT binary patch
literal 877
zcmV-z1CsnlNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000O|0RIUbNU)&6g9sBUM3N>GHH8Daxth}p
z;y_PZEDG$F<{?BRAVFFTsqr5Yjj2+mgb0e7OHdFg^_ocuBBE0`5kdUJlV?eS0RaFz
DiiDtY

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Part.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Part.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6f86ad5bf3cf35ea3e9c58085a6dad2a63eed633
GIT binary patch
literal 942
zcmV;f15x}(Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01yBW000P!0R8=AB83W-EL^yZQTM80Lw}1FHLAqP
z)2Uau$f(=M&>s_m1`#S8LndNGe|k8oT&YeEN_GEY%AEPHp39UpbK3Mb2WHNh_2&4K
z<MU_CdUE`+DQeUn8-Ht<{<OEoUm2-6?Uk{r&Yst=V7-Fz_oZvtvtRsm!J4y+zbtU$
Q%AM=4uHCzM{RIR7J1#%bjQ{`u

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartDescriptor.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartDescriptor.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cf28a00e0c03288033f3d5bd6f717ff68c2507d2
GIT binary patch
literal 962
zcmV;z13mmlNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01yBW000P|0R0IZNU$J5MhFuk{Kv4MB7G1e(qhz*
zU?P40n2b^P%Gbny1rOz0v<Md&b;&#)DoE%a6OCiYki=K0;2?c^)alfzN8g}=fN-i~
z_^)11Kn45c%SqH|zCH!_+?z9$VZAx{_7uEhPfpdMa_rqHXlEW9b@tNQV?)nQ!8!4=
k$eo)d-kgGQ+_`(Fm+#&<1>v}PLs&53H*gFpE*KC1JJht(e*gdg

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer.gif
new file mode 100644
index 0000000000000000000000000000000000000000..94bdda3e6dffde4cc34b19432c60a37f5c2d489f
GIT binary patch
literal 969
zcmV;)12+6eNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000Q40RIUbNU)&5O$ZYzR46bLx`z)hL4=q|
zphR{U*;PW95#uF+lsK|$*G`g1lI<u7jD*geOLvc2zH}E!pd)nf;Jtgd2&c}SjRYz}
z7q4i%L`03oQzXz3x_MCN6?z(Vo*{vP(AC>oFDuurg9QFTcdzWdv1ZHu5y%G}zPI?=
r!hOp}U><b(^ySNUH}77)0`K6>s}Ij$!gmDLS<JX`V}p<h1_S^*mqydp

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer_vertical.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer_vertical.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f6da4c7a90ed58ccc318b363866fc11a9d7c8eff
GIT binary patch
literal 937
zcmV;a16KS;Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000Pv0RIUbNU)$mf{GkPqI4<KCV_SC<l*y2
zkfDSN8$SG32c5@{AU$rZqfZ~cd-dkUgXfMNJ9HyUo=my2<;$4)W~zMWuH8+D`f{S&
z+4CnyJQFJxO0?*aq)L}YhMWo$sL7!<T~_5N6Dv!tICaM3>2oVdp)|=FJu6nNS&0+}
LU2K%mVL$*oB|pUA

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartStack.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartStack.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5d94ef32e76d6c9c6e4a2627e6fff9ab8f658a8e
GIT binary patch
literal 963
zcmV;!13dgkNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008s=EC2ui01yBW000P}0O<)FNU$J5KUuQ)q1Q%;kTwSWi2L_X
zoS$<T&p{lxiK54Un?i~VNpF+Ce<x3(^rsReJxu=k^<z0xrp%a_=vCs!uOCmDKY8-2
zL{HMbqx|+IReJPjBzlbW<(sOns#L4`8qq^EwX0WrT@leEbg!)0vt|d;`(v-I+qZ82
l(9=_|uDyD9@!GAohaR4~fCC4<L$8kE!-x|bTs$x!06Td?*&F}>

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Perspective.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Perspective.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6cc4e83788f4bb0e1ed88d23586218f204cbc864
GIT binary patch
literal 953
zcmV;q14jHuNk%w1VGaNe0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01f~S000P<0RIUbNRSUfY5$~!gSRl8rhkhVKAD1K
zibX)y_$>OD%Agfssg{YP$7i3(Zu<aPq&P*3r;LEK@i7R99=(5|Y+56!4bZ=EK5q^p
z_^%5qc>iktqZewaQ+j~HCEfY&&>*X&29*kf6wskihYS++8P3Yhf29VVHT#e4Kd}U@
b{OhLW>>;NE*;>(J#mW-CTK?{x8xR0Ht2NL;

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PerspectiveStack.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PerspectiveStack.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c9dc7d45f580e68f8db1126a62a0bd10f93d1d8b
GIT binary patch
literal 964
zcmV;#13UajNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000P~0RIUbNU)&6g9f8Skzxf4moH<^sBr^F
z&cHX2AW`B(%GIr4$)Z)WC{W>)Dp<BaG_$5n#etjJ$(%{E-6ojrM(G@7Zzs>20xz|b
zlr5X2o<&F9yEITzyF5kp;8TPS-6DLF1~O_VrfQgcX~L$-w`gFYc2Vrvi?Xk+TS5c<
mpj8;9AKkis2Igtkub)4^{{H&KGq8@~!-x+fT+G;DKma>i^woL*

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Placeholder.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Placeholder.gif
new file mode 100644
index 0000000000000000000000000000000000000000..36c1a4b3b3ab29e79b78d7b3bf8f9d51ca43126c
GIT binary patch
literal 893
zcmV-@1A_cVNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01yBW000PD0R0IZNU)&6g9sBU^!M-ILV^DpHFAis
zVZ%nVCLa7}sAETPvkXxj_^%JNlPICh>NAp|99=MD>LMklCBri~agri+#wJ9IT`G0)
TS@2(zCPWQ3e8{w^(|`awG@q^J

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/StringModelFragment.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/StringModelFragment.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a2780ba83d114f825cca8e554599a0ee0966e48
GIT binary patch
literal 442
zcmV;r0Y(0aP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igY+6dD3e
z>G4ef00BNpL_t(2&wbHBZ%knn#_`{sUO`pM7)cS45)m0zHWC{<8;Oq~79>7}_%eI~
zf(VI)2)l_`5Y1IJ2yN7)Zri!<dn~3I(~W0!lJn0=&i^UG|5N@OAHU7r6zSo$tCK)$
zylzLg<8YBK?z}JtuB;B%vkgseCs2eZktJD*`6BtW)}+*G+&nl29>pP9Aj^`FE!k(k
zA2zNR;X!nSU)E)zC2QNQ<Alod?<I{d_Lw!0WkaPS4yd%uY0niS5BKAkz9f{+S<ts;
zQEl_g_7{!N$XdEiS~g|cmddU7CHJB+Ey-#Zobp+z_R6w)WU_HwSh3f<v-)=V<F&1Y
zJJq(RMp!a1tI!h$-l*KJ#wLf7qgGw=%~LNtGh=hItj0UZM<1NGqGu+5t@G~*)uUXl
kPnTU&FMr;+yExg!U$~KpFSFZFeE<Le07*qoM6N<$f(j45YXATM

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBar.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBar.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0153af73a851e4d3c50aea94ec723e20b04a6d60
GIT binary patch
literal 981
zcmV;`11kJSNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000QG0RIUbNU)&6g9W2Vp>ie57B6AOm`Std
zO&mG@-awLssnaM`vUL42#w=Pjj0&k(!SWCcnTc%Pz`;mnp3R##<GEY6&d|R!=E_A8
zS0`MQa7Dw36L;vRw`|#nMV%@YYST2<o;`!c6`EG9UawMYBXf=&JbU~E8dRuhpLTHL
z%8lFSU!HdM^6IU}m#;lM|KhZ}N4T)zd-&k|L(>kQK75WJM}C~<Uzp37GiyeOFdzUs
Dy<^|m

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarContribution.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarContribution.gif
new file mode 100644
index 0000000000000000000000000000000000000000..81e35f1c5cb794d5041d623fc5a5a7b2c1a4f27e
GIT binary patch
literal 872
zcmV-u1DE_qNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000O@0RIUbNU)&6g9sBU{C8{NKw!6kIb;Z^
y;lgQvFiuMdF(WXH5e?qD<q_D&iWUiWoOUuKLX8<6l1!-(qQr?bC+b8P5CA*0BA?U%

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarSeparator.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarSeparator.gif
new file mode 100644
index 0000000000000000000000000000000000000000..92c10a984c2b4fd43e5408d54db0f723f371bfc6
GIT binary patch
literal 989
zcmV<310wuKNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01yBW000QO0R0IZNU)$mf&XS4^cO`6l`C0(BrIYk
z&6+oH<oJ67NfM?`a1#FcWsF(0Y8o3-v4Tb742o&kyn&;U%)FcPOeHimFP^(~>kRoz
zW3F5jaZnOwsuS+0xI;s|Wy?m4QbI#ivqDW{?b$PEjuJZZ`t{jXi*4R8NhoEHpFo2O
zLG9D7Zry}-?e_7Pr=7jO_7c_`JlGx{e{tH~Tg<reJ$!Kdp=pOtAHK?#F<VaKFO28U
LphGWQ7!UwEsaD@M

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolControl.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolControl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2c3094933808e930896bac8af10012ec7643539e
GIT binary patch
literal 956
zcmV;t14H~rNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000P?0RIUbNU-3*O$ZYzR48!MxQ7rUKHMZQ
z(>Qk+Gir2~N#Lc68#i7ONa^CccNkBiL^(+yq;c?K%7phW=DSD&8;y&{Qy$NsJR1pA
zG;ZEJc}9~aRV2{RxO(*JL8TW}YCS^&1&y=EwX0Wqf&~5<cdx8jd}Y!85y)p8zPI__
e!hOp}pq_F0^6K52Pme%6fCCE_Y_RaafB-wL-^=9y

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/TrimContribution.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/TrimContribution.gif
new file mode 100644
index 0000000000000000000000000000000000000000..81e35f1c5cb794d5041d623fc5a5a7b2c1a4f27e
GIT binary patch
literal 872
zcmV-u1DE_qNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000O@0RIUbNU)&6g9sBU{C8{NKw!6kIb;Z^
y;lgQvFiuMdF(WXH5e?qD<q_D&iWUiWoOUuKLX8<6l1!-(qQr?bC+b8P5CA*0BA?U%

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Window.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Window.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ca9858dfb0c215c5ea1e4b1596fb36ab072ab589
GIT binary patch
literal 945
zcmV;i15W%$Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000P%0RIUbNU)&5IC13Av4dxipFo5RC0f)-
z;3HG2UeVeW4B4}4+rEi=bTHw<h7Ti7toV<Uyq7RzzT_m(<-MCYbKax*Pm?^IKs5=>
zBoCj_qe$^(5@@Mt(xjFIQgZtAC?$cB<mKDSwQIge7PWfyO7b70d1JjY5~ygNzPE7W
T>Qf{zk=?s^@fzGqFdzUsBGt{E

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/WindowTrim.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/WindowTrim.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ca9858dfb0c215c5ea1e4b1596fb36ab072ab589
GIT binary patch
literal 945
zcmV;i15W%$Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000P%0RIUbNU)&5IC13Av4dxipFo5RC0f)-
z;3HG2UeVeW4B4}4+rEi=bTHw<h7Ti7toV<Uyq7RzzT_m(<-MCYbKax*Pm?^IKs5=>
zBoCj_qe$^(5@@Mt(xjFIQgZtAC?$cB<mKDSwQIge7PWfyO7b70d1JjY5~ygNzPE7W
T>Qf{zk=?s^@fzGqFdzUsBGt{E

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 5e8b84e86f..22815f0d40 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -28,6 +28,7 @@
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -55,6 +56,7 @@ public class ApplicationEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private Image image;
+	private Image tbrImage;
 	private EMFDataBindingContext context;
 	private Button createRemoveRootContext;
 
@@ -75,16 +77,30 @@ public ApplicationEditor(EditingDomain editingDomain, ModelEditor editor) {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return image;
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Application.png")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return tbrImage;
 			}
 		}
-
-		return image;
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 436c59b0a6..2bc6dc61cd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -20,6 +20,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
@@ -40,6 +41,7 @@
 
 public class DirectMenuItemEditor extends MenuItemEditor {
 	private Image image;
+	private Image tbrImage;
 
 	public DirectMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain, editor, project);
@@ -47,16 +49,31 @@ public DirectMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IPr
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return image;
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectMenuItem.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return tbrImage;
 			}
 		}
 
-		return image;
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 13adde111b..60ae7d9e37 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -20,6 +20,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
@@ -40,6 +41,7 @@
 
 public class DirectToolItemEditor extends ToolItemEditor {
 	private Image image;
+	private Image tbrImage;
 
 	public DirectToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain, editor, project);
@@ -47,16 +49,31 @@ public DirectToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IPr
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return image;
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectToolItem.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return tbrImage;
 			}
 		}
 
-		return image;
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index 13f1a56ec6..c0ef2c703d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -23,6 +23,7 @@
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -57,6 +58,7 @@ public class HandledMenuItemEditor extends MenuItemEditor {
 	private IModelResource resource;
 
 	private IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
+	private Image tbrImage;
 
 	public HandledMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IModelResource resource) {
 		super(editingDomain, editor, project);
@@ -65,16 +67,31 @@ public HandledMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IP
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return image;
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledMenuItem.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return tbrImage;
 			}
 		}
 
-		return image;
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 4ef9c0b28d..c4f783cd4c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -23,6 +23,7 @@
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -56,6 +57,7 @@ public class HandledToolItemEditor extends ToolItemEditor {
 	private Image image;
 	private IModelResource resource;
 	private IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
+	private Image tbrImage;
 
 	public HandledToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IModelResource resource) {
 		super(editingDomain, editor, project);
@@ -64,16 +66,31 @@ public HandledToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IP
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return image;
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledToolItem.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return tbrImage;
 			}
 		}
 
-		return image;
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 28807d5363..e563588cf2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -27,6 +27,7 @@
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
@@ -70,6 +71,7 @@
 public class MenuContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image image;
+	private Image tbrImage;
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
@@ -93,16 +95,31 @@ public MenuContributionEditor(EditingDomain editingDomain, IProject project, Mod
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return image;
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuContribution.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return tbrImage;
 			}
 		}
 
-		return image;
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 119f47080f..01c9ed5c52 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -29,6 +29,7 @@
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -82,6 +83,7 @@ public class MenuEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
+	private Image tbrImage;
 
 	private static class Struct {
 		private final String label;
@@ -102,16 +104,29 @@ public MenuEditor(EditingDomain editingDomain, IProject project, ModelEditor edi
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Menu.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
 			}
 		}
 
-		return image;
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index c24cff032b..64ffa5f46e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -26,6 +26,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuItemIconDialogEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
@@ -58,7 +59,8 @@
 public abstract class MenuItemEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private Image menuImage;
+	private Image image;
+	private Image tbrImage;
 	private EMFDataBindingContext context;
 	protected IProject project;
 	private EStackLayout stackLayout;
@@ -70,16 +72,31 @@ public MenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (menuImage == null) {
-			try {
-				menuImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return image;
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuItem.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return tbrImage;
 			}
 		}
 
-		return menuImage;
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 66d9dd70f8..ff1ea3a111 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -33,6 +33,7 @@
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
@@ -77,6 +78,7 @@ public class PartEditor extends AbstractComponentEditor {
 	private IValueProperty PART__TOOLBAR = EMFProperties.value(BasicPackageImpl.Literals.PART__TOOLBAR);
 	private Button createRemoveToolBar;
 	private EStackLayout stackLayout;
+	private Image tbrImage;
 
 	public PartEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain, editor);
@@ -85,16 +87,31 @@ public PartEditor(EditingDomain editingDomain, ModelEditor editor, IProject proj
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return image;
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Part.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return tbrImage;
 			}
 		}
 
-		return image;
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index a24f1a6539..6160dbc034 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -70,6 +70,8 @@ public class PartSashContainerEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private Image vImage;
 	private Image hImage;
+	private Image vTbrImage;
+	private Image hTbrImage;
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
@@ -83,29 +85,56 @@ public PartSashContainerEditor(EditingDomain editingDomain, ModelEditor editor)
 	public Image getImage(Object element, Display display) {
 		boolean horizontal = ((MPartSashContainer) element).isHorizontal();
 
-		if (vImage == null && !horizontal) {
-			try {
-				vImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
+		if (!horizontal) {
+			if (((MPartSashContainer) element).isToBeRendered()) {
+				if (vImage == null) {
+					try {
+						vImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif")); //$NON-NLS-1$	
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
 
-		if (hImage == null && horizontal) {
-			try {
-				hImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+				return vImage;
+			} else {
+				if (vTbrImage == null) {
+					try {
+						vTbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer_vertical.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return vTbrImage;
 			}
 		}
 
 		if (horizontal) {
-			return hImage;
-		} else {
-			return vImage;
+			if (((MPartSashContainer) element).isToBeRendered()) {
+				if (hImage != null) {
+					try {
+						hImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return hImage;
+			} else {
+				if (hTbrImage != null) {
+					try {
+						hTbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return hTbrImage;
+
+			}
 		}
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 08875801d9..f3bfd49de6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -24,6 +24,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -71,6 +72,7 @@ public class PartStackEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
+	private Image tbrImage;
 
 	public PartStackEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
@@ -78,16 +80,31 @@ public PartStackEditor(EditingDomain editingDomain, ModelEditor editor) {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return image;
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartStack.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return tbrImage;
 			}
 		}
 
-		return image;
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 39dcb813bd..ab9b7e853d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -27,6 +27,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PerspectiveIconDialogEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
@@ -76,6 +77,7 @@ public class PerspectiveEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
+	private Image tbrImage;
 
 	public PerspectiveEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
 		super(editingDomain, editor);
@@ -84,16 +86,31 @@ public PerspectiveEditor(EditingDomain editingDomain, IProject project, ModelEdi
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return image;
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Perspective.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return tbrImage;
 			}
 		}
 
-		return image;
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 24c8701156..ce58ae7730 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -24,6 +24,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -64,6 +65,7 @@ public class PerspectiveStackEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
+	private Image tbrImage;
 
 	public PerspectiveStackEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
@@ -71,16 +73,31 @@ public PerspectiveStackEditor(EditingDomain editingDomain, ModelEditor editor) {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return image;
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PerspectiveStack.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return tbrImage;
 			}
 		}
 
-		return image;
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 47b7b45623..be4b9029c9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -27,6 +27,7 @@
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
@@ -75,6 +76,7 @@ public class ToolBarContributionEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
+	private Image tbrImage;
 
 	private static class Struct {
 		private final String label;
@@ -95,16 +97,31 @@ public ToolBarContributionEditor(EditingDomain editingDomain, IProject project,
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return image;
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarContribution.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return tbrImage;
 			}
 		}
 
-		return image;
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index c6cf9e7711..c805d8d1d4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -26,6 +26,7 @@
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
@@ -74,6 +75,7 @@ public class ToolBarEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
+	private Image tbrImage;
 
 	private static class Struct {
 		private final String label;
@@ -93,15 +95,31 @@ public ToolBarEditor(EditingDomain editingDomain, ModelEditor editor) {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return image;
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBar.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return tbrImage;
 			}
 		}
-		return image;
+
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 61d1c3717e..d85512b656 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -20,6 +20,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -39,10 +40,11 @@
 import org.eclipse.swt.widgets.Text;
 
 public class ToolBarSeparatorEditor extends AbstractComponentEditor {
-	private Image separatorImage;
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private EStackLayout stackLayout;
+	private Image image;
+	private Image tbrImage;
 
 	public ToolBarSeparatorEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
@@ -50,16 +52,31 @@ public ToolBarSeparatorEditor(EditingDomain editingDomain, ModelEditor editor) {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (separatorImage == null) {
-			try {
-				separatorImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return image;
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarSeparator.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return tbrImage;
 			}
 		}
 
-		return separatorImage;
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 7671ba354c..d8fcbb0088 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -23,6 +23,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -50,6 +51,7 @@ public class ToolControlEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private IProject project;
 	private EStackLayout stackLayout;
+	private Image tbrImage;
 
 	public ToolControlEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain, editor);
@@ -68,16 +70,31 @@ public String getDescription(Object element) {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return image;
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolControl.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return tbrImage;
 			}
 		}
 
-		return image;
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 06615f7e36..b12908f513 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -25,6 +25,7 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.SideValue;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
@@ -73,6 +74,7 @@ public class TrimBarEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
+	private Image tbrImage;
 
 	public TrimBarEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
@@ -81,16 +83,31 @@ public TrimBarEditor(EditingDomain editingDomain, ModelEditor editor) {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return image;
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/WindowTrim.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return tbrImage;
 			}
 		}
 
-		return image;
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index ee94d9792a..d063856457 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -25,6 +25,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -70,6 +71,7 @@ public class TrimContributionEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
+	private Image tbrImage;
 
 	private static class Struct {
 		private final String label;
@@ -90,16 +92,31 @@ public TrimContributionEditor(EditingDomain editingDomain, IProject project, Mod
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return image;
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/TrimContribution.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return tbrImage;
 			}
 		}
 
-		return image;
+		return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index b5633c7886..6e00dea3cc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -31,6 +31,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.WindowIconDialogEditor;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
@@ -78,6 +79,7 @@ public class WindowEditor extends AbstractComponentEditor {
 	private Action addMainMenu;
 	private Button createRemoveMainMenu;
 	private EStackLayout stackLayout;
+	private Image tbrImage;
 
 	public WindowEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain, editor);
@@ -92,16 +94,31 @@ public void run() {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif"));
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				if (image == null) {
+					try {
+						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return image;
+			} else {
+				if (tbrImage == null) {
+					try {
+						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Window.gif")); //$NON-NLS-1$
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				return tbrImage;
 			}
 		}
 
-		return image;
+		return null;
 	}
 
 	@Override

From d493d0f12b28ea0de5a6511cb502284ce11d08bc Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 8 Jul 2010 21:16:32 +0000
Subject: [PATCH 0202/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * showing not rendered items in gray

---
 .../common/ComponentLabelProvider.java        |  6 +++-
 .../component/DirectMenuItemEditor.java       | 31 +++++++------------
 .../component/DirectToolItemEditor.java       | 31 +++++++------------
 .../component/HandledMenuItemEditor.java      | 31 +++++++------------
 .../component/HandledToolItemEditor.java      | 31 +++++++------------
 .../internal/common/component/MenuEditor.java | 29 +++++++----------
 .../common/component/PerspectiveEditor.java   | 31 +++++++------------
 .../component/PerspectiveStackEditor.java     | 31 +++++++------------
 .../component/ToolBarContributionEditor.java  | 31 +++++++------------
 .../common/component/ToolBarEditor.java       | 31 +++++++------------
 .../component/ToolBarSeparatorEditor.java     | 31 +++++++------------
 .../common/component/ToolControlEditor.java   | 31 +++++++------------
 .../common/component/TrimBarEditor.java       | 31 +++++++------------
 .../component/TrimContributionEditor.java     | 31 +++++++------------
 .../common/component/WindowEditor.java        | 29 +++++++----------
 15 files changed, 173 insertions(+), 263 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index 9f4165c4c9..e12afdf246 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -59,7 +59,11 @@ public void update(final ViewerCell cell) {
 				Styler styler = null;
 
 				if (o instanceof MUIElement) {
-					if (!((MUIElement) o).isToBeRendered()) {
+					if (!((MUIElement) o).isVisible()) {
+						label += "<invisible>";
+						styler = NOT_RENDERED_STYLER;
+					} else if (!((MUIElement) o).isToBeRendered()) {
+						label += "<not rendered>";
 						styler = NOT_RENDERED_STYLER;
 					}
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 2bc6dc61cd..43b63336a6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -40,8 +40,6 @@
 import org.eclipse.swt.widgets.Text;
 
 public class DirectMenuItemEditor extends MenuItemEditor {
-	private Image image;
-	private Image tbrImage;
 
 	public DirectMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain, editor, project);
@@ -50,26 +48,21 @@ public DirectMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IPr
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return image;
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectMenuItem.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectMenuItem.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return tbrImage;
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 60ae7d9e37..6119433069 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -40,8 +40,6 @@
 import org.eclipse.swt.widgets.Text;
 
 public class DirectToolItemEditor extends ToolItemEditor {
-	private Image image;
-	private Image tbrImage;
 
 	public DirectToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain, editor, project);
@@ -50,26 +48,21 @@ public DirectToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IPr
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return image;
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectToolItem.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectToolItem.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return tbrImage;
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index c0ef2c703d..81ced576f9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -54,11 +54,9 @@
 import org.eclipse.swt.widgets.Text;
 
 public class HandledMenuItemEditor extends MenuItemEditor {
-	private Image image;
 	private IModelResource resource;
 
 	private IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
-	private Image tbrImage;
 
 	public HandledMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IModelResource resource) {
 		super(editingDomain, editor, project);
@@ -68,26 +66,21 @@ public HandledMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IP
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif")); //$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return image;
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledMenuItem.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledMenuItem.gif")); //$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return tbrImage;
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index c4f783cd4c..410ad14257 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -54,10 +54,8 @@
 import org.eclipse.swt.widgets.Text;
 
 public class HandledToolItemEditor extends ToolItemEditor {
-	private Image image;
 	private IModelResource resource;
 	private IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
-	private Image tbrImage;
 
 	public HandledToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IModelResource resource) {
 		super(editingDomain, editor, project);
@@ -67,26 +65,21 @@ public HandledToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IP
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif")); //$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return image;
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledToolItem.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledToolItem.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return tbrImage;
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 01c9ed5c52..5891271674 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -77,13 +77,11 @@
 public class MenuEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 	private IProject project;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
-	private Image tbrImage;
 
 	private static class Struct {
 		private final String label;
@@ -105,23 +103,20 @@ public MenuEditor(EditingDomain editingDomain, IProject project, ModelEditor edi
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif")); //$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Menu.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Menu.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
 			}
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index ab9b7e853d..8e91d780bb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -71,13 +71,11 @@
 
 public class PerspectiveEditor extends AbstractComponentEditor {
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 	private IProject project;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
-	private Image tbrImage;
 
 	public PerspectiveEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
 		super(editingDomain, editor);
@@ -87,26 +85,21 @@ public PerspectiveEditor(EditingDomain editingDomain, IProject project, ModelEdi
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return image;
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Perspective.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Perspective.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return tbrImage;
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index ce58ae7730..490d58290a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -60,12 +60,10 @@
 
 public class PerspectiveStackEditor extends AbstractComponentEditor {
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
-	private Image tbrImage;
 
 	public PerspectiveStackEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
@@ -74,26 +72,21 @@ public PerspectiveStackEditor(EditingDomain editingDomain, ModelEditor editor) {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return image;
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PerspectiveStack.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PerspectiveStack.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return tbrImage;
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index be4b9029c9..9c32fe0208 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -70,13 +70,11 @@
 
 public class ToolBarContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 	private IProject project;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
-	private Image tbrImage;
 
 	private static class Struct {
 		private final String label;
@@ -98,26 +96,21 @@ public ToolBarContributionEditor(EditingDomain editingDomain, IProject project,
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return image;
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarContribution.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarContribution.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return tbrImage;
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index c805d8d1d4..d1de5cb376 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -70,12 +70,10 @@
 public class ToolBarEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
-	private Image tbrImage;
 
 	private static class Struct {
 		private final String label;
@@ -96,26 +94,21 @@ public ToolBarEditor(EditingDomain editingDomain, ModelEditor editor) {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return image;
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBar.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBar.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return tbrImage;
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index d85512b656..10fcd7c761 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -43,8 +43,6 @@ public class ToolBarSeparatorEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private EStackLayout stackLayout;
-	private Image image;
-	private Image tbrImage;
 
 	public ToolBarSeparatorEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
@@ -53,26 +51,21 @@ public ToolBarSeparatorEditor(EditingDomain editingDomain, ModelEditor editor) {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return image;
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarSeparator.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarSeparator.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return tbrImage;
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index d8fcbb0088..4c1763e154 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -46,12 +46,10 @@
 import org.eclipse.swt.widgets.Text;
 
 public class ToolControlEditor extends AbstractComponentEditor {
-	private Image image;
 	private EMFDataBindingContext context;
 	private Composite composite;
 	private IProject project;
 	private EStackLayout stackLayout;
-	private Image tbrImage;
 
 	public ToolControlEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain, editor);
@@ -71,26 +69,21 @@ public String getDescription(Object element) {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return image;
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolControl.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolControl.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return tbrImage;
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index b12908f513..65d4308082 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -68,13 +68,11 @@
 public class TrimBarEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 	private ModelEditor editor;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
-	private Image tbrImage;
 
 	public TrimBarEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
@@ -84,26 +82,21 @@ public TrimBarEditor(EditingDomain editingDomain, ModelEditor editor) {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return image;
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/WindowTrim.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/WindowTrim.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return tbrImage;
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index d063856457..ec62d555cd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -65,13 +65,11 @@
 
 public class TrimContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 	private IProject project;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
-	private Image tbrImage;
 
 	private static class Struct {
 		private final String label;
@@ -93,26 +91,21 @@ public TrimContributionEditor(EditingDomain editingDomain, IProject project, Mod
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return image;
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/TrimContribution.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/TrimContribution.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return tbrImage;
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 6e00dea3cc..ad9c6f5678 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -95,26 +95,21 @@ public void run() {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return image;
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Window.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Window.gif"));//$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return tbrImage;
 			}
 		}
 

From 574094bcaed5ba8923601c13807de6d20f5ba940 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 9 Jul 2010 09:47:52 +0000
Subject: [PATCH 0203/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed problem with not showing up a sash image

---
 .../component/PartSashContainerEditor.java    | 65 +++++++------------
 1 file changed, 25 insertions(+), 40 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 6160dbc034..0f7404c60f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -24,6 +24,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
@@ -68,10 +69,6 @@
 public class PartSashContainerEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private Image vImage;
-	private Image hImage;
-	private Image vTbrImage;
-	private Image hTbrImage;
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
@@ -86,52 +83,40 @@ public Image getImage(Object element, Display display) {
 		boolean horizontal = ((MPartSashContainer) element).isHorizontal();
 
 		if (!horizontal) {
-			if (((MPartSashContainer) element).isToBeRendered()) {
-				if (vImage == null) {
-					try {
-						vImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif")); //$NON-NLS-1$	
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif")); //$NON-NLS-1$	
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-
-				return vImage;
 			} else {
-				if (vTbrImage == null) {
-					try {
-						vTbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer_vertical.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer_vertical.gif")); //$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return vTbrImage;
 			}
 		}
 
 		if (horizontal) {
-			if (((MPartSashContainer) element).isToBeRendered()) {
-				if (hImage != null) {
-					try {
-						hImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif")); //$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return hImage;
 			} else {
-				if (hTbrImage != null) {
-					try {
-						hTbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer.gif")); //$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
-				return hTbrImage;
-
 			}
 		}
 		return null;

From 76011a573c8ae27b7fcd020e88a1a8f37bc5da4f Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 9 Jul 2010 10:29:21 +0000
Subject: [PATCH 0204/1286] Bug 319250 -  [Model Tooling] Shortcut to open
 liveeditor only works once


From 1330985506552580142fefc0d898d6e0b783170d Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 9 Jul 2010 11:26:44 +0000
Subject: [PATCH 0205/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * added container referencing

---
 .../emf/editor3x/TargetElementProviders.java  |   7 +-
 .../emf/ui/common/IModelElementProvider.java  |   7 +-
 .../eclipse/e4/tools/emf/ui/common/Util.java  | 104 +++++-
 .../common/component/StringModelFragment.java |  33 +-
 .../dialogs/FeatureSelectionDialog.java       | 302 +++++++-----------
 .../dialogs/FindImportElementDialog.java      |  39 ++-
 .../FindParentReferenceElementDialog.java     | 263 +++++++++++++++
 7 files changed, 526 insertions(+), 229 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
index c9c753471b..a53b2cdba9 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
@@ -92,9 +92,6 @@ public void getModelElements(Filter filter, ModelResultHandler handler) {
 	
 	private void applyFilter(Filter filter, ModelResultHandler handler) {
 		for (Resource res : resourceSet.getResources()) {
-			if (res.getURI().equals(filter.object.eResource().getURI())) {
-//				System.err.println("Skipped because self");
-			} else {
 				TreeIterator<EObject> it = EcoreUtil.getAllContents(res,
 						true);
 				while (it.hasNext()) {
@@ -103,12 +100,12 @@ private void applyFilter(Filter filter, ModelResultHandler handler) {
 //						System.err
 //								.println("Skipped because it is an import");
 					} else {
-						if (o.eClass().equals(filter.object.eClass())) {
+						if (o.eClass().equals(filter.eClass)) {
+							System.err.println("Found: " + o);
 							handler.result(o);
 						}
 					}
 				}
-			}
 		}
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
index 6c5cf3b0c6..a3c01b1645 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
@@ -1,16 +1,17 @@
 package org.eclipse.e4.tools.emf.ui.common;
 
 import java.util.regex.Pattern;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 
 public interface IModelElementProvider {
 	public class Filter {
-		public final EObject object;
+		public final EClass eClass;
 		public final String elementId;
 		public final Pattern elementIdPattern;
 
-		public Filter(EObject object, String elementId) {
-			this.object = object;
+		public Filter(EClass eClass, String elementId) {
+			this.eClass = eClass;
 			this.elementId = elementId;
 			this.elementIdPattern = Pattern.compile(".*" + elementId.replaceAll("\\.", "\\\\.").replaceAll("\\*", ".*") + ".*");
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index 19d535ce1f..16f542502e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -1,15 +1,115 @@
 package org.eclipse.e4.tools.emf.ui.common;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
+import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
-
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
 
 public class Util {
 	public static final boolean isNullOrEmpty(String element) {
 		return element == null || element.trim().length() == 0;
 	}
-	
+
 	public static final boolean isImport(EObject object) {
 		return object.eContainingFeature() == FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS;
 	}
+
+	public static final void addClasses(EPackage ePackage, List<FeatureClass> list) {
+		for (EClassifier c : ePackage.getEClassifiers()) {
+			if (c instanceof EClass) {
+				EClass eclass = (EClass) c;
+				if (eclass != ApplicationPackageImpl.Literals.APPLICATION && !eclass.isAbstract() && !eclass.isInterface() && eclass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT)) {
+					list.add(new FeatureClass(eclass.getName(), eclass));
+				}
+			}
+		}
+
+		for (EPackage eSubPackage : ePackage.getESubpackages()) {
+			addClasses(eSubPackage, list);
+		}
+	}
+
+	public static List<InternalPackage> loadPackages() {
+		List<InternalPackage> packs = new ArrayList<InternalPackage>();
+
+		for (Entry<String, Object> regEntry : EPackage.Registry.INSTANCE.entrySet()) {
+			if (regEntry.getValue() instanceof EPackage) {
+				EPackage ePackage = (EPackage) regEntry.getValue();
+				InternalPackage iePackage = new InternalPackage(ePackage);
+				boolean found = false;
+				for (EClassifier cl : ePackage.getEClassifiers()) {
+					if (cl instanceof EClass) {
+						EClass eClass = (EClass) cl;
+						if (eClass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT)) {
+							if (!eClass.isInterface() && !eClass.isAbstract()) {
+								found = true;
+								InternalClass ieClass = new InternalClass(iePackage, eClass);
+								iePackage.classes.add(ieClass);
+								for (EReference f : eClass.getEAllReferences()) {
+									ieClass.features.add(new InternalFeature(ieClass, f));
+								}
+							}
+						}
+					}
+				}
+				if (found) {
+					packs.add(iePackage);
+				}
+			}
+		}
+
+		return packs;
+	}
+
+	public static class InternalPackage {
+		public final EPackage ePackage;
+		public List<InternalClass> classes = new ArrayList<InternalClass>();
+
+		public InternalPackage(EPackage ePackage) {
+			this.ePackage = ePackage;
+		}
+
+		@Override
+		public String toString() {
+			return ePackage.toString();
+		}
+
+		public List<EClass> getAllClasses() {
+			ArrayList<EClass> rv = new ArrayList<EClass>(classes.size());
+			for (InternalClass c : classes) {
+				rv.add(c.eClass);
+			}
+			return rv;
+		}
+	}
+
+	public static class InternalClass {
+		public final InternalPackage pack;
+		public final EClass eClass;
+		public List<InternalFeature> features = new ArrayList<InternalFeature>();
+
+		public InternalClass(InternalPackage pack, EClass eClass) {
+			this.eClass = eClass;
+			this.pack = pack;
+		}
+	}
+
+	public static class InternalFeature {
+		public final InternalClass clazz;
+		public final EStructuralFeature feature;
+
+		public InternalFeature(InternalClass clazz, EStructuralFeature feature) {
+			this.clazz = clazz;
+			this.feature = feature;
+		}
+
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 460341cf82..020765acdc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -17,11 +17,13 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FeatureSelectionDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindParentReferenceElementDialog;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.fragment.MModelFragment;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
@@ -32,9 +34,7 @@
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
@@ -123,10 +123,20 @@ private Composite createForm(Composite parent) {
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
+			t.setEditable(false);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID).observeDetail(getMaster()));
+
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setText("Find");
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					FindParentReferenceElementDialog dialog = new FindParentReferenceElementDialog(b.getShell(), StringModelFragment.this, (MStringModelFragment) getMaster().getValue());
+					dialog.open();
+				}
+			});
 		}
 
 		{
@@ -272,7 +282,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 			});
 
 			List<FeatureClass> list = new ArrayList<FeatureClass>();
-			addClasses(ApplicationPackageImpl.eINSTANCE, list);
+			Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
 			list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
 
 			childrenDropDown.setInput(list);
@@ -318,21 +328,6 @@ public void widgetSelected(SelectionEvent e) {
 		return parent;
 	}
 
-	public void addClasses(EPackage ePackage, List<FeatureClass> list) {
-		for (EClassifier c : ePackage.getEClassifiers()) {
-			if (c instanceof EClass) {
-				EClass eclass = (EClass) c;
-				if (eclass != ApplicationPackageImpl.Literals.APPLICATION && !eclass.isAbstract() && !eclass.isInterface() && eclass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT)) {
-					list.add(new FeatureClass(eclass.getName(), eclass));
-				}
-			}
-		}
-
-		for (EPackage eSubPackage : ePackage.getESubpackages()) {
-			addClasses(eSubPackage, list);
-		}
-	}
-
 	public void dispose() {
 		if (image != null) {
 			image.dispose();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index 0b4908554f..ee2036a230 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -13,19 +13,17 @@
 import java.text.BreakIterator;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map.Entry;
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.Util.InternalClass;
+import org.eclipse.e4.tools.emf.ui.common.Util.InternalFeature;
+import org.eclipse.e4.tools.emf.ui.common.Util.InternalPackage;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.StringMatcher;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.e4.ui.model.internal.ModelUtils;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
@@ -61,7 +59,7 @@ public class FeatureSelectionDialog extends TitleAreaDialog {
 	private TreeViewer viewer;
 	private MStringModelFragment fragment;
 	private EditingDomain editingDomain;
-	
+
 	public FeatureSelectionDialog(Shell parentShell, EditingDomain editingDomain, MStringModelFragment fragment) {
 		super(parentShell);
 		this.fragment = fragment;
@@ -73,19 +71,18 @@ protected Control createDialogArea(Composite parent) {
 		getShell().setText(Messages.FeatureSelectionDialog_ShellTitle);
 		setTitle(Messages.FeatureSelectionDialog_DialogTitle);
 		setMessage(Messages.FeatureSelectionDialog_DialogMessage);
-		
-		
+
 		Composite composite = (Composite) super.createDialogArea(parent);
-		
-		final Image packageImage = new Image(getShell().getDisplay(),getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/EPackage.gif")); //$NON-NLS-1$
-		final Image classImage = new Image(getShell().getDisplay(),getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/class_obj.gif")); //$NON-NLS-1$
-		final Image featureImage = new Image(getShell().getDisplay(),getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/field_public_obj.gif")); //$NON-NLS-1$
-		final Image newTitleImage = new Image(getShell().getDisplay(),getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/fieldrefact_wiz.png")); //$NON-NLS-1$
+
+		final Image packageImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/EPackage.gif")); //$NON-NLS-1$
+		final Image classImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/class_obj.gif")); //$NON-NLS-1$
+		final Image featureImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/field_public_obj.gif")); //$NON-NLS-1$
+		final Image newTitleImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/fieldrefact_wiz.png")); //$NON-NLS-1$
 
 		setTitleImage(newTitleImage);
-		
+
 		composite.addDisposeListener(new DisposeListener() {
-			
+
 			public void widgetDisposed(DisposeEvent e) {
 				packageImage.dispose();
 				classImage.dispose();
@@ -93,8 +90,7 @@ public void widgetDisposed(DisposeEvent e) {
 				newTitleImage.dispose();
 			}
 		});
-		
-		
+
 		Composite container = new Composite(composite, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 		container.setLayout(new GridLayout(2, false));
@@ -104,16 +100,16 @@ public void widgetDisposed(DisposeEvent e) {
 
 		final Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
+
 		new Label(container, SWT.NONE);
 		viewer = new TreeViewer(container);
 		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.heightHint=200;
+		gd.heightHint = 200;
 		viewer.getControl().setLayoutData(gd);
 		viewer.setContentProvider(new ContentProviderImpl());
-		viewer.setLabelProvider(new LabelProviderImpl(packageImage,classImage,featureImage));
+		viewer.setLabelProvider(new LabelProviderImpl(packageImage, classImage, featureImage));
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
-			
+
 			public void doubleClick(DoubleClickEvent event) {
 				okPressed();
 			}
@@ -121,19 +117,19 @@ public void doubleClick(DoubleClickEvent event) {
 		viewer.setComparator(new ViewerComparator() {
 			@Override
 			public int compare(Viewer viewer, Object e1, Object e2) {
-				if( e1.getClass() == InternalPackage.class ) {
-					return ((InternalPackage)e1).ePackage.getNsURI().compareTo(((InternalPackage)e2).ePackage.getNsURI());
-				} else if( e1.getClass() == InternalClass.class ) {
-					return ((InternalClass)e1).eClass.getName().compareTo(((InternalClass)e2).eClass.getName());
-				} else if( e1.getClass() == InternalFeature.class ) {
-					return ((InternalFeature)e1).feature.getName().compareTo(((InternalFeature)e2).feature.getName());
+				if (e1.getClass() == InternalPackage.class) {
+					return ((InternalPackage) e1).ePackage.getNsURI().compareTo(((InternalPackage) e2).ePackage.getNsURI());
+				} else if (e1.getClass() == InternalClass.class) {
+					return ((InternalClass) e1).eClass.getName().compareTo(((InternalClass) e2).eClass.getName());
+				} else if (e1.getClass() == InternalFeature.class) {
+					return ((InternalFeature) e1).feature.getName().compareTo(((InternalFeature) e2).feature.getName());
 				}
 				return super.compare(viewer, e1, e2);
 			}
 		});
-		
+
 		final ViewerFilterImpl filter = new ViewerFilterImpl();
-		
+
 		viewer.addFilter(filter);
 		searchText.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
@@ -142,86 +138,53 @@ public void modifyText(ModifyEvent e) {
 			}
 		});
 
-		
-		viewer.setInput(loadPackages());
-		
+		viewer.setInput(Util.loadPackages());
+
 		return composite;
 	}
-	
+
 	@Override
 	protected void okPressed() {
 		IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
-		if( ! sel.isEmpty() && sel.getFirstElement().getClass() == InternalFeature.class ) {
+		if (!sel.isEmpty() && sel.getFirstElement().getClass() == InternalFeature.class) {
 			InternalFeature f = (InternalFeature) sel.getFirstElement();
 			Command cmd = SetCommand.create(editingDomain, fragment, FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME, f.feature.getName());
-			
-			if( cmd.canExecute() ) {
+
+			if (cmd.canExecute()) {
 				editingDomain.getCommandStack().execute(cmd);
-				super.okPressed();	
+				super.okPressed();
 			}
 		}
 	}
-	
-	private static List<InternalPackage> loadPackages() {
-		List<InternalPackage> packs = new ArrayList<InternalPackage>();
-		
-		for( Entry<String, Object> regEntry : EPackage.Registry.INSTANCE.entrySet() ) {
-			if( regEntry.getValue() instanceof EPackage ) {
-				EPackage ePackage = (EPackage) regEntry.getValue();
-				InternalPackage iePackage = new InternalPackage(ePackage);
-				boolean found = false;
-				for( EClassifier cl : ePackage.getEClassifiers() ) {
-					if( cl instanceof EClass ) {
-						EClass eClass = (EClass) cl;
-						if( eClass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT) ) {
-							if( ! eClass.isInterface() && ! eClass.isAbstract() ) {
-								found = true;
-								InternalClass ieClass = new InternalClass(iePackage, eClass);
-								iePackage.classes.add(ieClass);
-								for( EReference f : eClass.getEAllReferences() ) {
-									ieClass.features.add(new InternalFeature(ieClass, f));
-								}
-							}
-						}
-					}
-				}
-				if( found ) {
-					packs.add(iePackage);
-				}
-			}
-		}
-		
-		return packs;
-	}
-	
+
 	static class ContentProviderImpl implements ITreeContentProvider {
 
 		public void dispose() {
-			
+
 		}
 
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			
+
 		}
 
 		public Object[] getElements(Object inputElement) {
-			return ((List<?>)inputElement).toArray();
+			return ((List<?>) inputElement).toArray();
 		}
 
 		public Object[] getChildren(Object parentElement) {
-			if( parentElement.getClass() == InternalPackage.class ) {
-				return ((InternalPackage)parentElement).classes.toArray();
-			} else if( parentElement.getClass() == InternalClass.class ) {
-				return ((InternalClass)parentElement).features.toArray();
+			if (parentElement.getClass() == InternalPackage.class) {
+				return ((InternalPackage) parentElement).classes.toArray();
+			} else if (parentElement.getClass() == InternalClass.class) {
+				return ((InternalClass) parentElement).features.toArray();
 			}
 			return new Object[0];
 		}
 
 		public Object getParent(Object element) {
-			if( element.getClass() == InternalFeature.class ) {
-				return ((InternalFeature)element).clazz;
-			} else if( element.getClass() == InternalClass.class ) {
-				return ((InternalClass)element).pack;
+			if (element.getClass() == InternalFeature.class) {
+				return ((InternalFeature) element).clazz;
+			} else if (element.getClass() == InternalClass.class) {
+				return ((InternalClass) element).pack;
 			}
 			return null;
 		}
@@ -229,43 +192,43 @@ public Object getParent(Object element) {
 		public boolean hasChildren(Object element) {
 			return getChildren(element).length > 0;
 		}
-		
+
 	}
-	
+
 	static class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
 		private final Image packageImage;
 		private final Image classImage;
 		private final Image featureImage;
-		
+
 		public LabelProviderImpl(Image packageImage, Image classImage, Image featureImage) {
 			this.packageImage = packageImage;
 			this.classImage = classImage;
 			this.featureImage = featureImage;
 		}
-		
+
 		public void update(final ViewerCell cell) {
-			if( cell.getElement().getClass() == InternalPackage.class ) {
+			if (cell.getElement().getClass() == InternalPackage.class) {
 				InternalPackage o = (InternalPackage) cell.getElement();
-				StyledString styledString =  new StyledString(o.ePackage.getName());
-				styledString.append( " - " + o.ePackage.getNsURI(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+				StyledString styledString = new StyledString(o.ePackage.getName());
+				styledString.append(" - " + o.ePackage.getNsURI(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 				cell.setText(styledString.getString());
 				cell.setStyleRanges(styledString.getStyleRanges());
 				cell.setImage(packageImage);
-			} else if( cell.getElement().getClass() == InternalClass.class ) {
+			} else if (cell.getElement().getClass() == InternalClass.class) {
 				InternalClass o = (InternalClass) cell.getElement();
 				cell.setText(o.eClass.getName());
 				cell.setImage(classImage);
 			} else {
 				InternalFeature o = (InternalFeature) cell.getElement();
-				StyledString styledString =  new StyledString(o.feature.getName());
-				
+				StyledString styledString = new StyledString(o.feature.getName());
+
 				EClassifier type = ModelUtils.getTypeArgument(o.clazz.eClass, o.feature.getEGenericType());
-				if( o.feature.isMany() ) {
-					styledString.append(" : List<" + type.getName()+ ">", StyledString.DECORATIONS_STYLER); //$NON-NLS-1$ //$NON-NLS-2$
+				if (o.feature.isMany()) {
+					styledString.append(" : List<" + type.getName() + ">", StyledString.DECORATIONS_STYLER); //$NON-NLS-1$ //$NON-NLS-2$
 				} else {
 					styledString.append(" : " + type.getName(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 				}
-				
+
 				cell.setText(styledString.getString());
 				cell.setStyleRanges(styledString.getStyleRanges());
 				cell.setImage(featureImage);
@@ -277,10 +240,10 @@ public Image getImage(Object element) {
 		}
 
 		public String getText(Object element) {
-			if( element.getClass() == InternalPackage.class ) {
+			if (element.getClass() == InternalPackage.class) {
 				InternalPackage o = (InternalPackage) element;
 				return o.ePackage.getName();
-			} else if( element.getClass() == InternalClass.class ) {
+			} else if (element.getClass() == InternalClass.class) {
 				InternalClass o = (InternalClass) element;
 				return o.eClass.getName();
 			} else {
@@ -289,39 +252,39 @@ public String getText(Object element) {
 			}
 		}
 	}
-	
+
 	static class ViewerFilterImpl extends ViewerFilter {
 		private StringMatcher matcher;
-		
+
 		@Override
 		public boolean select(Viewer viewer, Object parentElement, Object element) {
-			
-			if( element.getClass() == InternalPackage.class ) {
-				ILabelProvider pv = (ILabelProvider) ((StructuredViewer)viewer).getLabelProvider(); 
-				for( InternalClass c : ((InternalPackage)element).classes ) {
-					if( match(pv.getText(c)) ) {
+
+			if (element.getClass() == InternalPackage.class) {
+				ILabelProvider pv = (ILabelProvider) ((StructuredViewer) viewer).getLabelProvider();
+				for (InternalClass c : ((InternalPackage) element).classes) {
+					if (match(pv.getText(c))) {
 						return true;
 					}
 				}
 				return false;
-			} else if( element.getClass() == InternalPackage.class ) {
-				ILabelProvider pv = (ILabelProvider) ((StructuredViewer)viewer).getLabelProvider(); 
-				return match(pv.getText(element));				
+			} else if (element.getClass() == InternalPackage.class) {
+				ILabelProvider pv = (ILabelProvider) ((StructuredViewer) viewer).getLabelProvider();
+				return match(pv.getText(element));
 			}
-			
+
 			return true;
 		}
-		
+
 		protected boolean wordMatches(String text) {
 			if (text == null) {
 				return false;
 			}
-			
-			//If the whole text matches we are all set
-			if(match(text)) {
+
+			// If the whole text matches we are all set
+			if (match(text)) {
 				return true;
 			}
-			
+
 			// Otherwise check if any of the words of the text matches
 			String[] words = getWords(text);
 			for (int i = 0; i < words.length; i++) {
@@ -333,56 +296,59 @@ protected boolean wordMatches(String text) {
 
 			return false;
 		}
-		
+
 		/**
-	     * Answers whether the given String matches the pattern.
-	     * 
-	     * @param string the String to test
-	     * 
-	     * @return whether the string matches the pattern
-	     */
-	    private boolean match(String string) {
-	    	if (matcher == null) {
+		 * Answers whether the given String matches the pattern.
+		 * 
+		 * @param string
+		 *            the String to test
+		 * 
+		 * @return whether the string matches the pattern
+		 */
+		private boolean match(String string) {
+			if (matcher == null) {
 				return true;
 			}
-	        return matcher.match(string);
-	    }
-	    
-	    /**
-	     * The pattern string for which this filter should select 
-	     * elements in the viewer.
-	     * 
-	     * @param patternString
-	     */
-	    public void setPattern(String patternString) {
-	    	
-	        if (patternString == null || patternString.equals("")) { //$NON-NLS-1$
+			return matcher.match(string);
+		}
+
+		/**
+		 * The pattern string for which this filter should select elements in
+		 * the viewer.
+		 * 
+		 * @param patternString
+		 */
+		public void setPattern(String patternString) {
+
+			if (patternString == null || patternString.equals("")) { //$NON-NLS-1$
 				matcher = null;
 			} else {
 				String pattern = patternString + "*"; //$NON-NLS-1$
-//				if (includeLeadingWildcard) {
-//					pattern = "*" + pattern; //$NON-NLS-1$
-//				}
+				// if (includeLeadingWildcard) {
+				//					pattern = "*" + pattern; //$NON-NLS-1$
+				// }
 				matcher = new StringMatcher(pattern, true, false);
 			}
-	    }
-	    
-	    /**
-	     * Take the given filter text and break it down into words using a 
-	     * BreakIterator.  
-	     * 
-	     * @param text
-	     * @return an array of words
-	     */
-	    private String[] getWords(String text){
-	    	List<String> words = new ArrayList<String>();
+		}
+
+		/**
+		 * Take the given filter text and break it down into words using a
+		 * BreakIterator.
+		 * 
+		 * @param text
+		 * @return an array of words
+		 */
+		private String[] getWords(String text) {
+			List<String> words = new ArrayList<String>();
 			// Break the text up into words, separating based on whitespace and
 			// common punctuation.
 			// Previously used String.split(..., "\\W"), where "\W" is a regular
 			// expression (see the Javadoc for class Pattern).
-			// Need to avoid both String.split and regular expressions, in order to
+			// Need to avoid both String.split and regular expressions, in order
+			// to
 			// compile against JCL Foundation (bug 80053).
-			// Also need to do this in an NL-sensitive way. The use of BreakIterator
+			// Also need to do this in an NL-sensitive way. The use of
+			// BreakIterator
 			// was suggested in bug 90579.
 			BreakIterator iter = BreakIterator.getWordInstance();
 			iter.setText(text);
@@ -400,42 +366,6 @@ private String[] getWords(String text){
 				i = j;
 			}
 			return (String[]) words.toArray(new String[words.size()]);
-	    }
-	}
-	
-	static class InternalPackage {
-		final EPackage ePackage;
-		List<InternalClass> classes = new ArrayList<InternalClass>();
-		
-		public InternalPackage(EPackage ePackage) {
-			this.ePackage = ePackage;
-		}
-		
-		@Override
-		public String toString() {
-			return ePackage.toString();
-		}
-	}
-	
-	static class InternalClass {
-		final InternalPackage pack;
-		final EClass eClass;
-		List<InternalFeature> features = new ArrayList<InternalFeature>();
-		
-		public InternalClass(InternalPackage pack, EClass eClass) {
-			this.eClass = eClass;
-			this.pack = pack;
-		}
-	}
-	
-	static class InternalFeature {
-		final InternalClass clazz;
-		final EStructuralFeature feature;
-		
-		public InternalFeature(InternalClass clazz, EStructuralFeature feature) {
-			this.clazz = clazz;
-			this.feature = feature;
 		}
-		
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index 0f71fd7c5f..085fc44bf0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -10,6 +10,7 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
@@ -125,8 +126,8 @@ public void modifyText(ModifyEvent e) {
 					currentResultHandler.cancled = true;
 				}
 				list.clear();
-				Filter filter = new Filter(element, searchText.getText());
-				currentResultHandler = new ModelResultHandlerImpl(list, filter, editor);
+				Filter filter = new Filter(element.eClass(), searchText.getText());
+				currentResultHandler = new ModelResultHandlerImpl(list, filter, editor, element.eResource());
 				collector.findModelElements(filter, currentResultHandler);
 			}
 		});
@@ -153,9 +154,11 @@ protected void okPressed() {
 				Command cmd = SetCommand.create(editor.getEditingDomain(), element, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, el.getElementId());
 				if (cmd.canExecute()) {
 					editor.getEditingDomain().getCommandStack().execute(cmd);
+					super.okPressed();
 				}
+			} else {
+				setErrorMessage("You can not import an element without an ID");
 			}
-			super.okPressed();
 		}
 	}
 
@@ -174,31 +177,39 @@ private static class ModelResultHandlerImpl implements ModelResultHandler {
 		private IObservableList list;
 		private Filter filter;
 		private AbstractComponentEditor editor;
+		private Resource resource;
 
-		public ModelResultHandlerImpl(IObservableList list, Filter filter, AbstractComponentEditor editor) {
+		public ModelResultHandlerImpl(IObservableList list, Filter filter, AbstractComponentEditor editor, Resource resource) {
 			this.list = list;
 			this.filter = filter;
 			this.editor = editor;
+			this.resource = resource;
 		}
 
 		public void result(EObject data) {
 			if (!cancled) {
-				if (data instanceof MApplicationElement) {
-					String elementId = ((MApplicationElement) data).getElementId();
-					if (elementId != null && elementId.trim().length() > 0) {
-						if (filter.elementIdPattern.matcher(elementId).matches()) {
+				if (!resource.getURI().equals(data.eResource().getURI()))
+					if (data instanceof MApplicationElement) {
+						String elementId = ((MApplicationElement) data).getElementId();
+						if (elementId == null) {
 							list.add(data);
 							return;
 						}
-					}
 
-					String label = editor.getDetailLabel(data);
-					if (elementId != null && label != null && label.trim().length() > 0) {
-						if (filter.elementIdPattern.matcher(label).matches()) {
-							list.add(data);
+						if (elementId != null && elementId.trim().length() > 0) {
+							if (filter.elementIdPattern.matcher(elementId).matches()) {
+								list.add(data);
+								return;
+							}
+						}
+
+						String label = editor.getDetailLabel(data);
+						if (elementId != null && label != null && label.trim().length() > 0) {
+							if (filter.elementIdPattern.matcher(label).matches()) {
+								list.add(data);
+							}
 						}
 					}
-				}
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
new file mode 100644
index 0000000000..c38bc0257a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -0,0 +1,263 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.Filter;
+import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.ModelResultHandler;
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.Util.InternalPackage;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
+import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+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.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+
+public class FindParentReferenceElementDialog extends TitleAreaDialog {
+	private MStringModelFragment fragment;
+	private AbstractComponentEditor editor;
+	private TableViewer viewer;
+
+	public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEditor editor, MStringModelFragment fragment) {
+		super(parentShell);
+		this.fragment = fragment;
+		this.editor = editor;
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite comp = (Composite) super.createDialogArea(parent);
+
+		final Image titleImage = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/import_wiz.png"));
+		setTitleImage(titleImage);
+		getShell().addDisposeListener(new DisposeListener() {
+
+			public void widgetDisposed(DisposeEvent e) {
+				titleImage.dispose();
+			}
+		});
+
+		getShell().setText("Find Parent Elements");
+		setTitle("Find Parent Elements");
+		setMessage("Search for an elements who you like to references as parent");
+
+		Composite container = new Composite(comp, SWT.NONE);
+		container.setLayoutData(new GridData(GridData.FILL_BOTH));
+		container.setLayout(new GridLayout(2, false));
+
+		Label l = new Label(container, SWT.NONE);
+		l.setText("Container-Type");
+
+		final ComboViewer eClassViewer = new ComboViewer(container);
+		eClassViewer.setLabelProvider(new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				return ((EClass) element).getName();
+			}
+		});
+		eClassViewer.setContentProvider(new ArrayContentProvider());
+		List<EClass> eClassList = new ArrayList<EClass>();
+		for (InternalPackage p : Util.loadPackages()) {
+			eClassList.addAll(p.getAllClasses());
+		}
+		eClassViewer.setComparator(new ViewerComparator() {
+			@Override
+			public int compare(Viewer viewer, Object e1, Object e2) {
+				EClass ec1 = (EClass) e1;
+				EClass ec2 = (EClass) e2;
+				return ec1.getName().compareTo(ec2.getName());
+			}
+		});
+		eClassViewer.setInput(eClassList);
+		eClassViewer.getCombo().select(0);
+		eClassViewer.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		l = new Label(container, SWT.NONE);
+		l.setText("Search");
+
+		final Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		searchText.setLayoutData(gd);
+
+		l = new Label(container, SWT.PUSH);
+
+		viewer = new TableViewer(container);
+		gd = new GridData(GridData.FILL_BOTH);
+		gd.heightHint = 200;
+		viewer.getControl().setLayoutData(gd);
+		viewer.setLabelProvider(new StyledCellLabelProvider() {
+			@Override
+			public void update(ViewerCell cell) {
+				EObject o = (EObject) cell.getElement();
+				AbstractComponentEditor editor = FindParentReferenceElementDialog.this.editor.getEditor().getEditor(o.eClass());
+				cell.setImage(editor.getImage(o, searchText.getDisplay()));
+
+				MApplicationElement appEl = (MApplicationElement) o;
+
+				StyledString styledString = new StyledString(editor.getLabel(o) + " (" + (appEl.getElementId() == null ? "<no id>" : appEl.getElementId()) + ")", null);
+				String detailLabel = editor.getDetailLabel(o);
+				if (detailLabel != null && !detailLabel.equals(appEl.getElementId())) {
+					styledString.append(" - " + detailLabel, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+				}
+
+				styledString.append(" - " + o.eResource().getURI(), StyledString.COUNTER_STYLER); //$NON-NLS-1$
+				cell.setStyleRanges(styledString.getStyleRanges());
+				cell.setText(styledString.getString());
+			}
+		});
+		viewer.setContentProvider(new ObservableListContentProvider());
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+
+			public void doubleClick(DoubleClickEvent event) {
+				okPressed();
+			}
+		});
+
+		final WritableList list = new WritableList();
+		viewer.setInput(list);
+
+		final ClassContributionCollector collector = getCollector();
+
+		searchText.addModifyListener(new ModifyListener() {
+			private ModelResultHandlerImpl currentResultHandler;
+
+			public void modifyText(ModifyEvent e) {
+				if (currentResultHandler != null) {
+					currentResultHandler.cancled = true;
+				}
+				list.clear();
+
+				Filter filter = new Filter((EClass) ((IStructuredSelection) eClassViewer.getSelection()).getFirstElement(), searchText.getText());
+
+				currentResultHandler = new ModelResultHandlerImpl(list, filter, editor, ((EObject) fragment).eResource());
+				collector.findModelElements(filter, currentResultHandler);
+			}
+		});
+
+		Button button = new Button(container, SWT.PUSH);
+		button.setText("Clear Cache");
+		button.setLayoutData(new GridData(GridData.END, GridData.CENTER, true, false, 2, 1));
+		button.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				collector.clearModelCache();
+			}
+		});
+
+		return comp;
+	}
+
+	@Override
+	protected void okPressed() {
+		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+		if (!s.isEmpty()) {
+			MApplicationElement el = (MApplicationElement) s.getFirstElement();
+			if (el.getElementId() != null && el.getElementId().trim().length() > 0) {
+				Command cmd = SetCommand.create(editor.getEditingDomain(), fragment, FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID, el.getElementId());
+				if (cmd.canExecute()) {
+					editor.getEditingDomain().getCommandStack().execute(cmd);
+					super.okPressed();
+				}
+			} else {
+				setErrorMessage("You can not reference an element without an ID");
+			}
+		}
+	}
+
+	private ClassContributionCollector getCollector() {
+		Bundle bundle = FrameworkUtil.getBundle(FindParentReferenceElementDialog.class);
+		BundleContext context = bundle.getBundleContext();
+		ServiceReference ref = context.getServiceReference(ClassContributionCollector.class.getName());
+		if (ref != null) {
+			return (ClassContributionCollector) context.getService(ref);
+		}
+		return null;
+	}
+
+	private static class ModelResultHandlerImpl implements ModelResultHandler {
+		private boolean cancled = false;
+		private IObservableList list;
+		private Filter filter;
+		private AbstractComponentEditor editor;
+		private Resource resource;
+
+		private List<EObject> noId = new ArrayList<EObject>();
+
+		public ModelResultHandlerImpl(IObservableList list, Filter filter, AbstractComponentEditor editor, Resource resource) {
+			this.list = list;
+			this.filter = filter;
+			this.editor = editor;
+			this.resource = resource;
+		}
+
+		public void result(EObject data) {
+			if (!cancled) {
+				if (!resource.getURI().equals(data.eResource().getURI())) {
+					if (data instanceof MApplicationElement) {
+						String elementId = ((MApplicationElement) data).getElementId();
+						if (elementId == null) {
+							list.add(data);
+							return;
+						}
+
+						if (elementId != null && elementId.trim().length() > 0) {
+							if (filter.elementIdPattern.matcher(elementId).matches()) {
+								list.add(data);
+								return;
+							}
+						}
+
+						String label = editor.getDetailLabel(data);
+						if (elementId != null && label != null && label.trim().length() > 0) {
+							if (filter.elementIdPattern.matcher(label).matches()) {
+								list.add(data);
+								return;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+}
\ No newline at end of file

From 1392aba4172771e5e9fd4cfd44f53300559987f7 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 9 Jul 2010 13:32:08 +0000
Subject: [PATCH 0206/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed layout

---
 .../common/component/StringModelFragment.java  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 020765acdc..9aed3b94bc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -122,14 +122,24 @@ private Composite createForm(Composite parent) {
 			l.setText(Messages.StringModelFragment_ParentId);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
-			t.setEditable(false);
+			Composite comp = new Composite(parent, SWT.NONE);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			comp.setLayoutData(gd);
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginWidth = gl.marginHeight = 0;
+			gl.verticalSpacing = 0;
+			gl.marginLeft = gl.marginBottom = gl.marginRight = gl.marginTop = 0;
+			comp.setLayout(gl);
+
+			Text t = new Text(comp, SWT.BORDER);
+			t.setEditable(false);
+			gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID).observeDetail(getMaster()));
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText("Find");
+			final Button b = new Button(comp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.StringModelFragment_Find);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {

From f4a2d714a748dabcb60bb9f1a1e184b8121c14a4 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 9 Jul 2010 13:35:18 +0000
Subject: [PATCH 0207/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed c&p

---
 .../e4/tools/emf/ui/internal/common/ModelEditor.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index cefdeededc..2e7ff81bae 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -700,6 +700,16 @@ public void paste() {
 				}
 			}
 
+			if (feature == FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS && container != null) {
+				MApplicationElement el = (MApplicationElement) EcoreUtil.create(((EObject) o).eClass());
+				el.setElementId(((MApplicationElement) o).getElementId());
+				Command cmd = AddCommand.create(getModelProvider().getEditingDomain(), container, feature, el);
+				if (cmd.canExecute()) {
+					getModelProvider().getEditingDomain().getCommandStack().execute(cmd);
+				}
+				return;
+			}
+
 			if (feature != null && container != null) {
 				Command cmd = AddCommand.create(getModelProvider().getEditingDomain(), container, feature, o);
 				if (cmd.canExecute()) {
@@ -844,7 +854,7 @@ public boolean performDrop(Object data) {
 					}
 				}
 
-				if (feature == FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
+				if (feature == FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS && parent != null) {
 					MApplicationElement el = (MApplicationElement) EcoreUtil.create(((EObject) data).eClass());
 					el.setElementId(((MApplicationElement) data).getElementId());
 					Command cmd = AddCommand.create(domain, parent, feature, el);

From 1b7733c3ad36193fc907566dd9ac1703089a4631 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 9 Jul 2010 13:44:35 +0000
Subject: [PATCH 0208/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * adding toberendered and visible attributes

---
 .../emf/ui/internal/common/component/PlaceholderEditor.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 82bca30ceb..2faa2d96dd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -28,6 +28,7 @@
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
@@ -220,6 +221,8 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 		}
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
 		return parent;
 	}

From 38a1d6a6c65c325b6e0de0f2204aa936316584c2 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 9 Jul 2010 15:48:31 +0000
Subject: [PATCH 0209/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed imports

---
 .../compat/internal/WorkbenchLogger.java      |  2 +
 .../emf/editor3x/E4WorkbenchModelEditor.java  |  1 -
 .../emf/editor3x/TargetElementProviders.java  |  6 --
 .../extension/AddonContributionEditor.java    |  1 -
 .../e4/tools/emf/ui/common/EStackLayout.java  |  3 +-
 .../tools/emf/ui/common/IEditorFeature.java   |  4 +-
 .../e4/tools/emf/ui/common/ImageTooltip.java  | 33 ++-----
 .../common/component/InputPartEditor.java     |  3 +-
 .../common/component/TrimmedWindowEditor.java |  5 +-
 .../AbstractCommandSelectionDialog.java       | 23 ++---
 .../dialogs/SharedElementsDialog.java         | 94 ++++++-------------
 .../virtual/VMenuContributionsEditor.java     | 20 +---
 .../virtual/VModelFragmentsEditor.java        | 19 +---
 .../virtual/VModelImportsEditor.java          | 29 ++----
 .../virtual/VToolBarContributionsEditor.java  | 24 +----
 .../virtual/VTrimContributionsEditor.java     | 28 +-----
 .../virtual/VWindowSharedElementsEditor.java  | 24 ++---
 .../internal/wbm/ApplicationModelEditor.java  |  3 +-
 18 files changed, 86 insertions(+), 236 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
index d5e64d8a36..ff8cbf85dc 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
@@ -1,7 +1,9 @@
 package org.eclipse.e4.tools.compat.internal;
 
 import java.util.ArrayList;
+
 import javax.inject.Inject;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
index 726842fae1..38b089228d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -13,7 +13,6 @@
 import org.eclipse.e4.tools.compat.parts.DIEditorPart;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource.ModelListener;
 import org.eclipse.e4.tools.emf.ui.internal.wbm.ApplicationModelEditor;
-import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.actions.ActionFactory;
 
 @SuppressWarnings("restriction")
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
index a53b2cdba9..4f4718d541 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
@@ -6,9 +6,6 @@
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider;
-import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.Filter;
-import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.ModelResultHandler;
-import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.common.util.URI;
@@ -17,10 +14,7 @@
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
 import org.eclipse.pde.internal.core.PDEExtensionRegistry;
-import org.eclipse.pde.internal.core.PluginModelManager;
 
 public class TargetElementProviders implements IModelElementProvider {
 	private ResourceSet resourceSet;
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
index ce8de80ff3..dee4f6bdcc 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
@@ -14,7 +14,6 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.e4.internal.tools.wizards.classes.NewAddonClassWizard;
-import org.eclipse.e4.internal.tools.wizards.classes.NewHandlerClassWizard;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/EStackLayout.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/EStackLayout.java
index 2b3b836c24..dee6098e7b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/EStackLayout.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/EStackLayout.java
@@ -11,11 +11,10 @@
 package org.eclipse.e4.tools.emf.ui.common;
 
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Composite;
 
-import org.eclipse.swt.custom.StackLayout;
-
 public class EStackLayout extends StackLayout {
 	private boolean onlyVisible;
 	
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
index cf0411f955..3771b73976 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
@@ -1,10 +1,8 @@
 package org.eclipse.e4.tools.emf.ui.common;
 
-import org.eclipse.emf.ecore.EStructuralFeature;
-
 import java.util.List;
-
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
 
 public interface IEditorFeature {
 	public class FeatureClass {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
index 87251ca5b5..2c3a30ce8a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
@@ -1,42 +1,23 @@
 package org.eclipse.e4.tools.emf.ui.common;
 
-import java.io.FileNotFoundException;
-
-import java.text.DecimalFormat;
-
-import java.text.NumberFormat;
-
 import java.io.ByteArrayInputStream;
-
-import org.eclipse.swt.graphics.ImageData;
-
 import java.io.ByteArrayOutputStream;
-
-import org.eclipse.swt.layout.GridLayout;
-
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
-
+import java.text.DecimalFormat;
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.jface.resource.JFaceResources;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.swt.graphics.Font;
-
-import org.eclipse.swt.widgets.Label;
-
+import org.eclipse.jface.window.ToolTip;
 import org.eclipse.swt.SWT;
-
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-
 import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.jface.window.ToolTip;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
 
 public abstract class ImageTooltip extends ToolTip {
 	private Image image;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
index b1164d29fa..35328c55bd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
@@ -10,11 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
index b00e589e71..e55c47e267 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
@@ -10,16 +10,15 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 
 public class TrimmedWindowEditor extends WindowEditor {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index 6134c2a0f1..d0ae2cab10 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -10,30 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-
-import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.common.util.TreeIterator;
-
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.e4.ui.model.fragment.MModelFragments;
-
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
-import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
@@ -48,6 +35,8 @@
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Image;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index f843431ff4..50a20e6c20 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -1,85 +1,49 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
-import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-
-import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
-
-import org.eclipse.emf.edit.command.SetCommand;
-
-import org.eclipse.emf.common.command.Command;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-
+import java.util.ArrayList;
+import java.util.List;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
-
-import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
-
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-
-import org.eclipse.jface.viewers.StyledString;
-
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jface.viewers.ViewerCell;
-
-import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
-
+import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.StyledCellLabelProvider;
-
-import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
-
+import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.fragment.MModelFragment;
-
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
-
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
-
-import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
-
-import java.util.ArrayList;
-
-import java.util.List;
-
+import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.e4.ui.model.application.MApplicationElement;
-
-import org.eclipse.e4.ui.model.application.MApplication;
-
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.AbstractTreeViewer;
+import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
-
-import org.eclipse.jface.viewers.ArrayContentProvider;
-
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.TableViewer;
-
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-
 import org.eclipse.swt.layout.GridLayout;
-
-import org.eclipse.swt.widgets.Text;
-
-import org.eclipse.swt.SWT;
-
-import org.eclipse.swt.widgets.Label;
-
 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.jface.dialogs.TitleAreaDialog;
+import org.eclipse.swt.widgets.Text;
 
 public class SharedElementsDialog extends TitleAreaDialog {
 	private TableViewer viewer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index 54a03e5c2c..51956f3f7a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -10,16 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
-
-import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
-
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -28,11 +18,11 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
-import org.eclipse.e4.ui.model.application.descriptor.basic.MBasicFactory;
-import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
-import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorContainer;
-import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index 22c351910c..ff947948ef 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -10,14 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import org.eclipse.e4.ui.model.fragment.MModelFragments;
-
-import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
-
-import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
-
-import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
-
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -25,23 +17,20 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
+import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index 4152290714..7335cc89c8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -10,39 +10,24 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-
 import java.util.ArrayList;
-import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-
-import org.eclipse.e4.ui.model.fragment.MModelFragments;
-
-import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
-
-import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
-
-import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
-
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
@@ -55,6 +40,8 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index e1edb402f7..9813292221 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -10,20 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContributions;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
-
-import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
-
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -32,11 +18,11 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
-import org.eclipse.e4.ui.model.application.descriptor.basic.MBasicFactory;
-import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
-import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorContainer;
-import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContributions;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index 42b3bd4a4d..a98176cde9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -10,24 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MTrimContributions;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContributions;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
-
-import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
-
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -36,11 +18,11 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
-import org.eclipse.e4.ui.model.application.descriptor.basic.MBasicFactory;
-import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
-import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorContainer;
-import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
+import org.eclipse.e4.ui.model.application.ui.menu.MTrimContributions;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 253f4fe051..66761b232d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -11,12 +11,16 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.List;
+import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
-import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.ecore.EClass;
@@ -25,34 +29,24 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Label;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.jface.viewers.TableViewer;
-
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.emf.edit.domain.EditingDomain;
-
-import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.swt.widgets.Label;
 
 public class VWindowSharedElementsEditor extends AbstractComponentEditor {
 	private Composite composite;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index c406dfc689..60a2ae91af 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -10,9 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.wbm;
 
-import javax.inject.Named;
-
 import javax.inject.Inject;
+import javax.inject.Named;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;

From cf3d713ce012e9e0eaa13caff2c0885f9a06fa39 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 13 Jul 2010 11:38:54 +0000
Subject: [PATCH 0210/1286]  Bug 319687 -  [ModelTooling] Feature Description
 and Copyright incorrect

---
 .../org.eclipse.e4.core.tools.feature/feature.properties    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.properties b/features/org.eclipse.e4.core.tools.feature/feature.properties
index b4f9dc8130..70a37cf4d4 100755
--- a/features/org.eclipse.e4.core.tools.feature/feature.properties
+++ b/features/org.eclipse.e4.core.tools.feature/feature.properties
@@ -28,18 +28,18 @@ secondaryUpdateSiteName=Ganymede Discovery Site
 
 
 # "description" property - description of the feature
-description=Eclipse e4 Multiple Programming Language
+description=Eclipse e4 Modeltooling
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others.\n\
+Copyright (c) 2000, 2009 BestSolution.at and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
 http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
-    IBM Corporation - initial API and implementation\n
+    BestSolution.at - initial API and implementation\n
 ################ end of copyright property ####################################
 
 # "licenseURL" property - URL of the "Feature License"

From 1c997e8b8d8972f843856b7b7d43696376a16a13 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 16 Jul 2010 22:08:49 +0000
Subject: [PATCH 0211/1286]  Bug 320131 -  NPE in ModelEditor.setFocus

---
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 2e7ff81bae..e62fc2ecf6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -657,7 +657,9 @@ public void setFocus() {
 		if (clipboardHandler == null) {
 			clipboardHandler = new ClipboardHandler();
 		}
-		clipboardService.setHandler(clipboardHandler);
+		if (clipboardService != null) {
+			clipboardService.setHandler(clipboardHandler);
+		}
 		viewer.getControl().setFocus();
 	}
 

From 377a12a9bb101dd839635b8e2a73c672b8f64b12 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 11:00:26 +0000
Subject: [PATCH 0212/1286] Bug 318383 -  Sash and Stack not updated if model
 is modified - Renderer * implemented moving for stacks

---
 .../eclipse/e4/tools/emf/ui/common/Util.java  | 25 +++++++++++++++++++
 .../common/component/PartStackEditor.java     | 14 +++--------
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index 16f542502e..5a54ad348a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -5,13 +5,19 @@
 import java.util.Map.Entry;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 
 public class Util {
 	public static final boolean isNullOrEmpty(String element) {
@@ -69,6 +75,25 @@ public static List<InternalPackage> loadPackages() {
 		return packs;
 	}
 
+	public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement element, boolean liveModel, int index) {
+		if (liveModel) {
+			MElementContainer<MUIElement> container = element.getParent();
+			container.getChildren().remove(element);
+			container.getChildren().add(index, element);
+			container.setSelectedElement(element);
+			return true;
+		} else {
+			MElementContainer<MUIElement> container = element.getParent();
+			Command cmd = MoveCommand.create(editingDomain, container, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, element, index);
+
+			if (cmd.canExecute()) {
+				editingDomain.getCommandStack().execute(cmd);
+				return true;
+			}
+			return false;
+		}
+	}
+
 	public static class InternalPackage {
 		public final EPackage ePackage;
 		public List<InternalClass> classes = new ArrayList<InternalClass>();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index f3bfd49de6..19c7adc85d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -38,7 +38,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -228,10 +227,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
 							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
@@ -252,17 +248,13 @@ public void widgetSelected(SelectionEvent e) {
 						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							MElementContainer<MUIElement> container = (MElementContainer<MUIElement>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
 							if (idx < container.getChildren().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-
 						}
 					}
 				}

From d36ff018fe70a167d6f51f051fdbc367f8fdac61 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 11:17:15 +0000
Subject: [PATCH 0213/1286] Bug 318383 -  Sash and Stack not updated if model
 is modified - Renderer * implemented moving for all element containers

---
 .../component/MenuContributionEditor.java     |  11 +-
 .../internal/common/component/MenuEditor.java |  11 +-
 .../component/PartSashContainerEditor.java    |  11 +-
 .../common/component/PerspectiveEditor.java   |  11 +-
 .../component/PerspectiveStackEditor.java     |  11 +-
 .../component/ToolBarContributionEditor.java  |  11 +-
 .../common/component/ToolBarEditor.java       |  11 +-
 .../common/component/TrimBarEditor.java       |  11 +-
 .../component/TrimContributionEditor.java     |  11 +-
 .../virtual/VWindowControlEditor.java         | 103 ++++++++----------
 .../component/virtual/VWindowEditor.java      |  52 ++++-----
 11 files changed, 85 insertions(+), 169 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index e563588cf2..fa7b3eaf14 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -42,7 +42,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -277,10 +276,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
 							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
@@ -304,10 +300,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
 							if (idx < container.getChildren().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 5891271674..f4278c1be9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -48,7 +48,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -305,10 +304,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
 							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
@@ -332,10 +328,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
 							if (idx < container.getChildren().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 0f7404c60f..55057b99de 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -39,7 +39,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -265,10 +264,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
 							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
@@ -292,10 +288,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
 							if (idx < container.getChildren().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 8e91d780bb..3dd1a150a5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -44,7 +44,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -289,10 +288,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
 							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
@@ -316,10 +312,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
 							if (idx < container.getChildren().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 490d58290a..94673c50d8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -36,7 +36,6 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -206,10 +205,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
 							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
@@ -233,10 +229,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
 							if (idx < container.getChildren().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 9c32fe0208..f4a7d9167d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -42,7 +42,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -272,10 +271,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
 							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
@@ -299,10 +295,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
 							if (idx < container.getChildren().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index d1de5cb376..e0411acdb4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -41,7 +41,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -239,10 +238,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
 							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
@@ -266,10 +262,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
 							if (idx < container.getChildren().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 65d4308082..516e873ab6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -39,7 +39,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -225,10 +224,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
 							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
@@ -252,10 +248,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
 							if (idx < container.getChildren().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index ec62d555cd..2972f95dec 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -38,7 +38,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -249,10 +248,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
 							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
@@ -276,10 +272,7 @@ public void widgetSelected(SelectionEvent e) {
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
 							if (idx < container.getChildren().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 12ce25b892..2e43c53208 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -13,11 +13,13 @@
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -29,7 +31,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -56,7 +57,7 @@ public class VWindowControlEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 
 	public VWindowControlEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
@@ -81,19 +82,18 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
 		parent.setLayout(new GridLayout(3, false));
 
 		{
@@ -105,46 +105,42 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
-			
+
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 
-			
 			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
-			
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout(2,false);
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Up");
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
-							if( idx >= 0 ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-								
-								if( cmd.canExecute() ) {
-									getEditingDomain().getCommandStack().execute(cmd);
+							if (idx >= 0) {
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -153,30 +149,26 @@ public void widgetSelected(SelectionEvent e) {
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Down");
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
-							if( idx < container.getChildren().size() ) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-								
-								if( cmd.canExecute() ) {
-									getEditingDomain().getCommandStack().execute(cmd);
+							if (idx < container.getChildren().size()) {
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
 						}
 					}
 				}
 			});
-			
+
 			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
 			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			childrenDropDown.setContentProvider(new ArrayContentProvider());
@@ -187,48 +179,42 @@ public String getText(Object element) {
 					return eclass.getName();
 				}
 			});
-			childrenDropDown.setInput(new EClass[] {
-					AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
-					BasicPackageImpl.Literals.PART_SASH_CONTAINER,
-					BasicPackageImpl.Literals.PART_STACK,
-					BasicPackageImpl.Literals.PART,
-					BasicPackageImpl.Literals.INPUT_PART
-			});
+			childrenDropDown.setInput(new EClass[] { AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART });
 			childrenDropDown.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK));
-			
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! childrenDropDown.getSelection().isEmpty() ) {
-						EClass eClass = (EClass) ((IStructuredSelection)childrenDropDown.getSelection()).getFirstElement();
-						
+					if (!childrenDropDown.getSelection().isEmpty()) {
+						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+
 						EObject eObject = EcoreUtil.create(eClass);
-						
+
 						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-						
-						if( cmd.canExecute() ) {
+
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 							getEditor().setSelection(eObject);
 						}
 					}
 				}
 			});
-			
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Remove");
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
-						
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
@@ -236,7 +222,6 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 3f358ad029..61129e57a6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -13,11 +13,13 @@
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -29,7 +31,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -57,7 +58,7 @@ public class VWindowEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 
 	public VWindowEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
@@ -156,7 +157,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		GridLayout gl = new GridLayout(2,false);
+		GridLayout gl = new GridLayout(2, false);
 		gl.marginLeft = 0;
 		gl.marginRight = 0;
 		gl.marginWidth = 0;
@@ -164,28 +165,25 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		buttonComp.setLayout(gl);
 
 		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		
+
 		b.setText("Up");
 		b.setImage(getImage(b.getDisplay(), ARROW_UP));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				if( ! viewer.getSelection().isEmpty() ) {
-					IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-					if( s.size() == 1 ) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
 						Object obj = s.getFirstElement();
 						MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 						int idx = container.getChildren().indexOf(obj) - 1;
-						if( idx >= 0 ) {
-							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-							
-							if( cmd.canExecute() ) {
-								getEditingDomain().getCommandStack().execute(cmd);
+						if (idx >= 0) {
+							if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 								viewer.setSelection(new StructuredSelection(obj));
 							}
 						}
-						
+
 					}
 				}
 			}
@@ -194,25 +192,21 @@ public void widgetSelected(SelectionEvent e) {
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText("Down");
 		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				if( ! viewer.getSelection().isEmpty() ) {
-					IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-					if( s.size() == 1 ) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
 						Object obj = s.getFirstElement();
 						MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 						int idx = container.getChildren().indexOf(obj) + 1;
-						if( idx < container.getChildren().size() ) {
-							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, obj, idx);
-							
-							if( cmd.canExecute() ) {
-								getEditingDomain().getCommandStack().execute(cmd);
+						if (idx < container.getChildren().size()) {
+							if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
 								viewer.setSelection(new StructuredSelection(obj));
 							}
 						}
-						
 					}
 				}
 			}
@@ -230,16 +224,16 @@ public String getText(Object element) {
 		});
 		childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.WINDOW, BasicPackageImpl.Literals.TRIMMED_WINDOW });
 		childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.WINDOW));
-		
+
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				EClass eClass = (EClass) ((IStructuredSelection)childrenDropDown.getSelection()).getFirstElement();
+				EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
 				EObject handler = EcoreUtil.create(eClass);
-				
+
 				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
 
 				if (cmd.canExecute()) {
@@ -252,7 +246,7 @@ public void widgetSelected(SelectionEvent e) {
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText("Remove");
 		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -262,7 +256,7 @@ public void widgetSelected(SelectionEvent e) {
 					Command cmd = RemoveCommand.create(getEditingDomain(), container, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, windows);
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
-						if( container.getChildren().size() > 0 ) {
+						if (container.getChildren().size() > 0) {
 							viewer.setSelection(new StructuredSelection(container.getChildren().get(0)));
 						}
 					}

From d8b50e3b88d3faa11706f86e0309335cd4de9d64 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 11:27:02 +0000
Subject: [PATCH 0214/1286] Bug 318383 -  Sash and Stack not updated if model
 is modified - Renderer * fixed drag and drop

---
 .../emf/ui/internal/common/ModelEditor.java     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index e62fc2ecf6..734dc615f5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -44,6 +44,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.ISelectionProviderService;
 import org.eclipse.e4.tools.emf.ui.common.MemoryTransfer;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.AddonsEditor;
@@ -787,7 +788,7 @@ public void dragSetData(DragSourceEvent event) {
 		}
 	}
 
-	static class DropListener extends ViewerDropAdapter {
+	class DropListener extends ViewerDropAdapter {
 		private EditingDomain domain;
 
 		protected DropListener(Viewer viewer, EditingDomain domain) {
@@ -866,7 +867,7 @@ public boolean performDrop(Object data) {
 					return true;
 				}
 
-				if (feature != null && parent != null) {
+				if (feature != null && parent != null && parent.eGet(feature) instanceof List<?>) {
 					List<Object> list = (List<Object>) parent.eGet(feature);
 					int index = list.indexOf(getCurrentTarget());
 
@@ -875,10 +876,14 @@ public boolean performDrop(Object data) {
 					}
 
 					if (parent == ((EObject) data).eContainer()) {
-						Command cmd = MoveCommand.create(domain, parent, feature, data, index);
-						if (cmd.canExecute()) {
-							domain.getCommandStack().execute(cmd);
-							return true;
+						if (parent instanceof MElementContainer<?> && data instanceof MUIElement) {
+							Util.moveElementByIndex(domain, (MUIElement) data, isLiveModel(), index);
+						} else {
+							Command cmd = MoveCommand.create(domain, parent, feature, data, index);
+							if (cmd.canExecute()) {
+								domain.getCommandStack().execute(cmd);
+								return true;
+							}
 						}
 					} else {
 						// Moving between different sources is always a copy

From eda3afb310035688812035bc91056fda257b83d3 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 11:40:48 +0000
Subject: [PATCH 0215/1286]  Bug 318246 -  [Model Tooling] Drag and drop for
 Parts into container

---
 .../org/eclipse/e4/tools/emf/ui/common/Util.java |  8 +++++++-
 .../emf/ui/internal/common/ModelEditor.java      | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index 5a54ad348a..b7addc99de 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -79,7 +79,13 @@ public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement
 		if (liveModel) {
 			MElementContainer<MUIElement> container = element.getParent();
 			container.getChildren().remove(element);
-			container.getChildren().add(index, element);
+
+			if (index >= 0) {
+				container.getChildren().add(index, element);
+			} else {
+				container.getChildren().add(element);
+			}
+
 			container.setSelectedElement(element);
 			return true;
 		} else {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 734dc615f5..76e81b0404 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -717,6 +717,11 @@ public void paste() {
 				Command cmd = AddCommand.create(getModelProvider().getEditingDomain(), container, feature, o);
 				if (cmd.canExecute()) {
 					getModelProvider().getEditingDomain().getCommandStack().execute(cmd);
+					if (isLiveModel()) {
+						if (container instanceof MElementContainer<?> && o instanceof MUIElement) {
+							((MElementContainer<MUIElement>) container).setSelectedElement((MUIElement) o);
+						}
+					}
 				}
 			}
 		}
@@ -827,6 +832,11 @@ public boolean performDrop(Object data) {
 					Command cmd = AddCommand.create(domain, parent, feature, data);
 					if (cmd.canExecute()) {
 						domain.getCommandStack().execute(cmd);
+						if (isLiveModel()) {
+							if (parent instanceof MElementContainer<?> && data instanceof MUIElement) {
+								((MElementContainer<MUIElement>) parent).setSelectedElement((MUIElement) data);
+							}
+						}
 					}
 				}
 			} else if (getCurrentLocation() == LOCATION_AFTER || getCurrentLocation() == LOCATION_BEFORE) {
@@ -894,6 +904,12 @@ public boolean performDrop(Object data) {
 						Command cmd = AddCommand.create(domain, parent, feature, data, index);
 						if (cmd.canExecute()) {
 							domain.getCommandStack().execute(cmd);
+							if (isLiveModel()) {
+								if (parent instanceof MElementContainer<?> && data instanceof MUIElement) {
+									((MElementContainer<MUIElement>) parent).setSelectedElement((MUIElement) data);
+								}
+							}
+
 							return true;
 						}
 					}

From e603d009b9b434490c04c7824d78af722b6e2331 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 12:54:25 +0000
Subject: [PATCH 0216/1286] Bug 320091 -  [Tools] liveeditor generates invalid
 keybindings

---
 .../common/component/AddonsEditor.java        |   4 +-
 .../common/component/ApplicationEditor.java   |   4 +-
 .../component/BindingContextEditor.java       |   6 +-
 .../common/component/BindingTableEditor.java  |   6 +-
 .../common/component/CommandEditor.java       |   6 +-
 .../component/CommandParameterEditor.java     |   4 +-
 .../common/component/HandlerEditor.java       |   4 +-
 .../common/component/InputPartEditor.java     |   9 +-
 .../common/component/KeyBindingEditor.java    |  67 +++++++++++-
 .../component/MenuContributionEditor.java     |   6 +-
 .../internal/common/component/MenuEditor.java |   6 +-
 .../common/component/MenuItemEditor.java      |   4 +-
 .../common/component/MenuSeparatorEditor.java |   4 +-
 .../component/ModelFragmentsEditor.java       |   8 +-
 .../common/component/ParameterEditor.java     |   4 +-
 .../component/PartDescriptorEditor.java       |   4 +-
 .../internal/common/component/PartEditor.java |   4 +-
 .../component/PartSashContainerEditor.java    |   6 +-
 .../common/component/PartStackEditor.java     |   6 +-
 .../common/component/PerspectiveEditor.java   |   6 +-
 .../component/PerspectiveStackEditor.java     |   6 +-
 .../common/component/PlaceholderEditor.java   |   4 +-
 .../common/component/StringModelFragment.java |  10 +-
 .../component/ToolBarContributionEditor.java  |   6 +-
 .../common/component/ToolBarEditor.java       |   6 +-
 .../component/ToolBarSeparatorEditor.java     |   4 +-
 .../common/component/ToolControlEditor.java   |   4 +-
 .../common/component/ToolItemEditor.java      |   4 +-
 .../common/component/TrimBarEditor.java       |   6 +-
 .../component/TrimContributionEditor.java     |   6 +-
 .../common/component/TrimmedWindowEditor.java |  14 +--
 .../common/component/WindowEditor.java        |   4 +-
 .../component/virtual/VApplicationAddons.java |  83 +++++++-------
 .../virtual/VBindingTableEditor.java          |   6 +-
 .../component/virtual/VCommandEditor.java     |  77 ++++++-------
 .../component/virtual/VHandlerEditor.java     |  72 ++++++------
 .../virtual/VMenuContributionsEditor.java     |  79 +++++++-------
 .../common/component/virtual/VMenuEditor.java |  18 +--
 .../virtual/VModelFragmentsEditor.java        |  99 +++++++++--------
 .../virtual/VModelImportsEditor.java          |  27 ++---
 .../component/virtual/VPartDescriptor.java    |  73 +++++++------
 .../virtual/VToolBarContributionsEditor.java  |  77 ++++++-------
 .../virtual/VTrimContributionsEditor.java     |  79 +++++++-------
 .../virtual/VWindowControlEditor.java         |   6 +-
 .../component/virtual/VWindowEditor.java      |   6 +-
 .../virtual/VWindowSharedElementsEditor.java  | 103 +++++++++---------
 .../component/virtual/VWindowTrimEditor.java  |  45 ++++----
 47 files changed, 609 insertions(+), 483 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index e946c8df8f..4ae0446015 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -124,7 +124,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 22815f0d40..d33cd92810 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -130,7 +130,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	protected Composite createForm(Composite parent, EMFDataBindingContext context) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 506f378725..dc2e753cc5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -135,7 +135,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -166,7 +168,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		GridLayout gl = new GridLayout();
+		gl = new GridLayout();
 		gl.marginLeft = 0;
 		gl.marginRight = 0;
 		gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index f0a68af973..b8d4933394 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -132,7 +132,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -214,7 +216,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
+			gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index d02a3afb3d..e3ebd7a220 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -127,7 +127,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -196,7 +198,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
+			gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 75dcbc4a42..52c9598b40 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -119,7 +119,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index e73d1c34b2..61258de2ee 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -121,7 +121,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
index 35328c55bd..3ccdaf593e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
@@ -32,16 +32,15 @@ public InputPartEditor(EditingDomain editingDomain, ModelEditor editor, IProject
 		super(editingDomain, editor, project);
 	}
 
-
 	@Override
 	public String getLabel(Object element) {
 		return Messages.InputPartEditor_Label;
 	}
-	
+
 	@Override
 	protected void createSubformElements(Composite parent, EMFDataBindingContext context, IObservableValue master) {
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-		
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -50,9 +49,9 @@ protected void createSubformElements(Composite parent, EMFDataBindingContext con
 
 			Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=2;
+			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200,t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.INPUT__INPUT_URI).observeDetail(master));			
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.INPUT__INPUT_URI).observeDetail(master));
 		}
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 822cb8db1a..7d22843310 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -12,9 +12,16 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -37,9 +44,13 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.bindings.keys.KeySequence;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.jface.fieldassist.FieldDecoration;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.ColumnViewerEditor;
 import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
@@ -136,7 +147,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -164,11 +177,41 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			l.setText(Messages.KeyBindingEditor_Sequence);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_SEQUENCE__KEY_SEQUENCE).observeDetail(getMaster()));
+			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_SEQUENCE__KEY_SEQUENCE).observeDetail(getMaster()), new UpdateValueStrategy().setBeforeSetValidator(new BindingValidator()), new UpdateValueStrategy());
+
+			final ControlDecoration dec = new ControlDecoration(t, SWT.TOP);
+			binding.getValidationStatus().addValueChangeListener(new IValueChangeListener() {
+
+				public void handleValueChange(ValueChangeEvent event) {
+					IStatus s = (IStatus) event.getObservableValue().getValue();
+					if (s.isOK()) {
+						dec.setDescriptionText(null);
+						dec.setImage(null);
+					} else {
+						dec.setDescriptionText(s.getMessage());
+
+						String fieldDecorationID = null;
+						switch (s.getSeverity()) {
+						case IStatus.INFO:
+							fieldDecorationID = FieldDecorationRegistry.DEC_INFORMATION;
+							break;
+						case IStatus.WARNING:
+							fieldDecorationID = FieldDecorationRegistry.DEC_WARNING;
+							break;
+						case IStatus.ERROR:
+						case IStatus.CANCEL:
+							fieldDecorationID = FieldDecorationRegistry.DEC_ERROR;
+							break;
+						}
+						FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(fieldDecorationID);
+						dec.setImage(fieldDecoration == null ? null : fieldDecoration.getImage());
+					}
+				}
+			});
 		}
 
 		// ------------------------------------------------------------
@@ -277,7 +320,7 @@ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent even
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		GridLayout gl = new GridLayout();
+		gl = new GridLayout();
 		gl.marginLeft = 0;
 		gl.marginRight = 0;
 		gl.marginWidth = 0;
@@ -353,4 +396,20 @@ public String getDetailLabel(Object element) {
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.KEY_SEQUENCE__KEY_SEQUENCE) };
 	}
+
+	class BindingValidator implements IValidator {
+
+		public IStatus validate(Object value) {
+			if (value != null && value.toString().trim().length() > 0) {
+				try {
+					KeySequence.getInstance(value.toString());
+					return Status.OK_STATUS;
+				} catch (Exception e) {
+					return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", e.getMessage(), e);
+				}
+			}
+
+			return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", "Keybinding must not be empty!");
+		}
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index fa7b3eaf14..1fdccca0c8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -171,7 +171,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -255,7 +257,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
+			gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index f4278c1be9..746ab44399 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -163,7 +163,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean rootMenu, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -283,7 +285,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
+			gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 64ffa5f46e..395e7f4e9f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -134,7 +134,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 		IWidgetValueProperty checkProp = WidgetProperties.selection();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 982db2a1d0..2671fd8573 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -110,7 +110,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index 056746d27a..b937f16f45 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -106,7 +106,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -125,7 +127,7 @@ private Composite createForm(Composite parent) {
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
+			gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -266,7 +268,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
+			gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index 0048711c65..f058aa16be 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -115,7 +115,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 6ea8626355..7265aa3afc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -143,7 +143,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index ff1ea3a111..bdddfe05e9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -164,7 +164,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 55057b99de..a41a870e12 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -166,7 +166,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -243,7 +245,7 @@ public String getText(Object element) {
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
+			gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 19c7adc85d..700392d180 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -151,7 +151,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -206,7 +208,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
+			gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 3dd1a150a5..340f63a52a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -165,7 +165,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -267,7 +269,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
+			gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 94673c50d8..20eaeceacf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -142,7 +142,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -184,7 +186,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
+			gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 2faa2d96dd..9c20311225 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -149,7 +149,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 9aed3b94bc..50efba48e0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -114,7 +114,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 		{
@@ -126,7 +128,7 @@ private Composite createForm(Composite parent) {
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			comp.setLayoutData(gd);
-			GridLayout gl = new GridLayout(2, false);
+			gl = new GridLayout(2, false);
 			gl.marginWidth = gl.marginHeight = 0;
 			gl.verticalSpacing = 0;
 			gl.marginLeft = gl.marginBottom = gl.marginRight = gl.marginTop = 0;
@@ -158,7 +160,7 @@ public void widgetSelected(SelectionEvent e) {
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			comp.setLayoutData(gd);
-			GridLayout gl = new GridLayout(2, false);
+			gl = new GridLayout(2, false);
 			gl.marginWidth = gl.marginHeight = 0;
 			gl.verticalSpacing = 0;
 			gl.marginLeft = gl.marginBottom = gl.marginRight = gl.marginTop = 0;
@@ -211,7 +213,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
+			gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index f4a7d9167d..4d0a999e9e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -166,7 +166,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -250,7 +252,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
+			gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index e0411acdb4..b5c390acf9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -159,7 +159,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -217,7 +219,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
+			gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 10fcd7c761..b4688cb37b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -122,7 +122,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 4c1763e154..04b600aa13 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -131,7 +131,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 160ce5dacc..94c5e62680 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -97,7 +97,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 516e873ab6..5040098700 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -147,7 +147,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -203,7 +205,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
+			gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 2972f95dec..19d3e2c1db 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -161,7 +161,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -227,7 +229,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
+			gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
index e55c47e267..dcf63e635c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
@@ -23,19 +23,19 @@
 
 public class TrimmedWindowEditor extends WindowEditor {
 	private IListProperty TRIMMED_WINDOW__TRIM_BARS = EMFProperties.list(BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS);
-	
+
 	public TrimmedWindowEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain,editor, project);
+		super(editingDomain, editor, project);
 	}
 
 	public IObservableList getChildList(Object element) {
 		IObservableList list = super.getChildList(element);
-		
-		if( getEditor().isModelFragment() && Util.isImport((EObject) element) ) {
+
+		if (getEditor().isModelFragment() && Util.isImport((EObject) element)) {
 			return list;
 		}
-		
-		list.add(new VirtualEntry<Object>( ModelEditor.VIRTUAL_TRIMMED_WINDOW_TRIMS, TRIMMED_WINDOW__TRIM_BARS, element, "TrimBars") {
+
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_TRIMMED_WINDOW_TRIMS, TRIMMED_WINDOW__TRIM_BARS, element, "TrimBars") {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -45,7 +45,7 @@ protected boolean accepted(Object o) {
 		});
 		return list;
 	}
-	
+
 	@Override
 	public String getLabel(Object element) {
 		return "Trimmed Window";
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index ad9c6f5678..5bc5a3d190 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -166,7 +166,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index 5b4a622efc..127121ef61 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -37,15 +37,15 @@ public class VApplicationAddons extends AbstractComponentEditor {
 	private Composite composite;
 	private TableViewer viewer;
 	private EMFDataBindingContext context;
-	
+
 	private List<Action> actions = new ArrayList<Action>();
-	
-	//FIXME We need to plug this stuff into the command frameworks
+
+	// FIXME We need to plug this stuff into the command frameworks
 	private AddAddonCommand addAddonCommand = new AddAddonCommand();
 	private RemoveAddonCommand removeAddonCommand = new RemoveAddonCommand();
-	
+
 	public VApplicationAddons(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 		actions.add(new Action("Add Addon") {
 			@Override
 			public void run() {
@@ -76,21 +76,22 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
-	
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
-		
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
+
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Commands");
@@ -104,14 +105,14 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			viewer.getControl().setLayoutData(gd);
 			viewer.getTable().setHeaderVisible(true);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
-						
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
@@ -121,21 +122,21 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MApplication container = (MApplication) getMaster().getValue();
 							int idx = container.getCommands().indexOf(obj) - 1;
-							if( idx >= 0 ) {
+							if (idx >= 0) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__ADDONS, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -148,21 +149,21 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MApplication container = (MApplication) getMaster().getValue();
 							int idx = container.getCommands().indexOf(obj) + 1;
-							if( idx < container.getCommands().size() ) {
+							if (idx < container.getCommands().size()) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__ADDONS, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -186,24 +187,24 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						handleRemoveAddons(((IStructuredSelection)viewer.getSelection()).toList());
+					if (!viewer.getSelection().isEmpty()) {
+						handleRemoveAddons(((IStructuredSelection) viewer.getSelection()).toList());
 					}
 				}
 			});
 		}
-		
+
 		return parent;
 	}
-	
+
 	private void handleAddAddon() {
 		addAddonCommand.execute(getEditingDomain(), (MApplication) getMaster().getValue());
 	}
-	
+
 	private void handleRemoveAddons(List<MAddon> addons) {
 		removeAddonCommand.execute(getEditingDomain(), addons);
 	}
-	
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		// TODO Auto-generated method stub
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 7d66ce41f6..4f359ccde9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -93,7 +93,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -110,7 +112,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
+			gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 156bdd2a51..0e45fe1884 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -52,11 +52,11 @@ public class VCommandEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	
+
 	private EStructuralFeature commandsFeature;
 
 	public VCommandEditor(EditingDomain editingDomain, ModelEditor editor, EStructuralFeature commandsFeature) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 		this.commandsFeature = commandsFeature;
 	}
 
@@ -82,20 +82,21 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -112,29 +113,29 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			{
 				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME);
-					
+
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Name");
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
-			
+
 			{
 				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-					
+
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Id");
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
-						
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
@@ -144,21 +145,21 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MApplication container = (MApplication) getMaster().getValue();
 							int idx = container.getCommands().indexOf(obj) - 1;
-							if( idx >= 0 ) {
+							if (idx >= 0) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), commandsFeature, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -171,21 +172,21 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MApplication container = (MApplication) getMaster().getValue();
 							int idx = container.getCommands().indexOf(obj) + 1;
-							if( idx < container.getCommands().size() ) {
+							if (idx < container.getCommands().size()) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), commandsFeature, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -200,8 +201,8 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					MCommand command = CommandsFactoryImpl.eINSTANCE.createCommand();
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), commandsFeature, command);
-					
-					if( cmd.canExecute() ) {
+
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 						getEditor().setSelection(command);
 					}
@@ -215,10 +216,10 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> commands = ((IStructuredSelection)viewer.getSelection()).toList();
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> commands = ((IStructuredSelection) viewer.getSelection()).toList();
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), commandsFeature, commands);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 9744229f4f..e2a3d703b3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -53,7 +53,7 @@ public class VHandlerEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 
 	public VHandlerEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
@@ -78,20 +78,21 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -114,7 +115,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
-			
+
 			{
 				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
 
@@ -123,7 +124,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 				column.getColumn().setWidth(300);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
-			
+
 			{
 				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
 
@@ -134,12 +135,12 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			}
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
@@ -149,21 +150,21 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MHandlerContainer container = (MHandlerContainer) getMaster().getValue();
 							int idx = container.getHandlers().indexOf(obj) - 1;
-							if( idx >= 0 ) {
+							if (idx >= 0) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -176,21 +177,21 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MHandlerContainer container = (MHandlerContainer) getMaster().getValue();
 							int idx = container.getHandlers().indexOf(obj) + 1;
-							if( idx < container.getHandlers().size() ) {
+							if (idx < container.getHandlers().size()) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -205,8 +206,8 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					MHandler handler = MCommandsFactory.INSTANCE.createHandler();
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, handler);
-					
-					if( cmd.canExecute() ) {
+
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 						getEditor().setSelection(handler);
 					}
@@ -220,10 +221,10 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> handlers = ((IStructuredSelection)viewer.getSelection()).toList();
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> handlers = ((IStructuredSelection) viewer.getSelection()).toList();
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, handlers);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
@@ -231,7 +232,6 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index 51956f3f7a..715b29c9b0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -53,7 +53,7 @@ public class VMenuContributionsEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 
 	public VMenuContributionsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
@@ -78,20 +78,21 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -108,38 +109,38 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			{
 				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-					
+
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Id");
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
-			
+
 			{
 				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID);
-					
+
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("ParentId");
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
-			
+
 			{
 				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__POSITION_IN_PARENT);
-					
+
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Position");
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
-						
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
@@ -149,21 +150,21 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MMenuContributions container = (MMenuContributions) getMaster().getValue();
 							int idx = container.getMenuContributions().indexOf(obj) - 1;
-							if( idx >= 0 ) {
+							if (idx >= 0) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -176,21 +177,21 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MMenuContributions container = (MMenuContributions) getMaster().getValue();
 							int idx = container.getMenuContributions().indexOf(obj) + 1;
-							if( idx < container.getMenuContributions().size() ) {
+							if (idx < container.getMenuContributions().size()) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -205,8 +206,8 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					MMenuContribution command = MMenuFactory.INSTANCE.createMenuContribution();
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS, command);
-					
-					if( cmd.canExecute() ) {
+
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 						getEditor().setSelection(command);
 					}
@@ -220,10 +221,10 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> commands = ((IStructuredSelection)viewer.getSelection()).toList();
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> commands = ((IStructuredSelection) viewer.getSelection()).toList();
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS, commands);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 6a187c8cf2..ff13dd9f52 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -50,7 +50,7 @@ public class VMenuEditor extends AbstractComponentEditor {
 	private EStructuralFeature feature;
 
 	public VMenuEditor(EditingDomain editingDomain, ModelEditor editor, EStructuralFeature feature) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 		this.feature = feature;
 	}
 
@@ -88,8 +88,10 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
-		
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
+
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("Menus");
 		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
@@ -97,17 +99,17 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		viewer = new TableViewer(parent);
 		ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
-		
+
 		IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
 		viewer.setLabelProvider(new ObservableColumnLabelProvider<MMenu>(valProp.observeDetail(cp.getKnownElements())));
-		
+
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.heightHint = 300;
 		viewer.getControl().setLayoutData(gd);
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		GridLayout gl = new GridLayout();
+		gl = new GridLayout();
 		gl.marginLeft = 0;
 		gl.marginRight = 0;
 		gl.marginWidth = 0;
@@ -157,10 +159,10 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		return parent;
 	}
-	
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		// TODO Auto-generated method stub
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index ff947948ef..e5892602bd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -50,7 +50,7 @@ public class VModelFragmentsEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 
 	public VModelFragmentsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
@@ -75,20 +75,21 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -99,46 +100,45 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
-			
+
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 
-			
 			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
 			viewer.setInput(prop.observeDetail(getMaster()));
-			
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout(2,false);
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Up");
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MModelFragments container = (MModelFragments) getMaster().getValue();
 							int idx = container.getFragments().indexOf(obj) - 1;
-							if( idx >= 0 ) {
+							if (idx >= 0) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -147,30 +147,30 @@ public void widgetSelected(SelectionEvent e) {
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Down");
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MModelFragments container = (MModelFragments) getMaster().getValue();
 							int idx = container.getFragments().indexOf(obj) + 1;
-							if( idx < container.getFragments().size() ) {
+							if (idx < container.getFragments().size()) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
 			});
-						
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Add");
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
@@ -178,30 +178,30 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					
-						MStringModelFragment eObject = MFragmentFactory.INSTANCE.createStringModelFragment();
-						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, eObject);
-						
-						if( cmd.canExecute() ) {
-							getEditingDomain().getCommandStack().execute(cmd);
-							getEditor().setSelection(eObject);
-						}
-					
+
+					MStringModelFragment eObject = MFragmentFactory.INSTANCE.createStringModelFragment();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, eObject);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						getEditor().setSelection(eObject);
+					}
+
 				}
 			});
-			
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Remove");
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
-						
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, elements);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
@@ -209,7 +209,6 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-
 		return parent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index 7335cc89c8..f351dc6aa2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -61,7 +61,7 @@ public class VModelImportsEditor extends AbstractComponentEditor {
 	public VModelImportsEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
 	}
- 
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		return null;
@@ -84,36 +84,37 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Imports");
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-			
+
 			viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 200;
 			viewer.getControl().setLayoutData(gd);
-			
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
+			gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -196,7 +197,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 			List<FeatureClass> list = new ArrayList<FeatureClass>();
 			addClasses(ApplicationPackageImpl.eINSTANCE, list);
 			list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
-			
+
 			childrenDropDown.setInput(list);
 			childrenDropDown.getCombo().select(0);
 
@@ -254,7 +255,7 @@ public void addClasses(EPackage ePackage, List<FeatureClass> list) {
 			addClasses(eSubPackage, list);
 		}
 	}
-	
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		// TODO Auto-generated method stub
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index aac36fea5c..ac08e04bc6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -78,20 +78,21 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -108,29 +109,29 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			{
 				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL);
-					
+
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Name");
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
-			
+
 			{
 				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CATEGORY);
-					
+
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Category");
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
-						
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
@@ -140,21 +141,21 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MPartDescriptorContainer container = (MPartDescriptorContainer) getMaster().getValue();
 							int idx = container.getDescriptors().indexOf(obj) - 1;
-							if( idx >= 0 ) {
+							if (idx >= 0) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -167,21 +168,21 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MPartDescriptorContainer container = (MPartDescriptorContainer) getMaster().getValue();
 							int idx = container.getDescriptors().indexOf(obj) + 1;
-							if( idx < container.getDescriptors().size() ) {
+							if (idx < container.getDescriptors().size()) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -196,8 +197,8 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					MPartDescriptor command = MBasicFactory.INSTANCE.createPartDescriptor();
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, command);
-					
-					if( cmd.canExecute() ) {
+
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 						getEditor().setSelection(command);
 					}
@@ -211,10 +212,10 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> commands = ((IStructuredSelection)viewer.getSelection()).toList();
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> commands = ((IStructuredSelection) viewer.getSelection()).toList();
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, commands);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index 9813292221..3d1ba17b3a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -78,20 +78,21 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -108,38 +109,38 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			{
 				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-					
+
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Id");
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
-			
+
 			{
 				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__PARENT_ID);
-					
+
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("ParentId");
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
-			
+
 			{
 				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__POSITION_IN_PARENT);
-					
+
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Position");
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
-						
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
@@ -149,21 +150,21 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MToolBarContributions container = (MToolBarContributions) getMaster().getValue();
 							int idx = container.getToolBarContributions().indexOf(obj) - 1;
-							if( idx >= 0 ) {
+							if (idx >= 0) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -176,21 +177,21 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MToolBarContributions container = (MToolBarContributions) getMaster().getValue();
 							int idx = container.getToolBarContributions().indexOf(obj) + 1;
-							if( idx < container.getToolBarContributions().size() ) {
+							if (idx < container.getToolBarContributions().size()) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -205,8 +206,8 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					MToolBarContribution command = MMenuFactory.INSTANCE.createToolBarContribution();
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS, command);
-					
-					if( cmd.canExecute() ) {
+
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 						getEditor().setSelection(command);
 					}
@@ -220,10 +221,10 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> commands = ((IStructuredSelection)viewer.getSelection()).toList();
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> commands = ((IStructuredSelection) viewer.getSelection()).toList();
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS, commands);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index a98176cde9..925129a5f0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -53,7 +53,7 @@ public class VTrimContributionsEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 
 	public VTrimContributionsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
@@ -78,20 +78,21 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -108,38 +109,38 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			{
 				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-					
+
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Id");
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
-			
+
 			{
 				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__PARENT_ID);
-					
+
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("ParentId");
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
-			
+
 			{
 				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__POSITION_IN_PARENT);
-					
+
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.getColumn().setText("Position");
 				column.getColumn().setWidth(200);
 				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
 			}
-						
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
@@ -149,21 +150,21 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MTrimContributions container = (MTrimContributions) getMaster().getValue();
 							int idx = container.getTrimContributions().indexOf(obj) - 1;
-							if( idx >= 0 ) {
+							if (idx >= 0) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -176,21 +177,21 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MTrimContributions container = (MTrimContributions) getMaster().getValue();
 							int idx = container.getTrimContributions().indexOf(obj) + 1;
-							if( idx < container.getTrimContributions().size() ) {
+							if (idx < container.getTrimContributions().size()) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -205,8 +206,8 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					MTrimContribution command = MMenuFactory.INSTANCE.createTrimContribution();
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS, command);
-					
-					if( cmd.canExecute() ) {
+
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 						getEditor().setSelection(command);
 					}
@@ -220,10 +221,10 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> commands = ((IStructuredSelection)viewer.getSelection()).toList();
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> commands = ((IStructuredSelection) viewer.getSelection()).toList();
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS, commands);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 2e43c53208..87e5278b7d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -94,7 +94,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -115,7 +117,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
+			gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 61129e57a6..bb4dbe0c9f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -95,7 +95,9 @@ public Composite getEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
 		parent = new Composite(parent, SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("Windows");
@@ -157,7 +159,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		GridLayout gl = new GridLayout(2, false);
+		gl = new GridLayout(2, false);
 		gl.marginLeft = 0;
 		gl.marginRight = 0;
 		gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 66761b232d..f8f48d06cb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -54,7 +54,7 @@ public class VWindowSharedElementsEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 
 	public VWindowSharedElementsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
@@ -79,20 +79,21 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -103,46 +104,45 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
-			
+
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 
-			
 			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
 			viewer.setInput(prop.observeDetail(getMaster()));
-			
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout(2,false);
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Up");
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) - 1;
-							if( idx >= 0 ) {
+							if (idx >= 0) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
@@ -151,30 +151,30 @@ public void widgetSelected(SelectionEvent e) {
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Down");
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						IStructuredSelection s = (IStructuredSelection)viewer.getSelection();
-						if( s.size() == 1 ) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
-							if( idx < container.getChildren().size() ) {
+							if (idx < container.getChildren().size()) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, obj, idx);
-								
-								if( cmd.canExecute() ) {
+
+								if (cmd.canExecute()) {
 									getEditingDomain().getCommandStack().execute(cmd);
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-							
+
 						}
 					}
 				}
 			});
-			
+
 			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
 			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			childrenDropDown.setContentProvider(new ArrayContentProvider());
@@ -185,46 +185,42 @@ public String getText(Object element) {
 					return eclass.getName();
 				}
 			});
-			childrenDropDown.setInput(new EClass[] {
-					BasicPackageImpl.Literals.PART_SASH_CONTAINER,
-					BasicPackageImpl.Literals.PART,
-					BasicPackageImpl.Literals.INPUT_PART
-			});
+			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART });
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
-			
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! childrenDropDown.getSelection().isEmpty() ) {
-						EClass eClass = (EClass) ((IStructuredSelection)childrenDropDown.getSelection()).getFirstElement();
-						
+					if (!childrenDropDown.getSelection().isEmpty()) {
+						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+
 						EObject eObject = EcoreUtil.create(eClass);
-						
+
 						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, eObject);
-						
-						if( cmd.canExecute() ) {
+
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 							getEditor().setSelection(eObject);
 						}
 					}
 				}
 			});
-			
+
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Remove");
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false,2,1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> elements = ((IStructuredSelection)viewer.getSelection()).toList();
-						
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, elements);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
@@ -232,10 +228,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-
 		return parent;
 	}
-	
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		// TODO Auto-generated method stub
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index 1d7ea1156f..f921ef902d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -45,7 +45,7 @@ public class VWindowTrimEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 
 	public VWindowTrimEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain,editor);
+		super(editingDomain, editor);
 	}
 
 	@Override
@@ -70,20 +70,21 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite getEditor(Composite parent, Object object) {
-		if( composite == null ) {
+		if (composite == null) {
 			context = new EMFDataBindingContext();
-			composite = createForm(parent,context, getMaster());
+			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>)object;
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue master) {
-		parent = new Composite(parent,SWT.NONE);
-		parent.setLayout(new GridLayout(3, false));
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -94,20 +95,20 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
-			
+
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			
+
 			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL,GridData.END,false,false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft=0;
-			gl.marginRight=0;
-			gl.marginWidth=0;
-			gl.marginHeight=0;
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
 			buttonComp.setLayout(gl);
-			
+
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText("Add Trim");
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
@@ -117,8 +118,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context,
 				public void widgetSelected(SelectionEvent e) {
 					MTrimBar handler = MBasicFactory.INSTANCE.createTrimBar();
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS, handler);
-					
-					if( cmd.canExecute() ) {
+
+					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 						getEditor().setSelection(handler);
 					}
@@ -132,10 +133,10 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if( ! viewer.getSelection().isEmpty() ) {
-						List<?> trimElements = ((IStructuredSelection)viewer.getSelection()).toList();
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> trimElements = ((IStructuredSelection) viewer.getSelection()).toList();
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS, trimElements);
-						if( cmd.canExecute() ) {
+						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}

From a07a7b98ba30a12ad718c30ddd6f96be7442bd1e Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 13:07:08 +0000
Subject: [PATCH 0217/1286] Bug 320091 -  [Tools] liveeditor generates invalid
 keybindings

---
 .../emf/ui/internal/common/component/KeyBindingEditor.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 7d22843310..61581b8f4d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -183,7 +183,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			t.setLayoutData(gd);
 			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_SEQUENCE__KEY_SEQUENCE).observeDetail(getMaster()), new UpdateValueStrategy().setBeforeSetValidator(new BindingValidator()), new UpdateValueStrategy());
 
-			final ControlDecoration dec = new ControlDecoration(t, SWT.TOP);
+			final ControlDecoration dec = new ControlDecoration(t, SWT.BOTTOM);
 			binding.getValidationStatus().addValueChangeListener(new IValueChangeListener() {
 
 				public void handleValueChange(ValueChangeEvent event) {
@@ -400,16 +400,17 @@ public FeaturePath[] getLabelProperties() {
 	class BindingValidator implements IValidator {
 
 		public IStatus validate(Object value) {
+			int statusCode = getEditor().isLiveModel() ? IStatus.ERROR : IStatus.WARNING;
 			if (value != null && value.toString().trim().length() > 0) {
 				try {
 					KeySequence.getInstance(value.toString());
 					return Status.OK_STATUS;
 				} catch (Exception e) {
-					return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", e.getMessage(), e);
+					return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", e.getMessage(), e);
 				}
 			}
 
-			return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", "Keybinding must not be empty!");
+			return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", "Keybinding must not be empty!");
 		}
 	}
 }

From 73d3d80177e138ee16514e1ea83747dbc4ac4414 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 13:11:52 +0000
Subject: [PATCH 0218/1286] Bug 320091 -  [Tools] liveeditor generates invalid
 keybindings

---
 .../ui/internal/common/component/KeyBindingEditor.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 61581b8f4d..a2c31eb649 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -403,14 +403,20 @@ public IStatus validate(Object value) {
 			int statusCode = getEditor().isLiveModel() ? IStatus.ERROR : IStatus.WARNING;
 			if (value != null && value.toString().trim().length() > 0) {
 				try {
-					KeySequence.getInstance(value.toString());
+					KeySequence keySequence = KeySequence.getInstance(value.toString());
+					if (!keySequence.isComplete()) {
+						return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", "Keysequence is not complete");
+					}
+					if (keySequence.isEmpty()) {
+						return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", "Keysequence must not be empty!");
+					}
 					return Status.OK_STATUS;
 				} catch (Exception e) {
 					return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", e.getMessage(), e);
 				}
 			}
 
-			return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", "Keybinding must not be empty!");
+			return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", "Keysequence must not be empty!");
 		}
 	}
 }

From 8179f5ef6dc25514b5ded069d11f25f363cd02f0 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 14:34:32 +0000
Subject: [PATCH 0219/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * setting a default application id

---
 .../wizards/model/BaseApplicationModelWizard.java     |  2 +-
 .../wizards/model/NewApplicationModelWizard.java      | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index 0ec8559dd2..ff59f7ef20 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -155,7 +155,7 @@ public void run() {
 	
 	protected abstract EObject createInitialModel();
 
-	private IFile getModelFile() throws CoreException {
+	protected IFile getModelFile() throws CoreException {
 		String containerName = page.getContainerName();
 		String fileName = page.getFileName();
 		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
index c68662560b..7b625052be 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.model;
 
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.emf.ecore.EObject;
 
@@ -22,6 +24,13 @@ public String getDefaultFileName() {
 	}
 	
 	protected EObject createInitialModel() {
-		return (EObject) MApplicationFactory.INSTANCE.createApplication();
+		MApplication application = MApplicationFactory.INSTANCE.createApplication();
+		try {
+			application.setElementId(getModelFile().getProject().getName() + ".application");
+		} catch (CoreException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return (EObject) application;
 	}
 }
\ No newline at end of file

From 203e33556d962a87647d001f5f0aa732923cc7f5 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 14:56:12 +0000
Subject: [PATCH 0220/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * some nls stuff

---
 .../e4/tools/emf/ui/internal/Messages.java    | 19 +++++-------------
 .../tools/emf/ui/internal/Messages.properties | 20 +++++--------------
 .../common/component/AddonsEditor.java        | 12 +++++------
 .../common/component/BindingTableEditor.java  |  2 +-
 .../component/DirectMenuItemEditor.java       |  2 +-
 .../component/DirectToolItemEditor.java       |  2 +-
 .../component/HandledMenuItemEditor.java      |  2 +-
 .../component/HandledToolItemEditor.java      |  2 +-
 .../common/component/HandlerEditor.java       |  4 ++--
 .../common/component/KeyBindingEditor.java    |  2 +-
 .../internal/common/component/MenuEditor.java |  2 +-
 .../common/component/MenuItemEditor.java      |  2 +-
 .../component/PartDescriptorEditor.java       |  4 ++--
 .../internal/common/component/PartEditor.java |  4 ++--
 .../common/component/PerspectiveEditor.java   |  2 +-
 .../common/component/PlaceholderEditor.java   |  2 +-
 .../common/component/StringModelFragment.java |  4 ++--
 17 files changed, 34 insertions(+), 53 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index d6a6cf23b0..e072a09575 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -19,6 +19,7 @@ public class Messages {
 	public static String ModelTooling_Common_Add;
 	public static String ModelTooling_Common_Remove;
 	public static String ModelTooling_Common_Id;
+	public static String ModelTooling_Common_FindEllipsis;
 
 	public static String AbstractCommandSelectionDialog_Label_CommandId;
 
@@ -37,7 +38,6 @@ public class Messages {
 	public static String BindingTableEditor_Label;
 	public static String BindingTableEditor_Description;
 	public static String BindingTableEditor_ContextId;
-	public static String BindingTableEditor_Find;
 	public static String BindingTableEditor_Keybindings;
 	public static String BindingTableEditor_KeySequence;
 	public static String BindingTableEditor_Command;
@@ -57,7 +57,6 @@ public class Messages {
 	public static String DirectMenuItemEditor_Label;
 	public static String DirectMenuItemEditor_Description;
 	public static String DirectMenuItemEditor_ClassURI;
-	public static String DirectMenuItemEditor_Find;
 
 	public static String ControlFactory_BindingContexts;
 	public static String ControlFactory_Tags;
@@ -66,20 +65,17 @@ public class Messages {
 	public static String ControlFactory_ContextVariables;
 
 	public static String DirectToolItemEditor_ClassURI;
-	public static String DirectToolItemEditor_Find;
 	public static String DirectToolItemEditor_Label;
 	public static String DirectToolItemEditor_Description;
 
 	public static String HandledMenuItemEditor_Label;
 	public static String HandledMenuItemEditor_Description;
 	public static String HandledMenuItemEditor_Command;
-	public static String HandledMenuItemEditor_Find;
 	public static String HandledMenuItemEditor_Parameters;
 	public static String HandledMenuItemEditor_Tag;
 	public static String HandledMenuItemEditor_Value;
 
 	public static String HandledToolItemEditor_Command;
-	public static String HandledToolItemEditor_Find;
 	public static String HandledToolItemEditor_Parameters;
 	public static String HandledToolItemEditor_ParametersName;
 	public static String HandledToolItemEditor_ParametersValue;
@@ -89,7 +85,6 @@ public class Messages {
 	public static String HandlerEditor_Label;
 	public static String HandlerEditor_Description;
 	public static String HandlerEditor_Command;
-	public static String HandlerEditor_Find;
 	public static String HandlerEditor_ClassURI;
 
 	public static String InputPartEditor_Label;
@@ -99,7 +94,6 @@ public class Messages {
 	public static String KeyBindingEditor_Description;
 	public static String KeyBindingEditor_Sequence;
 	public static String KeyBindingEditor_Command;
-	public static String KeyBindingEditor_Find;
 	public static String KeyBindingEditor_Parameters;
 	public static String KeyBindingEditor_ParametersKey;
 	public static String KeyBindingEditor_ParametersValue;
@@ -121,7 +115,6 @@ public class Messages {
 	public static String MenuItemEditor_Label;
 	public static String MenuItemEditor_Tooltip;
 	public static String MenuItemEditor_IconURI;
-	public static String MenuItemEditor_Find;
 	public static String MenuEditor_MainMenu;
 
 	public static String MenuSeparatorEditor_Label;
@@ -131,7 +124,6 @@ public class Messages {
 	public static String PartDescriptorEditor_LabelLabel;
 	public static String PartDescriptorEditor_Tooltip;
 	public static String PartDescriptorEditor_IconURI;
-	public static String PartDescriptorEditor_Find;
 	public static String PartDescriptorEditor_ClassURI;
 	public static String PartDescriptorEditor_Dirtyable;
 	public static String PartDescriptorEditor_Closeable;
@@ -153,7 +145,6 @@ public class Messages {
 	public static String PartEditor_LabelLabel;
 	public static String PartEditor_Tooltip;
 	public static String PartEditor_IconURI;
-	public static String PartEditor_Find;
 	public static String PartEditor_ClassURI;
 	public static String PartEditor_Closeable;
 	public static String PartEditor_PersitedState;
@@ -185,7 +176,6 @@ public class Messages {
 	public static String PerspectiveEditor_SelectedElement;
 	public static String PerspectiveEditor_Tooltip;
 	public static String PerspectiveEditor_IconURI;
-	public static String PerspectiveEditor_Find;
 	public static String PerspectiveEditor_Controls;
 
 	public static String PerspectiveStackEditor_Perspectives;
@@ -195,7 +185,6 @@ public class Messages {
 
 	public static String PlaceholderEditor_Label;
 	public static String PlaceholderEditor_Descriptor;
-	public static String PlaceholderEditor_FindReference;
 
 	public static String ToolBarEditor_Label;
 	public static String ToolBarEditor_Description;
@@ -220,7 +209,10 @@ public class Messages {
 	public static String VBindingTableEditor_LabelDescription;
 
 	public static String AddonsEditor_ClassURI;
-	public static String AddonsEditor_Find;
+	public static String AddonsEditor_TreeLabel;
+	public static String AddonsEditor_TreeLabelDescription;
+	public static String AddonsEditor_PersistedState;
+	public static String AddonsEditor_Tags;
 
 	public static String ContributionClassDialog_DialogMessage;
 	public static String ContributionClassDialog_DialogTitle;
@@ -247,7 +239,6 @@ public class Messages {
 	public static String StringModelFragment_ParentId;
 	public static String StringModelFragment_PositionInList;
 	public static String StringModelFragment_Elements;
-	public static String StringModelFragment_Find;
 
 	public static String FeatureSelectionDialog_Filter;
 	public static String FeatureSelectionDialog_ShellTitle;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index ce6235777c..a71661103b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -14,6 +14,7 @@ ModelTooling_Common_AddEllipsis=Add ...
 ModelTooling_Common_Add=Add
 ModelTooling_Common_Remove=Remove
 ModelTooling_Common_Id=Id
+ModelTooling_Common_FindEllipsis=Find ...
 
 AbstractCommandSelectionDialog_Label_CommandId=Command-Id
 
@@ -32,7 +33,6 @@ ApplicationEditor_TrimContributions=Trim Contributions
 BindingTableEditor_Label=BindingTable
 BindingTableEditor_Description=BindingTable bla bla bla
 BindingTableEditor_ContextId=Context Id
-BindingTableEditor_Find=Find ...
 BindingTableEditor_Keybindings=Keybindings
 BindingTableEditor_KeySequence=KeySequence
 BindingTableEditor_Command=Command
@@ -52,7 +52,6 @@ CommandEditor_ParameterId=Id
 DirectMenuItemEditor_Label=DirectMenuItem
 DirectMenuItemEditor_Description=DirectMenuItem bla bla bla
 DirectMenuItemEditor_ClassURI=Class URI
-DirectMenuItemEditor_Find=Find ...
 
 ControlFactory_BindingContexts=Binding Contexts
 ControlFactory_Tags=Tags
@@ -61,20 +60,17 @@ ControlFactory_Value=Value
 ControlFactory_ContextVariables=Context Variables
 
 DirectToolItemEditor_ClassURI=Class URI
-DirectToolItemEditor_Find=Find ...
 DirectToolItemEditor_Label=Direct Tool Item
 DirectToolItemEditor_Description=Direct Tool Item bla bla bla
 
 HandledMenuItemEditor_Label=HandledMenuItem
 HandledMenuItemEditor_Description=HandledMenuItem bla bla bla
 HandledMenuItemEditor_Command=Command
-HandledMenuItemEditor_Find=Find ...
 HandledMenuItemEditor_Parameters=Parameters
 HandledMenuItemEditor_Tag=Name
 HandledMenuItemEditor_Value=Value
 
 HandledToolItemEditor_Command=Command
-HandledToolItemEditor_Find=Find ...
 HandledToolItemEditor_Parameters=Parameters
 HandledToolItemEditor_ParametersName=Name
 HandledToolItemEditor_ParametersValue=Value
@@ -84,7 +80,6 @@ HandledToolItemEditor_Description=Handled Tool Item bla bla bla
 HandlerEditor_Label=Handler
 HandlerEditor_Description=Handler bla bla bla
 HandlerEditor_Command=Command
-HandlerEditor_Find=Find ...
 HandlerEditor_ClassURI=Class URI
 
 InputPartEditor_Label=InputPart
@@ -94,7 +89,6 @@ KeyBindingEditor_Label=Binding
 KeyBindingEditor_Description=Binding bla bla bla
 KeyBindingEditor_Sequence=Sequence
 KeyBindingEditor_Command=Command
-KeyBindingEditor_Find=Find ...
 KeyBindingEditor_Parameters=Parameters
 KeyBindingEditor_ParametersKey=Key
 KeyBindingEditor_ParametersValue=Value
@@ -117,8 +111,6 @@ MenuItemEditor_Type=Type
 MenuItemEditor_Label=Label
 MenuItemEditor_Tooltip=Tooltip
 MenuItemEditor_IconURI=Icon URI
-MenuItemEditor_Find=Find ...
-
 
 MenuSeparatorEditor_Label=Separator
 
@@ -127,7 +119,6 @@ PartDescriptorEditor_Descriptor=PartDescriptor Bla Bla Bla Bla
 PartDescriptorEditor_LabelLabel=Label
 PartDescriptorEditor_Tooltip=Tooltip
 PartDescriptorEditor_IconURI=Icon URI
-PartDescriptorEditor_Find=Find ...
 PartDescriptorEditor_ClassURI=Class URI
 PartDescriptorEditor_Dirtyable=Dirtyable
 PartDescriptorEditor_Closeable=Closeable
@@ -149,7 +140,6 @@ PartEditor_Description=Part Bla Bla Bla Bla
 PartEditor_LabelLabel=Label
 PartEditor_Tooltip=Tooltip
 PartEditor_IconURI=Icon URI
-PartEditor_Find=Find ...
 PartEditor_ClassURI=Class URI
 PartEditor_Closeable=Closeable
 PartEditor_PersitedState=Persisted State
@@ -182,7 +172,6 @@ PerspectiveEditor_SelectedElement=Selected Element
 PerspectiveEditor_Label=Label
 PerspectiveEditor_Tooltip=Tooltip
 PerspectiveEditor_IconURI=Icon URI
-PerspectiveEditor_Find=Find ...
 PerspectiveEditor_Controls=Controls
 
 PerspectiveStackEditor_Label=Perspective Stack
@@ -192,7 +181,6 @@ PerspectiveStackEditor_Perspectives=Perspectives
 
 PlaceholderEditor_Label=Placeholder
 PlaceholderEditor_Descriptor=Placeholder Bla Bla Bla Bla
-PlaceholderEditor_FindReference=Find ...
 
 ToolBarEditor_Label=Toolbar
 ToolBarEditor_Description=Toolbar bla bla bla
@@ -217,7 +205,10 @@ VBindingTableEditor_Name=Name
 VBindingTableEditor_LabelDescription=Description
 
 AddonsEditor_ClassURI=Class URI
-AddonsEditor_Find=Find ...
+AddonsEditor_TreeLabel=Addon
+AddonsEditor_TreeLabelDescription=Addon Bla Bla Bla
+AddonsEditor_PersistedState=Persisted State
+AddonsEditor_Tags=Tags
 
 ContributionClassDialog_DialogMessage=Enter the name of the contributing class
 ContributionClassDialog_DialogTitle=Find Contribution Class
@@ -244,7 +235,6 @@ StringModelFragment_Featurename=Featurename
 StringModelFragment_ParentId=Element Id
 StringModelFragment_PositionInList=Position in list
 StringModelFragment_Elements=Elements
-StringModelFragment_Find=Find ...
 
 FeatureSelectionDialog_Filter=Filter
 FeatureSelectionDialog_ShellTitle=Find Featurename
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 4ae0446015..e05295ca28 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -72,7 +72,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Addon";
+		return Messages.AddonsEditor_TreeLabel;
 	}
 
 	@Override
@@ -86,7 +86,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Addon Bla Bla Bla";
+		return Messages.AddonsEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -152,7 +152,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			final IContributionClassCreator c = getEditor().getContributionCreator(ApplicationPackageImpl.Literals.ADDON);
 			if (project != null && c != null) {
 				final Link l = new Link(parent, SWT.NONE);
-				l.setText("<A>" + Messages.PartEditor_ClassURI + "</A>");
+				l.setText("<A>" + Messages.PartEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
 				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 				l.addSelectionListener(new SelectionAdapter() {
 					@Override
@@ -172,7 +172,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText(Messages.AddonsEditor_Find);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -182,8 +182,8 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createMapProperties(parent, this, "Persisted State", ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, this, Messages.AddonsEditor_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.AddonsEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index b8d4933394..ae5292289f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -167,7 +167,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText(Messages.BindingTableEditor_Find);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 		}
 
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 43b63336a6..2b06123e4d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -109,7 +109,7 @@ public void widgetSelected(SelectionEvent e) {
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText(Messages.DirectMenuItemEditor_Find);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 6119433069..6f6bb09643 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -95,7 +95,7 @@ public void widgetSelected(SelectionEvent e) {
 		context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
 
 		final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.DirectToolItemEditor_Find);
+		b.setText(Messages.ModelTooling_Common_FindEllipsis);
 		b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 		b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index 81ced576f9..9e0edd8d72 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -113,7 +113,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(master));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.HandledMenuItemEditor_Find);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 410ad14257..df026640db 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -101,7 +101,7 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(master));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.HandledToolItemEditor_Find);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 61258de2ee..470f87da56 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -157,7 +157,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(CommandsPackageImpl.Literals.HANDLER__COMMAND, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.HandlerEditor_Find);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -194,7 +194,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
-			b.setText(Messages.HandlerEditor_Find);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index a2c31eb649..b7fe83abdb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -226,7 +226,7 @@ public void handleValueChange(ValueChangeEvent event) {
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(CommandsPackageImpl.Literals.KEY_BINDING__COMMAND, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.KeyBindingEditor_Find);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 746ab44399..cce027be2d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -239,7 +239,7 @@ protected URI getImageURI() {
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText(Messages.MenuItemEditor_Find);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 395e7f4e9f..d0a8ce0f69 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -230,7 +230,7 @@ protected URI getImageURI() {
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setText(Messages.MenuItemEditor_Find);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 7265aa3afc..c2947039d3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -219,7 +219,7 @@ protected URI getImageURI() {
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText(Messages.PartDescriptorEditor_Find);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -242,7 +242,7 @@ public void widgetSelected(SelectionEvent e) {
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText(Messages.PartDescriptorEditor_Find);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index bdddfe05e9..251c2aefdb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -240,7 +240,7 @@ protected URI getImageURI() {
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText(Messages.PartEditor_Find);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -276,7 +276,7 @@ public void widgetSelected(SelectionEvent e) {
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText(Messages.PartEditor_Find);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 340f63a52a..8d2ba2e6d9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -241,7 +241,7 @@ protected URI getImageURI() {
 			};
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.PerspectiveEditor_Find);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 9c20311225..4a7b462908 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -214,7 +214,7 @@ public Object convert(Object fromObject) {
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
-			b.setText(Messages.PlaceholderEditor_FindReference);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 50efba48e0..b698d3ecde 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -141,7 +141,7 @@ private Composite createForm(Composite parent) {
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID).observeDetail(getMaster()));
 
 			final Button b = new Button(comp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.StringModelFragment_Find);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -172,7 +172,7 @@ public void widgetSelected(SelectionEvent e) {
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME).observeDetail(getMaster()));
 
 			final Button button = new Button(comp, SWT.PUSH | SWT.FLAT);
-			button.setText(Messages.StringModelFragment_Find);
+			button.setText(Messages.ModelTooling_Common_FindEllipsis);
 			button.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {

From 3ada360b9804131f503c81857b0b1d942504fa22 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 15:05:00 +0000
Subject: [PATCH 0221/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * some nls stuff

---
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.java |  7 +++++++
 .../e4/tools/emf/ui/internal/Messages.properties       |  8 ++++++++
 .../internal/common/component/ApplicationEditor.java   | 10 +++++-----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index e072a09575..76b5049af6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -21,6 +21,11 @@ public class Messages {
 	public static String ModelTooling_Common_Id;
 	public static String ModelTooling_Common_FindEllipsis;
 
+	public static String ModelTooling_UIElement_ToBeRendered;
+	public static String ModelTooling_UIElement_Visible;
+
+	public static String ModelTooling_Context_Variables;
+
 	public static String AbstractCommandSelectionDialog_Label_CommandId;
 
 	public static String ApplicationEditor_Label;
@@ -34,6 +39,8 @@ public class Messages {
 	public static String ApplicationEditor_MenuContributions;
 	public static String ApplicationEditor_ToolBarContributions;
 	public static String ApplicationEditor_TrimContributions;
+	public static String ApplicationEditor_RootContext;
+	public static String ApplicationEditor_BindingContexts;
 
 	public static String BindingTableEditor_Label;
 	public static String BindingTableEditor_Description;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index a71661103b..7e1a90495d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -16,6 +16,11 @@ ModelTooling_Common_Remove=Remove
 ModelTooling_Common_Id=Id
 ModelTooling_Common_FindEllipsis=Find ...
 
+ModelTooling_UIElement_ToBeRendered=To Be Rendered
+ModelTooling_UIElement_Visible=Visible
+
+ModelTooling_Context_Variables=Variables
+
 AbstractCommandSelectionDialog_Label_CommandId=Command-Id
 
 ApplicationEditor_Label=Application
@@ -29,6 +34,9 @@ ApplicationEditor_Addons=Addons
 ApplicationEditor_MenuContributions=Menu Contributions
 ApplicationEditor_ToolBarContributions=Toolbar Contributions
 ApplicationEditor_TrimContributions=Trim Contributions
+ApplicationEditor_RootContext=Root Context
+ApplicationEditor_BindingContexts=Binding Contexts
+
 
 BindingTableEditor_Label=BindingTable
 BindingTableEditor_Description=BindingTable bla bla bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index d33cd92810..4dda304402 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -150,7 +150,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Root Context");
+			l.setText(Messages.ApplicationEditor_RootContext);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			createRemoveRootContext = new Button(parent, SWT.CHECK);
@@ -168,11 +168,11 @@ public void widgetSelected(SelectionEvent e) {
 			createRemoveRootContext.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 		}
 
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, "Variables", UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, "Binding Contexts", CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ApplicationEditor_BindingContexts, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}

From b2e25ab69f3b815b5b6d948315e45d0712e04e71 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 16:23:52 +0000
Subject: [PATCH 0222/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * added category support

---
 .../icons/full/modelelements/Category.png     | Bin 0 -> 781 bytes
 .../icons/full/modelelements/Command.gif      | Bin 495 -> 0 bytes
 .../icons/full/modelelements/Command.png      | Bin 0 -> 836 bytes
 .../full/modelelements/CommandParameter.gif   | Bin 612 -> 0 bytes
 .../full/modelelements/CommandParameter.png   | Bin 0 -> 586 bytes
 .../icons/full/modelelements/Handler.gif      | Bin 379 -> 0 bytes
 .../icons/full/modelelements/Handler.png      | Bin 0 -> 774 bytes
 .../icons/full/modelelements/KeyBinding.gif   | Bin 321 -> 0 bytes
 .../icons/full/modelelements/KeyBinding.png   | Bin 0 -> 343 bytes
 .../icons/full/modelelements/Parameter.gif    | Bin 184 -> 0 bytes
 .../icons/full/modelelements/Parameter.png    | Bin 0 -> 586 bytes
 .../icons/full/modelelements/tbr/Command.gif  | Bin 889 -> 0 bytes
 .../icons/full/modelelements/tbr/Handler.gif  | Bin 982 -> 0 bytes
 .../full/modelelements/tbr/KeyBinding.gif     | Bin 917 -> 0 bytes
 .../e4/tools/emf/ui/internal/Messages.java    |  12 +-
 .../tools/emf/ui/internal/Messages.properties |  15 +-
 .../emf/ui/internal/common/ModelEditor.java   |   6 +-
 .../common/component/ApplicationEditor.java   |  11 +
 .../common/component/CategoryEditor.java      | 137 +++++++++++
 .../common/component/CommandEditor.java       |  28 ++-
 .../component/CommandParameterEditor.java     |   2 +-
 .../common/component/HandlerEditor.java       |   2 +-
 .../common/component/KeyBindingEditor.java    |   2 +-
 .../common/component/ParameterEditor.java     |   2 +-
 .../CommandCategorySelectionDialog.java       | 182 ++++++++++++++
 .../component/virtual/VApplicationAddons.java |   6 +-
 .../virtual/VApplicationCategoriesEditor.java | 223 ++++++++++++++++++
 27 files changed, 615 insertions(+), 13 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Category.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Command.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Handler.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/KeyBinding.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Category.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Category.png
new file mode 100644
index 0000000000000000000000000000000000000000..d04dd7f513f574b6010273d879ec9c2dd1e5fc66
GIT binary patch
literal 781
zcmV+o1M>WdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!pGibPR5;6(
zlTT<=R}{v7_syG0CU#<CqC%PoK`SDLAk|{Qg#|&>hGNhxyAUiWDzvzAp&MOTEEMdb
z-KY>(MO>5!t%8VV7Yo%QYGN8YNyf}*Cds_{bMJfa-s57@1`%R=;N!qq{J!tNIfw}V
zSC>!nb?#@X*H7?^&ws3+j;XJ@K4fRgr*T&=dxA;QrFmAo*X`tIwBNtPka>1QBzs=m
z{g0)1*_R&<ajkzN9o}-T-+ie*KX!cGolpDD?N9kt$X<Zr?=*L;pywmDw=|G^XNAMt
zl(%66yZZKW@#v}jTbjE1ljH_5xnay)j4#lbiby5MBs^07=*{haG&XPEtW-VBH)jtj
zTfCd-+4qIgg(>2(GuTpzQa)xj3mu(+O)`;Va<)v(SK@8z+Ic0Zlmda4xjavYPGDY5
zFf%&E-w*RNuZ&sW32iN4H3Sv-bCerFjl4%J8W&=wzo+`*5{ckf*7fdT<aU8%+NZT+
z8(aI2@?_knqM@}7rm|&uKEush(-Qea$`co2!xZ8KSIeU2Cs^CwNp*adG?uZU2dv6$
zB?87~AeBZ%(TD)}C~0(YjmpacCO?h~t0Wp$vVLF?v6kG^2iW;1w61l;+VDZ9jqGn%
zF%hN?h&=rC8dmQ(4LA@%TtHkJ#_0*xv>VFFB8ACmlrB(d?gOB#nOp>jh}F32Bg8Hs
zHo)l@AP#XFT#cr*Cf(hD*f!GL1B^eu#=Y0Fn7|<7VqEkJi5Kb+XFy^QgSaYUE4Vm7
zYye8VbvHhth{7Uq5sByPvI|SFI6!O(u@%H=oXG;{e*qG@xwtyp6qQpMT*ebgg3Exk
zBh~;R;?=wIELLlg(3vHGHsAjB<AF~QcB9BF`;r2v;SeW-|BT)Mr%0)b3C=RQ00000
LNkvXXu0mjf#=>k|

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.gif
deleted file mode 100644
index c3193fd9ef95e62945158833e9c18f3e3840934d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 495
zcmZ?wbhEHb6krfwc*elMo9x7&<}8rrER^9Ql;J9z;U<#lCR6AqoZ%vt?JkkyE}7$@
zSQe;M9wbxXC6ntRSLCf&>aSEDs8SWITo#~I;;&K}tWg`LSsSKZAE{FxsaqeZRvoNf
z6|7bsXwVcDvZ^q2bz#WL!q8QPp373bmZy0xO^sS#61BcGVs(+%@)W<-8F8D-eO9FU
zuS`qcUKzM9J#|xJ%ErWut;rn+S~9jJb{uGG+t=8>zp49RYtGK3z9X&uN7|>H>@3-x
zShgo|`iYLp{fQO(5@(#~n0K~&*2&I!XL=T2=<7J1)N>+n&Bgw8mnLkyGI7hbiHGh^
zKX7~6|Ns9P1`|;H$->CM5Wt`Vaug^|7}$Lp0-BmzTHD$?I=i}?<RyBVq<n>Bd&FJc
z+<9cW#4JoKZEQv5I(U^7lr=SU^hMeQRkU>V4EO{(*bPmsxcIxc9a%Yh*jOf<IC-j(
G!5RPv<cVwm

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.png
new file mode 100644
index 0000000000000000000000000000000000000000..b89bb343458ea62488d810fd38a052c6a0572b30
GIT binary patch
literal 836
zcmV-K1H1f*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!)=5M`R5;6(
zlUqnsQ51&%bH>Yz&dqT~oxC<;gIOR^S%DIiX_Scdk}vgKP!L@}D(FJ>QuL4&2|W}(
z1Vs^zWETnXMvxi>si`B5la80k%W*t&&OT@Fwt_;DMf+txto41Yz1Cg=V+{Xu`h8v>
zQCXQ3(tSn82CHKJ3B2^WDBuzWj8eu<8AZ#!B%=d?AA|cB<9`+S8@=}-U@y~PBb1pf
zCc7Byn_{4<u%NKURRtW(qYR&|?lPk-y%GY`A&)dd9s2~Ui3t9&nTrRm3|;!8fWrq3
z#^k5g)GFAV8z2Ykphu=arpCbpGn_fe2u#dW^VDAj9CY*Rk;%Dfx5ZV3Sc3w2xE55A
zdBqAulMzglIpIKxIVN|Riy3I}=7|P0>l)IMat;ah%nGRC*N{eAKxG+Pl#6B;5Ff`7
z7sJ4G21%xLMW89{o-?n|ZA~eMuJnV1?m{H9U_`}SSOSTtAW?!^vmFtQ;C!r(*$5q9
z5fF*x$0s_WM82c9!-u#yidbewJP%rJu?UPwFz~+;HLA#PuE*JtE>vi&b6FtD^Ryw<
z^97owA|W9c!5%9@;|aK}#pCLvfCqLPYAw8Z_B`aL6(KX(i-+!LWyuYPc~KxN{=}AB
zo_32nX?yP0ax~TXP<He%&a^y1X~7Zbj6$b6C>TPsK_n%npu_(Toq=W=)l|pQ6pBy!
zcf7ss=~I+f>)hUaga*gJgG=ymnD>Qh&?o`X3FZ_Dg_*^eCkx_-q1Ldt{Fc%hzjtD2
z`gvrg7X#gGTo8rEN0VyJLYg%jZkvaX)&!R&9bF@BXd7&uTu`xD_<fn4om*Q5#v1Fh
zL@25Xm8whCc$@{;=GlXffp#=~dlOPM>>9nsz6z^t<KxpgmqFQulr<J)q?u4X+>MQy
zJJHemUXnn!aJX-!iL0IZ6WIn;VKs!{_|5d7OJSl=IGs@P;?7*la?VfOO=or#Hn2Yc
O0000<MNUMnLSTZ(UV6y@

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.gif
deleted file mode 100644
index b7f03d5679831bf19ec4643b6e079722414aa1d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 612
zcmV-q0-OCuNk%w1VGsZi0OkMyZiB9Kh_ZExvwM%XfRww0nZAsl!-}54k)_7~RhBe&
ztAnh}%iZcUZ;$f(|Jd~Z-Sz+L`Ty+t|Lyw!^!)$#{r~d(|N8#_I*M6ClU_1}Nj{ZU
zM3`Gclv_!WU9-}>Erdjey_KcUuuYd=bhLwjxQ>v)oTJXIzS_mc+{?z=%h%-EJd;jC
zmsLTMQb?LvN}F3vmR(?{a8{CIa<G4axQ%nMe@2;8L5)sMm|9YpUObIRN|RJknp<6@
zXxZl5FMK#loK#JhR$HWFDt$6Fggr%#Oi!LxRG?hI)xs}-H9n6-M36~3cRp35Tei};
zH;g+rb~;FyOge}?M3Y8rq;0UyvAEN@P@Yh&%dM@-t+&v(_4xI;(zjimSX7TsT9Q<B
zwrp{xXG(}WY@=Uqq+o2LS<BqTa;9EoqezCdZilpPmb!tGxp=zRrh&9roz-B4&MuzS
zUzopbuHJI4+;;o__WAzs{{Q&@|NsC0{{R30000000000000000A^8LW004RbEC2ui
z01yBW000NUfO>i#VN@P5H7J6Miy=aBbaQNCIwFjMDm-g$cXDrSYB?*HGG1s&d3JDV
zWn?y&IAC8}d3ktsW>q7X8ck7JwRvY_GZ~j4N<>+;S4BWQ9hWpaOjdbMMoUL7C6_-e
zQe9V5P*_1QTm}UL0RVa@Ej~j?PB$+Mmy0PR8yFlWTomX*aDadScX}2?sF0vSg$oJt
y2}%ILL4yPq7!E9WP>_NL5++D!KtZ5H1{f`<On{G|L4<l3C`gb%0ls{J0027(lNee6

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.png
new file mode 100644
index 0000000000000000000000000000000000000000..9757fc6ed6597438eb8e5a70a1ab2402cdebd5d1
GIT binary patch
literal 586
zcmV-Q0=4~#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz+(|@1R5;6p
zli7+IK@^7TCFVB4w-A~<T_9wVOfEA+67m49DDEgIDsIy~ZaprDn2w^x+%>6YY<vFH
zDX|@K$;G*;I{)|or}{M0bsgPq7wvW%tyT-oW)qsGK~+^W8jULe>{78#rvt}vj%qrc
zN=UU@y$E6COaj9&r1NAlaUpajQlL~SorN%pOwHs*2laYgHBA$?ZOd~4Rw@<b^ZAny
zMy|U?A$}5(4a>5yFm2?1ZIg`0V-$-;<Z`(q2qWiR<jrOS694||;KRc+-rfUQV|zCm
zjVJ}u>GT1Fi5dB7wUSNi^%`^Ge62m>OBeX610Nsukl}DhDG-mxT?nhyYH!4he7Ri8
zrq0Ti&UXUvqX&F@JcJAe14@BNBqAY_QZAPjF(Y3r7P9H_kB#@LgFAf>xz>Qp&n=|a
z>ro1XLZK^nmO`PRh#C2OK0ktd7l6-A;O5?fz1gNnCX)yR0<RBVRLrMjvspfy&0NSk
z0r@0GxNWUrT2C*<9(RP7mC0n3R4T=36A7XV$Zgw!W$&H+e!s_k#8b<WNF<b4EXHXQ
zcb}NV;`~5-7C;q^M!n*tIW1Vf-#;n72%rjw!`@&p$Vu$;`8+3A`G3EwaP<oDt8@4N
Y09wpC?6mZIDF6Tf07*qoM6N<$f_O;+EC2ui

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.gif
deleted file mode 100644
index 57f410224cf0e125fefdfbfd424b34ca32650ac4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 379
zcmZ?wbhEHb6krfwxXQqw(BP;BL>-Qf6T{<X<y&?58+Ul5tu5E>aP*iM?lCLeYNChZ
zME|t4Kq*J#ax2FU508od{<Ffvm&EBd7#nw3InMI%nB{K;WK47nUlQ)o;E}c@t$c0y
z+S6-yUD|c^!PU4~;T_u>@|VOltj+J(UOww!N5}U3iQCI3ZqHwGu%qFO+M$;f|G|KP
zbfEZ?g^__lk3k2d733!dwiyo73p{kh9NV1~0xTMO)-@+?HCpL1C+*_|jkQs$L%3SK
zWZD#%Uw+AK^#3sVq2$yax7_cq>g;#(C^lABHOjI%u}OEy<@M@F%Q8AK@K5dOm7mJO
z;KV30f4Z*Rd;#G}fjokO)8$r)3o+Lza0p5E$no(>iVJg;1ab?@$%#scNeOe;IkR(c
Y3G?y_b8(z@@nG_1@(Z}@>d0UX09ibCp#T5?

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d5fb90ec6ee08f53947e0266a87b03f75893446
GIT binary patch
literal 774
zcmV+h1Nr=kP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!m`OxIR5;6>
zlgUq0Q544c8(ae&UR$8ps&snq6^bPY3v3xAmMW74Di$h~GCH6E3TaYs2#6A<7K*gC
z777H71_Wa;(dfp+g-drPCSWu)#PInZi72LJ;o?i~$-U=y&UbQ89Dul3%3P+Axkzc*
zbH-y;QF=hR{qLItf%ci2_&e5wNo0gnVatG?ul6Zw=o$I9Ljfn*ic3`U?>IfEim3g{
zujU&$-hy6wn;w(xme|zJm;lWJxtTFfM)q0`kX!Vu0+d${$}LCddK1<^htTe-fUYL3
zB`SdNsZD>RgvLj1<^@h6_+cDRK2Brcr2~>%$*5S)hyV33PV^teac3%|4lz@8p4?)5
z?t5o^?q+%^%)Yygo~I^U4VR!bTnWuE35hcWrfCDR3q+sxJ79e7Fg`&)RCqLA^2^y^
z0laVfadW90_Fz8Brm|r47sB^u1VgI>kanj)Z4`zMSfHlm8>CwXa$JVM`$2RrmZB-3
zN10m-!;BvH*Br3V8t`DH7m`jf#2upVDXl{5ff<mavWU@F1lMyb8vQzyPGq6ja~k(n
zyJ4LwMAcX>18_pzCPK1Zu$$CKKvd8FGeFf)+K<|x33pc7P&S#3GZT4mEw;nr(Ze*F
z3&*?-4U-lm*#t<gCyuZ=gqeG7A3)z#^rg8Z=vrz+@wg7Ig$`KUI#iD2pl8ko>ber5
z%S_ceqB`b3ko6r~BbvDwdohTvP(3a(pq{x#T$yQsu#OKwEe}KuH^Mh@nxg_(Nw136
zq#a^3xNBke)In+!?<ES&ylN&<%d1G-<d!CYb1t5U3SgCL7rB$H{GWnLOhq#n{3_0?
zSPK_-*fz4_U*K%;$`ipopFsQ<fEC9WzmsT)-->qk3%4wB69{pF`Tzg`07*qoM6N<$
Eg55P&8UO$Q

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.gif
deleted file mode 100644
index d289b194fb6f9229adc4f0dc93850e926fe0da0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 321
zcmZ?wbhEHb6krfwxXJ(m|NsBLaN)s+4?kYK_;BFF2iNdL6%8{QIu;x_aU-K*LP5if
zf(aW=T)6Sz#Rs7b7oiMS;S4vCOgEWAKe23gi5z#y91q2^K$!wBnOqOKB5$SgK$Xg1
zjoL8H+Ay8^NVV!<^{QacWvO1vQ+!sW`man2T$i4@DKTSPV$RN_%KeG6PIk^a)3f+O
z-<E3=fi3~Nhy+6MCkrD3gFb@}NDs(Q3~X@+rWbhVNVUtK|9GP?*U4Kc{b*LKgIn`8
z1HoPoRbe-06CPdlkX4gT@~N)kNX-<pQ@9vz`(Ml89}jCK7bh<-6IUe%9}6=tM<sg?
Z3om;mH{VQ7?n+i}b`Gwlnk9}5)&LAfXEXo+

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.png
new file mode 100644
index 0000000000000000000000000000000000000000..25eacb7c2524142262d68bf729c5e2b61adfd6d4
GIT binary patch
literal 343
zcmV-d0jU0oP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy=}AOER4C75
z_|JeJGSEqZ9d}k~>$`dXYaZs9=SbAto%g@>T~?_bH&lTUn@`uo|1bXE{eSR(<Gt!b
zH-Fsyf8_tf|2|ztY+wb3e#IZIzKhuA{U`PRr2m!wQ~!JaiP*N{Vetn;KZprkP2VS{
z`*YcU-uwUD|3m-R{<r_^&ow!{>AO)ESb=V4`uk}mK|39Px&03WLbv~pzk+s7D@lK^
zn+aB+sp)&Y_x-B3>;6ywU--WQNUr<8>TU0P-|L#1U<GQ-_6A<}Q@&(>&;A)67w(+>
pDf@fM7q9#F25QXo3rUI;002ro52U44e~JJA002ovPDHLkV1l;_q@Mr)

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.gif
deleted file mode 100644
index 46e9bfa668478bf74bdb6f1b9b977bf0e2ca3422..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 184
zcmZ?wbhEHb6krfwIKsfd5IRjdeW8BIN}JmCg$s^WEIr=0<-+1aHxFNbcHzOBw-=Y)
z+Bx<3!sZJL>rc+8*w>x6r7n3(UCP?h*#H0k19cMwia%Kx85o2abU-RWb~3P<K2YgP
z$()z5iixRlMRF1kyNy_*uG%4PW`_m3D`qp4^ri?s3$T#ga6IW(gQLU^4xd9$#XJ=m
FtO5G*K4Aa=

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png
new file mode 100644
index 0000000000000000000000000000000000000000..9757fc6ed6597438eb8e5a70a1ab2402cdebd5d1
GIT binary patch
literal 586
zcmV-Q0=4~#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz+(|@1R5;6p
zli7+IK@^7TCFVB4w-A~<T_9wVOfEA+67m49DDEgIDsIy~ZaprDn2w^x+%>6YY<vFH
zDX|@K$;G*;I{)|or}{M0bsgPq7wvW%tyT-oW)qsGK~+^W8jULe>{78#rvt}vj%qrc
zN=UU@y$E6COaj9&r1NAlaUpajQlL~SorN%pOwHs*2laYgHBA$?ZOd~4Rw@<b^ZAny
zMy|U?A$}5(4a>5yFm2?1ZIg`0V-$-;<Z`(q2qWiR<jrOS694||;KRc+-rfUQV|zCm
zjVJ}u>GT1Fi5dB7wUSNi^%`^Ge62m>OBeX610Nsukl}DhDG-mxT?nhyYH!4he7Ri8
zrq0Ti&UXUvqX&F@JcJAe14@BNBqAY_QZAPjF(Y3r7P9H_kB#@LgFAf>xz>Qp&n=|a
z>ro1XLZK^nmO`PRh#C2OK0ktd7l6-A;O5?fz1gNnCX)yR0<RBVRLrMjvspfy&0NSk
z0r@0GxNWUrT2C*<9(RP7mC0n3R4T=36A7XV$Zgw!W$&H+e!s_k#8b<WNF<b4EXHXQ
zcb}NV;`~5-7C;q^M!n*tIW1Vf-#;n72%rjw!`@&p$Vu$;`8+3A`G3EwaP<oDt8@4N
Y09wpC?6mZIDF6Tf07*qoM6N<$f_O;+EC2ui

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Command.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Command.gif
deleted file mode 100644
index 86e51747ed5923db07f4d01806e0aefe01cd6bd1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 889
zcmV-<1BU!ZNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000P90RIUbNU)&6g9sBUTqw{D8ioSbC=+9b
zAsSu2goUY?kjyJsv1sK2GX|lUNt7s6%G4>8n1f&(If4|a(v~g=xp4X<>Pi-cSW-=~
P!jQ@oh)9zv4F~``cwDDw

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Handler.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Handler.gif
deleted file mode 100644
index 22b96c27f6be5346c749f0bcadf6c98c89e5daa4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 982
zcmV;{11bDRNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01yBW000QH0R0IZNU&hRZkpzxK{H2FH-r8(#eoH@
z)~!^M8Wz;l2NkS;uvCdu)ko97ZgD=LTJ{els+XwZJd9X~5+#-`VcE24(q9}zKyl^-
z>M4%EIB=2*YsoYl98YKjo*_eZDbr<C6`c`?CXH9C|Acv^^C)V>J$?FE6_$2TAwE63
z!6~F?sW3Tm^bC3gXJ*7akAw+>BPWofM|pY<)C7mnqfD6|5rU(bAVN0_-8h8ExnMv5
EJ5a*XvH$=8

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/KeyBinding.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/KeyBinding.gif
deleted file mode 100644
index 5ae4c89a5c390e01675825c713eb8ee9bce9e6f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 917
zcmV;G18V$7Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000Pb0RIUbNU)&6fosqlJcve_7&8kAlF{W$
zSQv-}vuMo1#gQXOkt%KJLNLofESx@xx?(cpKq{%GSXtQe-;^m4|JBTyjFC@9$#U8`
r_Uu_SJ2?@ZOBe4MqMU%1rh5h`r=N3JkNM&02M{7VL34@~7!UwE=&QH~

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 76b5049af6..53e1950330 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -12,7 +12,7 @@
 
 import org.eclipse.osgi.util.NLS;
 
-public class Messages {
+public class Messages extends NLS {
 	public static String ModelTooling_Common_Up;
 	public static String ModelTooling_Common_Down;
 	public static String ModelTooling_Common_AddEllipsis;
@@ -41,6 +41,7 @@ public class Messages {
 	public static String ApplicationEditor_TrimContributions;
 	public static String ApplicationEditor_RootContext;
 	public static String ApplicationEditor_BindingContexts;
+	public static String ApplicationEditor_Categories;
 
 	public static String BindingTableEditor_Label;
 	public static String BindingTableEditor_Description;
@@ -60,6 +61,7 @@ public class Messages {
 	public static String CommandEditor_ParameterOptional_No;
 	public static String CommandEditor_ParameterOptional_Yes;
 	public static String CommandEditor_ParameterId;
+	public static String CommandEditor_Category;
 
 	public static String DirectMenuItemEditor_Label;
 	public static String DirectMenuItemEditor_Description;
@@ -252,6 +254,14 @@ public class Messages {
 	public static String FeatureSelectionDialog_DialogTitle;
 	public static String FeatureSelectionDialog_DialogMessage;
 
+	public static String CategoryEditor_TreeLabel;
+	public static String CategoryEditor_TreeLabelDescriptor;
+	public static String CategoryEditor_Name;
+	public static String CategoryEditor_Description;
+	public static String CategoryEditor_Tags;
+
+	public static String CommandCategorySelectionDialog_LabelCategoryId;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 7e1a90495d..5cc3d53b84 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -36,7 +36,7 @@ ApplicationEditor_ToolBarContributions=Toolbar Contributions
 ApplicationEditor_TrimContributions=Trim Contributions
 ApplicationEditor_RootContext=Root Context
 ApplicationEditor_BindingContexts=Binding Contexts
-
+ApplicationEditor_Categories=Command Categories
 
 BindingTableEditor_Label=BindingTable
 BindingTableEditor_Description=BindingTable bla bla bla
@@ -56,6 +56,7 @@ CommandEditor_ParameterOptional=Optional
 CommandEditor_ParameterOptional_Yes=yes
 CommandEditor_ParameterOptional_No=no
 CommandEditor_ParameterId=Id
+CommandEditor_Category=Category
 
 DirectMenuItemEditor_Label=DirectMenuItem
 DirectMenuItemEditor_Description=DirectMenuItem bla bla bla
@@ -93,7 +94,7 @@ HandlerEditor_ClassURI=Class URI
 InputPartEditor_Label=InputPart
 InputPartEditor_InputURI=Input URI
 
-KeyBindingEditor_Label=Binding
+KeyBindingEditor_Label=KeyBinding
 KeyBindingEditor_Description=Binding bla bla bla
 KeyBindingEditor_Sequence=Sequence
 KeyBindingEditor_Command=Command
@@ -247,4 +248,12 @@ StringModelFragment_Elements=Elements
 FeatureSelectionDialog_Filter=Filter
 FeatureSelectionDialog_ShellTitle=Find Featurename
 FeatureSelectionDialog_DialogTitle=Featurename
-FeatureSelectionDialog_DialogMessage=Find the name of the feature you want to contribute to
\ No newline at end of file
+FeatureSelectionDialog_DialogMessage=Find the name of the feature you want to contribute to
+
+CategoryEditor_TreeLabel=Command Category
+CategoryEditor_TreeLabelDescriptor=Command Category Bla Bla Bla
+CategoryEditor_Name=Name
+CategoryEditor_Description=Description
+CategoryEditor_Tags=Tags
+
+CommandCategorySelectionDialog_LabelCategoryId=Category Id
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 76e81b0404..d9fb290bc2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -51,6 +51,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ApplicationEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.BindingContextEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.BindingTableEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.CategoryEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CommandEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CommandParameterEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectMenuItemEditor;
@@ -86,6 +87,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.TrimmedWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationAddons;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationCategoriesEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VBindingTableEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VCommandEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
@@ -181,6 +183,7 @@ public class ModelEditor {
 	public static final String VIRTUAL_WINDOW_SHARED_ELEMENTS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_SHARED_ELEMENTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_MODEL_FRAGEMENTS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_FRAGEMENTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_MODEL_IMPORTS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_IMPORTS"; //$NON-NLS-1$
+	public static final String VIRTUAL_CATEGORIES = ModelEditor.class.getName() + ".VIRTUAL_CATEGORIES"; //$NON-NLS-1$
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private Map<String, AbstractComponentEditor> virtualEditors = new HashMap<String, AbstractComponentEditor>();
@@ -520,7 +523,7 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_WINDOW_SHARED_ELEMENTS, new VWindowSharedElementsEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_MODEL_FRAGEMENTS, new VModelFragmentsEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_MODEL_IMPORTS, new VModelImportsEditor(modelProvider.getEditingDomain(), this));
-
+		registerVirtualEditor(VIRTUAL_CATEGORIES, new VApplicationCategoriesEditor(modelProvider.getEditingDomain(), this));
 	}
 
 	private void registerVirtualEditor(String id, AbstractComponentEditor editor) {
@@ -564,6 +567,7 @@ private void registerDefaultEditors() {
 		registerEditor(CommandsPackageImpl.Literals.PARAMETER, new ParameterEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(CommandsPackageImpl.Literals.BINDING_TABLE, new BindingTableEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(CommandsPackageImpl.Literals.BINDING_CONTEXT, new BindingContextEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(CommandsPackageImpl.Literals.CATEGORY, new CategoryEditor(modelProvider.getEditingDomain(), this));
 
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR, new ToolBarEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(MenuPackageImpl.Literals.RENDERED_TOOL_BAR, new RenderedToolBarEditor(modelProvider.getEditingDomain(), this));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 4dda304402..a0728c30da 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -69,6 +69,8 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private IListProperty MENU_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS);
 	private IListProperty TOOLBAR_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS);
 	private IListProperty TRIM_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS);
+	private IListProperty APPLICATION__CATEGORIES = EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES);
+
 	private IValueProperty BINDING_TABLE_CONTAINER__ROOT_CONTEXT = EMFProperties.value(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT);
 
 	public ApplicationEditor(EditingDomain editingDomain, ModelEditor editor) {
@@ -240,6 +242,15 @@ protected boolean accepted(Object o) {
 
 		});
 
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_CATEGORIES, APPLICATION__CATEGORIES, element, Messages.ApplicationEditor_Categories) {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOWS, ELEMENT_CONTAINER__CHILDREN, element, Messages.ApplicationEditor_Windows) {
 
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
new file mode 100644
index 0000000000..fd1aa52211
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -0,0 +1,137 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+
+public class CategoryEditor extends AbstractComponentEditor {
+
+	private Composite composite;
+	private Image image;
+	private EMFDataBindingContext context;
+	private EStackLayout stackLayout;
+
+	public CategoryEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain, editor);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if (image == null) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Category.png")); //$NON-NLS-1$
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.CategoryEditor_TreeLabel;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return Messages.CategoryEditor_TreeLabelDescriptor;
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new EStackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+
+		if (getEditor().isModelFragment()) {
+			Control topControl;
+			if (Util.isImport((EObject) object)) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];
+			}
+
+			if (stackLayout.topControl != topControl) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
+		parent = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
+
+			return parent;
+		}
+
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.CategoryEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__NAME));
+		ControlFactory.createTextField(parent, Messages.CategoryEditor_Description, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__DESCRIPTION));
+		ControlFactory.createStringListWidget(parent, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index e3ebd7a220..30c2ced40e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -21,6 +21,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.CommandCategorySelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.MCommandParameter;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
@@ -72,7 +73,7 @@ public CommandEditor(EditingDomain editingDomain, ModelEditor editor) {
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.png")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -178,6 +179,31 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__DESCRIPTION).observeDetail(getMaster()));
 		}
 
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.CommandEditor_Category);
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			t.setLayoutData(gd);
+			t.setEditable(false);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(CommandsPackageImpl.Literals.COMMAND__CATEGORY, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
+
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					CommandCategorySelectionDialog dialog = new CommandCategorySelectionDialog(b.getShell(), getEditor().getModelProvider(), (MCommand) getMaster().getValue());
+					dialog.open();
+				}
+			});
+		}
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 52c9598b40..8815123fe6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -53,7 +53,7 @@ public CommandParameterEditor(EditingDomain editingDomain, ModelEditor editor) {
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.png")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 470f87da56..3ee7dae174 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -67,7 +67,7 @@ public HandlerEditor(EditingDomain editingDomain, ModelEditor editor, IModelReso
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index b7fe83abdb..ff1dae4a1c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -92,7 +92,7 @@ public KeyBindingEditor(EditingDomain editingDomain, ModelEditor editor, IModelR
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.png")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index f058aa16be..d48cf40438 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -49,7 +49,7 @@ public ParameterEditor(EditingDomain editingDomain, ModelEditor editor) {
 	public Image getImage(Object element, Display display) {
 		if (image == null) {
 			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.gif")); //$NON-NLS-1$
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png")); //$NON-NLS-1$
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
new file mode 100644
index 0000000000..49dabd3381
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -0,0 +1,182 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
+import org.eclipse.e4.ui.model.application.commands.MCategory;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.AbstractTreeViewer;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.graphics.Image;
+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;
+
+public class CommandCategorySelectionDialog extends TitleAreaDialog {
+	private IModelResource resource;
+	private TableViewer viewer;
+	private MCommand command;
+
+	public CommandCategorySelectionDialog(Shell parentShell, IModelResource resource, MCommand command) {
+		super(parentShell);
+		this.resource = resource;
+		this.command = command;
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite composite = (Composite) super.createDialogArea(parent);
+		getShell().setText("Command Category Dialog");
+		setTitle("Command Category");
+		setMessage("Search for a Command Category");
+
+		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newexp_wiz.png"));
+		setTitleImage(titleImage);
+		getShell().addDisposeListener(new DisposeListener() {
+
+			public void widgetDisposed(DisposeEvent e) {
+				titleImage.dispose();
+			}
+		});
+
+		Composite container = new Composite(composite, SWT.NONE);
+		container.setLayoutData(new GridData(GridData.FILL_BOTH));
+		container.setLayout(new GridLayout(2, false));
+
+		Label l = new Label(container, SWT.NONE);
+		l.setText(Messages.CommandCategorySelectionDialog_LabelCategoryId);
+
+		Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		new Label(container, SWT.NONE);
+		viewer = new TableViewer(container);
+		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setLabelProvider(new LabelProviderImpl());
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+
+			public void doubleClick(DoubleClickEvent event) {
+				okPressed();
+			}
+		});
+
+		List<EObject> categories = new ArrayList<EObject>();
+		TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
+		while (it.hasNext()) {
+			EObject o = it.next();
+			if (o.eClass() == CommandsPackageImpl.Literals.CATEGORY) {
+				categories.add(o);
+			}
+		}
+		viewer.setInput(categories);
+
+		final PatternFilter filter = new PatternFilter() {
+			@Override
+			protected boolean isParentMatch(Viewer viewer, Object element) {
+				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);
+			}
+		};
+		viewer.addFilter(filter);
+
+		searchText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				filter.setPattern(((Text) e.widget).getText());
+				viewer.refresh();
+			}
+		});
+
+		return composite;
+	}
+
+	@Override
+	protected void okPressed() {
+		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+		if (!s.isEmpty()) {
+			Command cmd = SetCommand.create(resource.getEditingDomain(), command, CommandsPackageImpl.Literals.COMMAND__CATEGORY, s.getFirstElement());
+			if (cmd.canExecute()) {
+				resource.getEditingDomain().getCommandStack().execute(cmd);
+				super.okPressed();
+			}
+		}
+	}
+
+	private static class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
+
+		public void update(final ViewerCell cell) {
+			MCategory cmd = (MCategory) cell.getElement();
+
+			StyledString styledString = new StyledString();
+			if (cmd.getName() != null) {
+				styledString.append(cmd.getName());
+			}
+			if (cmd.getDescription() != null) {
+				styledString.append(" - " + cmd.getDescription(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+			}
+			if (cmd.getElementId() != null) {
+				styledString.append(" - " + cmd.getElementId(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+			}
+			cell.setText(styledString.getString());
+			cell.setStyleRanges(styledString.getStyleRanges());
+		}
+
+		public Image getImage(Object element) {
+			return null;
+		}
+
+		public String getText(Object element) {
+			MCategory command = (MCategory) element;
+			String s = ""; //$NON-NLS-1$
+			if (command.getName() != null) {
+				s += command.getName();
+			}
+
+			if (command.getDescription() != null) {
+				s += " " + command.getDescription(); //$NON-NLS-1$
+			}
+
+			if (command.getElementId() != null) {
+				s += " " + command.getElementId(); //$NON-NLS-1$
+			}
+
+			return s;
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index 127121ef61..8a32545123 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -127,7 +127,7 @@ public void widgetSelected(SelectionEvent e) {
 						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MApplication container = (MApplication) getMaster().getValue();
-							int idx = container.getCommands().indexOf(obj) - 1;
+							int idx = container.getAddons().indexOf(obj) - 1;
 							if (idx >= 0) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__ADDONS, obj, idx);
 
@@ -154,8 +154,8 @@ public void widgetSelected(SelectionEvent e) {
 						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MApplication container = (MApplication) getMaster().getValue();
-							int idx = container.getCommands().indexOf(obj) + 1;
-							if (idx < container.getCommands().size()) {
+							int idx = container.getAddons().indexOf(obj) + 1;
+							if (idx < container.getAddons().size()) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__ADDONS, obj, idx);
 
 								if (cmd.canExecute()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
new file mode 100644
index 0000000000..a97af9b7b1
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -0,0 +1,223 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.commands.MCategory;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VApplicationCategoriesEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private TableViewer viewer;
+	private EMFDataBindingContext context;
+
+	private List<Action> actions = new ArrayList<Action>();
+
+	public VApplicationCategoriesEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain, editor);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return "Command Categories";
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return "Command Categories bla bla bla bla";
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent, context, getMaster());
+		}
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText("Categories");
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.getTable().setHeaderVisible(true);
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Up");
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MApplication container = (MApplication) getMaster().getValue();
+							int idx = container.getCategories().indexOf(obj) - 1;
+							if (idx >= 0) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Down");
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MApplication container = (MApplication) getMaster().getValue();
+							int idx = container.getCategories().indexOf(obj) + 1;
+							if (idx < container.getCategories().size()) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Add ...");
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MCategory command = CommandsFactoryImpl.eINSTANCE.createCategory();
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES, command);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						getEditor().setSelection(command);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText("Remove");
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> commands = ((IStructuredSelection) viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES, commands);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
+}

From 4b11c5d810be51cf3c7089f818a9bc23e32ab133 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 16:41:14 +0000
Subject: [PATCH 0223/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * support to find contexts

---
 .../e4/tools/emf/ui/internal/Messages.java    |   2 +
 .../tools/emf/ui/internal/Messages.properties |   3 +-
 .../common/component/BindingTableEditor.java  |  16 +-
 .../BindingContextSelectionDialog.java        | 188 ++++++++++++++++++
 .../CommandCategorySelectionDialog.java       |   8 +-
 .../dialogs/SharedElementsDialog.java         |  77 ++++---
 6 files changed, 250 insertions(+), 44 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 53e1950330..aec6d792ea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -262,6 +262,8 @@ public class Messages extends NLS {
 
 	public static String CommandCategorySelectionDialog_LabelCategoryId;
 
+	public static String BindingContextSelectionDialog_LabelContextId;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 5cc3d53b84..d978512a72 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -256,4 +256,5 @@ CategoryEditor_Name=Name
 CategoryEditor_Description=Description
 CategoryEditor_Tags=Tags
 
-CommandCategorySelectionDialog_LabelCategoryId=Category Id
\ No newline at end of file
+CommandCategorySelectionDialog_LabelCategoryId=Category Id
+BindingContextSelectionDialog_LabelContextId=Context Id
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index ae5292289f..bf3b9a0ff9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -22,6 +22,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BindingContextSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MBindingTable;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
@@ -39,6 +40,7 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -164,10 +166,22 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID).observeDetail(getMaster()));
 
-			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(b.getShell(), getEditor().getModelProvider());
+					if (dialog.open() == BindingContextSelectionDialog.OK) {
+						Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID, dialog.getSelectedId());
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
 		}
 
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
new file mode 100644
index 0000000000..9f7d22179d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
@@ -0,0 +1,188 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
+import org.eclipse.e4.ui.model.application.commands.MBindingContext;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.AbstractTreeViewer;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.graphics.Image;
+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;
+
+public class BindingContextSelectionDialog extends TitleAreaDialog {
+	private IModelResource resource;
+	private TableViewer viewer;
+	private String selectedId;
+
+	public BindingContextSelectionDialog(Shell parentShell, IModelResource resource) {
+		super(parentShell);
+		this.resource = resource;
+	}
+
+	public String getSelectedId() {
+		return selectedId;
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite composite = (Composite) super.createDialogArea(parent);
+		getShell().setText("BindingContext Dialog");
+		setTitle("BindingContext");
+		setMessage("Search for a BindingContext");
+
+		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newexp_wiz.png"));
+		setTitleImage(titleImage);
+		getShell().addDisposeListener(new DisposeListener() {
+
+			public void widgetDisposed(DisposeEvent e) {
+				titleImage.dispose();
+			}
+		});
+
+		Composite container = new Composite(composite, SWT.NONE);
+		container.setLayoutData(new GridData(GridData.FILL_BOTH));
+		container.setLayout(new GridLayout(2, false));
+
+		Label l = new Label(container, SWT.NONE);
+		l.setText(Messages.BindingContextSelectionDialog_LabelContextId);
+
+		Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		new Label(container, SWT.NONE);
+		viewer = new TableViewer(container);
+		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setLabelProvider(new LabelProviderImpl());
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+
+			public void doubleClick(DoubleClickEvent event) {
+				okPressed();
+			}
+		});
+
+		List<EObject> categories = new ArrayList<EObject>();
+		TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
+		while (it.hasNext()) {
+			EObject o = it.next();
+			if (o.eClass() == CommandsPackageImpl.Literals.BINDING_CONTEXT) {
+				categories.add(o);
+			}
+		}
+		viewer.setInput(categories);
+
+		final PatternFilter filter = new PatternFilter() {
+			@Override
+			protected boolean isParentMatch(Viewer viewer, Object element) {
+				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);
+			}
+		};
+		viewer.addFilter(filter);
+
+		searchText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				filter.setPattern(((Text) e.widget).getText());
+				viewer.refresh();
+			}
+		});
+
+		return composite;
+	}
+
+	@Override
+	protected void okPressed() {
+		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+		if (!s.isEmpty()) {
+			selectedId = ((MBindingContext) s.getFirstElement()).getElementId();
+			if (selectedId != null && selectedId.trim().length() > 0) {
+				super.okPressed();
+			} else {
+				setErrorMessage("You can not reference an element without an ID");
+			}
+		}
+	}
+
+	private static class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
+
+		public void update(final ViewerCell cell) {
+			MBindingContext cmd = (MBindingContext) cell.getElement();
+
+			StyledString styledString = new StyledString();
+			if (cmd.getName() != null) {
+				styledString.append(cmd.getName());
+			}
+
+			if (cmd.getElementId() != null) {
+				styledString.append(" (" + cmd.getElementId() + ")", StyledString.DECORATIONS_STYLER); //$NON-NLS-1$ //$NON-NLS-2$
+			} else {
+				styledString.append(" (<no id>)", StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+			}
+
+			if (cmd.getDescription() != null) {
+				styledString.append(" - " + cmd.getDescription(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+			}
+
+			cell.setText(styledString.getString());
+			cell.setStyleRanges(styledString.getStyleRanges());
+		}
+
+		public Image getImage(Object element) {
+			return null;
+		}
+
+		public String getText(Object element) {
+			MBindingContext command = (MBindingContext) element;
+			String s = ""; //$NON-NLS-1$
+			if (command.getName() != null) {
+				s += command.getName();
+			}
+
+			if (command.getDescription() != null) {
+				s += " " + command.getDescription(); //$NON-NLS-1$
+			}
+
+			if (command.getElementId() != null) {
+				s += " " + command.getElementId(); //$NON-NLS-1$
+			}
+
+			return s;
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
index 49dabd3381..a5531d2ce7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -147,12 +147,14 @@ public void update(final ViewerCell cell) {
 			if (cmd.getName() != null) {
 				styledString.append(cmd.getName());
 			}
+			if (cmd.getElementId() != null) {
+				styledString.append(" (" + cmd.getElementId() + ")", StyledString.DECORATIONS_STYLER); //$NON-NLS-1$ //$NON-NLS-2$
+			} else {
+				styledString.append(" (<no id>)", StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+			}
 			if (cmd.getDescription() != null) {
 				styledString.append(" - " + cmd.getDescription(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 			}
-			if (cmd.getElementId() != null) {
-				styledString.append(" - " + cmd.getElementId(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
-			}
 			cell.setText(styledString.getString());
 			cell.setStyleRanges(styledString.getStyleRanges());
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index 50a20e6c20..0e1d33cf22 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -50,7 +50,7 @@ public class SharedElementsDialog extends TitleAreaDialog {
 	private MPlaceholder placeholder;
 	private IModelResource resource;
 	private ModelEditor editor;
-	
+
 	public SharedElementsDialog(Shell parentShell, ModelEditor editor, MPlaceholder placeholder, IModelResource resource) {
 		super(parentShell);
 		this.editor = editor;
@@ -65,49 +65,48 @@ protected Control createDialogArea(Composite parent) {
 		setTitle("Find Shared Elements");
 		setMessage("Find Shared Elements of an Window");
 
-		
 		Composite container = new Composite(comp, SWT.NONE);
 		container.setLayout(new GridLayout(2, false));
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
+
 		Label l = new Label(container, SWT.NONE);
 		l.setText("Name");
-		
+
 		Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
+
 		l = new Label(container, SWT.NONE);
-		
+
 		viewer = new TableViewer(container);
 		viewer.setContentProvider(new ArrayContentProvider());
 		viewer.setLabelProvider(new LabelProviderImpl());
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-		
+
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
-			
+
 			public void doubleClick(DoubleClickEvent event) {
 				okPressed();
 			}
 		});
-		
-		if( resource.getRoot().get(0) instanceof MApplication ) {
+
+		if (resource.getRoot().get(0) instanceof MApplication) {
 			List<MUIElement> list = new ArrayList<MUIElement>();
-			for( MWindow m : ((MApplication)resource.getRoot().get(0)).getChildren() ) {
+			for (MWindow m : ((MApplication) resource.getRoot().get(0)).getChildren()) {
 				list.addAll(filter(m.getSharedElements()));
 			}
 			viewer.setInput(list);
-		} else if( resource.getRoot().get(0) instanceof MModelFragments ) {
+		} else if (resource.getRoot().get(0) instanceof MModelFragments) {
 			List<MApplicationElement> list = new ArrayList<MApplicationElement>();
-			for( MModelFragment f : ((MModelFragments)resource.getRoot().get(0)).getFragments() ) {
-				if( f instanceof MStringModelFragment ) {
-					if( ((MStringModelFragment)f).getFeaturename().equals("sharedElements") ) { //$NON-NLS-1$
+			for (MModelFragment f : ((MModelFragments) resource.getRoot().get(0)).getFragments()) {
+				if (f instanceof MStringModelFragment) {
+					if (((MStringModelFragment) f).getFeaturename().equals("sharedElements")) { //$NON-NLS-1$
 						list.addAll(filter(f.getElements()));
 					}
 				}
 			}
 			viewer.setInput(list);
 		}
-		
+
 		final PatternFilter filter = new PatternFilter() {
 			@Override
 			protected boolean isParentMatch(Viewer viewer, Object element) {
@@ -122,74 +121,74 @@ public void modifyText(ModifyEvent e) {
 				viewer.refresh();
 			}
 		});
-		
+
 		return comp;
 	}
-	
+
 	@Override
 	protected void okPressed() {
-		if( ! viewer.getSelection().isEmpty() ) {
+		if (!viewer.getSelection().isEmpty()) {
 			IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 			Command cmd = SetCommand.create(resource.getEditingDomain(), placeholder, AdvancedPackageImpl.Literals.PLACEHOLDER__REF, s.getFirstElement());
-			if( cmd.canExecute() ) {
+			if (cmd.canExecute()) {
 				resource.getEditingDomain().getCommandStack().execute(cmd);
 				super.okPressed();
 			}
 		}
 	}
-	
+
 	private static <T> List<T> filter(List<T> o) {
 		List<T> rv = new ArrayList<T>();
-		for( T i : o ) {
-			if( i instanceof MPart || i instanceof MPartSashContainer ) {
+		for (T i : o) {
+			if (i instanceof MPart || i instanceof MPartSashContainer) {
 				rv.add(i);
 			}
 		}
 		return rv;
 	}
-	
+
 	private class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
 		public void update(final ViewerCell cell) {
 			EObject o = (EObject) cell.getElement();
-			
+
 			StyledString string = new StyledString(getTypename(o));
-			
-			if( o instanceof MUILabel ) {
-				string.append(" - " + ((MUILabel)o).getLabel(), StyledString.DECORATIONS_STYLER);
+
+			if (o instanceof MUILabel) {
+				string.append(" - " + ((MUILabel) o).getLabel(), StyledString.DECORATIONS_STYLER);
 			}
-			
+
 			MApplicationElement el = (MApplicationElement) o;
 			string.append(" - " + el.getElementId(), StyledString.DECORATIONS_STYLER);
-			
+
 			cell.setText(string.getString());
 			cell.setStyleRanges(string.getStyleRanges());
 			cell.setImage(getImage(o));
 		}
-		
+
 		public String getText(Object element) {
 			EObject o = (EObject) element;
 			MApplicationElement el = (MApplicationElement) o;
-			
-			if( el instanceof MUILabel ) {
+
+			if (el instanceof MUILabel) {
 				MUILabel label = (MUILabel) el;
 				return getTypename(o) + " - " + el.getElementId() + " - " + label.getLabel();
 			} else {
-				return getTypename(o) + " - " + el.getElementId() + " - ";	
+				return getTypename(o) + " - " + el.getElementId() + " - ";
 			}
 		}
-		
+
 		private String getTypename(EObject o) {
 			AbstractComponentEditor editor = SharedElementsDialog.this.editor.getEditor((o).eClass());
-			if( editor != null ) {
+			if (editor != null) {
 				return editor.getLabel(o);
 			} else {
 				return o.eClass().getName();
 			}
 		}
-		
+
 		public Image getImage(Object element) {
-			AbstractComponentEditor editor = SharedElementsDialog.this.editor.getEditor(((EObject)element).eClass());
-			if( editor != null ) {
+			AbstractComponentEditor editor = SharedElementsDialog.this.editor.getEditor(((EObject) element).eClass());
+			if (editor != null) {
 				return editor.getImage(element, getShell().getDisplay());
 			}
 			return null;

From fc234cf73889d7a1a3e22a6f302017daf7b47358 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 16:54:07 +0000
Subject: [PATCH 0224/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * support KeyBinding Parameters

---
 .../e4/tools/emf/ui/internal/Messages.java    |   4 +-
 .../tools/emf/ui/internal/Messages.properties |   5 +-
 .../common/component/AddonsEditor.java        |   2 +-
 .../common/component/HandlerEditor.java       |   6 +-
 .../common/component/KeyBindingEditor.java    | 101 +++---------------
 5 files changed, 25 insertions(+), 93 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index aec6d792ea..684ba65da1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -26,6 +26,9 @@ public class Messages extends NLS {
 
 	public static String ModelTooling_Context_Variables;
 
+	public static String ModelTooling_ApplicationElement_Tags;
+	public static String ModelTooling_Contribution_PersistedState;
+
 	public static String AbstractCommandSelectionDialog_Label_CommandId;
 
 	public static String ApplicationEditor_Label;
@@ -220,7 +223,6 @@ public class Messages extends NLS {
 	public static String AddonsEditor_ClassURI;
 	public static String AddonsEditor_TreeLabel;
 	public static String AddonsEditor_TreeLabelDescription;
-	public static String AddonsEditor_PersistedState;
 	public static String AddonsEditor_Tags;
 
 	public static String ContributionClassDialog_DialogMessage;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index d978512a72..0b4672b434 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -21,6 +21,10 @@ ModelTooling_UIElement_Visible=Visible
 
 ModelTooling_Context_Variables=Variables
 
+ModelTooling_ApplicationElement_Tags=Tags
+
+ModelTooling_Contribution_PersistedState=Persisted State
+
 AbstractCommandSelectionDialog_Label_CommandId=Command-Id
 
 ApplicationEditor_Label=Application
@@ -151,7 +155,6 @@ PartEditor_Tooltip=Tooltip
 PartEditor_IconURI=Icon URI
 PartEditor_ClassURI=Class URI
 PartEditor_Closeable=Closeable
-PartEditor_PersitedState=Persisted State
 PartEditor_PersitedStateKey=Key
 PartEditor_PersitedStateValue=Value
 PartEditor_Menus=Menus
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index e05295ca28..ad09b3b1e6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -182,7 +182,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createMapProperties(parent, this, Messages.AddonsEditor_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, this, Messages.AddonsEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 3ee7dae174..f8672a3863 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -174,7 +174,7 @@ public void widgetSelected(SelectionEvent e) {
 			final IContributionClassCreator c = getEditor().getContributionCreator(CommandsPackageImpl.Literals.HANDLER);
 			if (project != null && c != null) {
 				final Link l = new Link(parent, SWT.NONE);
-				l.setText("<A>" + Messages.HandlerEditor_ClassURI + "</A>");
+				l.setText("<A>" + Messages.HandlerEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
 				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 				l.addSelectionListener(new SelectionAdapter() {
 					@Override
@@ -204,8 +204,8 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 		}
-		ControlFactory.createMapProperties(parent, this, "Persisted State", ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index ff1dae4a1c..27138578f4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -18,7 +18,6 @@
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.databinding.validation.IValidator;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -27,6 +26,7 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.KeyBindingCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
@@ -47,22 +47,13 @@
 import org.eclipse.jface.bindings.keys.KeySequence;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.fieldassist.ControlDecoration;
 import org.eclipse.jface.fieldassist.FieldDecoration;
 import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnViewerEditor;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
-import org.eclipse.jface.viewers.EditingSupport;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.TableViewerEditor;
-import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -83,6 +74,8 @@ public class KeyBindingEditor extends AbstractComponentEditor {
 	private IModelResource resource;
 	private EStackLayout stackLayout;
 
+	private IEMFEditListProperty KEY_BINDING__PARAMETERS = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS);
+
 	public KeyBindingEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource) {
 		super(editingDomain, editor);
 		this.resource = resource;
@@ -242,81 +235,16 @@ public void widgetSelected(SelectionEvent e) {
 		l.setText(Messages.KeyBindingEditor_Parameters);
 		l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
-		final TableViewer tableviewer = new TableViewer(parent);
+		final TableViewer viewer = new TableViewer(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.BORDER);
+		ObservableListContentProvider cp = new ObservableListContentProvider();
+		viewer.setContentProvider(cp);
+		viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.heightHint = 120;
-		tableviewer.getTable().setHeaderVisible(true);
-		tableviewer.getControl().setLayoutData(gd);
-		IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS);
-
-		TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-		column.getColumn().setText(Messages.KeyBindingEditor_ParametersKey);
-		column.getColumn().setWidth(200);
-		column.setEditingSupport(new EditingSupport(tableviewer) {
-			private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
-
-			@Override
-			protected void setValue(Object element, Object value) {
-				((MParameter) element).setName((String) value);
-			}
-
-			@Override
-			protected Object getValue(Object element) {
-				String val = ((MParameter) element).getName();
-				return val == null ? "" : val; //$NON-NLS-1$
-			}
+		viewer.getControl().setLayoutData(gd);
 
-			@Override
-			protected CellEditor getCellEditor(Object element) {
-				return cellEditor;
-			}
-
-			@Override
-			protected boolean canEdit(Object element) {
-				return true;
-			}
-		});
-
-		column = new TableViewerColumn(tableviewer, SWT.NONE);
-		column.getColumn().setText(Messages.KeyBindingEditor_ParametersValue);
-		column.getColumn().setWidth(200);
-		column.setEditingSupport(new EditingSupport(tableviewer) {
-			private TextCellEditor cellEditor = new TextCellEditor(tableviewer.getTable());
-
-			@Override
-			protected void setValue(Object element, Object value) {
-				((MParameter) element).setValue((String) value);
-			}
-
-			@Override
-			protected Object getValue(Object element) {
-				String val = ((MParameter) element).getValue();
-				return val == null ? "" : val; //$NON-NLS-1$
-			}
-
-			@Override
-			protected CellEditor getCellEditor(Object element) {
-				return cellEditor;
-			}
-
-			@Override
-			protected boolean canEdit(Object element) {
-				return true;
-			}
-		});
-
-		ColumnViewerEditorActivationStrategy editorActivationStrategy = new ColumnViewerEditorActivationStrategy(tableviewer) {
-			@Override
-			protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
-				boolean singleSelect = ((IStructuredSelection) tableviewer.getSelection()).size() == 1;
-				boolean isLeftDoubleMouseSelect = event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION && ((MouseEvent) event.sourceEvent).button == 1;
-
-				return singleSelect && (isLeftDoubleMouseSelect || event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC || event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL);
-			}
-		};
-		TableViewerEditor.create(tableviewer, editorActivationStrategy, ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR);
-
-		ViewerSupport.bind(tableviewer, prop.observeDetail(getMaster()), new IValueProperty[] { EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__NAME), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__VALUE) });
+		viewer.setInput(KEY_BINDING__PARAMETERS.observeDetail(getMaster()));
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
@@ -350,7 +278,6 @@ public void widgetSelected(SelectionEvent e) {
 				if (cmd.canExecute()) {
 					getEditingDomain().getCommandStack().execute(cmd);
 				}
-				tableviewer.editElement(param, 0);
 			}
 		});
 
@@ -359,7 +286,7 @@ public void widgetSelected(SelectionEvent e) {
 		b.addSelectionListener(new SelectionAdapter() {
 
 			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection s = (IStructuredSelection) tableviewer.getSelection();
+				IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 				if (!s.isEmpty()) {
 					MKeyBinding item = (MKeyBinding) getMaster().getValue();
 					Command cmd = RemoveCommand.create(getEditingDomain(), item, CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS, s.toList());
@@ -373,14 +300,14 @@ public void widgetSelected(SelectionEvent e) {
 		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
-		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		return null;
+		return KEY_BINDING__PARAMETERS.observe(element);
 	}
 
 	@Override

From 0c580524fb8af08cfd71d0048979b92f5bdef74e Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 16:57:49 +0000
Subject: [PATCH 0225/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * some nls stuff

---
 .../eclipse/e4/tools/emf/ui/internal/Messages.java    |  3 +++
 .../e4/tools/emf/ui/internal/Messages.properties      |  5 ++++-
 .../ui/internal/common/ComponentLabelProvider.java    | 11 +++++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 684ba65da1..a59c9d10aa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -266,6 +266,9 @@ public class Messages extends NLS {
 
 	public static String BindingContextSelectionDialog_LabelContextId;
 
+	public static String ComponentLabelProvider_invisible;
+	public static String ComponentLabelProvider_notrendered;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 0b4672b434..2890de86d9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -260,4 +260,7 @@ CategoryEditor_Description=Description
 CategoryEditor_Tags=Tags
 
 CommandCategorySelectionDialog_LabelCategoryId=Category Id
-BindingContextSelectionDialog_LabelContextId=Context Id
\ No newline at end of file
+BindingContextSelectionDialog_LabelContextId=Context Id
+
+ComponentLabelProvider_invisible=invisible
+ComponentLabelProvider_notrendered=not rendered
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index e12afdf246..b52a0d7617 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -11,6 +11,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.resource.JFaceResources;
@@ -32,14 +33,16 @@ public class ComponentLabelProvider extends StyledCellLabelProvider {
 
 	private ModelEditor editor;
 
+	private static final String NOT_RENDERED_KEY = "NOT_RENDERED_STYLER";//$NON-NLS-1$
+
 	private static Styler NOT_RENDERED_STYLER = new Styler() {
 		{
-			JFaceResources.getColorRegistry().put("NOT_RENDERED_STYLER", new RGB(200, 200, 200));
+			JFaceResources.getColorRegistry().put(NOT_RENDERED_KEY, new RGB(200, 200, 200));
 		}
 
 		@Override
 		public void applyStyles(TextStyle textStyle) {
-			textStyle.foreground = JFaceResources.getColorRegistry().get("NOT_RENDERED_STYLER");
+			textStyle.foreground = JFaceResources.getColorRegistry().get(NOT_RENDERED_KEY);
 		}
 	};
 
@@ -60,10 +63,10 @@ public void update(final ViewerCell cell) {
 
 				if (o instanceof MUIElement) {
 					if (!((MUIElement) o).isVisible()) {
-						label += "<invisible>";
+						label += "<" + Messages.ComponentLabelProvider_invisible + ">"; //$NON-NLS-1$//$NON-NLS-2$
 						styler = NOT_RENDERED_STYLER;
 					} else if (!((MUIElement) o).isToBeRendered()) {
-						label += "<not rendered>";
+						label += "<" + Messages.ComponentLabelProvider_notrendered + ">"; //$NON-NLS-1$ //$NON-NLS-2$
 						styler = NOT_RENDERED_STYLER;
 					}
 				}

From ea55996690a27db320b8455976c07be978f3dc1b Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 16:59:13 +0000
Subject: [PATCH 0226/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed compiler warnings

---
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index d9fb290bc2..1474e5c633 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -674,6 +674,7 @@ public IModelResource getModelProvider() {
 
 	class ClipboardHandler implements Handler {
 
+		@SuppressWarnings("unchecked")
 		public void paste() {
 			Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
 			Object o = clip.getContents(MemoryTransfer.getInstance());
@@ -805,6 +806,7 @@ protected DropListener(Viewer viewer, EditingDomain domain) {
 			this.domain = domain;
 		}
 
+		@SuppressWarnings("unchecked")
 		@Override
 		public boolean performDrop(Object data) {
 			if (getCurrentLocation() == LOCATION_ON) {
@@ -945,6 +947,7 @@ public boolean validateDrop(Object target, int operation, TransferData transferT
 
 		private boolean isValidDrop(Object target, MApplicationElement instance, boolean isIndex) {
 			if (target instanceof MElementContainer<?>) {
+				@SuppressWarnings("unchecked")
 				MElementContainer<MUIElement> container = (MElementContainer<MUIElement>) target;
 
 				if (isIndex || !container.getChildren().contains(instance)) {
@@ -952,6 +955,7 @@ private boolean isValidDrop(Object target, MApplicationElement instance, boolean
 					return classifier.isInstance(instance);
 				}
 			} else if (target instanceof VirtualEntry<?>) {
+				@SuppressWarnings("unchecked")
 				VirtualEntry<Object> vTarget = (VirtualEntry<Object>) target;
 				if (isIndex || !vTarget.getList().contains(instance)) {
 					if (vTarget.getProperty() instanceof IEMFProperty) {

From 1a41cab39d5c8a8b747617a341959819f2ef6298 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 17:07:02 +0000
Subject: [PATCH 0227/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * some nls stuff

---
 .../e4/tools/emf/ui/internal/Messages.java    |  6 ++++++
 .../tools/emf/ui/internal/Messages.properties |  8 ++++++-
 .../component/BindingContextEditor.java       | 21 ++++++++++---------
 .../common/component/CommandEditor.java       |  2 +-
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index a59c9d10aa..f75e67fa4d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -269,6 +269,12 @@ public class Messages extends NLS {
 	public static String ComponentLabelProvider_invisible;
 	public static String ComponentLabelProvider_notrendered;
 
+	public static String BindingContextEditor_TreeLabel;
+	public static String BindingContextEditor_TreeLabelDescription;
+	public static String BindingContextEditor_Name;
+	public static String BindingContextEditor_Description;
+	public static String BindingContextEditor_Subcontexts;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 2890de86d9..312307b903 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -263,4 +263,10 @@ CommandCategorySelectionDialog_LabelCategoryId=Category Id
 BindingContextSelectionDialog_LabelContextId=Context Id
 
 ComponentLabelProvider_invisible=invisible
-ComponentLabelProvider_notrendered=not rendered
\ No newline at end of file
+ComponentLabelProvider_notrendered=not rendered
+
+BindingContextEditor_TreeLabel=Binding Context
+BindingContextEditor_TreeLabelDescription=Binding Context Bla Bla Bla
+BindingContextEditor_Name=Name
+BindingContextEditor_Description=Description
+BindingContextEditor_Subcontexts=Subcontexts
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index dc2e753cc5..043af0ead8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -19,6 +19,7 @@
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.commands.MBindingContext;
@@ -81,7 +82,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Binding Context";
+		return Messages.BindingContextEditor_TreeLabel;
 	}
 
 	@Override
@@ -97,7 +98,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Binding Context Bla Bla Bla";
+		return Messages.BindingContextEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -146,12 +147,12 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return parent;
 		}
 
-		ControlFactory.createTextField(parent, "Id", master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, "Name", master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME));
-		ControlFactory.createTextField(parent, "Description", master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__DESCRIPTION));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME));
+		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Description, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__DESCRIPTION));
 
 		Label l = new Label(parent, SWT.NONE);
-		l.setText("Childcontexts");
+		l.setText(Messages.BindingContextEditor_Subcontexts);
 		l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 		final TableViewer viewer = new TableViewer(parent);
@@ -176,7 +177,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		buttonComp.setLayout(gl);
 
 		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Up");
+		b.setText(Messages.ModelTooling_Common_Up);
 		b.setImage(getImage(b.getDisplay(), ARROW_UP));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
@@ -203,7 +204,7 @@ public void widgetSelected(SelectionEvent e) {
 		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Down");
+		b.setText(Messages.ModelTooling_Common_Down);
 		b.setImage(getImage(b.getDisplay(), ARROW_UP));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
@@ -230,7 +231,7 @@ public void widgetSelected(SelectionEvent e) {
 		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Add ...");
+		b.setText(Messages.ModelTooling_Common_AddEllipsis);
 		b.setImage(getImage(b.getDisplay(), ARROW_UP));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
@@ -249,7 +250,7 @@ public void widgetSelected(SelectionEvent e) {
 		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Remove ...");
+		b.setText(Messages.ModelTooling_Common_Remove);
 		b.setImage(getImage(b.getDisplay(), ARROW_UP));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 30c2ced40e..d49e28ca6b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -320,7 +320,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}

From 782d58b27a52c55fd22fcda2b44a9d5d58e6c6e1 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 17:29:57 +0000
Subject: [PATCH 0228/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * some nls stuff

---
 .../e4/tools/emf/ui/internal/Messages.java    | 21 ++++++++---------
 .../tools/emf/ui/internal/Messages.properties | 23 +++++++++----------
 .../component/CommandParameterEditor.java     | 14 +++++------
 .../common/component/ControlFactory.java      | 20 ++++++++--------
 .../common/component/KeyBindingEditor.java    |  8 +++----
 5 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index f75e67fa4d..d2dc730037 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -19,6 +19,7 @@ public class Messages extends NLS {
 	public static String ModelTooling_Common_Add;
 	public static String ModelTooling_Common_Remove;
 	public static String ModelTooling_Common_Id;
+	public static String ModelTooling_Common_RefId;
 	public static String ModelTooling_Common_FindEllipsis;
 
 	public static String ModelTooling_UIElement_ToBeRendered;
@@ -70,11 +71,9 @@ public class Messages extends NLS {
 	public static String DirectMenuItemEditor_Description;
 	public static String DirectMenuItemEditor_ClassURI;
 
-	public static String ControlFactory_BindingContexts;
-	public static String ControlFactory_Tags;
 	public static String ControlFactory_Key;
 	public static String ControlFactory_Value;
-	public static String ControlFactory_ContextVariables;
+	public static String ControlFactory_KeyValueShellTitle;
 
 	public static String DirectToolItemEditor_ClassURI;
 	public static String DirectToolItemEditor_Label;
@@ -107,8 +106,8 @@ public class Messages extends NLS {
 	public static String KeyBindingEditor_Sequence;
 	public static String KeyBindingEditor_Command;
 	public static String KeyBindingEditor_Parameters;
-	public static String KeyBindingEditor_ParametersKey;
-	public static String KeyBindingEditor_ParametersValue;
+	public static String KeyBindingEditor_SequenceNotComplete;
+	public static String KeyBindingEditor_SequenceEmpty;
 
 	public static String MenuEditor_Label;
 	public static String MenuEditor_Description;
@@ -141,9 +140,6 @@ public class Messages extends NLS {
 	public static String PartDescriptorEditor_Closeable;
 	public static String PartDescriptorEditor_Multiple;
 	public static String PartDescriptorEditor_Category;
-	public static String PartDescriptorEditor_PersitedState;
-	public static String PartDescriptorEditor_PersitedStateKey;
-	public static String PartDescriptorEditor_PersitedStateValue;
 	public static String PartDescriptorEditor_Variables;
 	public static String PartDescriptorEditor_Properties;
 	public static String PartDescriptorEditor_PropertiesKey;
@@ -159,9 +155,6 @@ public class Messages extends NLS {
 	public static String PartEditor_IconURI;
 	public static String PartEditor_ClassURI;
 	public static String PartEditor_Closeable;
-	public static String PartEditor_PersitedState;
-	public static String PartEditor_PersitedStateKey;
-	public static String PartEditor_PersitedStateValue;
 	public static String PartEditor_Menus;
 	public static String PartEditor_Handlers;
 	public static String PartEditor_ContainerData;
@@ -275,6 +268,12 @@ public class Messages extends NLS {
 	public static String BindingContextEditor_Description;
 	public static String BindingContextEditor_Subcontexts;
 
+	public static String CommandParameterEditor_TreeLabel;
+	public static String CommandParameterEditor_TreeLabelDescritpion;
+	public static String CommandParameterEditor_Name;
+	public static String CommandParameterEditor_TypeId;
+	public static String CommandParameterEditor_Optional;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 312307b903..d31f3bef29 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -14,6 +14,7 @@ ModelTooling_Common_AddEllipsis=Add ...
 ModelTooling_Common_Add=Add
 ModelTooling_Common_Remove=Remove
 ModelTooling_Common_Id=Id
+ModelTooling_Common_RefId=Reference-Id
 ModelTooling_Common_FindEllipsis=Find ...
 
 ModelTooling_UIElement_ToBeRendered=To Be Rendered
@@ -66,11 +67,9 @@ DirectMenuItemEditor_Label=DirectMenuItem
 DirectMenuItemEditor_Description=DirectMenuItem bla bla bla
 DirectMenuItemEditor_ClassURI=Class URI
 
-ControlFactory_BindingContexts=Binding Contexts
-ControlFactory_Tags=Tags
 ControlFactory_Key=Key
 ControlFactory_Value=Value
-ControlFactory_ContextVariables=Context Variables
+ControlFactory_KeyValueShellTitle=Key/Value Pair
 
 DirectToolItemEditor_ClassURI=Class URI
 DirectToolItemEditor_Label=Direct Tool Item
@@ -103,8 +102,8 @@ KeyBindingEditor_Description=Binding bla bla bla
 KeyBindingEditor_Sequence=Sequence
 KeyBindingEditor_Command=Command
 KeyBindingEditor_Parameters=Parameters
-KeyBindingEditor_ParametersKey=Key
-KeyBindingEditor_ParametersValue=Value
+KeyBindingEditor_SequenceNotComplete=Keysequence is not complete
+KeyBindingEditor_SequenceEmpty=Keysequence must not be empty!
 
 MenuEditor_Label=Menu
 MenuEditor_Description=Menu bla bla bla
@@ -137,9 +136,6 @@ PartDescriptorEditor_Dirtyable=Dirtyable
 PartDescriptorEditor_Closeable=Closeable
 PartDescriptorEditor_Multiple=Multiple
 PartDescriptorEditor_Category=Category
-PartDescriptorEditor_PersitedState=Persited State
-PartDescriptorEditor_PersitedStateKey=Key
-PartDescriptorEditor_PersitedStateValue=Value
 PartDescriptorEditor_Variables=Variables
 PartDescriptorEditor_Properties=Properties
 PartDescriptorEditor_PropertiesKey=Key
@@ -155,8 +151,6 @@ PartEditor_Tooltip=Tooltip
 PartEditor_IconURI=Icon URI
 PartEditor_ClassURI=Class URI
 PartEditor_Closeable=Closeable
-PartEditor_PersitedStateKey=Key
-PartEditor_PersitedStateValue=Value
 PartEditor_Menus=Menus
 PartEditor_Handlers=Handlers
 PartEditor_ContainerData=Container Data
@@ -219,7 +213,6 @@ VBindingTableEditor_LabelDescription=Description
 AddonsEditor_ClassURI=Class URI
 AddonsEditor_TreeLabel=Addon
 AddonsEditor_TreeLabelDescription=Addon Bla Bla Bla
-AddonsEditor_PersistedState=Persisted State
 AddonsEditor_Tags=Tags
 
 ContributionClassDialog_DialogMessage=Enter the name of the contributing class
@@ -269,4 +262,10 @@ BindingContextEditor_TreeLabel=Binding Context
 BindingContextEditor_TreeLabelDescription=Binding Context Bla Bla Bla
 BindingContextEditor_Name=Name
 BindingContextEditor_Description=Description
-BindingContextEditor_Subcontexts=Subcontexts
\ No newline at end of file
+BindingContextEditor_Subcontexts=Subcontexts
+
+CommandParameterEditor_TreeLabel=Command Parameter
+CommandParameterEditor_TreeLabelDescritpion=Command Parameter Bla Bla Bla
+CommandParameterEditor_Name=Name
+CommandParameterEditor_TypeId=TypeId
+CommandParameterEditor_Optional=Optional
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 8815123fe6..62bc14b19e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -17,6 +17,7 @@
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.commands.MCommandParameter;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
@@ -65,7 +66,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Command Parameter";
+		return Messages.CommandParameterEditor_TreeLabel;
 	}
 
 	@Override
@@ -81,7 +82,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Command Parameter Bla Bla Bla Bla";
+		return Messages.CommandParameterEditor_TreeLabelDescritpion;
 	}
 
 	@Override
@@ -130,13 +131,13 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return parent;
 		}
 
-		ControlFactory.createTextField(parent, "Id", master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, "Name", master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME));
-		ControlFactory.createTextField(parent, "TypeId", master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__TYPE_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.CommandParameterEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME));
+		ControlFactory.createTextField(parent, Messages.CommandParameterEditor_TypeId, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__TYPE_ID));
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Optional");
+			l.setText(Messages.CommandParameterEditor_Optional);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Button checkbox = new Button(parent, SWT.CHECK);
@@ -153,7 +154,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 783f3d3ac0..1f73258c13 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -92,7 +92,7 @@ public static void createMapProperties(Composite parent, final AbstractComponent
 		tableviewer.getControl().setLayoutData(gd);
 
 		TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-		column.getColumn().setText("Key");
+		column.getColumn().setText(Messages.ControlFactory_Key);
 		column.getColumn().setWidth(200);
 		column.setLabelProvider(new ColumnLabelProvider() {
 			@SuppressWarnings("unchecked")
@@ -105,7 +105,7 @@ public String getText(Object element) {
 
 		// FIXME How can we react upon changes in the Map-Value?
 		column = new TableViewerColumn(tableviewer, SWT.NONE);
-		column.getColumn().setText("Value");
+		column.getColumn().setText(Messages.ControlFactory_Value);
 		column.getColumn().setWidth(200);
 		column.setLabelProvider(new ColumnLabelProvider() {
 			@SuppressWarnings("unchecked")
@@ -170,20 +170,20 @@ public void widgetSelected(SelectionEvent e) {
 
 					@Override
 					protected Control createDialogArea(Composite parent) {
-						getShell().setText("Key/Value Pair");
+						getShell().setText(Messages.ControlFactory_KeyValueShellTitle);
 						Composite comp = (Composite) super.createDialogArea(parent);
 						Composite container = new Composite(comp, SWT.NONE);
 						container.setLayout(new GridLayout(2, false));
 						container.setLayoutData(new GridData(GridData.FILL_BOTH));
 
 						Label l = new Label(container, SWT.NONE);
-						l.setText("Key");
+						l.setText(Messages.ControlFactory_Key);
 
 						key = new Text(container, SWT.BORDER);
 						key.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 						l = new Label(container, SWT.NONE);
-						l.setText("Value");
+						l.setText(Messages.ControlFactory_Value);
 
 						value = new Text(container, SWT.BORDER);
 						value.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -246,7 +246,7 @@ public static void createFindImport(Composite parent, final AbstractComponentEdi
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		Label l = new Label(parent, SWT.NONE);
-		l.setText("Reference-Id");
+		l.setText(Messages.ModelTooling_Common_RefId);
 		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		Text t = new Text(parent, SWT.BORDER);
@@ -255,7 +255,7 @@ public static void createFindImport(Composite parent, final AbstractComponentEdi
 		context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(editor.getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(editor.getMaster()));
 
 		final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-		b.setText("Find ...");
+		b.setText(Messages.ModelTooling_Common_FindEllipsis);
 		b.setImage(editor.getImage(t.getDisplay(), AbstractComponentEditor.SEARCH_IMAGE));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -307,7 +307,7 @@ public String getText(Object element) {
 				if (element instanceof MUILabel) {
 					MUILabel label = (MUILabel) element;
 					if (!Util.isNullOrEmpty(label.getLabel())) {
-						return rv + " - " + label.getLabel().trim();
+						return rv + " - " + label.getLabel().trim(); //$NON-NLS-1$
 					}
 
 				}
@@ -315,11 +315,11 @@ public String getText(Object element) {
 				if (element instanceof MApplicationElement) {
 					MApplicationElement appEl = (MApplicationElement) element;
 					if (!Util.isNullOrEmpty(appEl.getElementId())) {
-						return rv + " - " + appEl.getElementId();
+						return rv + " - " + appEl.getElementId(); //$NON-NLS-1$
 					}
 				}
 
-				return rv + "[" + list.indexOf(element) + "]";
+				return rv + "[" + list.indexOf(element) + "]"; //$NON-NLS-1$//$NON-NLS-2$
 			}
 		});
 		viewer.setInput(list);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 27138578f4..da37c076bd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -332,18 +332,18 @@ public IStatus validate(Object value) {
 				try {
 					KeySequence keySequence = KeySequence.getInstance(value.toString());
 					if (!keySequence.isComplete()) {
-						return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", "Keysequence is not complete");
+						return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", Messages.KeyBindingEditor_SequenceNotComplete); //$NON-NLS-1$
 					}
 					if (keySequence.isEmpty()) {
-						return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", "Keysequence must not be empty!");
+						return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", Messages.KeyBindingEditor_SequenceEmpty); //$NON-NLS-1$
 					}
 					return Status.OK_STATUS;
 				} catch (Exception e) {
-					return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", e.getMessage(), e);
+					return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", e.getMessage(), e); //$NON-NLS-1$
 				}
 			}
 
-			return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", "Keysequence must not be empty!");
+			return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", Messages.KeyBindingEditor_SequenceEmpty); //$NON-NLS-1$
 		}
 	}
 }

From 61e680565cae471cc0a32ab150334d34ae899efa Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 17:50:41 +0000
Subject: [PATCH 0229/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * some nls stuff

---
 .../src/org/eclipse/e4/tools/emf/ui/internal/Messages.java  | 4 ++++
 .../eclipse/e4/tools/emf/ui/internal/Messages.properties    | 4 ++++
 .../internal/common/component/MenuContributionEditor.java   | 6 +++---
 .../tools/emf/ui/internal/common/component/MenuEditor.java  | 2 +-
 .../emf/ui/internal/common/component/MenuItemEditor.java    | 6 +++---
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index d2dc730037..01d3f75393 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -127,6 +127,8 @@ public class Messages extends NLS {
 	public static String MenuItemEditor_Tooltip;
 	public static String MenuItemEditor_IconURI;
 	public static String MenuEditor_MainMenu;
+	public static String MenuItemEditor_Enabled;
+	public static String MenuItemEditor_Selected;
 
 	public static String MenuSeparatorEditor_Label;
 
@@ -232,6 +234,8 @@ public class Messages extends NLS {
 	public static String MenuContributionEditor_DirectMenuItem;
 	public static String MenuContributionEditor_ParentId;
 	public static String MenuContributionEditor_Position;
+	public static String MenuContributionEditor_TreeLabel;
+	public static String MenuContributionEditor_TreeLabelDescription;
 
 	public static String ModelFragmentsEditor_ModelFragments;
 	public static String ModelFragmentsEditor_Label;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index d31f3bef29..263f901b8b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -123,6 +123,8 @@ MenuItemEditor_Type=Type
 MenuItemEditor_Label=Label
 MenuItemEditor_Tooltip=Tooltip
 MenuItemEditor_IconURI=Icon URI
+MenuItemEditor_Enabled=Enabled
+MenuItemEditor_Selected=Selected
 
 MenuSeparatorEditor_Label=Separator
 
@@ -229,6 +231,8 @@ MenuContributionEditor_Menu=Menu
 MenuContributionEditor_DirectMenuItem=Direct MenuItem
 MenuContributionEditor_ParentId=Parent-Id
 MenuContributionEditor_Position=Position
+MenuContributionEditor_TreeLabel=Menu Contribution
+MenuContributionEditor_TreeLabelDescription=Menu Contribution Bla Bla Bla Bla
 
 ModelFragmentsEditor_ModelFragments=Model Fragements
 ModelFragmentsEditor_Label=Model Fragments
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 1fdccca0c8..6b2f8c44cc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -123,7 +123,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Menu Contribution";
+		return Messages.MenuContributionEditor_TreeLabel;
 	}
 
 	@Override
@@ -133,7 +133,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Menu Contribution Bla Bla Bla Bla";
+		return Messages.MenuContributionEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -371,7 +371,7 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
 		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
-		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index cce027be2d..e6fe4f9968 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -399,7 +399,7 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
 		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
-		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index d0a8ce0f69..b2e23a046d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -242,7 +242,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Enabled");
+			l.setText(Messages.MenuItemEditor_Enabled);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Button b = new Button(parent, SWT.CHECK);
@@ -252,7 +252,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Selected");
+			l.setText(Messages.MenuItemEditor_Selected);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Button b = new Button(parent, SWT.CHECK);
@@ -283,7 +283,7 @@ public Object convert(Object fromObject) {
 		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
 		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
-		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}

From 6a53a4dabf989aa02f5330722874203806c59b95 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 17 Jul 2010 18:05:57 +0000
Subject: [PATCH 0230/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * some nls stuff

---
 .../e4/tools/emf/ui/internal/Messages.java     |  8 ++++++++
 .../tools/emf/ui/internal/Messages.properties  | 10 +++++++++-
 .../common/component/ModelFragmentsEditor.java | 12 ++++++------
 .../common/component/ParameterEditor.java      | 12 ++++++------
 .../common/component/PartDescriptorEditor.java |  2 +-
 .../internal/common/component/PartEditor.java  | 18 +++++++++---------
 6 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 01d3f75393..86ecb3410c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -26,6 +26,7 @@ public class Messages extends NLS {
 	public static String ModelTooling_UIElement_Visible;
 
 	public static String ModelTooling_Context_Variables;
+	public static String ModelTooling_Context_Properties;
 
 	public static String ModelTooling_ApplicationElement_Tags;
 	public static String ModelTooling_Contribution_PersistedState;
@@ -161,6 +162,7 @@ public class Messages extends NLS {
 	public static String PartEditor_Handlers;
 	public static String PartEditor_ContainerData;
 	public static String PartEditor_ToolBar;
+	public static String PartEditor_BindingContexts;
 
 	public static String PartSashContainerEditor_Label;
 	public static String PartSashContainerEditor_Description;
@@ -240,6 +242,7 @@ public class Messages extends NLS {
 	public static String ModelFragmentsEditor_ModelFragments;
 	public static String ModelFragmentsEditor_Label;
 	public static String ModelFragmentsEditor_Description;
+	public static String ModelFragmentsEditor_Imports;
 
 	public static String StringModelFragment_Label;
 	public static String StringModelFragment_Description;
@@ -278,6 +281,11 @@ public class Messages extends NLS {
 	public static String CommandParameterEditor_TypeId;
 	public static String CommandParameterEditor_Optional;
 
+	public static String ParameterEditor_TreeLabel;
+	public static String ParameterEditor_TreeLabelDescription;
+	public static String ParameterEditor_Name;
+	public static String ParameterEditor_Value;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 263f901b8b..8e0d3568da 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -21,6 +21,7 @@ ModelTooling_UIElement_ToBeRendered=To Be Rendered
 ModelTooling_UIElement_Visible=Visible
 
 ModelTooling_Context_Variables=Variables
+ModelTooling_Context_Properties=Context Properties
 
 ModelTooling_ApplicationElement_Tags=Tags
 
@@ -157,6 +158,7 @@ PartEditor_Menus=Menus
 PartEditor_Handlers=Handlers
 PartEditor_ContainerData=Container Data
 PartEditor_ToolBar=ToolBar
+PartEditor_BindingContexts=Binding Contexts
 
 PartSashContainerEditor_Label=Sash
 PartSashContainerEditor_Description=Sash bla bla bla
@@ -237,6 +239,7 @@ MenuContributionEditor_TreeLabelDescription=Menu Contribution Bla Bla Bla Bla
 ModelFragmentsEditor_ModelFragments=Model Fragements
 ModelFragmentsEditor_Label=Model Fragments
 ModelFragmentsEditor_Description=Description
+ModelFragmentsEditor_Imports=Imports
 
 StringModelFragment_Label=String Model Fragment
 StringModelFragment_Description=String Model Fragment Bla Bla Bla
@@ -272,4 +275,9 @@ CommandParameterEditor_TreeLabel=Command Parameter
 CommandParameterEditor_TreeLabelDescritpion=Command Parameter Bla Bla Bla
 CommandParameterEditor_Name=Name
 CommandParameterEditor_TypeId=TypeId
-CommandParameterEditor_Optional=Optional
\ No newline at end of file
+CommandParameterEditor_Optional=Optional
+
+ParameterEditor_TreeLabel=Parameter
+ParameterEditor_TreeLabelDescription=Parameter Bla Bla Bla Bla
+ParameterEditor_Name=Name
+ParameterEditor_Value=Value
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index b937f16f45..77fcc1a628 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -112,7 +112,7 @@ private Composite createForm(Composite parent) {
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Imports");
+			l.setText(Messages.ModelFragmentsEditor_Imports);
 			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			final TableViewer viewer = new TableViewer(parent);
@@ -135,7 +135,7 @@ private Composite createForm(Composite parent) {
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -162,7 +162,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -233,7 +233,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -387,13 +387,13 @@ public void addClasses(EPackage ePackage, List<FeatureClass> list) {
 	@Override
 	public IObservableList getChildList(Object element) {
 		WritableList list = new WritableList();
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MODEL_IMPORTS, MODEL_FRAGMENTS__IMPORTS, element, "Imports") {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MODEL_IMPORTS, MODEL_FRAGMENTS__IMPORTS, element, Messages.ModelFragmentsEditor_Imports) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
 			}
 		});
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MODEL_FRAGEMENTS, MODEL_FRAGMENTS__FRAGMENTS, element, "Fragments") {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MODEL_FRAGEMENTS, MODEL_FRAGMENTS__FRAGMENTS, element, Messages.ModelFragmentsEditor_ModelFragments) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index d48cf40438..aa6364c9a9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -17,6 +17,7 @@
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
@@ -61,7 +62,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Parameter";
+		return Messages.ParameterEditor_TreeLabel;
 	}
 
 	@Override
@@ -77,7 +78,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Parameter Bla Bla Bla Bla";
+		return Messages.ParameterEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -126,16 +127,15 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return parent;
 		}
 
-		ControlFactory.createTextField(parent, "Id", master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, "Name", master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__NAME));
-		ControlFactory.createTextField(parent, "Value", master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__VALUE));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ParameterEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__NAME));
+		ControlFactory.createTextField(parent, Messages.ParameterEditor_Value, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__VALUE));
 
 		return parent;
 	}
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index c2947039d3..b578fea993 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -342,7 +342,7 @@ public void widgetSelected(SelectionEvent e) {
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CATEGORY).observeDetail(master));
 		}
 
-		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 251c2aefdb..f229becc7a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -255,7 +255,7 @@ public void widgetSelected(SelectionEvent e) {
 			final IContributionClassCreator c = getEditor().getContributionCreator(BasicPackageImpl.Literals.PART);
 			if (project != null && c != null) {
 				final Link l = new Link(parent, SWT.NONE);
-				l.setText("<A>" + Messages.PartEditor_ClassURI + "</A>");
+				l.setText("<A>" + Messages.PartEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
 				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 				l.addSelectionListener(new SelectionAdapter() {
 					@Override
@@ -338,14 +338,14 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		// ------------------------------------------------------------
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
-
-		ControlFactory.createStringListWidget(parent, this, "Binding Contexts", CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, this, "Persisted State", ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, this, "Context Properties", UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, "Variables", UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+
+		ControlFactory.createStringListWidget(parent, this, Messages.PartEditor_BindingContexts, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}

From d102c89c0348bf5f9bbe77ae928e9df1d16b548a Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 18 Jul 2010 10:12:09 +0000
Subject: [PATCH 0231/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * some nls stuff

---
 .../internal/common/component/PartSashContainerEditor.java | 6 +++---
 .../emf/ui/internal/common/component/PartStackEditor.java  | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index a41a870e12..4c04323ab2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -352,10 +352,10 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 700392d180..4444a5d2b4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -250,6 +250,7 @@ public void widgetSelected(SelectionEvent e) {
 						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
+							@SuppressWarnings("unchecked")
 							MElementContainer<MUIElement> container = (MElementContainer<MUIElement>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
 							if (idx < container.getChildren().size()) {
@@ -312,10 +313,10 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}

From ab736896018e47ca7449f5e1512edc7a8dad9262 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 18 Jul 2010 10:21:01 +0000
Subject: [PATCH 0232/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * some nls stuff

---
 .../src/org/eclipse/e4/tools/emf/ui/internal/Messages.java  | 4 ++++
 .../eclipse/e4/tools/emf/ui/internal/Messages.properties    | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 86ecb3410c..06e893293f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -194,6 +194,7 @@ public class Messages extends NLS {
 
 	public static String PlaceholderEditor_Label;
 	public static String PlaceholderEditor_Descriptor;
+	public static String PlaceholderEditor_Reference;
 
 	public static String ToolBarEditor_Label;
 	public static String ToolBarEditor_Description;
@@ -286,6 +287,9 @@ public class Messages extends NLS {
 	public static String ParameterEditor_Name;
 	public static String ParameterEditor_Value;
 
+	public static String PopupMenuEditor_TreeLabel;
+	public static String PopupMenuEditor_TreeLabelDescription;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 8e0d3568da..a18744be25 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -191,6 +191,7 @@ PerspectiveStackEditor_Perspectives=Perspectives
 
 PlaceholderEditor_Label=Placeholder
 PlaceholderEditor_Descriptor=Placeholder Bla Bla Bla Bla
+PlaceholderEditor_Reference=Reference
 
 ToolBarEditor_Label=Toolbar
 ToolBarEditor_Description=Toolbar bla bla bla
@@ -280,4 +281,7 @@ CommandParameterEditor_Optional=Optional
 ParameterEditor_TreeLabel=Parameter
 ParameterEditor_TreeLabelDescription=Parameter Bla Bla Bla Bla
 ParameterEditor_Name=Name
-ParameterEditor_Value=Value
\ No newline at end of file
+ParameterEditor_Value=Value
+
+PopupMenuEditor_TreeLabel=Popup Menu
+PopupMenuEditor_TreeLabelDescription=Popup Menu Bla Bla Bla Bla
\ No newline at end of file

From 8c0264e2825a4dc7a25ab515036dc53ae04b00f3 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 18 Jul 2010 10:23:53 +0000
Subject: [PATCH 0233/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * some nls stuff

---
 .../eclipse/e4/tools/emf/ui/internal/Messages.java    |  5 +++++
 .../e4/tools/emf/ui/internal/Messages.properties      |  7 ++++++-
 .../internal/common/component/PerspectiveEditor.java  | 10 +++++-----
 .../common/component/PerspectiveStackEditor.java      |  6 +++---
 .../internal/common/component/PlaceholderEditor.java  | 11 ++++++-----
 .../ui/internal/common/component/PopupMenuEditor.java |  9 +++++----
 .../internal/common/component/RenderedMenuEditor.java |  3 ++-
 .../internal/common/component/RenderedMenuItem.java   |  7 +++----
 8 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 06e893293f..10a1bc77f5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -290,6 +290,11 @@ public class Messages extends NLS {
 	public static String PopupMenuEditor_TreeLabel;
 	public static String PopupMenuEditor_TreeLabelDescription;
 
+	public static String RenderedMenuEditor_TreeLabel;
+
+	public static String RenderedMenuItem_TreeLabel;
+	public static String RenderedMenuItem_TreeLabelDescription;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index a18744be25..3cfa66c400 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -284,4 +284,9 @@ ParameterEditor_Name=Name
 ParameterEditor_Value=Value
 
 PopupMenuEditor_TreeLabel=Popup Menu
-PopupMenuEditor_TreeLabelDescription=Popup Menu Bla Bla Bla Bla
\ No newline at end of file
+PopupMenuEditor_TreeLabelDescription=Popup Menu Bla Bla Bla Bla
+
+RenderedMenuEditor_TreeLabel=Rendered Menu
+
+RenderedMenuItem_TreeLabel=Rendered MenuItem
+RenderedMenuItem_TreeLabelDescription=Rendered MenuItem Bla Bla Bla Bla
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 8d2ba2e6d9..f63ecb0918 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -376,12 +376,12 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createMapProperties(parent, this, "Context Properties", UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, "Variables", UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 20eaeceacf..73446eda9b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -278,10 +278,10 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 4a7b462908..e561d2d2b6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -176,7 +176,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Reference");
+			l.setText(Messages.PlaceholderEditor_Reference);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
@@ -200,11 +200,11 @@ public Object convert(Object fromObject) {
 						if (o instanceof MUILabel) {
 							MUILabel label = (MUILabel) o;
 							if (!Util.isNullOrEmpty(label.getLabel())) {
-								return o.eClass().getName() + " - " + label.getLabel();
+								return o.eClass().getName() + " - " + label.getLabel(); //$NON-NLS-1$
 							}
 						}
 
-						return o.eClass().getName() + " - " + ((MUIElement) fromObject).getElementId();
+						return o.eClass().getName() + " - " + ((MUIElement) fromObject).getElementId(); //$NON-NLS-1$
 					}
 					return null;
 				}
@@ -223,8 +223,9 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 		}
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
index 9dc6bbf464..40607cac27 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
@@ -12,6 +12,7 @@
 
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -28,8 +29,8 @@ public PopupMenuEditor(EditingDomain editingDomain, IProject project, ModelEdito
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean rootMenu, boolean isImport) {
 		Composite comp = super.createForm(parent, context, master, rootMenu, isImport);
 		if (!isImport) {
-			ControlFactory.createMapProperties(parent, this, "Context Properties", UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
-			ControlFactory.createStringListWidget(comp, this, "Variables", UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+			ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+			ControlFactory.createStringListWidget(comp, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		}
 
 		return comp;
@@ -37,11 +38,11 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 	@Override
 	public String getLabel(Object element) {
-		return "Popup Menu";
+		return Messages.PopupMenuEditor_TreeLabel;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "Popup Menu Bla Bla Bla Bla";
+		return Messages.PopupMenuEditor_TreeLabelDescription;
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java
index fdabe40bd3..edbf6030e4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java
@@ -11,6 +11,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.emf.edit.domain.EditingDomain;
 
@@ -22,6 +23,6 @@ public RenderedMenuEditor(EditingDomain editingDomain, IProject project, ModelEd
 
 	@Override
 	public String getLabel(Object element) {
-		return "Rendered Menu";
+		return Messages.RenderedMenuEditor_TreeLabel;
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java
index aeb169ad9b..d62c567092 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java
@@ -12,6 +12,7 @@
 
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -25,18 +26,16 @@ public RenderedMenuItem(EditingDomain editingDomain, ModelEditor editor, IProjec
 
 	@Override
 	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		// TODO Auto-generated method stub
 
 	}
 
 	@Override
 	public String getLabel(Object element) {
-		return "Rendered MenuItem";
+		return Messages.RenderedMenuItem_TreeLabel;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "Rendered MenuItem Bla Bla Bla Bla";
+		return Messages.RenderedMenuItem_TreeLabelDescription;
 	}
-
 }

From 1d3716c5ce2de9a6bae156c240d57d0e4001032e Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 18 Jul 2010 11:05:44 +0000
Subject: [PATCH 0234/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * some nls stuff

---
 .../e4/tools/emf/ui/internal/Messages.java    | 44 +++++++++++++++++
 .../tools/emf/ui/internal/Messages.properties | 46 +++++++++++++++++-
 .../emf/ui/internal/common/ModelEditor.java   |  4 +-
 .../component/RenderedToolBarEditor.java      |  3 +-
 .../component/ToolBarContributionEditor.java  | 15 +++---
 .../common/component/ToolControlEditor.java   | 10 ++--
 .../common/component/ToolItemEditor.java      | 34 +++++---------
 .../common/component/TrimBarEditor.java       | 23 +++++----
 .../component/TrimContributionEditor.java     | 39 +++++----------
 .../common/component/TrimmedWindowEditor.java |  5 +-
 .../common/component/WindowEditor.java        | 47 +++++++++----------
 11 files changed, 168 insertions(+), 102 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 10a1bc77f5..c73dc5efed 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -295,6 +295,50 @@ public class Messages extends NLS {
 	public static String RenderedMenuItem_TreeLabel;
 	public static String RenderedMenuItem_TreeLabelDescription;
 
+	public static String RenderedToolBarEditor_TreeLabel;
+
+	public static String ToolBarContributionEditor_TreeLabel;
+	public static String ToolBarContributionEditor_TreeLabelDescription;
+
+	public static String ToolItemEditor_Type;
+	public static String ToolItemEditor_Label;
+	public static String ToolItemEditor_ToolTip;
+	public static String ToolItemEditor_IconURI;
+	public static String ToolItemEditor_Enabled;
+	public static String ToolItemEditor_Selected;
+
+	public static String TrimBarEditor_TreeLabel;
+	public static String TrimBarEditor_TreeLabelDescription;
+	public static String TrimBarEditor_Side;
+	public static String TrimBarEditor_Controls;
+
+	public static String TrimContributionEditor_TreeLabel;
+	public static String TrimContributionEditor_TreeLabelDescription;
+	public static String TrimContributionEditor_ParentId;
+	public static String TrimContributionEditor_Position;
+	public static String TrimContributionEditor_Controls;
+
+	public static String TrimmedWindowEditor_TrimBars;
+	public static String TrimmedWindowEditor_TreeLabel;
+
+	public static String WindowEditor_AddMainMenu;
+	public static String WindowEditor_TreeLabel;
+	public static String WindowEditor_TreeLabelDescription;
+	public static String WindowEditor_X;
+	public static String WindowEditor_Y;
+	public static String WindowEditor_Width;
+	public static String WindowEditor_Height;
+	public static String WindowEditor_Label;
+	public static String WindowEditor_Tooltip;
+	public static String WindowEditor_IconURI;
+	public static String WindowEditor_MainMenu;
+	public static String WindowEditor_SelectedElement;
+	public static String WindowEditor_BindingContexts;
+	public static String WindowEditor_Handlers;
+	public static String WindowEditor_Windows;
+	public static String WindowEditor_Controls;
+	public static String WindowEditor_SharedElements;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 3cfa66c400..924f9d57bd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -289,4 +289,48 @@ PopupMenuEditor_TreeLabelDescription=Popup Menu Bla Bla Bla Bla
 RenderedMenuEditor_TreeLabel=Rendered Menu
 
 RenderedMenuItem_TreeLabel=Rendered MenuItem
-RenderedMenuItem_TreeLabelDescription=Rendered MenuItem Bla Bla Bla Bla
\ No newline at end of file
+RenderedMenuItem_TreeLabelDescription=Rendered MenuItem Bla Bla Bla Bla
+
+RenderedToolBarEditor_TreeLabel=Rendered ToolBar
+
+ToolBarContributionEditor_TreeLabel=ToolBar Contribution
+ToolBarContributionEditor_TreeLabelDescription=ToolBar Contribution Bla Bla Bla Bla
+
+ToolItemEditor_Type=Type
+ToolItemEditor_Label=Label
+ToolItemEditor_ToolTip=Tooltip
+ToolItemEditor_IconURI=Icon URI
+ToolItemEditor_Enabled=Enabled
+ToolItemEditor_Selected=Selected
+
+TrimBarEditor_TreeLabel=Window Trim
+TrimBarEditor_TreeLabelDescription=Window Trim bla bla bla
+TrimBarEditor_Side=Side
+TrimBarEditor_Controls=Controls
+
+TrimContributionEditor_TreeLabel=Trim Contribution
+TrimContributionEditor_TreeLabelDescription=Trim Contribution Bla Bla Bla Bla
+TrimContributionEditor_ParentId=Parent Id
+TrimContributionEditor_Position=Position
+TrimContributionEditor_Controls=Controls
+
+TrimmedWindowEditor_TrimBars=TrimBars
+TrimmedWindowEditor_TreeLabel=Trimmed Window
+
+WindowEditor_AddMainMenu=Add Main Menu
+WindowEditor_TreeLabel=Window
+WindowEditor_TreeLabelDescription=Window bla bla bla
+WindowEditor_X=X
+WindowEditor_Y=Y
+WindowEditor_Width=Width
+WindowEditor_Height=Height
+WindowEditor_Label=Label
+WindowEditor_Tooltip=Tooltip
+WindowEditor_IconURI=Icon URI
+WindowEditor_MainMenu=Main Menu
+WindowEditor_SelectedElement=Selected Element
+WindowEditor_BindingContexts=Binding Contexts
+WindowEditor_Handlers=Handlers
+WindowEditor_Windows=Windows
+WindowEditor_Controls=Controls
+WindowEditor_SharedElements=Shared Elements
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 1474e5c633..c26df49c18 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -584,8 +584,8 @@ private void registerDefaultEditors() {
 		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this, project));
 		registerEditor(MenuPackageImpl.Literals.RENDERED_MENU_ITEM, new RenderedMenuItem(modelProvider.getEditingDomain(), this, project));
 		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION, new MenuContributionEditor(modelProvider.getEditingDomain(), project, this));
-		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION, new ToolBarContributionEditor(modelProvider.getEditingDomain(), project, this));
-		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION, new TrimContributionEditor(modelProvider.getEditingDomain(), project, this));
+		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION, new ToolBarContributionEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION, new TrimContributionEditor(modelProvider.getEditingDomain(), this));
 
 		registerEditor(BasicPackageImpl.Literals.PART, new PartEditor(modelProvider.getEditingDomain(), this, project));
 		registerEditor(BasicPackageImpl.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain(), this, project));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java
index 4cc0c20648..9618f31d56 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.emf.edit.domain.EditingDomain;
 
@@ -21,6 +22,6 @@ public RenderedToolBarEditor(EditingDomain editingDomain, ModelEditor editor) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Rendered ToolBar";
+		return Messages.RenderedToolBarEditor_TreeLabel;
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 4d0a999e9e..d4f709e616 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -16,7 +16,6 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -70,7 +69,6 @@
 public class ToolBarContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private IProject project;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
@@ -87,9 +85,8 @@ public Struct(String label, EClass eClass, boolean separator) {
 		}
 	}
 
-	public ToolBarContributionEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
+	public ToolBarContributionEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
-		this.project = project;
 	}
 
 	@Override
@@ -118,7 +115,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "ToolBar Contribution";
+		return Messages.ToolBarContributionEditor_TreeLabel;
 	}
 
 	@Override
@@ -128,7 +125,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "ToolBar Contribution Bla Bla Bla Bla";
+		return Messages.ToolBarContributionEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -363,10 +360,10 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 04b600aa13..7fca52fe89 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -168,7 +168,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
-			b.setText("Find ...");
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -178,11 +178,11 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createMapProperties(parent, this, "Persisted State", ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 94c5e62680..3b893b6162 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -21,6 +21,7 @@
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ToolItemIconDialogEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -108,22 +109,14 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return parent;
 		}
 
-		Label l = new Label(parent, SWT.NONE);
-		l.setText("Id");
-		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-		Text t = new Text(parent, SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		t.setLayoutData(gd);
-		context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		createFormSubTypeForm(parent, context, master);
 
 		return parent;
 	}
 
-	private void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, final WritableValue master) {
+	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, final WritableValue master) {
 		IValueProperty textProp = WidgetProperties.text(SWT.Modify);
 		IWidgetValueProperty checkProp = WidgetProperties.selection();
 		IWidgetValueProperty enabled = WidgetProperties.enabled();
@@ -131,7 +124,7 @@ private void createFormSubTypeForm(Composite parent, EMFDataBindingContext conte
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Type");
+			l.setText(Messages.ToolItemEditor_Type);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			ComboViewer viewer = new ComboViewer(parent);
@@ -147,7 +140,7 @@ private void createFormSubTypeForm(Composite parent, EMFDataBindingContext conte
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Label");
+			l.setText(Messages.ToolItemEditor_Label);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
@@ -160,7 +153,7 @@ private void createFormSubTypeForm(Composite parent, EMFDataBindingContext conte
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Tooltip");
+			l.setText(Messages.ToolItemEditor_ToolTip);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
@@ -173,7 +166,7 @@ private void createFormSubTypeForm(Composite parent, EMFDataBindingContext conte
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Icon URI");
+			l.setText(Messages.ToolItemEditor_IconURI);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
@@ -194,7 +187,7 @@ protected URI getImageURI() {
 			};
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText("Find ...");
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -208,7 +201,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Enabled");
+			l.setText(Messages.ToolItemEditor_Enabled);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Button b = new Button(parent, SWT.CHECK);
@@ -218,7 +211,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Selected");
+			l.setText(Messages.ToolItemEditor_Selected);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Button b = new Button(parent, SWT.CHECK);
@@ -248,10 +241,10 @@ public Object convert(Object fromObject) {
 
 		createSubTypeFormElements(parent, context, master);
 
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 	}
 
 	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, WritableValue master) {
@@ -260,7 +253,6 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 5040098700..304c84829c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -20,6 +20,7 @@
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -104,12 +105,12 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Window Trim";
+		return Messages.TrimBarEditor_TreeLabel;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "Window Trim bla bla bla";
+		return Messages.TrimBarEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -161,7 +162,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Id");
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
@@ -174,7 +175,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Side");
+			l.setText(Messages.TrimBarEditor_Side);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			ComboViewer viewer = new ComboViewer(parent);
@@ -190,7 +191,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Controls");
+			l.setText(Messages.TrimBarEditor_Controls);
 			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			final TableViewer viewer = new TableViewer(parent);
@@ -213,7 +214,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -237,7 +238,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -288,7 +289,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -306,8 +307,10 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 19d3e2c1db..584f000ec1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -16,7 +16,6 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -65,26 +64,12 @@
 public class TrimContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private IProject project;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
 
-	private static class Struct {
-		private final String label;
-		private final EClass eClass;
-		private final boolean separator;
-
-		public Struct(String label, EClass eClass, boolean separator) {
-			this.label = label;
-			this.eClass = eClass;
-			this.separator = separator;
-		}
-	}
-
-	public TrimContributionEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
+	public TrimContributionEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
-		this.project = project;
 	}
 
 	@Override
@@ -113,7 +98,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Trim Contribution";
+		return Messages.TrimContributionEditor_TreeLabel;
 	}
 
 	@Override
@@ -123,7 +108,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Trim Contribution Bla Bla Bla Bla";
+		return Messages.TrimContributionEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -188,7 +173,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuContributionEditor_ParentId);
+			l.setText(Messages.TrimContributionEditor_ParentId);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
@@ -201,7 +186,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuContributionEditor_Position);
+			l.setText(Messages.TrimContributionEditor_Position);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
@@ -214,7 +199,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Controls");
+			l.setText(Messages.TrimContributionEditor_Controls);
 			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			final TableViewer viewer = new TableViewer(parent);
@@ -237,7 +222,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -261,7 +246,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -312,7 +297,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -330,10 +315,10 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
index dcf63e635c..b4fa9948df 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
@@ -14,6 +14,7 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
@@ -35,7 +36,7 @@ public IObservableList getChildList(Object element) {
 			return list;
 		}
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_TRIMMED_WINDOW_TRIMS, TRIMMED_WINDOW__TRIM_BARS, element, "TrimBars") {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_TRIMMED_WINDOW_TRIMS, TRIMMED_WINDOW__TRIM_BARS, element, Messages.TrimmedWindowEditor_TrimBars) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -48,6 +49,6 @@ protected boolean accepted(Object o) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Trimmed Window";
+		return Messages.TrimmedWindowEditor_TreeLabel;
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 5bc5a3d190..c1d9ae441c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -26,6 +26,7 @@
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.WindowIconDialogEditor;
@@ -66,7 +67,6 @@
 public class WindowEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 	private IProject project;
 
@@ -79,12 +79,11 @@ public class WindowEditor extends AbstractComponentEditor {
 	private Action addMainMenu;
 	private Button createRemoveMainMenu;
 	private EStackLayout stackLayout;
-	private Image tbrImage;
 
 	public WindowEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain, editor);
 		this.project = project;
-		addMainMenu = new Action("Add Main Menu") {
+		addMainMenu = new Action(Messages.WindowEditor_AddMainMenu) {
 			@Override
 			public void run() {
 				addMenu();
@@ -118,12 +117,12 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Window";
+		return Messages.WindowEditor_TreeLabel;
 	}
 
 	@Override
 	public String getDescription(Object element) {
-		return "Window bla bla bla";
+		return Messages.WindowEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -180,7 +179,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Id");
+			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
@@ -193,7 +192,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("X");
+			l.setText(Messages.WindowEditor_X);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
@@ -206,7 +205,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Y");
+			l.setText(Messages.WindowEditor_Y);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
@@ -219,7 +218,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Width");
+			l.setText(Messages.WindowEditor_Width);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
@@ -232,7 +231,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Height");
+			l.setText(Messages.WindowEditor_Height);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
@@ -245,7 +244,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Label");
+			l.setText(Messages.WindowEditor_Label);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
@@ -258,7 +257,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Tooltip");
+			l.setText(Messages.WindowEditor_Tooltip);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
@@ -271,7 +270,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Icon URI");
+			l.setText(Messages.WindowEditor_IconURI);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
@@ -292,7 +291,7 @@ protected URI getImageURI() {
 			};
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText("Find ...");
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -306,7 +305,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Main Menu");
+			l.setText(Messages.WindowEditor_MainMenu);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			createRemoveMainMenu = new Button(parent, SWT.CHECK);
@@ -327,11 +326,11 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
 		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
-		ControlFactory.createSelectedElement(parent, this, context, "Selected Element");
-		ControlFactory.createStringListWidget(parent, this, "Binding Contexts", CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, this, "Context Properties", UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, "Variables", UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, "Tags", ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createSelectedElement(parent, this, context, Messages.WindowEditor_SelectedElement);
+		ControlFactory.createStringListWidget(parent, this, Messages.WindowEditor_BindingContexts, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
@@ -358,7 +357,7 @@ public IObservableList getChildList(final Object element) {
 			return list;
 		}
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, "Handlers") {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.WindowEditor_Handlers) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -367,7 +366,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOWS, WINDOW__WINDOWS, element, "Windows") {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOWS, WINDOW__WINDOWS, element, Messages.WindowEditor_Windows) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -376,7 +375,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_CONTROLS, ELEMENT_CONTAINER__CHILDREN, element, "Controls") {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_CONTROLS, ELEMENT_CONTAINER__CHILDREN, element, Messages.WindowEditor_Controls) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -385,7 +384,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_SHARED_ELEMENTS, SHARED_ELEMENTS, element, "Shared Elements") {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_SHARED_ELEMENTS, SHARED_ELEMENTS, element, Messages.WindowEditor_SharedElements) {
 			protected boolean accepted(Object o) {
 				return true;
 			}

From 6c0611f468d39da97c3d7d7ab96777a88c258be2 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 18 Jul 2010 11:47:59 +0000
Subject: [PATCH 0235/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * some nls stuff

---
 .../e4/tools/emf/ui/internal/Messages.java    | 22 ++++++++
 .../tools/emf/ui/internal/Messages.properties | 24 ++++++++-
 .../common/commands/AddAddonCommand.java      | 30 -----------
 .../common/commands/MoveAddonCommand.java     | 20 --------
 .../common/commands/RemoveAddonCommand.java   | 34 -------------
 .../component/virtual/VApplicationAddons.java | 51 ++++++++++++-------
 .../virtual/VApplicationCategoriesEditor.java | 16 +++---
 .../virtual/VBindingTableEditor.java          | 34 +++----------
 .../component/virtual/VCommandEditor.java     | 43 ++++------------
 .../component/virtual/VHandlerEditor.java     | 51 ++++---------------
 .../virtual/VMenuContributionsEditor.java     | 51 ++++---------------
 11 files changed, 122 insertions(+), 254 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/AddAddonCommand.java
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/MoveAddonCommand.java
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/RemoveAddonCommand.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index c73dc5efed..efc285d57d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -217,6 +217,7 @@ public class Messages extends NLS {
 	public static String VBindingTableEditor_Contexts;
 	public static String VBindingTableEditor_Name;
 	public static String VBindingTableEditor_LabelDescription;
+	public static String VBindingTableEditor_BindingTables;
 
 	public static String AddonsEditor_ClassURI;
 	public static String AddonsEditor_TreeLabel;
@@ -339,6 +340,27 @@ public class Messages extends NLS {
 	public static String WindowEditor_Controls;
 	public static String WindowEditor_SharedElements;
 
+	public static String VApplicationAddons_AddAddon;
+	public static String VApplicationAddons_TreeLabel;
+	public static String VApplicationAddons_TreeLabelDescription;
+	public static String VApplicationAddons_Commands;
+
+	public static String VApplicationCategoriesEditor_TreeLabel;
+	public static String VApplicationCategoriesEditor_TreeLabelDescription;
+	public static String VApplicationCategoriesEditor_Categories;
+
+	public static String VCommandEditor_TreeLabel;
+	public static String VCommandEditor_TreeLabelDescription;
+	public static String VCommandEditor_Commands;
+
+	public static String VHandlerEditor_TreeLabel;
+	public static String VHandlerEditor_TreeLabelDescription;
+	public static String VHandlerEditor_Handlers;
+
+	public static String VMenuContributionsEditor_TreeLabel;
+	public static String VMenuContributionsEditor_TreeLabelDescription;
+	public static String VMenuContributionsEditor_MenuContributions;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 924f9d57bd..c43e5e8cc7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -214,6 +214,7 @@ VBindingTableEditor_Description=Binding Configuration Bla Bla Bla Bla
 VBindingTableEditor_Contexts=Contexts
 VBindingTableEditor_Name=Name
 VBindingTableEditor_LabelDescription=Description
+VBindingTableEditor_BindingTables=Binding Tables
 
 AddonsEditor_ClassURI=Class URI
 AddonsEditor_TreeLabel=Addon
@@ -333,4 +334,25 @@ WindowEditor_BindingContexts=Binding Contexts
 WindowEditor_Handlers=Handlers
 WindowEditor_Windows=Windows
 WindowEditor_Controls=Controls
-WindowEditor_SharedElements=Shared Elements
\ No newline at end of file
+WindowEditor_SharedElements=Shared Elements
+
+VApplicationAddons_AddAddon=Add Addon
+VApplicationAddons_TreeLabel=Addons
+VApplicationAddons_TreeLabelDescription=Addons bla bla bla bla
+VApplicationAddons_Commands=Commands
+
+VApplicationCategoriesEditor_TreeLabel=Command Categories
+VApplicationCategoriesEditor_TreeLabelDescription=Command Categories bla bla bla bla
+VApplicationCategoriesEditor_Categories=Categories
+
+VCommandEditor_TreeLabel=Commands
+VCommandEditor_TreeLabelDescription=Commands Bla Bla Bla Bla Bla
+VCommandEditor_Commands=Commands
+
+VHandlerEditor_TreeLabel=Handlers
+VHandlerEditor_TreeLabelDescription=Handlers Bla Bla Bla Bla Bla
+VHandlerEditor_Handlers=Handlers
+
+VMenuContributionsEditor_TreeLabel=Menu Contributions
+VMenuContributionsEditor_TreeLabelDescription=Menu Contributions Bla Bla Bla Bla Bla
+VMenuContributionsEditor_MenuContributions=Menu Contributions
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/AddAddonCommand.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/AddAddonCommand.java
deleted file mode 100644
index 27cf0d5164..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/AddAddonCommand.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.commands;
-
-import org.eclipse.e4.ui.model.application.MAddon;
-import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-
-public class AddAddonCommand {
-	public void execute(EditingDomain editingDomain, MApplication parent) {
-		MAddon command = MApplicationFactory.INSTANCE.createAddon();
-		Command cmd = AddCommand.create(editingDomain, parent, ApplicationPackageImpl.Literals.APPLICATION__ADDONS, command);
-		
-		if( cmd.canExecute() ) {
-			editingDomain.getCommandStack().execute(cmd);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/MoveAddonCommand.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/MoveAddonCommand.java
deleted file mode 100644
index 6c3f9889de..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/MoveAddonCommand.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.commands;
-
-import org.eclipse.e4.ui.model.application.MAddon;
-import org.eclipse.emf.edit.domain.EditingDomain;
-
-public class MoveAddonCommand {
-	public void execute(EditingDomain editingDomain, MAddon addon, boolean up) {
-		
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/RemoveAddonCommand.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/RemoveAddonCommand.java
deleted file mode 100644
index fed166cee0..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/commands/RemoveAddonCommand.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.commands;
-
-import java.util.List;
-import org.eclipse.e4.ui.model.application.MAddon;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-
-public class RemoveAddonCommand {
-	public void execute(EditingDomain editingDomain, List<MAddon> addons) {
-		EObject parent = ((EObject)addons.get(0)).eContainer();
-		for( MAddon a : addons ) {
-			if( parent != ((EObject)a).eContainer() ) {
-				throw new IllegalArgumentException("The addons all have to belong to the same parent container");
-			}
-		}
-		Command cmd = RemoveCommand.create(editingDomain, parent, ApplicationPackageImpl.Literals.APPLICATION__ADDONS, addons);
-		if( cmd.canExecute() ) {
-			editingDomain.getCommandStack().execute(cmd);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index 8a32545123..ee1777872b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
@@ -5,17 +15,19 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.emf.ui.internal.common.commands.AddAddonCommand;
-import org.eclipse.e4.tools.emf.ui.internal.common.commands.RemoveAddonCommand;
 import org.eclipse.e4.ui.model.application.MAddon;
 import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -40,13 +52,9 @@ public class VApplicationAddons extends AbstractComponentEditor {
 
 	private List<Action> actions = new ArrayList<Action>();
 
-	// FIXME We need to plug this stuff into the command frameworks
-	private AddAddonCommand addAddonCommand = new AddAddonCommand();
-	private RemoveAddonCommand removeAddonCommand = new RemoveAddonCommand();
-
 	public VApplicationAddons(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
-		actions.add(new Action("Add Addon") {
+		actions.add(new Action(Messages.VApplicationAddons_AddAddon) {
 			@Override
 			public void run() {
 				handleAddAddon();
@@ -61,7 +69,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Addons";
+		return Messages.VApplicationAddons_TreeLabel;
 	}
 
 	@Override
@@ -71,7 +79,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Addons bla bla bla bla";
+		return Messages.VApplicationAddons_TreeLabelDescription;
 	}
 
 	@Override
@@ -94,7 +102,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Commands");
+			l.setText(Messages.VApplicationAddons_Commands);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			viewer = new TableViewer(parent);
@@ -116,7 +124,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -143,7 +151,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -170,7 +178,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add ...");
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -181,7 +189,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -198,16 +206,23 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	private void handleAddAddon() {
-		addAddonCommand.execute(getEditingDomain(), (MApplication) getMaster().getValue());
+		MAddon command = MApplicationFactory.INSTANCE.createAddon();
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__ADDONS, command);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+		}
 	}
 
-	private void handleRemoveAddons(List<MAddon> addons) {
-		removeAddonCommand.execute(getEditingDomain(), addons);
+	private void handleRemoveAddons(List<?> addons) {
+		Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__ADDONS, addons);
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+		}
 	}
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index a97af9b7b1..c682ea4c7f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -15,6 +15,7 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -62,7 +63,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Command Categories";
+		return Messages.VApplicationCategoriesEditor_TreeLabel;
 	}
 
 	@Override
@@ -72,7 +73,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Command Categories bla bla bla bla";
+		return Messages.VApplicationCategoriesEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -95,7 +96,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Categories");
+			l.setText(Messages.VApplicationCategoriesEditor_Categories);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			viewer = new TableViewer(parent);
@@ -117,7 +118,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -144,7 +145,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -171,7 +172,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add ...");
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -188,7 +189,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -210,7 +211,6 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 4f359ccde9..67f6ed5754 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -11,9 +11,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.List;
-import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -26,18 +24,14 @@
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.databinding.viewers.TreeStructureAdvisor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -53,7 +47,6 @@ public class VBindingTableEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer bindingViewer;
-	private TreeViewer contextsViewer;
 
 	public VBindingTableEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
@@ -99,7 +92,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Binding Tables");
+			l.setText(Messages.VBindingTableEditor_BindingTables);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			bindingViewer = new TableViewer(parent);
@@ -120,7 +113,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -147,7 +140,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -174,7 +167,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add ...");
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -191,7 +184,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -213,22 +206,7 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
-	private static class ObservableFactoryImpl implements IObservableFactory {
-		private IEMFListProperty prop = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
-
-		public IObservable createObservable(Object target) {
-			if (target instanceof IObservableList) {
-				return (IObservable) target;
-			}
-			return prop.observe(target);
-		}
-	}
-
-	private static class TreeStructureAdvisorImpl extends TreeStructureAdvisor {
-
-	}
-}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 0e45fe1884..551b505675 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -14,19 +14,15 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl;
-import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
@@ -36,7 +32,6 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -67,7 +62,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Commands";
+		return Messages.VCommandEditor_TreeLabel;
 	}
 
 	@Override
@@ -77,7 +72,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Commands Bla Bla Bla Bla Bla";
+		return Messages.VCommandEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -100,7 +95,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Commands");
+			l.setText(Messages.VCommandEditor_Commands);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			viewer = new TableViewer(parent);
@@ -110,24 +105,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 			viewer.getTable().setHeaderVisible(true);
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Name");
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Id");
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
@@ -139,7 +117,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -166,7 +144,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -193,7 +171,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add ...");
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -210,7 +188,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -232,7 +210,6 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index e2a3d703b3..4825357548 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -14,19 +14,16 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.commands.MHandlerContainer;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -35,7 +32,6 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -63,7 +59,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Handlers";
+		return Messages.VHandlerEditor_TreeLabel;
 	}
 
 	@Override
@@ -73,7 +69,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Handlers Bla Bla Bla Bla Bla";
+		return Messages.VHandlerEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -96,7 +92,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Handlers");
+			l.setText(Messages.VHandlerEditor_Handlers);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			viewer = new TableViewer(parent);
@@ -106,33 +102,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 			viewer.getTable().setHeaderVisible(true);
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(CommandsPackageImpl.Literals.HANDLER__COMMAND, CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME));
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Command");
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Class");
-				column.getColumn().setWidth(300);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Id");
-				column.getColumn().setWidth(150);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
@@ -144,7 +114,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -171,7 +141,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -198,7 +168,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add ...");
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -215,7 +185,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -237,7 +207,6 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index 715b29c9b0..f7e48213f9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -14,19 +14,16 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -35,7 +32,6 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -63,7 +59,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Menu Contributions";
+		return Messages.VMenuContributionsEditor_TreeLabel;
 	}
 
 	@Override
@@ -73,7 +69,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Menu Contributions Bla Bla Bla Bla Bla";
+		return Messages.VMenuContributionsEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -96,7 +92,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Menu Contributions");
+			l.setText(Messages.VMenuContributionsEditor_MenuContributions);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			viewer = new TableViewer(parent);
@@ -106,33 +102,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 			viewer.getTable().setHeaderVisible(true);
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Id");
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("ParentId");
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__POSITION_IN_PARENT);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Position");
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
@@ -144,7 +114,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -171,7 +141,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -198,7 +168,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add ...");
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -215,7 +185,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -237,7 +207,6 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 }

From 148c2198aac35650ba4758a5ff5cece3fb887ab4 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 18 Jul 2010 12:35:04 +0000
Subject: [PATCH 0236/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * some nls stuff

---
 .../e4/tools/emf/ui/internal/Messages.java    | 40 ++++++++++
 .../tools/emf/ui/internal/Messages.properties | 42 ++++++++++-
 .../common/component/virtual/VMenuEditor.java | 75 +++++++++++++++----
 .../virtual/VModelFragmentsEditor.java        | 21 ++----
 .../virtual/VModelImportsEditor.java          | 14 ++--
 .../component/virtual/VPartDescriptor.java    | 42 +++--------
 .../virtual/VToolBarContributionsEditor.java  | 50 +++----------
 .../virtual/VTrimContributionsEditor.java     | 51 +++----------
 .../virtual/VWindowControlEditor.java         | 20 ++---
 .../component/virtual/VWindowEditor.java      | 68 +++--------------
 .../virtual/VWindowSharedElementsEditor.java  | 14 ++--
 .../component/virtual/VWindowTrimEditor.java  | 11 +--
 12 files changed, 215 insertions(+), 233 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index efc285d57d..06b182325c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -361,6 +361,46 @@ public class Messages extends NLS {
 	public static String VMenuContributionsEditor_TreeLabelDescription;
 	public static String VMenuContributionsEditor_MenuContributions;
 
+	public static String VMenuEditor_TreeLabel;
+	public static String VMenuEditor_TreeLabelDescription;
+	public static String VMenuEditor_Menus;
+
+	public static String VModelFragmentsEditor_TreeLabel;
+	public static String VModelFragmentsEditor_TreeLabelDescription;
+	public static String VModelFragmentsEditor_Fragments;
+
+	public static String VModelImportsEditor_TreeLabel;
+	public static String VModelImportsEditor_TreeLabelDescription;
+	public static String VModelImportsEditor_Imports;
+
+	public static String VPartDescriptor_TreeLabel;
+	public static String VPartDescriptor_TreeLabelDescription;
+	public static String VPartDescriptor_Descriptors;
+
+	public static String VToolBarContributionsEditor_Contributions;
+	public static String VToolBarContributionsEditor_TreeLabelDescription;
+	public static String VToolBarContributionsEditor_TreeLabel;
+
+	public static String VTrimContributionsEditor_TreeLabel;
+	public static String VTrimContributionsEditor_TreeLabelDescription;
+	public static String VTrimContributionsEditor_Contributions;
+
+	public static String VWindowControlEditor_TreeLabel;
+	public static String VWindowControlEditor_TreeLabelDescription;
+	public static String VWindowControlEditor_Controls;
+
+	public static String VWindowEditor_TreeLabel;
+	public static String VWindowEditor_TreeLabelDescription;
+	public static String VWindowEditor_Windows;
+
+	public static String VWindowSharedElementsEditor_TreeLabel;
+	public static String VWindowSharedElementsEditor_TreeLabelDescription;
+	public static String VWindowSharedElementsEditor_Controls;
+
+	public static String VWindowTrimEditor_TreeLabel;
+	public static String VWindowTrimEditor_TreeLabelDescription;
+	public static String VWindowTrimEditor_Controls;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index c43e5e8cc7..2f35202a5e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -355,4 +355,44 @@ VHandlerEditor_Handlers=Handlers
 
 VMenuContributionsEditor_TreeLabel=Menu Contributions
 VMenuContributionsEditor_TreeLabelDescription=Menu Contributions Bla Bla Bla Bla Bla
-VMenuContributionsEditor_MenuContributions=Menu Contributions
\ No newline at end of file
+VMenuContributionsEditor_MenuContributions=Menu Contributions
+
+VMenuEditor_TreeLabel=Menus
+VMenuEditor_TreeLabelDescription=Menus Bla Bla Bla Bla Bla
+VMenuEditor_Menus=Menus
+
+VModelFragmentsEditor_TreeLabel=Fragments
+VModelFragmentsEditor_TreeLabelDescription=Fragments Bla Bla Bla Bla Bla
+VModelFragmentsEditor_Fragments=Fragments
+
+VModelImportsEditor_TreeLabel=Imports
+VModelImportsEditor_TreeLabelDescription=Imports Bla Bla Bla Bla Bla
+VModelImportsEditor_Imports=Imports
+
+VPartDescriptor_TreeLabel=Part Descriptors
+VPartDescriptor_TreeLabelDescription=Part Descriptors Bla Bla Bla Bla Bla
+VPartDescriptor_Descriptors=Descriptors
+
+VToolBarContributionsEditor_TreeLabel=ToolBar Contributions
+VToolBarContributionsEditor_TreeLabelDescription=ToolBar Contributions Bla Bla Bla Bla Bla
+VToolBarContributionsEditor_Contributions=ToolBar Contributions
+
+VTrimContributionsEditor_TreeLabel=Trim Contributions
+VTrimContributionsEditor_TreeLabelDescription=Trim Contributions Bla Bla Bla Bla Bla
+VTrimContributionsEditor_Contributions=Trim Contributions
+
+VWindowControlEditor_TreeLabel=Controls
+VWindowControlEditor_TreeLabelDescription=Controls Bla Bla Bla Bla Bla
+VWindowControlEditor_Controls=Controls
+
+VWindowEditor_TreeLabel=Windows
+VWindowEditor_TreeLabelDescription=Windows Bla Bla Bla Bla Bla
+VWindowEditor_Windows=Windows
+
+VWindowSharedElementsEditor_TreeLabel=Shared Elements
+VWindowSharedElementsEditor_TreeLabelDescription=Shared Elements Bla Bla Bla Bla
+VWindowSharedElementsEditor_Controls=Controls
+
+VWindowTrimEditor_TreeLabel=Window Trims
+VWindowTrimEditor_TreeLabelDescription=Window Trims Bla Bla Bla Bla Bla
+VWindowTrimEditor_Controls=Controls
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index ff13dd9f52..a7678f8990 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -14,23 +14,25 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -61,7 +63,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Menus";
+		return Messages.VMenuEditor_TreeLabel;
 	}
 
 	@Override
@@ -71,7 +73,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Menus Bla Bla Bla Bla Bla";
+		return Messages.VMenuEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -93,19 +95,17 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent.setLayout(gl);
 
 		Label l = new Label(parent, SWT.NONE);
-		l.setText("Menus");
+		l.setText(Messages.VMenuEditor_Menus);
 		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 		viewer = new TableViewer(parent);
 		ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
-
-		IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-		viewer.setLabelProvider(new ObservableColumnLabelProvider<MMenu>(valProp.observeDetail(cp.getKnownElements())));
-
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.heightHint = 300;
 		viewer.getControl().setLayoutData(gd);
+		viewer.getTable().setHeaderVisible(true);
+		viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
@@ -117,17 +117,62 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		buttonComp.setLayout(gl);
 
 		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Up");
+		b.setText(Messages.ModelTooling_Common_Up);
 		b.setImage(getImage(b.getDisplay(), ARROW_UP));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						EObject container = (EObject) getMaster().getValue();
+						int idx = ((List<?>) container.eGet(feature)).indexOf(obj) - 1;
+						if (idx >= 0) {
+							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), feature, obj, idx);
+
+							if (cmd.canExecute()) {
+								getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+
+					}
+				}
+			}
+		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Down");
+		b.setText(Messages.ModelTooling_Common_Down);
 		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						EObject container = (EObject) getMaster().getValue();
+						List<?> list = (List<?>) container.eGet(feature);
+						int idx = list.indexOf(obj) + 1;
+						if (idx < list.size()) {
+							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, obj, idx);
+
+							if (cmd.canExecute()) {
+								getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+
+					}
+				}
+			}
+		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Add ...");
+		b.setText(Messages.ModelTooling_Common_AddEllipsis);
 		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
@@ -144,7 +189,7 @@ public void widgetSelected(SelectionEvent e) {
 		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Remove");
+		b.setText(Messages.ModelTooling_Common_Remove);
 		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index e5892602bd..3ed39f68a4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -14,6 +14,7 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -23,8 +24,6 @@
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -60,7 +59,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Fragments";
+		return Messages.VModelFragmentsEditor_TreeLabel;
 	}
 
 	@Override
@@ -70,7 +69,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Fragments Bla Bla Bla Bla Bla";
+		return Messages.VModelFragmentsEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -93,7 +92,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Fragments");
+			l.setText(Messages.VModelFragmentsEditor_Fragments);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			viewer = new TableViewer(parent);
@@ -105,9 +104,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 
-			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
-			viewer.setInput(prop.observeDetail(getMaster()));
-
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
 			gl = new GridLayout(2, false);
@@ -118,7 +114,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -145,7 +141,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -172,7 +168,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add");
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -191,7 +187,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -214,7 +210,6 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index f351dc6aa2..6ccec9918d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -16,6 +16,7 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -69,7 +70,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Imports";
+		return Messages.VModelImportsEditor_TreeLabel;
 	}
 
 	@Override
@@ -79,7 +80,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Imports Bla Bla Bla Bla Bla";
+		return Messages.VModelImportsEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -102,7 +103,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Imports");
+			l.setText(Messages.VModelImportsEditor_Imports);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			viewer = new TableViewer(parent);
@@ -122,7 +123,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -149,7 +150,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -220,7 +221,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -258,7 +259,6 @@ public void addClasses(EPackage ePackage, List<FeatureClass> list) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index ac08e04bc6..7e92a05fd7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -14,19 +14,16 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MBasicFactory;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorContainer;
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -35,7 +32,6 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -63,7 +59,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Part Descriptors";
+		return Messages.VPartDescriptor_TreeLabel;
 	}
 
 	@Override
@@ -73,7 +69,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Part Descriptors Bla Bla Bla Bla Bla";
+		return Messages.VPartDescriptor_TreeLabelDescription;
 	}
 
 	@Override
@@ -96,7 +92,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Descriptors");
+			l.setText(Messages.VPartDescriptor_Descriptors);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			viewer = new TableViewer(parent);
@@ -106,24 +102,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 			viewer.getTable().setHeaderVisible(true);
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Name");
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CATEGORY);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Category");
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
@@ -135,7 +114,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -162,7 +141,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -189,7 +168,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add ...");
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -206,7 +185,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -228,7 +207,6 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index 3d1ba17b3a..67228f0d83 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -14,19 +14,16 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContributions;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -35,7 +32,6 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -63,7 +59,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "ToolBar Contributions";
+		return Messages.VToolBarContributionsEditor_TreeLabel;
 	}
 
 	@Override
@@ -73,7 +69,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "ToolBar Contributions Bla Bla Bla Bla Bla";
+		return Messages.VToolBarContributionsEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -96,7 +92,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("ToolBar Contributions");
+			l.setText(Messages.VToolBarContributionsEditor_Contributions);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			viewer = new TableViewer(parent);
@@ -106,33 +102,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 			viewer.getTable().setHeaderVisible(true);
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Id");
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__PARENT_ID);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("ParentId");
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__POSITION_IN_PARENT);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Position");
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
@@ -144,7 +114,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -171,7 +141,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -198,7 +168,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add ...");
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -215,7 +185,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index 925129a5f0..6166aaf8f8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -14,19 +14,16 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.MTrimContributions;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -35,7 +32,6 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -63,7 +59,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Trim Contributions";
+		return Messages.VTrimContributionsEditor_TreeLabel;
 	}
 
 	@Override
@@ -73,7 +69,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Trim Contributions Bla Bla Bla Bla Bla";
+		return Messages.VTrimContributionsEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -96,7 +92,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Trim Contributions");
+			l.setText(Messages.VTrimContributionsEditor_Contributions);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			viewer = new TableViewer(parent);
@@ -106,33 +102,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 			viewer.getTable().setHeaderVisible(true);
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Id");
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__PARENT_ID);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("ParentId");
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__POSITION_IN_PARENT);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText("Position");
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
@@ -144,7 +114,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -171,7 +141,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -198,7 +168,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add ...");
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -215,7 +185,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -237,7 +207,6 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 87e5278b7d..f111c9ec46 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -15,6 +15,7 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -25,8 +26,6 @@
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -67,7 +66,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Controls";
+		return Messages.VWindowControlEditor_TreeLabel;
 	}
 
 	@Override
@@ -77,7 +76,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Controls Bla Bla Bla Bla Bla";
+		return Messages.VWindowControlEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -100,21 +99,17 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Controls");
+			l.setText(Messages.VWindowControlEditor_Controls);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
-
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 
-			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(getMaster()));
-
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
 			gl = new GridLayout(2, false);
@@ -125,7 +120,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -149,7 +144,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -206,7 +201,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -229,7 +224,6 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index bb4dbe0c9f..234af90722 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -15,18 +15,16 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
-import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -40,7 +38,6 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -68,7 +65,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Windows";
+		return Messages.VWindowEditor_TreeLabel;
 	}
 
 	@Override
@@ -78,7 +75,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Windows Bla Bla Bla Bla Bla";
+		return Messages.VWindowEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -100,62 +97,16 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent.setLayout(gl);
 
 		Label l = new Label(parent, SWT.NONE);
-		l.setText("Windows");
+		l.setText(Messages.VWindowEditor_Windows);
 		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 		viewer = new TableViewer(parent);
 		ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
-
+		viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.heightHint = 300;
 		viewer.getControl().setLayoutData(gd);
-		viewer.getTable().setHeaderVisible(true);
-
-		{
-			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL);
-
-			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-			column.getColumn().setText("Name");
-			column.getColumn().setWidth(180);
-			column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
-		}
-
-		{
-			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__X);
-
-			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-			column.getColumn().setText("X");
-			column.getColumn().setWidth(80);
-			column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
-		}
-
-		{
-			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__Y);
-
-			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-			column.getColumn().setText("Y");
-			column.getColumn().setWidth(80);
-			column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
-		}
-
-		{
-			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__WIDTH);
-
-			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-			column.getColumn().setText("Width");
-			column.getColumn().setWidth(100);
-			column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
-		}
-
-		{
-			IEMFEditValueProperty valProp = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__HEIGHT);
-
-			TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-			column.getColumn().setText("Height");
-			column.getColumn().setWidth(100);
-			column.setLabelProvider(new ObservableColumnLabelProvider<MWindow>(valProp.observeDetail(cp.getKnownElements())));
-		}
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
@@ -168,7 +119,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 
-		b.setText("Up");
+		b.setText(Messages.ModelTooling_Common_Up);
 		b.setImage(getImage(b.getDisplay(), ARROW_UP));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 		b.addSelectionListener(new SelectionAdapter() {
@@ -192,7 +143,7 @@ public void widgetSelected(SelectionEvent e) {
 		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Down");
+		b.setText(Messages.ModelTooling_Common_Down);
 		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 		b.addSelectionListener(new SelectionAdapter() {
@@ -246,7 +197,7 @@ public void widgetSelected(SelectionEvent e) {
 		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText("Remove");
+		b.setText(Messages.ModelTooling_Common_Remove);
 		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 		b.addSelectionListener(new SelectionAdapter() {
@@ -271,7 +222,6 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index f8f48d06cb..076f2cdb8a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -14,6 +14,7 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -64,7 +65,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Shared Elements";
+		return Messages.VWindowSharedElementsEditor_TreeLabel;
 	}
 
 	@Override
@@ -74,7 +75,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Shared Elements Bla Bla Bla Bla";
+		return Messages.VWindowSharedElementsEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -97,7 +98,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Controls");
+			l.setText(Messages.VWindowSharedElementsEditor_Controls);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			viewer = new TableViewer(parent);
@@ -122,7 +123,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Up");
+			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(getImage(b.getDisplay(), ARROW_UP));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -149,7 +150,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Down");
+			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -210,7 +211,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -233,7 +234,6 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index f921ef902d..abc168cd8f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -14,6 +14,7 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -55,7 +56,7 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
-		return "Window Trims";
+		return Messages.VWindowTrimEditor_TreeLabel;
 	}
 
 	@Override
@@ -65,7 +66,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public String getDescription(Object element) {
-		return "Window Trims Bla Bla Bla Bla Bla";
+		return Messages.VWindowTrimEditor_TreeLabelDescription;
 	}
 
 	@Override
@@ -88,7 +89,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText("Controls");
+			l.setText(Messages.VWindowTrimEditor_Controls);
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			viewer = new TableViewer(parent);
@@ -110,7 +111,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			buttonComp.setLayout(gl);
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Add Trim");
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -127,7 +128,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText("Remove");
+			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {

From 1ccb359e3c1a560c7cbf48d5701169fa8b351661 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 18 Jul 2010 13:43:15 +0000
Subject: [PATCH 0237/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * some nls stuff

---
 .../tools/emf/ui/common/XMIModelResource.java | 28 +++----
 .../e4/tools/emf/ui/internal/Messages.java    | 64 +++++++++++++++
 .../tools/emf/ui/internal/Messages.properties | 66 +++++++++++++++-
 .../AbstractCommandSelectionDialog.java       | 68 ++++++++--------
 .../component/dialogs/AbstractIconDialog.java | 25 +++---
 .../BindingContextSelectionDialog.java        | 10 +--
 .../CommandCategorySelectionDialog.java       |  8 +-
 .../dialogs/ContributionClassDialog.java      | 79 +++++++++----------
 .../dialogs/FeatureSelectionDialog.java       |  1 -
 .../dialogs/FindImportElementDialog.java      | 17 ++--
 .../FindParentReferenceElementDialog.java     | 21 +++--
 ...HandledMenuItemCommandSelectionDialog.java | 17 ++--
 ...HandledToolItemCommandSelectionDialog.java | 17 ++--
 .../HandlerCommandSelectionDialog.java        | 17 ++--
 .../KeyBindingCommandSelectionDialog.java     | 15 ++--
 .../dialogs/MenuIconDialogEditor.java         |  8 +-
 .../dialogs/MenuItemIconDialogEditor.java     |  8 +-
 .../PartDescriptorIconDialogEditor.java       |  8 +-
 .../dialogs/PartIconDialogEditor.java         |  7 +-
 .../dialogs/PerspectiveIconDialogEditor.java  |  8 +-
 20 files changed, 310 insertions(+), 182 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
index aa8bae4b27..d6b47cfe80 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
@@ -30,32 +30,26 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 
-@SuppressWarnings("restriction")
 public class XMIModelResource implements IModelResource {
 	private EditingDomain editingDomain;
 	private Resource resource;
 	private List<ModelListener> listeners = new ArrayList<IModelResource.ModelListener>();
 	private boolean dirty;
 
-	
 	public XMIModelResource(URI uri) {
-		ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
-				ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+		ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
 		ResourceSet resourceSet = new ResourceSetImpl();
 		BasicCommandStack commandStack = new BasicCommandStack();
 		commandStack.addCommandStackListener(new CommandStackListener() {
-			
+
 			public void commandStackChanged(EventObject event) {
 				dirty = true;
 				fireDirtyChanged();
 				fireCommandStackChanged();
 			}
 		});
-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory,
-				commandStack, resourceSet);
-		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
-				.put(Resource.Factory.Registry.DEFAULT_EXTENSION,
-						new E4XMIResourceFactory());
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, resourceSet);
+		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, new E4XMIResourceFactory());
 		resource = resourceSet.getResource(uri, true);
 	}
 
@@ -76,27 +70,27 @@ public boolean isSaveable() {
 	public void addModelListener(ModelListener listener) {
 		listeners.add(listener);
 	}
-	
+
 	public void removeModelListener(ModelListener listener) {
 		listeners.remove(listener);
 	}
-	
+
 	public boolean isDirty() {
 		return dirty && getEditingDomain().getCommandStack().canUndo();
 	}
-	
+
 	private void fireDirtyChanged() {
-		for( ModelListener listener : listeners ) {
+		for (ModelListener listener : listeners) {
 			listener.dirtyChanged();
 		}
 	}
-	
+
 	private void fireCommandStackChanged() {
-		for( ModelListener listener : listeners ) {
+		for (ModelListener listener : listeners) {
 			listener.commandStackChanged();
 		}
 	}
-	
+
 	public IStatus save() {
 		Map<String, String> map = new HashMap<String, String>();
 		try {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 06b182325c..34cd530daa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -401,6 +401,70 @@ public class Messages extends NLS {
 	public static String VWindowTrimEditor_TreeLabelDescription;
 	public static String VWindowTrimEditor_Controls;
 
+	public static String AbstractIconDialog_IconName;
+
+	public static String BindingContextSelectionDialog_ShellTitle;
+	public static String BindingContextSelectionDialog_Title;
+	public static String BindingContextSelectionDialog_Message;
+	public static String BindingContextSelectionDialog_NoIdReference;
+
+	public static String CommandCategorySelectionDialog_ShellTitle;
+	public static String CommandCategorySelectionDialog_Title;
+	public static String CommandCategorySelectionDialog_Message;
+
+	public static String FindImportElementDialog_ShellTitle;
+	public static String FindImportElementDialog_Title;
+	public static String FindImportElementDialog_Message;
+	public static String FindImportElementDialog_Search;
+	public static String FindImportElementDialog_ClearCache;
+	public static String FindImportElementDialog_NoIdReference;
+	public static String FindImportElementDialog_noId;
+
+	public static String FindParentReferenceElementDialog_ShellTitle;
+	public static String FindParentReferenceElementDialog_Title;
+	public static String FindParentReferenceElementDialog_Message;
+	public static String FindParentReferenceElementDialog_ContainerType;
+	public static String FindParentReferenceElementDialog_Search;
+	public static String FindParentReferenceElementDialog_NoId;
+	public static String FindParentReferenceElementDialog_ClearCache;
+	public static String FindParentReferenceElementDialog_NoReferenceId;
+
+	public static String HandledMenuItemCommandSelectionDialog_ShellTitle;
+	public static String HandledMenuItemCommandSelectionDialog_DialogTitle;
+	public static String HandledMenuItemCommandSelectionDialog_DialogMessage;
+
+	public static String HandledToolItemCommandSelectionDialog_ShellTitle;
+	public static String HandledToolItemCommandSelectionDialog_DialogTitle;
+	public static String HandledToolItemCommandSelectionDialog_DialogMessage;
+
+	public static String HandlerCommandSelectionDialog_ShellTitle;
+	public static String HandlerCommandSelectionDialog_DialogTitle;
+	public static String HandlerCommandSelectionDialog_DialogMessage;
+
+	public static String KeyBindingCommandSelectionDialog_ShellTitle;
+	public static String KeyBindingCommandSelectionDialog_DialogTitle;
+	public static String KeyBindingCommandSelectionDialog_DialogMessage;
+
+	public static String MenuIconDialogEditor_ShellTitle;
+	public static String MenuIconDialogEditor_DialogTitle;
+	public static String MenuIconDialogEditor_DialogMessage;
+
+	public static String MenuItemIconDialogEditor_ShellTitle;
+	public static String MenuItemIconDialogEditor_DialogTitle;
+	public static String MenuItemIconDialogEditor_DialogMessage;
+
+	public static String PartDescriptorIconDialogEditor_ShellTitle;
+	public static String PartDescriptorIconDialogEditor_DialogTitle;
+	public static String PartDescriptorIconDialogEditor_DialogMessage;
+
+	public static String PartIconDialogEditor_ShellTitle;
+	public static String PartIconDialogEditor_DialogTitle;
+	public static String PartIconDialogEditor_DialogMessage;
+
+	public static String PerspectiveIconDialogEditor_ShellTitle;
+	public static String PerspectiveIconDialogEditor_DialogTitle;
+	public static String PerspectiveIconDialogEditor_DialogMessage;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 2f35202a5e..44be9b210d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -395,4 +395,68 @@ VWindowSharedElementsEditor_Controls=Controls
 
 VWindowTrimEditor_TreeLabel=Window Trims
 VWindowTrimEditor_TreeLabelDescription=Window Trims Bla Bla Bla Bla Bla
-VWindowTrimEditor_Controls=Controls
\ No newline at end of file
+VWindowTrimEditor_Controls=Controls
+
+AbstractIconDialog_IconName=IconName
+
+BindingContextSelectionDialog_ShellTitle=BindingContext Dialog
+BindingContextSelectionDialog_Title=BindingContext
+BindingContextSelectionDialog_Message=Search for a BindingContext
+BindingContextSelectionDialog_NoIdReference=You can not reference an element without an ID
+
+CommandCategorySelectionDialog_ShellTitle=Command Category Dialog
+CommandCategorySelectionDialog_Title=Command Category
+CommandCategorySelectionDialog_Message=Search for a Command Category
+
+FindImportElementDialog_ShellTitle=Find Import Elements
+FindImportElementDialog_Title=Find Import Elements
+FindImportElementDialog_Message=Search for an elements whose ID you'd like to import
+FindImportElementDialog_Search=Search
+FindImportElementDialog_noId=no id
+FindImportElementDialog_ClearCache=Clear Cache
+FindImportElementDialog_NoIdReference=You can not import an element without an ID
+
+FindParentReferenceElementDialog_ShellTitle=Find Parent Elements
+FindParentReferenceElementDialog_Title=Find Parent Elements
+FindParentReferenceElementDialog_Message=Search for an elements who you like to references as parent
+FindParentReferenceElementDialog_ContainerType=Container-Type
+FindParentReferenceElementDialog_Search=Search
+FindParentReferenceElementDialog_ClearCache=Clear Cache
+FindParentReferenceElementDialog_NoReferenceId=You can not reference an element without an ID
+FindParentReferenceElementDialog_NoId=no id
+
+HandledMenuItemCommandSelectionDialog_ShellTitle=MenuItem Command
+HandledMenuItemCommandSelectionDialog_DialogTitle=MenuItem-Command
+HandledMenuItemCommandSelectionDialog_DialogMessage=Connect the MenuItem to a command
+
+HandledToolItemCommandSelectionDialog_ShellTitle=ToolItem Command
+HandledToolItemCommandSelectionDialog_DialogTitle=ToolItem-Command
+HandledToolItemCommandSelectionDialog_DialogMessage=Connect the ToolItem to a command
+
+HandlerCommandSelectionDialog_ShellTitle=Handler Command
+HandlerCommandSelectionDialog_DialogTitle=Handler-Command
+HandlerCommandSelectionDialog_DialogMessage=Connect the handler to a command
+
+KeyBindingCommandSelectionDialog_ShellTitle=Keybinding Command
+KeyBindingCommandSelectionDialog_DialogTitle=Keybinding-Command
+KeyBindingCommandSelectionDialog_DialogMessage=Connect the keybinding to a command
+
+MenuIconDialogEditor_ShellTitle=Menu Icon Search
+MenuIconDialogEditor_DialogTitle=Menu Icon Search
+MenuIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
+
+MenuItemIconDialogEditor_ShellTitle=Menu Item Icon Search
+MenuItemIconDialogEditor_DialogTitle=Menu Item Icon Search
+MenuItemIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
+
+PartDescriptorIconDialogEditor_ShellTitle=Part Descriptor Icon Search
+PartDescriptorIconDialogEditor_DialogTitle=Part Descriptor Icon Search
+PartDescriptorIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
+
+PartIconDialogEditor_ShellTitle=Part Icon Search
+PartIconDialogEditor_DialogTitle=Part Icon Search
+PartIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
+
+PerspectiveIconDialogEditor_ShellTitle=Perspective Icon Search
+PerspectiveIconDialogEditor_DialogTitle=Perspective Icon Search
+PerspectiveIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index d0ae2cab10..9968650d51 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -58,25 +58,27 @@ public AbstractCommandSelectionDialog(Shell parentShell, IModelResource resource
 	}
 
 	protected abstract String getShellTitle();
+
 	protected abstract String getDialogTitle();
+
 	protected abstract String getDialogMessage();
-	
+
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite composite = (Composite) super.createDialogArea(parent);
-		getShell().setText( getShellTitle());
-		setTitle( getDialogTitle() );
-		setMessage( getDialogMessage() );
-		
-		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newexp_wiz.png"));
+		getShell().setText(getShellTitle());
+		setTitle(getDialogTitle());
+		setMessage(getDialogMessage());
+
+		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
-			
+
 			public void widgetDisposed(DisposeEvent e) {
 				titleImage.dispose();
 			}
 		});
-		
+
 		Composite container = new Composite(composite, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 		container.setLayout(new GridLayout(2, false));
@@ -93,22 +95,22 @@ public void widgetDisposed(DisposeEvent e) {
 		viewer.setLabelProvider(new LabelProviderImpl());
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
-			
+
 			public void doubleClick(DoubleClickEvent event) {
 				okPressed();
 			}
 		});
-		
+
 		List<EObject> commands = new ArrayList<EObject>();
-		TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject)resource.getRoot().get(0), true);
-		while( it.hasNext() ) {
+		TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
+		while (it.hasNext()) {
 			EObject o = it.next();
-			if( o.eClass() == CommandsPackageImpl.Literals.COMMAND ) {
+			if (o.eClass() == CommandsPackageImpl.Literals.COMMAND) {
 				commands.add(o);
 			}
 		}
 		viewer.setInput(commands);
-		
+
 		final PatternFilter filter = new PatternFilter() {
 			@Override
 			protected boolean isParentMatch(Viewer viewer, Object element) {
@@ -130,31 +132,31 @@ public void modifyText(ModifyEvent e) {
 	@Override
 	protected void okPressed() {
 		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-		if( ! s.isEmpty() ) {
-			Command cmd = createStoreCommand( resource.getEditingDomain(), (MCommand) s.getFirstElement() );
-			if( cmd.canExecute() ) {
+		if (!s.isEmpty()) {
+			Command cmd = createStoreCommand(resource.getEditingDomain(), (MCommand) s.getFirstElement());
+			if (cmd.canExecute()) {
 				resource.getEditingDomain().getCommandStack().execute(cmd);
 				super.okPressed();
 			}
 		}
 	}
-	
-	protected abstract Command createStoreCommand( EditingDomain editingDomain, MCommand command);
-	
+
+	protected abstract Command createStoreCommand(EditingDomain editingDomain, MCommand command);
+
 	private static class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
-		
+
 		public void update(final ViewerCell cell) {
 			MCommand cmd = (MCommand) cell.getElement();
-			
+
 			StyledString styledString = new StyledString();
-			if( cmd.getCommandName() != null ) {
+			if (cmd.getCommandName() != null) {
 				styledString.append(cmd.getCommandName());
 			}
-			if( cmd.getDescription() != null ) {
-				styledString.append(" - " + cmd.getDescription(),StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+			if (cmd.getDescription() != null) {
+				styledString.append(" - " + cmd.getDescription(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 			}
-			if( cmd.getElementId() != null ) {
-				styledString.append(" - " + cmd.getElementId(),StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+			if (cmd.getElementId() != null) {
+				styledString.append(" - " + cmd.getElementId(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 			}
 			cell.setText(styledString.getString());
 			cell.setStyleRanges(styledString.getStyleRanges());
@@ -167,18 +169,18 @@ public Image getImage(Object element) {
 		public String getText(Object element) {
 			MCommand command = (MCommand) element;
 			String s = ""; //$NON-NLS-1$
-			if( command.getCommandName() != null ) {
+			if (command.getCommandName() != null) {
 				s += command.getCommandName();
 			}
-			
-			if( command.getDescription() != null ) {
+
+			if (command.getDescription() != null) {
 				s += " " + command.getDescription(); //$NON-NLS-1$
 			}
-			
-			if( command.getElementId() != null ) {
+
+			if (command.getElementId() != null) {
 				s += " " + command.getElementId(); //$NON-NLS-1$
 			}
-			
+
 			return s;
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
index a054c2c764..7e72bc38db 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
@@ -16,6 +16,7 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceVisitor;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.StringMatcher;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.emf.common.command.Command;
@@ -80,7 +81,7 @@ protected Control createDialogArea(Composite parent) {
 		container.setLayout(new GridLayout(2, false));
 
 		Label l = new Label(container, SWT.NONE);
-		l.setText("IconName");
+		l.setText(Messages.AbstractIconDialog_IconName);
 
 		final Text t = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -118,12 +119,12 @@ public void update(ViewerCell cell) {
 						}
 					}
 				}
-				
+
 				String bundle = getBundle(file);
-				if( bundle != null ) {
+				if (bundle != null) {
 					styledString.append(" - " + bundle, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$	
 				}
-				
+
 				cell.setImage(img);
 				cell.setText(styledString.getString());
 				cell.setStyleRanges(styledString.getStyleRanges());
@@ -133,7 +134,7 @@ public void update(ViewerCell cell) {
 		final WritableList list = new WritableList();
 		viewer.setInput(list);
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
-			
+
 			public void doubleClick(DoubleClickEvent event) {
 				okPressed();
 			}
@@ -152,7 +153,7 @@ public void modifyText(ModifyEvent e) {
 					task.cancel();
 				}
 				list.clear();
-				
+
 				clearImages();
 
 				callback = new IconMatchCallback(list);
@@ -170,23 +171,23 @@ public void widgetDisposed(DisposeEvent e) {
 
 		return comp;
 	}
-	
+
 	private void clearImages() {
 		for (Image img : icons.values()) {
 			img.dispose();
 		}
 		icons.clear();
 	}
-	
+
 	@Override
 	protected void okPressed() {
 		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-		if( ! s.isEmpty() ) {
+		if (!s.isEmpty()) {
 			IFile file = (IFile) s.getFirstElement();
 			String bundle = getBundle(file);
-			String uri = "platform:/plugin/"+bundle+"/"+file.getProjectRelativePath().toString();
+			String uri = "platform:/plugin/" + bundle + "/" + file.getProjectRelativePath().toString(); //$NON-NLS-1$//$NON-NLS-2$
 			Command cmd = SetCommand.create(editingDomain, element, feature, uri);
-			if( cmd.canExecute() ) {
+			if (cmd.canExecute()) {
 				editingDomain.getCommandStack().execute(cmd);
 				super.okPressed();
 			}
@@ -232,7 +233,7 @@ private String getBundle(IFile file) {
 		}
 		return null;
 	}
-	
+
 	private class IconMatchCallback {
 		private volatile boolean cancel;
 		private IObservableList list;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
index 9f7d22179d..559841a18b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
@@ -63,11 +63,11 @@ public String getSelectedId() {
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite composite = (Composite) super.createDialogArea(parent);
-		getShell().setText("BindingContext Dialog");
-		setTitle("BindingContext");
-		setMessage("Search for a BindingContext");
+		getShell().setText(Messages.BindingContextSelectionDialog_ShellTitle);
+		setTitle(Messages.BindingContextSelectionDialog_Title);
+		setMessage(Messages.BindingContextSelectionDialog_Message);
 
-		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newexp_wiz.png"));
+		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
 
@@ -134,7 +134,7 @@ protected void okPressed() {
 			if (selectedId != null && selectedId.trim().length() > 0) {
 				super.okPressed();
 			} else {
-				setErrorMessage("You can not reference an element without an ID");
+				setErrorMessage(Messages.BindingContextSelectionDialog_NoIdReference);
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
index a5531d2ce7..4c6d63ed1c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -63,11 +63,11 @@ public CommandCategorySelectionDialog(Shell parentShell, IModelResource resource
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite composite = (Composite) super.createDialogArea(parent);
-		getShell().setText("Command Category Dialog");
-		setTitle("Command Category");
-		setMessage("Search for a Command Category");
+		getShell().setText(Messages.CommandCategorySelectionDialog_ShellTitle);
+		setTitle(Messages.CommandCategorySelectionDialog_Title);
+		setMessage(Messages.CommandCategorySelectionDialog_Message);
 
-		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newexp_wiz.png"));
+		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index 005cba0506..dc9338fdbd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -57,10 +57,10 @@ public class ContributionClassDialog extends TitleAreaDialog {
 	private EditingDomain editingDomain;
 	private TableViewer viewer;
 	private EStructuralFeature feature;
-	
+
 	public ContributionClassDialog(Shell parentShell, IProject project, EditingDomain editingDomain, MApplicationElement contribution, EStructuralFeature feature) {
 		super(parentShell);
-		this.project = project;	
+		this.project = project;
 		this.contribution = contribution;
 		this.editingDomain = editingDomain;
 		this.feature = feature;
@@ -69,36 +69,36 @@ public ContributionClassDialog(Shell parentShell, IProject project, EditingDomai
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite comp = (Composite) super.createDialogArea(parent);
-		
+
 		getShell().setText(Messages.ContributionClassDialog_ShellTitle);
 		setTitle(Messages.ContributionClassDialog_DialogTitle);
 		setMessage(Messages.ContributionClassDialog_DialogMessage);
-		
-		final Image titleImage = new Image(comp.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newclass_wiz.png"));
+
+		final Image titleImage = new Image(comp.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newclass_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
-		
+
 		getShell().addDisposeListener(new DisposeListener() {
-			
+
 			public void widgetDisposed(DisposeEvent e) {
 				javaClassImage.dispose();
 				titleImage.dispose();
 			}
 		});
-		
+
 		javaClassImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/class_obj.gif")); //$NON-NLS-1$
-		
+
 		Composite container = new Composite(comp, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		container.setLayout(new GridLayout(2,false));
-		
+		container.setLayout(new GridLayout(2, false));
+
 		Label l = new Label(container, SWT.NONE);
 		l.setText(Messages.ContributionClassDialog_Label_Classname);
-		
+
 		final Text t = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		new Label(container,SWT.NONE);
-		
+
+		new Label(container, SWT.NONE);
+
 		viewer = new TableViewer(container);
 		GridData gd = new GridData(GridData.FILL_BOTH);
 		viewer.getControl().setLayoutData(gd);
@@ -108,42 +108,41 @@ public void widgetDisposed(DisposeEvent e) {
 			public void update(ViewerCell cell) {
 				ContributionData data = (ContributionData) cell.getElement();
 				StyledString styledString = new StyledString(data.className, null);
-				
-				if( data.bundleName != null ) {
+
+				if (data.bundleName != null) {
 					styledString.append(" - " + data.bundleName, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 				}
-				
-				if( data.sourceType != null ) {
+
+				if (data.sourceType != null) {
 					styledString.append(" - ", StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 					styledString.append(data.sourceType + "", StyledString.COUNTER_STYLER); //$NON-NLS-1$
 				}
-				
-				if( data.iconPath == null ) {
+
+				if (data.iconPath == null) {
 					cell.setImage(javaClassImage);
 				}
-				
+
 				cell.setText(styledString.getString());
 				cell.setStyleRanges(styledString.getStyleRanges());
 			}
 		});
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
-			
+
 			public void doubleClick(DoubleClickEvent event) {
 				okPressed();
 			}
 		});
-		
-		
+
 		final WritableList list = new WritableList();
 		viewer.setInput(list);
-		
+
 		final ClassContributionCollector collector = getCollector();
-		
+
 		t.addModifyListener(new ModifyListener() {
 			private ContributionResultHandlerImpl currentResultHandler;
-			
+
 			public void modifyText(ModifyEvent e) {
-				if( currentResultHandler != null ) {
+				if (currentResultHandler != null) {
 					currentResultHandler.cancled = true;
 				}
 				list.clear();
@@ -152,47 +151,47 @@ public void modifyText(ModifyEvent e) {
 				collector.findContributions(filter, currentResultHandler);
 			}
 		});
-				
+
 		return comp;
 	}
-	
+
 	@Override
 	protected void okPressed() {
 		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-		if( ! s.isEmpty() ) {
+		if (!s.isEmpty()) {
 			ContributionData cd = (ContributionData) s.getFirstElement();
 			String uri = "platform:/plugin/" + cd.bundleName + "/" + cd.className; //$NON-NLS-1$ //$NON-NLS-2$
 			Command cmd = SetCommand.create(editingDomain, contribution, feature, uri);
-			if( cmd.canExecute() ) {
+			if (cmd.canExecute()) {
 				editingDomain.getCommandStack().execute(cmd);
 				super.okPressed();
 			}
 		}
 	}
-	
+
 	private ClassContributionCollector getCollector() {
 		Bundle bundle = FrameworkUtil.getBundle(ContributionClassDialog.class);
 		BundleContext context = bundle.getBundleContext();
 		ServiceReference ref = context.getServiceReference(ClassContributionCollector.class.getName());
-		if( ref != null ) {
+		if (ref != null) {
 			return (ClassContributionCollector) context.getService(ref);
 		}
 		return null;
 	}
-	
+
 	private static class ContributionResultHandlerImpl implements ContributionResultHandler {
 		private boolean cancled = false;
 		private IObservableList list;
-		
+
 		public ContributionResultHandlerImpl(IObservableList list) {
 			this.list = list;
 		}
-		
+
 		public void result(ContributionData data) {
-			if( ! cancled ) {
+			if (!cancled) {
 				list.add(data);
 			}
 		}
-		
+
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index ee2036a230..2b8028996a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -54,7 +54,6 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-@SuppressWarnings("restriction")
 public class FeatureSelectionDialog extends TitleAreaDialog {
 	private TreeViewer viewer;
 	private MStringModelFragment fragment;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index 085fc44bf0..f8a88bcd13 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -5,6 +5,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.Filter;
 import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.ModelResultHandler;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -57,7 +58,7 @@ public FindImportElementDialog(Shell parentShell, AbstractComponentEditor editor
 	protected Control createDialogArea(Composite parent) {
 		Composite comp = (Composite) super.createDialogArea(parent);
 
-		final Image titleImage = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/import_wiz.png"));
+		final Image titleImage = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/import_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
 
@@ -66,16 +67,16 @@ public void widgetDisposed(DisposeEvent e) {
 			}
 		});
 
-		getShell().setText("Find Import Elements");
-		setTitle("Find Import Elements");
-		setMessage("Search for an elements whose ID you'd like to import");
+		getShell().setText(Messages.FindImportElementDialog_ShellTitle);
+		setTitle(Messages.FindImportElementDialog_Title);
+		setMessage(Messages.FindImportElementDialog_Message);
 
 		Composite container = new Composite(comp, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 		container.setLayout(new GridLayout(2, false));
 
 		Label l = new Label(container, SWT.NONE);
-		l.setText("Search");
+		l.setText(Messages.FindImportElementDialog_Search);
 
 		final Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -94,7 +95,7 @@ public void update(ViewerCell cell) {
 				cell.setImage(editor.getImage(o, searchText.getDisplay()));
 
 				MApplicationElement appEl = (MApplicationElement) o;
-				StyledString styledString = new StyledString(editor.getLabel(o) + " (" + appEl.getElementId() + ")", null);
+				StyledString styledString = new StyledString(editor.getLabel(o) + " (" + (appEl.getElementId() == null ? "<" + Messages.FindImportElementDialog_noId + ">" : appEl.getElementId()) + ")", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 				String detailLabel = editor.getDetailLabel(o);
 				if (detailLabel != null && !detailLabel.equals(appEl.getElementId())) {
 					styledString.append(" - " + detailLabel, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
@@ -133,7 +134,7 @@ public void modifyText(ModifyEvent e) {
 		});
 
 		Button button = new Button(container, SWT.PUSH);
-		button.setText("Clear Cache");
+		button.setText(Messages.FindImportElementDialog_ClearCache);
 		button.setLayoutData(new GridData(GridData.END, GridData.CENTER, true, false, 2, 1));
 		button.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -157,7 +158,7 @@ protected void okPressed() {
 					super.okPressed();
 				}
 			} else {
-				setErrorMessage("You can not import an element without an ID");
+				setErrorMessage(Messages.FindImportElementDialog_NoIdReference);
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index c38bc0257a..0173faafee 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -9,6 +9,7 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.Util.InternalPackage;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
@@ -68,7 +69,7 @@ public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEdit
 	protected Control createDialogArea(Composite parent) {
 		Composite comp = (Composite) super.createDialogArea(parent);
 
-		final Image titleImage = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/import_wiz.png"));
+		final Image titleImage = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/import_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
 
@@ -77,16 +78,16 @@ public void widgetDisposed(DisposeEvent e) {
 			}
 		});
 
-		getShell().setText("Find Parent Elements");
-		setTitle("Find Parent Elements");
-		setMessage("Search for an elements who you like to references as parent");
+		getShell().setText(Messages.FindParentReferenceElementDialog_ShellTitle);
+		setTitle(Messages.FindParentReferenceElementDialog_Title);
+		setMessage(Messages.FindParentReferenceElementDialog_Message);
 
 		Composite container = new Composite(comp, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 		container.setLayout(new GridLayout(2, false));
 
 		Label l = new Label(container, SWT.NONE);
-		l.setText("Container-Type");
+		l.setText(Messages.FindParentReferenceElementDialog_ContainerType);
 
 		final ComboViewer eClassViewer = new ComboViewer(container);
 		eClassViewer.setLabelProvider(new LabelProvider() {
@@ -113,7 +114,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 		eClassViewer.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		l = new Label(container, SWT.NONE);
-		l.setText("Search");
+		l.setText(Messages.FindParentReferenceElementDialog_Search);
 
 		final Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -134,7 +135,7 @@ public void update(ViewerCell cell) {
 
 				MApplicationElement appEl = (MApplicationElement) o;
 
-				StyledString styledString = new StyledString(editor.getLabel(o) + " (" + (appEl.getElementId() == null ? "<no id>" : appEl.getElementId()) + ")", null);
+				StyledString styledString = new StyledString(editor.getLabel(o) + " (" + (appEl.getElementId() == null ? "<" + Messages.FindParentReferenceElementDialog_NoId + ">" : appEl.getElementId()) + ")", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 				String detailLabel = editor.getDetailLabel(o);
 				if (detailLabel != null && !detailLabel.equals(appEl.getElementId())) {
 					styledString.append(" - " + detailLabel, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
@@ -175,7 +176,7 @@ public void modifyText(ModifyEvent e) {
 		});
 
 		Button button = new Button(container, SWT.PUSH);
-		button.setText("Clear Cache");
+		button.setText(Messages.FindParentReferenceElementDialog_ClearCache);
 		button.setLayoutData(new GridData(GridData.END, GridData.CENTER, true, false, 2, 1));
 		button.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -199,7 +200,7 @@ protected void okPressed() {
 					super.okPressed();
 				}
 			} else {
-				setErrorMessage("You can not reference an element without an ID");
+				setErrorMessage(Messages.FindParentReferenceElementDialog_NoReferenceId);
 			}
 		}
 	}
@@ -221,8 +222,6 @@ private static class ModelResultHandlerImpl implements ModelResultHandler {
 		private AbstractComponentEditor editor;
 		private Resource resource;
 
-		private List<EObject> noId = new ArrayList<EObject>();
-
 		public ModelResultHandlerImpl(IObservableList list, Filter filter, AbstractComponentEditor editor, Resource resource) {
 			this.list = list;
 			this.filter = filter;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
index 39f72ebd90..778fb9b94d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
@@ -11,6 +11,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
@@ -21,29 +22,29 @@
 
 public class HandledMenuItemCommandSelectionDialog extends AbstractCommandSelectionDialog {
 	private MHandledItem handler;
-	
+
 	public HandledMenuItemCommandSelectionDialog(Shell parentShell, MHandledItem handler, IModelResource resource) {
 		super(parentShell, resource);
 		this.handler = handler;
 	}
-	
+
 	@Override
 	protected String getShellTitle() {
-		return  "MenuItem Command";
+		return Messages.HandledMenuItemCommandSelectionDialog_ShellTitle;
 	}
-	
+
 	@Override
 	protected String getDialogTitle() {
-		return "MenuItem-Command";
+		return Messages.HandledMenuItemCommandSelectionDialog_DialogTitle;
 	}
-	
+
 	@Override
 	protected String getDialogMessage() {
-		return "Connect the MenuItem to a command";
+		return Messages.HandledMenuItemCommandSelectionDialog_DialogMessage;
 	}
 
 	@Override
-	protected Command createStoreCommand( EditingDomain editingDomain, MCommand command) {
+	protected Command createStoreCommand(EditingDomain editingDomain, MCommand command) {
 		return SetCommand.create(editingDomain, handler, MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND, command);
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
index 8f9b0345d5..67b3ebc5ed 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
@@ -11,6 +11,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
@@ -21,29 +22,29 @@
 
 public class HandledToolItemCommandSelectionDialog extends AbstractCommandSelectionDialog {
 	private MHandledItem handler;
-	
+
 	public HandledToolItemCommandSelectionDialog(Shell parentShell, MHandledItem handler, IModelResource resource) {
 		super(parentShell, resource);
 		this.handler = handler;
 	}
-	
+
 	@Override
 	protected String getShellTitle() {
-		return  "ToolItem Command";
+		return Messages.HandledToolItemCommandSelectionDialog_ShellTitle;
 	}
-	
+
 	@Override
 	protected String getDialogTitle() {
-		return "ToolItem-Command";
+		return Messages.HandledToolItemCommandSelectionDialog_DialogTitle;
 	}
-	
+
 	@Override
 	protected String getDialogMessage() {
-		return "Connect the ToolItem to a command";
+		return Messages.HandledToolItemCommandSelectionDialog_DialogMessage;
 	}
 
 	@Override
-	protected Command createStoreCommand( EditingDomain editingDomain, MCommand command) {
+	protected Command createStoreCommand(EditingDomain editingDomain, MCommand command) {
 		return SetCommand.create(editingDomain, handler, MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND, command);
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
index ace3d85758..de38caa972 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
@@ -11,6 +11,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
@@ -21,29 +22,29 @@
 
 public class HandlerCommandSelectionDialog extends AbstractCommandSelectionDialog {
 	private MHandler handler;
-	
+
 	public HandlerCommandSelectionDialog(Shell parentShell, MHandler handler, IModelResource resource) {
 		super(parentShell, resource);
 		this.handler = handler;
 	}
-	
+
 	@Override
 	protected String getShellTitle() {
-		return  "Handler Command";
+		return Messages.HandlerCommandSelectionDialog_ShellTitle;
 	}
-	
+
 	@Override
 	protected String getDialogTitle() {
-		return "Handler-Command";
+		return Messages.HandlerCommandSelectionDialog_DialogTitle;
 	}
-	
+
 	@Override
 	protected String getDialogMessage() {
-		return "Connect the handler to a command";
+		return Messages.HandlerCommandSelectionDialog_DialogMessage;
 	}
 
 	@Override
-	protected Command createStoreCommand( EditingDomain editingDomain, MCommand command) {
+	protected Command createStoreCommand(EditingDomain editingDomain, MCommand command) {
 		return SetCommand.create(editingDomain, handler, CommandsPackageImpl.Literals.HANDLER__COMMAND, command);
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
index bda337ad84..a2c1405fc3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
@@ -11,6 +11,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
@@ -29,21 +30,21 @@ public KeyBindingCommandSelectionDialog(Shell parentShell, MKeyBinding binding,
 
 	@Override
 	protected String getShellTitle() {
-		return  "Keybinding Command";
+		return Messages.KeyBindingCommandSelectionDialog_ShellTitle;
 	}
-	
+
 	@Override
 	protected String getDialogTitle() {
-		return "Keybinding-Command";
+		return Messages.KeyBindingCommandSelectionDialog_DialogTitle;
 	}
-	
+
 	@Override
 	protected String getDialogMessage() {
-		return "Connect the keybinding to a command";
+		return Messages.KeyBindingCommandSelectionDialog_DialogMessage;
 	}
-	
+
 	@Override
-	protected Command createStoreCommand( EditingDomain editingDomain, MCommand command) {
+	protected Command createStoreCommand(EditingDomain editingDomain, MCommand command) {
 		return SetCommand.create(editingDomain, binding, CommandsPackageImpl.Literals.KEY_BINDING__COMMAND, command);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
index 704470cc14..353fe44267 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
@@ -1,6 +1,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -14,17 +15,16 @@ public MenuIconDialogEditor(Shell parentShell, IProject project, EditingDomain e
 
 	@Override
 	protected String getShellTitle() {
-		return "Menu Icon Search";
+		return Messages.MenuIconDialogEditor_ShellTitle;
 	}
 
 	@Override
 	protected String getDialogTitle() {
-		return "Menu Icon Search";
+		return Messages.MenuIconDialogEditor_DialogTitle;
 	}
 
 	@Override
 	protected String getDialogMessage() {
-		return "Search for GIF, PNG and JPG icons in the current project";
+		return Messages.MenuIconDialogEditor_DialogMessage;
 	}
-
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
index b35362f402..84d77b61c6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
@@ -1,6 +1,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -14,17 +15,16 @@ public MenuItemIconDialogEditor(Shell parentShell, IProject project, EditingDoma
 
 	@Override
 	protected String getShellTitle() {
-		return "Menu Item Icon Search";
+		return Messages.MenuItemIconDialogEditor_ShellTitle;
 	}
 
 	@Override
 	protected String getDialogTitle() {
-		return "Menu Item Icon Search";
+		return Messages.MenuItemIconDialogEditor_DialogTitle;
 	}
 
 	@Override
 	protected String getDialogMessage() {
-		return "Search for GIF, PNG and JPG icons in the current project";
+		return Messages.MenuItemIconDialogEditor_DialogMessage;
 	}
-
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
index 165cb83a7f..dcec7abad4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
@@ -1,6 +1,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -14,17 +15,16 @@ public PartDescriptorIconDialogEditor(Shell parentShell, IProject project, Editi
 
 	@Override
 	protected String getShellTitle() {
-		return "Part Descriptor Icon Search";
+		return Messages.PartDescriptorIconDialogEditor_ShellTitle;
 	}
 
 	@Override
 	protected String getDialogTitle() {
-		return "Part Descriptor Icon Search";
+		return Messages.PartDescriptorIconDialogEditor_DialogTitle;
 	}
 
 	@Override
 	protected String getDialogMessage() {
-		return "Search for GIF, PNG and JPG icons in the current project";
+		return Messages.PartDescriptorIconDialogEditor_DialogMessage;
 	}
-
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
index d2c0e3f8e1..29d47148cf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
@@ -1,6 +1,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -14,17 +15,17 @@ public PartIconDialogEditor(Shell parentShell, IProject project, EditingDomain e
 
 	@Override
 	protected String getShellTitle() {
-		return "Part Icon Search";
+		return Messages.PartIconDialogEditor_ShellTitle;
 	}
 
 	@Override
 	protected String getDialogTitle() {
-		return "Part Icon Search";
+		return Messages.PartIconDialogEditor_DialogTitle;
 	}
 
 	@Override
 	protected String getDialogMessage() {
-		return "Search for GIF, PNG and JPG icons in the current project";
+		return Messages.PartIconDialogEditor_DialogMessage;
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
index fecfb28384..2992f550f8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
@@ -1,6 +1,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -14,17 +15,16 @@ public PerspectiveIconDialogEditor(Shell parentShell, IProject project, EditingD
 
 	@Override
 	protected String getShellTitle() {
-		return "Perspective Icon Search";
+		return Messages.PerspectiveIconDialogEditor_ShellTitle;
 	}
 
 	@Override
 	protected String getDialogTitle() {
-		return "Perspective Icon Search";
+		return Messages.PerspectiveIconDialogEditor_DialogTitle;
 	}
 
 	@Override
 	protected String getDialogMessage() {
-		return "Search for GIF, PNG and JPG icons in the current project";
+		return Messages.PerspectiveIconDialogEditor_DialogMessage;
 	}
-
 }

From a182af3cdec4cda6742a137eb5e9ae86e7f9c043 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 18 Jul 2010 15:25:08 +0000
Subject: [PATCH 0238/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * some nls stuff

---
 .../e4/tools/emf/ui/internal/Messages.java       | 13 +++++++++++++
 .../e4/tools/emf/ui/internal/Messages.properties | 15 ++++++++++++++-
 .../component/dialogs/SharedElementsDialog.java  | 16 +++++++++-------
 .../dialogs/ToolItemIconDialogEditor.java        |  7 ++++---
 .../dialogs/WindowIconDialogEditor.java          |  8 ++++----
 5 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 34cd530daa..c077fc4c8a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -465,6 +465,19 @@ public class Messages extends NLS {
 	public static String PerspectiveIconDialogEditor_DialogTitle;
 	public static String PerspectiveIconDialogEditor_DialogMessage;
 
+	public static String SharedElementsDialog_ShellTitle;
+	public static String SharedElementsDialog_Title;
+	public static String SharedElementsDialog_Message;
+	public static String SharedElementsDialog_Name;
+
+	public static String ToolItemIconDialogEditor_ShellTitle;
+	public static String ToolItemIconDialogEditor_DialogTitle;
+	public static String ToolItemIconDialogEditor_DialogMessage;
+
+	public static String WindowIconDialogEditor_ShellTitle;
+	public static String WindowIconDialogEditor_DialogTitle;
+	public static String WindowIconDialogEditor_DialogMessage;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 44be9b210d..46a848d619 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -459,4 +459,17 @@ PartIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the curr
 
 PerspectiveIconDialogEditor_ShellTitle=Perspective Icon Search
 PerspectiveIconDialogEditor_DialogTitle=Perspective Icon Search
-PerspectiveIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
\ No newline at end of file
+PerspectiveIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
+
+SharedElementsDialog_ShellTitle=Find Shared Elements
+SharedElementsDialog_Title=Find Shared Elements
+SharedElementsDialog_Message=Find Shared Elements of an Window
+SharedElementsDialog_Name=Name
+
+ToolItemIconDialogEditor_ShellTitle=ToolItem Icon Search
+ToolItemIconDialogEditor_DialogTitle=ToolItem Icon Search
+ToolItemIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
+
+WindowIconDialogEditor_ShellTitle=Menu Icon Search
+WindowIconDialogEditor_DialogTitle=Menu Icon Search
+WindowIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index 0e1d33cf22..042cf486c3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -62,15 +63,16 @@ public SharedElementsDialog(Shell parentShell, ModelEditor editor, MPlaceholder
 	protected Control createDialogArea(Composite parent) {
 		Composite comp = (Composite) super.createDialogArea(parent);
 
-		setTitle("Find Shared Elements");
-		setMessage("Find Shared Elements of an Window");
+		getShell().setText(Messages.SharedElementsDialog_ShellTitle);
+		setTitle(Messages.SharedElementsDialog_Title);
+		setMessage(Messages.SharedElementsDialog_Message);
 
 		Composite container = new Composite(comp, SWT.NONE);
 		container.setLayout(new GridLayout(2, false));
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 
 		Label l = new Label(container, SWT.NONE);
-		l.setText("Name");
+		l.setText(Messages.SharedElementsDialog_Name);
 
 		Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -154,11 +156,11 @@ public void update(final ViewerCell cell) {
 			StyledString string = new StyledString(getTypename(o));
 
 			if (o instanceof MUILabel) {
-				string.append(" - " + ((MUILabel) o).getLabel(), StyledString.DECORATIONS_STYLER);
+				string.append(" - " + ((MUILabel) o).getLabel(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 			}
 
 			MApplicationElement el = (MApplicationElement) o;
-			string.append(" - " + el.getElementId(), StyledString.DECORATIONS_STYLER);
+			string.append(" - " + el.getElementId(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 
 			cell.setText(string.getString());
 			cell.setStyleRanges(string.getStyleRanges());
@@ -171,9 +173,9 @@ public String getText(Object element) {
 
 			if (el instanceof MUILabel) {
 				MUILabel label = (MUILabel) el;
-				return getTypename(o) + " - " + el.getElementId() + " - " + label.getLabel();
+				return getTypename(o) + " - " + el.getElementId() + " - " + label.getLabel(); //$NON-NLS-1$ //$NON-NLS-2$
 			} else {
-				return getTypename(o) + " - " + el.getElementId() + " - ";
+				return getTypename(o) + " - " + el.getElementId() + " - "; //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
index d11e1b3188..6f8f5d480e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
@@ -1,6 +1,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -14,17 +15,17 @@ public ToolItemIconDialogEditor(Shell parentShell, IProject project, EditingDoma
 
 	@Override
 	protected String getShellTitle() {
-		return "ToolItem Icon Search";
+		return Messages.ToolItemIconDialogEditor_ShellTitle;
 	}
 
 	@Override
 	protected String getDialogTitle() {
-		return "ToolItem Icon Search";
+		return Messages.ToolItemIconDialogEditor_DialogTitle;
 	}
 
 	@Override
 	protected String getDialogMessage() {
-		return "Search for GIF, PNG and JPG icons in the current project";
+		return Messages.ToolItemIconDialogEditor_DialogMessage;
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
index af108df53d..1db725693b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
@@ -1,6 +1,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -14,17 +15,16 @@ public WindowIconDialogEditor(Shell parentShell, IProject project, EditingDomain
 
 	@Override
 	protected String getShellTitle() {
-		return "Menu Icon Search";
+		return Messages.WindowIconDialogEditor_ShellTitle;
 	}
 
 	@Override
 	protected String getDialogTitle() {
-		return "Menu Icon Search";
+		return Messages.WindowIconDialogEditor_DialogTitle;
 	}
 
 	@Override
 	protected String getDialogMessage() {
-		return "Search for GIF, PNG and JPG icons in the current project";
+		return Messages.WindowIconDialogEditor_DialogMessage;
 	}
-
 }

From 2f27e1c4fbcf7e357e02d06e7c4f7e6e2faeb1d6 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 18 Jul 2010 15:32:27 +0000
Subject: [PATCH 0239/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * some nls stuff

---
 .../emf/ui/common/IModelElementProvider.java  |  2 +-
 .../e4/tools/emf/ui/common/ImageTooltip.java  | 99 ++++++++++---------
 .../e4/tools/emf/ui/internal/Messages.java    |  7 ++
 .../tools/emf/ui/internal/Messages.properties |  9 +-
 4 files changed, 66 insertions(+), 51 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
index a3c01b1645..ef5a1b0c54 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
@@ -13,7 +13,7 @@ public class Filter {
 		public Filter(EClass eClass, String elementId) {
 			this.eClass = eClass;
 			this.elementId = elementId;
-			this.elementIdPattern = Pattern.compile(".*" + elementId.replaceAll("\\.", "\\\\.").replaceAll("\\*", ".*") + ".*");
+			this.elementIdPattern = Pattern.compile(".*" + elementId.replaceAll("\\.", "\\\\.").replaceAll("\\*", ".*") + ".*"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
 		}
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
index 2c3a30ce8a..c5c51b36ac 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
@@ -8,6 +8,8 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.DecimalFormat;
+import java.text.MessageFormat;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.window.ToolTip;
@@ -21,7 +23,7 @@
 
 public abstract class ImageTooltip extends ToolTip {
 	private Image image;
-	
+
 	public ImageTooltip(Control control) {
 		super(control);
 
@@ -29,12 +31,12 @@ public ImageTooltip(Control control) {
 
 	@Override
 	protected boolean shouldCreateToolTip(Event event) {
-		if( getImageURI() != null ) {
-			return super.shouldCreateToolTip(event);	
+		if (getImageURI() != null) {
+			return super.shouldCreateToolTip(event);
 		}
 		return false;
 	}
-	
+
 	@Override
 	protected Composite createToolTipContentArea(Event event, Composite parent) {
 		clearResources();
@@ -43,43 +45,43 @@ protected Composite createToolTipContentArea(Event event, Composite parent) {
 		parent.setBackgroundMode(SWT.INHERIT_DEFAULT);
 		parent.setLayout(new GridLayout(2, false));
 
-		URI uri = getImageURI(); 
-		
-		if( uri != null ) {
+		URI uri = getImageURI();
+
+		if (uri != null) {
 			int fileSize = -1;
 			ByteArrayOutputStream out = null;
 			InputStream stream = null;
 			InputStream bStream = null;
-			String errorMessage = "<Unknow Error>";
+			String errorMessage = "<" + Messages.ImageTooltip_UnknownError + ">"; //$NON-NLS-1$ //$NON-NLS-2$
 			try {
 				URL url = new URL(uri.toString());
 				stream = url.openStream();
-				
-				if( stream != null ) {
+
+				if (stream != null) {
 					out = new ByteArrayOutputStream();
 					byte[] buf = new byte[1024];
 					int length;
-					while( ( length = stream.read(buf)) != -1 ) {
-						out.write(buf,0,length);
+					while ((length = stream.read(buf)) != -1) {
+						out.write(buf, 0, length);
 					}
 					fileSize = out.size();
 					bStream = new ByteArrayInputStream(out.toByteArray());
-					image = new Image(parent.getDisplay(),bStream);
+					image = new Image(parent.getDisplay(), bStream);
 				}
 			} catch (MalformedURLException e) {
 				errorMessage = e.getMessage();
 			} catch (FileNotFoundException e) {
-				if( uri.isPlatform() ) {
-					errorMessage = "File '" + e.getMessage() + "' not found in bundle '"+uri.segment(1)+"'";	
+				if (uri.isPlatform()) {
+					errorMessage = MessageFormat.format(Messages.ImageTooltip_FileNotFound, e.getMessage(), uri.segment(1));
 				} else {
 					errorMessage = e.getMessage();
 				}
 			} catch (IOException e) {
 				errorMessage = e.getMessage();
-			} catch(Exception e) {
+			} catch (Exception e) {
 				errorMessage = e.getMessage();
-			}finally {
-				if(out != null) {
+			} finally {
+				if (out != null) {
 					try {
 						out.close();
 					} catch (IOException e) {
@@ -87,8 +89,8 @@ protected Composite createToolTipContentArea(Event event, Composite parent) {
 						e.printStackTrace();
 					}
 				}
-				
-				if( bStream != null ) {
+
+				if (bStream != null) {
 					try {
 						bStream.close();
 					} catch (IOException e) {
@@ -96,8 +98,8 @@ protected Composite createToolTipContentArea(Event event, Composite parent) {
 						e.printStackTrace();
 					}
 				}
-				
-				if( stream != null ) {
+
+				if (stream != null) {
 					try {
 						stream.close();
 					} catch (IOException e) {
@@ -106,14 +108,14 @@ protected Composite createToolTipContentArea(Event event, Composite parent) {
 					}
 				}
 			}
-			
+
 			// ---------------------------------
 			Label l = new Label(parent, SWT.NONE);
 			l.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
-			l.setText("Icon:");
-			
-			l = new Label(parent,SWT.NONE);
-			if( image == null ) {
+			l.setText(Messages.ImageTooltip_Icon + ":"); //$NON-NLS-1$
+
+			l = new Label(parent, SWT.NONE);
+			if (image == null) {
 				System.err.println(errorMessage);
 				l.setText(errorMessage);
 			} else {
@@ -121,38 +123,37 @@ protected Composite createToolTipContentArea(Event event, Composite parent) {
 			}
 
 			// ---------------------------------
-			
+
 			l = new Label(parent, SWT.NONE);
 			l.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
-			l.setText("Name:");
-			
-			l = new Label(parent,SWT.NONE);
+			l.setText(Messages.ImageTooltip_Name + ":"); //$NON-NLS-1$
+
+			l = new Label(parent, SWT.NONE);
 			l.setText(uri.lastSegment());
-			
+
 			// ---------------------------------
-			
+
 			l = new Label(parent, SWT.NONE);
 			l.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
-			l.setText("Dimensions:");
-			
-			l = new Label(parent,SWT.NONE);
-			if( image != null ) {
-				l.setText(image.getBounds().width + "x" + image.getBounds().height+" px");	
+			l.setText(Messages.ImageTooltip_Dimension + ":"); //$NON-NLS-1$
+
+			l = new Label(parent, SWT.NONE);
+			if (image != null) {
+				l.setText(image.getBounds().width + "x" + image.getBounds().height + " px"); //$NON-NLS-1$ //$NON-NLS-2$
 			} else {
-				l.setText("0x0 px");
+				l.setText("0x0 px"); //$NON-NLS-1$
 			}
-			
 
 			// ---------------------------------
-			
+
 			l = new Label(parent, SWT.NONE);
 			l.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
-			l.setText("File-Size:");
-			
-			l = new Label(parent,SWT.NONE);
-			l.setText( new DecimalFormat("#,##0.00").format((fileSize / 1024.0)) + "KB" );			
+			l.setText(Messages.ImageTooltip_FileSize + ":"); //$NON-NLS-1$
+
+			l = new Label(parent, SWT.NONE);
+			l.setText(new DecimalFormat("#,##0.00").format((fileSize / 1024.0)) + "KB"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
-		
+
 		return parent;
 	}
 
@@ -161,11 +162,11 @@ protected void afterHideToolTip(Event event) {
 		super.afterHideToolTip(event);
 		clearResources();
 	}
-	
+
 	protected abstract URI getImageURI();
-	
+
 	private void clearResources() {
-		if( image != null ) {
+		if (image != null) {
 			image.dispose();
 			image = null;
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index c077fc4c8a..b84981ee0f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -478,6 +478,13 @@ public class Messages extends NLS {
 	public static String WindowIconDialogEditor_DialogTitle;
 	public static String WindowIconDialogEditor_DialogMessage;
 
+	public static String ImageTooltip_UnknownError;
+	public static String ImageTooltip_FileNotFound;
+	public static String ImageTooltip_Icon;
+	public static String ImageTooltip_Name;
+	public static String ImageTooltip_Dimension;
+	public static String ImageTooltip_FileSize;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 46a848d619..1d290945fc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -472,4 +472,11 @@ ToolItemIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the
 
 WindowIconDialogEditor_ShellTitle=Menu Icon Search
 WindowIconDialogEditor_DialogTitle=Menu Icon Search
-WindowIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
\ No newline at end of file
+WindowIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
+
+ImageTooltip_UnknownError=Unknown Error
+ImageTooltip_FileNotFound=File ''{0}'' not found in bundle ''{1}''
+ImageTooltip_Icon=Icon
+ImageTooltip_Name=Name
+ImageTooltip_Dimension=Dimensions
+ImageTooltip_FileSize=File-Size
\ No newline at end of file

From 01316c8efb958c2db0d465109aae3b2c6a9ed27d Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 18 Jul 2010 15:39:30 +0000
Subject: [PATCH 0240/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed copyrights

---
 .../emf/ui/common/IContributionClassCreator.java    | 10 ++++++++++
 .../e4/tools/emf/ui/common/IEditorDescriptor.java   | 11 +++++++++++
 .../e4/tools/emf/ui/common/IEditorFeature.java      | 13 ++++++++++++-
 .../tools/emf/ui/common/IModelElementProvider.java  | 10 ++++++++++
 .../emf/ui/common/ISelectionProviderService.java    | 10 ++++++++++
 .../e4/tools/emf/ui/common/ImageTooltip.java        | 10 ++++++++++
 .../org/eclipse/e4/tools/emf/ui/common/Util.java    | 10 ++++++++++
 .../component/dialogs/AbstractIconDialog.java       | 10 ++++++++++
 .../component/dialogs/FindImportElementDialog.java  | 10 ++++++++++
 .../dialogs/FindParentReferenceElementDialog.java   | 10 ++++++++++
 .../component/dialogs/MenuIconDialogEditor.java     | 10 ++++++++++
 .../component/dialogs/MenuItemIconDialogEditor.java | 10 ++++++++++
 .../dialogs/PartDescriptorIconDialogEditor.java     | 10 ++++++++++
 .../component/dialogs/PartIconDialogEditor.java     | 10 ++++++++++
 .../dialogs/PerspectiveIconDialogEditor.java        | 10 ++++++++++
 .../component/dialogs/SharedElementsDialog.java     | 10 ++++++++++
 .../component/dialogs/ToolItemIconDialogEditor.java | 10 ++++++++++
 .../component/dialogs/WindowIconDialogEditor.java   | 10 ++++++++++
 18 files changed, 183 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
index d60729a6bc..bbe72fed83 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
 import org.eclipse.core.resources.IProject;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java
index de57bc4ae2..2d5fd342fb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java
@@ -1,8 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
 import org.eclipse.emf.ecore.EClass;
 
 public interface IEditorDescriptor {
 	public EClass getEClass();
+
 	public Class<?> getEditorClass();
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
index 3771b73976..530f7b017b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
 import java.util.List;
@@ -8,11 +18,12 @@ public interface IEditorFeature {
 	public class FeatureClass {
 		public final String label;
 		public final EClass eClass;
-		
+
 		public FeatureClass(String label, EClass eClass) {
 			this.label = label;
 			this.eClass = eClass;
 		}
 	}
+
 	public List<FeatureClass> getFeatureClasses(EClass eClass, EStructuralFeature feature);
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
index ef5a1b0c54..a276bdc834 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
 import java.util.regex.Pattern;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java
index 3c1d3d5fcd..f4769f1377 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
 public interface ISelectionProviderService {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
index c5c51b36ac..255cbb728f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
 import java.io.ByteArrayInputStream;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index b7addc99de..755836fc0e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
 import java.util.ArrayList;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
index 7e72bc38db..3dbefb247f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import java.io.BufferedReader;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index f8a88bcd13..f5673911af 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index 0173faafee..b6823e6aba 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import java.util.ArrayList;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
index 353fe44267..e27843d1af 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
index 84d77b61c6..9e1812800e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
index dcec7abad4..6abf5c6d3a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
index 29d47148cf..7b7b48a632 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
index 2992f550f8..3e380367c2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index 042cf486c3..4ffc8cb35c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import java.util.ArrayList;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
index 6f8f5d480e..0966feb280 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
index 1db725693b..a112f7a30b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;

From d4289023d515573ee3f04fb73d65b5ebc309c698 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 19 Jul 2010 07:25:30 +0000
Subject: [PATCH 0241/1286] Bug 320218 -  Improve .product-File generated by e4
 Project Wizard * added mac specific settings

---
 .../templates/common/$projectName$.product        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product b/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
index d91c3d09e2..75ff15ff61 100644
--- a/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
+++ b/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
@@ -13,13 +13,13 @@
    <windowImages/>
 
    <plugins>
-      <plugin id="@@projectName@@"/>
+      <plugin id="@@projectName@@" fragment=""/>
       <plugin id="com.ibm.icu"/>
+      <plugin id="javax.annotation"/>
       <plugin id="javax.inject"/>
       <plugin id="org.apache.batik.css"/>
       <plugin id="org.apache.batik.util"/>
       <plugin id="org.apache.batik.util.gui"/>
-      <plugin id="org.apache.commons.beanutils"/>
       <plugin id="org.apache.commons.logging"/>
       <plugin id="org.eclipse.core.commands"/>
       <plugin id="org.eclipse.core.contenttype"/>
@@ -29,6 +29,7 @@
       <plugin id="org.eclipse.core.databinding.property"/>
       <plugin id="org.eclipse.core.expressions"/>
       <plugin id="org.eclipse.core.filesystem"/>
+      <plugin id="org.eclipse.core.filesystem.macosx" fragment="true"/>
       <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
       <plugin id="org.eclipse.core.jobs"/>
       <plugin id="org.eclipse.core.resources"/>
@@ -36,15 +37,18 @@
       <plugin id="org.eclipse.core.runtime"/>
       <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
       <plugin id="org.eclipse.e4.core.commands"/>
+      <plugin id="org.eclipse.e4.core.contexts"/>
+      <plugin id="org.eclipse.e4.core.di"/>
+      <plugin id="org.eclipse.e4.core.di.extensions"/>
       <plugin id="org.eclipse.e4.core.services"/>
-      <plugin id="org.eclipse.e4.core.services.annotations" fragment="true"/>
       <plugin id="org.eclipse.e4.ui.bindings"/>
       <plugin id="org.eclipse.e4.ui.css.core"/>
-      <plugin id="org.eclipse.e4.ui.css.nebula"/>
       <plugin id="org.eclipse.e4.ui.css.swt"/>
+      <plugin id="org.eclipse.e4.ui.css.swt.theme"/>
       <plugin id="org.eclipse.e4.ui.di"/>
       <plugin id="org.eclipse.e4.ui.model.workbench"/>
       <plugin id="org.eclipse.e4.ui.services"/>
+      <plugin id="org.eclipse.e4.ui.widgets"/>
       <plugin id="org.eclipse.e4.ui.workbench"/>
       <plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
       <plugin id="org.eclipse.e4.ui.workbench.swt"/>
@@ -64,12 +68,11 @@
       <plugin id="org.eclipse.equinox.util"/>
       <plugin id="org.eclipse.jface"/>
       <plugin id="org.eclipse.jface.databinding"/>
-      <plugin id="org.eclipse.nebula.widgets.gallery"/>
       <plugin id="org.eclipse.osgi"/>
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.swt"/>
+      <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
       <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
-      <plugin id="org.pushingpixels.trident"/>
       <plugin id="org.w3c.css.sac"/>
       <plugin id="org.w3c.dom.smil"/>
       <plugin id="org.w3c.dom.svg"/>

From f7c988533bbcdc442e881aa87c8c4700339c859d Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 19 Jul 2010 10:41:31 +0000
Subject: [PATCH 0242/1286] Bug 320218 -  Improve .product-File generated by e4
 Project Wizard

---
 .../templates/common/$projectName$.product                    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product b/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
index 75ff15ff61..1c236dcff2 100644
--- a/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
+++ b/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
@@ -13,7 +13,7 @@
    <windowImages/>
 
    <plugins>
-      <plugin id="@@projectName@@" fragment=""/>
+      <plugin id="@@projectName@@"/>
       <plugin id="com.ibm.icu"/>
       <plugin id="javax.annotation"/>
       <plugin id="javax.inject"/>
@@ -29,6 +29,7 @@
       <plugin id="org.eclipse.core.databinding.property"/>
       <plugin id="org.eclipse.core.expressions"/>
       <plugin id="org.eclipse.core.filesystem"/>
+      <plugin id="org.eclipse.core.filesystem.linux.x86" fragment="true"/>
       <plugin id="org.eclipse.core.filesystem.macosx" fragment="true"/>
       <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
       <plugin id="org.eclipse.core.jobs"/>
@@ -72,6 +73,7 @@
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.swt"/>
       <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
+      <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
       <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
       <plugin id="org.w3c.css.sac"/>
       <plugin id="org.w3c.dom.smil"/>

From 98d731c12079e1b96f2c99eb01ec3e256beb5ea5 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 19 Jul 2010 17:33:19 +0000
Subject: [PATCH 0243/1286] Bug 320218 -  Improve .product-File generated by e4
 Project Wizard * support all available platforms

---
 .../templates/common/$projectName$.product    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product b/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
index 1c236dcff2..4d69f3c61f 100644
--- a/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
+++ b/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
@@ -29,9 +29,15 @@
       <plugin id="org.eclipse.core.databinding.property"/>
       <plugin id="org.eclipse.core.expressions"/>
       <plugin id="org.eclipse.core.filesystem"/>
+      <plugin id="org.eclipse.core.filesystem.aix.ppc" fragment="true"/>
+      <plugin id="org.eclipse.core.filesystem.hpux.ia64_32" fragment="true"/>
+      <plugin id="org.eclipse.core.filesystem.linux.ppc" fragment="true"/>
       <plugin id="org.eclipse.core.filesystem.linux.x86" fragment="true"/>
+      <plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true"/>
       <plugin id="org.eclipse.core.filesystem.macosx" fragment="true"/>
+      <plugin id="org.eclipse.core.filesystem.solaris.sparc" fragment="true"/>
       <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.core.filesystem.win32.x86_64" fragment="true"/>
       <plugin id="org.eclipse.core.jobs"/>
       <plugin id="org.eclipse.core.resources"/>
       <plugin id="org.eclipse.core.resources.win32.x86" fragment="true"/>
@@ -72,9 +78,24 @@
       <plugin id="org.eclipse.osgi"/>
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.swt"/>
+      <plugin id="org.eclipse.swt.carbon.macosx" fragment="true"/>
+      <plugin id="org.eclipse.swt.cocoa.macosx" fragment="true"/>
       <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
+      <plugin id="org.eclipse.swt.gtk.linux.ppc" fragment="true"/>
+      <plugin id="org.eclipse.swt.gtk.linux.ppc64" fragment="true"/>
+      <plugin id="org.eclipse.swt.gtk.linux.s390" fragment="true"/>
+      <plugin id="org.eclipse.swt.gtk.linux.s390x" fragment="true"/>
       <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
+      <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
+      <plugin id="org.eclipse.swt.gtk.solaris.sparc" fragment="true"/>
+      <plugin id="org.eclipse.swt.gtk.solaris.x86" fragment="true"/>
+      <plugin id="org.eclipse.swt.motif.aix.ppc" fragment="true"/>
+      <plugin id="org.eclipse.swt.motif.hpux.ia64_32" fragment="true"/>
+      <plugin id="org.eclipse.swt.motif.linux.x86" fragment="true"/>
+      <plugin id="org.eclipse.swt.motif.solaris.sparc" fragment="true"/>
+      <plugin id="org.eclipse.swt.photon.qnx.x86" fragment="true"/>
       <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
       <plugin id="org.w3c.css.sac"/>
       <plugin id="org.w3c.dom.smil"/>
       <plugin id="org.w3c.dom.svg"/>

From 3360a9df61ed796483d14d2cbc17dd2014279112 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 20 Jul 2010 18:04:21 +0000
Subject: [PATCH 0244/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * add support for autogenerating the elementId * make
 it configurable through perferences

---
 .../plugin.xml                                |  8 ++
 .../editor3x/ModelEditorPreferencePage.java   | 74 +++++++++++++++++++
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../eclipse/e4/tools/emf/ui/common/Util.java  | 52 +++++++++++++
 .../component/AbstractComponentEditor.java    | 12 +++
 .../emf/ui/internal/common/ModelEditor.java   | 13 ++++
 .../component/BindingContextEditor.java       |  1 +
 .../common/component/BindingTableEditor.java  | 34 +--------
 .../common/component/CommandEditor.java       |  2 +
 .../component/HandledMenuItemEditor.java      |  2 +
 .../component/HandledToolItemEditor.java      |  3 +-
 .../common/component/KeyBindingEditor.java    | 48 ++++++++++++
 .../component/MenuContributionEditor.java     | 22 +-----
 .../internal/common/component/MenuEditor.java | 26 +------
 .../common/component/MenuSeparatorEditor.java |  6 +-
 .../component/PartDescriptorEditor.java       |  2 +
 .../internal/common/component/PartEditor.java |  2 +
 .../component/PartSashContainerEditor.java    |  1 +
 .../common/component/PartStackEditor.java     |  1 +
 .../common/component/PerspectiveEditor.java   |  1 +
 .../component/PerspectiveStackEditor.java     |  1 +
 .../component/ToolBarContributionEditor.java  | 27 +------
 .../common/component/ToolBarEditor.java       | 27 +------
 .../component/ToolBarSeparatorEditor.java     |  1 +
 .../common/component/TrimBarEditor.java       |  2 +
 .../component/TrimContributionEditor.java     |  2 +
 .../common/component/WindowEditor.java        |  2 +
 .../component/virtual/VApplicationAddons.java |  7 +-
 .../virtual/VApplicationCategoriesEditor.java |  3 +-
 .../virtual/VBindingTableEditor.java          |  2 +
 .../component/virtual/VCommandEditor.java     |  3 +-
 .../component/virtual/VHandlerEditor.java     |  3 +-
 .../virtual/VMenuContributionsEditor.java     |  3 +-
 .../common/component/virtual/VMenuEditor.java |  3 +-
 .../component/virtual/VPartDescriptor.java    |  3 +-
 .../virtual/VToolBarContributionsEditor.java  |  3 +-
 .../virtual/VTrimContributionsEditor.java     |  3 +-
 .../virtual/VWindowControlEditor.java         |  2 +
 .../component/virtual/VWindowEditor.java      |  1 +
 .../virtual/VWindowSharedElementsEditor.java  |  2 +-
 .../component/virtual/VWindowTrimEditor.java  |  2 +
 41 files changed, 272 insertions(+), 143 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index e232671bfb..389ebccf38 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -24,5 +24,13 @@
             class="org.eclipse.e4.tools.emf.editor3x.extension.AddonContributionEditor">
       </contributionClassCreator>
    </extension>
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            class="org.eclipse.e4.tools.emf.editor3x.ModelEditorPreferencePage"
+            id="org.eclipse.e4.tools.emf.editor3x.modeleditor"
+            name="Model Editor">
+      </page>
+   </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
new file mode 100644
index 0000000000..22c0eb0d41
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
@@ -0,0 +1,74 @@
+package org.eclipse.e4.tools.emf.editor3x;
+
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.osgi.service.prefs.BackingStoreException;
+
+public class ModelEditorPreferencePage extends PreferencePage implements
+		IWorkbenchPreferencePage {
+	private boolean autoCreateElementId;
+	private IEclipsePreferences node;
+	
+	public ModelEditorPreferencePage() {
+	}
+
+	public ModelEditorPreferencePage(String title) {
+		super(title);
+	}
+
+	public ModelEditorPreferencePage(String title, ImageDescriptor image) {
+		super(title, image);
+	}
+
+	public void init(IWorkbench workbench) {
+		node = new InstanceScope().getNode("org.eclipse.e4.tools.emf.ui");
+		autoCreateElementId = node.getBoolean("autoCreateElementId", false);
+	}
+
+	@Override
+	protected Control createContents(Composite parent) {
+		Composite result= new Composite(parent, SWT.NONE);
+		result.setLayout(new GridLayout(2,false));
+		
+		Label l = new Label(result, SWT.NONE);
+		l.setText("Autogenerate Element-Id");
+		final Button b = new Button(result, SWT.CHECK);
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				autoCreateElementId = b.getSelection();
+			}
+		});
+		
+		return result;
+	}
+	
+	@Override
+	public boolean performOk() {
+		node.putBoolean("autoCreateElementId", autoCreateElementId);
+		try {
+			node.flush();
+		} catch (BackingStoreException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return super.performOk();
+	}
+
+	@Override
+	public void dispose() {
+		super.dispose();
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 49f07ca6d0..ca0ea06334 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -27,7 +27,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",
  org.eclipse.e4.ui.di;bundle-version="0.9.0",
  javax.annotation;bundle-version="1.0.0",
- org.eclipse.e4.tools.services;bundle-version="1.0.0"
+ org.eclipse.e4.tools.services;bundle-version="1.0.0",
+ org.eclipse.e4.core.di.extensions;bundle-version="0.9.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.runtime.jobs,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index 755836fc0e..b23df112d2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -13,19 +13,25 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 
@@ -53,6 +59,52 @@ public static final void addClasses(EPackage ePackage, List<FeatureClass> list)
 		}
 	}
 
+	// TODO In future support different name formats something like
+	// ${project}.${classname}.${counter}
+	public static final String getDefaultElementId(Resource resource, MApplicationElement element, IProject project) {
+		try {
+			EObject o = (EObject) element;
+			String className = o.eClass().getName();
+			String projectName = project.getName();
+
+			String prefix = projectName + "." + className; //$NON-NLS-1$
+
+			TreeIterator<EObject> it = resource.getAllContents();
+			SortedSet<Integer> numbers = new TreeSet<Integer>();
+
+			while (it.hasNext()) {
+				EObject tmp = it.next();
+				if (tmp instanceof MApplicationElement) {
+					String elementId = ((MApplicationElement) tmp).getElementId();
+					if (elementId != null && elementId.length() > prefix.length() && elementId.startsWith(prefix)) {
+						String suffix = elementId.substring(prefix.length());
+						if (suffix.startsWith(".") && suffix.length() > 1) { //$NON-NLS-1$
+							try {
+								numbers.add(Integer.parseInt(suffix.substring(1)));
+							} catch (Exception e) {
+								// TODO: handle exception
+							}
+						}
+					}
+				}
+			}
+
+			int lastNumber = -1;
+			for (Integer number : numbers) {
+				if ((lastNumber + 1) != number) {
+					break;
+				}
+				lastNumber = number;
+			}
+
+			return prefix + "." + ++lastNumber; //$NON-NLS-1$
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+		}
+		return null;
+	}
+
 	public static List<InternalPackage> loadPackages() {
 		List<InternalPackage> packs = new ArrayList<InternalPackage>();
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index ab6a55b6b1..9b51f06d82 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -18,8 +18,11 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.resource.ImageRegistry;
@@ -70,6 +73,15 @@ public WritableValue getMaster() {
 		return master;
 	}
 
+	protected void setElementId(Object element) {
+		if (getEditor().isAutoCreateElementId() && element instanceof MApplicationElement) {
+			MApplicationElement el = (MApplicationElement) element;
+			if (el.getElementId() == null || el.getElementId().trim().length() == 0) {
+				el.setElementId(Util.getDefaultElementId(((EObject) getMaster().getValue()).eResource(), el, getEditor().getProject()));
+			}
+		}
+	}
+
 	public Image getImage(Display d, int id) {
 		Image img = IMG_REG.get(IMAGES[id]);
 		if (img == null) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index c26df49c18..227ce0a9a9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -35,6 +35,7 @@
 import org.eclipse.core.runtime.RegistryFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.core.di.extensions.Preference;
 import org.eclipse.e4.core.services.contributions.IContributionFactory;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
@@ -203,6 +204,10 @@ public class ModelEditor {
 	@Optional
 	private IClipboardService clipboardService;
 
+	@Inject
+	@Preference(nodePath = "org.eclipse.e4.tools.emf.ui", value = "autoCreateElementId")
+	private boolean autoCreateElementId;
+
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project) {
 		this.modelProvider = modelProvider;
 		this.project = project;
@@ -348,6 +353,14 @@ public void menuAboutToShow(IMenuManager manager) {
 		viewer.getControl().setMenu(mgr.createContextMenu(viewer.getControl()));
 	}
 
+	public boolean isAutoCreateElementId() {
+		return autoCreateElementId && project != null;
+	}
+
+	public IProject getProject() {
+		return project;
+	}
+
 	private void loadContributionCreators() {
 		IExtensionRegistry registry = RegistryFactory.getRegistry();
 		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 043af0ead8..d41b449ecf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -238,6 +238,7 @@ public void widgetSelected(SelectionEvent e) {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				MBindingContext eObject = MCommandsFactory.INSTANCE.createBindingContext();
+				setElementId(eObject);
 
 				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN, eObject);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index bf3b9a0ff9..27f0ddb38b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -20,12 +20,11 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BindingContextSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MBindingTable;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -35,7 +34,6 @@
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
@@ -48,7 +46,6 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -196,34 +193,7 @@ public void widgetSelected(SelectionEvent e) {
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.getTable().setHeaderVisible(true);
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_SEQUENCE__KEY_SEQUENCE);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText(Messages.BindingTableEditor_KeySequence);
-				column.getColumn().setWidth(100);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(CommandsPackageImpl.Literals.KEY_BINDING__COMMAND, CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME));
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText(Messages.BindingTableEditor_Command);
-				column.getColumn().setWidth(200);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText(Messages.ModelTooling_Common_Id);
-				column.getColumn().setWidth(170);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			IEMFListProperty prop = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
 			viewer.setInput(prop.observeDetail(getMaster()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index d49e28ca6b..66eb2063ad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -293,6 +293,8 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MCommandParameter param = MCommandsFactory.INSTANCE.createCommandParameter();
+					setElementId(param);
+
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS, param);
 
 					if (cmd.canExecute()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index 9e0edd8d72..a39b73c52d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -215,6 +215,8 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					MHandledItem item = (MHandledItem) master.getValue();
 					MParameter param = MCommandsFactory.INSTANCE.createParameter();
+					setElementId(param);
+
 					Command cmd = AddCommand.create(getEditingDomain(), item, MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, param);
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index df026640db..2b6131f23f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -122,7 +122,6 @@ public void widgetSelected(SelectionEvent e) {
 		final TableViewer viewer = new TableViewer(parent);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.heightHint = 120;
-		viewer.getTable().setHeaderVisible(true);
 		viewer.getControl().setLayoutData(gd);
 
 		ObservableListContentProvider cp = new ObservableListContentProvider();
@@ -182,6 +181,8 @@ public void widgetSelected(SelectionEvent e) {
 			public void widgetSelected(SelectionEvent e) {
 				MHandledItem item = (MHandledItem) master.getValue();
 				MParameter param = MCommandsFactory.INSTANCE.createParameter();
+				setElementId(param);
+
 				Command cmd = AddCommand.create(getEditingDomain(), item, MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, param);
 				if (cmd.canExecute()) {
 					getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index da37c076bd..a36f5ca915 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -42,6 +42,7 @@
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.bindings.keys.KeySequence;
@@ -52,6 +53,7 @@
 import org.eclipse.jface.fieldassist.FieldDecoration;
 import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -259,11 +261,55 @@ public void widgetSelected(SelectionEvent e) {
 		b.setText(Messages.ModelTooling_Common_Up);
 		b.setImage(getImage(b.getDisplay(), ARROW_UP));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MKeyBinding container = (MKeyBinding) getMaster().getValue();
+						int idx = container.getParameters().indexOf(obj) - 1;
+						if (idx >= 0) {
+							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS, obj, idx);
+
+							if (cmd.canExecute()) {
+								getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+
+					}
+				}
+			}
+		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Down);
 		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MKeyBinding container = (MKeyBinding) getMaster().getValue();
+						int idx = container.getParameters().indexOf(obj) + 1;
+						if (idx < container.getParameters().size()) {
+							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS, obj, idx);
+
+							if (cmd.canExecute()) {
+								getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+
+					}
+				}
+			}
+		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_AddEllipsis);
@@ -274,6 +320,8 @@ public void widgetSelected(SelectionEvent e) {
 			public void widgetSelected(SelectionEvent e) {
 				MKeyBinding item = (MKeyBinding) getMaster().getValue();
 				MParameter param = MCommandsFactory.INSTANCE.createParameter();
+				setElementId(param);
+
 				Command cmd = AddCommand.create(getEditingDomain(), item, CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS, param);
 				if (cmd.canExecute()) {
 					getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 6b2f8c44cc..51d3505992 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -21,10 +21,8 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -37,7 +35,6 @@
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -53,7 +50,6 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -230,27 +226,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.getTable().setHeaderVisible(true);
-
-			{
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText(Messages.MenuContributionEditor_MenuItemType);
-				column.getColumn().setWidth(300);
-				column.setLabelProvider(new ComponentLabelProvider(getEditor()));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText(Messages.MenuContributionEditor_MenuItemItemType);
-				column.getColumn().setWidth(100);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
 
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index e6fe4f9968..1c1dd4cc72 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -22,11 +22,9 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -43,7 +41,6 @@
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -59,7 +56,6 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -258,27 +254,7 @@ public void widgetSelected(SelectionEvent e) {
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
-			viewer.getControl().setLayoutData(gd);
-			viewer.getTable().setHeaderVisible(true);
-
-			{
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText(Messages.MenuEditor_MenuItemType);
-				column.getColumn().setWidth(300);
-				column.setLabelProvider(new ComponentLabelProvider(getEditor()));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText(Messages.MenuEditor_MenuItemItemType);
-				column.getColumn().setWidth(100);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 2671fd8573..4c4dd2d581 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -20,6 +20,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
@@ -134,7 +135,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
-		// TODO Should we add visible to mimic a GroupMarker of 3.x
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index b578fea993..c87f6e3a0d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -349,6 +349,8 @@ public void widgetSelected(SelectionEvent e) {
 
 	private void addToolBar() {
 		MToolBar menu = MMenuFactory.INSTANCE.createToolBar();
+		setElementId(menu);
+
 		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR, menu);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index f229becc7a..687678bc29 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -352,6 +352,8 @@ public void widgetSelected(SelectionEvent e) {
 
 	private void addToolBar() {
 		MToolBar menu = MMenuFactory.INSTANCE.createToolBar();
+		setElementId(menu);
+
 		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART__TOOLBAR, menu);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 4c04323ab2..d46b44c844 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -322,6 +322,7 @@ public void widgetSelected(SelectionEvent e) {
 					if (!childrenDropDown.getSelection().isEmpty()) {
 						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
 						EObject eObject = EcoreUtil.create(eClass);
+						setElementId(eObject);
 
 						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 4444a5d2b4..1e78ab803b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -284,6 +284,7 @@ public String getText(Object element) {
 				public void widgetSelected(SelectionEvent e) {
 					EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
 					EObject eObject = EcoreUtil.create(eClass);
+					setElementId(eObject);
 
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index f63ecb0918..cc84bf9516 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -346,6 +346,7 @@ public void widgetSelected(SelectionEvent e) {
 					if (!childrenDropDown.getSelection().isEmpty()) {
 						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
 						EObject eObject = EcoreUtil.create(eClass);
+						setElementId(eObject);
 
 						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 73446eda9b..213e53fd36 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -249,6 +249,7 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MPerspective eObject = MAdvancedFactory.INSTANCE.createPerspective();
+					setElementId(eObject);
 
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index d4f709e616..dbb39e9740 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -20,10 +20,8 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -36,7 +34,6 @@
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -52,7 +49,6 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -222,27 +218,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
-			viewer.getControl().setLayoutData(gd);
-			viewer.getTable().setHeaderVisible(true);
-
-			{
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText(Messages.ToolBarEditor_ToolbarItemsType);
-				column.getColumn().setWidth(300);
-				column.setLabelProvider(new ComponentLabelProvider(getEditor()));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText(Messages.ToolBarEditor_ToolbarItemsItemType);
-				column.getColumn().setWidth(100);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
@@ -329,6 +305,7 @@ public void widgetSelected(SelectionEvent e) {
 						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
 						EClass eClass = struct.eClass;
 						MToolBarElement eObject = (MToolBarElement) EcoreUtil.create(eClass);
+						setElementId(eObject);
 
 						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index b5c390acf9..91775b5e02 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -20,10 +20,8 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.ObservableColumnLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -36,7 +34,6 @@
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -52,7 +49,6 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -192,27 +188,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
-			viewer.getControl().setLayoutData(gd);
-			viewer.getTable().setHeaderVisible(true);
-
-			{
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText(Messages.ToolBarEditor_ToolbarItemsType);
-				column.getColumn().setWidth(300);
-				column.setLabelProvider(new ComponentLabelProvider(getEditor()));
-			}
-
-			{
-				IEMFEditValueProperty prop = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE);
-
-				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-				column.getColumn().setText(Messages.ToolBarEditor_ToolbarItemsItemType);
-				column.getColumn().setWidth(100);
-				column.setLabelProvider(new ObservableColumnLabelProvider<MHandler>(prop.observeDetail(cp.getKnownElements())));
-			}
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
@@ -299,6 +275,7 @@ public void widgetSelected(SelectionEvent e) {
 						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
 						EClass eClass = struct.eClass;
 						MToolBarElement eObject = (MToolBarElement) EcoreUtil.create(eClass);
+						setElementId(eObject);
 
 						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index b4688cb37b..f8bf808911 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -148,6 +148,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
 		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 304c84829c..eeb430d81d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -279,6 +279,8 @@ public String getText(Object element) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					EObject toolbar = EcoreUtil.create((EClass) ((IStructuredSelection) typeViewer.getSelection()).getFirstElement());
+					setElementId(toolbar);
+
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
 
 					if (cmd.canExecute()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 584f000ec1..a3d12e2a05 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -287,6 +287,8 @@ public String getText(Object element) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					EObject toolbar = EcoreUtil.create((EClass) ((IStructuredSelection) typeViewer.getSelection()).getFirstElement());
+					setElementId(toolbar);
+
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
 
 					if (cmd.canExecute()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index c1d9ae441c..b825ff1624 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -344,6 +344,8 @@ void removeMenu() {
 
 	void addMenu() {
 		MMenu menu = MMenuFactory.INSTANCE.createMenu();
+		setElementId(menu);
+
 		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__MAIN_MENU, menu);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index ee1777872b..f06206cdc1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -111,7 +111,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.getTable().setHeaderVisible(true);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -206,8 +205,10 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	private void handleAddAddon() {
-		MAddon command = MApplicationFactory.INSTANCE.createAddon();
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__ADDONS, command);
+		MAddon addon = MApplicationFactory.INSTANCE.createAddon();
+		setElementId(addon);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__ADDONS, addon);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index c682ea4c7f..dc92ad7eb2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -105,7 +105,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.getTable().setHeaderVisible(true);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -179,6 +178,8 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MCategory command = CommandsFactoryImpl.eINSTANCE.createCategory();
+					setElementId(command);
+
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES, command);
 
 					if (cmd.canExecute()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 67f6ed5754..6c09652695 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -174,6 +174,8 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MBindingTable command = MCommandsFactory.INSTANCE.createBindingTable();
+					setElementId(command);
+
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES, command);
 
 					if (cmd.canExecute()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 551b505675..1646f41202 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -104,7 +104,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.getTable().setHeaderVisible(true);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -178,6 +177,8 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MCommand command = CommandsFactoryImpl.eINSTANCE.createCommand();
+					setElementId(command);
+
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), commandsFeature, command);
 
 					if (cmd.canExecute()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 4825357548..2f5f7a6972 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -101,7 +101,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.getTable().setHeaderVisible(true);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -175,6 +174,8 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MHandler handler = MCommandsFactory.INSTANCE.createHandler();
+					setElementId(handler);
+
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, handler);
 
 					if (cmd.canExecute()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index f7e48213f9..4443cf1ce7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -101,7 +101,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.getTable().setHeaderVisible(true);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -175,6 +174,8 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MMenuContribution command = MMenuFactory.INSTANCE.createMenuContribution();
+					setElementId(command);
+
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS, command);
 
 					if (cmd.canExecute()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index a7678f8990..537f5a7626 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -104,7 +104,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.heightHint = 300;
 		viewer.getControl().setLayoutData(gd);
-		viewer.getTable().setHeaderVisible(true);
 		viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -179,6 +178,8 @@ public void widgetSelected(SelectionEvent e) {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				MMenu handler = MMenuFactory.INSTANCE.createMenu();
+				setElementId(handler);
+
 				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), feature, handler);
 
 				if (cmd.canExecute()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index 7e92a05fd7..cd3e2cb025 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -101,7 +101,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.getTable().setHeaderVisible(true);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -175,6 +174,8 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MPartDescriptor command = MBasicFactory.INSTANCE.createPartDescriptor();
+					setElementId(command);
+
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, command);
 
 					if (cmd.canExecute()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index 67228f0d83..f5e196921b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -101,7 +101,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.getTable().setHeaderVisible(true);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -175,6 +174,8 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MToolBarContribution command = MMenuFactory.INSTANCE.createToolBarContribution();
+					setElementId(command);
+
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS, command);
 
 					if (cmd.canExecute()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index 6166aaf8f8..84de2e6b21 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -101,7 +101,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.getTable().setHeaderVisible(true);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
@@ -175,6 +174,8 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MTrimContribution command = MMenuFactory.INSTANCE.createTrimContribution();
+					setElementId(command);
+
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS, command);
 
 					if (cmd.canExecute()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index f111c9ec46..4f4e3b9783 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -190,6 +190,8 @@ public void widgetSelected(SelectionEvent e) {
 
 						EObject eObject = EcoreUtil.create(eClass);
 
+						setElementId(eObject);
+
 						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 						if (cmd.canExecute()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 234af90722..b8995ff341 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -186,6 +186,7 @@ public String getText(Object element) {
 			public void widgetSelected(SelectionEvent e) {
 				EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
 				EObject handler = EcoreUtil.create(eClass);
+				setElementId(handler);
 
 				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 076f2cdb8a..5a1d061c68 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -197,8 +197,8 @@ public String getText(Object element) {
 				public void widgetSelected(SelectionEvent e) {
 					if (!childrenDropDown.getSelection().isEmpty()) {
 						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-
 						EObject eObject = EcoreUtil.create(eClass);
+						setElementId(eObject);
 
 						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, eObject);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index abc168cd8f..2e3a6a0be9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -118,6 +118,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					MTrimBar handler = MBasicFactory.INSTANCE.createTrimBar();
+					setElementId(handler);
+
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS, handler);
 
 					if (cmd.canExecute()) {

From 6f4c947de49d466c9ebacea1e459ad7e09fba011 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 20 Jul 2010 18:24:01 +0000
Subject: [PATCH 0245/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed overwriting existing model files

---
 .../tools/wizards/model/BaseApplicationModelWizard.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index ff59f7ef20..d6b5699180 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -75,6 +75,12 @@ public boolean performFinish() {
 			// Remember the file.
 			//
 			final IFile modelFile = getModelFile();
+			
+			if( modelFile.exists() ) {
+				if( ! MessageDialog.openQuestion(getShell(), "File exists", "The file already exists. Would you like to overwrite?")) {
+					return false;
+				}
+			}
 
 			// Do the work within an operation.
 			//
@@ -90,7 +96,7 @@ protected void execute(IProgressMonitor progressMonitor) {
 							// Get the URI of the model file.
 							//
 							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
-
+							
 							// Create a resource for this file.
 							//
 							Resource resource = resourceSet.createResource(fileURI);

From 852d975bf7dcb65c8b9b0833548bcbcda2952fdd Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 20 Jul 2010 18:27:30 +0000
Subject: [PATCH 0246/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed layout

---
 .../common/component/virtual/VModelFragmentsEditor.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index 3ed39f68a4..e67f9f8a4a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -170,7 +170,7 @@ public void widgetSelected(SelectionEvent e) {
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {

From 091a8fae7dc71701287092b47a4b03cf6a4eb63d Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 20 Jul 2010 19:15:53 +0000
Subject: [PATCH 0247/1286]  Bug 319687 -  [ModelTooling] Feature Description
 and Copyright incorrect  * adding Soyatec to the copyright

---
 .../org.eclipse.e4.core.tools.feature/feature.properties     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.properties b/features/org.eclipse.e4.core.tools.feature/feature.properties
index 70a37cf4d4..41626957c0 100755
--- a/features/org.eclipse.e4.core.tools.feature/feature.properties
+++ b/features/org.eclipse.e4.core.tools.feature/feature.properties
@@ -32,14 +32,15 @@ description=Eclipse e4 Modeltooling
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2009 BestSolution.at and others.\n\
+Copyright (c) 2010 BestSolution.at, Soyatec and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
 http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
-    BestSolution.at - initial API and implementation\n
+    BestSolution.at - initial API and implementation\n\
+    Soytec - initial API and implementation\n
 ################ end of copyright property ####################################
 
 # "licenseURL" property - URL of the "Feature License"

From 15ad9f9885da5fa59ea86ba5f04f141222854241 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 20 Jul 2010 19:33:27 +0000
Subject: [PATCH 0248/1286]  Bug 319687 -  [ModelTooling] Feature Description
 and Copyright incorrect  * fixed listener leaking  * fixed problem of setting
 selection on disposed control

---
 .../emf/ui/internal/common/ModelEditor.java   | 48 ++++++++++++++-----
 .../component/PartDescriptorEditor.java       |  4 +-
 .../internal/common/component/PartEditor.java | 11 +++--
 .../common/component/WindowEditor.java        |  4 +-
 4 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 227ce0a9a9..ad1a20a069 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -15,7 +15,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.annotation.PreDestroy;
 import javax.inject.Inject;
+import org.eclipse.core.databinding.ObservablesManager;
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.map.IMapChangeListener;
@@ -208,11 +210,14 @@ public class ModelEditor {
 	@Preference(nodePath = "org.eclipse.e4.tools.emf.ui", value = "autoCreateElementId")
 	private boolean autoCreateElementId;
 
+	private ObservablesManager obsManager;
+
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project) {
 		this.modelProvider = modelProvider;
 		this.project = project;
 		this.context = context;
 		this.context.set(ModelEditor.class, this);
+		this.obsManager = new ObservablesManager();
 
 		registerDefaultEditors();
 		registerVirtualEditors();
@@ -283,28 +288,39 @@ public void controlResized(ControlEvent e) {
 
 			public void selectionChanged(SelectionChangedEvent event) {
 				if (!event.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) event.getSelection();
+					final IStructuredSelection s = (IStructuredSelection) event.getSelection();
 					if (s.getFirstElement() instanceof EObject) {
 						EObject obj = (EObject) s.getFirstElement();
-						AbstractComponentEditor editor = getEditor(obj.eClass());
+						final AbstractComponentEditor editor = getEditor(obj.eClass());
 						if (editor != null) {
 							textLabel.setText(editor.getLabel(obj));
 							iconLabel.setImage(editor.getImage(obj, iconLabel.getDisplay()));
-							Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
-							comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
-							layout.topControl = comp;
-							contentContainer.layout(true);
+							obsManager.runAndCollect(new Runnable() {
+
+								public void run() {
+									Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
+									comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
+									layout.topControl = comp;
+									contentContainer.layout(true);
+								}
+							});
 						}
 					} else {
 						VirtualEntry<?> entry = (VirtualEntry<?>) s.getFirstElement();
-						AbstractComponentEditor editor = virtualEditors.get(entry.getId());
+						final AbstractComponentEditor editor = virtualEditors.get(entry.getId());
 						if (editor != null) {
 							textLabel.setText(editor.getLabel(entry));
 							iconLabel.setImage(editor.getImage(entry, iconLabel.getDisplay()));
-							Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
-							comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
-							layout.topControl = comp;
-							contentContainer.layout(true);
+							obsManager.runAndCollect(new Runnable() {
+
+								public void run() {
+									Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
+									comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
+									layout.topControl = comp;
+									contentContainer.layout(true);
+								}
+
+							});
 						}
 					}
 
@@ -681,6 +697,16 @@ public void setFocus() {
 		viewer.getControl().setFocus();
 	}
 
+	@PreDestroy
+	void dispose() {
+		try {
+			obsManager.dispose();
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+		}
+	}
+
 	public IModelResource getModelProvider() {
 		return modelProvider;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index c87f6e3a0d..c765096636 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -400,7 +400,7 @@ protected boolean accepted(Object o) {
 			public void handleValueChange(ValueChangeEvent event) {
 				if (event.diff.getOldValue() != null) {
 					list.remove(event.diff.getOldValue());
-					if (getMaster().getValue() == element) {
+					if (getMaster().getValue() == element && !createRemoveToolBar.isDisposed()) {
 						createRemoveToolBar.setSelection(false);
 					}
 
@@ -408,7 +408,7 @@ public void handleValueChange(ValueChangeEvent event) {
 
 				if (event.diff.getNewValue() != null) {
 					list.add(0, event.diff.getNewValue());
-					if (getMaster().getValue() == element) {
+					if (getMaster().getValue() == element && !createRemoveToolBar.isDisposed()) {
 						createRemoveToolBar.setSelection(true);
 					}
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 687678bc29..3404c41ee2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -372,7 +372,7 @@ protected void createSubformElements(Composite parent, EMFDataBindingContext con
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList getChildList(final Object element) {
 		final WritableList list = new WritableList();
 
 		if (getEditor().isModelFragment() && Util.isImport((EObject) element)) {
@@ -407,12 +407,17 @@ protected boolean accepted(Object o) {
 			public void handleValueChange(ValueChangeEvent event) {
 				if (event.diff.getOldValue() != null) {
 					list.remove(event.diff.getOldValue());
-					createRemoveToolBar.setSelection(false);
+					if (getMaster().getValue() == element && !createRemoveToolBar.isDisposed()) {
+						createRemoveToolBar.setSelection(false);
+					}
+
 				}
 
 				if (event.diff.getNewValue() != null) {
 					list.add(0, event.diff.getNewValue());
-					createRemoveToolBar.setSelection(true);
+					if (getMaster().getValue() == element && !createRemoveToolBar.isDisposed()) {
+						createRemoveToolBar.setSelection(true);
+					}
 				}
 			}
 		});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index b825ff1624..9af16c8c58 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -402,14 +402,14 @@ protected boolean accepted(Object o) {
 			public void handleValueChange(ValueChangeEvent event) {
 				if (event.diff.getOldValue() != null) {
 					list.remove(event.diff.getOldValue());
-					if (getMaster().getValue() == element) {
+					if (getMaster().getValue() == element && !createRemoveMainMenu.isDisposed()) {
 						createRemoveMainMenu.setSelection(false);
 					}
 				}
 
 				if (event.diff.getNewValue() != null) {
 					list.add(0, event.diff.getNewValue());
-					if (getMaster().getValue() == element) {
+					if (getMaster().getValue() == element && !createRemoveMainMenu.isDisposed()) {
 						createRemoveMainMenu.setSelection(true);
 					}
 				}

From b8a24dbff552faae14dd06f63862d3c3033281c7 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 20 Jul 2010 21:42:39 +0000
Subject: [PATCH 0249/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixing copyrights

---
 .../org.eclipse.e4.tools.compat/about.html    | 28 ++++++++++++
 .../build.properties                          |  3 +-
 .../build.properties                          |  4 +-
 .../org.eclipse.e4.tools.services/about.html  | 28 ++++++++++++
 .../build.properties                          |  3 +-
 bundles/org.eclipse.e4.tools/about.html       | 45 +++++++++++++++++++
 bundles/org.eclipse.e4.tools/build.properties |  3 +-
 7 files changed, 109 insertions(+), 5 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.compat/about.html
 create mode 100644 bundles/org.eclipse.e4.tools.services/about.html
 create mode 100644 bundles/org.eclipse.e4.tools/about.html

diff --git a/bundles/org.eclipse.e4.tools.compat/about.html b/bundles/org.eclipse.e4.tools.compat/about.html
new file mode 100644
index 0000000000..824948673d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/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>December 3, 2009</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/bundles/org.eclipse.e4.tools.compat/build.properties b/bundles/org.eclipse.e4.tools.compat/build.properties
index 4975ca25a1..b4866ecf76 100644
--- a/bundles/org.eclipse.e4.tools.compat/build.properties
+++ b/bundles/org.eclipse.e4.tools.compat/build.properties
@@ -2,5 +2,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               OSGI-INF/selectionproviderfunction.xml
+               OSGI-INF/,\
+               about.html
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/build.properties b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
index 0ab8a4447f..e0bc710666 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
@@ -3,9 +3,9 @@ bin.includes = .,\
                plugin.properties,\
                icons/,\
                about.html,\
-               OSGI-INF/contributioncollector.xml,\
                plugin.xml,\
-               css/
+               css/,\
+               OSGI-INF/
 output.. = bin/
 jars.compile.order = .
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.services/about.html b/bundles/org.eclipse.e4.tools.services/about.html
new file mode 100644
index 0000000000..824948673d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/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>December 3, 2009</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/bundles/org.eclipse.e4.tools.services/build.properties b/bundles/org.eclipse.e4.tools.services/build.properties
index 34d2e4d2da..17daa5b49c 100644
--- a/bundles/org.eclipse.e4.tools.services/build.properties
+++ b/bundles/org.eclipse.e4.tools.services/build.properties
@@ -1,4 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               about.html
diff --git a/bundles/org.eclipse.e4.tools/about.html b/bundles/org.eclipse.e4.tools/about.html
new file mode 100644
index 0000000000..c1343aa318
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/about.html
@@ -0,0 +1,45 @@
+<!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>December 3, 2009</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  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>Silk icon set Version 1.3</h4>
+<p>
+This plugin contains icons from the Silk icon set created by Mark James. The original files can
+be found at:
+<ul>
+<a href="http://www.famfamfam.com/lab/icons/silk/">http://www.famfamfam.com/lab/icons/silk/</a></ul>
+<p>The license can be found at:</p>
+<ul>
+ <li><a href="http://creativecommons.org/licenses/by/2.5/">http://creativecommons.org/licenses/by/2.5/</a></li>
+</ul>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/build.properties b/bundles/org.eclipse.e4.tools/build.properties
index 02422f7fd3..31b79e8de6 100644
--- a/bundles/org.eclipse.e4.tools/build.properties
+++ b/bundles/org.eclipse.e4.tools/build.properties
@@ -4,4 +4,5 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
-               templates/
+               templates/,\
+               about.html

From d7dc08a92a4bb060828aa577995b4d30a56fd96e Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 20 Jul 2010 21:48:47 +0000
Subject: [PATCH 0250/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * externalizing MANIFEST and plugin.xml informations

---
 .../META-INF/MANIFEST.MF                       |  2 +-
 .../OSGI-INF/l10n/bundle.properties            |  2 ++
 .../build.properties                           |  4 ++--
 .../META-INF/MANIFEST.MF                       |  2 +-
 .../OSGI-INF/l10n/bundle.properties            |  4 ++++
 .../build.properties                           |  3 ++-
 .../plugin.xml                                 |  4 ++--
 .../plugin.properties                          |  4 +++-
 bundles/org.eclipse.e4.tools.emf.ui/plugin.xml |  2 +-
 .../META-INF/MANIFEST.MF                       |  2 +-
 .../OSGI-INF/l10n/bundle.properties            |  2 ++
 .../build.properties                           |  3 ++-
 .../org.eclipse.e4.tools/META-INF/MANIFEST.MF  |  2 +-
 .../OSGI-INF/l10n/bundle.properties            | 11 +++++++++++
 bundles/org.eclipse.e4.tools/build.properties  |  3 ++-
 bundles/org.eclipse.e4.tools/plugin.xml        | 18 +++++++++---------
 16 files changed, 46 insertions(+), 22 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
 create mode 100644 bundles/org.eclipse.e4.tools.services/OSGI-INF/l10n/bundle.properties
 create mode 100644 bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 4225c5064e..db28661cb9 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Compat
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000000..b630aa038e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,2 @@
+#Properties file for org.eclipse.e4.tools.compat
+Bundle-Name = Compat
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/build.properties b/bundles/org.eclipse.e4.tools.compat/build.properties
index b4866ecf76..aac269a41e 100644
--- a/bundles/org.eclipse.e4.tools.compat/build.properties
+++ b/bundles/org.eclipse.e4.tools.compat/build.properties
@@ -2,6 +2,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               OSGI-INF/,\
-               about.html
+               about.html,\
+               OSGI-INF/
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index a521ba15df..444ded1a21 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Editor3x
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
 Bundle-Version: 0.9.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000000..565e1cd2af
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,4 @@
+#Properties file for org.eclipse.e4.tools.emf.editor3x
+editor.name = e4 Workbenchmodel Editor
+page.name = Model Editor
+Bundle-Name = Editor3x
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
index 4f0aef779f..72fab184b7 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
@@ -3,5 +3,6 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
-               OSGI-INF/
+               OSGI-INF/,\
+               about.html
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index 389ebccf38..0ca898f300 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -9,7 +9,7 @@
             extensions="e4xmi"
             icon="icons/full/obj16/application_view_tile.png"
             id="org.eclipse.e4.tools.emf.editor3x.e4wbm"
-            name="e4 Workbenchmodel Editor">
+            name="%editor.name">
       </editor>
    </extension>
    <extension
@@ -29,7 +29,7 @@
       <page
             class="org.eclipse.e4.tools.emf.editor3x.ModelEditorPreferencePage"
             id="org.eclipse.e4.tools.emf.editor3x.modeleditor"
-            name="Model Editor">
+            name="%page.name">
       </page>
    </extension>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties b/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties
index 14a799fbca..3d72871770 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties
@@ -2,7 +2,9 @@
 # <copyright>
 # </copyright>
 #
-# $Id$
+# $Id: plugin.properties,v 1.1 2010/03/03 21:12:20 tschindl Exp $
 
 pluginName = EMFUI Model
 providerName = www.example.org
+
+extension-point.name = Editors
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml b/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
index b3cd9703c8..b532b6c1b4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension-point id="org.eclipse.e4.tools.emf.ui.editors" name="Editors" schema="schema/org.eclipse.e4.tools.emf.ui.editors.exsd"/>
+   <extension-point id="org.eclipse.e4.tools.emf.ui.editors" name="%extension-point.name" schema="schema/org.eclipse.e4.tools.emf.ui.editors.exsd"/>
    <extension
          point="org.eclipse.e4.ui.css.swt.theme">
       <stylesheet
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 664eaddc1e..f4af0416bf 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Services
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.e4.tools.services/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools.services/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000000..b08f86c6c2
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,2 @@
+#Properties file for org.eclipse.e4.tools.services
+Bundle-Name = Services
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.services/build.properties b/bundles/org.eclipse.e4.tools.services/build.properties
index 17daa5b49c..b8bb95d7f8 100644
--- a/bundles/org.eclipse.e4.tools.services/build.properties
+++ b/bundles/org.eclipse.e4.tools.services/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               about.html
+               about.html,\
+               OSGI-INF/
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 756afee3b2..5906598513 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Tools
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
 Bundle-Version: 0.9.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000000..c9513f64d2
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,11 @@
+#Properties file for org.eclipse.e4.tools
+category.name = e4
+category.name.0 = Classes
+category.name.1 = Model
+wizard.name = e4 Application Project
+wizard.name.0 = New Application Model
+wizard.name.1 = New Model Fragment
+wizard.name.2 = New Handler Class
+wizard.name.3 = New Part Class
+wizard.name.4 = New Addon Class
+Bundle-Name = Tools
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/build.properties b/bundles/org.eclipse.e4.tools/build.properties
index 31b79e8de6..337436ebe9 100644
--- a/bundles/org.eclipse.e4.tools/build.properties
+++ b/bundles/org.eclipse.e4.tools/build.properties
@@ -5,4 +5,5 @@ bin.includes = META-INF/,\
                plugin.xml,\
                icons/,\
                templates/,\
-               about.html
+               about.html,\
+               OSGI-INF/
diff --git a/bundles/org.eclipse.e4.tools/plugin.xml b/bundles/org.eclipse.e4.tools/plugin.xml
index d00322a1c6..4efad6a0d4 100644
--- a/bundles/org.eclipse.e4.tools/plugin.xml
+++ b/bundles/org.eclipse.e4.tools/plugin.xml
@@ -5,16 +5,16 @@
          point="org.eclipse.ui.newWizards">
       <category
             id="org.eclipse.e4.tools"
-            name="e4">
+            name="%category.name">
       </category>
       <category
             id="org.eclipse.e4.tools.classes"
-            name="Classes"
+            name="%category.name.0"
             parentCategory="org.eclipse.e4.tools">
       </category>
       <category
             id="org.eclipse.e4.tools.model"
-            name="Model"
+            name="%category.name.1"
             parentCategory="org.eclipse.e4.tools">
       </category>
       <wizard
@@ -22,7 +22,7 @@
             class="org.eclipse.e4.internal.tools.wizards.project.E4NewProjectWizard"
             icon="platform:/plugin/org.eclipse.pde.ui/icons/etool16/newpprj_wiz.gif"
             id="org.eclipse.e4.tools.E4NewProjectWizard"
-            name="e4 Application Project"
+            name="%wizard.name"
             project="true">
       </wizard>
       <wizard
@@ -30,35 +30,35 @@
             class="org.eclipse.e4.internal.tools.wizards.model.NewApplicationModelWizard"
             icon="icons/full/obj16/application_view_tile.png"
             id="org.eclipse.e4.tools.newappmodel"
-            name="New Application Model">
+            name="%wizard.name.0">
       </wizard>
       <wizard
             category="org.eclipse.e4.tools/org.eclipse.e4.tools.model"
             class="org.eclipse.e4.internal.tools.wizards.model.NewContributionModelWizard"
             icon="icons/full/obj16/plugin.png"
             id="org.eclipse.e4.tools.newmodelfragment"
-            name="New Model Fragment">
+            name="%wizard.name.1">
       </wizard>
       <wizard
             category="org.eclipse.e4.tools/org.eclipse.e4.tools.classes"
             class="org.eclipse.e4.internal.tools.wizards.classes.NewHandlerClassWizard"
             icon="icons/full/obj16/class_obj.gif"
             id="org.eclipse.e4.tools.newhandler"
-            name="New Handler Class">
+            name="%wizard.name.2">
       </wizard>
       <wizard
             category="org.eclipse.e4.tools/org.eclipse.e4.tools.classes"
             class="org.eclipse.e4.internal.tools.wizards.classes.NewPartClassWizard"
             icon="icons/full/obj16/Part.gif"
             id="org.eclipse.e4.tools.newpart"
-            name="New Part Class">
+            name="%wizard.name.3">
       </wizard>
       <wizard
             category="org.eclipse.e4.tools/org.eclipse.e4.tools.classes"
             class="org.eclipse.e4.internal.tools.wizards.classes.NewAddonClassWizard"
             icon="icons/full/obj16/Addons.png"
             id="org.eclipse.e4.tools.newaddon"
-            name="New Addon Class">
+            name="%wizard.name.4">
       </wizard>
    </extension>
 

From af954c602a09b8a1c67fa4b8090c4f6aa0d703b5 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 20 Jul 2010 21:53:48 +0000
Subject: [PATCH 0251/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * externalizing MANIFEST and plugin.xml informations

---
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF    | 1 +
 .../OSGI-INF/l10n/bundle.properties                         | 3 ++-
 .../org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF  | 1 +
 .../OSGI-INF/l10n/bundle.properties                         | 3 ++-
 bundles/org.eclipse.e4.tools.emf.ui/plugin.properties       | 6 +++---
 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF  | 1 +
 .../OSGI-INF/l10n/bundle.properties                         | 3 ++-
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF           | 1 +
 .../org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties    | 3 ++-
 9 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index db28661cb9..0b4aea4d40 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
 Service-Component: OSGI-INF/selectionproviderfunction.xml
 Export-Package: org.eclipse.e4.tools.compat.parts
 Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties
index b630aa038e..767d1e6f4b 100644
--- a/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties
@@ -1,2 +1,3 @@
 #Properties file for org.eclipse.e4.tools.compat
-Bundle-Name = Compat
\ No newline at end of file
+Bundle-Name = Compat
+Bundle-Vendor = Eclipse.org
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 444ded1a21..5fa115467f 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -29,3 +29,4 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.jdt.ui;bundle-version="3.6.0"
 Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/projectfunction.xml, OSGI-INF/pdee4xmiprovider.xml
 Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
index 565e1cd2af..9042b1e4e4 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
@@ -1,4 +1,5 @@
 #Properties file for org.eclipse.e4.tools.emf.editor3x
 editor.name = e4 Workbenchmodel Editor
 page.name = Model Editor
-Bundle-Name = Editor3x
\ No newline at end of file
+Bundle-Name = Editor3x
+Bundle-Vendor = Eclipse.org
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties b/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties
index 3d72871770..a43449c01e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties
@@ -2,9 +2,9 @@
 # <copyright>
 # </copyright>
 #
-# $Id: plugin.properties,v 1.1 2010/03/03 21:12:20 tschindl Exp $
+# $Id: plugin.properties,v 1.2 2010/07/20 21:48:42 tschindl Exp $
 
-pluginName = EMFUI Model
-providerName = www.example.org
+pluginName = EMF ModelTooling UI
+providerName = Eclipse.org
 
 extension-point.name = Editors
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index f4af0416bf..08d062afb0 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -5,3 +5,4 @@ Bundle-SymbolicName: org.eclipse.e4.tools.services
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.e4.tools.services
+Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.e4.tools.services/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools.services/OSGI-INF/l10n/bundle.properties
index b08f86c6c2..190cbb9640 100644
--- a/bundles/org.eclipse.e4.tools.services/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.e4.tools.services/OSGI-INF/l10n/bundle.properties
@@ -1,2 +1,3 @@
 #Properties file for org.eclipse.e4.tools.services
-Bundle-Name = Services
\ No newline at end of file
+Bundle-Name = Services
+Bundle-Vendor = Eclipse.org
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 5906598513..3e8068527a 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -23,3 +23,4 @@ Bundle-Activator: org.eclipse.e4.internal.tools.ToolsPlugin
 Export-Package: org.eclipse.e4.internal.tools.wizards.classes;x-internal:=true,
  org.eclipse.e4.internal.tools.wizards.model;x-internal:=true,
  org.eclipse.e4.internal.tools.wizards.project;x-internal:=true
+Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
index c9513f64d2..af034d7e3f 100644
--- a/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
@@ -8,4 +8,5 @@ wizard.name.1 = New Model Fragment
 wizard.name.2 = New Handler Class
 wizard.name.3 = New Part Class
 wizard.name.4 = New Addon Class
-Bundle-Name = Tools
\ No newline at end of file
+Bundle-Name = Tools
+Bundle-Vendor = Eclipse.org
\ No newline at end of file

From 8f06e956941be8eb892c0d2fb3b1562e3e9d2482 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 21 Jul 2010 21:26:30 +0000
Subject: [PATCH 0252/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed tooling dialog title

---
 .../e4/internal/tools/wizards/model/NewModelFilePage.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
index b0e8fc0cdf..4cb85960be 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
@@ -53,8 +53,8 @@ public class NewModelFilePage extends WizardPage {
 	 */
 	public NewModelFilePage(ISelection selection, String defaultFilename) {
 		super("wizardPage");
-		setTitle("Multi-page Editor File");
-		setDescription("This wizard creates a new file with *.e4xmi extension that can be opened by a multi-page editor.");
+		setTitle("New application model");
+		setDescription("This wizard creates a new e4 application model");
 		this.selection = selection;
 		this.defaultFilename = defaultFilename;
 	}

From 708faf7a93bc82555582167a6539f532ae155b15 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 21 Jul 2010 21:33:39 +0000
Subject: [PATCH 0253/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * code layouting

---
 .../e4/tools/emf/ui/common/EStackLayout.java       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/EStackLayout.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/EStackLayout.java
index dee6098e7b..f416113015 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/EStackLayout.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/EStackLayout.java
@@ -17,18 +17,18 @@
 
 public class EStackLayout extends StackLayout {
 	private boolean onlyVisible;
-	
+
 	public EStackLayout() {
 		this(true);
 	}
-	
+
 	public EStackLayout(boolean onlyVisible) {
 		this.onlyVisible = onlyVisible;
 	}
-	
+
 	@Override
 	protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) {
-		if( topControl != null && onlyVisible ) {
+		if (topControl != null && onlyVisible) {
 			int maxWidth = 0;
 			int maxHeight = 0;
 			Point size = topControl.computeSize(wHint, hHint, flushCache);
@@ -36,8 +36,10 @@ protected Point computeSize(Composite composite, int wHint, int hHint, boolean f
 			maxHeight = Math.max(size.y, maxHeight);
 			int width = maxWidth + 2 * marginWidth;
 			int height = maxHeight + 2 * marginHeight;
-			if (wHint != SWT.DEFAULT) width = wHint;
-			if (hHint != SWT.DEFAULT) height = hHint;
+			if (wHint != SWT.DEFAULT)
+				width = wHint;
+			if (hHint != SWT.DEFAULT)
+				height = hHint;
 			return new Point(width, height);
 		}
 		return super.computeSize(composite, wHint, hHint, flushCache);

From 336cc5b11f3ac0f39443a97912ef708e15849b99 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 22 Jul 2010 14:02:59 +0000
Subject: [PATCH 0254/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * set the name of the file

---
 .../e4/tools/emf/editor3x/E4WorkbenchModelEditor.java      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
index 38b089228d..dd2194036f 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -13,6 +13,7 @@
 import org.eclipse.e4.tools.compat.parts.DIEditorPart;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource.ModelListener;
 import org.eclipse.e4.tools.emf.ui.internal.wbm.ApplicationModelEditor;
+import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.actions.ActionFactory;
 
 @SuppressWarnings("restriction")
@@ -36,6 +37,12 @@ public E4WorkbenchModelEditor() {
 		super(ApplicationModelEditor.class, COPY|CUT|PASTE);
 	}
 
+	@Override
+	public void createPartControl(Composite parent) {
+		super.createPartControl(parent);
+		setPartName(getEditorInput().getName());
+	}
+	
 	protected void makeActions() {
 		super.makeActions();
 		undoAction = new UndoAction(getComponent().getModelProvider());

From 5549602499bc084d9fb285a730a12bc66b83b5af Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 23 Jul 2010 12:41:50 +0000
Subject: [PATCH 0255/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed layout problem

---
 .../e4/tools/emf/ui/internal/common/component/MenuEditor.java | 4 ++++
 .../internal/common/component/ToolBarContributionEditor.java  | 4 ++++
 .../tools/emf/ui/internal/common/component/ToolBarEditor.java | 4 ++++
 .../common/component/virtual/VBindingTableEditor.java         | 2 +-
 .../common/component/virtual/VModelImportsEditor.java         | 2 +-
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 1c1dd4cc72..907cf6c162 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -254,6 +254,10 @@ public void widgetSelected(SelectionEvent e) {
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
+
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 120;
+			viewer.getControl().setLayoutData(gd);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index dbb39e9740..557fb7ed13 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -218,6 +218,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
+
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 120;
+			viewer.getControl().setLayoutData(gd);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 91775b5e02..ae4e0998b1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -188,6 +188,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
+
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 120;
+			viewer.getControl().setLayoutData(gd);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 6c09652695..6f806c1bf7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -99,7 +99,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			bindingViewer.setContentProvider(cp);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 180;
+			gd.heightHint = 300;
 			bindingViewer.getControl().setLayoutData(gd);
 			bindingViewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index 6ccec9918d..582d95e2b2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -110,7 +110,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer.setContentProvider(new ObservableListContentProvider());
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 200;
+			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);

From cf511351f47410a4c2fa0d8af69c4ab134ebc02b Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 23 Jul 2010 13:16:37 +0000
Subject: [PATCH 0256/1286] Bug 304584 -  [Tooling] Implement
 Workbench-Model-Tooling * fixed problem with not updating package root

---
 .../e4/internal/tools/wizards/classes/AbstractNewClassPage.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index fe4d7f7178..91584d662d 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -161,6 +161,7 @@ public void widgetDisposed(DisposeEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					IPackageFragmentRoot root = choosePackageRoot();
 					if( root != null ) {
+						froot = root;
 						clazz.setFragmentRoot(root);	
 					}
 					bd.updateModelToTarget(); //TODO Find out why this is needed

From 99cf31d21173b03cb0ef1f9a4bb013d361240d75 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 24 Jul 2010 08:58:50 +0000
Subject: [PATCH 0257/1286] Bug 320788 -  [Model] The model misses the
 possibility to define mnemonics for Menu-Elements

---
 .../eclipse/e4/tools/emf/ui/internal/Messages.java  |  1 +
 .../e4/tools/emf/ui/internal/Messages.properties    |  1 +
 .../internal/common/component/MenuItemEditor.java   | 13 +++++++++++++
 3 files changed, 15 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index b84981ee0f..e66cdca324 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -130,6 +130,7 @@ public class Messages extends NLS {
 	public static String MenuEditor_MainMenu;
 	public static String MenuItemEditor_Enabled;
 	public static String MenuItemEditor_Selected;
+	public static String MenuItemEditor_Mnemonics;
 
 	public static String MenuSeparatorEditor_Label;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 1d290945fc..595bb5a4d2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -126,6 +126,7 @@ MenuItemEditor_Tooltip=Tooltip
 MenuItemEditor_IconURI=Icon URI
 MenuItemEditor_Enabled=Enabled
 MenuItemEditor_Selected=Selected
+MenuItemEditor_Mnemonics=Mnemonics
 
 MenuSeparatorEditor_Label=Separator
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index b2e23a046d..23d606399d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -191,6 +191,19 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
 		}
 
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuItemEditor_Mnemonics);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ITEM__MNEMONICS).observeDetail(master));
+		}
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);

From fe2c728948431e2713ddbc83c10496be032fb661 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 24 Jul 2010 17:54:58 +0000
Subject: [PATCH 0258/1286] Bug 320819 -  [ModelTooling] Generated canExecute()
 should return value

---
 .../tools/wizards/classes/templates/HandlerTemplate.java        | 2 +-
 bundles/org.eclipse.e4.tools/templates/handler.txtjet           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
index ddf80d9149..70ec397a07 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
@@ -21,7 +21,7 @@ public static synchronized HandlerTemplate create(String lineSeparator)
   protected final String TEXT_5 = " {" + NL + "\t@Execute" + NL + "\tpublic void ";
   protected final String TEXT_6 = "() {" + NL + "\t\t//TODO Your code goes here" + NL + "\t}" + NL + "\t";
   protected final String TEXT_7 = NL + "\t" + NL + "\t@CanExecute" + NL + "\tpublic boolean ";
-  protected final String TEXT_8 = "() {" + NL + "\t\t//TODO Your code goes here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_8 = "() {" + NL + "\t\t//TODO Your code goes here" + NL + "\t\treturn true;" + NL + "\t}" + NL + "\t";
   protected final String TEXT_9 = "\t" + NL + "}";
 
   public String generate(Object argument)
diff --git a/bundles/org.eclipse.e4.tools/templates/handler.txtjet b/bundles/org.eclipse.e4.tools/templates/handler.txtjet
index 27c7d75d51..7dfd8fd6e6 100644
--- a/bundles/org.eclipse.e4.tools/templates/handler.txtjet
+++ b/bundles/org.eclipse.e4.tools/templates/handler.txtjet
@@ -17,6 +17,7 @@ public class <%= domainClass.getName() %> {
 	@CanExecute
 	public boolean <%= domainClass.getCanExecuteMethodName() %>() {
 		//TODO Your code goes here
+		return true;
 	}
 	<% } %>	
 }
\ No newline at end of file

From 1999748cbe445d8c23b0ecaf075a0779b529bc05 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 24 Jul 2010 23:08:20 +0000
Subject: [PATCH 0259/1286]  Bug 320617 -  [ModelTooling] Undo/Redo not working
 in 4.0

---
 .../eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
index dd2194036f..eff3aa3a7d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -14,6 +14,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelResource.ModelListener;
 import org.eclipse.e4.tools.emf.ui.internal.wbm.ApplicationModelEditor;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IWorkbenchCommandConstants;
 import org.eclipse.ui.actions.ActionFactory;
 
 @SuppressWarnings("restriction")
@@ -46,7 +47,10 @@ public void createPartControl(Composite parent) {
 	protected void makeActions() {
 		super.makeActions();
 		undoAction = new UndoAction(getComponent().getModelProvider());
+		undoAction.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_UNDO);
+		
 		redoAction = new RedoAction(getComponent().getModelProvider());
+		redoAction.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_REDO);
 
 		getEditorSite().getActionBars().setGlobalActionHandler(
 				ActionFactory.UNDO.getId(), undoAction);

From d0a13a8d2d4ad5b71841948e6b0cc4ca47cc9799 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 25 Jul 2010 13:47:11 +0000
Subject: [PATCH 0260/1286] Bug 320842 -  [ModelTooling] Editing of Expressions
 not available

---
 .../full/modelelements/CoreExpression.png     | Bin 0 -> 603 bytes
 .../e4/tools/emf/ui/internal/Messages.java    |   8 +
 .../tools/emf/ui/internal/Messages.properties |  10 +-
 .../emf/ui/internal/common/ModelEditor.java   |   6 +
 .../component/CoreExpressionEditor.java       | 104 +++++++++
 .../component/DirectMenuItemEditor.java       |  33 +++
 .../component/DirectToolItemEditor.java       |  33 +++
 .../component/HandledMenuItemEditor.java      | 160 +++----------
 .../component/HandledToolItemEditor.java      | 121 +---------
 .../virtual/VItemParametersEditor.java        | 217 ++++++++++++++++++
 10 files changed, 453 insertions(+), 239 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CoreExpression.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CoreExpression.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CoreExpression.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c76bd1297751b66230f74719504b2adb02b1615
GIT binary patch
literal 603
zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz?MXyIR5;6x
zlRZz{P!xtKLzj*)5~W+GmLUkKYs6nbq#%Sq3aOY16$mC4en49#LkcQYL6Ei*pjMPh
zojYVgqzf!S6l}*|wVl|p^8s&tZm@AkP_gvL(mnS)KIiz}E&yGG`}Da)Tn7KcW0!6}
zFCd6Gj-%J>^~*-1fljz_B$LUvK}k?BNXe#Y!m=zM!!V#}8bncK5<w7<N~L^>m;8VP
zw86G*RI63?Cd%b9bX|ueNlZ|wR6rj|r_)VIP@r2imh3?SN+^{|kY%~8B{maJ@F*OK
z&VH9LwOeGt#DRjj0~v~8`>iO7!Ybi;zE$va`A^T#yW`y44;k^#O~K5*jD=qcUhPSc
zv<j0@B{UCJRc{2(R!(DMUqyR%UqXDl2u^iakk_i1-Vs6T<C!A%vMOtbW<nxgFtRNe
zOFtFFHo3;pnc31~E^lFMi^u#o5u+b2U|J575We8a>yy~<I%m&(DPm&n0-W5efGU~#
z#DUgF)(Y7Dt@^{I^UyMb@I<!f`Ql+NzQJKUnP<Vtj~rfR1SD1qkaY*OT8%-;Z36lW
z4}1Hg@l+neZ_Zip#rpyh=>q;5H_1WT1l~cqje9yfa+l!hu6xjdOJ8s;8E^+=QQ$tw
p?%p!Hy#YapB=@+^9(46X{{RQg%9y;OKjr`c002ovPDHLkV1g7l326WT

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index e66cdca324..cf1c9ddab8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -486,6 +486,14 @@ public class Messages extends NLS {
 	public static String ImageTooltip_Dimension;
 	public static String ImageTooltip_FileSize;
 
+	public static String VItemParametersEditor_TreeLabel;
+	public static String VItemParametersEditor_TreeLabelDescription;
+	public static String VItemParametersEditor_Parameters;
+
+	public static String CoreExpressionEditor_TreeLabel;
+	public static String CoreExpressionEditor_TreeLabelDescription;
+	public static String CoreExpressionEditor_ExpressionId;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 595bb5a4d2..094bc6f80a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -480,4 +480,12 @@ ImageTooltip_FileNotFound=File ''{0}'' not found in bundle ''{1}''
 ImageTooltip_Icon=Icon
 ImageTooltip_Name=Name
 ImageTooltip_Dimension=Dimensions
-ImageTooltip_FileSize=File-Size
\ No newline at end of file
+ImageTooltip_FileSize=File-Size
+
+VItemParametersEditor_TreeLabel=Parameters
+VItemParametersEditor_TreeLabelDescription=Parameters Bla Bla Bla
+VItemParametersEditor_Parameters=Parameters
+
+CoreExpressionEditor_TreeLabel=Core Expression
+CoreExpressionEditor_TreeLabelDescription=Core Expression Bla Bla Bla
+CoreExpressionEditor_ExpressionId=Expression Id
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index ad1a20a069..35c0cd19ac 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -57,6 +57,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CategoryEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CommandEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CommandParameterEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.CoreExpressionEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectMenuItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledMenuItemEditor;
@@ -94,6 +95,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VBindingTableEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VCommandEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VItemParametersEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuContributionsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelFragmentsEditor;
@@ -187,6 +189,7 @@ public class ModelEditor {
 	public static final String VIRTUAL_MODEL_FRAGEMENTS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_FRAGEMENTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_MODEL_IMPORTS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_IMPORTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_CATEGORIES = ModelEditor.class.getName() + ".VIRTUAL_CATEGORIES"; //$NON-NLS-1$
+	public static final String VIRTUAL_PARAMETERS = ModelEditor.class.getName() + ".VIRTUAL_PARAMETERS"; //$NON-NLS-1$
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private Map<String, AbstractComponentEditor> virtualEditors = new HashMap<String, AbstractComponentEditor>();
@@ -553,6 +556,7 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_MODEL_FRAGEMENTS, new VModelFragmentsEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_MODEL_IMPORTS, new VModelImportsEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_CATEGORIES, new VApplicationCategoriesEditor(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_PARAMETERS, new VItemParametersEditor(modelProvider.getEditingDomain(), this));
 	}
 
 	private void registerVirtualEditor(String id, AbstractComponentEditor editor) {
@@ -616,6 +620,8 @@ private void registerDefaultEditors() {
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION, new ToolBarContributionEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION, new TrimContributionEditor(modelProvider.getEditingDomain(), this));
 
+		registerEditor(UiPackageImpl.Literals.CORE_EXPRESSION, new CoreExpressionEditor(modelProvider.getEditingDomain(), this));
+
 		registerEditor(BasicPackageImpl.Literals.PART, new PartEditor(modelProvider.getEditingDomain(), this, project));
 		registerEditor(BasicPackageImpl.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain(), this, project));
 		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW, new TrimmedWindowEditor(modelProvider.getEditingDomain(), this, project));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
new file mode 100644
index 0000000000..91eff9ede5
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.ui.MCoreExpression;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class CoreExpressionEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private Image image;
+	private EMFDataBindingContext context;
+
+	public CoreExpressionEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain, editor);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if (image == null) {
+			try {
+				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CoreExpression.png")); //$NON-NLS-1$
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		return image;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.CoreExpressionEditor_TreeLabel;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		if (((MCoreExpression) element).getCoreExpressionId() != null && ((MCoreExpression) element).getCoreExpressionId().trim().length() > 0) {
+			return ((MCoreExpression) element).getCoreExpressionId();
+		}
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return Messages.CoreExpressionEditor_TreeLabelDescription;
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			composite = new Composite(parent, SWT.NONE);
+			composite.setLayout(new FillLayout());
+			createForm(composite, context, getMaster());
+		}
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		ControlFactory.createTextField(parent, Messages.CoreExpressionEditor_ExpressionId, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.CORE_EXPRESSION__CORE_EXPRESSION_ID));
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 2b06123e4d..b51f905d0e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -12,6 +12,10 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
@@ -21,8 +25,12 @@
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -40,6 +48,7 @@
 import org.eclipse.swt.widgets.Text;
 
 public class DirectMenuItemEditor extends MenuItemEditor {
+	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
 	public DirectMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain, editor, project);
@@ -119,4 +128,28 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		final WritableList list = new WritableList();
+
+		if (((MHandledMenuItem) element).getVisibleWhen() != null) {
+			list.add(0, ((MHandledMenuItem) element).getVisibleWhen());
+		}
+
+		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() {
+
+			public void handleValueChange(ValueChangeEvent event) {
+				if (event.diff.getOldValue() != null) {
+					list.remove(event.diff.getOldValue());
+				}
+
+				if (event.diff.getNewValue() != null) {
+					list.add(0, event.diff.getNewValue());
+				}
+			}
+		});
+
+		return list;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 6f6bb09643..edd8257c25 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -12,6 +12,10 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
@@ -21,8 +25,12 @@
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -40,6 +48,7 @@
 import org.eclipse.swt.widgets.Text;
 
 public class DirectToolItemEditor extends ToolItemEditor {
+	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
 	public DirectToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
 		super(editingDomain, editor, project);
@@ -116,4 +125,28 @@ public String getLabel(Object element) {
 	public String getDescription(Object element) {
 		return Messages.DirectToolItemEditor_Description;
 	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		final WritableList list = new WritableList();
+
+		if (((MHandledMenuItem) element).getVisibleWhen() != null) {
+			list.add(0, ((MHandledMenuItem) element).getVisibleWhen());
+		}
+
+		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() {
+
+			public void handleValueChange(ValueChangeEvent event) {
+				if (event.diff.getOldValue() != null) {
+					list.remove(event.diff.getOldValue());
+				}
+
+				if (event.diff.getNewValue() != null) {
+					list.add(0, event.diff.getNewValue());
+				}
+			}
+		});
+
+		return list;
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index a39b73c52d..f3c933dfa2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -13,40 +13,37 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledMenuItemCommandSelectionDialog;
-import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
-import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -57,6 +54,7 @@ public class HandledMenuItemEditor extends MenuItemEditor {
 	private IModelResource resource;
 
 	private IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
+	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
 	public HandledMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IModelResource resource) {
 		super(editingDomain, editor, project);
@@ -124,130 +122,36 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 		}
+	}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.HandledMenuItemEditor_Parameters);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-			final TableViewer viewer = new TableViewer(parent);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 120;
-			viewer.getControl().setLayoutData(gd);
-
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
-
-			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
-			viewer.setInput(prop.observeDetail(master));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MHandledItem container = (MHandledItem) getMaster().getValue();
-							int idx = container.getParameters().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
+	@Override
+	public IObservableList getChildList(Object element) {
+		final WritableList list = new WritableList();
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MHandledItem container = (MHandledItem) getMaster().getValue();
-							int idx = container.getParameters().indexOf(obj) + 1;
-							if (idx < container.getParameters().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
+		if (((MHandledMenuItem) element).getVisibleWhen() != null) {
+			list.add(0, ((MHandledMenuItem) element).getVisibleWhen());
+		}
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					MHandledItem item = (MHandledItem) master.getValue();
-					MParameter param = MCommandsFactory.INSTANCE.createParameter();
-					setElementId(param);
-
-					Command cmd = AddCommand.create(getEditingDomain(), item, MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, param);
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(param);
-					}
-				}
-			});
+		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() {
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.addSelectionListener(new SelectionAdapter() {
+			public void handleValueChange(ValueChangeEvent event) {
+				if (event.diff.getOldValue() != null) {
+					list.remove(event.diff.getOldValue());
+				}
 
-				public void widgetSelected(SelectionEvent e) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (!s.isEmpty()) {
-						MHandledItem item = (MHandledItem) master.getValue();
-						Command cmd = RemoveCommand.create(getEditingDomain(), item, MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, s.toList());
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
+				if (event.diff.getNewValue() != null) {
+					list.add(0, event.diff.getNewValue());
 				}
+			}
+		});
 
-			});
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		}
-	}
+		list.add(new VirtualEntry<MParameter>(ModelEditor.VIRTUAL_PARAMETERS, HANDLED_ITEM__PARAMETERS, element, Messages.HandledMenuItemEditor_Parameters) {
+			@Override
+			protected boolean accepted(MParameter o) {
+				return true;
+			}
+		});
 
-	@Override
-	public IObservableList getChildList(Object element) {
-		return HANDLED_ITEM__PARAMETERS.observe(element);
+		return list;
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 2b6131f23f..b07ababcc3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -13,40 +13,31 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledToolItemCommandSelectionDialog;
-import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
-import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -112,104 +103,6 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 		}
-
-		// ------------------------------------------------------------
-
-		Label l = new Label(parent, SWT.NONE);
-		l.setText(Messages.HandledToolItemEditor_Parameters);
-		l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-		final TableViewer viewer = new TableViewer(parent);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.heightHint = 120;
-		viewer.getControl().setLayoutData(gd);
-
-		ObservableListContentProvider cp = new ObservableListContentProvider();
-		viewer.setContentProvider(cp);
-		viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
-
-		IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
-		viewer.setInput(prop.observeDetail(getMaster()));
-
-		Composite buttonComp = new Composite(parent, SWT.NONE);
-		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		GridLayout gl = new GridLayout();
-		gl.marginLeft = 0;
-		gl.marginRight = 0;
-		gl.marginWidth = 0;
-		gl.marginHeight = 0;
-		buttonComp.setLayout(gl);
-
-		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Up);
-		b.setImage(getImage(b.getDisplay(), ARROW_UP));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						MHandledItem container = (MHandledItem) getMaster().getValue();
-						int idx = container.getParameters().indexOf(obj) - 1;
-						if (idx >= 0) {
-							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, obj, idx);
-
-							if (cmd.canExecute()) {
-								getEditingDomain().getCommandStack().execute(cmd);
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
-				}
-			}
-		});
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Down);
-		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_AddEllipsis);
-		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				MHandledItem item = (MHandledItem) master.getValue();
-				MParameter param = MCommandsFactory.INSTANCE.createParameter();
-				setElementId(param);
-
-				Command cmd = AddCommand.create(getEditingDomain(), item, MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, param);
-				if (cmd.canExecute()) {
-					getEditingDomain().getCommandStack().execute(cmd);
-					getEditor().setSelection(param);
-				}
-			}
-		});
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Remove);
-		b.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-				if (!s.isEmpty()) {
-					MHandledItem item = (MHandledItem) master.getValue();
-					Command cmd = RemoveCommand.create(getEditingDomain(), item, MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, s.toList());
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-					}
-				}
-			}
-
-		});
-		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
 	}
 
 	@Override
@@ -224,7 +117,15 @@ public String getDescription(Object element) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		return HANDLED_ITEM__PARAMETERS.observe(element);
+		WritableList list = new WritableList();
+		list.add(new VirtualEntry<MParameter>(ModelEditor.VIRTUAL_PARAMETERS, HANDLED_ITEM__PARAMETERS, element, Messages.HandledToolItemEditor_Parameters) {
+			@Override
+			protected boolean accepted(MParameter o) {
+				return true;
+			}
+		});
+
+		return list;
 	}
 
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
new file mode 100644
index 0000000000..de21d72f1b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -0,0 +1,217 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import java.util.List;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
+import org.eclipse.e4.ui.model.application.commands.MParameter;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VItemParametersEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private TableViewer viewer;
+
+	private IEMFListProperty HANDLED_ITEM__PARAMETERS = EMFProperties.list(MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
+
+	public VItemParametersEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain, editor);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.VItemParametersEditor_TreeLabel;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return Messages.VItemParametersEditor_TreeLabelDescription;
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent, context, getMaster());
+		}
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.VItemParametersEditor_Parameters);
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Up);
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MHandledItem container = (MHandledItem) getMaster().getValue();
+							int idx = container.getParameters().indexOf(obj) - 1;
+							if (idx >= 0) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Down);
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MHandledItem container = (MHandledItem) getMaster().getValue();
+							int idx = container.getParameters().indexOf(obj) + 1;
+							if (idx < container.getParameters().size()) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MParameter handler = MCommandsFactory.INSTANCE.createParameter();
+					setElementId(handler);
+
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, handler);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						getEditor().setSelection(handler);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Remove);
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> handlers = ((IStructuredSelection) viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, handlers);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return HANDLED_ITEM__PARAMETERS.observe(element);
+	}
+}

From 118c62134a7f93a00e5429d874b01a427ed14808 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 25 Jul 2010 14:35:50 +0000
Subject: [PATCH 0261/1286] Bug 320842 -  [ModelTooling] Editing of Expressions
 not available

---
 .../e4/tools/emf/ui/internal/Messages.java    |  3 +
 .../tools/emf/ui/internal/Messages.properties |  3 +
 .../component/DirectMenuItemEditor.java       |  6 +-
 .../component/DirectToolItemEditor.java       |  6 +-
 .../component/HandledToolItemEditor.java      | 28 ++++++++-
 .../common/component/MenuItemEditor.java      | 63 ++++++++++++++++++-
 .../common/component/ToolItemEditor.java      | 58 +++++++++++++++++
 7 files changed, 158 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index cf1c9ddab8..11b3de3d1c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -24,6 +24,7 @@ public class Messages extends NLS {
 
 	public static String ModelTooling_UIElement_ToBeRendered;
 	public static String ModelTooling_UIElement_Visible;
+	public static String ModelTooling_UIElement_VisibleWhen;
 
 	public static String ModelTooling_Context_Variables;
 	public static String ModelTooling_Context_Properties;
@@ -131,6 +132,7 @@ public class Messages extends NLS {
 	public static String MenuItemEditor_Enabled;
 	public static String MenuItemEditor_Selected;
 	public static String MenuItemEditor_Mnemonics;
+	public static String MenuItemEditor_NoExpression;
 
 	public static String MenuSeparatorEditor_Label;
 
@@ -308,6 +310,7 @@ public class Messages extends NLS {
 	public static String ToolItemEditor_IconURI;
 	public static String ToolItemEditor_Enabled;
 	public static String ToolItemEditor_Selected;
+	public static String ToolItemEditor_NoExpression;
 
 	public static String TrimBarEditor_TreeLabel;
 	public static String TrimBarEditor_TreeLabelDescription;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 094bc6f80a..c3bd06e041 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -19,6 +19,7 @@ ModelTooling_Common_FindEllipsis=Find ...
 
 ModelTooling_UIElement_ToBeRendered=To Be Rendered
 ModelTooling_UIElement_Visible=Visible
+ModelTooling_UIElement_VisibleWhen=Visible-When Expression
 
 ModelTooling_Context_Variables=Variables
 ModelTooling_Context_Properties=Context Properties
@@ -127,6 +128,7 @@ MenuItemEditor_IconURI=Icon URI
 MenuItemEditor_Enabled=Enabled
 MenuItemEditor_Selected=Selected
 MenuItemEditor_Mnemonics=Mnemonics
+MenuItemEditor_NoExpression=<None>
 
 MenuSeparatorEditor_Label=Separator
 
@@ -304,6 +306,7 @@ ToolItemEditor_ToolTip=Tooltip
 ToolItemEditor_IconURI=Icon URI
 ToolItemEditor_Enabled=Enabled
 ToolItemEditor_Selected=Selected
+ToolItemEditor_NoExpression=<None>
 
 TrimBarEditor_TreeLabel=Window Trim
 TrimBarEditor_TreeLabelDescription=Window Trim bla bla bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index b51f905d0e..c8b5e32363 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -26,7 +26,7 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MDirectMenuItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -133,8 +133,8 @@ public void widgetSelected(SelectionEvent e) {
 	public IObservableList getChildList(Object element) {
 		final WritableList list = new WritableList();
 
-		if (((MHandledMenuItem) element).getVisibleWhen() != null) {
-			list.add(0, ((MHandledMenuItem) element).getVisibleWhen());
+		if (((MDirectMenuItem) element).getVisibleWhen() != null) {
+			list.add(0, ((MDirectMenuItem) element).getVisibleWhen());
 		}
 
 		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index edd8257c25..5370368e8c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -26,7 +26,7 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MDirectToolItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -130,8 +130,8 @@ public String getDescription(Object element) {
 	public IObservableList getChildList(Object element) {
 		final WritableList list = new WritableList();
 
-		if (((MHandledMenuItem) element).getVisibleWhen() != null) {
-			list.add(0, ((MHandledMenuItem) element).getVisibleWhen());
+		if (((MDirectToolItem) element).getVisibleWhen() != null) {
+			list.add(0, ((MDirectToolItem) element).getVisibleWhen());
 		}
 
 		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index b07ababcc3..4b81e066f2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -14,6 +14,8 @@
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
@@ -24,10 +26,14 @@
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledToolItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -46,7 +52,9 @@
 
 public class HandledToolItemEditor extends ToolItemEditor {
 	private IModelResource resource;
+
 	private IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
+	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
 	public HandledToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IModelResource resource) {
 		super(editingDomain, editor, project);
@@ -117,7 +125,25 @@ public String getDescription(Object element) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		WritableList list = new WritableList();
+		final WritableList list = new WritableList();
+
+		if (((MHandledToolItem) element).getVisibleWhen() != null) {
+			list.add(0, ((MHandledToolItem) element).getVisibleWhen());
+		}
+
+		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() {
+
+			public void handleValueChange(ValueChangeEvent event) {
+				if (event.diff.getOldValue() != null) {
+					list.remove(event.diff.getOldValue());
+				}
+
+				if (event.diff.getNewValue() != null) {
+					list.add(0, event.diff.getNewValue());
+				}
+			}
+		});
+
 		list.add(new VirtualEntry<MParameter>(ModelEditor.VIRTUAL_PARAMETERS, HANDLED_ITEM__PARAMETERS, element, Messages.HandledToolItemEditor_Parameters) {
 			@Override
 			protected boolean accepted(MParameter o) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 23d606399d..b02b02c7ca 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -12,6 +12,8 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -36,13 +38,16 @@
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -291,10 +296,37 @@ public Object convert(Object fromObject) {
 
 		}
 
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.ModelTooling_UIElement_VisibleWhen);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			ComboViewer combo = new ComboViewer(parent);
+			combo.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			combo.setContentProvider(new ArrayContentProvider());
+			combo.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					if (element instanceof EClass) {
+						EClass eClass = (EClass) element;
+						return eClass.getName();
+					}
+
+					return super.getText(element);
+				}
+			});
+			List<Object> list = new ArrayList<Object>();
+			list.add(Messages.MenuItemEditor_NoExpression);
+			list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
+			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
+			combo.setInput(list);
+			context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject()), new UpdateValueStrategy().setConverter(new EObject2EClass()));
+		}
+
 		createFormSubTypeForm(parent, context, master);
 
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
@@ -321,4 +353,31 @@ public String getDetailLabel(Object element) {
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
+
+	static class EObject2EClass extends Converter {
+		public EObject2EClass() {
+			super(EObject.class, EClass.class);
+		}
+
+		public Object convert(Object fromObject) {
+			if (fromObject == null) {
+				return Messages.MenuItemEditor_NoExpression;
+			}
+			return ((EObject) fromObject).eClass();
+		}
+	}
+
+	static class EClass2EObject extends Converter {
+
+		public EClass2EObject() {
+			super(EClass.class, EObject.class);
+		}
+
+		public Object convert(Object fromObject) {
+			if (fromObject == null || fromObject.toString().equals(Messages.MenuItemEditor_NoExpression)) {
+				return null;
+			}
+			return EcoreUtil.create((EClass) fromObject);
+		}
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 3b893b6162..598b692249 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.util.ArrayList;
+import java.util.List;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -34,13 +36,16 @@
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -237,6 +242,32 @@ public Object convert(Object fromObject) {
 
 		}
 
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.ModelTooling_UIElement_VisibleWhen);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			ComboViewer combo = new ComboViewer(parent);
+			combo.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			combo.setContentProvider(new ArrayContentProvider());
+			combo.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					if (element instanceof EClass) {
+						EClass eClass = (EClass) element;
+						return eClass.getName();
+					}
+
+					return super.getText(element);
+				}
+			});
+			List<Object> list = new ArrayList<Object>();
+			list.add(Messages.ToolItemEditor_NoExpression);
+			list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
+			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
+			combo.setInput(list);
+			context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject()), new UpdateValueStrategy().setConverter(new EObject2EClass()));
+		}
 		// ------------------------------------------------------------
 
 		createSubTypeFormElements(parent, context, master);
@@ -271,4 +302,31 @@ public String getDetailLabel(Object element) {
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__TOOLTIP), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
+
+	static class EObject2EClass extends Converter {
+		public EObject2EClass() {
+			super(EObject.class, EClass.class);
+		}
+
+		public Object convert(Object fromObject) {
+			if (fromObject == null) {
+				return Messages.MenuItemEditor_NoExpression;
+			}
+			return ((EObject) fromObject).eClass();
+		}
+	}
+
+	static class EClass2EObject extends Converter {
+
+		public EClass2EObject() {
+			super(EClass.class, EObject.class);
+		}
+
+		public Object convert(Object fromObject) {
+			if (fromObject == null || fromObject.toString().equals(Messages.MenuItemEditor_NoExpression)) {
+				return null;
+			}
+			return EcoreUtil.create((EClass) fromObject);
+		}
+	}
 }

From e5ccc124c6dac384d02e2bdeba1a980931f45d7c Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 25 Jul 2010 15:09:45 +0000
Subject: [PATCH 0262/1286] Bug 320842 -  [ModelTooling] Editing of Expressions
 not available

---
 .../e4/tools/emf/ui/internal/Messages.java    |   5 +
 .../tools/emf/ui/internal/Messages.properties |   7 +-
 .../emf/ui/internal/common/ModelEditor.java   |   3 +
 .../internal/common/component/MenuEditor.java | 203 ++++----------
 .../virtual/VMenuElementsEditor.java          | 248 ++++++++++++++++++
 5 files changed, 318 insertions(+), 148 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuElementsEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 11b3de3d1c..ac2bd8eea2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -123,6 +123,7 @@ public class Messages extends NLS {
 	public static String MenuEditor_LabelLabel;
 	public static String MenuEditor_Tooltip;
 	public static String MenuEditor_IconURI;
+	public static String MenuEditor_Children;
 
 	public static String MenuItemEditor_Type;
 	public static String MenuItemEditor_Label;
@@ -497,6 +498,10 @@ public class Messages extends NLS {
 	public static String CoreExpressionEditor_TreeLabelDescription;
 	public static String CoreExpressionEditor_ExpressionId;
 
+	public static String VMenuElementsEditor_TreeLabel;
+	public static String VMenuElementsEditor_TreeLabelDescription;
+	public static String VMenuElementsEditor_Children;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index c3bd06e041..220a454f1c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -120,6 +120,7 @@ MenuEditor_LabelLabel=Label
 MenuEditor_Tooltip=Tooltip
 MenuEditor_IconURI=Icon URI
 MenuEditor_MainMenu=Main Menu
+MenuEditor_Children=Children
 
 MenuItemEditor_Type=Type
 MenuItemEditor_Label=Label
@@ -491,4 +492,8 @@ VItemParametersEditor_Parameters=Parameters
 
 CoreExpressionEditor_TreeLabel=Core Expression
 CoreExpressionEditor_TreeLabelDescription=Core Expression Bla Bla Bla
-CoreExpressionEditor_ExpressionId=Expression Id
\ No newline at end of file
+CoreExpressionEditor_ExpressionId=Expression Id
+
+VMenuElementsEditor_TreeLabel=Children
+VMenuElementsEditor_TreeLabelDescription=Children Bla Bla Bla
+VMenuElementsEditor_Children=Children
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 35c0cd19ac..4158827582 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -98,6 +98,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VItemParametersEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuContributionsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuElementsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelFragmentsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelImportsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartDescriptor;
@@ -190,6 +191,7 @@ public class ModelEditor {
 	public static final String VIRTUAL_MODEL_IMPORTS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_IMPORTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_CATEGORIES = ModelEditor.class.getName() + ".VIRTUAL_CATEGORIES"; //$NON-NLS-1$
 	public static final String VIRTUAL_PARAMETERS = ModelEditor.class.getName() + ".VIRTUAL_PARAMETERS"; //$NON-NLS-1$
+	public static final String VIRTUAL_MENUELEMENTS = ModelEditor.class.getName() + ".VIRTUAL_MENUELEMENTS"; //$NON-NLS-1$
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private Map<String, AbstractComponentEditor> virtualEditors = new HashMap<String, AbstractComponentEditor>();
@@ -557,6 +559,7 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_MODEL_IMPORTS, new VModelImportsEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_CATEGORIES, new VApplicationCategoriesEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_PARAMETERS, new VItemParametersEditor(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_MENUELEMENTS, new VMenuElementsEditor(modelProvider.getEditingDomain(), this));
 	}
 
 	private void registerVirtualEditor(String id, AbstractComponentEditor editor) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 907cf6c162..888a19128f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -12,8 +12,13 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
+import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
@@ -22,40 +27,33 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EClass2EObject;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EObject2EClass;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
-import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
-import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -76,20 +74,9 @@ public class MenuEditor extends AbstractComponentEditor {
 	private IProject project;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 	private EStackLayout stackLayout;
 
-	private static class Struct {
-		private final String label;
-		private final EClass eClass;
-		private final boolean separator;
-
-		public Struct(String label, EClass eClass, boolean separator) {
-			this.label = label;
-			this.eClass = eClass;
-			this.separator = separator;
-		}
-	}
-
 	public MenuEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
 		super(editingDomain, editor);
 		this.project = project;
@@ -245,139 +232,35 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuEditor_MenuItems);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-			final TableViewer viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 120;
-			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
-
-			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(master));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) - 1;
-							if (idx >= 0) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) + 1;
-							if (idx < container.getChildren().size()) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
+			l.setText(Messages.ModelTooling_UIElement_VisibleWhen);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
+			ComboViewer combo = new ComboViewer(parent);
+			combo.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			combo.setContentProvider(new ArrayContentProvider());
+			combo.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
-					Struct struct = (Struct) element;
-					return struct.label;
-				}
-			});
-
-			Struct defaultStruct = new Struct(Messages.MenuEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
-			childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false) });
-			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!childrenDropDown.getSelection().isEmpty()) {
-						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-						EClass eClass = struct.eClass;
-						MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
-
-						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-							if (!struct.separator) {
-								getEditor().setSelection(eObject);
-							}
-						}
+					if (element instanceof EClass) {
+						EClass eClass = (EClass) element;
+						return eClass.getName();
 					}
-				}
-			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
+					return super.getText(element);
 				}
 			});
+			List<Object> list = new ArrayList<Object>();
+			list.add(Messages.MenuItemEditor_NoExpression);
+			list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
+			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
+			combo.setInput(list);
+			context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject()), new UpdateValueStrategy().setConverter(new EObject2EClass()));
 		}
 
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
@@ -386,7 +269,33 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+		final WritableList list = new WritableList();
+
+		if (((MUIElement) element).getVisibleWhen() != null) {
+			list.add(0, ((MUIElement) element).getVisibleWhen());
+		}
+
+		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() {
+
+			public void handleValueChange(ValueChangeEvent event) {
+				if (event.diff.getOldValue() != null) {
+					list.remove(event.diff.getOldValue());
+				}
+
+				if (event.diff.getNewValue() != null) {
+					list.add(0, event.diff.getNewValue());
+				}
+			}
+		});
+
+		list.add(new VirtualEntry<MMenuElement>(ModelEditor.VIRTUAL_MENUELEMENTS, ELEMENT_CONTAINER__CHILDREN, element, Messages.MenuEditor_Children) {
+			@Override
+			protected boolean accepted(MMenuElement o) {
+				return true;
+			}
+		});
+
+		return list;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuElementsEditor.java
new file mode 100644
index 0000000000..02e44a4ebf
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuElementsEditor.java
@@ -0,0 +1,248 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import java.util.List;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VMenuElementsEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private TableViewer viewer;
+
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+
+	public VMenuElementsEditor(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain, editor);
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.VMenuElementsEditor_TreeLabel;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return Messages.VMenuElementsEditor_TreeLabelDescription;
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent, context, getMaster());
+		}
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
+
+		Label l = new Label(parent, SWT.NONE);
+		l.setText(Messages.VMenuElementsEditor_Children);
+		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+		viewer = new TableViewer(parent);
+		ObservableListContentProvider cp = new ObservableListContentProvider();
+		viewer.setContentProvider(cp);
+
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.heightHint = 120;
+		viewer.getControl().setLayoutData(gd);
+		viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+
+		Composite buttonComp = new Composite(parent, SWT.NONE);
+		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+		gl = new GridLayout(2, false);
+		gl.marginLeft = 0;
+		gl.marginRight = 0;
+		gl.marginWidth = 0;
+		gl.marginHeight = 0;
+		buttonComp.setLayout(gl);
+
+		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ModelTooling_Common_Up);
+		b.setImage(getImage(b.getDisplay(), ARROW_UP));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+						int idx = container.getChildren().indexOf(obj) - 1;
+						if (idx >= 0) {
+							if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+
+					}
+				}
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ModelTooling_Common_Down);
+		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+						int idx = container.getChildren().indexOf(obj) + 1;
+						if (idx < container.getChildren().size()) {
+							if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+
+					}
+				}
+			}
+		});
+
+		final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+		childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		childrenDropDown.setContentProvider(new ArrayContentProvider());
+		childrenDropDown.setLabelProvider(new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				Struct struct = (Struct) element;
+				return struct.label;
+			}
+		});
+
+		Struct defaultStruct = new Struct(Messages.MenuEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
+		childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false) });
+		childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!childrenDropDown.getSelection().isEmpty()) {
+					Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+					EClass eClass = struct.eClass;
+					MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
+
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						if (!struct.separator) {
+							getEditor().setSelection(eObject);
+						}
+					}
+				}
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ModelTooling_Common_Remove);
+		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
+					Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+					}
+				}
+			}
+		});
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	}
+
+	private static class Struct {
+		private final String label;
+		private final EClass eClass;
+		private final boolean separator;
+
+		public Struct(String label, EClass eClass, boolean separator) {
+			this.label = label;
+			this.eClass = eClass;
+			this.separator = separator;
+		}
+	}
+
+}

From 59a07d7f5d1bc77fa369d60617fb9bdec2cdea96 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 25 Jul 2010 15:36:55 +0000
Subject: [PATCH 0263/1286] Bug 320848 -  [ModelTooling] No command information
 displayed without an id

---
 .../ui/common/CommandToStringConverter.java   | 48 +++++++++++++++++++
 .../component/HandledMenuItemEditor.java      |  6 +--
 .../component/HandledToolItemEditor.java      |  6 +--
 .../common/component/HandlerEditor.java       |  4 +-
 .../common/component/KeyBindingEditor.java    |  3 +-
 5 files changed, 59 insertions(+), 8 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
new file mode 100644
index 0000000000..5df8932322
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.common;
+
+import org.eclipse.core.databinding.conversion.Converter;
+import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+
+public class CommandToStringConverter extends Converter {
+
+	public CommandToStringConverter() {
+		super(MCommand.class, String.class);
+	}
+
+	public Object convert(Object fromObject) {
+		MCommand cmd = (MCommand) fromObject;
+		String elementId = null;
+		if (cmd != null && cmd.getElementId() != null && cmd.getElementId().trim().length() > 0) {
+			elementId = cmd.getElementId();
+		}
+		if (cmd == null) {
+			return "<None>";
+		} else if (cmd.getCommandName() != null && cmd.getCommandName().trim().length() > 0) {
+			return cmd.getCommandName() + (elementId != null ? " - " + elementId : ""); //$NON-NLS-1$//$NON-NLS-2$
+		} else if (elementId != null) {
+			return elementId;
+		} else {
+			Resource res = ((EObject) cmd).eResource();
+			if (res instanceof E4XMIResource) {
+				String v = ((E4XMIResource) res).getID((EObject) cmd);
+				if (v != null && v.trim().length() > 0) {
+					return v;
+				}
+			}
+			return cmd.getClass().getSimpleName() + "@" + cmd.hashCode(); //$NON-NLS-1$
+		}
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index f3c933dfa2..5aaa4afc6f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -12,19 +12,20 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledMenuItemCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
@@ -32,7 +33,6 @@
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
@@ -108,7 +108,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEnabled(false);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND).observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 4b81e066f2..4b11f9fb64 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -12,19 +12,20 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledToolItemCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
@@ -32,7 +33,6 @@
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
@@ -97,7 +97,7 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEnabled(false);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND).observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index f8672a3863..7e14fabe21 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -12,9 +12,11 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
@@ -154,7 +156,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEnabled(false);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(CommandsPackageImpl.Literals.HANDLER__COMMAND, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.HANDLER__COMMAND).observeDetail(getMaster()), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index a36f5ca915..1cd26d842d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -21,6 +21,7 @@
 import org.eclipse.core.databinding.validation.IValidator;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -218,7 +219,7 @@ public void handleValueChange(ValueChangeEvent event) {
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEnabled(false);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(CommandsPackageImpl.Literals.KEY_BINDING__COMMAND, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__COMMAND).observeDetail(getMaster()), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);

From 5e55064571fb04bd8b9b7a36fb6011c0131108d2 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 25 Jul 2010 16:06:21 +0000
Subject: [PATCH 0264/1286] Bug 320850 -  [ModelTooling] Should be able to show
 the XMI:ID

---
 .../editor3x/ModelEditorPreferencePage.java   | 18 +++++++++++
 .../emf/ui/internal/common/ModelEditor.java   |  8 +++++
 .../common/component/AddonsEditor.java        |  4 +++
 .../common/component/ApplicationEditor.java   |  4 +++
 .../component/BindingContextEditor.java       |  4 +++
 .../common/component/BindingTableEditor.java  |  4 +++
 .../common/component/CategoryEditor.java      |  4 +++
 .../common/component/CommandEditor.java       |  4 +++
 .../component/CommandParameterEditor.java     |  4 +++
 .../common/component/ControlFactory.java      | 30 +++++++++++++++++++
 .../component/CoreExpressionEditor.java       |  4 +++
 .../component/HandledMenuItemEditor.java      |  2 +-
 .../component/HandledToolItemEditor.java      |  2 +-
 .../common/component/HandlerEditor.java       |  6 +++-
 .../common/component/KeyBindingEditor.java    |  6 +++-
 .../component/MenuContributionEditor.java     |  4 +++
 .../internal/common/component/MenuEditor.java |  4 +++
 .../common/component/MenuItemEditor.java      |  4 +++
 .../common/component/MenuSeparatorEditor.java |  4 +++
 .../component/ModelFragmentsEditor.java       |  4 +++
 .../common/component/ParameterEditor.java     |  4 +++
 .../component/PartDescriptorEditor.java       |  4 +++
 .../internal/common/component/PartEditor.java |  4 +++
 .../component/PartSashContainerEditor.java    |  4 +++
 .../common/component/PartStackEditor.java     |  4 +++
 .../common/component/PerspectiveEditor.java   |  4 +++
 .../component/PerspectiveStackEditor.java     |  4 +++
 .../common/component/PlaceholderEditor.java   |  4 +++
 .../common/component/StringModelFragment.java |  4 +++
 .../component/ToolBarContributionEditor.java  |  4 +++
 .../common/component/ToolBarEditor.java       |  4 +++
 .../component/ToolBarSeparatorEditor.java     |  4 +++
 .../common/component/ToolControlEditor.java   |  4 +++
 .../common/component/ToolItemEditor.java      |  4 +++
 .../common/component/TrimBarEditor.java       |  4 +++
 .../component/TrimContributionEditor.java     |  4 +++
 .../common/component/WindowEditor.java        |  4 +++
 37 files changed, 188 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
index 22c0eb0d41..7bb2547f74 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
@@ -19,6 +19,8 @@
 public class ModelEditorPreferencePage extends PreferencePage implements
 		IWorkbenchPreferencePage {
 	private boolean autoCreateElementId;
+	private boolean showXMIId;
+	
 	private IEclipsePreferences node;
 	
 	public ModelEditorPreferencePage() {
@@ -35,6 +37,7 @@ public ModelEditorPreferencePage(String title, ImageDescriptor image) {
 	public void init(IWorkbench workbench) {
 		node = new InstanceScope().getNode("org.eclipse.e4.tools.emf.ui");
 		autoCreateElementId = node.getBoolean("autoCreateElementId", false);
+		showXMIId = node.getBoolean("showXMIId", false);
 	}
 
 	@Override
@@ -42,6 +45,7 @@ protected Control createContents(Composite parent) {
 		Composite result= new Composite(parent, SWT.NONE);
 		result.setLayout(new GridLayout(2,false));
 		
+		{
 		Label l = new Label(result, SWT.NONE);
 		l.setText("Autogenerate Element-Id");
 		final Button b = new Button(result, SWT.CHECK);
@@ -51,6 +55,19 @@ public void widgetSelected(SelectionEvent e) {
 				autoCreateElementId = b.getSelection();
 			}
 		});
+		}
+		
+		{
+		Label l = new Label(result, SWT.NONE);
+		l.setText("Show XMI:ID");
+		final Button b = new Button(result, SWT.CHECK);
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				showXMIId = b.getSelection();
+			}
+		});
+		}
 		
 		return result;
 	}
@@ -58,6 +75,7 @@ public void widgetSelected(SelectionEvent e) {
 	@Override
 	public boolean performOk() {
 		node.putBoolean("autoCreateElementId", autoCreateElementId);
+		node.putBoolean("showXMIId", showXMIId);
 		try {
 			node.flush();
 		} catch (BackingStoreException e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 4158827582..870097b6b0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -215,6 +215,10 @@ public class ModelEditor {
 	@Preference(nodePath = "org.eclipse.e4.tools.emf.ui", value = "autoCreateElementId")
 	private boolean autoCreateElementId;
 
+	@Inject
+	@Preference(nodePath = "org.eclipse.e4.tools.emf.ui", value = "showXMIId")
+	private boolean showXMIId;
+
 	private ObservablesManager obsManager;
 
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project) {
@@ -382,6 +386,10 @@ public IProject getProject() {
 		return project;
 	}
 
+	public boolean isShowXMIId() {
+		return showXMIId;
+	}
+
 	private void loadContributionCreators() {
 		IExtensionRegistry registry = RegistryFactory.getRegistry();
 		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index ad09b3b1e6..5536794a0b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -130,6 +130,10 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		if (getEditor().isModelFragment() && isImport) {
 			ControlFactory.createFindImport(parent, this, context);
 			return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index a0728c30da..c6067d22ad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -138,6 +138,10 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ModelTooling_Common_Id);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index d41b449ecf..228b5e5200 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -142,6 +142,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		if (isImport) {
 			ControlFactory.createFindImport(parent, this, context);
 			return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 27f0ddb38b..2e28f5e6c3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -137,6 +137,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		if (isImport) {
 			ControlFactory.createFindImport(parent, this, context);
 			return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index fd1aa52211..723fada6ca 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -115,6 +115,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		if (isImport) {
 			ControlFactory.createFindImport(parent, this, context);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 66eb2063ad..d02ecb8f42 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -134,6 +134,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		if (isImport) {
 			ControlFactory.createFindImport(parent, this, context);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 62bc14b19e..4ff5987e07 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -126,6 +126,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		if (isImport) {
 			ControlFactory.createFindImport(parent, this, context);
 			return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 1f73258c13..1d972ce537 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -23,6 +23,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationFactoryImpl;
@@ -40,6 +41,7 @@
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -75,6 +77,34 @@
 import org.eclipse.swt.widgets.Text;
 
 public class ControlFactory {
+	public static void createXMIId(Composite parent, AbstractComponentEditor editor) {
+		Label l = new Label(parent, SWT.NONE);
+		l.setText("XMI:ID");
+		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+		final Text t = new Text(parent, SWT.BORDER);
+		t.setEditable(false);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 2;
+		t.setLayoutData(gd);
+
+		editor.getMaster().addValueChangeListener(new IValueChangeListener() {
+
+			public void handleValueChange(ValueChangeEvent event) {
+				Object val = event.diff.getNewValue();
+				if (val != null && val instanceof EObject && !t.isDisposed()) {
+					Resource res = ((EObject) val).eResource();
+					if (res instanceof E4XMIResource) {
+						String v = ((E4XMIResource) res).getID((EObject) val);
+						if (v != null && v.trim().length() > 0) {
+							t.setText(v);
+						}
+					}
+				}
+			}
+		});
+	}
+
 	public static void createMapProperties(Composite parent, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index 91eff9ede5..13b99b7721 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -90,6 +90,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 		ControlFactory.createTextField(parent, Messages.CoreExpressionEditor_ExpressionId, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.CORE_EXPRESSION__CORE_EXPRESSION_ID));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index 5aaa4afc6f..a9034ec830 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -107,7 +107,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			t.setEnabled(false);
+			t.setEditable(false);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND).observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 4b11f9fb64..42bb48319d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -96,7 +96,7 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			t.setEnabled(false);
+			t.setEditable(false);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND).observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 7e14fabe21..ecd43fca67 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -129,6 +129,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		if (isImport) {
 			ControlFactory.createFindImport(parent, this, context);
 			return parent;
@@ -155,7 +159,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			t.setEnabled(false);
+			t.setEditable(false);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.HANDLER__COMMAND).observeDetail(getMaster()), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 1cd26d842d..965654a901 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -147,6 +147,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
@@ -218,7 +222,7 @@ public void handleValueChange(ValueChangeEvent event) {
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			t.setEnabled(false);
+			t.setEditable(false);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__COMMAND).observeDetail(getMaster()), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 51d3505992..895ff7a569 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -171,6 +171,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 888a19128f..ad8cd4ec7f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -150,6 +150,10 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index b02b02c7ca..edbaacbf4c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -147,6 +147,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		IWidgetValueProperty checkProp = WidgetProperties.selection();
 		IWidgetValueProperty enabled = WidgetProperties.enabled();
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		if (isImport) {
 			ControlFactory.createFindImport(parent, this, context);
 			return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 4c4dd2d581..404c728281 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -115,6 +115,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index 77fcc1a628..62f129c019 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -110,6 +110,10 @@ private Composite createForm(Composite parent) {
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ModelFragmentsEditor_Imports);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index aa6364c9a9..0bd741eb47 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -120,6 +120,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index c765096636..41d83b481d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -147,6 +147,10 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 3404c41ee2..d8e1372d5e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -168,6 +168,10 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index d46b44c844..d361b01a85 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -170,6 +170,10 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 1e78ab803b..483d560201 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -155,6 +155,10 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index cc84bf9516..1f672a26dc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -169,6 +169,10 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 213e53fd36..13cbfe7962 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -146,6 +146,10 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index e561d2d2b6..0c6b200eb8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -153,6 +153,10 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index b698d3ecde..1be39cdb77 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -118,6 +118,10 @@ private Composite createForm(Composite parent) {
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 557fb7ed13..a87504ea62 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -163,6 +163,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index ae4e0998b1..9676e5c6e0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -159,6 +159,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index f8bf808911..390e53cca2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -126,6 +126,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 7fca52fe89..1e6743fe2d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -135,6 +135,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 598b692249..cb090993db 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -107,6 +107,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index eeb430d81d..f874386af9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -152,6 +152,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index a3d12e2a05..f2f004b06f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -150,6 +150,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 9af16c8c58..2d17e9e863 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -169,6 +169,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		gl.horizontalSpacing = 10;
 		parent.setLayout(gl);
 
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {

From 612e9dd13e034cf0651537297f1eb0ca267cb919 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 25 Jul 2010 16:11:51 +0000
Subject: [PATCH 0265/1286] Bug 320850 -  [ModelTooling] Should be able to show
 the XMI:ID

---
 .../e4/tools/emf/ui/internal/common/ModelEditor.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 870097b6b0..9ab19f4b00 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -15,6 +15,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import org.eclipse.core.databinding.ObservablesManager;
@@ -347,7 +348,6 @@ public void run() {
 		});
 
 		form.setWeights(new int[] { 1, 2 });
-		viewer.setSelection(new StructuredSelection(modelProvider.getRoot()));
 
 		MenuManager mgr = new MenuManager();
 		mgr.setRemoveAllWhenShown(true);
@@ -378,6 +378,11 @@ public void menuAboutToShow(IMenuManager manager) {
 		viewer.getControl().setMenu(mgr.createContextMenu(viewer.getControl()));
 	}
 
+	@PostConstruct
+	void postCreate() {
+		viewer.setSelection(new StructuredSelection(modelProvider.getRoot()));
+	}
+
 	public boolean isAutoCreateElementId() {
 		return autoCreateElementId && project != null;
 	}

From 98a79605b4c8d322dce3d157356684b99c52c68e Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 25 Jul 2010 16:56:54 +0000
Subject: [PATCH 0266/1286] Bug 320849 -  No workspace chooser dialog after
 installing e4 tools

---
 .../OSGI-INF/pdee4xmiprovider.xml                               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdee4xmiprovider.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdee4xmiprovider.xml
index 54795752ac..f1e7b737da 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdee4xmiprovider.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdee4xmiprovider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.eclipse.e4.tools.emf.editor3x.pdee4xmiprovider">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="false" name="org.eclipse.e4.tools.emf.editor3x.pdee4xmiprovider">
    <implementation class="org.eclipse.e4.tools.emf.editor3x.TargetElementProviders"/>
    <service>
       <provide interface="org.eclipse.e4.tools.emf.ui.common.IModelElementProvider"/>

From 6768fd0926d8329939984246fbfa5a109f4e06c1 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 25 Jul 2010 18:41:27 +0000
Subject: [PATCH 0267/1286] Bug 320842 -  [ModelTooling] Editing of Expressions
 not available

---
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../OSGI-INF/pdeextensionlookup.xml           |   7 +
 .../build.properties                          |   3 +-
 .../emf/editor3x/PDEExtensionLookup.java      |  24 +++
 .../ui/common/CommandToStringConverter.java   |   3 +-
 .../tools/emf/ui/common/IExtensionLookup.java |  17 ++
 .../e4/tools/emf/ui/internal/Messages.java    |   7 +
 .../tools/emf/ui/internal/Messages.properties |   8 +-
 .../emf/ui/internal/common/ModelEditor.java   |   9 ++
 .../component/CoreExpressionEditor.java       |  33 +++-
 .../component/dialogs/ExpressionIdDialog.java | 150 ++++++++++++++++++
 11 files changed, 258 insertions(+), 5 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdeextensionlookup.xml
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 5fa115467f..1691e76e64 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -27,6 +27,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.tools.services;bundle-version="1.0.0",
  org.eclipse.e4.tools;bundle-version="0.9.0",
  org.eclipse.jdt.ui;bundle-version="3.6.0"
-Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/projectfunction.xml, OSGI-INF/pdee4xmiprovider.xml
+Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/projectfunction.xml, OSGI-INF/pdee4xmiprovider.xml, OSGI-INF/pdeextensionlookup.xml
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdeextensionlookup.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdeextensionlookup.xml
new file mode 100644
index 0000000000..759090b939
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdeextensionlookup.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.emf.editor3x">
+   <implementation class="org.eclipse.e4.tools.emf.editor3x.PDEExtensionLookup"/>
+   <service>
+      <provide interface="org.eclipse.e4.tools.emf.ui.common.IExtensionLookup"/>
+   </service>
+</scr:component>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
index 72fab184b7..13160ee89d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
@@ -4,5 +4,6 @@ bin.includes = META-INF/,\
                plugin.xml,\
                icons/,\
                OSGI-INF/,\
-               about.html
+               about.html,\
+               OSGI-INF/pdeextensionlookup.xml
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java
new file mode 100644
index 0000000000..4cce764f8f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x;
+
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.e4.tools.emf.ui.common.IExtensionLookup;
+import org.eclipse.pde.internal.core.PDEExtensionRegistry;
+
+public class PDEExtensionLookup implements IExtensionLookup {
+
+	public IExtension[] findExtensions(String extensionPointId) {
+		PDEExtensionRegistry reg = new PDEExtensionRegistry();
+		return reg.findExtensions(extensionPointId, true);
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
index 5df8932322..16f2a454a5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
@@ -11,6 +11,7 @@
 package org.eclipse.e4.tools.emf.ui.common;
 
 import org.eclipse.core.databinding.conversion.Converter;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.emf.ecore.EObject;
@@ -29,7 +30,7 @@ public Object convert(Object fromObject) {
 			elementId = cmd.getElementId();
 		}
 		if (cmd == null) {
-			return "<None>";
+			return Messages.CommandToStringConverter_None;
 		} else if (cmd.getCommandName() != null && cmd.getCommandName().trim().length() > 0) {
 			return cmd.getCommandName() + (elementId != null ? " - " + elementId : ""); //$NON-NLS-1$//$NON-NLS-2$
 		} else if (elementId != null) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java
new file mode 100644
index 0000000000..71b6a1e18c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.common;
+
+import org.eclipse.core.runtime.IExtension;
+
+public interface IExtensionLookup {
+	public IExtension[] findExtensions(String extensionPointId);
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index ac2bd8eea2..58f47fc184 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -502,6 +502,13 @@ public class Messages extends NLS {
 	public static String VMenuElementsEditor_TreeLabelDescription;
 	public static String VMenuElementsEditor_Children;
 
+	public static String ExpressionIdDialog_ShellTitle;
+	public static String ExpressionIdDialog_DialogTitle;
+	public static String ExpressionIdDialog_DialogMessage;
+	public static String ExpressionIdDialog_Id;
+
+	public static String CommandToStringConverter_None;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 220a454f1c..78e4dd5ede 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -496,4 +496,10 @@ CoreExpressionEditor_ExpressionId=Expression Id
 
 VMenuElementsEditor_TreeLabel=Children
 VMenuElementsEditor_TreeLabelDescription=Children Bla Bla Bla
-VMenuElementsEditor_Children=Children
\ No newline at end of file
+VMenuElementsEditor_Children=Children
+
+ExpressionIdDialog_ShellTitle=Find Expression Id
+ExpressionIdDialog_DialogTitle=Find Expression Id
+ExpressionIdDialog_DialogMessage=Find the expression id defined through the 'org.eclipse.core.expressions.definitions' extension point
+ExpressionIdDialog_Id=Id
+CommandToStringConverter_None=<None>
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 9ab19f4b00..91103d16f3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -45,6 +45,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IEditorDescriptor;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
+import org.eclipse.e4.tools.emf.ui.common.IExtensionLookup;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.ISelectionProviderService;
 import org.eclipse.e4.tools.emf.ui.common.MemoryTransfer;
@@ -220,6 +221,10 @@ public class ModelEditor {
 	@Preference(nodePath = "org.eclipse.e4.tools.emf.ui", value = "showXMIId")
 	private boolean showXMIId;
 
+	@Inject
+	@Optional
+	private IExtensionLookup extensionLookup;
+
 	private ObservablesManager obsManager;
 
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project) {
@@ -383,6 +388,10 @@ void postCreate() {
 		viewer.setSelection(new StructuredSelection(modelProvider.getRoot()));
 	}
 
+	public IExtensionLookup getExtensionLookup() {
+		return extensionLookup;
+	}
+
 	public boolean isAutoCreateElementId() {
 		return autoCreateElementId && project != null;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index 13b99b7721..f8924c947d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -17,6 +17,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ExpressionIdDialog;
 import org.eclipse.e4.ui.model.application.ui.MCoreExpression;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -25,11 +26,17 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class CoreExpressionEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -95,7 +102,31 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-		ControlFactory.createTextField(parent, Messages.CoreExpressionEditor_ExpressionId, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.CORE_EXPRESSION__CORE_EXPRESSION_ID));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.CoreExpressionEditor_ExpressionId);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			final Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.CORE_EXPRESSION__CORE_EXPRESSION_ID).observeDetail(getMaster()));
+
+			if (getEditor().getExtensionLookup() == null) {
+				gd.horizontalSpan = 2;
+			} else {
+				Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+				b.setText(Messages.ModelTooling_Common_FindEllipsis);
+				b.addSelectionListener(new SelectionAdapter() {
+					@Override
+					public void widgetSelected(SelectionEvent e) {
+						ExpressionIdDialog dialog = new ExpressionIdDialog(t.getShell(), getEditor().getExtensionLookup(), (MCoreExpression) getMaster().getValue(), getEditingDomain());
+						dialog.open();
+					}
+				});
+			}
+		}
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
new file mode 100644
index 0000000000..f146843358
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
@@ -0,0 +1,150 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.e4.tools.emf.ui.common.IExtensionLookup;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
+import org.eclipse.e4.ui.model.application.ui.MCoreExpression;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.AbstractTreeViewer;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.graphics.Image;
+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;
+
+public class ExpressionIdDialog extends TitleAreaDialog {
+	private IExtensionLookup lookup;
+	private TableViewer viewer;
+	private EditingDomain domain;
+	private MCoreExpression expression;
+
+	public ExpressionIdDialog(Shell parentShell, IExtensionLookup lookup, MCoreExpression expression, EditingDomain domain) {
+		super(parentShell);
+		this.lookup = lookup;
+		this.expression = expression;
+		this.domain = domain;
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		getShell().setText(Messages.ExpressionIdDialog_ShellTitle);
+		setTitle(Messages.ExpressionIdDialog_DialogTitle);
+		setMessage(Messages.ExpressionIdDialog_DialogMessage);
+		Composite comp = (Composite) super.createDialogArea(parent);
+		Composite container = new Composite(comp, SWT.NONE);
+		container.setLayoutData(new GridData(GridData.FILL_BOTH));
+		container.setLayout(new GridLayout(2, false));
+
+		Label l = new Label(container, SWT.NONE);
+		l.setText(Messages.ExpressionIdDialog_Id);
+
+		Text idField = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		idField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		final PatternFilter filter = new PatternFilter() {
+			@Override
+			protected boolean isParentMatch(Viewer viewer, Object element) {
+				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);
+			}
+		};
+		idField.addModifyListener(new ModifyListener() {
+
+			public void modifyText(ModifyEvent e) {
+				filter.setPattern(((Text) e.widget).getText());
+				viewer.refresh();
+			}
+		});
+
+		l = new Label(container, SWT.NONE);
+		viewer = new TableViewer(container);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setLabelProvider(new LabelProviderImpl());
+		viewer.addFilter(filter);
+		viewer.setInput(getElements(lookup));
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+
+			public void doubleClick(DoubleClickEvent event) {
+				okPressed();
+			}
+		});
+
+		return comp;
+	}
+
+	@Override
+	protected void okPressed() {
+		if (!viewer.getSelection().isEmpty()) {
+			IConfigurationElement el = (IConfigurationElement) ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+			Command cmd = SetCommand.create(domain, expression, UiPackageImpl.Literals.CORE_EXPRESSION__CORE_EXPRESSION_ID, el.getAttribute("id")); //$NON-NLS-1$
+			if (cmd.canExecute()) {
+				domain.getCommandStack().execute(cmd);
+				super.okPressed();
+			}
+		}
+	}
+
+	private List<IConfigurationElement> getElements(IExtensionLookup lookup) {
+		List<IConfigurationElement> list = new ArrayList<IConfigurationElement>();
+		for (IExtension ext : lookup.findExtensions("org.eclipse.core.expressions.definitions")) { //$NON-NLS-1$
+			for (IConfigurationElement el : ext.getConfigurationElements()) {
+				list.add(el);
+			}
+		}
+		return list;
+	}
+
+	static class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
+		@Override
+		public void update(ViewerCell cell) {
+			IConfigurationElement el = (IConfigurationElement) cell.getElement();
+			StyledString str = new StyledString(el.getAttribute("id")); //$NON-NLS-1$
+			str.append(" - " + el.getContributor().getName(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+			cell.setText(str.getString());
+			cell.setStyleRanges(str.getStyleRanges());
+		}
+
+		public Image getImage(Object element) {
+			return null;
+		}
+
+		public String getText(Object element) {
+			IConfigurationElement el = (IConfigurationElement) element;
+			return el.getAttribute("id") + " " + el.getContributor().getName(); //$NON-NLS-1$//$NON-NLS-2$
+		}
+	}
+}
\ No newline at end of file

From b2c9f23b392f92212b4036a9692072ffc2977976 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 25 Jul 2010 19:18:25 +0000
Subject: [PATCH 0268/1286] Bug 320842 -  [ModelTooling] Editing of Expressions
 not available

---
 .../OSGI-INF/pdeextensionlookup.xml                 |  1 +
 .../e4/tools/emf/editor3x/PDEExtensionLookup.java   | 13 ++++++++++---
 .../e4/tools/emf/ui/common/IExtensionLookup.java    |  2 +-
 .../common/component/CoreExpressionEditor.java      |  2 +-
 .../component/dialogs/ExpressionIdDialog.java       |  6 ++++--
 .../component/virtual/VMenuElementsEditor.java      |  2 +-
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdeextensionlookup.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdeextensionlookup.xml
index 759090b939..cad2595f2c 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdeextensionlookup.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdeextensionlookup.xml
@@ -4,4 +4,5 @@
    <service>
       <provide interface="org.eclipse.e4.tools.emf.ui.common.IExtensionLookup"/>
    </service>
+   <property name="service.ranking" type="Integer" value="1000"/>
 </scr:component>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java
index 4cce764f8f..88c4114e12 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java
@@ -11,14 +11,21 @@
 package org.eclipse.e4.tools.emf.editor3x;
 
 import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.RegistryFactory;
 import org.eclipse.e4.tools.emf.ui.common.IExtensionLookup;
 import org.eclipse.pde.internal.core.PDEExtensionRegistry;
 
 public class PDEExtensionLookup implements IExtensionLookup {
 
-	public IExtension[] findExtensions(String extensionPointId) {
-		PDEExtensionRegistry reg = new PDEExtensionRegistry();
-		return reg.findExtensions(extensionPointId, true);
+	public IExtension[] findExtensions(String extensionPointId, boolean liveModel) {
+		if( liveModel ) {
+			IExtensionRegistry registry = RegistryFactory.getRegistry();
+			return registry.getExtensionPoint(extensionPointId).getExtensions();
+		} else {
+			PDEExtensionRegistry reg = new PDEExtensionRegistry();
+			return reg.findExtensions(extensionPointId, true);			
+		}
 	}
 
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java
index 71b6a1e18c..24a2ebb11e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java
@@ -13,5 +13,5 @@
 import org.eclipse.core.runtime.IExtension;
 
 public interface IExtensionLookup {
-	public IExtension[] findExtensions(String extensionPointId);
+	public IExtension[] findExtensions(String extensionPointId, boolean liveModel);
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index f8924c947d..99c47c8f55 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -121,7 +121,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 				b.addSelectionListener(new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
-						ExpressionIdDialog dialog = new ExpressionIdDialog(t.getShell(), getEditor().getExtensionLookup(), (MCoreExpression) getMaster().getValue(), getEditingDomain());
+						ExpressionIdDialog dialog = new ExpressionIdDialog(t.getShell(), getEditor().getExtensionLookup(), (MCoreExpression) getMaster().getValue(), getEditingDomain(), getEditor().isLiveModel());
 						dialog.open();
 					}
 				});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
index f146843358..abdeb0b8cf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
@@ -51,12 +51,14 @@ public class ExpressionIdDialog extends TitleAreaDialog {
 	private TableViewer viewer;
 	private EditingDomain domain;
 	private MCoreExpression expression;
+	private boolean liveModel;
 
-	public ExpressionIdDialog(Shell parentShell, IExtensionLookup lookup, MCoreExpression expression, EditingDomain domain) {
+	public ExpressionIdDialog(Shell parentShell, IExtensionLookup lookup, MCoreExpression expression, EditingDomain domain, boolean liveModel) {
 		super(parentShell);
 		this.lookup = lookup;
 		this.expression = expression;
 		this.domain = domain;
+		this.liveModel = liveModel;
 	}
 
 	@Override
@@ -120,7 +122,7 @@ protected void okPressed() {
 
 	private List<IConfigurationElement> getElements(IExtensionLookup lookup) {
 		List<IConfigurationElement> list = new ArrayList<IConfigurationElement>();
-		for (IExtension ext : lookup.findExtensions("org.eclipse.core.expressions.definitions")) { //$NON-NLS-1$
+		for (IExtension ext : lookup.findExtensions("org.eclipse.core.expressions.definitions", liveModel)) { //$NON-NLS-1$
 			for (IConfigurationElement el : ext.getConfigurationElements()) {
 				list.add(el);
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuElementsEditor.java
index 02e44a4ebf..baebd34556 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuElementsEditor.java
@@ -109,7 +109,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		viewer.setContentProvider(cp);
 
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.heightHint = 120;
+		gd.heightHint = 300;
 		viewer.getControl().setLayoutData(gd);
 		viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
 

From b66db8f7c14a92458ad95df3bce5e9c8ef3f1094 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 26 Jul 2010 14:55:06 +0000
Subject: [PATCH 0269/1286] Bug 320909 -  [ModelTooling] Label displayed to add
 KeyBindingTable is wrong

---
 .../internal/common/component/virtual/VBindingTableEditor.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 6f806c1bf7..7705e08ec2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -167,7 +167,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {

From 697b5996dcc3a4448f315eade3bf35121fb89b55 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 29 Jul 2010 10:52:53 +0000
Subject: [PATCH 0270/1286] Bug 320938, 320954, 320938 - Merging back changes
 from branch

---
 .../e4/tools/emf/ui/common/ImageTooltip.java  | 20 +++++++++++++++++--
 .../component/BindingContextEditor.java       |  4 ++--
 .../common/component/ControlFactory.java      |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
index 255cbb728f..e9d75fe16e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
@@ -64,8 +64,24 @@ protected Composite createToolTipContentArea(Event event, Composite parent) {
 			InputStream bStream = null;
 			String errorMessage = "<" + Messages.ImageTooltip_UnknownError + ">"; //$NON-NLS-1$ //$NON-NLS-2$
 			try {
-				URL url = new URL(uri.toString());
-				stream = url.openStream();
+				URL url;
+				try {
+					url = new URL(uri.toString());
+					stream = url.openStream();
+				} catch (Exception e) {
+					// FIXME Temporary fix to show icon
+					// If not found in runtime search in workspace
+					if (stream == null) {
+						String[] segments = uri.segments();
+						URI tmpUri = URI.createPlatformResourceURI(segments[1], true);
+						for (int i = 2; i < segments.length; i++) {
+							tmpUri = tmpUri.appendSegment(segments[i]);
+						}
+
+						url = new URL(tmpUri.toString());
+						stream = url.openStream();
+					}
+				}
 
 				if (stream != null) {
 					out = new ByteArrayOutputStream();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 228b5e5200..5619fded8a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -236,7 +236,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_AddEllipsis);
-		b.setImage(getImage(b.getDisplay(), ARROW_UP));
+		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -256,7 +256,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Remove);
-		b.setImage(getImage(b.getDisplay(), ARROW_UP));
+		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 1d972ce537..4ff3ef894e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -377,7 +377,7 @@ public static void createStringListWidget(Composite parent, final AbstractCompon
 			@Override
 			public void keyPressed(KeyEvent e) {
 				if (e.keyCode == SWT.CR || e.keyCode == SWT.LF) {
-					handleAddText(editor, UiPackageImpl.Literals.CONTEXT__VARIABLES, t);
+					handleAddText(editor, feature, t);
 				}
 			}
 		});

From ccda26a13e82f1b74e7f76e304cf11e2ce901baa Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 29 Jul 2010 13:39:38 +0000
Subject: [PATCH 0271/1286] Bug 321181 -  [ModelTooling]
 ArrayIndexOutOfBoundException * added validation to avoid entering incorrect
 URIs * added support when no Java-class is found to launch the wizard

---
 .../ui/common/ContributionURIValidator.java   | 39 ++++++++++++++++++
 .../eclipse/e4/tools/emf/ui/common/Util.java  | 41 +++++++++++++++++++
 .../common/component/AddonsEditor.java        |  6 ++-
 .../component/DirectMenuItemEditor.java       |  7 +++-
 .../component/DirectToolItemEditor.java       |  7 +++-
 .../common/component/HandlerEditor.java       |  5 ++-
 .../common/component/KeyBindingEditor.java    | 36 +---------------
 .../internal/common/component/PartEditor.java |  6 ++-
 8 files changed, 107 insertions(+), 40 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
new file mode 100644
index 0000000000..77f9dc4c92
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.common;
+
+import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.URI;
+
+public class ContributionURIValidator implements IValidator {
+
+	public IStatus validate(Object value) {
+		if (value == null) {
+			return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", "The URI must not be empty!");
+		} else if (!value.toString().startsWith("platform:/plugin")) {
+			return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", "The URI has to start with 'platform:/plugin'");
+		} else {
+			try {
+				URI uri = URI.createURI(value.toString());
+				if (uri.segmentCount() != 3) {
+					return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", "The uri has to have the format 'platform:/plugin/$$bundleId$$/$$className$$'");
+				}
+			} catch (Exception e) {
+				return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", e.getMessage());
+			}
+
+		}
+
+		return Status.OK_STATUS;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index b23df112d2..9c41f212c4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -15,7 +15,11 @@
 import java.util.Map.Entry;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -34,6 +38,11 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.jface.fieldassist.FieldDecoration;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Control;
 
 public class Util {
 	public static final boolean isNullOrEmpty(String element) {
@@ -162,6 +171,38 @@ public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement
 		}
 	}
 
+	public static final void addDecoration(Control control, Binding binding) {
+		final ControlDecoration dec = new ControlDecoration(control, SWT.BOTTOM);
+		binding.getValidationStatus().addValueChangeListener(new IValueChangeListener() {
+
+			public void handleValueChange(ValueChangeEvent event) {
+				IStatus s = (IStatus) event.getObservableValue().getValue();
+				if (s.isOK()) {
+					dec.setDescriptionText(null);
+					dec.setImage(null);
+				} else {
+					dec.setDescriptionText(s.getMessage());
+
+					String fieldDecorationID = null;
+					switch (s.getSeverity()) {
+					case IStatus.INFO:
+						fieldDecorationID = FieldDecorationRegistry.DEC_INFORMATION;
+						break;
+					case IStatus.WARNING:
+						fieldDecorationID = FieldDecorationRegistry.DEC_WARNING;
+						break;
+					case IStatus.ERROR:
+					case IStatus.CANCEL:
+						fieldDecorationID = FieldDecorationRegistry.DEC_ERROR;
+						break;
+					}
+					FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(fieldDecorationID);
+					dec.setImage(fieldDecoration == null ? null : fieldDecoration.getImage());
+				}
+			}
+		});
+	}
+
 	public static class InternalPackage {
 		public final EPackage ePackage;
 		public List<InternalClass> classes = new ArrayList<InternalClass>();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 5536794a0b..67df8d015e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -12,9 +12,12 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -172,7 +175,8 @@ public void widgetSelected(SelectionEvent e) {
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()));
+			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
+			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index c8b5e32363..ee46377fd1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -12,13 +12,17 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
@@ -113,7 +117,8 @@ public void widgetSelected(SelectionEvent e) {
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
+			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
+			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 5370368e8c..da548c44ce 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -12,13 +12,17 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
@@ -101,7 +105,8 @@ public void widgetSelected(SelectionEvent e) {
 
 		Text t = new Text(parent, SWT.BORDER);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
+		Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
+		Util.addDecoration(t, binding);
 
 		final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_FindEllipsis);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index ecd43fca67..a9995f307e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -12,11 +12,13 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
+import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
@@ -196,7 +198,8 @@ public void widgetSelected(SelectionEvent e) {
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()));
+			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
+			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 965654a901..10908af671 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -16,8 +16,6 @@
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.validation.IValidator;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -50,9 +48,6 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.fieldassist.ControlDecoration;
-import org.eclipse.jface.fieldassist.FieldDecoration;
-import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
@@ -182,36 +177,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
 			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_SEQUENCE__KEY_SEQUENCE).observeDetail(getMaster()), new UpdateValueStrategy().setBeforeSetValidator(new BindingValidator()), new UpdateValueStrategy());
-
-			final ControlDecoration dec = new ControlDecoration(t, SWT.BOTTOM);
-			binding.getValidationStatus().addValueChangeListener(new IValueChangeListener() {
-
-				public void handleValueChange(ValueChangeEvent event) {
-					IStatus s = (IStatus) event.getObservableValue().getValue();
-					if (s.isOK()) {
-						dec.setDescriptionText(null);
-						dec.setImage(null);
-					} else {
-						dec.setDescriptionText(s.getMessage());
-
-						String fieldDecorationID = null;
-						switch (s.getSeverity()) {
-						case IStatus.INFO:
-							fieldDecorationID = FieldDecorationRegistry.DEC_INFORMATION;
-							break;
-						case IStatus.WARNING:
-							fieldDecorationID = FieldDecorationRegistry.DEC_WARNING;
-							break;
-						case IStatus.ERROR:
-						case IStatus.CANCEL:
-							fieldDecorationID = FieldDecorationRegistry.DEC_ERROR;
-							break;
-						}
-						FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(fieldDecorationID);
-						dec.setImage(fieldDecoration == null ? null : fieldDecoration.getImage());
-					}
-				}
-			});
+			Util.addDecoration(t, binding);
 		}
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index d8e1372d5e..09976ca157 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -12,6 +12,8 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -20,6 +22,7 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
@@ -275,7 +278,8 @@ public void widgetSelected(SelectionEvent e) {
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
+			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
+			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));

From 580aa8e552754dfbc21f470a082a0aa3eaec8cb0 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 29 Jul 2010 14:44:36 +0000
Subject: [PATCH 0272/1286] Bug 321233 -  [ModelTooling] Improve ModelTooling
 in 4.1 * presenting virtual nodes in an ITALIC-Font

---
 .../common/ComponentLabelProvider.java        | 50 ++++++-------------
 1 file changed, 14 insertions(+), 36 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index b52a0d7617..22653dd83e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -19,22 +19,20 @@
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.StyledString.Styler;
 import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.graphics.TextStyle;
 
 public class ComponentLabelProvider extends StyledCellLabelProvider {
-	private Image modelComponentsImage;
-	private Image modelComonentImage;
-	private Image partsImage;
-	private Image menusImage;
-	private Image partImage;
-	private Image partDescriptorImage;
 
 	private ModelEditor editor;
 
 	private static final String NOT_RENDERED_KEY = "NOT_RENDERED_STYLER";//$NON-NLS-1$
 
+	private Font font;
+
 	private static Styler NOT_RENDERED_STYLER = new Styler() {
 		{
 			JFaceResources.getColorRegistry().put(NOT_RENDERED_KEY, new RGB(200, 200, 200));
@@ -87,6 +85,11 @@ public void update(final ViewerCell cell) {
 			}
 		} else if (cell.getElement() instanceof VirtualEntry<?>) {
 			String s = cell.getElement().toString();
+			if (font == null) {
+				FontData[] data = cell.getControl().getFont().getFontData();
+				font = new Font(cell.getControl().getDisplay(), new FontData(data[0].getName(), data[0].getHeight(), SWT.ITALIC));
+			}
+			cell.setFont(font);
 			cell.setText(s);
 		} else {
 			cell.setText(cell.getElement().toString());
@@ -95,35 +98,10 @@ public void update(final ViewerCell cell) {
 
 	@Override
 	public void dispose() {
-		if (modelComponentsImage != null) {
-			modelComponentsImage.dispose();
-			modelComponentsImage = null;
-		}
-
-		if (modelComonentImage != null) {
-			modelComonentImage.dispose();
-			modelComonentImage = null;
-		}
-
-		if (partsImage != null) {
-			partsImage.dispose();
-			partsImage = null;
-		}
-
-		if (menusImage != null) {
-			menusImage.dispose();
-			menusImage = null;
-		}
-
-		if (partImage != null) {
-			partImage.dispose();
-			partImage = null;
-		}
-
-		if (partDescriptorImage != null) {
-			partDescriptorImage.dispose();
-			partDescriptorImage = null;
+		if (font != null) {
+			font.dispose();
+			font = null;
 		}
 		super.dispose();
 	}
-}
+}
\ No newline at end of file

From dd3a521e75149ad41212103279bbedb3a564a784 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 29 Jul 2010 14:46:12 +0000
Subject: [PATCH 0273/1286] Bug 321181 -  [ModelTooling]
 ArrayIndexOutOfBoundException * added validation to avoid entering incorrect
 URIs * added support when no Java-class is found to launch the wizard

---
 .../extension/AddonContributionEditor.java    | 50 +++++++++++------
 .../extension/HandlerContributionEditor.java  | 49 +++++++++++------
 .../extension/PartContributionEditor.java     | 53 +++++++++++++------
 3 files changed, 105 insertions(+), 47 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
index dee4f6bdcc..19f4ec5122 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
@@ -28,6 +28,7 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.widgets.Shell;
@@ -38,10 +39,15 @@ public class AddonContributionEditor implements IContributionClassCreator {
 	public boolean isSupported(EClass element) {
 		return Util.isTypeOrSuper(ApplicationPackageImpl.Literals.ADDON, element);
 	}
-
+	
 	public void createOpen(MContribution contribution, EditingDomain domain,
 			IProject project, Shell shell) {
-		if( contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 ) {
+		createOpen(contribution, domain, project, shell, false);
+	}
+
+	private void createOpen(MContribution contribution, EditingDomain domain,
+			IProject project, Shell shell, boolean forceNew) {
+		if( forceNew || contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 || !contribution.getContributionURI().startsWith("platform:") ) {
 			NewAddonClassWizard wizard = new NewAddonClassWizard();
 			wizard.init( null, new StructuredSelection(project));
 			WizardDialog dialog = new WizardDialog(shell, wizard);
@@ -62,20 +68,34 @@ public void createOpen(MContribution contribution, EditingDomain domain,
 			}
 		} else {
 			URI uri = URI.createURI(contribution.getContributionURI());
-			IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(uri.segment(1));
-			//TODO If this is not a WS-Resource we need to open differently 
-			if( p != null ) {
-				IJavaProject jp = JavaCore.create(p);
-				try {
-					IType t = jp.findType(uri.segment(2));
-					JavaUI.openInEditor(t);
-				} catch (JavaModelException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				} catch (PartInitException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
+			if (uri.segmentCount() == 3) {
+				IProject p = ResourcesPlugin.getWorkspace().getRoot()
+						.getProject(uri.segment(1));
+				// TODO If this is not a WS-Resource we need to open differently
+				if (p != null) {
+					IJavaProject jp = JavaCore.create(p);
+					try {
+						IType t = jp.findType(uri.segment(2));
+						if( t != null ) {
+							JavaUI.openInEditor(t);
+						} else {
+							if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+uri.segment(2)+"' was not found. Would you like to start the class creation wizard?") ) {
+								createOpen(contribution, domain, project, shell, true);
+							}
+						}
+					} catch (JavaModelException e) {
+						if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+uri.segment(2)+"' was not found. Would you like to start the class creation wizard?") ) {
+							createOpen(contribution, domain, project, shell, true);
+						}
+					} catch (PartInitException e) {
+						MessageDialog.openError(shell, "Failed to open editor", e.getMessage());
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
 				}
+			} else {
+				MessageDialog.openError(shell, "Invalid URL",
+						"The current url is invalid");
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
index 4ebf9a28d5..56c9933235 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
@@ -30,15 +30,20 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PartInitException;
 
 public class HandlerContributionEditor implements IContributionClassCreator {
-
 	public void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell) {
-		if( contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 ) {
+		createOpen(contribution, domain, project, shell, false);
+	}
+	
+	private void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell, boolean forceNew) {
+		if( contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 || !contribution.getContributionURI().startsWith("platform:") ) {
 			NewHandlerClassWizard wizard = new NewHandlerClassWizard();
 			wizard.init( null, new StructuredSelection(project));
 			WizardDialog dialog = new WizardDialog(shell, wizard);
@@ -59,20 +64,34 @@ public void createOpen(MContribution contribution, EditingDomain domain, IProjec
 			}
 		} else {
 			URI uri = URI.createURI(contribution.getContributionURI());
-			IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(uri.segment(1));
-			//TODO If this is not a WS-Resource we need to open differently 
-			if( p != null ) {
-				IJavaProject jp = JavaCore.create(p);
-				try {
-					IType t = jp.findType(uri.segment(2));
-					JavaUI.openInEditor(t);
-				} catch (JavaModelException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				} catch (PartInitException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
+			if (uri.segmentCount() == 3) {
+				IProject p = ResourcesPlugin.getWorkspace().getRoot()
+						.getProject(uri.segment(1));
+				// TODO If this is not a WS-Resource we need to open differently
+				if (p != null) {
+					IJavaProject jp = JavaCore.create(p);
+					try {
+						IType t = jp.findType(uri.segment(2));
+						if( t != null ) {
+							JavaUI.openInEditor(t);
+						} else {
+							if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+uri.segment(2)+"' was not found. Would you like to start the class creation wizard?") ) {
+								createOpen(contribution, domain, project, shell, true);
+							}
+						}
+					} catch (JavaModelException e) {
+						if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+uri.segment(2)+"' was not found. Would you like to start the class creation wizard?") ) {
+							createOpen(contribution, domain, project, shell, true);
+						}
+					} catch (PartInitException e) {
+						MessageDialog.openError(shell, "Failed to open editor", e.getMessage());
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
 				}
+			} else {
+				MessageDialog.openError(shell, "Invalid URL",
+						"The current url is invalid");
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
index c6f5c3a32d..8fea74032d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
@@ -29,17 +29,23 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PartInitException;
 
 public class PartContributionEditor implements IContributionClassCreator {
-
 	public void createOpen(MContribution contribution, EditingDomain domain,
 			IProject project, Shell shell) {
-		if (contribution.getContributionURI() == null
-				|| contribution.getContributionURI().trim().length() == 0) {
+		createOpen(contribution, domain, project, shell, false);
+	}
+	
+	private void createOpen(MContribution contribution, EditingDomain domain,
+			IProject project, Shell shell, boolean forceNew) {
+		if ( forceNew || contribution.getContributionURI() == null
+				|| contribution.getContributionURI().trim().length() == 0
+				|| !contribution.getContributionURI().startsWith("platform:")) {
 			NewPartClassWizard wizard = new NewPartClassWizard();
 			wizard.init(null, new StructuredSelection(project));
 			WizardDialog dialog = new WizardDialog(shell, wizard);
@@ -67,21 +73,34 @@ public void createOpen(MContribution contribution, EditingDomain domain,
 			}
 		} else {
 			URI uri = URI.createURI(contribution.getContributionURI());
-			IProject p = ResourcesPlugin.getWorkspace().getRoot()
-					.getProject(uri.segment(1));
-			// TODO If this is not a WS-Resource we need to open differently
-			if (p != null) {
-				IJavaProject jp = JavaCore.create(p);
-				try {
-					IType t = jp.findType(uri.segment(2));
-					JavaUI.openInEditor(t);
-				} catch (JavaModelException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				} catch (PartInitException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
+			if (uri.segmentCount() == 3) {
+				IProject p = ResourcesPlugin.getWorkspace().getRoot()
+						.getProject(uri.segment(1));
+				// TODO If this is not a WS-Resource we need to open differently
+				if (p != null) {
+					IJavaProject jp = JavaCore.create(p);
+					try {
+						IType t = jp.findType(uri.segment(2));
+						if( t != null ) {
+							JavaUI.openInEditor(t);
+						} else {
+							if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+uri.segment(2)+"' was not found. Would you like to start the class creation wizard?") ) {
+								createOpen(contribution, domain, project, shell, true);
+							}
+						}
+					} catch (JavaModelException e) {
+						if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+uri.segment(2)+"' was not found. Would you like to start the class creation wizard?") ) {
+							createOpen(contribution, domain, project, shell, true);
+						}
+					} catch (PartInitException e) {
+						MessageDialog.openError(shell, "Failed to open editor", e.getMessage());
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
 				}
+			} else {
+				MessageDialog.openError(shell, "Invalid URL",
+						"The current url is invalid");
 			}
 		}
 	}

From 650011720c0f615244d1796a056cf5a28d01836f Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 10 Sep 2010 13:16:27 +0000
Subject: [PATCH 0274/1286] Bug 323310 -  [ModelTooling] Rename Sash in the
 tree to PartSashContainer?

---
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.properties    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 78e4dd5ede..0ce26469e1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -164,7 +164,7 @@ PartEditor_ContainerData=Container Data
 PartEditor_ToolBar=ToolBar
 PartEditor_BindingContexts=Binding Contexts
 
-PartSashContainerEditor_Label=Sash
+PartSashContainerEditor_Label=PartSashContainer
 PartSashContainerEditor_Description=Sash bla bla bla
 PartSashContainerEditor_Orientation=Orientation
 PartSashContainerEditor_Vertical=Vertical

From 928d676161fcee12a986b80e201ed74a05a169aa Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster>
Date: Mon, 29 Nov 2010 20:13:34 +0000
Subject: [PATCH 0275/1286] Bug 329646 -  Keybindings aren't found or shown
 when run from .jars context restructuring without binding restructuring

---
 .../e4/internal/tools/wizards/project/E4NewProjectWizard.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 85a29bf619..e2375e5f80 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -360,7 +360,7 @@ public void createApplicationResources(IProject project,
 			childContext.setName("In Dialogs");
 			rootContext.getChildren().add(childContext);
 			
-			application.setRootContext(rootContext);
+			application.getRootContext().add(rootContext);
 			application.getBindingContexts().add("org.eclipse.ui.contexts.dialogAndWindow");
 			
 			resource.getContents().add((EObject) application);

From 9d4350de236a3ce8f93687bdcce3cf0171a8a705 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 11 Dec 2010 15:46:32 +0000
Subject: [PATCH 0276/1286] Bug 332362 - [ModelTooling] Update model to use
 multiple root contexts

---
 .../e4/tools/emf/ui/internal/Messages.java    |   8 +-
 .../tools/emf/ui/internal/Messages.properties |   9 +-
 .../emf/ui/internal/common/ModelEditor.java   |   3 +
 .../common/component/ApplicationEditor.java   | 118 +++------
 .../virtual/VRootBindingContexts.java         | 236 ++++++++++++++++++
 5 files changed, 292 insertions(+), 82 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 58f47fc184..1c41e70b7b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -13,6 +13,7 @@
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
+
 	public static String ModelTooling_Common_Up;
 	public static String ModelTooling_Common_Down;
 	public static String ModelTooling_Common_AddEllipsis;
@@ -45,7 +46,7 @@ public class Messages extends NLS {
 	public static String ApplicationEditor_MenuContributions;
 	public static String ApplicationEditor_ToolBarContributions;
 	public static String ApplicationEditor_TrimContributions;
-	public static String ApplicationEditor_RootContext;
+	public static String ApplicationEditor_RootContexts;
 	public static String ApplicationEditor_BindingContexts;
 	public static String ApplicationEditor_Categories;
 
@@ -509,6 +510,11 @@ public class Messages extends NLS {
 
 	public static String CommandToStringConverter_None;
 
+	public static String VRootBindingContexts_AddContext;
+	public static String VRootBindingContexts_TreeLabel;
+	public static String VRootBindingContexts_TreeLabelDescription;
+	public static String VRootBindingContexts_Contexts;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 0ce26469e1..26e7868f99 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -41,7 +41,7 @@ ApplicationEditor_Addons=Addons
 ApplicationEditor_MenuContributions=Menu Contributions
 ApplicationEditor_ToolBarContributions=Toolbar Contributions
 ApplicationEditor_TrimContributions=Trim Contributions
-ApplicationEditor_RootContext=Root Context
+ApplicationEditor_RootContexts=Binding Contexts
 ApplicationEditor_BindingContexts=Binding Contexts
 ApplicationEditor_Categories=Command Categories
 
@@ -502,4 +502,9 @@ ExpressionIdDialog_ShellTitle=Find Expression Id
 ExpressionIdDialog_DialogTitle=Find Expression Id
 ExpressionIdDialog_DialogMessage=Find the expression id defined through the 'org.eclipse.core.expressions.definitions' extension point
 ExpressionIdDialog_Id=Id
-CommandToStringConverter_None=<None>
\ No newline at end of file
+CommandToStringConverter_None=<None>
+
+VRootBindingContexts_AddContext=Add Binding Context
+VRootBindingContexts_TreeLabel=Binding Context
+VRootBindingContexts_TreeLabelDescription=Binding Context Bla Bla Bla
+VRootBindingContexts_Contexts=Binding Contexts
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 91103d16f3..efe9305e42 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -104,6 +104,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelFragmentsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelImportsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartDescriptor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VRootBindingContexts;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VToolBarContributionsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VTrimContributionsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowControlEditor;
@@ -194,6 +195,7 @@ public class ModelEditor {
 	public static final String VIRTUAL_CATEGORIES = ModelEditor.class.getName() + ".VIRTUAL_CATEGORIES"; //$NON-NLS-1$
 	public static final String VIRTUAL_PARAMETERS = ModelEditor.class.getName() + ".VIRTUAL_PARAMETERS"; //$NON-NLS-1$
 	public static final String VIRTUAL_MENUELEMENTS = ModelEditor.class.getName() + ".VIRTUAL_MENUELEMENTS"; //$NON-NLS-1$
+	public static final String VIRTUAL_ROOT_CONTEXTS = ModelEditor.class.getName() + ".VIRTUAL_ROOT_CONTEXTS"; //$NON-NLS-1$
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private Map<String, AbstractComponentEditor> virtualEditors = new HashMap<String, AbstractComponentEditor>();
@@ -582,6 +584,7 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_CATEGORIES, new VApplicationCategoriesEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_PARAMETERS, new VItemParametersEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_MENUELEMENTS, new VMenuElementsEditor(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_ROOT_CONTEXTS, new VRootBindingContexts(modelProvider.getEditingDomain(), this));
 	}
 
 	private void registerVirtualEditor(String id, AbstractComponentEditor editor) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index c6067d22ad..5b4730b769 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -14,39 +14,28 @@
 import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.commands.MBindingContext;
-import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
-import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
@@ -58,7 +47,7 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private Image image;
 	private Image tbrImage;
 	private EMFDataBindingContext context;
-	private Button createRemoveRootContext;
+	// private Button createRemoveRootContext;
 
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES);
@@ -71,7 +60,7 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private IListProperty TRIM_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS);
 	private IListProperty APPLICATION__CATEGORIES = EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES);
 
-	private IValueProperty BINDING_TABLE_CONTAINER__ROOT_CONTEXT = EMFProperties.value(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT);
+	private IListProperty BINDING_TABLE_CONTAINER__ROOT_CONTEXT = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT);
 
 	public ApplicationEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
@@ -123,10 +112,6 @@ public Composite getEditor(Composite parent, Object object) {
 		}
 		getMaster().setValue(object);
 
-		if (createRemoveRootContext != null) {
-			createRemoveRootContext.setSelection(((MApplication) object).getRootContext() != null);
-		}
-
 		return composite;
 	}
 
@@ -154,26 +139,6 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ApplicationEditor_RootContext);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			createRemoveRootContext = new Button(parent, SWT.CHECK);
-			createRemoveRootContext.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					MApplication app = (MApplication) getMaster().getValue();
-					if (app.getRootContext() == null) {
-						addContext();
-					} else {
-						removeContext();
-					}
-				}
-			});
-			createRemoveRootContext.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
-		}
-
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
@@ -183,21 +148,6 @@ public void widgetSelected(SelectionEvent e) {
 		return parent;
 	}
 
-	void removeContext() {
-		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT, null);
-		if (cmd.canExecute()) {
-			getEditingDomain().getCommandStack().execute(cmd);
-		}
-	}
-
-	void addContext() {
-		MBindingContext context = MCommandsFactory.INSTANCE.createBindingContext();
-		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT, context);
-		if (cmd.canExecute()) {
-			getEditingDomain().getCommandStack().execute(cmd);
-		}
-	}
-
 	@Override
 	public IObservableList getChildList(final Object element) {
 		final WritableList list = new WritableList();
@@ -210,7 +160,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.ApplicationEditor_Handlers) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_ROOT_CONTEXTS, BINDING_TABLE_CONTAINER__ROOT_CONTEXT, element, Messages.ApplicationEditor_RootContexts) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -219,7 +169,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PART_DESCRIPTORS, PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, element, Messages.ApplicationEditor_PartDescriptors) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element, Messages.ApplicationEditor_BindingTables) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -228,7 +178,16 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element, Messages.ApplicationEditor_BindingTables) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.ApplicationEditor_Handlers) {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
+
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PART_DESCRIPTORS, PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, element, Messages.ApplicationEditor_PartDescriptors) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -284,30 +243,31 @@ protected boolean accepted(Object o) {
 				return true;
 			}
 		});
-
-		MApplication application = (MApplication) element;
-		if (application.getRootContext() != null) {
-			list.add(0, application.getRootContext());
-		}
-
-		BINDING_TABLE_CONTAINER__ROOT_CONTEXT.observe(element).addValueChangeListener(new IValueChangeListener() {
-
-			public void handleValueChange(ValueChangeEvent event) {
-				if (event.diff.getOldValue() != null) {
-					list.remove(event.diff.getOldValue());
-					if (getMaster().getValue() == element) {
-						createRemoveRootContext.setSelection(false);
-					}
-				}
-
-				if (event.diff.getNewValue() != null) {
-					list.add(0, event.diff.getNewValue());
-					if (getMaster().getValue() == element) {
-						createRemoveRootContext.setSelection(true);
-					}
-				}
-			}
-		});
+		//
+		// MApplication application = (MApplication) element;
+		// if (application.getRootContext() != null) {
+		// list.add(0, application.getRootContext());
+		// }
+
+		// BINDING_TABLE_CONTAINER__ROOT_CONTEXT.observe(element).addValueChangeListener(new
+		// IValueChangeListener() {
+		//
+		// public void handleValueChange(ValueChangeEvent event) {
+		// if (event.diff.getOldValue() != null) {
+		// list.remove(event.diff.getOldValue());
+		// if (getMaster().getValue() == element) {
+		// createRemoveRootContext.setSelection(false);
+		// }
+		// }
+		//
+		// if (event.diff.getNewValue() != null) {
+		// list.add(0, event.diff.getNewValue());
+		// if (getMaster().getValue() == element) {
+		// createRemoveRootContext.setSelection(true);
+		// }
+		// }
+		// }
+		// });
 
 		return list;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
new file mode 100644
index 0000000000..3bc2433b20
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
@@ -0,0 +1,236 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.commands.MBindingContext;
+import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VRootBindingContexts extends AbstractComponentEditor {
+	private Composite composite;
+	private TableViewer viewer;
+	private EMFDataBindingContext context;
+
+	private List<Action> actions = new ArrayList<Action>();
+
+	public VRootBindingContexts(EditingDomain editingDomain, ModelEditor editor) {
+		super(editingDomain, editor);
+		actions.add(new Action(Messages.VRootBindingContexts_AddContext) {
+			@Override
+			public void run() {
+				handleAddContext();
+			}
+		});
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.VRootBindingContexts_TreeLabel;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return Messages.VRootBindingContexts_TreeLabelDescription;
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent, context, getMaster());
+		}
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		parent = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.VRootBindingContexts_Contexts);
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Up);
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MApplication container = (MApplication) getMaster().getValue();
+							int idx = container.getAddons().indexOf(obj) - 1;
+							if (idx >= 0) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Down);
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MApplication container = (MApplication) getMaster().getValue();
+							int idx = container.getAddons().indexOf(obj) + 1;
+							if (idx < container.getAddons().size()) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					handleAddContext();
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Remove);
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						handleRemoveContexts(((IStructuredSelection) viewer.getSelection()).toList());
+					}
+				}
+			});
+		}
+
+		return parent;
+	}
+
+	private void handleAddContext() {
+		MBindingContext context = MCommandsFactory.INSTANCE.createBindingContext();
+		setElementId(context);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT, context);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+		}
+	}
+
+	private void handleRemoveContexts(List<?> contexts) {
+		Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT, contexts);
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+		}
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return null;
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
+}

From a8875157f75dab6c5c2110ac5a300d04dbe1f5e5 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 17 Dec 2010 09:48:58 +0000
Subject: [PATCH 0277/1286] Bug 332712 - After creating the skeleton
 e4-Application with the wizward provided by E4 Tools the generated projects
 doesn't work because of missing Addons etc

---
 .../wizards/project/E4NewProjectWizard.java   | 31 +++++++++++++++++++
 .../templates/src/handlers/SaveHandler.java   |  7 ++---
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index e2375e5f80..50ef617d8d 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -30,6 +30,7 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.e4.ui.model.application.MAddon;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.commands.MBindingContext;
@@ -346,6 +347,36 @@ public void createApplicationResources(IProject project,
 			
 			application.setElementId("org.eclipse.e4.ide.application");
 			
+			MAddon addon = MApplicationFactory.INSTANCE.createAddon();
+			addon.setElementId("org.eclipse.e4.core.commands.service");
+			addon.setContributionURI("platform:/plugin/org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon");
+			application.getAddons().add(addon);
+			
+			addon = MApplicationFactory.INSTANCE.createAddon();
+			addon.setElementId("org.eclipse.e4.ui.contexts.service");
+			addon.setContributionURI("platform:/plugin/org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon");
+			application.getAddons().add(addon);
+			
+			addon = MApplicationFactory.INSTANCE.createAddon();
+			addon.setElementId("org.eclipse.e4.ui.bindings.service");
+			addon.setContributionURI("platform:/plugin/org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon");
+			application.getAddons().add(addon);
+			
+			addon = MApplicationFactory.INSTANCE.createAddon();
+			addon.setElementId("org.eclipse.e4.ui.workbench.commands.model");
+			addon.setContributionURI("platform:/plugin/org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon");
+			application.getAddons().add(addon);
+			
+			addon = MApplicationFactory.INSTANCE.createAddon();
+			addon.setElementId("org.eclipse.e4.ui.workbench.contexts.model");
+			addon.setContributionURI("platform:/plugin/org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon");
+			application.getAddons().add(addon);
+			
+			addon = MApplicationFactory.INSTANCE.createAddon();
+			addon.setElementId("org.eclipse.e4.ui.workbench.bindings.model");
+			addon.setContributionURI("platform:/plugin/org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon");
+			application.getAddons().add(addon);
+			
 			MBindingContext rootContext = MCommandsFactory.INSTANCE.createBindingContext();
 			rootContext.setElementId("org.eclipse.ui.contexts.dialogAndWindow");
 			rootContext.setName("In Dialog and Windows");
diff --git a/bundles/org.eclipse.e4.tools/templates/src/handlers/SaveHandler.java b/bundles/org.eclipse.e4.tools/templates/src/handlers/SaveHandler.java
index c1e49cdf9a..02963726ef 100644
--- a/bundles/org.eclipse.e4.tools/templates/src/handlers/SaveHandler.java
+++ b/bundles/org.eclipse.e4.tools/templates/src/handlers/SaveHandler.java
@@ -17,7 +17,6 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.di.IDisposable;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.core.di.annotations.CanExecute;
 import org.eclipse.e4.ui.model.application.MContribution;
@@ -59,9 +58,7 @@ public void run(IProgressMonitor monitor)
 				}
 			}
 		});
-
-		if (pmContext instanceof IDisposable) {
-			((IDisposable) pmContext).dispose();
-		}
+		
+		pmContext.dispose();
 	}
 }

From 5f346169f3f0473d4a6efeba17a802856d641f82 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 18 Dec 2010 08:58:19 +0000
Subject: [PATCH 0278/1286] Bug 320788 - [Model] The model misses the
 possibility to define mnemonics for Menu-Elements

---
 .../eclipse/e4/tools/emf/ui/internal/Messages.java |  1 +
 .../e4/tools/emf/ui/internal/Messages.properties   |  1 +
 .../ui/internal/common/component/MenuEditor.java   | 14 ++++++++++++++
 .../internal/common/component/MenuItemEditor.java  |  2 +-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 1c41e70b7b..9e56336bfd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -125,6 +125,7 @@ public class Messages extends NLS {
 	public static String MenuEditor_Tooltip;
 	public static String MenuEditor_IconURI;
 	public static String MenuEditor_Children;
+	public static String MenuEditor_Mnemonics;
 
 	public static String MenuItemEditor_Type;
 	public static String MenuItemEditor_Label;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 26e7868f99..3cc6f3c170 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -121,6 +121,7 @@ MenuEditor_Tooltip=Tooltip
 MenuEditor_IconURI=Icon URI
 MenuEditor_MainMenu=Main Menu
 MenuEditor_Children=Children
+MenuEditor_Mnemonics=Mnemonics
 
 MenuItemEditor_Type=Type
 MenuItemEditor_Label=Label
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index ad8cd4ec7f..fb03422c2a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -39,6 +39,7 @@
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -187,6 +188,19 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
 		}
 
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuEditor_Mnemonics);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS).observeDetail(master));
+		}
+
 		// ------------------------------------------------------------
 		if (!rootMenu) {
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index edbaacbf4c..7ee365e256 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -210,7 +210,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ITEM__MNEMONICS).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------

From ea60da54efd87fe780ce032c51ec9da6ee3f68a1 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 23 Dec 2010 20:20:18 +0000
Subject: [PATCH 0279/1286] [ModelTooling] Add support for
 UIElement#accessibilityPhrase

---
 .../e4/tools/emf/ui/internal/Messages.java    |  1 +
 .../tools/emf/ui/internal/Messages.properties |  1 +
 .../common/component/ApplicationEditor.java   |  2 +
 .../component/MenuContributionEditor.java     |  2 +
 .../internal/common/component/MenuEditor.java |  2 +
 .../common/component/MenuItemEditor.java      |  2 +
 .../common/component/MenuSeparatorEditor.java |  2 +
 .../internal/common/component/PartEditor.java | 71 ++-----------------
 .../component/PartSashContainerEditor.java    |  2 +
 .../common/component/PartStackEditor.java     |  2 +
 .../common/component/PerspectiveEditor.java   |  2 +
 .../component/PerspectiveStackEditor.java     |  2 +
 .../common/component/PlaceholderEditor.java   |  2 +
 .../component/ToolBarContributionEditor.java  |  2 +
 .../common/component/ToolBarEditor.java       |  2 +
 .../component/ToolBarSeparatorEditor.java     |  2 +-
 .../common/component/ToolControlEditor.java   |  2 +
 .../common/component/ToolItemEditor.java      |  5 +-
 .../common/component/TrimBarEditor.java       |  2 +
 .../component/TrimContributionEditor.java     |  2 +
 .../common/component/WindowEditor.java        |  2 +
 21 files changed, 44 insertions(+), 68 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 9e56336bfd..996576d94d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -26,6 +26,7 @@ public class Messages extends NLS {
 	public static String ModelTooling_UIElement_ToBeRendered;
 	public static String ModelTooling_UIElement_Visible;
 	public static String ModelTooling_UIElement_VisibleWhen;
+	public static String ModelTooling_UIElement_AccessibilityPhrase;
 
 	public static String ModelTooling_Context_Variables;
 	public static String ModelTooling_Context_Properties;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 3cc6f3c170..c185ac9c28 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -20,6 +20,7 @@ ModelTooling_Common_FindEllipsis=Find ...
 ModelTooling_UIElement_ToBeRendered=To Be Rendered
 ModelTooling_UIElement_Visible=Visible
 ModelTooling_UIElement_VisibleWhen=Visible-When Expression
+ModelTooling_UIElement_AccessibilityPhrase=Accessibility Phrase
 
 ModelTooling_Context_Variables=Variables
 ModelTooling_Context_Properties=Context Properties
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 5b4730b769..2e71b5d521 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -139,6 +139,8 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 895ff7a569..b697f587c0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -195,6 +195,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index fb03422c2a..0cc20dd488 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -188,6 +188,8 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
 		}
 
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 7ee365e256..941e92dfda 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -200,6 +200,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
 		}
 
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 404c728281..c290dd50f1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -139,6 +139,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
 		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
 		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 09976ca157..1a92e757c8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -49,7 +49,6 @@
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -182,44 +181,10 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));
-		}
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartEditor_LabelLabel);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
-		}
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartEditor_Tooltip);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
-		}
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.PartEditor_LabelLabel, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createTextField(parent, Messages.PartEditor_Tooltip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
 
 		// ------------------------------------------------------------
 		{
@@ -315,35 +280,11 @@ public void widgetSelected(SelectionEvent e) {
 			createRemoveToolBar.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartEditor_ContainerData);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
-		}
+		ControlFactory.createTextField(parent, Messages.PartEditor_ContainerData, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		createSubformElements(parent, context, master);
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartEditor_Closeable);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Button checkbox = new Button(parent, SWT.CHECK);
-			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
-
-			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART__CLOSEABLE);
-			IWidgetValueProperty uiProp = WidgetProperties.selection();
-
-			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
-		}
+		ControlFactory.createCheckBox(parent, Messages.PartEditor_Closeable, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART__CLOSEABLE));
 
 		// ------------------------------------------------------------
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index d361b01a85..fb7562e8a5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -194,6 +194,8 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 483d560201..1f998a1d57 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -179,6 +179,8 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PartStackEditor_SelectedElement);
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 1f672a26dc..4543a3b154 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -193,6 +193,8 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PerspectiveEditor_SelectedElement);
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 13cbfe7962..1d35f67951 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -170,6 +170,8 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PerspectiveStackEditor_SelectedElement);
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 0c6b200eb8..baf4f5e92f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -177,6 +177,8 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index a87504ea62..115ca1b9ed 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -187,6 +187,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 9676e5c6e0..b72494d501 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -183,6 +183,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 390e53cca2..9a81ba392c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -149,7 +149,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
-
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
 		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 1e6743fe2d..4383f6e165 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -159,6 +159,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));
 		}
 
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index cb090993db..e7f2e09831 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -17,7 +17,6 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
@@ -126,7 +125,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 	}
 
 	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, final WritableValue master) {
-		IValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 		IWidgetValueProperty checkProp = WidgetProperties.selection();
 		IWidgetValueProperty enabled = WidgetProperties.enabled();
 
@@ -159,6 +158,8 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
 		}
 
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index f874386af9..8ad1916d4d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -176,6 +176,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index f2f004b06f..3452ce1a1d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -174,6 +174,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 2d17e9e863..37598cdf8a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -258,6 +258,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
 		}
 
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);

From 44db22444806e23ac0a0e16b446fba8fa6a5ea8e Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 23 Dec 2010 20:50:40 +0000
Subject: [PATCH 0280/1286] Bug 325864 - [ModelTooling] Add support for MArea

---
 .../e4/tools/emf/ui/internal/Messages.java    |  16 +
 .../tools/emf/ui/internal/Messages.properties |  18 +-
 .../emf/ui/internal/common/ModelEditor.java   |   2 +
 .../internal/common/component/AreaEditor.java | 432 ++++++++++++++++++
 .../component/PartSashContainerEditor.java    |   2 +-
 .../dialogs/AreaIconDialogEditor.java         |  41 ++
 .../virtual/VWindowControlEditor.java         |   2 +-
 7 files changed, 510 insertions(+), 3 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 996576d94d..db5e2faf69 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -517,6 +517,22 @@ public class Messages extends NLS {
 	public static String VRootBindingContexts_TreeLabelDescription;
 	public static String VRootBindingContexts_Contexts;
 
+	public static String AreaEditor_Label;
+	public static String AreaEditor_Description;
+	public static String AreaEditor_Orientation;
+	public static String AreaEditor_Horizontal;
+	public static String AreaEditor_SelectedElement;
+	public static String AreaEditor_ContainerData;
+	public static String AreaEditor_Controls;
+	public static String AreaEditor_Vertical;
+	public static String AreaEditor_LabelLabel;
+	public static String AreaEditor_Tooltip;
+	public static String AreaEditor_IconURI;
+
+	public static String AreaIconDialogEditor_ShellTitle;
+	public static String AreaIconDialogEditor_DialogTitle;
+	public static String AreaIconDialogEditor_DialogMessage;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index c185ac9c28..9d41de5620 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -509,4 +509,20 @@ CommandToStringConverter_None=<None>
 VRootBindingContexts_AddContext=Add Binding Context
 VRootBindingContexts_TreeLabel=Binding Context
 VRootBindingContexts_TreeLabelDescription=Binding Context Bla Bla Bla
-VRootBindingContexts_Contexts=Binding Contexts
\ No newline at end of file
+VRootBindingContexts_Contexts=Binding Contexts
+
+AreaEditor_Label=Area
+AreaEditor_Description=Area Bla Bla Bla
+AreaEditor_Orientation=Orientation
+AreaEditor_Horizontal=Horizontal
+AreaEditor_SelectedElement=Selected Element
+AreaEditor_ContainerData=Container Data
+AreaEditor_Controls=Controls
+AreaEditor_Vertical=Vertical
+AreaEditor_LabelLabel=Label
+AreaEditor_Tooltip=Tooltip
+AreaEditor_IconURI=Icon URI
+
+AreaIconDialogEditor_ShellTitle=Area Icon Search
+AreaIconDialogEditor_DialogTitle=Area Icon Search
+AreaIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index efe9305e42..df16938bea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -54,6 +54,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.AddonsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ApplicationEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.AreaEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.BindingContextEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.BindingTableEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CategoryEditor;
@@ -654,6 +655,7 @@ private void registerDefaultEditors() {
 		registerEditor(BasicPackageImpl.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain(), this, project));
 		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW, new TrimmedWindowEditor(modelProvider.getEditingDomain(), this, project));
 		registerEditor(BasicPackageImpl.Literals.PART_SASH_CONTAINER, new PartSashContainerEditor(modelProvider.getEditingDomain(), this));
+		registerEditor(AdvancedPackageImpl.Literals.AREA, new AreaEditor(modelProvider.getEditingDomain(), this, project));
 		registerEditor(BasicPackageImpl.Literals.PART_STACK, new PartStackEditor(modelProvider.getEditingDomain(), this));
 		registerEditor(BasicPackageImpl.Literals.INPUT_PART, new InputPartEditor(modelProvider.getEditingDomain(), this, project));
 		registerEditor(BasicPackageImpl.Literals.TRIM_BAR, new TrimBarEditor(modelProvider.getEditingDomain(), this));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
new file mode 100644
index 0000000000..b0227e57ed
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -0,0 +1,432 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AreaIconDialogEditor;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+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.Text;
+
+public class AreaEditor extends AbstractComponentEditor {
+
+	private Composite composite;
+	private EMFDataBindingContext context;
+
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private EStackLayout stackLayout;
+	private IProject project;
+
+	public AreaEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
+		super(editingDomain, editor);
+		this.project = project;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		boolean horizontal = ((MPartSashContainer) element).isHorizontal();
+
+		if (!horizontal) {
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif")); //$NON-NLS-1$	
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			} else {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer_vertical.gif")); //$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		}
+
+		if (horizontal) {
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif")); //$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			} else {
+				try {
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer.gif")); //$NON-NLS-1$
+				} catch (MalformedURLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.AreaEditor_Label;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return Messages.AreaEditor_Description;
+	}
+
+	@Override
+	public Composite getEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new EStackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+
+		if (getEditor().isModelFragment()) {
+			Control topControl;
+			if (Util.isImport((EObject) object)) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];
+			}
+
+			if (stackLayout.topControl != topControl) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
+		parent = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		parent.setLayout(gl);
+
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		if (isImport) {
+			ControlFactory.createFindImport(parent, this, context);
+			return parent;
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.ModelTooling_Common_Id);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+		}
+
+		ControlFactory.createTextField(parent, Messages.AreaEditor_LabelLabel, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createTextField(parent, Messages.AreaEditor_Tooltip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.AreaEditor_IconURI);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			final Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+
+			new ImageTooltip(t) {
+
+				@Override
+				protected URI getImageURI() {
+					MUILabel part = (MUILabel) getMaster().getValue();
+					String uri = part.getIconURI();
+					if (uri == null || uri.trim().length() == 0) {
+						return null;
+					}
+					return URI.createURI(part.getIconURI());
+				}
+			};
+
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					AreaIconDialogEditor dialog = new AreaIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPart) getMaster().getValue());
+					dialog.open();
+				}
+			});
+		}
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.AreaEditor_Orientation);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			ComboViewer viewer = new ComboViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			viewer.getControl().setLayoutData(gd);
+			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					return ((Boolean) element).booleanValue() ? Messages.AreaEditor_Horizontal : Messages.AreaEditor_Vertical;
+				}
+			});
+			viewer.setInput(new Boolean[] { Boolean.TRUE, Boolean.FALSE });
+			IViewerValueProperty vProp = ViewerProperties.singleSelection();
+			context.bindValue(vProp.observe(viewer), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL).observeDetail(getMaster()));
+		}
+
+		ControlFactory.createSelectedElement(parent, this, context, Messages.AreaEditor_SelectedElement);
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.AreaEditor_ContainerData);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			Text t = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
+		}
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.AreaEditor_Controls);
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+
+			final TableViewer viewer = new TableViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 200;
+			viewer.getControl().setLayoutData(gd);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+
+			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(getMaster()));
+
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Up);
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) - 1;
+							if (idx >= 0) {
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Down);
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) + 1;
+							if (idx < container.getChildren().size()) {
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					EClass eclass = (EClass) element;
+					return eclass.getName();
+				}
+			});
+			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
+			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!childrenDropDown.getSelection().isEmpty()) {
+						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+						EObject eObject = EcoreUtil.create(eClass);
+						setElementId(eObject);
+
+						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+							getEditor().setSelection(eObject);
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Remove);
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+
+		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		return parent;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		MArea o = (MArea) element;
+		return o.getLabel();
+	}
+
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index fb7562e8a5..9835cbce4c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -316,7 +316,7 @@ public String getText(Object element) {
 					return eclass.getName();
 				}
 			});
-			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.PLACEHOLDER });
+			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
new file mode 100644
index 0000000000..e918099acb
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.widgets.Shell;
+
+public class AreaIconDialogEditor extends AbstractIconDialog {
+
+	public AreaIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPart element) {
+		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+	}
+
+	@Override
+	protected String getShellTitle() {
+		return Messages.AreaIconDialogEditor_ShellTitle;
+	}
+
+	@Override
+	protected String getDialogTitle() {
+		return Messages.AreaIconDialogEditor_DialogTitle;
+	}
+
+	@Override
+	protected String getDialogMessage() {
+		return Messages.AreaIconDialogEditor_DialogMessage;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 4f4e3b9783..dd3531951f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -176,7 +176,7 @@ public String getText(Object element) {
 					return eclass.getName();
 				}
 			});
-			childrenDropDown.setInput(new EClass[] { AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART });
+			childrenDropDown.setInput(new EClass[] { AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA });
 			childrenDropDown.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);

From 88401ae8eac59d5d96977b2c190af499611588f2 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 23 Dec 2010 23:32:52 +0000
Subject: [PATCH 0281/1286] Bug 323309 - [ModelTooling] Add Elements via the
 right mouse button * adds generic remove

---
 .../e4/tools/emf/ui/internal/Messages.java    |  2 ++
 .../tools/emf/ui/internal/Messages.properties |  4 +++-
 .../emf/ui/internal/common/ModelEditor.java   | 20 +++++++++++++++----
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index db5e2faf69..60c00abafe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -533,6 +533,8 @@ public class Messages extends NLS {
 	public static String AreaIconDialogEditor_DialogTitle;
 	public static String AreaIconDialogEditor_DialogMessage;
 
+	public static String ModelEditor_Delete;
+
 	static {
 		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 9d41de5620..efc3c629ae 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -525,4 +525,6 @@ AreaEditor_IconURI=Icon URI
 
 AreaIconDialogEditor_ShellTitle=Area Icon Search
 AreaIconDialogEditor_DialogTitle=Area Icon Search
-AreaIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
\ No newline at end of file
+AreaIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
+
+ModelEditor_Delete=Remove
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index df16938bea..6b8071d163 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -11,7 +11,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -51,6 +50,7 @@
 import org.eclipse.e4.tools.emf.ui.common.MemoryTransfer;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.AddonsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ApplicationEditor;
@@ -368,13 +368,25 @@ public void menuAboutToShow(IMenuManager manager) {
 					if (s.getFirstElement() instanceof VirtualEntry<?>) {
 						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId()).getActions(s.getFirstElement());
 					} else {
-						EObject o = (EObject) s.getFirstElement();
+						final EObject o = (EObject) s.getFirstElement();
 						AbstractComponentEditor editor = getEditor(o.eClass());
 						if (editor != null) {
-							actions = editor.getActions(s.getFirstElement());
+							actions = new ArrayList<Action>(editor.getActions(s.getFirstElement()));
 						} else {
-							actions = Collections.emptyList();
+							actions = new ArrayList<Action>();
 						}
+
+						if (o.eContainer() != null) {
+							actions.add(new Action(Messages.ModelEditor_Delete) {
+								public void run() {
+									Command cmd = RemoveCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), o.eContainer(), o.eContainingFeature(), o);
+									if (cmd.canExecute()) {
+										ModelEditor.this.modelProvider.getEditingDomain().getCommandStack().execute(cmd);
+									}
+								}
+							});
+						}
+
 					}
 
 					for (Action a : actions) {

From 1437c83541e6207dba90c7fce2b43b5edc5dfa2f Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 24 Dec 2010 14:21:02 +0000
Subject: [PATCH 0282/1286] Bug 323309 - [ModelTooling] Add Elements via the
 right mouse button * adds context actions for virtual elements

---
 .../icons/full/modelelements/Area.gif         | Bin 0 -> 378 bytes
 .../full/modelelements/Area_vertical.gif      | Bin 0 -> 347 bytes
 .../icons/full/modelelements/tbr/Area.gif     | Bin 0 -> 969 bytes
 .../full/modelelements/tbr/Area_vertical.gif  | Bin 0 -> 937 bytes
 .../icons/full/obj16/cross.png                | Bin 0 -> 655 bytes
 .../component/AbstractComponentEditor.java    |   5 ++
 .../e4/tools/emf/ui/internal/Messages.java    |  26 ++++++
 .../tools/emf/ui/internal/Messages.properties |  26 ++++++
 .../emf/ui/internal/common/ModelEditor.java   |   8 +-
 .../internal/common/component/AreaEditor.java |   8 +-
 .../component/virtual/VApplicationAddons.java |  19 ++--
 .../virtual/VApplicationCategoriesEditor.java |  35 ++++++--
 .../virtual/VBindingTableEditor.java          |  44 ++++++++--
 .../component/virtual/VCommandEditor.java     |  44 ++++++++--
 .../component/virtual/VHandlerEditor.java     |  45 ++++++++--
 .../virtual/VItemParametersEditor.java        |  45 ++++++++--
 .../virtual/VMenuContributionsEditor.java     |  46 ++++++++--
 .../common/component/virtual/VMenuEditor.java |  46 +++++++---
 .../virtual/VMenuElementsEditor.java          |  65 +++++++++++---
 .../component/virtual/VPartDescriptor.java    |  45 ++++++++--
 .../virtual/VRootBindingContexts.java         |  19 ++--
 .../virtual/VToolBarContributionsEditor.java  |  46 +++++++---
 .../virtual/VTrimContributionsEditor.java     |  45 ++++++++--
 .../virtual/VWindowControlEditor.java         |  83 +++++++++++++++---
 .../component/virtual/VWindowEditor.java      |  54 +++++++++---
 .../virtual/VWindowSharedElementsEditor.java  |  59 +++++++++++--
 .../component/virtual/VWindowTrimEditor.java  |  44 ++++++++--
 27 files changed, 698 insertions(+), 159 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area_vertical.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Area.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Area_vertical.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/cross.png

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bbbdd559a918bb27921ae8feb93d597c3c4cfb75
GIT binary patch
literal 378
zcmZ?wbhEHb6krfwxXQrr^Vh#0KmUIF@$cJ@zcmwfCsnV`Y1vfJzNNf(XZ@7DP1E+b
z%s7})HtGH6-(SA}O{iL#TDLZ{ab0ouw(N=t`BlAdKK}an_0O}nKTB%6UVixX<JaHf
z+O9XBem!~n<N5oaPv8A``SI8D_dni!`CZx2UeVBY{_XGj=H~jA=9c#QuI}my{pAz;
z%co5$UN9qP&eZ(bQwyd~DqcP(W67+n|Ns9p5CIf_vM@3*7&GXA)PnrPz&8EB%mNP`
zuH+L-f;6X0op+v9L`!&^*W4WU#;avfhr(YL{j3psyy>QD%Ty=D{`L=jry~!Aa<ZIC
z5vZ=M({j>Om5~t@6>9J7(sa^L<>ggUVxK&9nue2_s@MWCw)qRi)SZ-7`Bw7@u3E#V
z;v}ug#Kg=juyy+m2`3R%DJe!q)`N$Sh&TzWGMr=JKYN}**oo)*jhi>!?zlKISOWmH
C)28qM

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area_vertical.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area_vertical.gif
new file mode 100644
index 0000000000000000000000000000000000000000..013e818ecb54b04fe97baea83dc819b9688b2c24
GIT binary patch
literal 347
zcmZ?wbhEHb6krfwSZd7h^Vh#0KmUIF@$cJ@zcmwfCsnV`Y1vfJzNNf(XZ@7DP1E+b
z%s7})HtGH6-(SA}O{iL#TDLZ{ab0ouw(N=t`BlAdKK}an_0O}nKTB%6UVixX<JaHf
z+O9XBem!~n<N5oaPv8A``SI8D_dni!`CZx2UeVBY{_XGj=H~jA=9c#QuI}my{pAz;
z%co5$UN9qP&eZ(bQwyd~DqcP(W67+n|HJ{spDc_F4E78<3_t+#69Zetf%yd<I#Qi0
zMc-VVbhM?1Gu7B=;iS{gJ|EYp+@J7%8sh~HnQ3h7BD+ew9)Ggjo45aQBV$y^$qKvj
z0EWuy+WN*AepUfNHg+Kn7EUhi<izO(O=%ffIe9Z<isqEguc#8MscTq}(z2p$^|IDg
S9f2YeD(c}{I(ku#4Aua@vc`@8

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Area.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Area.gif
new file mode 100644
index 0000000000000000000000000000000000000000..94bdda3e6dffde4cc34b19432c60a37f5c2d489f
GIT binary patch
literal 969
zcmV;)12+6eNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000Q40RIUbNU)&5O$ZYzR46bLx`z)hL4=q|
zphR{U*;PW95#uF+lsK|$*G`g1lI<u7jD*geOLvc2zH}E!pd)nf;Jtgd2&c}SjRYz}
z7q4i%L`03oQzXz3x_MCN6?z(Vo*{vP(AC>oFDuurg9QFTcdzWdv1ZHu5y%G}zPI?=
r!hOp}U><b(^ySNUH}77)0`K6>s}Ij$!gmDLS<JX`V}p<h1_S^*mqydp

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Area_vertical.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Area_vertical.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f6da4c7a90ed58ccc318b363866fc11a9d7c8eff
GIT binary patch
literal 937
zcmV;a16KS;Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000Pv0RIUbNU)$mf{GkPqI4<KCV_SC<l*y2
zkfDSN8$SG32c5@{AU$rZqfZ~cd-dkUgXfMNJ9HyUo=my2<;$4)W~zMWuH8+D`f{S&
z+4CnyJQFJxO0?*aq)L}YhMWo$sL7!<T~_5N6Dv!tICaM3>2oVdp)|=FJu6nNS&0+}
LU2K%mVL$*oB|pUA

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/cross.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/cross.png
new file mode 100644
index 0000000000000000000000000000000000000000..1514d51a3cf1b67e1c5b9ada36f1fd474e2d214a
GIT binary patch
literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!AxT6*R5;6(
zlj}|sQ51!ViOGr2pjL^7$dQ1=8$w$KD6I_$CeZtZUZjAurR}6mp*HFdO?(oc3q-}<
zu+o`!I@9H@m`W`r;m1zSWX}5bthM(H02sJT)z?DT&OUcv5HmU|-dF4oa@p;T*KAHh
zFQ6^X?4p&<LW?JRAa!4W*8^cRHn#BV<;v&k;?li;fWKno-=RgNB}6ngw>uEoyT++I
zn$b9r%cFfhHe2K68Pk<hKq}2z2~lh9z5zadf|kv-0cZq5T=w`mb%(MY1L(c%58!zI
zxmp(Hu69|_VhN_cj;WfM0p5Rrno6S{41>Bu*@^<$y+7xQ$wJ~;c5aBx$R=xq*41Wo
zhwQus_VOgm0hughj}MhOvs#{>Vg09Y8WxjWUJY5Y<Msg#Hz1}_nVr{4MuGi*zXu>W
zJ?&8eG!59Cz=|E%Ns@013KLWOLV)CObIIj_5{>{#k%TEAMs_GbdDV`x-iYsG<NRDe
z&F<oo(+wrG4$v4ShYJ*zTAVUyCyUEKWCOJq%P2g2jKiT}-UXn|;?x~V@D+7UK%!5l
zu+-wDffb%iu%q!uYSm;0f+3t(tT-AO#lfvX-T}~N2{oGoN+1Mj)d31iEk4tC0{b>H
z#=Z{USAQA>NY(}X7=3{K8#<xO0&SL1U06cNFs)HoJ!v1_9b#Vw@2F?RJt3C#MxpR@
plJ)zU4s^HK{`H%}g=4&I{RVQoq{rLsz7zle002ovPDHLkV1j2<C=vhw

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 9b51f06d82..42670618b6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -25,6 +25,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
@@ -131,6 +132,10 @@ protected Image loadSharedImage(Display d, URL path) {
 		return img;
 	}
 
+	protected ImageDescriptor loadSharedDescriptor(Display d, URL path) {
+		return ImageDescriptor.createFromImage(loadSharedImage(d, path));
+	}
+
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] {};
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 60c00abafe..fbf1fc223d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -225,6 +225,7 @@ public class Messages extends NLS {
 	public static String VBindingTableEditor_Name;
 	public static String VBindingTableEditor_LabelDescription;
 	public static String VBindingTableEditor_BindingTables;
+	public static String VBindingTableEditor_AddBindingTable;
 
 	public static String AddonsEditor_ClassURI;
 	public static String AddonsEditor_TreeLabel;
@@ -356,22 +357,27 @@ public class Messages extends NLS {
 	public static String VApplicationCategoriesEditor_TreeLabel;
 	public static String VApplicationCategoriesEditor_TreeLabelDescription;
 	public static String VApplicationCategoriesEditor_Categories;
+	public static String VApplicationCategoriesEditor_AddCategory;
 
 	public static String VCommandEditor_TreeLabel;
 	public static String VCommandEditor_TreeLabelDescription;
 	public static String VCommandEditor_Commands;
+	public static String VCommandEditor_AddCommand;
 
 	public static String VHandlerEditor_TreeLabel;
 	public static String VHandlerEditor_TreeLabelDescription;
 	public static String VHandlerEditor_Handlers;
+	public static String VHandlerEditor_AddHandler;
 
 	public static String VMenuContributionsEditor_TreeLabel;
 	public static String VMenuContributionsEditor_TreeLabelDescription;
 	public static String VMenuContributionsEditor_MenuContributions;
+	public static String VMenuContributionsEditor_AddMenuContribution;
 
 	public static String VMenuEditor_TreeLabel;
 	public static String VMenuEditor_TreeLabelDescription;
 	public static String VMenuEditor_Menus;
+	public static String VMenuEditor_AddMenuContribution;
 
 	public static String VModelFragmentsEditor_TreeLabel;
 	public static String VModelFragmentsEditor_TreeLabelDescription;
@@ -384,30 +390,45 @@ public class Messages extends NLS {
 	public static String VPartDescriptor_TreeLabel;
 	public static String VPartDescriptor_TreeLabelDescription;
 	public static String VPartDescriptor_Descriptors;
+	public static String VPartDescriptor_AddPartDescriptor;
 
 	public static String VToolBarContributionsEditor_Contributions;
 	public static String VToolBarContributionsEditor_TreeLabelDescription;
 	public static String VToolBarContributionsEditor_TreeLabel;
+	public static String VToolBarContributionsEditor_AddToolBarContribution;
 
 	public static String VTrimContributionsEditor_TreeLabel;
 	public static String VTrimContributionsEditor_TreeLabelDescription;
 	public static String VTrimContributionsEditor_Contributions;
+	public static String VTrimContributionsEditor_AddTrimContribution;
 
 	public static String VWindowControlEditor_TreeLabel;
 	public static String VWindowControlEditor_TreeLabelDescription;
 	public static String VWindowControlEditor_Controls;
+	public static String VWindowControlEditor_AddPerspectiveStack;
+	public static String VWindowControlEditor_AddPartSashContainer;
+	public static String VWindowControlEditor_AddPartStack;
+	public static String VWindowControlEditor_AddPart;
+	public static String VWindowControlEditor_AddInputPart;
+	public static String VWindowControlEditor_AddArea;
 
 	public static String VWindowEditor_TreeLabel;
 	public static String VWindowEditor_TreeLabelDescription;
 	public static String VWindowEditor_Windows;
+	public static String VWindowEditor_AddTrimmedWindow;
+	public static String VWindowEditor_AddWindow;
 
 	public static String VWindowSharedElementsEditor_TreeLabel;
 	public static String VWindowSharedElementsEditor_TreeLabelDescription;
 	public static String VWindowSharedElementsEditor_Controls;
+	public static String VWindowSharedElementsEditor_AddPartSashContainer;
+	public static String VWindowSharedElementsEditor_AddPart;
+	public static String VWindowSharedElementsEditor_AddInputPart;
 
 	public static String VWindowTrimEditor_TreeLabel;
 	public static String VWindowTrimEditor_TreeLabelDescription;
 	public static String VWindowTrimEditor_Controls;
+	public static String VWindowTrimEditor_AddWindowTrim;
 
 	public static String AbstractIconDialog_IconName;
 
@@ -496,6 +517,7 @@ public class Messages extends NLS {
 	public static String VItemParametersEditor_TreeLabel;
 	public static String VItemParametersEditor_TreeLabelDescription;
 	public static String VItemParametersEditor_Parameters;
+	public static String VItemParametersEditor_AddParameter;
 
 	public static String CoreExpressionEditor_TreeLabel;
 	public static String CoreExpressionEditor_TreeLabelDescription;
@@ -504,6 +526,10 @@ public class Messages extends NLS {
 	public static String VMenuElementsEditor_TreeLabel;
 	public static String VMenuElementsEditor_TreeLabelDescription;
 	public static String VMenuElementsEditor_Children;
+	public static String VMenuElementsEditor_AddHandledMenuItem;
+	public static String VMenuElementsEditor_AddMenu;
+	public static String VMenuElementsEditor_AddDirectMenuItem;
+	public static String VMenuElementsEditor_AddSeparator;
 
 	public static String ExpressionIdDialog_ShellTitle;
 	public static String ExpressionIdDialog_DialogTitle;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index efc3c629ae..2ee8972a0a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -221,6 +221,7 @@ VBindingTableEditor_Contexts=Contexts
 VBindingTableEditor_Name=Name
 VBindingTableEditor_LabelDescription=Description
 VBindingTableEditor_BindingTables=Binding Tables
+VBindingTableEditor_AddBindingTable=Add Binding Table
 
 AddonsEditor_ClassURI=Class URI
 AddonsEditor_TreeLabel=Addon
@@ -351,22 +352,27 @@ VApplicationAddons_Commands=Commands
 VApplicationCategoriesEditor_TreeLabel=Command Categories
 VApplicationCategoriesEditor_TreeLabelDescription=Command Categories bla bla bla bla
 VApplicationCategoriesEditor_Categories=Categories
+VApplicationCategoriesEditor_AddCategory=Add Category
 
 VCommandEditor_TreeLabel=Commands
 VCommandEditor_TreeLabelDescription=Commands Bla Bla Bla Bla Bla
 VCommandEditor_Commands=Commands
+VCommandEditor_AddCommand=Add Command
 
 VHandlerEditor_TreeLabel=Handlers
 VHandlerEditor_TreeLabelDescription=Handlers Bla Bla Bla Bla Bla
 VHandlerEditor_Handlers=Handlers
+VHandlerEditor_AddHandler=Add Handler
 
 VMenuContributionsEditor_TreeLabel=Menu Contributions
 VMenuContributionsEditor_TreeLabelDescription=Menu Contributions Bla Bla Bla Bla Bla
 VMenuContributionsEditor_MenuContributions=Menu Contributions
+VMenuContributionsEditor_AddMenuContribution=Add Menu Contribution
 
 VMenuEditor_TreeLabel=Menus
 VMenuEditor_TreeLabelDescription=Menus Bla Bla Bla Bla Bla
 VMenuEditor_Menus=Menus
+VMenuEditor_AddMenuContribution=Add Menu
 
 VModelFragmentsEditor_TreeLabel=Fragments
 VModelFragmentsEditor_TreeLabelDescription=Fragments Bla Bla Bla Bla Bla
@@ -379,30 +385,45 @@ VModelImportsEditor_Imports=Imports
 VPartDescriptor_TreeLabel=Part Descriptors
 VPartDescriptor_TreeLabelDescription=Part Descriptors Bla Bla Bla Bla Bla
 VPartDescriptor_Descriptors=Descriptors
+VPartDescriptor_AddPartDescriptor=Add Descriptor
 
 VToolBarContributionsEditor_TreeLabel=ToolBar Contributions
 VToolBarContributionsEditor_TreeLabelDescription=ToolBar Contributions Bla Bla Bla Bla Bla
 VToolBarContributionsEditor_Contributions=ToolBar Contributions
+VToolBarContributionsEditor_AddToolBarContribution=Add ToolBar Contribution
 
 VTrimContributionsEditor_TreeLabel=Trim Contributions
 VTrimContributionsEditor_TreeLabelDescription=Trim Contributions Bla Bla Bla Bla Bla
 VTrimContributionsEditor_Contributions=Trim Contributions
+VTrimContributionsEditor_AddTrimContribution=Add Trim Contribution
 
 VWindowControlEditor_TreeLabel=Controls
 VWindowControlEditor_TreeLabelDescription=Controls Bla Bla Bla Bla Bla
 VWindowControlEditor_Controls=Controls
+VWindowControlEditor_AddPerspectiveStack=Add Perspective Stack
+VWindowControlEditor_AddPartSashContainer=Add Part Sash Container
+VWindowControlEditor_AddPartStack=Add Part Stack
+VWindowControlEditor_AddPart=Add Part
+VWindowControlEditor_AddInputPart=Add Input Part
+VWindowControlEditor_AddArea=Add Area
 
 VWindowEditor_TreeLabel=Windows
 VWindowEditor_TreeLabelDescription=Windows Bla Bla Bla Bla Bla
 VWindowEditor_Windows=Windows
+VWindowEditor_AddTrimmedWindow=Add Trimmed Window
+VWindowEditor_AddWindow=Add Window
 
 VWindowSharedElementsEditor_TreeLabel=Shared Elements
 VWindowSharedElementsEditor_TreeLabelDescription=Shared Elements Bla Bla Bla Bla
 VWindowSharedElementsEditor_Controls=Controls
+VWindowSharedElementsEditor_AddPartSashContainer=Add Part Sash Container
+VWindowSharedElementsEditor_AddPart=Add Part
+VWindowSharedElementsEditor_AddInputPart=Add Input Part
 
 VWindowTrimEditor_TreeLabel=Window Trims
 VWindowTrimEditor_TreeLabelDescription=Window Trims Bla Bla Bla Bla Bla
 VWindowTrimEditor_Controls=Controls
+VWindowTrimEditor_AddWindowTrim=Add Window Trim
 
 AbstractIconDialog_IconName=IconName
 
@@ -491,6 +512,7 @@ ImageTooltip_FileSize=File-Size
 VItemParametersEditor_TreeLabel=Parameters
 VItemParametersEditor_TreeLabelDescription=Parameters Bla Bla Bla
 VItemParametersEditor_Parameters=Parameters
+VItemParametersEditor_AddParameter=Add Parameter
 
 CoreExpressionEditor_TreeLabel=Core Expression
 CoreExpressionEditor_TreeLabelDescription=Core Expression Bla Bla Bla
@@ -499,6 +521,10 @@ CoreExpressionEditor_ExpressionId=Expression Id
 VMenuElementsEditor_TreeLabel=Children
 VMenuElementsEditor_TreeLabelDescription=Children Bla Bla Bla
 VMenuElementsEditor_Children=Children
+VMenuElementsEditor_AddHandledMenuItem=Add Handled Menu Item
+VMenuElementsEditor_AddMenu=Add Menu
+VMenuElementsEditor_AddDirectMenuItem=Add Direct Menu Item
+VMenuElementsEditor_AddSeparator=Add Separator
 
 ExpressionIdDialog_ShellTitle=Find Expression Id
 ExpressionIdDialog_DialogTitle=Find Expression Id
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 6b8071d163..5c6e4c7955 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -148,6 +148,7 @@
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.databinding.viewers.ObservableListTreeContentProvider;
 import org.eclipse.jface.databinding.viewers.TreeStructureAdvisor;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -166,6 +167,7 @@
 import org.eclipse.swt.dnd.TransferData;
 import org.eclipse.swt.events.ControlAdapter;
 import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
@@ -212,6 +214,8 @@ public class ModelEditor {
 	private boolean fragment;
 	private Handler clipboardHandler;
 
+	private Image removeIcon;
+
 	@Inject
 	@Optional
 	private IClipboardService clipboardService;
@@ -236,6 +240,7 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 		this.context = context;
 		this.context.set(ModelEditor.class, this);
 		this.obsManager = new ObservablesManager();
+		this.removeIcon = new Image(composite.getDisplay(), ModelEditor.class.getResourceAsStream("/icons/full/obj16/cross.png"));
 
 		registerDefaultEditors();
 		registerVirtualEditors();
@@ -377,7 +382,7 @@ public void menuAboutToShow(IMenuManager manager) {
 						}
 
 						if (o.eContainer() != null) {
-							actions.add(new Action(Messages.ModelEditor_Delete) {
+							actions.add(new Action(Messages.ModelEditor_Delete, ImageDescriptor.createFromImage(removeIcon)) {
 								public void run() {
 									Command cmd = RemoveCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), o.eContainer(), o.eContainingFeature(), o);
 									if (cmd.canExecute()) {
@@ -748,6 +753,7 @@ public void setFocus() {
 	@PreDestroy
 	void dispose() {
 		try {
+			removeIcon.dispose();
 			obsManager.dispose();
 		} catch (Exception e) {
 			// TODO: handle exception
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index b0227e57ed..c7c8b37874 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -94,14 +94,14 @@ public Image getImage(Object element, Display display) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif")); //$NON-NLS-1$	
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area_vertical.gif")); //$NON-NLS-1$	
 				} catch (MalformedURLException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 			} else {
 				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer_vertical.gif")); //$NON-NLS-1$
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Area_vertical.gif")); //$NON-NLS-1$
 				} catch (MalformedURLException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -113,14 +113,14 @@ public Image getImage(Object element, Display display) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif")); //$NON-NLS-1$
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif")); //$NON-NLS-1$
 				} catch (MalformedURLException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 			} else {
 				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer.gif")); //$NON-NLS-1$
+					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Area.gif")); //$NON-NLS-1$
 				} catch (MalformedURLException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index f06206cdc1..dca00e323c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -54,12 +56,17 @@ public class VApplicationAddons extends AbstractComponentEditor {
 
 	public VApplicationAddons(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
-		actions.add(new Action(Messages.VApplicationAddons_AddAddon) {
-			@Override
-			public void run() {
-				handleAddAddon();
-			}
-		});
+		try {
+			actions.add(new Action(Messages.VApplicationAddons_AddAddon, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddAddon();
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index dc92ad7eb2..eb5ef69574 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -54,6 +56,17 @@ public class VApplicationCategoriesEditor extends AbstractComponentEditor {
 
 	public VApplicationCategoriesEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+			actions.add(new Action(Messages.VApplicationCategoriesEditor_AddCategory, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Category.png"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd();
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -177,15 +190,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MCategory command = CommandsFactoryImpl.eINSTANCE.createCategory();
-					setElementId(command);
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES, command);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(command);
-					}
+					handleAdd();
 				}
 			});
 
@@ -215,6 +220,18 @@ public IObservableList getChildList(Object element) {
 		return null;
 	}
 
+	protected void handleAdd() {
+		MCategory command = CommandsFactoryImpl.eINSTANCE.createCategory();
+		setElementId(command);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES, command);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(command);
+		}
+	}
+
 	@Override
 	public List<Action> getActions(Object element) {
 		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 7705e08ec2..857a361ee0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -28,6 +31,7 @@
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -47,9 +51,21 @@ public class VBindingTableEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer bindingViewer;
+	private List<Action> actions = new ArrayList<Action>();
 
 	public VBindingTableEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+			actions.add(new Action(Messages.VBindingTableEditor_AddBindingTable, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingTable.png"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd();
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -173,15 +189,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MBindingTable command = MCommandsFactory.INSTANCE.createBindingTable();
-					setElementId(command);
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES, command);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(command);
-					}
+					handleAdd();
 				}
 			});
 
@@ -206,9 +214,27 @@ public void widgetSelected(SelectionEvent e) {
 		return parent;
 	}
 
+	protected void handleAdd() {
+		MBindingTable command = MCommandsFactory.INSTANCE.createBindingTable();
+		setElementId(command);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES, command);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(command);
+		}
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		return null;
 	}
 
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 1646f41202..81a39e6350 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -28,6 +31,7 @@
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -49,10 +53,22 @@ public class VCommandEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 
 	private EStructuralFeature commandsFeature;
+	private List<Action> actions = new ArrayList<Action>();
 
 	public VCommandEditor(EditingDomain editingDomain, ModelEditor editor, EStructuralFeature commandsFeature) {
 		super(editingDomain, editor);
 		this.commandsFeature = commandsFeature;
+		try {
+			actions.add(new Action(Messages.VCommandEditor_AddCommand, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.png"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd();
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -176,15 +192,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MCommand command = CommandsFactoryImpl.eINSTANCE.createCommand();
-					setElementId(command);
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), commandsFeature, command);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(command);
-					}
+					handleAdd();
 				}
 			});
 
@@ -209,9 +217,27 @@ public void widgetSelected(SelectionEvent e) {
 		return parent;
 	}
 
+	protected void handleAdd() {
+		MCommand command = CommandsFactoryImpl.eINSTANCE.createCommand();
+		setElementId(command);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), commandsFeature, command);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(command);
+		}
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		return null;
 	}
 
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 2f5f7a6972..9ccbd4d087 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -28,6 +31,7 @@
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -47,9 +51,21 @@ public class VHandlerEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
+	private List<Action> actions = new ArrayList<Action>();
 
 	public VHandlerEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+			actions.add(new Action(Messages.VHandlerEditor_AddHandler, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd();
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -173,15 +189,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MHandler handler = MCommandsFactory.INSTANCE.createHandler();
-					setElementId(handler);
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, handler);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(handler);
-					}
+					handleAdd();
 				}
 			});
 
@@ -210,4 +218,23 @@ public void widgetSelected(SelectionEvent e) {
 	public IObservableList getChildList(Object element) {
 		return null;
 	}
+
+	protected void handleAdd() {
+		MHandler handler = MCommandsFactory.INSTANCE.createHandler();
+		setElementId(handler);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, handler);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(handler);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
index de21d72f1b..08f398a673 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -30,6 +33,7 @@
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -49,11 +53,23 @@ public class VItemParametersEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
+	private List<Action> actions = new ArrayList<Action>();
 
 	private IEMFListProperty HANDLED_ITEM__PARAMETERS = EMFProperties.list(MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
 
 	public VItemParametersEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+			actions.add(new Action(Messages.VItemParametersEditor_AddParameter, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd();
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -177,15 +193,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MParameter handler = MCommandsFactory.INSTANCE.createParameter();
-					setElementId(handler);
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, handler);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(handler);
-					}
+					handleAdd();
 				}
 			});
 
@@ -214,4 +222,23 @@ public void widgetSelected(SelectionEvent e) {
 	public IObservableList getChildList(Object element) {
 		return HANDLED_ITEM__PARAMETERS.observe(element);
 	}
+
+	protected void handleAdd() {
+		MParameter handler = MCommandsFactory.INSTANCE.createParameter();
+		setElementId(handler);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, handler);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(handler);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index 4443cf1ce7..346ad2a7d9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -28,6 +31,7 @@
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -48,8 +52,21 @@ public class VMenuContributionsEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
 
+	private List<Action> actions = new ArrayList<Action>();
+
 	public VMenuContributionsEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+			actions.add(new Action(Messages.VMenuContributionsEditor_AddMenuContribution, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd();
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -173,15 +190,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MMenuContribution command = MMenuFactory.INSTANCE.createMenuContribution();
-					setElementId(command);
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS, command);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(command);
-					}
+					handleAdd();
 				}
 			});
 
@@ -210,4 +219,23 @@ public void widgetSelected(SelectionEvent e) {
 	public IObservableList getChildList(Object element) {
 		return null;
 	}
+
+	protected void handleAdd() {
+		MMenuContribution command = MMenuFactory.INSTANCE.createMenuContribution();
+		setElementId(command);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS, command);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(command);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 537f5a7626..596bce56d1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -30,6 +33,7 @@
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -50,10 +54,22 @@ public class VMenuEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
 	private EStructuralFeature feature;
+	private List<Action> actions = new ArrayList<Action>();
 
 	public VMenuEditor(EditingDomain editingDomain, ModelEditor editor, EStructuralFeature feature) {
 		super(editingDomain, editor);
 		this.feature = feature;
+		try {
+			actions.add(new Action(Messages.VMenuEditor_AddMenuContribution, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd();
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -177,15 +193,7 @@ public void widgetSelected(SelectionEvent e) {
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				MMenu handler = MMenuFactory.INSTANCE.createMenu();
-				setElementId(handler);
-
-				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), feature, handler);
-
-				if (cmd.canExecute()) {
-					getEditingDomain().getCommandStack().execute(cmd);
-					getEditor().setSelection(handler);
-				}
+				handleAdd();
 			}
 		});
 
@@ -211,7 +219,25 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
+
+	protected void handleAdd() {
+		MMenu handler = MMenuFactory.INSTANCE.createMenu();
+		setElementId(handler);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), feature, handler);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(handler);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuElementsEditor.java
index baebd34556..1610a95c7f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuElementsEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -33,6 +36,7 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
@@ -55,11 +59,42 @@ public class VMenuElementsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
+	private List<Action> actions = new ArrayList<Action>();
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
 	public VMenuElementsEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+			actions.add(new Action(Messages.VMenuElementsEditor_AddHandledMenuItem, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
+				}
+			});
+			actions.add(new Action(Messages.VMenuElementsEditor_AddMenu, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(MenuPackageImpl.Literals.MENU, false);
+				}
+			});
+			actions.add(new Action(Messages.VMenuElementsEditor_AddDirectMenuItem, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false);
+				}
+			});
+			actions.add(new Action(Messages.VMenuElementsEditor_AddSeparator, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(MenuPackageImpl.Literals.MENU_SEPARATOR, true);
+				}
+			});
+
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -194,16 +229,7 @@ public void widgetSelected(SelectionEvent e) {
 				if (!childrenDropDown.getSelection().isEmpty()) {
 					Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
 					EClass eClass = struct.eClass;
-					MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						if (!struct.separator) {
-							getEditor().setSelection(eObject);
-						}
-					}
+					handleAdd(eClass, struct.separator);
 				}
 			}
 		});
@@ -245,4 +271,23 @@ public Struct(String label, EClass eClass, boolean separator) {
 		}
 	}
 
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
+
+	protected void handleAdd(EClass eClass, boolean separator) {
+		MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			if (!separator) {
+				getEditor().setSelection(eObject);
+			}
+		}
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index cd3e2cb025..e0a5fdc69a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -28,6 +31,7 @@
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -47,9 +51,21 @@ public class VPartDescriptor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
+	private List<Action> actions = new ArrayList<Action>();
 
 	public VPartDescriptor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+			actions.add(new Action(Messages.VPartDescriptor_AddPartDescriptor, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd();
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -173,15 +189,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MPartDescriptor command = MBasicFactory.INSTANCE.createPartDescriptor();
-					setElementId(command);
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, command);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(command);
-					}
+					handleAdd();
 				}
 			});
 
@@ -210,4 +218,23 @@ public void widgetSelected(SelectionEvent e) {
 	public IObservableList getChildList(Object element) {
 		return null;
 	}
+
+	protected void handleAdd() {
+		MPartDescriptor command = MBasicFactory.INSTANCE.createPartDescriptor();
+		setElementId(command);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, command);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(command);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
index 3bc2433b20..8629943ab6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -54,12 +56,17 @@ public class VRootBindingContexts extends AbstractComponentEditor {
 
 	public VRootBindingContexts(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
-		actions.add(new Action(Messages.VRootBindingContexts_AddContext) {
-			@Override
-			public void run() {
-				handleAddContext();
-			}
-		});
+		try {
+			actions.add(new Action(Messages.VRootBindingContexts_AddContext, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddContext();
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index f5e196921b..34b558e9bb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -28,6 +31,7 @@
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -47,9 +51,21 @@ public class VToolBarContributionsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
+	private List<Action> actions = new ArrayList<Action>();
 
 	public VToolBarContributionsEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+			actions.add(new Action(Messages.VToolBarContributionsEditor_AddToolBarContribution, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd();
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -173,15 +189,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MToolBarContribution command = MMenuFactory.INSTANCE.createToolBarContribution();
-					setElementId(command);
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS, command);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(command);
-					}
+					handleAdd();
 				}
 			});
 
@@ -208,7 +216,25 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
+
+	protected void handleAdd() {
+		MToolBarContribution command = MMenuFactory.INSTANCE.createToolBarContribution();
+		setElementId(command);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS, command);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(command);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index 84de2e6b21..6aec00c547 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -28,6 +31,7 @@
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -47,9 +51,21 @@ public class VTrimContributionsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
+	private List<Action> actions = new ArrayList<Action>();
 
 	public VTrimContributionsEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+			actions.add(new Action(Messages.VTrimContributionsEditor_AddTrimContribution, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd();
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -173,15 +189,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MTrimContribution command = MMenuFactory.INSTANCE.createTrimContribution();
-					setElementId(command);
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS, command);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(command);
-					}
+					handleAdd();
 				}
 			});
 
@@ -210,4 +218,23 @@ public void widgetSelected(SelectionEvent e) {
 	public IObservableList getChildList(Object element) {
 		return null;
 	}
+
+	protected void handleAdd() {
+		MTrimContribution command = MMenuFactory.INSTANCE.createTrimContribution();
+		setElementId(command);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS, command);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(command);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index dd3531951f..c0277478ab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -32,6 +35,7 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
@@ -54,9 +58,57 @@ public class VWindowControlEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
+	private List<Action> actions = new ArrayList<Action>();
 
 	public VWindowControlEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+			actions.add(new Action(Messages.VWindowControlEditor_AddPerspectiveStack, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK);
+				}
+			});
+
+			actions.add(new Action(Messages.VWindowControlEditor_AddPartSashContainer, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
+				}
+			});
+
+			actions.add(new Action(Messages.VWindowControlEditor_AddPartStack, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(BasicPackageImpl.Literals.PART_STACK);
+				}
+			});
+
+			actions.add(new Action(Messages.VWindowControlEditor_AddPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(BasicPackageImpl.Literals.PART);
+				}
+			});
+
+			actions.add(new Action(Messages.VWindowControlEditor_AddInputPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(BasicPackageImpl.Literals.PART);
+				}
+			});
+
+			actions.add(new Action(Messages.VWindowControlEditor_AddArea, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(AdvancedPackageImpl.Literals.AREA);
+				}
+			});
+
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -187,17 +239,7 @@ public String getText(Object element) {
 				public void widgetSelected(SelectionEvent e) {
 					if (!childrenDropDown.getSelection().isEmpty()) {
 						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-
-						EObject eObject = EcoreUtil.create(eClass);
-
-						setElementId(eObject);
-
-						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-							getEditor().setSelection(eObject);
-						}
+						handleAdd(eClass);
 					}
 				}
 			});
@@ -229,4 +271,23 @@ public IObservableList getChildList(Object element) {
 		return null;
 	}
 
+	private void handleAdd(EClass eClass) {
+		EObject eObject = EcoreUtil.create(eClass);
+
+		setElementId(eObject);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(eObject);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index b8995ff341..462628b329 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -31,6 +34,7 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
@@ -53,9 +57,27 @@ public class VWindowEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
+	private List<Action> actions = new ArrayList<Action>();
 
 	public VWindowEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+			actions.add(new Action(Messages.VWindowEditor_AddTrimmedWindow, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(BasicPackageImpl.Literals.TRIMMED_WINDOW);
+				}
+			});
+			actions.add(new Action(Messages.VWindowEditor_AddWindow, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(BasicPackageImpl.Literals.WINDOW);
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -175,8 +197,8 @@ public String getText(Object element) {
 				return eclass.getName();
 			}
 		});
-		childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.WINDOW, BasicPackageImpl.Literals.TRIMMED_WINDOW });
-		childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.WINDOW));
+		childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW });
+		childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.TRIMMED_WINDOW));
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
@@ -185,15 +207,7 @@ public String getText(Object element) {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-				EObject handler = EcoreUtil.create(eClass);
-				setElementId(handler);
-
-				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
-
-				if (cmd.canExecute()) {
-					getEditingDomain().getCommandStack().execute(cmd);
-					getEditor().setSelection(handler);
-				}
+				handleAdd(eClass);
 			}
 		});
 
@@ -226,4 +240,22 @@ public IObservableList getChildList(Object element) {
 		return null;
 	}
 
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
+
+	protected void handleAdd(EClass eClass) {
+		EObject handler = EcoreUtil.create(eClass);
+		setElementId(handler);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(handler);
+		}
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 5a1d061c68..99be98eb6d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -31,6 +34,7 @@
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
@@ -53,9 +57,36 @@ public class VWindowSharedElementsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
+	private List<Action> actions = new ArrayList<Action>();
 
 	public VWindowSharedElementsEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+
+		try {
+			actions.add(new Action(Messages.VWindowSharedElementsEditor_AddPartSashContainer, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
+				}
+			});
+
+			actions.add(new Action(Messages.VWindowSharedElementsEditor_AddPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(BasicPackageImpl.Literals.PART);
+				}
+			});
+
+			actions.add(new Action(Messages.VWindowSharedElementsEditor_AddInputPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(BasicPackageImpl.Literals.INPUT_PART);
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -197,15 +228,7 @@ public String getText(Object element) {
 				public void widgetSelected(SelectionEvent e) {
 					if (!childrenDropDown.getSelection().isEmpty()) {
 						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-						EObject eObject = EcoreUtil.create(eClass);
-						setElementId(eObject);
-
-						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, eObject);
-
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-							getEditor().setSelection(eObject);
-						}
+						handleAdd(eClass);
 					}
 				}
 			});
@@ -237,4 +260,22 @@ public IObservableList getChildList(Object element) {
 		return null;
 	}
 
+	protected void handleAdd(EClass eClass) {
+		EObject eObject = EcoreUtil.create(eClass);
+		setElementId(eObject);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(eObject);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index 2e3a6a0be9..f6ae8da45c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -26,6 +29,7 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
@@ -44,9 +48,21 @@ public class VWindowTrimEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
+	private List<Action> actions = new ArrayList<Action>();
 
 	public VWindowTrimEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+			actions.add(new Action(Messages.VWindowTrimEditor_AddWindowTrim, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd();
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -117,15 +133,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MTrimBar handler = MBasicFactory.INSTANCE.createTrimBar();
-					setElementId(handler);
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS, handler);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(handler);
-					}
+					handleAdd();
 				}
 			});
 
@@ -156,4 +164,22 @@ public IObservableList getChildList(Object element) {
 		return null;
 	}
 
+	protected void handleAdd() {
+		MTrimBar handler = MBasicFactory.INSTANCE.createTrimBar();
+		setElementId(handler);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS, handler);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(handler);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
\ No newline at end of file

From d414990fd8b19ec02e80e12f391892fb2144eb49 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 30 Dec 2010 23:09:06 +0000
Subject: [PATCH 0283/1286] Bug 323309 - [ModelTooling] Add Elements via the
 right mouse button * adds context actions for rest of elements

---
 .../e4/tools/emf/ui/internal/Messages.java    | 26 +++++++
 .../tools/emf/ui/internal/Messages.properties | 28 +++++++
 .../component/BindingContextEditor.java       | 45 ++++++++---
 .../common/component/BindingTableEditor.java  | 40 ++++++++--
 .../common/component/CommandEditor.java       | 42 +++++++---
 .../common/component/KeyBindingEditor.java    | 42 ++++++++--
 .../component/PartSashContainerEditor.java    | 74 +++++++++++++++---
 .../common/component/PartStackEditor.java     | 55 +++++++++++---
 .../common/component/PerspectiveEditor.java   | 76 ++++++++++++++++---
 .../component/PerspectiveStackEditor.java     | 44 ++++++++---
 .../common/component/ToolBarEditor.java       | 65 +++++++++++++---
 .../common/component/TrimBarEditor.java       | 49 +++++++++---
 12 files changed, 494 insertions(+), 92 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index fbf1fc223d..be5bae1c54 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -57,6 +57,7 @@ public class Messages extends NLS {
 	public static String BindingTableEditor_Keybindings;
 	public static String BindingTableEditor_KeySequence;
 	public static String BindingTableEditor_Command;
+	public static String BindingTableEditor_AddKeyBinding;
 
 	public static String CommandEditor_Label;
 	public static String CommandEditor_Description;
@@ -70,6 +71,7 @@ public class Messages extends NLS {
 	public static String CommandEditor_ParameterOptional_Yes;
 	public static String CommandEditor_ParameterId;
 	public static String CommandEditor_Category;
+	public static String CommandEditor_AddCommandParameter;
 
 	public static String DirectMenuItemEditor_Label;
 	public static String DirectMenuItemEditor_Description;
@@ -112,6 +114,7 @@ public class Messages extends NLS {
 	public static String KeyBindingEditor_Parameters;
 	public static String KeyBindingEditor_SequenceNotComplete;
 	public static String KeyBindingEditor_SequenceEmpty;
+	public static String KeyBindingEditor_AddParameter;
 
 	public static String MenuEditor_Label;
 	public static String MenuEditor_Description;
@@ -179,12 +182,21 @@ public class Messages extends NLS {
 	public static String PartSashContainerEditor_SelectedElement;
 	public static String PartSashContainerEditor_Controls;
 	public static String PartSashContainerEditor_ContainerData;
+	public static String PartSashContainerEditor_AddPartSashContainer;
+	public static String PartSashContainerEditor_AddPartStack;
+	public static String PartSashContainerEditor_AddPart;
+	public static String PartSashContainerEditor_AddInputPart;
+	public static String PartSashContainerEditor_AddArea;
+	public static String PartSashContainerEditor_AddPlaceholder;
 
 	public static String PartStackEditor_Label;
 	public static String PartStackEditor_Description;
 	public static String PartStackEditor_SelectedElement;
 	public static String PartStackEditor_Parts;
 	public static String PartStackEditor_ContainerData;
+	public static String PartStackEditor_AddPart;
+	public static String PartStackEditor_AddInputPart;
+	public static String PartStackEditor_AddPlaceholder;
 
 	public static String PerspectiveEditor_Label;
 	public static String PerspectiveEditor_Description;
@@ -193,11 +205,18 @@ public class Messages extends NLS {
 	public static String PerspectiveEditor_Tooltip;
 	public static String PerspectiveEditor_IconURI;
 	public static String PerspectiveEditor_Controls;
+	public static String PerspectiveEditor_AddPartSashContainer;
+	public static String PerspectiveEditor_AddPartStack;
+	public static String PerspectiveEditor_AddPart;
+	public static String PerspectiveEditor_AddInputPart;
+	public static String PerspectiveEditor_AddArea;
+	public static String PerspectiveEditor_AddPlaceholder;
 
 	public static String PerspectiveStackEditor_Perspectives;
 	public static String PerspectiveStackEditor_Label;
 	public static String PerspectiveStackEditor_Description;
 	public static String PerspectiveStackEditor_SelectedElement;
+	public static String PerspectiveStackEditor_AddPerspective;
 
 	public static String PlaceholderEditor_Label;
 	public static String PlaceholderEditor_Descriptor;
@@ -212,6 +231,10 @@ public class Messages extends NLS {
 	public static String ToolBarEditor_DirectToolItem;
 	public static String ToolBarEditor_ToolControl;
 	public static String ToolBarEditor_Separator;
+	public static String ToolBarEditor_AddHandledToolItem;
+	public static String ToolBarEditor_AddDirectToolItem;
+	public static String ToolBarEditor_AddToolControl;
+	public static String ToolBarEditor_AddToolBarSeparator;
 
 	public static String ToolBarSeparatorEditor_Label;
 
@@ -284,6 +307,7 @@ public class Messages extends NLS {
 	public static String BindingContextEditor_Name;
 	public static String BindingContextEditor_Description;
 	public static String BindingContextEditor_Subcontexts;
+	public static String BindingContextEditor_AddContext;
 
 	public static String CommandParameterEditor_TreeLabel;
 	public static String CommandParameterEditor_TreeLabelDescritpion;
@@ -321,6 +345,8 @@ public class Messages extends NLS {
 	public static String TrimBarEditor_TreeLabelDescription;
 	public static String TrimBarEditor_Side;
 	public static String TrimBarEditor_Controls;
+	public static String TrimBarEditor_AddToolBar;
+	public static String TrimBarEditor_AddToolControl;
 
 	public static String TrimContributionEditor_TreeLabel;
 	public static String TrimContributionEditor_TreeLabelDescription;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 2ee8972a0a..690ea2d3fc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -52,6 +52,7 @@ BindingTableEditor_ContextId=Context Id
 BindingTableEditor_Keybindings=Keybindings
 BindingTableEditor_KeySequence=KeySequence
 BindingTableEditor_Command=Command
+BindingTableEditor_AddKeyBinding=Add Keybinding
 
 CommandEditor_Label=Command
 CommandEditor_Description=Command bla bla bla
@@ -65,6 +66,7 @@ CommandEditor_ParameterOptional_Yes=yes
 CommandEditor_ParameterOptional_No=no
 CommandEditor_ParameterId=Id
 CommandEditor_Category=Category
+CommandEditor_AddCommandParameter=Add Command Parameter
 
 DirectMenuItemEditor_Label=DirectMenuItem
 DirectMenuItemEditor_Description=DirectMenuItem bla bla bla
@@ -107,6 +109,7 @@ KeyBindingEditor_Command=Command
 KeyBindingEditor_Parameters=Parameters
 KeyBindingEditor_SequenceNotComplete=Keysequence is not complete
 KeyBindingEditor_SequenceEmpty=Keysequence must not be empty!
+KeyBindingEditor_AddParameter=Add Parameter
 
 MenuEditor_Label=Menu
 MenuEditor_Description=Menu bla bla bla
@@ -174,12 +177,21 @@ PartSashContainerEditor_Horizontal=Horizontal
 PartSashContainerEditor_SelectedElement=Selected Element
 PartSashContainerEditor_Controls=Controls
 PartSashContainerEditor_ContainerData=Container Data
+PartSashContainerEditor_AddPartSashContainer=Add PartSashContainer
+PartSashContainerEditor_AddPartStack=Add PartStack
+PartSashContainerEditor_AddPart=Add Part
+PartSashContainerEditor_AddInputPart=Add Input Part
+PartSashContainerEditor_AddArea=Add Area
+PartSashContainerEditor_AddPlaceholder=Add Placeholder
 
 PartStackEditor_Label=Part Stack
 PartStackEditor_Description=Stack bla bla bla
 PartStackEditor_SelectedElement=Selected Element
 PartStackEditor_Parts=Parts
 PartStackEditor_ContainerData=Container Data
+PartStackEditor_AddPart=Add Part
+PartStackEditor_AddInputPart=Add Input Part
+PartStackEditor_AddPlaceholder=Add Placeholder
 
 PerspectiveEditor_Label=Perspective
 PerspectiveEditor_Description=Perspective Bla Bla Bla
@@ -189,11 +201,19 @@ PerspectiveEditor_Label=Label
 PerspectiveEditor_Tooltip=Tooltip
 PerspectiveEditor_IconURI=Icon URI
 PerspectiveEditor_Controls=Controls
+PerspectiveEditor_AddPartSashContainer=Add PartSashContainer
+PerspectiveEditor_AddPartStack=Add PartStack
+PerspectiveEditor_AddPart=Add Part
+PerspectiveEditor_AddInputPart=Add InputPart
+PerspectiveEditor_AddArea=Add Area
+PerspectiveEditor_AddPlaceholder=Add Placeholder
+
 
 PerspectiveStackEditor_Label=Perspective Stack
 PerspectiveStackEditor_Description=Perspective Stack Bla Bla Bla
 PerspectiveStackEditor_SelectedElement=Selected Element
 PerspectiveStackEditor_Perspectives=Perspectives
+PerspectiveStackEditor_AddPerspective=Add Perspective
 
 PlaceholderEditor_Label=Placeholder
 PlaceholderEditor_Descriptor=Placeholder Bla Bla Bla Bla
@@ -208,6 +228,10 @@ ToolBarEditor_HandledToolItem=Handled ToolItem
 ToolBarEditor_DirectToolItem=Direct ToolItem
 ToolBarEditor_ToolControl=Tool Control
 ToolBarEditor_Separator=Separator
+ToolBarEditor_AddHandledToolItem=Add Handled ToolItem
+ToolBarEditor_AddDirectToolItem=Add Direct ToolItem
+ToolBarEditor_AddToolControl=Add Toolcontrol
+ToolBarEditor_AddToolBarSeparator=Add Sepatator
 
 ToolBarSeparatorEditor_Label=Separator
 
@@ -279,6 +303,7 @@ BindingContextEditor_TreeLabelDescription=Binding Context Bla Bla Bla
 BindingContextEditor_Name=Name
 BindingContextEditor_Description=Description
 BindingContextEditor_Subcontexts=Subcontexts
+BindingContextEditor_AddContext=Add Binding Context
 
 CommandParameterEditor_TreeLabel=Command Parameter
 CommandParameterEditor_TreeLabelDescritpion=Command Parameter Bla Bla Bla
@@ -316,6 +341,9 @@ TrimBarEditor_TreeLabel=Window Trim
 TrimBarEditor_TreeLabelDescription=Window Trim bla bla bla
 TrimBarEditor_Side=Side
 TrimBarEditor_Controls=Controls
+TrimBarEditor_AddToolBar=Add Toolbar
+TrimBarEditor_AddToolControl=Add Toolcontrol
+
 
 TrimContributionEditor_TreeLabel=Trim Contribution
 TrimContributionEditor_TreeLabelDescription=Trim Contribution Bla Bla Bla Bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 5619fded8a..a792889f48 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -12,6 +12,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -36,6 +37,7 @@
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -62,8 +64,21 @@ public class BindingContextEditor extends AbstractComponentEditor {
 	private EStackLayout stackLayout;
 	private IListProperty BINDING_CONTEXT__CHILDREN = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
 
+	private List<Action> actions = new ArrayList<Action>();
+
 	public BindingContextEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+			actions.add(new Action(Messages.BindingContextEditor_AddContext, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddContext();
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -241,16 +256,7 @@ public void widgetSelected(SelectionEvent e) {
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				MBindingContext eObject = MCommandsFactory.INSTANCE.createBindingContext();
-				setElementId(eObject);
-
-				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN, eObject);
-
-				if (cmd.canExecute()) {
-					getEditingDomain().getCommandStack().execute(cmd);
-					getEditor().setSelection(eObject);
-
-				}
+				handleAddContext();
 			}
 		});
 
@@ -279,4 +285,23 @@ public IObservableList getChildList(Object element) {
 		return BINDING_CONTEXT__CHILDREN.observe(element);
 	}
 
+	protected void handleAddContext() {
+		MBindingContext eObject = MCommandsFactory.INSTANCE.createBindingContext();
+		setElementId(eObject);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(eObject);
+
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 2e28f5e6c3..324098119c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -12,6 +12,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -40,6 +41,7 @@
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -67,9 +69,21 @@ public class BindingTableEditor extends AbstractComponentEditor {
 
 	private IListProperty BINDING_TABLE__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
 	private EStackLayout stackLayout;
+	private List<Action> actions = new ArrayList<Action>();
 
 	public BindingTableEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+			actions.add(new Action(Messages.BindingTableEditor_AddKeyBinding, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.png"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddKeyBinding();
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -272,14 +286,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MKeyBinding handler = MCommandsFactory.INSTANCE.createKeyBinding();
-					System.err.println(getMaster().getValue());
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, handler);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(handler);
-					}
+					handleAddKeyBinding();
 				}
 			});
 
@@ -323,4 +330,21 @@ public String getDetailLabel(Object element) {
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID) };
 	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
+
+	protected void handleAddKeyBinding() {
+		MKeyBinding handler = MCommandsFactory.INSTANCE.createKeyBinding();
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, handler);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(handler);
+		}
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index d02ecb8f42..77fcd742cd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -12,6 +12,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -37,6 +38,7 @@
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -62,11 +64,23 @@ public class CommandEditor extends AbstractComponentEditor {
 	private Image image;
 	private EMFDataBindingContext context;
 	private EStackLayout stackLayout;
+	private List<Action> actions = new ArrayList<Action>();
 
 	private IEMFEditListProperty COMMAND__PARAMETERS = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
 
 	public CommandEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+			actions.add(new Action(Messages.CommandEditor_AddCommandParameter, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.png"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddCommandParameter();
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -296,15 +310,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MCommandParameter param = MCommandsFactory.INSTANCE.createCommandParameter();
-					setElementId(param);
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS, param);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(param);
-					}
+					handleAddCommandParameter();
 				}
 			});
 
@@ -351,4 +357,22 @@ public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME) };
 	}
 
+	protected void handleAddCommandParameter() {
+		MCommandParameter param = MCommandsFactory.INSTANCE.createCommandParameter();
+		setElementId(param);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS, param);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(param);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 10908af671..df1f3ba0ce 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -12,6 +12,8 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -44,6 +46,7 @@
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.bindings.keys.KeySequence;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -71,12 +74,24 @@ public class KeyBindingEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private IModelResource resource;
 	private EStackLayout stackLayout;
+	private List<Action> actions = new ArrayList<Action>();
 
 	private IEMFEditListProperty KEY_BINDING__PARAMETERS = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS);
 
 	public KeyBindingEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource) {
 		super(editingDomain, editor);
 		this.resource = resource;
+		try {
+			actions.add(new Action(Messages.KeyBindingEditor_AddParameter, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddParameter();
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -289,14 +304,7 @@ public void widgetSelected(SelectionEvent e) {
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				MKeyBinding item = (MKeyBinding) getMaster().getValue();
-				MParameter param = MCommandsFactory.INSTANCE.createParameter();
-				setElementId(param);
-
-				Command cmd = AddCommand.create(getEditingDomain(), item, CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS, param);
-				if (cmd.canExecute()) {
-					getEditingDomain().getCommandStack().execute(cmd);
-				}
+				handleAddParameter();
 			}
 		});
 
@@ -365,4 +373,22 @@ public IStatus validate(Object value) {
 			return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", Messages.KeyBindingEditor_SequenceEmpty); //$NON-NLS-1$
 		}
 	}
+
+	protected void handleAddParameter() {
+		MKeyBinding item = (MKeyBinding) getMaster().getValue();
+		MParameter param = MCommandsFactory.INSTANCE.createParameter();
+		setElementId(param);
+
+		Command cmd = AddCommand.create(getEditingDomain(), item, CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS, param);
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 9835cbce4c..d3ecac257f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -12,6 +12,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -41,6 +42,7 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
@@ -72,9 +74,52 @@ public class PartSashContainerEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
+	private List<Action> actions = new ArrayList<Action>();
 
 	public PartSashContainerEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+			actions.add(new Action(Messages.PartSashContainerEditor_AddPartSashContainer, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
+				}
+			});
+			actions.add(new Action(Messages.PartSashContainerEditor_AddPartStack, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(BasicPackageImpl.Literals.PART_STACK);
+				}
+			});
+			actions.add(new Action(Messages.PartSashContainerEditor_AddPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(BasicPackageImpl.Literals.PART);
+				}
+			});
+			actions.add(new Action(Messages.PartSashContainerEditor_AddInputPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(BasicPackageImpl.Literals.INPUT_PART);
+				}
+			});
+			actions.add(new Action(Messages.PartSashContainerEditor_AddArea, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(AdvancedPackageImpl.Literals.AREA);
+				}
+			});
+			actions.add(new Action(Messages.PartSashContainerEditor_AddPlaceholder, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
+				}
+			});
+
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -327,15 +372,7 @@ public String getText(Object element) {
 				public void widgetSelected(SelectionEvent e) {
 					if (!childrenDropDown.getSelection().isEmpty()) {
 						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-						EObject eObject = EcoreUtil.create(eClass);
-						setElementId(eObject);
-
-						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-							getEditor().setSelection(eObject);
-						}
+						handleAddChild(eClass);
 					}
 				}
 			});
@@ -381,4 +418,23 @@ public String getDetailLabel(Object element) {
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
+
+	protected void handleAddChild(EClass eClass) {
+		EObject eObject = EcoreUtil.create(eClass);
+		setElementId(eObject);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(eObject);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 1f998a1d57..0061885ba1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -12,6 +12,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -40,6 +41,7 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -72,9 +74,33 @@ public class PartStackEditor extends AbstractComponentEditor {
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private Image tbrImage;
+	private List<Action> actions = new ArrayList<Action>();
 
 	public PartStackEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+			actions.add(new Action(Messages.PartStackEditor_AddPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(BasicPackageImpl.Literals.PART);
+				}
+			});
+			actions.add(new Action(Messages.PartStackEditor_AddInputPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(BasicPackageImpl.Literals.INPUT_PART);
+				}
+			});
+			actions.add(new Action(Messages.PartStackEditor_AddPlaceholder, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -289,15 +315,7 @@ public String getText(Object element) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-					EObject eObject = EcoreUtil.create(eClass);
-					setElementId(eObject);
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(eObject);
-					}
+					handleAddChild(eClass);
 				}
 			});
 
@@ -342,4 +360,23 @@ public String getDetailLabel(Object element) {
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
+
+	protected void handleAddChild(EClass eClass) {
+		EObject eObject = EcoreUtil.create(eClass);
+		setElementId(eObject);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(eObject);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 4543a3b154..2ee16ccea9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -12,6 +12,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -46,6 +47,7 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -75,10 +77,53 @@ public class PerspectiveEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
+	private List<Action> actions = new ArrayList<Action>();
 
 	public PerspectiveEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
 		super(editingDomain, editor);
 		this.project = project;
+		try {
+			actions.add(new Action(Messages.PerspectiveEditor_AddPartSashContainer, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
+				}
+			});
+			actions.add(new Action(Messages.PerspectiveEditor_AddPartStack, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(BasicPackageImpl.Literals.PART_STACK);
+				}
+			});
+			actions.add(new Action(Messages.PerspectiveEditor_AddPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(BasicPackageImpl.Literals.PART);
+				}
+			});
+			actions.add(new Action(Messages.PerspectiveEditor_AddInputPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(BasicPackageImpl.Literals.INPUT_PART);
+				}
+			});
+			actions.add(new Action(Messages.PerspectiveEditor_AddArea, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(AdvancedPackageImpl.Literals.AREA);
+				}
+			});
+			actions.add(new Action(Messages.PerspectiveEditor_AddPlaceholder, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
+				}
+			});
+
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -340,7 +385,7 @@ public String getText(Object element) {
 					return eclass.getName();
 				}
 			});
-			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.PLACEHOLDER });
+			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
@@ -351,15 +396,7 @@ public String getText(Object element) {
 				public void widgetSelected(SelectionEvent e) {
 					if (!childrenDropDown.getSelection().isEmpty()) {
 						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-						EObject eObject = EcoreUtil.create(eClass);
-						setElementId(eObject);
-
-						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-							getEditor().setSelection(eObject);
-						}
+						handleAddChild(eClass);
 					}
 				}
 			});
@@ -397,4 +434,23 @@ public void widgetSelected(SelectionEvent e) {
 	public IObservableList getChildList(Object element) {
 		return ELEMENT_CONTAINER__CHILDREN.observe(element);
 	}
+
+	protected void handleAddChild(EClass eClass) {
+		EObject eObject = EcoreUtil.create(eClass);
+		setElementId(eObject);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(eObject);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 1d35f67951..792cd25fbb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -12,6 +12,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -38,6 +39,7 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -63,9 +65,22 @@ public class PerspectiveStackEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
+	private List<Action> actions = new ArrayList<Action>();
 
 	public PerspectiveStackEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+
+			actions.add(new Action(Messages.PerspectiveStackEditor_AddPerspective, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddPerspective();
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -254,15 +269,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MPerspective eObject = MAdvancedFactory.INSTANCE.createPerspective();
-					setElementId(eObject);
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(eObject);
-					}
+					handleAddPerspective();
 				}
 			});
 
@@ -302,4 +309,23 @@ public IObservableList getChildList(Object element) {
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
+
+	protected void handleAddPerspective() {
+		MPerspective eObject = MAdvancedFactory.INSTANCE.createPerspective();
+		setElementId(eObject);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(eObject);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index b72494d501..07e16f5cd5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -12,6 +12,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -40,6 +41,7 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -69,6 +71,7 @@ public class ToolBarEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
+	private List<Action> actions = new ArrayList<Action>();
 
 	private static class Struct {
 		private final String label;
@@ -84,6 +87,35 @@ public Struct(String label, EClass eClass, boolean separator) {
 
 	public ToolBarEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
+		try {
+			actions.add(new Action(Messages.ToolBarEditor_AddHandledToolItem, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
+				}
+			});
+			actions.add(new Action(Messages.ToolBarEditor_AddDirectToolItem, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false);
+				}
+			});
+			actions.add(new Action(Messages.ToolBarEditor_AddToolControl, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(MenuPackageImpl.Literals.TOOL_CONTROL, false);
+				}
+			});
+			actions.add(new Action(Messages.ToolBarEditor_AddToolBarSeparator, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true);
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -284,17 +316,7 @@ public void widgetSelected(SelectionEvent e) {
 					if (!childrenDropDown.getSelection().isEmpty()) {
 						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
 						EClass eClass = struct.eClass;
-						MToolBarElement eObject = (MToolBarElement) EcoreUtil.create(eClass);
-						setElementId(eObject);
-
-						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-							if (!struct.separator) {
-								getEditor().setSelection(eObject);
-							}
-						}
+						handleAddChild(eClass, struct.separator);
 					}
 				}
 			});
@@ -337,4 +359,25 @@ public String getDetailLabel(Object element) {
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
+
+	protected void handleAddChild(EClass eClass, boolean separator) {
+		MToolBarElement eObject = (MToolBarElement) EcoreUtil.create(eClass);
+		setElementId(eObject);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			if (!separator) {
+				getEditor().setSelection(eObject);
+			}
+		}
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 8ad1916d4d..5622e4cc83 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -12,6 +12,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -42,6 +43,7 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -73,10 +75,28 @@ public class TrimBarEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
+	private List<Action> actions = new ArrayList<Action>();
 
 	public TrimBarEditor(EditingDomain editingDomain, ModelEditor editor) {
 		super(editingDomain, editor);
 		this.editor = editor;
+		try {
+			actions.add(new Action(Messages.TrimBarEditor_AddToolBar, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Toolbar.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(MenuPackageImpl.Literals.TOOL_BAR);
+				}
+			});
+			actions.add(new Action(Messages.TrimBarEditor_AddToolControl, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAddChild(MenuPackageImpl.Literals.TOOL_CONTROL);
+				}
+			});
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -284,15 +304,8 @@ public String getText(Object element) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					EObject toolbar = EcoreUtil.create((EClass) ((IStructuredSelection) typeViewer.getSelection()).getFirstElement());
-					setElementId(toolbar);
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						editor.setSelection(toolbar);
-					}
+					EClass eClass = (EClass) ((IStructuredSelection) typeViewer.getSelection()).getFirstElement();
+					handleAddChild(eClass);
 				}
 			});
 
@@ -344,4 +357,22 @@ public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TRIM_CONTAINER__SIDE), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
+	protected void handleAddChild(EClass eClass) {
+		EObject toolbar = EcoreUtil.create(eClass);
+		setElementId(toolbar);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			editor.setSelection(toolbar);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }

From 0b0c937bcdd675daa7d727776de57d752e9b1d6a Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 30 Dec 2010 23:40:57 +0000
Subject: [PATCH 0284/1286] Bug 321159 - [ModelTooling] Remove the children
 attributes in the Menus

---
 .../e4/tools/emf/ui/internal/Messages.java    |  12 +-
 .../tools/emf/ui/internal/Messages.properties |  13 +-
 .../emf/ui/internal/common/ModelEditor.java   |  16 +-
 .../internal/common/component/MenuEditor.java | 221 ++++++++++++-
 .../virtual/VMenuElementsEditor.java          | 293 ------------------
 5 files changed, 236 insertions(+), 319 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuElementsEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index be5bae1c54..ee83fd605c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -130,6 +130,10 @@ public class Messages extends NLS {
 	public static String MenuEditor_IconURI;
 	public static String MenuEditor_Children;
 	public static String MenuEditor_Mnemonics;
+	public static String MenuEditor_AddHandledMenuItem;
+	public static String MenuEditor_AddMenu;
+	public static String MenuEditor_AddDirectMenuItem;
+	public static String MenuEditor_AddSeparator;
 
 	public static String MenuItemEditor_Type;
 	public static String MenuItemEditor_Label;
@@ -549,14 +553,6 @@ public class Messages extends NLS {
 	public static String CoreExpressionEditor_TreeLabelDescription;
 	public static String CoreExpressionEditor_ExpressionId;
 
-	public static String VMenuElementsEditor_TreeLabel;
-	public static String VMenuElementsEditor_TreeLabelDescription;
-	public static String VMenuElementsEditor_Children;
-	public static String VMenuElementsEditor_AddHandledMenuItem;
-	public static String VMenuElementsEditor_AddMenu;
-	public static String VMenuElementsEditor_AddDirectMenuItem;
-	public static String VMenuElementsEditor_AddSeparator;
-
 	public static String ExpressionIdDialog_ShellTitle;
 	public static String ExpressionIdDialog_DialogTitle;
 	public static String ExpressionIdDialog_DialogMessage;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 690ea2d3fc..163b7d2c33 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -126,6 +126,11 @@ MenuEditor_IconURI=Icon URI
 MenuEditor_MainMenu=Main Menu
 MenuEditor_Children=Children
 MenuEditor_Mnemonics=Mnemonics
+MenuEditor_AddHandledMenuItem=Add HandledMenuItem
+MenuEditor_AddMenu=Add Menu
+MenuEditor_AddDirectMenuItem=Add DirectMenuItem
+MenuEditor_AddSeparator=Add Separator
+
 
 MenuItemEditor_Type=Type
 MenuItemEditor_Label=Label
@@ -546,14 +551,6 @@ CoreExpressionEditor_TreeLabel=Core Expression
 CoreExpressionEditor_TreeLabelDescription=Core Expression Bla Bla Bla
 CoreExpressionEditor_ExpressionId=Expression Id
 
-VMenuElementsEditor_TreeLabel=Children
-VMenuElementsEditor_TreeLabelDescription=Children Bla Bla Bla
-VMenuElementsEditor_Children=Children
-VMenuElementsEditor_AddHandledMenuItem=Add Handled Menu Item
-VMenuElementsEditor_AddMenu=Add Menu
-VMenuElementsEditor_AddDirectMenuItem=Add Direct Menu Item
-VMenuElementsEditor_AddSeparator=Add Separator
-
 ExpressionIdDialog_ShellTitle=Find Expression Id
 ExpressionIdDialog_DialogTitle=Find Expression Id
 ExpressionIdDialog_DialogMessage=Find the expression id defined through the 'org.eclipse.core.expressions.definitions' extension point
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 5c6e4c7955..06a142326b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -101,7 +101,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VItemParametersEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuContributionsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuElementsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelFragmentsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelImportsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartDescriptor;
@@ -141,6 +140,7 @@
 import org.eclipse.emf.edit.command.CommandParameter;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuListener;
@@ -384,9 +384,16 @@ public void menuAboutToShow(IMenuManager manager) {
 						if (o.eContainer() != null) {
 							actions.add(new Action(Messages.ModelEditor_Delete, ImageDescriptor.createFromImage(removeIcon)) {
 								public void run() {
-									Command cmd = RemoveCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), o.eContainer(), o.eContainingFeature(), o);
-									if (cmd.canExecute()) {
-										ModelEditor.this.modelProvider.getEditingDomain().getCommandStack().execute(cmd);
+									if (o.eContainingFeature().isMany()) {
+										Command cmd = RemoveCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), o.eContainer(), o.eContainingFeature(), o);
+										if (cmd.canExecute()) {
+											ModelEditor.this.modelProvider.getEditingDomain().getCommandStack().execute(cmd);
+										}
+									} else {
+										Command cmd = SetCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), o.eContainer(), o.eContainingFeature(), null);
+										if (cmd.canExecute()) {
+											ModelEditor.this.modelProvider.getEditingDomain().getCommandStack().execute(cmd);
+										}
 									}
 								}
 							});
@@ -601,7 +608,6 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_MODEL_IMPORTS, new VModelImportsEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_CATEGORIES, new VApplicationCategoriesEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_PARAMETERS, new VItemParametersEditor(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_MENUELEMENTS, new VMenuElementsEditor(modelProvider.getEditingDomain(), this));
 		registerVirtualEditor(VIRTUAL_ROOT_CONTEXTS, new VRootBindingContexts(modelProvider.getEditingDomain(), this));
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 0cc20dd488..2891bf9438 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -15,7 +15,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.UpdateValueStrategy;
+import org.eclipse.core.databinding.observable.list.IListChangeListener;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.ListChangeEvent;
+import org.eclipse.core.databinding.observable.list.ListDiffVisitor;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
@@ -27,12 +30,13 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EClass2EObject;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EObject2EClass;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
@@ -40,21 +44,31 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -77,10 +91,53 @@ public class MenuEditor extends AbstractComponentEditor {
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 	private EStackLayout stackLayout;
+	private List<Action> actions = new ArrayList<Action>();
+
+	private static class Struct {
+		private final String label;
+		private final EClass eClass;
+		private final boolean separator;
+
+		public Struct(String label, EClass eClass, boolean separator) {
+			this.label = label;
+			this.eClass = eClass;
+			this.separator = separator;
+		}
+	}
 
 	public MenuEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
 		super(editingDomain, editor);
 		this.project = project;
+		try {
+			actions.add(new Action(Messages.MenuEditor_AddHandledMenuItem, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
+				}
+			});
+			actions.add(new Action(Messages.MenuEditor_AddMenu, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(MenuPackageImpl.Literals.MENU, false);
+				}
+			});
+			actions.add(new Action(Messages.MenuEditor_AddDirectMenuItem, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false);
+				}
+			});
+			actions.add(new Action(Messages.MenuEditor_AddSeparator, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif"))) { //$NON-NLS-1$
+				@Override
+				public void run() {
+					handleAdd(MenuPackageImpl.Literals.MENU_SEPARATOR, true);
+				}
+			});
+
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	@Override
@@ -203,6 +260,127 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS).observeDetail(master));
 		}
 
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuEditor_Children);
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+
+			final TableViewer viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.heightHint = 300;
+			viewer.getControl().setLayoutData(gd);
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+
+			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(master));
+
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Up);
+			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) - 1;
+							if (idx >= 0) {
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Down);
+			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) + 1;
+							if (idx < container.getChildren().size()) {
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					Struct struct = (Struct) element;
+					return struct.label;
+				}
+			});
+
+			Struct defaultStruct = new Struct(Messages.MenuEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
+			childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false) });
+			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!childrenDropDown.getSelection().isEmpty()) {
+						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+						EClass eClass = struct.eClass;
+						handleAdd(eClass, struct.separator);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Remove);
+			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+
 		// ------------------------------------------------------------
 		if (!rootMenu) {
 			Label l = new Label(parent, SWT.NONE);
@@ -308,12 +486,25 @@ public void handleValueChange(ValueChangeEvent event) {
 			}
 		});
 
-		list.add(new VirtualEntry<MMenuElement>(ModelEditor.VIRTUAL_MENUELEMENTS, ELEMENT_CONTAINER__CHILDREN, element, Messages.MenuEditor_Children) {
-			@Override
-			protected boolean accepted(MMenuElement o) {
-				return true;
+		IObservableList l = ELEMENT_CONTAINER__CHILDREN.observe(element);
+		l.addListChangeListener(new IListChangeListener() {
+
+			public void handleListChange(ListChangeEvent event) {
+				event.diff.accept(new ListDiffVisitor() {
+
+					@Override
+					public void handleRemove(int index, Object element) {
+						list.remove(element);
+					}
+
+					@Override
+					public void handleAdd(int index, Object element) {
+						list.add(element);
+					}
+				});
 			}
 		});
+		list.addAll(l);
 
 		return list;
 	}
@@ -344,4 +535,24 @@ public String getDetailLabel(Object element) {
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
+
+	protected void handleAdd(EClass eClass, boolean separator) {
+		MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			if (!separator) {
+				getEditor().setSelection(eObject);
+			}
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuElementsEditor.java
deleted file mode 100644
index 1610a95c7f..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuElementsEditor.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
-import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
-import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-
-public class VMenuElementsEditor extends AbstractComponentEditor {
-	private Composite composite;
-	private EMFDataBindingContext context;
-	private TableViewer viewer;
-	private List<Action> actions = new ArrayList<Action>();
-
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-
-	public VMenuElementsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.VMenuElementsEditor_AddHandledMenuItem, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
-				}
-			});
-			actions.add(new Action(Messages.VMenuElementsEditor_AddMenu, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(MenuPackageImpl.Literals.MENU, false);
-				}
-			});
-			actions.add(new Action(Messages.VMenuElementsEditor_AddDirectMenuItem, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false);
-				}
-			});
-			actions.add(new Action(Messages.VMenuElementsEditor_AddSeparator, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(MenuPackageImpl.Literals.MENU_SEPARATOR, true);
-				}
-			});
-
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
-
-	@Override
-	public String getLabel(Object element) {
-		return Messages.VMenuElementsEditor_TreeLabel;
-	}
-
-	@Override
-	public String getDetailLabel(Object element) {
-		return null;
-	}
-
-	@Override
-	public String getDescription(Object element) {
-		return Messages.VMenuElementsEditor_TreeLabelDescription;
-	}
-
-	@Override
-	public Composite getEditor(Composite parent, Object object) {
-		if (composite == null) {
-			context = new EMFDataBindingContext();
-			composite = createForm(parent, context, getMaster());
-		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
-		viewer.setInput(o.getList());
-		getMaster().setValue(o.getOriginalParent());
-		return composite;
-	}
-
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
-
-		Label l = new Label(parent, SWT.NONE);
-		l.setText(Messages.VMenuElementsEditor_Children);
-		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
-		viewer = new TableViewer(parent);
-		ObservableListContentProvider cp = new ObservableListContentProvider();
-		viewer.setContentProvider(cp);
-
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.heightHint = 300;
-		viewer.getControl().setLayoutData(gd);
-		viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
-
-		Composite buttonComp = new Composite(parent, SWT.NONE);
-		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		gl = new GridLayout(2, false);
-		gl.marginLeft = 0;
-		gl.marginRight = 0;
-		gl.marginWidth = 0;
-		gl.marginHeight = 0;
-		buttonComp.setLayout(gl);
-
-		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Up);
-		b.setImage(getImage(b.getDisplay(), ARROW_UP));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-						int idx = container.getChildren().indexOf(obj) - 1;
-						if (idx >= 0) {
-							if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
-				}
-			}
-		});
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Down);
-		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-						int idx = container.getChildren().indexOf(obj) + 1;
-						if (idx < container.getChildren().size()) {
-							if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
-				}
-			}
-		});
-
-		final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-		childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		childrenDropDown.setContentProvider(new ArrayContentProvider());
-		childrenDropDown.setLabelProvider(new LabelProvider() {
-			@Override
-			public String getText(Object element) {
-				Struct struct = (Struct) element;
-				return struct.label;
-			}
-		});
-
-		Struct defaultStruct = new Struct(Messages.MenuEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
-		childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false) });
-		childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!childrenDropDown.getSelection().isEmpty()) {
-					Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-					EClass eClass = struct.eClass;
-					handleAdd(eClass, struct.separator);
-				}
-			}
-		});
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Remove);
-		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
-					Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-					}
-				}
-			}
-		});
-
-		return parent;
-	}
-
-	@Override
-	public IObservableList getChildList(Object element) {
-		return ELEMENT_CONTAINER__CHILDREN.observe(element);
-	}
-
-	private static class Struct {
-		private final String label;
-		private final EClass eClass;
-		private final boolean separator;
-
-		public Struct(String label, EClass eClass, boolean separator) {
-			this.label = label;
-			this.eClass = eClass;
-			this.separator = separator;
-		}
-	}
-
-	@Override
-	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
-		l.addAll(actions);
-		return l;
-	}
-
-	protected void handleAdd(EClass eClass, boolean separator) {
-		MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
-
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-
-		if (cmd.canExecute()) {
-			getEditingDomain().getCommandStack().execute(cmd);
-			if (!separator) {
-				getEditor().setSelection(eObject);
-			}
-		}
-	}
-}

From e21857e07bc4ef7f6b6bffc7d9b3f6a529d81d24 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 30 Dec 2010 23:55:47 +0000
Subject: [PATCH 0285/1286] Bug 321159 - [ModelTooling] Remove the children
 attributes in the Menus

---
 .../emf/ui/internal/common/component/MenuEditor.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 2891bf9438..441de33382 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -37,6 +37,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MExpression;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
@@ -497,6 +498,15 @@ public void handleRemove(int index, Object element) {
 						list.remove(element);
 					}
 
+					@Override
+					public void handleMove(int oldIndex, int newIndex, Object element) {
+						if (list.get(0) instanceof MExpression) {
+							oldIndex += 1;
+							newIndex += 1;
+						}
+						list.move(oldIndex, newIndex);
+					}
+
 					@Override
 					public void handleAdd(int index, Object element) {
 						list.add(element);

From 577720d2c82f48f3c292bd04ef8c92e23d2d557b Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 8 Jan 2011 13:10:36 +0000
Subject: [PATCH 0286/1286] Bug 321132 - [ModelTooling] AbstractComponentEditor
 needs to dispose its images on bundle shutdown

---
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../OSGI-INF/images.properties                |  89 ++++
 .../OSGI-INF/resourceprovider.xml             |   8 +
 .../build.properties                          |   3 +-
 .../component/AbstractComponentEditor.java    |  64 +--
 .../emf/ui/internal/ResourceProvider.java     | 106 +++++
 .../emf/ui/internal/common/ModelEditor.java   | 142 +++----
 .../common/component/AddonsEditor.java        |  22 +-
 .../common/component/ApplicationEditor.java   |  31 +-
 .../internal/common/component/AreaEditor.java |  46 +--
 .../component/BindingContextEditor.java       |  45 +-
 .../common/component/BindingTableEditor.java  |  47 +--
 .../common/component/CategoryEditor.java      |  20 +-
 .../common/component/CommandEditor.java       |  47 +--
 .../component/CommandParameterEditor.java     |  20 +-
 .../common/component/ControlFactory.java      |  15 +-
 .../component/CoreExpressionEditor.java       |  20 +-
 .../component/DirectMenuItemEditor.java       |  24 +-
 .../component/DirectToolItemEditor.java       |  24 +-
 .../component/HandledMenuItemEditor.java      |  24 +-
 .../component/HandledToolItemEditor.java      |  24 +-
 .../common/component/HandlerEditor.java       |  23 +-
 .../common/component/InputPartEditor.java     |   5 +-
 .../common/component/KeyBindingEditor.java    |  47 +--
 .../component/MenuContributionEditor.java     |  38 +-
 .../internal/common/component/MenuEditor.java |  86 ++--
 .../common/component/MenuItemEditor.java      |  32 +-
 .../common/component/MenuSeparatorEditor.java |  20 +-
 .../component/ModelFragmentsEditor.java       |  35 +-
 .../common/component/ParameterEditor.java     |  20 +-
 .../component/PartDescriptorEditor.java       |  24 +-
 .../internal/common/component/PartEditor.java |  34 +-
 .../component/PartSashContainerEditor.java    | 122 +++---
 .../common/component/PartStackEditor.java     |  79 ++--
 .../common/component/PerspectiveEditor.java   | 108 +++--
 .../component/PerspectiveStackEditor.java     |  48 +--
 .../common/component/PlaceholderEditor.java   |  22 +-
 .../common/component/PopupMenuEditor.java     |   5 +-
 .../common/component/RenderedMenuEditor.java  |   5 +-
 .../common/component/RenderedMenuItem.java    |   5 +-
 .../component/RenderedToolBarEditor.java      |   5 +-
 .../common/component/StringModelFragment.java |  32 +-
 .../component/ToolBarContributionEditor.java  |  30 +-
 .../common/component/ToolBarEditor.java       |  83 ++--
 .../component/ToolBarSeparatorEditor.java     |  22 +-
 .../common/component/ToolControlEditor.java   |  24 +-
 .../common/component/ToolItemEditor.java      |   8 +-
 .../common/component/TrimBarEditor.java       |  59 +--
 .../component/TrimContributionEditor.java     |  30 +-
 .../common/component/TrimmedWindowEditor.java |   5 +-
 .../common/component/WindowEditor.java        |  24 +-
 .../component/virtual/VApplicationAddons.java |  33 +-
 .../virtual/VApplicationCategoriesEditor.java |  33 +-
 .../virtual/VBindingTableEditor.java          |  33 +-
 .../component/virtual/VCommandEditor.java     |  33 +-
 .../component/virtual/VHandlerEditor.java     |  33 +-
 .../virtual/VItemParametersEditor.java        |  33 +-
 .../virtual/VMenuContributionsEditor.java     |  33 +-
 .../common/component/virtual/VMenuEditor.java |  33 +-
 .../virtual/VModelFragmentsEditor.java        |  14 +-
 .../virtual/VModelImportsEditor.java          |  14 +-
 .../component/virtual/VPartDescriptor.java    |  33 +-
 .../virtual/VRootBindingContexts.java         |  33 +-
 .../virtual/VToolBarContributionsEditor.java  |  33 +-
 .../virtual/VWindowControlEditor.java         | 104 +++--
 .../component/virtual/VWindowEditor.java      |  45 +-
 .../virtual/VWindowSharedElementsEditor.java  |  62 ++-
 .../component/virtual/VWindowTrimEditor.java  |  30 +-
 .../org.eclipse.e4.tools.services/.project    |   5 +
 .../META-INF/MANIFEST.MF                      |   9 +
 .../OSGI-INF/resourcepoolfunction.xml         |   8 +
 .../OSGI-INF/resourceservice.xml              |   7 +
 .../build.properties                          |   6 +-
 .../AbstractBundleResourceProvider.java       |  47 +++
 .../e4/tools/services/IResourcePool.java      |  17 +
 .../services/IResourceProviderService.java    |  10 +
 .../e4/tools/services/IResourceService.java   |  35 ++
 .../services/impl/ResourcePoolFactory.java    |  26 ++
 .../tools/services/impl/ResourceService.java  | 389 ++++++++++++++++++
 79 files changed, 1632 insertions(+), 1462 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/images.properties
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resourceprovider.xml
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/OSGI-INF/resourcepoolfunction.xml
 create mode 100644 bundles/org.eclipse.e4.tools.services/OSGI-INF/resourceservice.xml
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/AbstractBundleResourceProvider.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourcePool.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceProviderService.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index ca0ea06334..252f2ad402 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -40,4 +40,4 @@ Export-Package: org.eclipse.e4.tools.emf.ui.common,
  org.eclipse.e4.tools.emf.ui.internal.common.component;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.wbm;x-friends:="org.eclipse.e4.tools.emf.editor"
-Service-Component: OSGI-INF/contributioncollector.xml
+Service-Component: OSGI-INF/contributioncollector.xml, OSGI-INF/resourceprovider.xml
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/images.properties b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/images.properties
new file mode 100644
index 0000000000..f38970e7fb
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/images.properties
@@ -0,0 +1,89 @@
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.Addons=/icons/full/modelelements/Addons.png
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.Application=/icons/full/modelelements/Application.png
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.Area_vertical=/icons/full/modelelements/Area_vertical.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.Area=/icons/full/modelelements/Area.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.BindingContext=/icons/full/modelelements/BindingContext.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.BindingTable=/icons/full/modelelements/BindingTable.png
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.Category=/icons/full/modelelements/Category.png
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.Command=/icons/full/modelelements/Command.png
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.CommandParameter=/icons/full/modelelements/CommandParameter.png
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.CoreExpression=/icons/full/modelelements/CoreExpression.png
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.DirectMenuItem=/icons/full/modelelements/DirectMenuItem.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.DirectToolItem=/icons/full/modelelements/DirectToolItem.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.HandledMenuItem=/icons/full/modelelements/HandledMenuItem.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.HandledToolItem=/icons/full/modelelements/HandledToolItem.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.Handler=/icons/full/modelelements/Handler.png
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.KeyBinding=/icons/full/modelelements/KeyBinding.png
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.Menu=/icons/full/modelelements/Menu.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.MenuContribution=/icons/full/modelelements/MenuContribution.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.MenuItem=/icons/full/modelelements/MenuItem.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.MenuSeparator=/icons/full/modelelements/MenuSeparator.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.ModelFragments=/icons/full/modelelements/ModelFragments.png
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.Parameter=/icons/full/modelelements/Parameter.png
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.Part=/icons/full/modelelements/Part.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.PartDescriptor=/icons/full/modelelements/PartDescriptor.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.PartSashContainer_vertical=/icons/full/modelelements/PartSashContainer_vertical.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.PartSashContainer=/icons/full/modelelements/PartSashContainer.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.PartStack=/icons/full/modelelements/PartStack.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.Perspective=/icons/full/modelelements/Perspective.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.PerspectiveStack=/icons/full/modelelements/PerspectiveStack.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.Placeholder=/icons/full/modelelements/Placeholder.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.StringModelFragment=/icons/full/modelelements/StringModelFragment.png
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.ToolBar=/icons/full/modelelements/ToolBar.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.ToolBarContribution=/icons/full/modelelements/ToolBarContribution.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.ToolBarSeparator=/icons/full/modelelements/ToolBarSeparator.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.ToolControl=/icons/full/modelelements/ToolControl.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.TrimContribution=/icons/full/modelelements/TrimContribution.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.Window=/icons/full/modelelements/Window.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.WindowTrim=/icons/full/modelelements/WindowTrim.gif
+
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Addons=/icons/full/modelelements/tbr/Addons.png
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Application=/icons/full/modelelements/tbr/Application.png
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Area_vertical=/icons/full/modelelements/tbr/Area_vertical.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Area=/icons/full/modelelements/tbr/Area.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.BindingContext=/icons/full/modelelements/tbr/BindingContext.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.BindingTable=/icons/full/modelelements/tbr/BindingTable.png
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.CommandParameter=/icons/full/modelelements/tbr/CommandParameter.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.DirectMenuItem=/icons/full/modelelements/tbr/DirectMenuItem.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.DirectToolItem=/icons/full/modelelements/tbr/DirectToolItem.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.HandledMenuItem=/icons/full/modelelements/tbr/HandledMenuItem.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.HandledToolItem=/icons/full/modelelements/tbr/HandledToolItem.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Menu=/icons/full/modelelements/tbr/Menu.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.MenuContribution=/icons/full/modelelements/tbr/MenuContribution.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.MenuItem=/icons/full/modelelements/tbr/MenuItem.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.MenuSeparator=/icons/full/modelelements/tbr/MenuSeparator.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.ModelFragments=/icons/full/modelelements/tbr/ModelFragments.png
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Parameter=/icons/full/modelelements/tbr/Parameter.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Part=/icons/full/modelelements/tbr/Part.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.PartDescriptor=/icons/full/modelelements/tbr/PartDescriptor.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.PartSashContainer_vertical=/icons/full/modelelements/tbr/PartSashContainer_vertical.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.PartSashContainer=/icons/full/modelelements/tbr/PartSashContainer.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.PartStack=/icons/full/modelelements/tbr/PartStack.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Perspective=/icons/full/modelelements/tbr/Perspective.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.PerspectiveStack=/icons/full/modelelements/tbr/PerspectiveStack.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Placeholder=/icons/full/modelelements/tbr/Placeholder.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.StringModelFragment=/icons/full/modelelements/tbr/StringModelFragment.png
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.ToolBar=/icons/full/modelelements/tbr/ToolBar.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.ToolBarContribution=/icons/full/modelelements/tbr/ToolBarContribution.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.ToolBarSeparator=/icons/full/modelelements/tbr/ToolBarSeparator.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.ToolControl=/icons/full/modelelements/tbr/ToolControl.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.TrimContribution=/icons/full/modelelements/tbr/TrimContribution.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Window=/icons/full/modelelements/tbr/Window.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.WindowTrim=/icons/full/modelelements/tbr/WindowTrim.gif
+
+IMG_org.eclipse.e4.tools.emf.ui.obj16.arrow_down=/icons/full/obj16/arrow_down.png
+IMG_org.eclipse.e4.tools.emf.ui.obj16.arrow_up=/icons/full/obj16/arrow_up.png
+IMG_org.eclipse.e4.tools.emf.ui.obj16.class_obj=/icons/full/obj16/class_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.obj16.cross=/icons/full/obj16/cross.png
+IMG_org.eclipse.e4.tools.emf.ui.obj16.EPackage=/icons/full/obj16/EPackage.gif
+IMG_org.eclipse.e4.tools.emf.ui.obj16.field_public_obj=/icons/full/obj16/field_public_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.obj16.headermenu=/icons/full/obj16/headermenu.png
+IMG_org.eclipse.e4.tools.emf.ui.obj16.table_add=/icons/full/obj16/table_add.png
+IMG_org.eclipse.e4.tools.emf.ui.obj16.table_delete=/icons/full/obj16/table_delete.png
+IMG_org.eclipse.e4.tools.emf.ui.obj16.zoom=/icons/full/obj16/zoom.png
+
+IMG_org.eclipse.e4.tools.emf.ui.wizban.fieldrefact_wiz=/icons/full/wizban/fieldrefact_wiz.png
+IMG_org.eclipse.e4.tools.emf.ui.wizban.import_wiz=/icons/full/wizban/import_wiz.png
+IMG_org.eclipse.e4.tools.emf.ui.wizban.newclass_wiz=/icons/full/wizban/newclass_wiz.png
+IMG_org.eclipse.e4.tools.emf.ui.wizban.newexp_wiz=/icons/full/wizban/newexp_wiz.png
+IMG_org.eclipse.e4.tools.emf.ui.wizban.typerefact_wiz=/icons/full/wizban/typerefact_wiz.png
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resourceprovider.xml b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resourceprovider.xml
new file mode 100644
index 0000000000..fc93362838
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resourceprovider.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.emf.ui.resourceprovider">
+   <implementation class="org.eclipse.e4.tools.emf.ui.internal.ResourceProvider"/>
+   <service>
+      <provide interface="org.eclipse.e4.tools.services.IResourceProviderService"/>
+   </service>
+   <properties entry="OSGI-INF/images.properties"/>
+</scr:component>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/build.properties b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
index e0bc710666..b51da18453 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
@@ -5,7 +5,8 @@ bin.includes = .,\
                about.html,\
                plugin.xml,\
                css/,\
-               OSGI-INF/
+               OSGI-INF/,\
+               OSGI-INF/resourceprovider.xml
 output.. = bin/
 jars.compile.order = .
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 42670618b6..d1971b58cd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -10,23 +10,19 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common.component;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
 import java.util.Collections;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -34,17 +30,6 @@
 public abstract class AbstractComponentEditor {
 	private EditingDomain editingDomain;
 
-	private static ImageRegistry IMG_REG = new ImageRegistry();
-	// private static Map<Integer, Image> IMAGE_MAP = new HashMap<Integer,
-	// Image>();
-
-	private static final String[] IMAGES = { "/icons/full/obj16/zoom.png", //$NON-NLS-1$
-	"/icons/full/obj16/table_add.png", //$NON-NLS-1$
-	"/icons/full/obj16/table_delete.png", //$NON-NLS-1$
-	"/icons/full/obj16/arrow_up.png", //$NON-NLS-1$
-	"/icons/full/obj16/arrow_down.png" //$NON-NLS-1$
-	};
-
 	private WritableValue master = new WritableValue();
 
 	public static final int SEARCH_IMAGE = 0;
@@ -56,10 +41,12 @@ public abstract class AbstractComponentEditor {
 	protected static final int VERTICAL_LIST_WIDGET_INDENT = 10;
 
 	private ModelEditor editor;
+	private final IResourcePool resourcePool;
 
-	public AbstractComponentEditor(EditingDomain editingDomain, ModelEditor editor) {
+	public AbstractComponentEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
 		this.editingDomain = editingDomain;
 		this.editor = editor;
+		this.resourcePool = resourcePool;
 	}
 
 	public EditingDomain getEditingDomain() {
@@ -83,21 +70,12 @@ protected void setElementId(Object element) {
 		}
 	}
 
-	public Image getImage(Display d, int id) {
-		Image img = IMG_REG.get(IMAGES[id]);
-		if (img == null) {
-			try {
-				InputStream in = AbstractComponentEditor.class.getClassLoader().getResourceAsStream(IMAGES[id]);
-				img = new Image(d, in);
-				IMG_REG.put(IMAGES[id], img);
-				in.close();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
+	public Image createImage(String key) {
+		return resourcePool.getImageUnchecked(key);
+	}
 
-		return img;
+	public ImageDescriptor createImageDescriptor(String key) {
+		return ImageDescriptor.createFromImage(createImage(key));
 	}
 
 	public abstract Image getImage(Object element, Display display);
@@ -112,30 +90,6 @@ public Image getImage(Display d, int id) {
 
 	public abstract IObservableList getChildList(Object element);
 
-	protected Image loadSharedImage(Display d, URL path) {
-		Image img = IMG_REG.get(path.toString());
-		if (img == null) {
-			try {
-				URL url = FileLocator.resolve(path);
-				if (url != null) {
-					InputStream in = url.openStream();
-					img = new Image(d, in);
-					IMG_REG.put(path.toString(), img);
-					in.close();
-				}
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		return img;
-	}
-
-	protected ImageDescriptor loadSharedDescriptor(Display d, URL path) {
-		return ImageDescriptor.createFromImage(loadSharedImage(d, path));
-	}
-
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] {};
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
new file mode 100644
index 0000000000..e1ca66fdc5
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
@@ -0,0 +1,106 @@
+package org.eclipse.e4.tools.emf.ui.internal;
+
+import org.eclipse.e4.tools.services.AbstractBundleResourceProvider;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+
+public class ResourceProvider extends AbstractBundleResourceProvider {
+	public static final String IMG_Addons = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Addons"; //$NON-NLS-1$
+	public static final String IMG_Application = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Application"; //$NON-NLS-1$
+	public static final String IMG_Area_vertical = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Area_vertical"; //$NON-NLS-1$
+	public static final String IMG_Area = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Area"; //$NON-NLS-1$
+	public static final String IMG_BindingContext = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.BindingContext"; //$NON-NLS-1$
+	public static final String IMG_BindingTable = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.BindingTable"; //$NON-NLS-1$
+	public static final String IMG_Category = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Category"; //$NON-NLS-1$
+	public static final String IMG_Command = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Command"; //$NON-NLS-1$
+	public static final String IMG_CommandParameter = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.CommandParameter"; //$NON-NLS-1$
+	public static final String IMG_CoreExpression = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.CoreExpression"; //$NON-NLS-1$
+	public static final String IMG_DirectMenuItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.DirectMenuItem"; //$NON-NLS-1$
+	public static final String IMG_DirectToolItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.DirectToolItem"; //$NON-NLS-1$
+	public static final String IMG_HandledMenuItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.HandledMenuItem"; //$NON-NLS-1$
+	public static final String IMG_HandledToolItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.HandledToolItem"; //$NON-NLS-1$
+	public static final String IMG_Handler = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Handler"; //$NON-NLS-1$
+	public static final String IMG_KeyBinding = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.KeyBinding"; //$NON-NLS-1$
+	public static final String IMG_Menu = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Menu"; //$NON-NLS-1$
+	public static final String IMG_MenuContribution = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.MenuContribution"; //$NON-NLS-1$
+	public static final String IMG_MenuItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.MenuItem"; //$NON-NLS-1$
+	public static final String IMG_MenuSeparator = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.MenuSeparator"; //$NON-NLS-1$
+	public static final String IMG_ModelFragments = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.ModelFragments"; //$NON-NLS-1$
+	public static final String IMG_Parameter = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Parameter"; //$NON-NLS-1$
+	public static final String IMG_Part = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Part"; //$NON-NLS-1$
+	public static final String IMG_PartDescriptor = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.PartDescriptor"; //$NON-NLS-1$
+	public static final String IMG_PartSashContainer_vertical = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.PartSashContainer_vertical"; //$NON-NLS-1$
+	public static final String IMG_PartSashContainer = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.PartSashContainer"; //$NON-NLS-1$
+	public static final String IMG_PartStack = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.PartStack"; //$NON-NLS-1$
+	public static final String IMG_Perspective = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Perspective"; //$NON-NLS-1$
+	public static final String IMG_PerspectiveStack = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.PerspectiveStack"; //$NON-NLS-1$
+	public static final String IMG_Placeholder = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Placeholder"; //$NON-NLS-1$
+	public static final String IMG_StringModelFragment = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.StringModelFragment"; //$NON-NLS-1$
+	public static final String IMG_ToolBar = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.ToolBar"; //$NON-NLS-1$
+	public static final String IMG_ToolBarContribution = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.ToolBarContribution"; //$NON-NLS-1$
+	public static final String IMG_ToolBarSeparator = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.ToolBarSeparator"; //$NON-NLS-1$
+	public static final String IMG_ToolControl = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.ToolControl"; //$NON-NLS-1$
+	public static final String IMG_TrimContribution = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.TrimContribution"; //$NON-NLS-1$
+	public static final String IMG_Window = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Window"; //$NON-NLS-1$
+	public static final String IMG_WindowTrim = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.WindowTrim"; //$NON-NLS-1$
+
+	public static final String IMG_Tbr_Addons = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Addons"; //$NON-NLS-1$
+	public static final String IMG_Tbr_Application = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Application"; //$NON-NLS-1$
+	public static final String IMG_Tbr_Area_vertical = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Area_vertical"; //$NON-NLS-1$
+	public static final String IMG_Tbr_Area = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Area"; //$NON-NLS-1$
+	public static final String IMG_Tbr_BindingContext = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.BindingContext"; //$NON-NLS-1$
+	public static final String IMG_Tbr_BindingTable = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.BindingTable"; //$NON-NLS-1$
+	public static final String IMG_Tbr_CommandParameter = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.CommandParameter"; //$NON-NLS-1$
+	public static final String IMG_Tbr_DirectMenuItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.DirectMenuItem"; //$NON-NLS-1$
+	public static final String IMG_Tbr_DirectToolItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.DirectToolItem"; //$NON-NLS-1$
+	public static final String IMG_Tbr_HandledMenuItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.HandledMenuItem"; //$NON-NLS-1$
+	public static final String IMG_Tbr_HandledToolItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.HandledToolItem"; //$NON-NLS-1$
+	public static final String IMG_Tbr_Menu = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Menu"; //$NON-NLS-1$
+	public static final String IMG_Tbr_MenuContribution = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.MenuContribution"; //$NON-NLS-1$
+	public static final String IMG_Tbr_MenuItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.MenuItem"; //$NON-NLS-1$
+	public static final String IMG_Tbr_MenuSeparator = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.MenuSeparator"; //$NON-NLS-1$
+	public static final String IMG_Tbr_ModelFragments = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.ModelFragments"; //$NON-NLS-1$
+	public static final String IMG_Tbr_Parameter = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Parameter"; //$NON-NLS-1$
+	public static final String IMG_Tbr_Part = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Part"; //$NON-NLS-1$
+	public static final String IMG_Tbr_PartDescriptor = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.PartDescriptor"; //$NON-NLS-1$
+	public static final String IMG_Tbr_PartSashContainer_vertical = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.PartSashContainer_vertical"; //$NON-NLS-1$
+	public static final String IMG_Tbr_PartSashContainer = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.PartSashContainer"; //$NON-NLS-1$
+	public static final String IMG_Tbr_PartStack = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.PartStack"; //$NON-NLS-1$
+	public static final String IMG_Tbr_Perspective = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Perspective"; //$NON-NLS-1$
+	public static final String IMG_Tbr_PerspectiveStack = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.PerspectiveStack"; //$NON-NLS-1$
+	public static final String IMG_Tbr_Placeholder = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Placeholder"; //$NON-NLS-1$
+	public static final String IMG_Tbr_StringModelFragment = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.StringModelFragment"; //$NON-NLS-1$
+	public static final String IMG_Tbr_ToolBar = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.ToolBar"; //$NON-NLS-1$
+	public static final String IMG_Tbr_ToolBarContribution = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.ToolBarContribution"; //$NON-NLS-1$
+	public static final String IMG_Tbr_ToolBarSeparator = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.ToolBarSeparator"; //$NON-NLS-1$
+	public static final String IMG_Tbr_ToolControl = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.ToolControl"; //$NON-NLS-1$
+	public static final String IMG_Tbr_TrimContribution = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.TrimContribution"; //$NON-NLS-1$
+	public static final String IMG_Tbr_Window = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Window"; //$NON-NLS-1$
+	public static final String IMG_Tbr_WindowTrim = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.WindowTrim"; //$NON-NLS-1$
+
+	public static final String IMG_Obj16_arrow_down = "IMG_org.eclipse.e4.tools.emf.ui.obj16.arrow_down"; //$NON-NLS-1$
+	public static final String IMG_Obj16_arrow_up = "IMG_org.eclipse.e4.tools.emf.ui.obj16.arrow_up"; //$NON-NLS-1$
+	public static final String IMG_Obj16_class_obj = "IMG_org.eclipse.e4.tools.emf.ui.obj16.class_obj"; //$NON-NLS-1$
+	public static final String IMG_Obj16_cross = "IMG_org.eclipse.e4.tools.emf.ui.obj16.cross"; //$NON-NLS-1$
+	public static final String IMG_Obj16_EPackage = "IMG_org.eclipse.e4.tools.emf.ui.obj16.EPackage"; //$NON-NLS-1$
+	public static final String IMG_Obj16_field_public_obj = "IMG_org.eclipse.e4.tools.emf.ui.obj16.field_public_obj"; //$NON-NLS-1$
+	public static final String IMG_Obj16_headermenu = "IMG_org.eclipse.e4.tools.emf.ui.obj16.headermenu"; //$NON-NLS-1$
+	public static final String IMG_Obj16_table_add = "IMG_org.eclipse.e4.tools.emf.ui.obj16.table_add"; //$NON-NLS-1$
+	public static final String IMG_Obj16_table_delete = "IMG_org.eclipse.e4.tools.emf.ui.obj16.table_delete"; //$NON-NLS-1$
+	public static final String IMG_Obj16_zoom = "IMG_org.eclipse.e4.tools.emf.ui.obj16.zoom"; //$NON-NLS-1$
+
+	public static final String IMG_Wizban16_fieldrefact_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.fieldrefact_wiz"; //$NON-NLS-1$
+	public static final String IMG_Wizban16_import_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.import_wiz"; //$NON-NLS-1$
+	public static final String IMG_Wizban16_newclass_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.newclass_wiz"; //$NON-NLS-1$
+	public static final String IMG_Wizban16_newexp_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.newexp_wiz"; //$NON-NLS-1$
+	public static final String IMG_Wizban16_typerefact_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.typerefact_wiz"; //$NON-NLS-1$
+
+	public Image getFont(Display display, String key) {
+		return null;
+	}
+
+	public Image getColor(Display display, String key) {
+		return null;
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 06a142326b..7e44276b50 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -113,6 +113,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowTrimEditor;
 import org.eclipse.e4.tools.services.IClipboardService;
 import org.eclipse.e4.tools.services.IClipboardService.Handler;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.di.Persist;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
@@ -234,7 +235,10 @@ public class ModelEditor {
 
 	private ObservablesManager obsManager;
 
-	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project) {
+	private final IResourcePool resourcePool;
+
+	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project, IResourcePool resourcePool) {
+		this.resourcePool = resourcePool;
 		this.modelProvider = modelProvider;
 		this.project = project;
 		this.context = context;
@@ -590,25 +594,25 @@ private void registerContributedVirtualEditors() {
 	}
 
 	private void registerVirtualEditors() {
-		registerVirtualEditor(VIRTUAL_PART_MENU, new VMenuEditor(modelProvider.getEditingDomain(), this, BasicPackageImpl.Literals.PART__MENUS));
-		registerVirtualEditor(VIRTUAL_HANDLER, new VHandlerEditor(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_BINDING_TABLE, new VBindingTableEditor(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_COMMAND, new VCommandEditor(modelProvider.getEditingDomain(), this, ApplicationPackageImpl.Literals.APPLICATION__COMMANDS));
-		registerVirtualEditor(VIRTUAL_WINDOWS, new VWindowEditor(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_WINDOW_CONTROLS, new VWindowControlEditor(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_PART_DESCRIPTORS, new VPartDescriptor(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_PARTDESCRIPTOR_MENU, new VMenuEditor(modelProvider.getEditingDomain(), this, org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS));
-		registerVirtualEditor(VIRTUAL_TRIMMED_WINDOW_TRIMS, new VWindowTrimEditor(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_ADDONS, new VApplicationAddons(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_MENU_CONTRIBUTIONS, new VMenuContributionsEditor(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_TOOLBAR_CONTRIBUTIONS, new VToolBarContributionsEditor(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_TRIM_CONTRIBUTIONS, new VTrimContributionsEditor(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_WINDOW_SHARED_ELEMENTS, new VWindowSharedElementsEditor(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_MODEL_FRAGEMENTS, new VModelFragmentsEditor(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_MODEL_IMPORTS, new VModelImportsEditor(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_CATEGORIES, new VApplicationCategoriesEditor(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_PARAMETERS, new VItemParametersEditor(modelProvider.getEditingDomain(), this));
-		registerVirtualEditor(VIRTUAL_ROOT_CONTEXTS, new VRootBindingContexts(modelProvider.getEditingDomain(), this));
+		registerVirtualEditor(VIRTUAL_PART_MENU, new VMenuEditor(modelProvider.getEditingDomain(), this, BasicPackageImpl.Literals.PART__MENUS, resourcePool));
+		registerVirtualEditor(VIRTUAL_HANDLER, new VHandlerEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerVirtualEditor(VIRTUAL_BINDING_TABLE, new VBindingTableEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerVirtualEditor(VIRTUAL_COMMAND, new VCommandEditor(modelProvider.getEditingDomain(), this, ApplicationPackageImpl.Literals.APPLICATION__COMMANDS, resourcePool));
+		registerVirtualEditor(VIRTUAL_WINDOWS, new VWindowEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerVirtualEditor(VIRTUAL_WINDOW_CONTROLS, new VWindowControlEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerVirtualEditor(VIRTUAL_PART_DESCRIPTORS, new VPartDescriptor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerVirtualEditor(VIRTUAL_PARTDESCRIPTOR_MENU, new VMenuEditor(modelProvider.getEditingDomain(), this, org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS, resourcePool));
+		registerVirtualEditor(VIRTUAL_TRIMMED_WINDOW_TRIMS, new VWindowTrimEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerVirtualEditor(VIRTUAL_ADDONS, new VApplicationAddons(modelProvider.getEditingDomain(), this, resourcePool));
+		registerVirtualEditor(VIRTUAL_MENU_CONTRIBUTIONS, new VMenuContributionsEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerVirtualEditor(VIRTUAL_TOOLBAR_CONTRIBUTIONS, new VToolBarContributionsEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerVirtualEditor(VIRTUAL_TRIM_CONTRIBUTIONS, new VTrimContributionsEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerVirtualEditor(VIRTUAL_WINDOW_SHARED_ELEMENTS, new VWindowSharedElementsEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerVirtualEditor(VIRTUAL_MODEL_FRAGEMENTS, new VModelFragmentsEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerVirtualEditor(VIRTUAL_MODEL_IMPORTS, new VModelImportsEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerVirtualEditor(VIRTUAL_CATEGORIES, new VApplicationCategoriesEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerVirtualEditor(VIRTUAL_PARAMETERS, new VItemParametersEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerVirtualEditor(VIRTUAL_ROOT_CONTEXTS, new VRootBindingContexts(modelProvider.getEditingDomain(), this, resourcePool));
 	}
 
 	private void registerVirtualEditor(String id, AbstractComponentEditor editor) {
@@ -642,55 +646,55 @@ private void registerContributedEditors() {
 	}
 
 	private void registerDefaultEditors() {
-		registerEditor(ApplicationPackageImpl.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(ApplicationPackageImpl.Literals.ADDON, new AddonsEditor(modelProvider.getEditingDomain(), this, project));
-
-		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain(), this, modelProvider));
-		registerEditor(CommandsPackageImpl.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(), this, modelProvider, project));
-		registerEditor(CommandsPackageImpl.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(CommandsPackageImpl.Literals.COMMAND_PARAMETER, new CommandParameterEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(CommandsPackageImpl.Literals.PARAMETER, new ParameterEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(CommandsPackageImpl.Literals.BINDING_TABLE, new BindingTableEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(CommandsPackageImpl.Literals.BINDING_CONTEXT, new BindingContextEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(CommandsPackageImpl.Literals.CATEGORY, new CategoryEditor(modelProvider.getEditingDomain(), this));
-
-		registerEditor(MenuPackageImpl.Literals.TOOL_BAR, new ToolBarEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(MenuPackageImpl.Literals.RENDERED_TOOL_BAR, new RenderedToolBarEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor(modelProvider.getEditingDomain(), this, project));
-		registerEditor(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, new HandledToolItemEditor(modelProvider.getEditingDomain(), this, project, modelProvider));
-		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, new ToolBarSeparatorEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(MenuPackageImpl.Literals.TOOL_CONTROL, new ToolControlEditor(modelProvider.getEditingDomain(), this, project));
-
-		registerEditor(MenuPackageImpl.Literals.MENU, new MenuEditor(modelProvider.getEditingDomain(), project, this));
-		registerEditor(MenuPackageImpl.Literals.RENDERED_MENU, new RenderedMenuEditor(modelProvider.getEditingDomain(), project, this));
-		registerEditor(MenuPackageImpl.Literals.POPUP_MENU, new PopupMenuEditor(modelProvider.getEditingDomain(), project, this));
-		registerEditor(MenuPackageImpl.Literals.MENU_SEPARATOR, new MenuSeparatorEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), this, project, modelProvider));
-		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this, project));
-		registerEditor(MenuPackageImpl.Literals.RENDERED_MENU_ITEM, new RenderedMenuItem(modelProvider.getEditingDomain(), this, project));
-		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION, new MenuContributionEditor(modelProvider.getEditingDomain(), project, this));
-		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION, new ToolBarContributionEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION, new TrimContributionEditor(modelProvider.getEditingDomain(), this));
-
-		registerEditor(UiPackageImpl.Literals.CORE_EXPRESSION, new CoreExpressionEditor(modelProvider.getEditingDomain(), this));
-
-		registerEditor(BasicPackageImpl.Literals.PART, new PartEditor(modelProvider.getEditingDomain(), this, project));
-		registerEditor(BasicPackageImpl.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain(), this, project));
-		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW, new TrimmedWindowEditor(modelProvider.getEditingDomain(), this, project));
-		registerEditor(BasicPackageImpl.Literals.PART_SASH_CONTAINER, new PartSashContainerEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(AdvancedPackageImpl.Literals.AREA, new AreaEditor(modelProvider.getEditingDomain(), this, project));
-		registerEditor(BasicPackageImpl.Literals.PART_STACK, new PartStackEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(BasicPackageImpl.Literals.INPUT_PART, new InputPartEditor(modelProvider.getEditingDomain(), this, project));
-		registerEditor(BasicPackageImpl.Literals.TRIM_BAR, new TrimBarEditor(modelProvider.getEditingDomain(), this));
-
-		registerEditor(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR, new PartDescriptorEditor(modelProvider.getEditingDomain(), this, project));
-
-		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, new PerspectiveStackEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE, new PerspectiveEditor(modelProvider.getEditingDomain(), project, this));
-		registerEditor(AdvancedPackageImpl.Literals.PLACEHOLDER, new PlaceholderEditor(modelProvider.getEditingDomain(), this, modelProvider));
-
-		registerEditor(FragmentPackageImpl.Literals.MODEL_FRAGMENTS, new ModelFragmentsEditor(modelProvider.getEditingDomain(), this));
-		registerEditor(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT, new StringModelFragment(modelProvider.getEditingDomain(), this));
+		registerEditor(ApplicationPackageImpl.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerEditor(ApplicationPackageImpl.Literals.ADDON, new AddonsEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
+
+		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain(), this, modelProvider, resourcePool));
+		registerEditor(CommandsPackageImpl.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(), this, modelProvider, project, resourcePool));
+		registerEditor(CommandsPackageImpl.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerEditor(CommandsPackageImpl.Literals.COMMAND_PARAMETER, new CommandParameterEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerEditor(CommandsPackageImpl.Literals.PARAMETER, new ParameterEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerEditor(CommandsPackageImpl.Literals.BINDING_TABLE, new BindingTableEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerEditor(CommandsPackageImpl.Literals.BINDING_CONTEXT, new BindingContextEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerEditor(CommandsPackageImpl.Literals.CATEGORY, new CategoryEditor(modelProvider.getEditingDomain(), this, resourcePool));
+
+		registerEditor(MenuPackageImpl.Literals.TOOL_BAR, new ToolBarEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerEditor(MenuPackageImpl.Literals.RENDERED_TOOL_BAR, new RenderedToolBarEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerEditor(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
+		registerEditor(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, new HandledToolItemEditor(modelProvider.getEditingDomain(), this, project, modelProvider, resourcePool));
+		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, new ToolBarSeparatorEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerEditor(MenuPackageImpl.Literals.TOOL_CONTROL, new ToolControlEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
+
+		registerEditor(MenuPackageImpl.Literals.MENU, new MenuEditor(modelProvider.getEditingDomain(), project, this, resourcePool));
+		registerEditor(MenuPackageImpl.Literals.RENDERED_MENU, new RenderedMenuEditor(modelProvider.getEditingDomain(), project, this, resourcePool));
+		registerEditor(MenuPackageImpl.Literals.POPUP_MENU, new PopupMenuEditor(modelProvider.getEditingDomain(), project, this, resourcePool));
+		registerEditor(MenuPackageImpl.Literals.MENU_SEPARATOR, new MenuSeparatorEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), this, project, modelProvider, resourcePool));
+		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
+		registerEditor(MenuPackageImpl.Literals.RENDERED_MENU_ITEM, new RenderedMenuItem(modelProvider.getEditingDomain(), this, project, resourcePool));
+		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION, new MenuContributionEditor(modelProvider.getEditingDomain(), project, this, resourcePool));
+		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION, new ToolBarContributionEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION, new TrimContributionEditor(modelProvider.getEditingDomain(), this, resourcePool));
+
+		registerEditor(UiPackageImpl.Literals.CORE_EXPRESSION, new CoreExpressionEditor(modelProvider.getEditingDomain(), this, resourcePool));
+
+		registerEditor(BasicPackageImpl.Literals.PART, new PartEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
+		registerEditor(BasicPackageImpl.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
+		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW, new TrimmedWindowEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
+		registerEditor(BasicPackageImpl.Literals.PART_SASH_CONTAINER, new PartSashContainerEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerEditor(AdvancedPackageImpl.Literals.AREA, new AreaEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
+		registerEditor(BasicPackageImpl.Literals.PART_STACK, new PartStackEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerEditor(BasicPackageImpl.Literals.INPUT_PART, new InputPartEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
+		registerEditor(BasicPackageImpl.Literals.TRIM_BAR, new TrimBarEditor(modelProvider.getEditingDomain(), this, resourcePool));
+
+		registerEditor(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR, new PartDescriptorEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
+
+		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, new PerspectiveStackEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE, new PerspectiveEditor(modelProvider.getEditingDomain(), project, this, resourcePool));
+		registerEditor(AdvancedPackageImpl.Literals.PLACEHOLDER, new PlaceholderEditor(modelProvider.getEditingDomain(), this, modelProvider, resourcePool));
+
+		registerEditor(FragmentPackageImpl.Literals.MODEL_FRAGMENTS, new ModelFragmentsEditor(modelProvider.getEditingDomain(), this, resourcePool));
+		registerEditor(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT, new StringModelFragment(modelProvider.getEditingDomain(), this, resourcePool));
 	}
 
 	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 67df8d015e..eda867614a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -23,8 +21,10 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -51,26 +51,16 @@ public class AddonsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private IProject project;
-	private Image image;
 	private EStackLayout stackLayout;
 
-	public AddonsEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain, editor);
+	public AddonsEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 		this.project = project;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		return image;
+		return createImage(ResourceProvider.IMG_Addons);
 	}
 
 	@Override
@@ -179,7 +169,7 @@ public void widgetSelected(SelectionEvent e) {
 			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 2e71b5d521..6ad610e85e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -10,15 +10,15 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -44,10 +44,7 @@
 public class ApplicationEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private Image image;
-	private Image tbrImage;
 	private EMFDataBindingContext context;
-	// private Button createRemoveRootContext;
 
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES);
@@ -62,33 +59,17 @@ public class ApplicationEditor extends AbstractComponentEditor {
 
 	private IListProperty BINDING_TABLE_CONTAINER__ROOT_CONTEXT = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT);
 
-	public ApplicationEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
+	public ApplicationEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-				return image;
+				return createImage(ResourceProvider.IMG_Application);
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Application.png")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-				return tbrImage;
+				return createImage(ResourceProvider.IMG_Tbr_Application);
 			}
 		}
 		return null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index c7c8b37874..955b3875ea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -22,9 +20,11 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AreaIconDialogEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -81,8 +81,8 @@ public class AreaEditor extends AbstractComponentEditor {
 	private EStackLayout stackLayout;
 	private IProject project;
 
-	public AreaEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain, editor);
+	public AreaEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 		this.project = project;
 	}
 
@@ -93,38 +93,18 @@ public Image getImage(Object element, Display display) {
 		if (!horizontal) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area_vertical.gif")); //$NON-NLS-1$	
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Area_vertical);
 			} else {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Area_vertical.gif")); //$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Tbr_Area_vertical);
 			}
 		}
 
 		if (horizontal) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif")); //$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Area);
 			} else {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Area.gif")); //$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Tbr_Area);
 			}
 		}
 		return null;
@@ -232,7 +212,7 @@ protected URI getImageURI() {
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -307,7 +287,7 @@ public String getText(Object element) {
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -331,7 +311,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -367,7 +347,7 @@ public String getText(Object element) {
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -389,7 +369,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index a792889f48..045adbec06 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -21,8 +19,10 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MBindingContext;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
@@ -58,7 +58,6 @@
 
 public class BindingContextEditor extends AbstractComponentEditor {
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 
 	private EStackLayout stackLayout;
@@ -66,33 +65,19 @@ public class BindingContextEditor extends AbstractComponentEditor {
 
 	private List<Action> actions = new ArrayList<Action>();
 
-	public BindingContextEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.BindingContextEditor_AddContext, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddContext();
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public BindingContextEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.BindingContextEditor_AddContext, createImageDescriptor(ResourceProvider.IMG_BindingContext)) {
+			@Override
+			public void run() {
+				handleAddContext();
+			}
+		});
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		return image;
+		return createImage(ResourceProvider.IMG_BindingContext);
 	}
 
 	@Override
@@ -197,7 +182,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Up);
-		b.setImage(getImage(b.getDisplay(), ARROW_UP));
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -224,7 +209,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Down);
-		b.setImage(getImage(b.getDisplay(), ARROW_UP));
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -251,7 +236,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_AddEllipsis);
-		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -262,7 +247,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Remove);
-		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 324098119c..ecb550e6ff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -21,9 +19,11 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BindingContextSelectionDialog;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MBindingTable;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
@@ -64,40 +64,25 @@
 public class BindingTableEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 
 	private IListProperty BINDING_TABLE__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public BindingTableEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.BindingTableEditor_AddKeyBinding, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.png"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddKeyBinding();
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public BindingTableEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.BindingTableEditor_AddKeyBinding, createImageDescriptor(ResourceProvider.IMG_KeyBinding)) {
+			@Override
+			public void run() {
+				handleAddKeyBinding();
+			}
+		});
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingTable.png")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		return image;
+		return createImage(ResourceProvider.IMG_BindingTable);
 	}
 
 	@Override
@@ -183,7 +168,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -227,7 +212,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -254,7 +239,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -281,7 +266,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -292,7 +277,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index 723fada6ca..71904eb140 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -10,15 +10,15 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -37,26 +37,16 @@
 public class CategoryEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 	private EStackLayout stackLayout;
 
-	public CategoryEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
+	public CategoryEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Category.png")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		return image;
+		return createImage(ResourceProvider.IMG_Category);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 77fcd742cd..c4d4ddf397 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -20,9 +18,11 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.CommandCategorySelectionDialog;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.MCommandParameter;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
@@ -61,40 +61,25 @@
 public class CommandEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
 	private IEMFEditListProperty COMMAND__PARAMETERS = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
 
-	public CommandEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.CommandEditor_AddCommandParameter, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.png"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddCommandParameter();
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public CommandEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.CommandEditor_AddCommandParameter, createImageDescriptor(ResourceProvider.IMG_CommandParameter)) {
+			@Override
+			public void run() {
+				handleAddCommandParameter();
+			}
+		});
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.png")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		return image;
+		return createImage(ResourceProvider.IMG_Command);
 	}
 
 	@Override
@@ -211,7 +196,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -251,7 +236,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -278,7 +263,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -305,7 +290,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -316,7 +301,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 4ff5987e07..1a79f32a0f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -10,15 +10,15 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MCommandParameter;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -41,27 +41,17 @@
 
 public class CommandParameterEditor extends AbstractComponentEditor {
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 
 	private EStackLayout stackLayout;
 
-	public CommandParameterEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
+	public CommandParameterEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.png")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		return image;
+		return createImage(ResourceProvider.IMG_CommandParameter);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 4ff3ef894e..b5c73a2836 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -22,6 +22,7 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -189,7 +190,7 @@ protected boolean canEdit(Object element) {
 
 		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_AddEllipsis);
-		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
+		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_add));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -243,7 +244,7 @@ protected void okPressed() {
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Remove);
-		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_DELETE_IMAGE));
+		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_delete));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -286,7 +287,7 @@ public static void createFindImport(Composite parent, final AbstractComponentEdi
 
 		final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_FindEllipsis);
-		b.setImage(editor.getImage(t.getDisplay(), AbstractComponentEditor.SEARCH_IMAGE));
+		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_zoom));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -384,7 +385,7 @@ public void keyPressed(KeyEvent e) {
 
 		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Add);
-		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_ADD_IMAGE));
+		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_add));
 		gd = new GridData(GridData.FILL, GridData.CENTER, false, false);
 		gd.verticalIndent = vIndent;
 		b.setLayoutData(gd);
@@ -418,7 +419,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Up);
-		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_UP));
+		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_arrow_up));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -445,7 +446,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Down);
-		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.ARROW_DOWN));
+		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_arrow_down));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -472,7 +473,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Remove);
-		b.setImage(editor.getImage(b.getDisplay(), AbstractComponentEditor.TABLE_DELETE_IMAGE));
+		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_delete));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index 99c47c8f55..dc0d852e29 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -10,14 +10,14 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ExpressionIdDialog;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.MCoreExpression;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -40,25 +40,15 @@
 
 public class CoreExpressionEditor extends AbstractComponentEditor {
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 
-	public CoreExpressionEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
+	public CoreExpressionEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CoreExpression.png")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		return image;
+		return createImage(ResourceProvider.IMG_CoreExpression);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index ee46377fd1..d5933aa989 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -24,8 +22,10 @@
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -54,8 +54,8 @@
 public class DirectMenuItemEditor extends MenuItemEditor {
 	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
-	public DirectMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain, editor, project);
+	public DirectMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
+		super(editingDomain, editor, project, resourcePool);
 	}
 
 	@Override
@@ -63,19 +63,9 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_DirectMenuItem);
 			} else {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectMenuItem.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Tbr_DirectMenuItem);
 			}
 		}
 
@@ -122,7 +112,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index da548c44ce..f5dc180f52 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -24,8 +22,10 @@
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -54,8 +54,8 @@
 public class DirectToolItemEditor extends ToolItemEditor {
 	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
-	public DirectToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain, editor, project);
+	public DirectToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
+		super(editingDomain, editor, project, resourcePool);
 	}
 
 	@Override
@@ -63,19 +63,9 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_DirectToolItem);
 			} else {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectToolItem.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Tbr_DirectToolItem);
 			}
 		}
 
@@ -110,7 +100,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_FindEllipsis);
-		b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index a9034ec830..d320108383 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
@@ -22,9 +20,11 @@
 import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledMenuItemCommandSelectionDialog;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -56,8 +56,8 @@ public class HandledMenuItemEditor extends MenuItemEditor {
 	private IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
 	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
-	public HandledMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IModelResource resource) {
-		super(editingDomain, editor, project);
+	public HandledMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IModelResource resource, IResourcePool resourcePool) {
+		super(editingDomain, editor, project, resourcePool);
 		this.resource = resource;
 	}
 
@@ -66,19 +66,9 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif")); //$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_HandledMenuItem);
 			} else {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledMenuItem.gif")); //$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Tbr_HandledMenuItem);
 			}
 		}
 
@@ -112,7 +102,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 42bb48319d..61c4cdca91 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
@@ -22,9 +20,11 @@
 import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledToolItemCommandSelectionDialog;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -56,8 +56,8 @@ public class HandledToolItemEditor extends ToolItemEditor {
 	private IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
 	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
-	public HandledToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IModelResource resource) {
-		super(editingDomain, editor, project);
+	public HandledToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IModelResource resource, IResourcePool resourcePool) {
+		super(editingDomain, editor, project, resourcePool);
 		this.resource = resource;
 	}
 
@@ -66,19 +66,9 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif")); //$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_HandledToolItem);
 			} else {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledToolItem.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Tbr_HandledToolItem);
 			}
 		}
 
@@ -101,7 +91,7 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index a9995f307e..dc65799b46 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -25,9 +23,11 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandlerCommandSelectionDialog;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
@@ -55,29 +55,20 @@
 
 public class HandlerEditor extends AbstractComponentEditor {
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 	private IModelResource resource;
 	private IProject project;
 	private EStackLayout stackLayout;
 
-	public HandlerEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource, IProject project) {
-		super(editingDomain, editor);
+	public HandlerEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource, IProject project, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 		this.resource = resource;
 		this.project = project;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		return image;
+		return createImage(ResourceProvider.IMG_Handler);
 	}
 
 	@Override
@@ -166,7 +157,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -202,7 +193,7 @@ public void widgetSelected(SelectionEvent e) {
 			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
index 3ccdaf593e..6cc41e1778 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
@@ -14,6 +14,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
@@ -28,8 +29,8 @@
 
 public class InputPartEditor extends PartEditor {
 
-	public InputPartEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain, editor, project);
+	public InputPartEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
+		super(editingDomain, editor, project, resourcePool);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index df1f3ba0ce..30f7dc44fc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.Binding;
@@ -27,9 +25,11 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.KeyBindingCommandSelectionDialog;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
 import org.eclipse.e4.ui.model.application.commands.MKeySequence;
@@ -70,7 +70,6 @@
 public class KeyBindingEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 	private IModelResource resource;
 	private EStackLayout stackLayout;
@@ -78,34 +77,20 @@ public class KeyBindingEditor extends AbstractComponentEditor {
 
 	private IEMFEditListProperty KEY_BINDING__PARAMETERS = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS);
 
-	public KeyBindingEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource) {
-		super(editingDomain, editor);
+	public KeyBindingEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 		this.resource = resource;
-		try {
-			actions.add(new Action(Messages.KeyBindingEditor_AddParameter, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddParameter();
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+		actions.add(new Action(Messages.KeyBindingEditor_AddParameter, createImageDescriptor(ResourceProvider.IMG_Parameter)) {
+			@Override
+			public void run() {
+				handleAddParameter();
+			}
+		});
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.png")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		return image;
+		return createImage(ResourceProvider.IMG_KeyBinding);
 	}
 
 	@Override
@@ -208,7 +193,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -245,7 +230,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Up);
-		b.setImage(getImage(b.getDisplay(), ARROW_UP));
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -272,7 +257,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Down);
-		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -299,7 +284,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_AddEllipsis);
-		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -324,7 +309,7 @@ public void widgetSelected(SelectionEvent e) {
 			}
 
 		});
-		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index b697f587c0..f244a12110 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -21,8 +19,10 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -65,8 +65,6 @@
 
 public class MenuContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
-	private Image image;
-	private Image tbrImage;
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
@@ -84,33 +82,17 @@ public Struct(String label, EClass eClass, boolean separator) {
 		}
 	}
 
-	public MenuContributionEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
-		super(editingDomain, editor);
+	public MenuContributionEditor(EditingDomain editingDomain, IProject project, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-				return image;
+				return createImage(ResourceProvider.IMG_MenuContribution);
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuContribution.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-				return tbrImage;
+				return createImage(ResourceProvider.IMG_Tbr_MenuContribution);
 			}
 		}
 
@@ -252,7 +234,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -276,7 +258,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -314,7 +296,7 @@ public String getText(Object element) {
 			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -338,7 +320,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 441de33382..bb88a0df90 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.UpdateValueStrategy;
@@ -30,11 +28,13 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EClass2EObject;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EObject2EClass;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MExpression;
@@ -106,39 +106,33 @@ public Struct(String label, EClass eClass, boolean separator) {
 		}
 	}
 
-	public MenuEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
-		super(editingDomain, editor);
+	public MenuEditor(EditingDomain editingDomain, IProject project, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 		this.project = project;
-		try {
-			actions.add(new Action(Messages.MenuEditor_AddHandledMenuItem, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
-				}
-			});
-			actions.add(new Action(Messages.MenuEditor_AddMenu, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(MenuPackageImpl.Literals.MENU, false);
-				}
-			});
-			actions.add(new Action(Messages.MenuEditor_AddDirectMenuItem, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false);
-				}
-			});
-			actions.add(new Action(Messages.MenuEditor_AddSeparator, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(MenuPackageImpl.Literals.MENU_SEPARATOR, true);
-				}
-			});
-
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+		actions.add(new Action(Messages.MenuEditor_AddHandledMenuItem, createImageDescriptor(ResourceProvider.IMG_MenuItem)) {
+			@Override
+			public void run() {
+				handleAdd(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
+			}
+		});
+		actions.add(new Action(Messages.MenuEditor_AddMenu, createImageDescriptor(ResourceProvider.IMG_Menu)) {
+			@Override
+			public void run() {
+				handleAdd(MenuPackageImpl.Literals.MENU, false);
+			}
+		});
+		actions.add(new Action(Messages.MenuEditor_AddDirectMenuItem, createImageDescriptor(ResourceProvider.IMG_MenuItem)) {
+			@Override
+			public void run() {
+				handleAdd(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false);
+			}
+		});
+		actions.add(new Action(Messages.MenuEditor_AddSeparator, createImageDescriptor(ResourceProvider.IMG_MenuSeparator)) {
+			@Override
+			public void run() {
+				handleAdd(MenuPackageImpl.Literals.MENU_SEPARATOR, true);
+			}
+		});
 	}
 
 	@Override
@@ -146,19 +140,9 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif")); //$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Menu);
 			} else {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Menu.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Tbr_Menu);
 			}
 		}
 
@@ -289,7 +273,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -313,7 +297,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -351,7 +335,7 @@ public String getText(Object element) {
 			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -366,7 +350,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -420,7 +404,7 @@ protected URI getImageURI() {
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 941e92dfda..b3f2a1000a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.UpdateValueStrategy;
@@ -25,8 +23,10 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuItemIconDialogEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
@@ -64,14 +64,12 @@
 public abstract class MenuItemEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private Image image;
-	private Image tbrImage;
 	private EMFDataBindingContext context;
 	protected IProject project;
 	private EStackLayout stackLayout;
 
-	public MenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain, editor);
+	public MenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 		this.project = project;
 	}
 
@@ -79,25 +77,9 @@ public MenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-				return image;
+				return createImage(ResourceProvider.IMG_MenuItem);
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuItem.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-				return tbrImage;
+				return createImage(ResourceProvider.IMG_Tbr_MenuItem);
 			}
 		}
 
@@ -252,7 +234,7 @@ protected URI getImageURI() {
 			};
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index c290dd50f1..34356ca83e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -10,15 +10,15 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -38,27 +38,17 @@
 import org.eclipse.swt.widgets.Text;
 
 public class MenuSeparatorEditor extends AbstractComponentEditor {
-	private Image separatorImage;
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private EStackLayout stackLayout;
 
-	public MenuSeparatorEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
+	public MenuSeparatorEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (separatorImage == null) {
-			try {
-				separatorImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		return separatorImage;
+		return createImage(ResourceProvider.IMG_MenuSeparator);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index 62f129c019..7cb41fd053 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -20,9 +18,11 @@
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
 import org.eclipse.e4.ui.model.fragment.MModelFragment;
@@ -66,23 +66,14 @@ public class ModelFragmentsEditor extends AbstractComponentEditor {
 	private IListProperty MODEL_FRAGMENTS__IMPORTS = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
 
 	private Composite composite;
-	private Image image;
 
-	public ModelFragmentsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
+	public ModelFragmentsEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelFragments.png")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		return image;
+		return createImage(ResourceProvider.IMG_ModelFragments);
 	}
 
 	@Override
@@ -140,7 +131,7 @@ private Composite createForm(Composite parent) {
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -167,7 +158,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -219,7 +210,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 			childrenDropDown.getCombo().select(0);
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -238,7 +229,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -281,7 +272,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -308,7 +299,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -335,7 +326,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -353,7 +344,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index 0bd741eb47..f40fb4c319 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -10,15 +10,15 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -37,27 +37,17 @@
 
 public class ParameterEditor extends AbstractComponentEditor {
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 
 	private EStackLayout stackLayout;
 
-	public ParameterEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
+	public ParameterEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		return image;
+		return createImage(ResourceProvider.IMG_Parameter);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 41d83b481d..217a36fdd3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -25,10 +23,12 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartDescriptorIconDialogEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
@@ -65,7 +65,6 @@
 public class PartDescriptorEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 	private IProject project;
 
@@ -75,23 +74,14 @@ public class PartDescriptorEditor extends AbstractComponentEditor {
 	private Button createRemoveToolBar;
 	private EStackLayout stackLayout;
 
-	public PartDescriptorEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain, editor);
+	public PartDescriptorEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 		this.project = project;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		return image;
+		return createImage(ResourceProvider.IMG_PartDescriptor);
 	}
 
 	@Override
@@ -222,7 +212,7 @@ protected URI getImageURI() {
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -245,7 +235,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 1a92e757c8..e2306ba70c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -29,10 +27,12 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -71,7 +71,6 @@
 public class PartEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 	private IProject project;
 
@@ -80,10 +79,9 @@ public class PartEditor extends AbstractComponentEditor {
 	private IValueProperty PART__TOOLBAR = EMFProperties.value(BasicPackageImpl.Literals.PART__TOOLBAR);
 	private Button createRemoveToolBar;
 	private EStackLayout stackLayout;
-	private Image tbrImage;
 
-	public PartEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain, editor);
+	public PartEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 		this.project = project;
 	}
 
@@ -91,25 +89,9 @@ public PartEditor(EditingDomain editingDomain, ModelEditor editor, IProject proj
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-				return image;
+				return createImage(ResourceProvider.IMG_Part);
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Part.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-				return tbrImage;
+				return createImage(ResourceProvider.IMG_Tbr_Part);
 			}
 		}
 
@@ -211,7 +193,7 @@ protected URI getImageURI() {
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -248,7 +230,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index d3ecac257f..370b4e0580 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -21,8 +19,10 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -76,50 +76,44 @@ public class PartSashContainerEditor extends AbstractComponentEditor {
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public PartSashContainerEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.PartSashContainerEditor_AddPartSashContainer, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
-				}
-			});
-			actions.add(new Action(Messages.PartSashContainerEditor_AddPartStack, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(BasicPackageImpl.Literals.PART_STACK);
-				}
-			});
-			actions.add(new Action(Messages.PartSashContainerEditor_AddPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(BasicPackageImpl.Literals.PART);
-				}
-			});
-			actions.add(new Action(Messages.PartSashContainerEditor_AddInputPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(BasicPackageImpl.Literals.INPUT_PART);
-				}
-			});
-			actions.add(new Action(Messages.PartSashContainerEditor_AddArea, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(AdvancedPackageImpl.Literals.AREA);
-				}
-			});
-			actions.add(new Action(Messages.PartSashContainerEditor_AddPlaceholder, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
-				}
-			});
-
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public PartSashContainerEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.PartSashContainerEditor_AddPartSashContainer, createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
+			}
+		});
+		actions.add(new Action(Messages.PartSashContainerEditor_AddPartStack, createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.PART_STACK);
+			}
+		});
+		actions.add(new Action(Messages.PartSashContainerEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.PART);
+			}
+		});
+		actions.add(new Action(Messages.PartSashContainerEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.INPUT_PART);
+			}
+		});
+		actions.add(new Action(Messages.PartSashContainerEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area)) {
+			@Override
+			public void run() {
+				handleAddChild(AdvancedPackageImpl.Literals.AREA);
+			}
+		});
+		actions.add(new Action(Messages.PartSashContainerEditor_AddPlaceholder, createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
+			@Override
+			public void run() {
+				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
+			}
+		});
 	}
 
 	@Override
@@ -129,38 +123,18 @@ public Image getImage(Object element, Display display) {
 		if (!horizontal) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif")); //$NON-NLS-1$	
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_PartSashContainer_vertical);
 			} else {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer_vertical.gif")); //$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Tbr_PartSashContainer_vertical);
 			}
 		}
 
 		if (horizontal) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif")); //$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_PartSashContainer);
 			} else {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer.gif")); //$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Tbr_PartSashContainer);
 			}
 		}
 		return null;
@@ -305,7 +279,7 @@ public String getText(Object element) {
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -329,7 +303,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -365,7 +339,7 @@ public String getText(Object element) {
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -379,7 +353,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 0061885ba1..06af6efb0c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -21,8 +19,10 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -68,64 +68,41 @@
 public class PartStackEditor extends AbstractComponentEditor {
 
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private Image tbrImage;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public PartStackEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.PartStackEditor_AddPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(BasicPackageImpl.Literals.PART);
-				}
-			});
-			actions.add(new Action(Messages.PartStackEditor_AddInputPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(BasicPackageImpl.Literals.INPUT_PART);
-				}
-			});
-			actions.add(new Action(Messages.PartStackEditor_AddPlaceholder, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public PartStackEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.PartStackEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.PART);
+			}
+		});
+		actions.add(new Action(Messages.PartStackEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.INPUT_PART);
+			}
+		});
+		actions.add(new Action(Messages.PartStackEditor_AddPlaceholder, createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
+			@Override
+			public void run() {
+				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
+			}
+		});
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			if (((MUIElement) element).isToBeRendered()) {
-				if (image == null) {
-					try {
-						image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-				return image;
+				return createImage(ResourceProvider.IMG_Part);
 			} else {
-				if (tbrImage == null) {
-					try {
-						tbrImage = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartStack.gif")); //$NON-NLS-1$
-					} catch (MalformedURLException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-				return tbrImage;
+				return createImage(ResourceProvider.IMG_Tbr_Part);
 			}
 		}
 
@@ -249,7 +226,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -273,7 +250,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -309,7 +286,7 @@ public String getText(Object element) {
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -321,7 +298,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 2ee16ccea9..3bc04732ce 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -23,9 +21,11 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PerspectiveIconDialogEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -79,51 +79,45 @@ public class PerspectiveEditor extends AbstractComponentEditor {
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public PerspectiveEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
-		super(editingDomain, editor);
+	public PerspectiveEditor(EditingDomain editingDomain, IProject project, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 		this.project = project;
-		try {
-			actions.add(new Action(Messages.PerspectiveEditor_AddPartSashContainer, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
-				}
-			});
-			actions.add(new Action(Messages.PerspectiveEditor_AddPartStack, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(BasicPackageImpl.Literals.PART_STACK);
-				}
-			});
-			actions.add(new Action(Messages.PerspectiveEditor_AddPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(BasicPackageImpl.Literals.PART);
-				}
-			});
-			actions.add(new Action(Messages.PerspectiveEditor_AddInputPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(BasicPackageImpl.Literals.INPUT_PART);
-				}
-			});
-			actions.add(new Action(Messages.PerspectiveEditor_AddArea, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(AdvancedPackageImpl.Literals.AREA);
-				}
-			});
-			actions.add(new Action(Messages.PerspectiveEditor_AddPlaceholder, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
-				}
-			});
-
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+		actions.add(new Action(Messages.PerspectiveEditor_AddPartSashContainer, createImageDescriptor(ResourceProvider.IMG_Perspective)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
+			}
+		});
+		actions.add(new Action(Messages.PerspectiveEditor_AddPartStack, createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.PART_STACK);
+			}
+		});
+		actions.add(new Action(Messages.PerspectiveEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.PART);
+			}
+		});
+		actions.add(new Action(Messages.PerspectiveEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.INPUT_PART);
+			}
+		});
+		actions.add(new Action(Messages.PerspectiveEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area)) {
+			@Override
+			public void run() {
+				handleAddChild(AdvancedPackageImpl.Literals.AREA);
+			}
+		});
+		actions.add(new Action(Messages.PerspectiveEditor_AddPlaceholder, createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
+			@Override
+			public void run() {
+				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
+			}
+		});
 	}
 
 	@Override
@@ -131,19 +125,9 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Perspective);
 			} else {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Perspective.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Tbr_Perspective);
 			}
 		}
 
@@ -329,7 +313,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -353,7 +337,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -389,7 +373,7 @@ public String getText(Object element) {
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -403,7 +387,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 792cd25fbb..711b3d32ad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -21,8 +19,10 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -67,20 +67,14 @@ public class PerspectiveStackEditor extends AbstractComponentEditor {
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public PerspectiveStackEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-
-			actions.add(new Action(Messages.PerspectiveStackEditor_AddPerspective, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddPerspective();
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public PerspectiveStackEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.PerspectiveStackEditor_AddPerspective, createImageDescriptor(ResourceProvider.IMG_Perspective)) {
+			@Override
+			public void run() {
+				handleAddPerspective();
+			}
+		});
 	}
 
 	@Override
@@ -88,19 +82,9 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_PerspectiveStack);
 			} else {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PerspectiveStack.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Tbr_PerspectiveStack);
 			}
 		}
 
@@ -216,7 +200,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -240,7 +224,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -263,7 +247,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -275,7 +259,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index baf4f5e92f..89e18c96ec 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -21,8 +19,10 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.SharedElementsDialog;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
@@ -50,28 +50,18 @@
 
 public class PlaceholderEditor extends AbstractComponentEditor {
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 	private IModelResource resource;
 	private EStackLayout stackLayout;
 
-	public PlaceholderEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource) {
-		super(editingDomain, editor);
+	public PlaceholderEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 		this.resource = resource;
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		return image;
+		return createImage(ResourceProvider.IMG_Placeholder);
 	}
 
 	@Override
@@ -219,7 +209,7 @@ public Object convert(Object fromObject) {
 			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), AdvancedPackageImpl.Literals.PLACEHOLDER__REF).observeDetail(getMaster()), t2m, m2t);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
index 40607cac27..be51647acc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
@@ -14,6 +14,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -21,8 +22,8 @@
 
 public class PopupMenuEditor extends MenuEditor {
 
-	public PopupMenuEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
-		super(editingDomain, project, editor);
+	public PopupMenuEditor(EditingDomain editingDomain, IProject project, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, project, editor, resourcePool);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java
index edbf6030e4..5819befe8b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java
@@ -13,12 +13,13 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.emf.edit.domain.EditingDomain;
 
 public class RenderedMenuEditor extends MenuEditor {
 
-	public RenderedMenuEditor(EditingDomain editingDomain, IProject project, ModelEditor editor) {
-		super(editingDomain, project, editor);
+	public RenderedMenuEditor(EditingDomain editingDomain, IProject project, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, project, editor, resourcePool);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java
index d62c567092..c4c418f850 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java
@@ -14,14 +14,15 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Composite;
 
 public class RenderedMenuItem extends MenuItemEditor {
 
-	public RenderedMenuItem(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain, editor, project);
+	public RenderedMenuItem(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
+		super(editingDomain, editor, project, resourcePool);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java
index 9618f31d56..70c61e0445 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java
@@ -12,12 +12,13 @@
 
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.emf.edit.domain.EditingDomain;
 
 public class RenderedToolBarEditor extends ToolBarEditor {
 
-	public RenderedToolBarEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
+	public RenderedToolBarEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 1be39cdb77..f5fd803f6d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -20,10 +18,12 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FeatureSelectionDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindParentReferenceElementDialog;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.fragment.MModelFragment;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
@@ -65,26 +65,17 @@
 
 public class StringModelFragment extends AbstractComponentEditor {
 	private Composite composite;
-	private Image image;
 	private EMFDataBindingContext context;
 
 	private IListProperty MODEL_FRAGMENT__ELEMENTS = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
 
-	public StringModelFragment(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
+	public StringModelFragment(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 	}
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		if (image == null) {
-			try {
-				image = loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/StringModelFragment.png")); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		return image;
+		return createImage(ResourceProvider.IMG_StringModelFragment);
 	}
 
 	@Override
@@ -226,7 +217,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -253,7 +244,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -305,7 +296,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 			childrenDropDown.getCombo().select(0);
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -324,7 +315,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -345,11 +336,6 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	public void dispose() {
-		if (image != null) {
-			image.dispose();
-			image = null;
-		}
-
 		if (composite != null) {
 			composite.dispose();
 			composite = null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 115ca1b9ed..cf841a054f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -20,8 +18,10 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -81,8 +81,8 @@ public Struct(String label, EClass eClass, boolean separator) {
 		}
 	}
 
-	public ToolBarContributionEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
+	public ToolBarContributionEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 	}
 
 	@Override
@@ -90,19 +90,9 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_ToolBarContribution);
 			} else {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarContribution.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Tbr_ToolBarContribution);
 			}
 		}
 
@@ -244,7 +234,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -268,7 +258,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -306,7 +296,7 @@ public String getText(Object element) {
 			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -331,7 +321,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 07e16f5cd5..d4681ecb1b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -21,8 +19,10 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -85,37 +85,32 @@ public Struct(String label, EClass eClass, boolean separator) {
 		}
 	}
 
-	public ToolBarEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.ToolBarEditor_AddHandledToolItem, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
-				}
-			});
-			actions.add(new Action(Messages.ToolBarEditor_AddDirectToolItem, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false);
-				}
-			});
-			actions.add(new Action(Messages.ToolBarEditor_AddToolControl, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(MenuPackageImpl.Literals.TOOL_CONTROL, false);
-				}
-			});
-			actions.add(new Action(Messages.ToolBarEditor_AddToolBarSeparator, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true);
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public ToolBarEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.ToolBarEditor_AddHandledToolItem, createImageDescriptor(ResourceProvider.IMG_HandledToolItem)) {
+			@Override
+			public void run() {
+				handleAddChild(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
+			}
+		});
+		actions.add(new Action(Messages.ToolBarEditor_AddDirectToolItem, createImageDescriptor(ResourceProvider.IMG_DirectToolItem)) {
+			@Override
+			public void run() {
+				handleAddChild(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false);
+			}
+		});
+		actions.add(new Action(Messages.ToolBarEditor_AddToolControl, createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
+			@Override
+			public void run() {
+				handleAddChild(MenuPackageImpl.Literals.TOOL_CONTROL, false);
+			}
+		});
+		actions.add(new Action(Messages.ToolBarEditor_AddToolBarSeparator, createImageDescriptor(ResourceProvider.IMG_ToolBarSeparator)) {
+			@Override
+			public void run() {
+				handleAddChild(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true);
+			}
+		});
 	}
 
 	@Override
@@ -123,19 +118,9 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_ToolBar);
 			} else {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBar.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Tbr_ToolBar);
 			}
 		}
 
@@ -246,7 +231,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -270,7 +255,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -308,7 +293,7 @@ public String getText(Object element) {
 			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -323,7 +308,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 9a81ba392c..c5b8969122 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -10,15 +10,15 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -44,8 +44,8 @@ public class ToolBarSeparatorEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private EStackLayout stackLayout;
 
-	public ToolBarSeparatorEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
+	public ToolBarSeparatorEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 	}
 
 	@Override
@@ -53,19 +53,9 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_ToolBarSeparator);
 			} else {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarSeparator.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Tbr_ToolBarSeparator);
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 4383f6e165..6291b792ed 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
@@ -19,8 +17,10 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -51,8 +51,8 @@ public class ToolControlEditor extends AbstractComponentEditor {
 	private IProject project;
 	private EStackLayout stackLayout;
 
-	public ToolControlEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain, editor);
+	public ToolControlEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 		this.project = project;
 	}
 
@@ -71,19 +71,9 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_ToolControl);
 			} else {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolControl.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Tbr_ToolControl);
 			}
 		}
 
@@ -173,7 +163,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(getImage(t.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index e7f2e09831..f587170bb2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -23,8 +23,10 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ToolItemIconDialogEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -62,8 +64,8 @@ public abstract class ToolItemEditor extends AbstractComponentEditor {
 	protected IProject project;
 	private EStackLayout stackLayout;
 
-	public ToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain, editor);
+	public ToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 		this.project = project;
 	}
 
@@ -198,7 +200,7 @@ protected URI getImageURI() {
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 5622e4cc83..18f6768aaa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -22,8 +20,10 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer;
@@ -77,26 +77,21 @@ public class TrimBarEditor extends AbstractComponentEditor {
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public TrimBarEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
+	public TrimBarEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 		this.editor = editor;
-		try {
-			actions.add(new Action(Messages.TrimBarEditor_AddToolBar, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Toolbar.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(MenuPackageImpl.Literals.TOOL_BAR);
-				}
-			});
-			actions.add(new Action(Messages.TrimBarEditor_AddToolControl, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddChild(MenuPackageImpl.Literals.TOOL_CONTROL);
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+		actions.add(new Action(Messages.TrimBarEditor_AddToolBar, createImageDescriptor(ResourceProvider.IMG_ToolBar)) {
+			@Override
+			public void run() {
+				handleAddChild(MenuPackageImpl.Literals.TOOL_BAR);
+			}
+		});
+		actions.add(new Action(Messages.TrimBarEditor_AddToolControl, createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
+			@Override
+			public void run() {
+				handleAddChild(MenuPackageImpl.Literals.TOOL_CONTROL);
+			}
+		});
 	}
 
 	@Override
@@ -104,19 +99,9 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_WindowTrim);
 			} else {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/WindowTrim.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Tbr_WindowTrim);
 			}
 		}
 
@@ -241,7 +226,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -265,7 +250,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -299,7 +284,7 @@ public String getText(Object element) {
 			typeViewer.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -311,7 +296,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 3452ce1a1d..c849e52bb0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -20,8 +18,10 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -68,8 +68,8 @@ public class TrimContributionEditor extends AbstractComponentEditor {
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
 
-	public TrimContributionEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
+	public TrimContributionEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 	}
 
 	@Override
@@ -77,19 +77,9 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_TrimContribution);
 			} else {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/TrimContribution.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Tbr_TrimContribution);
 			}
 		}
 
@@ -229,7 +219,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -253,7 +243,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -287,7 +277,7 @@ public String getText(Object element) {
 			typeViewer.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -306,7 +296,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
index b4fa9948df..4b95783eca 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
@@ -17,6 +17,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.ecore.EObject;
@@ -25,8 +26,8 @@
 public class TrimmedWindowEditor extends WindowEditor {
 	private IListProperty TRIMMED_WINDOW__TRIM_BARS = EMFProperties.list(BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS);
 
-	public TrimmedWindowEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain, editor, project);
+	public TrimmedWindowEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
+		super(editingDomain, editor, project, resourcePool);
 	}
 
 	public IObservableList getChildList(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 37598cdf8a..0d9bc6da57 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -27,9 +25,11 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.WindowIconDialogEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -80,8 +80,8 @@ public class WindowEditor extends AbstractComponentEditor {
 	private Button createRemoveMainMenu;
 	private EStackLayout stackLayout;
 
-	public WindowEditor(EditingDomain editingDomain, ModelEditor editor, IProject project) {
-		super(editingDomain, editor);
+	public WindowEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 		this.project = project;
 		addMainMenu = new Action(Messages.WindowEditor_AddMainMenu) {
 			@Override
@@ -96,19 +96,9 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Window);
 			} else {
-				try {
-					return loadSharedImage(display, new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Window.gif"));//$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
+				return createImage(ResourceProvider.IMG_Tbr_Window);
 			}
 		}
 
@@ -298,7 +288,7 @@ protected URI getImageURI() {
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setImage(getImage(b.getDisplay(), SEARCH_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index dca00e323c..d62c5ef2f3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -10,17 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MAddon;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
@@ -54,19 +54,14 @@ public class VApplicationAddons extends AbstractComponentEditor {
 
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VApplicationAddons(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.VApplicationAddons_AddAddon, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddAddon();
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public VApplicationAddons(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.VApplicationAddons_AddAddon, createImageDescriptor(ResourceProvider.IMG_Addons)) {
+			@Override
+			public void run() {
+				handleAddAddon();
+			}
+		});
 	}
 
 	@Override
@@ -131,7 +126,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -158,7 +153,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -185,7 +180,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -196,7 +191,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index eb5ef69574..2d08172df9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -10,17 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.MCategory;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl;
@@ -54,19 +54,14 @@ public class VApplicationCategoriesEditor extends AbstractComponentEditor {
 
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VApplicationCategoriesEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.VApplicationCategoriesEditor_AddCategory, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Category.png"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd();
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public VApplicationCategoriesEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.VApplicationCategoriesEditor_AddCategory, createImageDescriptor(ResourceProvider.IMG_Category)) {
+			@Override
+			public void run() {
+				handleAdd();
+			}
+		});
 	}
 
 	@Override
@@ -131,7 +126,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -158,7 +153,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -185,7 +180,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -196,7 +191,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 857a361ee0..fca96e7f8c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -10,17 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MBindingTable;
 import org.eclipse.e4.ui.model.application.commands.MBindingTableContainer;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
@@ -53,19 +53,14 @@ public class VBindingTableEditor extends AbstractComponentEditor {
 	private TableViewer bindingViewer;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VBindingTableEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.VBindingTableEditor_AddBindingTable, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingTable.png"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd();
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public VBindingTableEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.VBindingTableEditor_AddBindingTable, createImageDescriptor(ResourceProvider.IMG_BindingTable)) {
+			@Override
+			public void run() {
+				handleAdd();
+			}
+		});
 	}
 
 	@Override
@@ -130,7 +125,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -157,7 +152,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -184,7 +179,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -195,7 +190,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 81a39e6350..2c6ef7e779 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -10,17 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl;
@@ -55,20 +55,15 @@ public class VCommandEditor extends AbstractComponentEditor {
 	private EStructuralFeature commandsFeature;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VCommandEditor(EditingDomain editingDomain, ModelEditor editor, EStructuralFeature commandsFeature) {
-		super(editingDomain, editor);
+	public VCommandEditor(EditingDomain editingDomain, ModelEditor editor, EStructuralFeature commandsFeature, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 		this.commandsFeature = commandsFeature;
-		try {
-			actions.add(new Action(Messages.VCommandEditor_AddCommand, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.png"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd();
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+		actions.add(new Action(Messages.VCommandEditor_AddCommand, createImageDescriptor(ResourceProvider.IMG_Command)) {
+			@Override
+			public void run() {
+				handleAdd();
+			}
+		});
 	}
 
 	@Override
@@ -133,7 +128,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -160,7 +155,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -187,7 +182,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -198,7 +193,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 9ccbd4d087..fa16189bdd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -10,17 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.commands.MHandlerContainer;
@@ -53,19 +53,14 @@ public class VHandlerEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VHandlerEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.VHandlerEditor_AddHandler, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd();
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public VHandlerEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.VHandlerEditor_AddHandler, createImageDescriptor(ResourceProvider.IMG_Handler)) {
+			@Override
+			public void run() {
+				handleAdd();
+			}
+		});
 	}
 
 	@Override
@@ -130,7 +125,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -157,7 +152,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -184,7 +179,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -195,7 +190,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
index 08f398a673..807dacfcd9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -10,17 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
@@ -57,19 +57,14 @@ public class VItemParametersEditor extends AbstractComponentEditor {
 
 	private IEMFListProperty HANDLED_ITEM__PARAMETERS = EMFProperties.list(MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
 
-	public VItemParametersEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.VItemParametersEditor_AddParameter, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd();
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public VItemParametersEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.VItemParametersEditor_AddParameter, createImageDescriptor(ResourceProvider.IMG_Parameter)) {
+			@Override
+			public void run() {
+				handleAdd();
+			}
+		});
 	}
 
 	@Override
@@ -134,7 +129,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -161,7 +156,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -188,7 +183,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -199,7 +194,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index 346ad2a7d9..8fdd87fa87 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -10,17 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
@@ -54,19 +54,14 @@ public class VMenuContributionsEditor extends AbstractComponentEditor {
 
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VMenuContributionsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.VMenuContributionsEditor_AddMenuContribution, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd();
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public VMenuContributionsEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.VMenuContributionsEditor_AddMenuContribution, createImageDescriptor(ResourceProvider.IMG_MenuContribution)) {
+			@Override
+			public void run() {
+				handleAdd();
+			}
+		});
 	}
 
 	@Override
@@ -131,7 +126,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -158,7 +153,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -185,7 +180,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -196,7 +191,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 596bce56d1..cdedf9fba1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -10,17 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
@@ -56,20 +56,15 @@ public class VMenuEditor extends AbstractComponentEditor {
 	private EStructuralFeature feature;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VMenuEditor(EditingDomain editingDomain, ModelEditor editor, EStructuralFeature feature) {
-		super(editingDomain, editor);
+	public VMenuEditor(EditingDomain editingDomain, ModelEditor editor, EStructuralFeature feature, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 		this.feature = feature;
-		try {
-			actions.add(new Action(Messages.VMenuEditor_AddMenuContribution, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd();
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+		actions.add(new Action(Messages.VMenuEditor_AddMenuContribution, createImageDescriptor(ResourceProvider.IMG_Menu)) {
+			@Override
+			public void run() {
+				handleAdd();
+			}
+		});
 	}
 
 	@Override
@@ -133,7 +128,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Up);
-		b.setImage(getImage(b.getDisplay(), ARROW_UP));
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -160,7 +155,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Down);
-		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -188,7 +183,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_AddEllipsis);
-		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -199,7 +194,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Remove);
-		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index e67f9f8a4a..6e31542757 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -15,9 +15,11 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
@@ -48,8 +50,8 @@ public class VModelFragmentsEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
 
-	public VModelFragmentsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
+	public VModelFragmentsEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 	}
 
 	@Override
@@ -115,7 +117,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -142,7 +144,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -169,7 +171,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -188,7 +190,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index 582d95e2b2..fde83c1d30 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -17,9 +17,11 @@
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
@@ -59,8 +61,8 @@ public class VModelImportsEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
 
-	public VModelImportsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
+	public VModelImportsEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
 	}
 
 	@Override
@@ -124,7 +126,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -151,7 +153,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -203,7 +205,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 			childrenDropDown.getCombo().select(0);
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -222,7 +224,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index e0a5fdc69a..9c22f94b11 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -10,17 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MBasicFactory;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorContainer;
@@ -53,19 +53,14 @@ public class VPartDescriptor extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VPartDescriptor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.VPartDescriptor_AddPartDescriptor, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd();
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public VPartDescriptor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.VPartDescriptor_AddPartDescriptor, createImageDescriptor(ResourceProvider.IMG_PartDescriptor)) {
+			@Override
+			public void run() {
+				handleAdd();
+			}
+		});
 	}
 
 	@Override
@@ -130,7 +125,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -157,7 +152,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -184,7 +179,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -195,7 +190,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
index 8629943ab6..1b9c6a4d01 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
@@ -10,17 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.MBindingContext;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
@@ -54,19 +54,14 @@ public class VRootBindingContexts extends AbstractComponentEditor {
 
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VRootBindingContexts(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.VRootBindingContexts_AddContext, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAddContext();
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public VRootBindingContexts(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.VRootBindingContexts_AddContext, createImageDescriptor(ResourceProvider.IMG_BindingContext)) {
+			@Override
+			public void run() {
+				handleAddContext();
+			}
+		});
 	}
 
 	@Override
@@ -131,7 +126,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -158,7 +153,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -185,7 +180,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -196,7 +191,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index 34b558e9bb..ddceef6aa1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -10,17 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContributions;
@@ -53,19 +53,14 @@ public class VToolBarContributionsEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VToolBarContributionsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.VToolBarContributionsEditor_AddToolBarContribution, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd();
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public VToolBarContributionsEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.VToolBarContributionsEditor_AddToolBarContribution, createImageDescriptor(ResourceProvider.IMG_ToolBarContribution)) {
+			@Override
+			public void run() {
+				handleAdd();
+			}
+		});
 	}
 
 	@Override
@@ -130,7 +125,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -157,7 +152,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -184,7 +179,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -195,7 +190,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index c0277478ab..7ad0b72283 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -19,9 +17,11 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
@@ -60,55 +60,49 @@ public class VWindowControlEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VWindowControlEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.VWindowControlEditor_AddPerspectiveStack, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK);
-				}
-			});
-
-			actions.add(new Action(Messages.VWindowControlEditor_AddPartSashContainer, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
-				}
-			});
-
-			actions.add(new Action(Messages.VWindowControlEditor_AddPartStack, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(BasicPackageImpl.Literals.PART_STACK);
-				}
-			});
-
-			actions.add(new Action(Messages.VWindowControlEditor_AddPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(BasicPackageImpl.Literals.PART);
-				}
-			});
-
-			actions.add(new Action(Messages.VWindowControlEditor_AddInputPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(BasicPackageImpl.Literals.PART);
-				}
-			});
-
-			actions.add(new Action(Messages.VWindowControlEditor_AddArea, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(AdvancedPackageImpl.Literals.AREA);
-				}
-			});
-
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public VWindowControlEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.VWindowControlEditor_AddPerspectiveStack, createImageDescriptor(ResourceProvider.IMG_PerspectiveStack)) {
+			@Override
+			public void run() {
+				handleAdd(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK);
+			}
+		});
+
+		actions.add(new Action(Messages.VWindowControlEditor_AddPartSashContainer, createImageDescriptor(ResourceProvider.IMG_PartSashContainer_vertical)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
+			}
+		});
+
+		actions.add(new Action(Messages.VWindowControlEditor_AddPartStack, createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.PART_STACK);
+			}
+		});
+
+		actions.add(new Action(Messages.VWindowControlEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.PART);
+			}
+		});
+
+		actions.add(new Action(Messages.VWindowControlEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.PART);
+			}
+		});
+
+		actions.add(new Action(Messages.VWindowControlEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area_vertical)) {
+			@Override
+			public void run() {
+				handleAdd(AdvancedPackageImpl.Literals.AREA);
+			}
+		});
 	}
 
 	@Override
@@ -173,7 +167,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -197,7 +191,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -232,7 +226,7 @@ public String getText(Object element) {
 			childrenDropDown.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -246,7 +240,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 462628b329..3851e6e66c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -19,9 +17,11 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
@@ -59,25 +59,20 @@ public class VWindowEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VWindowEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.VWindowEditor_AddTrimmedWindow, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(BasicPackageImpl.Literals.TRIMMED_WINDOW);
-				}
-			});
-			actions.add(new Action(Messages.VWindowEditor_AddWindow, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(BasicPackageImpl.Literals.WINDOW);
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public VWindowEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.VWindowEditor_AddTrimmedWindow, createImageDescriptor(ResourceProvider.IMG_Window)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.TRIMMED_WINDOW);
+			}
+		});
+		actions.add(new Action(Messages.VWindowEditor_AddWindow, createImageDescriptor(ResourceProvider.IMG_Window)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.WINDOW);
+			}
+		});
 	}
 
 	@Override
@@ -142,7 +137,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 
 		b.setText(Messages.ModelTooling_Common_Up);
-		b.setImage(getImage(b.getDisplay(), ARROW_UP));
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -166,7 +161,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Down);
-		b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -201,7 +196,7 @@ public String getText(Object element) {
 		childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.TRIMMED_WINDOW));
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -213,7 +208,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Remove);
-		b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 99be98eb6d..243fdb8488 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -10,17 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -59,34 +59,28 @@ public class VWindowSharedElementsEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VWindowSharedElementsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-
-		try {
-			actions.add(new Action(Messages.VWindowSharedElementsEditor_AddPartSashContainer, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
-				}
-			});
-
-			actions.add(new Action(Messages.VWindowSharedElementsEditor_AddPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(BasicPackageImpl.Literals.PART);
-				}
-			});
-
-			actions.add(new Action(Messages.VWindowSharedElementsEditor_AddInputPart, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd(BasicPackageImpl.Literals.INPUT_PART);
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public VWindowSharedElementsEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.VWindowSharedElementsEditor_AddPartSashContainer, createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
+			}
+		});
+
+		actions.add(new Action(Messages.VWindowSharedElementsEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.PART);
+			}
+		});
+
+		actions.add(new Action(Messages.VWindowSharedElementsEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.INPUT_PART);
+			}
+		});
 	}
 
 	@Override
@@ -155,7 +149,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -182,7 +176,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -221,7 +215,7 @@ public String getText(Object element) {
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -235,7 +229,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index f6ae8da45c..298e924503 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -10,17 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
 import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
@@ -50,19 +50,14 @@ public class VWindowTrimEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VWindowTrimEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.VWindowTrimEditor_AddWindowTrim, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd();
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public VWindowTrimEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.VWindowTrimEditor_AddWindowTrim, createImageDescriptor(ResourceProvider.IMG_WindowTrim)) {
+			@Override
+			public void run() {
+				handleAdd();
+			}
+		});
 	}
 
 	@Override
@@ -128,7 +123,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -139,7 +134,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -160,7 +155,6 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.services/.project b/bundles/org.eclipse.e4.tools.services/.project
index 15c52ba19e..d8bd3a0180 100644
--- a/bundles/org.eclipse.e4.tools.services/.project
+++ b/bundles/org.eclipse.e4.tools.services/.project
@@ -20,6 +20,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 08d062afb0..f14d25988c 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -6,3 +6,12 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.e4.tools.services
 Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
+ org.eclipse.equinox.common;bundle-version="3.6.0",
+ org.eclipse.e4.core.contexts;bundle-version="0.9.0",
+ javax.annotation;bundle-version="1.0.0",
+ org.eclipse.e4.core.di;bundle-version="0.9.0",
+ javax.inject;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.7.0"
+Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourcepoolfunction.xml b/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourcepoolfunction.xml
new file mode 100644
index 0000000000..ee100ccaad
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourcepoolfunction.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.services.resourcepoolfactory">
+   <implementation class="org.eclipse.e4.tools.services.impl.ResourcePoolFactory"/>
+   <service>
+      <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
+   </service>
+   <property name="service.context.key" type="String" value="org.eclipse.e4.tools.services.IResourcePool"/>
+</scr:component>
diff --git a/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourceservice.xml b/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourceservice.xml
new file mode 100644
index 0000000000..3291208df3
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourceservice.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.services.resourceservice">
+   <implementation class="org.eclipse.e4.tools.services.impl.ResourceService"/>
+   <service>
+      <provide interface="org.eclipse.e4.tools.services.IResourceService"/>
+   </service>
+</scr:component>
diff --git a/bundles/org.eclipse.e4.tools.services/build.properties b/bundles/org.eclipse.e4.tools.services/build.properties
index b8bb95d7f8..caddfdf972 100644
--- a/bundles/org.eclipse.e4.tools.services/build.properties
+++ b/bundles/org.eclipse.e4.tools.services/build.properties
@@ -1,6 +1,8 @@
-source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
                about.html,\
-               OSGI-INF/
+               OSGI-INF/,\
+               OSGI-INF/resourcepoolfunction.xml,\
+               OSGI-INF/resourceservice.xml
+source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/AbstractBundleResourceProvider.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/AbstractBundleResourceProvider.java
new file mode 100644
index 0000000000..6fda1278b5
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/AbstractBundleResourceProvider.java
@@ -0,0 +1,47 @@
+package org.eclipse.e4.tools.services;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Map;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.osgi.framework.BundleContext;
+
+public abstract class AbstractBundleResourceProvider implements IResourceProviderService {
+	private Map<String, String> properties;
+	private BundleContext context;
+	
+	public void activate(BundleContext context, Map<String, String> properties) {
+		this.properties = properties;
+		this.context = context;
+	}
+	
+	public Image getImage(Display display, String key) {
+		URL url = FileLocator.find(context.getBundle(),new Path(properties.get(key)),null);
+		
+		if( url != null ) {
+			InputStream stream = null;
+			try {
+				stream = url.openStream();
+				return new Image(display, stream);
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} finally {
+				if( stream != null ) {
+					try {
+						stream.close();
+					} catch (IOException e) {
+					}
+				}
+			}
+		}
+		
+		// TODO Auto-generated method stub
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourcePool.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourcePool.java
new file mode 100644
index 0000000000..bd06e5ea53
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourcePool.java
@@ -0,0 +1,17 @@
+package org.eclipse.e4.tools.services;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Image;
+
+public interface IResourcePool {
+	public Image getImage(String imageKey) throws CoreException;
+	public Image getImageUnchecked(String imageKey);
+	
+	public Color getColor(String imageKey) throws CoreException;
+	public Color getColorUnchecked(String imageKey);
+	
+	public Font getFont(String imageKey) throws CoreException;
+	public Font getFontUnchecked(String imageKey);
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceProviderService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceProviderService.java
new file mode 100644
index 0000000000..5c047d05c5
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceProviderService.java
@@ -0,0 +1,10 @@
+package org.eclipse.e4.tools.services;
+
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+
+public interface IResourceProviderService {
+	public Image getImage(Display display, String key);
+	public Image getFont(Display display, String key);
+	public Image getColor(Display display, String key);
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java
new file mode 100644
index 0000000000..93324df8f7
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2011 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.services;
+
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+
+public interface IResourceService {
+	public interface IPooledResource<T> {
+		public T getResource();
+		public void dispose();
+	}
+	
+	public interface IDiposeableResourcePool extends IResourcePool {
+		public void dispose();
+	}
+	
+	public IPooledResource<Image> getImage(Display display, String key);
+	public IPooledResource<Color> getColor(Display display, String key);
+	public IPooledResource<Font> getFont(Display display, String key);
+	
+	public IDiposeableResourcePool getResourcePool(Display display);
+	public IResourcePool getControlPool(Control control);
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java
new file mode 100644
index 0000000000..1808b9f401
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2011 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.services.impl;
+
+import org.eclipse.e4.core.contexts.ContextFunction;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.services.impl.ResourceService.ResourcePool;
+
+@SuppressWarnings("restriction")
+public class ResourcePoolFactory extends ContextFunction {
+
+	@Override
+	public Object compute(IEclipseContext context) {
+		return ContextInjectionFactory.make(ResourcePool.class, context);
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
new file mode 100644
index 0000000000..f74b4af0fe
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
@@ -0,0 +1,389 @@
+/*******************************************************************************
+ * Copyright (c) 2011 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.services.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.e4.tools.services.IResourceProviderService;
+import org.eclipse.e4.tools.services.IResourceService;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Resource;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+
+public class ResourceService implements IResourceService {
+	private enum Type {
+		IMAGE, FONT, COLOR
+	}
+
+	static class PooledResource<T extends Resource> implements
+			IPooledResource<T> {
+		private Display display;
+		private int count;
+		private T resource;
+		private String imageKey;
+		private ResourceService resourceService;
+
+		PooledResource(Display display, ResourceService resourceService,
+				String imageKey, T resource) {
+			this.display = display;
+			this.imageKey = imageKey;
+			this.count = 1;
+			this.resourceService = resourceService;
+			this.resource = resource;
+		}
+
+		public T getResource() {
+			return resource;
+		}
+
+		public void dispose() {
+			this.count--;
+			if (this.count == 0) {
+				resourceService.removePooledResource(this);
+				if (resource != null) {
+					resource.dispose();
+				}
+				resource = null;
+				imageKey = null;
+				resourceService = null;
+			}
+		}
+	}
+
+	static class ResourcePool implements IDiposeableResourcePool {
+		private ResourceService resourceService;
+
+		private List<PooledResource<Image>> pooledImages = new ArrayList<PooledResource<Image>>();
+		private List<PooledResource<Font>> pooledFonts = new ArrayList<PooledResource<Font>>();
+		private List<PooledResource<Color>> pooledColors = new ArrayList<PooledResource<Color>>();
+		private Display display;
+
+		@Inject
+		public ResourcePool(ResourceService resourceService, Display display) {
+			this.display = display;
+			this.resourceService = resourceService;
+		}
+
+		public Image getImage(String key) throws CoreException {
+			if (resourceService == null) {
+				throw new CoreException(
+						new Status(IStatus.ERROR,
+								"org.eclipse.e4.tools.services",
+								"The pool is disposed"));
+			}
+			PooledResource<Image> image = null;
+
+			for (PooledResource<Image> img : pooledImages) {
+				if (img.imageKey.equals(key)) {
+					image = img;
+				}
+			}
+			if (image == null) {
+				image = resourceService.getImage(display, key);
+				pooledImages.add(image);
+			}
+			
+			return image.getResource();
+		}
+
+		public Font getFont(String key) throws CoreException {
+			if (resourceService == null) {
+				throw new CoreException(
+						new Status(IStatus.ERROR,
+								"org.eclipse.e4.tools.services",
+								"The pool is disposed"));
+			}
+			
+			PooledResource<Font> font = null;
+			for (PooledResource<Font> fon : pooledFonts) {
+				if (fon.imageKey.equals(key)) {
+					font = fon;
+				}
+			}
+			if( font == null ) {
+				font = resourceService.getFont(display, key);
+				pooledFonts.add(font);				
+			}
+			return font.getResource();
+		}
+
+		public Color getColor(String key) throws CoreException {
+			if (resourceService == null) {
+				throw new CoreException(
+						new Status(IStatus.ERROR,
+								"org.eclipse.e4.tools.services",
+								"The pool is disposed"));
+			}
+			PooledResource<Color> color = null;
+			
+			for (PooledResource<Color> col : pooledColors) {
+				if (col.imageKey.equals(key)) {
+					color = col;
+				}
+			}
+			
+			if( color == null ) {
+				color = resourceService.getColor(display,
+						key);
+				pooledColors.add(color);				
+			}
+			return color.getResource();
+		}
+
+		public Image getImageUnchecked(String key) {
+			try {
+				return getImage(key);
+			} catch (CoreException e) {
+				return null;
+			}
+		}
+
+		public Font getFontUnchecked(String key) {
+			try {
+				return getFont(key);
+			} catch (CoreException e) {
+				return null;
+			}
+		}
+
+		public Color getColorUnchecked(String key) {
+			try {
+				return getColor(key);
+			} catch (CoreException e) {
+				return null;
+			}
+		}
+
+		@PreDestroy
+		public void dispose() {
+			for (IPooledResource<Image> img : pooledImages) {
+				img.dispose();
+			}
+			for (IPooledResource<Font> font : pooledFonts) {
+				font.dispose();
+			}
+			for (IPooledResource<Color> col : pooledColors) {
+				col.dispose();
+			}
+			resourceService = null;
+			pooledImages = null;
+			pooledFonts = null;
+			pooledColors = null;
+		}
+	}
+
+	static class DisplayPool {
+		private Map<String, PooledResource<Image>> imagePool;
+		private Map<String, PooledResource<Color>> colorPool;
+		private Map<String, PooledResource<Font>> fontPool;
+
+		public Map<String, PooledResource<Color>> getColorPool() {
+			if (colorPool == null) {
+				colorPool = new HashMap<String, ResourceService.PooledResource<Color>>();
+			}
+			return colorPool;
+		}
+
+		public Map<String, PooledResource<Image>> getImagePool() {
+			if (imagePool == null) {
+				imagePool = new HashMap<String, ResourceService.PooledResource<Image>>();
+			}
+			return imagePool;
+		}
+
+		public Map<String, PooledResource<Font>> getFontPool() {
+			if (fontPool == null) {
+				fontPool = new HashMap<String, ResourceService.PooledResource<Font>>();
+			}
+			return fontPool;
+		}
+	}
+
+	private Map<Display, DisplayPool> displayPool = new HashMap<Display, ResourceService.DisplayPool>();
+	// private Map<String, IResourceProviderService> imagekey2providers = new
+	// HashMap<String, IResourceProviderService>();
+	// private Map<String, IResourceProviderService> fontkey2providers = new
+	// HashMap<String, IResourceProviderService>();
+	// private Map<String, IResourceProviderService> colorkey2providers = new
+	// HashMap<String, IResourceProviderService>();
+	private BundleContext context;
+
+	public ResourceService() {
+		Bundle b = FrameworkUtil.getBundle(ResourceService.class);
+		context = b.getBundleContext();
+	}
+
+	protected void removePooledResource(PooledResource<?> resource) {
+		if (resource.getResource() instanceof Image) {
+			displayPool.get(resource.display).getImagePool().remove(resource);
+		} else if (resource.getResource() instanceof Color) {
+			displayPool.get(resource.display).getColorPool().remove(resource);
+		} else if (resource.getResource() instanceof Font) {
+			displayPool.get(resource.display).getFontPool().remove(resource);
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	private <R extends Resource> PooledResource<R> loadResource(
+			Display display, String key, Type type) {
+		DisplayPool p = displayPool.get(display);
+		PooledResource<R> resource = null;
+
+		if (p != null) {
+			if (type == Type.IMAGE) {
+				resource = (PooledResource<R>) p.getImagePool().get(key);
+			} else if (type == Type.COLOR) {
+				resource = (PooledResource<R>) p.getColorPool().get(key);
+			} else {
+				resource = (PooledResource<R>) p.getFontPool().get(key);
+			}
+		}
+
+		if (resource != null) {
+			resource.count++;
+		} else {
+			resource = new PooledResource<R>(display, this, key,
+					(R) lookupResource(display, key, type));
+
+			if (p == null) {
+				p = new DisplayPool();
+				displayPool.put(display, p);
+			}
+
+			if (type == Type.IMAGE) {
+				p.getImagePool().put(key, (PooledResource<Image>) resource);
+			} else if (type == Type.COLOR) {
+				p.getColorPool().put(key, (PooledResource<Color>) resource);
+			} else {
+				p.getFontPool().put(key, (PooledResource<Font>) resource);
+			}
+
+		}
+
+		return resource;
+	}
+
+	@SuppressWarnings("unchecked")
+	private <R> R lookupResource(Display display, String key, Type type) {
+
+		if (type == Type.IMAGE) {
+			IResourceProviderService provider = lookupOSGI(key);
+			if (provider != null) {
+				return (R) provider.getImage(display, key);
+			}
+		} else if (type == Type.COLOR) {
+			IResourceProviderService provider = lookupOSGI(key);
+			if (provider != null) {
+				return (R) provider.getColor(display, key);
+			}
+
+		} else {
+			IResourceProviderService provider = lookupOSGI(key);
+			if (provider != null) {
+				return (R) provider.getFont(display, key);
+			}
+		}
+		throw new IllegalArgumentException("No provider known for '" + key
+				+ "'.");
+	}
+
+	private IResourceProviderService lookupOSGI(String key) {
+		try {
+			Collection<ServiceReference<IResourceProviderService>> refs = context
+					.getServiceReferences(IResourceProviderService.class, "("
+							+ key + "=*)");
+			if (!refs.isEmpty()) {
+				ServiceReference<IResourceProviderService> ref = refs
+						.iterator().next();
+				return context.getService(ref);
+			}
+		} catch (InvalidSyntaxException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	// public void addProvider(IResourceProviderService provider,
+	// Map<String, String> map) {
+	// for (Entry<String, String> e : map.entrySet()) {
+	// if( e.getKey().startsWith("IMAGE") ) {
+	// imagekey2providers.put(e.getKey(), provider);
+	// } else if( e.getKey().startsWith("FONT") ) {
+	// fontkey2providers.put(e.getKey(), provider);
+	// } else if( e.getKey().startsWith("COLOR") ) {
+	// colorkey2providers.put(e.getKey(), provider);
+	// }
+	// }
+	// }
+	//
+	// public void removeProvider(IResourceProviderService provider,
+	// Map<String, String> map) {
+	// for (Entry<String, String> e : map.entrySet()) {
+	// if( e.getKey().startsWith("IMAGE") ) {
+	// imagekey2providers.remove(e.getKey());
+	// } else if( e.getKey().startsWith("FONT") ) {
+	// fontkey2providers.remove(e.getKey());
+	// } else if( e.getKey().startsWith("COLOR") ) {
+	// colorkey2providers.remove(e.getKey());
+	// }
+	// }
+	// }
+
+	public PooledResource<Image> getImage(Display display, String key) {
+		return loadResource(display, key, Type.IMAGE);
+	}
+
+	public PooledResource<Color> getColor(Display display, String key) {
+		return loadResource(display, key, Type.COLOR);
+	}
+
+	public PooledResource<Font> getFont(Display display, String key) {
+		return loadResource(display, key, Type.FONT);
+	}
+
+	public IDiposeableResourcePool getResourcePool(Display display) {
+		return new ResourcePool(this, display);
+	}
+
+	public IResourcePool getControlPool(Control control) {
+		final ResourcePool pool = new ResourcePool(this, control.getDisplay());
+		control.addDisposeListener(new DisposeListener() {
+
+			public void widgetDisposed(DisposeEvent e) {
+				pool.dispose();
+			}
+		});
+		return pool;
+	}
+
+}

From b3be5bff75c7f1fb2b03dd4036a7523c91d8df0d Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 8 Jan 2011 13:13:21 +0000
Subject: [PATCH 0287/1286] Bug 321132 - [ModelTooling] AbstractComponentEditor
 needs to dispose its images on bundle shutdown

---
 .../emf/ui/internal/common/ModelEditor.java   | 10 ++----
 .../virtual/VTrimContributionsEditor.java     | 33 ++++++++-----------
 .../internal/wbm/ApplicationModelEditor.java  |  8 ++---
 3 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 7e44276b50..9b8ee232ec 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -51,6 +51,7 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.AddonsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ApplicationEditor;
@@ -168,7 +169,6 @@
 import org.eclipse.swt.dnd.TransferData;
 import org.eclipse.swt.events.ControlAdapter;
 import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
@@ -215,8 +215,6 @@ public class ModelEditor {
 	private boolean fragment;
 	private Handler clipboardHandler;
 
-	private Image removeIcon;
-
 	@Inject
 	@Optional
 	private IClipboardService clipboardService;
@@ -237,14 +235,13 @@ public class ModelEditor {
 
 	private final IResourcePool resourcePool;
 
-	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project, IResourcePool resourcePool) {
+	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project, final IResourcePool resourcePool) {
 		this.resourcePool = resourcePool;
 		this.modelProvider = modelProvider;
 		this.project = project;
 		this.context = context;
 		this.context.set(ModelEditor.class, this);
 		this.obsManager = new ObservablesManager();
-		this.removeIcon = new Image(composite.getDisplay(), ModelEditor.class.getResourceAsStream("/icons/full/obj16/cross.png"));
 
 		registerDefaultEditors();
 		registerVirtualEditors();
@@ -386,7 +383,7 @@ public void menuAboutToShow(IMenuManager manager) {
 						}
 
 						if (o.eContainer() != null) {
-							actions.add(new Action(Messages.ModelEditor_Delete, ImageDescriptor.createFromImage(removeIcon)) {
+							actions.add(new Action(Messages.ModelEditor_Delete, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
 								public void run() {
 									if (o.eContainingFeature().isMany()) {
 										Command cmd = RemoveCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), o.eContainer(), o.eContainingFeature(), o);
@@ -763,7 +760,6 @@ public void setFocus() {
 	@PreDestroy
 	void dispose() {
 		try {
-			removeIcon.dispose();
 			obsManager.dispose();
 		} catch (Exception e) {
 			// TODO: handle exception
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index 6aec00c547..4b47525409 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -10,17 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.MTrimContributions;
@@ -53,19 +53,14 @@ public class VTrimContributionsEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VTrimContributionsEditor(EditingDomain editingDomain, ModelEditor editor) {
-		super(editingDomain, editor);
-		try {
-			actions.add(new Action(Messages.VTrimContributionsEditor_AddTrimContribution, loadSharedDescriptor(Display.getCurrent(), new URL("platform:/plugin/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif"))) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleAdd();
-				}
-			});
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public VTrimContributionsEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
+		super(editingDomain, editor, resourcePool);
+		actions.add(new Action(Messages.VTrimContributionsEditor_AddTrimContribution, createImageDescriptor(ResourceProvider.IMG_TrimContribution)) {
+			@Override
+			public void run() {
+				handleAdd();
+			}
+		});
 	}
 
 	@Override
@@ -130,7 +125,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(getImage(b.getDisplay(), ARROW_UP));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -157,7 +152,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(getImage(b.getDisplay(), ARROW_DOWN));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -184,7 +179,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(getImage(b.getDisplay(), TABLE_ADD_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -195,7 +190,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(getImage(b.getDisplay(), TABLE_DELETE_IMAGE));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index 60a2ae91af..162f84d57b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -17,12 +17,12 @@
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.swt.widgets.Composite;
 
 public class ApplicationModelEditor extends ModelEditor {
 	@Inject
-	public ApplicationModelEditor(Composite composite, IEclipseContext context,
-			IModelResource modelProvider, @Named("org.eclipse.e4.tools.emf.ui.editorproject") @Optional IProject project) {
-		super(composite, context, modelProvider, project);
+	public ApplicationModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, @Named("org.eclipse.e4.tools.emf.ui.editorproject") @Optional IProject project, IResourcePool resourcePool) {
+		super(composite, context, modelProvider, project, resourcePool);
 	}
-} 
+}

From 8b59ee029fc80582bc154ce2ffb11cce84e7dd16 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 29 Jan 2011 00:23:41 +0000
Subject: [PATCH 0288/1286] Merging back changes

---
 .../tools/emf/editor3x/XMIModelResource.java  |  118 --
 .../META-INF/MANIFEST.MF                      |    3 +-
 .../OSGI-INF/images.properties                |    3 +
 .../icons/full/obj16/application_form.png     |  Bin 0 -> 467 bytes
 .../icons/full/obj16/chart_organisation.png   |  Bin 0 -> 444 bytes
 .../icons/full/obj16/error_obj.gif            |  Bin 0 -> 339 bytes
 .../ui/common/CommandToStringConverter.java   |    4 +-
 .../tools/emf/ui/common/IModelResource.java   |   13 +-
 .../e4/tools/emf/ui/common/ImageTooltip.java  |    5 +-
 .../tools/emf/ui/common/XMIModelResource.java |   24 +-
 .../component/AbstractComponentEditor.java    |   19 +-
 .../e4/tools/emf/ui/internal/Messages.java    | 1150 ++++++++---------
 .../tools/emf/ui/internal/Messages.properties |    4 +-
 .../emf/ui/internal/ResourceProvider.java     |    3 +
 .../common/ComponentLabelProvider.java        |    5 +-
 .../emf/ui/internal/common/ModelEditor.java   |  258 ++--
 .../common/component/AddonsEditor.java        |   24 +-
 .../common/component/ApplicationEditor.java   |   13 +-
 .../internal/common/component/AreaEditor.java |   25 +-
 .../component/BindingContextEditor.java       |   19 +-
 .../common/component/BindingTableEditor.java  |   21 +-
 .../common/component/CategoryEditor.java      |   14 +-
 .../common/component/CommandEditor.java       |   23 +-
 .../component/CommandParameterEditor.java     |   12 +-
 .../common/component/ControlFactory.java      |   10 +-
 .../component/CoreExpressionEditor.java       |   12 +-
 .../component/DirectMenuItemEditor.java       |   13 +-
 .../component/DirectToolItemEditor.java       |   13 +-
 .../component/HandledMenuItemEditor.java      |   19 +-
 .../component/HandledToolItemEditor.java      |   19 +-
 .../common/component/HandlerEditor.java       |   32 +-
 .../common/component/InputPartEditor.java     |   10 +-
 .../common/component/KeyBindingEditor.java    |   30 +-
 .../component/MenuContributionEditor.java     |   17 +-
 .../internal/common/component/MenuEditor.java |   34 +-
 .../common/component/MenuItemEditor.java      |   35 +-
 .../common/component/MenuSeparatorEditor.java |   14 +-
 .../component/ModelFragmentsEditor.java       |   13 +-
 .../common/component/ParameterEditor.java     |   12 +-
 .../component/PartDescriptorEditor.java       |   20 +-
 .../internal/common/component/PartEditor.java |   34 +-
 .../component/PartSashContainerEditor.java    |   21 +-
 .../common/component/PartStackEditor.java     |   21 +-
 .../common/component/PerspectiveEditor.java   |   36 +-
 .../component/PerspectiveStackEditor.java     |   21 +-
 .../common/component/PlaceholderEditor.java   |   21 +-
 .../common/component/PopupMenuEditor.java     |   15 +-
 .../common/component/RenderedMenuEditor.java  |   10 +-
 .../common/component/RenderedMenuItem.java    |   10 +-
 .../component/RenderedToolBarEditor.java      |    9 +-
 .../common/component/StringModelFragment.java |   16 +-
 .../component/ToolBarContributionEditor.java  |   16 +-
 .../common/component/ToolBarEditor.java       |   19 +-
 .../component/ToolBarSeparatorEditor.java     |   18 +-
 .../common/component/ToolControlEditor.java   |   25 +-
 .../common/component/ToolItemEditor.java      |   35 +-
 .../common/component/TrimBarEditor.java       |   25 +-
 .../component/TrimContributionEditor.java     |   16 +-
 .../common/component/TrimmedWindowEditor.java |    9 +-
 .../common/component/WindowEditor.java        |   35 +-
 .../AbstractCommandSelectionDialog.java       |    4 +-
 .../component/dialogs/AbstractIconDialog.java |    5 +-
 .../dialogs/AreaIconDialogEditor.java         |    4 +-
 .../BindingContextSelectionDialog.java        |    4 +-
 .../CommandCategorySelectionDialog.java       |    4 +-
 .../dialogs/ContributionClassDialog.java      |    4 +-
 .../component/dialogs/ExpressionIdDialog.java |    4 +-
 .../dialogs/FeatureSelectionDialog.java       |    4 +-
 .../dialogs/FindImportElementDialog.java      |    4 +-
 .../FindParentReferenceElementDialog.java     |    4 +-
 ...HandledMenuItemCommandSelectionDialog.java |    4 +-
 ...HandledToolItemCommandSelectionDialog.java |    4 +-
 .../HandlerCommandSelectionDialog.java        |    4 +-
 .../KeyBindingCommandSelectionDialog.java     |    4 +-
 .../dialogs/MenuIconDialogEditor.java         |    4 +-
 .../dialogs/MenuItemIconDialogEditor.java     |    4 +-
 .../PartDescriptorIconDialogEditor.java       |    4 +-
 .../dialogs/PartIconDialogEditor.java         |    4 +-
 .../dialogs/PerspectiveIconDialogEditor.java  |    4 +-
 .../dialogs/SharedElementsDialog.java         |    4 +-
 .../dialogs/ToolItemIconDialogEditor.java     |    4 +-
 .../dialogs/WindowIconDialogEditor.java       |    4 +-
 .../component/virtual/VApplicationAddons.java |   17 +-
 .../virtual/VApplicationCategoriesEditor.java |   17 +-
 .../virtual/VBindingTableEditor.java          |   17 +-
 .../component/virtual/VCommandEditor.java     |   20 +-
 .../component/virtual/VHandlerEditor.java     |   17 +-
 .../virtual/VItemParametersEditor.java        |   17 +-
 .../virtual/VMenuContributionsEditor.java     |   17 +-
 .../common/component/virtual/VMenuEditor.java |   15 +-
 .../virtual/VModelFragmentsEditor.java        |   12 +-
 .../virtual/VModelImportsEditor.java          |   12 +-
 .../component/virtual/VPartDescriptor.java    |   17 +-
 .../virtual/VPartDescriptorMenuEditor.java    |   11 +
 .../component/virtual/VPartMenuEditor.java    |   12 +
 .../virtual/VRootBindingContexts.java         |   17 +-
 .../virtual/VToolBarContributionsEditor.java  |   17 +-
 .../virtual/VTrimContributionsEditor.java     |   17 +-
 .../virtual/VWindowControlEditor.java         |   17 +-
 .../component/virtual/VWindowEditor.java      |   17 +-
 .../virtual/VWindowSharedElementsEditor.java  |   17 +-
 .../component/virtual/VWindowTrimEditor.java  |   17 +-
 .../internal/common/xml/AnnotationAccess.java |   61 +
 .../ui/internal/common/xml/ColorManager.java  |   38 +
 .../xml/EMFDocumentResourceMediator.java      |   94 ++
 .../common/xml/IXMLColorConstants.java        |   21 +
 .../xml/NonRuleBasedDamagerRepairer.java      |  148 +++
 .../emf/ui/internal/common/xml/TagRule.java   |   41 +
 .../internal/common/xml/XMLConfiguration.java |   77 ++
 .../common/xml/XMLDoubleClickStrategy.java    |  125 ++
 .../common/xml/XMLPartitionScanner.java       |   35 +
 .../ui/internal/common/xml/XMLScanner.java    |   34 +
 .../ui/internal/common/xml/XMLTagScanner.java |   37 +
 .../common/xml/XMLWhitespaceDetector.java     |   20 +
 .../META-INF/MANIFEST.MF                      |    5 +-
 .../OSGI-INF/messagefactoryservice.xml        |    7 +
 .../OSGI-INF/translationsupplier.xml          |    8 +
 .../build.properties                          |    4 +-
 .../services/IMessageFactoryService.java      |    6 +
 .../eclipse/e4/tools/services/Message.java    |    9 +
 .../e4/tools/services/Translation.java        |   16 +
 .../impl/MessageFactoryServiceImpl.java       |  139 ++
 .../PropertiesBundleTranslationProvider.java  |  223 ++++
 .../impl/TranslationObjectSupplier.java       |   67 +
 124 files changed, 2726 insertions(+), 1373 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/application_form.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/chart_organisation.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/error_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/ColorManager.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/IXMLColorConstants.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLPartitionScanner.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/OSGI-INF/messagefactoryservice.xml
 create mode 100644 bundles/org.eclipse.e4.tools.services/OSGI-INF/translationsupplier.xml
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Message.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Translation.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/PropertiesBundleTranslationProvider.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java
deleted file mode 100644
index a19ed76ddb..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIModelResource.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.editor3x;
-
-import java.util.ArrayList;
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.e4.tools.emf.ui.common.IModelResource;
-import org.eclipse.e4.ui.internal.workbench.E4XMIResourceFactory;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-
-@SuppressWarnings("restriction")
-public class XMIModelResource implements IModelResource {
-	private EditingDomain editingDomain;
-	private Resource resource;
-	private List<ModelListener> listeners = new ArrayList<IModelResource.ModelListener>();
-	private boolean dirty;
-
-	
-	public XMIModelResource(URI uri) {
-		ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
-				ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-		ResourceSet resourceSet = new ResourceSetImpl();
-		BasicCommandStack commandStack = new BasicCommandStack();
-		commandStack.addCommandStackListener(new CommandStackListener() {
-			
-			public void commandStackChanged(EventObject event) {
-				dirty = true;
-				fireDirtyChanged();
-				fireCommandStackChanged();
-			}
-		});
-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory,
-				commandStack, resourceSet);
-		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
-				.put(Resource.Factory.Registry.DEFAULT_EXTENSION,
-						new E4XMIResourceFactory());
-		resource = resourceSet.getResource(uri, true);
-	}
-
-	public IObservableList getRoot() {
-		WritableList list = new WritableList();
-		list.add(resource.getContents().get(0));
-		return list;
-	}
-
-	public EditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	public boolean isSaveable() {
-		return true;
-	}
-
-	public void addModelListener(ModelListener listener) {
-		listeners.add(listener);
-	}
-	
-	public void removeModelListener(ModelListener listener) {
-		listeners.remove(listener);
-	}
-	
-	public boolean isDirty() {
-		return dirty && getEditingDomain().getCommandStack().canUndo();
-	}
-	
-	private void fireDirtyChanged() {
-		for( ModelListener listener : listeners ) {
-			listener.dirtyChanged();
-		}
-	}
-	
-	private void fireCommandStackChanged() {
-		for( ModelListener listener : listeners ) {
-			listener.commandStackChanged();
-		}
-	}
-	
-	public IStatus save() {
-		Map<String, String> map = new HashMap<String, String>();
-		try {
-			resource.save(map);
-			editingDomain.getCommandStack().flush();
-			dirty = false;
-			fireDirtyChanged();
-			fireCommandStackChanged();
-		} catch (Exception e) {
-			// TODO: handle exception
-			e.printStackTrace();
-		}
-
-		return Status.OK_STATUS;
-	}
-
-}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 252f2ad402..8af951f288 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -28,7 +28,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.e4.ui.di;bundle-version="0.9.0",
  javax.annotation;bundle-version="1.0.0",
  org.eclipse.e4.tools.services;bundle-version="1.0.0",
- org.eclipse.e4.core.di.extensions;bundle-version="0.9.0"
+ org.eclipse.e4.core.di.extensions;bundle-version="0.9.0",
+ org.eclipse.jface.text;bundle-version="3.7.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.runtime.jobs,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/images.properties b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/images.properties
index f38970e7fb..471396af6b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/images.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/images.properties
@@ -81,6 +81,9 @@ IMG_org.eclipse.e4.tools.emf.ui.obj16.headermenu=/icons/full/obj16/headermenu.pn
 IMG_org.eclipse.e4.tools.emf.ui.obj16.table_add=/icons/full/obj16/table_add.png
 IMG_org.eclipse.e4.tools.emf.ui.obj16.table_delete=/icons/full/obj16/table_delete.png
 IMG_org.eclipse.e4.tools.emf.ui.obj16.zoom=/icons/full/obj16/zoom.png
+IMG_org.eclipse.e4.tools.emf.ui.obj16.application_form=/icons/full/obj16/application_form.png
+IMG_org.eclipse.e4.tools.emf.ui.obj16.chart_organisation=/icons/full/obj16/chart_organisation.png
+IMG_org.eclipse.e4.tools.emf.ui.obj16.error_obj=/icons/full/obj16/error_obj.gif
 
 IMG_org.eclipse.e4.tools.emf.ui.wizban.fieldrefact_wiz=/icons/full/wizban/fieldrefact_wiz.png
 IMG_org.eclipse.e4.tools.emf.ui.wizban.import_wiz=/icons/full/wizban/import_wiz.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/application_form.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/application_form.png
new file mode 100644
index 0000000000000000000000000000000000000000..807b862cfc087b70dcdd971af3ac92688484e998
GIT binary patch
literal 467
zcmV;^0WAKBP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzWl2OqR2Uhh
z!Ld%0VHk$t`)xiANfSmH95k><I$^r`51xV!9D!jmggCjdIk`wm!k``j3?2%ObyEhK
zC<!u@I{bZ~hkhX>4nWfMy23V#h*$3p-!?D%AI~T5+JJ;5Qi)|`;Y?)XOj2U`VS70o
zp1%L~Y4f1;U-b7MEOk38OU$EtImvzCpiEkKCg)@3^{;h@nc_6NuOBn7?ZF9Ev4w3+
zWiSxI_v2&k@_b{1R8kdeGLx;rFK&F@c}mqZ4YwJO$7q^VC6&nL^Y#-6g9F*zM-oa=
z70W0^1X#=%!t{DQE-wCJ^Pd1r08&yFDUlL$EtoM3e+;?Hv-Nc(QI%=il9}v$`OS^N
z)(TbAG~DLw><`m+N>!Xf5_@kR0j83~eKLh5sv-%=fC#``TU}jaG#UW`VS>Ph2!jLJ
zROR&N$<c?yc2k)sMP?$2Y+EED8!K@dSy)1%I$|blvxp80x&qw|@H*2>x3B;J002ov
JPDHLkV1im=zq<ec

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/chart_organisation.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/chart_organisation.png
new file mode 100644
index 0000000000000000000000000000000000000000..c32d25c16f8b399f0cf5681651d2871a48207627
GIT binary patch
literal 444
zcmV;t0Ym<YP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzPDw;TR5;7E
zQoBk6Q4l>F_A89qTKGV%LqLqA&{k|D2>yV7qLmg~*x1@cbjz3zP!z2FhV16<-TNNz
zuIz$fLNt0{xWmll%$dUkM1*+|PHJ2ZGvdmC35A3UoF6R(-~DS$BH+@Xy#VYsLyQ>z
zxq>v8$ny|FSR~0W2u4ic`k5mcbEIiLksz4Y#KyE{9LLn}_oq&%6$}Oga?Zh83$3-^
zU4V1$eaMkz85m>bTh*c{3ch%tltQ=L4Q7$u>-Ff*JP6K)r(~Ul_41v6uR1rSij#*!
zl14&E<wGDoek|)-7we>?hS3Iagod#Oo#p}d7WbijUO{Mqc5?@<<rZ=&>$>unxw*22
z?bQuGkPsSMOgEm)qR1=cLLyZOm>T<B)b(O=q1gG=>65_V?)|o0p=i_uUiST44Cz-W
mqJp!8r`H!$*8T4x&4Leh&Epbde3h>N0000<MNUMnLSTX_2FT6;

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/error_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/error_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0bc60689c6dcbfb71770789a3c2e98f51f6eecd7
GIT binary patch
literal 339
zcmZ?wbhEHb6krfwxXQrrHNWU<d&k$jqAz*HuX78(R@LA23c2SUeBVF(V`TED#Ef$q
z=I1mmE?T(Wb@2V<9rZdi;Y&j9oy?*WVj3qTwa%%UezXtzXdnD+_106dp6Bx7zAu_}
z(%tSsV)XaU)~}V7-<lfUHZ}a;zyI-(BmcpGfvQ09CkrD3gDQg#$W)M@7}yF9Oe*lu
zk?KEj$z$@v6cgnq9hW(Con-yCSbUw}kTA(TdWwRb(xrBlUkWNm*&G=ZHnKB0Ew<>4
z&?^&f5)>{J;LlXy?-r<b5#r0_oW#jj;36Ta!Zjz8l}Ex&f}5R%k%eu6hlCKX2(QpW
N&&^x5dO9*#0|1dmYAXN$

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
index 16f2a454a5..87692fbe2e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
@@ -18,9 +18,11 @@
 import org.eclipse.emf.ecore.resource.Resource;
 
 public class CommandToStringConverter extends Converter {
+	private Messages Messages;
 
-	public CommandToStringConverter() {
+	public CommandToStringConverter(Messages Messages) {
 		super(MCommand.class, String.class);
+		this.Messages = Messages;
 	}
 
 	public Object convert(Object fromObject) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
index 4c5d0acaa3..0aead91e4d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
@@ -12,20 +12,29 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 
 public interface IModelResource {
 	public IObservableList getRoot();
+
 	public boolean isSaveable();
+
 	public IStatus save();
+
 	public EditingDomain getEditingDomain();
+
 	public boolean isDirty();
-	
+
+	public void replaceRoot(EObject eobject);
+
 	public void addModelListener(ModelListener listener);
+
 	public void removeModelListener(ModelListener listener);
-	
+
 	public interface ModelListener {
 		public void dirtyChanged();
+
 		public void commandStackChanged();
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
index e9d75fe16e..b494088606 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
@@ -33,10 +33,11 @@
 
 public abstract class ImageTooltip extends ToolTip {
 	private Image image;
+	private Messages Messages;
 
-	public ImageTooltip(Control control) {
+	public ImageTooltip(Control control, Messages Messages) {
 		super(control);
-
+		this.Messages = Messages;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
index d6b47cfe80..c9f53fb4b9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
@@ -11,21 +11,27 @@
 package org.eclipse.e4.tools.emf.ui.common;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.EventObject;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.ui.internal.workbench.E4XMIResourceFactory;
 import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.command.CompoundCommand;
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -35,6 +41,7 @@ public class XMIModelResource implements IModelResource {
 	private Resource resource;
 	private List<ModelListener> listeners = new ArrayList<IModelResource.ModelListener>();
 	private boolean dirty;
+	private IObservableList list;
 
 	public XMIModelResource(URI uri) {
 		ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
@@ -54,11 +61,22 @@ public void commandStackChanged(EventObject event) {
 	}
 
 	public IObservableList getRoot() {
-		WritableList list = new WritableList();
-		list.add(resource.getContents().get(0));
+		if (list != null) {
+			return list;
+		}
+
+		list = EMFEditProperties.resource(getEditingDomain()).observe(resource);
+
 		return list;
 	}
 
+	public void replaceRoot(EObject eobject) {
+		Command cmdRemove = new RemoveCommand(getEditingDomain(), resource.getContents(), list.get(0));
+		Command cmdAdd = new AddCommand(getEditingDomain(), resource.getContents(), eobject);
+		CompoundCommand cmd = new CompoundCommand(Arrays.asList(cmdRemove, cmdAdd));
+		getEditingDomain().getCommandStack().execute(cmd);
+	}
+
 	public EditingDomain getEditingDomain() {
 		return editingDomain;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index d1971b58cd..5786d640f7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -12,11 +12,14 @@
 
 import java.util.Collections;
 import java.util.List;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.ecore.EObject;
@@ -28,8 +31,6 @@
 import org.eclipse.swt.widgets.Display;
 
 public abstract class AbstractComponentEditor {
-	private EditingDomain editingDomain;
-
 	private WritableValue master = new WritableValue();
 
 	public static final int SEARCH_IMAGE = 0;
@@ -40,14 +41,16 @@ public abstract class AbstractComponentEditor {
 
 	protected static final int VERTICAL_LIST_WIDGET_INDENT = 10;
 
+	@Inject
+	private EditingDomain editingDomain;
+	@Inject
 	private ModelEditor editor;
-	private final IResourcePool resourcePool;
+	@Inject
+	private IResourcePool resourcePool;
 
-	public AbstractComponentEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		this.editingDomain = editingDomain;
-		this.editor = editor;
-		this.resourcePool = resourcePool;
-	}
+	@Inject
+	@Translation
+	protected Messages Messages;
 
 	public EditingDomain getEditingDomain() {
 		return editingDomain;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index ee83fd605c..63be298c7b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -10,580 +10,576 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
-	public static String ModelTooling_Common_Up;
-	public static String ModelTooling_Common_Down;
-	public static String ModelTooling_Common_AddEllipsis;
-	public static String ModelTooling_Common_Add;
-	public static String ModelTooling_Common_Remove;
-	public static String ModelTooling_Common_Id;
-	public static String ModelTooling_Common_RefId;
-	public static String ModelTooling_Common_FindEllipsis;
-
-	public static String ModelTooling_UIElement_ToBeRendered;
-	public static String ModelTooling_UIElement_Visible;
-	public static String ModelTooling_UIElement_VisibleWhen;
-	public static String ModelTooling_UIElement_AccessibilityPhrase;
-
-	public static String ModelTooling_Context_Variables;
-	public static String ModelTooling_Context_Properties;
-
-	public static String ModelTooling_ApplicationElement_Tags;
-	public static String ModelTooling_Contribution_PersistedState;
-
-	public static String AbstractCommandSelectionDialog_Label_CommandId;
-
-	public static String ApplicationEditor_Label;
-	public static String ApplicationEditor_Description;
-	public static String ApplicationEditor_Handlers;
-	public static String ApplicationEditor_PartDescriptors;
-	public static String ApplicationEditor_BindingTables;
-	public static String ApplicationEditor_Commands;
-	public static String ApplicationEditor_Windows;
-	public static String ApplicationEditor_Addons;
-	public static String ApplicationEditor_MenuContributions;
-	public static String ApplicationEditor_ToolBarContributions;
-	public static String ApplicationEditor_TrimContributions;
-	public static String ApplicationEditor_RootContexts;
-	public static String ApplicationEditor_BindingContexts;
-	public static String ApplicationEditor_Categories;
-
-	public static String BindingTableEditor_Label;
-	public static String BindingTableEditor_Description;
-	public static String BindingTableEditor_ContextId;
-	public static String BindingTableEditor_Keybindings;
-	public static String BindingTableEditor_KeySequence;
-	public static String BindingTableEditor_Command;
-	public static String BindingTableEditor_AddKeyBinding;
-
-	public static String CommandEditor_Label;
-	public static String CommandEditor_Description;
-	public static String CommandEditor_Name;
-	public static String CommandEditor_LabelDescription;
-	public static String CommandEditor_Parameters;
-	public static String CommandEditor_ParameterName;
-	public static String CommandEditor_ParameterTypeId;
-	public static String CommandEditor_ParameterOptional;
-	public static String CommandEditor_ParameterOptional_No;
-	public static String CommandEditor_ParameterOptional_Yes;
-	public static String CommandEditor_ParameterId;
-	public static String CommandEditor_Category;
-	public static String CommandEditor_AddCommandParameter;
-
-	public static String DirectMenuItemEditor_Label;
-	public static String DirectMenuItemEditor_Description;
-	public static String DirectMenuItemEditor_ClassURI;
-
-	public static String ControlFactory_Key;
-	public static String ControlFactory_Value;
-	public static String ControlFactory_KeyValueShellTitle;
-
-	public static String DirectToolItemEditor_ClassURI;
-	public static String DirectToolItemEditor_Label;
-	public static String DirectToolItemEditor_Description;
-
-	public static String HandledMenuItemEditor_Label;
-	public static String HandledMenuItemEditor_Description;
-	public static String HandledMenuItemEditor_Command;
-	public static String HandledMenuItemEditor_Parameters;
-	public static String HandledMenuItemEditor_Tag;
-	public static String HandledMenuItemEditor_Value;
-
-	public static String HandledToolItemEditor_Command;
-	public static String HandledToolItemEditor_Parameters;
-	public static String HandledToolItemEditor_ParametersName;
-	public static String HandledToolItemEditor_ParametersValue;
-	public static String HandledToolItemEditor_Label;
-	public static String HandledToolItemEditor_Description;
-
-	public static String HandlerEditor_Label;
-	public static String HandlerEditor_Description;
-	public static String HandlerEditor_Command;
-	public static String HandlerEditor_ClassURI;
-
-	public static String InputPartEditor_Label;
-	public static String InputPartEditor_InputURI;
-
-	public static String KeyBindingEditor_Label;
-	public static String KeyBindingEditor_Description;
-	public static String KeyBindingEditor_Sequence;
-	public static String KeyBindingEditor_Command;
-	public static String KeyBindingEditor_Parameters;
-	public static String KeyBindingEditor_SequenceNotComplete;
-	public static String KeyBindingEditor_SequenceEmpty;
-	public static String KeyBindingEditor_AddParameter;
-
-	public static String MenuEditor_Label;
-	public static String MenuEditor_Description;
-	public static String MenuEditor_MenuItems;
-	public static String MenuEditor_MenuItemType;
-	public static String MenuEditor_MenuItemItemType;
-	public static String MenuEditor_HandledMenuItem;
-	public static String MenuEditor_Separator;
-	public static String MenuEditor_Menu;
-	public static String MenuEditor_DirectMenuItem;
-	public static String MenuEditor_LabelLabel;
-	public static String MenuEditor_Tooltip;
-	public static String MenuEditor_IconURI;
-	public static String MenuEditor_Children;
-	public static String MenuEditor_Mnemonics;
-	public static String MenuEditor_AddHandledMenuItem;
-	public static String MenuEditor_AddMenu;
-	public static String MenuEditor_AddDirectMenuItem;
-	public static String MenuEditor_AddSeparator;
-
-	public static String MenuItemEditor_Type;
-	public static String MenuItemEditor_Label;
-	public static String MenuItemEditor_Tooltip;
-	public static String MenuItemEditor_IconURI;
-	public static String MenuEditor_MainMenu;
-	public static String MenuItemEditor_Enabled;
-	public static String MenuItemEditor_Selected;
-	public static String MenuItemEditor_Mnemonics;
-	public static String MenuItemEditor_NoExpression;
-
-	public static String MenuSeparatorEditor_Label;
-
-	public static String PartDescriptorEditor_Label;
-	public static String PartDescriptorEditor_Descriptor;
-	public static String PartDescriptorEditor_LabelLabel;
-	public static String PartDescriptorEditor_Tooltip;
-	public static String PartDescriptorEditor_IconURI;
-	public static String PartDescriptorEditor_ClassURI;
-	public static String PartDescriptorEditor_Dirtyable;
-	public static String PartDescriptorEditor_Closeable;
-	public static String PartDescriptorEditor_Multiple;
-	public static String PartDescriptorEditor_Category;
-	public static String PartDescriptorEditor_Variables;
-	public static String PartDescriptorEditor_Properties;
-	public static String PartDescriptorEditor_PropertiesKey;
-	public static String PartDescriptorEditor_PropertiesValue;
-	public static String PartDescriptorEditor_Menus;
-	public static String PartDescriptorEditor_Handlers;
-	public static String PartDescriptorEditor_ContainerData;
-
-	public static String PartEditor_Label;
-	public static String PartEditor_Description;
-	public static String PartEditor_LabelLabel;
-	public static String PartEditor_Tooltip;
-	public static String PartEditor_IconURI;
-	public static String PartEditor_ClassURI;
-	public static String PartEditor_Closeable;
-	public static String PartEditor_Menus;
-	public static String PartEditor_Handlers;
-	public static String PartEditor_ContainerData;
-	public static String PartEditor_ToolBar;
-	public static String PartEditor_BindingContexts;
-
-	public static String PartSashContainerEditor_Label;
-	public static String PartSashContainerEditor_Description;
-	public static String PartSashContainerEditor_Orientation;
-	public static String PartSashContainerEditor_Vertical;
-	public static String PartSashContainerEditor_Horizontal;
-	public static String PartSashContainerEditor_SelectedElement;
-	public static String PartSashContainerEditor_Controls;
-	public static String PartSashContainerEditor_ContainerData;
-	public static String PartSashContainerEditor_AddPartSashContainer;
-	public static String PartSashContainerEditor_AddPartStack;
-	public static String PartSashContainerEditor_AddPart;
-	public static String PartSashContainerEditor_AddInputPart;
-	public static String PartSashContainerEditor_AddArea;
-	public static String PartSashContainerEditor_AddPlaceholder;
-
-	public static String PartStackEditor_Label;
-	public static String PartStackEditor_Description;
-	public static String PartStackEditor_SelectedElement;
-	public static String PartStackEditor_Parts;
-	public static String PartStackEditor_ContainerData;
-	public static String PartStackEditor_AddPart;
-	public static String PartStackEditor_AddInputPart;
-	public static String PartStackEditor_AddPlaceholder;
-
-	public static String PerspectiveEditor_Label;
-	public static String PerspectiveEditor_Description;
-	public static String PerspectiveEditor_LabelLabel;
-	public static String PerspectiveEditor_SelectedElement;
-	public static String PerspectiveEditor_Tooltip;
-	public static String PerspectiveEditor_IconURI;
-	public static String PerspectiveEditor_Controls;
-	public static String PerspectiveEditor_AddPartSashContainer;
-	public static String PerspectiveEditor_AddPartStack;
-	public static String PerspectiveEditor_AddPart;
-	public static String PerspectiveEditor_AddInputPart;
-	public static String PerspectiveEditor_AddArea;
-	public static String PerspectiveEditor_AddPlaceholder;
-
-	public static String PerspectiveStackEditor_Perspectives;
-	public static String PerspectiveStackEditor_Label;
-	public static String PerspectiveStackEditor_Description;
-	public static String PerspectiveStackEditor_SelectedElement;
-	public static String PerspectiveStackEditor_AddPerspective;
-
-	public static String PlaceholderEditor_Label;
-	public static String PlaceholderEditor_Descriptor;
-	public static String PlaceholderEditor_Reference;
-
-	public static String ToolBarEditor_Label;
-	public static String ToolBarEditor_Description;
-	public static String ToolBarEditor_ToolbarItems;
-	public static String ToolBarEditor_ToolbarItemsType;
-	public static String ToolBarEditor_ToolbarItemsItemType;
-	public static String ToolBarEditor_HandledToolItem;
-	public static String ToolBarEditor_DirectToolItem;
-	public static String ToolBarEditor_ToolControl;
-	public static String ToolBarEditor_Separator;
-	public static String ToolBarEditor_AddHandledToolItem;
-	public static String ToolBarEditor_AddDirectToolItem;
-	public static String ToolBarEditor_AddToolControl;
-	public static String ToolBarEditor_AddToolBarSeparator;
-
-	public static String ToolBarSeparatorEditor_Label;
-
-	public static String ToolControlEditor_Label;
-	public static String ToolControlEditor_Description;
-	public static String ToolControlEditor_ClassURI;
-
-	public static String VBindingTableEditor_Label;
-	public static String VBindingTableEditor_Description;
-	public static String VBindingTableEditor_Contexts;
-	public static String VBindingTableEditor_Name;
-	public static String VBindingTableEditor_LabelDescription;
-	public static String VBindingTableEditor_BindingTables;
-	public static String VBindingTableEditor_AddBindingTable;
-
-	public static String AddonsEditor_ClassURI;
-	public static String AddonsEditor_TreeLabel;
-	public static String AddonsEditor_TreeLabelDescription;
-	public static String AddonsEditor_Tags;
-
-	public static String ContributionClassDialog_DialogMessage;
-	public static String ContributionClassDialog_DialogTitle;
-	public static String ContributionClassDialog_Label_Classname;
-	public static String ContributionClassDialog_ShellTitle;
-
-	public static String MenuContributionEditor_MenuItems;
-	public static String MenuContributionEditor_MenuItemType;
-	public static String MenuContributionEditor_MenuItemItemType;
-	public static String MenuContributionEditor_HandledMenuItem;
-	public static String MenuContributionEditor_Separator;
-	public static String MenuContributionEditor_Menu;
-	public static String MenuContributionEditor_DirectMenuItem;
-	public static String MenuContributionEditor_ParentId;
-	public static String MenuContributionEditor_Position;
-	public static String MenuContributionEditor_TreeLabel;
-	public static String MenuContributionEditor_TreeLabelDescription;
-
-	public static String ModelFragmentsEditor_ModelFragments;
-	public static String ModelFragmentsEditor_Label;
-	public static String ModelFragmentsEditor_Description;
-	public static String ModelFragmentsEditor_Imports;
-
-	public static String StringModelFragment_Label;
-	public static String StringModelFragment_Description;
-	public static String StringModelFragment_Featurename;
-	public static String StringModelFragment_ParentId;
-	public static String StringModelFragment_PositionInList;
-	public static String StringModelFragment_Elements;
-
-	public static String FeatureSelectionDialog_Filter;
-	public static String FeatureSelectionDialog_ShellTitle;
-	public static String FeatureSelectionDialog_DialogTitle;
-	public static String FeatureSelectionDialog_DialogMessage;
-
-	public static String CategoryEditor_TreeLabel;
-	public static String CategoryEditor_TreeLabelDescriptor;
-	public static String CategoryEditor_Name;
-	public static String CategoryEditor_Description;
-	public static String CategoryEditor_Tags;
-
-	public static String CommandCategorySelectionDialog_LabelCategoryId;
-
-	public static String BindingContextSelectionDialog_LabelContextId;
-
-	public static String ComponentLabelProvider_invisible;
-	public static String ComponentLabelProvider_notrendered;
-
-	public static String BindingContextEditor_TreeLabel;
-	public static String BindingContextEditor_TreeLabelDescription;
-	public static String BindingContextEditor_Name;
-	public static String BindingContextEditor_Description;
-	public static String BindingContextEditor_Subcontexts;
-	public static String BindingContextEditor_AddContext;
-
-	public static String CommandParameterEditor_TreeLabel;
-	public static String CommandParameterEditor_TreeLabelDescritpion;
-	public static String CommandParameterEditor_Name;
-	public static String CommandParameterEditor_TypeId;
-	public static String CommandParameterEditor_Optional;
-
-	public static String ParameterEditor_TreeLabel;
-	public static String ParameterEditor_TreeLabelDescription;
-	public static String ParameterEditor_Name;
-	public static String ParameterEditor_Value;
-
-	public static String PopupMenuEditor_TreeLabel;
-	public static String PopupMenuEditor_TreeLabelDescription;
-
-	public static String RenderedMenuEditor_TreeLabel;
-
-	public static String RenderedMenuItem_TreeLabel;
-	public static String RenderedMenuItem_TreeLabelDescription;
-
-	public static String RenderedToolBarEditor_TreeLabel;
-
-	public static String ToolBarContributionEditor_TreeLabel;
-	public static String ToolBarContributionEditor_TreeLabelDescription;
-
-	public static String ToolItemEditor_Type;
-	public static String ToolItemEditor_Label;
-	public static String ToolItemEditor_ToolTip;
-	public static String ToolItemEditor_IconURI;
-	public static String ToolItemEditor_Enabled;
-	public static String ToolItemEditor_Selected;
-	public static String ToolItemEditor_NoExpression;
-
-	public static String TrimBarEditor_TreeLabel;
-	public static String TrimBarEditor_TreeLabelDescription;
-	public static String TrimBarEditor_Side;
-	public static String TrimBarEditor_Controls;
-	public static String TrimBarEditor_AddToolBar;
-	public static String TrimBarEditor_AddToolControl;
-
-	public static String TrimContributionEditor_TreeLabel;
-	public static String TrimContributionEditor_TreeLabelDescription;
-	public static String TrimContributionEditor_ParentId;
-	public static String TrimContributionEditor_Position;
-	public static String TrimContributionEditor_Controls;
-
-	public static String TrimmedWindowEditor_TrimBars;
-	public static String TrimmedWindowEditor_TreeLabel;
-
-	public static String WindowEditor_AddMainMenu;
-	public static String WindowEditor_TreeLabel;
-	public static String WindowEditor_TreeLabelDescription;
-	public static String WindowEditor_X;
-	public static String WindowEditor_Y;
-	public static String WindowEditor_Width;
-	public static String WindowEditor_Height;
-	public static String WindowEditor_Label;
-	public static String WindowEditor_Tooltip;
-	public static String WindowEditor_IconURI;
-	public static String WindowEditor_MainMenu;
-	public static String WindowEditor_SelectedElement;
-	public static String WindowEditor_BindingContexts;
-	public static String WindowEditor_Handlers;
-	public static String WindowEditor_Windows;
-	public static String WindowEditor_Controls;
-	public static String WindowEditor_SharedElements;
-
-	public static String VApplicationAddons_AddAddon;
-	public static String VApplicationAddons_TreeLabel;
-	public static String VApplicationAddons_TreeLabelDescription;
-	public static String VApplicationAddons_Commands;
-
-	public static String VApplicationCategoriesEditor_TreeLabel;
-	public static String VApplicationCategoriesEditor_TreeLabelDescription;
-	public static String VApplicationCategoriesEditor_Categories;
-	public static String VApplicationCategoriesEditor_AddCategory;
-
-	public static String VCommandEditor_TreeLabel;
-	public static String VCommandEditor_TreeLabelDescription;
-	public static String VCommandEditor_Commands;
-	public static String VCommandEditor_AddCommand;
-
-	public static String VHandlerEditor_TreeLabel;
-	public static String VHandlerEditor_TreeLabelDescription;
-	public static String VHandlerEditor_Handlers;
-	public static String VHandlerEditor_AddHandler;
-
-	public static String VMenuContributionsEditor_TreeLabel;
-	public static String VMenuContributionsEditor_TreeLabelDescription;
-	public static String VMenuContributionsEditor_MenuContributions;
-	public static String VMenuContributionsEditor_AddMenuContribution;
-
-	public static String VMenuEditor_TreeLabel;
-	public static String VMenuEditor_TreeLabelDescription;
-	public static String VMenuEditor_Menus;
-	public static String VMenuEditor_AddMenuContribution;
-
-	public static String VModelFragmentsEditor_TreeLabel;
-	public static String VModelFragmentsEditor_TreeLabelDescription;
-	public static String VModelFragmentsEditor_Fragments;
-
-	public static String VModelImportsEditor_TreeLabel;
-	public static String VModelImportsEditor_TreeLabelDescription;
-	public static String VModelImportsEditor_Imports;
-
-	public static String VPartDescriptor_TreeLabel;
-	public static String VPartDescriptor_TreeLabelDescription;
-	public static String VPartDescriptor_Descriptors;
-	public static String VPartDescriptor_AddPartDescriptor;
-
-	public static String VToolBarContributionsEditor_Contributions;
-	public static String VToolBarContributionsEditor_TreeLabelDescription;
-	public static String VToolBarContributionsEditor_TreeLabel;
-	public static String VToolBarContributionsEditor_AddToolBarContribution;
-
-	public static String VTrimContributionsEditor_TreeLabel;
-	public static String VTrimContributionsEditor_TreeLabelDescription;
-	public static String VTrimContributionsEditor_Contributions;
-	public static String VTrimContributionsEditor_AddTrimContribution;
-
-	public static String VWindowControlEditor_TreeLabel;
-	public static String VWindowControlEditor_TreeLabelDescription;
-	public static String VWindowControlEditor_Controls;
-	public static String VWindowControlEditor_AddPerspectiveStack;
-	public static String VWindowControlEditor_AddPartSashContainer;
-	public static String VWindowControlEditor_AddPartStack;
-	public static String VWindowControlEditor_AddPart;
-	public static String VWindowControlEditor_AddInputPart;
-	public static String VWindowControlEditor_AddArea;
-
-	public static String VWindowEditor_TreeLabel;
-	public static String VWindowEditor_TreeLabelDescription;
-	public static String VWindowEditor_Windows;
-	public static String VWindowEditor_AddTrimmedWindow;
-	public static String VWindowEditor_AddWindow;
-
-	public static String VWindowSharedElementsEditor_TreeLabel;
-	public static String VWindowSharedElementsEditor_TreeLabelDescription;
-	public static String VWindowSharedElementsEditor_Controls;
-	public static String VWindowSharedElementsEditor_AddPartSashContainer;
-	public static String VWindowSharedElementsEditor_AddPart;
-	public static String VWindowSharedElementsEditor_AddInputPart;
-
-	public static String VWindowTrimEditor_TreeLabel;
-	public static String VWindowTrimEditor_TreeLabelDescription;
-	public static String VWindowTrimEditor_Controls;
-	public static String VWindowTrimEditor_AddWindowTrim;
-
-	public static String AbstractIconDialog_IconName;
-
-	public static String BindingContextSelectionDialog_ShellTitle;
-	public static String BindingContextSelectionDialog_Title;
-	public static String BindingContextSelectionDialog_Message;
-	public static String BindingContextSelectionDialog_NoIdReference;
-
-	public static String CommandCategorySelectionDialog_ShellTitle;
-	public static String CommandCategorySelectionDialog_Title;
-	public static String CommandCategorySelectionDialog_Message;
-
-	public static String FindImportElementDialog_ShellTitle;
-	public static String FindImportElementDialog_Title;
-	public static String FindImportElementDialog_Message;
-	public static String FindImportElementDialog_Search;
-	public static String FindImportElementDialog_ClearCache;
-	public static String FindImportElementDialog_NoIdReference;
-	public static String FindImportElementDialog_noId;
-
-	public static String FindParentReferenceElementDialog_ShellTitle;
-	public static String FindParentReferenceElementDialog_Title;
-	public static String FindParentReferenceElementDialog_Message;
-	public static String FindParentReferenceElementDialog_ContainerType;
-	public static String FindParentReferenceElementDialog_Search;
-	public static String FindParentReferenceElementDialog_NoId;
-	public static String FindParentReferenceElementDialog_ClearCache;
-	public static String FindParentReferenceElementDialog_NoReferenceId;
-
-	public static String HandledMenuItemCommandSelectionDialog_ShellTitle;
-	public static String HandledMenuItemCommandSelectionDialog_DialogTitle;
-	public static String HandledMenuItemCommandSelectionDialog_DialogMessage;
-
-	public static String HandledToolItemCommandSelectionDialog_ShellTitle;
-	public static String HandledToolItemCommandSelectionDialog_DialogTitle;
-	public static String HandledToolItemCommandSelectionDialog_DialogMessage;
-
-	public static String HandlerCommandSelectionDialog_ShellTitle;
-	public static String HandlerCommandSelectionDialog_DialogTitle;
-	public static String HandlerCommandSelectionDialog_DialogMessage;
-
-	public static String KeyBindingCommandSelectionDialog_ShellTitle;
-	public static String KeyBindingCommandSelectionDialog_DialogTitle;
-	public static String KeyBindingCommandSelectionDialog_DialogMessage;
-
-	public static String MenuIconDialogEditor_ShellTitle;
-	public static String MenuIconDialogEditor_DialogTitle;
-	public static String MenuIconDialogEditor_DialogMessage;
-
-	public static String MenuItemIconDialogEditor_ShellTitle;
-	public static String MenuItemIconDialogEditor_DialogTitle;
-	public static String MenuItemIconDialogEditor_DialogMessage;
-
-	public static String PartDescriptorIconDialogEditor_ShellTitle;
-	public static String PartDescriptorIconDialogEditor_DialogTitle;
-	public static String PartDescriptorIconDialogEditor_DialogMessage;
-
-	public static String PartIconDialogEditor_ShellTitle;
-	public static String PartIconDialogEditor_DialogTitle;
-	public static String PartIconDialogEditor_DialogMessage;
-
-	public static String PerspectiveIconDialogEditor_ShellTitle;
-	public static String PerspectiveIconDialogEditor_DialogTitle;
-	public static String PerspectiveIconDialogEditor_DialogMessage;
-
-	public static String SharedElementsDialog_ShellTitle;
-	public static String SharedElementsDialog_Title;
-	public static String SharedElementsDialog_Message;
-	public static String SharedElementsDialog_Name;
-
-	public static String ToolItemIconDialogEditor_ShellTitle;
-	public static String ToolItemIconDialogEditor_DialogTitle;
-	public static String ToolItemIconDialogEditor_DialogMessage;
-
-	public static String WindowIconDialogEditor_ShellTitle;
-	public static String WindowIconDialogEditor_DialogTitle;
-	public static String WindowIconDialogEditor_DialogMessage;
-
-	public static String ImageTooltip_UnknownError;
-	public static String ImageTooltip_FileNotFound;
-	public static String ImageTooltip_Icon;
-	public static String ImageTooltip_Name;
-	public static String ImageTooltip_Dimension;
-	public static String ImageTooltip_FileSize;
-
-	public static String VItemParametersEditor_TreeLabel;
-	public static String VItemParametersEditor_TreeLabelDescription;
-	public static String VItemParametersEditor_Parameters;
-	public static String VItemParametersEditor_AddParameter;
-
-	public static String CoreExpressionEditor_TreeLabel;
-	public static String CoreExpressionEditor_TreeLabelDescription;
-	public static String CoreExpressionEditor_ExpressionId;
-
-	public static String ExpressionIdDialog_ShellTitle;
-	public static String ExpressionIdDialog_DialogTitle;
-	public static String ExpressionIdDialog_DialogMessage;
-	public static String ExpressionIdDialog_Id;
-
-	public static String CommandToStringConverter_None;
-
-	public static String VRootBindingContexts_AddContext;
-	public static String VRootBindingContexts_TreeLabel;
-	public static String VRootBindingContexts_TreeLabelDescription;
-	public static String VRootBindingContexts_Contexts;
-
-	public static String AreaEditor_Label;
-	public static String AreaEditor_Description;
-	public static String AreaEditor_Orientation;
-	public static String AreaEditor_Horizontal;
-	public static String AreaEditor_SelectedElement;
-	public static String AreaEditor_ContainerData;
-	public static String AreaEditor_Controls;
-	public static String AreaEditor_Vertical;
-	public static String AreaEditor_LabelLabel;
-	public static String AreaEditor_Tooltip;
-	public static String AreaEditor_IconURI;
-
-	public static String AreaIconDialogEditor_ShellTitle;
-	public static String AreaIconDialogEditor_DialogTitle;
-	public static String AreaIconDialogEditor_DialogMessage;
-
-	public static String ModelEditor_Delete;
-
-	static {
-		NLS.initializeMessages(Messages.class.getName(), Messages.class);
-	}
-}
+public class Messages {
+
+	public String ModelTooling_Common_Up;
+	public String ModelTooling_Common_Down;
+	public String ModelTooling_Common_AddEllipsis;
+	public String ModelTooling_Common_Add;
+	public String ModelTooling_Common_Remove;
+	public String ModelTooling_Common_Id;
+	public String ModelTooling_Common_RefId;
+	public String ModelTooling_Common_FindEllipsis;
+
+	public String ModelTooling_UIElement_ToBeRendered;
+	public String ModelTooling_UIElement_Visible;
+	public String ModelTooling_UIElement_VisibleWhen;
+	public String ModelTooling_UIElement_AccessibilityPhrase;
+
+	public String ModelTooling_Context_Variables;
+	public String ModelTooling_Context_Properties;
+
+	public String ModelTooling_ApplicationElement_Tags;
+	public String ModelTooling_Contribution_PersistedState;
+
+	public String AbstractCommandSelectionDialog_Label_CommandId;
+
+	public String ApplicationEditor_Label;
+	public String ApplicationEditor_Description;
+	public String ApplicationEditor_Handlers;
+	public String ApplicationEditor_PartDescriptors;
+	public String ApplicationEditor_BindingTables;
+	public String ApplicationEditor_Commands;
+	public String ApplicationEditor_Windows;
+	public String ApplicationEditor_Addons;
+	public String ApplicationEditor_MenuContributions;
+	public String ApplicationEditor_ToolBarContributions;
+	public String ApplicationEditor_TrimContributions;
+	public String ApplicationEditor_RootContexts;
+	public String ApplicationEditor_BindingContexts;
+	public String ApplicationEditor_Categories;
+
+	public String BindingTableEditor_Label;
+	public String BindingTableEditor_Description;
+	public String BindingTableEditor_ContextId;
+	public String BindingTableEditor_Keybindings;
+	public String BindingTableEditor_KeySequence;
+	public String BindingTableEditor_Command;
+	public String BindingTableEditor_AddKeyBinding;
+
+	public String CommandEditor_Label;
+	public String CommandEditor_Description;
+	public String CommandEditor_Name;
+	public String CommandEditor_LabelDescription;
+	public String CommandEditor_Parameters;
+	public String CommandEditor_ParameterName;
+	public String CommandEditor_ParameterTypeId;
+	public String CommandEditor_ParameterOptional;
+	public String CommandEditor_ParameterOptional_No;
+	public String CommandEditor_ParameterOptional_Yes;
+	public String CommandEditor_ParameterId;
+	public String CommandEditor_Category;
+	public String CommandEditor_AddCommandParameter;
+
+	public String DirectMenuItemEditor_Label;
+	public String DirectMenuItemEditor_Description;
+	public String DirectMenuItemEditor_ClassURI;
+
+	public String ControlFactory_Key;
+	public String ControlFactory_Value;
+	public String ControlFactory_KeyValueShellTitle;
+
+	public String DirectToolItemEditor_ClassURI;
+	public String DirectToolItemEditor_Label;
+	public String DirectToolItemEditor_Description;
+
+	public String HandledMenuItemEditor_Label;
+	public String HandledMenuItemEditor_Description;
+	public String HandledMenuItemEditor_Command;
+	public String HandledMenuItemEditor_Parameters;
+	public String HandledMenuItemEditor_Tag;
+	public String HandledMenuItemEditor_Value;
+
+	public String HandledToolItemEditor_Command;
+	public String HandledToolItemEditor_Parameters;
+	public String HandledToolItemEditor_ParametersName;
+	public String HandledToolItemEditor_ParametersValue;
+	public String HandledToolItemEditor_Label;
+	public String HandledToolItemEditor_Description;
+
+	public String HandlerEditor_Label;
+	public String HandlerEditor_Description;
+	public String HandlerEditor_Command;
+	public String HandlerEditor_ClassURI;
+
+	public String InputPartEditor_Label;
+	public String InputPartEditor_InputURI;
+
+	public String KeyBindingEditor_Label;
+	public String KeyBindingEditor_Description;
+	public String KeyBindingEditor_Sequence;
+	public String KeyBindingEditor_Command;
+	public String KeyBindingEditor_Parameters;
+	public String KeyBindingEditor_SequenceNotComplete;
+	public String KeyBindingEditor_SequenceEmpty;
+	public String KeyBindingEditor_AddParameter;
+
+	public String MenuEditor_Label;
+	public String MenuEditor_Description;
+	public String MenuEditor_MenuItems;
+	public String MenuEditor_MenuItemType;
+	public String MenuEditor_MenuItemItemType;
+	public String MenuEditor_HandledMenuItem;
+	public String MenuEditor_Separator;
+	public String MenuEditor_Menu;
+	public String MenuEditor_DirectMenuItem;
+	public String MenuEditor_LabelLabel;
+	public String MenuEditor_Tooltip;
+	public String MenuEditor_IconURI;
+	public String MenuEditor_Children;
+	public String MenuEditor_Mnemonics;
+	public String MenuEditor_AddHandledMenuItem;
+	public String MenuEditor_AddMenu;
+	public String MenuEditor_AddDirectMenuItem;
+	public String MenuEditor_AddSeparator;
+
+	public String MenuItemEditor_Type;
+	public String MenuItemEditor_Label;
+	public String MenuItemEditor_Tooltip;
+	public String MenuItemEditor_IconURI;
+	public String MenuEditor_MainMenu;
+	public String MenuItemEditor_Enabled;
+	public String MenuItemEditor_Selected;
+	public String MenuItemEditor_Mnemonics;
+	public String MenuItemEditor_NoExpression;
+
+	public String MenuSeparatorEditor_Label;
+
+	public String PartDescriptorEditor_Label;
+	public String PartDescriptorEditor_Descriptor;
+	public String PartDescriptorEditor_LabelLabel;
+	public String PartDescriptorEditor_Tooltip;
+	public String PartDescriptorEditor_IconURI;
+	public String PartDescriptorEditor_ClassURI;
+	public String PartDescriptorEditor_Dirtyable;
+	public String PartDescriptorEditor_Closeable;
+	public String PartDescriptorEditor_Multiple;
+	public String PartDescriptorEditor_Category;
+	public String PartDescriptorEditor_Variables;
+	public String PartDescriptorEditor_Properties;
+	public String PartDescriptorEditor_PropertiesKey;
+	public String PartDescriptorEditor_PropertiesValue;
+	public String PartDescriptorEditor_Menus;
+	public String PartDescriptorEditor_Handlers;
+	public String PartDescriptorEditor_ContainerData;
+
+	public String PartEditor_Label;
+	public String PartEditor_Description;
+	public String PartEditor_LabelLabel;
+	public String PartEditor_Tooltip;
+	public String PartEditor_IconURI;
+	public String PartEditor_ClassURI;
+	public String PartEditor_Closeable;
+	public String PartEditor_Menus;
+	public String PartEditor_Handlers;
+	public String PartEditor_ContainerData;
+	public String PartEditor_ToolBar;
+	public String PartEditor_BindingContexts;
+
+	public String PartSashContainerEditor_Label;
+	public String PartSashContainerEditor_Description;
+	public String PartSashContainerEditor_Orientation;
+	public String PartSashContainerEditor_Vertical;
+	public String PartSashContainerEditor_Horizontal;
+	public String PartSashContainerEditor_SelectedElement;
+	public String PartSashContainerEditor_Controls;
+	public String PartSashContainerEditor_ContainerData;
+	public String PartSashContainerEditor_AddPartSashContainer;
+	public String PartSashContainerEditor_AddPartStack;
+	public String PartSashContainerEditor_AddPart;
+	public String PartSashContainerEditor_AddInputPart;
+	public String PartSashContainerEditor_AddArea;
+	public String PartSashContainerEditor_AddPlaceholder;
+
+	public String PartStackEditor_Label;
+	public String PartStackEditor_Description;
+	public String PartStackEditor_SelectedElement;
+	public String PartStackEditor_Parts;
+	public String PartStackEditor_ContainerData;
+	public String PartStackEditor_AddPart;
+	public String PartStackEditor_AddInputPart;
+	public String PartStackEditor_AddPlaceholder;
+
+	public String PerspectiveEditor_Label;
+	public String PerspectiveEditor_Description;
+	public String PerspectiveEditor_LabelLabel;
+	public String PerspectiveEditor_SelectedElement;
+	public String PerspectiveEditor_Tooltip;
+	public String PerspectiveEditor_IconURI;
+	public String PerspectiveEditor_Controls;
+	public String PerspectiveEditor_AddPartSashContainer;
+	public String PerspectiveEditor_AddPartStack;
+	public String PerspectiveEditor_AddPart;
+	public String PerspectiveEditor_AddInputPart;
+	public String PerspectiveEditor_AddArea;
+	public String PerspectiveEditor_AddPlaceholder;
+
+	public String PerspectiveStackEditor_Perspectives;
+	public String PerspectiveStackEditor_Label;
+	public String PerspectiveStackEditor_Description;
+	public String PerspectiveStackEditor_SelectedElement;
+	public String PerspectiveStackEditor_AddPerspective;
+
+	public String PlaceholderEditor_Label;
+	public String PlaceholderEditor_Descriptor;
+	public String PlaceholderEditor_Reference;
+
+	public String ToolBarEditor_Label;
+	public String ToolBarEditor_Description;
+	public String ToolBarEditor_ToolbarItems;
+	public String ToolBarEditor_ToolbarItemsType;
+	public String ToolBarEditor_ToolbarItemsItemType;
+	public String ToolBarEditor_HandledToolItem;
+	public String ToolBarEditor_DirectToolItem;
+	public String ToolBarEditor_ToolControl;
+	public String ToolBarEditor_Separator;
+	public String ToolBarEditor_AddHandledToolItem;
+	public String ToolBarEditor_AddDirectToolItem;
+	public String ToolBarEditor_AddToolControl;
+	public String ToolBarEditor_AddToolBarSeparator;
+
+	public String ToolBarSeparatorEditor_Label;
+
+	public String ToolControlEditor_Label;
+	public String ToolControlEditor_Description;
+	public String ToolControlEditor_ClassURI;
+
+	public String VBindingTableEditor_Label;
+	public String VBindingTableEditor_Description;
+	public String VBindingTableEditor_Contexts;
+	public String VBindingTableEditor_Name;
+	public String VBindingTableEditor_LabelDescription;
+	public String VBindingTableEditor_BindingTables;
+	public String VBindingTableEditor_AddBindingTable;
+
+	public String AddonsEditor_ClassURI;
+	public String AddonsEditor_TreeLabel;
+	public String AddonsEditor_TreeLabelDescription;
+	public String AddonsEditor_Tags;
+
+	public String ContributionClassDialog_DialogMessage;
+	public String ContributionClassDialog_DialogTitle;
+	public String ContributionClassDialog_Label_Classname;
+	public String ContributionClassDialog_ShellTitle;
+
+	public String MenuContributionEditor_MenuItems;
+	public String MenuContributionEditor_MenuItemType;
+	public String MenuContributionEditor_MenuItemItemType;
+	public String MenuContributionEditor_HandledMenuItem;
+	public String MenuContributionEditor_Separator;
+	public String MenuContributionEditor_Menu;
+	public String MenuContributionEditor_DirectMenuItem;
+	public String MenuContributionEditor_ParentId;
+	public String MenuContributionEditor_Position;
+	public String MenuContributionEditor_TreeLabel;
+	public String MenuContributionEditor_TreeLabelDescription;
+
+	public String ModelFragmentsEditor_ModelFragments;
+	public String ModelFragmentsEditor_Label;
+	public String ModelFragmentsEditor_Description;
+	public String ModelFragmentsEditor_Imports;
+
+	public String StringModelFragment_Label;
+	public String StringModelFragment_Description;
+	public String StringModelFragment_Featurename;
+	public String StringModelFragment_ParentId;
+	public String StringModelFragment_PositionInList;
+	public String StringModelFragment_Elements;
+
+	public String FeatureSelectionDialog_Filter;
+	public String FeatureSelectionDialog_ShellTitle;
+	public String FeatureSelectionDialog_DialogTitle;
+	public String FeatureSelectionDialog_DialogMessage;
+
+	public String CategoryEditor_TreeLabel;
+	public String CategoryEditor_TreeLabelDescriptor;
+	public String CategoryEditor_Name;
+	public String CategoryEditor_Description;
+	public String CategoryEditor_Tags;
+
+	public String CommandCategorySelectionDialog_LabelCategoryId;
+
+	public String BindingContextSelectionDialog_LabelContextId;
+
+	public String ComponentLabelProvider_invisible;
+	public String ComponentLabelProvider_notrendered;
+
+	public String BindingContextEditor_TreeLabel;
+	public String BindingContextEditor_TreeLabelDescription;
+	public String BindingContextEditor_Name;
+	public String BindingContextEditor_Description;
+	public String BindingContextEditor_Subcontexts;
+	public String BindingContextEditor_AddContext;
+
+	public String CommandParameterEditor_TreeLabel;
+	public String CommandParameterEditor_TreeLabelDescritpion;
+	public String CommandParameterEditor_Name;
+	public String CommandParameterEditor_TypeId;
+	public String CommandParameterEditor_Optional;
+
+	public String ParameterEditor_TreeLabel;
+	public String ParameterEditor_TreeLabelDescription;
+	public String ParameterEditor_Name;
+	public String ParameterEditor_Value;
+
+	public String PopupMenuEditor_TreeLabel;
+	public String PopupMenuEditor_TreeLabelDescription;
+
+	public String RenderedMenuEditor_TreeLabel;
+
+	public String RenderedMenuItem_TreeLabel;
+	public String RenderedMenuItem_TreeLabelDescription;
+
+	public String RenderedToolBarEditor_TreeLabel;
+
+	public String ToolBarContributionEditor_TreeLabel;
+	public String ToolBarContributionEditor_TreeLabelDescription;
+
+	public String ToolItemEditor_Type;
+	public String ToolItemEditor_Label;
+	public String ToolItemEditor_ToolTip;
+	public String ToolItemEditor_IconURI;
+	public String ToolItemEditor_Enabled;
+	public String ToolItemEditor_Selected;
+	public String ToolItemEditor_NoExpression;
+
+	public String TrimBarEditor_TreeLabel;
+	public String TrimBarEditor_TreeLabelDescription;
+	public String TrimBarEditor_Side;
+	public String TrimBarEditor_Controls;
+	public String TrimBarEditor_AddToolBar;
+	public String TrimBarEditor_AddToolControl;
+
+	public String TrimContributionEditor_TreeLabel;
+	public String TrimContributionEditor_TreeLabelDescription;
+	public String TrimContributionEditor_ParentId;
+	public String TrimContributionEditor_Position;
+	public String TrimContributionEditor_Controls;
+
+	public String TrimmedWindowEditor_TrimBars;
+	public String TrimmedWindowEditor_TreeLabel;
+
+	public String WindowEditor_AddMainMenu;
+	public String WindowEditor_TreeLabel;
+	public String WindowEditor_TreeLabelDescription;
+	public String WindowEditor_X;
+	public String WindowEditor_Y;
+	public String WindowEditor_Width;
+	public String WindowEditor_Height;
+	public String WindowEditor_Label;
+	public String WindowEditor_Tooltip;
+	public String WindowEditor_IconURI;
+	public String WindowEditor_MainMenu;
+	public String WindowEditor_SelectedElement;
+	public String WindowEditor_BindingContexts;
+	public String WindowEditor_Handlers;
+	public String WindowEditor_Windows;
+	public String WindowEditor_Controls;
+	public String WindowEditor_SharedElements;
+
+	public String VApplicationAddons_AddAddon;
+	public String VApplicationAddons_TreeLabel;
+	public String VApplicationAddons_TreeLabelDescription;
+	public String VApplicationAddons_Commands;
+
+	public String VApplicationCategoriesEditor_TreeLabel;
+	public String VApplicationCategoriesEditor_TreeLabelDescription;
+	public String VApplicationCategoriesEditor_Categories;
+	public String VApplicationCategoriesEditor_AddCategory;
+
+	public String VCommandEditor_TreeLabel;
+	public String VCommandEditor_TreeLabelDescription;
+	public String VCommandEditor_Commands;
+	public String VCommandEditor_AddCommand;
+
+	public String VHandlerEditor_TreeLabel;
+	public String VHandlerEditor_TreeLabelDescription;
+	public String VHandlerEditor_Handlers;
+	public String VHandlerEditor_AddHandler;
+
+	public String VMenuContributionsEditor_TreeLabel;
+	public String VMenuContributionsEditor_TreeLabelDescription;
+	public String VMenuContributionsEditor_MenuContributions;
+	public String VMenuContributionsEditor_AddMenuContribution;
+
+	public String VMenuEditor_TreeLabel;
+	public String VMenuEditor_TreeLabelDescription;
+	public String VMenuEditor_Menus;
+	public String VMenuEditor_AddMenuContribution;
+
+	public String VModelFragmentsEditor_TreeLabel;
+	public String VModelFragmentsEditor_TreeLabelDescription;
+	public String VModelFragmentsEditor_Fragments;
+
+	public String VModelImportsEditor_TreeLabel;
+	public String VModelImportsEditor_TreeLabelDescription;
+	public String VModelImportsEditor_Imports;
+
+	public String VPartDescriptor_TreeLabel;
+	public String VPartDescriptor_TreeLabelDescription;
+	public String VPartDescriptor_Descriptors;
+	public String VPartDescriptor_AddPartDescriptor;
+
+	public String VToolBarContributionsEditor_Contributions;
+	public String VToolBarContributionsEditor_TreeLabelDescription;
+	public String VToolBarContributionsEditor_TreeLabel;
+	public String VToolBarContributionsEditor_AddToolBarContribution;
+
+	public String VTrimContributionsEditor_TreeLabel;
+	public String VTrimContributionsEditor_TreeLabelDescription;
+	public String VTrimContributionsEditor_Contributions;
+	public String VTrimContributionsEditor_AddTrimContribution;
+
+	public String VWindowControlEditor_TreeLabel;
+	public String VWindowControlEditor_TreeLabelDescription;
+	public String VWindowControlEditor_Controls;
+	public String VWindowControlEditor_AddPerspectiveStack;
+	public String VWindowControlEditor_AddPartSashContainer;
+	public String VWindowControlEditor_AddPartStack;
+	public String VWindowControlEditor_AddPart;
+	public String VWindowControlEditor_AddInputPart;
+	public String VWindowControlEditor_AddArea;
+
+	public String VWindowEditor_TreeLabel;
+	public String VWindowEditor_TreeLabelDescription;
+	public String VWindowEditor_Windows;
+	public String VWindowEditor_AddTrimmedWindow;
+	public String VWindowEditor_AddWindow;
+
+	public String VWindowSharedElementsEditor_TreeLabel;
+	public String VWindowSharedElementsEditor_TreeLabelDescription;
+	public String VWindowSharedElementsEditor_Controls;
+	public String VWindowSharedElementsEditor_AddPartSashContainer;
+	public String VWindowSharedElementsEditor_AddPart;
+	public String VWindowSharedElementsEditor_AddInputPart;
+
+	public String VWindowTrimEditor_TreeLabel;
+	public String VWindowTrimEditor_TreeLabelDescription;
+	public String VWindowTrimEditor_Controls;
+	public String VWindowTrimEditor_AddWindowTrim;
+
+	public String AbstractIconDialog_IconName;
+
+	public String BindingContextSelectionDialog_ShellTitle;
+	public String BindingContextSelectionDialog_Title;
+	public String BindingContextSelectionDialog_Message;
+	public String BindingContextSelectionDialog_NoIdReference;
+
+	public String CommandCategorySelectionDialog_ShellTitle;
+	public String CommandCategorySelectionDialog_Title;
+	public String CommandCategorySelectionDialog_Message;
+
+	public String FindImportElementDialog_ShellTitle;
+	public String FindImportElementDialog_Title;
+	public String FindImportElementDialog_Message;
+	public String FindImportElementDialog_Search;
+	public String FindImportElementDialog_ClearCache;
+	public String FindImportElementDialog_NoIdReference;
+	public String FindImportElementDialog_noId;
+
+	public String FindParentReferenceElementDialog_ShellTitle;
+	public String FindParentReferenceElementDialog_Title;
+	public String FindParentReferenceElementDialog_Message;
+	public String FindParentReferenceElementDialog_ContainerType;
+	public String FindParentReferenceElementDialog_Search;
+	public String FindParentReferenceElementDialog_NoId;
+	public String FindParentReferenceElementDialog_ClearCache;
+	public String FindParentReferenceElementDialog_NoReferenceId;
+
+	public String HandledMenuItemCommandSelectionDialog_ShellTitle;
+	public String HandledMenuItemCommandSelectionDialog_DialogTitle;
+	public String HandledMenuItemCommandSelectionDialog_DialogMessage;
+
+	public String HandledToolItemCommandSelectionDialog_ShellTitle;
+	public String HandledToolItemCommandSelectionDialog_DialogTitle;
+	public String HandledToolItemCommandSelectionDialog_DialogMessage;
+
+	public String HandlerCommandSelectionDialog_ShellTitle;
+	public String HandlerCommandSelectionDialog_DialogTitle;
+	public String HandlerCommandSelectionDialog_DialogMessage;
+
+	public String KeyBindingCommandSelectionDialog_ShellTitle;
+	public String KeyBindingCommandSelectionDialog_DialogTitle;
+	public String KeyBindingCommandSelectionDialog_DialogMessage;
+
+	public String MenuIconDialogEditor_ShellTitle;
+	public String MenuIconDialogEditor_DialogTitle;
+	public String MenuIconDialogEditor_DialogMessage;
+
+	public String MenuItemIconDialogEditor_ShellTitle;
+	public String MenuItemIconDialogEditor_DialogTitle;
+	public String MenuItemIconDialogEditor_DialogMessage;
+
+	public String PartDescriptorIconDialogEditor_ShellTitle;
+	public String PartDescriptorIconDialogEditor_DialogTitle;
+	public String PartDescriptorIconDialogEditor_DialogMessage;
+
+	public String PartIconDialogEditor_ShellTitle;
+	public String PartIconDialogEditor_DialogTitle;
+	public String PartIconDialogEditor_DialogMessage;
+
+	public String PerspectiveIconDialogEditor_ShellTitle;
+	public String PerspectiveIconDialogEditor_DialogTitle;
+	public String PerspectiveIconDialogEditor_DialogMessage;
+
+	public String SharedElementsDialog_ShellTitle;
+	public String SharedElementsDialog_Title;
+	public String SharedElementsDialog_Message;
+	public String SharedElementsDialog_Name;
+
+	public String ToolItemIconDialogEditor_ShellTitle;
+	public String ToolItemIconDialogEditor_DialogTitle;
+	public String ToolItemIconDialogEditor_DialogMessage;
+
+	public String WindowIconDialogEditor_ShellTitle;
+	public String WindowIconDialogEditor_DialogTitle;
+	public String WindowIconDialogEditor_DialogMessage;
+
+	public String ImageTooltip_UnknownError;
+	public String ImageTooltip_FileNotFound;
+	public String ImageTooltip_Icon;
+	public String ImageTooltip_Name;
+	public String ImageTooltip_Dimension;
+	public String ImageTooltip_FileSize;
+
+	public String VItemParametersEditor_TreeLabel;
+	public String VItemParametersEditor_TreeLabelDescription;
+	public String VItemParametersEditor_Parameters;
+	public String VItemParametersEditor_AddParameter;
+
+	public String CoreExpressionEditor_TreeLabel;
+	public String CoreExpressionEditor_TreeLabelDescription;
+	public String CoreExpressionEditor_ExpressionId;
+
+	public String ExpressionIdDialog_ShellTitle;
+	public String ExpressionIdDialog_DialogTitle;
+	public String ExpressionIdDialog_DialogMessage;
+	public String ExpressionIdDialog_Id;
+
+	public String CommandToStringConverter_None;
+
+	public String VRootBindingContexts_AddContext;
+	public String VRootBindingContexts_TreeLabel;
+	public String VRootBindingContexts_TreeLabelDescription;
+	public String VRootBindingContexts_Contexts;
+
+	public String AreaEditor_Label;
+	public String AreaEditor_Description;
+	public String AreaEditor_Orientation;
+	public String AreaEditor_Horizontal;
+	public String AreaEditor_SelectedElement;
+	public String AreaEditor_ContainerData;
+	public String AreaEditor_Controls;
+	public String AreaEditor_Vertical;
+	public String AreaEditor_LabelLabel;
+	public String AreaEditor_Tooltip;
+	public String AreaEditor_IconURI;
+
+	public String AreaIconDialogEditor_ShellTitle;
+	public String AreaIconDialogEditor_DialogTitle;
+	public String AreaIconDialogEditor_DialogMessage;
+
+	public String ModelEditor_Delete;
+	public String ModelEditor_Form;
+	public String ModelEditor_XMI;
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 163b7d2c33..59e04fdbba 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -578,4 +578,6 @@ AreaIconDialogEditor_ShellTitle=Area Icon Search
 AreaIconDialogEditor_DialogTitle=Area Icon Search
 AreaIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
 
-ModelEditor_Delete=Remove
\ No newline at end of file
+ModelEditor_Delete=Remove
+ModelEditor_Form=Form
+ModelEditor_XMI=XMI
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
index e1ca66fdc5..41c8eeead4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
@@ -88,6 +88,9 @@ public class ResourceProvider extends AbstractBundleResourceProvider {
 	public static final String IMG_Obj16_table_add = "IMG_org.eclipse.e4.tools.emf.ui.obj16.table_add"; //$NON-NLS-1$
 	public static final String IMG_Obj16_table_delete = "IMG_org.eclipse.e4.tools.emf.ui.obj16.table_delete"; //$NON-NLS-1$
 	public static final String IMG_Obj16_zoom = "IMG_org.eclipse.e4.tools.emf.ui.obj16.zoom"; //$NON-NLS-1$
+	public static final String IMG_Obj16_application_form = "IMG_org.eclipse.e4.tools.emf.ui.obj16.application_form"; //$NON-NLS-1$
+	public static final String IMG_Obj16_chart_organisation = "IMG_org.eclipse.e4.tools.emf.ui.obj16.chart_organisation"; //$NON-NLS-1$
+	public static final String IMG_Obj16_error_obj = "IMG_org.eclipse.e4.tools.emf.ui.obj16.error_obj"; //$NON-NLS-1$
 
 	public static final String IMG_Wizban16_fieldrefact_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.fieldrefact_wiz"; //$NON-NLS-1$
 	public static final String IMG_Wizban16_import_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.import_wiz"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index 22653dd83e..f7e54e99f7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -33,6 +33,8 @@ public class ComponentLabelProvider extends StyledCellLabelProvider {
 
 	private Font font;
 
+	private Messages Messages;
+
 	private static Styler NOT_RENDERED_STYLER = new Styler() {
 		{
 			JFaceResources.getColorRegistry().put(NOT_RENDERED_KEY, new RGB(200, 200, 200));
@@ -44,8 +46,9 @@ public void applyStyles(TextStyle textStyle) {
 		}
 	};
 
-	public ComponentLabelProvider(ModelEditor editor) {
+	public ComponentLabelProvider(ModelEditor editor, Messages Messages) {
 		this.editor = editor;
+		this.Messages = Messages;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 9b8ee232ec..78a07d74e9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -35,6 +35,7 @@
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.RegistryFactory;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.Preference;
@@ -101,10 +102,11 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VItemParametersEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuContributionsEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelFragmentsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelImportsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartDescriptor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartDescriptorMenuEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartMenuEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VRootBindingContexts;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VToolBarContributionsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VTrimContributionsEditor;
@@ -112,9 +114,15 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowSharedElementsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowTrimEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.xml.AnnotationAccess;
+import org.eclipse.e4.tools.emf.ui.internal.common.xml.ColorManager;
+import org.eclipse.e4.tools.emf.ui.internal.common.xml.EMFDocumentResourceMediator;
+import org.eclipse.e4.tools.emf.ui.internal.common.xml.XMLConfiguration;
+import org.eclipse.e4.tools.emf.ui.internal.common.xml.XMLPartitionScanner;
 import org.eclipse.e4.tools.services.IClipboardService;
 import org.eclipse.e4.tools.services.IClipboardService.Handler;
 import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.di.Persist;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
@@ -137,6 +145,7 @@
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.CommandParameter;
@@ -151,6 +160,15 @@
 import org.eclipse.jface.databinding.viewers.ObservableListTreeContentProvider;
 import org.eclipse.jface.databinding.viewers.TreeStructureAdvisor;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentPartitioner;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.rules.FastPartitioner;
+import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.jface.text.source.AnnotationModel;
+import org.eclipse.jface.text.source.SourceViewer;
+import org.eclipse.jface.text.source.VerticalRuler;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -159,6 +177,8 @@
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerDropAdapter;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.custom.ScrolledComposite;
 import org.eclipse.swt.dnd.Clipboard;
@@ -169,11 +189,14 @@
 import org.eclipse.swt.dnd.TransferData;
 import org.eclipse.swt.events.ControlAdapter;
 import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Rectangle;
 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.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TreeItem;
 
@@ -201,6 +224,8 @@ public class ModelEditor {
 	public static final String VIRTUAL_MENUELEMENTS = ModelEditor.class.getName() + ".VIRTUAL_MENUELEMENTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_ROOT_CONTEXTS = ModelEditor.class.getName() + ".VIRTUAL_ROOT_CONTEXTS"; //$NON-NLS-1$
 
+	private static final int VERTICAL_RULER_WIDTH = 20;
+
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private Map<String, AbstractComponentEditor> virtualEditors = new HashMap<String, AbstractComponentEditor>();
 	private List<FeaturePath> labelFeaturePaths = new ArrayList<FeaturePath>();
@@ -231,10 +256,16 @@ public class ModelEditor {
 	@Optional
 	private IExtensionLookup extensionLookup;
 
+	@Inject
+	@Translation
+	private Messages messages;
+
 	private ObservablesManager obsManager;
 
 	private final IResourcePool resourcePool;
 
+	private EMFDocumentResourceMediator emfDocumentProvider;
+
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project, final IResourcePool resourcePool) {
 		this.resourcePool = resourcePool;
 		this.modelProvider = modelProvider;
@@ -242,6 +273,18 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 		this.context = context;
 		this.context.set(ModelEditor.class, this);
 		this.obsManager = new ObservablesManager();
+	}
+
+	@PostConstruct
+	void postCreate(Composite composite) {
+		context.set(ModelEditor.class, this);
+		context.set(IResourcePool.class, resourcePool);
+		context.set(EditingDomain.class, modelProvider.getEditingDomain());
+		context.set(IModelResource.class, modelProvider);
+
+		if (project != null) {
+			context.set(IProject.class, project);
+		}
 
 		registerDefaultEditors();
 		registerVirtualEditors();
@@ -253,6 +296,71 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 
 		fragment = modelProvider.getRoot().get(0) instanceof MModelFragments;
 
+		final CTabFolder folder = new CTabFolder(composite, SWT.BOTTOM);
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(messages.ModelEditor_Form);
+		item.setControl(createFormTab(folder));
+		item.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_application_form));
+
+		emfDocumentProvider = new EMFDocumentResourceMediator(modelProvider);
+
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(messages.ModelEditor_XMI);
+		item.setControl(createXMITab(folder));
+		item.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_chart_organisation));
+		folder.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (folder.getSelectionIndex() == 1) {
+					emfDocumentProvider.updateFromEMF();
+				}
+			}
+		});
+
+		folder.setSelection(0);
+	}
+
+	private Control createXMITab(Composite composite) {
+
+		final AnnotationModel model = new AnnotationModel();
+		VerticalRuler verticalRuler = new VerticalRuler(VERTICAL_RULER_WIDTH, new AnnotationAccess(resourcePool));
+		ColorManager colorManager = new ColorManager();
+		int styles = SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION;
+		SourceViewer viewer = new SourceViewer(composite, verticalRuler, styles);
+		viewer.configure(new XMLConfiguration(colorManager));
+		viewer.setEditable(project != null);
+
+		final IDocument document = emfDocumentProvider.getDocument();
+		IDocumentPartitioner partitioner = new FastPartitioner(new XMLPartitionScanner(), new String[] { XMLPartitionScanner.XML_TAG, XMLPartitionScanner.XML_COMMENT });
+		partitioner.connect(document);
+		document.setDocumentPartitioner(partitioner);
+		viewer.setDocument(document);
+		verticalRuler.setModel(model);
+
+		emfDocumentProvider.setValidationChangedCallback(new Runnable() {
+
+			public void run() {
+				model.removeAllAnnotations();
+
+				for (Diagnostic d : emfDocumentProvider.getErrorList()) {
+					Annotation a = new Annotation("e4xmi.error", false, d.getMessage()); //$NON-NLS-1$
+					int l;
+					try {
+						l = document.getLineOffset(d.getLine() - 1);
+						model.addAnnotation(a, new Position(l));
+					} catch (BadLocationException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+
+			}
+		});
+
+		return viewer.getControl();
+	}
+
+	private Composite createFormTab(Composite composite) {
 		SashForm form = new SashForm(composite, SWT.HORIZONTAL);
 		form.setBackground(form.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 
@@ -383,7 +491,7 @@ public void menuAboutToShow(IMenuManager manager) {
 						}
 
 						if (o.eContainer() != null) {
-							actions.add(new Action(Messages.ModelEditor_Delete, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
+							actions.add(new Action(messages.ModelEditor_Delete, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
 								public void run() {
 									if (o.eContainingFeature().isMany()) {
 										Command cmd = RemoveCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), o.eContainer(), o.eContainingFeature(), o);
@@ -409,11 +517,9 @@ public void run() {
 			}
 		});
 		viewer.getControl().setMenu(mgr.createContextMenu(viewer.getControl()));
-	}
-
-	@PostConstruct
-	void postCreate() {
 		viewer.setSelection(new StructuredSelection(modelProvider.getRoot()));
+
+		return form;
 	}
 
 	public IExtensionLookup getExtensionLookup() {
@@ -516,7 +622,7 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		ShadowComposite editingArea = new ShadowComposite(parent, SWT.NONE);
 		editingArea.setLayout(new FillLayout());
 		final TreeViewer viewer = new TreeViewer(editingArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
-		viewer.setLabelProvider(new ComponentLabelProvider(this));
+		viewer.setLabelProvider(new ComponentLabelProvider(this, messages));
 		ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(new ObservableFactoryImpl(), new TreeStructureAdvisorImpl());
 		viewer.setContentProvider(contentProvider);
 
@@ -591,25 +697,25 @@ private void registerContributedVirtualEditors() {
 	}
 
 	private void registerVirtualEditors() {
-		registerVirtualEditor(VIRTUAL_PART_MENU, new VMenuEditor(modelProvider.getEditingDomain(), this, BasicPackageImpl.Literals.PART__MENUS, resourcePool));
-		registerVirtualEditor(VIRTUAL_HANDLER, new VHandlerEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerVirtualEditor(VIRTUAL_BINDING_TABLE, new VBindingTableEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerVirtualEditor(VIRTUAL_COMMAND, new VCommandEditor(modelProvider.getEditingDomain(), this, ApplicationPackageImpl.Literals.APPLICATION__COMMANDS, resourcePool));
-		registerVirtualEditor(VIRTUAL_WINDOWS, new VWindowEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerVirtualEditor(VIRTUAL_WINDOW_CONTROLS, new VWindowControlEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerVirtualEditor(VIRTUAL_PART_DESCRIPTORS, new VPartDescriptor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerVirtualEditor(VIRTUAL_PARTDESCRIPTOR_MENU, new VMenuEditor(modelProvider.getEditingDomain(), this, org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS, resourcePool));
-		registerVirtualEditor(VIRTUAL_TRIMMED_WINDOW_TRIMS, new VWindowTrimEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerVirtualEditor(VIRTUAL_ADDONS, new VApplicationAddons(modelProvider.getEditingDomain(), this, resourcePool));
-		registerVirtualEditor(VIRTUAL_MENU_CONTRIBUTIONS, new VMenuContributionsEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerVirtualEditor(VIRTUAL_TOOLBAR_CONTRIBUTIONS, new VToolBarContributionsEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerVirtualEditor(VIRTUAL_TRIM_CONTRIBUTIONS, new VTrimContributionsEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerVirtualEditor(VIRTUAL_WINDOW_SHARED_ELEMENTS, new VWindowSharedElementsEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerVirtualEditor(VIRTUAL_MODEL_FRAGEMENTS, new VModelFragmentsEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerVirtualEditor(VIRTUAL_MODEL_IMPORTS, new VModelImportsEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerVirtualEditor(VIRTUAL_CATEGORIES, new VApplicationCategoriesEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerVirtualEditor(VIRTUAL_PARAMETERS, new VItemParametersEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerVirtualEditor(VIRTUAL_ROOT_CONTEXTS, new VRootBindingContexts(modelProvider.getEditingDomain(), this, resourcePool));
+		registerVirtualEditor(VIRTUAL_PART_MENU, ContextInjectionFactory.make(VPartMenuEditor.class, context));
+		registerVirtualEditor(VIRTUAL_HANDLER, ContextInjectionFactory.make(VHandlerEditor.class, context));
+		registerVirtualEditor(VIRTUAL_BINDING_TABLE, ContextInjectionFactory.make(VBindingTableEditor.class, context));
+		registerVirtualEditor(VIRTUAL_COMMAND, ContextInjectionFactory.make(VCommandEditor.class, context));
+		registerVirtualEditor(VIRTUAL_WINDOWS, ContextInjectionFactory.make(VWindowEditor.class, context));
+		registerVirtualEditor(VIRTUAL_WINDOW_CONTROLS, ContextInjectionFactory.make(VWindowControlEditor.class, context));
+		registerVirtualEditor(VIRTUAL_PART_DESCRIPTORS, ContextInjectionFactory.make(VPartDescriptor.class, context));
+		registerVirtualEditor(VIRTUAL_PARTDESCRIPTOR_MENU, ContextInjectionFactory.make(VPartDescriptorMenuEditor.class, context));
+		registerVirtualEditor(VIRTUAL_TRIMMED_WINDOW_TRIMS, ContextInjectionFactory.make(VWindowTrimEditor.class, context));
+		registerVirtualEditor(VIRTUAL_ADDONS, ContextInjectionFactory.make(VApplicationAddons.class, context));
+		registerVirtualEditor(VIRTUAL_MENU_CONTRIBUTIONS, ContextInjectionFactory.make(VMenuContributionsEditor.class, context));
+		registerVirtualEditor(VIRTUAL_TOOLBAR_CONTRIBUTIONS, ContextInjectionFactory.make(VToolBarContributionsEditor.class, context));
+		registerVirtualEditor(VIRTUAL_TRIM_CONTRIBUTIONS, ContextInjectionFactory.make(VTrimContributionsEditor.class, context));
+		registerVirtualEditor(VIRTUAL_WINDOW_SHARED_ELEMENTS, ContextInjectionFactory.make(VWindowSharedElementsEditor.class, context));
+		registerVirtualEditor(VIRTUAL_MODEL_FRAGEMENTS, ContextInjectionFactory.make(VModelFragmentsEditor.class, context));
+		registerVirtualEditor(VIRTUAL_MODEL_IMPORTS, ContextInjectionFactory.make(VModelImportsEditor.class, context));
+		registerVirtualEditor(VIRTUAL_CATEGORIES, ContextInjectionFactory.make(VApplicationCategoriesEditor.class, context));
+		registerVirtualEditor(VIRTUAL_PARAMETERS, ContextInjectionFactory.make(VItemParametersEditor.class, context));
+		registerVirtualEditor(VIRTUAL_ROOT_CONTEXTS, ContextInjectionFactory.make(VRootBindingContexts.class, context));
 	}
 
 	private void registerVirtualEditor(String id, AbstractComponentEditor editor) {
@@ -643,55 +749,57 @@ private void registerContributedEditors() {
 	}
 
 	private void registerDefaultEditors() {
-		registerEditor(ApplicationPackageImpl.Literals.APPLICATION, new ApplicationEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerEditor(ApplicationPackageImpl.Literals.ADDON, new AddonsEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
-
-		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING, new KeyBindingEditor(modelProvider.getEditingDomain(), this, modelProvider, resourcePool));
-		registerEditor(CommandsPackageImpl.Literals.HANDLER, new HandlerEditor(modelProvider.getEditingDomain(), this, modelProvider, project, resourcePool));
-		registerEditor(CommandsPackageImpl.Literals.COMMAND, new CommandEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerEditor(CommandsPackageImpl.Literals.COMMAND_PARAMETER, new CommandParameterEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerEditor(CommandsPackageImpl.Literals.PARAMETER, new ParameterEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerEditor(CommandsPackageImpl.Literals.BINDING_TABLE, new BindingTableEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerEditor(CommandsPackageImpl.Literals.BINDING_CONTEXT, new BindingContextEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerEditor(CommandsPackageImpl.Literals.CATEGORY, new CategoryEditor(modelProvider.getEditingDomain(), this, resourcePool));
-
-		registerEditor(MenuPackageImpl.Literals.TOOL_BAR, new ToolBarEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerEditor(MenuPackageImpl.Literals.RENDERED_TOOL_BAR, new RenderedToolBarEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerEditor(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, new DirectToolItemEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
-		registerEditor(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, new HandledToolItemEditor(modelProvider.getEditingDomain(), this, project, modelProvider, resourcePool));
-		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, new ToolBarSeparatorEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerEditor(MenuPackageImpl.Literals.TOOL_CONTROL, new ToolControlEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
-
-		registerEditor(MenuPackageImpl.Literals.MENU, new MenuEditor(modelProvider.getEditingDomain(), project, this, resourcePool));
-		registerEditor(MenuPackageImpl.Literals.RENDERED_MENU, new RenderedMenuEditor(modelProvider.getEditingDomain(), project, this, resourcePool));
-		registerEditor(MenuPackageImpl.Literals.POPUP_MENU, new PopupMenuEditor(modelProvider.getEditingDomain(), project, this, resourcePool));
-		registerEditor(MenuPackageImpl.Literals.MENU_SEPARATOR, new MenuSeparatorEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, new HandledMenuItemEditor(modelProvider.getEditingDomain(), this, project, modelProvider, resourcePool));
-		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, new DirectMenuItemEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
-		registerEditor(MenuPackageImpl.Literals.RENDERED_MENU_ITEM, new RenderedMenuItem(modelProvider.getEditingDomain(), this, project, resourcePool));
-		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION, new MenuContributionEditor(modelProvider.getEditingDomain(), project, this, resourcePool));
-		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION, new ToolBarContributionEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION, new TrimContributionEditor(modelProvider.getEditingDomain(), this, resourcePool));
-
-		registerEditor(UiPackageImpl.Literals.CORE_EXPRESSION, new CoreExpressionEditor(modelProvider.getEditingDomain(), this, resourcePool));
-
-		registerEditor(BasicPackageImpl.Literals.PART, new PartEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
-		registerEditor(BasicPackageImpl.Literals.WINDOW, new WindowEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
-		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW, new TrimmedWindowEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
-		registerEditor(BasicPackageImpl.Literals.PART_SASH_CONTAINER, new PartSashContainerEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerEditor(AdvancedPackageImpl.Literals.AREA, new AreaEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
-		registerEditor(BasicPackageImpl.Literals.PART_STACK, new PartStackEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerEditor(BasicPackageImpl.Literals.INPUT_PART, new InputPartEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
-		registerEditor(BasicPackageImpl.Literals.TRIM_BAR, new TrimBarEditor(modelProvider.getEditingDomain(), this, resourcePool));
-
-		registerEditor(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR, new PartDescriptorEditor(modelProvider.getEditingDomain(), this, project, resourcePool));
-
-		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, new PerspectiveStackEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE, new PerspectiveEditor(modelProvider.getEditingDomain(), project, this, resourcePool));
-		registerEditor(AdvancedPackageImpl.Literals.PLACEHOLDER, new PlaceholderEditor(modelProvider.getEditingDomain(), this, modelProvider, resourcePool));
-
-		registerEditor(FragmentPackageImpl.Literals.MODEL_FRAGMENTS, new ModelFragmentsEditor(modelProvider.getEditingDomain(), this, resourcePool));
-		registerEditor(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT, new StringModelFragment(modelProvider.getEditingDomain(), this, resourcePool));
+		System.err.println(resourcePool);
+
+		registerEditor(ApplicationPackageImpl.Literals.APPLICATION, ContextInjectionFactory.make(ApplicationEditor.class, context));
+		registerEditor(ApplicationPackageImpl.Literals.ADDON, ContextInjectionFactory.make(AddonsEditor.class, context));
+
+		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING, ContextInjectionFactory.make(KeyBindingEditor.class, context));
+		registerEditor(CommandsPackageImpl.Literals.HANDLER, ContextInjectionFactory.make(HandlerEditor.class, context));
+		registerEditor(CommandsPackageImpl.Literals.COMMAND, ContextInjectionFactory.make(CommandEditor.class, context));
+		registerEditor(CommandsPackageImpl.Literals.COMMAND_PARAMETER, ContextInjectionFactory.make(CommandParameterEditor.class, context));
+		registerEditor(CommandsPackageImpl.Literals.PARAMETER, ContextInjectionFactory.make(ParameterEditor.class, context));
+		registerEditor(CommandsPackageImpl.Literals.BINDING_TABLE, ContextInjectionFactory.make(BindingTableEditor.class, context));
+		registerEditor(CommandsPackageImpl.Literals.BINDING_CONTEXT, ContextInjectionFactory.make(BindingContextEditor.class, context));
+		registerEditor(CommandsPackageImpl.Literals.CATEGORY, ContextInjectionFactory.make(CategoryEditor.class, context));
+
+		registerEditor(MenuPackageImpl.Literals.TOOL_BAR, ContextInjectionFactory.make(ToolBarEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.RENDERED_TOOL_BAR, ContextInjectionFactory.make(RenderedToolBarEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, ContextInjectionFactory.make(DirectToolItemEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, ContextInjectionFactory.make(HandledToolItemEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, ContextInjectionFactory.make(ToolBarSeparatorEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.TOOL_CONTROL, ContextInjectionFactory.make(ToolControlEditor.class, context));
+
+		registerEditor(MenuPackageImpl.Literals.MENU, ContextInjectionFactory.make(MenuEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.RENDERED_MENU, ContextInjectionFactory.make(RenderedMenuEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.POPUP_MENU, ContextInjectionFactory.make(PopupMenuEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.MENU_SEPARATOR, ContextInjectionFactory.make(MenuSeparatorEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, ContextInjectionFactory.make(HandledMenuItemEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, ContextInjectionFactory.make(DirectMenuItemEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.RENDERED_MENU_ITEM, ContextInjectionFactory.make(RenderedMenuItem.class, context));
+		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION, ContextInjectionFactory.make(MenuContributionEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION, ContextInjectionFactory.make(ToolBarContributionEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION, ContextInjectionFactory.make(TrimContributionEditor.class, context));
+
+		registerEditor(UiPackageImpl.Literals.CORE_EXPRESSION, ContextInjectionFactory.make(CoreExpressionEditor.class, context));
+
+		registerEditor(BasicPackageImpl.Literals.PART, ContextInjectionFactory.make(PartEditor.class, context));
+		registerEditor(BasicPackageImpl.Literals.WINDOW, ContextInjectionFactory.make(WindowEditor.class, context));
+		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW, ContextInjectionFactory.make(TrimmedWindowEditor.class, context));
+		registerEditor(BasicPackageImpl.Literals.PART_SASH_CONTAINER, ContextInjectionFactory.make(PartSashContainerEditor.class, context));
+		registerEditor(AdvancedPackageImpl.Literals.AREA, ContextInjectionFactory.make(AreaEditor.class, context));
+		registerEditor(BasicPackageImpl.Literals.PART_STACK, ContextInjectionFactory.make(PartStackEditor.class, context));
+		registerEditor(BasicPackageImpl.Literals.INPUT_PART, ContextInjectionFactory.make(InputPartEditor.class, context));
+		registerEditor(BasicPackageImpl.Literals.TRIM_BAR, ContextInjectionFactory.make(TrimBarEditor.class, context));
+
+		registerEditor(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR, ContextInjectionFactory.make(PartDescriptorEditor.class, context));
+
+		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, ContextInjectionFactory.make(PerspectiveStackEditor.class, context));
+		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE, ContextInjectionFactory.make(PerspectiveEditor.class, context));
+		registerEditor(AdvancedPackageImpl.Literals.PLACEHOLDER, ContextInjectionFactory.make(PlaceholderEditor.class, context));
+
+		registerEditor(FragmentPackageImpl.Literals.MODEL_FRAGMENTS, ContextInjectionFactory.make(ModelFragmentsEditor.class, context));
+		registerEditor(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT, ContextInjectionFactory.make(StringModelFragment.class, context));
 	}
 
 	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index eda867614a..6a88ffcdac 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -10,27 +10,25 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -50,12 +48,16 @@
 public class AddonsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
+
+	@Inject
+	@Optional
 	private IProject project;
+
 	private EStackLayout stackLayout;
 
-	public AddonsEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
-		this.project = project;
+	@Inject
+	public AddonsEditor() {
+		super();
 	}
 
 	@Override
@@ -128,7 +130,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		}
 
 		if (getEditor().isModelFragment() && isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -174,14 +176,14 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
 		}
 
-		ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, Messages.AddonsEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.AddonsEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 6ad610e85e..7f73e005fc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -10,15 +10,14 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -29,7 +28,6 @@
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -59,8 +57,9 @@ public class ApplicationEditor extends AbstractComponentEditor {
 
 	private IListProperty BINDING_TABLE_CONTAINER__ROOT_CONTEXT = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT);
 
-	public ApplicationEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public ApplicationEditor() {
+		super();
 	}
 
 	@Override
@@ -125,8 +124,8 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, Messages.ApplicationEditor_BindingContexts, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ApplicationEditor_BindingContexts, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 955b3875ea..2f3af7ca9d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -11,20 +11,19 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.List;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AreaIconDialogEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -47,7 +46,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
@@ -79,11 +77,14 @@ public class AreaEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
+
+	@Inject
+	@Optional
 	private IProject project;
 
-	public AreaEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
-		this.project = project;
+	@Inject
+	public AreaEditor() {
+		super();
 	}
 
 	@Override
@@ -166,7 +167,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -197,7 +198,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-			new ImageTooltip(t) {
+			new ImageTooltip(t, Messages) {
 
 				@Override
 				protected URI getImageURI() {
@@ -217,7 +218,7 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					AreaIconDialogEditor dialog = new AreaIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPart) getMaster().getValue());
+					AreaIconDialogEditor dialog = new AreaIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPart) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -271,7 +272,7 @@ public String getText(Object element) {
 			viewer.getControl().setLayoutData(gd);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
@@ -389,7 +390,7 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 045adbec06..86b346b413 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -12,17 +12,16 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MBindingContext;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
@@ -36,7 +35,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -65,8 +63,13 @@ public class BindingContextEditor extends AbstractComponentEditor {
 
 	private List<Action> actions = new ArrayList<Action>();
 
-	public BindingContextEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public BindingContextEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.BindingContextEditor_AddContext, createImageDescriptor(ResourceProvider.IMG_BindingContext)) {
 			@Override
 			public void run() {
@@ -147,7 +150,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -166,7 +169,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.heightHint = 300;
 		viewer.getControl().setLayoutData(gd);
-		viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+		viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 		IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
 		viewer.setInput(prop.observeDetail(master));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index ecb550e6ff..c389c96153 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -12,18 +12,17 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BindingContextSelectionDialog;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MBindingTable;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
@@ -40,7 +39,6 @@
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -70,8 +68,13 @@ public class BindingTableEditor extends AbstractComponentEditor {
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public BindingTableEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public BindingTableEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.BindingTableEditor_AddKeyBinding, createImageDescriptor(ResourceProvider.IMG_KeyBinding)) {
 			@Override
 			public void run() {
@@ -141,7 +144,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		}
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -173,7 +176,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(b.getShell(), getEditor().getModelProvider());
+					BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(b.getShell(), getEditor().getModelProvider(), Messages);
 					if (dialog.open() == BindingContextSelectionDialog.OK) {
 						Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID, dialog.getSelectedId());
 						if (cmd.canExecute()) {
@@ -196,7 +199,7 @@ public void widgetSelected(SelectionEvent e) {
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			IEMFListProperty prop = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
 			viewer.setInput(prop.observeDetail(getMaster()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index 71904eb140..b6e35c248e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -10,21 +10,18 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -40,8 +37,9 @@ public class CategoryEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private EStackLayout stackLayout;
 
-	public CategoryEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public CategoryEditor() {
+		super();
 	}
 
 	@Override
@@ -110,7 +108,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		}
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 
 			return parent;
 		}
@@ -118,7 +116,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.CategoryEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__NAME));
 		ControlFactory.createTextField(parent, Messages.CategoryEditor_Description, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__DESCRIPTION));
-		ControlFactory.createStringListWidget(parent, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index c4d4ddf397..a49e84e3bf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -12,17 +12,16 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.CommandCategorySelectionDialog;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.MCommandParameter;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
@@ -37,7 +36,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -67,8 +65,13 @@ public class CommandEditor extends AbstractComponentEditor {
 
 	private IEMFEditListProperty COMMAND__PARAMETERS = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
 
-	public CommandEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public CommandEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.CommandEditor_AddCommandParameter, createImageDescriptor(ResourceProvider.IMG_CommandParameter)) {
 			@Override
 			public void run() {
@@ -138,7 +141,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		}
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 
 			return parent;
 		}
@@ -201,7 +204,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					CommandCategorySelectionDialog dialog = new CommandCategorySelectionDialog(b.getShell(), getEditor().getModelProvider(), (MCommand) getMaster().getValue());
+					CommandCategorySelectionDialog dialog = new CommandCategorySelectionDialog(b.getShell(), getEditor().getModelProvider(), (MCommand) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -216,7 +219,7 @@ public void widgetSelected(SelectionEvent e) {
 			final TableViewer viewer = new TableViewer(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.BORDER);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 120;
@@ -317,7 +320,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 1a79f32a0f..351ed51b7d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -10,15 +10,13 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MCommandParameter;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -26,7 +24,6 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -45,8 +42,9 @@ public class CommandParameterEditor extends AbstractComponentEditor {
 
 	private EStackLayout stackLayout;
 
-	public CommandParameterEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public CommandParameterEditor() {
+		super();
 	}
 
 	@Override
@@ -121,7 +119,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index b5c73a2836..c14d9ce8ac 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -80,7 +80,7 @@
 public class ControlFactory {
 	public static void createXMIId(Composite parent, AbstractComponentEditor editor) {
 		Label l = new Label(parent, SWT.NONE);
-		l.setText("XMI:ID");
+		l.setText("XMI:ID"); //$NON-NLS-1$
 		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		final Text t = new Text(parent, SWT.BORDER);
@@ -106,7 +106,7 @@ public void handleValueChange(ValueChangeEvent event) {
 		});
 	}
 
-	public static void createMapProperties(Composite parent, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
+	public static void createMapProperties(Composite parent, final Messages Messages, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
 		GridData gd = new GridData(GridData.END, GridData.BEGINNING, false, false);
@@ -273,7 +273,7 @@ public static void createTextField(Composite parent, String label, IObservableVa
 
 	}
 
-	public static void createFindImport(Composite parent, final AbstractComponentEditor editor, EMFDataBindingContext context) {
+	public static void createFindImport(Composite parent, final Messages Messages, final AbstractComponentEditor editor, EMFDataBindingContext context) {
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		Label l = new Label(parent, SWT.NONE);
@@ -291,7 +291,7 @@ public static void createFindImport(Composite parent, final AbstractComponentEdi
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				FindImportElementDialog dialog = new FindImportElementDialog(b.getShell(), editor, (EObject) editor.getMaster().getValue());
+				FindImportElementDialog dialog = new FindImportElementDialog(b.getShell(), editor, (EObject) editor.getMaster().getValue(), Messages);
 				dialog.open();
 			}
 		});
@@ -363,7 +363,7 @@ public void handleValueChange(ValueChangeEvent event) {
 		});
 	}
 
-	public static void createStringListWidget(Composite parent, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
+	public static void createStringListWidget(Composite parent, Messages Messages, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
 		GridData gd = new GridData(GridData.END, GridData.BEGINNING, false, false);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index dc0d852e29..7834e8d631 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -10,19 +10,16 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ExpressionIdDialog;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.MCoreExpression;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -42,8 +39,9 @@ public class CoreExpressionEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	public CoreExpressionEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public CoreExpressionEditor() {
+		super();
 	}
 
 	@Override
@@ -111,7 +109,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 				b.addSelectionListener(new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
-						ExpressionIdDialog dialog = new ExpressionIdDialog(t.getShell(), getEditor().getExtensionLookup(), (MCoreExpression) getMaster().getValue(), getEditingDomain(), getEditor().isLiveModel());
+						ExpressionIdDialog dialog = new ExpressionIdDialog(t.getShell(), getEditor().getExtensionLookup(), (MCoreExpression) getMaster().getValue(), getEditingDomain(), getEditor().isLiveModel(), Messages);
 						dialog.open();
 					}
 				});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index d5933aa989..411a15775d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -17,15 +18,11 @@
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -36,7 +33,6 @@
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -54,8 +50,9 @@
 public class DirectMenuItemEditor extends MenuItemEditor {
 	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
-	public DirectMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
-		super(editingDomain, editor, project, resourcePool);
+	@Inject
+	public DirectMenuItemEditor() {
+		super();
 	}
 
 	@Override
@@ -117,7 +114,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index f5dc180f52..f435c895f6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -17,15 +18,11 @@
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -36,7 +33,6 @@
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -54,8 +50,9 @@
 public class DirectToolItemEditor extends ToolItemEditor {
 	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
-	public DirectToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
-		super(editingDomain, editor, project, resourcePool);
+	@Inject
+	public DirectToolItemEditor() {
+		super();
 	}
 
 	@Override
@@ -105,7 +102,7 @@ public void widgetSelected(SelectionEvent e) {
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
+				ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 				dialog.open();
 			}
 		});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index d320108383..f7e952a3bf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -10,21 +10,19 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledMenuItemCommandSelectionDialog;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -36,7 +34,6 @@
 import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -51,14 +48,16 @@
 import org.eclipse.swt.widgets.Text;
 
 public class HandledMenuItemEditor extends MenuItemEditor {
-	private IModelResource resource;
 
 	private IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
 	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
-	public HandledMenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IModelResource resource, IResourcePool resourcePool) {
-		super(editingDomain, editor, project, resourcePool);
-		this.resource = resource;
+	@Inject
+	private IModelResource resource;
+
+	@Inject
+	public HandledMenuItemEditor() {
+		super();
 	}
 
 	@Override
@@ -98,7 +97,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND).observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND).observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter(Messages)));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -107,7 +106,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					HandledMenuItemCommandSelectionDialog dialog = new HandledMenuItemCommandSelectionDialog(b.getShell(), (MHandledItem) getMaster().getValue(), resource);
+					HandledMenuItemCommandSelectionDialog dialog = new HandledMenuItemCommandSelectionDialog(b.getShell(), (MHandledItem) getMaster().getValue(), resource, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 61c4cdca91..2044e0708a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -10,21 +10,19 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledToolItemCommandSelectionDialog;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -36,7 +34,6 @@
 import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -51,14 +48,16 @@
 import org.eclipse.swt.widgets.Text;
 
 public class HandledToolItemEditor extends ToolItemEditor {
-	private IModelResource resource;
 
 	private IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
 	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
-	public HandledToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IModelResource resource, IResourcePool resourcePool) {
-		super(editingDomain, editor, project, resourcePool);
-		this.resource = resource;
+	@Inject
+	private IModelResource resource;
+
+	@Inject
+	public HandledToolItemEditor() {
+		super();
 	}
 
 	@Override
@@ -87,7 +86,7 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND).observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND).observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter(Messages)));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -96,7 +95,7 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					HandledToolItemCommandSelectionDialog dialog = new HandledToolItemCommandSelectionDialog(b.getShell(), (MHandledItem) getMaster().getValue(), resource);
+					HandledToolItemCommandSelectionDialog dialog = new HandledToolItemCommandSelectionDialog(b.getShell(), (MHandledItem) getMaster().getValue(), resource, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index dc65799b46..6130636cce 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -10,11 +10,13 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
 import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
@@ -22,12 +24,9 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandlerCommandSelectionDialog;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
@@ -36,7 +35,6 @@
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -56,14 +54,18 @@
 public class HandlerEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
+	private EStackLayout stackLayout;
+
+	@Inject
 	private IModelResource resource;
+
+	@Inject
+	@Optional
 	private IProject project;
-	private EStackLayout stackLayout;
 
-	public HandlerEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource, IProject project, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
-		this.resource = resource;
-		this.project = project;
+	@Inject
+	public HandlerEditor() {
+		super();
 	}
 
 	@Override
@@ -127,7 +129,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		}
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -153,7 +155,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.HANDLER__COMMAND).observeDetail(getMaster()), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.HANDLER__COMMAND).observeDetail(getMaster()), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter(Messages)));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -162,7 +164,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					HandlerCommandSelectionDialog dialog = new HandlerCommandSelectionDialog(b.getShell(), (MHandler) getMaster().getValue(), resource);
+					HandlerCommandSelectionDialog dialog = new HandlerCommandSelectionDialog(b.getShell(), (MHandler) getMaster().getValue(), resource, Messages);
 					dialog.open();
 				}
 			});
@@ -199,13 +201,13 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
 		}
-		ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
index 6cc41e1778..0ae5765a7b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
@@ -10,15 +10,12 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -29,8 +26,9 @@
 
 public class InputPartEditor extends PartEditor {
 
-	public InputPartEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
-		super(editingDomain, editor, project, resourcePool);
+	@Inject
+	public InputPartEditor() {
+		super();
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 30f7dc44fc..1b31435d51 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -12,6 +12,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -24,12 +26,9 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.KeyBindingCommandSelectionDialog;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
 import org.eclipse.e4.ui.model.application.commands.MKeySequence;
@@ -45,7 +44,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.bindings.keys.KeySequence;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -71,15 +69,21 @@ public class KeyBindingEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private IModelResource resource;
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
 	private IEMFEditListProperty KEY_BINDING__PARAMETERS = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS);
 
-	public KeyBindingEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
-		this.resource = resource;
+	@Inject
+	private IModelResource resource;
+
+	@Inject
+	public KeyBindingEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.KeyBindingEditor_AddParameter, createImageDescriptor(ResourceProvider.IMG_Parameter)) {
 			@Override
 			public void run() {
@@ -149,7 +153,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -189,7 +193,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__COMMAND).observeDetail(getMaster()), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__COMMAND).observeDetail(getMaster()), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter(Messages)));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -198,7 +202,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					KeyBindingCommandSelectionDialog dialog = new KeyBindingCommandSelectionDialog(b.getShell(), (MKeyBinding) getMaster().getValue(), resource);
+					KeyBindingCommandSelectionDialog dialog = new KeyBindingCommandSelectionDialog(b.getShell(), (MKeyBinding) getMaster().getValue(), resource, Messages);
 					dialog.open();
 				}
 			});
@@ -211,7 +215,7 @@ public void widgetSelected(SelectionEvent e) {
 		final TableViewer viewer = new TableViewer(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.BORDER);
 		ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
-		viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+		viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.heightHint = 120;
@@ -312,7 +316,7 @@ public void widgetSelected(SelectionEvent e) {
 		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index f244a12110..b0eea46bde 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -11,18 +11,15 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.List;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -40,7 +37,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -82,8 +78,9 @@ public Struct(String label, EClass eClass, boolean separator) {
 		}
 	}
 
-	public MenuContributionEditor(EditingDomain editingDomain, IProject project, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public MenuContributionEditor() {
+		super();
 	}
 
 	@Override
@@ -160,7 +157,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -214,7 +211,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
@@ -339,7 +336,7 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
 		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index bb88a0df90..90e6eda011 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -12,6 +12,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IListChangeListener;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -23,18 +25,16 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EClass2EObject;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EObject2EClass;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MExpression;
@@ -58,7 +58,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -87,13 +86,16 @@ public class MenuEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private IProject project;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
+	@Inject
+	@Optional
+	private IProject project;
+
 	private static class Struct {
 		private final String label;
 		private final EClass eClass;
@@ -106,9 +108,13 @@ public Struct(String label, EClass eClass, boolean separator) {
 		}
 	}
 
-	public MenuEditor(EditingDomain editingDomain, IProject project, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
-		this.project = project;
+	@Inject
+	public MenuEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.MenuEditor_AddHandledMenuItem, createImageDescriptor(ResourceProvider.IMG_MenuItem)) {
 			@Override
 			public void run() {
@@ -200,7 +206,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -257,7 +263,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
@@ -389,7 +395,7 @@ public void widgetSelected(SelectionEvent e) {
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-			new ImageTooltip(t) {
+			new ImageTooltip(t, Messages) {
 
 				@Override
 				protected URI getImageURI() {
@@ -409,7 +415,7 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MenuIconDialogEditor dialog = new MenuIconDialogEditor(b.getShell(), project, getEditingDomain(), (MMenu) getMaster().getValue());
+					MenuIconDialogEditor dialog = new MenuIconDialogEditor(b.getShell(), project, getEditingDomain(), (MMenu) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -439,13 +445,13 @@ public String getText(Object element) {
 			list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
 			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
 			combo.setInput(list);
-			context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject()), new UpdateValueStrategy().setConverter(new EObject2EClass()));
+			context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)), new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index b3f2a1000a..251fda8fef 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -12,21 +12,21 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuItemIconDialogEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
@@ -41,7 +41,6 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
@@ -65,12 +64,15 @@ public abstract class MenuItemEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-	protected IProject project;
+
 	private EStackLayout stackLayout;
 
-	public MenuItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
-		this.project = project;
+	@Inject
+	@Optional
+	protected IProject project;
+
+	public MenuItemEditor() {
+		super();
 	}
 
 	@Override
@@ -134,7 +136,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -220,7 +222,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-			new ImageTooltip(t) {
+			new ImageTooltip(t, Messages) {
 
 				@Override
 				protected URI getImageURI() {
@@ -240,7 +242,7 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MenuItemIconDialogEditor dialog = new MenuItemIconDialogEditor(b.getShell(), project, getEditingDomain(), (MMenuItem) getMaster().getValue());
+					MenuItemIconDialogEditor dialog = new MenuItemIconDialogEditor(b.getShell(), project, getEditingDomain(), (MMenuItem) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -308,7 +310,7 @@ public String getText(Object element) {
 			list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
 			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
 			combo.setInput(list);
-			context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject()), new UpdateValueStrategy().setConverter(new EObject2EClass()));
+			context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)), new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
 		}
 
 		createFormSubTypeForm(parent, context, master);
@@ -316,7 +318,7 @@ public String getText(Object element) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
@@ -343,8 +345,11 @@ public FeaturePath[] getLabelProperties() {
 	}
 
 	static class EObject2EClass extends Converter {
-		public EObject2EClass() {
+		Messages Messages;
+
+		public EObject2EClass(Messages Messages) {
 			super(EObject.class, EClass.class);
+			this.Messages = Messages;
 		}
 
 		public Object convert(Object fromObject) {
@@ -356,9 +361,11 @@ public Object convert(Object fromObject) {
 	}
 
 	static class EClass2EObject extends Converter {
+		Messages Messages;
 
-		public EClass2EObject() {
+		public EClass2EObject(Messages Messages) {
 			super(EClass.class, EObject.class);
+			this.Messages = Messages;
 		}
 
 		public Object convert(Object fromObject) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 34356ca83e..0ac8e5e11c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -10,21 +10,18 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -42,8 +39,9 @@ public class MenuSeparatorEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private EStackLayout stackLayout;
 
-	public MenuSeparatorEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public MenuSeparatorEditor() {
+		super();
 	}
 
 	@Override
@@ -112,7 +110,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -134,7 +132,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
 		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index 7cb41fd053..2ee762c4ec 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -12,17 +12,16 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
 import org.eclipse.e4.ui.model.fragment.MModelFragment;
@@ -39,7 +38,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
@@ -67,8 +65,9 @@ public class ModelFragmentsEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 
-	public ModelFragmentsEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public ModelFragmentsEditor() {
+		super();
 	}
 
 	@Override
@@ -112,7 +111,7 @@ private Composite createForm(Composite parent) {
 
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 200;
 			viewer.getControl().setLayoutData(gd);
@@ -253,7 +252,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 200;
 			viewer.getControl().setLayoutData(gd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index f40fb4c319..22e06e5183 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -10,22 +10,19 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -41,8 +38,9 @@ public class ParameterEditor extends AbstractComponentEditor {
 
 	private EStackLayout stackLayout;
 
-	public ParameterEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public ParameterEditor() {
+		super();
 	}
 
 	@Override
@@ -117,7 +115,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 217a36fdd3..d78611042d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -22,13 +23,11 @@
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartDescriptorIconDialogEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
@@ -46,7 +45,6 @@
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -74,9 +72,9 @@ public class PartDescriptorEditor extends AbstractComponentEditor {
 	private Button createRemoveToolBar;
 	private EStackLayout stackLayout;
 
-	public PartDescriptorEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
-		this.project = project;
+	@Inject
+	public PartDescriptorEditor() {
+		super();
 	}
 
 	@Override
@@ -144,7 +142,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -197,7 +195,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-			new ImageTooltip(t) {
+			new ImageTooltip(t, Messages) {
 
 				@Override
 				protected URI getImageURI() {
@@ -217,7 +215,7 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					PartDescriptorIconDialogEditor dialog = new PartDescriptorIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPartDescriptor) getMaster().getValue());
+					PartDescriptorIconDialogEditor dialog = new PartDescriptorIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -240,7 +238,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
@@ -336,7 +334,7 @@ public void widgetSelected(SelectionEvent e) {
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CATEGORY).observeDetail(master));
 		}
 
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index e2306ba70c..af1321b106 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -20,19 +21,18 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -51,7 +51,6 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -72,7 +71,6 @@ public class PartEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private IProject project;
 
 	private IListProperty PART__MENUS = EMFProperties.list(BasicPackageImpl.Literals.PART__MENUS);
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
@@ -80,9 +78,13 @@ public class PartEditor extends AbstractComponentEditor {
 	private Button createRemoveToolBar;
 	private EStackLayout stackLayout;
 
-	public PartEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
-		this.project = project;
+	@Inject
+	@Optional
+	private IProject project;
+
+	@Inject
+	public PartEditor() {
+		super();
 	}
 
 	@Override
@@ -159,7 +161,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -178,7 +180,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-			new ImageTooltip(t) {
+			new ImageTooltip(t, Messages) {
 
 				@Override
 				protected URI getImageURI() {
@@ -198,7 +200,7 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPart) getMaster().getValue());
+					PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPart) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -235,7 +237,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
@@ -272,11 +274,11 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, Messages.PartEditor_BindingContexts, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.PartEditor_BindingContexts, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 370b4e0580..29912ff150 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -12,17 +12,16 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -41,7 +40,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -76,8 +74,13 @@ public class PartSashContainerEditor extends AbstractComponentEditor {
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public PartSashContainerEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public PartSashContainerEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.PartSashContainerEditor_AddPartSashContainer, createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
 			@Override
 			public void run() {
@@ -196,7 +199,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -263,7 +266,7 @@ public String getText(Object element) {
 			viewer.getControl().setLayoutData(gd);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
@@ -373,7 +376,7 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 06af6efb0c..9830102cea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -12,17 +12,16 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -40,7 +39,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -74,8 +72,13 @@ public class PartStackEditor extends AbstractComponentEditor {
 	private StackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public PartStackEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public PartStackEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.PartStackEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
@@ -165,7 +168,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -207,7 +210,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
@@ -318,7 +321,7 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 3bc04732ce..fe375de2a1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -12,20 +12,20 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PerspectiveIconDialogEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -46,7 +46,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -73,15 +72,22 @@
 public class PerspectiveEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private IProject project;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public PerspectiveEditor(EditingDomain editingDomain, IProject project, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
-		this.project = project;
+	@Inject
+	@Optional
+	private IProject project;
+
+	@Inject
+	public PerspectiveEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.PerspectiveEditor_AddPartSashContainer, createImageDescriptor(ResourceProvider.IMG_Perspective)) {
 			@Override
 			public void run() {
@@ -205,7 +211,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -262,7 +268,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-			new ImageTooltip(t) {
+			new ImageTooltip(t, Messages) {
 
 				@Override
 				protected URI getImageURI() {
@@ -280,7 +286,7 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					PerspectiveIconDialogEditor dialog = new PerspectiveIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPerspective) getMaster().getValue());
+					PerspectiveIconDialogEditor dialog = new PerspectiveIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPerspective) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -297,7 +303,7 @@ public void widgetSelected(SelectionEvent e) {
 			viewer.getControl().setLayoutData(gd);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
@@ -407,9 +413,9 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 711b3d32ad..164d4c93d8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -12,17 +12,16 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -38,7 +37,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -67,8 +65,13 @@ public class PerspectiveStackEditor extends AbstractComponentEditor {
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public PerspectiveStackEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public PerspectiveStackEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.PerspectiveStackEditor_AddPerspective, createImageDescriptor(ResourceProvider.IMG_Perspective)) {
 			@Override
 			public void run() {
@@ -152,7 +155,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -181,7 +184,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
@@ -279,7 +282,7 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 89e18c96ec..ab49f99d0b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -18,11 +19,8 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.SharedElementsDialog;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
@@ -32,7 +30,6 @@
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -51,12 +48,14 @@
 public class PlaceholderEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private IModelResource resource;
 	private EStackLayout stackLayout;
 
-	public PlaceholderEditor(EditingDomain editingDomain, ModelEditor editor, IModelResource resource, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
-		this.resource = resource;
+	@Inject
+	private IModelResource resource;
+
+	@Inject
+	public PlaceholderEditor() {
+		super();
 	}
 
 	@Override
@@ -150,7 +149,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -214,14 +213,14 @@ public Object convert(Object fromObject) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					SharedElementsDialog dialog = new SharedElementsDialog(b.getShell(), getEditor(), (MPlaceholder) getMaster().getValue(), resource);
+					SharedElementsDialog dialog = new SharedElementsDialog(b.getShell(), getEditor(), (MPlaceholder) getMaster().getValue(), resource, Messages);
 					dialog.open();
 				}
 			});
 		}
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
index be51647acc..799ea94c98 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
@@ -10,28 +10,25 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Composite;
 
 public class PopupMenuEditor extends MenuEditor {
 
-	public PopupMenuEditor(EditingDomain editingDomain, IProject project, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, project, editor, resourcePool);
+	@Inject
+	public PopupMenuEditor() {
+		super();
 	}
 
 	@Override
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean rootMenu, boolean isImport) {
 		Composite comp = super.createForm(parent, context, master, rootMenu, isImport);
 		if (!isImport) {
-			ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
-			ControlFactory.createStringListWidget(comp, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+			ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+			ControlFactory.createStringListWidget(comp, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		}
 
 		return comp;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java
index 5819befe8b..baf767ff30 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java
@@ -10,16 +10,14 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.core.resources.IProject;
+import javax.inject.Inject;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
-import org.eclipse.emf.edit.domain.EditingDomain;
 
 public class RenderedMenuEditor extends MenuEditor {
 
-	public RenderedMenuEditor(EditingDomain editingDomain, IProject project, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, project, editor, resourcePool);
+	@Inject
+	public RenderedMenuEditor() {
+		super();
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java
index c4c418f850..fdbed724f0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java
@@ -10,19 +10,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Composite;
 
 public class RenderedMenuItem extends MenuItemEditor {
 
-	public RenderedMenuItem(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
-		super(editingDomain, editor, project, resourcePool);
+	@Inject
+	public RenderedMenuItem() {
+		super();
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java
index 70c61e0445..85d96c2378 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java
@@ -10,15 +10,14 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
-import org.eclipse.emf.edit.domain.EditingDomain;
 
 public class RenderedToolBarEditor extends ToolBarEditor {
 
-	public RenderedToolBarEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public RenderedToolBarEditor() {
+		super();
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index f5fd803f6d..f4d76d53cc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -12,18 +12,16 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FeatureSelectionDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindParentReferenceElementDialog;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.fragment.MModelFragment;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
@@ -39,7 +37,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -69,8 +66,9 @@ public class StringModelFragment extends AbstractComponentEditor {
 
 	private IListProperty MODEL_FRAGMENT__ELEMENTS = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
 
-	public StringModelFragment(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public StringModelFragment() {
+		super();
 	}
 
 	@Override
@@ -140,7 +138,7 @@ private Composite createForm(Composite parent) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					FindParentReferenceElementDialog dialog = new FindParentReferenceElementDialog(b.getShell(), StringModelFragment.this, (MStringModelFragment) getMaster().getValue());
+					FindParentReferenceElementDialog dialog = new FindParentReferenceElementDialog(b.getShell(), StringModelFragment.this, (MStringModelFragment) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -171,7 +169,7 @@ public void widgetSelected(SelectionEvent e) {
 			button.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					FeatureSelectionDialog dialog = new FeatureSelectionDialog(button.getShell(), getEditingDomain(), (MStringModelFragment) getMaster().getValue());
+					FeatureSelectionDialog dialog = new FeatureSelectionDialog(button.getShell(), getEditingDomain(), (MStringModelFragment) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -198,7 +196,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index cf841a054f..cd929bf9d1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -11,17 +11,15 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.List;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -39,7 +37,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -81,8 +78,9 @@ public Struct(String label, EClass eClass, boolean separator) {
 		}
 	}
 
-	public ToolBarContributionEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public ToolBarContributionEditor() {
+		super();
 	}
 
 	@Override
@@ -160,7 +158,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -218,7 +216,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 120;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
@@ -340,7 +338,7 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index d4681ecb1b..da90978bef 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -12,17 +12,16 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -40,7 +39,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -85,8 +83,13 @@ public Struct(String label, EClass eClass, boolean separator) {
 		}
 	}
 
-	public ToolBarEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public ToolBarEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.ToolBarEditor_AddHandledToolItem, createImageDescriptor(ResourceProvider.IMG_HandledToolItem)) {
 			@Override
 			public void run() {
@@ -183,7 +186,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -215,7 +218,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 120;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index c5b8969122..cc8876bc20 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -10,15 +10,13 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -26,7 +24,6 @@
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -44,8 +41,9 @@ public class ToolBarSeparatorEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private EStackLayout stackLayout;
 
-	public ToolBarSeparatorEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public ToolBarSeparatorEditor() {
+		super();
 	}
 
 	@Override
@@ -123,7 +121,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -140,9 +138,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 6291b792ed..993a36a269 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -10,17 +10,16 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -29,7 +28,6 @@
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
@@ -48,12 +46,15 @@
 public class ToolControlEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private Composite composite;
-	private IProject project;
 	private EStackLayout stackLayout;
 
-	public ToolControlEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
-		this.project = project;
+	@Inject
+	@Optional
+	private IProject project;
+
+	@Inject
+	public ToolControlEditor() {
+		super();
 	}
 
 	@Override
@@ -132,7 +133,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -168,7 +169,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
@@ -177,8 +178,8 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index f587170bb2..43e56a95e4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -12,21 +12,21 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ToolItemIconDialogEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -40,7 +40,6 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
@@ -61,12 +60,15 @@
 public abstract class ToolItemEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	protected IProject project;
+
 	private EStackLayout stackLayout;
 
-	public ToolItemEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
-		this.project = project;
+	@Inject
+	@Optional
+	protected IProject project;
+
+	public ToolItemEditor() {
+		super();
 	}
 
 	@Override
@@ -115,7 +117,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -185,7 +187,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-			new ImageTooltip(t) {
+			new ImageTooltip(t, Messages) {
 
 				@Override
 				protected URI getImageURI() {
@@ -205,7 +207,7 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ToolItemIconDialogEditor dialog = new ToolItemIconDialogEditor(b.getShell(), project, getEditingDomain(), (MToolItem) getMaster().getValue());
+					ToolItemIconDialogEditor dialog = new ToolItemIconDialogEditor(b.getShell(), project, getEditingDomain(), (MToolItem) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -273,7 +275,7 @@ public String getText(Object element) {
 			list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
 			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
 			combo.setInput(list);
-			context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject()), new UpdateValueStrategy().setConverter(new EObject2EClass()));
+			context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)), new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
 		}
 		// ------------------------------------------------------------
 
@@ -282,7 +284,7 @@ public String getText(Object element) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 	}
 
 	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, WritableValue master) {
@@ -311,8 +313,11 @@ public FeaturePath[] getLabelProperties() {
 	}
 
 	static class EObject2EClass extends Converter {
-		public EObject2EClass() {
+		private Messages Messages;
+
+		public EObject2EClass(Messages Messages) {
 			super(EObject.class, EClass.class);
+			this.Messages = Messages;
 		}
 
 		public Object convert(Object fromObject) {
@@ -324,9 +329,11 @@ public Object convert(Object fromObject) {
 	}
 
 	static class EClass2EObject extends Converter {
+		private Messages Messages;
 
-		public EClass2EObject() {
+		public EClass2EObject(Messages Messages) {
 			super(EClass.class, EObject.class);
+			this.Messages = Messages;
 		}
 
 		public Object convert(Object fromObject) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 18f6768aaa..2fc3431d87 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -12,6 +12,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -19,11 +21,9 @@
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer;
@@ -42,7 +42,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -71,15 +70,21 @@ public class TrimBarEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private ModelEditor editor;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public TrimBarEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
-		this.editor = editor;
+	@Inject
+	private ModelEditor editor;
+
+	@Inject
+	public TrimBarEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.TrimBarEditor_AddToolBar, createImageDescriptor(ResourceProvider.IMG_ToolBar)) {
 			@Override
 			public void run() {
@@ -164,7 +169,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -206,7 +211,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			final TableViewer viewer = new TableViewer(parent);
-			viewer.setLabelProvider(new ComponentLabelProvider(editor));
+			viewer.setLabelProvider(new ComponentLabelProvider(editor, Messages));
 			viewer.setContentProvider(new ObservableListContentProvider());
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
@@ -316,7 +321,7 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index c849e52bb0..42fa30f6a2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -11,17 +11,15 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.List;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -38,7 +36,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -68,8 +65,9 @@ public class TrimContributionEditor extends AbstractComponentEditor {
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
 
-	public TrimContributionEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public TrimContributionEditor() {
+		super();
 	}
 
 	@Override
@@ -147,7 +145,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -199,7 +197,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			final TableViewer viewer = new TableViewer(parent);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 			viewer.setContentProvider(new ObservableListContentProvider());
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
@@ -316,7 +314,7 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
index 4b95783eca..497685d47d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
@@ -10,24 +10,23 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.EditingDomain;
 
 public class TrimmedWindowEditor extends WindowEditor {
 	private IListProperty TRIMMED_WINDOW__TRIM_BARS = EMFProperties.list(BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS);
 
-	public TrimmedWindowEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
-		super(editingDomain, editor, project, resourcePool);
+	@Inject
+	public TrimmedWindowEditor() {
+		super();
 	}
 
 	public IObservableList getChildList(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 0d9bc6da57..31ee67b856 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -12,6 +12,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
@@ -20,16 +22,15 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.WindowIconDialogEditor;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -47,7 +48,6 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -68,7 +68,6 @@ public class WindowEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private IProject project;
 
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IListProperty WINDOW__WINDOWS = EMFProperties.list(BasicPackageImpl.Literals.WINDOW__WINDOWS);
@@ -80,9 +79,17 @@ public class WindowEditor extends AbstractComponentEditor {
 	private Button createRemoveMainMenu;
 	private EStackLayout stackLayout;
 
-	public WindowEditor(EditingDomain editingDomain, ModelEditor editor, IProject project, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
-		this.project = project;
+	@Inject
+	@Optional
+	private IProject project;
+
+	@Inject
+	public WindowEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		addMainMenu = new Action(Messages.WindowEditor_AddMainMenu) {
 			@Override
 			public void run() {
@@ -166,7 +173,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
-			ControlFactory.createFindImport(parent, this, context);
+			ControlFactory.createFindImport(parent, Messages, this, context);
 			return parent;
 		}
 
@@ -273,7 +280,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-			new ImageTooltip(t) {
+			new ImageTooltip(t, Messages) {
 
 				@Override
 				protected URI getImageURI() {
@@ -293,7 +300,7 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					WindowIconDialogEditor dialog = new WindowIconDialogEditor(b.getShell(), project, getEditingDomain(), (MWindow) getMaster().getValue());
+					WindowIconDialogEditor dialog = new WindowIconDialogEditor(b.getShell(), project, getEditingDomain(), (MWindow) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -323,10 +330,10 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.WindowEditor_SelectedElement);
-		ControlFactory.createStringListWidget(parent, this, Messages.WindowEditor_BindingContexts, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.WindowEditor_BindingContexts, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index 9968650d51..b0034d2080 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -51,10 +51,12 @@
 public abstract class AbstractCommandSelectionDialog extends TitleAreaDialog {
 	private IModelResource resource;
 	private TableViewer viewer;
+	protected Messages Messages;
 
-	public AbstractCommandSelectionDialog(Shell parentShell, IModelResource resource) {
+	public AbstractCommandSelectionDialog(Shell parentShell, IModelResource resource, Messages Messages) {
 		super(parentShell);
 		this.resource = resource;
+		this.Messages = Messages;
 	}
 
 	protected abstract String getShellTitle();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
index 3dbefb247f..dfd06994c2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
@@ -64,12 +64,15 @@ public abstract class AbstractIconDialog extends TitleAreaDialog {
 	private EditingDomain editingDomain;
 	private Map<IFile, Image> icons = Collections.synchronizedMap(new HashMap<IFile, Image>());
 
-	public AbstractIconDialog(Shell parentShell, IProject project, EditingDomain editingDomain, MApplicationElement element, EStructuralFeature feature) {
+	protected Messages Messages;
+
+	public AbstractIconDialog(Shell parentShell, IProject project, EditingDomain editingDomain, MApplicationElement element, EStructuralFeature feature, Messages Messages) {
 		super(parentShell);
 		this.editingDomain = editingDomain;
 		this.element = element;
 		this.feature = feature;
 		this.project = project;
+		this.Messages = Messages;
 	}
 
 	protected abstract String getShellTitle();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
index e918099acb..218d564cba 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
@@ -19,8 +19,8 @@
 
 public class AreaIconDialogEditor extends AbstractIconDialog {
 
-	public AreaIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPart element) {
-		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+	public AreaIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPart element, Messages Messages) {
+		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
index 559841a18b..05a63e2378 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
@@ -50,10 +50,12 @@ public class BindingContextSelectionDialog extends TitleAreaDialog {
 	private IModelResource resource;
 	private TableViewer viewer;
 	private String selectedId;
+	private Messages Messages;
 
-	public BindingContextSelectionDialog(Shell parentShell, IModelResource resource) {
+	public BindingContextSelectionDialog(Shell parentShell, IModelResource resource, Messages Messages) {
 		super(parentShell);
 		this.resource = resource;
+		this.Messages = Messages;
 	}
 
 	public String getSelectedId() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
index 4c6d63ed1c..2df3390307 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -53,11 +53,13 @@ public class CommandCategorySelectionDialog extends TitleAreaDialog {
 	private IModelResource resource;
 	private TableViewer viewer;
 	private MCommand command;
+	private Messages Messages;
 
-	public CommandCategorySelectionDialog(Shell parentShell, IModelResource resource, MCommand command) {
+	public CommandCategorySelectionDialog(Shell parentShell, IModelResource resource, MCommand command, Messages Messages) {
 		super(parentShell);
 		this.resource = resource;
 		this.command = command;
+		this.Messages = Messages;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index dc9338fdbd..d7664cf431 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -57,13 +57,15 @@ public class ContributionClassDialog extends TitleAreaDialog {
 	private EditingDomain editingDomain;
 	private TableViewer viewer;
 	private EStructuralFeature feature;
+	private Messages Messages;
 
-	public ContributionClassDialog(Shell parentShell, IProject project, EditingDomain editingDomain, MApplicationElement contribution, EStructuralFeature feature) {
+	public ContributionClassDialog(Shell parentShell, IProject project, EditingDomain editingDomain, MApplicationElement contribution, EStructuralFeature feature, Messages Messages) {
 		super(parentShell);
 		this.project = project;
 		this.contribution = contribution;
 		this.editingDomain = editingDomain;
 		this.feature = feature;
+		this.Messages = Messages;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
index abdeb0b8cf..12eaf29494 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
@@ -52,13 +52,15 @@ public class ExpressionIdDialog extends TitleAreaDialog {
 	private EditingDomain domain;
 	private MCoreExpression expression;
 	private boolean liveModel;
+	private Messages Messages;
 
-	public ExpressionIdDialog(Shell parentShell, IExtensionLookup lookup, MCoreExpression expression, EditingDomain domain, boolean liveModel) {
+	public ExpressionIdDialog(Shell parentShell, IExtensionLookup lookup, MCoreExpression expression, EditingDomain domain, boolean liveModel, Messages Messages) {
 		super(parentShell);
 		this.lookup = lookup;
 		this.expression = expression;
 		this.domain = domain;
 		this.liveModel = liveModel;
+		this.Messages = Messages;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index 2b8028996a..d0cfce3825 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -58,11 +58,13 @@ public class FeatureSelectionDialog extends TitleAreaDialog {
 	private TreeViewer viewer;
 	private MStringModelFragment fragment;
 	private EditingDomain editingDomain;
+	private Messages Messages;
 
-	public FeatureSelectionDialog(Shell parentShell, EditingDomain editingDomain, MStringModelFragment fragment) {
+	public FeatureSelectionDialog(Shell parentShell, EditingDomain editingDomain, MStringModelFragment fragment, Messages Messages) {
 		super(parentShell);
 		this.fragment = fragment;
 		this.editingDomain = editingDomain;
+		this.Messages = Messages;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index f5673911af..1a492b65a5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -57,11 +57,13 @@ public class FindImportElementDialog extends TitleAreaDialog {
 	private EObject element;
 	private AbstractComponentEditor editor;
 	private TableViewer viewer;
+	private Messages Messages;
 
-	public FindImportElementDialog(Shell parentShell, AbstractComponentEditor editor, EObject element) {
+	public FindImportElementDialog(Shell parentShell, AbstractComponentEditor editor, EObject element, Messages Messages) {
 		super(parentShell);
 		this.element = element;
 		this.editor = editor;
+		this.Messages = Messages;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index b6823e6aba..9c0df83089 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -68,11 +68,13 @@ public class FindParentReferenceElementDialog extends TitleAreaDialog {
 	private MStringModelFragment fragment;
 	private AbstractComponentEditor editor;
 	private TableViewer viewer;
+	private Messages Messages;
 
-	public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEditor editor, MStringModelFragment fragment) {
+	public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEditor editor, MStringModelFragment fragment, Messages Messages) {
 		super(parentShell);
 		this.fragment = fragment;
 		this.editor = editor;
+		this.Messages = Messages;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
index 778fb9b94d..a2ae60fe08 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
@@ -23,8 +23,8 @@
 public class HandledMenuItemCommandSelectionDialog extends AbstractCommandSelectionDialog {
 	private MHandledItem handler;
 
-	public HandledMenuItemCommandSelectionDialog(Shell parentShell, MHandledItem handler, IModelResource resource) {
-		super(parentShell, resource);
+	public HandledMenuItemCommandSelectionDialog(Shell parentShell, MHandledItem handler, IModelResource resource, Messages Messages) {
+		super(parentShell, resource, Messages);
 		this.handler = handler;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
index 67b3ebc5ed..48c62637a8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
@@ -23,8 +23,8 @@
 public class HandledToolItemCommandSelectionDialog extends AbstractCommandSelectionDialog {
 	private MHandledItem handler;
 
-	public HandledToolItemCommandSelectionDialog(Shell parentShell, MHandledItem handler, IModelResource resource) {
-		super(parentShell, resource);
+	public HandledToolItemCommandSelectionDialog(Shell parentShell, MHandledItem handler, IModelResource resource, Messages Messages) {
+		super(parentShell, resource, Messages);
 		this.handler = handler;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
index de38caa972..afa6facb4c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
@@ -23,8 +23,8 @@
 public class HandlerCommandSelectionDialog extends AbstractCommandSelectionDialog {
 	private MHandler handler;
 
-	public HandlerCommandSelectionDialog(Shell parentShell, MHandler handler, IModelResource resource) {
-		super(parentShell, resource);
+	public HandlerCommandSelectionDialog(Shell parentShell, MHandler handler, IModelResource resource, Messages Messages) {
+		super(parentShell, resource, Messages);
 		this.handler = handler;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
index a2c1405fc3..18259a9e12 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
@@ -23,8 +23,8 @@
 public class KeyBindingCommandSelectionDialog extends AbstractCommandSelectionDialog {
 	private MKeyBinding binding;
 
-	public KeyBindingCommandSelectionDialog(Shell parentShell, MKeyBinding binding, IModelResource resource) {
-		super(parentShell, resource);
+	public KeyBindingCommandSelectionDialog(Shell parentShell, MKeyBinding binding, IModelResource resource, Messages Messages) {
+		super(parentShell, resource, Messages);
 		this.binding = binding;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
index e27843d1af..3358369558 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
@@ -19,8 +19,8 @@
 
 public class MenuIconDialogEditor extends AbstractIconDialog {
 
-	public MenuIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MMenu element) {
-		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+	public MenuIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MMenu element, Messages Messages) {
+		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
index 9e1812800e..2d5ad184e4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
@@ -19,8 +19,8 @@
 
 public class MenuItemIconDialogEditor extends AbstractIconDialog {
 
-	public MenuItemIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MMenuItem element) {
-		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+	public MenuItemIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MMenuItem element, Messages Messages) {
+		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
index 6abf5c6d3a..92814cd1cd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
@@ -19,8 +19,8 @@
 
 public class PartDescriptorIconDialogEditor extends AbstractIconDialog {
 
-	public PartDescriptorIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPartDescriptor element) {
-		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+	public PartDescriptorIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPartDescriptor element, Messages Messages) {
+		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
index 7b7b48a632..8f283343ed 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
@@ -19,8 +19,8 @@
 
 public class PartIconDialogEditor extends AbstractIconDialog {
 
-	public PartIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPart element) {
-		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+	public PartIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPart element, Messages Messages) {
+		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
index 3e380367c2..189632c316 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
@@ -19,8 +19,8 @@
 
 public class PerspectiveIconDialogEditor extends AbstractIconDialog {
 
-	public PerspectiveIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPerspective element) {
-		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+	public PerspectiveIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPerspective element, Messages Messages) {
+		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index 4ffc8cb35c..ce28f7fc02 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -61,12 +61,14 @@ public class SharedElementsDialog extends TitleAreaDialog {
 	private MPlaceholder placeholder;
 	private IModelResource resource;
 	private ModelEditor editor;
+	private Messages Messages;
 
-	public SharedElementsDialog(Shell parentShell, ModelEditor editor, MPlaceholder placeholder, IModelResource resource) {
+	public SharedElementsDialog(Shell parentShell, ModelEditor editor, MPlaceholder placeholder, IModelResource resource, Messages Messages) {
 		super(parentShell);
 		this.editor = editor;
 		this.placeholder = placeholder;
 		this.resource = resource;
+		this.Messages = Messages;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
index 0966feb280..242fba0f00 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
@@ -19,8 +19,8 @@
 
 public class ToolItemIconDialogEditor extends AbstractIconDialog {
 
-	public ToolItemIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MToolItem element) {
-		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+	public ToolItemIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MToolItem element, Messages Messages) {
+		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
index a112f7a30b..1a0fbaffd1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
@@ -19,8 +19,8 @@
 
 public class WindowIconDialogEditor extends AbstractIconDialog {
 
-	public WindowIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MWindow element) {
-		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+	public WindowIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MWindow element, Messages Messages) {
+		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index d62c5ef2f3..a384584a6f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -12,15 +12,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MAddon;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
@@ -30,7 +29,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -54,8 +52,13 @@ public class VApplicationAddons extends AbstractComponentEditor {
 
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VApplicationAddons(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public VApplicationAddons() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.VApplicationAddons_AddAddon, createImageDescriptor(ResourceProvider.IMG_Addons)) {
 			@Override
 			public void run() {
@@ -113,7 +116,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index 2d08172df9..205c652dcb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -12,15 +12,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.MCategory;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl;
@@ -30,7 +29,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -54,8 +52,13 @@ public class VApplicationCategoriesEditor extends AbstractComponentEditor {
 
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VApplicationCategoriesEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public VApplicationCategoriesEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.VApplicationCategoriesEditor_AddCategory, createImageDescriptor(ResourceProvider.IMG_Category)) {
 			@Override
 			public void run() {
@@ -113,7 +116,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index fca96e7f8c..a289242700 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -12,15 +12,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MBindingTable;
 import org.eclipse.e4.ui.model.application.commands.MBindingTableContainer;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
@@ -30,7 +29,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -53,8 +51,13 @@ public class VBindingTableEditor extends AbstractComponentEditor {
 	private TableViewer bindingViewer;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VBindingTableEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public VBindingTableEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.VBindingTableEditor_AddBindingTable, createImageDescriptor(ResourceProvider.IMG_BindingTable)) {
 			@Override
 			public void run() {
@@ -112,7 +115,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			bindingViewer.getControl().setLayoutData(gd);
-			bindingViewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			bindingViewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 2c6ef7e779..31bf81e474 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -12,25 +12,24 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -55,9 +54,14 @@ public class VCommandEditor extends AbstractComponentEditor {
 	private EStructuralFeature commandsFeature;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VCommandEditor(EditingDomain editingDomain, ModelEditor editor, EStructuralFeature commandsFeature, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
-		this.commandsFeature = commandsFeature;
+	@Inject
+	public VCommandEditor() {
+		super();
+		this.commandsFeature = ApplicationPackageImpl.Literals.APPLICATION__COMMANDS;
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.VCommandEditor_AddCommand, createImageDescriptor(ResourceProvider.IMG_Command)) {
 			@Override
 			public void run() {
@@ -115,7 +119,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index fa16189bdd..883bc1a075 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -12,15 +12,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.commands.MHandlerContainer;
@@ -30,7 +29,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -53,8 +51,13 @@ public class VHandlerEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VHandlerEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public VHandlerEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.VHandlerEditor_AddHandler, createImageDescriptor(ResourceProvider.IMG_Handler)) {
 			@Override
 			public void run() {
@@ -112,7 +115,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
index 807dacfcd9..67b2b39f51 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -12,15 +12,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
@@ -32,7 +31,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -57,8 +55,13 @@ public class VItemParametersEditor extends AbstractComponentEditor {
 
 	private IEMFListProperty HANDLED_ITEM__PARAMETERS = EMFProperties.list(MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
 
-	public VItemParametersEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public VItemParametersEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.VItemParametersEditor_AddParameter, createImageDescriptor(ResourceProvider.IMG_Parameter)) {
 			@Override
 			public void run() {
@@ -116,7 +119,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index 8fdd87fa87..3c39157ab4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -12,15 +12,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
@@ -30,7 +29,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -54,8 +52,13 @@ public class VMenuContributionsEditor extends AbstractComponentEditor {
 
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VMenuContributionsEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public VMenuContributionsEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.VMenuContributionsEditor_AddMenuContribution, createImageDescriptor(ResourceProvider.IMG_MenuContribution)) {
 			@Override
 			public void run() {
@@ -113,7 +116,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index cdedf9fba1..4ee60e3a1f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -12,15 +12,13 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
@@ -32,7 +30,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -56,9 +53,13 @@ public class VMenuEditor extends AbstractComponentEditor {
 	private EStructuralFeature feature;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VMenuEditor(EditingDomain editingDomain, ModelEditor editor, EStructuralFeature feature, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	protected VMenuEditor(EStructuralFeature feature) {
+		super();
 		this.feature = feature;
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.VMenuEditor_AddMenuContribution, createImageDescriptor(ResourceProvider.IMG_Menu)) {
 			@Override
 			public void run() {
@@ -115,7 +116,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.heightHint = 300;
 		viewer.getControl().setLayoutData(gd);
-		viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+		viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index 6e31542757..59be50e2ad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -11,15 +11,13 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.List;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
@@ -29,7 +27,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -50,8 +47,9 @@ public class VModelFragmentsEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
 
-	public VModelFragmentsEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public VModelFragmentsEditor() {
+		super();
 	}
 
 	@Override
@@ -100,7 +98,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index fde83c1d30..3e9a08a157 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -12,16 +12,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
@@ -35,7 +33,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
@@ -61,8 +58,9 @@ public class VModelImportsEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
 
-	public VModelImportsEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public VModelImportsEditor() {
+		super();
 	}
 
 	@Override
@@ -110,7 +108,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index 9c22f94b11..69a754b810 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -12,15 +12,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MBasicFactory;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorContainer;
@@ -30,7 +29,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -53,8 +51,13 @@ public class VPartDescriptor extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VPartDescriptor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public VPartDescriptor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.VPartDescriptor_AddPartDescriptor, createImageDescriptor(ResourceProvider.IMG_PartDescriptor)) {
 			@Override
 			public void run() {
@@ -112,7 +115,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java
new file mode 100644
index 0000000000..b14dc15b85
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java
@@ -0,0 +1,11 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import javax.inject.Inject;
+
+public class VPartDescriptorMenuEditor extends VMenuEditor {
+	@Inject
+	public VPartDescriptorMenuEditor() {
+		super(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS);
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java
new file mode 100644
index 0000000000..3c5191fd25
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java
@@ -0,0 +1,12 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import javax.inject.Inject;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+
+public class VPartMenuEditor extends VMenuEditor {
+	@Inject
+	public VPartMenuEditor() {
+		super(BasicPackageImpl.Literals.PART__MENUS);
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
index 1b9c6a4d01..7fdb2bf488 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
@@ -12,15 +12,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.MBindingContext;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
@@ -30,7 +29,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -54,8 +52,13 @@ public class VRootBindingContexts extends AbstractComponentEditor {
 
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VRootBindingContexts(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public VRootBindingContexts() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.VRootBindingContexts_AddContext, createImageDescriptor(ResourceProvider.IMG_BindingContext)) {
 			@Override
 			public void run() {
@@ -113,7 +116,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index ddceef6aa1..206999f4d0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -12,15 +12,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContributions;
@@ -30,7 +29,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -53,8 +51,13 @@ public class VToolBarContributionsEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VToolBarContributionsEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public VToolBarContributionsEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.VToolBarContributionsEditor_AddToolBarContribution, createImageDescriptor(ResourceProvider.IMG_ToolBarContribution)) {
 			@Override
 			public void run() {
@@ -112,7 +115,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index 4b47525409..9978ad2b65 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -12,15 +12,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.MTrimContributions;
@@ -30,7 +29,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -53,8 +51,13 @@ public class VTrimContributionsEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VTrimContributionsEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public VTrimContributionsEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.VTrimContributionsEditor_AddTrimContribution, createImageDescriptor(ResourceProvider.IMG_TrimContribution)) {
 			@Override
 			public void run() {
@@ -112,7 +115,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 7ad0b72283..4b749c5099 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -12,16 +12,15 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
@@ -34,7 +33,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -60,8 +58,13 @@ public class VWindowControlEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VWindowControlEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public VWindowControlEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.VWindowControlEditor_AddPerspectiveStack, createImageDescriptor(ResourceProvider.IMG_PerspectiveStack)) {
 			@Override
 			public void run() {
@@ -151,7 +154,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
 			viewer.getControl().setLayoutData(gd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 3851e6e66c..464e066521 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -12,16 +12,15 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
@@ -33,7 +32,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -59,8 +57,13 @@ public class VWindowEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VWindowEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public VWindowEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.VWindowEditor_AddTrimmedWindow, createImageDescriptor(ResourceProvider.IMG_Window)) {
 			@Override
 			public void run() {
@@ -120,7 +123,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		viewer = new TableViewer(parent);
 		ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
-		viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+		viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.heightHint = 300;
 		viewer.getControl().setLayoutData(gd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 243fdb8488..18649ac4fa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -12,15 +12,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -33,7 +32,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -59,8 +57,13 @@ public class VWindowSharedElementsEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VWindowSharedElementsEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public VWindowSharedElementsEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.VWindowSharedElementsEditor_AddPartSashContainer, createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
 			@Override
 			public void run() {
@@ -129,7 +132,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index 298e924503..9bc4b8bb57 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -12,15 +12,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
 import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
@@ -28,7 +27,6 @@
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -50,8 +48,13 @@ public class VWindowTrimEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 
-	public VWindowTrimEditor(EditingDomain editingDomain, ModelEditor editor, IResourcePool resourcePool) {
-		super(editingDomain, editor, resourcePool);
+	@Inject
+	public VWindowTrimEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
 		actions.add(new Action(Messages.VWindowTrimEditor_AddWindowTrim, createImageDescriptor(ResourceProvider.IMG_WindowTrim)) {
 			@Override
 			public void run() {
@@ -106,7 +109,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.heightHint = 300;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java
new file mode 100644
index 0000000000..0f4ccbd86b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java
@@ -0,0 +1,61 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.xml;
+
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.jface.text.source.IAnnotationAccess;
+import org.eclipse.jface.text.source.IAnnotationAccessExtension;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Canvas;
+
+public class AnnotationAccess implements IAnnotationAccess, IAnnotationAccessExtension {
+	private IResourcePool pool;
+
+	public AnnotationAccess(IResourcePool pool) {
+		this.pool = pool;
+	}
+
+	public String getTypeLabel(Annotation annotation) {
+		return annotation.getText();
+	}
+
+	public int getLayer(Annotation annotation) {
+		return IAnnotationAccessExtension.DEFAULT_LAYER;
+	}
+
+	public void paint(Annotation annotation, GC gc, Canvas canvas, Rectangle bounds) {
+		gc.drawImage(pool.getImageUnchecked(ResourceProvider.IMG_Obj16_error_obj), bounds.x, bounds.y);
+	}
+
+	public boolean isPaintable(Annotation annotation) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public boolean isSubtype(Object annotationType, Object potentialSupertype) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public Object[] getSupertypes(Object annotationType) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public Object getType(Annotation annotation) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public boolean isMultiLine(Annotation annotation) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public boolean isTemporary(Annotation annotation) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/ColorManager.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/ColorManager.java
new file mode 100644
index 0000000000..4a3a225d66
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/ColorManager.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.xml;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Display;
+
+public class ColorManager {
+
+	protected Map<RGB, Color> fColorTable = new HashMap<RGB, Color>(10);
+
+	public void dispose() {
+		Iterator<Color> e = fColorTable.values().iterator();
+		while (e.hasNext())
+			((Color) e.next()).dispose();
+	}
+
+	public Color getColor(RGB rgb) {
+		Color color = (Color) fColorTable.get(rgb);
+		if (color == null) {
+			color = new Color(Display.getCurrent(), rgb);
+			fColorTable.put(rgb, color);
+		}
+		return color;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
new file mode 100644
index 0000000000..1907ecfe4e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
@@ -0,0 +1,94 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.xml;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
+import org.eclipse.jface.text.Document;
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IDocumentListener;
+import org.xml.sax.InputSource;
+
+public class EMFDocumentResourceMediator {
+	private IModelResource modelResource;
+	private Document document;
+	private boolean updateFromEMF;
+	private List<Diagnostic> errorList = new ArrayList<Diagnostic>();
+	private Runnable documentValidationChanged;
+
+	public EMFDocumentResourceMediator(final IModelResource modelResource) {
+		this.modelResource = modelResource;
+		this.document = new Document();
+		this.document.addDocumentListener(new IDocumentListener() {
+
+			public void documentChanged(DocumentEvent event) {
+				if (updateFromEMF) {
+					return;
+				}
+
+				String doc = document.get();
+				XMIResourceImpl res = new XMIResourceImpl();
+				try {
+					res.load(new InputSource(new StringReader(doc)), null);
+					modelResource.replaceRoot(res.getContents().get(0));
+					errorList.clear();
+					if (documentValidationChanged != null) {
+						documentValidationChanged.run();
+					}
+				} catch (IOException e) {
+					errorList = res.getErrors();
+					if (documentValidationChanged != null) {
+						documentValidationChanged.run();
+					}
+
+				}
+			}
+
+			public void documentAboutToBeChanged(DocumentEvent event) {
+
+			}
+		});
+		updateFromEMF();
+	}
+
+	public void setValidationChangedCallback(Runnable runnable) {
+		documentValidationChanged = runnable;
+	}
+
+	public List<Diagnostic> getErrorList() {
+		return Collections.unmodifiableList(errorList);
+	}
+
+	public void updateFromEMF() {
+		try {
+			updateFromEMF = true;
+			this.document.set(toXMI((EObject) modelResource.getRoot().get(0)));
+		} finally {
+			updateFromEMF = false;
+		}
+	}
+
+	public Document getDocument() {
+		return document;
+	}
+
+	private String toXMI(EObject root) {
+		XMIResourceImpl resource = new XMIResourceImpl();
+		resource.getContents().add(EcoreUtil.copy(root));
+		StringWriter writer = new StringWriter();
+		try {
+			resource.save(writer, null);
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return writer.toString();
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/IXMLColorConstants.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/IXMLColorConstants.java
new file mode 100644
index 0000000000..0c7a2a580b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/IXMLColorConstants.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.xml;
+
+import org.eclipse.swt.graphics.RGB;
+
+public interface IXMLColorConstants {
+	RGB XML_COMMENT = new RGB(128, 0, 0);
+	RGB PROC_INSTR = new RGB(128, 128, 128);
+	RGB STRING = new RGB(0, 128, 0);
+	RGB DEFAULT = new RGB(0, 0, 0);
+	RGB TAG = new RGB(0, 0, 128);
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java
new file mode 100644
index 0000000000..627ce6af1f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java
@@ -0,0 +1,148 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.xml;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITypedRegion;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.jface.text.presentation.IPresentationDamager;
+import org.eclipse.jface.text.presentation.IPresentationRepairer;
+import org.eclipse.swt.custom.StyleRange;
+
+public class NonRuleBasedDamagerRepairer
+	implements IPresentationDamager, IPresentationRepairer {
+
+	/** The document this object works on */
+	protected IDocument fDocument;
+	/** The default text attribute if non is returned as data by the current token */
+	protected TextAttribute fDefaultTextAttribute;
+	
+	/**
+	 * Constructor for NonRuleBasedDamagerRepairer.
+	 */
+	public NonRuleBasedDamagerRepairer(TextAttribute defaultTextAttribute) {
+		Assert.isNotNull(defaultTextAttribute);
+
+		fDefaultTextAttribute = defaultTextAttribute;
+	}
+
+	/**
+	 * @see IPresentationRepairer#setDocument(IDocument)
+	 */
+	public void setDocument(IDocument document) {
+		fDocument = document;
+	}
+
+	/**
+	 * Returns the end offset of the line that contains the specified offset or
+	 * if the offset is inside a line delimiter, the end offset of the next line.
+	 *
+	 * @param offset the offset whose line end offset must be computed
+	 * @return the line end offset for the given offset
+	 * @exception BadLocationException if offset is invalid in the current document
+	 */
+	protected int endOfLineOf(int offset) throws BadLocationException {
+
+		IRegion info = fDocument.getLineInformationOfOffset(offset);
+		if (offset <= info.getOffset() + info.getLength())
+			return info.getOffset() + info.getLength();
+
+		int line = fDocument.getLineOfOffset(offset);
+		try {
+			info = fDocument.getLineInformation(line + 1);
+			return info.getOffset() + info.getLength();
+		} catch (BadLocationException x) {
+			return fDocument.getLength();
+		}
+	}
+
+	/**
+	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
+	 */
+	public IRegion getDamageRegion(
+		ITypedRegion partition,
+		DocumentEvent event,
+		boolean documentPartitioningChanged) {
+		if (!documentPartitioningChanged) {
+			try {
+
+				IRegion info =
+					fDocument.getLineInformationOfOffset(event.getOffset());
+				int start = Math.max(partition.getOffset(), info.getOffset());
+
+				int end =
+					event.getOffset()
+						+ (event.getText() == null
+							? event.getLength()
+							: event.getText().length());
+
+				if (info.getOffset() <= end
+					&& end <= info.getOffset() + info.getLength()) {
+					// optimize the case of the same line
+					end = info.getOffset() + info.getLength();
+				} else
+					end = endOfLineOf(end);
+
+				end =
+					Math.min(
+						partition.getOffset() + partition.getLength(),
+						end);
+				return new Region(start, end - start);
+
+			} catch (BadLocationException x) {
+			}
+		}
+
+		return partition;
+	}
+
+	/**
+	 * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion)
+	 */
+	public void createPresentation(
+		TextPresentation presentation,
+		ITypedRegion region) {
+		addRange(
+			presentation,
+			region.getOffset(),
+			region.getLength(),
+			fDefaultTextAttribute);
+	}
+
+	/**
+	 * Adds style information to the given text presentation.
+	 *
+	 * @param presentation the text presentation to be extended
+	 * @param offset the offset of the range to be styled
+	 * @param length the length of the range to be styled
+	 * @param attr the attribute describing the style of the range to be styled
+	 */
+	protected void addRange(
+		TextPresentation presentation,
+		int offset,
+		int length,
+		TextAttribute attr) {
+		if (attr != null)
+			presentation.addStyleRange(
+				new StyleRange(
+					offset,
+					length,
+					attr.getForeground(),
+					attr.getBackground(),
+					attr.getStyle()));
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java
new file mode 100644
index 0000000000..85719e9150
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.xml;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.MultiLineRule;
+
+public class TagRule extends MultiLineRule {
+
+	public TagRule(IToken token) {
+		super("<", ">", token); //$NON-NLS-1$//$NON-NLS-2$
+	}
+
+	protected boolean sequenceDetected(ICharacterScanner scanner, char[] sequence, boolean eofAllowed) {
+		int c = scanner.read();
+		if (sequence[0] == '<') {
+			if (c == '?') {
+				// processing instruction - abort
+				scanner.unread();
+				return false;
+			}
+			if (c == '!') {
+				scanner.unread();
+				// comment - abort
+				return false;
+			}
+		} else if (sequence[0] == '>') {
+			scanner.unread();
+		}
+		return super.sequenceDetected(scanner, sequence, eofAllowed);
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
new file mode 100644
index 0000000000..42080119a1
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.xml;
+
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextDoubleClickStrategy;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.presentation.IPresentationReconciler;
+import org.eclipse.jface.text.presentation.PresentationReconciler;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
+
+public class XMLConfiguration extends SourceViewerConfiguration {
+	private XMLDoubleClickStrategy doubleClickStrategy;
+	private XMLTagScanner tagScanner;
+	private XMLScanner scanner;
+	private ColorManager colorManager;
+
+	public XMLConfiguration(ColorManager colorManager) {
+		this.colorManager = colorManager;
+	}
+
+	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
+		return new String[] { IDocument.DEFAULT_CONTENT_TYPE, XMLPartitionScanner.XML_COMMENT, XMLPartitionScanner.XML_TAG };
+	}
+
+	public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer, String contentType) {
+		if (doubleClickStrategy == null)
+			doubleClickStrategy = new XMLDoubleClickStrategy();
+		return doubleClickStrategy;
+	}
+
+	protected XMLScanner getXMLScanner() {
+		if (scanner == null) {
+			scanner = new XMLScanner(colorManager);
+			scanner.setDefaultReturnToken(new Token(new TextAttribute(colorManager.getColor(IXMLColorConstants.DEFAULT))));
+		}
+		return scanner;
+	}
+
+	protected XMLTagScanner getXMLTagScanner() {
+		if (tagScanner == null) {
+			tagScanner = new XMLTagScanner(colorManager);
+			tagScanner.setDefaultReturnToken(new Token(new TextAttribute(colorManager.getColor(IXMLColorConstants.TAG))));
+		}
+		return tagScanner;
+	}
+
+	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
+		PresentationReconciler reconciler = new PresentationReconciler();
+
+		DefaultDamagerRepairer dr = new DefaultDamagerRepairer(getXMLTagScanner());
+		reconciler.setDamager(dr, XMLPartitionScanner.XML_TAG);
+		reconciler.setRepairer(dr, XMLPartitionScanner.XML_TAG);
+
+		dr = new DefaultDamagerRepairer(getXMLScanner());
+		reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
+		reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
+
+		NonRuleBasedDamagerRepairer ndr = new NonRuleBasedDamagerRepairer(new TextAttribute(colorManager.getColor(IXMLColorConstants.XML_COMMENT)));
+		reconciler.setDamager(ndr, XMLPartitionScanner.XML_COMMENT);
+		reconciler.setRepairer(ndr, XMLPartitionScanner.XML_COMMENT);
+
+		return reconciler;
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java
new file mode 100644
index 0000000000..492d51bbc1
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java
@@ -0,0 +1,125 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.xml;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextDoubleClickStrategy;
+import org.eclipse.jface.text.ITextViewer;
+
+public class XMLDoubleClickStrategy implements ITextDoubleClickStrategy {
+	protected ITextViewer fText;
+
+	public void doubleClicked(ITextViewer part) {
+		int pos = part.getSelectedRange().x;
+
+		if (pos < 0)
+			return;
+
+		fText = part;
+
+		if (!selectComment(pos)) {
+			selectWord(pos);
+		}
+	}
+	protected boolean selectComment(int caretPos) {
+		IDocument doc = fText.getDocument();
+		int startPos, endPos;
+
+		try {
+			int pos = caretPos;
+			char c = ' ';
+
+			while (pos >= 0) {
+				c = doc.getChar(pos);
+				if (c == '\\') {
+					pos -= 2;
+					continue;
+				}
+				if (c == Character.LINE_SEPARATOR || c == '\"')
+					break;
+				--pos;
+			}
+
+			if (c != '\"')
+				return false;
+
+			startPos = pos;
+
+			pos = caretPos;
+			int length = doc.getLength();
+			c = ' ';
+
+			while (pos < length) {
+				c = doc.getChar(pos);
+				if (c == Character.LINE_SEPARATOR || c == '\"')
+					break;
+				++pos;
+			}
+			if (c != '\"')
+				return false;
+
+			endPos = pos;
+
+			int offset = startPos + 1;
+			int len = endPos - offset;
+			fText.setSelectedRange(offset, len);
+			return true;
+		} catch (BadLocationException x) {
+		}
+
+		return false;
+	}
+	protected boolean selectWord(int caretPos) {
+
+		IDocument doc = fText.getDocument();
+		int startPos, endPos;
+
+		try {
+
+			int pos = caretPos;
+			char c;
+
+			while (pos >= 0) {
+				c = doc.getChar(pos);
+				if (!Character.isJavaIdentifierPart(c))
+					break;
+				--pos;
+			}
+
+			startPos = pos;
+
+			pos = caretPos;
+			int length = doc.getLength();
+
+			while (pos < length) {
+				c = doc.getChar(pos);
+				if (!Character.isJavaIdentifierPart(c))
+					break;
+				++pos;
+			}
+
+			endPos = pos;
+			selectRange(startPos, endPos);
+			return true;
+
+		} catch (BadLocationException x) {
+		}
+
+		return false;
+	}
+
+	private void selectRange(int startPos, int stopPos) {
+		int offset = startPos + 1;
+		int length = stopPos - offset;
+		fText.setSelectedRange(offset, length);
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLPartitionScanner.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLPartitionScanner.java
new file mode 100644
index 0000000000..04ea48a9cc
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLPartitionScanner.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.xml;
+
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.MultiLineRule;
+import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
+import org.eclipse.jface.text.rules.Token;
+
+public class XMLPartitionScanner extends RuleBasedPartitionScanner {
+	public final static String XML_COMMENT = "__xml_comment"; //$NON-NLS-1$
+	public final static String XML_TAG = "__xml_tag"; //$NON-NLS-1$
+
+	public XMLPartitionScanner() {
+
+		IToken xmlComment = new Token(XML_COMMENT);
+		IToken tag = new Token(XML_TAG);
+
+		IPredicateRule[] rules = new IPredicateRule[2];
+
+		rules[0] = new MultiLineRule("<!--", "-->", xmlComment); //$NON-NLS-1$//$NON-NLS-2$
+		rules[1] = new TagRule(tag);
+
+		setPredicateRules(rules);
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java
new file mode 100644
index 0000000000..7eaafe0632
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.xml;
+
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.rules.WhitespaceRule;
+
+public class XMLScanner extends RuleBasedScanner {
+
+	public XMLScanner(ColorManager manager) {
+		IToken procInstr = new Token(new TextAttribute(manager.getColor(IXMLColorConstants.PROC_INSTR)));
+
+		IRule[] rules = new IRule[2];
+		// Add rule for processing instructions
+		rules[0] = new SingleLineRule("<?", "?>", procInstr); //$NON-NLS-1$//$NON-NLS-2$
+		// Add generic whitespace rule.
+		rules[1] = new WhitespaceRule(new XMLWhitespaceDetector());
+
+		setRules(rules);
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java
new file mode 100644
index 0000000000..47ccf71b98
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.xml;
+
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.rules.WhitespaceRule;
+
+public class XMLTagScanner extends RuleBasedScanner {
+
+	public XMLTagScanner(ColorManager manager) {
+		IToken string = new Token(new TextAttribute(manager.getColor(IXMLColorConstants.STRING)));
+
+		IRule[] rules = new IRule[3];
+
+		// Add rule for double quotes
+		rules[0] = new SingleLineRule("\"", "\"", string, '\\'); //$NON-NLS-1$//$NON-NLS-2$
+		// Add a rule for single quotes
+		rules[1] = new SingleLineRule("'", "'", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
+		// Add generic whitespace rule.
+		rules[2] = new WhitespaceRule(new XMLWhitespaceDetector());
+
+		setRules(rules);
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java
new file mode 100644
index 0000000000..3ded701a8c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.xml;
+
+import org.eclipse.jface.text.rules.IWhitespaceDetector;
+
+public class XMLWhitespaceDetector implements IWhitespaceDetector {
+
+	public boolean isWhitespace(char c) {
+		return (c == ' ' || c == '\t' || c == '\n' || c == '\r');
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index f14d25988c..445bfb48c2 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -12,6 +12,7 @@ Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
  javax.annotation;bundle-version="1.0.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0",
  javax.inject;bundle-version="1.0.0",
- org.eclipse.osgi;bundle-version="3.7.0"
-Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml
+ org.eclipse.osgi;bundle-version="3.7.0",
+ org.eclipse.e4.core.services;bundle-version="0.9.1"
+Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml, OSGI-INF/messagefactoryservice.xml, OSGI-INF/translationsupplier.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.e4.tools.services/OSGI-INF/messagefactoryservice.xml b/bundles/org.eclipse.e4.tools.services/OSGI-INF/messagefactoryservice.xml
new file mode 100644
index 0000000000..6331e45327
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/OSGI-INF/messagefactoryservice.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.services.messagefactoryservice">
+   <implementation class="org.eclipse.e4.tools.services.impl.MessageFactoryServiceImpl"/>
+   <service>
+      <provide interface="org.eclipse.e4.tools.services.IMessageFactoryService"/>
+   </service>
+</scr:component>
diff --git a/bundles/org.eclipse.e4.tools.services/OSGI-INF/translationsupplier.xml b/bundles/org.eclipse.e4.tools.services/OSGI-INF/translationsupplier.xml
new file mode 100644
index 0000000000..a25fcdfb93
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/OSGI-INF/translationsupplier.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.services.translationsupplier">
+   <implementation class="org.eclipse.e4.tools.services.impl.TranslationObjectSupplier"/>
+   <service>
+      <provide interface="org.eclipse.e4.core.di.suppliers.ExtendedObjectSupplier"/>
+   </service>
+   <property name="dependency.injection.annotation" type="String" value="org.eclipse.e4.tools.services.Translation"/>
+</scr:component>
diff --git a/bundles/org.eclipse.e4.tools.services/build.properties b/bundles/org.eclipse.e4.tools.services/build.properties
index caddfdf972..e611dd6a4e 100644
--- a/bundles/org.eclipse.e4.tools.services/build.properties
+++ b/bundles/org.eclipse.e4.tools.services/build.properties
@@ -4,5 +4,7 @@ bin.includes = META-INF/,\
                about.html,\
                OSGI-INF/,\
                OSGI-INF/resourcepoolfunction.xml,\
-               OSGI-INF/resourceservice.xml
+               OSGI-INF/resourceservice.xml,\
+               OSGI-INF/messagefactoryservice.xml,\
+               OSGI-INF/translationsupplier.xml
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java
new file mode 100644
index 0000000000..fc22333050
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java
@@ -0,0 +1,6 @@
+package org.eclipse.e4.tools.services;
+
+public interface IMessageFactoryService {
+	public <M> M createInstance(final String locale, final Class<M> messages)
+			throws InstantiationException, IllegalAccessException;
+}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Message.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Message.java
new file mode 100644
index 0000000000..d2948f9753
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Message.java
@@ -0,0 +1,9 @@
+package org.eclipse.e4.tools.services;
+
+public @interface Message {
+	public enum ReferenceType {
+		NONE, SOFT, WEAK
+	}
+
+	ReferenceType referenceType() default ReferenceType.SOFT;
+}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Translation.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Translation.java
new file mode 100644
index 0000000000..ca92d445ee
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Translation.java
@@ -0,0 +1,16 @@
+package org.eclipse.e4.tools.services;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import javax.inject.Qualifier;
+
+@Qualifier
+@Documented
+@Target({ElementType.FIELD, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Translation {
+
+}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java
new file mode 100644
index 0000000000..2d8d3496b4
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java
@@ -0,0 +1,139 @@
+/*******************************************************************************
+ * Copyright (c) 2011 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.services.impl;
+
+import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Field;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.e4.tools.services.IMessageFactoryService;
+import org.eclipse.e4.tools.services.Message;
+import org.eclipse.e4.tools.services.Message.ReferenceType;
+
+public class MessageFactoryServiceImpl implements IMessageFactoryService {
+
+	// Cache so when multiple instance use the same message class
+	private Map<Object, Reference<Object>> SOFT_CACHE = Collections
+			.synchronizedMap(new HashMap<Object, Reference<Object>>());
+
+	private Map<Object, Reference<Object>> WEAK_CACHE = Collections
+			.synchronizedMap(new HashMap<Object, Reference<Object>>());
+
+	private int CLEANUPCOUNT = 0;
+
+	public <M> M createInstance(final String locale, final Class<M> messages)
+			throws InstantiationException, IllegalAccessException {
+		String key = messages.getName() + "_" + locale;
+
+		final Message annotation = messages.getAnnotation(Message.class);
+		Map<Object, Reference<Object>> cache = null;
+		ReferenceType type = ReferenceType.NONE;
+
+		if (++CLEANUPCOUNT > 1000) {
+			Iterator<Entry<Object, Reference<Object>>> it = WEAK_CACHE
+					.entrySet().iterator();
+			while (it.hasNext()) {
+				if (it.next().getValue().get() == null) {
+					it.remove();
+				}
+			}
+
+			it = SOFT_CACHE.entrySet().iterator();
+			while (it.hasNext()) {
+				if (it.next().getValue().get() == null) {
+					it.remove();
+				}
+			}
+			CLEANUPCOUNT = 0;
+		}
+
+		if (annotation == null
+				|| annotation.referenceType() == ReferenceType.SOFT) {
+			cache = SOFT_CACHE;
+			type = ReferenceType.SOFT;
+		} else if (annotation.referenceType() == ReferenceType.WEAK) {
+			cache = WEAK_CACHE;
+			type = ReferenceType.WEAK;
+		}
+
+		if (cache != null && cache.containsKey(key)) {
+			@SuppressWarnings("unchecked")
+			Reference<M> ref = (Reference<M>) cache.get(key);
+			M o = ref.get();
+			if (o != null) {
+				return o;
+			}
+			cache.remove(key);
+		}
+
+		M instance;
+
+		if (System.getSecurityManager() == null) {
+			instance = doCreateInstance(locale, messages, annotation);
+		} else {
+			instance = AccessController.doPrivileged(new PrivilegedAction<M>() {
+
+				public M run() {
+					try {
+						return doCreateInstance(locale, messages, annotation);
+					} catch (InstantiationException e) {
+						e.printStackTrace();
+					} catch (IllegalAccessException e) {
+						e.printStackTrace();
+					}
+					return null;
+				}
+
+			});
+		}
+
+		if (cache != null) {
+			if (type == ReferenceType.SOFT) {
+				cache.put(key, new SoftReference<Object>(instance));
+			} else if (type == ReferenceType.WEAK) {
+				cache.put(key, new WeakReference<Object>(instance));
+			}
+		}
+
+		return instance;
+	}
+
+	private static <M> M doCreateInstance(String locale, Class<M> messages,
+			Message annotation) throws InstantiationException,
+			IllegalAccessException {
+
+		String basename = messages.getName().replace('.', '/');
+		PropertiesBundleTranslationProvider provider = new PropertiesBundleTranslationProvider(
+				messages.getClassLoader(), basename);
+
+		M instance = messages.newInstance();
+		Field[] fields = messages.getDeclaredFields();
+
+		for (int i = 0; i < fields.length; i++) {
+			if (!fields[i].isAccessible()) {
+				fields[i].setAccessible(true);
+			}
+
+			fields[i].set(instance,
+					provider.translate(locale, fields[i].getName()));
+		}
+
+		return instance;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/PropertiesBundleTranslationProvider.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/PropertiesBundleTranslationProvider.java
new file mode 100644
index 0000000000..c7ed9fb242
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/PropertiesBundleTranslationProvider.java
@@ -0,0 +1,223 @@
+/*******************************************************************************
+ * Copyright (c) 2011 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.services.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.PropertyResourceBundle;
+import java.util.ResourceBundle;
+import org.eclipse.osgi.service.localization.BundleLocalization;
+
+/**
+ * The lookup of the translation the same than the one in {@link BundleLocalization} which is based
+ * upon the value found in equinox.root.locale which defaults to "en":
+ * <ul>
+ * <li>If set to empty string then the search order for:
+ * <ul>
+ * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
+ * <li>bn + Ls + "_" + Cs</li>
+ * <li>bn + Ls</li>
+ * <li>bn + Ld + "_" + Cd + "_" + Vd</li>
+ * <li>bn + Ld + "_" + Cd</li>
+ * <li>bn + Ld</li>
+ * </ul>
+ * </li>
+ * <li>If Ls equals the value of equinox.root.locale then the following search order is used:
+ * <ul>
+ * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
+ * <li>bn + Ls + "_" + Cs</li>
+ * <li>bn + Ls</li>
+ * <li>bn + Ld + "_" + Cd + "_" + Vd</li>
+ * <li>bn + Ld + "_" + Cd</li>
+ * <li>bn + Ld</li>
+ * </ul>
+ * </li>
+ * </ul>
+ * Where bn is this bundle's localization basename, Ls, Cs and Vs are the specified locale
+ * (language, country, variant) and Ld, Cd and Vd are the default locale (language, country,
+ * variant).
+ */
+public class PropertiesBundleTranslationProvider {
+	final static String DEFAULT_ROOT = getEquinoxRootLocale();
+
+	private ClassLoader loader;
+	private String baseName;
+
+	private final Hashtable<String, BundleResourceBundle> cache = new Hashtable<String, BundleResourceBundle>(
+			5);
+
+	public PropertiesBundleTranslationProvider(ClassLoader loader, String baseName) {
+		this.loader = loader;
+		this.baseName = baseName;
+	}
+
+	private static String getEquinoxRootLocale() {
+		// Logic from FrameworkProperties.getProperty("equinox.root.locale", "en")
+		String root = System.getProperties().getProperty("equinox.root.locale");
+		if (root == null) {
+			root = "en";
+		}
+		return root;
+	}
+
+	public String translate(String locale, String key) {
+		String defaultLocale = Locale.getDefault().toString();
+		String localeString = locale;
+		ResourceBundle bundle = getResourceBundle(locale.toString(),
+				defaultLocale.equals(localeString));
+		try {
+			return bundle.getString(key);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return key;
+		}
+
+	}
+
+	private ResourceBundle getResourceBundle(String localeString, boolean isDefaultLocale) {
+		BundleResourceBundle resourceBundle = lookupResourceBundle(localeString);
+		if (isDefaultLocale)
+			return (ResourceBundle) resourceBundle;
+		// need to determine if this is resource bundle is an empty stem
+		// if it is then the default locale should be used
+		if (resourceBundle == null || resourceBundle.isStemEmpty())
+			return (ResourceBundle) lookupResourceBundle(Locale.getDefault().toString());
+		return (ResourceBundle) resourceBundle;
+	}
+
+	private interface BundleResourceBundle {
+		void setParent(ResourceBundle parent);
+
+		boolean isEmpty();
+
+		boolean isStemEmpty();
+	}
+
+	private BundleResourceBundle lookupResourceBundle(String localeString) {
+		// get the localization header as late as possible to avoid accessing the raw headers
+		// getting the first value from the raw headers forces the manifest to be parsed (bug
+		// 332039)
+		String localizationHeader = baseName;
+		synchronized (cache) {
+			BundleResourceBundle result = cache.get(localeString);
+			if (result != null)
+				return result.isEmpty() ? null : result;
+			String[] nlVarients = buildNLVariants(localeString);
+			BundleResourceBundle parent = null;
+
+			for (int i = nlVarients.length - 1; i >= 0; i--) {
+				BundleResourceBundle varientBundle = null;
+				InputStream resourceStream = loader.getResourceAsStream(localizationHeader
+						+ (nlVarients[i].equals("") ? nlVarients[i] : '_' + nlVarients[i])
+						+ ".properties");
+
+				if (resourceStream == null) {
+					varientBundle = cache.get(nlVarients[i]);
+				} else {
+					try {
+						varientBundle = new LocalizationResourceBundle(resourceStream);
+					} catch (IOException e) {
+						// ignore and continue
+					} finally {
+						if (resourceStream != null) {
+							try {
+								resourceStream.close();
+							} catch (IOException e3) {
+								// Ignore exception
+							}
+						}
+					}
+				}
+
+				if (varientBundle == null) {
+					varientBundle = new EmptyResouceBundle(nlVarients[i]);
+				}
+				if (parent != null)
+					varientBundle.setParent((ResourceBundle) parent);
+				cache.put(nlVarients[i], varientBundle);
+				parent = varientBundle;
+			}
+			result = cache.get(localeString);
+			return result.isEmpty() ? null : result;
+		}
+	}
+
+	private String[] buildNLVariants(String nl) {
+		List<String> result = new ArrayList<String>();
+		while (nl.length() > 0) {
+			result.add(nl);
+			int i = nl.lastIndexOf('_');
+			nl = (i < 0) ? "" : nl.substring(0, i); //$NON-NLS-1$
+		}
+		result.add(""); //$NON-NLS-1$
+		return result.toArray(new String[result.size()]);
+	}
+
+	private class LocalizationResourceBundle extends PropertyResourceBundle implements
+			BundleResourceBundle {
+		public LocalizationResourceBundle(InputStream in) throws IOException {
+			super(in);
+		}
+
+		public void setParent(ResourceBundle parent) {
+			super.setParent(parent);
+		}
+
+		public boolean isEmpty() {
+			return false;
+		}
+
+		public boolean isStemEmpty() {
+			return parent == null;
+		}
+	}
+
+	class EmptyResouceBundle extends ResourceBundle implements BundleResourceBundle {
+		private final String localeString;
+
+		public EmptyResouceBundle(String locale) {
+			super();
+			this.localeString = locale;
+		}
+
+		public Enumeration<String> getKeys() {
+			return null;
+		}
+
+		protected Object handleGetObject(String arg0) throws MissingResourceException {
+			return null;
+		}
+
+		public void setParent(ResourceBundle parent) {
+			super.setParent(parent);
+		}
+
+		public boolean isEmpty() {
+			if (parent == null)
+				return true;
+			return ((BundleResourceBundle) parent).isEmpty();
+		}
+
+		public boolean isStemEmpty() {
+			if (DEFAULT_ROOT.equals(localeString))
+				return false;
+			if (parent == null)
+				return true;
+			return ((BundleResourceBundle) parent).isStemEmpty();
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java
new file mode 100644
index 0000000000..a7ee2584f4
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2011 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.services.impl;
+
+import java.lang.reflect.ParameterizedType;
+
+import java.lang.reflect.Type;
+import java.util.Locale;
+
+import org.eclipse.e4.core.internal.contexts.ContextObjectSupplier;
+
+import org.eclipse.e4.core.internal.di.Requestor;
+import org.eclipse.e4.core.services.translation.TranslationService;
+
+import org.eclipse.e4.core.di.suppliers.IObjectDescriptor;
+import org.eclipse.e4.core.di.suppliers.IRequestor;
+
+import org.eclipse.e4.core.di.suppliers.ExtendedObjectSupplier;
+import org.eclipse.e4.tools.services.IMessageFactoryService;
+
+public class TranslationObjectSupplier extends ExtendedObjectSupplier {
+
+	@Override
+	public Object get(IObjectDescriptor descriptor, IRequestor requestor,
+			boolean track, boolean group) {
+		Class<?> descriptorsClass = getDesiredClass(descriptor.getDesiredType());
+
+		Requestor req = (Requestor) requestor;
+		ContextObjectSupplier sub = (ContextObjectSupplier) req
+				.getPrimarySupplier();
+		
+		String locale = (String) sub.getContext().get(TranslationService.LOCALE);
+		locale = locale == null ? Locale.getDefault().toString() : locale;
+		IMessageFactoryService factoryService = sub.getContext().get(IMessageFactoryService.class); 
+		
+		try {
+			return factoryService.createInstance(locale,descriptorsClass);
+		} catch (InstantiationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IllegalAccessException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	private Class<?> getDesiredClass(Type desiredType) {
+		if (desiredType instanceof Class<?>)
+			return (Class<?>) desiredType;
+		if (desiredType instanceof ParameterizedType) {
+			Type rawType = ((ParameterizedType) desiredType).getRawType();
+			if (rawType instanceof Class<?>)
+				return (Class<?>) rawType;
+		}
+		return null;
+	}
+
+}
\ No newline at end of file

From 71f87f118fd20d47227b18b03d86025e6ed672e8 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 29 Jan 2011 01:16:48 +0000
Subject: [PATCH 0289/1286] Bug 316371 - [ModelTooling] ModelEditor should be
 multipart editors which allows to edit xml or via UI

---
 .../OSGI-INF/resourceprovider.xml             |  2 +-
 ...images.properties => resources.properties} |  8 +++-
 .../emf/ui/internal/ResourceProvider.java     | 19 ++++------
 .../emf/ui/internal/common/ModelEditor.java   |  4 +-
 .../ui/internal/common/xml/ColorManager.java  | 38 -------------------
 .../internal/common/xml/XMLConfiguration.java | 18 +++++----
 .../ui/internal/common/xml/XMLScanner.java    |  6 ++-
 .../ui/internal/common/xml/XMLTagScanner.java |  6 ++-
 ...ovider.java => BasicResourceProvider.java} | 26 +++++++++++--
 .../services/IResourceProviderService.java    |  6 ++-
 10 files changed, 61 insertions(+), 72 deletions(-)
 rename bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/{images.properties => resources.properties} (96%)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/ColorManager.java
 rename bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/{AbstractBundleResourceProvider.java => BasicResourceProvider.java} (57%)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resourceprovider.xml b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resourceprovider.xml
index fc93362838..4f18498cdc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resourceprovider.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resourceprovider.xml
@@ -4,5 +4,5 @@
    <service>
       <provide interface="org.eclipse.e4.tools.services.IResourceProviderService"/>
    </service>
-   <properties entry="OSGI-INF/images.properties"/>
+   <properties entry="OSGI-INF/resources.properties"/>
 </scr:component>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/images.properties b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
similarity index 96%
rename from bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/images.properties
rename to bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
index 471396af6b..598a3c1fc8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/images.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
@@ -89,4 +89,10 @@ IMG_org.eclipse.e4.tools.emf.ui.wizban.fieldrefact_wiz=/icons/full/wizban/fieldr
 IMG_org.eclipse.e4.tools.emf.ui.wizban.import_wiz=/icons/full/wizban/import_wiz.png
 IMG_org.eclipse.e4.tools.emf.ui.wizban.newclass_wiz=/icons/full/wizban/newclass_wiz.png
 IMG_org.eclipse.e4.tools.emf.ui.wizban.newexp_wiz=/icons/full/wizban/newexp_wiz.png
-IMG_org.eclipse.e4.tools.emf.ui.wizban.typerefact_wiz=/icons/full/wizban/typerefact_wiz.png
\ No newline at end of file
+IMG_org.eclipse.e4.tools.emf.ui.wizban.typerefact_wiz=/icons/full/wizban/typerefact_wiz.png
+
+COLOR_org.eclipse.e4.tools.emf.ui.XML_COMMENT=rgb(128, 0, 0)
+COLOR_org.eclipse.e4.tools.emf.ui.PROC_INSTR=rgb(128, 128, 128)
+COLOR_org.eclipse.e4.tools.emf.ui.STRING=rgb(0, 128, 0)
+COLOR_org.eclipse.e4.tools.emf.ui.DEFAULT=rgb(0, 0, 0)
+COLOR_org.eclipse.e4.tools.emf.ui.TAG=rgb(0, 0, 128)
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
index 41c8eeead4..13f4fba9ba 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
@@ -1,10 +1,8 @@
 package org.eclipse.e4.tools.emf.ui.internal;
 
-import org.eclipse.e4.tools.services.AbstractBundleResourceProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.e4.tools.services.BasicResourceProvider;
 
-public class ResourceProvider extends AbstractBundleResourceProvider {
+public class ResourceProvider extends BasicResourceProvider {
 	public static final String IMG_Addons = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Addons"; //$NON-NLS-1$
 	public static final String IMG_Application = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Application"; //$NON-NLS-1$
 	public static final String IMG_Area_vertical = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Area_vertical"; //$NON-NLS-1$
@@ -98,12 +96,9 @@ public class ResourceProvider extends AbstractBundleResourceProvider {
 	public static final String IMG_Wizban16_newexp_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.newexp_wiz"; //$NON-NLS-1$
 	public static final String IMG_Wizban16_typerefact_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.typerefact_wiz"; //$NON-NLS-1$
 
-	public Image getFont(Display display, String key) {
-		return null;
-	}
-
-	public Image getColor(Display display, String key) {
-		return null;
-	}
-
+	public static final String COLOR_XML_COMMENT = "COLOR_org.eclipse.e4.tools.emf.ui.XML_COMMENT"; //$NON-NLS-1$
+	public static final String COLOR_PROC_INSTR = "COLOR_org.eclipse.e4.tools.emf.ui.PROC_INSTR"; //$NON-NLS-1$
+	public static final String COLOR_STRING = "COLOR_org.eclipse.e4.tools.emf.ui.STRING"; //$NON-NLS-1$
+	public static final String COLOR_DEFAULT = "COLOR_org.eclipse.e4.tools.emf.ui.DEFAULT"; //$NON-NLS-1$
+	public static final String COLOR_TAG = "COLOR_org.eclipse.e4.tools.emf.ui.TAG"; //$NON-NLS-1$	
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 78a07d74e9..e6a382381e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -115,7 +115,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowSharedElementsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowTrimEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.AnnotationAccess;
-import org.eclipse.e4.tools.emf.ui.internal.common.xml.ColorManager;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.EMFDocumentResourceMediator;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.XMLConfiguration;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.XMLPartitionScanner;
@@ -324,10 +323,9 @@ private Control createXMITab(Composite composite) {
 
 		final AnnotationModel model = new AnnotationModel();
 		VerticalRuler verticalRuler = new VerticalRuler(VERTICAL_RULER_WIDTH, new AnnotationAccess(resourcePool));
-		ColorManager colorManager = new ColorManager();
 		int styles = SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION;
 		SourceViewer viewer = new SourceViewer(composite, verticalRuler, styles);
-		viewer.configure(new XMLConfiguration(colorManager));
+		viewer.configure(new XMLConfiguration(resourcePool));
 		viewer.setEditable(project != null);
 
 		final IDocument document = emfDocumentProvider.getDocument();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/ColorManager.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/ColorManager.java
deleted file mode 100644
index 4a3a225d66..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/ColorManager.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.xml;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-
-public class ColorManager {
-
-	protected Map<RGB, Color> fColorTable = new HashMap<RGB, Color>(10);
-
-	public void dispose() {
-		Iterator<Color> e = fColorTable.values().iterator();
-		while (e.hasNext())
-			((Color) e.next()).dispose();
-	}
-
-	public Color getColor(RGB rgb) {
-		Color color = (Color) fColorTable.get(rgb);
-		if (color == null) {
-			color = new Color(Display.getCurrent(), rgb);
-			fColorTable.put(rgb, color);
-		}
-		return color;
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
index 42080119a1..ea8ed3b260 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.xml;
 
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.ITextDoubleClickStrategy;
 import org.eclipse.jface.text.TextAttribute;
@@ -24,10 +26,10 @@ public class XMLConfiguration extends SourceViewerConfiguration {
 	private XMLDoubleClickStrategy doubleClickStrategy;
 	private XMLTagScanner tagScanner;
 	private XMLScanner scanner;
-	private ColorManager colorManager;
+	private IResourcePool pool;
 
-	public XMLConfiguration(ColorManager colorManager) {
-		this.colorManager = colorManager;
+	public XMLConfiguration(IResourcePool pool) {
+		this.pool = pool;
 	}
 
 	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
@@ -42,16 +44,16 @@ public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewe
 
 	protected XMLScanner getXMLScanner() {
 		if (scanner == null) {
-			scanner = new XMLScanner(colorManager);
-			scanner.setDefaultReturnToken(new Token(new TextAttribute(colorManager.getColor(IXMLColorConstants.DEFAULT))));
+			scanner = new XMLScanner(pool);
+			scanner.setDefaultReturnToken(new Token(new TextAttribute(pool.getColorUnchecked(ResourceProvider.COLOR_DEFAULT))));
 		}
 		return scanner;
 	}
 
 	protected XMLTagScanner getXMLTagScanner() {
 		if (tagScanner == null) {
-			tagScanner = new XMLTagScanner(colorManager);
-			tagScanner.setDefaultReturnToken(new Token(new TextAttribute(colorManager.getColor(IXMLColorConstants.TAG))));
+			tagScanner = new XMLTagScanner(pool);
+			tagScanner.setDefaultReturnToken(new Token(new TextAttribute(pool.getColorUnchecked(ResourceProvider.COLOR_TAG))));
 		}
 		return tagScanner;
 	}
@@ -67,7 +69,7 @@ public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceVie
 		reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
 		reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
 
-		NonRuleBasedDamagerRepairer ndr = new NonRuleBasedDamagerRepairer(new TextAttribute(colorManager.getColor(IXMLColorConstants.XML_COMMENT)));
+		NonRuleBasedDamagerRepairer ndr = new NonRuleBasedDamagerRepairer(new TextAttribute(pool.getColorUnchecked(ResourceProvider.COLOR_XML_COMMENT)));
 		reconciler.setDamager(ndr, XMLPartitionScanner.XML_COMMENT);
 		reconciler.setRepairer(ndr, XMLPartitionScanner.XML_COMMENT);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java
index 7eaafe0632..1e4329581f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.xml;
 
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.jface.text.TextAttribute;
 import org.eclipse.jface.text.rules.IRule;
 import org.eclipse.jface.text.rules.IToken;
@@ -20,8 +22,8 @@
 
 public class XMLScanner extends RuleBasedScanner {
 
-	public XMLScanner(ColorManager manager) {
-		IToken procInstr = new Token(new TextAttribute(manager.getColor(IXMLColorConstants.PROC_INSTR)));
+	public XMLScanner(IResourcePool pool) {
+		IToken procInstr = new Token(new TextAttribute(pool.getColorUnchecked(ResourceProvider.COLOR_PROC_INSTR)));
 
 		IRule[] rules = new IRule[2];
 		// Add rule for processing instructions
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java
index 47ccf71b98..3a12036884 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.xml;
 
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.jface.text.TextAttribute;
 import org.eclipse.jface.text.rules.IRule;
 import org.eclipse.jface.text.rules.IToken;
@@ -20,8 +22,8 @@
 
 public class XMLTagScanner extends RuleBasedScanner {
 
-	public XMLTagScanner(ColorManager manager) {
-		IToken string = new Token(new TextAttribute(manager.getColor(IXMLColorConstants.STRING)));
+	public XMLTagScanner(IResourcePool pool) {
+		IToken string = new Token(new TextAttribute(pool.getColorUnchecked(ResourceProvider.COLOR_STRING)));
 
 		IRule[] rules = new IRule[3];
 
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/AbstractBundleResourceProvider.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java
similarity index 57%
rename from bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/AbstractBundleResourceProvider.java
rename to bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java
index 6fda1278b5..30944d79fe 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/AbstractBundleResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java
@@ -7,13 +7,16 @@
 
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Display;
 import org.osgi.framework.BundleContext;
 
-public abstract class AbstractBundleResourceProvider implements IResourceProviderService {
-	private Map<String, String> properties;
-	private BundleContext context;
+public abstract class BasicResourceProvider implements IResourceProviderService {
+	protected Map<String, String> properties;
+	protected BundleContext context;
 	
 	public void activate(BundleContext context, Map<String, String> properties) {
 		this.properties = properties;
@@ -44,4 +47,21 @@ public Image getImage(Display display, String key) {
 		// TODO Auto-generated method stub
 		return null;
 	}
+	
+	public Font getFont(Display display, String key) {
+		return null;
+	}
+
+	public Color getColor(Display display, String key) {
+		String color = properties.get(key);
+		if (color.startsWith("rgb")) {
+			String rgb = color.substring(color.indexOf('(')+1, color.indexOf(')'));
+			String[] cols = rgb.split(",");
+			int r = Integer.parseInt(cols[0].trim());
+			int g = Integer.parseInt(cols[1].trim());
+			int b = Integer.parseInt(cols[2].trim());
+			return new Color(display, new RGB(r,g,b));
+		}
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceProviderService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceProviderService.java
index 5c047d05c5..70413f2bf0 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceProviderService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceProviderService.java
@@ -1,10 +1,12 @@
 package org.eclipse.e4.tools.services;
 
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
 
 public interface IResourceProviderService {
 	public Image getImage(Display display, String key);
-	public Image getFont(Display display, String key);
-	public Image getColor(Display display, String key);
+	public Font getFont(Display display, String key);
+	public Color getColor(Display display, String key);
 }
\ No newline at end of file

From cf23674051375fbde3a914db9319be2946c398ca Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 29 Jan 2011 14:05:12 +0000
Subject: [PATCH 0290/1286] Bug 316371 - [ModelTooling] ModelEditor should be
 multipart editors which allows to edit xml or via UI

---
 .../tools/emf/ui/common/XMIModelResource.java | 25 +++++++++++++++++--
 .../xml/EMFDocumentResourceMediator.java      |  9 +++----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
index c9f53fb4b9..ab131ba7b0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
@@ -16,20 +16,24 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
 import org.eclipse.e4.ui.internal.workbench.E4XMIResourceFactory;
 import org.eclipse.emf.common.command.BasicCommandStack;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.command.CommandStackListener;
 import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
@@ -70,11 +74,28 @@ public IObservableList getRoot() {
 		return list;
 	}
 
-	public void replaceRoot(EObject eobject) {
+	public void replaceRoot(EObject eObject) {
+		E4XMIResource resource = (E4XMIResource) eObject.eResource();
+		Map<EObject, String> idMap = new HashMap<EObject, String>();
+		idMap.put(eObject, resource.getID(eObject));
+
+		TreeIterator<EObject> it = EcoreUtil.getAllContents(eObject, true);
+		while (it.hasNext()) {
+			EObject o = it.next();
+			resource = (E4XMIResource) o.eResource();
+			idMap.put(o, resource.getID(o));
+		}
+
+		resource = (E4XMIResource) ((EObject) list.get(0)).eResource();
+
 		Command cmdRemove = new RemoveCommand(getEditingDomain(), resource.getContents(), list.get(0));
-		Command cmdAdd = new AddCommand(getEditingDomain(), resource.getContents(), eobject);
+		Command cmdAdd = new AddCommand(getEditingDomain(), resource.getContents(), eObject);
 		CompoundCommand cmd = new CompoundCommand(Arrays.asList(cmdRemove, cmdAdd));
 		getEditingDomain().getCommandStack().execute(cmd);
+
+		for (Entry<EObject, String> e : idMap.entrySet()) {
+			resource.setID(e.getKey(), e.getValue());
+		}
 	}
 
 	public EditingDomain getEditingDomain() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
index 1907ecfe4e..5dd518af4a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
@@ -7,10 +7,9 @@
 import java.util.Collections;
 import java.util.List;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.DocumentEvent;
 import org.eclipse.jface.text.IDocumentListener;
@@ -34,7 +33,7 @@ public void documentChanged(DocumentEvent event) {
 				}
 
 				String doc = document.get();
-				XMIResourceImpl res = new XMIResourceImpl();
+				E4XMIResource res = new E4XMIResource();
 				try {
 					res.load(new InputSource(new StringReader(doc)), null);
 					modelResource.replaceRoot(res.getContents().get(0));
@@ -80,8 +79,8 @@ public Document getDocument() {
 	}
 
 	private String toXMI(EObject root) {
-		XMIResourceImpl resource = new XMIResourceImpl();
-		resource.getContents().add(EcoreUtil.copy(root));
+		E4XMIResource resource = (E4XMIResource) root.eResource();
+		// resource.getContents().add(EcoreUtil.copy(root));
 		StringWriter writer = new StringWriter();
 		try {
 			resource.save(writer, null);

From 25a6bc60d40f4ba5c19fec12dbc5c51c4beae137 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 29 Jan 2011 15:12:17 +0000
Subject: [PATCH 0291/1286] Bug 335587 - [ModelTooling] NPE thrown when using
 'New Addon Class' wizard

---
 .../internal/tools/wizards/classes/AbstractNewClassPage.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index 91584d662d..a304714fa2 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -347,6 +347,9 @@ public PackageFragmentRootToStringConverter() {
 
 		public Object convert(Object fromObject) {
 			IPackageFragmentRoot f = (IPackageFragmentRoot) fromObject;
+			if( f == null ) {
+				return "";
+			}
 			return f.getPath().makeRelative().toString();
 		}
 	}

From af8b71ad7c093faad6100b1b1903796a3dd15536 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 2 Feb 2011 23:08:20 +0000
Subject: [PATCH 0292/1286] Bug 335767 - [ModelTooling] Add support for NLS

---
 .../META-INF/MANIFEST.MF                      |   3 +-
 .../impl/AbstractTranslationProvider.java     | 225 ++++++++++++++++++
 .../PropertiesBundleTranslationProvider.java  | 186 ++-------------
 3 files changed, 241 insertions(+), 173 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/AbstractTranslationProvider.java

diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 445bfb48c2..25140262a7 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -4,7 +4,8 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.e4.tools.services
+Export-Package: org.eclipse.e4.tools.services,
+ org.eclipse.e4.tools.services.impl;x-friends:="org.eclipse.e4.tools.emf.ui"
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
  org.eclipse.equinox.common;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/AbstractTranslationProvider.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/AbstractTranslationProvider.java
new file mode 100644
index 0000000000..c255ee13cb
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/AbstractTranslationProvider.java
@@ -0,0 +1,225 @@
+/*******************************************************************************
+ * Copyright (c) 2011 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.services.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.PropertyResourceBundle;
+import java.util.ResourceBundle;
+import org.eclipse.osgi.service.localization.BundleLocalization;
+
+/**
+ * The lookup of the translation the same than the one in {@link BundleLocalization} which is based
+ * upon the value found in equinox.root.locale which defaults to "en":
+ * <ul>
+ * <li>If set to empty string then the search order for:
+ * <ul>
+ * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
+ * <li>bn + Ls + "_" + Cs</li>
+ * <li>bn + Ls</li>
+ * <li>bn + Ld + "_" + Cd + "_" + Vd</li>
+ * <li>bn + Ld + "_" + Cd</li>
+ * <li>bn + Ld</li>
+ * </ul>
+ * </li>
+ * <li>If Ls equals the value of equinox.root.locale then the following search order is used:
+ * <ul>
+ * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
+ * <li>bn + Ls + "_" + Cs</li>
+ * <li>bn + Ls</li>
+ * <li>bn + Ld + "_" + Cd + "_" + Vd</li>
+ * <li>bn + Ld + "_" + Cd</li>
+ * <li>bn + Ld</li>
+ * </ul>
+ * </li>
+ * </ul>
+ * Where bn is this bundle's localization basename, Ls, Cs and Vs are the specified locale
+ * (language, country, variant) and Ld, Cd and Vd are the default locale (language, country,
+ * variant).
+ */
+public abstract class AbstractTranslationProvider {
+	final static String DEFAULT_ROOT = getEquinoxRootLocale();
+
+	private final Hashtable<String, BundleResourceBundle> cache = new Hashtable<String, BundleResourceBundle>(
+			5);
+
+	private static String getEquinoxRootLocale() {
+		// Logic from FrameworkProperties.getProperty("equinox.root.locale", "en")
+		String root = System.getProperties().getProperty("equinox.root.locale");
+		if (root == null) {
+			root = "en";
+		}
+		return root;
+	}
+	
+	protected abstract InputStream getResourceAsStream(String name);
+	protected abstract String getBasename();
+
+	public String translate(String locale, String key) {
+		String defaultLocale = Locale.getDefault().toString();
+		String localeString = locale;
+		ResourceBundle bundle = getResourceBundle(locale.toString(),
+				defaultLocale.equals(localeString));
+		try {
+			if( bundle == null ) {
+				return key;
+			}
+			return bundle.getString(key);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return key;
+		}
+
+	}
+
+	private ResourceBundle getResourceBundle(String localeString, boolean isDefaultLocale) {
+		BundleResourceBundle resourceBundle = lookupResourceBundle(localeString);
+		if (isDefaultLocale)
+			return (ResourceBundle) resourceBundle;
+		// need to determine if this is resource bundle is an empty stem
+		// if it is then the default locale should be used
+		if (resourceBundle == null || resourceBundle.isStemEmpty())
+			return (ResourceBundle) lookupResourceBundle(Locale.getDefault().toString());
+		return (ResourceBundle) resourceBundle;
+	}
+
+	private interface BundleResourceBundle {
+		void setParent(ResourceBundle parent);
+
+		boolean isEmpty();
+
+		boolean isStemEmpty();
+	}
+
+	private BundleResourceBundle lookupResourceBundle(String localeString) {
+		// get the localization header as late as possible to avoid accessing the raw headers
+		// getting the first value from the raw headers forces the manifest to be parsed (bug
+		// 332039)
+		String localizationHeader = getBasename();
+		synchronized (cache) {
+			BundleResourceBundle result = cache.get(localeString);
+			if (result != null)
+				return result.isEmpty() ? null : result;
+			String[] nlVarients = buildNLVariants(localeString);
+			BundleResourceBundle parent = null;
+
+			for (int i = nlVarients.length - 1; i >= 0; i--) {
+				BundleResourceBundle varientBundle = null;
+				InputStream resourceStream = getResourceAsStream(localizationHeader
+						+ (nlVarients[i].equals("") ? nlVarients[i] : '_' + nlVarients[i])
+						+ ".properties");
+
+				if (resourceStream == null) {
+					varientBundle = cache.get(nlVarients[i]);
+				} else {
+					try {
+						varientBundle = new LocalizationResourceBundle(resourceStream);
+					} catch (IOException e) {
+						// ignore and continue
+					} finally {
+						if (resourceStream != null) {
+							try {
+								resourceStream.close();
+							} catch (IOException e3) {
+								// Ignore exception
+							}
+						}
+					}
+				}
+
+				if (varientBundle == null) {
+					varientBundle = new EmptyResouceBundle(nlVarients[i]);
+				}
+				if (parent != null)
+					varientBundle.setParent((ResourceBundle) parent);
+				cache.put(nlVarients[i], varientBundle);
+				parent = varientBundle;
+			}
+			result = cache.get(localeString);
+			return result.isEmpty() ? null : result;
+		}
+	}
+
+	private String[] buildNLVariants(String nl) {
+		List<String> result = new ArrayList<String>();
+		while (nl.length() > 0) {
+			result.add(nl);
+			int i = nl.lastIndexOf('_');
+			nl = (i < 0) ? "" : nl.substring(0, i); //$NON-NLS-1$
+		}
+		result.add(""); //$NON-NLS-1$
+		return result.toArray(new String[result.size()]);
+	}
+
+	private class LocalizationResourceBundle extends PropertyResourceBundle implements
+			BundleResourceBundle {
+		public LocalizationResourceBundle(InputStream in) throws IOException {
+			super(in);
+		}
+
+		public void setParent(ResourceBundle parent) {
+			super.setParent(parent);
+		}
+
+		public boolean isEmpty() {
+			return false;
+		}
+
+		public boolean isStemEmpty() {
+			return parent == null;
+		}
+	}
+
+	class EmptyResouceBundle extends ResourceBundle implements BundleResourceBundle {
+		private final String localeString;
+
+		public EmptyResouceBundle(String locale) {
+			super();
+			this.localeString = locale;
+		}
+
+		public Enumeration<String> getKeys() {
+			return null;
+		}
+
+		protected Object handleGetObject(String arg0) throws MissingResourceException {
+			return null;
+		}
+
+		public void setParent(ResourceBundle parent) {
+			super.setParent(parent);
+		}
+
+		public boolean isEmpty() {
+			if (parent == null)
+				return true;
+			return ((BundleResourceBundle) parent).isEmpty();
+		}
+
+		public boolean isStemEmpty() {
+			if (DEFAULT_ROOT.equals(localeString))
+				return false;
+			if (parent == null)
+				return true;
+			return ((BundleResourceBundle) parent).isStemEmpty();
+		}
+	}
+	
+	protected void clearCache() {
+		cache.clear();
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/PropertiesBundleTranslationProvider.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/PropertiesBundleTranslationProvider.java
index c7ed9fb242..55242b699b 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/PropertiesBundleTranslationProvider.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/PropertiesBundleTranslationProvider.java
@@ -10,16 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.services.impl;
 
-import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.PropertyResourceBundle;
-import java.util.ResourceBundle;
+
 import org.eclipse.osgi.service.localization.BundleLocalization;
 
 /**
@@ -51,173 +43,23 @@
  * (language, country, variant) and Ld, Cd and Vd are the default locale (language, country,
  * variant).
  */
-public class PropertiesBundleTranslationProvider {
-	final static String DEFAULT_ROOT = getEquinoxRootLocale();
-
+public class PropertiesBundleTranslationProvider extends AbstractTranslationProvider {
 	private ClassLoader loader;
-	private String baseName;
-
-	private final Hashtable<String, BundleResourceBundle> cache = new Hashtable<String, BundleResourceBundle>(
-			5);
-
+	private String basename;
+	
 	public PropertiesBundleTranslationProvider(ClassLoader loader, String baseName) {
+		super();
+		this.basename = baseName;
 		this.loader = loader;
-		this.baseName = baseName;
-	}
-
-	private static String getEquinoxRootLocale() {
-		// Logic from FrameworkProperties.getProperty("equinox.root.locale", "en")
-		String root = System.getProperties().getProperty("equinox.root.locale");
-		if (root == null) {
-			root = "en";
-		}
-		return root;
-	}
-
-	public String translate(String locale, String key) {
-		String defaultLocale = Locale.getDefault().toString();
-		String localeString = locale;
-		ResourceBundle bundle = getResourceBundle(locale.toString(),
-				defaultLocale.equals(localeString));
-		try {
-			return bundle.getString(key);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return key;
-		}
-
-	}
-
-	private ResourceBundle getResourceBundle(String localeString, boolean isDefaultLocale) {
-		BundleResourceBundle resourceBundle = lookupResourceBundle(localeString);
-		if (isDefaultLocale)
-			return (ResourceBundle) resourceBundle;
-		// need to determine if this is resource bundle is an empty stem
-		// if it is then the default locale should be used
-		if (resourceBundle == null || resourceBundle.isStemEmpty())
-			return (ResourceBundle) lookupResourceBundle(Locale.getDefault().toString());
-		return (ResourceBundle) resourceBundle;
-	}
-
-	private interface BundleResourceBundle {
-		void setParent(ResourceBundle parent);
-
-		boolean isEmpty();
-
-		boolean isStemEmpty();
-	}
-
-	private BundleResourceBundle lookupResourceBundle(String localeString) {
-		// get the localization header as late as possible to avoid accessing the raw headers
-		// getting the first value from the raw headers forces the manifest to be parsed (bug
-		// 332039)
-		String localizationHeader = baseName;
-		synchronized (cache) {
-			BundleResourceBundle result = cache.get(localeString);
-			if (result != null)
-				return result.isEmpty() ? null : result;
-			String[] nlVarients = buildNLVariants(localeString);
-			BundleResourceBundle parent = null;
-
-			for (int i = nlVarients.length - 1; i >= 0; i--) {
-				BundleResourceBundle varientBundle = null;
-				InputStream resourceStream = loader.getResourceAsStream(localizationHeader
-						+ (nlVarients[i].equals("") ? nlVarients[i] : '_' + nlVarients[i])
-						+ ".properties");
-
-				if (resourceStream == null) {
-					varientBundle = cache.get(nlVarients[i]);
-				} else {
-					try {
-						varientBundle = new LocalizationResourceBundle(resourceStream);
-					} catch (IOException e) {
-						// ignore and continue
-					} finally {
-						if (resourceStream != null) {
-							try {
-								resourceStream.close();
-							} catch (IOException e3) {
-								// Ignore exception
-							}
-						}
-					}
-				}
-
-				if (varientBundle == null) {
-					varientBundle = new EmptyResouceBundle(nlVarients[i]);
-				}
-				if (parent != null)
-					varientBundle.setParent((ResourceBundle) parent);
-				cache.put(nlVarients[i], varientBundle);
-				parent = varientBundle;
-			}
-			result = cache.get(localeString);
-			return result.isEmpty() ? null : result;
-		}
 	}
 
-	private String[] buildNLVariants(String nl) {
-		List<String> result = new ArrayList<String>();
-		while (nl.length() > 0) {
-			result.add(nl);
-			int i = nl.lastIndexOf('_');
-			nl = (i < 0) ? "" : nl.substring(0, i); //$NON-NLS-1$
-		}
-		result.add(""); //$NON-NLS-1$
-		return result.toArray(new String[result.size()]);
-	}
-
-	private class LocalizationResourceBundle extends PropertyResourceBundle implements
-			BundleResourceBundle {
-		public LocalizationResourceBundle(InputStream in) throws IOException {
-			super(in);
-		}
-
-		public void setParent(ResourceBundle parent) {
-			super.setParent(parent);
-		}
-
-		public boolean isEmpty() {
-			return false;
-		}
-
-		public boolean isStemEmpty() {
-			return parent == null;
-		}
+	@Override
+	protected InputStream getResourceAsStream(String name) {
+		return loader.getResourceAsStream(name);
 	}
-
-	class EmptyResouceBundle extends ResourceBundle implements BundleResourceBundle {
-		private final String localeString;
-
-		public EmptyResouceBundle(String locale) {
-			super();
-			this.localeString = locale;
-		}
-
-		public Enumeration<String> getKeys() {
-			return null;
-		}
-
-		protected Object handleGetObject(String arg0) throws MissingResourceException {
-			return null;
-		}
-
-		public void setParent(ResourceBundle parent) {
-			super.setParent(parent);
-		}
-
-		public boolean isEmpty() {
-			if (parent == null)
-				return true;
-			return ((BundleResourceBundle) parent).isEmpty();
-		}
-
-		public boolean isStemEmpty() {
-			if (DEFAULT_ROOT.equals(localeString))
-				return false;
-			if (parent == null)
-				return true;
-			return ((BundleResourceBundle) parent).isStemEmpty();
-		}
+	
+	@Override
+	protected String getBasename() {
+		return basename;
 	}
-}
+}
\ No newline at end of file

From 253f58ee31d331bbb7d0f0763e3ed6832a8fcb72 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 2 Feb 2011 23:44:13 +0000
Subject: [PATCH 0293/1286] Bug 335767 - [ModelTooling] Add support for NLS

---
 .../OSGI-INF/resources.properties             |   1 +
 .../icons/full/obj16/world_edit.png           | Bin 0 -> 945 bytes
 .../component/AbstractComponentEditor.java    |  20 ++-
 .../e4/tools/emf/ui/internal/Messages.java    |   6 +-
 .../tools/emf/ui/internal/Messages.properties |   5 +-
 .../emf/ui/internal/ResourceProvider.java     |   1 +
 .../emf/ui/internal/common/ModelEditor.java   |  16 ++
 .../internal/common/component/AreaEditor.java |   4 +-
 .../common/component/ControlFactory.java      |  45 +++++
 .../internal/common/component/MenuEditor.java |   7 +-
 .../common/component/MenuItemEditor.java      |   6 +-
 .../component/PartDescriptorEditor.java       |   3 +-
 .../internal/common/component/PartEditor.java |   3 +-
 .../common/component/PerspectiveEditor.java   |   7 +-
 .../common/component/PlaceholderEditor.java   |  11 +-
 .../common/component/ToolItemEditor.java      |   6 +-
 .../common/component/WindowEditor.java        | 101 +++--------
 .../ProjectOSGiTranslationProvider.java       | 160 ++++++++++++++++++
 .../properties/ResourceBundleEditor.java      |  15 ++
 .../properties/ResourceBundleEntry.java       |  19 +++
 20 files changed, 317 insertions(+), 119 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/world_edit.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEntry.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
index 598a3c1fc8..bf7fc81021 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
@@ -84,6 +84,7 @@ IMG_org.eclipse.e4.tools.emf.ui.obj16.zoom=/icons/full/obj16/zoom.png
 IMG_org.eclipse.e4.tools.emf.ui.obj16.application_form=/icons/full/obj16/application_form.png
 IMG_org.eclipse.e4.tools.emf.ui.obj16.chart_organisation=/icons/full/obj16/chart_organisation.png
 IMG_org.eclipse.e4.tools.emf.ui.obj16.error_obj=/icons/full/obj16/error_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.obj16.world_edit=/icons/full/obj16/world_edit.png
 
 IMG_org.eclipse.e4.tools.emf.ui.wizban.fieldrefact_wiz=/icons/full/wizban/fieldrefact_wiz.png
 IMG_org.eclipse.e4.tools.emf.ui.wizban.import_wiz=/icons/full/wizban/import_wiz.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/world_edit.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/world_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..00794d4088a00c6baf0c26268ce127cc2c0277a8
GIT binary patch
literal 945
zcmV;i15W&jP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#LrFwIR5;6J
zlW$NHbQs6?qTc0oy{hYVFS_f6ciq*i^iDC1uJkSf3jsB{p~W~o!__QLP*9uX;BW^6
z2{HagjX&Ek7-Jx~#x}OGzmCapYRGCr7y}gi^cz<l+KbP-=ktA@7vDz$NH$V9a$t*~
zT@VrcC0G{B3c6*(``>wbexvw|;D@Bpf2#?5tPj)lD7w%noq+*50?iyU<vf!1Wf?v(
z?0N2q03kgq7-<Zi=iZ`&P~3|rK8`lxL_g)H(d*^1Yn*o12o=^d<Y?2~AGhy*eq%sW
zL*NWk3ugQa7JPF)oU<;PCw=@l6-MQlMEPrg?}n^seFIcj6r^8y*RUQS<hKM5qYupJ
z=Ja&T>*<XT(R<rVUGN4MJt1Uz2eKXur)_#Pkt!TBTHdcsT}@MO-<=HjNk3JM{dYYr
zb6vFEw_=UCDR=r%+HN4#ImkB}IpWu#b{-_y^bwO?rMNDoQd0SbCm9f(_@jr$Xf5Tj
zOJchhOUy;#FHWRgc8aVv@+Xf`;@HKENzVL)4j$ZPZlVL@`JHRYfW`2<iBrL1WRr3<
zcL!;S*vV-fqhMedW#}qOyMmbS1S_|@nK3I#cz$MedW7-%Pm##3?N8jCGx3f4C<Sg6
z_0vXjTP);udPuLi&V~MJ;@+=WON@}XSwMVDM&L>w6AgL1SN!I(<g>xtJI>ioRNhm3
z8y=*@c8$zNJK5S0C$-Jo_k6|Ll7+?aK9-_;S@0|HYf><esd!zn`JO}+qgxxOL^svI
z;p?Y4>1rjrX%u;FB{MepKXNWhx3c)tdmO*|ZNArkPMxVZ889e0pvz1Z#dze2>G{HV
zh$91qls28kbG1mEJ<L)hkL73%^Wu_#kc%#6Vh%Sa<;Q}o^&;(Q-PKiYK1NTV24#H)
zK7#^xuZla?3>G7MiMzhUrQU&Dok7h|F~{5T*SG)I#1Af~Z4$+Bm-QZ|{agwxOcT_6
zh)MA>qt$8jm2IcNd=z7-0Y$4cDTf3vJ@HICtF~=Qxv<4hB7Kb&OBE~D3aq8uXgl}{
z-NV&r%qNoKYI3vS#s7WdzhrEE;bGanS0DGEO{4DI*0mjq%?Tm=CKwQ8KRy394wBI;
Te6@B!00000NkvXXu0mjfI-kC4

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 5786d640f7..1432201fd1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -13,14 +13,20 @@
 import java.util.Collections;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Named;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.core.services.translation.TranslationService;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
+import org.eclipse.e4.tools.emf.ui.internal.common.properties.ProjectOSGiTranslationProvider;
 import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -46,12 +52,20 @@ public abstract class AbstractComponentEditor {
 	@Inject
 	private ModelEditor editor;
 	@Inject
-	private IResourcePool resourcePool;
+	protected IResourcePool resourcePool;
 
 	@Inject
 	@Translation
 	protected Messages Messages;
 
+	@Inject
+	@Optional
+	private ProjectOSGiTranslationProvider translationProvider;
+
+	@Inject
+	@Named(TranslationService.LOCALE)
+	private String locale;
+
 	public EditingDomain getEditingDomain() {
 		return editingDomain;
 	}
@@ -100,4 +114,8 @@ public FeaturePath[] getLabelProperties() {
 	public List<Action> getActions(Object element) {
 		return Collections.emptyList();
 	}
+
+	protected String getLocalizedLabel(MUILabel element) {
+		return ControlFactory.getLocalizedLabel(translationProvider, element, locale);
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 63be298c7b..95ccf714c3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -362,10 +362,8 @@ public class Messages {
 	public String WindowEditor_AddMainMenu;
 	public String WindowEditor_TreeLabel;
 	public String WindowEditor_TreeLabelDescription;
-	public String WindowEditor_X;
-	public String WindowEditor_Y;
-	public String WindowEditor_Width;
-	public String WindowEditor_Height;
+
+	public String WindowEditor_Bounds;
 	public String WindowEditor_Label;
 	public String WindowEditor_Tooltip;
 	public String WindowEditor_IconURI;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 59e04fdbba..244f4bd0e5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -362,10 +362,7 @@ TrimmedWindowEditor_TreeLabel=Trimmed Window
 WindowEditor_AddMainMenu=Add Main Menu
 WindowEditor_TreeLabel=Window
 WindowEditor_TreeLabelDescription=Window bla bla bla
-WindowEditor_X=X
-WindowEditor_Y=Y
-WindowEditor_Width=Width
-WindowEditor_Height=Height
+WindowEditor_Bounds=Bounds(x,y,w,h)
 WindowEditor_Label=Label
 WindowEditor_Tooltip=Tooltip
 WindowEditor_IconURI=Icon URI
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
index 13f4fba9ba..f7b91e96a1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
@@ -89,6 +89,7 @@ public class ResourceProvider extends BasicResourceProvider {
 	public static final String IMG_Obj16_application_form = "IMG_org.eclipse.e4.tools.emf.ui.obj16.application_form"; //$NON-NLS-1$
 	public static final String IMG_Obj16_chart_organisation = "IMG_org.eclipse.e4.tools.emf.ui.obj16.chart_organisation"; //$NON-NLS-1$
 	public static final String IMG_Obj16_error_obj = "IMG_org.eclipse.e4.tools.emf.ui.obj16.error_obj"; //$NON-NLS-1$
+	public static final String IMG_Obj16_world_edit = "IMG_org.eclipse.e4.tools.emf.ui.obj16.world_edit"; //$NON-NLS-1$
 
 	public static final String IMG_Wizban16_fieldrefact_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.fieldrefact_wiz"; //$NON-NLS-1$
 	public static final String IMG_Wizban16_import_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.import_wiz"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index e6a382381e..ff86656d7f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -114,6 +114,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowSharedElementsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowTrimEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.properties.ProjectOSGiTranslationProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.AnnotationAccess;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.EMFDocumentResourceMediator;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.XMLConfiguration;
@@ -272,6 +273,21 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 		this.context = context;
 		this.context.set(ModelEditor.class, this);
 		this.obsManager = new ObservablesManager();
+		if (project != null) {
+			ProjectOSGiTranslationProvider translationProvider = new ProjectOSGiTranslationProvider(project) {
+				@Override
+				protected void clearCache() {
+					super.clearCache();
+					viewer.getControl().getDisplay().asyncExec(new Runnable() {
+
+						public void run() {
+							viewer.refresh();
+						}
+					});
+				}
+			};
+			context.set(ProjectOSGiTranslationProvider.class, translationProvider);
+		}
 	}
 
 	@PostConstruct
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 2f3af7ca9d..43dde29643 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -28,7 +28,6 @@
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
-import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
@@ -402,8 +401,7 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MArea o = (MArea) element;
-		return o.getLabel();
+		return getLocalizedLabel((MUILabel) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index c14d9ce8ac..fc15824a33 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -19,11 +19,14 @@
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.properties.ProjectOSGiTranslationProvider;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
@@ -270,7 +273,26 @@ public static void createTextField(Composite parent, String label, IObservableVa
 		gd.horizontalSpan = 2;
 		t.setLayoutData(gd);
 		context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master));
+	}
+
+	public static void createTranslatedTextField(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp, IResourcePool resourcePool, IProject project) {
+		Label l = new Label(parent, SWT.NONE);
+		l.setText(label);
+		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+		Text t = new Text(parent, SWT.BORDER);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		if (project == null) {
+			gd.horizontalSpan = 2;
+		}
+
+		t.setLayoutData(gd);
+		context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master));
 
+		if (project != null) {
+			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_world_edit));
+		}
 	}
 
 	public static void createFindImport(Composite parent, final Messages Messages, final AbstractComponentEditor editor, EMFDataBindingContext context) {
@@ -519,4 +541,27 @@ public static void createCheckBox(Composite parent, String label, IObservableVal
 		context.bindValue(selectionProp.observe(t), modelProp.observeDetail(master));
 
 	}
+
+	public static String getLocalizedLabel(ProjectOSGiTranslationProvider translationProvider, MUILabel element, String locale) {
+		if (translationProvider == null) {
+			if (element.getLocalizedLabel() != null && element.getLocalizedLabel().trim().length() > 0) {
+				return element.getLocalizedLabel();
+			}
+		}
+
+		if (element.getLabel() != null && element.getLabel().trim().length() > 0) {
+			String label = element.getLabel();
+			return tr(translationProvider, locale, label);
+		}
+		return null;
+	}
+
+	public static String tr(ProjectOSGiTranslationProvider translationProvider, String locale, String label) {
+		if (label.startsWith("%") && translationProvider != null) { //$NON-NLS-1$
+			String key = label.substring(1);
+			String translation = translationProvider.translate(locale, key);
+			return translation == key ? label : translation;
+		}
+		return label;
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 90e6eda011..98182644a7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -523,12 +523,7 @@ public String getLabel(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MMenu menu = (MMenu) element;
-
-		if (menu.getLabel() != null && menu.getLabel().trim().length() > 0) {
-			return menu.getLabel();
-		}
-		return null;
+		return getLocalizedLabel((MUILabel) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 251fda8fef..d1698a348c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -332,11 +332,7 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MUILabel label = (MUILabel) element;
-		if (label.getLabel() != null && label.getLabel().trim().length() > 0) {
-			return label.getLabel();
-		}
-		return null;
+		return getLocalizedLabel((MUILabel) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index d78611042d..ac6200f940 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -412,8 +412,7 @@ public void handleValueChange(ValueChangeEvent event) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MPartDescriptor o = (MPartDescriptor) element;
-		return o.getLabel();
+		return getLocalizedLabel((MUILabel) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index af1321b106..c730592713 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -360,8 +360,7 @@ public void handleValueChange(ValueChangeEvent event) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MPart o = (MPart) element;
-		return o.getLabel();
+		return getLocalizedLabel((MUILabel) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index fe375de2a1..ef4351da87 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -147,12 +147,7 @@ public String getLabel(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MPerspective perspective = (MPerspective) element;
-		if (perspective.getLabel() != null && perspective.getLabel().trim().length() > 0) {
-			return perspective.getLabel();
-		}
-
-		return null;
+		return getLocalizedLabel((MUILabel) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index ab49f99d0b..e1051d681b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -77,8 +77,10 @@ public String getDetailLabel(Object element) {
 			b.append(((EObject) pl.getRef()).eClass().getName());
 			if (pl.getRef() instanceof MUILabel) {
 				MUILabel label = (MUILabel) pl.getRef();
-				if (label.getLabel() != null && label.getLabel().trim().length() > 0) {
-					b.append(" (" + label.getLabel() + ")"); //$NON-NLS-1$//$NON-NLS-2$
+				String l = getLocalizedLabel(label);
+
+				if (l != null && l.trim().length() > 0) {
+					b.append(" (" + l + ")"); //$NON-NLS-1$//$NON-NLS-2$
 				} else if (label.getTooltip() != null && label.getTooltip().trim().length() > 0) {
 					b.append(" (" + label.getTooltip() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 				} else {
@@ -194,8 +196,9 @@ public Object convert(Object fromObject) {
 						EObject o = (EObject) fromObject;
 						if (o instanceof MUILabel) {
 							MUILabel label = (MUILabel) o;
-							if (!Util.isNullOrEmpty(label.getLabel())) {
-								return o.eClass().getName() + " - " + label.getLabel(); //$NON-NLS-1$
+							String l = getLocalizedLabel(label);
+							if (!Util.isNullOrEmpty(l)) {
+								return o.eClass().getName() + " - " + l; //$NON-NLS-1$
 							}
 						}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 43e56a95e4..e80b357a93 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -299,8 +299,10 @@ public IObservableList getChildList(Object element) {
 	@Override
 	public String getDetailLabel(Object element) {
 		MToolItem item = (MToolItem) element;
-		if (item.getLabel() != null && item.getLabel().trim().length() > 0) {
-			return item.getLabel();
+		String l = getLocalizedLabel(item);
+
+		if (l != null && l.trim().length() > 0) {
+			return l;
 		} else if (item.getTooltip() != null && item.getTooltip().trim().length() > 0) {
 			return item.getTooltip();
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 31ee67b856..17dbc2f497 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -177,98 +177,43 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.WindowEditor_X);
+			l.setText(Messages.WindowEditor_Bounds);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
+			Composite comp = new Composite(parent, SWT.NONE);
+			GridLayout layout = new GridLayout(4, true);
+			layout.marginWidth = 0;
+			layout.marginHeight = 0;
+			comp.setLayout(layout);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__X).observeDetail(getMaster()));
-		}
+			comp.setLayoutData(gd);
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.WindowEditor_Y);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			Text t = new Text(comp, SWT.BORDER | SWT.TRAIL);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__X).observeDetail(getMaster()));
 
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
+			t = new Text(comp, SWT.BORDER | SWT.TRAIL);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__Y).observeDetail(getMaster()));
-		}
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.WindowEditor_Width);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
+			t = new Text(comp, SWT.BORDER | SWT.TRAIL);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__WIDTH).observeDetail(getMaster()));
-		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.WindowEditor_Height);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
+			t = new Text(comp, SWT.BORDER | SWT.TRAIL);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__HEIGHT).observeDetail(getMaster()));
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.WindowEditor_Label);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
-		}
-
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.WindowEditor_Tooltip);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
-		}
+		ControlFactory.createTranslatedTextField(parent, Messages.WindowEditor_Label, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
+		ControlFactory.createTranslatedTextField(parent, Messages.WindowEditor_Tooltip, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool, project);
+		ControlFactory.createTranslatedTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE), resourcePool, project);
 
 		// ------------------------------------------------------------
 		{
@@ -424,11 +369,7 @@ public void handleValueChange(ValueChangeEvent event) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MWindow window = (MWindow) element;
-		if (window.getLabel() != null && window.getLabel().trim().length() > 0) {
-			return window.getLabel();
-		}
-		return null;
+		return getLocalizedLabel((MUILabel) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
new file mode 100644
index 0000000000..112b60e1a3
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
@@ -0,0 +1,160 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.properties;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.e4.tools.services.impl.AbstractTranslationProvider;
+
+public abstract class ProjectOSGiTranslationProvider extends AbstractTranslationProvider {
+	private IProject project;
+	private List<String> observedFiles = new ArrayList<String>();
+	private IResourceChangeListener listener;
+	private String basename;
+
+	public ProjectOSGiTranslationProvider(IProject project) {
+		super();
+		this.project = project;
+		this.listener = new IResourceChangeListener() {
+
+			public void resourceChanged(IResourceChangeEvent event) {
+				if (event.getType() == IResourceChangeEvent.POST_CHANGE) {
+					try {
+						event.getDelta().accept(new IResourceDeltaVisitor() {
+
+							public boolean visit(IResourceDelta delta) throws CoreException {
+								return ProjectOSGiTranslationProvider.this.visit(delta);
+							}
+						});
+					} catch (CoreException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+			}
+		};
+		this.project.getWorkspace().addResourceChangeListener(listener);
+		IFile f = this.project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
+		if (f.exists()) {
+			handleManifestChange(f);
+		} else {
+			basename = "OSGI-INF/l10n/bundle"; //$NON-NLS-1$
+		}
+	}
+
+	boolean visit(IResourceDelta delta) throws CoreException {
+		if (delta.getResource() instanceof IWorkspaceRoot) {
+			return true;
+		} else if (delta.getResource().equals(project)) {
+			return true;
+		} else if (delta.getResource().getProjectRelativePath().toString().equals("META-INF")) { //$NON-NLS-1$
+			return true;
+		} else if (delta.getResource().getProjectRelativePath().toString().equals("META-INF/MANIFEST.MF")) { //$NON-NLS-1$
+			handleManifestChange((IFile) delta.getResource());
+			return false;
+		}
+
+		for (String o : observedFiles) {
+			if (delta.getResource().getProjectRelativePath().toString().equals(o)) {
+				clearCache();
+				return false;
+			}
+
+			String[] p = o.split("/"); //$NON-NLS-1$
+			int i = 0;
+			String path = ""; //$NON-NLS-1$
+			do {
+				path += p[i];
+				if (delta.getResource().getProjectRelativePath().toString().equals(path)) {
+					return true;
+				}
+				path += "/"; //$NON-NLS-1$
+			} while (++i < p.length);
+		}
+
+		return false;
+	}
+
+	private void handleManifestChange(IFile file) {
+		try {
+			InputStream in = file.getContents();
+			BufferedReader r = new BufferedReader(new InputStreamReader(in));
+			String line;
+			String newValue = "OSGI-INF/l10n/bundle"; //$NON-NLS-1$
+			while ((line = r.readLine()) != null) {
+				if (line.startsWith("Bundle-Localization:")) { //$NON-NLS-1$
+					newValue = line.substring("Bundle-Localization:".length()).trim(); //$NON-NLS-1$
+					break;
+				}
+			}
+
+			r.close();
+
+			if (!newValue.equals(basename)) {
+				if (basename != null) {
+					basename = newValue;
+					clearCache();
+				} else {
+					basename = newValue;
+				}
+			}
+
+		} catch (CoreException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	protected InputStream getResourceAsStream(String name) {
+		IFile f = project.getFile(name);
+		observedFiles.add(name);
+		try {
+			if (f.exists()) {
+				return f.getContents();
+			} else {
+				return null;
+			}
+		} catch (CoreException e) {
+			return null;
+		}
+	}
+
+	@Override
+	protected void clearCache() {
+		super.clearCache();
+		observedFiles.clear();
+	}
+
+	@Override
+	protected String getBasename() {
+		return basename;
+	}
+
+	public void dispose() {
+
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEditor.java
new file mode 100644
index 0000000000..4c8495ab5b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEditor.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.properties;
+
+public class ResourceBundleEditor {
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEntry.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEntry.java
new file mode 100644
index 0000000000..63b9f4151f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEntry.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.properties;
+
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+public class ResourceBundleEntry {
+	public String key;
+	public SortedMap<String, String> translations = new TreeMap<String, String>();
+}

From a9d46c3a0de8b0711f23759b095bcf0ccb760acd Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 8 Feb 2011 23:02:06 +0000
Subject: [PATCH 0294/1286] Bug 335767 - [ModelTooling] Add support for NLS

---
 .../OSGI-INF/resources.properties             |   1 +
 .../icons/full/wizban/extstr_wiz.png          | Bin 0 -> 6405 bytes
 .../e4/tools/emf/ui/internal/Messages.java    |  10 +
 .../tools/emf/ui/internal/Messages.properties |  11 +-
 .../emf/ui/internal/ResourceProvider.java     |   1 +
 .../emf/ui/internal/common/ModelEditor.java   |  12 +
 .../properties/ExternalizeStringHandler.java  | 237 ++++++++++++++++++
 .../ProjectOSGiTranslationProvider.java       |  29 ++-
 8 files changed, 288 insertions(+), 13 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/extstr_wiz.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
index bf7fc81021..300c6bab2b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
@@ -91,6 +91,7 @@ IMG_org.eclipse.e4.tools.emf.ui.wizban.import_wiz=/icons/full/wizban/import_wiz.
 IMG_org.eclipse.e4.tools.emf.ui.wizban.newclass_wiz=/icons/full/wizban/newclass_wiz.png
 IMG_org.eclipse.e4.tools.emf.ui.wizban.newexp_wiz=/icons/full/wizban/newexp_wiz.png
 IMG_org.eclipse.e4.tools.emf.ui.wizban.typerefact_wiz=/icons/full/wizban/typerefact_wiz.png
+IMG_org.eclipse.e4.tools.emf.ui.wizban.extstr_wiz=/icons/full/wizban/extstr_wiz.png
 
 COLOR_org.eclipse.e4.tools.emf.ui.XML_COMMENT=rgb(128, 0, 0)
 COLOR_org.eclipse.e4.tools.emf.ui.PROC_INSTR=rgb(128, 128, 128)
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/extstr_wiz.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/extstr_wiz.png
new file mode 100644
index 0000000000000000000000000000000000000000..74ff2458416eab9b8c998b51586397e1b99abd0b
GIT binary patch
literal 6405
zcmV+g8T#glP)<h;3K|Lk000e1NJLTq002t>002S=1^@s6A3-Z300009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde00d`2O+f$vv5tKEQIh}w03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`
z>R<o>I+y?e7jKeZ#YO-C4kAfJK~#9!?3;UVT-ANYKfiPD-KVsA*~Val2_zWvC?YXT
zoIrzdA4!3f&NNLrZ2(V7|42J64V~#fOkFojr_-d9%w&dUGLwXM3T-ASB$*D=7J{Kb
z-4JLgp~l!eELoPVm$lMrrQLh)Ilum~5ACjGkgSzlMD8Ejd-gu|oR5CL-}(K%=U(Aw
z+oIcF{o@Hwm6WP>snQ9g{hwiJ0u%sgRdUX0R+V()@%KEeuY7OVQzh$^lyjO^r&*^Y
z7CZMn3+ro-o=iJOMpY9E9;%(FCg1Lw_Y|zJ|L~M?N>WujRq;eXl?<vKfV|W7?-^L%
z_~(&Mr<xHkszAk>asmli;yu<qtZzOxl6FePk^rrkP+Fl=Ky(@RTDPzs{MXThDmhgR
zL@SV}fa*lZG=BG<h4uH3k9kftr%I{?hKSG&BvjAt-s=k1Lr;ulRp}5gO*{nO2wm#%
zbp`id7qGr_U_7W=Qv#sHa(pB7sxB`+txH(neQG@Glnz0RwnQNTUqpIUb;Y3G)vz9U
zX2Li}kD`gig0)m!uh%J}+MeHhSHk-KvlA(&bcxh+rq)RAi_ohMS^k{2j$r-Zxzjm?
ztf(%ELBJQ&o*1<%u*RPG>jSf0*WN^}W{_IP>pM-ggvk8Rn$Mpfu^W9AQy#@ncYGDt
z|9r4_+9^G%XP){6d}E~7wJAoe3M{9}T-UXAC{iUN4Pd0YBT_|FJGV+pWFE92&~*i+
zC+<c3;GX2>5A5D1&;HIa?}ig+f*^utjP$A^=;~OtX~#_>tM$Q(NClKsL5Ls??dJV6
zw@o5LYR9bvI!k%@&^2A<LqFOYJ$K<5OiDaMw=AI;{(k|hW<653p5?Y>Vf%tzbo6Z^
zw`DtS^l&a$dgWWa(V^S|_wb}wL{>fiwg;ATi-Kr&J85w{X>vPhaLZa-Q@yy<W;)*Y
zVRGlcA8-8dl^e?kztxg)=46c~sy11cTd~_McC8V?`rX+40Evzs(&;2#{>_hEQuy0@
z0X!oaW16MkcZD0a#qC;yK7#dg*ooKC;wV8nO(r^xnH#-#<Lu-8o}qJ<`G_ikbDDNe
zGk*IltJ$q;v)zCF^e8XBe59T~EH#Dry}NF!s82RV3nQrKV~in426PmUQ}nw3oKEg;
z8x}=e1&psspo&k+gy941+PCf7)%G79+&_>%+u5)&$k)KU`0^1h+}y)e+b>%3{qFnn
zL;U{UPomC2c?K^o<1|J+k03~pjLW2F26lG%|F(0w>la@*J2n+KvDLsi4Xnd=s;Dj~
z#G7Gl*s$fU4SicV{MwKEckSD@`%J)g?c3H5bT@o;?BM=^W1)46<W^FTLsxCTh>z~v
zvE+etb!HGCj3PRw-ykqP&UiS_r=VTT${Zcx7!#%Ax6#FtVX5L-M_{cctR>;x+rwED
zRw|L<<9qJJi1Z&i{GSIJf$iG2tsA%pxU;8c<Ha4BY&G#zM#e|jwQt+8$4<V`eP=jB
zHrcr_={(zDAz<dl$=YdVH++bZ^yM5Yq?n$bq8Js3!f7rjja{$=Kw=$9Yc*+|25uQ}
z7KLR*NQ%#`d-h_G{#OnkJg{ruw%x!@o)>)k@+)?AU;A^r=*{H_j3p3@heJde9Y1yP
z^DjNmA3Xfae17-+TzAQy=9J;AVF?{N!_4k4;k*>txjD8><w;E>nVw2Ao6b<2Ize!T
z>#ZYE0pya-wWpk}z(PnHpYfR~ZrQUJh5r9NeDJ?}`?g$s!=5|X(9?$vXE`!(jJdgK
zJaPEqNCbxSdV2Vk-JhU;#}MCm{5}RIUgJ~Oe|~;;6L{sd!DV%7sxXTP*bO@n5j-H<
zk;U^2#t6RWkw^rLP1q(_3KCmQ$4*nuVO*Qb9v{FHp~Lfd>a8Pe-E=;m*t3^RN8iOC
zxa#L|#_;;FHyIfj!V`xPhi4p~D4saR^QU>^xNzx~t^Dq%@8ZEn9%55&3%hsRjsVwP
za~UuE&rycQe!8GomWG{18@&0W*DR9Q8Zwy-s){;?XAHyD%0a=4tY)m$q*GX}+R(2}
z+<_QUp5f&;4xzw@ue+6z!W6F@eVNi+0UL!Bi<6W~GeC@I9KLa+lL1{FS)w@P{JuVZ
z`&U2B*B|~O7k0m&%PzQ@>-x8IegF1F3g(4{_JYEC!7(9|Nn>peP%I)*tX<X-=qdqP
z084>bm4s(Vdme}1I?UG69B&K{Fjo#K%*-%3c?!=sjGe*7MH0S8*+tkWNf^#CRhXn4
z&H~D<H~$h3Jb52q{>(oS1pb0_qRC=fAU0c5GgLwFeV=S5gL4+E;wxtiTdM_2v8p7D
zA?16-&M|yy5Tgzkm6<p_hS88{`YqIjdEomY3;@g(xW@PW+q0cHL>#J)t1rERl9}Z3
zm%qm?JAbpmLgq8|#d5O6>cz#5B@ziT>2$q-UsG5BmWpMie2>UVW#A~6TzC;T-}nnW
z{q)1Uc_hpO*B;zIaIEnr`@i_P1NoeP(~Bpb#M+odkl=$?_Vbh1pJdOKzeXmLs$0nL
z$OI=&jW?wit$J5eyZYxNAH2K{(Re~KnPiPw&AXvfB`}q^Wg5QAPoAdKo#)1zK8wM1
zzkcK=kG3YRU7b1Z`uLynogY8IV~78aY&wHl$C0r^luKo@*>oMuqyO?Bj7>~((FGfq
z+{u6V;lFe6(J$4319+Z?({p550CVL6#n~xJv85C{=3+}Jwmkjfb6mFLYHqygHweV_
zzxvvXO^It{m1Hu(9Ur@gqvJ0zUO3L?-c8I#GvIWAwS4Bb8<&;QKlj3`^=s=2fHA~t
zY+0uECto<p`1k<D**t|}p6TKwQ-w+L)00e1Px8!j2RLx>DL%CGV_dPlzaKbI&F%?n
z5)Hy9uf2n*e4cU?HU;YXjMm1^NA4V0*6Han9)I?`6p95R>j<3^Sx01**g0Zb$!(4u
z8D{Y43vAo65zh<yt&RGDry}d>G3e^8*AtdQ^3zjn$Zl@XshSrv+Ofsw0@md8#NNs2
ziHn!CI03x%#t1<E;QoQ90K!<QilKC*a-{q$M_)h6T|57zMW>P#l|Zdq7@q@J2lo#=
zxS~$mW?A`bpM8|$LxWt{bt!(}H67b}ejk7NH;=R~VV$Az&N|vT3-BwJm8;gXxoa!E
z=}p8@OeULdN-BT-mK*rgEjKi)6D|4Ia<u<<9jwsSLeqTWm`o-}rIPbW=28;Svk)DP
zV2r^yKn0wFt9_b^9HXw<ZuwmBeO12E>a!D3jBQ-_ZqFhs;y2ZHE!z8HqTm9N@N9lp
z2|81@53R&ftx7S@RYq88D>aEmomS7Qh<=T5Tmz&y78_ZO$`Mgvj#ArT4UCj>`@iys
za;7D))>3CBZnr?QLV{G_dbGtNv_T$L8unX{yXLl2Y-EWd(MS<3M;f)w4UdnO(@r%T
z#=6k8s{3F4<_~z{*_Y_*%q;o7ue>(Ep&vc41j`aX5Z9|xgHiRFI+SYV+W?AIfE5dL
zRtY0Z=u|X>a4yvHOo?(^U=59x166WOt2>J+1p@c~@oz0FW550GzgU`OIeZV>qt$<q
z&WnHz`&G@W`lxaRtX9t#YaNj@gwBdp6<aJ*7@Hzr3W?eh;D^V{#wk6u3Lt98;G5h|
z+MTm6h?RlCb=OKnt(sILv|2i%3P=^5h&m;7N(m&gPNLaRCP$|kot&ZQ+~V@#*;-bY
z2wts|m8GyVh<U3xm0O38+8&{qPQ&x=^)D-yC90JwsRR;Qm2xRI;}ZorIXcB;Iad32
zwfVAPojM(MIwjS(L{eJ{TXeQtMOvyF7-u(WOFmomvbvxGVih6>CB&4S%1p_6C-bxB
z#MqRK73Q?Ol*(yYutp}sgeo12XYh;9gi>8JU2cG1nq^6#&UH5}S=1~`#fgYj2vsO4
zrsy!IL+cOEgl1@D$_!5xb=JD2EA~r<HI|Qzs`f1Q2&ZC#GbNc{xchd#aQE%26SGu3
zob9P&s(GA93>qnB4r9tH-e{=)&|K^dj?b8(iD~k&t;G4&%HZn(z2X1pJJqhps<bAg
zYq42JfUUr)Lb8a2AVo1=!5MEj#y?)N-r!Wp8yuUGiE>PQwxZ#ZU`<R#o!asmhblg*
zy`Wy~FtyZSEw@<JsA_sXM>PdCW&-1%uqGG`oj*7en!)jcIaw@A*{x90c}G~Mr=vij
zqsg<?Wz@wR<0$O2QMfsoNOY|=C;(d%;YA`mZw${rt|l0a@Q=;L-r(t?KUA30qP6W=
zNqk#a`I)#9ry73BS=$pu<!v?&H^*Ugo{Q~y$sm#a-2H#H=CBl1jF%VRA5t$Eh{Yc$
zJAWWQ=MCm(&14kgw2eBwyaTLmRZZ85Olvh4+qfr=${TDP_t`k^cGl*cb6ICy8mED(
z^Oc1U^NW}?4e$3g4q`s3oX?fC<yhl24d+=kX4a}dQFh*`V(5)bm&{ZcX<SniR9%DG
zp!1)urLC0(ns<EUXt8ao7^hIu4V}&bX=D77pYVpfK!=>8qG4!rXSAUss*3NKj1kE=
zb=aCD($G;`mrJUHsDCz|2hO>=l+rlB)^pcX&nnEuMwPBwL{O#oY_oj<@r|U{ST0|^
z)tv<c6uPLqv$rBp0D*7PtX(#-wy=sNn*~Wxd0uTrpajJ8B+WY6nqbY9tp{{eE6x>x
zs#%q+6RTRxvbq7U9iT)Ie;rv>6Rc8b(?GJ~dMkgmW4&2b9ab1QBS?2UENZ=4)x2d1
zJqmqDdscgVPm-(shSoWO6<e1A&TkhefWVUs>u@u```Y<dRbV6`B4$0p`o94Hwhnxv
T1;L}@00000NkvXXu0mjfs`7IS

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 95ccf714c3..777352ec49 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -580,4 +580,14 @@ public class Messages {
 	public String ModelEditor_Delete;
 	public String ModelEditor_Form;
 	public String ModelEditor_XMI;
+	public String ModelEditor_ExternalizeStrings;
+
+	public String ExternalizeStringHandler_Dialog_ElementName;
+	public String ExternalizeStringHandler_Dialog_AttributeName;
+	public String ExternalizeStringHandler_Dialog_Key;
+	public String ExternalizeStringHandler_Dialog_Value;
+	public String ExternalizeStringHandler_Dialog_ShellTitle;
+	public String ExternalizeStringHandler_Dialog_DialogTitle;
+	public String ExternalizeStringHandler_Dialog_DialogMessage;
+
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 244f4bd0e5..30b91f9f43 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -577,4 +577,13 @@ AreaIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the curr
 
 ModelEditor_Delete=Remove
 ModelEditor_Form=Form
-ModelEditor_XMI=XMI
\ No newline at end of file
+ModelEditor_XMI=XMI
+ModelEditor_ExternalizeStrings=Externalize Strings
+
+ExternalizeStringHandler_Dialog_ElementName=Element
+ExternalizeStringHandler_Dialog_AttributeName=Attribute
+ExternalizeStringHandler_Dialog_Key=Key
+ExternalizeStringHandler_Dialog_Value=Value
+ExternalizeStringHandler_Dialog_ShellTitle=Externalize Strings
+ExternalizeStringHandler_Dialog_DialogTitle=Externalize Strings
+ExternalizeStringHandler_Dialog_DialogMessage=Externalizing manifest files extracts translatable strings and stores them in a properties file for multi-language support.
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
index f7b91e96a1..44381e6669 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
@@ -96,6 +96,7 @@ public class ResourceProvider extends BasicResourceProvider {
 	public static final String IMG_Wizban16_newclass_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.newclass_wiz"; //$NON-NLS-1$
 	public static final String IMG_Wizban16_newexp_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.newexp_wiz"; //$NON-NLS-1$
 	public static final String IMG_Wizban16_typerefact_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.typerefact_wiz"; //$NON-NLS-1$
+	public static final String IMG_Wizban16_extstr_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.extstr_wiz"; //$NON-NLS-1$
 
 	public static final String COLOR_XML_COMMENT = "COLOR_org.eclipse.e4.tools.emf.ui.XML_COMMENT"; //$NON-NLS-1$
 	public static final String COLOR_PROC_INSTR = "COLOR_org.eclipse.e4.tools.emf.ui.PROC_INSTR"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index ff86656d7f..d5212285f3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -37,6 +37,7 @@
 import org.eclipse.core.runtime.RegistryFactory;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.Preference;
 import org.eclipse.e4.core.services.contributions.IContributionFactory;
@@ -114,6 +115,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowSharedElementsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowTrimEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.properties.ExternalizeStringHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.properties.ProjectOSGiTranslationProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.AnnotationAccess;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.EMFDocumentResourceMediator;
@@ -528,6 +530,16 @@ public void run() {
 						manager.add(a);
 					}
 				}
+
+				if (project != null) {
+					Action nlsAction = new Action(messages.ModelEditor_ExternalizeStrings) {
+						public void run() {
+							ExternalizeStringHandler h = ContextInjectionFactory.make(ExternalizeStringHandler.class, context);
+							ContextInjectionFactory.invoke(h, Execute.class, context);
+						}
+					};
+					manager.add(nlsAction);
+				}
 			}
 		});
 		viewer.getControl().setMenu(mgr.createContextMenu(viewer.getControl()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
new file mode 100644
index 0000000000..8a217492d6
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
@@ -0,0 +1,237 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.properties;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import javax.inject.Named;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.e4.tools.services.Translation;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.services.IServiceConstants;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+
+public class ExternalizeStringHandler {
+
+	@Execute
+	public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell, @Translation Messages messages, IModelResource resource, IResourcePool pool, IProject project) {
+		TitleAreaDialog dialog = new ExtractionDialog(shell, messages, resource.getRoot(), pool, project);
+		dialog.open();
+	}
+
+	static class ExtractionDialog extends TitleAreaDialog {
+		private Messages messages;
+		private IObservableList list;
+		private IResourcePool pool;
+		private IProject project;
+
+		public ExtractionDialog(Shell parentShell, Messages messages, IObservableList list, IResourcePool pool, IProject project) {
+			super(parentShell);
+			this.messages = messages;
+			this.list = list;
+			this.pool = pool;
+			this.project = project;
+		}
+
+		@Override
+		protected Control createDialogArea(Composite parent) {
+			getShell().setText(messages.ExternalizeStringHandler_Dialog_ShellTitle);
+			setTitle(messages.ExternalizeStringHandler_Dialog_DialogTitle);
+			setMessage(messages.ExternalizeStringHandler_Dialog_DialogMessage);
+			setTitleImage(pool.getImageUnchecked(ResourceProvider.IMG_Wizban16_extstr_wiz));
+
+			Composite container = (Composite) super.createDialogArea(parent);
+			Table t = new Table(container, SWT.BORDER | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.CHECK);
+			t.setLayoutData(new GridData(GridData.FILL_BOTH));
+			t.setHeaderVisible(true);
+			t.setLinesVisible(true);
+
+			CheckboxTableViewer viewer = new CheckboxTableViewer(t);
+			{
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.setLabelProvider(new ColumnLabelProvider() {
+					@Override
+					public String getText(Object element) {
+						return ""; //$NON-NLS-1$
+					}
+				});
+			}
+
+			{
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText(messages.ExternalizeStringHandler_Dialog_ElementName);
+				column.setLabelProvider(new ColumnLabelProvider() {
+					@Override
+					public String getText(Object element) {
+						Entry e = (Entry) element;
+						// FIXME We need the label provider
+						return e.object.eClass().getName();
+					}
+				});
+			}
+
+			{
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText(messages.ExternalizeStringHandler_Dialog_AttributeName);
+				column.setLabelProvider(new ColumnLabelProvider() {
+					@Override
+					public String getText(Object element) {
+						Entry e = (Entry) element;
+						// FIXME We need the label provider
+						return e.feature.getName();
+					}
+				});
+			}
+
+			{
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText(messages.ExternalizeStringHandler_Dialog_Key);
+				column.setLabelProvider(new ColumnLabelProvider() {
+					@Override
+					public String getText(Object element) {
+						Entry e = (Entry) element;
+						return e.key;
+					}
+				});
+			}
+
+			{
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText(messages.ExternalizeStringHandler_Dialog_Value);
+				column.setLabelProvider(new ColumnLabelProvider() {
+					@Override
+					public String getText(Object element) {
+						Entry e = (Entry) element;
+						return e.value;
+					}
+				});
+			}
+
+			List<Entry> entries = new ArrayList<ExternalizeStringHandler.Entry>();
+			TreeIterator<EObject> it = EcoreUtil.getAllContents(list);
+
+			List<String> ids = new ArrayList<String>();
+
+			while (it.hasNext()) {
+				EObject o = it.next();
+				if (o instanceof MUILabel) {
+					MUILabel l = (MUILabel) o;
+					if (l.getLabel() != null && l.getLabel().startsWith("%")) { //$NON-NLS-1$
+						ids.add(l.getLabel());
+					}
+
+					if (l.getTooltip() != null && l.getTooltip().startsWith("%")) { //$NON-NLS-1$
+						ids.add(l.getTooltip());
+					}
+				}
+			}
+
+			try {
+				IFile file = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
+				String base = ProjectOSGiTranslationProvider.extractBasenameFromManifest(file);
+				IFile f = project.getFile(base + ".properties"); //$NON-NLS-1$
+				if (f.exists()) {
+					Properties prop = new Properties();
+					InputStream in = f.getContents();
+					prop.load(in);
+					in.close();
+
+					for (Object o : prop.keySet()) {
+						ids.add(o.toString());
+					}
+				}
+			} catch (CoreException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+
+			it = EcoreUtil.getAllContents(list);
+			while (it.hasNext()) {
+				EObject o = it.next();
+				if (o instanceof MUILabel) {
+					MUILabel l = (MUILabel) o;
+					if (l.getLabel() != null && l.getLabel().trim().length() != 0 && !l.getLabel().startsWith("%")) { //$NON-NLS-1$
+						String id = findId(ids, o.eClass().getName().toLowerCase() + ".label"); //$NON-NLS-1$
+						entries.add(new Entry(o, UiPackageImpl.Literals.UI_LABEL__LABEL, id, l.getLabel()));
+						ids.add(id);
+					}
+
+					if (l.getTooltip() != null && l.getTooltip().trim().length() != 0 && !l.getTooltip().startsWith("%")) { //$NON-NLS-1$
+						String id = findId(ids, o.eClass().getName().toLowerCase() + ".tooltip"); //$NON-NLS-1$
+						entries.add(new Entry(o, UiPackageImpl.Literals.UI_LABEL__TOOLTIP, id, l.getTooltip()));
+						ids.add(id);
+					}
+				}
+			}
+			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setInput(entries);
+			viewer.setAllChecked(true);
+
+			for (int i = 1; i < viewer.getTable().getColumnCount(); i++) {
+				TableColumn c = viewer.getTable().getColumn(i);
+				c.pack();
+				if (c.getWidth() < 120) {
+					c.setWidth(120);
+				}
+			}
+
+			return container;
+		}
+
+		@Override
+		protected void okPressed() {
+			super.okPressed();
+		}
+	}
+
+	private static String findId(List<String> ids, String prefix) {
+		int count = 1;
+		String id = prefix + "." + count; //$NON-NLS-1$
+		while (ids.contains(prefix)) {
+			id = prefix + "." + ++count; //$NON-NLS-1$
+		}
+		return id;
+	}
+
+	static class Entry {
+		private EObject object;
+		private EStructuralFeature feature;
+		private String key;
+		private String value;
+
+		public Entry(EObject object, EStructuralFeature feature, String key, String value) {
+			this.object = object;
+			this.feature = feature;
+			this.key = key;
+			this.value = value;
+		}
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
index 112b60e1a3..436711cd26 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
@@ -97,18 +97,7 @@ boolean visit(IResourceDelta delta) throws CoreException {
 
 	private void handleManifestChange(IFile file) {
 		try {
-			InputStream in = file.getContents();
-			BufferedReader r = new BufferedReader(new InputStreamReader(in));
-			String line;
-			String newValue = "OSGI-INF/l10n/bundle"; //$NON-NLS-1$
-			while ((line = r.readLine()) != null) {
-				if (line.startsWith("Bundle-Localization:")) { //$NON-NLS-1$
-					newValue = line.substring("Bundle-Localization:".length()).trim(); //$NON-NLS-1$
-					break;
-				}
-			}
-
-			r.close();
+			String newValue = extractBasenameFromManifest(file);
 
 			if (!newValue.equals(basename)) {
 				if (basename != null) {
@@ -128,6 +117,22 @@ private void handleManifestChange(IFile file) {
 		}
 	}
 
+	public static String extractBasenameFromManifest(IFile file) throws CoreException, IOException {
+		InputStream in = file.getContents();
+		BufferedReader r = new BufferedReader(new InputStreamReader(in));
+		String line;
+		String newValue = "OSGI-INF/l10n/bundle"; //$NON-NLS-1$
+		while ((line = r.readLine()) != null) {
+			if (line.startsWith("Bundle-Localization:")) { //$NON-NLS-1$
+				newValue = line.substring("Bundle-Localization:".length()).trim(); //$NON-NLS-1$
+				break;
+			}
+		}
+
+		r.close();
+		return newValue;
+	}
+
 	@Override
 	protected InputStream getResourceAsStream(String name) {
 		IFile f = project.getFile(name);

From 6fea43f5abfe126d8168f64954119353d4e5ccd2 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 9 Feb 2011 21:45:25 +0000
Subject: [PATCH 0295/1286] Bug 335767 - [ModelTooling] Add support for NLS

---
 .../properties/ExternalizeStringHandler.java  | 102 +++++++++++++-----
 1 file changed, 77 insertions(+), 25 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
index 8a217492d6..e7a699538c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
@@ -1,5 +1,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.properties;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -10,6 +11,7 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -19,10 +21,12 @@
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.services.IServiceConstants;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
@@ -40,7 +44,7 @@ public class ExternalizeStringHandler {
 
 	@Execute
 	public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell, @Translation Messages messages, IModelResource resource, IResourcePool pool, IProject project) {
-		TitleAreaDialog dialog = new ExtractionDialog(shell, messages, resource.getRoot(), pool, project);
+		TitleAreaDialog dialog = new ExtractionDialog(shell, messages, resource, resource.getRoot(), pool, project);
 		dialog.open();
 	}
 
@@ -49,13 +53,16 @@ static class ExtractionDialog extends TitleAreaDialog {
 		private IObservableList list;
 		private IResourcePool pool;
 		private IProject project;
+		private CheckboxTableViewer viewer;
+		private IModelResource resource;
 
-		public ExtractionDialog(Shell parentShell, Messages messages, IObservableList list, IResourcePool pool, IProject project) {
+		public ExtractionDialog(Shell parentShell, Messages messages, IModelResource resource, IObservableList list, IResourcePool pool, IProject project) {
 			super(parentShell);
 			this.messages = messages;
 			this.list = list;
 			this.pool = pool;
 			this.project = project;
+			this.resource = resource;
 		}
 
 		@Override
@@ -71,7 +78,8 @@ protected Control createDialogArea(Composite parent) {
 			t.setHeaderVisible(true);
 			t.setLinesVisible(true);
 
-			CheckboxTableViewer viewer = new CheckboxTableViewer(t);
+			viewer = new CheckboxTableViewer(t);
+
 			{
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
 				column.setLabelProvider(new ColumnLabelProvider() {
@@ -151,26 +159,9 @@ public String getText(Object element) {
 				}
 			}
 
-			try {
-				IFile file = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
-				String base = ProjectOSGiTranslationProvider.extractBasenameFromManifest(file);
-				IFile f = project.getFile(base + ".properties"); //$NON-NLS-1$
-				if (f.exists()) {
-					Properties prop = new Properties();
-					InputStream in = f.getContents();
-					prop.load(in);
-					in.close();
-
-					for (Object o : prop.keySet()) {
-						ids.add(o.toString());
-					}
-				}
-			} catch (CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+			Properties properties = getBaseProperties();
+			for (Object o : properties.keySet()) {
+				ids.add(o.toString());
 			}
 
 			it = EcoreUtil.getAllContents(list);
@@ -208,14 +199,75 @@ public String getText(Object element) {
 
 		@Override
 		protected void okPressed() {
-			super.okPressed();
+			Object[] els = viewer.getCheckedElements();
+			if (els.length > 0) {
+				try {
+					IFile f = getBasePropertyFile();
+					if (f.exists()) {
+						StringBuilder b = new StringBuilder(System.getProperty("line.separator"));
+						for (Object o : els) {
+							Entry e = (Entry) o;
+							b.append(e.key + " = " + e.value + System.getProperty("line.separator")); //$NON-NLS-1$//$NON-NLS-2$
+						}
+
+						System.err.println("Appending: " + b);
+
+						ByteArrayInputStream stream = new ByteArrayInputStream(b.toString().getBytes());
+						f.appendContents(stream, IFile.KEEP_HISTORY, new NullProgressMonitor());
+
+						for (Object o : els) {
+							Entry e = (Entry) o;
+							Command cmd = SetCommand.create(resource.getEditingDomain(), e.object, e.feature, "%" + e.key);
+
+							if (cmd.canExecute()) {
+								resource.getEditingDomain().getCommandStack().execute(cmd);
+							}
+						}
+					}
+					super.okPressed();
+				} catch (CoreException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+
+			}
+		}
+
+		private IFile getBasePropertyFile() throws CoreException, IOException {
+			IFile file = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
+			String base = ProjectOSGiTranslationProvider.extractBasenameFromManifest(file);
+			return project.getFile(base + ".properties"); //$NON-NLS-1$
+		}
+
+		private Properties getBaseProperties() {
+			Properties prop = new Properties();
+			try {
+				IFile f = getBasePropertyFile();
+				if (f.exists()) {
+
+					InputStream in = f.getContents();
+					prop.load(in);
+					in.close();
+				}
+			} catch (CoreException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+
+			return prop;
 		}
 	}
 
 	private static String findId(List<String> ids, String prefix) {
 		int count = 1;
 		String id = prefix + "." + count; //$NON-NLS-1$
-		while (ids.contains(prefix)) {
+		while (ids.contains(id)) {
 			id = prefix + "." + ++count; //$NON-NLS-1$
 		}
 		return id;

From 4ba96cd1a70be319f0134c19ed0ce27bcc4186f8 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 14 Feb 2011 19:59:19 +0000
Subject: [PATCH 0296/1286] Bug 321019 - [ModelTooling] Copy&Paste does not
 work in DetailArea * some refactoring to make focus control accessible

---
 .../component/AbstractComponentEditor.java    | 14 +++++++-
 .../emf/ui/internal/common/ModelEditor.java   | 34 +++++++++++++++++--
 .../common/component/AddonsEditor.java        |  2 +-
 .../common/component/ApplicationEditor.java   |  2 +-
 .../internal/common/component/AreaEditor.java |  2 +-
 .../component/BindingContextEditor.java       |  2 +-
 .../common/component/BindingTableEditor.java  |  2 +-
 .../common/component/CategoryEditor.java      |  2 +-
 .../common/component/CommandEditor.java       |  2 +-
 .../component/CommandParameterEditor.java     |  2 +-
 .../common/component/ControlFactory.java      | 10 +++++-
 .../component/CoreExpressionEditor.java       |  2 +-
 .../common/component/HandlerEditor.java       |  2 +-
 .../common/component/KeyBindingEditor.java    |  2 +-
 .../component/MenuContributionEditor.java     |  2 +-
 .../internal/common/component/MenuEditor.java |  2 +-
 .../common/component/MenuItemEditor.java      |  2 +-
 .../common/component/MenuSeparatorEditor.java |  2 +-
 .../component/ModelFragmentsEditor.java       |  2 +-
 .../common/component/ParameterEditor.java     |  2 +-
 .../component/PartDescriptorEditor.java       |  2 +-
 .../internal/common/component/PartEditor.java |  2 +-
 .../component/PartSashContainerEditor.java    |  2 +-
 .../common/component/PartStackEditor.java     |  2 +-
 .../common/component/PerspectiveEditor.java   |  2 +-
 .../component/PerspectiveStackEditor.java     |  2 +-
 .../common/component/PlaceholderEditor.java   |  2 +-
 .../common/component/StringModelFragment.java |  2 +-
 .../component/ToolBarContributionEditor.java  |  2 +-
 .../common/component/ToolBarEditor.java       |  2 +-
 .../component/ToolBarSeparatorEditor.java     |  2 +-
 .../common/component/ToolControlEditor.java   |  2 +-
 .../common/component/ToolItemEditor.java      |  2 +-
 .../common/component/TrimBarEditor.java       |  2 +-
 .../component/TrimContributionEditor.java     |  2 +-
 .../common/component/WindowEditor.java        |  2 +-
 .../component/virtual/VApplicationAddons.java |  2 +-
 .../virtual/VApplicationCategoriesEditor.java |  2 +-
 .../virtual/VBindingTableEditor.java          |  2 +-
 .../component/virtual/VCommandEditor.java     |  2 +-
 .../component/virtual/VHandlerEditor.java     |  2 +-
 .../virtual/VItemParametersEditor.java        |  2 +-
 .../virtual/VMenuContributionsEditor.java     |  2 +-
 .../common/component/virtual/VMenuEditor.java |  2 +-
 .../virtual/VModelFragmentsEditor.java        |  2 +-
 .../virtual/VModelImportsEditor.java          |  2 +-
 .../component/virtual/VPartDescriptor.java    |  2 +-
 .../virtual/VRootBindingContexts.java         |  2 +-
 .../virtual/VToolBarContributionsEditor.java  |  2 +-
 .../virtual/VTrimContributionsEditor.java     |  2 +-
 .../virtual/VWindowControlEditor.java         |  2 +-
 .../component/virtual/VWindowEditor.java      |  2 +-
 .../virtual/VWindowSharedElementsEditor.java  |  2 +-
 .../component/virtual/VWindowTrimEditor.java  |  2 +-
 54 files changed, 104 insertions(+), 56 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 1432201fd1..41e6a3995e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -103,7 +103,7 @@ public ImageDescriptor createImageDescriptor(String key) {
 
 	public abstract String getDescription(Object element);
 
-	public abstract Composite getEditor(Composite parent, Object object);
+	public abstract Composite doGetEditor(Composite parent, Object object);
 
 	public abstract IObservableList getChildList(Object element);
 
@@ -118,4 +118,16 @@ public List<Action> getActions(Object element) {
 	protected String getLocalizedLabel(MUILabel element) {
 		return ControlFactory.getLocalizedLabel(translationProvider, element, locale);
 	}
+
+	public void handleCopy() {
+
+	}
+
+	public void handlePaste() {
+
+	}
+
+	public void handleCut() {
+
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index d5212285f3..e88e0546ca 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -268,6 +268,8 @@ public class ModelEditor {
 
 	private EMFDocumentResourceMediator emfDocumentProvider;
 
+	private AbstractComponentEditor currentEditor;
+
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project, final IResourcePool resourcePool) {
 		this.resourcePool = resourcePool;
 		this.modelProvider = modelProvider;
@@ -441,12 +443,13 @@ public void selectionChanged(SelectionChangedEvent event) {
 						EObject obj = (EObject) s.getFirstElement();
 						final AbstractComponentEditor editor = getEditor(obj.eClass());
 						if (editor != null) {
+							currentEditor = editor;
 							textLabel.setText(editor.getLabel(obj));
 							iconLabel.setImage(editor.getImage(obj, iconLabel.getDisplay()));
 							obsManager.runAndCollect(new Runnable() {
 
 								public void run() {
-									Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
+									Composite comp = editor.doGetEditor(contentContainer, s.getFirstElement());
 									comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
 									layout.topControl = comp;
 									contentContainer.layout(true);
@@ -457,12 +460,13 @@ public void run() {
 						VirtualEntry<?> entry = (VirtualEntry<?>) s.getFirstElement();
 						final AbstractComponentEditor editor = virtualEditors.get(entry.getId());
 						if (editor != null) {
+							currentEditor = editor;
 							textLabel.setText(editor.getLabel(entry));
 							iconLabel.setImage(editor.getImage(entry, iconLabel.getDisplay()));
 							obsManager.runAndCollect(new Runnable() {
 
 								public void run() {
-									Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
+									Composite comp = editor.doGetEditor(contentContainer, s.getFirstElement());
 									comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
 									layout.topControl = comp;
 									contentContainer.layout(true);
@@ -907,8 +911,16 @@ public IModelResource getModelProvider() {
 
 	class ClipboardHandler implements Handler {
 
-		@SuppressWarnings("unchecked")
 		public void paste() {
+			if (viewer.getControl().getDisplay().getFocusControl() == viewer.getControl()) {
+				handleStructurePaste();
+			} else if (currentEditor != null) {
+				currentEditor.handlePaste();
+			}
+		}
+
+		@SuppressWarnings("unchecked")
+		private void handleStructurePaste() {
 			Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
 			Object o = clip.getContents(MemoryTransfer.getInstance());
 			clip.dispose();
@@ -965,6 +977,14 @@ public void paste() {
 		}
 
 		public void copy() {
+			if (viewer.getControl().getDisplay().getFocusControl() == viewer.getControl()) {
+				handleStructureCopy();
+			} else if (currentEditor != null) {
+				currentEditor.handleCopy();
+			}
+		}
+
+		private void handleStructureCopy() {
 			Object o = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
 			if (o != null && o instanceof EObject) {
 				Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
@@ -974,6 +994,14 @@ public void copy() {
 		}
 
 		public void cut() {
+			if (viewer.getControl().getDisplay().getFocusControl() == viewer.getControl()) {
+				handleStructureCut();
+			} else if (currentEditor != null) {
+				currentEditor.handleCut();
+			}
+		}
+
+		private void handleStructureCut() {
 			Object o = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
 			if (o != null && o instanceof EObject) {
 				Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 6a88ffcdac..21ff5edbdd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -85,7 +85,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 7f73e005fc..fca8f63e9b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -85,7 +85,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 43dde29643..60054fcbbf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -121,7 +121,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 86b346b413..cf1434ab99 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -105,7 +105,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index c389c96153..45cf8492b8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -99,7 +99,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index b6e35c248e..c561544156 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -63,7 +63,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index a49e84e3bf..4a7022565f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -96,7 +96,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 351ed51b7d..7bf53d2c84 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -74,7 +74,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index fc15824a33..cc23a52bb8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -19,6 +19,7 @@
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
+import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -81,6 +82,8 @@
 import org.eclipse.swt.widgets.Text;
 
 public class ControlFactory {
+	public static final String COPY_WRITABLE = ControlFactory.class.getName() + ".COPY_WRITABLE"; //$NON-NLS-1$
+
 	public static void createXMIId(Composite parent, AbstractComponentEditor editor) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText("XMI:ID"); //$NON-NLS-1$
@@ -272,7 +275,12 @@ public static void createTextField(Composite parent, String label, IObservableVa
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 2;
 		t.setLayoutData(gd);
-		context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master));
+
+		IObservableValue modelObs = modelProp.observeDetail(master);
+		WritableValue copyWritable = new WritableValue("", String.class);//$NON-NLS-1$
+		context.bindValue(copyWritable, modelObs);
+		t.setData(COPY_WRITABLE, copyWritable);
+		context.bindValue(textProp.observeDelayed(200, t), modelObs);
 	}
 
 	public static void createTranslatedTextField(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp, IResourcePool resourcePool, IProject project) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index 7834e8d631..5791ac9101 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -68,7 +68,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = new Composite(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 6130636cce..6983528939 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -84,7 +84,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 1b31435d51..ad83a92b81 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -108,7 +108,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index b0eea46bde..5eb7d82715 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -112,7 +112,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 98182644a7..88d0a53d73 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -161,7 +161,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = new Composite(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index d1698a348c..e445857947 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -89,7 +89,7 @@ public Image getImage(Object element, Display display) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 0ac8e5e11c..1b8a9a0d9c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -65,7 +65,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index 2ee762c4ec..4d243152fb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -86,7 +86,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			composite = createForm(parent);
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index 22e06e5183..7595fe5c59 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -70,7 +70,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index ac6200f940..8335a6ecf8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -93,7 +93,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index c730592713..bfa1a088cd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -111,7 +111,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 29912ff150..ddbd2d9921 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -154,7 +154,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 9830102cea..ceee54eb4d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -123,7 +123,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index ef4351da87..025561f5be 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -161,7 +161,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 164d4c93d8..0f69f83f41 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -110,7 +110,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index e1051d681b..d2e024d67e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -106,7 +106,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index f4d76d53cc..e7701f0f78 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -92,7 +92,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index cd929bf9d1..bdc7d9432f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -113,7 +113,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index da90978bef..41f3ea009b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -141,7 +141,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index cc8876bc20..d0876f29e7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -76,7 +76,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 993a36a269..f34edd8092 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -88,7 +88,7 @@ public String getDetailLabel(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index e80b357a93..12c097df92 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -72,7 +72,7 @@ public ToolItemEditor() {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 2fc3431d87..b765b894da 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -124,7 +124,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 42fa30f6a2..2bde1c7a67 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -100,7 +100,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 17dbc2f497..afd72eb246 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -123,7 +123,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index a384584a6f..ee3ba01ebc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -88,7 +88,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index 205c652dcb..0b8524dade 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -88,7 +88,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index a289242700..6e48adf6ca 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -87,7 +87,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 31bf81e474..77a7003a47 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -91,7 +91,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 883bc1a075..5a5d7deff5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -87,7 +87,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
index 67b2b39f51..d412d3df28 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -91,7 +91,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index 3c39157ab4..ef39aec75e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -88,7 +88,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 4ee60e3a1f..b1d755a4be 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -89,7 +89,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index 59be50e2ad..b81404add4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -73,7 +73,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index 3e9a08a157..f7d052f0a2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -84,7 +84,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index 69a754b810..c79019d817 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -87,7 +87,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
index 7fdb2bf488..459644ec10 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
@@ -88,7 +88,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index 206999f4d0..4f7dcaf82c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -87,7 +87,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index 9978ad2b65..8565227248 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -87,7 +87,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 4b749c5099..981869255c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -129,7 +129,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 464e066521..5e9b5d8750 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -99,7 +99,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 18649ac4fa..52969346d4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -107,7 +107,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index 9bc4b8bb57..491c87e837 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -84,7 +84,7 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Composite getEditor(Composite parent, Object object) {
+	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());

From bba998e0641e0600ec8aa2f52ba13199dd316feb Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 14 Feb 2011 21:20:54 +0000
Subject: [PATCH 0297/1286] Bug 321019 - [ModelTooling] Copy&Paste does not
 work in DetailArea * handling pastes

---
 .../component/AbstractComponentEditor.java    | 36 ++++++++-
 .../emf/ui/internal/common/ModelEditor.java   |  4 +-
 .../common/component/AddonsEditor.java        | 14 +---
 .../common/component/ApplicationEditor.java   | 16 +---
 .../internal/common/component/AreaEditor.java | 30 +------
 .../common/component/BindingTableEditor.java  |  2 +
 .../common/component/CommandEditor.java       | 29 ++-----
 .../common/component/ControlFactory.java      | 79 +++++++++++++++----
 .../component/CoreExpressionEditor.java       |  2 +
 .../component/DirectMenuItemEditor.java       |  2 +
 .../component/DirectToolItemEditor.java       |  2 +
 .../component/HandledMenuItemEditor.java      |  2 +
 .../component/HandledToolItemEditor.java      |  2 +
 .../common/component/HandlerEditor.java       | 16 +---
 .../common/component/InputPartEditor.java     | 17 +---
 .../common/component/KeyBindingEditor.java    | 16 +---
 .../component/MenuContributionEditor.java     | 43 +---------
 .../internal/common/component/MenuEditor.java | 49 ++----------
 .../common/component/MenuItemEditor.java      | 58 ++------------
 .../common/component/MenuSeparatorEditor.java | 22 +-----
 .../component/PartDescriptorEditor.java       | 43 ++--------
 .../internal/common/component/PartEditor.java |  3 +
 .../component/PartSashContainerEditor.java    | 29 +------
 .../common/component/PartStackEditor.java     | 30 +------
 .../common/component/PerspectiveEditor.java   | 45 ++---------
 .../component/PerspectiveStackEditor.java     | 16 +---
 .../common/component/PlaceholderEditor.java   | 16 +---
 .../common/component/RenderedMenuEditor.java  |  1 -
 .../common/component/RenderedMenuItem.java    |  1 -
 .../component/RenderedToolBarEditor.java      |  1 -
 .../common/component/StringModelFragment.java | 15 +---
 .../component/ToolBarContributionEditor.java  | 43 +---------
 .../common/component/ToolBarEditor.java       | 15 +---
 .../component/ToolBarSeparatorEditor.java     | 20 +----
 .../common/component/ToolControlEditor.java   | 16 +---
 .../common/component/ToolItemEditor.java      | 30 +------
 .../common/component/TrimBarEditor.java       | 15 +---
 .../component/TrimContributionEditor.java     | 43 +---------
 .../common/component/TrimmedWindowEditor.java |  1 -
 39 files changed, 198 insertions(+), 626 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 41e6a3995e..3234f2753d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -23,6 +23,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
 import org.eclipse.e4.tools.emf.ui.internal.common.properties.ProjectOSGiTranslationProvider;
+import org.eclipse.e4.tools.services.IClipboardService.Handler;
 import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
@@ -34,6 +35,7 @@
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 
 public abstract class AbstractComponentEditor {
@@ -66,6 +68,8 @@ public abstract class AbstractComponentEditor {
 	@Named(TranslationService.LOCALE)
 	private String locale;
 
+	private Composite editorControl;
+
 	public EditingDomain getEditingDomain() {
 		return editingDomain;
 	}
@@ -103,7 +107,11 @@ public ImageDescriptor createImageDescriptor(String key) {
 
 	public abstract String getDescription(Object element);
 
-	public abstract Composite doGetEditor(Composite parent, Object object);
+	public Composite getEditor(Composite parent, Object object) {
+		return editorControl = doGetEditor(parent, object);
+	}
+
+	protected abstract Composite doGetEditor(Composite parent, Object object);
 
 	public abstract IObservableList getChildList(Object element);
 
@@ -119,15 +127,41 @@ protected String getLocalizedLabel(MUILabel element) {
 		return ControlFactory.getLocalizedLabel(translationProvider, element, locale);
 	}
 
+	private boolean isFocusChild(Control control) {
+		Control c = control;
+		while (c != null && c != editorControl) {
+			c = c.getParent();
+		}
+		return c != null;
+	}
+
 	public void handleCopy() {
+		if (editorControl != null) {
+			Control focusControl = editorControl.getDisplay().getFocusControl();
 
+			if (isFocusChild(focusControl) && focusControl.getData(ControlFactory.COPY_HANDLER) != null) {
+				((Handler) focusControl.getData(ControlFactory.COPY_HANDLER)).copy();
+			}
+		}
 	}
 
 	public void handlePaste() {
+		if (editorControl != null) {
+			Control focusControl = editorControl.getDisplay().getFocusControl();
 
+			if (isFocusChild(focusControl) && focusControl.getData(ControlFactory.COPY_HANDLER) != null) {
+				((Handler) focusControl.getData(ControlFactory.COPY_HANDLER)).paste();
+			}
+		}
 	}
 
 	public void handleCut() {
+		if (editorControl != null) {
+			Control focusControl = editorControl.getDisplay().getFocusControl();
 
+			if (isFocusChild(focusControl) && focusControl.getData(ControlFactory.COPY_HANDLER) != null) {
+				((Handler) focusControl.getData(ControlFactory.COPY_HANDLER)).cut();
+			}
+		}
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index e88e0546ca..4b9b691638 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -449,7 +449,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 							obsManager.runAndCollect(new Runnable() {
 
 								public void run() {
-									Composite comp = editor.doGetEditor(contentContainer, s.getFirstElement());
+									Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
 									comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
 									layout.topControl = comp;
 									contentContainer.layout(true);
@@ -466,7 +466,7 @@ public void run() {
 							obsManager.runAndCollect(new Runnable() {
 
 								public void run() {
-									Composite comp = editor.doGetEditor(contentContainer, s.getFirstElement());
+									Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
 									comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
 									layout.topControl = comp;
 									contentContainer.layout(true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 21ff5edbdd..a85b73d9a2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -23,6 +23,7 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -134,17 +135,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			return parent;
 		}
 
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		// ------------------------------------------------------------
 		{
@@ -166,6 +157,7 @@ public void widgetSelected(SelectionEvent e) {
 			}
 
 			Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index fca8f63e9b..47c41be24d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -32,12 +32,9 @@
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
 
 public class ApplicationEditor extends AbstractComponentEditor {
 
@@ -107,18 +104,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
-
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 60054fcbbf..0adaf8b07a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -23,6 +23,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AreaIconDialogEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
@@ -170,19 +171,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
-
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.AreaEditor_LabelLabel, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createTextField(parent, Messages.AreaEditor_Tooltip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
@@ -194,6 +183,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			final Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
@@ -246,19 +236,7 @@ public String getText(Object element) {
 		}
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.AreaEditor_SelectedElement);
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.AreaEditor_ContainerData);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
-		}
+		ControlFactory.createTextField(parent, Messages.AreaEditor_ContainerData, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 45cf8492b8..862cba0a4a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -22,6 +22,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BindingContextSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MBindingTable;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
@@ -166,6 +167,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID).observeDetail(getMaster()));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 4a7022565f..d86773c3f9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -21,6 +21,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.CommandCategorySelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.MCommandParameter;
@@ -146,30 +147,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			return parent;
 		}
 
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.CommandEditor_Name);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME).observeDetail(getMaster()));
-		}
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.CommandEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME));
 
 		// ------------------------------------------------------------
 		{
@@ -178,6 +157,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			Text t = new Text(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
+			TextPasteHandler.createFor(t);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			gd.heightHint = 100;
@@ -192,6 +172,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			t.setEditable(false);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index cc23a52bb8..b73d1b9e5a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -19,7 +19,6 @@
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
-import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -27,6 +26,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.properties.ProjectOSGiTranslationProvider;
+import org.eclipse.e4.tools.services.IClipboardService.Handler;
 import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -69,6 +69,9 @@
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.Clipboard;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -82,7 +85,49 @@
 import org.eclipse.swt.widgets.Text;
 
 public class ControlFactory {
-	public static final String COPY_WRITABLE = ControlFactory.class.getName() + ".COPY_WRITABLE"; //$NON-NLS-1$
+	public static final String COPY_HANDLER = ControlFactory.class.getName() + ".COPY_HANDLER"; //$NON-NLS-1$
+
+	public static class TextPasteHandler implements Handler {
+		private final Text t;
+
+		public TextPasteHandler(Text t) {
+			this.t = t;
+		}
+
+		public static void createFor(Text t) {
+			t.setData(COPY_HANDLER, new TextPasteHandler(t));
+		}
+
+		public void paste() {
+			Clipboard cp = new Clipboard(t.getDisplay());
+			Object o = cp.getContents(TextTransfer.getInstance());
+			cp.dispose();
+			if (o == null) {
+				return;
+			}
+
+			if (validate(o.toString())) {
+				t.insert(o.toString());
+			}
+		}
+
+		public void cut() {
+			Clipboard cp = new Clipboard(t.getDisplay());
+			cp.setContents(new Object[] { t.getSelectionText() }, new Transfer[] { TextTransfer.getInstance() });
+			cp.dispose();
+			t.insert(""); //$NON-NLS-1$
+		}
+
+		public void copy() {
+			Clipboard cp = new Clipboard(t.getDisplay());
+			cp.setContents(new Object[] { t.getSelectionText() }, new Transfer[] { TextTransfer.getInstance() });
+			cp.dispose();
+		}
+
+		public boolean validate(String text) {
+			return true;
+		}
+	}
 
 	public static void createXMIId(Composite parent, AbstractComponentEditor editor) {
 		Label l = new Label(parent, SWT.NONE);
@@ -95,6 +140,8 @@ public static void createXMIId(Composite parent, AbstractComponentEditor editor)
 		gd.horizontalSpan = 2;
 		t.setLayoutData(gd);
 
+		TextPasteHandler.createFor(t);
+
 		editor.getMaster().addValueChangeListener(new IValueChangeListener() {
 
 			public void handleValueChange(ValueChangeEvent event) {
@@ -271,16 +318,13 @@ public static void createTextField(Composite parent, String label, IObservableVa
 		l.setText(label);
 		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-		Text t = new Text(parent, SWT.BORDER);
+		final Text t = new Text(parent, SWT.BORDER);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 2;
 		t.setLayoutData(gd);
 
-		IObservableValue modelObs = modelProp.observeDetail(master);
-		WritableValue copyWritable = new WritableValue("", String.class);//$NON-NLS-1$
-		context.bindValue(copyWritable, modelObs);
-		t.setData(COPY_WRITABLE, copyWritable);
-		context.bindValue(textProp.observeDelayed(200, t), modelObs);
+		TextPasteHandler.createFor(t);
+		context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master));
 	}
 
 	public static void createTranslatedTextField(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp, IResourcePool resourcePool, IProject project) {
@@ -288,19 +332,21 @@ public static void createTranslatedTextField(Composite parent, String label, IOb
 		l.setText(label);
 		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-		Text t = new Text(parent, SWT.BORDER);
+		final Text t = new Text(parent, SWT.BORDER);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		if (project == null) {
 			gd.horizontalSpan = 2;
 		}
 
 		t.setLayoutData(gd);
+
+		TextPasteHandler.createFor(t);
 		context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master));
 
-		if (project != null) {
-			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_world_edit));
-		}
+		// if (project != null) {
+		// Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+		// b.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_world_edit));
+		// }
 	}
 
 	public static void createFindImport(Composite parent, final Messages Messages, final AbstractComponentEditor editor, EMFDataBindingContext context) {
@@ -310,9 +356,12 @@ public static void createFindImport(Composite parent, final Messages Messages, f
 		l.setText(Messages.ModelTooling_Common_RefId);
 		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-		Text t = new Text(parent, SWT.BORDER);
+		final Text t = new Text(parent, SWT.BORDER);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		t.setLayoutData(gd);
+
+		TextPasteHandler.createFor(t);
+
 		context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(editor.getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(editor.getMaster()));
 
 		final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
@@ -413,6 +462,8 @@ public void keyPressed(KeyEvent e) {
 			}
 		});
 
+		TextPasteHandler.createFor(t);
+
 		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Add);
 		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_add));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index 5791ac9101..d67a3153e8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -15,6 +15,7 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ExpressionIdDialog;
 import org.eclipse.e4.ui.model.application.ui.MCoreExpression;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -97,6 +98,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			final Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.CORE_EXPRESSION__CORE_EXPRESSION_ID).observeDetail(getMaster()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 411a15775d..886fa2eaba 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -22,6 +22,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -103,6 +104,7 @@ public void widgetSelected(SelectionEvent e) {
 			}
 
 			Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index f435c895f6..d1cd523839 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -22,6 +22,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -91,6 +92,7 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		Text t = new Text(parent, SWT.BORDER);
+		TextPasteHandler.createFor(t);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
 		Util.addDecoration(t, binding);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index f7e952a3bf..b07c8c69f0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -22,6 +22,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledMenuItemCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -95,6 +96,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND).observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter(Messages)));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 2044e0708a..e4895037f3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -22,6 +22,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledToolItemCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -84,6 +85,7 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND).observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter(Messages)));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 6983528939..9ec6853c4a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -25,6 +25,7 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandlerCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
@@ -133,18 +134,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		// ------------------------------------------------------------
 		{
@@ -153,6 +143,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.HANDLER__COMMAND).observeDetail(getMaster()), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter(Messages)));
@@ -190,6 +181,7 @@ public void widgetSelected(SelectionEvent e) {
 			}
 
 			Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
index 0ae5765a7b..3810c7bbc8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
@@ -12,17 +12,13 @@
 
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
 
 public class InputPartEditor extends PartEditor {
 
@@ -40,17 +36,6 @@ public String getLabel(Object element) {
 	protected void createSubformElements(Composite parent, EMFDataBindingContext context, IObservableValue master) {
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.InputPartEditor_InputURI);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.INPUT__INPUT_URI).observeDetail(master));
-		}
+		ControlFactory.createTextField(parent, Messages.InputPartEditor_InputURI, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.INPUT__INPUT_URI));
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index ad83a92b81..490fda82a6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -28,6 +28,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.KeyBindingCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
@@ -157,18 +158,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		// ------------------------------------------------------------
 		{
@@ -177,6 +167,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			final Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
@@ -191,6 +182,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__COMMAND).observeDetail(getMaster()), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter(Messages)));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 5eb7d82715..11a523c505 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -57,7 +57,6 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
 
 public class MenuContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -161,46 +160,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
-
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuContributionEditor_ParentId);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID).observeDetail(getMaster()));
-		}
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuContributionEditor_Position);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__POSITION_IN_PARENT).observeDetail(getMaster()));
-		}
+		ControlFactory.createTextField(parent, Messages.MenuContributionEditor_ParentId, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID));
+		ControlFactory.createTextField(parent, Messages.MenuContributionEditor_Position, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__POSITION_IN_PARENT));
 
 		// ------------------------------------------------------------
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 88d0a53d73..b844c4c7b5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -32,6 +32,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EClass2EObject;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EObject2EClass;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
@@ -210,46 +211,15 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		// ------------------------------------------------------------
 		if (!rootMenu) {
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuEditor_LabelLabel);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
+			ControlFactory.createTranslatedTextField(parent, Messages.MenuEditor_LabelLabel, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuEditor_Mnemonics);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS).observeDetail(master));
-		}
+		ControlFactory.createTextField(parent, Messages.MenuEditor_Mnemonics, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS));
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -374,15 +344,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		if (!rootMenu) {
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuEditor_Tooltip);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
+			ControlFactory.createTranslatedTextField(parent, Messages.MenuEditor_Tooltip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool, project);
 		}
 
 		// ------------------------------------------------------------
@@ -392,6 +354,7 @@ public void widgetSelected(SelectionEvent e) {
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index e445857947..71bd5672d2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -26,6 +26,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuItemIconDialogEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -140,18 +141,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		if (this.getClass() != MenuItemEditor.class) {
 			// ------------------------------------------------------------
@@ -171,46 +161,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			}
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuItemEditor_Label);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
-		}
-
+		ControlFactory.createTranslatedTextField(parent, Messages.MenuItemEditor_Label, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuItemEditor_Mnemonics);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS).observeDetail(master));
-		}
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuItemEditor_Tooltip);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
-		}
+		ControlFactory.createTranslatedTextField(parent, Messages.MenuItemEditor_Label, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
+		ControlFactory.createTextField(parent, Messages.MenuItemEditor_Mnemonics, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS));
+		ControlFactory.createTranslatedTextField(parent, Messages.MenuItemEditor_Tooltip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool, project);
 
 		// ------------------------------------------------------------
 		{
@@ -219,6 +174,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 1b8a9a0d9c..66a86641f3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -26,13 +26,10 @@
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
-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.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
 
 public class MenuSeparatorEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -114,23 +111,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
-
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 8335a6ecf8..4161f1bb0d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -26,6 +26,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartDescriptorIconDialogEditor;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
@@ -146,44 +147,9 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));
-		}
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartDescriptorEditor_LabelLabel);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
-		}
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartDescriptorEditor_Tooltip);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
-		}
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTranslatedTextField(parent, Messages.PartDescriptorEditor_LabelLabel, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
+		ControlFactory.createTranslatedTextField(parent, Messages.PartDescriptorEditor_Tooltip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool, project);
 
 		// ------------------------------------------------------------
 		{
@@ -192,6 +158,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index bfa1a088cd..f2fd78d3f7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -31,6 +31,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
 import org.eclipse.e4.ui.model.application.MContribution;
@@ -177,6 +178,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			final Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
@@ -226,6 +228,7 @@ public void widgetSelected(SelectionEvent e) {
 			}
 
 			Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index ddbd2d9921..b22e2e9bb8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -63,7 +63,6 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
 
 public class PartSashContainerEditor extends AbstractComponentEditor {
 
@@ -203,19 +202,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
-
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		// ------------------------------------------------------------
@@ -241,19 +228,7 @@ public String getText(Object element) {
 		}
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PartSashContainerEditor_SelectedElement);
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartSashContainerEditor_ContainerData);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
-		}
+		ControlFactory.createTextField(parent, Messages.PartSashContainerEditor_ContainerData, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index ceee54eb4d..014342c2d9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -61,7 +61,6 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
 
 public class PartStackEditor extends AbstractComponentEditor {
 
@@ -172,35 +171,10 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
-
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PartStackEditor_SelectedElement);
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartStackEditor_ContainerData);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
-		}
+		ControlFactory.createTextField(parent, Messages.PartStackEditor_ContainerData, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		// ------------------------------------------------------------
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 025561f5be..852c38996b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -25,6 +25,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PerspectiveIconDialogEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
@@ -210,48 +211,11 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
-
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PerspectiveEditor_SelectedElement);
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PerspectiveEditor_LabelLabel);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
-		}
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PerspectiveEditor_Tooltip);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
-		}
+		ControlFactory.createTranslatedTextField(parent, Messages.PerspectiveEditor_LabelLabel, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
+		ControlFactory.createTranslatedTextField(parent, Messages.PerspectiveEditor_Tooltip, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool, project);
 
 		// ------------------------------------------------------------
 		{
@@ -260,6 +224,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 0f69f83f41..050891670d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -55,7 +55,6 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
 
 public class PerspectiveStackEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -159,21 +158,8 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
-
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PerspectiveStackEditor_SelectedElement);
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index d2e024d67e..57bade472c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -20,6 +20,7 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.SharedElementsDialog;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -155,19 +156,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
-
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		// ------------------------------------------------------------
@@ -177,6 +166,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setEditable(false);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java
index baf767ff30..8f9f2ae530 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java
@@ -11,7 +11,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 
 public class RenderedMenuEditor extends MenuEditor {
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java
index fdbed724f0..b0da74aaa7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java
@@ -12,7 +12,6 @@
 
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.swt.widgets.Composite;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java
index 85d96c2378..04aa50ad6b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java
@@ -11,7 +11,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 
 public class RenderedToolBarEditor extends ToolBarEditor {
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index e7701f0f78..247f65ff93 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -20,6 +20,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FeatureSelectionDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindParentReferenceElementDialog;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -128,6 +129,7 @@ private Composite createForm(Composite parent) {
 			comp.setLayout(gl);
 
 			Text t = new Text(comp, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setEditable(false);
 			gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
@@ -160,6 +162,7 @@ public void widgetSelected(SelectionEvent e) {
 			comp.setLayout(gl);
 
 			Text t = new Text(comp, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME).observeDetail(getMaster()));
@@ -176,17 +179,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		}
 
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.StringModelFragment_PositionInList);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__POSITION_IN_LIST).observeDetail(getMaster()));
-		}
+		ControlFactory.createTextField(parent, Messages.StringModelFragment_PositionInList, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__POSITION_IN_LIST));
 
 		// ------------------------------------------------------------
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index bdc7d9432f..488cd656b5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -57,7 +57,6 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
 
 public class ToolBarContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -162,46 +161,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
-
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuContributionEditor_ParentId);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__PARENT_ID).observeDetail(getMaster()));
-		}
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuContributionEditor_Position);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__POSITION_IN_PARENT).observeDetail(getMaster()));
-		}
+		ControlFactory.createTextField(parent, Messages.MenuContributionEditor_ParentId, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__PARENT_ID));
+		ControlFactory.createTextField(parent, Messages.MenuContributionEditor_Position, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__POSITION_IN_PARENT));
 
 		// ------------------------------------------------------------
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 41f3ea009b..6ea78a7bf2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -60,7 +60,6 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
 
 public class ToolBarEditor extends AbstractComponentEditor {
 
@@ -190,19 +189,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
-
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index d0876f29e7..8f6b6dfc6b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -28,13 +28,10 @@
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
-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.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
 
 public class ToolBarSeparatorEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -125,21 +122,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index f34edd8092..ff437a247f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -19,6 +19,7 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -137,19 +138,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(master));
-		}
-
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		// ------------------------------------------------------------
@@ -159,6 +148,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 12c097df92..7e7266edde 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -26,6 +26,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ToolItemIconDialogEditor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
@@ -149,33 +150,9 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			context.bindValue(ViewerProperties.singleSelection().observe(viewer), itemTypeObs);
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ToolItemEditor_Label);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL).observeDetail(master));
-		}
-
+		ControlFactory.createTextField(parent, Messages.ToolItemEditor_Label, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ToolItemEditor_ToolTip);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP).observeDetail(master));
-		}
+		ControlFactory.createTextField(parent, Messages.ToolItemEditor_ToolTip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
 
 		// ------------------------------------------------------------
 		{
@@ -184,6 +161,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index b765b894da..2109295acf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -64,7 +64,6 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
 
 public class TrimBarEditor extends AbstractComponentEditor {
 
@@ -173,19 +172,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
-
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 2bde1c7a67..4e796d85fd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -56,7 +56,6 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
 
 public class TrimContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -149,46 +148,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return parent;
 		}
 
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
-		}
-
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.TrimContributionEditor_ParentId);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__PARENT_ID).observeDetail(getMaster()));
-		}
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.TrimContributionEditor_Position);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__POSITION_IN_PARENT).observeDetail(getMaster()));
-		}
+		ControlFactory.createTextField(parent, Messages.TrimContributionEditor_ParentId, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__PARENT_ID));
+		ControlFactory.createTextField(parent, Messages.TrimContributionEditor_Position, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__POSITION_IN_PARENT));
 
 		// ------------------------------------------------------------
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
index 497685d47d..74ca26b6c2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
@@ -14,7 +14,6 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;

From f7ed82299f490ae7f672d0cce07c7d6b62c19c43 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 14 Feb 2011 23:21:50 +0000
Subject: [PATCH 0298/1286] Bug 325388 - [ModelTooling] Using "Find Class..."
 to create class results in incorrect URL

---
 .../extension/AddonContributionEditor.java    | 20 +++++++++++++++--
 .../extension/HandlerContributionEditor.java  | 13 ++++++++++-
 .../extension/PartContributionEditor.java     | 13 ++++++++++-
 .../e4/tools/emf/editor3x/extension/Util.java | 22 +++++++++++++++++++
 4 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
index 19f4ec5122..6f615c007c 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
@@ -13,6 +13,7 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.e4.internal.tools.wizards.classes.NewAddonClassWizard;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.ui.model.application.MContribution;
@@ -31,8 +32,13 @@
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.pde.core.project.IBundleProjectDescription;
+import org.eclipse.pde.core.project.IBundleProjectService;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PartInitException;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
 
 public class AddonContributionEditor implements IContributionClassCreator {
 
@@ -57,7 +63,7 @@ private void createOpen(MContribution contribution, EditingDomain domain,
 				try {
 					String packageName = el.getPackageDeclarations()[0].getElementName();
 					String className = wizard.getDomainClass().getName();
-					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "platform:/plugin/" + f.getProject().getName() + "/" + packageName+"."+className);
+					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "platform:/plugin/" + Util.getBundleSymbolicName(f.getProject()) + "/" + packageName+"."+className);
 					if( cmd.canExecute() ) {
 						domain.getCommandStack().execute(cmd);
 					}
@@ -71,6 +77,17 @@ private void createOpen(MContribution contribution, EditingDomain domain,
 			if (uri.segmentCount() == 3) {
 				IProject p = ResourcesPlugin.getWorkspace().getRoot()
 						.getProject(uri.segment(1));
+				
+				if( ! p.exists() ) {
+					for( IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects() ) {
+						String name = Util.getBundleSymbolicName(check);
+						if( uri.segment(1).equals(name) ) {
+							p = check;
+							break;
+						}
+					}
+				}
+				
 				// TODO If this is not a WS-Resource we need to open differently
 				if (p != null) {
 					IJavaProject jp = JavaCore.create(p);
@@ -99,5 +116,4 @@ private void createOpen(MContribution contribution, EditingDomain domain,
 			}
 		}
 	}
-
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
index 56c9933235..4a49f21f79 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
@@ -53,7 +53,7 @@ private void createOpen(MContribution contribution, EditingDomain domain, IProje
 				try {
 					String packageName = el.getPackageDeclarations()[0].getElementName();
 					String className = wizard.getDomainClass().getName();
-					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "platform:/plugin/" + f.getProject().getName() + "/" + packageName+"."+className);
+					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "platform:/plugin/" + Util.getBundleSymbolicName(f.getProject()) + "/" + packageName+"."+className);
 					if( cmd.canExecute() ) {
 						domain.getCommandStack().execute(cmd);
 					}
@@ -67,6 +67,17 @@ private void createOpen(MContribution contribution, EditingDomain domain, IProje
 			if (uri.segmentCount() == 3) {
 				IProject p = ResourcesPlugin.getWorkspace().getRoot()
 						.getProject(uri.segment(1));
+				
+				if( ! p.exists() ) {
+					for( IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects() ) {
+						String name = Util.getBundleSymbolicName(check);
+						if( uri.segment(1).equals(name) ) {
+							p = check;
+							break;
+						}
+					}
+				}
+				
 				// TODO If this is not a WS-Resource we need to open differently
 				if (p != null) {
 					IJavaProject jp = JavaCore.create(p);
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
index 8fea74032d..0f343de897 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
@@ -61,7 +61,7 @@ private void createOpen(MContribution contribution, EditingDomain domain,
 									contribution,
 									ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
 									"platform:/plugin/"
-											+ f.getProject().getName() + "/"
+											+ Util.getBundleSymbolicName(f.getProject()) + "/"
 											+ packageName + "." + className);
 					if (cmd.canExecute()) {
 						domain.getCommandStack().execute(cmd);
@@ -76,6 +76,17 @@ private void createOpen(MContribution contribution, EditingDomain domain,
 			if (uri.segmentCount() == 3) {
 				IProject p = ResourcesPlugin.getWorkspace().getRoot()
 						.getProject(uri.segment(1));
+				
+				if( ! p.exists() ) {
+					for( IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects() ) {
+						String name = Util.getBundleSymbolicName(check);
+						if( uri.segment(1).equals(name) ) {
+							p = check;
+							break;
+						}
+					}
+				}
+				
 				// TODO If this is not a WS-Resource we need to open differently
 				if (p != null) {
 					IJavaProject jp = JavaCore.create(p);
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java
index f49d3b784c..23d5bb0bf6 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java
@@ -10,10 +10,32 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x.extension;
 
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.pde.core.project.IBundleProjectDescription;
+import org.eclipse.pde.core.project.IBundleProjectService;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
 
 public class Util {
 	public static boolean isTypeOrSuper(EClass eClass, EClass element) {
 		return eClass.equals(element) || element.getEAllSuperTypes().contains(eClass);
 	}
+	
+	public static String getBundleSymbolicName(IProject project) {
+		BundleContext context = FrameworkUtil.getBundle(AddonContributionEditor.class).getBundleContext();
+		ServiceReference<IBundleProjectService> ref = context.getServiceReference(IBundleProjectService.class);
+		IBundleProjectService service = context.getService(ref);
+		try {
+			IBundleProjectDescription description = service.getDescription(project);
+			return description.getSymbolicName();
+		} catch (CoreException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		return null;
+	}
 }

From cc72156a72cf866c3db2e8c55d40e923010d7d1e Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 14 Feb 2011 23:37:32 +0000
Subject: [PATCH 0299/1286] Bug 337174 - [ModelTooling] Creating class is
 default package fails

---
 .../extension/AddonContributionEditor.java    | 17 +++-
 .../extension/HandlerContributionEditor.java  | 17 +++-
 .../extension/PartContributionEditor.java     | 26 +++---
 .../classes/templates/AddonTemplate.java      | 16 ++--
 .../classes/templates/HandlerTemplate.java    | 38 ++++----
 .../classes/templates/PartTemplate.java       | 86 ++++++++++---------
 .../templates/addon.txtjet                    |  2 +
 .../templates/handler.txtjet                  |  2 +
 .../templates/part.txtjet                     |  2 +
 9 files changed, 128 insertions(+), 78 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
index 6f615c007c..a1da6fd58e 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
@@ -61,9 +61,20 @@ private void createOpen(MContribution contribution, EditingDomain domain,
 				IFile f = wizard.getFile();
 				ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
 				try {
-					String packageName = el.getPackageDeclarations()[0].getElementName();
-					String className = wizard.getDomainClass().getName();
-					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "platform:/plugin/" + Util.getBundleSymbolicName(f.getProject()) + "/" + packageName+"."+className);
+					String fullyQualified;
+					if( el.getPackageDeclarations() != null && el.getPackageDeclarations().length > 0 ) {
+						String packageName = el.getPackageDeclarations()[0].getElementName();
+						String className = wizard.getDomainClass().getName();
+						if( packageName.trim().length() > 0 ) {
+							fullyQualified = packageName + "." + className;	
+						} else {
+							fullyQualified = className;
+						}
+					} else {
+						fullyQualified = wizard.getDomainClass().getName();
+					}
+					
+					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "platform:/plugin/" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified);
 					if( cmd.canExecute() ) {
 						domain.getCommandStack().execute(cmd);
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
index 4a49f21f79..e8e1ca2a58 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
@@ -51,9 +51,20 @@ private void createOpen(MContribution contribution, EditingDomain domain, IProje
 				IFile f = wizard.getFile();
 				ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
 				try {
-					String packageName = el.getPackageDeclarations()[0].getElementName();
-					String className = wizard.getDomainClass().getName();
-					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "platform:/plugin/" + Util.getBundleSymbolicName(f.getProject()) + "/" + packageName+"."+className);
+					String fullyQualified;
+					if( el.getPackageDeclarations() != null && el.getPackageDeclarations().length > 0 ) {
+						String packageName = el.getPackageDeclarations()[0].getElementName();
+						String className = wizard.getDomainClass().getName();
+						if( packageName.trim().length() > 0 ) {
+							fullyQualified = packageName + "." + className;	
+						} else {
+							fullyQualified = className;
+						}
+					} else {
+						fullyQualified = wizard.getDomainClass().getName();
+					}
+					
+					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "platform:/plugin/" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified);
 					if( cmd.canExecute() ) {
 						domain.getCommandStack().execute(cmd);
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
index 0f343de897..22561f88c2 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
@@ -53,17 +53,21 @@ private void createOpen(MContribution contribution, EditingDomain domain,
 				IFile f = wizard.getFile();
 				ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
 				try {
-					String packageName = el.getPackageDeclarations()[0]
-							.getElementName();
-					String className = wizard.getDomainClass().getName();
-					Command cmd = SetCommand
-							.create(domain,
-									contribution,
-									ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
-									"platform:/plugin/"
-											+ Util.getBundleSymbolicName(f.getProject()) + "/"
-											+ packageName + "." + className);
-					if (cmd.canExecute()) {
+					String fullyQualified;
+					if( el.getPackageDeclarations() != null && el.getPackageDeclarations().length > 0 ) {
+						String packageName = el.getPackageDeclarations()[0].getElementName();
+						String className = wizard.getDomainClass().getName();
+						if( packageName.trim().length() > 0 ) {
+							fullyQualified = packageName + "." + className;	
+						} else {
+							fullyQualified = className;
+						}
+					} else {
+						fullyQualified = wizard.getDomainClass().getName();
+					}
+					
+					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "platform:/plugin/" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified);
+					if( cmd.canExecute() ) {
 						domain.getCommandStack().execute(cmd);
 					}
 				} catch (JavaModelException e) {
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
index 52be770c3d..316a8ddee6 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
@@ -14,19 +14,25 @@ public static synchronized AddonTemplate create(String lineSeparator)
   }
 
   public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-  protected final String TEXT_1 = " " + NL + "package ";
-  protected final String TEXT_2 = ";" + NL + "" + NL + "import javax.inject.Inject;" + NL + "import javax.annotation.PostConstruct;" + NL + "import javax.annotation.PreDestroy;" + NL + "" + NL + "import org.eclipse.e4.core.services.events.IEventBroker;" + NL + "" + NL + "public class ";
-  protected final String TEXT_3 = " {" + NL + "\t@Inject" + NL + "\tIEventBroker eventBroker;" + NL + "\t" + NL + "\t@PostConstruct" + NL + "\tvoid hookListeners() {" + NL + "\t\t// Hook event listeners" + NL + "\t}" + NL + "\t" + NL + "\t@PreDestroy" + NL + "\tvoid unhookListeners() {" + NL + "\t\t// Unhook event listeners" + NL + "\t}" + NL + "}";
+  protected final String TEXT_1 = " ";
+  protected final String TEXT_2 = NL + "package ";
+  protected final String TEXT_3 = ";";
+  protected final String TEXT_4 = NL + NL + "import javax.inject.Inject;" + NL + "import javax.annotation.PostConstruct;" + NL + "import javax.annotation.PreDestroy;" + NL + "" + NL + "import org.eclipse.e4.core.services.events.IEventBroker;" + NL + "" + NL + "public class ";
+  protected final String TEXT_5 = " {" + NL + "\t@Inject" + NL + "\tIEventBroker eventBroker;" + NL + "\t" + NL + "\t@PostConstruct" + NL + "\tvoid hookListeners() {" + NL + "\t\t// Hook event listeners" + NL + "\t}" + NL + "\t" + NL + "\t@PreDestroy" + NL + "\tvoid unhookListeners() {" + NL + "\t\t// Unhook event listeners" + NL + "\t}" + NL + "}";
 
   public String generate(Object argument)
   {
     final StringBuffer stringBuffer = new StringBuffer();
      JavaClass domainClass = (JavaClass)argument; 
     stringBuffer.append(TEXT_1);
-    stringBuffer.append( domainClass.getPackageFragment().getElementName() );
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
     stringBuffer.append(TEXT_2);
-    stringBuffer.append( domainClass.getName() );
+    stringBuffer.append( domainClass.getPackageFragment().getElementName() );
     stringBuffer.append(TEXT_3);
+     } 
+    stringBuffer.append(TEXT_4);
+    stringBuffer.append( domainClass.getName() );
+    stringBuffer.append(TEXT_5);
     return stringBuffer.toString();
   }
 }
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
index 70ec397a07..f94d6cdb93 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
@@ -14,37 +14,43 @@ public static synchronized HandlerTemplate create(String lineSeparator)
   }
 
   public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-  protected final String TEXT_1 = " " + NL + "package ";
-  protected final String TEXT_2 = ";" + NL + "" + NL + "import org.eclipse.e4.core.di.annotations.Execute;";
-  protected final String TEXT_3 = NL + "import org.eclipse.e4.core.di.annotations.CanExecute;";
-  protected final String TEXT_4 = NL + NL + "public class ";
-  protected final String TEXT_5 = " {" + NL + "\t@Execute" + NL + "\tpublic void ";
-  protected final String TEXT_6 = "() {" + NL + "\t\t//TODO Your code goes here" + NL + "\t}" + NL + "\t";
-  protected final String TEXT_7 = NL + "\t" + NL + "\t@CanExecute" + NL + "\tpublic boolean ";
-  protected final String TEXT_8 = "() {" + NL + "\t\t//TODO Your code goes here" + NL + "\t\treturn true;" + NL + "\t}" + NL + "\t";
-  protected final String TEXT_9 = "\t" + NL + "}";
+  protected final String TEXT_1 = " ";
+  protected final String TEXT_2 = NL + "package ";
+  protected final String TEXT_3 = ";";
+  protected final String TEXT_4 = NL + NL + "import org.eclipse.e4.core.di.annotations.Execute;";
+  protected final String TEXT_5 = NL + "import org.eclipse.e4.core.di.annotations.CanExecute;";
+  protected final String TEXT_6 = NL + NL + "public class ";
+  protected final String TEXT_7 = " {" + NL + "\t@Execute" + NL + "\tpublic void ";
+  protected final String TEXT_8 = "() {" + NL + "\t\t//TODO Your code goes here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_9 = NL + "\t" + NL + "\t@CanExecute" + NL + "\tpublic boolean ";
+  protected final String TEXT_10 = "() {" + NL + "\t\t//TODO Your code goes here" + NL + "\t\treturn true;" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_11 = "\t" + NL + "}";
 
   public String generate(Object argument)
   {
     final StringBuffer stringBuffer = new StringBuffer();
      HandlerClass domainClass = (HandlerClass)argument; 
     stringBuffer.append(TEXT_1);
-    stringBuffer.append( domainClass.getPackageFragment().getElementName() );
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
     stringBuffer.append(TEXT_2);
-     if( domainClass.isUseCanExecute() )  { 
+    stringBuffer.append( domainClass.getPackageFragment().getElementName() );
     stringBuffer.append(TEXT_3);
      } 
     stringBuffer.append(TEXT_4);
-    stringBuffer.append( domainClass.getName() );
+     if( domainClass.isUseCanExecute() )  { 
     stringBuffer.append(TEXT_5);
-    stringBuffer.append( domainClass.getExecuteMethodName() );
+     } 
     stringBuffer.append(TEXT_6);
-     if( domainClass.isUseCanExecute() )  { 
+    stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_7);
-    stringBuffer.append( domainClass.getCanExecuteMethodName() );
+    stringBuffer.append( domainClass.getExecuteMethodName() );
     stringBuffer.append(TEXT_8);
-     } 
+     if( domainClass.isUseCanExecute() )  { 
     stringBuffer.append(TEXT_9);
+    stringBuffer.append( domainClass.getCanExecuteMethodName() );
+    stringBuffer.append(TEXT_10);
+     } 
+    stringBuffer.append(TEXT_11);
     return stringBuffer.toString();
   }
 }
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
index 7180c49822..5cdb9871b8 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
@@ -14,76 +14,82 @@ public static synchronized PartTemplate create(String lineSeparator)
   }
 
   public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-  protected final String TEXT_1 = " " + NL + "package ";
-  protected final String TEXT_2 = ";" + NL + "" + NL + "import javax.inject.Inject;";
-  protected final String TEXT_3 = NL + "import javax.annotation.PostConstruct;";
-  protected final String TEXT_4 = NL + "import javax.annotation.PreDestroy;";
-  protected final String TEXT_5 = NL + "import org.eclipse.e4.ui.di.Focus;";
-  protected final String TEXT_6 = NL + "import org.eclipse.e4.ui.di.Persist;";
-  protected final String TEXT_7 = NL + NL + "public class ";
-  protected final String TEXT_8 = " {" + NL + "\t@Inject" + NL + "\tpublic ";
-  protected final String TEXT_9 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
-  protected final String TEXT_10 = NL + "\t@PostConstruct" + NL + "\tpublic void ";
+  protected final String TEXT_1 = " ";
+  protected final String TEXT_2 = NL + "package ";
+  protected final String TEXT_3 = ";";
+  protected final String TEXT_4 = NL + NL + "import javax.inject.Inject;";
+  protected final String TEXT_5 = NL + "import javax.annotation.PostConstruct;";
+  protected final String TEXT_6 = NL + "import javax.annotation.PreDestroy;";
+  protected final String TEXT_7 = NL + "import org.eclipse.e4.ui.di.Focus;";
+  protected final String TEXT_8 = NL + "import org.eclipse.e4.ui.di.Persist;";
+  protected final String TEXT_9 = NL + NL + "public class ";
+  protected final String TEXT_10 = " {" + NL + "\t@Inject" + NL + "\tpublic ";
   protected final String TEXT_11 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
-  protected final String TEXT_12 = NL + "\t";
-  protected final String TEXT_13 = NL + "\t@PreDestroy" + NL + "\tpublic void ";
-  protected final String TEXT_14 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
-  protected final String TEXT_15 = NL + "\t";
-  protected final String TEXT_16 = NL + "\t@Focus" + NL + "\tpublic void ";
-  protected final String TEXT_17 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
-  protected final String TEXT_18 = NL + "\t";
-  protected final String TEXT_19 = NL + "\t@Persist" + NL + "\tpublic void ";
-  protected final String TEXT_20 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
-  protected final String TEXT_21 = NL + "}";
+  protected final String TEXT_12 = NL + "\t@PostConstruct" + NL + "\tpublic void ";
+  protected final String TEXT_13 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_14 = NL + "\t";
+  protected final String TEXT_15 = NL + "\t@PreDestroy" + NL + "\tpublic void ";
+  protected final String TEXT_16 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_17 = NL + "\t";
+  protected final String TEXT_18 = NL + "\t@Focus" + NL + "\tpublic void ";
+  protected final String TEXT_19 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_20 = NL + "\t";
+  protected final String TEXT_21 = NL + "\t@Persist" + NL + "\tpublic void ";
+  protected final String TEXT_22 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_23 = NL + "}";
 
   public String generate(Object argument)
   {
     final StringBuffer stringBuffer = new StringBuffer();
      PartClass domainClass = (PartClass)argument; 
     stringBuffer.append(TEXT_1);
-    stringBuffer.append( domainClass.getPackageFragment().getElementName() );
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
     stringBuffer.append(TEXT_2);
-     if( domainClass.isUsePostConstruct() ) { 
+    stringBuffer.append( domainClass.getPackageFragment().getElementName() );
     stringBuffer.append(TEXT_3);
      } 
-     if( domainClass.isUsePredestroy() ) { 
     stringBuffer.append(TEXT_4);
-     } 
-     if( domainClass.isUseFocus() ) { 
+     if( domainClass.isUsePostConstruct() ) { 
     stringBuffer.append(TEXT_5);
      } 
-     if( domainClass.isUsePersist() ) { 
+     if( domainClass.isUsePredestroy() ) { 
     stringBuffer.append(TEXT_6);
      } 
+     if( domainClass.isUseFocus() ) { 
     stringBuffer.append(TEXT_7);
-    stringBuffer.append( domainClass.getName() );
+     } 
+     if( domainClass.isUsePersist() ) { 
     stringBuffer.append(TEXT_8);
-    stringBuffer.append( domainClass.getName() );
+     } 
     stringBuffer.append(TEXT_9);
-     if( domainClass.isUsePostConstruct() ) { 
+    stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_10);
-    stringBuffer.append( domainClass.getPostConstructMethodName()  );
+    stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_11);
-     } 
+     if( domainClass.isUsePostConstruct() ) { 
     stringBuffer.append(TEXT_12);
-     if( domainClass.isUsePredestroy() ) { 
+    stringBuffer.append( domainClass.getPostConstructMethodName()  );
     stringBuffer.append(TEXT_13);
-    stringBuffer.append( domainClass.getPreDestroyMethodName()  );
-    stringBuffer.append(TEXT_14);
      } 
+    stringBuffer.append(TEXT_14);
+     if( domainClass.isUsePredestroy() ) { 
     stringBuffer.append(TEXT_15);
-     if( domainClass.isUseFocus() ) { 
+    stringBuffer.append( domainClass.getPreDestroyMethodName()  );
     stringBuffer.append(TEXT_16);
-    stringBuffer.append( domainClass.getFocusMethodName() );
-    stringBuffer.append(TEXT_17);
      } 
+    stringBuffer.append(TEXT_17);
+     if( domainClass.isUseFocus() ) { 
     stringBuffer.append(TEXT_18);
-     if( domainClass.isUsePersist() ) { 
+    stringBuffer.append( domainClass.getFocusMethodName() );
     stringBuffer.append(TEXT_19);
-    stringBuffer.append( domainClass.getPersistMethodName() );
-    stringBuffer.append(TEXT_20);
      } 
+    stringBuffer.append(TEXT_20);
+     if( domainClass.isUsePersist() ) { 
     stringBuffer.append(TEXT_21);
+    stringBuffer.append( domainClass.getPersistMethodName() );
+    stringBuffer.append(TEXT_22);
+     } 
+    stringBuffer.append(TEXT_23);
     return stringBuffer.toString();
   }
 }
diff --git a/bundles/org.eclipse.e4.tools/templates/addon.txtjet b/bundles/org.eclipse.e4.tools/templates/addon.txtjet
index 32436d2b30..b980609312 100644
--- a/bundles/org.eclipse.e4.tools/templates/addon.txtjet
+++ b/bundles/org.eclipse.e4.tools/templates/addon.txtjet
@@ -1,6 +1,8 @@
 <%@ jet package="org.eclipse.e4.internal.tools.wizards.classes.templates" class="AddonTemplate" imports="org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass" %>
 <% JavaClass domainClass = (JavaClass)argument; %> 
+<% if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { %>
 package <%= domainClass.getPackageFragment().getElementName() %>;
+<% } %>
 
 import javax.inject.Inject;
 import javax.annotation.PostConstruct;
diff --git a/bundles/org.eclipse.e4.tools/templates/handler.txtjet b/bundles/org.eclipse.e4.tools/templates/handler.txtjet
index 7dfd8fd6e6..e425325ed7 100644
--- a/bundles/org.eclipse.e4.tools/templates/handler.txtjet
+++ b/bundles/org.eclipse.e4.tools/templates/handler.txtjet
@@ -1,6 +1,8 @@
 <%@ jet package="org.eclipse.e4.internal.tools.wizards.classes.templates" class="HandlerTemplate" imports="org.eclipse.e4.internal.tools.wizards.classes.NewHandlerClassWizard.HandlerClass" %>
 <% HandlerClass domainClass = (HandlerClass)argument; %> 
+<% if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { %>
 package <%= domainClass.getPackageFragment().getElementName() %>;
+<% } %>
 
 import org.eclipse.e4.core.di.annotations.Execute;
 <% if( domainClass.isUseCanExecute() )  { %>
diff --git a/bundles/org.eclipse.e4.tools/templates/part.txtjet b/bundles/org.eclipse.e4.tools/templates/part.txtjet
index 03a2b1b668..f79efd96c9 100644
--- a/bundles/org.eclipse.e4.tools/templates/part.txtjet
+++ b/bundles/org.eclipse.e4.tools/templates/part.txtjet
@@ -1,6 +1,8 @@
 <%@ jet package="org.eclipse.e4.internal.tools.wizards.classes.templates" class="PartTemplate" imports="org.eclipse.e4.internal.tools.wizards.classes.NewPartClassWizard.PartClass" %>
 <% PartClass domainClass = (PartClass)argument; %> 
+<% if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { %>
 package <%= domainClass.getPackageFragment().getElementName() %>;
+<% } %>
 
 import javax.inject.Inject;
 <% if( domainClass.isUsePostConstruct() ) { %>

From 36b6dd86c4feb1df322431d611317d7f8bfc411c Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster>
Date: Tue, 15 Feb 2011 18:03:08 +0000
Subject: [PATCH 0300/1286] Bug 320171 - [Model] Use real Java-References in
 the Binding-Model-Elements

---
 .../common/component/ApplicationEditor.java   | 18 ++---
 .../common/component/BindingTableEditor.java  | 71 ++++++++++---------
 .../wizards/project/E4NewProjectWizard.java   | 13 +++-
 3 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 47c41be24d..39c886936e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -128,14 +128,16 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_ROOT_CONTEXTS, BINDING_TABLE_CONTAINER__ROOT_CONTEXT, element, Messages.ApplicationEditor_RootContexts) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
+		// list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_ROOT_CONTEXTS,
+		// BINDING_TABLE_CONTAINER__ROOT_CONTEXT, element,
+		// Messages.ApplicationEditor_RootContexts) {
+		//
+		// @Override
+		// protected boolean accepted(Object o) {
+		// return true;
+		// }
+		//
+		// });
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element, Messages.ApplicationEditor_BindingTables) {
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 862cba0a4a..95bbc38d5f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -22,8 +22,6 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BindingContextSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MBindingTable;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
@@ -39,7 +37,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -161,33 +158,41 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.BindingTableEditor_ContextId);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Text t = new Text(parent, SWT.BORDER);
-			TextPasteHandler.createFor(t);
-			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID).observeDetail(getMaster()));
-
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(b.getShell(), getEditor().getModelProvider(), Messages);
-					if (dialog.open() == BindingContextSelectionDialog.OK) {
-						Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID, dialog.getSelectedId());
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
-		}
+		// {
+		// Label l = new Label(parent, SWT.NONE);
+		// l.setText(Messages.BindingTableEditor_ContextId);
+		// l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+		//
+		// Text t = new Text(parent, SWT.BORDER);
+		// TextPasteHandler.createFor(t);
+		// t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		// context.bindValue(textProp.observeDelayed(200, t),
+		// EMFEditProperties.value(getEditingDomain(),
+		// CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID).observeDetail(getMaster()));
+		//
+		// final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+		// b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false,
+		// false));
+		// b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
+		// b.setText(Messages.ModelTooling_Common_FindEllipsis);
+		// b.addSelectionListener(new SelectionAdapter() {
+		// @Override
+		// public void widgetSelected(SelectionEvent e) {
+		// BindingContextSelectionDialog dialog = new
+		// BindingContextSelectionDialog(b.getShell(),
+		// getEditor().getModelProvider(), Messages);
+		// if (dialog.open() == BindingContextSelectionDialog.OK) {
+		// Command cmd = SetCommand.create(getEditingDomain(),
+		// getMaster().getValue(),
+		// CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID,
+		// dialog.getSelectedId());
+		// if (cmd.canExecute()) {
+		// getEditingDomain().getCommandStack().execute(cmd);
+		// }
+		// }
+		// }
+		// });
+		// }
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -309,8 +314,8 @@ public IObservableList getChildList(Object element) {
 	@Override
 	public String getDetailLabel(Object element) {
 		MBindingTable cmd = (MBindingTable) element;
-		if (cmd.getBindingContextId() != null && cmd.getBindingContextId().trim().length() > 0) {
-			return cmd.getBindingContextId();
+		if (cmd.getBindingContext() != null && cmd.getBindingContext().getName() != null && cmd.getBindingContext().getName().trim().length() > 0) {
+			return cmd.getBindingContext().getName();
 		}
 
 		return null;
@@ -318,7 +323,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID) };
+		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT, CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME) };
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 50ef617d8d..4c9c95da40 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -392,7 +392,7 @@ public void createApplicationResources(IProject project,
 			rootContext.getChildren().add(childContext);
 			
 			application.getRootContext().add(rootContext);
-			application.getBindingContexts().add("org.eclipse.ui.contexts.dialogAndWindow");
+			application.getBindingContexts().add(rootContext);
 			
 			resource.getContents().add((EObject) application);
 
@@ -606,8 +606,17 @@ private MCommand createCommand(String name, String className,
 			binding.setCommand(command);
 			List<MBindingTable> tables = application.getBindingTables();
 			if (tables.size()==0) {
+				MBindingContext rootContext = null;
+				if (application.getRootContext().size()>0) {
+					rootContext = application.getRootContext().get(0);
+				} else {
+					rootContext = MCommandsFactory.INSTANCE.createBindingContext();
+					rootContext.setElementId("org.eclipse.ui.contexts.dialogAndWindow");
+					rootContext.setName("In Dialog and Windows");
+					application.getRootContext().add(rootContext);
+				}
 				MBindingTable table = MCommandsFactory.INSTANCE.createBindingTable();
-				table.setBindingContextId("org.eclipse.ui.contexts.dialogAndWindow");
+				table.setBindingContext(rootContext);
 				tables.add(table);
 			}
 			tables.get(0).getBindings().add(binding);

From 6f61fe9423d2fa9905b873ced11174ee17a195d1 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 15 Feb 2011 21:26:42 +0000
Subject: [PATCH 0301/1286] Bug 320171 - [Model] Use real Java-References in
 the Binding-Model-Elements

---
 .../common/component/ApplicationEditor.java   |  21 ++--
 .../common/component/BindingTableEditor.java  |  64 +++++-----
 .../common/component/ControlFactory.java      | 115 ++++++++++++++++++
 .../component/PartDescriptorEditor.java       |   1 +
 .../internal/common/component/PartEditor.java |   2 +-
 .../common/component/WindowEditor.java        |   2 +-
 .../BindingContextSelectionDialog.java        |  10 +-
 7 files changed, 161 insertions(+), 54 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 39c886936e..d4da526150 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -109,9 +109,8 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
-
+		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.ApplicationEditor_BindingContexts);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ApplicationEditor_BindingContexts, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
 	}
@@ -128,16 +127,14 @@ protected boolean accepted(Object o) {
 
 		});
 
-		// list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_ROOT_CONTEXTS,
-		// BINDING_TABLE_CONTAINER__ROOT_CONTEXT, element,
-		// Messages.ApplicationEditor_RootContexts) {
-		//
-		// @Override
-		// protected boolean accepted(Object o) {
-		// return true;
-		// }
-		//
-		// });
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_ROOT_CONTEXTS, BINDING_TABLE_CONTAINER__ROOT_CONTEXT, element, Messages.ApplicationEditor_RootContexts) {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+
+		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element, Messages.ApplicationEditor_BindingTables) {
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 95bbc38d5f..ba06650ea8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -22,6 +22,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BindingContextSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MBindingTable;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
@@ -37,6 +38,7 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -158,41 +160,33 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
-		// {
-		// Label l = new Label(parent, SWT.NONE);
-		// l.setText(Messages.BindingTableEditor_ContextId);
-		// l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-		//
-		// Text t = new Text(parent, SWT.BORDER);
-		// TextPasteHandler.createFor(t);
-		// t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		// context.bindValue(textProp.observeDelayed(200, t),
-		// EMFEditProperties.value(getEditingDomain(),
-		// CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID).observeDetail(getMaster()));
-		//
-		// final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-		// b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false,
-		// false));
-		// b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-		// b.setText(Messages.ModelTooling_Common_FindEllipsis);
-		// b.addSelectionListener(new SelectionAdapter() {
-		// @Override
-		// public void widgetSelected(SelectionEvent e) {
-		// BindingContextSelectionDialog dialog = new
-		// BindingContextSelectionDialog(b.getShell(),
-		// getEditor().getModelProvider(), Messages);
-		// if (dialog.open() == BindingContextSelectionDialog.OK) {
-		// Command cmd = SetCommand.create(getEditingDomain(),
-		// getMaster().getValue(),
-		// CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID,
-		// dialog.getSelectedId());
-		// if (cmd.canExecute()) {
-		// getEditingDomain().getCommandStack().execute(cmd);
-		// }
-		// }
-		// }
-		// });
-		// }
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.BindingTableEditor_ContextId);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			Text t = new Text(parent, SWT.BORDER);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			t.setEditable(false);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT, CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME)).observeDetail(getMaster()));
+
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(b.getShell(), getEditor().getModelProvider(), Messages);
+					if (dialog.open() == BindingContextSelectionDialog.OK) {
+						Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT, dialog.getSelectedContext());
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
 
 		{
 			Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index b73d1b9e5a..d1fc058c7b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -24,6 +24,8 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BindingContextSelectionDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.properties.ProjectOSGiTranslationProvider;
 import org.eclipse.e4.tools.services.IClipboardService.Handler;
@@ -31,6 +33,8 @@
 import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.commands.MBindings;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationFactoryImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MContext;
@@ -58,6 +62,7 @@
 import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ComboViewer;
@@ -442,6 +447,116 @@ public void handleValueChange(ValueChangeEvent event) {
 		});
 	}
 
+	public static void createBindingContextWiget(Composite parent, final Messages Messages, final AbstractComponentEditor editor, String label) {
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(label);
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			final TableViewer viewer = new TableViewer(parent);
+			GridData gd = new GridData(GridData.FILL_BOTH);
+			gd.heightHint = 120;
+			viewer.getControl().setLayoutData(gd);
+			viewer.setContentProvider(new ObservableListContentProvider());
+			viewer.setLabelProvider(new ComponentLabelProvider(editor.getEditor(), Messages));
+			viewer.setInput(EMFProperties.list(CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS).observeDetail(editor.getMaster()));
+
+			final Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout();
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Up);
+			b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_arrow_up));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MBindings container = (MBindings) editor.getMaster().getValue();
+							int idx = container.getBindingContexts().indexOf(obj) - 1;
+							if (idx >= 0) {
+								Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
+
+								if (cmd.canExecute()) {
+									editor.getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Down);
+			b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_arrow_down));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MBindings container = (MBindings) editor.getMaster().getValue();
+							int idx = container.getBindingContexts().indexOf(obj) + 1;
+							if (idx < container.getBindingContexts().size()) {
+								Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
+
+								if (cmd.canExecute()) {
+									editor.getEditingDomain().getCommandStack().execute(cmd);
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
+			b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_add));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(buttonComp.getShell(), editor.getEditor().getModelProvider(), Messages);
+					if (dialog.open() == IDialogConstants.OK_ID) {
+						Command cmd = AddCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, dialog.getSelectedContext());
+						if (cmd.canExecute()) {
+							editor.getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Remove);
+			b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_delete));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					Command cmd = RemoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, ((IStructuredSelection) viewer.getSelection()).toList());
+					if (cmd.canExecute()) {
+						editor.getEditingDomain().getCommandStack().execute(cmd);
+					}
+				}
+			});
+		}
+	}
+
 	public static void createStringListWidget(Composite parent, Messages Messages, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 4161f1bb0d..b8a4d6f2cf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -301,6 +301,7 @@ public void widgetSelected(SelectionEvent e) {
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CATEGORY).observeDetail(master));
 		}
 
+		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.PartEditor_BindingContexts);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		return parent;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index f2fd78d3f7..4df2f2348b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -277,7 +277,7 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.PartEditor_BindingContexts, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.PartEditor_BindingContexts);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index afd72eb246..a7723b900f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -275,7 +275,7 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.WindowEditor_SelectedElement);
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.WindowEditor_BindingContexts, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.WindowEditor_BindingContexts);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
index 05a63e2378..bffd28ba97 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
@@ -49,7 +49,7 @@
 public class BindingContextSelectionDialog extends TitleAreaDialog {
 	private IModelResource resource;
 	private TableViewer viewer;
-	private String selectedId;
+	private MBindingContext selectedContext;
 	private Messages Messages;
 
 	public BindingContextSelectionDialog(Shell parentShell, IModelResource resource, Messages Messages) {
@@ -58,8 +58,8 @@ public BindingContextSelectionDialog(Shell parentShell, IModelResource resource,
 		this.Messages = Messages;
 	}
 
-	public String getSelectedId() {
-		return selectedId;
+	public MBindingContext getSelectedContext() {
+		return selectedContext;
 	}
 
 	@Override
@@ -132,8 +132,8 @@ public void modifyText(ModifyEvent e) {
 	protected void okPressed() {
 		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 		if (!s.isEmpty()) {
-			selectedId = ((MBindingContext) s.getFirstElement()).getElementId();
-			if (selectedId != null && selectedId.trim().length() > 0) {
+			selectedContext = ((MBindingContext) s.getFirstElement());
+			if (selectedContext != null) {
 				super.okPressed();
 			} else {
 				setErrorMessage(Messages.BindingContextSelectionDialog_NoIdReference);

From 054948c4c56ad5d784883704367214c82b94809e Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 15 Feb 2011 21:47:27 +0000
Subject: [PATCH 0302/1286] Bug 335767 - [ModelTooling] Add support for NLS

---
 .../tools/emf/ui/internal/common/component/ControlFactory.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index d1fc058c7b..853b4558e2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -341,6 +341,8 @@ public static void createTranslatedTextField(Composite parent, String label, IOb
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		if (project == null) {
 			gd.horizontalSpan = 2;
+		} else {
+			gd.horizontalSpan = 2;
 		}
 
 		t.setLayoutData(gd);

From f0c8adf3fe6c92ce8be79ea0232f97e95009c942 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 15 Feb 2011 22:36:00 +0000
Subject: [PATCH 0303/1286] Bug 337260 - Improve Forward Compat Layer

---
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF       | 3 ++-
 .../e4/tools/compat/internal/ContextServiceFactory.java        | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 0b4aea4d40..8e138e6925 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.tools.services;bundle-version="1.0.0",
  org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
  org.eclipse.e4.ui.di;bundle-version="0.9.0",
- javax.inject;bundle-version="1.0.0"
+ javax.inject;bundle-version="1.0.0",
+ org.eclipse.core.databinding;bundle-version="1.4.0"
 Service-Component: OSGI-INF/selectionproviderfunction.xml
 Export-Package: org.eclipse.e4.tools.compat.parts
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index 632d0fbe2d..b1ef1c58ba 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -63,6 +63,7 @@ public Object create(@SuppressWarnings("rawtypes") Class serviceInterface, IServ
 			IEclipseContext serviceContext = EclipseContextFactory.getServiceContext(bundleContext);
 
 			final IEclipseContext appContext = serviceContext.createChild("WorkbenchContext"); //$NON-NLS-1$
+			appContext.set(Display.class, Display.getCurrent());
 			appContext.set(Logger.class, new WorkbenchLogger());
 			appContext.set(IClipboardService.class, new ClipboardServiceImpl());
 			IContributionFactory contributionFactory = ContextInjectionFactory.make(ReflectionContributionFactory.class, appContext);

From 9fe004221563cef72d9ac448aad99869dd6e598c Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 15 Feb 2011 22:36:01 +0000
Subject: [PATCH 0304/1286] Bug 337260 - Improve Forward Compat Layer

---
 .../eclipse/e4/tools/compat/internal/ContextServiceFactory.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index b1ef1c58ba..8cf22228ba 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.internal;
 
+import org.eclipse.core.databinding.observable.Realm;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.EclipseContextFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -66,6 +67,7 @@ public Object create(@SuppressWarnings("rawtypes") Class serviceInterface, IServ
 			appContext.set(Display.class, Display.getCurrent());
 			appContext.set(Logger.class, new WorkbenchLogger());
 			appContext.set(IClipboardService.class, new ClipboardServiceImpl());
+			appContext.set(Realm.class, Realm.getDefault());
 			IContributionFactory contributionFactory = ContextInjectionFactory.make(ReflectionContributionFactory.class, appContext);
 			appContext.set(IContributionFactory.class.getName(),contributionFactory);
 			

From 90246b5619bd81fbd33d9559d62af4af65c21274 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 16 Feb 2011 17:21:32 +0000
Subject: [PATCH 0305/1286] Bug 336730 - Bug e 4.1 m5 application creation
 wizard

---
 .../wizards/project/E4NewProjectWizard.java   | 93 ++++++++++++-------
 1 file changed, 58 insertions(+), 35 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 4c9c95da40..541ebdf860 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -29,6 +29,7 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.e4.ui.model.application.MAddon;
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -72,6 +73,7 @@
 import org.eclipse.pde.internal.core.ICoreConstants;
 import org.eclipse.pde.internal.core.bundle.WorkspaceBundlePluginModel;
 import org.eclipse.pde.internal.core.plugin.WorkspacePluginModelBase;
+import org.eclipse.pde.internal.core.util.CoreUtility;
 import org.eclipse.pde.internal.ui.PDEPlugin;
 import org.eclipse.pde.internal.ui.PDEUIMessages;
 import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
@@ -316,8 +318,24 @@ public void createApplicationResources(IProject project,
 		String xmiPath = map
 				.get(NewApplicationWizardPage.APPLICATION_XMI_PROPERTY);
 
+		// If there's no Activator created we create default package
+		if (!fPluginData.doGenerateClass()) {
+			String packageName = fPluginData.getId();
+			IPath path = new Path(packageName.replace('.', '/'));
+			if (fPluginData.getSourceFolderName().trim().length() > 0)
+				path = new Path(fPluginData.getSourceFolderName()).append(path);
+			
+			try {
+				CoreUtility.createFolder(project.getFolder(path));
+			} catch (CoreException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
 		IJavaProject javaProject = JavaCore.create(project);
 		IPackageFragment fragment = null;
+
 		try {
 			for (IPackageFragment element : javaProject.getPackageFragments()) {
 				if (element.getKind() == IPackageFragmentRoot.K_SOURCE) {
@@ -344,56 +362,58 @@ public void createApplicationResources(IProject project,
 
 			MApplication application = MApplicationFactory.INSTANCE
 					.createApplication();
-			
+
 			application.setElementId("org.eclipse.e4.ide.application");
-			
+
 			MAddon addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.core.commands.service");
 			addon.setContributionURI("platform:/plugin/org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon");
 			application.getAddons().add(addon);
-			
+
 			addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.ui.contexts.service");
 			addon.setContributionURI("platform:/plugin/org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon");
 			application.getAddons().add(addon);
-			
+
 			addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.ui.bindings.service");
 			addon.setContributionURI("platform:/plugin/org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon");
 			application.getAddons().add(addon);
-			
+
 			addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.ui.workbench.commands.model");
 			addon.setContributionURI("platform:/plugin/org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon");
 			application.getAddons().add(addon);
-			
+
 			addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.ui.workbench.contexts.model");
 			addon.setContributionURI("platform:/plugin/org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon");
 			application.getAddons().add(addon);
-			
+
 			addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.ui.workbench.bindings.model");
 			addon.setContributionURI("platform:/plugin/org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon");
 			application.getAddons().add(addon);
-			
-			MBindingContext rootContext = MCommandsFactory.INSTANCE.createBindingContext();
+
+			MBindingContext rootContext = MCommandsFactory.INSTANCE
+					.createBindingContext();
 			rootContext.setElementId("org.eclipse.ui.contexts.dialogAndWindow");
 			rootContext.setName("In Dialog and Windows");
-			
-			MBindingContext childContext = MCommandsFactory.INSTANCE.createBindingContext();
+
+			MBindingContext childContext = MCommandsFactory.INSTANCE
+					.createBindingContext();
 			childContext.setElementId("org.eclipse.ui.contexts.window");
 			childContext.setName("In Windows");
 			rootContext.getChildren().add(childContext);
-			
+
 			childContext = MCommandsFactory.INSTANCE.createBindingContext();
 			childContext.setElementId("org.eclipse.ui.contexts.dialog");
 			childContext.setName("In Dialogs");
 			rootContext.getChildren().add(childContext);
-			
+
 			application.getRootContext().add(rootContext);
 			application.getBindingContexts().add(rootContext);
-			
+
 			resource.getContents().add((EObject) application);
 
 			// Create Quit command
@@ -410,7 +430,8 @@ public void createApplicationResources(IProject project,
 					"AboutHandler", "Ctrl+A", projectName, fragment,
 					application);
 
-			MTrimmedWindow mainWindow = MBasicFactory.INSTANCE.createTrimmedWindow();
+			MTrimmedWindow mainWindow = MBasicFactory.INSTANCE
+					.createTrimmedWindow();
 			application.getChildren().add(mainWindow);
 			{
 				mainWindow.setLabel(projectName);
@@ -423,8 +444,7 @@ public void createApplicationResources(IProject project,
 					mainWindow.setMainMenu(menu);
 					menu.setElementId("menu:org.eclipse.ui.main.menu");
 
-					MMenu fileMenuItem = MMenuFactory.INSTANCE
-							.createMenu();
+					MMenu fileMenuItem = MMenuFactory.INSTANCE.createMenu();
 					menu.getChildren().add(fileMenuItem);
 					fileMenuItem.setLabel("File");
 					{
@@ -450,8 +470,7 @@ public void createApplicationResources(IProject project,
 						menuItemQuit.setLabel("Quit");
 						menuItemQuit.setCommand(quitCommand);
 					}
-					MMenu helpMenuItem = MMenuFactory.INSTANCE
-							.createMenu();
+					MMenu helpMenuItem = MMenuFactory.INSTANCE.createMenu();
 					menu.getChildren().add(helpMenuItem);
 					helpMenuItem.setLabel("Help");
 					{
@@ -481,15 +500,17 @@ public void createApplicationResources(IProject project,
 						MPartStack partStack = MBasicFactory.INSTANCE
 								.createPartStack();
 						partSashContainer.getChildren().add(partStack);
-//
-//						MPart part = MApplicationFactory.eINSTANCE.createPart();
-//						partStack.getChildren().add(part);
-//						part.setLabel("Main");
+						//
+						// MPart part =
+						// MApplicationFactory.eINSTANCE.createPart();
+						// partStack.getChildren().add(part);
+						// part.setLabel("Main");
 					}
 
 					// WindowTrim
 					{
-						MTrimBar trimBar = MBasicFactory.INSTANCE.createTrimBar();
+						MTrimBar trimBar = MBasicFactory.INSTANCE
+								.createTrimBar();
 						mainWindow.getTrimBars().add(trimBar);
 
 						MToolBar toolBar = MMenuFactory.INSTANCE
@@ -593,29 +614,31 @@ private MCommand createCommand(String name, String className,
 		application.getCommands().add(command);
 		{
 			// Create Quit handler for command
-			MHandler quitHandler =MCommandsFactory.INSTANCE
-					.createHandler();
+			MHandler quitHandler = MCommandsFactory.INSTANCE.createHandler();
 			quitHandler.setCommand(command);
-			quitHandler.setContributionURI("platform:/plugin/" + projectName + "/"
-					+ fragment.getElementName() + ".handlers." + className);
+			quitHandler.setContributionURI("platform:/plugin/" + projectName
+					+ "/" + fragment.getElementName() + ".handlers."
+					+ className);
 			application.getHandlers().add(quitHandler);
 
-			MKeyBinding binding = MCommandsFactory.INSTANCE
-					.createKeyBinding();
+			MKeyBinding binding = MCommandsFactory.INSTANCE.createKeyBinding();
 			binding.setKeySequence(keyBinding);
 			binding.setCommand(command);
 			List<MBindingTable> tables = application.getBindingTables();
-			if (tables.size()==0) {
+			if (tables.size() == 0) {
 				MBindingContext rootContext = null;
-				if (application.getRootContext().size()>0) {
+				if (application.getRootContext().size() > 0) {
 					rootContext = application.getRootContext().get(0);
 				} else {
-					rootContext = MCommandsFactory.INSTANCE.createBindingContext();
-					rootContext.setElementId("org.eclipse.ui.contexts.dialogAndWindow");
+					rootContext = MCommandsFactory.INSTANCE
+							.createBindingContext();
+					rootContext
+							.setElementId("org.eclipse.ui.contexts.dialogAndWindow");
 					rootContext.setName("In Dialog and Windows");
 					application.getRootContext().add(rootContext);
 				}
-				MBindingTable table = MCommandsFactory.INSTANCE.createBindingTable();
+				MBindingTable table = MCommandsFactory.INSTANCE
+						.createBindingTable();
 				table.setBindingContext(rootContext);
 				tables.add(table);
 			}

From d4ba8b7f839dd0d0f6a98aa20a722d901d354b7a Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 16 Feb 2011 19:41:36 +0000
Subject: [PATCH 0306/1286] Bug 337174 - [ModelTooling] Creating class is
 default package fails

---
 .../classes/AbstractNewClassWizard.java       | 32 ++++++++++++++++++-
 .../wizards/classes/NewAddonClassWizard.java  |  6 ++++
 .../classes/NewHandlerClassWizard.java        |  5 +++
 .../wizards/classes/NewPartClassWizard.java   |  6 ++++
 4 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
index 16974d80e1..355a41c726 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
@@ -13,9 +13,12 @@
 import java.io.ByteArrayInputStream;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaElement;
@@ -111,11 +114,21 @@ public JavaClass getDomainClass() {
 		return ((AbstractNewClassPage) getPages()[0]).getClazz();
 	}
 	
+	protected void checkRequiredBundles() {
+		
+	}
+	
 	@Override
 	public boolean performFinish() {
 		JavaClass clazz = getDomainClass();
 		String content = getContent();
 		
+		if( clazz.getFragmentRoot() == null ) {
+			return false;
+		}
+		
+		checkRequiredBundles();
+		
 		IPackageFragment fragment = clazz.getPackageFragment();
 		if (fragment != null) {
 			String cuName = clazz.getName() + ".java";
@@ -131,7 +144,24 @@ public boolean performFinish() {
 							IFile.FORCE | IFile.KEEP_HISTORY, null);
 				}
 				IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
-				unit.open(null);
+//				unit.open(null);
+			} catch (CoreException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		} else {
+			String cuName = clazz.getName() + ".java";
+			IFolder p = (IFolder) clazz.getFragmentRoot().getResource();
+			file = p.getFile(cuName);
+			try {
+				if (!file.exists()) {
+					file.create(new ByteArrayInputStream(content.getBytes()),
+							true, null);
+				} else {
+					file.setContents(new ByteArrayInputStream(content.getBytes()),
+							IFile.FORCE | IFile.KEEP_HISTORY, null);
+				}
+				IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
 			} catch (CoreException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
index fba02f96fb..48793ef0ac 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
@@ -40,5 +40,11 @@ protected String getContent() {
 		AddonTemplate template = new AddonTemplate();
 		return template.generate(getDomainClass());
 	}
+	
+	@Override
+	protected void checkRequiredBundles() {
+		// TODO Auto-generated method stub
+		
+	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
index 4fc4f47930..100fb1888a 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
@@ -86,6 +86,11 @@ protected void createFields(Composite parent, DataBindingContext dbc) {
 		});
 	}
 	
+	@Override
+	protected void checkRequiredBundles() {
+		// TODO Auto-generated method stub
+		
+	}
 	
 
 	public static class HandlerClass extends JavaClass {
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
index d33ffbdc7e..a28bdb1922 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
@@ -134,6 +134,12 @@ protected JavaClass createInstance() {
 
 		});
 	}
+	
+	@Override
+	protected void checkRequiredBundles() {
+		// TODO Auto-generated method stub
+		
+	}
 
 	@Override
 	protected String getContent() {

From aa024bf54e3f934a30fe66af3b4c026ae493e19a Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 16 Feb 2011 20:14:07 +0000
Subject: [PATCH 0307/1286] Bug 337174 - [ModelTooling] Creating class is
 default package fails

---
 .../classes/AbstractNewClassWizard.java       | 46 ++++++++++++++++++-
 .../wizards/classes/NewAddonClassWizard.java  | 13 ++++--
 .../classes/NewHandlerClassWizard.java        | 10 ++--
 .../wizards/classes/NewPartClassWizard.java   | 14 ++++--
 4 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
index 355a41c726..523e003bc4 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
@@ -11,9 +11,15 @@
 package org.eclipse.e4.internal.tools.wizards.classes;
 
 import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -29,10 +35,16 @@
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.pde.core.project.IBundleProjectDescription;
+import org.eclipse.pde.core.project.IBundleProjectService;
+import org.eclipse.pde.core.project.IRequiredBundleDescription;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.IDE;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
 
 public abstract class AbstractNewClassWizard extends Wizard implements INewWizard {
 	protected IPackageFragmentRoot root;
@@ -115,7 +127,39 @@ public JavaClass getDomainClass() {
 	}
 	
 	protected void checkRequiredBundles() {
-		
+		IProject project = getDomainClass().getFragmentRoot().getJavaProject().getProject();
+		BundleContext context = FrameworkUtil.getBundle(NewAddonClassWizard.class).getBundleContext();
+		ServiceReference<IBundleProjectService> ref = context.getServiceReference(IBundleProjectService.class);
+		IBundleProjectService service = context.getService(ref);
+		try {
+			IBundleProjectDescription description = service.getDescription(project);
+			Set<String> requiredBundles = getRequiredBundles();
+			IRequiredBundleDescription[] arTmp = description.getRequiredBundles();
+			List<IRequiredBundleDescription> descs = new ArrayList<IRequiredBundleDescription>();
+			if( arTmp != null ) {
+				descs.addAll(Arrays.asList(arTmp));
+			}
+			for( IRequiredBundleDescription bd : descs ) {
+				requiredBundles.remove(bd.getName());
+			}
+			
+			if( requiredBundles.size() > 0 ) {
+				for( String b : requiredBundles ) {
+					descs.add(service.newRequiredBundle(b, null, false, false));
+				}
+				description.setRequiredBundles(descs.toArray(new IRequiredBundleDescription[0]));
+				description.apply(new NullProgressMonitor());
+			}
+		} catch (CoreException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+	protected Set<String> getRequiredBundles() {
+		Set<String> rv = new HashSet<String>();
+		rv.add("javax.inject");
+		return rv;
 	}
 	
 	@Override
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
index 48793ef0ac..58432912b2 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
+import java.util.Set;
+
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.e4.internal.tools.wizards.classes.templates.AddonTemplate;
@@ -42,9 +44,10 @@ protected String getContent() {
 	}
 	
 	@Override
-	protected void checkRequiredBundles() {
-		// TODO Auto-generated method stub
-		
+	protected Set<String> getRequiredBundles() {
+		Set<String> rv = super.getRequiredBundles();
+		rv.add("javax.annotation");
+		rv.add("org.eclipse.e4.core.services");
+		return rv;
 	}
-
-}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
index 100fb1888a..f970424a4c 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
+import java.util.Set;
+
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.beans.BeanProperties;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -87,12 +89,12 @@ protected void createFields(Composite parent, DataBindingContext dbc) {
 	}
 	
 	@Override
-	protected void checkRequiredBundles() {
-		// TODO Auto-generated method stub
-		
+	protected Set<String> getRequiredBundles() {
+		Set<String> set = super.getRequiredBundles();
+		set.add("org.eclipse.e4.core.di");
+		return set;
 	}
 	
-
 	public static class HandlerClass extends JavaClass {
 		private String executeMethodName = "execute";
 		private String canExecuteMethodName = "canExecute";
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
index a28bdb1922..db3d3bf679 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
@@ -12,6 +12,7 @@
 
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
+import java.util.Set;
 
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.beans.BeanProperties;
@@ -136,11 +137,18 @@ protected JavaClass createInstance() {
 	}
 	
 	@Override
-	protected void checkRequiredBundles() {
-		// TODO Auto-generated method stub
+	protected Set<String> getRequiredBundles() {
+		Set<String> rv = super.getRequiredBundles();
+		PartClass cl = (PartClass)getDomainClass();
+		if( cl.usePostConstruct || cl.usePredestroy ) {
+			rv.add("javax.annotation");
+		} else if( cl.useFocus || cl.usePersist ) {
+			rv.add("org.eclipse.e4.ui.di");
+		}
 		
+		return rv;
 	}
-
+	
 	@Override
 	protected String getContent() {
 		PartTemplate template = new PartTemplate();

From 1a466bea7b36bd5fd59967ec9ed32d649d5b5e49 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 16 Feb 2011 22:19:09 +0000
Subject: [PATCH 0308/1286] Bug 306619 - [ModelTooling] e4 WorkbenchModel
 Editor should support wildcard searches

---
 .../emf/editor3x/PDEClassContributionProvider.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index cf55a477d1..76f37692b3 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -49,6 +49,14 @@ public void findContribution(final Filter filter,  final ContributionResultHandl
 			// There is no package qualification
 			// Perform the search only on the type name
 			typeName = currentContent.toCharArray();
+			if( currentContent.startsWith("*") ) {
+				typeName = "".toCharArray();
+				if( ! currentContent.endsWith("*") ) {
+					currentContent += "*";
+				}
+				packageName = currentContent.toCharArray();
+			}
+			
 		} else if ((index + 1) == currentContent.length()) {
 			// There is a package qualification and the last character is a
 			// dot
@@ -132,7 +140,7 @@ public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
 		try {
 			searchEngine.searchAllTypeNames(
 					packageName, 
-					SearchPattern.R_EXACT_MATCH, 
+					SearchPattern.R_PATTERN_MATCH, 
 					typeName, 
 					SearchPattern.R_PREFIX_MATCH, 
 					IJavaSearchConstants.CLASS, 

From 42e76ce20a442073700a3c419dc3cb54779197c7 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 18 Feb 2011 22:00:47 +0000
Subject: [PATCH 0309/1286] Bug 337560 - [ModelTooling] Split form area in tabs
 * a first split

---
 .../component/AbstractComponentEditor.java    |  37 +++++++
 .../e4/tools/emf/ui/internal/Messages.java    |   2 +
 .../tools/emf/ui/internal/Messages.properties |   2 +
 .../emf/ui/internal/common/ModelEditor.java   |  49 +++++----
 .../common/component/AddonsEditor.java        |  25 ++++-
 .../common/component/ApplicationEditor.java   |  31 ++++--
 .../internal/common/component/AreaEditor.java | 104 +++++++++++++++---
 .../component/BindingContextEditor.java       |  30 +++--
 .../common/component/BindingTableEditor.java  |  30 +++--
 .../common/component/CategoryEditor.java      |  25 ++++-
 .../common/component/CommandEditor.java       |  41 ++++---
 .../component/CommandParameterEditor.java     |  26 ++++-
 .../component/CoreExpressionEditor.java       |  27 ++++-
 .../common/component/HandlerEditor.java       |  27 +++--
 .../common/component/KeyBindingEditor.java    |  27 +++--
 .../component/MenuContributionEditor.java     |  27 +++--
 .../internal/common/component/MenuEditor.java |  30 +++--
 .../common/component/MenuItemEditor.java      |  30 +++--
 .../common/component/MenuSeparatorEditor.java |  26 +++--
 .../component/ModelFragmentsEditor.java       |  21 ++--
 .../common/component/ParameterEditor.java     |  26 ++++-
 .../component/PartDescriptorEditor.java       |  27 +++--
 .../internal/common/component/PartEditor.java |  27 +++--
 .../component/PartSashContainerEditor.java    |  27 +++--
 .../common/component/PartStackEditor.java     |  27 +++--
 .../common/component/PerspectiveEditor.java   |  28 +++--
 .../component/PerspectiveStackEditor.java     |  27 +++--
 .../common/component/PlaceholderEditor.java   |  26 +++--
 .../common/component/StringModelFragment.java |  23 ++--
 .../component/ToolBarContributionEditor.java  |  27 +++--
 .../common/component/ToolBarEditor.java       |  27 ++++-
 .../component/ToolBarSeparatorEditor.java     |  27 +++--
 .../common/component/ToolControlEditor.java   |  27 +++--
 .../common/component/ToolItemEditor.java      |  28 +++--
 .../common/component/TrimBarEditor.java       |  27 +++--
 .../component/TrimContributionEditor.java     |  27 +++--
 .../common/component/WindowEditor.java        |  26 ++++-
 .../component/virtual/VApplicationAddons.java |  19 +++-
 .../virtual/VApplicationCategoriesEditor.java |  19 +++-
 .../virtual/VBindingTableEditor.java          |  19 +++-
 .../component/virtual/VCommandEditor.java     |  19 +++-
 .../component/virtual/VHandlerEditor.java     |  19 +++-
 .../virtual/VItemParametersEditor.java        |  19 +++-
 .../virtual/VMenuContributionsEditor.java     |  19 +++-
 .../common/component/virtual/VMenuEditor.java |  19 +++-
 .../virtual/VModelFragmentsEditor.java        |  19 +++-
 .../virtual/VModelImportsEditor.java          |  19 +++-
 .../component/virtual/VPartDescriptor.java    |  19 +++-
 .../virtual/VRootBindingContexts.java         |  19 +++-
 .../virtual/VToolBarContributionsEditor.java  |  19 +++-
 .../virtual/VTrimContributionsEditor.java     |  19 +++-
 .../virtual/VWindowControlEditor.java         |  19 +++-
 .../component/virtual/VWindowEditor.java      |  19 +++-
 .../virtual/VWindowSharedElementsEditor.java  |  19 +++-
 .../component/virtual/VWindowTrimEditor.java  |  19 +++-
 55 files changed, 1023 insertions(+), 390 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 3234f2753d..f914f28009 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -33,12 +33,21 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.resource.ImageDescriptor;
+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.graphics.Image;
+import org.eclipse.swt.graphics.Rectangle;
+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.Display;
 
 public abstract class AbstractComponentEditor {
+	private static final String CSS_CLASS_KEY = "org.eclipse.e4.ui.css.CssClassName"; //$NON-NLS-1$
+
 	private WritableValue master = new WritableValue();
 
 	public static final int SEARCH_IMAGE = 0;
@@ -164,4 +173,32 @@ public void handleCut() {
 			}
 		}
 	}
+
+	protected Composite createScrollableContainer(Composite parent) {
+		final ScrolledComposite scrolling = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
+		scrolling.setBackgroundMode(SWT.INHERIT_DEFAULT);
+		scrolling.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
+
+		final Composite contentContainer = new Composite(scrolling, SWT.NONE);
+
+		contentContainer.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
+		scrolling.setExpandHorizontal(true);
+		scrolling.setExpandVertical(true);
+		scrolling.setContent(contentContainer);
+
+		scrolling.addControlListener(new ControlAdapter() {
+			public void controlResized(ControlEvent e) {
+				Rectangle r = scrolling.getClientArea();
+				scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT));
+			}
+		});
+
+		scrolling.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+		GridLayout gl = new GridLayout(3, false);
+		gl.horizontalSpacing = 10;
+		contentContainer.setLayout(gl);
+
+		return contentContainer;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 777352ec49..2ffd3964a4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -20,6 +20,8 @@ public class Messages {
 	public String ModelTooling_Common_Id;
 	public String ModelTooling_Common_RefId;
 	public String ModelTooling_Common_FindEllipsis;
+	public String ModelTooling_Common_TabDefault;
+	public String ModelTooling_Common_TabSupplementary;
 
 	public String ModelTooling_UIElement_ToBeRendered;
 	public String ModelTooling_UIElement_Visible;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 30b91f9f43..f200a6aa57 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -16,6 +16,8 @@ ModelTooling_Common_Remove=Remove
 ModelTooling_Common_Id=Id
 ModelTooling_Common_RefId=Reference-Id
 ModelTooling_Common_FindEllipsis=Find ...
+ModelTooling_Common_TabDefault=Default
+ModelTooling_Common_TabSupplementary=Supplementary
 
 ModelTooling_UIElement_ToBeRendered=To Be Rendered
 ModelTooling_UIElement_Visible=Visible
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 4b9b691638..1a6899606d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -182,18 +182,14 @@
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.custom.ScrolledComposite;
 import org.eclipse.swt.dnd.Clipboard;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DragSourceAdapter;
 import org.eclipse.swt.dnd.DragSourceEvent;
 import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -413,25 +409,29 @@ private Composite createFormTab(Composite composite) {
 		textLabel.setData(CSS_CLASS_KEY, "sectionHeader"); //$NON-NLS-1$
 		textLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
-		final ScrolledComposite scrolling = new ScrolledComposite(editingArea, SWT.H_SCROLL | SWT.V_SCROLL);
-		scrolling.setBackgroundMode(SWT.INHERIT_DEFAULT);
-		scrolling.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
+		// final ScrolledComposite scrolling = new
+		// ScrolledComposite(editingArea, SWT.H_SCROLL | SWT.V_SCROLL);
+		// scrolling.setBackgroundMode(SWT.INHERIT_DEFAULT);
+		//		scrolling.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
 
 		final EStackLayout layout = new EStackLayout();
-		final Composite contentContainer = new Composite(scrolling, SWT.NONE);
-		contentContainer.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
-		scrolling.setExpandHorizontal(true);
-		scrolling.setExpandVertical(true);
-		scrolling.setContent(contentContainer);
-
-		scrolling.addControlListener(new ControlAdapter() {
-			public void controlResized(ControlEvent e) {
-				Rectangle r = scrolling.getClientArea();
-				scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT));
-			}
-		});
+		final Composite contentContainer = new Composite(editingArea, SWT.NONE);
+		contentContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
 
-		scrolling.setLayoutData(new GridData(GridData.FILL_BOTH));
+		//		contentContainer.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
+		// scrolling.setExpandHorizontal(true);
+		// scrolling.setExpandVertical(true);
+		// scrolling.setContent(contentContainer);
+		//
+		// scrolling.addControlListener(new ControlAdapter() {
+		// public void controlResized(ControlEvent e) {
+		// Rectangle r = scrolling.getClientArea();
+		// scrolling.setMinSize(contentContainer.computeSize(r.width,
+		// SWT.DEFAULT));
+		// }
+		// });
+		//
+		// scrolling.setLayoutData(new GridData(GridData.FILL_BOTH));
 		contentContainer.setLayout(layout);
 
 		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
@@ -476,10 +476,11 @@ public void run() {
 						}
 					}
 
-					Rectangle r = scrolling.getClientArea();
-					scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT));
-					scrolling.setOrigin(0, 0);
-					scrolling.layout(true, true);
+					// Rectangle r = scrolling.getClientArea();
+					// scrolling.setMinSize(contentContainer.computeSize(r.width,
+					// SWT.DEFAULT));
+					// scrolling.setOrigin(0, 0);
+					// scrolling.layout(true, true);
 
 					if (selectionService != null) {
 						selectionService.setSelection(s.getFirstElement());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index a85b73d9a2..1f0a3784a8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -33,11 +33,12 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -119,10 +120,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -175,9 +179,18 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.AddonsEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index d4da526150..e2abbe9d81 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -31,8 +31,9 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -93,10 +94,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	protected Composite createForm(Composite parent, EMFDataBindingContext context) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -105,14 +109,25 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
+		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.ApplicationEditor_BindingContexts);
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
-		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.ApplicationEditor_BindingContexts);
+
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.AddonsEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
 
-		return parent;
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 0adaf8b07a..4e01654a52 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -10,7 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -46,6 +48,7 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
@@ -58,6 +61,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -78,6 +83,8 @@ public class AreaEditor extends AbstractComponentEditor {
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
 
+	private List<Action> actions = new ArrayList<Action>();
+
 	@Inject
 	@Optional
 	private IProject project;
@@ -87,6 +94,46 @@ public AreaEditor() {
 		super();
 	}
 
+	@PostConstruct
+	void init() {
+		actions.add(new Action(Messages.PartSashContainerEditor_AddPartSashContainer, createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
+			}
+		});
+		actions.add(new Action(Messages.PartSashContainerEditor_AddPartStack, createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.PART_STACK);
+			}
+		});
+		actions.add(new Action(Messages.PartSashContainerEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.PART);
+			}
+		});
+		actions.add(new Action(Messages.PartSashContainerEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.INPUT_PART);
+			}
+		});
+		actions.add(new Action(Messages.PartSashContainerEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area)) {
+			@Override
+			public void run() {
+				handleAddChild(AdvancedPackageImpl.Literals.AREA);
+			}
+		});
+		actions.add(new Action(Messages.PartSashContainerEditor_AddPlaceholder, createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
+			@Override
+			public void run() {
+				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
+			}
+		});
+	}
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		boolean horizontal = ((MPartSashContainer) element).isHorizontal();
@@ -155,10 +202,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -173,7 +223,6 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.AreaEditor_LabelLabel, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createTextField(parent, Messages.AreaEditor_Tooltip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
 
 		// ------------------------------------------------------------
@@ -244,8 +293,7 @@ public String getText(Object element) {
 			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			final TableViewer viewer = new TableViewer(parent);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 200;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
@@ -256,7 +304,7 @@ public String getText(Object element) {
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -332,15 +380,7 @@ public String getText(Object element) {
 				public void widgetSelected(SelectionEvent e) {
 					if (!childrenDropDown.getSelection().isEmpty()) {
 						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-						EObject eObject = EcoreUtil.create(eClass);
-						setElementId(eObject);
-
-						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-							getEditor().setSelection(eObject);
-						}
+						handleAddChild(eClass);
 					}
 				}
 			});
@@ -367,9 +407,30 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
+	}
+
+	protected void handleAddChild(EClass eClass) {
+		EObject eObject = EcoreUtil.create(eClass);
+		setElementId(eObject);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(eObject);
+		}
 	}
 
 	@Override
@@ -386,4 +447,11 @@ public String getDetailLabel(Object element) {
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index cf1434ab99..931cb7dd81 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -43,6 +43,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -138,10 +140,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -166,8 +171,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
 
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.heightHint = 300;
+		GridData gd = new GridData(GridData.FILL_BOTH);
 		viewer.getControl().setLayoutData(gd);
 		viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
@@ -176,7 +180,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		gl = new GridLayout();
+		GridLayout gl = new GridLayout();
 		gl.marginLeft = 0;
 		gl.marginRight = 0;
 		gl.marginWidth = 0;
@@ -265,7 +269,17 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		return parent;
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index ba06650ea8..28ebe2494c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -47,6 +47,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -132,10 +134,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -197,8 +202,7 @@ public void widgetSelected(SelectionEvent e) {
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
 
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
@@ -207,7 +211,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout();
+			GridLayout gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -297,7 +301,17 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index c561544156..30f37e8d17 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -25,8 +25,9 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
@@ -96,10 +97,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -116,9 +120,18 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.CategoryEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__NAME));
 		ControlFactory.createTextField(parent, Messages.CategoryEditor_Description, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__DESCRIPTION));
+
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index d86773c3f9..55a348ff25 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -45,6 +45,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -130,10 +132,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -149,21 +154,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.CommandEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME));
-
-		// ------------------------------------------------------------
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.CommandEditor_LabelDescription);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-			Text t = new Text(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-			TextPasteHandler.createFor(t);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			gd.heightHint = 100;
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__DESCRIPTION).observeDetail(getMaster()));
-		}
+		ControlFactory.createTextField(parent, Messages.CommandEditor_LabelDescription, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__DESCRIPTION));
 
 		// ------------------------------------------------------------
 		{
@@ -211,7 +202,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout();
+			GridLayout gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -301,9 +292,17 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 7bf53d2c84..90e05c4042 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -27,9 +27,10 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -107,10 +108,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -141,7 +145,17 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
 		}
 
-		return parent;
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index d67a3153e8..0f8129e152 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -17,6 +17,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ExpressionIdDialog;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MCoreExpression;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -24,12 +25,13 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -81,10 +83,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -118,7 +123,17 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		}
 
-		return parent;
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 9ec6853c4a..6aea831483 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -39,11 +39,12 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -118,10 +119,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
@@ -199,9 +203,18 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
-		return parent;
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 490fda82a6..ef07c0c360 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -54,6 +54,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -142,10 +144,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -217,7 +222,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		gl = new GridLayout();
+		GridLayout gl = new GridLayout();
 		gl.marginLeft = 0;
 		gl.marginRight = 0;
 		gl.marginWidth = 0;
@@ -308,9 +313,17 @@ public void widgetSelected(SelectionEvent e) {
 		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
 
-		return parent;
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 11a523c505..f83618bc58 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -47,6 +47,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -144,10 +146,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -185,7 +190,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -299,9 +304,17 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
 		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
 
-		return parent;
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index b844c4c7b5..90a8c5da6d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -71,6 +71,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -195,10 +197,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean rootMenu, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -230,8 +235,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
 
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
@@ -240,7 +244,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -414,9 +418,17 @@ public String getText(Object element) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
 
-		return parent;
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 71bd5672d2..b6b9d8fd28 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -49,11 +49,12 @@
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -123,10 +124,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 		IWidgetValueProperty checkProp = WidgetProperties.selection();
@@ -161,8 +165,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			}
 		}
 
-		ControlFactory.createTranslatedTextField(parent, Messages.MenuItemEditor_Label, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createTranslatedTextField(parent, Messages.MenuItemEditor_Label, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
 		ControlFactory.createTextField(parent, Messages.MenuItemEditor_Mnemonics, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS));
 		ControlFactory.createTranslatedTextField(parent, Messages.MenuItemEditor_Tooltip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool, project);
@@ -274,9 +276,19 @@ public String getText(Object element) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
 
-		return parent;
+		return folder;
 	}
 
 	protected abstract void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 66a86641f3..17c051342e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -25,8 +25,9 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
@@ -95,10 +96,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -116,9 +120,17 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
 
-		return parent;
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index 4d243152fb..c6ac79e056 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -48,6 +48,8 @@
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -95,10 +97,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -121,7 +126,7 @@ private Composite createForm(Composite parent) {
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -262,7 +267,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout();
+			GridLayout gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -360,7 +365,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	public void addClasses(EPackage ePackage, List<FeatureClass> list) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index 7595fe5c59..b3f4572e71 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -26,8 +26,9 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
@@ -103,10 +104,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -123,7 +127,17 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		ControlFactory.createTextField(parent, Messages.ParameterEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__NAME));
 		ControlFactory.createTextField(parent, Messages.ParameterEditor_Value, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__VALUE));
 
-		return parent;
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index b8a4d6f2cf..0e1a99bcd7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -49,11 +49,12 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -131,10 +132,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -302,9 +306,18 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.PartEditor_BindingContexts);
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
-		return parent;
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	private void addToolBar() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 4df2f2348b..c4eb4239d2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -55,11 +55,12 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -150,10 +151,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -281,9 +285,18 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
-		return parent;
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	private void addToolBar() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index b22e2e9bb8..75a8a65a6d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -53,6 +53,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -186,10 +188,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -248,7 +253,7 @@ public String getText(Object element) {
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -351,9 +356,17 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
 
-		return parent;
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 014342c2d9..f0d82e6a2b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -50,6 +50,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -155,10 +157,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -194,7 +199,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -295,9 +300,17 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
 
-		return parent;
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 852c38996b..b28457a186 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -58,6 +58,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -195,10 +197,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -270,7 +275,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -375,9 +380,18 @@ public void widgetSelected(SelectionEvent e) {
 
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
-		return parent;
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 050891670d..62544cbd6c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -45,6 +45,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -142,10 +144,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -180,7 +185,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout();
+			GridLayout gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -268,9 +273,17 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
 
-		return parent;
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 57bade472c..1be26f8753 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -34,11 +34,12 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -140,10 +141,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -213,9 +217,17 @@ public void widgetSelected(SelectionEvent e) {
 		}
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
 
-		return parent;
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 247f65ff93..1852a4fad4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -50,6 +50,8 @@
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -103,10 +105,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -122,7 +127,7 @@ private Composite createForm(Composite parent) {
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			comp.setLayoutData(gd);
-			gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginWidth = gl.marginHeight = 0;
 			gl.verticalSpacing = 0;
 			gl.marginLeft = gl.marginBottom = gl.marginRight = gl.marginTop = 0;
@@ -155,7 +160,7 @@ public void widgetSelected(SelectionEvent e) {
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			comp.setLayoutData(gd);
-			gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginWidth = gl.marginHeight = 0;
 			gl.verticalSpacing = 0;
 			gl.marginLeft = gl.marginBottom = gl.marginRight = gl.marginTop = 0;
@@ -199,7 +204,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -323,7 +328,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	public void dispose() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 488cd656b5..a1c719bbfe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -47,6 +47,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -145,10 +147,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -186,7 +191,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -301,9 +306,17 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
 
-		return parent;
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 6ea78a7bf2..6d6b1b52a9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -50,6 +50,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -173,10 +175,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -212,7 +217,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -317,7 +322,17 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
 		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
-		return parent;
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 8f6b6dfc6b..29e386a7d2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -27,8 +27,9 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
@@ -106,10 +107,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -126,9 +130,18 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
-		return parent;
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index ff437a247f..19bf8146b1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -32,11 +32,12 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -122,10 +123,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -169,9 +173,18 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
-		return parent;
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 7e7266edde..2f2313ed40 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -48,10 +48,11 @@
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -106,10 +107,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -124,12 +128,14 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
-		createFormSubTypeForm(parent, context, master);
+		createFormSubTypeForm(parent, folder, context, master);
+
+		folder.setSelection(0);
 
-		return parent;
+		return folder;
 	}
 
-	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, final WritableValue master) {
+	protected void createFormSubTypeForm(Composite parent, CTabFolder folder, EMFDataBindingContext context, final WritableValue master) {
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 		IWidgetValueProperty checkProp = WidgetProperties.selection();
 		IWidgetValueProperty enabled = WidgetProperties.enabled();
@@ -262,6 +268,12 @@ public String getText(Object element) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 2109295acf..1cb7531fd6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -54,6 +54,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -156,10 +158,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -209,7 +214,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -308,9 +313,17 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
 
-		return parent;
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 4e796d85fd..1b9d79be6e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -46,6 +46,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -132,10 +134,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -171,7 +176,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -277,9 +282,17 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
 
-		return parent;
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index a7723b900f..acdb2c8e6e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -52,6 +52,8 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -161,10 +163,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -278,9 +283,18 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.WindowEditor_BindingContexts);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
-		return parent;
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	void removeMenu() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index ee3ba01ebc..aab20496df 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -35,6 +35,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -100,10 +102,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -120,7 +125,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout();
+			GridLayout gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -206,7 +211,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	private void handleAddAddon() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index 0b8524dade..5677b445d4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -35,6 +35,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -100,10 +102,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -120,7 +125,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout();
+			GridLayout gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -210,7 +215,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 6e48adf6ca..b3919f6f29 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -35,6 +35,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -99,10 +101,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -119,7 +124,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout();
+			GridLayout gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -209,7 +214,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	protected void handleAdd() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 77a7003a47..51502b305d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -36,6 +36,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -103,10 +105,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -123,7 +128,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout();
+			GridLayout gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -213,7 +218,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	protected void handleAdd() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 5a5d7deff5..522c6e2a8d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -35,6 +35,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -99,10 +101,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -119,7 +124,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout();
+			GridLayout gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -209,7 +214,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
index d412d3df28..3b76887c74 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -37,6 +37,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -103,10 +105,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -123,7 +128,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout();
+			GridLayout gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -213,7 +218,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index ef39aec75e..0d670a8268 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -35,6 +35,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -100,10 +102,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -120,7 +125,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout();
+			GridLayout gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -210,7 +215,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index b1d755a4be..4d2b8fefd4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -36,6 +36,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -101,10 +103,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(Messages.VMenuEditor_Menus);
@@ -120,7 +125,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		gl = new GridLayout();
+		GridLayout gl = new GridLayout();
 		gl.marginLeft = 0;
 		gl.marginRight = 0;
 		gl.marginWidth = 0;
@@ -210,7 +215,9 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index b81404add4..97ccd900b9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -32,6 +32,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -85,10 +87,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -106,7 +111,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -205,7 +210,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index f7d052f0a2..137bb68eed 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -43,6 +43,8 @@
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -96,10 +98,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -115,7 +120,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -239,7 +244,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	public void addClasses(EPackage ePackage, List<FeatureClass> list) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index c79019d817..7a1c9343c6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -35,6 +35,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -99,10 +101,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -119,7 +124,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout();
+			GridLayout gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -209,7 +214,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
index 459644ec10..66a4d1be15 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
@@ -35,6 +35,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -100,10 +102,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -120,7 +125,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout();
+			GridLayout gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -206,7 +211,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	private void handleAddContext() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index 4f7dcaf82c..4ed0eb526a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -35,6 +35,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -99,10 +101,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -119,7 +124,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout();
+			GridLayout gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -209,7 +214,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index 8565227248..2dace79524 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -35,6 +35,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -99,10 +101,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -119,7 +124,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout();
+			GridLayout gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -209,7 +214,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 981869255c..c2589abc43 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -42,6 +42,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -141,10 +143,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -161,7 +166,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -260,7 +265,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 5e9b5d8750..91802d82fc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -41,6 +41,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -111,10 +113,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(Messages.VWindowEditor_Windows);
@@ -130,7 +135,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		gl = new GridLayout(2, false);
+		GridLayout gl = new GridLayout(2, false);
 		gl.marginLeft = 0;
 		gl.marginRight = 0;
 		gl.marginWidth = 0;
@@ -230,7 +235,9 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 52969346d4..f8b8c4d46a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -41,6 +41,8 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -119,10 +121,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -143,7 +148,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -249,7 +254,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index 491c87e837..be6a55de78 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -32,6 +32,8 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -96,10 +98,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(3, false);
-		gl.horizontalSpacing = 10;
-		parent.setLayout(gl);
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
 
 		{
 			Label l = new Label(parent, SWT.NONE);
@@ -117,7 +122,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			gl = new GridLayout();
+			GridLayout gl = new GridLayout();
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -153,7 +158,9 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		return parent;
+		folder.setSelection(0);
+
+		return folder;
 	}
 
 	@Override

From 145e21aaa8c2c6f8d06b5ae3a0f3dcb43ec201a8 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 18 Feb 2011 22:05:17 +0000
Subject: [PATCH 0310/1286] Bug 337560 - [ModelTooling] Split form area in tabs
 * a first split

---
 .../internal/common/component/virtual/VApplicationAddons.java  | 3 +--
 .../common/component/virtual/VApplicationCategoriesEditor.java | 3 +--
 .../internal/common/component/virtual/VBindingTableEditor.java | 3 +--
 .../ui/internal/common/component/virtual/VCommandEditor.java   | 3 +--
 .../ui/internal/common/component/virtual/VHandlerEditor.java   | 3 +--
 .../common/component/virtual/VItemParametersEditor.java        | 3 +--
 .../common/component/virtual/VMenuContributionsEditor.java     | 3 +--
 .../emf/ui/internal/common/component/virtual/VMenuEditor.java  | 3 +--
 .../common/component/virtual/VModelFragmentsEditor.java        | 3 +--
 .../internal/common/component/virtual/VModelImportsEditor.java | 3 +--
 .../ui/internal/common/component/virtual/VPartDescriptor.java  | 3 +--
 .../common/component/virtual/VRootBindingContexts.java         | 3 +--
 .../common/component/virtual/VToolBarContributionsEditor.java  | 3 +--
 .../common/component/virtual/VTrimContributionsEditor.java     | 3 +--
 .../common/component/virtual/VWindowControlEditor.java         | 3 +--
 .../ui/internal/common/component/virtual/VWindowEditor.java    | 3 +--
 .../common/component/virtual/VWindowSharedElementsEditor.java  | 3 +--
 .../internal/common/component/virtual/VWindowTrimEditor.java   | 3 +--
 18 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index aab20496df..e8c9bd44c6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -118,8 +118,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index 5677b445d4..2b1af264b3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -118,8 +118,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index b3919f6f29..01a74ca6f3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -117,8 +117,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			bindingViewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			bindingViewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			bindingViewer.getControl().setLayoutData(gd);
 			bindingViewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 51502b305d..5661672ae9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -121,8 +121,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 522c6e2a8d..ab57532a34 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -117,8 +117,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
index 3b76887c74..637f240953 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -121,8 +121,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index 0d670a8268..8870e43ac6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -118,8 +118,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 4d2b8fefd4..7204aabb1a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -118,8 +118,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		viewer = new TableViewer(parent);
 		ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.heightHint = 300;
+		GridData gd = new GridData(GridData.FILL_BOTH);
 		viewer.getControl().setLayoutData(gd);
 		viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index 97ccd900b9..257c8e305a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -105,8 +105,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer.setContentProvider(cp);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index 137bb68eed..2e289aa0b2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -114,8 +114,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index 7a1c9343c6..3175fe16df 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -117,8 +117,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
index 66a4d1be15..e792c05ebc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
@@ -118,8 +118,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index 4ed0eb526a..9b5552c295 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -117,8 +117,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index 2dace79524..4a2c6b5d7a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -117,8 +117,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index c2589abc43..1842987d61 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -160,8 +160,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 91802d82fc..9a78f13000 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -129,8 +129,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
 		viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.heightHint = 300;
+		GridData gd = new GridData(GridData.FILL_BOTH);
 		viewer.getControl().setLayoutData(gd);
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index f8b8c4d46a..64587f8ab6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -139,8 +139,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer.setContentProvider(cp);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 
 			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index be6a55de78..70fe2b3cde 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -116,8 +116,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer.setContentProvider(cp);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);

From 36a18d4f760121752f8ab0c1453fce7ba1d56347 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 18 Feb 2011 22:49:16 +0000
Subject: [PATCH 0311/1286] Bug 337560 - [ModelTooling] Split form area in tabs
 * a first split

---
 .../tools/emf/ui/internal/common/component/CommandEditor.java | 3 +--
 .../emf/ui/internal/common/component/KeyBindingEditor.java    | 3 +--
 .../ui/internal/common/component/MenuContributionEditor.java  | 3 +--
 .../e4/tools/emf/ui/internal/common/component/MenuEditor.java | 2 +-
 .../e4/tools/emf/ui/internal/common/component/PartEditor.java | 2 +-
 .../ui/internal/common/component/PartSashContainerEditor.java | 3 +--
 .../emf/ui/internal/common/component/PartStackEditor.java     | 3 +--
 .../emf/ui/internal/common/component/PerspectiveEditor.java   | 3 +--
 .../ui/internal/common/component/PerspectiveStackEditor.java  | 3 +--
 .../internal/common/component/ToolBarContributionEditor.java  | 3 +--
 .../tools/emf/ui/internal/common/component/ToolBarEditor.java | 3 +--
 .../tools/emf/ui/internal/common/component/TrimBarEditor.java | 3 +--
 .../ui/internal/common/component/TrimContributionEditor.java  | 3 +--
 .../tools/emf/ui/internal/common/component/WindowEditor.java  | 4 ++--
 14 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 55a348ff25..1dded8232f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -193,8 +193,7 @@ public void widgetSelected(SelectionEvent e) {
 			viewer.setContentProvider(cp);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 120;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 
 			IEMFEditListProperty mProp = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index ef07c0c360..c3dd441b54 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -214,8 +214,7 @@ public void widgetSelected(SelectionEvent e) {
 		viewer.setContentProvider(cp);
 		viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.heightHint = 120;
+		GridData gd = new GridData(GridData.FILL_BOTH);
 		viewer.getControl().setLayoutData(gd);
 
 		viewer.setInput(KEY_BINDING__PARAMETERS.observeDetail(getMaster()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index f83618bc58..c4b267fc23 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -181,8 +181,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer.setContentProvider(cp);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 90a8c5da6d..9ac70683c2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -223,7 +223,6 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			ControlFactory.createTranslatedTextField(parent, Messages.MenuEditor_LabelLabel, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createTextField(parent, Messages.MenuEditor_Mnemonics, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS));
 
 		{
@@ -424,6 +423,7 @@ public String getText(Object element) {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index c4eb4239d2..47e13464d6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -284,7 +284,6 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.PartEditor_BindingContexts);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -292,6 +291,7 @@ public void widgetSelected(SelectionEvent e) {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 75a8a65a6d..d8d5257590 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -241,8 +241,7 @@ public String getText(Object element) {
 			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			final TableViewer viewer = new TableViewer(parent);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 200;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index f0d82e6a2b..5dcb31a804 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -190,8 +190,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index b28457a186..e594033288 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -263,8 +263,7 @@ public void widgetSelected(SelectionEvent e) {
 			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
 			final TableViewer viewer = new TableViewer(parent);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 200;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 62544cbd6c..940a717592 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -176,8 +176,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index a1c719bbfe..7f1d781328 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -181,8 +181,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
 
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 120;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 6d6b1b52a9..f0745f574e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -207,8 +207,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
 
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 120;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 1cb7531fd6..af979b7ab9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -205,8 +205,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setLabelProvider(new ComponentLabelProvider(editor, Messages));
 			viewer.setContentProvider(new ObservableListContentProvider());
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 1b9d79be6e..f61fe50da2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -167,8 +167,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 			viewer.setContentProvider(new ObservableListContentProvider());
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index acdb2c8e6e..06c827f907 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -218,7 +218,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		ControlFactory.createTranslatedTextField(parent, Messages.WindowEditor_Label, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
 		ControlFactory.createTranslatedTextField(parent, Messages.WindowEditor_Tooltip, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool, project);
-		ControlFactory.createTranslatedTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE), resourcePool, project);
 
 		// ------------------------------------------------------------
 		{
@@ -282,7 +281,6 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createSelectedElement(parent, this, context, Messages.WindowEditor_SelectedElement);
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.WindowEditor_BindingContexts);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -290,6 +288,8 @@ public void widgetSelected(SelectionEvent e) {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
+		ControlFactory.createTranslatedTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE), resourcePool, project);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		folder.setSelection(0);

From 8092e54b5ad9dd278051aa789c827d45203483c2 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 18 Feb 2011 22:56:46 +0000
Subject: [PATCH 0312/1286] Bug 337579 - [UI] Update model before API freeze *
 added new attribute to tooling

---
 .../src/org/eclipse/e4/tools/emf/ui/internal/Messages.java    | 1 +
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.properties  | 1 +
 .../emf/ui/internal/common/component/PlaceholderEditor.java   | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 2ffd3964a4..89b4f1687d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -225,6 +225,7 @@ public class Messages {
 	public String PlaceholderEditor_Label;
 	public String PlaceholderEditor_Descriptor;
 	public String PlaceholderEditor_Reference;
+	public String PlaceholderEditor_Closeable;
 
 	public String ToolBarEditor_Label;
 	public String ToolBarEditor_Description;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index f200a6aa57..bfb745adf4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -225,6 +225,7 @@ PerspectiveStackEditor_AddPerspective=Add Perspective
 PlaceholderEditor_Label=Placeholder
 PlaceholderEditor_Descriptor=Placeholder Bla Bla Bla Bla
 PlaceholderEditor_Reference=Reference
+PlaceholderEditor_Closeable=Closeable
 
 ToolBarEditor_Label=Toolbar
 ToolBarEditor_Description=Toolbar bla bla bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 1be26f8753..53dfa3509e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -215,8 +215,12 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 		}
+
+		ControlFactory.createCheckBox(parent, Messages.PlaceholderEditor_Closeable, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), AdvancedPackageImpl.Literals.PLACEHOLDER__CLOSEABLE));
+
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
 

From 40254f0c41b9d56eec8e9ffc9cf9680b9fab809a Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 18 Feb 2011 23:27:34 +0000
Subject: [PATCH 0313/1286] Bug 337560 - [ModelTooling] Split form area in tabs
 * fixed context menus

---
 .../e4/tools/emf/ui/internal/Messages.java    |   3 +
 .../tools/emf/ui/internal/Messages.properties | 113 +++++++++---------
 .../emf/ui/internal/common/ModelEditor.java   |  33 ++++-
 .../internal/common/component/MenuEditor.java |  17 +++
 .../common/component/MenuItemEditor.java      |  30 +++++
 5 files changed, 135 insertions(+), 61 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 89b4f1687d..14b4a2c931 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -22,6 +22,7 @@ public class Messages {
 	public String ModelTooling_Common_FindEllipsis;
 	public String ModelTooling_Common_TabDefault;
 	public String ModelTooling_Common_TabSupplementary;
+	public String ModelEditor_AddChild;
 
 	public String ModelTooling_UIElement_ToBeRendered;
 	public String ModelTooling_UIElement_Visible;
@@ -134,6 +135,7 @@ public class Messages {
 	public String MenuEditor_AddMenu;
 	public String MenuEditor_AddDirectMenuItem;
 	public String MenuEditor_AddSeparator;
+	public String MenuEditor_AddCoreExpression;
 
 	public String MenuItemEditor_Type;
 	public String MenuItemEditor_Label;
@@ -144,6 +146,7 @@ public class Messages {
 	public String MenuItemEditor_Selected;
 	public String MenuItemEditor_Mnemonics;
 	public String MenuItemEditor_NoExpression;
+	public String MenuItemEditor_AddCoreExpression;
 
 	public String MenuSeparatorEditor_Label;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index bfb745adf4..f21c4840af 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -18,6 +18,7 @@ ModelTooling_Common_RefId=Reference-Id
 ModelTooling_Common_FindEllipsis=Find ...
 ModelTooling_Common_TabDefault=Default
 ModelTooling_Common_TabSupplementary=Supplementary
+ModelEditor_AddChild=Add child
 
 ModelTooling_UIElement_ToBeRendered=To Be Rendered
 ModelTooling_UIElement_Visible=Visible
@@ -54,7 +55,7 @@ BindingTableEditor_ContextId=Context Id
 BindingTableEditor_Keybindings=Keybindings
 BindingTableEditor_KeySequence=KeySequence
 BindingTableEditor_Command=Command
-BindingTableEditor_AddKeyBinding=Add Keybinding
+BindingTableEditor_AddKeyBinding=Keybinding
 
 CommandEditor_Label=Command
 CommandEditor_Description=Command bla bla bla
@@ -68,7 +69,7 @@ CommandEditor_ParameterOptional_Yes=yes
 CommandEditor_ParameterOptional_No=no
 CommandEditor_ParameterId=Id
 CommandEditor_Category=Category
-CommandEditor_AddCommandParameter=Add Command Parameter
+CommandEditor_AddCommandParameter=Command Parameter
 
 DirectMenuItemEditor_Label=DirectMenuItem
 DirectMenuItemEditor_Description=DirectMenuItem bla bla bla
@@ -111,7 +112,7 @@ KeyBindingEditor_Command=Command
 KeyBindingEditor_Parameters=Parameters
 KeyBindingEditor_SequenceNotComplete=Keysequence is not complete
 KeyBindingEditor_SequenceEmpty=Keysequence must not be empty!
-KeyBindingEditor_AddParameter=Add Parameter
+KeyBindingEditor_AddParameter=Parameter
 
 MenuEditor_Label=Menu
 MenuEditor_Description=Menu bla bla bla
@@ -128,10 +129,11 @@ MenuEditor_IconURI=Icon URI
 MenuEditor_MainMenu=Main Menu
 MenuEditor_Children=Children
 MenuEditor_Mnemonics=Mnemonics
-MenuEditor_AddHandledMenuItem=Add HandledMenuItem
-MenuEditor_AddMenu=Add Menu
-MenuEditor_AddDirectMenuItem=Add DirectMenuItem
-MenuEditor_AddSeparator=Add Separator
+MenuEditor_AddHandledMenuItem=HandledMenuItem
+MenuEditor_AddMenu=Menu
+MenuEditor_AddDirectMenuItem=DirectMenuItem
+MenuEditor_AddSeparator=Separator
+MenuEditor_AddCoreExpression=VisibleWhen Core Expression
 
 
 MenuItemEditor_Type=Type
@@ -142,6 +144,7 @@ MenuItemEditor_Enabled=Enabled
 MenuItemEditor_Selected=Selected
 MenuItemEditor_Mnemonics=Mnemonics
 MenuItemEditor_NoExpression=<None>
+MenuItemEditor_AddCoreExpression=VisibleWhen Core Expression
 
 MenuSeparatorEditor_Label=Separator
 
@@ -184,21 +187,21 @@ PartSashContainerEditor_Horizontal=Horizontal
 PartSashContainerEditor_SelectedElement=Selected Element
 PartSashContainerEditor_Controls=Controls
 PartSashContainerEditor_ContainerData=Container Data
-PartSashContainerEditor_AddPartSashContainer=Add PartSashContainer
-PartSashContainerEditor_AddPartStack=Add PartStack
-PartSashContainerEditor_AddPart=Add Part
-PartSashContainerEditor_AddInputPart=Add Input Part
-PartSashContainerEditor_AddArea=Add Area
-PartSashContainerEditor_AddPlaceholder=Add Placeholder
+PartSashContainerEditor_AddPartSashContainer=PartSashContainer
+PartSashContainerEditor_AddPartStack=PartStack
+PartSashContainerEditor_AddPart=Part
+PartSashContainerEditor_AddInputPart=Input Part
+PartSashContainerEditor_AddArea=Area
+PartSashContainerEditor_AddPlaceholder=Placeholder
 
 PartStackEditor_Label=Part Stack
 PartStackEditor_Description=Stack bla bla bla
 PartStackEditor_SelectedElement=Selected Element
 PartStackEditor_Parts=Parts
 PartStackEditor_ContainerData=Container Data
-PartStackEditor_AddPart=Add Part
-PartStackEditor_AddInputPart=Add Input Part
-PartStackEditor_AddPlaceholder=Add Placeholder
+PartStackEditor_AddPart=Part
+PartStackEditor_AddInputPart=Input Part
+PartStackEditor_AddPlaceholder=Placeholder
 
 PerspectiveEditor_Label=Perspective
 PerspectiveEditor_Description=Perspective Bla Bla Bla
@@ -208,19 +211,19 @@ PerspectiveEditor_Label=Label
 PerspectiveEditor_Tooltip=Tooltip
 PerspectiveEditor_IconURI=Icon URI
 PerspectiveEditor_Controls=Controls
-PerspectiveEditor_AddPartSashContainer=Add PartSashContainer
-PerspectiveEditor_AddPartStack=Add PartStack
-PerspectiveEditor_AddPart=Add Part
-PerspectiveEditor_AddInputPart=Add InputPart
-PerspectiveEditor_AddArea=Add Area
-PerspectiveEditor_AddPlaceholder=Add Placeholder
+PerspectiveEditor_AddPartSashContainer=PartSashContainer
+PerspectiveEditor_AddPartStack=PartStack
+PerspectiveEditor_AddPart=Part
+PerspectiveEditor_AddInputPart=InputPart
+PerspectiveEditor_AddArea=Area
+PerspectiveEditor_AddPlaceholder=Placeholder
 
 
 PerspectiveStackEditor_Label=Perspective Stack
 PerspectiveStackEditor_Description=Perspective Stack Bla Bla Bla
 PerspectiveStackEditor_SelectedElement=Selected Element
 PerspectiveStackEditor_Perspectives=Perspectives
-PerspectiveStackEditor_AddPerspective=Add Perspective
+PerspectiveStackEditor_AddPerspective=Perspective
 
 PlaceholderEditor_Label=Placeholder
 PlaceholderEditor_Descriptor=Placeholder Bla Bla Bla Bla
@@ -236,10 +239,10 @@ ToolBarEditor_HandledToolItem=Handled ToolItem
 ToolBarEditor_DirectToolItem=Direct ToolItem
 ToolBarEditor_ToolControl=Tool Control
 ToolBarEditor_Separator=Separator
-ToolBarEditor_AddHandledToolItem=Add Handled ToolItem
-ToolBarEditor_AddDirectToolItem=Add Direct ToolItem
-ToolBarEditor_AddToolControl=Add Toolcontrol
-ToolBarEditor_AddToolBarSeparator=Add Sepatator
+ToolBarEditor_AddHandledToolItem=Handled ToolItem
+ToolBarEditor_AddDirectToolItem=Direct ToolItem
+ToolBarEditor_AddToolControl=Toolcontrol
+ToolBarEditor_AddToolBarSeparator=Sepatator
 
 ToolBarSeparatorEditor_Label=Separator
 
@@ -253,7 +256,7 @@ VBindingTableEditor_Contexts=Contexts
 VBindingTableEditor_Name=Name
 VBindingTableEditor_LabelDescription=Description
 VBindingTableEditor_BindingTables=Binding Tables
-VBindingTableEditor_AddBindingTable=Add Binding Table
+VBindingTableEditor_AddBindingTable=Binding Table
 
 AddonsEditor_ClassURI=Class URI
 AddonsEditor_TreeLabel=Addon
@@ -311,7 +314,7 @@ BindingContextEditor_TreeLabelDescription=Binding Context Bla Bla Bla
 BindingContextEditor_Name=Name
 BindingContextEditor_Description=Description
 BindingContextEditor_Subcontexts=Subcontexts
-BindingContextEditor_AddContext=Add Binding Context
+BindingContextEditor_AddContext=Binding Context
 
 CommandParameterEditor_TreeLabel=Command Parameter
 CommandParameterEditor_TreeLabelDescritpion=Command Parameter Bla Bla Bla
@@ -349,8 +352,8 @@ TrimBarEditor_TreeLabel=Window Trim
 TrimBarEditor_TreeLabelDescription=Window Trim bla bla bla
 TrimBarEditor_Side=Side
 TrimBarEditor_Controls=Controls
-TrimBarEditor_AddToolBar=Add Toolbar
-TrimBarEditor_AddToolControl=Add Toolcontrol
+TrimBarEditor_AddToolBar=Toolbar
+TrimBarEditor_AddToolControl=Toolcontrol
 
 
 TrimContributionEditor_TreeLabel=Trim Contribution
@@ -362,7 +365,7 @@ TrimContributionEditor_Controls=Controls
 TrimmedWindowEditor_TrimBars=TrimBars
 TrimmedWindowEditor_TreeLabel=Trimmed Window
 
-WindowEditor_AddMainMenu=Add Main Menu
+WindowEditor_AddMainMenu=Main Menu
 WindowEditor_TreeLabel=Window
 WindowEditor_TreeLabelDescription=Window bla bla bla
 WindowEditor_Bounds=Bounds(x,y,w,h)
@@ -377,7 +380,7 @@ WindowEditor_Windows=Windows
 WindowEditor_Controls=Controls
 WindowEditor_SharedElements=Shared Elements
 
-VApplicationAddons_AddAddon=Add Addon
+VApplicationAddons_AddAddon=Addon
 VApplicationAddons_TreeLabel=Addons
 VApplicationAddons_TreeLabelDescription=Addons bla bla bla bla
 VApplicationAddons_Commands=Commands
@@ -385,27 +388,27 @@ VApplicationAddons_Commands=Commands
 VApplicationCategoriesEditor_TreeLabel=Command Categories
 VApplicationCategoriesEditor_TreeLabelDescription=Command Categories bla bla bla bla
 VApplicationCategoriesEditor_Categories=Categories
-VApplicationCategoriesEditor_AddCategory=Add Category
+VApplicationCategoriesEditor_AddCategory=Category
 
 VCommandEditor_TreeLabel=Commands
 VCommandEditor_TreeLabelDescription=Commands Bla Bla Bla Bla Bla
 VCommandEditor_Commands=Commands
-VCommandEditor_AddCommand=Add Command
+VCommandEditor_AddCommand=Command
 
 VHandlerEditor_TreeLabel=Handlers
 VHandlerEditor_TreeLabelDescription=Handlers Bla Bla Bla Bla Bla
 VHandlerEditor_Handlers=Handlers
-VHandlerEditor_AddHandler=Add Handler
+VHandlerEditor_AddHandler=Handler
 
 VMenuContributionsEditor_TreeLabel=Menu Contributions
 VMenuContributionsEditor_TreeLabelDescription=Menu Contributions Bla Bla Bla Bla Bla
 VMenuContributionsEditor_MenuContributions=Menu Contributions
-VMenuContributionsEditor_AddMenuContribution=Add Menu Contribution
+VMenuContributionsEditor_AddMenuContribution=Menu Contribution
 
 VMenuEditor_TreeLabel=Menus
 VMenuEditor_TreeLabelDescription=Menus Bla Bla Bla Bla Bla
 VMenuEditor_Menus=Menus
-VMenuEditor_AddMenuContribution=Add Menu
+VMenuEditor_AddMenuContribution=Menu
 
 VModelFragmentsEditor_TreeLabel=Fragments
 VModelFragmentsEditor_TreeLabelDescription=Fragments Bla Bla Bla Bla Bla
@@ -418,45 +421,45 @@ VModelImportsEditor_Imports=Imports
 VPartDescriptor_TreeLabel=Part Descriptors
 VPartDescriptor_TreeLabelDescription=Part Descriptors Bla Bla Bla Bla Bla
 VPartDescriptor_Descriptors=Descriptors
-VPartDescriptor_AddPartDescriptor=Add Descriptor
+VPartDescriptor_AddPartDescriptor=Descriptor
 
 VToolBarContributionsEditor_TreeLabel=ToolBar Contributions
 VToolBarContributionsEditor_TreeLabelDescription=ToolBar Contributions Bla Bla Bla Bla Bla
 VToolBarContributionsEditor_Contributions=ToolBar Contributions
-VToolBarContributionsEditor_AddToolBarContribution=Add ToolBar Contribution
+VToolBarContributionsEditor_AddToolBarContribution=ToolBar Contribution
 
 VTrimContributionsEditor_TreeLabel=Trim Contributions
 VTrimContributionsEditor_TreeLabelDescription=Trim Contributions Bla Bla Bla Bla Bla
 VTrimContributionsEditor_Contributions=Trim Contributions
-VTrimContributionsEditor_AddTrimContribution=Add Trim Contribution
+VTrimContributionsEditor_AddTrimContribution=Trim Contribution
 
 VWindowControlEditor_TreeLabel=Controls
 VWindowControlEditor_TreeLabelDescription=Controls Bla Bla Bla Bla Bla
 VWindowControlEditor_Controls=Controls
-VWindowControlEditor_AddPerspectiveStack=Add Perspective Stack
-VWindowControlEditor_AddPartSashContainer=Add Part Sash Container
-VWindowControlEditor_AddPartStack=Add Part Stack
-VWindowControlEditor_AddPart=Add Part
-VWindowControlEditor_AddInputPart=Add Input Part
-VWindowControlEditor_AddArea=Add Area
+VWindowControlEditor_AddPerspectiveStack=Perspective Stack
+VWindowControlEditor_AddPartSashContainer=Part Sash Container
+VWindowControlEditor_AddPartStack=Part Stack
+VWindowControlEditor_AddPart=Part
+VWindowControlEditor_AddInputPart=Input Part
+VWindowControlEditor_AddArea=Area
 
 VWindowEditor_TreeLabel=Windows
 VWindowEditor_TreeLabelDescription=Windows Bla Bla Bla Bla Bla
 VWindowEditor_Windows=Windows
-VWindowEditor_AddTrimmedWindow=Add Trimmed Window
-VWindowEditor_AddWindow=Add Window
+VWindowEditor_AddTrimmedWindow=Trimmed Window
+VWindowEditor_AddWindow=Window
 
 VWindowSharedElementsEditor_TreeLabel=Shared Elements
 VWindowSharedElementsEditor_TreeLabelDescription=Shared Elements Bla Bla Bla Bla
 VWindowSharedElementsEditor_Controls=Controls
-VWindowSharedElementsEditor_AddPartSashContainer=Add Part Sash Container
-VWindowSharedElementsEditor_AddPart=Add Part
-VWindowSharedElementsEditor_AddInputPart=Add Input Part
+VWindowSharedElementsEditor_AddPartSashContainer=Part Sash Container
+VWindowSharedElementsEditor_AddPart=Part
+VWindowSharedElementsEditor_AddInputPart=Input Part
 
 VWindowTrimEditor_TreeLabel=Window Trims
 VWindowTrimEditor_TreeLabelDescription=Window Trims Bla Bla Bla Bla Bla
 VWindowTrimEditor_Controls=Controls
-VWindowTrimEditor_AddWindowTrim=Add Window Trim
+VWindowTrimEditor_AddWindowTrim=Window Trim
 
 AbstractIconDialog_IconName=IconName
 
@@ -545,7 +548,7 @@ ImageTooltip_FileSize=File-Size
 VItemParametersEditor_TreeLabel=Parameters
 VItemParametersEditor_TreeLabelDescription=Parameters Bla Bla Bla
 VItemParametersEditor_Parameters=Parameters
-VItemParametersEditor_AddParameter=Add Parameter
+VItemParametersEditor_AddParameter=Parameter
 
 CoreExpressionEditor_TreeLabel=Core Expression
 CoreExpressionEditor_TreeLabelDescription=Core Expression Bla Bla Bla
@@ -557,7 +560,7 @@ ExpressionIdDialog_DialogMessage=Find the expression id defined through the 'org
 ExpressionIdDialog_Id=Id
 CommandToStringConverter_None=<None>
 
-VRootBindingContexts_AddContext=Add Binding Context
+VRootBindingContexts_AddContext=Binding Context
 VRootBindingContexts_TreeLabel=Binding Context
 VRootBindingContexts_TreeLabelDescription=Binding Context Bla Bla Bla
 VRootBindingContexts_Contexts=Binding Contexts
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 1a6899606d..ee0d897abe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -159,6 +159,7 @@
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.databinding.viewers.ObservableListTreeContentProvider;
 import org.eclipse.jface.databinding.viewers.TreeStructureAdvisor;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -498,10 +499,20 @@ public void run() {
 
 			public void menuAboutToShow(IMenuManager manager) {
 				IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+				boolean addSeparator = false;
 				if (!s.isEmpty()) {
 					List<Action> actions;
 					if (s.getFirstElement() instanceof VirtualEntry<?>) {
 						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId()).getActions(s.getFirstElement());
+
+						if (actions.size() > 0) {
+							MenuManager addMenu = new MenuManager(messages.ModelEditor_AddChild);
+							for (Action a : actions) {
+								addSeparator = true;
+								addMenu.add(a);
+							}
+							manager.add(addMenu);
+						}
 					} else {
 						final EObject o = (EObject) s.getFirstElement();
 						AbstractComponentEditor editor = getEditor(o.eClass());
@@ -511,8 +522,18 @@ public void menuAboutToShow(IMenuManager manager) {
 							actions = new ArrayList<Action>();
 						}
 
+						if (actions.size() > 0) {
+							MenuManager addMenu = new MenuManager(messages.ModelEditor_AddChild);
+							for (Action a : actions) {
+								addSeparator = true;
+								addMenu.add(a);
+							}
+							manager.add(addMenu);
+						}
+
 						if (o.eContainer() != null) {
-							actions.add(new Action(messages.ModelEditor_Delete, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
+							addSeparator = true;
+							manager.add(new Action(messages.ModelEditor_Delete, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
 								public void run() {
 									if (o.eContainingFeature().isMany()) {
 										Command cmd = RemoveCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), o.eContainer(), o.eContainingFeature(), o);
@@ -528,15 +549,15 @@ public void run() {
 								}
 							});
 						}
-
-					}
-
-					for (Action a : actions) {
-						manager.add(a);
 					}
 				}
 
 				if (project != null) {
+
+					if (addSeparator) {
+						manager.add(new Separator());
+					}
+
 					Action nlsAction = new Action(messages.ModelEditor_ExternalizeStrings) {
 						public void run() {
 							ExternalizeStringHandler h = ContextInjectionFactory.make(ExternalizeStringHandler.class, context);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 9ac70683c2..3e30b5b6c0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -41,6 +41,7 @@
 import org.eclipse.e4.ui.model.application.ui.MExpression;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.e4.ui.model.application.ui.MUiFactory;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
@@ -59,6 +60,7 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -99,6 +101,8 @@ public class MenuEditor extends AbstractComponentEditor {
 	@Optional
 	private IProject project;
 
+	private Action addExpression;
+
 	private static class Struct {
 		private final String label;
 		private final EClass eClass;
@@ -142,6 +146,16 @@ public void run() {
 				handleAdd(MenuPackageImpl.Literals.MENU_SEPARATOR, true);
 			}
 		});
+		addExpression = new Action(Messages.MenuEditor_AddCoreExpression, createImageDescriptor(ResourceProvider.IMG_CoreExpression)) {
+			@Override
+			public void run() {
+				MUIElement e = (MUIElement) getMaster().getValue();
+				Command cmd = SetCommand.create(getEditingDomain(), e, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN, MUiFactory.INSTANCE.createCoreExpression());
+				if (cmd.canExecute()) {
+					getEditingDomain().getCommandStack().execute(cmd);
+				}
+			}
+		};
 	}
 
 	@Override
@@ -523,6 +537,9 @@ protected void handleAdd(EClass eClass, boolean separator) {
 	public List<Action> getActions(Object element) {
 		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
+		if (((MUIElement) getMaster().getValue()).getVisibleWhen() == null) {
+			l.add(addExpression);
+		}
 		return l;
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index b6b9d8fd28..4a476842cd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -12,6 +12,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.conversion.Converter;
@@ -31,10 +32,12 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.e4.ui.model.application.ui.MUiFactory;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -42,6 +45,8 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
@@ -73,10 +78,26 @@ public abstract class MenuItemEditor extends AbstractComponentEditor {
 	@Optional
 	protected IProject project;
 
+	private Action addExpression;
+
 	public MenuItemEditor() {
 		super();
 	}
 
+	@PostConstruct
+	void init() {
+		addExpression = new Action(Messages.MenuItemEditor_AddCoreExpression, createImageDescriptor(ResourceProvider.IMG_CoreExpression)) {
+			@Override
+			public void run() {
+				MUIElement e = (MUIElement) getMaster().getValue();
+				Command cmd = SetCommand.create(getEditingDomain(), e, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN, MUiFactory.INSTANCE.createCoreExpression());
+				if (cmd.canExecute()) {
+					getEditingDomain().getCommandStack().execute(cmd);
+				}
+			}
+		};
+	}
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
@@ -308,6 +329,15 @@ public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		if (((MUIElement) getMaster().getValue()).getVisibleWhen() == null) {
+			l.add(addExpression);
+		}
+		return l;
+	}
+
 	static class EObject2EClass extends Converter {
 		Messages Messages;
 

From 8b652f64aad08b9f87286b54c62d86850adb6ac3 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 20 Feb 2011 15:04:19 +0000
Subject: [PATCH 0314/1286] Bug 337622 - [ModelTooling] Show runtime
 Informations MContribution

---
 .../OSGI-INF/resources.properties             |   4 +
 .../icons/full/obj16/class_default_obj.gif    | Bin 0 -> 604 bytes
 .../icons/full/obj16/field_default_obj.gif    | Bin 0 -> 118 bytes
 .../icons/full/obj16/field_private_obj.gif    | Bin 0 -> 87 bytes
 .../icons/full/obj16/field_protected_obj.gif  | Bin 0 -> 119 bytes
 .../e4/tools/emf/ui/internal/Messages.java    |   1 +
 .../tools/emf/ui/internal/Messages.properties |   1 +
 .../emf/ui/internal/ResourceProvider.java     |   4 +
 .../common/component/AddonsEditor.java        |  20 +++
 .../component/DirectMenuItemEditor.java       |  29 ++++
 .../component/DirectToolItemEditor.java       |  28 ++++
 .../common/component/HandlerEditor.java       |  18 +++
 .../common/component/MenuItemEditor.java      |   4 +-
 .../internal/common/component/PartEditor.java |  20 +++
 .../common/component/ToolControlEditor.java   |  18 ++-
 .../common/component/ToolItemEditor.java      |   4 +-
 .../common/objectdata/AccessLevel.java        |  11 ++
 .../common/objectdata/JavaAttribute.java      | 106 +++++++++++++
 .../common/objectdata/JavaMethod.java         |   5 +
 .../common/objectdata/JavaObject.java         |  52 ++++++
 .../common/objectdata/ObjectViewer.java       | 149 ++++++++++++++++++
 21 files changed, 469 insertions(+), 5 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_default_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_default_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_private_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_protected_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/AccessLevel.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaMethod.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
index 300c6bab2b..b4e477f3df 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
@@ -74,9 +74,13 @@ IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.WindowTrim=/icons/full/modelel
 IMG_org.eclipse.e4.tools.emf.ui.obj16.arrow_down=/icons/full/obj16/arrow_down.png
 IMG_org.eclipse.e4.tools.emf.ui.obj16.arrow_up=/icons/full/obj16/arrow_up.png
 IMG_org.eclipse.e4.tools.emf.ui.obj16.class_obj=/icons/full/obj16/class_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.obj16.class_default_obj=/icons/full/obj16/class_default_obj.gif
 IMG_org.eclipse.e4.tools.emf.ui.obj16.cross=/icons/full/obj16/cross.png
 IMG_org.eclipse.e4.tools.emf.ui.obj16.EPackage=/icons/full/obj16/EPackage.gif
 IMG_org.eclipse.e4.tools.emf.ui.obj16.field_public_obj=/icons/full/obj16/field_public_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.obj16.field_default_obj=/icons/full/obj16/field_default_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.obj16.field_private_obj=/icons/full/obj16/field_private_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.obj16.field_protected_obj=/icons/full/obj16/field_protected_obj.gif
 IMG_org.eclipse.e4.tools.emf.ui.obj16.headermenu=/icons/full/obj16/headermenu.png
 IMG_org.eclipse.e4.tools.emf.ui.obj16.table_add=/icons/full/obj16/table_add.png
 IMG_org.eclipse.e4.tools.emf.ui.obj16.table_delete=/icons/full/obj16/table_delete.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_default_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_default_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4244a7f39d32695bf6e435665a8775ca8458ff19
GIT binary patch
literal 604
zcmZ?wbhEHb6krfwc*ejG(zwmBe0@;cuHd#^aw&_I)0bG5Z?LS`AP_T0C~mH3{5-LQ
z`I5;CWKtH%q%M+4StygbP%d?`QpQrX?B(h?%iWtchc7J5UDvYi(r)7>U$_3asM!T&
z>pJQ-PiWja>BNHzXCGa;{_?I$nVnvZn{lJJWm`b(yu#!~<;%`&y7lV5ZjFmxt*d^m
zn?W5=*3)}Zg4cw&@^$Ssn|hkIPS|_v=#7_mjT+p|TD+{={p~x0`u5J6eQcRshreA%
zfL(ilTVHt4w506iRsH*B9lm?=(fg-ivr@ulrtG<KC}etK+?=diukJqk_~OgYuR+t|
zK7Rj{upqN$Q%mK##?~D@kuwuBmgFZcNKcrTcJ;;edB+ysd385^QC9A<g7S404VxRP
zH&#`yD{tS?+PJy);rj;@_w{VPv|-Q9o%?R>o_~DSg5$Gy-`IZW&i-Tf4sW=y`ac*j
zkPZ}ovM@3*<T2=gw1VP<fqiE~UQ?cen!c)mnnH6=o}6k(%%l)Wx!yjr#GI_`tc+Nt
zY0V0%@oBj$R;0#Bb~j0frmx6MPRUJ52vu*E@{P!i3_BDZ6%{PiEUD|1>#VJ%rLAXf
zqq4`sFxSP>&d$hK!&;_U-PY4D*WJ-7*GEKHzS&gCBhYK5H!BmfP>-y#{XB<>Oi#HQ
znc0*~UL9ca5L7nNvMFF#$k^<rsTXlTz{#<ppHVDEY6?Tc$;q5<yBrT}QuUsy#mvZH
F4FHXg_A&qf

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_default_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_default_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6929d3d13f20e1c8146f7eb9dbdb9c492f53d367
GIT binary patch
literal 118
zcmZ?wbhEHb6krfw*v!D-SiU~EZI?jI9LeMbYT3(m3RZYDZ{Be7{(mrFzyOLrSr{1@
zI2m+6G9WV;Sd<M;damAU@%pUk%T7UwJAn#EH}ZN|XQ(wWWUAfS!SJr;eXt;dH2|m8
BC1(Ht

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_private_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_private_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1fe064e6ca688938174065a6583f2b587c7265e3
GIT binary patch
literal 87
zcmZ?wbhEHb6krfwSj50^!^!_~dBgLL3ID->0R|L*vM@3*urTO=1VCyTm}NY6-T7y5
e%JVgg#C-#%9nL>I8Pt0Mmqq5h-si)_U=0A%@f=A2

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_protected_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_protected_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3377b1ebe7e36d3956926b027d48bb8765d768e2
GIT binary patch
literal 119
zcmZ?wbhEHb6krfw*v!DNZ;r<98S1-ds;_I8-`uOTsaI)voy@96*;P$)>)I9m-JACB
ze9nI`U;qQfpDc_F47?0FARfpJ1{ReKCp}m1wRnBj^abyNn&<@vT?<6HAM3SD+j9DV
PEH{%>!u$U-IT)+~%PKA;

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 14b4a2c931..05b6cb0557 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -23,6 +23,7 @@ public class Messages {
 	public String ModelTooling_Common_TabDefault;
 	public String ModelTooling_Common_TabSupplementary;
 	public String ModelEditor_AddChild;
+	public String ModelTooling_Common_TabRuntime;
 
 	public String ModelTooling_UIElement_ToBeRendered;
 	public String ModelTooling_UIElement_Visible;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index f21c4840af..e19d8ed591 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -19,6 +19,7 @@ ModelTooling_Common_FindEllipsis=Find ...
 ModelTooling_Common_TabDefault=Default
 ModelTooling_Common_TabSupplementary=Supplementary
 ModelEditor_AddChild=Add child
+ModelTooling_Common_TabRuntime=Runtime
 
 ModelTooling_UIElement_ToBeRendered=To Be Rendered
 ModelTooling_UIElement_Visible=Visible
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
index 44381e6669..18a8568c5c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
@@ -79,9 +79,13 @@ public class ResourceProvider extends BasicResourceProvider {
 	public static final String IMG_Obj16_arrow_down = "IMG_org.eclipse.e4.tools.emf.ui.obj16.arrow_down"; //$NON-NLS-1$
 	public static final String IMG_Obj16_arrow_up = "IMG_org.eclipse.e4.tools.emf.ui.obj16.arrow_up"; //$NON-NLS-1$
 	public static final String IMG_Obj16_class_obj = "IMG_org.eclipse.e4.tools.emf.ui.obj16.class_obj"; //$NON-NLS-1$
+	public static final String IMG_Obj16_class_default_obj = "IMG_org.eclipse.e4.tools.emf.ui.obj16.class_default_obj"; //$NON-NLS-1$
 	public static final String IMG_Obj16_cross = "IMG_org.eclipse.e4.tools.emf.ui.obj16.cross"; //$NON-NLS-1$
 	public static final String IMG_Obj16_EPackage = "IMG_org.eclipse.e4.tools.emf.ui.obj16.EPackage"; //$NON-NLS-1$
 	public static final String IMG_Obj16_field_public_obj = "IMG_org.eclipse.e4.tools.emf.ui.obj16.field_public_obj"; //$NON-NLS-1$
+	public static final String IMG_Obj16_field_default_obj = "IMG_org.eclipse.e4.tools.emf.ui.obj16.field_default_obj"; //$NON-NLS-1$
+	public static final String IMG_Obj16_field_private_obj = "IMG_org.eclipse.e4.tools.emf.ui.obj16.field_private_obj"; //$NON-NLS-1$
+	public static final String IMG_Obj16_field_protected_obj = "IMG_org.eclipse.e4.tools.emf.ui.obj16.field_protected_obj"; //$NON-NLS-1$
 	public static final String IMG_Obj16_headermenu = "IMG_org.eclipse.e4.tools.emf.ui.obj16.headermenu"; //$NON-NLS-1$
 	public static final String IMG_Obj16_table_add = "IMG_org.eclipse.e4.tools.emf.ui.obj16.table_add"; //$NON-NLS-1$
 	public static final String IMG_Obj16_table_delete = "IMG_org.eclipse.e4.tools.emf.ui.obj16.table_delete"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 1f0a3784a8..a5a75ac677 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -25,6 +25,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -32,6 +33,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -39,6 +41,7 @@
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -188,11 +191,28 @@ public void widgetSelected(SelectionEvent e) {
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.AddonsEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
+		if (project == null) {
+			createInstanceInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createInstanceInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabRuntime);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		ObjectViewer objectViewer = new ObjectViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		return null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 886fa2eaba..c730065cac 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -24,6 +24,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -36,11 +37,15 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -70,6 +75,30 @@ public Image getImage(Object element, Display display) {
 		return null;
 	}
 
+	@Override
+	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+		if (!isImport) {
+			CTabFolder folder = super.createForm(parent, context, master, isImport);
+			createInstanceInspection(folder);
+			return folder;
+		} else {
+			return super.createForm(parent, context, master, isImport);
+		}
+	}
+
+	private void createInstanceInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabRuntime);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		ObjectViewer objectViewer = new ObjectViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+
+	}
+
 	@Override
 	public String getLabel(Object element) {
 		return Messages.DirectMenuItemEditor_Label;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index d1cd523839..43af670ed2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -24,6 +24,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -36,11 +37,15 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -110,6 +115,29 @@ public void widgetSelected(SelectionEvent e) {
 		});
 	}
 
+	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+		if (!isImport) {
+			CTabFolder folder = super.createForm(parent, context, master, isImport);
+			createInstanceInspection(folder);
+			return folder;
+		} else {
+			return super.createForm(parent, context, master, isImport);
+		}
+	}
+
+	private void createInstanceInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabRuntime);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		ObjectViewer objectViewer = new ObjectViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+
+	}
+
 	@Override
 	public String getLabel(Object element) {
 		return Messages.DirectToolItemEditor_Label;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 6aea831483..8ae4bc5971 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -28,6 +28,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandlerCommandSelectionDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
@@ -38,6 +39,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -45,6 +47,7 @@
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -212,11 +215,26 @@ public void widgetSelected(SelectionEvent e) {
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
+		createInstanceInspection(folder);
+
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createInstanceInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabRuntime);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		ObjectViewer objectViewer = new ObjectViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		return null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 4a476842cd..3561de7cc4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -144,7 +144,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -163,7 +163,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 47e13464d6..cf7dfbff41 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -34,6 +34,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -54,6 +55,7 @@
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -61,6 +63,7 @@
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -294,11 +297,28 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
+		if (project == null) {
+			createInstanceInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createInstanceInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabRuntime);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		ObjectViewer objectViewer = new ObjectViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+
+	}
+
 	private void addToolBar() {
 		MToolBar menu = MMenuFactory.INSTANCE.createToolBar();
 		setElementId(menu);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 19bf8146b1..3b95184d43 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -21,6 +21,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -31,6 +32,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -38,6 +40,7 @@
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -181,12 +184,25 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-
+		createInstanceInspection(folder);
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createInstanceInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabRuntime);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		ObjectViewer objectViewer = new ObjectViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		// TODO Auto-generated method stub
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 2f2313ed40..8f100cf0e0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -106,7 +106,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -123,7 +123,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/AccessLevel.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/AccessLevel.java
new file mode 100644
index 0000000000..fc5d6dc896
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/AccessLevel.java
@@ -0,0 +1,11 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.objectdata;
+
+public enum AccessLevel {
+	PUBLIC(3), PROTECTED(2), DEFAULT(1), PRIVATE(0);
+
+	public final int value;
+
+	private AccessLevel(int value) {
+		this.value = value;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
new file mode 100644
index 0000000000..1ba218f151
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
@@ -0,0 +1,106 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.objectdata;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.Collections;
+import java.util.List;
+import javax.inject.Inject;
+
+public class JavaAttribute {
+	private JavaObject object;
+	private JavaAttribute attribute;
+
+	private Field field;
+
+	public JavaAttribute(JavaObject object, Field field) {
+		this.object = object;
+		this.field = field;
+		this.field.setAccessible(true);
+	}
+
+	public JavaAttribute(JavaObject object, JavaAttribute attribute, Field field) {
+		this.object = object;
+		this.field = field;
+		this.field.setAccessible(true);
+		this.attribute = attribute;
+	}
+
+	public boolean isInjected() {
+		return this.field.getAnnotation(Inject.class) != null;
+	}
+
+	public boolean isStatic() {
+		return (this.field.getModifiers() & Modifier.STATIC) == Modifier.STATIC;
+	}
+
+	public String getValue() {
+		if (field.getType().isPrimitive()) {
+			try {
+				return field.get(object.getInstance()) + "";
+			} catch (IllegalArgumentException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (IllegalAccessException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		} else {
+			try {
+				Object o = field.get(object.getInstance());
+				if (o == null) {
+					return "<null>";
+				} else {
+					return "id=" + Integer.toHexString(System.identityHashCode(o));
+				}
+			} catch (IllegalArgumentException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (IllegalAccessException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+
+		}
+
+		return "";
+	}
+
+	public List<JavaAttribute> getAttributes() {
+		try {
+			if (field.getType().isPrimitive()) {
+				return Collections.emptyList();
+			} else {
+				return new JavaObject(field.get(object.getInstance())).getAttributes();
+			}
+
+		} catch (IllegalArgumentException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IllegalAccessException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return Collections.emptyList();
+	}
+
+	public String getName() {
+		return field.getName();
+	}
+
+	public String getType() {
+		return field.getType().getSimpleName();
+	}
+
+	public AccessLevel getAccessLevel() {
+		int m = field.getModifiers();
+		if ((m & Modifier.PUBLIC) == Modifier.PUBLIC) {
+			return AccessLevel.PUBLIC;
+		} else if ((m & Modifier.PRIVATE) == Modifier.PRIVATE) {
+			return AccessLevel.PRIVATE;
+		} else if ((m & Modifier.PROTECTED) == Modifier.PROTECTED) {
+			return AccessLevel.PROTECTED;
+		} else {
+			return AccessLevel.DEFAULT;
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaMethod.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaMethod.java
new file mode 100644
index 0000000000..09dc0ea5c7
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaMethod.java
@@ -0,0 +1,5 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.objectdata;
+
+public class JavaMethod {
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java
new file mode 100644
index 0000000000..841f9103da
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java
@@ -0,0 +1,52 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.objectdata;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+public class JavaObject {
+	private Object instance;
+	private List<JavaAttribute> attributes;
+	private List<JavaMethod> methods;
+
+	public JavaObject(Object instance) {
+		this.instance = instance;
+	}
+
+	public Object getInstance() {
+		return instance;
+	}
+
+	public List<JavaAttribute> getAttributes() {
+		if (attributes == null) {
+			initAttributes();
+		}
+		return attributes;
+	}
+
+	private void initAttributes() {
+		attributes = new ArrayList<JavaAttribute>();
+
+		if (instance == null) {
+			return;
+		}
+
+		Class<?> clazz = instance.getClass();
+		addDeclaredFields(clazz);
+		clazz = clazz.getSuperclass();
+		while (clazz != null) {
+			addDeclaredFields(clazz);
+			clazz = clazz.getSuperclass();
+		}
+	}
+
+	private void addDeclaredFields(Class<?> clazz) {
+		for (Field f : clazz.getDeclaredFields()) {
+			attributes.add(new JavaAttribute(this, f));
+		}
+	}
+
+	public String getName() {
+		return instance.getClass().getSimpleName();
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
new file mode 100644
index 0000000000..0f9f70651c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
@@ -0,0 +1,149 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.objectdata;
+
+import java.util.Collection;
+import java.util.Collections;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFValueProperty;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.swt.widgets.Composite;
+
+public class ObjectViewer {
+	public TreeViewer createViewer(Composite parent, EStructuralFeature feature, IObservableValue master, IResourcePool resourcePool) {
+		final TreeViewer viewer = new TreeViewer(parent);
+		viewer.setContentProvider(new ContentProviderImpl());
+		viewer.setLabelProvider(new LabelProviderImpl(resourcePool));
+		viewer.setComparator(new ViewerComparatorImpl());
+		IEMFValueProperty property = EMFProperties.value(feature);
+		IObservableValue value = property.observeDetail(master);
+		value.addValueChangeListener(new IValueChangeListener() {
+
+			public void handleValueChange(ValueChangeEvent event) {
+				if (event.diff.getNewValue() != null) {
+					viewer.setInput(Collections.singleton(new JavaObject(event.diff.getNewValue())));
+				} else {
+					viewer.setInput(Collections.emptyList());
+				}
+			}
+		});
+		return viewer;
+	}
+
+	class ViewerComparatorImpl extends ViewerComparator {
+		@Override
+		public int compare(Viewer viewer, Object e1, Object e2) {
+			if (e1 instanceof JavaAttribute) {
+				if (e2 instanceof JavaAttribute) {
+					JavaAttribute a1 = (JavaAttribute) e1;
+					JavaAttribute a2 = (JavaAttribute) e2;
+
+					if (a1.isStatic() && !a2.isStatic()) {
+						return -1;
+					} else if (!a1.isStatic() && a2.isStatic()) {
+						return 1;
+					}
+
+					int rv = Integer.valueOf(a1.getAccessLevel().value).compareTo(a2.getAccessLevel().value);
+					if (rv == 0) {
+						return a1.getName().compareTo(a2.getName());
+					} else {
+						return rv;
+					}
+				} else {
+					return -1;
+				}
+			}
+			return super.compare(viewer, e1, e2);
+		}
+	}
+
+	class LabelProviderImpl extends StyledCellLabelProvider {
+
+		private IResourcePool resourcePool;
+
+		public LabelProviderImpl(IResourcePool resourcePool) {
+			this.resourcePool = resourcePool;
+		}
+
+		@Override
+		public void update(ViewerCell cell) {
+			if (cell.getElement() instanceof JavaObject) {
+				JavaObject o = (JavaObject) cell.getElement();
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_class_obj));
+				cell.setText(o.getName());
+			} else if (cell.getElement() instanceof JavaAttribute) {
+				JavaAttribute o = (JavaAttribute) cell.getElement();
+				StyledString string = new StyledString();
+				if (o.isInjected()) {
+					string.append("<injected> ", StyledString.COUNTER_STYLER);
+				}
+				string.append(o.getName());
+				string.append(" : " + o.getType() + " - " + o.getValue(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$ //$NON-NLS-2$
+				cell.setText(string.getString());
+				cell.setStyleRanges(string.getStyleRanges());
+				switch (o.getAccessLevel()) {
+				case PUBLIC:
+					cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_field_public_obj));
+					break;
+				case PRIVATE:
+					cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_field_private_obj));
+					break;
+				case DEFAULT:
+					cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_field_default_obj));
+					break;
+				default:
+					cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_field_protected_obj));
+					break;
+				}
+			}
+
+			super.update(cell);
+		}
+	}
+
+	class ContentProviderImpl implements ITreeContentProvider {
+
+		public void dispose() {
+
+		}
+
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+
+		}
+
+		public Object[] getElements(Object inputElement) {
+			return ((Collection<?>) inputElement).toArray();
+
+		}
+
+		public Object[] getChildren(Object parentElement) {
+			if (parentElement instanceof JavaObject) {
+				return ((JavaObject) parentElement).getAttributes().toArray();
+			} else if (parentElement instanceof JavaAttribute) {
+				return ((JavaAttribute) parentElement).getAttributes().toArray();
+			}
+			return new Object[0];
+		}
+
+		public Object getParent(Object element) {
+			// TODO Auto-generated method stub
+			return null;
+		}
+
+		public boolean hasChildren(Object element) {
+			return getChildren(element).length > 0;
+		}
+
+	}
+}

From 5c025a10842862b3add94c523bbaeea4e2a3a64d Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 20 Feb 2011 18:19:57 +0000
Subject: [PATCH 0315/1286] Bug 337622 - [ModelTooling] Show runtime
 Informations MContribution

---
 .../OSGI-INF/resources.properties             |   1 +
 .../icons/full/obj16/bullet_go.png            | Bin 0 -> 410 bytes
 .../e4/tools/emf/ui/internal/Messages.java    |   3 +
 .../tools/emf/ui/internal/Messages.properties |   5 +-
 .../emf/ui/internal/ResourceProvider.java     |   1 +
 .../emf/ui/internal/common/ModelEditor.java   |   2 +-
 .../common/component/AddonsEditor.java        |   4 +-
 .../internal/common/component/AreaEditor.java |   2 +-
 .../component/BindingContextEditor.java       |   2 +-
 .../common/component/BindingTableEditor.java  |   2 +-
 .../common/component/CategoryEditor.java      |   2 +-
 .../common/component/CommandEditor.java       |   2 +-
 .../component/CommandParameterEditor.java     |   2 +-
 .../component/DirectMenuItemEditor.java       |   2 +-
 .../component/DirectToolItemEditor.java       |   2 +-
 .../common/component/HandlerEditor.java       |   4 +-
 .../common/component/KeyBindingEditor.java    |   2 +-
 .../component/MenuContributionEditor.java     |   2 +-
 .../internal/common/component/MenuEditor.java |   2 +-
 .../common/component/MenuSeparatorEditor.java |   2 +-
 .../common/component/ParameterEditor.java     |   2 +-
 .../component/PartDescriptorEditor.java       |   2 +-
 .../internal/common/component/PartEditor.java |   4 +-
 .../component/PartSashContainerEditor.java    |   2 +-
 .../common/component/PartStackEditor.java     |   2 +-
 .../common/component/PerspectiveEditor.java   |   2 +-
 .../component/PerspectiveStackEditor.java     |   2 +-
 .../common/component/PlaceholderEditor.java   |   2 +-
 .../component/ToolBarContributionEditor.java  |   2 +-
 .../common/component/ToolBarEditor.java       |   2 +-
 .../component/ToolBarSeparatorEditor.java     |   2 +-
 .../common/component/ToolControlEditor.java   |   4 +-
 .../common/component/TrimBarEditor.java       |   2 +-
 .../component/TrimContributionEditor.java     |   2 +-
 .../common/component/WindowEditor.java        |   2 +-
 .../common/objectdata/JavaAttribute.java      |  93 +++++++++++++-----
 .../common/objectdata/ObjectViewer.java       |  79 ++++++++++++++-
 37 files changed, 190 insertions(+), 60 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bullet_go.png

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
index b4e477f3df..4ad8645f14 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
@@ -89,6 +89,7 @@ IMG_org.eclipse.e4.tools.emf.ui.obj16.application_form=/icons/full/obj16/applica
 IMG_org.eclipse.e4.tools.emf.ui.obj16.chart_organisation=/icons/full/obj16/chart_organisation.png
 IMG_org.eclipse.e4.tools.emf.ui.obj16.error_obj=/icons/full/obj16/error_obj.gif
 IMG_org.eclipse.e4.tools.emf.ui.obj16.world_edit=/icons/full/obj16/world_edit.png
+IMG_org.eclipse.e4.tools.emf.ui.obj16.bullet_go=/icons/full/obj16/bullet_go.png
 
 IMG_org.eclipse.e4.tools.emf.ui.wizban.fieldrefact_wiz=/icons/full/wizban/fieldrefact_wiz.png
 IMG_org.eclipse.e4.tools.emf.ui.wizban.import_wiz=/icons/full/wizban/import_wiz.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bullet_go.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bullet_go.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc4faa709e7980514e6aaa5360e6208e63248c65
GIT binary patch
literal 410
zcmV;L0cHM)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzEJ;K`R5;6H
z`2YVu10|SYm>ZD2*!*kie8d0ob9Fh%G9Y=r;n&8^QUAkdX#Dq|D$hyKfc&Ml|8p0c
z|4m<L{5Nr~{@<GQq5oH%p7_6Hwf}$De(}Gy-GV%L4FEd%|AuqZ{;xed1*~z!=?VWQ
z>?!%b@Oan%jHPb>P21W3>NYd-<1_&1WU%JGUHShzcVz!>-In&hVRPdDrmgA!XB=w&
zAG5&bziK_hADjk6&({3E^3;U?OHcIvUwEwR|Gc9eKtr<rPe0W3KW(YUf5lpcSJIUX
z1~?4}oUZuKbE5P==YG+D*4_O7;^tfZpLVd}f6`*N|MImA&m}7vv`C5t?PkWW@e7^*
z%U3fz0cut!IU0dZ{wi0^{9m+^L6Pi~C|u6KIk@uz0Ed;w`VQT!>;M1&07*qoM6N<$
Ef*qF6bpQYW

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 05b6cb0557..7074aa2d62 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -597,4 +597,7 @@ public class Messages {
 	public String ExternalizeStringHandler_Dialog_DialogTitle;
 	public String ExternalizeStringHandler_Dialog_DialogMessage;
 
+	public String ObjectViewer_Tooltip_Value;
+	public String ObjectViewer_Tooltip_InjectionKey;
+
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index e19d8ed591..cc70fd5380 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -593,4 +593,7 @@ ExternalizeStringHandler_Dialog_Key=Key
 ExternalizeStringHandler_Dialog_Value=Value
 ExternalizeStringHandler_Dialog_ShellTitle=Externalize Strings
 ExternalizeStringHandler_Dialog_DialogTitle=Externalize Strings
-ExternalizeStringHandler_Dialog_DialogMessage=Externalizing manifest files extracts translatable strings and stores them in a properties file for multi-language support.
\ No newline at end of file
+ExternalizeStringHandler_Dialog_DialogMessage=Externalizing manifest files extracts translatable strings and stores them in a properties file for multi-language support.
+
+ObjectViewer_Tooltip_Value=Value
+ObjectViewer_Tooltip_InjectionKey=Injection key
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
index 18a8568c5c..e0d490356c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
@@ -94,6 +94,7 @@ public class ResourceProvider extends BasicResourceProvider {
 	public static final String IMG_Obj16_chart_organisation = "IMG_org.eclipse.e4.tools.emf.ui.obj16.chart_organisation"; //$NON-NLS-1$
 	public static final String IMG_Obj16_error_obj = "IMG_org.eclipse.e4.tools.emf.ui.obj16.error_obj"; //$NON-NLS-1$
 	public static final String IMG_Obj16_world_edit = "IMG_org.eclipse.e4.tools.emf.ui.obj16.world_edit"; //$NON-NLS-1$
+	public static final String IMG_Obj16_bullet_go = "IMG_org.eclipse.e4.tools.emf.ui.obj16.bullet_go"; //$NON-NLS-1$
 
 	public static final String IMG_Wizban16_fieldrefact_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.fieldrefact_wiz"; //$NON-NLS-1$
 	public static final String IMG_Wizban16_import_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.import_wiz"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index ee0d897abe..9472e98c3c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -200,7 +200,7 @@
 import org.eclipse.swt.widgets.TreeItem;
 
 public class ModelEditor {
-	private static final String CSS_CLASS_KEY = "org.eclipse.e4.ui.css.CssClassName"; //$NON-NLS-1$
+	public static final String CSS_CLASS_KEY = "org.eclipse.e4.ui.css.CssClassName"; //$NON-NLS-1$
 
 	public static final String VIRTUAL_PART_MENU = ModelEditor.class.getName() + ".VIRTUAL_PART_MENU"; //$NON-NLS-1$
 	public static final String VIRTUAL_HANDLER = ModelEditor.class.getName() + ".VIRTUAL_HANDLER"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index a5a75ac677..fe964e6d23 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -139,7 +139,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		if (getEditor().isModelFragment() && isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
@@ -208,7 +208,7 @@ private void createInstanceInspection(CTabFolder folder) {
 		item.setControl(container);
 
 		ObjectViewer objectViewer = new ObjectViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool);
+		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 4e01654a52..146e20a65a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -218,7 +218,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 931cb7dd81..0b4f7d1776 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -156,7 +156,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 28ebe2494c..5d5dc408a3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -150,7 +150,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index 30f37e8d17..173cb52e9d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -114,7 +114,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
 
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 1dded8232f..f913a326be 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -149,7 +149,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
 
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 90e05c4042..cf6a42150f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -124,7 +124,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index c730065cac..f452e92082 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -94,7 +94,7 @@ private void createInstanceInspection(CTabFolder folder) {
 		item.setControl(container);
 
 		ObjectViewer objectViewer = new ObjectViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool);
+		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 43af670ed2..13b8741b59 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -133,7 +133,7 @@ private void createInstanceInspection(CTabFolder folder) {
 		item.setControl(container);
 
 		ObjectViewer objectViewer = new ObjectViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool);
+		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 8ae4bc5971..558024b341 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -138,7 +138,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
@@ -230,7 +230,7 @@ private void createInstanceInspection(CTabFolder folder) {
 		item.setControl(container);
 
 		ObjectViewer objectViewer = new ObjectViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool);
+		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index c3dd441b54..1c85beaeaf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -160,7 +160,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index c4b267fc23..c6e5731efc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -162,7 +162,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 3e30b5b6c0..3245d567c8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -227,7 +227,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 17c051342e..19368822ec 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -112,7 +112,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index b3f4572e71..4569c8d79e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -120,7 +120,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 0e1a99bcd7..65530756f1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -148,7 +148,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index cf7dfbff41..1939c2f44a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -170,7 +170,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
@@ -314,7 +314,7 @@ private void createInstanceInspection(CTabFolder folder) {
 		item.setControl(container);
 
 		ObjectViewer objectViewer = new ObjectViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool);
+		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index d8d5257590..c8fe39bd2c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -204,7 +204,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 5dcb31a804..7b018a32b2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -173,7 +173,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index e594033288..51bf75568f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -213,7 +213,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 940a717592..2cbbcf6890 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -160,7 +160,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 53dfa3509e..6196954511 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -157,7 +157,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 7f1d781328..d0bcef2ddc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -163,7 +163,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index f0745f574e..683b7004c8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -191,7 +191,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 29e386a7d2..b2b3382064 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -123,7 +123,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 3b95184d43..fbb8f0941a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -142,7 +142,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
@@ -198,7 +198,7 @@ private void createInstanceInspection(CTabFolder folder) {
 		item.setControl(container);
 
 		ObjectViewer objectViewer = new ObjectViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool);
+		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index af979b7ab9..c302c3da34 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -174,7 +174,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index f61fe50da2..024b7973e4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -150,7 +150,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 06c827f907..d16e3b9d13 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -179,7 +179,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-			return parent;
+			return folder;
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
index 1ba218f151..5a0c9a7ec8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
@@ -5,6 +5,12 @@
 import java.util.Collections;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Named;
+import org.eclipse.e4.core.di.extensions.EventTopic;
+import org.eclipse.e4.core.di.extensions.Preference;
+import org.eclipse.e4.tools.services.Translation;
+import org.eclipse.e4.ui.di.UIEventTopic;
+import org.osgi.framework.FrameworkUtil;
 
 public class JavaAttribute {
 	private JavaObject object;
@@ -34,35 +40,25 @@ public boolean isStatic() {
 	}
 
 	public String getValue() {
+		Object value = getFieldValue();
 		if (field.getType().isPrimitive()) {
-			try {
-				return field.get(object.getInstance()) + "";
-			} catch (IllegalArgumentException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (IllegalAccessException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
+			return value + ""; //$NON-NLS-1$
 		} else {
-			try {
-				Object o = field.get(object.getInstance());
-				if (o == null) {
-					return "<null>";
+			if (value == null) {
+				return "<null>"; //$NON-NLS-1$
+			} else if (value instanceof String) {
+				return value.toString();
+			} else {
+				String name;
+				if (value.getClass().isAnonymousClass()) {
+					name = value.getClass().getName().substring(value.getClass().getPackage().getName().length() + 1);
 				} else {
-					return "id=" + Integer.toHexString(System.identityHashCode(o));
+					name = value.getClass().getSimpleName();
 				}
-			} catch (IllegalArgumentException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (IllegalAccessException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
 
+				return name + " (id = " + Integer.toHexString(System.identityHashCode(value)) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+			}
 		}
-
-		return "";
 	}
 
 	public List<JavaAttribute> getAttributes() {
@@ -103,4 +99,55 @@ public AccessLevel getAccessLevel() {
 			return AccessLevel.DEFAULT;
 		}
 	}
+
+	public String getContextKey() {
+		if (isInjected()) {
+			Named named = field.getAnnotation(Named.class);
+			if (named != null) {
+				return "@Named(" + named.value() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+			}
+
+			Preference preference = field.getAnnotation(Preference.class);
+			if (preference != null) {
+				String path = preference.nodePath();
+				if (path == null || path.trim().length() == 0) {
+					path = FrameworkUtil.getBundle(getFieldValue().getClass()).getSymbolicName();
+				}
+				return "@Preference(" + preference.nodePath() + "/" + preference.value() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			}
+
+			EventTopic topic = field.getAnnotation(EventTopic.class);
+
+			if (topic != null) {
+				return "@Topic(" + topic.value() + ")"; //$NON-NLS-1$//$NON-NLS-2$
+			}
+
+			UIEventTopic uiTopic = field.getAnnotation(UIEventTopic.class);
+			if (uiTopic != null) {
+				return "@UITopic(" + uiTopic.value() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+			}
+
+			Translation translation = field.getAnnotation(Translation.class);
+			if (translation != null) {
+				return "@Translation(" + field.getType().getName() + ")"; //$NON-NLS-1$//$NON-NLS-2$
+			}
+
+			return field.getType().getName();
+		}
+
+		return ""; //$NON-NLS-1$
+	}
+
+	private Object getFieldValue() {
+		try {
+			return field.get(object.getInstance());
+		} catch (IllegalArgumentException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IllegalAccessException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return null;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
index 0f9f70651c..318ddc6658 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
@@ -5,11 +5,15 @@
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.jface.viewers.ColumnViewer;
+import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
@@ -17,10 +21,16 @@
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.jface.window.ToolTip;
+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.Event;
+import org.eclipse.swt.widgets.Label;
 
 public class ObjectViewer {
-	public TreeViewer createViewer(Composite parent, EStructuralFeature feature, IObservableValue master, IResourcePool resourcePool) {
+	public TreeViewer createViewer(Composite parent, EStructuralFeature feature, IObservableValue master, IResourcePool resourcePool, Messages messages) {
 		final TreeViewer viewer = new TreeViewer(parent);
 		viewer.setContentProvider(new ContentProviderImpl());
 		viewer.setLabelProvider(new LabelProviderImpl(resourcePool));
@@ -37,9 +47,66 @@ public void handleValueChange(ValueChangeEvent event) {
 				}
 			}
 		});
+		new TooltipSupportImpl(viewer, ToolTip.NO_RECREATE, false, resourcePool, messages);
 		return viewer;
 	}
 
+	class TooltipSupportImpl extends ColumnViewerToolTipSupport {
+		private IResourcePool resourcePool;
+		private Messages messages;
+
+		protected TooltipSupportImpl(ColumnViewer viewer, int style, boolean manualActivation, IResourcePool resourcePool, Messages messages) {
+			super(viewer, style, manualActivation);
+			this.resourcePool = resourcePool;
+			this.messages = messages;
+		}
+
+		@Override
+		protected Composite createViewerToolTipContentArea(Event event, ViewerCell cell, Composite parent) {
+			JavaAttribute attribute = (JavaAttribute) cell.getElement();
+
+			Composite container = new Composite(parent, SWT.NONE);
+			container.setBackground(container.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+			container.setLayout(new GridLayout(2, false));
+
+			{
+				Composite headerContainer = new Composite(container, SWT.NONE);
+				headerContainer.setBackgroundMode(SWT.INHERIT_DEFAULT);
+				headerContainer.setData(ModelEditor.CSS_CLASS_KEY, "headerSectionContainer"); //$NON-NLS-1$
+				GridLayout fl = new GridLayout();
+				fl.marginHeight = 5;
+				fl.marginWidth = 5;
+				headerContainer.setLayout(fl);
+				headerContainer.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false, 2, 1));
+
+				Label iconLabel = new Label(parent, SWT.NONE);
+				iconLabel.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_bullet_go));
+
+				Label textLabel = new Label(headerContainer, SWT.NONE);
+				textLabel.setText(attribute.getName());
+				textLabel.setData(ModelEditor.CSS_CLASS_KEY, "sectionHeader"); //$NON-NLS-1$
+			}
+
+			{
+				Label l = new Label(container, SWT.NONE);
+				l.setText(messages.ObjectViewer_Tooltip_Value);
+
+				l = new Label(container, SWT.NONE);
+				l.setText(attribute.getValue());
+			}
+
+			{
+				Label l = new Label(container, SWT.NONE);
+				l.setText(messages.ObjectViewer_Tooltip_InjectionKey);
+
+				l = new Label(container, SWT.NONE);
+				l.setText(attribute.getContextKey());
+			}
+
+			return container;
+		}
+	}
+
 	class ViewerComparatorImpl extends ViewerComparator {
 		@Override
 		public int compare(Viewer viewer, Object e1, Object e2) {
@@ -76,6 +143,14 @@ public LabelProviderImpl(IResourcePool resourcePool) {
 			this.resourcePool = resourcePool;
 		}
 
+		@Override
+		public String getToolTipText(Object element) {
+			if (element instanceof JavaAttribute && ((JavaAttribute) element).isInjected()) {
+				return "Show Tooltip"; //$NON-NLS-1$
+			}
+			return super.getToolTipText(element);
+		}
+
 		@Override
 		public void update(ViewerCell cell) {
 			if (cell.getElement() instanceof JavaObject) {
@@ -86,7 +161,7 @@ public void update(ViewerCell cell) {
 				JavaAttribute o = (JavaAttribute) cell.getElement();
 				StyledString string = new StyledString();
 				if (o.isInjected()) {
-					string.append("<injected> ", StyledString.COUNTER_STYLER);
+					string.append("<injected> ", StyledString.COUNTER_STYLER); //$NON-NLS-1$
 				}
 				string.append(o.getName());
 				string.append(" : " + o.getType() + " - " + o.getValue(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$ //$NON-NLS-2$

From 3263926d443157ed42763b89d635f0af8964d325 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sun, 20 Feb 2011 19:18:58 +0000
Subject: [PATCH 0316/1286] Bug 337622 - [ModelTooling] Show runtime
 Informations MContribution

---
 .../emf/ui/internal/common/objectdata/ObjectViewer.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
index 318ddc6658..970021dbe9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
@@ -42,6 +42,7 @@ public TreeViewer createViewer(Composite parent, EStructuralFeature feature, IOb
 			public void handleValueChange(ValueChangeEvent event) {
 				if (event.diff.getNewValue() != null) {
 					viewer.setInput(Collections.singleton(new JavaObject(event.diff.getNewValue())));
+					viewer.expandToLevel(2);
 				} else {
 					viewer.setInput(Collections.emptyList());
 				}
@@ -73,13 +74,13 @@ protected Composite createViewerToolTipContentArea(Event event, ViewerCell cell,
 				Composite headerContainer = new Composite(container, SWT.NONE);
 				headerContainer.setBackgroundMode(SWT.INHERIT_DEFAULT);
 				headerContainer.setData(ModelEditor.CSS_CLASS_KEY, "headerSectionContainer"); //$NON-NLS-1$
-				GridLayout fl = new GridLayout();
+				GridLayout fl = new GridLayout(2, false);
 				fl.marginHeight = 5;
 				fl.marginWidth = 5;
 				headerContainer.setLayout(fl);
 				headerContainer.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false, 2, 1));
 
-				Label iconLabel = new Label(parent, SWT.NONE);
+				Label iconLabel = new Label(headerContainer, SWT.NONE);
 				iconLabel.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_bullet_go));
 
 				Label textLabel = new Label(headerContainer, SWT.NONE);

From 42f0111a89f87e997dfa63c5eafb0603ad714a4a Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 28 Feb 2011 18:04:06 +0000
Subject: [PATCH 0317/1286] Bug 321019 - [ModelTooling] Copy&Paste does not
 work in DetailArea

---
 .../ui/internal/common/component/ControlFactory.java | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 853b4558e2..6e678f3ae7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -76,7 +76,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.Clipboard;
 import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -112,21 +111,16 @@ public void paste() {
 			}
 
 			if (validate(o.toString())) {
-				t.insert(o.toString());
+				t.paste();
 			}
 		}
 
 		public void cut() {
-			Clipboard cp = new Clipboard(t.getDisplay());
-			cp.setContents(new Object[] { t.getSelectionText() }, new Transfer[] { TextTransfer.getInstance() });
-			cp.dispose();
-			t.insert(""); //$NON-NLS-1$
+			t.cut();
 		}
 
 		public void copy() {
-			Clipboard cp = new Clipboard(t.getDisplay());
-			cp.setContents(new Object[] { t.getSelectionText() }, new Transfer[] { TextTransfer.getInstance() });
-			cp.dispose();
+			t.copy();
 		}
 
 		public boolean validate(String text) {

From 3b880b60cd0281ddb99af10461b38a36becdc262 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 2 Mar 2011 18:05:47 +0000
Subject: [PATCH 0318/1286] Bug 337302 - [Build] Add features to install
 forward compat layer in 3.x easily


From 736bdd860626a752b9ba46d86c929a66a74ddc21 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 2 Mar 2011 18:27:32 +0000
Subject: [PATCH 0319/1286] Bug 337302 - [Build] Add features to install
 forward compat layer in 3.x easily


From 3502596ac6a599e568e20cc6f1369c3cc4cc335f Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 3 Mar 2011 21:38:17 +0000
Subject: [PATCH 0320/1286] Bug 338860 - [ModelTooling] Highlight Model-Element
 in the Running UI

---
 .../internal/common/ControlHighlighter.java   | 40 +++++++++++++++++++
 .../emf/ui/internal/common/ModelEditor.java   | 25 ++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
new file mode 100644
index 0000000000..bfe4148208
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
@@ -0,0 +1,40 @@
+package org.eclipse.e4.tools.emf.ui.internal.common;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
+
+public class ControlHighlighter {
+	private Control control;
+	private Shell s;
+
+	public ControlHighlighter(Control control) {
+		this.control = control;
+	}
+
+	public void show(Shell dialog) {
+		s = new Shell(control.getShell(), SWT.NO_TRIM);
+		Point p1 = control.toDisplay(0, 0);
+		Point p2 = control.getSize();
+		s.setBounds(p1.x, p1.y, p2.x, p2.y);
+		s.setBackground(s.getDisplay().getSystemColor(SWT.COLOR_RED));
+		s.setAlpha(100);
+		s.open();
+		s.addListener(SWT.MouseDown, new Listener() {
+
+			public void handleEvent(Event event) {
+				hide();
+			}
+		});
+	}
+
+	public void hide() {
+		if (s != null) {
+			s.dispose();
+			s = null;
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 9472e98c3c..914692bdfd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -267,6 +267,8 @@ public class ModelEditor {
 
 	private AbstractComponentEditor currentEditor;
 
+	private ControlHighlighter currentControlHighlighter;
+
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project, final IResourcePool resourcePool) {
 		this.resourcePool = resourcePool;
 		this.modelProvider = modelProvider;
@@ -565,6 +567,29 @@ public void run() {
 						}
 					};
 					manager.add(nlsAction);
+				} else {
+					if (addSeparator) {
+						manager.add(new Separator());
+					}
+
+					if (s.getFirstElement() instanceof MUIElement) {
+						final MUIElement el = (MUIElement) s.getFirstElement();
+						if (el.getWidget() instanceof Control) {
+							manager.add(new Action("Show control") {
+
+								public void run() {
+									if (currentControlHighlighter != null) {
+										currentControlHighlighter.hide();
+									}
+
+									currentControlHighlighter = new ControlHighlighter((Control) el.getWidget());
+									currentControlHighlighter.show(viewer.getTree().getShell());
+								}
+							});
+
+						}
+					}
+
 				}
 			}
 		});

From 86492ef4a86592944a45a1b3fd482f979baec1b6 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 4 Mar 2011 14:51:25 +0000
Subject: [PATCH 0321/1286] Bug 338938 - [ModelTooling] XMI-Editor should use
 Monospaced Text Font

---
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 914692bdfd..6a4f43ba29 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -163,6 +163,7 @@
 import org.eclipse.jface.databinding.viewers.ObservableListTreeContentProvider;
 import org.eclipse.jface.databinding.viewers.TreeStructureAdvisor;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentPartitioner;
@@ -346,6 +347,7 @@ private Control createXMITab(Composite composite) {
 		SourceViewer viewer = new SourceViewer(composite, verticalRuler, styles);
 		viewer.configure(new XMLConfiguration(resourcePool));
 		viewer.setEditable(project != null);
+		viewer.getTextWidget().setFont(JFaceResources.getTextFont());
 
 		final IDocument document = emfDocumentProvider.getDocument();
 		IDocumentPartitioner partitioner = new FastPartitioner(new XMLPartitionScanner(), new String[] { XMLPartitionScanner.XML_TAG, XMLPartitionScanner.XML_COMMENT });

From 234ef929a198267205fa67f4ad5a76e1ba36531c Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 4 Mar 2011 15:11:43 +0000
Subject: [PATCH 0322/1286] Bug 335767 - [ModelTooling] Add support for NLS

---
 .../properties/ExternalizeStringHandler.java  | 46 +++++++++++++------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
index e7a699538c..e6525b7f63 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
@@ -8,7 +8,9 @@
 import java.util.Properties;
 import javax.inject.Named;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -203,25 +205,29 @@ protected void okPressed() {
 			if (els.length > 0) {
 				try {
 					IFile f = getBasePropertyFile();
-					if (f.exists()) {
-						StringBuilder b = new StringBuilder(System.getProperty("line.separator"));
-						for (Object o : els) {
-							Entry e = (Entry) o;
-							b.append(e.key + " = " + e.value + System.getProperty("line.separator")); //$NON-NLS-1$//$NON-NLS-2$
-						}
 
-						System.err.println("Appending: " + b);
+					StringBuilder b = new StringBuilder(System.getProperty("line.separator"));
+					for (Object o : els) {
+						Entry e = (Entry) o;
+						b.append(e.key + " = " + e.value + System.getProperty("line.separator")); //$NON-NLS-1$//$NON-NLS-2$
+					}
 
-						ByteArrayInputStream stream = new ByteArrayInputStream(b.toString().getBytes());
+					ByteArrayInputStream stream = new ByteArrayInputStream(b.toString().getBytes());
+					if (f.exists()) {
 						f.appendContents(stream, IFile.KEEP_HISTORY, new NullProgressMonitor());
+					} else {
+						createParent(f.getParent());
+						f.create(stream, IFile.KEEP_HISTORY, new NullProgressMonitor());
+					}
+
+					stream.close();
 
-						for (Object o : els) {
-							Entry e = (Entry) o;
-							Command cmd = SetCommand.create(resource.getEditingDomain(), e.object, e.feature, "%" + e.key);
+					for (Object o : els) {
+						Entry e = (Entry) o;
+						Command cmd = SetCommand.create(resource.getEditingDomain(), e.object, e.feature, "%" + e.key); //$NON-NLS-1$
 
-							if (cmd.canExecute()) {
-								resource.getEditingDomain().getCommandStack().execute(cmd);
-							}
+						if (cmd.canExecute()) {
+							resource.getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
 					super.okPressed();
@@ -236,6 +242,18 @@ protected void okPressed() {
 			}
 		}
 
+		private void createParent(IContainer container) throws CoreException {
+			if (!container.exists()) {
+
+				createParent(container.getParent());
+
+				if (container instanceof IFolder) {
+					IFolder f = (IFolder) container;
+					f.create(true, true, new NullProgressMonitor());
+				}
+			}
+		}
+
 		private IFile getBasePropertyFile() throws CoreException, IOException {
 			IFile file = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
 			String base = ProjectOSGiTranslationProvider.extractBasenameFromManifest(file);

From 698dfb7d99cd2bbadb2f7e5bd3072915fd2f1d68 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 8 Mar 2011 23:22:13 +0000
Subject: [PATCH 0323/1286] Bug 339299 - [ModelTooling] Add scripting support

---
 .../build.properties                          |   3 +-
 .../org.eclipse.e4.tools.emf.ui/plugin.xml    |   1 +
 ...org.eclipse.e4.tools.emf.ui.scripting.exsd | 112 ++++++++++++++++++
 .../emf/ui/common/IScriptingSupport.java      |   8 ++
 .../e4/tools/emf/ui/internal/Messages.java    |   1 +
 .../tools/emf/ui/internal/Messages.properties |   3 +-
 .../common/objectdata/JavaAttribute.java      |   2 +-
 .../common/objectdata/ObjectViewer.java       |  62 +++++++++-
 8 files changed, 187 insertions(+), 5 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.scripting.exsd
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IScriptingSupport.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/build.properties b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
index b51da18453..e0bc710666 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
@@ -5,8 +5,7 @@ bin.includes = .,\
                about.html,\
                plugin.xml,\
                css/,\
-               OSGI-INF/,\
-               OSGI-INF/resourceprovider.xml
+               OSGI-INF/
 output.. = bin/
 jars.compile.order = .
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml b/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
index b532b6c1b4..e01f13b902 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
@@ -2,6 +2,7 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension-point id="org.eclipse.e4.tools.emf.ui.editors" name="%extension-point.name" schema="schema/org.eclipse.e4.tools.emf.ui.editors.exsd"/>
+   <extension-point id="org.eclipse.e4.tools.emf.ui.scripting" name="Scripting" schema="schema/org.eclipse.e4.tools.emf.ui.scripting.exsd"/>
    <extension
          point="org.eclipse.e4.ui.css.swt.theme">
       <stylesheet
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.scripting.exsd b/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.scripting.exsd
new file mode 100644
index 0000000000..9d8b4e5af0
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.scripting.exsd
@@ -0,0 +1,112 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.e4.tools.emf.ui" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.e4.tools.emf.ui" id="org.eclipse.e4.tools.emf.ui.scripting" name="Scripting"/>
+      </appinfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="scripting" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="scripting">
+      <complexType>
+         <attribute name="label" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.e4.tools.emf.ui.common.IScriptingSupport"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IScriptingSupport.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IScriptingSupport.java
new file mode 100644
index 0000000000..ef2a071492
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IScriptingSupport.java
@@ -0,0 +1,8 @@
+package org.eclipse.e4.tools.emf.ui.common;
+
+import java.util.Map;
+import org.eclipse.swt.widgets.Shell;
+
+public interface IScriptingSupport {
+	public void openEditor(Shell shell, Object scope, Map<String, Object> additionalData);
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 7074aa2d62..0dd425e40c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -599,5 +599,6 @@ public class Messages {
 
 	public String ObjectViewer_Tooltip_Value;
 	public String ObjectViewer_Tooltip_InjectionKey;
+	public String ObjectViewer_Script;
 
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index cc70fd5380..a26f112bc9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -596,4 +596,5 @@ ExternalizeStringHandler_Dialog_DialogTitle=Externalize Strings
 ExternalizeStringHandler_Dialog_DialogMessage=Externalizing manifest files extracts translatable strings and stores them in a properties file for multi-language support.
 
 ObjectViewer_Tooltip_Value=Value
-ObjectViewer_Tooltip_InjectionKey=Injection key
\ No newline at end of file
+ObjectViewer_Tooltip_InjectionKey=Injection key
+ObjectViewer_Script=Execute Script
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
index 5a0c9a7ec8..b47d1e832b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
@@ -138,7 +138,7 @@ public String getContextKey() {
 		return ""; //$NON-NLS-1$
 	}
 
-	private Object getFieldValue() {
+	public Object getFieldValue() {
 		try {
 			return field.get(object.getInstance());
 		} catch (IllegalArgumentException e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
index 970021dbe9..100b7a731c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
@@ -2,9 +2,16 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.RegistryFactory;
+import org.eclipse.e4.tools.emf.ui.common.IScriptingSupport;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
@@ -12,8 +19,13 @@
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.ColumnViewer;
 import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
@@ -30,7 +42,7 @@
 import org.eclipse.swt.widgets.Label;
 
 public class ObjectViewer {
-	public TreeViewer createViewer(Composite parent, EStructuralFeature feature, IObservableValue master, IResourcePool resourcePool, Messages messages) {
+	public TreeViewer createViewer(Composite parent, EStructuralFeature feature, IObservableValue master, IResourcePool resourcePool, final Messages messages) {
 		final TreeViewer viewer = new TreeViewer(parent);
 		viewer.setContentProvider(new ContentProviderImpl());
 		viewer.setLabelProvider(new LabelProviderImpl(resourcePool));
@@ -48,6 +60,54 @@ public void handleValueChange(ValueChangeEvent event) {
 				}
 			}
 		});
+
+		IExtensionRegistry registry = RegistryFactory.getRegistry();
+		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.scripting"); //$NON-NLS-1$
+		final IConfigurationElement[] elements = extPoint.getConfigurationElements();
+
+		if (elements.length > 0) {
+			final MenuManager mgr = new MenuManager();
+			mgr.setRemoveAllWhenShown(true);
+			mgr.addMenuListener(new IMenuListener() {
+
+				public void menuAboutToShow(IMenuManager manager) {
+					if (viewer.getSelection().isEmpty()) {
+						return;
+					}
+
+					MenuManager scriptExecute = new MenuManager(messages.ObjectViewer_Script);
+					mgr.add(scriptExecute);
+					for (IConfigurationElement e : elements) {
+						final IConfigurationElement le = e;
+						scriptExecute.add(new Action(e.getAttribute("label")) { //$NON-NLS-1$
+							@Override
+							public void run() {
+								try {
+									IScriptingSupport support = (IScriptingSupport) le.createExecutableExtension("class"); //$NON-NLS-1$
+									Object o = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+									Object mainObject = null;
+									if (o instanceof JavaObject) {
+										mainObject = ((JavaObject) o).getInstance();
+									} else if (o instanceof JavaAttribute) {
+										mainObject = ((JavaAttribute) o).getFieldValue();
+									}
+
+									if (mainObject != null) {
+										support.openEditor(viewer.getControl().getShell(), mainObject, new HashMap<String, Object>());
+									}
+								} catch (CoreException e) {
+									// TODO Auto-generated catch block
+									e.printStackTrace();
+								}
+							}
+						});
+					}
+				}
+			});
+
+			viewer.getControl().setMenu(mgr.createContextMenu(viewer.getControl()));
+		}
+
 		new TooltipSupportImpl(viewer, ToolTip.NO_RECREATE, false, resourcePool, messages);
 		return viewer;
 	}

From 67fba58e2ae506e32798c8a1ee0ce33887a8ef84 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 8 Mar 2011 23:30:12 +0000
Subject: [PATCH 0324/1286] Bug 339299 - [ModelTooling] Add scripting support

---
 .../emf/ui/internal/common/ModelEditor.java   | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 6a4f43ba29..f88e737630 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -48,6 +48,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.IExtensionLookup;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.common.IScriptingSupport;
 import org.eclipse.e4.tools.emf.ui.common.ISelectionProviderService;
 import org.eclipse.e4.tools.emf.ui.common.MemoryTransfer;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -502,7 +503,7 @@ public void run() {
 		mgr.addMenuListener(new IMenuListener() {
 
 			public void menuAboutToShow(IMenuManager manager) {
-				IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+				final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 				boolean addSeparator = false;
 				if (!s.isEmpty()) {
 					List<Action> actions;
@@ -574,6 +575,30 @@ public void run() {
 						manager.add(new Separator());
 					}
 
+					IExtensionRegistry registry = RegistryFactory.getRegistry();
+					IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.scripting"); //$NON-NLS-1$
+					final IConfigurationElement[] elements = extPoint.getConfigurationElements();
+
+					if (elements.length > 0 && !s.isEmpty() && s.getFirstElement() instanceof MApplicationElement) {
+						MenuManager scriptExecute = new MenuManager(messages.ObjectViewer_Script);
+						manager.add(scriptExecute);
+						for (IConfigurationElement e : elements) {
+							final IConfigurationElement le = e;
+							scriptExecute.add(new Action(e.getAttribute("label")) { //$NON-NLS-1$
+								@Override
+								public void run() {
+									try {
+										IScriptingSupport support = (IScriptingSupport) le.createExecutableExtension("class"); //$NON-NLS-1$
+										support.openEditor(viewer.getControl().getShell(), s.getFirstElement(), new HashMap<String, Object>());
+									} catch (CoreException e) {
+										// TODO Auto-generated catch block
+										e.printStackTrace();
+									}
+								}
+							});
+						}
+					}
+
 					if (s.getFirstElement() instanceof MUIElement) {
 						final MUIElement el = (MUIElement) s.getFirstElement();
 						if (el.getWidget() instanceof Control) {

From 52702ba6f89029837e901a40969f1ce7ff1baf67 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 8 Mar 2011 23:49:05 +0000
Subject: [PATCH 0325/1286] Bug 339299 - [ModelTooling] Add scripting support

---
 .../e4/tools/emf/ui/internal/Messages.java    |  2 +
 .../tools/emf/ui/internal/Messages.properties |  2 +
 .../internal/common/ControlHighlighter.java   | 14 ++--
 .../emf/ui/internal/common/ModelEditor.java   | 65 +++++++++----------
 4 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 0dd425e40c..475fb90bde 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -588,6 +588,8 @@ public class Messages {
 	public String ModelEditor_Form;
 	public String ModelEditor_XMI;
 	public String ModelEditor_ExternalizeStrings;
+	public String ModelEditor_Script;
+	public String ModelEditor_ShowControl;
 
 	public String ExternalizeStringHandler_Dialog_ElementName;
 	public String ExternalizeStringHandler_Dialog_AttributeName;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index a26f112bc9..b45be4ff6b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -586,6 +586,8 @@ ModelEditor_Delete=Remove
 ModelEditor_Form=Form
 ModelEditor_XMI=XMI
 ModelEditor_ExternalizeStrings=Externalize Strings
+ModelEditor_Script=Execute Script
+ModelEditor_ShowControl=Show control
 
 ExternalizeStringHandler_Dialog_ElementName=Element
 ExternalizeStringHandler_Dialog_AttributeName=Attribute
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
index bfe4148208..da74a4d7e7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
@@ -8,14 +8,12 @@
 import org.eclipse.swt.widgets.Shell;
 
 public class ControlHighlighter {
-	private Control control;
-	private Shell s;
+	private static Shell s;
 
-	public ControlHighlighter(Control control) {
-		this.control = control;
-	}
-
-	public void show(Shell dialog) {
+	public static void show(Control control) {
+		if (s != null && !s.isDisposed()) {
+			s.dispose();
+		}
 		s = new Shell(control.getShell(), SWT.NO_TRIM);
 		Point p1 = control.toDisplay(0, 0);
 		Point p2 = control.getSize();
@@ -31,7 +29,7 @@ public void handleEvent(Event event) {
 		});
 	}
 
-	public void hide() {
+	public static void hide() {
 		if (s != null) {
 			s.dispose();
 			s = null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index f88e737630..c5f16b0401 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -269,8 +269,6 @@ public class ModelEditor {
 
 	private AbstractComponentEditor currentEditor;
 
-	private ControlHighlighter currentControlHighlighter;
-
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project, final IResourcePool resourcePool) {
 		this.resourcePool = resourcePool;
 		this.modelProvider = modelProvider;
@@ -557,6 +555,36 @@ public void run() {
 					}
 				}
 
+				IExtensionRegistry registry = RegistryFactory.getRegistry();
+				IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.scripting"); //$NON-NLS-1$
+				final IConfigurationElement[] elements = extPoint.getConfigurationElements();
+
+				if (elements.length > 0 && !s.isEmpty() && s.getFirstElement() instanceof MApplicationElement) {
+					if (addSeparator) {
+						manager.add(new Separator());
+					}
+
+					addSeparator = false;
+
+					MenuManager scriptExecute = new MenuManager(messages.ModelEditor_Script);
+					manager.add(scriptExecute);
+					for (IConfigurationElement e : elements) {
+						final IConfigurationElement le = e;
+						scriptExecute.add(new Action(e.getAttribute("label")) { //$NON-NLS-1$
+							@Override
+							public void run() {
+								try {
+									IScriptingSupport support = (IScriptingSupport) le.createExecutableExtension("class"); //$NON-NLS-1$
+									support.openEditor(viewer.getControl().getShell(), s.getFirstElement(), new HashMap<String, Object>());
+								} catch (CoreException e) {
+									// TODO Auto-generated catch block
+									e.printStackTrace();
+								}
+							}
+						});
+					}
+				}
+
 				if (project != null) {
 
 					if (addSeparator) {
@@ -575,42 +603,13 @@ public void run() {
 						manager.add(new Separator());
 					}
 
-					IExtensionRegistry registry = RegistryFactory.getRegistry();
-					IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.scripting"); //$NON-NLS-1$
-					final IConfigurationElement[] elements = extPoint.getConfigurationElements();
-
-					if (elements.length > 0 && !s.isEmpty() && s.getFirstElement() instanceof MApplicationElement) {
-						MenuManager scriptExecute = new MenuManager(messages.ObjectViewer_Script);
-						manager.add(scriptExecute);
-						for (IConfigurationElement e : elements) {
-							final IConfigurationElement le = e;
-							scriptExecute.add(new Action(e.getAttribute("label")) { //$NON-NLS-1$
-								@Override
-								public void run() {
-									try {
-										IScriptingSupport support = (IScriptingSupport) le.createExecutableExtension("class"); //$NON-NLS-1$
-										support.openEditor(viewer.getControl().getShell(), s.getFirstElement(), new HashMap<String, Object>());
-									} catch (CoreException e) {
-										// TODO Auto-generated catch block
-										e.printStackTrace();
-									}
-								}
-							});
-						}
-					}
-
 					if (s.getFirstElement() instanceof MUIElement) {
 						final MUIElement el = (MUIElement) s.getFirstElement();
 						if (el.getWidget() instanceof Control) {
-							manager.add(new Action("Show control") {
+							manager.add(new Action(messages.ModelEditor_ShowControl) {
 
 								public void run() {
-									if (currentControlHighlighter != null) {
-										currentControlHighlighter.hide();
-									}
-
-									currentControlHighlighter = new ControlHighlighter((Control) el.getWidget());
-									currentControlHighlighter.show(viewer.getTree().getShell());
+									ControlHighlighter.show((Control) el.getWidget());
 								}
 							});
 

From 2b3127674c9c68ba77d0a63025269861bd96772f Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 9 Mar 2011 00:01:40 +0000
Subject: [PATCH 0326/1286] Bug 339299 - [ModelTooling] Add scripting support


From 165542978d4f046ca95a6810baac4dd19115af69 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 9 Mar 2011 00:10:49 +0000
Subject: [PATCH 0327/1286] Bug 339299 - [ModelTooling] Add scripting support


From 550a6044749185d819562ee375b5e6f16bbf0905 Mon Sep 17 00:00:00 2001
From: Andrew Niefer <aniefer>
Date: Wed, 9 Mar 2011 18:30:10 +0000
Subject: [PATCH 0328/1286] bug 339301 - add tools.emf.ui.script.js

---
 .../org.eclipse.e4.core.tools.feature/feature.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 1ce569e119..488acb9168 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -58,5 +58,20 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+         
+    <plugin
+         id="org.eclipse.e4.tools.emf.ui.script.js"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+    <plugin
+         id="org.mozilla.javascript"
+         download-size="0"
+         install-size="0"
+         version="1.7.2.qualifier"
+         unpack="false"/>
+         
 
 </feature>

From 983ca10a9a60daffc1290a42713acbd2a3ed5c09 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 10 Mar 2011 22:06:50 +0000
Subject: [PATCH 0329/1286] Bug 339598 - [ModelTooling] Add UI-Widget-Tree
 inspector

---
 .../META-INF/MANIFEST.MF                      |   3 +-
 .../OSGI-INF/resources.properties             |  26 +++
 .../icons/full/widgets/button_obj.gif         | Bin 0 -> 344 bytes
 .../icons/full/widgets/ccombo_obj.gif         | Bin 0 -> 634 bytes
 .../icons/full/widgets/checkbox_obj.gif       | Bin 0 -> 343 bytes
 .../icons/full/widgets/clabel_obj.gif         | Bin 0 -> 341 bytes
 .../icons/full/widgets/comboviewer_obj.gif    | Bin 0 -> 946 bytes
 .../icons/full/widgets/composite_obj.gif      | Bin 0 -> 377 bytes
 .../icons/full/widgets/coolbar_obj.gif        | Bin 0 -> 613 bytes
 .../icons/full/widgets/ctabfolder_obj.gif     | Bin 0 -> 367 bytes
 .../icons/full/widgets/group_obj.gif          | Bin 0 -> 398 bytes
 .../icons/full/widgets/label_obj.gif          | Bin 0 -> 582 bytes
 .../icons/full/widgets/progressbar_obj.gif    | Bin 0 -> 327 bytes
 .../icons/full/widgets/radiobutton_obj.gif    | Bin 0 -> 166 bytes
 .../icons/full/widgets/sashform_obj.gif       | Bin 0 -> 378 bytes
 .../icons/full/widgets/separator_obj.gif      | Bin 0 -> 868 bytes
 .../icons/full/widgets/shell_obj.gif          | Bin 0 -> 358 bytes
 .../icons/full/widgets/tabfolder_obj.gif      | Bin 0 -> 607 bytes
 .../icons/full/widgets/table_obj.gif          | Bin 0 -> 573 bytes
 .../icons/full/widgets/text_obj.gif           | Bin 0 -> 343 bytes
 .../icons/full/widgets/toolbar_obj.gif        | Bin 0 -> 607 bytes
 .../icons/full/widgets/toolitemcheck_obj.gif  | Bin 0 -> 354 bytes
 .../icons/full/widgets/toolitemdrop_obj.gif   | Bin 0 -> 607 bytes
 .../icons/full/widgets/toolitempush_obj.gif   | Bin 0 -> 216 bytes
 .../icons/full/widgets/toolitemradio_obj.gif  | Bin 0 -> 563 bytes
 .../full/widgets/toolitemseparator_obj.gif    | Bin 0 -> 608 bytes
 .../icons/full/widgets/tree_obj.gif           | Bin 0 -> 372 bytes
 .../e4/tools/emf/ui/internal/Messages.java    |   3 +-
 .../tools/emf/ui/internal/Messages.properties |   3 +-
 .../emf/ui/internal/ResourceProvider.java     |  26 +++
 .../common/component/AddonsEditor.java        |   2 +-
 .../common/component/ApplicationEditor.java   |  26 +++
 .../internal/common/component/AreaEditor.java |  18 ++
 .../component/DirectMenuItemEditor.java       |   2 +-
 .../component/DirectToolItemEditor.java       |   2 +-
 .../common/component/HandlerEditor.java       |   2 +-
 .../internal/common/component/MenuEditor.java |  18 ++
 .../common/component/MenuItemEditor.java      |  19 ++
 .../common/component/MenuSeparatorEditor.java |  27 ++-
 .../internal/common/component/PartEditor.java |  15 +-
 .../component/PartSashContainerEditor.java    |  24 +++
 .../common/component/PartStackEditor.java     |  24 +++
 .../common/component/PerspectiveEditor.java   |  18 ++
 .../component/PerspectiveStackEditor.java     |  24 +++
 .../common/component/PlaceholderEditor.java   |  25 +++
 .../component/ToolBarContributionEditor.java  |  24 +++
 .../component/ToolBarSeparatorEditor.java     |  26 +++
 .../common/component/ToolControlEditor.java   |  22 ++-
 .../common/component/ToolItemEditor.java      |  19 ++
 .../common/component/TrimBarEditor.java       |  24 +++
 .../component/TrimContributionEditor.java     |  24 +++
 .../common/component/WindowEditor.java        |  18 ++
 .../internal/common/uistructure/UIViewer.java |  72 ++++++++
 .../uistructure/WidgetContentProvider.java    | 113 ++++++++++++
 .../uistructure/WidgetLabelProvider.java      | 165 ++++++++++++++++++
 55 files changed, 803 insertions(+), 11 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/button_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ccombo_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/checkbox_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/clabel_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/comboviewer_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/composite_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/coolbar_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ctabfolder_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/group_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/label_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/progressbar_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/radiobutton_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/sashform_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/separator_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/shell_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tabfolder_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/table_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/text_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolbar_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemcheck_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemdrop_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitempush_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemradio_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemseparator_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tree_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 8af951f288..92554df36a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -29,7 +29,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  javax.annotation;bundle-version="1.0.0",
  org.eclipse.e4.tools.services;bundle-version="1.0.0",
  org.eclipse.e4.core.di.extensions;bundle-version="0.9.0",
- org.eclipse.jface.text;bundle-version="3.7.0"
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.e4.ui.widgets;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.runtime.jobs,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
index 4ad8645f14..43901a3af5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
@@ -98,6 +98,32 @@ IMG_org.eclipse.e4.tools.emf.ui.wizban.newexp_wiz=/icons/full/wizban/newexp_wiz.
 IMG_org.eclipse.e4.tools.emf.ui.wizban.typerefact_wiz=/icons/full/wizban/typerefact_wiz.png
 IMG_org.eclipse.e4.tools.emf.ui.wizban.extstr_wiz=/icons/full/wizban/extstr_wiz.png
 
+IMG_org.eclipse.e4.tools.emf.ui.widgets.ctabfolder_obj = /icons/full/widgets/ctabfolder_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.tabfolder_obj = /icons/full/widgets/tabfolder_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.shell_obj = /icons/full/widgets/shell_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.group_obj = /icons/full/widgets/group_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.ccombo_obj = /icons/full/widgets/ccombo_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.comboviewer_obj = /icons/full/widgets/comboviewer_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.table_obj = /icons/full/widgets/table_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.tree_obj = /icons/full/widgets/tree_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.sashform_obj = /icons/full/widgets/sashform_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.text_obj = /icons/full/widgets/text_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.label_obj = /icons/full/widgets/label_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.button_obj = /icons/full/widgets/button_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.composite_obj = /icons/full/widgets/composite_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.progressbar_obj = /icons/full/widgets/progressbar_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.separator_obj = /icons/full/widgets/separator_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.clabel_obj = /icons/full/widgets/clabel_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.coolbar_obj = /icons/full/widgets/coolbar_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.toolbar_obj = /icons/full/widgets/toolbar_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.toolitemcheck_obj = /icons/full/widgets/toolitemcheck_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.toolitemdrop_obj = /icons/full/widgets/toolitemdrop_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.toolitempush_obj = /icons/full/widgets/toolitempush_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.toolitemradio_obj = /icons/full/widgets/toolitemradio_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.toolitemseparator_obj = /icons/full/widgets/toolitemseparator_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.checkbox_obj = /icons/full/widgets/checkbox_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.group_obj = /icons/full/widgets/group_obj.gif
+
 COLOR_org.eclipse.e4.tools.emf.ui.XML_COMMENT=rgb(128, 0, 0)
 COLOR_org.eclipse.e4.tools.emf.ui.PROC_INSTR=rgb(128, 128, 128)
 COLOR_org.eclipse.e4.tools.emf.ui.STRING=rgb(0, 128, 0)
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/button_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/button_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d143fcf6213917833ea4b7a97bc919b3ff390760
GIT binary patch
literal 344
zcmZ?wbhEHb6krfwxXQpVsiCX0y05lma!tvkyzCjdIWuCD=f@_`d->|i<0tPPKY2TG
z+Rix(4$N7wfA#uPbqy2t9=Nvmz|{+v9$mQf&^K!7Y@pP_1FP4c^od$Bd*Ojq>rbs(
ze{#~a)q4+K+k5cph0BjFTz>fI$vfMiRga#$)o|Nv=)J+vd;O!QZ=bz*XX6^Vc-5}|
zV8B2wQ2fcl$iScjgg^lD69ZeR!?Xeq9jX2kDus+0R`buXYBxkgu8)|abwFs1mZW#;
zoWvQ@a~M}|D6%l=>#i0qFW^{n_>^#?gO#A1K$D;hn~sRKki4*vf_%5Uyn>8`j*_<W
rEM;{rMP<%eGD<pXTKp?kuHx5J)!|mzxM}mIAg}E^cJ6X^WUvMR!~TSg

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ccombo_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ccombo_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6bd017e83be60e9e30abbaf2036330e39119e036
GIT binary patch
literal 634
zcmZ?wbhEHb6krfwc*el6XZ4mz4PDQly_-LG=aIu#PoB8Bc+tKU%MYzud3e{(a|iZc
zF36vfpFd^&`s2HIU);0j!s*lZ4j#OG^5o5P=k8v(aPQu|7tfx(efspxr%&JCzWwy&
z%a1>Q{^jIO%g&v)ZTp$@>>24<)05I?y?pg0CS^`y#;mY}`C*CkV^ZgMMK1A*S`rYu
zC?IyBh5s5$|24KjEA4_;xr8lmo^V{lZL_xfCT)*RdR`m!y*B**^Y7R1zi|~SvMVO!
zRrcAt`uhaMynO%j%lAJ90reT}TZ?MC-+cP@{>yI%_kd^be!O`9<HOhA@4x)|^5gG|
z4?kaj`t{-iP~_M5Uw?o9{r~yLpYv~j|N8r{zPb7Dzke<5^<CZ7|NsA+*k8V2M$YW1
z1=A-LFQ1dKWLDOHFkql1Q2fcl$iR@mpaZf56ekSq*BcUIn_FTT7&|%{65@jT`gxQh
z;-?63_w>2Va+8UdnlB|Hn-CS`;OH<*K3-z2gs?(Fbda5cx4W-myyPB9A(e!fAZG_3
zXJ_?z@zdgh$_bG{9u9sko@();w?z3>6T*W69qjGBwBl`TTy5pF6T+6Q@b}k<XR@^w
z<JC+E2{Jcd=CG6Tv3FxLtH1#UWf!i#cK+C!K!?D_M)8C)kDCW3CU@&|I;lw<P<ni<
zPdcYY@xY`5jZz6E9xI(DKjRU!D70F@sMdadzGc!02`>}28H+t8Yq1J*FjxZsdPxxm

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/checkbox_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/checkbox_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9cacb96dca98b0bdcf7e7bb62e491f8760b244ce
GIT binary patch
literal 343
zcmZ?wbhEHb6krfwxXQq=a?`PC3wLx+TirNeg?n^`Z$foW?Q~<me4Ee`+t6Z7k8C5q
zyubhczy10D+n@hG|Nj5;@BjN>|F3@j|LW)e*FXQi`}P0h@Bcsk{(tl9|Jz^xzx?_C
z`q%$=zyH7g{r~fy|G)qJ|M=(sx4-{?{rmsx|NlS#|Ns3D0u0mxia%Kx85q<UbU;Re
z{KUXk;xM_uLr1FLt+D82h!E?f6(w2~US^XyRlOMlRyk|1P0ma)XkcQ~X$jMk^;6+}
zu)+6211k%c0E3uVITIrXvm7%ggOrq9vk)UU8#^PP;`DxgW-exaasCDU^73qp<&~6_
Z`&9)5RC#y=cvPBww|VT?>F&s24FDJgfQ<kE

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/clabel_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/clabel_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8588b69e0df3aa4f285b56f7ca027e78e7f52440
GIT binary patch
literal 341
zcmZ?wbhEHb6krfwxXQrr{m0+$KmL6E{^#SD-(SA}{r>Z>p<h#OW&fpHFE8DC@$u`Q
z7w><)`ta-BXQ1q#^EY3-c>nX`*WcfN{wc2QK6mrQ+t0t>eg5_0!>{M>f4=$%WB|#Z
zZ$JO4ZfvV=Y`yyYadTTkPft}(PxX|ErBf%C%$=6Ed``yVS=n=^=KufypMhea_>+Z^
zfkBf&2V@e+PYi5D2c{Hw=t%XSP`P*{$7-(A<#eyLe!hn;vmbt2WvHI`lKEnWLU(uN
z!pH?Ji~ZY@ZrJb?+cc|))Jk!%$ux>`vWbZ*Iw{Bt_VqFMa|tRq$;tE0<YSu6GLuEt
gNm!nNkx__YB?IeHVJG$t8#it8+PZDKvm=8w0C~-jY5)KL

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/comboviewer_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/comboviewer_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9ac63fc1dcecf6a36b29929b1c488776314a7ee2
GIT binary patch
literal 946
zcmZ?wbhEHb6krfw_|5<VUfD~ds@Eo0ugxxQ$u6Ff-Lkg0WodOwOLfoEmMKenfN0Lr
zDN~B4%vrj0PWIBR$ChqAxA)k+bMOD(d;k63`~T11e}De||NHO%zXQ?#Q7{?;Ln#Dw
zKsf-E7Z^CEGnjM8cx-sk#?B$E6;n~rbhw>g-sR4PgeF#Q5xul60fr4NY|;Wg2PPbJ
zVw<GqI*Wy2fdeCxUi`5skquATm;@As8V+1mYvvSb;##`FVZ~WiF@3GA0VXSaSv{vm
z1tf?ZXk+ozkGN2!=-9-}nIku&V3W?tjeNOM3fX4PZH&S;w_09bTg$e+#Q27YLBrDf
P`|H`6<jxo=FjxZsD6AW;

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/composite_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/composite_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3e53cbdc5fc65bfd4f7178bf328195067ae8b7f1
GIT binary patch
literal 377
zcmV-<0fzoZNk%w1VGsZi0M!5h_xSzx_x$+z{rC9%_4obu`2F?w{PFbr^Y;Ar`Th3z
z{B3!U@%8-h^!xAg`fz)V=<oXK@cQZR`R?=k?ehBb_WN{wis<k8?DG5S@cHre`}g_$
z?DG2W^!x7f`t|ty=<xdI@A>NS`tbGp@AUfU@cHWT`R?@ld4PxR^!k5;gnomA)#u}c
zhk%5Ke~OEHii>=Zj(3obc$JcLmXdUvm2an<Xr!8IpqOo(lyLw5{{R300000000000
z00000A^8LW0024wEC2ui01yBW000J-K%H<%EDmkRq*5ugv7XTA(<Z#JLfEV}bQ9vP
z+bvF5V@XP-3j~CQlps0bjAatlMfeOpLKDhZ7#JKB9EFA)F+wmb9Vs3s4ih8}krOXM
zEi4)h8X5;92O12WE<!6T6$q-Ss;w$QC@cg9v;hVRvmXQ~LKZ9l3IiJj1pojE1qv2I
X4=e)D(9r@9LJQW{*w{wfLqPyLJ_p1#

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/coolbar_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/coolbar_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d71af7a63670c491919e94f3312ebf786367197c
GIT binary patch
literal 613
zcmZ?wbhEHb6krfwc*el+`SY*SXFr`j`|<vR&kr7ce*EOy>2n`1Uio_U`lnZ~f4+PF
z>;A*fZ{B{tb@%Jzr(ZvP{*{!`my*?A-@2-%X<0+ts=AgH4Q(r5zW(;<^Us*%jsu4;
zz5n>bJAbiGc)wxvB=dx6R>?DLQ)fA3%yrC|>yka+J$Ip3!D8RyW&S10{Y#ezmaWhZ
z>(vSG)r*{97&FN@cCvBYWV3{6mOx!;vs}tn?YjDQ#p#zDFTOc=^PS(EtHJZGrLMS@
zxAtz;=KFJwJ&##(qh<G_iHDxN{Qm#rum5j<{{Qgn|C^uxuYUgj^5_3IK#^bnp92N|
z{6BnPQ+ASF76{pAC)po4u&E-`x~<TxBEx!0x#8pr!?psmxi$L#|Nm#8FHro+!pOi7
z#h?SS78EB8?1vhnnwnc$+uB>TWp(uo42_JHR8(cuHMOElEUoOVZEPJJ?aa(gEoNxz
z=*sEKD<~>YR#VrQAt|wA=T2!JadDw20Y294JNAhSFmtnr9OUIV#L9n}L5k!0Spjw?
zf%9B)52P5`m~ILP-eTf>z$qmvEGiZi>FzGT#`gNP)K~Y&sPI08Mu&iAM_##>iijjv
z?y1UdlT;L)To$<$cx}j7S+s;>vXb)*14$#6IqgcpTWlIPUGkiw5wOT4Q)%fkVV4dj
HMh0sDrS0%9

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ctabfolder_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ctabfolder_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7a93c669a28b9def0f4417da1100024b1be8f1e5
GIT binary patch
literal 367
zcmZ?wbhEHb6krfwxXQp_;h1FMnCRdUxpLDncdtMP&qynecq{j4O^<AM|DbPw|Ns2^
z@7tfhFMs^>3<&TF2zc@1$E%+|UjoS=Ki>TO`R>=R55IqZ{`2R{@8944{Q2|m->aWL
zKK}mo<<IZH2+yE!&!{M;s3`ZOM91Vr#~-gdQ=+xXvMtJTEQ+(NvXg<x`s0&%6*=bp
zO`hHL-mTd-iFUmI|NsB@?;nt4AOa}<WMO1rFlNvJsRj9ofvxAj%mNP`q1dI9vcEMQ
zjB~rLB^JHYBSNSoV^LM|+6_C7&YGF>;>-2wSqn`*RInPZ;1MvqqO<kIZ_DyVLoH)v
zp7st|ajp^xLnUKHiOEwW8%x9$jOE4V&MPi0=aDn!7hS$$$|^o%PLcH+=51mzX64<!
jgI7pUNLX5k$(T*x$kAg**^L=bpE-M$!R?~6BZD;nsdSp%

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/group_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/group_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d91ebdf84021e7d55738e2ebf35e274727d4ee8c
GIT binary patch
literal 398
zcmV;90df9ENk%w1VGsZi0M!5h{r&&`{{Q>@|N8s>Xnv{m_x<zs{QUj@`~3d;`~7f+
zux)vd?(_Wd_57j2_lKOoaC?pD@A~ib{O<GnbbX5X`~LX){q6Jn@b&!f^!xYv{`UF(
z=kNLQ_x<tq{Pg(!@Adq7fQR(>{P_F+_xk<%{Qmv^|NQ;_`TYKWgM@yAgZ}^j{r>*`
z|NexBfP{yCii>-Si+qrdcaV;Fm6CLpl60GuZ>OASq?&4=m~EVtaG95t|Nj2|{{H{}
z{{R30A^8LW002G!EC2ui01yBW000K7K;LahEE<K3$%JvaOfF341?S6QK#r_7E6GT5
zK3l`%;F!-2&sgW9?K<U$f<WLn47**ez56&KfPoGo1$sU+I~!YD8yh<^J~2BM79$oU
zBpQ^IJ1{;jI~4;7q9`a8q7^$YJ}Ns10tm7tva$j@DLx@PC%q>JzX!l4J0ZF|0RYJ+
sEX@Hu0L4BOJ3KurEh_=r+&dIL5P9O`;}AXz=;`X~KJD)B@IFBRJC?lOwg3PC

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/label_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/label_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cf00ad26ffb8b308cd51369b5544187ba14c8002
GIT binary patch
literal 582
zcmZ?wbhEHb6krfwc*el+|KEQ`2ByFNfb{>9HxB;$|M%MMg$c=KiAffnU0EHSnI0ZG
zo}Rj$o$3Go|Gjl%X=g`fa-zkZn@hYr^lx8Ze*gBGmZr?-PY$LeSoL&fT{zZw<#^?-
z^Zie5FFCv^;po<^6T9-y?k~G~tntIMt+!53m{KJ>rCNUH;(#3s19vPAI<_Ht=aSGX
z`-*NJt+{))f9Il*or}UQ?an>5CHu;rqAUA~uk0<qyr=B#%{gyw%zkro-qpROmv)uB
zxiR;|+O)kBH1|!^+BZ?>$aJHlGmMYTG&wxoY-SeU>>Pnvxk4KoB=>j9Z)=rbQzy5!
zUj9J0>d{H+d%HE(HL4xx(>~a*b8w>Wp@~MvrkU)YWYQJO(Hqa%6U#k4m9Ia6Z(g?0
zyd2@#IU<Yl#a5Jw&(0QGRUx^&Omao3%+Wse%?+x@rkGBM;p~m&o|3>bA(p4Wi+ftK
zKyM8H{7m85>B3v8#QS4-|NsC0@83TLU<m*J4<vB`#h)yU3=CxqIv@q0IALI4+)&ok
z+|t_C-pVG-&e_o-C?dqs*TT=uHKj?EN0KEi-O16>Db&R|B&<wKKs?3B&{)UH%+$op
zI-pFjEJsVx-@(p4$SyEg&!>!6LQPJ_*M^yauf*I>*}Ex~u~fyQ_)2jxlb39Alc%b*
zRD#82RtC!?rTFG7T?N-z_k6d+xEQ+wiXzL|xg<D(msosEa-HoIbuD4%qcmSJ%ghTo
MCy!hVRA8_M0M0Y_+W-In

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/progressbar_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/progressbar_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..af41a17200b17be03bab1c8bfc1fd22690b8c1b4
GIT binary patch
literal 327
zcmZ?wbhEHb6krfwxXQrr?a%-7Z-0OK{r}ys|3CizfBozKyWjsm{rUgx@BgoV|Ns2=
z|Hr@o{}22B1EM4T|BgleJ0AJ}&W!(eX8yZ9<3A9+JNJFF-<LhvU-o8yJ5u%IZ13mU
znxE(CeOY4tb+yZvb^b?ZCR|vYc4mIci8)D^mu8%po%H|ze+KFS#h)yU3=C=vIv^uK
zeqvxtahP1-p(E9QVu_Jwmeu?V%iJdKWLXuSop5_ig<&gKgp9@v&xI#kJ{fM{o#KBW
zL88TF0((pGjqjF>>`d%R$~=6$(hQy5(u@q89I6UpVsf(F(`U*ua&xgLEL^mB$wKet
LD^{*_WUvMRR+oct

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/radiobutton_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/radiobutton_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3901d05500d31f28a9df58e4089ec4e0c7a4b691
GIT binary patch
literal 166
zcmZ?wbhEHb6krfw*v!D-8J~Le=AGqxw{$J)&1y`2^y$vgn_K?>|Ifg{03m@4WT5zy
zg^_`QlR*b02r`3#CD`Dk=jy!{q6b}1GBFA~5{OYu5NUO+2vw9T$*r5bK#sAArTuK9
zkd{o1-K>Ne$`TVfq$ccm{kQ3|XQIQ3s|`Cm9SjVTHgDXhz>pGmW=lbu-*OiQ25SIK
CNI6FU

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/sashform_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/sashform_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bbbdd559a918bb27921ae8feb93d597c3c4cfb75
GIT binary patch
literal 378
zcmZ?wbhEHb6krfwxXQrr^Vh#0KmUIF@$cJ@zcmwfCsnV`Y1vfJzNNf(XZ@7DP1E+b
z%s7})HtGH6-(SA}O{iL#TDLZ{ab0ouw(N=t`BlAdKK}an_0O}nKTB%6UVixX<JaHf
z+O9XBem!~n<N5oaPv8A``SI8D_dni!`CZx2UeVBY{_XGj=H~jA=9c#QuI}my{pAz;
z%co5$UN9qP&eZ(bQwyd~DqcP(W67+n|Ns9p5CIf_vM@3*7&GXA)PnrPz&8EB%mNP`
zuH+L-f;6X0op+v9L`!&^*W4WU#;avfhr(YL{j3psyy>QD%Ty=D{`L=jry~!Aa<ZIC
z5vZ=M({j>Om5~t@6>9J7(sa^L<>ggUVxK&9nue2_s@MWCw)qRi)SZ-7`Bw7@u3E#V
z;v}ug#Kg=juyy+m2`3R%DJe!q)`N$Sh&TzWGMr=JKYN}**oo)*jhi>!?zlKISOWmH
C)28qM

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/separator_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/separator_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..579587dccbec503e6dbd01273afc3f362288064a
GIT binary patch
literal 868
zcmZ?wbhEHb6krfw_|Cxa^Vh#0KmUIF@$cJ@zcmwfCsnV`Y1vfJzNNf(XZ@7DP1E+b
z%s7})HtGH6-(SA}O{iL#TDLZ{ab0ouw(N=t`BlAdKK}an_0O}nKTB%6UVixX<JaHf
z+O9XBem!~n<N5oaPv8A``SI8D_dni!`CZx2UeVBY{_XGj=H~jA=9c#QuI}my{pAz;
z%co5$UN9qP&eZ(bQwyd~DqcP(W67+n|Ns9pjDpb+pm7K&{$ycfU@&IT0oen}6AT=V
z4Cx#)9vc=MY~~QwiaD`ip(6tW6Hh^cqf0A~oLz}Vpp!x~JF9|=L4gAk6BDP1PKV-z
V#iyqm$ex<xxp|pyJ0l~5H2?)$gysMM

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/shell_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/shell_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..37aad784dd4e7aa04e1ecbfbc79e9b48c6116943
GIT binary patch
literal 358
zcmZ?wbhEHb6krfwxXQqg*tsL6dsjx^p6m&Gb0_V~pS<6_e6?rA8t<xgel_cZ>NbQm
zZi;N#65GD*$FDz^pME*>=<|~EZ+6}KaOD1{jLi@8wmmA_^|)c*)1D*Gr=NVa{_4B0
zzy5yv_2<#Ie~-WY`~2(gy>I{TfBXO7+rNk3{=NP6@8hq(Z+`uI|LgCx&eTPHv2(i<
zW_G3Qo8`TGhVS<20h^`-t(_dUd_vU!|Nj|?1ByRc7#SFh7<53&L4IOjYj&7f;Gx6C
z+s3T4Fv38pp&`LRKukmQH0$Kf3>D!Miwk`8W}kntMJu`S-iIHvRZC{S`?04}FT3$e
zgRYaFqDotPhl-w)zM^{ngo*0<P6kS<GiJ_GHE=RimS4DNvAm&^rmXa;)oY|RowVd+
gHgDM~qvfP6$G2ziK0a+Hjl)Nd9(6n6;>chP0Fl$Aa{vGU

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tabfolder_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tabfolder_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..edd6060d56111462e76a9d24fd82ad3987855ee4
GIT binary patch
literal 607
zcmd6k&ri~E9L7IwZ6t&-=gCl@Fz}ng*O{rIfQZ0n9qQgiHx4eH2i+R38pscsV+D(b
z)rv{3b?MM8+PbuLvHp$L0*#3{{JuXw!~Tk%`|I^Q+Y`p2$*DyXGNE4x2_csrJX?w7
z*B<6pHu7taavO;(7c!Q}0vD%@w;4a7tVw8#vO^#ZAT<qY0KYY@4p7sy1Aw}w{UPKK
zph3tHrA<m(jI}6j^A1bfjDhH=7;sL7Ae?h4ndmf2E<_!)27x0=nv|Td4#G}3i>Ff{
zcs!HjQZT`@+mG{4W2NGH{z*(b*xo6wNAD?bN~`Z*FYUd$-~3tLd%0XLt>)slGt1M9
zUZa%qpI)N>J~lXi4k3(&&z7Ejf^=UJIGIXk(!rUTAf69}=C^{g;qYwG^TJa|`JR`<
zzRKGQ_C*}ZxNc}jK{|(H+=u<n!9nNE&(-Ru0QPp-uh_fB#_Zp|Uz@|z2AgWRYO(1@
z^#)a)!nds50|V}h?*4A8+uA>gCoa3ptr6F;(d-(Tz&H9#CiUY&Wpj5cH5|2%7QP1N
vvX?Age<A8m=X#V6)w`R4jN!V{8wo5V_lwRu`bf|2yB|BMao^l~0eSuc=ppg`

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/table_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/table_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b99b45cac109f6a9674e281283eaa18a87e00165
GIT binary patch
literal 573
zcmZ?wbhEHb6krfwc*ekxSJn69_y6+xj*5o%AAkP8{Qm#VkN>Z~|9k)Q|Mx%t-~asg
z`|rQ|U;n@U@$br~f0sZ0z4!J1<M02Ud<V+@`}OzV?|=Uq+ZvmIs1=ABdV4E-dn#v4
zE?PJ<XTgk|1v7JIOfFtNCu8A^oP{%T^HXiJlI-(S?S3B9{C!%xEW_se0hNv-)A}5X
z`do|h4D0W^6lPQzPAD^)P-@&!X!dop^xPW#8I^{g*NDHL$M<Qe(7PF&ultzZPGVb{
zD!L?DY)O*XqImH|F%mtI>I)+!7lcX83znW6AUnrbZnn4lEKm7a?h60^|7RG)K=CIF
zBLjmsgAT}zpg3V*pVi>q)ZEhA*52mj>EZ6?>f-F^U~gyJ>|||YWnpP<qOYZ{F|Dbq
zr*FcfDNDRf`S|%2H*DN&+HA_t%Br|)_ug$y21;^DN0sH|<z!{envDe5coo>$*krD-
z88&P4aBxU-adAjJ<S=g56_<GZT1--0TvDf5Q&5<NiIY>9nemrivxmou4Gave%?w&H
VCWb3o4z~-)E6wt_7@)vl4FI!MxNQIc

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/text_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/text_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cf20952b60e303848367cf5f8ba874246cac6d1f
GIT binary patch
literal 343
zcmZ?wbhEHb6krfwxXQrLF?HRyAAfphtlo9}{=3h=zyA2^owq2ZWoz%u)em3&c=+o3
zi}ybtzW(w43sCCMgV#TvzyJCE%dZEozrXwPd+OY!Uw{7n_VdrzpMTE3{XKv2y!ngf
ztyno@#fljl*G=5HxqB0k+|;vwTgU(Z{~2fl6o0ZXGB7AH=zxp|`H6w8#9?BAhYlZa
z`@w?=IYzVnGz?u#1J*~Z;%GT2vFm}sG38eYB5bV62d8<+@gH+Pa?pXNn>A(rd1o^v
zNeN*#7T$JVLBS3wB@qd6HdayAsf>(M#YB`iB>33)_@*;1Tqw?@#ITBO)!KEdT>OJJ
PZg%(d-n!Gtk--`O1IB$-

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolbar_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolbar_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..64173281d286c3eaad051b4f19e6393d1e6f7f40
GIT binary patch
literal 607
zcmZ?wbhEHb6krfwc*el+;K8TUXMyPB{Rf{PJp6qB!KcShzMVez>D1Yer_X)7c;)NW
z>z}gnrrdw{`OVw!8M%|wvil3m=G?mb_3_iMNf~`9S^YUhGfJu!<d@DUuU%B%x~isW
zSwq{Zx|S6UZ7cU3zW?&|w@;sc#w2%CHY|Dn@kd74B=7viI^q3>(UZ&*rdcJ=uuYxi
zkTKUWW3Ef~eD~aiUImMNi<kMAEcY*69$2<QJFHhHyjL%Bf?>=g<Jif@ag)swrda}Y
zrOk3FTea)z+ZCr@ZoK&B;LUe_bFK!@yOz4*R^HmXRh#e6Ircne$&HrXk0u^^^78xt
zkH7xE{rUgHum5j;{=fS9|I45M-vC8^{eS-R|HnW7Km7Thon)5<LiX87_7$1dZG~nP
z8P-$E4JTI^wiTGot<nGg|33o_fZ|UUMh1pt1|5*upg3V*-_wxX)ZEhA*4}EWZf;>^
zZDXsWr>|ycY?5r}?BeO_=I-U~;oxZRG{e-)T*FdROIvrcfuYe1CB+>(cdGCyC`cuX
z2(y{;s<N80sxmP1vdA11;^vmWa_#En3nE-h9GvVAm>3^%GTjmp72xL)lMob_RF;;N
zOHK;>@$=Wuq~wIapj9kWlv+C-n?v{YycA+RHAT~Jj?Em4R<9X`af@trep+&Js<y99
d)W%OOr)TIy1ti_v<m&A`U1y_$lL!ZcH2~+80Q>*|

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemcheck_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemcheck_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9421f5633a48b475cd4720da3e266a93d98198b4
GIT binary patch
literal 354
zcmZ?wbhEHb6krfwxXQpVsiCX0y05lma&FFy*yMRHUwxT4ZRhIsr|KFe>^*R8?}4iq
zE<L(%>7j4b(%B0R%vpF~_4<>u7amx({?y)s*Y+N~dg1b;3zr|-2CaJZ<gJF=W<&4w
zkDk7L_Tt^jO~)3m+BI$Aj_zrz8z-!AkFLn6oo?)xZyQ>y>5*;Zm-p?@|DS*VzyJ0B
z>gWIOe*ORW`~Q!>|G)hC|L*ty_rL#t{`3F$zyBZq{Qvg%|F3`lA%FoJQ2fcl$iQI1
zpaYTw`H6w8-eFFGhmKVLi6<8rGOXtNG3y2Fh+H4hr`{lZM`mLCVMeXlXPa+7RIqe#
zSiPf$Rq2jKmrD{;`q2a}Sxp6Ab8b-{Zm|Mg6BBtQGX-&TiD?qj1&T(Bs<QeDQgR$i
qmMF-pE33$Bm@2SIZrn6WO;J;?*}cG6*?8ZiUFqpwM~*l$SOWmyD5_ro

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemdrop_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemdrop_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c03f91d8cbad19bab0900416e494319e192c2117
GIT binary patch
literal 607
zcmZ?wbhEHb6krfwc*elcUc3ImgHNZ=0@26&4?aJ5`1$^WPmiB`JALlcsk0wXpZj?6
z%GaycKV{`jx&QF<o44OHawn%{_ZODUxpnvJ<ELMfGWt@o`g4kAlvFLqFP%|dyQsc(
zRZY{fhPG98Eh`$@R_;4||K;m%pFaPLNa%=3?x<{7^7Gff_aA?J{r)GTY|@eqC*FMg
z{pI`LAHV*^Rjf#^S&`KMM9X&_zyI*%kB2Y6fBgC<sb)n{+w$t3<uyIamux(K@5PS?
zFMr&B@%`(MzutL^irSY~_b#vLU7lOk{P5L}CvSfI`1QAC^77_M%W}$^zyA269oE}2
zd0F@LWzXOL{PN>(_l#u|W-t5k`|tU;zyJUL&oIzH@h1x-149Ud4#**(IALJl(-6|s
z+|t^l+|k+9#So&RG-2XIb$&%f=@3y7c5gmSHg7gfMixF+*_pyTJPK>ptzErBl$)88
zi(>~f(=IONO`>9g0=(jqLK0G{GIH`w&cPQhUhveivhr*S40gG5*Co)z*e0;aH`w*X
zOV<EfTWjAYk6^zqU;TXETDvzn25bLk2xmDs(V2tK(R|sJh!Y#wCS;hi9Gua_)XFcS
oGf!jY4`(+XNBw16CL|qc5fN6)@iDygs8vDSAo<i3Ne%{U0C33r82|tP

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitempush_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitempush_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..619f79d6ba88d1c13c79972f98a9a7a7944bc22e
GIT binary patch
literal 216
zcmZ?wbhEHb6krfwIKsd%p`oLrqNAc<LPo}n2@`g#SaIUQg$EBFyogAcp<yvY!(oF(
zzy^<q1px^wA~H4<G@PjDxKPk=V8((276B`E9JuiR|9=L&K=CIFBLjmdgAPa)$W8{<
z&;-@Kl+1Y<t5&f**!RIZ<RJ6i3OQXzRfkCn3N$h~w3s~-Pv(e8HFGgJt&Cbfg>BKH
s28n$SHY_~2!bhQfOI2-#&l$e98ozWE5z(fk^Y1^WYd1D&D>7IE0Mn{Y0RR91

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemradio_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemradio_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3cf1226406df3c017362975760fd80e5273b55a9
GIT binary patch
literal 563
zcmZ?wbhEHb6krfwc*ejmsiCX0y05lma!tvk+?*M)$@5;m`ttb6+lkY5u3mqtu3^I7
z1K0K*xO(BzqYIZF`bI6Cz2Lx{g$GuzKRJ8hfmQ2I?LByH@4>4VE<d_(`Jrvlsz*=W
zYPfAS^j`ny>Dy;7-Ys6W>)PX2D_5^sv1;|rXD@C(d%kSt%H=CpE?co;)tWW`{{KI7
z=labTk565{bo0fdm!ICv+p_A^^^1uWxo7WP>s>tK_y50rOJ=<M^mgI4RfjL1s_1WQ
zn%vnqsiUl~zG6b-!*|ch`|4X}b~n%H+J0)+wv#)rKDz$q+nb3?dL}LD`Tg(LufIR<
zzrFGB!;SlIuRnZ$<NyEv3=9kq637@NK=CIFBLhPKgAT|&pg3V*pU@D{)ZEhA*51+C
z%)!vx*Wbqxz{ut|ZTbv3dBy-HKLKGufyKfW4wg2?%mFNZoSY(@LYyv!*1leD=B})M
zVm#d3qCAdPeu|2IPFnnayyASk65_Vr8vg!D9y*eKQun1~+3kI<`>S~>%gA%ReP`<K
lr>gF!t;Zq#^Ov-pzO#vDR6_uZD;tlH8HZNP2?GHJYXGTk)=~ff

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemseparator_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemseparator_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..81d54f3192b7255ee504a683afe2e25fc72a0140
GIT binary patch
literal 608
zcmZ?wbhEHb6krfwc*el+;K8TUXMyPBgNL6VKlyg*?8npRK3=@?_3HIc_aA<K^Y(j2
z?&P%W{#$pyK7RT&DWfkXtG}dbL3!<>`qou7P0JeER@JqvXlPrx@9_PXufKiz{4*xG
zqq1R%gHPG}k3U?3YO4DVR`(rfoO-aReN#r+B>SL}_Spv&oGKKZD%3q{z4I6Ag!dap
zPjbng@1DERt6;Hj@iPCC<^HA11It!ST5+7os!ltsS0}tzFLHum%p~L3$;NS$oys@3
zl&uPH+qUcK+ZCr@ZoK&B;LUe_bFK!@yOz4*)|_L{W0u@_`ThULU;p3!{Qu$C|2IGX
zU;X_5<<I|bfFi&CKmYmv<DdT@{`}8QvdaP?`|Kq9icIUaLbHkt>nY`ilPe6{3e4u#
z=>G=;23i8epDc_F3<(T6AWJ}T!oa?_A)%?crM0ao-n2czOxwcJTD?<KS5M2p$T-2)
z*~Q(}rqj;N!O`AnmYKPQj+Msbsrm+nv!tcAOPO?<NXc<YN(v|N^Rbw5s&=ZWFdSzV
zJ<Q9&A)(Z%eC6f^es(5SHib?_MkYo!rrZ1iJlwLK@`6G#B4XkRalSu)cK-Smmk=|{
zqSMGga8fh-;vB}wOF1X2`%lqm^!Ug*MK58CNu*J#=OoSGNi|cHQaQy8Lf0%=QuMS-
Pbh>_YP~;X30S0RTeCPCY

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tree_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tree_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..82b3bed1240131ea22e24beac479e32353ee01c5
GIT binary patch
literal 372
zcmZ?wbhEHb6krfwxXQrr{m0*L-~ash`S<Jhzu$fU$v+>z{Qmsy&$l0cax42|s#Yb`
ztxap*IC1Img6iHE?|;4e@ax^@-)}$t`uy#8PS^I5+O8Mxf4=$j`{UQ&MH6<FP1*P6
z)35hmet-S(=f#I#&)@(2@b&kL4?kah{8`!1Uf<kO*W7&d`Qw)MhL-mFuI}ot?wSdG
z<rDfUrcNrEHmPLx)coahGM3EBS}-Gb&Xj`x|Nk=(0*XIb7#SE$7<51iL4IOjo9HmB
zz(a>C@x+p#N)yZZ0qQ;y#+vKquQ8JrKDCDTsQcuF24ayjKcw!BlA9Os!f-xkwA#cZ
z<(oO{ss;3%bkxKf8WIJiwVkxoWVj?G*c2Kh1T~%1)g-vs*@YJ@me6ogRTJi7Wo2Y-
xkY!hKQdVQ`2v1~TR(29qV_-UTsDX(?)QL~+@R>7wPMjAnUB2vg&Bc+y8UU-9s5t-t

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 475fb90bde..97ca0695dd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -23,7 +23,8 @@ public class Messages {
 	public String ModelTooling_Common_TabDefault;
 	public String ModelTooling_Common_TabSupplementary;
 	public String ModelEditor_AddChild;
-	public String ModelTooling_Common_TabRuntime;
+	public String ModelTooling_Common_RuntimeContributionInstance;
+	public String ModelTooling_Common_RuntimeWidgetTree;
 
 	public String ModelTooling_UIElement_ToBeRendered;
 	public String ModelTooling_UIElement_Visible;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index b45be4ff6b..d517011088 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -19,7 +19,8 @@ ModelTooling_Common_FindEllipsis=Find ...
 ModelTooling_Common_TabDefault=Default
 ModelTooling_Common_TabSupplementary=Supplementary
 ModelEditor_AddChild=Add child
-ModelTooling_Common_TabRuntime=Runtime
+ModelTooling_Common_RuntimeContributionInstance=Contrib. Instance
+ModelTooling_Common_RuntimeWidgetTree=Widget Tree
 
 ModelTooling_UIElement_ToBeRendered=To Be Rendered
 ModelTooling_UIElement_Visible=Visible
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
index e0d490356c..fd80845dd1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
@@ -103,6 +103,32 @@ public class ResourceProvider extends BasicResourceProvider {
 	public static final String IMG_Wizban16_typerefact_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.typerefact_wiz"; //$NON-NLS-1$
 	public static final String IMG_Wizban16_extstr_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.extstr_wiz"; //$NON-NLS-1$
 
+	public static final String IMG_Widgets_ctabfolder_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.ctabfolder_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_tabfolder_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.tabfolder_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_shell_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.shell_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_group_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.group_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_ccombo_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.ccombo_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_comboviewer_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.comboviewer_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_table_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.table_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_tree_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.tree_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_sashform_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.sashform_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_text_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.text_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_label_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.label_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_button_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.button_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_composite_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.composite_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_progressbar_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.progressbar_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_separator_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.separator_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_clabel_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.clabel_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_coolbar_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.coolbar_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_toolbar_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.toolbar_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_toolitemcheck_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.toolitemcheck_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_toolitemdrop_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.toolitemdrop_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_toolitempush_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.toolitempush_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_toolitemradio_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.toolitemradio_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_toolitemseparator_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.toolitemseparator_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_checkbox_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.checkbox_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_radiobutton_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.radiobutton_obj"; //$NON-NLS-1$
+
 	public static final String COLOR_XML_COMMENT = "COLOR_org.eclipse.e4.tools.emf.ui.XML_COMMENT"; //$NON-NLS-1$
 	public static final String COLOR_PROC_INSTR = "COLOR_org.eclipse.e4.tools.emf.ui.PROC_INSTR"; //$NON-NLS-1$
 	public static final String COLOR_STRING = "COLOR_org.eclipse.e4.tools.emf.ui.STRING"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index fe964e6d23..8b934ef325 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -202,7 +202,7 @@ public void widgetSelected(SelectionEvent e) {
 
 	private void createInstanceInspection(CTabFolder folder) {
 		CTabItem item = new CTabItem(folder, SWT.NONE);
-		item.setText(Messages.ModelTooling_Common_TabRuntime);
+		item.setText(Messages.ModelTooling_Common_RuntimeContributionInstance);
 		Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index e2abbe9d81..f926d05ca3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -14,10 +14,13 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -30,10 +33,13 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -55,6 +61,10 @@ public class ApplicationEditor extends AbstractComponentEditor {
 
 	private IListProperty BINDING_TABLE_CONTAINER__ROOT_CONTEXT = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT);
 
+	@Inject
+	@Optional
+	private IProject project;
+
 	@Inject
 	public ApplicationEditor() {
 		super();
@@ -125,11 +135,27 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.AddonsEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
+		if (project == null) {
+			createUITreeInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
 	@Override
 	public IObservableList getChildList(final Object element) {
 		final WritableList list = new WritableList();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 146e20a65a..0e1f878fa1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -27,6 +27,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AreaIconDialogEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -60,6 +61,7 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -416,11 +418,27 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
+		if (project == null) {
+			createUITreeInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
 	protected void handleAddChild(EClass eClass) {
 		EObject eObject = EcoreUtil.create(eClass);
 		setElementId(eObject);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index f452e92082..9cb85eef7c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -88,7 +88,7 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 
 	private void createInstanceInspection(CTabFolder folder) {
 		CTabItem item = new CTabItem(folder, SWT.NONE);
-		item.setText(Messages.ModelTooling_Common_TabRuntime);
+		item.setText(Messages.ModelTooling_Common_RuntimeContributionInstance);
 		Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 13b8741b59..c22e08eb1b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -127,7 +127,7 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 
 	private void createInstanceInspection(CTabFolder folder) {
 		CTabItem item = new CTabItem(folder, SWT.NONE);
-		item.setText(Messages.ModelTooling_Common_TabRuntime);
+		item.setText(Messages.ModelTooling_Common_RuntimeContributionInstance);
 		Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 558024b341..53a58181a1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -224,7 +224,7 @@ public void widgetSelected(SelectionEvent e) {
 
 	private void createInstanceInspection(CTabFolder folder) {
 		CTabItem item = new CTabItem(folder, SWT.NONE);
-		item.setText(Messages.ModelTooling_Common_TabRuntime);
+		item.setText(Messages.ModelTooling_Common_RuntimeContributionInstance);
 		Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 3245d567c8..8aadbcad14 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -36,6 +36,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EClass2EObject;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EObject2EClass;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MExpression;
@@ -72,6 +73,7 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -440,11 +442,27 @@ public String getText(Object element) {
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
+		if (project == null) {
+			createUITreeInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		final WritableList list = new WritableList();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 3561de7cc4..5b1542fff7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -29,6 +29,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuItemIconDialogEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
@@ -53,6 +54,7 @@
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -60,6 +62,7 @@
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -307,6 +310,10 @@ public String getText(Object element) {
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
+		if (project == null) {
+			createUITreeInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
@@ -314,6 +321,18 @@ public String getText(Object element) {
 
 	protected abstract void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master);
 
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		return null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 19368822ec..1fa6af050e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -13,10 +13,13 @@
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -24,10 +27,13 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.graphics.Image;
+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.Display;
@@ -37,6 +43,10 @@ public class MenuSeparatorEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private EStackLayout stackLayout;
 
+	@Inject
+	@Optional
+	private IProject project;
+
 	@Inject
 	public MenuSeparatorEditor() {
 		super();
@@ -128,14 +138,29 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
+		if (project == null) {
+			createUITreeInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 1939c2f44a..1fe518a5c1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -35,6 +35,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -299,6 +300,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		if (project == null) {
 			createInstanceInspection(folder);
+			createUITreeInspection(folder);
 		}
 
 		folder.setSelection(0);
@@ -308,7 +310,7 @@ public void widgetSelected(SelectionEvent e) {
 
 	private void createInstanceInspection(CTabFolder folder) {
 		CTabItem item = new CTabItem(folder, SWT.NONE);
-		item.setText(Messages.ModelTooling_Common_TabRuntime);
+		item.setText(Messages.ModelTooling_Common_RuntimeContributionInstance);
 		Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
@@ -316,7 +318,18 @@ private void createInstanceInspection(CTabFolder folder) {
 		ObjectViewer objectViewer = new ObjectViewer();
 		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
 
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
 	private void addToolBar() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index c8fe39bd2c..71ed478853 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -17,11 +17,14 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -52,6 +55,7 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -75,6 +79,10 @@ public class PartSashContainerEditor extends AbstractComponentEditor {
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
+	@Inject
+	@Optional
+	private IProject project;
+
 	@Inject
 	public PartSashContainerEditor() {
 		super();
@@ -363,11 +371,27 @@ public void widgetSelected(SelectionEvent e) {
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
+		if (project == null) {
+			createUITreeInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		return ELEMENT_CONTAINER__CHILDREN.observe(element);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 7b018a32b2..b46d543208 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -17,11 +17,14 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -49,6 +52,7 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -73,6 +77,10 @@ public class PartStackEditor extends AbstractComponentEditor {
 	private StackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
+	@Inject
+	@Optional
+	private IProject project;
+
 	@Inject
 	public PartStackEditor() {
 		super();
@@ -307,11 +315,27 @@ public void widgetSelected(SelectionEvent e) {
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
+		if (project == null) {
+			createUITreeInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		return ELEMENT_CONTAINER__CHILDREN.observe(element);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 51bf75568f..c5f8bc0683 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -27,6 +27,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PerspectiveIconDialogEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -57,6 +58,7 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -388,11 +390,27 @@ public void widgetSelected(SelectionEvent e) {
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
+		if (project == null) {
+			createUITreeInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		return ELEMENT_CONTAINER__CHILDREN.observe(element);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 2cbbcf6890..0e6ba7cb6f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -17,11 +17,14 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -44,6 +47,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -66,6 +70,10 @@ public class PerspectiveStackEditor extends AbstractComponentEditor {
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
+	@Inject
+	@Optional
+	private IProject project;
+
 	@Inject
 	public PerspectiveStackEditor() {
 		super();
@@ -280,11 +288,27 @@ public void widgetSelected(SelectionEvent e) {
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
+		if (project == null) {
+			createUITreeInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		return ELEMENT_CONTAINER__CHILDREN.observe(element);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 6196954511..0e14cfdf3a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -15,6 +15,8 @@
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -22,6 +24,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.SharedElementsDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
@@ -33,6 +36,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -40,6 +44,7 @@
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -52,6 +57,10 @@ public class PlaceholderEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private EStackLayout stackLayout;
 
+	@Inject
+	@Optional
+	private IProject project;
+
 	@Inject
 	private IModelResource resource;
 
@@ -229,11 +238,27 @@ public void widgetSelected(SelectionEvent e) {
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
+		if (project == null) {
+			createUITreeInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		return null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index d0bcef2ddc..88110efa35 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -15,11 +15,14 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -46,6 +49,7 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -67,6 +71,10 @@ public class ToolBarContributionEditor extends AbstractComponentEditor {
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
 
+	@Inject
+	@Optional
+	private IProject project;
+
 	private static class Struct {
 		private final String label;
 		private final EClass eClass;
@@ -313,11 +321,27 @@ public void widgetSelected(SelectionEvent e) {
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
+		if (project == null) {
+			createUITreeInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		return ELEMENT_CONTAINER__CHILDREN.observe(element);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index b2b3382064..4cc8b945db 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -13,10 +13,13 @@
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -26,10 +29,13 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.graphics.Image;
+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.Display;
@@ -39,6 +45,10 @@ public class ToolBarSeparatorEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private EStackLayout stackLayout;
 
+	@Inject
+	@Optional
+	private IProject project;
+
 	@Inject
 	public ToolBarSeparatorEditor() {
 		super();
@@ -139,11 +149,27 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
+		if (project == null) {
+			createUITreeInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		return null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index fbb8f0941a..0e90d536df 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -22,6 +22,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -184,7 +185,12 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		createInstanceInspection(folder);
+
+		if (project == null) {
+			createInstanceInspection(folder);
+			createUITreeInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
@@ -192,7 +198,7 @@ public void widgetSelected(SelectionEvent e) {
 
 	private void createInstanceInspection(CTabFolder folder) {
 		CTabItem item = new CTabItem(folder, SWT.NONE);
-		item.setText(Messages.ModelTooling_Common_TabRuntime);
+		item.setText(Messages.ModelTooling_Common_RuntimeContributionInstance);
 		Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
@@ -203,6 +209,18 @@ private void createInstanceInspection(CTabFolder folder) {
 
 	}
 
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		// TODO Auto-generated method stub
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 8f100cf0e0..db0ce04681 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -28,6 +28,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ToolItemIconDialogEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -47,12 +48,14 @@
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -130,11 +133,27 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 
 		createFormSubTypeForm(parent, folder, context, master);
 
+		if (project == null) {
+			createUITreeInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
 	protected void createFormSubTypeForm(Composite parent, CTabFolder folder, EMFDataBindingContext context, final WritableValue master) {
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 		IWidgetValueProperty checkProp = WidgetProperties.selection();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index c302c3da34..072ba2f1c5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -18,12 +18,15 @@
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer;
@@ -53,6 +56,7 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -76,6 +80,10 @@ public class TrimBarEditor extends AbstractComponentEditor {
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
+	@Inject
+	@Optional
+	protected IProject project;
+
 	@Inject
 	private ModelEditor editor;
 
@@ -320,11 +328,27 @@ public void widgetSelected(SelectionEvent e) {
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
+		if (project == null) {
+			createUITreeInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		return ELEMENT_CONTAINER__CHILDREN.observe(element);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 024b7973e4..bd85be0f80 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -15,11 +15,14 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -45,6 +48,7 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -66,6 +70,10 @@ public class TrimContributionEditor extends AbstractComponentEditor {
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
 
+	@Inject
+	@Optional
+	protected IProject project;
+
 	@Inject
 	public TrimContributionEditor() {
 		super();
@@ -289,11 +297,27 @@ public void widgetSelected(SelectionEvent e) {
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
+		if (project == null) {
+			createUITreeInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		return ELEMENT_CONTAINER__CHILDREN.observe(element);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index d16e3b9d13..efc20524d9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -31,6 +31,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.WindowIconDialogEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -51,6 +52,7 @@
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -292,11 +294,27 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
+		if (project == null) {
+			createUITreeInspection(folder);
+		}
+
 		folder.setSelection(0);
 
 		return folder;
 	}
 
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
 	void removeMenu() {
 		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__MAIN_MENU, null);
 		if (cmd.canExecute()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
new file mode 100644
index 0000000000..e27d5befe7
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2011 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.uistructure;
+
+import java.util.Collections;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ControlHighlighter;
+import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.IEMFValueProperty;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+public class UIViewer {
+	public TreeViewer createViewer(Composite parent, EStructuralFeature feature, IObservableValue master, IResourcePool resourcePool, final Messages messages) {
+		final TreeViewer viewer = new TreeViewer(parent);
+		viewer.setContentProvider(new WidgetContentProvider());
+		viewer.setLabelProvider(new WidgetLabelProvider(resourcePool));
+		IEMFValueProperty property = EMFProperties.value(feature);
+		IObservableValue value = property.observeDetail(master);
+		value.addValueChangeListener(new IValueChangeListener() {
+
+			public void handleValueChange(ValueChangeEvent event) {
+				if (event.diff.getNewValue() != null) {
+					viewer.setInput(Collections.singleton(event.diff.getNewValue()));
+					viewer.expandToLevel(2);
+				} else {
+					viewer.setInput(Collections.emptyList());
+				}
+			}
+		});
+
+		MenuManager mgr = new MenuManager();
+		mgr.setRemoveAllWhenShown(true);
+		mgr.addMenuListener(new IMenuListener() {
+
+			public void menuAboutToShow(IMenuManager manager) {
+				final Object o = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+				if (o instanceof Control) {
+					manager.add(new Action(messages.ModelEditor_ShowControl) {
+						@Override
+						public void run() {
+							ControlHighlighter.show((Control) o);
+						}
+					});
+				}
+			}
+		});
+
+		viewer.getControl().setMenu(mgr.createContextMenu(viewer.getControl()));
+
+		return viewer;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
new file mode 100644
index 0000000000..f3f6e13ce1
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
@@ -0,0 +1,113 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.uistructure;
+
+import java.util.Collection;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.CoolBar;
+import org.eclipse.swt.widgets.CoolItem;
+import org.eclipse.swt.widgets.List;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.swt.widgets.Tree;
+
+public class WidgetContentProvider implements ITreeContentProvider {
+
+	public void dispose() {
+
+	}
+
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+
+	}
+
+	public Object[] getElements(Object inputElement) {
+		return ((Collection<?>) inputElement).toArray();
+	}
+
+	public Object[] getChildren(Object parentElement) {
+		if (parentElement instanceof ToolBar) {
+			ToolBar toolbar = (ToolBar) parentElement;
+			ToolItem[] items = toolbar.getItems();
+			Object[] rv = new Object[items.length];
+			System.arraycopy(items, 0, rv, 0, rv.length);
+			return rv;
+		} else if (parentElement instanceof CoolBar) {
+			CoolBar coolbar = (CoolBar) parentElement;
+			CoolItem[] items = coolbar.getItems();
+			Object[] rv = new Object[items.length];
+			System.arraycopy(items, 0, rv, 0, rv.length);
+			return rv;
+		} else if (parentElement instanceof TabItem) {
+			TabItem item = (TabItem) parentElement;
+			if (item.getControl() != null) {
+				return new Object[] { item.getControl() };
+			}
+		} else if (parentElement instanceof CTabItem) {
+			CTabItem item = (CTabItem) parentElement;
+			if (item.getControl() != null) {
+				return new Object[] { item.getControl() };
+			}
+		} else if (parentElement instanceof org.eclipse.e4.ui.widgets.CTabItem) {
+			org.eclipse.e4.ui.widgets.CTabItem item = (org.eclipse.e4.ui.widgets.CTabItem) parentElement;
+			if (item.getControl() != null) {
+				return new Object[] { item.getControl() };
+			}
+		} else if (parentElement instanceof Tree) {
+			Tree tree = (Tree) parentElement;
+
+		} else if (parentElement instanceof Tree) {
+			Table table = (Table) parentElement;
+
+		} else if (parentElement instanceof List) {
+			List list = (List) parentElement;
+
+		} else if (parentElement instanceof Combo) {
+			Combo combo = (Combo) parentElement;
+
+		} else if (parentElement instanceof CTabFolder) {
+			CTabFolder tabFolder = (CTabFolder) parentElement;
+			CTabItem[] items = tabFolder.getItems();
+			Object[] rv = new Object[items.length];
+			System.arraycopy(items, 0, rv, 0, rv.length);
+			return rv;
+		} else if (parentElement instanceof org.eclipse.e4.ui.widgets.CTabFolder) {
+			org.eclipse.e4.ui.widgets.CTabFolder tabFolder = (org.eclipse.e4.ui.widgets.CTabFolder) parentElement;
+			org.eclipse.e4.ui.widgets.CTabItem[] items = tabFolder.getItems();
+			Object[] rv = new Object[items.length];
+			System.arraycopy(items, 0, rv, 0, rv.length);
+			return rv;
+		} else if (parentElement instanceof TabFolder) {
+			TabFolder tabFolder = (TabFolder) parentElement;
+			TabItem[] items = tabFolder.getItems();
+			Object[] rv = new Object[items.length];
+			System.arraycopy(items, 0, rv, 0, rv.length);
+			return rv;
+		} else if (parentElement instanceof Composite) {
+			Composite comp = (Composite) parentElement;
+			Control controls[] = comp.getChildren();
+			Object[] rv = new Object[controls.length];
+			System.arraycopy(controls, 0, rv, 0, rv.length);
+			return rv;
+		}
+
+		return new Object[0];
+	}
+
+	public Object getParent(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public boolean hasChildren(Object element) {
+		return getChildren(element).length > 0;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
new file mode 100644
index 0000000000..9aa305ced1
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
@@ -0,0 +1,165 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.uistructure;
+
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CCombo;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.CoolBar;
+import org.eclipse.swt.widgets.CoolItem;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.ProgressBar;
+import org.eclipse.swt.widgets.Sash;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.swt.widgets.Tree;
+
+public class WidgetLabelProvider extends StyledCellLabelProvider {
+	private IResourcePool resourcePool;
+
+	public WidgetLabelProvider(IResourcePool resourcePool) {
+		this.resourcePool = resourcePool;
+	}
+
+	@Override
+	public void update(ViewerCell cell) {
+		Object element = cell.getElement();
+		if (element instanceof CLabel) {
+			StyledString s = new StyledString("Label"); //$NON-NLS-1$
+			s.append(" - " + ((CLabel) element).getText(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+			cell.setStyleRanges(s.getStyleRanges());
+			cell.setText(s.getString());
+			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_clabel_obj));
+		} else if (element instanceof ToolBar) {
+			cell.setText("Toolbar"); //$NON-NLS-1$
+			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_toolbar_obj));
+		} else if (element instanceof ToolItem) {
+			cell.setText("ToolItem"); //$NON-NLS-1$
+			ToolItem item = (ToolItem) element;
+			if ((item.getStyle() & SWT.PUSH) == SWT.PUSH) {
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_toolitempush_obj));
+			} else if ((item.getStyle() & SWT.DROP_DOWN) == SWT.DROP_DOWN) {
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_toolitemdrop_obj));
+			} else if ((item.getStyle() & SWT.CHECK) == SWT.CHECK) {
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_toolitemcheck_obj));
+			} else if ((item.getStyle() & SWT.RADIO) == SWT.RADIO) {
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_toolitemradio_obj));
+			} else if ((item.getStyle() & SWT.SEPARATOR) == SWT.SEPARATOR) {
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_toolitemseparator_obj));
+			}
+		} else if (element instanceof CoolItem) {
+			cell.setText("CoolItem"); //$NON-NLS-1$
+			CoolItem item = (CoolItem) element;
+			if ((item.getStyle() & SWT.PUSH) == SWT.PUSH) {
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_toolitempush_obj));
+			} else if ((item.getStyle() & SWT.DROP_DOWN) == SWT.DROP_DOWN) {
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_toolitemdrop_obj));
+			} else if ((item.getStyle() & SWT.CHECK) == SWT.CHECK) {
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_toolitemcheck_obj));
+			} else if ((item.getStyle() & SWT.RADIO) == SWT.RADIO) {
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_toolitemradio_obj));
+			} else if ((item.getStyle() & SWT.SEPARATOR) == SWT.SEPARATOR) {
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_toolitemseparator_obj));
+			}
+		} else if (element instanceof CoolBar) {
+			cell.setText("Coolbar"); //$NON-NLS-1$
+			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_coolbar_obj));
+		} else if (element instanceof Shell) {
+			StyledString s = new StyledString("Shell"); //$NON-NLS-1$
+			s.append(" - " + ((Shell) element).getText(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+			cell.setStyleRanges(s.getStyleRanges());
+			cell.setText(s.getString());
+			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_shell_obj));
+		} else if (element instanceof ProgressBar) {
+			cell.setText("ProgressBar"); //$NON-NLS-1$
+			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_progressbar_obj));
+		} else if (element instanceof Group) {
+			StyledString s = new StyledString("Group"); //$NON-NLS-1$
+			s.append(" - " + ((Group) element).getText(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+			cell.setStyleRanges(s.getStyleRanges());
+			cell.setText(s.getString());
+			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_group_obj));
+		} else if (element instanceof TabFolder) {
+			cell.setText("TabFolder"); //$NON-NLS-1$
+			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_tabfolder_obj));
+		} else if (element instanceof CTabFolder || element instanceof org.eclipse.e4.ui.widgets.CTabFolder) {
+			cell.setText("CTabFolder"); //$NON-NLS-1$
+			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_ctabfolder_obj));
+		} else if (element instanceof Combo) {
+			cell.setText("Combo"); //$NON-NLS-1$
+			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_comboviewer_obj));
+		} else if (element instanceof CCombo) {
+			cell.setText("CCombo"); //$NON-NLS-1$
+			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_ccombo_obj));
+		} else if (element instanceof Table) {
+			cell.setText("Table"); //$NON-NLS-1$
+			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_table_obj));
+		} else if (element instanceof Tree) {
+			cell.setText("Tree"); //$NON-NLS-1$
+			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_tree_obj));
+		} else if (element instanceof Text) {
+			cell.setText("Text"); //$NON-NLS-1$
+			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_text_obj));
+		} else if (element instanceof Sash) {
+			cell.setText("Sash"); //$NON-NLS-1$
+			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_sashform_obj));
+		} else if (element instanceof Label) {
+			Label l = (Label) element;
+			if ((l.getStyle() & SWT.SEPARATOR) == SWT.SEPARATOR) {
+				cell.setText("Separator"); //$NON-NLS-1$
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_separator_obj));
+			} else {
+				StyledString s = new StyledString("Label"); //$NON-NLS-1$
+				s.append(" - " + l.getText(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_label_obj));
+			}
+
+		} else if (element instanceof TabItem) {
+			cell.setText("TabItem"); //$NON-NLS-1$
+		} else if (element instanceof CTabItem) {
+			StyledString s = new StyledString("CTabItem"); //$NON-NLS-1$
+			s.append(" - " + ((CTabItem) element).getText(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+			cell.setStyleRanges(s.getStyleRanges());
+			cell.setText(s.getString());
+			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_clabel_obj));
+		} else if (element instanceof org.eclipse.e4.ui.widgets.CTabItem) {
+			StyledString s = new StyledString("CTabItem"); //$NON-NLS-1$
+			s.append(" - " + ((org.eclipse.e4.ui.widgets.CTabItem) element).getText(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+			cell.setStyleRanges(s.getStyleRanges());
+			cell.setText(s.getString());
+			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_clabel_obj));
+		} else if (element instanceof Button) {
+			Button b = (Button) element;
+			if ((b.getStyle() & SWT.PUSH) == SWT.PUSH) {
+				cell.setText("Button"); //$NON-NLS-1$
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_button_obj));
+			} else if ((b.getStyle() & SWT.CHECK) == SWT.CHECK) {
+				cell.setText("Checkbox"); //$NON-NLS-1$
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_checkbox_obj));
+			} else if ((b.getStyle() & SWT.RADIO) == SWT.RADIO) {
+				cell.setText("Radiobox"); //$NON-NLS-1$
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_radiobutton_obj));
+			}
+		} else if (element instanceof Composite) {
+			cell.setText("Composite"); //$NON-NLS-1$
+			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_composite_obj));
+		} else {
+			cell.setText(element + ""); //$NON-NLS-1$
+		}
+		super.update(cell);
+	}
+}

From 21ba38ee90a2e85c2307d576d30ea85e335c21ad Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 10 Mar 2011 22:08:52 +0000
Subject: [PATCH 0330/1286] Bug 339299 - [ModelTooling] Add scripting support


From 0d21227b387e8cc55d78bf9420d928cb57cc0a29 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 10 Mar 2011 22:30:58 +0000
Subject: [PATCH 0331/1286] Bug 339598 - [ModelTooling] Add UI-Widget-Tree
 inspector

---
 .../OSGI-INF/resources.properties             |   4 ++
 .../icons/full/widgets/menu_obj.gif           | Bin 0 -> 351 bytes
 .../icons/full/widgets/menubar_obj.gif        | Bin 0 -> 607 bytes
 .../icons/full/widgets/menuitem_obj.gif       | Bin 0 -> 348 bytes
 .../icons/full/widgets/menuseparator_obj.gif  | Bin 0 -> 352 bytes
 .../emf/ui/internal/ResourceProvider.java     |   4 ++
 .../internal/common/uistructure/UIViewer.java |  36 +++++++++++++++++-
 .../uistructure/WidgetContentProvider.java    |  18 ++++++++-
 .../uistructure/WidgetLabelProvider.java      |  26 ++++++++++++-
 9 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menu_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menubar_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuitem_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuseparator_obj.gif

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
index 43901a3af5..31acf1b154 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
@@ -123,6 +123,10 @@ IMG_org.eclipse.e4.tools.emf.ui.widgets.toolitemradio_obj = /icons/full/widgets/
 IMG_org.eclipse.e4.tools.emf.ui.widgets.toolitemseparator_obj = /icons/full/widgets/toolitemseparator_obj.gif
 IMG_org.eclipse.e4.tools.emf.ui.widgets.checkbox_obj = /icons/full/widgets/checkbox_obj.gif
 IMG_org.eclipse.e4.tools.emf.ui.widgets.group_obj = /icons/full/widgets/group_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.menu_obj = /icons/full/widgets/menu_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.menubar_obj = /icons/full/widgets/menubar_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.menuitem_obj = /icons/full/widgets/menuitem_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.widgets.menuseparator_obj = /icons/full/widgets/menuseparator_obj.gif
 
 COLOR_org.eclipse.e4.tools.emf.ui.XML_COMMENT=rgb(128, 0, 0)
 COLOR_org.eclipse.e4.tools.emf.ui.PROC_INSTR=rgb(128, 128, 128)
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menu_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menu_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9235de52db3a054121eccb9146ebcf6ce92c1324
GIT binary patch
literal 351
zcmZ?wbhEHb6krfwxXQqgUb`}<X>EDW*0#y(x~8r!Y~NTrX=n3{z3p=j^v+oM;{DH0
z-~PP$^lS3$rO)60{P^w9`!Byfef$05!_QYAf4=?v>-mSDZ$AI}^!?BGUw?o7`S;`3
zpFe;9J^%3I)A!$Be*y*n%$&FI3y|^q@9)3=e*FQGfB*jb_vi251&ih`TQ+meswtb+
zP29e*cmKAIJzKi||NqZGB2fIv!pOj&&!7X+2l5jGTg`##1s*z5{l}*joy-x9UbZ6S
zmC7!kj%LRI4hElfO4%W|a@>{&XCBd7XLK`H+#yOdbOwLg|BDGOTCSRkg)wn*nywmx
zvf_f=f`a_q8m<Zgt;GTguDoJmJYpg|JR%~zuAIU%<Aga~Sw#6Z3-QTt@v*ov@7cSL
L+2f$TBZD;n_Zpy~

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menubar_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menubar_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..64173281d286c3eaad051b4f19e6393d1e6f7f40
GIT binary patch
literal 607
zcmZ?wbhEHb6krfwc*el+;K8TUXMyPB{Rf{PJp6qB!KcShzMVez>D1Yer_X)7c;)NW
z>z}gnrrdw{`OVw!8M%|wvil3m=G?mb_3_iMNf~`9S^YUhGfJu!<d@DUuU%B%x~isW
zSwq{Zx|S6UZ7cU3zW?&|w@;sc#w2%CHY|Dn@kd74B=7viI^q3>(UZ&*rdcJ=uuYxi
zkTKUWW3Ef~eD~aiUImMNi<kMAEcY*69$2<QJFHhHyjL%Bf?>=g<Jif@ag)swrda}Y
zrOk3FTea)z+ZCr@ZoK&B;LUe_bFK!@yOz4*R^HmXRh#e6Ircne$&HrXk0u^^^78xt
zkH7xE{rUgHum5j;{=fS9|I45M-vC8^{eS-R|HnW7Km7Thon)5<LiX87_7$1dZG~nP
z8P-$E4JTI^wiTGot<nGg|33o_fZ|UUMh1pt1|5*upg3V*-_wxX)ZEhA*4}EWZf;>^
zZDXsWr>|ycY?5r}?BeO_=I-U~;oxZRG{e-)T*FdROIvrcfuYe1CB+>(cdGCyC`cuX
z2(y{;s<N80sxmP1vdA11;^vmWa_#En3nE-h9GvVAm>3^%GTjmp72xL)lMob_RF;;N
zOHK;>@$=Wuq~wIapj9kWlv+C-n?v{YycA+RHAT~Jj?Em4R<9X`af@trep+&Js<y99
d)W%OOr)TIy1ti_v<m&A`U1y_$lL!ZcH2~+80Q>*|

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuitem_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuitem_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b7c3c562a84a27efbd225a694b4e00311ddd0781
GIT binary patch
literal 348
zcmZ?wbhEHb6krfwxXQrr{qvviUx4WEx9`8de*cqRyE3O~Z9sf&dC%6i$?G~ME&ul8
z&)4t2fByO-q2piJzOi=F&gL0=J0>r0pL1aKj<cV?{q|3+{r>ZhcJ!>TKmKUuAJNR-
zsg<=;D|w}M%uMa@{(CRKzx(p*`_JFEUw_|w|I6M7U$$=O+qibp&Q0ArH}`DY(7%6M
z$KEYnd$)F7JbmQi>7)Pu|7RctDE?$&WMD90&;e-z`H6w8(qTq{hmKJAi6up$DW>xR
zGFHzJ@>LQzayVeef-bE?2?rul#8{eER;-HIeB0@1NC_tkqfLT-g`jCeV^gEEjADC7
zr=qm8tg>=`R7}6Dvz*F|nJTI?C7k6KEL^nEg->MpiWPjWVhR%r71&*c6t-^L#^uVn
Md(U1@Cr1Wr0A~!CQUCw|

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuseparator_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuseparator_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..16d63ff2495cf72b733d25700545d6bc28b6a506
GIT binary patch
literal 352
zcmZ?wbhEHb6krfwxXQrr{qvviUx4WEx9`6NW$nLy|0AR0C#&OU<dU9VyE3O~ZF$eu
zZ$JKg{r>ysuRn>E%Mz=WB~~u=PiiS_-&i|oXY-7`#jQ&dtCprzFG{Uh)IR6H>K$jF
zz5V&|>+kPB|9t!L`@yRp4_<wL{N~5kAAi1l|IK7ockku*hp&Mm-#>l({rK&Vr|*9J
z`1NPfr0Pi%s{{NjrcWuGJ*{xg^r9uRvlh(ET|Osc$*imeGxGj}0Rsk5{K>+|z+lOs
z1CjyxiGi*5z?=dP9ii+KOE!gVv78t1VogPIrq-0BE)zdo=-PNb;X*=>L~GL;j_jDt
zw^=yDa+b0%+9cdB6pa^aY--YXwrKC@?6Oqt?dzZ5%pyHy>Qok2cJ2JA7#TKK4kab6
n#Y!5BIb4O*=M<_7xk@UkZQZ7(AmJ(?$S=O{fPjFLBZD;n(S@u*

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
index fd80845dd1..1ef5275651 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
@@ -128,6 +128,10 @@ public class ResourceProvider extends BasicResourceProvider {
 	public static final String IMG_Widgets_toolitemseparator_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.toolitemseparator_obj"; //$NON-NLS-1$
 	public static final String IMG_Widgets_checkbox_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.checkbox_obj"; //$NON-NLS-1$
 	public static final String IMG_Widgets_radiobutton_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.radiobutton_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_menu_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.menu_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_menubar_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.menubar_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_menuitem_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.menuitem_obj"; //$NON-NLS-1$
+	public static final String IMG_Widgets_menuseparator_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.menuseparator_obj"; //$NON-NLS-1$
 
 	public static final String COLOR_XML_COMMENT = "COLOR_org.eclipse.e4.tools.emf.ui.XML_COMMENT"; //$NON-NLS-1$
 	public static final String COLOR_PROC_INSTR = "COLOR_org.eclipse.e4.tools.emf.ui.PROC_INSTR"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
index e27d5befe7..14eb553a4b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
@@ -11,12 +11,20 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.uistructure;
 
 import java.util.Collections;
+import java.util.HashMap;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.RegistryFactory;
+import org.eclipse.e4.tools.emf.ui.common.IScriptingSupport;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ControlHighlighter;
 import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -48,7 +56,7 @@ public void handleValueChange(ValueChangeEvent event) {
 			}
 		});
 
-		MenuManager mgr = new MenuManager();
+		final MenuManager mgr = new MenuManager();
 		mgr.setRemoveAllWhenShown(true);
 		mgr.addMenuListener(new IMenuListener() {
 
@@ -62,6 +70,32 @@ public void run() {
 						}
 					});
 				}
+
+				IExtensionRegistry registry = RegistryFactory.getRegistry();
+				IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.scripting"); //$NON-NLS-1$
+				final IConfigurationElement[] elements = extPoint.getConfigurationElements();
+
+				final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+
+				if (elements.length > 0 && !s.isEmpty() && s.getFirstElement() instanceof MApplicationElement) {
+					MenuManager scriptExecute = new MenuManager(messages.ModelEditor_Script);
+					manager.add(scriptExecute);
+					for (IConfigurationElement e : elements) {
+						final IConfigurationElement le = e;
+						scriptExecute.add(new Action(e.getAttribute("label")) { //$NON-NLS-1$
+							@Override
+							public void run() {
+								try {
+									IScriptingSupport support = (IScriptingSupport) le.createExecutableExtension("class"); //$NON-NLS-1$
+									support.openEditor(viewer.getControl().getShell(), s.getFirstElement(), new HashMap<String, Object>());
+								} catch (CoreException e) {
+									// TODO Auto-generated catch block
+									e.printStackTrace();
+								}
+							}
+						});
+					}
+				}
 			}
 		});
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
index f3f6e13ce1..5e74fa251a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
@@ -11,6 +11,8 @@
 import org.eclipse.swt.widgets.CoolBar;
 import org.eclipse.swt.widgets.CoolItem;
 import org.eclipse.swt.widgets.List;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.swt.widgets.TabFolder;
 import org.eclipse.swt.widgets.TabItem;
 import org.eclipse.swt.widgets.Table;
@@ -33,7 +35,21 @@ public Object[] getElements(Object inputElement) {
 	}
 
 	public Object[] getChildren(Object parentElement) {
-		if (parentElement instanceof ToolBar) {
+		if (parentElement instanceof Menu) {
+			Menu m = (Menu) parentElement;
+			MenuItem[] items = m.getItems();
+			Object[] rv = new Object[items.length];
+			System.arraycopy(items, 0, rv, 0, rv.length);
+			return rv;
+		} else if (parentElement instanceof MenuItem) {
+			MenuItem item = (MenuItem) parentElement;
+			if (item.getMenu() != null) {
+				MenuItem[] items = item.getMenu().getItems();
+				Object[] rv = new Object[items.length];
+				System.arraycopy(items, 0, rv, 0, rv.length);
+				return rv;
+			}
+		} else if (parentElement instanceof ToolBar) {
 			ToolBar toolbar = (ToolBar) parentElement;
 			ToolItem[] items = toolbar.getItems();
 			Object[] rv = new Object[items.length];
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
index 9aa305ced1..b7cd68a35c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
@@ -17,6 +17,8 @@
 import org.eclipse.swt.widgets.CoolItem;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.swt.widgets.ProgressBar;
 import org.eclipse.swt.widgets.Sash;
 import org.eclipse.swt.widgets.Shell;
@@ -38,7 +40,29 @@ public WidgetLabelProvider(IResourcePool resourcePool) {
 	@Override
 	public void update(ViewerCell cell) {
 		Object element = cell.getElement();
-		if (element instanceof CLabel) {
+		if (element instanceof Menu) {
+			Menu m = (Menu) element;
+			if ((m.getStyle() & SWT.BAR) == SWT.BAR) {
+				cell.setText("MenuBar"); //$NON-NLS-1$
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_menubar_obj));
+			} else {
+				cell.setText("Menu"); //$NON-NLS-1$
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_menu_obj));
+			}
+		} else if (element instanceof MenuItem) {
+			MenuItem item = (MenuItem) element;
+			if ((item.getStyle() & SWT.SEPARATOR) == SWT.SEPARATOR) {
+				cell.setText("Separator"); //$NON-NLS-1$
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_menuseparator_obj));
+			} else {
+				StyledString s = new StyledString("MenuItem"); //$NON-NLS-1$
+				s.append(" - " + ((MenuItem) element).getText(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+				cell.setStyleRanges(s.getStyleRanges());
+				cell.setText(s.getString());
+				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_menuitem_obj));
+			}
+
+		} else if (element instanceof CLabel) {
 			StyledString s = new StyledString("Label"); //$NON-NLS-1$
 			s.append(" - " + ((CLabel) element).getText(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 			cell.setStyleRanges(s.getStyleRanges());

From ef01acbad6a37c3de1df71c0d7986ebc009f63cd Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 10 Mar 2011 22:43:12 +0000
Subject: [PATCH 0332/1286] Bug 339299 - [ModelTooling] Add scripting support

---
 .../e4/tools/emf/ui/internal/common/uistructure/UIViewer.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
index 14eb553a4b..7cf82cb935 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
@@ -24,7 +24,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ControlHighlighter;
 import org.eclipse.e4.tools.services.IResourcePool;
-import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -77,7 +76,7 @@ public void run() {
 
 				final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 
-				if (elements.length > 0 && !s.isEmpty() && s.getFirstElement() instanceof MApplicationElement) {
+				if (elements.length > 0 && !s.isEmpty()) {
 					MenuManager scriptExecute = new MenuManager(messages.ModelEditor_Script);
 					manager.add(scriptExecute);
 					for (IConfigurationElement e : elements) {

From f95ca06f088db71f4aa720f08df47a8a9b598bd9 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 10 Mar 2011 23:15:53 +0000
Subject: [PATCH 0333/1286] Bug 339598 - [ModelTooling] Add UI-Widget-Tree
 inspector

---
 .../common/uistructure/WidgetLabelProvider.java   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
index b7cd68a35c..0318e46cf6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
@@ -10,6 +10,7 @@
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
@@ -140,6 +141,9 @@ public void update(ViewerCell cell) {
 			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_text_obj));
 		} else if (element instanceof Sash) {
 			cell.setText("Sash"); //$NON-NLS-1$
+			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_separator_obj));
+		} else if (element instanceof SashForm) {
+			cell.setText("Sash Form"); //$NON-NLS-1$
 			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_sashform_obj));
 		} else if (element instanceof Label) {
 			Label l = (Label) element;
@@ -149,23 +153,28 @@ public void update(ViewerCell cell) {
 			} else {
 				StyledString s = new StyledString("Label"); //$NON-NLS-1$
 				s.append(" - " + l.getText(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+				cell.setStyleRanges(s.getStyleRanges());
+				cell.setText(s.getString());
 				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_label_obj));
 			}
 
 		} else if (element instanceof TabItem) {
-			cell.setText("TabItem"); //$NON-NLS-1$
+			StyledString s = new StyledString("TabItem"); //$NON-NLS-1$
+			s.append(" - " + ((TabItem) element).getText(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+			cell.setStyleRanges(s.getStyleRanges());
+			cell.setText(s.getString());
 		} else if (element instanceof CTabItem) {
 			StyledString s = new StyledString("CTabItem"); //$NON-NLS-1$
 			s.append(" - " + ((CTabItem) element).getText(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 			cell.setStyleRanges(s.getStyleRanges());
 			cell.setText(s.getString());
-			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_clabel_obj));
+			// cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_clabel_obj));
 		} else if (element instanceof org.eclipse.e4.ui.widgets.CTabItem) {
 			StyledString s = new StyledString("CTabItem"); //$NON-NLS-1$
 			s.append(" - " + ((org.eclipse.e4.ui.widgets.CTabItem) element).getText(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 			cell.setStyleRanges(s.getStyleRanges());
 			cell.setText(s.getString());
-			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_clabel_obj));
+			// cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_clabel_obj));
 		} else if (element instanceof Button) {
 			Button b = (Button) element;
 			if ((b.getStyle() & SWT.PUSH) == SWT.PUSH) {

From d6d6314faaa7e7d6abc0b598eb873518df2ceb92 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 12 Mar 2011 00:42:48 +0000
Subject: [PATCH 0334/1286] Bug 339299 - [ModelTooling] Add scripting support


From b2f563f117dea9c126ec9236719b35e8a649169b Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Sat, 12 Mar 2011 16:26:35 +0000
Subject: [PATCH 0335/1286] Bug 339299 - [ModelTooling] Add scripting support

---
 .../emf/ui/common/IScriptingSupport.java      |  4 +-
 .../emf/ui/internal/common/ModelEditor.java   | 57 ++++++++++++++++++-
 .../common/objectdata/ObjectViewer.java       |  8 ++-
 .../internal/common/uistructure/UIViewer.java |  8 ++-
 4 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IScriptingSupport.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IScriptingSupport.java
index ef2a071492..b9690d4dcf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IScriptingSupport.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IScriptingSupport.java
@@ -1,8 +1,8 @@
 package org.eclipse.e4.tools.emf.ui.common;
 
-import java.util.Map;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.swt.widgets.Shell;
 
 public interface IScriptingSupport {
-	public void openEditor(Shell shell, Object scope, Map<String, Object> additionalData);
+	public void openEditor(Shell shell, Object scope, IEclipseContext context);
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index c5f16b0401..7b184305d7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -134,6 +134,7 @@
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
@@ -198,7 +199,10 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.TreeItem;
 
 public class ModelEditor {
@@ -269,6 +273,8 @@ public class ModelEditor {
 
 	private AbstractComponentEditor currentEditor;
 
+	private Listener keyListener;
+
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project, final IResourcePool resourcePool) {
 		this.resourcePool = resourcePool;
 		this.modelProvider = modelProvider;
@@ -295,6 +301,18 @@ public void run() {
 
 	@PostConstruct
 	void postCreate(Composite composite) {
+		if (project == null) {
+			keyListener = new Listener() {
+
+				public void handleEvent(Event event) {
+					if ((event.stateMask & SWT.ALT) == SWT.ALT) {
+						findAndHighlight(context.get(Display.class).getFocusControl());
+					}
+				}
+			};
+			context.get(Display.class).addFilter(SWT.MouseUp, keyListener);
+		}
+
 		context.set(ModelEditor.class, this);
 		context.set(IResourcePool.class, resourcePool);
 		context.set(EditingDomain.class, modelProvider.getEditingDomain());
@@ -338,6 +356,38 @@ public void widgetSelected(SelectionEvent e) {
 		folder.setSelection(0);
 	}
 
+	private void findAndHighlight(Control control) {
+		if (control != null) {
+			MApplicationElement m = findModelElement(control);
+			MApplicationElement o = m;
+			if (m != null) {
+				List<MApplicationElement> l = new ArrayList<MApplicationElement>();
+				do {
+					l.add(m);
+					m = (MApplicationElement) ((EObject) m).eContainer();
+				} while (m != null);
+
+				if (o instanceof MPart) {
+					System.err.println(o);
+					System.err.println(((EObject) o).eContainingFeature());
+				}
+
+				viewer.setSelection(new StructuredSelection(o));
+			}
+		}
+	}
+
+	private MApplicationElement findModelElement(Control control) {
+		do {
+			if (control.getData("modelElement") != null) { //$NON-NLS-1$
+				return (MApplicationElement) control.getData("modelElement"); //$NON-NLS-1$
+			}
+			control = control.getParent();
+		} while (control != null);
+
+		return null;
+	}
+
 	private Control createXMITab(Composite composite) {
 
 		final AnnotationModel model = new AnnotationModel();
@@ -574,8 +624,9 @@ public void run() {
 							@Override
 							public void run() {
 								try {
+									MApplicationElement o = (MApplicationElement) s.getFirstElement();
 									IScriptingSupport support = (IScriptingSupport) le.createExecutableExtension("class"); //$NON-NLS-1$
-									support.openEditor(viewer.getControl().getShell(), s.getFirstElement(), new HashMap<String, Object>());
+									support.openEditor(viewer.getControl().getShell(), s.getFirstElement(), project == null ? ModelUtils.getContainingContext(o) : null);
 								} catch (CoreException e) {
 									// TODO Auto-generated catch block
 									e.printStackTrace();
@@ -976,6 +1027,10 @@ void dispose() {
 			// TODO: handle exception
 			e.printStackTrace();
 		}
+
+		if (project == null) {
+			context.get(Display.class).removeFilter(SWT.MouseUp, keyListener);
+		}
 	}
 
 	public IModelResource getModelProvider() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
index 100b7a731c..27b3f11fa1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
@@ -2,7 +2,6 @@
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
@@ -16,6 +15,8 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.internal.ModelUtils;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -42,7 +43,7 @@
 import org.eclipse.swt.widgets.Label;
 
 public class ObjectViewer {
-	public TreeViewer createViewer(Composite parent, EStructuralFeature feature, IObservableValue master, IResourcePool resourcePool, final Messages messages) {
+	public TreeViewer createViewer(Composite parent, EStructuralFeature feature, final IObservableValue master, IResourcePool resourcePool, final Messages messages) {
 		final TreeViewer viewer = new TreeViewer(parent);
 		viewer.setContentProvider(new ContentProviderImpl());
 		viewer.setLabelProvider(new LabelProviderImpl(resourcePool));
@@ -93,7 +94,8 @@ public void run() {
 									}
 
 									if (mainObject != null) {
-										support.openEditor(viewer.getControl().getShell(), mainObject, new HashMap<String, Object>());
+										MApplicationElement value = (MApplicationElement) master.getValue();
+										support.openEditor(viewer.getControl().getShell(), mainObject, ModelUtils.getContainingContext(value));
 									}
 								} catch (CoreException e) {
 									// TODO Auto-generated catch block
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
index 7cf82cb935..ac02009ff7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
@@ -11,7 +11,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.uistructure;
 
 import java.util.Collections;
-import java.util.HashMap;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
@@ -24,6 +23,8 @@
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ControlHighlighter;
 import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.internal.ModelUtils;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -37,7 +38,7 @@
 import org.eclipse.swt.widgets.Control;
 
 public class UIViewer {
-	public TreeViewer createViewer(Composite parent, EStructuralFeature feature, IObservableValue master, IResourcePool resourcePool, final Messages messages) {
+	public TreeViewer createViewer(Composite parent, EStructuralFeature feature, final IObservableValue master, IResourcePool resourcePool, final Messages messages) {
 		final TreeViewer viewer = new TreeViewer(parent);
 		viewer.setContentProvider(new WidgetContentProvider());
 		viewer.setLabelProvider(new WidgetLabelProvider(resourcePool));
@@ -85,8 +86,9 @@ public void run() {
 							@Override
 							public void run() {
 								try {
+									MApplicationElement o = (MApplicationElement) master.getValue();
 									IScriptingSupport support = (IScriptingSupport) le.createExecutableExtension("class"); //$NON-NLS-1$
-									support.openEditor(viewer.getControl().getShell(), s.getFirstElement(), new HashMap<String, Object>());
+									support.openEditor(viewer.getControl().getShell(), s.getFirstElement(), ModelUtils.getContainingContext(o));
 								} catch (CoreException e) {
 									// TODO Auto-generated catch block
 									e.printStackTrace();

From e00ea1d44fc25812ba03dcb4b20b33623be26a25 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 15 Mar 2011 00:29:43 +0000
Subject: [PATCH 0336/1286] Bug 339299 - [ModelTooling] Add scripting support


From 4694f707789646e6a9af5245e674401f5af4d3c3 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 15 Mar 2011 00:32:26 +0000
Subject: [PATCH 0337/1286] Bug 339299 - [ModelTooling] Add scripting support

---
 .../e4/tools/emf/ui/internal/ResourceProvider.java     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
index 1ef5275651..41e626817a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011 BestSolution.at
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
 import org.eclipse.e4.tools.services.BasicResourceProvider;

From 10b416968dbb1bf643ebf9f8cbcaf68adeaec4e8 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 15 Mar 2011 00:42:37 +0000
Subject: [PATCH 0338/1286] Bug 339299 - [ModelTooling] Add scripting support


From c9946d49443785f241c933855c64342fadc9ccf6 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 15 Mar 2011 00:44:26 +0000
Subject: [PATCH 0339/1286] Bug 339299 - [ModelTooling] Add scripting support


From f461a2100bd84c20bebaac946afa12db41d94af8 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 15 Mar 2011 14:06:58 +0000
Subject: [PATCH 0340/1286] Bug 340023 - [ModelTooling] Infinite SWT error
 dialog after closing a part with the live editor dialog up


From 592bbe872b8fe70dfcbff9f3f4eb85c5e8f11bc5 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 15 Mar 2011 18:49:11 +0000
Subject: [PATCH 0341/1286] Bug 340042 - [ModelTooling] Perspective tree node
 in the editor doesn't include windows

---
 .../eclipse/e4/tools/emf/ui/common/Util.java  |  25 ++
 .../emf/ui/internal/common/ModelEditor.java   |  15 +-
 .../common/component/ApplicationEditor.java   |   2 +-
 .../common/component/PerspectiveEditor.java   | 151 ++-------
 .../common/component/WindowEditor.java        |   2 +-
 .../virtual/VApplicationWindowEditor.java     |  13 +
 .../virtual/VPerspectiveControlEditor.java    | 289 ++++++++++++++++++
 .../virtual/VPerspectiveWindowsEditor.java    |  13 +
 .../component/virtual/VWindowEditor.java      |  32 +-
 .../virtual/VWindowWindowsEditor.java         |  13 +
 .../build.properties                          |   6 +-
 11 files changed, 408 insertions(+), 153 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index 9c41f212c4..caa8211363 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -146,6 +146,31 @@ public static List<InternalPackage> loadPackages() {
 		return packs;
 	}
 
+	public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement element, boolean liveModel, int index, EStructuralFeature feature) {
+		if (liveModel) {
+			EObject container = ((EObject) element).eContainer();
+			List<Object> l = (List<Object>) container.eGet(feature);
+			l.remove(element);
+
+			if (index >= 0) {
+				l.add(index, element);
+			} else {
+				l.add(element);
+			}
+
+			return true;
+		} else {
+			EObject container = ((EObject) element).eContainer();
+			Command cmd = MoveCommand.create(editingDomain, container, feature, element, index);
+
+			if (cmd.canExecute()) {
+				editingDomain.getCommandStack().execute(cmd);
+				return true;
+			}
+			return false;
+		}
+	}
+
 	public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement element, boolean liveModel, int index) {
 		if (liveModel) {
 			MElementContainer<MUIElement> container = element.getParent();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 7b184305d7..19c35dccbf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -99,6 +99,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationAddons;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationCategoriesEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VBindingTableEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VCommandEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
@@ -109,13 +110,15 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartDescriptor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartDescriptorMenuEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartMenuEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPerspectiveControlEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPerspectiveWindowsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VRootBindingContexts;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VToolBarContributionsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VTrimContributionsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowControlEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowSharedElementsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowTrimEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowWindowsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.properties.ExternalizeStringHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.properties.ProjectOSGiTranslationProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.AnnotationAccess;
@@ -212,7 +215,9 @@ public class ModelEditor {
 	public static final String VIRTUAL_HANDLER = ModelEditor.class.getName() + ".VIRTUAL_HANDLER"; //$NON-NLS-1$
 	public static final String VIRTUAL_BINDING_TABLE = ModelEditor.class.getName() + ".VIRTUAL_BINDING_TABLE"; //$NON-NLS-1$
 	public static final String VIRTUAL_COMMAND = ModelEditor.class.getName() + ".VIRTUAL_COMMAND"; //$NON-NLS-1$
-	public static final String VIRTUAL_WINDOWS = ModelEditor.class.getName() + ".VIRTUAL_WINDOWS"; //$NON-NLS-1$
+	public static final String VIRTUAL_APPLICATION_WINDOWS = ModelEditor.class.getName() + ".VIRTUAL_APPLICATION_WINDOWS"; //$NON-NLS-1$
+	public static final String VIRTUAL_PERSPECTIVE_WINDOWS = ModelEditor.class.getName() + ".VIRTUAL_PERSPECTIVE_WINDOWS"; //$NON-NLS-1$
+	public static final String VIRTUAL_WINDOW_WINDOWS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_WINDOWS"; //$NON-NLS-1$
 	public static final String VIRTUAL_WINDOW_CONTROLS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_CONTROLS"; //$NON-NLS-1$
 	public static final String VIRTUAL_PART_DESCRIPTORS = ModelEditor.class.getName() + ".VIRTUAL_PART_DESCRIPTORS"; //$NON-NLS-1$
 	public static final String VIRTUAL_PARTDESCRIPTOR_MENU = ModelEditor.class.getName() + ".VIRTUAL_PARTDESCRIPTOR_MENU"; //$NON-NLS-1$
@@ -228,6 +233,7 @@ public class ModelEditor {
 	public static final String VIRTUAL_PARAMETERS = ModelEditor.class.getName() + ".VIRTUAL_PARAMETERS"; //$NON-NLS-1$
 	public static final String VIRTUAL_MENUELEMENTS = ModelEditor.class.getName() + ".VIRTUAL_MENUELEMENTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_ROOT_CONTEXTS = ModelEditor.class.getName() + ".VIRTUAL_ROOT_CONTEXTS"; //$NON-NLS-1$
+	public static final String VIRTUAL_PERSPECTIVE_CONTROLS = ModelEditor.class.getName() + "VIRTUAL_PERSPECTIVE_CONTROLS"; //$NON-NLS-1$
 
 	private static final int VERTICAL_RULER_WIDTH = 20;
 
@@ -855,7 +861,9 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_HANDLER, ContextInjectionFactory.make(VHandlerEditor.class, context));
 		registerVirtualEditor(VIRTUAL_BINDING_TABLE, ContextInjectionFactory.make(VBindingTableEditor.class, context));
 		registerVirtualEditor(VIRTUAL_COMMAND, ContextInjectionFactory.make(VCommandEditor.class, context));
-		registerVirtualEditor(VIRTUAL_WINDOWS, ContextInjectionFactory.make(VWindowEditor.class, context));
+		registerVirtualEditor(VIRTUAL_APPLICATION_WINDOWS, ContextInjectionFactory.make(VApplicationWindowEditor.class, context));
+		registerVirtualEditor(VIRTUAL_WINDOW_WINDOWS, ContextInjectionFactory.make(VWindowWindowsEditor.class, context));
+		registerVirtualEditor(VIRTUAL_PERSPECTIVE_WINDOWS, ContextInjectionFactory.make(VPerspectiveWindowsEditor.class, context));
 		registerVirtualEditor(VIRTUAL_WINDOW_CONTROLS, ContextInjectionFactory.make(VWindowControlEditor.class, context));
 		registerVirtualEditor(VIRTUAL_PART_DESCRIPTORS, ContextInjectionFactory.make(VPartDescriptor.class, context));
 		registerVirtualEditor(VIRTUAL_PARTDESCRIPTOR_MENU, ContextInjectionFactory.make(VPartDescriptorMenuEditor.class, context));
@@ -870,6 +878,7 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_CATEGORIES, ContextInjectionFactory.make(VApplicationCategoriesEditor.class, context));
 		registerVirtualEditor(VIRTUAL_PARAMETERS, ContextInjectionFactory.make(VItemParametersEditor.class, context));
 		registerVirtualEditor(VIRTUAL_ROOT_CONTEXTS, ContextInjectionFactory.make(VRootBindingContexts.class, context));
+		registerVirtualEditor(VIRTUAL_PERSPECTIVE_CONTROLS, ContextInjectionFactory.make(VPerspectiveControlEditor.class, context));
 	}
 
 	private void registerVirtualEditor(String id, AbstractComponentEditor editor) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index f926d05ca3..85f51b6953 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -222,7 +222,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOWS, ELEMENT_CONTAINER__CHILDREN, element, Messages.ApplicationEditor_Windows) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_APPLICATION_WINDOWS, ELEMENT_CONTAINER__CHILDREN, element, Messages.ApplicationEditor_Windows) {
 
 			@Override
 			protected boolean accepted(Object o) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index c5f8bc0683..59361c49b4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -15,6 +15,7 @@
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
@@ -24,12 +25,12 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PerspectiveIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
@@ -41,23 +42,14 @@
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -79,6 +71,7 @@ public class PerspectiveEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private IListProperty PERSPECTIVE__WINDOWS = EMFProperties.list(AdvancedPackageImpl.Literals.PERSPECTIVE__WINDOWS);
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
@@ -259,123 +252,6 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PerspectiveEditor_Controls);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-			final TableViewer viewer = new TableViewer(parent);
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(getMaster()));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) - 1;
-							if (idx >= 0) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) + 1;
-							if (idx < container.getChildren().size()) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					EClass eclass = (EClass) element;
-					return eclass.getName();
-				}
-			});
-			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
-			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!childrenDropDown.getSelection().isEmpty()) {
-						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-						handleAddChild(eClass);
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
-
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
-		}
-
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
@@ -413,7 +289,24 @@ private void createUITreeInspection(CTabFolder folder) {
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+		final WritableList list = new WritableList();
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PERSPECTIVE_WINDOWS, PERSPECTIVE__WINDOWS, element, Messages.WindowEditor_Windows) {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+		});
+
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PERSPECTIVE_CONTROLS, ELEMENT_CONTAINER__CHILDREN, element, Messages.PerspectiveEditor_Controls) {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+		});
+
+		return list;
 	}
 
 	protected void handleAddChild(EClass eClass) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index efc20524d9..15f5739843 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -348,7 +348,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOWS, WINDOW__WINDOWS, element, Messages.WindowEditor_Windows) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_WINDOWS, WINDOW__WINDOWS, element, Messages.WindowEditor_Windows) {
 
 			@Override
 			protected boolean accepted(Object o) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java
new file mode 100644
index 0000000000..325af803bf
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java
@@ -0,0 +1,13 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import javax.inject.Inject;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+
+public class VApplicationWindowEditor extends VWindowEditor {
+
+	@Inject
+	public VApplicationWindowEditor() {
+		super(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
new file mode 100644
index 0000000000..9aaba3ec59
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -0,0 +1,289 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VPerspectiveControlEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private TableViewer viewer;
+	private List<Action> actions = new ArrayList<Action>();
+
+	@Inject
+	public VPerspectiveControlEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
+		actions.add(new Action(Messages.VWindowControlEditor_AddPartSashContainer, createImageDescriptor(ResourceProvider.IMG_PartSashContainer_vertical)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
+			}
+		});
+
+		actions.add(new Action(Messages.VWindowControlEditor_AddPartStack, createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.PART_STACK);
+			}
+		});
+
+		actions.add(new Action(Messages.VWindowControlEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.PART);
+			}
+		});
+
+		actions.add(new Action(Messages.VWindowControlEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.PART);
+			}
+		});
+
+		actions.add(new Action(Messages.VWindowControlEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area_vertical)) {
+			@Override
+			public void run() {
+				handleAdd(AdvancedPackageImpl.Literals.AREA);
+			}
+		});
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.VWindowControlEditor_TreeLabel;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return Messages.VWindowControlEditor_TreeLabelDescription;
+	}
+
+	@Override
+	public Composite doGetEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent, context, getMaster());
+		}
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.VWindowControlEditor_Controls);
+			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+			viewer = new TableViewer(parent);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
+			GridData gd = new GridData(GridData.FILL_BOTH);
+			viewer.getControl().setLayoutData(gd);
+
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Up);
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) - 1;
+							if (idx >= 0) {
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Down);
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) + 1;
+							if (idx < container.getChildren().size()) {
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+						}
+					}
+				}
+			});
+
+			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					EClass eclass = (EClass) element;
+					return eclass.getName();
+				}
+			});
+			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
+			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!childrenDropDown.getSelection().isEmpty()) {
+						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+						handleAdd(eClass);
+					}
+				}
+			});
+
+			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Remove);
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+
+		folder.setSelection(0);
+
+		return folder;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return null;
+	}
+
+	private void handleAdd(EClass eClass) {
+		EObject eObject = EcoreUtil.create(eClass);
+
+		setElementId(eObject);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(eObject);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java
new file mode 100644
index 0000000000..3d3865a7f8
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java
@@ -0,0 +1,13 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import javax.inject.Inject;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+
+public class VPerspectiveWindowsEditor extends VWindowEditor {
+
+	@Inject
+	public VPerspectiveWindowsEditor() {
+		super(AdvancedPackageImpl.Literals.PERSPECTIVE__WINDOWS);
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 9a78f13000..500042f7f1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -13,7 +13,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
-import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -24,11 +23,11 @@
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -53,15 +52,16 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 
-public class VWindowEditor extends AbstractComponentEditor {
+public abstract class VWindowEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
+	private EStructuralFeature targetFeature;
 
-	@Inject
-	public VWindowEditor() {
+	public VWindowEditor(EStructuralFeature targetFeature) {
 		super();
+		this.targetFeature = targetFeature;
 	}
 
 	@PostConstruct
@@ -147,16 +147,18 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 		b.addSelectionListener(new SelectionAdapter() {
+			@SuppressWarnings("unchecked")
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (!viewer.getSelection().isEmpty()) {
 					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 					if (s.size() == 1) {
 						Object obj = s.getFirstElement();
-						MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-						int idx = container.getChildren().indexOf(obj) - 1;
+						EObject container = (EObject) getMaster().getValue();
+						List<Object> l = (List<Object>) container.eGet(targetFeature);
+						int idx = l.indexOf(obj) - 1;
 						if (idx >= 0) {
-							if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
+							if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx, targetFeature)) {
 								viewer.setSelection(new StructuredSelection(obj));
 							}
 						}
@@ -171,16 +173,18 @@ public void widgetSelected(SelectionEvent e) {
 		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 		b.addSelectionListener(new SelectionAdapter() {
+			@SuppressWarnings("unchecked")
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (!viewer.getSelection().isEmpty()) {
 					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 					if (s.size() == 1) {
 						Object obj = s.getFirstElement();
-						MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-						int idx = container.getChildren().indexOf(obj) + 1;
-						if (idx < container.getChildren().size()) {
-							if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
+						EObject container = (EObject) getMaster().getValue();
+						List<Object> l = (List<Object>) container.eGet(targetFeature);
+						int idx = l.indexOf(obj) + 1;
+						if (idx < l.size()) {
+							if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx, targetFeature)) {
 								viewer.setSelection(new StructuredSelection(obj));
 							}
 						}
@@ -223,7 +227,7 @@ public void widgetSelected(SelectionEvent e) {
 				if (!viewer.getSelection().isEmpty()) {
 					List<?> windows = ((IStructuredSelection) viewer.getSelection()).toList();
 					MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-					Command cmd = RemoveCommand.create(getEditingDomain(), container, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, windows);
+					Command cmd = RemoveCommand.create(getEditingDomain(), container, targetFeature, windows);
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
 						if (container.getChildren().size() > 0) {
@@ -255,7 +259,7 @@ protected void handleAdd(EClass eClass) {
 		EObject handler = EcoreUtil.create(eClass);
 		setElementId(handler);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, handler);
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), targetFeature, handler);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java
new file mode 100644
index 0000000000..7e1dd2df67
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java
@@ -0,0 +1,13 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import javax.inject.Inject;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+
+public class VWindowWindowsEditor extends VWindowEditor {
+
+	@Inject
+	public VWindowWindowsEditor() {
+		super(BasicPackageImpl.Literals.WINDOW__WINDOWS);
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.services/build.properties b/bundles/org.eclipse.e4.tools.services/build.properties
index e611dd6a4e..67344cd64d 100644
--- a/bundles/org.eclipse.e4.tools.services/build.properties
+++ b/bundles/org.eclipse.e4.tools.services/build.properties
@@ -2,9 +2,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                about.html,\
-               OSGI-INF/,\
-               OSGI-INF/resourcepoolfunction.xml,\
-               OSGI-INF/resourceservice.xml,\
-               OSGI-INF/messagefactoryservice.xml,\
-               OSGI-INF/translationsupplier.xml
+               OSGI-INF/
 source.. = src/

From 73fc6d5293fa8c18814fa58be74a62bfb50ca180 Mon Sep 17 00:00:00 2001
From: Remy Suen <rsuen>
Date: Thu, 17 Mar 2011 20:24:00 +0000
Subject: [PATCH 0342/1286] Ignore bin/ folders.

---
 bundles/org.eclipse.e4.tools.emf.ui/.cvsignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/.cvsignore

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.cvsignore b/bundles/org.eclipse.e4.tools.emf.ui/.cvsignore
new file mode 100644
index 0000000000..ba077a4031
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.cvsignore
@@ -0,0 +1 @@
+bin

From 5376d1e28356a34b70271b7c37d4c31370a2a06f Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 30 Mar 2011 18:33:48 +0000
Subject: [PATCH 0343/1286] Bug 320380 - [ModelTooling] Integration in Renaming
 Operations

---
 .../META-INF/MANIFEST.MF                      |   5 +-
 .../plugin.xml                                |  18 +++
 .../emf/editor3x/ClassRenameParticipant.java  | 105 ++++++++++++++++++
 3 files changed, 127 insertions(+), 1 deletion(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 1691e76e64..20ae981b14 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -26,7 +26,10 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.tools.compat;bundle-version="1.0.0",
  org.eclipse.e4.tools.services;bundle-version="1.0.0",
  org.eclipse.e4.tools;bundle-version="0.9.0",
- org.eclipse.jdt.ui;bundle-version="3.6.0"
+ org.eclipse.jdt.ui;bundle-version="3.6.0",
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
+ org.eclipse.search;bundle-version="3.7.0",
+ org.eclipse.text;bundle-version="3.5.100"
 Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/projectfunction.xml, OSGI-INF/pdee4xmiprovider.xml, OSGI-INF/pdeextensionlookup.xml
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index 0ca898f300..ac5ff7689c 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -32,5 +32,23 @@
             name="%page.name">
       </page>
    </extension>
+   <extension
+         point="org.eclipse.ltk.core.refactoring.renameParticipants">
+      <renameParticipant
+            class="org.eclipse.e4.tools.emf.editor3x.ClassRenameParticipant"
+            id="org.eclipse.e4.tools.emf.editor3x.renameParticipant"
+            name="Workbench Model Contribution Participant">
+         <enablement>
+	  	  <with variable="affectedNatures">
+	  	    <iterate operator="or">
+	  	      <equals value="org.eclipse.jdt.core.javanature"/>
+	  	    </iterate>
+	  	  </with>
+	  	  <with variable="element">
+		  	 <instanceof value="org.eclipse.jdt.core.IType"/>
+	  	  </with>
+	  	</enablement>
+      </renameParticipant>
+   </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java
new file mode 100644
index 0000000000..43275b1db3
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2011 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.ltk.core.refactoring.Change;
+import org.eclipse.ltk.core.refactoring.CompositeChange;
+import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.ltk.core.refactoring.TextChange;
+import org.eclipse.ltk.core.refactoring.TextFileChange;
+import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
+import org.eclipse.search.core.text.TextSearchEngine;
+import org.eclipse.search.core.text.TextSearchMatchAccess;
+import org.eclipse.search.core.text.TextSearchRequestor;
+import org.eclipse.search.ui.text.FileTextSearchScope;
+import org.eclipse.text.edits.MultiTextEdit;
+import org.eclipse.text.edits.ReplaceEdit;
+import org.eclipse.text.edits.TextEditGroup;
+
+public class ClassRenameParticipant extends
+		org.eclipse.ltk.core.refactoring.participants.RenameParticipant {
+	private IType type;
+	
+	@Override
+	protected boolean initialize(Object element) {
+		if( element instanceof IType ) {
+			type = (IType) element;
+		} else {
+			type = null;
+		}
+		
+		return type != null;
+	}
+
+	@Override
+	public String getName() {
+		return "Workbench Model Contribution Participant";
+	}
+
+	@Override
+	public RefactoringStatus checkConditions(IProgressMonitor pm,
+			CheckConditionsContext context) throws OperationCanceledException {
+		return new RefactoringStatus();
+	}
+
+	@Override
+	public Change createChange(IProgressMonitor pm) throws CoreException,
+			OperationCanceledException {
+		final Map<IFile, TextFileChange> changes= new HashMap<IFile, TextFileChange>();
+		final String newName = type.getPackageFragment().getElementName().length() == 0 ? getArguments().getNewName() : type.getPackageFragment().getElementName() + "." + getArguments().getNewName();
+		String oldName = type.getFullyQualifiedName().replace(".", "\\.");
+		
+		String[] filenames = { "*.e4xmi" };
+		FileTextSearchScope scope= FileTextSearchScope.newWorkspaceScope(filenames, false);
+		Pattern pattern= Pattern.compile(oldName);
+		
+		TextSearchRequestor searchRequestor = new TextSearchRequestor() {
+			public boolean acceptPatternMatch(TextSearchMatchAccess matchAccess) throws CoreException {
+				IFile file = matchAccess.getFile();
+				TextFileChange change= (TextFileChange) changes.get(file);
+				
+				if (change == null) {
+					TextChange textChange = getTextChange(file);
+					if (textChange != null) {
+						return false;
+					}
+					change= new TextFileChange(file.getName(), file);
+					change.setEdit(new MultiTextEdit());
+					changes.put(file, change);
+				}
+				ReplaceEdit edit= new ReplaceEdit(matchAccess.getMatchOffset(), matchAccess.getMatchLength(), newName);
+				change.addEdit(edit);
+				change.addTextEditGroup(new TextEditGroup("Update contribution reference", edit)); //$NON-NLS-1$
+				return true;
+			}
+		};
+		TextSearchEngine.create().search(scope, searchRequestor, pattern, pm);
+		
+		if (changes.isEmpty())
+			return null;
+		
+		CompositeChange result= new CompositeChange("Update contribution reference"); //$NON-NLS-1$
+		for (TextFileChange c : changes.values()) {
+			result.add(c);
+		}
+		return result;
+	}
+
+}

From 05aa4c63cd7f7f334c2742103ef78aa3fd7855fa Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 30 Mar 2011 18:42:21 +0000
Subject: [PATCH 0344/1286] Bug 341412 - [ModelTooling] Path construction for
 Contribution in <default-package> is wrong

---
 .../e4/tools/emf/editor3x/PDEClassContributionProvider.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index 76f37692b3..0fb63750bd 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -83,7 +83,7 @@ public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
 				String cName = new String(simpleTypeName);
 				String pName = new String(packageName);
 //				String label = cName + " - " + pName; //$NON-NLS-1$
-				String content = pName + "." + cName; //$NON-NLS-1$
+				String content = pName.length() == 0 ? cName : pName + "." + cName; //$NON-NLS-1$
 				
 //				System.err.println("Found: " + label + " => " + pName + " => " + path);
 				

From 032b75ea442b9133d691c95cbf0a6286143743fb Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 30 Mar 2011 18:44:43 +0000
Subject: [PATCH 0345/1286] Bug 341412 - [ModelTooling] Path construction for
 Contribution in <default-package> is wrong

---
 .../e4/tools/emf/editor3x/PDEClassContributionProvider.java     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index 0fb63750bd..7ae0019c62 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -36,8 +36,6 @@ public PDEClassContributionProvider() {
 	
 	@SuppressWarnings("restriction")
 	public void findContribution(final Filter filter,  final ContributionResultHandler handler) {
-		System.err.println("Searching for: " + filter.namePattern);
-		
 		IJavaSearchScope scope = PDEJavaHelper.getSearchScope(filter.project);
 		
 		char[] packageName = null;

From 94e8aea3e786cf1d2c2fc496731829e8a6670a4e Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 30 Mar 2011 20:56:45 +0000
Subject: [PATCH 0346/1286] Bug 320380 - [ModelTooling] Integration in Renaming
 Operations

---
 .../plugin.xml                                | 20 ++++-
 .../emf/editor3x/ClassMoveParticipant.java    | 52 ++++++++++++
 .../emf/editor3x/ClassRenameParticipant.java  | 57 ++-----------
 .../editor3x/RefactorParticipantDelegate.java | 80 +++++++++++++++++++
 4 files changed, 156 insertions(+), 53 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassMoveParticipant.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index ac5ff7689c..f47fd93ed8 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -41,7 +41,7 @@
          <enablement>
 	  	  <with variable="affectedNatures">
 	  	    <iterate operator="or">
-	  	      <equals value="org.eclipse.jdt.core.javanature"/>
+	  	      <equals value="org.eclipse.pde.PluginNature"/>
 	  	    </iterate>
 	  	  </with>
 	  	  <with variable="element">
@@ -50,5 +50,23 @@
 	  	</enablement>
       </renameParticipant>
    </extension>
+   <extension
+         point="org.eclipse.ltk.core.refactoring.moveParticipants">
+      <moveParticipant
+            class="org.eclipse.e4.tools.emf.editor3x.ClassMoveParticipant"
+            id="org.eclipse.e4.tools.emf.editor3x.moveParticipant"
+            name="Workbench Model Contribution Participant">
+         <enablement>
+	  	  <with variable="affectedNatures">
+	  	    <iterate operator="or">
+	  	      <equals value="org.eclipse.pde.PluginNature"/>
+	  	    </iterate>
+	  	  </with>
+	  	  <with variable="element">
+		  	 <instanceof value="org.eclipse.jdt.core.IType"/>
+	  	  </with>
+	  	</enablement>
+      </moveParticipant>
+   </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassMoveParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassMoveParticipant.java
new file mode 100644
index 0000000000..0c883aa0c7
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassMoveParticipant.java
@@ -0,0 +1,52 @@
+package org.eclipse.e4.tools.emf.editor3x;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.e4.tools.emf.editor3x.extension.Util;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.ltk.core.refactoring.Change;
+import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
+
+public class ClassMoveParticipant extends
+		org.eclipse.ltk.core.refactoring.participants.MoveParticipant {
+	private IType type;
+	
+	@Override
+	protected boolean initialize(Object element) {
+		if( element instanceof IType ) {
+			type = (IType) element;
+		} else {
+			type = null;
+		}
+		
+		return type != null;
+	}
+
+	@Override
+	public String getName() {
+		return "Workbench Model Contribution Participant";
+	}
+
+	@Override
+	public RefactoringStatus checkConditions(IProgressMonitor pm,
+			CheckConditionsContext context) throws OperationCanceledException {
+		return new RefactoringStatus();
+	}
+
+	@Override
+	public Change createChange(IProgressMonitor pm) throws CoreException,
+			OperationCanceledException {
+		String fromBundle = Util.getBundleSymbolicName(type.getJavaProject().getProject());
+		String fromClassname = type.getFullyQualifiedName();
+		
+		IPackageFragment fragment = (IPackageFragment) getArguments().getDestination();
+		String toBundle = Util.getBundleSymbolicName(fragment.getJavaProject().getProject());
+		String toClassName = fragment.getElementName().length() == 0 ? type.getElementName() : fragment.getElementName() + "." + type.getElementName();
+		
+		return RefactorParticipantDelegate.createChange(pm, this, "platform:/plugin/"+fromBundle+"/"+fromClassname, "platform:/plugin/"+toBundle+"/"+toClassName);
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java
index 43275b1db3..7547109159 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java
@@ -10,28 +10,14 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.e4.tools.emf.editor3x.extension.Util;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
 import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextChange;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
 import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.search.core.text.TextSearchEngine;
-import org.eclipse.search.core.text.TextSearchMatchAccess;
-import org.eclipse.search.core.text.TextSearchRequestor;
-import org.eclipse.search.ui.text.FileTextSearchScope;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.text.edits.TextEditGroup;
 
 public class ClassRenameParticipant extends
 		org.eclipse.ltk.core.refactoring.participants.RenameParticipant {
@@ -62,44 +48,11 @@ public RefactoringStatus checkConditions(IProgressMonitor pm,
 	@Override
 	public Change createChange(IProgressMonitor pm) throws CoreException,
 			OperationCanceledException {
-		final Map<IFile, TextFileChange> changes= new HashMap<IFile, TextFileChange>();
-		final String newName = type.getPackageFragment().getElementName().length() == 0 ? getArguments().getNewName() : type.getPackageFragment().getElementName() + "." + getArguments().getNewName();
-		String oldName = type.getFullyQualifiedName().replace(".", "\\.");
-		
-		String[] filenames = { "*.e4xmi" };
-		FileTextSearchScope scope= FileTextSearchScope.newWorkspaceScope(filenames, false);
-		Pattern pattern= Pattern.compile(oldName);
-		
-		TextSearchRequestor searchRequestor = new TextSearchRequestor() {
-			public boolean acceptPatternMatch(TextSearchMatchAccess matchAccess) throws CoreException {
-				IFile file = matchAccess.getFile();
-				TextFileChange change= (TextFileChange) changes.get(file);
-				
-				if (change == null) {
-					TextChange textChange = getTextChange(file);
-					if (textChange != null) {
-						return false;
-					}
-					change= new TextFileChange(file.getName(), file);
-					change.setEdit(new MultiTextEdit());
-					changes.put(file, change);
-				}
-				ReplaceEdit edit= new ReplaceEdit(matchAccess.getMatchOffset(), matchAccess.getMatchLength(), newName);
-				change.addEdit(edit);
-				change.addTextEditGroup(new TextEditGroup("Update contribution reference", edit)); //$NON-NLS-1$
-				return true;
-			}
-		};
-		TextSearchEngine.create().search(scope, searchRequestor, pattern, pm);
+		String bundle = Util.getBundleSymbolicName(type.getJavaProject().getProject());
 		
-		if (changes.isEmpty())
-			return null;
-		
-		CompositeChange result= new CompositeChange("Update contribution reference"); //$NON-NLS-1$
-		for (TextFileChange c : changes.values()) {
-			result.add(c);
-		}
-		return result;
+		final String newUrl = "platform:/plugin/" + bundle + "/" + (type.getPackageFragment().getElementName().length() == 0 ? getArguments().getNewName() : type.getPackageFragment().getElementName() + "." + getArguments().getNewName());
+		String oldUrl = "platform:/plugin/" + bundle + "/" + type.getFullyQualifiedName().replace(".", "\\.");
+		return RefactorParticipantDelegate.createChange(pm, this, oldUrl, newUrl);
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
new file mode 100644
index 0000000000..0ba52ad123
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2011 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.ltk.core.refactoring.Change;
+import org.eclipse.ltk.core.refactoring.CompositeChange;
+import org.eclipse.ltk.core.refactoring.TextChange;
+import org.eclipse.ltk.core.refactoring.TextFileChange;
+import org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant;
+import org.eclipse.search.core.text.TextSearchEngine;
+import org.eclipse.search.core.text.TextSearchMatchAccess;
+import org.eclipse.search.core.text.TextSearchRequestor;
+import org.eclipse.search.ui.text.FileTextSearchScope;
+import org.eclipse.text.edits.MultiTextEdit;
+import org.eclipse.text.edits.ReplaceEdit;
+import org.eclipse.text.edits.TextEditGroup;
+
+class RefactorParticipantDelegate {
+	public static Change createChange(IProgressMonitor pm,
+			final RefactoringParticipant p, String oldUrl, final String newUrl)
+			throws CoreException, OperationCanceledException {
+		String[] filenames = { "*.e4xmi" };
+		FileTextSearchScope scope = FileTextSearchScope.newWorkspaceScope(
+				filenames, false);
+		Pattern pattern = Pattern.compile(oldUrl);
+
+		final Map<IFile, TextFileChange> changes = new HashMap<IFile, TextFileChange>();
+		TextSearchRequestor searchRequestor = new TextSearchRequestor() {
+			public boolean acceptPatternMatch(TextSearchMatchAccess matchAccess)
+					throws CoreException {
+				IFile file = matchAccess.getFile();
+				TextFileChange change = (TextFileChange) changes.get(file);
+
+				if (change == null) {
+					TextChange textChange = p.getTextChange(file);
+					if (textChange != null) {
+						return false;
+					}
+					change = new TextFileChange(file.getName(), file);
+					change.setEdit(new MultiTextEdit());
+					changes.put(file, change);
+				}
+				ReplaceEdit edit = new ReplaceEdit(
+						matchAccess.getMatchOffset(),
+						matchAccess.getMatchLength(), newUrl);
+				change.addEdit(edit);
+				change.addTextEditGroup(new TextEditGroup(
+						"Update contribution reference", edit)); //$NON-NLS-1$
+				return true;
+			}
+		};
+		TextSearchEngine.create().search(scope, searchRequestor, pattern, pm);
+
+		if (changes.isEmpty())
+			return null;
+
+		CompositeChange result = new CompositeChange(
+				"Update contribution reference"); //$NON-NLS-1$
+		for (TextFileChange c : changes.values()) {
+			result.add(c);
+		}
+		return result;
+	}
+}

From 51ee6fbc9f3ee34254925db88f8b4cc54f2ede22 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 30 Mar 2011 21:08:18 +0000
Subject: [PATCH 0347/1286] Bug 341400 - [ModelTooling] C&P not supported in
 XMI-Area

---
 .../emf/ui/internal/common/ModelEditor.java   | 68 ++++++++++++-------
 1 file changed, 42 insertions(+), 26 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 19c35dccbf..1feb7bb362 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -281,6 +281,10 @@ public class ModelEditor {
 
 	private Listener keyListener;
 
+	private CTabFolder editorTabFolder;
+
+	private SourceViewer sourceViewer;
+
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project, final IResourcePool resourcePool) {
 		this.resourcePool = resourcePool;
 		this.modelProvider = modelProvider;
@@ -338,28 +342,28 @@ public void handleEvent(Event event) {
 
 		fragment = modelProvider.getRoot().get(0) instanceof MModelFragments;
 
-		final CTabFolder folder = new CTabFolder(composite, SWT.BOTTOM);
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		editorTabFolder = new CTabFolder(composite, SWT.BOTTOM);
+		CTabItem item = new CTabItem(editorTabFolder, SWT.NONE);
 		item.setText(messages.ModelEditor_Form);
-		item.setControl(createFormTab(folder));
+		item.setControl(createFormTab(editorTabFolder));
 		item.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_application_form));
 
 		emfDocumentProvider = new EMFDocumentResourceMediator(modelProvider);
 
-		item = new CTabItem(folder, SWT.NONE);
+		item = new CTabItem(editorTabFolder, SWT.NONE);
 		item.setText(messages.ModelEditor_XMI);
-		item.setControl(createXMITab(folder));
+		item.setControl(createXMITab(editorTabFolder));
 		item.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_chart_organisation));
-		folder.addSelectionListener(new SelectionAdapter() {
+		editorTabFolder.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				if (folder.getSelectionIndex() == 1) {
+				if (editorTabFolder.getSelectionIndex() == 1) {
 					emfDocumentProvider.updateFromEMF();
 				}
 			}
 		});
 
-		folder.setSelection(0);
+		editorTabFolder.setSelection(0);
 	}
 
 	private void findAndHighlight(Control control) {
@@ -399,16 +403,16 @@ private Control createXMITab(Composite composite) {
 		final AnnotationModel model = new AnnotationModel();
 		VerticalRuler verticalRuler = new VerticalRuler(VERTICAL_RULER_WIDTH, new AnnotationAccess(resourcePool));
 		int styles = SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION;
-		SourceViewer viewer = new SourceViewer(composite, verticalRuler, styles);
-		viewer.configure(new XMLConfiguration(resourcePool));
-		viewer.setEditable(project != null);
-		viewer.getTextWidget().setFont(JFaceResources.getTextFont());
+		sourceViewer = new SourceViewer(composite, verticalRuler, styles);
+		sourceViewer.configure(new XMLConfiguration(resourcePool));
+		sourceViewer.setEditable(project != null);
+		sourceViewer.getTextWidget().setFont(JFaceResources.getTextFont());
 
 		final IDocument document = emfDocumentProvider.getDocument();
 		IDocumentPartitioner partitioner = new FastPartitioner(new XMLPartitionScanner(), new String[] { XMLPartitionScanner.XML_TAG, XMLPartitionScanner.XML_COMMENT });
 		partitioner.connect(document);
 		document.setDocumentPartitioner(partitioner);
-		viewer.setDocument(document);
+		sourceViewer.setDocument(document);
 		verticalRuler.setModel(model);
 
 		emfDocumentProvider.setValidationChangedCallback(new Runnable() {
@@ -431,7 +435,7 @@ public void run() {
 			}
 		});
 
-		return viewer.getControl();
+		return sourceViewer.getControl();
 	}
 
 	private Composite createFormTab(Composite composite) {
@@ -1049,10 +1053,14 @@ public IModelResource getModelProvider() {
 	class ClipboardHandler implements Handler {
 
 		public void paste() {
-			if (viewer.getControl().getDisplay().getFocusControl() == viewer.getControl()) {
-				handleStructurePaste();
-			} else if (currentEditor != null) {
-				currentEditor.handlePaste();
+			if (editorTabFolder.getSelectionIndex() == 0) {
+				if (viewer.getControl().getDisplay().getFocusControl() == viewer.getControl()) {
+					handleStructurePaste();
+				} else if (currentEditor != null) {
+					currentEditor.handlePaste();
+				}
+			} else {
+				sourceViewer.getTextWidget().paste();
 			}
 		}
 
@@ -1114,10 +1122,14 @@ private void handleStructurePaste() {
 		}
 
 		public void copy() {
-			if (viewer.getControl().getDisplay().getFocusControl() == viewer.getControl()) {
-				handleStructureCopy();
-			} else if (currentEditor != null) {
-				currentEditor.handleCopy();
+			if (editorTabFolder.getSelectionIndex() == 0) {
+				if (viewer.getControl().getDisplay().getFocusControl() == viewer.getControl()) {
+					handleStructureCopy();
+				} else if (currentEditor != null) {
+					currentEditor.handleCopy();
+				}
+			} else {
+				sourceViewer.getTextWidget().copy();
 			}
 		}
 
@@ -1131,10 +1143,14 @@ private void handleStructureCopy() {
 		}
 
 		public void cut() {
-			if (viewer.getControl().getDisplay().getFocusControl() == viewer.getControl()) {
-				handleStructureCut();
-			} else if (currentEditor != null) {
-				currentEditor.handleCut();
+			if (editorTabFolder.getSelectionIndex() == 0) {
+				if (viewer.getControl().getDisplay().getFocusControl() == viewer.getControl()) {
+					handleStructureCut();
+				} else if (currentEditor != null) {
+					currentEditor.handleCut();
+				}
+			} else {
+				sourceViewer.getTextWidget().cut();
 			}
 		}
 

From cf7fd09ec870fed6c160214a7ccb5c986143c28e Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 30 Mar 2011 22:05:10 +0000
Subject: [PATCH 0348/1286] Bug 340413 - [ModelTooling] Make the live editor
 into a part so that it can be opened in 4.1


From baad914243b3cd13f223f2908c0b6be0a8569c71 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 30 Mar 2011 22:10:50 +0000
Subject: [PATCH 0349/1286] Bug 340012 - [ModelTooling] Label of an identified
 MPlaceholder of an MArea seems to be concatenated

---
 .../emf/ui/internal/common/component/PlaceholderEditor.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 0e14cfdf3a..978294e729 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -96,7 +96,7 @@ public String getDetailLabel(Object element) {
 					b.append(" (" + label.getTooltip() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 				} else {
 					if (pl.getRef().getElementId() != null && pl.getRef().getElementId().trim().length() > 0) {
-						b.append(pl.getRef().getElementId());
+						b.append(" (" + pl.getRef().getElementId() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 					}
 				}
 			} else {

From 01ac8966b82dfaf863dc6c81c7af4a57fab987d9 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 5 Apr 2011 22:16:59 +0000
Subject: [PATCH 0350/1286] Bug 340413 - [ModelTooling] Make the live editor
 into a part so that it can be opened in 4.1


From e62bf02cc393ac6ff845afcdde3ff58e4ca61cdd Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 19 Apr 2011 20:14:11 +0000
Subject: [PATCH 0351/1286] Bug 337223 - [Model] Missing NLS-Support for
 various Model-Attributes

---
 .../common/component/ControlFactory.java      | 24 ++++++--
 .../properties/ExternalizeStringHandler.java  | 55 ++++++++++++-------
 2 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 6e678f3ae7..1218ca93ea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map.Entry;
@@ -49,6 +50,7 @@
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.edit.command.AddCommand;
@@ -713,17 +715,29 @@ public static void createCheckBox(Composite parent, String label, IObservableVal
 	}
 
 	public static String getLocalizedLabel(ProjectOSGiTranslationProvider translationProvider, MUILabel element, String locale) {
+		return getLocalizedValue(translationProvider, (MApplicationElement) element, UiPackageImpl.Literals.UI_LABEL__LABEL, UiPackageImpl.Literals.UI_LABEL___GET_LOCALIZED_LABEL, locale);
+	}
+
+	public static String getLocalizedValue(ProjectOSGiTranslationProvider translationProvider, MApplicationElement element, EStructuralFeature feature, EOperation operation, String locale) {
+		EObject eo = (EObject) element;
 		if (translationProvider == null) {
-			if (element.getLocalizedLabel() != null && element.getLocalizedLabel().trim().length() > 0) {
-				return element.getLocalizedLabel();
+			try {
+				String value = (String) eo.eInvoke(operation, null);
+				if (value != null && value.trim().length() > 0) {
+					return value;
+				}
+			} catch (InvocationTargetException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
 			}
 		}
 
-		if (element.getLabel() != null && element.getLabel().trim().length() > 0) {
-			String label = element.getLabel();
-			return tr(translationProvider, locale, label);
+		String value = (String) eo.eGet(feature);
+		if (value != null && value.trim().length() > 0) {
+			return tr(translationProvider, locale, value);
 		}
 		return null;
+
 	}
 
 	public static String tr(ProjectOSGiTranslationProvider translationProvider, String locale, String label) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
index e6525b7f63..1ea30b803f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
@@ -20,11 +20,14 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.tools.services.Translation;
-import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -76,7 +79,9 @@ protected Control createDialogArea(Composite parent) {
 
 			Composite container = (Composite) super.createDialogArea(parent);
 			Table t = new Table(container, SWT.BORDER | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.CHECK);
-			t.setLayoutData(new GridData(GridData.FILL_BOTH));
+			GridData gd = new GridData(GridData.FILL_BOTH);
+			gd.heightHint = t.getItemHeight() * 15;
+			t.setLayoutData(gd);
 			t.setHeaderVisible(true);
 			t.setLinesVisible(true);
 
@@ -147,16 +152,27 @@ public String getText(Object element) {
 
 			List<String> ids = new ArrayList<String>();
 
+			List<EStructuralFeature> translatedFeatures = new ArrayList<EStructuralFeature>();
+			translatedFeatures.add(UiPackageImpl.Literals.UI_LABEL__LABEL);
+			translatedFeatures.add(UiPackageImpl.Literals.UI_LABEL__TOOLTIP);
+			translatedFeatures.add(CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME);
+			translatedFeatures.add(CommandsPackageImpl.Literals.COMMAND__DESCRIPTION);
+			translatedFeatures.add(CommandsPackageImpl.Literals.CATEGORY__NAME);
+			translatedFeatures.add(CommandsPackageImpl.Literals.CATEGORY__DESCRIPTION);
+			translatedFeatures.add(org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.PART__DESCRIPTION);
+			translatedFeatures.add(BasicPackageImpl.Literals.PART_DESCRIPTOR__DESCRIPTION);
+			translatedFeatures.add(MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS);
+
 			while (it.hasNext()) {
 				EObject o = it.next();
-				if (o instanceof MUILabel) {
-					MUILabel l = (MUILabel) o;
-					if (l.getLabel() != null && l.getLabel().startsWith("%")) { //$NON-NLS-1$
-						ids.add(l.getLabel());
-					}
 
-					if (l.getTooltip() != null && l.getTooltip().startsWith("%")) { //$NON-NLS-1$
-						ids.add(l.getTooltip());
+				for (EAttribute a : o.eClass().getEAllAttributes()) {
+					if (translatedFeatures.contains(a)) {
+						String v = (String) o.eGet(a);
+
+						if (v != null && v.startsWith("%")) { //$NON-NLS-1$
+							ids.add(v);
+						}
 					}
 				}
 			}
@@ -169,18 +185,15 @@ public String getText(Object element) {
 			it = EcoreUtil.getAllContents(list);
 			while (it.hasNext()) {
 				EObject o = it.next();
-				if (o instanceof MUILabel) {
-					MUILabel l = (MUILabel) o;
-					if (l.getLabel() != null && l.getLabel().trim().length() != 0 && !l.getLabel().startsWith("%")) { //$NON-NLS-1$
-						String id = findId(ids, o.eClass().getName().toLowerCase() + ".label"); //$NON-NLS-1$
-						entries.add(new Entry(o, UiPackageImpl.Literals.UI_LABEL__LABEL, id, l.getLabel()));
-						ids.add(id);
-					}
 
-					if (l.getTooltip() != null && l.getTooltip().trim().length() != 0 && !l.getTooltip().startsWith("%")) { //$NON-NLS-1$
-						String id = findId(ids, o.eClass().getName().toLowerCase() + ".tooltip"); //$NON-NLS-1$
-						entries.add(new Entry(o, UiPackageImpl.Literals.UI_LABEL__TOOLTIP, id, l.getTooltip()));
-						ids.add(id);
+				for (EAttribute a : o.eClass().getEAllAttributes()) {
+					if (translatedFeatures.contains(a)) {
+						String v = (String) o.eGet(a);
+						if (v != null && v.trim().length() > 0 && !v.startsWith("%")) { //$NON-NLS-1$
+							String id = findId(ids, o.eClass().getName().toLowerCase() + "." + a.getName().toLowerCase()); //$NON-NLS-1$
+							entries.add(new Entry(o, a, id, v));
+							ids.add(id);
+						}
 					}
 				}
 			}
@@ -206,7 +219,7 @@ protected void okPressed() {
 				try {
 					IFile f = getBasePropertyFile();
 
-					StringBuilder b = new StringBuilder(System.getProperty("line.separator"));
+					StringBuilder b = new StringBuilder(System.getProperty("line.separator")); //$NON-NLS-1$
 					for (Object o : els) {
 						Entry e = (Entry) o;
 						b.append(e.key + " = " + e.value + System.getProperty("line.separator")); //$NON-NLS-1$//$NON-NLS-2$

From 46a4e0801f26674e408686fb9393463a52b4255f Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Wed, 20 Apr 2011 16:19:07 +0000
Subject: [PATCH 0352/1286] Bug 343410 - [ModelTooling] Model editor's tree's
 label provider doesn't seem to update when 'visible' changes

---
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 1feb7bb362..d704b82c9b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -307,6 +307,8 @@ public void run() {
 			};
 			context.set(ProjectOSGiTranslationProvider.class, translationProvider);
 		}
+		labelFeaturePaths.add(FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		labelFeaturePaths.add(FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 	}
 
 	@PostConstruct

From f2bc14a91eabdf95f499af3eab60c518c6e43380 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Mon, 25 Apr 2011 06:59:25 +0000
Subject: [PATCH 0353/1286] Bug 343717 - [ModelTooling] Make rendered / visible
 color a preference

---
 .../editor3x/ModelEditorPreferencePage.java   | 105 +++++++++++-------
 .../META-INF/MANIFEST.MF                      |   3 +-
 .../org.eclipse.e4.tools.emf.ui/plugin.xml    |   6 +
 .../ui/internal/PreferenceInitializer.java    |  31 ++++++
 .../common/ComponentLabelProvider.java        |  33 ++++--
 .../emf/ui/internal/common/ModelEditor.java   |  44 ++++++++
 6 files changed, 171 insertions(+), 51 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
index 7bb2547f74..64315c76c1 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
@@ -1,28 +1,27 @@
 package org.eclipse.e4.tools.emf.editor3x;
 
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.preference.ColorFieldEditor;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.osgi.service.prefs.BackingStoreException;
+import org.eclipse.ui.preferences.ScopedPreferenceStore;
 
 public class ModelEditorPreferencePage extends PreferencePage implements
 		IWorkbenchPreferencePage {
-	private boolean autoCreateElementId;
-	private boolean showXMIId;
-	
-	private IEclipsePreferences node;
-	
+	private BooleanFieldEditor fAutoGeneratedId;
+	private BooleanFieldEditor fShowXMIId;
+	private ColorFieldEditor fColorValueNotRendered;
+	private ColorFieldEditor fColorValueNotVisible;
+	private ColorFieldEditor fColorValueNotVisibleAndRendered;
+
 	public ModelEditorPreferencePage() {
 	}
 
@@ -35,56 +34,76 @@ public ModelEditorPreferencePage(String title, ImageDescriptor image) {
 	}
 
 	public void init(IWorkbench workbench) {
-		node = new InstanceScope().getNode("org.eclipse.e4.tools.emf.ui");
-		autoCreateElementId = node.getBoolean("autoCreateElementId", false);
-		showXMIId = node.getBoolean("showXMIId", false);
+		setPreferenceStore(new ScopedPreferenceStore(InstanceScope.INSTANCE,"org.eclipse.e4.tools.emf.ui"));
 	}
 
 	@Override
 	protected Control createContents(Composite parent) {
-		Composite result= new Composite(parent, SWT.NONE);
-		result.setLayout(new GridLayout(2,false));
+		Composite result = new Composite(parent, SWT.NONE);
+		result.setLayout(new GridLayout());
+		
+		{
+			fColorValueNotRendered = new ColorFieldEditor("notRenderedColor", "Not rendered color", result);
+			fColorValueNotRendered.setPage(this);
+			fColorValueNotRendered.setPreferenceStore(getPreferenceStore());
+			fColorValueNotRendered.load();			
+		}
+
+		{
+			fColorValueNotVisible = new ColorFieldEditor("notVisibleColor", "Not visible color", result);
+			fColorValueNotVisible.setPage(this);
+			fColorValueNotVisible.setPreferenceStore(getPreferenceStore());
+			fColorValueNotVisible.load();			
+		}
 		
 		{
-		Label l = new Label(result, SWT.NONE);
-		l.setText("Autogenerate Element-Id");
-		final Button b = new Button(result, SWT.CHECK);
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				autoCreateElementId = b.getSelection();
-			}
-		});
+			fColorValueNotVisibleAndRendered = new ColorFieldEditor("notVisibleAndRenderedColor", "Not visible and not rendered color", result);
+			fColorValueNotVisibleAndRendered.setPage(this);
+			fColorValueNotVisibleAndRendered.setPreferenceStore(getPreferenceStore());
+			fColorValueNotVisibleAndRendered.load();			
 		}
 		
 		{
-		Label l = new Label(result, SWT.NONE);
-		l.setText("Show XMI:ID");
-		final Button b = new Button(result, SWT.CHECK);
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				showXMIId = b.getSelection();
-			}
-		});
+			Composite container = new Composite(result, SWT.NONE);
+			container.setLayoutData(new GridData(GridData.FILL,GridData.CENTER,false,false,2,1));
+			fAutoGeneratedId = new BooleanFieldEditor("autoCreateElementId", "Autogenerate Element-Id", container);
+			fAutoGeneratedId.setPage(this);
+			fAutoGeneratedId.setPreferenceStore(getPreferenceStore());
+			fAutoGeneratedId.load();			
+		}
+		
+		{
+			Composite container = new Composite(result, SWT.NONE);
+			container.setLayoutData(new GridData(GridData.FILL,GridData.CENTER,false,false,2,1));
+			fShowXMIId = new BooleanFieldEditor("showXMIId", "Show XMI:ID", container);
+			fShowXMIId.setPage(this);
+			fShowXMIId.setPreferenceStore(getPreferenceStore());
+			fShowXMIId.load();			
 		}
 		
 		return result;
 	}
-	
+
 	@Override
 	public boolean performOk() {
-		node.putBoolean("autoCreateElementId", autoCreateElementId);
-		node.putBoolean("showXMIId", showXMIId);
-		try {
-			node.flush();
-		} catch (BackingStoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+		fAutoGeneratedId.store();
+		fShowXMIId.store();
+		fColorValueNotRendered.store();
+		fColorValueNotVisible.store();
+		fColorValueNotVisibleAndRendered.store();
 		return super.performOk();
 	}
 
+	@Override
+	protected void performDefaults() {
+		fAutoGeneratedId.loadDefault();
+		fShowXMIId.loadDefault();
+		fColorValueNotRendered.loadDefault();
+		fColorValueNotVisible.loadDefault();
+		fColorValueNotVisibleAndRendered.loadDefault();
+		super.performDefaults();
+	}
+	
 	@Override
 	public void dispose() {
 		super.dispose();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 92554df36a..8d3f7496ce 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -30,7 +30,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.e4.tools.services;bundle-version="1.0.0",
  org.eclipse.e4.core.di.extensions;bundle-version="0.9.0",
  org.eclipse.jface.text;bundle-version="3.7.0",
- org.eclipse.e4.ui.widgets;bundle-version="1.0.0"
+ org.eclipse.e4.ui.widgets;bundle-version="1.0.0",
+ org.eclipse.equinox.preferences;bundle-version="3.4.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.runtime.jobs,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml b/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
index e01f13b902..91859ac65a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
@@ -9,5 +9,11 @@
             uri="css/default.css">
       </stylesheet>
    </extension>
+   <extension
+         point="org.eclipse.equinox.preferences.preferences">
+      <initializer
+            class="org.eclipse.e4.tools.emf.ui.internal.PreferenceInitializer">
+      </initializer>
+   </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
new file mode 100644
index 0000000000..bcfc2bbe2b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
@@ -0,0 +1,31 @@
+package org.eclipse.e4.tools.emf.ui.internal;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.resource.StringConverter;
+import org.eclipse.swt.graphics.RGB;
+
+public class PreferenceInitializer extends AbstractPreferenceInitializer {
+
+	@Override
+	public void initializeDefaultPreferences() {
+		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode("org.eclipse.e4.tools.emf.ui");
+
+		if (pref.get("notRenderedColor", null) == null) {
+			String val = StringConverter.asString(new RGB(200, 200, 200));
+			pref.put("notRenderedColor", val);
+		}
+
+		if (pref.get("notVisibleColor", null) == null) {
+			String val = StringConverter.asString(new RGB(200, 200, 200));
+			pref.put("notVisibleColor", val);
+		}
+
+		if (pref.get("notVisibleAndRenderedColor", null) == null) {
+			String val = StringConverter.asString(new RGB(200, 200, 200));
+			pref.put("notVisibleAndRenderedColor", val);
+		}
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index f7e54e99f7..187d5d0896 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -22,27 +22,42 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.graphics.TextStyle;
 
 public class ComponentLabelProvider extends StyledCellLabelProvider {
 
 	private ModelEditor editor;
 
-	private static final String NOT_RENDERED_KEY = "NOT_RENDERED_STYLER";//$NON-NLS-1$
+	public static final String NOT_RENDERED_KEY = "NOT_RENDERED_STYLER";//$NON-NLS-1$
+
+	public static final String NOT_VISIBLE_KEY = "NOT_VISIBLE_KEY";//$NON-NLS-1$
+
+	public static final String NOT_VISIBLE_AND_RENDERED_KEY = "NOT_VISIBLE_AND_RENDERED_KEY";//$NON-NLS-1$
 
 	private Font font;
 
 	private Messages Messages;
 
-	private static Styler NOT_RENDERED_STYLER = new Styler() {
-		{
-			JFaceResources.getColorRegistry().put(NOT_RENDERED_KEY, new RGB(200, 200, 200));
+	private static Styler BOTH_STYLER = new Styler() {
+		@Override
+		public void applyStyles(TextStyle textStyle) {
+			textStyle.foreground = JFaceResources.getColorRegistry().get(NOT_VISIBLE_AND_RENDERED_KEY);
+			textStyle.strikeout = true;
 		}
+	};
 
+	private static Styler NOT_RENDERED_STYLER = new Styler() {
 		@Override
 		public void applyStyles(TextStyle textStyle) {
 			textStyle.foreground = JFaceResources.getColorRegistry().get(NOT_RENDERED_KEY);
+			textStyle.strikeout = true;
+		}
+	};
+
+	private static Styler NOT_VISIBLE_STYLER = new Styler() {
+		@Override
+		public void applyStyles(TextStyle textStyle) {
+			textStyle.foreground = JFaceResources.getColorRegistry().get(NOT_VISIBLE_KEY);
 		}
 	};
 
@@ -63,9 +78,13 @@ public void update(final ViewerCell cell) {
 				Styler styler = null;
 
 				if (o instanceof MUIElement) {
-					if (!((MUIElement) o).isVisible()) {
+
+					if (!((MUIElement) o).isVisible() && !((MUIElement) o).isToBeRendered()) {
+						label += "<" + Messages.ComponentLabelProvider_invisible + "/" + Messages.ComponentLabelProvider_notrendered + ">"; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+						styler = BOTH_STYLER;
+					} else if (!((MUIElement) o).isVisible()) {
 						label += "<" + Messages.ComponentLabelProvider_invisible + ">"; //$NON-NLS-1$//$NON-NLS-2$
-						styler = NOT_RENDERED_STYLER;
+						styler = NOT_VISIBLE_STYLER;
 					} else if (!((MUIElement) o).isToBeRendered()) {
 						label += "<" + Messages.ComponentLabelProvider_notrendered + ">"; //$NON-NLS-1$ //$NON-NLS-2$
 						styler = NOT_RENDERED_STYLER;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index d704b82c9b..486a16d763 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -169,6 +169,7 @@
 import org.eclipse.jface.databinding.viewers.TreeStructureAdvisor;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.StringConverter;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentPartitioner;
@@ -197,6 +198,7 @@
 import org.eclipse.swt.dnd.TransferData;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -971,6 +973,48 @@ private void registerDefaultEditors() {
 		registerEditor(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT, ContextInjectionFactory.make(StringModelFragment.class, context));
 	}
 
+	@Inject
+	public void setNotVisibleColor(@Preference("notVisibleColor") String color) {
+		RGB current = JFaceResources.getColorRegistry().getRGB(ComponentLabelProvider.NOT_VISIBLE_KEY);
+
+		if (current == null || !current.equals(color)) {
+			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_VISIBLE_KEY, StringConverter.asRGB(color, new RGB(200, 200, 200)));
+		}
+
+		if (viewer != null) {
+			viewer.refresh();
+			viewer.getControl().redraw();
+		}
+	}
+
+	@Inject
+	public void setNotRenderedColor(@Preference("notRenderedColor") String color) {
+		RGB current = JFaceResources.getColorRegistry().getRGB(ComponentLabelProvider.NOT_RENDERED_KEY);
+
+		if (current == null || !current.equals(color)) {
+			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_RENDERED_KEY, StringConverter.asRGB(color, new RGB(200, 200, 200)));
+		}
+
+		if (viewer != null) {
+			viewer.refresh();
+			viewer.getControl().redraw();
+		}
+	}
+
+	@Inject
+	public void setNotVisibleRenderedColor(@Preference("notVisibleAndRenderedColor") String color) {
+		RGB current = JFaceResources.getColorRegistry().getRGB(ComponentLabelProvider.NOT_VISIBLE_AND_RENDERED_KEY);
+
+		if (current == null || !current.equals(color)) {
+			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_VISIBLE_AND_RENDERED_KEY, StringConverter.asRGB(color, new RGB(200, 200, 200)));
+		}
+
+		if (viewer != null) {
+			viewer.refresh();
+			viewer.getControl().redraw();
+		}
+	}
+
 	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
 		editorMap.put(eClass, editor);
 

From d99984bc14d23c9b634b1aa56056d05d80a0a2b0 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Tue, 26 Apr 2011 14:30:20 +0000
Subject: [PATCH 0354/1286] Bug 343850 - [Tooling] NPE in model editor

---
 .../tools/emf/ui/internal/common/component/PartStackEditor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index b46d543208..ae737f26f0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -272,7 +272,7 @@ public String getText(Object element) {
 				}
 			});
 			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.PLACEHOLDER });
-			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
+			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));

From 699918bb50a198616722d172661567025340c14c Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 12 May 2011 17:13:14 +0000
Subject: [PATCH 0355/1286] Bug 345629 - [ModelTooling] Removeing element
 leaves dangling references

---
 .../tools/emf/ui/common/XMIModelResource.java |   3 +
 .../e4/tools/emf/ui/internal/Messages.java    |   1 +
 .../tools/emf/ui/internal/Messages.properties |   5 +-
 .../emf/ui/internal/common/ModelEditor.java   |  15 +-
 .../common/component/ApplicationEditor.java   | 476 ++++++++++++++++++
 5 files changed, 488 insertions(+), 12 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
index ab131ba7b0..bca1aab957 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
@@ -39,6 +39,7 @@
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
 
 public class XMIModelResource implements IModelResource {
 	private EditingDomain editingDomain;
@@ -49,6 +50,8 @@ public class XMIModelResource implements IModelResource {
 
 	public XMIModelResource(URI uri) {
 		ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
 		ResourceSet resourceSet = new ResourceSetImpl();
 		BasicCommandStack commandStack = new BasicCommandStack();
 		commandStack.addCommandStackListener(new CommandStackListener() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 97ca0695dd..42e3378c03 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -604,4 +604,5 @@ public class Messages {
 	public String ObjectViewer_Tooltip_InjectionKey;
 	public String ObjectViewer_Script;
 
+	public String CommandWizard_ShellTitle;
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index d517011088..41dbdadb04 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -600,4 +600,7 @@ ExternalizeStringHandler_Dialog_DialogMessage=Externalizing manifest files extra
 
 ObjectViewer_Tooltip_Value=Value
 ObjectViewer_Tooltip_InjectionKey=Injection key
-ObjectViewer_Script=Execute Script
\ No newline at end of file
+ObjectViewer_Script=Execute Script
+
+
+CommandWizard_ShellTitle=Command/Handler wizard
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 486a16d763..381dd8bc04 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -156,9 +156,9 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.CommandParameter;
+import org.eclipse.emf.edit.command.DeleteCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuListener;
@@ -602,16 +602,9 @@ public void menuAboutToShow(IMenuManager manager) {
 							addSeparator = true;
 							manager.add(new Action(messages.ModelEditor_Delete, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
 								public void run() {
-									if (o.eContainingFeature().isMany()) {
-										Command cmd = RemoveCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), o.eContainer(), o.eContainingFeature(), o);
-										if (cmd.canExecute()) {
-											ModelEditor.this.modelProvider.getEditingDomain().getCommandStack().execute(cmd);
-										}
-									} else {
-										Command cmd = SetCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), o.eContainer(), o.eContainingFeature(), null);
-										if (cmd.canExecute()) {
-											ModelEditor.this.modelProvider.getEditingDomain().getCommandStack().execute(cmd);
-										}
+									Command cmd = DeleteCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), o);
+									if (cmd.canExecute()) {
+										ModelEditor.this.modelProvider.getEditingDomain().getCommandStack().execute(cmd);
 									}
 								}
 							});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 85f51b6953..93ef898799 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -10,6 +10,11 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
@@ -18,30 +23,63 @@
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.common.command.CompoundCommand;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.resource.ImageDescriptor;
+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.StructuredSelection;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class ApplicationEditor extends AbstractComponentEditor {
 
@@ -65,11 +103,33 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	@Optional
 	private IProject project;
 
+	private List<Action> actions = new ArrayList<Action>();
+
 	@Inject
 	public ApplicationEditor() {
 		super();
 	}
 
+	@PostConstruct
+	void init() {
+		// actions.add(new Action("Command Wizard ...") {
+		// @Override
+		// public void run() {
+		// doCreateCommandWizard();
+		// }
+		// });
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		return actions;
+	}
+
+	void doCreateCommandWizard() {
+		WizardDialog dialog = new WizardDialog(composite.getShell(), new CommandWizard((MApplication) getMaster().getValue()));
+		dialog.open();
+	}
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
@@ -289,4 +349,420 @@ public String getDetailLabel(Object element) {
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
+
+	class CommandWizard extends Wizard {
+		private MApplication application;
+
+		private HandlerCommandPage handlerPage;
+		private KeybindingPage keyPage;
+		private MenuWizardPage menuPage;
+		private ToolbarWizardPage toolbarPage;
+
+		public CommandWizard(MApplication application) {
+			this.application = application;
+		}
+
+		@Override
+		public void addPages() {
+			getShell().setText(Messages.CommandWizard_ShellTitle);
+			setDefaultPageImageDescriptor(ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Wizban16_newexp_wiz)));
+			handlerPage = new HandlerCommandPage("Handler and Command");
+			addPage(handlerPage);
+
+			keyPage = new KeybindingPage("Keybinding", application);
+			addPage(keyPage);
+
+			menuPage = new MenuWizardPage("Menu", application);
+			addPage(menuPage);
+
+			toolbarPage = new ToolbarWizardPage("Toolbar", application);
+			addPage(toolbarPage);
+		}
+
+		@Override
+		public boolean performFinish() {
+
+			MCommand command = CommandsFactoryImpl.eINSTANCE.createCommand();
+			MHandler handler = CommandsFactoryImpl.eINSTANCE.createHandler();
+			MKeyBinding keyBinding = null;
+
+			String parentId = application.getElementId();
+
+			String prefix = parentId != null && parentId.trim().length() > 0 ? parentId + "." : ""; //$NON-NLS-1$ //$NON-NLS-2$
+
+			if (handlerPage.idField.getText().trim().length() > 0) {
+				command.setElementId(prefix + "commands." + handlerPage.idField.getText().trim()); //$NON-NLS-1$
+				handler.setElementId(prefix + "handlers." + handlerPage.idField.getText().trim()); //$NON-NLS-1$
+			}
+
+			if (!application.getBindingTables().isEmpty()) {
+				if (keyPage.keyField.getText().trim().length() > 0 && !keyPage.bindtableViewer.getSelection().isEmpty()) {
+					keyBinding = CommandsFactoryImpl.eINSTANCE.createKeyBinding();
+					keyBinding.setKeySequence(keyPage.keyField.getText().trim());
+					keyBinding.setCommand(command);
+
+				}
+			}
+
+			command.setCommandName(handlerPage.nameField.getText());
+			handler.setCommand(command);
+
+			CompoundCommand cmd = new CompoundCommand();
+			cmd.append(AddCommand.create(getEditingDomain(), application, ApplicationPackageImpl.Literals.APPLICATION__COMMANDS, command));
+			cmd.append(AddCommand.create(getEditingDomain(), application, CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, handler));
+
+			if (keyBinding != null) {
+				cmd.append(AddCommand.create(getEditingDomain(), ((IStructuredSelection) keyPage.bindtableViewer.getSelection()).getFirstElement(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, keyBinding));
+			}
+
+			if (cmd.canExecute()) {
+				getEditingDomain().getCommandStack().execute(cmd);
+				return true;
+			}
+
+			return false;
+		}
+	}
+
+	class HandlerCommandPage extends WizardPage {
+		public Text idField;
+		public Text nameField;
+
+		public HandlerCommandPage(String pageName) {
+			super(pageName);
+		}
+
+		public void createControl(Composite parent) {
+			setTitle("Command/Handler");
+			setMessage("Insert informations for Command and Handler");
+
+			Composite group = new Composite(parent, SWT.NONE);
+			group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			group.setLayout(new GridLayout(3, false));
+
+			{
+				Label l = new Label(group, SWT.NONE);
+				l.setText("Id");
+
+				idField = new Text(group, SWT.BORDER);
+				idField.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			}
+
+			{
+				Label l = new Label(group, SWT.NONE);
+				l.setText("Name" + "*");
+
+				nameField = new Text(group, SWT.BORDER);
+				nameField.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+				nameField.addModifyListener(new ModifyListener() {
+
+					public void modifyText(ModifyEvent e) {
+						setPageComplete(nameField.getText().trim().length() > 0);
+					}
+				});
+			}
+
+			{
+				Label l = new Label(group, SWT.NONE);
+				l.setText("Class");
+
+				Text t = new Text(group, SWT.BORDER);
+				t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+				Button b = new Button(group, SWT.PUSH | SWT.FLAT);
+				b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			}
+
+			setControl(group);
+		}
+
+		@Override
+		public boolean isPageComplete() {
+			return nameField.getText().trim().length() > 0;
+		}
+	}
+
+	class KeybindingPage extends WizardPage {
+
+		private Text keyField;
+		private TableViewer bindtableViewer;
+		private MApplication application;
+
+		public KeybindingPage(String pageName, MApplication application) {
+			super(pageName);
+			this.application = application;
+		}
+
+		public void createControl(Composite parent) {
+			setTitle("Keybinding");
+			setMessage("Insert informations for a keybinding");
+
+			Composite group = new Composite(parent, SWT.NONE);
+			group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			group.setLayout(new GridLayout(2, false));
+
+			{
+				Label l = new Label(group, SWT.NONE);
+				l.setText("Sequence");
+
+				keyField = new Text(group, SWT.BORDER);
+				keyField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+				keyField.addModifyListener(new ModifyListener() {
+
+					public void modifyText(ModifyEvent e) {
+						bindtableViewer.getControl().setEnabled(isPageComplete());
+						setPageComplete(isPageComplete());
+					}
+				});
+			}
+
+			{
+				Label l = new Label(group, SWT.NONE);
+				l.setText("Binding Table");
+				l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+				bindtableViewer = new TableViewer(group);
+				bindtableViewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
+				bindtableViewer.setContentProvider(new ArrayContentProvider());
+				bindtableViewer.setInput(application.getBindingTables());
+				bindtableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+
+					public void selectionChanged(SelectionChangedEvent event) {
+						setPageComplete(isPageComplete());
+					}
+				});
+				bindtableViewer.setSelection(new StructuredSelection(application.getBindingTables().get(0)));
+				GridData gd = new GridData(GridData.FILL_BOTH);
+				gd.heightHint = bindtableViewer.getTable().getItemHeight() * 5;
+				bindtableViewer.getControl().setLayoutData(gd);
+				bindtableViewer.getControl().setEnabled(false);
+			}
+
+			setControl(group);
+		}
+
+		@Override
+		public boolean isPageComplete() {
+			if (keyField.getText().trim().isEmpty()) {
+				return true;
+			} else {
+				return !bindtableViewer.getSelection().isEmpty();
+			}
+		}
+	}
+
+	class MenuWizardPage extends WizardPage {
+		private MApplication application;
+		private Text labelField;
+		private Text iconField;
+		private ComboViewer typeViewer;
+		private TableViewer menuViewer;
+
+		public MenuWizardPage(String pageName, MApplication application) {
+			super(pageName);
+			this.application = application;
+		}
+
+		public void createControl(Composite parent) {
+			setTitle("Handled Menu Item");
+			setMessage("Insert informations for a Handled Menu Item");
+
+			Composite group = new Composite(parent, SWT.NONE);
+			group.setLayout(new GridLayout(2, false));
+			group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+			{
+				Label l = new Label(group, SWT.NONE);
+				l.setText("Label");
+
+				labelField = new Text(group, SWT.BORDER);
+				labelField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			}
+
+			{
+				Label l = new Label(group, SWT.NONE);
+				l.setText("Icon");
+
+				iconField = new Text(group, SWT.BORDER);
+				iconField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			}
+
+			{
+				Label l = new Label(group, SWT.NONE);
+				l.setText("Type");
+
+				typeViewer = new ComboViewer(group, SWT.READ_ONLY);
+				typeViewer.setContentProvider(new ArrayContentProvider());
+				typeViewer.setInput(ItemType.values());
+				typeViewer.setSelection(new StructuredSelection(ItemType.PUSH));
+			}
+
+			{
+				Label l = new Label(group, SWT.NONE);
+				l.setText("Parent");
+				l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+				menuViewer = new TableViewer(group);
+				menuViewer.setLabelProvider(new HiearchyLabelProvider());
+				menuViewer.setContentProvider(new ArrayContentProvider());
+
+				List<MMenu> menuList = new ArrayList<MMenu>();
+				Iterator<EObject> it = EcoreUtil.getAllContents(Collections.singleton(application));
+				while (it.hasNext()) {
+					EObject o = it.next();
+					if (MenuPackageImpl.Literals.MENU.isSuperTypeOf(o.eClass())) {
+						menuList.add((MMenu) o);
+					}
+				}
+				menuViewer.setInput(menuList);
+				menuViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+
+					public void selectionChanged(SelectionChangedEvent event) {
+						setPageComplete(isPageComplete());
+					}
+				});
+				GridData gd = new GridData(GridData.FILL_BOTH);
+				gd.heightHint = menuViewer.getTable().getItemHeight() * 5;
+				menuViewer.getControl().setLayoutData(gd);
+				menuViewer.setSelection(new StructuredSelection(menuList.get(0)));
+			}
+
+			setControl(group);
+		}
+
+		@Override
+		public boolean isPageComplete() {
+			if (labelField.getText().trim().isEmpty() && iconField.getText().trim().isEmpty()) {
+				return true;
+			} else {
+				return !menuViewer.getSelection().isEmpty();
+			}
+		}
+	}
+
+	class ToolbarWizardPage extends WizardPage {
+		private MApplication application;
+		private Text labelField;
+		private Text iconField;
+		private ComboViewer typeViewer;
+		private TableViewer toolbarViewer;
+
+		public ToolbarWizardPage(String pageName, MApplication application) {
+			super(pageName);
+			this.application = application;
+		}
+
+		public void createControl(Composite parent) {
+			setTitle("Handled Toolbar Item");
+			setMessage("Insert informations for a Toolbar Item");
+
+			Composite group = new Composite(parent, SWT.NONE);
+			group.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false, 2, 1));
+			group.setLayout(new GridLayout(2, false));
+
+			{
+				Label l = new Label(group, SWT.NONE);
+				l.setText("Label");
+
+				labelField = new Text(group, SWT.BORDER);
+				labelField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			}
+
+			{
+				Label l = new Label(group, SWT.NONE);
+				l.setText("Icon");
+
+				iconField = new Text(group, SWT.BORDER);
+				iconField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			}
+
+			{
+				Label l = new Label(group, SWT.NONE);
+				l.setText("Type");
+
+				typeViewer = new ComboViewer(group, SWT.READ_ONLY);
+				// viewer.setLabelProvider(labelProvider)
+				typeViewer.setContentProvider(new ArrayContentProvider());
+				typeViewer.setInput(ItemType.values());
+			}
+
+			{
+				Label l = new Label(group, SWT.NONE);
+				l.setText("Parent");
+				l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+				toolbarViewer = new TableViewer(group);
+				toolbarViewer.setLabelProvider(new HiearchyLabelProvider());
+				toolbarViewer.setContentProvider(new ArrayContentProvider());
+
+				List<MToolBar> toolbarList = new ArrayList<MToolBar>();
+				Iterator<EObject> it = EcoreUtil.getAllContents(Collections.singleton(application));
+				while (it.hasNext()) {
+					EObject o = it.next();
+					if (MenuPackageImpl.Literals.TOOL_BAR.isSuperTypeOf(o.eClass())) {
+						toolbarList.add((MToolBar) o);
+					}
+				}
+				toolbarViewer.setInput(toolbarList);
+				toolbarViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+
+					public void selectionChanged(SelectionChangedEvent event) {
+						setPageComplete(isPageComplete());
+					}
+				});
+				GridData gd = new GridData(GridData.FILL_BOTH);
+				gd.heightHint = toolbarViewer.getTable().getItemHeight() * 5;
+				toolbarViewer.getControl().setLayoutData(gd);
+				toolbarViewer.setSelection(new StructuredSelection(toolbarList.get(0)));
+			}
+
+			setControl(group);
+		}
+
+		@Override
+		public boolean isPageComplete() {
+			if (labelField.getText().trim().isEmpty() && iconField.getText().trim().isEmpty()) {
+				return true;
+			} else {
+				return !toolbarViewer.getSelection().isEmpty();
+			}
+		}
+	}
+
+	class HiearchyLabelProvider extends StyledCellLabelProvider {
+
+		@Override
+		public void update(ViewerCell cell) {
+			EObject o = (EObject) cell.getElement();
+
+			String label = ""; //$NON-NLS-1$
+			Image img = null;
+			AbstractComponentEditor elementEditor = getEditor().getEditor(o.eClass());
+			if (elementEditor != null) {
+				label = elementEditor.getDetailLabel(o);
+				label = label == null ? elementEditor.getLabel(o) : label;
+				img = elementEditor.getImage(o, composite.getDisplay());
+			}
+
+			List<String> parentPath = new ArrayList<String>();
+			while (o.eContainer() != null) {
+				o = o.eContainer();
+				elementEditor = getEditor().getEditor(o.eClass());
+				if (elementEditor != null) {
+					parentPath.add(0, elementEditor.getLabel(o));
+				}
+			}
+
+			String parentString = ""; //$NON-NLS-1$
+			for (String p : parentPath) {
+				parentString += "/" + p; //$NON-NLS-1$
+			}
+
+			StyledString s = new StyledString(label);
+			s.append(" - " + parentString, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+			cell.setStyleRanges(s.getStyleRanges());
+			cell.setText(s.getString());
+			cell.setImage(img);
+		}
+	}
 }
\ No newline at end of file

From 0008a46a5f9927400e0aa05e5b18f2340f2c0745 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Thu, 12 May 2011 17:24:34 +0000
Subject: [PATCH 0356/1286] Bug 345629 - [ModelTooling] Removeing element
 leaves dangling references

---
 .../ui/internal/common/component/ApplicationEditor.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 93ef898799..846494bc0c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -395,7 +395,7 @@ public boolean performFinish() {
 				handler.setElementId(prefix + "handlers." + handlerPage.idField.getText().trim()); //$NON-NLS-1$
 			}
 
-			if (!application.getBindingTables().isEmpty()) {
+			if (application.getBindingTables().size() != 0) {
 				if (keyPage.keyField.getText().trim().length() > 0 && !keyPage.bindtableViewer.getSelection().isEmpty()) {
 					keyBinding = CommandsFactoryImpl.eINSTANCE.createKeyBinding();
 					keyBinding.setKeySequence(keyPage.keyField.getText().trim());
@@ -543,7 +543,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 
 		@Override
 		public boolean isPageComplete() {
-			if (keyField.getText().trim().isEmpty()) {
+			if (keyField.getText().trim().length() == 0) {
 				return true;
 			} else {
 				return !bindtableViewer.getSelection().isEmpty();
@@ -632,7 +632,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 
 		@Override
 		public boolean isPageComplete() {
-			if (labelField.getText().trim().isEmpty() && iconField.getText().trim().isEmpty()) {
+			if (labelField.getText().trim().length() == 0 && iconField.getText().trim().length() == 0) {
 				return true;
 			} else {
 				return !menuViewer.getSelection().isEmpty();
@@ -721,7 +721,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 
 		@Override
 		public boolean isPageComplete() {
-			if (labelField.getText().trim().isEmpty() && iconField.getText().trim().isEmpty()) {
+			if (labelField.getText().trim().length() == 0 && iconField.getText().trim().length() == 0) {
 				return true;
 			} else {
 				return !toolbarViewer.getSelection().isEmpty();

From 8d47924adb769b4658b083fcd8a2c6670fa5f4c2 Mon Sep 17 00:00:00 2001
From: Thomas Schindl <tschindl>
Date: Fri, 3 Jun 2011 15:20:56 +0000
Subject: [PATCH 0357/1286] Bug 348223 - The bridge feature should require same
 version as ui.css


From f718aa48ede7f4e25c248a7f550e00542b381ba0 Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster>
Date: Fri, 3 Jun 2011 15:26:08 +0000
Subject: [PATCH 0358/1286] Bug 348123 - Annotation @PostConstruct not found by
 injector We use javax.annotation;version="1.0.0" in Eclipse 4

---
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF   | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF   | 4 ++--
 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 8e138e6925..a030a2864f 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -13,9 +13,9 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.tools.services;bundle-version="1.0.0",
  org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
  org.eclipse.e4.ui.di;bundle-version="0.9.0",
- javax.inject;bundle-version="1.0.0",
  org.eclipse.core.databinding;bundle-version="1.4.0"
 Service-Component: OSGI-INF/selectionproviderfunction.xml
 Export-Package: org.eclipse.e4.tools.compat.parts
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
+Import-Package: javax.inject;version="1.0.0"
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 8d3f7496ce..4765b76f2d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -26,14 +26,14 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.equinox.registry;bundle-version="3.5.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",
  org.eclipse.e4.ui.di;bundle-version="0.9.0",
- javax.annotation;bundle-version="1.0.0",
  org.eclipse.e4.tools.services;bundle-version="1.0.0",
  org.eclipse.e4.core.di.extensions;bundle-version="0.9.0",
  org.eclipse.jface.text;bundle-version="3.7.0",
  org.eclipse.e4.ui.widgets;bundle-version="1.0.0",
  org.eclipse.equinox.preferences;bundle-version="3.4.0"
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.inject;version="1.0.0",
+Import-Package: javax.annotation;version="1.0.0",
+ javax.inject;version="1.0.0",
  org.eclipse.core.runtime.jobs,
  org.osgi.framework;version="1.5.0"
 Export-Package: org.eclipse.e4.tools.emf.ui.common,
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 25140262a7..191444710d 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -10,10 +10,10 @@ Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
  org.eclipse.equinox.common;bundle-version="3.6.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",
- javax.annotation;bundle-version="1.0.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0",
- javax.inject;bundle-version="1.0.0",
  org.eclipse.osgi;bundle-version="3.7.0",
  org.eclipse.e4.core.services;bundle-version="0.9.1"
 Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml, OSGI-INF/messagefactoryservice.xml, OSGI-INF/translationsupplier.xml
 Bundle-ActivationPolicy: lazy
+Import-Package: javax.annotation;version="1.0.0",
+ javax.inject;version="1.0.0"

From 827996460f2d3b4aae99da2259a826ef5a8b972d Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster>
Date: Tue, 14 Jun 2011 00:25:39 +0000
Subject: [PATCH 0359/1286] Bug 349255 - [releng] Change our bundle version
 numbers for 4.1

---
 .../org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF  |  4 ++--
 .../META-INF/MANIFEST.MF                              |  6 +++---
 .../org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF  |  6 +++---
 .../META-INF/MANIFEST.MF                              |  2 +-
 .../META-INF/MANIFEST.MF                              |  2 +-
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF     |  2 +-
 .../org.eclipse.e4.core.tools.feature/feature.xml     | 11 +++++------
 7 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index a030a2864f..0e792e7af8 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.11.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.core.services;bundle-version="0.9.1",
  org.eclipse.e4.ui.services;bundle-version="0.9.1",
  org.eclipse.e4.core.di;bundle-version="0.9.0",
- org.eclipse.e4.tools.services;bundle-version="1.0.0",
+ org.eclipse.e4.tools.services;bundle-version="0.11.0",
  org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
  org.eclipse.e4.ui.di;bundle-version="0.9.0",
  org.eclipse.core.databinding;bundle-version="1.4.0"
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 20ae981b14..a75d4ceb82 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
@@ -23,8 +23,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.core.services;bundle-version="0.9.1",
  org.eclipse.emf.edit;bundle-version="2.6.0",
  org.eclipse.e4.ui.services;bundle-version="0.9.1",
- org.eclipse.e4.tools.compat;bundle-version="1.0.0",
- org.eclipse.e4.tools.services;bundle-version="1.0.0",
+ org.eclipse.e4.tools.compat;bundle-version="0.11.0",
+ org.eclipse.e4.tools.services;bundle-version="0.11.0",
  org.eclipse.e4.tools;bundle-version="0.9.0",
  org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 4765b76f2d..7abd03fc96 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -26,10 +26,10 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.equinox.registry;bundle-version="3.5.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",
  org.eclipse.e4.ui.di;bundle-version="0.9.0",
- org.eclipse.e4.tools.services;bundle-version="1.0.0",
+ org.eclipse.e4.tools.services;bundle-version="0.11.0",
  org.eclipse.e4.core.di.extensions;bundle-version="0.9.0",
  org.eclipse.jface.text;bundle-version="3.7.0",
- org.eclipse.e4.ui.widgets;bundle-version="1.0.0",
+ org.eclipse.e4.ui.widgets;bundle-version="0.11.0",
  org.eclipse.equinox.preferences;bundle-version="3.4.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.0.0",
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index 1a967cb340..a38d2608f1 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: e4 Templates
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 191444710d..22da85cdd8 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.11.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.e4.tools.services,
  org.eclipse.e4.tools.services.impl;x-friends:="org.eclipse.e4.tools.emf.ui"
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 3e8068527a..51cbe5ed5f 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.pde.core;bundle-version="3.6.0",
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 488acb9168..c56823a4ff 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="0.9.0.qualifier"
+      version="0.10.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -58,20 +58,19 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
-    <plugin
+
+   <plugin
          id="org.eclipse.e4.tools.emf.ui.script.js"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
-    <plugin
+
+   <plugin
          id="org.mozilla.javascript"
          download-size="0"
          install-size="0"
          version="1.7.2.qualifier"
          unpack="false"/>
-         
 
 </feature>

From 169082386d56c3fd84eed0c6bd5b2698ea536e45 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Thu, 4 Aug 2011 20:11:36 +0200
Subject: [PATCH 0360/1286] Bug 352781 - [tools] [0.12] compile errors *
 adjusted to changed API in internal PDE class

---
 .../e4/internal/tools/wizards/project/PluginContentPage.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
index 6fb9ae3f8b..8f0c5ae0cb 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
@@ -139,7 +139,7 @@ private void createPluginPropertiesGroup(Composite container) {
 
 		label = new Label(propertiesGroup, SWT.NONE);
 		label.setText(PDEUIMessages.ContentPage_pprovider);
-		fProviderText = createText(propertiesGroup, propertiesListener, 2);
+		fProviderCombo = createProviderCombo(propertiesGroup, propertiesListener, 2);
 
 		createExecutionEnvironmentControls(propertiesGroup);
 	}

From be0a3222f2c6a530a4491ee130fa75ed5c148d46 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Mon, 15 Aug 2011 20:04:01 +0200
Subject: [PATCH 0361/1286] Bug 354748 - [Tooling] Removal of tags not working
 e.g. on PartStack

---
 .../common/component/ControlFactory.java      | 46 +++++++++++++++----
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 1218ca93ea..5d25804862 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -24,6 +24,7 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BindingContextSelectionDialog;
@@ -32,13 +33,11 @@
 import org.eclipse.e4.tools.services.IClipboardService.Handler;
 import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
-import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.commands.MBindings;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationFactoryImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MContext;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -80,8 +79,12 @@
 import org.eclipse.swt.dnd.TextTransfer;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.TraverseEvent;
+import org.eclipse.swt.events.TraverseListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -622,8 +625,9 @@ public void widgetSelected(SelectionEvent e) {
 					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 					if (s.size() == 1) {
 						Object obj = s.getFirstElement();
-						MContext container = (MContext) editor.getMaster().getValue();
-						int idx = container.getVariables().indexOf(obj) - 1;
+						EObject container = (EObject) editor.getMaster().getValue();
+						List<?> l = (List<?>) container.eGet(feature);
+						int idx = l.indexOf(obj) - 1;
 						if (idx >= 0) {
 							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), feature, obj, idx);
 
@@ -649,9 +653,10 @@ public void widgetSelected(SelectionEvent e) {
 					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 					if (s.size() == 1) {
 						Object obj = s.getFirstElement();
-						MContext container = (MApplication) editor.getMaster().getValue();
-						int idx = container.getVariables().indexOf(obj) + 1;
-						if (idx < container.getVariables().size()) {
+						EObject container = (EObject) editor.getMaster().getValue();
+						List<?> l = (List<?>) container.eGet(feature);
+						int idx = l.indexOf(obj) + 1;
+						if (idx < l.size()) {
 							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), feature, obj, idx);
 
 							if (cmd.canExecute()) {
@@ -673,13 +678,13 @@ public void widgetSelected(SelectionEvent e) {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (!viewer.getSelection().isEmpty()) {
-					MContext el = (MContext) editor.getMaster().getValue();
+					EObject el = (EObject) editor.getMaster().getValue();
 					List<?> ids = ((IStructuredSelection) viewer.getSelection()).toList();
 					Command cmd = RemoveCommand.create(editor.getEditingDomain(), el, feature, ids);
 					if (cmd.canExecute()) {
 						editor.getEditingDomain().getCommandStack().execute(cmd);
-						if (el.getVariables().size() > 0) {
-							viewer.setSelection(new StructuredSelection(el.getVariables().get(0)));
+						if (ids.size() > 0) {
+							viewer.setSelection(new StructuredSelection(ids.get(0)));
 						}
 					}
 				}
@@ -748,4 +753,25 @@ public static String tr(ProjectOSGiTranslationProvider translationProvider, Stri
 		}
 		return label;
 	}
+
+	public static void attachFiltering(Text searchText, final TableViewer viewer, final PatternFilter filter) {
+		searchText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				filter.setPattern(((Text) e.widget).getText());
+				viewer.refresh();
+				if (viewer.getTable().getItemCount() > 0) {
+					Object data = viewer.getTable().getItem(0).getData();
+					viewer.setSelection(new StructuredSelection(data));
+				}
+			}
+		});
+		searchText.addTraverseListener(new TraverseListener() {
+
+			public void keyTraversed(TraverseEvent e) {
+				if (e.keyCode == SWT.ARROW_DOWN && viewer.getTable().getItemCount() > 0) {
+					viewer.getControl().setFocus();
+				}
+			}
+		});
+	}
 }
\ No newline at end of file

From ef082d363e98d094b5006422c5a189b64395ef48 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Mon, 15 Aug 2011 20:04:18 +0200
Subject: [PATCH 0362/1286] Bug 354053 - [Tooling] [E4XMI Editor Dialogs]
 Forward Arrow Keys from Textbox to Listbox

---
 .../dialogs/AbstractCommandSelectionDialog.java        | 10 ++--------
 .../dialogs/BindingContextSelectionDialog.java         | 10 ++--------
 .../dialogs/CommandCategorySelectionDialog.java        |  9 +++------
 .../common/component/dialogs/ExpressionIdDialog.java   | 10 ++--------
 .../component/dialogs/FeatureSelectionDialog.java      |  8 --------
 .../common/component/dialogs/SharedElementsDialog.java | 10 ++--------
 6 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index b0034d2080..cc0c7086cb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -15,6 +15,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -37,8 +38,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -121,12 +120,7 @@ protected boolean isParentMatch(Viewer viewer, Object element) {
 		};
 		viewer.addFilter(filter);
 
-		searchText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				filter.setPattern(((Text) e.widget).getText());
-				viewer.refresh();
-			}
-		});
+		ControlFactory.attachFiltering(searchText, viewer, filter);
 
 		return composite;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
index bffd28ba97..faadd680fd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
@@ -15,6 +15,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
 import org.eclipse.e4.ui.model.application.commands.MBindingContext;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.emf.common.util.TreeIterator;
@@ -35,8 +36,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -118,12 +117,7 @@ protected boolean isParentMatch(Viewer viewer, Object element) {
 		};
 		viewer.addFilter(filter);
 
-		searchText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				filter.setPattern(((Text) e.widget).getText());
-				viewer.refresh();
-			}
-		});
+		ControlFactory.attachFiltering(searchText, viewer, filter);
 
 		return composite;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
index 2df3390307..cdb3a163d1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
+
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
@@ -118,12 +120,7 @@ protected boolean isParentMatch(Viewer viewer, Object element) {
 		};
 		viewer.addFilter(filter);
 
-		searchText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				filter.setPattern(((Text) e.widget).getText());
-				viewer.refresh();
-			}
-		});
+		ControlFactory.attachFiltering(searchText, viewer, filter);
 
 		return composite;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
index 12eaf29494..7090bf33b8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
@@ -17,6 +17,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IExtensionLookup;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
 import org.eclipse.e4.ui.model.application.ui.MCoreExpression;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -35,8 +36,6 @@
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -85,13 +84,8 @@ protected boolean isParentMatch(Viewer viewer, Object element) {
 				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);
 			}
 		};
-		idField.addModifyListener(new ModifyListener() {
 
-			public void modifyText(ModifyEvent e) {
-				filter.setPattern(((Text) e.widget).getText());
-				viewer.refresh();
-			}
-		});
+		ControlFactory.attachFiltering(idField, viewer, filter);
 
 		l = new Label(container, SWT.NONE);
 		viewer = new TableViewer(container);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index d0cfce3825..bf39936e97 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -43,8 +43,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -132,12 +130,6 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 		final ViewerFilterImpl filter = new ViewerFilterImpl();
 
 		viewer.addFilter(filter);
-		searchText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				filter.setPattern(searchText.getText());
-				viewer.refresh();
-			}
-		});
 
 		viewer.setInput(Util.loadPackages());
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index ce28f7fc02..dd9c7af57b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -17,6 +17,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -45,8 +46,6 @@
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -129,12 +128,7 @@ protected boolean isParentMatch(Viewer viewer, Object element) {
 		};
 		viewer.addFilter(filter);
 
-		searchText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				filter.setPattern(((Text) e.widget).getText());
-				viewer.refresh();
-			}
-		});
+		ControlFactory.attachFiltering(searchText, viewer, filter);
 
 		return comp;
 	}

From 3b0b3ce1bbd7b855b88fea4de6dfb9da09bac61b Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Wed, 14 Sep 2011 17:15:24 +0200
Subject: [PATCH 0363/1286] Bug 357634 - Application.e4xmi missing entries when
 created by New>e4>Model>New Application Model

---
 .../model/BaseApplicationModelWizard.java     |  5 +-
 .../model/NewApplicationModelWizard.java      | 49 +++++++++++++++++++
 .../model/NewContributionModelWizard.java     |  6 +++
 .../tools/wizards/model/NewModelFilePage.java |  8 +++
 4 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index d6b5699180..72f8463605 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -33,6 +33,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
@@ -63,10 +64,12 @@ public BaseApplicationModelWizard() {
 	 */
 
 	public void addPages() {
-		page = new NewModelFilePage(selection,getDefaultFileName());
+		page = createWizardPage(selection);
 		addPage(page);
 	}
 
+	protected abstract NewModelFilePage createWizardPage(ISelection selection);
+	
 	public abstract String getDefaultFileName();
 	
 	@Override
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
index 7b625052be..8e030bb61d 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
@@ -11,9 +11,15 @@
 package org.eclipse.e4.internal.tools.wizards.model;
 
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.e4.ui.model.application.MAddon;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
 
 
 public class NewApplicationModelWizard extends BaseApplicationModelWizard {
@@ -27,10 +33,53 @@ protected EObject createInitialModel() {
 		MApplication application = MApplicationFactory.INSTANCE.createApplication();
 		try {
 			application.setElementId(getModelFile().getProject().getName() + ".application");
+			if( ((ModelFilePageImpl)getPages()[0]).includeDefaultAddons.getSelection() ) {
+				String[][] addons = { 
+					{ "org.eclipse.e4.core.commands.service", "platform:/plugin/org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon" },
+					{ "org.eclipse.e4.ui.contexts.service", "platform:/plugin/org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon" },
+					{ "org.eclipse.e4.ui.bindings.service", "platform:/plugin/org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon" },
+					{ "org.eclipse.e4.ui.workbench.commands.model", "platform:/plugin/org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon" },
+					{ "org.eclipse.e4.ui.workbench.contexts.model", "platform:/plugin/org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon" },
+					{ "org.eclipse.e4.ui.workbench.bindings.model", "platform:/plugin/org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon" }
+					
+				};
+				
+				for( String[] a : addons ) {
+					MAddon addon = MApplicationFactory.INSTANCE.createAddon();
+					addon.setElementId(a[0]);
+					addon.setContributionURI(a[1]);
+					application.getAddons().add(addon);
+				}
+			}
 		} catch (CoreException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		return (EObject) application;
 	}
+	
+	@Override
+	protected NewModelFilePage createWizardPage(ISelection selection) {
+		return new ModelFilePageImpl(selection,getDefaultFileName());
+	}
+	
+	static class ModelFilePageImpl extends NewModelFilePage {
+
+		private Button includeDefaultAddons;
+
+		public ModelFilePageImpl(ISelection selection, String defaultFilename) {
+			super(selection, defaultFilename);
+		}
+
+		@Override
+		protected void createAdditionalControls(Composite parent) {
+			super.createAdditionalControls(parent);
+			
+			new Label(parent, SWT.NONE);
+			
+			includeDefaultAddons = new Button(parent, SWT.CHECK);
+			includeDefaultAddons.setText("Include default addons");
+			includeDefaultAddons.setSelection(true);
+		}
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
index 04d252f610..3c9873e6b2 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
@@ -12,6 +12,7 @@
 
 import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.viewers.ISelection;
 
 
 public class NewContributionModelWizard extends BaseApplicationModelWizard {
@@ -24,4 +25,9 @@ public String getDefaultFileName() {
 	protected EObject createInitialModel() {
 		return (EObject) MFragmentFactory.INSTANCE.createModelFragments();
 	}
+	
+	@Override
+	protected NewModelFilePage createWizardPage(ISelection selection) {
+		return new NewModelFilePage(selection,getDefaultFileName());
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
index 4cb85960be..634ea30ce8 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
@@ -98,11 +98,19 @@ public void modifyText(ModifyEvent e) {
 				dialogChanged();
 			}
 		});
+		
+		new Label(container, SWT.NONE);
+		
+		createAdditionalControls(container);
 		initialize();
 		dialogChanged();
 		setControl(container);
 	}
 
+	protected void createAdditionalControls(Composite parent) {
+		
+	}
+	
 	/**
 	 * Tests if the current workbench selection is a suitable container to use.
 	 */

From 3f7d808eba38669a16b3c8f022b093bb5bfe33f0 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Sun, 18 Sep 2011 13:21:07 +0200
Subject: [PATCH 0364/1286] Bug 351421 - E4 Application wizard should add
 Application.e4xmi, plugin.xml and the css and icons folders to
 build.properties

---
 .../wizards/project/E4NewProjectWizard.java   | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 541ebdf860..921f3b4d7a 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -66,13 +66,17 @@
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.pde.core.build.IBuildEntry;
+import org.eclipse.pde.core.build.IBuildModelFactory;
 import org.eclipse.pde.core.plugin.IPluginBase;
 import org.eclipse.pde.core.plugin.IPluginElement;
 import org.eclipse.pde.core.plugin.IPluginExtension;
 import org.eclipse.pde.core.plugin.IPluginImport;
 import org.eclipse.pde.internal.core.ICoreConstants;
+import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
 import org.eclipse.pde.internal.core.bundle.WorkspaceBundlePluginModel;
 import org.eclipse.pde.internal.core.plugin.WorkspacePluginModelBase;
+import org.eclipse.pde.internal.core.project.PDEProject;
 import org.eclipse.pde.internal.core.util.CoreUtility;
 import org.eclipse.pde.internal.ui.PDEPlugin;
 import org.eclipse.pde.internal.ui.PDEUIMessages;
@@ -207,14 +211,41 @@ protected void setPluginLibraries(
 
 			this.createApplicationResources(fProjectProvider.getProject(),
 					new NullProgressMonitor());
-
+			// Add the product sources
+			adjustBuildPropertiesFile(fProjectProvider.getProject());
 			return true;
 		} catch (InvocationTargetException e) {
 			PDEPlugin.logException(e);
 		} catch (InterruptedException e) {
+		} catch (CoreException e) {
+			PDEPlugin.logException(e);
 		}
 		return false;
 	}
+	
+	private void adjustBuildPropertiesFile(IProject project) throws CoreException {
+		IFile file = PDEProject.getBuildProperties(project);
+		if (file.exists()) {
+			WorkspaceBuildModel model = new WorkspaceBuildModel(file);
+			IBuildEntry e = model.getBuild().getEntry(IBuildEntry.BIN_INCLUDES);
+			
+			e.addToken("plugin.xml");
+			
+			Map<String, String> map = fApplicationPage.getData();
+			String cssEntry = map.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
+			if( cssEntry != null ) {
+				e.addToken(cssEntry);	
+			}
+			
+			String xmiPath = map
+					.get(NewApplicationWizardPage.APPLICATION_XMI_PROPERTY);
+			if( xmiPath != null ) {
+				e.addToken(xmiPath);	
+			}
+			
+			model.save();
+		}
+	}
 
 	/**
 	 * create products extension detail

From 3eb3228eb3701d860d2392b4aecc2fb671e64710 Mon Sep 17 00:00:00 2001
From: Bogdan Gheorghe <gheorghe@ca.ibm.com>
Date: Thu, 27 Oct 2011 10:45:12 -0400
Subject: [PATCH 0365/1286] XText-based css editor


From 3e3da3ce8dacb300616bf785f1e6d57ff21608b4 Mon Sep 17 00:00:00 2001
From: Bogdan Gheorghe <gheorghe@ca.ibm.com>
Date: Thu, 27 Oct 2011 11:10:52 -0400
Subject: [PATCH 0366/1286] Added CSS editor ui improvements


From 617b36ddaf7d2b0d060264168da1dd54699e863b Mon Sep 17 00:00:00 2001
From: Bogdan Gheorghe <gheorghe@ca.ibm.com>
Date: Thu, 27 Oct 2011 11:41:20 -0400
Subject: [PATCH 0367/1286] Add feature for CSS editor


From a2b9c6c05f8de3020b7f7ce0df60d619dd356c67 Mon Sep 17 00:00:00 2001
From: Bogdan Gheorghe <gheorghe@ca.ibm.com>
Date: Tue, 1 Nov 2011 16:39:14 -0400
Subject: [PATCH 0368/1286] Add CSSEditorPrefs tweaklet


From f802c154d59dadfa5c311f0e1e2324c583918b18 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Wed, 16 Nov 2011 17:17:58 -0500
Subject: [PATCH 0369/1286] Initial contribution of the CSS Spy


From d200e33b8738de0768affaaa27c4fd319f27185e Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 17 Nov 2011 08:08:09 -0500
Subject: [PATCH 0370/1286] Some minor rearrangements of the
 interesting-details dump, fix highlighting for shells (already in display
 coordinates), and avoid querying CSS selector for empty string.


From 779f57adc34ba81ee03a7b29ddfca4dc970f5f04 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 17 Nov 2011 09:21:04 -0500
Subject: [PATCH 0371/1286] Apply Eclipse formatting standard


From 23c595b1edeb5c119e05fdc6ecf0c29008eb7548 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 17 Nov 2011 09:22:01 -0500
Subject: [PATCH 0372/1286] Rename CSSHandler to CSSPropertyProvider


From ed294fe0998945f7e479b40ee547b95318112c8d Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 17 Nov 2011 09:22:16 -0500
Subject: [PATCH 0373/1286] Use new CSSEngine#getCSSPropertyHandlers()


From c34f848f3684fbe8ec6ab6975a169456344d4095 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 17 Nov 2011 10:46:46 -0500
Subject: [PATCH 0374/1286] More message tweaking


From 7d4ddef19f1776965d7f16c9467b62755b0e872d Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 17 Nov 2011 17:16:43 -0500
Subject: [PATCH 0375/1286] Add composite layout as it can be helpful for
 debugging


From a5119d54b9aa21f136b9485d66f870224b6cc404 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Fri, 18 Nov 2011 10:27:32 -0500
Subject: [PATCH 0376/1286] Use proper per-column label providers and enable
 tooltips.


From 85e4c24ec9c764f55484a13e11769f5f59a8baef Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Fri, 18 Nov 2011 11:07:09 -0500
Subject: [PATCH 0377/1286] Add support for editing and changing CSS properties
 for the selected widget


From f007009247bdbee8268cc5191e5b692061b0072b Mon Sep 17 00:00:00 2001
From: Bogdan Gheorghe <gheorghe@ca.ibm.com>
Date: Wed, 30 Nov 2011 23:35:18 -0500
Subject: [PATCH 0378/1286] CSSEditorPreferences page


From be31cd1c1db5c50f38f4b4a5c8cc946acd8a84e0 Mon Sep 17 00:00:00 2001
From: Bogdan Gheorghe <gheorghe@ca.ibm.com>
Date: Thu, 1 Dec 2011 17:50:52 -0500
Subject: [PATCH 0379/1286] Use new model service API for hosting MPart


From dfbabb17e7131ec5a5d9242960014a99f29a92f4 Mon Sep 17 00:00:00 2001
From: Bogdan Gheorghe <gheorghe@ca.ibm.com>
Date: Fri, 2 Dec 2011 16:35:27 -0500
Subject: [PATCH 0380/1286] Updated bundle version for CSS editor & CSS editor
 UI


From fc0e228755ae1ca09a6f4ed5461a1aa3956cb309 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Sun, 4 Dec 2011 21:55:48 -0500
Subject: [PATCH 0381/1286] Make CSS Spy a bit more robust to unexpected
 inputs, including not assuming children from WidgetElements are themselves
 widgets (e.g., SWT_AWT bridge)


From d1df77e2870ebb8696f35fdf068308f4892dbf7c Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Sun, 4 Dec 2011 21:56:46 -0500
Subject: [PATCH 0382/1286] Add feature for the CSS Spy


From 1d026be0dddb71e16dc74f4098a66b55985b05a1 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Mon, 5 Dec 2011 14:06:01 -0500
Subject: [PATCH 0383/1286] CSS Spy: Fix creeping 1.6'isms, and fixup the
 feature


From a1ec7197b6c808bed1cb617c11ece152c8e1e000 Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Mon, 5 Dec 2011 15:35:45 -0500
Subject: [PATCH 0384/1286] Bug 365018 - [CSS] Add missing support to CSS
 engine Add css spy feature


From c196a122763a5754b5c740f6265392da2a5ec140 Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Tue, 6 Dec 2011 10:09:21 -0500
Subject: [PATCH 0385/1286] Bug 365018 - [CSS] Add missing support to CSS
 engine

Need a build.properties, or it won't work.

From a5eccef0420dadd8bfd0c36b66b3224db69fabcf Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Tue, 6 Dec 2011 16:44:33 -0500
Subject: [PATCH 0386/1286] [Spy] Guard against possible NPEs


From 9af66d890c229980969af712bce4bb07909bda6c Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 8 Dec 2011 12:33:24 -0500
Subject: [PATCH 0387/1286] Add support for application snippets

---
 .../e4/tools/emf/ui/internal/Messages.java    |   3 +
 .../tools/emf/ui/internal/Messages.properties |   3 +
 .../emf/ui/internal/common/ModelEditor.java   |   3 +
 .../common/component/ApplicationEditor.java   |   7 +
 .../component/virtual/VSnippetsEditor.java    | 321 ++++++++++++++++++
 5 files changed, 337 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 42e3378c03..3b0e0830c1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -48,6 +48,7 @@ public class Messages {
 	public String ApplicationEditor_Windows;
 	public String ApplicationEditor_Addons;
 	public String ApplicationEditor_MenuContributions;
+	public String ApplicationEditor_Snippets;
 	public String ApplicationEditor_ToolBarContributions;
 	public String ApplicationEditor_TrimContributions;
 	public String ApplicationEditor_RootContexts;
@@ -426,6 +427,8 @@ public class Messages {
 	public String VPartDescriptor_Descriptors;
 	public String VPartDescriptor_AddPartDescriptor;
 
+	public String VSnippetsEditor_Snippets;
+
 	public String VToolBarContributionsEditor_Contributions;
 	public String VToolBarContributionsEditor_TreeLabelDescription;
 	public String VToolBarContributionsEditor_TreeLabel;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 41dbdadb04..27b4e90d58 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -45,6 +45,7 @@ ApplicationEditor_Commands=Commands
 ApplicationEditor_Windows=Windows
 ApplicationEditor_Addons=Addons
 ApplicationEditor_MenuContributions=Menu Contributions
+ApplicationEditor_Snippets=Snippets
 ApplicationEditor_ToolBarContributions=Toolbar Contributions
 ApplicationEditor_TrimContributions=Trim Contributions
 ApplicationEditor_RootContexts=Binding Contexts
@@ -425,6 +426,8 @@ VPartDescriptor_TreeLabelDescription=Part Descriptors Bla Bla Bla Bla Bla
 VPartDescriptor_Descriptors=Descriptors
 VPartDescriptor_AddPartDescriptor=Descriptor
 
+VSnippetsEditor_Snippets=Snippets;
+
 VToolBarContributionsEditor_TreeLabel=ToolBar Contributions
 VToolBarContributionsEditor_TreeLabelDescription=ToolBar Contributions Bla Bla Bla Bla Bla
 VToolBarContributionsEditor_Contributions=ToolBar Contributions
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 381dd8bc04..730a1f2ad6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -113,6 +113,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPerspectiveControlEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPerspectiveWindowsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VRootBindingContexts;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VSnippetsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VToolBarContributionsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VTrimContributionsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowControlEditor;
@@ -236,6 +237,7 @@ public class ModelEditor {
 	public static final String VIRTUAL_MENUELEMENTS = ModelEditor.class.getName() + ".VIRTUAL_MENUELEMENTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_ROOT_CONTEXTS = ModelEditor.class.getName() + ".VIRTUAL_ROOT_CONTEXTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_PERSPECTIVE_CONTROLS = ModelEditor.class.getName() + "VIRTUAL_PERSPECTIVE_CONTROLS"; //$NON-NLS-1$
+	public static final String VIRTUAL_SNIPPETS = ModelEditor.class.getName() + "VIRTUAL_SNIPPETS"; //$NON-NLS-1$
 
 	private static final int VERTICAL_RULER_WIDTH = 20;
 
@@ -880,6 +882,7 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_PARAMETERS, ContextInjectionFactory.make(VItemParametersEditor.class, context));
 		registerVirtualEditor(VIRTUAL_ROOT_CONTEXTS, ContextInjectionFactory.make(VRootBindingContexts.class, context));
 		registerVirtualEditor(VIRTUAL_PERSPECTIVE_CONTROLS, ContextInjectionFactory.make(VPerspectiveControlEditor.class, context));
+		registerVirtualEditor(VIRTUAL_SNIPPETS, ContextInjectionFactory.make(VSnippetsEditor.class, context));
 	}
 
 	private void registerVirtualEditor(String id, AbstractComponentEditor editor) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 846494bc0c..b5675746f3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -95,6 +95,7 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private IListProperty MENU_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS);
 	private IListProperty TOOLBAR_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS);
 	private IListProperty TRIM_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS);
+	private IListProperty APPLICATION__SNIPPETS = EMFProperties.list(UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS);
 	private IListProperty APPLICATION__CATEGORIES = EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES);
 
 	private IListProperty BINDING_TABLE_CONTAINER__ROOT_CONTEXT = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT);
@@ -311,6 +312,12 @@ protected boolean accepted(Object o) {
 				return true;
 			}
 		});
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_SNIPPETS, APPLICATION__SNIPPETS, element, Messages.ApplicationEditor_Snippets) {
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+		});
 		//
 		// MApplication application = (MApplication) element;
 		// if (application.getRootContext() != null) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
new file mode 100644
index 0000000000..1932fa060e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -0,0 +1,321 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.PostConstruct;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+
+public class VSnippetsEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private TableViewer viewer;
+	private List<Action> actions = new ArrayList<Action>();
+	private EStructuralFeature targetFeature;
+
+	public VSnippetsEditor() {
+		super();
+		this.targetFeature = UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS;
+	}
+
+	@PostConstruct
+	void init() {
+		actions.add(new Action(Messages.VWindowEditor_AddTrimmedWindow, createImageDescriptor(ResourceProvider.IMG_Window)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.TRIMMED_WINDOW);
+			}
+		});
+		actions.add(new Action(Messages.VWindowEditor_AddWindow, createImageDescriptor(ResourceProvider.IMG_Window)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.WINDOW);
+			}
+		});
+		actions.add(new Action(Messages.VWindowControlEditor_AddPerspectiveStack, createImageDescriptor(ResourceProvider.IMG_PerspectiveStack)) {
+			@Override
+			public void run() {
+				handleAdd(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK);
+			}
+		});
+		actions.add(new Action(Messages.PerspectiveStackEditor_AddPerspective, createImageDescriptor(ResourceProvider.IMG_Perspective)) {
+			@Override
+			public void run() {
+				handleAdd(AdvancedPackageImpl.Literals.PERSPECTIVE);
+			}
+		});
+
+		actions.add(new Action(Messages.VWindowControlEditor_AddPartSashContainer, createImageDescriptor(ResourceProvider.IMG_PartSashContainer_vertical)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
+			}
+		});
+
+		actions.add(new Action(Messages.VWindowControlEditor_AddPartStack, createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.PART_STACK);
+			}
+		});
+
+		actions.add(new Action(Messages.VWindowControlEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.PART);
+			}
+		});
+
+		actions.add(new Action(Messages.VWindowControlEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.INPUT_PART);
+			}
+		});
+
+		actions.add(new Action(Messages.VWindowControlEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area_vertical)) {
+			@Override
+			public void run() {
+				handleAdd(AdvancedPackageImpl.Literals.AREA);
+			}
+		});
+		actions.add(new Action(Messages.VWindowTrimEditor_AddWindowTrim, createImageDescriptor(ResourceProvider.IMG_WindowTrim)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.TRIM_BAR);
+			}
+		});
+		actions.add(new Action(Messages.VTrimContributionsEditor_AddTrimContribution, createImageDescriptor(ResourceProvider.IMG_TrimContribution)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.TRIM_ELEMENT);
+			}
+		});
+
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.VWindowControlEditor_TreeLabel;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return Messages.VWindowControlEditor_TreeLabelDescription;
+	}
+
+	@Override
+	public Composite doGetEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent, context, getMaster());
+		}
+		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		Label l = new Label(parent, SWT.NONE);
+		l.setText(Messages.VSnippetsEditor_Snippets);
+		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
+
+		viewer = new TableViewer(parent);
+		ObservableListContentProvider cp = new ObservableListContentProvider();
+		viewer.setContentProvider(cp);
+		viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
+		GridData gd = new GridData(GridData.FILL_BOTH);
+		viewer.getControl().setLayoutData(gd);
+
+		Composite buttonComp = new Composite(parent, SWT.NONE);
+		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+		GridLayout gl = new GridLayout(2, false);
+		gl.marginLeft = 0;
+		gl.marginRight = 0;
+		gl.marginWidth = 0;
+		gl.marginHeight = 0;
+		buttonComp.setLayout(gl);
+
+		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+
+		b.setText(Messages.ModelTooling_Common_Up);
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+		b.addSelectionListener(new SelectionAdapter() {
+			@SuppressWarnings("unchecked")
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						EObject container = (EObject) getMaster().getValue();
+						List<Object> l = (List<Object>) container.eGet(targetFeature);
+						int idx = l.indexOf(obj) - 1;
+						if (idx >= 0) {
+							if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx, targetFeature)) {
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+
+					}
+				}
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ModelTooling_Common_Down);
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+		b.addSelectionListener(new SelectionAdapter() {
+			@SuppressWarnings("unchecked")
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						EObject container = (EObject) getMaster().getValue();
+						List<Object> l = (List<Object>) container.eGet(targetFeature);
+						int idx = l.indexOf(obj) + 1;
+						if (idx < l.size()) {
+							if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx, targetFeature)) {
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+					}
+				}
+			}
+		});
+
+		final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+		childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		childrenDropDown.setContentProvider(new ArrayContentProvider());
+		childrenDropDown.setLabelProvider(new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				EClass eclass = (EClass) element;
+				return eclass.getName();
+			}
+		});
+		childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW, AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, AdvancedPackageImpl.Literals.PERSPECTIVE, AdvancedPackageImpl.Literals.AREA, BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, BasicPackageImpl.Literals.TRIM_BAR, BasicPackageImpl.Literals.TRIM_ELEMENT, });
+		childrenDropDown.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE));
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+				handleAdd(eClass);
+			}
+		});
+
+		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ModelTooling_Common_Remove);
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					List<?> windows = ((IStructuredSelection) viewer.getSelection()).toList();
+					MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+					Command cmd = RemoveCommand.create(getEditingDomain(), container, targetFeature, windows);
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						if (container.getChildren().size() > 0) {
+							viewer.setSelection(new StructuredSelection(container.getChildren().get(0)));
+						}
+					}
+				}
+			}
+		});
+
+		folder.setSelection(0);
+
+		return folder;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return null;
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
+
+	protected void handleAdd(EClass eClass) {
+		EObject handler = EcoreUtil.create(eClass);
+		setElementId(handler);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), targetFeature, handler);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(handler);
+		}
+	}
+}
\ No newline at end of file

From 8751ad430ce4ab756be880e9f2b9e192c82d714c Mon Sep 17 00:00:00 2001
From: droberts <dean_roberts@ca.ibm.com>
Date: Thu, 19 Jan 2012 12:28:35 -0500
Subject: [PATCH 0388/1286] Bug 307458 - Using 'platform:/plugin' URI on
 handlers is not a good idea

---
 .../emf/ui/common/ContributionURIValidator.java    |  4 ++--
 .../wizards/model/NewApplicationModelWizard.java   | 12 ++++++------
 .../tools/wizards/project/E4NewProjectWizard.java  | 14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
index 77f9dc4c92..115cac4c6b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
@@ -25,8 +25,8 @@ public IStatus validate(Object value) {
 		} else {
 			try {
 				URI uri = URI.createURI(value.toString());
-				if (uri.segmentCount() != 3) {
-					return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", "The uri has to have the format 'platform:/plugin/$$bundleId$$/$$className$$'");
+				if (uri.authority() == null || uri.authority().length() == 0 || uri.segmentCount() != 1) {
+					return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", "The uri has to have the format 'bundleclass://$$bundleId$$/$$className$$'");
 				}
 			} catch (Exception e) {
 				return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", e.getMessage());
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
index 8e030bb61d..8d5d78fdc1 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
@@ -35,12 +35,12 @@ protected EObject createInitialModel() {
 			application.setElementId(getModelFile().getProject().getName() + ".application");
 			if( ((ModelFilePageImpl)getPages()[0]).includeDefaultAddons.getSelection() ) {
 				String[][] addons = { 
-					{ "org.eclipse.e4.core.commands.service", "platform:/plugin/org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon" },
-					{ "org.eclipse.e4.ui.contexts.service", "platform:/plugin/org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon" },
-					{ "org.eclipse.e4.ui.bindings.service", "platform:/plugin/org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon" },
-					{ "org.eclipse.e4.ui.workbench.commands.model", "platform:/plugin/org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon" },
-					{ "org.eclipse.e4.ui.workbench.contexts.model", "platform:/plugin/org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon" },
-					{ "org.eclipse.e4.ui.workbench.bindings.model", "platform:/plugin/org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon" }
+					{ "org.eclipse.e4.core.commands.service", "bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon" },
+					{ "org.eclipse.e4.ui.contexts.service", "bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon" },
+					{ "org.eclipse.e4.ui.bindings.service", "bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon" },
+					{ "org.eclipse.e4.ui.workbench.commands.model", "bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon" },
+					{ "org.eclipse.e4.ui.workbench.contexts.model", "bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon" },
+					{ "org.eclipse.e4.ui.workbench.bindings.model", "bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon" }
 					
 				};
 				
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 921f3b4d7a..32bc24f6dd 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -398,32 +398,32 @@ public void createApplicationResources(IProject project,
 
 			MAddon addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.core.commands.service");
-			addon.setContributionURI("platform:/plugin/org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon");
+			addon.setContributionURI("bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon");
 			application.getAddons().add(addon);
 
 			addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.ui.contexts.service");
-			addon.setContributionURI("platform:/plugin/org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon");
+			addon.setContributionURI("bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon");
 			application.getAddons().add(addon);
 
 			addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.ui.bindings.service");
-			addon.setContributionURI("platform:/plugin/org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon");
+			addon.setContributionURI("bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon");
 			application.getAddons().add(addon);
 
 			addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.ui.workbench.commands.model");
-			addon.setContributionURI("platform:/plugin/org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon");
+			addon.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon");
 			application.getAddons().add(addon);
 
 			addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.ui.workbench.contexts.model");
-			addon.setContributionURI("platform:/plugin/org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon");
+			addon.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon");
 			application.getAddons().add(addon);
 
 			addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.ui.workbench.bindings.model");
-			addon.setContributionURI("platform:/plugin/org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon");
+			addon.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon");
 			application.getAddons().add(addon);
 
 			MBindingContext rootContext = MCommandsFactory.INSTANCE
@@ -647,7 +647,7 @@ private MCommand createCommand(String name, String className,
 			// Create Quit handler for command
 			MHandler quitHandler = MCommandsFactory.INSTANCE.createHandler();
 			quitHandler.setCommand(command);
-			quitHandler.setContributionURI("platform:/plugin/" + projectName
+			quitHandler.setContributionURI("bundleclass://" + projectName
 					+ "/" + fragment.getElementName() + ".handlers."
 					+ className);
 			application.getHandlers().add(quitHandler);

From 3694f8ff772197fd57ecc5395b41f9bb46566c0b Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Wed, 25 Jan 2012 15:20:35 -0500
Subject: [PATCH 0389/1286] Bugzilla 307458 - Using 'platform:/plugin' URI on
 handlers

Final changes to tools
---
 .../eclipse/e4/tools/emf/editor3x/ClassMoveParticipant.java   | 2 +-
 .../eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java | 4 ++--
 .../tools/emf/editor3x/extension/AddonContributionEditor.java | 4 ++--
 .../emf/editor3x/extension/HandlerContributionEditor.java     | 4 ++--
 .../tools/emf/editor3x/extension/PartContributionEditor.java  | 4 ++--
 .../e4/tools/emf/ui/common/ContributionURIValidator.java      | 2 +-
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java  | 4 ++--
 .../common/component/dialogs/ContributionClassDialog.java     | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassMoveParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassMoveParticipant.java
index 0c883aa0c7..675979aaa4 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassMoveParticipant.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassMoveParticipant.java
@@ -46,7 +46,7 @@ public Change createChange(IProgressMonitor pm) throws CoreException,
 		String toBundle = Util.getBundleSymbolicName(fragment.getJavaProject().getProject());
 		String toClassName = fragment.getElementName().length() == 0 ? type.getElementName() : fragment.getElementName() + "." + type.getElementName();
 		
-		return RefactorParticipantDelegate.createChange(pm, this, "platform:/plugin/"+fromBundle+"/"+fromClassname, "platform:/plugin/"+toBundle+"/"+toClassName);
+		return RefactorParticipantDelegate.createChange(pm, this, "bundleclass://"+fromBundle+"/"+fromClassname, "bundleclass://"+toBundle+"/"+toClassName);
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java
index 7547109159..e053cda698 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java
@@ -50,8 +50,8 @@ public Change createChange(IProgressMonitor pm) throws CoreException,
 			OperationCanceledException {
 		String bundle = Util.getBundleSymbolicName(type.getJavaProject().getProject());
 		
-		final String newUrl = "platform:/plugin/" + bundle + "/" + (type.getPackageFragment().getElementName().length() == 0 ? getArguments().getNewName() : type.getPackageFragment().getElementName() + "." + getArguments().getNewName());
-		String oldUrl = "platform:/plugin/" + bundle + "/" + type.getFullyQualifiedName().replace(".", "\\.");
+		final String newUrl = "bundleclass://" + bundle + "/" + (type.getPackageFragment().getElementName().length() == 0 ? getArguments().getNewName() : type.getPackageFragment().getElementName() + "." + getArguments().getNewName());
+		String oldUrl = "bundleclass://" + bundle + "/" + type.getFullyQualifiedName().replace(".", "\\.");
 		return RefactorParticipantDelegate.createChange(pm, this, oldUrl, newUrl);
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
index a1da6fd58e..a37f124260 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
@@ -53,7 +53,7 @@ public void createOpen(MContribution contribution, EditingDomain domain,
 
 	private void createOpen(MContribution contribution, EditingDomain domain,
 			IProject project, Shell shell, boolean forceNew) {
-		if( forceNew || contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 || !contribution.getContributionURI().startsWith("platform:") ) {
+		if( forceNew || contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 || !contribution.getContributionURI().startsWith("bundleclass:") ) {
 			NewAddonClassWizard wizard = new NewAddonClassWizard();
 			wizard.init( null, new StructuredSelection(project));
 			WizardDialog dialog = new WizardDialog(shell, wizard);
@@ -74,7 +74,7 @@ private void createOpen(MContribution contribution, EditingDomain domain,
 						fullyQualified = wizard.getDomainClass().getName();
 					}
 					
-					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "platform:/plugin/" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified);
+					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "bundleclass://" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified);
 					if( cmd.canExecute() ) {
 						domain.getCommandStack().execute(cmd);
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
index e8e1ca2a58..d1be445ea5 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
@@ -43,7 +43,7 @@ public void createOpen(MContribution contribution, EditingDomain domain, IProjec
 	}
 	
 	private void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell, boolean forceNew) {
-		if( contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 || !contribution.getContributionURI().startsWith("platform:") ) {
+		if( contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 || !contribution.getContributionURI().startsWith("bundleclass:") ) {
 			NewHandlerClassWizard wizard = new NewHandlerClassWizard();
 			wizard.init( null, new StructuredSelection(project));
 			WizardDialog dialog = new WizardDialog(shell, wizard);
@@ -64,7 +64,7 @@ private void createOpen(MContribution contribution, EditingDomain domain, IProje
 						fullyQualified = wizard.getDomainClass().getName();
 					}
 					
-					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "platform:/plugin/" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified);
+					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "bundleclass://" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified);
 					if( cmd.canExecute() ) {
 						domain.getCommandStack().execute(cmd);
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
index 22561f88c2..7383e50f5d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
@@ -45,7 +45,7 @@ private void createOpen(MContribution contribution, EditingDomain domain,
 			IProject project, Shell shell, boolean forceNew) {
 		if ( forceNew || contribution.getContributionURI() == null
 				|| contribution.getContributionURI().trim().length() == 0
-				|| !contribution.getContributionURI().startsWith("platform:")) {
+				|| !contribution.getContributionURI().startsWith("bundleclass:")) {
 			NewPartClassWizard wizard = new NewPartClassWizard();
 			wizard.init(null, new StructuredSelection(project));
 			WizardDialog dialog = new WizardDialog(shell, wizard);
@@ -66,7 +66,7 @@ private void createOpen(MContribution contribution, EditingDomain domain,
 						fullyQualified = wizard.getDomainClass().getName();
 					}
 					
-					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "platform:/plugin/" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified);
+					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "bundleclass://" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified);
 					if( cmd.canExecute() ) {
 						domain.getCommandStack().execute(cmd);
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
index 115cac4c6b..4ec3193764 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
@@ -20,7 +20,7 @@ public class ContributionURIValidator implements IValidator {
 	public IStatus validate(Object value) {
 		if (value == null) {
 			return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", "The URI must not be empty!");
-		} else if (!value.toString().startsWith("platform:/plugin")) {
+		} else if (!value.toString().startsWith("bundleclass:")) {
 			return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", "The URI has to start with 'platform:/plugin'");
 		} else {
 			try {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 730a1f2ad6..31e5bf0e2c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -854,7 +854,7 @@ private void registerContributedVirtualEditors() {
 			}
 
 			IContributionFactory fact = context.get(IContributionFactory.class);
-			AbstractComponentEditor editor = (AbstractComponentEditor) fact.create("platform:/plugin/" + el.getContributor().getName() + "/" + el.getAttribute("class"), context); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			AbstractComponentEditor editor = (AbstractComponentEditor) fact.create("bundleclass://" + el.getContributor().getName() + "/" + el.getAttribute("class"), context); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			registerVirtualEditor(el.getAttribute("id"), editor); //$NON-NLS-1$
 		}
 	}
@@ -906,7 +906,7 @@ private void registerContributedEditors() {
 				IEditorDescriptor desc = (IEditorDescriptor) el.createExecutableExtension("descriptorClass"); //$NON-NLS-1$
 				EClass eClass = desc.getEClass();
 				IContributionFactory fact = context.get(IContributionFactory.class);
-				AbstractComponentEditor editor = (AbstractComponentEditor) fact.create("platform:/plugin/" + el.getContributor().getName() + "/" + desc.getEditorClass().getName(), context); //$NON-NLS-1$ //$NON-NLS-2$
+				AbstractComponentEditor editor = (AbstractComponentEditor) fact.create("bundleclass://" + el.getContributor().getName() + "/" + desc.getEditorClass().getName(), context); //$NON-NLS-1$ //$NON-NLS-2$
 				registerEditor(eClass, editor);
 			} catch (CoreException e) {
 				// TODO Auto-generated catch block
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index d7664cf431..50b4056fb0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -162,7 +162,7 @@ protected void okPressed() {
 		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 		if (!s.isEmpty()) {
 			ContributionData cd = (ContributionData) s.getFirstElement();
-			String uri = "platform:/plugin/" + cd.bundleName + "/" + cd.className; //$NON-NLS-1$ //$NON-NLS-2$
+			String uri = "bundleclass://" + cd.bundleName + "/" + cd.className; //$NON-NLS-1$ //$NON-NLS-2$
 			Command cmd = SetCommand.create(editingDomain, contribution, feature, uri);
 			if (cmd.canExecute()) {
 				editingDomain.getCommandStack().execute(cmd);

From ad69c4784e2b1c184e17655f8a1ec507996368e0 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 26 Jan 2012 15:14:47 -0500
Subject: [PATCH 0390/1286] Update class-open actions for new bundleclass URI

---
 .../extension/AddonContributionEditor.java    | 84 ++++++++++---------
 .../extension/HandlerContributionEditor.java  | 14 ++--
 .../extension/PartContributionEditor.java     | 84 ++++++++++---------
 3 files changed, 94 insertions(+), 88 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
index a37f124260..023ecb2b24 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
@@ -84,47 +84,49 @@ private void createOpen(MContribution contribution, EditingDomain domain,
 				}
 			}
 		} else {
-			URI uri = URI.createURI(contribution.getContributionURI());
-			if (uri.segmentCount() == 3) {
-				IProject p = ResourcesPlugin.getWorkspace().getRoot()
-						.getProject(uri.segment(1));
-				
-				if( ! p.exists() ) {
-					for( IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects() ) {
-						String name = Util.getBundleSymbolicName(check);
-						if( uri.segment(1).equals(name) ) {
-							p = check;
-							break;
-						}
-					}
-				}
-				
-				// TODO If this is not a WS-Resource we need to open differently
-				if (p != null) {
-					IJavaProject jp = JavaCore.create(p);
-					try {
-						IType t = jp.findType(uri.segment(2));
-						if( t != null ) {
-							JavaUI.openInEditor(t);
-						} else {
-							if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+uri.segment(2)+"' was not found. Would you like to start the class creation wizard?") ) {
-								createOpen(contribution, domain, project, shell, true);
-							}
-						}
-					} catch (JavaModelException e) {
-						if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+uri.segment(2)+"' was not found. Would you like to start the class creation wizard?") ) {
-							createOpen(contribution, domain, project, shell, true);
-						}
-					} catch (PartInitException e) {
-						MessageDialog.openError(shell, "Failed to open editor", e.getMessage());
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-			} else {
-				MessageDialog.openError(shell, "Invalid URL",
-						"The current url is invalid");
-			}
+            URI uri = URI.createURI(contribution.getContributionURI());
+            if (uri.hasAuthority() && uri.segmentCount() == 1) {
+                String symbolicName = uri.authority();
+                String fullyQualified = uri.segment(0);
+                IProject p = ResourcesPlugin.getWorkspace().getRoot()
+                        .getProject(symbolicName);
+                
+                if( ! p.exists() ) {
+                    for( IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects() ) {
+                        String name = Util.getBundleSymbolicName(check);
+                        if( symbolicName.equals(name) ) {
+                            p = check;
+                            break;
+                        }
+                    }
+                }
+                
+                // TODO If this is not a WS-Resource we need to open differently
+                if (p != null) {
+                    IJavaProject jp = JavaCore.create(p);
+                    try {
+                        IType t = jp.findType(fullyQualified);
+                        if( t != null ) {
+                            JavaUI.openInEditor(t);
+                        } else {
+                            if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+fullyQualified+"' was not found. Would you like to start the class creation wizard?") ) {
+                                createOpen(contribution, domain, project, shell, true);
+                            }
+                        }
+                    } catch (JavaModelException e) {
+                        if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+fullyQualified+"' was not found. Would you like to start the class creation wizard?") ) {
+                            createOpen(contribution, domain, project, shell, true);
+                        }
+                    } catch (PartInitException e) {
+                        MessageDialog.openError(shell, "Failed to open editor", e.getMessage());
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                }
+            } else {
+                MessageDialog.openError(shell, "Invalid URL",
+                        "The current url is invalid");
+            }
 		}
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
index d1be445ea5..36bc0c2e90 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
@@ -75,14 +75,16 @@ private void createOpen(MContribution contribution, EditingDomain domain, IProje
 			}
 		} else {
 			URI uri = URI.createURI(contribution.getContributionURI());
-			if (uri.segmentCount() == 3) {
+			if (uri.hasAuthority() && uri.segmentCount() == 1) {
+			    String symbolicName = uri.authority();
+			    String fullyQualified = uri.segment(0);
 				IProject p = ResourcesPlugin.getWorkspace().getRoot()
-						.getProject(uri.segment(1));
+						.getProject(symbolicName);
 				
 				if( ! p.exists() ) {
 					for( IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects() ) {
 						String name = Util.getBundleSymbolicName(check);
-						if( uri.segment(1).equals(name) ) {
+						if( symbolicName.equals(name) ) {
 							p = check;
 							break;
 						}
@@ -93,16 +95,16 @@ private void createOpen(MContribution contribution, EditingDomain domain, IProje
 				if (p != null) {
 					IJavaProject jp = JavaCore.create(p);
 					try {
-						IType t = jp.findType(uri.segment(2));
+						IType t = jp.findType(fullyQualified);
 						if( t != null ) {
 							JavaUI.openInEditor(t);
 						} else {
-							if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+uri.segment(2)+"' was not found. Would you like to start the class creation wizard?") ) {
+							if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+fullyQualified+"' was not found. Would you like to start the class creation wizard?") ) {
 								createOpen(contribution, domain, project, shell, true);
 							}
 						}
 					} catch (JavaModelException e) {
-						if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+uri.segment(2)+"' was not found. Would you like to start the class creation wizard?") ) {
+						if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+fullyQualified+"' was not found. Would you like to start the class creation wizard?") ) {
 							createOpen(contribution, domain, project, shell, true);
 						}
 					} catch (PartInitException e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
index 7383e50f5d..83eadf22eb 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
@@ -76,47 +76,49 @@ private void createOpen(MContribution contribution, EditingDomain domain,
 				}
 			}
 		} else {
-			URI uri = URI.createURI(contribution.getContributionURI());
-			if (uri.segmentCount() == 3) {
-				IProject p = ResourcesPlugin.getWorkspace().getRoot()
-						.getProject(uri.segment(1));
-				
-				if( ! p.exists() ) {
-					for( IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects() ) {
-						String name = Util.getBundleSymbolicName(check);
-						if( uri.segment(1).equals(name) ) {
-							p = check;
-							break;
-						}
-					}
-				}
-				
-				// TODO If this is not a WS-Resource we need to open differently
-				if (p != null) {
-					IJavaProject jp = JavaCore.create(p);
-					try {
-						IType t = jp.findType(uri.segment(2));
-						if( t != null ) {
-							JavaUI.openInEditor(t);
-						} else {
-							if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+uri.segment(2)+"' was not found. Would you like to start the class creation wizard?") ) {
-								createOpen(contribution, domain, project, shell, true);
-							}
-						}
-					} catch (JavaModelException e) {
-						if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+uri.segment(2)+"' was not found. Would you like to start the class creation wizard?") ) {
-							createOpen(contribution, domain, project, shell, true);
-						}
-					} catch (PartInitException e) {
-						MessageDialog.openError(shell, "Failed to open editor", e.getMessage());
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-			} else {
-				MessageDialog.openError(shell, "Invalid URL",
-						"The current url is invalid");
-			}
+            URI uri = URI.createURI(contribution.getContributionURI());
+            if (uri.hasAuthority() && uri.segmentCount() == 1) {
+                String symbolicName = uri.authority();
+                String fullyQualified = uri.segment(0);
+                IProject p = ResourcesPlugin.getWorkspace().getRoot()
+                        .getProject(symbolicName);
+                
+                if( ! p.exists() ) {
+                    for( IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects() ) {
+                        String name = Util.getBundleSymbolicName(check);
+                        if( symbolicName.equals(name) ) {
+                            p = check;
+                            break;
+                        }
+                    }
+                }
+                
+                // TODO If this is not a WS-Resource we need to open differently
+                if (p != null) {
+                    IJavaProject jp = JavaCore.create(p);
+                    try {
+                        IType t = jp.findType(fullyQualified);
+                        if( t != null ) {
+                            JavaUI.openInEditor(t);
+                        } else {
+                            if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+fullyQualified+"' was not found. Would you like to start the class creation wizard?") ) {
+                                createOpen(contribution, domain, project, shell, true);
+                            }
+                        }
+                    } catch (JavaModelException e) {
+                        if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+fullyQualified+"' was not found. Would you like to start the class creation wizard?") ) {
+                            createOpen(contribution, domain, project, shell, true);
+                        }
+                    } catch (PartInitException e) {
+                        MessageDialog.openError(shell, "Failed to open editor", e.getMessage());
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                }
+            } else {
+                MessageDialog.openError(shell, "Invalid URL",
+                        "The current url is invalid");
+            }
 		}
 	}
 

From 96c039728c918d2ae7515b27f63c4cd1011186f3 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 26 Jan 2012 15:15:13 -0500
Subject: [PATCH 0391/1286] Prevent NPE in New E4 Project wizard if bundles not
 present

---
 .../tools/wizards/project/E4NewProjectWizard.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 32bc24f6dd..ea336265fe 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -184,11 +184,13 @@ protected void adjustManifests(
 								IPluginImport iimport = model
 										.getPluginFactory().createImport();
 								iimport.setId(id);
-								Version version = dependency.getVersion();
-								String versionString = version.getMajor() + "."
-										+ version.getMinor() + "."
-										+ version.getMicro();
-								iimport.setVersion(versionString);
+								if(dependency != null) {
+    								Version version = dependency.getVersion();
+    								String versionString = version.getMajor() + "."
+    										+ version.getMinor() + "."
+    										+ version.getMicro();
+    								iimport.setVersion(versionString);
+								}
 								pluginBase.add(iimport);
 							}
 						}

From 309f746f126ba4288fe7d64909cd7d38443dd244 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 26 Jan 2012 16:04:46 -0500
Subject: [PATCH 0392/1286] Bug 307458 - Using 'platform:/plugin' URI on
 handlers is not a good

Fix up org.eclipse.e4.tools.compat's ReflectionContributionFactory to handle
bundleclass:// style URIs
---
 .../ReflectionContributionFactory.java        | 53 +++++++++++++++----
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
index 5b61577cca..ea7e640e5d 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
@@ -60,6 +60,15 @@ private Object doCreate(String uriString, IEclipseContext context, IEclipseConte
 		if (uriString == null) {
 			return null;
 		}
+		// translate old-style platform:/plugin/ class specifiers into new-style
+		// bundleclass:// URIs
+		if (uriString.startsWith("platform:/plugin/")) { //$NON-NLS-1$
+			logger.error("platform-style URIs deprecated for referencing types: " + uriString); //$NON-NLS-1$
+			uriString = uriString
+					.replace("platform:/plugin/", "bundleclass://"); //$NON-NLS-1$ //$NON-NLS-2$
+			logger.error("URI rewritten as: " + uriString); //$NON-NLS-1$
+		}
+
 		URI uri = URI.createURI(uriString);
 		Bundle bundle = getBundle(uri);
 		Object contribution;
@@ -76,17 +85,22 @@ private Object doCreate(String uriString, IEclipseContext context, IEclipseConte
 	protected Object createFromBundle(Bundle bundle, IEclipseContext context,
 			IEclipseContext staticContext, URI uri) {
 		Object contribution;
-		if (uri.segmentCount() > 3) {
-			String prefix = uri.segment(2);
+		if (uri.segmentCount() > 1) {
+			String prefix = uri.segment(0);
 			IContributionFactorySpi factory = (IContributionFactorySpi) languages.get(prefix);
-			StringBuffer resource = new StringBuffer(uri.segment(3));
-			for (int i = 4; i < uri.segmentCount(); i++) {
+			if(factory == null) {
+			    String message = "Unsupported contribution factory type '" + prefix + "'"; //$NON-NLS-1$ //$NON-NLS-2$
+			    logger.error(message);
+			    return null;
+			}
+			StringBuffer resource = new StringBuffer(uri.segment(1));
+			for (int i = 2; i < uri.segmentCount(); i++) {
 				resource.append('/');
 				resource.append(uri.segment(i));
 			}
 			contribution = factory.create(bundle, resource.toString(), context);
 		} else {
-			String clazz = uri.segment(2);
+			String clazz = uri.segment(0);
 			try {
 				Class<?> targetClass = bundle.loadClass(clazz);
 				if (staticContext == null)
@@ -136,7 +150,7 @@ protected void processLanguages() {
 
 
 	protected Bundle getBundle(URI platformURI) {
-		return getBundleForName(platformURI.segments[1]);
+		return getBundleForName(platformURI.authority());
 	}
 
 	public Bundle getBundle(String uriString) {
@@ -164,14 +178,33 @@ public Bundle getBundleForName(String bundlename) {
 	}
 	
 	static class URI {
-		String[] segments;
-		String uri;
+	    String scheme;
+		String authority;
+		String[] segments = new String[0];
 		
 		URI(String uriString) {
-			segments = uriString.substring(uriString.indexOf('/')+1).split("/");
+		    int colon = uriString.indexOf(':');
+		    if(colon < 0) { throw new IllegalArgumentException("invalid URI"); }
+		    scheme = uriString.substring(0, colon);
+		    uriString = uriString.substring(colon + 1);
+		    if(uriString.startsWith("//")) {
+		        int authEnd = uriString.indexOf('/', 2);
+		        if(authEnd < 0) {
+		            authority = uriString.substring(2);
+		        } else {
+		            authority = uriString.substring(2, authEnd);
+		            segments = uriString.substring(authEnd + 1).split("/");
+		        }
+		    } else {
+		        segments = uriString.substring(uriString.indexOf('/')+1).split("/");
+		    }
 		}
 		
-		public String segment(int i) {
+		public String authority() {
+            return authority;
+        }
+
+        public String segment(int i) {
 			return segments[i];
 		}
 

From 7d82f35089ef196e4d0df92472c8f03f642df07d Mon Sep 17 00:00:00 2001
From: Remy Suen <remysuen@ca.ibm.com>
Date: Mon, 30 Jan 2012 13:31:40 -0500
Subject: [PATCH 0393/1286] Bug 368192 Need to persist information in a window
 but only contributions have a persisted state map

Update the model editor with the model changes.
---
 .../tools/emf/ui/internal/common/component/AddonsEditor.java  | 4 ++--
 .../tools/emf/ui/internal/common/component/HandlerEditor.java | 4 ++--
 .../e4/tools/emf/ui/internal/common/component/PartEditor.java | 4 ++--
 .../emf/ui/internal/common/component/ToolControlEditor.java   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 8b934ef325..ed553dc500 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2012 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -181,7 +181,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 53a58181a1..f2b870a4e8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2012 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -205,7 +205,7 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 		}
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 1fe518a5c1..45475eac95 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2012 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -286,7 +286,7 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.PartEditor_BindingContexts);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
 
 		item = new CTabItem(folder, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 0e90d536df..ace2bd3a07 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2012 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -176,7 +176,7 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);

From 845a0c8be1e662ac56fe63d710312f89ef16241d Mon Sep 17 00:00:00 2001
From: Eric Moffatt <emoffatt@ca.ibm.com>
Date: Tue, 7 Feb 2012 14:04:08 -0500
Subject: [PATCH 0394/1286] Fix for Bug 370509 - New E4 Application wizard does
 not handle spaces in project name

---
 .../wizards/project/E4NewProjectWizard.java   | 28 ++++++++++---------
 .../project/NewApplicationWizardPage.java     | 19 +++++++++----
 .../wizards/project/PluginContentPage.java    | 26 ++++++++++++++++-
 3 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index ea336265fe..24c84c3da6 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Soyatec(http://www.soyatec.com) and others.
+ * Copyright (c) 2006, 2012 Soyatec(http://www.soyatec.com) and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Soyatec - initial API and implementation
+ *     IBM Corporation - ongoing enhancements
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -129,7 +130,7 @@ public IPath getLocationPath() {
 		fContentPage = new PluginContentPage(
 				"page2", fProjectProvider, fMainPage, fPluginData); //$NON-NLS-1$
 
-		fApplicationPage = new NewApplicationWizardPage(fProjectProvider);
+		fApplicationPage = new NewApplicationWizardPage(fProjectProvider, fPluginData);
 
 		addPage(fContentPage);
 		addPage(fApplicationPage);
@@ -347,7 +348,8 @@ public void createApplicationResources(IProject project,
 				|| map.get(NewApplicationWizardPage.PRODUCT_NAME) == null)
 			return;
 
-		String projectName = map.get(NewApplicationWizardPage.PRODUCT_NAME);
+		// If the project has invalid characters, the plug-in name would replace them with underscores, product name does the same
+		String pluginName = map.get(NewApplicationWizardPage.PRODUCT_NAME);
 		String xmiPath = map
 				.get(NewApplicationWizardPage.APPLICATION_XMI_PROPERTY);
 
@@ -451,23 +453,23 @@ public void createApplicationResources(IProject project,
 
 			// Create Quit command
 			MCommand quitCommand = createCommand("quitCommand", "QuitHandler",
-					"Ctrl+Q", projectName, fragment, application);
+					"Ctrl+Q", pluginName, fragment, application);
 
 			MCommand openCommand = createCommand("openCommand", "OpenHandler",
-					"Ctrl+O", projectName, fragment, application);
+					"Ctrl+O", pluginName, fragment, application);
 
 			MCommand saveCommand = createCommand("saveCommand", "SaveHandler",
-					"Ctrl+S", projectName, fragment, application);
+					"Ctrl+S", pluginName, fragment, application);
 
 			MCommand aboutCommand = createCommand("aboutCommand",
-					"AboutHandler", "Ctrl+A", projectName, fragment,
+					"AboutHandler", "Ctrl+A", pluginName, fragment,
 					application);
 
 			MTrimmedWindow mainWindow = MBasicFactory.INSTANCE
 					.createTrimmedWindow();
 			application.getChildren().add(mainWindow);
 			{
-				mainWindow.setLabel(projectName);
+				mainWindow.setLabel(pluginName);
 				mainWindow.setWidth(500);
 				mainWindow.setHeight(400);
 
@@ -486,7 +488,7 @@ public void createApplicationResources(IProject project,
 						fileMenuItem.getChildren().add(menuItemOpen);
 						menuItemOpen.setLabel("Open");
 						menuItemOpen.setIconURI("platform:/plugin/"
-								+ project.getName() + "/icons/sample.gif");
+								+ pluginName + "/icons/sample.gif");
 						menuItemOpen.setCommand(openCommand);
 
 						MHandledMenuItem menuItemSave = MMenuFactory.INSTANCE
@@ -494,7 +496,7 @@ public void createApplicationResources(IProject project,
 						fileMenuItem.getChildren().add(menuItemSave);
 						menuItemSave.setLabel("Save");
 						menuItemSave.setIconURI("platform:/plugin/"
-								+ project.getName() + "/icons/save_edit.gif");
+								+ pluginName + "/icons/save_edit.gif");
 						menuItemSave.setCommand(saveCommand);
 
 						MHandledMenuItem menuItemQuit = MMenuFactory.INSTANCE
@@ -555,14 +557,14 @@ public void createApplicationResources(IProject project,
 								.createHandledToolItem();
 						toolBar.getChildren().add(toolItemOpen);
 						toolItemOpen.setIconURI("platform:/plugin/"
-								+ project.getName() + "/icons/sample.gif");
+								+ pluginName + "/icons/sample.gif");
 						toolItemOpen.setCommand(openCommand);
 
 						MHandledToolItem toolItemSave = MMenuFactory.INSTANCE
 								.createHandledToolItem();
 						toolBar.getChildren().add(toolItemSave);
 						toolItemSave.setIconURI("platform:/plugin/"
-								+ project.getName() + "/icons/save_edit.gif");
+								+ pluginName + "/icons/save_edit.gif");
 						toolItemSave.setCommand(saveCommand);
 					}
 				}
@@ -616,7 +618,7 @@ public void createApplicationResources(IProject project,
 		binaryExtentions.add(".png");
 
 		Map<String, String> keys = new HashMap<String, String>();
-		keys.put("projectName", projectName);
+		keys.put("projectName", pluginName);
 		keys.put("packageName", fragment.getElementName() + ".handlers");
 
 		try {
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
index 14bc00b97e..8573dac15c 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Soyatec (http://www.soyatec.com) and others.
+ * Copyright (c) 2006, 2012 Soyatec (http://www.soyatec.com) and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Soyatec - initial API and implementation
+ *     IBM Corporation - ongoing enhancements
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -19,6 +20,7 @@
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
+import org.eclipse.pde.internal.ui.wizards.plugin.AbstractFieldData;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -58,12 +60,14 @@ public class NewApplicationWizardPage extends WizardPage {
 	private Text proNameText;
 	private Text proApplicationText;
 	private Group propertyGroup;
+	private AbstractFieldData pluginData;
 
 	private PropertyData[] PROPERTIES;
 
-	protected NewApplicationWizardPage(IProjectProvider projectProvider) {
+	protected NewApplicationWizardPage(IProjectProvider projectProvider, AbstractFieldData pluginData) {
 		super("New e4 Application Wizard Page");
 		this.projectProvider = projectProvider;
+		this.pluginData = pluginData;
 		data = new HashMap<String, String>();
 		setTitle("e4 Application");
 		setMessage("Configure application with special values.");
@@ -386,7 +390,9 @@ protected PropertyData[] getPropertyData() {
 	@Override
 	public void setVisible(boolean visible) {
 		if (visible && PROPERTIES == null) {
-			proNameText.setText(projectProvider.getProjectName());
+			
+			// Use the plug-in name for the product name (not project name which can contain illegal characters)
+			proNameText.setText(pluginData.getId());
 
 			proApplicationText.setText(E4_APPLICATION);
 
@@ -406,8 +412,11 @@ public Map<String, String> getData() {
 			for (PropertyData property : getPropertyData()) {
 				data.put(property.getName(), property.getValue());
 			}
-
-			data.put(PRODUCT_NAME, projectProvider.getProjectName());
+			
+			// Use the plug-in name for the product name (not project name which can contain illegal characters)
+			String productName = pluginData.getId();
+			
+			data.put(PRODUCT_NAME, productName);
 			data.put(APPLICATION, E4_APPLICATION);
 		}
 		Map<String, String> map = new HashMap<String, String>();
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
index 8f0c5ae0cb..74d65d95cf 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -50,6 +50,7 @@
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.PreferencesUtil;
+import org.osgi.framework.Version;
 
 /**
  * Content wizard page for the New Plugin Project wizard (page 2)
@@ -360,4 +361,27 @@ public boolean canFlipToNextPage() {
 		}
 		return super.canFlipToNextPage();
 	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#computeId()
+	 */
+	protected String computeId() {
+		String id = super.computeId();
+		// In addition to removed illegal characters, the xmi model does not recognize plug-in uris if they end in a version number
+		// See PlatformURLPluginConnection.parse()
+		int underScore = id.lastIndexOf('_');
+		Version version;
+		while (underScore >= 0) {
+			try {
+				version = Version.parseVersion(id.substring(underScore + 1));
+				// name cannot end with a valid version, remove it
+				id = id.substring(0, underScore);
+			} catch (IllegalArgumentException iae) {
+				// valid name so far, continue to next underscore
+			}
+			underScore = id.lastIndexOf('_', underScore - 1);
+			
+		}
+		return id;
+	}
 }

From cf77f529ed8ca0ddc5a5ef504791b73db5cc76b6 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Tue, 14 Feb 2012 17:23:53 -0500
Subject: [PATCH 0395/1286] Bequinox/rt.equinox.p2.gitug 371548 - [Model
 Editor] Model editor throws exception when used via File > Open File...

---
 .../eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java   | 2 +-
 .../eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
index eff3aa3a7d..370dfb9cdf 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -66,7 +66,7 @@ public void dispose() {
 		if (redoAction != null)
 			redoAction.dispose();
 
-		if (listener != null && getComponent().getModelProvider() != null)
+		if (listener != null && getComponent() != null && getComponent().getModelProvider() != null)
 			getComponent().getModelProvider().removeModelListener(listener);
 
 		super.dispose();
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java
index c99606b515..742cb743b4 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java
@@ -10,7 +10,7 @@ public class EditorProjectFunction extends ContextFunction {
 	@Override
 	public Object compute(IEclipseContext context) {
 		final IEditorInput input = context.get(IEditorInput.class);
-		if( input != null ) {
+		if( input != null && input instanceof IFileEditorInput ) {
 			return ((IFileEditorInput)input).getFile().getProject();	
 		}
 		return null;

From 29d56958f780fb6d51bc13249b85bbc9cceabfdd Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Tue, 14 Feb 2012 17:30:21 -0500
Subject: [PATCH 0396/1286] Bug 371549 - [Model Editor] Parts can define both
 menus and popup-menus

---
 .../e4/tools/emf/ui/internal/Messages.java    |  1 +
 .../tools/emf/ui/internal/Messages.properties |  1 +
 .../common/component/virtual/VMenuEditor.java | 49 ++++++++++++++-----
 3 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 3b0e0830c1..d8e672f6b1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -413,6 +413,7 @@ public class Messages {
 	public String VMenuEditor_TreeLabelDescription;
 	public String VMenuEditor_Menus;
 	public String VMenuEditor_AddMenuContribution;
+	public String VMenuEditor_AddPopupMenuContribution;
 
 	public String VModelFragmentsEditor_TreeLabel;
 	public String VModelFragmentsEditor_TreeLabelDescription;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 27b4e90d58..52deb0acdd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -412,6 +412,7 @@ VMenuEditor_TreeLabel=Menus
 VMenuEditor_TreeLabelDescription=Menus Bla Bla Bla Bla Bla
 VMenuEditor_Menus=Menus
 VMenuEditor_AddMenuContribution=Menu
+VMenuEditor_AddPopupMenuContribution=Popup Menu
 
 VModelFragmentsEditor_TreeLabel=Fragments
 VModelFragmentsEditor_TreeLabelDescription=Fragments Bla Bla Bla Bla Bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 7204aabb1a..7fc2f058a5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -21,18 +21,22 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
@@ -52,8 +56,8 @@ public class VMenuEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private EStructuralFeature feature;
 	private List<Action> actions = new ArrayList<Action>();
+	private EStructuralFeature feature;
 
 	protected VMenuEditor(EStructuralFeature feature) {
 		super();
@@ -65,7 +69,13 @@ void init() {
 		actions.add(new Action(Messages.VMenuEditor_AddMenuContribution, createImageDescriptor(ResourceProvider.IMG_Menu)) {
 			@Override
 			public void run() {
-				handleAdd();
+				handleAdd(MenuPackageImpl.Literals.MENU);
+			}
+		});
+		actions.add(new Action(Messages.VMenuEditor_AddPopupMenuContribution, createImageDescriptor(ResourceProvider.IMG_Menu)) {
+			@Override
+			public void run() {
+				handleAdd(MenuPackageImpl.Literals.POPUP_MENU);
 			}
 		});
 	}
@@ -124,7 +134,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		GridLayout gl = new GridLayout();
+		GridLayout gl = new GridLayout(2, false);
 		gl.marginLeft = 0;
 		gl.marginRight = 0;
 		gl.marginWidth = 0;
@@ -134,7 +144,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Up);
 		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -161,7 +171,7 @@ public void widgetSelected(SelectionEvent e) {
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Down);
 		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -186,21 +196,34 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
+		final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+		childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		childrenDropDown.setContentProvider(new ArrayContentProvider());
+		childrenDropDown.setLabelProvider(new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				EClass eclass = (EClass) element;
+				return eclass.getName();
+			}
+		});
+		childrenDropDown.setInput(new EClass[] { MenuPackageImpl.Literals.MENU, MenuPackageImpl.Literals.POPUP_MENU });
+		childrenDropDown.setSelection(new StructuredSelection(MenuPackageImpl.Literals.MENU));
+
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_AddEllipsis);
 		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				handleAdd();
+				EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+				handleAdd(eClass);
 			}
 		});
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Remove);
 		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -224,8 +247,8 @@ public IObservableList getChildList(Object element) {
 		return null;
 	}
 
-	protected void handleAdd() {
-		MMenu handler = MMenuFactory.INSTANCE.createMenu();
+	protected void handleAdd(EClass eClass) {
+		EObject handler = EcoreUtil.create(eClass);
 		setElementId(handler);
 
 		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), feature, handler);

From 622b23c2ed34d69c58be889d3d5e7a201eac3877 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Tue, 14 Feb 2012 17:43:50 -0500
Subject: [PATCH 0397/1286] Bug 371551 - [Model Editor] Adding Input Part via
 Window > Controls context menu instead adds a Part

---
 .../internal/common/component/virtual/VWindowControlEditor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 1842987d61..7e910d6094 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -98,7 +98,7 @@ public void run() {
 		actions.add(new Action(Messages.VWindowControlEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
-				handleAdd(BasicPackageImpl.Literals.PART);
+				handleAdd(BasicPackageImpl.Literals.INPUT_PART);
 			}
 		});
 

From 6200249427056d25f98b32d4c660fce2aab7429a Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Tue, 14 Feb 2012 17:52:44 -0500
Subject: [PATCH 0398/1286] Bug 371553 - [Model Editor] NPE when finding a
 contribution class from Live Editor

---
 .../tools/emf/editor3x/PDEClassContributionProvider.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index 7ae0019c62..4b3c3de337 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -18,6 +18,8 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider;
 import org.eclipse.jdt.core.JavaModelException;
@@ -36,7 +38,10 @@ public PDEClassContributionProvider() {
 	
 	@SuppressWarnings("restriction")
 	public void findContribution(final Filter filter,  final ContributionResultHandler handler) {
-		IJavaSearchScope scope = PDEJavaHelper.getSearchScope(filter.project);
+		// filter.project may be null in the live editor
+		IJavaSearchScope scope = filter.project != null ? PDEJavaHelper
+				.getSearchScope(filter.project) : SearchEngine
+				.createWorkspaceScope();
 		
 		char[] packageName = null;
 		char[] typeName = null;
@@ -85,7 +90,7 @@ public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
 				
 //				System.err.println("Found: " + label + " => " + pName + " => " + path);
 				
-				IResource resource = filter.project.getWorkspace().getRoot().findMember(path);
+				IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
 				
 				if( resource != null ) {
 					IProject project = resource.getProject();

From 423b8751da303ab5cf29f9c3e9a74d2c40b32a31 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Fri, 24 Feb 2012 00:40:12 +0100
Subject: [PATCH 0399/1286] Bug 371989 - Fail to open e4 workbench Editor

---
 .../org/eclipse/e4/tools/services/impl/ResourceService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
index f74b4af0fe..b4c9c83db6 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
@@ -79,7 +79,7 @@ public void dispose() {
 		}
 	}
 
-	static class ResourcePool implements IDiposeableResourcePool {
+	public static class ResourcePool implements IDiposeableResourcePool {
 		private ResourceService resourceService;
 
 		private List<PooledResource<Image>> pooledImages = new ArrayList<PooledResource<Image>>();
@@ -88,9 +88,9 @@ static class ResourcePool implements IDiposeableResourcePool {
 		private Display display;
 
 		@Inject
-		public ResourcePool(ResourceService resourceService, Display display) {
+		public ResourcePool(IResourceService resourceService, Display display) {
 			this.display = display;
-			this.resourceService = resourceService;
+			this.resourceService = (ResourceService) resourceService;
 		}
 
 		public Image getImage(String key) throws CoreException {

From 2dea1d3291a20be553da903b4758fb850ef6d778 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Fri, 24 Feb 2012 01:10:58 +0100
Subject: [PATCH 0400/1286] Bug 371989 - Fail to open e4 workbench Editor

---
 .../eclipse/e4/tools/services/impl/ResourceService.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
index b4c9c83db6..7606412edd 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
@@ -244,11 +244,11 @@ public ResourceService() {
 
 	protected void removePooledResource(PooledResource<?> resource) {
 		if (resource.getResource() instanceof Image) {
-			displayPool.get(resource.display).getImagePool().remove(resource);
+			displayPool.get(resource.display).getImagePool().remove(resource.imageKey);
 		} else if (resource.getResource() instanceof Color) {
-			displayPool.get(resource.display).getColorPool().remove(resource);
+			displayPool.get(resource.display).getColorPool().remove(resource.imageKey);
 		} else if (resource.getResource() instanceof Font) {
-			displayPool.get(resource.display).getFontPool().remove(resource);
+			displayPool.get(resource.display).getFontPool().remove(resource.imageKey);
 		}
 	}
 
@@ -268,7 +268,7 @@ private <R extends Resource> PooledResource<R> loadResource(
 			}
 		}
 
-		if (resource != null) {
+		if (resource != null && resource.getResource() != null) {
 			resource.count++;
 		} else {
 			resource = new PooledResource<R>(display, this, key,

From 0cf1d1f536a51613e69150a5e7123adc3e167942 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Fri, 24 Feb 2012 01:22:49 +0100
Subject: [PATCH 0401/1286] Bug 371989 - Fail to open e4 workbench Editor

---
 .../e4/tools/services/IResourceService.java   |  1 +
 .../tools/services/impl/ResourceService.java  | 44 ++++++++++---------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java
index 93324df8f7..a52c0fbdae 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java
@@ -19,6 +19,7 @@
 public interface IResourceService {
 	public interface IPooledResource<T> {
 		public T getResource();
+		public String getId();
 		public void dispose();
 	}
 	
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
index 7606412edd..468cfaf978 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
@@ -49,17 +49,21 @@ static class PooledResource<T extends Resource> implements
 		private Display display;
 		private int count;
 		private T resource;
-		private String imageKey;
+		private String id;
 		private ResourceService resourceService;
 
 		PooledResource(Display display, ResourceService resourceService,
-				String imageKey, T resource) {
+				String id, T resource) {
 			this.display = display;
-			this.imageKey = imageKey;
+			this.id = id;
 			this.count = 1;
 			this.resourceService = resourceService;
 			this.resource = resource;
 		}
+		
+		public String getId() {
+			return id;
+		}
 
 		public T getResource() {
 			return resource;
@@ -73,18 +77,18 @@ public void dispose() {
 					resource.dispose();
 				}
 				resource = null;
-				imageKey = null;
+				id = null;
 				resourceService = null;
 			}
 		}
 	}
 
 	public static class ResourcePool implements IDiposeableResourcePool {
-		private ResourceService resourceService;
+		private IResourceService resourceService;
 
-		private List<PooledResource<Image>> pooledImages = new ArrayList<PooledResource<Image>>();
-		private List<PooledResource<Font>> pooledFonts = new ArrayList<PooledResource<Font>>();
-		private List<PooledResource<Color>> pooledColors = new ArrayList<PooledResource<Color>>();
+		private List<IPooledResource<Image>> pooledImages = new ArrayList<IPooledResource<Image>>();
+		private List<IPooledResource<Font>> pooledFonts = new ArrayList<IPooledResource<Font>>();
+		private List<IPooledResource<Color>> pooledColors = new ArrayList<IPooledResource<Color>>();
 		private Display display;
 
 		@Inject
@@ -100,10 +104,10 @@ public Image getImage(String key) throws CoreException {
 								"org.eclipse.e4.tools.services",
 								"The pool is disposed"));
 			}
-			PooledResource<Image> image = null;
+			IPooledResource<Image> image = null;
 
-			for (PooledResource<Image> img : pooledImages) {
-				if (img.imageKey.equals(key)) {
+			for (IPooledResource<Image> img : pooledImages) {
+				if (img.getId().equals(key)) {
 					image = img;
 				}
 			}
@@ -123,9 +127,9 @@ public Font getFont(String key) throws CoreException {
 								"The pool is disposed"));
 			}
 			
-			PooledResource<Font> font = null;
-			for (PooledResource<Font> fon : pooledFonts) {
-				if (fon.imageKey.equals(key)) {
+			IPooledResource<Font> font = null;
+			for (IPooledResource<Font> fon : pooledFonts) {
+				if (fon.getId().equals(key)) {
 					font = fon;
 				}
 			}
@@ -143,10 +147,10 @@ public Color getColor(String key) throws CoreException {
 								"org.eclipse.e4.tools.services",
 								"The pool is disposed"));
 			}
-			PooledResource<Color> color = null;
+			IPooledResource<Color> color = null;
 			
-			for (PooledResource<Color> col : pooledColors) {
-				if (col.imageKey.equals(key)) {
+			for (IPooledResource<Color> col : pooledColors) {
+				if (col.getId().equals(key)) {
 					color = col;
 				}
 			}
@@ -244,11 +248,11 @@ public ResourceService() {
 
 	protected void removePooledResource(PooledResource<?> resource) {
 		if (resource.getResource() instanceof Image) {
-			displayPool.get(resource.display).getImagePool().remove(resource.imageKey);
+			displayPool.get(resource.display).getImagePool().remove(resource.getId());
 		} else if (resource.getResource() instanceof Color) {
-			displayPool.get(resource.display).getColorPool().remove(resource.imageKey);
+			displayPool.get(resource.display).getColorPool().remove(resource.getId());
 		} else if (resource.getResource() instanceof Font) {
-			displayPool.get(resource.display).getFontPool().remove(resource.imageKey);
+			displayPool.get(resource.display).getFontPool().remove(resource.getId());
 		}
 	}
 

From ec55a29f4307e327a401bc33f3e1a2b21c14f979 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Fri, 9 Mar 2012 16:14:06 +0100
Subject: [PATCH 0402/1286] [Bug 373476] [Bridge] No UISynchronizer installed
 into root context

---
 .../compat/internal/ContextServiceFactory.java  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index 8cf22228ba..f487fdeff3 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -20,6 +20,7 @@
 import org.eclipse.e4.tools.services.IClipboardService;
 import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
 import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
+import org.eclipse.e4.ui.di.UISynchronize;
 import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.e4.ui.services.IStylingEngine;
 import org.eclipse.jface.viewers.ISelection;
@@ -63,11 +64,27 @@ public Object create(@SuppressWarnings("rawtypes") Class serviceInterface, IServ
 			BundleContext bundleContext = bundle.getBundleContext();
 			IEclipseContext serviceContext = EclipseContextFactory.getServiceContext(bundleContext);
 
+			
 			final IEclipseContext appContext = serviceContext.createChild("WorkbenchContext"); //$NON-NLS-1$
 			appContext.set(Display.class, Display.getCurrent());
 			appContext.set(Logger.class, new WorkbenchLogger());
 			appContext.set(IClipboardService.class, new ClipboardServiceImpl());
 			appContext.set(Realm.class, Realm.getDefault());
+			
+			final Display d = Display.getCurrent();
+			appContext.set(UISynchronize.class, new UISynchronize() {
+				
+				@Override
+				public void syncExec(Runnable runnable) {
+					d.syncExec(runnable);
+				}
+				
+				@Override
+				public void asyncExec(Runnable runnable) {
+					d.asyncExec(runnable);
+				}
+			});
+			
 			IContributionFactory contributionFactory = ContextInjectionFactory.make(ReflectionContributionFactory.class, appContext);
 			appContext.set(IContributionFactory.class.getName(),contributionFactory);
 			

From 86a913abc14c6f2578b236610c03e284df20e1eb Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Fri, 9 Mar 2012 16:16:41 +0100
Subject: [PATCH 0403/1286] Bug 373805 - ISelectionProvider of compat layer can
 lead to a selection which can't be empty

---
 .../internal/SelectionProviderContextFunction.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/SelectionProviderContextFunction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/SelectionProviderContextFunction.java
index 901627cd04..b77ed466b2 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/SelectionProviderContextFunction.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/SelectionProviderContextFunction.java
@@ -15,10 +15,10 @@
 import org.eclipse.e4.core.contexts.ContextFunction;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.services.ISelectionProviderService;
+import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 
-
 public class SelectionProviderContextFunction extends ContextFunction {
 
 	@Override
@@ -27,12 +27,18 @@ public Object compute(final IEclipseContext context) {
 			public void setSelection(Object selection) {
 				ISelectionProvider pv = context.get(ISelectionProvider.class);
 				
-				if( selection instanceof List<?> ) {
-					pv.setSelection(new StructuredSelection((List<?>)selection));	
+				if( selection == null ) {
+					pv.setSelection(StructuredSelection.EMPTY);
+				} else if (selection instanceof ISelection) {
+					pv.setSelection((ISelection) selection);
+				} else if (selection instanceof List<?>) {
+					pv.setSelection(new StructuredSelection((List<?>) selection));
+				} else if (selection instanceof Object[]) {
+					pv.setSelection(new StructuredSelection(
+							(Object[]) selection));
 				} else {
 					pv.setSelection(new StructuredSelection(selection));
 				}
-				
 			}
 		};
 	}

From 751a53f864e6d819031ba3888cb494353933c057 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Mon, 12 Mar 2012 08:21:32 -0400
Subject: [PATCH 0404/1286] Update to revised CSS specs for obtaining and
 changing properties


From d48380477d879b6de77e22d15bd663c0a566c523 Mon Sep 17 00:00:00 2001
From: Bogdan Gheorghe <gheorghe@ca.ibm.com>
Date: Mon, 12 Mar 2012 19:40:00 -0400
Subject: [PATCH 0405/1286] Bug 372327 - Editing CSS in Appearance pref page
 and restarting shows no change


From 740d5a9a1cbdc0af119ce6185c2a7d467d8fac7d Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Sat, 24 Mar 2012 07:19:13 -0400
Subject: [PATCH 0406/1286] Bug 375233 - [CSS Spy] Cannot select CTabItems

Needed to add getParent() support.  Also added in support for
SWT CTab{Folder,Items}.

From ca28162127b2a456a5e331157546a243c34f5cac Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Sat, 24 Mar 2012 10:30:04 -0400
Subject: [PATCH 0407/1286] Bug 375253 - [CSS Spy] Add support for spying
 across multiple windows


From 32783ccbb452da5cfda487fcf86c5ba477f3b9e2 Mon Sep 17 00:00:00 2001
From: Bogdan Gheorghe <gheorghe@ca.ibm.com>
Date: Wed, 11 Apr 2012 11:48:34 -0400
Subject: [PATCH 0408/1286] Bug 376480 [CSSEditor] cannot install CSS editor
 into Juno M6


From 980a810fc3fbcd995b0d8ef716a977e6de7f199b Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Sun, 15 Apr 2012 16:48:55 +0200
Subject: [PATCH 0409/1286] Bug 376055 - [Tooling] Rename "Label" to
 "Perspective" under the Perspective Stack

---
 .../eclipse/e4/tools/emf/ui/internal/Messages.properties    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 52deb0acdd..1c181eff5b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -208,9 +208,9 @@ PartStackEditor_AddPlaceholder=Placeholder
 
 PerspectiveEditor_Label=Perspective
 PerspectiveEditor_Description=Perspective Bla Bla Bla
-PerspectiveEditor_LabelLabel=Label	
+PerspectiveEditor_LabelLabel=Label
 PerspectiveEditor_SelectedElement=Selected Element
-PerspectiveEditor_Label=Label
+PerspectiveEditor_Label=Perspective
 PerspectiveEditor_Tooltip=Tooltip
 PerspectiveEditor_IconURI=Icon URI
 PerspectiveEditor_Controls=Controls
@@ -283,7 +283,7 @@ MenuContributionEditor_Position=Position
 MenuContributionEditor_TreeLabel=Menu Contribution
 MenuContributionEditor_TreeLabelDescription=Menu Contribution Bla Bla Bla Bla
 
-ModelFragmentsEditor_ModelFragments=Model Fragements
+ModelFragmentsEditor_ModelFragments=Model Fragments
 ModelFragmentsEditor_Label=Model Fragments
 ModelFragmentsEditor_Description=Description
 ModelFragmentsEditor_Imports=Imports

From 8aa34900b3d36f5081546756a5930b444487f6ff Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Sun, 15 Apr 2012 16:52:56 +0200
Subject: [PATCH 0410/1286] Bug 375261 - [Tools] No check on Java type names
 when creating classes for handlers, parts and addons from Application.e4xmi
 editor.

---
 .../wizards/classes/AbstractNewClassPage.java | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index a304714fa2..c137f6c6f7 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -23,11 +23,13 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.e4.internal.tools.ToolsPlugin;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaModel;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaConventions;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.internal.ui.JavaPlugin;
@@ -205,7 +207,8 @@ public void widgetSelected(SelectionEvent e) {
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			dbc.bindValue(textProp.observe(t), BeanProperties.value("name", String.class).observe(clazz));
+			dbc.bindValue(textProp.observe(t), BeanProperties.value("name", String.class).observe(clazz), 
+					new UpdateValueStrategy().setBeforeSetValidator(new ClassnameValidator()),null);
 
 			new Label(parent, SWT.NONE);
 		}
@@ -324,18 +327,12 @@ static class ClassnameValidator implements IValidator {
 
 		public IStatus validate(Object value) {
 			String name = value.toString();
-			char[] ar = name.toCharArray();
-			for (char c : ar) {
-				if (!Character.isJavaIdentifierPart(c)) {
-					return new Status(IStatus.ERROR, "", "'" + c + "' is not allowed in a Class-Name");
-				}
-			}
-
-			if (!Character.isJavaIdentifierStart(ar[0])) {
-				return new Status(IStatus.ERROR, "", "'" + ar[0] + "' is not allowed as the first character of a Class-Name");
-			}
+			if (name.length()==0)
+				return new Status(IStatus.ERROR,ToolsPlugin.PLUGIN_ID,"Name must not be empty");
+			if ((name.indexOf('.')!=-1)||(name.trim().indexOf(' ')!=-1))
+				return new Status(IStatus.ERROR,ToolsPlugin.PLUGIN_ID,"Name must not be qualified or contain spaces");
 
-			return Status.OK_STATUS;
+			return JavaConventions.validateJavaTypeName(name,JavaCore.VERSION_1_3,JavaCore.VERSION_1_3);
 		}
 	}
 

From 8f72d84dce5b835a46bbcfc21e1c6aefa95d7151 Mon Sep 17 00:00:00 2001
From: Bogdan Gheorghe <gheorghe@ca.ibm.com>
Date: Wed, 25 Apr 2012 17:44:40 -0400
Subject: [PATCH 0411/1286] Remove dependency on xtext.xtend2.lib


From 2746eecc9dfd4387473a249dc31ed8d83a6367cd Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 26 Apr 2012 09:23:52 -0400
Subject: [PATCH 0412/1286] Bug 376475 - [CSSSpy] processor causes duplicate
 Copy keybinding

Don't create a new binding table, but insert into the table
corresponding to the requested context.

From 6c79ff9f000267fafeacb6b816a6fcb4e877994f Mon Sep 17 00:00:00 2001
From: Elias Volanakis <elias@eclipsesource.com>
Date: Tue, 3 Apr 2012 15:59:07 -0700
Subject: [PATCH 0413/1286] Bug 376027 - e4 project template should use M1
 instead of Ctrl in KeyBindings

Changed key bindings for handlers to use M1 instead of Ctrl
---
 .../tools/wizards/project/E4NewProjectWizard.java         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 24c84c3da6..e7a1434e81 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -453,16 +453,16 @@ public void createApplicationResources(IProject project,
 
 			// Create Quit command
 			MCommand quitCommand = createCommand("quitCommand", "QuitHandler",
-					"Ctrl+Q", pluginName, fragment, application);
+					"M1+Q", pluginName, fragment, application);
 
 			MCommand openCommand = createCommand("openCommand", "OpenHandler",
-					"Ctrl+O", pluginName, fragment, application);
+					"M1+O", pluginName, fragment, application);
 
 			MCommand saveCommand = createCommand("saveCommand", "SaveHandler",
-					"Ctrl+S", pluginName, fragment, application);
+					"M1+S", pluginName, fragment, application);
 
 			MCommand aboutCommand = createCommand("aboutCommand",
-					"AboutHandler", "Ctrl+A", pluginName, fragment,
+					"AboutHandler", "M1+A", pluginName, fragment,
 					application);
 
 			MTrimmedWindow mainWindow = MBasicFactory.INSTANCE

From 49df658f9192939ea46ab68cc822cf51a7629ac2 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 26 Apr 2012 18:50:33 -0400
Subject: [PATCH 0414/1286] Soup up E4NewProjectWizard to use well-known
 Eclipse identifiers for commands

---
 .../wizards/project/E4NewProjectWizard.java    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index e7a1434e81..1fce85eba9 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -68,7 +68,6 @@
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.core.build.IBuildModelFactory;
 import org.eclipse.pde.core.plugin.IPluginBase;
 import org.eclipse.pde.core.plugin.IPluginElement;
 import org.eclipse.pde.core.plugin.IPluginExtension;
@@ -452,16 +451,20 @@ public void createApplicationResources(IProject project,
 			resource.getContents().add((EObject) application);
 
 			// Create Quit command
-			MCommand quitCommand = createCommand("quitCommand", "QuitHandler",
+			MCommand quitCommand = createCommand("org.eclipse.ui.file.exit",
+					"quitCommand", "QuitHandler",
 					"M1+Q", pluginName, fragment, application);
 
-			MCommand openCommand = createCommand("openCommand", "OpenHandler",
+			MCommand openCommand = createCommand(pluginName + ".open",
+					"openCommand", "OpenHandler",
 					"M1+O", pluginName, fragment, application);
 
-			MCommand saveCommand = createCommand("saveCommand", "SaveHandler",
+			MCommand saveCommand = createCommand("org.eclipse.ui.file.save",
+					"saveCommand", "SaveHandler",
 					"M1+S", pluginName, fragment, application);
 
-			MCommand aboutCommand = createCommand("aboutCommand",
+			MCommand aboutCommand = createCommand(
+					"org.eclipse.ui.help.aboutAction", "aboutCommand",
 					"AboutHandler", "M1+A", pluginName, fragment,
 					application);
 
@@ -640,12 +643,13 @@ public void createApplicationResources(IProject project,
 		}
 	}
 
-	private MCommand createCommand(String name, String className,
+	private MCommand createCommand(String commandId, String name,
+			String className,
 			String keyBinding, String projectName, IPackageFragment fragment,
 			MApplication application) {
 		MCommand command = MCommandsFactory.INSTANCE.createCommand();
 		command.setCommandName(name);
-		command.setElementId(projectName + "." + name);
+		command.setElementId(commandId);
 		application.getCommands().add(command);
 		{
 			// Create Quit handler for command

From e9e349ee4c876312a7aa02ed41e63c6c1f78f140 Mon Sep 17 00:00:00 2001
From: Bogdan Gheorghe <gheorghe@ca.ibm.com>
Date: Fri, 27 Apr 2012 21:29:10 -0400
Subject: [PATCH 0415/1286] Bug 377980 - Move
 org.eclipse.e4.ui.widgets.CTabFolder back to SWT

---
 .../common/uistructure/WidgetContentProvider.java     | 11 -----------
 .../common/uistructure/WidgetLabelProvider.java       |  8 +-------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
index 5e74fa251a..94fcb0c1e0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
@@ -71,11 +71,6 @@ public Object[] getChildren(Object parentElement) {
 			if (item.getControl() != null) {
 				return new Object[] { item.getControl() };
 			}
-		} else if (parentElement instanceof org.eclipse.e4.ui.widgets.CTabItem) {
-			org.eclipse.e4.ui.widgets.CTabItem item = (org.eclipse.e4.ui.widgets.CTabItem) parentElement;
-			if (item.getControl() != null) {
-				return new Object[] { item.getControl() };
-			}
 		} else if (parentElement instanceof Tree) {
 			Tree tree = (Tree) parentElement;
 
@@ -94,12 +89,6 @@ public Object[] getChildren(Object parentElement) {
 			Object[] rv = new Object[items.length];
 			System.arraycopy(items, 0, rv, 0, rv.length);
 			return rv;
-		} else if (parentElement instanceof org.eclipse.e4.ui.widgets.CTabFolder) {
-			org.eclipse.e4.ui.widgets.CTabFolder tabFolder = (org.eclipse.e4.ui.widgets.CTabFolder) parentElement;
-			org.eclipse.e4.ui.widgets.CTabItem[] items = tabFolder.getItems();
-			Object[] rv = new Object[items.length];
-			System.arraycopy(items, 0, rv, 0, rv.length);
-			return rv;
 		} else if (parentElement instanceof TabFolder) {
 			TabFolder tabFolder = (TabFolder) parentElement;
 			TabItem[] items = tabFolder.getItems();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
index 0318e46cf6..b1811dca41 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
@@ -121,7 +121,7 @@ public void update(ViewerCell cell) {
 		} else if (element instanceof TabFolder) {
 			cell.setText("TabFolder"); //$NON-NLS-1$
 			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_tabfolder_obj));
-		} else if (element instanceof CTabFolder || element instanceof org.eclipse.e4.ui.widgets.CTabFolder) {
+		} else if (element instanceof CTabFolder) {
 			cell.setText("CTabFolder"); //$NON-NLS-1$
 			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_ctabfolder_obj));
 		} else if (element instanceof Combo) {
@@ -169,12 +169,6 @@ public void update(ViewerCell cell) {
 			cell.setStyleRanges(s.getStyleRanges());
 			cell.setText(s.getString());
 			// cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_clabel_obj));
-		} else if (element instanceof org.eclipse.e4.ui.widgets.CTabItem) {
-			StyledString s = new StyledString("CTabItem"); //$NON-NLS-1$
-			s.append(" - " + ((org.eclipse.e4.ui.widgets.CTabItem) element).getText(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
-			cell.setStyleRanges(s.getStyleRanges());
-			cell.setText(s.getString());
-			// cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_clabel_obj));
 		} else if (element instanceof Button) {
 			Button b = (Button) element;
 			if ((b.getStyle() & SWT.PUSH) == SWT.PUSH) {

From bb429af4b7b6edbbc1ff4307e7773906db9ae721 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Mon, 30 Apr 2012 11:03:55 -0400
Subject: [PATCH 0416/1286] Bug 369443 - [CSS] Provide mechanism to listen for
 theme changes

Remove unused references to CSS engine from ThemeEngine

From b7f194cc7042064db5b8a66b955493e71797ba12 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Mon, 30 Apr 2012 11:05:36 -0400
Subject: [PATCH 0417/1286] CSS Spy: avoid creating "Cancel" button since
 there's no support for cancellation


From 2b3007f58761ae61a7233b841c708b2ea0757202 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Mon, 30 Apr 2012 11:25:46 -0400
Subject: [PATCH 0418/1286] Commit CSS Scratchpad (from Brian's EclipseCon
 talk): open using M1+M2+M3+F4 or Ctrl-Alt-Shift-F4


From 9ea290aebbc5397c2ab59ddd2089892b8e0d8941 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Wed, 2 May 2012 12:41:23 -0400
Subject: [PATCH 0419/1286] Bug 376475 - [CSSSpy] processor causes duplicate
 Copy keybinding

Add code to correct existig installations by checking for and removing
the incorrect binding table.

From 77cfe30456b537d27bb6b4b4724c3d036af762bc Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Mon, 7 May 2012 16:13:10 +0200
Subject: [PATCH 0420/1286] Bug 378602 - [Tooling] JavaProject not accepted as
 default container for new Application model file

---
 .../internal/tools/wizards/model/NewModelFilePage.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
index 634ea30ce8..23f4163208 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
@@ -14,6 +14,8 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jface.dialogs.IDialogPage;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -122,6 +124,7 @@ private void initialize() {
 			if (ssel.size() > 1)
 				return;
 			Object obj = ssel.getFirstElement();
+			
 			if (obj instanceof IResource) {
 				IContainer container;
 				if (obj instanceof IContainer)
@@ -129,6 +132,13 @@ private void initialize() {
 				else
 					container = ((IResource) obj).getParent();
 				containerText.setText(container.getFullPath().toString());
+			} else if( obj instanceof IJavaProject ) {
+				IJavaProject container = (IJavaProject) obj;
+				try {
+					containerText.setText(container.getCorrespondingResource().getFullPath().toString());
+				} catch(JavaModelException e) {
+					e.printStackTrace();
+				}
 			}
 		}
 		fileText.setText(defaultFilename);

From 537e9591b87b8e418cc6e14fea8082b4341d6387 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Mon, 7 May 2012 16:27:01 +0200
Subject: [PATCH 0421/1286] Bug 378618 - [Liveeditor] NPE on
 Application-Element

---
 .../e4/tools/emf/ui/internal/common/ModelEditor.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 31e5bf0e2c..df35df625e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -135,6 +135,7 @@
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MContext;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
@@ -635,7 +636,16 @@ public void run() {
 								try {
 									MApplicationElement o = (MApplicationElement) s.getFirstElement();
 									IScriptingSupport support = (IScriptingSupport) le.createExecutableExtension("class"); //$NON-NLS-1$
-									support.openEditor(viewer.getControl().getShell(), s.getFirstElement(), project == null ? ModelUtils.getContainingContext(o) : null);
+									IEclipseContext ctx = null;
+									if (project == null) {
+										if (o instanceof MContext) {
+											ctx = ((MContext) o).getContext();
+										} else {
+											ctx = ModelUtils.getContainingContext(o);
+										}
+									}
+
+									support.openEditor(viewer.getControl().getShell(), s.getFirstElement(), ctx);
 								} catch (CoreException e) {
 									// TODO Auto-generated catch block
 									e.printStackTrace();

From ed9bc94509bbbec5632fd8feb5fdf96cecd10f39 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Thu, 10 May 2012 13:23:09 +0200
Subject: [PATCH 0422/1286] Bug 376091 - [Tooling] Rename "String Model
 Fragment" to "Model Fragment" in fragment editor

---
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.properties  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 1c181eff5b..ee118fb261 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -288,8 +288,8 @@ ModelFragmentsEditor_Label=Model Fragments
 ModelFragmentsEditor_Description=Description
 ModelFragmentsEditor_Imports=Imports
 
-StringModelFragment_Label=String Model Fragment
-StringModelFragment_Description=String Model Fragment Bla Bla Bla
+StringModelFragment_Label=Model Fragment
+StringModelFragment_Description=Model Fragment Bla Bla Bla
 StringModelFragment_Featurename=Featurename
 StringModelFragment_ParentId=Element Id
 StringModelFragment_PositionInList=Position in list

From 0067472f747b36d77d38238b1e500116bca8812d Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Fri, 11 May 2012 12:25:03 +0200
Subject: [PATCH 0423/1286] Bug 379215 - Allow typing in Element Id line for a
 Model Fragment

---
 .../emf/ui/internal/common/component/StringModelFragment.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 1852a4fad4..a34e25ed20 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -135,7 +135,7 @@ private Composite createForm(Composite parent) {
 
 			Text t = new Text(comp, SWT.BORDER);
 			TextPasteHandler.createFor(t);
-			t.setEditable(false);
+			// t.setEditable(false);
 			gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID).observeDetail(getMaster()));

From eb34ff34eae1001efe9ba2e49116d627134e734c Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Fri, 11 May 2012 13:00:15 +0200
Subject: [PATCH 0424/1286] Bug 378606 - [Tooling] Adding a Part menu does not
 add the required tag <tags>ViewMenu</tags>

---
 .../e4/tools/emf/ui/internal/Messages.java    |  1 +
 .../tools/emf/ui/internal/Messages.properties |  1 +
 .../internal/common/component/MenuEditor.java |  5 ++
 .../common/component/virtual/VMenuEditor.java | 49 ++++++++++++++++---
 4 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index d8e672f6b1..72f5591c5c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -121,6 +121,7 @@ public class Messages {
 	public String KeyBindingEditor_AddParameter;
 
 	public String MenuEditor_Label;
+	public String MenuEditor_Label_ViewMenu;
 	public String MenuEditor_Description;
 	public String MenuEditor_MenuItems;
 	public String MenuEditor_MenuItemType;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index ee118fb261..203dd427e1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -118,6 +118,7 @@ KeyBindingEditor_SequenceEmpty=Keysequence must not be empty!
 KeyBindingEditor_AddParameter=Parameter
 
 MenuEditor_Label=Menu
+MenuEditor_Label_ViewMenu=View Menu
 MenuEditor_Description=Menu bla bla bla
 MenuEditor_MenuItems=MenuItems
 MenuEditor_MenuItemType=Type
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 8aadbcad14..4dde73d666 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -36,6 +36,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EClass2EObject;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EObject2EClass;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
@@ -523,7 +524,11 @@ public String getLabel(Object element) {
 			EObject o = (EObject) element;
 			if (o.eContainer() instanceof MWindow) {
 				return Messages.MenuEditor_MainMenu;
+			} else if (menu.getTags().contains(VMenuEditor.VIEW_MENU_TAG)) {
+				return Messages.MenuEditor_Label_ViewMenu;
 			}
+		} else if (menu.getTags().contains(VMenuEditor.VIEW_MENU_TAG)) {
+			return Messages.MenuEditor_Label_ViewMenu;
 		}
 		return Messages.MenuEditor_Label;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 7fc2f058a5..0dcfffffc9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -21,6 +21,8 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -59,6 +61,12 @@ public class VMenuEditor extends AbstractComponentEditor {
 	private List<Action> actions = new ArrayList<Action>();
 	private EStructuralFeature feature;
 
+	public static final String VIEW_MENU_TAG = "ViewMenu"; //$NON-NLS-1$
+
+	enum Types {
+		MENU, POPUP_MENU, VIEW_MENU
+	}
+
 	protected VMenuEditor(EStructuralFeature feature) {
 		super();
 		this.feature = feature;
@@ -78,6 +86,12 @@ public void run() {
 				handleAdd(MenuPackageImpl.Literals.POPUP_MENU);
 			}
 		});
+		actions.add(new Action(Messages.MenuEditor_Label_ViewMenu, createImageDescriptor(ResourceProvider.IMG_Menu)) {
+			@Override
+			public void run() {
+				handleAddViewMenu();
+			}
+		});
 	}
 
 	@Override
@@ -202,12 +216,16 @@ public void widgetSelected(SelectionEvent e) {
 		childrenDropDown.setLabelProvider(new LabelProvider() {
 			@Override
 			public String getText(Object element) {
-				EClass eclass = (EClass) element;
-				return eclass.getName();
+				if (element == Types.MENU) {
+					return Messages.MenuEditor_Label;
+				} else if (element == Types.POPUP_MENU) {
+					return Messages.PopupMenuEditor_TreeLabel;
+				}
+				return Messages.MenuEditor_Label_ViewMenu;
 			}
 		});
-		childrenDropDown.setInput(new EClass[] { MenuPackageImpl.Literals.MENU, MenuPackageImpl.Literals.POPUP_MENU });
-		childrenDropDown.setSelection(new StructuredSelection(MenuPackageImpl.Literals.MENU));
+		childrenDropDown.setInput(Types.values());
+		childrenDropDown.setSelection(new StructuredSelection(Types.MENU));
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
@@ -215,8 +233,14 @@ public String getText(Object element) {
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-				handleAdd(eClass);
+				Types t = (Types) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+				if (t == Types.MENU) {
+					handleAdd(MenuPackageImpl.Literals.MENU);
+				} else if (t == Types.POPUP_MENU) {
+					handleAdd(MenuPackageImpl.Literals.POPUP_MENU);
+				} else {
+					handleAddViewMenu();
+				}
 			}
 		});
 
@@ -259,6 +283,19 @@ protected void handleAdd(EClass eClass) {
 		}
 	}
 
+	protected void handleAddViewMenu() {
+		MMenu menu = MenuFactoryImpl.eINSTANCE.createMenu();
+		menu.getTags().add(VIEW_MENU_TAG);
+		setElementId(menu);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), feature, menu);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(menu);
+		}
+	}
+
 	@Override
 	public List<Action> getActions(Object element) {
 		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));

From aae5c51587868da42291af737f6dd36f255fd156 Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@gmail.com>
Date: Mon, 14 May 2012 19:01:00 +0200
Subject: [PATCH 0425/1286] Bug 378597 - [Tooling] Rename e4 to Eclipse 4 in
 project creation wizard

---
 bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties  | 4 ++--
 .../e4/internal/tools/wizards/model/NewModelFilePage.java     | 2 +-
 .../tools/wizards/project/NewApplicationWizardPage.java       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
index af034d7e3f..fc83b8cd1b 100644
--- a/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
@@ -1,8 +1,8 @@
 #Properties file for org.eclipse.e4.tools
-category.name = e4
+category.name = Eclipse 4
 category.name.0 = Classes
 category.name.1 = Model
-wizard.name = e4 Application Project
+wizard.name = Eclipse 4 Application Project
 wizard.name.0 = New Application Model
 wizard.name.1 = New Model Fragment
 wizard.name.2 = New Handler Class
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
index 23f4163208..218e7d6a9d 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
@@ -56,7 +56,7 @@ public class NewModelFilePage extends WizardPage {
 	public NewModelFilePage(ISelection selection, String defaultFilename) {
 		super("wizardPage");
 		setTitle("New application model");
-		setDescription("This wizard creates a new e4 application model");
+		setDescription("This wizard creates a new Eclipse 4 application model");
 		this.selection = selection;
 		this.defaultFilename = defaultFilename;
 	}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
index 8573dac15c..0fa47ba585 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
@@ -65,11 +65,11 @@ public class NewApplicationWizardPage extends WizardPage {
 	private PropertyData[] PROPERTIES;
 
 	protected NewApplicationWizardPage(IProjectProvider projectProvider, AbstractFieldData pluginData) {
-		super("New e4 Application Wizard Page");
+		super("New Eclipse 4 Application Wizard Page");
 		this.projectProvider = projectProvider;
 		this.pluginData = pluginData;
 		data = new HashMap<String, String>();
-		setTitle("e4 Application");
+		setTitle("Eclipse 4 Application");
 		setMessage("Configure application with special values.");
 	}
 

From 775ef0261b1d332100fc5a9db5e36dad928ea13c Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@gmail.com>
Date: Mon, 14 May 2012 19:18:28 +0200
Subject: [PATCH 0426/1286] Bug 379281 - [Tooling] Adding the Add button to all
 model editor elements

---
 .../e4/tools/emf/ui/internal/common/component/MenuEditor.java    | 1 +
 .../ui/internal/common/component/PartSashContainerEditor.java    | 1 +
 .../tools/emf/ui/internal/common/component/PartStackEditor.java  | 1 +
 .../common/component/virtual/VPerspectiveControlEditor.java      | 1 +
 .../internal/common/component/virtual/VWindowControlEditor.java  | 1 +
 .../emf/ui/internal/common/component/virtual/VWindowEditor.java  | 1 +
 6 files changed, 6 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 4dde73d666..b86ae279a6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -331,6 +331,7 @@ public String getText(Object element) {
 			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 71ed478853..cbd7068a70 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -329,6 +329,7 @@ public String getText(Object element) {
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index ae737f26f0..d6860e06cd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -275,6 +275,7 @@ public String getText(Object element) {
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index 9aaba3ec59..4fa358dde5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -226,6 +226,7 @@ public String getText(Object element) {
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 7e910d6094..1346d55b3e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -233,6 +233,7 @@ public String getText(Object element) {
 			childrenDropDown.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 500042f7f1..051f24131f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -207,6 +207,7 @@ public String getText(Object element) {
 		childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.TRIMMED_WINDOW));
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ModelTooling_Common_AddEllipsis);
 		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 		b.addSelectionListener(new SelectionAdapter() {

From a9da7e2cf867e61b4b47a352b26007c6e912ec7c Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@gmail.com>
Date: Mon, 14 May 2012 19:39:47 +0200
Subject: [PATCH 0427/1286] Bug 378660 - Eclipse 4 wizard should not add
 dependency on o.e.core.resources

---
 .../e4/internal/tools/wizards/project/E4NewProjectWizard.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 1fce85eba9..f1288fc588 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -160,7 +160,6 @@ protected void adjustManifests(
 							IPluginBase pluginBase = model.getPluginBase();
 							String[] dependencyId = new String[] {
 									"javax.inject",
-									"org.eclipse.core.resources",
 									"org.eclipse.core.runtime",
 									"org.eclipse.swt",
 									"org.eclipse.core.databinding",

From e8cc65cd57d65f17b8c985bfb58931487b0129f5 Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@gmail.com>
Date: Mon, 14 May 2012 20:29:38 +0200
Subject: [PATCH 0428/1286] Bug 379459 - [Tooling] Changing default in the
 Preferences for Autogenerated ID's to true

---
 .../e4/tools/emf/ui/internal/PreferenceInitializer.java       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
index bcfc2bbe2b..2068b5c289 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
@@ -26,6 +26,10 @@ public void initializeDefaultPreferences() {
 			String val = StringConverter.asString(new RGB(200, 200, 200));
 			pref.put("notVisibleAndRenderedColor", val);
 		}
+
+		if (pref.get("autoCreateElementId", null) == null) {
+			pref.putBoolean("autoCreateElementId", true);
+		}
 	}
 
 }

From 1cc06a7958ec3a221e1b1944a54ae34e74db9e7f Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Mon, 14 May 2012 20:55:43 +0200
Subject: [PATCH 0429/1286] Bug 379460 - [Tooling] Generated IDs by the Model
 Editor should be lowercase

---
 .../src/org/eclipse/e4/tools/emf/ui/common/Util.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index caa8211363..271cade28e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -106,7 +106,7 @@ public static final String getDefaultElementId(Resource resource, MApplicationEl
 				lastNumber = number;
 			}
 
-			return prefix + "." + ++lastNumber; //$NON-NLS-1$
+			return (prefix + "." + ++lastNumber).toLowerCase(); //$NON-NLS-1$
 		} catch (Exception e) {
 			// TODO: handle exception
 			e.printStackTrace();

From a0b4904ca9bc4372adf823031b53e13abb4f1ad1 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Mon, 14 May 2012 20:55:43 +0200
Subject: [PATCH 0430/1286] Bug 379286 - [Tooling] Remove redundant information
 and space in model editor

---
 .../e4/tools/emf/ui/internal/common/ModelEditor.java        | 2 +-
 .../common/component/virtual/VApplicationAddons.java        | 5 -----
 .../component/virtual/VApplicationCategoriesEditor.java     | 5 -----
 .../common/component/virtual/VBindingTableEditor.java       | 6 +-----
 .../internal/common/component/virtual/VCommandEditor.java   | 5 -----
 .../internal/common/component/virtual/VHandlerEditor.java   | 5 -----
 .../common/component/virtual/VItemParametersEditor.java     | 5 -----
 .../common/component/virtual/VMenuContributionsEditor.java  | 5 -----
 .../ui/internal/common/component/virtual/VMenuEditor.java   | 5 -----
 .../common/component/virtual/VModelFragmentsEditor.java     | 5 -----
 .../common/component/virtual/VModelImportsEditor.java       | 5 -----
 .../internal/common/component/virtual/VPartDescriptor.java  | 5 -----
 .../common/component/virtual/VPerspectiveControlEditor.java | 5 -----
 .../common/component/virtual/VRootBindingContexts.java      | 5 -----
 .../internal/common/component/virtual/VSnippetsEditor.java  | 5 -----
 .../component/virtual/VToolBarContributionsEditor.java      | 5 -----
 .../common/component/virtual/VTrimContributionsEditor.java  | 5 -----
 .../common/component/virtual/VWindowControlEditor.java      | 5 -----
 .../ui/internal/common/component/virtual/VWindowEditor.java | 5 -----
 .../component/virtual/VWindowSharedElementsEditor.java      | 5 -----
 .../common/component/virtual/VWindowTrimEditor.java         | 5 -----
 .../src/org/eclipse/e4/internal/tools/ToolsPlugin.java      | 2 +-
 22 files changed, 3 insertions(+), 102 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index df35df625e..c44a07892e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -561,7 +561,7 @@ public void run() {
 			}
 		});
 
-		form.setWeights(new int[] { 1, 2 });
+		form.setWeights(new int[] { 3, 4 });
 
 		MenuManager mgr = new MenuManager();
 		mgr.setRemoveAllWhenShown(true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index e8c9bd44c6..dc6490be7a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -45,7 +45,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VApplicationAddons extends AbstractComponentEditor {
 	private Composite composite;
@@ -111,10 +110,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.VApplicationAddons_Commands);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index 2b1af264b3..ed8e27eec6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -45,7 +45,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VApplicationCategoriesEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -111,10 +110,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.VApplicationCategoriesEditor_Categories);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 01a74ca6f3..d703c46427 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -45,7 +45,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VBindingTableEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -93,6 +92,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
+
 		}
 		VirtualEntry<?> o = (VirtualEntry<?>) object;
 		bindingViewer.setInput(o.getList());
@@ -110,10 +110,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.VBindingTableEditor_BindingTables);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 			bindingViewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			bindingViewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 5661672ae9..64232bb699 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -46,7 +46,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VCommandEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -114,10 +113,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.VCommandEditor_Commands);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index ab57532a34..8899479634 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -45,7 +45,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VHandlerEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -110,10 +109,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.VHandlerEditor_Handlers);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
index 637f240953..c12a38667b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -47,7 +47,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VItemParametersEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -114,10 +113,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.VItemParametersEditor_Parameters);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index 8870e43ac6..70c2d3a53f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -45,7 +45,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VMenuContributionsEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -111,10 +110,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.VMenuContributionsEditor_MenuContributions);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 0dcfffffc9..f5de8e8da5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -52,7 +52,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VMenuEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -135,10 +134,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		Label l = new Label(parent, SWT.NONE);
-		l.setText(Messages.VMenuEditor_Menus);
-		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 		viewer = new TableViewer(parent);
 		ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index 257c8e305a..723342daf2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -42,7 +42,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VModelFragmentsEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -96,10 +95,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.VModelFragmentsEditor_Fragments);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index 2e289aa0b2..80fb9be8b8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -53,7 +53,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VModelImportsEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -107,10 +106,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.VModelImportsEditor_Imports);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 			viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index 3175fe16df..be122480dc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -45,7 +45,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VPartDescriptor extends AbstractComponentEditor {
 	private Composite composite;
@@ -110,10 +109,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.VPartDescriptor_Descriptors);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index 4fa358dde5..347d336347 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -52,7 +52,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VPerspectiveControlEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -145,10 +144,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.VWindowControlEditor_Controls);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
index e792c05ebc..cb58e9424e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
@@ -45,7 +45,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VRootBindingContexts extends AbstractComponentEditor {
 	private Composite composite;
@@ -111,10 +110,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.VRootBindingContexts_Contexts);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index 1932fa060e..df4eac39ef 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -42,7 +42,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VSnippetsEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -173,10 +172,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		Label l = new Label(parent, SWT.NONE);
-		l.setText(Messages.VSnippetsEditor_Snippets);
-		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 		viewer = new TableViewer(parent);
 		ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index 9b5552c295..ab026ff2cd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -45,7 +45,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VToolBarContributionsEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -110,10 +109,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.VToolBarContributionsEditor_Contributions);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index 4a2c6b5d7a..196ed27447 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -45,7 +45,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VTrimContributionsEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -110,10 +109,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.VTrimContributionsEditor_Contributions);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 1346d55b3e..cd6e97a230 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -52,7 +52,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VWindowControlEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -152,10 +151,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.VWindowControlEditor_Controls);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 051f24131f..99eb3d8e45 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -50,7 +50,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public abstract class VWindowEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -121,10 +120,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		Label l = new Label(parent, SWT.NONE);
-		l.setText(Messages.VWindowEditor_Windows);
-		l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 		viewer = new TableViewer(parent);
 		ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 64587f8ab6..32c985f9de 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -51,7 +51,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VWindowSharedElementsEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -130,10 +129,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.VWindowSharedElementsEditor_Controls);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index 70fe2b3cde..0ffae0236a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -42,7 +42,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class VWindowTrimEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -107,10 +106,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.VWindowTrimEditor_Controls);
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
 			viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
index 9f80ed6bfd..1a9fa29348 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
@@ -11,7 +11,7 @@
 public class ToolsPlugin extends AbstractUIPlugin {
 	// The plug-in ID
 	public static final String PLUGIN_ID = "org.eclipse.e4.tools"; //$NON-NLS-1$
-
+ 
 	private static ToolsPlugin plugin;
 	
 	private ResourceLocator resourceLocator;

From 064236f3a046260d962c93d5501c9df92057aaa5 Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@gmail.com>
Date: Tue, 15 May 2012 18:47:44 +0200
Subject: [PATCH 0431/1286] Bug 379281 - [Tooling] Adding the Add button to all
 model editor elements - Menu Entry for Parts

---
 .../emf/ui/internal/common/component/virtual/VMenuEditor.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index f5de8e8da5..77ee666c30 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -224,6 +224,7 @@ public String getText(Object element) {
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
+		b.setText(Messages.ModelTooling_Common_AddEllipsis);
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override

From 9683c008afc294132110910fad6148247c824256 Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@gmail.com>
Date: Sun, 20 May 2012 21:43:12 +0200
Subject: [PATCH 0432/1286] Bug 380172 - Renamed e4 Workbench Editor to Eclipse
 4 model editor

---
 .../OSGI-INF/l10n/bundle.properties                             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
index 9042b1e4e4..482fea1f55 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
@@ -1,5 +1,5 @@
 #Properties file for org.eclipse.e4.tools.emf.editor3x
-editor.name = e4 Workbenchmodel Editor
+editor.name = Eclipse 4 model editor
 page.name = Model Editor
 Bundle-Name = Editor3x
 Bundle-Vendor = Eclipse.org
\ No newline at end of file

From 49f8a49d2544c5fb9388c861b29f419719740e52 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Tue, 29 May 2012 22:33:59 +0200
Subject: [PATCH 0433/1286] Bug 380936 - Active features and plugins version
 should be increased to 0.12

---
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF       | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF       | 2 +-
 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF     | 2 +-
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF              | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 0e792e7af8..6cedfefcc5 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index a75d4ceb82..e11ae02f52 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 7abd03fc96..7874eea14c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 22da85cdd8..9374d6b9a4 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.e4.tools.services,
  org.eclipse.e4.tools.services.impl;x-friends:="org.eclipse.e4.tools.emf.ui"
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 51cbe5ed5f..6165ceec1c 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.pde.core;bundle-version="3.6.0",
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index c56823a4ff..a00b903e60 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="0.10.0.qualifier"
+      version="0.12.0.qualifier"
       provider-name="%providerName">
 
    <description>

From 074f265dafc09f48822c45cca313aae95f2e49b5 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Tue, 29 May 2012 22:36:17 +0200
Subject: [PATCH 0434/1286] Bug 379820 - Preference setting for autogenerated
 ID's not used for menus

---
 .../e4/tools/emf/ui/internal/common/component/MenuEditor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index b86ae279a6..5719a269b4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -546,7 +546,7 @@ public FeaturePath[] getLabelProperties() {
 
 	protected void handleAdd(EClass eClass, boolean separator) {
 		MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
-
+		setElementId(eObject);
 		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {

From 9d89e2aedcc487d60fea79de2e524d8e5002cca6 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Fri, 8 Jun 2012 21:26:40 +0200
Subject: [PATCH 0435/1286] Bug 382118 - [Tools] Multiple keybindings for Show
 Live model


From bea861c7a68f8c231502a1cae6d71ad021da69c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sopot=20=C3=87ela?= <sopotcela@gmail.com>
Date: Thu, 19 Jul 2012 18:49:14 +0200
Subject: [PATCH 0436/1286] Bug 379313 - Added API to show warning decoration
 in model editor

---
 .../common/component/ControlFactory.java      | 52 ++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 5d25804862..fd1788b11f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -15,12 +15,17 @@
 import java.util.List;
 import java.util.Map.Entry;
 import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.map.IObservableMap;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
+import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.core.databinding.validation.ValidationStatus;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -64,6 +69,9 @@
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.jface.fieldassist.FieldDecoration;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ComboViewer;
@@ -318,6 +326,23 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	public static void createTextField(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp) {
+		createTextField(parent, label, master, context, textProp, modelProp, null);
+
+	}
+
+	/**
+	 * 
+	 * @param parent
+	 * @param label
+	 * @param master
+	 * @param context
+	 * @param textProp
+	 * @param modelProp
+	 * @param warningText
+	 *            Non null warningText means that a warning with this non-null
+	 *            text will be shown when the field is left empty
+	 */
+	public static void createTextField(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp, final String warningText) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
 		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
@@ -326,7 +351,32 @@ public static void createTextField(Composite parent, String label, IObservableVa
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 2;
 		t.setLayoutData(gd);
-
+		if (warningText != null) {
+			final ControlDecoration controlDecoration = new ControlDecoration(t, SWT.LEFT | SWT.TOP);
+			controlDecoration.setDescriptionText(warningText);
+			FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_WARNING);
+			controlDecoration.setImage(fieldDecoration.getImage());
+			IValidator iv = new IValidator() {
+
+				public IStatus validate(Object value) {
+					if (value == null) {
+						controlDecoration.show();
+						return ValidationStatus.warning(warningText);
+					}
+					if (value instanceof String) {
+						String text = (String) value;
+						if (text.trim().length() == 0) {
+							controlDecoration.show();
+							return ValidationStatus.warning(warningText);
+						}
+					}
+					controlDecoration.hide();
+					return Status.OK_STATUS;
+				}
+			};
+			UpdateValueStrategy acv = new UpdateValueStrategy().setAfterConvertValidator(iv);
+			context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master), acv, acv);
+		}
 		TextPasteHandler.createFor(t);
 		context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master));
 	}

From a78ebe39c02c02cdbf58ff068c93fedb13135da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sopot=20=C3=87ela?= <sopotcela@gmail.com>
Date: Thu, 19 Jul 2012 19:12:12 +0200
Subject: [PATCH 0437/1286] Bug 379304 - Show warning if ID not entered for
 commands

---
 .../src/org/eclipse/e4/tools/emf/ui/internal/Messages.java      | 1 +
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.properties    | 2 ++
 .../tools/emf/ui/internal/common/component/CommandEditor.java   | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 72f5591c5c..708e717fe5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -12,6 +12,7 @@
 
 public class Messages {
 
+	public String ModelTooling_Empty_Warning;
 	public String ModelTooling_Common_Up;
 	public String ModelTooling_Common_Down;
 	public String ModelTooling_Common_AddEllipsis;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 203dd427e1..c0f8a18103 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -34,6 +34,8 @@ ModelTooling_ApplicationElement_Tags=Tags
 
 ModelTooling_Contribution_PersistedState=Persisted State
 
+ModelTooling_Empty_Warning=Value must not be empty
+
 AbstractCommandSelectionDialog_Label_CommandId=Command-Id
 
 ApplicationEditor_Label=Application
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index f913a326be..989672157f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -152,7 +152,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID), Messages.ModelTooling_Empty_Warning);
 		ControlFactory.createTextField(parent, Messages.CommandEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME));
 		ControlFactory.createTextField(parent, Messages.CommandEditor_LabelDescription, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__DESCRIPTION));
 

From 78f853b9d926fca461234a31245f4d83f063af80 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Thu, 19 Jul 2012 19:21:50 +0200
Subject: [PATCH 0438/1286] Bug 384581 - [Tooling] Avoid double naming for
 Model Fragments

Renamed label to "Model Fragment Definition".
---
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.properties    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index c0f8a18103..2ecc65615f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -287,7 +287,7 @@ MenuContributionEditor_TreeLabel=Menu Contribution
 MenuContributionEditor_TreeLabelDescription=Menu Contribution Bla Bla Bla Bla
 
 ModelFragmentsEditor_ModelFragments=Model Fragments
-ModelFragmentsEditor_Label=Model Fragments
+ModelFragmentsEditor_Label=Model Fragment Definition
 ModelFragmentsEditor_Description=Description
 ModelFragmentsEditor_Imports=Imports
 

From 5bebf52744d8b079f0443eae5d7610d164734207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sopot=20=C3=87ela?= <sopotcela@gmail.com>
Date: Fri, 20 Jul 2012 00:13:08 +0200
Subject: [PATCH 0439/1286] Bug 385556 - Warn if Binding Context name is left
 empty

---
 .../src/org/eclipse/e4/tools/emf/ui/internal/Messages.java      | 2 ++
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.properties    | 1 +
 .../emf/ui/internal/common/component/BindingContextEditor.java  | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 708e717fe5..e0a2e6eb6f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -321,6 +321,7 @@ public class Messages {
 	public String BindingContextEditor_Description;
 	public String BindingContextEditor_Subcontexts;
 	public String BindingContextEditor_AddContext;
+	public String BindingContextEditor_NameWarning;
 
 	public String CommandParameterEditor_TreeLabel;
 	public String CommandParameterEditor_TreeLabelDescritpion;
@@ -611,4 +612,5 @@ public class Messages {
 	public String ObjectViewer_Script;
 
 	public String CommandWizard_ShellTitle;
+
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 2ecc65615f..609bcdc4a4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -321,6 +321,7 @@ BindingContextEditor_Name=Name
 BindingContextEditor_Description=Description
 BindingContextEditor_Subcontexts=Subcontexts
 BindingContextEditor_AddContext=Binding Context
+BindingContextEditor_NameWarning=Binding Context name should be left empty
 
 CommandParameterEditor_TreeLabel=Command Parameter
 CommandParameterEditor_TreeLabelDescritpion=Command Parameter Bla Bla Bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 0b4f7d1776..f6c2d51636 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -160,7 +160,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME));
+		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME), Messages.BindingContextEditor_NameWarning);
 		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Description, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__DESCRIPTION));
 
 		Label l = new Label(parent, SWT.NONE);

From b24753683bdc5afb57d79d4f8fb4a6d98b080b38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sopot=20=C3=87ela?= <sopotcela@gmail.com>
Date: Tue, 24 Jul 2012 10:37:19 +0200
Subject: [PATCH 0440/1286] Bug 385257 - Adding class dialog to application
 model behaves now similar to the "Open Type" dialog.

This patch will activate camelCase matching in the dialog, and allow
the user to select with entry with tab or enter.
---
 .../PDEClassContributionProvider.java         |  2 +-
 .../tools/emf/ui/internal/Messages.properties |  2 +-
 .../dialogs/ContributionClassDialog.java      | 21 +++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index 4b3c3de337..540d02b251 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -145,7 +145,7 @@ public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
 					packageName, 
 					SearchPattern.R_PATTERN_MATCH, 
 					typeName, 
-					SearchPattern.R_PREFIX_MATCH, 
+					SearchPattern.R_PREFIX_MATCH | SearchPattern.R_CAMELCASE_MATCH, 
 					IJavaSearchConstants.CLASS, 
 					scope, 
 					req, 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 609bcdc4a4..8b813e4668 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -271,7 +271,7 @@ AddonsEditor_Tags=Tags
 
 ContributionClassDialog_DialogMessage=Enter the name of the contributing class
 ContributionClassDialog_DialogTitle=Find Contribution Class
-ContributionClassDialog_Label_Classname=Classname
+ContributionClassDialog_Label_Classname=Class Name
 ContributionClassDialog_ShellTitle=Find Contribution Class
 
 MenuContributionEditor_MenuItems=Menu Items
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index 50b4056fb0..d4a02ef75e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -35,6 +35,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Image;
@@ -151,6 +153,25 @@ public void modifyText(ModifyEvent e) {
 				currentResultHandler = new ContributionResultHandlerImpl(list);
 				Filter filter = new Filter(project, t.getText());
 				collector.findContributions(filter, currentResultHandler);
+				t.addKeyListener(new KeyAdapter() {
+					public void keyPressed(KeyEvent e) {
+						if (e.keyCode == SWT.ARROW_DOWN) {
+							if (viewer.getTable().getItemCount() > 0) {
+								viewer.getTable().setFocus();
+								viewer.getTable().select(0);
+							}
+						}
+					}
+				});
+				viewer.getTable().addKeyListener(new KeyAdapter() {
+					@Override
+					public void keyPressed(KeyEvent e) {
+						super.keyPressed(e);
+						if ((e.keyCode == SWT.ARROW_UP) && (viewer.getTable().getSelectionIndex() == 0)) {
+							t.setFocus();
+						}
+					}
+				});
 			}
 		});
 

From 8879d5abdf397f2b4d3f76f384d0b617b90ae218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sopot=20=C3=87ela?= <sopotcela@gmail.com>
Date: Tue, 24 Jul 2012 10:55:40 +0200
Subject: [PATCH 0441/1286] Bug 385685 - Model editor - Avoid repositioning the
 cursor and improved warning message

---
 .../eclipse/e4/tools/emf/ui/internal/Messages.properties    | 2 +-
 .../emf/ui/internal/common/component/ControlFactory.java    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 8b813e4668..35ba6c60ae 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -321,7 +321,7 @@ BindingContextEditor_Name=Name
 BindingContextEditor_Description=Description
 BindingContextEditor_Subcontexts=Subcontexts
 BindingContextEditor_AddContext=Binding Context
-BindingContextEditor_NameWarning=Binding Context name should be left empty
+BindingContextEditor_NameWarning=Binding Context name should not be empty
 
 CommandParameterEditor_TreeLabel=Command Parameter
 CommandParameterEditor_TreeLabelDescritpion=Command Parameter Bla Bla Bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index fd1788b11f..faaf89f4ab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -351,6 +351,7 @@ public static void createTextField(Composite parent, String label, IObservableVa
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 2;
 		t.setLayoutData(gd);
+		TextPasteHandler.createFor(t);
 		if (warningText != null) {
 			final ControlDecoration controlDecoration = new ControlDecoration(t, SWT.LEFT | SWT.TOP);
 			controlDecoration.setDescriptionText(warningText);
@@ -376,9 +377,8 @@ public IStatus validate(Object value) {
 			};
 			UpdateValueStrategy acv = new UpdateValueStrategy().setAfterConvertValidator(iv);
 			context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master), acv, acv);
-		}
-		TextPasteHandler.createFor(t);
-		context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master));
+		} else
+			context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master));
 	}
 
 	public static void createTranslatedTextField(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp, IResourcePool resourcePool, IProject project) {

From 96f3f49600caddf23cedf059931ba3a6077f8e27 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Wed, 8 Aug 2012 14:16:52 -0400
Subject: [PATCH 0442/1286] Bug 379236 - add maximize button in CSS Spy


From 9cdc1dde00bca21e0edf6c19ad0e1f6629228053 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Sun, 12 Aug 2012 11:12:49 +0200
Subject: [PATCH 0443/1286] Bug 387073 - [ModelEditor] ToolItem does not allow
 to define Menu

---
 .../e4/tools/emf/ui/internal/Messages.java    |  2 +-
 .../tools/emf/ui/internal/Messages.properties |  1 +
 .../component/DirectToolItemEditor.java       |  4 +-
 .../component/HandledToolItemEditor.java      |  4 +-
 .../common/component/ToolItemEditor.java      | 84 ++++++++++++++++++-
 5 files changed, 88 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index e0a2e6eb6f..a0883713df 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -354,6 +354,7 @@ public class Messages {
 	public String ToolItemEditor_Enabled;
 	public String ToolItemEditor_Selected;
 	public String ToolItemEditor_NoExpression;
+	public String ToolItemEditor_Menu;
 
 	public String TrimBarEditor_TreeLabel;
 	public String TrimBarEditor_TreeLabelDescription;
@@ -612,5 +613,4 @@ public class Messages {
 	public String ObjectViewer_Script;
 
 	public String CommandWizard_ShellTitle;
-
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 35ba6c60ae..f77325f0a2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -354,6 +354,7 @@ ToolItemEditor_IconURI=Icon URI
 ToolItemEditor_Enabled=Enabled
 ToolItemEditor_Selected=Selected
 ToolItemEditor_NoExpression=<None>
+ToolItemEditor_Menu=Menu
 
 TrimBarEditor_TreeLabel=Window Trim
 TrimBarEditor_TreeLabelDescription=Window Trim bla bla bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index c22e08eb1b..b593827918 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -14,7 +14,6 @@
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -148,9 +147,10 @@ public String getDescription(Object element) {
 		return Messages.DirectToolItemEditor_Description;
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public IObservableList getChildList(Object element) {
-		final WritableList list = new WritableList();
+		final IObservableList list = super.getChildList(element);
 
 		if (((MDirectToolItem) element).getVisibleWhen() != null) {
 			list.add(0, ((MDirectToolItem) element).getVisibleWhen());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index e4895037f3..18febd9c5e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -13,7 +13,6 @@
 import javax.inject.Inject;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -114,9 +113,10 @@ public String getDescription(Object element) {
 		return Messages.HandledToolItemEditor_Description;
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public IObservableList getChildList(Object element) {
-		final WritableList list = new WritableList();
+		final IObservableList list = super.getChildList(element);
 
 		if (((MHandledToolItem) element).getVisibleWhen() != null) {
 			list.add(0, ((MHandledToolItem) element).getVisibleWhen());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index db0ce04681..fd1be2be05 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -16,8 +16,12 @@
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
@@ -33,15 +37,20 @@
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
@@ -68,10 +77,14 @@ public abstract class ToolItemEditor extends AbstractComponentEditor {
 
 	private EStackLayout stackLayout;
 
+	private IValueProperty TOOL_ITEM__MENU = EMFProperties.value(MenuPackageImpl.Literals.TOOL_ITEM__MENU);
+
 	@Inject
 	@Optional
 	protected IProject project;
 
+	private Button createRemoveMenu;
+
 	public ToolItemEditor() {
 		super();
 	}
@@ -105,6 +118,10 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
+		if (createRemoveMenu != null) {
+			createRemoveMenu.setSelection(((MToolItem) object).getMenu() != null);
+		}
+
 		getMaster().setValue(object);
 		return composite;
 	}
@@ -216,6 +233,26 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.ToolItemEditor_Menu);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			createRemoveMenu = new Button(parent, SWT.CHECK);
+			createRemoveMenu.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MToolItem item = (MToolItem) getMaster().getValue();
+					if (item.getMenu() == null) {
+						addMenu();
+					} else {
+						removeMenu();
+					}
+				}
+			});
+			createRemoveMenu.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
+		}
+
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolItemEditor_Enabled);
@@ -300,9 +337,52 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 
 	}
 
+	void removeMenu() {
+		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_ITEM__MENU, null);
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+		}
+	}
+
+	void addMenu() {
+		MMenu menu = MMenuFactory.INSTANCE.createMenu();
+		setElementId(menu);
+
+		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_ITEM__MENU, menu);
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+		}
+	}
+
 	@Override
-	public IObservableList getChildList(Object element) {
-		return null;
+	public IObservableList getChildList(final Object element) {
+		final WritableList list = new WritableList();
+
+		MToolItem item = (MToolItem) element;
+		if (item.getMenu() != null) {
+			list.add(0, item.getMenu());
+		}
+
+		TOOL_ITEM__MENU.observe(element).addValueChangeListener(new IValueChangeListener() {
+
+			public void handleValueChange(ValueChangeEvent event) {
+				if (event.diff.getOldValue() != null) {
+					list.remove(event.diff.getOldValue());
+					if (getMaster().getValue() == element && !createRemoveMenu.isDisposed()) {
+						createRemoveMenu.setSelection(false);
+					}
+				}
+
+				if (event.diff.getNewValue() != null) {
+					list.add(0, event.diff.getNewValue());
+					if (getMaster().getValue() == element && !createRemoveMenu.isDisposed()) {
+						createRemoveMenu.setSelection(true);
+					}
+				}
+			}
+		});
+
+		return list;
 	}
 
 	@Override

From a3581f8886f2ca9d0699420d1ed8f197a49913de Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Tue, 14 Aug 2012 12:56:54 +0200
Subject: [PATCH 0444/1286] Bug 387017 - [Tooling] Eclipse 4 application wizard
 should not display the applicationXMI property

Removes the applicationXMI property as we offer a good default behavior.
---
 .../wizards/project/E4NewProjectWizard.java   | 147 ++++++++----------
 .../project/NewApplicationWizardPage.java     |   3 -
 2 files changed, 69 insertions(+), 81 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index f1288fc588..d5df9c946f 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -93,6 +93,7 @@
  */
 public class E4NewProjectWizard extends NewPluginProjectWizard {
 
+	private static final String APPLICATION_MODEL = "Application.e4xmi";
 	private PluginFieldData fPluginData;
 	private NewApplicationWizardPage fApplicationPage;
 	private IProjectProvider fProjectProvider;
@@ -238,12 +239,6 @@ private void adjustBuildPropertiesFile(IProject project) throws CoreException {
 				e.addToken(cssEntry);	
 			}
 			
-			String xmiPath = map
-					.get(NewApplicationWizardPage.APPLICATION_XMI_PROPERTY);
-			if( xmiPath != null ) {
-				e.addToken(xmiPath);	
-			}
-			
 			model.save();
 		}
 	}
@@ -269,13 +264,6 @@ public void createProductsExtension(IProject project) {
 			String applicationName = map
 					.get(NewApplicationWizardPage.APPLICATION);
 
-			String xmiPath = map
-					.get(NewApplicationWizardPage.APPLICATION_XMI_PROPERTY);
-			if (xmiPath != null) {
-				xmiPath = productName + "/" + xmiPath;
-				map.put(NewApplicationWizardPage.APPLICATION_XMI_PROPERTY,
-						xmiPath);
-			}
 			String cssValue = map
 					.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
 			if (cssValue != null) {
@@ -348,8 +336,6 @@ public void createApplicationResources(IProject project,
 
 		// If the project has invalid characters, the plug-in name would replace them with underscores, product name does the same
 		String pluginName = map.get(NewApplicationWizardPage.PRODUCT_NAME);
-		String xmiPath = map
-				.get(NewApplicationWizardPage.APPLICATION_XMI_PROPERTY);
 
 		// If there's no Activator created we create default package
 		if (!fPluginData.doGenerateClass()) {
@@ -379,7 +365,73 @@ public void createApplicationResources(IProject project,
 			e1.printStackTrace();
 		}
 
-		if (xmiPath != null && xmiPath.trim().length() > 0) {
+		createApplicationModel(project, pluginName, fragment);
+
+		String cssPath = map
+				.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
+		if (cssPath != null && cssPath.trim().length() > 0) {
+			IFile file = project.getFile(cssPath);
+
+			try {
+				prepareFolder(file.getParent(), monitor);
+
+				URL corePath = ResourceLocator
+						.getProjectTemplateFiles("css/default.css");
+				file.create(corePath.openStream(), true, monitor);
+			} catch (Exception e) {
+				PDEPlugin.logException(e);
+			}
+		}
+
+		// IFolder folder = project.getFolder("icons");
+		// try {
+		// folder.create(true, true, monitor);
+		// Bundle bundle = Platform
+		// .getBundle("org.eclipse.e4.tools.ui.designer");
+		//
+		// for (String fileName : new String[] { "sample.gif", "save_edit.gif"
+		// }) {
+		// URL sampleUrl = bundle.getEntry("resources/icons/" + fileName);
+		// sampleUrl = FileLocator.resolve(sampleUrl);
+		// InputStream inputStream = sampleUrl.openStream();
+		// IFile file = folder.getFile(fileName);
+		// file.create(inputStream, true, monitor);
+		// }
+		// } catch (Exception e) {
+		// PDEPlugin.logException(e);
+		// }
+
+		String template_id = "common";
+		Set<String> binaryExtentions = new HashSet<String>();
+		binaryExtentions.add(".gif");
+		binaryExtentions.add(".png");
+
+		Map<String, String> keys = new HashMap<String, String>();
+		keys.put("projectName", pluginName);
+		keys.put("packageName", fragment.getElementName() + ".handlers");
+
+		try {
+			URL corePath = ResourceLocator.getProjectTemplateFiles(template_id);
+			IRunnableWithProgress op = new TemplateOperation(corePath, project,
+					keys, binaryExtentions);
+			getContainer().run(false, true, op);
+		} catch (Exception e) {
+			PDEPlugin.logException(e);
+		}
+
+		try {
+			URL corePath = ResourceLocator.getProjectTemplateFiles("src");
+			IRunnableWithProgress op = new TemplateOperation(corePath,
+					(IContainer) fragment.getResource(), keys, binaryExtentions);
+			getContainer().run(false, true, op);
+		} catch (Exception e) {
+			PDEPlugin.logException(e);
+		}
+	}
+
+	private void createApplicationModel(IProject project, String pluginName,
+			IPackageFragment fragment) {
+		if (APPLICATION_MODEL != null && APPLICATION_MODEL.trim().length() > 0) {
 			// Create a resource set
 			//
 			ResourceSet resourceSet = new ResourceSetImpl();
@@ -387,7 +439,7 @@ public void createApplicationResources(IProject project,
 			// Get the URI of the model file.
 			//
 			URI fileURI = URI.createPlatformResourceURI(project.getName() + "/"
-					+ xmiPath, true);
+					+ APPLICATION_MODEL, true);
 
 			// Create a resource for this file.
 			//
@@ -579,67 +631,6 @@ public void createApplicationResources(IProject project,
 				PDEPlugin.logException(e);
 			}
 		}
-
-		String cssPath = map
-				.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
-		if (cssPath != null && cssPath.trim().length() > 0) {
-			IFile file = project.getFile(cssPath);
-
-			try {
-				prepareFolder(file.getParent(), monitor);
-
-				URL corePath = ResourceLocator
-						.getProjectTemplateFiles("css/default.css");
-				file.create(corePath.openStream(), true, monitor);
-			} catch (Exception e) {
-				PDEPlugin.logException(e);
-			}
-		}
-
-		// IFolder folder = project.getFolder("icons");
-		// try {
-		// folder.create(true, true, monitor);
-		// Bundle bundle = Platform
-		// .getBundle("org.eclipse.e4.tools.ui.designer");
-		//
-		// for (String fileName : new String[] { "sample.gif", "save_edit.gif"
-		// }) {
-		// URL sampleUrl = bundle.getEntry("resources/icons/" + fileName);
-		// sampleUrl = FileLocator.resolve(sampleUrl);
-		// InputStream inputStream = sampleUrl.openStream();
-		// IFile file = folder.getFile(fileName);
-		// file.create(inputStream, true, monitor);
-		// }
-		// } catch (Exception e) {
-		// PDEPlugin.logException(e);
-		// }
-
-		String template_id = "common";
-		Set<String> binaryExtentions = new HashSet<String>();
-		binaryExtentions.add(".gif");
-		binaryExtentions.add(".png");
-
-		Map<String, String> keys = new HashMap<String, String>();
-		keys.put("projectName", pluginName);
-		keys.put("packageName", fragment.getElementName() + ".handlers");
-
-		try {
-			URL corePath = ResourceLocator.getProjectTemplateFiles(template_id);
-			IRunnableWithProgress op = new TemplateOperation(corePath, project,
-					keys, binaryExtentions);
-			getContainer().run(false, true, op);
-		} catch (Exception e) {
-			PDEPlugin.logException(e);
-		}
-
-		try {
-			URL corePath = ResourceLocator.getProjectTemplateFiles("src");
-			IRunnableWithProgress op = new TemplateOperation(corePath,
-					(IContainer) fragment.getResource(), keys, binaryExtentions);
-			getContainer().run(false, true, op);
-		} catch (Exception e) {
-			PDEPlugin.logException(e);
-		}
 	}
 
 	private MCommand createCommand(String commandId, String name,
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
index 0fa47ba585..886986f745 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
@@ -48,7 +48,6 @@
  */
 public class NewApplicationWizardPage extends WizardPage {
 	public static final String E4_APPLICATION = "org.eclipse.e4.ui.workbench.swt.E4Application";
-	public static final String APPLICATION_XMI_PROPERTY = "applicationXMI";
 	public static final String APPLICATION_CSS_PROPERTY = "applicationCSS";
 	public static final String PRODUCT_NAME = "productName";
 	public static final String APPLICATION = "application";
@@ -367,8 +366,6 @@ protected PropertyData[] getPropertyData() {
 					new PropertyData(IProductConstants.APP_NAME, "Application Name:",
 							projectProvider.getProjectName(), String.class,
 							true),
-					new PropertyData(APPLICATION_XMI_PROPERTY, "Application UI:",
-							"Application.e4xmi", String.class, true),
 					new PropertyData(APPLICATION_CSS_PROPERTY, "CSS Style:",
 							"css/default.css", String.class, true),
 					new PropertyData(IProductConstants.ABOUT_TEXT, "About Message:", "",

From 2f382acf170c65280c3c7073dd4da3c93ac975c8 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Wed, 15 Aug 2012 16:23:49 +0200
Subject: [PATCH 0445/1286] Bug 387288 - [Tooling] Add message to filter text
 fields in ContributionClassDialog

---
 .../src/org/eclipse/e4/tools/emf/ui/internal/Messages.java       | 1 +
 .../src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties | 1 +
 .../common/component/dialogs/ContributionClassDialog.java        | 1 +
 3 files changed, 3 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index a0883713df..c3e7afbf2c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -271,6 +271,7 @@ public class Messages {
 	public String ContributionClassDialog_DialogMessage;
 	public String ContributionClassDialog_DialogTitle;
 	public String ContributionClassDialog_Label_Classname;
+	public String ContributionClassDialog_FilterText_Message;
 	public String ContributionClassDialog_ShellTitle;
 
 	public String MenuContributionEditor_MenuItems;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index f77325f0a2..575bd475d9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -272,6 +272,7 @@ AddonsEditor_Tags=Tags
 ContributionClassDialog_DialogMessage=Enter the name of the contributing class
 ContributionClassDialog_DialogTitle=Find Contribution Class
 ContributionClassDialog_Label_Classname=Class Name
+ContributionClassDialog_FilterText_Message=Type to start search
 ContributionClassDialog_ShellTitle=Find Contribution Class
 
 MenuContributionEditor_MenuItems=Menu Items
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index d4a02ef75e..8438f86ae2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -100,6 +100,7 @@ public void widgetDisposed(DisposeEvent e) {
 
 		final Text t = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		t.setMessage(Messages.ContributionClassDialog_FilterText_Message);
 
 		new Label(container, SWT.NONE);
 

From aaea8f10fc341b8dbd91613d12ee28ecf27c43a2 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Wed, 15 Aug 2012 17:58:56 +0200
Subject: [PATCH 0446/1286] Bug 387295 - [Tooling] Fix
 org.eclipse.e4.tools.jdt.templates

---
 .../plugin.xml                                | 68 ++++++++++++++++++-
 .../E4TemplateCompletionProposalComputer.java |  4 +-
 .../templates/default-e4templates.xml         | 25 ++++---
 3 files changed, 86 insertions(+), 11 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml b/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
index b3ed8606b1..2a4f15366e 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
@@ -15,7 +15,6 @@
             activate="true"
             categoryId="org.eclipse.e4.tools.jdt.templates.e4ProposalCategory"
             class="org.eclipse.e4.internal.tools.jdt.templates.E4TemplateCompletionProposalComputer">
-			<partition type="__dftl_partition_content_type"/>
       </javaCompletionProposalComputer>
     </extension>
    <extension
@@ -42,6 +41,73 @@
             file="templates/default-e4templates.xml"
             translations="$nl$/templates/default-e4templates.properties">
       </include>
+            <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.FieldResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.Field.description"
+            name="%templates.java.resolvers.Field.name"
+            type="field"/>
+      <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.LocalVarResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.LocalVar.description"
+            name="%templates.java.resolvers.LocalVar.name"
+            type="localVar"/>
+      <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.VarResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.Var.description"
+            name="%templates.java.resolvers.Var.name"
+            type="var"/>
+      <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.NameResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.Name.description"
+            name="%templates.java.resolvers.Name.name"
+            type="newName"/>
+      <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.TypeResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.Type.description"
+            name="%templates.java.resolvers.Type.name"
+            type="newType"/>
+      <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.ElementTypeResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.ElementType.description"
+            name="%templates.java.resolvers.ElementType.name"
+            type="elemType"/>
+      <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.TypeVariableResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.ArgumentType.description"
+            name="%templates.java.resolvers.ArgumentType.name"
+            type="argType"/>
+	  <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.LinkResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.Link.description"
+            name="%templates.java.resolvers.Link.name"
+            type="link"/>
+      <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.ImportsResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.Imports.description"
+            name="%templates.java.resolvers.Imports.name"
+            type="import"/>
+      <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.StaticImportResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.ImportStatic.description"
+            name="%templates.java.resolvers.ImportStatic.name"
+            type="importStatic"/>
+      <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.ExceptionVariableNameResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.ExceptionVariableName.description"
+            name="%templates.java.resolvers.ExceptionVariableName.name"
+            type="exception_variable_name">
+      </resolver>
    </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
index cadf6bfc7c..fc49a7fb4d 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
@@ -34,10 +34,10 @@
 public class E4TemplateCompletionProposalComputer extends AbstractTemplateCompletionProposalComputer {
 
 	/**
-	 * The name of <code>org.eclipse.e4.core.services.IDisposable</code> used to detect
+	 * The name of <code>javax.inject.Inject</code> used to detect
 	 * if a project uses e4.
 	 */
-	private static final String E4_TYPE_NAME= "org.eclipse.e4.core.services.IDisposable"; //$NON-NLS-1$
+	private static final String E4_TYPE_NAME= "org.eclipse.e4.ui.di.Focus"; //$NON-NLS-1$
 
 
 	/**
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
index 33dd080869..61cd4d654a 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
@@ -10,6 +10,7 @@
  *
  * Contributors:
  *     Boris Bokowski, IBM Corporation - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Reworked templates
  *******************************************************************************/
 -->
 
@@ -46,14 +47,22 @@ void handleSomeEvent(Payload payloadObject) {
 	${cursor}
 }</template>
 
-<template name="e4-init" description="Initialization Method" id="org.eclipse.e4.tools.jdt.templates.init" context="e4-members" enabled="true" autoinsert="false">@PostConstruct
-void init() {
-	${cursor}
-}</template>
+<template name="PostConstruct" description="Creates @PostConstruct method" id="org.eclipse.e4.tools.jdt.templates.init" context="e4-members" enabled="true" autoinsert="false">@PostConstruct
+public void postConstruct(${type:newType(org.eclipse.swt.widgets.Composite)} parent) { 
+}
+${imp:import(javax.annotation.PostConstruct)}
+</template>
 
-<template name="e4-dispose" description="Dispose Method" id="org.eclipse.e4.tools.jdt.templates.dispose" context="e4-members" enabled="true" autoinsert="false">@PreDestroy
-void dispose() {
-	${cursor}
-}</template>
+<template name="Focus" description="Creates @Focus method" id="org.eclipse.e4.tools.jdt.templates.focus" context="e4-members" enabled="true" autoinsert="false">@Focus
+public void onFocus() {
+}
+${imp:import(org.eclipse.e4.ui.di.Focus)}
+</template>
+
+<template name="PreDestroy" description="Creates @PreDestroy method" id="org.eclipse.e4.tools.jdt.templates.dispose" context="e4-members" enabled="true" autoinsert="false">@PreDestroy
+public void preDestroy() {
+}
+${imp:import(javax.annotation.PreDestroy)}
+</template>
 
 </templates>

From db6469e99c3418f1a5820a2828cd68d1a4ccf2f6 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Wed, 22 Aug 2012 00:09:28 +0200
Subject: [PATCH 0447/1286] Bug 387735 - [Tooling] All model element editors
 should allow to edit the persited state

---
 .../emf/ui/internal/common/component/ApplicationEditor.java      | 1 +
 .../e4/tools/emf/ui/internal/common/component/AreaEditor.java    | 1 +
 .../emf/ui/internal/common/component/BindingContextEditor.java   | 1 +
 .../emf/ui/internal/common/component/BindingTableEditor.java     | 1 +
 .../tools/emf/ui/internal/common/component/CategoryEditor.java   | 1 +
 .../e4/tools/emf/ui/internal/common/component/CommandEditor.java | 1 +
 .../emf/ui/internal/common/component/CommandParameterEditor.java | 1 +
 .../emf/ui/internal/common/component/CoreExpressionEditor.java   | 1 +
 .../e4/tools/emf/ui/internal/common/component/HandlerEditor.java | 1 +
 .../tools/emf/ui/internal/common/component/KeyBindingEditor.java | 1 +
 .../emf/ui/internal/common/component/MenuContributionEditor.java | 1 +
 .../e4/tools/emf/ui/internal/common/component/MenuEditor.java    | 1 +
 .../tools/emf/ui/internal/common/component/MenuItemEditor.java   | 1 +
 .../emf/ui/internal/common/component/MenuSeparatorEditor.java    | 1 +
 .../tools/emf/ui/internal/common/component/ParameterEditor.java  | 1 +
 .../emf/ui/internal/common/component/PartDescriptorEditor.java   | 1 +
 .../ui/internal/common/component/PartSashContainerEditor.java    | 1 +
 .../tools/emf/ui/internal/common/component/PartStackEditor.java  | 1 +
 .../emf/ui/internal/common/component/PerspectiveEditor.java      | 1 +
 .../emf/ui/internal/common/component/PerspectiveStackEditor.java | 1 +
 .../emf/ui/internal/common/component/PlaceholderEditor.java      | 1 +
 .../ui/internal/common/component/ToolBarContributionEditor.java  | 1 +
 .../e4/tools/emf/ui/internal/common/component/ToolBarEditor.java | 1 +
 .../emf/ui/internal/common/component/ToolBarSeparatorEditor.java | 1 +
 .../emf/ui/internal/common/component/ToolControlEditor.java      | 1 +
 .../tools/emf/ui/internal/common/component/ToolItemEditor.java   | 1 +
 .../e4/tools/emf/ui/internal/common/component/TrimBarEditor.java | 1 +
 .../emf/ui/internal/common/component/TrimContributionEditor.java | 1 +
 .../e4/tools/emf/ui/internal/common/component/WindowEditor.java  | 1 +
 29 files changed, 29 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index b5675746f3..73c66bdeb1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -195,6 +195,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.AddonsEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 0e1f878fa1..ed5f975d84 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -417,6 +417,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index f6c2d51636..2c7693ff45 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -276,6 +276,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		folder.setSelection(0);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 5d5dc408a3..d222f192bc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -308,6 +308,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		folder.setSelection(0);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index 173cb52e9d..a873bb7315 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -128,6 +128,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		folder.setSelection(0);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 989672157f..d3e2f478b7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -298,6 +298,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		folder.setSelection(0);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index cf6a42150f..af385b064f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -152,6 +152,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		folder.setSelection(0);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index 0f8129e152..ffcae4d697 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -130,6 +130,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		folder.setSelection(0);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index f2b870a4e8..462394b998 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -214,6 +214,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createInstanceInspection(folder);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 1c85beaeaf..484d0bf670 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -319,6 +319,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		folder.setSelection(0);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index c6e5731efc..b5787d78e8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -310,6 +310,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		folder.setSelection(0);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 5719a269b4..15a40d6b53 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -443,6 +443,7 @@ public String getText(Object element) {
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 5b1542fff7..0ebae9700e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -309,6 +309,7 @@ public String getText(Object element) {
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 1fa6af050e..7be3e9565a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -137,6 +137,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index 4569c8d79e..ca4dff692b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -134,6 +134,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		folder.setSelection(0);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 65530756f1..c13a2a94c7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -314,6 +314,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		folder.setSelection(0);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index cbd7068a70..079ce6384b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -371,6 +371,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index d6860e06cd..01f534fc06 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -315,6 +315,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 59361c49b4..05f98064bc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -265,6 +265,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 0e6ba7cb6f..72c4cebe24 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -287,6 +287,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 978294e729..c320bd4944 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -237,6 +237,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 88110efa35..76e2100f95 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -320,6 +320,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 683b7004c8..bcdbefba5f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -328,6 +328,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		folder.setSelection(0);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 4cc8b945db..6c3b174cc6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -148,6 +148,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index ace2bd3a07..5db75c2f04 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -185,6 +185,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createInstanceInspection(folder);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index fd1be2be05..a66f05b012 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -331,6 +331,7 @@ public String getText(Object element) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 	}
 
 	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, WritableValue master) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 072ba2f1c5..f717944a6e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -327,6 +327,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index bd85be0f80..89381775aa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -296,6 +296,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 15f5739843..8e8c6987bc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -293,6 +293,7 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createTranslatedTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE), resourcePool, project);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);

From e2b01816820d8141929f75962c3669cf5b0d5dd6 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Fri, 24 Aug 2012 18:13:18 -0400
Subject: [PATCH 0448/1286] CSS Spy: tweak output to add extra blank line


From e2b1d26d98d2da29f942ea71599b5400ed20fe8b Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Fri, 24 Aug 2012 18:13:41 -0400
Subject: [PATCH 0449/1286] Bug 387676 - CSS editor in preferences > General >
 Appearance does not resize


From f72d2f1f6c25facda50d8ba32bacc32984915c5f Mon Sep 17 00:00:00 2001
From: scela <sopotcela@gmail.com>
Date: Sun, 26 Aug 2012 15:11:44 +0200
Subject: [PATCH 0450/1286] ASSIGNED - bug 384675: [Tooling] Autogen id number
 not computed correctly. https://bugs.eclipse.org/bugs/show_bug.cgi?id=384675

---
 .../src/org/eclipse/e4/tools/emf/ui/common/Util.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index 271cade28e..3ea0cbf284 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -76,7 +76,7 @@ public static final String getDefaultElementId(Resource resource, MApplicationEl
 			String className = o.eClass().getName();
 			String projectName = project.getName();
 
-			String prefix = projectName + "." + className; //$NON-NLS-1$
+			String prefix = (projectName + "." + className).toLowerCase(); //$NON-NLS-1$
 
 			TreeIterator<EObject> it = resource.getAllContents();
 			SortedSet<Integer> numbers = new TreeSet<Integer>();

From b245890b88c952053e44b340c4835b2c9b7d8c04 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Sun, 26 Aug 2012 15:43:30 +0200
Subject: [PATCH 0451/1286] NEW - bug 384508: [Model Editor] CTRL+C Does Not
 Copy https://bugs.eclipse.org/bugs/show_bug.cgi?id=384508

---
 .../emf/ui/internal/common/component/PartDescriptorEditor.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index c13a2a94c7..e4a519c7db 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -201,6 +201,7 @@ public void widgetSelected(SelectionEvent e) {
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI).observeDetail(master));
+			TextPasteHandler.createFor(t);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));

From c406a2b46a8bd72c594d786cda0fcda1648d881d Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Sun, 26 Aug 2012 15:58:45 +0200
Subject: [PATCH 0452/1286] NEW - bug 384450: [Tooling] Auto-Id for KeyBinding
 does not work https://bugs.eclipse.org/bugs/show_bug.cgi?id=384450

---
 .../emf/ui/internal/common/component/BindingTableEditor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index d222f192bc..14c724f16e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -345,7 +345,7 @@ public List<Action> getActions(Object element) {
 	protected void handleAddKeyBinding() {
 		MKeyBinding handler = MCommandsFactory.INSTANCE.createKeyBinding();
 		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, handler);
-
+		setElementId(handler);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 			getEditor().setSelection(handler);

From 09252a352d03501de3b86810e03ddaa010900d1e Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Mon, 27 Aug 2012 22:29:49 +0200
Subject: [PATCH 0453/1286] ASSIGNED - bug 384579: [Tooling] Using the "Add"
 label for the Add button also for the Fragment editor
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=384579

---
 .../emf/ui/internal/common/component/ModelFragmentsEditor.java   | 1 +
 .../emf/ui/internal/common/component/StringModelFragment.java    | 1 +
 .../internal/common/component/virtual/VModelImportsEditor.java   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index c6ac79e056..fe814a0fd0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -215,6 +215,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index a34e25ed20..fe7bac2dd1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -293,6 +293,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index 80fb9be8b8..38d0eeb91f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -203,6 +203,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override

From 3d0d3fc2ec77939b9018e54c69bd414245475352 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Tue, 28 Aug 2012 00:58:47 +0200
Subject: [PATCH 0454/1286] ASSIGNED - bug 384578: [Tooling] Fragment Editor,
 place text above the boxes
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=384578

---
 .../component/ModelFragmentsEditor.java       | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index fe814a0fd0..db4380bac4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -110,11 +110,16 @@ private Composite createForm(Composite parent) {
 		}
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ModelFragmentsEditor_Imports);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+			GridLayout layout = (GridLayout) parent.getLayout();
+			layout.numColumns = 2;
 
-			final TableViewer viewer = new TableViewer(parent);
+			Composite impCompo = new Composite(parent, SWT.NONE);
+			impCompo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			impCompo.setLayout(new GridLayout());
+			Label l = new Label(impCompo, SWT.NONE);
+			l.setText(Messages.ModelFragmentsEditor_Imports);
+			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+			final TableViewer viewer = new TableViewer(impCompo);
 			viewer.setContentProvider(new ObservableListContentProvider());
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -252,11 +257,15 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+
+			Composite fragCompo = new Composite(parent, SWT.NONE);
+			fragCompo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			fragCompo.setLayout(new GridLayout());
+			Label l = new Label(fragCompo, SWT.NONE);
 			l.setText(Messages.ModelFragmentsEditor_ModelFragments);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 
-			final TableViewer viewer = new TableViewer(parent);
+			final TableViewer viewer = new TableViewer(fragCompo);
 			viewer.setContentProvider(new ObservableListContentProvider());
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);

From 010f306b1ffdce207aeb121925cb687519b62526 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Tue, 28 Aug 2012 16:01:16 +0200
Subject: [PATCH 0455/1286] First versioni of a Tycho build for the
 org.eclipse.e4.core.tools feature.

Currently the build of the update site is failing. This might be a Tycho
bug.
---
 bundles/org.eclipse.e4.tools.compat/pom.xml     | 16 ++++++++++++++++
 .../org.eclipse.e4.tools.emf.editor3x/pom.xml   | 16 ++++++++++++++++
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml     | 16 ++++++++++++++++
 bundles/org.eclipse.e4.tools.services/pom.xml   | 16 ++++++++++++++++
 bundles/org.eclipse.e4.tools/pom.xml            | 16 ++++++++++++++++
 .../org.eclipse.e4.core.tools.feature/pom.xml   | 17 +++++++++++++++++
 6 files changed, 97 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.compat/pom.xml
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/pom.xml
 create mode 100644 bundles/org.eclipse.e4.tools.services/pom.xml
 create mode 100644 bundles/org.eclipse.e4.tools/pom.xml
 create mode 100644 features/org.eclipse.e4.core.tools.feature/pom.xml

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
new file mode 100644
index 0000000000..d7ecc19323
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <relativePath>../../build/parent/pom.xml</relativePath>
+    <groupId>org.eclipse.e4.tools</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.eclipse.e4.tools.compat</artifactId>
+  <version>0.12.0.qualifier</version>
+  <packaging>eclipse-plugin</packaging>
+
+  <name>org.eclipse.e4.tools.compat Build</name>
+</project> 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
new file mode 100644
index 0000000000..eba3805c9c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <relativePath>../../build/parent/pom.xml</relativePath>
+    <groupId>org.eclipse.e4.tools</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.eclipse.e4.tools.emf.editor3x</artifactId>
+  <version>0.12.0.qualifier</version>
+  <packaging>eclipse-plugin</packaging>
+
+  <name>org.eclipse.e4.tools.emf.editor3x Build</name>
+</project> 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
new file mode 100644
index 0000000000..cfa0fc5283
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <relativePath>../../build/parent/pom.xml</relativePath>
+    <groupId>org.eclipse.e4.tools</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
+  <version>0.12.0.qualifier</version>
+  <packaging>eclipse-plugin</packaging>
+
+  <name>org.eclipse.e4.tools.emf.uiBuild</name>
+</project> 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
new file mode 100644
index 0000000000..644f0083a7
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <relativePath>../../build/parent/pom.xml</relativePath>
+    <groupId>org.eclipse.e4.tools</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.eclipse.e4.tools.services</artifactId>
+  <version>0.12.0.qualifier</version>
+  <packaging>eclipse-plugin</packaging>
+
+  <name>org.eclipse.e4.tools.services Build</name>
+</project> 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
new file mode 100644
index 0000000000..dc537d5f56
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <relativePath>../../build/parent/pom.xml</relativePath>
+    <groupId>org.eclipse.e4.tools</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.eclipse.e4.tools</artifactId>
+  <version>0.12.0.qualifier</version>
+  <packaging>eclipse-plugin</packaging>
+
+  <name>org.eclipse.e4.tools Build</name>
+</project> 
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
new file mode 100644
index 0000000000..e4cc8bf596
--- /dev/null
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <relativePath>../../build/parent/pom.xml</relativePath>
+    <groupId>org.eclipse.e4.tools</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
+  <version>0.12.0.qualifier</version>
+  <packaging>eclipse-feature</packaging>
+
+  <name>org.eclipse.e4.core.tools.feature Build</name>
+</project> 

From dedbc20dc538c6038a409745fa4220a72f881b3b Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Tue, 28 Aug 2012 18:08:48 +0200
Subject: [PATCH 0456/1286] Tycho build setup changed based on feedback from
 Paul Webster


From 124f85832928c51722915096f55e6813206806b3 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Fri, 31 Aug 2012 14:47:26 +0200
Subject: [PATCH 0457/1286] Tycho build now includes all o.e.e4.tools
 components

Also increased version number for o.e.e4.tools.jdt.templates
---
 .../META-INF/MANIFEST.MF                         |  2 +-
 .../org.eclipse.e4.tools.jdt.templates/pom.xml   | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index a38d2608f1..4da685d645 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: e4 Templates
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
new file mode 100644
index 0000000000..e4d546ea1b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <relativePath>../../build/parent/pom.xml</relativePath>
+    <groupId>org.eclipse.e4.tools</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.eclipse.e4.tools.jdt.templates</artifactId>
+  <version>0.12.0.qualifier</version>
+  <packaging>eclipse-plugin</packaging>
+
+  <name>org.eclipse.e4.tools.jdt.templates Build</name>
+</project> 

From 9cef7ef19ab8c373f9da4557d3e7037416903679 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Fri, 31 Aug 2012 15:27:06 +0200
Subject: [PATCH 0458/1286] Added features to category.xml for Tycho build


From 85bd664389d25e6a910e1782cd72c8af698033ef Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Fri, 31 Aug 2012 15:31:19 +0200
Subject: [PATCH 0459/1286] Split CSS spy and CSS editor feature in different
 p2 categories to allow to install them separately


From fa88a2be65960ca6dc972faa7647826bec936c0e Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Sun, 2 Sep 2012 21:54:35 +0200
Subject: [PATCH 0460/1286] Bug 365195 - [Tooling] Double-click on editor tree
 element should open the tree

---
 .../e4/tools/emf/ui/internal/common/ModelEditor.java  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index c44a07892e..02f1430c58 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -181,6 +181,8 @@
 import org.eclipse.jface.text.source.AnnotationModel;
 import org.eclipse.jface.text.source.SourceViewer;
 import org.eclipse.jface.text.source.VerticalRuler;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -830,6 +832,15 @@ public void handleMapChange(MapChangeEvent event) {
 
 		viewer.setInput(modelProvider.getRoot());
 		viewer.expandToLevel(2);
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+
+			public void doubleClick(DoubleClickEvent event) {
+				TreeViewer viewer = (TreeViewer) event.getViewer();
+				IStructuredSelection thisSelection = (IStructuredSelection) event.getSelection();
+				Object selectedNode = thisSelection.getFirstElement();
+				viewer.setExpandedState(selectedNode, !viewer.getExpandedState(selectedNode));
+			}
+		});
 		// ViewerDropAdapter adapter = new ViewerDropAdapter(viewer) {
 		//
 		// @Override

From c08ac6bf9212d0bdbea81ddbc4ed627e71275a81 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Sun, 2 Sep 2012 22:14:24 +0200
Subject: [PATCH 0461/1286] bug 384584: [Tooling] No auto-id for model elements
 in fragments https://bugs.eclipse.org/bugs/show_bug.cgi?id=384584

---
 .../emf/ui/internal/common/component/StringModelFragment.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index fe7bac2dd1..7215a536e2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -300,7 +300,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 				public void widgetSelected(SelectionEvent e) {
 					EClass eClass = ((FeatureClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement()).eClass;
 					EObject eObject = EcoreUtil.create(eClass);
-
+					setElementId(eObject);
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, eObject);
 
 					if (cmd.canExecute()) {

From 808b65e55770bad1ab6e8d2410df0f0626935374 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Mon, 3 Sep 2012 00:01:43 +0200
Subject: [PATCH 0462/1286] Updated e4 JDT templates

---
 .../templates/default-e4templates.xml         | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
index 61cd4d654a..f8cf7dc5ad 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
@@ -16,33 +16,27 @@
 
 <templates>
 
-<template name="e4-parent" description="Injected Parent Composite" id="org.eclipse.e4.tools.jdt.templates.parent" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="inject-parent" description="Injected Parent Composite" id="org.eclipse.e4.tools.jdt.templates.parent" context="e4-members" enabled="true" autoinsert="false">@Inject
 Composite parent;</template>
 
-<template name="e4-preference" description="Injected Preference Value" id="org.eclipse.e4.tools.jdt.templates.preference" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="inject-preference" description="Injected Preference Value" id="org.eclipse.e4.tools.jdt.templates.preference" context="e4-members" enabled="true" autoinsert="false">@Inject
 void setPreferenceValue(@Named("preference-PREFERENCE_KEY") String preferenceValue) {
 	${cursor}
 }</template>
 
-<template name="e4-adapter" description="Injected Adapter Service" id="org.eclipse.e4.tools.jdt.templates.adapter" context="e4-members" enabled="true" autoinsert="false">@Inject
-Adapter adapter;</template>
-
-<template name="e4-preferences" description="Injected Preferences Service" id="org.eclipse.e4.tools.jdt.templates.preferences" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="inject-preferences" description="Injected Preferences Service" id="org.eclipse.e4.tools.jdt.templates.preferences" context="e4-members" enabled="true" autoinsert="false">@Inject
 IEclipsePreferences preferences;</template>
 
-<template name="e4-statushandler" description="Injected Status Handler" id="org.eclipse.e4.tools.jdt.templates.statushandler" context="e4-members" enabled="true" autoinsert="false">@Inject
-IStatusHandler statusHandler;</template>
-
-<template name="e4-logger" description="Injected Logger" id="org.eclipse.e4.tools.jdt.templates.logger" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="inject-logger" description="Injected Logger" id="org.eclipse.e4.tools.jdt.templates.logger" context="e4-members" enabled="true" autoinsert="false">@Inject
 Logger logger;</template>
 
-<template name="e4-eventbroker" description="Injected Event Broker" id="org.eclipse.e4.tools.jdt.templates.eventbroker" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="inject-eventbroker" description="Injected Event Broker" id="org.eclipse.e4.tools.jdt.templates.eventbroker" context="e4-members" enabled="true" autoinsert="false">@Inject
 IEventBroker eventBroker;</template>
 
-<template name="e4-stylingengine" description="Injected Styling Engine" id="org.eclipse.e4.tools.jdt.templates.stylingengine" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="inject-stylingengine" description="Injected Styling Engine" id="org.eclipse.e4.tools.jdt.templates.stylingengine" context="e4-members" enabled="true" autoinsert="false">@Inject
 IStylingEngine stylingEngine;</template>
 
-<template name="e4-event" description="Event Handler Method" id="org.eclipse.e4.tools.jdt.templates.eventhandler" context="e4-members" enabled="true" autoinsert="false">@EventHandler("some/event/topic")
+<template name="ininjectject-event" description="Event Handler Method" id="org.eclipse.e4.tools.jdt.templates.eventhandler" context="e4-members" enabled="true" autoinsert="false">@EventHandler("some/event/topic")
 void handleSomeEvent(Payload payloadObject) {
 	${cursor}
 }</template>

From 2e232fbcc5275116a01892c1fc33bb2dd2598159 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Mon, 3 Sep 2012 19:53:44 +0200
Subject: [PATCH 0463/1286] bug 382717: [Tooling] Find in fragments only works
 if ApplicationXMI property is set on the product
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=382717

---
 .../emf/editor3x/TargetElementProviders.java  | 50 ++++++++++++-------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
index 4f4718d541..62a37da562 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
@@ -17,6 +17,7 @@
 import org.eclipse.pde.internal.core.PDEExtensionRegistry;
 
 public class TargetElementProviders implements IModelElementProvider {
+	private static final String APP_E4XMI_DEFAULT = "Application.e4xmi";
 	private ResourceSet resourceSet;
 	
 	public void getModelElements(Filter filter, ModelResultHandler handler) {
@@ -53,29 +54,19 @@ public void getModelElements(Filter filter, ModelResultHandler handler) {
 			for( IExtension ext : extensions ) {
 				for( IConfigurationElement el : ext.getConfigurationElements() ) {
 					if( el.getName().equals("product") ) {
+						boolean xmiPropertyPresent = false;
 						for( IConfigurationElement prop: el.getChildren("property") ) {
 							if( prop.getAttribute("name").equals("applicationXMI") ) {
 								String v = prop.getAttribute("value");
-								String[] s = v.split("/");
-								URI uri;
-//								System.err.println("Product-Ext: Checking: " + v + " => P:" +  s[0] + "");
-								IProject p = root.getProject(s[0]);
-								if( p.exists() && p.isOpen() ) {
-									uri = URI.createPlatformResourceURI(v, true );	
-								} else {
-									uri = URI.createURI("platform:/plugin/" + v );
-								}
-								
-//								System.err.println(uri);
-								try {
-									resourceSet.getResource(uri, true);							
-								} catch (Exception e) {
-									e.printStackTrace();
-//									System.err.println("=============> Failing");
-								}
+								setUpResourceSet(root, v);
+								xmiPropertyPresent = true;
 								break;
 							}
 						}
+						if (!xmiPropertyPresent){
+							setUpResourceSet(root, ext.getNamespaceIdentifier()+"/"+APP_E4XMI_DEFAULT);
+							break;
+						}
 					}
 				}
 			}			
@@ -83,6 +74,29 @@ public void getModelElements(Filter filter, ModelResultHandler handler) {
 		
 		applyFilter(filter, handler);
 	}
+
+	private void setUpResourceSet(IWorkspaceRoot root, String v) {
+		String[] s = v.split("/");
+		URI uri;
+//								System.err.println("Product-Ext: Checking: " + v + " => P:" +  s[0] + "");
+		IProject p = root.getProject(s[0]);
+		if( p.exists() && p.isOpen() ) {
+			uri = URI.createPlatformResourceURI(v, true );	
+		} else {
+			uri = URI.createURI("platform:/plugin/" + v );
+		}
+		
+//		System.err.println(uri);
+		try {
+			//prevent some unnecessary calls by checking the uri 
+			if (resourceSet.getURIConverter().exists(uri, null)
+					)
+			resourceSet.getResource(uri, true);							
+		} catch (Exception e) {
+			e.printStackTrace();
+//									System.err.println("=============> Failing");
+		}
+	}
 	
 	private void applyFilter(Filter filter, ModelResultHandler handler) {
 		for (Resource res : resourceSet.getResources()) {
@@ -95,7 +109,7 @@ private void applyFilter(Filter filter, ModelResultHandler handler) {
 //								.println("Skipped because it is an import");
 					} else {
 						if (o.eClass().equals(filter.eClass)) {
-							System.err.println("Found: " + o);
+//							System.err.println("Found: " + o);
 							handler.result(o);
 						}
 					}

From 55cef7381e9ffb114fe1a9868f9e1544ac82e9fb Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Mon, 3 Sep 2012 20:42:01 +0200
Subject: [PATCH 0464/1286] bug 321172: [Tooling] [tooling] e4 Application
 Project wizard generates invalid package declarations and class URIs
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=321172

---
 .../internal/tools/wizards/project/E4NewProjectWizard.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index d5df9c946f..65e60d2a17 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -408,7 +408,8 @@ public void createApplicationResources(IProject project,
 
 		Map<String, String> keys = new HashMap<String, String>();
 		keys.put("projectName", pluginName);
-		keys.put("packageName", fragment.getElementName() + ".handlers");
+		String elementName = fragment.getElementName();
+		keys.put("packageName", (elementName.equals("")?"": elementName + ".")+"handlers");
 
 		try {
 			URL corePath = ResourceLocator.getProjectTemplateFiles(template_id);
@@ -645,8 +646,9 @@ private MCommand createCommand(String commandId, String name,
 			// Create Quit handler for command
 			MHandler quitHandler = MCommandsFactory.INSTANCE.createHandler();
 			quitHandler.setCommand(command);
+			String elementName = fragment.getElementName();
 			quitHandler.setContributionURI("bundleclass://" + projectName
-					+ "/" + fragment.getElementName() + ".handlers."
+					+ "/" + (elementName.equals("")?"": elementName + ".")+"handlers."
 					+ className);
 			application.getHandlers().add(quitHandler);
 

From 715458ff562624dfd559f23c88221eee8cac284a Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Tue, 4 Sep 2012 13:17:38 +0200
Subject: [PATCH 0465/1286] Bug 387018 - [Tooling] Adding a Part in the Eclipse
 4 Application Wizard

---
 .../wizards/project/E4NewProjectWizard.java   | 17 ++++---
 .../templates/src/parts/SamplePart.java       | 47 +++++++++++++++++++
 2 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools/templates/src/parts/SamplePart.java

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 65e60d2a17..8cecd72c79 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -45,6 +45,7 @@
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack;
 import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
 import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
 import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
@@ -171,6 +172,7 @@ protected void adjustManifests(
 									"org.eclipse.e4.ui.workbench",
 									"org.eclipse.e4.core.services",
 									"org.eclipse.e4.core.di",
+									"org.eclipse.e4.ui.di",
 									"org.eclipse.e4.core.contexts",
 									"org.eclipse.e4.ui.workbench.swt",
 									"org.eclipse.core.databinding.property",
@@ -410,7 +412,7 @@ public void createApplicationResources(IProject project,
 		keys.put("projectName", pluginName);
 		String elementName = fragment.getElementName();
 		keys.put("packageName", (elementName.equals("")?"": elementName + ".")+"handlers");
-
+		keys.put("packageName2", (elementName.equals("")?"": elementName + ".")+"parts");
 		try {
 			URL corePath = ResourceLocator.getProjectTemplateFiles(template_id);
 			IRunnableWithProgress op = new TemplateOperation(corePath, project,
@@ -419,7 +421,7 @@ public void createApplicationResources(IProject project,
 		} catch (Exception e) {
 			PDEPlugin.logException(e);
 		}
-
+		
 		try {
 			URL corePath = ResourceLocator.getProjectTemplateFiles("src");
 			IRunnableWithProgress op = new TemplateOperation(corePath,
@@ -590,11 +592,12 @@ private void createApplicationModel(IProject project, String pluginName,
 						MPartStack partStack = MBasicFactory.INSTANCE
 								.createPartStack();
 						partSashContainer.getChildren().add(partStack);
-						//
-						// MPart part =
-						// MApplicationFactory.eINSTANCE.createPart();
-						// partStack.getChildren().add(part);
-						// part.setLabel("Main");
+						
+						 MPart part = MBasicFactory.INSTANCE.createPart();
+						 partStack.getChildren().add(part);
+						 part.setLabel("Sample Part");
+						 part.setContributionURI("bundleclass://"+pluginName+"/"+fragment.getElementName()+".parts"+".SamplePart");
+						 
 					}
 
 					// WindowTrim
diff --git a/bundles/org.eclipse.e4.tools/templates/src/parts/SamplePart.java b/bundles/org.eclipse.e4.tools/templates/src/parts/SamplePart.java
new file mode 100644
index 0000000000..0d63748064
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/templates/src/parts/SamplePart.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package @@packageName2@@;
+
+import javax.annotation.PostConstruct;
+import org.eclipse.e4.ui.di.Focus;
+import org.eclipse.jface.viewers.TableViewer;
+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.Label;
+
+public class SamplePart {
+
+	private Label label;
+	private TableViewer tableViewer;
+
+	@PostConstruct
+	public void createComposite(Composite parent) {
+		parent.setLayout(new GridLayout());
+
+		label = new Label(parent, SWT.NONE);
+		label.setText("Sample table");
+
+		tableViewer = new TableViewer(parent);
+		tableViewer.add("Sample item 1");
+		tableViewer.add("Sample item 2");
+		tableViewer.add("Sample item 3");
+		tableViewer.add("Sample item 4");
+		tableViewer.add("Sample item 5");
+		tableViewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
+	@Focus
+	public void setFocus() {
+		tableViewer.getTable().setFocus();
+	}
+}

From d838d24e49043d7bb4956c066aef178c062392ca Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Wed, 5 Sep 2012 02:29:27 +0200
Subject: [PATCH 0466/1286] [Bug 385265] [Tooling] Update problem on binding
 context tree items

---
 .../ui/internal/common/component/BindingContextEditor.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 2c7693ff45..65a1674e6d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -29,6 +29,7 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
@@ -101,6 +102,11 @@ public String getDetailLabel(Object element) {
 		return null;
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME), FeaturePath.fromList(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID) };
+	}
+
 	@Override
 	public String getDescription(Object element) {
 		return Messages.BindingContextEditor_TreeLabelDescription;

From 007714e5bf8b3ffbef1d1b0fd290795e9bd70cef Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Thu, 6 Sep 2012 17:21:31 +0200
Subject: [PATCH 0467/1286] bug 388740: Handler class URI does not open wizard
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=388740

---
 .../tools/emf/editor3x/extension/HandlerContributionEditor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
index 36bc0c2e90..4b14881e7b 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
@@ -43,7 +43,7 @@ public void createOpen(MContribution contribution, EditingDomain domain, IProjec
 	}
 	
 	private void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell, boolean forceNew) {
-		if( contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 || !contribution.getContributionURI().startsWith("bundleclass:") ) {
+		if( forceNew || contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 || !contribution.getContributionURI().startsWith("bundleclass:") ) {
 			NewHandlerClassWizard wizard = new NewHandlerClassWizard();
 			wizard.init( null, new StructuredSelection(project));
 			WizardDialog dialog = new WizardDialog(shell, wizard);

From c11b28df799c13c3eb11cede70a6ec92d9681836 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 6 Sep 2012 11:25:12 -0400
Subject: [PATCH 0468/1286] CSS Spy: Fix stray scrollbar on Linux/GTK


From 32f036968ad5c61c3ddeb4e9ea1c8e888cf15aee Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Sun, 9 Sep 2012 23:11:16 +0200
Subject: [PATCH 0469/1286] bug 389039: Handler, Addon and Part class URI
 wizard autofill package and name
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=389039

---
 .../extension/AddonContributionEditor.java    |  7 +-
 .../extension/HandlerContributionEditor.java  |  7 +-
 .../extension/PartContributionEditor.java     |  7 +-
 .../wizards/classes/AbstractNewClassPage.java | 89 +++++++++++++++++--
 .../classes/AbstractNewClassWizard.java       | 25 +++++-
 .../wizards/classes/NewAddonClassWizard.java  |  9 +-
 .../classes/NewHandlerClassWizard.java        | 10 ++-
 .../wizards/classes/NewPartClassWizard.java   |  9 +-
 8 files changed, 137 insertions(+), 26 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
index 023ecb2b24..87fa59a30a 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Sopot Cela <sopotcela@gmail.com>
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x.extension;
 
@@ -54,7 +55,7 @@ public void createOpen(MContribution contribution, EditingDomain domain,
 	private void createOpen(MContribution contribution, EditingDomain domain,
 			IProject project, Shell shell, boolean forceNew) {
 		if( forceNew || contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 || !contribution.getContributionURI().startsWith("bundleclass:") ) {
-			NewAddonClassWizard wizard = new NewAddonClassWizard();
+			NewAddonClassWizard wizard = new NewAddonClassWizard(contribution.getContributionURI());
 			wizard.init( null, new StructuredSelection(project));
 			WizardDialog dialog = new WizardDialog(shell, wizard);
 			if( dialog.open() == WizardDialog.OK ) {
@@ -109,14 +110,10 @@ private void createOpen(MContribution contribution, EditingDomain domain,
                         if( t != null ) {
                             JavaUI.openInEditor(t);
                         } else {
-                            if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+fullyQualified+"' was not found. Would you like to start the class creation wizard?") ) {
                                 createOpen(contribution, domain, project, shell, true);
-                            }
                         }
                     } catch (JavaModelException e) {
-                        if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+fullyQualified+"' was not found. Would you like to start the class creation wizard?") ) {
                             createOpen(contribution, domain, project, shell, true);
-                        }
                     } catch (PartInitException e) {
                         MessageDialog.openError(shell, "Failed to open editor", e.getMessage());
                         // TODO Auto-generated catch block
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
index 4b14881e7b..e6aed7c938 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Sopot Cela <sopotcela@gmail.com>
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x.extension;
 
@@ -44,7 +45,7 @@ public void createOpen(MContribution contribution, EditingDomain domain, IProjec
 	
 	private void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell, boolean forceNew) {
 		if( forceNew || contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 || !contribution.getContributionURI().startsWith("bundleclass:") ) {
-			NewHandlerClassWizard wizard = new NewHandlerClassWizard();
+			NewHandlerClassWizard wizard = new NewHandlerClassWizard(contribution.getContributionURI());
 			wizard.init( null, new StructuredSelection(project));
 			WizardDialog dialog = new WizardDialog(shell, wizard);
 			if( dialog.open() == WizardDialog.OK ) {
@@ -99,14 +100,10 @@ private void createOpen(MContribution contribution, EditingDomain domain, IProje
 						if( t != null ) {
 							JavaUI.openInEditor(t);
 						} else {
-							if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+fullyQualified+"' was not found. Would you like to start the class creation wizard?") ) {
 								createOpen(contribution, domain, project, shell, true);
-							}
 						}
 					} catch (JavaModelException e) {
-						if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+fullyQualified+"' was not found. Would you like to start the class creation wizard?") ) {
 							createOpen(contribution, domain, project, shell, true);
-						}
 					} catch (PartInitException e) {
 						MessageDialog.openError(shell, "Failed to open editor", e.getMessage());
 						// TODO Auto-generated catch block
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
index 83eadf22eb..cd15cfa930 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Sopot Cela <sopotcela@gmail.com>
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x.extension;
 
@@ -46,7 +47,7 @@ private void createOpen(MContribution contribution, EditingDomain domain,
 		if ( forceNew || contribution.getContributionURI() == null
 				|| contribution.getContributionURI().trim().length() == 0
 				|| !contribution.getContributionURI().startsWith("bundleclass:")) {
-			NewPartClassWizard wizard = new NewPartClassWizard();
+			NewPartClassWizard wizard = new NewPartClassWizard(contribution.getContributionURI());
 			wizard.init(null, new StructuredSelection(project));
 			WizardDialog dialog = new WizardDialog(shell, wizard);
 			if (dialog.open() == WizardDialog.OK) {
@@ -101,14 +102,10 @@ private void createOpen(MContribution contribution, EditingDomain domain,
                         if( t != null ) {
                             JavaUI.openInEditor(t);
                         } else {
-                            if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+fullyQualified+"' was not found. Would you like to start the class creation wizard?") ) {
                                 createOpen(contribution, domain, project, shell, true);
-                            }
                         }
                     } catch (JavaModelException e) {
-                        if( MessageDialog.openQuestion(shell, "Class not found", "The class '"+fullyQualified+"' was not found. Would you like to start the class creation wizard?") ) {
                             createOpen(contribution, domain, project, shell, true);
-                        }
                     } catch (PartInitException e) {
                         MessageDialog.openError(shell, "Failed to open editor", e.getMessage());
                         // TODO Auto-generated catch block
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index c137f6c6f7..af61db6bc8 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Sopot Cela <sopotcela@gmail.com>
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
@@ -111,6 +112,7 @@ public void removePropertyChangeListener(PropertyChangeListener listener) {
 	private JavaClass clazz;
 	private IPackageFragmentRoot froot;
 	private IWorkspaceRoot fWorkspaceRoot;
+	private String initialString;
 	
 	protected AbstractNewClassPage(String pageName, String title, String description, IPackageFragmentRoot froot, IWorkspaceRoot fWorkspaceRoot) {
 		super(pageName);
@@ -121,6 +123,11 @@ protected AbstractNewClassPage(String pageName, String title, String description
 		setDescription(description);
 	}
 	
+	protected AbstractNewClassPage(String pageName, String title, String description, IPackageFragmentRoot froot, IWorkspaceRoot fWorkspaceRoot, String initialString){
+		this(pageName,title,description,froot,fWorkspaceRoot);
+		this.initialString=initialString;
+	}
+	
 	public void createControl(Composite parent) {
 		final Image img = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newclass_wiz.png"));
 		setImageDescriptor(ImageDescriptor.createFromImage(img));
@@ -138,7 +145,9 @@ public void widgetDisposed(DisposeEvent e) {
 		parent.setLayout(new GridLayout(3, false));
 		
 		clazz = createInstance();
-
+		
+		clazz.setPackageFragment(froot.getPackageFragment(parseInitialStringForPackage(initialString)==null?"":parseInitialStringForPackage(initialString)));
+		clazz.setName(parseInitialStringForClassName(initialString));
 		DataBindingContext dbc = new DataBindingContext();
 		WizardPageSupport.create(this, dbc);
 		
@@ -149,6 +158,7 @@ public void widgetDisposed(DisposeEvent e) {
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
+			
 			final Binding bd = dbc.bindValue(
 					WidgetProperties.text().observe(t), 
 					BeanProperties.value("fragmentRoot").observe(clazz), 
@@ -166,7 +176,7 @@ public void widgetSelected(SelectionEvent e) {
 						froot = root;
 						clazz.setFragmentRoot(root);	
 					}
-					bd.updateModelToTarget(); //TODO Find out why this is needed
+					bd.updateModelToTarget(); 
 				}
 			});
 		}
@@ -174,14 +184,13 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Package");
-
 			Text t = new Text(parent, SWT.BORDER);
-			t.setEditable(false);
+			t.setEditable(true);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			final Binding bd = dbc.bindValue(
-					WidgetProperties.text().observe(t), 
+					WidgetProperties.text(SWT.Modify).observe(t), 
 					BeanProperties.value("packageFragment").observe(clazz),
-					new UpdateValueStrategy(), 
+					new UpdateValueStrategy().setConverter(new StringToPackageFragmentConverter(froot)), 
 					new UpdateValueStrategy().setConverter(new PackageFragmentToStringConverter())
 			);
 
@@ -222,6 +231,49 @@ public void widgetSelected(SelectionEvent e) {
 		setControl(parent);
 	}
 	
+	private String parseInitialStringForPackage(String initialString2) {
+		if (initialString2==null) return null;
+		int ioBC = initialString2.indexOf("bundleclass://");
+		int iSecondSlash = initialString2.lastIndexOf('/');
+		if (
+		
+			(initialString2.length()==0)||//empty
+			(ioBC==-1)||//no bundle class
+			(iSecondSlash==-1)||//no package &| class name
+			(initialString2.indexOf('.')==-1)//no package
+			){
+			System.err.println("unparsable");
+			return null;
+		}
+		System.err.println("First: "+initialString2);;
+		int bi = ioBC+"bundleclass://".length()-1;
+		int ei = iSecondSlash;
+
+		int lastDot = initialString2.lastIndexOf('.');
+		String packageString = initialString2.substring(iSecondSlash+1, lastDot);
+		return packageString;
+	}
+	
+	private String parseInitialStringForClassName(String initialString){
+		if (initialString==null) return null;
+		int ioBC = initialString.indexOf("bundleclass://");
+		int iSecondSlash = initialString.lastIndexOf('/');
+		if (
+		
+			(initialString.length()==0)||//empty
+			(ioBC==-1)||//no bundle class
+			(iSecondSlash==-1)||//no package &| class name
+			(initialString.indexOf('.')==-1)//no package
+			){
+			System.err.println("unparsable");
+			return null;
+		}
+		int lastDot = initialString.lastIndexOf('.');
+		if (lastDot!=-1)
+			return initialString.substring(lastDot+1);
+		return null;
+	}
+
 	private IPackageFragmentRoot choosePackageRoot() {
 		IJavaElement initElement= clazz.getFragmentRoot();
 		Class[] acceptedClasses= new Class[] { IPackageFragmentRoot.class, IJavaProject.class };
@@ -303,7 +355,6 @@ private IPackageFragment choosePackage() {
 		dialog.setEmptyListMessage("You need to select a package");
 		dialog.setElements(packages);
 		dialog.setHelpAvailable(false);
-
 		IPackageFragment pack= clazz.getPackageFragment();
 		if (pack != null) {
 			dialog.setInitialSelections(new Object[] { pack });
@@ -365,4 +416,28 @@ public Object convert(Object fromObject) {
 			return f.getElementName();
 		}
 	}
+	
+	static class StringToPackageFragmentConverter extends Converter {
+
+		private IPackageFragmentRoot proot;
+
+		public StringToPackageFragmentConverter(IPackageFragmentRoot froot) {
+			super(String.class, IPackageFragment.class);
+			this.proot = froot;
+		}
+		
+		public Object convert(Object fromObject) {
+			try {
+			if( fromObject == null ) {
+				return proot.createPackageFragment("", true, null);
+			}
+			
+				return proot.getPackageFragment((String) fromObject);
+			} catch (JavaModelException e) {
+				e.printStackTrace();
+				return null;
+			}
+			
+		}
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
index 523e003bc4..5abe6b383a 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Sopot Cela <sopotcela@gmail.com>
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
@@ -49,7 +50,9 @@
 public abstract class AbstractNewClassWizard extends Wizard implements INewWizard {
 	protected IPackageFragmentRoot root;
 	protected IFile file;
-	
+	public AbstractNewClassWizard() {
+		this.setWindowTitle("New contribution class");
+	}
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
 		root = getFragmentRoot(getInitialJavaElement(selection));
 	}
@@ -174,7 +177,27 @@ public boolean performFinish() {
 		checkRequiredBundles();
 		
 		IPackageFragment fragment = clazz.getPackageFragment();
+		boolean exists = false;
 		if (fragment != null) {
+			IJavaElement[] children;
+			try {
+				children = clazz.getFragmentRoot().getChildren();
+			
+					for (IJavaElement iJavaElement : children) {
+						IPackageFragment pf = (IPackageFragment) iJavaElement;
+						if (pf.getElementName().equals(fragment.getElementName())){
+						exists = true;
+						break;
+						}
+					}
+			;
+			
+			if (!exists)
+				fragment = clazz.getFragmentRoot().createPackageFragment(fragment.getElementName(), true, null);
+			} catch (JavaModelException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			}
 			String cuName = clazz.getName() + ".java";
 			ICompilationUnit unit = fragment.getCompilationUnit(cuName); 
 			IResource resource = unit.getResource();
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
index 58432912b2..94325ef74f 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Sopot Cela <sopotcela@gmail.com>
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
@@ -18,11 +19,17 @@
 import org.eclipse.swt.widgets.Composite;
 
 public class NewAddonClassWizard extends AbstractNewClassWizard {
+	private String initialString;
+
+	public NewAddonClassWizard(String contributionURI) {
+		this.initialString = contributionURI;
+	}
+
 	@Override
 	public void addPages() {
 		addPage(new AbstractNewClassPage("Classinformation",
 				"New Addon",
-				"Create a new addon class", root, ResourcesPlugin.getWorkspace().getRoot()) {
+				"Create a new addon class", root, ResourcesPlugin.getWorkspace().getRoot(), initialString) {
 
 					@Override
 					protected void createFields(Composite parent,
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
index f970424a4c..b5b29f3ee8 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Sopot Cela <sopotcela@gmail.com>
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
@@ -28,6 +29,13 @@
 import org.eclipse.swt.widgets.Text;
 
 public class NewHandlerClassWizard extends AbstractNewClassWizard {
+	private String initialString;
+
+	public NewHandlerClassWizard(String contributionURI) {
+		this.initialString = contributionURI;
+		
+	}
+
 	@Override
 	protected String getContent() {
 		HandlerTemplate template = new HandlerTemplate();
@@ -38,7 +46,7 @@ protected String getContent() {
 	public void addPages() {
 		addPage(new AbstractNewClassPage("Classinformation",
 				"New Handler",
-				"Create a new handler class", root, ResourcesPlugin.getWorkspace().getRoot()) {
+				"Create a new handler class", root, ResourcesPlugin.getWorkspace().getRoot(),initialString) {
 
 			@Override
 			protected JavaClass createInstance() {
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
index db3d3bf679..1f6526f44f 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Sopot Cela <sopotcela@gmail.com>
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
@@ -31,11 +32,17 @@
 
 public class NewPartClassWizard extends AbstractNewClassWizard {
 
+	private String initialString;
+
+	public NewPartClassWizard(String contributionURI) {
+		this.initialString = contributionURI;
+	}
+
 	@Override
 	public void addPages() {
 		addPage(new AbstractNewClassPage("Classinformation", "New Part",
 				"Create a new part class", root, ResourcesPlugin.getWorkspace()
-						.getRoot()) {
+						.getRoot(), initialString) {
 
 			@Override
 			protected void createFields(Composite parent, DataBindingContext dbc) {

From 42921af8dbf76c1cc891fed73b48bd33ed359ed0 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Sun, 9 Sep 2012 23:29:38 +0200
Subject: [PATCH 0470/1286] First commit for bug 389047: [Tooling] Model editor
 improvements round 1 https://bugs.eclipse.org/bugs/show_bug.cgi?id=389047

---
 .../emf/ui/internal/common/component/BindingContextEditor.java | 2 +-
 .../internal/tools/wizards/classes/AbstractNewClassPage.java   | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 65a1674e6d..8e0be72fd1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -222,7 +222,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Down);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index af61db6bc8..78da3e17a6 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -242,10 +242,8 @@ private String parseInitialStringForPackage(String initialString2) {
 			(iSecondSlash==-1)||//no package &| class name
 			(initialString2.indexOf('.')==-1)//no package
 			){
-			System.err.println("unparsable");
 			return null;
 		}
-		System.err.println("First: "+initialString2);;
 		int bi = ioBC+"bundleclass://".length()-1;
 		int ei = iSecondSlash;
 
@@ -265,7 +263,6 @@ private String parseInitialStringForClassName(String initialString){
 			(iSecondSlash==-1)||//no package &| class name
 			(initialString.indexOf('.')==-1)//no package
 			){
-			System.err.println("unparsable");
 			return null;
 		}
 		int lastDot = initialString.lastIndexOf('.');

From da536ee49e59fe52c4b527fc85e4dd1c00dab2cb Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Mon, 10 Sep 2012 15:09:14 +0200
Subject: [PATCH 0471/1286] Bug 385063 - [Tooling] Support delete key for model
 elements

---
 .../emf/ui/internal/common/ModelEditor.java   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 02f1430c58..698e119b35 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -200,6 +200,8 @@
 import org.eclipse.swt.dnd.DragSourceEvent;
 import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.dnd.TransferData;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.RGB;
@@ -507,6 +509,24 @@ private Composite createFormTab(Composite composite) {
 		// scrolling.setLayoutData(new GridData(GridData.FILL_BOTH));
 		contentContainer.setLayout(layout);
 
+		viewer.getTree().addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyReleased(final KeyEvent e) {
+				if (e.keyCode == SWT.DEL) {
+					final IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
+					if (selection.getFirstElement() instanceof EObject) {
+						EObject o = (EObject) selection.getFirstElement();
+
+						Command cmd = DeleteCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), o);
+						if (cmd.canExecute()) {
+							ModelEditor.this.modelProvider.getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+
+				}
+			}
+		});
+
 		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			public void selectionChanged(SelectionChangedEvent event) {

From 3956c0afff6f567d552c1f51b894dbc15a8af3ba Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Mon, 10 Sep 2012 15:18:17 -0400
Subject: [PATCH 0472/1286] Update tools to work with
 org.eclipse.e4.releng:eclipse-parent pom

It must be installed into your local repo before you can
build this repo
---
 bundles/org.eclipse.e4.tools.compat/pom.xml        | 6 +++---
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml  | 6 +++---
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml        | 6 +++---
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml | 6 +++---
 bundles/org.eclipse.e4.tools.services/pom.xml      | 6 +++---
 bundles/org.eclipse.e4.tools/pom.xml               | 6 +++---
 features/org.eclipse.e4.core.tools.feature/pom.xml | 7 +++----
 7 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index d7ecc19323..c850e36740 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -2,12 +2,12 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <relativePath>../../build/parent/pom.xml</relativePath>
-    <groupId>org.eclipse.e4.tools</groupId>
-    <artifactId>parent</artifactId>
+    <groupId>org.eclipse.e4.releng</groupId>
+    <artifactId>eclipse-parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.compat</artifactId>
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index eba3805c9c..fd3b68e1d7 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -2,12 +2,12 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <relativePath>../../build/parent/pom.xml</relativePath>
-    <groupId>org.eclipse.e4.tools</groupId>
-    <artifactId>parent</artifactId>
+    <groupId>org.eclipse.e4.releng</groupId>
+    <artifactId>eclipse-parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.emf.editor3x</artifactId>
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index cfa0fc5283..8c36e1a24f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -2,12 +2,12 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <relativePath>../../build/parent/pom.xml</relativePath>
-    <groupId>org.eclipse.e4.tools</groupId>
-    <artifactId>parent</artifactId>
+    <groupId>org.eclipse.e4.releng</groupId>
+    <artifactId>eclipse-parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index e4d546ea1b..d613e7f1a1 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -2,12 +2,12 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <relativePath>../../build/parent/pom.xml</relativePath>
-    <groupId>org.eclipse.e4.tools</groupId>
-    <artifactId>parent</artifactId>
+    <groupId>org.eclipse.e4.releng</groupId>
+    <artifactId>eclipse-parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.jdt.templates</artifactId>
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 644f0083a7..fc55305fb3 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -2,12 +2,12 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <relativePath>../../build/parent/pom.xml</relativePath>
-    <groupId>org.eclipse.e4.tools</groupId>
-    <artifactId>parent</artifactId>
+    <groupId>org.eclipse.e4.releng</groupId>
+    <artifactId>eclipse-parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.services</artifactId>
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index dc537d5f56..98ddd83866 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -2,12 +2,12 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <relativePath>../../build/parent/pom.xml</relativePath>
-    <groupId>org.eclipse.e4.tools</groupId>
-    <artifactId>parent</artifactId>
+    <groupId>org.eclipse.e4.releng</groupId>
+    <artifactId>eclipse-parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index e4cc8bf596..033bd8691b 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <modelVersion>4.0.0</modelVersion>
-
   <parent>
-    <relativePath>../../build/parent/pom.xml</relativePath>
-    <groupId>org.eclipse.e4.tools</groupId>
-    <artifactId>parent</artifactId>
+    <groupId>org.eclipse.e4.releng</groupId>
+    <artifactId>eclipse-parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-feature</packaging>

From 3335485e4a8d61eeffd2b55a57b7be9c671960fa Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Tue, 11 Sep 2012 21:55:01 +0200
Subject: [PATCH 0473/1286] Bug 387481 - Adding o.e.e4.tools.jdt.templates to
 o.e.e4.core.tools.feature feature

---
 features/org.eclipse.e4.core.tools.feature/feature.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index a00b903e60..ec90c2daf1 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -73,4 +73,11 @@
          version="1.7.2.qualifier"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.e4.tools.jdt.templates"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

From 575f98cb9e694a8ebffc10aff01d3600c47c57b2 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Mon, 17 Sep 2012 10:30:32 +0200
Subject: [PATCH 0474/1286] ASSIGNED - bug 389022: URI in Model AddOn
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=389022

---
 .../editor3x/extension/AddonContributionEditor.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
index 87fa59a30a..6b8fb1cd88 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
@@ -105,8 +105,16 @@ private void createOpen(MContribution contribution, EditingDomain domain,
                 // TODO If this is not a WS-Resource we need to open differently
                 if (p != null) {
                     IJavaProject jp = JavaCore.create(p);
+                    IType t = null;
                     try {
-                        IType t = jp.findType(fullyQualified);
+                    	if (p.exists()){
+                    		t = jp.findType(fullyQualified);
+                    	}
+                    	else
+                    	{
+                    		IJavaProject pprim = JavaCore.create(project);
+                    		t = pprim.findType(fullyQualified);
+                    	}
                         if( t != null ) {
                             JavaUI.openInEditor(t);
                         } else {

From dd4af3b11a71c65e0e3a048ff79354c176e1a7f0 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Tue, 18 Sep 2012 23:31:02 +0200
Subject: [PATCH 0475/1286] Bug 389848 - Per default the Eclipse 4 wizard not 
 generate an Activator

---
 .../e4/internal/tools/wizards/project/PluginContentPage.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
index 74d65d95cf..6a1d0e9edb 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     Soyatec - port to e4
+ *     Lars Vogel, vogella GmbH - ongoing enhancements
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -207,7 +208,7 @@ protected void createPluginClassGroup(Composite container) {
 
 		IDialogSettings settings = getDialogSettings();
 
-		fGenerateActivator = SWTFactory.createCheckButton(classGroup, PDEUIMessages.ContentPage_generate, null, (settings != null) ? !settings.getBoolean(S_GENERATE_ACTIVATOR) : true, 2);
+		fGenerateActivator = SWTFactory.createCheckButton(classGroup, PDEUIMessages.ContentPage_generate, null, false, 2);
 		fGenerateActivator.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				fClassLabel.setEnabled(fGenerateActivator.getSelection());
@@ -266,7 +267,6 @@ public void updateData() {
 	public void setVisible(boolean visible) {
 		if (visible) {
 			fMainPage.updateData();
-			fGenerateActivator.setSelection(!fData.isSimple());
 			fGenerateActivator.setEnabled(!fData.isSimple());
 			fClassLabel.setEnabled(!fData.isSimple() && fGenerateActivator.getSelection());
 			fClassText.setEnabled(!fData.isSimple() && fGenerateActivator.getSelection());

From 6348ce2aef604c7769bf23d4c096c599e0b513cb Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Thu, 20 Sep 2012 10:55:51 +0200
Subject: [PATCH 0476/1286] ASSIGNED - bug 389047: [Tooling] Model editor
 improvements round 1 (second commit)
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=389047

---
 .../extension/HandlerContributionEditor.java  | 22 +++++++++++++------
 .../extension/PartContributionEditor.java     | 10 ++++++++-
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
index e6aed7c938..1d9ae41d51 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
@@ -95,13 +95,21 @@ private void createOpen(MContribution contribution, EditingDomain domain, IProje
 				// TODO If this is not a WS-Resource we need to open differently
 				if (p != null) {
 					IJavaProject jp = JavaCore.create(p);
-					try {
-						IType t = jp.findType(fullyQualified);
-						if( t != null ) {
-							JavaUI.openInEditor(t);
-						} else {
-								createOpen(contribution, domain, project, shell, true);
-						}
+					IType t = null;
+                    try {
+                    	if (p.exists()){
+                    		t = jp.findType(fullyQualified);
+                    	}
+                    	else
+                    	{
+                    		IJavaProject pprim = JavaCore.create(project);
+                    		t = pprim.findType(fullyQualified);
+                    	}
+                        if( t != null ) {
+                            JavaUI.openInEditor(t);
+                        } else {
+                                createOpen(contribution, domain, project, shell, true);
+                        }
 					} catch (JavaModelException e) {
 							createOpen(contribution, domain, project, shell, true);
 					} catch (PartInitException e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
index cd15cfa930..c3d1b600a9 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
@@ -97,8 +97,16 @@ private void createOpen(MContribution contribution, EditingDomain domain,
                 // TODO If this is not a WS-Resource we need to open differently
                 if (p != null) {
                     IJavaProject jp = JavaCore.create(p);
+                    IType t = null;
                     try {
-                        IType t = jp.findType(fullyQualified);
+                    	if (p.exists()){
+                    		t = jp.findType(fullyQualified);
+                    	}
+                    	else
+                    	{
+                    		IJavaProject pprim = JavaCore.create(project);
+                    		t = pprim.findType(fullyQualified);
+                    	}
                         if( t != null ) {
                             JavaUI.openInEditor(t);
                         } else {

From 7ee7deb4fdf02075fa7310759ad612c9dbbc2e35 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Thu, 20 Sep 2012 18:56:37 +0200
Subject: [PATCH 0477/1286] Bug 388772 - Reduce fields in Wizard

---
 .../project/NewApplicationWizardPage.java     | 27 +------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
index 886986f745..5ba79e57fd 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Soyatec - initial API and implementation
  *     IBM Corporation - ongoing enhancements
+ *     Lars Vogel, vogella GmbH - ongoing enhancements
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -57,7 +58,6 @@ public class NewApplicationWizardPage extends WizardPage {
 	private IProject project;
 	private IProjectProvider projectProvider;
 	private Text proNameText;
-	private Text proApplicationText;
 	private Group propertyGroup;
 	private AbstractFieldData pluginData;
 
@@ -346,37 +346,14 @@ public void handleEvent(Event event) {
 			}
 		});
 
-		Label proApplicationLabel = new Label(proGroup, SWT.NONE);
-		proApplicationLabel.setText("Application:");
-
-		proApplicationText = new Text(proGroup, SWT.BORDER);
-		proApplicationText
-				.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		proApplicationText.addListener(SWT.Modify, new Listener() {
-			public void handleEvent(Event event) {
-				handleTextEvent(APPLICATION, proApplicationText);
-			}
-		});
 		return proGroup;
 	}
 
 	protected PropertyData[] getPropertyData() {
 		if (PROPERTIES == null) {
 			PROPERTIES = new PropertyData[] {
-					new PropertyData(IProductConstants.APP_NAME, "Application Name:",
-							projectProvider.getProjectName(), String.class,
-							true),
 					new PropertyData(APPLICATION_CSS_PROPERTY, "CSS Style:",
 							"css/default.css", String.class, true),
-					new PropertyData(IProductConstants.ABOUT_TEXT, "About Message:", "",
-							String.class, true),
-					new PropertyData(
-							IProductConstants.STARTUP_FOREGROUND_COLOR, "Startup Foreground:", "",
-							Color.class, false),
-					new PropertyData(IProductConstants.STARTUP_MESSAGE_RECT, "Startup Message Region:",
-							"", Rectangle.class, false),
-					new PropertyData(IProductConstants.STARTUP_PROGRESS_RECT, "Startup Progress Region:",
-							"", Rectangle.class, false),
 					new PropertyData(
 							IProductConstants.PREFERENCE_CUSTOMIZATION, "Preference Customization:", "",
 							String.class, true) }; // plugin_customization.ini
@@ -391,8 +368,6 @@ public void setVisible(boolean visible) {
 			// Use the plug-in name for the product name (not project name which can contain illegal characters)
 			proNameText.setText(pluginData.getId());
 
-			proApplicationText.setText(E4_APPLICATION);
-
 			for (PropertyData property : getPropertyData()) {
 				createPropertyItem(propertyGroup, property);
 			}

From 55ad12a5ef6c0725d62ad56186e4e8384d5e17f3 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Mon, 24 Sep 2012 11:13:27 +0200
Subject: [PATCH 0478/1286] Revert "Bug 388772 - Reduce fields in Wizard "

This reverts commit bd7597f6437a6060cd0a62b0fef66a583f824f50.
---
 .../project/NewApplicationWizardPage.java     | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
index 5ba79e57fd..886986f745 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
@@ -8,7 +8,6 @@
  * Contributors:
  *     Soyatec - initial API and implementation
  *     IBM Corporation - ongoing enhancements
- *     Lars Vogel, vogella GmbH - ongoing enhancements
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -58,6 +57,7 @@ public class NewApplicationWizardPage extends WizardPage {
 	private IProject project;
 	private IProjectProvider projectProvider;
 	private Text proNameText;
+	private Text proApplicationText;
 	private Group propertyGroup;
 	private AbstractFieldData pluginData;
 
@@ -346,14 +346,37 @@ public void handleEvent(Event event) {
 			}
 		});
 
+		Label proApplicationLabel = new Label(proGroup, SWT.NONE);
+		proApplicationLabel.setText("Application:");
+
+		proApplicationText = new Text(proGroup, SWT.BORDER);
+		proApplicationText
+				.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		proApplicationText.addListener(SWT.Modify, new Listener() {
+			public void handleEvent(Event event) {
+				handleTextEvent(APPLICATION, proApplicationText);
+			}
+		});
 		return proGroup;
 	}
 
 	protected PropertyData[] getPropertyData() {
 		if (PROPERTIES == null) {
 			PROPERTIES = new PropertyData[] {
+					new PropertyData(IProductConstants.APP_NAME, "Application Name:",
+							projectProvider.getProjectName(), String.class,
+							true),
 					new PropertyData(APPLICATION_CSS_PROPERTY, "CSS Style:",
 							"css/default.css", String.class, true),
+					new PropertyData(IProductConstants.ABOUT_TEXT, "About Message:", "",
+							String.class, true),
+					new PropertyData(
+							IProductConstants.STARTUP_FOREGROUND_COLOR, "Startup Foreground:", "",
+							Color.class, false),
+					new PropertyData(IProductConstants.STARTUP_MESSAGE_RECT, "Startup Message Region:",
+							"", Rectangle.class, false),
+					new PropertyData(IProductConstants.STARTUP_PROGRESS_RECT, "Startup Progress Region:",
+							"", Rectangle.class, false),
 					new PropertyData(
 							IProductConstants.PREFERENCE_CUSTOMIZATION, "Preference Customization:", "",
 							String.class, true) }; // plugin_customization.ini
@@ -368,6 +391,8 @@ public void setVisible(boolean visible) {
 			// Use the plug-in name for the product name (not project name which can contain illegal characters)
 			proNameText.setText(pluginData.getId());
 
+			proApplicationText.setText(E4_APPLICATION);
+
 			for (PropertyData property : getPropertyData()) {
 				createPropertyItem(propertyGroup, property);
 			}

From 519b28d40d87882a546cf542312c64b256fe9ace Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@gmail.com>
Date: Mon, 24 Sep 2012 13:00:31 +0200
Subject: [PATCH 0479/1286] Bug 388772 - Reduce fields in Wizard

---
 .../project/NewApplicationWizardPage.java     | 27 +------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
index 886986f745..5ba79e57fd 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Soyatec - initial API and implementation
  *     IBM Corporation - ongoing enhancements
+ *     Lars Vogel, vogella GmbH - ongoing enhancements
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -57,7 +58,6 @@ public class NewApplicationWizardPage extends WizardPage {
 	private IProject project;
 	private IProjectProvider projectProvider;
 	private Text proNameText;
-	private Text proApplicationText;
 	private Group propertyGroup;
 	private AbstractFieldData pluginData;
 
@@ -346,37 +346,14 @@ public void handleEvent(Event event) {
 			}
 		});
 
-		Label proApplicationLabel = new Label(proGroup, SWT.NONE);
-		proApplicationLabel.setText("Application:");
-
-		proApplicationText = new Text(proGroup, SWT.BORDER);
-		proApplicationText
-				.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		proApplicationText.addListener(SWT.Modify, new Listener() {
-			public void handleEvent(Event event) {
-				handleTextEvent(APPLICATION, proApplicationText);
-			}
-		});
 		return proGroup;
 	}
 
 	protected PropertyData[] getPropertyData() {
 		if (PROPERTIES == null) {
 			PROPERTIES = new PropertyData[] {
-					new PropertyData(IProductConstants.APP_NAME, "Application Name:",
-							projectProvider.getProjectName(), String.class,
-							true),
 					new PropertyData(APPLICATION_CSS_PROPERTY, "CSS Style:",
 							"css/default.css", String.class, true),
-					new PropertyData(IProductConstants.ABOUT_TEXT, "About Message:", "",
-							String.class, true),
-					new PropertyData(
-							IProductConstants.STARTUP_FOREGROUND_COLOR, "Startup Foreground:", "",
-							Color.class, false),
-					new PropertyData(IProductConstants.STARTUP_MESSAGE_RECT, "Startup Message Region:",
-							"", Rectangle.class, false),
-					new PropertyData(IProductConstants.STARTUP_PROGRESS_RECT, "Startup Progress Region:",
-							"", Rectangle.class, false),
 					new PropertyData(
 							IProductConstants.PREFERENCE_CUSTOMIZATION, "Preference Customization:", "",
 							String.class, true) }; // plugin_customization.ini
@@ -391,8 +368,6 @@ public void setVisible(boolean visible) {
 			// Use the plug-in name for the product name (not project name which can contain illegal characters)
 			proNameText.setText(pluginData.getId());
 
-			proApplicationText.setText(E4_APPLICATION);
-
 			for (PropertyData property : getPropertyData()) {
 				createPropertyItem(propertyGroup, property);
 			}

From 5997e7dd8d4f0dcd98fa9ed0bbf338f4283ed6c8 Mon Sep 17 00:00:00 2001
From: Vincenzo Caselli <vincenzo.caselli@rcp-vision.com>
Date: Mon, 24 Sep 2012 13:05:15 +0200
Subject: [PATCH 0480/1286] Bug 389651 - -clearPersistedState option as default

---
 .../wizards/project/E4NewProjectWizard.java   |  1 +
 .../project/NewApplicationWizardPage.java     | 86 ++++++++++++++-----
 .../templates/common/$projectName$.product    |  1 +
 3 files changed, 67 insertions(+), 21 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 8cecd72c79..e4ad890603 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -413,6 +413,7 @@ public void createApplicationResources(IProject project,
 		String elementName = fragment.getElementName();
 		keys.put("packageName", (elementName.equals("")?"": elementName + ".")+"handlers");
 		keys.put("packageName2", (elementName.equals("")?"": elementName + ".")+"parts");
+		keys.put("programArgs", "true".equalsIgnoreCase(map.get(NewApplicationWizardPage.CLEAR_PERSISTED_STATE))?"-clearPersitedState":"" );
 		try {
 			URL corePath = ResourceLocator.getProjectTemplateFiles(template_id);
 			IRunnableWithProgress op = new TemplateOperation(corePath, project,
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
index 5ba79e57fd..0ff88fe6bc 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
@@ -52,6 +52,8 @@ public class NewApplicationWizardPage extends WizardPage {
 	public static final String APPLICATION_CSS_PROPERTY = "applicationCSS";
 	public static final String PRODUCT_NAME = "productName";
 	public static final String APPLICATION = "application";
+	public static final String CLEAR_PERSISTED_STATE = "clearPersistedState";
+	public static final String EOL = System.getProperty("line.separator");
 
 	private final Map<String, String> data;
 
@@ -106,6 +108,7 @@ public void createControl(Composite parent) {
 	static class PropertyData {
 		private String name;
 		private String label;
+		private String extraTooltipInfo;
 
 		private String value;
 		private Class<?> type;
@@ -120,6 +123,16 @@ public PropertyData(String name, String label, String value, Class<?> type,
 			this.editable = editable;
 		}
 
+		public PropertyData(String name, String label, String value, Class<?> type,
+				boolean editable, String extraTooltipInfo) {
+			this.name = name;
+			this.value = value;
+			this.label = label;
+			this.type = type;
+			this.editable = editable;
+			this.extraTooltipInfo = extraTooltipInfo;
+		}
+
 		public String getName() {
 			return name;
 		}
@@ -139,6 +152,11 @@ public boolean isEditable() {
 		public String getLabel() {
 			return label;
 		}
+
+		public String getExtraTooltipInfo() {
+			return extraTooltipInfo;
+		}
+
 	}
 
 	private Group createPropertyGroup(Composite control) {
@@ -156,35 +174,51 @@ private void createPropertyItem(final Composite parent,
 		label.setText(property.getLabel());
 		label.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_BLUE));
 		label.setToolTipText("Property \"" + property.getName() + "\"");
-		
-		final Text valueText = new Text(parent, SWT.BORDER);
-		valueText.setText(property.getValue());
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		valueText.setLayoutData(gridData);
-		if (!property.isEditable()) {
-			valueText.setEditable(false);
+		if (property.getExtraTooltipInfo()!=null) {
+			label.setToolTipText(label.getToolTipText() + EOL + property.getExtraTooltipInfo());
 		}
-		valueText.addListener(SWT.Modify, new Listener() {
-			public void handleEvent(Event event) {
-				handleTextEvent(property.getName(), valueText);
-			}
-		});
 
-		if (property.getType() == Color.class
-				|| property.getType() == Rectangle.class) {
-			Button button = new Button(parent, SWT.PUSH);
-			button.setText("...");
+		if (property.getType() == Boolean.class) {
+			final Button button = new Button(parent, SWT.CHECK);
+			button.setSelection("true".equalsIgnoreCase(property.getValue()));
 			button.addSelectionListener(new SelectionListener() {
 				public void widgetSelected(SelectionEvent e) {
-					handleLinkEvent(property, valueText, parent.getShell());
+					handleCheckBoxEvent(property.getName(), button.getSelection());
 				}
-
 				public void widgetDefaultSelected(SelectionEvent e) {
 				}
 			});
-		}
-		else {
 			new Label(parent, SWT.NONE);
+		} else {
+			final Text valueText = new Text(parent, SWT.BORDER);
+			valueText.setText(property.getValue());
+			GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+			valueText.setLayoutData(gridData);
+			if (!property.isEditable()) {
+				valueText.setEditable(false);
+			}
+			valueText.addListener(SWT.Modify, new Listener() {
+				public void handleEvent(Event event) {
+					handleTextEvent(property.getName(), valueText);
+				}
+			});
+
+			if (property.getType() == Color.class
+					|| property.getType() == Rectangle.class) {
+				Button button = new Button(parent, SWT.PUSH);
+				button.setText("...");
+				button.addSelectionListener(new SelectionListener() {
+					public void widgetSelected(SelectionEvent e) {
+						handleLinkEvent(property, valueText, parent.getShell());
+					}
+
+					public void widgetDefaultSelected(SelectionEvent e) {
+					}
+				});
+			}
+			else {
+				new Label(parent, SWT.NONE);
+			}
 		}
 		data.put(property.getName(), property.getValue());
 	}
@@ -328,6 +362,13 @@ private void handleTextEvent(String property, Text valueText) {
 		data.put(property, value);
 	}
 
+	protected void handleCheckBoxEvent(String property, boolean selection) {
+		if (property == null) {
+			return;
+		}
+		data.put(property, Boolean.toString(selection));
+	}
+	
 	private Group createProductGroup(Composite control) {
 		Group proGroup = new Group(control, SWT.NONE);
 		proGroup.setText("Product");
@@ -356,7 +397,10 @@ protected PropertyData[] getPropertyData() {
 							"css/default.css", String.class, true),
 					new PropertyData(
 							IProductConstants.PREFERENCE_CUSTOMIZATION, "Preference Customization:", "",
-							String.class, true) }; // plugin_customization.ini
+							String.class, true),
+					new PropertyData(CLEAR_PERSISTED_STATE, "Enable development mode for application model:", "true", Boolean.class, true, 
+							"Add option -clearPersistedState to the Product's Program Arguments")
+			}; // plugin_customization.ini
 		}
 		return PROPERTIES;
 	}
diff --git a/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product b/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
index 4d69f3c61f..dac8e11004 100644
--- a/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
+++ b/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
@@ -7,6 +7,7 @@
    </configIni>
 
    <launcherArgs>
+      <programArgs>@@programArgs@@</programArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
    </launcherArgs>
 

From a6bcdbbab443a224128af91df0bd9442acd8e58b Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Tue, 25 Sep 2012 13:30:39 +0200
Subject: [PATCH 0481/1286] Bug 390237 - [patch] Model Editor Layout Change

Improved positioning of the menu buttons.
---
 .../internal/common/component/MenuEditor.java | 97 ++++++++++---------
 1 file changed, 52 insertions(+), 45 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 15a40d6b53..52966e1abf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -81,6 +81,7 @@
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -247,30 +248,68 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			l.setText(Messages.MenuEditor_Children);
 			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
+			Composite buttonComp = new Composite(parent, SWT.NONE);
+			GridData span2 = new GridData(GridData.FILL, GridData.BEGINNING, false, false, 2, 1);
+			buttonComp.setLayoutData(span2);
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonComp.setLayout(gl);
+
+			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					Struct struct = (Struct) element;
+					return struct.label;
+				}
+			});
+
+			Struct defaultStruct = new Struct(Messages.MenuEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
+			childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false) });
+			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
+
+			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!childrenDropDown.getSelection().isEmpty()) {
+						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+						EClass eClass = struct.eClass;
+						handleAdd(eClass, struct.separator);
+					}
+				}
+			});
+
+			new Label(parent, SWT.None);
+
 			final TableViewer viewer = new TableViewer(parent);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
 
-			GridData gd = new GridData(GridData.FILL_BOTH);
+			GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1);
 			viewer.getControl().setLayoutData(gd);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
 
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
+			new Label(parent, SWT.None);
 
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			Composite buttonComp2 = new Composite(parent, SWT.NONE);
+			buttonComp2.setLayoutData(span2);
+			buttonComp2.setLayout(new FillLayout());
+
+			b = new Button(buttonComp2, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -291,10 +330,9 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b = new Button(buttonComp2, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -315,40 +353,9 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 
-			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					Struct struct = (Struct) element;
-					return struct.label;
-				}
-			});
-
-			Struct defaultStruct = new Struct(Messages.MenuEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
-			childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false) });
-			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!childrenDropDown.getSelection().isEmpty()) {
-						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-						EClass eClass = struct.eClass;
-						handleAdd(eClass, struct.separator);
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b = new Button(buttonComp2, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {

From 9009753b9cd53e900622ecf0df36e5343b0a9c11 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Tue, 25 Sep 2012 23:15:42 +0200
Subject: [PATCH 0482/1286] bug 388774: Templates - More options to create
 Eclipse 4 RCP applications
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=388774

---
 .../wizards/project/E4NewProjectWizard.java   | 153 +++++++++---------
 .../project/NewApplicationWizardPage.java     |  25 ++-
 .../wizards/project/TemplateOperation.java    |   8 +-
 3 files changed, 105 insertions(+), 81 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index e4ad890603..d967369230 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Soyatec - initial API and implementation
  *     IBM Corporation - ongoing enhancements
+ *     Sopot Cela - ongoing enhancements
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -332,6 +333,7 @@ public void createProductsExtension(IProject project) {
 	public void createApplicationResources(IProject project,
 			IProgressMonitor monitor) {
 		Map<String, String> map = fApplicationPage.getData();
+		boolean isMinimalist = !map.get(NewApplicationWizardPage.richSample).equalsIgnoreCase("TRUE");
 		if (map == null
 				|| map.get(NewApplicationWizardPage.PRODUCT_NAME) == null)
 			return;
@@ -417,24 +419,28 @@ public void createApplicationResources(IProject project,
 		try {
 			URL corePath = ResourceLocator.getProjectTemplateFiles(template_id);
 			IRunnableWithProgress op = new TemplateOperation(corePath, project,
-					keys, binaryExtentions);
+					keys, binaryExtentions,isMinimalist);
 			getContainer().run(false, true, op);
 		} catch (Exception e) {
 			PDEPlugin.logException(e);
 		}
-		
+		if (!isMinimalist)
+		{
 		try {
 			URL corePath = ResourceLocator.getProjectTemplateFiles("src");
 			IRunnableWithProgress op = new TemplateOperation(corePath,
-					(IContainer) fragment.getResource(), keys, binaryExtentions);
+					(IContainer) fragment.getResource(), keys, binaryExtentions, isMinimalist);
 			getContainer().run(false, true, op);
 		} catch (Exception e) {
 			PDEPlugin.logException(e);
 		}
+		}
 	}
 
 	private void createApplicationModel(IProject project, String pluginName,
 			IPackageFragment fragment) {
+		Map<String, String> map = fApplicationPage.getData();
+		boolean isMinimalist = !map.get(NewApplicationWizardPage.richSample).equalsIgnoreCase("TRUE");
 		if (APPLICATION_MODEL != null && APPLICATION_MODEL.trim().length() > 0) {
 			// Create a resource set
 			//
@@ -483,56 +489,53 @@ private void createApplicationModel(IProject project, String pluginName,
 			addon.setElementId("org.eclipse.e4.ui.workbench.bindings.model");
 			addon.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon");
 			application.getAddons().add(addon);
+			MTrimmedWindow mainWindow = MBasicFactory.INSTANCE
+					.createTrimmedWindow();
+			application.getChildren().add(mainWindow);
+				mainWindow.setLabel(pluginName);
+				mainWindow.setWidth(500);
+				mainWindow.setHeight(400);
+				resource.getContents().add((EObject) application);
+				if (!isMinimalist){
+					MBindingContext rootContext = MCommandsFactory.INSTANCE
+							.createBindingContext();
+					rootContext.setElementId("org.eclipse.ui.contexts.dialogAndWindow");
+					rootContext.setName("In Dialog and Windows");
 
-			MBindingContext rootContext = MCommandsFactory.INSTANCE
-					.createBindingContext();
-			rootContext.setElementId("org.eclipse.ui.contexts.dialogAndWindow");
-			rootContext.setName("In Dialog and Windows");
+					MBindingContext childContext = MCommandsFactory.INSTANCE
+							.createBindingContext();
+					childContext.setElementId("org.eclipse.ui.contexts.window");
+					childContext.setName("In Windows");
+					rootContext.getChildren().add(childContext);
 
-			MBindingContext childContext = MCommandsFactory.INSTANCE
-					.createBindingContext();
-			childContext.setElementId("org.eclipse.ui.contexts.window");
-			childContext.setName("In Windows");
-			rootContext.getChildren().add(childContext);
+					childContext = MCommandsFactory.INSTANCE.createBindingContext();
+					childContext.setElementId("org.eclipse.ui.contexts.dialog");
+					childContext.setName("In Dialogs");
+					rootContext.getChildren().add(childContext);
 
-			childContext = MCommandsFactory.INSTANCE.createBindingContext();
-			childContext.setElementId("org.eclipse.ui.contexts.dialog");
-			childContext.setName("In Dialogs");
-			rootContext.getChildren().add(childContext);
+					application.getRootContext().add(rootContext);
+					application.getBindingContexts().add(rootContext);
 
-			application.getRootContext().add(rootContext);
-			application.getBindingContexts().add(rootContext);
 
-			resource.getContents().add((EObject) application);
 
-			// Create Quit command
-			MCommand quitCommand = createCommand("org.eclipse.ui.file.exit",
-					"quitCommand", "QuitHandler",
-					"M1+Q", pluginName, fragment, application);
+					// Create Quit command
+					MCommand quitCommand = createCommand("org.eclipse.ui.file.exit",
+							"quitCommand", "QuitHandler",
+							"M1+Q", pluginName, fragment, application);
 
-			MCommand openCommand = createCommand(pluginName + ".open",
-					"openCommand", "OpenHandler",
-					"M1+O", pluginName, fragment, application);
+					MCommand openCommand = createCommand(pluginName + ".open",
+							"openCommand", "OpenHandler",
+							"M1+O", pluginName, fragment, application);
 
-			MCommand saveCommand = createCommand("org.eclipse.ui.file.save",
-					"saveCommand", "SaveHandler",
-					"M1+S", pluginName, fragment, application);
+					MCommand saveCommand = createCommand("org.eclipse.ui.file.save",
+							"saveCommand", "SaveHandler",
+							"M1+S", pluginName, fragment, application);
 
-			MCommand aboutCommand = createCommand(
-					"org.eclipse.ui.help.aboutAction", "aboutCommand",
-					"AboutHandler", "M1+A", pluginName, fragment,
-					application);
+					MCommand aboutCommand = createCommand(
+							"org.eclipse.ui.help.aboutAction", "aboutCommand",
+							"AboutHandler", "M1+A", pluginName, fragment,
+							application);
 
-			MTrimmedWindow mainWindow = MBasicFactory.INSTANCE
-					.createTrimmedWindow();
-			application.getChildren().add(mainWindow);
-			{
-				mainWindow.setLabel(pluginName);
-				mainWindow.setWidth(500);
-				mainWindow.setHeight(400);
-
-				// Menu
-				{
 					MMenu menu = MMenuFactory.INSTANCE.createMenu();
 					mainWindow.setMainMenu(menu);
 					menu.setElementId("menu:org.eclipse.ui.main.menu");
@@ -573,10 +576,8 @@ private void createApplicationModel(IProject project, String pluginName,
 						menuItemAbout.setLabel("About");
 						menuItemAbout.setCommand(aboutCommand);
 					}
-				}
 
-				// PerspectiveStack
-				{
+					// PerspectiveStack
 					MPerspectiveStack perspectiveStack = MAdvancedFactory.INSTANCE
 							.createPerspectiveStack();
 					mainWindow.getChildren().add(perspectiveStack);
@@ -593,47 +594,45 @@ private void createApplicationModel(IProject project, String pluginName,
 						MPartStack partStack = MBasicFactory.INSTANCE
 								.createPartStack();
 						partSashContainer.getChildren().add(partStack);
-						
-						 MPart part = MBasicFactory.INSTANCE.createPart();
-						 partStack.getChildren().add(part);
-						 part.setLabel("Sample Part");
-						 part.setContributionURI("bundleclass://"+pluginName+"/"+fragment.getElementName()+".parts"+".SamplePart");
-						 
-					}
 
-					// WindowTrim
-					{
-						MTrimBar trimBar = MBasicFactory.INSTANCE
-								.createTrimBar();
-						mainWindow.getTrimBars().add(trimBar);
-
-						MToolBar toolBar = MMenuFactory.INSTANCE
-								.createToolBar();
-						toolBar.setElementId("toolbar:org.eclipse.ui.main.toolbar");
-						trimBar.getChildren().add(toolBar);
-
-						MHandledToolItem toolItemOpen = MMenuFactory.INSTANCE
-								.createHandledToolItem();
-						toolBar.getChildren().add(toolItemOpen);
-						toolItemOpen.setIconURI("platform:/plugin/"
-								+ pluginName + "/icons/sample.gif");
-						toolItemOpen.setCommand(openCommand);
+						MPart part = MBasicFactory.INSTANCE.createPart();
+						partStack.getChildren().add(part);
+						part.setLabel("Sample Part");
+						part.setContributionURI("bundleclass://"+pluginName+"/"+fragment.getElementName()+".parts"+".SamplePart");
 
-						MHandledToolItem toolItemSave = MMenuFactory.INSTANCE
-								.createHandledToolItem();
-						toolBar.getChildren().add(toolItemSave);
-						toolItemSave.setIconURI("platform:/plugin/"
-								+ pluginName + "/icons/save_edit.gif");
-						toolItemSave.setCommand(saveCommand);
 					}
+
+					// WindowTrim
+					MTrimBar trimBar = MBasicFactory.INSTANCE
+							.createTrimBar();
+					mainWindow.getTrimBars().add(trimBar);
+
+					MToolBar toolBar = MMenuFactory.INSTANCE
+							.createToolBar();
+					toolBar.setElementId("toolbar:org.eclipse.ui.main.toolbar");
+					trimBar.getChildren().add(toolBar);
+
+					MHandledToolItem toolItemOpen = MMenuFactory.INSTANCE
+							.createHandledToolItem();
+					toolBar.getChildren().add(toolItemOpen);
+					toolItemOpen.setIconURI("platform:/plugin/"
+							+ pluginName + "/icons/sample.gif");
+					toolItemOpen.setCommand(openCommand);
+
+					MHandledToolItem toolItemSave = MMenuFactory.INSTANCE
+							.createHandledToolItem();
+					toolBar.getChildren().add(toolItemSave);
+					toolItemSave.setIconURI("platform:/plugin/"
+							+ pluginName + "/icons/save_edit.gif");
+					toolItemSave.setCommand(saveCommand);
 				}
-			}
 			Map<Object, Object> options = new HashMap<Object, Object>();
 			options.put(XMLResource.OPTION_ENCODING, "UTF-8");
 			try {
 				resource.save(options);
 			} catch (IOException e) {
 				PDEPlugin.logException(e);
+		
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
index 0ff88fe6bc..ff94d0c9c9 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
@@ -9,6 +9,7 @@
  *     Soyatec - initial API and implementation
  *     IBM Corporation - ongoing enhancements
  *     Lars Vogel, vogella GmbH - ongoing enhancements
+ *     Sopot Cela - ongoing enhancements
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -54,7 +55,7 @@ public class NewApplicationWizardPage extends WizardPage {
 	public static final String APPLICATION = "application";
 	public static final String CLEAR_PERSISTED_STATE = "clearPersistedState";
 	public static final String EOL = System.getProperty("line.separator");
-
+	public static final String richSample = "RICH_SAMPLE";
 	private final Map<String, String> data;
 
 	private IProject project;
@@ -64,12 +65,14 @@ public class NewApplicationWizardPage extends WizardPage {
 	private AbstractFieldData pluginData;
 
 	private PropertyData[] PROPERTIES;
-
+	private Button richSampleCheckbox;
+	
 	protected NewApplicationWizardPage(IProjectProvider projectProvider, AbstractFieldData pluginData) {
 		super("New Eclipse 4 Application Wizard Page");
 		this.projectProvider = projectProvider;
 		this.pluginData = pluginData;
 		data = new HashMap<String, String>();
+		data.put(richSample, "FALSE");//minimalist by default
 		setTitle("Eclipse 4 Application");
 		setMessage("Configure application with special values.");
 	}
@@ -386,7 +389,23 @@ public void handleEvent(Event event) {
 				handleTextEvent(PRODUCT_NAME, proNameText);
 			}
 		});
-
+		Label label = new Label(proGroup,SWT.NONE);
+		label.setText("Rich sample (with parts, menu etc.)");
+		richSampleCheckbox = new Button(proGroup, SWT.CHECK);
+		richSampleCheckbox.setSelection(false);
+		richSampleCheckbox.addSelectionListener(new SelectionListener() {
+			
+			public void widgetSelected(SelectionEvent e) {
+				data.put(richSample, richSampleCheckbox.getSelection()?"TRUE":"FALSE");
+				
+			}
+			
+			public void widgetDefaultSelected(SelectionEvent e) {
+				widgetSelected(e)
+				;
+				
+			}
+		});
 		return proGroup;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java
index 3546db5726..ce2c7f49bc 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java
@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     Soyatec - initial API and implementation
+ *     Sopot Cela - ongoing enhancements
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -47,13 +48,15 @@ public class TemplateOperation extends WorkspaceModifyOperation implements
 	private final IContainer target;
 	private final Map<String, String> keys;
 	private final Set<String> binaryExtentions;
+	private boolean isMinimalist;
 
 	public TemplateOperation(URL source, IContainer target,
-			Map<String, String> keys, Set<String> binaryExtentions) {
+			Map<String, String> keys, Set<String> binaryExtentions, boolean justProduct) {
 		templateDirectory = source;
 		this.binaryExtentions = binaryExtentions;
 		this.target = target;
 		this.keys = keys;
+		this.isMinimalist = justProduct;
 	}
 
 	@Override
@@ -102,6 +105,8 @@ protected void execute(IProgressMonitor monitor) throws CoreException,
 
 	private void generateFiles(File src, IContainer dst, boolean firstLevel,
 			IProgressMonitor monitor) throws CoreException {
+		if ((!firstLevel)&&(isMinimalist))
+		return;
 		File[] members = src.listFiles();
 
 		for (int i = 0; i < members.length; i++) {
@@ -118,6 +123,7 @@ private void generateFiles(File src, IContainer dst, boolean firstLevel,
 				}
 				if (dstContainer != null && !dstContainer.exists())
 					((IFolder) dstContainer).create(true, true, monitor);
+			
 				generateFiles(member, dstContainer, false, monitor);
 			} else {
 				InputStream in = null;

From b95d04eefd0c271d465f95930bda53b33cdaa984 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Sun, 30 Sep 2012 20:01:20 +0200
Subject: [PATCH 0483/1286] Added missing javax.xml dependency to the product
 configuration file

---
 .../org.eclipse.e4.tools/templates/common/$projectName$.product  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product b/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
index dac8e11004..67ca16b768 100644
--- a/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
+++ b/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
@@ -18,6 +18,7 @@
       <plugin id="com.ibm.icu"/>
       <plugin id="javax.annotation"/>
       <plugin id="javax.inject"/>
+      <plugin id="javax.xml"/>
       <plugin id="org.apache.batik.css"/>
       <plugin id="org.apache.batik.util"/>
       <plugin id="org.apache.batik.util.gui"/>

From 125b11402efef39291969d75e30c3a6d901da241 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Sun, 30 Sep 2012 22:57:19 +0200
Subject: [PATCH 0484/1286] Cleanup of Wizard Page

- Replaced SelectionListener with SelectionAdapter
- Removed Labels for CheckBox buttons
- Moved Template option into its own conatainer
---
 .../project/NewApplicationWizardPage.java     | 118 ++++++++++--------
 1 file changed, 64 insertions(+), 54 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
index ff94d0c9c9..3244776210 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
@@ -24,8 +24,8 @@
 import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
 import org.eclipse.pde.internal.ui.wizards.plugin.AbstractFieldData;
 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.events.VerifyEvent;
 import org.eclipse.swt.events.VerifyListener;
 import org.eclipse.swt.graphics.Color;
@@ -66,13 +66,14 @@ public class NewApplicationWizardPage extends WizardPage {
 
 	private PropertyData[] PROPERTIES;
 	private Button richSampleCheckbox;
-	
-	protected NewApplicationWizardPage(IProjectProvider projectProvider, AbstractFieldData pluginData) {
+
+	protected NewApplicationWizardPage(IProjectProvider projectProvider,
+			AbstractFieldData pluginData) {
 		super("New Eclipse 4 Application Wizard Page");
 		this.projectProvider = projectProvider;
 		this.pluginData = pluginData;
 		data = new HashMap<String, String>();
-		data.put(richSample, "FALSE");//minimalist by default
+		data.put(richSample, "FALSE");// minimalist by default
 		setTitle("Eclipse 4 Application");
 		setMessage("Configure application with special values.");
 	}
@@ -105,9 +106,29 @@ public void createControl(Composite parent) {
 		propertyGroup = createPropertyGroup(control);
 		propertyGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
+		Group templateGroup = createTemplateGroup(control);
+		templateGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		setControl(control);
 	}
 
+	private Group createTemplateGroup(Composite parent) {
+		Group group = new Group(parent, SWT.NONE);
+		group.setLayout(new GridLayout(1, false));
+		group.setText("Template option");
+		
+		richSampleCheckbox = new Button(group, SWT.CHECK);
+		
+		richSampleCheckbox.setSelection(false);
+		richSampleCheckbox.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				data.put(richSample, richSampleCheckbox.getSelection() ? "TRUE"
+						: "FALSE");
+			}
+		});
+		richSampleCheckbox.setText("Create example content (parts, menu etc.)");
+		return group;
+	}
+	
 	static class PropertyData {
 		private String name;
 		private String label;
@@ -117,8 +138,8 @@ static class PropertyData {
 		private Class<?> type;
 		private boolean editable;
 
-		public PropertyData(String name, String label, String value, Class<?> type,
-				boolean editable) {
+		public PropertyData(String name, String label, String value,
+				Class<?> type, boolean editable) {
 			this.name = name;
 			this.value = value;
 			this.label = label;
@@ -126,8 +147,8 @@ public PropertyData(String name, String label, String value, Class<?> type,
 			this.editable = editable;
 		}
 
-		public PropertyData(String name, String label, String value, Class<?> type,
-				boolean editable, String extraTooltipInfo) {
+		public PropertyData(String name, String label, String value,
+				Class<?> type, boolean editable, String extraTooltipInfo) {
 			this.name = name;
 			this.value = value;
 			this.label = label;
@@ -151,7 +172,7 @@ public Class<?> getType() {
 		public boolean isEditable() {
 			return editable;
 		}
-		
+
 		public String getLabel() {
 			return label;
 		}
@@ -173,26 +194,21 @@ private Group createPropertyGroup(Composite control) {
 
 	private void createPropertyItem(final Composite parent,
 			final PropertyData property) {
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(property.getLabel());
-		label.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_BLUE));
-		label.setToolTipText("Property \"" + property.getName() + "\"");
-		if (property.getExtraTooltipInfo()!=null) {
-			label.setToolTipText(label.getToolTipText() + EOL + property.getExtraTooltipInfo());
-		}
+		
 
 		if (property.getType() == Boolean.class) {
 			final Button button = new Button(parent, SWT.CHECK);
 			button.setSelection("true".equalsIgnoreCase(property.getValue()));
-			button.addSelectionListener(new SelectionListener() {
+			button.addSelectionListener(new SelectionAdapter() {
 				public void widgetSelected(SelectionEvent e) {
-					handleCheckBoxEvent(property.getName(), button.getSelection());
-				}
-				public void widgetDefaultSelected(SelectionEvent e) {
+					handleCheckBoxEvent(property.getName(),
+							button.getSelection());
 				}
 			});
+			button.setText(property.getLabel());
 			new Label(parent, SWT.NONE);
 		} else {
+			createLabelForField(parent, property);
 			final Text valueText = new Text(parent, SWT.BORDER);
 			valueText.setText(property.getValue());
 			GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
@@ -210,22 +226,30 @@ public void handleEvent(Event event) {
 					|| property.getType() == Rectangle.class) {
 				Button button = new Button(parent, SWT.PUSH);
 				button.setText("...");
-				button.addSelectionListener(new SelectionListener() {
+				button.addSelectionListener(new SelectionAdapter() {
 					public void widgetSelected(SelectionEvent e) {
 						handleLinkEvent(property, valueText, parent.getShell());
 					}
-
-					public void widgetDefaultSelected(SelectionEvent e) {
-					}
 				});
-			}
-			else {
+			} else {
 				new Label(parent, SWT.NONE);
 			}
 		}
 		data.put(property.getName(), property.getValue());
 	}
 
+	private void createLabelForField(final Composite parent,
+			final PropertyData property) {
+		Label label = new Label(parent, SWT.NONE);
+		label.setText(property.getLabel());
+		label.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_BLUE));
+		label.setToolTipText("Property \"" + property.getName() + "\"");
+		if (property.getExtraTooltipInfo() != null) {
+			label.setToolTipText(label.getToolTipText() + EOL
+					+ property.getExtraTooltipInfo());
+		}
+	}
+
 	private void handleLinkEvent(PropertyData property, Text valueText,
 			Shell shell) {
 		if (property == null || valueText == null || valueText.isDisposed()) {
@@ -371,7 +395,7 @@ protected void handleCheckBoxEvent(String property, boolean selection) {
 		}
 		data.put(property, Boolean.toString(selection));
 	}
-	
+
 	private Group createProductGroup(Composite control) {
 		Group proGroup = new Group(control, SWT.NONE);
 		proGroup.setText("Product");
@@ -389,23 +413,6 @@ public void handleEvent(Event event) {
 				handleTextEvent(PRODUCT_NAME, proNameText);
 			}
 		});
-		Label label = new Label(proGroup,SWT.NONE);
-		label.setText("Rich sample (with parts, menu etc.)");
-		richSampleCheckbox = new Button(proGroup, SWT.CHECK);
-		richSampleCheckbox.setSelection(false);
-		richSampleCheckbox.addSelectionListener(new SelectionListener() {
-			
-			public void widgetSelected(SelectionEvent e) {
-				data.put(richSample, richSampleCheckbox.getSelection()?"TRUE":"FALSE");
-				
-			}
-			
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e)
-				;
-				
-			}
-		});
 		return proGroup;
 	}
 
@@ -415,11 +422,12 @@ protected PropertyData[] getPropertyData() {
 					new PropertyData(APPLICATION_CSS_PROPERTY, "CSS Style:",
 							"css/default.css", String.class, true),
 					new PropertyData(
-							IProductConstants.PREFERENCE_CUSTOMIZATION, "Preference Customization:", "",
-							String.class, true),
-					new PropertyData(CLEAR_PERSISTED_STATE, "Enable development mode for application model:", "true", Boolean.class, true, 
-							"Add option -clearPersistedState to the Product's Program Arguments")
-			}; // plugin_customization.ini
+							IProductConstants.PREFERENCE_CUSTOMIZATION,
+							"Preference Customization:", "", String.class, true),
+					new PropertyData(CLEAR_PERSISTED_STATE,
+							"Enable development mode for application model",
+							"true", Boolean.class, true,
+							"Add option -clearPersistedState to the Product's Program Arguments") }; // plugin_customization.ini
 		}
 		return PROPERTIES;
 	}
@@ -427,8 +435,9 @@ protected PropertyData[] getPropertyData() {
 	@Override
 	public void setVisible(boolean visible) {
 		if (visible && PROPERTIES == null) {
-			
-			// Use the plug-in name for the product name (not project name which can contain illegal characters)
+
+			// Use the plug-in name for the product name (not project name which
+			// can contain illegal characters)
 			proNameText.setText(pluginData.getId());
 
 			for (PropertyData property : getPropertyData()) {
@@ -447,10 +456,11 @@ public Map<String, String> getData() {
 			for (PropertyData property : getPropertyData()) {
 				data.put(property.getName(), property.getValue());
 			}
-			
-			// Use the plug-in name for the product name (not project name which can contain illegal characters)
+
+			// Use the plug-in name for the product name (not project name which
+			// can contain illegal characters)
 			String productName = pluginData.getId();
-			
+
 			data.put(PRODUCT_NAME, productName);
 			data.put(APPLICATION, E4_APPLICATION);
 		}

From 6e5de2bcf2edd903dcc5ecd45cfa088702d48225 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Sun, 30 Sep 2012 23:03:41 +0200
Subject: [PATCH 0485/1286] Improved label text for the sample creation option

---
 .../tools/wizards/project/NewApplicationWizardPage.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
index 3244776210..a1c24224db 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
@@ -125,7 +125,7 @@ public void widgetSelected(SelectionEvent e) {
 						: "FALSE");
 			}
 		});
-		richSampleCheckbox.setText("Create example content (parts, menu etc.)");
+		richSampleCheckbox.setText("Create sample content (parts, menu etc.)");
 		return group;
 	}
 	

From 422ac061106e95fe4656c9cd7ca41e0f8fd0ec67 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Mon, 1 Oct 2012 19:51:29 +0200
Subject: [PATCH 0486/1286] Fixed typo in -clearPersistedState option

---
 .../e4/internal/tools/wizards/project/E4NewProjectWizard.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index d967369230..baae4c1fb8 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -415,7 +415,7 @@ public void createApplicationResources(IProject project,
 		String elementName = fragment.getElementName();
 		keys.put("packageName", (elementName.equals("")?"": elementName + ".")+"handlers");
 		keys.put("packageName2", (elementName.equals("")?"": elementName + ".")+"parts");
-		keys.put("programArgs", "true".equalsIgnoreCase(map.get(NewApplicationWizardPage.CLEAR_PERSISTED_STATE))?"-clearPersitedState":"" );
+		keys.put("programArgs", "true".equalsIgnoreCase(map.get(NewApplicationWizardPage.CLEAR_PERSISTED_STATE))?"-clearPersistedState":"" );
 		try {
 			URL corePath = ResourceLocator.getProjectTemplateFiles(template_id);
 			IRunnableWithProgress op = new TemplateOperation(corePath, project,

From 17b843f0d317b02492083febfc8c6f269184dbae Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Mon, 1 Oct 2012 22:07:27 +0200
Subject: [PATCH 0487/1286] Bug 390779 - Handler/ Part / Addon Wizard does not
 work anymore

---
 .../wizards/classes/AbstractNewClassPage.java | 39 +++++++++++--------
 .../wizards/classes/NewAddonClassWizard.java  |  4 ++
 .../classes/NewHandlerClassWizard.java        |  5 ++-
 .../wizards/classes/NewPartClassWizard.java   |  4 ++
 4 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index 78da3e17a6..689c024a61 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -145,9 +145,10 @@ public void widgetDisposed(DisposeEvent e) {
 		parent.setLayout(new GridLayout(3, false));
 		
 		clazz = createInstance();
-		
+		if ((froot!=null)&&(initialString!=null)){
 		clazz.setPackageFragment(froot.getPackageFragment(parseInitialStringForPackage(initialString)==null?"":parseInitialStringForPackage(initialString)));
 		clazz.setName(parseInitialStringForClassName(initialString));
+		}
 		DataBindingContext dbc = new DataBindingContext();
 		WizardPageSupport.create(this, dbc);
 		
@@ -162,7 +163,7 @@ public void widgetDisposed(DisposeEvent e) {
 			final Binding bd = dbc.bindValue(
 					WidgetProperties.text().observe(t), 
 					BeanProperties.value("fragmentRoot").observe(clazz), 
-					new UpdateValueStrategy(), 
+					new UpdateValueStrategy().setBeforeSetValidator(new PFRootValidator()), 
 					new UpdateValueStrategy().setConverter(new PackageFragmentRootToStringConverter())
 			);
 
@@ -190,10 +191,10 @@ public void widgetSelected(SelectionEvent e) {
 			final Binding bd = dbc.bindValue(
 					WidgetProperties.text(SWT.Modify).observe(t), 
 					BeanProperties.value("packageFragment").observe(clazz),
-					new UpdateValueStrategy().setConverter(new StringToPackageFragmentConverter(froot)), 
+					new UpdateValueStrategy().setConverter(new StringToPackageFragmentConverter(clazz)), 
 					new UpdateValueStrategy().setConverter(new PackageFragmentToStringConverter())
 			);
-
+			
 			Button b = new Button(parent, SWT.PUSH);
 			b.setText("Browse ...");
 			b.addSelectionListener(new SelectionAdapter() {
@@ -244,8 +245,6 @@ private String parseInitialStringForPackage(String initialString2) {
 			){
 			return null;
 		}
-		int bi = ioBC+"bundleclass://".length()-1;
-		int ei = iSecondSlash;
 
 		int lastDot = initialString2.lastIndexOf('.');
 		String packageString = initialString2.substring(iSecondSlash+1, lastDot);
@@ -383,6 +382,18 @@ public IStatus validate(Object value) {
 			return JavaConventions.validateJavaTypeName(name,JavaCore.VERSION_1_3,JavaCore.VERSION_1_3);
 		}
 	}
+	
+	static class PFRootValidator implements IValidator {
+
+		public IStatus validate(Object value) {
+			String name = value.toString();
+			if (name.length()==0)
+				return new Status(IStatus.ERROR,ToolsPlugin.PLUGIN_ID,"Source folder must not be empty");
+			
+
+			return new Status(IStatus.OK,ToolsPlugin.PLUGIN_ID,"");
+		}
+	}
 
 	static class PackageFragmentRootToStringConverter extends Converter {
 
@@ -416,24 +427,20 @@ public Object convert(Object fromObject) {
 	
 	static class StringToPackageFragmentConverter extends Converter {
 
-		private IPackageFragmentRoot proot;
+		private JavaClass clazz;
 
-		public StringToPackageFragmentConverter(IPackageFragmentRoot froot) {
+		public StringToPackageFragmentConverter(JavaClass clazz) {
 			super(String.class, IPackageFragment.class);
-			this.proot = froot;
+			this.clazz = clazz;
 		}
 		
 		public Object convert(Object fromObject) {
-			try {
+			if (clazz.getFragmentRoot()==null) return null;
 			if( fromObject == null ) {
-				return proot.createPackageFragment("", true, null);
+				return clazz.getFragmentRoot().getPackageFragment("");
 			}
 			
-				return proot.getPackageFragment((String) fromObject);
-			} catch (JavaModelException e) {
-				e.printStackTrace();
-				return null;
-			}
+				return clazz.getFragmentRoot().getPackageFragment((String) fromObject);
 			
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
index 94325ef74f..d5a73559c0 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
@@ -24,6 +24,10 @@ public class NewAddonClassWizard extends AbstractNewClassWizard {
 	public NewAddonClassWizard(String contributionURI) {
 		this.initialString = contributionURI;
 	}
+	
+	public NewAddonClassWizard() {
+		// Intentially left empty 
+	}
 
 	@Override
 	public void addPages() {
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
index b5b29f3ee8..244b498e1a 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
@@ -33,7 +33,10 @@ public class NewHandlerClassWizard extends AbstractNewClassWizard {
 
 	public NewHandlerClassWizard(String contributionURI) {
 		this.initialString = contributionURI;
-		
+	}
+	
+	public NewHandlerClassWizard() {
+		// Intentially left empty 
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
index 1f6526f44f..4de0b134cd 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
@@ -37,6 +37,10 @@ public class NewPartClassWizard extends AbstractNewClassWizard {
 	public NewPartClassWizard(String contributionURI) {
 		this.initialString = contributionURI;
 	}
+	
+	public NewPartClassWizard() {
+		// Intentially left empty 
+	}
 
 	@Override
 	public void addPages() {

From 97825558e37c34dc7120ac210efc701ece039177 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Mon, 1 Oct 2012 23:16:24 +0200
Subject: [PATCH 0488/1286] Cleanup of the e4 code templates

---
 .../plugin.xml                                | 23 ++++++++--------
 .../templates/default-e4templates.properties  |  0
 .../templates/default-e4templates.xml         | 27 ++++++++++++-------
 3 files changed, 28 insertions(+), 22 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.properties

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml b/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
index 2a4f15366e..30b8ff7fca 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
@@ -38,8 +38,7 @@
             registryId="org.eclipse.jdt.ui.CompilationUnitEditor">
       </contextType>
       <include
-            file="templates/default-e4templates.xml"
-            translations="$nl$/templates/default-e4templates.properties">
+            file="templates/default-e4templates.xml">
       </include>
             <resolver
             class="org.eclipse.jdt.internal.corext.template.java.FieldResolver"
@@ -51,61 +50,61 @@
             class="org.eclipse.jdt.internal.corext.template.java.LocalVarResolver"
             contextTypeId="e4-members"
             description="%templates.java.resolvers.LocalVar.description"
-            name="%templates.java.resolvers.LocalVar.name"
+            name="Local Variable"
             type="localVar"/>
       <resolver
             class="org.eclipse.jdt.internal.corext.template.java.VarResolver"
             contextTypeId="e4-members"
             description="%templates.java.resolvers.Var.description"
-            name="%templates.java.resolvers.Var.name"
+            name="Variable"
             type="var"/>
       <resolver
             class="org.eclipse.jdt.internal.corext.template.java.NameResolver"
             contextTypeId="e4-members"
             description="%templates.java.resolvers.Name.description"
-            name="%templates.java.resolvers.Name.name"
+            name="New Name"
             type="newName"/>
       <resolver
             class="org.eclipse.jdt.internal.corext.template.java.TypeResolver"
             contextTypeId="e4-members"
             description="%templates.java.resolvers.Type.description"
-            name="%templates.java.resolvers.Type.name"
+            name="New Type"
             type="newType"/>
       <resolver
             class="org.eclipse.jdt.internal.corext.template.java.ElementTypeResolver"
             contextTypeId="e4-members"
             description="%templates.java.resolvers.ElementType.description"
-            name="%templates.java.resolvers.ElementType.name"
+            name="Element Type"
             type="elemType"/>
       <resolver
             class="org.eclipse.jdt.internal.corext.template.java.TypeVariableResolver"
             contextTypeId="e4-members"
             description="%templates.java.resolvers.ArgumentType.description"
-            name="%templates.java.resolvers.ArgumentType.name"
+            name="Argument Type"
             type="argType"/>
 	  <resolver
             class="org.eclipse.jdt.internal.corext.template.java.LinkResolver"
             contextTypeId="e4-members"
             description="%templates.java.resolvers.Link.description"
-            name="%templates.java.resolvers.Link.name"
+            name="Linked Mode"
             type="link"/>
       <resolver
             class="org.eclipse.jdt.internal.corext.template.java.ImportsResolver"
             contextTypeId="e4-members"
             description="%templates.java.resolvers.Imports.description"
-            name="%templates.java.resolvers.Imports.name"
+            name="Import"
             type="import"/>
       <resolver
             class="org.eclipse.jdt.internal.corext.template.java.StaticImportResolver"
             contextTypeId="e4-members"
             description="%templates.java.resolvers.ImportStatic.description"
-            name="%templates.java.resolvers.ImportStatic.name"
+            name="Import Static"
             type="importStatic"/>
       <resolver
             class="org.eclipse.jdt.internal.corext.template.java.ExceptionVariableNameResolver"
             contextTypeId="e4-members"
             description="%templates.java.resolvers.ExceptionVariableName.description"
-            name="%templates.java.resolvers.ExceptionVariableName.name"
+            name="Exception Variable Name"
             type="exception_variable_name">
       </resolver>
    </extension>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.properties b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.properties
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
index f8cf7dc5ad..2f6c540494 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
@@ -16,33 +16,40 @@
 
 <templates>
 
-<template name="inject-parent" description="Injected Parent Composite" id="org.eclipse.e4.tools.jdt.templates.parent" context="e4-members" enabled="true" autoinsert="false">@Inject
-Composite parent;</template>
+<template name="Inject - Composite" description="Injected Parent Composite" id="org.eclipse.e4.tools.jdt.templates.parent" context="e4-members" enabled="true" autoinsert="false">@Inject
+Composite parent;
+${imp:import(javax.inject.Inject)}
+</template>
 
-<template name="inject-preference" description="Injected Preference Value" id="org.eclipse.e4.tools.jdt.templates.preference" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="Inject -  Preference Value" description="Injected Preference Value" id="org.eclipse.e4.tools.jdt.templates.preference" context="e4-members" enabled="true" autoinsert="false">@Inject
 void setPreferenceValue(@Named("preference-PREFERENCE_KEY") String preferenceValue) {
 	${cursor}
 }</template>
 
-<template name="inject-preferences" description="Injected Preferences Service" id="org.eclipse.e4.tools.jdt.templates.preferences" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="Inject - Preferences" description="Injected Preferences Service" id="org.eclipse.e4.tools.jdt.templates.preferences" context="e4-members" enabled="true" autoinsert="false">@Inject
 IEclipsePreferences preferences;</template>
 
-<template name="inject-logger" description="Injected Logger" id="org.eclipse.e4.tools.jdt.templates.logger" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="Inject - Logger" description="Injected Logger" id="org.eclipse.e4.tools.jdt.templates.logger" context="e4-members" enabled="true" autoinsert="false">@Inject
 Logger logger;</template>
 
-<template name="inject-eventbroker" description="Injected Event Broker" id="org.eclipse.e4.tools.jdt.templates.eventbroker" context="e4-members" enabled="true" autoinsert="false">@Inject
-IEventBroker eventBroker;</template>
+<template name="Inject - Eventbroker" description="Injected Event Broker" id="org.eclipse.e4.tools.jdt.templates.eventbroker" context="e4-members" enabled="true" autoinsert="false">@Inject
+IEventBroker eventBroker;
+${imp:import(org.eclipse.e4.core.services.events.IEventBroker)}
+</template>
 
-<template name="inject-stylingengine" description="Injected Styling Engine" id="org.eclipse.e4.tools.jdt.templates.stylingengine" context="e4-members" enabled="true" autoinsert="false">@Inject
-IStylingEngine stylingEngine;</template>
 
-<template name="ininjectject-event" description="Event Handler Method" id="org.eclipse.e4.tools.jdt.templates.eventhandler" context="e4-members" enabled="true" autoinsert="false">@EventHandler("some/event/topic")
+<template name="Injectject -  Event" description="Event Handler Method" id="org.eclipse.e4.tools.jdt.templates.eventhandler" context="e4-members" enabled="true" autoinsert="false">@EventHandler("some/event/topic")
 void handleSomeEvent(Payload payloadObject) {
 	${cursor}
 }</template>
 
+<template name="Inject - Styling Engine" description="Injected Styling Engine" id="org.eclipse.e4.tools.jdt.templates.stylingengine" context="e4-members" enabled="true" autoinsert="false">@Inject
+IStylingEngine stylingEngine;</template>
+
+
 <template name="PostConstruct" description="Creates @PostConstruct method" id="org.eclipse.e4.tools.jdt.templates.init" context="e4-members" enabled="true" autoinsert="false">@PostConstruct
 public void postConstruct(${type:newType(org.eclipse.swt.widgets.Composite)} parent) { 
+	${cursor}
 }
 ${imp:import(javax.annotation.PostConstruct)}
 </template>

From 5f33d6dfa7acefa85d78fa34dda3b00dd5b960bd Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Mon, 1 Oct 2012 23:24:35 +0200
Subject: [PATCH 0489/1286] Bug 390237-Model Editor Layout Change

Improves the layout of PartSashContainerEditor and PartStackEditor
---
 .../component/PartSashContainerEditor.java    | 92 ++++++++++---------
 .../common/component/PartStackEditor.java     | 87 ++++++++++--------
 2 files changed, 97 insertions(+), 82 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 079ce6384b..92e22ea745 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -62,6 +62,7 @@
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -244,12 +245,52 @@ public String getText(Object element) {
 		ControlFactory.createTextField(parent, Messages.PartSashContainerEditor_ContainerData, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		{
+
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartSashContainerEditor_Controls);
 			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
+			Composite buttonCompTop = new Composite(parent, SWT.NONE);
+			GridData span2 = new GridData(GridData.FILL, GridData.BEGINNING, false, false, 2, 1);
+			buttonCompTop.setLayoutData(span2);
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonCompTop.setLayout(gl);
+
+			final ComboViewer childrenDropDown = new ComboViewer(buttonCompTop);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					EClass eclass = (EClass) element;
+					return eclass.getName();
+				}
+			});
+			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
+			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
+
+			Button b = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!childrenDropDown.getSelection().isEmpty()) {
+						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+						handleAddChild(eClass);
+					}
+				}
+			});
+
+			new Label(parent, SWT.NONE);
+
 			final TableViewer viewer = new TableViewer(parent);
-			GridData gd = new GridData(GridData.FILL_BOTH);
+			GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1);
 			viewer.getControl().setLayoutData(gd);
 			ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
@@ -258,19 +299,15 @@ public String getText(Object element) {
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
+			new Label(parent, SWT.NONE);
 
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			Composite buttonCompBot = new Composite(parent, SWT.NONE);
+			buttonCompBot.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 2, 1));
+			buttonCompBot.setLayout(new FillLayout());
+
+			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -291,10 +328,9 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -315,37 +351,9 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 
-			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					EClass eclass = (EClass) element;
-					return eclass.getName();
-				}
-			});
-			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
-			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!childrenDropDown.getSelection().isEmpty()) {
-						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-						handleAddChild(eClass);
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 01f534fc06..af9833cb3c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -60,6 +60,7 @@
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -195,28 +196,61 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			l.setText(Messages.PartStackEditor_Parts);
 			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
+			Composite buttonCompTop = new Composite(parent, SWT.NONE);
+			GridData span2 = new GridData(GridData.FILL, GridData.BEGINNING, false, false, 2, 1);
+			buttonCompTop.setLayoutData(span2);
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonCompTop.setLayout(gl);
+
+			final ComboViewer childrenDropDown = new ComboViewer(buttonCompTop);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					EClass eclass = (EClass) element;
+					return eclass.getName();
+				}
+			});
+			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.PLACEHOLDER });
+			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
+
+			Button b = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+					handleAddChild(eClass);
+				}
+			});
+
+			new Label(parent, SWT.NONE);
+
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-			GridData gd = new GridData(GridData.FILL_BOTH);
+			GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1);
 			viewer.getControl().setLayoutData(gd);
 
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
+			new Label(parent, SWT.NONE);
+
+			Composite buttonCompBot = new Composite(parent, SWT.NONE);
+			buttonCompBot.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 2, 1));
+			buttonCompBot.setLayout(new FillLayout());
 
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -237,10 +271,9 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -261,35 +294,9 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 
-			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					EClass eclass = (EClass) element;
-					return eclass.getName();
-				}
-			});
-			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.PLACEHOLDER });
-			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-					handleAddChild(eClass);
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {

From 45e8ca0e838632c9f488cc9990b79ca057069a1b Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Wed, 10 Oct 2012 16:52:12 +0200
Subject: [PATCH 0490/1286] Improve layout for the Window Trim editor

---
 .../common/component/TrimBarEditor.java       | 81 ++++++++++---------
 1 file changed, 44 insertions(+), 37 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index f717944a6e..beea4c88f6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -63,6 +63,7 @@
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -210,28 +211,58 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			l.setText(Messages.TrimBarEditor_Controls);
 			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
+			Composite buttonCompTop = new Composite(parent, SWT.NONE);
+			buttonCompTop.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 2, 1));
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonCompTop.setLayout(gl);
+
+			final ComboViewer typeViewer = new ComboViewer(buttonCompTop, SWT.READ_ONLY);
+			typeViewer.setContentProvider(new ArrayContentProvider());
+			typeViewer.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					return ((EClass) element).getName();
+				}
+			});
+			typeViewer.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
+			typeViewer.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
+			typeViewer.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+			Button b = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					EClass eClass = (EClass) ((IStructuredSelection) typeViewer.getSelection()).getFirstElement();
+					handleAddChild(eClass);
+				}
+			});
+
+			new Label(parent, SWT.NONE);
+
 			final TableViewer viewer = new TableViewer(parent);
 			viewer.setLabelProvider(new ComponentLabelProvider(editor, Messages));
 			viewer.setContentProvider(new ObservableListContentProvider());
-			GridData gd = new GridData(GridData.FILL_BOTH);
+			GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1);
 			viewer.getControl().setLayoutData(gd);
 
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
+			new Label(parent, SWT.NONE);
+
+			Composite buttonCompBot = new Composite(parent, SWT.NONE);
+			buttonCompBot.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 2, 1));
+			buttonCompBot.setLayout(new FillLayout());
 
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -252,10 +283,9 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -276,32 +306,9 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 
-			final ComboViewer typeViewer = new ComboViewer(buttonComp, SWT.READ_ONLY);
-			typeViewer.setContentProvider(new ArrayContentProvider());
-			typeViewer.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					return ((EClass) element).getName();
-				}
-			});
-			typeViewer.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
-			typeViewer.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					EClass eClass = (EClass) ((IStructuredSelection) typeViewer.getSelection()).getFirstElement();
-					handleAddChild(eClass);
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {

From 4a2a227818e4fdf3bca1addf00516746d35c67f5 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Tue, 16 Oct 2012 15:44:27 +0200
Subject: [PATCH 0491/1286] Bug 389794 - Eclipse 4 Model Editor uses bug
 (animal) image for Handlers

---
 .../icons/full/modelelements/Handler.png        | Bin 774 -> 850 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png
index 2d5fb90ec6ee08f53947e0266a87b03f75893446..b8c64af1ee0cddf9e745670001e2d4b29ec8a89b 100644
GIT binary patch
delta 773
zcmV+g1N!`i2GRzQS%2h7L_t(I%axLANRv?<#)ZDsm%j9&PpNHhq%+h?D`Ylr<(v&C
zg%Cl4OP%&%nKDDR*i=%Owo%N4ETS}*b28_=<Pc4yn#}S#FC#A~yX0kBUYhyzzArQw
z71DtR{^x(5=XcKGoB#j;|D&l^!Z@a5dfz_|)>HHS0|w%V&3{0Ikio+?15+_;jD))_
z0qu$)@4f(gJMn}J&QItG54r2ldDB@8R0r)1C|S^z1h)PYKn9u9CSuDubQ{~QZtOTa
zu{J1%tCfS%ns69ofwJG;zlGChd(Oi>UWp$r6Fk;ySa}x*r#=*pmS{LS;$e~p+Wr8L
z!K0+!E?F|LF@M{L?S&WcSh!g2=isaP0^A*^;WD0rt2-HkRSd5WFl{85WN?YR>z;c=
z3h$Z)-|eMv4_t!N%*J9{G-m3<u+YSUvxPiG=VkPi1@HI(6FO$Md-y7L98a-1C&8vI
z6I&w!xOzF5)<$6bStveh2+TH|ps%rHN<z!Mz<D2F_<uQLaowJab-NrNU$XE?8-lUM
zD9n&@c0|FVV!-<FI2P&|aCaqQt|<nMcaJss03RL&*G?H@urgVK(PlpM(sR(<Pe(<W
z6m@lVs8AH3yD|d9H3TY43+Y~YnPNjE5*4!9>_arAuPSI@s38)|lM)o)WJ9G=!QpVg
zZnvYiw|^Ja4+^1H2r+3JqkH}R{j`V2<5l`zp{qP-vQ`=aNs$=Vkr9+hvyjS5flw%f
zTCGNLaWP%<Qn<*-$S_fmf`WoIzdw+9C3LD(E~5c&idaaDkA>N6hSh3CUtb?|IvwIU
z>^(l8e~<#m<?<~*Kv-B<Zcg^C4GM5an2dx34t|o7l8}~`MvJQB;x6t91cFWqke!{q
z>IXPUj?~oD38hlGs(t-xv$?q$8jS{Gu^1AGgs!QcR;yj6Je1cDKoG=%*x1-`E|>cy
zD=X_;US8f-ex7JocH@jkex2pX7v=1dy=`iZ@=)GiXh*2Iz!j=w00000NkvXXu0mjf
D9B*&0

delta 697
zcmV;q0!IDP28ITZS$~*GL_t(I%bk<SPg7A8#`zmu107ylpxCN(dhZpAB?t>_86=h}
zlLaakDwHxhpaBYLQg8@}5~dc4w6+!s1dRp+V=&R^#>9n7cP1uaG&IEU`5uWVre)#c
zOYX_N=XcI`a!(w9xLC?urjfZwY1wneV^vXlK)L<zn*)LNnSYx2JJy6rWQ0^<%YdG*
z_9<%U8Tq$E0VmmtOH}jkI6bI}sQt>X<{LTQf?j%?9+T~s*woIL0L=oqnK4gB_F4{*
zTlA~~lvfVQEl1~i6V^Y6(C(^$t|qM|DuD5+O@E|>#z$`E1x_LOVH{6BPGjJu1Cm?G
zs94U2|Mf6V^nV}4ac3%|4lz@8p4?)5?t5o^?q+%^%)Yygo~I^U4VR!bTnWuE35hcW
zrfCDR3q+sxJ79e7Fg`&)RCqLA^2^y^0laVfadW90_Fz8Brm|r47sB^u1VgI>kanj)
zZ4`zMSfHlm8>CwXa$JVM`$2RrmZB-3N10m-!;BvH*MA(a&l>Pxr5BP;F~l9B?<uW9
z>wy`Nqq2z6R|MB{D;oVelul%!*mD~9R=Z)HDn!*-E(35v+$KV@U9g+fNI+E2|1&_<
zP}+~$pb2+Y+E6x`jWZK@a4ojO;?cu2nhVFg4GohPB-sQ=t|yMLIfR*eZ6842RrIB~
zB<NadLx1tO4z7g`Sll{Pj^v<c&Ianb5~9mY)jFa&=0A}29a|%sxfpvfh^|mQE;68=
zxkg->X@Rhg4?!&tL=88>H*uPy0$53}ir1taVl=pGVfWNQY7_4z3eCJ~CQ-|)NZjO>
zCV+D;o`?!ym1-BcldSxof=f(AGZ*|S&Z}4p7czI)HnQSh;B4^96Tv;7K>Qbg6~`FA
flW2(Figx!4w=8iJ2yue?00000NkvXXu0mjfdVWQo


From c6b3ae0d216e8ccb6a59d62ac907cf225e43e30f Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Wed, 17 Oct 2012 11:05:45 +0200
Subject: [PATCH 0492/1286] Bug 391358 - Wizard create strange RICH_SAMPLE
 property

---
 .../e4/internal/tools/wizards/project/E4NewProjectWizard.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index baae4c1fb8..6cb549b56b 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -303,7 +303,9 @@ public void createProductsExtension(IProject project) {
 						if (entry.getKey().equals(
 								NewApplicationWizardPage.PRODUCT_NAME)
 								|| entry.getKey().equals(
-										NewApplicationWizardPage.APPLICATION)) {
+										NewApplicationWizardPage.APPLICATION)
+											||entry.getKey().equals(
+													NewApplicationWizardPage.richSample)) {
 							continue;
 						}
 						IPluginElement element = fmodel.getFactory()

From 47f1132124f0b617e66f32f45c5744fcfbd6918d Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Thu, 18 Oct 2012 15:53:21 +0200
Subject: [PATCH 0493/1286] Bug 392289 - Placeholder ContainerData

---
 .../src/org/eclipse/e4/tools/emf/ui/internal/Messages.java      | 1 +
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.properties    | 1 +
 .../emf/ui/internal/common/component/PlaceholderEditor.java     | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index c3e7afbf2c..160274ce97 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -234,6 +234,7 @@ public class Messages {
 	public String PlaceholderEditor_Descriptor;
 	public String PlaceholderEditor_Reference;
 	public String PlaceholderEditor_Closeable;
+	public String PlaceholderEditor_ContainerData;
 
 	public String ToolBarEditor_Label;
 	public String ToolBarEditor_Description;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 575bd475d9..57b5902777 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -235,6 +235,7 @@ PlaceholderEditor_Label=Placeholder
 PlaceholderEditor_Descriptor=Placeholder Bla Bla Bla Bla
 PlaceholderEditor_Reference=Reference
 PlaceholderEditor_Closeable=Closeable
+PlaceholderEditor_ContainerData=Container Data
 
 ToolBarEditor_Label=Toolbar
 ToolBarEditor_Description=Toolbar bla bla bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index c320bd4944..12c267c0ed 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -171,7 +171,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-
+		ControlFactory.createTextField(parent, Messages.PlaceholderEditor_ContainerData, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 		// ------------------------------------------------------------
 		{
 			Label l = new Label(parent, SWT.NONE);

From 41ba48e864f4244ca2d40840ae16ef8458b0f100 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Mon, 22 Oct 2012 17:07:51 +0200
Subject: [PATCH 0494/1286] Adds template for creating a @Execute method

---
 .../templates/default-e4templates.xml                      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
index 2f6c540494..025f5b3439 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
@@ -66,4 +66,11 @@ public void preDestroy() {
 ${imp:import(javax.annotation.PreDestroy)}
 </template>
 
+<template name="Execute" description="Creates Execute method" id="org.eclipse.e4.tools.jdt.templates.execute" context="e4-members" enabled="true" autoinsert="false">@Execute
+public void execute() {
+}
+${imp:import(org.eclipse.e4.core.di.annotations.Execute)}
+</template>
+
+
 </templates>

From 21e158d0fed3d601e7c47c9cc22ea1d608f89c60 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Thu, 25 Oct 2012 11:48:29 +0200
Subject: [PATCH 0495/1286] Improves layout for Windows editor

---
 .../component/virtual/VWindowEditor.java      | 89 ++++++++++---------
 1 file changed, 49 insertions(+), 40 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 99eb3d8e45..aa69f16e71 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -120,27 +120,61 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
+		Composite buttonCompTop = new Composite(parent, SWT.NONE);
+		buttonCompTop.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 3, 1));
+		GridLayout gl = new GridLayout(2, false);
+		gl.marginLeft = 0;
+		gl.marginRight = 0;
+		gl.marginWidth = 0;
+		gl.marginHeight = 0;
+		buttonCompTop.setLayout(gl);
+
+		final ComboViewer childrenDropDown = new ComboViewer(buttonCompTop);
+		childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		childrenDropDown.setContentProvider(new ArrayContentProvider());
+		childrenDropDown.setLabelProvider(new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				EClass eclass = (EClass) element;
+				return eclass.getName();
+			}
+		});
+		childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW });
+		childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.TRIMMED_WINDOW));
+
+		Button b = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ModelTooling_Common_AddEllipsis);
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+				handleAdd(eClass);
+			}
+		});
+
 		viewer = new TableViewer(parent);
 		ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
 		viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-		GridData gd = new GridData(GridData.FILL_BOTH);
+		GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 3, 1);
 		viewer.getControl().setLayoutData(gd);
 
-		Composite buttonComp = new Composite(parent, SWT.NONE);
-		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		GridLayout gl = new GridLayout(2, false);
-		gl.marginLeft = 0;
-		gl.marginRight = 0;
-		gl.marginWidth = 0;
-		gl.marginHeight = 0;
-		buttonComp.setLayout(gl);
+		Composite buttonCompBot = new Composite(parent, SWT.NONE);
+		buttonCompBot.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 3, 1));
+		GridLayout gl1 = new GridLayout(3, false);
+		gl1.marginLeft = 0;
+		gl1.marginRight = 0;
+		gl1.marginWidth = 0;
+		gl1.marginHeight = 0;
+		buttonCompBot.setLayout(gl1);
 
-		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
 
 		b.setText(Messages.ModelTooling_Common_Up);
 		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@SuppressWarnings("unchecked")
 			@Override
@@ -163,10 +197,10 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Down);
 		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@SuppressWarnings("unchecked")
 			@Override
@@ -188,35 +222,10 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-		childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		childrenDropDown.setContentProvider(new ArrayContentProvider());
-		childrenDropDown.setLabelProvider(new LabelProvider() {
-			@Override
-			public String getText(Object element) {
-				EClass eclass = (EClass) element;
-				return eclass.getName();
-			}
-		});
-		childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW });
-		childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.TRIMMED_WINDOW));
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_AddEllipsis);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-				handleAdd(eClass);
-			}
-		});
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
+		b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_Remove);
 		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {

From dd9604ed1c77db55916dbf8945e539e6155ed322 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Mon, 29 Oct 2012 21:59:58 +0100
Subject: [PATCH 0496/1286] Bug 391604 - Application model editor is opened
 after project generation

Opening the application model makes more sense than
opening the plugin.xml editor which guides people into
pressing the start button.
---
 .../wizards/project/E4NewProjectWizard.java   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 6cb549b56b..ed3268fe5b 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -9,6 +9,7 @@
  *     Soyatec - initial API and implementation
  *     IBM Corporation - ongoing enhancements
  *     Sopot Cela - ongoing enhancements
+ *     Lars Vogel - ongoing enhancements
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -86,7 +87,12 @@
 import org.eclipse.pde.internal.ui.wizards.plugin.NewPluginProjectWizard;
 import org.eclipse.pde.internal.ui.wizards.plugin.NewProjectCreationOperation;
 import org.eclipse.pde.internal.ui.wizards.plugin.PluginFieldData;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkingSet;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.FileEditorInput;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Version;
 
@@ -95,6 +101,7 @@
  */
 public class E4NewProjectWizard extends NewPluginProjectWizard {
 
+	private static final String MODEL_EDITOR_ID = "org.eclipse.e4.tools.emf.editor3x.e4wbm";
 	private static final String APPLICATION_MODEL = "Application.e4xmi";
 	private PluginFieldData fPluginData;
 	private NewApplicationWizardPage fApplicationPage;
@@ -218,6 +225,10 @@ protected void setPluginLibraries(
 					new NullProgressMonitor());
 			// Add the product sources
 			adjustBuildPropertiesFile(fProjectProvider.getProject());
+			
+			// Open the model editor
+			openEditorForApplicationModel();
+			
 			return true;
 		} catch (InvocationTargetException e) {
 			PDEPlugin.logException(e);
@@ -227,6 +238,18 @@ protected void setPluginLibraries(
 		}
 		return false;
 	}
+
+	private void openEditorForApplicationModel() throws PartInitException {
+		IFile file = fProjectProvider.getProject().getFile(
+				APPLICATION_MODEL);
+		if (file != null) {
+			FileEditorInput input = new FileEditorInput(file);
+			IWorkbenchWindow window = PlatformUI.getWorkbench()
+					.getActiveWorkbenchWindow();
+			IWorkbenchPage page = window.getActivePage();
+			page.openEditor(input, MODEL_EDITOR_ID);
+		}
+	}
 	
 	private void adjustBuildPropertiesFile(IProject project) throws CoreException {
 		IFile file = PDEProject.getBuildProperties(project);

From a5992d9ee9624e57455bbf6c729fe91ec265c0bf Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Tue, 30 Oct 2012 19:09:44 +0100
Subject: [PATCH 0497/1286] Bug 316345 - Applies the changes in PDE  for the e4
 tools copy of the WizardPage

PDE changed the PluginContentPage implementation in
http://git.eclipse.org/c/pde/eclipse.pde.ui.git/commit/?id=fe8c42cffd5d1778fef3dcaba4719fab500c188e
this commit does the same for the e4 tools
---
 .../tools/wizards/project/PluginContentPage.java   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
index 6a1d0e9edb..451f6706b5 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
@@ -267,7 +267,17 @@ public void updateData() {
 	public void setVisible(boolean visible) {
 		if (visible) {
 			fMainPage.updateData();
+			
+			boolean wasGenActivatorEnabled = fGenerateActivator.isEnabled();
 			fGenerateActivator.setEnabled(!fData.isSimple());
+			// if fGenerateActivator is disabled, set selection to false
+			if (!fGenerateActivator.isEnabled()) {
+				fGenerateActivator.setSelection(false);
+			}
+			// if the fGenerateActivator was disabled and is now enabled, then set the selection to true
+			else if (!wasGenActivatorEnabled) {
+				fGenerateActivator.setSelection(true);
+			}
 			fClassLabel.setEnabled(!fData.isSimple() && fGenerateActivator.getSelection());
 			fClassText.setEnabled(!fData.isSimple() && fGenerateActivator.getSelection());
 			boolean wasUIPluginEnabled = fUIPlugin.isEnabled();
@@ -341,7 +351,9 @@ protected void validatePage() {
 	 * @param settings
 	 */
 	public void saveSettings(IDialogSettings settings) {
-		settings.put(S_GENERATE_ACTIVATOR, !fGenerateActivator.getSelection());
+		if (fGenerateActivator.isEnabled()) {
+			settings.put(S_GENERATE_ACTIVATOR, !fGenerateActivator.getSelection());
+		}
 		if (fUIPlugin.isEnabled()) {
 			settings.put(S_UI_PLUGIN, !fUIPlugin.getSelection());
 		}

From ec8568b5fc7efc2f1cf8a00a810d4e276fe9f6d9 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Fri, 2 Nov 2012 10:26:56 +0100
Subject: [PATCH 0498/1286] [Bug 393389] [Tools] Shared elements does not allow
 to add MPartStack

---
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.java   | 1 +
 .../eclipse/e4/tools/emf/ui/internal/Messages.properties | 2 ++
 .../component/virtual/VWindowSharedElementsEditor.java   | 9 ++++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 160274ce97..7439832e3b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -615,4 +615,5 @@ public class Messages {
 	public String ObjectViewer_Script;
 
 	public String CommandWizard_ShellTitle;
+	public String VWindowSharedElementsEditor_AddPartStack;
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 57b5902777..b5c8cd0bb1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -7,6 +7,7 @@
 # *
 # * Contributors:
 # *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+# *		Sopot Cela <sopotcela@gmail.com> - enhancements
 # ******************************************************************************
 ModelTooling_Common_Up=Up
 ModelTooling_Common_Down=Down
@@ -468,6 +469,7 @@ VWindowSharedElementsEditor_Controls=Controls
 VWindowSharedElementsEditor_AddPartSashContainer=Part Sash Container
 VWindowSharedElementsEditor_AddPart=Part
 VWindowSharedElementsEditor_AddInputPart=Input Part
+VWindowSharedElementsEditor_AddPartStack=Part Stack
 
 VWindowTrimEditor_TreeLabel=Window Trims
 VWindowTrimEditor_TreeLabelDescription=Window Trims Bla Bla Bla Bla Bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 32c985f9de..c730ef472a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -85,6 +85,13 @@ public void run() {
 				handleAdd(BasicPackageImpl.Literals.INPUT_PART);
 			}
 		});
+
+		actions.add(new Action(Messages.VWindowSharedElementsEditor_AddPartStack, createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.PART_STACK);
+			}
+		});
 	}
 
 	@Override
@@ -213,7 +220,7 @@ public String getText(Object element) {
 					return eclass.getName();
 				}
 			});
-			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART });
+			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, BasicPackageImpl.Literals.PART_STACK });
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);

From d38b94ed21019d21f569486f3068ef92e10462c9 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Tue, 6 Nov 2012 15:06:33 +0100
Subject: [PATCH 0499/1286] Bug 393150 - Deleting a plug-in project will not
 close the Application.e4xmi

---
 .../internal/wbm/ApplicationModelEditor.java  | 72 ++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index 162f84d57b..0e8b48937f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -7,22 +7,92 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Wim Jongman <wim.jongman@remainsoftware.com> - https://bugs.eclipse.org/bugs/show_bug.cgi?id=393150
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.wbm;
 
+import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.swt.widgets.Composite;
 
 public class ApplicationModelEditor extends ModelEditor {
+
+	private static final String EDITORPROJECT = "org.eclipse.e4.tools.emf.ui.editorproject";
+
+	@Inject
+	MPart part;
+
+	@Inject
+	EPartService partService;
+
+	private Resource resource;
+
+	private IProject project;
+
 	@Inject
-	public ApplicationModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, @Named("org.eclipse.e4.tools.emf.ui.editorproject") @Optional IProject project, IResourcePool resourcePool) {
+	public ApplicationModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, @Named(EDITORPROJECT) @Optional IProject project, IResourcePool resourcePool) {
 		super(composite, context, modelProvider, project, resourcePool);
+		resource = modelProvider.getEditingDomain().getResourceSet().getResources().get(0);
 	}
+
+	@Inject
+	public void addResourceListener(@Named(EDITORPROJECT) @Optional IProject project) {
+		if (project != null) {
+			this.project = project;
+			project.getWorkspace().addResourceChangeListener(listener);
+		}
+	}
+
+	@PreDestroy
+	private void removeResourceListener() {
+		if (project != null) {
+			project.getWorkspace().removeResourceChangeListener(listener);
+		}
+	}
+
+	/**
+	 * Listener changes on the resource being edited. Will close the part if the
+	 * resource was deleted or the containing project was closed.
+	 */
+	private IResourceChangeListener listener = new IResourceChangeListener() {
+		public void resourceChanged(IResourceChangeEvent event) {
+
+			if (event.getType() == IResourceChangeEvent.PRE_CLOSE || event.getType() == IResourceChangeEvent.PRE_DELETE) {
+				if (event.getResource().equals(project)) {
+					hidePart(true);
+				}
+				return;
+			}
+
+			if (resource == null)
+				return;
+
+			IResourceDelta delta = event.getDelta().findMember(new Path(resource.getURI().toPlatformString(false)));
+			if (delta == null) {
+				return;
+			}
+
+			if (delta.getKind() == IResourceDelta.REMOVED) {
+				hidePart(true);
+			}
+		}
+
+		private void hidePart(boolean force) {
+			partService.hidePart(part, force);
+		}
+	};
 }

From cbaf7f47f4fb95e012157a75e21c68aac4327845 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Tue, 6 Nov 2012 15:18:18 +0100
Subject: [PATCH 0500/1286] Bug 391854 - Eclipse 4 RCP Wizard should add
 o.e.e4.ui.workbench.renderers.swt.cocoa to product dependencies

---
 .../org.eclipse.e4.tools/templates/common/$projectName$.product  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product b/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
index 67ca16b768..01daa0619d 100644
--- a/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
+++ b/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
@@ -60,6 +60,7 @@
       <plugin id="org.eclipse.e4.ui.widgets"/>
       <plugin id="org.eclipse.e4.ui.workbench"/>
       <plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
+      <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa"/>
       <plugin id="org.eclipse.e4.ui.workbench.swt"/>
       <plugin id="org.eclipse.e4.ui.workbench3"/>
       <plugin id="org.eclipse.emf.common"/>

From 0db971dd31a0d725c66e1052fc584f3f2bce7e21 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Tue, 6 Nov 2012 16:50:27 +0100
Subject: [PATCH 0501/1286] Bug 393144 - E4 Application wizard does not include
 all artifacts in build.properties

---
 .../wizards/project/E4NewProjectWizard.java      | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index ed3268fe5b..679706b8f3 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -101,12 +101,14 @@
  */
 public class E4NewProjectWizard extends NewPluginProjectWizard {
 
+	private static final String PLUGIN_XML = "plugin.xml";
 	private static final String MODEL_EDITOR_ID = "org.eclipse.e4.tools.emf.editor3x.e4wbm";
 	private static final String APPLICATION_MODEL = "Application.e4xmi";
 	private PluginFieldData fPluginData;
 	private NewApplicationWizardPage fApplicationPage;
 	private IProjectProvider fProjectProvider;
 	private PluginContentPage fContentPage;
+	private boolean isMinimalist;
 
 	public E4NewProjectWizard() {
 		fPluginData = new PluginFieldData();
@@ -257,8 +259,16 @@ private void adjustBuildPropertiesFile(IProject project) throws CoreException {
 			WorkspaceBuildModel model = new WorkspaceBuildModel(file);
 			IBuildEntry e = model.getBuild().getEntry(IBuildEntry.BIN_INCLUDES);
 			
-			e.addToken("plugin.xml");
-			
+			e.addToken(PLUGIN_XML);
+			e.addToken(APPLICATION_MODEL);
+
+			// Event though an icons directory is always created
+			// it seems appropriate to only add it if it contains
+			// some content
+			if (!isMinimalist) {
+				e.addToken("icons/");
+			}
+
 			Map<String, String> map = fApplicationPage.getData();
 			String cssEntry = map.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
 			if( cssEntry != null ) {
@@ -358,7 +368,7 @@ public void createProductsExtension(IProject project) {
 	public void createApplicationResources(IProject project,
 			IProgressMonitor monitor) {
 		Map<String, String> map = fApplicationPage.getData();
-		boolean isMinimalist = !map.get(NewApplicationWizardPage.richSample).equalsIgnoreCase("TRUE");
+		isMinimalist = !map.get(NewApplicationWizardPage.richSample).equalsIgnoreCase("TRUE");
 		if (map == null
 				|| map.get(NewApplicationWizardPage.PRODUCT_NAME) == null)
 			return;

From b4e0fac13eac7e03e2be22f1826c98ace026209d Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@gmail.com>
Date: Fri, 9 Nov 2012 11:28:09 +0100
Subject: [PATCH 0502/1286] Typo correction in method name

---
 .../src/org/eclipse/e4/tools/compat/internal/PartHelper.java    | 2 +-
 .../src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java     | 2 +-
 .../src/org/eclipse/e4/tools/compat/parts/DIViewPart.java       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
index aceae1ebf8..f767bf108a 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
@@ -57,7 +57,7 @@ public static IEclipseContext createPartContext(WorkbenchPart part) throws PartI
 
 	}
 	
-	public static <C> C creatComponent(Composite parent, IEclipseContext context, Class<C> clazz, WorkbenchPart part) {
+	public static <C> C createComponent(Composite parent, IEclipseContext context, Class<C> clazz, WorkbenchPart part) {
 		ISelectionProvider s = new SelectionProviderImpl();
 		context.set(ISelectionProvider.class, s);
 		part.getSite().setSelectionProvider(s);
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index f1f6838d43..5b97049080 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -89,7 +89,7 @@ public void init(IEditorSite site, IEditorInput input)
 	
 	@Override
 	public void createPartControl(Composite parent) {
-		component = PartHelper.creatComponent(parent, context, clazz, this);
+		component = PartHelper.createComponent(parent, context, clazz, this);
 		makeActions();
 	}
 	
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
index 46a29f69af..44d24cc821 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
@@ -42,7 +42,7 @@ public void init(IViewSite site) throws PartInitException {
 	
 	@Override
 	public void createPartControl(Composite parent) {
-		component = PartHelper.creatComponent(parent, context, clazz, this);
+		component = PartHelper.createComponent(parent, context, clazz, this);
 	}
 
 	protected IEclipseContext getContext() {

From c566111932052d0ddab6a7a4a6cb2c7496016960 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Mon, 19 Nov 2012 23:27:31 +0100
Subject: [PATCH 0503/1286] Bug 394247 - Default editor for unknown model
 elements

---
 .../e4/tools/emf/ui/internal/Messages.java    |  2 +
 .../tools/emf/ui/internal/Messages.properties |  2 +
 .../emf/ui/internal/common/ModelEditor.java   |  4 +-
 .../common/component/DefaultEditor.java       | 44 +++++++++++++++++++
 4 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 7439832e3b..c12d38c4d6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -616,4 +616,6 @@ public class Messages {
 
 	public String CommandWizard_ShellTitle;
 	public String VWindowSharedElementsEditor_AddPartStack;
+	public String Special_UnknownElement;
+	public String Special_UnknownElement_Detail;
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index b5c8cd0bb1..aee6827e00 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -617,3 +617,5 @@ ObjectViewer_Script=Execute Script
 
 
 CommandWizard_ShellTitle=Command/Handler wizard
+Special_UnknownElement=(unknown model element)
+Special_UnknownElement_Detail= Use an extension point!
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 698e119b35..9b20b80f73 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -65,6 +65,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CommandEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CommandParameterEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CoreExpressionEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.DefaultEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectMenuItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledMenuItemEditor;
@@ -526,7 +527,6 @@ public void keyReleased(final KeyEvent e) {
 				}
 			}
 		});
-
 		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			public void selectionChanged(SelectionChangedEvent event) {
@@ -1093,6 +1093,8 @@ public AbstractComponentEditor getEditor(EClass eClass) {
 					return editor;
 				}
 			}
+			if (editor == null)
+				editor = ContextInjectionFactory.make(DefaultEditor.class, context);
 		}
 		return editor;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java
new file mode 100644
index 0000000000..2691e269a1
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java
@@ -0,0 +1,44 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class DefaultEditor extends AbstractComponentEditor {
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		// no image
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return element.getClass().getInterfaces()[0].getSimpleName() + " " + Messages.Special_UnknownElement; //$NON-NLS-1$
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return Messages.Special_UnknownElement_Detail;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return null;
+	}
+
+	@Override
+	protected Composite doGetEditor(Composite parent, Object object) {
+		return new Composite(parent, SWT.NONE);
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}

From be4c06af74052a1e5f84e41ec0d9a593fbd053fe Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Wed, 21 Nov 2012 11:42:19 +0100
Subject: [PATCH 0504/1286] Bug 393150 - Application model editor does not
 register a resource listener in live mode

Started in live mode the application model editor can not
register to a resources.
---
 .../internal/wbm/ApplicationModelEditor.java  | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index 0e8b48937f..e5e64ebb83 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -1,5 +1,7 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
+
+
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -26,14 +28,16 @@
 import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.swt.widgets.Composite;
 
 public class ApplicationModelEditor extends ModelEditor {
 
-	private static final String EDITORPROJECT = "org.eclipse.e4.tools.emf.ui.editorproject";
+	private static final String EDITORPROJECT = "org.eclipse.e4.tools.emf.ui.editorproject"; //$NON-NLS-1$
 
 	@Inject
+	@Optional
 	MPart part;
 
 	@Inject
@@ -46,12 +50,15 @@ public class ApplicationModelEditor extends ModelEditor {
 	@Inject
 	public ApplicationModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, @Named(EDITORPROJECT) @Optional IProject project, IResourcePool resourcePool) {
 		super(composite, context, modelProvider, project, resourcePool);
-		resource = modelProvider.getEditingDomain().getResourceSet().getResources().get(0);
+		EList<Resource> resources = modelProvider.getEditingDomain().getResourceSet().getResources();
+		if (!resources.isEmpty()) {
+			resource = resources.get(0);
+		}
 	}
 
 	@Inject
 	public void addResourceListener(@Named(EDITORPROJECT) @Optional IProject project) {
-		if (project != null) {
+		if (project != null && resource != null) {
 			this.project = project;
 			project.getWorkspace().addResourceChangeListener(listener);
 		}
@@ -65,8 +72,8 @@ private void removeResourceListener() {
 	}
 
 	/**
-	 * Listener changes on the resource being edited. Will close the part if the
-	 * resource was deleted or the containing project was closed.
+	 * Listen for changes on the resource being edited. Will close the part if
+	 * the resource was deleted or the containing project was closed.
 	 */
 	private IResourceChangeListener listener = new IResourceChangeListener() {
 		public void resourceChanged(IResourceChangeEvent event) {
@@ -95,4 +102,4 @@ private void hidePart(boolean force) {
 			partService.hidePart(part, force);
 		}
 	};
-}
+}
\ No newline at end of file

From 8ed77c1bc364f4d5c6c97357a529217cd4839bd6 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Wed, 21 Nov 2012 11:59:28 +0100
Subject: [PATCH 0505/1286] Bug 394327 - Tooling should add javax.annotation to
 imported packages

Fixes the issue in which @PostConstruct is not called because OSGi will
use the JRE version in Java7 and also the Eclipse version.
---
 .../wizards/project/E4NewProjectWizard.java   | 502 ++++++++++--------
 1 file changed, 266 insertions(+), 236 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 679706b8f3..e7067fb5b2 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -10,12 +10,14 @@
  *     IBM Corporation - ongoing enhancements
  *     Sopot Cela - ongoing enhancements
  *     Lars Vogel - ongoing enhancements
+ *     Wim Jongman - ongoing enhancements
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -70,11 +72,13 @@
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.core.plugin.IPluginBase;
+import org.eclipse.pde.core.plugin.IMatchRules;
 import org.eclipse.pde.core.plugin.IPluginElement;
 import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginImport;
+import org.eclipse.pde.core.plugin.IPluginModelBase;
+import org.eclipse.pde.core.plugin.IPluginReference;
 import org.eclipse.pde.internal.core.ICoreConstants;
 import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
 import org.eclipse.pde.internal.core.bundle.WorkspaceBundlePluginModel;
@@ -87,6 +91,9 @@
 import org.eclipse.pde.internal.ui.wizards.plugin.NewPluginProjectWizard;
 import org.eclipse.pde.internal.ui.wizards.plugin.NewProjectCreationOperation;
 import org.eclipse.pde.internal.ui.wizards.plugin.PluginFieldData;
+import org.eclipse.pde.ui.IBundleContentWizard;
+import org.eclipse.pde.ui.IFieldData;
+import org.eclipse.pde.ui.templates.PluginReference;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkingSet;
@@ -141,7 +148,8 @@ public IPath getLocationPath() {
 		fContentPage = new PluginContentPage(
 				"page2", fProjectProvider, fMainPage, fPluginData); //$NON-NLS-1$
 
-		fApplicationPage = new NewApplicationWizardPage(fProjectProvider, fPluginData);
+		fApplicationPage = new NewApplicationWizardPage(fProjectProvider,
+				fPluginData);
 
 		addPage(fContentPage);
 		addPage(fApplicationPage);
@@ -157,56 +165,15 @@ public boolean performFinish() {
 				fMainPage.saveSettings(settings);
 				fContentPage.saveSettings(settings);
 			}
+
+			// Create the project
 			getContainer().run(
 					false,
 					true,
 					new NewProjectCreationOperation(fPluginData,
-							fProjectProvider, null) {
+							fProjectProvider, new ContentWizard()) {
 						private WorkspacePluginModelBase model;
 
-						@Override
-						protected void adjustManifests(
-								IProgressMonitor monitor, IProject project,
-								IPluginBase bundle) throws CoreException {
-							super.adjustManifests(monitor, project, bundle);
-							IPluginBase pluginBase = model.getPluginBase();
-							String[] dependencyId = new String[] {
-									"javax.inject",
-									"org.eclipse.core.runtime",
-									"org.eclipse.swt",
-									"org.eclipse.core.databinding",
-									"org.eclipse.core.databinding.beans",
-									"org.eclipse.jface",
-									"org.eclipse.jface.databinding",
-									"org.eclipse.e4.ui.services",
-									"org.eclipse.e4.ui.workbench",
-									"org.eclipse.e4.core.services",
-									"org.eclipse.e4.core.di",
-									"org.eclipse.e4.ui.di",
-									"org.eclipse.e4.core.contexts",
-									"org.eclipse.e4.ui.workbench.swt",
-									"org.eclipse.core.databinding.property",
-									"org.eclipse.e4.ui.css.core",
-									"org.w3c.css.sac",
-									"org.eclipse.e4.core.commands",
-									"org.eclipse.e4.ui.bindings" };
-							for (String id : dependencyId) {
-								Bundle dependency = Platform.getBundle(id);
-
-								IPluginImport iimport = model
-										.getPluginFactory().createImport();
-								iimport.setId(id);
-								if(dependency != null) {
-    								Version version = dependency.getVersion();
-    								String versionString = version.getMajor() + "."
-    										+ version.getMinor() + "."
-    										+ version.getMicro();
-    								iimport.setVersion(versionString);
-								}
-								pluginBase.add(iimport);
-							}
-						}
-
 						@Override
 						protected void setPluginLibraries(
 								WorkspacePluginModelBase model)
@@ -216,6 +183,7 @@ protected void setPluginLibraries(
 						}
 					});
 
+			// Add Project to working set
 			IWorkingSet[] workingSets = fMainPage.getSelectedWorkingSets();
 			if (workingSets.length > 0)
 				getWorkbench().getWorkingSetManager().addToWorkingSets(
@@ -225,12 +193,13 @@ protected void setPluginLibraries(
 
 			this.createApplicationResources(fProjectProvider.getProject(),
 					new NullProgressMonitor());
-			// Add the product sources
+
+			// Add the resources to build.properties
 			adjustBuildPropertiesFile(fProjectProvider.getProject());
-			
+
 			// Open the model editor
 			openEditorForApplicationModel();
-			
+
 			return true;
 		} catch (InvocationTargetException e) {
 			PDEPlugin.logException(e);
@@ -241,9 +210,13 @@ protected void setPluginLibraries(
 		return false;
 	}
 
+	/**
+	 * Opens the model editor after the project was created.
+	 * 
+	 * @throws PartInitException
+	 */
 	private void openEditorForApplicationModel() throws PartInitException {
-		IFile file = fProjectProvider.getProject().getFile(
-				APPLICATION_MODEL);
+		IFile file = fProjectProvider.getProject().getFile(APPLICATION_MODEL);
 		if (file != null) {
 			FileEditorInput input = new FileEditorInput(file);
 			IWorkbenchWindow window = PlatformUI.getWorkbench()
@@ -252,13 +225,20 @@ private void openEditorForApplicationModel() throws PartInitException {
 			page.openEditor(input, MODEL_EDITOR_ID);
 		}
 	}
-	
-	private void adjustBuildPropertiesFile(IProject project) throws CoreException {
+
+	/**
+	 * Adds other resources to the build.properties file.
+	 * 
+	 * @param project
+	 * @throws CoreException
+	 */
+	private void adjustBuildPropertiesFile(IProject project)
+			throws CoreException {
 		IFile file = PDEProject.getBuildProperties(project);
 		if (file.exists()) {
 			WorkspaceBuildModel model = new WorkspaceBuildModel(file);
 			IBuildEntry e = model.getBuild().getEntry(IBuildEntry.BIN_INCLUDES);
-			
+
 			e.addToken(PLUGIN_XML);
 			e.addToken(APPLICATION_MODEL);
 
@@ -270,11 +250,12 @@ private void adjustBuildPropertiesFile(IProject project) throws CoreException {
 			}
 
 			Map<String, String> map = fApplicationPage.getData();
-			String cssEntry = map.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
-			if( cssEntry != null ) {
-				e.addToken(cssEntry);	
+			String cssEntry = map
+					.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
+			if (cssEntry != null) {
+				e.addToken(cssEntry);
 			}
-			
+
 			model.save();
 		}
 	}
@@ -337,8 +318,8 @@ public void createProductsExtension(IProject project) {
 								NewApplicationWizardPage.PRODUCT_NAME)
 								|| entry.getKey().equals(
 										NewApplicationWizardPage.APPLICATION)
-											||entry.getKey().equals(
-													NewApplicationWizardPage.richSample)) {
+								|| entry.getKey().equals(
+										NewApplicationWizardPage.richSample)) {
 							continue;
 						}
 						IPluginElement element = fmodel.getFactory()
@@ -368,12 +349,14 @@ public void createProductsExtension(IProject project) {
 	public void createApplicationResources(IProject project,
 			IProgressMonitor monitor) {
 		Map<String, String> map = fApplicationPage.getData();
-		isMinimalist = !map.get(NewApplicationWizardPage.richSample).equalsIgnoreCase("TRUE");
+		isMinimalist = !map.get(NewApplicationWizardPage.richSample)
+				.equalsIgnoreCase("TRUE");
 		if (map == null
 				|| map.get(NewApplicationWizardPage.PRODUCT_NAME) == null)
 			return;
 
-		// If the project has invalid characters, the plug-in name would replace them with underscores, product name does the same
+		// If the project has invalid characters, the plug-in name would replace
+		// them with underscores, product name does the same
 		String pluginName = map.get(NewApplicationWizardPage.PRODUCT_NAME);
 
 		// If there's no Activator created we create default package
@@ -382,7 +365,7 @@ public void createApplicationResources(IProject project,
 			IPath path = new Path(packageName.replace('.', '/'));
 			if (fPluginData.getSourceFolderName().trim().length() > 0)
 				path = new Path(fPluginData.getSourceFolderName()).append(path);
-			
+
 			try {
 				CoreUtility.createFolder(project.getFolder(path));
 			} catch (CoreException e) {
@@ -422,24 +405,6 @@ public void createApplicationResources(IProject project,
 			}
 		}
 
-		// IFolder folder = project.getFolder("icons");
-		// try {
-		// folder.create(true, true, monitor);
-		// Bundle bundle = Platform
-		// .getBundle("org.eclipse.e4.tools.ui.designer");
-		//
-		// for (String fileName : new String[] { "sample.gif", "save_edit.gif"
-		// }) {
-		// URL sampleUrl = bundle.getEntry("resources/icons/" + fileName);
-		// sampleUrl = FileLocator.resolve(sampleUrl);
-		// InputStream inputStream = sampleUrl.openStream();
-		// IFile file = folder.getFile(fileName);
-		// file.create(inputStream, true, monitor);
-		// }
-		// } catch (Exception e) {
-		// PDEPlugin.logException(e);
-		// }
-
 		String template_id = "common";
 		Set<String> binaryExtentions = new HashSet<String>();
 		binaryExtentions.add(".gif");
@@ -448,35 +413,45 @@ public void createApplicationResources(IProject project,
 		Map<String, String> keys = new HashMap<String, String>();
 		keys.put("projectName", pluginName);
 		String elementName = fragment.getElementName();
-		keys.put("packageName", (elementName.equals("")?"": elementName + ".")+"handlers");
-		keys.put("packageName2", (elementName.equals("")?"": elementName + ".")+"parts");
-		keys.put("programArgs", "true".equalsIgnoreCase(map.get(NewApplicationWizardPage.CLEAR_PERSISTED_STATE))?"-clearPersistedState":"" );
+		keys.put("packageName", (elementName.equals("") ? "" : elementName
+				+ ".")
+				+ "handlers");
+		keys.put("packageName2", (elementName.equals("") ? "" : elementName
+				+ ".")
+				+ "parts");
+		keys.put(
+				"programArgs",
+				"true".equalsIgnoreCase(map
+						.get(NewApplicationWizardPage.CLEAR_PERSISTED_STATE)) ? "-clearPersistedState"
+						: "");
 		try {
 			URL corePath = ResourceLocator.getProjectTemplateFiles(template_id);
 			IRunnableWithProgress op = new TemplateOperation(corePath, project,
-					keys, binaryExtentions,isMinimalist);
-			getContainer().run(false, true, op);
-		} catch (Exception e) {
-			PDEPlugin.logException(e);
-		}
-		if (!isMinimalist)
-		{
-		try {
-			URL corePath = ResourceLocator.getProjectTemplateFiles("src");
-			IRunnableWithProgress op = new TemplateOperation(corePath,
-					(IContainer) fragment.getResource(), keys, binaryExtentions, isMinimalist);
+					keys, binaryExtentions, isMinimalist);
 			getContainer().run(false, true, op);
 		} catch (Exception e) {
 			PDEPlugin.logException(e);
 		}
+		if (!isMinimalist) {
+			try {
+				URL corePath = ResourceLocator.getProjectTemplateFiles("src");
+				IRunnableWithProgress op = new TemplateOperation(corePath,
+						(IContainer) fragment.getResource(), keys,
+						binaryExtentions, isMinimalist);
+				getContainer().run(false, true, op);
+			} catch (Exception e) {
+				PDEPlugin.logException(e);
+			}
 		}
 	}
 
 	private void createApplicationModel(IProject project, String pluginName,
 			IPackageFragment fragment) {
 		Map<String, String> map = fApplicationPage.getData();
-		boolean isMinimalist = !map.get(NewApplicationWizardPage.richSample).equalsIgnoreCase("TRUE");
+		boolean isMinimalist = !map.get(NewApplicationWizardPage.richSample)
+				.equalsIgnoreCase("TRUE");
 		if (APPLICATION_MODEL != null && APPLICATION_MODEL.trim().length() > 0) {
+
 			// Create a resource set
 			//
 			ResourceSet resourceSet = new ResourceSetImpl();
@@ -527,155 +502,155 @@ private void createApplicationModel(IProject project, String pluginName,
 			MTrimmedWindow mainWindow = MBasicFactory.INSTANCE
 					.createTrimmedWindow();
 			application.getChildren().add(mainWindow);
-				mainWindow.setLabel(pluginName);
-				mainWindow.setWidth(500);
-				mainWindow.setHeight(400);
-				resource.getContents().add((EObject) application);
-				if (!isMinimalist){
-					MBindingContext rootContext = MCommandsFactory.INSTANCE
-							.createBindingContext();
-					rootContext.setElementId("org.eclipse.ui.contexts.dialogAndWindow");
-					rootContext.setName("In Dialog and Windows");
-
-					MBindingContext childContext = MCommandsFactory.INSTANCE
-							.createBindingContext();
-					childContext.setElementId("org.eclipse.ui.contexts.window");
-					childContext.setName("In Windows");
-					rootContext.getChildren().add(childContext);
-
-					childContext = MCommandsFactory.INSTANCE.createBindingContext();
-					childContext.setElementId("org.eclipse.ui.contexts.dialog");
-					childContext.setName("In Dialogs");
-					rootContext.getChildren().add(childContext);
-
-					application.getRootContext().add(rootContext);
-					application.getBindingContexts().add(rootContext);
-
-
-
-					// Create Quit command
-					MCommand quitCommand = createCommand("org.eclipse.ui.file.exit",
-							"quitCommand", "QuitHandler",
-							"M1+Q", pluginName, fragment, application);
-
-					MCommand openCommand = createCommand(pluginName + ".open",
-							"openCommand", "OpenHandler",
-							"M1+O", pluginName, fragment, application);
-
-					MCommand saveCommand = createCommand("org.eclipse.ui.file.save",
-							"saveCommand", "SaveHandler",
-							"M1+S", pluginName, fragment, application);
-
-					MCommand aboutCommand = createCommand(
-							"org.eclipse.ui.help.aboutAction", "aboutCommand",
-							"AboutHandler", "M1+A", pluginName, fragment,
-							application);
-
-					MMenu menu = MMenuFactory.INSTANCE.createMenu();
-					mainWindow.setMainMenu(menu);
-					menu.setElementId("menu:org.eclipse.ui.main.menu");
-
-					MMenu fileMenuItem = MMenuFactory.INSTANCE.createMenu();
-					menu.getChildren().add(fileMenuItem);
-					fileMenuItem.setLabel("File");
-					{
-						MHandledMenuItem menuItemOpen = MMenuFactory.INSTANCE
-								.createHandledMenuItem();
-						fileMenuItem.getChildren().add(menuItemOpen);
-						menuItemOpen.setLabel("Open");
-						menuItemOpen.setIconURI("platform:/plugin/"
-								+ pluginName + "/icons/sample.gif");
-						menuItemOpen.setCommand(openCommand);
-
-						MHandledMenuItem menuItemSave = MMenuFactory.INSTANCE
-								.createHandledMenuItem();
-						fileMenuItem.getChildren().add(menuItemSave);
-						menuItemSave.setLabel("Save");
-						menuItemSave.setIconURI("platform:/plugin/"
-								+ pluginName + "/icons/save_edit.gif");
-						menuItemSave.setCommand(saveCommand);
-
-						MHandledMenuItem menuItemQuit = MMenuFactory.INSTANCE
-								.createHandledMenuItem();
-						fileMenuItem.getChildren().add(menuItemQuit);
-						menuItemQuit.setLabel("Quit");
-						menuItemQuit.setCommand(quitCommand);
-					}
-					MMenu helpMenuItem = MMenuFactory.INSTANCE.createMenu();
-					menu.getChildren().add(helpMenuItem);
-					helpMenuItem.setLabel("Help");
-					{
-						MHandledMenuItem menuItemAbout = MMenuFactory.INSTANCE
-								.createHandledMenuItem();
-						helpMenuItem.getChildren().add(menuItemAbout);
-						menuItemAbout.setLabel("About");
-						menuItemAbout.setCommand(aboutCommand);
-					}
-
-					// PerspectiveStack
-					MPerspectiveStack perspectiveStack = MAdvancedFactory.INSTANCE
-							.createPerspectiveStack();
-					mainWindow.getChildren().add(perspectiveStack);
-
-					MPerspective perspective = MAdvancedFactory.INSTANCE
-							.createPerspective();
-					perspectiveStack.getChildren().add(perspective);
-					{
-						// Part Container
-						MPartSashContainer partSashContainer = MBasicFactory.INSTANCE
-								.createPartSashContainer();
-						perspective.getChildren().add(partSashContainer);
-
-						MPartStack partStack = MBasicFactory.INSTANCE
-								.createPartStack();
-						partSashContainer.getChildren().add(partStack);
-
-						MPart part = MBasicFactory.INSTANCE.createPart();
-						partStack.getChildren().add(part);
-						part.setLabel("Sample Part");
-						part.setContributionURI("bundleclass://"+pluginName+"/"+fragment.getElementName()+".parts"+".SamplePart");
+			mainWindow.setLabel(pluginName);
+			mainWindow.setWidth(500);
+			mainWindow.setHeight(400);
+			resource.getContents().add((EObject) application);
+			if (!isMinimalist) {
+				MBindingContext rootContext = MCommandsFactory.INSTANCE
+						.createBindingContext();
+				rootContext
+						.setElementId("org.eclipse.ui.contexts.dialogAndWindow");
+				rootContext.setName("In Dialog and Windows");
+
+				MBindingContext childContext = MCommandsFactory.INSTANCE
+						.createBindingContext();
+				childContext.setElementId("org.eclipse.ui.contexts.window");
+				childContext.setName("In Windows");
+				rootContext.getChildren().add(childContext);
+
+				childContext = MCommandsFactory.INSTANCE.createBindingContext();
+				childContext.setElementId("org.eclipse.ui.contexts.dialog");
+				childContext.setName("In Dialogs");
+				rootContext.getChildren().add(childContext);
+
+				application.getRootContext().add(rootContext);
+				application.getBindingContexts().add(rootContext);
+
+				// Create Quit command
+				MCommand quitCommand = createCommand(
+						"org.eclipse.ui.file.exit", "quitCommand",
+						"QuitHandler", "M1+Q", pluginName, fragment,
+						application);
+
+				MCommand openCommand = createCommand(pluginName + ".open",
+						"openCommand", "OpenHandler", "M1+O", pluginName,
+						fragment, application);
+
+				MCommand saveCommand = createCommand(
+						"org.eclipse.ui.file.save", "saveCommand",
+						"SaveHandler", "M1+S", pluginName, fragment,
+						application);
+
+				MCommand aboutCommand = createCommand(
+						"org.eclipse.ui.help.aboutAction", "aboutCommand",
+						"AboutHandler", "M1+A", pluginName, fragment,
+						application);
+
+				MMenu menu = MMenuFactory.INSTANCE.createMenu();
+				mainWindow.setMainMenu(menu);
+				menu.setElementId("menu:org.eclipse.ui.main.menu");
+
+				MMenu fileMenuItem = MMenuFactory.INSTANCE.createMenu();
+				menu.getChildren().add(fileMenuItem);
+				fileMenuItem.setLabel("File");
+				{
+					MHandledMenuItem menuItemOpen = MMenuFactory.INSTANCE
+							.createHandledMenuItem();
+					fileMenuItem.getChildren().add(menuItemOpen);
+					menuItemOpen.setLabel("Open");
+					menuItemOpen.setIconURI("platform:/plugin/" + pluginName
+							+ "/icons/sample.gif");
+					menuItemOpen.setCommand(openCommand);
+
+					MHandledMenuItem menuItemSave = MMenuFactory.INSTANCE
+							.createHandledMenuItem();
+					fileMenuItem.getChildren().add(menuItemSave);
+					menuItemSave.setLabel("Save");
+					menuItemSave.setIconURI("platform:/plugin/" + pluginName
+							+ "/icons/save_edit.gif");
+					menuItemSave.setCommand(saveCommand);
+
+					MHandledMenuItem menuItemQuit = MMenuFactory.INSTANCE
+							.createHandledMenuItem();
+					fileMenuItem.getChildren().add(menuItemQuit);
+					menuItemQuit.setLabel("Quit");
+					menuItemQuit.setCommand(quitCommand);
+				}
+				MMenu helpMenuItem = MMenuFactory.INSTANCE.createMenu();
+				menu.getChildren().add(helpMenuItem);
+				helpMenuItem.setLabel("Help");
+				{
+					MHandledMenuItem menuItemAbout = MMenuFactory.INSTANCE
+							.createHandledMenuItem();
+					helpMenuItem.getChildren().add(menuItemAbout);
+					menuItemAbout.setLabel("About");
+					menuItemAbout.setCommand(aboutCommand);
+				}
 
-					}
+				// PerspectiveStack
+				MPerspectiveStack perspectiveStack = MAdvancedFactory.INSTANCE
+						.createPerspectiveStack();
+				mainWindow.getChildren().add(perspectiveStack);
+
+				MPerspective perspective = MAdvancedFactory.INSTANCE
+						.createPerspective();
+				perspectiveStack.getChildren().add(perspective);
+				{
+					// Part Container
+					MPartSashContainer partSashContainer = MBasicFactory.INSTANCE
+							.createPartSashContainer();
+					perspective.getChildren().add(partSashContainer);
+
+					MPartStack partStack = MBasicFactory.INSTANCE
+							.createPartStack();
+					partSashContainer.getChildren().add(partStack);
+
+					MPart part = MBasicFactory.INSTANCE.createPart();
+					partStack.getChildren().add(part);
+					part.setLabel("Sample Part");
+					part.setContributionURI("bundleclass://" + pluginName + "/"
+							+ fragment.getElementName() + ".parts"
+							+ ".SamplePart");
 
-					// WindowTrim
-					MTrimBar trimBar = MBasicFactory.INSTANCE
-							.createTrimBar();
-					mainWindow.getTrimBars().add(trimBar);
-
-					MToolBar toolBar = MMenuFactory.INSTANCE
-							.createToolBar();
-					toolBar.setElementId("toolbar:org.eclipse.ui.main.toolbar");
-					trimBar.getChildren().add(toolBar);
-
-					MHandledToolItem toolItemOpen = MMenuFactory.INSTANCE
-							.createHandledToolItem();
-					toolBar.getChildren().add(toolItemOpen);
-					toolItemOpen.setIconURI("platform:/plugin/"
-							+ pluginName + "/icons/sample.gif");
-					toolItemOpen.setCommand(openCommand);
-
-					MHandledToolItem toolItemSave = MMenuFactory.INSTANCE
-							.createHandledToolItem();
-					toolBar.getChildren().add(toolItemSave);
-					toolItemSave.setIconURI("platform:/plugin/"
-							+ pluginName + "/icons/save_edit.gif");
-					toolItemSave.setCommand(saveCommand);
 				}
+
+				// WindowTrim
+				MTrimBar trimBar = MBasicFactory.INSTANCE.createTrimBar();
+				mainWindow.getTrimBars().add(trimBar);
+
+				MToolBar toolBar = MMenuFactory.INSTANCE.createToolBar();
+				toolBar.setElementId("toolbar:org.eclipse.ui.main.toolbar");
+				trimBar.getChildren().add(toolBar);
+
+				MHandledToolItem toolItemOpen = MMenuFactory.INSTANCE
+						.createHandledToolItem();
+				toolBar.getChildren().add(toolItemOpen);
+				toolItemOpen.setIconURI("platform:/plugin/" + pluginName
+						+ "/icons/sample.gif");
+				toolItemOpen.setCommand(openCommand);
+
+				MHandledToolItem toolItemSave = MMenuFactory.INSTANCE
+						.createHandledToolItem();
+				toolBar.getChildren().add(toolItemSave);
+				toolItemSave.setIconURI("platform:/plugin/" + pluginName
+						+ "/icons/save_edit.gif");
+				toolItemSave.setCommand(saveCommand);
+			}
 			Map<Object, Object> options = new HashMap<Object, Object>();
 			options.put(XMLResource.OPTION_ENCODING, "UTF-8");
 			try {
 				resource.save(options);
 			} catch (IOException e) {
 				PDEPlugin.logException(e);
-		
+
 			}
 		}
 	}
 
 	private MCommand createCommand(String commandId, String name,
-			String className,
-			String keyBinding, String projectName, IPackageFragment fragment,
-			MApplication application) {
+			String className, String keyBinding, String projectName,
+			IPackageFragment fragment, MApplication application) {
 		MCommand command = MCommandsFactory.INSTANCE.createCommand();
 		command.setCommandName(name);
 		command.setElementId(commandId);
@@ -685,9 +660,9 @@ private MCommand createCommand(String commandId, String name,
 			MHandler quitHandler = MCommandsFactory.INSTANCE.createHandler();
 			quitHandler.setCommand(command);
 			String elementName = fragment.getElementName();
-			quitHandler.setContributionURI("bundleclass://" + projectName
-					+ "/" + (elementName.equals("")?"": elementName + ".")+"handlers."
-					+ className);
+			quitHandler.setContributionURI("bundleclass://" + projectName + "/"
+					+ (elementName.equals("") ? "" : elementName + ".")
+					+ "handlers." + className);
 			application.getHandlers().add(quitHandler);
 
 			MKeyBinding binding = MCommandsFactory.INSTANCE.createKeyBinding();
@@ -735,4 +710,59 @@ public String getPluginId() {
 	public String getPluginVersion() {
 		return fPluginData.getVersion();
 	}
-}
+
+	private class ContentWizard extends Wizard implements IBundleContentWizard {
+
+		String[] dependencies = new String[] { "javax.inject",
+				"org.eclipse.core.runtime", "org.eclipse.swt",
+				"org.eclipse.core.databinding",
+				"org.eclipse.core.databinding.beans", "org.eclipse.jface",
+				"org.eclipse.jface.databinding", "org.eclipse.e4.ui.services",
+				"org.eclipse.e4.ui.workbench", "org.eclipse.e4.core.services",
+				"org.eclipse.e4.core.di", "org.eclipse.e4.ui.di",
+				"org.eclipse.e4.core.contexts",
+				"org.eclipse.e4.ui.workbench.swt",
+				"org.eclipse.core.databinding.property",
+				"org.eclipse.e4.ui.css.core", "org.w3c.css.sac",
+				"org.eclipse.e4.core.commands", "org.eclipse.e4.ui.bindings" };
+
+		public void init(IFieldData data) {
+		}
+
+		public IPluginReference[] getDependencies(String schemaVersion) {
+			ArrayList<IPluginReference> result = new ArrayList<IPluginReference>(
+					dependencies.length);
+			for (String dependency : dependencies) {
+				Bundle bundle = Platform.getBundle(dependency);
+				String versionString = "0.0.0";
+				if (dependency != null) {
+					Version version = bundle.getVersion();
+					versionString = version.getMajor() + "."
+							+ version.getMinor() + "." + version.getMicro();
+				}
+				result.add(new PluginReference(dependency, versionString,
+						IMatchRules.GREATER_OR_EQUAL));
+			}
+			return result.toArray(new IPluginReference[0]);
+		}
+
+		public String[] getNewFiles() {
+			return new String[0];
+		}
+
+		public boolean performFinish(IProject project, IPluginModelBase model,
+				IProgressMonitor monitor) {
+			return true;
+		}
+
+		public String[] getImportPackages() {
+			return new String[] { "javax.annotation;version=\"1.0.0\"" };
+		}
+
+		@Override
+		public boolean performFinish() {
+			return true;
+		}
+
+	}
+}
\ No newline at end of file

From 08ed5b5b00053fc69af3fce050a5a0dbb0a2b26f Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Wed, 21 Nov 2012 22:31:38 +0100
Subject: [PATCH 0506/1286] Bug 394757 - [tooling] Placeholders Find-Button on
 shows MPart instances but not MArea, MSashContainer, MPartStack

---
 .../common/component/dialogs/SharedElementsDialog.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index dd9c7af57b..3c8d145c08 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -22,10 +22,12 @@
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.fragment.MModelFragment;
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
@@ -148,7 +150,7 @@ protected void okPressed() {
 	private static <T> List<T> filter(List<T> o) {
 		List<T> rv = new ArrayList<T>();
 		for (T i : o) {
-			if (i instanceof MPart || i instanceof MPartSashContainer) {
+			if (i instanceof MPart || i instanceof MPartSashContainer || i instanceof MArea || i instanceof MPartStack) {
 				rv.add(i);
 			}
 		}

From cc55235c45963a2e26414624132bef58c38e5084 Mon Sep 17 00:00:00 2001
From: Jonas Helming <jonas.helming@googlemail.com>
Date: Wed, 21 Nov 2012 22:57:04 +0100
Subject: [PATCH 0507/1286] Bug 394347 - Dialog to select parent element for a
 fragment does not update correctly

---
 .../emf/editor3x/TargetElementProviders.java  |  1 +
 .../FindParentReferenceElementDialog.java     | 44 +++++++++++++------
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
index 62a37da562..66645ee732 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
@@ -118,6 +118,7 @@ private void applyFilter(Filter filter, ModelResultHandler handler) {
 	}
 
 	public void clearCache() {
+		if (resourceSet==null) return;
 		for (Resource r : resourceSet.getResources()) {
 			r.unload();
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index 9c0df83089..04eabeb63c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -35,8 +35,10 @@
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.TableViewer;
@@ -69,6 +71,10 @@ public class FindParentReferenceElementDialog extends TitleAreaDialog {
 	private AbstractComponentEditor editor;
 	private TableViewer viewer;
 	private Messages Messages;
+	private ModelResultHandlerImpl currentResultHandler;
+	private WritableList list;
+	private ComboViewer eClassViewer;
+	private Text searchText;
 
 	public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEditor editor, MStringModelFragment fragment, Messages Messages) {
 		super(parentShell);
@@ -101,7 +107,7 @@ public void widgetDisposed(DisposeEvent e) {
 		Label l = new Label(container, SWT.NONE);
 		l.setText(Messages.FindParentReferenceElementDialog_ContainerType);
 
-		final ComboViewer eClassViewer = new ComboViewer(container);
+		eClassViewer = new ComboViewer(container);
 		eClassViewer.setLabelProvider(new LabelProvider() {
 			@Override
 			public String getText(Object element) {
@@ -124,11 +130,18 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 		eClassViewer.setInput(eClassList);
 		eClassViewer.getCombo().select(0);
 		eClassViewer.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		eClassViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+
+			public void selectionChanged(SelectionChangedEvent event) {
+				updateSearch();
+
+			}
+		});
 
 		l = new Label(container, SWT.NONE);
 		l.setText(Messages.FindParentReferenceElementDialog_Search);
 
-		final Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		searchText.setLayoutData(gd);
 
@@ -166,24 +179,15 @@ public void doubleClick(DoubleClickEvent event) {
 			}
 		});
 
-		final WritableList list = new WritableList();
+		list = new WritableList();
 		viewer.setInput(list);
 
 		final ClassContributionCollector collector = getCollector();
 
 		searchText.addModifyListener(new ModifyListener() {
-			private ModelResultHandlerImpl currentResultHandler;
 
 			public void modifyText(ModifyEvent e) {
-				if (currentResultHandler != null) {
-					currentResultHandler.cancled = true;
-				}
-				list.clear();
-
-				Filter filter = new Filter((EClass) ((IStructuredSelection) eClassViewer.getSelection()).getFirstElement(), searchText.getText());
-
-				currentResultHandler = new ModelResultHandlerImpl(list, filter, editor, ((EObject) fragment).eResource());
-				collector.findModelElements(filter, currentResultHandler);
+				updateSearch();
 			}
 		});
 
@@ -196,10 +200,22 @@ public void widgetSelected(SelectionEvent e) {
 				collector.clearModelCache();
 			}
 		});
-
 		return comp;
 	}
 
+	protected void updateSearch() {
+		if (currentResultHandler != null) {
+			currentResultHandler.cancled = true;
+		}
+		list.clear();
+
+		Filter filter = new Filter((EClass) ((IStructuredSelection) eClassViewer.getSelection()).getFirstElement(), searchText.getText());
+
+		currentResultHandler = new ModelResultHandlerImpl(list, filter, editor, ((EObject) fragment).eResource());
+		getCollector().findModelElements(filter, currentResultHandler);
+
+	}
+
 	@Override
 	protected void okPressed() {
 		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();

From ab7cd2c284a14287dea8341665d8fce58f0c50f0 Mon Sep 17 00:00:00 2001
From: Jonas Helming <jonas.helming@googlemail.com>
Date: Wed, 21 Nov 2012 23:06:09 +0100
Subject: [PATCH 0508/1286] Bug 394345 - Fragment Editor does not allow to
 create a fragment in the tree using right click

---
 .../e4/tools/emf/ui/internal/Messages.java    |  1 +
 .../tools/emf/ui/internal/Messages.properties |  1 +
 .../virtual/VModelFragmentsEditor.java        | 40 +++++++++++++++----
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index c12d38c4d6..cc5005b967 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -424,6 +424,7 @@ public class Messages {
 	public String VModelFragmentsEditor_TreeLabel;
 	public String VModelFragmentsEditor_TreeLabelDescription;
 	public String VModelFragmentsEditor_Fragments;
+	public String VModelFragmentsEditor_AddFragment;
 
 	public String VModelImportsEditor_TreeLabel;
 	public String VModelImportsEditor_TreeLabelDescription;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index aee6827e00..8068a96b66 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -425,6 +425,7 @@ VMenuEditor_AddPopupMenuContribution=Popup Menu
 VModelFragmentsEditor_TreeLabel=Fragments
 VModelFragmentsEditor_TreeLabelDescription=Fragments Bla Bla Bla Bla Bla
 VModelFragmentsEditor_Fragments=Fragments
+VModelFragmentsEditor_AddFragment=Model Fragment
 
 VModelImportsEditor_TreeLabel=Imports
 VModelImportsEditor_TreeLabelDescription=Imports Bla Bla Bla Bla Bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index 723342daf2..516e7f2d05 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -10,7 +10,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -27,6 +29,7 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -47,12 +50,23 @@ public class VModelFragmentsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
+	private List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	public VModelFragmentsEditor() {
 		super();
 	}
 
+	@PostConstruct
+	void init() {
+		actions.add(new Action(Messages.VModelFragmentsEditor_AddFragment, createImageDescriptor(ResourceProvider.IMG_ModelFragments)) {
+			@Override
+			public void run() {
+				handleAdd();
+			}
+		});
+	}
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		return null;
@@ -174,15 +188,10 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 
-					MStringModelFragment eObject = MFragmentFactory.INSTANCE.createStringModelFragment();
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, eObject);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(eObject);
-					}
+					handleAdd();
 
 				}
+
 			});
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
@@ -214,4 +223,21 @@ public IObservableList getChildList(Object element) {
 		return null;
 	}
 
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
+
+	private void handleAdd() {
+		MStringModelFragment eObject = MFragmentFactory.INSTANCE.createStringModelFragment();
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(eObject);
+		}
+	}
+
 }
\ No newline at end of file

From 6893beb17c17fc843d7971dd6a606310fcd3219c Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Thu, 22 Nov 2012 00:18:21 +0100
Subject: [PATCH 0509/1286] Bug 394446 - e4xmi editor cannot create "Area"
 element in "Shared Elements"

---
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.java |  1 +
 .../e4/tools/emf/ui/internal/Messages.properties       |  1 +
 .../component/virtual/VWindowSharedElementsEditor.java | 10 +++++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index cc5005b967..206ca12035 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -619,4 +619,5 @@ public class Messages {
 	public String VWindowSharedElementsEditor_AddPartStack;
 	public String Special_UnknownElement;
 	public String Special_UnknownElement_Detail;
+	public String VWindowSharedElementsEditor_Area;
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 8068a96b66..9bb590a1b3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -620,3 +620,4 @@ ObjectViewer_Script=Execute Script
 CommandWizard_ShellTitle=Command/Handler wizard
 Special_UnknownElement=(unknown model element)
 Special_UnknownElement_Detail= Use an extension point!
+VWindowSharedElementsEditor_Area=Area
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index c730ef472a..bc3783732b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -21,6 +21,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -92,6 +93,13 @@ public void run() {
 				handleAdd(BasicPackageImpl.Literals.PART_STACK);
 			}
 		});
+
+		actions.add(new Action(Messages.VWindowSharedElementsEditor_Area, createImageDescriptor(ResourceProvider.IMG_Area)) {
+			@Override
+			public void run() {
+				handleAdd(AdvancedPackageImpl.Literals.AREA);
+			}
+		});
 	}
 
 	@Override
@@ -220,7 +228,7 @@ public String getText(Object element) {
 					return eclass.getName();
 				}
 			});
-			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, BasicPackageImpl.Literals.PART_STACK });
+			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, BasicPackageImpl.Literals.PART_STACK, AdvancedPackageImpl.Literals.AREA });
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);

From 7ddcb02f119083e499f0b6ec3bfd5774fde4f83b Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 22 Nov 2012 18:12:37 -0500
Subject: [PATCH 0510/1286] Bug 384500 - [ModelEditor] "Default" tab should be
 automatically selected after creating a new Import

---
 .../e4/tools/emf/ui/internal/common/component/AddonsEditor.java | 1 +
 .../e4/tools/emf/ui/internal/common/component/AreaEditor.java   | 1 +
 .../emf/ui/internal/common/component/BindingContextEditor.java  | 1 +
 .../emf/ui/internal/common/component/BindingTableEditor.java    | 1 +
 .../tools/emf/ui/internal/common/component/CategoryEditor.java  | 2 +-
 .../tools/emf/ui/internal/common/component/CommandEditor.java   | 2 +-
 .../ui/internal/common/component/CommandParameterEditor.java    | 1 +
 .../tools/emf/ui/internal/common/component/HandlerEditor.java   | 1 +
 .../emf/ui/internal/common/component/KeyBindingEditor.java      | 1 +
 .../ui/internal/common/component/MenuContributionEditor.java    | 1 +
 .../e4/tools/emf/ui/internal/common/component/MenuEditor.java   | 1 +
 .../tools/emf/ui/internal/common/component/MenuItemEditor.java  | 1 +
 .../emf/ui/internal/common/component/MenuSeparatorEditor.java   | 1 +
 .../tools/emf/ui/internal/common/component/ParameterEditor.java | 1 +
 .../emf/ui/internal/common/component/PartDescriptorEditor.java  | 1 +
 .../e4/tools/emf/ui/internal/common/component/PartEditor.java   | 1 +
 .../ui/internal/common/component/PartSashContainerEditor.java   | 1 +
 .../tools/emf/ui/internal/common/component/PartStackEditor.java | 1 +
 .../emf/ui/internal/common/component/PerspectiveEditor.java     | 1 +
 .../ui/internal/common/component/PerspectiveStackEditor.java    | 1 +
 .../emf/ui/internal/common/component/PlaceholderEditor.java     | 1 +
 .../ui/internal/common/component/ToolBarContributionEditor.java | 1 +
 .../tools/emf/ui/internal/common/component/ToolBarEditor.java   | 1 +
 .../ui/internal/common/component/ToolBarSeparatorEditor.java    | 1 +
 .../emf/ui/internal/common/component/ToolControlEditor.java     | 1 +
 .../tools/emf/ui/internal/common/component/ToolItemEditor.java  | 1 +
 .../tools/emf/ui/internal/common/component/TrimBarEditor.java   | 1 +
 .../ui/internal/common/component/TrimContributionEditor.java    | 1 +
 .../e4/tools/emf/ui/internal/common/component/WindowEditor.java | 1 +
 29 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index ed553dc500..beb24deb43 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -139,6 +139,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		if (getEditor().isModelFragment() && isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index ed5f975d84..f8a6aff910 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -220,6 +220,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 8e0be72fd1..10b5d11476 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -162,6 +162,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 14c724f16e..2d03f37166 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -150,6 +150,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index a873bb7315..31ddc93de4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -113,7 +113,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index d3e2f478b7..84538ceb1e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -148,7 +148,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
-
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index af385b064f..e7c1fc3a86 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -124,6 +124,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 462394b998..6ce9fa4e1a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -138,6 +138,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 484d0bf670..88532de697 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -160,6 +160,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index b5787d78e8..e0e8e86f8d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -162,6 +162,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 52966e1abf..5b3631fe05 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -231,6 +231,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 0ebae9700e..6ce12a90fe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -166,6 +166,7 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 7be3e9565a..8b62447652 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -122,6 +122,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index ca4dff692b..c5009a30a5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -120,6 +120,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index e4a519c7db..3d3f9d42bb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -148,6 +148,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 45475eac95..6b455aef30 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -171,6 +171,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 92e22ea745..f973855b48 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -213,6 +213,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index af9833cb3c..45b4aafe70 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -182,6 +182,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 05f98064bc..0ebf886fee 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -208,6 +208,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 72c4cebe24..701b8e2840 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -168,6 +168,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 12c267c0ed..0b342f6514 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -166,6 +166,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 76e2100f95..8798078205 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -171,6 +171,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index bcdbefba5f..8b77e1f39c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -191,6 +191,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 6c3b174cc6..88fb6a5382 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -133,6 +133,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 5db75c2f04..d25147beb8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -143,6 +143,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index a66f05b012..a582674bd3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -143,6 +143,7 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index beea4c88f6..581610bf09 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -183,6 +183,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 89381775aa..ab9254ff31 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -158,6 +158,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 8e8c6987bc..952f6db187 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -181,6 +181,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
 			return folder;
 		}
 

From 7da9a5e900cb542d018425e81b861fb911adc9f8 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 22 Nov 2012 18:34:17 -0500
Subject: [PATCH 0511/1286] Back out mistaken CSS-Spy related changes in
 previous commit


From b5fea5ac285ed58d344e16553a8d595cc6534e9f Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 22 Nov 2012 18:44:11 -0500
Subject: [PATCH 0512/1286] Bug 394948 - Change CSS Spy & Scratchpad
 keybindings away from F4

  * Change the CSS Spy to be invoked on Shift-Alt-F5.
    (Windows ignores Shift on Shift-Alt-F4 and closes the window.)
  * Change the CSS Scratchpad to be invoked on Shift-Alt-F6.
    (Linux ignores Shift on Ctrl-Shift-Alt-F4 and switches VTs.)

From 66c7eae9fbf59e6a026ddd57ba4ae54e4df4e071 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 22 Nov 2012 18:49:26 -0500
Subject: [PATCH 0513/1286] Bug 394949 - [CSS Spy] Using keyboard to change
 highlighted widget results in focus-change

Ensure the highlighting shell is made NO_FOCUS and ON_TOP.

From e2dfdf40dcd5a8df5a1f9f7370938dbbda1db627 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Fri, 23 Nov 2012 08:27:46 -0500
Subject: [PATCH 0514/1286] Bug 394948 - Change CSS Spy & Scratchpad
 keybindings away from F4

Replace existing bindings if they were the system-provided bindings,
but don't replace user-provided or user-deleted bindings.

From eafb94699f53a3aedcdb57571e2bbc5c5a78216f Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@gmail.com>
Date: Mon, 26 Nov 2012 20:31:11 +0100
Subject: [PATCH 0515/1286] Bug 395104 - Find Handler Class Dialog does not
 resize

---
 .../common/component/dialogs/ContributionClassDialog.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index 8438f86ae2..9cf6c11da5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *	   Lars Vogel <lars.vogel@gmail.com> - Enhancements
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -70,6 +71,11 @@ public ContributionClassDialog(Shell parentShell, IProject project, EditingDomai
 		this.Messages = Messages;
 	}
 
+	@Override
+	protected boolean isResizable() {
+		return true;
+	}
+
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite comp = (Composite) super.createDialogArea(parent);

From a43cb4f86097b9290d3b53acf6f0ff9343a32ec1 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Tue, 27 Nov 2012 15:39:16 +0100
Subject: [PATCH 0516/1286] Bug 393408 - [Tools] It would be nice to get
 Tootips on the Class-URI Text-Field

---
 .../common/component/AddonsEditor.java        | 20 +++++++++++++------
 .../component/DirectMenuItemEditor.java       | 19 +++++++++++++-----
 .../component/DirectToolItemEditor.java       | 19 +++++++++++++-----
 .../common/component/HandlerEditor.java       | 19 +++++++++++++-----
 .../internal/common/component/PartEditor.java | 19 +++++++++++++-----
 5 files changed, 70 insertions(+), 26 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index beb24deb43..bde56f2fa1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -37,6 +37,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -144,18 +146,18 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-
+		final Link lnk = new Link(parent, SWT.NONE);
 		// ------------------------------------------------------------
 		{
 			final IContributionClassCreator c = getEditor().getContributionCreator(ApplicationPackageImpl.Literals.ADDON);
 			if (project != null && c != null) {
-				final Link l = new Link(parent, SWT.NONE);
-				l.setText("<A>" + Messages.PartEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
-				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-				l.addSelectionListener(new SelectionAdapter() {
+
+				lnk.setText("<A>" + Messages.PartEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
+				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+				lnk.addSelectionListener(new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
-						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, l.getShell());
+						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, lnk.getShell());
 					}
 				});
 			} else {
@@ -167,6 +169,12 @@ public void widgetSelected(SelectionEvent e) {
 			Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			t.addModifyListener(new ModifyListener() {
+
+				public void modifyText(ModifyEvent e) {
+					lnk.setToolTipText(((Text) (e.getSource())).getText());
+				}
+			});
 			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 9cb85eef7c..7311e8b2ca 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -41,6 +41,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -114,16 +116,17 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		// ------------------------------------------------------------
+		final Link lnk = new Link(parent, SWT.NONE);
 		{
 			final IContributionClassCreator c = getEditor().getContributionCreator(MenuPackageImpl.Literals.DIRECT_MENU_ITEM);
 			if (project != null && c != null) {
-				final Link l = new Link(parent, SWT.NONE);
-				l.setText("<A>" + Messages.DirectMenuItemEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
-				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-				l.addSelectionListener(new SelectionAdapter() {
+
+				lnk.setText("<A>" + Messages.DirectMenuItemEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
+				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+				lnk.addSelectionListener(new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
-						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, l.getShell());
+						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, lnk.getShell());
 					}
 				});
 			} else {
@@ -135,6 +138,12 @@ public void widgetSelected(SelectionEvent e) {
 			Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			t.addModifyListener(new ModifyListener() {
+
+				public void modifyText(ModifyEvent e) {
+					lnk.setToolTipText(((Text) (e.getSource())).getText());
+				}
+			});
 			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index b593827918..51264bfbcd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -40,6 +40,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -79,14 +81,15 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		final IContributionClassCreator c = getEditor().getContributionCreator(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM);
+		final Link lnk = new Link(parent, SWT.NONE);
 		if (project != null && c != null) {
-			final Link l = new Link(parent, SWT.NONE);
-			l.setText("<A>" + Messages.DirectMenuItemEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			l.addSelectionListener(new SelectionAdapter() {
+
+			lnk.setText("<A>" + Messages.DirectMenuItemEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
+			lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			lnk.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, l.getShell());
+					c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, lnk.getShell());
 				}
 			});
 		} else {
@@ -98,6 +101,12 @@ public void widgetSelected(SelectionEvent e) {
 		Text t = new Text(parent, SWT.BORDER);
 		TextPasteHandler.createFor(t);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		t.addModifyListener(new ModifyListener() {
+
+			public void modifyText(ModifyEvent e) {
+				lnk.setToolTipText(((Text) (e.getSource())).getText());
+			}
+		});
 		Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
 		Util.addDecoration(t, binding);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 6ce9fa4e1a..3f278c707a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -43,6 +43,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -170,16 +172,17 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		// ------------------------------------------------------------
+		final Link lnk = new Link(parent, SWT.NONE);
 		{
 			final IContributionClassCreator c = getEditor().getContributionCreator(CommandsPackageImpl.Literals.HANDLER);
 			if (project != null && c != null) {
-				final Link l = new Link(parent, SWT.NONE);
-				l.setText("<A>" + Messages.HandlerEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
-				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-				l.addSelectionListener(new SelectionAdapter() {
+
+				lnk.setText("<A>" + Messages.HandlerEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
+				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+				lnk.addSelectionListener(new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
-						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, l.getShell());
+						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, lnk.getShell());
 					}
 				});
 			} else {
@@ -191,6 +194,12 @@ public void widgetSelected(SelectionEvent e) {
 			Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			t.addModifyListener(new ModifyListener() {
+
+				public void modifyText(ModifyEvent e) {
+					lnk.setToolTipText(((Text) (e.getSource())).getText());
+				}
+			});
 			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 6b455aef30..77c80b6fa8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -60,6 +60,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -218,16 +220,17 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		// ------------------------------------------------------------
+		final Link lnk = new Link(parent, SWT.NONE);
 		{
 			final IContributionClassCreator c = getEditor().getContributionCreator(BasicPackageImpl.Literals.PART);
 			if (project != null && c != null) {
-				final Link l = new Link(parent, SWT.NONE);
-				l.setText("<A>" + Messages.PartEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
-				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-				l.addSelectionListener(new SelectionAdapter() {
+
+				lnk.setText("<A>" + Messages.PartEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
+				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+				lnk.addSelectionListener(new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
-						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, l.getShell());
+						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, lnk.getShell());
 					}
 				});
 			} else {
@@ -239,6 +242,12 @@ public void widgetSelected(SelectionEvent e) {
 			Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			t.addModifyListener(new ModifyListener() {
+
+				public void modifyText(ModifyEvent e) {
+					lnk.setToolTipText(((Text) (e.getSource())).getText());
+				}
+			});
 			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 

From 8baa6e95d61e43c8c3ebec50bf58a4d9579452ac Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@gmail.com>
Date: Tue, 27 Nov 2012 19:54:28 +0100
Subject: [PATCH 0517/1286] Bug 395162 - "Find"-windows in
 Application.e4xmi-Editor are not resizable

Fixed the Icon and Command selection dialog. Bug also ask for a fix for
another fix but does not state which one.
---
 .../component/dialogs/AbstractCommandSelectionDialog.java    | 5 +++++
 .../common/component/dialogs/AbstractIconDialog.java         | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index cc0c7086cb..0543991585 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -137,6 +137,11 @@ protected void okPressed() {
 		}
 	}
 
+	@Override
+	protected boolean isResizable() {
+		return true;
+	}
+
 	protected abstract Command createStoreCommand(EditingDomain editingDomain, MCommand command);
 
 	private static class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
index dfd06994c2..814e7f4b5b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
@@ -192,6 +192,11 @@ private void clearImages() {
 		icons.clear();
 	}
 
+	@Override
+	protected boolean isResizable() {
+		return true;
+	}
+
 	@Override
 	protected void okPressed() {
 		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();

From f1aa0f8ec518ac78d6578467fb81b20b934e6bf7 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Wed, 28 Nov 2012 19:53:13 +0100
Subject: [PATCH 0518/1286] Bug 395308 - Parameter ID of Command Parameter is
 not updated after rename

---
 .../internal/common/component/CommandParameterEditor.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index e7c1fc3a86..cdb927736a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -21,6 +21,7 @@
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EObject;
@@ -48,6 +49,12 @@ public CommandParameterEditor() {
 		super();
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		// TODO Auto-generated method stub
+		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME), FeaturePath.fromList(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID) };
+	}
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		return createImage(ResourceProvider.IMG_CommandParameter);

From 7305c5e630ec1d73daa273197947aa07744a0455 Mon Sep 17 00:00:00 2001
From: Marcel Bruch <marcel.bruch@codetrails.com>
Date: Wed, 28 Nov 2012 20:10:13 +0100
Subject: [PATCH 0519/1286] Bug 395297 - Find contribution class dialog does
 not support "*" at all

---
 .../e4/tools/emf/editor3x/PDEClassContributionProvider.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index 540d02b251..4ba2573e25 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -53,11 +53,11 @@ public void findContribution(final Filter filter,  final ContributionResultHandl
 			// Perform the search only on the type name
 			typeName = currentContent.toCharArray();
 			if( currentContent.startsWith("*") ) {
-				typeName = "".toCharArray();
 				if( ! currentContent.endsWith("*") ) {
 					currentContent += "*";
 				}
-				packageName = currentContent.toCharArray();
+				typeName = currentContent.toCharArray();
+				packageName = "*".toCharArray();
 			}
 			
 		} else if ((index + 1) == currentContent.length()) {
@@ -145,7 +145,7 @@ public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
 					packageName, 
 					SearchPattern.R_PATTERN_MATCH, 
 					typeName, 
-					SearchPattern.R_PREFIX_MATCH | SearchPattern.R_CAMELCASE_MATCH, 
+					SearchPattern.R_PATTERN_MATCH | SearchPattern.R_CAMELCASE_MATCH, 
 					IJavaSearchConstants.CLASS, 
 					scope, 
 					req, 

From 568782ebf899fe8cfc77ef24664a213e0283ac95 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Wed, 28 Nov 2012 20:33:48 +0100
Subject: [PATCH 0520/1286] Bug 395244 - Clean up Eclipse 4 wizard template
 handlers

---
 .../templates/src/handlers/AboutHandler.java                 | 2 +-
 .../templates/src/handlers/OpenHandler.java                  | 4 +---
 .../templates/src/handlers/QuitHandler.java                  | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/templates/src/handlers/AboutHandler.java b/bundles/org.eclipse.e4.tools/templates/src/handlers/AboutHandler.java
index c9f6a86afd..dce5d1002e 100644
--- a/bundles/org.eclipse.e4.tools/templates/src/handlers/AboutHandler.java
+++ b/bundles/org.eclipse.e4.tools/templates/src/handlers/AboutHandler.java
@@ -20,6 +20,6 @@
 public class AboutHandler {
 	@Execute
 	public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell) {
-		MessageDialog.openInformation(shell, "About", "e4 Application example.");
+		MessageDialog.openInformation(shell, "About", "Eclipse 4 Application example.");
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools/templates/src/handlers/OpenHandler.java b/bundles/org.eclipse.e4.tools/templates/src/handlers/OpenHandler.java
index 46d423cec2..923e7c6935 100644
--- a/bundles/org.eclipse.e4.tools/templates/src/handlers/OpenHandler.java
+++ b/bundles/org.eclipse.e4.tools/templates/src/handlers/OpenHandler.java
@@ -24,9 +24,7 @@ public class OpenHandler {
 
 	@Execute
 	public void execute(
-			IEclipseContext context,
-			@Named(IServiceConstants.ACTIVE_SHELL) Shell shell)
-			throws InvocationTargetException, InterruptedException {
+			@Named(IServiceConstants.ACTIVE_SHELL) Shell shell){
 		FileDialog dialog = new FileDialog(shell);
 		dialog.open();
 	}
diff --git a/bundles/org.eclipse.e4.tools/templates/src/handlers/QuitHandler.java b/bundles/org.eclipse.e4.tools/templates/src/handlers/QuitHandler.java
index 0c1337bb1e..f49e7f88ed 100644
--- a/bundles/org.eclipse.e4.tools/templates/src/handlers/QuitHandler.java
+++ b/bundles/org.eclipse.e4.tools/templates/src/handlers/QuitHandler.java
@@ -23,9 +23,8 @@
 
 public class QuitHandler {
 	@Execute
-	public void execute(IWorkbench workbench, IEclipseContext context,
-			@Named(IServiceConstants.ACTIVE_SHELL) Shell shell)
-			throws InvocationTargetException, InterruptedException {
+	public void execute(IWorkbench workbench,
+			@Named(IServiceConstants.ACTIVE_SHELL) Shell shell){
 		if (MessageDialog.openConfirm(shell, "Confirmation",
 				"Do you want to exit?")) {
 			workbench.close();

From 541303f3d6aca58a330c36503c392d3044781a23 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Wed, 28 Nov 2012 22:07:50 +0100
Subject: [PATCH 0521/1286] Bug 395081 - Copy Handler in Application.e4xmi
 model only copy once

---
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 9b20b80f73..0c222e9bd8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1158,6 +1158,8 @@ private void handleStructurePaste() {
 				return;
 			}
 
+			o = EcoreUtil.copy((EObject) o);
+
 			Object parent = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
 
 			EStructuralFeature feature = null;

From 8b6a21e06c5ac7f10a02b6e01dd6a4ba50aa8cef Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@gmail.com>
Date: Fri, 30 Nov 2012 00:40:11 +0100
Subject: [PATCH 0522/1286] Bug 395416 and 395403 - Improvements in Find Dialog
 for Features

Make dialog resizable and controls the OK button status.
---
 .../dialogs/FeatureSelectionDialog.java       | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index bf39936e97..079b1a8ee3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -26,12 +26,15 @@
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 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.ITreeContentProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
@@ -46,6 +49,7 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
@@ -65,6 +69,11 @@ public FeatureSelectionDialog(Shell parentShell, EditingDomain editingDomain, MS
 		this.Messages = Messages;
 	}
 
+	@Override
+	protected boolean isResizable() {
+		return true;
+	}
+
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		getShell().setText(Messages.FeatureSelectionDialog_ShellTitle);
@@ -126,6 +135,16 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 				return super.compare(viewer, e1, e2);
 			}
 		});
+		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			public void selectionChanged(SelectionChangedEvent event) {
+				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+				Button buttonOk = getButton(IDialogConstants.OK_ID);
+				if (!selection.isEmpty() && selection.getFirstElement().getClass() == InternalFeature.class)
+					buttonOk.setEnabled(true);
+				else
+					buttonOk.setEnabled(false);
+			}
+		});
 
 		final ViewerFilterImpl filter = new ViewerFilterImpl();
 

From 1b205fdd619ecff2f56f618d397fbe73147ec43a Mon Sep 17 00:00:00 2001
From: Robert Koehler <koehler@se-elektronic.de>
Date: Fri, 30 Nov 2012 00:45:42 +0100
Subject: [PATCH 0523/1286] Bug 395403 - "Find"-dialogs in
 fragment.e4xmi-Editor are not resizable

---
 .../component/dialogs/FindParentReferenceElementDialog.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index 04eabeb63c..3a1077ff81 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -83,6 +83,11 @@ public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEdit
 		this.Messages = Messages;
 	}
 
+	@Override
+	protected boolean isResizable() {
+		return true;
+	}
+
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite comp = (Composite) super.createDialogArea(parent);

From 3e99c9a587f50de78dee48da81f275a2b3415dcd Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Fri, 30 Nov 2012 01:09:23 +0100
Subject: [PATCH 0524/1286] Bug 395371 - Wizard to convert part of the
 application model to a fragment

---
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../e4/tools/emf/ui/internal/Messages.java    |  2 +
 .../tools/emf/ui/internal/Messages.properties |  4 +-
 .../emf/ui/internal/common/ModelEditor.java   | 62 ++++++++++++++-
 .../model/BaseApplicationModelWizard.java     |  1 +
 .../model/ExtractContributionModelWizard.java | 75 +++++++++++++++++++
 6 files changed, 144 insertions(+), 3 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 7874eea14c..2f80d0653f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -30,7 +30,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.e4.core.di.extensions;bundle-version="0.9.0",
  org.eclipse.jface.text;bundle-version="3.7.0",
  org.eclipse.e4.ui.widgets;bundle-version="0.11.0",
- org.eclipse.equinox.preferences;bundle-version="3.4.0"
+ org.eclipse.equinox.preferences;bundle-version="3.4.0",
+ org.eclipse.e4.tools;bundle-version="0.12.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.0.0",
  javax.inject;version="1.0.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 206ca12035..8419240574 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -620,4 +620,6 @@ public class Messages {
 	public String Special_UnknownElement;
 	public String Special_UnknownElement_Detail;
 	public String VWindowSharedElementsEditor_Area;
+	public String ModelEditor_ExtractFragment;
+	public String ModelEditor_ExtractFragment_NoParentId;
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 9bb590a1b3..9fb51c7e80 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -620,4 +620,6 @@ ObjectViewer_Script=Execute Script
 CommandWizard_ShellTitle=Command/Handler wizard
 Special_UnknownElement=(unknown model element)
 Special_UnknownElement_Detail= Use an extension point!
-VWindowSharedElementsEditor_Area=Area
\ No newline at end of file
+VWindowSharedElementsEditor_Area=Area
+ModelEditor_ExtractFragment=Extract into a fragment
+ModelEditor_ExtractFragment_NoParentId=Can not extract because parent container has no id. \nAdd an id and try again.
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 0c222e9bd8..be8be027fe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -12,6 +12,7 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.PostConstruct;
@@ -41,6 +42,7 @@
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.Preference;
 import org.eclipse.e4.core.services.contributions.IContributionFactory;
+import org.eclipse.e4.internal.tools.wizards.model.ExtractContributionModelWizard;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.IEditorDescriptor;
@@ -133,6 +135,7 @@
 import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.di.Persist;
+import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -170,6 +173,7 @@
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.databinding.viewers.ObservableListTreeContentProvider;
 import org.eclipse.jface.databinding.viewers.TreeStructureAdvisor;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.resource.StringConverter;
@@ -191,6 +195,7 @@
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerDropAdapter;
+import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -596,7 +601,6 @@ public void menuAboutToShow(IMenuManager manager) {
 					List<Action> actions;
 					if (s.getFirstElement() instanceof VirtualEntry<?>) {
 						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId()).getActions(s.getFirstElement());
-
 						if (actions.size() > 0) {
 							MenuManager addMenu = new MenuManager(messages.ModelEditor_AddChild);
 							for (Action a : actions) {
@@ -605,6 +609,38 @@ public void menuAboutToShow(IMenuManager manager) {
 							}
 							manager.add(addMenu);
 						}
+
+						// build the extract action
+						if ((!((VirtualEntry<?>) s.getFirstElement()).getList().isEmpty()) && (!isModelFragment()))
+							manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {
+								public void run() {
+									VirtualEntry<?> ve = (VirtualEntry<?>) s.getFirstElement();
+									EObject container = (EObject) ve.getOriginalParent();
+									String containerId = ((MApplicationElement) container).getElementId();
+									if (containerId == null || containerId.isEmpty()) {
+										MessageDialog.openError(viewer.getControl().getShell(), null, messages.ModelEditor_ExtractFragment_NoParentId);
+										return;
+									}
+									ArrayList<MApplicationElement> maes = new ArrayList<MApplicationElement>();
+									IObservableList list = ve.getList();
+									Iterator iterator = list.iterator();
+									while (iterator.hasNext()) {
+										maes.add((MApplicationElement) iterator.next());
+									}
+									ExtractContributionModelWizard extractContributionModelWizard = new ExtractContributionModelWizard(maes);
+									extractContributionModelWizard.setup(project);
+									WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), extractContributionModelWizard);
+									if (wizardDialog.open() == WizardDialog.OK) {
+										for (MApplicationElement mae : maes) {
+											Command cmd = DeleteCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), mae);
+											if (cmd.canExecute()) {
+												ModelEditor.this.modelProvider.getEditingDomain().getCommandStack().execute(cmd);
+											}
+										}
+									}
+								};
+							});
+
 					} else {
 						final EObject o = (EObject) s.getFirstElement();
 						AbstractComponentEditor editor = getEditor(o.eClass());
@@ -709,6 +745,30 @@ public void run() {
 					}
 
 				}
+				if ((s.getFirstElement() instanceof MApplicationElement) && (!isModelFragment()) && (!(s.getFirstElement() instanceof MApplication)))
+					manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {
+						public void run() {
+							MApplicationElement oe = (MApplicationElement) s.getFirstElement();
+							EObject container = ((EObject) oe).eContainer();
+							String containerId = ((MApplicationElement) container).getElementId();
+							if (containerId == null || containerId.isEmpty()) {
+								MessageDialog.openError(viewer.getControl().getShell(), null, messages.ModelEditor_ExtractFragment_NoParentId);
+								return;
+							}
+							ExtractContributionModelWizard extractContributionModelWizard = new ExtractContributionModelWizard(oe);
+							extractContributionModelWizard.setup(project);
+							WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), extractContributionModelWizard);
+							if (wizardDialog.open() == WizardDialog.OK) {
+								Command cmd = DeleteCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), oe);
+								if (cmd.canExecute()) {
+									ModelEditor.this.modelProvider.getEditingDomain().getCommandStack().execute(cmd);
+								}
+							}
+
+						};
+
+					});
+
 			}
 		});
 		viewer.getControl().setMenu(mgr.createContextMenu(viewer.getControl()));
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index 72f8463605..da32d9f2c6 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -157,6 +157,7 @@ public void run() {
 			return true;
 		}
 		catch (Exception exception) {
+			exception.printStackTrace();
 			MessageDialog.openError(getShell(), "Error", exception.getMessage());
 			return false;
 		}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
new file mode 100644
index 0000000000..c5f3d52858
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Sopot Cela <sopotcela@gmail.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
+
+
+public class ExtractContributionModelWizard extends BaseApplicationModelWizard {
+
+	private List<MApplicationElement> oes= new ArrayList<MApplicationElement>();
+
+	public ExtractContributionModelWizard(MApplicationElement oe){
+		super();
+		oes.add(oe);
+	}
+	
+	public ExtractContributionModelWizard(List<MApplicationElement> oes){
+		this.oes.addAll(oes);
+	}
+	
+	public ExtractContributionModelWizard(){
+		super();
+	}
+	
+	@Override
+	public String getDefaultFileName() {
+		return "fragment.e4xmi";
+	}
+	
+	protected EObject createInitialModel() {
+		MModelFragments createModelFragments = MFragmentFactory.INSTANCE.createModelFragments();
+		MStringModelFragment createStringModelFragment = MFragmentFactory.INSTANCE.createStringModelFragment();
+		for (MApplicationElement moe : oes) {
+			
+		MApplicationElement e = (MApplicationElement) EcoreUtil.copy((EObject) moe);
+		String featurename = ((EObject) moe).eContainmentFeature().getName();
+		createStringModelFragment.setParentElementId(((MApplicationElement) ((EObject) moe).eContainer()).getElementId());
+		createStringModelFragment.getElements().add(e);
+		createStringModelFragment.setFeaturename(featurename);
+		}
+		createModelFragments.getFragments().add(createStringModelFragment);
+		return (EObject)createModelFragments;
+	}
+	
+	public void setup(IProject project){
+		this.init(PlatformUI.getWorkbench(),new StructuredSelection(project));
+	}
+	@Override
+	protected NewModelFilePage createWizardPage(ISelection selection) {
+		return new NewModelFilePage(selection,getDefaultFileName());
+	}
+	
+}
\ No newline at end of file

From dc5b80b5d9607d811e0afaaa66bc7725762c4ed6 Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Fri, 30 Nov 2012 14:49:57 +0100
Subject: [PATCH 0525/1286] Bug 395463 - Application Model Editor
 PerspectiveEditor Find IconURI Icon is missing

---
 .../emf/ui/internal/common/component/PerspectiveEditor.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 0ebf886fee..4dba3f1f8f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -244,6 +244,7 @@ protected URI getImageURI() {
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {

From 007934c2d7ffe036c0faa539431574dd20180d5d Mon Sep 17 00:00:00 2001
From: Christian Zahl <mail@dcc-net.de>
Date: Mon, 3 Dec 2012 21:12:50 +0100
Subject: [PATCH 0526/1286] Context menu for expanding a selected tree element

---
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.java   | 1 +
 .../eclipse/e4/tools/emf/ui/internal/Messages.properties | 1 +
 .../e4/tools/emf/ui/internal/common/ModelEditor.java     | 9 +++++++++
 3 files changed, 11 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 8419240574..e4991d9dbc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -597,6 +597,7 @@ public class Messages {
 	public String AreaIconDialogEditor_DialogMessage;
 
 	public String ModelEditor_Delete;
+	public String ModelEditor_ExpandSubtree;
 	public String ModelEditor_Form;
 	public String ModelEditor_XMI;
 	public String ModelEditor_ExternalizeStrings;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 9fb51c7e80..8044596a2e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -598,6 +598,7 @@ AreaIconDialogEditor_DialogTitle=Area Icon Search
 AreaIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
 
 ModelEditor_Delete=Remove
+ModelEditor_ExpandSubtree=Expand subtree
 ModelEditor_Form=Form
 ModelEditor_XMI=XMI
 ModelEditor_ExternalizeStrings=Externalize Strings
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index be8be027fe..2912de0961 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -610,6 +610,15 @@ public void menuAboutToShow(IMenuManager manager) {
 							manager.add(addMenu);
 						}
 
+						manager.add(new Action(messages.ModelEditor_ExpandSubtree) {
+							public void run() {
+								if (!s.isEmpty())
+									viewer.expandToLevel(s.getFirstElement(), TreeViewer.ALL_LEVELS);
+							}
+						});
+
+						manager.add(new Separator());
+
 						// build the extract action
 						if ((!((VirtualEntry<?>) s.getFirstElement()).getList().isEmpty()) && (!isModelFragment()))
 							manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {

From e24756769cfa28f85ff45b5f640fe2b4fc9795d9 Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@gmail.com>
Date: Tue, 4 Dec 2012 15:42:52 +0100
Subject: [PATCH 0527/1286] Bug 395710 - Wizard for creating new class for a
 Part - Add Composite for PostConstruct method

WindowBuilder searches for a method annotated with PostConstruct which
gets a Composite as parameter.
---
 .../tools/wizards/classes/templates/PartTemplate.java         | 4 ++--
 bundles/org.eclipse.e4.tools/templates/part.txtjet            | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
index 5cdb9871b8..7a1891605e 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
@@ -18,7 +18,7 @@ public static synchronized PartTemplate create(String lineSeparator)
   protected final String TEXT_2 = NL + "package ";
   protected final String TEXT_3 = ";";
   protected final String TEXT_4 = NL + NL + "import javax.inject.Inject;";
-  protected final String TEXT_5 = NL + "import javax.annotation.PostConstruct;";
+  protected final String TEXT_5 = NL + "import javax.annotation.PostConstruct;" + NL + "import org.eclipse.swt.widgets.Composite;";
   protected final String TEXT_6 = NL + "import javax.annotation.PreDestroy;";
   protected final String TEXT_7 = NL + "import org.eclipse.e4.ui.di.Focus;";
   protected final String TEXT_8 = NL + "import org.eclipse.e4.ui.di.Persist;";
@@ -26,7 +26,7 @@ public static synchronized PartTemplate create(String lineSeparator)
   protected final String TEXT_10 = " {" + NL + "\t@Inject" + NL + "\tpublic ";
   protected final String TEXT_11 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
   protected final String TEXT_12 = NL + "\t@PostConstruct" + NL + "\tpublic void ";
-  protected final String TEXT_13 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_13 = "(Composite parent) {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
   protected final String TEXT_14 = NL + "\t";
   protected final String TEXT_15 = NL + "\t@PreDestroy" + NL + "\tpublic void ";
   protected final String TEXT_16 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
diff --git a/bundles/org.eclipse.e4.tools/templates/part.txtjet b/bundles/org.eclipse.e4.tools/templates/part.txtjet
index f79efd96c9..a71061342a 100644
--- a/bundles/org.eclipse.e4.tools/templates/part.txtjet
+++ b/bundles/org.eclipse.e4.tools/templates/part.txtjet
@@ -7,6 +7,7 @@ package <%= domainClass.getPackageFragment().getElementName() %>;
 import javax.inject.Inject;
 <% if( domainClass.isUsePostConstruct() ) { %>
 import javax.annotation.PostConstruct;
+import org.eclipse.swt.widgets.Composite;
 <% } %>
 <% if( domainClass.isUsePredestroy() ) { %>
 import javax.annotation.PreDestroy;
@@ -25,7 +26,7 @@ public class <%= domainClass.getName() %> {
 	}
 	<% if( domainClass.isUsePostConstruct() ) { %>
 	@PostConstruct
-	public void <%= domainClass.getPostConstructMethodName()  %>() {
+	public void <%= domainClass.getPostConstructMethodName()  %>(Composite parent) {
 		//TODO Your code here
 	}
 	<% } %>

From 7be63ebc71485ba745ec6b1350307b96c4582611 Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@gmail.com>
Date: Tue, 4 Dec 2012 16:08:00 +0100
Subject: [PATCH 0528/1286] Bug 395371 - Wizard to convert part of the
 application model to a fragment

Removes Java 1.6 API call String.isEmpty()
---
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 2912de0961..e14fa8de8b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -626,7 +626,7 @@ public void run() {
 									VirtualEntry<?> ve = (VirtualEntry<?>) s.getFirstElement();
 									EObject container = (EObject) ve.getOriginalParent();
 									String containerId = ((MApplicationElement) container).getElementId();
-									if (containerId == null || containerId.isEmpty()) {
+									if (containerId == null || containerId.length() == 0) {
 										MessageDialog.openError(viewer.getControl().getShell(), null, messages.ModelEditor_ExtractFragment_NoParentId);
 										return;
 									}
@@ -760,7 +760,7 @@ public void run() {
 							MApplicationElement oe = (MApplicationElement) s.getFirstElement();
 							EObject container = ((EObject) oe).eContainer();
 							String containerId = ((MApplicationElement) container).getElementId();
-							if (containerId == null || containerId.isEmpty()) {
+							if (containerId == null || containerId.length()==0) {
 								MessageDialog.openError(viewer.getControl().getShell(), null, messages.ModelEditor_ExtractFragment_NoParentId);
 								return;
 							}

From 91f82be52375d27761687e6e676b2aef1a35796c Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@gmail.com>
Date: Tue, 4 Dec 2012 18:44:46 +0100
Subject: [PATCH 0529/1286] Bug 395240 - Remove the <name> tag from the pom.xml
 file

---
 bundles/org.eclipse.e4.tools.compat/pom.xml        | 1 -
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml  | 1 -
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml        | 1 -
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml | 1 -
 bundles/org.eclipse.e4.tools.services/pom.xml      | 1 -
 bundles/org.eclipse.e4.tools/pom.xml               | 1 -
 features/org.eclipse.e4.core.tools.feature/pom.xml | 1 -
 7 files changed, 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index c850e36740..31c653e36c 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -12,5 +12,4 @@
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
-  <name>org.eclipse.e4.tools.compat Build</name>
 </project> 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index fd3b68e1d7..c5de1aa4fc 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -12,5 +12,4 @@
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
-  <name>org.eclipse.e4.tools.emf.editor3x Build</name>
 </project> 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 8c36e1a24f..f97e6fc819 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -12,5 +12,4 @@
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
-  <name>org.eclipse.e4.tools.emf.uiBuild</name>
 </project> 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index d613e7f1a1..c93c03383d 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -12,5 +12,4 @@
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
-  <name>org.eclipse.e4.tools.jdt.templates Build</name>
 </project> 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index fc55305fb3..577fe644e3 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -12,5 +12,4 @@
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
-  <name>org.eclipse.e4.tools.services Build</name>
 </project> 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 98ddd83866..dcd83cd8a4 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -12,5 +12,4 @@
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
-  <name>org.eclipse.e4.tools Build</name>
 </project> 
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 033bd8691b..ca3c65e1ac 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -12,5 +12,4 @@
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
 
-  <name>org.eclipse.e4.core.tools.feature Build</name>
 </project> 

From 7121d4e96ed4f76ecb8445d8bf1a73cda54ced0e Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@gmail.com>
Date: Tue, 4 Dec 2012 18:53:12 +0100
Subject: [PATCH 0530/1286] Bug 394908 and Bug 394902 - Fixes in DIEditorpart
 and DIViewPart

---
 .../e4/tools/compat/parts/DIEditorPart.java   |  4 ++++
 .../e4/tools/compat/parts/DIViewPart.java     | 20 ++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index 5b97049080..cc103e7a96 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -93,6 +93,10 @@ public void createPartControl(Composite parent) {
 		makeActions();
 	}
 	
+	protected IEclipseContext getContext() {
+		return context;
+	}
+	
 	public C getComponent() {
 		return component;
 	}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
index 44d24cc821..0a060eeff0 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
@@ -25,21 +25,21 @@ public abstract class DIViewPart<C> extends ViewPart {
 	private IEclipseContext context;
 	private Class<C> clazz;
 	private C component;
-	
+
 	public DIViewPart(Class<C> clazz) {
 		this.clazz = clazz;
 	}
-	
+
 	@Override
 	public void init(IViewSite site) throws PartInitException {
 		super.init(site);
 		context = PartHelper.createPartContext(this);
-		
+
 		context.declareModifiable(IViewPart.class);
-		
+
 		context.set(IViewPart.class, this);
 	}
-	
+
 	@Override
 	public void createPartControl(Composite parent) {
 		component = PartHelper.createComponent(parent, context, clazz, this);
@@ -48,17 +48,13 @@ public void createPartControl(Composite parent) {
 	protected IEclipseContext getContext() {
 		return context;
 	}
-	
+
 	public C getComponent() {
 		return component;
 	}
-	
+
 	@Override
 	public void setFocus() {
-		try {
-			ContextInjectionFactory.invoke(component, Focus.class, context);	
-		} catch (InjectionException e) {
-			// TODO: handle exception
-		}
+		ContextInjectionFactory.invoke(component, Focus.class, context);
 	}
 }
\ No newline at end of file

From d207cd117466f6c872dd8fb5b858854dea890901 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Tue, 4 Dec 2012 23:34:34 +0100
Subject: [PATCH 0531/1286] bug 391086: Search the model editor tree.
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=391086 The FilteredTree,
 PatternFilter and BasicUIJob are already copied in
 org.eclipse.e4.ui.workbench.swt *.internal.copy package so instead I now
 depend on this bundle.

I completely removed all the code from the existing PatternFilter
(sorry) and let it implement the "original copied" PatternFilter from
org.eclipse.e4.ui.workbench.swt and instead only keep the method that
handles with the ILabelProvider.

So, I am checking in what is now a minimal change so that you can give
it a spin.

@TODO: Take care that the tree does not collapse when search is
cancelled
@TODO: Wrap FilteredTree in ShadowComposite so that it looks like it did
(takes a lot of space IMHO)
---
 .../META-INF/MANIFEST.MF                      |   3 +-
 .../tools/emf/ui/internal/PatternFilter.java  | 344 +-----------------
 .../emf/ui/internal/common/ModelEditor.java   |  39 +-
 3 files changed, 51 insertions(+), 335 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 2f80d0653f..8727c5ffff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -31,7 +31,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.jface.text;bundle-version="3.7.0",
  org.eclipse.e4.ui.widgets;bundle-version="0.11.0",
  org.eclipse.equinox.preferences;bundle-version="3.4.0",
- org.eclipse.e4.tools;bundle-version="0.12.0"
+ org.eclipse.e4.tools;bundle-version="0.12.0",
+ org.eclipse.e4.ui.workbench.swt;bundle-version="0.10.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.0.0",
  javax.inject;version="1.0.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
index fbba0c0945..4ec1939b96 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
@@ -7,348 +7,44 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Wim Jongman - 
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
-import java.text.BreakIterator;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
 
-/**
- * A filter used in conjunction with <code>FilteredTree</code>. In order to
- * determine if a node should be filtered it uses the content and label provider
- * of the tree to do pattern matching on its children. This causes the entire
- * tree structure to be realized. Note that the label provider must implement
- * ILabelProvider.
- * 
- * @see org.eclipse.ui.dialogs.FilteredTree
- * @since 3.2
- */
-public class PatternFilter extends ViewerFilter {
-	/*
-	 * Cache of filtered elements in the tree
-	 */
-    private Map<Object,Object[]> cache = new HashMap<Object,Object[]>();
-    
-    /*
-     * Maps parent elements to TRUE or FALSE
-     */
-    private Map<Object,Boolean> foundAnyCache = new HashMap<Object,Boolean>();
-    
-    private boolean useCache = false;
-    
-	/**
-	 * Whether to include a leading wildcard for all provided patterns.  A
-	 * trailing wildcard is always included.
-	 */
-	private boolean includeLeadingWildcard = false;
+public class PatternFilter extends org.eclipse.e4.ui.workbench.swt.internal.copy.PatternFilter {
 
 	/**
-	 * The string pattern matcher used for this pattern filter.  
-	 */
-    private StringMatcher matcher;
-    
-    private boolean useEarlyReturnIfMatcherIsNull = true;
-    
-    private static Object[] EMPTY = new Object[0];
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.ViewerFilter#filter(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object[])
-     */
-    public final Object[] filter(Viewer viewer, Object parent, Object[] elements) {
-    	// we don't want to optimize if we've extended the filter ... this
-    	// needs to be addressed in 3.4
-    	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=186404
-        if (matcher == null && useEarlyReturnIfMatcherIsNull) {
-			return elements;
-		}
-
-        if (!useCache) {
-        	return super.filter(viewer, parent, elements);
-        }
-        
-        Object[] filtered = (Object[]) cache.get(parent);
-        if (filtered == null) {
-        	Boolean foundAny = (Boolean) foundAnyCache.get(parent);
-        	if (foundAny != null && !foundAny.booleanValue()) {
-        		filtered = EMPTY;
-        	} else {
-        		filtered = super.filter(viewer, parent, elements);
-        	}
-            cache.put(parent, filtered);
-        }
-        return filtered;
-    }
-
-    /**
-     * Returns true if any of the elements makes it through the filter.
-     * This method uses caching if enabled; the computation is done in
-     * computeAnyVisible.
-     *  
-     * @param viewer
-     * @param parent
-     * @param elements the elements (must not be an empty array)
-     * @return true if any of the elements makes it through the filter.
-     */
-    private boolean isAnyVisible(Viewer viewer, Object parent, Object[] elements) {
-    	if (matcher == null) {
-    		return true;
-    	}
-    	
-    	if (!useCache) {
-    		return computeAnyVisible(viewer, elements);
-    	}
-    	
-    	Object[] filtered = (Object[]) cache.get(parent);
-    	if (filtered != null) {
-    		return filtered.length > 0;
-    	}
-    	Boolean foundAny = (Boolean) foundAnyCache.get(parent);
-    	if (foundAny == null) {
-    		foundAny = computeAnyVisible(viewer, elements) ? Boolean.TRUE : Boolean.FALSE;
-    		foundAnyCache.put(parent, foundAny);
-    	}
-    	return foundAny.booleanValue();
-    }
-
-	/**
-	 * Returns true if any of the elements makes it through the filter.
+	 * Check if the current (leaf) element is a match with the filter text. The
+	 * default behavior checks that the label of the element is a match.
 	 * 
-	 * @param viewer the viewer
-	 * @param elements the elements to test
-	 * @return <code>true</code> if any of the elements makes it through the filter
-	 */
-	private boolean computeAnyVisible(Viewer viewer, Object[] elements) {
-		boolean elementFound = false;
-		for (int i = 0; i < elements.length && !elementFound; i++) {
-			Object element = elements[i];
-			elementFound = isElementVisible(viewer, element);
-		}
-		return elementFound;
-	}
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-     */
-    public final boolean select(Viewer viewer, Object parentElement,
-			Object element) {
-        return isElementVisible(viewer, element);
-    }
-    
-    /**
-	 * Sets whether a leading wildcard should be attached to each pattern
-	 * string.
+	 * Subclasses should override this method.
 	 * 
-	 * @param includeLeadingWildcard
-	 *            Whether a leading wildcard should be added.
+	 * @param viewer
+	 *            the viewer that contains the element
+	 * @param element
+	 *            the tree element to check
+	 * @return true if the given element's label matches the filter text
 	 */
-	public final void setIncludeLeadingWildcard(
-			final boolean includeLeadingWildcard) {
-		this.includeLeadingWildcard = includeLeadingWildcard;
-	}
+	protected boolean isLeafMatch(Viewer viewer, Object element) {
 
-    /**
-     * The pattern string for which this filter should select 
-     * elements in the viewer.
-     * 
-     * @param patternString
-     */
-    public void setPattern(String patternString) {
-    	// these 2 strings allow the PatternFilter to be extended in
-    	// 3.3 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=186404
-    	if ("org.eclipse.ui.keys.optimization.true".equals(patternString)) { //$NON-NLS-1$
-    		useEarlyReturnIfMatcherIsNull = true;
-    		return;
-    	} else if ("org.eclipse.ui.keys.optimization.false".equals(patternString)) { //$NON-NLS-1$
-    		useEarlyReturnIfMatcherIsNull = false;
-    		return;
-    	}
-        clearCaches();
-        if (patternString == null || patternString.equals("")) { //$NON-NLS-1$
-			matcher = null;
-		} else {
-			String pattern = patternString + "*"; //$NON-NLS-1$
-			if (includeLeadingWildcard) {
-				pattern = "*" + pattern; //$NON-NLS-1$
-			}
-			matcher = new StringMatcher(pattern, true, false);
-		}
-    }
+		Object labelProvider = ((StructuredViewer) viewer).getLabelProvider();
+		String labelText = null;
 
-	/**
-	 * Clears the caches used for optimizing this filter. Needs to be called whenever
-	 * the tree content changes.
-	 */
-	/* package */ void clearCaches() {
-		cache.clear();
-        foundAnyCache.clear();
-	}
-
-    /**
-     * Answers whether the given String matches the pattern.
-     * 
-     * @param string the String to test
-     * 
-     * @return whether the string matches the pattern
-     */
-    private boolean match(String string) {
-    	if (matcher == null) {
-			return true;
+		if (labelProvider instanceof ILabelProvider) {
+			labelText = ((ILabelProvider) labelProvider).getText(element);
+		} else {
+			System.out.println(element.toString());
+			labelText = element.toString();
 		}
-        return matcher.match(string);
-    }
-    
-    /**
-     * Answers whether the given element is a valid selection in 
-     * the filtered tree.  For example, if a tree has items that 
-     * are categorized, the category itself may  not be a valid 
-     * selection since it is used merely to organize the elements.
-     * 
-     * @param element
-     * @return true if this element is eligible for automatic selection
-     */
-    public boolean isElementSelectable(Object element){
-    	return element != null;
-    }
-    
-    /**
-     * Answers whether the given element in the given viewer matches
-     * the filter pattern.  This is a default implementation that will 
-     * show a leaf element in the tree based on whether the provided  
-     * filter text matches the text of the given element's text, or that 
-     * of it's children (if the element has any).  
-     * 
-     * Subclasses may override this method.
-     * 
-     * @param viewer the tree viewer in which the element resides
-     * @param element the element in the tree to check for a match
-     * 
-     * @return true if the element matches the filter pattern
-     */
-    public boolean isElementVisible(Viewer viewer, Object element){
-    	return isParentMatch(viewer, element) || isLeafMatch(viewer, element);
-    }
-    
-    /**
-     * Check if the parent (category) is a match to the filter text.  The default 
-     * behavior returns true if the element has at least one child element that is 
-     * a match with the filter text.
-     * 
-     * Subclasses may override this method.
-     * 
-     * @param viewer the viewer that contains the element
-     * @param element the tree element to check
-     * @return true if the given element has children that matches the filter text
-     */
-    protected boolean isParentMatch(Viewer viewer, Object element){
-        Object[] children = ((ITreeContentProvider) ((AbstractTreeViewer) viewer)
-                .getContentProvider()).getChildren(element);
 
-        if ((children != null) && (children.length > 0)) {
-			return isAnyVisible(viewer, element, children);
-		}	
-        return false;
-    }
-    
-    /**
-     * Check if the current (leaf) element is a match with the filter text.  
-     * The default behavior checks that the label of the element is a match. 
-     * 
-     * Subclasses should override this method.
-     * 
-     * @param viewer the viewer that contains the element
-     * @param element the tree element to check
-     * @return true if the given element's label matches the filter text
-     */
-    protected boolean isLeafMatch(Viewer viewer, Object element){
-        String labelText = ((ILabelProvider) ((StructuredViewer) viewer)
-                .getLabelProvider()).getText(element);
-        
-        if(labelText == null) {
-			return false;
-		}
-        return wordMatches(labelText);  
-    }
-    
-    /**
-     * Take the given filter text and break it down into words using a 
-     * BreakIterator.  
-     * 
-     * @param text
-     * @return an array of words
-     */
-    private String[] getWords(String text){
-    	List<String> words = new ArrayList<String>();
-		// Break the text up into words, separating based on whitespace and
-		// common punctuation.
-		// Previously used String.split(..., "\\W"), where "\W" is a regular
-		// expression (see the Javadoc for class Pattern).
-		// Need to avoid both String.split and regular expressions, in order to
-		// compile against JCL Foundation (bug 80053).
-		// Also need to do this in an NL-sensitive way. The use of BreakIterator
-		// was suggested in bug 90579.
-		BreakIterator iter = BreakIterator.getWordInstance();
-		iter.setText(text);
-		int i = iter.first();
-		while (i != java.text.BreakIterator.DONE && i < text.length()) {
-			int j = iter.following(i);
-			if (j == java.text.BreakIterator.DONE) {
-				j = text.length();
-			}
-			// match the word
-			if (Character.isLetterOrDigit(text.charAt(i))) {
-				String word = text.substring(i, j);
-				words.add(word);
-			}
-			i = j;
-		}
-		return (String[]) words.toArray(new String[words.size()]);
-    }
-    
-	/**
-	 * Return whether or not if any of the words in text satisfy the
-	 * match critera.
-	 * 
-	 * @param text the text to match
-	 * @return boolean <code>true</code> if one of the words in text 
-	 * 					satisifes the match criteria.
-	 */
-	protected boolean wordMatches(String text) {
-		if (text == null) {
+		if (labelText == null) {
 			return false;
 		}
-		
-		//If the whole text matches we are all set
-		if(match(text)) {
-			return true;
-		}
-		
-		// Otherwise check if any of the words of the text matches
-		String[] words = getWords(text);
-		for (int i = 0; i < words.length; i++) {
-			String word = words[i];
-			if (match(word)) {
-				return true;
-			}
-		}
-
-		return false;
+		return wordMatches(labelText);
 	}
 
-	/**
-	 * Can be called by the filtered tree to turn on caching.
-	 * 
-	 * @param useCache The useCache to set.
-	 */
-	void setUseCache(boolean useCache) {
-		this.useCache = useCache;
-	}    
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index e14fa8de8b..bc3510714b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Wim Jongman <wim.jongman@remainsoftware.com> - Maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
@@ -56,6 +57,7 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.AddonsEditor;
@@ -150,6 +152,7 @@
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.e4.ui.model.internal.ModelUtils;
+import org.eclipse.e4.ui.workbench.swt.internal.copy.FilteredTree;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -210,6 +213,8 @@
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.TreeAdapter;
+import org.eclipse.swt.events.TreeEvent;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
@@ -760,7 +765,7 @@ public void run() {
 							MApplicationElement oe = (MApplicationElement) s.getFirstElement();
 							EObject container = ((EObject) oe).eContainer();
 							String containerId = ((MApplicationElement) container).getElementId();
-							if (containerId == null || containerId.length()==0) {
+							if (containerId == null || containerId.length() == 0) {
 								MessageDialog.openError(viewer.getControl().getShell(), null, messages.ModelEditor_ExtractFragment_NoParentId);
 								return;
 							}
@@ -876,16 +881,20 @@ public void setSelectionService(@Optional ISelectionProviderService selectionSer
 	}
 
 	private TreeViewer createTreeViewerArea(Composite parent) {
-		parent = new Composite(parent, SWT.NONE);
+
+		parent = new FilteredTree(parent, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(), true);
 		parent.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
 		parent.setBackgroundMode(SWT.INHERIT_DEFAULT);
 
-		FillLayout l = new FillLayout();
-		l.marginWidth = 5;
-		parent.setLayout(l);
-		ShadowComposite editingArea = new ShadowComposite(parent, SWT.NONE);
-		editingArea.setLayout(new FillLayout());
-		final TreeViewer viewer = new TreeViewer(editingArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
+		// FillLayout l = new FillLayout();
+		// l.marginWidth = 5;
+		// parent.setLayout(l);
+		// ShadowComposite editingArea = new ShadowComposite(parent, SWT.NONE);
+		// editingArea.setLayout(new FillLayout());
+		// final TreeViewer viewer = new TreeViewer(editingArea,
+		// SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
+		final TreeViewer viewer = ((FilteredTree) parent).getViewer();
+
 		viewer.setLabelProvider(new ComponentLabelProvider(this, messages));
 		ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(new ObservableFactoryImpl(), new TreeStructureAdvisorImpl());
 		viewer.setContentProvider(contentProvider);
@@ -920,7 +929,8 @@ public void handleMapChange(MapChangeEvent event) {
 		}
 
 		viewer.setInput(modelProvider.getRoot());
-		viewer.expandToLevel(2);
+		viewer.setAutoExpandLevel(2);
+		viewer.expandToLevel(viewer.getAutoExpandLevel());
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
 
 			public void doubleClick(DoubleClickEvent event) {
@@ -930,6 +940,15 @@ public void doubleClick(DoubleClickEvent event) {
 				viewer.setExpandedState(selectedNode, !viewer.getExpandedState(selectedNode));
 			}
 		});
+
+		// Effect of filtered tree implementation (bug 391086)
+		viewer.getTree().addTreeListener(new TreeAdapter() {
+			@Override
+			public void treeCollapsed(TreeEvent e) {
+				viewer.expandToLevel(viewer.getAutoExpandLevel());
+			}
+		});
+
 		// ViewerDropAdapter adapter = new ViewerDropAdapter(viewer) {
 		//
 		// @Override
@@ -1550,4 +1569,4 @@ private boolean isValidDrop(Object target, MApplicationElement instance, boolean
 		}
 	}
 
-}
\ No newline at end of file
+}

From a3b2120abb30794232de923d6e04d4645d67698b Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Wed, 5 Dec 2012 10:26:02 +0100
Subject: [PATCH 0532/1286] Search the model editor tree.
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=391086 Removed a lingering
 sysout

---
 .../src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
index 4ec1939b96..e04663e58e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
@@ -37,7 +37,6 @@ protected boolean isLeafMatch(Viewer viewer, Object element) {
 		if (labelProvider instanceof ILabelProvider) {
 			labelText = ((ILabelProvider) labelProvider).getText(element);
 		} else {
-			System.out.println(element.toString());
 			labelText = element.toString();
 		}
 

From 600d8aaf69a698f95957c6311c9d963ecf3648e2 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Wed, 5 Dec 2012 12:20:33 +0100
Subject: [PATCH 0533/1286] bug 391086: Search the model editor tree.
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=391086 The include leading
 wildcard for the PatternFilter was lost. Now I add the leading wildcard on
 instantiation of the PatternFilter.

---
 .../e4/tools/emf/ui/internal/PatternFilter.java        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
index e04663e58e..9e82fb41d1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *     Wim Jongman - 
+ *     Wim Jongman - Maintenance (391086)
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
@@ -17,6 +17,14 @@
 
 public class PatternFilter extends org.eclipse.e4.ui.workbench.swt.internal.copy.PatternFilter {
 
+	/**
+	 * This constructor will call {@link #setIncludeLeadingWildcard(boolean)}
+	 * with boolean=true.
+	 */
+	public PatternFilter() {
+		setIncludeLeadingWildcard(true);
+	}
+
 	/**
 	 * Check if the current (leaf) element is a match with the filter text. The
 	 * default behavior checks that the label of the element is a match.

From 0fc618435ef158467b9b02b933876b9a1f391de1 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Thu, 6 Dec 2012 23:38:11 +0100
Subject: [PATCH 0534/1286] Bug 395111: Option to expand the application model
 tree The application model tree nodes will be totally collapsed/expanded to
 the bottom if you open it while the MOD1 (CTRL) is pressed.
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=395111

---
 .../emf/ui/internal/common/ModelEditor.java   | 60 ++++++++++++++++---
 1 file changed, 52 insertions(+), 8 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index bc3510714b..db88af1f46 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -193,8 +193,10 @@
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITreeViewerListener;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeExpansionEvent;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerDropAdapter;
@@ -211,6 +213,7 @@
 import org.eclipse.swt.dnd.TransferData;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.TreeAdapter;
@@ -305,6 +308,8 @@ public class ModelEditor {
 
 	private SourceViewer sourceViewer;
 
+	private boolean mod1Down = false;
+
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project, final IResourcePool resourcePool) {
 		this.resourcePool = resourcePool;
 		this.modelProvider = modelProvider;
@@ -615,13 +620,6 @@ public void menuAboutToShow(IMenuManager manager) {
 							manager.add(addMenu);
 						}
 
-						manager.add(new Action(messages.ModelEditor_ExpandSubtree) {
-							public void run() {
-								if (!s.isEmpty())
-									viewer.expandToLevel(s.getFirstElement(), TreeViewer.ALL_LEVELS);
-							}
-						});
-
 						manager.add(new Separator());
 
 						// build the extract action
@@ -785,6 +783,44 @@ public void run() {
 
 			}
 		});
+
+		// Save the stateMask
+		viewer.getTree().addKeyListener(new KeyListener() {
+			public void keyReleased(KeyEvent e) {
+				if (mod1Down && (e.keyCode & SWT.MOD1) == SWT.MOD1) {
+					mod1Down = false;
+				}
+			}
+
+			public void keyPressed(KeyEvent e) {
+				if (!mod1Down && (e.keyCode & SWT.MOD1) == SWT.MOD1) {
+					mod1Down = true;
+				}
+			}
+		});
+
+		viewer.addTreeListener(new ITreeViewerListener() {
+			public void treeExpanded(final TreeExpansionEvent event) {
+				if (mod1Down) {
+					viewer.getTree().getDisplay().asyncExec(new Runnable() {
+						public void run() {
+							viewer.expandToLevel(event.getElement(), TreeViewer.ALL_LEVELS);
+						}
+					});
+				}
+			}
+
+			public void treeCollapsed(final TreeExpansionEvent event) {
+				if (mod1Down) {
+					viewer.getTree().getDisplay().asyncExec(new Runnable() {
+						public void run() {
+							viewer.collapseToLevel(event.getElement(), TreeViewer.ALL_LEVELS);
+						}
+					});
+				}
+			}
+		});
+
 		viewer.getControl().setMenu(mgr.createContextMenu(viewer.getControl()));
 		viewer.setSelection(new StructuredSelection(modelProvider.getRoot()));
 
@@ -937,7 +973,15 @@ public void doubleClick(DoubleClickEvent event) {
 				TreeViewer viewer = (TreeViewer) event.getViewer();
 				IStructuredSelection thisSelection = (IStructuredSelection) event.getSelection();
 				Object selectedNode = thisSelection.getFirstElement();
-				viewer.setExpandedState(selectedNode, !viewer.getExpandedState(selectedNode));
+				if (mod1Down) {
+					if (viewer.getExpandedState(selectedNode))
+						viewer.setExpandedState(selectedNode, false);
+					else
+						viewer.expandToLevel(selectedNode, TreeViewer.ALL_LEVELS);
+				} else {
+					viewer.setExpandedState(selectedNode, !viewer.getExpandedState(selectedNode));
+				}
+
 			}
 		});
 

From f2288fde7cdba833fabab4500b002a52d5c2fced Mon Sep 17 00:00:00 2001
From: Christian Zahl <mail@dcc-net.de>
Date: Thu, 6 Dec 2012 23:39:44 +0100
Subject: [PATCH 0535/1286] Bug 395111: Option to expand the application model
 tree The application model tree nodes will be totally collapsed/expanded to
 the bottom if you open it while the MOD1 (CTRL) is pressed.
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=395111

---
 .../src/org/eclipse/e4/tools/emf/ui/internal/Messages.java       | 1 -
 .../src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties | 1 -
 2 files changed, 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index e4991d9dbc..8419240574 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -597,7 +597,6 @@ public class Messages {
 	public String AreaIconDialogEditor_DialogMessage;
 
 	public String ModelEditor_Delete;
-	public String ModelEditor_ExpandSubtree;
 	public String ModelEditor_Form;
 	public String ModelEditor_XMI;
 	public String ModelEditor_ExternalizeStrings;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 8044596a2e..9fb51c7e80 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -598,7 +598,6 @@ AreaIconDialogEditor_DialogTitle=Area Icon Search
 AreaIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
 
 ModelEditor_Delete=Remove
-ModelEditor_ExpandSubtree=Expand subtree
 ModelEditor_Form=Form
 ModelEditor_XMI=XMI
 ModelEditor_ExternalizeStrings=Externalize Strings

From 6523a640f74fe6257f87ae7d37c5f7bbf3f9b59e Mon Sep 17 00:00:00 2001
From: Christian Zahl <mail@dcc-net.de>
Date: Sat, 8 Dec 2012 17:56:23 +0100
Subject: [PATCH 0536/1286] bug 395546: The search in feature select dialog
 does not work https://bugs.eclipse.org/bugs/show_bug.cgi?id=395546

---
 .../dialogs/FeatureSelectionDialog.java       | 53 +++++++++++++++----
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index 079b1a8ee3..06668e6cb2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -46,6 +46,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -61,6 +63,7 @@ public class FeatureSelectionDialog extends TitleAreaDialog {
 	private MStringModelFragment fragment;
 	private EditingDomain editingDomain;
 	private Messages Messages;
+	private ViewerFilterImpl filter;
 
 	public FeatureSelectionDialog(Shell parentShell, EditingDomain editingDomain, MStringModelFragment fragment, Messages Messages) {
 		super(parentShell);
@@ -109,6 +112,22 @@ public void widgetDisposed(DisposeEvent e) {
 		final Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
+		searchText.addModifyListener(new ModifyListener() {
+
+			public void modifyText(ModifyEvent e) {
+				if (filter != null) {
+					filter.setPattern(searchText.getText());
+					if (viewer != null) {
+						viewer.refresh();
+						if (searchText.getText().length() > 0) {
+							viewer.expandAll();
+						} else {
+							viewer.collapseAll();
+						}
+					}
+				}
+			}
+		});
 		new Label(container, SWT.NONE);
 		viewer = new TreeViewer(container);
 		GridData gd = new GridData(GridData.FILL_BOTH);
@@ -146,7 +165,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 			}
 		});
 
-		final ViewerFilterImpl filter = new ViewerFilterImpl();
+		filter = new ViewerFilterImpl();
 
 		viewer.addFilter(filter);
 
@@ -266,24 +285,38 @@ public String getText(Object element) {
 	}
 
 	static class ViewerFilterImpl extends ViewerFilter {
+		private static final String WILDCARD = "*"; //$NON-NLS-1$
 		private StringMatcher matcher;
 
 		@Override
 		public boolean select(Viewer viewer, Object parentElement, Object element) {
+			ILabelProvider pv = (ILabelProvider) ((StructuredViewer) viewer).getLabelProvider();
 
 			if (element.getClass() == InternalPackage.class) {
-				ILabelProvider pv = (ILabelProvider) ((StructuredViewer) viewer).getLabelProvider();
 				for (InternalClass c : ((InternalPackage) element).classes) {
 					if (match(pv.getText(c))) {
 						return true;
 					}
+					for (InternalFeature f : c.features) {
+						if (match(pv.getText(f))) {
+							return true;
+						}
+					}
+				}
+				return false;
+			} else if (element.getClass() == InternalClass.class) {
+				if (match(pv.getText(element))) {
+					return true;
+				}
+				for (InternalFeature f : ((InternalClass) element).features) {
+					if (match(pv.getText(f))) {
+						return true;
+					}
 				}
 				return false;
-			} else if (element.getClass() == InternalPackage.class) {
-				ILabelProvider pv = (ILabelProvider) ((StructuredViewer) viewer).getLabelProvider();
+			} else if (element.getClass() == InternalFeature.class) {
 				return match(pv.getText(element));
 			}
-
 			return true;
 		}
 
@@ -332,13 +365,13 @@ private boolean match(String string) {
 		 */
 		public void setPattern(String patternString) {
 
-			if (patternString == null || patternString.equals("")) { //$NON-NLS-1$
+			if (patternString == null || patternString.length() == 0) {
 				matcher = null;
 			} else {
-				String pattern = patternString + "*"; //$NON-NLS-1$
-				// if (includeLeadingWildcard) {
-				//					pattern = "*" + pattern; //$NON-NLS-1$
-				// }
+				String pattern = patternString + WILDCARD;
+				if (!pattern.startsWith(WILDCARD)) {
+					pattern = WILDCARD + pattern;
+				}
 				matcher = new StringMatcher(pattern, true, false);
 			}
 		}

From 74ea38c024d6d9be8ce029c276417bdfda508f2c Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Sat, 8 Dec 2012 21:59:41 +0100
Subject: [PATCH 0537/1286] Created new component ViewerElement bug 391335:
 Fragment Editor layout changes
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=391335

---
 .../common/uistructure/ViewerElement.java     | 232 ++++++++++++++++++
 1 file changed, 232 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
new file mode 100644
index 0000000000..46f9c64181
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
@@ -0,0 +1,232 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Remain BV and others
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Wim Jongman <wim.jongman@remainsoftware.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.uistructure;
+
+import java.util.List;
+import javax.inject.Inject;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.services.Translation;
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A viewer with buttons.
+ * 
+ * @author wim.jongman@remainsoftware.com
+ * 
+ */
+public class ViewerElement {
+
+	Messages Messages;
+
+	private StructuredViewer viewer;
+	private AbstractComponentEditor editor;
+	private ComboViewer dropDown;
+	private Button addButton;
+	private Composite parent;
+	private EReference reference;
+
+	/**
+	 * @param parent
+	 * @param reference
+	 * @param editor
+	 */
+	@Inject
+	public ViewerElement(@Translation Messages Messages, Composite parent, EReference reference, AbstractComponentEditor editor) {
+		this.parent = parent;
+		this.reference = reference;
+		this.editor = editor;
+		this.Messages = Messages;
+		createControl();
+	}
+
+	public StructuredViewer getViewer() {
+		return viewer;
+	}
+
+	public void createControl() {
+
+		createTopButtons();
+
+		if (viewer == null)
+			viewer = new TableViewer(parent);
+
+		GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 3, 1);
+		viewer.getControl().setLayoutData(gd);
+
+		createBottomButtons();
+
+	}
+
+	private void createBottomButtons() {
+		Composite buttonCompBot = new Composite(parent, SWT.NONE);
+		buttonCompBot.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 3, 1));
+		GridLayout gl = new GridLayout(3, false);
+		gl.marginLeft = 0;
+		gl.marginRight = 0;
+		gl.marginWidth = 0;
+		gl.marginHeight = 0;
+		buttonCompBot.setLayout(gl);
+
+		Button b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ModelTooling_Common_Up);
+		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_arrow_up));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 1, 1));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MModelFragments container = (MModelFragments) editor.getMaster().getValue();
+						int idx = container.getImports().indexOf(obj) - 1;
+						if (idx >= 0) {
+							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), reference, obj, idx);
+
+							if (cmd.canExecute()) {
+								editor.getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+
+					}
+				}
+			}
+		});
+
+		b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ModelTooling_Common_Down);
+		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_arrow_down));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 1, 1));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MModelFragments container = (MModelFragments) editor.getMaster().getValue();
+						int idx = container.getImports().indexOf(obj) + 1;
+						if (idx < container.getImports().size()) {
+							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), reference, obj, idx);
+
+							if (cmd.canExecute()) {
+								editor.getEditingDomain().getCommandStack().execute(cmd);
+								viewer.setSelection(new StructuredSelection(obj));
+							}
+						}
+
+					}
+				}
+			}
+		});
+
+		b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ModelTooling_Common_Remove);
+		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_delete));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 1, 1));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
+					Command cmd = RemoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), reference, elements);
+					if (cmd.canExecute()) {
+						editor.getEditingDomain().getCommandStack().execute(cmd);
+					}
+				}
+			}
+		});
+	}
+
+	private void createTopButtons() {
+		Composite buttonCompTop = new Composite(parent, SWT.NONE);
+		buttonCompTop.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 3, 1));
+		GridLayout buttonCompTopLayout = new GridLayout(2, false);
+		buttonCompTopLayout.marginLeft = 0;
+		buttonCompTopLayout.marginRight = 0;
+		buttonCompTopLayout.marginWidth = 0;
+		buttonCompTopLayout.marginHeight = 0;
+		buttonCompTop.setLayout(buttonCompTopLayout);
+
+		dropDown = new ComboViewer(buttonCompTop);
+		dropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+
+		addButton = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);
+		addButton.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_add));
+		addButton.setText(Messages.ModelTooling_Common_AddEllipsis);
+		addButton.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		addButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				EClass eClass = ((FeatureClass) ((IStructuredSelection) dropDown.getSelection()).getFirstElement()).eClass;
+				EObject eObject = EcoreUtil.create(eClass);
+
+				Command cmd = AddCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), reference, eObject);
+
+				if (cmd.canExecute()) {
+					editor.getEditingDomain().getCommandStack().execute(cmd);
+					editor.getEditor().setSelection(eObject);
+				}
+			}
+		});
+
+	}
+
+	public ComboViewer getDropDown() {
+		return dropDown;
+	}
+
+	/**
+	 * Creates and returns a new instance of this class based on the supplied
+	 * context.
+	 * 
+	 * @param parentContext
+	 * @param parent
+	 * @param reference
+	 * @param editor
+	 * @return a new {@link ViewerElement}
+	 */
+	public static ViewerElement create(IEclipseContext parentContext, Composite parent, EReference reference, AbstractComponentEditor editor) {
+		IEclipseContext mycontext = parentContext.createChild();
+		mycontext.set(Composite.class, parent);
+		mycontext.set(AbstractComponentEditor.class, editor);
+		mycontext.set(EReference.class, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
+		return ContextInjectionFactory.make(ViewerElement.class, mycontext);
+	}
+}

From 25e6e29043add919f80a287a6a975a0ceade42ef Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Sat, 8 Dec 2012 22:07:04 +0100
Subject: [PATCH 0538/1286] fixed the layout problems of the Fragment editor
 with the new ViewerElement class which is re-used in the VModelImportsEditor
 396001: Fragment Editor layout changes Main:   
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=396001 Related:
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=391335

---
 .../component/ModelFragmentsEditor.java       | 228 +++++-------------
 .../virtual/VModelImportsEditor.java          | 200 +++------------
 2 files changed, 98 insertions(+), 330 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index db4380bac4..9984e587bd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -16,12 +16,15 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.ViewerElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
 import org.eclipse.e4.ui.model.fragment.MModelFragment;
@@ -32,15 +35,12 @@
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -58,7 +58,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 
 public class ModelFragmentsEditor extends AbstractComponentEditor {
 
@@ -67,6 +66,9 @@ public class ModelFragmentsEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 
+	@Inject
+	IEclipseContext context;
+
 	@Inject
 	public ModelFragmentsEditor() {
 		super();
@@ -98,172 +100,31 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 	private Composite createForm(Composite parent) {
 		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		createFragmentsTab(folder);
+		createImportsTab(folder);
+		folder.setSelection(0);
+		return folder;
+	}
+
+	private void createFragmentsTab(CTabFolder folder) {
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
-		item.setText(Messages.ModelTooling_Common_TabDefault);
+		item.setText(Messages.ModelFragmentsEditor_ModelFragments);
 
-		parent = createScrollableContainer(folder);
+		Composite parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
-			ControlFactory.createXMIId(parent, this);
-		}
-
-		{
-			GridLayout layout = (GridLayout) parent.getLayout();
-			layout.numColumns = 2;
-
-			Composite impCompo = new Composite(parent, SWT.NONE);
-			impCompo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			impCompo.setLayout(new GridLayout());
-			Label l = new Label(impCompo, SWT.NONE);
-			l.setText(Messages.ModelFragmentsEditor_Imports);
-			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
-			final TableViewer viewer = new TableViewer(impCompo);
-			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 200;
-			viewer.getControl().setLayoutData(gd);
-
-			IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
-			viewer.setInput(prop.observeDetail(getMaster()));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MModelFragments container = (MModelFragments) getMaster().getValue();
-							int idx = container.getImports().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MModelFragments container = (MModelFragments) getMaster().getValue();
-							int idx = container.getImports().indexOf(obj) + 1;
-							if (idx < container.getImports().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					FeatureClass eclass = (FeatureClass) element;
-					return eclass.label;
-				}
-			});
-			childrenDropDown.setComparator(new ViewerComparator() {
-				@Override
-				public int compare(Viewer viewer, Object e1, Object e2) {
-					FeatureClass eClass1 = (FeatureClass) e1;
-					FeatureClass eClass2 = (FeatureClass) e2;
-					return eClass1.label.compareTo(eClass2.label);
-				}
-			});
-
-			List<FeatureClass> list = new ArrayList<FeatureClass>();
-			addClasses(ApplicationPackageImpl.eINSTANCE, list);
-			list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
-
-			childrenDropDown.setInput(list);
-			childrenDropDown.getCombo().select(0);
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					EClass eClass = ((FeatureClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement()).eClass;
-					EObject eObject = EcoreUtil.create(eClass);
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, eObject);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(eObject);
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
-
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, elements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
-		}
-
 		{
 
 			Composite fragCompo = new Composite(parent, SWT.NONE);
-			fragCompo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			fragCompo.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1));
 			fragCompo.setLayout(new GridLayout());
-			Label l = new Label(fragCompo, SWT.NONE);
-			l.setText(Messages.ModelFragmentsEditor_ModelFragments);
-			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+			GridLayout fragCompoLayout = new GridLayout(1, false);
+			fragCompoLayout.marginLeft = 0;
+			fragCompoLayout.marginRight = 0;
+			fragCompoLayout.marginWidth = 0;
+			fragCompoLayout.marginHeight = 0;
+			fragCompo.setLayout(fragCompoLayout);
 
 			final TableViewer viewer = new TableViewer(fragCompo);
 			viewer.setContentProvider(new ObservableListContentProvider());
@@ -375,9 +236,50 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		folder.setSelection(0);
+	}
 
-		return folder;
+	private void createImportsTab(CTabFolder folder) {
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelFragmentsEditor_Imports);
+
+		Composite parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
+		ViewerElement tableElement = ViewerElement.create(context, parent, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, this);
+		tableElement.getViewer().setContentProvider(new ObservableListContentProvider());
+		tableElement.getViewer().setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
+
+		tableElement.getDropDown().setContentProvider(new ArrayContentProvider());
+		tableElement.getDropDown().setLabelProvider(new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				FeatureClass eclass = (FeatureClass) element;
+				return eclass.label;
+			}
+		});
+		tableElement.getDropDown().setComparator(new ViewerComparator() {
+			@Override
+			public int compare(Viewer viewer, Object e1, Object e2) {
+				FeatureClass eClass1 = (FeatureClass) e1;
+				FeatureClass eClass2 = (FeatureClass) e2;
+				return eClass1.label.compareTo(eClass2.label);
+			}
+		});
+
+		List<FeatureClass> list = new ArrayList<FeatureClass>();
+		Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
+		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
+
+		tableElement.getDropDown().setInput(list);
+		tableElement.getDropDown().getCombo().select(0);
+
+		IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
+		tableElement.getViewer().setInput(prop.observeDetail(getMaster()));
 	}
 
 	public void addClasses(EPackage ePackage, List<FeatureClass> list) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index 38d0eeb91f..16863519f6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -15,49 +15,35 @@
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.ViewerElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
-import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 public class VModelImportsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private TableViewer viewer;
+	private ViewerElement tableElement;
+
+	@Inject
+	IEclipseContext eclipseContext;
 
 	@Inject
 	public VModelImportsEditor() {
@@ -91,13 +77,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 			composite = createForm(parent, context, getMaster());
 		}
 		VirtualEntry<?> o = (VirtualEntry<?>) object;
-		viewer.setInput(o.getList());
+		tableElement.getViewer().setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
 		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		composite = folder;
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -105,160 +92,39 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		{
-			viewer = new TableViewer(parent);
-			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MModelFragments container = (MModelFragments) getMaster().getValue();
-							int idx = container.getImports().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MModelFragments container = (MModelFragments) getMaster().getValue();
-							int idx = container.getImports().indexOf(obj) + 1;
-							if (idx < container.getImports().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					FeatureClass eclass = (FeatureClass) element;
-					return eclass.label;
-				}
-			});
-			childrenDropDown.setComparator(new ViewerComparator() {
-				@Override
-				public int compare(Viewer viewer, Object e1, Object e2) {
-					FeatureClass eClass1 = (FeatureClass) e1;
-					FeatureClass eClass2 = (FeatureClass) e2;
-					return eClass1.label.compareTo(eClass2.label);
-				}
-			});
-
-			List<FeatureClass> list = new ArrayList<FeatureClass>();
-			addClasses(ApplicationPackageImpl.eINSTANCE, list);
-			list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
-
-			childrenDropDown.setInput(list);
-			childrenDropDown.getCombo().select(0);
+		tableElement = ViewerElement.create(eclipseContext, parent, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, this);
+		tableElement.getViewer().setContentProvider(new ObservableListContentProvider());
+		tableElement.getViewer().setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					EClass eClass = ((FeatureClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement()).eClass;
-					EObject eObject = EcoreUtil.create(eClass);
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, eObject);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(eObject);
-					}
-				}
-			});
+		tableElement.getDropDown().setContentProvider(new ArrayContentProvider());
+		tableElement.getDropDown().setLabelProvider(new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				FeatureClass eclass = (FeatureClass) element;
+				return eclass.label;
+			}
+		});
+		tableElement.getDropDown().setComparator(new ViewerComparator() {
+			@Override
+			public int compare(Viewer viewer, Object e1, Object e2) {
+				FeatureClass eClass1 = (FeatureClass) e1;
+				FeatureClass eClass2 = (FeatureClass) e2;
+				return eClass1.label.compareTo(eClass2.label);
+			}
+		});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+		List<FeatureClass> list = new ArrayList<FeatureClass>();
+		Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
+		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
 
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, elements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
-		}
+		tableElement.getDropDown().setInput(list);
+		tableElement.getDropDown().getCombo().select(0);
 
 		folder.setSelection(0);
 
 		return folder;
 	}
 
-	public void addClasses(EPackage ePackage, List<FeatureClass> list) {
-		for (EClassifier c : ePackage.getEClassifiers()) {
-			if (c instanceof EClass) {
-				EClass eclass = (EClass) c;
-				if (eclass != ApplicationPackageImpl.Literals.APPLICATION && !eclass.isAbstract() && !eclass.isInterface() && eclass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT)) {
-					list.add(new FeatureClass(eclass.getName(), eclass));
-				}
-			}
-		}
-
-		for (EPackage eSubPackage : ePackage.getESubpackages()) {
-			addClasses(eSubPackage, list);
-		}
-	}
-
 	@Override
 	public IObservableList getChildList(Object element) {
 		return null;

From 0ed1122b80bbf343f6ca155af7f8b58516f35349 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Sun, 9 Dec 2012 17:47:39 +0100
Subject: [PATCH 0539/1286] Added back the ShadowComposite Made the tree not
 full-selection to be in line with eclipse bug 391086: Search the model editor
 tree. https://bugs.eclipse.org/bugs/show_bug.cgi?id=391086

---
 .../emf/ui/internal/common/ModelEditor.java   | 36 +++++--------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index db88af1f46..8062ac4878 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -918,18 +918,15 @@ public void setSelectionService(@Optional ISelectionProviderService selectionSer
 
 	private TreeViewer createTreeViewerArea(Composite parent) {
 
-		parent = new FilteredTree(parent, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(), true);
-		parent.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
-		parent.setBackgroundMode(SWT.INHERIT_DEFAULT);
+		final ShadowComposite treeArea = new ShadowComposite(parent, SWT.NONE);
+
+		treeArea.setLayout(new FillLayout());
+		treeArea.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
+		treeArea.setBackgroundMode(SWT.INHERIT_DEFAULT);
 
-		// FillLayout l = new FillLayout();
-		// l.marginWidth = 5;
-		// parent.setLayout(l);
-		// ShadowComposite editingArea = new ShadowComposite(parent, SWT.NONE);
-		// editingArea.setLayout(new FillLayout());
-		// final TreeViewer viewer = new TreeViewer(editingArea,
-		// SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
-		final TreeViewer viewer = ((FilteredTree) parent).getViewer();
+		final FilteredTree viewParent = new FilteredTree(treeArea, SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(), true);
+
+		final TreeViewer viewer = ((FilteredTree) viewParent).getViewer();
 
 		viewer.setLabelProvider(new ComponentLabelProvider(this, messages));
 		ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(new ObservableFactoryImpl(), new TreeStructureAdvisorImpl());
@@ -993,23 +990,6 @@ public void treeCollapsed(TreeEvent e) {
 			}
 		});
 
-		// ViewerDropAdapter adapter = new ViewerDropAdapter(viewer) {
-		//
-		// @Override
-		// public boolean validateDrop(Object target, int operation,
-		// TransferData transferType) {
-		// // TODO Auto-generated method stub
-		// return false;
-		// }
-		//
-		// @Override
-		// public boolean performDrop(Object data) {
-		// // TODO Auto-generated method stub
-		// return false;
-		// }
-		// };
-		// adapter.setFeedbackEnabled(true);
-
 		int ops = DND.DROP_MOVE;
 		viewer.addDragSupport(ops, new Transfer[] { MemoryTransfer.getInstance() }, new DragListener(viewer));
 		viewer.addDropSupport(ops, new Transfer[] { MemoryTransfer.getInstance() }, new DropListener(viewer, modelProvider.getEditingDomain()));

From 584bdae3474537d9ff410d0d936f7446c936e910 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Mon, 10 Dec 2012 00:41:33 +0100
Subject: [PATCH 0540/1286] Added refactoring support for package, folder and
 file change. Added reload of model editor after refactoring. bug 395174:
 e4xmi should participate in package renaming
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=395174

---
 .../plugin.xml                                |  15 ++-
 .../emf/editor3x/ClassRenameParticipant.java  | 126 ++++++++++++++++--
 .../editor3x/RefactorParticipantDelegate.java |   4 +-
 .../internal/wbm/ApplicationModelEditor.java  |  43 ++++++
 4 files changed, 172 insertions(+), 16 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index f47fd93ed8..292826c0bd 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -45,7 +45,20 @@
 	  	    </iterate>
 	  	  </with>
 	  	  <with variable="element">
-		  	 <instanceof value="org.eclipse.jdt.core.IType"/>
+           <or>
+            <instanceof
+                  value="org.eclipse.jdt.core.IType">
+            </instanceof>
+            <instanceof
+                  value="org.eclipse.jdt.core.IPackageFragment">
+            </instanceof>
+            <instanceof
+                  value="org.eclipse.core.resources.IFile">
+            </instanceof>
+            <instanceof
+                  value="org.eclipse.core.resources.IFolder">
+            </instanceof>
+         </or>
 	  	  </with>
 	  	</enablement>
       </renameParticipant>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java
index e053cda698..1ea3f19c5a 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java
@@ -10,10 +10,13 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.e4.tools.emf.editor3x.extension.Util;
+import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.ltk.core.refactoring.Change;
 import org.eclipse.ltk.core.refactoring.RefactoringStatus;
@@ -21,17 +24,34 @@
 
 public class ClassRenameParticipant extends
 		org.eclipse.ltk.core.refactoring.participants.RenameParticipant {
-	private IType type;
-	
+	private IType _type;
+	private IPackageFragment _pckage;
+	private IFile _file;
+	private IFolder _folder;
+
 	@Override
 	protected boolean initialize(Object element) {
-		if( element instanceof IType ) {
-			type = (IType) element;
-		} else {
-			type = null;
+
+		if (element instanceof IType) {
+			_type = (IType) element;
+			return true;
+		}
+
+		if (element instanceof IPackageFragment) {
+			_pckage = (IPackageFragment) element;
+			return true;
+		}
+
+		if (element instanceof IFile) {
+			_file = (IFile) element;
+			return true;
+		}
+
+		if (element instanceof IFolder) {
+			_folder = (IFolder) element;
+			return true;
 		}
-		
-		return type != null;
+		return false;
 	}
 
 	@Override
@@ -48,11 +68,91 @@ public RefactoringStatus checkConditions(IProgressMonitor pm,
 	@Override
 	public Change createChange(IProgressMonitor pm) throws CoreException,
 			OperationCanceledException {
-		String bundle = Util.getBundleSymbolicName(type.getJavaProject().getProject());
-		
-		final String newUrl = "bundleclass://" + bundle + "/" + (type.getPackageFragment().getElementName().length() == 0 ? getArguments().getNewName() : type.getPackageFragment().getElementName() + "." + getArguments().getNewName());
-		String oldUrl = "bundleclass://" + bundle + "/" + type.getFullyQualifiedName().replace(".", "\\.");
-		return RefactorParticipantDelegate.createChange(pm, this, oldUrl, newUrl);
+		if (_type != null) {
+			return createClassChange(pm, _type);
+		}
+
+		if (_pckage != null) {
+			return createPackageChange(pm, _pckage);
+		}
+
+		if (_file != null) {
+			return createFileChange(pm, _file);
+		}
+
+		if (_folder != null) {
+			return createFolderChange(pm, _folder);
+		}
+
+		return null;
+	}
+
+	private Change createFolderChange(IProgressMonitor pm, IFolder folder)
+			throws CoreException {
+
+		String SPLIT = "/";
+		if (folder.getParent().getFullPath().segmentCount() == 1) {
+			SPLIT = "";
+		}
+
+		String newUrl = "platform:/plugin/" + folder.getProject().getName() + "/"
+				+ folder.getParent().getProjectRelativePath().toString()
+				+ SPLIT + getArguments().getNewName();
+
+		String oldUrl = "platform:/plugin" + folder.getFullPath();
+
+		return RefactorParticipantDelegate.createChange(pm, this, oldUrl,
+				newUrl);
+	}
+
+	private Change createFileChange(IProgressMonitor pm, IFile file)
+			throws CoreException {
+
+		String SPLIT = "/";
+		if (file.getParent().getFullPath().segmentCount() == 1) {
+			SPLIT = "";
+		}
+		String newUrl = "platform:/plugin/" + file.getProject().getName() + "/"
+				+ file.getParent().getProjectRelativePath().toString() + SPLIT
+				+ getArguments().getNewName();
+
+		String oldUrl = "platform:/plugin" + file.getFullPath();
+
+		return RefactorParticipantDelegate.createChange(pm, this, oldUrl,
+				newUrl);
+	}
+
+	private Change createPackageChange(IProgressMonitor pm,
+			IPackageFragment pckage) throws CoreException {
+		String bundle = Util.getBundleSymbolicName(pckage.getJavaProject()
+				.getProject());
+
+		final String newUrl = "bundleclass://" + bundle + "/"
+				+ getArguments().getNewName();
+
+		String oldUrl = "bundleclass://" + bundle + "/"
+				+ pckage.getElementName();
+
+		return RefactorParticipantDelegate.createChange(pm, this, oldUrl,
+				newUrl);
+	}
+
+	private Change createClassChange(IProgressMonitor pm, IType type)
+			throws CoreException {
+		String bundle = Util.getBundleSymbolicName(type.getJavaProject()
+				.getProject());
+
+		final String newUrl = "bundleclass://"
+				+ bundle
+				+ "/"
+				+ (type.getPackageFragment().getElementName().length() == 0 ? getArguments()
+						.getNewName() : type.getPackageFragment()
+						.getElementName() + "." + getArguments().getNewName());
+		String oldUrl = "bundleclass://" + bundle + "/"
+				+ type.getFullyQualifiedName().replace(".", "\\.");
+
+		return RefactorParticipantDelegate.createChange(pm, this, oldUrl,
+				newUrl);
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
index 0ba52ad123..f38b95a19f 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
@@ -61,7 +61,7 @@ public boolean acceptPatternMatch(TextSearchMatchAccess matchAccess)
 						matchAccess.getMatchLength(), newUrl);
 				change.addEdit(edit);
 				change.addTextEditGroup(new TextEditGroup(
-						"Update contribution reference", edit)); //$NON-NLS-1$
+						"Eclipse 4 Application Model Changes", edit)); //$NON-NLS-1$
 				return true;
 			}
 		};
@@ -71,7 +71,7 @@ public boolean acceptPatternMatch(TextSearchMatchAccess matchAccess)
 			return null;
 
 		CompositeChange result = new CompositeChange(
-				"Update contribution reference"); //$NON-NLS-1$
+				"Eclipse 4 Application Model Changes"); //$NON-NLS-1$
 		for (TextFileChange c : changes.values()) {
 			result.add(c);
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index e5e64ebb83..136d751f61 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -13,6 +13,7 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.wbm;
 
+import java.io.IOException;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -20,17 +21,23 @@
 import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.e4.ui.di.UISynchronize;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
+import org.osgi.framework.FrameworkUtil;
 
 public class ApplicationModelEditor extends ModelEditor {
 
@@ -47,6 +54,12 @@ public class ApplicationModelEditor extends ModelEditor {
 
 	private IProject project;
 
+	@Inject
+	Shell shell;
+
+	@Inject
+	UISynchronize sync;
+
 	@Inject
 	public ApplicationModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, @Named(EDITORPROJECT) @Optional IProject project, IResourcePool resourcePool) {
 		super(composite, context, modelProvider, project, resourcePool);
@@ -96,10 +109,40 @@ public void resourceChanged(IResourceChangeEvent event) {
 			if (delta.getKind() == IResourceDelta.REMOVED) {
 				hidePart(true);
 			}
+
+			if (delta.getKind() == IResourceDelta.CHANGED) {
+				try {
+					resource.unload();
+					resource.load(null);
+					// must be done in ui thread because of databinding
+					sync.syncExec(new Runnable() {
+						public void run() {
+							getModelProvider().replaceRoot(resource.getContents().get(0));
+							getModelProvider().save(); // avoids dirty state
+						}
+					});
+				} catch (IOException e) {
+					statusDialog(e);
+				}
+			}
 		}
 
 		private void hidePart(boolean force) {
 			partService.hidePart(part, force);
 		}
 	};
+
+	protected void statusDialog(final Exception exc) {
+		try {
+			sync.syncExec(new Runnable() {
+				public void run() {
+					String bundle = FrameworkUtil.getBundle(getClass()).getSymbolicName();
+					Status status = new Status(IStatus.ERROR, bundle, exc.getMessage());
+					ErrorDialog.openError(shell, exc.getMessage(), exc.getMessage(), status);
+					exc.printStackTrace(System.err);
+				}
+			});
+		} catch (Exception e) {
+		}
+	}
 }
\ No newline at end of file

From e0b6a9024cadcff7509eb0f5b96c72901380340d Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Mon, 10 Dec 2012 16:24:14 +0100
Subject: [PATCH 0541/1286] Undo model reload after change. This caused the
 tree to collapse when save was pressed in the model editor. bug 396159:
 CTRL+S closes the model tree
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=396159

---
 .../internal/wbm/ApplicationModelEditor.java  | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index 136d751f61..bb9600d505 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -13,7 +13,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.wbm;
 
-import java.io.IOException;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -110,21 +109,21 @@ public void resourceChanged(IResourceChangeEvent event) {
 				hidePart(true);
 			}
 
-			if (delta.getKind() == IResourceDelta.CHANGED) {
-				try {
-					resource.unload();
-					resource.load(null);
-					// must be done in ui thread because of databinding
-					sync.syncExec(new Runnable() {
-						public void run() {
-							getModelProvider().replaceRoot(resource.getContents().get(0));
-							getModelProvider().save(); // avoids dirty state
-						}
-					});
-				} catch (IOException e) {
-					statusDialog(e);
-				}
-			}
+			// if (delta.getKind() == IResourceDelta.CHANGED) {
+			// try {
+			// resource.unload();
+			// resource.load(null);
+			// // must be done in ui thread because of databinding
+			// sync.syncExec(new Runnable() {
+			// public void run() {
+			// getModelProvider().replaceRoot(resource.getContents().get(0));
+			// // getModelProvider().save(); // avoids dirty state
+			// }
+			// });
+			// } catch (IOException e) {
+			// statusDialog(e);
+			// }
+			// }
 		}
 
 		private void hidePart(boolean force) {

From e3783aa788f9db52c1a8fe70ef837434a6eae3e9 Mon Sep 17 00:00:00 2001
From: Marco Drescher <marco@descher.at>
Date: Tue, 11 Dec 2012 10:38:46 +0100
Subject: [PATCH 0542/1286] Bug 396130 - Popup Menu Icons not equivalent to
 tree entry icons

---
 .../e4/tools/emf/ui/internal/common/component/MenuEditor.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 5b3631fe05..a41adfe105 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -126,7 +126,7 @@ public MenuEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.MenuEditor_AddHandledMenuItem, createImageDescriptor(ResourceProvider.IMG_MenuItem)) {
+		actions.add(new Action(Messages.MenuEditor_AddHandledMenuItem, createImageDescriptor(ResourceProvider.IMG_HandledMenuItem)) {
 			@Override
 			public void run() {
 				handleAdd(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
@@ -138,7 +138,7 @@ public void run() {
 				handleAdd(MenuPackageImpl.Literals.MENU, false);
 			}
 		});
-		actions.add(new Action(Messages.MenuEditor_AddDirectMenuItem, createImageDescriptor(ResourceProvider.IMG_MenuItem)) {
+		actions.add(new Action(Messages.MenuEditor_AddDirectMenuItem, createImageDescriptor(ResourceProvider.IMG_DirectMenuItem)) {
 			@Override
 			public void run() {
 				handleAdd(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false);

From 80b9a91a1e93372ef221b196330979c515e96013 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Wed, 12 Dec 2012 11:38:15 +0100
Subject: [PATCH 0543/1286] Bug 395591 - Adding a Model Addon does not update
 its description in the tree

---
 .../tools/emf/ui/internal/common/component/AddonsEditor.java | 5 +++++
 .../ui/internal/common/component/CommandParameterEditor.java | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index bde56f2fa1..ae6f03c97b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -29,6 +29,7 @@
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -227,4 +228,8 @@ public IObservableList getChildList(Object element) {
 		return null;
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI) };
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index cdb927736a..ffea0eb2c5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -51,7 +51,6 @@ public CommandParameterEditor() {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		// TODO Auto-generated method stub
 		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME), FeaturePath.fromList(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID) };
 	}
 

From fd49b6752c3aa5215ffe041b97be1614fa6726a7 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Wed, 12 Dec 2012 12:12:14 +0100
Subject: [PATCH 0544/1286] Bug 396388 - Increase rules compliance on e4 code

---
 .../e4/tools/emf/editor3x/TargetElementProviders.java     | 5 +----
 .../org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java | 8 ++++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
index 66645ee732..39356e0912 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
@@ -104,10 +104,7 @@ private void applyFilter(Filter filter, ModelResultHandler handler) {
 						true);
 				while (it.hasNext()) {
 					EObject o = it.next();
-					if (o.eContainingFeature() == FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
-//						System.err
-//								.println("Skipped because it is an import");
-					} else {
+					if (o.eContainingFeature() != FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
 						if (o.eClass().equals(filter.eClass)) {
 //							System.err.println("Found: " + o);
 							handler.result(o);
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java
index 39074b0341..4052b79be8 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java
@@ -15,7 +15,7 @@ public class EditUIUtil {
 		Class<?> fileClass = null;
 		try {
 			fileClass = IFile.class;
-		} catch (Throwable exception) {
+		} catch (Exception exception) {
 			// Ignore any exceptions and assume the class isn't available.
 		}
 		FILE_CLASS = fileClass;
@@ -34,7 +34,7 @@ public class EditUIUtil {
 						.loadClass("org.eclipse.team.core.history.IFileRevision");
 				fileRevisionGetURIMethod = fileRevisionClass
 						.getMethod("getURI");
-			} catch (Throwable exeption) {
+			} catch (Exception exeption) {
 				// Ignore any exceptions and assume the class isn't available.
 			}
 		}
@@ -47,7 +47,7 @@ public class EditUIUtil {
 		Class<?> uriEditorInputClass = null;
 		try {
 			uriEditorInputClass = IURIEditorInput.class;
-		} catch (Throwable exception) {
+		} catch (Exception exception) {
 			// The class is not available.
 		}
 		URI_EDITOR_INPUT_CLASS = uriEditorInputClass;
@@ -69,7 +69,7 @@ public static URI getURI(IEditorInput editorInput) {
 					return URI
 							.createURI(((java.net.URI) FILE_REVISION_GET_URI_METHOD
 									.invoke(fileRevision)).toString());
-				} catch (Throwable exception) {
+				} catch (Exception exception) {
 					// TODO Log error
 				}
 			}

From 3109a65ce795403888d9c124637486935ad2f656 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Wed, 12 Dec 2012 12:22:00 +0100
Subject: [PATCH 0545/1286] Fix from previous commit


From 5a0e494c173c10db8a9067d0339586bcafc4b91a Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Sun, 16 Dec 2012 17:05:29 +0100
Subject: [PATCH 0546/1286] Let the resource change listener know that she
 herself caused the resource change. This is solved by setting a flag in
 doSave. If the flag is set during the resource change then the model will not
 be reloaded which is good.

bug 395174: Provide refactoring support for e4xmi files
https://bugs.eclipse.org/bugs/show_bug.cgi?id=395174
---
 .../emf/ui/internal/common/ModelEditor.java   | 23 ++++++++-
 .../internal/wbm/ApplicationModelEditor.java  | 49 +++++++++++++------
 2 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 8062ac4878..be541f7275 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -310,6 +310,8 @@ public class ModelEditor {
 
 	private boolean mod1Down = false;
 
+	private boolean saving;
+
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project, final IResourcePool resourcePool) {
 		this.resourcePool = resourcePool;
 		this.modelProvider = modelProvider;
@@ -1213,11 +1215,28 @@ public AbstractComponentEditor getEditor(EClass eClass) {
 
 	@Persist
 	public void doSave(@Optional IProgressMonitor monitor) {
-		if (modelProvider.isSaveable()) {
-			modelProvider.save();
+
+		try {
+			setSaving(true);
+			if (modelProvider.isSaveable()) {
+				modelProvider.save();
+			}
+		} finally {
+			setSaving(false);
 		}
 	}
 
+	private void setSaving(boolean saving) {
+		this.saving = saving;
+	}
+
+	/**
+	 * @return true if the editor is currently in the progress of saving.
+	 */
+	protected boolean isSaving() {
+		return saving;
+	}
+
 	@Focus
 	public void setFocus() {
 		if (clipboardHandler == null) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index bb9600d505..e05ca64dd3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -13,6 +13,7 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.wbm;
 
+import java.io.IOException;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -109,21 +110,15 @@ public void resourceChanged(IResourceChangeEvent event) {
 				hidePart(true);
 			}
 
-			// if (delta.getKind() == IResourceDelta.CHANGED) {
-			// try {
-			// resource.unload();
-			// resource.load(null);
-			// // must be done in ui thread because of databinding
-			// sync.syncExec(new Runnable() {
-			// public void run() {
-			// getModelProvider().replaceRoot(resource.getContents().get(0));
-			// // getModelProvider().save(); // avoids dirty state
-			// }
-			// });
-			// } catch (IOException e) {
-			// statusDialog(e);
-			// }
-			// }
+			// If the current model editor is causing this resource change event
+			// then skip the reload.
+			if (!isSaving()) {
+
+				// reload the model if the file has changed
+				if (delta.getKind() == IResourceDelta.CHANGED) {
+					reloadModel();
+				}
+			}
 		}
 
 		private void hidePart(boolean force) {
@@ -131,6 +126,12 @@ private void hidePart(boolean force) {
 		}
 	};
 
+	/**
+	 * Shows an error dialog based on the passed exception. It should never
+	 * occur but if it does, the user can report a problem.
+	 * 
+	 * @param exc
+	 */
 	protected void statusDialog(final Exception exc) {
 		try {
 			sync.syncExec(new Runnable() {
@@ -144,4 +145,22 @@ public void run() {
 		} catch (Exception e) {
 		}
 	}
+
+	/**
+	 * Reload the model.
+	 */
+	protected void reloadModel() {
+		try {
+			resource.unload();
+			resource.load(null);
+			// must be done in ui thread because of databinding
+			sync.syncExec(new Runnable() {
+				public void run() {
+					getModelProvider().replaceRoot(resource.getContents().get(0));
+				}
+			});
+		} catch (IOException e) {
+			statusDialog(e);
+		}
+	}
 }
\ No newline at end of file

From 2eecd0807d021ccccaea20eae15311027a8c8daa Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Sun, 16 Dec 2012 17:08:14 +0100
Subject: [PATCH 0547/1286] Renamed ClassRenameParticipant to
 RenameParticipant. It is not only there for renaming classes. bug 395174:
 Provide refactoring support for e4xmi files
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=395174

---
 bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml            | 2 +-
 .../{ClassRenameParticipant.java => RenameParticipant.java}     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/{ClassRenameParticipant.java => RenameParticipant.java} (99%)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index 292826c0bd..86a929eb32 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -35,7 +35,7 @@
    <extension
          point="org.eclipse.ltk.core.refactoring.renameParticipants">
       <renameParticipant
-            class="org.eclipse.e4.tools.emf.editor3x.ClassRenameParticipant"
+            class="org.eclipse.e4.tools.emf.editor3x.RenameParticipant"
             id="org.eclipse.e4.tools.emf.editor3x.renameParticipant"
             name="Workbench Model Contribution Participant">
          <enablement>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RenameParticipant.java
similarity index 99%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java
rename to bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RenameParticipant.java
index 1ea3f19c5a..5972877a62 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassRenameParticipant.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RenameParticipant.java
@@ -22,7 +22,7 @@
 import org.eclipse.ltk.core.refactoring.RefactoringStatus;
 import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
 
-public class ClassRenameParticipant extends
+public class RenameParticipant extends
 		org.eclipse.ltk.core.refactoring.participants.RenameParticipant {
 	private IType _type;
 	private IPackageFragment _pckage;

From ab5b25217fb9d968776b490010ac32c14e199d04 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Mon, 17 Dec 2012 09:40:05 +0100
Subject: [PATCH 0548/1286] bug 396717: NPE in PatternFilter
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=395174

---
 .../org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
index 9e82fb41d1..4695375294 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
@@ -45,7 +45,9 @@ protected boolean isLeafMatch(Viewer viewer, Object element) {
 		if (labelProvider instanceof ILabelProvider) {
 			labelText = ((ILabelProvider) labelProvider).getText(element);
 		} else {
-			labelText = element.toString();
+			if (element != null) {
+				labelText = element.toString();
+			}
 		}
 
 		if (labelText == null) {

From d5aa3cf663c5dc749ad282d4a06917965f55551e Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Wed, 19 Dec 2012 10:59:04 +0100
Subject: [PATCH 0549/1286] bug 396694: Disabled the FilteredTree.
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=395174

---
 .../e4/tools/emf/ui/internal/common/ModelEditor.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index be541f7275..ba47957395 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -57,7 +57,6 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.AddonsEditor;
@@ -152,7 +151,6 @@
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.e4.ui.model.internal.ModelUtils;
-import org.eclipse.e4.ui.workbench.swt.internal.copy.FilteredTree;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -926,9 +924,11 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		treeArea.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
 		treeArea.setBackgroundMode(SWT.INHERIT_DEFAULT);
 
-		final FilteredTree viewParent = new FilteredTree(treeArea, SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(), true);
+		// final FilteredTree viewParent = new FilteredTree(treeArea,
+		// SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(), true);
+		// final TreeViewer viewer = ((FilteredTree) viewParent).getViewer();
 
-		final TreeViewer viewer = ((FilteredTree) viewParent).getViewer();
+		final TreeViewer viewer = new TreeViewer(treeArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
 
 		viewer.setLabelProvider(new ComponentLabelProvider(this, messages));
 		ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(new ObservableFactoryImpl(), new TreeStructureAdvisorImpl());

From 87c3f08bd21de32cc2b106622ba24a9d543fa2d0 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Wed, 19 Dec 2012 11:01:31 +0100
Subject: [PATCH 0550/1286] bug 395174: Added support for moving files
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=395174

---
 .../plugin.xml                                |  19 ++-
 .../emf/editor3x/ClassMoveParticipant.java    |  52 ------
 .../emf/editor3x/ModelMoveParticipant.java    | 151 ++++++++++++++++++
 ...ipant.java => ModelRenameParticipant.java} |   2 +-
 .../internal/wbm/ApplicationModelEditor.java  |  21 +--
 5 files changed, 179 insertions(+), 66 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassMoveParticipant.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java
 rename bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/{RenameParticipant.java => ModelRenameParticipant.java} (99%)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index 86a929eb32..d141b3132c 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -35,7 +35,7 @@
    <extension
          point="org.eclipse.ltk.core.refactoring.renameParticipants">
       <renameParticipant
-            class="org.eclipse.e4.tools.emf.editor3x.RenameParticipant"
+            class="org.eclipse.e4.tools.emf.editor3x.ModelRenameParticipant"
             id="org.eclipse.e4.tools.emf.editor3x.renameParticipant"
             name="Workbench Model Contribution Participant">
          <enablement>
@@ -66,7 +66,7 @@
    <extension
          point="org.eclipse.ltk.core.refactoring.moveParticipants">
       <moveParticipant
-            class="org.eclipse.e4.tools.emf.editor3x.ClassMoveParticipant"
+            class="org.eclipse.e4.tools.emf.editor3x.ModelMoveParticipant"
             id="org.eclipse.e4.tools.emf.editor3x.moveParticipant"
             name="Workbench Model Contribution Participant">
          <enablement>
@@ -76,7 +76,20 @@
 	  	    </iterate>
 	  	  </with>
 	  	  <with variable="element">
-		  	 <instanceof value="org.eclipse.jdt.core.IType"/>
+         <or>
+            <instanceof
+                  value="org.eclipse.jdt.core.IType">
+            </instanceof>
+            <instanceof
+                  value="org.eclipse.jdt.core.IPackageFragment">
+            </instanceof>
+            <instanceof
+                  value="org.eclipse.core.resources.IFile">
+            </instanceof>
+            <instanceof
+                  value="org.eclipse.core.resources.IFolder">
+            </instanceof>
+         </or>
 	  	  </with>
 	  	</enablement>
       </moveParticipant>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassMoveParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassMoveParticipant.java
deleted file mode 100644
index 675979aaa4..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ClassMoveParticipant.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.eclipse.e4.tools.emf.editor3x;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.e4.tools.emf.editor3x.extension.Util;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-
-public class ClassMoveParticipant extends
-		org.eclipse.ltk.core.refactoring.participants.MoveParticipant {
-	private IType type;
-	
-	@Override
-	protected boolean initialize(Object element) {
-		if( element instanceof IType ) {
-			type = (IType) element;
-		} else {
-			type = null;
-		}
-		
-		return type != null;
-	}
-
-	@Override
-	public String getName() {
-		return "Workbench Model Contribution Participant";
-	}
-
-	@Override
-	public RefactoringStatus checkConditions(IProgressMonitor pm,
-			CheckConditionsContext context) throws OperationCanceledException {
-		return new RefactoringStatus();
-	}
-
-	@Override
-	public Change createChange(IProgressMonitor pm) throws CoreException,
-			OperationCanceledException {
-		String fromBundle = Util.getBundleSymbolicName(type.getJavaProject().getProject());
-		String fromClassname = type.getFullyQualifiedName();
-		
-		IPackageFragment fragment = (IPackageFragment) getArguments().getDestination();
-		String toBundle = Util.getBundleSymbolicName(fragment.getJavaProject().getProject());
-		String toClassName = fragment.getElementName().length() == 0 ? type.getElementName() : fragment.getElementName() + "." + type.getElementName();
-		
-		return RefactorParticipantDelegate.createChange(pm, this, "bundleclass://"+fromBundle+"/"+fromClassname, "bundleclass://"+toBundle+"/"+toClassName);
-	}
-
-}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java
new file mode 100644
index 0000000000..2ec2342e2a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java
@@ -0,0 +1,151 @@
+package org.eclipse.e4.tools.emf.editor3x;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.e4.tools.emf.editor3x.extension.Util;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.ltk.core.refactoring.Change;
+import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
+import org.eclipse.ltk.core.refactoring.participants.MoveParticipant;
+
+public class ModelMoveParticipant extends MoveParticipant {
+	private IType _type;
+	private IPackageFragment _pckage;
+	private IFile _file;
+	private IFolder _folder;
+
+	@Override
+	protected boolean initialize(Object element) {
+
+		if (element instanceof IType) {
+			_type = (IType) element;
+			return true;
+		}
+
+		if (element instanceof IPackageFragment) {
+			_pckage = (IPackageFragment) element;
+			return true;
+		}
+
+		if (element instanceof IFile) {
+			_file = (IFile) element;
+			return true;
+		}
+
+		if (element instanceof IFolder) {
+			_folder = (IFolder) element;
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public String getName() {
+		return "Workbench Model Contribution Participant";
+	}
+
+	@Override
+	public RefactoringStatus checkConditions(IProgressMonitor pm,
+			CheckConditionsContext context) throws OperationCanceledException {
+		return new RefactoringStatus();
+	}
+
+	@Override
+	public Change createChange(IProgressMonitor pm) throws CoreException,
+			OperationCanceledException {
+
+		pm.beginTask("Creating Change ..", IProgressMonitor.UNKNOWN);
+
+		Change change = null;
+
+		if (_type != null) {
+			change = createClassChange(pm, _type);
+		}
+
+		else if (_pckage != null) {
+			change = createPackageChange(pm, _pckage);
+		}
+
+		else if (_file != null) {
+			change = createFileChange(pm, _file);
+		}
+
+		//
+		// if (_folder != null) {
+		// return createFolderChange(pm, _folder);
+		// }
+
+		pm.done();
+
+		return change;
+	}
+
+	private Change createFileChange(IProgressMonitor pm, IFile file)
+			throws CoreException {
+
+		String newUrl = "platform:/plugin/";
+		if (getArguments().getDestination() instanceof IFolder) {
+			IFolder folder = (IFolder) getArguments().getDestination();
+			newUrl += folder.getProject().getName() + "/"
+					+ folder.getProjectRelativePath().toString() + "/"
+					+ file.getName();
+		} else {
+			IProject project = (IProject) getArguments().getDestination();
+			newUrl += project.getName() + "/" + file.getName();
+
+		}
+
+		String oldUrl = "platform:/plugin" + file.getFullPath();
+
+		return RefactorParticipantDelegate.createChange(pm, this, oldUrl,
+				newUrl);
+	}
+
+	private Change createPackageChange(IProgressMonitor pm,
+			IPackageFragment pckage) throws CoreException,
+			OperationCanceledException {
+		String fromBundle = Util.getBundleSymbolicName(pckage.getJavaProject()
+				.getProject());
+
+		IPackageFragmentRoot fragmentRoot = (IPackageFragmentRoot) getArguments()
+				.getDestination();
+		String toBundle = Util.getBundleSymbolicName(fragmentRoot
+				.getJavaProject().getProject());
+
+		final String newUrl = "bundleclass://" + toBundle + "/"
+				+ pckage.getElementName();
+
+		String oldUrl = "bundleclass://" + fromBundle + "/"
+				+ pckage.getElementName();
+
+		return RefactorParticipantDelegate.createChange(pm, this, oldUrl,
+				newUrl);
+	}
+
+	private Change createClassChange(IProgressMonitor pm, IType type)
+			throws CoreException, OperationCanceledException {
+		String fromBundle = Util.getBundleSymbolicName(_type.getJavaProject()
+				.getProject());
+		String fromClassname = type.getFullyQualifiedName();
+
+		IPackageFragment fragment = (IPackageFragment) getArguments()
+				.getDestination();
+		String toBundle = Util.getBundleSymbolicName(fragment.getJavaProject()
+				.getProject());
+		String toClassName = fragment.getElementName().length() == 0 ? type
+				.getElementName() : fragment.getElementName() + "."
+				+ type.getElementName();
+
+		return RefactorParticipantDelegate.createChange(pm, this,
+				"bundleclass://" + fromBundle + "/" + fromClassname,
+				"bundleclass://" + toBundle + "/" + toClassName);
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RenameParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelRenameParticipant.java
similarity index 99%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RenameParticipant.java
rename to bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelRenameParticipant.java
index 5972877a62..24ee9ceb26 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RenameParticipant.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelRenameParticipant.java
@@ -22,7 +22,7 @@
 import org.eclipse.ltk.core.refactoring.RefactoringStatus;
 import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
 
-public class RenameParticipant extends
+public class ModelRenameParticipant extends
 		org.eclipse.ltk.core.refactoring.participants.RenameParticipant {
 	private IType _type;
 	private IPackageFragment _pckage;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index e05ca64dd3..1487f11643 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -22,6 +22,7 @@
 import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -150,17 +151,17 @@ public void run() {
 	 * Reload the model.
 	 */
 	protected void reloadModel() {
-		try {
-			resource.unload();
-			resource.load(null);
-			// must be done in ui thread because of databinding
-			sync.syncExec(new Runnable() {
-				public void run() {
+		getModelProvider().getRoot().getRealm().asyncExec(new Runnable() {
+			public void run() {
+				try {
+					resource.unload();
+					resource.load(null);
 					getModelProvider().replaceRoot(resource.getContents().get(0));
+					doSave(new NullProgressMonitor());
+				} catch (IOException e) {
+					statusDialog(e);
 				}
-			});
-		} catch (IOException e) {
-			statusDialog(e);
-		}
+			}
+		});
 	}
 }
\ No newline at end of file

From bf0a68181c8de826123cd7cec3e1e1177cfee275 Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.att>
Date: Tue, 8 Jan 2013 15:39:04 +0100
Subject: [PATCH 0551/1286] Bug 397326 - NPE in ExpressionIdDialog Filter

---
 .../internal/common/component/dialogs/ExpressionIdDialog.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
index 7090bf33b8..098cde8654 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
@@ -85,8 +85,6 @@ protected boolean isParentMatch(Viewer viewer, Object element) {
 			}
 		};
 
-		ControlFactory.attachFiltering(idField, viewer, filter);
-
 		l = new Label(container, SWT.NONE);
 		viewer = new TableViewer(container);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -101,6 +99,8 @@ public void doubleClick(DoubleClickEvent event) {
 			}
 		});
 
+		ControlFactory.attachFiltering(idField, viewer, filter);
+
 		return comp;
 	}
 

From 43e27a60ddb2b821a6757851d2000361fa9e63b9 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Mon, 14 Jan 2013 00:20:56 +0100
Subject: [PATCH 0552/1286] Bug 398033 - Updating the label of a part does not
 reflect in part stack

---
 .../emf/ui/internal/common/component/PartStackEditor.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 45b4aafe70..40f22b5a8b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -81,6 +81,7 @@ public class PartStackEditor extends AbstractComponentEditor {
 	@Inject
 	@Optional
 	private IProject project;
+	private TableViewer viewer;
 
 	@Inject
 	public PartStackEditor() {
@@ -160,7 +161,8 @@ public Composite doGetEditor(Composite parent, Object object) {
 				composite.layout(true, true);
 			}
 		}
-
+		IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+		viewer.setInput(prop.observeDetail(getMaster()));
 		getMaster().setValue(object);
 		return composite;
 	}
@@ -234,7 +236,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			new Label(parent, SWT.NONE);
 
-			final TableViewer viewer = new TableViewer(parent);
+			viewer = new TableViewer(parent);
 			viewer.setContentProvider(new ObservableListContentProvider());
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 			GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1);

From 4f77d211d803ed2cea938e81c6551a8d1a37225c Mon Sep 17 00:00:00 2001
From: Bogdan Gheorghe <gheorghe@ca.ibm.com>
Date: Wed, 16 Jan 2013 17:47:21 -0500
Subject: [PATCH 0553/1286] Bug 374485 - [CSS] Theme exception when starting up
 an Eclipse4 App


From 3ac825616562b251599cf6fd6d8b9611e8580ab9 Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Tue, 5 Feb 2013 15:00:39 +0100
Subject: [PATCH 0554/1286] Bug 397307 - Application Model Editor
 CoreExpressionEditor Find IconURI Icon is missing

---
 .../emf/ui/internal/common/component/CoreExpressionEditor.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index ffcae4d697..bcca5a2b14 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -113,6 +113,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			} else {
 				Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 				b.setText(Messages.ModelTooling_Common_FindEllipsis);
+				b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 				b.addSelectionListener(new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {

From 449e386b04b9e17e4ae62d6fb8087244f796908e Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Mon, 11 Feb 2013 21:22:05 +0100
Subject: [PATCH 0555/1286] Fixed expand/collapse menu REOPENED - bug 395111:
 Option to expand the application model tree
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=395111

---
 .../e4/tools/emf/ui/internal/Messages.java    |  1 +
 .../tools/emf/ui/internal/Messages.properties |  1 +
 .../emf/ui/internal/common/ModelEditor.java   | 29 +++++++++++++++----
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 8419240574..e4991d9dbc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -597,6 +597,7 @@ public class Messages {
 	public String AreaIconDialogEditor_DialogMessage;
 
 	public String ModelEditor_Delete;
+	public String ModelEditor_ExpandSubtree;
 	public String ModelEditor_Form;
 	public String ModelEditor_XMI;
 	public String ModelEditor_ExternalizeStrings;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 9fb51c7e80..8ac1069aae 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -598,6 +598,7 @@ AreaIconDialogEditor_DialogTitle=Area Icon Search
 AreaIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
 
 ModelEditor_Delete=Remove
+ModelEditor_ExpandSubtree=Expand/Collapse (CTRL + Mouse)
 ModelEditor_Form=Form
 ModelEditor_XMI=XMI
 ModelEditor_ExternalizeStrings=Externalize Strings
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index ba47957395..4210e267e1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -405,8 +405,8 @@ private void findAndHighlight(Control control) {
 				} while (m != null);
 
 				if (o instanceof MPart) {
-					System.err.println(o);
-					System.err.println(((EObject) o).eContainingFeature());
+					System.err.println(getClass().getName() + ".findAndHighLight: " + o);
+					System.err.println(getClass().getName() + ".findAndHighLight: " + ((EObject) o).eContainingFeature());
 				}
 
 				viewer.setSelection(new StructuredSelection(o));
@@ -458,7 +458,6 @@ public void run() {
 						e.printStackTrace();
 					}
 				}
-
 			}
 		});
 
@@ -781,6 +780,23 @@ public void run() {
 
 					});
 
+				if (addSeparator) {
+					manager.add(new Separator());
+				}
+
+				Action expandAction = new Action(messages.ModelEditor_ExpandSubtree) {
+					public void run() {
+						if (!s.isEmpty()) {
+							if (viewer.getExpandedState(s.getFirstElement())) {
+								viewer.collapseToLevel(s.getFirstElement(), TreeViewer.ALL_LEVELS);
+							} else {
+								viewer.expandToLevel(s.getFirstElement(), TreeViewer.ALL_LEVELS);
+							}
+						}
+					}
+				};
+
+				manager.add(expandAction);
 			}
 		});
 
@@ -925,8 +941,9 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		treeArea.setBackgroundMode(SWT.INHERIT_DEFAULT);
 
 		// final FilteredTree viewParent = new FilteredTree(treeArea,
-		// SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(), true);
-		// final TreeViewer viewer = ((FilteredTree) viewParent).getViewer();
+		// SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new
+		// PatternFilter(), true);
+		// final TreeViewer viewer = viewParent.getViewer();
 
 		final TreeViewer viewer = new TreeViewer(treeArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
 
@@ -1071,7 +1088,7 @@ private void registerContributedEditors() {
 	}
 
 	private void registerDefaultEditors() {
-		System.err.println(resourcePool);
+		System.err.println(getClass().getName() + ".registerDefaultEditors: " + resourcePool);
 
 		registerEditor(ApplicationPackageImpl.Literals.APPLICATION, ContextInjectionFactory.make(ApplicationEditor.class, context));
 		registerEditor(ApplicationPackageImpl.Literals.ADDON, ContextInjectionFactory.make(AddonsEditor.class, context));

From 70ffcb0195b16c35a09c3e507298104bab815d67 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Thu, 14 Feb 2013 10:00:53 +0100
Subject: [PATCH 0556/1286] added DI MultiPageEditorPart

---
 .../compat/parts/DIMultiPageEditorPart.java   | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
new file mode 100644
index 0000000000..9530edc5f9
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
@@ -0,0 +1,29 @@
+package org.eclipse.e4.tools.compat.parts;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.e4.tools.services.IDirtyProviderService;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.MultiPageEditorPart;
+
+public abstract class DIMultiPageEditorPart extends MultiPageEditorPart
+		implements IDirtyProviderService {
+
+	public <T> int addPage(Class<T> clazz) throws PartInitException {
+		DIEditorPart<T> part = new DIEditorPart<T>(clazz) {};
+		return addPage(part, getEditorInput());
+
+	}
+
+	public DIMultiPageEditorPart() {
+	}
+
+	@Override
+	public void doSave(IProgressMonitor monitor) {
+		for (int i = 0; i < getPageCount(); i++) {
+			IEditorPart e = getEditor(i);
+			e.doSave(monitor);
+		}
+	}
+
+}

From 0c001721fdc83977da538d0819e11bb726cf7270 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Thu, 14 Feb 2013 10:01:03 +0100
Subject: [PATCH 0557/1286] added documentation

---
 .../e4/tools/compat/parts/DIEditorPart.java   | 71 +++++++++++--------
 1 file changed, 41 insertions(+), 30 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index cc103e7a96..c135bb13fd 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -7,10 +7,10 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Jonas Helming <jhelming@eclipsesource.com>
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.parts;
 
-
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -31,38 +31,47 @@
 import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.part.EditorPart;
 
-public abstract class DIEditorPart<C> extends EditorPart implements IDirtyProviderService {
+/**
+ * This class provides an adapter enabling to plug editors, which are
+ * implemented following the e4 programming model into a 3.x workbench. This
+ * class is supposed to be sub classed by clients.
+ * 
+ * @author Jonas
+ * 
+ * @param <C>
+ */
+public abstract class DIEditorPart<C> extends EditorPart implements
+		IDirtyProviderService {
 	private IEclipseContext context;
 	private C component;
 	private Class<C> clazz;
 	private boolean dirtyState;
-	
+
 	private int features;
 
 	protected static final int COPY = 1;
 	protected static final int PASTE = 1 << 1;
 	protected static final int CUT = 1 << 2;
-	
-	
+
 	public DIEditorPart(Class<C> clazz) {
 		this(clazz, SWT.NONE);
 	}
-	
+
 	public DIEditorPart(Class<C> clazz, int features) {
 		this.clazz = clazz;
 		this.features = features;
 	}
-	
+
 	@Override
 	public void doSave(IProgressMonitor monitor) {
 		IEclipseContext saveContext = context.createChild();
 		ContextInjectionFactory.invoke(component, Persist.class, saveContext);
 		saveContext.dispose();
 	}
-	
+
 	@Override
 	public void doSaveAs() {
-		
+
 	}
 
 	@Override
@@ -75,66 +84,68 @@ public void init(IEditorSite site, IEditorInput input)
 			throws PartInitException {
 		setSite(site);
 		setInput(input);
-		
+
 		context = PartHelper.createPartContext(this);
 		context.declareModifiable(IEditorInput.class);
 		context.declareModifiable(IEditorPart.class);
 		context.declareModifiable(IDirtyProviderService.class);
-		
-		context.set(IEditorPart.class,this);
-		context.set(IDirtyProviderService.class,this);
+
+		context.set(IEditorPart.class, this);
+		context.set(IDirtyProviderService.class, this);
 		context.set(IEditorInput.class, input);
 	}
 
-	
 	@Override
 	public void createPartControl(Composite parent) {
 		component = PartHelper.createComponent(parent, context, clazz, this);
 		makeActions();
 	}
-	
+
 	protected IEclipseContext getContext() {
 		return context;
 	}
-	
+
 	public C getComponent() {
 		return component;
 	}
-	
+
 	protected void makeActions() {
-		if( (features & COPY) == COPY ) {
+		if ((features & COPY) == COPY) {
 			IClipboardService clipboard = context.get(IClipboardService.class);
-			getEditorSite().getActionBars().setGlobalActionHandler(ActionFactory.COPY.getId(), new CopyAction(clipboard));
+			getEditorSite().getActionBars().setGlobalActionHandler(
+					ActionFactory.COPY.getId(), new CopyAction(clipboard));
 		}
-		
-		if( (features & PASTE) == PASTE ) {
+
+		if ((features & PASTE) == PASTE) {
 			IClipboardService clipboard = context.get(IClipboardService.class);
-			getEditorSite().getActionBars().setGlobalActionHandler(ActionFactory.PASTE.getId(), new PasteAction(clipboard));
+			getEditorSite().getActionBars().setGlobalActionHandler(
+					ActionFactory.PASTE.getId(), new PasteAction(clipboard));
 		}
-		
-		if( (features & CUT) == CUT ) {
+
+		if ((features & CUT) == CUT) {
 			IClipboardService clipboard = context.get(IClipboardService.class);
-			getEditorSite().getActionBars().setGlobalActionHandler(ActionFactory.CUT.getId(), new CutAction(clipboard));
+			getEditorSite().getActionBars().setGlobalActionHandler(
+					ActionFactory.CUT.getId(), new CutAction(clipboard));
 		}
 	}
-	
+
 	public void setDirtyState(boolean dirtyState) {
-		if( dirtyState != this.dirtyState ) {
+		if (dirtyState != this.dirtyState) {
 			this.dirtyState = dirtyState;
 			firePropertyChange(PROP_DIRTY);
 		}
 	}
-	
+
 	@Override
 	public boolean isDirty() {
 		return dirtyState;
 	}
-	
+
 	@Override
 	public void setFocus() {
 		ContextInjectionFactory.invoke(component, Focus.class, context);
 	}
-	
+
 	@Override
 	public void dispose() {
 		context.dispose();

From f0fc1fa0a6af6085a818e3512ab5db36de7ab46d Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Thu, 14 Feb 2013 10:17:38 +0100
Subject: [PATCH 0558/1286] added Header

---
 .../e4/tools/compat/parts/DIMultiPageEditorPart.java  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
index 9530edc5f9..494b9dda55 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2013 EclipseSource and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Jonas Helming <jhelming@eclipsesource.com>
+ ******************************************************************************/
+
 package org.eclipse.e4.tools.compat.parts;
 
 import org.eclipse.core.runtime.IProgressMonitor;

From 8534bdfe128771fe46e84f1629e6fcd2285128ec Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Thu, 14 Feb 2013 10:51:47 +0100
Subject: [PATCH 0559/1286] Bug 400542 - [KeyBinding] M1+ lowercase does not
 work

---
 .../src/org/eclipse/e4/tools/emf/ui/internal/Messages.java    | 1 +
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.properties  | 3 ++-
 .../emf/ui/internal/common/component/KeyBindingEditor.java    | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index e4991d9dbc..e83558364b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -623,4 +623,5 @@ public class Messages {
 	public String VWindowSharedElementsEditor_Area;
 	public String ModelEditor_ExtractFragment;
 	public String ModelEditor_ExtractFragment_NoParentId;
+	public String KeyBindingEditor_SequenceLowercase;
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 8ac1069aae..34ecbf8b58 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -623,4 +623,5 @@ Special_UnknownElement=(unknown model element)
 Special_UnknownElement_Detail= Use an extension point!
 VWindowSharedElementsEditor_Area=Area
 ModelEditor_ExtractFragment=Extract into a fragment
-ModelEditor_ExtractFragment_NoParentId=Can not extract because parent container has no id. \nAdd an id and try again.
\ No newline at end of file
+ModelEditor_ExtractFragment_NoParentId=Can not extract because parent container has no id. \nAdd an id and try again.
+KeyBindingEditor_SequenceLowercase=Key sequences should be specified in uppercase characters
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 88532de697..9337dd64c6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -359,6 +359,10 @@ public IStatus validate(Object value) {
 					if (keySequence.isEmpty()) {
 						return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", Messages.KeyBindingEditor_SequenceEmpty); //$NON-NLS-1$
 					}
+					if (!value.toString().toUpperCase().equals(value.toString())) {
+						return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", Messages.KeyBindingEditor_SequenceLowercase); //$NON-NLS-1$ 
+					}
+
 					return Status.OK_STATUS;
 				} catch (Exception e) {
 					return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", e.getMessage(), e); //$NON-NLS-1$

From f487994542b124c1dcd61a02741207364ef159cc Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Thu, 14 Feb 2013 11:08:02 +0100
Subject: [PATCH 0560/1286] Bug 397650 - [Menu|Toolbar|Trim] Contributions to
 not feature "Add child" action

---
 .../component/MenuContributionEditor.java     | 53 ++++++++++++++++++
 .../component/ToolBarContributionEditor.java  | 54 +++++++++++++++++++
 .../component/TrimContributionEditor.java     | 40 ++++++++++++++
 3 files changed, 147 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index e0e8e86f8d..d14fca00c9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -7,10 +7,13 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Marco Descher <marco@descher.at> - https://bugs.eclipse.org/397650
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -37,6 +40,7 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -66,6 +70,7 @@ public class MenuContributionEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
+	private List<Action> actions = new ArrayList<Action>();
 
 	private static class Struct {
 		private final String label;
@@ -84,6 +89,34 @@ public MenuContributionEditor() {
 		super();
 	}
 
+	@PostConstruct
+	void init() {
+		actions.add(new Action(Messages.MenuEditor_AddHandledMenuItem, createImageDescriptor(ResourceProvider.IMG_HandledMenuItem)) {
+			@Override
+			public void run() {
+				handleAdd(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
+			}
+		});
+		actions.add(new Action(Messages.MenuEditor_AddMenu, createImageDescriptor(ResourceProvider.IMG_Menu)) {
+			@Override
+			public void run() {
+				handleAdd(MenuPackageImpl.Literals.MENU, false);
+			}
+		});
+		actions.add(new Action(Messages.MenuEditor_AddDirectMenuItem, createImageDescriptor(ResourceProvider.IMG_DirectMenuItem)) {
+			@Override
+			public void run() {
+				handleAdd(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false);
+			}
+		});
+		actions.add(new Action(Messages.MenuEditor_AddSeparator, createImageDescriptor(ResourceProvider.IMG_MenuSeparator)) {
+			@Override
+			public void run() {
+				handleAdd(MenuPackageImpl.Literals.MENU_SEPARATOR, true);
+			}
+		});
+	}
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
@@ -327,4 +360,24 @@ public IObservableList getChildList(Object element) {
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
+
+	protected void handleAdd(EClass eClass, boolean separator) {
+		MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
+		setElementId(eObject);
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			if (!separator) {
+				getEditor().setSelection(eObject);
+			}
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 8798078205..2c16a0a93e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -7,10 +7,13 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Marco Descher <marco@descher.at> - https://bugs.eclipse.org/397650
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -40,6 +43,7 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -70,6 +74,7 @@ public class ToolBarContributionEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
+	private List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	@Optional
@@ -92,6 +97,34 @@ public ToolBarContributionEditor() {
 		super();
 	}
 
+	@PostConstruct
+	void init() {
+		actions.add(new Action(Messages.ToolBarEditor_AddHandledToolItem, createImageDescriptor(ResourceProvider.IMG_HandledToolItem)) {
+			@Override
+			public void run() {
+				handleAddChild(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
+			}
+		});
+		actions.add(new Action(Messages.ToolBarEditor_AddDirectToolItem, createImageDescriptor(ResourceProvider.IMG_DirectToolItem)) {
+			@Override
+			public void run() {
+				handleAddChild(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false);
+			}
+		});
+		actions.add(new Action(Messages.ToolBarEditor_AddToolControl, createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
+			@Override
+			public void run() {
+				handleAddChild(MenuPackageImpl.Literals.TOOL_CONTROL, false);
+			}
+		});
+		actions.add(new Action(Messages.ToolBarEditor_AddToolBarSeparator, createImageDescriptor(ResourceProvider.IMG_ToolBarSeparator)) {
+			@Override
+			public void run() {
+				handleAddChild(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true);
+			}
+		});
+	}
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
@@ -353,4 +386,25 @@ public IObservableList getChildList(Object element) {
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
+
+	protected void handleAddChild(EClass eClass, boolean separator) {
+		MToolBarElement eObject = (MToolBarElement) EcoreUtil.create(eClass);
+		setElementId(eObject);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			if (!separator) {
+				getEditor().setSelection(eObject);
+			}
+		}
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index ab9254ff31..5c56b50097 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -7,10 +7,13 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Marco Descher <marco@descher.at> - https://bugs.eclipse.org/397650
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -39,6 +42,7 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -69,6 +73,7 @@ public class TrimContributionEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
+	private List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	@Optional
@@ -79,6 +84,22 @@ public TrimContributionEditor() {
 		super();
 	}
 
+	@PostConstruct
+	void init() {
+		actions.add(new Action(Messages.TrimBarEditor_AddToolBar, createImageDescriptor(ResourceProvider.IMG_ToolBar)) {
+			@Override
+			public void run() {
+				handleAddChild(MenuPackageImpl.Literals.TOOL_BAR);
+			}
+		});
+		actions.add(new Action(Messages.TrimBarEditor_AddToolControl, createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
+			@Override
+			public void run() {
+				handleAddChild(MenuPackageImpl.Literals.TOOL_CONTROL);
+			}
+		});
+	}
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
@@ -329,4 +350,23 @@ public IObservableList getChildList(Object element) {
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
+
+	protected void handleAddChild(EClass eClass) {
+		EObject toolbar = EcoreUtil.create(eClass);
+		setElementId(toolbar);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(toolbar);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
 }

From b5aa1671271e489c0b3aa152dad73d8f89c23017 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Wed, 20 Feb 2013 17:28:40 +0100
Subject: [PATCH 0561/1286] bug 400804: Implemented various table layouts.

---
 .../component/ModelFragmentsEditor.java       |  78 +++++++-
 .../common/component/StringModelFragment.java | 175 ++++++++----------
 .../common/component/virtual/VMenuEditor.java |  72 +++----
 .../virtual/VModelImportsEditor.java          |  88 ++++++++-
 .../virtual/VWindowControlEditor.java         | 142 ++++++--------
 .../virtual/VWindowSharedElementsEditor.java  |  85 +++------
 .../common/uistructure/ViewerElement.java     | 170 +++++++----------
 7 files changed, 419 insertions(+), 391 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index 9984e587bd..43227f5eec 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -35,7 +35,9 @@
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -250,7 +252,7 @@ private void createImportsTab(CTabFolder folder) {
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		ViewerElement tableElement = ViewerElement.create(context, parent, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, this);
+		final ViewerElement tableElement = ViewerElement.create(context, parent, this);
 		tableElement.getViewer().setContentProvider(new ObservableListContentProvider());
 		tableElement.getViewer().setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
@@ -271,6 +273,80 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 			}
 		});
 
+		tableElement.getButtonAdd().addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				EClass eClass = ((FeatureClass) ((IStructuredSelection) tableElement.getDropDown().getSelection()).getFirstElement()).eClass;
+				EObject eObject = EcoreUtil.create(eClass);
+
+				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, eObject);
+
+				if (cmd.canExecute()) {
+					getEditingDomain().getCommandStack().execute(cmd);
+					getEditor().setSelection(eObject);
+				}
+			}
+		});
+
+		tableElement.getButtonRemove().addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!tableElement.getViewer().getSelection().isEmpty()) {
+					List<?> elements = ((IStructuredSelection) tableElement.getViewer().getSelection()).toList();
+
+					Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, elements);
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+					}
+				}
+			}
+		});
+
+		tableElement.getButtonDown().addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!tableElement.getViewer().getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) tableElement.getViewer().getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MModelFragments container = (MModelFragments) getMaster().getValue();
+						int idx = container.getImports().indexOf(obj) + 1;
+						if (idx < container.getImports().size()) {
+							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, obj, idx);
+
+							if (cmd.canExecute()) {
+								getEditingDomain().getCommandStack().execute(cmd);
+								tableElement.getViewer().setSelection(new StructuredSelection(obj));
+							}
+						}
+
+					}
+				}
+			}
+		});
+
+		tableElement.getButtonUp().addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!tableElement.getViewer().getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) tableElement.getViewer().getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MModelFragments container = (MModelFragments) getMaster().getValue();
+						int idx = container.getImports().indexOf(obj) - 1;
+						if (idx >= 0) {
+							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, obj, idx);
+
+							if (cmd.canExecute()) {
+								getEditingDomain().getCommandStack().execute(cmd);
+								tableElement.getViewer().setSelection(new StructuredSelection(obj));
+							}
+						}
+					}
+				}
+			}
+		});
+
 		List<FeatureClass> list = new ArrayList<FeatureClass>();
 		Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
 		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 7215a536e2..0ec25be941 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -15,6 +15,7 @@
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -23,6 +24,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FeatureSelectionDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindParentReferenceElementDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.ViewerElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.fragment.MModelFragment;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
@@ -42,11 +44,9 @@
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
@@ -69,6 +69,9 @@ public class StringModelFragment extends AbstractComponentEditor {
 
 	private IListProperty MODEL_FRAGMENT__ELEMENTS = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
 
+	@Inject
+	IEclipseContext eclipseContext;
+
 	@Inject
 	public StringModelFragment() {
 		super();
@@ -188,94 +191,40 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.StringModelFragment_Elements);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
-			final TableViewer viewer = new TableViewer(parent);
-			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 300;
-			viewer.getControl().setLayoutData(gd);
+			final ViewerElement tableElement = ViewerElement.create(eclipseContext, parent, this);
 
-			IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
-			viewer.setInput(prop.observeDetail(getMaster()));
+			tableElement.getViewer().setContentProvider(new ObservableListContentProvider());
+			tableElement.getViewer().setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
+			tableElement.getDropDown().setContentProvider(new ArrayContentProvider());
+			tableElement.getDropDown().setLabelProvider(new LabelProvider() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MModelFragment container = (MModelFragment) getMaster().getValue();
-							int idx = container.getElements().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
+				public String getText(Object element) {
+					FeatureClass eclass = (FeatureClass) element;
+					return eclass.label;
 				}
 			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
+			tableElement.getDropDown().setComparator(new ViewerComparator() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MModelFragment container = (MModelFragment) getMaster().getValue();
-							int idx = container.getElements().indexOf(obj) + 1;
-							if (idx < container.getElements().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
+				public int compare(Viewer viewer, Object e1, Object e2) {
+					FeatureClass eClass1 = (FeatureClass) e1;
+					FeatureClass eClass2 = (FeatureClass) e2;
+					return eClass1.label.compareTo(eClass2.label);
 				}
 			});
 
-			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
+			tableElement.getDropDown().setContentProvider(new ArrayContentProvider());
+			tableElement.getDropDown().setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
 					FeatureClass eclass = (FeatureClass) element;
 					return eclass.label;
 				}
 			});
-			childrenDropDown.setComparator(new ViewerComparator() {
+
+			tableElement.getDropDown().setComparator(new ViewerComparator() {
 				@Override
 				public int compare(Viewer viewer, Object e1, Object e2) {
 					FeatureClass eClass1 = (FeatureClass) e1;
@@ -284,21 +233,10 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 				}
 			});
 
-			List<FeatureClass> list = new ArrayList<FeatureClass>();
-			Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
-			list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
-
-			childrenDropDown.setInput(list);
-			childrenDropDown.getCombo().select(0);
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			tableElement.getButtonAdd().addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					EClass eClass = ((FeatureClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement()).eClass;
+					EClass eClass = ((FeatureClass) ((IStructuredSelection) tableElement.getDropDown().getSelection()).getFirstElement()).eClass;
 					EObject eObject = EcoreUtil.create(eClass);
 					setElementId(eObject);
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, eObject);
@@ -310,15 +248,11 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
+			tableElement.getButtonRemove().addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+					if (!tableElement.getViewer().getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) tableElement.getViewer().getSelection()).toList();
 
 						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, elements);
 						if (cmd.canExecute()) {
@@ -327,6 +261,61 @@ public void widgetSelected(SelectionEvent e) {
 					}
 				}
 			});
+
+			tableElement.getButtonDown().addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!tableElement.getViewer().getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) tableElement.getViewer().getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MModelFragment container = (MModelFragment) getMaster().getValue();
+							int idx = container.getElements().indexOf(obj) + 1;
+							if (idx < container.getElements().size()) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									tableElement.getViewer().setSelection(new StructuredSelection(obj));
+								}
+							}
+						}
+					}
+				}
+			});
+
+			tableElement.getButtonUp().addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!tableElement.getViewer().getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) tableElement.getViewer().getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MModelFragment container = (MModelFragment) getMaster().getValue();
+							int idx = container.getElements().indexOf(obj) - 1;
+							if (idx >= 0) {
+								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, obj, idx);
+
+								if (cmd.canExecute()) {
+									getEditingDomain().getCommandStack().execute(cmd);
+									tableElement.getViewer().setSelection(new StructuredSelection(obj));
+								}
+							}
+						}
+					}
+				}
+			});
+
+			List<FeatureClass> list = new ArrayList<FeatureClass>();
+			Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
+			list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
+
+			tableElement.getDropDown().setInput(list);
+			tableElement.getDropDown().getCombo().select(0);
+
+			IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
+			tableElement.getViewer().setInput(prop.observeDetail(getMaster()));
+
 		}
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 77ee666c30..2f4fc4d4f1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -13,13 +13,15 @@
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.ViewerElement;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl;
@@ -36,30 +38,29 @@
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 public class VMenuEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private TableViewer viewer;
+	private StructuredViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 	private EStructuralFeature feature;
 
+	@Inject
+	IEclipseContext eclipseContext;
+
 	public static final String VIEW_MENU_TAG = "ViewMenu"; //$NON-NLS-1$
 
 	enum Types {
@@ -134,27 +135,12 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		viewer = new TableViewer(parent);
-		ObservableListContentProvider cp = new ObservableListContentProvider();
-		viewer.setContentProvider(cp);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		viewer.getControl().setLayoutData(gd);
+		final ViewerElement tableElement = ViewerElement.create(eclipseContext, parent, this);
+		viewer = tableElement.getViewer();
+		viewer.setContentProvider(new ObservableListContentProvider());
 		viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
-		Composite buttonComp = new Composite(parent, SWT.NONE);
-		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		GridLayout gl = new GridLayout(2, false);
-		gl.marginLeft = 0;
-		gl.marginRight = 0;
-		gl.marginWidth = 0;
-		gl.marginHeight = 0;
-		buttonComp.setLayout(gl);
-
-		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Up);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-		b.addSelectionListener(new SelectionAdapter() {
+		tableElement.getButtonUp().addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (!viewer.getSelection().isEmpty()) {
@@ -177,11 +163,7 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Down);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-		b.addSelectionListener(new SelectionAdapter() {
+		tableElement.getButtonDown().addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (!viewer.getSelection().isEmpty()) {
@@ -192,7 +174,7 @@ public void widgetSelected(SelectionEvent e) {
 						List<?> list = (List<?>) container.eGet(feature);
 						int idx = list.indexOf(obj) + 1;
 						if (idx < list.size()) {
-							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, obj, idx);
+							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), feature, obj, idx);
 
 							if (cmd.canExecute()) {
 								getEditingDomain().getCommandStack().execute(cmd);
@@ -205,10 +187,8 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-		childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		childrenDropDown.setContentProvider(new ArrayContentProvider());
-		childrenDropDown.setLabelProvider(new LabelProvider() {
+		tableElement.getDropDown().setContentProvider(new ArrayContentProvider());
+		tableElement.getDropDown().setLabelProvider(new LabelProvider() {
 			@Override
 			public String getText(Object element) {
 				if (element == Types.MENU) {
@@ -219,17 +199,13 @@ public String getText(Object element) {
 				return Messages.MenuEditor_Label_ViewMenu;
 			}
 		});
-		childrenDropDown.setInput(Types.values());
-		childrenDropDown.setSelection(new StructuredSelection(Types.MENU));
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-		b.setText(Messages.ModelTooling_Common_AddEllipsis);
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-		b.addSelectionListener(new SelectionAdapter() {
+		tableElement.getDropDown().setInput(Types.values());
+		tableElement.getDropDown().setSelection(new StructuredSelection(Types.MENU));
+
+		tableElement.getButtonAdd().addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				Types t = (Types) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+				Types t = (Types) ((IStructuredSelection) tableElement.getDropDown().getSelection()).getFirstElement();
 				if (t == Types.MENU) {
 					handleAdd(MenuPackageImpl.Literals.MENU);
 				} else if (t == Types.POPUP_MENU) {
@@ -240,11 +216,7 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Remove);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-		b.addSelectionListener(new SelectionAdapter() {
+		tableElement.getButtonRemove().addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (!viewer.getSelection().isEmpty()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index 16863519f6..482c9e1444 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -23,16 +23,28 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.ViewerElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -92,7 +104,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		tableElement = ViewerElement.create(eclipseContext, parent, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, this);
+		tableElement = ViewerElement.create(eclipseContext, parent, this);
 		tableElement.getViewer().setContentProvider(new ObservableListContentProvider());
 		tableElement.getViewer().setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
@@ -113,6 +125,80 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 			}
 		});
 
+		tableElement.getButtonAdd().addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				EClass eClass = ((FeatureClass) ((IStructuredSelection) tableElement.getDropDown().getSelection()).getFirstElement()).eClass;
+				EObject eObject = EcoreUtil.create(eClass);
+
+				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, eObject);
+
+				if (cmd.canExecute()) {
+					getEditingDomain().getCommandStack().execute(cmd);
+					getEditor().setSelection(eObject);
+				}
+			}
+		});
+
+		tableElement.getButtonRemove().addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!tableElement.getViewer().getSelection().isEmpty()) {
+					List<?> elements = ((IStructuredSelection) tableElement.getViewer().getSelection()).toList();
+
+					Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, elements);
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+					}
+				}
+			}
+		});
+
+		tableElement.getButtonDown().addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!tableElement.getViewer().getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) tableElement.getViewer().getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MModelFragments container = (MModelFragments) getMaster().getValue();
+						int idx = container.getImports().indexOf(obj) + 1;
+						if (idx < container.getImports().size()) {
+							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, obj, idx);
+
+							if (cmd.canExecute()) {
+								getEditingDomain().getCommandStack().execute(cmd);
+								tableElement.getViewer().setSelection(new StructuredSelection(obj));
+							}
+						}
+
+					}
+				}
+			}
+		});
+
+		tableElement.getButtonUp().addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!tableElement.getViewer().getSelection().isEmpty()) {
+					IStructuredSelection s = (IStructuredSelection) tableElement.getViewer().getSelection();
+					if (s.size() == 1) {
+						Object obj = s.getFirstElement();
+						MModelFragments container = (MModelFragments) getMaster().getValue();
+						int idx = container.getImports().indexOf(obj) - 1;
+						if (idx >= 0) {
+							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, obj, idx);
+
+							if (cmd.canExecute()) {
+								getEditingDomain().getCommandStack().execute(cmd);
+								tableElement.getViewer().setSelection(new StructuredSelection(obj));
+							}
+						}
+					}
+				}
+			}
+		});
+
 		List<FeatureClass> list = new ArrayList<FeatureClass>();
 		Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
 		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index cd6e97a230..de2ff8d419 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -16,11 +16,13 @@
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.ViewerElement;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
@@ -36,28 +38,26 @@
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 public class VWindowControlEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
+	private ViewerElement tableElement;
+
+	@Inject
+	IEclipseContext eclipseContext;
 
 	@Inject
 	public VWindowControlEditor() {
@@ -136,7 +136,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			composite = createForm(parent, context, getMaster());
 		}
 		VirtualEntry<?> o = (VirtualEntry<?>) object;
-		viewer.setInput(o.getList());
+		tableElement.getViewer().setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
@@ -151,62 +151,57 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
+
+			tableElement = ViewerElement.create(eclipseContext, parent, this);
+			tableElement.getViewer().setContentProvider(new ObservableListContentProvider());
+			tableElement.getViewer().setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
+
+			tableElement.getDropDown().setContentProvider(new ArrayContentProvider());
+
+			tableElement.getDropDown().setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					EClass eclass = (EClass) element;
+					return eclass.getName();
+				}
+			});
+
+			tableElement.getButtonAdd().addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) - 1;
-							if (idx >= 0) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
+					if (!tableElement.getDropDown().getSelection().isEmpty()) {
+						EClass eClass = (EClass) ((IStructuredSelection) tableElement.getDropDown().getSelection()).getFirstElement();
+						handleAdd(eClass);
+					}
+				}
+			});
 
+			tableElement.getButtonRemove().addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!tableElement.getViewer().getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) tableElement.getViewer().getSelection()).toList();
+
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
 				}
 			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
+			tableElement.getButtonDown().addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (!tableElement.getViewer().getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) tableElement.getViewer().getSelection();
 						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
 							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
 							int idx = container.getChildren().indexOf(obj) + 1;
 							if (idx < container.getChildren().size()) {
 								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
+									tableElement.getViewer().setSelection(new StructuredSelection(obj));
 								}
 							}
 						}
@@ -214,50 +209,29 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 
-			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					EClass eclass = (EClass) element;
-					return eclass.getName();
-				}
-			});
-			childrenDropDown.setInput(new EClass[] { AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA });
-			childrenDropDown.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!childrenDropDown.getSelection().isEmpty()) {
-						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-						handleAdd(eClass);
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
+			tableElement.getButtonUp().addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+					if (!tableElement.getViewer().getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) tableElement.getViewer().getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) - 1;
+							if (idx >= 0) {
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
+									tableElement.getViewer().setSelection(new StructuredSelection(obj));
+								}
+							}
 
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
 				}
 			});
+
+			tableElement.getDropDown().setInput(new EClass[] { AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA });
+			tableElement.getDropDown().setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK));
+
 		}
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index bc3783732b..0681befa6c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Wim Jongman <wim.jongman@remainsoftware.com> - bug 400804
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
@@ -16,11 +17,12 @@
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.ViewerElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -36,29 +38,28 @@
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 public class VWindowSharedElementsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private TableViewer viewer;
+	private StructuredViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 
+	@Inject
+	IEclipseContext eclipseContext;
+
 	@Inject
 	public VWindowSharedElementsEditor() {
 		super();
@@ -144,39 +145,25 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
+			final ViewerElement tableElement = ViewerElement.create(eclipseContext, parent, this);
+			viewer = tableElement.getViewer();
+			viewer.setContentProvider(new ObservableListContentProvider());
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
+			tableElement.getButtonUp().addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
+
 					if (!viewer.getSelection().isEmpty()) {
 						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) - 1;
+							EObject container = (EObject) getMaster().getValue();
+							int idx = ((List<?>) container.eGet(BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS)).indexOf(obj) - 1;
 							if (idx >= 0) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, obj, idx);
 
@@ -185,26 +172,22 @@ public void widgetSelected(SelectionEvent e) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-
 						}
 					}
 				}
 			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
+			tableElement.getButtonDown().addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (!viewer.getSelection().isEmpty()) {
 						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 						if (s.size() == 1) {
 							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) + 1;
-							if (idx < container.getChildren().size()) {
+							EObject container = (EObject) getMaster().getValue();
+							List<?> list = (List<?>) container.eGet(BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
+							int idx = list.indexOf(obj) + 1;
+							if (idx < list.size()) {
 								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, obj, idx);
 
 								if (cmd.canExecute()) {
@@ -212,43 +195,33 @@ public void widgetSelected(SelectionEvent e) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
-
 						}
 					}
 				}
 			});
 
-			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
+			tableElement.getDropDown().setContentProvider(new ArrayContentProvider());
+			tableElement.getDropDown().setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
 					EClass eclass = (EClass) element;
 					return eclass.getName();
 				}
 			});
-			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, BasicPackageImpl.Literals.PART_STACK, AdvancedPackageImpl.Literals.AREA });
-			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
+			tableElement.getDropDown().setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, BasicPackageImpl.Literals.PART_STACK, AdvancedPackageImpl.Literals.AREA });
+			tableElement.getDropDown().setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			tableElement.getButtonAdd().addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					if (!childrenDropDown.getSelection().isEmpty()) {
-						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+					if (!tableElement.getDropDown().getSelection().isEmpty()) {
+						EClass eClass = (EClass) ((IStructuredSelection) tableElement.getDropDown().getSelection()).getFirstElement();
 						handleAdd(eClass);
 					}
 				}
 			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
+			tableElement.getButtonRemove().addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (!viewer.getSelection().isEmpty()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
index 46f9c64181..5b5a547f9f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
@@ -10,33 +10,18 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.uistructure;
 
-import java.util.List;
 import javax.inject.Inject;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.services.Translation;
-import org.eclipse.e4.ui.model.fragment.MModelFragments;
-import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.TableViewer;
 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.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -57,7 +42,12 @@ public class ViewerElement {
 	private ComboViewer dropDown;
 	private Button addButton;
 	private Composite parent;
-	private EReference reference;
+
+	private Button removeButton;
+
+	private Button downButton;
+
+	private Button upButton;
 
 	/**
 	 * @param parent
@@ -65,9 +55,8 @@ public class ViewerElement {
 	 * @param editor
 	 */
 	@Inject
-	public ViewerElement(@Translation Messages Messages, Composite parent, EReference reference, AbstractComponentEditor editor) {
+	public ViewerElement(@Translation Messages Messages, Composite parent, AbstractComponentEditor editor) {
 		this.parent = parent;
-		this.reference = reference;
 		this.editor = editor;
 		this.Messages = Messages;
 		createControl();
@@ -101,77 +90,61 @@ private void createBottomButtons() {
 		gl.marginHeight = 0;
 		buttonCompBot.setLayout(gl);
 
-		Button b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Up);
-		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_arrow_up));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 1, 1));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						MModelFragments container = (MModelFragments) editor.getMaster().getValue();
-						int idx = container.getImports().indexOf(obj) - 1;
-						if (idx >= 0) {
-							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), reference, obj, idx);
-
-							if (cmd.canExecute()) {
-								editor.getEditingDomain().getCommandStack().execute(cmd);
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
-				}
-			}
-		});
-
-		b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Down);
-		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_arrow_down));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 1, 1));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						MModelFragments container = (MModelFragments) editor.getMaster().getValue();
-						int idx = container.getImports().indexOf(obj) + 1;
-						if (idx < container.getImports().size()) {
-							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), reference, obj, idx);
-
-							if (cmd.canExecute()) {
-								editor.getEditingDomain().getCommandStack().execute(cmd);
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
-				}
-			}
-		});
-
-		b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Remove);
-		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_delete));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 1, 1));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
-
-					Command cmd = RemoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), reference, elements);
-					if (cmd.canExecute()) {
-						editor.getEditingDomain().getCommandStack().execute(cmd);
-					}
-				}
-			}
-		});
+		upButton = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
+		upButton.setText(Messages.ModelTooling_Common_Up);
+		upButton.setImage(editor.createImage(ResourceProvider.IMG_Obj16_arrow_up));
+		upButton.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 1, 1));
+
+		downButton = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
+		downButton.setText(Messages.ModelTooling_Common_Down);
+		downButton.setImage(editor.createImage(ResourceProvider.IMG_Obj16_arrow_down));
+		downButton.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 1, 1));
+
+		removeButton = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
+		removeButton.setText(Messages.ModelTooling_Common_Remove);
+		removeButton.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_delete));
+		removeButton.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 1, 1));
+
+	}
+
+	/**
+	 * Returns the button that removes an element from the list. Use it to add
+	 * your {@link SelectionListener} to it.
+	 * 
+	 * @return
+	 */
+	public Button getButtonRemove() {
+		return removeButton;
+	}
+
+	/**
+	 * Returns the button that adds an element to the list. Use it to add your
+	 * {@link SelectionListener} to it.
+	 * 
+	 * @return
+	 */
+	public Button getButtonAdd() {
+		return addButton;
+	}
+
+	/**
+	 * Returns the button that moves an element down in the list. Use it to add
+	 * your {@link SelectionListener} to it.
+	 * 
+	 * @return
+	 */
+	public Button getButtonDown() {
+		return downButton;
+	}
+
+	/**
+	 * Returns the button that moves an element up in the list. Use it to add
+	 * your {@link SelectionListener} to it.
+	 * 
+	 * @return
+	 */
+	public Button getButtonUp() {
+		return upButton;
 	}
 
 	private void createTopButtons() {
@@ -191,20 +164,6 @@ private void createTopButtons() {
 		addButton.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_add));
 		addButton.setText(Messages.ModelTooling_Common_AddEllipsis);
 		addButton.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		addButton.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				EClass eClass = ((FeatureClass) ((IStructuredSelection) dropDown.getSelection()).getFirstElement()).eClass;
-				EObject eObject = EcoreUtil.create(eClass);
-
-				Command cmd = AddCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), reference, eObject);
-
-				if (cmd.canExecute()) {
-					editor.getEditingDomain().getCommandStack().execute(cmd);
-					editor.getEditor().setSelection(eObject);
-				}
-			}
-		});
 
 	}
 
@@ -222,11 +181,10 @@ public ComboViewer getDropDown() {
 	 * @param editor
 	 * @return a new {@link ViewerElement}
 	 */
-	public static ViewerElement create(IEclipseContext parentContext, Composite parent, EReference reference, AbstractComponentEditor editor) {
+	public static ViewerElement create(IEclipseContext parentContext, Composite parent, AbstractComponentEditor editor) {
 		IEclipseContext mycontext = parentContext.createChild();
 		mycontext.set(Composite.class, parent);
 		mycontext.set(AbstractComponentEditor.class, editor);
-		mycontext.set(EReference.class, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
 		return ContextInjectionFactory.make(ViewerElement.class, mycontext);
 	}
 }

From 894c89e1f4f1d719562e135d31a02eff68aa3294 Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@gmail.com>
Date: Wed, 20 Feb 2013 22:36:04 +0530
Subject: [PATCH 0562/1286] Bug 398078 - Reduce dependencies in the Eclipse 4
 wizard to the needed components

Only leaves SWT as unused dependency in. It is reported to be redundant
because JFace re-exports but I think for the user it is easier to see
SWT as direct dependency
---
 .../wizards/project/E4NewProjectWizard.java   | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index e7067fb5b2..5073493d72 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -713,18 +713,17 @@ public String getPluginVersion() {
 
 	private class ContentWizard extends Wizard implements IBundleContentWizard {
 
-		String[] dependencies = new String[] { "javax.inject",
-				"org.eclipse.core.runtime", "org.eclipse.swt",
-				"org.eclipse.core.databinding",
-				"org.eclipse.core.databinding.beans", "org.eclipse.jface",
-				"org.eclipse.jface.databinding", "org.eclipse.e4.ui.services",
-				"org.eclipse.e4.ui.workbench", "org.eclipse.e4.core.services",
-				"org.eclipse.e4.core.di", "org.eclipse.e4.ui.di",
+		String[] dependencies = new String[] { 
+				"javax.inject",
+				"org.eclipse.core.runtime", 
+				"org.eclipse.swt",
+				"org.eclipse.jface",
+				"org.eclipse.e4.ui.services",
+				"org.eclipse.e4.ui.workbench", 
+				"org.eclipse.e4.core.di", 
+				"org.eclipse.e4.ui.di",
 				"org.eclipse.e4.core.contexts",
-				"org.eclipse.e4.ui.workbench.swt",
-				"org.eclipse.core.databinding.property",
-				"org.eclipse.e4.ui.css.core", "org.w3c.css.sac",
-				"org.eclipse.e4.core.commands", "org.eclipse.e4.ui.bindings" };
+				};
 
 		public void init(IFieldData data) {
 		}

From 6b38d46cd2dae83cec0d7cf819ad80d5339483ae Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Wed, 20 Feb 2013 18:23:31 +0100
Subject: [PATCH 0563/1286] bug 400804: Additional make-up for the model editor

---
 .../internal/common/component/ModelFragmentsEditor.java  | 8 +++-----
 .../common/component/virtual/VModelFragmentsEditor.java  | 9 +++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index 43227f5eec..f4bd0881ef 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -119,8 +119,7 @@ private void createFragmentsTab(CTabFolder folder) {
 		{
 
 			Composite fragCompo = new Composite(parent, SWT.NONE);
-			fragCompo.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1));
-			fragCompo.setLayout(new GridLayout());
+			fragCompo.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 3, 1));
 			GridLayout fragCompoLayout = new GridLayout(1, false);
 			fragCompoLayout.marginLeft = 0;
 			fragCompoLayout.marginRight = 0;
@@ -131,8 +130,7 @@ private void createFragmentsTab(CTabFolder folder) {
 			final TableViewer viewer = new TableViewer(fragCompo);
 			viewer.setContentProvider(new ObservableListContentProvider());
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = 200;
+			GridData gd = new GridData(GridData.FILL_BOTH);
 			viewer.getControl().setLayoutData(gd);
 
 			IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
@@ -140,7 +138,7 @@ private void createFragmentsTab(CTabFolder folder) {
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
+			GridLayout gl = new GridLayout(4, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index 516e7f2d05..d5aa32a950 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -115,11 +115,12 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
 			GridData gd = new GridData(GridData.FILL_BOTH);
+			gd.horizontalSpan = 3;
 			viewer.getControl().setLayoutData(gd);
 
 			Composite buttonComp = new Composite(parent, SWT.NONE);
 			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
+			GridLayout gl = new GridLayout(4, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -129,7 +130,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Up);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 1, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -156,7 +157,7 @@ public void widgetSelected(SelectionEvent e) {
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Down);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 1, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -197,7 +198,7 @@ public void widgetSelected(SelectionEvent e) {
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_Remove);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 1, 1));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {

From f36fa1dca51563caa563f1b7e83c6fe0895d0d71 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Thu, 21 Feb 2013 17:05:28 +0100
Subject: [PATCH 0564/1286] added DIHandler

---
 .../e4/tools/compat/parts/DIHandler.java      | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
new file mode 100644
index 0000000000..1bb218385f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2012 EclipseSource München GmbH and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Jonas Helming <jhelming@eclipsesource.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.parts;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.ui.PlatformUI;
+/**
+ * This is a preliminary implementation of a Handler wrapper. It does not support @CanExecute yet
+ * @author Jonas
+ *
+ * @param <C>
+ */
+public class DIHandler<C> extends AbstractHandler {
+
+	private Class<C> clazz;
+	private C component;
+
+	public DIHandler(Class<C> clazz) {
+		this.clazz = clazz;
+		IEclipseContext context = getActiveContext();
+		component = ContextInjectionFactory.make(clazz, context);
+	}
+
+	private static IEclipseContext getActiveContext() {
+		IEclipseContext parentContext = getParentContext();
+		return parentContext.getActiveLeaf();
+	}
+
+	private static IEclipseContext getParentContext() {
+		return (IEclipseContext) PlatformUI.getWorkbench().getService(
+				IEclipseContext.class);
+	}
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		return ContextInjectionFactory.invoke(component, Execute.class,
+				getActiveContext());
+	}
+
+}
\ No newline at end of file

From e2cd1c8ca963e658fa5fb65e15eaa6374781b653 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Fri, 16 Nov 2012 23:32:20 +0100
Subject: [PATCH 0565/1286] Bug 394172 - Update Eclipse 4 tools projects with
 HandlerProcessingAddon

---
 .../tools/wizards/model/NewApplicationModelWizard.java     | 3 ++-
 .../internal/tools/wizards/project/E4NewProjectWizard.java | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
index 8d5d78fdc1..6f73ed3e87 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
@@ -40,7 +40,8 @@ protected EObject createInitialModel() {
 					{ "org.eclipse.e4.ui.bindings.service", "bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon" },
 					{ "org.eclipse.e4.ui.workbench.commands.model", "bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon" },
 					{ "org.eclipse.e4.ui.workbench.contexts.model", "bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon" },
-					{ "org.eclipse.e4.ui.workbench.bindings.model", "bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon" }
+					{ "org.eclipse.e4.ui.workbench.bindings.model", "bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon" },
+					{ "org.eclipse.e4.ui.workbench.handler.model", "bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon" }
 					
 				};
 				
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 5073493d72..c3ae3916cf 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -490,6 +490,11 @@ private void createApplicationModel(IProject project, String pluginName,
 			addon.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon");
 			application.getAddons().add(addon);
 
+			addon = MApplicationFactory.INSTANCE.createAddon();
+			addon.setElementId("org.eclipse.e4.ui.workbench.handler.model");
+			addon.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon");
+			application.getAddons().add(addon);
+			
 			addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.ui.workbench.contexts.model");
 			addon.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon");
@@ -764,4 +769,4 @@ public boolean performFinish() {
 		}
 
 	}
-}
\ No newline at end of file
+}

From 76ca959d68f595e5f903b4d371130f449ede80b8 Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Fri, 15 Feb 2013 12:09:52 +0100
Subject: [PATCH 0566/1286] [395982] Dynamic menu contribution; Application
 model editor tooling part

---
 .../plugin.xml                                |   3 +
 ...micMenuContributionContributionEditor.java | 132 +++++++++++
 .../OSGI-INF/resources.properties             |   2 +
 .../modelelements/DynamicMenuContribution.gif | Bin 0 -> 366 bytes
 .../tbr/DynamicMenuContribution.gif           | Bin 0 -> 962 bytes
 .../e4/tools/emf/ui/internal/Messages.java    |  10 +-
 .../tools/emf/ui/internal/Messages.properties |  10 +-
 .../emf/ui/internal/ResourceProvider.java     |   5 +-
 .../emf/ui/internal/common/ModelEditor.java   |   5 +-
 .../DynamicMenuContributionEditor.java        | 211 ++++++++++++++++++
 .../component/MenuContributionEditor.java     |  10 +-
 .../internal/common/component/MenuEditor.java |   9 +-
 ...NewDynamicMenuContributionClassWizard.java | 149 +++++++++++++
 .../DynamicMenuContributionTemplate.java      |  56 +++++
 .../templates/dynamicMenuContribution.txtjet  |  28 +++
 15 files changed, 623 insertions(+), 7 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DynamicMenuContribution.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DynamicMenuContribution.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
 create mode 100644 bundles/org.eclipse.e4.tools/templates/dynamicMenuContribution.txtjet

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index d141b3132c..05d1907ee0 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -23,6 +23,9 @@
       <contributionClassCreator
             class="org.eclipse.e4.tools.emf.editor3x.extension.AddonContributionEditor">
       </contributionClassCreator>
+      <contributionClassCreator
+            class="org.eclipse.e4.tools.emf.editor3x.extension.DynamicMenuContributionContributionEditor">
+      </contributionClassCreator>
    </extension>
    <extension
          point="org.eclipse.ui.preferencePages">
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java
new file mode 100644
index 0000000000..a9f1c3ceaf
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java
@@ -0,0 +1,132 @@
+/*******************************************************************************
+ * Copyright (c) 2013 MEDEVIT, FHV and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Marco Descher <marco@descher.at> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x.extension;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.e4.internal.tools.wizards.classes.NewDynamicMenuContributionClassWizard;
+import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
+import org.eclipse.e4.ui.model.application.MContribution;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PartInitException;
+
+public class DynamicMenuContributionContributionEditor implements
+		IContributionClassCreator {
+
+	public void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell) {
+		createOpen(contribution, domain, project, shell, false);
+	}
+
+	public void createOpen(MContribution contribution, EditingDomain domain,
+			IProject project, Shell shell, boolean forceNew) {
+		if( forceNew || contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 || !contribution.getContributionURI().startsWith("bundleclass:") ) {
+			NewDynamicMenuContributionClassWizard wizard = new NewDynamicMenuContributionClassWizard(contribution.getContributionURI());
+			wizard.init( null, new StructuredSelection(project));
+			WizardDialog dialog = new WizardDialog(shell, wizard);
+			if( dialog.open() == WizardDialog.OK ) {
+				IFile f = wizard.getFile();
+				ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
+				try {
+					String fullyQualified;
+					if( el.getPackageDeclarations() != null && el.getPackageDeclarations().length > 0 ) {
+						String packageName = el.getPackageDeclarations()[0].getElementName();
+						String className = wizard.getDomainClass().getName();
+						if( packageName.trim().length() > 0 ) {
+							fullyQualified = packageName + "." + className;	
+						} else {
+							fullyQualified = className;
+						}
+					} else {
+						fullyQualified = wizard.getDomainClass().getName();
+					}
+					
+					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "bundleclass://" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified);
+					if( cmd.canExecute() ) {
+						domain.getCommandStack().execute(cmd);
+					}
+				} catch (JavaModelException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		} else {
+			URI uri = URI.createURI(contribution.getContributionURI());
+			if (uri.hasAuthority() && uri.segmentCount() == 1) {
+			    String symbolicName = uri.authority();
+			    String fullyQualified = uri.segment(0);
+				IProject p = ResourcesPlugin.getWorkspace().getRoot()
+						.getProject(symbolicName);
+				
+				if( ! p.exists() ) {
+					for( IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects() ) {
+						String name = Util.getBundleSymbolicName(check);
+						if( symbolicName.equals(name) ) {
+							p = check;
+							break;
+						}
+					}
+				}
+				
+				// TODO If this is not a WS-Resource we need to open differently
+				if (p != null) {
+					IJavaProject jp = JavaCore.create(p);
+					IType t = null;
+                    try {
+                    	if (p.exists()){
+                    		t = jp.findType(fullyQualified);
+                    	}
+                    	else
+                    	{
+                    		IJavaProject pprim = JavaCore.create(project);
+                    		t = pprim.findType(fullyQualified);
+                    	}
+                        if( t != null ) {
+                            JavaUI.openInEditor(t);
+                        } else {
+                                createOpen(contribution, domain, project, shell, true);
+                        }
+					} catch (JavaModelException e) {
+							createOpen(contribution, domain, project, shell, true);
+					} catch (PartInitException e) {
+						MessageDialog.openError(shell, "Failed to open editor", e.getMessage());
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+			} else {
+				MessageDialog.openError(shell, "Invalid URL",
+						"The current url is invalid");
+			}
+		}
+	}
+
+	public boolean isSupported(EClass element) {
+		return Util.isTypeOrSuper(MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, element);
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
index 31acf1b154..7e109d4ce8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
@@ -17,6 +17,7 @@ IMG_org.eclipse.e4.tools.emf.ui.modelelements.KeyBinding=/icons/full/modelelemen
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.Menu=/icons/full/modelelements/Menu.gif
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.MenuContribution=/icons/full/modelelements/MenuContribution.gif
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.MenuItem=/icons/full/modelelements/MenuItem.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.DynamicMenuContribution=/icons/full/modelelements/DynamicMenuContribution.gif
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.MenuSeparator=/icons/full/modelelements/MenuSeparator.gif
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.ModelFragments=/icons/full/modelelements/ModelFragments.png
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.Parameter=/icons/full/modelelements/Parameter.png
@@ -51,6 +52,7 @@ IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.HandledToolItem=/icons/full/mo
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Menu=/icons/full/modelelements/tbr/Menu.gif
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.MenuContribution=/icons/full/modelelements/tbr/MenuContribution.gif
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.MenuItem=/icons/full/modelelements/tbr/MenuItem.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.DynamicMenuContribution=/icons/full/modelelements/tbr/DynamicMenuContribution.gif
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.MenuSeparator=/icons/full/modelelements/tbr/MenuSeparator.gif
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.ModelFragments=/icons/full/modelelements/tbr/ModelFragments.png
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Parameter=/icons/full/modelelements/tbr/Parameter.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DynamicMenuContribution.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DynamicMenuContribution.gif
new file mode 100644
index 0000000000000000000000000000000000000000..29f08863e728ee61de3a88a2b227bad21eb79e27
GIT binary patch
literal 366
zcmZ?wbhEHb6krfwSZc~3q2sR|-me`qQ!9C;e`2jx)=tgrotpVa1loM%I)l<{SDMVo
z$Z1+z*uK$aVM%$<*4jxsJ0>r0o4l@h#@_Zh2MRZqcJ650xOP(Q-uYWM^ljVFzjIUf
z&doi0w{-2@+O>aM$LbwtC!Sb$@$`|4r;qNv|7GukFZW)4zy13AyDz`KfBy6R3lRPN
z{O$MG??CkD8<70*=i84z-+%u8{`1ezUw{4+0*XIb7`Yhi8FUzc0OThIw(bM-3p{j$
z>`yHD6#VAGynq$UPfQF{o8aEOa7J#I)b-a_yACGlg)gf}jNKf~`Z`EtZJ1U~)_y5L
z{)Wb;MrT%y_Kr>sHfLsa_57%qer9JTl^HWtR2BL76rC9tEncL^Ehfgjz==U&-Fj|O
oQ&UlHXBM@Iyc}Yi#W<V=)eaw#*t1{4S?Khc(-NE<Cmk8A0obF&761SM

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DynamicMenuContribution.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DynamicMenuContribution.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b2caa8a1d6929d89d9c40ac8160af15017304701
GIT binary patch
literal 962
zcmV;z13mmlNk%w1VGsZi0Ou+I000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW3IP59EC2ui01yBW000P|0R0IZNU$KmS_l&=tW|K9zK0MY(kd7$
zpC(I?6cqxrCts|BukMMwhp(i_R|Q$wyO?p~9($|`GOI_kW=&=U&FI|8bLT)Y^MVQ;
zI&aKCF6hv))W|U@mw{HYNu8Qan=VC)bPbfkwJTR$e^jaZqg9}aTWHh%`SkDKr#}O~
kD8;BTjjFb)(hQW8v@g0=cJsE{E2*$yNv+(Z85|G*JN=N+v;Y7A

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index e83558364b..22189a5faf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010-2013 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Marco Descher <marco@descher.at> - Bug 395982
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
@@ -97,6 +98,12 @@ public class Messages {
 	public String HandledMenuItemEditor_Tag;
 	public String HandledMenuItemEditor_Value;
 
+	public String DynamicMenuContributionEditor_Label;
+	public String DynamicMenuContributionEditor_Description;
+
+	public String DynamicMenuContributionEditor_ClassURI;
+	public String DynamicMenuContributionEditor_LabelLabel;
+
 	public String HandledToolItemEditor_Command;
 	public String HandledToolItemEditor_Parameters;
 	public String HandledToolItemEditor_ParametersName;
@@ -140,6 +147,7 @@ public class Messages {
 	public String MenuEditor_AddMenu;
 	public String MenuEditor_AddDirectMenuItem;
 	public String MenuEditor_AddSeparator;
+	public String MenuEditor_AddDynamicMenuContribution;
 	public String MenuEditor_AddCoreExpression;
 
 	public String MenuItemEditor_Type;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 34ecbf8b58..01e57514f3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -1,5 +1,5 @@
 # ******************************************************************************
-# * Copyright (c) 2010 BestSolution.at and others.
+# * Copyright (c) 2010-2013 BestSolution.at and others.
 # * All rights reserved. This program and the accompanying materials
 # * are made available under the terms of the Eclipse Public License v1.0
 # * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
 # * Contributors:
 # *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
 # *		Sopot Cela <sopotcela@gmail.com> - enhancements
+# *     Marco Descher <marco@descher.at> - Bug 395982
 # ******************************************************************************
 ModelTooling_Common_Up=Up
 ModelTooling_Common_Down=Down
@@ -96,6 +97,12 @@ HandledMenuItemEditor_Parameters=Parameters
 HandledMenuItemEditor_Tag=Name
 HandledMenuItemEditor_Value=Value
 
+DynamicMenuContributionEditor_Label=DynamicMenuContribution
+DynamicMenuContributionEditor_Description=DynamicMenuContribution blablabla
+
+DynamicMenuContributionEditor_ClassURI=Class URI
+DynamicMenuContributionEditor_LabelLabel=Label
+
 HandledToolItemEditor_Command=Command
 HandledToolItemEditor_Parameters=Parameters
 HandledToolItemEditor_ParametersName=Name
@@ -140,6 +147,7 @@ MenuEditor_AddHandledMenuItem=HandledMenuItem
 MenuEditor_AddMenu=Menu
 MenuEditor_AddDirectMenuItem=DirectMenuItem
 MenuEditor_AddSeparator=Separator
+MenuEditor_AddDynamicMenuContribution=DynamicMenuContribution
 MenuEditor_AddCoreExpression=VisibleWhen Core Expression
 
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
index 41e626817a..60c8ecf024 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 BestSolution.at
+ * Copyright (c) 2011-2013 BestSolution.at
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Marco Descher <marco@descher.at> - Bug 395982
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
@@ -32,6 +33,7 @@ public class ResourceProvider extends BasicResourceProvider {
 	public static final String IMG_Menu = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Menu"; //$NON-NLS-1$
 	public static final String IMG_MenuContribution = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.MenuContribution"; //$NON-NLS-1$
 	public static final String IMG_MenuItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.MenuItem"; //$NON-NLS-1$
+	public static final String IMG_DynamicMenuContribution = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.DynamicMenuContribution"; //$NON-NLS-1$
 	public static final String IMG_MenuSeparator = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.MenuSeparator"; //$NON-NLS-1$
 	public static final String IMG_ModelFragments = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.ModelFragments"; //$NON-NLS-1$
 	public static final String IMG_Parameter = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Parameter"; //$NON-NLS-1$
@@ -66,6 +68,7 @@ public class ResourceProvider extends BasicResourceProvider {
 	public static final String IMG_Tbr_Menu = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Menu"; //$NON-NLS-1$
 	public static final String IMG_Tbr_MenuContribution = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.MenuContribution"; //$NON-NLS-1$
 	public static final String IMG_Tbr_MenuItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.MenuItem"; //$NON-NLS-1$
+	public static final String IMG_Tbr_DynamicMenuContribution = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.DynamicMenuContribution"; //$NON-NLS-1$
 	public static final String IMG_Tbr_MenuSeparator = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.MenuSeparator"; //$NON-NLS-1$
 	public static final String IMG_Tbr_ModelFragments = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.ModelFragments"; //$NON-NLS-1$
 	public static final String IMG_Tbr_Parameter = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Parameter"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 4210e267e1..9640c9cae6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010-2013 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Wim Jongman <wim.jongman@remainsoftware.com> - Maintenance
+ *     Marco Descher <marco@descher.at> - Bug395982
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
@@ -71,6 +72,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DefaultEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectMenuItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectToolItemEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.DynamicMenuContributionEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledMenuItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandlerEditor;
@@ -1119,6 +1121,7 @@ private void registerDefaultEditors() {
 		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION, ContextInjectionFactory.make(MenuContributionEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION, ContextInjectionFactory.make(ToolBarContributionEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION, ContextInjectionFactory.make(TrimContributionEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, ContextInjectionFactory.make(DynamicMenuContributionEditor.class, context));
 
 		registerEditor(UiPackageImpl.Literals.CORE_EXPRESSION, ContextInjectionFactory.make(CoreExpressionEditor.class, context));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
new file mode 100644
index 0000000000..d8757498b7
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
@@ -0,0 +1,211 @@
+/*******************************************************************************
+ * Copyright (c) 2013 MEDEVIT, FHV and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Marco Descher <marco@descher.at> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import javax.inject.Inject;
+import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.UpdateValueStrategy;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
+import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
+import org.eclipse.e4.ui.model.application.MContribution;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+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.Link;
+import org.eclipse.swt.widgets.Text;
+
+public class DynamicMenuContributionEditor extends AbstractComponentEditor {
+
+	private Composite composite;
+	private EMFDataBindingContext context;
+
+	private EStackLayout stackLayout;
+
+	@Inject
+	@Optional
+	private IProject project;
+
+	public DynamicMenuContributionEditor() {
+		super();
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.DynamicMenuContributionEditor_Label;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return Messages.DynamicMenuContributionEditor_Description;
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if (element instanceof MUIElement) {
+			if (((MUIElement) element).isToBeRendered()) {
+				return createImage(ResourceProvider.IMG_DynamicMenuContribution);
+			} else {
+				return createImage(ResourceProvider.IMG_Tbr_DynamicMenuContribution);
+			}
+		}
+
+		return null;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return getLocalizedLabel((MUILabel) element);
+	}
+
+	@Override
+	protected Composite doGetEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new EStackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+
+		if (getEditor().isModelFragment()) {
+			Control topControl;
+			if (Util.isImport((EObject) object)) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];
+			}
+
+			if (stackLayout.topControl != topControl) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		if (isImport) {
+			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
+			return folder;
+		}
+
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTranslatedTextField(parent, Messages.DynamicMenuContributionEditor_LabelLabel, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
+
+		// ------------------------------------------------------------
+		final Link lnk = new Link(parent, SWT.NONE);
+		{
+			final IContributionClassCreator c = getEditor().getContributionCreator(MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION);
+			if (project != null && c != null) {
+
+				lnk.setText("<A>" + Messages.DynamicMenuContributionEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
+				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+				lnk.addSelectionListener(new SelectionAdapter() {
+					@Override
+					public void widgetSelected(SelectionEvent e) {
+						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, lnk.getShell());
+					}
+				});
+			} else {
+				Label l = new Label(parent, SWT.NONE);
+				l.setText(Messages.DynamicMenuContributionEditor_ClassURI);
+				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			}
+
+			Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			t.addModifyListener(new ModifyListener() {
+
+				public void modifyText(ModifyEvent e) {
+					lnk.setToolTipText(((Text) (e.getSource())).getText());
+				}
+			});
+			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
+			Util.addDecoration(t, binding);
+
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					dialog.open();
+				}
+			});
+		}
+
+		folder.setSelection(0);
+
+		return folder;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index d14fca00c9..f8b610fd6b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010-2013 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Marco Descher <marco@descher.at> - https://bugs.eclipse.org/397650
+ *     Marco Descher <marco@descher.at> - Bug 397650, Bug 395982
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -115,6 +115,12 @@ public void run() {
 				handleAdd(MenuPackageImpl.Literals.MENU_SEPARATOR, true);
 			}
 		});
+		actions.add(new Action(Messages.MenuEditor_AddDynamicMenuContribution, createImageDescriptor(ResourceProvider.IMG_DynamicMenuContribution)) {
+			@Override
+			public void run() {
+				handleAdd(MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false);
+			}
+		});
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index a41adfe105..985455785e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010-2013 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Marco Descher <marco@descher.at> - Bug 395982
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -150,6 +151,12 @@ public void run() {
 				handleAdd(MenuPackageImpl.Literals.MENU_SEPARATOR, true);
 			}
 		});
+		actions.add(new Action(Messages.MenuEditor_AddDynamicMenuContribution, createImageDescriptor(ResourceProvider.IMG_DynamicMenuContribution)) {
+			@Override
+			public void run() {
+				handleAdd(MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false);
+			}
+		});
 		addExpression = new Action(Messages.MenuEditor_AddCoreExpression, createImageDescriptor(ResourceProvider.IMG_CoreExpression)) {
 			@Override
 			public void run() {
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
new file mode 100644
index 0000000000..59c8b2bc63
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
@@ -0,0 +1,149 @@
+/*******************************************************************************
+ * Copyright (c) 2013 MEDEVIT, FHV and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Marco Descher <marco@descher.at> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.classes;
+
+import java.util.Set;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage;
+import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassWizard;
+import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
+import org.eclipse.e4.internal.tools.wizards.classes.templates.DynamicMenuContributionTemplate;
+
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class NewDynamicMenuContributionClassWizard extends
+		AbstractNewClassWizard {
+
+	private String initialString;
+	
+	public NewDynamicMenuContributionClassWizard(String contributionURI) {
+		this.initialString = contributionURI;
+	}
+
+	@Override
+	protected String getContent() {
+		DynamicMenuContributionTemplate template = new DynamicMenuContributionTemplate();
+		return template.generate(getDomainClass());
+	}
+	
+	@Override
+	public void addPages() {
+		addPage(new AbstractNewClassPage("Classinformation",
+				"New Dynamic Menu Contribution",
+				"Create a new dynamic menu contribution class", root, ResourcesPlugin.getWorkspace().getRoot(),initialString) {
+
+			@Override
+			protected JavaClass createInstance() {
+				return new DynamicMenuContributionClass(root);
+			}
+
+			@Override
+			protected void createFields(Composite parent, DataBindingContext dbc) {
+				IWidgetValueProperty textProp = WidgetProperties
+						.text(SWT.Modify);
+
+				{
+					Label l = new Label(parent, SWT.NONE);
+					l.setText("AboutToShow Method");
+
+					Text t = new Text(parent, SWT.BORDER);
+					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+					dbc.bindValue(
+							textProp.observe(t),
+							BeanProperties.value("aboutToShowMethodName").observe(
+									getClazz()));
+
+					l = new Label(parent, SWT.NONE);
+				}
+
+				{
+					Label l = new Label(parent, SWT.NONE);
+					l.setText("AboutToShow Method");
+
+					Text t = new Text(parent, SWT.BORDER);
+					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+					dbc.bindValue(textProp.observe(t),
+							BeanProperties.value("aboutToHideMethodName")
+									.observe(getClazz()));
+					dbc.bindValue(
+							WidgetProperties.enabled().observe(t),
+							BeanProperties.value("useAboutToHide").observe(
+									getClazz()));
+
+					Button b = new Button(parent, SWT.CHECK);
+					dbc.bindValue(
+							WidgetProperties.selection().observe(b),
+							BeanProperties.value("useAboutToHide").observe(
+									getClazz()));
+				}
+			}
+		});
+	}
+	
+	@Override
+	protected Set<String> getRequiredBundles() {
+		Set<String> set = super.getRequiredBundles();
+		set.add("org.eclipse.e4.ui.di");
+		set.add("org.eclipse.e4.ui.model.workbench");
+		return set;
+	}
+	
+	public static class DynamicMenuContributionClass extends JavaClass {
+		private String aboutToShowMethodName = "aboutToShow";
+		private String aboutToHideMethodName = "aboutToHide";
+		private boolean useAboutToHide = false;
+
+		public DynamicMenuContributionClass(IPackageFragmentRoot root) {
+			super(root);
+		}
+
+		public String getAboutToShowMethodName() {
+			return aboutToShowMethodName;
+		}
+
+		public void setAboutToShowMethodName(String executeMethodName) {
+			support.firePropertyChange("aboutToShowMethodName",
+					this.aboutToShowMethodName,
+					this.aboutToShowMethodName = executeMethodName);
+		}
+
+		public String getAboutToHideMethodName() {
+			return aboutToHideMethodName;
+		}
+
+		public void setAboutToHideMethodName(String canExecuteMethodName) {
+			support.firePropertyChange("aboutToHideMethodName",
+					this.aboutToHideMethodName,
+					this.aboutToHideMethodName = canExecuteMethodName);
+		}
+
+		public boolean isUseAboutToHide() {
+			return useAboutToHide;
+		}
+
+		public void setUseAboutToHide(boolean useAboutToHide) {
+			support.firePropertyChange("useAboutToHide", this.useAboutToHide,
+					this.useAboutToHide = useAboutToHide);
+		}
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
new file mode 100644
index 0000000000..aa531af457
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
@@ -0,0 +1,56 @@
+package org.eclipse.e4.internal.tools.wizards.classes.templates;
+
+import org.eclipse.e4.internal.tools.wizards.classes.NewDynamicMenuContributionClassWizard.DynamicMenuContributionClass;
+
+public class DynamicMenuContributionTemplate
+{
+  protected static String nl;
+  public static synchronized DynamicMenuContributionTemplate create(String lineSeparator)
+  {
+    nl = lineSeparator;
+    DynamicMenuContributionTemplate result = new DynamicMenuContributionTemplate();
+    nl = null;
+    return result;
+  }
+
+  public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+  protected final String TEXT_1 = " ";
+  protected final String TEXT_2 = NL + "package ";
+  protected final String TEXT_3 = ";";
+  protected final String TEXT_4 = NL + NL + "import java.util.List;" + NL + "" + NL + "import org.eclipse.e4.ui.di.AboutToShow;";
+  protected final String TEXT_5 = NL + "import org.eclipse.e4.ui.di.AboutToHide;";
+  protected final String TEXT_6 = NL + NL + "import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;" + NL + "" + NL + "public class ";
+  protected final String TEXT_7 = " {" + NL + "\t@AboutToShow" + NL + "\tpublic void ";
+  protected final String TEXT_8 = "(List<MMenuElement> items) {" + NL + "\t\t//TODO Your code goes here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_9 = NL + "\t" + NL + "\t@AboutToHide" + NL + "\tpublic void ";
+  protected final String TEXT_10 = "(List<MMenuElement> items) {" + NL + "\t\t//TODO Your code goes here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_11 = "\t" + NL + "}";
+
+  public String generate(Object argument)
+  {
+    final StringBuffer stringBuffer = new StringBuffer();
+     DynamicMenuContributionClass domainClass = (DynamicMenuContributionClass)argument; 
+    stringBuffer.append(TEXT_1);
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
+    stringBuffer.append(TEXT_2);
+    stringBuffer.append( domainClass.getPackageFragment().getElementName() );
+    stringBuffer.append(TEXT_3);
+     } 
+    stringBuffer.append(TEXT_4);
+     if( domainClass.isUseAboutToHide() )  { 
+    stringBuffer.append(TEXT_5);
+     } 
+    stringBuffer.append(TEXT_6);
+    stringBuffer.append( domainClass.getName() );
+    stringBuffer.append(TEXT_7);
+    stringBuffer.append( domainClass.getAboutToShowMethodName() );
+    stringBuffer.append(TEXT_8);
+     if( domainClass.isUseAboutToHide() )  { 
+    stringBuffer.append(TEXT_9);
+    stringBuffer.append( domainClass.getAboutToHideMethodName() );
+    stringBuffer.append(TEXT_10);
+     } 
+    stringBuffer.append(TEXT_11);
+    return stringBuffer.toString();
+  }
+}
diff --git a/bundles/org.eclipse.e4.tools/templates/dynamicMenuContribution.txtjet b/bundles/org.eclipse.e4.tools/templates/dynamicMenuContribution.txtjet
new file mode 100644
index 0000000000..832f703f9c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/templates/dynamicMenuContribution.txtjet
@@ -0,0 +1,28 @@
+<%@ jet package="org.eclipse.e4.internal.tools.wizards.classes.templates" class="DynamicMenuContributionTemplate" imports="org.eclipse.e4.internal.tools.wizards.classes.NewDynamicMenuContributionClassWizard.DynamicMenuContributionClass" %>
+<% DynamicMenuContributionClass domainClass = (DynamicMenuContributionClass)argument; %> 
+<% if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { %>
+package <%= domainClass.getPackageFragment().getElementName() %>;
+<% } %>
+
+import java.util.List;
+
+import org.eclipse.e4.ui.di.AboutToShow;
+<% if( domainClass.isUseAboutToHide() )  { %>
+import org.eclipse.e4.ui.di.AboutToHide;
+<% } %>
+
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
+
+public class <%= domainClass.getName() %> {
+	@AboutToShow
+	public void <%= domainClass.getAboutToShowMethodName() %>(List<MMenuElement> items) {
+		//TODO Your code goes here
+	}
+	<% if( domainClass.isUseAboutToHide() )  { %>
+	
+	@AboutToHide
+	public void <%= domainClass.getAboutToHideMethodName() %>(List<MMenuElement> items) {
+		//TODO Your code goes here
+	}
+	<% } %>	
+}
\ No newline at end of file

From 662b7c8b6f8af3e5e36252ea75dc71baaf14f8ac Mon Sep 17 00:00:00 2001
From: Vincenzo Caselli <vincenzo.caselli@rcp-vision.com>
Date: Wed, 13 Mar 2013 13:37:23 +0100
Subject: [PATCH 0567/1286] Bug 395443 - Extract part of application model and
 add to existing fragment

https://bugs.eclipse.org/395443
---
 .../model/BaseApplicationModelWizard.java     | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index da32d9f2c6..68add7537a 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -23,11 +23,15 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.fragment.MModelFragment;
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
 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.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -80,7 +84,8 @@ public boolean performFinish() {
 			final IFile modelFile = getModelFile();
 			
 			if( modelFile.exists() ) {
-				if( ! MessageDialog.openQuestion(getShell(), "File exists", "The file already exists. Would you like to overwrite?")) {
+				if( ! MessageDialog.openQuestion(getShell(), "File exists", "The file already exists. "
+						+ "Would you like to add the extracted node to this file?")) {
 					return false;
 				}
 			}
@@ -103,12 +108,32 @@ protected void execute(IProgressMonitor progressMonitor) {
 							// Create a resource for this file.
 							//
 							Resource resource = resourceSet.createResource(fileURI);
+							
+							// If target file already exists, load its content
+							//
+							if (modelFile.exists()) {
+								resource.load(null);
+							}
 
 							// Add the initial model object to the contents.
 							//
 							EObject rootObject = createInitialModel();
 							if (rootObject != null) {
-								resource.getContents().add(rootObject);
+								if (resource.getContents().size() == 0) {
+									//If target model is empty (file just created) => add as is
+									resource.getContents().add(rootObject);
+								} else {
+									//Otherwise (file already exists) => take the roots of source and target models
+									//and copy multiple attributes 'imports' and 'fragments' objects from source to target
+									MModelFragments sourceFragments = (MModelFragments) rootObject;
+									MModelFragments targetFragments = (MModelFragments) resource.getContents().get(0);
+									for (MApplicationElement element : sourceFragments.getImports()) {
+										targetFragments.getImports().add((MApplicationElement) EcoreUtil.copy((EObject) element));
+									}
+									for (MModelFragment fragment : sourceFragments.getFragments()) {
+										targetFragments.getFragments().add((MModelFragment) EcoreUtil.copy((EObject) fragment));
+									}
+								}
 							}
 
 							// Save the contents of the resource to the file system.

From 91b662613b30d6626ded2f700eccfc1f2621ec72 Mon Sep 17 00:00:00 2001
From: "l.ripeynih" <akafakir@gmail.com>
Date: Tue, 22 Jan 2013 23:45:26 +0400
Subject: [PATCH 0568/1286] Bug 388635 creates an id for handlers following the
 pattern: <project_name>.handler.<commad_name>

Change-Id: I22e7e39c0780a57c5b3edabaec3b47e199bac5a1
---
 .../tools/wizards/project/E4NewProjectWizard.java     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index c3ae3916cf..6179a319a1 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -661,14 +661,15 @@ private MCommand createCommand(String commandId, String name,
 		command.setElementId(commandId);
 		application.getCommands().add(command);
 		{
-			// Create Quit handler for command
-			MHandler quitHandler = MCommandsFactory.INSTANCE.createHandler();
-			quitHandler.setCommand(command);
+			// Create handler for command
+			MHandler handler = MCommandsFactory.INSTANCE.createHandler();
+			handler.setCommand(command);
 			String elementName = fragment.getElementName();
-			quitHandler.setContributionURI("bundleclass://" + projectName + "/"
+			handler.setContributionURI("bundleclass://" + projectName + "/"
 					+ (elementName.equals("") ? "" : elementName + ".")
 					+ "handlers." + className);
-			application.getHandlers().add(quitHandler);
+			handler.setElementId(projectName + ".handler." + name);
+			application.getHandlers().add(handler);
 
 			MKeyBinding binding = MCommandsFactory.INSTANCE.createKeyBinding();
 			binding.setKeySequence(keyBinding);

From 861addc9035129f7cf60225d9e5123d68a029264 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Fri, 15 Mar 2013 09:49:27 -0400
Subject: [PATCH 0569/1286] Bug 403453 - [tools] CSS Spy generates
 ClassNotFoundException in Eclipse M6


From 94a6227b0125289228de265e6354eaa1610110a4 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Sat, 16 Mar 2013 23:23:51 +0100
Subject: [PATCH 0570/1286] bug 402875: Added support for command categories
 and commands https://bugs.eclipse.org/bugs/show_bug.cgi?id=402875

---
 .../META-INF/MANIFEST.MF                      |   3 +-
 .../component/AbstractComponentEditor.java    |   9 +
 .../emf/ui/internal/common/ModelEditor.java   |  33 +++-
 .../virtual/VApplicationCategoriesEditor.java |  39 +++-
 .../component/virtual/VCommandEditor.java     |  33 +++-
 .../emf/ui/internal/imp/ModelImportPage1.java | 174 +++++++++++++++++
 .../ui/internal/imp/ModelImportWizard.java    |  97 ++++++++++
 .../emf/ui/internal/imp/RegistryStruct.java   |  38 ++++
 .../emf/ui/internal/imp/RegistryUtil.java     | 176 ++++++++++++++++++
 9 files changed, 595 insertions(+), 7 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryStruct.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 8727c5ffff..f816882cce 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -32,7 +32,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.e4.ui.widgets;bundle-version="0.11.0",
  org.eclipse.equinox.preferences;bundle-version="3.4.0",
  org.eclipse.e4.tools;bundle-version="0.12.0",
- org.eclipse.e4.ui.workbench.swt;bundle-version="0.10.0"
+ org.eclipse.e4.ui.workbench.swt;bundle-version="0.10.0",
+ org.eclipse.pde.core;bundle-version="3.9.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.0.0",
  javax.inject;version="1.0.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index f914f28009..b1a043b7a4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -132,6 +132,15 @@ public List<Action> getActions(Object element) {
 		return Collections.emptyList();
 	}
 
+	/**
+	 * @param element
+	 * @return the list of actions that are populated in the import menu. Can be
+	 *         empty but is never null.
+	 */
+	public List<Action> getActionsImport(Object element) {
+		return Collections.emptyList();
+	}
+
 	protected String getLocalizedLabel(MUILabel element) {
 		return ControlFactory.getLocalizedLabel(translationProvider, element, locale);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 9640c9cae6..1c50f18e26 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -621,7 +621,18 @@ public void menuAboutToShow(IMenuManager manager) {
 							manager.add(addMenu);
 						}
 
-						manager.add(new Separator());
+						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId()).getActionsImport(s.getFirstElement());
+						if (actions.size() > 0) {
+							MenuManager menu = new MenuManager("Import");
+							for (Action a : actions) {
+								addSeparator = true;
+								menu.add(a);
+							}
+							manager.add(menu);
+						}
+
+						if (addSeparator)
+							manager.add(new Separator());
 
 						// build the extract action
 						if ((!((VirtualEntry<?>) s.getFirstElement()).getList().isEmpty()) && (!isModelFragment()))
@@ -655,8 +666,11 @@ public void run() {
 							});
 
 					} else {
+
 						final EObject o = (EObject) s.getFirstElement();
 						AbstractComponentEditor editor = getEditor(o.eClass());
+
+						// Build Add Child menu
 						if (editor != null) {
 							actions = new ArrayList<Action>(editor.getActions(s.getFirstElement()));
 						} else {
@@ -672,6 +686,23 @@ public void run() {
 							manager.add(addMenu);
 						}
 
+						// Build import menu
+						if (editor != null) {
+							actions = new ArrayList<Action>(editor.getActionsImport(s.getFirstElement()));
+						} else {
+							actions = new ArrayList<Action>();
+						}
+
+						if (actions.size() > 0) {
+							// TODO WIM - extract nls
+							MenuManager menu = new MenuManager("Import");
+							for (Action a : actions) {
+								addSeparator = true;
+								menu.add(a);
+							}
+							manager.add(menu);
+						}
+
 						if (o.eContainer() != null) {
 							addSeparator = true;
 							manager.add(new Action(messages.ModelEditor_Delete, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index ed8e27eec6..62c8d47b86 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -20,6 +20,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.MCategory;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl;
@@ -34,6 +35,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -52,6 +54,7 @@ public class VApplicationCategoriesEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private List<Action> actions = new ArrayList<Action>();
+	private List<Action> actionsImport = new ArrayList<Action>();
 
 	@Inject
 	public VApplicationCategoriesEditor() {
@@ -66,6 +69,23 @@ public void run() {
 				handleAdd();
 			}
 		});
+		actionsImport.add(new Action(Messages.VApplicationCategoriesEditor_AddCategory, createImageDescriptor(ResourceProvider.IMG_Category)) {
+			@Override
+			public void run() {
+				handleImport();
+			}
+		});
+	}
+
+	protected void handleImport() {
+		ModelImportWizard wizard = new ModelImportWizard(MCategory.class, getEditingDomain());
+		WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
+		if (wizardDialog.open() == WizardDialog.OK) {
+			MCategory[] elements = (MCategory[]) wizard.getElements(MCategory.class);
+			for (MCategory category : elements) {
+				addCategory(category);
+			}
+		}
 	}
 
 	@Override
@@ -220,14 +240,18 @@ public IObservableList getChildList(Object element) {
 	}
 
 	protected void handleAdd() {
-		MCategory command = CommandsFactoryImpl.eINSTANCE.createCategory();
-		setElementId(command);
+		MCategory category = CommandsFactoryImpl.eINSTANCE.createCategory();
+		addCategory(category);
+	}
+
+	private void addCategory(MCategory category) {
+		setElementId(category);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES, command);
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES, category);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
-			getEditor().setSelection(command);
+			getEditor().setSelection(category);
 		}
 	}
 
@@ -237,4 +261,11 @@ public List<Action> getActions(Object element) {
 		l.addAll(actions);
 		return l;
 	}
+
+	@Override
+	public List<Action> getActionsImport(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actionsImport);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 64232bb699..9ea93a7c98 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -20,6 +20,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl;
@@ -35,6 +36,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -54,6 +56,7 @@ public class VCommandEditor extends AbstractComponentEditor {
 
 	private EStructuralFeature commandsFeature;
 	private List<Action> actions = new ArrayList<Action>();
+	private List<Action> actionsImport = new ArrayList<Action>();
 
 	@Inject
 	public VCommandEditor() {
@@ -69,6 +72,13 @@ public void run() {
 				handleAdd();
 			}
 		});
+
+		actionsImport.add(new Action("Import Commands", createImageDescriptor(ResourceProvider.IMG_Command)) {
+			@Override
+			public void run() {
+				handleImport();
+			}
+		});
 	}
 
 	@Override
@@ -219,8 +229,11 @@ public void widgetSelected(SelectionEvent e) {
 
 	protected void handleAdd() {
 		MCommand command = CommandsFactoryImpl.eINSTANCE.createCommand();
-		setElementId(command);
+		addCommand(command);
+	}
 
+	private void addCommand(MCommand command) {
+		setElementId(command);
 		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), commandsFeature, command);
 
 		if (cmd.canExecute()) {
@@ -229,6 +242,17 @@ protected void handleAdd() {
 		}
 	}
 
+	protected void handleImport() {
+		ModelImportWizard wizard = new ModelImportWizard(MCommand.class, getEditingDomain());
+		WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
+		if (wizardDialog.open() == WizardDialog.OK) {
+			MCommand[] elements = (MCommand[]) wizard.getElements(MCommand.class);
+			for (MCommand mCommand : elements) {
+				addCommand(mCommand);
+			}
+		}
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		return null;
@@ -240,4 +264,11 @@ public List<Action> getActions(Object element) {
 		l.addAll(actions);
 		return l;
 	}
+
+	@Override
+	public List<Action> getActionsImport(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actionsImport);
+		return l;
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
new file mode 100644
index 0000000000..261646bc8e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
@@ -0,0 +1,174 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Remain BV, Industrial-TSI BV and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Wim Jongmam <wim.jongman@remainsoftware.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.imp;
+
+import java.util.ArrayList;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.jface.layout.TableColumnLayout;
+import org.eclipse.jface.viewers.CheckStateChangedEvent;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.ICheckStateListener;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+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.TableColumn;
+
+public class ModelImportPage1 extends WizardPage {
+
+	private class TableLabelProvider extends LabelProvider implements ITableLabelProvider {
+		public Image getColumnImage(Object element, int columnIndex) {
+			return null;
+		}
+
+		public String getColumnText(Object element, int columnIndex) {
+			if (element instanceof IConfigurationElement) {
+				IConfigurationElement config = (IConfigurationElement) element;
+				return config.getAttribute(wizard.getMappingName());
+			}
+			return element.toString();
+		}
+	}
+
+	private IExtensionRegistry registry;
+	private ModelImportWizard wizard;
+	protected Object[] checkedElements;
+
+	private class TableContentProvider implements IStructuredContentProvider {
+		public Object[] getElements(Object inputElement) {
+
+			if (!(inputElement instanceof RegistryStruct)) {
+				return new String[] { "Wrong input" };
+			}
+
+			RegistryStruct input = (RegistryStruct) inputElement;
+
+			return RegistryUtil.getExtensions(registry, input);
+		}
+
+		public void dispose() {
+		}
+
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		}
+	}
+
+	private class ComboContentProvider implements IStructuredContentProvider {
+		public Object[] getElements(Object inputElement) {
+			return RegistryUtil.getProvidingBundles(registry, wizard.getExtensionPoint());
+		}
+
+		public void dispose() {
+		}
+
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		}
+	}
+
+	/**
+	 * Create the wizard.
+	 */
+	public ModelImportPage1() {
+		super("wizardPage");
+		setTitle("Import Commands");
+		setDescription("Select plug-in and commands to import");
+		wizard = (ModelImportWizard) getWizard();
+		setPageComplete(false);
+	}
+
+	/**
+	 * Create contents of the wizard.
+	 * 
+	 * @param parent
+	 */
+	public void createControl(Composite parent) {
+		Composite container = new Composite(parent, SWT.NULL);
+
+		setControl(container);
+		container.setLayout(new GridLayout(1, false));
+
+		ComboViewer comboViewer = new ComboViewer(container, SWT.NONE);
+		Combo combo = comboViewer.getCombo();
+		combo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+
+		Composite composite = new Composite(container, SWT.NONE);
+		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+		TableColumnLayout tcl_composite = new TableColumnLayout();
+		composite.setLayout(tcl_composite);
+
+		final CheckboxTableViewer checkboxTableViewer = CheckboxTableViewer.newCheckList(composite, SWT.BORDER | SWT.FULL_SELECTION);
+
+		TableViewerColumn tableViewerColumn = new TableViewerColumn(checkboxTableViewer, SWT.NONE);
+		TableColumn column = tableViewerColumn.getColumn();
+		column.setResizable(false);
+		tcl_composite.setColumnData(column, new ColumnWeightData(1, ColumnWeightData.MINIMUM_WIDTH, true));
+		column.setText("Description");
+		checkboxTableViewer.setLabelProvider(new TableLabelProvider());
+		checkboxTableViewer.setContentProvider(new TableContentProvider());
+		comboViewer.setContentProvider(new ComboContentProvider());
+
+		comboViewer.setInput("go");
+
+		comboViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+
+			public void selectionChanged(SelectionChangedEvent event) {
+				String bundle = ((IStructuredSelection) event.getSelection()).getFirstElement().toString();
+				RegistryStruct struct = RegistryUtil.getStruct(wizard.getApplicationElement());
+				struct.setBundle(bundle);
+				checkboxTableViewer.setInput(struct);
+
+			}
+		});
+
+		checkboxTableViewer.addCheckStateListener(new ICheckStateListener() {
+			public void checkStateChanged(CheckStateChangedEvent event) {
+				checkedElements = checkboxTableViewer.getCheckedElements();
+				if (checkedElements.length > 0) {
+					setPageComplete(true);
+				} else {
+					setPageComplete(false);
+				}
+			}
+		});
+	}
+
+	@Override
+	public void setWizard(IWizard newWizard) {
+		this.wizard = (ModelImportWizard) newWizard;
+		super.setWizard(newWizard);
+	}
+
+	public IConfigurationElement[] getConfigurationElements() {
+		ArrayList<IConfigurationElement> result = new ArrayList<IConfigurationElement>();
+		for (Object element : checkedElements) {
+			if (element instanceof IConfigurationElement) {
+				result.add((IConfigurationElement) element);
+			}
+		}
+		return result.toArray(new IConfigurationElement[0]);
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
new file mode 100644
index 0000000000..505f4755f0
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Remain BV, Industrial-TSI BV and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Wim Jongmam <wim.jongman@remainsoftware.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.imp;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.wizard.Wizard;
+
+public class ModelImportWizard extends Wizard {
+
+	private Class<? extends MApplicationElement> applicationElement;
+
+	private ModelImportPage1 page1;
+
+	private EditingDomain editingDomain;
+
+	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, EditingDomain editingDomain) {
+		this.applicationElement = applicationElement;
+		this.editingDomain = editingDomain;
+		setWindowTitle("Model Command Import Wizard");
+		Assert.isNotNull(RegistryUtil.getStruct(applicationElement), "Unknown Element: " + applicationElement.getClass().getName());
+	}
+
+	@Override
+	public void addPages() {
+		page1 = new ModelImportPage1();
+		page1.setWizard(this);
+		addPage(page1);
+	}
+
+	@Override
+	public boolean performFinish() {
+
+		return true;
+	}
+
+	/**
+	 * @return the {@link MApplicationElement} passed in the constructor.
+	 */
+	public Class<? extends MApplicationElement> getApplicationElement() {
+		return applicationElement;
+	}
+
+	/**
+	 * @return the extension point name associated with the
+	 *         {@link MApplicationElement} that is passed in the constructor of
+	 *         this wizard.
+	 * @see #MAPPING_EXTENSION
+	 * @see #getApplicationElement()
+	 */
+	protected String getExtensionPointName() {
+		return RegistryUtil.getStruct(applicationElement).getExtensionPointName();
+	}
+
+	/**
+	 * @return the extension point id associated with the
+	 *         {@link MApplicationElement} that is passed in the constructor of
+	 *         this wizard.
+	 * @see #MAPPING_EXTENSION
+	 * @see #getApplicationElement()
+	 */
+	protected String getExtensionPoint() {
+		return RegistryUtil.getStruct(applicationElement).getExtensionPoint();
+	}
+
+	/**
+	 * @return the attribute name of the {@link IConfigurationElement} that
+	 *         contains the description that you want to see in the wizard page.
+	 * @see #MAPPING_NAME
+	 */
+	protected String getMappingName() {
+		return RegistryUtil.getStruct(applicationElement).getMappingName();
+	}
+
+	/**
+	 * Returns the list of {@link MApplicationElement}s of the type passed in
+	 * the constructor of the wizard.
+	 * 
+	 * @param <T>
+	 * 
+	 * @return
+	 */
+	public MApplicationElement[] getElements(Class<? extends MApplicationElement> type) {
+		return RegistryUtil.getModelElements(type, editingDomain, page1.getConfigurationElements());
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryStruct.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryStruct.java
new file mode 100644
index 0000000000..09dc6fa9d8
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryStruct.java
@@ -0,0 +1,38 @@
+package org.eclipse.e4.tools.emf.ui.internal.imp;
+
+public class RegistryStruct {
+
+	String bundle;
+	String extensionPoint;
+	String extensionPointName;
+	String mappingName;
+
+	public RegistryStruct(String bundle, String extensionPoint,
+			String extensionPointName, String mappingName) {
+		super();
+		this.bundle = bundle;
+		this.extensionPoint = extensionPoint;
+		this.extensionPointName = extensionPointName;
+		this.mappingName = mappingName;
+	}
+
+	public String getBundle() {
+		return bundle;
+	}
+
+	public String getExtensionPoint() {
+		return extensionPoint;
+	}
+
+	public String getExtensionPointName() {
+		return extensionPointName;
+	}
+
+	public String getMappingName() {
+		return mappingName;
+	}
+
+	public void setBundle(String bundle) {
+		this.bundle = bundle;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
new file mode 100644
index 0000000000..b24eca53ab
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
@@ -0,0 +1,176 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Remain BV, Industrial-TSI BV and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Wim Jongmam <wim.jongman@remainsoftware.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.imp;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.commands.MCategory;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.pde.core.plugin.IPluginModelBase;
+import org.eclipse.pde.core.plugin.PluginRegistry;
+import org.eclipse.pde.internal.core.PDEExtensionRegistry;
+
+public class RegistryUtil {
+
+	/**
+	 * 
+	 * @param t
+	 * @param editingDomain
+	 * @param elements
+	 * @return
+	 */
+	public static MApplicationElement[] getModelElements(Class<? extends MApplicationElement> t, EditingDomain editingDomain, IConfigurationElement... elements) {
+
+		Assert.isNotNull(t);
+		Assert.isNotNull(elements);
+		Assert.isTrue(elements.length > 0);
+
+		if (t.equals(MCommand.class)) {
+			return getCommands(elements, editingDomain);
+		} else if (t.equals(MCategory.class)) {
+			return getCategories(elements);
+		}
+		return new MApplicationElement[0];
+	}
+
+	private static MCommand[] getCommands(IConfigurationElement[] elements, EditingDomain editingDomain) {
+
+		ArrayList<MCommand> result = new ArrayList<MCommand>();
+
+		MCommandsFactory commandsFactory = MCommandsFactory.INSTANCE;
+
+		for (IConfigurationElement element : elements) {
+
+			MCommand command = commandsFactory.createCommand();
+			command.setCommandName(element.getAttribute("name"));
+			command.setDescription(element.getAttribute("description"));
+			command.setElementId(element.getAttribute("id"));
+			String catId = element.getAttribute("categoryId");
+
+			if (catId != null || catId.trim().length() == 0) {
+				MApplication app = (MApplication) editingDomain.getResourceSet().getResources().get(0).getContents().get(0);
+				List<MCategory> categories = app.getCategories();
+				for (MCategory category : categories) {
+					if (category.getElementId().equals(catId)) {
+						command.setCategory(category);
+						break;
+					}
+				}
+			}
+
+			result.add((MCommand) command);
+		}
+
+		return result.toArray(new MCommand[0]);
+	}
+
+	private static MCategory[] getCategories(IConfigurationElement[] elements) {
+
+		ArrayList<MCategory> result = new ArrayList<MCategory>();
+
+		MCommandsFactory commandsFactory = MCommandsFactory.INSTANCE;
+
+		for (IConfigurationElement element : elements) {
+
+			MCategory category = commandsFactory.createCategory();
+			category.setDescription(element.getAttribute("description"));
+			category.setElementId(element.getAttribute("id"));
+			category.setName(element.getAttribute("name"));
+
+			result.add(category);
+		}
+
+		return result.toArray(new MCategory[0]);
+	}
+
+	/**
+	 * Returns a list of bundle id's that have extension to the passed extension
+	 * point.
+	 * 
+	 * @param registry
+	 * @param extensionPoint
+	 * @return
+	 */
+	public static String[] getProvidingBundles(IExtensionRegistry registry, String extensionPoint) {
+
+		IPluginModelBase[] models = PluginRegistry.getWorkspaceModels();
+		PDEExtensionRegistry reg = new PDEExtensionRegistry(models);
+		ArrayList<String> result = new ArrayList<String>();
+
+		IExtension[] extensions = reg.findExtensions(extensionPoint, true);
+		for (IExtension extension : extensions) {
+			IConfigurationElement[] elements = extension.getConfigurationElements();
+			for (IConfigurationElement element : elements) {
+				if (!result.contains(element.getContributor().getName())) {
+					result.add(element.getContributor().getName());
+				}
+			}
+		}
+
+		String[] resultArray = result.toArray(new String[0]);
+		Arrays.sort(resultArray);
+		return resultArray;
+	}
+
+	/**
+	 * 
+	 * @param registry
+	 * @param MApplicationElement
+	 * @return the array of {@link IConfigurationElement} objects that meets the
+	 *         passed criteria.
+	 */
+	public static IConfigurationElement[] getExtensions(IExtensionRegistry registry, RegistryStruct struct) {
+
+		if (struct == null) {
+			return new IConfigurationElement[0];
+		}
+
+		IPluginModelBase[] models = PluginRegistry.getWorkspaceModels();
+		PDEExtensionRegistry reg = new PDEExtensionRegistry(models);
+		ArrayList<IConfigurationElement> result = new ArrayList<IConfigurationElement>();
+
+		IExtension[] extensions = reg.findExtensions(struct.getExtensionPoint(), true);
+		for (IExtension extension : extensions) {
+			IConfigurationElement[] elements = extension.getConfigurationElements();
+			for (IConfigurationElement element : elements) {
+				if (element.getContributor().getName().equals(struct.getBundle())) {
+					if (element.getName().equals(struct.getExtensionPointName())) {
+						result.add(element);
+					}
+				}
+			}
+		}
+
+		return result.toArray(new IConfigurationElement[0]);
+	}
+
+	public static RegistryStruct getStruct(Class<? extends MApplicationElement> applicationElement) {
+
+		if (applicationElement == MCommand.class)
+			return new RegistryStruct("", "org.eclipse.ui.commands", "command", "name");
+
+		else if (applicationElement == MCategory.class)
+			return new RegistryStruct("", "org.eclipse.ui.commands", "category", "name");
+
+		return null;
+	}
+
+}

From f02a3b54cd9cce8eab356760dad42872c9a06588 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Sun, 17 Mar 2013 16:54:34 +0100
Subject: [PATCH 0571/1286] bug 402875: Removed dependency to pde
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=402875

---
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../common/component/DefaultEditor.java       | 88 +++++++++----------
 .../virtual/VApplicationCategoriesEditor.java |  2 +-
 .../component/virtual/VCommandEditor.java     |  2 +-
 .../emf/ui/internal/imp/ModelImportPage1.java |  4 +-
 .../ui/internal/imp/ModelImportWizard.java    | 27 ++++--
 .../emf/ui/internal/imp/RegistryUtil.java     | 69 ++++++++++-----
 7 files changed, 119 insertions(+), 76 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index f816882cce..8727c5ffff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -32,8 +32,7 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.e4.ui.widgets;bundle-version="0.11.0",
  org.eclipse.equinox.preferences;bundle-version="3.4.0",
  org.eclipse.e4.tools;bundle-version="0.12.0",
- org.eclipse.e4.ui.workbench.swt;bundle-version="0.10.0",
- org.eclipse.pde.core;bundle-version="3.9.0"
+ org.eclipse.e4.ui.workbench.swt;bundle-version="0.10.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.0.0",
  javax.inject;version="1.0.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java
index 2691e269a1..784850751a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java
@@ -1,44 +1,44 @@
-package org.eclipse.e4.tools.emf.ui.internal.common.component;
-
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-
-public class DefaultEditor extends AbstractComponentEditor {
-
-	@Override
-	public Image getImage(Object element, Display display) {
-		// no image
-		return null;
-	}
-
-	@Override
-	public String getLabel(Object element) {
-		return element.getClass().getInterfaces()[0].getSimpleName() + " " + Messages.Special_UnknownElement; //$NON-NLS-1$
-	}
-
-	@Override
-	public String getDetailLabel(Object element) {
-		return Messages.Special_UnknownElement_Detail;
-	}
-
-	@Override
-	public String getDescription(Object element) {
-		return null;
-	}
-
-	@Override
-	protected Composite doGetEditor(Composite parent, Object object) {
-		return new Composite(parent, SWT.NONE);
-	}
-
-	@Override
-	public IObservableList getChildList(Object element) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class DefaultEditor extends AbstractComponentEditor {
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		// no image
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return element.getClass().getInterfaces()[0].getSimpleName() + " " + Messages.Special_UnknownElement; //$NON-NLS-1$
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return Messages.Special_UnknownElement_Detail;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return null;
+	}
+
+	@Override
+	protected Composite doGetEditor(Composite parent, Object object) {
+		return new Composite(parent, SWT.NONE);
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index 62c8d47b86..9dd22f5920 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -78,7 +78,7 @@ public void run() {
 	}
 
 	protected void handleImport() {
-		ModelImportWizard wizard = new ModelImportWizard(MCategory.class, getEditingDomain());
+		ModelImportWizard wizard = new ModelImportWizard(MCategory.class, this);
 		WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
 		if (wizardDialog.open() == WizardDialog.OK) {
 			MCategory[] elements = (MCategory[]) wizard.getElements(MCategory.class);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 9ea93a7c98..c57f5315b1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -243,7 +243,7 @@ private void addCommand(MCommand command) {
 	}
 
 	protected void handleImport() {
-		ModelImportWizard wizard = new ModelImportWizard(MCommand.class, getEditingDomain());
+		ModelImportWizard wizard = new ModelImportWizard(MCommand.class, this);
 		WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
 		if (wizardDialog.open() == WizardDialog.OK) {
 			MCommand[] elements = (MCommand[]) wizard.getElements(MCommand.class);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
index 261646bc8e..f85a8147c3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
@@ -67,7 +67,7 @@ public Object[] getElements(Object inputElement) {
 
 			RegistryStruct input = (RegistryStruct) inputElement;
 
-			return RegistryUtil.getExtensions(registry, input);
+			return RegistryUtil.getExtensions(registry, input, wizard.isLiveModel());
 		}
 
 		public void dispose() {
@@ -79,7 +79,7 @@ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 
 	private class ComboContentProvider implements IStructuredContentProvider {
 		public Object[] getElements(Object inputElement) {
-			return RegistryUtil.getProvidingBundles(registry, wizard.getExtensionPoint());
+			return RegistryUtil.getProvidingBundles(registry, wizard.getExtensionPoint(), wizard.isLiveModel());
 		}
 
 		public void dispose() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
index 505f4755f0..b4acc1cecb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
@@ -13,8 +13,9 @@
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
-import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.wizard.Wizard;
 
 public class ModelImportWizard extends Wizard {
@@ -23,11 +24,14 @@ public class ModelImportWizard extends Wizard {
 
 	private ModelImportPage1 page1;
 
-	private EditingDomain editingDomain;
+	private MApplication application;
 
-	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, EditingDomain editingDomain) {
+	private AbstractComponentEditor editor;
+
+	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, AbstractComponentEditor editor) {
 		this.applicationElement = applicationElement;
-		this.editingDomain = editingDomain;
+		this.editor = editor;
+		this.application = (MApplication) editor.getMaster().getValue();
 		setWindowTitle("Model Command Import Wizard");
 		Assert.isNotNull(RegistryUtil.getStruct(applicationElement), "Unknown Element: " + applicationElement.getClass().getName());
 	}
@@ -92,6 +96,19 @@ protected String getMappingName() {
 	 * @return
 	 */
 	public MApplicationElement[] getElements(Class<? extends MApplicationElement> type) {
-		return RegistryUtil.getModelElements(type, editingDomain, page1.getConfigurationElements());
+		return RegistryUtil.getModelElements(type, application, page1.getConfigurationElements());
+	}
+
+	public AbstractComponentEditor getEditor() {
+		return editor;
+	}
+
+	/**
+	 * Returns if this is a live model.
+	 * 
+	 * @return true or false
+	 */
+	public boolean isLiveModel() {
+		return !editor.getEditor().isLiveModel();
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
index b24eca53ab..a02739ab24 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
@@ -13,45 +13,48 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.e4.tools.emf.ui.common.IExtensionLookup;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.commands.MCategory;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.PluginRegistry;
-import org.eclipse.pde.internal.core.PDEExtensionRegistry;
+import org.eclipse.e4.ui.workbench.UIEvents.ApplicationElement;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
 
 public class RegistryUtil {
 
 	/**
 	 * 
 	 * @param t
-	 * @param editingDomain
+	 * @param application
 	 * @param elements
 	 * @return
 	 */
-	public static MApplicationElement[] getModelElements(Class<? extends MApplicationElement> t, EditingDomain editingDomain, IConfigurationElement... elements) {
+	public static MApplicationElement[] getModelElements(Class<? extends MApplicationElement> t, MApplication application, IConfigurationElement... elements) {
 
 		Assert.isNotNull(t);
 		Assert.isNotNull(elements);
 		Assert.isTrue(elements.length > 0);
 
 		if (t.equals(MCommand.class)) {
-			return getCommands(elements, editingDomain);
+			return getCommands(elements, application);
 		} else if (t.equals(MCategory.class)) {
 			return getCategories(elements);
 		}
 		return new MApplicationElement[0];
 	}
 
-	private static MCommand[] getCommands(IConfigurationElement[] elements, EditingDomain editingDomain) {
+	private static MCommand[] getCommands(IConfigurationElement[] elements, MApplication application) {
 
 		ArrayList<MCommand> result = new ArrayList<MCommand>();
 
@@ -65,9 +68,8 @@ private static MCommand[] getCommands(IConfigurationElement[] elements, EditingD
 			command.setElementId(element.getAttribute("id"));
 			String catId = element.getAttribute("categoryId");
 
-			if (catId != null || catId.trim().length() == 0) {
-				MApplication app = (MApplication) editingDomain.getResourceSet().getResources().get(0).getContents().get(0);
-				List<MCategory> categories = app.getCategories();
+			if (catId != null && catId.trim().length() > 0) {
+				List<MCategory> categories = application.getCategories();
 				for (MCategory category : categories) {
 					if (category.getElementId().equals(catId)) {
 						command.setCategory(category);
@@ -109,13 +111,17 @@ private static MCategory[] getCategories(IConfigurationElement[] elements) {
 	 * @param extensionPoint
 	 * @return
 	 */
-	public static String[] getProvidingBundles(IExtensionRegistry registry, String extensionPoint) {
+	public static String[] getProvidingBundles(IExtensionRegistry registry, String extensionPoint, boolean isLive) {
+
+		IExtensionLookup service = getService(IExtensionLookup.class, null);
+
+		if (service == null) {
+			return new String[] { "No " + IExtensionLookup.class.getName() + " service found." };
+		}
 
-		IPluginModelBase[] models = PluginRegistry.getWorkspaceModels();
-		PDEExtensionRegistry reg = new PDEExtensionRegistry(models);
 		ArrayList<String> result = new ArrayList<String>();
 
-		IExtension[] extensions = reg.findExtensions(extensionPoint, true);
+		IExtension[] extensions = service.findExtensions(extensionPoint, isLive);
 		for (IExtension extension : extensions) {
 			IConfigurationElement[] elements = extension.getConfigurationElements();
 			for (IConfigurationElement element : elements) {
@@ -133,21 +139,20 @@ public static String[] getProvidingBundles(IExtensionRegistry registry, String e
 	/**
 	 * 
 	 * @param registry
-	 * @param MApplicationElement
+	 * @param struct
 	 * @return the array of {@link IConfigurationElement} objects that meets the
 	 *         passed criteria.
 	 */
-	public static IConfigurationElement[] getExtensions(IExtensionRegistry registry, RegistryStruct struct) {
+	public static IConfigurationElement[] getExtensions(IExtensionRegistry registry, RegistryStruct struct, boolean isLive) {
 
-		if (struct == null) {
+		IExtensionLookup service = getService(IExtensionLookup.class, null);
+		if (struct == null || service == null) {
 			return new IConfigurationElement[0];
 		}
 
-		IPluginModelBase[] models = PluginRegistry.getWorkspaceModels();
-		PDEExtensionRegistry reg = new PDEExtensionRegistry(models);
 		ArrayList<IConfigurationElement> result = new ArrayList<IConfigurationElement>();
 
-		IExtension[] extensions = reg.findExtensions(struct.getExtensionPoint(), true);
+		IExtension[] extensions = service.findExtensions(struct.getExtensionPoint(), isLive);
 		for (IExtension extension : extensions) {
 			IConfigurationElement[] elements = extension.getConfigurationElements();
 			for (IConfigurationElement element : elements) {
@@ -162,6 +167,14 @@ public static IConfigurationElement[] getExtensions(IExtensionRegistry registry,
 		return result.toArray(new IConfigurationElement[0]);
 	}
 
+	/**
+	 * This will return a structure that contains the registry information we
+	 * are looking for.
+	 * 
+	 * @param applicationElement
+	 * @return the structure that matches the extension registry to the passed
+	 *         {@link ApplicationElement}
+	 */
 	public static RegistryStruct getStruct(Class<? extends MApplicationElement> applicationElement) {
 
 		if (applicationElement == MCommand.class)
@@ -173,4 +186,18 @@ else if (applicationElement == MCategory.class)
 		return null;
 	}
 
+	private static <T> T getService(Class<T> clazz, String filter) {
+
+		try {
+			BundleContext context = FrameworkUtil.getBundle(RegistryUtil.class).getBundleContext();
+			Collection<ServiceReference<T>> references;
+			references = context.getServiceReferences(clazz, filter);
+			for (ServiceReference<T> reference : references) {
+				return context.getService(reference);
+			}
+		} catch (InvalidSyntaxException e) {
+			// FIXME log
+		}
+		return null;
+	}
 }

From d65ed7444bbe41f5d5c4cd999afb9776850218b1 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Sun, 17 Mar 2013 17:05:16 +0100
Subject: [PATCH 0572/1286] bug 402875: Livemodel test fix
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=402875

---
 .../eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
index b4acc1cecb..d22adc7960 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
@@ -109,6 +109,6 @@ public AbstractComponentEditor getEditor() {
 	 * @return true or false
 	 */
 	public boolean isLiveModel() {
-		return !editor.getEditor().isLiveModel();
+		return editor.getEditor().isLiveModel();
 	}
 }

From 0acd29f2b70b726caf125d0729d02b782264509f Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Mon, 18 Mar 2013 00:58:47 +0100
Subject: [PATCH 0573/1286] bug 402875: added support for views, perspectives
 and handlers https://bugs.eclipse.org/bugs/show_bug.cgi?id=402875

---
 .../emf/ui/internal/common/ModelEditor.java   |  2 +-
 .../component/PartSashContainerEditor.java    | 42 ++++++++
 .../component/PerspectiveStackEditor.java     | 41 +++++++-
 .../component/virtual/VHandlerEditor.java     | 35 ++++++-
 .../ui/internal/imp/ModelImportWizard.java    |  2 +-
 .../emf/ui/internal/imp/RegistryUtil.java     | 96 +++++++++++++++++++
 6 files changed, 211 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 1c50f18e26..82203d488b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -623,7 +623,7 @@ public void menuAboutToShow(IMenuManager manager) {
 
 						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId()).getActionsImport(s.getFirstElement());
 						if (actions.size() > 0) {
-							MenuManager menu = new MenuManager("Import");
+							MenuManager menu = new MenuManager("Import 3x");
 							for (Action a : actions) {
 								addSeparator = true;
 								menu.add(a);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index f973855b48..4d1006dc76 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -25,10 +25,12 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
+import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -56,6 +58,7 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -70,6 +73,7 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
 
 public class PartSashContainerEditor extends AbstractComponentEditor {
 
@@ -79,11 +83,15 @@ public class PartSashContainerEditor extends AbstractComponentEditor {
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
+	private List<Action> actionsImport = new ArrayList<Action>();
 
 	@Inject
 	@Optional
 	private IProject project;
 
+	@Inject
+	private Shell shell;
+
 	@Inject
 	public PartSashContainerEditor() {
 		super();
@@ -127,6 +135,15 @@ public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
 			}
 		});
+
+		// --- Import Actions ---
+		actionsImport.add(new Action(Messages.PartSashContainerEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleImportChild(BasicPackageImpl.Literals.PART);
+			}
+		});
+
 	}
 
 	@Override
@@ -420,6 +437,10 @@ public FeaturePath[] getLabelProperties() {
 
 	protected void handleAddChild(EClass eClass) {
 		EObject eObject = EcoreUtil.create(eClass);
+		addToModel(eObject);
+	}
+
+	private void addToModel(EObject eObject) {
 		setElementId(eObject);
 
 		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
@@ -430,10 +451,31 @@ protected void handleAddChild(EClass eClass) {
 		}
 	}
 
+	protected void handleImportChild(EClass eClass) {
+
+		if (eClass == BasicPackageImpl.Literals.PART) {
+			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this);
+			WizardDialog wizardDialog = new WizardDialog(shell, wizard);
+			if (wizardDialog.open() == WizardDialog.OK) {
+				MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
+				for (MPart part : parts) {
+					addToModel((EObject) part);
+				}
+			}
+		}
+	}
+
 	@Override
 	public List<Action> getActions(Object element) {
 		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
+
+	@Override
+	public List<Action> getActionsImport(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		l.addAll(actionsImport);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 701b8e2840..a9d69634dc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -25,6 +25,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
+import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -48,6 +49,7 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -61,6 +63,7 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
 
 public class PerspectiveStackEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -69,6 +72,7 @@ public class PerspectiveStackEditor extends AbstractComponentEditor {
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
+	private List<Action> actionsImport = new ArrayList<Action>();
 
 	@Inject
 	@Optional
@@ -79,6 +83,9 @@ public PerspectiveStackEditor() {
 		super();
 	}
 
+	@Inject
+	Shell shell;
+
 	@PostConstruct
 	void init() {
 		actions.add(new Action(Messages.PerspectiveStackEditor_AddPerspective, createImageDescriptor(ResourceProvider.IMG_Perspective)) {
@@ -87,6 +94,14 @@ public void run() {
 				handleAddPerspective();
 			}
 		});
+
+		// --- import ---
+		actionsImport.add(new Action(Messages.PerspectiveStackEditor_AddPerspective, createImageDescriptor(ResourceProvider.IMG_Perspective)) {
+			@Override
+			public void run() {
+				handleImportPerspective();
+			}
+		});
 	}
 
 	@Override
@@ -323,13 +338,26 @@ public FeaturePath[] getLabelProperties() {
 
 	protected void handleAddPerspective() {
 		MPerspective eObject = MAdvancedFactory.INSTANCE.createPerspective();
-		setElementId(eObject);
+		addToModel(eObject);
+	}
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+	protected void handleImportPerspective() {
+		ModelImportWizard wizard = new ModelImportWizard(MPerspective.class, this);
+		WizardDialog wizardDialog = new WizardDialog(shell, wizard);
+		if (wizardDialog.open() == WizardDialog.OK) {
+			MPerspective[] elements = (MPerspective[]) wizard.getElements(MPerspective.class);
+			for (MPerspective category : elements) {
+				addToModel(category);
+			}
+		}
+	}
 
+	private void addToModel(MPerspective perspective) {
+		setElementId(perspective);
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, perspective);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
-			getEditor().setSelection(eObject);
+			getEditor().setSelection(perspective);
 		}
 	}
 
@@ -339,4 +367,11 @@ public List<Action> getActions(Object element) {
 		l.addAll(actions);
 		return l;
 	}
+
+	@Override
+	public List<Action> getActionsImport(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		l.addAll(actionsImport);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 8899479634..a612c95f3c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -20,6 +20,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.commands.MHandlerContainer;
@@ -34,6 +35,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -51,6 +53,7 @@ public class VHandlerEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
+	private List<Action> actionsImport = new ArrayList<Action>();
 
 	@Inject
 	public VHandlerEditor() {
@@ -65,6 +68,14 @@ public void run() {
 				handleAdd();
 			}
 		});
+
+		// -- import --
+		actionsImport.add(new Action(Messages.VHandlerEditor_AddHandler, createImageDescriptor(ResourceProvider.IMG_Handler)) {
+			@Override
+			public void run() {
+				handleImport();
+			}
+		});
 	}
 
 	@Override
@@ -220,20 +231,40 @@ public IObservableList getChildList(Object element) {
 
 	protected void handleAdd() {
 		MHandler handler = MCommandsFactory.INSTANCE.createHandler();
-		setElementId(handler);
+		addToModel(handler);
+	}
 
+	private void addToModel(MHandler handler) {
+		setElementId(handler);
 		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, handler);
-
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 			getEditor().setSelection(handler);
 		}
 	}
 
+	protected void handleImport() {
+		ModelImportWizard wizard = new ModelImportWizard(MHandler.class, this);
+		WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
+		if (wizardDialog.open() == WizardDialog.OK) {
+			MHandler[] elements = (MHandler[]) wizard.getElements(MHandler.class);
+			for (MHandler handler : elements) {
+				addToModel(handler);
+			}
+		}
+	}
+
 	@Override
 	public List<Action> getActions(Object element) {
 		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
+
+	@Override
+	public List<Action> getActionsImport(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		l.addAll(actionsImport);
+		return l;
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
index d22adc7960..85e994a4f7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
@@ -31,7 +31,7 @@ public class ModelImportWizard extends Wizard {
 	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, AbstractComponentEditor editor) {
 		this.applicationElement = applicationElement;
 		this.editor = editor;
-		this.application = (MApplication) editor.getMaster().getValue();
+		this.application = (MApplication) editor.getEditor().getModelProvider().getRoot().get(0);
 		setWindowTitle("Model Command Import Wizard");
 		Assert.isNotNull(RegistryUtil.getStruct(applicationElement), "Unknown Element: " + applicationElement.getClass().getName());
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
index a02739ab24..c4c7cf32ea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
@@ -25,7 +25,14 @@
 import org.eclipse.e4.ui.model.application.commands.MCategory;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.workbench.UIEvents.ApplicationElement;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
@@ -50,6 +57,12 @@ public static MApplicationElement[] getModelElements(Class<? extends MApplicatio
 			return getCommands(elements, application);
 		} else if (t.equals(MCategory.class)) {
 			return getCategories(elements);
+		} else if (t.equals(MPerspective.class)) {
+			return getPerspectives(elements);
+		} else if (t.equals(MPart.class)) {
+			return getParts(elements);
+		} else if (t.equals(MHandler.class)) {
+			return getHandlers(elements, application);
 		}
 		return new MApplicationElement[0];
 	}
@@ -84,6 +97,25 @@ private static MCommand[] getCommands(IConfigurationElement[] elements, MApplica
 		return result.toArray(new MCommand[0]);
 	}
 
+	private static MPerspective[] getPerspectives(IConfigurationElement[] elements) {
+
+		ArrayList<MPerspective> result = new ArrayList<MPerspective>();
+
+		MAdvancedFactory factory = MAdvancedFactory.INSTANCE;
+
+		for (IConfigurationElement element : elements) {
+			MPerspective perspective = factory.createPerspective();
+			perspective.setLabel(element.getAttribute("name"));
+			perspective.setIconURI(getIconURI(element, "icon"));
+			perspective.setElementId(element.getAttribute("id"));
+			perspective.setToBeRendered(true);
+			perspective.setVisible(true);
+			result.add((MPerspective) perspective);
+		}
+
+		return result.toArray(new MPerspective[0]);
+	}
+
 	private static MCategory[] getCategories(IConfigurationElement[] elements) {
 
 		ArrayList<MCategory> result = new ArrayList<MCategory>();
@@ -103,6 +135,58 @@ private static MCategory[] getCategories(IConfigurationElement[] elements) {
 		return result.toArray(new MCategory[0]);
 	}
 
+	private static MPart[] getParts(IConfigurationElement[] elements) {
+
+		ArrayList<MPart> result = new ArrayList<MPart>();
+		for (IConfigurationElement element : elements) {
+			MPart part = (MPart) EcoreUtil.create(BasicPackageImpl.Literals.PART);
+			part.setElementId(element.getAttribute("id"));
+			part.setLabel(element.getAttribute("name"));
+			part.setIconURI(getIconURI(element, "icon"));
+			part.setContributionURI(getContributionURI(element, "class"));
+			part.setToBeRendered(true);
+			part.setVisible(true);
+			part.setToolbar(MMenuFactory.INSTANCE.createToolBar());
+			part.setCloseable(true);
+			result.add(part);
+		}
+
+		return result.toArray(new MPart[0]);
+	}
+
+	private static MHandler[] getHandlers(IConfigurationElement[] elements, MApplication application) {
+
+		ArrayList<MHandler> result = new ArrayList<MHandler>();
+		for (IConfigurationElement element : elements) {
+			MHandler hand = (MHandler) MCommandsFactory.INSTANCE.createHandler();
+			hand.setElementId(element.getAttribute("id"));
+			hand.setContributionURI(getContributionURI(element, "class"));
+
+			String cmdId = element.getAttribute("commandId");
+
+			if (cmdId != null && cmdId.trim().length() > 0) {
+				List<MCommand> categories = application.getCommands();
+				for (MCommand command : categories) {
+					if (command.getElementId().equals(cmdId)) {
+						hand.setCommand(command);
+						break;
+					}
+				}
+			}
+			result.add(hand);
+		}
+		return result.toArray(new MHandler[0]);
+	}
+
+	private static String getIconURI(IConfigurationElement element, String attribute) {
+		// FIXME don't assume local icon
+		return "platform:/plugin/" + element.getContributor().getName() + "/" + element.getAttribute(attribute);
+	}
+
+	private static String getContributionURI(IConfigurationElement element, String attribute) {
+		return "bundleclass://" + element.getContributor().getName() + "/" + element.getAttribute(attribute);
+	}
+
 	/**
 	 * Returns a list of bundle id's that have extension to the passed extension
 	 * point.
@@ -183,6 +267,18 @@ public static RegistryStruct getStruct(Class<? extends MApplicationElement> appl
 		else if (applicationElement == MCategory.class)
 			return new RegistryStruct("", "org.eclipse.ui.commands", "category", "name");
 
+		else if (applicationElement == MPerspective.class)
+			return new RegistryStruct("", "org.eclipse.ui.perspectives", "perspective", "name");
+
+		else if (applicationElement == MPart.class)
+			return new RegistryStruct("", "org.eclipse.ui.views", "view", "name");
+
+		else if (applicationElement == MHandler.class)
+			return new RegistryStruct("", "org.eclipse.ui.handlers", "handler", "commandId");
+
+		else if (applicationElement == MPart.class)
+			return new RegistryStruct("", "org.eclipse.ui.views", "view", "name");
+
 		return null;
 	}
 

From c4ab45b08f28aa2149cc0b4901dfd79c1f49ec06 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Mon, 18 Mar 2013 14:27:53 +0100
Subject: [PATCH 0574/1286] Bug 403618 - Tooling does not compile against M6
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=403618

---
 .../org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF    | 3 ++-
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF      | 3 ++-
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF             | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index e11ae02f52..ca3b121306 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -29,7 +29,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
  org.eclipse.search;bundle-version="3.7.0",
- org.eclipse.text;bundle-version="3.5.100"
+ org.eclipse.text;bundle-version="3.5.100",
+ org.eclipse.e4.ui.model.workbench;bundle-version="1.0.0"
 Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/projectfunction.xml, OSGI-INF/pdee4xmiprovider.xml, OSGI-INF/pdeextensionlookup.xml
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 8727c5ffff..b2aafdb39e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -32,7 +32,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.e4.ui.widgets;bundle-version="0.11.0",
  org.eclipse.equinox.preferences;bundle-version="3.4.0",
  org.eclipse.e4.tools;bundle-version="0.12.0",
- org.eclipse.e4.ui.workbench.swt;bundle-version="0.10.0"
+ org.eclipse.e4.ui.workbench.swt;bundle-version="0.10.0",
+ org.eclipse.emf.ecore.xmi;bundle-version="2.9.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.0.0",
  javax.inject;version="1.0.0",
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 6165ceec1c..b1fdff31d4 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -17,7 +17,9 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.databinding.beans;bundle-version="1.2.100",
  org.eclipse.jface.databinding;bundle-version="1.4.0",
  org.eclipse.core.databinding.property;bundle-version="1.3.0",
- org.eclipse.jdt.ui;bundle-version="3.6.0"
+ org.eclipse.jdt.ui;bundle-version="3.6.0",
+ org.eclipse.emf.ecore;bundle-version="2.9.0",
+ org.eclipse.emf.ecore.xmi;bundle-version="2.9.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.e4.internal.tools.ToolsPlugin
 Export-Package: org.eclipse.e4.internal.tools.wizards.classes;x-internal:=true,

From 2477a5cc438a64c680826d33bfd677ab908ec5f7 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Mon, 18 Mar 2013 16:00:06 +0100
Subject: [PATCH 0575/1286] [Bug 403640] fixed for commands added translate
 method to abstractcomponent editor
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=403640

---
 .../emf/ui/common/component/AbstractComponentEditor.java      | 4 ++++
 .../tools/emf/ui/internal/common/component/CommandEditor.java | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index b1a043b7a4..b0b45a14ee 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -132,6 +132,10 @@ public List<Action> getActions(Object element) {
 		return Collections.emptyList();
 	}
 
+	public String translate(String string) {
+		return ControlFactory.tr(translationProvider, locale, string);
+	}
+
 	/**
 	 * @param element
 	 * @return the list of actions that are populated in the import menu. Can be
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 84538ceb1e..1f74b3fae3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -314,9 +314,8 @@ public IObservableList getChildList(Object element) {
 	public String getDetailLabel(Object element) {
 		MCommand cmd = (MCommand) element;
 		if (cmd.getCommandName() != null && cmd.getCommandName().trim().length() > 0) {
-			return cmd.getCommandName();
+			return translate(cmd.getCommandName());
 		}
-
 		return null;
 	}
 

From 5bcdc8c2726474af159542e4d88e11c75c419b58 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Mon, 18 Mar 2013 16:11:48 +0100
Subject: [PATCH 0576/1286] Bug 403640 fixed javadoc
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=403640

---
 .../ui/common/component/AbstractComponentEditor.java  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index b0b45a14ee..191b2ad6c6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -26,6 +26,7 @@
 import org.eclipse.e4.tools.services.IClipboardService.Handler;
 import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.tools.services.Translation;
+import org.eclipse.e4.tools.services.impl.AbstractTranslationProvider;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -132,6 +133,16 @@ public List<Action> getActions(Object element) {
 		return Collections.emptyList();
 	}
 
+	/**
+	 * Translates an input <code>string</code> using the current
+	 * {@link AbstractTranslationProvider} and <code>locale</code> from the
+	 * {@link TranslationService}.
+	 * 
+	 * @param string
+	 *            the string to translate, may not be null.
+	 * @return the translated string or the input string if it could not be
+	 *         translated.
+	 */
 	public String translate(String string) {
 		return ControlFactory.tr(translationProvider, locale, string);
 	}

From 9d427f32314cae0e40c444f296e4f3bd17f6f871 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Mon, 18 Mar 2013 22:44:53 +0100
Subject: [PATCH 0577/1286] Bug 402875 Added support for editors
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=402875

---
 .../emf/ui/internal/common/ModelEditor.java   |   2 +-
 .../component/PartSashContainerEditor.java    |  27 ++++-
 .../common/component/PartStackEditor.java     |  56 ++++++++++
 .../component/virtual/VPartDescriptor.java    |  52 ++++++++-
 .../emf/ui/internal/imp/ModelImportPage1.java |  14 ++-
 .../ui/internal/imp/ModelImportWizard.java    |  28 ++++-
 .../emf/ui/internal/imp/RegistryUtil.java     | 104 +++++++++++++++++-
 7 files changed, 259 insertions(+), 24 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 82203d488b..4c933c0a45 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -695,7 +695,7 @@ public void run() {
 
 						if (actions.size() > 0) {
 							// TODO WIM - extract nls
-							MenuManager menu = new MenuManager("Import");
+							MenuManager menu = new MenuManager("Import 3x");
 							for (Action a : actions) {
 								addSeparator = true;
 								menu.add(a);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 4d1006dc76..de1733f52d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -26,10 +26,12 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
+import org.eclipse.e4.tools.emf.ui.internal.imp.RegistryUtil;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.MInputPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
@@ -137,10 +139,16 @@ public void run() {
 		});
 
 		// --- Import Actions ---
-		actionsImport.add(new Action(Messages.PartSashContainerEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+		actionsImport.add(new Action("Views", createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
-				handleImportChild(BasicPackageImpl.Literals.PART);
+				handleImportChild(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_VIEW);
+			}
+		});
+		actionsImport.add(new Action("Editors", createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleImportChild(BasicPackageImpl.Literals.INPUT_PART, RegistryUtil.HINT_EDITOR);
 			}
 		});
 
@@ -451,10 +459,10 @@ private void addToModel(EObject eObject) {
 		}
 	}
 
-	protected void handleImportChild(EClass eClass) {
+	protected void handleImportChild(EClass eClass, String hint) {
 
 		if (eClass == BasicPackageImpl.Literals.PART) {
-			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this);
+			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, hint);
 			WizardDialog wizardDialog = new WizardDialog(shell, wizard);
 			if (wizardDialog.open() == WizardDialog.OK) {
 				MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
@@ -463,6 +471,17 @@ protected void handleImportChild(EClass eClass) {
 				}
 			}
 		}
+
+		if (eClass == BasicPackageImpl.Literals.INPUT_PART) {
+			ModelImportWizard wizard = new ModelImportWizard(MInputPart.class, this);
+			WizardDialog wizardDialog = new WizardDialog(shell, wizard);
+			if (wizardDialog.open() == WizardDialog.OK) {
+				MInputPart[] parts = (MInputPart[]) wizard.getElements(MInputPart.class);
+				for (MInputPart part : parts) {
+					addToModel((EObject) part);
+				}
+			}
+		}
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 40f22b5a8b..eea4087675 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -25,10 +25,13 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
+import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.MInputPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -53,6 +56,7 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -77,6 +81,7 @@ public class PartStackEditor extends AbstractComponentEditor {
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
+	private List<Action> actionsImport = new ArrayList<Action>();
 
 	@Inject
 	@Optional
@@ -108,6 +113,21 @@ public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
 			}
 		});
+
+		// --- Import Actions ---
+		actionsImport.add(new Action("Views", createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleImportChild(BasicPackageImpl.Literals.PART);
+			}
+		});
+		actionsImport.add(new Action("Editors", createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleImportChild(BasicPackageImpl.Literals.INPUT_PART);
+			}
+		});
+
 	}
 
 	@Override
@@ -365,6 +385,10 @@ public FeaturePath[] getLabelProperties() {
 
 	protected void handleAddChild(EClass eClass) {
 		EObject eObject = EcoreUtil.create(eClass);
+		addToModel(eObject);
+	}
+
+	private void addToModel(EObject eObject) {
 		setElementId(eObject);
 
 		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
@@ -375,10 +399,42 @@ protected void handleAddChild(EClass eClass) {
 		}
 	}
 
+	protected void handleImportChild(EClass eClass) {
+
+		if (eClass == BasicPackageImpl.Literals.PART) {
+			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this);
+			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
+			if (wizardDialog.open() == WizardDialog.OK) {
+				MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
+				for (MPart part : parts) {
+					addToModel((EObject) part);
+				}
+			}
+		}
+
+		if (eClass == BasicPackageImpl.Literals.INPUT_PART) {
+			ModelImportWizard wizard = new ModelImportWizard(MInputPart.class, this);
+			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
+			if (wizardDialog.open() == WizardDialog.OK) {
+				MInputPart[] parts = (MInputPart[]) wizard.getElements(MInputPart.class);
+				for (MInputPart part : parts) {
+					addToModel((EObject) part);
+				}
+			}
+		}
+	}
+
 	@Override
 	public List<Action> getActions(Object element) {
 		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
+
+	@Override
+	public List<Action> getActionsImport(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		l.addAll(actionsImport);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index be122480dc..22a9bd949e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -20,12 +20,15 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
+import org.eclipse.e4.tools.emf.ui.internal.imp.RegistryUtil;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MBasicFactory;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorContainer;
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
@@ -34,6 +37,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -51,6 +55,7 @@ public class VPartDescriptor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
+	private List<Action> actionsImport = new ArrayList<Action>();
 
 	@Inject
 	public VPartDescriptor() {
@@ -65,6 +70,20 @@ public void run() {
 				handleAdd();
 			}
 		});
+
+		// --- Import Actions ---
+		actionsImport.add(new Action("Views", createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleImportChild(BasicPackageImpl.Literals.PART_DESCRIPTOR, RegistryUtil.HINT_VIEW);
+			}
+		});
+		actionsImport.add(new Action("Editors", createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleImportChild(BasicPackageImpl.Literals.PART_DESCRIPTOR, RegistryUtil.HINT_EDITOR);
+			}
+		});
 	}
 
 	@Override
@@ -219,14 +238,32 @@ public IObservableList getChildList(Object element) {
 	}
 
 	protected void handleAdd() {
-		MPartDescriptor command = MBasicFactory.INSTANCE.createPartDescriptor();
-		setElementId(command);
+		MPartDescriptor partDescription = MBasicFactory.INSTANCE.createPartDescriptor();
+		addToModel(partDescription);
+	}
+
+	private void addToModel(MPartDescriptor partDescription) {
+		setElementId(partDescription);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, command);
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, partDescription);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
-			getEditor().setSelection(command);
+			getEditor().setSelection(partDescription);
+		}
+	}
+
+	protected void handleImportChild(EClass eClass, String hint) {
+
+		if (eClass == BasicPackageImpl.Literals.PART_DESCRIPTOR) {
+			ModelImportWizard wizard = new ModelImportWizard(MPartDescriptor.class, this, hint);
+			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
+			if (wizardDialog.open() == WizardDialog.OK) {
+				MPartDescriptor[] parts = (MPartDescriptor[]) wizard.getElements(MPartDescriptor.class);
+				for (MPartDescriptor part : parts) {
+					addToModel(part);
+				}
+			}
 		}
 	}
 
@@ -236,4 +273,11 @@ public List<Action> getActions(Object element) {
 		l.addAll(actions);
 		return l;
 	}
+
+	@Override
+	public List<Action> getActionsImport(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		l.addAll(actionsImport);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
index f85a8147c3..a3badfda5f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
@@ -94,8 +94,8 @@ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 	 */
 	public ModelImportPage1() {
 		super("wizardPage");
-		setTitle("Import Commands");
-		setDescription("Select plug-in and commands to import");
+		setTitle("Import ");
+		setDescription("Select plug-in and elements to import");
 		wizard = (ModelImportWizard) getWizard();
 		setPageComplete(false);
 	}
@@ -137,7 +137,7 @@ public void createControl(Composite parent) {
 
 			public void selectionChanged(SelectionChangedEvent event) {
 				String bundle = ((IStructuredSelection) event.getSelection()).getFirstElement().toString();
-				RegistryStruct struct = RegistryUtil.getStruct(wizard.getApplicationElement());
+				RegistryStruct struct = RegistryUtil.getStruct(wizard.getApplicationElement(), wizard.getHint());
 				struct.setBundle(bundle);
 				checkboxTableViewer.setInput(struct);
 
@@ -159,6 +159,14 @@ public void checkStateChanged(CheckStateChangedEvent event) {
 	@Override
 	public void setWizard(IWizard newWizard) {
 		this.wizard = (ModelImportWizard) newWizard;
+		setTitle("Import " + wizard.getApplicationElement().getSimpleName());
+
+		String hint = wizard.getHint();
+		if (hint != null && hint.length() > 0) {
+			setDescription("Select plug-in and elements (" + hint + ") to import");
+			// else already set
+		}
+
 		super.setWizard(newWizard);
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
index 85e994a4f7..b53e6ec33a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
@@ -28,12 +28,19 @@ public class ModelImportWizard extends Wizard {
 
 	private AbstractComponentEditor editor;
 
+	private final String hint;
+
 	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, AbstractComponentEditor editor) {
+		this(applicationElement, editor, "");
+	}
+
+	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, AbstractComponentEditor editor, String hint) {
 		this.applicationElement = applicationElement;
 		this.editor = editor;
+		this.hint = hint;
 		this.application = (MApplication) editor.getEditor().getModelProvider().getRoot().get(0);
-		setWindowTitle("Model Command Import Wizard");
-		Assert.isNotNull(RegistryUtil.getStruct(applicationElement), "Unknown Element: " + applicationElement.getClass().getName());
+		setWindowTitle("Model " + applicationElement.getSimpleName() + " Import Wizard");
+		Assert.isNotNull(RegistryUtil.getStruct(applicationElement, getHint()), "Unknown Element: " + applicationElement.getClass().getName());
 	}
 
 	@Override
@@ -64,7 +71,7 @@ public Class<? extends MApplicationElement> getApplicationElement() {
 	 * @see #getApplicationElement()
 	 */
 	protected String getExtensionPointName() {
-		return RegistryUtil.getStruct(applicationElement).getExtensionPointName();
+		return RegistryUtil.getStruct(applicationElement, getHint()).getExtensionPointName();
 	}
 
 	/**
@@ -75,7 +82,7 @@ protected String getExtensionPointName() {
 	 * @see #getApplicationElement()
 	 */
 	protected String getExtensionPoint() {
-		return RegistryUtil.getStruct(applicationElement).getExtensionPoint();
+		return RegistryUtil.getStruct(applicationElement, getHint()).getExtensionPoint();
 	}
 
 	/**
@@ -84,7 +91,7 @@ protected String getExtensionPoint() {
 	 * @see #MAPPING_NAME
 	 */
 	protected String getMappingName() {
-		return RegistryUtil.getStruct(applicationElement).getMappingName();
+		return RegistryUtil.getStruct(applicationElement, getHint()).getMappingName();
 	}
 
 	/**
@@ -96,7 +103,7 @@ protected String getMappingName() {
 	 * @return
 	 */
 	public MApplicationElement[] getElements(Class<? extends MApplicationElement> type) {
-		return RegistryUtil.getModelElements(type, application, page1.getConfigurationElements());
+		return RegistryUtil.getModelElements(type, getHint(), application, page1.getConfigurationElements());
 	}
 
 	public AbstractComponentEditor getEditor() {
@@ -111,4 +118,13 @@ public AbstractComponentEditor getEditor() {
 	public boolean isLiveModel() {
 		return editor.getEditor().isLiveModel();
 	}
+
+	/**
+	 * Returns the hint that explains the meaning of the caller.
+	 * 
+	 * @return
+	 */
+	public String getHint() {
+		return hint;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
index c4c7cf32ea..7e35e8ffb4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
@@ -26,8 +26,10 @@
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.basic.MInputPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
@@ -40,6 +42,9 @@
 
 public class RegistryUtil {
 
+	public final static String HINT_VIEW = "view";
+	public final static String HINT_EDITOR = "editor";
+
 	/**
 	 * 
 	 * @param t
@@ -47,7 +52,7 @@ public class RegistryUtil {
 	 * @param elements
 	 * @return
 	 */
-	public static MApplicationElement[] getModelElements(Class<? extends MApplicationElement> t, MApplication application, IConfigurationElement... elements) {
+	public static MApplicationElement[] getModelElements(Class<? extends MApplicationElement> t, String hint, MApplication application, IConfigurationElement... elements) {
 
 		Assert.isNotNull(t);
 		Assert.isNotNull(elements);
@@ -60,9 +65,15 @@ public static MApplicationElement[] getModelElements(Class<? extends MApplicatio
 		} else if (t.equals(MPerspective.class)) {
 			return getPerspectives(elements);
 		} else if (t.equals(MPart.class)) {
-			return getParts(elements);
+			return getViews(elements);
+		} else if (t.equals(MInputPart.class)) {
+			return getEditors(elements);
 		} else if (t.equals(MHandler.class)) {
 			return getHandlers(elements, application);
+		} else if (t.equals(MPartDescriptor.class) && HINT_EDITOR.equals(hint)) {
+			return getEditorPartDescriptors(elements);
+		} else if (t.equals(MPartDescriptor.class) && HINT_VIEW.equals(hint)) {
+			return getViewPartDescriptors(elements);
 		}
 		return new MApplicationElement[0];
 	}
@@ -135,7 +146,7 @@ private static MCategory[] getCategories(IConfigurationElement[] elements) {
 		return result.toArray(new MCategory[0]);
 	}
 
-	private static MPart[] getParts(IConfigurationElement[] elements) {
+	private static MPart[] getViews(IConfigurationElement[] elements) {
 
 		ArrayList<MPart> result = new ArrayList<MPart>();
 		for (IConfigurationElement element : elements) {
@@ -154,6 +165,69 @@ private static MPart[] getParts(IConfigurationElement[] elements) {
 		return result.toArray(new MPart[0]);
 	}
 
+	private static MInputPart[] getEditors(IConfigurationElement[] elements) {
+
+		ArrayList<MInputPart> result = new ArrayList<MInputPart>();
+		for (IConfigurationElement element : elements) {
+			MInputPart part = (MInputPart) EcoreUtil.create(BasicPackageImpl.Literals.INPUT_PART);
+			part.setElementId(element.getAttribute("id"));
+			part.setLabel(element.getAttribute("name"));
+			part.setIconURI(getIconURI(element, "icon"));
+			if (element.getAttribute("class") != null) {
+				part.setContributionURI(getContributionURI(element, "class"));
+			} else {
+				part.setContributionURI(getContributionURI(element, "launcher"));
+			}
+			part.setToBeRendered(true);
+			part.setVisible(true);
+			part.setToolbar(MMenuFactory.INSTANCE.createToolBar());
+			part.setCloseable(true);
+			result.add(part);
+		}
+
+		return result.toArray(new MInputPart[0]);
+	}
+
+	private static MPartDescriptor[] getEditorPartDescriptors(IConfigurationElement[] elements) {
+
+		ArrayList<MPartDescriptor> result = new ArrayList<MPartDescriptor>();
+		for (IConfigurationElement element : elements) {
+			MPartDescriptor part = (MPartDescriptor) EcoreUtil.create(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR);
+			part.setElementId(element.getAttribute("id"));
+			part.setLabel(element.getAttribute("name"));
+			part.setIconURI(getIconURI(element, "icon"));
+			if (element.getAttribute("class") != null) {
+				part.setContributionURI(getContributionURI(element, "class"));
+			} else {
+				part.setContributionURI(getContributionURI(element, "launcher"));
+			}
+			part.setDirtyable(true);
+			part.setAllowMultiple(true);
+			part.setToolbar(MMenuFactory.INSTANCE.createToolBar());
+			part.setCloseable(true);
+			result.add(part);
+		}
+
+		return result.toArray(new MPartDescriptor[0]);
+	}
+
+	private static MPartDescriptor[] getViewPartDescriptors(IConfigurationElement[] elements) {
+
+		ArrayList<MPartDescriptor> result = new ArrayList<MPartDescriptor>();
+		for (IConfigurationElement element : elements) {
+			MPartDescriptor part = (MPartDescriptor) EcoreUtil.create(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR);
+			part.setElementId(element.getAttribute("id"));
+			part.setLabel(element.getAttribute("name"));
+			part.setIconURI(getIconURI(element, "icon"));
+			part.setContributionURI(getContributionURI(element, "class"));
+			part.setToolbar(MMenuFactory.INSTANCE.createToolBar());
+			part.setCloseable(true);
+			result.add(part);
+		}
+
+		return result.toArray(new MPartDescriptor[0]);
+	}
+
 	private static MHandler[] getHandlers(IConfigurationElement[] elements, MApplication application) {
 
 		ArrayList<MHandler> result = new ArrayList<MHandler>();
@@ -179,7 +253,13 @@ private static MHandler[] getHandlers(IConfigurationElement[] elements, MApplica
 	}
 
 	private static String getIconURI(IConfigurationElement element, String attribute) {
-		// FIXME don't assume local icon
+		if (element.getAttribute(attribute) == null) {
+			return "";
+		}
+		// FIXME any other cases?
+		if (element.getAttribute(attribute).startsWith("platform:")) {
+			return element.getAttribute(attribute);
+		}
 		return "platform:/plugin/" + element.getContributor().getName() + "/" + element.getAttribute(attribute);
 	}
 
@@ -259,7 +339,7 @@ public static IConfigurationElement[] getExtensions(IExtensionRegistry registry,
 	 * @return the structure that matches the extension registry to the passed
 	 *         {@link ApplicationElement}
 	 */
-	public static RegistryStruct getStruct(Class<? extends MApplicationElement> applicationElement) {
+	public static RegistryStruct getStruct(Class<? extends MApplicationElement> applicationElement, String hint) {
 
 		if (applicationElement == MCommand.class)
 			return new RegistryStruct("", "org.eclipse.ui.commands", "command", "name");
@@ -276,8 +356,20 @@ else if (applicationElement == MPart.class)
 		else if (applicationElement == MHandler.class)
 			return new RegistryStruct("", "org.eclipse.ui.handlers", "handler", "commandId");
 
-		else if (applicationElement == MPart.class)
+		else if (applicationElement == MPart.class) {
 			return new RegistryStruct("", "org.eclipse.ui.views", "view", "name");
+		}
+
+		else if (applicationElement == MInputPart.class) {
+			return new RegistryStruct("", "org.eclipse.ui.editors", "editor", "name");
+		}
+
+		else if (applicationElement == MPartDescriptor.class) {
+			if (hint == HINT_EDITOR)
+				return new RegistryStruct("", "org.eclipse.ui.editors", "editor", "name");
+			if (hint == HINT_VIEW)
+				return new RegistryStruct("", "org.eclipse.ui.views", "view", "name");
+		}
 
 		return null;
 	}

From 9793a7aee8a20a4ab852a92138536f85399fa577 Mon Sep 17 00:00:00 2001
From: "l.ripeynih" <akafakir@gmail.com>
Date: Wed, 13 Mar 2013 14:03:45 +0100
Subject: [PATCH 0578/1286] Bug 388635 creates an id for handlers following the
 pattern: <project_name>.handler.<commad_name>

Change-Id: I22e7e39c0780a57c5b3edabaec3b47e199bac5a1
---
 .../e4/internal/tools/wizards/project/E4NewProjectWizard.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 6179a319a1..e061decce7 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -670,7 +670,8 @@ private MCommand createCommand(String commandId, String name,
 					+ "handlers." + className);
 			handler.setElementId(projectName + ".handler." + name);
 			application.getHandlers().add(handler);
-
+			
+			// create binding for the command
 			MKeyBinding binding = MCommandsFactory.INSTANCE.createKeyBinding();
 			binding.setKeySequence(keyBinding);
 			binding.setCommand(command);

From f05b11f7b2ee0cb02e7335fd643e9a298b79b895 Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@gmail.com>
Date: Mon, 18 Mar 2013 22:50:28 +0100
Subject: [PATCH 0579/1286] Bug 403679 - New Application wizard is missing
 dependency to org.eclipse.e4.ui.model.workbench

---
 .../e4/internal/tools/wizards/project/E4NewProjectWizard.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index e061decce7..c8c2ca839b 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -724,6 +724,7 @@ private class ContentWizard extends Wizard implements IBundleContentWizard {
 				"javax.inject",
 				"org.eclipse.core.runtime", 
 				"org.eclipse.swt",
+				"org.eclipse.e4.ui.model.workbench",
 				"org.eclipse.jface",
 				"org.eclipse.e4.ui.services",
 				"org.eclipse.e4.ui.workbench", 

From dbec7ca3fc8eb760f61ed23c13461561bd5ccc4f Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Fri, 22 Mar 2013 23:43:48 +0100
Subject: [PATCH 0580/1286] bug 402875: Importing model elements from legacy
 RCP

Added preview functionality to add compatibility views to shared area
and part descriptor. This to experiment with mixed mode.

All imported part and partdescriptors now also get a toolbar and
viewmenu with the same id.

https://bugs.eclipse.org/bugs/show_bug.cgi?id=402875
---
 .../component/virtual/VPartDescriptor.java    |  13 ++-
 .../virtual/VWindowSharedElementsEditor.java  |  62 +++++++++++
 .../emf/ui/internal/imp/RegistryUtil.java     | 102 ++++++++++++++----
 3 files changed, 156 insertions(+), 21 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index 22a9bd949e..b60c34f4ce 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -75,13 +75,20 @@ public void run() {
 		actionsImport.add(new Action("Views", createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
-				handleImportChild(BasicPackageImpl.Literals.PART_DESCRIPTOR, RegistryUtil.HINT_VIEW);
+				handleImport(BasicPackageImpl.Literals.PART_DESCRIPTOR, RegistryUtil.HINT_VIEW);
 			}
 		});
 		actionsImport.add(new Action("Editors", createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
-				handleImportChild(BasicPackageImpl.Literals.PART_DESCRIPTOR, RegistryUtil.HINT_EDITOR);
+				handleImport(BasicPackageImpl.Literals.PART_DESCRIPTOR, RegistryUtil.HINT_EDITOR);
+			}
+		});
+
+		actionsImport.add(new Action("View as CompatibilityView", createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleImport(BasicPackageImpl.Literals.PART_DESCRIPTOR, RegistryUtil.HINT_COMPAT_VIEW);
 			}
 		});
 	}
@@ -253,7 +260,7 @@ private void addToModel(MPartDescriptor partDescription) {
 		}
 	}
 
-	protected void handleImportChild(EClass eClass, String hint) {
+	protected void handleImport(EClass eClass, String hint) {
 
 		if (eClass == BasicPackageImpl.Literals.PART_DESCRIPTOR) {
 			ModelImportWizard wizard = new ModelImportWizard(MPartDescriptor.class, this, hint);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 0681befa6c..253b06178a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -23,7 +23,11 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.ViewerElement;
+import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
+import org.eclipse.e4.tools.emf.ui.internal.imp.RegistryUtil;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.MInputPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -42,6 +46,7 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -56,6 +61,7 @@ public class VWindowSharedElementsEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private StructuredViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
+	private List<Action> actionsImport = new ArrayList<Action>();
 
 	@Inject
 	IEclipseContext eclipseContext;
@@ -101,6 +107,28 @@ public void run() {
 				handleAdd(AdvancedPackageImpl.Literals.AREA);
 			}
 		});
+
+		// -- IMPORT ACTIONS --
+		actionsImport.add(new Action("Views", createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleImport(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_VIEW);
+			}
+		});
+
+		actionsImport.add(new Action("Editors", createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleImport(BasicPackageImpl.Literals.INPUT_PART, RegistryUtil.HINT_EDITOR);
+			}
+		});
+
+		actionsImport.add(new Action("View as CompatibilityView", createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleImport(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_COMPAT_VIEW);
+			}
+		});
 	}
 
 	@Override
@@ -248,6 +276,10 @@ public IObservableList getChildList(Object element) {
 
 	protected void handleAdd(EClass eClass) {
 		EObject eObject = EcoreUtil.create(eClass);
+		addToModel(eObject);
+	}
+
+	private void addToModel(EObject eObject) {
 		setElementId(eObject);
 
 		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, eObject);
@@ -258,10 +290,40 @@ protected void handleAdd(EClass eClass) {
 		}
 	}
 
+	protected void handleImport(EClass eClass, String hint) {
+		if (eClass == BasicPackageImpl.Literals.PART) {
+			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, hint);
+			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
+			if (wizardDialog.open() == WizardDialog.OK) {
+				MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
+				for (MPart part : parts) {
+					addToModel((EObject) part);
+				}
+			}
+		}
+		if (eClass == BasicPackageImpl.Literals.INPUT_PART) {
+			ModelImportWizard wizard = new ModelImportWizard(MInputPart.class, this, hint);
+			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
+			if (wizardDialog.open() == WizardDialog.OK) {
+				MInputPart[] parts = (MInputPart[]) wizard.getElements(MInputPart.class);
+				for (MInputPart part : parts) {
+					addToModel((EObject) part);
+				}
+			}
+		}
+	}
+
 	@Override
 	public List<Action> getActions(Object element) {
 		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
+
+	@Override
+	public List<Action> getActionsImport(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		l.addAll(actionsImport);
+		return l;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
index 7e35e8ffb4..a8d1b1a9c0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
@@ -32,7 +32,9 @@
 import org.eclipse.e4.ui.model.application.ui.basic.MInputPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
 import org.eclipse.e4.ui.workbench.UIEvents.ApplicationElement;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.osgi.framework.BundleContext;
@@ -44,6 +46,7 @@ public class RegistryUtil {
 
 	public final static String HINT_VIEW = "view";
 	public final static String HINT_EDITOR = "editor";
+	public final static String HINT_COMPAT_VIEW = "compatibilityView";
 
 	/**
 	 * 
@@ -64,6 +67,8 @@ public static MApplicationElement[] getModelElements(Class<? extends MApplicatio
 			return getCategories(elements);
 		} else if (t.equals(MPerspective.class)) {
 			return getPerspectives(elements);
+		} else if (t.equals(MPart.class) && HINT_COMPAT_VIEW.equals(hint)) {
+			return getViewsAsCompatibilityViews(elements);
 		} else if (t.equals(MPart.class)) {
 			return getViews(elements);
 		} else if (t.equals(MInputPart.class)) {
@@ -74,6 +79,8 @@ public static MApplicationElement[] getModelElements(Class<? extends MApplicatio
 			return getEditorPartDescriptors(elements);
 		} else if (t.equals(MPartDescriptor.class) && HINT_VIEW.equals(hint)) {
 			return getViewPartDescriptors(elements);
+		} else if (t.equals(MPartDescriptor.class) && HINT_COMPAT_VIEW.equals(hint)) {
+			return getPartDescriptorsAsCompatibilyViews(elements);
 		}
 		return new MApplicationElement[0];
 	}
@@ -157,32 +164,74 @@ private static MPart[] getViews(IConfigurationElement[] elements) {
 			part.setContributionURI(getContributionURI(element, "class"));
 			part.setToBeRendered(true);
 			part.setVisible(true);
-			part.setToolbar(MMenuFactory.INSTANCE.createToolBar());
+			part.setToolbar(createToolBar(part));
+			part.getMenus().add(createViewMenu(part));
 			part.setCloseable(true);
+			part.getTags().add("View");
+			if (element.getAttribute("category") != null) {
+				part.getTags().add("categoryTag:" + element.getAttribute("category"));
+			}
+
 			result.add(part);
 		}
 
 		return result.toArray(new MPart[0]);
 	}
 
+	private static MToolBar createToolBar(MPart part) {
+		MToolBar toolBar = MMenuFactory.INSTANCE.createToolBar();
+		toolBar.setElementId(part.getElementId());
+		return toolBar;
+	}
+
+	private static MMenu createViewMenu(MPart part) {
+		MMenu menu = MMenuFactory.INSTANCE.createMenu();
+		menu.setElementId(part.getElementId());
+		menu.getTags().add("ViewMenu");
+		return menu;
+	}
+
+	private static MPart[] getViewsAsCompatibilityViews(IConfigurationElement[] elements) {
+		ArrayList<MPart> result = new ArrayList<MPart>();
+		MPart[] parts = getViews(elements);
+		for (MPart part : parts) {
+			part.setContributionURI("bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView");
+			result.add(part);
+		}
+		return result.toArray(new MPart[0]);
+	}
+
+	private static MPartDescriptor[] getPartDescriptorsAsCompatibilyViews(IConfigurationElement[] elements) {
+		ArrayList<MPartDescriptor> result = new ArrayList<MPartDescriptor>();
+		MPartDescriptor[] parts = getViewPartDescriptors(elements);
+		for (MPartDescriptor part : parts) {
+			part.setContributionURI("bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView");
+			result.add(part);
+		}
+		return result.toArray(new MPartDescriptor[0]);
+	}
+
 	private static MInputPart[] getEditors(IConfigurationElement[] elements) {
 
 		ArrayList<MInputPart> result = new ArrayList<MInputPart>();
 		for (IConfigurationElement element : elements) {
-			MInputPart part = (MInputPart) EcoreUtil.create(BasicPackageImpl.Literals.INPUT_PART);
-			part.setElementId(element.getAttribute("id"));
-			part.setLabel(element.getAttribute("name"));
-			part.setIconURI(getIconURI(element, "icon"));
-			if (element.getAttribute("class") != null) {
-				part.setContributionURI(getContributionURI(element, "class"));
-			} else {
-				part.setContributionURI(getContributionURI(element, "launcher"));
+			if ("editor".equals(element.getName())) /* Sanity Check */{
+				MInputPart part = (MInputPart) EcoreUtil.create(BasicPackageImpl.Literals.INPUT_PART);
+				part.setElementId(element.getAttribute("id"));
+				part.setLabel(element.getAttribute("name"));
+				part.setIconURI(getIconURI(element, "icon"));
+				if (element.getAttribute("class") != null) {
+					part.setContributionURI(getContributionURI(element, "class"));
+				} else {
+					part.setContributionURI(getContributionURI(element, "launcher"));
+				}
+				part.setToBeRendered(true);
+				part.setVisible(true);
+				part.setToolbar(createToolBar(part));
+				part.getMenus().add(createViewMenu(part));
+				part.setCloseable(true);
+				result.add(part);
 			}
-			part.setToBeRendered(true);
-			part.setVisible(true);
-			part.setToolbar(MMenuFactory.INSTANCE.createToolBar());
-			part.setCloseable(true);
-			result.add(part);
 		}
 
 		return result.toArray(new MInputPart[0]);
@@ -203,7 +252,16 @@ private static MPartDescriptor[] getEditorPartDescriptors(IConfigurationElement[
 			}
 			part.setDirtyable(true);
 			part.setAllowMultiple(true);
-			part.setToolbar(MMenuFactory.INSTANCE.createToolBar());
+
+			MToolBar toolBar = MMenuFactory.INSTANCE.createToolBar();
+			toolBar.setElementId(part.getElementId());
+			part.setToolbar(toolBar);
+
+			MMenu menu = MMenuFactory.INSTANCE.createMenu();
+			menu.setElementId(part.getElementId());
+			menu.getTags().add("ViewMenu");
+			part.getMenus().add(menu);
+
 			part.setCloseable(true);
 			result.add(part);
 		}
@@ -219,8 +277,16 @@ private static MPartDescriptor[] getViewPartDescriptors(IConfigurationElement[]
 			part.setElementId(element.getAttribute("id"));
 			part.setLabel(element.getAttribute("name"));
 			part.setIconURI(getIconURI(element, "icon"));
-			part.setContributionURI(getContributionURI(element, "class"));
-			part.setToolbar(MMenuFactory.INSTANCE.createToolBar());
+
+			MToolBar toolBar = MMenuFactory.INSTANCE.createToolBar();
+			toolBar.setElementId(part.getElementId());
+			part.setToolbar(toolBar);
+
+			MMenu menu = MMenuFactory.INSTANCE.createMenu();
+			menu.setElementId(part.getElementId());
+			menu.getTags().add("ViewMenu");
+			part.getMenus().add(menu);
+
 			part.setCloseable(true);
 			result.add(part);
 		}
@@ -367,7 +433,7 @@ else if (applicationElement == MInputPart.class) {
 		else if (applicationElement == MPartDescriptor.class) {
 			if (hint == HINT_EDITOR)
 				return new RegistryStruct("", "org.eclipse.ui.editors", "editor", "name");
-			if (hint == HINT_VIEW)
+			if (hint == HINT_VIEW || hint == HINT_COMPAT_VIEW)
 				return new RegistryStruct("", "org.eclipse.ui.views", "view", "name");
 		}
 

From 4cac38232e7371e88cf0075155f0bb217e7b5ce2 Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Fri, 22 Mar 2013 21:54:40 +0100
Subject: [PATCH 0581/1286] [404187] Spelling error in Toolbar/Add child

---
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.properties    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 01e57514f3..2ef6d0c4c7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -258,7 +258,7 @@ ToolBarEditor_Separator=Separator
 ToolBarEditor_AddHandledToolItem=Handled ToolItem
 ToolBarEditor_AddDirectToolItem=Direct ToolItem
 ToolBarEditor_AddToolControl=Toolcontrol
-ToolBarEditor_AddToolBarSeparator=Sepatator
+ToolBarEditor_AddToolBarSeparator=Separator
 
 ToolBarSeparatorEditor_Label=Separator
 

From 1782576a682bac15ca742e2eb8ad13143103763c Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Sat, 23 Mar 2013 12:24:38 +0100
Subject: [PATCH 0582/1286] [404207] Missing DynamicMenuContribution in child
 selector

---
 .../src/org/eclipse/e4/tools/emf/ui/internal/Messages.java    | 2 ++
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.properties  | 4 +++-
 .../ui/internal/common/component/MenuContributionEditor.java  | 2 +-
 .../e4/tools/emf/ui/internal/common/component/MenuEditor.java | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 22189a5faf..6f8e30050f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -135,6 +135,7 @@ public class Messages {
 	public String MenuEditor_MenuItemType;
 	public String MenuEditor_MenuItemItemType;
 	public String MenuEditor_HandledMenuItem;
+	public String MenuEditor_DynamicMenuContribution;
 	public String MenuEditor_Separator;
 	public String MenuEditor_Menu;
 	public String MenuEditor_DirectMenuItem;
@@ -287,6 +288,7 @@ public class Messages {
 	public String MenuContributionEditor_MenuItemType;
 	public String MenuContributionEditor_MenuItemItemType;
 	public String MenuContributionEditor_HandledMenuItem;
+	public String MenuContributionEditor_DynamicMenuContribution;
 	public String MenuContributionEditor_Separator;
 	public String MenuContributionEditor_Menu;
 	public String MenuContributionEditor_DirectMenuItem;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 2ef6d0c4c7..f39ae0e752 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -134,6 +134,7 @@ MenuEditor_MenuItems=MenuItems
 MenuEditor_MenuItemType=Type
 MenuEditor_MenuItemItemType=Item Type
 MenuEditor_HandledMenuItem=Handled MenuItem
+MenuEditor_DynamicMenuContribution=DynamicMenuContribution
 MenuEditor_Separator=Separator
 MenuEditor_Menu=Menu
 MenuEditor_DirectMenuItem=Direct MenuItem
@@ -289,6 +290,7 @@ MenuContributionEditor_MenuItems=Menu Items
 MenuContributionEditor_MenuItemType=Type
 MenuContributionEditor_MenuItemItemType=Item Type
 MenuContributionEditor_HandledMenuItem=Handled MenuItem
+MenuContributionEditor_DynamicMenuContribution=DynamicMenuContribution
 MenuContributionEditor_Separator=Separator
 MenuContributionEditor_Menu=Menu
 MenuContributionEditor_DirectMenuItem=Direct MenuItem
@@ -632,4 +634,4 @@ Special_UnknownElement_Detail= Use an extension point!
 VWindowSharedElementsEditor_Area=Area
 ModelEditor_ExtractFragment=Extract into a fragment
 ModelEditor_ExtractFragment_NoParentId=Can not extract because parent container has no id. \nAdd an id and try again.
-KeyBindingEditor_SequenceLowercase=Key sequences should be specified in uppercase characters
\ No newline at end of file
+KeyBindingEditor_SequenceLowercase=Key sequences should be specified in uppercase characters
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index f8b610fd6b..506f3f03d3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -296,7 +296,7 @@ public String getText(Object element) {
 			});
 
 			Struct defaultStruct = new Struct(Messages.MenuContributionEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
-			childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuContributionEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuContributionEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuContributionEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false) });
+			childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuContributionEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuContributionEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuContributionEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false), new Struct(Messages.MenuContributionEditor_DynamicMenuContribution, MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
 			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
 
 			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 985455785e..d90482b15a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -278,7 +278,7 @@ public String getText(Object element) {
 			});
 
 			Struct defaultStruct = new Struct(Messages.MenuEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
-			childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false) });
+			childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false), new Struct(Messages.MenuEditor_DynamicMenuContribution, MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
 			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
 
 			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);

From 4a9941b97558fe4b2df718ce4d02f0b605d6bab2 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Sat, 23 Mar 2013 22:58:29 +0100
Subject: [PATCH 0583/1286] bug 391086: Search and filter the model editor
 tree.

The filtered tree can now be switched on with java argument:
-Dorg.eclipse.e4.tools.modeleditor.filteredtree.enabled.xmitab.disabled

This will enable the filtered tree but disable editing in the XMI tab.
This is a temp fix until we either solve the root cause or can set
preferences in some way.

https://bugs.eclipse.org/bugs/show_bug.cgi?id=391086
---
 .../emf/ui/internal/common/ModelEditor.java   | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 4c933c0a45..1514248536 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -58,6 +58,7 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.AddonsEditor;
@@ -153,6 +154,7 @@
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.e4.ui.model.internal.ModelUtils;
+import org.eclipse.e4.ui.workbench.swt.internal.copy.FilteredTree;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -231,6 +233,8 @@
 import org.eclipse.swt.widgets.TreeItem;
 
 public class ModelEditor {
+	private static final String ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED = "org.eclipse.e4.tools.modeleditor.filteredtree.enabled.xmitab.disabled";
+
 	public static final String CSS_CLASS_KEY = "org.eclipse.e4.ui.css.CssClassName"; //$NON-NLS-1$
 
 	public static final String VIRTUAL_PART_MENU = ModelEditor.class.getName() + ".VIRTUAL_PART_MENU"; //$NON-NLS-1$
@@ -463,6 +467,12 @@ public void run() {
 			}
 		});
 
+		String property = System.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
+		if (property != null) {
+			sourceViewer.setEditable(false);
+			sourceViewer.getTextWidget().setEnabled(false);
+		}
+
 		return sourceViewer.getControl();
 	}
 
@@ -973,12 +983,15 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		treeArea.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
 		treeArea.setBackgroundMode(SWT.INHERIT_DEFAULT);
 
-		// final FilteredTree viewParent = new FilteredTree(treeArea,
-		// SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new
-		// PatternFilter(), true);
-		// final TreeViewer viewer = viewParent.getViewer();
-
-		final TreeViewer viewer = new TreeViewer(treeArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
+		TreeViewer tempViewer = null;
+		String property = System.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
+		if (property != null) {
+			FilteredTree viewParent = new FilteredTree(treeArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(), true);
+			tempViewer = viewParent.getViewer();
+		} else {
+			tempViewer = new TreeViewer(treeArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
+		}
+		final TreeViewer viewer = tempViewer;
 
 		viewer.setLabelProvider(new ComponentLabelProvider(this, messages));
 		ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(new ObservableFactoryImpl(), new TreeStructureAdvisorImpl());

From d11843f2f63c1fb4199017fc2f3170865fce5fbc Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Mon, 25 Mar 2013 11:41:11 -0400
Subject: [PATCH 0584/1286] Bug 403237 - o.e.e4.tools cannot be build with "mvn
 clean install"

Set version to 0.14.0-SNAPSHOT

Change-Id: Ia362d46adc302aabb05220339317c19f123b46ea
---
 .../org.eclipse.e4.tools.compat/forceQualifierUpdate.txt    | 2 ++
 bundles/org.eclipse.e4.tools.compat/pom.xml                 | 6 +++---
 .../forceQualifierUpdate.txt                                | 2 ++
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml           | 6 +++---
 .../org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt    | 2 ++
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml                 | 6 +++---
 .../forceQualifierUpdate.txt                                | 2 ++
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml          | 6 +++---
 .../org.eclipse.e4.tools.services/forceQualifierUpdate.txt  | 2 ++
 bundles/org.eclipse.e4.tools.services/pom.xml               | 6 +++---
 bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt       | 2 ++
 bundles/org.eclipse.e4.tools/pom.xml                        | 6 +++---
 .../forceQualifierUpdate.txt                                | 2 ++
 features/org.eclipse.e4.core.tools.feature/pom.xml          | 6 +++---
 14 files changed, 35 insertions(+), 21 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt
 create mode 100644 bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
 create mode 100644 bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
 create mode 100644 features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt

diff --git a/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
new file mode 100644
index 0000000000..396f08759f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 31c653e36c..c35bda5c0b 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.e4.releng</groupId>
     <artifactId>eclipse-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.14.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
@@ -12,4 +12,4 @@
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
-</project> 
+</project>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt
new file mode 100644
index 0000000000..396f08759f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index c5de1aa4fc..8d6862f877 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.e4.releng</groupId>
     <artifactId>eclipse-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.14.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
@@ -12,4 +12,4 @@
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
-</project> 
+</project>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
new file mode 100644
index 0000000000..396f08759f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index f97e6fc819..dc97e83bde 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.e4.releng</groupId>
     <artifactId>eclipse-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.14.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
@@ -12,4 +12,4 @@
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
-</project> 
+</project>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt
new file mode 100644
index 0000000000..396f08759f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index c93c03383d..8d3a8671bb 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.e4.releng</groupId>
     <artifactId>eclipse-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.14.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
@@ -12,4 +12,4 @@
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
-</project> 
+</project>
diff --git a/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
new file mode 100644
index 0000000000..396f08759f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 577fe644e3..c25c346c8a 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.e4.releng</groupId>
     <artifactId>eclipse-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.14.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
@@ -12,4 +12,4 @@
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
-</project> 
+</project>
diff --git a/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
new file mode 100644
index 0000000000..396f08759f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index dcd83cd8a4..e8ee01ba6e 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.e4.releng</groupId>
     <artifactId>eclipse-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.14.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
@@ -12,4 +12,4 @@
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
-</project> 
+</project>
diff --git a/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt b/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt
new file mode 100644
index 0000000000..396f08759f
--- /dev/null
+++ b/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index ca3c65e1ac..d3ee2142ff 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.e4.releng</groupId>
     <artifactId>eclipse-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.14.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
@@ -12,4 +12,4 @@
   <version>0.12.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
 
-</project> 
+</project>

From ea658c12217237bfcdebcd066edafde0b18eefdc Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Thu, 11 Apr 2013 17:25:57 +0200
Subject: [PATCH 0585/1286] Bug 394503 - Live Application Model Editor not
 usable (InjectionException)


From a18060e07d46de5a4bcfe06afcb35370f0bdeea9 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Thu, 11 Apr 2013 18:53:04 +0200
Subject: [PATCH 0586/1286] Bug 395371 - Wizard to convert part of the
 application model to a fragment

---
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../OSGI-INF/modelextractor.xml               |  7 +++++
 .../build.properties                          |  5 ++--
 .../e4/tools/emf/editor3x/ModelExtractor.java | 24 +++++++++++++++++
 .../META-INF/MANIFEST.MF                      |  1 -
 .../tools/emf/ui/common/IModelExtractor.java  | 12 +++++++++
 .../emf/ui/internal/common/ModelEditor.java   | 27 +++++++++----------
 7 files changed, 59 insertions(+), 19 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/modelextractor.xml
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelExtractor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index ca3b121306..c4ae4d5f2d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -31,6 +31,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.search;bundle-version="3.7.0",
  org.eclipse.text;bundle-version="3.5.100",
  org.eclipse.e4.ui.model.workbench;bundle-version="1.0.0"
-Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/projectfunction.xml, OSGI-INF/pdee4xmiprovider.xml, OSGI-INF/pdeextensionlookup.xml
+Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/projectfunction.xml, OSGI-INF/pdee4xmiprovider.xml, OSGI-INF/pdeextensionlookup.xml, OSGI-INF/modelextractor.xml 
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/modelextractor.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/modelextractor.xml
new file mode 100644
index 0000000000..c2dbd85ca6
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/modelextractor.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.emf.editor3x.modelextractor">
+   <implementation class="org.eclipse.e4.tools.emf.editor3x.ModelExtractor"/>
+   <service>
+      <provide interface="org.eclipse.e4.tools.emf.ui.common.IModelExtractor"/>
+   </service>
+</scr:component>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
index 13160ee89d..9fb99e10a8 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
@@ -1,9 +1,8 @@
 output.. = bin/
+source.. = src/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
-               OSGI-INF/,\
                about.html,\
-               OSGI-INF/pdeextensionlookup.xml
-source.. = src/
+               OSGI-INF/
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java
new file mode 100644
index 0000000000..ee3f155664
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java
@@ -0,0 +1,24 @@
+package org.eclipse.e4.tools.emf.editor3x;
+
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.internal.tools.wizards.model.ExtractContributionModelWizard;
+import org.eclipse.e4.tools.emf.ui.common.IModelExtractor;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.jface.wizard.WizardDialog; 
+import org.eclipse.swt.widgets.Shell;
+ 
+@SuppressWarnings("restriction")
+public class ModelExtractor implements IModelExtractor { 
+	
+	public boolean extract(Shell shell, IProject project,
+			List<MApplicationElement> maes) {
+		ExtractContributionModelWizard extractContributionModelWizard = new ExtractContributionModelWizard(maes);
+		extractContributionModelWizard.setup(project);
+		WizardDialog wizardDialog = new WizardDialog(shell, extractContributionModelWizard);
+		return wizardDialog.open() == WizardDialog.OK;
+	}
+
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index b2aafdb39e..a90c35b16d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -31,7 +31,6 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.jface.text;bundle-version="3.7.0",
  org.eclipse.e4.ui.widgets;bundle-version="0.11.0",
  org.eclipse.equinox.preferences;bundle-version="3.4.0",
- org.eclipse.e4.tools;bundle-version="0.12.0",
  org.eclipse.e4.ui.workbench.swt;bundle-version="0.10.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.9.0"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelExtractor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelExtractor.java
new file mode 100644
index 0000000000..c5b840e1f7
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelExtractor.java
@@ -0,0 +1,12 @@
+package org.eclipse.e4.tools.emf.ui.common;
+
+import java.util.List;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.swt.widgets.Shell;
+
+public interface IModelExtractor {
+
+	boolean extract(Shell shell, IProject project, List<MApplicationElement> maes);
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 1514248536..cd285a8748 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -13,6 +13,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -44,13 +45,13 @@
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.Preference;
 import org.eclipse.e4.core.services.contributions.IContributionFactory;
-import org.eclipse.e4.internal.tools.wizards.model.ExtractContributionModelWizard;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.IEditorDescriptor;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.IExtensionLookup;
+import org.eclipse.e4.tools.emf.ui.common.IModelExtractor;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.IScriptingSupport;
 import org.eclipse.e4.tools.emf.ui.common.ISelectionProviderService;
@@ -202,7 +203,6 @@
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerDropAdapter;
-import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -298,6 +298,10 @@ public class ModelEditor {
 	@Translation
 	private Messages messages;
 
+	@Inject
+	@Optional
+	private IModelExtractor modelExtractor;
+
 	private ObservablesManager obsManager;
 
 	private final IResourcePool resourcePool;
@@ -645,7 +649,7 @@ public void menuAboutToShow(IMenuManager manager) {
 							manager.add(new Separator());
 
 						// build the extract action
-						if ((!((VirtualEntry<?>) s.getFirstElement()).getList().isEmpty()) && (!isModelFragment()))
+						if ((!((VirtualEntry<?>) s.getFirstElement()).getList().isEmpty()) && (!isModelFragment()) && modelExtractor != null) {
 							manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {
 								public void run() {
 									VirtualEntry<?> ve = (VirtualEntry<?>) s.getFirstElement();
@@ -661,10 +665,8 @@ public void run() {
 									while (iterator.hasNext()) {
 										maes.add((MApplicationElement) iterator.next());
 									}
-									ExtractContributionModelWizard extractContributionModelWizard = new ExtractContributionModelWizard(maes);
-									extractContributionModelWizard.setup(project);
-									WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), extractContributionModelWizard);
-									if (wizardDialog.open() == WizardDialog.OK) {
+
+									if (modelExtractor.extract(viewer.getControl().getShell(), project, maes)) {
 										for (MApplicationElement mae : maes) {
 											Command cmd = DeleteCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), mae);
 											if (cmd.canExecute()) {
@@ -674,7 +676,7 @@ public void run() {
 									}
 								};
 							});
-
+						}
 					} else {
 
 						final EObject o = (EObject) s.getFirstElement();
@@ -799,7 +801,7 @@ public void run() {
 					}
 
 				}
-				if ((s.getFirstElement() instanceof MApplicationElement) && (!isModelFragment()) && (!(s.getFirstElement() instanceof MApplication)))
+				if ((s.getFirstElement() instanceof MApplicationElement) && (!isModelFragment()) && (!(s.getFirstElement() instanceof MApplication)) && modelExtractor != null) {
 					manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {
 						public void run() {
 							MApplicationElement oe = (MApplicationElement) s.getFirstElement();
@@ -809,19 +811,16 @@ public void run() {
 								MessageDialog.openError(viewer.getControl().getShell(), null, messages.ModelEditor_ExtractFragment_NoParentId);
 								return;
 							}
-							ExtractContributionModelWizard extractContributionModelWizard = new ExtractContributionModelWizard(oe);
-							extractContributionModelWizard.setup(project);
-							WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), extractContributionModelWizard);
-							if (wizardDialog.open() == WizardDialog.OK) {
+							if (modelExtractor.extract(viewer.getControl().getShell(), project, Collections.singletonList(oe))) {
 								Command cmd = DeleteCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), oe);
 								if (cmd.canExecute()) {
 									ModelEditor.this.modelProvider.getEditingDomain().getCommandStack().execute(cmd);
 								}
 							}
-
 						};
 
 					});
+				}
 
 				if (addSeparator) {
 					manager.add(new Separator());

From e8c415bfec8f53317b249038c84074d2760297fd Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Fri, 12 Apr 2013 23:10:21 +0200
Subject: [PATCH 0587/1286] Bug 379011 - Odd enablement in New Plug-in Project
 wizard page

---
 .../internal/tools/wizards/project/E4NewProjectWizardPage.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizardPage.java
index 72ae3d446e..9465cd4ce4 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizardPage.java
@@ -24,6 +24,7 @@ public E4NewProjectWizardPage(String pageName, AbstractFieldData data, boolean f
 	public void createControl(Composite parent) {
 		super.createControl(parent);
 		fOSGIButton.setSelection(true);
+		fEclipseButton.setSelection(false);
 		fEclipseButton.setEnabled(false);
 		fEclipseCombo.setEnabled(false);
 	}

From c8862589c9a0e062c45098b4602f32a8a050f291 Mon Sep 17 00:00:00 2001
From: Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de>
Date: Mon, 15 Apr 2013 16:17:12 +0200
Subject: [PATCH 0588/1286] NEW - bug 405728: Add tooltips to model editor
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=405728

---
 .../e4/tools/emf/ui/internal/Messages.java    |  2 +
 .../tools/emf/ui/internal/Messages.properties |  2 +
 .../common/component/ControlFactory.java      | 49 ++++++++++++++++++-
 .../internal/common/component/PartEditor.java |  5 +-
 4 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 6f8e30050f..6b16dce3b9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -34,6 +34,7 @@ public class Messages {
 	public String ModelTooling_UIElement_AccessibilityPhrase;
 
 	public String ModelTooling_Context_Variables;
+	public String ModelTooling_Context_Variables_Tooltip;
 	public String ModelTooling_Context_Properties;
 
 	public String ModelTooling_ApplicationElement_Tags;
@@ -189,6 +190,7 @@ public class Messages {
 	public String PartEditor_IconURI;
 	public String PartEditor_ClassURI;
 	public String PartEditor_Closeable;
+	public String PartEditor_Closeable_Tooltip;
 	public String PartEditor_Menus;
 	public String PartEditor_Handlers;
 	public String PartEditor_ContainerData;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index f39ae0e752..7671cdb5e1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -30,6 +30,7 @@ ModelTooling_UIElement_VisibleWhen=Visible-When Expression
 ModelTooling_UIElement_AccessibilityPhrase=Accessibility Phrase
 
 ModelTooling_Context_Variables=Variables
+ModelTooling_Context_Variables_Tooltip=Declares the following variables to be modifiable in the local IEclipseContext (non-modifiable context variables will cause an IllegalArgumentException to be thrown if a modification attempt by a descendant context is made).
 ModelTooling_Context_Properties=Context Properties
 
 ModelTooling_ApplicationElement_Tags=Tags
@@ -189,6 +190,7 @@ PartEditor_Tooltip=Tooltip
 PartEditor_IconURI=Icon URI
 PartEditor_ClassURI=Class URI
 PartEditor_Closeable=Closeable
+PartEditor_Closeable_Tooltip=If checked, the part can be closed by the user
 PartEditor_Menus=Menus
 PartEditor_Handlers=Handlers
 PartEditor_ContainerData=Container Data
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index faaf89f4ab..905fa66c49 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -172,8 +172,15 @@ public void handleValueChange(ValueChangeEvent event) {
 	}
 
 	public static void createMapProperties(Composite parent, final Messages Messages, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
+		createMapProperties(parent, Messages, editor, label, null, feature, vIndent);
+	}
+
+	public static void createMapProperties(Composite parent, final Messages Messages, final AbstractComponentEditor editor, String label, String tooltip, final EStructuralFeature feature, int vIndent) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
+		if (tooltip != null) {
+			l.setToolTipText(tooltip);
+		}
 		GridData gd = new GridData(GridData.END, GridData.BEGINNING, false, false);
 		gd.verticalIndent = vIndent;
 		l.setLayoutData(gd);
@@ -326,8 +333,15 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	public static void createTextField(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp) {
-		createTextField(parent, label, master, context, textProp, modelProp, null);
+		createTextField(parent, label, null, master, context, textProp, modelProp, null);
+	}
 
+	public static void createTextField(Composite parent, String label, String tooltip, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp) {
+		createTextField(parent, label, tooltip, master, context, textProp, modelProp, null);
+	}
+
+	public static void createTextField(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp, final String warningText) {
+		createTextField(parent, label, null, master, context, textProp, modelProp, warningText);
 	}
 
 	/**
@@ -342,9 +356,12 @@ public static void createTextField(Composite parent, String label, IObservableVa
 	 *            Non null warningText means that a warning with this non-null
 	 *            text will be shown when the field is left empty
 	 */
-	public static void createTextField(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp, final String warningText) {
+	public static void createTextField(Composite parent, String label, String tooltip, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp, final String warningText) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
+		if (tooltip != null) {
+			l.setToolTipText(tooltip);
+		}
 		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		final Text t = new Text(parent, SWT.BORDER);
@@ -382,8 +399,15 @@ public IStatus validate(Object value) {
 	}
 
 	public static void createTranslatedTextField(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp, IResourcePool resourcePool, IProject project) {
+		createTranslatedTextField(parent, label, null, master, context, textProp, modelProp, resourcePool, project);
+	}
+
+	public static void createTranslatedTextField(Composite parent, String label, String tooltip, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp, IResourcePool resourcePool, IProject project) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
+		if (tooltip != null) {
+			l.setToolTipText(tooltip);
+		}
 		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		final Text t = new Text(parent, SWT.BORDER);
@@ -499,9 +523,16 @@ public void handleValueChange(ValueChangeEvent event) {
 	}
 
 	public static void createBindingContextWiget(Composite parent, final Messages Messages, final AbstractComponentEditor editor, String label) {
+		createBindingContextWiget(parent, Messages, editor, label, null);
+	}
+
+	public static void createBindingContextWiget(Composite parent, final Messages Messages, final AbstractComponentEditor editor, String label, String tooltip) {
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(label);
+			if (tooltip != null) {
+				l.setToolTipText(tooltip);
+			}
 			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 			final TableViewer viewer = new TableViewer(parent);
@@ -609,8 +640,15 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	public static void createStringListWidget(Composite parent, Messages Messages, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
+		createStringListWidget(parent, Messages, editor, label, null, feature, vIndent);
+	}
+
+	public static void createStringListWidget(Composite parent, Messages Messages, final AbstractComponentEditor editor, String label, String tooltip, final EStructuralFeature feature, int vIndent) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
+		if (tooltip != null) {
+			l.setToolTipText(tooltip);
+		}
 		GridData gd = new GridData(GridData.END, GridData.BEGINNING, false, false);
 		gd.verticalIndent = vIndent;
 		l.setLayoutData(gd);
@@ -759,8 +797,15 @@ private static void handleAddText(AbstractComponentEditor editor, EStructuralFea
 	}
 
 	public static void createCheckBox(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty selectionProp, IEMFEditValueProperty modelProp) {
+		createCheckBox(parent, label, null, master, context, selectionProp, modelProp);
+	}
+
+	public static void createCheckBox(Composite parent, String label, String tooltip, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty selectionProp, IEMFEditValueProperty modelProp) {
 		Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
+		if (tooltip != null) {
+			l.setToolTipText(tooltip);
+		}
 		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		Button t = new Button(parent, SWT.CHECK);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 77c80b6fa8..fe7b347936 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -289,13 +289,12 @@ public void widgetSelected(SelectionEvent e) {
 
 		createSubformElements(parent, context, master);
 
-		ControlFactory.createCheckBox(parent, Messages.PartEditor_Closeable, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART__CLOSEABLE));
+		ControlFactory.createCheckBox(parent, Messages.PartEditor_Closeable, Messages.PartEditor_Closeable_Tooltip, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART__CLOSEABLE));
 
 		// ------------------------------------------------------------
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.PartEditor_BindingContexts);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
 
@@ -305,7 +304,7 @@ public void widgetSelected(SelectionEvent e) {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, Messages.ModelTooling_Context_Variables_Tooltip, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {

From 8ca9c10210e8689916d3bc02f06a7fb23dfde561 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Wed, 17 Apr 2013 10:55:56 +0200
Subject: [PATCH 0589/1286] Bug 405728 - Update tooling fields with meaningful
 tooltips

---
 .../src/org/eclipse/e4/tools/emf/ui/internal/Messages.java      | 1 +
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.properties    | 1 +
 .../tools/emf/ui/internal/common/component/CommandEditor.java   | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 6b16dce3b9..e27edb7efb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -636,4 +636,5 @@ public class Messages {
 	public String ModelEditor_ExtractFragment;
 	public String ModelEditor_ExtractFragment_NoParentId;
 	public String KeyBindingEditor_SequenceLowercase;
+	public String ModelTooling_CommandId_tooltip;
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 7671cdb5e1..a63f7ac704 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -637,3 +637,4 @@ VWindowSharedElementsEditor_Area=Area
 ModelEditor_ExtractFragment=Extract into a fragment
 ModelEditor_ExtractFragment_NoParentId=Can not extract because parent container has no id. \nAdd an id and try again.
 KeyBindingEditor_SequenceLowercase=Key sequences should be specified in uppercase characters
+ModelTooling_CommandId_tooltip=Command identifier. Must be defined for a command to work properly.
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 1f74b3fae3..bcbe9b6db2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -152,7 +152,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID), Messages.ModelTooling_Empty_Warning);
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, Messages.ModelTooling_CommandId_tooltip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID), Messages.ModelTooling_Empty_Warning);
 		ControlFactory.createTextField(parent, Messages.CommandEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME));
 		ControlFactory.createTextField(parent, Messages.CommandEditor_LabelDescription, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__DESCRIPTION));
 

From e35da46c228cdb326845d3d73b41c673f6751558 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Wed, 17 Apr 2013 11:06:47 +0200
Subject: [PATCH 0590/1286] Bug 404232 - Move "Part Descriptors" entry in the
 tree before "Menu Contributions"

---
 .../ui/internal/common/component/ApplicationEditor.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 73c66bdeb1..43accfc417 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -257,7 +257,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PART_DESCRIPTORS, PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, element, Messages.ApplicationEditor_PartDescriptors) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_COMMAND, APPLICATION__COMMANDS, element, Messages.ApplicationEditor_Commands) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -266,7 +266,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_COMMAND, APPLICATION__COMMANDS, element, Messages.ApplicationEditor_Commands) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_CATEGORIES, APPLICATION__CATEGORIES, element, Messages.ApplicationEditor_Categories) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -275,7 +275,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_CATEGORIES, APPLICATION__CATEGORIES, element, Messages.ApplicationEditor_Categories) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_APPLICATION_WINDOWS, ELEMENT_CONTAINER__CHILDREN, element, Messages.ApplicationEditor_Windows) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -284,7 +284,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_APPLICATION_WINDOWS, ELEMENT_CONTAINER__CHILDREN, element, Messages.ApplicationEditor_Windows) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PART_DESCRIPTORS, PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, element, Messages.ApplicationEditor_PartDescriptors) {
 
 			@Override
 			protected boolean accepted(Object o) {

From 81f6a3a0620c1624c23d68b4d43599cc9a8320cd Mon Sep 17 00:00:00 2001
From: Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de>
Date: Wed, 17 Apr 2013 15:50:19 +0200
Subject: [PATCH 0591/1286] NEW - bug 405886: BindingContext widget not shown
 for parts (any more) https://bugs.eclipse.org/bugs/show_bug.cgi?id=405886

---
 .../e4/tools/emf/ui/internal/common/component/PartEditor.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index fe7b347936..9c45ad1436 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -295,6 +295,7 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
+		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.PartEditor_BindingContexts);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
 

From 0e85e975fdc8f67fcb06f94350c8d80b873b0e23 Mon Sep 17 00:00:00 2001
From: Dirk Fauth <dirk.fauth@googlemail.com>
Date: Wed, 17 Apr 2013 19:18:35 +0200
Subject: [PATCH 0592/1286] Bug 396198 - Enhancement of translation service in
 tools.services

---
 .../META-INF/MANIFEST.MF                      |   1 +
 .../services/IMessageFactoryService.java      |   4 +-
 .../eclipse/e4/tools/services/Message.java    |   5 +
 .../services/ToolsServicesActivator.java      |  63 +++
 .../impl/AbstractTranslationProvider.java     |   1 +
 .../impl/MessageFactoryServiceImpl.java       |  66 ++-
 .../services/impl/ResourceBundleHelper.java   | 501 ++++++++++++++++++
 .../ResourceBundleTranslationProvider.java    |  70 +++
 .../impl/TranslationObjectSupplier.java       |  14 +-
 9 files changed, 706 insertions(+), 19 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java

diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 9374d6b9a4..f0ce943793 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@ Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.x
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.0.0",
  javax.inject;version="1.0.0"
+Bundle-Activator: org.eclipse.e4.tools.services.ToolsServicesActivator
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java
index fc22333050..b5512df783 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java
@@ -1,6 +1,8 @@
 package org.eclipse.e4.tools.services;
 
+import org.eclipse.osgi.service.localization.BundleLocalization;
+
 public interface IMessageFactoryService {
-	public <M> M createInstance(final String locale, final Class<M> messages)
+	public <M> M createInstance(final String locale, final Class<M> messages, BundleLocalization localization)
 			throws InstantiationException, IllegalAccessException;
 }
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Message.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Message.java
index d2948f9753..05afcf7f30 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Message.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Message.java
@@ -1,9 +1,14 @@
 package org.eclipse.e4.tools.services;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
 public @interface Message {
 	public enum ReferenceType {
 		NONE, SOFT, WEAK
 	}
 
 	ReferenceType referenceType() default ReferenceType.SOFT;
+	String contributorURI() default "";
 }
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java
new file mode 100644
index 0000000000..04d636723a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java
@@ -0,0 +1,63 @@
+package org.eclipse.e4.tools.services;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.service.log.LogService;
+import org.osgi.service.packageadmin.PackageAdmin;
+import org.osgi.util.tracker.ServiceTracker;
+
+@SuppressWarnings("deprecation")
+public class ToolsServicesActivator implements BundleActivator {
+
+	static private ToolsServicesActivator defaultInstance;
+	private BundleContext bundleContext;
+	private ServiceTracker<PackageAdmin, PackageAdmin> pkgAdminTracker;
+	private ServiceTracker<LogService, LogService> logTracker;
+
+	public ToolsServicesActivator() {
+		defaultInstance = this;
+	}
+
+	public static ToolsServicesActivator getDefault() {
+		return defaultInstance;
+	}
+
+	public void start(BundleContext context) throws Exception {
+		bundleContext = context;
+	}
+
+	public void stop(BundleContext context) throws Exception {
+		if (pkgAdminTracker != null) {
+			pkgAdminTracker.close();
+			pkgAdminTracker = null;
+		}
+		if (logTracker != null) {
+			logTracker.close();
+			logTracker = null;
+		}
+		bundleContext = null;
+	}
+
+	public PackageAdmin getPackageAdmin() {
+		if (pkgAdminTracker == null) {
+			if (bundleContext == null)
+				return null;
+			pkgAdminTracker = new ServiceTracker<PackageAdmin, PackageAdmin>(bundleContext,
+					PackageAdmin.class, null);
+			pkgAdminTracker.open();
+		}
+		return (PackageAdmin) pkgAdminTracker.getService();
+	}
+
+	public LogService getLogService() {
+		if (logTracker == null) {
+			if (bundleContext == null)
+				return null;
+			logTracker = new ServiceTracker<LogService, LogService>(bundleContext,
+					LogService.class, null);
+			logTracker.open();
+		}
+		return logTracker.getService();
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/AbstractTranslationProvider.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/AbstractTranslationProvider.java
index c255ee13cb..20d0deb776 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/AbstractTranslationProvider.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/AbstractTranslationProvider.java
@@ -20,6 +20,7 @@
 import java.util.MissingResourceException;
 import java.util.PropertyResourceBundle;
 import java.util.ResourceBundle;
+
 import org.eclipse.osgi.service.localization.BundleLocalization;
 
 /**
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java
index 2d8d3496b4..e09b23b6f1 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java
@@ -19,15 +19,25 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 
 import org.eclipse.e4.tools.services.IMessageFactoryService;
 import org.eclipse.e4.tools.services.Message;
 import org.eclipse.e4.tools.services.Message.ReferenceType;
+import org.eclipse.e4.tools.services.ToolsServicesActivator;
+import org.eclipse.osgi.service.localization.BundleLocalization;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.service.log.LogService;
 
 public class MessageFactoryServiceImpl implements IMessageFactoryService {
 
+	private static LogService logService = ToolsServicesActivator.getDefault().getLogService();
+
 	// Cache so when multiple instance use the same message class
 	private Map<Object, Reference<Object>> SOFT_CACHE = Collections
 			.synchronizedMap(new HashMap<Object, Reference<Object>>());
@@ -37,9 +47,9 @@ public class MessageFactoryServiceImpl implements IMessageFactoryService {
 
 	private int CLEANUPCOUNT = 0;
 
-	public <M> M createInstance(final String locale, final Class<M> messages)
+	public <M> M createInstance(final String locale, final Class<M> messages, final BundleLocalization localization)
 			throws InstantiationException, IllegalAccessException {
-		String key = messages.getName() + "_" + locale;
+		String key = messages.getName() + "_" + locale; //$NON-NLS-1$
 
 		final Message annotation = messages.getAnnotation(Message.class);
 		Map<Object, Reference<Object>> cache = null;
@@ -85,13 +95,13 @@ public <M> M createInstance(final String locale, final Class<M> messages)
 		M instance;
 
 		if (System.getSecurityManager() == null) {
-			instance = doCreateInstance(locale, messages, annotation);
+			instance = doCreateInstance(locale, messages, annotation, localization);
 		} else {
 			instance = AccessController.doPrivileged(new PrivilegedAction<M>() {
 
 				public M run() {
 					try {
-						return doCreateInstance(locale, messages, annotation);
+						return doCreateInstance(locale, messages, annotation, localization);
 					} catch (InstantiationException e) {
 						e.printStackTrace();
 					} catch (IllegalAccessException e) {
@@ -115,13 +125,49 @@ public M run() {
 	}
 
 	private static <M> M doCreateInstance(String locale, Class<M> messages,
-			Message annotation) throws InstantiationException,
+			Message annotation, BundleLocalization localization) throws InstantiationException,
 			IllegalAccessException {
 
-		String basename = messages.getName().replace('.', '/');
-		PropertiesBundleTranslationProvider provider = new PropertiesBundleTranslationProvider(
-				messages.getClassLoader(), basename);
-
+		Locale loc = null;
+		try {
+			loc = locale == null ? Locale.getDefault() : ResourceBundleHelper.toLocale(locale);
+		}
+		catch (Exception e) {
+			//parsing the locale String to a Locale failed, so we use the default Locale
+			if (logService != null)
+				logService.log(LogService.LOG_ERROR, "Invalid locale", e); //$NON-NLS-1$
+			loc = Locale.getDefault();
+		}
+		
+		ResourceBundle resourceBundle = null;
+		if (annotation != null && annotation.contributorURI().length() > 0) {
+			resourceBundle = ResourceBundleHelper.getResourceBundleForUri(annotation.contributorURI(), loc, localization);
+		}
+		
+		if (resourceBundle == null) {
+			//check for the resource bundle relative to the messages class
+			String baseName = messages.getName().replace('.', '/');
+			
+			try {
+				resourceBundle = ResourceBundleHelper.getEquinoxResourceBundle(baseName, loc, messages.getClassLoader());
+			}
+			catch (MissingResourceException e) {
+				//do nothing as this just means there is no resource bundle named
+				//like the messages class in the same package
+				//therefore we will go on and search for the OSGi resource bundle
+			}
+		}
+		
+		if (resourceBundle == null) {
+			//retrieve the OSGi resource bundle
+			Bundle bundle = FrameworkUtil.getBundle(messages);
+			resourceBundle = localization.getLocalization(bundle, locale);
+		}
+		
+		//always create a provider, if there is no resource bundle found, simply the modified keys will
+		//be returned by this provider to show that there is something wrong on loading it
+		ResourceBundleTranslationProvider provider = new ResourceBundleTranslationProvider(resourceBundle);
+		
 		M instance = messages.newInstance();
 		Field[] fields = messages.getDeclaredFields();
 
@@ -131,7 +177,7 @@ private static <M> M doCreateInstance(String locale, Class<M> messages,
 			}
 
 			fields[i].set(instance,
-					provider.translate(locale, fields[i].getName()));
+					provider.translate(fields[i].getName()));
 		}
 
 		return instance;
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
new file mode 100644
index 0000000000..fb3f017eb2
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
@@ -0,0 +1,501 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Dirk Fauth and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Dirk Fauth <dirk.fauth@gmail.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.services.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.List;
+import java.util.Locale;
+import java.util.PropertyResourceBundle;
+import java.util.ResourceBundle;
+import java.util.ResourceBundle.Control;
+
+import org.eclipse.e4.tools.services.ToolsServicesActivator;
+import org.eclipse.osgi.service.localization.BundleLocalization;
+import org.osgi.framework.Bundle;
+import org.osgi.service.log.LogService;
+import org.osgi.service.packageadmin.PackageAdmin;
+
+/**
+ * Helper class for retrieving {@link ResourceBundle}s out of OSGi {@link Bundle}s.
+ * 
+ * @author Dirk Fauth
+ */
+// There is no replacement for PackageAdmin#getBundles()
+@SuppressWarnings("deprecation")
+public class ResourceBundleHelper {
+
+	/**
+	 * The schema identifier used for Eclipse platform references
+	 */
+	private static final String PLATFORM_SCHEMA = "platform"; //$NON-NLS-1$
+	/**
+	 * The schema identifier used for Eclipse bundle class references
+	 */
+	private static final String BUNDLECLASS_SCHEMA = "bundleclass"; //$NON-NLS-1$
+	/**
+	 * Identifier part of the Eclipse platform schema to point to a plugin
+	 */
+	private static final String PLUGIN_SEGMENT = "/plugin/"; //$NON-NLS-1$
+	/**
+	 * Identifier part of the Eclipse platform schema to point to a fragment
+	 */
+	private static final String FRAGMENT_SEGMENT = "/fragment/"; //$NON-NLS-1$
+	/**
+	 * The separator character for paths in the platform schema
+	 */
+	private static final String PATH_SEPARATOR = "/"; //$NON-NLS-1$
+	
+	/**
+	 * Parses the specified contributor URI and loads the {@link ResourceBundle} for the specified {@link Locale}
+	 * out of an OSGi {@link Bundle}.
+	 * <p>Following URIs are supported:
+	 * <ul>
+	 * <li>platform:/[plugin|fragment]/[Bundle-SymbolicName]<br>
+	 * Load the OSGi resource bundle out of the bundle/fragment named [Bundle-SymbolicName]</li>
+	 * <li>platform:/[plugin|fragment]/[Bundle-SymbolicName]/[Path]/[Basename]<br>
+	 * Load the resource bundle specified by [Path] and [Basename] out of the bundle/fragment named [Bundle-SymbolicName].</li>
+	 * <li>bundleclass://[plugin|fragment]/[Full-Qualified-Classname]<br>
+	 * Instantiate the class specified by [Full-Qualified-Classname] out of the bundle/fragment named [Bundle-SymbolicName].
+	 * Note that the class needs to be a subtype of {@link ResourceBundle}.</li>
+	 * </ul>
+	 * </p>
+	 * @param contributorURI The URI that points to a {@link ResourceBundle}
+	 * @param locale The {@link Locale} to use for loading the {@link ResourceBundle}
+	 * @param localization The service for retrieving a {@link ResourceBundle} for a given {@link Locale} out of
+	 * 			the given {@link Bundle} which is specified by URI.
+	 * @return
+	 */
+	public static ResourceBundle getResourceBundleForUri(String contributorURI, Locale locale, BundleLocalization localization) {
+		if (contributorURI == null)
+			return null;
+		
+		LogService logService = ToolsServicesActivator.getDefault().getLogService();
+
+		URI uri;
+		try {
+			uri = new URI(contributorURI);
+		} catch (URISyntaxException e) {
+			if (logService != null)
+				logService.log(LogService.LOG_ERROR, "Invalid contributor URI: " + contributorURI); //$NON-NLS-1$
+			return null;
+		}
+
+		String bundleName = null;
+		Bundle bundle = null;
+		String resourcePath = null;
+		String classPath = null;
+		
+		//the uri follows the platform schema, so we search for .properties files in the bundle
+		if (PLATFORM_SCHEMA.equals(uri.getScheme())) {
+			bundleName = uri.getPath();
+			if (bundleName.startsWith(PLUGIN_SEGMENT))
+				bundleName = bundleName.substring(PLUGIN_SEGMENT.length());
+			else if (bundleName.startsWith(FRAGMENT_SEGMENT))
+				bundleName = bundleName.substring(FRAGMENT_SEGMENT.length());
+			
+			resourcePath = ""; //$NON-NLS-1$
+			if (bundleName.contains(PATH_SEPARATOR)) {
+				resourcePath = bundleName.substring(bundleName.indexOf(PATH_SEPARATOR) + 1);
+				bundleName = bundleName.substring(0, bundleName.indexOf(PATH_SEPARATOR));
+			}
+		} else if (BUNDLECLASS_SCHEMA.equals(uri.getScheme())) {
+			if (uri.getAuthority() == null) {
+				if (logService != null)
+					logService.log(LogService.LOG_ERROR, "Failed to get bundle for: " + contributorURI); //$NON-NLS-1$
+			}
+			bundleName = uri.getAuthority();
+			//remove the leading /
+			classPath = uri.getPath().substring(1);
+		}
+		
+		ResourceBundle result = null;
+
+		if (bundleName != null) {
+			bundle = getBundleForName(bundleName);
+			
+			if (bundle != null) {
+				if (resourcePath == null && classPath != null) {
+					//the URI points to a class within the bundle classpath
+					//therefore we are trying to instantiate the class
+					try {
+						Class<?> resourceBundleClass = bundle.loadClass(classPath);
+						result = getEquinoxResourceBundle(classPath, locale, resourceBundleClass.getClassLoader());
+					} catch (Exception e) {
+						if (logService != null)
+							logService.log(LogService.LOG_ERROR, "Failed to load specified ResourceBundle: " + contributorURI, e); //$NON-NLS-1$
+					}
+				}
+				else if (resourcePath.length() > 0) {
+					//the specified URI points to a resource 
+					//therefore we try to load the .properties files into a ResourceBundle
+					result = getEquinoxResourceBundle(resourcePath.replace('.', '/'), locale, bundle);
+				}
+				else {
+					//there is no class and no special resource specified within the URI 
+					//therefore we load the OSGi resource bundle out of the specified Bundle
+					//for the current Locale
+					result = localization.getLocalization(bundle, locale.toString());
+				}
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	 * This method searches for the {@link ResourceBundle} in a modified way by inspecting the configuration option 
+	 * <code>equinox.root.locale</code>. 
+	 * <p>
+	 * If the value for this system property is set to an empty String the default search order for ResourceBundles is used:
+	 * <ul>
+	 * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
+	 * <li>bn + Ls + "_" + Cs</li>
+	 * <li>bn + Ls</li>
+	 * <li>bn + Ld + "_" + Cd + "_" + Vd</li>
+	 * <li>bn + Ld + "_" + Cd</li>
+	 * <li>bn + Ld</li>
+	 * <li>bn</li>
+	 * </ul>
+	 * Where bn is this bundle's localization basename, Ls, Cs and Vs are the specified locale (language, country, variant) and 
+	 * Ld, Cd and Vd are the default locale (language, country, variant).
+	 * </p>
+	 * <p>
+	 * If Ls equals the value of <code>equinox.root.locale</code> then the following search order is used:
+	 * <ul>
+	 * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
+	 * <li>bn + Ls + "_" + Cs</li>
+	 * <li>bn + Ls</li>
+	 * <li>bn</li>
+	 * <li>bn + Ld + "_" + Cd + "_" + Vd</li>
+	 * <li>bn + Ld + "_" + Cd</li>
+	 * <li>bn + Ld</li>
+	 * <li>bn</li>
+	 * </ul>
+	 * </p>
+	 * If <code>equinox.root.locale=en</code> and en_XX or en is asked for then this allows the root file to be used instead of 
+	 * falling back to the default locale.
+	 * 
+     * @param baseName the base name of the resource bundle, a fully qualified class name
+     * @param locale the locale for which a resource bundle is desired
+     * @param loader the class loader from which to load the resource bundle
+     * @return a resource bundle for the given base name and locale
+	 * 
+	 * @see ResourceBundle#getBundle(String, Locale, ClassLoader)
+	 */
+	public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale locale, ClassLoader loader) {
+		ResourceBundle resourceBundle = null;
+		
+		String equinoxLocale = getEquinoxRootLocale();
+        //if the equinox.root.locale is not empty and the specified locale equals the equinox.root.locale
+		// -> use the special search order
+        if (equinoxLocale.length() > 0 && locale.toString().startsWith(equinoxLocale)) {
+        	//there is a equinox.root.locale configured that matches the specified locale 
+        	//so the special search order is used
+        	//to achieve this we first search without a fallback to the default locale
+        	resourceBundle = ResourceBundle.getBundle(baseName, locale, loader,
+                    ResourceBundle.Control.getNoFallbackControl(Control.FORMAT_DEFAULT));
+        	//if there is no ResourceBundle found for that path, we will now search for the default locale ResourceBundle
+        	if (resourceBundle == null) {
+            	resourceBundle = ResourceBundle.getBundle(baseName, Locale.getDefault(), loader,
+                        ResourceBundle.Control.getNoFallbackControl(Control.FORMAT_DEFAULT));
+        	}
+        }
+        else {
+        	//there is either no equinox.root.locale configured or it does not match the specified locale
+        	// -> use the default search order
+        	resourceBundle = ResourceBundle.getBundle(baseName, locale, loader);
+        }
+
+        return resourceBundle;
+    }
+	
+	/**
+	 * This method searches for the {@link ResourceBundle} in a modified way by inspecting the configuration option 
+	 * <code>equinox.root.locale</code>. 
+	 * <p><b>Note: This method will only search for ResourceBundles based on properties files.</b></p>
+	 * <p>
+	 * If the value for this system property is set to an empty String the default search order for ResourceBundles is used:
+	 * <ul>
+	 * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
+	 * <li>bn + Ls + "_" + Cs</li>
+	 * <li>bn + Ls</li>
+	 * <li>bn + Ld + "_" + Cd + "_" + Vd</li>
+	 * <li>bn + Ld + "_" + Cd</li>
+	 * <li>bn + Ld</li>
+	 * <li>bn</li>
+	 * </ul>
+	 * Where bn is this bundle's localization basename, Ls, Cs and Vs are the specified locale (language, country, variant) and 
+	 * Ld, Cd and Vd are the default locale (language, country, variant).
+	 * </p>
+	 * <p>
+	 * If Ls equals the value of <code>equinox.root.locale</code> then the following search order is used:
+	 * <ul>
+	 * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
+	 * <li>bn + Ls + "_" + Cs</li>
+	 * <li>bn + Ls</li>
+	 * <li>bn</li>
+	 * <li>bn + Ld + "_" + Cd + "_" + Vd</li>
+	 * <li>bn + Ld + "_" + Cd</li>
+	 * <li>bn + Ld</li>
+	 * <li>bn</li>
+	 * </ul>
+	 * </p>
+	 * If <code>equinox.root.locale=en</code> and en_XX or en is asked for then this allows the root file to be used instead of 
+	 * falling back to the default locale.
+	 * 
+     * @param baseName the base name of the resource bundle, a fully qualified class name
+     * @param locale the locale for which a resource bundle is desired
+	 * @param bundle The OSGi {@link Bundle} to lookup the {@link ResourceBundle}
+     * @return a resource bundle for the given base name and locale
+	 * 
+	 * @see ResourceBundle#getBundle(String, Locale, Control)
+	 */
+	public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale locale, Bundle bundle) {
+		ResourceBundle resourceBundle = null;
+		
+		String equinoxLocale = getEquinoxRootLocale();
+        //if the equinox.root.locale is not empty and the specified locale equals the equinox.root.locale
+		// -> use the special search order
+        if (equinoxLocale.length() > 0 && locale.toString().startsWith(equinoxLocale)) {
+        	//there is a equinox.root.locale configured that matches the specified locale 
+        	//so the special search order is used
+        	//to achieve this we first search without a fallback to the default locale
+        	resourceBundle = ResourceBundle.getBundle(baseName, locale, new BundleResourceBundleControl(bundle, false));
+        	//if there is no ResourceBundle found for that path, we will now search for the default locale ResourceBundle
+        	if (resourceBundle == null) {
+            	resourceBundle = ResourceBundle.getBundle(baseName, Locale.getDefault(), new BundleResourceBundleControl(bundle, false));
+        	}
+        }
+        else {
+        	//there is either no equinox.root.locale configured or it does not match the specified locale
+        	// -> use the default search order
+        	resourceBundle = ResourceBundle.getBundle(baseName, locale, new BundleResourceBundleControl(bundle, true));
+        }
+		
+		return resourceBundle;
+	}
+
+	/**
+	 * @return The value for the system property for key <code>equinox.root.locale</code>.
+	 * 			If none is specified than <b>en</b> will be returned as default.
+	 */
+	private static String getEquinoxRootLocale() {
+		// Logic from FrameworkProperties.getProperty("equinox.root.locale", "en")
+		String root = System.getProperties().getProperty("equinox.root.locale"); //$NON-NLS-1$
+		if (root == null) {
+			root = "en"; //$NON-NLS-1$
+		}
+		return root;
+	}
+
+	/**
+	 * This method is copied out of org.eclipse.e4.ui.internal.workbench.Activator
+	 * because as it is a internal resource, it is not accessible for us.
+	 * 
+	 * @param bundleName
+	 *            the bundle id
+	 * @return A bundle if found, or <code>null</code>
+	 */
+	public static Bundle getBundleForName(String bundleName) {
+		PackageAdmin packageAdmin = ToolsServicesActivator.getDefault().getPackageAdmin();
+		Bundle[] bundles = packageAdmin.getBundles(bundleName, null);
+		if (bundles == null)
+			return null;
+		// Return the first bundle that is not installed or uninstalled
+		for (int i = 0; i < bundles.length; i++) {
+			if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
+				return bundles[i];
+			}
+		}
+		return null;
+	}
+	
+    /**
+     * <p>Converts a String to a Locale.</p>
+     *
+     * <p>This method takes the string format of a locale and creates the
+     * locale object from it.</p>
+     *
+     * <pre>
+     *   MessageFactoryServiceImpl.toLocale("en")         = new Locale("en", "")
+     *   MessageFactoryServiceImpl.toLocale("en_GB")      = new Locale("en", "GB")
+     *   MessageFactoryServiceImpl.toLocale("en_GB_xxx")  = new Locale("en", "GB", "xxx")
+     * </pre>
+     *
+     * <p>This method validates the input strictly.
+     * The language code must be lowercase.
+     * The country code must be uppercase.
+     * The separator must be an underscore.
+     * The length must be correct.
+     * </p>
+     *
+     * <p>This method is inspired by <code>org.apache.commons.lang.LocaleUtils.toLocale(String)</code> by
+     * fixing the parsing error for uncommon Locales like having a language and a variant code but
+     * no country code, or a Locale that only consists of a country code.
+     * </p>
+     *  
+     * @param str the locale String to convert 
+     * @return a Locale that matches the specified locale String or <code>null</code> 
+     * 			if the specified String is <code>null</code>
+     * @throws IllegalArgumentException if the String is an invalid format
+     */	
+	public static Locale toLocale(String str) {
+        if (str == null) {
+            return null;
+        }
+        
+        String language = ""; //$NON-NLS-1$
+        String country = ""; //$NON-NLS-1$
+        String variant = ""; //$NON-NLS-1$
+        
+        String[] localeParts = str.split("_"); //$NON-NLS-1$
+        if (localeParts.length == 0 || localeParts.length > 3 
+        		|| (localeParts.length == 1 && localeParts[0].length() == 0)) {
+            throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
+        } else {
+        	if (localeParts[0].length() == 1 || localeParts[0].length() > 2) {
+                throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
+        	}
+        	else if (localeParts[0].length() == 2) {
+        		char ch0 = localeParts[0].charAt(0);
+        		char ch1 = localeParts[0].charAt(1);
+        		if (ch0 < 'a' || ch0 > 'z' || ch1 < 'a' || ch1 > 'z') {
+        			throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
+        		}
+        	}
+            
+            language = localeParts[0];
+            
+            if (localeParts.length > 1) {
+            	if (localeParts[1].length() == 1 || localeParts[1].length() > 2) {
+                    throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
+            	}
+            	else if (localeParts[1].length() == 2) {
+            		char ch3 = localeParts[1].charAt(0);
+            		char ch4 = localeParts[1].charAt(1);
+            		if (ch3 < 'A' || ch3 > 'Z' || ch4 < 'A' || ch4 > 'Z') {
+            			throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
+            		}
+            	}
+           	
+                country = localeParts[1];
+            }
+            
+            if (localeParts.length == 3) {
+            	if (localeParts[0].length() == 0 && localeParts[1].length() == 0) {
+            		throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
+            	}
+            	variant = localeParts[2];
+            }
+        }
+        
+        return new Locale(language, country, variant);
+    }
+	
+	/**
+	 * Specialization of {@link Control} which loads the {@link ResourceBundle} out of an
+	 * OSGi {@link Bundle} instead of using a classloader.
+	 * 
+	 * <p>It only supports properties based {@link ResourceBundle}s. If you want to use 
+	 * source based {@link ResourceBundle}s you have to use the bundleclass URI with the
+	 * Message annotation.
+	 * 
+	 * @author Dirk Fauth
+	 *
+	 */
+	static class BundleResourceBundleControl extends ResourceBundle.Control {
+		
+		/**
+		 * Flag to determine whether the default locale should be used as fallback locale
+		 * in case there is no {@link ResourceBundle} found for the specified locale.
+		 */
+		private final boolean useFallback;
+		
+		/**
+		 * The OSGi {@link Bundle} to lookup the {@link ResourceBundle}
+		 */
+		private final Bundle osgiBundle;
+		
+		/**
+		 * 
+		 * @param osgiBundle The OSGi {@link Bundle} to lookup the {@link ResourceBundle}
+		 * @param useFallback <code>true</code> if the default locale should be used as fallback
+		 * 			locale in the search path or <code>false</code> if there should be no fallback.
+		 */
+		public BundleResourceBundleControl(Bundle osgiBundle, boolean useFallback) {
+			this.osgiBundle = osgiBundle;
+			this.useFallback = useFallback;
+		}
+		
+		@Override
+		public ResourceBundle newBundle(String baseName, Locale locale,
+				String format, ClassLoader loader, boolean reload)
+				throws IllegalAccessException, InstantiationException, IOException {
+
+		    String bundleName = toBundleName(baseName, locale);
+		    ResourceBundle bundle = null;
+		    if (format.equals("java.properties")) { //$NON-NLS-1$
+				final String resourceName = toResourceName(bundleName, "properties"); //$NON-NLS-1$
+				InputStream stream = null;
+				try {
+				    stream = AccessController.doPrivileged(
+						new PrivilegedExceptionAction<InputStream>() {
+						    public InputStream run() throws IOException {
+								InputStream is = null;
+								URL url = osgiBundle.getEntry(resourceName);
+							    if (url != null) {
+									URLConnection connection = url.openConnection();
+									if (connection != null) {
+									    // Disable caches to get fresh data for
+									    // reloading.
+									    connection.setUseCaches(false);
+									    is = connection.getInputStream();
+									}
+							    }
+								return is;
+						    }
+						});
+				} catch (PrivilegedActionException e) {
+				    throw (IOException) e.getException();
+				}
+				if (stream != null) {
+				    try {
+				    	bundle = new PropertyResourceBundle(stream);
+				    } finally {
+				    	stream.close();
+				    }
+				}
+		    } 
+		    else {
+		    	throw new IllegalArgumentException("unknown format: " + format); //$NON-NLS-1$
+		    }
+		    return bundle;
+		}
+		
+		@Override
+		public List<String> getFormats(String baseName) {
+			return FORMAT_PROPERTIES;
+		}
+		
+		@Override
+		public Locale getFallbackLocale(String baseName, Locale locale) {
+			return this.useFallback ? super.getFallbackLocale(baseName, locale) : null;
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
new file mode 100644
index 0000000000..163087b05c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Dirk Fauth and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Dirk Fauth <dirk.fauth@gmail.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.services.impl;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * Wrapper class for accessing translations out of a {@link ResourceBundle}.
+ * 
+ * @author Dirk Fauth
+ *
+ */
+public class ResourceBundleTranslationProvider {
+
+	/**
+	 * The {@link ResourceBundle} to use for translations.
+	 */
+	private ResourceBundle resourceBundle;
+	
+	/**
+	 * 
+	 * @param resourceBundle The {@link ResourceBundle} to use for translations.
+	 * 			Can be <code>null</code>, which will lead to simply return the key
+	 * 			modified by prefixing and suffixing it with "!" when calling translate(String).
+	 */
+	public ResourceBundleTranslationProvider(ResourceBundle resourceBundle) {
+		this.resourceBundle = resourceBundle;
+	}
+
+	/**
+	 * Tries to retrieve the translation value for the given key out of the {@link ResourceBundle}
+	 * set to this {@link ResourceBundleTranslationProvider}. If there is no {@link ResourceBundle}
+	 * set or there is no translation found for the given key, the key itself prefixed and suffixed
+	 * with "!" will be returned to indicate that there is no translation found.
+	 * <p>This implementation also supports the usage of dot separation for property keys. As in Java
+	 * variables can not be separated with a dot, the underscore needs to be used for separation of
+	 * the variable. This will be replaced automatically to a dot, if there is no translation found
+	 * with an underscore as separator.
+	 * </p>
+	 * @param key The key of the requested translation property.
+	 * @return The translation for the given key or the key itself prefixed and suffixed
+	 * 			with "!" to indicate that there is no translation available for the
+	 * 			given key.
+	 */
+	public String translate(String key) {
+		String result = ""; //$NON-NLS-1$
+		try {
+			if (this.resourceBundle == null) {
+				result = "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			result = resourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			if (key.contains("_")) { //$NON-NLS-1$
+				result = translate(key.replace('_', '.'));
+			} else {
+				result = "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$
+			}
+		}
+		return result;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java
index a7ee2584f4..31c06b8708 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java
@@ -11,20 +11,17 @@
 package org.eclipse.e4.tools.services.impl;
 
 import java.lang.reflect.ParameterizedType;
-
 import java.lang.reflect.Type;
 import java.util.Locale;
 
+import org.eclipse.e4.core.di.suppliers.ExtendedObjectSupplier;
+import org.eclipse.e4.core.di.suppliers.IObjectDescriptor;
+import org.eclipse.e4.core.di.suppliers.IRequestor;
 import org.eclipse.e4.core.internal.contexts.ContextObjectSupplier;
-
 import org.eclipse.e4.core.internal.di.Requestor;
 import org.eclipse.e4.core.services.translation.TranslationService;
-
-import org.eclipse.e4.core.di.suppliers.IObjectDescriptor;
-import org.eclipse.e4.core.di.suppliers.IRequestor;
-
-import org.eclipse.e4.core.di.suppliers.ExtendedObjectSupplier;
 import org.eclipse.e4.tools.services.IMessageFactoryService;
+import org.eclipse.osgi.service.localization.BundleLocalization;
 
 public class TranslationObjectSupplier extends ExtendedObjectSupplier {
 
@@ -39,10 +36,11 @@ public Object get(IObjectDescriptor descriptor, IRequestor requestor,
 		
 		String locale = (String) sub.getContext().get(TranslationService.LOCALE);
 		locale = locale == null ? Locale.getDefault().toString() : locale;
+		BundleLocalization localization = sub.getContext().get(BundleLocalization.class);
 		IMessageFactoryService factoryService = sub.getContext().get(IMessageFactoryService.class); 
 		
 		try {
-			return factoryService.createInstance(locale,descriptorsClass);
+			return factoryService.createInstance(locale, descriptorsClass, localization);
 		} catch (InstantiationException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();

From 115e733174ed6c999432165b091e9acc31cf659c Mon Sep 17 00:00:00 2001
From: Dirk Fauth <dirk.fauth@googlemail.com>
Date: Thu, 18 Apr 2013 11:32:29 +0200
Subject: [PATCH 0593/1286] Bug 405935 - Errors in new message extension for
 handling not found resources

---
 .../services/impl/ResourceBundleHelper.java   | 97 +++++++++++++++++--
 .../ResourceBundleTranslationProvider.java    | 20 +++-
 2 files changed, 106 insertions(+), 11 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
index fb3f017eb2..2201ab5da6 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
@@ -21,6 +21,7 @@
 import java.security.PrivilegedExceptionAction;
 import java.util.List;
 import java.util.Locale;
+import java.util.MissingResourceException;
 import java.util.PropertyResourceBundle;
 import java.util.ResourceBundle;
 import java.util.ResourceBundle.Control;
@@ -208,18 +209,33 @@ public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale lo
         	//there is a equinox.root.locale configured that matches the specified locale 
         	//so the special search order is used
         	//to achieve this we first search without a fallback to the default locale
-        	resourceBundle = ResourceBundle.getBundle(baseName, locale, loader,
-                    ResourceBundle.Control.getNoFallbackControl(Control.FORMAT_DEFAULT));
+        	try {
+        		resourceBundle = ResourceBundle.getBundle(baseName, locale, loader,
+        				ResourceBundle.Control.getNoFallbackControl(Control.FORMAT_DEFAULT));
+        	}
+        	catch (MissingResourceException e) {
+        		//do nothing
+        	}
         	//if there is no ResourceBundle found for that path, we will now search for the default locale ResourceBundle
         	if (resourceBundle == null) {
-            	resourceBundle = ResourceBundle.getBundle(baseName, Locale.getDefault(), loader,
-                        ResourceBundle.Control.getNoFallbackControl(Control.FORMAT_DEFAULT));
+        		try {
+        			resourceBundle = ResourceBundle.getBundle(baseName, Locale.getDefault(), loader,
+        					ResourceBundle.Control.getNoFallbackControl(Control.FORMAT_DEFAULT));
+        		}
+            	catch (MissingResourceException e) {
+            		//do nothing
+            	}
         	}
         }
         else {
         	//there is either no equinox.root.locale configured or it does not match the specified locale
         	// -> use the default search order
-        	resourceBundle = ResourceBundle.getBundle(baseName, locale, loader);
+        	try {
+        		resourceBundle = ResourceBundle.getBundle(baseName, locale, loader);
+        	}
+        	catch (MissingResourceException e) {
+        		//do nothing
+        	}
         }
 
         return resourceBundle;
@@ -227,7 +243,8 @@ public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale lo
 	
 	/**
 	 * This method searches for the {@link ResourceBundle} in a modified way by inspecting the configuration option 
-	 * <code>equinox.root.locale</code>. 
+	 * <code>equinox.root.locale</code>. It uses the {@link BundleResourceBundleControl} to load the resources out
+	 * of a {@link Bundle}.
 	 * <p><b>Note: This method will only search for ResourceBundles based on properties files.</b></p>
 	 * <p>
 	 * If the value for this system property is set to an empty String the default search order for ResourceBundles is used:
@@ -267,6 +284,53 @@ public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale lo
 	 * @see ResourceBundle#getBundle(String, Locale, Control)
 	 */
 	public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale locale, Bundle bundle) {
+		return getEquinoxResourceBundle(baseName, locale, 
+				new BundleResourceBundleControl(bundle, true), new BundleResourceBundleControl(bundle, false));
+	}
+
+	/**
+	 * This method searches for the {@link ResourceBundle} in a modified way by inspecting the configuration option 
+	 * <code>equinox.root.locale</code>.
+	 * <p><b>Note: This method will only search for ResourceBundles based on properties files.</b></p>
+	 * <p>
+	 * If the value for this system property is set to an empty String the default search order for ResourceBundles is used:
+	 * <ul>
+	 * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
+	 * <li>bn + Ls + "_" + Cs</li>
+	 * <li>bn + Ls</li>
+	 * <li>bn + Ld + "_" + Cd + "_" + Vd</li>
+	 * <li>bn + Ld + "_" + Cd</li>
+	 * <li>bn + Ld</li>
+	 * <li>bn</li>
+	 * </ul>
+	 * Where bn is this bundle's localization basename, Ls, Cs and Vs are the specified locale (language, country, variant) and 
+	 * Ld, Cd and Vd are the default locale (language, country, variant).
+	 * </p>
+	 * <p>
+	 * If Ls equals the value of <code>equinox.root.locale</code> then the following search order is used:
+	 * <ul>
+	 * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
+	 * <li>bn + Ls + "_" + Cs</li>
+	 * <li>bn + Ls</li>
+	 * <li>bn</li>
+	 * <li>bn + Ld + "_" + Cd + "_" + Vd</li>
+	 * <li>bn + Ld + "_" + Cd</li>
+	 * <li>bn + Ld</li>
+	 * <li>bn</li>
+	 * </ul>
+	 * </p>
+	 * If <code>equinox.root.locale=en</code> and en_XX or en is asked for then this allows the root file to be used instead of 
+	 * falling back to the default locale.
+	 * 
+     * @param baseName the base name of the resource bundle, a fully qualified class name
+     * @param locale the locale for which a resource bundle is desired
+	 * @param withFallback The {@link Control} that uses the default locale fallback on searching for resource bundles.
+	 * @param withoutFallback The {@link Control} that doesn't use the default locale fallback on searching for resource bundles.
+     * @return a resource bundle for the given base name and locale
+	 * 
+	 * @see ResourceBundle#getBundle(String, Locale, Control)
+	 */
+	public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale locale, Control withFallback, Control withoutFallback) {
 		ResourceBundle resourceBundle = null;
 		
 		String equinoxLocale = getEquinoxRootLocale();
@@ -276,16 +340,31 @@ public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale lo
         	//there is a equinox.root.locale configured that matches the specified locale 
         	//so the special search order is used
         	//to achieve this we first search without a fallback to the default locale
-        	resourceBundle = ResourceBundle.getBundle(baseName, locale, new BundleResourceBundleControl(bundle, false));
+        	try {
+        		resourceBundle = ResourceBundle.getBundle(baseName, locale, withoutFallback);
+        	}
+        	catch (MissingResourceException e) {
+        		//do nothing
+        	}
         	//if there is no ResourceBundle found for that path, we will now search for the default locale ResourceBundle
         	if (resourceBundle == null) {
-            	resourceBundle = ResourceBundle.getBundle(baseName, Locale.getDefault(), new BundleResourceBundleControl(bundle, false));
+        		try {
+        			resourceBundle = ResourceBundle.getBundle(baseName, Locale.getDefault(), withoutFallback);
+        		}
+            	catch (MissingResourceException e) {
+            		//do nothing
+            	}
         	}
         }
         else {
         	//there is either no equinox.root.locale configured or it does not match the specified locale
         	// -> use the default search order
-        	resourceBundle = ResourceBundle.getBundle(baseName, locale, new BundleResourceBundleControl(bundle, true));
+        	try {
+        		resourceBundle = ResourceBundle.getBundle(baseName, locale, withFallback);
+        	}
+        	catch (MissingResourceException e) {
+        		//do nothing
+        	}
         }
 		
 		return resourceBundle;
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
index 163087b05c..6cd9fd8885 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
@@ -33,7 +33,7 @@ public class ResourceBundleTranslationProvider {
 	 * 			modified by prefixing and suffixing it with "!" when calling translate(String).
 	 */
 	public ResourceBundleTranslationProvider(ResourceBundle resourceBundle) {
-		this.resourceBundle = resourceBundle;
+		this.setResourceBundle(resourceBundle);
 	}
 
 	/**
@@ -57,7 +57,9 @@ public String translate(String key) {
 			if (this.resourceBundle == null) {
 				result = "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$
 			}
-			result = resourceBundle.getString(key);
+			else {
+				result = this.resourceBundle.getString(key);
+			}
 		} catch (MissingResourceException e) {
 			if (key.contains("_")) { //$NON-NLS-1$
 				result = translate(key.replace('_', '.'));
@@ -67,4 +69,18 @@ public String translate(String key) {
 		}
 		return result;
 	}
+
+	/**
+	 * @return The {@link ResourceBundle} that is used for translations.
+	 */
+	public ResourceBundle getResourceBundle() {
+		return resourceBundle;
+	}
+
+	/**
+	 * @param resourceBundle The {@link ResourceBundle} to use for translations.
+	 */
+	public void setResourceBundle(ResourceBundle resourceBundle) {
+		this.resourceBundle = resourceBundle;
+	}
 }

From 752aa109e96944fa0f0ae8505a2c4a925ce79dea Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Thu, 18 Apr 2013 14:34:07 +0200
Subject: [PATCH 0594/1286] Bug 405975 - Compile failures in
 org.eclipse.e4.tools.services

---
 bundles/org.eclipse.e4.tools.services/.classpath           | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                   | 7 +++----
 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.services/.classpath b/bundles/org.eclipse.e4.tools.services/.classpath
index 64c5e31b7a..ad32c83a78 100644
--- a/bundles/org.eclipse.e4.tools.services/.classpath
+++ b/bundles/org.eclipse.e4.tools.services/.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/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
index 199694e6da..c537b63063 100644
--- a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Wed Jun 02 16:01:21 CEST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+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/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index f0ce943793..4d07898ac1 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
 Bundle-Version: 0.12.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.e4.tools.services,
  org.eclipse.e4.tools.services.impl;x-friends:="org.eclipse.e4.tools.emf.ui"
 Bundle-Vendor: %Bundle-Vendor

From 242ca29ec4d109855d0bfda6853016ac945d8843 Mon Sep 17 00:00:00 2001
From: Dirk Fauth <dirk.fauth@googlemail.com>
Date: Fri, 17 May 2013 15:31:00 +0200
Subject: [PATCH 0595/1286] Bug 405936 - Update ProjectOSGiTranslationProvider
 to use the new message extensions

---
 .../component/AbstractComponentEditor.java    |  17 +-
 .../emf/ui/internal/common/ModelEditor.java   |   7 +-
 .../common/component/ControlFactory.java      |  12 +-
 .../ProjectOSGiTranslationProvider.java       | 287 +++++++++++++-----
 4 files changed, 233 insertions(+), 90 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 191b2ad6c6..830dde3943 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -13,7 +13,6 @@
 import java.util.Collections;
 import java.util.List;
 import javax.inject.Inject;
-import javax.inject.Named;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.di.annotations.Optional;
@@ -26,7 +25,7 @@
 import org.eclipse.e4.tools.services.IClipboardService.Handler;
 import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.tools.services.Translation;
-import org.eclipse.e4.tools.services.impl.AbstractTranslationProvider;
+import org.eclipse.e4.tools.services.impl.ResourceBundleTranslationProvider;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -74,10 +73,6 @@ public abstract class AbstractComponentEditor {
 	@Optional
 	private ProjectOSGiTranslationProvider translationProvider;
 
-	@Inject
-	@Named(TranslationService.LOCALE)
-	private String locale;
-
 	private Composite editorControl;
 
 	public EditingDomain getEditingDomain() {
@@ -134,9 +129,9 @@ public List<Action> getActions(Object element) {
 	}
 
 	/**
-	 * Translates an input <code>string</code> using the current
-	 * {@link AbstractTranslationProvider} and <code>locale</code> from the
-	 * {@link TranslationService}.
+	 * Translates an input <code>String</code> using the current
+	 * {@link ResourceBundleTranslationProvider} and <code>locale</code> from
+	 * the {@link TranslationService}.
 	 * 
 	 * @param string
 	 *            the string to translate, may not be null.
@@ -144,7 +139,7 @@ public List<Action> getActions(Object element) {
 	 *         translated.
 	 */
 	public String translate(String string) {
-		return ControlFactory.tr(translationProvider, locale, string);
+		return ControlFactory.tr(translationProvider, string);
 	}
 
 	/**
@@ -157,7 +152,7 @@ public List<Action> getActionsImport(Object element) {
 	}
 
 	protected String getLocalizedLabel(MUILabel element) {
-		return ControlFactory.getLocalizedLabel(translationProvider, element, locale);
+		return ControlFactory.getLocalizedLabel(translationProvider, element);
 	}
 
 	private boolean isFocusChild(Control control) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index cd285a8748..35b417a15c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -45,6 +45,7 @@
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.Preference;
 import org.eclipse.e4.core.services.contributions.IContributionFactory;
+import org.eclipse.e4.core.services.translation.TranslationService;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.IEditorDescriptor;
@@ -328,10 +329,10 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 		this.context.set(ModelEditor.class, this);
 		this.obsManager = new ObservablesManager();
 		if (project != null) {
-			ProjectOSGiTranslationProvider translationProvider = new ProjectOSGiTranslationProvider(project) {
+			ProjectOSGiTranslationProvider translationProvider = new ProjectOSGiTranslationProvider(project, (String) this.context.get(TranslationService.LOCALE)) {
 				@Override
-				protected void clearCache() {
-					super.clearCache();
+				protected void updateResourceBundle() {
+					super.updateResourceBundle();
 					viewer.getControl().getDisplay().asyncExec(new Runnable() {
 
 						public void run() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 905fa66c49..fd76e8b318 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -814,11 +814,11 @@ public static void createCheckBox(Composite parent, String label, String tooltip
 
 	}
 
-	public static String getLocalizedLabel(ProjectOSGiTranslationProvider translationProvider, MUILabel element, String locale) {
-		return getLocalizedValue(translationProvider, (MApplicationElement) element, UiPackageImpl.Literals.UI_LABEL__LABEL, UiPackageImpl.Literals.UI_LABEL___GET_LOCALIZED_LABEL, locale);
+	public static String getLocalizedLabel(ProjectOSGiTranslationProvider translationProvider, MUILabel element) {
+		return getLocalizedValue(translationProvider, (MApplicationElement) element, UiPackageImpl.Literals.UI_LABEL__LABEL, UiPackageImpl.Literals.UI_LABEL___GET_LOCALIZED_LABEL);
 	}
 
-	public static String getLocalizedValue(ProjectOSGiTranslationProvider translationProvider, MApplicationElement element, EStructuralFeature feature, EOperation operation, String locale) {
+	public static String getLocalizedValue(ProjectOSGiTranslationProvider translationProvider, MApplicationElement element, EStructuralFeature feature, EOperation operation) {
 		EObject eo = (EObject) element;
 		if (translationProvider == null) {
 			try {
@@ -834,16 +834,16 @@ public static String getLocalizedValue(ProjectOSGiTranslationProvider translatio
 
 		String value = (String) eo.eGet(feature);
 		if (value != null && value.trim().length() > 0) {
-			return tr(translationProvider, locale, value);
+			return tr(translationProvider, value);
 		}
 		return null;
 
 	}
 
-	public static String tr(ProjectOSGiTranslationProvider translationProvider, String locale, String label) {
+	public static String tr(ProjectOSGiTranslationProvider translationProvider, String label) {
 		if (label.startsWith("%") && translationProvider != null) { //$NON-NLS-1$
 			String key = label.substring(1);
-			String translation = translationProvider.translate(locale, key);
+			String translation = translationProvider.translate(key);
 			return translation == key ? label : translation;
 		}
 		return label;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
index 436711cd26..016d28bab2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
@@ -1,21 +1,19 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.properties;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import java.util.List;
+import java.util.Locale;
+import java.util.PropertyResourceBundle;
+import java.util.ResourceBundle;
+import java.util.ResourceBundle.Control;
+import javax.inject.Inject;
+import javax.inject.Named;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResourceChangeEvent;
@@ -24,18 +22,46 @@
 import org.eclipse.core.resources.IResourceDeltaVisitor;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.e4.tools.services.impl.AbstractTranslationProvider;
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.core.services.translation.TranslationService;
+import org.eclipse.e4.tools.services.impl.ResourceBundleHelper;
+import org.eclipse.e4.tools.services.impl.ResourceBundleTranslationProvider;
+import org.osgi.framework.Constants;
 
-public abstract class ProjectOSGiTranslationProvider extends AbstractTranslationProvider {
+public class ProjectOSGiTranslationProvider extends ResourceBundleTranslationProvider {
+
+	public static final String META_INF_DIRECTORY_NAME = "META-INF"; //$NON-NLS-1$
+	public static final String MANIFEST_DEFAULT_PATH = "META-INF/MANIFEST.MF"; //$NON-NLS-1$
+
+	/**
+	 * The {@link IProject} this translation provider is connected to
+	 */
 	private IProject project;
-	private List<String> observedFiles = new ArrayList<String>();
-	private IResourceChangeListener listener;
+	/**
+	 * The manifest header identifying the base name of the bundle's
+	 * localization entries.
+	 */
 	private String basename;
+	/**
+	 * The Locale to use for translations.
+	 */
+	private Locale locale;
+
+	/**
+	 * @param project
+	 *            The {@link IProject} this translation provider should be
+	 *            connected to.
+	 * @param locale
+	 *            The initial {@link Locale} for which this translation provider
+	 *            should be created.
+	 */
+	public ProjectOSGiTranslationProvider(IProject project, String locale) {
+		// create the translation provider with no initial ResourceBundle as we
+		// need to calculate it first
+		super(null);
 
-	public ProjectOSGiTranslationProvider(IProject project) {
-		super();
 		this.project = project;
-		this.listener = new IResourceChangeListener() {
+		this.project.getWorkspace().addResourceChangeListener(new IResourceChangeListener() {
 
 			public void resourceChanged(IResourceChangeEvent event) {
 				if (event.getType() == IResourceChangeEvent.POST_CHANGE) {
@@ -52,59 +78,92 @@ public boolean visit(IResourceDelta delta) throws CoreException {
 					}
 				}
 			}
-		};
-		this.project.getWorkspace().addResourceChangeListener(listener);
-		IFile f = this.project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
+		});
+		setLocale(locale, false);
+
+		IFile f = this.project.getFile(MANIFEST_DEFAULT_PATH);
 		if (f.exists()) {
 			handleManifestChange(f);
 		} else {
-			basename = "OSGI-INF/l10n/bundle"; //$NON-NLS-1$
+			basename = Constants.BUNDLE_LOCALIZATION_DEFAULT_BASENAME;
 		}
 	}
 
-	boolean visit(IResourceDelta delta) throws CoreException {
+	@Inject
+	void setLocale(@Named(TranslationService.LOCALE) String locale, @Optional Boolean performUpdate) {
+		try {
+			this.locale = locale == null ? Locale.getDefault() : ResourceBundleHelper.toLocale(locale);
+		} catch (Exception e) {
+			this.locale = Locale.getDefault();
+		}
+
+		if (performUpdate == null || performUpdate)
+			updateResourceBundle();
+	}
+
+	/**
+	 * 
+	 * @param delta
+	 *            The resource delta that represents the changes in the state of
+	 *            a resource tree between two discrete points in time.
+	 * @return <code>true</code> if the resource delta's children should be
+	 *         visited; <code>false</code> if they should be skipped.
+	 */
+	boolean visit(IResourceDelta delta) {
 		if (delta.getResource() instanceof IWorkspaceRoot) {
 			return true;
-		} else if (delta.getResource().equals(project)) {
+		} else if (delta.getResource().equals(this.project)) {
 			return true;
-		} else if (delta.getResource().getProjectRelativePath().toString().equals("META-INF")) { //$NON-NLS-1$
+		} else if (delta.getResource().getProjectRelativePath().toString().equals(META_INF_DIRECTORY_NAME)) {
 			return true;
-		} else if (delta.getResource().getProjectRelativePath().toString().equals("META-INF/MANIFEST.MF")) { //$NON-NLS-1$
+		} else if (delta.getResource().getProjectRelativePath().toString().equals(MANIFEST_DEFAULT_PATH)) {
 			handleManifestChange((IFile) delta.getResource());
 			return false;
-		}
-
-		for (String o : observedFiles) {
-			if (delta.getResource().getProjectRelativePath().toString().equals(o)) {
-				clearCache();
+		} else if (delta.getResource() instanceof IFile) {
+			String filename = ((IFile) delta.getResource()).getName();
+			// extract base bundle name out of local basename
+			String fileBaseName = this.basename.substring(this.basename.lastIndexOf("/") + 1, this.basename.length()); //$NON-NLS-1$
+			if (filename.startsWith(fileBaseName)) {
+				updateResourceBundle();
 				return false;
 			}
+		}
 
-			String[] p = o.split("/"); //$NON-NLS-1$
-			int i = 0;
-			String path = ""; //$NON-NLS-1$
-			do {
-				path += p[i];
-				if (delta.getResource().getProjectRelativePath().toString().equals(path)) {
-					return true;
-				}
-				path += "/"; //$NON-NLS-1$
-			} while (++i < p.length);
+		if (delta.getResource().getProjectRelativePath().toString().equals(this.basename)) {
+			updateResourceBundle();
+			return false;
 		}
 
+		String[] p = this.basename.split("/"); //$NON-NLS-1$
+		int i = 0;
+		String path = ""; //$NON-NLS-1$
+		do {
+			path += p[i];
+			if (delta.getResource().getProjectRelativePath().toString().equals(path)) {
+				return true;
+			}
+			path += "/"; //$NON-NLS-1$
+		} while (++i < p.length);
+
 		return false;
 	}
 
+	/**
+	 * Will check if the manifest header identifying the base name of the
+	 * bundle's localization entries has changed and if so it will update the
+	 * underlying {@link ResourceBundle} and clear the caches.
+	 * 
+	 * @param file
+	 *            The reference to the manifest file of the current project.
+	 */
 	private void handleManifestChange(IFile file) {
 		try {
 			String newValue = extractBasenameFromManifest(file);
 
 			if (!newValue.equals(basename)) {
+				basename = newValue;
 				if (basename != null) {
-					basename = newValue;
-					clearCache();
-				} else {
-					basename = newValue;
+					updateResourceBundle();
 				}
 			}
 
@@ -117,14 +176,29 @@ private void handleManifestChange(IFile file) {
 		}
 	}
 
+	/**
+	 * Extracts the manifest header identifying the base name of the bundle's
+	 * localization entries.
+	 * 
+	 * @param file
+	 *            The reference to the manifest file of the current project.
+	 * @return The manifest header identifying the base name of the bundle's
+	 *         localization entries.
+	 * @throws CoreException
+	 *             If loading the contents of the given {@link IFile} fails
+	 * @throws IOException
+	 *             If reading out of the given file fails.
+	 * 
+	 * @see IFile#getContents()
+	 */
 	public static String extractBasenameFromManifest(IFile file) throws CoreException, IOException {
 		InputStream in = file.getContents();
 		BufferedReader r = new BufferedReader(new InputStreamReader(in));
 		String line;
-		String newValue = "OSGI-INF/l10n/bundle"; //$NON-NLS-1$
+		String newValue = Constants.BUNDLE_LOCALIZATION_DEFAULT_BASENAME;
 		while ((line = r.readLine()) != null) {
-			if (line.startsWith("Bundle-Localization:")) { //$NON-NLS-1$
-				newValue = line.substring("Bundle-Localization:".length()).trim(); //$NON-NLS-1$
+			if (line.startsWith(Constants.BUNDLE_LOCALIZATION)) {
+				newValue = line.substring(Constants.BUNDLE_LOCALIZATION.length() + 1).trim();
 				break;
 			}
 		}
@@ -133,33 +207,106 @@ public static String extractBasenameFromManifest(IFile file) throws CoreExceptio
 		return newValue;
 	}
 
-	@Override
-	protected InputStream getResourceAsStream(String name) {
-		IFile f = project.getFile(name);
-		observedFiles.add(name);
-		try {
-			if (f.exists()) {
-				return f.getContents();
+	/**
+	 * Reloads the underlying ResourceBundle.
+	 */
+	protected void updateResourceBundle() {
+		setResourceBundle(ResourceBundleHelper.getEquinoxResourceBundle(this.basename, this.locale, new ProjectResourceBundleControl(true), new ProjectResourceBundleControl(false)));
+	}
+
+	/**
+	 * Specialization of {@link Control} which loads the {@link ResourceBundle}
+	 * by using file structures of a project instead of using a classloader.
+	 * 
+	 * @author Dirk Fauth
+	 */
+	class ProjectResourceBundleControl extends ResourceBundle.Control {
+
+		/**
+		 * Flag to determine whether the default locale should be used as
+		 * fallback locale in case there is no {@link ResourceBundle} found for
+		 * the specified locale.
+		 */
+		private final boolean useFallback;
+
+		/**
+		 * @param useFallback
+		 *            <code>true</code> if the default locale should be used as
+		 *            fallback locale in the search path or <code>false</code>
+		 *            if there should be no fallback.
+		 */
+		ProjectResourceBundleControl(boolean useFallback) {
+			this.useFallback = useFallback;
+		}
+
+		@Override
+		public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader, boolean reload) throws IllegalAccessException, InstantiationException, IOException {
+
+			String bundleName = toBundleName(baseName, locale);
+			ResourceBundle bundle = null;
+			if (format.equals("java.properties")) { //$NON-NLS-1$
+				final String resourceName = toResourceName(bundleName, "properties"); //$NON-NLS-1$
+				InputStream stream = null;
+				try {
+					stream = AccessController.doPrivileged(new PrivilegedExceptionAction<InputStream>() {
+						public InputStream run() throws IOException {
+							return getResourceAsStream(resourceName);
+						}
+					});
+				} catch (PrivilegedActionException e) {
+					throw (IOException) e.getException();
+				}
+				if (stream != null) {
+					try {
+						bundle = new PropertyResourceBundle(stream);
+					} finally {
+						stream.close();
+					}
+				}
 			} else {
-				return null;
+				throw new IllegalArgumentException("unknown format: " + format); //$NON-NLS-1$
 			}
-		} catch (CoreException e) {
-			return null;
+			return bundle;
 		}
-	}
 
-	@Override
-	protected void clearCache() {
-		super.clearCache();
-		observedFiles.clear();
-	}
+		/**
+		 * Loads the properties file by using the {@link IProject} of the
+		 * {@link ProjectOSGiTranslationProvider}.
+		 * 
+		 * @param name
+		 * @return The {@link InputStream} to the properties file to load
+		 */
+		protected InputStream getResourceAsStream(String name) {
+			IFile f = project.getFile(name);
+			try {
+				if (f.exists()) {
+					return f.getContents();
+				} else {
+					return null;
+				}
+			} catch (CoreException e) {
+				return null;
+			}
+		}
 
-	@Override
-	protected String getBasename() {
-		return basename;
-	}
+		@Override
+		public List<String> getFormats(String baseName) {
+			return FORMAT_PROPERTIES;
+		}
 
-	public void dispose() {
+		@Override
+		public Locale getFallbackLocale(String baseName, Locale locale) {
+			return this.useFallback ? super.getFallbackLocale(baseName, locale) : null;
+		}
 
+		// this implementation simply doesn't cache the values in the
+		// ResourceBundle. If we recognize performance issues in the
+		// Application Model Editor because of this we should consider
+		// returning 0 here and overriding needsReload() with the information
+		// which bundle needs to be reloaded
+		@Override
+		public long getTimeToLive(String baseName, Locale locale) {
+			return TTL_DONT_CACHE;
+		}
 	}
-}
\ No newline at end of file
+}

From 10fd6237a3b33c13280353228b9a0886893d50c1 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Fri, 17 May 2013 15:34:18 +0200
Subject: [PATCH 0596/1286] fixed NPE introduced

---
 .../e4/tools/emf/ui/internal/common/ModelEditor.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 35b417a15c..dc1a1d92bf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -333,12 +333,14 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 				@Override
 				protected void updateResourceBundle() {
 					super.updateResourceBundle();
-					viewer.getControl().getDisplay().asyncExec(new Runnable() {
+					if (viewer != null) {
+						viewer.getControl().getDisplay().asyncExec(new Runnable() {
 
-						public void run() {
-							viewer.refresh();
-						}
-					});
+							public void run() {
+								viewer.refresh();
+							}
+						});
+					}
 				}
 			};
 			context.set(ProjectOSGiTranslationProvider.class, translationProvider);

From aea557a246ffa8d45db46e8bebd68dfe755310b1 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Fri, 17 May 2013 15:37:45 +0200
Subject: [PATCH 0597/1286] Bug 405936 - Update ProjectOSGiTranslationProvider
 to use the new message extensions

---
 .../impl/AbstractTranslationProvider.java     | 226 ------------------
 .../PropertiesBundleTranslationProvider.java  |  65 -----
 2 files changed, 291 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/AbstractTranslationProvider.java
 delete mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/PropertiesBundleTranslationProvider.java

diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/AbstractTranslationProvider.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/AbstractTranslationProvider.java
deleted file mode 100644
index 20d0deb776..0000000000
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/AbstractTranslationProvider.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.services.impl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.PropertyResourceBundle;
-import java.util.ResourceBundle;
-
-import org.eclipse.osgi.service.localization.BundleLocalization;
-
-/**
- * The lookup of the translation the same than the one in {@link BundleLocalization} which is based
- * upon the value found in equinox.root.locale which defaults to "en":
- * <ul>
- * <li>If set to empty string then the search order for:
- * <ul>
- * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
- * <li>bn + Ls + "_" + Cs</li>
- * <li>bn + Ls</li>
- * <li>bn + Ld + "_" + Cd + "_" + Vd</li>
- * <li>bn + Ld + "_" + Cd</li>
- * <li>bn + Ld</li>
- * </ul>
- * </li>
- * <li>If Ls equals the value of equinox.root.locale then the following search order is used:
- * <ul>
- * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
- * <li>bn + Ls + "_" + Cs</li>
- * <li>bn + Ls</li>
- * <li>bn + Ld + "_" + Cd + "_" + Vd</li>
- * <li>bn + Ld + "_" + Cd</li>
- * <li>bn + Ld</li>
- * </ul>
- * </li>
- * </ul>
- * Where bn is this bundle's localization basename, Ls, Cs and Vs are the specified locale
- * (language, country, variant) and Ld, Cd and Vd are the default locale (language, country,
- * variant).
- */
-public abstract class AbstractTranslationProvider {
-	final static String DEFAULT_ROOT = getEquinoxRootLocale();
-
-	private final Hashtable<String, BundleResourceBundle> cache = new Hashtable<String, BundleResourceBundle>(
-			5);
-
-	private static String getEquinoxRootLocale() {
-		// Logic from FrameworkProperties.getProperty("equinox.root.locale", "en")
-		String root = System.getProperties().getProperty("equinox.root.locale");
-		if (root == null) {
-			root = "en";
-		}
-		return root;
-	}
-	
-	protected abstract InputStream getResourceAsStream(String name);
-	protected abstract String getBasename();
-
-	public String translate(String locale, String key) {
-		String defaultLocale = Locale.getDefault().toString();
-		String localeString = locale;
-		ResourceBundle bundle = getResourceBundle(locale.toString(),
-				defaultLocale.equals(localeString));
-		try {
-			if( bundle == null ) {
-				return key;
-			}
-			return bundle.getString(key);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return key;
-		}
-
-	}
-
-	private ResourceBundle getResourceBundle(String localeString, boolean isDefaultLocale) {
-		BundleResourceBundle resourceBundle = lookupResourceBundle(localeString);
-		if (isDefaultLocale)
-			return (ResourceBundle) resourceBundle;
-		// need to determine if this is resource bundle is an empty stem
-		// if it is then the default locale should be used
-		if (resourceBundle == null || resourceBundle.isStemEmpty())
-			return (ResourceBundle) lookupResourceBundle(Locale.getDefault().toString());
-		return (ResourceBundle) resourceBundle;
-	}
-
-	private interface BundleResourceBundle {
-		void setParent(ResourceBundle parent);
-
-		boolean isEmpty();
-
-		boolean isStemEmpty();
-	}
-
-	private BundleResourceBundle lookupResourceBundle(String localeString) {
-		// get the localization header as late as possible to avoid accessing the raw headers
-		// getting the first value from the raw headers forces the manifest to be parsed (bug
-		// 332039)
-		String localizationHeader = getBasename();
-		synchronized (cache) {
-			BundleResourceBundle result = cache.get(localeString);
-			if (result != null)
-				return result.isEmpty() ? null : result;
-			String[] nlVarients = buildNLVariants(localeString);
-			BundleResourceBundle parent = null;
-
-			for (int i = nlVarients.length - 1; i >= 0; i--) {
-				BundleResourceBundle varientBundle = null;
-				InputStream resourceStream = getResourceAsStream(localizationHeader
-						+ (nlVarients[i].equals("") ? nlVarients[i] : '_' + nlVarients[i])
-						+ ".properties");
-
-				if (resourceStream == null) {
-					varientBundle = cache.get(nlVarients[i]);
-				} else {
-					try {
-						varientBundle = new LocalizationResourceBundle(resourceStream);
-					} catch (IOException e) {
-						// ignore and continue
-					} finally {
-						if (resourceStream != null) {
-							try {
-								resourceStream.close();
-							} catch (IOException e3) {
-								// Ignore exception
-							}
-						}
-					}
-				}
-
-				if (varientBundle == null) {
-					varientBundle = new EmptyResouceBundle(nlVarients[i]);
-				}
-				if (parent != null)
-					varientBundle.setParent((ResourceBundle) parent);
-				cache.put(nlVarients[i], varientBundle);
-				parent = varientBundle;
-			}
-			result = cache.get(localeString);
-			return result.isEmpty() ? null : result;
-		}
-	}
-
-	private String[] buildNLVariants(String nl) {
-		List<String> result = new ArrayList<String>();
-		while (nl.length() > 0) {
-			result.add(nl);
-			int i = nl.lastIndexOf('_');
-			nl = (i < 0) ? "" : nl.substring(0, i); //$NON-NLS-1$
-		}
-		result.add(""); //$NON-NLS-1$
-		return result.toArray(new String[result.size()]);
-	}
-
-	private class LocalizationResourceBundle extends PropertyResourceBundle implements
-			BundleResourceBundle {
-		public LocalizationResourceBundle(InputStream in) throws IOException {
-			super(in);
-		}
-
-		public void setParent(ResourceBundle parent) {
-			super.setParent(parent);
-		}
-
-		public boolean isEmpty() {
-			return false;
-		}
-
-		public boolean isStemEmpty() {
-			return parent == null;
-		}
-	}
-
-	class EmptyResouceBundle extends ResourceBundle implements BundleResourceBundle {
-		private final String localeString;
-
-		public EmptyResouceBundle(String locale) {
-			super();
-			this.localeString = locale;
-		}
-
-		public Enumeration<String> getKeys() {
-			return null;
-		}
-
-		protected Object handleGetObject(String arg0) throws MissingResourceException {
-			return null;
-		}
-
-		public void setParent(ResourceBundle parent) {
-			super.setParent(parent);
-		}
-
-		public boolean isEmpty() {
-			if (parent == null)
-				return true;
-			return ((BundleResourceBundle) parent).isEmpty();
-		}
-
-		public boolean isStemEmpty() {
-			if (DEFAULT_ROOT.equals(localeString))
-				return false;
-			if (parent == null)
-				return true;
-			return ((BundleResourceBundle) parent).isStemEmpty();
-		}
-	}
-	
-	protected void clearCache() {
-		cache.clear();
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/PropertiesBundleTranslationProvider.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/PropertiesBundleTranslationProvider.java
deleted file mode 100644
index 55242b699b..0000000000
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/PropertiesBundleTranslationProvider.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.services.impl;
-
-import java.io.InputStream;
-
-import org.eclipse.osgi.service.localization.BundleLocalization;
-
-/**
- * The lookup of the translation the same than the one in {@link BundleLocalization} which is based
- * upon the value found in equinox.root.locale which defaults to "en":
- * <ul>
- * <li>If set to empty string then the search order for:
- * <ul>
- * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
- * <li>bn + Ls + "_" + Cs</li>
- * <li>bn + Ls</li>
- * <li>bn + Ld + "_" + Cd + "_" + Vd</li>
- * <li>bn + Ld + "_" + Cd</li>
- * <li>bn + Ld</li>
- * </ul>
- * </li>
- * <li>If Ls equals the value of equinox.root.locale then the following search order is used:
- * <ul>
- * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
- * <li>bn + Ls + "_" + Cs</li>
- * <li>bn + Ls</li>
- * <li>bn + Ld + "_" + Cd + "_" + Vd</li>
- * <li>bn + Ld + "_" + Cd</li>
- * <li>bn + Ld</li>
- * </ul>
- * </li>
- * </ul>
- * Where bn is this bundle's localization basename, Ls, Cs and Vs are the specified locale
- * (language, country, variant) and Ld, Cd and Vd are the default locale (language, country,
- * variant).
- */
-public class PropertiesBundleTranslationProvider extends AbstractTranslationProvider {
-	private ClassLoader loader;
-	private String basename;
-	
-	public PropertiesBundleTranslationProvider(ClassLoader loader, String baseName) {
-		super();
-		this.basename = baseName;
-		this.loader = loader;
-	}
-
-	@Override
-	protected InputStream getResourceAsStream(String name) {
-		return loader.getResourceAsStream(name);
-	}
-	
-	@Override
-	protected String getBasename() {
-		return basename;
-	}
-}
\ No newline at end of file

From 492a0c10370116398daaddffaa9fa5fe283c7875 Mon Sep 17 00:00:00 2001
From: Dirk Fauth <dirk.fauth@googlemail.com>
Date: Sat, 18 May 2013 17:41:24 +0200
Subject: [PATCH 0598/1286] Bug 406632 - Add support for Locale changes at
 runtime

---
 .../services/IMessageFactoryService.java      |  26 ++-
 .../impl/MessageFactoryServiceImpl.java       |  66 +++++---
 .../impl/TranslationObjectSupplier.java       | 152 ++++++++++++++++--
 3 files changed, 205 insertions(+), 39 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java
index b5512df783..b93d9b2cad 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java
@@ -1,8 +1,32 @@
 package org.eclipse.e4.tools.services;
 
+import java.util.Locale;
+import java.util.ResourceBundle;
+
 import org.eclipse.osgi.service.localization.BundleLocalization;
 
+/**
+ * Service that is responsible for creating and managing message class instances.
+ */
 public interface IMessageFactoryService {
-	public <M> M createInstance(final String locale, final Class<M> messages, BundleLocalization localization)
+	
+	/**
+	 * Returns an instance of the of a given messages class for the given {@link Locale}.
+	 * If configured it caches the created instances and return the already created instances.
+	 * Otherwise a new instance will be created.
+	 * 
+	 * @param locale The {@link Locale} for which the message class instance is requested.
+	 * @param messages The type of the message class whose instance is requested.
+	 * @param localization The service that is needed to retrieve {@link ResourceBundle} objects from a bundle 
+	 * 			with a given locale.
+	 * @return An instance of the given messages class and {@link Locale}.
+	 * 
+	 * @throws InstantiationException if the requested message class represents an abstract class, an interface, 
+	 * 			an array class, a primitive type, or void; 
+	 * 			or if the class has no nullary constructor; 
+	 * 			or if the instantiation fails for some other reason.
+	 * @throws IllegalAccessException if the requested message class or its nullary constructor is not accessible.
+	 */
+	public <M> M getMessageInstance(final Locale locale, final Class<M> messages, BundleLocalization localization)
 			throws InstantiationException, IllegalAccessException;
 }
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java
index e09b23b6f1..27a234678f 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Dirk Fauth <dirk.fauth@gmail.com> - modifications to instance creation
  ******************************************************************************/
 package org.eclipse.e4.tools.services.impl;
 
@@ -28,16 +29,12 @@
 import org.eclipse.e4.tools.services.IMessageFactoryService;
 import org.eclipse.e4.tools.services.Message;
 import org.eclipse.e4.tools.services.Message.ReferenceType;
-import org.eclipse.e4.tools.services.ToolsServicesActivator;
 import org.eclipse.osgi.service.localization.BundleLocalization;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
-import org.osgi.service.log.LogService;
 
 public class MessageFactoryServiceImpl implements IMessageFactoryService {
 
-	private static LogService logService = ToolsServicesActivator.getDefault().getLogService();
-
 	// Cache so when multiple instance use the same message class
 	private Map<Object, Reference<Object>> SOFT_CACHE = Collections
 			.synchronizedMap(new HashMap<Object, Reference<Object>>());
@@ -47,7 +44,8 @@ public class MessageFactoryServiceImpl implements IMessageFactoryService {
 
 	private int CLEANUPCOUNT = 0;
 
-	public <M> M createInstance(final String locale, final Class<M> messages, final BundleLocalization localization)
+	@Override
+	public <M> M getMessageInstance(final Locale locale, final Class<M> messages, final BundleLocalization localization)
 			throws InstantiationException, IllegalAccessException {
 		String key = messages.getName() + "_" + locale; //$NON-NLS-1$
 
@@ -95,13 +93,13 @@ public <M> M createInstance(final String locale, final Class<M> messages, final
 		M instance;
 
 		if (System.getSecurityManager() == null) {
-			instance = doCreateInstance(locale, messages, annotation, localization);
+			instance = createInstance(locale, messages, annotation, localization);
 		} else {
 			instance = AccessController.doPrivileged(new PrivilegedAction<M>() {
 
 				public M run() {
 					try {
-						return doCreateInstance(locale, messages, annotation, localization);
+						return createInstance(locale, messages, annotation, localization);
 					} catch (InstantiationException e) {
 						e.printStackTrace();
 					} catch (IllegalAccessException e) {
@@ -124,24 +122,48 @@ public M run() {
 		return instance;
 	}
 
-	private static <M> M doCreateInstance(String locale, Class<M> messages,
+	/**
+	 * Creates and returns an instance of the of a given messages class for the given {@link Locale}.
+	 * The message class gets instantiated and the fields are initialized with values out of a {@link ResourceBundle}.
+	 * As there are several options to specify the location of the {@link ResourceBundle} to load, the 
+	 * following search order is used:
+	 * <ol>
+	 * <li>URI location<br/>
+	 * 		If the message class is annotated with <code>@Message</code> and the <i>contributorURI</i>
+	 * 		attribute is set, the {@link ResourceBundle} is searched at the specified location</li> 
+	 * <li>Relative location<br/>
+	 * 		If the message class is not annotated with <code>@Message</code> and a contributorURI
+	 * 		attribute value or there is no {@link ResourceBundle} found at the specified location, a 
+	 * 		{@link ResourceBundle} with the same name in the same package as the message class is searched.</li> 
+	 * <li>Bundle localization<br/>
+	 * 		If there is no {@link ResourceBundle} found by URI or relative location, the OSGi {@link ResourceBundle}
+	 * 		configured in the MANIFEST.MF is tried to load.</li> 
+	 * </ol>
+	 * Note: Even if there is no {@link ResourceBundle} found in any of the mentioned locations, this method will
+	 * 		 not break. In this case the fields of the message class will get initialized with values that look 
+	 * 		 like <code>!key!</code> to indicate that there is no translation value found for that key.
+	 * 
+	 * @param locale The {@link Locale} for which the message class instance is requested.
+	 * @param messages The type of the message class whose instance is requested.
+	 * @param annotation The annotation that is used in the message class. If specified it is needed
+	 * 			to retrieve the URI of the location to search for the {@link ResourceBundle}.
+	 * @param localization The service that is needed to retrieve {@link ResourceBundle} objects from a bundle 
+	 * 			with a given locale.
+	 * @return The created instance of the given messages class and {@link Locale}.
+	 * 
+	 * @throws InstantiationException if the requested message class represents an abstract class, an interface, 
+	 * 			an array class, a primitive type, or void; 
+	 * 			or if the class has no nullary constructor; 
+	 * 			or if the instantiation fails for some other reason.
+	 * @throws IllegalAccessException if the requested message class or its nullary constructor is not accessible.
+	 */
+	private static <M> M createInstance(Locale locale, Class<M> messages,
 			Message annotation, BundleLocalization localization) throws InstantiationException,
 			IllegalAccessException {
 
-		Locale loc = null;
-		try {
-			loc = locale == null ? Locale.getDefault() : ResourceBundleHelper.toLocale(locale);
-		}
-		catch (Exception e) {
-			//parsing the locale String to a Locale failed, so we use the default Locale
-			if (logService != null)
-				logService.log(LogService.LOG_ERROR, "Invalid locale", e); //$NON-NLS-1$
-			loc = Locale.getDefault();
-		}
-		
 		ResourceBundle resourceBundle = null;
 		if (annotation != null && annotation.contributorURI().length() > 0) {
-			resourceBundle = ResourceBundleHelper.getResourceBundleForUri(annotation.contributorURI(), loc, localization);
+			resourceBundle = ResourceBundleHelper.getResourceBundleForUri(annotation.contributorURI(), locale, localization);
 		}
 		
 		if (resourceBundle == null) {
@@ -149,7 +171,7 @@ private static <M> M doCreateInstance(String locale, Class<M> messages,
 			String baseName = messages.getName().replace('.', '/');
 			
 			try {
-				resourceBundle = ResourceBundleHelper.getEquinoxResourceBundle(baseName, loc, messages.getClassLoader());
+				resourceBundle = ResourceBundleHelper.getEquinoxResourceBundle(baseName, locale, messages.getClassLoader());
 			}
 			catch (MissingResourceException e) {
 				//do nothing as this just means there is no resource bundle named
@@ -161,7 +183,7 @@ private static <M> M doCreateInstance(String locale, Class<M> messages,
 		if (resourceBundle == null) {
 			//retrieve the OSGi resource bundle
 			Bundle bundle = FrameworkUtil.getBundle(messages);
-			resourceBundle = localization.getLocalization(bundle, locale);
+			resourceBundle = localization.getLocalization(bundle, locale.toString());
 		}
 		
 		//always create a provider, if there is no resource bundle found, simply the modified keys will
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java
index 31c06b8708..1350a0bf47 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java
@@ -7,49 +7,170 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Dirk Fauth <dirk.fauth@gmail.com> - modifications to support locale changes at runtime
  ******************************************************************************/
 package org.eclipse.e4.tools.services.impl;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.Set;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.suppliers.ExtendedObjectSupplier;
 import org.eclipse.e4.core.di.suppliers.IObjectDescriptor;
 import org.eclipse.e4.core.di.suppliers.IRequestor;
-import org.eclipse.e4.core.internal.contexts.ContextObjectSupplier;
-import org.eclipse.e4.core.internal.di.Requestor;
 import org.eclipse.e4.core.services.translation.TranslationService;
 import org.eclipse.e4.tools.services.IMessageFactoryService;
+import org.eclipse.e4.tools.services.Message;
+import org.eclipse.e4.tools.services.ToolsServicesActivator;
 import org.eclipse.osgi.service.localization.BundleLocalization;
+import org.osgi.service.log.LogService;
 
+@SuppressWarnings("rawtypes")
 public class TranslationObjectSupplier extends ExtendedObjectSupplier {
 
+	private static LogService logService = ToolsServicesActivator.getDefault().getLogService();
+
+	/**
+	 * The current active locale that gets injected for updating the message instances.
+	 */
+	private Locale locale;
+
+	/**
+	 * The service that gets {@link ResourceBundle} objects from a bundle with a given locale. 
+	 */
+	@Inject
+	private BundleLocalization localization;
+
+	/**
+	 * The service that creates instances of message classes based on the current active locale,
+	 * the {@link BundleLocalization} and the configuration used in the {@link Message} annotation.
+	 */
+	@Inject
+	private IMessageFactoryService factoryService;
+	
+	/**
+	 * Map that contains all {@link IRequestor} that requested an instance of a messages class.
+	 * Used to inform all requestor if the instances have changed due to a locale change.
+	 */
+	private Map<Class, Set<IRequestor>> listeners = new HashMap<Class, Set<IRequestor>>();
+
 	@Override
 	public Object get(IObjectDescriptor descriptor, IRequestor requestor,
 			boolean track, boolean group) {
+
 		Class<?> descriptorsClass = getDesiredClass(descriptor.getDesiredType());
 
-		Requestor req = (Requestor) requestor;
-		ContextObjectSupplier sub = (ContextObjectSupplier) req
-				.getPrimarySupplier();
-		
-		String locale = (String) sub.getContext().get(TranslationService.LOCALE);
-		locale = locale == null ? Locale.getDefault().toString() : locale;
-		BundleLocalization localization = sub.getContext().get(BundleLocalization.class);
-		IMessageFactoryService factoryService = sub.getContext().get(IMessageFactoryService.class); 
+		if (track)
+			 addListener(descriptorsClass, requestor);
+
+		return getMessageInstance(descriptorsClass);
+	}
+
+	/**
+	 * Setting the {@link Locale} by using this method will cause to create new instances for all
+	 * message classes that were requested before. It also notifys all {@link IRequestor} that requested
+	 * those messages instance which causes dynamic reinjection.
+	 * @param locale The {@link Locale} to use for creating the message instances.
+	 */
+	@Inject
+	public void setLocale(@Optional @Named(TranslationService.LOCALE) String locale) {
+		try {
+			this.locale = locale == null ? Locale.getDefault() : ResourceBundleHelper.toLocale(locale);
+		}
+		catch (IllegalArgumentException e) {
+			//parsing the locale String to a Locale failed because of invalid String, use the default locale
+			if (logService != null)
+				logService.log(LogService.LOG_ERROR, e.getMessage() + " - Default Locale will be used instead."); //$NON-NLS-1$
+			this.locale = Locale.getDefault();
+		}
+		catch (Exception e) {
+			//parsing the locale String to a Locale failed, so we use the default Locale
+			if (logService != null)
+				logService.log(LogService.LOG_ERROR, "Invalid locale", e); //$NON-NLS-1$
+			this.locale = Locale.getDefault();
+		}
 		
+		//update listener
+		updateMessages();
+	}
+
+	/**
+	 * Notify the {@link IRequestor}s of those instances that they need to update their message class instances.
+	 */
+	private void updateMessages() {
+		for (Map.Entry<Class, Set<IRequestor>> entry : this.listeners.entrySet()) {
+			notifyRequestor(entry.getValue());
+		}
+	}
+	
+	/**
+	 * Checks if for the specified descriptor class there is already an instance in the local
+	 * cache. If not a new instance is created using the local configuration on {@link Locale},
+	 * {@link BundleLocalization} and given descriptor class.
+	 * @param descriptorsClass The class for which an instance is requested.
+	 * @return The instance of the requested message class
+	 */
+	private Object getMessageInstance(Class<?> descriptorsClass) {
 		try {
-			return factoryService.createInstance(locale, descriptorsClass, localization);
+			return this.factoryService.getMessageInstance(
+					this.locale, descriptorsClass, this.localization);
 		} catch (InstantiationException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+			if (logService != null)
+				logService.log(LogService.LOG_ERROR,
+						"Instantiation of messages class failed", e); //$NON-NLS-1$
 		} catch (IllegalAccessException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+			if (logService != null)
+				logService.log(LogService.LOG_ERROR,
+						"Failed to access messages class", e); //$NON-NLS-1$
 		}
 		return null;
 	}
+	
+	/**
+	 * Remember the {@link IRequestor} that requested an instance of the given descriptor class.
+	 * This is needed to be able to inform all {@link IRequestor} if the {@link Locale} changes 
+	 * at runtime.
+	 * @param descriptorsClass The class for which an instance was requested.
+	 * @param requestor The {@link IRequestor} that requested the instance.
+	 */
+	private void addListener(Class<?> descriptorsClass, IRequestor requestor) {
+		Set<IRequestor> registered = this.listeners.get(descriptorsClass);
+		if (registered == null) {
+			registered = new HashSet<IRequestor>();
+			this.listeners.put(descriptorsClass, registered);
+		}
+		registered.add(requestor);
+	}
+
+	/**
+	 * Notify all given {@link IRequestor} about changes for their injected values.
+	 * This way the dynamic injection is performed. 
+	 * @param requestors The {@link IRequestor} to inform about the instance changes.
+	 */
+	private void notifyRequestor(Collection<IRequestor> requestors) {
+		if (requestors != null) {
+			for (Iterator<IRequestor> it = requestors.iterator(); it.hasNext();) {
+				IRequestor requestor = it.next();
+				if (!requestor.isValid()) {
+					it.remove();
+					continue;
+				}
+				requestor.resolveArguments(false);
+				requestor.execute();
+			}
+		}
+	}
 
 	private Class<?> getDesiredClass(Type desiredType) {
 		if (desiredType instanceof Class<?>)
@@ -61,5 +182,4 @@ private Class<?> getDesiredClass(Type desiredType) {
 		}
 		return null;
 	}
-
 }
\ No newline at end of file

From d053c3e4a2730e54a3f3076bf23a5e1ce5d47892 Mon Sep 17 00:00:00 2001
From: Dirk Fauth <dirk.fauth@googlemail.com>
Date: Sat, 18 May 2013 17:43:29 +0200
Subject: [PATCH 0599/1286] Bug 406645 - Add support for placeholders in
 message extension

---
 .../services/IMessageFactoryService.java      |  9 +-
 .../impl/MessageFactoryServiceImpl.java       | 96 +++++++++++++------
 .../impl/TranslationObjectSupplier.java       | 14 +--
 3 files changed, 70 insertions(+), 49 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java
index b93d9b2cad..94080225ed 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java
@@ -20,13 +20,6 @@ public interface IMessageFactoryService {
 	 * @param localization The service that is needed to retrieve {@link ResourceBundle} objects from a bundle 
 	 * 			with a given locale.
 	 * @return An instance of the given messages class and {@link Locale}.
-	 * 
-	 * @throws InstantiationException if the requested message class represents an abstract class, an interface, 
-	 * 			an array class, a primitive type, or void; 
-	 * 			or if the class has no nullary constructor; 
-	 * 			or if the instantiation fails for some other reason.
-	 * @throws IllegalAccessException if the requested message class or its nullary constructor is not accessible.
 	 */
-	public <M> M getMessageInstance(final Locale locale, final Class<M> messages, BundleLocalization localization)
-			throws InstantiationException, IllegalAccessException;
+	public <M> M getMessageInstance(final Locale locale, final Class<M> messages, BundleLocalization localization);
 }
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java
index 27a234678f..4273532fb2 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java
@@ -15,6 +15,7 @@
 import java.lang.ref.SoftReference;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.Collections;
@@ -26,15 +27,21 @@
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
+import javax.annotation.PostConstruct;
+
 import org.eclipse.e4.tools.services.IMessageFactoryService;
 import org.eclipse.e4.tools.services.Message;
 import org.eclipse.e4.tools.services.Message.ReferenceType;
+import org.eclipse.e4.tools.services.ToolsServicesActivator;
 import org.eclipse.osgi.service.localization.BundleLocalization;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
+import org.osgi.service.log.LogService;
 
 public class MessageFactoryServiceImpl implements IMessageFactoryService {
 
+	private static LogService logService = ToolsServicesActivator.getDefault().getLogService();
+
 	// Cache so when multiple instance use the same message class
 	private Map<Object, Reference<Object>> SOFT_CACHE = Collections
 			.synchronizedMap(new HashMap<Object, Reference<Object>>());
@@ -45,8 +52,7 @@ public class MessageFactoryServiceImpl implements IMessageFactoryService {
 	private int CLEANUPCOUNT = 0;
 
 	@Override
-	public <M> M getMessageInstance(final Locale locale, final Class<M> messages, final BundleLocalization localization)
-			throws InstantiationException, IllegalAccessException {
+	public <M> M getMessageInstance(final Locale locale, final Class<M> messages, final BundleLocalization localization) {
 		String key = messages.getName() + "_" + locale; //$NON-NLS-1$
 
 		final Message annotation = messages.getAnnotation(Message.class);
@@ -98,14 +104,7 @@ public <M> M getMessageInstance(final Locale locale, final Class<M> messages, fi
 			instance = AccessController.doPrivileged(new PrivilegedAction<M>() {
 
 				public M run() {
-					try {
-						return createInstance(locale, messages, annotation, localization);
-					} catch (InstantiationException e) {
-						e.printStackTrace();
-					} catch (IllegalAccessException e) {
-						e.printStackTrace();
-					}
-					return null;
+					return createInstance(locale, messages, annotation, localization);
 				}
 
 			});
@@ -149,17 +148,12 @@ public M run() {
 	 * 			to retrieve the URI of the location to search for the {@link ResourceBundle}.
 	 * @param localization The service that is needed to retrieve {@link ResourceBundle} objects from a bundle 
 	 * 			with a given locale.
-	 * @return The created instance of the given messages class and {@link Locale}.
 	 * 
-	 * @throws InstantiationException if the requested message class represents an abstract class, an interface, 
-	 * 			an array class, a primitive type, or void; 
-	 * 			or if the class has no nullary constructor; 
-	 * 			or if the instantiation fails for some other reason.
-	 * @throws IllegalAccessException if the requested message class or its nullary constructor is not accessible.
+	 * @return The created instance of the given messages class and {@link Locale} or <code>null</code>
+	 * 			if an error occured on creating the instance.
 	 */
 	private static <M> M createInstance(Locale locale, Class<M> messages,
-			Message annotation, BundleLocalization localization) throws InstantiationException,
-			IllegalAccessException {
+			Message annotation, BundleLocalization localization) {
 
 		ResourceBundle resourceBundle = null;
 		if (annotation != null && annotation.contributorURI().length() > 0) {
@@ -190,18 +184,64 @@ private static <M> M createInstance(Locale locale, Class<M> messages,
 		//be returned by this provider to show that there is something wrong on loading it
 		ResourceBundleTranslationProvider provider = new ResourceBundleTranslationProvider(resourceBundle);
 		
-		M instance = messages.newInstance();
-		Field[] fields = messages.getDeclaredFields();
-
-		for (int i = 0; i < fields.length; i++) {
-			if (!fields[i].isAccessible()) {
-				fields[i].setAccessible(true);
+		M instance = null;
+		try {
+			instance = messages.newInstance();
+			Field[] fields = messages.getDeclaredFields();
+			
+			for (int i = 0; i < fields.length; i++) {
+				if (!fields[i].isAccessible()) {
+					fields[i].setAccessible(true);
+				}
+				
+				fields[i].set(instance,
+						provider.translate(fields[i].getName()));
 			}
-
-			fields[i].set(instance,
-					provider.translate(fields[i].getName()));
+		} catch (InstantiationException e) {
+			if (logService != null)
+				logService.log(LogService.LOG_ERROR,
+						"Instantiation of messages class failed", e); //$NON-NLS-1$
+		} catch (IllegalAccessException e) {
+			if (logService != null)
+				logService.log(LogService.LOG_ERROR,
+						"Failed to access messages class", e); //$NON-NLS-1$
 		}
-
+		
+		//invoke the method annotated with @PostConstruct
+		processPostConstruct(instance, messages);
+		
 		return instance;
 	}
+	
+	/**
+	 * Searches for the method annotated {@link PostConstruct} in the messages class.
+	 * If there is one found it will be executed.
+	 * <p>
+	 * Note: The method annotated with {@link PostConstruct} does not support method injection
+	 * 		 because we are not using the injection mechanism to call.
+	 * @param messageObject The message instance of the given class where the method annotated with
+	 * 			{@link PostConstruct} should be called
+	 * @param messageClass The type of the message class whose instance is requested.
+	 */
+	private static void processPostConstruct(Object messageObject, Class<?> messageClass) {
+		if (messageObject != null) {
+			Method[] methods = messageClass.getDeclaredMethods();
+			for (int i = 0; i < methods.length; i++) {
+				Method method = methods[i];
+				if (!method.isAnnotationPresent(PostConstruct.class)) {
+					continue;
+				}
+				else {
+					try {
+						method.invoke(messageObject);
+					} catch (Exception e) {
+						if (logService != null)
+							logService.log(LogService.LOG_ERROR,
+								"Exception on trying to execute the @PostConstruct annotated method in " + messageClass, e); //$NON-NLS-1$
+					}
+				}
+			}
+		}
+	}
+
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java
index 1350a0bf47..c52c2afdb3 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java
@@ -122,19 +122,7 @@ private void updateMessages() {
 	 * @return The instance of the requested message class
 	 */
 	private Object getMessageInstance(Class<?> descriptorsClass) {
-		try {
-			return this.factoryService.getMessageInstance(
-					this.locale, descriptorsClass, this.localization);
-		} catch (InstantiationException e) {
-			if (logService != null)
-				logService.log(LogService.LOG_ERROR,
-						"Instantiation of messages class failed", e); //$NON-NLS-1$
-		} catch (IllegalAccessException e) {
-			if (logService != null)
-				logService.log(LogService.LOG_ERROR,
-						"Failed to access messages class", e); //$NON-NLS-1$
-		}
-		return null;
+		return this.factoryService.getMessageInstance(this.locale, descriptorsClass, this.localization);
 	}
 	
 	/**

From ffd4889f9409110cb055aef7edf542fd9da0a19b Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Mon, 20 May 2013 09:35:00 +0200
Subject: [PATCH 0600/1286] Bug 405936 - Update ProjectOSGiTranslationProvider
 to use the new message extensions

---
 bundles/org.eclipse.e4.tools.emf.ui/.classpath       |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs             | 12 +++++++-----
 .../org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.classpath b/bundles/org.eclipse.e4.tools.emf.ui/.classpath
index 64c5e31b7a..ad32c83a78 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.classpath
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.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/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
index 118f2dfe61..fa824f42ed 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,8 @@
-#Mon Jun 21 15:26:11 CEST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -74,7 +73,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0
@@ -146,9 +145,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
 org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index a90c35b16d..605ac24f26 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.12.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.core.databinding.property;bundle-version="1.2.100",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",

From 2bf85f931202c28e9502f21e830c3413af1ca2a4 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Wed, 5 Jun 2013 11:55:48 +0200
Subject: [PATCH 0601/1286] Bug 409373 Update version number of e4 tools
 features to 0.13

---
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index ec90c2daf1..9ba9ffdcf1 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="0.12.0.qualifier"
+      version="0.13.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index d3ee2142ff..24967e7ab7 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>0.12.0.qualifier</version>
+  <version>0.13.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
 
 </project>

From 92e86b86e600833f22a354b7c02a16fba40fc4b7 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Wed, 5 Jun 2013 12:00:53 +0200
Subject: [PATCH 0602/1286] Bug 409373 - Update version number of e4 tools
 features to 0.14

---
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 9ba9ffdcf1..0c251f92dc 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="0.13.0.qualifier"
+      version="0.14.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 24967e7ab7..7651207394 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>0.13.0.qualifier</version>
+  <version>0.14.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
 
 </project>

From 319bc28fcace2540f6452e369368fa4bdfb9b541 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Wed, 5 Jun 2013 12:13:04 +0200
Subject: [PATCH 0603/1286] Bug 409373 - Update version number of e4 tools
 features to 0.14

Repairs the build

From f3a67a338853fde690b9724326ba2d1d267c37a3 Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Fri, 14 Jun 2013 13:22:01 -0400
Subject: [PATCH 0604/1286] Bug 410841 - Explorer editing CSS with orion

A sample view that loads the Orion CSS editor with the current
theme.

From 2c6d16ea7f0be30cda8f95b729b6658f4948451c Mon Sep 17 00:00:00 2001
From: Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de>
Date: Mon, 17 Jun 2013 14:51:42 +0200
Subject: [PATCH 0605/1286] Bug 403237 - o.e.e4.tools cannot be build with "mvn
 clean install" https://bugs.eclipse.org/403237

Change-Id: Icd239c744d74fc4dc7cab0ed0f45526e9ed87812
---
 bundles/org.eclipse.e4.tools.compat/pom.xml        | 5 +++--
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml  | 5 +++--
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml        | 5 +++--
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml | 5 +++--
 bundles/org.eclipse.e4.tools.services/pom.xml      | 5 +++--
 bundles/org.eclipse.e4.tools/pom.xml               | 5 +++--
 features/org.eclipse.e4.core.tools.feature/pom.xml | 5 +++--
 7 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index c35bda5c0b..03be8b290e 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.e4.releng</groupId>
-    <artifactId>eclipse-parent</artifactId>
+    <groupId>org.eclipse.e4.tools</groupId>
+    <artifactId>e4-tools-aggregator</artifactId>
     <version>0.14.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 8d6862f877..1353ad751c 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.e4.releng</groupId>
-    <artifactId>eclipse-parent</artifactId>
+    <groupId>org.eclipse.e4.tools</groupId>
+    <artifactId>e4-tools-aggregator</artifactId>
     <version>0.14.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index dc97e83bde..acc8021ad9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.e4.releng</groupId>
-    <artifactId>eclipse-parent</artifactId>
+    <groupId>org.eclipse.e4.tools</groupId>
+    <artifactId>e4-tools-aggregator</artifactId>
     <version>0.14.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 8d3a8671bb..8282d202c0 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.e4.releng</groupId>
-    <artifactId>eclipse-parent</artifactId>
+    <groupId>org.eclipse.e4.tools</groupId>
+    <artifactId>e4-tools-aggregator</artifactId>
     <version>0.14.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index c25c346c8a..494d6fcebf 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.e4.releng</groupId>
-    <artifactId>eclipse-parent</artifactId>
+    <groupId>org.eclipse.e4.tools</groupId>
+    <artifactId>e4-tools-aggregator</artifactId>
     <version>0.14.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index e8ee01ba6e..a50bc76c43 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.e4.releng</groupId>
-    <artifactId>eclipse-parent</artifactId>
+    <groupId>org.eclipse.e4.tools</groupId>
+    <artifactId>e4-tools-aggregator</artifactId>
     <version>0.14.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 7651207394..f8c77b5274 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.e4.releng</groupId>
-    <artifactId>eclipse-parent</artifactId>
+    <groupId>org.eclipse.e4.tools</groupId>
+    <artifactId>e4-tools-aggregator</artifactId>
     <version>0.14.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>

From 888d13add368383ad95f45a344b691b5df1cc093 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Thu, 20 Jun 2013 11:35:10 +0200
Subject: [PATCH 0606/1286] Fixed 386329

---
 .../eclipse/e4/tools/compat/internal/PartHelper.java  |  2 +-
 .../eclipse/e4/tools/compat/parts/DIEditorPart.java   | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
index f767bf108a..cbe2d201ef 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
@@ -42,7 +42,7 @@ public static IEclipseContext createPartContext(WorkbenchPart part) throws PartI
 				Object instance = site.getService(clazz);
 				Method m = clazz.getMethod("getContext", new Class[0]);
 				IEclipseContext ctx = (IEclipseContext) m.invoke(instance);
-				IEclipseContext rv = ctx.createChild();
+				IEclipseContext rv = ctx;
 				while( ctx.getParent() != null ) {
 					ctx = ctx.getParent();
 				}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index c135bb13fd..0c99e15f8e 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -148,8 +148,15 @@ public void setFocus() {
 
 	@Override
 	public void dispose() {
-		context.dispose();
-		context = null;
+		IEclipseContext parentContext = (IEclipseContext) getSite().getService(
+				IEclipseContext.class);
+		// Check if running in 3.x, otherwise there was no dedicated context
+		// created
+		if (parentContext
+				.get("org.eclipse.e4.ui.workbench.IPresentationEngine") != null) {
+			context.dispose();
+			context = null;
+		}
 		super.dispose();
 	}
 }

From 17afecf731bb4fa8cd9fc5b1d6f96d5f9f976e86 Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Fri, 28 Jun 2013 15:30:33 -0400
Subject: [PATCH 0607/1286] Bug 411915 - [releng] Move to 0.15

---
 bundles/org.eclipse.e4.tools.compat/pom.xml        | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml  | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml        | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml               | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 03be8b290e..5267862bff 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.14.0-SNAPSHOT</version>
+    <version>0.15.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 1353ad751c..f5c014c35d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.14.0-SNAPSHOT</version>
+    <version>0.15.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index acc8021ad9..d405ec8cc3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.14.0-SNAPSHOT</version>
+    <version>0.15.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 8282d202c0..39d27521f7 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.14.0-SNAPSHOT</version>
+    <version>0.15.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 494d6fcebf..1f65263f0b 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.14.0-SNAPSHOT</version>
+    <version>0.15.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index a50bc76c43..bb76072b31 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.14.0-SNAPSHOT</version>
+    <version>0.15.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index f8c77b5274..3117aba896 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.14.0-SNAPSHOT</version>
+    <version>0.15.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 

From ed0b9642df80e662a046f0afd12d6c9175df5e25 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Mon, 1 Jul 2013 18:17:41 +0200
Subject: [PATCH 0608/1286] Bug 412029 - Compat DIEditorPart disposes parent
 context on Eclipse 4 - fixed

---
 .../src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index 0c99e15f8e..c20e922555 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -153,7 +153,7 @@ public void dispose() {
 		// Check if running in 3.x, otherwise there was no dedicated context
 		// created
 		if (parentContext
-				.get("org.eclipse.e4.ui.workbench.IPresentationEngine") != null) {
+				.get("org.eclipse.e4.ui.workbench.IPresentationEngine") == null) {
 			context.dispose();
 			context = null;
 		}

From 89df9bf81c4f127df7f39463511ab531ede12275 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Thu, 4 Jul 2013 15:57:15 +0200
Subject: [PATCH 0609/1286] Bug 412059 - E4NewProjectWizard uses product name
 to construct platform:/plugin/ URIs

---
 .../internal/tools/wizards/project/E4NewProjectWizard.java   | 5 +++--
 .../{$projectName$.product => $productFileName$.product}     | 0
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename bundles/org.eclipse.e4.tools/templates/common/{$projectName$.product => $productFileName$.product} (100%)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index c8c2ca839b..cf120f5ee2 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -284,7 +284,7 @@ public void createProductsExtension(IProject project) {
 			String cssValue = map
 					.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
 			if (cssValue != null) {
-				cssValue = "platform:/plugin/" + productName + "/" + cssValue;
+				cssValue = "platform:/plugin/" + fPluginData.getId() + "/" + cssValue;
 				map.put(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY,
 						cssValue);
 			}
@@ -357,7 +357,7 @@ public void createApplicationResources(IProject project,
 
 		// If the project has invalid characters, the plug-in name would replace
 		// them with underscores, product name does the same
-		String pluginName = map.get(NewApplicationWizardPage.PRODUCT_NAME);
+		String pluginName = fPluginData.getId();
 
 		// If there's no Activator created we create default package
 		if (!fPluginData.doGenerateClass()) {
@@ -412,6 +412,7 @@ public void createApplicationResources(IProject project,
 
 		Map<String, String> keys = new HashMap<String, String>();
 		keys.put("projectName", pluginName);
+		keys.put("productFileName", map.get(NewApplicationWizardPage.PRODUCT_NAME));
 		String elementName = fragment.getElementName();
 		keys.put("packageName", (elementName.equals("") ? "" : elementName
 				+ ".")
diff --git a/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product b/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
similarity index 100%
rename from bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
rename to bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product

From b2f59efc90ab13e375e6147f182cd662104b130a Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Wed, 10 Jul 2013 16:07:37 +0200
Subject: [PATCH 0610/1286] Bug 412655 - [e4xmi] wizard should create binding
 contexts even when not generating parts

---
 .../wizards/project/E4NewProjectWizard.java   | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index cf120f5ee2..d803118dc0 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -512,26 +512,26 @@ private void createApplicationModel(IProject project, String pluginName,
 			mainWindow.setWidth(500);
 			mainWindow.setHeight(400);
 			resource.getContents().add((EObject) application);
+			MBindingContext rootContext = MCommandsFactory.INSTANCE
+					.createBindingContext();
+			rootContext
+			.setElementId("org.eclipse.ui.contexts.dialogAndWindow");
+			rootContext.setName("In Dialog and Windows");
+			
+			MBindingContext childContext = MCommandsFactory.INSTANCE
+					.createBindingContext();
+			childContext.setElementId("org.eclipse.ui.contexts.window");
+			childContext.setName("In Windows");
+			rootContext.getChildren().add(childContext);
+			
+			childContext = MCommandsFactory.INSTANCE.createBindingContext();
+			childContext.setElementId("org.eclipse.ui.contexts.dialog");
+			childContext.setName("In Dialogs");
+			rootContext.getChildren().add(childContext);
+			
+			application.getRootContext().add(rootContext);
+			application.getBindingContexts().add(rootContext);
 			if (!isMinimalist) {
-				MBindingContext rootContext = MCommandsFactory.INSTANCE
-						.createBindingContext();
-				rootContext
-						.setElementId("org.eclipse.ui.contexts.dialogAndWindow");
-				rootContext.setName("In Dialog and Windows");
-
-				MBindingContext childContext = MCommandsFactory.INSTANCE
-						.createBindingContext();
-				childContext.setElementId("org.eclipse.ui.contexts.window");
-				childContext.setName("In Windows");
-				rootContext.getChildren().add(childContext);
-
-				childContext = MCommandsFactory.INSTANCE.createBindingContext();
-				childContext.setElementId("org.eclipse.ui.contexts.dialog");
-				childContext.setName("In Dialogs");
-				rootContext.getChildren().add(childContext);
-
-				application.getRootContext().add(rootContext);
-				application.getBindingContexts().add(rootContext);
 
 				// Create Quit command
 				MCommand quitCommand = createCommand(

From 195ef4ba73a1f922070f35571b3fba479eeca62a Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Mon, 22 Jul 2013 15:55:29 +0200
Subject: [PATCH 0611/1286] Updates dependencies to the latest PDE bundles

Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=413449
Change-Id: Ic0ede124035d9b9e828a9fa2a31fdb50408d25a6
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index b1fdff31d4..3e253a8051 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -5,8 +5,6 @@ Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
 Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
- org.eclipse.pde.core;bundle-version="3.6.0",
- org.eclipse.pde.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
  org.eclipse.core.resources;bundle-version="3.6.0",
@@ -19,7 +17,9 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.databinding.property;bundle-version="1.3.0",
  org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.emf.ecore;bundle-version="2.9.0",
- org.eclipse.emf.ecore.xmi;bundle-version="2.9.0"
+ org.eclipse.emf.ecore.xmi;bundle-version="2.9.0",
+ org.eclipse.pde.core;bundle-version="3.9.0",
+ org.eclipse.pde.ui;bundle-version="3.8.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.e4.internal.tools.ToolsPlugin
 Export-Package: org.eclipse.e4.internal.tools.wizards.classes;x-internal:=true,

From f9b6813ec6069933bfac28d2ba679f5c6ccb36c9 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Wed, 31 Jul 2013 14:59:21 +0200
Subject: [PATCH 0612/1286] Bug 414102 - Use "ID" instead of "Id" in the user
 interface

Signed-off-by: Sopot Cela <sopotcela@gmail.com>
---
 .../tools/emf/ui/internal/Messages.properties | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index a63f7ac704..402fef08b2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -15,8 +15,8 @@ ModelTooling_Common_Down=Down
 ModelTooling_Common_AddEllipsis=Add ...
 ModelTooling_Common_Add=Add
 ModelTooling_Common_Remove=Remove
-ModelTooling_Common_Id=Id
-ModelTooling_Common_RefId=Reference-Id
+ModelTooling_Common_Id=ID
+ModelTooling_Common_RefId=Reference-ID
 ModelTooling_Common_FindEllipsis=Find ...
 ModelTooling_Common_TabDefault=Default
 ModelTooling_Common_TabSupplementary=Supplementary
@@ -39,7 +39,7 @@ ModelTooling_Contribution_PersistedState=Persisted State
 
 ModelTooling_Empty_Warning=Value must not be empty
 
-AbstractCommandSelectionDialog_Label_CommandId=Command-Id
+AbstractCommandSelectionDialog_Label_CommandId=Command-ID
 
 ApplicationEditor_Label=Application
 ApplicationEditor_Description=Application bla, bla, bla
@@ -59,7 +59,7 @@ ApplicationEditor_Categories=Command Categories
 
 BindingTableEditor_Label=BindingTable
 BindingTableEditor_Description=BindingTable bla bla bla
-BindingTableEditor_ContextId=Context Id
+BindingTableEditor_ContextId=Context ID
 BindingTableEditor_Keybindings=Keybindings
 BindingTableEditor_KeySequence=KeySequence
 BindingTableEditor_Command=Command
@@ -71,11 +71,11 @@ CommandEditor_Name=Name
 CommandEditor_LabelDescription=Description
 CommandEditor_Parameters=Parameters
 CommandEditor_ParameterName=Name
-CommandEditor_ParameterTypeId=Type-Id
+CommandEditor_ParameterTypeId=Type-ID
 CommandEditor_ParameterOptional=Optional
 CommandEditor_ParameterOptional_Yes=yes
 CommandEditor_ParameterOptional_No=no
-CommandEditor_ParameterId=Id
+CommandEditor_ParameterId=ID
 CommandEditor_Category=Category
 CommandEditor_AddCommandParameter=Command Parameter
 
@@ -296,7 +296,7 @@ MenuContributionEditor_DynamicMenuContribution=DynamicMenuContribution
 MenuContributionEditor_Separator=Separator
 MenuContributionEditor_Menu=Menu
 MenuContributionEditor_DirectMenuItem=Direct MenuItem
-MenuContributionEditor_ParentId=Parent-Id
+MenuContributionEditor_ParentId=Parent-ID
 MenuContributionEditor_Position=Position
 MenuContributionEditor_TreeLabel=Menu Contribution
 MenuContributionEditor_TreeLabelDescription=Menu Contribution Bla Bla Bla Bla
@@ -309,7 +309,7 @@ ModelFragmentsEditor_Imports=Imports
 StringModelFragment_Label=Model Fragment
 StringModelFragment_Description=Model Fragment Bla Bla Bla
 StringModelFragment_Featurename=Featurename
-StringModelFragment_ParentId=Element Id
+StringModelFragment_ParentId=Element ID
 StringModelFragment_PositionInList=Position in list
 StringModelFragment_Elements=Elements
 
@@ -324,8 +324,8 @@ CategoryEditor_Name=Name
 CategoryEditor_Description=Description
 CategoryEditor_Tags=Tags
 
-CommandCategorySelectionDialog_LabelCategoryId=Category Id
-BindingContextSelectionDialog_LabelContextId=Context Id
+CommandCategorySelectionDialog_LabelCategoryId=Category ID
+BindingContextSelectionDialog_LabelContextId=Context ID
 
 ComponentLabelProvider_invisible=invisible
 ComponentLabelProvider_notrendered=not rendered
@@ -341,7 +341,7 @@ BindingContextEditor_NameWarning=Binding Context name should not be empty
 CommandParameterEditor_TreeLabel=Command Parameter
 CommandParameterEditor_TreeLabelDescritpion=Command Parameter Bla Bla Bla
 CommandParameterEditor_Name=Name
-CommandParameterEditor_TypeId=TypeId
+CommandParameterEditor_TypeId=TypeID
 CommandParameterEditor_Optional=Optional
 
 ParameterEditor_TreeLabel=Parameter
@@ -381,7 +381,7 @@ TrimBarEditor_AddToolControl=Toolcontrol
 
 TrimContributionEditor_TreeLabel=Trim Contribution
 TrimContributionEditor_TreeLabelDescription=Trim Contribution Bla Bla Bla Bla
-TrimContributionEditor_ParentId=Parent Id
+TrimContributionEditor_ParentId=Parent ID
 TrimContributionEditor_Position=Position
 TrimContributionEditor_Controls=Controls
 
@@ -504,7 +504,7 @@ FindImportElementDialog_ShellTitle=Find Import Elements
 FindImportElementDialog_Title=Find Import Elements
 FindImportElementDialog_Message=Search for an elements whose ID you'd like to import
 FindImportElementDialog_Search=Search
-FindImportElementDialog_noId=no id
+FindImportElementDialog_noId=no ID
 FindImportElementDialog_ClearCache=Clear Cache
 FindImportElementDialog_NoIdReference=You can not import an element without an ID
 
@@ -515,7 +515,7 @@ FindParentReferenceElementDialog_ContainerType=Container-Type
 FindParentReferenceElementDialog_Search=Search
 FindParentReferenceElementDialog_ClearCache=Clear Cache
 FindParentReferenceElementDialog_NoReferenceId=You can not reference an element without an ID
-FindParentReferenceElementDialog_NoId=no id
+FindParentReferenceElementDialog_NoId=no ID
 
 HandledMenuItemCommandSelectionDialog_ShellTitle=MenuItem Command
 HandledMenuItemCommandSelectionDialog_DialogTitle=MenuItem-Command
@@ -580,12 +580,12 @@ VItemParametersEditor_AddParameter=Parameter
 
 CoreExpressionEditor_TreeLabel=Core Expression
 CoreExpressionEditor_TreeLabelDescription=Core Expression Bla Bla Bla
-CoreExpressionEditor_ExpressionId=Expression Id
+CoreExpressionEditor_ExpressionId=Expression ID
 
-ExpressionIdDialog_ShellTitle=Find Expression Id
-ExpressionIdDialog_DialogTitle=Find Expression Id
-ExpressionIdDialog_DialogMessage=Find the expression id defined through the 'org.eclipse.core.expressions.definitions' extension point
-ExpressionIdDialog_Id=Id
+ExpressionIdDialog_ShellTitle=Find Expression ID
+ExpressionIdDialog_DialogTitle=Find Expression ID
+ExpressionIdDialog_DialogMessage=Find the expression ID defined through the 'org.eclipse.core.expressions.definitions' extension point
+ExpressionIdDialog_Id=ID
 CommandToStringConverter_None=<None>
 
 VRootBindingContexts_AddContext=Binding Context
@@ -635,6 +635,6 @@ Special_UnknownElement=(unknown model element)
 Special_UnknownElement_Detail= Use an extension point!
 VWindowSharedElementsEditor_Area=Area
 ModelEditor_ExtractFragment=Extract into a fragment
-ModelEditor_ExtractFragment_NoParentId=Can not extract because parent container has no id. \nAdd an id and try again.
+ModelEditor_ExtractFragment_NoParentId=Can not extract because parent container has no ID. \nAdd an ID and try again.
 KeyBindingEditor_SequenceLowercase=Key sequences should be specified in uppercase characters
 ModelTooling_CommandId_tooltip=Command identifier. Must be defined for a command to work properly.

From e22f9cf747541e26472922a6a508599c52c8332c Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Wed, 7 Aug 2013 13:08:52 -0400
Subject: [PATCH 0613/1286] Bug 410841 - Explorer editing CSS with orion

An example of hooking in CSS keywords.

From 9d8b53e5554b633b775fb413ca933285c10993ae Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Thu, 8 Aug 2013 11:39:50 +0200
Subject: [PATCH 0614/1286] Bug 409372 - No source bundles for e4 tools bundles

Adding source build for e4 tools, still source bundle missing for the
org.eclipse.e4.tools plug-in, see bug for discussion
---
 .../org.eclipse.e4.core.tools.feature/pom.xml | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 3117aba896..e5bf6c515d 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -13,4 +13,35 @@
   <version>0.14.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho.extras</groupId>
+        <artifactId>tycho-source-feature-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <id>source-feature</id>
+            <goals>
+              <goal>source-feature</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-p2-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <executions>
+          <execution>
+            <id>attached-p2-metadata</id>
+            <phase>package</phase>
+            <goals>
+              <goal>p2-metadata</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

From 2d46428371a00274e9e70f19cf565c2e088f9fb5 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Thu, 8 Aug 2013 12:01:15 +0200
Subject: [PATCH 0615/1286] Bug 409372 - No source bundles for e4 tools bundles

Adding source builds for all features

From 4519d0d810eb14d93a718c00ee57722f14b6dadc Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Fri, 9 Aug 2013 15:10:31 +0200
Subject: [PATCH 0616/1286] Bug 414750 - DIViewPart does not handle the
 @PreDestroy correctly

---
 .../eclipse/e4/tools/compat/internal/PartHelper.java | 12 ++++++++++++
 .../eclipse/e4/tools/compat/parts/DIEditorPart.java  |  9 ++++++---
 .../eclipse/e4/tools/compat/parts/DIViewPart.java    |  8 +++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
index cbe2d201ef..2bc16f47f9 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
@@ -107,4 +107,16 @@ public void addSelectionChangedListener(ISelectionChangedListener listener) {
 			listeners.add(listener);
 		}
 	}
+
+	public static void disposeContextIfE3(IEclipseContext parentContext,
+			IEclipseContext context) {
+			// Check if running in 3.x, otherwise there was no dedicated context
+			// created
+			if (parentContext
+					.get("org.eclipse.e4.ui.workbench.IPresentationEngine") == null) {
+				context.dispose();
+				context = null;
+		}
+		
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index c20e922555..f5ea188dd5 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -148,8 +148,12 @@ public void setFocus() {
 
 	@Override
 	public void dispose() {
-		IEclipseContext parentContext = (IEclipseContext) getSite().getService(
-				IEclipseContext.class);
+		disposeContextIfE3((IEclipseContext) getSite().getService(
+				IEclipseContext.class), context);
+		super.dispose();
+	}
+
+	public static void disposeContextIfE3(IEclipseContext parentContext, IEclipseContext context) {
 		// Check if running in 3.x, otherwise there was no dedicated context
 		// created
 		if (parentContext
@@ -157,6 +161,5 @@ public void dispose() {
 			context.dispose();
 			context = null;
 		}
-		super.dispose();
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
index 0a060eeff0..edabb81027 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
@@ -12,7 +12,6 @@
 
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.di.InjectionException;
 import org.eclipse.e4.tools.compat.internal.PartHelper;
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.swt.widgets.Composite;
@@ -57,4 +56,11 @@ public C getComponent() {
 	public void setFocus() {
 		ContextInjectionFactory.invoke(component, Focus.class, context);
 	}
+	
+	@Override
+	public void dispose() {
+		PartHelper.disposeContextIfE3((IEclipseContext) getSite().getService(
+				IEclipseContext.class), context);
+		super.dispose();
+	}
 }
\ No newline at end of file

From 037862fa1fcdddf335b0f92fb49f68c5d6ac8e20 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Fri, 9 Aug 2013 15:10:31 +0200
Subject: [PATCH 0617/1286] Bug 414750 - DIViewPart does not handle the
 @PreDestroy correctly

---
 .../eclipse/e4/tools/compat/parts/DIEditorPart.java  | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index f5ea188dd5..c7053dd91b 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -148,18 +148,10 @@ public void setFocus() {
 
 	@Override
 	public void dispose() {
-		disposeContextIfE3((IEclipseContext) getSite().getService(
+		PartHelper.disposeContextIfE3((IEclipseContext) getSite().getService(
 				IEclipseContext.class), context);
 		super.dispose();
 	}
 
-	public static void disposeContextIfE3(IEclipseContext parentContext, IEclipseContext context) {
-		// Check if running in 3.x, otherwise there was no dedicated context
-		// created
-		if (parentContext
-				.get("org.eclipse.e4.ui.workbench.IPresentationEngine") == null) {
-			context.dispose();
-			context = null;
-		}
-	}
+	
 }

From 21678ad70bd10d9d8a14fa42ad0a9b2660cb7ffa Mon Sep 17 00:00:00 2001
From: Daniel Rolka <daniel.rolka@pl.ibm.com>
Date: Wed, 14 Aug 2013 11:27:16 +0200
Subject: [PATCH 0618/1286] Bug 414853 - [tools] Create tool for monitoring e4
 events

Change-Id: Id3fd4ffdabaa70ad18505831f498aa6469701a83
Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>
---
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF        | 2 +-
 bundles/org.eclipse.e4.tools.compat/pom.xml                     | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF  | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml               | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF        | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml                     | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml              | 2 +-
 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF      | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml                   | 2 +-
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF               | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                            | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml          | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml              | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 6cedfefcc5..1038fb3a52 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.15.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 5267862bff..b673628691 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.compat</artifactId>
-  <version>0.12.0.qualifier</version>
+  <version>0.15.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index c4ae4d5f2d..255c68acdd 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.15.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index f5c014c35d..6a9e09624a 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.emf.editor3x</artifactId>
-  <version>0.12.0.qualifier</version>
+  <version>0.15.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 605ac24f26..03e6a40917 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.15.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index d405ec8cc3..21f90e3402 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>0.12.0.qualifier</version>
+  <version>0.15.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index 4da685d645..ee3140474b 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: e4 Templates
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.15.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 39d27521f7..b8bc6e17a1 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.jdt.templates</artifactId>
-  <version>0.12.0.qualifier</version>
+  <version>0.15.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 4d07898ac1..d0f653c8cb 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.15.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.e4.tools.services,
  org.eclipse.e4.tools.services.impl;x-friends:="org.eclipse.e4.tools.emf.ui"
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 1f65263f0b..b58948beb4 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.services</artifactId>
-  <version>0.12.0.qualifier</version>
+  <version>0.15.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 3e253a8051..e79cc2a0f4 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.15.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index bb76072b31..b1a578715b 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>0.12.0.qualifier</version>
+  <version>0.15.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 0c251f92dc..5f41dfb826 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="0.14.0.qualifier"
+      version="0.15.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index e5bf6c515d..e520fd4661 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>0.14.0.qualifier</version>
+  <version>0.15.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
 
   <build>

From fc435b4300c331affd1b64f9f02d2af007193395 Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@alumni.uwaterloo.ca>
Date: Wed, 14 Aug 2013 08:30:33 -0400
Subject: [PATCH 0619/1286] Revert "Bug 414853 - [tools] Create tool for
 monitoring e4 events"

This reverts commit 6558e66ebacacd79b403d027e8f2d5ee5238574d.

There are changes in a bunch of features/plugins unrelated to this bug.

Change-Id: Id9a3539e0932e0166cc4e53e70d457ece36e0ef5
---
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF        | 2 +-
 bundles/org.eclipse.e4.tools.compat/pom.xml                     | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF  | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml               | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF        | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml                     | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml              | 2 +-
 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF      | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml                   | 2 +-
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF               | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                            | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml          | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml              | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 1038fb3a52..6cedfefcc5 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 0.15.0.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index b673628691..5267862bff 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.compat</artifactId>
-  <version>0.15.0.qualifier</version>
+  <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 255c68acdd..c4ae4d5f2d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 0.15.0.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 6a9e09624a..f5c014c35d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.emf.editor3x</artifactId>
-  <version>0.15.0.qualifier</version>
+  <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 03e6a40917..605ac24f26 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 0.15.0.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 21f90e3402..d405ec8cc3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>0.15.0.qualifier</version>
+  <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index ee3140474b..4da685d645 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: e4 Templates
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
-Bundle-Version: 0.15.0.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index b8bc6e17a1..39d27521f7 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.jdt.templates</artifactId>
-  <version>0.15.0.qualifier</version>
+  <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index d0f653c8cb..4d07898ac1 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
-Bundle-Version: 0.15.0.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.e4.tools.services,
  org.eclipse.e4.tools.services.impl;x-friends:="org.eclipse.e4.tools.emf.ui"
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index b58948beb4..1f65263f0b 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.services</artifactId>
-  <version>0.15.0.qualifier</version>
+  <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index e79cc2a0f4..3e253a8051 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 0.15.0.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index b1a578715b..bb76072b31 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>0.15.0.qualifier</version>
+  <version>0.12.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 5f41dfb826..0c251f92dc 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="0.15.0.qualifier"
+      version="0.14.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index e520fd4661..e5bf6c515d 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>0.15.0.qualifier</version>
+  <version>0.14.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
 
   <build>

From 7e7f0c7c640296ba4fc944f3875666c3fa47fda9 Mon Sep 17 00:00:00 2001
From: Daniel Rolka <daniel.rolka@pl.ibm.com>
Date: Wed, 14 Aug 2013 15:24:48 +0200
Subject: [PATCH 0620/1286] Bug 414853 - [tools] Create tool for monitoring e4
 events

Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>

From 3678af85dada1068f67b44ac297b552cca0c3c45 Mon Sep 17 00:00:00 2001
From: Daniel Rolka <daniel.rolka@pl.ibm.com>
Date: Wed, 14 Aug 2013 17:32:25 +0200
Subject: [PATCH 0621/1286] Bug 415076 - [event spy] uses invalid isEmpty()

Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>

From 11f421fa05ceda77ea45bc10daee75f7d6905766 Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Fri, 23 Aug 2013 15:36:46 -0400
Subject: [PATCH 0622/1286] Bug 410841 - Explorer editing CSS with orion

Update to the 3.0 release of the editor

From de9ab88cafc0f24144e7e197c4d1aeb84edf8206 Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Fri, 23 Aug 2013 16:26:55 -0400
Subject: [PATCH 0623/1286] Bug 410841 - Explorer editing CSS with orion

Hook in basic keyword completion from the extension point.

From c3053aa4ae8c2273f4310ca108ff2581aaad01b9 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Thu, 29 Aug 2013 19:30:25 +0200
Subject: [PATCH 0624/1286] Bug 416171 - [Minor] Clean-up of
 org.eclipse.e4.tools

Change-Id: I441f3332521eda474a135a298509e97b8151a755
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../src/org/eclipse/e4/internal/tools/ToolsPlugin.java |  2 ++
 .../tools/wizards/classes/AbstractNewClassPage.java    |  2 ++
 .../tools/wizards/classes/AbstractNewClassWizard.java  |  5 ++---
 .../tools/wizards/classes/NewPartClassWizard.java      |  2 ++
 .../wizards/model/BaseApplicationModelWizard.java      |  2 +-
 .../wizards/model/ExtractContributionModelWizard.java  |  3 +--
 .../tools/wizards/model/NewApplicationModelWizard.java |  1 +
 .../wizards/model/NewContributionModelWizard.java      |  1 +
 .../internal/tools/wizards/model/NewModelFilePage.java |  4 +++-
 .../tools/wizards/project/E4NewProjectWizard.java      |  6 +++++-
 .../wizards/project/NewApplicationWizardPage.java      |  3 +++
 .../tools/wizards/project/PluginContentPage.java       | 10 ++++++++++
 12 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
index 1a9fa29348..18b87cae44 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
@@ -23,6 +23,7 @@ public class ToolsPlugin extends AbstractUIPlugin {
 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
 	 * )
 	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
@@ -35,6 +36,7 @@ public void start(BundleContext context) throws Exception {
 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
 	 * )
 	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index 689c024a61..6c72852606 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -274,6 +274,7 @@ private IPackageFragmentRoot choosePackageRoot() {
 		IJavaElement initElement= clazz.getFragmentRoot();
 		Class[] acceptedClasses= new Class[] { IPackageFragmentRoot.class, IJavaProject.class };
 		TypedElementSelectionValidator validator= new TypedElementSelectionValidator(acceptedClasses, false) {
+			@Override
 			public boolean isSelectedValid(Object element) {
 				try {
 					if (element instanceof IJavaProject) {
@@ -293,6 +294,7 @@ public boolean isSelectedValid(Object element) {
 
 		acceptedClasses= new Class[] { IJavaModel.class, IPackageFragmentRoot.class, IJavaProject.class };
 		ViewerFilter filter= new TypedViewerFilter(acceptedClasses) {
+			@Override
 			public boolean select(Viewer viewer, Object parent, Object element) {
 				if (element instanceof IPackageFragmentRoot) {
 					try {
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
index 5abe6b383a..21371d9af2 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
@@ -24,7 +24,6 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
 import org.eclipse.jdt.core.ICompilationUnit;
@@ -208,7 +207,7 @@ public boolean performFinish() {
 							true, null);
 				} else {
 					file.setContents(new ByteArrayInputStream(content.getBytes()),
-							IFile.FORCE | IFile.KEEP_HISTORY, null);
+							IResource.FORCE | IResource.KEEP_HISTORY, null);
 				}
 				IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
 //				unit.open(null);
@@ -226,7 +225,7 @@ public boolean performFinish() {
 							true, null);
 				} else {
 					file.setContents(new ByteArrayInputStream(content.getBytes()),
-							IFile.FORCE | IFile.KEEP_HISTORY, null);
+							IResource.FORCE | IResource.KEEP_HISTORY, null);
 				}
 				IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
 			} catch (CoreException e) {
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
index 4de0b134cd..0154229d31 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
@@ -185,10 +185,12 @@ public PartClass(IPackageFragmentRoot fragmentRoot) {
 			super(fragmentRoot);
 		}
 		
+		@Override
 		public void addPropertyChangeListener(PropertyChangeListener listener) {
 			support.addPropertyChangeListener(listener);
 		}
 
+		@Override
 		public void removePropertyChangeListener(PropertyChangeListener listener) {
 			support.removePropertyChangeListener(listener);
 		}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index 68add7537a..97febe37a4 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -37,7 +37,6 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
@@ -67,6 +66,7 @@ public BaseApplicationModelWizard() {
 	 * Adding the page to the wizard.
 	 */
 
+	@Override
 	public void addPages() {
 		page = createWizardPage(selection);
 		addPage(page);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
index c5f3d52858..4584f3ccc5 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
@@ -21,9 +21,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
 
 
@@ -49,6 +47,7 @@ public String getDefaultFileName() {
 		return "fragment.e4xmi";
 	}
 	
+	@Override
 	protected EObject createInitialModel() {
 		MModelFragments createModelFragments = MFragmentFactory.INSTANCE.createModelFragments();
 		MStringModelFragment createStringModelFragment = MFragmentFactory.INSTANCE.createStringModelFragment();
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
index 6f73ed3e87..f4ab3393d5 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
@@ -29,6 +29,7 @@ public String getDefaultFileName() {
 		return "Application.e4xmi";
 	}
 	
+	@Override
 	protected EObject createInitialModel() {
 		MApplication application = MApplicationFactory.INSTANCE.createApplication();
 		try {
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
index 3c9873e6b2..47bf7233a6 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
@@ -22,6 +22,7 @@ public String getDefaultFileName() {
 		return "fragment.e4xmi";
 	}
 	
+	@Override
 	protected EObject createInitialModel() {
 		return (EObject) MFragmentFactory.INSTANCE.createModelFragments();
 	}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
index 218e7d6a9d..4533ca4c82 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
@@ -19,6 +19,7 @@
 import org.eclipse.jface.dialogs.IDialogPage;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
@@ -85,6 +86,7 @@ public void modifyText(ModifyEvent e) {
 		Button button = new Button(container, SWT.PUSH);
 		button.setText("Browse...");
 		button.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				handleBrowse();
 			}
@@ -153,7 +155,7 @@ private void handleBrowse() {
 		ContainerSelectionDialog dialog = new ContainerSelectionDialog(
 				getShell(), ResourcesPlugin.getWorkspace().getRoot(), false,
 				"Select new file container");
-		if (dialog.open() == ContainerSelectionDialog.OK) {
+		if (dialog.open() == Window.OK) {
 			Object[] result = dialog.getResult();
 			if (result.length == 1) {
 				containerText.setText(((Path) result[0]).toString());
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index d803118dc0..492b12f231 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -121,6 +121,7 @@ public E4NewProjectWizard() {
 		fPluginData = new PluginFieldData();
 	}
 
+	@Override
 	public void addPages() {
 		fMainPage = new E4NewProjectWizardPage(
 				"main", fPluginData, false, getSelection()); //$NON-NLS-1$
@@ -155,6 +156,7 @@ public IPath getLocationPath() {
 		addPage(fApplicationPage);
 	}
 
+	@Override
 	@SuppressWarnings("restriction")
 	public boolean performFinish() {
 		try {
@@ -703,7 +705,7 @@ private void prepareFolder(IContainer container, IProgressMonitor monitor)
 			throws CoreException {
 		IContainer parent = container.getParent();
 		if (parent instanceof IFolder) {
-			prepareFolder((IFolder) parent, monitor);
+			prepareFolder(parent, monitor);
 		}
 		if (!container.exists() && container instanceof IFolder) {
 			IFolder folder = (IFolder) container;
@@ -711,10 +713,12 @@ private void prepareFolder(IContainer container, IProgressMonitor monitor)
 		}
 	}
 
+	@Override
 	public String getPluginId() {
 		return fPluginData.getId();
 	}
 
+	@Override
 	public String getPluginVersion() {
 		return fPluginData.getVersion();
 	}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
index a1c24224db..a248d910f2 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
@@ -120,6 +120,7 @@ private Group createTemplateGroup(Composite parent) {
 		
 		richSampleCheckbox.setSelection(false);
 		richSampleCheckbox.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				data.put(richSample, richSampleCheckbox.getSelection() ? "TRUE"
 						: "FALSE");
@@ -200,6 +201,7 @@ private void createPropertyItem(final Composite parent,
 			final Button button = new Button(parent, SWT.CHECK);
 			button.setSelection("true".equalsIgnoreCase(property.getValue()));
 			button.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent e) {
 					handleCheckBoxEvent(property.getName(),
 							button.getSelection());
@@ -227,6 +229,7 @@ public void handleEvent(Event event) {
 				Button button = new Button(parent, SWT.PUSH);
 				button.setText("...");
 				button.addSelectionListener(new SelectionAdapter() {
+					@Override
 					public void widgetSelected(SelectionEvent e) {
 						handleLinkEvent(property, valueText, parent.getShell());
 					}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
index 451f6706b5..275f1657f0 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
@@ -170,6 +170,7 @@ private void createExecutionEnvironmentControls(Composite container) {
 		// Set data 
 		fEEChoice.setItems((String[]) availableEEs.toArray(new String[availableEEs.size() - 1]));
 		fEEChoice.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				validatePage();
 			}
@@ -210,6 +211,7 @@ protected void createPluginClassGroup(Composite container) {
 
 		fGenerateActivator = SWTFactory.createCheckButton(classGroup, PDEUIMessages.ContentPage_generate, null, false, 2);
 		fGenerateActivator.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				fClassLabel.setEnabled(fGenerateActivator.getSelection());
 				fClassText.setEnabled(fGenerateActivator.getSelection());
@@ -227,6 +229,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		fUIPlugin = SWTFactory.createCheckButton(classGroup, PDEUIMessages.ContentPage_uicontribution, null, (settings != null) ? !settings.getBoolean(S_UI_PLUGIN) : true, 2);
 		fUIPlugin.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				updateData();
 				validatePage();
@@ -236,6 +239,7 @@ public void widgetSelected(SelectionEvent e) {
 		fApiAnalysisButton = SWTFactory.createCheckButton(classGroup, PDEUIMessages.PluginContentPage_enable_api_analysis, null, false, 2);
 		fApiAnalysisButton.setSelection((settings != null) ? settings.getBoolean(S_API_ANALYSIS) : false);
 		fApiAnalysisButton.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				updateData();
 				validatePage();
@@ -246,6 +250,7 @@ public void widgetSelected(SelectionEvent e) {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#updateData()
 	 */
+	@Override
 	public void updateData() {
 		super.updateData();
 		PluginFieldData data = (PluginFieldData) fData;
@@ -264,6 +269,7 @@ public void updateData() {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#setVisible(boolean)
 	 */
+	@Override
 	public void setVisible(boolean visible) {
 		if (visible) {
 			fMainPage.updateData();
@@ -323,6 +329,7 @@ private boolean isPureOSGi() {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#validatePage()
 	 */
+	@Override
 	protected void validatePage() {
 		String errorMessage = validateProperties();
 		if (errorMessage == null && fGenerateActivator.getSelection()) {
@@ -350,6 +357,7 @@ protected void validatePage() {
 	 * Saves the current state of widgets of interest in the dialog settings for the wizard
 	 * @param settings
 	 */
+	@Override
 	public void saveSettings(IDialogSettings settings) {
 		if (fGenerateActivator.isEnabled()) {
 			settings.put(S_GENERATE_ACTIVATOR, !fGenerateActivator.getSelection());
@@ -366,6 +374,7 @@ public void saveSettings(IDialogSettings settings) {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
 	 */
+	@Override
 	public boolean canFlipToNextPage() {
 		if (getNextPage() instanceof TemplateListSelectionPage) {
 			TemplateListSelectionPage templatePage = (TemplateListSelectionPage) getNextPage();
@@ -377,6 +386,7 @@ public boolean canFlipToNextPage() {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#computeId()
 	 */
+	@Override
 	protected String computeId() {
 		String id = super.computeId();
 		// In addition to removed illegal characters, the xmi model does not recognize plug-in uris if they end in a version number

From e241fdf2aa12585636814091c9808057f516d18d Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Fri, 6 Sep 2013 11:33:16 -0400
Subject: [PATCH 0625/1286] Bug 410841 - Explorer editing CSS with orion

The Orion based editor will now plug into the General>Appearance
preference page if this bundle is included.

From 2207af174ca44b0f0454e660ee66736e5e7adc10 Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Fri, 6 Sep 2013 11:56:49 -0400
Subject: [PATCH 0626/1286] Bug 410841 - Explorer editing CSS with orion

Make it available in the build

From ef1d85c7a9a154025020861097dc54ddbfa6a1fd Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Tue, 10 Sep 2013 13:00:01 -0400
Subject: [PATCH 0627/1286] Bug 416947 - [Orion] Pick up the orion editor with
 IE8 fixes


From 207e420f78a2129b5f33874f37872fb73b992568 Mon Sep 17 00:00:00 2001
From: Angelo ZERR <angelo.zerr@gmail.com>
Date: Thu, 19 Sep 2013 14:22:39 -0400
Subject: [PATCH 0628/1286] Bug 417315 - Improve "Explorer editing CSS with
 orion" with SWT OrionControl

Export packages + remove .setting to .gitignore + remove extra blank in
the HTMLEditor.htmljet

Change-Id: I47ece36a9c9c57f789b09718dcb44b98c9514186
Signed-off-by: Angelo ZERR <angelo.zerr@gmail.com>

From 9d8c053b87fd6c8b2ccaee9351e70401a240d608 Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Tue, 1 Oct 2013 16:31:04 -0400
Subject: [PATCH 0629/1286] Bug 417315 - Improve "Explorer editing CSS with
 orion" with SWT OrionControl

Added new control to the build.

From 7903482527f2a0cac6d27beb6b987bc1594782ad Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Thu, 17 Oct 2013 15:09:54 +0200
Subject: [PATCH 0630/1286] Bug 412377 - add "Add child" item in right click
 menu at "Model Fragement" (adding new features)

---
 .../common/component/StringModelFragment.java | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 0ec25be941..a911851535 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -11,7 +11,10 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
+import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -40,6 +43,7 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -69,6 +73,8 @@ public class StringModelFragment extends AbstractComponentEditor {
 
 	private IListProperty MODEL_FRAGMENT__ELEMENTS = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
 
+	private List<Action> actions = new ArrayList<Action>();
+
 	@Inject
 	IEclipseContext eclipseContext;
 
@@ -77,6 +83,22 @@ public StringModelFragment() {
 		super();
 	}
 
+	@PostConstruct
+	public void init() {
+		List<FeatureClass> list = new ArrayList<FeatureClass>();
+		Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
+		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
+		for (final FeatureClass featureClass : list) {
+			actions.add(new Action(featureClass.label) {
+
+				@Override
+				public void run() {
+					handleAdd(featureClass.eClass, false);
+				}
+			});
+		}
+	}
+
 	@Override
 	public Image getImage(Object element, Display display) {
 		return createImage(ResourceProvider.IMG_StringModelFragment);
@@ -340,4 +362,29 @@ public IObservableList getChildList(Object element) {
 		return MODEL_FRAGMENT__ELEMENTS.observe(element);
 	}
 
+	protected void handleAdd(EClass eClass, boolean separator) {
+		EObject eObject = EcoreUtil.create(eClass);
+		setElementId(eObject);
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(eObject);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		Collections.sort(l, new Comparator<Action>() {
+			@Override
+			public int compare(Action o1, Action o2) {
+
+				return o1.getText().compareTo(o2.getText());
+			}
+		});
+		return l;
+	}
+
 }

From 6af250f6d21ed365fb5e5efd2e1716b71ab40bd6 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Thu, 17 Oct 2013 16:00:04 +0200
Subject: [PATCH 0631/1286] Bug 402849 - Property clearPersistedState in
 plugin.xml rules out product configuration

---
 .../internal/tools/wizards/project/E4NewProjectWizard.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 492b12f231..798b39b583 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -321,7 +321,10 @@ public void createProductsExtension(IProject project) {
 								|| entry.getKey().equals(
 										NewApplicationWizardPage.APPLICATION)
 								|| entry.getKey().equals(
-										NewApplicationWizardPage.richSample)) {
+										NewApplicationWizardPage.richSample)
+								|| entry.getKey().equals(
+										NewApplicationWizardPage.CLEAR_PERSISTED_STATE)
+								) {
 							continue;
 						}
 						IPluginElement element = fmodel.getFactory()

From 4b60022b23edc3a3b0026735560dd19390016766 Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Thu, 17 Oct 2013 21:04:18 +0200
Subject: [PATCH 0632/1286] Bug 396975 - Provide find action for
 [ToolBar|Trim|Menu] contribution elements

Change-Id: I52152edf92937c0c473a386f756eb8a7f36c2506
Signed-off-by: Marco Descher <marco@descher.at>

Bug 396975 - Provide find action for [ToolBar|Trim|Menu] contribution
elements

Change-Id: I52152edf92937c0c473a386f756eb8a7f36c2506
Signed-off-by: Marco Descher <marco@descher.at>
---
 .../e4/tools/emf/ui/internal/Messages.java    |   7 +-
 .../tools/emf/ui/internal/Messages.properties |   7 +-
 .../component/MenuContributionEditor.java     |  40 +++-
 .../component/dialogs/MenuIdDialog.java       | 189 ++++++++++++++++++
 4 files changed, 239 insertions(+), 4 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index e27edb7efb..8a78ad126f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Marco Descher <marco@descher.at> - Bug 395982
+ *     Marco Descher <marco@descher.at> - Bug 395982, Bug 396975
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
@@ -585,6 +585,11 @@ public class Messages {
 	public String ExpressionIdDialog_DialogMessage;
 	public String ExpressionIdDialog_Id;
 
+	public String MenuIdDialog_ShellTitle;
+	public String MenuIdDialog_DialogTitle;
+	public String MenuIdDialog_DialogMessage;
+	public String MenuIdDialog_Id;
+
 	public String CommandToStringConverter_None;
 
 	public String VRootBindingContexts_AddContext;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 402fef08b2..2395d438f2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -8,7 +8,7 @@
 # * Contributors:
 # *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
 # *		Sopot Cela <sopotcela@gmail.com> - enhancements
-# *     Marco Descher <marco@descher.at> - Bug 395982
+# *     Marco Descher <marco@descher.at> - Bug 395982, Bug 396975
 # ******************************************************************************
 ModelTooling_Common_Up=Up
 ModelTooling_Common_Down=Down
@@ -588,6 +588,11 @@ ExpressionIdDialog_DialogMessage=Find the expression ID defined through the 'org
 ExpressionIdDialog_Id=ID
 CommandToStringConverter_None=<None>
 
+MenuIdDialog_ShellTitle=Find Parent Menu Id
+MenuIdDialog_DialogTitle=Find Parent Menu Id
+MenuIdDialog_DialogMessage=Find the menu id to be used as parent (in fragment finds the imported menus only)
+MenuIdDialog_Id=Parent Id 
+
 VRootBindingContexts_AddContext=Binding Context
 VRootBindingContexts_TreeLabel=Binding Context
 VRootBindingContexts_TreeLabelDescription=Binding Context Bla Bla Bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 506f3f03d3..98dabb4016 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Marco Descher <marco@descher.at> - Bug 397650, Bug 395982
+ *     Marco Descher <marco@descher.at> - Bug 397650, Bug 395982, Bug 396975
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -19,16 +19,21 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIdDialog;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -63,6 +68,7 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class MenuContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -72,6 +78,12 @@ public class MenuContributionEditor extends AbstractComponentEditor {
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
+	@Inject
+	private IModelResource resource;
+
+	@Inject
+	private EModelService modelService;
+
 	private static class Struct {
 		private final String label;
 		private final EClass eClass;
@@ -207,7 +219,31 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-		ControlFactory.createTextField(parent, Messages.MenuContributionEditor_ParentId, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuContributionEditor_ParentId);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			final Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID).observeDetail(getMaster()));
+
+			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					MenuIdDialog dialog = new MenuIdDialog(t.getShell(), resource, (MMenuContribution) getMaster().getValue(), getEditingDomain(), modelService, Messages);
+					dialog.open();
+				}
+			});
+
+		}
+
 		ControlFactory.createTextField(parent, Messages.MenuContributionEditor_Position, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__POSITION_IN_PARENT));
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
new file mode 100644
index 0000000000..d5b1226574
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
@@ -0,0 +1,189 @@
+/*******************************************************************************
+ * Copyright (c) 2013 MEDEVIT, FHV and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Marco Descher <marco@descher.at> - initial implementation (Bug 396975)
+ *******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.AbstractTreeViewer;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerCell;
+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;
+
+public class MenuIdDialog extends TitleAreaDialog {
+
+	private EModelService modelService;
+	private TableViewer viewer;
+	private EditingDomain domain;
+	private IModelResource resource;
+	private MMenuContribution menuContribution;
+	private Messages messages;
+
+	public MenuIdDialog(Shell parentShell, IModelResource resource, MMenuContribution menuContribution, EditingDomain domain, EModelService modelService, Messages Messages) {
+		super(parentShell);
+		this.resource = resource;
+		this.modelService = modelService;
+		this.messages = Messages;
+		this.domain = domain;
+		this.menuContribution = menuContribution;
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		getShell().setText(messages.MenuIdDialog_ShellTitle);
+		setTitle(messages.MenuIdDialog_DialogTitle);
+		setMessage(messages.MenuIdDialog_DialogMessage);
+		Composite comp = (Composite) super.createDialogArea(parent);
+		Composite container = new Composite(comp, SWT.NONE);
+		container.setLayoutData(new GridData(GridData.FILL_BOTH));
+		container.setLayout(new GridLayout(2, false));
+
+		Label l = new Label(container, SWT.NONE);
+		l.setText(messages.MenuIdDialog_Id);
+
+		Text idField = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		idField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		final PatternFilter filter = new PatternFilter() {
+			@Override
+			protected boolean isParentMatch(Viewer viewer, Object element) {
+				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);
+			}
+		};
+
+		l = new Label(container, SWT.NONE);
+		viewer = new TableViewer(container);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setLabelProvider(new LabelProviderImpl());
+		viewer.addFilter(filter);
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+
+			public void doubleClick(DoubleClickEvent event) {
+				okPressed();
+			}
+		});
+
+		ControlFactory.attachFiltering(idField, viewer, filter);
+
+		if (resource.getRoot().get(0) instanceof MApplication) {
+			List<MMenu> list = new ArrayList<MMenu>();
+			// include Window main-menu instances
+			MApplication ma = ((MApplication) resource.getRoot().get(0));
+			for (MWindow m : ma.getChildren()) {
+				list.add(m.getMainMenu());
+			}
+			// include menu elements located within parts
+			List<MPart> mp = modelService.findElements(ma, null, MPart.class, null);
+			for (MPart mPart : mp) {
+				list.addAll(mPart.getMenus());
+			}
+			// include menu elements carried by tool items
+			List<MToolItem> mt = modelService.findElements(ma, null, MToolItem.class, null);
+			for (MToolItem mToolItem : mt) {
+				if (mToolItem.getMenu() != null)
+					list.add(mToolItem.getMenu());
+			}
+
+			for (MMenu mMenuEntry : list.toArray(new MMenu[] {})) {
+				performRecursiveCheck(mMenuEntry, list);
+			}
+
+			viewer.setInput(list);
+
+		} else if (resource.getRoot().get(0) instanceof MModelFragments) {
+			List<MApplicationElement> list = new ArrayList<MApplicationElement>();
+			for (MApplicationElement f : ((MModelFragments) resource.getRoot().get(0)).getImports()) {
+				if (f instanceof MMenu) {
+					list.add(f);
+				}
+			}
+			viewer.setInput(list);
+
+		}
+
+		return comp;
+	}
+
+	/**
+	 * A menu may contain another {@link MMenu} as a child; we want them to be
+	 * shown as an additional entry, so we recursively dive into these elements
+	 * 
+	 * @param mMenu
+	 * @param list
+	 */
+	private void performRecursiveCheck(MMenu mMenu, List<MMenu> list) {
+		List<MMenuElement> children = mMenu.getChildren();
+		for (MMenuElement child : children) {
+			if (child instanceof MMenu) {
+				MMenu mMenuChild = (MMenu) child;
+				list.add(mMenuChild);
+				performRecursiveCheck(mMenuChild, list);
+			}
+		}
+	}
+
+	@Override
+	protected void okPressed() {
+		if (!viewer.getSelection().isEmpty()) {
+			MMenu el = (MMenu) ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+			Command cmd = SetCommand.create(domain, menuContribution, MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID, el.getElementId());
+			if (cmd.canExecute()) {
+				domain.getCommandStack().execute(cmd);
+				super.okPressed();
+			}
+		}
+	}
+
+	static class LabelProviderImpl extends StyledCellLabelProvider {
+		@Override
+		public void update(ViewerCell cell) {
+			MMenu el = (MMenu) cell.getElement();
+			String elementId = (el.getElementId() != null) ? el.getElementId() : "(Id missing)";
+			StyledString str = new StyledString(elementId);
+			str.append(" - " + el.getLabel(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+			cell.setText(str.getString());
+			cell.setStyleRanges(str.getStyleRanges());
+		}
+	}
+}
\ No newline at end of file

From 8d59b023b9687ca286a16376d18ba0ac5777fd2d Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Mon, 21 Oct 2013 09:59:02 +0200
Subject: [PATCH 0633/1286] Bug 416109 - Context menu for Perspective ->
 Controls does not contain Placeholder

---
 .../common/component/virtual/VPerspectiveControlEditor.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index 347d336347..b2cce6db2a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -100,6 +100,12 @@ public void run() {
 				handleAdd(AdvancedPackageImpl.Literals.AREA);
 			}
 		});
+		actions.add(new Action(Messages.PerspectiveEditor_AddPlaceholder, createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
+			@Override
+			public void run() {
+				handleAdd(AdvancedPackageImpl.Literals.PLACEHOLDER);
+			}
+		});
 	}
 
 	@Override

From 47fe3195282c74edcad8bfcfa6af711a98d56605 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Thu, 17 Oct 2013 20:25:36 +0200
Subject: [PATCH 0634/1286] Bug 419723 - Update ModelProcessor class to uses
 services

Change-Id: I49c3e63500921c4bc3f84dd9058532e993b90681
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>

From 5ccb8a7d4083580f0f39dfd7d303781b146193f7 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Thu, 17 Oct 2013 23:11:54 +0200
Subject: [PATCH 0635/1286] Bug 419770 - Update templates for e4 wizard

Change-Id: I2349e16ef3c27a2ceca25ebf9ca9cda5ca539f4f
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../templates/src/handlers/AboutHandler.java  |  8 +--
 .../templates/src/handlers/OpenHandler.java   | 11 +---
 .../templates/src/handlers/QuitHandler.java   | 13 ++---
 .../templates/src/handlers/SaveHandler.java   | 56 ++++---------------
 .../templates/src/parts/SamplePart.java       | 37 +++++++++---
 5 files changed, 51 insertions(+), 74 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/templates/src/handlers/AboutHandler.java b/bundles/org.eclipse.e4.tools/templates/src/handlers/AboutHandler.java
index dce5d1002e..df0b8ed642 100644
--- a/bundles/org.eclipse.e4.tools/templates/src/handlers/AboutHandler.java
+++ b/bundles/org.eclipse.e4.tools/templates/src/handlers/AboutHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
+ * Copyright (c) 2010 - 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,19 +7,17 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Lars Vogel <lars.Vogel@gmail.com> - Bug 419770
  *******************************************************************************/
 package @@packageName@@;
 
-import javax.inject.Named;
-
 import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Shell;
 
 public class AboutHandler {
 	@Execute
-	public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell) {
+	public void execute(Shell shell) {
 		MessageDialog.openInformation(shell, "About", "Eclipse 4 Application example.");
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools/templates/src/handlers/OpenHandler.java b/bundles/org.eclipse.e4.tools/templates/src/handlers/OpenHandler.java
index 923e7c6935..fe13432bd7 100644
--- a/bundles/org.eclipse.e4.tools/templates/src/handlers/OpenHandler.java
+++ b/bundles/org.eclipse.e4.tools/templates/src/handlers/OpenHandler.java
@@ -7,24 +7,17 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Lars Vogel <lars.Vogel@gmail.com> - Bug 419770
  *******************************************************************************/
 package @@packageName@@;
 
-import java.lang.reflect.InvocationTargetException;
-
-import javax.inject.Named;
-
-import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Shell;
-
 public class OpenHandler {
 
 	@Execute
-	public void execute(
-			@Named(IServiceConstants.ACTIVE_SHELL) Shell shell){
+	public void execute(Shell shell){
 		FileDialog dialog = new FileDialog(shell);
 		dialog.open();
 	}
diff --git a/bundles/org.eclipse.e4.tools/templates/src/handlers/QuitHandler.java b/bundles/org.eclipse.e4.tools/templates/src/handlers/QuitHandler.java
index f49e7f88ed..3b1929b5c0 100644
--- a/bundles/org.eclipse.e4.tools/templates/src/handlers/QuitHandler.java
+++ b/bundles/org.eclipse.e4.tools/templates/src/handlers/QuitHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
+ * Copyright (c) 2010 - 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,24 +7,19 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Lars Vogel <lars.Vogel@gmail.com> - Bug 419770
  *******************************************************************************/
 package @@packageName@@;
 
-import java.lang.reflect.InvocationTargetException;
-
-import javax.inject.Named;
-
-import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.e4.ui.workbench.IWorkbench;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Shell;
 
+
 public class QuitHandler {
 	@Execute
-	public void execute(IWorkbench workbench,
-			@Named(IServiceConstants.ACTIVE_SHELL) Shell shell){
+	public void execute(IWorkbench workbench, Shell shell){
 		if (MessageDialog.openConfirm(shell, "Confirmation",
 				"Do you want to exit?")) {
 			workbench.close();
diff --git a/bundles/org.eclipse.e4.tools/templates/src/handlers/SaveHandler.java b/bundles/org.eclipse.e4.tools/templates/src/handlers/SaveHandler.java
index 02963726ef..1127141ead 100644
--- a/bundles/org.eclipse.e4.tools/templates/src/handlers/SaveHandler.java
+++ b/bundles/org.eclipse.e4.tools/templates/src/handlers/SaveHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
+ * Copyright (c) 2010 - 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,58 +7,26 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Lars Vogel <lars.Vogel@gmail.com> - Bug 419770
  *******************************************************************************/
 package @@packageName@@;
 
-import java.lang.reflect.InvocationTargetException;
-
-import javax.inject.Named;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.e4.core.contexts.ContextInjectionFactory;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.core.di.annotations.CanExecute;
-import org.eclipse.e4.ui.model.application.MContribution;
-import org.eclipse.e4.ui.model.application.ui.MDirtyable;
-import org.eclipse.e4.ui.services.IServiceConstants;
-//import org.eclipse.e4.ui.workbench.Persist;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.widgets.Shell;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
 
 public class SaveHandler {
+
 	@CanExecute
-	public boolean canExecute(
-			@Named(IServiceConstants.ACTIVE_PART) MDirtyable dirtyable) {
-		if (dirtyable == null) {
-			return false;
+	public boolean canExecute(EPartService partService) {
+		if (partService != null) {
+			return !partService.getDirtyParts().isEmpty();
 		}
-		return dirtyable.isDirty();
+		return false;
 	}
 
 	@Execute
-	public void execute(
-			IEclipseContext context,
-			@Named(IServiceConstants.ACTIVE_SHELL) Shell shell,
-			@Named(IServiceConstants.ACTIVE_PART) final MContribution contribution)
-			throws InvocationTargetException, InterruptedException {
-		final IEclipseContext pmContext = context.createChild();
-
-		ProgressMonitorDialog dialog = new ProgressMonitorDialog(shell);
-		dialog.open();
-		dialog.run(true, true, new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException, InterruptedException {
-				pmContext.set(IProgressMonitor.class.getName(), monitor);
-				if (contribution != null) {
-					Object clientObject = contribution.getObject();
-//					ContextInjectionFactory.invoke(clientObject, Persist.class, //$NON-NLS-1$
-//							pmContext, null);
-				}
-			}
-		});
-		
-		pmContext.dispose();
+	public void execute(EPartService partService) {
+		partService.saveAll(false);
 	}
-}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/templates/src/parts/SamplePart.java b/bundles/org.eclipse.e4.tools/templates/src/parts/SamplePart.java
index 0d63748064..28ae4816f7 100644
--- a/bundles/org.eclipse.e4.tools/templates/src/parts/SamplePart.java
+++ b/bundles/org.eclipse.e4.tools/templates/src/parts/SamplePart.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
+ * Copyright (c) 2010 - 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,31 +7,49 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Lars Vogel <lars.Vogel@gmail.com> - Bug 419770
  *******************************************************************************/
 package @@packageName2@@;
 
 import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
 import org.eclipse.e4.ui.di.Focus;
+import org.eclipse.e4.ui.di.Persist;
+import org.eclipse.e4.ui.model.application.ui.MDirtyable;
 import org.eclipse.jface.viewers.TableViewer;
 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;
 
 public class SamplePart {
 
-	private Label label;
+	private Text txtInput;
 	private TableViewer tableViewer;
 
+	@Inject
+	private MDirtyable dirty;
+
 	@PostConstruct
 	public void createComposite(Composite parent) {
-		parent.setLayout(new GridLayout());
+		parent.setLayout(new GridLayout(1, false));
 
-		label = new Label(parent, SWT.NONE);
-		label.setText("Sample table");
+		txtInput = new Text(parent, SWT.BORDER);
+		txtInput.setMessage("Enter text to mark part as dirty");
+		txtInput.addModifyListener(new ModifyListener() {
+			@Override
+			public void modifyText(ModifyEvent e) {
+				dirty.setDirty(true);
+			}
+		});
+		txtInput.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		tableViewer = new TableViewer(parent);
+
 		tableViewer.add("Sample item 1");
 		tableViewer.add("Sample item 2");
 		tableViewer.add("Sample item 3");
@@ -44,4 +62,9 @@ public void createComposite(Composite parent) {
 	public void setFocus() {
 		tableViewer.getTable().setFocus();
 	}
-}
+
+	@Persist
+	public void save() {
+		dirty.setDirty(false);
+	}
+}
\ No newline at end of file

From 6bda7d6bbaf10ccc6a8d833258f551f4d72f6bb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Brandstetter?= <Rene.Brandstetter@gmx.net>
Date: Wed, 16 Oct 2013 17:49:06 +0200
Subject: [PATCH 0636/1286] =?UTF-8?q?Bug=20419442=20=E2=80=93=20[Model-Edi?=
 =?UTF-8?q?tor]=20Creating=20a=20Command-Parameter=20without=20entering=20?=
 =?UTF-8?q?a=20Name=20causes=20a=20NPE=20on=20startup=20of=20the=20applica?=
 =?UTF-8?q?tion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Set the name of a new command to a generated default value
instead of leaving it null. The CommandParameterEditor will
display a warning if the CommandParameter Name or the
CommandParameter ID is empty.

Change-Id: Ib327e2e6c9ca5be24ed5edfbe5c2f3d055ebae4f
Signed-off-by: René Brandstetter <Rene.Brandstetter@gmx.net>
---
 .../e4/tools/emf/ui/internal/Messages.java    |  3 ++-
 .../tools/emf/ui/internal/Messages.properties |  1 +
 .../common/component/CommandEditor.java       | 20 +++++++++++++++++++
 .../component/CommandParameterEditor.java     |  4 ++--
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 8a78ad126f..0d4b8efecc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -79,6 +79,7 @@ public class Messages {
 	public String CommandEditor_ParameterId;
 	public String CommandEditor_Category;
 	public String CommandEditor_AddCommandParameter;
+	public String CommandEditor_NewCommandParameter;
 
 	public String DirectMenuItemEditor_Label;
 	public String DirectMenuItemEditor_Description;
@@ -642,4 +643,4 @@ public class Messages {
 	public String ModelEditor_ExtractFragment_NoParentId;
 	public String KeyBindingEditor_SequenceLowercase;
 	public String ModelTooling_CommandId_tooltip;
-}
\ No newline at end of file
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 2395d438f2..3dceed69eb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -78,6 +78,7 @@ CommandEditor_ParameterOptional_No=no
 CommandEditor_ParameterId=ID
 CommandEditor_Category=Category
 CommandEditor_AddCommandParameter=Command Parameter
+CommandEditor_NewCommandParameter=Command Parameter {0}
 
 DirectMenuItemEditor_Label=DirectMenuItem
 DirectMenuItemEditor_Description=DirectMenuItem bla bla bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index bcbe9b6db2..289ba0c821 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -65,6 +66,7 @@ public class CommandEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private EStackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
+	private MessageFormat newCommandParameterName;
 
 	private IEMFEditListProperty COMMAND__PARAMETERS = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
 
@@ -81,6 +83,8 @@ public void run() {
 				handleAddCommandParameter();
 			}
 		});
+
+		newCommandParameterName = new MessageFormat(Messages.CommandEditor_NewCommandParameter);
 	}
 
 	@Override
@@ -327,6 +331,7 @@ public FeaturePath[] getLabelProperties() {
 	protected void handleAddCommandParameter() {
 		MCommandParameter param = MCommandsFactory.INSTANCE.createCommandParameter();
 		setElementId(param);
+		param.setName(newCommandParameterName.format(new Object[] { getParameterCount() }));
 
 		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS, param);
 
@@ -342,4 +347,19 @@ public List<Action> getActions(Object element) {
 		l.addAll(actions);
 		return l;
 	}
+
+	/**
+	 * Returns the current amount of {@link MCommandParameter}s the edited
+	 * {@link MCommand} has.
+	 * 
+	 * @return the amount of {@link MCommandParameter}s of the edited
+	 *         {@link MCommand}
+	 */
+	private int getParameterCount() {
+		// getChildList() will always create a new IObservableList and
+		// this method uses the normal EMF way to retrieve the count manually.
+		EObject command = (EObject) getMaster().getValue();
+		List<?> commandParameters = (List<?>) command.eGet(CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
+		return commandParameters.size();
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index ffea0eb2c5..0422276e43 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -134,8 +134,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.CommandParameterEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID), Messages.ModelTooling_Empty_Warning);
+		ControlFactory.createTextField(parent, Messages.CommandParameterEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME), Messages.ModelTooling_Empty_Warning);
 		ControlFactory.createTextField(parent, Messages.CommandParameterEditor_TypeId, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__TYPE_ID));
 
 		{

From 8ec9e592eefc50bf15ada7137dadf9fe2344ed33 Mon Sep 17 00:00:00 2001
From: dvasyn <akafakir@gmail.com>
Date: Sun, 17 Mar 2013 18:28:33 +0400
Subject: [PATCH 0637/1286] Bug 401215 - [Tooling] Binding table editor is now
 showing binding context ID instead of Name

Change-Id: Ic828775276e9ad2cb9fb25d52ebf004197d8fb36
Signed-off-by: dvasyn <akafakir@gmail.com>
---
 .../emf/ui/internal/common/component/BindingTableEditor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 2d03f37166..9e701e5b22 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -174,7 +174,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT, CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME)).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));

From 6c657267be567fe2da41f10a5535327fe70c55e4 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Tue, 22 Oct 2013 17:02:54 +0200
Subject: [PATCH 0638/1286] [Bug 419723] Update ModelProcessor to uses services

Removes syso statement

From d3b6b0a921d3bc01b1fa8627404ce8fa484ce06f Mon Sep 17 00:00:00 2001
From: Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de>
Date: Tue, 29 Oct 2013 18:03:14 +0100
Subject: [PATCH 0639/1286] Bug 420642 - Add Eclipse-SourceReferences to binary
 bundles https://bugs.eclipse.org/420642

Change-Id: Id679afe00b75bc0b97e1a212973b71e68447daad
Signed-off-by: Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de>

From 4fa4d00ead35736e5ae290276af2c08d9003ea94 Mon Sep 17 00:00:00 2001
From: "mark.hoffmann" <mark.hoffmann@web.de>
Date: Tue, 29 Oct 2013 21:15:18 +0100
Subject: [PATCH 0640/1286] Bug 420671 - E4 Tools application extensions not
 exported

Change-Id: Ia5f25a12446c4514b06629dac9fdef7174bc72d4
Signed-off-by: mhoffmann <mark.hoffmann@web.de>
---
 bundles/org.eclipse.e4.tools.emf.ui/build.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/build.properties b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
index e0bc710666..cb9211218e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
@@ -5,7 +5,8 @@ bin.includes = .,\
                about.html,\
                plugin.xml,\
                css/,\
-               OSGI-INF/
+               OSGI-INF/,\
+               schema/
 output.. = bin/
 jars.compile.order = .
 source.. = src/

From d1b54e2a7dd4b44bca36dd468f99d72ec43c52ae Mon Sep 17 00:00:00 2001
From: Patrik Suzzi <psuzzi@gmail.com>
Date: Tue, 29 Oct 2013 22:05:46 +0100
Subject: [PATCH 0641/1286] Bug 417008 - creating a new handler class
 overwrites an existing class

Change-Id: I09cd8b69fca44ca03f6776d5b788b706d4226551
Signed-off-by: Patrik Suzzi <psuzzi@gmail.com>
---
 .../wizards/classes/AbstractNewClassPage.java | 109 +++++++++++-------
 1 file changed, 70 insertions(+), 39 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index 6c72852606..3cbd9364a4 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -20,11 +20,15 @@
 import org.eclipse.core.databinding.beans.BeanProperties;
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.internal.tools.ToolsPlugin;
+import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaModel;
 import org.eclipse.jdt.core.IJavaProject;
@@ -107,43 +111,62 @@ public void addPropertyChangeListener(PropertyChangeListener listener) {
 		public void removePropertyChangeListener(PropertyChangeListener listener) {
 			support.removePropertyChangeListener(listener);
 		}
+
+		public static boolean exists(IPackageFragmentRoot pFragmentRoot, IPackageFragment pPackageFragment, String pName){
+
+			if( pFragmentRoot==null )
+				return false;
+
+			String cuName = pName + ".java";
+			IFile file;
+
+			if( pPackageFragment != null ) {
+				ICompilationUnit unit = pPackageFragment.getCompilationUnit(cuName);
+				IResource resource = unit.getResource();
+				file = (IFile) resource;
+			} else {
+				IFolder p = (IFolder) pFragmentRoot.getResource();
+				file = p.getFile(cuName);
+			}
+			return file.exists();
+		}
 	}
 
 	private JavaClass clazz;
 	private IPackageFragmentRoot froot;
-	private IWorkspaceRoot fWorkspaceRoot;
+	private final IWorkspaceRoot fWorkspaceRoot;
 	private String initialString;
-	
+
 	protected AbstractNewClassPage(String pageName, String title, String description, IPackageFragmentRoot froot, IWorkspaceRoot fWorkspaceRoot) {
 		super(pageName);
 		this.froot = froot;
 		this.fWorkspaceRoot = fWorkspaceRoot;
-		
+
 		setTitle(title);
 		setDescription(description);
 	}
-	
+
 	protected AbstractNewClassPage(String pageName, String title, String description, IPackageFragmentRoot froot, IWorkspaceRoot fWorkspaceRoot, String initialString){
 		this(pageName,title,description,froot,fWorkspaceRoot);
 		this.initialString=initialString;
 	}
-	
+
 	public void createControl(Composite parent) {
 		final Image img = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newclass_wiz.png"));
 		setImageDescriptor(ImageDescriptor.createFromImage(img));
-		
+
 		parent.addDisposeListener(new DisposeListener() {
-			
+
 			public void widgetDisposed(DisposeEvent e) {
 				img.dispose();
 				setImageDescriptor(null);
 			}
 		});
 
-		parent = new Composite(parent, SWT.NULL);		
+		parent = new Composite(parent, SWT.NULL);
 		parent.setLayoutData(new GridData(GridData.FILL_BOTH));
 		parent.setLayout(new GridLayout(3, false));
-		
+
 		clazz = createInstance();
 		if ((froot!=null)&&(initialString!=null)){
 		clazz.setPackageFragment(froot.getPackageFragment(parseInitialStringForPackage(initialString)==null?"":parseInitialStringForPackage(initialString)));
@@ -151,7 +174,7 @@ public void widgetDisposed(DisposeEvent e) {
 		}
 		DataBindingContext dbc = new DataBindingContext();
 		WizardPageSupport.create(this, dbc);
-		
+
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText("Source folder");
@@ -159,11 +182,11 @@ public void widgetDisposed(DisposeEvent e) {
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
-			
+
 			final Binding bd = dbc.bindValue(
-					WidgetProperties.text().observe(t), 
-					BeanProperties.value("fragmentRoot").observe(clazz), 
-					new UpdateValueStrategy().setBeforeSetValidator(new PFRootValidator()), 
+					WidgetProperties.text().observe(t),
+					BeanProperties.value("fragmentRoot").observe(clazz),
+					new UpdateValueStrategy().setBeforeSetValidator(new PFRootValidator()),
 					new UpdateValueStrategy().setConverter(new PackageFragmentRootToStringConverter())
 			);
 
@@ -175,9 +198,9 @@ public void widgetSelected(SelectionEvent e) {
 					IPackageFragmentRoot root = choosePackageRoot();
 					if( root != null ) {
 						froot = root;
-						clazz.setFragmentRoot(root);	
+						clazz.setFragmentRoot(root);
 					}
-					bd.updateModelToTarget(); 
+					bd.updateModelToTarget();
 				}
 			});
 		}
@@ -189,12 +212,12 @@ public void widgetSelected(SelectionEvent e) {
 			t.setEditable(true);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			final Binding bd = dbc.bindValue(
-					WidgetProperties.text(SWT.Modify).observe(t), 
+					WidgetProperties.text(SWT.Modify).observe(t),
 					BeanProperties.value("packageFragment").observe(clazz),
-					new UpdateValueStrategy().setConverter(new StringToPackageFragmentConverter(clazz)), 
+					new UpdateValueStrategy().setConverter(new StringToPackageFragmentConverter(clazz)),
 					new UpdateValueStrategy().setConverter(new PackageFragmentToStringConverter())
 			);
-			
+
 			Button b = new Button(parent, SWT.PUSH);
 			b.setText("Browse ...");
 			b.addSelectionListener(new SelectionAdapter() {
@@ -202,7 +225,7 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					IPackageFragment fragment = choosePackage();
 					if( fragment != null ) {
-						clazz.setPackageFragment(fragment);	
+						clazz.setPackageFragment(fragment);
 					}
 					bd.updateModelToTarget(); //TODO Find out why this is needed
 				}
@@ -217,8 +240,8 @@ public void widgetSelected(SelectionEvent e) {
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			dbc.bindValue(textProp.observe(t), BeanProperties.value("name", String.class).observe(clazz), 
-					new UpdateValueStrategy().setBeforeSetValidator(new ClassnameValidator()),null);
+			dbc.bindValue(textProp.observe(t), BeanProperties.value("name", String.class).observe(clazz),
+					new UpdateValueStrategy().setBeforeSetValidator(new ClassnameValidator(clazz)),null);
 
 			new Label(parent, SWT.NONE);
 		}
@@ -227,17 +250,17 @@ public void widgetSelected(SelectionEvent e) {
 			Label l = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
 			l.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 3, 1));
 		}
-		
+
 		createFields(parent, dbc);
 		setControl(parent);
 	}
-	
+
 	private String parseInitialStringForPackage(String initialString2) {
 		if (initialString2==null) return null;
 		int ioBC = initialString2.indexOf("bundleclass://");
 		int iSecondSlash = initialString2.lastIndexOf('/');
 		if (
-		
+
 			(initialString2.length()==0)||//empty
 			(ioBC==-1)||//no bundle class
 			(iSecondSlash==-1)||//no package &| class name
@@ -250,13 +273,13 @@ private String parseInitialStringForPackage(String initialString2) {
 		String packageString = initialString2.substring(iSecondSlash+1, lastDot);
 		return packageString;
 	}
-	
+
 	private String parseInitialStringForClassName(String initialString){
 		if (initialString==null) return null;
 		int ioBC = initialString.indexOf("bundleclass://");
 		int iSecondSlash = initialString.lastIndexOf('/');
 		if (
-		
+
 			(initialString.length()==0)||//empty
 			(ioBC==-1)||//no bundle class
 			(iSecondSlash==-1)||//no package &| class name
@@ -332,7 +355,7 @@ public boolean select(Viewer viewer, Object parent, Object element) {
 		}
 		return null;
 	}
-	
+
 	private IPackageFragment choosePackage() {
 		IJavaElement[] packages= null;
 		try {
@@ -371,27 +394,35 @@ private IPackageFragment choosePackage() {
 	public JavaClass getClazz() {
 		return clazz;
 	}
-	
+
 	static class ClassnameValidator implements IValidator {
 
+		private final JavaClass clazz;
+
+		public ClassnameValidator(JavaClass clazz) {
+			this.clazz = clazz;
+		}
+
 		public IStatus validate(Object value) {
 			String name = value.toString();
 			if (name.length()==0)
 				return new Status(IStatus.ERROR,ToolsPlugin.PLUGIN_ID,"Name must not be empty");
 			if ((name.indexOf('.')!=-1)||(name.trim().indexOf(' ')!=-1))
 				return new Status(IStatus.ERROR,ToolsPlugin.PLUGIN_ID,"Name must not be qualified or contain spaces");
+			if( JavaClass.exists(clazz.getFragmentRoot(), clazz.getPackageFragment(), name) )
+				return new Status(IStatus.ERROR,ToolsPlugin.PLUGIN_ID,"Java Class already exists");
 
 			return JavaConventions.validateJavaTypeName(name,JavaCore.VERSION_1_3,JavaCore.VERSION_1_3);
 		}
 	}
-	
+
 	static class PFRootValidator implements IValidator {
 
 		public IStatus validate(Object value) {
 			String name = value.toString();
 			if (name.length()==0)
 				return new Status(IStatus.ERROR,ToolsPlugin.PLUGIN_ID,"Source folder must not be empty");
-			
+
 
 			return new Status(IStatus.OK,ToolsPlugin.PLUGIN_ID,"");
 		}
@@ -411,13 +442,13 @@ public Object convert(Object fromObject) {
 			return f.getPath().makeRelative().toString();
 		}
 	}
-	
+
 	static class PackageFragmentToStringConverter extends Converter {
 
 		public PackageFragmentToStringConverter() {
 			super(IPackageFragment.class, String.class);
 		}
-		
+
 		public Object convert(Object fromObject) {
 			if( fromObject == null ) {
 				return "";
@@ -426,24 +457,24 @@ public Object convert(Object fromObject) {
 			return f.getElementName();
 		}
 	}
-	
+
 	static class StringToPackageFragmentConverter extends Converter {
 
-		private JavaClass clazz;
+		private final JavaClass clazz;
 
 		public StringToPackageFragmentConverter(JavaClass clazz) {
 			super(String.class, IPackageFragment.class);
 			this.clazz = clazz;
 		}
-		
+
 		public Object convert(Object fromObject) {
 			if (clazz.getFragmentRoot()==null) return null;
-			if( fromObject == null ) {
+			if (fromObject == null) {
 				return clazz.getFragmentRoot().getPackageFragment("");
 			}
-			
+
 				return clazz.getFragmentRoot().getPackageFragment((String) fromObject);
-			
+
 		}
 	}
 }

From f84504be4e9c815f793ec6543d5e5b7880bef15f Mon Sep 17 00:00:00 2001
From: Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de>
Date: Thu, 7 Nov 2013 17:05:31 +0100
Subject: [PATCH 0642/1286] [Bug 421259: LiveEditor's keybinding does not work
 out of the box in newly generated e4 application
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=421259

Change-Id: I2c35d912feb5e3088a4ad55c2f82d7b05ebef822
Signed-off-by: Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de>

From 7e666d22ddb2d7ff39d8cb9521b23fffcf56f7ab Mon Sep 17 00:00:00 2001
From: Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de>
Date: Fri, 8 Nov 2013 20:30:28 +0100
Subject: [PATCH 0643/1286] [Bug 421365]: New part wizard
 (org.eclipse.e4.internal.tools.wizards.classes.NewPartClassWizard.PartClass)
 pre-selects to generate @Focus method but not @PostConstruct
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=421365

Change-Id: Ide9a27c71a1611f202c62aafc9262494c16b0f73
Signed-off-by: Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de>
---
 .../e4/internal/tools/wizards/classes/NewPartClassWizard.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
index 0154229d31..a28c2d0111 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
@@ -169,13 +169,13 @@ protected String getContent() {
 	public static class PartClass extends JavaClass {
 		private PropertyChangeSupport support = new PropertyChangeSupport(this);
 
-		private boolean usePostConstruct;
+		private boolean usePostConstruct = true;
 		private String postConstructMethodName = "postConstruct";
 
 		private boolean usePredestroy;
 		private String preDestroyMethodName = "preDestroy";
 
-		private boolean useFocus = true;
+		private boolean useFocus;
 		private String focusMethodName = "onFocus";
 
 		private boolean usePersist;

From d97e5bdc1fca3ebf84e9e80795fece226762995b Mon Sep 17 00:00:00 2001
From: Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de>
Date: Fri, 8 Nov 2013 22:01:27 +0100
Subject: [PATCH 0644/1286] [Bug 421369]: Layout broken in part form
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=421369

Change-Id: If64f334c7b60406afa9bef70b3de6dd2f3594265
Signed-off-by: Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de>
---
 .../emf/ui/internal/common/component/PartEditor.java  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 9c45ad1436..2abc7d94d3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -159,7 +159,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
 		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		CTabItem item = new CTabItem(folder, SWT.BORDER);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
@@ -234,6 +234,10 @@ public void widgetSelected(SelectionEvent e) {
 					}
 				});
 			} else {
+				// Dispose the lnk widget, which is unused in this else branch
+				// and screws up the layout: see https://bugs.eclipse.org/421369
+				lnk.dispose();
+
 				Label l = new Label(parent, SWT.NONE);
 				l.setText(Messages.PartEditor_ClassURI);
 				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
@@ -245,7 +249,10 @@ public void widgetSelected(SelectionEvent e) {
 			t.addModifyListener(new ModifyListener() {
 
 				public void modifyText(ModifyEvent e) {
-					lnk.setToolTipText(((Text) (e.getSource())).getText());
+					// lnk might be disposed if else branch above taken
+					if (!lnk.isDisposed()) {
+						lnk.setToolTipText(((Text) (e.getSource())).getText());
+					}
 				}
 			});
 			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());

From 38da3ad2644df357ae2af22c0d5ace6212a2be3e Mon Sep 17 00:00:00 2001
From: Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de>
Date: Thu, 7 Nov 2013 10:33:23 +0100
Subject: [PATCH 0645/1286] [Bug 421207]: Use widely allowed 'http://' instead
 of 'git://' protocol for Eclipse-SourceReferences
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=421207

Change-Id: If13664bcd16477506dd1e45b61e06cd5095db279
Signed-off-by: Markus Alexander Kuppe <bugs.eclipse.org@lemmster.de>

From 278aa7b3003f88391763f1947f1077d6fb2fd6ff Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Mon, 11 Nov 2013 16:08:08 +0100
Subject: [PATCH 0646/1286] Bug 421453 - Code cleanup in the e4 tools projects

Change-Id: I0a2100222f73a4cd986099b2d7126f7992a82987
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../internal/ContextServiceFactory.java       | 10 ++---
 .../internal/DefaultLoggerProvider.java       |  2 +-
 .../compat/internal/WorkbenchLogger.java      | 11 ++++++
 .../compat/parts/DISaveableViewPart.java      |  1 +
 .../emf/editor3x/E4WorkbenchModelEditor.java  |  1 +
 .../e4/tools/emf/editor3x/ModelExtractor.java |  3 +-
 .../PDEClassContributionProvider.java         |  2 +-
 .../editor3x/RefactorParticipantDelegate.java |  3 +-
 .../extension/AddonContributionEditor.java    |  9 +----
 ...micMenuContributionContributionEditor.java |  3 +-
 .../extension/HandlerContributionEditor.java  |  4 +-
 .../extension/PartContributionEditor.java     |  3 +-
 .../ui/common/CommandToStringConverter.java   |  1 +
 .../ui/common/ContributionURIValidator.java   | 11 ++++--
 .../tools/emf/ui/common/MemoryTransfer.java   |  2 +
 .../eclipse/e4/tools/emf/ui/common/Util.java  |  1 +
 .../tools/emf/ui/common/XMIModelResource.java |  9 +++++
 .../component/AbstractComponentEditor.java    |  1 +
 .../ObservableColumnLabelProvider.java        |  3 ++
 .../tools/emf/ui/internal/PatternFilter.java  |  1 +
 .../emf/ui/internal/ShadowComposite.java      |  4 ++
 .../internal/common/ControlHighlighter.java   |  1 +
 .../emf/ui/internal/common/ModelEditor.java   | 38 ++++++++++++++++---
 .../emf/ui/internal/common/VirtualEntry.java  |  1 +
 .../common/component/AddonsEditor.java        |  1 +
 .../common/component/ApplicationEditor.java   |  9 +++++
 .../common/component/BindingTableEditor.java  |  4 +-
 .../common/component/ControlFactory.java      |  9 +++++
 .../component/DirectMenuItemEditor.java       |  2 +
 .../component/DirectToolItemEditor.java       |  3 ++
 .../DynamicMenuContributionEditor.java        |  1 +
 .../component/HandledMenuItemEditor.java      |  1 +
 .../component/HandledToolItemEditor.java      |  1 +
 .../common/component/HandlerEditor.java       |  1 +
 .../common/component/KeyBindingEditor.java    |  2 +
 .../internal/common/component/MenuEditor.java |  2 +
 .../common/component/MenuItemEditor.java      |  4 ++
 .../component/PartDescriptorEditor.java       |  1 +
 .../internal/common/component/PartEditor.java |  2 +
 .../component/PartSashContainerEditor.java    |  6 ++-
 .../common/component/PartStackEditor.java     |  6 ++-
 .../component/PerspectiveStackEditor.java     |  4 +-
 .../common/component/PlaceholderEditor.java   |  2 +
 .../common/component/ToolItemEditor.java      |  5 +++
 .../common/component/TrimmedWindowEditor.java |  1 +
 .../common/component/WindowEditor.java        |  2 +
 .../AbstractCommandSelectionDialog.java       |  5 +++
 .../component/dialogs/AbstractIconDialog.java |  5 +++
 .../BindingContextSelectionDialog.java        |  5 +++
 .../CommandCategorySelectionDialog.java       |  7 +++-
 .../dialogs/ContributionClassDialog.java      |  5 +++
 .../component/dialogs/ExpressionIdDialog.java |  3 ++
 .../dialogs/FeatureSelectionDialog.java       | 15 +++++++-
 .../dialogs/FindImportElementDialog.java      |  4 ++
 .../FindParentReferenceElementDialog.java     |  5 +++
 .../component/dialogs/MenuIdDialog.java       |  1 +
 .../dialogs/SharedElementsDialog.java         |  4 ++
 .../virtual/VApplicationCategoriesEditor.java |  4 +-
 .../component/virtual/VCommandEditor.java     |  4 +-
 .../component/virtual/VHandlerEditor.java     |  4 +-
 .../component/virtual/VPartDescriptor.java    |  4 +-
 .../virtual/VWindowSharedElementsEditor.java  |  6 ++-
 .../common/objectdata/ObjectViewer.java       |  8 ++++
 .../properties/ExternalizeStringHandler.java  |  6 ++-
 .../ProjectOSGiTranslationProvider.java       |  3 ++
 .../internal/common/uistructure/UIViewer.java |  2 +
 .../uistructure/WidgetContentProvider.java    |  6 +++
 .../internal/common/xml/AnnotationAccess.java |  9 +++++
 .../xml/EMFDocumentResourceMediator.java      |  2 +
 .../xml/NonRuleBasedDamagerRepairer.java      |  3 ++
 .../emf/ui/internal/common/xml/TagRule.java   |  1 +
 .../internal/common/xml/XMLConfiguration.java |  3 ++
 .../common/xml/XMLDoubleClickStrategy.java    |  1 +
 .../common/xml/XMLWhitespaceDetector.java     |  1 +
 .../emf/ui/internal/imp/ModelImportPage1.java | 11 ++++++
 .../emf/ui/internal/imp/RegistryUtil.java     |  6 +--
 .../internal/wbm/ApplicationModelEditor.java  |  3 ++
 77 files changed, 291 insertions(+), 49 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index f487fdeff3..e7b2ccb76b 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -97,20 +97,20 @@ public void asyncExec(Runnable runnable) {
 				public void setClassname(Object widget, String classname) {
 					((Widget) widget).setData(
 							"org.eclipse.e4.ui.css.CssClassName", classname); //$NON-NLS-1$
-					engine.applyStyles((Widget) widget, true);
+					engine.applyStyles(widget, true);
 				}
 
 				public void setId(Object widget, String id) {
 					((Widget) widget).setData("org.eclipse.e4.ui.css.id", id); //$NON-NLS-1$
-					engine.applyStyles((Widget) widget, true);
+					engine.applyStyles(widget, true);
 				}
 
 				public void style(Object widget) {
-					engine.applyStyles((Widget) widget, true);
+					engine.applyStyles(widget, true);
 				}
 
 				public CSSStyleDeclaration getStyle(Object widget) {
-					return engine.getStyle((Widget) widget);
+					return engine.getStyle(widget);
 				}
 
 				public void setClassnameAndId(Object widget, String classname,
@@ -118,7 +118,7 @@ public void setClassnameAndId(Object widget, String classname,
 					((Widget) widget).setData(
 							"org.eclipse.e4.ui.css.CssClassName", classname); //$NON-NLS-1$
 					((Widget) widget).setData("org.eclipse.e4.ui.css.id", id); //$NON-NLS-1$
-					engine.applyStyles((Widget) widget, true);
+					engine.applyStyles(widget, true);
 				}
 			});
 			
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
index b3f922b062..5f0a7a6b42 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
@@ -15,6 +15,6 @@ public class DefaultLoggerProvider implements ILoggerProvider {
 	public Logger getClassLogger(Class<?> clazz) {
 		IEclipseContext childContext = context.createChild();
 		childContext.set("logger.bundlename", FrameworkUtil.getBundle(clazz).getSymbolicName()); //$NON-NLS-1$
-		return (Logger) ContextInjectionFactory.make(WorkbenchLogger.class, childContext);
+		return ContextInjectionFactory.make(WorkbenchLogger.class, childContext);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
index ff8cbf85dc..eb14dfa4d2 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
@@ -30,14 +30,17 @@ public WorkbenchLogger() {
 		super();
 	}
 
+	@Override
 	public void debug(Throwable t) {
 		debug(t, null);
 	}
 
+	@Override
 	public void debug(Throwable t, String message) {
 		trace(t, message);
 	}
 
+	@Override
 	public void error(Throwable t, String message) {
 		log(new Status(IStatus.ERROR, bundle.getSymbolicName(),
 				message, t));
@@ -73,27 +76,33 @@ private static FrameworkLogEntry getLog(IStatus status) {
 				status.getMessage(), stackCode, t, children);
 	}
 
+	@Override
 	public void info(Throwable t, String message) {
 		log(new Status(IStatus.INFO, bundle.getSymbolicName(), message,
 				t));
 	}
 
+	@Override
 	public boolean isDebugEnabled() {
 		return false;
 	}
 
+	@Override
 	public boolean isErrorEnabled() {
 		return true;
 	}
 
+	@Override
 	public boolean isInfoEnabled() {
 		return true;
 	}
 
+	@Override
 	public boolean isTraceEnabled() {
 		return false;
 	}
 
+	@Override
 	public boolean isWarnEnabled() {
 		return true;
 	}
@@ -129,6 +138,7 @@ public void setFrameworkLog(FrameworkLog log) {
 		this.log = log;
 	}
 
+	@Override
 	public void trace(Throwable t, String message) {
 		if (trace != null) {
 			trace.trace(null, message, t);
@@ -138,6 +148,7 @@ public void trace(Throwable t, String message) {
 		}
 	}
 
+	@Override
 	public void warn(Throwable t, String message) {
 		log(new Status(IStatus.WARNING, bundle.getSymbolicName(),
 				message, t));
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
index b9cb94eb4c..b3e591c033 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
@@ -51,6 +51,7 @@ public boolean isDirty() {
 		return dirtyState;
 	}
 
+	@Override
 	public void init(IViewSite site) throws PartInitException {
 		super.init(site);
 		
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
index 370dfb9cdf..5502f73712 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -44,6 +44,7 @@ public void createPartControl(Composite parent) {
 		setPartName(getEditorInput().getName());
 	}
 	
+	@Override
 	protected void makeActions() {
 		super.makeActions();
 		undoAction = new UndoAction(getComponent().getModelProvider());
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java
index ee3f155664..c0b46b8725 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java
@@ -6,6 +6,7 @@
 import org.eclipse.e4.internal.tools.wizards.model.ExtractContributionModelWizard;
 import org.eclipse.e4.tools.emf.ui.common.IModelExtractor;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog; 
 import org.eclipse.swt.widgets.Shell;
  
@@ -17,7 +18,7 @@ public boolean extract(Shell shell, IProject project,
 		ExtractContributionModelWizard extractContributionModelWizard = new ExtractContributionModelWizard(maes);
 		extractContributionModelWizard.setup(project);
 		WizardDialog wizardDialog = new WizardDialog(shell, extractContributionModelWizard);
-		return wizardDialog.open() == WizardDialog.OK;
+		return wizardDialog.open() == Window.OK;
 	}
 
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index 4ba2573e25..77060deb40 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -18,7 +18,6 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider;
@@ -81,6 +80,7 @@ public void findContribution(final Filter filter,  final ContributionResultHandl
 //		char[] typeName = "*".toCharArray();
 		
 		TypeNameRequestor req = new TypeNameRequestor() {
+			@Override
 			public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path) {
 				// Accept search results from the JDT SearchEngine
 				String cName = new String(simpleTypeName);
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
index f38b95a19f..de104ff5fc 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
@@ -42,10 +42,11 @@ public static Change createChange(IProgressMonitor pm,
 
 		final Map<IFile, TextFileChange> changes = new HashMap<IFile, TextFileChange>();
 		TextSearchRequestor searchRequestor = new TextSearchRequestor() {
+			@Override
 			public boolean acceptPatternMatch(TextSearchMatchAccess matchAccess)
 					throws CoreException {
 				IFile file = matchAccess.getFile();
-				TextFileChange change = (TextFileChange) changes.get(file);
+				TextFileChange change = changes.get(file);
 
 				if (change == null) {
 					TextChange textChange = p.getTextChange(file);
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
index 6b8fb1cd88..6b3d9f20d6 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
@@ -14,7 +14,6 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.e4.internal.tools.wizards.classes.NewAddonClassWizard;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.ui.model.application.MContribution;
@@ -32,14 +31,10 @@
 import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.core.project.IBundleProjectDescription;
-import org.eclipse.pde.core.project.IBundleProjectService;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PartInitException;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceReference;
 
 public class AddonContributionEditor implements IContributionClassCreator {
 
@@ -58,7 +53,7 @@ private void createOpen(MContribution contribution, EditingDomain domain,
 			NewAddonClassWizard wizard = new NewAddonClassWizard(contribution.getContributionURI());
 			wizard.init( null, new StructuredSelection(project));
 			WizardDialog dialog = new WizardDialog(shell, wizard);
-			if( dialog.open() == WizardDialog.OK ) {
+			if( dialog.open() == Window.OK ) {
 				IFile f = wizard.getFile();
 				ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
 				try {
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java
index a9f1c3ceaf..a147c583e2 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java
@@ -31,6 +31,7 @@
 import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PartInitException;
@@ -48,7 +49,7 @@ public void createOpen(MContribution contribution, EditingDomain domain,
 			NewDynamicMenuContributionClassWizard wizard = new NewDynamicMenuContributionClassWizard(contribution.getContributionURI());
 			wizard.init( null, new StructuredSelection(project));
 			WizardDialog dialog = new WizardDialog(shell, wizard);
-			if( dialog.open() == WizardDialog.OK ) {
+			if( dialog.open() == Window.OK ) {
 				IFile f = wizard.getFile();
 				ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
 				try {
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
index 1d9ae41d51..f1379dd071 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
@@ -31,9 +31,9 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PartInitException;
@@ -48,7 +48,7 @@ private void createOpen(MContribution contribution, EditingDomain domain, IProje
 			NewHandlerClassWizard wizard = new NewHandlerClassWizard(contribution.getContributionURI());
 			wizard.init( null, new StructuredSelection(project));
 			WizardDialog dialog = new WizardDialog(shell, wizard);
-			if( dialog.open() == WizardDialog.OK ) {
+			if( dialog.open() == Window.OK ) {
 				IFile f = wizard.getFile();
 				ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
 				try {
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
index c3d1b600a9..c1aa9a4000 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
@@ -32,6 +32,7 @@
 import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PartInitException;
@@ -50,7 +51,7 @@ private void createOpen(MContribution contribution, EditingDomain domain,
 			NewPartClassWizard wizard = new NewPartClassWizard(contribution.getContributionURI());
 			wizard.init(null, new StructuredSelection(project));
 			WizardDialog dialog = new WizardDialog(shell, wizard);
-			if (dialog.open() == WizardDialog.OK) {
+			if (dialog.open() == Window.OK) {
 				IFile f = wizard.getFile();
 				ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
 				try {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
index 87692fbe2e..d3979790ac 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
@@ -25,6 +25,7 @@ public CommandToStringConverter(Messages Messages) {
 		this.Messages = Messages;
 	}
 
+	@Override
 	public Object convert(Object fromObject) {
 		MCommand cmd = (MCommand) fromObject;
 		String elementId = null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
index 4ec3193764..ae3d97b1e1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
@@ -17,19 +17,22 @@
 
 public class ContributionURIValidator implements IValidator {
 
+	private static final String PLUGIN_ID = "org.eclipse.e4.tools.emf.ui";
+
+	@Override
 	public IStatus validate(Object value) {
 		if (value == null) {
-			return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", "The URI must not be empty!");
+			return new Status(IStatus.ERROR, PLUGIN_ID, "The URI must not be empty!");
 		} else if (!value.toString().startsWith("bundleclass:")) {
-			return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", "The URI has to start with 'platform:/plugin'");
+			return new Status(IStatus.ERROR, PLUGIN_ID, "The URI has to start with 'platform:/plugin'");
 		} else {
 			try {
 				URI uri = URI.createURI(value.toString());
 				if (uri.authority() == null || uri.authority().length() == 0 || uri.segmentCount() != 1) {
-					return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", "The uri has to have the format 'bundleclass://$$bundleId$$/$$className$$'");
+					return new Status(IStatus.ERROR, PLUGIN_ID, "The uri has to have the format 'bundleclass://$$bundleId$$/$$className$$'");
 				}
 			} catch (Exception e) {
-				return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", e.getMessage());
+				return new Status(IStatus.ERROR, PLUGIN_ID, e.getMessage());
 			}
 
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java
index 4e378b5ccd..2ee24af40f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java
@@ -42,6 +42,7 @@ protected String[] getTypeNames() {
 		return new String[] { NAME };
 	}
 
+	@Override
 	public void javaToNative(Object object, TransferData transferData) {
 		this.uid = UUID.randomUUID().toString();
 		this.object = object;
@@ -50,6 +51,7 @@ public void javaToNative(Object object, TransferData transferData) {
 		}
 	}
 
+	@Override
 	public Object nativeToJava(TransferData transferData) {
 		byte[] bytes = (byte[]) super.nativeToJava(transferData);
 		if (bytes == null)
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index 3ea0cbf284..a3b77af41f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -200,6 +200,7 @@ public static final void addDecoration(Control control, Binding binding) {
 		final ControlDecoration dec = new ControlDecoration(control, SWT.BOTTOM);
 		binding.getValidationStatus().addValueChangeListener(new IValueChangeListener() {
 
+			@Override
 			public void handleValueChange(ValueChangeEvent event) {
 				IStatus s = (IStatus) event.getObservableValue().getValue();
 				if (s.isOK()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
index bca1aab957..1695e22f0f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
@@ -56,6 +56,7 @@ public XMIModelResource(URI uri) {
 		BasicCommandStack commandStack = new BasicCommandStack();
 		commandStack.addCommandStackListener(new CommandStackListener() {
 
+			@Override
 			public void commandStackChanged(EventObject event) {
 				dirty = true;
 				fireDirtyChanged();
@@ -67,6 +68,7 @@ public void commandStackChanged(EventObject event) {
 		resource = resourceSet.getResource(uri, true);
 	}
 
+	@Override
 	public IObservableList getRoot() {
 		if (list != null) {
 			return list;
@@ -77,6 +79,7 @@ public IObservableList getRoot() {
 		return list;
 	}
 
+	@Override
 	public void replaceRoot(EObject eObject) {
 		E4XMIResource resource = (E4XMIResource) eObject.eResource();
 		Map<EObject, String> idMap = new HashMap<EObject, String>();
@@ -101,22 +104,27 @@ public void replaceRoot(EObject eObject) {
 		}
 	}
 
+	@Override
 	public EditingDomain getEditingDomain() {
 		return editingDomain;
 	}
 
+	@Override
 	public boolean isSaveable() {
 		return true;
 	}
 
+	@Override
 	public void addModelListener(ModelListener listener) {
 		listeners.add(listener);
 	}
 
+	@Override
 	public void removeModelListener(ModelListener listener) {
 		listeners.remove(listener);
 	}
 
+	@Override
 	public boolean isDirty() {
 		return dirty && getEditingDomain().getCommandStack().canUndo();
 	}
@@ -133,6 +141,7 @@ private void fireCommandStackChanged() {
 		}
 	}
 
+	@Override
 	public IStatus save() {
 		Map<String, String> map = new HashMap<String, String>();
 		try {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 830dde3943..718c5a749f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -206,6 +206,7 @@ protected Composite createScrollableContainer(Composite parent) {
 		scrolling.setContent(contentContainer);
 
 		scrolling.addControlListener(new ControlAdapter() {
+			@Override
 			public void controlResized(ControlEvent e) {
 				Rectangle r = scrolling.getClientArea();
 				scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
index f5bdd1fe23..90f011a034 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
@@ -25,6 +25,7 @@ public class ObservableColumnLabelProvider<M> extends CellLabelProvider {
 	private IObservableMap[] attributeMaps;
 
 	private IMapChangeListener mapChangeListener = new IMapChangeListener() {
+		@Override
 		public void handleMapChange(MapChangeEvent event) {
 			Set<?> affectedElements = event.diff.getChangedKeys();
 			LabelProviderChangedEvent newEvent = new LabelProviderChangedEvent(
@@ -59,6 +60,7 @@ protected ObservableColumnLabelProvider(IObservableMap[] attributeMaps) {
 		}
 	}
 
+	@Override
 	public void dispose() {
 		for (int i = 0; i < attributeMaps.length; i++) {
 			attributeMaps[i].removeMapChangeListener(mapChangeListener);
@@ -68,6 +70,7 @@ public void dispose() {
 		this.mapChangeListener = null;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public void update(ViewerCell cell) {
 		M element = (M) cell.getElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
index 4695375294..f9b79cb676 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
@@ -37,6 +37,7 @@ public PatternFilter() {
 	 *            the tree element to check
 	 * @return true if the given element's label matches the filter text
 	 */
+	@Override
 	protected boolean isLeafMatch(Viewer viewer, Object element) {
 
 		Object labelProvider = ((StructuredViewer) viewer).getLabelProvider();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java
index 8391c7a5bb..8df6d95540 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java
@@ -99,12 +99,14 @@ public ShadowComposite(Composite parent, int style) {
 		this.outerKeyline = new Color(getDisplay(), new RGB(240, 240, 240));
 		addListener(SWT.Paint, new Listener() {
 
+			@Override
 			public void handleEvent(Event event) {
 				onPaint(event);
 			}
 		});
 		addListener(SWT.Dispose, new Listener() {
 
+			@Override
 			public void handleEvent(Event event) {
 				outerKeyline.dispose();
 			}
@@ -120,6 +122,7 @@ public void handleEvent(Event event) {
 		// });
 	}
 
+	@Override
 	public Rectangle getClientArea() {
 		Rectangle trim = computeTrim(CTabFolderRenderer.PART_BODY, SWT.NONE, 0, 0, 0, 0);
 		// if (minimized)
@@ -473,6 +476,7 @@ void createShadow(final Display display) {
 			tmpImage.dispose();
 			shadowColor.dispose();
 			display.disposeExec(new Runnable() {
+				@Override
 				public void run() {
 					Object obj = display.getData(E4_SHADOW_IMAGE);
 					if (obj != null) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
index da74a4d7e7..018080f3c7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
@@ -23,6 +23,7 @@ public static void show(Control control) {
 		s.open();
 		s.addListener(SWT.MouseDown, new Listener() {
 
+			@Override
 			public void handleEvent(Event event) {
 				hide();
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index dc1a1d92bf..2a6143f810 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -12,6 +12,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
+import org.eclipse.jface.viewers.AbstractTreeViewer;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -336,6 +338,7 @@ protected void updateResourceBundle() {
 					if (viewer != null) {
 						viewer.getControl().getDisplay().asyncExec(new Runnable() {
 
+							@Override
 							public void run() {
 								viewer.refresh();
 							}
@@ -354,6 +357,7 @@ void postCreate(Composite composite) {
 		if (project == null) {
 			keyListener = new Listener() {
 
+				@Override
 				public void handleEvent(Event event) {
 					if ((event.stateMask & SWT.ALT) == SWT.ALT) {
 						findAndHighlight(context.get(Display.class).getFocusControl());
@@ -457,6 +461,7 @@ private Control createXMITab(Composite composite) {
 
 		emfDocumentProvider.setValidationChangedCallback(new Runnable() {
 
+			@Override
 			public void run() {
 				model.removeAllAnnotations();
 
@@ -562,6 +567,7 @@ public void keyReleased(final KeyEvent e) {
 		});
 		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
 
+			@Override
 			public void selectionChanged(SelectionChangedEvent event) {
 				if (!event.getSelection().isEmpty()) {
 					final IStructuredSelection s = (IStructuredSelection) event.getSelection();
@@ -574,6 +580,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 							iconLabel.setImage(editor.getImage(obj, iconLabel.getDisplay()));
 							obsManager.runAndCollect(new Runnable() {
 
+								@Override
 								public void run() {
 									Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
 									comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
@@ -591,6 +598,7 @@ public void run() {
 							iconLabel.setImage(editor.getImage(entry, iconLabel.getDisplay()));
 							obsManager.runAndCollect(new Runnable() {
 
+								@Override
 								public void run() {
 									Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
 									comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
@@ -622,6 +630,7 @@ public void run() {
 		mgr.setRemoveAllWhenShown(true);
 		mgr.addMenuListener(new IMenuListener() {
 
+			@Override
 			public void menuAboutToShow(IMenuManager manager) {
 				final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 				boolean addSeparator = false;
@@ -654,6 +663,7 @@ public void menuAboutToShow(IMenuManager manager) {
 						// build the extract action
 						if ((!((VirtualEntry<?>) s.getFirstElement()).getList().isEmpty()) && (!isModelFragment()) && modelExtractor != null) {
 							manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {
+								@Override
 								public void run() {
 									VirtualEntry<?> ve = (VirtualEntry<?>) s.getFirstElement();
 									EObject container = (EObject) ve.getOriginalParent();
@@ -721,6 +731,7 @@ public void run() {
 						if (o.eContainer() != null) {
 							addSeparator = true;
 							manager.add(new Action(messages.ModelEditor_Delete, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
+								@Override
 								public void run() {
 									Command cmd = DeleteCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), o);
 									if (cmd.canExecute()) {
@@ -779,6 +790,7 @@ public void run() {
 					}
 
 					Action nlsAction = new Action(messages.ModelEditor_ExternalizeStrings) {
+						@Override
 						public void run() {
 							ExternalizeStringHandler h = ContextInjectionFactory.make(ExternalizeStringHandler.class, context);
 							ContextInjectionFactory.invoke(h, Execute.class, context);
@@ -795,6 +807,7 @@ public void run() {
 						if (el.getWidget() instanceof Control) {
 							manager.add(new Action(messages.ModelEditor_ShowControl) {
 
+								@Override
 								public void run() {
 									ControlHighlighter.show((Control) el.getWidget());
 								}
@@ -806,6 +819,7 @@ public void run() {
 				}
 				if ((s.getFirstElement() instanceof MApplicationElement) && (!isModelFragment()) && (!(s.getFirstElement() instanceof MApplication)) && modelExtractor != null) {
 					manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {
+						@Override
 						public void run() {
 							MApplicationElement oe = (MApplicationElement) s.getFirstElement();
 							EObject container = ((EObject) oe).eContainer();
@@ -830,12 +844,13 @@ public void run() {
 				}
 
 				Action expandAction = new Action(messages.ModelEditor_ExpandSubtree) {
+					@Override
 					public void run() {
 						if (!s.isEmpty()) {
 							if (viewer.getExpandedState(s.getFirstElement())) {
-								viewer.collapseToLevel(s.getFirstElement(), TreeViewer.ALL_LEVELS);
+								viewer.collapseToLevel(s.getFirstElement(), AbstractTreeViewer.ALL_LEVELS);
 							} else {
-								viewer.expandToLevel(s.getFirstElement(), TreeViewer.ALL_LEVELS);
+								viewer.expandToLevel(s.getFirstElement(), AbstractTreeViewer.ALL_LEVELS);
 							}
 						}
 					}
@@ -847,12 +862,14 @@ public void run() {
 
 		// Save the stateMask
 		viewer.getTree().addKeyListener(new KeyListener() {
+			@Override
 			public void keyReleased(KeyEvent e) {
 				if (mod1Down && (e.keyCode & SWT.MOD1) == SWT.MOD1) {
 					mod1Down = false;
 				}
 			}
 
+			@Override
 			public void keyPressed(KeyEvent e) {
 				if (!mod1Down && (e.keyCode & SWT.MOD1) == SWT.MOD1) {
 					mod1Down = true;
@@ -861,21 +878,25 @@ public void keyPressed(KeyEvent e) {
 		});
 
 		viewer.addTreeListener(new ITreeViewerListener() {
+			@Override
 			public void treeExpanded(final TreeExpansionEvent event) {
 				if (mod1Down) {
 					viewer.getTree().getDisplay().asyncExec(new Runnable() {
+						@Override
 						public void run() {
-							viewer.expandToLevel(event.getElement(), TreeViewer.ALL_LEVELS);
+							viewer.expandToLevel(event.getElement(), AbstractTreeViewer.ALL_LEVELS);
 						}
 					});
 				}
 			}
 
+			@Override
 			public void treeCollapsed(final TreeExpansionEvent event) {
 				if (mod1Down) {
 					viewer.getTree().getDisplay().asyncExec(new Runnable() {
+						@Override
 						public void run() {
-							viewer.collapseToLevel(event.getElement(), TreeViewer.ALL_LEVELS);
+							viewer.collapseToLevel(event.getElement(), AbstractTreeViewer.ALL_LEVELS);
 						}
 					});
 				}
@@ -1003,6 +1024,7 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 
 		contentProvider.getKnownElements().addSetChangeListener(new ISetChangeListener() {
 
+			@Override
 			public void handleSetChange(SetChangeEvent event) {
 				for (Object o : event.diff.getAdditions()) {
 					if (o instanceof EObject) {
@@ -1022,6 +1044,7 @@ public void handleSetChange(SetChangeEvent event) {
 			IObservableMap map = EMFProperties.value(p).observeDetail(clearedSet);
 			map.addMapChangeListener(new IMapChangeListener() {
 
+				@Override
 				public void handleMapChange(MapChangeEvent event) {
 					viewer.update(event.diff.getChangedKeys().toArray(), null);
 				}
@@ -1033,6 +1056,7 @@ public void handleMapChange(MapChangeEvent event) {
 		viewer.expandToLevel(viewer.getAutoExpandLevel());
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
 
+			@Override
 			public void doubleClick(DoubleClickEvent event) {
 				TreeViewer viewer = (TreeViewer) event.getViewer();
 				IStructuredSelection thisSelection = (IStructuredSelection) event.getSelection();
@@ -1041,7 +1065,7 @@ public void doubleClick(DoubleClickEvent event) {
 					if (viewer.getExpandedState(selectedNode))
 						viewer.setExpandedState(selectedNode, false);
 					else
-						viewer.expandToLevel(selectedNode, TreeViewer.ALL_LEVELS);
+						viewer.expandToLevel(selectedNode, AbstractTreeViewer.ALL_LEVELS);
 				} else {
 					viewer.setExpandedState(selectedNode, !viewer.getExpandedState(selectedNode));
 				}
@@ -1334,6 +1358,7 @@ public IModelResource getModelProvider() {
 
 	class ClipboardHandler implements Handler {
 
+		@Override
 		public void paste() {
 			if (editorTabFolder.getSelectionIndex() == 0) {
 				if (viewer.getControl().getDisplay().getFocusControl() == viewer.getControl()) {
@@ -1405,6 +1430,7 @@ private void handleStructurePaste() {
 			}
 		}
 
+		@Override
 		public void copy() {
 			if (editorTabFolder.getSelectionIndex() == 0) {
 				if (viewer.getControl().getDisplay().getFocusControl() == viewer.getControl()) {
@@ -1426,6 +1452,7 @@ private void handleStructureCopy() {
 			}
 		}
 
+		@Override
 		public void cut() {
 			if (editorTabFolder.getSelectionIndex() == 0) {
 				if (viewer.getControl().getDisplay().getFocusControl() == viewer.getControl()) {
@@ -1459,6 +1486,7 @@ static class TreeStructureAdvisorImpl extends TreeStructureAdvisor {
 
 	class ObservableFactoryImpl implements IObservableFactory {
 
+		@Override
 		public IObservable createObservable(Object target) {
 			if (target instanceof IObservableList) {
 				return (IObservable) target;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
index 575102da79..2c03f8325b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
@@ -38,6 +38,7 @@ public VirtualEntry(String id, IListProperty property, Object originalParent, St
 
 		final IListChangeListener listener = new IListChangeListener() {
 
+			@Override
 			public void handleListChange(ListChangeEvent event) {
 				if (!VirtualEntry.this.list.isDisposed()) {
 					List<Object> clean = cleanedList(event.getObservableList());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index ae6f03c97b..cd224164e6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -172,6 +172,7 @@ public void widgetSelected(SelectionEvent e) {
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.addModifyListener(new ModifyListener() {
 
+				@Override
 				public void modifyText(ModifyEvent e) {
 					lnk.setToolTipText(((Text) (e.getSource())).getText());
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 43accfc417..8d95afc243 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -440,6 +440,7 @@ public HandlerCommandPage(String pageName) {
 			super(pageName);
 		}
 
+		@Override
 		public void createControl(Composite parent) {
 			setTitle("Command/Handler");
 			setMessage("Insert informations for Command and Handler");
@@ -464,6 +465,7 @@ public void createControl(Composite parent) {
 				nameField.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 				nameField.addModifyListener(new ModifyListener() {
 
+					@Override
 					public void modifyText(ModifyEvent e) {
 						setPageComplete(nameField.getText().trim().length() > 0);
 					}
@@ -501,6 +503,7 @@ public KeybindingPage(String pageName, MApplication application) {
 			this.application = application;
 		}
 
+		@Override
 		public void createControl(Composite parent) {
 			setTitle("Keybinding");
 			setMessage("Insert informations for a keybinding");
@@ -517,6 +520,7 @@ public void createControl(Composite parent) {
 				keyField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 				keyField.addModifyListener(new ModifyListener() {
 
+					@Override
 					public void modifyText(ModifyEvent e) {
 						bindtableViewer.getControl().setEnabled(isPageComplete());
 						setPageComplete(isPageComplete());
@@ -535,6 +539,7 @@ public void modifyText(ModifyEvent e) {
 				bindtableViewer.setInput(application.getBindingTables());
 				bindtableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 
+					@Override
 					public void selectionChanged(SelectionChangedEvent event) {
 						setPageComplete(isPageComplete());
 					}
@@ -571,6 +576,7 @@ public MenuWizardPage(String pageName, MApplication application) {
 			this.application = application;
 		}
 
+		@Override
 		public void createControl(Composite parent) {
 			setTitle("Handled Menu Item");
 			setMessage("Insert informations for a Handled Menu Item");
@@ -625,6 +631,7 @@ public void createControl(Composite parent) {
 				menuViewer.setInput(menuList);
 				menuViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 
+					@Override
 					public void selectionChanged(SelectionChangedEvent event) {
 						setPageComplete(isPageComplete());
 					}
@@ -660,6 +667,7 @@ public ToolbarWizardPage(String pageName, MApplication application) {
 			this.application = application;
 		}
 
+		@Override
 		public void createControl(Composite parent) {
 			setTitle("Handled Toolbar Item");
 			setMessage("Insert informations for a Toolbar Item");
@@ -714,6 +722,7 @@ public void createControl(Composite parent) {
 				toolbarViewer.setInput(toolbarList);
 				toolbarViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 
+					@Override
 					public void selectionChanged(SelectionChangedEvent event) {
 						setPageComplete(isPageComplete());
 					}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 9e701e5b22..2028bc69bd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.jface.window.Window;
+
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -184,7 +186,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(b.getShell(), getEditor().getModelProvider(), Messages);
-					if (dialog.open() == BindingContextSelectionDialog.OK) {
+					if (dialog.open() == Window.OK) {
 						Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT, dialog.getSelectedContext());
 						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index fd76e8b318..a866696b56 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -115,6 +115,7 @@ public static void createFor(Text t) {
 			t.setData(COPY_HANDLER, new TextPasteHandler(t));
 		}
 
+		@Override
 		public void paste() {
 			Clipboard cp = new Clipboard(t.getDisplay());
 			Object o = cp.getContents(TextTransfer.getInstance());
@@ -128,10 +129,12 @@ public void paste() {
 			}
 		}
 
+		@Override
 		public void cut() {
 			t.cut();
 		}
 
+		@Override
 		public void copy() {
 			t.copy();
 		}
@@ -156,6 +159,7 @@ public static void createXMIId(Composite parent, AbstractComponentEditor editor)
 
 		editor.getMaster().addValueChangeListener(new IValueChangeListener() {
 
+			@Override
 			public void handleValueChange(ValueChangeEvent event) {
 				Object val = event.diff.getNewValue();
 				if (val != null && val instanceof EObject && !t.isDisposed()) {
@@ -376,6 +380,7 @@ public static void createTextField(Composite parent, String label, String toolti
 			controlDecoration.setImage(fieldDecoration.getImage());
 			IValidator iv = new IValidator() {
 
+				@Override
 				public IStatus validate(Object value) {
 					if (value == null) {
 						controlDecoration.show();
@@ -476,6 +481,7 @@ public static void createSelectedElement(Composite parent, final AbstractCompone
 		final IObservableValue mObs = EMFEditProperties.value(editor.getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(editor.getMaster());
 		editor.getMaster().addValueChangeListener(new IValueChangeListener() {
 
+			@Override
 			public void handleValueChange(ValueChangeEvent event) {
 				if (binding[0] != null) {
 					binding[0].dispose();
@@ -516,6 +522,7 @@ public String getText(Object element) {
 
 		editor.getMaster().addValueChangeListener(new IValueChangeListener() {
 
+			@Override
 			public void handleValueChange(ValueChangeEvent event) {
 				binding[0] = context.bindValue(uiObs, mObs);
 			}
@@ -851,6 +858,7 @@ public static String tr(ProjectOSGiTranslationProvider translationProvider, Stri
 
 	public static void attachFiltering(Text searchText, final TableViewer viewer, final PatternFilter filter) {
 		searchText.addModifyListener(new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				filter.setPattern(((Text) e.widget).getText());
 				viewer.refresh();
@@ -862,6 +870,7 @@ public void modifyText(ModifyEvent e) {
 		});
 		searchText.addTraverseListener(new TraverseListener() {
 
+			@Override
 			public void keyTraversed(TraverseEvent e) {
 				if (e.keyCode == SWT.ARROW_DOWN && viewer.getTable().getItemCount() > 0) {
 					viewer.getControl().setFocus();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 7311e8b2ca..34b9291172 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -140,6 +140,7 @@ public void widgetSelected(SelectionEvent e) {
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.addModifyListener(new ModifyListener() {
 
+				@Override
 				public void modifyText(ModifyEvent e) {
 					lnk.setToolTipText(((Text) (e.getSource())).getText());
 				}
@@ -171,6 +172,7 @@ public IObservableList getChildList(Object element) {
 
 		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() {
 
+			@Override
 			public void handleValueChange(ValueChangeEvent event) {
 				if (event.diff.getOldValue() != null) {
 					list.remove(event.diff.getOldValue());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 51264bfbcd..48ce163180 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -103,6 +103,7 @@ public void widgetSelected(SelectionEvent e) {
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		t.addModifyListener(new ModifyListener() {
 
+			@Override
 			public void modifyText(ModifyEvent e) {
 				lnk.setToolTipText(((Text) (e.getSource())).getText());
 			}
@@ -123,6 +124,7 @@ public void widgetSelected(SelectionEvent e) {
 		});
 	}
 
+	@Override
 	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
 		if (!isImport) {
 			CTabFolder folder = super.createForm(parent, context, master, isImport);
@@ -167,6 +169,7 @@ public IObservableList getChildList(Object element) {
 
 		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() {
 
+			@Override
 			public void handleValueChange(ValueChangeEvent event) {
 				if (event.diff.getOldValue() != null) {
 					list.remove(event.diff.getOldValue());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
index d8757498b7..4cb2cf549b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
@@ -178,6 +178,7 @@ public void widgetSelected(SelectionEvent e) {
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.addModifyListener(new ModifyListener() {
 
+				@Override
 				public void modifyText(ModifyEvent e) {
 					lnk.setToolTipText(((Text) (e.getSource())).getText());
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index b07c8c69f0..ac3297d06f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -125,6 +125,7 @@ public IObservableList getChildList(Object element) {
 
 		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() {
 
+			@Override
 			public void handleValueChange(ValueChangeEvent event) {
 				if (event.diff.getOldValue() != null) {
 					list.remove(event.diff.getOldValue());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 18febd9c5e..9234824be7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -124,6 +124,7 @@ public IObservableList getChildList(Object element) {
 
 		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() {
 
+			@Override
 			public void handleValueChange(ValueChangeEvent event) {
 				if (event.diff.getOldValue() != null) {
 					list.remove(event.diff.getOldValue());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 3f278c707a..cd50f0e3bf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -196,6 +196,7 @@ public void widgetSelected(SelectionEvent e) {
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.addModifyListener(new ModifyListener() {
 
+				@Override
 				public void modifyText(ModifyEvent e) {
 					lnk.setToolTipText(((Text) (e.getSource())).getText());
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 9337dd64c6..b713f67d6c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -298,6 +298,7 @@ public void widgetSelected(SelectionEvent e) {
 		b.setText(Messages.ModelTooling_Common_Remove);
 		b.addSelectionListener(new SelectionAdapter() {
 
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 				if (!s.isEmpty()) {
@@ -348,6 +349,7 @@ public FeaturePath[] getLabelProperties() {
 
 	class BindingValidator implements IValidator {
 
+		@Override
 		public IStatus validate(Object value) {
 			int statusCode = getEditor().isLiveModel() ? IStatus.ERROR : IStatus.WARNING;
 			if (value != null && value.toString().trim().length() > 0) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index d90482b15a..48367539c7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -491,6 +491,7 @@ public IObservableList getChildList(Object element) {
 
 		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() {
 
+			@Override
 			public void handleValueChange(ValueChangeEvent event) {
 				if (event.diff.getOldValue() != null) {
 					list.remove(event.diff.getOldValue());
@@ -505,6 +506,7 @@ public void handleValueChange(ValueChangeEvent event) {
 		IObservableList l = ELEMENT_CONTAINER__CHILDREN.observe(element);
 		l.addListChangeListener(new IListChangeListener() {
 
+			@Override
 			public void handleListChange(ListChangeEvent event) {
 				event.diff.accept(new ListDiffVisitor() {
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 6ce12a90fe..ae5cd32f79 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -253,6 +253,7 @@ public void widgetSelected(SelectionEvent e) {
 			UpdateValueStrategy t2m = new UpdateValueStrategy();
 			t2m.setConverter(new Converter(boolean.class, ItemType.class) {
 
+				@Override
 				public Object convert(Object fromObject) {
 					return null;
 				}
@@ -260,6 +261,7 @@ public Object convert(Object fromObject) {
 			UpdateValueStrategy m2t = new UpdateValueStrategy();
 			m2t.setConverter(new Converter(ItemType.class, boolean.class) {
 
+				@Override
 				public Object convert(Object fromObject) {
 					return fromObject == ItemType.CHECK || fromObject == ItemType.RADIO;
 				}
@@ -367,6 +369,7 @@ public EObject2EClass(Messages Messages) {
 			this.Messages = Messages;
 		}
 
+		@Override
 		public Object convert(Object fromObject) {
 			if (fromObject == null) {
 				return Messages.MenuItemEditor_NoExpression;
@@ -383,6 +386,7 @@ public EClass2EObject(Messages Messages) {
 			this.Messages = Messages;
 		}
 
+		@Override
 		public Object convert(Object fromObject) {
 			if (fromObject == null || fromObject.toString().equals(Messages.MenuItemEditor_NoExpression)) {
 				return null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 3d3f9d42bb..4e35cc5912 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -373,6 +373,7 @@ protected boolean accepted(Object o) {
 
 		PART__TOOLBAR.observe(element).addValueChangeListener(new IValueChangeListener() {
 
+			@Override
 			public void handleValueChange(ValueChangeEvent event) {
 				if (event.diff.getOldValue() != null) {
 					list.remove(event.diff.getOldValue());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 2abc7d94d3..4c5806918d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -248,6 +248,7 @@ public void widgetSelected(SelectionEvent e) {
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.addModifyListener(new ModifyListener() {
 
+				@Override
 				public void modifyText(ModifyEvent e) {
 					// lnk might be disposed if else branch above taken
 					if (!lnk.isDisposed()) {
@@ -403,6 +404,7 @@ protected boolean accepted(Object o) {
 
 		PART__TOOLBAR.observe(element).addValueChangeListener(new IValueChangeListener() {
 
+			@Override
 			public void handleValueChange(ValueChangeEvent event) {
 				if (event.diff.getOldValue() != null) {
 					list.remove(event.diff.getOldValue());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index de1733f52d..083b982ec1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.jface.window.Window;
+
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -464,7 +466,7 @@ protected void handleImportChild(EClass eClass, String hint) {
 		if (eClass == BasicPackageImpl.Literals.PART) {
 			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, hint);
 			WizardDialog wizardDialog = new WizardDialog(shell, wizard);
-			if (wizardDialog.open() == WizardDialog.OK) {
+			if (wizardDialog.open() == Window.OK) {
 				MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
 				for (MPart part : parts) {
 					addToModel((EObject) part);
@@ -475,7 +477,7 @@ protected void handleImportChild(EClass eClass, String hint) {
 		if (eClass == BasicPackageImpl.Literals.INPUT_PART) {
 			ModelImportWizard wizard = new ModelImportWizard(MInputPart.class, this);
 			WizardDialog wizardDialog = new WizardDialog(shell, wizard);
-			if (wizardDialog.open() == WizardDialog.OK) {
+			if (wizardDialog.open() == Window.OK) {
 				MInputPart[] parts = (MInputPart[]) wizard.getElements(MInputPart.class);
 				for (MInputPart part : parts) {
 					addToModel((EObject) part);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index eea4087675..c8daab874a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.jface.window.Window;
+
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -404,7 +406,7 @@ protected void handleImportChild(EClass eClass) {
 		if (eClass == BasicPackageImpl.Literals.PART) {
 			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this);
 			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
-			if (wizardDialog.open() == WizardDialog.OK) {
+			if (wizardDialog.open() == Window.OK) {
 				MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
 				for (MPart part : parts) {
 					addToModel((EObject) part);
@@ -415,7 +417,7 @@ protected void handleImportChild(EClass eClass) {
 		if (eClass == BasicPackageImpl.Literals.INPUT_PART) {
 			ModelImportWizard wizard = new ModelImportWizard(MInputPart.class, this);
 			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
-			if (wizardDialog.open() == WizardDialog.OK) {
+			if (wizardDialog.open() == Window.OK) {
 				MInputPart[] parts = (MInputPart[]) wizard.getElements(MInputPart.class);
 				for (MInputPart part : parts) {
 					addToModel((EObject) part);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index a9d69634dc..42b75f33ad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.jface.window.Window;
+
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -344,7 +346,7 @@ protected void handleAddPerspective() {
 	protected void handleImportPerspective() {
 		ModelImportWizard wizard = new ModelImportWizard(MPerspective.class, this);
 		WizardDialog wizardDialog = new WizardDialog(shell, wizard);
-		if (wizardDialog.open() == WizardDialog.OK) {
+		if (wizardDialog.open() == Window.OK) {
 			MPerspective[] elements = (MPerspective[]) wizard.getElements(MPerspective.class);
 			for (MPerspective category : elements) {
 				addToModel(category);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 0b342f6514..d74c25585a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -188,6 +188,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			UpdateValueStrategy t2m = new UpdateValueStrategy();
 			t2m.setConverter(new Converter(String.class, MUIElement.class) {
 
+				@Override
 				public Object convert(Object fromObject) {
 					return null;
 				}
@@ -195,6 +196,7 @@ public Object convert(Object fromObject) {
 			UpdateValueStrategy m2t = new UpdateValueStrategy();
 			m2t.setConverter(new Converter(MUIElement.class, String.class) {
 
+				@Override
 				public Object convert(Object fromObject) {
 					if (fromObject != null) {
 						EObject o = (EObject) fromObject;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index a582674bd3..9c39153fe0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -276,6 +276,7 @@ public void widgetSelected(SelectionEvent e) {
 			UpdateValueStrategy t2m = new UpdateValueStrategy();
 			t2m.setConverter(new Converter(boolean.class, ItemType.class) {
 
+				@Override
 				public Object convert(Object fromObject) {
 					return null;
 				}
@@ -283,6 +284,7 @@ public Object convert(Object fromObject) {
 			UpdateValueStrategy m2t = new UpdateValueStrategy();
 			m2t.setConverter(new Converter(ItemType.class, boolean.class) {
 
+				@Override
 				public Object convert(Object fromObject) {
 					return fromObject == ItemType.CHECK || fromObject == ItemType.RADIO;
 				}
@@ -367,6 +369,7 @@ public IObservableList getChildList(final Object element) {
 
 		TOOL_ITEM__MENU.observe(element).addValueChangeListener(new IValueChangeListener() {
 
+			@Override
 			public void handleValueChange(ValueChangeEvent event) {
 				if (event.diff.getOldValue() != null) {
 					list.remove(event.diff.getOldValue());
@@ -413,6 +416,7 @@ public EObject2EClass(Messages Messages) {
 			this.Messages = Messages;
 		}
 
+		@Override
 		public Object convert(Object fromObject) {
 			if (fromObject == null) {
 				return Messages.MenuItemEditor_NoExpression;
@@ -429,6 +433,7 @@ public EClass2EObject(Messages Messages) {
 			this.Messages = Messages;
 		}
 
+		@Override
 		public Object convert(Object fromObject) {
 			if (fromObject == null || fromObject.toString().equals(Messages.MenuItemEditor_NoExpression)) {
 				return null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
index 74ca26b6c2..8a2c35f7b4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
@@ -28,6 +28,7 @@ public TrimmedWindowEditor() {
 		super();
 	}
 
+	@Override
 	public IObservableList getChildList(Object element) {
 		IObservableList list = super.getChildList(element);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 952f6db187..7f4ae23b4a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -369,6 +369,7 @@ protected boolean accepted(Object o) {
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_SHARED_ELEMENTS, SHARED_ELEMENTS, element, Messages.WindowEditor_SharedElements) {
+			@Override
 			protected boolean accepted(Object o) {
 				return true;
 			}
@@ -381,6 +382,7 @@ protected boolean accepted(Object o) {
 
 		WINDOW__MAIN_MENU.observe(element).addValueChangeListener(new IValueChangeListener() {
 
+			@Override
 			public void handleValueChange(ValueChangeEvent event) {
 				if (event.diff.getOldValue() != null) {
 					list.remove(event.diff.getOldValue());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index 0543991585..5f96c0fd1f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -75,6 +75,7 @@ protected Control createDialogArea(Composite parent) {
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
 
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				titleImage.dispose();
 			}
@@ -97,6 +98,7 @@ public void widgetDisposed(DisposeEvent e) {
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
 
+			@Override
 			public void doubleClick(DoubleClickEvent event) {
 				okPressed();
 			}
@@ -146,6 +148,7 @@ protected boolean isResizable() {
 
 	private static class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
 
+		@Override
 		public void update(final ViewerCell cell) {
 			MCommand cmd = (MCommand) cell.getElement();
 
@@ -163,10 +166,12 @@ public void update(final ViewerCell cell) {
 			cell.setStyleRanges(styledString.getStyleRanges());
 		}
 
+		@Override
 		public Image getImage(Object element) {
 			return null;
 		}
 
+		@Override
 		public String getText(Object element) {
 			MCommand command = (MCommand) element;
 			String s = ""; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
index 814e7f4b5b..15cdb406fe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
@@ -148,6 +148,7 @@ public void update(ViewerCell cell) {
 		viewer.setInput(list);
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
 
+			@Override
 			public void doubleClick(DoubleClickEvent event) {
 				okPressed();
 			}
@@ -158,6 +159,7 @@ public void doubleClick(DoubleClickEvent event) {
 			private Timer timer = new Timer(true);
 			private TimerTask task;
 
+			@Override
 			public void modifyText(ModifyEvent e) {
 				if (callback != null) {
 					callback.cancel = true;
@@ -177,6 +179,7 @@ public void modifyText(ModifyEvent e) {
 
 		getShell().addDisposeListener(new DisposeListener() {
 
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				clearImages();
 			}
@@ -264,6 +267,7 @@ public void match(final IFile file) {
 			if (!cancel) {
 				list.getRealm().exec(new Runnable() {
 
+					@Override
 					public void run() {
 						list.add(file);
 					}
@@ -292,6 +296,7 @@ public void run() {
 			try {
 				project.accept(new IResourceVisitor() {
 
+					@Override
 					public boolean visit(IResource resource) throws CoreException {
 						if (callback.cancel) {
 							return false;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
index faadd680fd..85e319cf97 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
@@ -72,6 +72,7 @@ protected Control createDialogArea(Composite parent) {
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
 
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				titleImage.dispose();
 			}
@@ -94,6 +95,7 @@ public void widgetDisposed(DisposeEvent e) {
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
 
+			@Override
 			public void doubleClick(DoubleClickEvent event) {
 				okPressed();
 			}
@@ -137,6 +139,7 @@ protected void okPressed() {
 
 	private static class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
 
+		@Override
 		public void update(final ViewerCell cell) {
 			MBindingContext cmd = (MBindingContext) cell.getElement();
 
@@ -159,10 +162,12 @@ public void update(final ViewerCell cell) {
 			cell.setStyleRanges(styledString.getStyleRanges());
 		}
 
+		@Override
 		public Image getImage(Object element) {
 			return null;
 		}
 
+		@Override
 		public String getText(Object element) {
 			MBindingContext command = (MBindingContext) element;
 			String s = ""; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
index cdb3a163d1..68ff2b631b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -40,8 +40,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -75,6 +73,7 @@ protected Control createDialogArea(Composite parent) {
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
 
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				titleImage.dispose();
 			}
@@ -97,6 +96,7 @@ public void widgetDisposed(DisposeEvent e) {
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
 
+			@Override
 			public void doubleClick(DoubleClickEvent event) {
 				okPressed();
 			}
@@ -139,6 +139,7 @@ protected void okPressed() {
 
 	private static class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
 
+		@Override
 		public void update(final ViewerCell cell) {
 			MCategory cmd = (MCategory) cell.getElement();
 
@@ -158,10 +159,12 @@ public void update(final ViewerCell cell) {
 			cell.setStyleRanges(styledString.getStyleRanges());
 		}
 
+		@Override
 		public Image getImage(Object element) {
 			return null;
 		}
 
+		@Override
 		public String getText(Object element) {
 			MCategory command = (MCategory) element;
 			String s = ""; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index 9cf6c11da5..93d3ae1a32 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -89,6 +89,7 @@ protected Control createDialogArea(Composite parent) {
 
 		getShell().addDisposeListener(new DisposeListener() {
 
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				javaClassImage.dispose();
 				titleImage.dispose();
@@ -139,6 +140,7 @@ public void update(ViewerCell cell) {
 		});
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
 
+			@Override
 			public void doubleClick(DoubleClickEvent event) {
 				okPressed();
 			}
@@ -152,6 +154,7 @@ public void doubleClick(DoubleClickEvent event) {
 		t.addModifyListener(new ModifyListener() {
 			private ContributionResultHandlerImpl currentResultHandler;
 
+			@Override
 			public void modifyText(ModifyEvent e) {
 				if (currentResultHandler != null) {
 					currentResultHandler.cancled = true;
@@ -161,6 +164,7 @@ public void modifyText(ModifyEvent e) {
 				Filter filter = new Filter(project, t.getText());
 				collector.findContributions(filter, currentResultHandler);
 				t.addKeyListener(new KeyAdapter() {
+					@Override
 					public void keyPressed(KeyEvent e) {
 						if (e.keyCode == SWT.ARROW_DOWN) {
 							if (viewer.getTable().getItemCount() > 0) {
@@ -217,6 +221,7 @@ public ContributionResultHandlerImpl(IObservableList list) {
 			this.list = list;
 		}
 
+		@Override
 		public void result(ContributionData data) {
 			if (!cancled) {
 				list.add(data);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
index 098cde8654..9ed5253a42 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
@@ -94,6 +94,7 @@ protected boolean isParentMatch(Viewer viewer, Object element) {
 		viewer.setInput(getElements(lookup));
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
 
+			@Override
 			public void doubleClick(DoubleClickEvent event) {
 				okPressed();
 			}
@@ -136,10 +137,12 @@ public void update(ViewerCell cell) {
 			cell.setStyleRanges(str.getStyleRanges());
 		}
 
+		@Override
 		public Image getImage(Object element) {
 			return null;
 		}
 
+		@Override
 		public String getText(Object element) {
 			IConfigurationElement el = (IConfigurationElement) element;
 			return el.getAttribute("id") + " " + el.getContributor().getName(); //$NON-NLS-1$//$NON-NLS-2$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index 06668e6cb2..e8b804562d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -94,6 +94,7 @@ protected Control createDialogArea(Composite parent) {
 
 		composite.addDisposeListener(new DisposeListener() {
 
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				packageImage.dispose();
 				classImage.dispose();
@@ -114,6 +115,7 @@ public void widgetDisposed(DisposeEvent e) {
 
 		searchText.addModifyListener(new ModifyListener() {
 
+			@Override
 			public void modifyText(ModifyEvent e) {
 				if (filter != null) {
 					filter.setPattern(searchText.getText());
@@ -137,6 +139,7 @@ public void modifyText(ModifyEvent e) {
 		viewer.setLabelProvider(new LabelProviderImpl(packageImage, classImage, featureImage));
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
 
+			@Override
 			public void doubleClick(DoubleClickEvent event) {
 				okPressed();
 			}
@@ -155,6 +158,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 			}
 		});
 		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			@Override
 			public void selectionChanged(SelectionChangedEvent event) {
 				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
 				Button buttonOk = getButton(IDialogConstants.OK_ID);
@@ -190,18 +194,22 @@ protected void okPressed() {
 
 	static class ContentProviderImpl implements ITreeContentProvider {
 
+		@Override
 		public void dispose() {
 
 		}
 
+		@Override
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 
 		}
 
+		@Override
 		public Object[] getElements(Object inputElement) {
 			return ((List<?>) inputElement).toArray();
 		}
 
+		@Override
 		public Object[] getChildren(Object parentElement) {
 			if (parentElement.getClass() == InternalPackage.class) {
 				return ((InternalPackage) parentElement).classes.toArray();
@@ -211,6 +219,7 @@ public Object[] getChildren(Object parentElement) {
 			return new Object[0];
 		}
 
+		@Override
 		public Object getParent(Object element) {
 			if (element.getClass() == InternalFeature.class) {
 				return ((InternalFeature) element).clazz;
@@ -220,6 +229,7 @@ public Object getParent(Object element) {
 			return null;
 		}
 
+		@Override
 		public boolean hasChildren(Object element) {
 			return getChildren(element).length > 0;
 		}
@@ -237,6 +247,7 @@ public LabelProviderImpl(Image packageImage, Image classImage, Image featureImag
 			this.featureImage = featureImage;
 		}
 
+		@Override
 		public void update(final ViewerCell cell) {
 			if (cell.getElement().getClass() == InternalPackage.class) {
 				InternalPackage o = (InternalPackage) cell.getElement();
@@ -266,10 +277,12 @@ public void update(final ViewerCell cell) {
 			}
 		}
 
+		@Override
 		public Image getImage(Object element) {
 			return null;
 		}
 
+		@Override
 		public String getText(Object element) {
 			if (element.getClass() == InternalPackage.class) {
 				InternalPackage o = (InternalPackage) element;
@@ -410,7 +423,7 @@ private String[] getWords(String text) {
 				}
 				i = j;
 			}
-			return (String[]) words.toArray(new String[words.size()]);
+			return words.toArray(new String[words.size()]);
 		}
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index 1a492b65a5..b15b5f4af8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -74,6 +74,7 @@ protected Control createDialogArea(Composite parent) {
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
 
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				titleImage.dispose();
 			}
@@ -121,6 +122,7 @@ public void update(ViewerCell cell) {
 		viewer.setContentProvider(new ObservableListContentProvider());
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
 
+			@Override
 			public void doubleClick(DoubleClickEvent event) {
 				okPressed();
 			}
@@ -134,6 +136,7 @@ public void doubleClick(DoubleClickEvent event) {
 		searchText.addModifyListener(new ModifyListener() {
 			private ModelResultHandlerImpl currentResultHandler;
 
+			@Override
 			public void modifyText(ModifyEvent e) {
 				if (currentResultHandler != null) {
 					currentResultHandler.cancled = true;
@@ -199,6 +202,7 @@ public ModelResultHandlerImpl(IObservableList list, Filter filter, AbstractCompo
 			this.resource = resource;
 		}
 
+		@Override
 		public void result(EObject data) {
 			if (!cancled) {
 				if (!resource.getURI().equals(data.eResource().getURI()))
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index 3a1077ff81..89ca837b47 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -96,6 +96,7 @@ protected Control createDialogArea(Composite parent) {
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
 
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				titleImage.dispose();
 			}
@@ -137,6 +138,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 		eClassViewer.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		eClassViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 
+			@Override
 			public void selectionChanged(SelectionChangedEvent event) {
 				updateSearch();
 
@@ -179,6 +181,7 @@ public void update(ViewerCell cell) {
 		viewer.setContentProvider(new ObservableListContentProvider());
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
 
+			@Override
 			public void doubleClick(DoubleClickEvent event) {
 				okPressed();
 			}
@@ -191,6 +194,7 @@ public void doubleClick(DoubleClickEvent event) {
 
 		searchText.addModifyListener(new ModifyListener() {
 
+			@Override
 			public void modifyText(ModifyEvent e) {
 				updateSearch();
 			}
@@ -262,6 +266,7 @@ public ModelResultHandlerImpl(IObservableList list, Filter filter, AbstractCompo
 			this.resource = resource;
 		}
 
+		@Override
 		public void result(EObject data) {
 			if (!cancled) {
 				if (!resource.getURI().equals(data.eResource().getURI())) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
index d5b1226574..d2596b0dfd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
@@ -99,6 +99,7 @@ protected boolean isParentMatch(Viewer viewer, Object element) {
 		viewer.addFilter(filter);
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
 
+			@Override
 			public void doubleClick(DoubleClickEvent event) {
 				okPressed();
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index 3c8d145c08..1eb5fb6678 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -99,6 +99,7 @@ protected Control createDialogArea(Composite parent) {
 
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
 
+			@Override
 			public void doubleClick(DoubleClickEvent event) {
 				okPressed();
 			}
@@ -158,6 +159,7 @@ private static <T> List<T> filter(List<T> o) {
 	}
 
 	private class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
+		@Override
 		public void update(final ViewerCell cell) {
 			EObject o = (EObject) cell.getElement();
 
@@ -175,6 +177,7 @@ public void update(final ViewerCell cell) {
 			cell.setImage(getImage(o));
 		}
 
+		@Override
 		public String getText(Object element) {
 			EObject o = (EObject) element;
 			MApplicationElement el = (MApplicationElement) o;
@@ -196,6 +199,7 @@ private String getTypename(EObject o) {
 			}
 		}
 
+		@Override
 		public Image getImage(Object element) {
 			AbstractComponentEditor editor = SharedElementsDialog.this.editor.getEditor(((EObject) element).eClass());
 			if (editor != null) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index 9dd22f5920..ed1c3d3814 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import org.eclipse.jface.window.Window;
+
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -80,7 +82,7 @@ public void run() {
 	protected void handleImport() {
 		ModelImportWizard wizard = new ModelImportWizard(MCategory.class, this);
 		WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
-		if (wizardDialog.open() == WizardDialog.OK) {
+		if (wizardDialog.open() == Window.OK) {
 			MCategory[] elements = (MCategory[]) wizard.getElements(MCategory.class);
 			for (MCategory category : elements) {
 				addCategory(category);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index c57f5315b1..950cd5d7b9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import org.eclipse.jface.window.Window;
+
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -245,7 +247,7 @@ private void addCommand(MCommand command) {
 	protected void handleImport() {
 		ModelImportWizard wizard = new ModelImportWizard(MCommand.class, this);
 		WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
-		if (wizardDialog.open() == WizardDialog.OK) {
+		if (wizardDialog.open() == Window.OK) {
 			MCommand[] elements = (MCommand[]) wizard.getElements(MCommand.class);
 			for (MCommand mCommand : elements) {
 				addCommand(mCommand);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index a612c95f3c..3db167936b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import org.eclipse.jface.window.Window;
+
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -246,7 +248,7 @@ private void addToModel(MHandler handler) {
 	protected void handleImport() {
 		ModelImportWizard wizard = new ModelImportWizard(MHandler.class, this);
 		WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
-		if (wizardDialog.open() == WizardDialog.OK) {
+		if (wizardDialog.open() == Window.OK) {
 			MHandler[] elements = (MHandler[]) wizard.getElements(MHandler.class);
 			for (MHandler handler : elements) {
 				addToModel(handler);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index b60c34f4ce..2242cd727d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import org.eclipse.jface.window.Window;
+
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -265,7 +267,7 @@ protected void handleImport(EClass eClass, String hint) {
 		if (eClass == BasicPackageImpl.Literals.PART_DESCRIPTOR) {
 			ModelImportWizard wizard = new ModelImportWizard(MPartDescriptor.class, this, hint);
 			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
-			if (wizardDialog.open() == WizardDialog.OK) {
+			if (wizardDialog.open() == Window.OK) {
 				MPartDescriptor[] parts = (MPartDescriptor[]) wizard.getElements(MPartDescriptor.class);
 				for (MPartDescriptor part : parts) {
 					addToModel(part);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 253b06178a..1c60515c4f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -11,6 +11,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import org.eclipse.jface.window.Window;
+
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -294,7 +296,7 @@ protected void handleImport(EClass eClass, String hint) {
 		if (eClass == BasicPackageImpl.Literals.PART) {
 			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, hint);
 			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
-			if (wizardDialog.open() == WizardDialog.OK) {
+			if (wizardDialog.open() == Window.OK) {
 				MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
 				for (MPart part : parts) {
 					addToModel((EObject) part);
@@ -304,7 +306,7 @@ protected void handleImport(EClass eClass, String hint) {
 		if (eClass == BasicPackageImpl.Literals.INPUT_PART) {
 			ModelImportWizard wizard = new ModelImportWizard(MInputPart.class, this, hint);
 			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
-			if (wizardDialog.open() == WizardDialog.OK) {
+			if (wizardDialog.open() == Window.OK) {
 				MInputPart[] parts = (MInputPart[]) wizard.getElements(MInputPart.class);
 				for (MInputPart part : parts) {
 					addToModel((EObject) part);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
index 27b3f11fa1..646673e7ff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
@@ -52,6 +52,7 @@ public TreeViewer createViewer(Composite parent, EStructuralFeature feature, fin
 		IObservableValue value = property.observeDetail(master);
 		value.addValueChangeListener(new IValueChangeListener() {
 
+			@Override
 			public void handleValueChange(ValueChangeEvent event) {
 				if (event.diff.getNewValue() != null) {
 					viewer.setInput(Collections.singleton(new JavaObject(event.diff.getNewValue())));
@@ -71,6 +72,7 @@ public void handleValueChange(ValueChangeEvent event) {
 			mgr.setRemoveAllWhenShown(true);
 			mgr.addMenuListener(new IMenuListener() {
 
+				@Override
 				public void menuAboutToShow(IMenuManager manager) {
 					if (viewer.getSelection().isEmpty()) {
 						return;
@@ -252,19 +254,23 @@ public void update(ViewerCell cell) {
 
 	class ContentProviderImpl implements ITreeContentProvider {
 
+		@Override
 		public void dispose() {
 
 		}
 
+		@Override
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 
 		}
 
+		@Override
 		public Object[] getElements(Object inputElement) {
 			return ((Collection<?>) inputElement).toArray();
 
 		}
 
+		@Override
 		public Object[] getChildren(Object parentElement) {
 			if (parentElement instanceof JavaObject) {
 				return ((JavaObject) parentElement).getAttributes().toArray();
@@ -274,11 +280,13 @@ public Object[] getChildren(Object parentElement) {
 			return new Object[0];
 		}
 
+		@Override
 		public Object getParent(Object element) {
 			// TODO Auto-generated method stub
 			return null;
 		}
 
+		@Override
 		public boolean hasChildren(Object element) {
 			return getChildren(element).length > 0;
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
index 1ea30b803f..33c214325d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
@@ -1,5 +1,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.properties;
 
+import org.eclipse.core.resources.IResource;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -227,10 +229,10 @@ protected void okPressed() {
 
 					ByteArrayInputStream stream = new ByteArrayInputStream(b.toString().getBytes());
 					if (f.exists()) {
-						f.appendContents(stream, IFile.KEEP_HISTORY, new NullProgressMonitor());
+						f.appendContents(stream, IResource.KEEP_HISTORY, new NullProgressMonitor());
 					} else {
 						createParent(f.getParent());
-						f.create(stream, IFile.KEEP_HISTORY, new NullProgressMonitor());
+						f.create(stream, IResource.KEEP_HISTORY, new NullProgressMonitor());
 					}
 
 					stream.close();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
index 016d28bab2..6cefaa958d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
@@ -63,11 +63,13 @@ public ProjectOSGiTranslationProvider(IProject project, String locale) {
 		this.project = project;
 		this.project.getWorkspace().addResourceChangeListener(new IResourceChangeListener() {
 
+			@Override
 			public void resourceChanged(IResourceChangeEvent event) {
 				if (event.getType() == IResourceChangeEvent.POST_CHANGE) {
 					try {
 						event.getDelta().accept(new IResourceDeltaVisitor() {
 
+							@Override
 							public boolean visit(IResourceDelta delta) throws CoreException {
 								return ProjectOSGiTranslationProvider.this.visit(delta);
 							}
@@ -249,6 +251,7 @@ public ResourceBundle newBundle(String baseName, Locale locale, String format, C
 				InputStream stream = null;
 				try {
 					stream = AccessController.doPrivileged(new PrivilegedExceptionAction<InputStream>() {
+						@Override
 						public InputStream run() throws IOException {
 							return getResourceAsStream(resourceName);
 						}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
index ac02009ff7..902d64b475 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
@@ -46,6 +46,7 @@ public TreeViewer createViewer(Composite parent, EStructuralFeature feature, fin
 		IObservableValue value = property.observeDetail(master);
 		value.addValueChangeListener(new IValueChangeListener() {
 
+			@Override
 			public void handleValueChange(ValueChangeEvent event) {
 				if (event.diff.getNewValue() != null) {
 					viewer.setInput(Collections.singleton(event.diff.getNewValue()));
@@ -60,6 +61,7 @@ public void handleValueChange(ValueChangeEvent event) {
 		mgr.setRemoveAllWhenShown(true);
 		mgr.addMenuListener(new IMenuListener() {
 
+			@Override
 			public void menuAboutToShow(IMenuManager manager) {
 				final Object o = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
 				if (o instanceof Control) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
index 94fcb0c1e0..6a2433fd29 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
@@ -22,18 +22,22 @@
 
 public class WidgetContentProvider implements ITreeContentProvider {
 
+	@Override
 	public void dispose() {
 
 	}
 
+	@Override
 	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 
 	}
 
+	@Override
 	public Object[] getElements(Object inputElement) {
 		return ((Collection<?>) inputElement).toArray();
 	}
 
+	@Override
 	public Object[] getChildren(Object parentElement) {
 		if (parentElement instanceof Menu) {
 			Menu m = (Menu) parentElement;
@@ -106,11 +110,13 @@ public Object[] getChildren(Object parentElement) {
 		return new Object[0];
 	}
 
+	@Override
 	public Object getParent(Object element) {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
+	@Override
 	public boolean hasChildren(Object element) {
 		return getChildren(element).length > 0;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java
index 0f4ccbd86b..fcbc3e8b04 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java
@@ -16,43 +16,52 @@ public AnnotationAccess(IResourcePool pool) {
 		this.pool = pool;
 	}
 
+	@Override
 	public String getTypeLabel(Annotation annotation) {
 		return annotation.getText();
 	}
 
+	@Override
 	public int getLayer(Annotation annotation) {
 		return IAnnotationAccessExtension.DEFAULT_LAYER;
 	}
 
+	@Override
 	public void paint(Annotation annotation, GC gc, Canvas canvas, Rectangle bounds) {
 		gc.drawImage(pool.getImageUnchecked(ResourceProvider.IMG_Obj16_error_obj), bounds.x, bounds.y);
 	}
 
+	@Override
 	public boolean isPaintable(Annotation annotation) {
 		// TODO Auto-generated method stub
 		return false;
 	}
 
+	@Override
 	public boolean isSubtype(Object annotationType, Object potentialSupertype) {
 		// TODO Auto-generated method stub
 		return false;
 	}
 
+	@Override
 	public Object[] getSupertypes(Object annotationType) {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
+	@Override
 	public Object getType(Annotation annotation) {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
+	@Override
 	public boolean isMultiLine(Annotation annotation) {
 		// TODO Auto-generated method stub
 		return false;
 	}
 
+	@Override
 	public boolean isTemporary(Annotation annotation) {
 		// TODO Auto-generated method stub
 		return false;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
index 5dd518af4a..5889901af3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
@@ -27,6 +27,7 @@ public EMFDocumentResourceMediator(final IModelResource modelResource) {
 		this.document = new Document();
 		this.document.addDocumentListener(new IDocumentListener() {
 
+			@Override
 			public void documentChanged(DocumentEvent event) {
 				if (updateFromEMF) {
 					return;
@@ -50,6 +51,7 @@ public void documentChanged(DocumentEvent event) {
 				}
 			}
 
+			@Override
 			public void documentAboutToBeChanged(DocumentEvent event) {
 
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java
index 627ce6af1f..b3726387e5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java
@@ -43,6 +43,7 @@ public NonRuleBasedDamagerRepairer(TextAttribute defaultTextAttribute) {
 	/**
 	 * @see IPresentationRepairer#setDocument(IDocument)
 	 */
+	@Override
 	public void setDocument(IDocument document) {
 		fDocument = document;
 	}
@@ -73,6 +74,7 @@ protected int endOfLineOf(int offset) throws BadLocationException {
 	/**
 	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
 	 */
+	@Override
 	public IRegion getDamageRegion(
 		ITypedRegion partition,
 		DocumentEvent event,
@@ -113,6 +115,7 @@ public IRegion getDamageRegion(
 	/**
 	 * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion)
 	 */
+	@Override
 	public void createPresentation(
 		TextPresentation presentation,
 		ITypedRegion region) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java
index 85719e9150..cb588bc18b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java
@@ -20,6 +20,7 @@ public TagRule(IToken token) {
 		super("<", ">", token); //$NON-NLS-1$//$NON-NLS-2$
 	}
 
+	@Override
 	protected boolean sequenceDetected(ICharacterScanner scanner, char[] sequence, boolean eofAllowed) {
 		int c = scanner.read();
 		if (sequence[0] == '<') {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
index ea8ed3b260..804dcea408 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
@@ -32,10 +32,12 @@ public XMLConfiguration(IResourcePool pool) {
 		this.pool = pool;
 	}
 
+	@Override
 	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
 		return new String[] { IDocument.DEFAULT_CONTENT_TYPE, XMLPartitionScanner.XML_COMMENT, XMLPartitionScanner.XML_TAG };
 	}
 
+	@Override
 	public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer, String contentType) {
 		if (doubleClickStrategy == null)
 			doubleClickStrategy = new XMLDoubleClickStrategy();
@@ -58,6 +60,7 @@ protected XMLTagScanner getXMLTagScanner() {
 		return tagScanner;
 	}
 
+	@Override
 	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
 		PresentationReconciler reconciler = new PresentationReconciler();
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java
index 492d51bbc1..5aae88439c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java
@@ -18,6 +18,7 @@
 public class XMLDoubleClickStrategy implements ITextDoubleClickStrategy {
 	protected ITextViewer fText;
 
+	@Override
 	public void doubleClicked(ITextViewer part) {
 		int pos = part.getSelectedRange().x;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java
index 3ded701a8c..91a53aeceb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java
@@ -14,6 +14,7 @@
 
 public class XMLWhitespaceDetector implements IWhitespaceDetector {
 
+	@Override
 	public boolean isWhitespace(char c) {
 		return (c == ' ' || c == '\t' || c == '\n' || c == '\r');
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
index a3badfda5f..8724ce5827 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
@@ -41,10 +41,12 @@
 public class ModelImportPage1 extends WizardPage {
 
 	private class TableLabelProvider extends LabelProvider implements ITableLabelProvider {
+		@Override
 		public Image getColumnImage(Object element, int columnIndex) {
 			return null;
 		}
 
+		@Override
 		public String getColumnText(Object element, int columnIndex) {
 			if (element instanceof IConfigurationElement) {
 				IConfigurationElement config = (IConfigurationElement) element;
@@ -59,6 +61,7 @@ public String getColumnText(Object element, int columnIndex) {
 	protected Object[] checkedElements;
 
 	private class TableContentProvider implements IStructuredContentProvider {
+		@Override
 		public Object[] getElements(Object inputElement) {
 
 			if (!(inputElement instanceof RegistryStruct)) {
@@ -70,21 +73,26 @@ public Object[] getElements(Object inputElement) {
 			return RegistryUtil.getExtensions(registry, input, wizard.isLiveModel());
 		}
 
+		@Override
 		public void dispose() {
 		}
 
+		@Override
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 		}
 	}
 
 	private class ComboContentProvider implements IStructuredContentProvider {
+		@Override
 		public Object[] getElements(Object inputElement) {
 			return RegistryUtil.getProvidingBundles(registry, wizard.getExtensionPoint(), wizard.isLiveModel());
 		}
 
+		@Override
 		public void dispose() {
 		}
 
+		@Override
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 		}
 	}
@@ -105,6 +113,7 @@ public ModelImportPage1() {
 	 * 
 	 * @param parent
 	 */
+	@Override
 	public void createControl(Composite parent) {
 		Composite container = new Composite(parent, SWT.NULL);
 
@@ -135,6 +144,7 @@ public void createControl(Composite parent) {
 
 		comboViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 
+			@Override
 			public void selectionChanged(SelectionChangedEvent event) {
 				String bundle = ((IStructuredSelection) event.getSelection()).getFirstElement().toString();
 				RegistryStruct struct = RegistryUtil.getStruct(wizard.getApplicationElement(), wizard.getHint());
@@ -145,6 +155,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 		});
 
 		checkboxTableViewer.addCheckStateListener(new ICheckStateListener() {
+			@Override
 			public void checkStateChanged(CheckStateChangedEvent event) {
 				checkedElements = checkboxTableViewer.getCheckedElements();
 				if (checkedElements.length > 0) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
index a8d1b1a9c0..1d74bce1bc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
@@ -109,7 +109,7 @@ private static MCommand[] getCommands(IConfigurationElement[] elements, MApplica
 				}
 			}
 
-			result.add((MCommand) command);
+			result.add(command);
 		}
 
 		return result.toArray(new MCommand[0]);
@@ -128,7 +128,7 @@ private static MPerspective[] getPerspectives(IConfigurationElement[] elements)
 			perspective.setElementId(element.getAttribute("id"));
 			perspective.setToBeRendered(true);
 			perspective.setVisible(true);
-			result.add((MPerspective) perspective);
+			result.add(perspective);
 		}
 
 		return result.toArray(new MPerspective[0]);
@@ -298,7 +298,7 @@ private static MHandler[] getHandlers(IConfigurationElement[] elements, MApplica
 
 		ArrayList<MHandler> result = new ArrayList<MHandler>();
 		for (IConfigurationElement element : elements) {
-			MHandler hand = (MHandler) MCommandsFactory.INSTANCE.createHandler();
+			MHandler hand = MCommandsFactory.INSTANCE.createHandler();
 			hand.setElementId(element.getAttribute("id"));
 			hand.setContributionURI(getContributionURI(element, "class"));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index 1487f11643..f994c56b10 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -90,6 +90,7 @@ private void removeResourceListener() {
 	 * the resource was deleted or the containing project was closed.
 	 */
 	private IResourceChangeListener listener = new IResourceChangeListener() {
+		@Override
 		public void resourceChanged(IResourceChangeEvent event) {
 
 			if (event.getType() == IResourceChangeEvent.PRE_CLOSE || event.getType() == IResourceChangeEvent.PRE_DELETE) {
@@ -136,6 +137,7 @@ private void hidePart(boolean force) {
 	protected void statusDialog(final Exception exc) {
 		try {
 			sync.syncExec(new Runnable() {
+				@Override
 				public void run() {
 					String bundle = FrameworkUtil.getBundle(getClass()).getSymbolicName();
 					Status status = new Status(IStatus.ERROR, bundle, exc.getMessage());
@@ -152,6 +154,7 @@ public void run() {
 	 */
 	protected void reloadModel() {
 		getModelProvider().getRoot().getRealm().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				try {
 					resource.unload();

From f712379f16f85b3ee8e68f56c8df3154a07b5c2d Mon Sep 17 00:00:00 2001
From: Joseph Carrol <jdsalingerjr@gmail.com>
Date: Sat, 16 Nov 2013 23:48:30 +0100
Subject: [PATCH 0647/1286] Bug 384514 - [Model Editor] Cannot add view
 placeholders in fragments

Signed-off-by: Joseph Carrol <jdsalingerjr@gmail.com>
---
 .../common/component/dialogs/SharedElementsDialog.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index 1eb5fb6678..16d641472b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -11,6 +11,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -120,6 +121,12 @@ public void doubleClick(DoubleClickEvent event) {
 					}
 				}
 			}
+
+			// NEW IMPLEMENTATION:
+			for (MApplicationElement f : ((MModelFragments) resource.getRoot().get(0)).getImports()) {
+				// let filter() do its job
+				list.addAll(filter(Collections.singletonList(f)));
+			}
 			viewer.setInput(list);
 		}
 

From 96589008631229c3168cde3b94b645d915896ffb Mon Sep 17 00:00:00 2001
From: Daniel Rolka <daniel.rolka@pl.ibm.com>
Date: Thu, 21 Nov 2013 18:21:59 +0100
Subject: [PATCH 0648/1286] Bug 422225 - [event spy] Replace plain Tree widget
 with TreeViewer

Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>

From 1eb82601c628169ba9b84b9e733b6160cfd62e0e Mon Sep 17 00:00:00 2001
From: Daniel Rolka <daniel.rolka@pl.ibm.com>
Date: Fri, 22 Nov 2013 02:39:09 +0100
Subject: [PATCH 0649/1286] Bug 422319 - [event spy] Improve support for
 filtering the captured events

Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>

From 96afa45358bda2857f5ffb2b0896b109433eadb4 Mon Sep 17 00:00:00 2001
From: Daniel Rolka <daniel.rolka@pl.ibm.com>
Date: Fri, 22 Nov 2013 11:32:12 +0100
Subject: [PATCH 0650/1286] Bug 422319 - [event spy] Improve support for
 filtering the captured events - Addtional fix for the filters order

Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>

From 3f0d25888cf93c26fcbf8a96759543e08897eb8f Mon Sep 17 00:00:00 2001
From: Daniel Rolka <daniel.rolka@pl.ibm.com>
Date: Fri, 22 Nov 2013 12:09:47 +0100
Subject: [PATCH 0651/1286] Bug 422323 - [event spy] Improve the way of loading
 the selected classes in the IDE

Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>

From 07d0c959ba5e3e56e3ee439eebfc30140e9b9d55 Mon Sep 17 00:00:00 2001
From: Daniel Rolka <daniel.rolka@pl.ibm.com>
Date: Fri, 22 Nov 2013 13:24:36 +0100
Subject: [PATCH 0652/1286] Bug 422324 - [event spy] Improve the project
 structure to follow the Eclipse naming conventions

Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>

From fe98a4fc24327f459fbcb93d121e7c5daccf89e8 Mon Sep 17 00:00:00 2001
From: Daniel Rolka <daniel.rolka@pl.ibm.com>
Date: Fri, 22 Nov 2013 14:10:54 +0100
Subject: [PATCH 0653/1286] Bug 422332 - [event spy] Remove redundant 'close'
 button from dialog

Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>

From 0095a6ceba4af20469d9cab812756f96b20b0dbe Mon Sep 17 00:00:00 2001
From: Daniel Rolka <daniel.rolka@pl.ibm.com>
Date: Fri, 22 Nov 2013 14:30:50 +0100
Subject: [PATCH 0654/1286] Bug 422333 - [event spy] Exceptions during
 adding/modifying filter when validation fails

Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>

From ca66b882c37fdb0ca7a2e6acc4714a605749cec4 Mon Sep 17 00:00:00 2001
From: Daniel Rolka <daniel.rolka@pl.ibm.com>
Date: Fri, 22 Nov 2013 18:53:21 +0100
Subject: [PATCH 0655/1286] Bug 422362 - [event spy] Stale filters when
 launching the spy several times

Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>

From 094ff694e0facfd72d6e86d6ff453ea457545103 Mon Sep 17 00:00:00 2001
From: Daniel Rolka <daniel.rolka@pl.ibm.com>
Date: Sun, 24 Nov 2013 21:38:50 +0100
Subject: [PATCH 0656/1286] Bug 422422 - [event spy] Add single cell selection
 to the captured events tree

Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>

From a2d1554f4e4e7880d8568cbabb360cdef38cb2b4 Mon Sep 17 00:00:00 2001
From: Daniel Rolka <daniel.rolka@pl.ibm.com>
Date: Sun, 24 Nov 2013 22:14:08 +0100
Subject: [PATCH 0657/1286] Bug 422423 - [event spy] Wrong context for storing
 the filters

Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>

From 48c90e141936a2bad6454f77eea62ec18942dd49 Mon Sep 17 00:00:00 2001
From: Daniel Rolka <daniel.rolka@pl.ibm.com>
Date: Sun, 24 Nov 2013 23:09:46 +0100
Subject: [PATCH 0658/1286] Bug 422422 - [event spy] Add single cell selection
 to the captured events tree - change in the selection behavior

Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>

From a3a7fe4861ff02900f24ff029c67186b2dd833a1 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Fri, 22 Nov 2013 08:48:52 +0100
Subject: [PATCH 0659/1286] Bug 422311 - Use png files instead of gif file in
 the Eclipse 4 application wizard

Change-Id: I835891205bed4fb3b6f09b4fcf866e6afcaa0dcd
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 bundles/org.eclipse.e4.tools/build.properties |   4 +-
 .../wizards/project/E4NewProjectWizard.java   |  52 ++++++++----------
 .../templates/common/icons/sample.gif         | Bin 983 -> 0 bytes
 .../templates/common/icons/sample.png         | Bin 0 -> 642 bytes
 .../templates/common/icons/save_edit.gif      | Bin 639 -> 0 bytes
 .../templates/common/icons/save_edit.png      | Bin 0 -> 933 bytes
 6 files changed, 25 insertions(+), 31 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools/templates/common/icons/sample.gif
 create mode 100644 bundles/org.eclipse.e4.tools/templates/common/icons/sample.png
 delete mode 100644 bundles/org.eclipse.e4.tools/templates/common/icons/save_edit.gif
 create mode 100644 bundles/org.eclipse.e4.tools/templates/common/icons/save_edit.png

diff --git a/bundles/org.eclipse.e4.tools/build.properties b/bundles/org.eclipse.e4.tools/build.properties
index 337436ebe9..ecd7b1c601 100644
--- a/bundles/org.eclipse.e4.tools/build.properties
+++ b/bundles/org.eclipse.e4.tools/build.properties
@@ -3,7 +3,7 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               icons/,\
                templates/,\
                about.html,\
-               OSGI-INF/
+               OSGI-INF/,\
+               icons/
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 798b39b583..d976b6a0e0 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2012 Soyatec(http://www.soyatec.com) and others.
+ * Copyright (c) 2006, 2013 Soyatec(http://www.soyatec.com) and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -286,7 +286,8 @@ public void createProductsExtension(IProject project) {
 			String cssValue = map
 					.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
 			if (cssValue != null) {
-				cssValue = "platform:/plugin/" + fPluginData.getId() + "/" + cssValue;
+				cssValue = "platform:/plugin/" + fPluginData.getId() + "/"
+						+ cssValue;
 				map.put(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY,
 						cssValue);
 			}
@@ -322,9 +323,8 @@ public void createProductsExtension(IProject project) {
 										NewApplicationWizardPage.APPLICATION)
 								|| entry.getKey().equals(
 										NewApplicationWizardPage.richSample)
-								|| entry.getKey().equals(
-										NewApplicationWizardPage.CLEAR_PERSISTED_STATE)
-								) {
+								|| entry.getKey()
+										.equals(NewApplicationWizardPage.CLEAR_PERSISTED_STATE)) {
 							continue;
 						}
 						IPluginElement element = fmodel.getFactory()
@@ -417,7 +417,8 @@ public void createApplicationResources(IProject project,
 
 		Map<String, String> keys = new HashMap<String, String>();
 		keys.put("projectName", pluginName);
-		keys.put("productFileName", map.get(NewApplicationWizardPage.PRODUCT_NAME));
+		keys.put("productFileName",
+				map.get(NewApplicationWizardPage.PRODUCT_NAME));
 		String elementName = fragment.getElementName();
 		keys.put("packageName", (elementName.equals("") ? "" : elementName
 				+ ".")
@@ -500,7 +501,7 @@ private void createApplicationModel(IProject project, String pluginName,
 			addon.setElementId("org.eclipse.e4.ui.workbench.handler.model");
 			addon.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon");
 			application.getAddons().add(addon);
-			
+
 			addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.ui.workbench.contexts.model");
 			addon.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon");
@@ -519,21 +520,20 @@ private void createApplicationModel(IProject project, String pluginName,
 			resource.getContents().add((EObject) application);
 			MBindingContext rootContext = MCommandsFactory.INSTANCE
 					.createBindingContext();
-			rootContext
-			.setElementId("org.eclipse.ui.contexts.dialogAndWindow");
+			rootContext.setElementId("org.eclipse.ui.contexts.dialogAndWindow");
 			rootContext.setName("In Dialog and Windows");
-			
+
 			MBindingContext childContext = MCommandsFactory.INSTANCE
 					.createBindingContext();
 			childContext.setElementId("org.eclipse.ui.contexts.window");
 			childContext.setName("In Windows");
 			rootContext.getChildren().add(childContext);
-			
+
 			childContext = MCommandsFactory.INSTANCE.createBindingContext();
 			childContext.setElementId("org.eclipse.ui.contexts.dialog");
 			childContext.setName("In Dialogs");
 			rootContext.getChildren().add(childContext);
-			
+
 			application.getRootContext().add(rootContext);
 			application.getBindingContexts().add(rootContext);
 			if (!isMinimalist) {
@@ -571,7 +571,7 @@ private void createApplicationModel(IProject project, String pluginName,
 					fileMenuItem.getChildren().add(menuItemOpen);
 					menuItemOpen.setLabel("Open");
 					menuItemOpen.setIconURI("platform:/plugin/" + pluginName
-							+ "/icons/sample.gif");
+							+ "/icons/sample.png");
 					menuItemOpen.setCommand(openCommand);
 
 					MHandledMenuItem menuItemSave = MMenuFactory.INSTANCE
@@ -579,7 +579,7 @@ private void createApplicationModel(IProject project, String pluginName,
 					fileMenuItem.getChildren().add(menuItemSave);
 					menuItemSave.setLabel("Save");
 					menuItemSave.setIconURI("platform:/plugin/" + pluginName
-							+ "/icons/save_edit.gif");
+							+ "/icons/save_edit.png");
 					menuItemSave.setCommand(saveCommand);
 
 					MHandledMenuItem menuItemQuit = MMenuFactory.INSTANCE
@@ -638,14 +638,14 @@ private void createApplicationModel(IProject project, String pluginName,
 						.createHandledToolItem();
 				toolBar.getChildren().add(toolItemOpen);
 				toolItemOpen.setIconURI("platform:/plugin/" + pluginName
-						+ "/icons/sample.gif");
+						+ "/icons/sample.png");
 				toolItemOpen.setCommand(openCommand);
 
 				MHandledToolItem toolItemSave = MMenuFactory.INSTANCE
 						.createHandledToolItem();
 				toolBar.getChildren().add(toolItemSave);
 				toolItemSave.setIconURI("platform:/plugin/" + pluginName
-						+ "/icons/save_edit.gif");
+						+ "/icons/save_edit.png");
 				toolItemSave.setCommand(saveCommand);
 			}
 			Map<Object, Object> options = new HashMap<Object, Object>();
@@ -676,7 +676,7 @@ private MCommand createCommand(String commandId, String name,
 					+ "handlers." + className);
 			handler.setElementId(projectName + ".handler." + name);
 			application.getHandlers().add(handler);
-			
+
 			// create binding for the command
 			MKeyBinding binding = MCommandsFactory.INSTANCE.createKeyBinding();
 			binding.setKeySequence(keyBinding);
@@ -728,18 +728,12 @@ public String getPluginVersion() {
 
 	private class ContentWizard extends Wizard implements IBundleContentWizard {
 
-		String[] dependencies = new String[] { 
-				"javax.inject",
-				"org.eclipse.core.runtime", 
-				"org.eclipse.swt",
-				"org.eclipse.e4.ui.model.workbench",
-				"org.eclipse.jface",
-				"org.eclipse.e4.ui.services",
-				"org.eclipse.e4.ui.workbench", 
-				"org.eclipse.e4.core.di", 
-				"org.eclipse.e4.ui.di",
-				"org.eclipse.e4.core.contexts",
-				};
+		String[] dependencies = new String[] { "javax.inject",
+				"org.eclipse.core.runtime", "org.eclipse.swt",
+				"org.eclipse.e4.ui.model.workbench", "org.eclipse.jface",
+				"org.eclipse.e4.ui.services", "org.eclipse.e4.ui.workbench",
+				"org.eclipse.e4.core.di", "org.eclipse.e4.ui.di",
+				"org.eclipse.e4.core.contexts", };
 
 		public void init(IFieldData data) {
 		}
diff --git a/bundles/org.eclipse.e4.tools/templates/common/icons/sample.gif b/bundles/org.eclipse.e4.tools/templates/common/icons/sample.gif
deleted file mode 100644
index 34fb3c9d8cb7d489681b7f7aee4bdcd7eaf53610..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 983
zcmZ?wbhEHb6krfw_|CxKYUg-n!?izO{@<MU=lrfa-=6>9*?jxd%4aX0yzy`dymabz
zw#(eg=y~&N&n)dZv2xzduG}5lraiApo3(c4*{Ylg5#|$JO_EEZ<^|a2`Z*=9ns7DV
zy=TR&gYw*7f%auV?ip3tvjRPmcdoho{K?x$_vR?C#t5&<;~V}S*>OMCr>h}%%bLZ9
zmo3`hYE<KGQ|@6^6ztNF7&tM)w`%LUlM$ZXF+LNb{aPCe*E?B9-oF0Q%eE%Wqbtg%
z@9CqD9#(CE&J!||x{C9<qx`1E1<#EMm>wTICo-TTCZwgTsC&VjZRgJ1eE#fBa^%9R
zmmfWS@;bnyJ27HWY}kxYzv(Hl>yu;FCPlAEh+34Muq-8Rb6C)<<b<V}>8qA3{r2e5
z`$vyngh#H=FWlqqvnapfc5%(!sQ4v?r7J61-&eJNEN^;KTK}T7{#i-g<Ko(f<;_oL
zEqXI)#s$xy8I>Jh%G*9vcYdwv_*~xdw!Gz4Va?T!sXyyF@8?w<>X`X=#<IVLwl(2N
zbDlnX{r~@ehEXtZA)xq^g^_`wfk6l41W=w};Ml^z$SLEoVZp&>j%uHV4GRvj@+tE@
zQ%F!a)GKcn<q;6D!JEN>^~8abN>4la1UNXVL;{ZWi)lEwyeatDu%Lr6;aASiLrXXW
z<qR}<jx?wH%UBk_m}3}x+;6r`C0o`5p=aFFG(%QJbS6DH5nx_(p~G`=8t-hw@-KTT
zjSG%3ippkO@kn%b<6zL?_~%%t)W#~L>Qm#<km7kzO+(7yLxUo7pMn=(Rpi5j!`up<
Pa}@5JsVsJ2V6X-N$YLV6

diff --git a/bundles/org.eclipse.e4.tools/templates/common/icons/sample.png b/bundles/org.eclipse.e4.tools/templates/common/icons/sample.png
new file mode 100644
index 0000000000000000000000000000000000000000..932e4518cdae42e5eaa2b38f655b31e155873367
GIT binary patch
literal 642
zcmV-|0)737P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006>Nkl<Zc-muN
zKmv?F0Hl~1Z~#U|CZHT6E=fiv7+YFWSHsjGBGb}1w#(8au31OjBV0&OUIeBT!w{&=
z41)Z!f*wwlbK}G2{7eX+_dg*Ff)m5%|Bnrs`4VVg2^%XXNGTIY7qZPvLV|K4;eP!W
z;=|_tj|`Xu!oOiSB4E;=$biZJlOh-X_i!qo%?dOGsE-+D2s0}SJ41kH>xQ_{+5aQ_
zC;p5IobnHd|D)l55&jc?CPgm#Z>$%R1q~Axuq%}1%xx1w=lqZG>-!D09SffLKhl5F
z-$?(7e}ViLyxgKZV9n84`x*)wpS{hmefTH8?%_Wm{!a+!)!zSC+W!8bqMC~%gMzBF
zYE<OHGf4?+|0Tq&`kN59`agcW>Q74IhJStm6K3-8NeD66xYfF)W*@kpmbL$HYS#XL
zK>9yEoSL=oZ(8>Lze!npcZ*5sDKoeROvp|xJas*{;`;CGvMYac%C7v!hqEE{zr?)5
zha_c9%)#NHBx7n9A3WoKn0M#z2;biS5xzaxu}{z6aG&nKk$(MeIaoL#F~G#c!ph3Z
z!5rw>x(^hM!1(?d6*TRCRM1p({0|hxplGzSOsfDTA0{SdR#-w}6ctvI2Wq|-7cvW!
z7XCsK(d6HV1U2!0Qp5sKLR!bp#?6eJkl^`1SWsRzz@ud|DCvTdFvvym!1Mu1*1#0{
z&E7Jj3z(Eyp!tCjYi43*W@AuMw6+Fjq6RmIlEseJIdg#-t3XOZM-@HqV9Sw=kc@&i
cJELd@0Km0g2{wxuo&W#<07*qoM6N<$g5ZTN)c^nh

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools/templates/common/icons/save_edit.gif b/bundles/org.eclipse.e4.tools/templates/common/icons/save_edit.gif
deleted file mode 100644
index 499dd0ca6021c351c641053be30eecb5b4a7e7e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 639
zcmZ?wbhEHb6krfwc*el+<Hw(<%GJ?8R0Skg#Z|9LtX+BM@%uOLzeHE9N~l|zQokal
zVMRvM^68syZaw#D`^m?<PCwaq?&*<B&re=^dG6Nh^C0x<!>6w~t;=?ud9vy7?cE^q
z*1q%4_Md-x_|o&km!6%t_VVPl7w2!kK6mTY)%$O+-hXrZ@w-PaKBPA<&u(2-(6RIc
zNcPq9H=oX5zOnP@<=ao*J$&)u*_+SB-Al@Q7r*)NC8Bg<dEeri35y=R{a!s`(Zjdj
z-+cag`^Be+Z@<+~UU=u_r#GK}eE9tJ_RCMNKmTZ&x}bU5g3n*SwN9VkHe-IrOdy)K
z{qV8E=C-cc^EU3?-!*&Ax1T@1|NOah^SXb3e?2)r_y7O@3<Ciaf3h$#FhnrufGh{a
z2?P6`hKQ!-mewYNfKLCwo*w_s0D}l$Pfx$F88gHDrusy9Nw@@rEC~r-60p!a!o!>+
zz;2_n+r|KMbN2{G6a4_&{kGN)4gvc5juAGR#sRMOu1@w&t^vlzRuN`KMgigX?uQ4k
zYgk5@s;SFPcrC52W*VWRCnlyRuKMMRsEVpigru?tONzsU2OVNcZfg!)N^s&3;9>A!
zDQIQv=+@exGeO}YGc&uwQjf$B2b)>gB6wUn7Bn7go*uf&AmXGW<1{9LBBLK|i<A5~
bST`Jza8PJuU}Rz9@R-nWAc(1vfx#L8pLQ0s

diff --git a/bundles/org.eclipse.e4.tools/templates/common/icons/save_edit.png b/bundles/org.eclipse.e4.tools/templates/common/icons/save_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c598e5aef10055fd508a52964ecac7ad00ef2a2
GIT binary patch
literal 933
zcmV;W16urvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV000AQNkl<Zc-m!=
z>u-})9LJv*F1{ejHrkmuH!p|^iHwD$_&@NHS7;!bkjOHl@dY|yD$2Nsfx$K)s4=Bo
zuj_7YN4u_F*?R9NtXsRacD?UupZ00Hc5M-GPrn}aq6R(5C%=>L`ToA=cXB9-td|-Z
zsK(}9uk37UZsN7Hv^Dei?ae&ie`(vr=eP6t{MJ{SnsyTZj_17;ujRGI@2_5;85B#|
z+cL$5_WnF(oo<+23;)C9bYawBtPyX1KrCgtd(I3|dpkN0jhU@r^F^#BXy`3gJp218
zs()4MR32CG^w|^Siv>)P3)qbkBFPl431y&m@B2`oG|X?6t53F~G*eU0-bb-qK{!d*
z2_@E%%&?%dEGCTRTCx1N#^g%1zT3hr60lz&(OHlyR=Hq|hH82SY^jQLzEmfbD<WH}
zAVM=x>J7*g%7~})`017i)H{3k3q(^EF!>7SUrR!!)gzWI;bAaZ=RqI>Uo3@{cp4JT
zJ<#kX!s|KwFeC=`_6Hq;Kh##NXUp7TFagno1_^fK1>)HP=)xv^(FBBJYQ&i$f^inT
zH-<sIMFM^uw<4M<aSv7#xGB1eMVAUoZWX-lf2-d!in&=C?#NXL(?$5g8T9l^K)v~X
zhv3$z4S`sm^G9=#O_?wxmg0BC2!2y2UtmBafzIkdXnhlpf@z$(Dh1X4-T}d&(uU<Q
z%Pod-SdAC)D8$0J5U*o!#bEX%$P)_iM>nt>$zfqNjjykeZ)_t0{W3cq{+Z=G!7QBq
zG`<}$;HxWIeABNZ=<(f6Bf2h3;+n((Z#YN1EF8WRzPv04^~Rn9f?p(dxK<d>Lk=|7
zHGJMTi6t^kfK20DPC=?$!n7m0tvgpTa0jxO_tNOTNCH~l?G#+PYln3y#X0;LOwN;l
z3mOQgV;D9ia6{$CXFpD0aBKx%T-K7tH0(YGCQlM4&nrN^zPs~KpU_dWcvGC+m%;d4
z2wj&n&@H54^0JT^*U<g54pI}TM4wws!?Mi4NCHlrlXFz-o`VO^-myVri`1swNr?3U
zGMWlDn*k2T3`}M{<l~c2>+a#?MK!ec81(K0l%^m~oL7T-c}HWzkyFDn$9q*c-aE2&
ztak*ToKfOvk9?btPs@p}*xo<ai3i8dD!EV3Y4FkEuG9YjAc*EtH2BH&00000NkvXX
Hu0mjfqjte?

literal 0
HcmV?d00001


From 34403a4f68faba93116e628a36b96cfec5bbe9b9 Mon Sep 17 00:00:00 2001
From: Daniel Rolka <daniel.rolka@pl.ibm.com>
Date: Tue, 26 Nov 2013 16:06:36 +0100
Subject: [PATCH 0660/1286] Bug 419697 - Generated Eclipse 4 project does not
 work out of the box with Luna

Change-Id: I562e0d24ab0b292ba5d249964f327b8dcacf336f
Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>
---
 .../templates/common/$productFileName$.product                   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product b/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
index 01daa0619d..b957ad64a2 100644
--- a/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
+++ b/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
@@ -102,6 +102,7 @@
       <plugin id="org.w3c.css.sac"/>
       <plugin id="org.w3c.dom.smil"/>
       <plugin id="org.w3c.dom.svg"/>
+      <plugin id="org.w3c.dom.events"/>
    </plugins>
 
 

From 30d80a7d0c09a87305d1cfc6e3a9da6ab93eaa65 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Wed, 27 Nov 2013 10:52:59 +0100
Subject: [PATCH 0661/1286] Bug 422644 - Live model editor - Use M keys instead
 of SHIFT + ALT

Change-Id: I4d6f724d9dde76d475404038f584c132af375541
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>

From aa4f974042de8eb588cc72ed13cb20658164d898 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Wed, 27 Nov 2013 10:59:00 +0100
Subject: [PATCH 0662/1286] Bug 422653 - Enable save actions for
 org.eclipse.e4.tools.emf.liveeditor

Change-Id: I3c4369828206495cf4971e31fc8af8e27a86e527
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>

From 63c3c95808c67f5b359a1c19ca74a2829f20db35 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Mon, 2 Dec 2013 16:23:34 +0100
Subject: [PATCH 0663/1286] Bug 419697 - Generated Eclipse 4 project does not
 work out of the box with Luna

Change-Id: I91d3755c5512e2f1f4f2d585baa13a03074de988
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../templates/common/$productFileName$.product                   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product b/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
index b957ad64a2..838c6abe19 100644
--- a/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
+++ b/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
@@ -79,6 +79,7 @@
       <plugin id="org.eclipse.jface"/>
       <plugin id="org.eclipse.jface.databinding"/>
       <plugin id="org.eclipse.osgi"/>
+      <plugin id="org.eclipse.osgi.compatibility.state"/>
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.swt"/>
       <plugin id="org.eclipse.swt.carbon.macosx" fragment="true"/>

From f85899d4f237713ca0cab6e7f3877ad92227b9c5 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Thu, 12 Dec 2013 17:46:02 +0100
Subject: [PATCH 0664/1286] Bug 423931 - [Model Editor] Editing Context
 Properties or Persisted State modifies key rather than value

Change-Id: I8a8b485a4ec8dcecef4d9f616823d03c631fa087
Signed-off-by: Sopot Cela <sopotcela@gmail.com>
---
 .../tools/emf/ui/internal/common/component/ControlFactory.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index a866696b56..515443e100 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -228,9 +228,10 @@ public String getText(Object element) {
 
 			@Override
 			protected void setValue(Object element, Object value) {
-				Command cmd = SetCommand.create(editor.getEditingDomain(), element, ApplicationPackageImpl.Literals.STRING_TO_STRING_MAP__KEY, value.toString().trim().length() == 0 ? null : value.toString());
+				Command cmd = SetCommand.create(editor.getEditingDomain(), element, ApplicationPackageImpl.Literals.STRING_TO_STRING_MAP__VALUE, value.toString().trim().length() == 0 ? null : value.toString());
 				if (cmd.canExecute()) {
 					editor.getEditingDomain().getCommandStack().execute(cmd);
+					tableviewer.refresh();
 				}
 			}
 

From 4916a8831f9300dd454056dce2860b839ff55693 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Mon, 16 Dec 2013 16:45:44 +0100
Subject: [PATCH 0665/1286] Bug 424140 - LiveModelEditor should not rely on
 findElements for handlers and commands

Change-Id: Ic24b001e0760766d2f7af0736938f633c05e716c
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>

From e3979468508a5db272ac7894ce3fee45e91c927f Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Sun, 12 Jan 2014 21:02:17 +0100
Subject: [PATCH 0666/1286] Bug 425508 - [e4xmi] Live editor layout is broken
 when ClassURI is used

---
 .../emf/ui/internal/common/component/AddonsEditor.java   | 9 ++++++---
 .../internal/common/component/DirectMenuItemEditor.java  | 9 ++++++---
 .../internal/common/component/DirectToolItemEditor.java  | 9 ++++++---
 .../common/component/DynamicMenuContributionEditor.java  | 9 ++++++---
 .../emf/ui/internal/common/component/HandlerEditor.java  | 9 ++++++---
 .../emf/ui/internal/common/component/PartEditor.java     | 8 ++++----
 6 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index cd224164e6..4c393f776d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -147,12 +147,12 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		final Link lnk = new Link(parent, SWT.NONE);
+		final Link lnk;
 		// ------------------------------------------------------------
 		{
 			final IContributionClassCreator c = getEditor().getContributionCreator(ApplicationPackageImpl.Literals.ADDON);
 			if (project != null && c != null) {
-
+				lnk = new Link(parent, SWT.NONE);
 				lnk.setText("<A>" + Messages.PartEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
 				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 				lnk.addSelectionListener(new SelectionAdapter() {
@@ -162,6 +162,7 @@ public void widgetSelected(SelectionEvent e) {
 					}
 				});
 			} else {
+				lnk = null;
 				Label l = new Label(parent, SWT.NONE);
 				l.setText(Messages.AddonsEditor_ClassURI);
 				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
@@ -174,7 +175,9 @@ public void widgetSelected(SelectionEvent e) {
 
 				@Override
 				public void modifyText(ModifyEvent e) {
-					lnk.setToolTipText(((Text) (e.getSource())).getText());
+					if (lnk != null) {
+						lnk.setToolTipText(((Text) (e.getSource())).getText());
+					}
 				}
 			});
 			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 34b9291172..d8931cc622 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -116,11 +116,11 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		// ------------------------------------------------------------
-		final Link lnk = new Link(parent, SWT.NONE);
+		final Link lnk;
 		{
 			final IContributionClassCreator c = getEditor().getContributionCreator(MenuPackageImpl.Literals.DIRECT_MENU_ITEM);
 			if (project != null && c != null) {
-
+				lnk = new Link(parent, SWT.NONE);
 				lnk.setText("<A>" + Messages.DirectMenuItemEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
 				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 				lnk.addSelectionListener(new SelectionAdapter() {
@@ -130,6 +130,7 @@ public void widgetSelected(SelectionEvent e) {
 					}
 				});
 			} else {
+				lnk = null;
 				Label l = new Label(parent, SWT.NONE);
 				l.setText(Messages.DirectMenuItemEditor_ClassURI);
 				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
@@ -142,7 +143,9 @@ public void widgetSelected(SelectionEvent e) {
 
 				@Override
 				public void modifyText(ModifyEvent e) {
-					lnk.setToolTipText(((Text) (e.getSource())).getText());
+					if (lnk != null) {
+						lnk.setToolTipText(((Text) (e.getSource())).getText());
+					}
 				}
 			});
 			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 48ce163180..1344120a45 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -81,9 +81,9 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		final IContributionClassCreator c = getEditor().getContributionCreator(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM);
-		final Link lnk = new Link(parent, SWT.NONE);
+		final Link lnk;
 		if (project != null && c != null) {
-
+			lnk = new Link(parent, SWT.NONE);
 			lnk.setText("<A>" + Messages.DirectMenuItemEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
 			lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 			lnk.addSelectionListener(new SelectionAdapter() {
@@ -93,6 +93,7 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 		} else {
+			lnk = null;
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.DirectToolItemEditor_ClassURI);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
@@ -105,7 +106,9 @@ public void widgetSelected(SelectionEvent e) {
 
 			@Override
 			public void modifyText(ModifyEvent e) {
-				lnk.setToolTipText(((Text) (e.getSource())).getText());
+				if (lnk != null) {
+					lnk.setToolTipText(((Text) (e.getSource())).getText());
+				}
 			}
 		});
 		Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
index 4cb2cf549b..3d56e4044d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
@@ -154,11 +154,11 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		ControlFactory.createTranslatedTextField(parent, Messages.DynamicMenuContributionEditor_LabelLabel, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
 
 		// ------------------------------------------------------------
-		final Link lnk = new Link(parent, SWT.NONE);
+		final Link lnk;
 		{
 			final IContributionClassCreator c = getEditor().getContributionCreator(MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION);
 			if (project != null && c != null) {
-
+				lnk = new Link(parent, SWT.NONE);
 				lnk.setText("<A>" + Messages.DynamicMenuContributionEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
 				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 				lnk.addSelectionListener(new SelectionAdapter() {
@@ -168,6 +168,7 @@ public void widgetSelected(SelectionEvent e) {
 					}
 				});
 			} else {
+				lnk = null;
 				Label l = new Label(parent, SWT.NONE);
 				l.setText(Messages.DynamicMenuContributionEditor_ClassURI);
 				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
@@ -180,7 +181,9 @@ public void widgetSelected(SelectionEvent e) {
 
 				@Override
 				public void modifyText(ModifyEvent e) {
-					lnk.setToolTipText(((Text) (e.getSource())).getText());
+					if (lnk != null) {
+						lnk.setToolTipText(((Text) (e.getSource())).getText());
+					}
 				}
 			});
 			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index cd50f0e3bf..97f961a843 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -172,11 +172,11 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		// ------------------------------------------------------------
-		final Link lnk = new Link(parent, SWT.NONE);
+		final Link lnk;
 		{
 			final IContributionClassCreator c = getEditor().getContributionCreator(CommandsPackageImpl.Literals.HANDLER);
 			if (project != null && c != null) {
-
+				lnk = new Link(parent, SWT.NONE);
 				lnk.setText("<A>" + Messages.HandlerEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
 				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 				lnk.addSelectionListener(new SelectionAdapter() {
@@ -186,6 +186,7 @@ public void widgetSelected(SelectionEvent e) {
 					}
 				});
 			} else {
+				lnk = null;
 				Label l = new Label(parent, SWT.NONE);
 				l.setText(Messages.HandlerEditor_ClassURI);
 				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
@@ -198,7 +199,9 @@ public void widgetSelected(SelectionEvent e) {
 
 				@Override
 				public void modifyText(ModifyEvent e) {
-					lnk.setToolTipText(((Text) (e.getSource())).getText());
+					if (lnk != null) {
+						lnk.setToolTipText(((Text) (e.getSource())).getText());
+					}
 				}
 			});
 			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 4c5806918d..e215abfce2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -220,11 +220,11 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		// ------------------------------------------------------------
-		final Link lnk = new Link(parent, SWT.NONE);
+		final Link lnk;
 		{
 			final IContributionClassCreator c = getEditor().getContributionCreator(BasicPackageImpl.Literals.PART);
 			if (project != null && c != null) {
-
+				lnk = new Link(parent, SWT.NONE);
 				lnk.setText("<A>" + Messages.PartEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
 				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 				lnk.addSelectionListener(new SelectionAdapter() {
@@ -236,7 +236,7 @@ public void widgetSelected(SelectionEvent e) {
 			} else {
 				// Dispose the lnk widget, which is unused in this else branch
 				// and screws up the layout: see https://bugs.eclipse.org/421369
-				lnk.dispose();
+				lnk = null;
 
 				Label l = new Label(parent, SWT.NONE);
 				l.setText(Messages.PartEditor_ClassURI);
@@ -251,7 +251,7 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void modifyText(ModifyEvent e) {
 					// lnk might be disposed if else branch above taken
-					if (!lnk.isDisposed()) {
+					if (lnk != null) {
 						lnk.setToolTipText(((Text) (e.getSource())).getText());
 					}
 				}

From 17a92d3eace84bab6493aa433a48deb524f0190e Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Thu, 16 Jan 2014 11:51:21 +0100
Subject: [PATCH 0667/1286] Bug 425866 - Add README.md to the e4 tools projects

Change-Id: I84afe1090c986059ef5623df4b495151b32d999c
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/README.md

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/README.md b/bundles/org.eclipse.e4.tools.emf.ui/README.md
new file mode 100644
index 0000000000..4833807cc0
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/README.md
@@ -0,0 +1,12 @@
+# org.eclipse.e4.tools.emf.ui
+
+Provides the e4 model editor and the org.eclipse.e4.tools.emf.ui.editors extension point which can be used to add editor pages for custom model elements.
+
+For more information, refer to the [Eclipse e4 wiki page] [1].
+
+##License
+
+[Eclipse Public License (EPL) v1.0][2]
+
+[1]: http://www.eclipse.org/e4/
+[2]: http://wiki.eclipse.org/EPL

From 65a0066cac0f69ff54532c9156749b7885c75807 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Thu, 16 Jan 2014 12:26:31 +0100
Subject: [PATCH 0668/1286] Bug 425866 - Add README.md to the e4 tools projects

Adjusts formating of headlines, underline reads better in text mode

Change-Id: I2b926019197dad9e487e609db356f615faa876fa
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/README.md b/bundles/org.eclipse.e4.tools.emf.ui/README.md
index 4833807cc0..891a57e8f9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/README.md
+++ b/bundles/org.eclipse.e4.tools.emf.ui/README.md
@@ -1,10 +1,12 @@
-# org.eclipse.e4.tools.emf.ui
+org.eclipse.e4.tools.emf.ui
+===========================
 
 Provides the e4 model editor and the org.eclipse.e4.tools.emf.ui.editors extension point which can be used to add editor pages for custom model elements.
 
 For more information, refer to the [Eclipse e4 wiki page] [1].
 
-##License
+License
+-------
 
 [Eclipse Public License (EPL) v1.0][2]
 

From d18a3544dbccf95eb3a0c04ef7c87739d00abafd Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Thu, 16 Jan 2014 17:54:54 +0100
Subject: [PATCH 0669/1286] Bug 425879 - Add MDialog and MWizardDialog to model
 editor

Added the new elements to the model editor.

https://bugs.eclipse.org/bugs/show_bug.cgi?id=425879
---
 .../OSGI-INF/resources.properties             |   5 ++
 .../icons/full/modelelements/Dialog.png       | Bin 0 -> 730 bytes
 .../icons/full/modelelements/WizardDialog.png | Bin 0 -> 339 bytes
 .../icons/full/modelelements/tbr/Dialog.png   | Bin 0 -> 647 bytes
 .../full/modelelements/tbr/WizardDialog.png   | Bin 0 -> 1444 bytes
 .../e4/tools/emf/ui/internal/Messages.java    |   6 ++
 .../tools/emf/ui/internal/Messages.properties |   8 ++-
 .../emf/ui/internal/ResourceProvider.java     |   4 ++
 .../emf/ui/internal/common/ModelEditor.java   |   7 ++-
 .../common/component/ApplicationEditor.java   |   3 +-
 .../common/component/DialogEditor.java        |  54 ++++++++++++++++++
 .../common/component/WindowEditor.java        |   6 +-
 .../common/component/WizardDialogEditor.java  |  54 ++++++++++++++++++
 .../component/virtual/VWindowEditor.java      |  14 ++++-
 14 files changed, 154 insertions(+), 7 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Dialog.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WizardDialog.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Dialog.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/WizardDialog.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
index 7e109d4ce8..f4b0761075 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
@@ -8,6 +8,7 @@ IMG_org.eclipse.e4.tools.emf.ui.modelelements.Category=/icons/full/modelelements
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.Command=/icons/full/modelelements/Command.png
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.CommandParameter=/icons/full/modelelements/CommandParameter.png
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.CoreExpression=/icons/full/modelelements/CoreExpression.png
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.Dialog=/icons/full/modelelements/Dialog.png
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.DirectMenuItem=/icons/full/modelelements/DirectMenuItem.gif
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.DirectToolItem=/icons/full/modelelements/DirectToolItem.gif
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.HandledMenuItem=/icons/full/modelelements/HandledMenuItem.gif
@@ -37,6 +38,7 @@ IMG_org.eclipse.e4.tools.emf.ui.modelelements.ToolControl=/icons/full/modeleleme
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.TrimContribution=/icons/full/modelelements/TrimContribution.gif
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.Window=/icons/full/modelelements/Window.gif
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.WindowTrim=/icons/full/modelelements/WindowTrim.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.WizardDialog=/icons/full/modelelements/WizardDialog.png
 
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Addons=/icons/full/modelelements/tbr/Addons.png
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Application=/icons/full/modelelements/tbr/Application.png
@@ -45,6 +47,7 @@ IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Area=/icons/full/modelelements
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.BindingContext=/icons/full/modelelements/tbr/BindingContext.gif
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.BindingTable=/icons/full/modelelements/tbr/BindingTable.png
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.CommandParameter=/icons/full/modelelements/tbr/CommandParameter.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Dialog=/icons/full/modelelements/tbr/Dialog.png
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.DirectMenuItem=/icons/full/modelelements/tbr/DirectMenuItem.gif
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.DirectToolItem=/icons/full/modelelements/tbr/DirectToolItem.gif
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.HandledMenuItem=/icons/full/modelelements/tbr/HandledMenuItem.gif
@@ -72,6 +75,8 @@ IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.ToolControl=/icons/full/modele
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.TrimContribution=/icons/full/modelelements/tbr/TrimContribution.gif
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Window=/icons/full/modelelements/tbr/Window.gif
 IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.WindowTrim=/icons/full/modelelements/tbr/WindowTrim.gif
+IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.WizardDialog=/icons/full/modelelements/tbr/WizardDialog.png
+
 
 IMG_org.eclipse.e4.tools.emf.ui.obj16.arrow_down=/icons/full/obj16/arrow_down.png
 IMG_org.eclipse.e4.tools.emf.ui.obj16.arrow_up=/icons/full/obj16/arrow_up.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Dialog.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Dialog.png
new file mode 100644
index 0000000000000000000000000000000000000000..681c0a0f1b67cdf71953ee7540e4e41a39586d6b
GIT binary patch
literal 730
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAP>{XE
z)7O>#9-{!ij$XP_M-N!YHKN3^v?L?Hh+*ZrGaf)8o)VytOKNd)QD#9&W_})nFsGt2
zP@D@S?wnsxS(KTcQNpl>|BMw-ln*Rgl$r=qs!)=do62DNou3mZ!wHfJ&QB{TPb^Ah
zh%NXJQqB!FJhM1CClRQ$h++GIE&V`Y4v=toVo_dZUOK}8>1XXgF?NXl(xT*4hOhsd
zU&E9+=jZ08=9MsfJ2P!RP>c<vEF`leCzWBvyG!Z}42(-XT^vI!dY4Y#pFKHIq;<Zz
zo5qo@=B*1lf@GtNLtO+O^}8Mkyx8X##Lju}<WXOlm@7Q8SN1P(y>oQygKN7&*|+lX
zW|-&-E&lOz-s2CoVxrRAwx@T;oZEYT=X>96H@hyiN^icNo!)o%?U$I1jGW#rOs7vA
z670$Oe`fi6>z^Bc%<=mA<NEc}b7%X%_dUDB+W+2>4+Tq2R-6uaudA&;-*8v8zWb}|
zGwjPdzx~`LXX2Nu{oQDK)!cUn4BKxUJn^qE?Dy^&_Jz~*)%8E?7IQ9mW3XNC-EEe)
z5C7~el4_{>%(}C&HTRPSFI!MjVPc~5>cx{Mw<wt(P*a+br?+0*CQpWCLD=fQmlxcA
zyQnTvfGg$mhB}5x2RZ+yZ=Dpd!eK&S$CLwF29s8XtzNTs?Wg78Og>CsxE;Bc9N0fK
zA);#QmWM2lg@rwivi#LiR?4vXwIS}p968w;j=TR(th=T!;N<b>-&Nbn*G+{Jls?^$
zQs6k*z;!4lIk`P!Ym{Y(QD+P9%k>LRYrnsD{_ec9%S0NTTv#S`=$yX1Z6lL=p}3Ii
lXUm2ySF>d*TxMVNH!%Oz^rvdJ7cdGLJYD@<);T3K0RT@kFIE5m

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WizardDialog.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WizardDialog.png
new file mode 100644
index 0000000000000000000000000000000000000000..0889b901bc139ec2d5a0a3ce92880025c319138c
GIT binary patch
literal 339
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;V>;F5;{vRv2ef##^i3<Oh
zNdMpIzjEiABWoMhmaF~WV0Cx0%E}FE{(ml<yn6Tl|NnuSfTSKjLnx3XSQ6wH4CJB!
z2GzAQlYo+pN#5=*eEE9~{DB;$4A0;Y237_ZAY^7>0zyV4$iX1Oz{w!Qu>SeKs`o(E
z(j~4DCBgY=CFO}lsSN3vX+{Nk=?VsVW(pcfsU?Y;tL|n_0xFB~ba4!+m=k->o9}=E
z2TQ<;TkD(e{NJ*5Ba`lI&$tGjm-!yAI~cZRJ>{@mzV(LR`I4?28UIU4MUn#3ljEbB
z=W7_w;^Zx!dER%;MUnMCx}3!YT>`$?b$mD>E^>f3^*5ijgZ3J3pgjzpu6{1-oD!M<
D58i(=

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Dialog.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Dialog.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a4cbfe0542184c2de194040a9525ea987472d15
GIT binary patch
literal 647
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAP>{XE
z)7O>#9-{!iuHcFIDIdT>t`Q}Ur6n2pMGPy~o$&w)@st3CTvCgZi!uvJGV}8oggF(J
zf#O^sap(Mk%A(Blj1q=5{Aa9yqI_V{qSQo?QiYPt+*AhB@BExV8BUN)aDG}zd16s2
zLu|o+kaBLY;hDwBIf+1}MGV^yZ0QFIbAW`y6N~aP^U@g(NIz=_im^lVmlh?bGJO5t
z{2HdrIX^cyHLrx>+nH(mfnsbRWg(d*IjIaQ-d$2>U|<aLba4!^=v_M5x{JwCpl!dL
zn#2c&G`1uKsZKUFxq}`lf=7hkFq#<|-Yz+K<cbf^o|7%JwAr|{UPxI4-<_Saef`|T
zgH6j;FZ{PYZi~^e4_zzk_WzGtf8GB4^J2CG63y471Pk|FlUgdGbg0H|d4NXE`mojg
z2NMjwWN*C{F2E8ez|tAncU(D9V$#{Pn|a%1_}YE8M*U@K`}efyW7+Q5teM9oigwC)
zX>PeT#Y=UO#wUiFWS+BWpYPk2TgfuGEf(ZUIKQ?vaR$fA5Uq|Aq6$hq$CJe`y#C6N
zVIoz}<hT4XP$*;V%d*|&w##SU?OA<b-OI2Dz3DgKe_tuUaR1Vp8%<)}u8Vd==)^Gw
ziYO}iEDsjHkhi_@iDZtM^dpOX`3tXR*-o7v_Ai*bf7<!yk?XI&`)i^6`uFLlMMksF
y-qSger`nf1{p7h5_x3;HY^eHbUZuaXQU3M6Z?$EeANqjd&EV<k=d#Wzp$P!BKmJ|-

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/WizardDialog.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/WizardDialog.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ad3435ee1be32ee23b3c4bccc2518bbab516623
GIT binary patch
literal 1444
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^8|%*@QXy1IsjhTh)Z
zIdkSLTC`~S^5tvRtl7A6<M!>_ckI}4>C&a!w{QRd{~xG$6pV(za0&s-8-))T7#JB!
zg8YJkDI5tfAhAaV^XcvkKVaN)7I;J!GcfQS0b$0e+I-SLLG}_)Usv{fi~>Bu3=eYz
z)xbio5haeLB^mie3@g{2@c;_(lmLZXQj3#|G7CyF^Ya*lITe+G;#?qc=lp`oqRjM+
z5{5PWXRLstd|=U{)I^X{g_6wNR0h-U{G31;PLND+ep*R+Vo@qXY{7q!a&EBUnZ?OD
zi9n@A4BHQE=?4mPfP}*ni}Et_(isj&KWhhyu|xEi7A2=LeEr}28m7!SKQ}iuuY}>-
znQ8lhVr(E~A(<sPsSGRLT~Y^%gnPO;hDc0}J=@6FpuoX$;k1s|mw*3@7tie2Xt-_r
zZpMFXSH552San56@p(yiy2G-$Hr{KNxW(~pJ+aZ$A+0s7z_H$vHU3g+L-*kcoNC(y
gHP*gX(hhKu3t7p1vQqd;63_|;Pgg&ebxsLQ0Ac2#zW@LL

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 0d4b8efecc..7643488cfe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -268,6 +268,10 @@ public class Messages {
 	public String ToolControlEditor_Description;
 	public String ToolControlEditor_ClassURI;
 
+	public String DialogEditor_Label;
+
+	public String WizardDialogEditor_Label;
+
 	public String VBindingTableEditor_Label;
 	public String VBindingTableEditor_Description;
 	public String VBindingTableEditor_Contexts;
@@ -475,6 +479,8 @@ public class Messages {
 	public String VWindowEditor_Windows;
 	public String VWindowEditor_AddTrimmedWindow;
 	public String VWindowEditor_AddWindow;
+	public String VWindowEditor_AddDialog;
+	public String VWindowEditor_AddWizardDialog;
 
 	public String VWindowSharedElementsEditor_TreeLabel;
 	public String VWindowSharedElementsEditor_TreeLabelDescription;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 3dceed69eb..7e0e85a448 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -47,7 +47,7 @@ ApplicationEditor_Handlers=Handlers
 ApplicationEditor_PartDescriptors=Part Descriptors
 ApplicationEditor_BindingTables=BindingTables
 ApplicationEditor_Commands=Commands
-ApplicationEditor_Windows=Windows
+ApplicationEditor_Windows=Windows and Dialogs
 ApplicationEditor_Addons=Addons
 ApplicationEditor_MenuContributions=Menu Contributions
 ApplicationEditor_Snippets=Snippets
@@ -80,6 +80,10 @@ CommandEditor_Category=Category
 CommandEditor_AddCommandParameter=Command Parameter
 CommandEditor_NewCommandParameter=Command Parameter {0}
 
+DialogEditor_Label=Dialog
+
+WizardDialogEditor_Label=Wizard
+
 DirectMenuItemEditor_Label=DirectMenuItem
 DirectMenuItemEditor_Description=DirectMenuItem bla bla bla
 DirectMenuItemEditor_ClassURI=Class URI
@@ -476,6 +480,8 @@ VWindowEditor_TreeLabelDescription=Windows Bla Bla Bla Bla Bla
 VWindowEditor_Windows=Windows
 VWindowEditor_AddTrimmedWindow=Trimmed Window
 VWindowEditor_AddWindow=Window
+VWindowEditor_AddDialog=Dialog
+VWindowEditor_AddWizardDialog=Wizard
 
 VWindowSharedElementsEditor_TreeLabel=Shared Elements
 VWindowSharedElementsEditor_TreeLabelDescription=Shared Elements Bla Bla Bla Bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
index 60c8ecf024..353ab2f35e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
@@ -24,6 +24,7 @@ public class ResourceProvider extends BasicResourceProvider {
 	public static final String IMG_Command = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Command"; //$NON-NLS-1$
 	public static final String IMG_CommandParameter = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.CommandParameter"; //$NON-NLS-1$
 	public static final String IMG_CoreExpression = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.CoreExpression"; //$NON-NLS-1$
+	public static final String IMG_Dialog = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Dialog"; //$NON-NLS-1$
 	public static final String IMG_DirectMenuItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.DirectMenuItem"; //$NON-NLS-1$
 	public static final String IMG_DirectToolItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.DirectToolItem"; //$NON-NLS-1$
 	public static final String IMG_HandledMenuItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.HandledMenuItem"; //$NON-NLS-1$
@@ -53,6 +54,7 @@ public class ResourceProvider extends BasicResourceProvider {
 	public static final String IMG_TrimContribution = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.TrimContribution"; //$NON-NLS-1$
 	public static final String IMG_Window = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Window"; //$NON-NLS-1$
 	public static final String IMG_WindowTrim = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.WindowTrim"; //$NON-NLS-1$
+	public static final String IMG_WizardDialog = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.WizardDialog"; //$NON-NLS-1$
 
 	public static final String IMG_Tbr_Addons = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Addons"; //$NON-NLS-1$
 	public static final String IMG_Tbr_Application = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Application"; //$NON-NLS-1$
@@ -61,6 +63,7 @@ public class ResourceProvider extends BasicResourceProvider {
 	public static final String IMG_Tbr_BindingContext = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.BindingContext"; //$NON-NLS-1$
 	public static final String IMG_Tbr_BindingTable = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.BindingTable"; //$NON-NLS-1$
 	public static final String IMG_Tbr_CommandParameter = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.CommandParameter"; //$NON-NLS-1$
+	public static final String IMG_Tbr_Dialog = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Dialog"; //$NON-NLS-1$
 	public static final String IMG_Tbr_DirectMenuItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.DirectMenuItem"; //$NON-NLS-1$
 	public static final String IMG_Tbr_DirectToolItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.DirectToolItem"; //$NON-NLS-1$
 	public static final String IMG_Tbr_HandledMenuItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.HandledMenuItem"; //$NON-NLS-1$
@@ -88,6 +91,7 @@ public class ResourceProvider extends BasicResourceProvider {
 	public static final String IMG_Tbr_TrimContribution = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.TrimContribution"; //$NON-NLS-1$
 	public static final String IMG_Tbr_Window = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Window"; //$NON-NLS-1$
 	public static final String IMG_Tbr_WindowTrim = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.WindowTrim"; //$NON-NLS-1$
+	public static final String IMG_Tbr_WizardDialog = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.WizardDialog"; //$NON-NLS-1$
 
 	public static final String IMG_Obj16_arrow_down = "IMG_org.eclipse.e4.tools.emf.ui.obj16.arrow_down"; //$NON-NLS-1$
 	public static final String IMG_Obj16_arrow_up = "IMG_org.eclipse.e4.tools.emf.ui.obj16.arrow_up"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 2a6143f810..8087b53255 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -12,8 +12,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -75,6 +73,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CommandParameterEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CoreExpressionEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DefaultEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.DialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectMenuItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DynamicMenuContributionEditor;
@@ -108,6 +107,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.TrimContributionEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.TrimmedWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.WizardDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationAddons;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationCategoriesEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationWindowEditor;
@@ -195,6 +195,7 @@
 import org.eclipse.jface.text.source.AnnotationModel;
 import org.eclipse.jface.text.source.SourceViewer;
 import org.eclipse.jface.text.source.VerticalRuler;
+import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -1203,6 +1204,8 @@ private void registerDefaultEditors() {
 		registerEditor(BasicPackageImpl.Literals.PART_STACK, ContextInjectionFactory.make(PartStackEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.INPUT_PART, ContextInjectionFactory.make(InputPartEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.TRIM_BAR, ContextInjectionFactory.make(TrimBarEditor.class, context));
+		registerEditor(BasicPackageImpl.Literals.DIALOG, ContextInjectionFactory.make(DialogEditor.class, context));
+		registerEditor(BasicPackageImpl.Literals.WIZARD_DIALOG, ContextInjectionFactory.make(WizardDialogEditor.class, context));
 
 		registerEditor(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR, ContextInjectionFactory.make(PartDescriptorEditor.class, context));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 8d95afc243..77cb8eef95 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -89,6 +89,7 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES);
 	private IListProperty APPLICATION__COMMANDS = EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__COMMANDS);
+	private IListProperty APPLICATION__DIALOGS = EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__DIALOGS);
 	private IListProperty PART_DESCRIPTOR_CONTAINER__DESCRIPTORS = EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS);
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private IListProperty APPLICATION__ADDONS = EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__ADDONS);
@@ -263,7 +264,6 @@ protected boolean accepted(Object o) {
 			protected boolean accepted(Object o) {
 				return true;
 			}
-
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_CATEGORIES, APPLICATION__CATEGORIES, element, Messages.ApplicationEditor_Categories) {
@@ -272,7 +272,6 @@ protected boolean accepted(Object o) {
 			protected boolean accepted(Object o) {
 				return true;
 			}
-
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_APPLICATION_WINDOWS, ELEMENT_CONTAINER__CHILDREN, element, Messages.ApplicationEditor_Windows) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java
new file mode 100644
index 0000000000..44495c0b3a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MDialog;
+import org.eclipse.jface.action.Action;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+
+public class DialogEditor extends WindowEditor {
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if (element instanceof MUIElement) {
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				return createImage(ResourceProvider.IMG_Dialog);
+			} else {
+				return createImage(ResourceProvider.IMG_Tbr_Dialog);
+			}
+		}
+
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.DialogEditor_Label;
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		List<Action> actions = new ArrayList<Action>();
+
+		MDialog dialog = (MDialog) element;
+		if (dialog.getMainMenu() == null) {
+			actions.add(getActionAddMainMenu());
+		}
+
+		return actions;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 7f4ae23b4a..c533efc290 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -419,9 +419,13 @@ public List<Action> getActions(Object element) {
 
 		MWindow window = (MWindow) element;
 		if (window.getMainMenu() == null) {
-			actions.add(addMainMenu);
+			actions.add(getActionAddMainMenu());
 		}
 
 		return actions;
 	}
+
+	protected Action getActionAddMainMenu() {
+		return addMainMenu;
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java
new file mode 100644
index 0000000000..7389d7e153
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MWizardDialog;
+import org.eclipse.jface.action.Action;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+
+public class WizardDialogEditor extends WindowEditor {
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		if (element instanceof MUIElement) {
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				return createImage(ResourceProvider.IMG_WizardDialog);
+			} else {
+				return createImage(ResourceProvider.IMG_Tbr_WizardDialog);
+			}
+		}
+
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.WizardDialogEditor_Label;
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		List<Action> actions = new ArrayList<Action>();
+
+		MWizardDialog dialog = (MWizardDialog) element;
+		if (dialog.getMainMenu() == null) {
+			actions.add(getActionAddMainMenu());
+		}
+
+		return actions;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index aa69f16e71..5ddd02da73 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -65,6 +65,12 @@ public VWindowEditor(EStructuralFeature targetFeature) {
 
 	@PostConstruct
 	void init() {
+		actions.add(new Action(Messages.VWindowEditor_AddDialog, createImageDescriptor(ResourceProvider.IMG_Dialog)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.DIALOG);
+			}
+		});
 		actions.add(new Action(Messages.VWindowEditor_AddTrimmedWindow, createImageDescriptor(ResourceProvider.IMG_Window)) {
 			@Override
 			public void run() {
@@ -77,6 +83,12 @@ public void run() {
 				handleAdd(BasicPackageImpl.Literals.WINDOW);
 			}
 		});
+		actions.add(new Action(Messages.VWindowEditor_AddWizardDialog, createImageDescriptor(ResourceProvider.IMG_WizardDialog)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.WIZARD_DIALOG);
+			}
+		});
 	}
 
 	@Override
@@ -139,7 +151,7 @@ public String getText(Object element) {
 				return eclass.getName();
 			}
 		});
-		childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW });
+		childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.DIALOG, BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW, BasicPackageImpl.Literals.WIZARD_DIALOG });
 		childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.TRIMMED_WINDOW));
 
 		Button b = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);

From f0a1e244dbbf0b5168d35134322a1f4f24e3333c Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Fri, 17 Jan 2014 10:14:24 -0500
Subject: [PATCH 0670/1286] Bug 425978 - [releng] upgrade build to Luna

Upgrade to 0.16.0-SNAPSHOT and to use Luna
Fix the e3x bridge dependency on o.e.e4.ui.services

Change-Id: I7cadd3f6ba2458d95c68f0a1f6e0c509823ac30b
---
 bundles/org.eclipse.e4.tools.compat/pom.xml        | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml  | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml        | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml               | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 5267862bff..d5a7722caa 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.15.0-SNAPSHOT</version>
+    <version>0.16.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index f5c014c35d..878d795953 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.15.0-SNAPSHOT</version>
+    <version>0.16.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index d405ec8cc3..faca210081 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.15.0-SNAPSHOT</version>
+    <version>0.16.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 39d27521f7..d330625c80 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.15.0-SNAPSHOT</version>
+    <version>0.16.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 1f65263f0b..01b2d36383 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.15.0-SNAPSHOT</version>
+    <version>0.16.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index bb76072b31..a292648956 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.15.0-SNAPSHOT</version>
+    <version>0.16.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index e5bf6c515d..370046ee10 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.15.0-SNAPSHOT</version>
+    <version>0.16.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 

From 3c63d02d17c5835167d9151e34ec9dc6dba4cb11 Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Tue, 7 Jan 2014 11:05:02 +0100
Subject: [PATCH 0671/1286] 424986 EP Document
 tools.emf.ui.editors.contributionClassCreator

Change-Id: Iaf1e7e5ece0984b6decbed81cfb0ff1dc465ea64
Signed-off-by: Marco Descher <marco@descher.at>
---
 .../org.eclipse.e4.tools.emf.ui.editors.exsd  | 48 ++++++++++++++++---
 .../ui/common/IContributionClassCreator.java  | 25 +++++++++-
 .../emf/ui/common/IEditorDescriptor.java      | 14 +++++-
 .../tools/emf/ui/common/IEditorFeature.java   | 18 ++++++-
 4 files changed, 96 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd b/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
index 471aa2881a..a5b50e95f4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
+++ b/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
@@ -6,7 +6,14 @@
          <meta.schema plugin="org.eclipse.e4.tools.emf.ui" id="org.eclipse.e4.tools.emf.ui.editors" name="Editors"/>
       </appinfo>
       <documentation>
-         [Enter description of this extension point.]
+         Contribute editor(s), creation assistants and features for application model element(s).
+&lt;br&gt;&lt;br&gt;
+This extension point allows three distinct extensions:
+&lt;ul&gt;
+&lt;li&gt;Definition of (virtual) element editors&lt;/LI&gt;
+&lt;li&gt;Contribution of model element creation assistants&lt;/LI&gt;
+&lt;li&gt;Contribution of features for reference by existing model elements&lt;/LI&gt;
+&lt;/ul&gt;
       </documentation>
    </annotation>
 
@@ -51,11 +58,18 @@
    </element>
 
    <element name="editor">
+      <annotation>
+         <documentation>
+            Contribute an editor for a model element. Used to support editing new model elements not yet covered by the tooling.
+&lt;br&gt;&lt;br&gt;
+Editors contributed using this extension point override default editors.
+         </documentation>
+      </annotation>
       <complexType>
          <attribute name="descriptorClass" type="string" use="required">
             <annotation>
                <documentation>
-                  
+                  Defines the supported model element and returns a class capable of editing it.
                </documentation>
                <appinfo>
                   <meta.attribute kind="java" basedOn=":org.eclipse.e4.tools.emf.ui.common.IEditorDescriptor"/>
@@ -66,18 +80,25 @@
    </element>
 
    <element name="virtualeditor">
+      <annotation>
+         <documentation>
+            Contribute an editor for a virtual model element.
+&lt;br&gt;&lt;br&gt;
+A virtual model element is an element not backed by a real object. This is for example the case for editors defining the logical tree structure. These virtual editors may containireal model element objects. A concrete example is the virtual &lt;i&gt;Command Categories&lt;/i&gt; editor managing &lt;i&gt;MCategory&lt;/i&gt; objects.
+         </documentation>
+      </annotation>
       <complexType>
          <attribute name="id" type="string" use="required">
             <annotation>
                <documentation>
-                  
+                  The element id this virtual editor is used for.
                </documentation>
             </annotation>
          </attribute>
          <attribute name="class" type="string" use="required">
             <annotation>
                <documentation>
-                  
+                  An abstract visual editor class for the virtual model element. Use as basis to realize a virtual element editor.
                </documentation>
                <appinfo>
                   <meta.attribute kind="java" basedOn="org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor:"/>
@@ -88,11 +109,19 @@
    </element>
 
    <element name="editorfeature">
+      <annotation>
+         <documentation>
+            Contribute features castable to &lt;i&gt;class&lt;/i&gt; for reference by the application model.
+&lt;br&gt;&lt;br&gt;
+This is currently used to contribute &lt;i&gt;MExpression#visibleWhen&lt;/i&gt; and
+&lt;i&gt;ModelFragment#imports&lt;/i&gt; elements. So, for example, a custom &lt;i&gt;MExpression&lt;/i&gt; class could be contributed in order to provide a specific &lt;i&gt;visibleWhen&lt;/i&gt; rule.
+         </documentation>
+      </annotation>
       <complexType>
          <attribute name="class" type="string" use="required">
             <annotation>
                <documentation>
-                  
+                  Contributes the list of FeatureClass elements.
                </documentation>
                <appinfo>
                   <meta.attribute kind="java" basedOn=":org.eclipse.e4.tools.emf.ui.common.IEditorFeature"/>
@@ -103,11 +132,18 @@
    </element>
 
    <element name="contributionClassCreator">
+      <annotation>
+         <documentation>
+            Contribute an assistant for a model elements contribution class creation.
+&lt;br&gt;
+This assistant will be called by the element editor when instantiating a new contribution of the respective EClass.
+         </documentation>
+      </annotation>
       <complexType>
          <attribute name="class" type="string" use="required">
             <annotation>
                <documentation>
-                  
+                  Specifies the supported types and implements the creation and subsequent presentation of the newly created object in an editor.
                </documentation>
                <appinfo>
                   <meta.attribute kind="java" basedOn=":org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator"/>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
index bbe72fed83..a10da50d4a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010-2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Marco Descher <marco@descher.at> - Bug 424986 (Documentation)
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
@@ -16,8 +17,30 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
+/**
+ * Contribute a creator for a certain type of {@link EClass}. The types
+ * supported by this creator are determined by querying
+ * {@link #isSupported(EClass)}.
+ */
 public interface IContributionClassCreator {
+	/**
+	 * Called to determine if the EClass is supported by the contribution
+	 *
+	 * @param element
+	 * @return <code>true</code> if supported
+	 */
 	public boolean isSupported(EClass element);
 
+	/**
+	 * Create and open editor for the model element. Called on the supported
+	 * creation of a new model element.
+	 *
+	 * @param contribution
+	 *            the {@link MContribution} element to be created and
+	 *            subsequently opened in the editor
+	 * @param domain
+	 * @param project
+	 * @param shell
+	 */
 	public void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell);
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java
index 2d5fd342fb..e56685d6a8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010-2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,13 +7,25 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Marco Descher <marco@descher.at> - Bug 424986 (Documentation)
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
 import org.eclipse.emf.ecore.EClass;
 
+/**
+ * Contribute an editor for an application model element
+ */
 public interface IEditorDescriptor {
+	/**
+	 * @return supported model element
+	 */
 	public EClass getEClass();
 
+	/**
+	 * @return a class extending
+	 *         {@link org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor}
+	 *         capable of editing class returned in {@link #getEClass()}
+	 */
 	public Class<?> getEditorClass();
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
index 530f7b017b..fdcf4cb001 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010-2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Marco Descher <marco@descher.at> - Bug 424986 (Documentation)
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
@@ -14,6 +15,9 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 
+/**
+ * Contribute features for reference in the application model.
+ */
 public interface IEditorFeature {
 	public class FeatureClass {
 		public final String label;
@@ -25,5 +29,17 @@ public FeatureClass(String label, EClass eClass) {
 		}
 	}
 
+	/**
+	 * Return a list of {@link FeatureClass} elements, where
+	 * {@link FeatureClass#eClass} must be castable to <b>eClass</b> and will be
+	 * stored in <b>feature</b>.
+	 * 
+	 * @param eClass
+	 *            your contribution must be castable to
+	 * @param feature
+	 *            your contributions storage
+	 *            {@link org.eclipse.emf.ecore.EReference} target
+	 * @return the list of selectable alternatives for storage in <b>feature</b>
+	 */
 	public List<FeatureClass> getFeatureClasses(EClass eClass, EStructuralFeature feature);
 }

From cb5b7f7256fc522206e83709a19795bcb768792d Mon Sep 17 00:00:00 2001
From: tobbaumann <tobbaumann@gmail.com>
Date: Fri, 17 Jan 2014 22:16:01 +0100
Subject: [PATCH 0672/1286] Bug 405728: Add tooltips to model editor
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=405728

Add tooltip to IconURI selection in part editor.

Change-Id: I068fad75e48ab3ff959ef88b289ef9eda9aaf409
Signed-off-by: tobbaumann <tobbaumann@gmail.com>
---
 .../src/org/eclipse/e4/tools/emf/ui/internal/Messages.java       | 1 +
 .../src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties | 1 +
 .../e4/tools/emf/ui/internal/common/component/PartEditor.java    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 7643488cfe..c15752e3b6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -189,6 +189,7 @@ public class Messages {
 	public String PartEditor_LabelLabel;
 	public String PartEditor_Tooltip;
 	public String PartEditor_IconURI;
+	public String PartEditor_IconURI_Tooltip;
 	public String PartEditor_ClassURI;
 	public String PartEditor_Closeable;
 	public String PartEditor_Closeable_Tooltip;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 7e0e85a448..5f5e9a8eaa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -193,6 +193,7 @@ PartEditor_Description=Part Bla Bla Bla Bla
 PartEditor_LabelLabel=Label
 PartEditor_Tooltip=Tooltip
 PartEditor_IconURI=Icon URI
+PartEditor_IconURI_Tooltip=Choose the icon of your part here
 PartEditor_ClassURI=Class URI
 PartEditor_Closeable=Closeable
 PartEditor_Closeable_Tooltip=If checked, the part can be closed by the user
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index e215abfce2..36efe145dc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -187,6 +187,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_IconURI);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setToolTipText(Messages.PartEditor_IconURI_Tooltip);
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);

From 15e4ad1a21bff4d63e40899784d4390b71aa6544 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Sat, 18 Jan 2014 00:28:42 +0100
Subject: [PATCH 0673/1286] Bug 426038 - Get rid of MInputPart

Support for this model element has been removed from the model.
Cleanup of NLS in RegistryUtil
Addition of Wizard image in ImportWizard
---
 .../OSGI-INF/resources.properties             |   1 +
 .../icons/full/wizban/imp3x_wiz.png           | Bin 0 -> 4601 bytes
 .../tools/emf/ui/internal/Messages.properties |   4 +-
 .../emf/ui/internal/ResourceProvider.java     |   1 +
 .../component/PartSashContainerEditor.java    |  17 +--
 .../common/component/PartStackEditor.java     |  11 +-
 .../component/PerspectiveStackEditor.java     |   5 +-
 .../virtual/VApplicationCategoriesEditor.java |   5 +-
 .../component/virtual/VCommandEditor.java     |   5 +-
 .../component/virtual/VHandlerEditor.java     |   5 +-
 .../component/virtual/VPartDescriptor.java    |   5 +-
 .../component/virtual/VSnippetsEditor.java    |  58 +++++---
 .../virtual/VWindowControlEditor.java         |  14 +-
 .../virtual/VWindowSharedElementsEditor.java  |  16 +--
 .../ui/internal/imp/ModelImportWizard.java    |  10 +-
 .../emf/ui/internal/imp/RegistryUtil.java     | 125 ++++++++++--------
 16 files changed, 146 insertions(+), 136 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/imp3x_wiz.png

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
index f4b0761075..c8488e2b5f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
@@ -104,6 +104,7 @@ IMG_org.eclipse.e4.tools.emf.ui.wizban.newclass_wiz=/icons/full/wizban/newclass_
 IMG_org.eclipse.e4.tools.emf.ui.wizban.newexp_wiz=/icons/full/wizban/newexp_wiz.png
 IMG_org.eclipse.e4.tools.emf.ui.wizban.typerefact_wiz=/icons/full/wizban/typerefact_wiz.png
 IMG_org.eclipse.e4.tools.emf.ui.wizban.extstr_wiz=/icons/full/wizban/extstr_wiz.png
+IMG_org.eclipse.e4.tools.emf.ui.wizban.imp3x_wiz=/icons/full/wizban/imp3x_wiz.png
 
 IMG_org.eclipse.e4.tools.emf.ui.widgets.ctabfolder_obj = /icons/full/widgets/ctabfolder_obj.gif
 IMG_org.eclipse.e4.tools.emf.ui.widgets.tabfolder_obj = /icons/full/widgets/tabfolder_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/imp3x_wiz.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/imp3x_wiz.png
new file mode 100644
index 0000000000000000000000000000000000000000..660e384bcadd6e52bd2c5d15e5948e1ec74cc5c9
GIT binary patch
literal 4601
zcmXw-XEfZ++kk)S>YWH4Wwo`UMaZ&<vU*!#^_tbY)%z;ZqC^kTBYGz!>WUCVd7}5|
zM2JKU68`eM=lyWs_c_;n&73)NX6D1hBXv|M$ymq$0H9P?Lp;8%nzx}yLVTM!6a>My
zh165c#2Wy}>Hh{EkekPR3qd~W+RC66JlZ?>5?VvcYyTl-V;==yA4d-iP+2#kc8e%{
zZV|%H8;x=D^l|cV2k1$;xNkYxU#{fg8HjOmaP$Fcs7Iu4Db;@zV`uYM<@9lKvjZf~
zsY!1;q<=g59`-)|HW)j=!t>^@PX6EIPTpu&n_CqFwBcG(ZZXMUY-EFRcXD?CaID+0
zw+!@u<9#t`JK*#t>f8ToN*-=*cJ4mF*+^E;EhGM`894d4+5r{cC-?z?=7Tyy!5|=S
z%iJZ=w%_-9tg^k$YH|74xEX$Bi7#nNxA+1}Du$Og7+0QdocbEZqu^Hx38#z7<lG8(
z{lv$)wPvitHlHj+D-iR8g71Z0QvQ!70uw}HV{DFvpP!%o&ga8mk7=n3uVDKQhah{0
zprDB7hr0eo(_I$l9aj05drNzKol!+q1n}8A-(_tKQc=@Q&;$VEXYCLUS|vX(AOSWF
z^d3(~LNWQLH-|&*J62_hP_mLi{J}~`1qPe?)}82ksY9tEk4kQ4knOJep!+?dn7;2;
z9Z8OB<|ozk;h{G}c_c@K(PYdOOvSk-hcCQe)s*kX#5~bQR31(Jd)guACmery6g7D-
zA+d^yR1|@Q9wC>Bv15L}rMSLvm>xA!hWPudl6A-(3v9=Gf93#w4fmBNaBh;Wp2=7j
znSwc&9CblDS%Xu(JwcFeS8;Pa=CEtsu*@Eb-EIJ9#37rR?jtEqD33?;T)#*SaI?Q=
zgPDw=H-NK~s;l8w^yetHKbHvvmdw|K$>Wsm99CCjS``U&wD=PlJOC#r%2;(?r8jE#
z1zSP;*`e}T{p|L)6zwoSM!kQXZ5HbmL3hi$FAkfxSyRR-=tapmcPqeP3VN<DhwrWo
zv)JVP4rCd-tVmyXum-GBZKu@DpADgVy#2Kg%}sP{wmoisILl3Va2T$e>5eb~uH4uT
z1EmHnNHxyAztugV#!u$5fO{d-AC--U-3_uEML&LgQ)Wal3A=9Y3EAgy?{VLOf*(Gs
zm+gjWFvJ24?+4BJ5-Z$=<xbzny!RY8jym%RpRBVobzxep_);SJ`?n$K)qsBaKq7Yq
zKA22To{<R`SC!_I@eG1!e{^+L4drxcXy-Gr3U@tf78eV$#10)^e6V+@*Fn|QO*<F2
zoR`&73}xC1Sd%i-68WaK5H%T6_VF@~epucz>$<w#RB-y?LG1&mq-nW3;8{AWy=UNA
zAC&&(nAG}gXseml1e{obm3*{Qn<Q*k%Oc4au$s&|FhjBQr|6&kp2n&YbmgS?9IH1>
zr0!pJpYr$F8AMN&;VSV!NrHkv^`bOe@wvp)mFC~`{B298tEFK-BR2TQ>?tJ^s}Ig=
z_gJfkhdLW=x#R*Z0<NkgSFD;58BpC!k0ozwI|wI^rHpoA|Hvk4mn9}-bcG);!)PTG
zeAg`G*ROB>varCJfa%(Vq>m+IcQXTB%?o7w9CV3tS0lzxkinL70qIa@EO$M*thRtv
z$9duRw}Bj?mjkQ6GyUftCWjx_f%s4BRLid4G@ILEHZ`fWWfo;aDvayd!uJaJH`}tG
zCBG$LH`u>csoiegk)1&Kypc=e4|U(jR#e*2(9<-Y?G;Z+y7?(|b-v_vEC)5|>ZzXK
zZ}XvT#gO<*CY3#+YC%8ImaC6`Y(zjWH(x0y6|%n&%>F(=_tRRsS^J>Xo(pbA=3(2~
z))<F*&&|XCmKVgj+-}fXaMvPULUuMmee>_3J^Nl2=AVNcAbo5gP3?6`Z^dRzu}pZG
zReO7R!eu(qU-%!5=n7@l+F1s_f)|{Ey#?gXPC^9Lx(~lzoWpmr9oo8f=0At-tRck?
zMII!UK+-<^TvAL5KO2q?-kPf{l@`@s5SbBg?h>Xm);=1}>@}_0KMB*cb^GMKJwg8U
zlKWBauiDsf&-KW68l8DycA?nozU=QXzdxBEj<8GKcm5dZx`L<o9zR8)$gyKi@*(10
zUnY+a$BilLVThiKt*hj)z1M|?Dvv@g6wH0B38OQx9J*{Dl~j{A&OKycVY{o{J-^1h
zM|ZM^=$_M4BBrXqjv|@uzXDZd8{Rq=zT0hdu<SVPu{2}rI&KYx!6YemNjgbh=xqF6
z=FQ7pOycN#(0qLK?EHYKUvtcbvn1k<@n-`Q7g;@4HMwsGk)NAxR_VvJ4}b4U9QI!4
z$F5osMokXR^A%Bj)ZG>nw<4g0>9lNiWf`QpRPWXVe1v>^Z!v1teKWC?`KIhhwGI~d
z)R{hO7(yY2|59N+!h9|=4!^ADFyPZ*&~+eXT7x8=ne?mgmpPXM3I2QYo`bJ4Xm}4;
zHhST0szzVJe@*M&Tzrx3xC02kbL20Itel6QxsEGN_XSh;i6IzA{=|N5i>~1<so_l?
zUtt5RVdBvrd@a6qi>+Mz3fEbZ6q{TMzN*bek0;;nK7UWBGd4{NrxqcvP%Zl>R;K3S
zYgWc-*~c2463L)Mu^cy>Rm0`E10~o=UtwO*`Nu~X5{|c`v4z^*$x5KMjgu$z@$?T$
z&@U`TtQ*<Ubz~!kDs2yL{C(w1yIEJ4Oq1FYU^=cs&J=o=24ui<0BbgX-$a<MkTTs^
zGps)p#RZq>2vE=S+&)r5JN7qw>huy$<&qi@i9Z89r$iG<Y7e!n)3gw^W)0C*CjHr+
zHsbh|a#H|D4l~Ze%fcI6O^2NDJ(Nve?hjR}ybZ63#zFWTzz@*YAJy1Z`L`Q{9Bh~Y
zl9h5lPCsd8JKCI)jqx$|x99P9ROL=qsEZikEl<AO<a{AS#DCQ836aaKB|JtcbiEFk
zMN-8dJN6UuVXZm&cm>sMwW;6G-b;U-n<Kp4>=E+gUn1^1-~UmO%nn^-{avUv5*feR
zX<fI6bb`g<#~X2CMDysjwQ|=rIu%=ShOteMg?FL5<w=k$a(op*OGdR7KebMIKr7$f
z+D~jiQ6ka^7mOD{%g-KtV)6n%jxOSOq7Af*G(6bR9eGd(7n?-Lnz9Y{=ebO=h;_Qg
zVjGap^gQ?ud<!B?J}1iL&Du5PrfLrDO%nQe?)M3b2wNAktM;)sO_STy9A0Y`73)HX
z0sAJ`hv7Xby1|`CmrlRe`#YY)6d2%I;|~|9c^Jr)*C#afP&{LOS9lakMJGqRcMkr{
z-KLc$Uz%d`b%_qYC~*&X8BKEjw)uNIl*Gimfng8G+LFDnd#|tu?j<4K7pTA>m6uzu
zgjfx2cNhp(P9q6{ONoGYXETM<`$x2alr!HfDlHw2I=-ah%q`y{Z_4IGVqn8UPQ&&k
zrB+1dF%`R~+tt?Coao_%KNTS3*<bw6Ymv~a@H(B4_C%+C_E89mI#r&?tv?VZ!udWc
zLjnm3KdFf6iZdmb<5B|md74rPnF+oW|1izR0dMJnU40PW7-Wuu_%Vm0@wT2YtqA7b
z`4F!vj;WBKpL$99+tle_N^5Id*?N}E*4dbc3vx%og$>E~Lr4JExAK18Ig9ak0}t8-
zsbv1_KcoNtE?XBzzV<<ja$XDAA+ls>q;GkW;w-CDn~KxCSqtE_t%Q2O^@Lu|%+CfF
z^KK}|5Hu;5WUw_c&{XVDt(`U?kKcsYT(uqk?$Z3;u@`z6)Meg~RH#)ja8@kSdHePt
z7`)c?T%<>gxChN-DZT`}x}Qf0gPFl4gl7%@;q|;D7Nhm$TlG+-?ViKr(|XI0>yDcf
z?{J^5^lwxWHzrYtMqP1=1OB=d^1Y-0&EW-1!uGU@fRs~Bbpju)*Qe~elFj#dm12&;
zW*tuPM*f)IQKOgJ)72{v7lO85qfPjF&(;)!b)#@nDLiL`bJs?^W_z2PrJIUQ3^Ohp
z^sSPqdc^e$X!j)XEaL2~7kLBE9)>&Kkk{ImmhZe|E|f{inI|hTB!34$n3zj&o&u8^
zY;Pokue*nWEG5+52RU^~7HAdJBqo#>3=G`g$zGq~6!jX;=g|+^Ox9()TvL<U;0BGL
z&?6}Dlo@F!@M<gZW|=kY`|glbXlV1!VfCx3VSe42R#kf<(xj<}w6sz`?VPIxzA^`k
z0X$B~HXb_=&i9^D7f5oi*>F0Th;}#9!tbV6>>`uj3Kll6D8ynPsV9HlT`d}Z(GL#`
zS#Js42C2T{m|>Cox{%<LRSpkLm1r#LW0^IApAbJcZq@ny{1B-x(iDjtMv@V0&rI}#
zvRnnmpQeI`wQPyx^BnIRr4COy8L8*(RfU>4aJfw4h1shlu(-6w-c?2LflieVXU7jb
zR~0LyzU{wbM8vm$4eSZP=rB!cyDh(*z3eS}GNU(*WLylIzL;aO2_a>TQ-~0g9slX~
zF(&hMm5jwCiYh-&jb40nHE02pjh$-ckmQlif>jT5dAG+&t|(9fv)3b7X`HzAB=G?~
zo-N5(8{7@RV8yBMurM)vS6Q<r_I87!s*|HnA|L<>&D7#e7Xy&4Z}8DaJCzc5X*mGw
zxovUUX^{;C1f`Rg5lsDgAWWaCr+!o=3UvmsInVOv2~b1vyGPGY0LXG&;}jM#iSB5k
zc8haP>&8$#Ki3cvnZjs{&gpUgbW|pN1CD*m$eqmAd0r)Wp5YF`rKF@#OGM#p!7g}(
zKWB)*lGYl`jiVLQqCj?LrJCaY8fFiMWYS!1f>Lmr98S|kFb+c*DzYiOG}5YAcqJ&H
z0Vx#CEb5<fIGGCY?Rd4rS5$bK5IQO-rRU6$W*Rjv3f}6V?Q%Zi5{-SlBZMQ=o6;6a
zW{E6m2N`u@MoEPb1%ji@nL*F0PDw_C$o19@BpFtfF*#a<6$3l8w0A#>(!lOZMT#iR
zC48ncSj$g@^kN?n>KP)Mpr+Us-YRSY$75{=MMeP3WspE9&&Wl<)0h?g_)RG}9qC$#
zjk+lrPU%?-17Akb9{$l>>jMVq*l1ywrauLhDm;u&>Y!ekaXXZ6onOQVdGn$xvZw<a
zGmx*@_3Rpx_d>di@STWEK4GX@6dLVw<^e3N*AoG<M4@Lba5~Q@nap^IAPtQk;p0~|
z#EM_@?W^>wNQfbTi=u|F-e%lTuO{HKw;ux0BL2ZilR;_F>pa2b)M=oQhO%LL+@~QI
zDq2<?88l#uFU1Q3>*IMV#|v`SLG>(fzIs*hm}NnhF@14AM+x+USA^>I$F<<<`Mi7%
zcJ|g|Niz|(K1l-f;1z|_iy>of!t^;DXnjcZD+J##;2yJYF~meHjLK5!jV&i9R-8s2
zRYONxDFIGv)Z!&lt7Un`**MTZCmv16@Vr7V(<k7*$oRzOAB<(Xnn|>fL5IDU9i|kj
zxL*`UxI|YZu$pC56`)%?r(c_c<n^0!F72zIPMCfz=E7}Ii`GC%nALytOwY9iH>KvL
zk!=CEs}BJft>i=xv!|s86sQoKqRL=%TpNJ1#n?i27U|6{p-!UbbU}`4_=eK-gV~eA
z2M@b9BFCmG{dKyaodmql&93*Vq^6dG{8VyhxiFBrjBOVO<%ydHD$_+msC?!=h%${1
zZrs2}3edeYHpbyc@`Mt9>7M<N2y-gT#nX@{86^Q8Z>(A@_zk^*?|J@^hJkuYnNiCP
zn6a3GG9NEmJFsWE{Jo(#??2@j*yfVGc#(%u4OkOFHshSNfDk*?Wx!)FmUdv(UUBsS
zX`uA$(X6y;t!fN_sMmM%o4vJB#2pjHX)b%_RND`3sTKaYRamMf1dqeZ!MJ`By|-IF
z-prlN21Gzj6%yqRC_NEVRQKp>yBqBhQAPX<r0Noh$N5v*^&b_=sWe&$IWuu7F_fZ@
zf{!@EI$E9>5F{k4h+rY;BPNW2Mk%F7(9zPj{L!T+!)7RqAVnvn@da>s8lrzR`H2Ma
z5Y{v}HGgf0{FI#GT{3(Dg^SU2k>Jnwuwt%aD!yRRsq=9D&ir10Y69>V0%>u59(Xu=
dZT0>J|7y-7YUHJ*)$I=lpsuWgs8h6#{2yr7VoU%4

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 7e0e85a448..c328f210d5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -404,7 +404,7 @@ WindowEditor_MainMenu=Main Menu
 WindowEditor_SelectedElement=Selected Element
 WindowEditor_BindingContexts=Binding Contexts
 WindowEditor_Handlers=Handlers
-WindowEditor_Windows=Windows
+WindowEditor_Windows=Windows and Dialogs
 WindowEditor_Controls=Controls
 WindowEditor_SharedElements=Shared Elements
 
@@ -475,7 +475,7 @@ VWindowControlEditor_AddPart=Part
 VWindowControlEditor_AddInputPart=Input Part
 VWindowControlEditor_AddArea=Area
 
-VWindowEditor_TreeLabel=Windows
+VWindowEditor_TreeLabel=Windows and Dialogs
 VWindowEditor_TreeLabelDescription=Windows Bla Bla Bla Bla Bla
 VWindowEditor_Windows=Windows
 VWindowEditor_AddTrimmedWindow=Trimmed Window
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
index 353ab2f35e..48ecfb7bfa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
@@ -119,6 +119,7 @@ public class ResourceProvider extends BasicResourceProvider {
 	public static final String IMG_Wizban16_newexp_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.newexp_wiz"; //$NON-NLS-1$
 	public static final String IMG_Wizban16_typerefact_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.typerefact_wiz"; //$NON-NLS-1$
 	public static final String IMG_Wizban16_extstr_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.extstr_wiz"; //$NON-NLS-1$
+	public static final String IMG_Wizban16_imp3x_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.imp3x_wiz"; //$NON-NLS-1$
 
 	public static final String IMG_Widgets_ctabfolder_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.ctabfolder_obj"; //$NON-NLS-1$
 	public static final String IMG_Widgets_tabfolder_obj = "IMG_org.eclipse.e4.tools.emf.ui.widgets.tabfolder_obj"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 083b982ec1..71f27ab6e0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.jface.window.Window;
-
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -33,7 +31,6 @@
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.basic.MInputPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
@@ -62,6 +59,7 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -464,7 +462,7 @@ private void addToModel(EObject eObject) {
 	protected void handleImportChild(EClass eClass, String hint) {
 
 		if (eClass == BasicPackageImpl.Literals.PART) {
-			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, hint);
+			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, hint, resourcePool);
 			WizardDialog wizardDialog = new WizardDialog(shell, wizard);
 			if (wizardDialog.open() == Window.OK) {
 				MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
@@ -473,17 +471,6 @@ protected void handleImportChild(EClass eClass, String hint) {
 				}
 			}
 		}
-
-		if (eClass == BasicPackageImpl.Literals.INPUT_PART) {
-			ModelImportWizard wizard = new ModelImportWizard(MInputPart.class, this);
-			WizardDialog wizardDialog = new WizardDialog(shell, wizard);
-			if (wizardDialog.open() == Window.OK) {
-				MInputPart[] parts = (MInputPart[]) wizard.getElements(MInputPart.class);
-				for (MInputPart part : parts) {
-					addToModel((EObject) part);
-				}
-			}
-		}
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index c8daab874a..e36cddf64a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.jface.window.Window;
-
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -58,6 +56,7 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -404,7 +403,7 @@ private void addToModel(EObject eObject) {
 	protected void handleImportChild(EClass eClass) {
 
 		if (eClass == BasicPackageImpl.Literals.PART) {
-			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this);
+			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, resourcePool);
 			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
 			if (wizardDialog.open() == Window.OK) {
 				MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
@@ -415,11 +414,11 @@ protected void handleImportChild(EClass eClass) {
 		}
 
 		if (eClass == BasicPackageImpl.Literals.INPUT_PART) {
-			ModelImportWizard wizard = new ModelImportWizard(MInputPart.class, this);
+			ModelImportWizard wizard = new ModelImportWizard(MInputPart.class, this, resourcePool);
 			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
 			if (wizardDialog.open() == Window.OK) {
-				MInputPart[] parts = (MInputPart[]) wizard.getElements(MInputPart.class);
-				for (MInputPart part : parts) {
+				MPart[] parts = (MPart[]) wizard.getElements(MInputPart.class);
+				for (MPart part : parts) {
 					addToModel((EObject) part);
 				}
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 42b75f33ad..ea19e6b057 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.jface.window.Window;
-
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -51,6 +49,7 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -344,7 +343,7 @@ protected void handleAddPerspective() {
 	}
 
 	protected void handleImportPerspective() {
-		ModelImportWizard wizard = new ModelImportWizard(MPerspective.class, this);
+		ModelImportWizard wizard = new ModelImportWizard(MPerspective.class, this, resourcePool);
 		WizardDialog wizardDialog = new WizardDialog(shell, wizard);
 		if (wizardDialog.open() == Window.OK) {
 			MPerspective[] elements = (MPerspective[]) wizard.getElements(MPerspective.class);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index ed1c3d3814..f7d1cc2183 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import org.eclipse.jface.window.Window;
-
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -37,6 +35,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -80,7 +79,7 @@ public void run() {
 	}
 
 	protected void handleImport() {
-		ModelImportWizard wizard = new ModelImportWizard(MCategory.class, this);
+		ModelImportWizard wizard = new ModelImportWizard(MCategory.class, this, resourcePool);
 		WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
 		if (wizardDialog.open() == Window.OK) {
 			MCategory[] elements = (MCategory[]) wizard.getElements(MCategory.class);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 950cd5d7b9..7153fe2c7e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import org.eclipse.jface.window.Window;
-
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -38,6 +36,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -245,7 +244,7 @@ private void addCommand(MCommand command) {
 	}
 
 	protected void handleImport() {
-		ModelImportWizard wizard = new ModelImportWizard(MCommand.class, this);
+		ModelImportWizard wizard = new ModelImportWizard(MCommand.class, this, resourcePool);
 		WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
 		if (wizardDialog.open() == Window.OK) {
 			MCommand[] elements = (MCommand[]) wizard.getElements(MCommand.class);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 3db167936b..5f0a49f233 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import org.eclipse.jface.window.Window;
-
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -37,6 +35,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -246,7 +245,7 @@ private void addToModel(MHandler handler) {
 	}
 
 	protected void handleImport() {
-		ModelImportWizard wizard = new ModelImportWizard(MHandler.class, this);
+		ModelImportWizard wizard = new ModelImportWizard(MHandler.class, this, resourcePool);
 		WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
 		if (wizardDialog.open() == Window.OK) {
 			MHandler[] elements = (MHandler[]) wizard.getElements(MHandler.class);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index 2242cd727d..484f14eca3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import org.eclipse.jface.window.Window;
-
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -39,6 +37,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -265,7 +264,7 @@ private void addToModel(MPartDescriptor partDescription) {
 	protected void handleImport(EClass eClass, String hint) {
 
 		if (eClass == BasicPackageImpl.Literals.PART_DESCRIPTOR) {
-			ModelImportWizard wizard = new ModelImportWizard(MPartDescriptor.class, this, hint);
+			ModelImportWizard wizard = new ModelImportWizard(MPartDescriptor.class, this, hint, resourcePool);
 			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
 			if (wizardDialog.open() == Window.OK) {
 				MPartDescriptor[] parts = (MPartDescriptor[]) wizard.getElements(MPartDescriptor.class);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index df4eac39ef..1709b863f6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -1,6 +1,8 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -57,28 +59,25 @@ public VSnippetsEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.VWindowEditor_AddTrimmedWindow, createImageDescriptor(ResourceProvider.IMG_Window)) {
-			@Override
-			public void run() {
-				handleAdd(BasicPackageImpl.Literals.TRIMMED_WINDOW);
-			}
-		});
-		actions.add(new Action(Messages.VWindowEditor_AddWindow, createImageDescriptor(ResourceProvider.IMG_Window)) {
+
+		actions.add(new Action(Messages.VWindowControlEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area_vertical)) {
 			@Override
 			public void run() {
-				handleAdd(BasicPackageImpl.Literals.WINDOW);
+				handleAdd(AdvancedPackageImpl.Literals.AREA);
 			}
 		});
-		actions.add(new Action(Messages.VWindowControlEditor_AddPerspectiveStack, createImageDescriptor(ResourceProvider.IMG_PerspectiveStack)) {
+
+		actions.add(new Action(Messages.VWindowEditor_AddDialog, createImageDescriptor(ResourceProvider.IMG_Dialog)) {
 			@Override
 			public void run() {
-				handleAdd(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK);
+				handleAdd(BasicPackageImpl.Literals.DIALOG);
 			}
 		});
-		actions.add(new Action(Messages.PerspectiveStackEditor_AddPerspective, createImageDescriptor(ResourceProvider.IMG_Perspective)) {
+
+		actions.add(new Action(Messages.VWindowControlEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
-				handleAdd(AdvancedPackageImpl.Literals.PERSPECTIVE);
+				handleAdd(BasicPackageImpl.Literals.PART);
 			}
 		});
 
@@ -96,24 +95,36 @@ public void run() {
 			}
 		});
 
-		actions.add(new Action(Messages.VWindowControlEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+		actions.add(new Action(Messages.VWindowControlEditor_AddPerspectiveStack, createImageDescriptor(ResourceProvider.IMG_PerspectiveStack)) {
 			@Override
 			public void run() {
-				handleAdd(BasicPackageImpl.Literals.PART);
+				handleAdd(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK);
+			}
+		});
+		actions.add(new Action(Messages.PerspectiveStackEditor_AddPerspective, createImageDescriptor(ResourceProvider.IMG_Perspective)) {
+			@Override
+			public void run() {
+				handleAdd(AdvancedPackageImpl.Literals.PERSPECTIVE);
 			}
 		});
 
-		actions.add(new Action(Messages.VWindowControlEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+		actions.add(new Action(Messages.VTrimContributionsEditor_AddTrimContribution, createImageDescriptor(ResourceProvider.IMG_TrimContribution)) {
 			@Override
 			public void run() {
-				handleAdd(BasicPackageImpl.Literals.INPUT_PART);
+				handleAdd(BasicPackageImpl.Literals.TRIM_ELEMENT);
 			}
 		});
 
-		actions.add(new Action(Messages.VWindowControlEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area_vertical)) {
+		actions.add(new Action(Messages.VWindowEditor_AddTrimmedWindow, createImageDescriptor(ResourceProvider.IMG_Window)) {
 			@Override
 			public void run() {
-				handleAdd(AdvancedPackageImpl.Literals.AREA);
+				handleAdd(BasicPackageImpl.Literals.TRIMMED_WINDOW);
+			}
+		});
+		actions.add(new Action(Messages.VWindowEditor_AddWindow, createImageDescriptor(ResourceProvider.IMG_Window)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.WINDOW);
 			}
 		});
 		actions.add(new Action(Messages.VWindowTrimEditor_AddWindowTrim, createImageDescriptor(ResourceProvider.IMG_WindowTrim)) {
@@ -122,10 +133,17 @@ public void run() {
 				handleAdd(BasicPackageImpl.Literals.TRIM_BAR);
 			}
 		});
-		actions.add(new Action(Messages.VTrimContributionsEditor_AddTrimContribution, createImageDescriptor(ResourceProvider.IMG_TrimContribution)) {
+		actions.add(new Action(Messages.VWindowEditor_AddWizardDialog, createImageDescriptor(ResourceProvider.IMG_WizardDialog)) {
 			@Override
 			public void run() {
-				handleAdd(BasicPackageImpl.Literals.TRIM_ELEMENT);
+				handleAdd(BasicPackageImpl.Literals.WIZARD_DIALOG);
+			}
+		});
+
+		Collections.sort(actions, new Comparator<Action>() {
+			@Override
+			public int compare(Action o1, Action o2) {
+				return o1.getText().compareTo(o2.getText());
 			}
 		});
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index de2ff8d419..2e56bda402 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -11,6 +11,8 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -66,6 +68,7 @@ public VWindowControlEditor() {
 
 	@PostConstruct
 	void init() {
+
 		actions.add(new Action(Messages.VWindowControlEditor_AddPerspectiveStack, createImageDescriptor(ResourceProvider.IMG_PerspectiveStack)) {
 			@Override
 			public void run() {
@@ -93,18 +96,17 @@ public void run() {
 				handleAdd(BasicPackageImpl.Literals.PART);
 			}
 		});
-
-		actions.add(new Action(Messages.VWindowControlEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+		actions.add(new Action(Messages.VWindowControlEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area_vertical)) {
 			@Override
 			public void run() {
-				handleAdd(BasicPackageImpl.Literals.INPUT_PART);
+				handleAdd(AdvancedPackageImpl.Literals.AREA);
 			}
 		});
 
-		actions.add(new Action(Messages.VWindowControlEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area_vertical)) {
+		Collections.sort(actions, new Comparator<Action>() {
 			@Override
-			public void run() {
-				handleAdd(AdvancedPackageImpl.Literals.AREA);
+			public int compare(Action o1, Action o2) {
+				return o1.getText().compareTo(o2.getText());
 			}
 		});
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 1c60515c4f..aae768d21a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -11,8 +11,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import org.eclipse.jface.window.Window;
-
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -28,7 +26,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.tools.emf.ui.internal.imp.RegistryUtil;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.basic.MInputPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -48,6 +45,7 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -294,7 +292,7 @@ private void addToModel(EObject eObject) {
 
 	protected void handleImport(EClass eClass, String hint) {
 		if (eClass == BasicPackageImpl.Literals.PART) {
-			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, hint);
+			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, hint, resourcePool);
 			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
 			if (wizardDialog.open() == Window.OK) {
 				MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
@@ -303,16 +301,6 @@ protected void handleImport(EClass eClass, String hint) {
 				}
 			}
 		}
-		if (eClass == BasicPackageImpl.Literals.INPUT_PART) {
-			ModelImportWizard wizard = new ModelImportWizard(MInputPart.class, this, hint);
-			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
-			if (wizardDialog.open() == Window.OK) {
-				MInputPart[] parts = (MInputPart[]) wizard.getElements(MInputPart.class);
-				for (MInputPart part : parts) {
-					addToModel((EObject) part);
-				}
-			}
-		}
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
index b53e6ec33a..134ab8c13f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
@@ -14,8 +14,11 @@
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.wizard.Wizard;
 
 public class ModelImportWizard extends Wizard {
@@ -30,16 +33,17 @@ public class ModelImportWizard extends Wizard {
 
 	private final String hint;
 
-	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, AbstractComponentEditor editor) {
-		this(applicationElement, editor, "");
+	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, AbstractComponentEditor editor, IResourcePool resourcePool) {
+		this(applicationElement, editor, "", resourcePool);
 	}
 
-	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, AbstractComponentEditor editor, String hint) {
+	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, AbstractComponentEditor editor, String hint, IResourcePool resourcePool) {
 		this.applicationElement = applicationElement;
 		this.editor = editor;
 		this.hint = hint;
 		this.application = (MApplication) editor.getEditor().getModelProvider().getRoot().get(0);
 		setWindowTitle("Model " + applicationElement.getSimpleName() + " Import Wizard");
+		setDefaultPageImageDescriptor(ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Wizban16_imp3x_wiz)));
 		Assert.isNotNull(RegistryUtil.getStruct(applicationElement, getHint()), "Unknown Element: " + applicationElement.getClass().getName());
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
index 1d74bce1bc..b49b6a7a86 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
@@ -44,9 +44,25 @@
 
 public class RegistryUtil {
 
-	public final static String HINT_VIEW = "view";
-	public final static String HINT_EDITOR = "editor";
-	public final static String HINT_COMPAT_VIEW = "compatibilityView";
+	private static final String PLATFORM = "platform:"; //$NON-NLS-1$
+	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
+	private static final String COMMAND_ID = "commandId"; //$NON-NLS-1$
+	private static final String CATEGORY_ID = "categoryId"; //$NON-NLS-1$
+	private static final String COMPATIBILITY_VIEW = "bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView"; //$NON-NLS-1$
+	private static final String VIEW_MENU = "ViewMenu"; //$NON-NLS-1$
+	private static final String LAUNCHER = "launcher"; //$NON-NLS-1$
+	private static final String EDITOR = "editor"; //$NON-NLS-1$
+	private static final String VIEW = "View"; //$NON-NLS-1$
+	private static final String CATEGORY_TAG = "categoryTag:"; //$NON-NLS-1$
+	private static final String CATEGORY = "category"; //$NON-NLS-1$
+	private static final String CLASS = "class"; //$NON-NLS-1$
+	private static final String DESCRIPTION = "description"; //$NON-NLS-1$
+	private static final String ICON = "icon"; //$NON-NLS-1$
+	private static final String NAME = "name"; //$NON-NLS-1$
+	private static final String ID = "id"; //$NON-NLS-1$
+	public final static String HINT_VIEW = "view"; //$NON-NLS-1$
+	public final static String HINT_EDITOR = EDITOR;
+	public final static String HINT_COMPAT_VIEW = "compatibilityView"; //$NON-NLS-1$
 
 	/**
 	 * 
@@ -94,10 +110,10 @@ private static MCommand[] getCommands(IConfigurationElement[] elements, MApplica
 		for (IConfigurationElement element : elements) {
 
 			MCommand command = commandsFactory.createCommand();
-			command.setCommandName(element.getAttribute("name"));
-			command.setDescription(element.getAttribute("description"));
-			command.setElementId(element.getAttribute("id"));
-			String catId = element.getAttribute("categoryId");
+			command.setCommandName(element.getAttribute(NAME));
+			command.setDescription(element.getAttribute(DESCRIPTION));
+			command.setElementId(element.getAttribute(ID));
+			String catId = element.getAttribute(CATEGORY_ID);
 
 			if (catId != null && catId.trim().length() > 0) {
 				List<MCategory> categories = application.getCategories();
@@ -123,9 +139,9 @@ private static MPerspective[] getPerspectives(IConfigurationElement[] elements)
 
 		for (IConfigurationElement element : elements) {
 			MPerspective perspective = factory.createPerspective();
-			perspective.setLabel(element.getAttribute("name"));
-			perspective.setIconURI(getIconURI(element, "icon"));
-			perspective.setElementId(element.getAttribute("id"));
+			perspective.setLabel(element.getAttribute(NAME));
+			perspective.setIconURI(getIconURI(element, ICON));
+			perspective.setElementId(element.getAttribute(ID));
 			perspective.setToBeRendered(true);
 			perspective.setVisible(true);
 			result.add(perspective);
@@ -143,9 +159,9 @@ private static MCategory[] getCategories(IConfigurationElement[] elements) {
 		for (IConfigurationElement element : elements) {
 
 			MCategory category = commandsFactory.createCategory();
-			category.setDescription(element.getAttribute("description"));
-			category.setElementId(element.getAttribute("id"));
-			category.setName(element.getAttribute("name"));
+			category.setDescription(element.getAttribute(DESCRIPTION));
+			category.setElementId(element.getAttribute(ID));
+			category.setName(element.getAttribute(NAME));
 
 			result.add(category);
 		}
@@ -158,23 +174,22 @@ private static MPart[] getViews(IConfigurationElement[] elements) {
 		ArrayList<MPart> result = new ArrayList<MPart>();
 		for (IConfigurationElement element : elements) {
 			MPart part = (MPart) EcoreUtil.create(BasicPackageImpl.Literals.PART);
-			part.setElementId(element.getAttribute("id"));
-			part.setLabel(element.getAttribute("name"));
-			part.setIconURI(getIconURI(element, "icon"));
-			part.setContributionURI(getContributionURI(element, "class"));
+			part.setElementId(element.getAttribute(ID));
+			part.setLabel(element.getAttribute(NAME));
+			part.setIconURI(getIconURI(element, ICON));
+			part.setContributionURI(getContributionURI(element, CLASS));
 			part.setToBeRendered(true);
 			part.setVisible(true);
 			part.setToolbar(createToolBar(part));
 			part.getMenus().add(createViewMenu(part));
 			part.setCloseable(true);
-			part.getTags().add("View");
-			if (element.getAttribute("category") != null) {
-				part.getTags().add("categoryTag:" + element.getAttribute("category"));
+			part.getTags().add(VIEW);
+			if (element.getAttribute(CATEGORY) != null) {
+				part.getTags().add(CATEGORY_TAG + element.getAttribute(CATEGORY));
 			}
 
 			result.add(part);
 		}
-
 		return result.toArray(new MPart[0]);
 	}
 
@@ -187,7 +202,7 @@ private static MToolBar createToolBar(MPart part) {
 	private static MMenu createViewMenu(MPart part) {
 		MMenu menu = MMenuFactory.INSTANCE.createMenu();
 		menu.setElementId(part.getElementId());
-		menu.getTags().add("ViewMenu");
+		menu.getTags().add(VIEW_MENU);
 		return menu;
 	}
 
@@ -195,7 +210,7 @@ private static MPart[] getViewsAsCompatibilityViews(IConfigurationElement[] elem
 		ArrayList<MPart> result = new ArrayList<MPart>();
 		MPart[] parts = getViews(elements);
 		for (MPart part : parts) {
-			part.setContributionURI("bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView");
+			part.setContributionURI(COMPATIBILITY_VIEW);
 			result.add(part);
 		}
 		return result.toArray(new MPart[0]);
@@ -205,18 +220,18 @@ private static MPartDescriptor[] getPartDescriptorsAsCompatibilyViews(IConfigura
 		ArrayList<MPartDescriptor> result = new ArrayList<MPartDescriptor>();
 		MPartDescriptor[] parts = getViewPartDescriptors(elements);
 		for (MPartDescriptor part : parts) {
-			part.setContributionURI("bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView");
+			part.setContributionURI(COMPATIBILITY_VIEW);
 			result.add(part);
 		}
 		return result.toArray(new MPartDescriptor[0]);
 	}
 
-	private static MInputPart[] getEditors(IConfigurationElement[] elements) {
+	private static MPart[] getEditors(IConfigurationElement[] elements) {
 
-		ArrayList<MInputPart> result = new ArrayList<MInputPart>();
+		ArrayList<MPart> result = new ArrayList<MPart>();
 		for (IConfigurationElement element : elements) {
 			if ("editor".equals(element.getName())) /* Sanity Check */{
-				MInputPart part = (MInputPart) EcoreUtil.create(BasicPackageImpl.Literals.INPUT_PART);
+				MPart part = (MPart) EcoreUtil.create(BasicPackageImpl.Literals.PART);
 				part.setElementId(element.getAttribute("id"));
 				part.setLabel(element.getAttribute("name"));
 				part.setIconURI(getIconURI(element, "icon"));
@@ -234,7 +249,7 @@ private static MInputPart[] getEditors(IConfigurationElement[] elements) {
 			}
 		}
 
-		return result.toArray(new MInputPart[0]);
+		return result.toArray(new MPart[0]);
 	}
 
 	private static MPartDescriptor[] getEditorPartDescriptors(IConfigurationElement[] elements) {
@@ -242,13 +257,13 @@ private static MPartDescriptor[] getEditorPartDescriptors(IConfigurationElement[
 		ArrayList<MPartDescriptor> result = new ArrayList<MPartDescriptor>();
 		for (IConfigurationElement element : elements) {
 			MPartDescriptor part = (MPartDescriptor) EcoreUtil.create(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR);
-			part.setElementId(element.getAttribute("id"));
-			part.setLabel(element.getAttribute("name"));
-			part.setIconURI(getIconURI(element, "icon"));
-			if (element.getAttribute("class") != null) {
-				part.setContributionURI(getContributionURI(element, "class"));
+			part.setElementId(element.getAttribute(ID));
+			part.setLabel(element.getAttribute(NAME));
+			part.setIconURI(getIconURI(element, ICON));
+			if (element.getAttribute(CLASS) != null) {
+				part.setContributionURI(getContributionURI(element, CLASS));
 			} else {
-				part.setContributionURI(getContributionURI(element, "launcher"));
+				part.setContributionURI(getContributionURI(element, LAUNCHER));
 			}
 			part.setDirtyable(true);
 			part.setAllowMultiple(true);
@@ -259,7 +274,7 @@ private static MPartDescriptor[] getEditorPartDescriptors(IConfigurationElement[
 
 			MMenu menu = MMenuFactory.INSTANCE.createMenu();
 			menu.setElementId(part.getElementId());
-			menu.getTags().add("ViewMenu");
+			menu.getTags().add(VIEW_MENU);
 			part.getMenus().add(menu);
 
 			part.setCloseable(true);
@@ -274,9 +289,9 @@ private static MPartDescriptor[] getViewPartDescriptors(IConfigurationElement[]
 		ArrayList<MPartDescriptor> result = new ArrayList<MPartDescriptor>();
 		for (IConfigurationElement element : elements) {
 			MPartDescriptor part = (MPartDescriptor) EcoreUtil.create(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR);
-			part.setElementId(element.getAttribute("id"));
-			part.setLabel(element.getAttribute("name"));
-			part.setIconURI(getIconURI(element, "icon"));
+			part.setElementId(element.getAttribute(ID));
+			part.setLabel(element.getAttribute(NAME));
+			part.setIconURI(getIconURI(element, ICON));
 
 			MToolBar toolBar = MMenuFactory.INSTANCE.createToolBar();
 			toolBar.setElementId(part.getElementId());
@@ -284,7 +299,7 @@ private static MPartDescriptor[] getViewPartDescriptors(IConfigurationElement[]
 
 			MMenu menu = MMenuFactory.INSTANCE.createMenu();
 			menu.setElementId(part.getElementId());
-			menu.getTags().add("ViewMenu");
+			menu.getTags().add(VIEW_MENU);
 			part.getMenus().add(menu);
 
 			part.setCloseable(true);
@@ -299,10 +314,10 @@ private static MHandler[] getHandlers(IConfigurationElement[] elements, MApplica
 		ArrayList<MHandler> result = new ArrayList<MHandler>();
 		for (IConfigurationElement element : elements) {
 			MHandler hand = MCommandsFactory.INSTANCE.createHandler();
-			hand.setElementId(element.getAttribute("id"));
-			hand.setContributionURI(getContributionURI(element, "class"));
+			hand.setElementId(element.getAttribute(ID));
+			hand.setContributionURI(getContributionURI(element, CLASS));
 
-			String cmdId = element.getAttribute("commandId");
+			String cmdId = element.getAttribute(COMMAND_ID);
 
 			if (cmdId != null && cmdId.trim().length() > 0) {
 				List<MCommand> categories = application.getCommands();
@@ -320,17 +335,17 @@ private static MHandler[] getHandlers(IConfigurationElement[] elements, MApplica
 
 	private static String getIconURI(IConfigurationElement element, String attribute) {
 		if (element.getAttribute(attribute) == null) {
-			return "";
+			return EMPTY_STRING;
 		}
 		// FIXME any other cases?
-		if (element.getAttribute(attribute).startsWith("platform:")) {
+		if (element.getAttribute(attribute).startsWith(PLATFORM)) {
 			return element.getAttribute(attribute);
 		}
-		return "platform:/plugin/" + element.getContributor().getName() + "/" + element.getAttribute(attribute);
+		return "platform:/plugin/" + element.getContributor().getName() + "/" + element.getAttribute(attribute); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	private static String getContributionURI(IConfigurationElement element, String attribute) {
-		return "bundleclass://" + element.getContributor().getName() + "/" + element.getAttribute(attribute);
+		return "bundleclass://" + element.getContributor().getName() + "/" + element.getAttribute(attribute); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
@@ -346,7 +361,7 @@ public static String[] getProvidingBundles(IExtensionRegistry registry, String e
 		IExtensionLookup service = getService(IExtensionLookup.class, null);
 
 		if (service == null) {
-			return new String[] { "No " + IExtensionLookup.class.getName() + " service found." };
+			return new String[] { "No " + IExtensionLookup.class.getName() + " service found." }; //$NON-NLS-1$ //$NON-NLS-2$
 		}
 
 		ArrayList<String> result = new ArrayList<String>();
@@ -408,22 +423,22 @@ public static IConfigurationElement[] getExtensions(IExtensionRegistry registry,
 	public static RegistryStruct getStruct(Class<? extends MApplicationElement> applicationElement, String hint) {
 
 		if (applicationElement == MCommand.class)
-			return new RegistryStruct("", "org.eclipse.ui.commands", "command", "name");
+			return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.commands", "command", NAME); //$NON-NLS-1$ //$NON-NLS-2$
 
 		else if (applicationElement == MCategory.class)
-			return new RegistryStruct("", "org.eclipse.ui.commands", "category", "name");
+			return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.commands", CATEGORY, NAME); //$NON-NLS-1$
 
 		else if (applicationElement == MPerspective.class)
-			return new RegistryStruct("", "org.eclipse.ui.perspectives", "perspective", "name");
+			return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.perspectives", "perspective", NAME); //$NON-NLS-1$ //$NON-NLS-2$
 
 		else if (applicationElement == MPart.class)
-			return new RegistryStruct("", "org.eclipse.ui.views", "view", "name");
+			return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.views", "view", NAME); //$NON-NLS-1$ //$NON-NLS-2$
 
 		else if (applicationElement == MHandler.class)
-			return new RegistryStruct("", "org.eclipse.ui.handlers", "handler", "commandId");
+			return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.handlers", "handler", COMMAND_ID); //$NON-NLS-1$ //$NON-NLS-2$
 
 		else if (applicationElement == MPart.class) {
-			return new RegistryStruct("", "org.eclipse.ui.views", "view", "name");
+			return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.views", "view", NAME); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 
 		else if (applicationElement == MInputPart.class) {
@@ -432,9 +447,9 @@ else if (applicationElement == MInputPart.class) {
 
 		else if (applicationElement == MPartDescriptor.class) {
 			if (hint == HINT_EDITOR)
-				return new RegistryStruct("", "org.eclipse.ui.editors", "editor", "name");
+				return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.editors", EDITOR, NAME); //$NON-NLS-1$
 			if (hint == HINT_VIEW || hint == HINT_COMPAT_VIEW)
-				return new RegistryStruct("", "org.eclipse.ui.views", "view", "name");
+				return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.views", "view", NAME); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 
 		return null;

From 6f4175d67639d6f97d232707bb039f20a06c593c Mon Sep 17 00:00:00 2001
From: klevis <klevis.ramo7@gmail.com>
Date: Sat, 18 Jan 2014 21:24:27 +0100
Subject: [PATCH 0674/1286] Bug 400890 - Extract into a fragment - Multiple
 elements

Change-Id: I1f5b75448ea79b0457ecb31ebbfc5fde31633f3b
Signed-off-by: klevis <klevis.ramo7@gmail.com>
---
 .../emf/ui/internal/common/ModelEditor.java   | 113 +++++++++---------
 .../model/ExtractContributionModelWizard.java |   6 +-
 2 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 8087b53255..c9ecf03b04 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -13,7 +13,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -634,8 +633,11 @@ public void run() {
 			@Override
 			public void menuAboutToShow(IMenuManager manager) {
 				final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+				final List listOfSelections = s.toList();
+				int noSelected = listOfSelections.size();
+
 				boolean addSeparator = false;
-				if (!s.isEmpty()) {
+				if (!s.isEmpty() && noSelected == 1) {
 					List<Action> actions;
 					if (s.getFirstElement() instanceof VirtualEntry<?>) {
 						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId()).getActions(s.getFirstElement());
@@ -661,36 +663,6 @@ public void menuAboutToShow(IMenuManager manager) {
 						if (addSeparator)
 							manager.add(new Separator());
 
-						// build the extract action
-						if ((!((VirtualEntry<?>) s.getFirstElement()).getList().isEmpty()) && (!isModelFragment()) && modelExtractor != null) {
-							manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {
-								@Override
-								public void run() {
-									VirtualEntry<?> ve = (VirtualEntry<?>) s.getFirstElement();
-									EObject container = (EObject) ve.getOriginalParent();
-									String containerId = ((MApplicationElement) container).getElementId();
-									if (containerId == null || containerId.length() == 0) {
-										MessageDialog.openError(viewer.getControl().getShell(), null, messages.ModelEditor_ExtractFragment_NoParentId);
-										return;
-									}
-									ArrayList<MApplicationElement> maes = new ArrayList<MApplicationElement>();
-									IObservableList list = ve.getList();
-									Iterator iterator = list.iterator();
-									while (iterator.hasNext()) {
-										maes.add((MApplicationElement) iterator.next());
-									}
-
-									if (modelExtractor.extract(viewer.getControl().getShell(), project, maes)) {
-										for (MApplicationElement mae : maes) {
-											Command cmd = DeleteCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), mae);
-											if (cmd.canExecute()) {
-												ModelEditor.this.modelProvider.getEditingDomain().getCommandStack().execute(cmd);
-											}
-										}
-									}
-								};
-							});
-						}
 					} else {
 
 						final EObject o = (EObject) s.getFirstElement();
@@ -743,12 +715,62 @@ public void run() {
 						}
 					}
 				}
+				// multi selection
+				if (noSelected > 0) {
+					if ((!isModelFragment()) && modelExtractor != null)
+						manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {
+							public void run() {
+								ArrayList<MApplicationElement> maes = new ArrayList<MApplicationElement>();
+								for (Object objSelect : listOfSelections) {
+									EObject container = null;
+									if (objSelect instanceof VirtualEntry<?>) {
+
+										VirtualEntry<?> ve = (VirtualEntry<?>) objSelect;
+										container = (EObject) ve.getOriginalParent();
+										IObservableList list = ve.getList();
+										Iterator iterator = list.iterator();
+										while (iterator.hasNext()) {
+											maes.add((MApplicationElement) iterator.next());
+										}
+
+									} else {
+										container = ((EObject) objSelect).eContainer();
+										MApplicationElement objSelect2 = (MApplicationElement) objSelect;
+										if (!(objSelect2 instanceof MApplication))
+											maes.add(objSelect2);
+										else {
+											// can't extract application
+											return;
+										}
+
+									}
+
+									String containerId = ((MApplicationElement) container).getElementId();
+									if (containerId == null || containerId.length() == 0) {
+										MessageDialog.openError(viewer.getControl().getShell(), null, messages.ModelEditor_ExtractFragment_NoParentId);
+
+										return;
+									}
+
+								}
+
+								if (modelExtractor.extract(viewer.getControl().getShell(), project, maes)) {
+									Command cmd = DeleteCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), maes);
+									if (cmd.canExecute()) {
+										ModelEditor.this.modelProvider.getEditingDomain().getCommandStack().execute(cmd);
+									}
+								}
+
+							};
+						});
+
+				}
 
 				IExtensionRegistry registry = RegistryFactory.getRegistry();
 				IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.scripting"); //$NON-NLS-1$
 				final IConfigurationElement[] elements = extPoint.getConfigurationElements();
 
-				if (elements.length > 0 && !s.isEmpty() && s.getFirstElement() instanceof MApplicationElement) {
+				if (elements.length > 0 && !s.isEmpty() && s.getFirstElement() instanceof MApplicationElement && noSelected == 1) {
 					if (addSeparator) {
 						manager.add(new Separator());
 					}
@@ -818,27 +840,6 @@ public void run() {
 					}
 
 				}
-				if ((s.getFirstElement() instanceof MApplicationElement) && (!isModelFragment()) && (!(s.getFirstElement() instanceof MApplication)) && modelExtractor != null) {
-					manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {
-						@Override
-						public void run() {
-							MApplicationElement oe = (MApplicationElement) s.getFirstElement();
-							EObject container = ((EObject) oe).eContainer();
-							String containerId = ((MApplicationElement) container).getElementId();
-							if (containerId == null || containerId.length() == 0) {
-								MessageDialog.openError(viewer.getControl().getShell(), null, messages.ModelEditor_ExtractFragment_NoParentId);
-								return;
-							}
-							if (modelExtractor.extract(viewer.getControl().getShell(), project, Collections.singletonList(oe))) {
-								Command cmd = DeleteCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), oe);
-								if (cmd.canExecute()) {
-									ModelEditor.this.modelProvider.getEditingDomain().getCommandStack().execute(cmd);
-								}
-							}
-						};
-
-					});
-				}
 
 				if (addSeparator) {
 					manager.add(new Separator());
@@ -1010,10 +1011,10 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		TreeViewer tempViewer = null;
 		String property = System.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
 		if (property != null) {
-			FilteredTree viewParent = new FilteredTree(treeArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(), true);
+			FilteredTree viewParent = new FilteredTree(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(), true);
 			tempViewer = viewParent.getViewer();
 		} else {
-			tempViewer = new TreeViewer(treeArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
+			tempViewer = new TreeViewer(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
 		}
 		final TreeViewer viewer = tempViewer;
 
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
index 4584f3ccc5..b20e70fdf0 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
@@ -50,16 +50,16 @@ public String getDefaultFileName() {
 	@Override
 	protected EObject createInitialModel() {
 		MModelFragments createModelFragments = MFragmentFactory.INSTANCE.createModelFragments();
-		MStringModelFragment createStringModelFragment = MFragmentFactory.INSTANCE.createStringModelFragment();
 		for (MApplicationElement moe : oes) {
-			
+	    MStringModelFragment createStringModelFragment = MFragmentFactory.INSTANCE.createStringModelFragment();	
 		MApplicationElement e = (MApplicationElement) EcoreUtil.copy((EObject) moe);
 		String featurename = ((EObject) moe).eContainmentFeature().getName();
 		createStringModelFragment.setParentElementId(((MApplicationElement) ((EObject) moe).eContainer()).getElementId());
 		createStringModelFragment.getElements().add(e);
 		createStringModelFragment.setFeaturename(featurename);
-		}
+		
 		createModelFragments.getFragments().add(createStringModelFragment);
+		}
 		return (EObject)createModelFragments;
 	}
 	

From da27aa86061c57bf80d0398776a008641a12e226 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Wed, 22 Jan 2014 13:32:16 +0100
Subject: [PATCH 0675/1286] Bug 426343 - Activate more save actions for
 org.eclipse.e4.tools projects

Change-Id: I8befdd35f384d00bac9dc03f42b829a16a9ba1c3
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../.settings/org.eclipse.jdt.ui.prefs                     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
index 2e80c9eb7a..d4d8200d6e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,3 @@
-#Sat Jun 26 16:51:30 CEST 2010
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_custom
@@ -28,10 +27,10 @@ sp_cleanup.make_local_variable_final=false
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
 sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.make_variable_declarations_final=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.on_save_use_additional_actions=true
 sp_cleanup.organize_imports=true
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
@@ -39,7 +38,7 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
 sp_cleanup.remove_unnecessary_casts=true

From ee64431f6f80de53745ec75cdd679964c0ed65b3 Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Wed, 22 Jan 2014 15:31:07 -0500
Subject: [PATCH 0676/1286] Bug 426397 - Provide an eclipse editor based on
 OrionEditorControl

initial plugin commit.

From 7d47ab56c9c49aa8d6496c4fb3e229a40bb4cc68 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Thu, 30 Jan 2014 12:05:25 +0100
Subject: [PATCH 0677/1286] Bug 426886 - Compiler error in
 org.eclipse.e4.tools.emf.ui

Change-Id: I6edf88a43d3aa8d9adf73efd639e65cc04230958
Signed-off-by: Sopot Cela <sopotcela@gmail.com>
---
 .../emf/ui/internal/common/component/ControlFactory.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 515443e100..07f72f52da 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -350,7 +350,7 @@ public static void createTextField(Composite parent, String label, IObservableVa
 	}
 
 	/**
-	 * 
+	 *
 	 * @param parent
 	 * @param label
 	 * @param master
@@ -823,7 +823,7 @@ public static void createCheckBox(Composite parent, String label, String tooltip
 	}
 
 	public static String getLocalizedLabel(ProjectOSGiTranslationProvider translationProvider, MUILabel element) {
-		return getLocalizedValue(translationProvider, (MApplicationElement) element, UiPackageImpl.Literals.UI_LABEL__LABEL, UiPackageImpl.Literals.UI_LABEL___GET_LOCALIZED_LABEL);
+		return getLocalizedValue(translationProvider, (MApplicationElement) element, UiPackageImpl.Literals.UI_LABEL__LABEL, UiPackageImpl.Literals.LOCALIZABLE___UPDATE_LOCALIZATION);
 	}
 
 	public static String getLocalizedValue(ProjectOSGiTranslationProvider translationProvider, MApplicationElement element, EStructuralFeature feature, EOperation operation) {

From fad6a2c86c8977e3616f3a8ab821ba8b0f48e8ba Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Fri, 31 Jan 2014 14:18:10 +0100
Subject: [PATCH 0678/1286] Bug 427048 - e4 tools processor throws NPE

Change-Id: Id04f29560beb1984155309b07dcf5bcfd9e5e6b0
Signed-off-by: Sopot Cela <sopotcela@gmail.com>

From b2a354b28ac324e3f011c3a498a138179e41b0ab Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Wed, 5 Feb 2014 12:29:00 +0100
Subject: [PATCH 0679/1286] Bug 426343 - Activate more save actions for
 org.eclipse.e4.tools projects

Change-Id: I9c64d02bf0850346de3beae1fcb7fe0d6233eb44
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>

From b48b649f2c6d29ae17cfbce3dfae5e9b6a934abe Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Wed, 5 Feb 2014 15:12:14 -0500
Subject: [PATCH 0680/1286] Bug 370055 - [ModelEditor] TrimWindow Bounds set to
 -2147483648

---
 .../UnsettableUpdateValueStrategy.java        | 117 ++++++++++++++++++
 .../common/component/WindowEditor.java        |   8 +-
 2 files changed, 121 insertions(+), 4 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
new file mode 100644
index 0000000000..05859cccd2
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
@@ -0,0 +1,117 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.core.databinding.conversion.Converter;
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.databinding.EMFUpdateValueStrategy;
+import org.eclipse.emf.databinding.internal.EMFValueProperty;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.emf.edit.command.SetCommand;
+
+/**
+ * An updater to deal with unsettable primitive attributes on EMF objects. EMF's
+ * {@link EMFEditValueProperty}/{@link EMFValueProperty} does an eGet to
+ * retrieve the attribute value, with no regard as to whether the attribute is
+ * unset. If the attribute is unset, then eGet() will return the default value.
+ *
+ * This implementation makes several assumptions:
+ * <ul>
+ * <li>Assumes that these unsettable attributes have a nonsensical default value
+ * that can be used to detect an eGet of an unset attribute.</li>
+ * <li>Assumes that we are using EMFEditObservables so that changes are
+ * described using {@link SetCommand}, such that we can provide
+ * {@link SetCommand#UNSET_VALUE} to remove a value.</li>
+ * </ul>
+ * See the following discussions for background details:
+ * <ul>
+ * <li><a
+ * href="http://www.eclipse.org/forums/index.php?t=msg&th=165026/">Dynamic eGet
+ * for unsettable attributes</a></li>
+ * <li><a
+ * href="http://www.eclipsezone.com/eclipse/forums/t114431.html?start=15">
+ * Creating a ComboViewer for an EReference</a> particularly the later postings
+ * from Tom Schindl on handling null values</li>
+ * <li><a href="http://www.eclipse.org/forums/index.php?t=msg&th=174967/">
+ * ObservableMapCellLabelProvider doesn't work well with unsettable features</a>
+ * </li>
+ * </ul>
+ */
+public class UnsettableUpdateValueStrategy extends EMFUpdateValueStrategy {
+	@Override
+	protected IConverter createConverter(Object fromType, Object toType) {
+		if (fromType == String.class) {
+			if (toType instanceof EAttribute) {
+				final EAttribute eAttribute = (EAttribute) toType;
+				final EDataType eDataType = eAttribute.getEAttributeType();
+				final EFactory eFactory = eDataType.getEPackage().getEFactoryInstance();
+				return new Converter(fromType, toType) {
+					@Override
+					public Object convert(Object fromObject) {
+						String value = fromObject == null ? null : fromObject.toString();
+						if (value == null || value.length() == 0) {
+							return SetCommand.UNSET_VALUE;
+						}
+						if (eAttribute.isMany()) {
+							List<Object> result = new ArrayList<Object>();
+							if (value != null) {
+								for (String element : value.split(" ")) {
+									result.add(eFactory.createFromString(eDataType, element));
+								}
+							}
+							return result;
+						} else {
+							return eFactory.createFromString(eDataType, value);
+						}
+					}
+				};
+			}
+		} else if (toType == String.class) {
+			if (fromType instanceof EAttribute) {
+				final EAttribute eAttribute = (EAttribute) fromType;
+				final EDataType eDataType = eAttribute.getEAttributeType();
+				final EFactory eFactory = eDataType.getEPackage().getEFactoryInstance();
+				return new Converter(fromType, toType) {
+					@Override
+					public Object convert(Object fromObject) {
+						if (eAttribute.isMany()) {
+							StringBuilder result = new StringBuilder();
+							for (Object value : (List<?>) fromObject) {
+								if (result.length() == 0) {
+									result.append(' ');
+								}
+								result.append(eFactory.convertToString(eDataType, value));
+							}
+							return result.toString();
+						} else {
+							// If the value
+2							if (fromObject == SetCommand.UNSET_VALUE || fromObject == null || fromObject.equals(eAttribute.getDefaultValue())) {
+								return "";
+							}
+							return eFactory.convertToString(eDataType, fromObject);
+						}
+					}
+				};
+			}
+		}
+		return super.createConverter(fromType, toType);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.core.databinding.UpdateValueStrategy#doSet(org.eclipse.core
+	 * .databinding.observable.value.IObservableValue, java.lang.Object)
+	 */
+	@Override
+	protected IStatus doSet(IObservableValue observableValue, Object value) {
+		// TODO Auto-generated method stub
+		return super.doSet(observableValue, value);
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index c533efc290..2eebda178e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -204,19 +204,19 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			Text t = new Text(comp, SWT.BORDER | SWT.TRAIL);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__X).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__X).observeDetail(getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
 
 			t = new Text(comp, SWT.BORDER | SWT.TRAIL);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__Y).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__Y).observeDetail(getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
 
 			t = new Text(comp, SWT.BORDER | SWT.TRAIL);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__WIDTH).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__WIDTH).observeDetail(getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
 
 			t = new Text(comp, SWT.BORDER | SWT.TRAIL);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__HEIGHT).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__HEIGHT).observeDetail(getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
 		}
 
 		ControlFactory.createTranslatedTextField(parent, Messages.WindowEditor_Label, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);

From 791647e24640b789891f2741043a98a669aa549d Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Wed, 5 Feb 2014 15:29:32 -0500
Subject: [PATCH 0681/1286] Fix stray character that should not have been
 committed

---
 .../common/component/UnsettableUpdateValueStrategy.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
index 05859cccd2..f4e134c453 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
@@ -89,7 +89,7 @@ public Object convert(Object fromObject) {
 							return result.toString();
 						} else {
 							// If the value
-2							if (fromObject == SetCommand.UNSET_VALUE || fromObject == null || fromObject.equals(eAttribute.getDefaultValue())) {
+							if (fromObject == SetCommand.UNSET_VALUE || fromObject == null || fromObject.equals(eAttribute.getDefaultValue())) {
 								return "";
 							}
 							return eFactory.convertToString(eDataType, fromObject);
@@ -103,7 +103,7 @@ public Object convert(Object fromObject) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.eclipse.core.databinding.UpdateValueStrategy#doSet(org.eclipse.core
 	 * .databinding.observable.value.IObservableValue, java.lang.Object)

From d79c2085fca963b2dc47fedaee7468589e896191 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Thu, 6 Feb 2014 09:28:05 +0100
Subject: [PATCH 0682/1286] Bug 427541 - Activate unix line endings for the e4
 tools projects

Change-Id: I623c8e6c2de3466907c58d3ba19956c06c8af2da
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../.settings/org.eclipse.core.runtime.prefs                    | 2 ++
 .../.settings/org.eclipse.core.runtime.prefs                    | 2 ++
 .../.settings/org.eclipse.core.runtime.prefs                    | 2 ++
 .../.settings/org.eclipse.core.runtime.prefs                    | 2 ++
 .../.settings/org.eclipse.core.runtime.prefs                    | 2 ++
 .../.settings/org.eclipse.core.runtime.prefs                    | 2 ++
 .../.settings/org.eclipse.core.runtime.prefs                    | 2 ++
 7 files changed, 14 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.runtime.prefs

diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n

From f8b7e5cd88e08f9847981eadf6d2d83b1b70f79b Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Thu, 6 Feb 2014 13:50:26 +0100
Subject: [PATCH 0683/1286] Bug 427558 - [e4xmi] Children DropDown of
 MPartStack & MPartSashContainer should consult IEditorFeature contributions

---
 .../tools/emf/ui/common/IEditorFeature.java   | 10 ++++++-
 .../component/AbstractComponentEditor.java    |  5 +++-
 .../emf/ui/internal/common/ModelEditor.java   |  3 +-
 .../component/PartSashContainerEditor.java    | 24 +++++++++++++--
 .../common/component/PartStackEditor.java     | 30 +++++++++++++++----
 5 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
index fdcf4cb001..21a8f120a7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
@@ -21,10 +21,18 @@
 public interface IEditorFeature {
 	public class FeatureClass {
 		public final String label;
+		public final String iconId;
 		public final EClass eClass;
 
 		public FeatureClass(String label, EClass eClass) {
 			this.label = label;
+			this.iconId = null;
+			this.eClass = eClass;
+		}
+
+		public FeatureClass(String label, String iconId, EClass eClass) {
+			this.label = label;
+			this.iconId = iconId;
 			this.eClass = eClass;
 		}
 	}
@@ -33,7 +41,7 @@ public FeatureClass(String label, EClass eClass) {
 	 * Return a list of {@link FeatureClass} elements, where
 	 * {@link FeatureClass#eClass} must be castable to <b>eClass</b> and will be
 	 * stored in <b>feature</b>.
-	 * 
+	 *
 	 * @param eClass
 	 *            your contribution must be castable to
 	 * @param feature
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 718c5a749f..32868cf8d4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -101,6 +101,9 @@ public Image createImage(String key) {
 	}
 
 	public ImageDescriptor createImageDescriptor(String key) {
+		if (key == null) {
+			return null;
+		}
 		return ImageDescriptor.createFromImage(createImage(key));
 	}
 
@@ -132,7 +135,7 @@ public List<Action> getActions(Object element) {
 	 * Translates an input <code>String</code> using the current
 	 * {@link ResourceBundleTranslationProvider} and <code>locale</code> from
 	 * the {@link TranslationService}.
-	 * 
+	 *
 	 * @param string
 	 *            the string to translate, may not be null.
 	 * @return the translated string or the input string if it could not be
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index c9ecf03b04..d0285fe916 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -376,12 +376,12 @@ public void handleEvent(Event event) {
 			context.set(IProject.class, project);
 		}
 
+		loadEditorFeatures();
 		registerDefaultEditors();
 		registerVirtualEditors();
 
 		registerContributedEditors();
 		registerContributedVirtualEditors();
-		loadEditorFeatures();
 		loadContributionCreators();
 
 		fragment = modelProvider.getRoot().get(0) instanceof MModelFragments;
@@ -719,6 +719,7 @@ public void run() {
 				if (noSelected > 0) {
 					if ((!isModelFragment()) && modelExtractor != null)
 						manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {
+							@Override
 							public void run() {
 								ArrayList<MApplicationElement> maes = new ArrayList<MApplicationElement>();
 								for (Object objSelect : listOfSelections) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 71f27ab6e0..384e67d1f7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -20,6 +20,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -137,6 +138,15 @@ public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
 			}
 		});
+		for (FeatureClass c : getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN)) {
+			final EClass ec = c.eClass;
+			actions.add(new Action(c.label, createImageDescriptor(c.iconId)) {
+				@Override
+				public void run() {
+					handleAddChild(ec);
+				}
+			});
+		}
 
 		// --- Import Actions ---
 		actionsImport.add(new Action("Views", createImageDescriptor(ResourceProvider.IMG_Part)) {
@@ -296,8 +306,16 @@ public String getText(Object element) {
 					return eclass.getName();
 				}
 			});
-			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
-			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
+			List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
+			eClassList.add(new FeatureClass("PartSashContainer", BasicPackageImpl.Literals.PART_SASH_CONTAINER));
+			eClassList.add(new FeatureClass("PartStack", BasicPackageImpl.Literals.PART_STACK));
+			eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART));
+			eClassList.add(new FeatureClass("InputPart", BasicPackageImpl.Literals.INPUT_PART));
+			eClassList.add(new FeatureClass("Area", AdvancedPackageImpl.Literals.AREA));
+			eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER));
+			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_SASH_CONTAINER, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
+
+			childrenDropDown.setSelection(new StructuredSelection(eClassList.get(0)));
 
 			Button b = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
@@ -307,7 +325,7 @@ public String getText(Object element) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (!childrenDropDown.getSelection().isEmpty()) {
-						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+						EClass eClass = ((FeatureClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement()).eClass;
 						handleAddChild(eClass);
 					}
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index e36cddf64a..6d2fa6cb7c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -20,6 +20,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
+import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -115,6 +116,20 @@ public void run() {
 			}
 		});
 
+		List<FeatureClass> list = getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+
+		if (!list.isEmpty()) {
+			for (FeatureClass c : list) {
+				final EClass ec = c.eClass;
+				actions.add(new Action(c.label, createImageDescriptor(c.iconId)) {
+					@Override
+					public void run() {
+						handleAddChild(ec);
+					}
+				});
+			}
+		}
+
 		// --- Import Actions ---
 		actionsImport.add(new Action("Views", createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
@@ -236,12 +251,17 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			childrenDropDown.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
-					EClass eclass = (EClass) element;
-					return eclass.getName();
+					FeatureClass eclass = (FeatureClass) element;
+					return eclass.label;
 				}
 			});
-			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.PLACEHOLDER });
-			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
+			List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
+			eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART));
+			eClassList.add(new FeatureClass("Input Part", BasicPackageImpl.Literals.INPUT_PART));
+			eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER));
+			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
+			childrenDropDown.setInput(eClassList);
+			childrenDropDown.setSelection(new StructuredSelection(eClassList.get(0)));
 
 			Button b = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_AddEllipsis);
@@ -250,7 +270,7 @@ public String getText(Object element) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+					EClass eClass = ((FeatureClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement()).eClass;
 					handleAddChild(eClass);
 				}
 			});

From 806fd00f9051875326407f94b391580e1b08cd05 Mon Sep 17 00:00:00 2001
From: Dirk Fauth <dirk.fauth@googlemail.com>
Date: Wed, 5 Feb 2014 16:47:30 +0100
Subject: [PATCH 0684/1286] Bug 427460 - Fix project name setting for
 org.eclipse.e4.tools.orion.css.editor.feature

Change-Id: Ic54a58bc04cc7db8e440748bad3e2de40e665405
Signed-off-by: Dirk Fauth <dirk.fauth@googlemail.com>

From 983c48a8d6138aba4f92dd2fdf65725d6ab9b97b Mon Sep 17 00:00:00 2001
From: Dirk Fauth <dirk.fauth@googlemail.com>
Date: Wed, 5 Feb 2014 16:49:44 +0100
Subject: [PATCH 0685/1286] Bug 426986 - changed getLocalizedValue() to use the
 localized feature to match the new model extension for Localizable

Change-Id: Ia43ca3859a2d4c2c8e0e845a8aaebe2da20d5cf8
Signed-off-by: Dirk Fauth <dirk.fauth@googlemail.com>
---
 .../common/component/ControlFactory.java      | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 07f72f52da..b97204dd29 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,10 +7,10 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Dirk Fauth <dirk.fauth@googlemail.com> - Bug 426986
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map.Entry;
@@ -54,7 +54,6 @@
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.edit.command.AddCommand;
@@ -823,20 +822,15 @@ public static void createCheckBox(Composite parent, String label, String tooltip
 	}
 
 	public static String getLocalizedLabel(ProjectOSGiTranslationProvider translationProvider, MUILabel element) {
-		return getLocalizedValue(translationProvider, (MApplicationElement) element, UiPackageImpl.Literals.UI_LABEL__LABEL, UiPackageImpl.Literals.LOCALIZABLE___UPDATE_LOCALIZATION);
+		return getLocalizedValue(translationProvider, (MApplicationElement) element, UiPackageImpl.Literals.UI_LABEL__LABEL, UiPackageImpl.Literals.UI_LABEL__LOCALIZED_LABEL);
 	}
 
-	public static String getLocalizedValue(ProjectOSGiTranslationProvider translationProvider, MApplicationElement element, EStructuralFeature feature, EOperation operation) {
+	public static String getLocalizedValue(ProjectOSGiTranslationProvider translationProvider, MApplicationElement element, EStructuralFeature feature, EStructuralFeature localizedFeature) {
 		EObject eo = (EObject) element;
 		if (translationProvider == null) {
-			try {
-				String value = (String) eo.eInvoke(operation, null);
-				if (value != null && value.trim().length() > 0) {
-					return value;
-				}
-			} catch (InvocationTargetException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+			String value = (String) eo.eGet(localizedFeature);
+			if (value != null && value.trim().length() > 0) {
+				return value;
 			}
 		}
 

From d7bb88c2e3d57cb9646db1b71986c300dbd38368 Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Sat, 25 Jan 2014 22:38:45 +0100
Subject: [PATCH 0686/1286] Bug 426653 - Export application model element IDs

Change-Id: I2eda59d32be78e72e51b3676d0ee68609353b57e
Signed-off-by: Marco Descher <marco@descher.at>
---
 .../META-INF/MANIFEST.MF                      |   6 +-
 .../e4/tools/emf/ui/internal/Messages.java    |  13 +-
 .../tools/emf/ui/internal/Messages.properties |  13 +-
 .../emf/ui/internal/common/ModelEditor.java   |  15 +-
 .../common/properties/ExportIdsHandler.java   | 317 ++++++++++++++++++
 5 files changed, 356 insertions(+), 8 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 605ac24f26..f76095a514 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
+ org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.core.databinding.property;bundle-version="1.2.100",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
  org.eclipse.emf.databinding;bundle-version="1.2.0",
@@ -32,7 +33,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.e4.ui.widgets;bundle-version="0.11.0",
  org.eclipse.equinox.preferences;bundle-version="3.4.0",
  org.eclipse.e4.ui.workbench.swt;bundle-version="0.10.0",
- org.eclipse.emf.ecore.xmi;bundle-version="2.9.0"
+ org.eclipse.emf.ecore.xmi;bundle-version="2.9.0",
+ org.eclipse.jdt.core
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.0.0",
  javax.inject;version="1.0.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index c15752e3b6..6e3d3ccd7e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2013 BestSolution.at and others.
+ * Copyright (c) 2010-2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Marco Descher <marco@descher.at> - Bug 395982, Bug 396975
+ *     Marco Descher <marco@descher.at> - Bug 395982, 396975, 426653
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
@@ -626,6 +626,7 @@ public class Messages {
 	public String ModelEditor_Form;
 	public String ModelEditor_XMI;
 	public String ModelEditor_ExternalizeStrings;
+	public String ModelEditor_ExportIds;
 	public String ModelEditor_Script;
 	public String ModelEditor_ShowControl;
 
@@ -637,6 +638,14 @@ public class Messages {
 	public String ExternalizeStringHandler_Dialog_DialogTitle;
 	public String ExternalizeStringHandler_Dialog_DialogMessage;
 
+	public String ExportIdsHandler_Dialog_ElementName;
+	public String ExportIdsHandler_Dialog_Key;
+	public String ExportIdsHandler_Dialog_Id_Value;
+	public String ExportIdsHandler_Dialog_ShellTitle;
+	public String ExportIdsHandler_Dialog_DialogTitle;
+	public String ExportIdsHandler_Dialog_DialogMessage;
+	public String ExportIdsHandler_Dialog_SelectProject;
+
 	public String ObjectViewer_Tooltip_Value;
 	public String ObjectViewer_Tooltip_InjectionKey;
 	public String ObjectViewer_Script;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 4811b31171..49868efd90 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -1,5 +1,5 @@
 # ******************************************************************************
-# * Copyright (c) 2010-2013 BestSolution.at and others.
+# * Copyright (c) 2010-2014 BestSolution.at and others.
 # * All rights reserved. This program and the accompanying materials
 # * are made available under the terms of the Eclipse Public License v1.0
 # * which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
 # * Contributors:
 # *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
 # *		Sopot Cela <sopotcela@gmail.com> - enhancements
-# *     Marco Descher <marco@descher.at> - Bug 395982, Bug 396975
+# *     Marco Descher <marco@descher.at> - Bug 395982, 396975, 426653
 # ******************************************************************************
 ModelTooling_Common_Up=Up
 ModelTooling_Common_Down=Down
@@ -627,6 +627,7 @@ ModelEditor_ExpandSubtree=Expand/Collapse (CTRL + Mouse)
 ModelEditor_Form=Form
 ModelEditor_XMI=XMI
 ModelEditor_ExternalizeStrings=Externalize Strings
+ModelEditor_ExportIds=Export Element Ids
 ModelEditor_Script=Execute Script
 ModelEditor_ShowControl=Show control
 
@@ -638,6 +639,14 @@ ExternalizeStringHandler_Dialog_ShellTitle=Externalize Strings
 ExternalizeStringHandler_Dialog_DialogTitle=Externalize Strings
 ExternalizeStringHandler_Dialog_DialogMessage=Externalizing manifest files extracts translatable strings and stores them in a properties file for multi-language support.
 
+ExportIdsHandler_Dialog_ElementName=Element
+ExportIdsHandler_Dialog_Key=Key
+ExportIdsHandler_Dialog_Id_Value=Id Value
+ExportIdsHandler_Dialog_ShellTitle=Export Element Ids
+ExportIdsHandler_Dialog_DialogTitle=Export Element Ids
+ExportIdsHandler_Dialog_DialogMessage=Export application model element Ids into a java file for static reference
+ExportIdsHandler_Dialog_SelectProject=Please select a Java project to continue
+
 ObjectViewer_Tooltip_Value=Value
 ObjectViewer_Tooltip_InjectionKey=Injection key
 ObjectViewer_Script=Execute Script
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index d0285fe916..ecc096ff8d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2013 BestSolution.at and others.
+ * Copyright (c) 2010-2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Wim Jongman <wim.jongman@remainsoftware.com> - Maintenance
- *     Marco Descher <marco@descher.at> - Bug395982
+ *     Marco Descher <marco@descher.at> - Bug395982, Bug426653
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
@@ -130,6 +130,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowSharedElementsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowTrimEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VWindowWindowsEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.properties.ExportIdsHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.properties.ExternalizeStringHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.properties.ProjectOSGiTranslationProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.AnnotationAccess;
@@ -820,7 +821,17 @@ public void run() {
 							ContextInjectionFactory.invoke(h, Execute.class, context);
 						}
 					};
+
+					Action extIdAction = new Action(messages.ModelEditor_ExportIds) {
+						@Override
+						public void run() {
+							ExportIdsHandler h = ContextInjectionFactory.make(ExportIdsHandler.class, context);
+							ContextInjectionFactory.invoke(h, Execute.class, context);
+						}
+					};
+
 					manager.add(nlsAction);
+					manager.add(extIdAction);
 				} else {
 					if (addSeparator) {
 						manager.add(new Separator());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
new file mode 100644
index 0000000000..7d8dc03293
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
@@ -0,0 +1,317 @@
+/*******************************************************************************
+ * Copyright (c) 2014 MEDEVIT, FHV and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Marco Descher <marco@descher.at> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.properties;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.inject.Named;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.e4.tools.services.Translation;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.services.IServiceConstants;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.core.JavaProject;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+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.Table;
+import org.eclipse.swt.widgets.TableColumn;
+
+/**
+ * This handler exports all Id values within the application model to a file for
+ * static reference. Currently the location of this file is fixed to be in the
+ * location of the selected projects main package with name
+ * <code>AppModelId.java</code>.
+ */
+public class ExportIdsHandler {
+	@Execute
+	public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell, @Translation Messages messages, IModelResource resource, IResourcePool pool, IProject project) {
+		TitleAreaDialog dialog = new ExportIdDialog(shell, messages, resource.getRoot(), pool, project);
+		dialog.open();
+	}
+
+	static class ExportIdDialog extends TitleAreaDialog {
+		private Messages messages;
+		private IObservableList list;
+		private IResourcePool pool;
+		private JavaClass clazz;
+		private CheckboxTableViewer viewer;
+
+		public ExportIdDialog(Shell parentShell, Messages messages, IObservableList list, IResourcePool pool, IProject project) {
+			super(parentShell);
+			this.messages = messages;
+			this.list = list;
+			this.pool = pool;
+
+			clazz = new JavaClass();
+			clazz.name = "AppModelId"; //$NON-NLS-1$
+
+			if (JavaProject.hasJavaNature(project)) {
+				try {
+					IJavaProject javaProject = JavaCore.create(project);
+					for (IPackageFragmentRoot iPackageFragmentRoot : javaProject.getAllPackageFragmentRoots()) {
+						if (iPackageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE) {
+							clazz.packageFragment = iPackageFragmentRoot.createPackageFragment(project.getName(), false, new NullProgressMonitor());
+							break;
+						}
+					}
+				} catch (JavaModelException e) {
+					e.printStackTrace();
+				}
+			} else {
+				setErrorMessage(messages.ExportIdsHandler_Dialog_SelectProject);
+				getButton(IDialogConstants.OK_ID).setEnabled(false);
+			}
+		}
+
+		@Override
+		protected Control createDialogArea(Composite parent) {
+			getShell().setText(messages.ExportIdsHandler_Dialog_ShellTitle);
+			setTitle(messages.ExportIdsHandler_Dialog_DialogTitle);
+			setMessage(messages.ExportIdsHandler_Dialog_DialogMessage);
+			setTitleImage(pool.getImageUnchecked(ResourceProvider.IMG_Wizban16_extstr_wiz));
+
+			Composite container = (Composite) super.createDialogArea(parent);
+			container.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+			Table t = new Table(container, SWT.BORDER | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.CHECK);
+
+			GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
+			gd.heightHint = t.getItemHeight() * 18;
+			container.setLayoutData(gd);
+
+			GridData gd2 = new GridData(SWT.FILL, SWT.FILL, true, true);
+			gd2.heightHint = t.getItemHeight() * 17;
+			t.setHeaderVisible(true);
+			t.setLinesVisible(true);
+			t.setLayoutData(gd2);
+
+			viewer = new CheckboxTableViewer(t);
+
+			{
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.setLabelProvider(new ColumnLabelProvider() {
+					@Override
+					public String getText(Object element) {
+						return ""; //$NON-NLS-1$
+					}
+				});
+			}
+
+			{
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText(messages.ExportIdsHandler_Dialog_ElementName);
+				column.setLabelProvider(new ColumnLabelProvider() {
+					@Override
+					public String getText(Object element) {
+						Entry e = (Entry) element;
+						return ((EObject) e.object).eClass().getName();
+					}
+				});
+			}
+
+			{
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText(messages.ExportIdsHandler_Dialog_Key);
+				column.setLabelProvider(new ColumnLabelProvider() {
+					@Override
+					public String getText(Object element) {
+						Entry e = (Entry) element;
+						return e.idFieldKey;
+					}
+				});
+			}
+
+			{
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText(messages.ExportIdsHandler_Dialog_Id_Value);
+				column.setLabelProvider(new ColumnLabelProvider() {
+					@Override
+					public String getText(Object element) {
+						Entry e = (Entry) element;
+						return e.elementId;
+					}
+				});
+			}
+
+			for (int i = 1; i < viewer.getTable().getColumnCount(); i++) {
+				TableColumn c = viewer.getTable().getColumn(i);
+				c.pack();
+				if (c.getWidth() < 120) {
+					c.setWidth(120);
+				}
+			}
+
+			{
+				Label l = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
+				l.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 3, 1));
+			}
+
+			List<Entry> entries = new ArrayList<ExportIdsHandler.Entry>();
+			TreeIterator<EObject> it = EcoreUtil.getAllContents(list);
+
+			while (it.hasNext()) {
+				Object next = it.next();
+				if (next instanceof MApplicationElement) {
+					MApplicationElement o = (MApplicationElement) next;
+					if (o.getElementId() != null && o.getElementId().length() > 1) {
+						String idFieldKey = findIdFieldKey(o);
+						entries.add(new Entry(o, idFieldKey, o.getElementId()));
+					}
+				}
+			}
+
+			Collections.sort(entries);
+
+			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setInput(entries);
+			viewer.setAllChecked(true);
+
+			for (int i = 1; i < viewer.getTable().getColumnCount(); i++) {
+				TableColumn c = viewer.getTable().getColumn(i);
+				c.pack();
+				if (c.getWidth() < 120) {
+					c.setWidth(120);
+				}
+			}
+
+			return container;
+		}
+
+		@Override
+		protected void okPressed() { // See AbstractNewClassWizard
+			Object[] els = viewer.getCheckedElements();
+			if (els.length > 0) {
+				try {
+					String content = compileFileContent(els);
+
+					IPackageFragment fragment = clazz.packageFragment;
+					String cuName = clazz.name + ".java"; //$NON-NLS-1$
+					ICompilationUnit unit = fragment.getCompilationUnit(cuName);
+					IResource resource = unit.getResource();
+					IFile file = (IFile) resource;
+
+					ByteArrayInputStream stream = new ByteArrayInputStream(content.toString().getBytes());
+					if (file.exists()) {
+						file.delete(true, new NullProgressMonitor());
+					}
+
+					createParent(file.getParent());
+					// NPE
+					file.create(stream, IResource.KEEP_HISTORY, new NullProgressMonitor());
+
+					stream.close();
+					super.okPressed();
+				} catch (CoreException e) {
+					e.printStackTrace();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+
+		private String compileFileContent(Object[] els) {
+			StringBuilder b = new StringBuilder();
+			b.append("package " + clazz.packageFragment.getElementName() + ";" + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			b.append(System.getProperty("line.separator")); //$NON-NLS-1$
+			b.append("public class " + clazz.name + " {" + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+			for (Object o : els) {
+				Entry e = (Entry) o;
+				b.append("\tpublic static final String " + e.idFieldKey + " = \"" + e.elementId + "\";" + System.getProperty("line.separator")); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+			}
+
+			b.append("}"); //$NON-NLS-1$
+			return b.toString();
+		}
+
+		private void createParent(IContainer container) throws CoreException {
+			if (!container.exists()) {
+
+				createParent(container.getParent());
+
+				if (container instanceof IFolder) {
+					IFolder f = (IFolder) container;
+					f.create(true, true, new NullProgressMonitor());
+				}
+			}
+		}
+	}
+
+	private static String findIdFieldKey(MApplicationElement object) {
+		StringBuilder sb = new StringBuilder();
+		sb.append(((EObject) object).eClass().getName());
+		sb.append("_"); //$NON-NLS-1$
+		sb.append(replaceInvalidChar(object.getElementId()));
+		return sb.toString().toUpperCase();
+	}
+
+	private static String replaceInvalidChar(String elementId) {
+		return elementId.replaceAll("[^A-Za-z0-9]", "_"); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	private static class Entry implements Comparable<Entry> {
+		private MApplicationElement object;
+		private String idFieldKey;
+		private String elementId;
+
+		public Entry(MApplicationElement object, String idFieldKey, String elementId) {
+			this.object = object;
+			this.idFieldKey = idFieldKey;
+			this.elementId = elementId;
+		}
+
+		@Override
+		public int compareTo(Entry o) {
+			return this.idFieldKey.compareTo(o.idFieldKey);
+		}
+	}
+
+	/**
+	 * @see org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage
+	 */
+	private static class JavaClass {
+		private IPackageFragment packageFragment;
+		private String name;
+	}
+
+}
\ No newline at end of file

From 2fd2a583c83da443722e5caa16c82d05bf11fa1c Mon Sep 17 00:00:00 2001
From: Klevis <klevis.ramo7@gmail.com>
Date: Mon, 27 Jan 2014 09:48:22 +0100
Subject: [PATCH 0687/1286] Bug 405439 - Extract into a fragment does not do
 command referencing correctly.

Change-Id: Ia6d61afcc6c49c46308845b8a7343fe489570e3b
Signed-off-by: Klevis <klevis.ramo7@gmail.com>
---
 .../model/BaseApplicationModelWizard.java     | 77 +++++++++++++++----
 .../model/ExtractContributionModelWizard.java | 62 +++++++++++++--
 2 files changed, 118 insertions(+), 21 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index 97febe37a4..8bcf8d86f7 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -10,7 +10,10 @@
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.model;
 
+
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.eclipse.core.resources.IContainer;
@@ -24,8 +27,12 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.fragment.MModelFragment;
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
+import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -51,7 +58,7 @@
 public abstract class BaseApplicationModelWizard extends Wizard implements INewWizard {
 	private NewModelFilePage page;
 	private ISelection selection;
-	
+
 	protected IWorkbench workbench;
 
 	/**
@@ -73,16 +80,16 @@ public void addPages() {
 	}
 
 	protected abstract NewModelFilePage createWizardPage(ISelection selection);
-	
+
 	public abstract String getDefaultFileName();
-	
+
 	@Override
 	public boolean performFinish() {
 		try {
 			// Remember the file.
 			//
 			final IFile modelFile = getModelFile();
-			
+
 			if( modelFile.exists() ) {
 				if( ! MessageDialog.openQuestion(getShell(), "File exists", "The file already exists. "
 						+ "Would you like to add the extracted node to this file?")) {
@@ -104,11 +111,11 @@ protected void execute(IProgressMonitor progressMonitor) {
 							// Get the URI of the model file.
 							//
 							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
-							
+
 							// Create a resource for this file.
 							//
 							Resource resource = resourceSet.createResource(fileURI);
-							
+
 							// If target file already exists, load its content
 							//
 							if (modelFile.exists()) {
@@ -127,12 +134,56 @@ protected void execute(IProgressMonitor progressMonitor) {
 									//and copy multiple attributes 'imports' and 'fragments' objects from source to target
 									MModelFragments sourceFragments = (MModelFragments) rootObject;
 									MModelFragments targetFragments = (MModelFragments) resource.getContents().get(0);
-									for (MApplicationElement element : sourceFragments.getImports()) {
-										targetFragments.getImports().add((MApplicationElement) EcoreUtil.copy((EObject) element));
-									}
+
+
+									List<MCommand> listOfAllImportsFromElements=new ArrayList<MCommand>();
 									for (MModelFragment fragment : sourceFragments.getFragments()) {
+										List<MCommand> commandsToImport=new ArrayList<MCommand>();
+										EObject eObject=(EObject) fragment;
+										TreeIterator<EObject> eAllContents = eObject.eAllContents();
+										while(eAllContents.hasNext()){
+											EObject next = eAllContents.next();
+											MApplicationElement mApplicationElement=(MApplicationElement) next;
+											if(mApplicationElement instanceof MHandler){
+												MHandler mHandler=(MHandler)mApplicationElement;
+												MCommand command = mHandler.getCommand();
+												commandsToImport.add(command);
+												MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject)command);
+												targetFragments.getImports().add(copy);
+												mHandler.setCommand((MCommand) copy);
+											}
+											else if(mApplicationElement instanceof MHandledItem){
+												MHandledItem mHandledItem=(MHandledItem)mApplicationElement;
+												MCommand command = mHandledItem.getCommand();
+												commandsToImport.add(command);
+												MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject)command);
+												targetFragments.getImports().add(copy);
+												mHandledItem.setCommand((MCommand) copy);
+											}
+
+										}
+										listOfAllImportsFromElements.addAll(commandsToImport);
 										targetFragments.getFragments().add((MModelFragment) EcoreUtil.copy((EObject) fragment));
+
 									}
+									for (MApplicationElement element : sourceFragments.getImports()) {
+										boolean isAlreadyImport=true;
+					  					for (MCommand mCommand : listOfAllImportsFromElements) {
+
+											if(!mCommand.getElementId().equals(element.getElementId())){
+
+											    isAlreadyImport=false;
+												break;
+											}
+											if(!isAlreadyImport){
+
+												targetFragments.getImports().add((MApplicationElement) EcoreUtil.copy((EObject)element));
+											}
+
+										}
+
+									}
+
 								}
 							}
 
@@ -172,7 +223,7 @@ public void run() {
 			try {
 				page.openEditor
 					(new FileEditorInput(modelFile),
-					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
 			}
 			catch (PartInitException exception) {
 				MessageDialog.openError(workbenchWindow.getShell(), "Could not init editor", exception.getMessage()); //$NON-NLS-1$
@@ -187,7 +238,7 @@ public void run() {
 			return false;
 		}
 	}
-	
+
 	protected abstract EObject createInitialModel();
 
 	protected IFile getModelFile() throws CoreException {
@@ -202,7 +253,7 @@ protected IFile getModelFile() throws CoreException {
 		IContainer container = (IContainer) resource;
 		return container.getFile(new Path(fileName));
 	}
-	
+
 	private void throwCoreException(String message) throws CoreException {
 		IStatus status = new Status(IStatus.ERROR,
 				"org.eclipse.e4.tools.emf.editor3x", IStatus.OK, message, null);
@@ -212,7 +263,7 @@ private void throwCoreException(String message) throws CoreException {
 	/**
 	 * We will accept the selection in the workbench to see if we can initialize
 	 * from it.
-	 * 
+	 *
 	 * @see IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
 	 */
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
index b20e70fdf0..2f9a89d675 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
@@ -10,14 +10,20 @@
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.model;
 
+
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
+import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.jface.viewers.ISelection;
@@ -33,36 +39,76 @@ public ExtractContributionModelWizard(MApplicationElement oe){
 		super();
 		oes.add(oe);
 	}
-	
+
 	public ExtractContributionModelWizard(List<MApplicationElement> oes){
 		this.oes.addAll(oes);
 	}
-	
+
 	public ExtractContributionModelWizard(){
 		super();
 	}
-	
+
 	@Override
 	public String getDefaultFileName() {
 		return "fragment.e4xmi";
 	}
-	
+	HashMap<String, MCommand> importCommands=new HashMap<String, MCommand>();
+    public void resolveCommandImports(MApplicationElement moe,MModelFragments mModelFragments){
+    	if (moe instanceof MHandler) {
+
+    		MHandler mhandler = (MHandler) moe;
+    		MCommand command = ((MHandler) moe).getCommand();
+    		MCommand existImportCommand = importCommands.get(command.getElementId());
+    		if(existImportCommand==null){
+    			MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject)command);
+    			mhandler.setCommand((MCommand) copy);
+    			importCommands.put(copy.getElementId(), (MCommand) copy);
+				mModelFragments.getImports().add(copy);
+    		}else{
+    			mhandler.setCommand(existImportCommand);
+    		}
+    	}else if(moe instanceof MHandledItem){
+    		MHandledItem mh=(MHandledItem) moe;
+    		MCommand command = mh.getCommand();
+    		MCommand existImportCommand = importCommands.get(command.getElementId());
+    		if(existImportCommand==null){
+    			MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject)command);
+    			mh.setCommand((MCommand) copy);
+    			importCommands.put(copy.getElementId(), command);
+    			mModelFragments.getImports().add(copy);
+    		}else{
+    			mh.setCommand(existImportCommand);
+    		}
+    	}
+    }
+
 	@Override
 	protected EObject createInitialModel() {
 		MModelFragments createModelFragments = MFragmentFactory.INSTANCE.createModelFragments();
 		for (MApplicationElement moe : oes) {
-	    MStringModelFragment createStringModelFragment = MFragmentFactory.INSTANCE.createStringModelFragment();	
+		EObject eObject=(EObject) moe;
+		TreeIterator<EObject> eAllContents = eObject.eAllContents();
+		boolean hasNext = eAllContents.hasNext();
+		if(!hasNext){
+			resolveCommandImports(moe, createModelFragments);
+		}
+		while(hasNext){
+			MApplicationElement next=(MApplicationElement) eAllContents.next();
+			resolveCommandImports(next, createModelFragments);
+			hasNext=eAllContents.hasNext();
+		}
+	    MStringModelFragment createStringModelFragment = MFragmentFactory.INSTANCE.createStringModelFragment();
 		MApplicationElement e = (MApplicationElement) EcoreUtil.copy((EObject) moe);
 		String featurename = ((EObject) moe).eContainmentFeature().getName();
 		createStringModelFragment.setParentElementId(((MApplicationElement) ((EObject) moe).eContainer()).getElementId());
 		createStringModelFragment.getElements().add(e);
 		createStringModelFragment.setFeaturename(featurename);
-		
+
 		createModelFragments.getFragments().add(createStringModelFragment);
 		}
 		return (EObject)createModelFragments;
 	}
-	
+
 	public void setup(IProject project){
 		this.init(PlatformUI.getWorkbench(),new StructuredSelection(project));
 	}
@@ -70,5 +116,5 @@ public void setup(IProject project){
 	protected NewModelFilePage createWizardPage(ISelection selection) {
 		return new NewModelFilePage(selection,getDefaultFileName());
 	}
-	
+
 }
\ No newline at end of file

From cfc32481dff51f35055dc5dba393553e85d0ae59 Mon Sep 17 00:00:00 2001
From: Leo Denault <ldena023@uottawa.ca>
Date: Fri, 7 Feb 2014 16:18:34 -0800
Subject: [PATCH 0688/1286] Bug 426397 - Provide an eclipse editor based on
 OrionEditorControl

Added OrionEditor.java.

Change-Id: Iae0cff275a7782817d4eb94dbe9cba369cb7570f
Signed-off-by: Leo Denault <ldena023@uottawa.ca>

From 82e286944e355d6570b11576b31f8645d30fc181 Mon Sep 17 00:00:00 2001
From: Leo Denault <ldena023@uottawa.ca>
Date: Sat, 8 Feb 2014 13:43:15 -0800
Subject: [PATCH 0689/1286] Bug 426397 - Provide an eclipse editor based on
 OrionEditorControl

Implemented test and set up plugin properties.

Change-Id: I7e28065062006143f6a979f3f2a93807416cf7f4
Signed-off-by: Leo Denault <ldena023@uottawa.ca>

From fdf6837815d00fe323e489fb17c9e8a9690a783e Mon Sep 17 00:00:00 2001
From: Leo Denault <ldena023@uottawa.ca>
Date: Sun, 9 Feb 2014 10:51:40 -0800
Subject: [PATCH 0690/1286] Bug 426397 - Provide an eclipse editor based on
 OrionEditorControl

Inserted the OrionEditControl into the editor. The control
opens into the Orion Editor when opening a CSS file.

Change-Id: I25f3d4c78fefb5a7ed2bfcbabfa4e84a3e952e1b
Signed-off-by: Leo Denault <ldena023@uottawa.ca>

From 6ec563bc04f8dd87e3c471d9b29acfa6bfb874d4 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Mon, 10 Feb 2014 13:30:58 +0100
Subject: [PATCH 0691/1286] Bug 427788 - Fix Live Model Editor keybinding in
 the IDE

Change-Id: I38c902e569774905622b0f4453aa36eb2b908481
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>

From 019322406c7fee3be488221a23da5d4a810b1c9b Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Mon, 10 Feb 2014 23:14:48 +0100
Subject: [PATCH 0692/1286] Bug 422543 - Putting the context explorer in e4
 tools

Initial commit

From fa842a58a0f44f3f53ecd9d1556ea37ca8bd58c8 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Tue, 11 Feb 2014 00:06:07 +0100
Subject: [PATCH 0693/1286] Bug 427852 - Fix build for context explorer

Added all build artifacts

From bf1258ed20a7f0f8e299c157522b4a0515900f83 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Tue, 11 Feb 2014 15:47:06 +0100
Subject: [PATCH 0694/1286] Bug 427852 - Fix build for context explorer

Fixed category for all features
Added Incubation to feature name
Added license-feature and license-feature-version attributes to feature

From 7476a178e9d521b47c4fff59638e57ef203ca318 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 13 Feb 2014 10:03:56 -0500
Subject: [PATCH 0695/1286] [CSS Spy] Add Shell parent helper info


From 4f62cceac5b9bf43d6a13dfdda346b1db3f8dd0c Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Thu, 13 Feb 2014 10:42:10 -0500
Subject: [PATCH 0696/1286] [CSS Spy] Add "Show CSS fragment" button to
 generate CSS snippet for the currently selected element based on its current
 property values.


From 5893abbec6ea5700d2464ba80a1370e14e72d2dc Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Thu, 13 Feb 2014 12:47:32 -0500
Subject: [PATCH 0697/1286] Bug 427852 - Fix build for context explorer

Updated feature license

From e4e0711e83c4076ecadfd3b7d2317b9a4d9262e1 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Thu, 13 Feb 2014 21:52:46 +0100
Subject: [PATCH 0698/1286] Bug 427852 - Fix build for context explorer

Typo in category

From 5d8f557f69a9f00756bba91e72e69b048889acb1 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Fri, 14 Feb 2014 00:59:50 +0100
Subject: [PATCH 0699/1286] Bug 428156 - Command name for Show Live Application
 model not easy to find

Change-Id: Ic4e89b243fdf0da87606f3101ee0305717d0249f
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>

From c7c328fd6293351409f1938da94891c239661234 Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Fri, 7 Feb 2014 15:38:59 +0100
Subject: [PATCH 0700/1286] Bug 422465 - Model elements horizontal extension
 possibility

Change-Id: I2e23e91d9ada7fe7a565ef1e8e7e7c934e79fbb2
Signed-off-by: Marco Descher <marco@descher.at>
---
 .../org.eclipse.e4.tools.emf.ui.editors.exsd  | 28 ++++++++-
 .../AbstractElementEditorContribution.java    | 58 +++++++++++++++++++
 .../component/AbstractComponentEditor.java    | 27 ++++++++-
 .../emf/ui/internal/common/ModelEditor.java   | 48 +++++++++++++--
 .../common/component/AddonsEditor.java        |  3 +
 .../common/component/ApplicationEditor.java   |  4 +-
 .../internal/common/component/AreaEditor.java |  3 +
 .../component/BindingContextEditor.java       |  2 +
 .../common/component/BindingTableEditor.java  |  5 +-
 .../common/component/CategoryEditor.java      |  3 +
 .../common/component/CommandEditor.java       |  2 +
 .../component/CommandParameterEditor.java     |  2 +
 .../component/CoreExpressionEditor.java       |  2 +
 .../DynamicMenuContributionEditor.java        |  3 +
 .../common/component/HandlerEditor.java       |  2 +
 .../common/component/KeyBindingEditor.java    |  2 +
 .../component/MenuContributionEditor.java     |  2 +
 .../internal/common/component/MenuEditor.java |  2 +
 .../common/component/MenuItemEditor.java      |  2 +
 .../common/component/MenuSeparatorEditor.java |  3 +
 .../common/component/ParameterEditor.java     |  2 +
 .../component/PartDescriptorEditor.java       |  2 +
 .../internal/common/component/PartEditor.java |  2 +
 .../component/PartSashContainerEditor.java    |  2 +
 .../common/component/PartStackEditor.java     |  3 +
 .../common/component/PerspectiveEditor.java   |  2 +
 .../component/PerspectiveStackEditor.java     |  3 +
 .../common/component/PlaceholderEditor.java   |  2 +
 .../common/component/StringModelFragment.java |  2 +
 .../component/ToolBarContributionEditor.java  |  3 +
 .../common/component/ToolBarEditor.java       |  3 +
 .../component/ToolBarSeparatorEditor.java     |  3 +
 .../common/component/ToolControlEditor.java   |  3 +
 .../common/component/ToolItemEditor.java      |  2 +
 .../common/component/TrimBarEditor.java       |  3 +
 .../component/TrimContributionEditor.java     |  3 +
 .../common/component/WindowEditor.java        |  2 +
 37 files changed, 234 insertions(+), 11 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd b/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
index a5b50e95f4..df0055ba69 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
+++ b/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
@@ -10,9 +10,10 @@
 &lt;br&gt;&lt;br&gt;
 This extension point allows three distinct extensions:
 &lt;ul&gt;
-&lt;li&gt;Definition of (virtual) element editors&lt;/LI&gt;
-&lt;li&gt;Contribution of model element creation assistants&lt;/LI&gt;
-&lt;li&gt;Contribution of features for reference by existing model elements&lt;/LI&gt;
+&lt;li&gt;Definition of (virtual) element editors&lt;/li&gt;
+&lt;li&gt;Contribution of model element creation assistants&lt;/li&gt;
+&lt;li&gt;Contribution of features for reference by existing model elements&lt;/li&gt;
+&lt;li&gt;Contribution of additional tabs to existing element editors&lt;/li&gt;
 &lt;/ul&gt;
       </documentation>
    </annotation>
@@ -29,6 +30,7 @@ This extension point allows three distinct extensions:
             <element ref="virtualeditor" minOccurs="0" maxOccurs="unbounded"/>
             <element ref="editorfeature" minOccurs="0" maxOccurs="unbounded"/>
             <element ref="contributionClassCreator" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="editorTab" minOccurs="1" maxOccurs="unbounded"/>
          </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>
@@ -153,6 +155,26 @@ This assistant will be called by the element editor when instantiating a new con
       </complexType>
    </element>
 
+   <element name="editorTab">
+      <annotation>
+         <documentation>
+            Register additional editor tabs to elements in the editor. For each contribution to this extension point, a respective tab item is shown for elements the contribution opts for.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="contribution" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Defines the types the editorTab is contributed to, the tab label to present and the contributed editor tab itself.
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn="org.eclipse.e4.tools.emf.ui.common.AbstractElementEditorContribution:"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
    <annotation>
       <appinfo>
          <meta.section type="since"/>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java
new file mode 100644
index 0000000000..3c2434e926
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2014 MEDEVIT, FHV and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Marco Descher <marco@descher.at> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.common;
+
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * This class is extended by plug-ins contributing to the
+ * <code>elementEditorTab</code> extension point.
+ */
+public abstract class AbstractElementEditorContribution {
+
+	/**
+	 * Filters the elements this extension point contribution is visible on. The
+	 * returned class will be compared using
+	 * {@link Class#isAssignableFrom(Class)}. So if for example an element of
+	 * type {@link MPart} is returned, it is only contributed to the part
+	 * editor. If {@link MUIElement} is returned, the contribution is presented
+	 * on all elements of this type.
+	 *
+	 * @return the class the contributed editor extension is assignable to
+	 */
+	public abstract Class<?> getContributableTo();
+
+	/**
+	 * @return the label to be shown in the {@link CTabItem} contributed
+	 */
+	public abstract String getTabLabel();
+
+	/**
+	 * @param parent
+	 *            the {@link Composite} within a {@link CTabItem} created for
+	 *            this contribution, added to the elements {@link CTabFolder}
+	 * @param context
+	 *            the data-binding context of the enclosing editor
+	 * @param master
+	 * @param editingDomain
+	 * @param project
+	 */
+	public abstract void createContributedEditorTab(Composite parent, EMFDataBindingContext context, WritableValue master, EditingDomain editingDomain, IProject project);
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 32868cf8d4..882dda6dba 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010-2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Marco Descher <marco@descher.at> - Bug 422465
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common.component;
 
@@ -15,8 +16,10 @@
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.services.translation.TranslationService;
+import org.eclipse.e4.tools.emf.ui.common.AbstractElementEditorContribution;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
@@ -28,12 +31,15 @@
 import org.eclipse.e4.tools.services.impl.ResourceBundleTranslationProvider;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.ScrolledComposite;
 import org.eclipse.swt.events.ControlAdapter;
 import org.eclipse.swt.events.ControlEvent;
@@ -65,6 +71,10 @@ public abstract class AbstractComponentEditor {
 	@Inject
 	protected IResourcePool resourcePool;
 
+	@Inject
+	@Optional
+	protected IProject project;
+
 	@Inject
 	@Translation
 	protected Messages Messages;
@@ -224,4 +234,19 @@ public void controlResized(ControlEvent e) {
 
 		return contentContainer;
 	}
+
+	protected void createContributedEditorTabs(CTabFolder folder, EMFDataBindingContext context, WritableValue master, Class<?> clazz) {
+		List<AbstractElementEditorContribution> contributionList = editor.getTabContributionsForClass(clazz);
+
+		for (AbstractElementEditorContribution eec : contributionList) {
+			CTabItem item = new CTabItem(folder, SWT.BORDER);
+			item.setText(eec.getTabLabel());
+
+			Composite parent = createScrollableContainer(folder);
+			item.setControl(parent.getParent());
+
+			eec.createContributedEditorTab(parent, context, master, getEditingDomain(), project);
+		}
+
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index ecc096ff8d..10516a0ee8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -8,11 +8,9 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Wim Jongman <wim.jongman@remainsoftware.com> - Maintenance
- *     Marco Descher <marco@descher.at> - Bug395982, Bug426653
+ *     Marco Descher <marco@descher.at> - Bug395982, 426653, 422465
  ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common;
-
-import java.util.ArrayList;
+package org.eclipse.e4.tools.emf.ui.internal.common;import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -45,6 +43,7 @@
 import org.eclipse.e4.core.di.extensions.Preference;
 import org.eclipse.e4.core.services.contributions.IContributionFactory;
 import org.eclipse.e4.core.services.translation.TranslationService;
+import org.eclipse.e4.tools.emf.ui.common.AbstractElementEditorContribution;
 import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.IEditorDescriptor;
@@ -235,6 +234,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.TreeItem;
+;
 
 public class ModelEditor {
 	private static final String ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED = "org.eclipse.e4.tools.modeleditor.filteredtree.enabled.xmitab.disabled";
@@ -270,6 +270,7 @@ public class ModelEditor {
 
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private Map<String, AbstractComponentEditor> virtualEditors = new HashMap<String, AbstractComponentEditor>();
+	private Map<Class<?>, List<AbstractElementEditorContribution>> tabContributions = new HashMap<Class<?>, List<AbstractElementEditorContribution>>();
 	private List<FeaturePath> labelFeaturePaths = new ArrayList<FeaturePath>();
 	private List<IEditorFeature> editorFeatures = new ArrayList<IEditorFeature>();
 	private List<IContributionClassCreator> contributionCreator = new ArrayList<IContributionClassCreator>();
@@ -383,6 +384,7 @@ public void handleEvent(Event event) {
 
 		registerContributedEditors();
 		registerContributedVirtualEditors();
+		registerContributedEditorTabs();
 		loadContributionCreators();
 
 		fragment = modelProvider.getRoot().get(0) instanceof MModelFragments;
@@ -1173,6 +1175,44 @@ private void registerContributedEditors() {
 		}
 	}
 
+	private void registerContributedEditorTabs() {
+		IExtensionRegistry registry = RegistryFactory.getRegistry();
+		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
+		for (IConfigurationElement el : extPoint.getConfigurationElements()) {
+			if (!"editorTab".equals(el.getName())) { //$NON-NLS-1$
+				continue;
+			}
+
+			try {
+				final Object o = el.createExecutableExtension("contribution"); //$NON-NLS-1$
+				if (o instanceof AbstractElementEditorContribution) {
+					AbstractElementEditorContribution contribution = (AbstractElementEditorContribution) o;
+					ContextInjectionFactory.inject(contribution, context);
+					Class<?> contribElem = contribution.getContributableTo();
+					if (contribElem == null)
+						continue;
+					if (!tabContributions.containsKey(contribElem)) {
+						tabContributions.put(contribElem, new ArrayList<AbstractElementEditorContribution>());
+					}
+					List<AbstractElementEditorContribution> res = tabContributions.get(contribElem);
+					res.add(contribution);
+				}
+			} catch (CoreException e) {
+				// TODO Auto-generated catch block 1204
+				e.printStackTrace();
+			}
+		}
+	}
+
+	public List<AbstractElementEditorContribution> getTabContributionsForClass(Class<?> clazz) {
+		List<AbstractElementEditorContribution> ret = new ArrayList<AbstractElementEditorContribution>();
+		for (Class<?> clasz : tabContributions.keySet()) {
+			if (clasz.isAssignableFrom(clazz))
+				ret.addAll(tabContributions.get(clasz));
+		}
+		return ret;
+	}
+
 	private void registerDefaultEditors() {
 		System.err.println(getClass().getName() + ".registerDefaultEditors: " + resourcePool);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 4c393f776d..ac4f0668d3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -26,6 +26,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
+import org.eclipse.e4.ui.model.application.MAddon;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -209,6 +210,8 @@ public void widgetSelected(SelectionEvent e) {
 			createInstanceInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MAddon.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 77cb8eef95..28fac09a23 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -202,6 +202,8 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 			createUITreeInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MApplication.class);
+
 		folder.setSelection(0);
 
 		return folder;
@@ -781,4 +783,4 @@ public void update(ViewerCell cell) {
 			cell.setImage(img);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index f8a6aff910..30996811bf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -32,6 +32,7 @@
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
@@ -424,6 +425,8 @@ public void widgetSelected(SelectionEvent e) {
 			createUITreeInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MArea.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 10b5d11476..b500c24a7c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -285,6 +285,8 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
+		createContributedEditorTabs(folder, context, getMaster(), MBindingContext.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 2028bc69bd..ccd9a1db10 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.jface.window.Window;
-
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -48,6 +46,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -313,6 +312,8 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
+		createContributedEditorTabs(folder, context, getMaster(), MBindingTable.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index 31ddc93de4..2421c36fef 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -17,6 +17,7 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.ui.model.application.commands.MCategory;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -130,6 +131,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
+		createContributedEditorTabs(folder, context, getMaster(), MCategory.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 289ba0c821..8c49a7615f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -304,6 +304,8 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
+		createContributedEditorTabs(folder, context, getMaster(), MCommand.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 0422276e43..2610d5b0f9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -161,6 +161,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
+		createContributedEditorTabs(folder, context, getMaster(), MCommandParameter.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index bcca5a2b14..c1244db12b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -133,6 +133,8 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
+		createContributedEditorTabs(folder, context, getMaster(), MCoreExpression.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
index 3d56e4044d..3c16e3df6e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
@@ -30,6 +30,7 @@
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MDynamicMenuContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
@@ -202,6 +203,8 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MDynamicMenuContribution.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 97f961a843..8c5cff6b89 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -232,6 +232,8 @@ public void widgetSelected(SelectionEvent e) {
 
 		createInstanceInspection(folder);
 
+		createContributedEditorTabs(folder, context, getMaster(), MHandler.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index b713f67d6c..a0e5b815ad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -323,6 +323,8 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
+		createContributedEditorTabs(folder, context, getMaster(), MKeyBinding.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 98dabb4016..77c2d6d637 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -388,6 +388,8 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
+		createContributedEditorTabs(folder, context, getMaster(), MMenuContribution.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 48367539c7..adfc664c60 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -464,6 +464,8 @@ public String getText(Object element) {
 			createUITreeInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MMenu.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index ae5cd32f79..a718c52ec1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -318,6 +318,8 @@ public String getText(Object element) {
 			createUITreeInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MMenuItem.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 8b62447652..e2a277a303 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -22,6 +22,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuSeparator;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
@@ -144,6 +145,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			createUITreeInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MMenuSeparator.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index c5009a30a5..3d501ab4ee 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -137,6 +137,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
+		createContributedEditorTabs(folder, context, getMaster(), MParameter.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 4e35cc5912..6d39aadc6d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -318,6 +318,8 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
+		createContributedEditorTabs(folder, context, getMaster(), MPartDescriptor.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 36efe145dc..6881fd7ad7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -322,6 +322,8 @@ public void widgetSelected(SelectionEvent e) {
 			createUITreeInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MPart.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 384e67d1f7..780307d8ed 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -429,6 +429,8 @@ public void widgetSelected(SelectionEvent e) {
 			createUITreeInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MPartSashContainer.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 6d2fa6cb7c..3f9845db5a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -33,6 +33,7 @@
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MInputPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -372,6 +373,8 @@ public void widgetSelected(SelectionEvent e) {
 			createUITreeInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MPartStack.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 4dba3f1f8f..9a67928f05 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -273,6 +273,8 @@ public void widgetSelected(SelectionEvent e) {
 			createUITreeInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MPerspective.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index ea19e6b057..633f80e2df 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -31,6 +31,7 @@
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -310,6 +311,8 @@ public void widgetSelected(SelectionEvent e) {
 			createUITreeInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MPerspectiveStack.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index d74c25585a..3e8bda87d6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -246,6 +246,8 @@ public void widgetSelected(SelectionEvent e) {
 			createUITreeInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MPlaceholder.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index a911851535..b45b6f99b0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -340,6 +340,8 @@ public void widgetSelected(SelectionEvent e) {
 
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MStringModelFragment.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 2c16a0a93e..427d661111 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -30,6 +30,7 @@
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -360,6 +361,8 @@ public void widgetSelected(SelectionEvent e) {
 			createUITreeInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MToolBarContribution.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 8b77e1f39c..c8b0e93ec5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -26,6 +26,7 @@
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -331,6 +332,8 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
+		createContributedEditorTabs(folder, context, getMaster(), MToolBar.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 88fb6a5382..1837d42f9a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -23,6 +23,7 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBarSeparator;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
@@ -155,6 +156,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			createUITreeInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MToolBarSeparator.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index d25147beb8..08842e407a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -27,6 +27,7 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolControl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
@@ -193,6 +194,8 @@ public void widgetSelected(SelectionEvent e) {
 			createUITreeInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MToolControl.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 9c39153fe0..d9d84c2aee 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -155,6 +155,8 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 			createUITreeInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MToolItem.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 581610bf09..cde3d62130 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -32,6 +32,7 @@
 import org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.SideValue;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -341,6 +342,8 @@ public void widgetSelected(SelectionEvent e) {
 			createUITreeInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MTrimBar.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 5c56b50097..bcd3c52f12 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -30,6 +30,7 @@
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -324,6 +325,8 @@ public void widgetSelected(SelectionEvent e) {
 			createUITreeInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MTrimContribution.class);
+
 		folder.setSelection(0);
 
 		return folder;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 2eebda178e..c52c362514 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -300,6 +300,8 @@ public void widgetSelected(SelectionEvent e) {
 			createUITreeInspection(folder);
 		}
 
+		createContributedEditorTabs(folder, context, getMaster(), MWindow.class);
+
 		folder.setSelection(0);
 
 		return folder;

From b4c34508b2641a83d4a3ea186b5938d21c3fab4e Mon Sep 17 00:00:00 2001
From: Wojciech Sudol <wojciech.sudol@pl.ibm.com>
Date: Thu, 13 Feb 2014 17:16:17 +0100
Subject: [PATCH 0701/1286] Bug 428116 - Event Spy recreates default key
 binding after restart

Change-Id: I23cbb26a2ad4e1357dedb666d8c7059331195fc7
Signed-off-by: Wojciech Sudol <wojciech.sudol@pl.ibm.com>

From ec4b2b6cdf2b2ae084c82ef094b0d55fc253f52b Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Mon, 17 Feb 2014 15:56:22 +0100
Subject: [PATCH 0702/1286] Bug 425866 - Add README.md to the e4 tools projects

Change-Id: Id57b393d16720773ed43cb770fee8c95df7bea4b
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>

From 11838c1b7a01d0f6497c76dd551960b9e6b9de12 Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Wed, 19 Feb 2014 10:30:51 -0500
Subject: [PATCH 0703/1286] Update java editor save actions

Should format edited lines only, except for new plugins.

From 03374a36ef668d74a04d5c91597344f42ed8de79 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Fri, 21 Feb 2014 13:30:52 +0100
Subject: [PATCH 0704/1286] Bug 428728 - Invalid contributor URI for live
 editor set in ModelProcessor

Change-Id: I5bcc2b1aa31c904bad5fa45ffa3f527c83bd98b9
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>

From 1740f5e7235edd32e80aecf49723c6abcf847fb4 Mon Sep 17 00:00:00 2001
From: Leo Denault <ldena023@uottawa.ca>
Date: Fri, 14 Feb 2014 11:12:30 -0500
Subject: [PATCH 0705/1286] Bug 426397 - Provide an eclipse editor based on
 OrionEditorControl

Added ability for OrionEditor to load text from a CSS file.
Also added some test cases for isDirty().

Change-Id: I1f471821105b2c5510ead12bbb2b11034de5cc5a
Signed-off-by: Leo Denault <ldena023@uottawa.ca>

From 0b68bda10b6b2ee2bee005ba6877477a924532a3 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Mon, 17 Feb 2014 16:40:26 +0100
Subject: [PATCH 0706/1286] Bug 428360 - Switch e4 tools to Java 1.6

Change-Id: I19d1e14ae242897b0a4d53fb2373e4cb8df731e6
Signed-off-by: Sopot Cela <sopotcela@gmail.com>
---
 bundles/org.eclipse.e4.tools.compat/.classpath             | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                   | 7 +++----
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF   | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/.classpath       | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                   | 7 +++----
 .../org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/.classpath      | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                   | 7 +++----
 .../META-INF/MANIFEST.MF                                   | 2 +-
 bundles/org.eclipse.e4.tools/.classpath                    | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                   | 7 +++----
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF          | 2 +-
 12 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/.classpath b/bundles/org.eclipse.e4.tools.compat/.classpath
index 64c5e31b7a..ad32c83a78 100644
--- a/bundles/org.eclipse.e4.tools.compat/.classpath
+++ b/bundles/org.eclipse.e4.tools.compat/.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/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
index 4fe427185e..c537b63063 100644
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Mon May 31 09:52:05 CEST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+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/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 6cedfefcc5..4cfc62488b 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
 Bundle-Version: 0.12.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath b/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
index 64c5e31b7a..ad32c83a78 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.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/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
index df1b497b8a..c537b63063 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Sun Mar 14 13:37:58 CET 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+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/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index c4ae4d5f2d..56445da670 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
 Bundle-Version: 0.12.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.emf.common;bundle-version="2.6.0",
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.classpath b/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
index 64c5e31b7a..ad32c83a78 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.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/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
index 5a797383d3..c537b63063 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Sat Mar 06 23:33:15 EST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+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/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index 4da685d645..cfd280664f 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: e4 Templates
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
 Bundle-Version: 0.12.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
  org.eclipse.jface.text;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools/.classpath b/bundles/org.eclipse.e4.tools/.classpath
index 64c5e31b7a..ad32c83a78 100644
--- a/bundles/org.eclipse.e4.tools/.classpath
+++ b/bundles/org.eclipse.e4.tools/.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/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
index 259614444e..c537b63063 100644
--- a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Mon Jul 05 10:09:17 CEST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+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/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 3e253a8051..8ea9d1c856 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
 Bundle-Version: 0.12.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",

From ce8fbd47a6a8e95b48658a0644911338dafebba7 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Fri, 28 Feb 2014 11:45:25 +0100
Subject: [PATCH 0707/1286] Bug 429299 - React to removeal the MOpaque* and
 MRendered* model classes

Change-Id: Idd800281c8d370bb9bee6f2141a92284aeaa488d
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../e4/tools/emf/ui/internal/Messages.java    |  7 ----
 .../emf/ui/internal/common/ModelEditor.java   | 11 ++----
 .../common/component/RenderedMenuEditor.java  | 26 -------------
 .../common/component/RenderedMenuItem.java    | 39 -------------------
 .../component/RenderedToolBarEditor.java      | 26 -------------
 5 files changed, 4 insertions(+), 105 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 6e3d3ccd7e..8fc441e0b6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -357,13 +357,6 @@ public class Messages {
 	public String PopupMenuEditor_TreeLabel;
 	public String PopupMenuEditor_TreeLabelDescription;
 
-	public String RenderedMenuEditor_TreeLabel;
-
-	public String RenderedMenuItem_TreeLabel;
-	public String RenderedMenuItem_TreeLabelDescription;
-
-	public String RenderedToolBarEditor_TreeLabel;
-
 	public String ToolBarContributionEditor_TreeLabel;
 	public String ToolBarContributionEditor_TreeLabelDescription;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 10516a0ee8..f670d295d8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,7 +10,9 @@
  *     Wim Jongman <wim.jongman@remainsoftware.com> - Maintenance
  *     Marco Descher <marco@descher.at> - Bug395982, 426653, 422465
  ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common;import java.util.ArrayList;
+package org.eclipse.e4.tools.emf.ui.internal.common;
+
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -93,9 +95,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PerspectiveStackEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PlaceholderEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.PopupMenuEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.RenderedMenuEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.RenderedMenuItem;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.RenderedToolBarEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.StringModelFragment;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolBarContributionEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ToolBarEditor;
@@ -234,6 +233,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.TreeItem;
+
 ;
 
 public class ModelEditor {
@@ -1229,19 +1229,16 @@ private void registerDefaultEditors() {
 		registerEditor(CommandsPackageImpl.Literals.CATEGORY, ContextInjectionFactory.make(CategoryEditor.class, context));
 
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR, ContextInjectionFactory.make(ToolBarEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.RENDERED_TOOL_BAR, ContextInjectionFactory.make(RenderedToolBarEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, ContextInjectionFactory.make(DirectToolItemEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, ContextInjectionFactory.make(HandledToolItemEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, ContextInjectionFactory.make(ToolBarSeparatorEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.TOOL_CONTROL, ContextInjectionFactory.make(ToolControlEditor.class, context));
 
 		registerEditor(MenuPackageImpl.Literals.MENU, ContextInjectionFactory.make(MenuEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.RENDERED_MENU, ContextInjectionFactory.make(RenderedMenuEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.POPUP_MENU, ContextInjectionFactory.make(PopupMenuEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.MENU_SEPARATOR, ContextInjectionFactory.make(MenuSeparatorEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, ContextInjectionFactory.make(HandledMenuItemEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, ContextInjectionFactory.make(DirectMenuItemEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.RENDERED_MENU_ITEM, ContextInjectionFactory.make(RenderedMenuItem.class, context));
 		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION, ContextInjectionFactory.make(MenuContributionEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION, ContextInjectionFactory.make(ToolBarContributionEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION, ContextInjectionFactory.make(TrimContributionEditor.class, context));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java
deleted file mode 100644
index 8f9f2ae530..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuEditor.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.component;
-
-import javax.inject.Inject;
-
-public class RenderedMenuEditor extends MenuEditor {
-
-	@Inject
-	public RenderedMenuEditor() {
-		super();
-	}
-
-	@Override
-	public String getLabel(Object element) {
-		return Messages.RenderedMenuEditor_TreeLabel;
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java
deleted file mode 100644
index b0da74aaa7..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedMenuItem.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.component;
-
-import javax.inject.Inject;
-import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.swt.widgets.Composite;
-
-public class RenderedMenuItem extends MenuItemEditor {
-
-	@Inject
-	public RenderedMenuItem() {
-		super();
-	}
-
-	@Override
-	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-
-	}
-
-	@Override
-	public String getLabel(Object element) {
-		return Messages.RenderedMenuItem_TreeLabel;
-	}
-
-	@Override
-	public String getDescription(Object element) {
-		return Messages.RenderedMenuItem_TreeLabelDescription;
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java
deleted file mode 100644
index 04aa50ad6b..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/RenderedToolBarEditor.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.component;
-
-import javax.inject.Inject;
-
-public class RenderedToolBarEditor extends ToolBarEditor {
-
-	@Inject
-	public RenderedToolBarEditor() {
-		super();
-	}
-
-	@Override
-	public String getLabel(Object element) {
-		return Messages.RenderedToolBarEditor_TreeLabel;
-	}
-}

From 1d399d4d3efd4fe25cf03374f4615b97c8127d5a Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Wed, 5 Feb 2014 13:28:44 +0100
Subject: [PATCH 0708/1286] Bug 426352 - Remove import package statement for
 javax.annotation after Eclipse 4.4. M5

Change-Id: Ief40c8e352b86f77375dec90441ec6ea2078f8ea
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../e4/internal/tools/wizards/project/E4NewProjectWizard.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index d976b6a0e0..99e03629e6 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -765,7 +765,7 @@ public boolean performFinish(IProject project, IPluginModelBase model,
 		}
 
 		public String[] getImportPackages() {
-			return new String[] { "javax.annotation;version=\"1.0.0\"" };
+			return new String[] { };
 		}
 
 		@Override

From 4881a51dd8179f1e8e67f41ec7015142587c7b65 Mon Sep 17 00:00:00 2001
From: Sopot Cela <sopotcela@gmail.com>
Date: Mon, 3 Mar 2014 13:41:40 +0100
Subject: [PATCH 0709/1286] Bug 429448 - PartSashContainer Controls box is
 empty

Change-Id: Iff91e1609ad5205c9c389ccbb6d34aa97dcace17
Signed-off-by: Sopot Cela <sopotcela@gmail.com>
---
 .../component/PartSashContainerEditor.java    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 780307d8ed..7141d900af 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -149,13 +149,13 @@ public void run() {
 		}
 
 		// --- Import Actions ---
-		actionsImport.add(new Action("Views", createImageDescriptor(ResourceProvider.IMG_Part)) {
+		actionsImport.add(new Action("Views", createImageDescriptor(ResourceProvider.IMG_Part)) { //$NON-NLS-1$
 			@Override
 			public void run() {
 				handleImportChild(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_VIEW);
 			}
 		});
-		actionsImport.add(new Action("Editors", createImageDescriptor(ResourceProvider.IMG_Part)) {
+		actionsImport.add(new Action("Editors", createImageDescriptor(ResourceProvider.IMG_Part)) { //$NON-NLS-1$
 			@Override
 			public void run() {
 				handleImportChild(BasicPackageImpl.Literals.INPUT_PART, RegistryUtil.HINT_EDITOR);
@@ -302,19 +302,19 @@ public String getText(Object element) {
 			childrenDropDown.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
-					EClass eclass = (EClass) element;
-					return eclass.getName();
+					FeatureClass eFeatureClass = (FeatureClass) element;
+					return eFeatureClass.eClass.getName();
 				}
 			});
 			List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
-			eClassList.add(new FeatureClass("PartSashContainer", BasicPackageImpl.Literals.PART_SASH_CONTAINER));
-			eClassList.add(new FeatureClass("PartStack", BasicPackageImpl.Literals.PART_STACK));
-			eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART));
-			eClassList.add(new FeatureClass("InputPart", BasicPackageImpl.Literals.INPUT_PART));
-			eClassList.add(new FeatureClass("Area", AdvancedPackageImpl.Literals.AREA));
-			eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER));
+			eClassList.add(new FeatureClass("PartSashContainer", BasicPackageImpl.Literals.PART_SASH_CONTAINER)); //$NON-NLS-1$
+			eClassList.add(new FeatureClass("PartStack", BasicPackageImpl.Literals.PART_STACK)); //$NON-NLS-1$
+			eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART)); //$NON-NLS-1$
+			eClassList.add(new FeatureClass("InputPart", BasicPackageImpl.Literals.INPUT_PART)); //$NON-NLS-1$
+			eClassList.add(new FeatureClass("Area", AdvancedPackageImpl.Literals.AREA)); //$NON-NLS-1$
+			eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER)); //$NON-NLS-1$
 			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_SASH_CONTAINER, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
-
+			childrenDropDown.setInput(eClassList);
 			childrenDropDown.setSelection(new StructuredSelection(eClassList.get(0)));
 
 			Button b = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);

From d6bd188b7951ebe71043d0f02d9ff5503606c28a Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Mon, 3 Mar 2014 15:52:30 +0100
Subject: [PATCH 0710/1286] Bug 428895 - Adding a processor for the new context
 spy

Change-Id: I5fc13064022c97823811b9629ea7e187db4b66b2
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>

From 23d1c0524a1f8ce57cf3fe1fe2bfef27556eab34 Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Mon, 3 Mar 2014 14:21:12 -0500
Subject: [PATCH 0711/1286] Bug 420394 - OrionEditorControl throws exception
 when restoring preference defaults

The notification should wrap the callback to the java function.

From cf0d91c9eb0f4a53e09e17bda4b00549add1bb63 Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Mon, 3 Mar 2014 14:23:27 -0500
Subject: [PATCH 0712/1286] Remove syserr


From 5508bfd616fa775071d00d659d700d63c7252a1c Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Wed, 5 Mar 2014 10:05:49 +0100
Subject: [PATCH 0713/1286] Bug 425866 - Add README.md to the e4 tools projects

Change-Id: If49b63d9ed333769bb12ec261210662e77df6073
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 bundles/org.eclipse.e4.tools/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools/README.md

diff --git a/bundles/org.eclipse.e4.tools/README.md b/bundles/org.eclipse.e4.tools/README.md
new file mode 100644
index 0000000000..6a7e7a0dc3
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/README.md
@@ -0,0 +1,14 @@
+org.eclipse.e4.tools
+====================
+
+Provides the e4 wizards for new Eclipse 4 RCP applications, e4 based classses, application models and model fragments.
+
+For more information, refer to the [Eclipse e4 wiki page] [1].
+
+License
+-------
+
+[Eclipse Public License (EPL) v1.0][2]
+
+[1]: http://www.eclipse.org/e4/
+[2]: http://wiki.eclipse.org/EPL

From c3936009008471e4f9feceb13ddac1460e369a0d Mon Sep 17 00:00:00 2001
From: Leo Denault <ldena023@uottawa.ca>
Date: Wed, 19 Feb 2014 11:17:10 -0500
Subject: [PATCH 0714/1286] Bug 426397 - Provide an eclipse editor based on
 OrionEditorControl

Implemented save feature.

Change-Id: I43f2aead89a9cd011a52bab8617ab12128fc274d
Signed-off-by: Leo Denault <ldena023@uottawa.ca>

From 9bbe402bcce3c7fb08a0c37a888d3d980153fda1 Mon Sep 17 00:00:00 2001
From: "D. Spiridenok" <spiridenok@tut.by>
Date: Thu, 6 Mar 2014 21:21:04 +0100
Subject: [PATCH 0715/1286] Bug 429776 - In the Application Model Editor move
 ToolBar property of a Part close to other check boxes

Change-Id: Icb2b75f98b9ad7fbc3fc3c683edc600be10c59a3
Signed-off-by: D. Spiridenok <spiridenok@tut.by>
---
 .../emf/ui/internal/common/component/PartEditor.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 6881fd7ad7..07dfb8fe20 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2012 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -274,6 +274,10 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		// ------------------------------------------------------------
+		ControlFactory.createTextField(parent, Messages.PartEditor_ContainerData, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
+
+		createSubformElements(parent, context, master);
+
 		{
 			Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_ToolBar);
@@ -294,10 +298,6 @@ public void widgetSelected(SelectionEvent e) {
 			createRemoveToolBar.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 		}
 
-		ControlFactory.createTextField(parent, Messages.PartEditor_ContainerData, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
-
-		createSubformElements(parent, context, master);
-
 		ControlFactory.createCheckBox(parent, Messages.PartEditor_Closeable, Messages.PartEditor_Closeable_Tooltip, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART__CLOSEABLE));
 
 		// ------------------------------------------------------------
@@ -438,4 +438,4 @@ public String getDetailLabel(Object element) {
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
-}
+}
\ No newline at end of file

From f088ee67f81236029516e4dc19493a8107db33f7 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Fri, 7 Mar 2014 21:59:45 +0100
Subject: [PATCH 0716/1286] Bug 429854 - Stacktrace at start when
 org.eclipse.e4.tools.context.spy (0.10.v20140303-1452) is included

Occured when no binding table nor context is present in model. In this
case, the created binding context should be created but not added in
application.

Change-Id: I8074fda2f52229ae611624ea78b42bd5fb591b94
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>

From 22b5cf850c2e0f39ce15caad14bb7e75af42a36e Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Fri, 7 Mar 2014 21:56:41 +0100
Subject: [PATCH 0717/1286] Bug 421453 - Code cleanup in the e4 tools projects

Change-Id: I025933fc009528f1f5ad468d94ba5f4993d9e1ec
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../compat/internal/ClipboardServiceImpl.java |  7 ++-
 .../internal/ContextServiceFactory.java       | 45 ++++++++++--------
 .../internal/DefaultLoggerProvider.java       |  1 +
 .../e4/tools/compat/internal/PartHelper.java  |  4 ++
 .../ReflectionContributionFactory.java        |  3 ++
 .../SelectionProviderContextFunction.java     |  6 ++-
 .../e4/tools/compat/parts/DIEditorPart.java   | 10 ++--
 .../e4/tools/compat/parts/DIHandler.java      |  5 +-
 .../compat/parts/DISaveableViewPart.java      | 22 +++++----
 .../e4/tools/emf/ui/common/EStackLayout.java  | 47 -------------------
 .../emf/ui/internal/common/ModelEditor.java   | 42 ++++-------------
 .../common/component/AddonsEditor.java        |  9 ++--
 .../common/component/ApplicationEditor.java   |  3 +-
 .../internal/common/component/AreaEditor.java |  9 ++--
 .../component/BindingContextEditor.java       |  9 ++--
 .../common/component/BindingTableEditor.java  |  9 ++--
 .../common/component/CategoryEditor.java      |  9 ++--
 .../common/component/CommandEditor.java       | 11 +++--
 .../component/CommandParameterEditor.java     |  9 ++--
 .../DynamicMenuContributionEditor.java        |  9 ++--
 .../common/component/HandlerEditor.java       |  9 ++--
 .../common/component/KeyBindingEditor.java    | 11 +++--
 .../component/MenuContributionEditor.java     |  9 ++--
 .../internal/common/component/MenuEditor.java |  9 ++--
 .../common/component/MenuItemEditor.java      |  9 ++--
 .../common/component/MenuSeparatorEditor.java |  9 ++--
 .../common/component/ParameterEditor.java     |  9 ++--
 .../component/PartDescriptorEditor.java       |  6 +--
 .../internal/common/component/PartEditor.java |  6 +--
 .../component/PartSashContainerEditor.java    |  6 +--
 .../common/component/PartStackEditor.java     |  3 +-
 .../common/component/PerspectiveEditor.java   |  6 +--
 .../component/PerspectiveStackEditor.java     |  6 +--
 .../common/component/PlaceholderEditor.java   |  6 +--
 .../component/ToolBarContributionEditor.java  | 11 +++--
 .../common/component/ToolBarEditor.java       |  9 ++--
 .../component/ToolBarSeparatorEditor.java     |  9 ++--
 .../common/component/ToolControlEditor.java   |  9 ++--
 .../common/component/ToolItemEditor.java      |  9 ++--
 .../common/component/TrimBarEditor.java       |  9 ++--
 .../component/TrimContributionEditor.java     | 11 +++--
 .../common/component/WindowEditor.java        |  9 ++--
 .../CommandCategorySelectionDialog.java       |  3 +-
 .../properties/ExternalizeStringHandler.java  |  3 +-
 44 files changed, 217 insertions(+), 238 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/EStackLayout.java

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
index bd163fe044..7a22431eca 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.internal;
 
@@ -14,23 +15,27 @@
 
 public class ClipboardServiceImpl implements IClipboardService {
 	private Handler handler;
-	
+
+	@Override
 	public void copy() {
 		if( handler != null ) {
 			handler.copy();
 		}
 	}
 
+	@Override
 	public void paste() {
 		if( handler != null ) {
 			handler.paste();
 		}
 	}
 
+	@Override
 	public void setHandler(Handler handler) {
 		this.handler = handler;
 	}
 
+	@Override
 	public void cut() {
 		this.handler.cut();
 	}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index e7b2ccb76b..11f4440830 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.internal;
 
@@ -49,14 +50,14 @@ public Object create(@SuppressWarnings("rawtypes") Class serviceInterface, IServ
 		if( ! IEclipseContext.class.equals(serviceInterface) ) {
 			return null;
 		}
-		
-		
+
+
 		IWorkbenchLocationService wls = (IWorkbenchLocationService) locator.getService(IWorkbenchLocationService.class);
 		final IWorkbenchWindow window = wls.getWorkbenchWindow();
 		final IWorkbenchPartSite site = wls.getPartSite();
 
 		Object o = parentLocator.getService(serviceInterface);
-		
+
 		// This happens when we run in plain 3.x
 		// We need to create a parent service context
 		if( window == null && site == null ) {
@@ -64,55 +65,60 @@ public Object create(@SuppressWarnings("rawtypes") Class serviceInterface, IServ
 			BundleContext bundleContext = bundle.getBundleContext();
 			IEclipseContext serviceContext = EclipseContextFactory.getServiceContext(bundleContext);
 
-			
+
 			final IEclipseContext appContext = serviceContext.createChild("WorkbenchContext"); //$NON-NLS-1$
 			appContext.set(Display.class, Display.getCurrent());
 			appContext.set(Logger.class, new WorkbenchLogger());
 			appContext.set(IClipboardService.class, new ClipboardServiceImpl());
 			appContext.set(Realm.class, Realm.getDefault());
-			
+
 			final Display d = Display.getCurrent();
 			appContext.set(UISynchronize.class, new UISynchronize() {
-				
+
 				@Override
 				public void syncExec(Runnable runnable) {
 					d.syncExec(runnable);
 				}
-				
+
 				@Override
 				public void asyncExec(Runnable runnable) {
 					d.asyncExec(runnable);
 				}
 			});
-			
+
 			IContributionFactory contributionFactory = ContextInjectionFactory.make(ReflectionContributionFactory.class, appContext);
 			appContext.set(IContributionFactory.class.getName(),contributionFactory);
-			
+
 			IThemeManager manager = serviceContext.get(IThemeManager.class);
 			final IThemeEngine engine = manager.getEngineForDisplay(Display.getCurrent());
 			appContext.set(IThemeEngine.class, engine);
-			
+
 			appContext.set(IStylingEngine.class, new IStylingEngine() {
-				
+
+				@Override
 				public void setClassname(Object widget, String classname) {
 					((Widget) widget).setData(
 							"org.eclipse.e4.ui.css.CssClassName", classname); //$NON-NLS-1$
 					engine.applyStyles(widget, true);
 				}
 
+				@Override
 				public void setId(Object widget, String id) {
 					((Widget) widget).setData("org.eclipse.e4.ui.css.id", id); //$NON-NLS-1$
 					engine.applyStyles(widget, true);
 				}
 
+				@Override
 				public void style(Object widget) {
 					engine.applyStyles(widget, true);
 				}
 
+				@Override
 				public CSSStyleDeclaration getStyle(Object widget) {
 					return engine.getStyle(widget);
 				}
 
+				@Override
 				public void setClassnameAndId(Object widget, String classname,
 						String id) {
 					((Widget) widget).setData(
@@ -121,28 +127,29 @@ public void setClassnameAndId(Object widget, String classname,
 					engine.applyStyles(widget, true);
 				}
 			});
-			
+
 			if( appContext.get(ILoggerProvider.class) == null ) {
 				appContext.set(ILoggerProvider.class, ContextInjectionFactory.make(DefaultLoggerProvider.class, appContext));
 			}
-			
+
 			return appContext;
 		} else if( o != null && site == null ) {
 			final IEclipseContext windowContext = ((IEclipseContext)o).createChild("WindowContext("+window+")");
 			windowContext.set(ISelectionService.class, window.getSelectionService());
-			
+
 			windowContext.declareModifiable(IServiceConstants.ACTIVE_SELECTION);
 			window.getSelectionService().addSelectionListener(new ISelectionListener() {
-				
+
+				@Override
 				public void selectionChanged(IWorkbenchPart part, ISelection selection) {
 					if( ! selection.isEmpty() ) {
 						if( selection instanceof IStructuredSelection ) {
 							IStructuredSelection s = (IStructuredSelection) selection;
 							if( s.size() == 1 ) {
-								windowContext.set(IServiceConstants.ACTIVE_SELECTION, s.getFirstElement());	
+								windowContext.set(IServiceConstants.ACTIVE_SELECTION, s.getFirstElement());
 							} else {
 								windowContext.set(IServiceConstants.ACTIVE_SELECTION, s.toList());
-							}	
+							}
 						} else {
 							windowContext.set(IServiceConstants.ACTIVE_SELECTION, selection);
 						}
@@ -151,7 +158,7 @@ public void selectionChanged(IWorkbenchPart part, ISelection selection) {
 			});
 			return windowContext;
 		}
-		
+
 		return o;
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
index 5f0a7a6b42..ea751895c0 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
@@ -12,6 +12,7 @@ public class DefaultLoggerProvider implements ILoggerProvider {
 	@Inject
 	private IEclipseContext context;
 
+	@Override
 	public Logger getClassLogger(Class<?> clazz) {
 		IEclipseContext childContext = context.createChild();
 		childContext.set("logger.bundlename", FrameworkUtil.getBundle(clazz).getSymbolicName()); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
index 2bc16f47f9..d752045cc1 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
@@ -85,6 +85,7 @@ static class SelectionProviderImpl implements ISelectionProvider {
 		
 		private ListenerList listeners = new ListenerList();
 		
+		@Override
 		public void setSelection(ISelection selection) {
 			currentSelection = selection;
 			SelectionChangedEvent evt = new SelectionChangedEvent(this, selection);
@@ -94,15 +95,18 @@ public void setSelection(ISelection selection) {
 			}
 		}
 				
+		@Override
 		public void removeSelectionChangedListener(
 				ISelectionChangedListener listener) {
 			listeners.remove(listener);
 		}
 		
+		@Override
 		public ISelection getSelection() {
 			return currentSelection;
 		}
 		
+		@Override
 		public void addSelectionChangedListener(ISelectionChangedListener listener) {
 			listeners.add(listener);
 		}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
index ea7e640e5d..fc626d064f 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
@@ -48,10 +48,12 @@ public ReflectionContributionFactory(IExtensionRegistry registry) {
 		processLanguages();
 	}
 
+	@Override
 	public Object create(String uriString, IEclipseContext context, IEclipseContext staticContext) {
 		return doCreate(uriString, context, staticContext);
 	}
 
+	@Override
 	public Object create(String uriString, IEclipseContext context) {
 		return doCreate(uriString, context, null);
 	}
@@ -153,6 +155,7 @@ protected Bundle getBundle(URI platformURI) {
 		return getBundleForName(platformURI.authority());
 	}
 
+	@Override
 	public Bundle getBundle(String uriString) {
 		return getBundle(new URI(uriString));
 	}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/SelectionProviderContextFunction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/SelectionProviderContextFunction.java
index b77ed466b2..1cbc46373e 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/SelectionProviderContextFunction.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/SelectionProviderContextFunction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.internal;
 
@@ -24,9 +25,10 @@ public class SelectionProviderContextFunction extends ContextFunction {
 	@Override
 	public Object compute(final IEclipseContext context) {
 		return new ISelectionProviderService() {
+			@Override
 			public void setSelection(Object selection) {
 				ISelectionProvider pv = context.get(ISelectionProvider.class);
-				
+
 				if( selection == null ) {
 					pv.setSelection(StructuredSelection.EMPTY);
 				} else if (selection instanceof ISelection) {
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index c7053dd91b..ca4a7b3bc5 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Jonas Helming <jhelming@eclipsesource.com>
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.parts;
 
@@ -35,9 +36,9 @@
  * This class provides an adapter enabling to plug editors, which are
  * implemented following the e4 programming model into a 3.x workbench. This
  * class is supposed to be sub classed by clients.
- * 
+ *
  * @author Jonas
- * 
+ *
  * @param <C>
  */
 public abstract class DIEditorPart<C> extends EditorPart implements
@@ -129,6 +130,7 @@ protected void makeActions() {
 		}
 	}
 
+	@Override
 	public void setDirtyState(boolean dirtyState) {
 		if (dirtyState != this.dirtyState) {
 			this.dirtyState = dirtyState;
@@ -153,5 +155,5 @@ public void dispose() {
 		super.dispose();
 	}
 
-	
+
 }
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
index 1bb218385f..760a8dce80 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 EclipseSource München GmbH and others.
+ * Copyright (c) 2012 EclipseSource M�nchen GmbH and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -43,7 +43,8 @@ private static IEclipseContext getParentContext() {
 		return (IEclipseContext) PlatformUI.getWorkbench().getService(
 				IEclipseContext.class);
 	}
-
+	
+	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		return ContextInjectionFactory.invoke(component, Execute.class,
 				getActiveContext());
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
index b3e591c033..ded22cb6d1 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.parts;
 
@@ -21,32 +22,37 @@
 
 public abstract class DISaveableViewPart<C> extends DIViewPart<C> implements ISaveablePart2, IDirtyProviderService {
 	private boolean dirtyState;
-	
+
 	public DISaveableViewPart(Class<C> clazz) {
 		super(clazz);
 	}
-	
+
+	@Override
 	public void doSave(IProgressMonitor monitor) {
 		IEclipseContext saveContext = getContext().createChild();
 		ContextInjectionFactory.invoke(getComponent(), Persist.class, saveContext);
 		saveContext.dispose();
 	}
-	
+
+	@Override
 	public void doSaveAs() {
-		
+
 	}
 
+	@Override
 	public boolean isSaveAsAllowed() {
 		return false;
 	}
 
+	@Override
 	public void setDirtyState(boolean dirtyState) {
 		if( dirtyState != this.dirtyState ) {
 			this.dirtyState = dirtyState;
 			firePropertyChange(PROP_DIRTY);
 		}
 	}
-	
+
+	@Override
 	public boolean isDirty() {
 		return dirtyState;
 	}
@@ -54,8 +60,8 @@ public boolean isDirty() {
 	@Override
 	public void init(IViewSite site) throws PartInitException {
 		super.init(site);
-		
+
 		getContext().declareModifiable(IDirtyProviderService.class);
 		getContext().set(IDirtyProviderService.class, this);
-	}	
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/EStackLayout.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/EStackLayout.java
deleted file mode 100644
index f416113015..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/EStackLayout.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.common;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-
-public class EStackLayout extends StackLayout {
-	private boolean onlyVisible;
-
-	public EStackLayout() {
-		this(true);
-	}
-
-	public EStackLayout(boolean onlyVisible) {
-		this.onlyVisible = onlyVisible;
-	}
-
-	@Override
-	protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) {
-		if (topControl != null && onlyVisible) {
-			int maxWidth = 0;
-			int maxHeight = 0;
-			Point size = topControl.computeSize(wHint, hHint, flushCache);
-			maxWidth = Math.max(size.x, maxWidth);
-			maxHeight = Math.max(size.y, maxHeight);
-			int width = maxWidth + 2 * marginWidth;
-			int height = maxHeight + 2 * marginHeight;
-			if (wHint != SWT.DEFAULT)
-				width = wHint;
-			if (hHint != SWT.DEFAULT)
-				height = hHint;
-			return new Point(width, height);
-		}
-		return super.computeSize(composite, wHint, hHint, flushCache);
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index f670d295d8..a64d5f2242 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -9,6 +9,7 @@
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Wim Jongman <wim.jongman@remainsoftware.com> - Maintenance
  *     Marco Descher <marco@descher.at> - Bug395982, 426653, 422465
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
@@ -46,7 +47,6 @@
 import org.eclipse.e4.core.services.contributions.IContributionFactory;
 import org.eclipse.e4.core.services.translation.TranslationService;
 import org.eclipse.e4.tools.emf.ui.common.AbstractElementEditorContribution;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.IEditorDescriptor;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature;
@@ -209,6 +209,7 @@
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.dnd.Clipboard;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DragSourceAdapter;
@@ -234,10 +235,8 @@
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.TreeItem;
 
-;
-
 public class ModelEditor {
-	private static final String ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED = "org.eclipse.e4.tools.modeleditor.filteredtree.enabled.xmitab.disabled";
+	private static final String ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED = "org.eclipse.e4.tools.modeleditor.filteredtree.enabled.xmitab.disabled";//$NON-NLS-1$
 
 	public static final String CSS_CLASS_KEY = "org.eclipse.e4.ui.css.CssClassName"; //$NON-NLS-1$
 
@@ -425,8 +424,8 @@ private void findAndHighlight(Control control) {
 				} while (m != null);
 
 				if (o instanceof MPart) {
-					System.err.println(getClass().getName() + ".findAndHighLight: " + o);
-					System.err.println(getClass().getName() + ".findAndHighLight: " + ((EObject) o).eContainingFeature());
+					System.err.println(getClass().getName() + ".findAndHighLight: " + o); //$NON-NLS-1$
+					System.err.println(getClass().getName() + ".findAndHighLight: " + ((EObject) o).eContainingFeature()); //$NON-NLS-1$
 				}
 
 				viewer.setSelection(new StructuredSelection(o));
@@ -526,29 +525,10 @@ private Composite createFormTab(Composite composite) {
 		textLabel.setData(CSS_CLASS_KEY, "sectionHeader"); //$NON-NLS-1$
 		textLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
-		// final ScrolledComposite scrolling = new
-		// ScrolledComposite(editingArea, SWT.H_SCROLL | SWT.V_SCROLL);
-		// scrolling.setBackgroundMode(SWT.INHERIT_DEFAULT);
-		//		scrolling.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
-
-		final EStackLayout layout = new EStackLayout();
+		final StackLayout layout = new StackLayout();
 		final Composite contentContainer = new Composite(editingArea, SWT.NONE);
 		contentContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
 
-		//		contentContainer.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$
-		// scrolling.setExpandHorizontal(true);
-		// scrolling.setExpandVertical(true);
-		// scrolling.setContent(contentContainer);
-		//
-		// scrolling.addControlListener(new ControlAdapter() {
-		// public void controlResized(ControlEvent e) {
-		// Rectangle r = scrolling.getClientArea();
-		// scrolling.setMinSize(contentContainer.computeSize(r.width,
-		// SWT.DEFAULT));
-		// }
-		// });
-		//
-		// scrolling.setLayoutData(new GridData(GridData.FILL_BOTH));
 		contentContainer.setLayout(layout);
 
 		viewer.getTree().addKeyListener(new KeyAdapter() {
@@ -1033,7 +1013,8 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		final TreeViewer viewer = tempViewer;
 
 		viewer.setLabelProvider(new ComponentLabelProvider(this, messages));
-		ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(new ObservableFactoryImpl(), new TreeStructureAdvisorImpl());
+		ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(new ObservableFactoryImpl(), new TreeStructureAdvisor() {
+		});
 		viewer.setContentProvider(contentProvider);
 
 		final WritableSet clearedSet = new WritableSet();
@@ -1169,7 +1150,6 @@ private void registerContributedEditors() {
 				AbstractComponentEditor editor = (AbstractComponentEditor) fact.create("bundleclass://" + el.getContributor().getName() + "/" + desc.getEditorClass().getName(), context); //$NON-NLS-1$ //$NON-NLS-2$
 				registerEditor(eClass, editor);
 			} catch (CoreException e) {
-				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 		}
@@ -1198,7 +1178,6 @@ private void registerContributedEditorTabs() {
 					res.add(contribution);
 				}
 			} catch (CoreException e) {
-				// TODO Auto-generated catch block 1204
 				e.printStackTrace();
 			}
 		}
@@ -1396,7 +1375,6 @@ void dispose() {
 		try {
 			obsManager.dispose();
 		} catch (Exception e) {
-			// TODO: handle exception
 			e.printStackTrace();
 		}
 
@@ -1533,10 +1511,6 @@ private void handleStructureCut() {
 		}
 	}
 
-	static class TreeStructureAdvisorImpl extends TreeStructureAdvisor {
-
-	}
-
 	class ObservableFactoryImpl implements IObservableFactory {
 
 		@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index ac4f0668d3..1e4a6c0487 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2012 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -18,7 +19,6 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -39,6 +39,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -62,7 +63,7 @@ public class AddonsEditor extends AbstractComponentEditor {
 	@Optional
 	private IProject project;
 
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 
 	@Inject
 	public AddonsEditor() {
@@ -99,7 +100,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 28fac09a23..a69a589155 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 30996811bf..38ab3a21b4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -19,7 +20,6 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -66,6 +66,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -84,7 +85,7 @@ public class AreaEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 
 	private List<Action> actions = new ArrayList<Action>();
 
@@ -177,7 +178,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index b500c24a7c..1be16537be 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -17,7 +18,6 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -46,6 +46,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -61,7 +62,7 @@ public class BindingContextEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 	private IListProperty BINDING_CONTEXT__CHILDREN = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
 
 	private List<Action> actions = new ArrayList<Action>();
@@ -118,7 +119,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index ccd9a1db10..ece088a72a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -17,7 +18,6 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -50,6 +50,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -68,7 +69,7 @@ public class BindingTableEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty BINDING_TABLE__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
 	@Inject
@@ -107,7 +108,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index 2421c36fef..49fa788c1e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,13 +7,13 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -28,6 +28,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -37,7 +38,7 @@ public class CategoryEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 
 	@Inject
 	public CategoryEditor() {
@@ -70,7 +71,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 8c49a7615f..b26546c303 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -17,7 +18,6 @@
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -48,6 +48,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -64,7 +65,7 @@ public class CommandEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 	private MessageFormat newCommandParameterName;
 
@@ -108,7 +109,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -353,7 +354,7 @@ public List<Action> getActions(Object element) {
 	/**
 	 * Returns the current amount of {@link MCommandParameter}s the edited
 	 * {@link MCommand} has.
-	 * 
+	 *
 	 * @return the amount of {@link MCommandParameter}s of the edited
 	 *         {@link MCommand}
 	 */
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 2610d5b0f9..76912023a3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,13 +7,13 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -30,6 +30,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
@@ -42,7 +43,7 @@ public class CommandParameterEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 
 	@Inject
 	public CommandParameterEditor() {
@@ -86,7 +87,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
index 3c16e3df6e..abb1e9e925 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013 MEDEVIT, FHV and others.
+ * Copyright (c) 2013, 2014 MEDEVIT, FHV and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Marco Descher <marco@descher.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -18,7 +19,6 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -40,6 +40,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -59,7 +60,7 @@ public class DynamicMenuContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 
 	@Inject
 	@Optional
@@ -103,7 +104,7 @@ protected Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 8c5cff6b89..b621da2c5e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2012 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -19,7 +20,6 @@
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
 import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -43,6 +43,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -61,7 +62,7 @@
 public class HandlerEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 
 	@Inject
 	private IModelResource resource;
@@ -96,7 +97,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index a0e5b815ad..8eb61b521d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -22,7 +23,6 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -56,6 +56,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -72,7 +73,7 @@ public class KeyBindingEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
 	private IEMFEditListProperty KEY_BINDING__PARAMETERS = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS);
@@ -116,7 +117,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
@@ -364,7 +365,7 @@ public IStatus validate(Object value) {
 						return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", Messages.KeyBindingEditor_SequenceEmpty); //$NON-NLS-1$
 					}
 					if (!value.toString().toUpperCase().equals(value.toString())) {
-						return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", Messages.KeyBindingEditor_SequenceLowercase); //$NON-NLS-1$ 
+						return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", Messages.KeyBindingEditor_SequenceLowercase); //$NON-NLS-1$
 					}
 
 					return Status.OK_STATUS;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 77c2d6d637..c957d284e5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2013 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Marco Descher <marco@descher.at> - Bug 397650, Bug 395982, Bug 396975
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -18,7 +19,6 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -58,6 +58,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -75,7 +76,7 @@ public class MenuContributionEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
 	@Inject
@@ -169,7 +170,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index adfc664c60..32df3efbe7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2013 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Marco Descher <marco@descher.at> - Bug 395982
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -27,7 +28,6 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -79,6 +79,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -99,7 +100,7 @@ public class MenuEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
 	@Inject
@@ -193,7 +194,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			context = new EMFDataBindingContext();
 			composite = new Composite(parent, SWT.NONE);
-			stackLayout = new EStackLayout();
+			stackLayout = new StackLayout();
 			composite.setLayout(stackLayout);
 
 			createForm(composite, context, getMaster(), false, false);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index a718c52ec1..84a526a04e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -21,7 +22,6 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -58,6 +58,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -75,7 +76,7 @@ public abstract class MenuItemEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 
 	@Inject
 	@Optional
@@ -120,7 +121,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index e2a277a303..8afaa3a7a7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -15,7 +16,6 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -32,6 +32,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -42,7 +43,7 @@
 public class MenuSeparatorEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 
 	@Inject
 	@Optional
@@ -79,7 +80,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index 3d501ab4ee..e2b4d437ea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,13 +7,13 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -28,6 +28,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -37,7 +38,7 @@ public class ParameterEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 
 	@Inject
 	public ParameterEditor() {
@@ -76,7 +77,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 6d39aadc6d..b5842ec1df 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -19,7 +19,6 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -51,6 +50,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -72,7 +72,7 @@ public class PartDescriptorEditor extends AbstractComponentEditor {
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IValueProperty PART__TOOLBAR = EMFProperties.value(BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR);
 	private Button createRemoveToolBar;
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 
 	@Inject
 	public PartDescriptorEditor() {
@@ -100,7 +100,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 07dfb8fe20..eeaaedcfec 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -23,7 +23,6 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -60,6 +59,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -84,7 +84,7 @@ public class PartEditor extends AbstractComponentEditor {
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IValueProperty PART__TOOLBAR = EMFProperties.value(BasicPackageImpl.Literals.PART__TOOLBAR);
 	private Button createRemoveToolBar;
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 
 	@Inject
 	@Optional
@@ -124,7 +124,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 7141d900af..a7cb95e7e7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -19,7 +19,6 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -65,6 +64,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -84,7 +84,7 @@ public class PartSashContainerEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 	private List<Action> actionsImport = new ArrayList<Action>();
 
@@ -204,7 +204,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 3f9845db5a..2a4c7516a7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -19,7 +19,6 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -176,7 +175,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 9a67928f05..136808df51 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -20,7 +20,6 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -54,6 +53,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -72,7 +72,7 @@ public class PerspectiveEditor extends AbstractComponentEditor {
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private IListProperty PERSPECTIVE__WINDOWS = EMFProperties.list(AdvancedPackageImpl.Literals.PERSPECTIVE__WINDOWS);
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
 	@Inject
@@ -164,7 +164,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 633f80e2df..eb52d7a65c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -19,7 +19,6 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -55,6 +54,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -72,7 +72,7 @@ public class PerspectiveStackEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 	private List<Action> actionsImport = new ArrayList<Action>();
 
@@ -141,7 +141,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 3e8bda87d6..e76ee33ff5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -17,7 +17,6 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -40,6 +39,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -55,7 +55,7 @@
 public class PlaceholderEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 
 	@Inject
 	@Optional
@@ -122,7 +122,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 427d661111..e7c1113461 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,7 +7,8 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Marco Descher <marco@descher.at> - https://bugs.eclipse.org/397650
+ *     Marco Descher <marco@descher.at> - Bug 397650
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -20,7 +21,6 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -58,6 +58,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -74,7 +75,7 @@ public class ToolBarContributionEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
 	@Inject
@@ -161,7 +162,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index c8b0e93ec5..aa645f4569 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -17,7 +18,6 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -53,6 +53,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -70,7 +71,7 @@ public class ToolBarEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
 	private static class Struct {
@@ -148,7 +149,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 1837d42f9a..6604a30544 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -15,7 +16,6 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -34,6 +34,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -44,7 +45,7 @@
 public class ToolBarSeparatorEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 
 	@Inject
 	@Optional
@@ -90,7 +91,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 08842e407a..1b123014a0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2012 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -15,7 +16,6 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -38,6 +38,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -53,7 +54,7 @@
 public class ToolControlEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private Composite composite;
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 
 	@Inject
 	@Optional
@@ -100,7 +101,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index d9d84c2aee..68aa5e894b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -24,7 +25,6 @@
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -61,6 +61,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -75,7 +76,7 @@ public abstract class ToolItemEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 
 	private IValueProperty TOOL_ITEM__MENU = EMFProperties.value(MenuPackageImpl.Literals.TOOL_ITEM__MENU);
 
@@ -95,7 +96,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index cde3d62130..029c8b6447 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -20,7 +21,6 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -61,6 +61,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -79,7 +80,7 @@ public class TrimBarEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
 	@Inject
@@ -140,7 +141,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index bcd3c52f12..9355a9345e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,7 +7,8 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Marco Descher <marco@descher.at> - https://bugs.eclipse.org/397650
+ *     Marco Descher <marco@descher.at> - Bug 397650
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -20,7 +21,6 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -57,6 +57,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -73,7 +74,7 @@ public class TrimContributionEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
 	@Inject
@@ -136,7 +137,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index c52c362514..0ccc350bb0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -23,7 +24,6 @@
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -56,6 +56,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -81,7 +82,7 @@ public class WindowEditor extends AbstractComponentEditor {
 
 	private Action addMainMenu;
 	private Button createRemoveMainMenu;
-	private EStackLayout stackLayout;
+	private StackLayout stackLayout;
 
 	@Inject
 	@Optional
@@ -132,7 +133,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			if (getEditor().isModelFragment()) {
 				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new EStackLayout();
+				stackLayout = new StackLayout();
 				composite.setLayout(stackLayout);
 				createForm(composite, context, getMaster(), false);
 				createForm(composite, context, getMaster(), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
index 68ff2b631b..92d0925575 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -10,13 +10,12 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
-
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
 import org.eclipse.e4.ui.model.application.commands.MCategory;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
index 33c214325d..f994cd5782 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
@@ -1,7 +1,5 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.properties;
 
-import org.eclipse.core.resources.IResource;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -14,6 +12,7 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.e4.core.di.annotations.Execute;

From 49bb5d0162925dd39d1fc348fcdcfb65fae23656 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Mon, 10 Mar 2014 10:14:24 +0100
Subject: [PATCH 0718/1286] Bug 421453 - Code cleanup in the e4 tools projects

Change-Id: I257caa14da0b490cee2f417f6533fc4aca4c9bd6
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../e4/tools/compat/internal/ClipboardServiceImpl.java       | 2 +-
 .../src/org/eclipse/e4/tools/compat/parts/DIHandler.java     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
index 7a22431eca..74b2130997 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
index 760a8dce80..97b46ad0b8 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 EclipseSource M�nchen GmbH and others.
+ * Copyright (c) 2012 EclipseSource München GmbH and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Jonas Helming <jhelming@eclipsesource.com> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.parts;
 
@@ -43,7 +44,7 @@ private static IEclipseContext getParentContext() {
 		return (IEclipseContext) PlatformUI.getWorkbench().getService(
 				IEclipseContext.class);
 	}
-	
+
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		return ContextInjectionFactory.invoke(component, Execute.class,

From 5bfea3421ab5b4a7f360046f3ef64ef5ffd4fc3d Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Mon, 10 Mar 2014 10:15:30 +0100
Subject: [PATCH 0719/1286] Bug 426343 - Activate more save actions for
 org.eclipse.e4.tools projects

Activate save actions for org.eclipse.e4.tools.compat

Change-Id: If145656013ee9ba9491cbc41769780042b4e2009
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../.settings/org.eclipse.jdt.ui.prefs        | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs

diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..a7a4847848
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,54 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

From 7eb857e3086e0067c8ac6009d73098a4d6484351 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Fri, 7 Mar 2014 22:05:24 +0100
Subject: [PATCH 0720/1286] Bug 426038 - Get rid of MInputPart in the model
 editor

MInputPart has been deprecated

Change-Id: Ifa37b57fc938b1bb88ad4a844c0239b3bbeb9ed4
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../e4/tools/emf/ui/internal/Messages.java    |  8 ----
 .../tools/emf/ui/internal/Messages.properties |  4 --
 .../emf/ui/internal/common/ModelEditor.java   |  2 -
 .../internal/common/component/AreaEditor.java |  6 ---
 .../common/component/InputPartEditor.java     | 41 -------------------
 .../component/PartSashContainerEditor.java    |  7 +---
 .../common/component/PartStackEditor.java     |  7 ----
 .../common/component/PerspectiveEditor.java   |  6 ---
 .../virtual/VPerspectiveControlEditor.java    |  7 ----
 .../virtual/VWindowSharedElementsEditor.java  |  7 ----
 10 files changed, 1 insertion(+), 94 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 8fc441e0b6..9ebdff810f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -118,9 +118,6 @@ public class Messages {
 	public String HandlerEditor_Command;
 	public String HandlerEditor_ClassURI;
 
-	public String InputPartEditor_Label;
-	public String InputPartEditor_InputURI;
-
 	public String KeyBindingEditor_Label;
 	public String KeyBindingEditor_Description;
 	public String KeyBindingEditor_Sequence;
@@ -210,7 +207,6 @@ public class Messages {
 	public String PartSashContainerEditor_AddPartSashContainer;
 	public String PartSashContainerEditor_AddPartStack;
 	public String PartSashContainerEditor_AddPart;
-	public String PartSashContainerEditor_AddInputPart;
 	public String PartSashContainerEditor_AddArea;
 	public String PartSashContainerEditor_AddPlaceholder;
 
@@ -220,7 +216,6 @@ public class Messages {
 	public String PartStackEditor_Parts;
 	public String PartStackEditor_ContainerData;
 	public String PartStackEditor_AddPart;
-	public String PartStackEditor_AddInputPart;
 	public String PartStackEditor_AddPlaceholder;
 
 	public String PerspectiveEditor_Label;
@@ -233,7 +228,6 @@ public class Messages {
 	public String PerspectiveEditor_AddPartSashContainer;
 	public String PerspectiveEditor_AddPartStack;
 	public String PerspectiveEditor_AddPart;
-	public String PerspectiveEditor_AddInputPart;
 	public String PerspectiveEditor_AddArea;
 	public String PerspectiveEditor_AddPlaceholder;
 
@@ -465,7 +459,6 @@ public class Messages {
 	public String VWindowControlEditor_AddPartSashContainer;
 	public String VWindowControlEditor_AddPartStack;
 	public String VWindowControlEditor_AddPart;
-	public String VWindowControlEditor_AddInputPart;
 	public String VWindowControlEditor_AddArea;
 
 	public String VWindowEditor_TreeLabel;
@@ -481,7 +474,6 @@ public class Messages {
 	public String VWindowSharedElementsEditor_Controls;
 	public String VWindowSharedElementsEditor_AddPartSashContainer;
 	public String VWindowSharedElementsEditor_AddPart;
-	public String VWindowSharedElementsEditor_AddInputPart;
 
 	public String VWindowTrimEditor_TreeLabel;
 	public String VWindowTrimEditor_TreeLabelDescription;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 49868efd90..33ced54147 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -214,7 +214,6 @@ PartSashContainerEditor_ContainerData=Container Data
 PartSashContainerEditor_AddPartSashContainer=PartSashContainer
 PartSashContainerEditor_AddPartStack=PartStack
 PartSashContainerEditor_AddPart=Part
-PartSashContainerEditor_AddInputPart=Input Part
 PartSashContainerEditor_AddArea=Area
 PartSashContainerEditor_AddPlaceholder=Placeholder
 
@@ -224,7 +223,6 @@ PartStackEditor_SelectedElement=Selected Element
 PartStackEditor_Parts=Parts
 PartStackEditor_ContainerData=Container Data
 PartStackEditor_AddPart=Part
-PartStackEditor_AddInputPart=Input Part
 PartStackEditor_AddPlaceholder=Placeholder
 
 PerspectiveEditor_Label=Perspective
@@ -473,7 +471,6 @@ VWindowControlEditor_AddPerspectiveStack=Perspective Stack
 VWindowControlEditor_AddPartSashContainer=Part Sash Container
 VWindowControlEditor_AddPartStack=Part Stack
 VWindowControlEditor_AddPart=Part
-VWindowControlEditor_AddInputPart=Input Part
 VWindowControlEditor_AddArea=Area
 
 VWindowEditor_TreeLabel=Windows and Dialogs
@@ -489,7 +486,6 @@ VWindowSharedElementsEditor_TreeLabelDescription=Shared Elements Bla Bla Bla Bla
 VWindowSharedElementsEditor_Controls=Controls
 VWindowSharedElementsEditor_AddPartSashContainer=Part Sash Container
 VWindowSharedElementsEditor_AddPart=Part
-VWindowSharedElementsEditor_AddInputPart=Input Part
 VWindowSharedElementsEditor_AddPartStack=Part Stack
 
 VWindowTrimEditor_TreeLabel=Window Trims
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index a64d5f2242..1388a87e1f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -80,7 +80,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledMenuItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandlerEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.InputPartEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.KeyBindingEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuContributionEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuEditor;
@@ -1231,7 +1230,6 @@ private void registerDefaultEditors() {
 		registerEditor(BasicPackageImpl.Literals.PART_SASH_CONTAINER, ContextInjectionFactory.make(PartSashContainerEditor.class, context));
 		registerEditor(AdvancedPackageImpl.Literals.AREA, ContextInjectionFactory.make(AreaEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.PART_STACK, ContextInjectionFactory.make(PartStackEditor.class, context));
-		registerEditor(BasicPackageImpl.Literals.INPUT_PART, ContextInjectionFactory.make(InputPartEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.TRIM_BAR, ContextInjectionFactory.make(TrimBarEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.DIALOG, ContextInjectionFactory.make(DialogEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.WIZARD_DIALOG, ContextInjectionFactory.make(WizardDialogEditor.class, context));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 38ab3a21b4..1bf9f03d66 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -118,12 +118,6 @@ public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART);
 			}
 		});
-		actions.add(new Action(Messages.PartSashContainerEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
-			@Override
-			public void run() {
-				handleAddChild(BasicPackageImpl.Literals.INPUT_PART);
-			}
-		});
 		actions.add(new Action(Messages.PartSashContainerEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area)) {
 			@Override
 			public void run() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
deleted file mode 100644
index 3810c7bbc8..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.component;
-
-import javax.inject.Inject;
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-
-public class InputPartEditor extends PartEditor {
-
-	@Inject
-	public InputPartEditor() {
-		super();
-	}
-
-	@Override
-	public String getLabel(Object element) {
-		return Messages.InputPartEditor_Label;
-	}
-
-	@Override
-	protected void createSubformElements(Composite parent, EMFDataBindingContext context, IObservableValue master) {
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-
-		ControlFactory.createTextField(parent, Messages.InputPartEditor_InputURI, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.INPUT__INPUT_URI));
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index a7cb95e7e7..898b1b7829 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -120,12 +120,7 @@ public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART);
 			}
 		});
-		actions.add(new Action(Messages.PartSashContainerEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
-			@Override
-			public void run() {
-				handleAddChild(BasicPackageImpl.Literals.INPUT_PART);
-			}
-		});
+
 		actions.add(new Action(Messages.PartSashContainerEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area)) {
 			@Override
 			public void run() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 2a4c7516a7..d1267cb14c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -103,12 +103,6 @@ public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART);
 			}
 		});
-		actions.add(new Action(Messages.PartStackEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
-			@Override
-			public void run() {
-				handleAddChild(BasicPackageImpl.Literals.INPUT_PART);
-			}
-		});
 		actions.add(new Action(Messages.PartStackEditor_AddPlaceholder, createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
 			@Override
 			public void run() {
@@ -257,7 +251,6 @@ public String getText(Object element) {
 			});
 			List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
 			eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART));
-			eClassList.add(new FeatureClass("Input Part", BasicPackageImpl.Literals.INPUT_PART));
 			eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER));
 			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
 			childrenDropDown.setInput(eClassList);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 136808df51..caa2b8b37a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -104,12 +104,6 @@ public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART);
 			}
 		});
-		actions.add(new Action(Messages.PerspectiveEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
-			@Override
-			public void run() {
-				handleAddChild(BasicPackageImpl.Literals.INPUT_PART);
-			}
-		});
 		actions.add(new Action(Messages.PerspectiveEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area)) {
 			@Override
 			public void run() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index b2cce6db2a..bcf9e7553d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -87,13 +87,6 @@ public void run() {
 			}
 		});
 
-		actions.add(new Action(Messages.VWindowControlEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
-			@Override
-			public void run() {
-				handleAdd(BasicPackageImpl.Literals.PART);
-			}
-		});
-
 		actions.add(new Action(Messages.VWindowControlEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area_vertical)) {
 			@Override
 			public void run() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index aae768d21a..78b28e5d41 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -87,13 +87,6 @@ public void run() {
 			}
 		});
 
-		actions.add(new Action(Messages.VWindowSharedElementsEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
-			@Override
-			public void run() {
-				handleAdd(BasicPackageImpl.Literals.INPUT_PART);
-			}
-		});
-
 		actions.add(new Action(Messages.VWindowSharedElementsEditor_AddPartStack, createImageDescriptor(ResourceProvider.IMG_PartStack)) {
 			@Override
 			public void run() {

From 4cce4a3c7c17ea51d35aca41d9b06d4b3f32262b Mon Sep 17 00:00:00 2001
From: Leo Denault <ldena023@uottawa.ca>
Date: Fri, 28 Feb 2014 12:00:00 -0500
Subject: [PATCH 0721/1286] Bug 426397 - Provide an eclipse editor based on
 OrionEditorControl

Added support for HTML files in OrionEditor.

Change-Id: Icd2686a2ee11cfcaa2a45fa309529ae18e940db7
Signed-off-by: Leo Denault <ldena023@uottawa.ca>

From d6327e268b206fa1d8f54f03e1efe64e3695453f Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Sat, 15 Mar 2014 12:30:54 +0100
Subject: [PATCH 0722/1286] Bug 430462  - Reduce hard coded styling in the
 model editor

Change-Id: I0607a4a8ac7ca5c7390be58df631adddf4ab3190
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../emf/ui/internal/common/ModelEditor.java   | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 1388a87e1f..f5d540291d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -496,33 +496,26 @@ private Composite createFormTab(Composite composite) {
 		viewer = createTreeViewerArea(form);
 
 		Composite parent = new Composite(form, SWT.NONE);
-		parent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-		parent.setBackgroundMode(SWT.INHERIT_DEFAULT);
-		// parent.setData("org.eclipse.e4.ui.css.CssClassName","contentContainer");
 		FillLayout l = new FillLayout();
-		l.marginWidth = 5;
 		parent.setLayout(l);
 
 		ShadowComposite editingArea = new ShadowComposite(parent, SWT.NONE);
 		GridLayout gl = new GridLayout();
-		gl.marginTop = 0;
-		gl.marginHeight = 0;
 		editingArea.setLayout(gl);
-		editingArea.setBackgroundMode(SWT.INHERIT_DEFAULT);
-		// editingArea.setData("org.eclipse.e4.ui.css.CssClassName","contentContainer");
 
 		Composite headerContainer = new Composite(editingArea, SWT.NONE);
-		headerContainer.setBackgroundMode(SWT.INHERIT_DEFAULT);
-		headerContainer.setData(CSS_CLASS_KEY, "headerSectionContainer"); //$NON-NLS-1$
 		headerContainer.setLayout(new GridLayout(3, false));
 		headerContainer.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		final Label iconLabel = new Label(headerContainer, SWT.NONE);
 		iconLabel.setLayoutData(new GridData(20, 20));
 
-		final Label textLabel = new Label(headerContainer, SWT.NONE);
-		textLabel.setData(CSS_CLASS_KEY, "sectionHeader"); //$NON-NLS-1$
-		textLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		final Label sectionHeaderLabel = new Label(headerContainer, SWT.NONE);
+		sectionHeaderLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		final Label separatorLabel = new Label(headerContainer, SWT.SEPARATOR | SWT.HORIZONTAL);
+		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+		gridData.horizontalSpan = 2;
+		separatorLabel.setLayoutData(gridData);
 
 		final StackLayout layout = new StackLayout();
 		final Composite contentContainer = new Composite(editingArea, SWT.NONE);
@@ -558,7 +551,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 						final AbstractComponentEditor editor = getEditor(obj.eClass());
 						if (editor != null) {
 							currentEditor = editor;
-							textLabel.setText(editor.getLabel(obj));
+							sectionHeaderLabel.setText(editor.getLabel(obj));
 							iconLabel.setImage(editor.getImage(obj, iconLabel.getDisplay()));
 							obsManager.runAndCollect(new Runnable() {
 
@@ -576,7 +569,7 @@ public void run() {
 						final AbstractComponentEditor editor = virtualEditors.get(entry.getId());
 						if (editor != null) {
 							currentEditor = editor;
-							textLabel.setText(editor.getLabel(entry));
+							sectionHeaderLabel.setText(editor.getLabel(entry));
 							iconLabel.setImage(editor.getImage(entry, iconLabel.getDisplay()));
 							obsManager.runAndCollect(new Runnable() {
 

From 8b5cb3dbd85941574e9c016f61d61305d4db4203 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Sat, 15 Mar 2014 10:34:39 +0100
Subject: [PATCH 0723/1286] Bug 430437 - Use standard Composite for application
 model editor instead

Change-Id: I0c92fa0fddd15bbf069436acd1534a1d22e85a96
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../emf/ui/internal/ShadowComposite.java      | 663 ------------------
 .../emf/ui/internal/common/ModelEditor.java   |   5 +-
 2 files changed, 2 insertions(+), 666 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java
deleted file mode 100644
index 8df6d95540..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java
+++ /dev/null
@@ -1,663 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- * 	   IBM Corporation - initial API and implementation
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolderRenderer;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.PaletteData;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.graphics.Region;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-public class ShadowComposite extends Composite {
-
-	// ================================
-	// Dummy to not modify code
-	// ================================
-	public int marginWidth = 0;
-	public int marginHeight = 0;
-
-	ShadowComposite parent;
-
-	private int getTabHeight() {
-		return 0;
-	}
-
-	private boolean getMinimized() {
-		return false;
-	}
-
-	public static final int PART_BODY = -1;
-	public static final int PART_HEADER = -2;
-	public static final int PART_BORDER = -3;
-	public static final int PART_BACKGROUND = -4;
-
-	// Constants for circle drawing
-	final static int LEFT_TOP = 0;
-	final static int LEFT_BOTTOM = 1;
-	final static int RIGHT_TOP = 2;
-	final static int RIGHT_BOTTOM = 3;
-
-	// drop shadow constants
-	final static int SIDE_DROP_WIDTH = 3;
-	final static int BOTTOM_DROP_WIDTH = 4;
-
-	// keylines
-	final static int OUTER_KEYLINE = 1;
-	final static int INNER_KEYLINE = 0;
-	final static int TOP_KEYLINE = 0;
-
-	// Item Constants
-	static final int ITEM_TOP_MARGIN = 2;
-	static final int ITEM_BOTTOM_MARGIN = 6;
-	static final int ITEM_LEFT_MARGIN = 4;
-	static final int ITEM_RIGHT_MARGIN = 4;
-	static final int INTERNAL_SPACING = 4;
-
-	static final String E4_SHADOW_IMAGE = "org.eclipse.e4.renderer.shadowcomposite_image"; //$NON-NLS-1$
-
-	static int[] shape;
-
-	Image shadowImage;
-
-	int cornerSize = 20;
-
-	boolean shadowEnabled = true;
-	Color outerKeyline, innerKeyline;
-	Color[] activeToolbar;
-	int[] activePercents;
-	Color[] inactiveToolbar;
-	int[] inactivePercents;
-	boolean active;
-
-	private boolean drawPolyline = true;
-
-	public ShadowComposite(Composite parent, int style) {
-		super(parent, style);
-		this.parent = this;
-		this.outerKeyline = new Color(getDisplay(), new RGB(240, 240, 240));
-		addListener(SWT.Paint, new Listener() {
-
-			@Override
-			public void handleEvent(Event event) {
-				onPaint(event);
-			}
-		});
-		addListener(SWT.Dispose, new Listener() {
-
-			@Override
-			public void handleEvent(Event event) {
-				outerKeyline.dispose();
-			}
-		});
-		// addPaintListener(new PaintListener() {
-		//
-		// public void paintControl(PaintEvent e) {
-		// Point size = getSize();
-		// Rectangle bodyRect = new Rectangle(0, 0, size.x, size.y);
-		// drawTabBody(e.gc, bodyRect, 0);
-		// drawTabHeader(e.gc, bodyRect, 0);
-		// }
-		// });
-	}
-
-	@Override
-	public Rectangle getClientArea() {
-		Rectangle trim = computeTrim(CTabFolderRenderer.PART_BODY, SWT.NONE, 0, 0, 0, 0);
-		// if (minimized)
-		// return new Rectangle(-trim.x, -trim.y, 0, 0);
-		Point size = getSize();
-		int width = size.x - trim.width;
-		int height = size.y - trim.height;
-		return new Rectangle(-trim.x, -trim.y, width, height);
-	}
-
-	private void onPaint(Event event) {
-		GC gc = event.gc;
-		gc.setAdvanced(true);
-
-		Color gcBackground = gc.getBackground();
-		Color gcForeground = gc.getForeground();
-
-		Point size = getSize();
-		Rectangle bodyRect = new Rectangle(0, 0, size.x, size.y);
-		draw(CTabFolderRenderer.PART_BODY, SWT.BACKGROUND | SWT.FOREGROUND, bodyRect, gc);
-
-		gc.setForeground(gcForeground);
-		gc.setBackground(gcBackground);
-
-		draw(CTabFolderRenderer.PART_HEADER, SWT.BACKGROUND | SWT.FOREGROUND, bodyRect, gc);
-
-	}
-
-	@Override
-	public Rectangle computeTrim(int x, int y, int width, int height) {
-		return computeTrim(PART_BODY, SWT.NONE, x, y, width, height);
-	}
-
-	protected Rectangle computeTrim(int part, int state, int x, int y, int width, int height) {
-		GC gc = new GC(parent);
-		gc.dispose();
-		int borderTop = TOP_KEYLINE + OUTER_KEYLINE;
-		int borderBottom = INNER_KEYLINE + OUTER_KEYLINE;
-		int marginWidth = parent.marginWidth;
-		int marginHeight = parent.marginHeight;
-		int sideDropWidth = shadowEnabled ? SIDE_DROP_WIDTH : 0;
-		switch (part) {
-		case PART_BODY:
-			x = x - marginWidth - OUTER_KEYLINE - INNER_KEYLINE - sideDropWidth - (cornerSize / 2);
-			width = width + 2 * OUTER_KEYLINE + 2 * INNER_KEYLINE + 2 * marginWidth + 2 * sideDropWidth + cornerSize;
-			int tabHeight = parent.getTabHeight() + 1; // TODO: Figure out what
-														// to do about the +1
-			// TODO: Fix
-			if (parent.getMinimized()) {
-				y = /* parent.onBottom ? y - borderTop : */y - tabHeight - borderTop - 5;
-				height = borderTop + borderBottom + tabHeight;
-			} else {
-				// y = tabFolder.onBottom ? y - marginHeight - highlight_margin
-				// - borderTop: y - marginHeight - highlight_header - tabHeight
-				// - borderTop;
-
-				y = y - marginHeight - tabHeight - borderTop - (cornerSize / 4);
-				height = height + borderBottom + borderTop + 2 * marginHeight + tabHeight + cornerSize / 2 + cornerSize / 4 + (shadowEnabled ? BOTTOM_DROP_WIDTH : 0);
-			}
-			break;
-		case PART_HEADER:
-			x = x - (INNER_KEYLINE + OUTER_KEYLINE) - sideDropWidth;
-			width = width + 2 * (INNER_KEYLINE + OUTER_KEYLINE + sideDropWidth);
-			break;
-		case PART_BORDER:
-			x = x - INNER_KEYLINE - OUTER_KEYLINE - sideDropWidth - (cornerSize / 4);
-			width = width + 2 * (INNER_KEYLINE + OUTER_KEYLINE + sideDropWidth) + cornerSize / 2;
-			y = y - borderTop;
-			height = height + borderTop + borderBottom;
-			break;
-		}
-		return new Rectangle(x, y, width, height);
-	}
-
-	protected void draw(int part, int state, Rectangle bounds, GC gc) {
-		switch (part) {
-		case PART_BODY:
-			this.drawTabBody(gc, bounds, state);
-			return;
-		case PART_HEADER:
-			this.drawTabHeader(gc, bounds, state);
-			return;
-		}
-	}
-
-	void drawTabHeader(GC gc, Rectangle bounds, int state) {
-		// gc.setClipping(bounds.x, bounds.y, bounds.width,
-		// parent.getTabHeight() + 1);
-
-		int[] points = new int[1024];
-		int index = 0;
-		int radius = cornerSize / 2;
-		int marginWidth = parent.marginWidth;
-		int marginHeight = parent.marginHeight;
-		int delta = INNER_KEYLINE + OUTER_KEYLINE + 2 * (shadowEnabled ? SIDE_DROP_WIDTH : 0) + 2 * marginWidth;
-		int width = bounds.width - delta;
-		int height = bounds.height - INNER_KEYLINE - OUTER_KEYLINE - 2 * marginHeight - (shadowEnabled ? BOTTOM_DROP_WIDTH : 0);
-		int circX = bounds.x + delta / 2 + radius;
-		int circY = bounds.y + radius;
-
-		// Fill in background
-		Region clipping = new Region();
-		gc.getClipping(clipping);
-		Region region = new Region();
-		region.add(shape);
-		region.intersect(clipping);
-		gc.setClipping(region);
-
-		int header = 3; // TODO: this needs to be added to computeTrim for
-						// HEADER
-		Rectangle trim = computeTrim(PART_HEADER, state, 0, 0, 0, 0);
-		trim.width = bounds.width - trim.width;
-		trim.height = (parent.getTabHeight() + 1 + header) - trim.height;
-		trim.x = -trim.x;
-		trim.y = -trim.y;
-
-		draw(PART_BACKGROUND, SWT.NONE, trim, gc);
-
-		gc.setClipping(clipping);
-		clipping.dispose();
-		region.dispose();
-
-		int[] ltt = drawCircle(circX + 1, circY + 1, radius, LEFT_TOP);
-		System.arraycopy(ltt, 0, points, index, ltt.length);
-		index += ltt.length;
-
-		int[] lbb = drawCircle(circX + 1, circY + height - (radius * 2) - 2, radius, LEFT_BOTTOM);
-		System.arraycopy(lbb, 0, points, index, lbb.length);
-		index += lbb.length;
-
-		int[] rb = drawCircle(circX + width - (radius * 2) - 2, circY + height - (radius * 2) - 2, radius, RIGHT_BOTTOM);
-		System.arraycopy(rb, 0, points, index, rb.length);
-		index += rb.length;
-
-		int[] rt = drawCircle(circX + width - (radius * 2) - 2, circY + 1, radius, RIGHT_TOP);
-		System.arraycopy(rt, 0, points, index, rt.length);
-		index += rt.length;
-		points[index++] = points[0];
-		points[index++] = points[1];
-
-		int[] tempPoints = new int[index];
-		System.arraycopy(points, 0, tempPoints, 0, index);
-
-		if (outerKeyline == null)
-			outerKeyline = gc.getDevice().getSystemColor(SWT.COLOR_BLACK);
-
-		gc.setForeground(outerKeyline);
-
-		if (drawPolyline) {
-			gc.drawPolyline(shape);
-		}
-	}
-
-	void drawTabBody(GC gc, Rectangle bounds, int state) {
-		int[] points = new int[1024];
-		int index = 0;
-		int radius = cornerSize / 2;
-		int marginWidth = parent.marginWidth;
-		int marginHeight = parent.marginHeight;
-		int delta = INNER_KEYLINE + OUTER_KEYLINE + 2 * (shadowEnabled ? SIDE_DROP_WIDTH : 0) + 2 * marginWidth;
-		int width = bounds.width - delta;
-		int height = Math.max(parent.getTabHeight() + INNER_KEYLINE + OUTER_KEYLINE + (shadowEnabled ? BOTTOM_DROP_WIDTH : 0), bounds.height - INNER_KEYLINE - OUTER_KEYLINE - 2 * marginHeight - (shadowEnabled ? BOTTOM_DROP_WIDTH : 0));
-
-		int circX = bounds.x + delta / 2 + radius;
-		int circY = bounds.y + radius;
-
-		// Body
-		index = 0;
-		int[] ltt = drawCircle(circX, circY, radius, LEFT_TOP);
-		System.arraycopy(ltt, 0, points, index, ltt.length);
-		index += ltt.length;
-
-		int[] lbb = drawCircle(circX, circY + height - (radius * 2), radius, LEFT_BOTTOM);
-		System.arraycopy(lbb, 0, points, index, lbb.length);
-		index += lbb.length;
-
-		int[] rb = drawCircle(circX + width - (radius * 2), circY + height - (radius * 2), radius, RIGHT_BOTTOM);
-		System.arraycopy(rb, 0, points, index, rb.length);
-		index += rb.length;
-
-		int[] rt = drawCircle(circX + width - (radius * 2), circY, radius, RIGHT_TOP);
-		System.arraycopy(rt, 0, points, index, rt.length);
-		index += rt.length;
-		points[index++] = circX;
-		points[index++] = circY - radius;
-
-		int[] tempPoints = new int[index];
-		System.arraycopy(points, 0, tempPoints, 0, index);
-		gc.fillPolygon(tempPoints);
-
-		// Fill in parent background for non-rectangular shape
-		Region r = new Region();
-		r.add(bounds);
-		r.subtract(tempPoints);
-		gc.setBackground(parent.getParent().getBackground());
-		Display display = parent.getDisplay();
-		Region clipping = new Region();
-		gc.getClipping(clipping);
-		r.intersect(clipping);
-		gc.setClipping(r);
-		Rectangle mappedBounds = display.map(parent, parent.getParent(), bounds);
-		parent.getParent().drawBackground(gc, bounds.x, bounds.y, bounds.width, bounds.height, mappedBounds.x, mappedBounds.y);
-
-		// Shadow
-		if (shadowEnabled)
-			drawShadow(display, bounds, gc);
-
-		gc.setClipping(clipping);
-		clipping.dispose();
-		r.dispose();
-
-		shape = tempPoints;
-	}
-
-	static int[] drawCircle(int xC, int yC, int r, int circlePart) {
-		int x = 0, y = r, u = 1, v = 2 * r - 1, e = 0;
-		int[] points = new int[1024];
-		int[] pointsMirror = new int[1024];
-		int loop = 0;
-		int loopMirror = 0;
-		while (x < y) {
-			if (circlePart == RIGHT_BOTTOM) {
-				points[loop++] = xC + x;
-				points[loop++] = yC + y;
-			}
-			if (circlePart == RIGHT_TOP) {
-				points[loop++] = xC + y;
-				points[loop++] = yC - x;
-			}
-			if (circlePart == LEFT_TOP) {
-				points[loop++] = xC - x;
-				points[loop++] = yC - y;
-			}
-			if (circlePart == LEFT_BOTTOM) {
-				points[loop++] = xC - y;
-				points[loop++] = yC + x;
-			}
-			x++;
-			e += u;
-			u += 2;
-			if (v < 2 * e) {
-				y--;
-				e -= v;
-				v -= 2;
-			}
-			if (x > y)
-				break;
-			if (circlePart == RIGHT_BOTTOM) {
-				pointsMirror[loopMirror++] = xC + y;
-				pointsMirror[loopMirror++] = yC + x;
-			}
-			if (circlePart == RIGHT_TOP) {
-				pointsMirror[loopMirror++] = xC + x;
-				pointsMirror[loopMirror++] = yC - y;
-			}
-			if (circlePart == LEFT_TOP) {
-				pointsMirror[loopMirror++] = xC - y;
-				pointsMirror[loopMirror++] = yC - x;
-			}
-			if (circlePart == LEFT_BOTTOM) {
-				pointsMirror[loopMirror++] = xC - x;
-				pointsMirror[loopMirror++] = yC + y;
-			}
-			// grow?
-			if ((loop + 1) > points.length) {
-				int length = points.length * 2;
-				int[] newPointTable = new int[length];
-				int[] newPointTableMirror = new int[length];
-				System.arraycopy(points, 0, newPointTable, 0, points.length);
-				points = newPointTable;
-				System.arraycopy(pointsMirror, 0, newPointTableMirror, 0, pointsMirror.length);
-				pointsMirror = newPointTableMirror;
-			}
-		}
-		int[] finalArray = new int[loop + loopMirror];
-		System.arraycopy(points, 0, finalArray, 0, loop);
-		for (int i = loopMirror - 1, j = loop; i > 0; i = i - 2, j = j + 2) {
-			int tempY = pointsMirror[i];
-			int tempX = pointsMirror[i - 1];
-			finalArray[j] = tempX;
-			finalArray[j + 1] = tempY;
-		}
-		return finalArray;
-	}
-
-	void drawShadow(final Display display, Rectangle bounds, GC gc) {
-		if (shadowImage == null)
-			createShadow(display);
-
-		int x = bounds.x;
-		int y = bounds.y;
-		int SIZE = shadowImage.getBounds().width / 3;
-
-		int height = Math.max(bounds.height, SIZE * 2);
-		int width = Math.max(bounds.width, SIZE * 2);
-		// top left
-		gc.drawImage(shadowImage, 0, 0, SIZE, SIZE, 2, 10, SIZE, 20);
-		int fillHeight = height - SIZE * 2;
-		int fillWidth = width + 5 - SIZE * 2;
-
-		int xFill = 0;
-		for (int i = SIZE; i < fillHeight; i += SIZE) {
-			xFill = i;
-			gc.drawImage(shadowImage, 0, SIZE, SIZE, SIZE, 2, i, SIZE, SIZE);
-		}
-
-		// Pad the rest of the shadow
-		gc.drawImage(shadowImage, 0, SIZE, SIZE, fillHeight - xFill, 2, xFill + SIZE, SIZE, fillHeight - xFill);
-
-		// bl
-		gc.drawImage(shadowImage, 0, 40, 20, 20, 2, y + height - SIZE, 20, 20);
-
-		int yFill = 0;
-		for (int i = SIZE; i <= fillWidth; i += SIZE) {
-			yFill = i;
-			gc.drawImage(shadowImage, SIZE, SIZE * 2, SIZE, SIZE, i, y + height - SIZE, SIZE, SIZE);
-		}
-		// Pad the rest of the shadow
-		gc.drawImage(shadowImage, SIZE, SIZE * 2, fillWidth - yFill, SIZE, yFill + SIZE, y + height - SIZE, fillWidth - yFill, SIZE);
-
-		// br
-		gc.drawImage(shadowImage, SIZE * 2, SIZE * 2, SIZE, SIZE, x + width - SIZE - 1, y + height - SIZE, SIZE, SIZE);
-
-		// tr
-		gc.drawImage(shadowImage, (SIZE * 2), 0, SIZE, SIZE, x + width - SIZE - 1, 10, SIZE, SIZE);
-
-		xFill = 0;
-		for (int i = SIZE; i < fillHeight; i += SIZE) {
-			xFill = i;
-			gc.drawImage(shadowImage, SIZE * 2, SIZE, SIZE, SIZE, x + width - SIZE - 1, i, SIZE, SIZE);
-		}
-
-		// Pad the rest of the shadow
-		gc.drawImage(shadowImage, SIZE * 2, SIZE, SIZE, fillHeight - xFill, x + width - SIZE - 1, xFill + SIZE, SIZE, fillHeight - xFill);
-	}
-
-	void createShadow(final Display display) {
-		Object obj = display.getData(E4_SHADOW_IMAGE);
-		if (obj != null) {
-			shadowImage = (Image) obj;
-		} else {
-			ImageData data = new ImageData(60, 60, 32, new PaletteData(0xFF0000, 0xFF00, 0xFF));
-			Image tmpImage = shadowImage = new Image(display, data);
-			GC gc = new GC(tmpImage);
-			Color shadowColor = new Color(display, new RGB(128, 128, 128));
-			gc.setBackground(shadowColor);
-			drawTabBody(gc, new Rectangle(0, 0, 60, 60), SWT.None);
-			ImageData blured = blur(tmpImage, 5, 25);
-			shadowImage = new Image(display, blured);
-			display.setData(E4_SHADOW_IMAGE, shadowImage);
-			tmpImage.dispose();
-			shadowColor.dispose();
-			display.disposeExec(new Runnable() {
-				@Override
-				public void run() {
-					Object obj = display.getData(E4_SHADOW_IMAGE);
-					if (obj != null) {
-						Image tmp = (Image) obj;
-						tmp.dispose();
-						display.setData(E4_SHADOW_IMAGE, null);
-					}
-				}
-			});
-		}
-	}
-
-	public ImageData blur(Image src, int radius, int sigma) {
-		float[] kernel = create1DKernel(radius, sigma);
-
-		ImageData imgPixels = src.getImageData();
-		int width = imgPixels.width;
-		int height = imgPixels.height;
-
-		int[] inPixels = new int[width * height];
-		int[] outPixels = new int[width * height];
-		int offset = 0;
-		for (int y = 0; y < height; y++) {
-			for (int x = 0; x < width; x++) {
-				RGB rgb = imgPixels.palette.getRGB(imgPixels.getPixel(x, y));
-				if (rgb.red == 255 && rgb.green == 255 && rgb.blue == 255) {
-					inPixels[offset] = (rgb.red << 16) | (rgb.green << 8) | rgb.blue;
-				} else {
-					inPixels[offset] = (imgPixels.getAlpha(x, y) << 24) | (rgb.red << 16) | (rgb.green << 8) | rgb.blue;
-				}
-				offset++;
-			}
-		}
-
-		convolve(kernel, inPixels, outPixels, width, height, true);
-		convolve(kernel, outPixels, inPixels, height, width, true);
-
-		ImageData dst = new ImageData(imgPixels.width, imgPixels.height, 24, new PaletteData(0xff0000, 0xff00, 0xff));
-
-		dst.setPixels(0, 0, inPixels.length, inPixels, 0);
-		offset = 0;
-		for (int y = 0; y < height; y++) {
-			for (int x = 0; x < width; x++) {
-				if (inPixels[offset] == -1) {
-					dst.setAlpha(x, y, 0);
-				} else {
-					int a = (inPixels[offset] >> 24) & 0xff;
-					// if (a < 150) a = 0;
-					dst.setAlpha(x, y, a);
-				}
-				offset++;
-			}
-		}
-		return dst;
-	}
-
-	private void convolve(float[] kernel, int[] inPixels, int[] outPixels, int width, int height, boolean alpha) {
-		int kernelWidth = kernel.length;
-		int kernelMid = kernelWidth / 2;
-		for (int y = 0; y < height; y++) {
-			int index = y;
-			int currentLine = y * width;
-			for (int x = 0; x < width; x++) {
-				// do point
-				float a = 0, r = 0, g = 0, b = 0;
-				for (int k = -kernelMid; k <= kernelMid; k++) {
-					float val = kernel[k + kernelMid];
-					int xcoord = x + k;
-					if (xcoord < 0)
-						xcoord = 0;
-					if (xcoord >= width)
-						xcoord = width - 1;
-					int pixel = inPixels[currentLine + xcoord];
-					// float alp = ((pixel >> 24) & 0xff);
-					a += val * ((pixel >> 24) & 0xff);
-					r += val * (((pixel >> 16) & 0xff));
-					g += val * (((pixel >> 8) & 0xff));
-					b += val * (((pixel) & 0xff));
-				}
-				int ia = alpha ? clamp((int) (a + 0.5)) : 0xff;
-				int ir = clamp((int) (r + 0.5));
-				int ig = clamp((int) (g + 0.5));
-				int ib = clamp((int) (b + 0.5));
-				outPixels[index] = (ia << 24) | (ir << 16) | (ig << 8) | ib;
-				index += height;
-			}
-		}
-
-	}
-
-	private int clamp(int value) {
-		if (value > 255)
-			return 255;
-		if (value < 0)
-			return 0;
-		return value;
-	}
-
-	private float[] create1DKernel(int radius, int sigma) {
-		// guideline: 3*sigma should be the radius
-		int size = radius * 2 + 1;
-		float[] kernel = new float[size];
-		int radiusSquare = radius * radius;
-		float sigmaSquare = 2 * sigma * sigma;
-		float piSigma = 2 * (float) Math.PI * sigma;
-		float sqrtSigmaPi2 = (float) Math.sqrt(piSigma);
-		int start = size / 2;
-		int index = 0;
-		float total = 0;
-		for (int i = -start; i <= start; i++) {
-			float d = i * i;
-			if (d > radiusSquare) {
-				kernel[index] = 0;
-			} else {
-				kernel[index] = (float) Math.exp(-(d) / sigmaSquare) / sqrtSigmaPi2;
-			}
-			total += kernel[index];
-			index++;
-		}
-		for (int i = 0; i < size; i++) {
-			kernel[i] /= total;
-		}
-		return kernel;
-	}
-
-	@Inject
-	@Optional
-	public void setCornerRadius(@Named("radius") Integer radius) {
-		cornerSize = radius.intValue();
-		parent.redraw();
-	}
-
-	@Inject
-	@Optional
-	public void setShadowVisible(@Named("shadowVisible") Boolean visible) {
-		this.shadowEnabled = visible.booleanValue();
-		parent.redraw();
-	}
-
-	@Inject
-	@Optional
-	public void setOuterKeyline(@Named("outerKeyline") Color color) {
-		this.outerKeyline = color;
-		// TODO: HACK! Should be set based on pseudo-state.
-		// setActive(!(color.getRed() == 255 && color.getGreen() == 255 &&
-		// color.getBlue() == 255));
-		parent.redraw();
-	}
-
-	@Inject
-	@Optional
-	public void setInnerKeyline(@Named("innerKeyline") Color color) {
-		this.innerKeyline = color;
-		parent.redraw();
-	}
-
-	@Inject
-	@Optional
-	public void setActiveToolbarGradient(@Named("activeToolbarColors") Color[] color, @Named("activeToolbarPercents") int[] percents) {
-		activeToolbar = color;
-		activePercents = percents;
-	}
-
-	@Inject
-	@Optional
-	public void setInactiveToolbarGradient(@Named("inactiveToolbarColors") Color[] color, @Named("inactiveToolbarPercents") int[] percents) {
-		inactiveToolbar = color;
-		inactivePercents = percents;
-	}
-
-	// public void setActive(boolean active) {
-	// this.active = active;
-	// Control topRight = parent.getTopRight();
-	// if (topRight != null) {
-	// if (active && toolbarActiveImage == null)
-	// createActiveToolbarImages(Display.getCurrent());
-	// if (!active && toolbarInactiveImage == null)
-	// createInactiveToolbarImages(Display.getCurrent());
-	// topRight.setBackgroundImage(active ? toolbarActiveImage :
-	// toolbarInactiveImage);
-	// parent.redraw();
-	// }
-	// }
-}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index f5d540291d..8a33ff8edb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -62,7 +62,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.ShadowComposite;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.AddonsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ApplicationEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.AreaEditor;
@@ -499,7 +498,7 @@ private Composite createFormTab(Composite composite) {
 		FillLayout l = new FillLayout();
 		parent.setLayout(l);
 
-		ShadowComposite editingArea = new ShadowComposite(parent, SWT.NONE);
+		Composite editingArea = new Composite(parent, SWT.BORDER);
 		GridLayout gl = new GridLayout();
 		editingArea.setLayout(gl);
 
@@ -988,7 +987,7 @@ public void setSelectionService(@Optional ISelectionProviderService selectionSer
 
 	private TreeViewer createTreeViewerArea(Composite parent) {
 
-		final ShadowComposite treeArea = new ShadowComposite(parent, SWT.NONE);
+		final Composite treeArea = new Composite(parent, SWT.BORDER);
 
 		treeArea.setLayout(new FillLayout());
 		treeArea.setData(CSS_CLASS_KEY, "formContainer"); //$NON-NLS-1$

From 928bee4a03dacada0ec92f43be130d166a54cfa7 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Sat, 15 Mar 2014 12:39:19 +0100
Subject: [PATCH 0724/1286] Bug 430463 - Retire custom selection service

Change-Id: I6ca62d87e69fa141b4f115b81de068c30be2110b
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../META-INF/MANIFEST.MF                      |  1 -
 .../OSGI-INF/selectionproviderfunction.xml    |  8 ----
 .../SelectionProviderContextFunction.java     | 47 -------------------
 .../emf/ui/internal/common/ModelEditor.java   | 17 ++-----
 .../services/ISelectionProviderService.java   | 15 ------
 5 files changed, 5 insertions(+), 83 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/OSGI-INF/selectionproviderfunction.xml
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/SelectionProviderContextFunction.java
 delete mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ISelectionProviderService.java

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 4cfc62488b..9f915bb1ce 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
  org.eclipse.e4.ui.di;bundle-version="0.9.0",
  org.eclipse.core.databinding;bundle-version="1.4.0"
-Service-Component: OSGI-INF/selectionproviderfunction.xml
 Export-Package: org.eclipse.e4.tools.compat.parts
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.e4.tools.compat/OSGI-INF/selectionproviderfunction.xml b/bundles/org.eclipse.e4.tools.compat/OSGI-INF/selectionproviderfunction.xml
deleted file mode 100644
index 15b8531d18..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/OSGI-INF/selectionproviderfunction.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.compat.selectionprovider">
-   <implementation class="org.eclipse.e4.tools.compat.internal.SelectionProviderContextFunction"/>
-   <service>
-      <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
-   </service>
-   <property name="service.context.key" type="String" value="org.eclipse.e4.tools.services.ISelectionProviderService"/>
-</scr:component>
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/SelectionProviderContextFunction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/SelectionProviderContextFunction.java
deleted file mode 100644
index 1cbc46373e..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/SelectionProviderContextFunction.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
- ******************************************************************************/
-package org.eclipse.e4.tools.compat.internal;
-
-import java.util.List;
-
-import org.eclipse.e4.core.contexts.ContextFunction;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.tools.services.ISelectionProviderService;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-public class SelectionProviderContextFunction extends ContextFunction {
-
-	@Override
-	public Object compute(final IEclipseContext context) {
-		return new ISelectionProviderService() {
-			@Override
-			public void setSelection(Object selection) {
-				ISelectionProvider pv = context.get(ISelectionProvider.class);
-
-				if( selection == null ) {
-					pv.setSelection(StructuredSelection.EMPTY);
-				} else if (selection instanceof ISelection) {
-					pv.setSelection((ISelection) selection);
-				} else if (selection instanceof List<?>) {
-					pv.setSelection(new StructuredSelection((List<?>) selection));
-				} else if (selection instanceof Object[]) {
-					pv.setSelection(new StructuredSelection(
-							(Object[]) selection));
-				} else {
-					pv.setSelection(new StructuredSelection(selection));
-				}
-			}
-		};
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 8a33ff8edb..add2ecfeba 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -55,7 +55,6 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelExtractor;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.IScriptingSupport;
-import org.eclipse.e4.tools.emf.ui.common.ISelectionProviderService;
 import org.eclipse.e4.tools.emf.ui.common.MemoryTransfer;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -154,6 +153,7 @@
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.e4.ui.model.internal.ModelUtils;
+import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
 import org.eclipse.e4.ui.workbench.swt.internal.copy.FilteredTree;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -275,7 +275,10 @@ public class ModelEditor {
 	private TreeViewer viewer;
 	private IModelResource modelProvider;
 	private IProject project;
-	private ISelectionProviderService selectionService;
+
+	@Inject
+	ESelectionService selectionService;
+
 	private IEclipseContext context;
 	private boolean fragment;
 	private Handler clipboardHandler;
@@ -975,16 +978,6 @@ public List<FeatureClass> getFeatureClasses(EClass eClass, EStructuralFeature fe
 		return list;
 	}
 
-	@Inject
-	public void setSelectionService(@Optional ISelectionProviderService selectionService) {
-		this.selectionService = selectionService;
-		if (viewer != null && !viewer.getControl().isDisposed()) {
-			if (!viewer.getSelection().isEmpty() && selectionService != null) {
-				selectionService.setSelection(((IStructuredSelection) viewer.getSelection()).getFirstElement());
-			}
-		}
-	}
-
 	private TreeViewer createTreeViewerArea(Composite parent) {
 
 		final Composite treeArea = new Composite(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ISelectionProviderService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ISelectionProviderService.java
deleted file mode 100644
index 42b49e777b..0000000000
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ISelectionProviderService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.services;
-
-public interface ISelectionProviderService {
-	public void setSelection(Object selection);
-}

From 1402437788e53f54522231a7cc763698e9204657 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Tue, 18 Mar 2014 22:59:57 -0400
Subject: [PATCH 0725/1286] Bug 430660 - unable to edit keys in application
 editor

Change-Id: I9babd958d11c1aff0450975581ff935b85bd3ce0
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../common/component/ControlFactory.java      | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index b97204dd29..969e181426 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Dirk Fauth <dirk.fauth@googlemail.com> - Bug 426986
+ *     Steven Spungin <steven@spungin.tv> - Bug 430660
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -209,6 +210,35 @@ public String getText(Object element) {
 			}
 		});
 
+		final TextCellEditor keyEditor = new TextCellEditor(tableviewer.getTable());
+		column.setEditingSupport(new EditingSupport(tableviewer) {
+
+			@Override
+			protected void setValue(Object element, Object value) {
+				Command cmd = SetCommand.create(editor.getEditingDomain(), element, ApplicationPackageImpl.Literals.STRING_TO_STRING_MAP__KEY, value.toString().trim().length() == 0 ? null : value.toString());
+				if (cmd.canExecute()) {
+					editor.getEditingDomain().getCommandStack().execute(cmd);
+					tableviewer.refresh();
+				}
+			}
+
+			@Override
+			protected Object getValue(Object element) {
+				Entry<String, String> entry = (Entry<String, String>) element;
+				return entry.getKey();
+			}
+
+			@Override
+			protected CellEditor getCellEditor(Object element) {
+				return keyEditor;
+			}
+
+			@Override
+			protected boolean canEdit(Object element) {
+				return true;
+			}
+		});
+
 		// FIXME How can we react upon changes in the Map-Value?
 		column = new TableViewerColumn(tableviewer, SWT.NONE);
 		column.getColumn().setText(Messages.ControlFactory_Value);

From d801502aa25aa19b259dd026fe3285fee57fd95f Mon Sep 17 00:00:00 2001
From: Tracy Miranda <tracymiranda@yahoo.com>
Date: Wed, 19 Mar 2014 04:17:15 +0000
Subject: [PATCH 0726/1286] Bug 430663 - Adding an addon doesn't automatically
 select in the tree

Change-Id: I74a91612b71db19b8945ea975ad91dd2ae367161
Signed-off-by: Tracy Miranda <tracymiranda@yahoo.com>
---
 .../internal/common/component/virtual/VApplicationAddons.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index dc6490be7a..28e69d2218 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Tracy Miranda <tracymiranda@yahoo.com> - bugfix for 430663
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
@@ -218,6 +219,7 @@ private void handleAddAddon() {
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(addon);
 		}
 	}
 

From 8787500a5c55bfaada3d51534357217c8b9b4948 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Wed, 19 Mar 2014 00:22:23 -0400
Subject: [PATCH 0727/1286] Bug 430664 - application editor key/value table
 columns are too large by default

Change-Id: I54f724c75c874d5dd9d427bf4830e41e29c64c78
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../internal/common/component/ControlFactory.java  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 969e181426..9c73ca4884 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Dirk Fauth <dirk.fauth@googlemail.com> - Bug 426986
- *     Steven Spungin <steven@spungin.tv> - Bug 430660
+ *     Steven Spungin <steven@spungin.tv> - Bug 430660, 430664
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -99,6 +99,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.Text;
 
 public class ControlFactory {
@@ -340,6 +341,15 @@ protected void okPressed() {
 								editor.getEditingDomain().getCommandStack().execute(cmd);
 								super.okPressed();
 							}
+
+							// pack the first column
+							if (tableviewer.getTable().getColumns().length > 0) {
+								TableColumn tableColumn = tableviewer.getTable().getColumns()[0];
+								tableColumn.pack();
+								if (tableColumn.getWidth() < 20) {
+									tableColumn.setWidth(20);
+								}
+							}
 						}
 					}
 				};
@@ -903,4 +913,4 @@ public void keyTraversed(TraverseEvent e) {
 			}
 		});
 	}
-}
\ No newline at end of file
+}

From 8ad59793f909a849b987c23932cf1524e5c4c906 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Thu, 20 Mar 2014 07:50:25 -0400
Subject: [PATCH 0728/1286] Bug 430809 resize key column after editing resize
 key column when provider adds row instead of when handler adds row (allows
 for resizing during init, and handles forms with multiple instances of editor
 on different tabs) no need to check for minimum width when packing

Change-Id: Ia58ec1810c68a3ca2611a5a1c88327020168bcee
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../common/component/ControlFactory.java      | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 9c73ca4884..6775e46db4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Dirk Fauth <dirk.fauth@googlemail.com> - Bug 426986
- *     Steven Spungin <steven@spungin.tv> - Bug 430660, 430664
+ *     Steven Spungin <steven@spungin.tv> - Bug 430660, 430664, Bug 430809
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -17,7 +17,9 @@
 import java.util.Map.Entry;
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
+import org.eclipse.core.databinding.observable.list.IListChangeListener;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.ListChangeEvent;
 import org.eclipse.core.databinding.observable.map.IObservableMap;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
@@ -99,7 +101,6 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.Text;
 
 public class ControlFactory {
@@ -220,6 +221,7 @@ protected void setValue(Object element, Object value) {
 				if (cmd.canExecute()) {
 					editor.getEditingDomain().getCommandStack().execute(cmd);
 					tableviewer.refresh();
+					tableviewer.getTable().getColumn(0).pack();
 				}
 			}
 
@@ -284,7 +286,15 @@ protected boolean canEdit(Object element) {
 		});
 
 		IEMFEditListProperty prop = EMFEditProperties.list(editor.getEditingDomain(), feature);
-		tableviewer.setInput(prop.observeDetail(editor.getMaster()));
+		IObservableList observableList = prop.observeDetail(editor.getMaster());
+		tableviewer.setInput(observableList);
+		observableList.addListChangeListener(new IListChangeListener() {
+
+			@Override
+			public void handleListChange(ListChangeEvent event) {
+				tableviewer.getTable().getColumn(0).pack();
+			}
+		});
 
 		final Composite buttonComp = new Composite(parent, SWT.NONE);
 		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
@@ -341,15 +351,6 @@ protected void okPressed() {
 								editor.getEditingDomain().getCommandStack().execute(cmd);
 								super.okPressed();
 							}
-
-							// pack the first column
-							if (tableviewer.getTable().getColumns().length > 0) {
-								TableColumn tableColumn = tableviewer.getTable().getColumns()[0];
-								tableColumn.pack();
-								if (tableColumn.getWidth() < 20) {
-									tableColumn.setWidth(20);
-								}
-							}
 						}
 					}
 				};

From 3f1584b934ea619a196fe30efb7baeddf9a6f4e7 Mon Sep 17 00:00:00 2001
From: Dmitry Spiridenok <d.spiridenok@gmail.com>
Date: Sat, 22 Mar 2014 15:19:42 +0100
Subject: [PATCH 0729/1286] Bug 430100 - Remove //TODO from the classes
 generated with the e4

wizards

Change-Id: I76594fd13df576235361743f31eb421cf49be7d0
Signed-off-by: Dmitry Spiridenok <d.spiridenok@gmail.com>
---
 .../templates/DynamicMenuContributionTemplate.java     |  4 ++--
 .../wizards/classes/templates/HandlerTemplate.java     |  4 ++--
 .../tools/wizards/classes/templates/PartTemplate.java  | 10 +++++-----
 .../templates/dynamicMenuContribution.txtjet           |  4 ++--
 bundles/org.eclipse.e4.tools/templates/handler.txtjet  |  4 ++--
 bundles/org.eclipse.e4.tools/templates/part.txtjet     | 10 +++++-----
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
index aa531af457..20a79b84f7 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
@@ -21,9 +21,9 @@ public static synchronized DynamicMenuContributionTemplate create(String lineSep
   protected final String TEXT_5 = NL + "import org.eclipse.e4.ui.di.AboutToHide;";
   protected final String TEXT_6 = NL + NL + "import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;" + NL + "" + NL + "public class ";
   protected final String TEXT_7 = " {" + NL + "\t@AboutToShow" + NL + "\tpublic void ";
-  protected final String TEXT_8 = "(List<MMenuElement> items) {" + NL + "\t\t//TODO Your code goes here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_8 = "(List<MMenuElement> items) {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
   protected final String TEXT_9 = NL + "\t" + NL + "\t@AboutToHide" + NL + "\tpublic void ";
-  protected final String TEXT_10 = "(List<MMenuElement> items) {" + NL + "\t\t//TODO Your code goes here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_10 = "(List<MMenuElement> items) {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
   protected final String TEXT_11 = "\t" + NL + "}";
 
   public String generate(Object argument)
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
index f94d6cdb93..f9cfd2ceea 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
@@ -21,9 +21,9 @@ public static synchronized HandlerTemplate create(String lineSeparator)
   protected final String TEXT_5 = NL + "import org.eclipse.e4.core.di.annotations.CanExecute;";
   protected final String TEXT_6 = NL + NL + "public class ";
   protected final String TEXT_7 = " {" + NL + "\t@Execute" + NL + "\tpublic void ";
-  protected final String TEXT_8 = "() {" + NL + "\t\t//TODO Your code goes here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_8 = "() {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
   protected final String TEXT_9 = NL + "\t" + NL + "\t@CanExecute" + NL + "\tpublic boolean ";
-  protected final String TEXT_10 = "() {" + NL + "\t\t//TODO Your code goes here" + NL + "\t\treturn true;" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_10 = "() {" + NL + "\t\t" + NL + "\t\treturn true;" + NL + "\t}" + NL + "\t";
   protected final String TEXT_11 = "\t" + NL + "}";
 
   public String generate(Object argument)
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
index 7a1891605e..20843b9887 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
@@ -24,18 +24,18 @@ public static synchronized PartTemplate create(String lineSeparator)
   protected final String TEXT_8 = NL + "import org.eclipse.e4.ui.di.Persist;";
   protected final String TEXT_9 = NL + NL + "public class ";
   protected final String TEXT_10 = " {" + NL + "\t@Inject" + NL + "\tpublic ";
-  protected final String TEXT_11 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_11 = "() {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
   protected final String TEXT_12 = NL + "\t@PostConstruct" + NL + "\tpublic void ";
-  protected final String TEXT_13 = "(Composite parent) {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_13 = "(Composite parent) {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
   protected final String TEXT_14 = NL + "\t";
   protected final String TEXT_15 = NL + "\t@PreDestroy" + NL + "\tpublic void ";
-  protected final String TEXT_16 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_16 = "() {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
   protected final String TEXT_17 = NL + "\t";
   protected final String TEXT_18 = NL + "\t@Focus" + NL + "\tpublic void ";
-  protected final String TEXT_19 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_19 = "() {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
   protected final String TEXT_20 = NL + "\t";
   protected final String TEXT_21 = NL + "\t@Persist" + NL + "\tpublic void ";
-  protected final String TEXT_22 = "() {" + NL + "\t\t//TODO Your code here" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_22 = "() {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
   protected final String TEXT_23 = NL + "}";
 
   public String generate(Object argument)
diff --git a/bundles/org.eclipse.e4.tools/templates/dynamicMenuContribution.txtjet b/bundles/org.eclipse.e4.tools/templates/dynamicMenuContribution.txtjet
index 832f703f9c..3567f49c87 100644
--- a/bundles/org.eclipse.e4.tools/templates/dynamicMenuContribution.txtjet
+++ b/bundles/org.eclipse.e4.tools/templates/dynamicMenuContribution.txtjet
@@ -16,13 +16,13 @@ import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
 public class <%= domainClass.getName() %> {
 	@AboutToShow
 	public void <%= domainClass.getAboutToShowMethodName() %>(List<MMenuElement> items) {
-		//TODO Your code goes here
+		
 	}
 	<% if( domainClass.isUseAboutToHide() )  { %>
 	
 	@AboutToHide
 	public void <%= domainClass.getAboutToHideMethodName() %>(List<MMenuElement> items) {
-		//TODO Your code goes here
+		
 	}
 	<% } %>	
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/templates/handler.txtjet b/bundles/org.eclipse.e4.tools/templates/handler.txtjet
index e425325ed7..cd2f820814 100644
--- a/bundles/org.eclipse.e4.tools/templates/handler.txtjet
+++ b/bundles/org.eclipse.e4.tools/templates/handler.txtjet
@@ -12,13 +12,13 @@ import org.eclipse.e4.core.di.annotations.CanExecute;
 public class <%= domainClass.getName() %> {
 	@Execute
 	public void <%= domainClass.getExecuteMethodName() %>() {
-		//TODO Your code goes here
+		
 	}
 	<% if( domainClass.isUseCanExecute() )  { %>
 	
 	@CanExecute
 	public boolean <%= domainClass.getCanExecuteMethodName() %>() {
-		//TODO Your code goes here
+		
 		return true;
 	}
 	<% } %>	
diff --git a/bundles/org.eclipse.e4.tools/templates/part.txtjet b/bundles/org.eclipse.e4.tools/templates/part.txtjet
index a71061342a..a51b59d58f 100644
--- a/bundles/org.eclipse.e4.tools/templates/part.txtjet
+++ b/bundles/org.eclipse.e4.tools/templates/part.txtjet
@@ -22,30 +22,30 @@ import org.eclipse.e4.ui.di.Persist;
 public class <%= domainClass.getName() %> {
 	@Inject
 	public <%= domainClass.getName() %>() {
-		//TODO Your code here
+		
 	}
 	<% if( domainClass.isUsePostConstruct() ) { %>
 	@PostConstruct
 	public void <%= domainClass.getPostConstructMethodName()  %>(Composite parent) {
-		//TODO Your code here
+		
 	}
 	<% } %>
 	<% if( domainClass.isUsePredestroy() ) { %>
 	@PreDestroy
 	public void <%= domainClass.getPreDestroyMethodName()  %>() {
-		//TODO Your code here
+		
 	}
 	<% } %>
 	<% if( domainClass.isUseFocus() ) { %>
 	@Focus
 	public void <%= domainClass.getFocusMethodName() %>() {
-		//TODO Your code here
+		
 	}
 	<% } %>
 	<% if( domainClass.isUsePersist() ) { %>
 	@Persist
 	public void <%= domainClass.getPersistMethodName() %>() {
-		//TODO Your code here
+		
 	}
 	<% } %>
 }
\ No newline at end of file

From 4eb6c20572c401d053bdd60e7f60790967ebdaad Mon Sep 17 00:00:00 2001
From: Dmitry Spiridenok <d.spiridenok@gmail.com>
Date: Tue, 25 Mar 2014 14:43:47 +0100
Subject: [PATCH 0730/1286] Bug 408712 - Add include to build.properties when
 new fragment.e4xmi gets created.

Change-Id: I0346f764a631851a9f381ba0c923890a0b431892
Signed-off-by: Dmitry Spiridenok <d.spiridenok@gmail.com>
---
 .../model/BaseApplicationModelWizard.java     | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index 8bcf8d86f7..db2ba1099f 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010 - 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 408712
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.model;
 
@@ -18,6 +19,7 @@
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -44,6 +46,9 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.pde.core.build.IBuildEntry;
+import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
+import org.eclipse.pde.internal.core.project.PDEProject;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
@@ -191,6 +196,7 @@ else if(mApplicationElement instanceof MHandledItem){
 							//
 							Map<Object, Object> options = new HashMap<Object, Object>();
 							resource.save(options);
+							adjustBuildPropertiesFile( modelFile );
 						}
 						catch (Exception exception) {
 							throw new RuntimeException(exception);
@@ -270,4 +276,18 @@ public void init(IWorkbench workbench, IStructuredSelection selection) {
 		this.workbench = workbench;
 		this.selection = selection;
 	}
+	/**
+	 * Adds other file to the build.properties file.
+	 */
+	private void adjustBuildPropertiesFile(IFile file)
+			throws CoreException {
+		IProject project = file.getProject();
+		IFile buildPropertiesFile = PDEProject.getBuildProperties(project);
+		if (buildPropertiesFile.exists()) {
+			WorkspaceBuildModel model = new WorkspaceBuildModel(buildPropertiesFile);
+			IBuildEntry entry = model.getBuild().getEntry(IBuildEntry.BIN_INCLUDES);
+			entry.addToken(file.getProjectRelativePath().toString());
+			model.save();
+		}
+	}
 }
\ No newline at end of file

From cb0a5702f6a3b06a68eb32b28368ca3fbfbbf84e Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Wed, 26 Mar 2014 00:53:01 +0100
Subject: [PATCH 0731/1286] Bug 426143 - [releng] Fix the e3x bridge feature so
 it can use anything

Change-Id: Idc75e41c73c2f15ae8e79b5142dee0996f2bac5f
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>

From 6dccd696c12fd29c38a516d04b951f334de77ef3 Mon Sep 17 00:00:00 2001
From: Leo Denault <ldena023@uottawa.ca>
Date: Fri, 7 Mar 2014 11:07:10 -0500
Subject: [PATCH 0732/1286] Bug 426397 - Provide an eclipse editor based on
 OrionEditorControl

Added support for JavaScript files OrionEditor. Added and refactored tests.

Change-Id: I9334d796d45b8fbd1feb582c4e33884cffb4ee12
Signed-off-by: Leo Denault <ldena023@uottawa.ca>

From 5005c675726451e059e8433b690bd55aa426b1c5 Mon Sep 17 00:00:00 2001
From: Dmitry Spiridenok <d.spiridenok@gmail.com>
Date: Sat, 29 Mar 2014 09:37:46 +0100
Subject: [PATCH 0733/1286] Bug 412672 - [e4xmi] Class URI in ToolControl is
 not a link like in MPart.

Change-Id: Ie203975efbe2b17592b037cf3530cccebfa67efd
Signed-off-by: Dmitry Spiridenok <d.spiridenok@gmail.com>
---
 .../plugin.xml                                |   3 +
 .../ToolControlContributionEditor.java        | 128 +++++++++++++++++
 .../common/component/ToolControlEditor.java   |  23 ++-
 .../OSGI-INF/l10n/bundle.properties           |   1 +
 .../icons/full/obj16/ToolControl.gif          | Bin 0 -> 377 bytes
 bundles/org.eclipse.e4.tools/plugin.xml       |   8 +-
 .../classes/NewToolControlClassWizard.java    | 132 ++++++++++++++++++
 .../templates/ToolControlTemplate.java        |  54 +++++++
 .../templates/toolControl.txtjet              |  23 +++
 9 files changed, 368 insertions(+), 4 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools/icons/full/obj16/ToolControl.gif
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
 create mode 100644 bundles/org.eclipse.e4.tools/templates/toolControl.txtjet

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index 05d1907ee0..0d40419362 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -26,6 +26,9 @@
       <contributionClassCreator
             class="org.eclipse.e4.tools.emf.editor3x.extension.DynamicMenuContributionContributionEditor">
       </contributionClassCreator>
+      <contributionClassCreator
+            class="org.eclipse.e4.tools.emf.editor3x.extension.ToolControlContributionEditor">
+      </contributionClassCreator>
    </extension>
    <extension
          point="org.eclipse.ui.preferencePages">
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java
new file mode 100644
index 0000000000..e5e472e4f6
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java
@@ -0,0 +1,128 @@
+/*******************************************************************************
+ * Copyright (c) 2014 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 412672
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x.extension;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.e4.internal.tools.wizards.classes.NewToolControlClassWizard;
+import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
+import org.eclipse.e4.ui.model.application.MContribution;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PartInitException;
+
+public class ToolControlContributionEditor implements IContributionClassCreator {
+	public void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell) {
+		createOpen(contribution, domain, project, shell, false);
+	}
+
+	private void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell, boolean forceNew) {
+		if( forceNew || contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 || !contribution.getContributionURI().startsWith("bundleclass:") ) {
+			NewToolControlClassWizard wizard = new NewToolControlClassWizard(contribution.getContributionURI());
+			wizard.init( null, new StructuredSelection(project));
+			WizardDialog dialog = new WizardDialog(shell, wizard);
+			if( dialog.open() == Window.OK ) {
+				IFile f = wizard.getFile();
+				ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
+				try {
+					String fullyQualified;
+					if( el.getPackageDeclarations() != null && el.getPackageDeclarations().length > 0 ) {
+						String packageName = el.getPackageDeclarations()[0].getElementName();
+						String className = wizard.getDomainClass().getName();
+						if( packageName.trim().length() > 0 ) {
+							fullyQualified = packageName + "." + className;
+						} else {
+							fullyQualified = className;
+						}
+					} else {
+						fullyQualified = wizard.getDomainClass().getName();
+					}
+
+					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "bundleclass://" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified);
+					if( cmd.canExecute() ) {
+						domain.getCommandStack().execute(cmd);
+					}
+				} catch (JavaModelException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		} else {
+			URI uri = URI.createURI(contribution.getContributionURI());
+			if (uri.hasAuthority() && uri.segmentCount() == 1) {
+			    String symbolicName = uri.authority();
+			    String fullyQualified = uri.segment(0);
+				IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(symbolicName);
+
+				if( ! p.exists() ) {
+					for( IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects() ) {
+						String name = Util.getBundleSymbolicName(check);
+						if( symbolicName.equals(name) ) {
+							p = check;
+							break;
+						}
+					}
+				}
+
+				// TODO If this is not a WS-Resource we need to open differently
+				if (p != null) {
+					IJavaProject jp = JavaCore.create(p);
+					IType t = null;
+                    try {
+                        if (p.exists()){
+                            t = jp.findType(fullyQualified);
+                        }
+                        else
+                        {
+                            IJavaProject pprim = JavaCore.create(project);
+                            t = pprim.findType(fullyQualified);
+                        }
+                        if( t != null ) {
+                            JavaUI.openInEditor(t);
+                        } else {
+                                createOpen(contribution, domain, project, shell, true);
+                        }
+					} catch (JavaModelException e) {
+							createOpen(contribution, domain, project, shell, true);
+					} catch (PartInitException e) {
+						MessageDialog.openError(shell, "Failed to open editor", e.getMessage());
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+			} else {
+				MessageDialog.openError(shell, "Invalid URL", "The current url is invalid");
+			}
+		}
+	}
+
+	public boolean isSupported(EClass element) {
+		return Util.isTypeOrSuper(MenuPackageImpl.Literals.TOOL_CONTROL,element);
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 1b123014a0..b07392ac4f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 412672
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -16,6 +17,7 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -28,6 +30,7 @@
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolControl;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
@@ -49,6 +52,7 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
 public class ToolControlEditor extends AbstractComponentEditor {
@@ -154,9 +158,22 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ToolControlEditor_ClassURI);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			final IContributionClassCreator c = getEditor().getContributionCreator(MenuPackageImpl.Literals.TOOL_CONTROL);
+			if (project != null && c != null) {
+				final Link lnk = new Link(parent, SWT.NONE);
+				lnk.setText("<A>" + Messages.ToolControlEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
+				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+				lnk.addSelectionListener(new SelectionAdapter() {
+					@Override
+					public void widgetSelected(SelectionEvent e) {
+						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, lnk.getShell());
+					}
+				});
+			} else {
+				Label l = new Label(parent, SWT.NONE);
+				l.setText(Messages.ToolControlEditor_ClassURI);
+				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			}
 
 			Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
diff --git a/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
index fc83b8cd1b..2445b90e3c 100644
--- a/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
@@ -8,5 +8,6 @@ wizard.name.1 = New Model Fragment
 wizard.name.2 = New Handler Class
 wizard.name.3 = New Part Class
 wizard.name.4 = New Addon Class
+wizard.name.5 = New Tool Control Class
 Bundle-Name = Tools
 Bundle-Vendor = Eclipse.org
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/icons/full/obj16/ToolControl.gif b/bundles/org.eclipse.e4.tools/icons/full/obj16/ToolControl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3e53cbdc5fc65bfd4f7178bf328195067ae8b7f1
GIT binary patch
literal 377
zcmV-<0fzoZNk%w1VGsZi0M!5h_xSzx_x$+z{rC9%_4obu`2F?w{PFbr^Y;Ar`Th3z
z{B3!U@%8-h^!xAg`fz)V=<oXK@cQZR`R?=k?ehBb_WN{wis<k8?DG5S@cHre`}g_$
z?DG2W^!x7f`t|ty=<xdI@A>NS`tbGp@AUfU@cHWT`R?@ld4PxR^!k5;gnomA)#u}c
zhk%5Ke~OEHii>=Zj(3obc$JcLmXdUvm2an<Xr!8IpqOo(lyLw5{{R300000000000
z00000A^8LW0024wEC2ui01yBW000J-K%H<%EDmkRq*5ugv7XTA(<Z#JLfEV}bQ9vP
z+bvF5V@XP-3j~CQlps0bjAatlMfeOpLKDhZ7#JKB9EFA)F+wmb9Vs3s4ih8}krOXM
zEi4)h8X5;92O12WE<!6T6$q-Ss;w$QC@cg9v;hVRvmXQ~LKZ9l3IiJj1pojE1qv2I
X4=e)D(9r@9LJQW{*w{wfLqPyLJ_p1#

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools/plugin.xml b/bundles/org.eclipse.e4.tools/plugin.xml
index 4efad6a0d4..8a6a20cf32 100644
--- a/bundles/org.eclipse.e4.tools/plugin.xml
+++ b/bundles/org.eclipse.e4.tools/plugin.xml
@@ -60,6 +60,12 @@
             id="org.eclipse.e4.tools.newaddon"
             name="%wizard.name.4">
       </wizard>
+      <wizard
+            category="org.eclipse.e4.tools/org.eclipse.e4.tools.classes"
+            class="org.eclipse.e4.internal.tools.wizards.classes.NewToolControlClassWizard"
+            icon="icons/full/obj16/ToolControl.gif"
+            id="org.eclipse.e4.tools.newtoolcontrol"
+            name="%wizard.name.5">
+      </wizard>
    </extension>
-
 </plugin>
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
new file mode 100644
index 0000000000..43804f70a5
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
@@ -0,0 +1,132 @@
+/*******************************************************************************
+ * Copyright (c) 2014 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 412672
+ ******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.classes;
+
+import java.util.Set;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
+import org.eclipse.e4.internal.tools.wizards.classes.templates.ToolControlTemplate;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class NewToolControlClassWizard extends AbstractNewClassWizard {
+	private String initialString;
+
+	public NewToolControlClassWizard(String contributionURI) {
+		this.initialString = contributionURI;
+	}
+
+	public NewToolControlClassWizard() {
+		// Intentionally left empty
+	}
+
+	@Override
+	protected String getContent() {
+		ToolControlTemplate template = new ToolControlTemplate();
+		return template.generate(getDomainClass());
+	}
+
+	@Override
+	public void addPages() {
+		addPage(new AbstractNewClassPage("Classinformation",
+				"New Tool Control",
+				"Create a new tool control class", root, ResourcesPlugin.getWorkspace().getRoot(),initialString) {
+
+			@Override
+			protected JavaClass createInstance() {
+				return new ToolControlClass(root);
+			}
+
+			@Override
+			protected void createFields(Composite parent, DataBindingContext dbc) {
+				IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+				{
+					Label l = new Label(parent, SWT.NONE);
+					l.setText("Create GUI Method");
+
+					Text t = new Text(parent, SWT.BORDER);
+					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+					dbc.bindValue(
+							textProp.observe(t),
+							BeanProperties.value("createGuiMethodName").observe(
+									getClazz()));
+
+					l = new Label(parent, SWT.NONE);
+				}
+				{
+					Label l = new Label(parent, SWT.NONE);
+					l.setText("Create Default Constructor");
+
+//					Text t = new Text(parent, SWT.BORDER);
+//					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+//					dbc.bindValue(textProp.observe(t),
+//							BeanProperties.value("defaultConstructorName")
+//									.observe(getClazz()));
+//					dbc.bindValue(
+//							WidgetProperties.enabled().observe(t),
+//							BeanProperties.value("useDefaultConstructor").observe(
+//									getClazz()));
+
+					Button b = new Button(parent, SWT.CHECK);
+					dbc.bindValue(
+							WidgetProperties.selection().observe(b),
+							BeanProperties.value("createDefaultConstructor").observe(
+									getClazz()));
+				}
+			}
+		});
+	}
+
+	@Override
+	protected Set<String> getRequiredBundles() {
+		Set<String> set = super.getRequiredBundles();
+		set.add("org.eclipse.e4.core.di");
+		return set;
+	}
+
+	public static class ToolControlClass extends JavaClass {
+		private String createGuiMethodName = "createGui";
+		private boolean createDefaultCostructor = false;
+
+		public ToolControlClass(IPackageFragmentRoot root) {
+			super(root);
+		}
+
+		public String getCreateGuiMethodName() {
+			return createGuiMethodName;
+		}
+
+		public void setCreateGuiMethodName(String createGuiMethodName) {
+			support.firePropertyChange("createGuiMethodName",
+					this.createGuiMethodName,
+					this.createGuiMethodName = createGuiMethodName);
+		}
+
+		public boolean isCreateDefaultConstructor() {
+			return createDefaultCostructor;
+		}
+
+		public void setCreateDefaultConstructor(boolean createDefaultConstructor) {
+			support.firePropertyChange("createDefaultConstructor", this.createDefaultCostructor,
+					this.createDefaultCostructor = createDefaultConstructor);
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
new file mode 100644
index 0000000000..5a0405f536
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
@@ -0,0 +1,54 @@
+package org.eclipse.e4.internal.tools.wizards.classes.templates;
+
+import org.eclipse.e4.internal.tools.wizards.classes.NewToolControlClassWizard.ToolControlClass;
+
+public class ToolControlTemplate
+{
+  protected static String nl;
+  public static synchronized ToolControlTemplate create(String lineSeparator)
+  {
+    nl = lineSeparator;
+    ToolControlTemplate result = new ToolControlTemplate();
+    nl = null;
+    return result;
+  }
+
+  public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+  protected final String TEXT_1 = "package ";
+  protected final String TEXT_2 = ";";
+  protected final String TEXT_3 = NL + NL + "import javax.annotation.PostConstruct;";
+  protected final String TEXT_4 = NL + "import javax.inject.Inject;";
+  protected final String TEXT_5 = NL + NL + "public class ";
+  protected final String TEXT_6 = " {" + NL + "\t";
+  protected final String TEXT_7 = NL + "\t@Inject" + NL + "\tpublic ";
+  protected final String TEXT_8 = "() {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_9 = NL + "\t@PostConstruct" + NL + "\tpublic void ";
+  protected final String TEXT_10 = "() {" + NL + "\t\t" + NL + "\t}" + NL + "}";
+
+  public String generate(Object argument)
+  {
+    final StringBuffer stringBuffer = new StringBuffer();
+     ToolControlClass domainClass = (ToolControlClass)argument; 
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
+    stringBuffer.append(TEXT_1);
+    stringBuffer.append( domainClass.getPackageFragment().getElementName() );
+    stringBuffer.append(TEXT_2);
+     } 
+    stringBuffer.append(TEXT_3);
+     if( domainClass.isCreateDefaultConstructor() )  { 
+    stringBuffer.append(TEXT_4);
+     } 
+    stringBuffer.append(TEXT_5);
+    stringBuffer.append( domainClass.getName() );
+    stringBuffer.append(TEXT_6);
+     if( domainClass.isCreateDefaultConstructor() )  { 
+    stringBuffer.append(TEXT_7);
+    stringBuffer.append( domainClass.getName() );
+    stringBuffer.append(TEXT_8);
+     } 
+    stringBuffer.append(TEXT_9);
+    stringBuffer.append( domainClass.getCreateGuiMethodName() );
+    stringBuffer.append(TEXT_10);
+    return stringBuffer.toString();
+  }
+}
diff --git a/bundles/org.eclipse.e4.tools/templates/toolControl.txtjet b/bundles/org.eclipse.e4.tools/templates/toolControl.txtjet
new file mode 100644
index 0000000000..524631cd6a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/templates/toolControl.txtjet
@@ -0,0 +1,23 @@
+<%@ jet package="org.eclipse.e4.internal.tools.wizards.classes.templates" class="ToolControlTemplate" imports="org.eclipse.e4.internal.tools.wizards.classes.NewToolControlClassWizard.ToolControlClass" %>
+<% ToolControlClass domainClass = (ToolControlClass)argument; %>
+<% if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { %>
+package <%= domainClass.getPackageFragment().getElementName() %>;
+<% } %>
+
+import javax.annotation.PostConstruct;
+<% if( domainClass.isCreateDefaultConstructor() )  { %>
+import javax.inject.Inject;
+<% } %>
+
+public class <%= domainClass.getName() %> {
+	<% if( domainClass.isCreateDefaultConstructor() )  { %>
+	@Inject
+	public <%= domainClass.getName() %>() {
+		
+	}
+	<% } %>
+	@PostConstruct
+	public void <%= domainClass.getCreateGuiMethodName() %>() {
+		
+	}
+}
\ No newline at end of file

From 36e59152c4f4d608ed6f42467f43ae278965f5d2 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Tue, 1 Apr 2014 18:27:40 -0400
Subject: [PATCH 0734/1286] Bug 431755 - [model editor] deleting multiple items
 in tree only deletes the first one

Change-Id: I4c942162fbbf252afc13fb65039fc1f8e0e68e68
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../tools/emf/ui/internal/common/ModelEditor.java  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index add2ecfeba..0dfccb8350 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,6 +10,7 @@
  *     Wim Jongman <wim.jongman@remainsoftware.com> - Maintenance
  *     Marco Descher <marco@descher.at> - Bug395982, 426653, 422465
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Steven Spungin <steven@spungin.tv> - Bug 431755
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
@@ -529,16 +530,19 @@ private Composite createFormTab(Composite composite) {
 			@Override
 			public void keyReleased(final KeyEvent e) {
 				if (e.keyCode == SWT.DEL) {
+					List<EObject> list = new ArrayList<EObject>();
 					final IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
-					if (selection.getFirstElement() instanceof EObject) {
-						EObject o = (EObject) selection.getFirstElement();
-
-						Command cmd = DeleteCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), o);
+					for (Object o : ((StructuredSelection) selection).toList()) {
+						if (o instanceof EObject) {
+							list.add((EObject) o);
+						}
+					}
+					if (list.isEmpty() == false) {
+						Command cmd = DeleteCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), list);
 						if (cmd.canExecute()) {
 							ModelEditor.this.modelProvider.getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
-
 				}
 			}
 		});

From 982bde1ea43e12cadc383cd17f64e4abf6280eac Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Tue, 1 Apr 2014 21:03:50 -0400
Subject: [PATCH 0735/1286] Bug 431744 - [CSS] Support using multiple CSS
 engines

Add style sheets for all CSS engines managed by the ThemeManager.

From 0da1b29113d203f1a43c49752181babf6d0a05d8 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Fri, 21 Mar 2014 20:38:45 -0400
Subject: [PATCH 0736/1286] Bug 404166 - Part descriptor URI is not hyperlinked

Change-Id: Ic84b1bc54728c2357a90eec75496f147e65a39f6
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../component/PartDescriptorEditor.java       | 45 +++++++++++++++++--
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index b5842ec1df..d197c48389 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Bug 404166
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -19,6 +20,8 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -33,6 +36,8 @@
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
@@ -60,6 +65,7 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
 public class PartDescriptorEditor extends AbstractComponentEditor {
@@ -67,6 +73,11 @@ public class PartDescriptorEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private IProject project;
+	// This was added for BUG 430921. The member 'project' is
+	// never set, and seems to be always null in this class.
+	@Inject
+	@Optional
+	private IProject projectInjected;
 
 	private IListProperty PART__MENUS = EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS);
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
@@ -194,10 +205,38 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		// ------------------------------------------------------------
+		final Link lnk;
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartDescriptorEditor_ClassURI);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			/*
+			 * IContributionClassCreator accepts MContribitions but
+			 * MPartDescriptor does not implement, so we need to be a bit
+			 * creative here
+			 */
+			//
+			final IContributionClassCreator c = getEditor().getContributionCreator(org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.PART);
+			if (projectInjected != null && c != null) {
+				lnk = new Link(parent, SWT.NONE);
+				lnk.setText("<A>" + Messages.PartEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
+				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+				final IObservableValue masterFinal = master;
+				lnk.addSelectionListener(new SelectionAdapter() {
+					@Override
+					public void widgetSelected(SelectionEvent e) {
+						MPart dummyPart = MBasicFactory.INSTANCE.createPart();
+						String contributionURI = ((MPartDescriptor) getMaster().getValue()).getContributionURI();
+						dummyPart.setContributionURI(contributionURI);
+						c.createOpen(dummyPart, getEditingDomain(), projectInjected, lnk.getShell());
+						((MPartDescriptor) masterFinal.getValue()).setContributionURI(dummyPart.getContributionURI());
+					}
+				});
+			} else {
+				// Dispose the lnk widget, which is unused in this else branch
+				// and screws up the layout: see https://bugs.eclipse.org/421369
+				lnk = null;
+				Label l = new Label(parent, SWT.NONE);
+				l.setText(Messages.PartDescriptorEditor_ClassURI);
+				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			}
 
 			Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

From 4d4d0de953f548a0138b09d423ab2c56852828d6 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Wed, 2 Apr 2014 14:14:54 -0400
Subject: [PATCH 0737/1286] Bug 396902 - Reloading the model causes the model
 editor tree to collapse

Change-Id: I0e22906ee88f8a6b6e9a812625badfdbe2d2627a
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../emf/ui/internal/common/ModelEditor.java   |   9 +-
 .../emf/ui/internal/common/TreeViewerEx.java  | 119 ++++++++++++++++++
 2 files changed, 124 insertions(+), 4 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 0dfccb8350..f3b4542e55 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,7 +10,7 @@
  *     Wim Jongman <wim.jongman@remainsoftware.com> - Maintenance
  *     Marco Descher <marco@descher.at> - Bug395982, 426653, 422465
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 431755
+ *     Steven Spungin <steven@spungin.tv> - Bug 396902, 431755
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
@@ -390,14 +390,15 @@ public void handleEvent(Event event) {
 
 		fragment = modelProvider.getRoot().get(0) instanceof MModelFragments;
 
+		// For Bug 396902, create this before creating the Form tab
+		emfDocumentProvider = new EMFDocumentResourceMediator(modelProvider);
+
 		editorTabFolder = new CTabFolder(composite, SWT.BOTTOM);
 		CTabItem item = new CTabItem(editorTabFolder, SWT.NONE);
 		item.setText(messages.ModelEditor_Form);
 		item.setControl(createFormTab(editorTabFolder));
 		item.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_application_form));
 
-		emfDocumentProvider = new EMFDocumentResourceMediator(modelProvider);
-
 		item = new CTabItem(editorTabFolder, SWT.NONE);
 		item.setText(messages.ModelEditor_XMI);
 		item.setControl(createXMITab(editorTabFolder));
@@ -996,7 +997,7 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 			FilteredTree viewParent = new FilteredTree(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(), true);
 			tempViewer = viewParent.getViewer();
 		} else {
-			tempViewer = new TreeViewer(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
+			tempViewer = new TreeViewerEx(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, emfDocumentProvider, modelProvider);
 		}
 		final TreeViewer viewer = tempViewer;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
new file mode 100644
index 0000000000..d30112121a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 396902
+ ******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.common.xml.EMFDocumentResourceMediator;
+import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.databinding.viewers.ObservableListTreeContentProvider;
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IDocumentListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * Adds additional functionality to TreeViewer
+ *
+ * @author Steven Spungin
+ *
+ */
+public class TreeViewerEx extends TreeViewer {
+
+	private ArrayList<String> elementsIds;
+	private ArrayList<String> selectedIds;
+
+	public TreeViewerEx(Composite parent, int style, EMFDocumentResourceMediator emfDocumentProvider, final IModelResource modelProvider) {
+		super(parent, style);
+
+		emfDocumentProvider.getDocument().addDocumentListener(new IDocumentListener() {
+
+			@Override
+			public void documentChanged(DocumentEvent event) {
+				try {
+					// restore Nodes from XmiIds
+					E4XMIResource xmiResource = (E4XMIResource) ((EObject) modelProvider.getRoot().get(0)).eResource();
+					ArrayList<Object> newElements = new ArrayList<Object>();
+					ObservableListTreeContentProvider provider = (ObservableListTreeContentProvider) getContentProvider();
+					for (String id : elementsIds) {
+						EObject eObject = xmiResource.getEObject(id);
+						if (eObject != null) {
+							newElements.add(eObject);
+							// force tree node creation
+							getFirstMatchingItem(eObject, provider, provider.getChildren(getInput()));
+						}
+					}
+					ArrayList<Object> newSelected = new ArrayList<Object>();
+					for (String id : selectedIds) {
+						EObject eObject = xmiResource.getEObject(id);
+						if (eObject != null) {
+							newSelected.add(eObject);
+							// force tree node creation
+							getFirstMatchingItem(eObject, provider, provider.getChildren(getInput()));
+						}
+					}
+					setExpandedElements(newElements.toArray(new Object[0]));
+					setSelection(new StructuredSelection(newSelected));
+
+					// update our stored id values
+					documentAboutToBeChanged(event);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+
+			}
+
+			@Override
+			public void documentAboutToBeChanged(DocumentEvent event) {
+				try {
+					// Stash XmiIds
+					Object[] elements = getExpandedElements();
+					List<?> selected = ((IStructuredSelection) getSelection()).toList();
+					E4XMIResource xmiResource = (E4XMIResource) ((EObject) modelProvider.getRoot().get(0)).eResource();
+					elementsIds = new ArrayList<String>();
+					selectedIds = new ArrayList<String>();
+					for (Object obj : elements) {
+						if (obj instanceof EObject) {
+							elementsIds.add(xmiResource.getID((EObject) obj));
+						}
+					}
+					for (Object obj : selected) {
+						if (obj instanceof EObject) {
+							selectedIds.add(xmiResource.getID((EObject) obj));
+						}
+					}
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+		});
+	}
+
+	// This will ensure the provider has created the tree node (so we can reveal
+	// it).
+	static public Object getFirstMatchingItem(EObject target, ObservableListTreeContentProvider provider, Object[] items) {
+		for (int i = 0; i < items.length; i++) {
+			if (items[i] == target) {
+				return items[i];
+			}
+			Object found = getFirstMatchingItem(target, provider, provider.getChildren(items[i]));
+			if (found != null) {
+				return found;
+			}
+		}
+		return null;
+	}
+}

From 0c950924c27aa2c14232b082de99d529f3b894ad Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Wed, 2 Apr 2014 19:25:59 -0400
Subject: [PATCH 0738/1286] Bug 431847 - duplicate top level items created in
 tree when editing xmi

Change-Id: I504de19c6070dcd576a9b233b4b04b749baad548
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../tools/emf/ui/internal/common/TreeViewerEx.java  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
index d30112121a..e05c4acddf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 396902
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 396902, Bug 431847
  ******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common;
@@ -48,12 +48,13 @@ public void documentChanged(DocumentEvent event) {
 					E4XMIResource xmiResource = (E4XMIResource) ((EObject) modelProvider.getRoot().get(0)).eResource();
 					ArrayList<Object> newElements = new ArrayList<Object>();
 					ObservableListTreeContentProvider provider = (ObservableListTreeContentProvider) getContentProvider();
+					Object[] children = new Object[] { modelProvider.getRoot().get(0) };
 					for (String id : elementsIds) {
 						EObject eObject = xmiResource.getEObject(id);
 						if (eObject != null) {
 							newElements.add(eObject);
 							// force tree node creation
-							getFirstMatchingItem(eObject, provider, provider.getChildren(getInput()));
+							getFirstMatchingItem(eObject, provider, children);
 						}
 					}
 					ArrayList<Object> newSelected = new ArrayList<Object>();
@@ -62,14 +63,14 @@ public void documentChanged(DocumentEvent event) {
 						if (eObject != null) {
 							newSelected.add(eObject);
 							// force tree node creation
-							getFirstMatchingItem(eObject, provider, provider.getChildren(getInput()));
+							getFirstMatchingItem(eObject, provider, children);
 						}
 					}
 					setExpandedElements(newElements.toArray(new Object[0]));
 					setSelection(new StructuredSelection(newSelected));
 
 					// update our stored id values
-					documentAboutToBeChanged(event);
+					reloadIds(modelProvider);
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
@@ -78,6 +79,10 @@ public void documentChanged(DocumentEvent event) {
 
 			@Override
 			public void documentAboutToBeChanged(DocumentEvent event) {
+				reloadIds(modelProvider);
+			}
+
+			private void reloadIds(final IModelResource modelProvider) {
 				try {
 					// Stash XmiIds
 					Object[] elements = getExpandedElements();

From db0ef32d14446cec45d55aa28ee1f27fdf0dfaa6 Mon Sep 17 00:00:00 2001
From: trylimits <nicohoess@gmail.com>
Date: Fri, 4 Apr 2014 10:57:26 +0200
Subject: [PATCH 0739/1286] Bug 431982 spelling mistake in icon search dialog

Signed-off-by: trylimits <nicohoess@gmail.com>
---
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.properties    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 33ced54147..160cac6529 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -493,7 +493,7 @@ VWindowTrimEditor_TreeLabelDescription=Window Trims Bla Bla Bla Bla Bla
 VWindowTrimEditor_Controls=Controls
 VWindowTrimEditor_AddWindowTrim=Window Trim
 
-AbstractIconDialog_IconName=IconName
+AbstractIconDialog_IconName=Icon Name
 
 BindingContextSelectionDialog_ShellTitle=BindingContext Dialog
 BindingContextSelectionDialog_Title=BindingContext

From ed1c9e314ef4910c852838ccf71c1b1ddc9efe69 Mon Sep 17 00:00:00 2001
From: Leo Denault <ldena023@uottawa.ca>
Date: Fri, 14 Mar 2014 09:23:39 -0400
Subject: [PATCH 0740/1286] Bug 426397 - Provide an eclipse editor based on
 OrionEditorControl

Implemented Save As feature.

Change-Id: I9723ac88b637e4dc99a5db23eb8a07f2bfc14e9d
Signed-off-by: Leo Denault <ldena023@uottawa.ca>

From 58e5b61543b754ebaee0c4f1107bf3630f3c4da1 Mon Sep 17 00:00:00 2001
From: Leo Denault <ldena023@uottawa.ca>
Date: Fri, 4 Apr 2014 11:54:14 -0400
Subject: [PATCH 0741/1286] Bug 426397 - Provide an eclipse editor based on
 OrionEditorControl

Fixed focus problem where the OrionEditorControl wouldn't gain focus
upon clicking within it.

Change-Id: Icee28646768b216676f25687222cdfa021057661
Signed-off-by: Leo Denault <ldena023@uottawa.ca>

From 85022ead842fbb6762ebc849277ea22bcaeb0a7d Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Fri, 4 Apr 2014 22:19:54 -0400
Subject: [PATCH 0742/1286] Bug 431735 - e4 Model Editor Table Tab

Change-Id: I1404b5e00defe2417177390a86d0ea444aaa0d03
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../editor3x/ModelEditorPreferencePage.java   | 126 +++++---
 .../e4/tools/emf/ui/internal/Messages.java    |  19 ++
 .../tools/emf/ui/internal/Messages.properties |  20 ++
 .../ui/internal/PreferenceInitializer.java    |  35 ++-
 .../emf/ui/internal/common/ModelEditor.java   | 151 ++++++++-
 .../tabs/EAttributeEditingSupport.java        |  75 +++++
 .../tabs/EAttributeTableViewerColumn.java     |  64 ++++
 .../common/component/tabs/EmfUtil.java        |  85 +++++
 .../common/component/tabs/IGotoObject.java    |  32 ++
 .../common/component/tabs/IViewEObjects.java  |  57 ++++
 .../common/component/tabs/ListTab.java        | 293 ++++++++++++++++++
 .../tabs/ModelResourceContentProvider.java    | 103 ++++++
 .../component/tabs/TableViewerUtil.java       |  61 ++++
 .../xml/EMFDocumentResourceMediator.java      |  31 ++
 14 files changed, 1102 insertions(+), 50 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
index 64315c76c1..f1a2207657 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
@@ -1,3 +1,9 @@
+/*******************************************************************************
+ *
+ * Contributors:
+ *     Steven Spungin <steven@spungin.tv> - Bug 431735
+ ******************************************************************************/
+
 package org.eclipse.e4.tools.emf.editor3x;
 
 import org.eclipse.core.runtime.preferences.InstanceScope;
@@ -10,17 +16,19 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
 
-public class ModelEditorPreferencePage extends PreferencePage implements
-		IWorkbenchPreferencePage {
+public class ModelEditorPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
 	private BooleanFieldEditor fAutoGeneratedId;
 	private BooleanFieldEditor fShowXMIId;
 	private ColorFieldEditor fColorValueNotRendered;
 	private ColorFieldEditor fColorValueNotVisible;
 	private ColorFieldEditor fColorValueNotVisibleAndRendered;
+	private BooleanFieldEditor fShowListTab;
+	private BooleanFieldEditor fShowSearch;
 
 	public ModelEditorPreferencePage() {
 	}
@@ -34,53 +42,93 @@ public ModelEditorPreferencePage(String title, ImageDescriptor image) {
 	}
 
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(new ScopedPreferenceStore(InstanceScope.INSTANCE,"org.eclipse.e4.tools.emf.ui"));
+		setPreferenceStore(new ScopedPreferenceStore(InstanceScope.INSTANCE, "org.eclipse.e4.tools.emf.ui"));
 	}
 
 	@Override
 	protected Control createContents(Composite parent) {
 		Composite result = new Composite(parent, SWT.NONE);
 		result.setLayout(new GridLayout());
-		
-		{
-			fColorValueNotRendered = new ColorFieldEditor("notRenderedColor", "Not rendered color", result);
-			fColorValueNotRendered.setPage(this);
-			fColorValueNotRendered.setPreferenceStore(getPreferenceStore());
-			fColorValueNotRendered.load();			
-		}
 
 		{
-			fColorValueNotVisible = new ColorFieldEditor("notVisibleColor", "Not visible color", result);
-			fColorValueNotVisible.setPage(this);
-			fColorValueNotVisible.setPreferenceStore(getPreferenceStore());
-			fColorValueNotVisible.load();			
-		}
-		
-		{
-			fColorValueNotVisibleAndRendered = new ColorFieldEditor("notVisibleAndRenderedColor", "Not visible and not rendered color", result);
-			fColorValueNotVisibleAndRendered.setPage(this);
-			fColorValueNotVisibleAndRendered.setPreferenceStore(getPreferenceStore());
-			fColorValueNotVisibleAndRendered.load();			
+			Group group = new Group(result, SWT.NONE);
+			group.setText("Color");
+			group.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
+			group.setLayout(new GridLayout(2, false));
+
+			{
+				fColorValueNotRendered = new ColorFieldEditor("notRenderedColor", "Not rendered color", group);
+				fColorValueNotRendered.setPage(this);
+				fColorValueNotRendered.setPreferenceStore(getPreferenceStore());
+				fColorValueNotRendered.load();
+			}
+
+			{
+				fColorValueNotVisible = new ColorFieldEditor("notVisibleColor", "Not visible color", group);
+				fColorValueNotVisible.setPage(this);
+				fColorValueNotVisible.setPreferenceStore(getPreferenceStore());
+				fColorValueNotVisible.load();
+			}
+
+			{
+				fColorValueNotVisibleAndRendered = new ColorFieldEditor("notVisibleAndRenderedColor", "Not visible and not rendered color", group);
+				fColorValueNotVisibleAndRendered.setPage(this);
+				fColorValueNotVisibleAndRendered.setPreferenceStore(getPreferenceStore());
+				fColorValueNotVisibleAndRendered.load();
+			}
 		}
-		
+
 		{
-			Composite container = new Composite(result, SWT.NONE);
-			container.setLayoutData(new GridData(GridData.FILL,GridData.CENTER,false,false,2,1));
-			fAutoGeneratedId = new BooleanFieldEditor("autoCreateElementId", "Autogenerate Element-Id", container);
-			fAutoGeneratedId.setPage(this);
-			fAutoGeneratedId.setPreferenceStore(getPreferenceStore());
-			fAutoGeneratedId.load();			
+			Group group = new Group(result, SWT.NONE);
+			group.setText("Form Tab");
+			group.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
+			group.setLayout(new GridLayout(2, false));
+
+			{
+				Composite container = new Composite(group, SWT.NONE);
+				container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
+				fAutoGeneratedId = new BooleanFieldEditor("autoCreateElementId", "Autogenerate Element-Id", container);
+				fAutoGeneratedId.setPage(this);
+				fAutoGeneratedId.setPreferenceStore(getPreferenceStore());
+				fAutoGeneratedId.load();
+			}
+
+			{
+				Composite container = new Composite(group, SWT.NONE);
+				container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
+				fShowXMIId = new BooleanFieldEditor("showXMIId", "Show XMI:ID", container);
+				fShowXMIId.setPage(this);
+				fShowXMIId.setPreferenceStore(getPreferenceStore());
+				fShowXMIId.load();
+			}
+
+			{
+				Composite container = new Composite(group, SWT.NONE);
+				container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
+				fShowSearch = new BooleanFieldEditor("tab-form-search-show", "Searchable tree on form tab\n" + "(forces read only XMI tab)\n" + "(requires reopening model)", container);
+				fShowSearch.setPage(this);
+				fShowSearch.setPreferenceStore(getPreferenceStore());
+				fShowSearch.load();
+			}
+
 		}
-		
+
 		{
-			Composite container = new Composite(result, SWT.NONE);
-			container.setLayoutData(new GridData(GridData.FILL,GridData.CENTER,false,false,2,1));
-			fShowXMIId = new BooleanFieldEditor("showXMIId", "Show XMI:ID", container);
-			fShowXMIId.setPage(this);
-			fShowXMIId.setPreferenceStore(getPreferenceStore());
-			fShowXMIId.load();			
+			Group group = new Group(result, SWT.NONE);
+			group.setText("Tabs");
+			group.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
+			group.setLayout(new GridLayout(2, false));
+
+			{
+				Composite container = new Composite(group, SWT.NONE);
+				container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
+				fShowListTab = new BooleanFieldEditor("tab-list-show", "Show List Tab", container);
+				fShowListTab.setPage(this);
+				fShowListTab.setPreferenceStore(getPreferenceStore());
+				fShowListTab.load();
+			}
 		}
-		
+
 		return result;
 	}
 
@@ -91,6 +139,8 @@ public boolean performOk() {
 		fColorValueNotRendered.store();
 		fColorValueNotVisible.store();
 		fColorValueNotVisibleAndRendered.store();
+		fShowListTab.store();
+		fShowSearch.store();
 		return super.performOk();
 	}
 
@@ -101,9 +151,11 @@ protected void performDefaults() {
 		fColorValueNotRendered.loadDefault();
 		fColorValueNotVisible.loadDefault();
 		fColorValueNotVisibleAndRendered.loadDefault();
+		fShowListTab.loadDefault();
+		fShowSearch.loadDefault();
 		super.performDefaults();
 	}
-	
+
 	@Override
 	public void dispose() {
 		super.dispose();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 9ebdff810f..b84dd7521f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Marco Descher <marco@descher.at> - Bug 395982, 396975, 426653
+ *     Steven Spungin <steven@spungin.tv> - Bug 431735
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
@@ -644,4 +645,22 @@ public class Messages {
 	public String ModelEditor_ExtractFragment_NoParentId;
 	public String KeyBindingEditor_SequenceLowercase;
 	public String ModelTooling_CommandId_tooltip;
+
+	public static String ModelEditor_goto_list;
+	public static String ModelEditor_goto_xmi;
+	public static String EmfUtil_ex_attribute_not_found;
+	public static String ListTab_0;
+	public static String ListTab_1;
+	public static String ListTab_2;
+	public static String ListTab_3;
+	public static String ListTab_4;
+	public static String ListTab_5;
+	public static String ListTab_6;
+	public static String ListTab_7;
+	public static String ListTab_8;
+	public static String ListTab_9;
+	public static String ListTab_col_id;
+	public static String ListTab_col_item;
+	public static String ListTab_col_label;
+	public static String ListTab_col_go;
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 160cac6529..5088e954dd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -9,6 +9,7 @@
 # *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
 # *		Sopot Cela <sopotcela@gmail.com> - enhancements
 # *     Marco Descher <marco@descher.at> - Bug 395982, 396975, 426653
+# *     Steven Spungin <steven@spungin.tv> - Bug 431735
 # ******************************************************************************
 ModelTooling_Common_Up=Up
 ModelTooling_Common_Down=Down
@@ -654,5 +655,24 @@ Special_UnknownElement_Detail= Use an extension point!
 VWindowSharedElementsEditor_Area=Area
 ModelEditor_ExtractFragment=Extract into a fragment
 ModelEditor_ExtractFragment_NoParentId=Can not extract because parent container has no ID. \nAdd an ID and try again.
+ModelEditor_goto_list=Goto List
+ModelEditor_goto_xmi=Goto XMI
 KeyBindingEditor_SequenceLowercase=Key sequences should be specified in uppercase characters
 ModelTooling_CommandId_tooltip=Command identifier. Must be defined for a command to work properly.
+
+
+EmfUtil_ex_attribute_not_found=Attribute not found: 
+ListTab_0=List
+ListTab_1=Mark Duplicate IDs
+ListTab_2=Duplicate IDs will be highlighted
+ListTab_3=Repair Duplicate IDs
+ListTab_4=Duplicate IDs will be replaced using a unique suffix
+ListTab_5=Delete Selected Items
+ListTab_6=Selected items will be deleted
+ListTab_7=Showing items with attribute: 
+ListTab_8=xmi
+ListTab_9=form
+ListTab_col_id=ID
+ListTab_col_item=Item
+ListTab_col_label=Label
+ListTab_col_go=Go
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
index 2068b5c289..2587345ef7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
@@ -1,3 +1,9 @@
+/*******************************************************************************
+ *
+ * Contributors:
+ *     Steven Spungin <steven@spungin.tv> - Bug 431735
+ ******************************************************************************/
+
 package org.eclipse.e4.tools.emf.ui.internal;
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
@@ -10,25 +16,36 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
 
 	@Override
 	public void initializeDefaultPreferences() {
-		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode("org.eclipse.e4.tools.emf.ui");
+		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode("org.eclipse.e4.tools.emf.ui"); //$NON-NLS-1$
 
-		if (pref.get("notRenderedColor", null) == null) {
+		if (pref.get("notRenderedColor", null) == null) { //$NON-NLS-1$
 			String val = StringConverter.asString(new RGB(200, 200, 200));
-			pref.put("notRenderedColor", val);
+			pref.put("notRenderedColor", val); //$NON-NLS-1$
 		}
 
-		if (pref.get("notVisibleColor", null) == null) {
+		if (pref.get("notVisibleColor", null) == null) { //$NON-NLS-1$
 			String val = StringConverter.asString(new RGB(200, 200, 200));
-			pref.put("notVisibleColor", val);
+			pref.put("notVisibleColor", val); //$NON-NLS-1$
 		}
 
-		if (pref.get("notVisibleAndRenderedColor", null) == null) {
+		if (pref.get("notVisibleAndRenderedColor", null) == null) { //$NON-NLS-1$
 			String val = StringConverter.asString(new RGB(200, 200, 200));
-			pref.put("notVisibleAndRenderedColor", val);
+			pref.put("notVisibleAndRenderedColor", val); //$NON-NLS-1$
+		}
+
+		if (pref.get("autoCreateElementId", null) == null) { //$NON-NLS-1$
+			pref.putBoolean("autoCreateElementId", true); //$NON-NLS-1$
+		}
+
+		// TODO: if accepted, this should default to true
+		if (pref.get("tab-list-show", null) == null) { //$NON-NLS-1$
+			pref.putBoolean("tab-list-show", false); //$NON-NLS-1$
 		}
 
-		if (pref.get("autoCreateElementId", null) == null) {
-			pref.putBoolean("autoCreateElementId", true);
+		// TODO: After XMI tab is not forced disabled, this should default to
+		// true
+		if (pref.get("tab-form-search-show", null) == null) { //$NON-NLS-1$
+			pref.putBoolean("tab-form-search-show", false); //$NON-NLS-1$
 		}
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index f3b4542e55..32fac0dda0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,11 +10,12 @@
  *     Wim Jongman <wim.jongman@remainsoftware.com> - Maintenance
  *     Marco Descher <marco@descher.at> - Bug395982, 426653, 422465
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 396902, 431755
+ *     Steven Spungin <steven@spungin.tv> - Bug 396902, 431755, 431735
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -40,6 +41,7 @@
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.RegistryFactory;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Execute;
@@ -103,6 +105,9 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.TrimmedWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WizardDialogEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.EmfUtil;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.IGotoObject;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.ListTab;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationAddons;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationCategoriesEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationWindowEditor;
@@ -186,7 +191,9 @@
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentPartitioner;
+import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.TextSelection;
 import org.eclipse.jface.text.rules.FastPartitioner;
 import org.eclipse.jface.text.source.Annotation;
 import org.eclipse.jface.text.source.AnnotationModel;
@@ -234,7 +241,7 @@
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.TreeItem;
 
-public class ModelEditor {
+public class ModelEditor implements IGotoObject {
 	private static final String ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED = "org.eclipse.e4.tools.modeleditor.filteredtree.enabled.xmitab.disabled";//$NON-NLS-1$
 
 	public static final String CSS_CLASS_KEY = "org.eclipse.e4.ui.css.CssClassName"; //$NON-NLS-1$
@@ -266,6 +273,10 @@ public class ModelEditor {
 
 	private static final int VERTICAL_RULER_WIDTH = 20;
 
+	public static final int TAB_FORM = 0;
+	public static final int TAB_XMI = 1;
+	public static final int TAB_LIST = 2;
+
 	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
 	private Map<String, AbstractComponentEditor> virtualEditors = new HashMap<String, AbstractComponentEditor>();
 	private Map<Class<?>, List<AbstractElementEditorContribution>> tabContributions = new HashMap<Class<?>, List<AbstractElementEditorContribution>>();
@@ -296,6 +307,10 @@ public class ModelEditor {
 	@Preference(nodePath = "org.eclipse.e4.tools.emf.ui", value = "showXMIId")
 	private boolean showXMIId;
 
+	@Inject
+	@Preference(nodePath = "org.eclipse.e4.tools.emf.ui")
+	IEclipsePreferences preferences;
+
 	@Inject
 	@Optional
 	private IExtensionLookup extensionLookup;
@@ -326,6 +341,8 @@ public class ModelEditor {
 
 	private boolean saving;
 
+	private ListTab listTab;
+
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project, final IResourcePool resourcePool) {
 		this.resourcePool = resourcePool;
 		this.modelProvider = modelProvider;
@@ -412,6 +429,8 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
+		tab_list_show(preferences.getBoolean("tab-list-show", false)); //$NON-NLS-1$
+
 		editorTabFolder.setSelection(0);
 	}
 
@@ -485,7 +504,7 @@ public void run() {
 		});
 
 		String property = System.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
-		if (property != null) {
+		if (property != null || preferences.getBoolean("tab-form-search-show", false)) { //$NON-NLS-1$
 			sourceViewer.setEditable(false);
 			sourceViewer.getTextWidget().setEnabled(false);
 		}
@@ -852,6 +871,31 @@ public void run() {
 				};
 
 				manager.add(expandAction);
+
+				if (s.getFirstElement() instanceof EObject) {
+					manager.add(new Separator());
+					final EObject el = (EObject) s.getFirstElement();
+					Action gotoXmiAction = new Action(Messages.ModelEditor_goto_xmi) {
+						@Override
+						public void run() {
+							gotoEObject(TAB_XMI, el);
+						}
+					};
+					manager.add(gotoXmiAction);
+
+					if (listTab != null) {
+						if (EmfUtil.getAttribute(el, "elementId") != null) { //$NON-NLS-1$
+							Action gotoListAction = new Action(Messages.ModelEditor_goto_list) {
+								@Override
+								public void run() {
+									gotoEObject(TAB_LIST, el);
+								}
+							};
+							manager.add(gotoListAction);
+						}
+					}
+
+				}
 			}
 		});
 
@@ -993,7 +1037,7 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 
 		TreeViewer tempViewer = null;
 		String property = System.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
-		if (property != null) {
+		if (property != null || preferences.getBoolean("tab-form-search-show", false)) { //$NON-NLS-1$
 			FilteredTree viewParent = new FilteredTree(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(), true);
 			tempViewer = viewParent.getViewer();
 		} else {
@@ -1234,6 +1278,29 @@ private void registerDefaultEditors() {
 		registerEditor(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT, ContextInjectionFactory.make(StringModelFragment.class, context));
 	}
 
+	@Inject
+	public void tab_list_show(@Preference("tab-list-show") Boolean show) {
+		if (editorTabFolder == null) {
+			return;
+		}
+		if (show == false) {
+			if (listTab != null) {
+				// remove the tab from the folder
+				listTab.getTabItem().dispose();
+				ContextInjectionFactory.uninject(listTab, listTab.getContext());
+				listTab = null;
+			}
+		} else {
+			if (listTab == null) {
+				IEclipseContext child = context.createChild();
+				child.set(CTabFolder.class, editorTabFolder);
+				child.set(EMFDocumentResourceMediator.class, emfDocumentProvider);
+				child.set(IGotoObject.class, this);
+				listTab = ContextInjectionFactory.make(ListTab.class, child);
+			}
+		}
+	}
+
 	@Inject
 	public void setNotVisibleColor(@Preference("notVisibleColor") String color) {
 		RGB current = JFaceResources.getColorRegistry().getRGB(ComponentLabelProvider.NOT_VISIBLE_KEY);
@@ -1721,4 +1788,80 @@ private boolean isValidDrop(Object target, MApplicationElement instance, boolean
 		}
 	}
 
+	@Override
+	public void gotoEObject(int targetHint, EObject object) {
+		if (object == null) {
+			// do nothing
+		} else {
+			switch (targetHint) {
+			case TAB_FORM:
+				// make sure tree node has been instantiated
+				ObservableListTreeContentProvider provider = (ObservableListTreeContentProvider) viewer.getContentProvider();
+				getFirstMatchingItem(object, provider, provider.getChildren(viewer.getInput()));
+
+				viewer.reveal(object);
+				viewer.setSelection(new StructuredSelection(object));
+				editorTabFolder.setSelection(0);
+				break;
+			case TAB_XMI:
+				editorTabFolder.setSelection(1);
+				// model was not updating in xmi document (selection listener
+				// was not firing from programatic setSelection()
+				emfDocumentProvider.updateFromEMF();
+
+				try {
+					// select the entire start tag
+					IRegion region = emfDocumentProvider.findStartTag(object);
+					if (region != null) {
+						sourceViewer.setSelection(new TextSelection(region.getOffset(), region.getLength()), true);
+					} else {
+						sourceViewer.setSelection(new TextSelection(0, 0), true);
+					}
+					//					String elementId = (String) EmfUtil.getAttributeValue(object, "elementId"); //$NON-NLS-1$
+					// if (elementId != null && elementId.isEmpty() == false) {
+					// int loc2 = emfDocumentProvider.indexOf(object);
+					// loc = emfDocumentProvider.getDocument().search(0,
+					// elementId, true, true, true);
+					// if (loc >= 0) {
+					// ISelection selection = new TextSelection(loc,
+					// elementId.length());
+					// sourceViewer.setSelection(selection, true);
+					// } else {
+					// sourceViewer.setSelection(new TextSelection(0, 0));
+					// }
+					// } else {
+					// sourceViewer.setSelection(new TextSelection(0, 0));
+					// }
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+				break;
+			case TAB_LIST:
+				if (listTab != null) {
+					editorTabFolder.setSelection(Arrays.asList(editorTabFolder.getItems()).indexOf(listTab.getTabItem()));
+					listTab.getViewer().setSelection(new StructuredSelection(object), true);
+				}
+				break;
+			default:
+				break;
+			}
+			// }
+		}
+	}
+
+	// This will ensure the provider has created the tree node (so we can reveal
+	// it).
+	private Object getFirstMatchingItem(EObject target, ObservableListTreeContentProvider provider, Object[] items) {
+		for (int i = 0; i < items.length; i++) {
+			if (items[i] == target) {
+				return items[i];
+			}
+			Object found = getFirstMatchingItem(target, provider, provider.getChildren(items[i]));
+			if (found != null) {
+				return found;
+			}
+		}
+		return null;
+	}
+
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
new file mode 100644
index 0000000000..4c30a06e28
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
+
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.EditingSupport;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.swt.SWT;
+
+class EAttributeEditingSupport extends EditingSupport {
+
+	private String attName;
+	private TextCellEditor editor;
+	private TableViewer tableViewer;
+	private boolean wasNull;
+	private IEclipseContext context;
+
+	public EAttributeEditingSupport(TableViewer tableViewer, String attName, IEclipseContext context) {
+		super(tableViewer);
+		this.tableViewer = tableViewer;
+		this.attName = attName;
+		this.context = context;
+		editor = new TextCellEditor(tableViewer.getTable(), SWT.NONE);
+	}
+
+	@Override
+	protected CellEditor getCellEditor(Object element) {
+		return editor;
+	}
+
+	@Override
+	protected boolean canEdit(Object element) {
+		return EmfUtil.getAttribute((EObject) element, attName) != null;
+	}
+
+	@Override
+	protected Object getValue(Object element) {
+		EObject eObject = (EObject) element;
+		Object value = eObject.eGet(EmfUtil.getAttribute(eObject, attName));
+		if (value == null) {
+			value = ""; //$NON-NLS-1$
+			wasNull = true;
+		} else {
+			wasNull = false;
+		}
+		return value;
+	}
+
+	@Override
+	protected void setValue(Object element, Object value) {
+		EObject eObject = (EObject) element;
+		if (value.equals("") && wasNull) { //$NON-NLS-1$
+			value = null;
+		}
+		Command cmd = SetCommand.create(context.get(EditingDomain.class), eObject, EmfUtil.getAttribute(eObject, attName), value);
+		context.get(EditingDomain.class).getCommandStack().execute(cmd);
+		TableViewerUtil.updateAndPack(tableViewer, eObject);
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
new file mode 100644
index 0000000000..63030ac51b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
+
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+
+/**
+ * A table viewer column for editing an EMF EAttribute If the object does not
+ * have an attribute with the given ID, the field is disabled.
+ * 
+ * @author Steven Spungin
+ *
+ */
+public class EAttributeTableViewerColumn {
+
+	public EAttributeTableViewerColumn(final TableViewer tvResults, String label, final String attName, final IEclipseContext context) {
+		TableViewerColumn tlc = new TableViewerColumn(tvResults, SWT.NONE);
+
+		tlc.getColumn().setText(label);
+		tlc.setLabelProvider(new ColumnLabelProvider() {
+			@Override
+			public String getText(Object element) {
+				EObject eObject = (EObject) element;
+				EAttribute eAtt = EmfUtil.getAttribute(eObject, attName);
+				Object value;
+				if (eAtt != null) {
+					value = eObject.eGet(eAtt);
+				} else {
+					value = ""; //$NON-NLS-1$
+				}
+				return super.getText(value);
+			}
+
+			@Override
+			public Color getBackground(Object element) {
+				EObject eObject = (EObject) element;
+				EAttribute eAtt = EmfUtil.getAttribute(eObject, attName);
+				if (eAtt == null) {
+					return tvResults.getTable().getDisplay().getSystemColor(SWT.COLOR_GRAY);
+				} else {
+					return super.getBackground(element);
+				}
+			}
+		});
+		tlc.setEditingSupport(new EAttributeEditingSupport(tvResults, attName, context));
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
new file mode 100644
index 0000000000..36c1557d5c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
+
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * Convenience methods for accessing EMF Objects
+ *
+ * @author Steven Spungin
+ *
+ */
+public class EmfUtil {
+	/**
+	 * Returns the EAttribute with the given name for the specified object, or
+	 * null if non-existent
+	 *
+	 * @param eObject
+	 * @param attName
+	 * @return the EAttribute with the given name for the specified object, or
+	 *         null if non-existent
+	 */
+	static public EAttribute getAttribute(EObject eObject, String attName) {
+		if (attName == null || attName.isEmpty()) {
+			return null;
+		}
+		// return (EAttribute)
+		// eObject.eGet(eObject.eClass().getEStructuralFeature(attName));
+		for (EAttribute att : eObject.eClass().getEAllAttributes()) {
+			if (attName.equals(att.getName())) {
+				return att;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the EAttribute value with the given attribute name for the
+	 * specified object. Returns null if the attribute is not define, or has
+	 * null as the value.
+	 *
+	 * @param eObject
+	 * @param attName
+	 * @return the EAttribute value with the given attribute name for the
+	 *         specified object, Returns null if the attribute is not defined,
+	 *         or has null as the value.
+	 */
+	static public Object getAttributeValue(EObject eObject, String attName) {
+		EAttribute att = getAttribute(eObject, attName);
+		if (att == null) {
+			return null;
+		} else {
+			return eObject.eGet(att);
+		}
+	}
+
+	/**
+	 * Returns the EAttribute value with the given attribute name for the
+	 * specified object. Throws if the attribute is not defined.
+	 *
+	 * @param eObject
+	 * @param attName
+	 * @return
+	 * @throws Exception
+	 */
+	static public Object getAttributeValueThrows(EObject eObject, String attName) throws Exception {
+		EAttribute att = getAttribute(eObject, attName);
+		if (att == null) {
+			throw new Exception(Messages.EmfUtil_ex_attribute_not_found + attName);
+		} else {
+			return eObject.eGet(att);
+		}
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java
new file mode 100644
index 0000000000..fecd0ee826
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * This interface allows a UI object to reveal and select an EMF object.
+ *
+ * @author Steven Spungin
+ *
+ */
+public interface IGotoObject {
+	/**
+	 *
+	 * @param targetHint
+	 *            An object specific hint used for resolution when the same
+	 *            object is available in multiple locations on the target.
+	 * @param object
+	 *            the EObject to reveal, and select.
+	 */
+	void gotoEObject(int targetHint, EObject object);
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
new file mode 100644
index 0000000000..24781744c2
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
+
+import java.util.Collection;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * This interface provides a common API for editing trees, lists, and xml
+ * editors that display EObjects.
+ *
+ * @author Steven Spungin
+ *
+ */
+public interface IViewEObjects {
+
+	/**
+	 * Highlights the indicated items. Objects that are not managed are ignored.
+	 * All other items are un-highlighted.
+	 *
+	 * @param items
+	 *            Collection of objects to highlight.
+	 */
+	void highlightEObjects(Collection<EObject> items);
+
+	/**
+	 * All EObjects that are managed by the view.
+	 *
+	 * @return All EObjects that are managed by the view's provider
+	 */
+	Collection<EObject> getAllEObjects();
+
+	/**
+	 * All EObjects that are selected by the view
+	 *
+	 * @return All EObjects that are selected by the view
+	 */
+	Collection<EObject> getSelectedEObjects();
+
+	/**
+	 * Deletes the objects specified.
+	 *
+	 * @param list
+	 *            The list of objects to delete. Objects that are not managed
+	 *            are ignored.
+	 */
+	void deleteEObjects(Collection<EObject> list);
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
new file mode 100644
index 0000000000..a793a76142
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -0,0 +1,293 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.xml.EMFDocumentResourceMediator;
+import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.DeleteCommand;
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IDocumentListener;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+/**
+ * A tab that contains a list EObjects, and provides editable columns for
+ * EObject features.
+ * 
+ * @author Steven Spungin
+ *
+ */
+public class ListTab implements IViewEObjects {
+
+	// The table will only include EObjects that define this attribute
+	private static final String FILTER_ATTRUBUTE_ID = "elementId"; //$NON-NLS-1$
+
+	ConcurrentHashMap<String, List<EObject>> mapId_Object = new ConcurrentHashMap<String, List<EObject>>();
+
+	@Inject
+	private IEclipseContext context;
+
+	@Inject
+	private IModelResource modelResource;
+
+	private TableViewer tvResults;
+
+	@Inject
+	private IGotoObject gotoObjectHandler;
+
+	@Inject
+	private IResourcePool resourcePool;
+
+	@Inject
+	MApplication app;
+
+	private CTabItem tabItem;
+
+	private ModelResourceContentProvider provider;
+
+	private IDocumentListener documentListener;
+
+	private Collection<?> highlightedItems;
+
+	@PreDestroy
+	public void preDestroy() {
+		// race condition issue with observables (exception is not thrown when
+		// break points are set)
+		tvResults.setContentProvider(ArrayContentProvider.getInstance());
+		context.get(EMFDocumentResourceMediator.class).getDocument().removeDocumentListener(documentListener);
+	}
+
+	@PostConstruct
+	public void postConstruct(final CTabFolder tabFolder) {
+
+		documentListener = new IDocumentListener() {
+
+			@Override
+			public void documentChanged(DocumentEvent event) {
+				reload();
+			}
+
+			@Override
+			public void documentAboutToBeChanged(DocumentEvent event) {
+			}
+		};
+		context.get(EMFDocumentResourceMediator.class).getDocument().addDocumentListener(documentListener);
+
+		tabItem = new CTabItem(tabFolder, SWT.NONE);
+
+		Composite composite = new Composite(tabFolder, SWT.NONE);
+		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		composite.setLayout(new GridLayout(2, false));
+		tabItem.setControl(composite);
+		tabItem.setText(Messages.ListTab_0);
+
+		tabItem.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_world_edit));
+		{
+			Label label = new Label(composite, SWT.NONE);
+			GridData layoutData = new GridData(SWT.BEGINNING, SWT.CENTER, false, false);
+			layoutData.horizontalSpan = 2;
+			label.setLayoutData(layoutData);
+			label.setText(Messages.ListTab_7 + FILTER_ATTRUBUTE_ID);
+		}
+
+		tvResults = new TableViewer(composite);
+		tvResults.getTable().setHeaderVisible(true);
+		tvResults.getTable().setLinesVisible(true);
+		// tvResults.setContentProvider(ArrayContentProvider.getInstance());
+
+		provider = new ModelResourceContentProvider();
+		tvResults.setContentProvider(provider);
+
+		tvResults.getTable().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		((GridData) tvResults.getTable().getLayoutData()).horizontalSpan = 2;
+
+		final Image imgForm = resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_application_form);
+		final Image imgXmi = resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_chart_organisation);
+
+		final TableViewerColumn colGo = new TableViewerColumn(tvResults, SWT.NONE);
+		colGo.getColumn().setText(Messages.ListTab_col_go);
+
+		colGo.setLabelProvider(new ColumnLabelProvider() {
+			@Override
+			public Image getImage(Object element) {
+				return imgForm;
+			}
+
+			@Override
+			public String getText(Object element) {
+				return ""; //$NON-NLS-1$
+			}
+		});
+
+		final TableViewerColumn colGoXmi = new TableViewerColumn(tvResults, SWT.NONE);
+		colGoXmi.getColumn().setText(Messages.ListTab_col_go);
+
+		colGoXmi.setLabelProvider(new ColumnLabelProvider() {
+			@Override
+			public String getText(Object element) {
+				return ""; //$NON-NLS-1$
+			};
+
+			@Override
+			public Image getImage(Object element) {
+				return imgXmi;
+			};
+		});
+
+		tvResults.getTable().addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseDown(MouseEvent e) {
+				if (TableViewerUtil.isColumnClicked(tvResults, e, colGo)) {
+					gotoObjectHandler.gotoEObject(ModelEditor.TAB_FORM, (EObject) TableViewerUtil.getData(tvResults, e));
+				} else if (TableViewerUtil.isColumnClicked(tvResults, e, colGoXmi)) {
+					gotoObjectHandler.gotoEObject(ModelEditor.TAB_XMI, (EObject) TableViewerUtil.getData(tvResults, e));
+				}
+			}
+		});
+
+		TableViewerColumn colItem = new TableViewerColumn(tvResults, SWT.NONE);
+		colItem.getColumn().setText(Messages.ListTab_col_item);
+		colItem.setLabelProvider(new ColumnLabelProvider() {
+			@Override
+			public String getText(Object element) {
+				EObject eObject = (EObject) element;
+				return super.getText(eObject.eClass().getName());
+			}
+		});
+
+		app.getContext().set("org.eclipse.e4.tools.active-object-viewer", this); //$NON-NLS-1$
+
+		TableViewerColumn colId = new TableViewerColumn(tvResults, SWT.NONE);
+		colId.getColumn().setText(Messages.ListTab_col_id);
+		colId.setLabelProvider(new ColumnLabelProvider() {
+			@Override
+			public String getText(Object element) {
+				EObject eObject = (EObject) element;
+				EAttribute eAtt = EmfUtil.getAttribute(eObject, FILTER_ATTRUBUTE_ID);
+				return super.getText(eObject.eGet(eAtt));
+			}
+
+			@Override
+			public Color getBackground(Object element) {
+				Color ret = super.getBackground(element);
+				if (highlightedItems != null && highlightedItems.contains(element)) {
+					return ret = tvResults.getTable().getDisplay().getSystemColor(SWT.COLOR_YELLOW);
+				}
+				return ret;
+			}
+		});
+		colId.setEditingSupport(new EAttributeEditingSupport(tvResults, FILTER_ATTRUBUTE_ID, context));
+
+		@SuppressWarnings("unused")
+		EAttributeTableViewerColumn colLabel = new EAttributeTableViewerColumn(tvResults, Messages.ListTab_col_label, "label", context); //$NON-NLS-1$
+
+		// Testing the commandName attribute column
+		// Any attribute can be added this way
+		// @SuppressWarnings("unused")
+		//EAttributeTableViewerColumn colName = new EAttributeTableViewerColumn(tvResults, Messages.ListTab_commandname, "commandName", context); //$NON-NLS-1$
+
+		reload();
+	}
+
+	public void reload() {
+		tvResults.setInput(modelResource);
+		TableViewerUtil.refreshAndPack(tvResults);
+	}
+
+	public TableViewer getViewer() {
+		return tvResults;
+	}
+
+	public CTabItem getTabItem() {
+		return tabItem;
+	}
+
+	public IEclipseContext getContext() {
+		return context;
+	}
+
+	@Override
+	public void highlightEObjects(Collection<EObject> items) {
+		highlightedItems = items;
+		tvResults.refresh();
+	}
+
+	@Override
+	public List<EObject> getAllEObjects() {
+		ArrayList<EObject> list = new ArrayList<EObject>();
+		TreeIterator<Object> itTree = EcoreUtil.getAllContents(modelResource.getRoot());
+		while (itTree.hasNext()) {
+			Object object = itTree.next();
+			EObject eObject = (EObject) object;
+			EAttribute att = EmfUtil.getAttribute(eObject, "elementId"); //$NON-NLS-1$
+			if (att != null) {
+				list.add(eObject);
+			}
+		}
+		return list;
+	}
+
+	@Override
+	public Collection<EObject> getSelectedEObjects() {
+		ArrayList<EObject> selected = new ArrayList<EObject>();
+		for (Object item : ((IStructuredSelection) tvResults.getSelection()).toList()) {
+			if (item instanceof EObject) {
+				selected.add((EObject) item);
+
+			}
+		}
+		return selected;
+	}
+
+	@Override
+	public void deleteEObjects(Collection<EObject> list) {
+		if (list.isEmpty() == false) {
+			Command cmd = DeleteCommand.create(modelResource.getEditingDomain(), list);
+			if (cmd.canExecute()) {
+				modelResource.getEditingDomain().getCommandStack().execute(cmd);
+			}
+			reload();
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
new file mode 100644
index 0000000000..1f3db3a4f4
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
@@ -0,0 +1,103 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
+
+import java.util.ArrayList;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+
+public class ModelResourceContentProvider implements IStructuredContentProvider {
+
+	private Object[] items = new Object[0];
+	private EContentAdapter adapter;
+	private Viewer viewer;
+
+	public ModelResourceContentProvider() {
+		adapter = new EContentAdapter() {
+			@Override
+			public void notifyChanged(Notification notification) {
+				switch (notification.getEventType()) {
+				case Notification.REMOVING_ADAPTER:
+					return;
+				}
+
+				if (viewer != null && viewer.getControl().isDisposed() == false) {
+					viewer.refresh();
+				}
+				super.notifyChanged(notification);
+
+				// boolean optimize = false;
+				// switch (notification.getEventType()) {
+				//
+				// case Notification.SET:
+				// // optimized to only update row if SET and not elementId
+				// // if the id is modified, we need to reindex our id map
+				// // (by forcing input)
+				//						if (notification.getFeature() != EmfUtil.getAttribute((EObject) notification.getFeature(), "elementId")) { //$NON-NLS-1$
+				// if (viewer instanceof TableViewer) {
+				// optimize = true;
+				// }
+				// }
+				// break;
+				// default:
+				// break;
+				// }
+				// if (optimize) {
+				// EClass eClass = (EClass) ((EAttribute)
+				// notification.getFeature()).eContainer();
+				// ((TableViewer) viewer).update(eClass, null);
+				// } else {
+				// viewer.setInput(viewer.getInput());
+				// }
+			}
+		};
+	}
+
+	@Override
+	public Object[] getElements(Object object) {
+		return items;
+	}
+
+	@Override
+	public void inputChanged(final Viewer viewer, Object oldInput, Object newInput) {
+		this.viewer = viewer;
+		ArrayList<EObject> list = new ArrayList<EObject>();
+		IModelResource modelProvider = (IModelResource) newInput;
+		if (newInput != oldInput && newInput != null) {
+			((EObject) modelProvider.getRoot().get(0)).eAdapters().add(adapter);
+		}
+		if (newInput != null) {
+			TreeIterator<Object> itTree = EcoreUtil.getAllContents(modelProvider.getRoot());
+			while (itTree.hasNext()) {
+				Object next = itTree.next();
+				EObject eObject = (EObject) next;
+				EAttribute att = EmfUtil.getAttribute(eObject, "elementId"); //$NON-NLS-1$
+				if (att != null) {
+					list.add(eObject);
+				}
+			}
+		}
+
+		items = list.toArray(new Object[0]);
+	}
+
+	@Override
+	public void dispose() {
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
new file mode 100644
index 0000000000..252cffd5a8
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
+
+import java.util.Arrays;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.TableColumn;
+
+public class TableViewerUtil {
+	static public void refreshAndPack(TableViewer viewer) {
+		viewer.refresh();
+		for (TableColumn col : viewer.getTable().getColumns()) {
+			col.pack();
+		}
+	}
+
+	static public void updateAndPack(TableViewer viewer, Object object) {
+		viewer.update(object, null);
+		for (TableColumn col : viewer.getTable().getColumns()) {
+			col.pack();
+		}
+	}
+
+	public static boolean isColumnClicked(TableViewer viewer, MouseEvent e, TableViewerColumn tvColumn) {
+		boolean ret;
+		ViewerCell cell = viewer.getCell(new Point(e.x, e.y));
+		if (cell == null) {
+			ret = false;
+		} else {
+			int index = Arrays.asList(viewer.getTable().getColumns()).indexOf(tvColumn.getColumn());
+			if (index == -1) {
+				ret = false;
+			} else {
+				ret = index == cell.getColumnIndex();
+			}
+		}
+		return ret;
+	}
+
+	public static Object getData(TableViewer viewer, MouseEvent e) {
+		ViewerCell cell = viewer.getCell(new Point(e.x, e.y));
+		if (cell == null) {
+			return null;
+		} else {
+			return cell.getElement();
+		}
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
index 5889901af3..9a4c036a75 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
@@ -1,3 +1,8 @@
+/*******************************************************************************
+ * Contributors:
+ *     Steven Spungin <steven@spungin.tv> - Bug 431735
+ *******************************************************************************/
+
 package org.eclipse.e4.tools.emf.ui.internal.common.xml;
 
 import java.io.IOException;
@@ -10,9 +15,12 @@
 import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
+import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.FindReplaceDocumentAdapter;
 import org.eclipse.jface.text.IDocumentListener;
+import org.eclipse.jface.text.IRegion;
 import org.xml.sax.InputSource;
 
 public class EMFDocumentResourceMediator {
@@ -92,4 +100,27 @@ private String toXMI(EObject root) {
 		}
 		return writer.toString();
 	}
+
+	/**
+	 * @param object
+	 * @return The region for the start tag of the EObject, or null if not found.
+	 */
+	public IRegion findStartTag(EObject object) {
+		if (object == null){
+			return null;
+		}
+		E4XMIResource root = (E4XMIResource) ((EObject) modelResource.getRoot().get(0)).eResource();
+		String xmiId = root.getID(object);
+
+		FindReplaceDocumentAdapter find = new FindReplaceDocumentAdapter(document);
+		IRegion region;
+		try {
+			//TODO This will not work if the element has '<' or '>' in an attribute value
+			region = find.find(0, "<.*?" + xmiId + ".*?>", true, true, false, true); //$NON-NLS-1$ //$NON-NLS-2$
+			return region;
+		} catch (BadLocationException e) {
+			return null;
+		}
+	}
+
 }

From 20b18d407b067205b9062bcc1b35c6d4b57da9bd Mon Sep 17 00:00:00 2001
From: Leo Denault <ldena023@uottawa.ca>
Date: Fri, 21 Mar 2014 08:55:16 -0400
Subject: [PATCH 0743/1286] Bug 426397 - Provide an eclipse editor based on
 OrionEditorControl

Implemented revert feature.

Change-Id: I382ae1d57f3599b18e3625b916616a07cf7ba433
Signed-off-by: Leo Denault <ldena023@uottawa.ca>

From 94b9f1db2f58e354f43a6571e33463ce27d893b2 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Fri, 18 Apr 2014 10:01:16 -0400
Subject: [PATCH 0744/1286] Bug 404136 - Model editor should be able to select
 icons from other bundles/projects

searchScope is no longer static
Externalied strings

Change-Id: Ia81dc96d068b46ce415eaefa33cf91f6b3c95f68
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../e4/tools/emf/ui/internal/Messages.java    |   3 +
 .../tools/emf/ui/internal/Messages.properties |   3 +
 .../component/dialogs/AbstractIconDialog.java | 103 ++++++++++++++----
 .../common/component/dialogs/SearchScope.java |  37 +++++++
 4 files changed, 125 insertions(+), 21 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SearchScope.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index b84dd7521f..4abb8eedd7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -482,6 +482,9 @@ public class Messages {
 	public String VWindowTrimEditor_AddWindowTrim;
 
 	public String AbstractIconDialog_IconName;
+	public String AbstractIconDialog_all_workspace_bundles;
+	public String AbstractIconDialog_current_project;
+	public String AbstractIconDialog_scope;
 
 	public String BindingContextSelectionDialog_ShellTitle;
 	public String BindingContextSelectionDialog_Title;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 5088e954dd..c347bd4784 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -495,6 +495,9 @@ VWindowTrimEditor_Controls=Controls
 VWindowTrimEditor_AddWindowTrim=Window Trim
 
 AbstractIconDialog_IconName=Icon Name
+AbstractIconDialog_all_workspace_bundles=All Workspace Bundles
+AbstractIconDialog_current_project=Current Project
+AbstractIconDialog_scope=Scope
 
 BindingContextSelectionDialog_ShellTitle=BindingContext Dialog
 BindingContextSelectionDialog_Title=BindingContext
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
index 15cdb406fe..7957885247 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Bug 404136
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -14,8 +15,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -47,11 +50,16 @@
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+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.Event;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
@@ -63,8 +71,10 @@ public abstract class AbstractIconDialog extends TitleAreaDialog {
 	private EStructuralFeature feature;
 	private EditingDomain editingDomain;
 	private Map<IFile, Image> icons = Collections.synchronizedMap(new HashMap<IFile, Image>());
+	private SearchScope searchScope = SearchScope.PROJECT;
 
 	protected Messages Messages;
+	private Text textFilter;
 
 	public AbstractIconDialog(Shell parentShell, IProject project, EditingDomain editingDomain, MApplicationElement element, EStructuralFeature feature, Messages Messages) {
 		super(parentShell);
@@ -93,11 +103,44 @@ protected Control createDialogArea(Composite parent) {
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 		container.setLayout(new GridLayout(2, false));
 
+		Label lblScope = new Label(container, SWT.NONE);
+		lblScope.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+		lblScope.setText(Messages.AbstractIconDialog_scope);
+
+		Composite compOptions = new Composite(container, SWT.NONE);
+		compOptions.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		compOptions.setLayout(new RowLayout());
+
+		Button btnProject = new Button(compOptions, SWT.RADIO);
+		btnProject.setText(Messages.AbstractIconDialog_current_project);
+		btnProject.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				searchScope = SearchScope.PROJECT;
+				textFilter.notifyListeners(SWT.Modify, new Event());
+
+			}
+		});
+		btnProject.setSelection(true);
+
+		Button btnWorkspace = new Button(compOptions, SWT.RADIO);
+		btnWorkspace.setText(Messages.AbstractIconDialog_all_workspace_bundles);
+		btnWorkspace.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				searchScope = SearchScope.WORKSPACE;
+				textFilter.notifyListeners(SWT.Modify, new Event());
+			}
+		});
+
+		btnWorkspace.setSelection(searchScope == SearchScope.WORKSPACE);
+		btnProject.setSelection(searchScope == SearchScope.PROJECT);
+
 		Label l = new Label(container, SWT.NONE);
 		l.setText(Messages.AbstractIconDialog_IconName);
 
-		final Text t = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
-		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		textFilter = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		textFilter.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		new Label(container, SWT.NONE);
 
@@ -135,7 +178,7 @@ public void update(ViewerCell cell) {
 
 				String bundle = getBundle(file);
 				if (bundle != null) {
-					styledString.append(" - " + bundle, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$	
+					styledString.append(" - " + bundle, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 				}
 
 				cell.setImage(img);
@@ -154,7 +197,7 @@ public void doubleClick(DoubleClickEvent event) {
 			}
 		});
 
-		t.addModifyListener(new ModifyListener() {
+		textFilter.addModifyListener(new ModifyListener() {
 			private IconMatchCallback callback;
 			private Timer timer = new Timer(true);
 			private TimerTask task;
@@ -172,7 +215,7 @@ public void modifyText(ModifyEvent e) {
 				clearImages();
 
 				callback = new IconMatchCallback(list);
-				task = new SearchThread(callback, t.getText(), project);
+				task = new SearchThread(callback, textFilter.getText(), project, searchScope);
 				timer.schedule(task, 500);
 			}
 		});
@@ -282,38 +325,56 @@ private static class SearchThread extends TimerTask {
 		private final StringMatcher matcherGif;
 		private final StringMatcher matcherJpg;
 		private final StringMatcher matcherPng;
+		private SearchScope searchScope;
 
-		public SearchThread(IconMatchCallback callback, String pattern, IProject project) {
+		public SearchThread(IconMatchCallback callback, String pattern, IProject project, SearchScope searchScope) {
 			this.matcherGif = new StringMatcher("*" + pattern + "*.gif", true, false); //$NON-NLS-1$//$NON-NLS-2$
 			this.matcherJpg = new StringMatcher("*" + pattern + "*.jpg", true, false); //$NON-NLS-1$//$NON-NLS-2$
 			this.matcherPng = new StringMatcher("*" + pattern + "*.png", true, false); //$NON-NLS-1$//$NON-NLS-2$
 			this.callback = callback;
 			this.project = project;
+			this.searchScope = searchScope;
 		}
 
 		@Override
 		public void run() {
+			List<IProject> projects;
+			switch (searchScope) {
+			case WORKSPACE:
+				projects = Arrays.asList(project.getWorkspace().getRoot().getProjects());
+				break;
+			case PROJECT:
+			default:
+				projects = Arrays.asList(project);
+				break;
+			}
 			try {
-				project.accept(new IResourceVisitor() {
+				for (IProject project : projects) {
+					// Only search bundles
+					if (project.getFile("/META-INF/MANIFEST.MF").exists() == false) { //$NON-NLS-1$
+						continue;
+					}
+					project.accept(new IResourceVisitor() {
 
-					@Override
-					public boolean visit(IResource resource) throws CoreException {
-						if (callback.cancel) {
-							return false;
-						}
+						@Override
+						public boolean visit(IResource resource) throws CoreException {
+							if (callback.cancel) {
+								return false;
+							}
 
-						if (resource.getType() == IResource.FOLDER || resource.getType() == IResource.PROJECT) {
-							return true;
-						} else if (resource.getType() == IResource.FILE && !resource.isLinked()) {
-							String path = resource.getProjectRelativePath().toString();
-							if (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path)) {
-								callback.match((IFile) resource);
+							if (resource.getType() == IResource.FOLDER || resource.getType() == IResource.PROJECT) {
+								return true;
+							} else if (resource.getType() == IResource.FILE && !resource.isLinked()) {
+								String path = resource.getProjectRelativePath().toString();
+								if (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path)) {
+									callback.match((IFile) resource);
+								}
 							}
+							return false;
 						}
-						return false;
-					}
 
-				});
+					});
+				}
 			} catch (CoreException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SearchScope.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SearchScope.java
new file mode 100644
index 0000000000..bd09e708ba
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SearchScope.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 404136
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+/**
+ * Specifies the scope when searching for a resource
+ *
+ * @author Steven Spungin
+ *
+ */
+public enum SearchScope {
+	/**
+	 * Resources in the current project
+	 */
+	PROJECT,
+	/**
+	 * Opened projects in the current workspace
+	 */
+	WORKSPACE,
+	/**
+	 * The current project, and projects the current project depends on
+	 */
+	DEPENDENT,
+	/**
+	 * All projects in the current workspace and bundles in the target platform
+	 */
+	TARGET_PLATFORM
+}

From aa14b92e4cb41bf35cb484f7fae71cc472b5a1fa Mon Sep 17 00:00:00 2001
From: Nicolaj Hoess <nicohoess@gmail.com>
Date: Fri, 18 Apr 2014 08:54:30 +0200
Subject: [PATCH 0745/1286] Bug 433064 - NPE in find action for parent id in
 menu contribution

Change-Id: Id6655890188701faca46412f005b5894e61280f6
Signed-off-by: Nicolaj Hoess <nicohoess@gmail.com>
---
 .../emf/ui/internal/common/component/dialogs/MenuIdDialog.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
index d2596b0dfd..fc7ea01ff7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
@@ -112,7 +112,8 @@ public void doubleClick(DoubleClickEvent event) {
 			// include Window main-menu instances
 			MApplication ma = ((MApplication) resource.getRoot().get(0));
 			for (MWindow m : ma.getChildren()) {
-				list.add(m.getMainMenu());
+				if (m.getMainMenu() != null)
+					list.add(m.getMainMenu());
 			}
 			// include menu elements located within parts
 			List<MPart> mp = modelService.findElements(ma, null, MPart.class, null);

From 31fb5569baf80cfcffdfcb1480477bc767c31548 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Sun, 13 Apr 2014 09:15:40 -0400
Subject: [PATCH 0746/1286] Bug 430921 - PartDescriptorEditor private member
 IProject project is never initialized or set, but is used as a parameter to
 other methods

Change-Id: I03602c0a626f70dab7355bea68ab04844cb8080c
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../common/component/PartDescriptorEditor.java         | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index d197c48389..5e7703d3b8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -72,12 +72,10 @@ public class PartDescriptorEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private IProject project;
-	// This was added for BUG 430921. The member 'project' is
-	// never set, and seems to be always null in this class.
+
 	@Inject
 	@Optional
-	private IProject projectInjected;
+	private IProject project;
 
 	private IListProperty PART__MENUS = EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS);
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
@@ -214,7 +212,7 @@ public void widgetSelected(SelectionEvent e) {
 			 */
 			//
 			final IContributionClassCreator c = getEditor().getContributionCreator(org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.PART);
-			if (projectInjected != null && c != null) {
+			if (project != null && c != null) {
 				lnk = new Link(parent, SWT.NONE);
 				lnk.setText("<A>" + Messages.PartEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
 				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
@@ -225,7 +223,7 @@ public void widgetSelected(SelectionEvent e) {
 						MPart dummyPart = MBasicFactory.INSTANCE.createPart();
 						String contributionURI = ((MPartDescriptor) getMaster().getValue()).getContributionURI();
 						dummyPart.setContributionURI(contributionURI);
-						c.createOpen(dummyPart, getEditingDomain(), projectInjected, lnk.getShell());
+						c.createOpen(dummyPart, getEditingDomain(), project, lnk.getShell());
 						((MPartDescriptor) masterFinal.getValue()).setContributionURI(dummyPart.getContributionURI());
 					}
 				});

From d2a1fc885e98a5b324fb1a5a4e710510dcead128 Mon Sep 17 00:00:00 2001
From: Nicolaj Hoess <nicohoess@gmail.com>
Date: Sat, 19 Apr 2014 20:11:09 +0200
Subject: [PATCH 0747/1286] Bug 396975 - Provide find action for
 [ToolBar|Trim|Menu] contribution elements

Change-Id: Ia000b95ad20880440fb5f0cc891d968b937fe81c
Signed-off-by: Nicolaj Hoess <nicohoess@gmail.com>
---
 .../e4/tools/emf/ui/internal/Messages.java    |  10 ++
 .../tools/emf/ui/internal/Messages.properties |  12 +-
 .../component/MenuContributionEditor.java     |   2 +
 .../component/ToolBarContributionEditor.java  |  38 ++++-
 .../component/TrimContributionEditor.java     |  38 ++++-
 .../component/dialogs/AbstractIdDialog.java   | 159 ++++++++++++++++++
 .../component/dialogs/MenuIdDialog.java       | 152 +++++------------
 .../component/dialogs/ToolBarIdDialog.java    | 111 ++++++++++++
 .../component/dialogs/TrimIdDialog.java       |  89 ++++++++++
 9 files changed, 501 insertions(+), 110 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 4abb8eedd7..cff7214b3c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -587,6 +587,16 @@ public class Messages {
 	public String MenuIdDialog_DialogMessage;
 	public String MenuIdDialog_Id;
 
+	public String ToolBarIdDialog_ShellTitle;
+	public String ToolBarIdDialog_DialogTitle;
+	public String ToolBarIdDialog_DialogMessage;
+	public String ToolBarIdDialog_Id;
+
+	public String TrimBarIdDialog_ShellTitle;
+	public String TrimBarIdDialog_DialogTitle;
+	public String TrimBarIdDialog_DialogMessage;
+	public String TrimBarIdDialog_Id;
+
 	public String CommandToStringConverter_None;
 
 	public String VRootBindingContexts_AddContext;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index c347bd4784..f59984c012 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -599,7 +599,17 @@ CommandToStringConverter_None=<None>
 MenuIdDialog_ShellTitle=Find Parent Menu Id
 MenuIdDialog_DialogTitle=Find Parent Menu Id
 MenuIdDialog_DialogMessage=Find the menu id to be used as parent (in fragment finds the imported menus only)
-MenuIdDialog_Id=Parent Id 
+MenuIdDialog_Id=Parent Id
+
+ToolBarIdDialog_ShellTitle=Find Parent Toolbar Id
+ToolBarIdDialog_DialogTitle=Find Parent Toolbar Id
+ToolBarIdDialog_DialogMessage=Find the toolbar id to be used as parent
+ToolBarIdDialog_Id=Parent Id
+
+TrimBarIdDialog_ShellTitle=Find Parent Trimbar Id
+TrimBarIdDialog_DialogTitle=Find Parent Trimbar Id
+TrimBarIdDialog_DialogMessage=Find the trimbar id to be used as parent
+TrimBarIdDialog_Id=Parent Id
 
 VRootBindingContexts_AddContext=Binding Context
 VRootBindingContexts_TreeLabel=Binding Context
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index c957d284e5..43f7804a8a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -9,6 +9,7 @@
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Marco Descher <marco@descher.at> - Bug 397650, Bug 395982, Bug 396975
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Nicolaj Hoess <nicohoess@gmail.com> - Bug 396975
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -235,6 +236,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index e7c1113461..4c1eb25d57 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -9,6 +9,7 @@
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Marco Descher <marco@descher.at> - Bug 397650
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Nicolaj Hoess <nicohoess@gmail.com> - Bug 396975
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -21,10 +22,13 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ToolBarIdDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
@@ -33,6 +37,7 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -69,6 +74,7 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class ToolBarContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -82,6 +88,12 @@ public class ToolBarContributionEditor extends AbstractComponentEditor {
 	@Optional
 	private IProject project;
 
+	@Inject
+	private IModelResource resource;
+
+	@Inject
+	private EModelService modelService;
+
 	private static class Struct {
 		private final String label;
 		private final EClass eClass;
@@ -212,7 +224,31 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-		ControlFactory.createTextField(parent, Messages.MenuContributionEditor_ParentId, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__PARENT_ID));
+
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuContributionEditor_ParentId);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			final Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__PARENT_ID).observeDetail(getMaster()));
+
+			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					ToolBarIdDialog dialog = new ToolBarIdDialog(t.getShell(), resource, (MToolBarContribution) getMaster().getValue(), getEditingDomain(), modelService, Messages);
+					dialog.open();
+				}
+			});
+		}
+
 		ControlFactory.createTextField(parent, Messages.MenuContributionEditor_Position, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__POSITION_IN_PARENT));
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 9355a9345e..9c97f06f83 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -9,6 +9,7 @@
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Marco Descher <marco@descher.at> - Bug 397650
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Nicolaj Hoess <nicohoess@gmail.com> - Bug 396975
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -21,10 +22,13 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.TrimIdDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
@@ -32,6 +36,7 @@
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -68,6 +73,7 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class TrimContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -81,6 +87,12 @@ public class TrimContributionEditor extends AbstractComponentEditor {
 	@Optional
 	protected IProject project;
 
+	@Inject
+	private IModelResource resource;
+
+	@Inject
+	private EModelService modelService;
+
 	@Inject
 	public TrimContributionEditor() {
 		super();
@@ -187,7 +199,31 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-		ControlFactory.createTextField(parent, Messages.TrimContributionEditor_ParentId, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__PARENT_ID));
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.MenuContributionEditor_ParentId);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			final Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			t.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID).observeDetail(getMaster()));
+
+			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					TrimIdDialog dialog = new TrimIdDialog(t.getShell(), resource, (MTrimContribution) getMaster().getValue(), getEditingDomain(), modelService, Messages);
+					dialog.open();
+				}
+			});
+
+		}
+
 		ControlFactory.createTextField(parent, Messages.TrimContributionEditor_Position, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__POSITION_IN_PARENT));
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
new file mode 100644
index 0000000000..a59855592c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
@@ -0,0 +1,159 @@
+/*******************************************************************************
+ * Copyright (c) 2013
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Nicolaj Hoess <nicohoess@gmail.com> - initial implementation (Bug 396975)
+ *     Andrej Brummelhuis <andrejbrummelhuis@gmail.com> - initial implementation (Bug 396975)
+ *     Adrian Alcaide - initial implementation (Bug 396975)
+ *******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import java.util.List;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.AbstractTreeViewer;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IBaseLabelProvider;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerCell;
+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;
+
+public abstract class AbstractIdDialog<ContributionClass, ElementClass extends MApplicationElement> extends TitleAreaDialog {
+
+	protected EModelService modelService;
+
+	protected TableViewer viewer;
+	protected EditingDomain domain;
+	protected IModelResource resource;
+	protected ContributionClass contribution;
+	protected Messages messages;
+
+	public AbstractIdDialog(Shell parentShell, IModelResource resource, ContributionClass toolbarContribution, EditingDomain domain, EModelService modelService, Messages Messages) {
+		super(parentShell);
+		this.resource = resource;
+		this.modelService = modelService;
+		this.messages = Messages;
+		this.domain = domain;
+		this.contribution = toolbarContribution;
+	}
+
+	protected abstract String getShellTitle();
+
+	protected abstract String getDialogTitle();
+
+	protected abstract String getDialogMessage();
+
+	protected abstract String getLabelText();
+
+	protected abstract List<ElementClass> getViewerInput();
+
+	protected abstract EAttribute getFeatureLiteral();
+
+	protected abstract String getListItemInformation(ElementClass listItem);
+
+	@Override
+	protected boolean isResizable() {
+		return true;
+	}
+
+	protected IBaseLabelProvider getLabelProvider() {
+		return new StyledCellLabelProvider() {
+
+			@Override
+			public void update(ViewerCell cell) {
+				ElementClass el = (ElementClass) cell.getElement();
+				String elementId = (el.getElementId() != null && el.getElementId().trim().length() > 0) ? el.getElementId() : "(Id missing)"; //$NON-NLS-1$
+				StyledString str = new StyledString(elementId);
+
+				String infoString = getListItemInformation(el);
+				if (infoString != null && infoString.trim().length() > 0)
+					str.append(" - " + getListItemInformation(el), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+
+				cell.setText(str.getString());
+				cell.setStyleRanges(str.getStyleRanges());
+			}
+		};
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		getShell().setText(getShellTitle());
+		setTitle(getDialogTitle());
+		setMessage(getDialogMessage());
+		Composite comp = (Composite) super.createDialogArea(parent);
+		Composite container = new Composite(comp, SWT.NONE);
+		container.setLayoutData(new GridData(GridData.FILL_BOTH));
+		container.setLayout(new GridLayout(2, false));
+
+		Label l = new Label(container, SWT.NONE);
+		l.setText(getLabelText());
+
+		Text idField = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		idField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		final PatternFilter filter = new PatternFilter() {
+			@Override
+			protected boolean isParentMatch(Viewer viewer, Object element) {
+				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);
+			}
+		};
+
+		l = new Label(container, SWT.NONE);
+		viewer = new TableViewer(container);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setLabelProvider(getLabelProvider());
+		viewer.addFilter(filter);
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+			@Override
+			public void doubleClick(DoubleClickEvent event) {
+				okPressed();
+			}
+		});
+
+		ControlFactory.attachFiltering(idField, viewer, filter);
+
+		viewer.setInput(getViewerInput());
+
+		return comp;
+	}
+
+	@Override
+	protected void okPressed() {
+		if (!viewer.getSelection().isEmpty()) {
+			ElementClass el = (ElementClass) ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+			Command cmd = SetCommand.create(domain, contribution, getFeatureLiteral(), el.getElementId());
+			if (cmd.canExecute()) {
+				domain.getCommandStack().execute(cmd);
+				super.okPressed();
+			}
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
index fc7ea01ff7..f17f34b687 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Marco Descher <marco@descher.at> - initial implementation (Bug 396975)
+ *     Nicolaj Hoess <nicohoess@gmail.com> - refactoring (Bug 396975)
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -14,8 +15,6 @@
 import java.util.List;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
@@ -27,130 +26,82 @@
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.workbench.modeling.EModelService;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StyledCellLabelProvider;
-import org.eclipse.jface.viewers.StyledString;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerCell;
-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;
-
-public class MenuIdDialog extends TitleAreaDialog {
-
-	private EModelService modelService;
-	private TableViewer viewer;
-	private EditingDomain domain;
-	private IModelResource resource;
-	private MMenuContribution menuContribution;
-	private Messages messages;
-
-	public MenuIdDialog(Shell parentShell, IModelResource resource, MMenuContribution menuContribution, EditingDomain domain, EModelService modelService, Messages Messages) {
-		super(parentShell);
-		this.resource = resource;
-		this.modelService = modelService;
-		this.messages = Messages;
-		this.domain = domain;
-		this.menuContribution = menuContribution;
+
+public class MenuIdDialog extends AbstractIdDialog<MMenuContribution, MMenu> {
+
+	public MenuIdDialog(Shell parentShell, IModelResource resource, MMenuContribution toolbarContribution, EditingDomain domain, EModelService modelService, Messages Messages) {
+		super(parentShell, resource, toolbarContribution, domain, modelService, Messages);
 	}
 
 	@Override
-	protected Control createDialogArea(Composite parent) {
-		getShell().setText(messages.MenuIdDialog_ShellTitle);
-		setTitle(messages.MenuIdDialog_DialogTitle);
-		setMessage(messages.MenuIdDialog_DialogMessage);
-		Composite comp = (Composite) super.createDialogArea(parent);
-		Composite container = new Composite(comp, SWT.NONE);
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		container.setLayout(new GridLayout(2, false));
-
-		Label l = new Label(container, SWT.NONE);
-		l.setText(messages.MenuIdDialog_Id);
-
-		Text idField = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
-		idField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		final PatternFilter filter = new PatternFilter() {
-			@Override
-			protected boolean isParentMatch(Viewer viewer, Object element) {
-				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);
-			}
-		};
-
-		l = new Label(container, SWT.NONE);
-		viewer = new TableViewer(container);
-		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-		viewer.setContentProvider(new ArrayContentProvider());
-		viewer.setLabelProvider(new LabelProviderImpl());
-		viewer.addFilter(filter);
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				okPressed();
-			}
-		});
+	protected String getShellTitle() {
+		return messages.MenuIdDialog_ShellTitle;
+	}
+
+	@Override
+	protected String getDialogTitle() {
+		return messages.MenuIdDialog_DialogTitle;
+	}
 
-		ControlFactory.attachFiltering(idField, viewer, filter);
+	@Override
+	protected String getDialogMessage() {
+		return messages.MenuIdDialog_DialogMessage;
+	}
+
+	@Override
+	protected String getLabelText() {
+		return messages.MenuIdDialog_Id;
+	}
+
+	@Override
+	protected List<MMenu> getViewerInput() {
+
+		List<MMenu> result = new ArrayList<MMenu>();
 
 		if (resource.getRoot().get(0) instanceof MApplication) {
-			List<MMenu> list = new ArrayList<MMenu>();
 			// include Window main-menu instances
 			MApplication ma = ((MApplication) resource.getRoot().get(0));
 			for (MWindow m : ma.getChildren()) {
 				if (m.getMainMenu() != null)
-					list.add(m.getMainMenu());
+					result.add(m.getMainMenu());
 			}
 			// include menu elements located within parts
 			List<MPart> mp = modelService.findElements(ma, null, MPart.class, null);
 			for (MPart mPart : mp) {
-				list.addAll(mPart.getMenus());
+				result.addAll(mPart.getMenus());
 			}
 			// include menu elements carried by tool items
 			List<MToolItem> mt = modelService.findElements(ma, null, MToolItem.class, null);
 			for (MToolItem mToolItem : mt) {
 				if (mToolItem.getMenu() != null)
-					list.add(mToolItem.getMenu());
+					result.add(mToolItem.getMenu());
 			}
 
-			for (MMenu mMenuEntry : list.toArray(new MMenu[] {})) {
-				performRecursiveCheck(mMenuEntry, list);
+			for (MMenu mMenuEntry : result.toArray(new MMenu[] {})) {
+				performRecursiveCheck(mMenuEntry, result);
 			}
 
-			viewer.setInput(list);
-
 		} else if (resource.getRoot().get(0) instanceof MModelFragments) {
-			List<MApplicationElement> list = new ArrayList<MApplicationElement>();
+
 			for (MApplicationElement f : ((MModelFragments) resource.getRoot().get(0)).getImports()) {
 				if (f instanceof MMenu) {
-					list.add(f);
+					result.add((MMenu) f);
 				}
 			}
-			viewer.setInput(list);
+			viewer.setInput(result);
 
 		}
 
-		return comp;
+		return result;
 	}
 
 	/**
 	 * A menu may contain another {@link MMenu} as a child; we want them to be
 	 * shown as an additional entry, so we recursively dive into these elements
-	 * 
+	 *
 	 * @param mMenu
 	 * @param list
 	 */
@@ -166,26 +117,13 @@ private void performRecursiveCheck(MMenu mMenu, List<MMenu> list) {
 	}
 
 	@Override
-	protected void okPressed() {
-		if (!viewer.getSelection().isEmpty()) {
-			MMenu el = (MMenu) ((IStructuredSelection) viewer.getSelection()).getFirstElement();
-			Command cmd = SetCommand.create(domain, menuContribution, MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID, el.getElementId());
-			if (cmd.canExecute()) {
-				domain.getCommandStack().execute(cmd);
-				super.okPressed();
-			}
-		}
+	protected EAttribute getFeatureLiteral() {
+		return MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID;
 	}
 
-	static class LabelProviderImpl extends StyledCellLabelProvider {
-		@Override
-		public void update(ViewerCell cell) {
-			MMenu el = (MMenu) cell.getElement();
-			String elementId = (el.getElementId() != null) ? el.getElementId() : "(Id missing)";
-			StyledString str = new StyledString(elementId);
-			str.append(" - " + el.getLabel(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
-			cell.setText(str.getString());
-			cell.setStyleRanges(str.getStyleRanges());
-		}
+	@Override
+	protected String getListItemInformation(MMenu listItem) {
+		return (listItem.getLabel() != null) ? listItem.getLabel() : ""; //$NON-NLS-1$
 	}
+
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java
new file mode 100644
index 0000000000..eae3f2531a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2013
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Nicolaj Hoess <nicohoess@gmail.com> - initial implementation (Bug 396975)
+ *     Andrej Brummelhuis <andrejbrummelhuis@gmail.com> - initial implementation (Bug 396975)
+ *     Adrian Alcaide <adrian4912@gmail.com> - initial implementation (Bug 396975)
+ *******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.widgets.Shell;
+
+public class ToolBarIdDialog extends AbstractIdDialog<MToolBarContribution, MToolBar> {
+
+	public ToolBarIdDialog(Shell parentShell, IModelResource resource, MToolBarContribution toolbarContribution, EditingDomain domain, EModelService modelService, Messages Messages) {
+		super(parentShell, resource, toolbarContribution, domain, modelService, Messages);
+	}
+
+	@Override
+	protected String getShellTitle() {
+		return messages.ToolBarIdDialog_ShellTitle;
+	}
+
+	@Override
+	protected String getDialogTitle() {
+		return messages.ToolBarIdDialog_DialogTitle;
+	}
+
+	@Override
+	protected String getDialogMessage() {
+		return messages.ToolBarIdDialog_DialogMessage;
+	}
+
+	@Override
+	protected String getLabelText() {
+		return messages.ToolBarIdDialog_Id;
+	}
+
+	@Override
+	protected List<MToolBar> getViewerInput() {
+		List<MToolBar> result = new ArrayList<MToolBar>();
+		if (resource.getRoot().get(0) instanceof MApplication) {
+
+			MApplication ma = ((MApplication) resource.getRoot().get(0));
+
+			List<MToolBar> tbs = modelService.findElements(ma, null, MToolBar.class, null);
+			result.addAll(tbs);
+
+		} else if (resource.getRoot().get(0) instanceof MModelFragments) {
+
+			for (MApplicationElement f : ((MModelFragments) resource.getRoot().get(0)).getImports()) {
+				if (f instanceof MToolBar) {
+					result.add((MToolBar) f);
+				}
+			}
+
+		}
+		return result;
+	}
+
+	@Override
+	protected EAttribute getFeatureLiteral() {
+		return MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__PARENT_ID;
+	}
+
+	@Override
+	protected String getListItemInformation(MToolBar listItem) {
+		return getAdditionalInfoForToolBar(listItem);
+	}
+
+	/**
+	 * Returns additional information for the given {@link MToolBar}. At the
+	 * moment the position of the parent {@link MTrimBar} is returned.
+	 *
+	 * TODO Check which information is most relevant for the user
+	 *
+	 * @param toolBar
+	 * @return String
+	 */
+	private String getAdditionalInfoForToolBar(MToolBar toolBar) {
+		MElementContainer<?> container = toolBar.getParent();
+		if (container == null) {
+			// If the MToolBar is imported into a fragment getParent() will
+			// return null
+			return "imported"; //$NON-NLS-1$
+		}
+		while (container instanceof MTrimBar == false) {
+			container = container.getParent();
+		}
+		return ((MTrimBar) container).getSide().getName();
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java
new file mode 100644
index 0000000000..10faf26daa
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2013
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Nicolaj Hoess <nicohoess@gmail.com> - initial implementation (Bug 396975)
+ *     Andrej Brummelhuis <andrejbrummelhuis@gmail.com> - initial implementation (Bug 396975)
+ *     Adrian Alcaide <adrian4912@gmail.com> - initial implementation (Bug 396975)
+ *******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.widgets.Shell;
+
+public class TrimIdDialog extends AbstractIdDialog<MTrimContribution, MTrimBar> {
+
+	public TrimIdDialog(Shell parentShell, IModelResource resource, MTrimContribution toolbarContribution, EditingDomain domain, EModelService modelService, Messages Messages) {
+		super(parentShell, resource, toolbarContribution, domain, modelService, Messages);
+	}
+
+	@Override
+	protected String getShellTitle() {
+		return messages.TrimBarIdDialog_ShellTitle;
+	}
+
+	@Override
+	protected String getDialogTitle() {
+		return messages.TrimBarIdDialog_DialogTitle;
+	}
+
+	@Override
+	protected String getDialogMessage() {
+		return messages.TrimBarIdDialog_DialogMessage;
+	}
+
+	@Override
+	protected String getLabelText() {
+		return messages.TrimBarIdDialog_Id;
+	}
+
+	@Override
+	protected List<MTrimBar> getViewerInput() {
+		List<MTrimBar> result = new ArrayList<MTrimBar>();
+
+		if (resource.getRoot().get(0) instanceof MApplication) {
+
+			MApplication ma = ((MApplication) resource.getRoot().get(0));
+
+			List<MTrimBar> tbs = modelService.findElements(ma, null, MTrimBar.class, null);
+			result.addAll(tbs);
+
+		} else if (resource.getRoot().get(0) instanceof MModelFragments) {
+
+			for (MApplicationElement f : ((MModelFragments) resource.getRoot().get(0)).getImports()) {
+				if (f instanceof MTrimBar) {
+					result.add((MTrimBar) f);
+				}
+			}
+		}
+
+		return result;
+	}
+
+	@Override
+	protected EAttribute getFeatureLiteral() {
+		return MenuPackageImpl.Literals.TRIM_CONTRIBUTION__PARENT_ID;
+	}
+
+	@Override
+	protected String getListItemInformation(MTrimBar listItem) {
+		return listItem.getSide().getName();
+	}
+
+}
\ No newline at end of file

From 3b32c9ed2151e91021048a30a9d69c90b1ffeb5a Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Thu, 24 Apr 2014 09:17:30 -0400
Subject: [PATCH 0748/1286] Bug 433408 - [model editor] Area Icon Find Button
 Does Not Work

Change-Id: I85dcb5a8472649fb792e7a13aee86819d535f860
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../tools/emf/ui/internal/common/component/AreaEditor.java   | 5 +++--
 .../common/component/dialogs/AreaIconDialogEditor.java       | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 1bf9f03d66..99ec41430a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Steven Spungin <steven@spungin.tv> - Bug 433408
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -28,13 +29,13 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AreaIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -255,7 +256,7 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					AreaIconDialogEditor dialog = new AreaIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPart) getMaster().getValue(), Messages);
+					AreaIconDialogEditor dialog = new AreaIconDialogEditor(b.getShell(), project, getEditingDomain(), (MApplicationElement) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
index 218d564cba..eaf383a3db 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
@@ -7,19 +7,20 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Bug 433408
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
 public class AreaIconDialogEditor extends AbstractIconDialog {
 
-	public AreaIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPart element, Messages Messages) {
+	public AreaIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MApplicationElement element, Messages Messages) {
 		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
 	}
 

From ea07b192725d80e6c197480ae3dc927fe02cb49e Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Fri, 2 May 2014 14:44:26 +0200
Subject: [PATCH 0749/1286] Bug 433986 - multiple addition of *.e4xmi to
 build.properties

Signed-off-by: Marco Descher <marco@descher.at>
---
 .../tools/wizards/model/BaseApplicationModelWizard.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index db2ba1099f..69b2bbc9c6 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -286,7 +286,8 @@ private void adjustBuildPropertiesFile(IFile file)
 		if (buildPropertiesFile.exists()) {
 			WorkspaceBuildModel model = new WorkspaceBuildModel(buildPropertiesFile);
 			IBuildEntry entry = model.getBuild().getEntry(IBuildEntry.BIN_INCLUDES);
-			entry.addToken(file.getProjectRelativePath().toString());
+			String token = file.getProjectRelativePath().toString();
+			if(!entry.contains(token)) entry.addToken(token);
 			model.save();
 		}
 	}

From 32786cbb0f52f205d0cd269668b5aba438c0fe17 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Mon, 21 Apr 2014 23:04:43 +0200
Subject: [PATCH 0750/1286] Bug 432892: Application does not work after
 renaming the project

Renaming a project and renaming a referenced project is now supported.
"platform:/plugin" and "bundleclass://" uris are processed in plugin.xml

I have refactored the code to be more clear.

the product file is not touched yet.

Change-Id: Ib407ab705134ff6f7a51f6843138fda55ebc3e96
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=432892
---
 .../META-INF/MANIFEST.MF                      |   3 +-
 .../plugin.xml                                |   3 +
 .../emf/editor3x/ModelMoveParticipant.java    | 106 +++++----
 .../emf/editor3x/ModelRenameParticipant.java  |  91 +++++---
 .../e4/tools/emf/editor3x/RefactorModel.java  | 216 ++++++++++++++++++
 .../editor3x/RefactorParticipantDelegate.java |  89 ++++++--
 6 files changed, 414 insertions(+), 94 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 56445da670..c5ec6f40c9 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -30,7 +30,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
  org.eclipse.search;bundle-version="3.7.0",
  org.eclipse.text;bundle-version="3.5.100",
- org.eclipse.e4.ui.model.workbench;bundle-version="1.0.0"
+ org.eclipse.e4.ui.model.workbench;bundle-version="1.0.0",
+ org.eclipse.pde.ui
 Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/projectfunction.xml, OSGI-INF/pdee4xmiprovider.xml, OSGI-INF/pdeextensionlookup.xml, OSGI-INF/modelextractor.xml 
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index 0d40419362..d4c034552a 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -64,6 +64,9 @@
             <instanceof
                   value="org.eclipse.core.resources.IFolder">
             </instanceof>
+            <instanceof
+                  value="org.eclipse.core.resources.IProject">
+            </instanceof>
          </or>
 	  	  </with>
 	  	</enablement>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java
index 2ec2342e2a..10d825f657 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Remain Software, Industrial-TSI and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Wim Jongman <wim.jongman@remainsoftware.com> - Bug 395174: e4xmi should participate in package renaming 
+ *                                                    Bug 432892: Eclipse 4 Application does not work after renaming the project name
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
 import org.eclipse.core.resources.IFile;
@@ -16,33 +27,31 @@
 import org.eclipse.ltk.core.refactoring.participants.MoveParticipant;
 
 public class ModelMoveParticipant extends MoveParticipant {
-	private IType _type;
-	private IPackageFragment _pckage;
-	private IFile _file;
-	private IFolder _folder;
+	private IType fType;
+	private IPackageFragment fPckage;
+	private IFile fFile;
+	private RefactorModel fModel;
 
 	@Override
-	protected boolean initialize(Object element) {
+	protected boolean initialize(Object pElement) {
 
-		if (element instanceof IType) {
-			_type = (IType) element;
-			return true;
-		}
+		fModel = RefactorModel.getModel(this);
 
-		if (element instanceof IPackageFragment) {
-			_pckage = (IPackageFragment) element;
+		if (pElement instanceof IType) {
+			fType = (IType) pElement;
 			return true;
 		}
 
-		if (element instanceof IFile) {
-			_file = (IFile) element;
+		if (pElement instanceof IPackageFragment) {
+			fPckage = (IPackageFragment) pElement;
 			return true;
 		}
 
-		if (element instanceof IFolder) {
-			_folder = (IFolder) element;
+		if (pElement instanceof IFile) {
+			fFile = (IFile) pElement;
 			return true;
 		}
+
 		return false;
 	}
 
@@ -52,42 +61,37 @@ public String getName() {
 	}
 
 	@Override
-	public RefactoringStatus checkConditions(IProgressMonitor pm,
-			CheckConditionsContext context) throws OperationCanceledException {
+	public RefactoringStatus checkConditions(IProgressMonitor pMonitor,
+			CheckConditionsContext pContext) throws OperationCanceledException {
 		return new RefactoringStatus();
 	}
 
 	@Override
-	public Change createChange(IProgressMonitor pm) throws CoreException,
+	public Change createChange(IProgressMonitor pMonitor) throws CoreException,
 			OperationCanceledException {
 
-		pm.beginTask("Creating Change ..", IProgressMonitor.UNKNOWN);
+		pMonitor.beginTask("Creating Change ..", IProgressMonitor.UNKNOWN);
 
 		Change change = null;
 
-		if (_type != null) {
-			change = createClassChange(pm, _type);
+		if (fType != null) {
+			change = createClassChange(pMonitor, fType);
 		}
 
-		else if (_pckage != null) {
-			change = createPackageChange(pm, _pckage);
+		else if (fPckage != null) {
+			change = createPackageChange(pMonitor, fPckage);
 		}
 
-		else if (_file != null) {
-			change = createFileChange(pm, _file);
+		else if (fFile != null) {
+			change = createFileChange(pMonitor, fFile);
 		}
 
-		//
-		// if (_folder != null) {
-		// return createFolderChange(pm, _folder);
-		// }
-
-		pm.done();
+		pMonitor.done();
 
 		return change;
 	}
 
-	private Change createFileChange(IProgressMonitor pm, IFile file)
+	private Change createFileChange(IProgressMonitor pMonitor, IFile file)
 			throws CoreException {
 
 		String newUrl = "platform:/plugin/";
@@ -104,14 +108,15 @@ private Change createFileChange(IProgressMonitor pm, IFile file)
 
 		String oldUrl = "platform:/plugin" + file.getFullPath();
 
-		return RefactorParticipantDelegate.createChange(pm, this, oldUrl,
-				newUrl);
+		fModel.addTextRename(oldUrl, newUrl);
+
+		return RefactorParticipantDelegate.createChange(pMonitor, fModel);
 	}
 
-	private Change createPackageChange(IProgressMonitor pm,
-			IPackageFragment pckage) throws CoreException,
+	private Change createPackageChange(IProgressMonitor pMonitor,
+			IPackageFragment pPckage) throws CoreException,
 			OperationCanceledException {
-		String fromBundle = Util.getBundleSymbolicName(pckage.getJavaProject()
+		String fromBundle = Util.getBundleSymbolicName(pPckage.getJavaProject()
 				.getProject());
 
 		IPackageFragmentRoot fragmentRoot = (IPackageFragmentRoot) getArguments()
@@ -120,32 +125,35 @@ private Change createPackageChange(IProgressMonitor pm,
 				.getJavaProject().getProject());
 
 		final String newUrl = "bundleclass://" + toBundle + "/"
-				+ pckage.getElementName();
+				+ pPckage.getElementName();
 
 		String oldUrl = "bundleclass://" + fromBundle + "/"
-				+ pckage.getElementName();
+				+ pPckage.getElementName();
+
+		fModel.addTextRename(oldUrl, newUrl);
 
-		return RefactorParticipantDelegate.createChange(pm, this, oldUrl,
-				newUrl);
+		return RefactorParticipantDelegate.createChange(pMonitor, fModel);
 	}
 
-	private Change createClassChange(IProgressMonitor pm, IType type)
+	private Change createClassChange(IProgressMonitor pMonitor, IType pType)
 			throws CoreException, OperationCanceledException {
-		String fromBundle = Util.getBundleSymbolicName(_type.getJavaProject()
+		String fromBundle = Util.getBundleSymbolicName(fType.getJavaProject()
 				.getProject());
-		String fromClassname = type.getFullyQualifiedName();
+		String fromClassname = pType.getFullyQualifiedName();
 
 		IPackageFragment fragment = (IPackageFragment) getArguments()
 				.getDestination();
 		String toBundle = Util.getBundleSymbolicName(fragment.getJavaProject()
 				.getProject());
-		String toClassName = fragment.getElementName().length() == 0 ? type
+		String toClassName = fragment.getElementName().length() == 0 ? pType
 				.getElementName() : fragment.getElementName() + "."
-				+ type.getElementName();
+				+ pType.getElementName();
 
-		return RefactorParticipantDelegate.createChange(pm, this,
-				"bundleclass://" + fromBundle + "/" + fromClassname,
-				"bundleclass://" + toBundle + "/" + toClassName);
+		return RefactorParticipantDelegate.createChange(
+				pMonitor,
+				fModel.addTextRename("bundleclass://" + fromBundle + "/"
+						+ fromClassname, "bundleclass://" + toBundle + "/"
+						+ toClassName));
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelRenameParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelRenameParticipant.java
index 24ee9ceb26..439e91343c 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelRenameParticipant.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelRenameParticipant.java
@@ -7,11 +7,15 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Wim Jongman <wim.jongman@remainsoftware.com> - Bug 395174: e4xmi should participate in package renaming 
+ *                                                    Bug 432892: Eclipse 4 Application does not work after renaming the project name
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
@@ -24,33 +28,41 @@
 
 public class ModelRenameParticipant extends
 		org.eclipse.ltk.core.refactoring.participants.RenameParticipant {
-	private IType _type;
-	private IPackageFragment _pckage;
-	private IFile _file;
-	private IFolder _folder;
+	private IType fType;
+	private IPackageFragment fPckage;
+	private IFile fFile;
+	private IFolder fFolder;
+	private IProject fProject;
+	private RefactorModel fModel;
 
 	@Override
 	protected boolean initialize(Object element) {
 
 		if (element instanceof IType) {
-			_type = (IType) element;
+			fType = (IType) element;
 			return true;
 		}
 
 		if (element instanceof IPackageFragment) {
-			_pckage = (IPackageFragment) element;
+			fPckage = (IPackageFragment) element;
 			return true;
 		}
 
 		if (element instanceof IFile) {
-			_file = (IFile) element;
+			fFile = (IFile) element;
 			return true;
 		}
 
 		if (element instanceof IFolder) {
-			_folder = (IFolder) element;
+			fFolder = (IFolder) element;
 			return true;
 		}
+
+		if (element instanceof IProject) {
+			fProject = (IProject) element;
+			return true;
+		}
+
 		return false;
 	}
 
@@ -68,25 +80,50 @@ public RefactoringStatus checkConditions(IProgressMonitor pm,
 	@Override
 	public Change createChange(IProgressMonitor pm) throws CoreException,
 			OperationCanceledException {
-		if (_type != null) {
-			return createClassChange(pm, _type);
+
+		fModel = RefactorModel.getModel(this);
+
+		if (fType != null) {
+			return createClassChange(pm, fType);
+		}
+
+		if (fPckage != null) {
+			return createPackageChange(pm, fPckage);
 		}
 
-		if (_pckage != null) {
-			return createPackageChange(pm, _pckage);
+		if (fFile != null) {
+			return createFileChange(pm, fFile);
 		}
 
-		if (_file != null) {
-			return createFileChange(pm, _file);
+		if (fFolder != null) {
+			return createFolderChange(pm, fFolder);
 		}
 
-		if (_folder != null) {
-			return createFolderChange(pm, _folder);
+		if (fProject != null) {
+			return createProjectChange(pm, fProject);
 		}
 
 		return null;
 	}
 
+	private Change createProjectChange(IProgressMonitor pm, IProject project)
+			throws CoreException {
+
+		if (!getArguments().getUpdateReferences())
+			return null;
+
+		fModel.addTextRename("platform:/plugin/" + project.getName() + "/",
+				"platform:/plugin/" + getArguments().getNewName() + "/");
+		fModel.addTextRename("bundleclass://" + project.getName() + "/",
+				"bundleclass://" + getArguments().getNewName() + "/");
+
+		fModel.setProjectRename(project, ((IWorkspaceRoot) project.getParent())
+				.getProject(getArguments().getNewName()));
+
+		return RefactorParticipantDelegate.createChange(pm, fModel);
+
+	}
+
 	private Change createFolderChange(IProgressMonitor pm, IFolder folder)
 			throws CoreException {
 
@@ -95,14 +132,15 @@ private Change createFolderChange(IProgressMonitor pm, IFolder folder)
 			SPLIT = "";
 		}
 
-		String newUrl = "platform:/plugin/" + folder.getProject().getName() + "/"
-				+ folder.getParent().getProjectRelativePath().toString()
+		String newUrl = "platform:/plugin/" + folder.getProject().getName()
+				+ "/" + folder.getParent().getProjectRelativePath().toString()
 				+ SPLIT + getArguments().getNewName();
 
 		String oldUrl = "platform:/plugin" + folder.getFullPath();
 
-		return RefactorParticipantDelegate.createChange(pm, this, oldUrl,
-				newUrl);
+		fModel.addTextRename(oldUrl, newUrl);
+
+		return RefactorParticipantDelegate.createChange(pm, fModel);
 	}
 
 	private Change createFileChange(IProgressMonitor pm, IFile file)
@@ -115,11 +153,10 @@ private Change createFileChange(IProgressMonitor pm, IFile file)
 		String newUrl = "platform:/plugin/" + file.getProject().getName() + "/"
 				+ file.getParent().getProjectRelativePath().toString() + SPLIT
 				+ getArguments().getNewName();
-
 		String oldUrl = "platform:/plugin" + file.getFullPath();
+		fModel.addTextRename(oldUrl, newUrl);
 
-		return RefactorParticipantDelegate.createChange(pm, this, oldUrl,
-				newUrl);
+		return RefactorParticipantDelegate.createChange(pm, fModel);
 	}
 
 	private Change createPackageChange(IProgressMonitor pm,
@@ -132,9 +169,9 @@ private Change createPackageChange(IProgressMonitor pm,
 
 		String oldUrl = "bundleclass://" + bundle + "/"
 				+ pckage.getElementName();
+		fModel.addTextRename(oldUrl, newUrl);
 
-		return RefactorParticipantDelegate.createChange(pm, this, oldUrl,
-				newUrl);
+		return RefactorParticipantDelegate.createChange(pm, fModel);
 	}
 
 	private Change createClassChange(IProgressMonitor pm, IType type)
@@ -150,9 +187,9 @@ private Change createClassChange(IProgressMonitor pm, IType type)
 						.getElementName() + "." + getArguments().getNewName());
 		String oldUrl = "bundleclass://" + bundle + "/"
 				+ type.getFullyQualifiedName().replace(".", "\\.");
+		fModel.addTextRename(oldUrl, newUrl);
 
-		return RefactorParticipantDelegate.createChange(pm, this, oldUrl,
-				newUrl);
+		return RefactorParticipantDelegate.createChange(pm, fModel);
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
new file mode 100644
index 0000000000..58d71e2ead
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
@@ -0,0 +1,216 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Remain Software, Industrial-TSI and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Wim Jongman <wim.jongman@remainsoftware.com> - Bug 432892: Eclipse 4 Application does not work after renaming the project name
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.ltk.core.refactoring.TextChange;
+import org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant;
+
+/**
+ * A temporary data storage for Ecipse 4 model refactoring. Use the static
+ * methods to get hold of an instance.
+ * 
+ * @author Remain Software - Wim Jongman
+ *
+ */
+public class RefactorModel {
+
+	int fIndex = 0;
+	IProject fNewProject;
+	List<String> fNewTexts = new ArrayList<String>();
+
+	IProject fOldProject;
+
+	List<String> fOldTexts = new ArrayList<String>();
+
+	private RefactoringParticipant fParticipant;
+
+	/**
+	 * Factory for an empty model. Use the
+	 * {@link #addTextRename(String, String)} method to add one or more text
+	 * renames.
+	 * 
+	 * @param pParticipant
+	 * @return the model
+	 */
+	public static RefactorModel getModel(RefactoringParticipant pParticipant) {
+		return new RefactorModel().setRefactorParticipant(pParticipant);
+	}
+
+	/**
+	 * Factory for a model with one rename. Use the
+	 * {@link #addTextRename(String, String)} method to add one or more text
+	 * renames.
+	 * 
+	 * @param pParticipant
+	 * @param pOldText
+	 * @param pNewText
+	 * @return the model.
+	 */
+	public static RefactorModel getModel(RefactoringParticipant pParticipant,
+			String pOldText, String pNewText) {
+		return new RefactorModel().addTextRename(pOldText, pNewText);
+	}
+
+	/**
+	 * Factory for a model with one rename and a project rename. The project
+	 * rename uses the old and new project because the refactoring framework
+	 * expects the already renamed filenames. Use the
+	 * {@link #addTextRename(String, String)} method to add one or more text
+	 * renames and the old and the new project.
+	 * 
+	 * @param pParticipant
+	 * @param pOldText
+	 * @param pNewText
+	 * @param pOldProject
+	 * @param pNewProject
+	 * @return the model.
+	 */
+	public static RefactorModel getModel(RefactoringParticipant pParticipant,
+			String pOldText, String pNewText, IProject pOldProject,
+			IProject pNewProject) {
+		return new RefactorModel().addTextRename(pOldText, pNewText)
+				.setProjectRename(pOldProject, pNewProject)
+				.setRefactorParticipant(pParticipant);
+	}
+
+	/**
+	 * Adds a text rename to be processed later. For example, if the project
+	 * name changes there can be <code>bundlclass://</code> and
+	 * <code>platform:/plugin</code> changes.
+	 * 
+	 * @param oldText
+	 * @param newText
+	 * @return the model
+	 */
+	public RefactorModel addTextRename(String oldText, String newText) {
+		Assert.isNotNull(oldText);
+		Assert.isNotNull(newText);
+		fOldTexts.add(oldText);
+		fNewTexts.add(newText);
+		return this;
+	}
+
+	/**
+	 * When project renaming this returns the new project. This project does not
+	 * necessarily exist yet.
+	 * 
+	 * @return the new project or null if it was not set
+	 * @see RefactorModel#setProjectRename(IProject, IProject)
+	 */
+	public IProject getNewProject() {
+		return fNewProject;
+	}
+
+	/**
+	 * @return the current index set by {@link #setIndex(int)}
+	 */
+	public String getNewTextCurrentIndex() {
+		return fNewTexts.get(fIndex);
+	}
+
+	/**
+	 * When project renaming this returns the old project.
+	 * 
+	 * @return the new project or null if it was not set
+	 * @see RefactorModel#setProjectRename(IProject, IProject)
+	 */
+	public IProject getOldProject() {
+		return fOldProject;
+	}
+
+	/**
+	 * 
+	 * @return the old text in the current index.
+	 */
+	public String getOldTextCurrentIndex() {
+		return fOldTexts.get(fIndex);
+	}
+
+	/**
+	 * @return
+	 */
+	public RefactoringParticipant getRefactoringParticipant() {
+		return fParticipant;
+	}
+
+	/**
+	 * @return the number of text renames in this model
+	 */
+	public int getRenameCount() {
+		return fOldTexts.size();
+	}
+
+	/**
+	 * Delegates to the same method of the embedded RefactoringParticipant.
+	 * 
+	 * @param file
+	 * @return a TextChange object
+	 * @see RefactoringParticipant#getTextChange(Object)
+	 */
+	public TextChange getTextChange(IFile file) {
+		return fParticipant.getTextChange(file);
+	}
+
+	/**
+	 * @return true if this is a projec rename (old and new project are set)
+	 */
+	public boolean isProjectRename() {
+		return fOldProject != null;
+	}
+
+	/**
+	 * Sets the current 0-based index. May not be out of bounds.
+	 * 
+	 * @param index
+	 * @return the model
+	 */
+	public RefactorModel setIndex(int index) {
+		Assert.isTrue(index >= 0);
+		Assert.isTrue(index < fOldTexts.size());
+		this.fIndex = index;
+		return this;
+	}
+
+	/**
+	 * Sets the old and the new project in case of project renaming.
+	 * 
+	 * @param oldProject
+	 * @param newProject
+	 * @return the model
+	 */
+	public RefactorModel setProjectRename(IProject oldProject,
+			IProject newProject) {
+		Assert.isNotNull(oldProject);
+		Assert.isNotNull(newProject);
+		fOldProject = oldProject;
+		fNewProject = newProject;
+		return this;
+	}
+
+	/**
+	 * Sets the RefactoringParticipant.
+	 * 
+	 * @param pParticipant
+	 * @return the model
+	 * @see RefactoringParticipant
+	 */
+	public RefactorModel setRefactorParticipant(
+			RefactoringParticipant pParticipant) {
+		this.fParticipant = pParticipant;
+		return this;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
index de104ff5fc..ba25f7743a 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
@@ -7,22 +7,23 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Wim Jongman <wim.jongman@remainsoftware.com>  Bug 432892: Eclipse 4 Application does not work after renaming the project name
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.regex.Pattern;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.ltk.core.refactoring.Change;
 import org.eclipse.ltk.core.refactoring.CompositeChange;
 import org.eclipse.ltk.core.refactoring.TextChange;
 import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant;
+import org.eclipse.pde.internal.ui.refactoring.MovedTextFileChange;
 import org.eclipse.search.core.text.TextSearchEngine;
 import org.eclipse.search.core.text.TextSearchMatchAccess;
 import org.eclipse.search.core.text.TextSearchRequestor;
@@ -32,16 +33,36 @@
 import org.eclipse.text.edits.TextEditGroup;
 
 class RefactorParticipantDelegate {
-	public static Change createChange(IProgressMonitor pm,
-			final RefactoringParticipant p, String oldUrl, final String newUrl)
+
+	private static final String E4_MODEL_CHANGES = "Eclipse 4 Application Model Changes";
+
+	/**
+	 * Creates a set of changes and returns a new {@link CompositeChange} or
+	 * adds the changes to the passed {@link CompositeChange}.
+	 * 
+	 * @param pProgressMonitor
+	 * @param pParticipant
+	 * @param pOldUrl
+	 *            String[] containing the old texts
+	 * @param pNewUrl
+	 *            String[] containing the new texts
+	 * @param pNewProject
+	 *            The name of the project if this is a project change else null.
+	 * @return a set of changes in a {@link CompositeChange}
+	 * @throws CoreException
+	 * @throws OperationCanceledException
+	 */
+	public static CompositeChange createChange(
+			IProgressMonitor pProgressMonitor, final RefactorModel pModel)
 			throws CoreException, OperationCanceledException {
-		String[] filenames = { "*.e4xmi" };
+
+		String[] filenames = { "*.e4xmi", "plugin.xml" };
 		FileTextSearchScope scope = FileTextSearchScope.newWorkspaceScope(
 				filenames, false);
-		Pattern pattern = Pattern.compile(oldUrl);
 
 		final Map<IFile, TextFileChange> changes = new HashMap<IFile, TextFileChange>();
 		TextSearchRequestor searchRequestor = new TextSearchRequestor() {
+
 			@Override
 			public boolean acceptPatternMatch(TextSearchMatchAccess matchAccess)
 					throws CoreException {
@@ -49,30 +70,64 @@ public boolean acceptPatternMatch(TextSearchMatchAccess matchAccess)
 				TextFileChange change = changes.get(file);
 
 				if (change == null) {
-					TextChange textChange = p.getTextChange(file);
+					TextChange textChange = pModel.getTextChange(file);
 					if (textChange != null) {
 						return false;
 					}
-					change = new TextFileChange(file.getName(), file);
-					change.setEdit(new MultiTextEdit());
-					changes.put(file, change);
+
+					if (pModel.isProjectRename()
+							&& file.getProject().equals(pModel.getOldProject())) {
+						// The project/resources get refactored before the
+						// TextChange is applied, therefore we need their
+						// future locations
+						IProject newProject = pModel.getNewProject();
+
+						// If the model is in a non-standard location the
+						// new project will keep that location, only the project
+						// will be changed
+						IPath oldFile = file.getFullPath().removeFirstSegments(
+								1);
+						IFile newFile = newProject.getFile(oldFile);
+
+						change = new MovedTextFileChange(file.getName(),
+								newFile, file);
+						change.setEdit(new MultiTextEdit());
+						changes.put(file, change);
+
+					} else {
+						change = new TextFileChange(file.getName(), file);
+						change.setEdit(new MultiTextEdit());
+						changes.put(file, change);
+					}
 				}
+
 				ReplaceEdit edit = new ReplaceEdit(
 						matchAccess.getMatchOffset(),
-						matchAccess.getMatchLength(), newUrl);
+						matchAccess.getMatchLength(),
+						pModel.getNewTextCurrentIndex());
 				change.addEdit(edit);
-				change.addTextEditGroup(new TextEditGroup(
-						"Eclipse 4 Application Model Changes", edit)); //$NON-NLS-1$
+				change.addTextEditGroup(new TextEditGroup(E4_MODEL_CHANGES,
+						edit)); //$NON-NLS-1$
 				return true;
 			}
 		};
-		TextSearchEngine.create().search(scope, searchRequestor, pattern, pm);
+
+		CompositeChange result;
+		TextSearchEngine searchEngine = TextSearchEngine.create();
+		for (int count = pModel.getRenameCount(); count > 0; count--) {
+			pModel.setIndex(count - 1);
+			searchEngine.search(
+					scope,
+					searchRequestor,
+					TextSearchEngine.createPattern(
+							pModel.getOldTextCurrentIndex(), true, false),
+					pProgressMonitor);
+		}
 
 		if (changes.isEmpty())
 			return null;
 
-		CompositeChange result = new CompositeChange(
-				"Eclipse 4 Application Model Changes"); //$NON-NLS-1$
+		result = new CompositeChange(E4_MODEL_CHANGES); //$NON-NLS-1$
 		for (TextFileChange c : changes.values()) {
 			result.add(c);
 		}

From 2814638b90bb048f9609bb73f0754b2c30041c0b Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Sun, 4 May 2014 22:08:54 +0200
Subject: [PATCH 0751/1286] Bug 392907 - New fragment.e4xmi should add required
 dependencies

Signed-off-by: Marco Descher <marco@descher.at>
---
 .../model/BaseApplicationModelWizard.java     |  11 ++
 .../model/NewContributionModelWizard.java     | 111 +++++++++++++++++-
 2 files changed, 117 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index 69b2bbc9c6..0f3ed9f5b7 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -197,6 +197,7 @@ else if(mApplicationElement instanceof MHandledItem){
 							Map<Object, Object> options = new HashMap<Object, Object>();
 							resource.save(options);
 							adjustBuildPropertiesFile( modelFile );
+							adjustDependencies( modelFile );
 						}
 						catch (Exception exception) {
 							throw new RuntimeException(exception);
@@ -291,4 +292,14 @@ private void adjustBuildPropertiesFile(IFile file)
 			model.save();
 		}
 	}
+	
+	/**
+	 * Callback hook to allow for after-file-creation modifications. Default
+	 * implementation does nothing.
+	 * 
+	 * @param file
+	 *            the file created by the wizard
+	 */
+	protected void adjustDependencies(IFile file) {
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
index 47bf7233a6..6c3a10adfe 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010-2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,13 +7,27 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Marco Descher <marco@descher.at> - Bug 392907
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.model;
 
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
-
+import org.eclipse.osgi.service.resolver.BundleDescription;
+import org.eclipse.pde.core.plugin.IMatchRules;
+import org.eclipse.pde.core.plugin.IPluginElement;
+import org.eclipse.pde.core.plugin.IPluginExtension;
+import org.eclipse.pde.core.plugin.IPluginImport;
+import org.eclipse.pde.core.plugin.IPluginModelBase;
+import org.eclipse.pde.core.plugin.IPluginObject;
+import org.eclipse.pde.core.plugin.PluginRegistry;
+import org.eclipse.pde.internal.core.bundle.WorkspaceBundlePluginModel;
+import org.eclipse.pde.internal.core.project.PDEProject;
 
 public class NewContributionModelWizard extends BaseApplicationModelWizard {
 
@@ -21,14 +35,101 @@ public class NewContributionModelWizard extends BaseApplicationModelWizard {
 	public String getDefaultFileName() {
 		return "fragment.e4xmi";
 	}
-	
+
 	@Override
 	protected EObject createInitialModel() {
 		return (EObject) MFragmentFactory.INSTANCE.createModelFragments();
 	}
-	
+
 	@Override
 	protected NewModelFilePage createWizardPage(ISelection selection) {
-		return new NewModelFilePage(selection,getDefaultFileName());
+		return new NewModelFilePage(selection, getDefaultFileName());
+	}
+
+	/**
+	 * Add the required dependencies (org.eclipse.e4.ui.model.workbench) and
+	 * register fragment.e4xmi at the required extension point
+	 * (org.eclipse.e4.workbench.model)
+	 */
+	@Override
+	protected void adjustDependencies(IFile file) {
+		IProject project = file.getProject();
+		IFile pluginXml = PDEProject.getPluginXml(project);
+		IFile manifest = PDEProject.getManifest(project);
+
+		WorkspaceBundlePluginModel fModel = new WorkspaceBundlePluginModel(
+				manifest, pluginXml);
+		try {
+			addWorkbenchDependencyIfRequired(fModel);
+			registerWithExtensionPointIfRequired(project, fModel, file);
+		} catch (CoreException e) {
+			e.printStackTrace();
+			MessageDialog.openError(getShell(), "Error", e.getMessage());
+		}
+	}
+
+	private void addWorkbenchDependencyIfRequired(
+			WorkspaceBundlePluginModel fModel) throws CoreException {
+		IPluginImport[] imports = fModel.getPluginBase().getImports();
+
+		final String WORKBENCH_IMPORT_ID = "org.eclipse.e4.ui.model.workbench"; //$NON-NLS-1$
+
+		for (IPluginImport iPluginImport : imports) {
+			if (WORKBENCH_IMPORT_ID.equalsIgnoreCase(iPluginImport.getId()))
+				return;
+		}
+
+		String version = "";
+		IPluginModelBase findModel = PluginRegistry
+				.findModel(WORKBENCH_IMPORT_ID);
+		if (findModel != null) {
+			BundleDescription bundleDescription = findModel
+					.getBundleDescription();
+			if (bundleDescription != null)
+				version = bundleDescription.getVersion().toString();
+		}
+
+		IPluginImport workbenchImport = fModel.getPluginFactory()
+				.createImport();
+		workbenchImport.setId(WORKBENCH_IMPORT_ID);
+		workbenchImport.setVersion(version);
+		workbenchImport.setMatch(IMatchRules.GREATER_OR_EQUAL);
+		fModel.getPluginBase().add(workbenchImport);
+		fModel.save();
+	}
+
+	/**
+	 * Register the fragment.e4xmi with the org.eclipse.e4.workbench.model
+	 * extension point, if there is not already a fragment registered.
+	 */
+	private void registerWithExtensionPointIfRequired(IProject project,
+			WorkspaceBundlePluginModel fModel, IFile file) throws CoreException {
+		IPluginExtension[] extensions = fModel.getPluginBase().getExtensions();
+
+		final String WORKBENCH_MODEL_EP_ID = "org.eclipse.e4.workbench.model"; //$NON-NLS-1$
+		final String FRAGMENT = "fragment";
+
+		for (IPluginExtension iPluginExtension : extensions) {
+			if (WORKBENCH_MODEL_EP_ID
+					.equalsIgnoreCase(iPluginExtension.getId())) {
+				IPluginObject[] children = iPluginExtension.getChildren();
+				for (IPluginObject child : children) {
+					if (FRAGMENT.equalsIgnoreCase(child.getName())) //$NON-NLS-1$
+						return;
+				}
+			}
+		}
+
+		IPluginExtension extPointFragmentRegister = fModel.getPluginFactory()
+				.createExtension();
+		IPluginElement element = extPointFragmentRegister.getModel()
+				.getFactory().createElement(extPointFragmentRegister);
+		element.setName(FRAGMENT);
+		element.setAttribute("uri", file.getName()); //$NON-NLS-1$
+		extPointFragmentRegister.setId(project.getName() + "." + FRAGMENT); //$NON-NLS-1$
+		extPointFragmentRegister.setPoint(WORKBENCH_MODEL_EP_ID);
+		extPointFragmentRegister.add(element);
+		fModel.getPluginBase().add(extPointFragmentRegister);
+		fModel.save();
 	}
 }
\ No newline at end of file

From 47facd48912fd015fc4780216ef2d042916863b4 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Thu, 24 Apr 2014 09:17:30 -0400
Subject: [PATCH 0752/1286] Bug 430717 - Changes To The StringListWidget

New Feature: Changes To The StringListWidget
Added a replace button
Selecting an item in the list populates the text box
UI State to disable buttons that have no effect
Added new string to Message.properties


Change-Id: Icf513da1a73e2ee88c9aaa5bd8a055bfc2a6c573
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../e4/tools/emf/ui/internal/Messages.java    |   3 +-
 .../tools/emf/ui/internal/Messages.properties |   8 +-
 .../common/component/ControlFactory.java      | 134 ++++++++++++++----
 3 files changed, 114 insertions(+), 31 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index cff7214b3c..8f96ada029 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Marco Descher <marco@descher.at> - Bug 395982, 396975, 426653
- *     Steven Spungin <steven@spungin.tv> - Bug 431735
+ *     Steven Spungin <steven@spungin.tv> - Bug 431735, 430717
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
@@ -20,6 +20,7 @@ public class Messages {
 	public String ModelTooling_Common_AddEllipsis;
 	public String ModelTooling_Common_Add;
 	public String ModelTooling_Common_Remove;
+	public String ModelTooling_Common_Replace;
 	public String ModelTooling_Common_Id;
 	public String ModelTooling_Common_RefId;
 	public String ModelTooling_Common_FindEllipsis;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index f59984c012..77a4a81d6e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -9,13 +9,14 @@
 # *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
 # *		Sopot Cela <sopotcela@gmail.com> - enhancements
 # *     Marco Descher <marco@descher.at> - Bug 395982, 396975, 426653
-# *     Steven Spungin <steven@spungin.tv> - Bug 431735
+# *     Steven Spungin <steven@spungin.tv> - Bug 431735, 430717
 # ******************************************************************************
 ModelTooling_Common_Up=Up
 ModelTooling_Common_Down=Down
 ModelTooling_Common_AddEllipsis=Add ...
 ModelTooling_Common_Add=Add
 ModelTooling_Common_Remove=Remove
+ModelTooling_Common_Replace=Replace
 ModelTooling_Common_Id=ID
 ModelTooling_Common_RefId=Reference-ID
 ModelTooling_Common_FindEllipsis=Find ...
@@ -494,10 +495,7 @@ VWindowTrimEditor_TreeLabelDescription=Window Trims Bla Bla Bla Bla Bla
 VWindowTrimEditor_Controls=Controls
 VWindowTrimEditor_AddWindowTrim=Window Trim
 
-AbstractIconDialog_IconName=Icon Name
-AbstractIconDialog_all_workspace_bundles=All Workspace Bundles
-AbstractIconDialog_current_project=Current Project
-AbstractIconDialog_scope=Scope
+AbstractIconDialog_IconName=IconName
 
 BindingContextSelectionDialog_ShellTitle=BindingContext Dialog
 BindingContextSelectionDialog_Title=BindingContext
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 6775e46db4..645a07c8fa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Dirk Fauth <dirk.fauth@googlemail.com> - Bug 426986
- *     Steven Spungin <steven@spungin.tv> - Bug 430660, 430664, Bug 430809
+ *     Steven Spungin <steven@spungin.tv> - Bug 430660, 430664, Bug 430809, 430717
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -78,8 +78,10 @@
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.EditingSupport;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
@@ -716,13 +718,13 @@ public void keyPressed(KeyEvent e) {
 
 		TextPasteHandler.createFor(t);
 
-		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Add);
-		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_add));
+		final Button btnAdd = new Button(parent, SWT.PUSH | SWT.FLAT);
+		btnAdd.setText(Messages.ModelTooling_Common_Add);
+		btnAdd.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_add));
 		gd = new GridData(GridData.FILL, GridData.CENTER, false, false);
 		gd.verticalIndent = vIndent;
-		b.setLayoutData(gd);
-		b.addSelectionListener(new SelectionAdapter() {
+		btnAdd.setLayoutData(gd);
+		btnAdd.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				handleAddText(editor, feature, t);
@@ -740,21 +742,43 @@ public void widgetSelected(SelectionEvent e) {
 
 		IEMFListProperty prop = EMFProperties.list(feature);
 		viewer.setInput(prop.observeDetail(editor.getMaster()));
+		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
 
-		Composite buttonComp = new Composite(parent, SWT.NONE);
-		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
+			@Override
+			public void selectionChanged(SelectionChangedEvent event) {
+				String strSelected = (String) ((StructuredSelection) event.getSelection()).getFirstElement();
+				t.setText(strSelected != null ? strSelected : ""); //$NON-NLS-1$
+			}
+		});
+
+		Composite compButton = new Composite(parent, SWT.NONE);
+		compButton.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
 		GridLayout gl = new GridLayout();
 		gl.marginLeft = 0;
 		gl.marginRight = 0;
 		gl.marginWidth = 0;
 		gl.marginHeight = 0;
-		buttonComp.setLayout(gl);
+		compButton.setLayout(gl);
 
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Up);
-		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_arrow_up));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
+		final Button btnReplace = new Button(compButton, SWT.PUSH | SWT.FLAT);
+		// TODO need to add icon for replace
+		btnReplace.setText(Messages.ModelTooling_Common_Replace);
+		btnReplace.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_add));
+		gd = new GridData(GridData.FILL, GridData.CENTER, false, false);
+		gd.verticalIndent = vIndent;
+		btnReplace.setLayoutData(gd);
+		btnReplace.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				handleReplaceText(editor, feature, t, viewer);
+			}
+		});
+
+		final Button btnUp = new Button(compButton, SWT.PUSH | SWT.FLAT);
+		btnUp.setText(Messages.ModelTooling_Common_Up);
+		btnUp.setImage(editor.createImage(ResourceProvider.IMG_Obj16_arrow_up));
+		btnUp.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		btnUp.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (!viewer.getSelection().isEmpty()) {
@@ -778,11 +802,11 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Down);
-		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_arrow_down));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
+		final Button btnDown = new Button(compButton, SWT.PUSH | SWT.FLAT);
+		btnDown.setText(Messages.ModelTooling_Common_Down);
+		btnDown.setImage(editor.createImage(ResourceProvider.IMG_Obj16_arrow_down));
+		btnDown.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		btnDown.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (!viewer.getSelection().isEmpty()) {
@@ -806,11 +830,11 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Remove);
-		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_delete));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
+		final Button btnDelete = new Button(compButton, SWT.PUSH | SWT.FLAT);
+		btnDelete.setText(Messages.ModelTooling_Common_Remove);
+		btnDelete.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_delete));
+		btnDelete.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		btnDelete.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (!viewer.getSelection().isEmpty()) {
@@ -826,6 +850,38 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
+
+		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+
+			@Override
+			public void selectionChanged(SelectionChangedEvent event) {
+				updateUiState(viewer, t, btnAdd, btnReplace, btnDelete, btnDown, btnUp);
+			}
+		});
+
+		t.addModifyListener(new ModifyListener() {
+
+			@Override
+			public void modifyText(ModifyEvent e) {
+				updateUiState(viewer, t, btnAdd, btnReplace, btnDelete, btnDown, btnUp);
+			}
+		});
+
+		updateUiState(viewer, t, btnAdd, btnReplace, btnDelete, btnDown, btnUp);
+	}
+
+	private static void updateUiState(TableViewer viewer, Text t, Button btnAdd, Button btnReplace, Button btnDelete, Button btnDown, Button btnUp) {
+		IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
+		Object firstViewerElement = sel.getFirstElement();
+		boolean diff = !t.getText().equals(firstViewerElement);
+
+		btnReplace.setEnabled(firstViewerElement != null && !t.getText().isEmpty() && diff);
+		// TODO check valid value and not already in list
+		btnAdd.setEnabled(!t.getText().isEmpty());
+
+		btnUp.setEnabled(firstViewerElement != null);
+		btnDown.setEnabled(firstViewerElement != null);
+		btnDelete.setEnabled(firstViewerElement != null);
 	}
 
 	private static void handleAddText(AbstractComponentEditor editor, EStructuralFeature feature, Text tagText) {
@@ -844,6 +900,34 @@ private static void handleAddText(AbstractComponentEditor editor, EStructuralFea
 		}
 	}
 
+	private static void handleReplaceText(AbstractComponentEditor editor, EStructuralFeature feature, Text tagText, TableViewer viewer) {
+		if (tagText.getText().trim().length() > 0) {
+			if (!viewer.getSelection().isEmpty()) {
+				String[] tags = tagText.getText().split(";"); //$NON-NLS-1$
+				for (int i = 0; i < tags.length; i++) {
+					tags[i] = tags[i].trim();
+				}
+
+				MApplicationElement appEl = (MApplicationElement) editor.getMaster().getValue();
+				EObject el = (EObject) editor.getMaster().getValue();
+				List<?> ids = ((IStructuredSelection) viewer.getSelection()).toList();
+				Object curVal = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+				EObject container = (EObject) editor.getMaster().getValue();
+				List<?> l = (List<?>) container.eGet(feature);
+				int idx = l.indexOf(curVal);
+				if (idx >= 0) {
+					Command cmdRemove = RemoveCommand.create(editor.getEditingDomain(), el, feature, ids);
+					Command cmdInsert = AddCommand.create(editor.getEditingDomain(), appEl, feature, Arrays.asList(tags), idx);
+					if (cmdRemove.canExecute() && cmdInsert.canExecute()) {
+						editor.getEditingDomain().getCommandStack().execute(cmdRemove);
+						editor.getEditingDomain().getCommandStack().execute(cmdInsert);
+					}
+					tagText.setText(""); //$NON-NLS-1$
+				}
+			}
+		}
+	}
+
 	public static void createCheckBox(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty selectionProp, IEMFEditValueProperty modelProp) {
 		createCheckBox(parent, label, null, master, context, selectionProp, modelProp);
 	}
@@ -914,4 +998,4 @@ public void keyTraversed(TraverseEvent e) {
 			}
 		});
 	}
-}
+}
\ No newline at end of file

From 672b1303689821d7cf05aaeb226fc012d45a59ca Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Tue, 8 Apr 2014 17:08:38 -0400
Subject: [PATCH 0753/1286] Bug 432555, Bug 432372 - [model editor] add row
 filter and ability to add attribute columns to list tab.

Bug 424730 - Find (Class) button of Model Editor does not find classes
outside the project

Bug 404136 - Model editor should be able to select icons from other
bundles/projects

Remove empty values when filtering.
BundleClass URI Editor (with Find, Create, Goto, and select Bundle or
Package features)
Icon URI Editor (with Find and filter by Bundle features)
EmptyFilterOptionDialog.
Model commands for marking duplicate and repairing duplicate
items.
Filter By Item Or Attribute
   -(and auto add filtered column)
   - with filter option for empty values
Added Filtering To FindContribution dialog
Added Empty utility class
Find Contribution enhancements
Engine for converting a project to bundle while importing a resoure
Ongoing maintainance


Change-Id: If3ee932af6e8a94f4668f5f5cdec92bc516ed0de
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../PDEClassContributionProvider.java         |  38 +-
 .../META-INF/MANIFEST.MF                      |   4 +-
 .../OSGI-INF/resources.properties             |   1 +
 .../build.properties                          |   3 +-
 .../fragment.e4xmi                            |  17 +
 .../icons/full/obj16/add_column.gif           | Bin 0 -> 543 bytes
 .../icons/full/obj16/bundle.png               | Bin 0 -> 402 bytes
 .../icons/full/obj16/command.gif              | Bin 0 -> 528 bytes
 .../icons/full/obj16/copy_to_project.png      | Bin 0 -> 354 bytes
 .../icons/full/obj16/filter_by_attribute.gif  | Bin 0 -> 166 bytes
 .../icons/full/obj16/filter_by_item.gif       | Bin 0 -> 585 bytes
 .../icons/full/obj16/find.png                 | Bin 0 -> 380 bytes
 .../icons/full/obj16/mark_occurrences.png     | Bin 0 -> 557 bytes
 .../full/obj16/missing_image_placeholder.png  | Bin 0 -> 861 bytes
 .../icons/full/obj16/package_obj.gif          | Bin 0 -> 227 bytes
 .../icons/full/obj16/projects.png             | Bin 0 -> 532 bytes
 .../icons/full/obj16/remove_filter.png        | Bin 0 -> 325 bytes
 .../icons/full/obj16/reset_columns.gif        | Bin 0 -> 325 bytes
 .../icons/full/obj16/use_anyway.gif           | Bin 0 -> 331 bytes
 .../icons/full/wizban/add_to_dir_wiz.png      | Bin 0 -> 6174 bytes
 .../icons/full/wizban/attribute_wiz.gif       | Bin 0 -> 3291 bytes
 .../icons/full/wizban/error_wiz.gif           | Bin 0 -> 3374 bytes
 .../icons/full/wizban/location_wiz.png        | Bin 0 -> 7016 bytes
 .../icons/full/wizban/newefix_wizban.png      | Bin 0 -> 7540 bytes
 .../icons/full/wizban/newfolder_wiz.png       | Bin 0 -> 5842 bytes
 .../icons/full/wizban/newsearch_wiz.gif       | Bin 0 -> 3122 bytes
 .../icons/full/wizban/package_wiz.png         | Bin 0 -> 8344 bytes
 .../icons/full/wizban/plugin_wiz.gif          | Bin 0 -> 1737 bytes
 .../org.eclipse.e4.tools.emf.ui/plugin.xml    |   7 +
 .../e4/tools/emf/ui/common/FilterEx.java      | 104 ++
 .../ui/common/IClassContributionProvider.java |  33 +-
 .../emf/ui/common/ResourceSearchScope.java    |  54 +
 .../e4/tools/emf/ui/internal/Messages.java    |  16 +
 .../tools/emf/ui/internal/Messages.properties |  16 +
 .../emf/ui/internal/ResourceProvider.java     |   1 +
 .../emf/ui/internal/common/ModelEditor.java   |  88 +-
 .../common/component/AddonsEditor.java        |   7 +-
 .../internal/common/component/AreaEditor.java |   8 +-
 .../component/DirectMenuItemEditor.java       |   7 +-
 .../component/DirectToolItemEditor.java       |   7 +-
 .../DynamicMenuContributionEditor.java        |   7 +-
 .../common/component/HandlerEditor.java       |   7 +-
 .../internal/common/component/MenuEditor.java |   7 +-
 .../common/component/MenuItemEditor.java      |   7 +-
 .../component/PartDescriptorEditor.java       |  10 +-
 .../internal/common/component/PartEditor.java |  11 +-
 .../common/component/PerspectiveEditor.java   |   7 +-
 .../common/component/ToolControlEditor.java   |   7 +-
 .../common/component/ToolItemEditor.java      |   7 +-
 .../common/component/WindowEditor.java        |   7 +-
 .../component/dialogs/AbstractIconDialog.java | 349 +------
 .../AbstractIconDialogWithHardcodedScope.java | 425 ++++++++
 .../AbstractIconDialogWithScopeAndFilter.java | 474 +++++++++
 .../dialogs/AreaIconDialogEditor.java         |  16 +-
 .../component/dialogs/BundleImageCache.java   | 130 +++
 .../dialogs/ContributionClassDialog.java      | 233 ++---
 .../dialogs/ContributionDataFile.java         | 677 ++++++++++++
 .../dialogs/FilteredContributionDialog.java   | 973 ++++++++++++++++++
 .../dialogs/MenuIconDialogEditor.java         |   6 +-
 .../dialogs/MenuItemIconDialogEditor.java     |   6 +-
 .../PartDescriptorIconDialogEditor.java       |   8 +-
 .../dialogs/PartIconDialogEditor.java         |   6 +-
 .../dialogs/PerspectiveIconDialogEditor.java  |   6 +-
 .../dialogs/ToolItemIconDialogEditor.java     |   6 +-
 .../dialogs/WindowIconDialogEditor.java       |   6 +-
 .../tabs/ContributionUriCellEditor.java       |  56 +
 .../common/component/tabs/E4ToolItemMenu.java | 111 ++
 .../tabs/EAttributeEditingSupport.java        | 112 +-
 .../tabs/EAttributeTableViewerColumn.java     |  71 +-
 .../common/component/tabs/IViewEObjects.java  |   9 +-
 .../common/component/tabs/ListTab.java        | 447 +++++++-
 .../common/component/tabs/Messages.java       |  19 +
 .../common/component/tabs/empty/E.java        | 101 ++
 .../empty/EmptyFilterOption.java}             |  27 +-
 .../tabs/empty/TitleAreaFilterDialog.java     | 163 +++
 ...TitleAreaFilterDialogWithEmptyOptions.java | 152 +++
 .../common/component/tabs/messages.properties |   5 +
 .../resourcelocator/BundleConverter.java      |  65 ++
 .../common/resourcelocator/Messages.java      |  72 ++
 ...getPlatformClassContributionCollector.java |  49 +
 .../TargetPlatformContributionCollector.java  | 515 +++++++++
 ...rgetPlatformIconContributionCollector.java |  53 +
 .../dialogs/BundleClassDialog.java            | 331 ++++++
 .../dialogs/FindContributionDialog.java       | 424 ++++++++
 .../dialogs/FindIconDialog.java               |  38 +
 .../resourcelocator/dialogs/IconDialog.java   | 307 ++++++
 .../dialogs/NonReferencedResourceDialog.java  | 512 +++++++++
 .../dialogs/ProjectFolderPickerDialog.java    | 257 +++++
 .../ReferencedProjectPickerDialog.java        |  75 ++
 .../resourcelocator/dialogs/UriDialog.java    |  32 +
 .../dialogs/UriDialogType.java                |  22 +
 .../resourcelocator/messages.properties       |  58 ++
 .../ui/internal/handlers/AbstractHandler.java |  28 +
 .../MarkDuplicateAttributesHandler.java       |  64 ++
 .../MarkDuplicateElementIdsHandler.java       |  20 +
 .../handlers/MarkDuplicateItemsBase.java      | 111 ++
 .../handlers/MarkDuplicateLabelsHandler.java  |  20 +
 .../handlers/RepairDuplicateItemsHandler.java | 115 +++
 .../internal/handlers/UnmarkItemsHandler.java |  27 +
 99 files changed, 7622 insertions(+), 655 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/add_column.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bundle.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/command.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/copy_to_project.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_attribute.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_item.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/find.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/mark_occurrences.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/missing_image_placeholder.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/projects.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/remove_filter.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/reset_columns.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/use_anyway.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/add_to_dir_wiz.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/attribute_wiz.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/error_wiz.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/location_wiz.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newefix_wizban.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newfolder_wiz.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/package_wiz.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/plugin_wiz.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/FilterEx.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/Messages.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java
 rename bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/{dialogs/SearchScope.java => tabs/empty/EmptyFilterOption.java} (56%)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/Messages.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/messages.properties
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateElementIdsHandler.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateLabelsHandler.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index 77060deb40..5702b9e29c 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
@@ -20,7 +21,12 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.e4.tools.emf.ui.common.FilterEx;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider;
+import org.eclipse.e4.tools.emf.ui.common.ResourceSearchScope;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.search.IJavaSearchConstants;
 import org.eclipse.jdt.core.search.IJavaSearchScope;
@@ -34,14 +40,34 @@ public class PDEClassContributionProvider implements IClassContributionProvider
 	public PDEClassContributionProvider() {
 		searchEngine = new SearchEngine();
 	}
-	
+
 	@SuppressWarnings("restriction")
 	public void findContribution(final Filter filter,  final ContributionResultHandler handler) {
-		// filter.project may be null in the live editor
-		IJavaSearchScope scope = filter.project != null ? PDEJavaHelper
-				.getSearchScope(filter.project) : SearchEngine
-				.createWorkspaceScope();
-		
+		boolean followReferences = true;
+		if (filter instanceof FilterEx) {
+			FilterEx filterEx = (FilterEx) filter;
+			if (filterEx.getSearchScope().contains(ResourceSearchScope.PROJECT) &&
+					!filterEx.getSearchScope().contains(ResourceSearchScope.REFERENCES)) {
+				followReferences = false;
+			}
+
+		}
+		IJavaSearchScope scope = null;
+		if (followReferences == false){
+			IJavaProject javaProject = JavaCore.create(filter.project);
+			IPackageFragmentRoot[] roots;
+			try {
+				roots = javaProject.getPackageFragmentRoots();
+				scope = SearchEngine.createJavaSearchScope(roots, false);
+			} catch (JavaModelException e) {
+				e.printStackTrace();
+			}
+		}else{
+			// filter.project may be null in the live editor
+			scope = filter.project != null ? PDEJavaHelper
+					.getSearchScope(filter.project) : SearchEngine
+					.createWorkspaceScope();
+		}
 		char[] packageName = null;
 		char[] typeName = null;
 		String currentContent = filter.namePattern;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index f76095a514..f8fcbafb3e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -34,7 +34,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.equinox.preferences;bundle-version="3.4.0",
  org.eclipse.e4.ui.workbench.swt;bundle-version="0.10.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.9.0",
- org.eclipse.jdt.core
+ org.eclipse.jdt.core,
+ org.eclipse.pde.core,
+ org.eclipse.e4.core.commands
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.0.0",
  javax.inject;version="1.0.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
index c8488e2b5f..cd369c37dc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
@@ -97,6 +97,7 @@ IMG_org.eclipse.e4.tools.emf.ui.obj16.chart_organisation=/icons/full/obj16/chart
 IMG_org.eclipse.e4.tools.emf.ui.obj16.error_obj=/icons/full/obj16/error_obj.gif
 IMG_org.eclipse.e4.tools.emf.ui.obj16.world_edit=/icons/full/obj16/world_edit.png
 IMG_org.eclipse.e4.tools.emf.ui.obj16.bullet_go=/icons/full/obj16/bullet_go.png
+IMG_org.eclipse.e4.tools.emf.ui.obj16.bundle = /icons/full/obj16/bundle.png
 
 IMG_org.eclipse.e4.tools.emf.ui.wizban.fieldrefact_wiz=/icons/full/wizban/fieldrefact_wiz.png
 IMG_org.eclipse.e4.tools.emf.ui.wizban.import_wiz=/icons/full/wizban/import_wiz.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/build.properties b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
index cb9211218e..11fb1086b7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
@@ -6,7 +6,8 @@ bin.includes = .,\
                plugin.xml,\
                css/,\
                OSGI-INF/,\
-               schema/
+               schema/,\
+               fragment.e4xmi
 output.. = bin/
 jars.compile.order = .
 source.. = src/
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi b/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
new file mode 100644
index 0000000000..cadc6334a5
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ASCII"?>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_GxnD8Ly2EeOxWJvPH-7sUQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_Kmj8QLy2EeOxWJvPH-7sUQ" featurename="commands" parentElementId="org.eclipse.e4.legacy.ide.application">
+    <elements xsi:type="commands:Command" xmi:id="_RRp7QLy2EeOxWJvPH-7sUQ" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_ids" commandName="Mark Duplicate Model Element Ids" description="Marks Duplicate Model Element Ids"/>
+    <elements xsi:type="commands:Command" xmi:id="_9ITpgL2IEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_labels" commandName="Mark Duplicate Model Labels" description="Marks Duplicate Model Labels"/>
+    <elements xsi:type="commands:Command" xmi:id="_RObi4L2MEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_attributes" commandName="Mark Duplicate Model Attributes..." description="Marks Duplicate Model Attributes"/>
+    <elements xsi:type="commands:Command" xmi:id="_dySeYLzDEeO8eO1Rpb-rFA" elementId="org.eclipse.e4.tools.emf.ui.command.repair_duplicate_ids" commandName="Repair Duplicate Model Element IDs" description="Repairs Duplicate Model Element IDs"/>
+    <elements xsi:type="commands:Command" xmi:id="_CFlw8L2LEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.unmark" commandName="Unmark Model Items" description="Unmarks All Model Items"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_jtmcsLy3EeOxWJvPH-7sUQ" featurename="handlers" parentElementId="org.eclipse.e4.legacy.ide.application">
+    <elements xsi:type="commands:Handler" xmi:id="_p45hULy3EeOxWJvPH-7sUQ" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateElementIdsHandler" command="_RRp7QLy2EeOxWJvPH-7sUQ"/>
+    <elements xsi:type="commands:Handler" xmi:id="_AOEgkL2JEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_labels" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateLabelsHandler" command="_9ITpgL2IEeOqSr2XZwfnmA"/>
+    <elements xsi:type="commands:Handler" xmi:id="_TgJt4L2MEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_attributes" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateAttributesHandler" command="_RObi4L2MEeOqSr2XZwfnmA"/>
+    <elements xsi:type="commands:Handler" xmi:id="_smaaALzDEeO8eO1Rpb-rFA" elementId="org.eclipse.e4.tools.emf.ui.handler.repair_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.RepairDuplicateItemsHandler" command="_dySeYLzDEeO8eO1Rpb-rFA"/>
+    <elements xsi:type="commands:Handler" xmi:id="_Fin4gL2LEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.unmark" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.UnmarkItemsHandler" command="_CFlw8L2LEeOqSr2XZwfnmA"/>
+  </fragments>
+</fragment:ModelFragments>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/add_column.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/add_column.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b8715247e07a2ed09d44115b6f418b108d907038
GIT binary patch
literal 543
zcmZ?wbhEHb6krfwI2OtvZWPNHF`FT21w-<ZS?&sqx$78mH_Z)@?TJ*+O0u64t-@Hb
zXHkqqS%%HjB*j_DN(_yMXQj$BG#^=-Dq5dwF*`?YevT|-*SU@&Q-+>%a|@*B7s|{m
z5uQ+L%rNoFf>QChWs(cZrRP<O&8RZuopyC@jsCJmsijR)%bKK`S{vnNUt8BDf4NS}
zXwi+W6P344Qr<OPZQ+cZ*L_S&XHQ!?XWG5#&i7_GeO@cJd&B&_n-=cdylBhTEiX4l
z@7%F@*Ul}wcWwTCTKo6i=0DFDU;g;_{pT-#KcD~m<^0R<|382G{{H8`_doxC|MBzF
zuYccv{`&Fr*Uw+SfByl3zyJQe|MM3F{tq-z{3qyKl$uzQnxasiS(2gP?&%xAp!k!8
zk&B_8L5BedKoP~jp59R3)ZEhA)^5<=#KOYPBWw`V+0J2P?x3e1q_5xJ!>;Y-=IZLE
z-KOfiN?qMaL#=(KySu8Aqf(c$;cn%6nXY<SXD?6L15FanK0Xr1>qRs#ik#zh4hY~q
V$LSm#%z2CR;r(+@o;EUA0|4BNLc9O~

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bundle.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bundle.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd9003b1e3ca6949504270f1d160d63a1bd6761f
GIT binary patch
literal 402
zcmV;D0d4+?P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D00007bV*G`2iXA+
z76cX)^>H=;000SaNLh0L03N~s03N~tZqRi;00004XF*Lt006O%3;baP0001%P)t-s
z|Ns9qVXKFu&WNMUm9Ep3t<tP?06S{2J!-L}x!9z**!$m#``?MLcmPOryQjO_cay)a
zz}&CF+(>o1`{I<+s7LzRe6)T5wSE9@jJ$4)yTHxlRDi_&_SMq2X8Y~3wUH$I-Gg0-
z%ZjDSsJq$w=&1bYsM4)a`rwSdiU7Wg0GO}SnXlCR>aW3$0Enc{iKNYboXYm4injm&
z00DGTPE!Ct=GbNc0044HL_t(|+GAiK7bq#A@eK`8MU?anl=SqFHE8Q7>FPp-l$4bC
zl~wqaRMpfqG&Qvt7$ha7q=7(2R#r}4K~a%`fsc=mUqDbuSVTlrOk6@7tc#t4lZ%6!
whnE*_DkBRkBO4o%wTw*6jHoVSMC0QF0O}M7pe{zklK=n!07*qoM6N<$f*5<U7ytkO

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/command.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/command.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d6b3bdcc3774b7802d93ef9348847b239e3af383
GIT binary patch
literal 528
zcmZ?wbhEHb6krfwc*elMo9x7&<}8rrER^9Ql;J9z;U<#lCR6AqoZ%vt?JkkyE}7$@
zSQe;M9wbxXC6ntRSLCf&>aSEDs8SWITo#~I;;&K}tWg`LSsSKZAE{FxsaqeZRvoNf
z6|7bsXwVcDvZ^q2bz#WL!q8QPp373bmZy0xO^sS#61BcGVs(+%@)W<-8F8D-eO9FU
zuS`qcUKzM9J#|xJ%ErWut;rn+S~9jJb{uGG+t=8>zp49RYtGK3z9X&uN7|>H>@3-x
zShgo|`iYLp{fQO(5@(#~n0K~&*2&I!XL=T2=<7J1)N>+n&Bgw8mnLkyGI7hbiHGh^
zKX7~6|Ns9P1`|;H$->CM5Wt`Vaug^|7}#?g0-BmzTHD$?I$PzXCA*rX{QQL_`o(>`
zynTgaJH=d_9bDbqd1Tsot<B6WOe}3|Mdexr)fJVL6qGeJbo519*tJ#FRJ3&U4EO|E
nxs8pC3{9=L_}kf>?Cc#`IXjs>Js4Q}IhYvxU%qN@WUvMR;#iN0

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/copy_to_project.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/copy_to_project.png
new file mode 100644
index 0000000000000000000000000000000000000000..c21bd73295727db938375e94a89695592113fb92
GIT binary patch
literal 354
zcmV-o0iFJdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003gNkl<Zc-muN
z7&O4IZ@&uJn!URAOZfHgz3n@3w+-2b`1b7A7@~&ccWygZ+`HpC2$%Kk>_Rc52V#gr
z>3j(gUDUIEK1^+K@Af@l16t=CxPAG~%l{x;J!SV{giCg6c($y*?N&J_-XVX&bC4KF
z9;Ozg55<7mse3<^^zYb)>^hh7dHxRh{r_!J8~>Xolu8tIZ#&UG|Ij-W16qKLi??6=
z2RRE_vqQsF9*4aC-8LzW&n=>h{~LHk8Gyvg`gh(3sc(T9P&IY;?StnZ|IcaLbe*^`
z+j1YI9;6Q}P}IBq_Qu0^|0mS0`jXbPVLM^G?j1-yNFUgM?6ys}7jD1)pHvLe2R0zA
zc+s1*#&yq0#ZhI8AA$`C$e6A`4i3tlEd$aI0ISz70J^HL%>V!Z07*qoM6N<$f@Dah
A(*OVf

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_attribute.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_attribute.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cfb58e4319f3bcfa647356bc85fa2ed92004e561
GIT binary patch
literal 166
zcmZ?wbhEHb6krfw*v!D7kf9K<AR=HwfJ1>pKu5rg12ZOUm~i68i61{cym;~8KNv6|
z0mYvzj0_Ci3_2h&kQodt!38HhSMRNmJkWTM-9hGwBSZUB&79q#YzM^-2W&WEzVJ=M
zg*5`L%Pn|Vnw<p=Le$u}W(DmCzQlD&RdtyMOO~7Kx=mRd<ECC%QQ{SACL5dPx88+;
G!5RQLO+E7f

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_item.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_item.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b9f9aaa44eec7cac39862d6a12b1e18e963cdef7
GIT binary patch
literal 585
zcmZ?wbhEHb6krfwc*ekBQ0Hma5f(T#J#0o!#LV2xWwmu1`agX8q*P?3UFmF4>uy}{
zZPw&#+ZN*79p&C1>(&z;GBYc3c5cG_;@b5+^N+9As&v$;a?-7K)~#|bUfrx;1Jvbe
z(d=W@>}%8J-?e+Xaf6#xi;s1SuXA^Z|D^bgCFR|FrtiFV;Nb1!58pj;?h5vw6dN=>
zF=$$1@U+CpndvLeZU~$l7cwm|dS?3556}H4MTbs{i=CU+xV5u$=Y;p)K9sGltz6%5
z^VRLRxhb);lT#OF&ptdaWq$gtSGThk=M=9lso79dv97#qb#e37#@Y>4J8x`1eD`4A
zp3V&y*UmXQeeTg2JFacnb92XmTYJ}@Tk+uCz2oPO{s#jFx&y_ZEQ|~ckqkN@n?Z5H
zz`m>@vZ=YHwXMA)GF*tCM?fgNgN?`0ZJHwkTN|6ScW8)jNT55%tmbeY&)|qPYkWKy
zCN?qK2doM5^N$GgvKMaVGjob?aX9Ac>}<~0%pjp2p(!pVCN86>#C1ScDnd(MPEOQN
zP~}XMu(Anzgoc_zgtdVV>v9ew8@sipR>mBgnlw}*8W+3w$yvndEJ)~ZY7^3p*`hJA
V@!>*kCMlK-2ZjVCmqrE#YXElw#N+?~

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/find.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/find.png
new file mode 100644
index 0000000000000000000000000000000000000000..611189d66a9b143b3c5cdd00ef9f586f1f91e93d
GIT binary patch
literal 380
zcmV-?0fYXDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz4oO5oRCwBA
z{Qv(y10{fwY6gJlD-Un{U$gfP!^hXB!D9TPrVJs@DhxXE8jL8K7?HRjjUasK{<Z)4
z?X~|OzIy-v^~djE3}S=CKyv^7{bPV(m>#g@Fh=Q&gJ2EszWqYr@4vueb#pf1G=K@_
zl5OWcGH|hTF#P@fkKy-U2>$!)A6RVdDcoVef-dm=4{D%tvfvLyxOA`?1H-qUKNx;7
zu`)3HV_;wgiv0zJ(cj--Ia~nl1yE>v)f{H{{_QVVGuSmh{xX!sG&9^g@tCw|g!vg{
zGf4CAM|T-m<&+r~&B|m%k46*&aDlkA>Hm=pA=v<QLl)1@V#EjoLI7klNHgv7!hjh7
a5MTfht>6k<W=jPC0000<MNUMnLSTZ1!ln=a

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/mark_occurrences.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/mark_occurrences.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bb2361071fd53d06bcff2f9d0a53cc94dda6466
GIT binary patch
literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005>Nkl<Zc-muN
zAQQ}<STtqs<f4ycYo0f$@Y{l!)&EJ>Ja<w-FG%ykS=Ij+&aNZPfO!*(%jQlh{0Y;%
za%uN}5^OGt18V*S)4XCy=l>&zHWO#S{Qd%gIg<*%ESy;d)Li?2`J(p!hYoD~zjxP)
z|3o^yU>DH#fAgnT{9m@P?f=33>w%hA{@=V|7GVRnFAguAHL>vjk~vNP7Xe+ccvj8-
z-P@P^-?Cx$|5eL+@Eh>zgqqFE6Ivhlt<Cwra7O9B-8)zOU$waN{{o;(KmoXDZo_}P
znqQyP{__1s?*HG9I{zQu(fEHMP~*1E^T4i{KfV0_LR{(K<q6ebnC3r^yZ`_FFdK+l
z{$Dth^?$*%VxV^#|Ie9N@E;VVST(;osr3V_`AN_JzaQrSH8=hL_c|WPclv*9W5EAe
z6AJ$?n3TC~?!<f>RA-;kmUwkS^V^S`1^@p%?fw7v)7<}m-`4{*#{ga8`2Xc8lmF*d
z8@*pYGsF$MzmF-ayg8}+{Liz#|9?Nv2WqbU|L;{4Fbo|2zc^|1=iC~@_s5nQYoKWQ
zdR^{57~fF3|MO|W{r8t#-@iDn`|as5<9APv7{9-}*WkmoE&89&tu=gup&1vrzu!RM
v{&o$8o7?qmuC6yQIKSRNVgGys0c>gkB(6{-NEP-;00000NkvXXu0mjf*5)jq

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/missing_image_placeholder.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/missing_image_placeholder.png
new file mode 100644
index 0000000000000000000000000000000000000000..78a436c011fd594adb81a7fd003a04d2f80f41cd
GIT binary patch
literal 861
zcmV-j1ETziP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0009dNkl<Zc-rMv
zOHUI~6lUSVg$sX>3wAEtm;j>kXd$7LLLZ1kAO>53K9wLAkpNLtiW&)l@Kl19M^Q=x
z1#3%zJ}9-drH^R`3m9^|cM>L+nHD7`E}Y~`?woVx`|g~3&bb*G|MJO{O3!4K$S!gu
zYF%-a#+ENshVw<LU~$zwOQBf(IGf*)d1~?;p6pVANad-OcSYXnjj-wVLMR-Cz)l#}
z9Ud4QHyldtv_-g;YD*5U@xmYNx=^Inl-_EIFIzU?;NXBlEKX9yE{_iqdwaBf-edu8
zrH0HCswBT9fYPD8t$spAi5To5BE0MNo*~HPH$pb=E(N^qcrgq+p$HZ8Ef@lEeOvrQ
zk(^RluAsIx9*Gi=NF;#V-G%Cg4x0ElYUG_%436~&b^vXTOqnh&S9&&2s0>=|PS`~s
zVGK^p(PZ6yqu_9D!_ul9>XhBIed5Cc9Y6EQ3>>l2!YYu(lX03_dkK;x;Rs4?A4O8D
z=z?GEi)I@w(Ee;F$tSMYMp&z>s8T(ppI?GlEJnkGhz7=H;JAHq+DHp@=|+-#{ln9T
zxP%!3sKz5ce*g%ANDH%N9ZIU3X@SqyjU+#QFS?;&rs+yq<Bw=G3hA)8Y=vv(a=McG
zhxLpYx5o?kEExh<%bNDX;V`6wpstl7&#O?t+=7`kW(x~cD8dYZ>*aFdtIrRiP>2<Q
zV31DB=%gWK+{za_p!2k`9kOxe;}QfB5gXRl9kc*mr-~aKpN2xQO2-h$<~5XR9=#+3
zfdH_<=l6rnzDWVEQ^ldijNk#u5V*{hp2ulgwXA_35wM}>)fhbJd;<=ro7ImqfU41h
z=NW6W<(4%Gt7Pr*ZLb%6K3@_#o)6I}8hJO%@VnewP;#?5j;C<?VJB7%C?58H-|~3C
zi-eA#H<*B5(*ixO$CB(A4yOyxB{IK4sX6%`5J=Bq5&S3SRV#z+I2KGRz(=FKK%~^B
zOiikE;WJTbb>#b5BelyT(v3|gj87RrdjBbbn+i|iQ{8I#;Bj?vBq}2oL*2WNJ06b}
n^p{h3K;kL<SMTVI|L*w-QBNPJ)^+wr00000NkvXXu0mjf7ZHx=

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..131c28da405493661e3253ef79a68bd273039295
GIT binary patch
literal 227
zcmZ?wbhEHb6krfwIKsg2^W*Nf7neOfxp04z;n8NJ+xzDotkS){bH@Hst%K#-*LO_c
zo~yCDQ0v_4?v)A3lSAd#C95utQCbkGxF}NT_=2WF8}WGs5taT9|NsAIzy=h5vM@3*
zNHFMtBtdpEuqG&|^`&Ia(}-MpBVo@mW@+b{B25<}cFdc?!Kkoc14n0vkh1`XOwU>7
z#al8o_@;D=?hdfkdC)D9Q@O@%Lfqp;ZBt~9C*29`GMF2XzQp8akWQVjDvMC75PzEx
Mi%z;upCW@b03m@=3jhEB

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/projects.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/projects.png
new file mode 100644
index 0000000000000000000000000000000000000000..13e0451b94685880c95515856d7e1c390656c525
GIT binary patch
literal 532
zcmV+v0_**WP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005oNkl<Zc-pPf
z-%C?r7zgn42lR&wy~q^iLZo3LUbIb?O%CNns5jejh0(;>P6<K&Y8$1vorB`0+i+~T
zWuuh{IqgCO%Tp@BaEcs7N9wR_Q`T2^qLn|UB0liBdf(^E^FF);agNHbWhG(_6UnET
zd*|sVBor$ZQw+ou`}pDlI8TG<i=U27dmE6#4K~KP*M@6n4{%Yj#6|?kUs1vC7LRF%
zI)3a9G^`>W(Am_2{$>L{Gv!zw*W+i{ghco`wr8GUZOj0URpFCGnKs3cc%W~G5TIe|
z2@~ChDXR*}?;}7gbfWj;0krqIP^j$^0`e%UNEm6zSOu&PpKA1@A6K<3Zq%7m<5#8M
z)bT_ItohC?b^pLp>g$>T-YK9T^`Oh#3%$M<_jL}?Pu)jQ4_#2}JdtX3-?9);Sz`ef
zS;1VW8(N(kwux2v7m^vVqbne5oa;h>{I(qkoAGs|6L&NoSVK_^%*Hc%@s3B?U2n96
zbpBc5^;<4*K_isagLoNSg?;izn(dI*S4$`+eNpL6kLcgWP<T;9`t}cbFdsHEqHXhu
z0@WKnPxfDPsuW72J*#vGIkLd-EAqh3zU>_O+s(_e;KpB)is5g$WkFN6)P0G#$l3#z
Wkmfkfor$pk0000<MNUMnLSTY-3Hr4F

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/remove_filter.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/remove_filter.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea14834f949fae2262738e25bca40d2b96c4eb03
GIT binary patch
literal 325
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU?dWKjFrj0`iUl`r+}N;T
z!wMj4!GakxW=sHz0_7SSDk>@p3JNkZG7=IJ{{R24p>moXWKc<vUoeo13>Y3L$4Ua_
z7?Zr+UHBz-G28@lI14-?i-EKU7`vU!wgWOIdAc};a9mIRq5tLofAydL|4Z7Lz4{-X
z!(!N@YSY5|_rGyXl3BWW8dKMw_eN&hUa=e2apq6|^}p8s@c+EmSFirPx>~X>r_b-U
z=vLj?54V5(_IRrL>3-us&)&t~zIbu>yodk${@0hEyTg6u>;M0|LRVj7bp7|gYU{JJ
ztHK@J?yL$ATz`#G^8dND|M$O>@i?o!;7c__)y?p?lNbB|xu3z))z4*}Q$iB}F}#{V

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/reset_columns.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/reset_columns.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ea14834f949fae2262738e25bca40d2b96c4eb03
GIT binary patch
literal 325
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU?dWKjFrj0`iUl`r+}N;T
z!wMj4!GakxW=sHz0_7SSDk>@p3JNkZG7=IJ{{R24p>moXWKc<vUoeo13>Y3L$4Ua_
z7?Zr+UHBz-G28@lI14-?i-EKU7`vU!wgWOIdAc};a9mIRq5tLofAydL|4Z7Lz4{-X
z!(!N@YSY5|_rGyXl3BWW8dKMw_eN&hUa=e2apq6|^}p8s@c+EmSFirPx>~X>r_b-U
z=vLj?54V5(_IRrL>3-us&)&t~zIbu>yodk${@0hEyTg6u>;M0|LRVj7bp7|gYU{JJ
ztHK@J?yL$ATz`#G^8dND|M$O>@i?o!;7c__)y?p?lNbB|xu3z))z4*}Q$iB}F}#{V

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/use_anyway.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/use_anyway.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2f1c5a8fa7b0daec8a56f57de75efab04032b6ae
GIT binary patch
literal 331
zcmZ?wbhEHb6krfwxXQrr?{@M3dyW4e_5XX+_y6(qe@~|We>U&m(|P~j9sGC5=ig!9
ze~115orwN_Hv8Y%?EhzT{#_{fe|P52T!toJhFEikBMmA?nsin*c&=^sUft-my2)!}
zyWhGN-wo~lTf2fbbp#%m8nb^&%;6dF2dBjynVE26QU3ZC-_0F?ho{G%Ti1H`%+CM+
z|1(ek6o0ZXGB9W}=zz=s`H6uo<G|Dc4;`s~kA+<>L8|Q<EKXlyR=Q0*abhNmqKb%%
zM&u_2E#a2sEq@rqUa&qW`7?!y>$HlX#>H-FMxN#tMp;)GW`2IY3_f07CN&ocR)OgW
e(*;;0TqHHw+1VB^(Ufu(U%6^^=-Rc84AuaX)Op?j

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/add_to_dir_wiz.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/add_to_dir_wiz.png
new file mode 100644
index 0000000000000000000000000000000000000000..684431cd1961cb9ad75430a7c111409fcdc95294
GIT binary patch
literal 6174
zcmV+(7~$uMP)<h;3K|Lk000e1NJLTq002t>002S=1^@s6A3-Z300009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde00d`2O+f$vv5tKEQIh}w03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`
z>R<o>I+y?e7jKeZ#YO-C4LeChK~#9!?3`<C9Ore0-!n72+~sAL7b&vjSf*4Ps4qek
z1Wj5CR+Kiei=au-C}~lrNSX$43<PQN!*LN5NR*=eQ^08207YFOK;XJa0=KDK)VbJ3
zZ8f%JHNHrctVEVXQ4&e<&gEry=kk5$?T?uycb7|wH<1FJ0TwemH_kr$p7Wh^zOxkk
zYH7Iq?e_;<5*d<t5^Vso-mkFK07?PKlE|sDg+#XcxV+N={oTI}x+GeZ$fz<)Ws4H&
zM(4g`mG$laxRzB#Gs!do7i1gArlqcVN5T51{~B_XXd>B0!W98XG=pqij+MP*VEyxd
z54S1VEPz7-h}D!6AiZ2)wB=!a=SRa?C1NE3U@W05fi?kzE4bH|h4tN^j-*NCNT!4_
zq+~>EgP^&3-#Zr8Q_qjOO6Evp>R^Zn+5x1=)!lnb!TQ%1Mq5a<3gECdK=K?xo(hj^
zxc`=b^@A73Qi+<<08pnK&k=NzEAvlV64ui%jkPGzDiDWtUPu5>L^?^X8Pu|1<^S}a
z&x(g`#}$Z+m&X6`%+Z?x(hq+&?x>=JV7igBme}+<l@M}${-$>wP#^r-Ck}siUw1c(
zVTkXaIEo+Q%%-PE&%8XIQ6eug7c<p+a!&-ERLIK5yj8*yPvCkkieZRi7$TM0e5?J>
zS0-`<T7+zfK>$yj_3=?Fg5|h?Zz2@K5Tz)Bp>7(aXJ4Igl;|KAANmFG97j5JoqW{F
zV0l1iE{{?a!8Z{sHV4*^PE4jqbPDJ!20;X_<47k70dLH6I7^!$_WLFV<r@Rnb#dF*
z_vJSd)KC6zGAn{@OFpYWTnFuPgG)|x%DVH*_kH8@zw_ZEuII*ZtU+K6AP#(E5Lk=u
zZMUH{(^}wD_d!8eRZIp2oG+Z)fAOoQPp$XEJ@;B6N3!L5qnYPQCkc-vHU!okyLKL`
zjCvIxRZ&!6Eh1~-h>LBlT~HE{wFs?2%5BDl>2vMt{a`P=UTD|4N@c?j;7ATwTV%ds
zSQfe@D5DA`Ye4xXf*(Z?XL0pE@o3k304y7(xJ^zv_iJqfFZ`j`y601GweI=k^kV0_
zjx>ufs~hA>=U|P_7Wz&PTt;9GLTeGJg*Xn{GHo@WhG$0*X?#4i7G)DO^d?U{+LZ_J
zOxLb^4|VOl2W_3V*PT(Ng(M8HRY!v$LjT$CV6x}&$8Y`k@y8c9TL)=J(55$5Qj(ar
z7mp#yvi;BR&5K~acyY)euE6oI|C8_i=(k+QgOWHuaS><7&K?p6h+hIY!1*ut9BlyW
z#ozk)Umx0c|04^YfHVLVpasEXTcH4)x)JyJe|ZFhgI7Pd<0H@hlq58c)?HW7MM9K>
zDxd^ZS+_>~B`?^YTvPSlD#R#Ls`N;tNO-6lFy@u@4`-$T)O_gO-`oewIA4gYMPLK;
z{>AC*raMnO+V$C;dk-AicmE?G6;vP4Fo9#27}OTV+XoN-4Sw+WgMVM_d;0y&x5p-#
za;2T*n$j2oqD0DArc{}-3QtLp3li~Vh7K;^Io_O)vda%jkG$`J$3R<#hC^U93EE-;
zEn3kl-IT$>KlnzjaPqIdm4M2LtgZk+!nKNwvCJ96E^C=1kxf*z#&pL)jWb^?f=~R@
z{^afcoqG>--?IBIm~vmDtmH)nR6(`#`>D`mpHiV}K~*R%G+C!JE$G;G+wTtj_~2vN
zcYWXtlf=2AfO$0}%1HJ}x@*R{<E!VbqRCn|S!GI>P|liR6{9k&0)7<1Xk!zyMvrW}
z_3p2vGcBM7*#E&lfi3?6HuPZwA0{l<u7fgc=))xY!k~m8EFlO=2$OXX*6vfaXy4xb
zm9)LExDBJ$%gl}+LrL1dAiF=`d&5gK;^5?|(KnB@rt>hWm@;F9M&|{A?*Gl-`%CQF
zvk#_t2>_r*Ax;`zHVrSE+wc^LAYS{Q@1dt}v^BL6xnb{Pr>6jX^LjT4eG41RB%@k%
zQxpY_u?T|*#-y<!u$H?7zCvw0{6o!60ZXF@Q4qmK8&uC)?h^VocG_k(9>s17Wd(?W
z2*%uGuma!4%F+<v&7mwCC9opB$&?kuLq2GiR8|=JIDhs;rSyA4VU_(5elUWr%-DmO
zi(h(ACA2_Y$N>N<nb|_e!_Nh&J;fUiOD*HLi56VKXPtcYSy*=)I(OWa4Dqsfd|mZn
zK!WuzjpH-b*k4*}leK|0aq^$P^#Jm~1EOUJOLcZS39%C>m5L~pi%3QN$2J7kd}L@B
zHN!CQF*0-&AA95pq%-rOgoXt$oSJ`M9*HCUDp#ZBVW4VXoKMDES{|%QMw~@HQlrpi
z4*=lh<1b*^<ew|G92~x0w7QP4bV)OO`^+oY(R~2vOb-5~r(uhi0UK<pUn@*cVr*gr
zrH()Q_YLz|$@dTSM;nF?Vd&%BnOE`qUwj_n&{3GFUu^mSKmr#porAjhQ?vO`^)9Dw
zzmBjNn_z>W^xT=_*nRg$k!^BO>U(kXhe`s)QW01BFQeT4i6=L7G^{nlh06Nn=@a<y
zXP!dP|6`DL^I0kJ%L`{gFMn#L>){?Ovx2z3u+%K@Sr^a0h0b03(Uoh0-*<8IBYP6X
zQW5=wSKxOXesU$(t`97cc$&O{vQEAJzqs%4x8V;yzv-$X2y2Pn%e{b;8J_KWxMwAE
zjOzl+_0nE!hNdQTxbXH{fY*kdU9Biz8Q=UA$SQ&`#Nf~XqUPUta;4WhYkh#r!+uU6
z0xDP<sHt+k@$+MN?}xsGa{o`_fOQjJ#ze3tLf@4>M0AIzcO7|dL(`qBBSBWlmboFO
z$^`rRdQlF5?%Q_3@9)`MKcz$zDZ(hkmBFisn&1EAYVNaYSpB0ximVQeYin62-+UAM
z4txgw;EQoNdDG%4!VlvTbzlEgSf)n8-CuvHNj0sK%<c%G$+^`N79?mXYE<m1VGWK2
zjuIU;W?WUv>hHgX(a~8vc-OB($6nb~RRy7eF$yIxGByIY^`7G$>2P~oi=T%RPqD>m
zRHdA6C?>QL_{IrJk?XHkS$Pq-HK`OimqZ^w_H*pH=R?rR*EUsEQDhNB7OKRxkx_((
zetz#4dYn|Wt9oLCRXL|pR29Zjg1}0dbm#-Ys+2V}5w<CjsZTm-%K#%>y*h-;mk05Y
zKRN_Xzq)y#tfCwkSQ|I6Tp75EY}bLFY;$K0)Lf-v!^#&8K#9nz1P0<$VU>=V3BBo3
z<g6Ul@MM@K(b~{A_``r&^z^)qdk=gXso)%Rlj16?M5$z8tir0|+Q=AG5q0kU^flMf
zT{ShWI8L=n_*SK?0%KIl1>YMUFQ+Cd{%S?AMhlTcvZGN8r{kqlphaP_fKw+g;Gr)*
z1Y178X{J~54NRgaYl(qt{b;-8{*k6kz9Vi+A|OICp5;@ZL`o@CDa-`!z(_GYFcZ3^
zwTy-x^>G;iPszLp1XLV7dJ4Pmx*ywH#$f#$uPP=^+FHU`MPw9KnV4R@o}8M3+5p@4
z95$}#P6`OZ5C{~Qp-K>0XLvSruT1#f)sbR)%xdGfep#@_r=m92{fvWz2ePwL?kr5s
z;EgwW@yDNgA8dJKU4c|rPAknJaWhAy>4VS;pahap!WzZEwE^UBIT&SHcD4hsBzy&?
zlu`(-^p}l$rQmy)MoQ_SQY67r^}p-FnwXAK1X@u$@?`<$s*}SL$6m*-Teo3n7eQSg
zRWX^4uf$8rxMDEh2}9UAP{tD0#^yIsm`32w;Ep>VN(tDalyOTLiBv8H#_gMlyvw7d
z^yMkvoz<!@WmT{WvnKXawTfyb&=Qu*EkUukBP^Hi?0Wazxl3;!$L-zk!plE9GuOx@
zBJs9VZ6j`UT5t@N?W)NPSy-xPU8SBCtX1(+C59?YPowkQzl~J$j<Tf;8g(uO>hzW(
zuXo%}Uz#j?lSY^S`>^XND+j=>0+l1#Tq;cN2uh{BCXBk(nmr%**w>2ZUwdZCaokKH
z`M^kEB%AZ^7aWr+NOi{`wE!#I3$BwYuo6G82)1>=w(ovmB2u?6Qm4<i?xm?P)jM8J
z4+X|Cy21{TMdzcYiY5c1L+5-1a;nT)rIcr9@{#Yi+sL%3GDFfMD3}lQ98~q9JC4&N
z;xw^J0drk2j8l!OYnfQx!l04WT`~k~ubVqIe-l6n6R9&>G~W1Z=*<Myi5fMtX%a&$
z)t}W+Su-W$kjN+32#L<hxgx?$Yg?hIrL~|Md(1icYsIh3Z-bPkl-sF<C>6HSkyrPi
zoa@r7Ue|T;Y1|!H`CxPFB|87&mZtgRYgwGewLIhz|7NcS)M}QL=VT#U<6j~yfK~Ku
z3m_Q)f;EB?KwMX{*dj{}ta4yo0IdMmtf-2rM7GX9+Nf7nI{<e*K#4%SEu^X%Sbk`;
z0GeXclQq}ox0<TvV1<!70%>0lMQv48%_~dLL7)q=KC?ZZD^0Qm|0$4TtY!f0TrW@n
wkaDFNTX1mz?2&bxnNB&977=GF!utOK0N!1ko1_B_lK=n!07*qoM6N<$g7l!!ivR!s

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/attribute_wiz.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/attribute_wiz.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8a70e59bc1df62e3e20c4b223ff9e285738cb484
GIT binary patch
literal 3291
zcmV<13?%bMNk%w1VM_o)0QUd@|NsBq=J@FD`rqgH>+t&g{r>Fn`|0lb>hJpD==k91
z_~GgJ?eY8I=lJF9`QqvL<LdcosciT9_in3j;_CUu*~Q)I-Q?=|E_yBc`~F*@Ue)B)
zNtR36+T+RF*ZBJV*3;eH<Lt`a%J=#G`~3dV%-HMg^5o>|XPa#H`2Ee_&h+>E<m>tL
z`1H)*&G7X6>F@fY$)x4(<?{COSe{$%^84oP`lPj}a;|m0)xKV$Vea(q{{H{M*uv%O
z`GL2Dw$8@;{QK?l`{(TVM2ST9`u6?(|5lz^{QdlXwSo5e_GPDN^Y;9azLGSCG~(>y
zxzV{ci8k!=?CtXMcCdN%`2F(r{J+=6z}CRw<?x2Nh%$mQ{r>+sjXL`L`sncJ=IQa2
zz?ReE)2+$5Y^rYV^ZT;Rvg7IXK#@Y3#G87ueCqP*gSdu@yp8bn@V3yl%*D|#eJ}a?
z{V{+s*yh<|rDkZTYxep5`TPCx_VLfl)%yJYPMJ_)q-0E(PU`Ub(d5$4;LrR0`(LAC
zM3P0>>Df@4Q!|7!N0mr$t#a@4{Nn5HJdZsvelXkT+wt}Mc(Hoa<J92m;AEy}Q=C;|
zq-FH>`bCsRbgy?&n^fxY>XyQoyx6_-^!R6}YLC8=`TP0!`u?oWt@il)LXt$a&$Y4A
zvp0)4@bUKV^ZUo!$3Bois>!Ol*1G5H_Wu9>RGn9Sw0|vkEHZ&HQj}9}qH(6nsB@)y
z`1$;(%&F$<^!@$*p~0-Y)4XY<YRBEk{QUliwTRu{>9f+bJB~a#emIQ1kBGX8*X7sf
z>F#^8e)048&*IN@uXxkt*!ueXpU9zLqhsIQ<>BDxK9E1->G<F5;H}TD_xb$T*5Fl{
zRj<&nwbZtWyNuD{(ed>Bp~#}>?fR(5sEVkJbg*~U=hw#E#`E{{-s|7>`u0$cQ;oWg
zUzK3s?B&DT!(yOg>+t*H=kwX+-{tH0aH?=Jfimpy`-ZlR;_CRo!^Y$4_pi9K+v?os
z@8|gX{Gh+8A^8LV00000EC2ui080Qu000R8009UbNU)&6g9sBUTu6{d1||#yFq}xS
z;>2BYtV9&R(W1wX6M4v~^35K{lM+FyTnT{0h!qeI96;HTrOl8eQmk0<0s#z}G*jLj
zdN6}dm<$m31WJ>r(}BS5RH?G!8$1F^f6i?Bbf}RLQ>VTlKsGB=lwEC#Op#*hiZTYs
zVqLlwZCaHs*|uF#!$91!bc5dg$R*Sry*h<3@GIAB-IHCdU1L*+#t~SQGVxLKsa1=D
zF7F&>yF&5ezjL(;9x7!Ura?MlYtUdBRwhGyIB-Y;2*4{jBSwfOUBfhEz^b{jRFbQX
zbLW-%z@AM5Gj2Z|E+ujiT=?O)#TlIcZX8&-N@f$5c=BXt{gO#_Dn-*l`v@i691syg
z^J$9r6{*w^-gwBJ1=&i_coIPbWHd+y8^gHp#25X@@Wd~o9HRk#`k_IIGj{-3hJePQ
z=GbZ<rNah;6HJf@B->cC!;Df$p~)8(N@9T{wnT&7C8Vr^h%>3AGU9;8rDkAF9u=Vl
z87|_0Lkw%oFhd@0xIyEMIqrxIIFxkA$R!>aNuqd3o@ic0X+VhsCb78C!kjIfbIz4o
z+KA&5I?}O$2oV5D4Kbv6aAb+(C1;mK+>nt74&)?(P76v@ssx?qV7Y^y7NX+_GGYV*
z$$pG<LBk?v5~$>3Oj1;cqc~9iA!(%&)GC1+fV7fE8k>aiNeu2(*yje`xX=t5rABd2
zs%e(DC`DRK5Ni_FC{ZgYpsZnv7Hs^GL@a7hfkPr>K*Grro`R}^2$ift%qdP>fuxDf
zI&c957X9KVCXn=SEw-Q-(?%P|ben`SkYJL?1Q9GTOrMbiB0>&`yc@+k^OARf0}v!I
zKmZ^IU{Ng6Qjx~LUZiZwCjxI011GIOlLQV7FHuJi7WnCn2o*Gu>>*bm`bRiEJTSn=
zA%|QMAp1g6js)0x5yaHxq`}D!*h+Az6sC}C$0U+ELaYj^^q@f(Q8-bHX#@!1!vYB?
z(7@42D@{=h`)+cr)IkXUf`k%oOzj0ITGyFJE@XV&M<AbyL3R)8pzXvgi@?A!1rNY2
zH{ErMOcBkoG6OXzQu~d>>4F3?IN_J(VGYBR^kIty>Wa`q4rrvk1urbzi@D}=BVD(v
zc9d)_=~JJsJQAvBed!EtXc0l|pV02O?K#*1?-sZ84#Dqn2j98p3~^FC4x1d$_wuJt
z?R=eX7&Cnzu~@(E?VspQi}&DfE_~7y$%P#p#f{@3&vd9$-8uNd2~+f{37Ak^{c3kR
zap*1%{L5VUI5)hBw80aOa)Gs=#y8WY4iMMi*1;0ywMj%H7L9vc4&IQqS;Qd(zSE%p
z#z&DhEFl6D00gD~Mpr^X6e0}-Gg!E2*04GZLK$N7#^ZYN20~0O4nW8u@Hhy-iF9KU
zKosH#qb4;#46I<@Y6CQeVTx;XV+noGff}Odg0l6Z6xuk%9I&Xx4gSw=3^_&}KnRF)
z3~_XzD916hz^xx};tPh`R4!bo0X5JeVm!kF6iUGXJz^k>-_xP^ItQ&v{O}huFyt8X
z&;~Yi>loFl6Z9nML=8Zqb`{706wKg+Ei?iHI1J?${|GXQq#+uEyoMX>L@8^zAPLY+
zLLn}7r#xxG7ICBj6^K>G+r2>?SHwUDhsnc<Ttf$am_!qH;D%JrNeQNiMJ$x@gE>`m
zMr-&&80bU)gJxi|0$8|XF!UG)b&S)G<zz@XG=R<t%*YLSVCE(uLD5avNmHAm5F}^=
z3mizXY`QdqFMNrC?)7npq@)N9G%$!txI+r;gy;;yfQg#^084q20)^Z$8~Y?eVioAY
z9nC-l8)D!e2SsTIJ-AXGv_TUveP}KcLDdN`V@njWKr?8QnF+{nmjj&x24vxZq>gf_
z4C%oUnu-iftf59bFo%O8@B<mFflKb#YIQV2hD;8X7Dh#Z56sF%Ku*LCuvlpl`tgM?
zxK#>}XpbkBFo7_{AO=*Zj|Md32Rncite%v`7zTUNvv!dpoX7+$*4hdg$e<sLWyW)&
zGoAYXkU<oDzz!mAw@GoJ!Kg%V0BMDZ(3FOx0F%fBC14SaUp(Onu9bm1>;N13(55=Z
zP=Oe9ONfBJ!3;DYsVsmXT*4BQd<%I+0SW*JJ{Ur|6F`O}=KEYa*g_e7pur%hunAQ}
zLW+xILlUTHhIedXkFr341Ik<4!WQ!)>n%VU{NUb9kRcKl$gqZY<On(-BNCxnmnr~C
z;CB!d1H}lzf`{8b(;7A*T!`>`BftSaP?!eXpo5Nej0|LK0K`%h0nd8iT~^TG#KrKy
zf*DL)rJgn+JTQWc3*ZJjAVN1b{)7vD3}P{OBM>TZfe1#-+cz|U5GR%eFKn=67K_sV
z!RS56D~urJ2xs5}Q&_?!5W!~-7$OY60CSjyOy+<>Aq?7ZLYmji<`tVap$Opuo$dUA
zN>4!zq#y+$2yux^5MlzG*v5#1iiJ0%fgV=u<sMP&0Rh;c(M)bJoD~w~Nf!VQa;WqN
zf@2FmpyAiRM#CzoaS07jq6?>pLfQ^dk5!`}1RQyFn;&glgYZDolg<FHb={qI{D2YQ
z1~)Or-34STThRypB@xE(lW4=*&E%|hLAZczU}QksxWEQBMzI1*SfUflkO!vAeTssg
z8{M;LL>$=h4_CNi2oPuUyQz)VhR_=r&lttOmw^fsm>?O+IKecgA&m}XLk~Cqs0A&Y
z!16;J;=n{;$2jtljcjzF1H#C82(rNQc%0!3`lv>eUHssJT)O}n&^X6E4swx~JR2Y=
zK?&eM^{VIN23X%m)vK<D5`X{%HpjUzLa_6A_&fm%c=LG=a&0b<Kn~dO_tHNea;KXd
z>Qa}w9`?TXyi5J-Vb}T2vtah0SECyEP&=dr!h@refCPKEcLw}{i&1EN;~ej}$8`aQ
z&U^mzp4WxwMGx^IIA9)*Zt&V0;`ql${@&ZJba(aw6DC-}3Xgb!?iDd2#T@4kOL6zK
zRloSgulMngmwfDZ9UR&-!S=Y<{R?;>p5F)G)e|RvwHv>S<GWt@xt9I72-rfE+TT9+
zyYD@LfZuNH4}a*h7RW1j(0%VGANJvAKKXa@{PRnn`o8xU?6(!tmU{5FdH`^3byfh#
z_j=lvf6eE7(1(80r+(Jgegzn7ikDKafNc@hfZ(TVxG;Va=zr-~eFAuW83=F1)j<ll
zfFOu}+(v@s*MHG>f&oYt11Nk3C~Iricphkf4!C>~Sc4Pze-@a67?^zr$U{JAYYg~(
ZGWY=_NQ3-$ggCf<D#(OBI6eUZ06UVUrceL?

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/error_wiz.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/error_wiz.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2eb9efee51fb22a844bb7f58030906458b02d734
GIT binary patch
literal 3374
zcmV+}4bk#PNk%w1VM_o)0QUd@|NsBq=J@FD`s?ue*^`Fe;O+8JRMXJh<m&nA@cQoZ
z`}m@q*sP24TU_z;@%NdN{r=?N=lGWu8SwP{`^3E7<?-U``TP6a>F)L5=JMxCO7J~G
z%*fK|?)vdXN%{Kx@kven{p<8{bocrF{K~`s>EZKXW2H4S<?Q+Y-O~EJwb)r%=EkGy
z@A~cV^ykyK<K^x1Raxil`u5G2vbwkX{Qmf>q^P&G&ZThQs%q))`u^0(;^^|;<@Ngf
z{`P!)@l8<m;l||Z^w!hgxMEr0=lG;2DbBv3;pq6{>G<I2_~GgJ;oaEUhJE(<{n5<W
zx<Nzc?D^bfX64w-_JxD=_x#3HRp5Je*u$gPe0B1%W8B^8<GG>P+2!=SdH>_v^lEMD
zw|dHibol!H?eY8Y+`az(|Jvd3y1=#aUSQ^@TlS5L`uqOl;N1HA`P$s->t$uc#ktzv
z?cUnf-s14OSyHvR!0`0y!p6$UbZh_r`0HzH{r>;;`2F(T#Pjz2;^_3~$+7P>Ip^&4
z+1lIpk&W*-JjiQh@IXZW_Vdm}NAzWA^?`o#_2u&Q{O&R}xwE9JueY>QOziRO_U+F0
z`Th8^tN-%t&3tm?>GH2fM9tLK+1lvz_WAPl`PxQE|NZ>!>(t%Wx7_3O@K;x{sh9b#
zUi$m><ZW%;-RJrG{j)ST^^J#MeS+g;X8-^7@ALcr;nvsI<MnQG)Y#hp|Ni&+<M{gi
z{MOO?{PNk=+VW~;;o|4^_xkz!{ru0z`1$*uva|l!&Bi=F|Nr~!;K~2``Ry+<+}`V~
zKtKNf|Nr>*_4o7icXjLR@Z03@?C|&ajfvOT<?83v+u7pM)YtNGYxQ?||L*6|lYj8<
z)B5}T<?Qd|;MxEG@BH4{`R>)d!N&3P_W0PX{r>&GW?k)XaO$&e=<WLG?)mug&i?-X
zprWPVqg?Ou_rE_v$xl%1(5de`Kk&?@^y0{{D=&SNl=q5<;Ga~_nTGoL{O<1Kp&cXW
z<=^t~?)~QCA^8LV00000EC2ui080Qu000R8009UbNU)&6g9sBUTu9Iin?Ga(Fq}xS
z;zT~G97Pns(W1wX6V0gVGhqP7lM+FyTnV7Yh$;{}bU@jWrOl8voK&eYp@j~aG*jLj
zdXSAym}FY`1WJ>r(}6WA_36WNzyPH`XEuF0l+TE%Q%hRK$`mD6n<AY!nOX%F8LL;9
zYBhUSrAxJIt0*AzcC6f>bwBdCRSB=oy?o)4oqIB{MVFNdtJTXlvEQtK9Wzv>YQ%`h
zlNBJg92fIe%?bI8@%*`PThW#KmM+^EHA0uHTfc@~S@GY~6N3mJPQ1ABAc+Pl^Of6k
zrM9p{kCweSGes72vTJ9;y*u}A;KS$t2vY`tnOm!yJAuVsdTigO>0UoW|C#+~74m1;
z&!c}PAppLBPY&@gGe&x>RWbp4(eXxFb-*#i!WsA3mtO_@WzZiF{{cA2Am^yj4hsi1
z=g5NXIY`}a@=b(Ah4|^G;f4Tu_~AS=gptDw2#)Z_1SmE*9elLaMA3^D$~Ys3H45<|
z1{h2+!#L;UPz-B40m-0yy<JwMP%b8kA%FhW_~9T>V!(?RGkBo}1OANQ1dv*$IHZ?z
zMS%bU7QJ{Onf*0+W||nlpoJG+XweQ9m7GZDmMZ$zfu2Z25WuAYSagJv9A?s?jf7$V
z4KJo>VX7KA^y6rqLcW&(Iw&On5rL(cVyY>IJa99~BzN@M>m)9O3eB)nm{O{#i>?|Z
zmnNaG1QJRVF>9^1R&<1}jo5O5A7yk~20a(p(#Rby3~Me6#)iQF132K|0-ek5rGuUp
zB=Kyt(^8u$MZ}2G2ql3q(8R!56pTq8`2-T~9qyRx#XNIxU`HhEl+p&g3^uzb0`=Z2
zEv?i}REr+ol)(i7SHRIg3<k7pKn!W1a!4LrgzJDi?)W2)J1|re4h<G#Jb(-+6uoiB
z(0;7%z6#ay3It`KoW>#|T=T;Z*N6ay2{C{W!yboVQid(ehy#l!o`};k9*|tTU;;A8
z5Jk}_9BpsX`G(x|(_A$F0mmXgtnt9$4-~QnBiGDgf&n0yAVoP`kd3w{oruFrHEqL^
z07r4pZS<Z<;|p@FdqdE78X~N*fF&xlZix*GJaEqsA}rE%45-u*IWwJf(n~Kc@B#@T
zKXEQM-FADNH|YuK5dsTMG;mEJHc)`eH{akwf(n+zet7M-qaw-J%=A))6TLWt2Ju>T
zjy&jhi@tP1wRqzP0S(Nuh7Ba7@WuZr&>r_<M}q%-Ar`_|fD|O5ju7<13BUk`IO4!Q
z<9V)b@KfICs&x=OTz~+3SOgUopaNW^02BhbL;xwEg6frEASGA;2*6+kF+kuH5&S?e
zC|EoJxbJfui=Wc}^o5Z61)>Qtm|pd8@da!M1QY?>9tC1CkV{aYYX&e!GUyS44|wqd
zaiB#He~7^#YH)rXga85HU;;)wz!KK`M+ydl4ee3jgaSzf1w@br#x0_TH~eB4$9Oy-
zhHi*@D~Qv|&;$d3feLT5-ZxTk34s_x7$gwJG6b>=VXQ%MG4KHHl5v4t2vUsgD`XiD
zxjYUMq<&nuf&pd$NgJr(7uTDkKuRDCCjtP951^gxKmY_0tbz+&^x_~>dBNo2ZG)FO
z2r<+MhZu;UmMWkCE`?D^03_lI1BrzVs36P+009IBct<uM;09$@gOJV4;4{%!5IsNu
z6KSv}Bv+UJO%nV<m%rSl3JO8a+BE<KhCswH>JZ2epkWimE9AxykOUz@lX>+72PReq
zhGsN_5v*81^(e4|<j|1<4_HG%7hwQH90L)bVCX5l_|S9=0ziPssZIfrp&t0O2crn8
zP<<LrgS^5Im@vQwJYawZm|z#y5Wz<+@xnarU;%}=2jUii&_}%V6Ow4?Lo>mH44E}Q
zbV#dO>BH7D1hof6t*0OIAP+$x0tlo?!&9wc4OYYgg-;a50~pZ^mU;jYhVUv(!#Y!k
zasUQuO=|%rOWDaHLk^hDEPX}+*SHeIgLy#2BQ}7}ygro?JJ@7E0Z;-~G=LNa0K#Dt
z`v?#JfVH7Cz(Zv%i;Uj-_6@)dE@s`DNP<lB5E?j!Av^$trlw&RBrxeEd}$04yf(J8
zeS{%^FpP4r(~G&?f_TOIhVj0E6X;DZCx9!5GjtZC#tlI>R`3YBmbL*D=q4z3K*e1$
zf@L7^zy=bF2vXD|A0cSx2WSwEE;#tXU66)^CoJJEtXB@BSQ^t_=?w;~U<0FNZVYTt
zRRDb90V*(QB2*CD0B=ALh5$htB=CY{e&7b-kcEzS%wrx)gA;O~Ll0W%S%SQR9_0W6
zj1d8XXn<27*sy^KqEX^6h(NZ8s4F63pa>(B@{2dH!w|+y<}#027Secwd*w$&X@)@m
z3@bo{AU5!Wzow7^i%3HnNMMW<%22?DkOvS<V1#ul_{MfPfT9=8=po306UeB566V=v
zgE%b^bs)tCVz7fg17I0D07C;tU5FB=fE0+82M8Ll0tryUlwh{Q6J|~8Cn$Od(m)0s
zkYLe^CWIIvz{Cm~@C$4t;@Ghe!OLP0g9eoJ*fErcsv7_Y2^ji|9|%SyYEA0{$l?uj
z0E8JSUEG4K;}w*s!xd6`k9$Nz1jGb_yn!&iLPR4Pj38|Tz)%lT!upHa=77LCVCx}t
zp#T|hCY#Gm5I&H@8-dV-D@fr1X(Pe|7zaUsF^-50EY$#M0K+OyKnWWIJQ4%{e*&(N
zk?>Xanw|wQ10VPRiV$!i87o+vfIW_go_E~i%q7Jl_Av62ANu43_x2X(AcXggd*SdM
zh|FiM4`wtX;_%o5*UpLYj02(Bi<pHg_;CVJpurxkNW0q8p6DTPBHSp5=hG1xb%9L1
z2Eg!yKN?Yta-0Aj<^aPYOrU4IE&>c9aK$PlAchO<gBPiYyyPce02l}%ZmLu`-Cb#S
znb+X+K48N(ash!r5WxsgfQJ;MKsza{;2lPg01?RNi4=7y0ZXx<(^={3hIqaPIuwU9
zV8DwubYmJX$OjQlAc5vfKodmBM=_?s1VT_F6)?zzs0Lse+{1JCFRyg}=ReN|V06L-
z!{-GxbfJqm96uDH(1tePKaFn8K^F%Y0yTJ%eKc{uFW$#Y;CDviX9mCbc{Shzs-OzM
z&<mZAHsT--4lscf=mO<3EM%Yn(a|8cmwP^xdGZ8x9Ha~fh=8HT25jI9s&F9bp%zpD
z6Mx_cGWaMQ*nJ*IMw&-tOmlY#2zn@(f-6`ea*`J?D1)nFdp7ueh7^8!qYN|02R-P6
zD5!!g=ov1!6MqncGgv1MVif_XdrL@wdNXxU7=<SYgjG0%FPMc!NP}HC0AKila>sk~
zV}MT>g$ekBR49a3ScF@MB5xRnI2eMP7fp6Jb9i`$d&nAn$cBFlh=c%mgCIC}Iv5ZD
EJK1ig2><{9

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/location_wiz.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/location_wiz.png
new file mode 100644
index 0000000000000000000000000000000000000000..d79281c27553b811fd0c227809957f57153c2140
GIT binary patch
literal 7016
zcmV-u8<*sXP)<h;3K|Lk000e1NJLTq002t>002S=1^@s6A3-Z300009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde00d`2O+f$vv5tKEQIh}w03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`
z>R<o>I+y?e7jKeZ#YO-C5QRxZK~#9!?3-(hT~~F-e|w*E?sM+F^YAlvYzNzkL*m3q
zFpsnZH>5O_en3?~Gze4)XhlWZf@u4pmC}Bza1ljF1y!nwcvPjTNCh-fp(?1QG?36b
zAta9TFm`N@XU3lKJnrM1z4u!EaL%2%GnqV`Ow1(VNL%;b^O`fiyVid__P&N+Y^!dc
z`p46eDiu|2snP(d@h`9}1C#(&RhlANSEV|5{522jGyi-hQl&0RMMSGAS{J3X+PSY;
zSf9IRyedLXRZ9vHstr`j&vngf3f33Can_1bR@H_okuji34b>sQJm2-N8CZY&t%-)H
z)(luxAh)Kbfs%QF_juLA`n!84s-onU1ZZwTRfUEDqZe_nS1qhB{@Y|pm8PmDMsrBy
zpc)uzgZo~yu)gx0sYq0ts#I3MFvc(plvH2by<b(ZzWVP|bybE8*kwEnu{E?*i1j7h
zf8D@Ro%t~6(2KcN1iR2Pryo7RktfgixfPZZTf?a8#p%<!hLz3y>>Ztx55Dt7TxtMK
z#&(^)e)qNCs8`~z9(lq|76)Qu%&4lqWKio0mbf(T_H?K_`X<0&Op*8)Fv~tKy*DNg
z`u>5>QJOq)Rb_taBYXE88WK&u@Zghf#u`RNF{*3xjPa#+w}s0=qm}zR6OYs~P4Jbi
z7-I?;Igmj(rhi}noW1sggdcx~xn6tNi{80s&#mq8>FA!R8R=Yn%v)EM<*x>R5U|U3
zNAV6Xx+<L2;q{L}G`5fO6*nVur<p(TP%999;QH4cI`_RJ<~x~Jc?HA5f<NfzC$AEh
zExDn0+ngxz3xLx<ZU-zatL<cXsDVHBpIkUm+Prai$9wnf*!}23PszzwGAw|kef-GY
zZZ||4<+W=vyb&LuQ~*%b91z8;>3?Q%9|PbPq)cP_7?oO;-rNbskN#l)&Np3g>mw)3
zmoix!>-xC~yjNvm<V{F*D+U<i6i&`y47kkk(9x&qbhBmG)N2(sj?`&3Dm3a<D&+*5
zL>ObR-D#LRO%z4cqm0>^Gs*m^Bfqj~_`ugsO)>Y%h81)%tu}xvxI(j{$g*jyNtXG+
zGKF$ErdmlTB{5NCur_x^kwA6+1eOxBW{h4Eu(Rh$)ApuPLh?#?LtN0js4c`?MDanf
z2BK2J>vn8<7R?&au411x5v9v-WU~1|CMG60JAQ`A-c!6)<pnfeUJ0-yhh+=P63qcV
zm!J<uM>`lXtwDC)!U#&aR3eEZLN<pNT^Vy<nXs~u*B`b3qx9Wyd9-srP%cHQSk`JO
zhGl4Ih>aUJGB-Vfm-b72OruJysxe@GF0e$@x}YW*)GQPi6l)B#a~+;IF@eZZ{<*w;
z0JUm~k!FpdTA6ySOr@MqP9mbn(rPwo4Y%-a;UcnSj3|kS#;PQ$#4Ed}mlW1-ee6?*
zKL6$K{^^@<y!@9nNd7d1Wr;3XmZ*@qfQl}uJ1lETMb?t0j!G#m&eO%*tW-*<)$2^3
z)8}B5!|_2A5lw;+iz=#lu=%;U;hlFKJ_OtyFo&kSK`V7!C^FQ-vV5Ug))+R7G<fU5
z<}-wRnd=RfJ0`!6wPvwiOp;QrS<6Z-q97z8Xek6rBF_!ylEb?5uEU=J{;=Jsvarb$
zwi@d7GE*`b4GqFl>hP?PjKQwV>{p2YqN`d<C=4zLl@PQXL=(9PIF}68op&7`2JQ(_
za%g(1B{UX@twl_RvAUQ#*ugw2=rRzN)dYP-lpFxIOcxcrU|lLBQhYJ%G8z`3zUxZK
zfvN3|s2nIo5o5J6c8%;L^&PSxs4iJhKPk1wFf-fc*v}@Apo@An*pe{@>eVu>W`#z*
z!cetLxg6)osx<?!)U4(I^>SI(JuZn4Om25Xr9cuzl%kmZTlaBUYXiyxE@;uW%B@3K
zvMlEV-L9i=5B*sgDTG`BAA~rzl;VhLDOnWxK3!GCixRD8Sa;ra_|L`ILuW4Q5hqF<
z#UwT&u@NU{enz9bz?Q~lvY;q=#%_#3bt!e&y0OL9jjiWQO3f<$QZpc0qIpTRZeiVd
z*Wq2NdiVIIfF_>E#6-ptSxX#6ETr>fp@}sHFPirb1}#f;)x^`T(5V-c%jIrJd2M@3
zYuN?WyJxG=9%^H)!CFgX3>)gBM8*=^d>CWMibC2NgEeMA;LTDhV3vATIk*=tL4p!Q
zS(lpizK?xsm#Y5u)Noexot9ju>pHZmbs__s8zbx-+06ZcrPRR;3Or2Dc6j2%B%#o-
zD0=31T1sMu8x@A?W$Kk&;FCDQ+P-Fi7uF{%75#(x3Z$hT<$hPB$RM-esKg~c_{Lx3
zvQ~-6_Hc{Qu;1)kvaDX3asEOZ5nZNDqDtRbYSj`3#acrW$3(Fuj_snr_uX)P!b0EO
zu11UbjH1LQMiuI%8n^5@2t+v~lx(r<kOPx`ZD<XbZy90R=HZKSyTR<e4|ZKz)_Xqs
zm%CJSm#>VVI)kcm<=E96*mi(NCy#LTmR&T;EqXrCa~5CLB6VQZ)WKN$lA~BZ8nWI5
zUR4h`8&NH{7%gumsBob>!y^+9bLFP1nVdgQ&kNlwka|Hxi_~GMu2Y4qNJ`ftlN43l
zdUQioJ>YFjEgt5ok?ox9KFq1PQ%rTvvSVZit;!hZ+jE$Dlhhl6Xr93{5akq3Po3vW
z_ujiE|Jd2{(=_XL{lOB+*YB9(8@*xEP4sjh=X;a<_|yYfqja))Zo2$B-nRQnwzbNO
zZrD!^wv3H%`&$kG>5GGNZj!O#;Z8SoGpcB<0{i#unoq;}vn*6~F}DdpXjWP@t4;1b
z_Kl+4iMapdgT!{0U86VVZm3{vUK?&4+0F;vx&1{y!w3HCPx$o5fA8UA<0GGL_oOEZ
zvt5{Nhu->v1x8e%m~?PKC<oyulRqH~`3#Ms1XX%2<6L`s(G9Ixn_BlmyGy-RS(xui
zXLccnC6a%U>k3w-RH~#w@!pepA$3BvBuur>;X=rZV6_CRWD*cnGOw(q{Pz6Xiuua|
z>%>H_`B#7Ql^@NW9LM!xc_DRya#SG;K2IhiOAx_@9F{74;;%ouwxQixS+}sBo=mHv
zT0eNhH4i^={Aoh3L+a}ETtwGdcDMF2pDl2%dyb%ao#=vRKF#>Z`){X~)Tkx(#bjSK
z4-|?b8klIGE84zVSf@~m%ETt2VypR=Ac9YOkfjb2b=D=UQ&VZ8N)zCgH{US#wSW2c
zPnn;&CT$GU%VJ8grBP|{_8qr!-}rqzb>TRXwVdyC_|_xGFu)tO-9)ooh608zP8cZX
zI_LSHQx6bS2qJh9%29=mYjZ{8O2(4Qa6Ti;92bs1$(Et=L+`(1&;6>R>k8JHbEy?&
zWH6~6s@49fH#_|o>4vRzvxFqJL^dy{x704<k#mm|S;PHLpTru&Z|uFD@#%<h+KYv+
zs^%^#f@q0vKJrt%1Y8Jgs%~a;bqoJ@?x+0vw*5Tj&yl7n-Sz^f|LZ<(y8gg7uX;>=
z<bu9zuwHD|)-q;!MRNPwZ~hu-moPg+FHPyBAs?A1(h6yCq~6nU8J9P9Fj^kN`7kg%
z&U?Ji;bbl_R@p$;Wu)G*wYHs&mF*lHJA?#F<~+`M=Euh&=)@hr`QHEbK}FX#ZoD*D
zXQ#6U##C1Bf7{JB%{7MVf6vqzdTEbtn$bx;?KDuaEmH64c}MCU2RFX~?*rZkLI{iR
zeGoDqNS)Agfh(H3*;L)a^&4(vPviB}?Jyfk+i>3Dy(8;&nLc`yEBEgG5|?1RsCso`
zCMyBMi=Bmmh4-S`*nZjO$A5U=kMHnGS*taSiO^zdemXtROnQM@T<6-c{RGK-<USNb
z1n2WIDD(MfCZk-@*uz+9GpWx(dhf`b!?}#}M<2y>+E4z`CqDUE9eAF>SI|}WFOI?e
zYh_te7o0UPvdSSNsv`=ueS5E%zxvAEcQbj0basYr+NGOjv{TRC#(uKkna?`3Q%^hf
zx#eZWC|tIig~icxfnM>Nx<KX}S(f2k#_Y)xEIfU3;kLKmc9=`FU5p!!tUO;K7S&N$
z`hDK-|IVG?9cwkdDo;H|@4__QUYBk!rA&*l@@9IzM>`G0@XNHVlLb1dUk0t`0zK!+
zvXm^#$XrHeW}4}vk8;h`umAk7-g@hkmkQPka>Mhpu7ROCXs*TTl2I-0F=)=W-SXxi
zeDC`|ysSMwepRT}(Ktp`DcLgPy_4)7x^B@0U65kvq8qxx4f~?+oGV6dQBw~d;hL-V
z9sb=9edycI=6)}S8$K_r={c8>|K?@j=2}&BWbjuDgMSo-cO1I;d*A=z|2F1NpSsSA
zpw${xJ47uSq87FC+^Mfu1u$PkMjt%B56L^c^Q7Gl=Z`+h^s!@Hcg^b$fAqrzsPzKt
z!h*NJSbs@aQ7aEAG*$}yN?59J+uPpqgC~!lJa+b}<2R=>(`AWb>Xi*h5Q5~9Fa)2&
zDFAuzaefJs^N!i4PcZr55&Z1z#Jk`1&QHGYJ$F2?!pbiREb~0DhE=uNUrZ5#HbtpQ
zza=9OimW@Y^79D=m8JKn*rSghAO450|LZ3nKYsdMrdlJ}u!*EKOgz+h#uS$pB}_Iy
z$HM8;bS5Vt%Q|~@?fm8+fBa)#3}Vy^p?`lVo@4OuFTH}QtbSZpIsbW<96c+n*|x8s
zjPz$zL}-fS;QFvakT^&vX$X}NLS2HdtAvJz(2^i638AGD8i<amYIAPB)BKP7ezNoX
zM;>cDefE5!szlA!Vn0k3f^)d}IYi-xeLK5vymrsRFWtEBRI^c^2iw8g1vSx}8nY0H
zW`mk}FHt)a(@wqVq|WwIkIOv%lE9kpc&o}rRjjC*AdIRK=Zj=RDFjy!-VFyIhC}cz
z^<g-K(8?i&rUV%lABI(=sj4M|SquXGt=;L_r%q2MPo17BwY$Ci_cf|)7;XB^qs?&r
zl{=rSWvV8M=F~)U#@bo6c3z2Q#n?HocHW7dO@p0lr)IX3(&?sTYXNK3+RzwUs#wj}
zRE`dwrxL0np{}ZBRY_2didK41V}h~PS)rp55yp5U(g4b;8kzil5kS3Gk^Osjr2F??
zp03_~UD01OCK!yWAv4DGFt&#^9gNAqcwJmzqp>wwimjH*F*OmSo0{xpDWu!IP*<e_
zYFGgZAc{+~*r+4cUobYViiDa3sTv6lE0SmkO)U{cK^lri1~#f{q@pEM6G3A{V^pnD
z{8+NT%FzrkQUb;VAYhEs{Bw#iL9t!(<yW12Zq~L%jmyN$2QgXdOsDHix0jhT^WtBY
zu0uBsktjo;&#<WFmS>%f5{F3^P{qVxMB<`jP*zc+BC)lmWi53TwIZ6RN>nTzDx+#t
zF{)w*BNRnTOBE3{DoUzq$XojwM2#0gT)+h}UKCB8$wVRZ>Q@T<%h{qC2BPNz_3Uxg
zdQ?$ky&6!fCQhPA(Y6+gKvjjH`Gl&7=C7)Regs{NY^y~$5RpP#mg`La+)GyO^s-O|
z%DL;k^d;X(Y^!TDU%GBK3y?Xn1~dGkENb-tVdBVCd6jLpNFYWO#xQF$+Y?8oY<P89
z6@c|YD!|sY0tJvnrpBvqv%nQ*4VNAz)|8Af_SFdM{|5lIzbj8LnPdzA0000<MNUMn
GLSTaC>!KV0

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newefix_wizban.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newefix_wizban.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d02d1cb3620417b1bf69c5af0c8263248b467b2
GIT binary patch
literal 7540
zcmV-)9gE_LP)<h;3K|Lk000e1NJLTq002t>002S=1^@s6A3-Z300009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde00d`2O+f$vv5tKEQIh}w03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`
z>R<o>I+y?e7jKeZ#YO-C5|K$nK~#9!?3;Oz99MnEKd*acc6PLvR@&9-TpdW3d`R+%
zFO0)s$A%DNTybz*BxU}f9H^85mm#U#MJfbR<)SF;I6y%PY-|E{g<uk6o698|%NLUD
zl`L7;-uLd@)7|gAU;gNxV@I=+V##7lW~z3(r(gG*p6`5r-}n9f-fPA0UJYMgdU(hc
zAt@s5BD4a{vERWm2cS66EJB;LvPgvH+V;0SSoi*5*cD-s6_VCUvshVVg+!xs-?m_V
z^|6s=Ye|VnLcm3&6_KXnUGugA>)(Df>R6#kL|R2~l>!k`h_nFeMAyG<!20(ekF{En
zlmbTt2-(!8AfZmOkFy@EZ~kPg*$N?(00}A7EYPYz$^WCTvlgsxKQW#Vp-n{MN<xqb
zfoesOsy+6$1?#&{PPkU2O@w3}7)mKRfP~1K>-($%>%pfc7KzZJz?p-GBIYRC#S)WK
z=>Lp>B_eL!Xk(R9_GGWOHi(PZmGj+i$(Pu4*0lJ6#G}tcB7M?YV)>G^i-?ja^u!7x
zV9W0%d|zo7$mC67Z@)Kn#=wd|>IE(UmIDqj3yg@!E~V6T9gw1wG7Y+NgkYmcu)Y4C
zwILxwqNAnyV@UK*5XTQlb=4iO?h7@CqH91KRX8x{?f}jVSRxV!-Zhmj-SYUehpy~9
zJhimoX}7nhEr02jW&5w$zUqe}@)WQdNC5#*6p`1JQZtPJvl47{2gYx3r*f-s9B{(;
zA~H+}AziEmQ}?G$v~LhAAZ23P3Q~RdeUsHcxbNjcscA<e+x1p5Yx}MP6L)>_J3DV!
z-P0c1)VmY~r1Kv4Kel_rj@`p6|MFv(bpq$q+{ZYuLqwidO63{>hNGJ7Y=%P*d>dQ`
zltMWQ5edJygy4uSZw+V@zSjoP1~C>Z7K>E=k}WOtJ@YiZ*wh)-ED?#n-am8u7r(Rf
zhFh;+9=qnkbBMW3_<<%Ff0YY2Z{{lx?%BHYq1*2q>HDwM+RMcNx;9)pap`RjE^cmH
zF$BEWuydu97(@T#|4Yj`n}{vzuEsE-@FaV>NiOLGkq|@)nKZKF*Cg6o5fN;}DM7LN
z;_ax(67nlKa{@0S3Wx(Mf4t++2ezHl6T9Z3Z8)+YOgBl_Fq>V**kl2Kfma?}cg3GQ
zLOj_42nT-l_g%lb|J}D<|G5KuM8pTCfl(2S2+CNR9EDO5qc+_A7j)isYot07!6m54
zNt6?ZLNN?UD;)jCH`)BJ|3Jqzmxt#`^%{3)AA?_i_{@!lkw#qxT>V1d=sAan(<?rH
z({@UpPvG~kqSM83Qshc;kZOdjIPXTlM|6SK4}O-Pe(hteJ0H6Ju4L=7+c&=Ju4kG%
zRzEg6ZT2Laq@yX0ivk=~ahUZ$L8w{g<(DZw`V^A)ketWsKY5so-uJFk`i{p1>w&wM
z+yrbtnT~$;&?h=t&;8_8_dPyx!Az#q)SQg7eq}rR2PWxii(|!rb#PQr=bWXIgv1vu
zXZ4oLa2B<!8`|@Obt8R0+Wh`|4rp!gk@*tcTA-L~%hkL;>>Q9!39JY1UeW>le94OQ
zx34|_#^cbbdUsu`FXSH|9pt_5+{o`=v63gBA10mi$QFFM+b5aME(Q!DGm(y$2P2Kx
z5?CMQrs!FJ0nNQ1ruU+odFJc4wC;WC3s-ktde0NbU`r(CbAYM?!IsUGG`RTmG3#5K
zF8S#8Yj6E(1At5v^EwhvgCO)B$s^8gZoG00fj7#s#Yv_zMYOie=CUMWow#m5zLcWi
zbw+k8>dzFx`d~{eUA2MPVurRQT`X!}PAT2rkxaNN6>f{dZ3g9FZ0Lz>P3TDt7?I-?
zV<Q_eKS-yPNI!7*l51NRues^U4}Br}v3wBW<^7{H#paLN=ldqPYTIfY3^Q3x%#AUV
zE#U>0>Ff%c69J9`ff3Z4@bJN85gUNXfmqs>^nme5wsbIg@Rw`cC-45Nw(d>M9V^dk
zkC~1ZWo$*8s%)x^hbWQIQ~3r7BKsioh2Y7vt<kstyNj>8heWak8%!di8JdDSzx+ei
zEniPOmcZA?W-8iPKKG}WlP!2mXG6ItdYYndaGkP60%HVgt2ZasM|2iU39Hk9rKxo}
z-t1vOF#b%7lF`j#7Gq5oq$TuEBDglddF?eS=$AvTY(jk<{so5fK6M96gBU#dB2oi#
zx^EwTIx`<+N`#n*!~hj*z^ZFEUUW0Y8;+caLYo-tmUpwNyA>yv#Mj66IyRXm?kL7)
zN=#)en^vco9!OL4G;U<FT}Ppf#nfUgMZ^z(lrR)EC>IH`AeLn7Qr2Gh2gH)y#8WGA
zr$GXPh)~?KkLI+G6be=Mu1(mUEh3&qe2sEk+6OGzuRaRJ0Ba0}(3lP!e3hPCuB)(8
zzzMV@^F_PZ7%9$S*8QL9d_^g>y{wNLFZwX1unXhoFn$T+dvqq&a_PAnaNK5!+G$A9
z>2zoZrqVuRGbPrq5VWzBd_&xIPzoHSuvQ3anQ2Rio(54^2?ZZKY>-8)#*H<xXz?nP
z+m4F2;!wZ@VfrYZk2x}e&E&$bX#})|K!-qi8cG^l^f9BeQ1G!{fVCl5Mhv=;o5Lv)
z94ojD!!Ype_78vRd-SZ?i19{I%Ef9AR17Dc!b!AqaJ&^`0tTlF^Tu-!7_=2;^8u5y
zC33|eVv$hrG{(3%j>3vioI_0wHo%IDF$See*!)q%WI+V&7nvR1M?AHhrWQp)J4m3z
zN`baW;6cs{nPJOdh3vu$kdj79I^6d)QkUjfq@s2wQm$Cw+3-Vb5Dw$$n#=-}<KhLv
z=yaZJKA5*7V+`7Y7ldpYpD9E+t>6ciAg~pI^*mEI9x060Xun9zlz?c21d5pn4nF@V
z%^mMx>H4c!N-s_nhCx2d&>OE~GP!D3kz-$V#TD4SBZwD3Ni#Tc2(dN{KLjg+LCEMr
zZI$BqVELZGn$QA-Ay9AN3S7LQi<#^a3MD;nN4pMY*?V}3wzekxz~BcKYeO-&5{6`;
zEh69rwP0BUh4u?*FNbS$6tWpg=`jF0d#|8<?F}SS-4m_LFV^mOeu)Gofe1(T@1v!y
z9a>uF_<*hp&Ly?^Lb5MC27VZhgP9|=Z{Lcvr4WR&LsJMWX+vhxCuWxK*=TgIAiALu
zF@=Nt-lqBIK$ME{j^#c4=Z;yfUa<y0Fyx8>j_aU}MJ)K*;&}!uf;T4&C2TL|F#asA
z&61z&$D0}_Gc(4j-fI~j86cNG@>=(n_sojTyqiELM1)lzxSn-?{h4EK*f}(eePSmR
zd?YYYg#osI<zI+hzGaTx5QO;7y&QSt5$p-UDuoP~k69;`7vj;|t=My5j7u+A$>em7
zH{vn2ZeCuo3ZAFQmvpFOx`tU|5wVnVli-b#nI2{$Jr2PPh4dIJw|<0?pM4)ch$~TH
z7%SgYD++VOS<0o=5F|gqA{Ctyu{CbKX8b!@&GJ2Sd}f{GE9GXm<Hikq@9{l&LBPSm
zS+2TxZOAMMeOSI2-~|R%_c<a$VP=q2yuje$gG`N$lUlrni*CM`SRz5GkjAj2GF(|3
zefdiDV6Gnz%fuEVHVQc#v1Tqf^~Ut1!q8elg3Jk-H8FaGiP0m}S@0+pWArAL@W<!D
z&b|o%X8L|ZTe^q<&DxUEnu4c^Il{7}Mawew{QAe}+%PkP1H@u3V;RMU_x>&Mre@Ol
z8OEM}kWyh7%Vh8Fr|<1fl_ZHCr|_OmhTVM>pZ(S`x3anYauk9gOvS8JHR>3kq<X}j
zVA>~Uqx?#2DKv)jSp%=cj;9`E!-aoDBH4yQHO%VQuY~n0J8Rh9Q5k6@nhg*Mhj}ZX
z#|s1-U&^B1^Rd>lqT7%!SWLEr(U!op(b97{z}oaIq*1V98L5xmf@cei9)2Aa41+CE
zDCQ^>@~pmUEjF8G(3_2zC3q1F=L4!d$#D|t&WSba@PU_D+;cvcy#Mo!b<32H()e6E
zk?XIYAwWzCTN<yMJ&-D({uGFR5~a4*n*DVEJoDVsw4~M$Oc);e@|VcwGgU_cT$j#}
zoX*q%C8$7GM#vL`B~kW&9A@o*^*OHo$kz~4!XJJL@n^Aq8VS-1V$N`KYMjZbG2XZS
zLv%N#`1HfyI<~eT0z3EB*Lf<Sog}j?*!h`t_>JA*r07|D8KuMDM`!jgtl3o&jt(3m
ze#Ga%Ki|uN+Hp>#Iv7N*uFN7E4FCr4Oi*$2C$2h(o|jpBUit+WUH3QW^geWY?*an~
z@`XGDLq}Mwm*HJpU$ALhjIlCzJd7jsoUCS9f4U*F2K)Ep2Zjw>KS*KU{h?P`NLX26
z-y40T+PdZ1`@W&yR8?>8r0t0`OTd&Gp0IDv^PG3Z9r)wVV!Y`E7JWj#kY{kXpL4Id
z^Nk>Ao@|Jf%u^XXW+jav$I<!fXxM;NW25~{&&=??OFn{s_&=hO@`8~mthF3EdJs3!
zGP88kZU3Dv2sN|v(N-#x)f}^x%G!q7DFtKk8&R{yIvfkuu9u#ncgyw2^iHfUEGSkP
zWAXfep^+h+mMu>l7?fwrh0@SFh6M=3Rtl(d+UJ}Xy{B5jFM2kZ-#XMWYkF#&k)eLx
z{n3x(^?!Fk0cEXVjBup?FxuE$Y|SSh8J{(|u)+b=En!}0sXH#=vHJ6CR@0ool+Fd~
zwcRh#d+rUy3w!Ywkf@7*)&@TaI6BmiTD0*owP;gL<gNegSXc%hfkjoYve^v#`d;Iv
zJMY08|M`Mql^+<a6-Fn<FjjJj4WE8g&d_H!WY!DM|C-L_=hK<Y;$;?&s0Z4jwZ)2X
zWZ)<&+4G#!vaujmoH=7%d0DNByq2Q&xY##oEMk?J-AJ=M&!g|vy<Gn%|AaU8+=2m0
z8%q!vj1`8*#_@cQw(~#nKXFy;vQCs<s`9F%Xq2-dSk@v&lxRy37$+!+@;vM4Q)bpH
zFYlsd@fy~xYR4O27+PgTD0vzam8tuO2T8PUe4(Xt8zMos5CT<MUF1Yysi^#=l-5@H
zN>srpWt39Ro7XI{h}C$W&r2`v;i?baMQLouf=OqJo({v$3e)KfLEy3cf{(u#LwAX)
zONmv*KZzA(tl%4~ibgp`P-yGuz&ODvXjT}8FTSt`OOki2X@l&*g21ZiX#zi-QZv>v
zFg!p!wQ8)nZG9XuT~gL2DQi?TgDA=ea)Js3thP=euj8{t<9hNYbD@w~`F?0Mys+~%
z-g*5UNM_H%0IH<%d{Y5xCY>Rd&#-FSpC5LxJ*b-Miwf7yT2Y=w6$E@iX)R7B7sN->
zL1I=LPDxiP0>69LehLMTt=l$XXP*D<in+FUzQqs9K!tyU!$UN;ZpgNFU8X>~sIp2E
zf>Q)Mfl?sOL_x=g(?Mdiq+QR-DP-66VEz0TyV-ix%}8cf%}U-gBi>~<ZEQHV7%nyz
zjIkA<3Pq1%F~hp^Kbv=uE~)4TMNkDn6|JbW7I&y*VuM+o7|I5Tw3X9mS7QLL{N@nT
z(>ZS0tgu1uEz)VJB(NgKrW@h0DvPYC?rUQi93CW*Tq><gwzUe9Qcx09UQnJzO=xk4
zeCrP6ZDJrBG>!Y#(ZZ>-=@_tHc;=UE-L{UFX3J?!8>D8EsglfA^RM!3bs3}zSf+Ms
z$rn7bnJLy?_!&jGW<DdRtVInOar*;t`%5-)G^?9NN;X!sZ&B_Ot9Vi??0Du?K!s}@
zRHz5#S)A}#XoaioDm2Fp+N;+}`Aw}J&t)9d$3V*4utE?rFPqJgOm(q%)qAa=rUa+o
z;Ph*8`+bQW$=l>W!6Y(9cuO;%*p@4A+c7ot+9hM@c++^M3Y1a`<<#t#!6>&os;;eW
z|9I_D8+Cn$ZDo+7b5JB&x}<B}ALcF2px_J|+{1yyjuxfqXx=tW>bD@|8iIA%2k&_V
z_$iQ}W+qT66?0rSS-t_KoF>%V#c$H60x5GD6ZI8GIdN*|=47s!tbeAa?mR1~Qh+n9
zB{u4j81p1C>x=7I<ctkQ4Oe?)3)&H(D_qzm%2+x@!U@@G-AAIet<@*2%I#7k-iWBC
zxZ7z3WyNBmI#aE<oANbf;je7x)~2krl?BMP_tLOl^%m5#8s<n!(N6fxo)V#xQ+T)_
z9&?&eD9(b{F<|9OW)Y|)pg2XK6e!nK&737KXKo&5T%ZNylo?fKl{!mU)reUgfO|TC
zQVJD2i&!-Wtdeh<fu=C@)G0pzb+)mp0+t_GN1-}S2cynbR#lm$SS+vvb$TADi@B;v
zadxo^z|qDgf#s(QD1f-DQk;b^2Uw?0<3pNpM<w2DjeDWL{%-(P>=kq6hf-hw0000<
KMNUMnLSTXz34L||

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newfolder_wiz.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newfolder_wiz.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4861b1c7ecfd81d1b76ef45edcdc41005dfd4d5
GIT binary patch
literal 5842
zcmV;@7A@(CP)<h;3K|Lk000e1NJLTq002t>002S=1^@s6A3-Z300009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde00d`2O+f$vv5tKEQIh}w03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`
z>R<o>I+y?e7jKeZ#YO-C3-3upK~#9!?3-I`T-SAmzjfvehr>H5S&=2nmRwUp>L`sX
zr*#7tkX<`LgEWZIJS1t*B0!6@4-HUQ@k<|qKJ=vs;D;hb+?$&;DH^1W<01}X*M{Yr
zYQ?f*%Zda^mMn@CFOo>{HkWhG-fQ*Y42MH%NbxF<scc}l&+Ky>e&^q7uf6s<!mmo*
z@^}AvF=IxvnRS}c4&=jMVVMIc3*^n{P_<Sw^0oVKdRUMD*I>qsRyCScEpKYAYBbe5
z_NImP_fHMwRcSG^CW8!S?U>~jJLjf?_3i%|4%En*S-Tk-5ip|#vo=7kcm7QS>mPqI
z(ynGL0)ZKjs;NVuNtSqx4G-&Iemas@BUKV$sf6+d?E+%UxYmY+^>5E!YBHn4%(7xB
zBvMfA2rad3H!ZC1{qN<Bnsu1bJP(G5&;>M^t?b$x3fA|Zzuam@n?Nv!hY$urrzxSW
z;`$o`)(>91lC7wz31FUb!a(RTTb_N|kg$Gu@Jg#1ZGr?g&k6~IBGO}Ks|NLfhV`RY
zMgvv44Qr}rtR?MwJ!**A+T8O43G2tNjy9{&DN^;B=3DYmgdS65`D5M&g7x%kV;u&q
zVpbP}Kq$f5*r*RItY=;y3)JW~TX^Uf2!lX+bd7A(2NKp#4`0oi(IZ%}5Cjo2K_ES5
z2(~`IV@0r@II!tsz~jLFrhEsRx9wg01T%DA)6`Un!szMqXyLEE`pwZFFLdh9ettD?
z(6y+M79=Bdtw-0Jr`#2RdhvHY`?p<tfA^~k(MkWROSet&XgV*edGuF@j`PwFzs~5;
z$w%q|d+x}1hncmifhw38YM=(DGuuWckWFTUI@4CI)BV@BTe`32yRXz%xqiJ8tN`%i
z`#$;DEGYAs#+WZ+ZW417XflQ-W0;@B{1m1I0xglz5`mQwix7+G+1ks)U;Y-ke8-bd
z9N5%Vdz0ti9Pa{JuiG^O>5v;_PJ(5sYJYq8?fdsV{1|2lnvCL;%cvVe{UoYIR7;p8
zOa8QWZQ-5={-O(b65z#OOaw0+9p4OdL%Q`!CXkjOxc+hPm(BXdzE3`e`2y<3*6c^z
z{fRHock=nqJ@NIo9synv$X?I(1OZKf(5|+we8h~<%tAmGh4t-6H+@Wm&sDy5ws+sY
z|E}NIkDES@cQKkIl{!XUjGt2{sEct)L{hCIk|e^p+U=MmiHOQmVEW|Q|Ni(t*E4~0
zC&ob#WZUu}0ubbPoa(smpI%%Q7DLp?s#<79){JnzO<xq2cl!9Admq`qXWwV=(Iq-I
z_u`7@Ks}fPQGx&n14Ke301X2&*$`Eac}M6Ivfkl+f}dBrnr%~M$6fn6P3_U;{+~w=
z{s$d!&+^!$aGbZSs%5<rs-*^gp^<k{SaGDZbnal=uiZydc(*db`SjstLNb{U$h~j=
zmsS3=*Ps2~5|1b2m8|#H<ULI@qu)~Jj*G)8dwimxF8wrEQSVW&#AUx2An{7hd&_yX
ztS$r2vX$k%f_cz{2Bd{^jyTe5O^DKz0@9r7+Dxaf1Iv>QvlR>5c*?>&E{=#JU$sNd
zTi&TPs}ijBNO@gl6{brSWw{1q<#0(v94U#ncJD2x2Jg$<FfMz%t90@uDC_d@`5Ow$
zInQ*lOs=IFfBqkS%PNz@fOL&3FtCc>VU=yyynDFZ_Q1%R!*b40ReUm5nddEBPP}!H
zzVq+W*0mi$t~2ediAC9Li&<)stvZAoYKE!K&ha$0qcgP`^xpS-=-AP3&Y$!OfR>PC
zu-cx@biQ4_>wyF7=fRsUs;nd`bNcupKJ(|#(AK$q>Gpa0Le=B6>f<-Gd<paA%6(IK
zsLs~$a0RF?+T+9$L?;0#mZo|3g{N^Xzy93%PIs<jvrhl=5Zzn%($={hEsfwOPp2bN
zX#{+fULu)5<B1y{HkpBW^3*Xb$c+?k`<v%jq2*r!EK6Z6psXY+bL#m2@!*&K6)lZW
zI{WY7%MCRU#7WH1$N;|e-tVsSL^_Q}Eu^f0^CxKQ+R4_PzfJMf6PPPD*pO+QeeX1h
z)9L7zFCSX}sDnleD(l$Mm)Q5IZx9b1#1{t}&b^4@gmdT5;G27&^3A=|t8pvBr92sn
z#_B5T+?jWfOe=TZ{Sbwd-%1tONDjUl=gyxY@j4yd@wFe_n0VF#HtX2Ym-)#414M%_
zG+g&HGom==y$k2ieD715@116qF8va1*0mGqvuBPI#mb$%_Yz<DL8F-|yjO-shHze|
z<87-~)iP|>wXVa7ci!M5_x~9>cDSLspBXr>m>TcCcLr<v&>_vQ&Q`6;br>2P;L4>-
zJhc1cxRGZXN>$D)>WzWnLCR4Xcl)1wcdf3yBxPALK1W$^{`?TT@BIQ{;RMcnLm70J
zq*J4_edn;;_UC-}gCpn-gJoEa=RJ7wA_M&cJov>wBpH6Xp$vMQc)S`HhewFx2;KRW
z?+0Q*)y=Og!HO6nm73WaFmDTY*d@6RwSm9GuODXD-cJ)2-)SgSMX|?w#jDXb&_|Hp
z`EqXaCn6*6HU%YJm^Ee=Y%7bZm3C*M&g05Hh)YQj*ULLuqU(@$!ONFN>F>M9=Rf@z
z$@q~5n$CEV#G?vVCniZ;Ovj!-Js5`ZRx`tbbdG2>p_-X(Rh(B`q7p|UkpYpD#Mj9!
zSz0%&*sC{>9Ao?L``MHqCy5(l1aw|0N3I&exiHvI*nI1S)~*j{%=|6PfSDPqW?`wS
zBwk1ok+Oo}r5w2+_A0sxr_?bqG0i*2&hYzR`U8^jlMMmNt5GT?cs0BlW8;%dPEWAq
z!(TZTioc~Ab&$#;g;WATCeABmgt8*4hASqS$<b1HHSywCY_lw$0L}60E5D$<X9suP
z(M~cx*btx!#R{m3t?C~fpt*JDSjUI%SJ15{HNi!}Tbln-cE&UaY7&)P=E{{~I6M`H
zMX!sm`&=JZGS0-+9B;k#E}#A5M~Sb#zp64b5~q~P4yT5C#Vd@BPf{#Svg4kw4F_Vk
zRD)S!YKS+ZtRe+f@oG{m`^@k}IUF1<H;u*)zm(;%C5?s$Uphv6=VtcwZXvqTf8)R~
zlUihWZ#XraOI4(rwpF{})l0N=?T$J&|7J62`oe%nY*50is05K$87uqD#i=ChA1gJD
z6yl(yRvRK*C9HBO=ERA99{kk(lrO)ru8OI8DrWO?tE`$+<*RY{3Mg+Bie<*fN7?bw
zKSG2pK!Q;)h|FX<F&RvJ=3>!hE{sLFfvGq%>HP9vNLdipk=Ndq@BH;Wa_01Tyf=2;
z(SfbCUsd_JvqO2Mt^>+flFw#sR5}uRZ(JO{NK<|@J-0oS0}B)>C^G6T=ub50FZoR0
zWZcw05oO0>4V>B<gq4rH_O_5FkZl8YZ`ro%*5ST0Y`wLcHx8ddMAEz!sjQwzx>2cM
z8T&!f3_y`<yWWh;QpYz+6~~-RzUiq^?%a0(pr{rMd89wlpfA#}ui(PIi6}Qx@|j3&
zjY2d>UVA$S+zIpodw|}%ANb3uU%vXC*d)xJ=|^T@&4DI@1hZ|m`{%aT+g}57{{Dro
zDb*)|gz1my-nujCzU|>rXTb$;L0_zy^Cb;0OvKFtMVBdfU7KasT4m)b-y>iIh<EON
z=+dr_KKwFRCKX1ILuPZjY9Ca+b->!45(If_-|wrj7&hm;N_4i~ar5stvxJ5uC6#Gs
z!KIRBhl(zHrQottUZqaz@5;-9D@hXt*NoAvR!wH@P__I_(yLXBu(#Qy)tPQ#HOZ}J
zMwkg&0+ALqtt7f$oBTR!r)ukY$+W81biw+^&YokY_4jL?<5!ZOHC1$h8J#vWS2ucC
zVUnwWgn{JOIi2x_l)4GHB6O0b3akngKsF5WmG%6M2dhx_tsu>Suu4z@lF3M(4N~U7
zDn&j6w1KT!Q8TKN4Wg=g%IX3#YXM3G2{(|c=D;e)J`d#5t|zO0V_~DIstPMkG!Ud~
zEflp;RW++Dq1#{+vNrF)gc->R8%tFHf%Do7+`3kv0J0frVFQ)`*tM2#Rb>Nd5|Lmd
c!utOK0G$<b%?<xTaR2}S07*qoM6N<$f_J2By8r+H

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a585f2941a23c08a50879c03012cbd2977951d2a
GIT binary patch
literal 3122
zcmV-249)XLNk%w1VM_o)0QUd@<)J$D>B_33so?1N@$~%r{LaS0#p~$U_W1qz`kLXD
zGWq4S`un=%>iO8)<#3U)*|Ko7shRAySj^1S`}xtDhH*)ApZfc*`~3dFyus=2`u5tT
z-i|EnxncO?ul)S9lZ%r2{H5dI*qV}>{Pfb2g@*Y0{n4OOq@1J2zPbAR{^+Vg;_CVE
z#(34y((c1^{{H{`^~$@py7~M4^2>wG$;&lfgR-r%{r&llg^cv<)x>fw^!D__sfD$6
zMa^p!>8ne`i%Q4C!}s8;ySc;Kg(mCp`ttJO)OZ>D>$3dv#^$YCy=p7*@#*87H|p>D
z>aj`L*3{<h`lFqY`TF_$?7H~+dzpM{^!NPp(~<S`+R)6-`TE4IthL(M#Psvk`sbX=
z#>o5Vto!Gq`T6$!{PE@E;O_GK`}ErT`tpHyfBpUS<>SWr?vviz)|If%{rc(s`r*pU
zy7&2Z?!0@!!Oga>v+e8S{P@|-#-#cB<@x#V^7NAI>9qX$=KK8i`|O+a^P;%2xA^*x
z`|!W@*`56S==0Ey^V_`9&(ZYsv;6t(qJd`l`r7>Y$Nl^9_0^gD{lUJuz5D$6`1*I-
z;OzMNg!%1@@4#&R{r~gz`1baO`|PLh^7Q-s<%xiY{Pv^d*tGZfg6YwmpO~Qa@Vb$K
zfAsOk{QcYe{P6nx=<V_Q_xX9_<9z!1-242%_UX6$`oQR<MEw2y#K6P%`TgSO^Noay
z!?dRM_w@Sw+~4Q;<?Q+3=lJ^j{^9BP=Ir_P`2G9*+wb%H)PN|*$I<7eKKbXj{{8Rz
z`{?`o#rfu#*nl6)fj9B;%ipR`_vf<j;kWne!T08)_V1$j=d9Az;@j8P=AJp{>h!35
zUjP65uc@#0@T|tdg8254`uBnR_KEQE?!CFS+=?mZr$T^zT;0Qo`1R$-!^hd+@$$`>
z`S^P8?&zwPTa1H=jf0He-rnHk?f2!L{PnTX&$8CjsM^@P#>m#2k&W%~`ptkQ?(+HQ
z?)u*5`2YX^A^8LV00000EC2ui080Qu06+-;0RIUbNU)&6g9sBUTu2axFD$G2F`P(o
zB8*xH5CjW`<;<!|M2bBbsX;@(lPD{yR0zX_iCQpYA{aIyhkyef7AzQ2=n#z;9e@CE
z!c1F^5h+(vbU4F=uUamnn%I&f#gZ2bJQT`8qXmR#vW6<)zyZk*A2~o+^T)QW(t{XO
z_|ilQ#g=Pcq9ocPM2LYD&szMH0A<ArV`9mYE3yM#jxM%-^%~G?*RHmhm1e@g8N(zr
z(v-v~P!Ghd5rSMqSslg2mN4mJr!zoHkdG^mf$`!6j70+$EFw>?d>J#_g)lN@n&bzM
zqYD>4yec5fP^w9(JT+>>g@K|F2?lNdYLynn4Q>Ls36g;#$0rn0bo2HNTsURR#*Yi!
z_HSF6IC0>C2MH9!Kmi`E_>qhrs8FB`10P%v!XSfKVg)4_Qewq7fqbEZI7X~ugc1Eb
z(T_>}ND<#|z5N!PWcL+k+&?fRr(7l~Y{r>fzWCBqR4`@45f)ewU?c&<AUVt#9*HO-
zi6)|`qI@mZ2P1L$`SaG6Tf%?=0z?u(5{f8E#O0X+wG>k@8FeHNDI**pjR%KFAi+8L
zq-9N+W}=ClFH*S_6BaeuvCakyc=5mkHrU{f1mz?~j#;=(kd&Wk_UPjbO+8ghE>z(n
z3lKwi0LdXOU{V-jPK?Dt5kD~h@lFnPV3{A6I_{W*Ac>f9#~x|qa)$`lM6pE;e$fJ0
zVjL{iOa+h8_u_E)-D**e7|gN=2}(Eu;dHvFLIxFk=+THX5#+#42D4@0uDi6*Vn7D%
z)j_4S_SrfkLYb@)2L<$m5M3k%pkf_%o(NMwcM^tYAtiG}9C5mzz@x?|AXu8>iu1Xc
zZ?*f<XyYui{E@~UexN}@0EEDj#4$-gBStkeS2ImD(Bv#l06H8YPAB~6<K&1Xo_Nxf
zEaH15$eCg4G(#-~LqJ4)K5g|s7;MB50V9s|L`i)1dG$(}n80R6V6L)C7a&Ly0SGy$
zYYUl|j=c~DF|CQkFqMG+Foh1s<jfPQ9jtId36GU&H$oUlm3J)!)Fc2RLqHSCIHPa{
zlu)g5zzh<&)p63|Y5o}KOTiRM$05)x5Xu`CSYXZxth#EJQKZPI<<(4adO8A$<bcZ(
z9YCX17A?F$SnXsnb5`8==<XJ#UiPSo03bvlh#+>L0Cx}A$TGwbTw&6|s?1Kx1mZ*t
z5M!2TcBX;@AfzKgJ82-3#vN|xRl{rsfIwjmlfEJ}194pd&M$u9K7BQ9C0^<bXBH8G
zcYMMQiC}{n4j=*%^lvY-iB}3}ae`(Qff&%b!EPGhq6IdPY15+!j%L9bGLS$Tj&Q^)
zrsIlakRb{n0D&O?YOn>@{11Qz2%!veKnjlWf`tlX;QOq#kWA2U7AcECETS`=>il66
zd(h6pyc38#p+E+bkiqr@A&Css25u9O&l6iHMF+<4Ajz2o9Pq$^5QN|Z1gp+<vZJu>
ze8*v|kk}M%0jIi*00e5tK{1fFLOQ-sdip6yCLR%o0yrWT40wey3TB8u;DC??cu>PC
zbRi5yj1_z+MF0*!1R_izN=I`d6j|WHDTZtfYe0q}&@rGG5P}d@s6rB!nFLO70uayy
z#3kBriE37}4b<pHDNdn-CUim{A?g|~Hzvnj_R@~}v5^%qkSiYf$Z;6a2$+ggBqS+`
zNootH5k_MFG;;1{j#0cM{76T-S(pGKiX-UL@J6InfURl@J(DlMgn+5>^Pvfis7f+X
z3$00QMEe|5*fdHJyrGRF9w`Rgj$$c{){UeF!CR2pbcSpQU<4vq2M{pP1GtUA0V9QJ
zK@7U4c%GqeagxR{j<JC(VB$`B8i6e`3R4)&;Bi432K`VVr={{F3x@zoq=FDPjfpLy
zWfRonBBw5#1n#Rp3Cd82vX4(la&#JP96Vt{s2oH95%V~P9Aak!Z)|R^3YgRmOaX$a
zp4DzWI$e-d2Z>`u;|;L0!R#XCgwC0T5s3rFZ%F45KmjUHwWvu7R(FgAY+w{`ct8bC
zz**1#{s4FC2$|J-XWBpo&ng`_#_{3`1y*&A7|&D7K%Z9H8ThETCLlxbL`4VT_9Ruy
zL+q=bmxJhGa(C2oXFLQUfb!D93{>gCsKy70pQws}ogIt%5Qh(6KJZM{n+pn15C(hH
zAPhoC2Q36}0&GBH2tIi#`r_LxW~}cqE<`7IxwIo+NP-kwIKUAaF)aUu!2m*l0AU7b
zT=^Ohfxh`g1MGW8&B*Tt0=UNk^st6gYJm-Ga6uwIOp8270KT1D3^DT51t>Nk!Z6Gv
z1SJ@k9H77e*O12%(9sSK_Rj_Xi&wmQ5abi4umJ!)@`@#_6d2G@f_|t%G}`kCQsg23
z3U2V=m5&vhB*yCmUe19EpBQE&e|IIbP!4B4Lx>nSLK&m{!Z=PNgCe%ZHL#J50shjS
zE^rLYMpiM4m5iKB*eDI$qChMn0j^|xaSvZ0g%Hz0L>|X$(jgo{4y+*`O#kM{3?%bJ
ztY}3zkRS%i;39QO2}W~`@ofTdV+JIV#x}+)19>7st@}LYBu^M2Ho`%391$Vu4Eu}O
zX~e>~(6CM90|WwC&kb&{9(SR@u9cW}rgLrWPUB#YvG5}xzl|_gjB%BsNMtKcLyGcp
z;|AV~qysKZ?M+|1AuzzfB2dxCKN8Gff4~4L83vvTK}=%gVdMx#V6pBVP2RWv_VaQJ
z0s~G`ppOG1<r)xHNCvFZ5*d=%95&I1bj6Jn4j>c5GhOXJ8w43~Xb=UKP61RHYz?zW
zg&`ECj7Z$Pm97*;Ah_9tCxuk#C{HoHjozPN!l5|@ih<fi!}eIv<L#h``!~V?4tCg`
z9isRKC=~GpbaW!0ASDS(hMw}GuY49bc!VJW#4ThVLky4~gBZp@`7wY249m!T=I1dD
zYQTb<U+|_rJQDb?4L<C+cKATl8EE-wY6eso7a7Qqi#_Bb7d*(lCNxpcBn@LpO#<oH
zPrt&3>$*laYJG)!<Xj-db4X#Tr;&b-PtuDM?8TqA>TAUMcE0|!GSLVRk)l8Sdj`Ms
M*yl6R9Uc$>J2zoW_5c6?

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/package_wiz.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/package_wiz.png
new file mode 100644
index 0000000000000000000000000000000000000000..07efd3e0d82e1f57f4b533fc4aaec946c09a24f4
GIT binary patch
literal 8344
zcmV;JAZOo+P)<h;3K|Lk000e1NJLTq002t>002S=1^@s6A3-Z300009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde00d`2O+f$vv5tKEQIh}w03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`
z>R<o>I+y?e7jKeZ#YO-C6}3r3K~#9!?3-(>T-SBqe|w)Z&->)PBrh*XQKTq|dRxy%
zl5K=V+{Q>$D@L0F0gOf|+7J0u^GksMMa7^Wj5;5PJ^~a4TFF3)HjM+@F`Gn+p+{@0
zaq3vKT)kz9A}PMf`<gkgz1Ld(aAxM-OHmI>w4_owz{Z(#&dkA_|NPh5|Mg#c9DlQ2
zbo=^$dn+-cZDvzuOaPtqZ(vymPy^_gF{x@}W^~qG|I~wZ;G4%2Gse_tt6Im@#?)wD
z?7g2_u>Re*PIOf1npx8z!E6Gv*1LV?Qw7$4_>+@fjh2~Bn2|UKW^^$d2i$vo{!;_i
ze>`|<Le07kyctllY0^Q{z0Z4G@nHR@KRwk^qh=CdHHA6`6AqkR!o99oupWKvbkmGU
zGix}jL81m~0!Mf4xlb)vfAAM)5;dDNqkRDw&N-%mrr8I(_Z0=!fBD{-F*C*;_;q+V
zQty~DCAAN6|0@ElKYa3RW5A{+zy-`ny<^7g((=>)H(>qFgL}V~B+1TQJ9pe(mer$2
zkG-|;Yu|Zl@oQiCdwVx-oOvWh;mFZr)4<=pbKf^#Rb$-Yyj_rm9Hh><88iFPKmqtq
zC|Q0YB8T5Ra%@Ad*Pm{+T2KDYgL}UkV))j=;?lk&M~{6OVB6=uvW#QWUF12OBTYOr
z&fzZCm-<A4^|kLjwI3ja@Z`ec;=d`&@(^$!&x<cFEG*s*?y1()=7;Bh;mi5OKJT1M
zy>~O<+~xdU?&AXF&^I353G7rg%oJ4{3`MPe{nO{)_|1M+Je1`X-h0x-kv7sJ^H*Pc
zU~1FcQBy<Leb!KyBsMmWUi-i+s*LWX#`?XkKbFDX4AeeBU>*9#!_&YUX{$Y*wA+{&
zHh8Fdub65LoGQ;g`wAf#+qO)yY0Ku(`FaQ@iin^p6j@H52W;++f2ueB#*Z#1SRYq{
zzddcWr+40aA1(pafOD>9SXE#mXcQ!r#H!-OmyaMTB~zO=vh&tGs0g9V2ziEtKqzyH
z-U<?wiB8I~qbr2PBX<Kox}0D7V*yLmNZM_D!&CLo;u{Hgj~O_xm<m_~4Cg&=ka}X7
zQ7oTFVnkv<LPSDE3|0M}!7vG!*<}x#j|VK%S_^rPZ#M9a6qh7`VNvP_R>P}eUI$^S
ztBJ!oobz@1b`CcjfWuK01=co_D*~)RZUV)p$p|paP!}*&Tui{n8aOjVWF0W90cwES
zfLY+ZC)g(tto{2A?gjP&zj%?$hk>5}-`;=Vfy2X-HUP_P0D$-SG{scG4?(F};;2~`
zV|>pk-2tjv=RdW}{v)R!5TI$`tH5ujsoyy<-Jv_)q}y%cllqH>pk)1uykD`rm><}`
z@8DCw@9sbFz*F@sHk@{>PUxY|GbRcnFb$)Y2Qdg2_X$>Yy8%*F;ObDn9MZ~+)XY-A
zr5^yOUjrU#wHwnrcF(e7*9_wmZ93g1Y3fH3peiFPO9ki7_Q?7rOAGnlGbdN}?%#Lt
zsT0dDe&d=MMPtCMW{imfhDJeStdGsW3=yrFWsE=^UNajOgElG(9ksr?q|I<@G*m4$
zqhUsRp|nab5vWJf)IYRi_bk`nGSA%HB;(^veBx16s!Ax!h*pub;n}o#oUPk8u(+7<
z=Idvfoa%7q)XLr$PF=TmeD*9m%N!6)4VMhS5Jh7|LqugDI7LQbXd{s9ZLe#N)%*7%
zmQjNf#Tu&C5GB<C`1WCS*8Y75A8EB458ZOtHm<v2j!m1#Nt^WyR+f=Guc(Sh6@;pc
zRAr>d0%a*AiD%nYGc26%qh@r+n*8Mp4Z0f&Zn`euM8JE7icm%Bu||Bx7*|0tU6c28
z1Q=#WRn+J8?P!^ih|&<TrU=cU2z|dKOy4h1W8<xd?zs1AuDxM18)iB*njW7xR2A<N
z(zHovCsd_S6bWS`AxS(*Ba&wo$B&%{921jmRFwIvrg`EAi;Q;y+vme-8Mn6l5gD*c
zkthQY2E%HVZ@Q}Zhp&gF&j27NN=w9AqSnw$0Oyjy+Q0AMLrLl%y8hNJTzA79)3Y6#
zO-I`Bq^SoIM3l5j@IH>F^>roe;34xYkY@oArPWH<vTce#drG-`_p^AaQEey#R>=UY
zrG*tlgu`!~V0k64*`&I<R~dm<_Lk{qN}qE#bj2n_wWWIL7V;&7HJJ4dY~Q(o8*ZLw
za=J~DK#W48<=5IFc<)G4kBBD~kEEVP!?Un_mcyqHv9NTK6X%~tL{U)^*I}%26|S|N
zLoaWnQ~rP$12NY5DTY|@W1YJIjvPM8u_LGO4ifM2-qpi7ykn&F0m`^|ml~~)QaXHf
zVyZp8=jM54H;&;w<XJ_tm7rocbX8>P>J;vr<EO7Z&Y_nd<J7_{%x~Ml#x3)F{+@er
zcno7{={!rz=XmSbpK|Qj8Mcm1aP#CYrrQ(seauGtXMg+(ON%}3zIzX?PIC})!(v-j
zj|c2pTFfZMuKw0Xt+W2w+_ov^w@>4}BkPx#8ENW>K~Zrd0Vryy7{^b)%6FgqxAg5a
zx7>L*U%v6z={6^5rcJy9pBPaBL34_jk(U+AD?Oe&^h2I_?htoO?BR2}?xdA8>as|c
zmtH!;(qf-hr^!{jwxGk>Fh(Q<GzL^cJ&Q`<?5Q3_8ZIxb-VLn%`wsqEvz1P7+p&Re
zw@DR*mF0qVw?T{wrI4m|eP)1)^26u;2j70;_qhH3d-;_+zr^N=tu&K1o&-1Y8I3e8
zNzCIDA!!ygy2?GDzl&>cxsktq<_G-2kG{*V-0(RzbvKM=wfaY?Wrau_B>z|sl|kOB
z_Ywn_N0YvPX8q#WM2o4ZdLha3LPm%}8WXBYF{_hroym>w|M-u1`ngB>yTAS*x9_^2
zvE~#BEfQKdmx6jQH_(rQ>Nu&5Av%t_vvkK!V9kQN_uj{AFTTWo{ojAiKfL)1Z0t<d
zQ`!J5kvL#hy|*DyqoE&6lzvFCZf|!QjCET`RF;<u8VyG%1@CHcm?U)=9(w69o_g*-
zv-eBC%pF&MmbM=!p+o9Acx_=?Gs{uWluE>$udNydFAidxBsorZ!|Uw0ah|9Z|NSrj
zg5S953w7=qGAo1;U_)lvfN3UzN*Jhl{b<4JbQ&b7r^o|&R$<)+KB;{s5hF<*r_aC6
zcmC(^ao>ZV<(3_{lKKYTHAraVq)Q_i!;{p>7ey^%7~Ul$E+O$L-Wnvnfvcv`d?$_8
z8*I6DD@B=c@cC!hVl#t+T5Cp)Kw8f#RUwu|?OyyG!tmW17Sm>i0!1Du%UCP)GE$a8
zSwzZ0c<h<qXUCm8xNZ0KB;F5Pg@hOqntqI??~wW?sc+)e<t_)#j~M6hwMRt*%Qxb1
zY}qqUIiVbpGdSl4;&hnMBdSAIMNHR(q}k6U4E=lgPB92owOYc|AO*@IaOkB!=e+)m
zJ-6+k-Aqx7hzfZT@Gf1adxk=Ftw&(!=-38JHr&W_afn5({)MaP&1M5%s}8f(&>I3J
zgD@Pt9!QCgG7Jx^+RiMiXf{*IJmQ_JZ4fom)bsos-(za`BwJ^?1j|WWMb_^#o{S?F
zh+5(C;1Uc$Oi&X<WBpnc9h_6EXS3Qxt!<g2DoMKu<5zX*pX%4;%!NsPI2#U_Ru%cE
zL-dh?Rh4n)@<PV89Wzu_#JPHwk*Jh%j#JAoaNkWg;L?g<8CBlHLYtN=2~tqGS}P?k
zsR2L`iwFU+;fRREnw2JNj)kHuagE62)nlA~={%U!{`w$4)nEys$Wg76e!kM9s#2``
z(Sr4K*01(1obR*qnvEohrzj$#hBTG8mVQcmW0P*jD0LZeDJ#ouCK_Xu+NUA4By9LV
z;!+sQpgI5}T1n8gqas*I)QX@LVu2zQNC-4%Q>ux;;zFN=b0t+#)Q%`aKTGTWp%@{i
zELCmVovD)_C0O6iv+!`%D_J<-XKK33>66QKk1Z-oE2n78deUY^Zau2Z6RI&9u1CYS
z@Fa){&7>l6Dc;pHqN0N^tO#0ANkJt!l@<gk2wD)eBxp|5Krinzv#~{ED&;&AkGI11
zQ`%x(Gq!dbh7DDvnKXM_zxdA|zual-ofZ6n2M+DuckuAaa=G*H&(3n~^>ds&z6k12
zQO>TsNU{qo%_+2Ev9Ba?oMzG?aSeb$-s;x!z@;$AM?xfOAZkgaIhACT(x(`VQu>rq
zP{oS8EC>R=0r8saAK!D+Z~tUn!*n1M-qu9D{89Lxwc+nBFXoSQx(&{s?=vykVQDd|
zHIIR%LQFC$bu8sZQx-^l6L6?SVp`Gk1&L2b02+pB98Ca~*32rUPZ4_*u}?02D$U7?
zoU$tE7i(H!ALI7!7R`YN9^Jq1;KTi1x%2RAXV^SHS(}+!`{km6bGg!JIf|GP;sS|F
zYxY>6(t?)nkS0w$3En03tcM~dgK(=uv5+1`?2*M~^0-3Kf?l3cgo+>z!)Q0#ola9H
zZP;oblr^THgRarg+|z-GuYa83Ia_ya=yMI3IkfW!Lq+Sxcv(9}@_wAs-#UM$|74mb
zoOo-IMk7JgX!;p?*(<Dsie_pQWtW6LR#~0EwWLaOnn{~RY~fu>;!>2_N>PhMs|Zqu
zVksGU>`}-HmE^2s8AVl6RwX3$Y}#(NCR<6I85pXAhZ<PJ>mGC!G+4Ec*Lv*hK0Ek)
zecfpkq9_uTPzEXk-WOQ=4?OVH{(T33>)h$yBeR>wYe8BD8h(bD2`hO?s~wR>A1&)&
zQZy2@pe=n`Nte_&N!)5EDl!nTag^9g$ta{xv<lI{!tydjSyF})mo$)-2J;*DNCTN2
zwIv3QhYgk?kIoGj*A4+$+W=xcNCV(i4UI}rB?1+=Dk{+osz`kQ9()~+pE-A?_tn|C
zaa!I{p58=EJSz(dQvpqKoDOC@FT|=M_barL4h`QPG0Qn$*N3J=iv%fZhG|)|O(RvT
zICE~9GL)oEqv}VRZf0qI_BxM+nbE_u29z}&L|fBgw864ubF8~&Zb&p2MO_61aIpr@
zNfoL31^G%ru3F#j{dac`Jg{&7zJotGeSG=A%-qEEp6l=DuipG7<-!WhZGvz0(WMmi
zN@9`3rHBS9$?+~34Ogq9kw{&u;A>GDIDK}7EH9|4!1zo;I0aj$cb!IL!`klWU`>0y
zpk!^2YaNKA#>Ei5L3`H)fwE3>4mBrgt}3F-vWmQy)9;s5wr1_+rS%ODJn-nh|JP5y
zx^TMp_5MnE|3rEV3vZnvn}g0=M$i^&LgE`FF2N7<l^+$!ZcX2E(BCs1fhHzodCBqP
zi<BWC8X22zqc1hN{muuEAYt}mRm^ZryIbv#tm%%{7oBrrxL~*dzNpih3u-=(>atRN
zzX;_0f@~?HUk2ibYTut)sG4THuEsz3&ZB>Ie|F~Hf3k4ohhNm4Mme<z6FsWs4vED<
z*bUgU)?IL`4>T;Khs=sG^2QsB6jenPA~SO-$(aden!6XbY`7kaGPMSR)y~mHI;gA7
z6el=WC{DmdbG}eqU-12?F0a&QWpw=_xU5%Nw$vvJ5&gh@!`I$8)^N_Z%DlH#qI4z3
z?k|05*Mi0!zyF7iJu!Crg;zhHj%`3TAE8_}yf#Lv-Q!2$hjT+;p$-qT(d<}Okz;SJ
z(Cbx%Ahg;oc3-ud-jfCQ-TjqU-_0R$7p#I<bF2<msY?o+&lHy_zAxtcQC$(l^~>n{
zc}2cbkS*urBJbQayC_(%9e%52W|JnmK}9!)yqa;&?<jl4MirTsDATGsW1<_raK~?t
zeftOhDoamxx{dA}{h6Q9JDVe#k65)n47nf-jowPdiK97XDX1hg(`oLx<1Ut;InGVn
z|IXnpvwM1%D#)F4!JN<4`^@l}IiIQdzTom`KC8s_%jmMKa`{Sb{a!&eOyrj;N>j|5
zgX_+xNz)9R5uLfhCq4&y2CYtK(!Th&_Py}OPd|M7TzXSFw_`Ws<0r_%De`!Zs2RZm
z7qc$2zOsB?$a;WwXeJ%H-5Kt>?H+p1A7Q?A<I($X{YNj3@{)Udo?6$<9X_ge5nO4`
z7dYQHTp=~1vWU+raaj>vmREItDk|h+(fm$Jn|KF?xo&s7?R_#YA`KB~ib%uMX3UsT
zwWdm(HPxBdkN%(C-+lV)e}DeAJKFP~xs6_Vl9lWfd03#59zilfED#a$JWytaM2AWW
z+5l}bH@kyduf2m;zV~O$q+4J8)zAHlXKY=bUO%(hnuNY4mxD7id@ysBIalf+KLxEB
zRYjNg3fEuGEUzN6w$6OFwGZzK)?zPuGux;}GAuDf85fmliPcyPVOm8dRJCKGoyC<C
z6My{pzx>C3Vr<tncmEQd*;y9*Ct2#9rl@)pRYnLUAw*(SL_h^LZP?B=+i#|S^fi9=
z*H5r>%RS%!!oB;RSqIDztTk%=Z92<r&3m1ixu8&qxiYHH%Sc{CpY;m*{hT61(+i98
z4+GY;nRP_XiAWkk*eWq@5s4c`WLib0O?BEtC+q(f%Y=${pL_Z78-M)rpUkvpH?!l$
z&$IdJTL~8F<%>kA5E0B^dVCX_FLUP2|I3>%{x7D|nfTeyeC6oerah;e_kEn}<9u$o
z!p!x}xkAkqq7-TbRe~C_uH0F#&<Bo^tAe<)2ozc6@_ueb6zpwFzCS2fOa0i!*icqw
zyQ-=w6}>9NaFvQ~Fwsd>-Jl|qsy1#a;~I5RBu=0<VWQ(^)_M8Z_x<6M&vN|yOEkMv
zj8D$3^V-j!evOuIvvbRx?AiWVW+!)u^S+07ne$1{B}w1;WCibf;4*VQGm;g>EeozM
z>ia?H=apL?cz~+~_2AgdEC{g-t|}@El^`N!7p{Z<z+kOp(VMZ!46kM`MA;%DofzY|
zsx~FYX;tZ%=(vcCnOWCF$IP^2YGbC>QnL=KT{CMqTx+p+qPf^Vxvrx=x8d5Ac4Go_
zh;y#O`#!jUbA>tI$GOUInc@3pu8jB<QI`evc@@cm_^PUxgh}lrT=?ezFjGW9^a3V*
z0I<@FPrFQ+;jOMJX1q_-xuoxXqpt?qw4*jK-9$ApGp~kImDCJOwPC8M8l>KLoOhkp
z%oexVVtb8+B8IPYjjdt^QC+EnwP+$Ps2QS8qoB1r$~!)wUS!yZSdaCdVD$?bGoxMi
z+L?Jz;p&`#lfmn1=mMxS44iNH88eDH@us6+Ty6DXW#})BT+g-cCqEb0^F#Ly^HLIE
z9L(AK0qQ-rM(R74^Dk_lD6oKOAh{esIfqLV*Wn7<Mqm|{bbwYJdhSF2nczxe)d;LA
zsCT&O%fYBCl~t?Ea%?b|#a*8N@}!AtIj$^L0r)7|2IempPymg@b-4mJ5A1T6@!w$$
i@0!jze<gzT{{{dYjwyo)Z5Yk~0000<MNUMnLSTZu3^5@9

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/plugin_wiz.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/plugin_wiz.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5457eafab666cf0595ff8a97b8b299a38a6c455d
GIT binary patch
literal 1737
zcmV;)1~&OeNk%w1VK4wN0Qdg@yUyjelS<9a&C1Hk+_qi1p>EL7(BI$Rtis#v?d{Us
z>Wr$-=<n0x!)DyINm_rk{q@t4uF+nEy8P>=#hX3X<nZX)y^yHPxy;`7_V()Z`~Ldg
z;o;$Pl)~!j>c+;#YmL4B_QlSoN~65l|NiaE+Tr}}wf^_YR(rFErp@N<?DF#R+S=Nb
zuhC_Py72Ju?e)$5@U_&`)PkYP`sJC^;OhMG!Rq7Gt9l#t_4VcD<^A!#)3IM<h`sye
zmh|70vBuqcn#YEq$o0}``TOzc=;*|kFVfcAsK46({_<3Mqw3CitaJe2>GPep*5bBA
zeVoUIqQ`HM!S3|-{{Qu&xYyyveqDjJ_u-VGwbRR|S=ZOs(zbrRuafTW?wYjK!J10?
z=APKt*uvA`@!5)kpT>x!$+d(Yzo>g}kiP%?=Y^xp+T`Z=;+J}v!%=sy@b~!Z@$ZJE
z%zmE8SADflcCh{Z{rUO%`}_O)`uhC*{P_6zd7I1f<EhuVXts|(gQL;u)sxh?e*XLA
zPj#=f$ld7e^l_5EdXu;Q_}I9cVdn1k)~Gg&q`}<Bo8HW*z@cHk)9AyH8}#}8kEyi7
z)Zq8#tm5tRm$K8Hw$sVl?CtXK-otzI?A`qAu+ZJ#^Y!`8-|>8##K63@xyRkP%+hg=
zy7Kqw`u6AZ&0dD3%fi&>zR%vAxY+OW_C#&1)wzMpv3LFP#LwO8X^F4ey>92rgt&+#
zt$7Ul{r8x#%JB8`!otGv^7iG#bmqu?v4=3Ui81WZe%#~k-{|T2<CtlUz~bxA=-<#g
zXPWrli_x=n<Ia)Qxpj}M(0i7?f0(@d=$!P{dH(#|z{1AJ*WtE-5BAxB<m=(U(&pE%
zRm9ZizmY8P;jR7ezKx{F`r?tWgC)3%EY#WH+~@P->+|2dX8Y%#;q3RBuh6fy!DxuL
zRC%#dd$zH=$yj`{x`YtFix$Jw)6d)A{q)QJ_Rz`L=<xK~(BJR5z{~6M^8WbI`1<C9
znYv4Kvj6}8A^8LW00930EC2ui05AYB000R80RIUbNU)&6g9sBUT*$DY!-o(fN}Ncs
zqQ#3CGiuz(v7^V2AVY=(b)k;QIv0A`5lPU{11OO+R44`FTLud_JBf5N2L>EC`d}cb
zBaVqtCXVo|>^O`Lx+(XF@FP~H4ii*Vl5k>j<IYlz3eu&Jxr<6J6=tj^A)#i6kuzW{
z=*eg(jY$9%YHT7x1g%;UgCI1}qJ_z$JYOjafpQ4}xoq|r#EEl^l2yPPAkb*Gfr7Xd
zc`VwgQ{j}ZNkHU%V#B6dl*@?{(K{Dt8V@Eqa?D-mN`dd+zDa?AgH6{W1Q^DYC^6<W
z6E*ed?Vw?4gB2!_VsR0~T@V*!iT^48Np=N=`Sa{rOqqwF+z24aD`7~>WP>bko@kgz
zWQz$m3IGCl3l0J7fyY30(4s^KJv8Xx167p63J^^=fdqW46yjVWCU`P|4>r{E3lp^j
zVxoy!`~gM+8SI8fBT=LP$c!`^Q^hO@Ab}4iRUiOFAqZ5(#6IVo69zajgy0Jkf!N@r
zlik3A1_v*M_Rk$ztii{YT=LOF72C9s$to>;F#-}ujNpb<C-^`^8_Gnp0|87}(Z`*5
zGP4W|3EUyj9d7g>!JvdnK!+0msM10<5nzIe6Ha{5!5d7pS<DaDoD&0`BKYCyr#w)w
zMW26O;KHe>p87xvk<1{9JrT73(1J70EN}>$KKww2G(N<j4HLoqA?&b!puwk~|K#BX
z3kH1P?6c~C5Xu}b;6v*IDXg)ET}*^P0~t#U@yib)Fu}_Q1Ej020S8nm5FRV&z=90)
z)@wi=p>%MCCJSIYLl8lLU{wgk2-83+ewf2eI0G241q%>Ed_WPp31r6|D<t5-#vJSL
z%nXOT1ArXa1|fwME)3j80}ecK1~*I;z^(@g)SQ49FXVt2f_U7q$Im}!u);X&nDj*o
za?HS>1Xm1<Maz=l01O%eu;78td1Rdj9=kD=#|sCz(~lIb%rHj>60}2yRTB*103%Fv
z@qqwa=&(Z964{Y~2M6S)Q%4F=oGpPr?9_paHSxg1L;xQcz=94hAX^b086?1gDRf*R
z1qctk@<tt_6rhMAT?`<@0UoU26-IjO@xl@B5c0-5?4UphB6AC1fWsWHh&M)iBya>Y
zC)I%nHI5&^0S86Aut#{T=imXe1323->MyLYLI$gQgopG8h(Rw4y=TC+9?)|{dBz(j
fu>J2M+0paQcPPcu{rKmv|Ni{<@BjY_2?zi?0-4(V

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml b/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
index 91859ac65a..aabe538357 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
@@ -15,5 +15,12 @@
             class="org.eclipse.e4.tools.emf.ui.internal.PreferenceInitializer">
       </initializer>
    </extension>
+   <extension
+         id="id1"
+         point="org.eclipse.e4.workbench.model">
+      <fragment
+            uri="fragment.e4xmi">
+      </fragment>
+   </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/FilterEx.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/FilterEx.java
new file mode 100644
index 0000000000..765aca7266
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/FilterEx.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.common;
+
+import java.util.EnumSet;
+import java.util.List;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
+
+/**
+ * An extension to the Filter class, allowing for bundles, packages, and
+ * locations to be specified.
+ *
+ * @author Steven Spungin
+ *
+ */
+public class FilterEx extends Filter {
+
+	private List<String> bundles;
+	private List<String> packages;
+	private List<String> locations;
+	private EnumSet<ResourceSearchScope> searchScope = EnumSet.noneOf(ResourceSearchScope.class);
+	private boolean includeNonBundles;
+
+	public FilterEx(IProject project, String regNamePattern) {
+		super(project, regNamePattern);
+	}
+
+	/**
+	 * Sets the bundles to filter on
+	 *
+	 * @param filterBundles
+	 */
+	public void setBundles(List<String> filterBundles) {
+		bundles = filterBundles;
+	}
+
+	public void setPackages(List<String> filterPackages) {
+		packages = filterPackages;
+	}
+
+	public List<String> getBundles() {
+		return bundles;
+	}
+
+	/**
+	 * Sets the packages to filter on
+	 *
+	 * @return
+	 */
+	public List<String> getPackages() {
+		return packages;
+	}
+
+	public List<String> getLocations() {
+		return locations;
+	}
+
+	/**
+	 * Sets the installed project locations to filter on
+	 *
+	 * @param locations
+	 */
+	public void setLocations(List<String> locations) {
+		this.locations = locations;
+	}
+
+	public EnumSet<ResourceSearchScope> getSearchScope() {
+		return searchScope;
+	}
+
+	/**
+	 * Sets the scope for the search.
+	 *
+	 * @param searchScope
+	 */
+	public void setSearchScope(EnumSet<ResourceSearchScope> searchScope) {
+		this.searchScope = searchScope;
+	}
+
+	/**
+	 * Include plain old java projects, resource projects, and others in
+	 * searches. No manifest required.
+	 *
+	 * @param includeNonBundles
+	 */
+	public void setIncludeNonBundles(boolean includeNonBundles) {
+		this.includeNonBundles = includeNonBundles;
+	}
+
+	public boolean isIncludeNonBundles() {
+		return includeNonBundles;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
index 53383e00f5..16f3e60ca7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
@@ -18,7 +19,17 @@ public class ContributionData {
 		public final String className;
 		public final String sourceType;
 		public final String iconPath;
-		
+
+		/**
+		 * This is used if the resource is not contained in a referenced bundle,
+		 * not a bundle, or not a project. It can be a jar file or a folder.
+		 */
+		public String installLocation;
+		/**
+		 * Path to the resource relative to the installLocation
+		 */
+		public String resourceRelativePath;
+
 		public ContributionData(String bundleName, String className, String sourceType, String iconPath) {
 			this.bundleName = bundleName;
 			this.className = className;
@@ -26,20 +37,32 @@ public ContributionData(String bundleName, String className, String sourceType,
 			this.iconPath = iconPath;
 		}
 	}
-	
+
 	public class Filter {
 		public final IProject project;
 		public final String namePattern;
-		
+		public int maxResults;
+		public Object userData;
+
 		public Filter(IProject project, String namePattern) {
 			this.project = project;
 			this.namePattern = namePattern;
 		}
 	}
-	
+
 	public interface ContributionResultHandler {
 		public void result(ContributionData data);
+
+		/**
+		 * This method is called at the end of a search. If the search
+		 * terminated because maxResults was exceeded, the hint parameter will
+		 * contain the number of additional results, or -1 if there are an
+		 * unspecified number of additional results.
+		 *
+		 * No there are no additional results, hint will be 0.
+		 */
+		public void moreResults(int hint, Filter filter);
 	}
-	
+
 	public void findContribution(Filter filter, ContributionResultHandler handler);
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java
new file mode 100644
index 0000000000..229b429935
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 404136, 424730
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.common;
+
+/**
+ * Specifies the scope when searching for a resource. This differs from the PDE
+ * search functions in that <li>more than just java objects can be queried. <li>
+ * Searches can specify the current project only, current workspace, non bundle
+ * projects, and target platform.
+ *
+ * @author Steven Spungin
+ *
+ */
+public enum ResourceSearchScope {
+	/**
+	 * The current project only
+	 */
+	PROJECT,
+	/**
+	 * Projects in the current workspace
+	 */
+	WORKSPACE,
+	/**
+	 * All plugins in target platform
+	 */
+	TARGET_PLATFORM,
+	/**
+	 * Eclipse Plugins and OSGi Bundles
+	 */
+	// BUNDLES,
+	/**
+	 * Eclipse Plugins
+	 */
+	// PLUGINS,
+	/**
+	 * Include resources in packages not exported by their bundles. Only applies
+	 * to SearchScope.TargetPlatform and SearchScope.Workspace
+	 */
+	NOT_EXPORTED,
+	/**
+	 * Follow references to dependent projects and bundles. Only applies to
+	 * SearchScope.Project
+	 */
+	REFERENCES
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 8f96ada029..23d7128f5f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -487,6 +487,12 @@ public class Messages {
 	public String AbstractIconDialog_current_project;
 	public String AbstractIconDialog_scope;
 
+	public static String AbstractIconDialogWithScopeAndFilter_details;
+	public static String AbstractIconDialogWithScopeAndFilter_icon;
+	public static String AbstractIconDialogWithScopeAndFilter_iconName;
+	public static String AbstractIconDialogWithScopeAndFilter_maxDisplayedImageSize;
+	public static String AbstractIconDialogWithScopeAndFilter_typeToStartSearch;
+
 	public String BindingContextSelectionDialog_ShellTitle;
 	public String BindingContextSelectionDialog_Title;
 	public String BindingContextSelectionDialog_Message;
@@ -677,4 +683,14 @@ public class Messages {
 	public static String ListTab_col_item;
 	public static String ListTab_col_label;
 	public static String ListTab_col_go;
+
+	public static String ListTab_addColumn;
+	public static String ListTab_filterByAttribute;
+	public static String ListTab_filterByItem;
+	public static String ListTab_mark;
+	public static String ListTab_markAttribute;
+	public static String ListTab_removeFilter;
+	public static String ListTab_resetColumns;
+	public static String ListTab_selectAnAttribute;
+	public static String ListTab_selectAType;
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 77a4a81d6e..cb892aa479 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -497,6 +497,12 @@ VWindowTrimEditor_AddWindowTrim=Window Trim
 
 AbstractIconDialog_IconName=IconName
 
+AbstractIconDialogWithScopeAndFilter_details=Details
+AbstractIconDialogWithScopeAndFilter_icon=Icon
+AbstractIconDialogWithScopeAndFilter_iconName=Icon Name
+AbstractIconDialogWithScopeAndFilter_maxDisplayedImageSize=Max Displayed Image Size
+AbstractIconDialogWithScopeAndFilter_typeToStartSearch=Type to start search
+
 BindingContextSelectionDialog_ShellTitle=BindingContext Dialog
 BindingContextSelectionDialog_Title=BindingContext
 BindingContextSelectionDialog_Message=Search for a BindingContext
@@ -687,3 +693,13 @@ ListTab_col_id=ID
 ListTab_col_item=Item
 ListTab_col_label=Label
 ListTab_col_go=Go
+
+ListTab_addColumn=Add Column
+ListTab_filterByAttribute=Filter By Attribute
+ListTab_filterByItem=Filter By Item
+ListTab_mark=Mark
+ListTab_markAttribute=Filter By Attribute
+ListTab_removeFilter=Remove Filter
+ListTab_resetColumns=Reset Columns
+ListTab_selectAnAttribute=Select an attribute
+ListTab_selectAType=Select a type
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
index 48ecfb7bfa..dffdc5d04f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
@@ -112,6 +112,7 @@ public class ResourceProvider extends BasicResourceProvider {
 	public static final String IMG_Obj16_error_obj = "IMG_org.eclipse.e4.tools.emf.ui.obj16.error_obj"; //$NON-NLS-1$
 	public static final String IMG_Obj16_world_edit = "IMG_org.eclipse.e4.tools.emf.ui.obj16.world_edit"; //$NON-NLS-1$
 	public static final String IMG_Obj16_bullet_go = "IMG_org.eclipse.e4.tools.emf.ui.obj16.bullet_go"; //$NON-NLS-1$
+	public static final String IMG_Obj16_bundle = "IMG_org.eclipse.e4.tools.emf.ui.obj16.bundle"; //$NON-NLS-1$
 
 	public static final String IMG_Wizban16_fieldrefact_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.fieldrefact_wiz"; //$NON-NLS-1$
 	public static final String IMG_Wizban16_import_wiz = "IMG_org.eclipse.e4.tools.emf.ui.wizban.import_wiz"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 32fac0dda0..5538517f54 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,7 +10,7 @@
  *     Wim Jongman <wim.jongman@remainsoftware.com> - Maintenance
  *     Marco Descher <marco@descher.at> - Bug395982, 426653, 422465
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 396902, 431755, 431735
+ *     Steven Spungin <steven@spungin.tv> - Bug 396902, 431755, 431735, 424730, 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
@@ -291,6 +291,9 @@ public class ModelEditor implements IGotoObject {
 	@Inject
 	ESelectionService selectionService;
 
+	@Inject
+	MApplication app;
+
 	private IEclipseContext context;
 	private boolean fragment;
 	private Handler clipboardHandler;
@@ -343,6 +346,12 @@ public class ModelEditor implements IGotoObject {
 
 	private ListTab listTab;
 
+	private CTabItem tabItemXmi;
+
+	private CTabItem tabItemList;
+
+	private CTabItem tabItemTree;
+
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project, final IResourcePool resourcePool) {
 		this.resourcePool = resourcePool;
 		this.modelProvider = modelProvider;
@@ -411,15 +420,17 @@ public void handleEvent(Event event) {
 		emfDocumentProvider = new EMFDocumentResourceMediator(modelProvider);
 
 		editorTabFolder = new CTabFolder(composite, SWT.BOTTOM);
-		CTabItem item = new CTabItem(editorTabFolder, SWT.NONE);
-		item.setText(messages.ModelEditor_Form);
-		item.setControl(createFormTab(editorTabFolder));
-		item.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_application_form));
-
-		item = new CTabItem(editorTabFolder, SWT.NONE);
-		item.setText(messages.ModelEditor_XMI);
-		item.setControl(createXMITab(editorTabFolder));
-		item.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_chart_organisation));
+		tabItemTree = new CTabItem(editorTabFolder, SWT.NONE);
+		tabItemTree.setText(messages.ModelEditor_Form);
+		tabItemTree.setControl(createFormTab(editorTabFolder));
+		tabItemTree.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_application_form));
+
+		tab_list_show(preferences.getBoolean("tab-list-show", false)); //$NON-NLS-1$
+
+		tabItemXmi = new CTabItem(editorTabFolder, SWT.NONE);
+		tabItemXmi.setText(messages.ModelEditor_XMI);
+		tabItemXmi.setControl(createXMITab(editorTabFolder));
+		tabItemXmi.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_chart_organisation));
 		editorTabFolder.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -429,11 +440,34 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		tab_list_show(preferences.getBoolean("tab-list-show", false)); //$NON-NLS-1$
+		editorTabFolder.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				// When the list tab is visible, register the IViewEObjects
+				// interface
+				// This allows external commands to interact with the view.
+				// Eventually, all 3 tabs, or even the ModelEditor itself, could
+				// implement the interface.
+				String key = "org.eclipse.e4.tools.active-object-viewer"; //$NON-NLS-1$
+				if (editorTabFolder.getSelectionIndex() == getTabIndex(listTab.getTabItem())) {
+					app.getContext().set(key, listTab);
+				} else {
+					app.getContext().set(key, null);
+				}
+			}
+		});
 
 		editorTabFolder.setSelection(0);
 	}
 
+	/**
+	 * @param tabItem
+	 * @return The index of the tab item. Should never return -1.
+	 */
+	static public int getTabIndex(CTabItem tabItem) {
+		return Arrays.asList(tabItem.getParent().getItems()).indexOf(tabItem);
+	}
+
 	private void findAndHighlight(Control control) {
 		if (control != null) {
 			MApplicationElement m = findModelElement(control);
@@ -1296,7 +1330,9 @@ public void tab_list_show(@Preference("tab-list-show") Boolean show) {
 				child.set(CTabFolder.class, editorTabFolder);
 				child.set(EMFDocumentResourceMediator.class, emfDocumentProvider);
 				child.set(IGotoObject.class, this);
+				child.set(Messages.class, messages);
 				listTab = ContextInjectionFactory.make(ListTab.class, child);
+				tabItemList = listTab.getTabItem();
 			}
 		}
 	}
@@ -1422,7 +1458,8 @@ public void setFocus() {
 		if (clipboardService != null) {
 			clipboardService.setHandler(clipboardHandler);
 		}
-		viewer.getControl().setFocus();
+		// See bug 432095.
+		// viewer.getControl().setFocus();
 	}
 
 	@PreDestroy
@@ -1801,12 +1838,12 @@ public void gotoEObject(int targetHint, EObject object) {
 
 				viewer.reveal(object);
 				viewer.setSelection(new StructuredSelection(object));
-				editorTabFolder.setSelection(0);
+				editorTabFolder.setSelection(getTabIndex(tabItemTree));
 				break;
 			case TAB_XMI:
-				editorTabFolder.setSelection(1);
-				// model was not updating in xmi document (selection listener
-				// was not firing from programatic setSelection()
+				editorTabFolder.setSelection(getTabIndex(tabItemXmi));
+				// model was not updating in XMI document (selection listener
+				// was not firing from programmatic setSelection()
 				emfDocumentProvider.updateFromEMF();
 
 				try {
@@ -1817,28 +1854,13 @@ public void gotoEObject(int targetHint, EObject object) {
 					} else {
 						sourceViewer.setSelection(new TextSelection(0, 0), true);
 					}
-					//					String elementId = (String) EmfUtil.getAttributeValue(object, "elementId"); //$NON-NLS-1$
-					// if (elementId != null && elementId.isEmpty() == false) {
-					// int loc2 = emfDocumentProvider.indexOf(object);
-					// loc = emfDocumentProvider.getDocument().search(0,
-					// elementId, true, true, true);
-					// if (loc >= 0) {
-					// ISelection selection = new TextSelection(loc,
-					// elementId.length());
-					// sourceViewer.setSelection(selection, true);
-					// } else {
-					// sourceViewer.setSelection(new TextSelection(0, 0));
-					// }
-					// } else {
-					// sourceViewer.setSelection(new TextSelection(0, 0));
-					// }
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
 				break;
 			case TAB_LIST:
-				if (listTab != null) {
-					editorTabFolder.setSelection(Arrays.asList(editorTabFolder.getItems()).indexOf(listTab.getTabItem()));
+				if (tabItemList != null) {
+					editorTabFolder.setSelection(getTabIndex(tabItemList));
 					listTab.getViewer().setSelection(new StructuredSelection(object), true);
 				}
 				break;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 1e4a6c0487..f33cb1c1ca 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -17,6 +18,7 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
@@ -63,6 +65,9 @@ public class AddonsEditor extends AbstractComponentEditor {
 	@Optional
 	private IProject project;
 
+	@Inject
+	IEclipseContext eclipseContext;
+
 	private StackLayout stackLayout;
 
 	@Inject
@@ -191,7 +196,7 @@ public void modifyText(ModifyEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 99ec41430a..4aa400a7a2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 433408
+ *     Steven Spungin <steven@spungin.tv> - Bug 433408, 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -20,6 +20,7 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -94,6 +95,9 @@ public class AreaEditor extends AbstractComponentEditor {
 	@Optional
 	private IProject project;
 
+	@Inject
+	IEclipseContext eclipseContext;
+
 	@Inject
 	public AreaEditor() {
 		super();
@@ -256,7 +260,7 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					AreaIconDialogEditor dialog = new AreaIconDialogEditor(b.getShell(), project, getEditingDomain(), (MApplicationElement) getMaster().getValue(), Messages);
+					AreaIconDialogEditor dialog = new AreaIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MApplicationElement) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index d8931cc622..bdaefb4376 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -18,6 +19,7 @@
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -58,6 +60,9 @@
 public class DirectMenuItemEditor extends MenuItemEditor {
 	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
+	@Inject
+	IEclipseContext eclipseContext;
+
 	@Inject
 	public DirectMenuItemEditor() {
 		super();
@@ -158,7 +163,7 @@ public void modifyText(ModifyEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 1344120a45..b2a0720add 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -17,6 +18,7 @@
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -57,6 +59,9 @@
 public class DirectToolItemEditor extends ToolItemEditor {
 	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
+	@Inject
+	IEclipseContext eclipseContext;
+
 	@Inject
 	public DirectToolItemEditor() {
 		super();
@@ -121,7 +126,7 @@ public void modifyText(ModifyEvent e) {
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+				ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 				dialog.open();
 			}
 		});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
index abb1e9e925..c2603eda9e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Marco Descher <marco@descher.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -17,6 +18,7 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
@@ -66,6 +68,9 @@ public class DynamicMenuContributionEditor extends AbstractComponentEditor {
 	@Optional
 	private IProject project;
 
+	@Inject
+	IEclipseContext eclipseContext;
+
 	public DynamicMenuContributionEditor() {
 		super();
 	}
@@ -198,7 +203,7 @@ public void modifyText(ModifyEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index b621da2c5e..c79c9b35cb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -17,6 +18,7 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
 import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
@@ -71,6 +73,9 @@ public class HandlerEditor extends AbstractComponentEditor {
 	@Optional
 	private IProject project;
 
+	@Inject
+	IEclipseContext eclipseContext;
+
 	@Inject
 	public HandlerEditor() {
 		super();
@@ -215,7 +220,7 @@ public void modifyText(ModifyEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 32df3efbe7..118c37f911 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -9,6 +9,7 @@
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Marco Descher <marco@descher.at> - Bug 395982
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -27,6 +28,7 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -107,6 +109,9 @@ public class MenuEditor extends AbstractComponentEditor {
 	@Optional
 	private IProject project;
 
+	@Inject
+	IEclipseContext eclipseContext;
+
 	private Action addExpression;
 
 	private static class Struct {
@@ -415,7 +420,7 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MenuIconDialogEditor dialog = new MenuIconDialogEditor(b.getShell(), project, getEditingDomain(), (MMenu) getMaster().getValue(), Messages);
+					MenuIconDialogEditor dialog = new MenuIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MMenu) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 84a526a04e..eeadda4132 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -21,6 +22,7 @@
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -82,6 +84,9 @@ public abstract class MenuItemEditor extends AbstractComponentEditor {
 	@Optional
 	protected IProject project;
 
+	@Inject
+	IEclipseContext eclipseContext;
+
 	private Action addExpression;
 
 	public MenuItemEditor() {
@@ -226,7 +231,7 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MenuItemIconDialogEditor dialog = new MenuItemIconDialogEditor(b.getShell(), project, getEditingDomain(), (MMenuItem) getMaster().getValue(), Messages);
+					MenuItemIconDialogEditor dialog = new MenuItemIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MMenuItem) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 5e7703d3b8..aebc5b3cb2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 404166
+ *     Steven Spungin <steven@spungin.tv> - Bug 404166, 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -20,6 +20,7 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
@@ -77,6 +78,9 @@ public class PartDescriptorEditor extends AbstractComponentEditor {
 	@Optional
 	private IProject project;
 
+	@Inject
+	IEclipseContext eclipseContext;
+
 	private IListProperty PART__MENUS = EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS);
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IValueProperty PART__TOOLBAR = EMFProperties.value(BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR);
@@ -196,7 +200,7 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					PartDescriptorIconDialogEditor dialog = new PartDescriptorIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), Messages);
+					PartDescriptorIconDialogEditor dialog = new PartDescriptorIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -248,7 +252,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI, Messages);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, project, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index eeaaedcfec..15be9c08ab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -7,7 +7,8 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
+******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
@@ -21,6 +22,7 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
@@ -90,6 +92,9 @@ public class PartEditor extends AbstractComponentEditor {
 	@Optional
 	private IProject project;
 
+	@Inject
+	IEclipseContext eclipseContext;
+
 	@Inject
 	public PartEditor() {
 		super();
@@ -214,7 +219,7 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPart) getMaster().getValue(), Messages);
+					PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MPart) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -267,7 +272,7 @@ public void modifyText(ModifyEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index caa2b8b37a..fbff8850f6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -19,6 +20,7 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -79,6 +81,9 @@ public class PerspectiveEditor extends AbstractComponentEditor {
 	@Optional
 	private IProject project;
 
+	@Inject
+	IEclipseContext eclipseContext;
+
 	@Inject
 	public PerspectiveEditor() {
 		super();
@@ -242,7 +247,7 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					PerspectiveIconDialogEditor dialog = new PerspectiveIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPerspective) getMaster().getValue(), Messages);
+					PerspectiveIconDialogEditor dialog = new PerspectiveIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MPerspective) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index b07392ac4f..ac9d5bfb3a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -9,6 +9,7 @@
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  *     Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 412672
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -16,6 +17,7 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -64,6 +66,9 @@ public class ToolControlEditor extends AbstractComponentEditor {
 	@Optional
 	private IProject project;
 
+	@Inject
+	IEclipseContext eclipseContext;
+
 	@Inject
 	public ToolControlEditor() {
 		super();
@@ -187,7 +192,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 68aa5e894b..ea2c36786c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -24,6 +25,7 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -84,6 +86,9 @@ public abstract class ToolItemEditor extends AbstractComponentEditor {
 	@Optional
 	protected IProject project;
 
+	@Inject
+	IEclipseContext eclipseContext;
+
 	private Button createRemoveMenu;
 
 	public ToolItemEditor() {
@@ -231,7 +236,7 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ToolItemIconDialogEditor dialog = new ToolItemIconDialogEditor(b.getShell(), project, getEditingDomain(), (MToolItem) getMaster().getValue(), Messages);
+					ToolItemIconDialogEditor dialog = new ToolItemIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MToolItem) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 0ccc350bb0..604612b864 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -23,6 +24,7 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -88,6 +90,9 @@ public class WindowEditor extends AbstractComponentEditor {
 	@Optional
 	private IProject project;
 
+	@Inject
+	IEclipseContext eclipseContext;
+
 	@Inject
 	public WindowEditor() {
 		super();
@@ -253,7 +258,7 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					WindowIconDialogEditor dialog = new WindowIconDialogEditor(b.getShell(), project, getEditingDomain(), (MWindow) getMaster().getValue(), Messages);
+					WindowIconDialogEditor dialog = new WindowIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MWindow) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
index 7957885247..4de500e544 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
@@ -7,377 +7,58 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 404136
+ *     Steven Spungin <steven@spungin.tv> - Bug 404136, Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.runtime.CoreException;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.StringMatcher;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StyledCellLabelProvider;
-import org.eclipse.jface.viewers.StyledString;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-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.Event;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
 
-public abstract class AbstractIconDialog extends TitleAreaDialog {
-	private TableViewer viewer;
+public abstract class AbstractIconDialog extends AbstractIconDialogWithScopeAndFilter {
 	private IProject project;
 	private MApplicationElement element;
 	private EStructuralFeature feature;
 	private EditingDomain editingDomain;
-	private Map<IFile, Image> icons = Collections.synchronizedMap(new HashMap<IFile, Image>());
-	private SearchScope searchScope = SearchScope.PROJECT;
+	// private Map<IFile, Image> icons = Collections.synchronizedMap(new
+	// HashMap<IFile, Image>());
 
 	protected Messages Messages;
-	private Text textFilter;
 
-	public AbstractIconDialog(Shell parentShell, IProject project, EditingDomain editingDomain, MApplicationElement element, EStructuralFeature feature, Messages Messages) {
-		super(parentShell);
+	public AbstractIconDialog(Shell parentShell, IEclipseContext context, IProject project, EditingDomain editingDomain, MApplicationElement element, EStructuralFeature feature, Messages Messages) {
+		super(parentShell, context);
 		this.editingDomain = editingDomain;
 		this.element = element;
 		this.feature = feature;
 		this.project = project;
 		this.Messages = Messages;
+		context.set(Messages.class, Messages);
 	}
 
-	protected abstract String getShellTitle();
-
-	protected abstract String getDialogTitle();
-
-	protected abstract String getDialogMessage();
-
 	@Override
-	protected Control createDialogArea(Composite parent) {
-		Composite comp = (Composite) super.createDialogArea(parent);
-
-		getShell().setText(getShellTitle());
-		setTitle(getDialogTitle());
-		setMessage(getDialogMessage());
-
-		Composite container = new Composite(comp, SWT.NONE);
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		container.setLayout(new GridLayout(2, false));
-
-		Label lblScope = new Label(container, SWT.NONE);
-		lblScope.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
-		lblScope.setText(Messages.AbstractIconDialog_scope);
-
-		Composite compOptions = new Composite(container, SWT.NONE);
-		compOptions.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		compOptions.setLayout(new RowLayout());
-
-		Button btnProject = new Button(compOptions, SWT.RADIO);
-		btnProject.setText(Messages.AbstractIconDialog_current_project);
-		btnProject.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				searchScope = SearchScope.PROJECT;
-				textFilter.notifyListeners(SWT.Modify, new Event());
-
-			}
-		});
-		btnProject.setSelection(true);
-
-		Button btnWorkspace = new Button(compOptions, SWT.RADIO);
-		btnWorkspace.setText(Messages.AbstractIconDialog_all_workspace_bundles);
-		btnWorkspace.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				searchScope = SearchScope.WORKSPACE;
-				textFilter.notifyListeners(SWT.Modify, new Event());
-			}
-		});
-
-		btnWorkspace.setSelection(searchScope == SearchScope.WORKSPACE);
-		btnProject.setSelection(searchScope == SearchScope.PROJECT);
-
-		Label l = new Label(container, SWT.NONE);
-		l.setText(Messages.AbstractIconDialog_IconName);
-
-		textFilter = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
-		textFilter.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		new Label(container, SWT.NONE);
-
-		viewer = new TableViewer(container);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		viewer.getControl().setLayoutData(gd);
-		viewer.setContentProvider(new ObservableListContentProvider());
-		viewer.setLabelProvider(new StyledCellLabelProvider() {
-			@Override
-			public void update(ViewerCell cell) {
-				IFile file = (IFile) cell.getElement();
-				StyledString styledString = new StyledString(file.getProjectRelativePath().toString(), null);
-
-				Image img = icons.get(file);
-				if (img == null) {
-					InputStream in = null;
-					try {
-						in = file.getContents();
-						img = new Image(cell.getControl().getDisplay(), in);
-						icons.put(file, img);
-					} catch (CoreException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					} finally {
-						if (in != null) {
-							try {
-								in.close();
-							} catch (IOException e) {
-								// TODO Auto-generated catch block
-								e.printStackTrace();
-							}
-						}
-					}
-				}
-
-				String bundle = getBundle(file);
-				if (bundle != null) {
-					styledString.append(" - " + bundle, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
-				}
-
-				cell.setImage(img);
-				cell.setText(styledString.getString());
-				cell.setStyleRanges(styledString.getStyleRanges());
-			}
-		});
-
-		final WritableList list = new WritableList();
-		viewer.setInput(list);
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				okPressed();
-			}
-		});
-
-		textFilter.addModifyListener(new ModifyListener() {
-			private IconMatchCallback callback;
-			private Timer timer = new Timer(true);
-			private TimerTask task;
-
-			@Override
-			public void modifyText(ModifyEvent e) {
-				if (callback != null) {
-					callback.cancel = true;
-				}
-				if (task != null) {
-					task.cancel();
-				}
-				list.clear();
-
-				clearImages();
-
-				callback = new IconMatchCallback(list);
-				task = new SearchThread(callback, textFilter.getText(), project, searchScope);
-				timer.schedule(task, 500);
-			}
-		});
-
-		getShell().addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				clearImages();
-			}
-		});
-
-		return comp;
-	}
-
-	private void clearImages() {
-		for (Image img : icons.values()) {
-			img.dispose();
-		}
-		icons.clear();
+	protected String getFilterTextMessage() {
+		return "Type to start search";
 	}
 
 	@Override
-	protected boolean isResizable() {
-		return true;
+	protected String getResourceNameText() {
+		return "Icon Name";
 	}
 
 	@Override
 	protected void okPressed() {
-		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-		if (!s.isEmpty()) {
-			IFile file = (IFile) s.getFirstElement();
-			String bundle = getBundle(file);
-			String uri = "platform:/plugin/" + bundle + "/" + file.getProjectRelativePath().toString(); //$NON-NLS-1$//$NON-NLS-2$
+		super.okPressed();
+		String uri = getValue();
+		if (uri != null) {
 			Command cmd = SetCommand.create(editingDomain, element, feature, uri);
 			if (cmd.canExecute()) {
 				editingDomain.getCommandStack().execute(cmd);
-				super.okPressed();
-			}
-		}
-	}
-
-	private String getBundle(IFile file) {
-		IProject project = file.getProject();
-		IFile f = project.getFile("/META-INF/MANIFEST.MF"); //$NON-NLS-1$
-
-		if (f != null && f.exists()) {
-			BufferedReader r = null;
-			try {
-				InputStream s = f.getContents();
-				r = new BufferedReader(new InputStreamReader(s));
-				String line;
-				while ((line = r.readLine()) != null) {
-					if (line.startsWith("Bundle-SymbolicName:")) { //$NON-NLS-1$
-						int start = line.indexOf(':');
-						int end = line.indexOf(';');
-						if (end == -1) {
-							end = line.length();
-						}
-						return line.substring(start + 1, end).trim();
-					}
-				}
-			} catch (CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} finally {
-				if (r != null) {
-					try {
-						r.close();
-					} catch (IOException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	private class IconMatchCallback {
-		private volatile boolean cancel;
-		private IObservableList list;
-
-		private IconMatchCallback(IObservableList list) {
-			this.list = list;
-		}
-
-		public void match(final IFile file) {
-			if (!cancel) {
-				list.getRealm().exec(new Runnable() {
-
-					@Override
-					public void run() {
-						list.add(file);
-					}
-				});
-			}
-		}
-	}
-
-	private static class SearchThread extends TimerTask {
-		private final IconMatchCallback callback;
-		private final IProject project;
-		private final StringMatcher matcherGif;
-		private final StringMatcher matcherJpg;
-		private final StringMatcher matcherPng;
-		private SearchScope searchScope;
-
-		public SearchThread(IconMatchCallback callback, String pattern, IProject project, SearchScope searchScope) {
-			this.matcherGif = new StringMatcher("*" + pattern + "*.gif", true, false); //$NON-NLS-1$//$NON-NLS-2$
-			this.matcherJpg = new StringMatcher("*" + pattern + "*.jpg", true, false); //$NON-NLS-1$//$NON-NLS-2$
-			this.matcherPng = new StringMatcher("*" + pattern + "*.png", true, false); //$NON-NLS-1$//$NON-NLS-2$
-			this.callback = callback;
-			this.project = project;
-			this.searchScope = searchScope;
-		}
-
-		@Override
-		public void run() {
-			List<IProject> projects;
-			switch (searchScope) {
-			case WORKSPACE:
-				projects = Arrays.asList(project.getWorkspace().getRoot().getProjects());
-				break;
-			case PROJECT:
-			default:
-				projects = Arrays.asList(project);
-				break;
-			}
-			try {
-				for (IProject project : projects) {
-					// Only search bundles
-					if (project.getFile("/META-INF/MANIFEST.MF").exists() == false) { //$NON-NLS-1$
-						continue;
-					}
-					project.accept(new IResourceVisitor() {
-
-						@Override
-						public boolean visit(IResource resource) throws CoreException {
-							if (callback.cancel) {
-								return false;
-							}
-
-							if (resource.getType() == IResource.FOLDER || resource.getType() == IResource.PROJECT) {
-								return true;
-							} else if (resource.getType() == IResource.FILE && !resource.isLinked()) {
-								String path = resource.getProjectRelativePath().toString();
-								if (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path)) {
-									callback.match((IFile) resource);
-								}
-							}
-							return false;
-						}
-
-					});
-				}
-			} catch (CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
new file mode 100644
index 0000000000..8fb47c6d7f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
@@ -0,0 +1,425 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Bug 404136, 424730
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Timer;
+import java.util.TimerTask;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.common.ResourceSearchScope;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.StringMatcher;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+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.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * Based of of AbstractIconDialog, but passively returns selection instead of
+ * modifying model.
+ *
+ * @author Steven Spungin
+ *
+ */
+public abstract class AbstractIconDialogWithHardcodedScope extends TitleAreaDialog {
+	private TableViewer viewer;
+	private IProject project;
+	private Map<IFile, Image> icons = Collections.synchronizedMap(new HashMap<IFile, Image>());
+	private ResourceSearchScope searchScope = ResourceSearchScope.PROJECT;
+
+	protected Messages Messages;
+	private Text textSearch;
+	private String value;
+	private IEclipseContext context;
+
+	public AbstractIconDialogWithHardcodedScope(Shell parentShell, IEclipseContext context) {
+		super(parentShell);
+		this.context = context;
+		this.project = context.get(IProject.class);
+		Messages = context.get(Messages.class);
+	}
+
+	protected IEclipseContext getContext() {
+		return context;
+	}
+
+	protected abstract String getShellTitle();
+
+	protected abstract String getDialogTitle();
+
+	protected abstract String getDialogMessage();
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite comp = (Composite) super.createDialogArea(parent);
+
+		getShell().setText(getShellTitle());
+		setTitle(getDialogTitle());
+		setMessage(getDialogMessage());
+		String bundleFilter = (String) context.get("bundle");
+		if (E.notEmpty(bundleFilter)) {
+			setMessage("Filtering by bundle " + bundleFilter); //$NON-NLS-1$
+		}
+
+		Composite container = new Composite(comp, SWT.NONE);
+		container.setLayoutData(new GridData(GridData.FILL_BOTH));
+		container.setLayout(new GridLayout(2, false));
+
+		Composite compOptions = new Composite(container, SWT.NONE);
+		compOptions.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
+		compOptions.setLayout(new RowLayout());
+
+		if (E.isEmpty(bundleFilter)) {
+			Button btnProject = new Button(compOptions, SWT.RADIO);
+			btnProject.setText("Project");
+			btnProject.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					searchScope = ResourceSearchScope.PROJECT;
+					textSearch.notifyListeners(SWT.Modify, new Event());
+
+				}
+			});
+			btnProject.setSelection(true);
+
+			Button btnWorkspace = new Button(compOptions, SWT.RADIO);
+			btnWorkspace.setText("Workspace");
+			btnWorkspace.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					searchScope = ResourceSearchScope.WORKSPACE;
+					textSearch.notifyListeners(SWT.Modify, new Event());
+				}
+			});
+
+			btnWorkspace.setSelection(searchScope == ResourceSearchScope.WORKSPACE);
+			btnProject.setSelection(searchScope == ResourceSearchScope.PROJECT);
+		} else {
+			searchScope = ResourceSearchScope.WORKSPACE;
+		}
+
+		Label l = new Label(container, SWT.NONE);
+		l.setText(Messages.AbstractIconDialog_IconName);
+
+		textSearch = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		textSearch.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		new Label(container, SWT.NONE);
+
+		viewer = new TableViewer(container, SWT.FULL_SELECTION);
+		GridData gd = new GridData(GridData.FILL_BOTH);
+		viewer.getControl().setLayoutData(gd);
+		viewer.setContentProvider(new ObservableListContentProvider());
+		viewer.setLabelProvider(new StyledCellLabelProvider() {
+			@Override
+			public void update(ViewerCell cell) {
+				IFile file = (IFile) cell.getElement();
+				StyledString styledString = new StyledString(file.getProjectRelativePath().toString(), null);
+
+				Image img = icons.get(file);
+				if (img == null) {
+					InputStream in = null;
+					try {
+						in = file.getContents();
+						img = new Image(cell.getControl().getDisplay(), in);
+						icons.put(file, img);
+					} catch (CoreException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					} finally {
+						if (in != null) {
+							try {
+								in.close();
+							} catch (IOException e) {
+								// TODO Auto-generated catch block
+								e.printStackTrace();
+							}
+						}
+					}
+				}
+
+				String bundle = getBundle(file);
+				if (bundle != null) {
+					styledString.append(" - " + bundle, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+				}
+
+				cell.setImage(img);
+				cell.setText(styledString.getString());
+				cell.setStyleRanges(styledString.getStyleRanges());
+			}
+		});
+
+		final WritableList list = new WritableList();
+		viewer.setInput(list);
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+
+			@Override
+			public void doubleClick(DoubleClickEvent event) {
+				okPressed();
+			}
+		});
+
+		textSearch.addModifyListener(new ModifyListener() {
+			private IconMatchCallback callback;
+			private Timer timer = new Timer(true);
+			private TimerTask task;
+
+			@Override
+			public void modifyText(ModifyEvent e) {
+				if (callback != null) {
+					callback.cancel = true;
+				}
+				if (task != null) {
+					task.cancel();
+				}
+				list.clear();
+
+				clearImages();
+
+				callback = new IconMatchCallback(list);
+				task = new SearchThread(callback, textSearch.getText(), project, context, searchScope);
+				timer.schedule(task, 500);
+			}
+		});
+
+		getShell().addDisposeListener(new DisposeListener() {
+
+			@Override
+			public void widgetDisposed(DisposeEvent e) {
+				clearImages();
+			}
+		});
+
+		textSearch.notifyListeners(SWT.Modify, new Event());
+
+		return comp;
+	}
+
+	private void clearImages() {
+		for (Image img : icons.values()) {
+			img.dispose();
+		}
+		icons.clear();
+	}
+
+	@Override
+	protected boolean isResizable() {
+		return true;
+	}
+
+	@Override
+	protected void okPressed() {
+		value = null;
+		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+		if (!s.isEmpty()) {
+			IFile file = (IFile) s.getFirstElement();
+			String bundle = getBundle(file);
+			value = "platform:/plugin/" + bundle + "/" + file.getProjectRelativePath().toString(); //$NON-NLS-1$//$NON-NLS-2$
+
+		}
+		super.okPressed();
+	}
+
+	private String getBundle(IFile file) {
+		IProject project = file.getProject();
+		IFile f = project.getFile("/META-INF/MANIFEST.MF"); //$NON-NLS-1$
+
+		if (f != null && f.exists()) {
+			BufferedReader r = null;
+			try {
+				InputStream s = f.getContents();
+				r = new BufferedReader(new InputStreamReader(s));
+				String line;
+				while ((line = r.readLine()) != null) {
+					if (line.startsWith("Bundle-SymbolicName:")) { //$NON-NLS-1$
+						int start = line.indexOf(':');
+						int end = line.indexOf(';');
+						if (end == -1) {
+							end = line.length();
+						}
+						return line.substring(start + 1, end).trim();
+					}
+				}
+			} catch (CoreException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} finally {
+				if (r != null) {
+					try {
+						r.close();
+					} catch (IOException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	private class IconMatchCallback {
+		private volatile boolean cancel;
+		private IObservableList list;
+
+		private IconMatchCallback(IObservableList list) {
+			this.list = list;
+		}
+
+		public void match(final IFile file) {
+			if (!cancel) {
+				list.getRealm().exec(new Runnable() {
+
+					@Override
+					public void run() {
+						list.add(file);
+					}
+				});
+			}
+		}
+	}
+
+	private static class SearchThread extends TimerTask {
+		private final IconMatchCallback callback;
+		private final IProject project;
+		private final StringMatcher matcherGif;
+		private final StringMatcher matcherJpg;
+		private final StringMatcher matcherPng;
+		private IEclipseContext context;
+		private ResourceSearchScope searchScope;
+
+		public SearchThread(IconMatchCallback callback, String pattern, IProject project, IEclipseContext context, ResourceSearchScope searchScope) {
+			this.context = context;
+			this.matcherGif = new StringMatcher("*" + pattern + "*.gif", true, false); //$NON-NLS-1$//$NON-NLS-2$
+			this.matcherJpg = new StringMatcher("*" + pattern + "*.jpg", true, false); //$NON-NLS-1$//$NON-NLS-2$
+			this.matcherPng = new StringMatcher("*" + pattern + "*.png", true, false); //$NON-NLS-1$//$NON-NLS-2$
+			this.callback = callback;
+			this.project = project;
+			this.searchScope = searchScope;
+		}
+
+		@Override
+		public void run() {
+			List<IProject> projects;
+			switch (searchScope) {
+			case WORKSPACE:
+				projects = Arrays.asList(project.getWorkspace().getRoot().getProjects());
+				break;
+			case PROJECT:
+			default:
+				projects = Arrays.asList(project);
+				break;
+			}
+			try {
+				for (IProject project : projects) {
+					// Only search bundles
+					IFile iFile = project.getFile("/META-INF/MANIFEST.MF"); //$NON-NLS-1$
+					if (iFile.exists() == false) {
+						continue;
+					}
+					// Only search target bundle if specified
+					String bundle = (String) context.get("bundle");
+					if (E.notEmpty(bundle)) {
+						InputStream inputStream = null;
+						try {
+							inputStream = iFile.getContents();
+							Properties props = new Properties();
+							props.load(inputStream);
+							String name = props.getProperty("Bundle-SymbolicName"); //$NON-NLS-1$
+							String[] parts = name.split(";"); //$NON-NLS-1$
+							if (parts[0].equals(bundle) == false) {
+								continue;
+							}
+						} catch (IOException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						} finally {
+							try {
+								inputStream.close();
+							} catch (Exception ex) {
+							}
+						}
+					}
+					project.accept(new IResourceVisitor() {
+
+						@Override
+						public boolean visit(IResource resource) throws CoreException {
+							if (callback.cancel) {
+								return false;
+							}
+
+							if (resource.getType() == IResource.FOLDER || resource.getType() == IResource.PROJECT) {
+								return true;
+							} else if (resource.getType() == IResource.FILE && !resource.isLinked()) {
+								String path = resource.getProjectRelativePath().toString();
+								if (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path)) {
+									callback.match((IFile) resource);
+								}
+							}
+							return false;
+						}
+
+					});
+				}
+			} catch (CoreException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
new file mode 100644
index 0000000000..6aa99a2481
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
@@ -0,0 +1,474 @@
+/*******************************************************************************
+
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Bug 404136, 424730
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.common.FilterEx;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
+import org.eclipse.e4.tools.emf.ui.common.ResourceSearchScope;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.StringMatcher;
+import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.TargetPlatformIconContributionCollector;
+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.StructuredSelection;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * A FilteredContributionDialog with additional options for icon resources.
+ * Features in include
+ * <ul>
+ * <li>Rebuilding the viewer when row height decreases. (Workaround for an SWT
+ * limitation)
+ * <li>Icon previews are displace in the first column.
+ * <li>Limited the maximum image size.
+ * </ul>
+ *
+ * @author "Steven Spungin"
+ *
+ * @see @FilteredContributionDialog
+ */
+public abstract class AbstractIconDialogWithScopeAndFilter extends FilteredContributionDialog {
+	private IProject project;
+	private Map<IFile, Image> icons = Collections.synchronizedMap(new HashMap<IFile, Image>());
+
+	static public class Entry {
+		IFile file;
+		String installLocation;
+	}
+
+	protected Integer maxDisplayedImageSize;
+	protected int maxImageHeight;
+	public static TargetPlatformIconContributionCollector collector;
+
+	public AbstractIconDialogWithScopeAndFilter(Shell parentShell, IEclipseContext context) {
+		super(parentShell, context);
+		this.project = context.get(IProject.class);
+	}
+
+	@Override
+	protected String getFilterTextMessage() {
+		return Messages.AbstractIconDialogWithScopeAndFilter_typeToStartSearch;
+	}
+
+	@Override
+	protected String getResourceNameText() {
+		return Messages.AbstractIconDialogWithScopeAndFilter_iconName;
+	}
+
+	@Override
+	protected ClassContributionCollector getCollector() {
+		if (collector == null) {
+			collector = TargetPlatformIconContributionCollector.getInstance();
+		}
+		return collector;
+	}
+
+	@Override
+	protected void createOptions(Composite compOptions) {
+		super.createOptions(compOptions);
+
+		Label lblMaxSize = new Label(compOptions, SWT.NONE);
+		lblMaxSize.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+		lblMaxSize.setText(Messages.AbstractIconDialogWithScopeAndFilter_maxDisplayedImageSize);
+
+		final ComboViewer cv = new ComboViewer(compOptions);
+		cv.getCombo().setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false, 1, 1));
+		cv.add(10);
+		cv.add(20);
+		cv.add(30);
+		cv.add(50);
+		cv.add(100);
+		cv.add(150);
+		cv.add(200);
+		maxDisplayedImageSize = 30;
+		cv.setSelection(new StructuredSelection(maxDisplayedImageSize));
+
+		cv.addSelectionChangedListener(new ISelectionChangedListener() {
+
+			@Override
+			public void selectionChanged(SelectionChangedEvent event) {
+				maxDisplayedImageSize = (Integer) ((IStructuredSelection) cv.getSelection()).getFirstElement();
+				rebuildViewer();
+				refreshSearch();
+				// combo viewer cannot make rows smaller, so we will need to
+				// rebuild it in that case.
+			}
+		});
+	}
+
+	@Override
+	protected void rebuildViewer() {
+		super.rebuildViewer();
+		getViewer().getTable().setHeaderVisible(true);
+
+		((GridData) getViewer().getTable().getLayoutData()).minimumHeight = 100;
+
+		TableViewerColumn colIcon = new TableViewerColumn(getViewer(), SWT.NONE);
+		colIcon.getColumn().setText(Messages.AbstractIconDialogWithScopeAndFilter_icon);
+		TableViewerColumn colText = new TableViewerColumn(getViewer(), SWT.NONE);
+		colText.getColumn().setText(Messages.AbstractIconDialogWithScopeAndFilter_details);
+
+		// resize the row height using a MeasureItem listener
+		getViewer().getTable().addListener(SWT.MeasureItem, new Listener() {
+			@Override
+			public void handleEvent(Event event) {
+				// height cannot be per row so simply set
+				event.height = maxDisplayedImageSize;
+			}
+		});
+
+		colIcon.setLabelProvider(new StyledCellLabelProvider() {
+			@Override
+			public void update(ViewerCell cell) {
+				IFile file;
+				if (cell.getElement() instanceof ContributionData) {
+					file = new ContributionDataFile((ContributionData) cell.getElement());
+				} else if (cell.getElement() instanceof Entry) {
+					file = ((Entry) cell.getElement()).file;
+				} else {
+					file = (IFile) cell.getElement();
+				}
+
+				Image img = icons.get(file);
+				if (img == null) {
+					InputStream in = null;
+					try {
+						in = file.getContents();
+						img = new Image(cell.getControl().getDisplay(), in);
+						icons.put(file, img);
+					} catch (Exception e) {
+						// e.printStackTrace();
+						return;
+					} finally {
+						if (in != null) {
+							try {
+								in.close();
+							} catch (IOException e) {
+								// TODO Auto-generated catch block
+								// e.printStackTrace();
+							}
+						}
+					}
+				}
+
+				// scale image if larger then max height
+				// also remember max width for column resizing
+				if (img != null) {
+					double scale1 = ((double) maxDisplayedImageSize) / img.getImageData().height;
+					double scale2 = ((double) maxDisplayedImageSize) / img.getImageData().width;
+					if (scale2 < scale1) {
+						scale1 = scale2;
+					}
+					if (scale1 < 1) {
+						int width = (int) (img.getImageData().width * scale1);
+						if (width == 0)
+							width = 1;
+						int height = (int) (img.getImageData().height * scale1);
+						if (height == 0)
+							height = 1;
+						Image img2 = new Image(img.getDevice(), img.getImageData().scaledTo(width, height));
+						img.dispose();
+						img = img2;
+						icons.put(file, img);
+					}
+					int width = AbstractIconDialogWithScopeAndFilter.this.getViewer().getTable().getColumn(0).getWidth();
+					if (img.getImageData().width > width) {
+						AbstractIconDialogWithScopeAndFilter.this.getViewer().getTable().getColumn(0).setWidth(img.getImageData().width);
+					}
+					int height = img.getImageData().height;
+					if (height > maxImageHeight) {
+						maxImageHeight = height;
+					}
+				}
+
+				cell.setImage(img);
+			}
+		});
+		colIcon.getColumn().setWidth(30);
+
+		colText.setLabelProvider(new StyledCellLabelProvider() {
+			@Override
+			public void update(ViewerCell cell) {
+				IFile file;
+				String installLocation = null;
+				if (cell.getElement() instanceof ContributionData) {
+					ContributionData contributionData = (ContributionData) cell.getElement();
+					file = new ContributionDataFile(contributionData);
+					installLocation = contributionData.installLocation;
+				} else if (cell.getElement() instanceof Entry) {
+					file = ((Entry) cell.getElement()).file;
+					installLocation = ((Entry) cell.getElement()).installLocation;
+				} else {
+					file = (IFile) cell.getElement();
+				}
+				StyledString styledString = new StyledString(file.getProjectRelativePath().toString(), null);
+				String bundle = FilteredContributionDialog.getBundle(file);
+				if (bundle != null) {
+					styledString.append(" - " + bundle, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+				} else if (installLocation != null) {
+					styledString.append(" - " + installLocation, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+				}
+
+				cell.setText(styledString.getString());
+				cell.setStyleRanges(styledString.getStyleRanges());
+			}
+		});
+		colText.getColumn().setWidth(400);
+
+		getShell().addDisposeListener(new DisposeListener() {
+
+			@Override
+			public void widgetDisposed(DisposeEvent e) {
+				clearImages();
+			}
+		});
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite comp = (Composite) super.createDialogArea(parent);
+		maxDisplayedImageSize = 20;
+		rebuildViewer();
+
+		return comp;
+	}
+
+	private IconMatchCallback callback;
+	private String returnValue;
+	private SearchThread task;
+
+	@Override
+	protected boolean doSearch() {
+
+		// if (getSearchScopes().contains(SearchScope.TARGET_PLATFORM) ||
+		// getSearchScopes().contains(SearchScope.WORKSPACE)) {
+		if (getSearchScopes().contains(ResourceSearchScope.TARGET_PLATFORM)) {
+			return false;
+		} else {
+			Timer timer = new Timer(true);
+
+			if (callback != null) {
+				callback.cancel = true;
+			}
+			if (task != null) {
+				task.cancel();
+			}
+			task = null;
+
+			clearImages();
+
+			callback = new IconMatchCallback((IObservableList) getViewer().getInput());
+			FilterEx filter = new FilterEx(project, getFilterTextBox().getText());
+			filter.setSearchScope(getSearchScopes());
+			filter.setBundles(getFilterBundles());
+			filter.setLocations(getFilterLocations());
+			filter.setPackages(getFilterPackages());
+			filter.setIncludeNonBundles(includeNonBundles);
+			task = new SearchThread(callback, filter);
+			timer.schedule(task, 500);
+			// }
+			return true;
+		}
+	}
+
+	private void clearImages() {
+		for (Image img : icons.values()) {
+			img.dispose();
+		}
+		icons.clear();
+	}
+
+	@Override
+	protected void okPressed() {
+		returnValue = null;
+		IFile file = getSelectedIfile();
+		if (file != null) {
+			String installLocation = null;
+			if (file instanceof ContributionDataFile) {
+				ContributionDataFile cdf = (ContributionDataFile) file;
+				installLocation = cdf.getContributionData().installLocation;
+
+			}
+			file = checkResourceAccessible(file, installLocation);
+			if (file != null) {
+				String bundle = getBundle(file);
+				String uri;
+				uri = "platform:/plugin/" + bundle + "/" + file.getProjectRelativePath().toString(); //$NON-NLS-1$ //$NON-NLS-2$
+				returnValue = uri;
+				super.okPressed();
+			}
+		}
+	}
+
+	private class IconMatchCallback {
+		private volatile boolean cancel;
+		private IObservableList list;
+
+		private IconMatchCallback(IObservableList list) {
+			this.list = list;
+		}
+
+		public void match(final IFile file, final String installLocation) {
+			if (!cancel) {
+				list.getRealm().exec(new Runnable() {
+
+					@Override
+					public void run() {
+						Entry entry = new Entry();
+						entry.file = file;
+						entry.installLocation = installLocation;
+						list.add(entry);
+					}
+				});
+			}
+		}
+	}
+
+	private static class SearchThread extends TimerTask {
+		private final IconMatchCallback callback;
+		private final StringMatcher matcherGif;
+		private final StringMatcher matcherJpg;
+		private final StringMatcher matcherPng;
+		private FilterEx filter;
+		private boolean includeNonBundles;
+
+		public SearchThread(IconMatchCallback callback, FilterEx filter) {
+			this.matcherGif = new StringMatcher("*" + filter.namePattern + "*.gif", true, false); //$NON-NLS-1$//$NON-NLS-2$
+			this.matcherJpg = new StringMatcher("*" + filter.namePattern + "*.jpg", true, false); //$NON-NLS-1$//$NON-NLS-2$
+			this.matcherPng = new StringMatcher("*" + filter.namePattern + "*.png", true, false); //$NON-NLS-1$//$NON-NLS-2$
+			this.callback = callback;
+			this.filter = filter;
+		}
+
+		@Override
+		public void run() {
+			List<IProject> projects;
+			if (filter.getSearchScope().contains(ResourceSearchScope.TARGET_PLATFORM)) {
+				// never should be here because it is cached and not run as
+				// thread
+				return;
+			} else if (filter.getSearchScope().contains(ResourceSearchScope.WORKSPACE)) {
+				projects = Arrays.asList(filter.project.getWorkspace().getRoot().getProjects());
+			} else if (filter.getSearchScope().contains(ResourceSearchScope.PROJECT)) {
+				if (filter.getSearchScope().contains(ResourceSearchScope.REFERENCES)) {
+					projects = new ArrayList<IProject>();
+					projects.add(filter.project);
+					try {
+						for (IProject ref : filter.project.getReferencedProjects()) {
+							projects.add(ref);
+						}
+					} catch (CoreException e) {
+						e.printStackTrace();
+					}
+				} else {
+					projects = Arrays.asList(filter.project);
+				}
+			} else {
+				return;
+			}
+
+			try {
+				for (final IProject project : projects) {
+					// Only search bundles unless requested
+					if (includeNonBundles == false && filter.project.getFile("/META-INF/MANIFEST.MF").exists() == false) { //$NON-NLS-1$
+						continue;
+					}
+					project.accept(new IResourceVisitor() {
+
+						@Override
+						public boolean visit(IResource resource) throws CoreException {
+							if (callback.cancel) {
+								return false;
+							}
+
+							if (resource.getType() == IResource.FOLDER || resource.getType() == IResource.PROJECT) {
+								return true;
+							} else if (resource.getType() == IResource.FILE && !resource.isLinked()) {
+								String path = resource.getProjectRelativePath().toString();
+								if (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path)) {
+									if (E.notEmpty(filter.getPackages())) {
+										if (!filter.getPackages().contains(resource.getProjectRelativePath().removeLastSegments(1).toOSString())) {
+											return false;
+										}
+									}
+									if (E.notEmpty(filter.getLocations())) {
+										if (!filter.getLocations().contains(project.getLocation().toOSString())) {
+											return false;
+										}
+									}
+									if (E.notEmpty(filter.getBundles())) {
+										String bundle = getBundle(project);
+										if (bundle == null || !filter.getBundles().contains(bundle)) {
+											return false;
+										}
+									}
+									if (!filter.isIncludeNonBundles()) {
+										String bundle = getBundle(project);
+										if (bundle == null) {
+											return false;
+										}
+
+									}
+									callback.match((IFile) resource, project.getLocation().toOSString());
+								}
+							}
+							return false;
+						}
+
+					});
+				}
+			} catch (CoreException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	public String getValue() {
+		return returnValue;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
index eaf383a3db..7a76c3734c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
@@ -7,11 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 433408
+ *     Steven Spungin <steven@spungin.tv> - Bug 433408, 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -20,8 +21,8 @@
 
 public class AreaIconDialogEditor extends AbstractIconDialog {
 
-	public AreaIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MApplicationElement element, Messages Messages) {
-		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
+	public AreaIconDialogEditor(Shell parentShell, IEclipseContext context, IProject project, EditingDomain editingDomain, MApplicationElement element, Messages Messages) {
+		super(parentShell, context, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
 	}
 
 	@Override
@@ -39,4 +40,13 @@ protected String getDialogMessage() {
 		return Messages.AreaIconDialogEditor_DialogMessage;
 	}
 
+	@Override
+	protected String getFilterTextMessage() {
+		return "Enter text";
+	}
+
+	@Override
+	protected String getResourceNameText() {
+		return "Icon";
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
new file mode 100644
index 0000000000..470eb0aa71
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
@@ -0,0 +1,130 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * A manager for images. Features include:
+ * <ul>
+ * <li>Eliminates the need to pass in Display when creating images
+ * <li>Loading an image from a bundle
+ * <li>Cleanup of cache
+ * </ul>
+ *
+ * Images returned by this method must never be disposed of outside of this
+ * class, as placeholders are used.
+ *
+ * @author "Steven Spungin"
+ *
+ */
+public class BundleImageCache {
+
+	private Display display;
+	private ClassLoader classloader;
+	ArrayList<Image> images;
+	static private Image imgPlaceholder;
+	private IEclipseContext context;
+
+	public BundleImageCache(Display display, ClassLoader classloader) {
+		this(display, classloader, null);
+	}
+
+	public BundleImageCache(Display display, ClassLoader classloader, IEclipseContext context) {
+		this.display = display;
+		this.classloader = classloader;
+		this.context = context;
+		images = new ArrayList<Image>();
+	}
+
+	/**
+	 * Creates the image, and tracks it for a bulk dispose operation.
+	 *
+	 * @param path
+	 * @return
+	 */
+	public Image create(String path) {
+		Image img;
+		try {
+			img = new Image(display, classloader.getResourceAsStream(path));
+			images.add(img);
+		} catch (Exception e) {
+			e.printStackTrace();
+			img = getPlaceholder();
+		}
+		return img;
+	}
+
+	/**
+	 * Uses IResourcePool to obtain image. Does not track object.
+	 * 
+	 * @param key
+	 * @return
+	 */
+	public Image loadFromKey(String key) {
+		Image ret = null;
+		try {
+			ret = context.get(IResourcePool.class).getImageUnchecked(key);
+		} catch (Exception ex) {
+			ex.printStackTrace();
+		}
+		if (ret == null) {
+			ret = getPlaceholder();
+		}
+		return ret;
+	}
+
+	protected Image getPlaceholder() {
+		if (imgPlaceholder == null) {
+			imgPlaceholder = new Image(Display.getDefault(), classloader.getResourceAsStream("/icons/full/obj16/missing_image_placeholder.png")); //$NON-NLS-1$
+		}
+		return imgPlaceholder;
+	}
+
+	@Override
+	protected void finalize() throws Throwable {
+		if (imgPlaceholder != null && imgPlaceholder.isDisposed() == false) {
+			imgPlaceholder.dispose();
+		}
+	}
+
+	public void dispose() {
+		for (Iterator<Image> it = images.iterator(); it.hasNext();) {
+			Image image = it.next();
+			if (image.isDisposed() == false) {
+				image.dispose();
+			}
+			it.remove();
+		}
+	}
+
+	public Image create(String bundleId, String path) {
+		if (path.startsWith("/") == false) { //$NON-NLS-1$
+			path = "/" + path; //$NON-NLS-1$
+		}
+		Image img;
+		try {
+			img = new Image(display, new URL("platform:/plugin/" + bundleId + path).openStream()); //$NON-NLS-1$
+			images.add(img);
+		} catch (Exception e) {
+			e.printStackTrace();
+			img = getPlaceholder();
+		}
+		return img;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index 93d3ae1a32..ff07eea58c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -8,15 +8,17 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *	   Lars Vogel <lars.vogel@gmail.com> - Enhancements
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.TargetPlatformClassContributionCollector;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.TargetPlatformContributionCollector;
+
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
-import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionResultHandler;
-import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
@@ -24,46 +26,24 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StyledCellLabelProvider;
-import org.eclipse.jface.viewers.StyledString;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Image;
-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.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
 
-public class ContributionClassDialog extends TitleAreaDialog {
+public class ContributionClassDialog extends FilteredContributionDialog {
+
 	private IProject project;
-	private Image javaClassImage;
 	private MApplicationElement contribution;
 	private EditingDomain editingDomain;
-	private TableViewer viewer;
 	private EStructuralFeature feature;
 	private Messages Messages;
 
-	public ContributionClassDialog(Shell parentShell, IProject project, EditingDomain editingDomain, MApplicationElement contribution, EStructuralFeature feature, Messages Messages) {
-		super(parentShell);
+	public ContributionClassDialog(Shell parentShell, IEclipseContext context, IProject project, EditingDomain editingDomain, MApplicationElement contribution, EStructuralFeature feature, Messages Messages) {
+		super(parentShell, context);
 		this.project = project;
 		this.contribution = contribution;
 		this.editingDomain = editingDomain;
@@ -72,161 +52,76 @@ public ContributionClassDialog(Shell parentShell, IProject project, EditingDomai
 	}
 
 	@Override
-	protected boolean isResizable() {
-		return true;
+	protected Image getTitleImage() {
+		return new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newclass_wiz.png")); //$NON-NLS-1$
 	}
 
 	@Override
-	protected Control createDialogArea(Composite parent) {
-		Composite comp = (Composite) super.createDialogArea(parent);
-
-		getShell().setText(Messages.ContributionClassDialog_ShellTitle);
-		setTitle(Messages.ContributionClassDialog_DialogTitle);
-		setMessage(Messages.ContributionClassDialog_DialogMessage);
-
-		final Image titleImage = new Image(comp.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newclass_wiz.png")); //$NON-NLS-1$
-		setTitleImage(titleImage);
-
-		getShell().addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				javaClassImage.dispose();
-				titleImage.dispose();
-			}
-		});
-
-		javaClassImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/class_obj.gif")); //$NON-NLS-1$
-
-		Composite container = new Composite(comp, SWT.NONE);
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		container.setLayout(new GridLayout(2, false));
-
-		Label l = new Label(container, SWT.NONE);
-		l.setText(Messages.ContributionClassDialog_Label_Classname);
-
-		final Text t = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
-		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		t.setMessage(Messages.ContributionClassDialog_FilterText_Message);
-
-		new Label(container, SWT.NONE);
-
-		viewer = new TableViewer(container);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		viewer.getControl().setLayoutData(gd);
-		viewer.setContentProvider(new ObservableListContentProvider());
-		viewer.setLabelProvider(new StyledCellLabelProvider() {
-			@Override
-			public void update(ViewerCell cell) {
-				ContributionData data = (ContributionData) cell.getElement();
-				StyledString styledString = new StyledString(data.className, null);
-
-				if (data.bundleName != null) {
-					styledString.append(" - " + data.bundleName, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
-				}
-
-				if (data.sourceType != null) {
-					styledString.append(" - ", StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
-					styledString.append(data.sourceType + "", StyledString.COUNTER_STYLER); //$NON-NLS-1$
-				}
-
-				if (data.iconPath == null) {
-					cell.setImage(javaClassImage);
-				}
-
-				cell.setText(styledString.getString());
-				cell.setStyleRanges(styledString.getStyleRanges());
-			}
-		});
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				okPressed();
-			}
-		});
-
-		final WritableList list = new WritableList();
-		viewer.setInput(list);
-
-		final ClassContributionCollector collector = getCollector();
-
-		t.addModifyListener(new ModifyListener() {
-			private ContributionResultHandlerImpl currentResultHandler;
-
-			@Override
-			public void modifyText(ModifyEvent e) {
-				if (currentResultHandler != null) {
-					currentResultHandler.cancled = true;
+	protected void okPressed() {
+		IStructuredSelection s = (IStructuredSelection) getViewer().getSelection();
+		if (!s.isEmpty()) {
+			ContributionData cd = (ContributionData) s.getFirstElement();
+			ContributionDataFile cdf = new ContributionDataFile(cd);
+			IFile file = checkResourceAccessible(cdf, cd.installLocation);
+			if (file != null) {
+				String uri = "bundleclass://" + cd.bundleName + "/" + cd.className; //$NON-NLS-1$ //$NON-NLS-2$
+				Command cmd = SetCommand.create(editingDomain, contribution, feature, uri);
+				if (cmd.canExecute()) {
+					editingDomain.getCommandStack().execute(cmd);
+					super.okPressed();
 				}
-				list.clear();
-				currentResultHandler = new ContributionResultHandlerImpl(list);
-				Filter filter = new Filter(project, t.getText());
-				collector.findContributions(filter, currentResultHandler);
-				t.addKeyListener(new KeyAdapter() {
-					@Override
-					public void keyPressed(KeyEvent e) {
-						if (e.keyCode == SWT.ARROW_DOWN) {
-							if (viewer.getTable().getItemCount() > 0) {
-								viewer.getTable().setFocus();
-								viewer.getTable().select(0);
-							}
-						}
-					}
-				});
-				viewer.getTable().addKeyListener(new KeyAdapter() {
-					@Override
-					public void keyPressed(KeyEvent e) {
-						super.keyPressed(e);
-						if ((e.keyCode == SWT.ARROW_UP) && (viewer.getTable().getSelectionIndex() == 0)) {
-							t.setFocus();
-						}
-					}
-				});
 			}
-		});
-
-		return comp;
+		}
 	}
 
 	@Override
-	protected void okPressed() {
-		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-		if (!s.isEmpty()) {
-			ContributionData cd = (ContributionData) s.getFirstElement();
-			String uri = "bundleclass://" + cd.bundleName + "/" + cd.className; //$NON-NLS-1$ //$NON-NLS-2$
-			Command cmd = SetCommand.create(editingDomain, contribution, feature, uri);
-			if (cmd.canExecute()) {
-				editingDomain.getCommandStack().execute(cmd);
-				super.okPressed();
+	protected ClassContributionCollector getCollector() {
+		switch (getScope()) {
+		case TARGET_PLATFORM:
+		case WORKSPACE:
+			if (collector instanceof TargetPlatformContributionCollector == false) {
+				collector = TargetPlatformClassContributionCollector.getInstance();
+			}
+			break;
+		case PROJECT:
+			Bundle bundle = FrameworkUtil.getBundle(ContributionClassDialog.class);
+			BundleContext context = bundle.getBundleContext();
+			ServiceReference<?> ref = context.getServiceReference(ClassContributionCollector.class.getName());
+			if (ref != null) {
+				collector = (ClassContributionCollector) context.getService(ref);
+			} else {
+				collector = null;
 			}
+			break;
+		default:
+			collector = null;
+			break;
 		}
+		return collector;
 	}
 
-	private ClassContributionCollector getCollector() {
-		Bundle bundle = FrameworkUtil.getBundle(ContributionClassDialog.class);
-		BundleContext context = bundle.getBundleContext();
-		ServiceReference ref = context.getServiceReference(ClassContributionCollector.class.getName());
-		if (ref != null) {
-			return (ClassContributionCollector) context.getService(ref);
-		}
-		return null;
+	@Override
+	protected String getShellTitle() {
+		return Messages.ContributionClassDialog_DialogTitle;
 	}
 
-	private static class ContributionResultHandlerImpl implements ContributionResultHandler {
-		private boolean cancled = false;
-		private IObservableList list;
+	@Override
+	protected String getDialogTitle() {
+		return Messages.ContributionClassDialog_DialogTitle;
+	}
 
-		public ContributionResultHandlerImpl(IObservableList list) {
-			this.list = list;
-		}
+	@Override
+	protected String getDialogMessage() {
+		return Messages.ContributionClassDialog_DialogMessage;
+	}
 
-		@Override
-		public void result(ContributionData data) {
-			if (!cancled) {
-				list.add(data);
-			}
-		}
+	@Override
+	protected String getResourceNameText() {
+		return Messages.ContributionClassDialog_Label_Classname;
+	}
 
+	@Override
+	protected String getFilterTextMessage() {
+		return Messages.ContributionClassDialog_FilterText_Message;
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
new file mode 100644
index 0000000000..cd90c844ab
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
@@ -0,0 +1,677 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFileState;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IPathVariableManager;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IResourceProxy;
+import org.eclipse.core.resources.IResourceProxyVisitor;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourceAttributes;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.content.IContentDescription;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
+
+/**
+ * An IFile wrapper for ContributionData. This is only partially implemented for
+ * the icon search dialog.
+ *
+ * @author Steven Spungin
+ *
+ */
+public class ContributionDataFile implements IFile {
+
+	private ContributionData data;
+	private IPath path;
+
+	public ContributionDataFile(ContributionData data) {
+		this.data = data;
+		if (data.iconPath != null) {
+			this.path = Path.fromOSString(data.iconPath);
+		}
+	}
+
+	public String getBundle() {
+		return data.bundleName;
+	}
+
+	public ContributionData getContributionData() {
+		return data;
+	}
+
+	@Override
+	public IPath getProjectRelativePath() {
+		if (getContributionData().installLocation != null) {
+			return new Path(data.resourceRelativePath);
+		} else {
+			return new Path(data.iconPath);
+		}
+	}
+
+	@Override
+	public void accept(IResourceProxyVisitor visitor, int memberFlags) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void accept(IResourceProxyVisitor visitor, int depth, int memberFlags) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void accept(IResourceVisitor visitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void accept(IResourceVisitor visitor, int depth, boolean includePhantoms) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void accept(IResourceVisitor visitor, int depth, int memberFlags) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void clearHistory(IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void copy(IPath destination, boolean force, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void copy(IPath destination, int updateFlags, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void copy(IProjectDescription description, boolean force, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void copy(IProjectDescription description, int updateFlags, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public IMarker createMarker(String type) throws CoreException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public IResourceProxy createProxy() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void delete(boolean force, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void delete(int updateFlags, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void deleteMarkers(String type, boolean includeSubtypes, int depth) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public boolean exists() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public IMarker findMarker(long id) throws CoreException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public IMarker[] findMarkers(String type, boolean includeSubtypes, int depth) throws CoreException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int findMaxProblemSeverity(String type, boolean includeSubtypes, int depth) throws CoreException {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public String getFileExtension() {
+		return path.getFileExtension();
+	}
+
+	@Override
+	public long getLocalTimeStamp() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public IPath getLocation() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public URI getLocationURI() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public IMarker getMarker(long id) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public long getModificationStamp() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public IPathVariableManager getPathVariableManager() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public IContainer getParent() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Map<QualifiedName, String> getPersistentProperties() throws CoreException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getPersistentProperty(QualifiedName key) throws CoreException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public IProject getProject() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public IPath getRawLocation() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public URI getRawLocationURI() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ResourceAttributes getResourceAttributes() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Map<QualifiedName, Object> getSessionProperties() throws CoreException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Object getSessionProperty(QualifiedName key) throws CoreException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getType() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public IWorkspace getWorkspace() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public boolean isAccessible() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean isDerived() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean isDerived(int options) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean isHidden() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean isHidden(int options) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean isLinked() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean isVirtual() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean isLinked(int options) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean isLocal(int depth) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean isPhantom() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean isSynchronized(int depth) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean isTeamPrivateMember() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean isTeamPrivateMember(int options) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public void move(IPath destination, boolean force, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void move(IPath destination, int updateFlags, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void move(IProjectDescription description, boolean force, boolean keepHistory, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void move(IProjectDescription description, int updateFlags, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void refreshLocal(int depth, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void revertModificationStamp(long value) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void setDerived(boolean isDerived) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void setDerived(boolean isDerived, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void setHidden(boolean isHidden) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void setLocal(boolean flag, int depth, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public long setLocalTimeStamp(long value) throws CoreException {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setPersistentProperty(QualifiedName key, String value) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void setReadOnly(boolean readOnly) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void setResourceAttributes(ResourceAttributes attributes) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void setSessionProperty(QualifiedName key, Object value) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void setTeamPrivateMember(boolean isTeamPrivate) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void touch(IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public Object getAdapter(Class adapter) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public boolean contains(ISchedulingRule rule) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean isConflicting(ISchedulingRule rule) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public void appendContents(InputStream source, boolean force, boolean keepHistory, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void appendContents(InputStream source, int updateFlags, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void create(InputStream source, boolean force, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void create(InputStream source, int updateFlags, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void createLink(IPath localLocation, int updateFlags, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void createLink(URI location, int updateFlags, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void delete(boolean force, boolean keepHistory, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public String getCharset() throws CoreException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getCharset(boolean checkImplicit) throws CoreException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getCharsetFor(Reader reader) throws CoreException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public IContentDescription getContentDescription() throws CoreException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public InputStream getContents() throws CoreException {
+		URL url;
+		try {
+			if (path.getFileExtension().equals("jar")) {
+				ZipFile zip = new ZipFile(path.toOSString());
+				ZipEntry entry;
+				if (getContributionData().className != null) {
+					entry = zip.getEntry(getContributionData().className.replace('.', '/') + ".class"); //$NON-NLS-1$
+				} else {
+					entry = zip.getEntry(data.iconPath);
+				}
+				return zip.getInputStream(entry);
+			} else {
+				url = new URL("platform:/plugin/" + data.bundleName + "/" + data.iconPath); //$NON-NLS-1$ //$NON-NLS-2$
+				InputStream ret;
+				try {
+					ret = url.openStream();
+				} catch (Exception e) {
+					return new BufferedInputStream(new FileInputStream(data.installLocation + "/" + data.resourceRelativePath)); //$NON-NLS-1$
+				}
+				return ret;
+			}
+		} catch (MalformedURLException e) {
+			e.printStackTrace();
+			throw new CoreException(Status.CANCEL_STATUS);
+		} catch (IOException e) {
+			// perhaps not a bundle
+			// e.printStackTrace();
+			throw new CoreException(Status.CANCEL_STATUS);
+		}
+	}
+
+	@Override
+	public InputStream getContents(boolean force) throws CoreException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getEncoding() throws CoreException {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public IPath getFullPath() {
+		return path;
+	}
+
+	@Override
+	public IFileState[] getHistory(IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getName() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public boolean isReadOnly() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public void move(IPath destination, boolean force, boolean keepHistory, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void setCharset(String newCharset) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void setCharset(String newCharset, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void setContents(InputStream source, boolean force, boolean keepHistory, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void setContents(IFileState source, boolean force, boolean keepHistory, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void setContents(InputStream source, int updateFlags, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void setContents(IFileState source, int updateFlags, IProgressMonitor monitor) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
new file mode 100644
index 0000000000..e31df87457
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -0,0 +1,973 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, 424730
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Scanner;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.common.FilterEx;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionResultHandler;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
+import org.eclipse.e4.tools.emf.ui.common.ResourceSearchScope;
+import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AbstractIconDialogWithScopeAndFilter.Entry;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.TitleAreaFilterDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.TargetPlatformClassContributionCollector;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.TargetPlatformIconContributionCollector;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.NonReferencedResourceDialog;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.text.Document;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.pde.internal.core.project.PDEProject;
+import org.eclipse.pde.internal.core.text.bundle.BundleModel;
+import org.eclipse.pde.internal.core.text.bundle.ImportPackageHeader;
+import org.eclipse.pde.internal.core.text.bundle.ImportPackageObject;
+import org.eclipse.pde.internal.core.text.bundle.RequireBundleHeader;
+import org.eclipse.pde.internal.core.text.bundle.RequireBundleObject;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+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.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * Abstract base class for a find contribution dialog.<br />
+ * Includes a filter text box, scope options, and filter options.
+ *
+ * @author Steven Spungin
+ *
+ */
+public abstract class FilteredContributionDialog extends TitleAreaDialog {
+
+	private static final int MAX_RESULTS = 500;
+	private Image contributionTypeImage;
+	private TableViewer viewer;
+	private ResourceSearchScope searchScope = ResourceSearchScope.PROJECT;
+	private EnumSet<ResourceSearchScope> searchScopes = EnumSet.of(ResourceSearchScope.PROJECT);
+	// private EnumSet<SearchScope> searchScopes =
+	// EnumSet.of(SearchScope.PROJECT, SearchScope.REFERENCES);
+	protected ClassContributionCollector collector;
+	private Text textBox;
+	private Button btnFilterNone;
+	private Button btnFilterBundle;
+	private Button btnFilterPackage;
+	private List<String> filterBundles;
+	private List<String> filterPackages;
+	private Button btnFilterLocation;
+	private List<String> filterLocations;
+	private Button btnClearCache;
+	private IEclipseContext context;
+	private Composite compOptions;
+	protected boolean includeNonBundles;
+	private Label lblStatus;
+	private Button btnIncludeNoneBundle;
+	private WritableList viewerList;
+	protected BundleImageCache imageCache;
+
+	abstract protected ClassContributionCollector getCollector();
+
+	abstract protected String getFilterTextMessage();
+
+	abstract protected String getResourceNameText();
+
+	abstract protected String getDialogMessage();
+
+	abstract protected String getDialogTitle();
+
+	abstract protected String getShellTitle();
+
+	private static class ContributionResultHandlerImpl implements ContributionResultHandler {
+		private boolean cancled = false;
+		private IObservableList list;
+
+		public ContributionResultHandlerImpl(IObservableList list) {
+			this.list = list;
+		}
+
+		@Override
+		public void result(ContributionData data) {
+			if (!cancled) {
+				list.add(data);
+			}
+		}
+
+		@Override
+		public void moreResults(int hint, Filter filter) {
+			FilteredContributionDialog dlg = (FilteredContributionDialog) filter.userData;
+			// dlg.setStatus("More than " + filter.maxResults +
+			// " items were found and have not been displayed");
+			if (hint != 0) {
+				dlg.setMessage("More than " + filter.maxResults + " items were found.  Not all results have been displayed.");
+			} else {
+				dlg.setMessage("");
+			}
+		}
+	}
+
+	@Override
+	protected Control createContents(Composite parent) {
+		Control ret = super.createContents(parent);
+		textBox.notifyListeners(SWT.Modify, new Event());
+		return ret;
+	}
+
+	public FilteredContributionDialog(Shell parentShell, IEclipseContext context) {
+		super(parentShell);
+		this.context = context;
+		imageCache = new BundleImageCache(context.get(Display.class), getClass().getClassLoader());
+	}
+
+	public void setStatus(final String message) {
+		getShell().getDisplay().asyncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				lblStatus.setText(message);
+			}
+		});
+	}
+
+	@Override
+	protected void createButtonsForButtonBar(Composite parent) {
+		super.createButtonsForButtonBar(parent);
+		((GridLayout) parent.getLayout()).numColumns = 4;
+
+		btnClearCache = new Button(parent, SWT.PUSH);
+		btnClearCache.setText("Clear Model Cache");
+		btnClearCache.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				getCollector().clearModelCache();
+			}
+		});
+
+		btnClearCache.moveAbove(getButton(0));
+
+		lblStatus = new Label(parent, SWT.NONE);
+		lblStatus.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+		lblStatus.setText(""); //$NON-NLS-1$
+		lblStatus.moveAbove(btnClearCache);
+
+		// This is called here instead of create contents because btnClearCache
+		// is referenced in updateUiState.
+		updateUiState();
+	}
+
+	// TODO add results found (and/or more indicator)
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite comp = (Composite) super.createDialogArea(parent);
+		getShell().addDisposeListener(new DisposeListener() {
+
+			@Override
+			public void widgetDisposed(DisposeEvent e) {
+				imageCache.dispose();
+
+				if (contributionTypeImage.isDisposed() == false) {
+					contributionTypeImage.dispose();
+				}
+				if (getTitleImageLabel().getImage() != null && getTitleImage().isDisposed() == false) {
+					getTitleImageLabel().getImage().dispose();
+				}
+			}
+		});
+
+		getShell().setText(getShellTitle());
+		setTitle(getDialogTitle());
+		setMessage(getDialogMessage());
+
+		final Image titleImage = getTitleImage();
+		setTitleImage(titleImage);
+
+		// TODO param or context
+		contributionTypeImage = imageCache.create("/icons/full/obj16/class_obj.gif"); //$NON-NLS-1$
+
+		compOptions = new Composite(comp, SWT.NONE);
+		compOptions.setLayoutData(new GridData(GridData.FILL_BOTH));
+		compOptions.setLayout(new GridLayout(2, false));
+
+		createOptions(compOptions);
+
+		Label l = new Label(compOptions, SWT.NONE);
+		l.setText(getResourceNameText());
+
+		textBox = new Text(compOptions, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		textBox.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		textBox.setMessage(getFilterTextMessage());
+
+		new Label(compOptions, SWT.NONE);
+
+		rebuildViewer();
+
+		collector = getCollector();
+
+		textBox.addModifyListener(new ModifyListener() {
+			private ContributionResultHandlerImpl currentResultHandler;
+
+			@Override
+			public void modifyText(ModifyEvent e) {
+				if (currentResultHandler != null) {
+					currentResultHandler.cancled = true;
+				}
+				viewerList.clear();
+
+				setMessage(""); //$NON-NLS-1$
+				if (doSearch() == true) {
+					return;
+				}
+
+				currentResultHandler = new ContributionResultHandlerImpl(viewerList);
+				FilterEx filter;
+				if (searchScopes.contains(ResourceSearchScope.PROJECT)) {
+					filter = new FilterEx(context.get(IProject.class), textBox.getText());
+				} else {
+					// filter = new FilterEx(null, textBox.getText());
+					filter = new FilterEx(context.get(IProject.class), textBox.getText());
+				}
+				filter.maxResults = MAX_RESULTS;
+				filter.userData = FilteredContributionDialog.this;
+				filter.setBundles(filterBundles);
+				filter.setPackages(filterPackages);
+				filter.setLocations(filterLocations);
+				filter.setSearchScope(searchScopes);
+				filter.setIncludeNonBundles(includeNonBundles);
+				collector.findContributions(filter, currentResultHandler);
+				textBox.addKeyListener(new KeyAdapter() {
+					@Override
+					public void keyPressed(KeyEvent e) {
+						if (e.keyCode == SWT.ARROW_DOWN) {
+							if (viewer.getTable().getItemCount() > 0) {
+								viewer.getTable().setFocus();
+								viewer.getTable().select(0);
+							}
+						}
+					}
+				});
+				viewer.getTable().addKeyListener(new KeyAdapter() {
+					@Override
+					public void keyPressed(KeyEvent e) {
+						super.keyPressed(e);
+						if ((e.keyCode == SWT.ARROW_UP) && (viewer.getTable().getSelectionIndex() == 0)) {
+							textBox.setFocus();
+						}
+					}
+				});
+			}
+		});
+
+		return comp;
+	}
+
+	protected Image getTitleImage() {
+		return imageCache.create("/icons/full/wizban/newsearch_wiz.gif"); //$NON-NLS-1$
+	}
+
+	protected void createOptions(Composite compOptions) {
+		{
+			Label lblScope = new Label(compOptions, SWT.NONE);
+			lblScope.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			lblScope.setText("Scope");
+
+			Composite compScope = new Composite(compOptions, SWT.NONE);
+			compScope.setLayoutData(new GridData(SWT.BEGINNING, SWT.TOP, false, false));
+			compScope.setLayout(new RowLayout());
+
+			final Button btnScopeProject = new Button(compScope, SWT.RADIO);
+			btnScopeProject.setText("Project Only");
+			btnScopeProject.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (btnScopeProject.getSelection()) {
+						searchScope = ResourceSearchScope.PROJECT;
+						searchScopes = EnumSet.of(ResourceSearchScope.PROJECT);
+						updateUiState();
+						getCollector();
+						refreshSearch();
+					}
+				}
+			});
+			btnScopeProject.setSelection(searchScopes.contains(ResourceSearchScope.PROJECT) && !searchScopes.contains(ResourceSearchScope.REFERENCES));
+
+			final Button btnProjectAndReferences = new Button(compScope, SWT.RADIO);
+			btnProjectAndReferences.setText("Project and References");
+			btnProjectAndReferences.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (btnProjectAndReferences.getSelection()) {
+						searchScope = ResourceSearchScope.PROJECT;
+						searchScopes = EnumSet.of(ResourceSearchScope.PROJECT, ResourceSearchScope.REFERENCES);
+						updateUiState();
+						getCollector();
+						refreshSearch();
+					}
+				}
+			});
+			btnProjectAndReferences.setSelection(searchScopes.contains(ResourceSearchScope.PROJECT) && searchScopes.contains(ResourceSearchScope.REFERENCES));
+
+			final Button btnScopeWorkspace = new Button(compScope, SWT.RADIO);
+			btnScopeWorkspace.setText("Workspace");
+			btnScopeWorkspace.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (btnScopeWorkspace.getSelection()) {
+						searchScope = ResourceSearchScope.WORKSPACE;
+						searchScopes = EnumSet.of(ResourceSearchScope.WORKSPACE);
+						updateUiState();
+						getCollector();
+						refreshSearch();
+					}
+				}
+			});
+			btnScopeWorkspace.setSelection(searchScopes.contains(ResourceSearchScope.WORKSPACE));
+
+			final Button btnScopeTargetPlatform = new Button(compScope, SWT.RADIO);
+			btnScopeTargetPlatform.setText("Target Platform");
+			btnScopeTargetPlatform.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (btnScopeTargetPlatform.getSelection()) {
+						searchScope = ResourceSearchScope.TARGET_PLATFORM;
+						searchScopes = EnumSet.of(ResourceSearchScope.TARGET_PLATFORM);
+						updateUiState();
+						getCollector();
+						refreshSearch();
+					}
+				}
+			});
+			btnScopeTargetPlatform.setSelection(searchScopes.contains(ResourceSearchScope.TARGET_PLATFORM));
+		}
+
+		{
+			Label lblFilter = new Label(compOptions, SWT.NONE);
+			lblFilter.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			lblFilter.setText("Scope Filter");
+
+			Composite compFilter = new Composite(compOptions, SWT.NONE);
+			compFilter.setLayoutData(new GridData(SWT.BEGINNING, SWT.TOP, false, false));
+			compFilter.setLayout(new RowLayout());
+
+			btnFilterNone = new Button(compFilter, SWT.CHECK);
+			btnFilterNone.setText("None");
+			btnFilterNone.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (btnFilterNone.getSelection()) {
+						removeFilters();
+					}
+				}
+			});
+
+			btnFilterBundle = new Button(compFilter, SWT.CHECK);
+			btnFilterBundle.setText("Bundle");
+			btnFilterBundle.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (btnFilterBundle.getSelection()) {
+						showBundleFilter();
+					} else {
+						filterBundles = null;
+						refreshSearch();
+						updateUiState();
+					}
+				}
+			});
+
+			btnFilterPackage = new Button(compFilter, SWT.CHECK);
+			btnFilterPackage.setText("Package");
+			btnFilterPackage.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (btnFilterPackage.getSelection()) {
+						showPackageFilter();
+					} else {
+						filterPackages = null;
+						refreshSearch();
+						updateUiState();
+					}
+				}
+			});
+
+			btnFilterLocation = new Button(compFilter, SWT.CHECK);
+			btnFilterLocation.setText("Location");
+			btnFilterLocation.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (btnFilterLocation.getSelection()) {
+						showLocationFilter();
+					} else {
+						filterLocations = null;
+						refreshSearch();
+						updateUiState();
+					}
+				}
+			});
+
+		}
+		{
+			Label lblIncludeNoneBundle = new Label(compOptions, SWT.NONE);
+			lblIncludeNoneBundle.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			lblIncludeNoneBundle.setText("Non Bundles");
+
+			btnIncludeNoneBundle = new Button(compOptions, SWT.CHECK);
+			btnIncludeNoneBundle.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			btnIncludeNoneBundle.setText("");
+			btnIncludeNoneBundle.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					includeNonBundles = btnIncludeNoneBundle.getSelection();
+					refreshSearch();
+				}
+			});
+		}
+	}
+
+	/**
+	 *
+	 * @return false if default search should be performed, or true if virtual
+	 *         function will handle
+	 */
+	protected boolean doSearch() {
+		return false;
+	}
+
+	protected void updateUiState() {
+		btnFilterNone.setSelection(E.isEmpty(filterBundles) && E.isEmpty(filterPackages) && E.isEmpty(filterLocations));
+		btnFilterBundle.setSelection(E.notEmpty(filterBundles));
+		btnFilterPackage.setSelection(E.notEmpty(filterPackages));
+		btnFilterLocation.setSelection(E.notEmpty(filterLocations));
+
+		// original (default) contribution filter does not support this
+		// filtering API
+		boolean enabled = !searchScopes.contains(ResourceSearchScope.PROJECT);
+		btnFilterNone.setEnabled(enabled);
+		btnFilterBundle.setEnabled(enabled);
+		btnFilterLocation.setEnabled(enabled);
+		btnFilterPackage.setEnabled(enabled);
+		btnClearCache.setEnabled(enabled);
+		btnIncludeNoneBundle.setEnabled(enabled);
+	}
+
+	protected void removeFilters() {
+		filterBundles = null;
+		setFilterPackages(null);
+		filterLocations = null;
+		refreshSearch();
+		updateUiState();
+	}
+
+	@Override
+	protected boolean isResizable() {
+		return true;
+	}
+
+	public List<String> getFilterPackages() {
+		return filterPackages;
+	}
+
+	public void setFilterPackages(List<String> filterPackages) {
+		this.filterPackages = filterPackages;
+	}
+
+	public List<String> getFilterLocations() {
+		return filterLocations;
+	}
+
+	public void setFilterLocations(List<String> filterLocations) {
+		this.filterLocations = filterLocations;
+	}
+
+	public List<String> getFilterBundles() {
+		return filterBundles;
+	}
+
+	public void setFilterBundles(List<String> filterBundles) {
+		this.filterBundles = filterBundles;
+	}
+
+	protected void refreshSearch() {
+		textBox.notifyListeners(SWT.Modify, new Event());
+	}
+
+	protected void showBundleFilter() {
+		final Collection<String> bundleIds;
+		// TODO make HasBundles an interface so we are not tied to
+		// implementation
+		if (getCollector() instanceof TargetPlatformClassContributionCollector) {
+			bundleIds = TargetPlatformClassContributionCollector.getInstance().getBundleIds();
+		} else if (getCollector() instanceof TargetPlatformIconContributionCollector) {
+			bundleIds = TargetPlatformIconContributionCollector.getInstance().getBundleIds();
+		} else {
+			return;
+		}
+
+		final ArrayList<String> sorted = new ArrayList<String>(bundleIds);
+		Collections.sort(sorted);
+
+		TitleAreaFilterDialog dlg = new TitleAreaFilterDialog(getShell(), new ColumnLabelProvider()) {
+			@Override
+			protected Control createContents(Composite parent) {
+				Control ret = super.createContents(parent);
+				getViewer().setInput(sorted);
+				setMessage("Select the bundle to filter on.");
+				setTitle("Bundle Filter");
+				getShell().setText("Bundle Filter");
+				try {
+					setTitleImage(imageCache.create("/icons/full/wizban/plugin_wiz.gif"));
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+				return ret;
+			}
+		};
+		if (dlg.open() == Dialog.OK) {
+			setFilterBundles((List<String>) dlg.asList());
+			refreshSearch();
+		}
+		updateUiState();
+	}
+
+	protected void showPackageFilter() {
+		final Collection<String> packages;
+		// TODO make HasPackages an interface so we are not tied to
+		// implementation
+		if (getCollector() instanceof TargetPlatformClassContributionCollector) {
+			packages = TargetPlatformClassContributionCollector.getInstance().getPackages();
+		} else if (getCollector() instanceof TargetPlatformIconContributionCollector) {
+			packages = TargetPlatformIconContributionCollector.getInstance().getPackages();
+		} else {
+			return;
+		}
+
+		final ArrayList<String> sorted = new ArrayList<String>(packages);
+		Collections.sort(sorted);
+
+		TitleAreaFilterDialog dlg = new TitleAreaFilterDialog(getShell(), new ColumnLabelProvider()) {
+			@Override
+			protected Control createContents(Composite parent) {
+				Control ret = super.createContents(parent);
+				getViewer().setInput(sorted);
+				setMessage("Select the package to filter on.");
+				setTitle("Package Filter");
+				getShell().setText("Package Filter");
+				setTitleImage(imageCache.create("/icons/full/wizban/package_wiz.png"));
+				return ret;
+			}
+		};
+		if (dlg.open() == Dialog.OK) {
+			setFilterPackages((List<String>) dlg.asList());
+			refreshSearch();
+		}
+		updateUiState();
+	}
+
+	public ResourceSearchScope getScope() {
+		return searchScope;
+	}
+
+	public void setScope(ResourceSearchScope scope) {
+		this.searchScope = scope;
+	}
+
+	public void setCollector(ClassContributionCollector collector) {
+		this.collector = collector;
+	}
+
+	protected void showLocationFilter() {
+		final Collection<String> locations;
+		// TODO make HasLocations an interface so we are not tied to
+		// implementation
+		if (getCollector() instanceof TargetPlatformClassContributionCollector) {
+			locations = TargetPlatformClassContributionCollector.getInstance().getLocations();
+		} else if (getCollector() instanceof TargetPlatformIconContributionCollector) {
+			locations = TargetPlatformIconContributionCollector.getInstance().getLocations();
+		} else {
+			return;
+		}
+
+		// add all parent paths
+		final HashSet<String> parentLocations = new HashSet<String>();
+		for (String location : locations) {
+			if (location.endsWith(".jar")) {
+				int index = location.lastIndexOf(File.separator);
+				if (index >= 0) {
+					location = location.substring(0, index);
+					parentLocations.add(location);
+				}
+			} else {
+				parentLocations.add(location);
+			}
+		}
+
+		final ArrayList<String> sorted = new ArrayList<String>(parentLocations);
+		Collections.sort(sorted);
+
+		TitleAreaFilterDialog dlg = new TitleAreaFilterDialog(getShell(), new ColumnLabelProvider()) {
+			@Override
+			protected Control createContents(Composite parent) {
+				Control ret = super.createContents(parent);
+				getViewer().setInput(sorted);
+				setMessage("Select the location to filter on.");
+				setTitle("Location Filter");
+				getShell().setText("Location Filter");
+				setTitleImage(imageCache.create("/icons/full/wizban/location_wiz.png"));
+				return ret;
+			}
+		};
+		if (dlg.open() == Dialog.OK) {
+			setFilterLocations((List<String>) dlg.asList());
+			refreshSearch();
+		}
+		updateUiState();
+	}
+
+	protected void rebuildViewer() {
+
+		viewerList = new WritableList();
+
+		TableViewer oldViewer = viewer;
+		viewer = new TableViewer(compOptions, SWT.FULL_SELECTION);
+		if (oldViewer != null) {
+			viewer.getTable().moveAbove(oldViewer.getTable());
+			oldViewer.getTable().dispose();
+		}
+		GridData gd = new GridData(GridData.FILL_BOTH);
+		viewer.getControl().setLayoutData(gd);
+		viewer.setContentProvider(new ObservableListContentProvider());
+		viewer.setLabelProvider(new StyledCellLabelProvider() {
+			@Override
+			public void update(ViewerCell cell) {
+				ContributionData data;
+				if (cell.getElement() instanceof ContributionData) {
+					data = (ContributionData) cell.getElement();
+				} else if (cell.getElement() instanceof ContributionDataFile) {
+					data = ((ContributionDataFile) cell.getElement()).getContributionData();
+				} else {
+					return;
+				}
+
+				StyledString styledString = new StyledString();
+				if (data.className != null) {
+					styledString.append(data.className, null);
+				}
+
+				if (data.bundleName != null) {
+					styledString.append(" - " + data.bundleName, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+				} else if (data.installLocation != null) {
+					styledString.append(" - " + data.installLocation, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+				}
+
+				if (data.sourceType != null) {
+					styledString.append(" - ", StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+					styledString.append(data.sourceType + "", StyledString.COUNTER_STYLER); //$NON-NLS-1$
+				}
+
+				if (data.iconPath == null) {
+					cell.setImage(contributionTypeImage);
+				}
+
+				cell.setText(styledString.getString());
+				cell.setStyleRanges(styledString.getStyleRanges());
+			}
+		});
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+
+			@Override
+			public void doubleClick(DoubleClickEvent event) {
+				okPressed();
+			}
+		});
+
+		viewer.setInput(viewerList);
+
+		if (oldViewer != null) {
+			getViewer().getTable().getParent().layout(true, true);
+			getViewer().getTable().getParent().redraw();
+		}
+	}
+
+	public TableViewer getViewer() {
+		return viewer;
+	}
+
+	public void setViewer(TableViewer viewer) {
+		this.viewer = viewer;
+	}
+
+	protected Text getFilterTextBox() {
+		return textBox;
+	}
+
+	public ResourceSearchScope getSearchScope() {
+		return searchScope;
+	}
+
+	protected IFile getSelectedIfile() {
+		IStructuredSelection s = (IStructuredSelection) getViewer().getSelection();
+		if (!s.isEmpty()) {
+			Object selected = s.getFirstElement();
+			if (selected instanceof ContributionData) {
+				ContributionData contributionData = (ContributionData) selected;
+				return new ContributionDataFile(contributionData);
+			} else if (selected instanceof IFile) {
+				return (IFile) selected;
+			} else if (selected instanceof Entry) {
+				Entry entry = (Entry) selected;
+				ContributionData cd = new ContributionData(null, null, "Java", entry.file.getFullPath().toOSString());
+				cd.installLocation = entry.installLocation;
+				cd.resourceRelativePath = entry.file.getProjectRelativePath().toOSString();
+				return new ContributionDataFile(cd);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns non null if the selected resource is accessible from the current
+	 * project<br />
+	 * Restrictions may include non-existent file, non exported class, or the
+	 * resource is in a location that is not a bundle.<br />
+	 * The function, through user intervention, may find a way to resolve the
+	 * file and return a resolution.
+	 *
+	 * @param file
+	 * @param installLocation
+	 * @return The original file, a fixed-up (copied or referred) file, or null.
+	 */
+	protected IFile checkResourceAccessible(final IFile file, String installLocation) {
+
+		// Obviously null is not accessible
+		if (file == null) {
+			return null;
+		}
+
+		// Not a bundle
+		final String bundle = getBundle(file);
+		if (bundle == null) {
+			NonReferencedResourceDialog dlg = new NonReferencedResourceDialog(getShell(), context.get(IProject.class), bundle, file, installLocation, context) {
+				@Override
+				public String getMessage() {
+					String message = "The resource is not contained in a bundle.";
+					// message +=
+					// "\nTo access during runtime, you need to copy the resource into this project, or into a referenced project.";
+					// message +=
+					// "\nYou can also convert the resource's project into a bundle and then import reference the bundle";
+					return message;
+				}
+			};
+			if (dlg.open() == IDialogConstants.OK_ID) {
+				return dlg.getResult();
+			} else {
+				return null;
+			}
+
+		}
+
+		// Reference by current project
+		IProject currentProject = context.get(IProject.class);
+		if (currentProject != null && !getBundle(currentProject).equals(bundle)) {
+			boolean found = false;
+			// search the current project's manifest for require-bundle
+			try {
+				BundleModel model = loadBundleModel(currentProject);
+
+				RequireBundleHeader rbh = (RequireBundleHeader) model.getBundle().getManifestHeader("Require-Bundle");
+				if (rbh != null) {
+					for (RequireBundleObject item : rbh.getRequiredBundles()) {
+						if (item.getValue().equals(bundle)) {
+							found = true;
+							break;
+						}
+					}
+				}
+				// search the current project's manifest for import-package
+				if (!found) {
+					if (file instanceof ContributionDataFile) {
+						ContributionDataFile cdFile = (ContributionDataFile) file;
+						String className = cdFile.getContributionData().className;
+						if (className != null) {
+							String pakage = NonReferencedResourceDialog.getPackageFromClassName(className);
+							ImportPackageHeader iph = (ImportPackageHeader) model.getBundle().getManifestHeader("Import-Package");
+							if (iph != null) {
+								for (ImportPackageObject item : iph.getPackages()) {
+									if (item.getValue().equals(pakage)) {
+										found = true;
+										break;
+									}
+								}
+							}
+						}
+					}
+				}
+			} catch (Exception e) {
+			}
+
+			if (!found) {
+				NonReferencedResourceDialog dlg = new NonReferencedResourceDialog(getShell(), context.get(IProject.class), bundle, file, installLocation, context);
+				if (dlg.open() == IDialogConstants.OK_ID) {
+					return dlg.getResult();
+				} else {
+					return null;
+				}
+			}
+		}
+		return file;
+	}
+
+	public BundleModel loadBundleModel(IProject currentProject) throws CoreException {
+		Document document = new Document();
+		String content = new Scanner(PDEProject.getManifest(currentProject).getContents()).useDelimiter("\\Z").next();
+		document.set(content);
+		BundleModel model = new BundleModel(document, false);
+		model.load();
+		return model;
+	}
+
+	protected EnumSet<ResourceSearchScope> getSearchScopes() {
+		return searchScopes;
+	}
+
+	static public String getBundle(IFile file) {
+
+		if (file instanceof ContributionDataFile) {
+			ContributionDataFile cdFile = (ContributionDataFile) file;
+			String ret = cdFile.getBundle();
+			if (ret != null) {
+				return ret;
+			} else if (cdFile.getContributionData().installLocation != null) {
+				return getBundle(cdFile.getContributionData().installLocation);
+			} else {
+				return null;
+			}
+		}
+
+		IProject project = file.getProject();
+		return getBundle(project);
+	}
+
+	static String getBundle(IProject project) {
+		IFile f = project.getFile("/META-INF/MANIFEST.MF"); //$NON-NLS-1$
+
+		if (f != null && f.exists()) {
+			BufferedReader r = null;
+			try {
+				InputStream s = f.getContents();
+				r = new BufferedReader(new InputStreamReader(s));
+				String line;
+				while ((line = r.readLine()) != null) {
+					if (line.startsWith("Bundle-SymbolicName:")) { //$NON-NLS-1$
+						int start = line.indexOf(':');
+						int end = line.indexOf(';');
+						if (end == -1) {
+							end = line.length();
+						}
+						return line.substring(start + 1, end).trim();
+					}
+				}
+			} catch (CoreException e) {
+				e.printStackTrace();
+			} catch (IOException e) {
+				e.printStackTrace();
+			} finally {
+				if (r != null) {
+					try {
+						r.close();
+					} catch (IOException e) {
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Searches the directory for a manifest and parses the symbolic name.
+	 *
+	 * @param rootDirectory
+	 * @return
+	 */
+	public static String getBundle(String rootDirectory) {
+		File f = new File(new File(rootDirectory), "/META-INF/MANIFEST.MF"); //$NON-NLS-1$
+
+		if (f.exists()) {
+			BufferedReader r = null;
+			try {
+				InputStream s = new FileInputStream(f);
+				r = new BufferedReader(new InputStreamReader(s));
+				String line;
+				while ((line = r.readLine()) != null) {
+					if (line.startsWith("Bundle-SymbolicName:")) { //$NON-NLS-1$
+						int start = line.indexOf(':');
+						int end = line.indexOf(';');
+						if (end == -1) {
+							end = line.length();
+						}
+						return line.substring(start + 1, end).trim();
+					}
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			} finally {
+				if (r != null) {
+					try {
+						r.close();
+					} catch (IOException e) {
+					}
+				}
+			}
+		}
+		return null;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
index 3358369558..cc1fb68013 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
@@ -19,8 +21,8 @@
 
 public class MenuIconDialogEditor extends AbstractIconDialog {
 
-	public MenuIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MMenu element, Messages Messages) {
-		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
+	public MenuIconDialogEditor(Shell parentShell, IEclipseContext context, IProject project, EditingDomain editingDomain, MMenu element, Messages Messages) {
+		super(parentShell, context, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
index 2d5ad184e4..0a91fe07ed 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
@@ -19,8 +21,8 @@
 
 public class MenuItemIconDialogEditor extends AbstractIconDialog {
 
-	public MenuItemIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MMenuItem element, Messages Messages) {
-		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
+	public MenuItemIconDialogEditor(Shell parentShell, IEclipseContext context, IProject project, EditingDomain editingDomain, MMenuItem element, Messages Messages) {
+		super(parentShell, context, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
index 92814cd1cd..abce02f93e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
+******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -19,8 +21,8 @@
 
 public class PartDescriptorIconDialogEditor extends AbstractIconDialog {
 
-	public PartDescriptorIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPartDescriptor element, Messages Messages) {
-		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
+	public PartDescriptorIconDialogEditor(Shell parentShell, IEclipseContext context, IProject project, EditingDomain editingDomain, MPartDescriptor element, Messages Messages) {
+		super(parentShell, context, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
index 8f283343ed..ed311dd75d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -19,8 +21,8 @@
 
 public class PartIconDialogEditor extends AbstractIconDialog {
 
-	public PartIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPart element, Messages Messages) {
-		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
+	public PartIconDialogEditor(Shell parentShell, IEclipseContext context, IProject project, EditingDomain editingDomain, MPart element, Messages Messages) {
+		super(parentShell, context, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
index 189632c316..81bf9fefcb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -19,8 +21,8 @@
 
 public class PerspectiveIconDialogEditor extends AbstractIconDialog {
 
-	public PerspectiveIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPerspective element, Messages Messages) {
-		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
+	public PerspectiveIconDialogEditor(Shell parentShell, IEclipseContext context, IProject project, EditingDomain editingDomain, MPerspective element, Messages Messages) {
+		super(parentShell, context, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
index 242fba0f00..9d6e1089fd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
@@ -19,8 +21,8 @@
 
 public class ToolItemIconDialogEditor extends AbstractIconDialog {
 
-	public ToolItemIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MToolItem element, Messages Messages) {
-		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
+	public ToolItemIconDialogEditor(Shell parentShell, IEclipseContext context, IProject project, EditingDomain editingDomain, MToolItem element, Messages Messages) {
+		super(parentShell, context, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
index 1a0fbaffd1..dc22bb1777 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -19,8 +21,8 @@
 
 public class WindowIconDialogEditor extends AbstractIconDialog {
 
-	public WindowIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MWindow element, Messages Messages) {
-		super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
+	public WindowIconDialogEditor(Shell parentShell, IEclipseContext context, IProject project, EditingDomain editingDomain, MWindow element, Messages Messages) {
+		super(parentShell, context, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
new file mode 100644
index 0000000000..66f14b4717
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others. All rights reserved. This
+ * program and the accompanying materials are made available under the 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: Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.BundleClassDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.IconDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.UriDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.UriDialogType;
+
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.viewers.DialogCellEditor;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * A cell editor that when selected offers the option to edit, view, or goto the
+ * item.
+ *
+ * @author Steven Spungin
+ *
+ */
+public class ContributionUriCellEditor extends DialogCellEditor {
+
+	private UriDialog dlg;
+
+	public ContributionUriCellEditor(Composite parent, int style, IEclipseContext context, UriDialogType dialogType) {
+		super(parent, style);
+		switch (dialogType) {
+		case ICON:
+			dlg = new IconDialog(parent.getShell(), context);
+			break;
+		case BUNDLECLASS:
+		default:
+			dlg = new BundleClassDialog(parent.getShell(), context);
+			break;
+		}
+	}
+
+	@Override
+	protected Object openDialogBox(Control cellEditorWindow) {
+		dlg.setUri((String) getValue());
+		if (dlg.open() == Dialog.OK) {
+			return dlg.getUri();
+		} else {
+			return getValue();
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
new file mode 100644
index 0000000000..3dbba0f5f3
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import org.eclipse.core.commands.ParameterizedCommand;
+import org.eclipse.core.commands.common.NotDefinedException;
+import org.eclipse.e4.core.commands.ECommandService;
+import org.eclipse.e4.core.commands.EHandlerService;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+
+/**
+ * A tool item that displays commands in a drop down menu. The enabled state is
+ * set by querying the handler when the menu is opened.
+ *
+ * @author Steven Spungin
+ *
+ */
+public class E4ToolItemMenu {
+
+	public static final String SEPARATOR = "~separator~"; //$NON-NLS-1$
+	private IEclipseContext context;
+	private ArrayList<String> commandIds = new ArrayList<String>();
+	private Menu menu;
+	private ECommandService commandService;
+	private EHandlerService handlerService;
+	private ToolItem toolItem;
+
+	public E4ToolItemMenu(final ToolBar parent, IEclipseContext context) {
+
+		toolItem = new ToolItem(parent, SWT.DROP_DOWN);
+		this.context = context;
+		commandService = this.context.get(ECommandService.class);
+		handlerService = this.context.get(EHandlerService.class);
+
+		menu = new Menu(parent.getShell(), SWT.POP_UP);
+
+		toolItem.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent event) {
+				// if (event.detail == SWT.ARROW) {
+				Rectangle rect = toolItem.getBounds();
+				Point pt = new Point(rect.x, rect.y + rect.height);
+				pt = parent.toDisplay(pt);
+				menu.setLocation(pt.x, pt.y);
+				menu.setVisible(true);
+				for (MenuItem mi : menu.getItems()) {
+					if (mi.getData() instanceof ParameterizedCommand) {
+						ParameterizedCommand cmd = (ParameterizedCommand) mi.getData();
+						mi.setEnabled(handlerService.canExecute(cmd));
+					}
+				}
+				// }
+			};
+		});
+	}
+
+	public void addCommands(Collection<String> commandIds) {
+		this.commandIds.addAll(commandIds);
+
+		for (String id : commandIds) {
+			if (id.equals(SEPARATOR)) {
+				new MenuItem(menu, SWT.SEPARATOR);
+			} else {
+				ParameterizedCommand myCommand = commandService.createCommand(id, null);
+				if (myCommand != null) {
+					final MenuItem item = new MenuItem(menu, SWT.PUSH);
+					try {
+						item.setText(myCommand.getName());
+					} catch (NotDefinedException e1) {
+						item.setText(id);
+						e1.printStackTrace();
+					}
+					item.setData(myCommand);
+					item.addSelectionListener(new SelectionAdapter() {
+
+						@Override
+						public void widgetSelected(SelectionEvent e) {
+							ParameterizedCommand cmd = (ParameterizedCommand) item.getData();
+							handlerService.executeHandler(cmd);
+						}
+
+					});
+				}
+			}
+		}
+	}
+
+	public ToolItem getToolItem() {
+		return toolItem;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
index 4c30a06e28..68a7c6dd1b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
@@ -6,57 +6,126 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.UriDialogType;
+
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.util.Policy;
 import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.CheckboxCellEditor;
 import org.eclipse.jface.viewers.EditingSupport;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
 
+// Restrictions: Only handles boolean and String types
 class EAttributeEditingSupport extends EditingSupport {
 
 	private String attName;
-	private TextCellEditor editor;
 	private TableViewer tableViewer;
 	private boolean wasNull;
 	private IEclipseContext context;
 
+	static public enum ATT_TYPE {
+		STRING, BOOLEAN, INTEGER, NOT_AN_ATTRIBUTE, OTHER;
+	}
+
 	public EAttributeEditingSupport(TableViewer tableViewer, String attName, IEclipseContext context) {
 		super(tableViewer);
 		this.tableViewer = tableViewer;
 		this.attName = attName;
 		this.context = context;
-		editor = new TextCellEditor(tableViewer.getTable(), SWT.NONE);
 	}
 
 	@Override
 	protected CellEditor getCellEditor(Object element) {
-		return editor;
+		switch (getAttributeType(element, attName)) {
+		case BOOLEAN:
+			return new CheckboxCellEditor(tableViewer.getTable(), SWT.CHECK);
+		case STRING:
+		case INTEGER:
+		default:
+			if ("contributionURI".equals(attName)) { //$NON-NLS-1$
+				return new ContributionUriCellEditor(tableViewer.getTable(), SWT.NONE, context, UriDialogType.BUNDLECLASS);
+			}
+			if ("iconURI".equals(attName)) { //$NON-NLS-1$
+				return new ContributionUriCellEditor(tableViewer.getTable(), SWT.NONE, context, UriDialogType.ICON);
+			}
+			return new TextCellEditor(tableViewer.getTable(), SWT.NONE);
+		}
+	}
+
+	static public ATT_TYPE getAttributeType(Object element, String attName) {
+		EAttribute att = EmfUtil.getAttribute((EObject) element, attName);
+		if (att == null) {
+			return ATT_TYPE.NOT_AN_ATTRIBUTE;
+		}
+		String instanceTypeName = att.getEType().getInstanceTypeName();
+		if (instanceTypeName.equals(String.class.getName())) {
+			return ATT_TYPE.STRING;
+		} else if (instanceTypeName.equals(boolean.class.getName())) {
+			return ATT_TYPE.BOOLEAN;
+		} else if (instanceTypeName.equals(int.class.getName())) {
+			return ATT_TYPE.INTEGER;
+		} else {
+			return ATT_TYPE.OTHER;
+		}
 	}
 
 	@Override
 	protected boolean canEdit(Object element) {
-		return EmfUtil.getAttribute((EObject) element, attName) != null;
+		EAttribute att = EmfUtil.getAttribute((EObject) element, attName);
+		if (att == null) {
+			return false;
+		} else {
+			String instanceTypeName = att.getEType().getInstanceTypeName();
+			if (instanceTypeName.equals(String.class.getName())) {
+				return true;
+			} else if (instanceTypeName.equals(boolean.class.getName())) {
+				return true;
+			} else if (instanceTypeName.equals(int.class.getName())) {
+				return true;
+			} else {
+				return false;
+			}
+		}
 	}
 
 	@Override
 	protected Object getValue(Object element) {
 		EObject eObject = (EObject) element;
 		Object value = eObject.eGet(EmfUtil.getAttribute(eObject, attName));
-		if (value == null) {
-			value = ""; //$NON-NLS-1$
-			wasNull = true;
-		} else {
+		switch (getAttributeType(element, attName)) {
+		case BOOLEAN:
 			wasNull = false;
+			break;
+		case INTEGER:
+			if (value == null) {
+				value = ""; //$NON-NLS-1$
+				wasNull = true;
+			} else {
+				return Integer.toString((Integer) value);
+			}
+			break;
+		case STRING:
+		default:
+			if (value == null) {
+				value = ""; //$NON-NLS-1$
+				wasNull = true;
+			} else {
+				wasNull = false;
+			}
+			break;
 		}
 		return value;
 	}
@@ -64,12 +133,33 @@ protected Object getValue(Object element) {
 	@Override
 	protected void setValue(Object element, Object value) {
 		EObject eObject = (EObject) element;
-		if (value.equals("") && wasNull) { //$NON-NLS-1$
-			value = null;
+		switch (getAttributeType(element, attName)) {
+		case INTEGER:
+			if (value.equals("")) { //$NON-NLS-1$
+				value = null;
+			} else {
+				try {
+					value = Integer.parseInt(value.toString());
+				} catch (Exception e) {
+					return;
+				}
+			}
+			break;
+		case BOOLEAN:
+		case STRING:
+		default:
+			if (value.equals("") && wasNull) { //$NON-NLS-1$
+				value = null;
+			}
+			break;
 		}
 		Command cmd = SetCommand.create(context.get(EditingDomain.class), eObject, EmfUtil.getAttribute(eObject, attName), value);
 		context.get(EditingDomain.class).getCommandStack().execute(cmd);
 		TableViewerUtil.updateAndPack(tableViewer, eObject);
 	}
 
+	static public TableViewerColumn getTableViewerColumn(TableViewer viewer, int index) {
+		return (TableViewerColumn) viewer.getTable().getColumn(index).getData(Policy.JFACE + ".columnViewer"); //$NON-NLS-1$
+
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
index 63030ac51b..e003e3d45e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
@@ -6,12 +6,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
 
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
@@ -19,18 +21,29 @@
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
 
 /**
  * A table viewer column for editing an EMF EAttribute If the object does not
  * have an attribute with the given ID, the field is disabled.
- * 
+ *
  * @author Steven Spungin
  *
  */
 public class EAttributeTableViewerColumn {
 
+	private TableViewerColumn tlc;
+	private IResourcePool resourcePool;
+	private String attName;
+	private TableViewer tvResults;
+
 	public EAttributeTableViewerColumn(final TableViewer tvResults, String label, final String attName, final IEclipseContext context) {
-		TableViewerColumn tlc = new TableViewerColumn(tvResults, SWT.NONE);
+		this.tvResults = tvResults;
+		this.attName = attName;
+		tlc = new TableViewerColumn(tvResults, SWT.NONE);
+
+		// CAN be null. Used for checkbox icon.
+		resourcePool = context.get(IResourcePool.class);
 
 		tlc.getColumn().setText(label);
 		tlc.setLabelProvider(new ColumnLabelProvider() {
@@ -44,21 +57,57 @@ public String getText(Object element) {
 				} else {
 					value = ""; //$NON-NLS-1$
 				}
-				return super.getText(value);
+				switch (EAttributeEditingSupport.getAttributeType(element, attName)) {
+				case BOOLEAN:
+					// if no icons provided, use text instead of checkbox
+					return resourcePool == null && ((Boolean) value) ? "X" : ""; //$NON-NLS-1$ //$NON-NLS-2$
+				case STRING:
+				case NOT_AN_ATTRIBUTE:
+				case OTHER:
+				default:
+					return super.getText(value);
+				}
 			}
 
 			@Override
-			public Color getBackground(Object element) {
-				EObject eObject = (EObject) element;
-				EAttribute eAtt = EmfUtil.getAttribute(eObject, attName);
-				if (eAtt == null) {
-					return tvResults.getTable().getDisplay().getSystemColor(SWT.COLOR_GRAY);
-				} else {
-					return super.getBackground(element);
+			public Image getImage(Object element) {
+				switch (EAttributeEditingSupport.getAttributeType(element, attName)) {
+				case BOOLEAN:
+					if (resourcePool != null) {
+						Object value = EmfUtil.getAttributeValue((EObject) element, attName);
+						if (value != null && value.equals(true)) {
+							return resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_checkbox_obj);
+						}
+					}
+					// fall through
+				case STRING:
+				case NOT_AN_ATTRIBUTE:
+				case OTHER:
+				default:
+					return super.getImage(element);
 				}
 			}
+
+			@Override
+			public Color getBackground(Object element) {
+				return EAttributeTableViewerColumn.this.getBackground(element);
+			}
 		});
 		tlc.setEditingSupport(new EAttributeEditingSupport(tvResults, attName, context));
 	}
 
+	public Color getBackground(Object element) {
+		EObject eObject = (EObject) element;
+		EAttribute eAtt = EmfUtil.getAttribute(eObject, attName);
+		if (eAtt == null) {
+			return tvResults.getTable().getDisplay().getSystemColor(SWT.COLOR_GRAY);
+		} else {
+			return null;
+		}
+	}
+
+	public void dispose() {
+		tlc.getColumn().dispose();
+	}
+
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
index 24781744c2..a7ec21d88b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
@@ -6,13 +6,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
 
 import java.util.Collection;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.domain.EditingDomain;
 
 /**
  * This interface provides a common API for editing trees, lists, and xml
@@ -54,4 +55,10 @@ public interface IViewEObjects {
 	 *            are ignored.
 	 */
 	void deleteEObjects(Collection<EObject> list);
+
+	/**
+	 *
+	 * @return The editing domain for the implementor's model.
+	 */
+	EditingDomain getEditingDomain();
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index a793a76142..d1ab894ad1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -6,13 +6,16 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.PostConstruct;
@@ -23,8 +26,14 @@
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.EmptyFilterOption;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.TitleAreaFilterDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.TitleAreaFilterDialogWithEmptyOptions;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.EMFDocumentResourceMediator;
 import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.util.TreeIterator;
@@ -32,36 +41,57 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.DeleteCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.text.DocumentEvent;
 import org.eclipse.jface.text.IDocumentListener;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
 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.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
 
 /**
  * A tab that contains a list EObjects, and provides editable columns for
  * EObject features.
- * 
+ *
  * @author Steven Spungin
  *
  */
 public class ListTab implements IViewEObjects {
 
+	static final String ELIPSIS = "..."; //$NON-NLS-1$
+
 	// The table will only include EObjects that define this attribute
-	private static final String FILTER_ATTRUBUTE_ID = "elementId"; //$NON-NLS-1$
+	private static final String FILTER_ATTRIBUTE_ID = "elementId"; //$NON-NLS-1$
 
 	ConcurrentHashMap<String, List<EObject>> mapId_Object = new ConcurrentHashMap<String, List<EObject>>();
 
@@ -79,9 +109,15 @@ public class ListTab implements IViewEObjects {
 	@Inject
 	private IResourcePool resourcePool;
 
+	@Inject
+	@Translation
+	protected Messages Messages;
+
 	@Inject
 	MApplication app;
 
+	BundleImageCache imageCache;
+
 	private CTabItem tabItem;
 
 	private ModelResourceContentProvider provider;
@@ -90,6 +126,15 @@ public class ListTab implements IViewEObjects {
 
 	private Collection<?> highlightedItems;
 
+	HashMap<String, EAttributeTableViewerColumn> defaultColumns = new HashMap<String, EAttributeTableViewerColumn>();
+	HashMap<String, EAttributeTableViewerColumn> optionalColumns = new HashMap<String, EAttributeTableViewerColumn>();
+
+	private ToolItem filterByItem;
+
+	private ToolItem filterByAttribute;
+
+	protected Image imgMarkedItem;
+
 	@PreDestroy
 	public void preDestroy() {
 		// race condition issue with observables (exception is not thrown when
@@ -100,6 +145,19 @@ public void preDestroy() {
 
 	@PostConstruct
 	public void postConstruct(final CTabFolder tabFolder) {
+		imageCache = new BundleImageCache(context.get(Display.class), getClass().getClassLoader());
+		tabFolder.addDisposeListener(new DisposeListener() {
+
+			@Override
+			public void widgetDisposed(DisposeEvent e) {
+				imageCache.dispose();
+			}
+		});
+		try {
+			imgMarkedItem = imageCache.create("org.eclipse.e4.tools.emf.ui", "/icons/full/obj16/mark_occurrences.png"); //$NON-NLS-1$//$NON-NLS-2$
+		} catch (Exception e2) {
+			e2.printStackTrace();
+		}
 
 		documentListener = new IDocumentListener() {
 
@@ -114,7 +172,7 @@ public void documentAboutToBeChanged(DocumentEvent event) {
 		};
 		context.get(EMFDocumentResourceMediator.class).getDocument().addDocumentListener(documentListener);
 
-		tabItem = new CTabItem(tabFolder, SWT.NONE);
+		tabItem = new CTabItem(tabFolder, SWT.NONE, 1);
 
 		Composite composite = new Composite(tabFolder, SWT.NONE);
 		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
@@ -122,19 +180,186 @@ public void documentAboutToBeChanged(DocumentEvent event) {
 		tabItem.setControl(composite);
 		tabItem.setText(Messages.ListTab_0);
 
-		tabItem.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_world_edit));
+		tabItem.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_table_obj));
+
+		final ToolBar toolBar = new ToolBar(composite, SWT.FLAT | SWT.NO_FOCUS);
+		toolBar.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
+
+		{
+			ToolItem button = new ToolItem(toolBar, SWT.PUSH);
+			button.setText(Messages.ListTab_addColumn + ELIPSIS);
+			button.setImage(imageCache.create("/icons/full/obj16/add_column.gif")); //$NON-NLS-1$
+
+			button.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					TitleAreaFilterDialogWithEmptyOptions dlg = createEObjectAttributePicker(Messages.ListTab_addColumn);
+					dlg.setShowEmptyOptions(false);
+					if (dlg.open() == dlg.OK) {
+						// Add Column
+						String attName = dlg.getFirstElement().toString();
+						addColumn(attName);
+					}
+				}
+			});
+		}
+
 		{
-			Label label = new Label(composite, SWT.NONE);
-			GridData layoutData = new GridData(SWT.BEGINNING, SWT.CENTER, false, false);
-			layoutData.horizontalSpan = 2;
-			label.setLayoutData(layoutData);
-			label.setText(Messages.ListTab_7 + FILTER_ATTRUBUTE_ID);
+			ToolItem button = new ToolItem(toolBar, SWT.PUSH);
+			button.setText(Messages.ListTab_resetColumns);
+			button.setImage(imageCache.create("/icons/full/obj16/reset_columns.gif")); //$NON-NLS-1$
+
+			button.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					for (EAttributeTableViewerColumn col : optionalColumns.values()) {
+						col.dispose();
+					}
+					optionalColumns.clear();
+					TableViewerUtil.refreshAndPack(tvResults);
+				}
+			});
+		}
+
+		new ToolItem(toolBar, SWT.SEPARATOR);
+
+		filterByItem = new ToolItem(toolBar, SWT.NONE);
+		{
+
+			filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS);
+			filterByItem.setImage(imageCache.create("/icons/full/obj16/filter_by_item.gif")); //$NON-NLS-1$
+
+			filterByItem.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					final TitleAreaFilterDialog dlg = createElementTypePicker(Messages.ListTab_filterByItem);
+					if (dlg.open() == Window.OK) {
+						final String name = dlg.getFirstElement().toString();
+						mapId_Object.clear();
+						final ArrayList<EObject> filtered = new ArrayList<EObject>();
+						for (EObject object : getAllEObjects()) {
+							if (object.eClass().getName().equals(name)) {
+								filtered.add(object);
+								// filter.setText(Messages.ListTab_7 +
+								// attFilter);
+
+							}
+
+							ViewerFilter viewerFilter = new ViewerFilter() {
+
+								@Override
+								public boolean select(Viewer viewer, Object parentElement, Object element) {
+									return filtered.contains(element);
+								}
+
+							};
+							tvResults.setFilters(new ViewerFilter[] { viewerFilter });
+							filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS + "(" + name + ")"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+							filterByAttribute.setText(Messages.ListTab_filterByAttribute + ELIPSIS);
+						}
+					}
+				};
+			});
 		}
 
-		tvResults = new TableViewer(composite);
+		filterByAttribute = new ToolItem(toolBar, SWT.NONE);
+		{
+
+			filterByAttribute.setText(Messages.ListTab_filterByAttribute + ELIPSIS);
+			filterByAttribute.setImage(imageCache.create("/icons/full/obj16/filter_by_attribute.gif")); //$NON-NLS-1$
+
+			filterByAttribute.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					TitleAreaFilterDialogWithEmptyOptions dlg = createEObjectAttributePicker(Messages.ListTab_filterByAttribute);
+					if (dlg.open() == dlg.OK) {
+						final String attFilter = dlg.getFirstElement().toString();
+						final EmptyFilterOption emptyOption = dlg.getEmptyFilterOption();
+						mapId_Object.clear();
+						final ArrayList<EObject> filtered = new ArrayList<EObject>();
+						for (EObject object : getAllEObjects()) {
+							if (EmfUtil.getAttribute(object, attFilter) != null) {
+								filtered.add(object);
+								ViewerFilter viewerFilter = new ViewerFilter() {
+
+									@Override
+									public boolean select(Viewer viewer, Object parentElement, Object element) {
+										// if filtering on attribute, always
+										// reject if not defined for model
+										// element
+										if (EmfUtil.getAttribute((EObject) element, attFilter) == null) {
+											return false;
+										}
+										switch (emptyOption) {
+										case EXCLUDE:
+											if (E.isEmpty(EmfUtil.getAttributeValue((EObject) element, attFilter))) {
+												return false;
+											} else {
+												return filtered.contains(element);
+											}
+										case ONLY:
+											if (E.notEmpty((EmfUtil.getAttributeValue((EObject) element, attFilter)))) {
+												return false;
+											} else {
+												return true;
+											}
+										default:
+										case INCLUDE:
+											if (E.isEmpty(EmfUtil.getAttributeValue((EObject) element, attFilter))) {
+												return true;
+											} else {
+												return filtered.contains(element);
+											}
+										}
+									}
+								};
+								tvResults.setFilters(new ViewerFilter[] { viewerFilter });
+								filterByAttribute.setText(Messages.ListTab_filterByAttribute + ELIPSIS + "(" + attFilter + ")"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+								filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS);
+
+							}
+						}
+						addColumn(attFilter);
+					}
+				};
+			});
+		}
+
+		{
+			final ToolItem filterRemove = new ToolItem(toolBar, SWT.NONE);
+			filterRemove.setText(Messages.ListTab_removeFilter);
+			filterRemove.setImage(imageCache.create("/icons/full/obj16/remove_filter.png")); //$NON-NLS-1$
+
+			filterRemove.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					tvResults.setFilters(new ViewerFilter[0]);
+					filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS);
+					filterByAttribute.setText(Messages.ListTab_markAttribute + ELIPSIS);
+				};
+			});
+		}
+
+		new ToolItem(toolBar, SWT.SEPARATOR);
+
+		{
+			final E4ToolItemMenu tiCommands = new E4ToolItemMenu(toolBar, context);
+			tiCommands.getToolItem().setImage(imageCache.create("/icons/full/obj16/command.gif")); //$NON-NLS-1$
+
+			ArrayList<String> commandIds = new ArrayList<String>();
+			commandIds.add("org.eclipse.e4.tools.emf.ui.command.mark_duplicate_attributes"); //$NON-NLS-1$
+			commandIds.add("org.eclipse.e4.tools.emf.ui.command.mark_duplicate_ids"); //$NON-NLS-1$
+			commandIds.add("org.eclipse.e4.tools.emf.ui.command.mark_duplicate_labels"); //$NON-NLS-1$
+			commandIds.add("org.eclipse.e4.tools.emf.ui.command.repair_duplicate_ids"); //$NON-NLS-1$
+			commandIds.add(E4ToolItemMenu.SEPARATOR);
+			commandIds.add("org.eclipse.e4.tools.emf.ui.command.unmark"); //$NON-NLS-1$
+			tiCommands.addCommands(commandIds);
+
+		}
+
+		tvResults = new TableViewer(composite, SWT.FULL_SELECTION);
 		tvResults.getTable().setHeaderVisible(true);
 		tvResults.getTable().setLinesVisible(true);
-		// tvResults.setContentProvider(ArrayContentProvider.getInstance());
 
 		provider = new ModelResourceContentProvider();
 		tvResults.setContentProvider(provider);
@@ -186,9 +411,33 @@ public void mouseDown(MouseEvent e) {
 			}
 		});
 
+		TableViewerColumn colMarked = new TableViewerColumn(tvResults, SWT.NONE);
+		colMarked.getColumn().setWidth(16);
+		colMarked.getColumn().setText(Messages.ListTab_mark);
+		colMarked.setLabelProvider(new ColumnLabelProvider() {
+			@Override
+			public Image getImage(Object element) {
+				Image ret = null;
+				if (isHighlighted(element)) {
+					try {
+						ret = imgMarkedItem;
+					} catch (Exception e) {
+					} //$NON-NLS-1$
+				} else {
+					ret = null;
+				}
+				return ret;
+			}
+
+			@Override
+			public String getText(Object element) {
+				return ""; //$NON-NLS-1$
+			}
+		});
+
 		TableViewerColumn colItem = new TableViewerColumn(tvResults, SWT.NONE);
 		colItem.getColumn().setText(Messages.ListTab_col_item);
-		colItem.setLabelProvider(new ColumnLabelProvider() {
+		colItem.setLabelProvider(new ColumnLabelProvider_Markable() {
 			@Override
 			public String getText(Object element) {
 				EObject eObject = (EObject) element;
@@ -199,34 +448,50 @@ public String getText(Object element) {
 		app.getContext().set("org.eclipse.e4.tools.active-object-viewer", this); //$NON-NLS-1$
 
 		TableViewerColumn colId = new TableViewerColumn(tvResults, SWT.NONE);
-		colId.getColumn().setText(Messages.ListTab_col_id);
-		colId.setLabelProvider(new ColumnLabelProvider() {
+		colId.getColumn().setText("elementId"); //$NON-NLS-1$
+		colId.setLabelProvider(new ColumnLabelProvider_Markable() {
 			@Override
 			public String getText(Object element) {
 				EObject eObject = (EObject) element;
-				EAttribute eAtt = EmfUtil.getAttribute(eObject, FILTER_ATTRUBUTE_ID);
+				EAttribute eAtt = EmfUtil.getAttribute(eObject, "elementId"); //$NON-NLS-1$
 				return super.getText(eObject.eGet(eAtt));
 			}
+		});
+		colId.setEditingSupport(new EAttributeEditingSupport(tvResults, FILTER_ATTRIBUTE_ID, context));
 
+		EAttributeTableViewerColumn colLabel = new EAttributeTableViewerColumn_Markable(tvResults, "label", "label", context); //$NON-NLS-1$ //$NON-NLS-2$
+
+		defaultColumns.put("label", colLabel); //$NON-NLS-1$
+
+		// Custom selection for marked items
+		tvResults.getTable().addListener(SWT.EraseItem, new Listener() {
 			@Override
-			public Color getBackground(Object element) {
-				Color ret = super.getBackground(element);
-				if (highlightedItems != null && highlightedItems.contains(element)) {
-					return ret = tvResults.getTable().getDisplay().getSystemColor(SWT.COLOR_YELLOW);
+			public void handleEvent(Event event) {
+				event.detail &= ~SWT.HOT;
+				if ((event.detail & SWT.SELECTED) == 0)
+					return; // / item not selected
+
+				TableItem item = (TableItem) event.item;
+				if (isHighlighted(item.getData())) {
+
+					Table table = (Table) event.widget;
+					int clientWidth = table.getClientArea().width;
+					GC gc = event.gc;
+					// Color oldForeground = gc.getForeground();
+					// Color oldBackground = gc.getBackground();
+
+					// gc.setBackground(item.getDisplay().getSystemColor(SWT.COLOR_YELLOW));
+					gc.setForeground(item.getDisplay().getSystemColor(SWT.COLOR_RED));
+					gc.fillRectangle(0, event.y, clientWidth, event.height);
+
+					// gc.setForeground(oldForeground);
+					// gc.setBackground(oldBackground);
+					event.detail &= ~SWT.SELECTED;
 				}
-				return ret;
 			}
 		});
-		colId.setEditingSupport(new EAttributeEditingSupport(tvResults, FILTER_ATTRUBUTE_ID, context));
-
-		@SuppressWarnings("unused")
-		EAttributeTableViewerColumn colLabel = new EAttributeTableViewerColumn(tvResults, Messages.ListTab_col_label, "label", context); //$NON-NLS-1$
-
-		// Testing the commandName attribute column
-		// Any attribute can be added this way
-		// @SuppressWarnings("unused")
-		//EAttributeTableViewerColumn colName = new EAttributeTableViewerColumn(tvResults, Messages.ListTab_commandname, "commandName", context); //$NON-NLS-1$
 
+		tvResults.getTable().setFocus();
 		reload();
 	}
 
@@ -290,4 +555,124 @@ public void deleteEObjects(Collection<EObject> list) {
 			reload();
 		}
 	}
+
+	private TitleAreaFilterDialogWithEmptyOptions createEObjectAttributePicker(final String title) {
+		// Get Attribute Names
+		final HashSet<String> set = new HashSet<String>();
+		Collection<EObject> allEObjects = getAllEObjects();
+		for (EObject obj : allEObjects) {
+			for (EAttribute attribute : obj.eClass().getEAllAttributes()) {
+				set.add(attribute.getName());
+			}
+		}
+		final ArrayList<String> sorted = new ArrayList<String>(set);
+		Collections.sort(sorted);
+
+		// Select Attribute
+		ILabelProvider renderer = new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				return String.valueOf(element);
+			}
+		};
+		TitleAreaFilterDialogWithEmptyOptions dlg = new TitleAreaFilterDialogWithEmptyOptions(context.get(Shell.class), renderer) {
+			@Override
+			protected Control createContents(Composite parent) {
+				Control ret = super.createContents(parent);
+				setMessage(Messages.ListTab_selectAnAttribute);
+				try {
+					setTitleImage(imageCache.create("org.eclipse.e4.tools.emf.ui", "/icons/full/wizban/attribute_wiz.gif")); //$NON-NLS-1$ //$NON-NLS-2$
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+				setTitle(title);
+				setElements(sorted.toArray(new String[0]));
+				return ret;
+			}
+		};
+		return dlg;
+	}
+
+	private TitleAreaFilterDialog createElementTypePicker(final String title) {
+		// Get Attribute Names
+		final HashSet<String> set = new HashSet<String>();
+		Collection<EObject> allEObjects = getAllEObjects();
+		for (EObject obj : allEObjects) {
+			set.add(obj.eClass().getName());
+		}
+
+		final ArrayList<String> sorted = new ArrayList<String>(set);
+		Collections.sort(sorted);
+
+		ILabelProvider renderer = new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				return String.valueOf(element);
+			}
+		};
+		TitleAreaFilterDialog dlg = new TitleAreaFilterDialog(context.get(Shell.class), renderer) {
+
+			@Override
+			protected Control createContents(Composite parent) {
+				Control ret = super.createContents(parent);
+				setMessage(Messages.ListTab_selectAType);
+				setTitle(title);
+				setElements(sorted.toArray(new String[0]));
+				return ret;
+			}
+		};
+		return dlg;
+	}
+
+	/**
+	 * Adds a column if it does not already exist
+	 *
+	 * @param attName
+	 */
+	private void addColumn(String attName) {
+		if (optionalColumns.containsKey(attName) == false && defaultColumns.containsKey(attName) == false) {
+			EAttributeTableViewerColumn colName = new EAttributeTableViewerColumn_Markable(tvResults, attName, attName, context);
+			TableViewerUtil.refreshAndPack(tvResults);
+			optionalColumns.put(attName, colName);
+		}
+	}
+
+	private class EAttributeTableViewerColumn_Markable extends EAttributeTableViewerColumn {
+		public EAttributeTableViewerColumn_Markable(TableViewer tvResults, String label, String attName, IEclipseContext context) {
+			super(tvResults, label, attName, context);
+		}
+
+		@Override
+		public Color getBackground(Object element) {
+			Color ret;
+			if (isHighlighted(element)) {
+				return ret = tvResults.getTable().getDisplay().getSystemColor(SWT.COLOR_YELLOW);
+			} else {
+				ret = super.getBackground(element);
+			}
+			return ret;
+		}
+	}
+
+	private class ColumnLabelProvider_Markable extends ColumnLabelProvider {
+		@Override
+		public Color getBackground(Object element) {
+			Color ret;
+			if (isHighlighted(element)) {
+				ret = tvResults.getTable().getDisplay().getSystemColor(SWT.COLOR_YELLOW);
+			} else {
+				ret = super.getBackground(element);
+			}
+			return ret;
+		}
+	}
+
+	@Override
+	public EditingDomain getEditingDomain() {
+		return modelResource.getEditingDomain();
+	}
+
+	public boolean isHighlighted(Object element) {
+		return highlightedItems != null && highlightedItems.contains(element);
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/Messages.java
new file mode 100644
index 0000000000..7981b5b919
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/Messages.java
@@ -0,0 +1,19 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.messages"; //$NON-NLS-1$
+	public static String TitleAreaFilterDialog_enterFilterText;
+	public static String TitleAreaFilterDialogWithEmptyOptions_emptyValueDescription;
+	public static String TitleAreaFilterDialogWithEmptyOptions_excludeEmptyValues;
+	public static String TitleAreaFilterDialogWithEmptyOptions_includeEmptyValues;
+	public static String TitleAreaFilterDialogWithEmptyOptions_onlyEmptyValues;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java
new file mode 100644
index 0000000000..8f6a4cab91
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
+ *******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty;
+
+import java.util.Collection;
+
+/**
+ * E is for empty. Very useful functions for determining empty objects. Avoids
+ * null checking and content checking, and makes code clearer. <br />
+ * An object is empty if it is null, an empty string, or an empty collection
+ *
+ * @author Steven Spungin
+ *
+ */
+public class E {
+
+	public static boolean notEmpty(String object) {
+		return !isEmpty(object);
+	}
+
+	public static boolean notEmpty(Collection<?> object) {
+		return !isEmpty(object);
+	}
+
+	public static boolean notEmpty(Object object) {
+		return !isEmpty(object);
+	}
+
+	public static boolean isEmpty(String object) {
+		return (object == null || object.isEmpty());
+	}
+
+	public static boolean isEmpty(Collection<?> object) {
+		return (object == null || object.isEmpty());
+	}
+
+	public static boolean isEmpty(Object object) {
+		if (object == null) {
+			return true;
+		} else if (object instanceof String && ((String) object).isEmpty()) {
+			return true;
+		} else if (object instanceof Collection<?> && ((Collection<?>) object).isEmpty()) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 *
+	 * @param obj1
+	 * @param obj2
+	 * @return true if (both objects are null) or (both objects are not null and
+	 *         equal)
+	 */
+	static public boolean equals(Object obj1, Object obj2) {
+		if (obj1 == null) {
+			if (obj2 == null) {
+				return true;
+			} else {
+				return false;
+			}
+		} else if (obj2 == null) {
+			return false;
+		} else {
+			return obj1.equals(obj2);
+		}
+	}
+
+	/**
+	 * Compares 2 objects.
+	 *
+	 * @param obj1
+	 * @param obj2
+	 * @return If both objects are null, returns 0. If only 1 object is null, it
+	 *         will return 1 or -1. Otherwise call compareTo on the first
+	 *         object.
+	 */
+	static public <T> int compareTo(Comparable<T> obj1, T obj2) {
+		if (obj1 == null) {
+			if (obj2 == null) {
+				return 0;
+			} else {
+				return -1;
+			}
+		} else if (obj2 == null) {
+			return 1;
+		} else {
+			return obj1.compareTo(obj2);
+		}
+
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SearchScope.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java
similarity index 56%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SearchScope.java
rename to bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java
index bd09e708ba..1bbba60232 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SearchScope.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java
@@ -6,32 +6,29 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 404136
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
  *******************************************************************************/
 
-package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty;
 
 /**
- * Specifies the scope when searching for a resource
+ * Options for working with empty values in filters. <br />
+ * An empty value is a null object, empty string, or empty collection.
  *
  * @author Steven Spungin
  *
  */
-public enum SearchScope {
+public enum EmptyFilterOption {
 	/**
-	 * Resources in the current project
+	 * Do not include empty values
 	 */
-	PROJECT,
+	EXCLUDE,
 	/**
-	 * Opened projects in the current workspace
+	 * Include empty values
 	 */
-	WORKSPACE,
+	INCLUDE,
 	/**
-	 * The current project, and projects the current project depends on
+	 * Include only empty values
 	 */
-	DEPENDENT,
-	/**
-	 * All projects in the current workspace and bundles in the target platform
-	 */
-	TARGET_PLATFORM
-}
+	ONLY
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
new file mode 100644
index 0000000000..df02c420bc
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
@@ -0,0 +1,163 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.Messages;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+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.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * Extends TitleAreaDialog to include a filter text box.<br />
+ * If no item is selected, the dialog result is Dialog.Cancel, even if OK is
+ * pressed. A result of Dialog.Ok is ensured to have at least 1 selected item.
+ *
+ * @author Steven Spungin
+ *
+ */
+public class TitleAreaFilterDialog extends TitleAreaDialog {
+
+	private ILabelProvider labelProvider;
+	private TableViewer viewer;
+	private Object result;
+	private Text text;
+
+	public TitleAreaFilterDialog(Shell parentShell, ILabelProvider labelProvider) {
+		super(parentShell);
+		this.labelProvider = labelProvider;
+	}
+
+	@Override
+	protected boolean isResizable() {
+		return true;
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite comp = (Composite) super.createDialogArea(parent);
+
+		comp.setLayoutData(new GridData(GridData.FILL_BOTH));
+		comp.setLayout(new GridLayout(1, false));
+
+		text = new Text(comp, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		text.setMessage(Messages.TitleAreaFilterDialog_enterFilterText);
+
+		viewer = new TableViewer(comp, SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER | SWT.FULL_SELECTION);
+		viewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
+		viewer.setLabelProvider(labelProvider);
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
+
+		viewer.setFilters(new ViewerFilter[] { new ViewerFilter() {
+
+			@Override
+			public boolean select(Viewer viewer, Object parentElement, Object element) {
+				return isFiltered(element, text.getText());
+			}
+		} });
+
+		text.addModifyListener(new ModifyListener() {
+
+			@Override
+			public void modifyText(ModifyEvent e) {
+				viewer.refresh();
+			}
+		});
+
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+
+			@Override
+			public void doubleClick(DoubleClickEvent event) {
+				result = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+				if (result != null) {
+					okPressed();
+				}
+			}
+		});
+
+		return comp;
+	}
+
+	/**
+	 * Default returns true if string value contains the filterText, and it is
+	 * case insensitive.
+	 *
+	 * @param element
+	 * @param filterText
+	 * @return
+	 */
+	protected boolean isFiltered(Object element, String filterText) {
+		filterText = filterText.toLowerCase();
+		if (filterText.isEmpty()) {
+			return true;
+		} else if (element.toString().toLowerCase().contains(filterText)) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	@Override
+	protected void okPressed() {
+		result = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+		if (result == null) {
+			cancelPressed();
+		} else {
+			super.okPressed();
+		}
+	}
+
+	public void setElements(Object[] array) {
+		viewer.setInput(array);
+	}
+
+	public Object getFirstElement() {
+		return result;
+	}
+
+	protected TableViewer getViewer() {
+		return viewer;
+	}
+
+	protected Text getText() {
+		return text;
+	}
+
+	public List<?> asList() {
+		Object firstElement = getFirstElement();
+		if (firstElement == null) {
+			return Collections.EMPTY_LIST;
+		} else {
+			return Arrays.asList(firstElement);
+		}
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
new file mode 100644
index 0000000000..2ef35a9c36
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
@@ -0,0 +1,152 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others. All rights reserved. This
+ * program and the accompanying materials are made available under the 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: Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
+ *******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.Messages;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.RowLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * A standard ElementListSelectionDialog with additional options for including,
+ * excluding, and selecting empty values.
+ *
+ * @author Steven Spungin
+ *
+ */
+public class TitleAreaFilterDialogWithEmptyOptions extends TitleAreaFilterDialog {
+	private Button btnExcludeEmptyValues;
+	private Button btnOnlyEmptyValues;
+	private Button btnIncludeEmptyValues;
+	private EmptyFilterOption emptyFilterOption;
+	private boolean bShowEmptyOptions = true;
+	private Composite compOptions;
+	private Composite parent;
+
+	public TitleAreaFilterDialogWithEmptyOptions(Shell parent, ILabelProvider renderer) {
+		super(parent, renderer);
+	}
+
+	@Override
+	protected org.eclipse.swt.widgets.Control createDialogArea(Composite parent) {
+		this.parent = parent;
+		Composite comp = (Composite) super.createDialogArea(parent);
+
+		// Label labelEmptyInfo = new Label(comp, SWT.NONE);
+		// labelEmptyInfo.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER,
+		// false, false));
+		// labelEmptyInfo.setText("An empty value is defined as a null object, an empty string, or an empty collection.");
+
+		compOptions = new Composite(comp, SWT.NONE);
+		compOptions.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
+		compOptions.setLayout(new RowLayout());
+
+		// labelEmptyInfo.moveAbove(getText());
+		compOptions.moveAbove(getText());
+
+		btnExcludeEmptyValues = new Button(compOptions, SWT.RADIO);
+		btnExcludeEmptyValues.setText(Messages.TitleAreaFilterDialogWithEmptyOptions_excludeEmptyValues);
+		btnExcludeEmptyValues.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				setEmptyFilterOption(EmptyFilterOption.EXCLUDE);
+			}
+		});
+
+		btnIncludeEmptyValues = new Button(compOptions, SWT.RADIO);
+		btnIncludeEmptyValues.setText(Messages.TitleAreaFilterDialogWithEmptyOptions_includeEmptyValues);
+		btnIncludeEmptyValues.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				setEmptyFilterOption(EmptyFilterOption.INCLUDE);
+			}
+		});
+
+		btnOnlyEmptyValues = new Button(compOptions, SWT.RADIO);
+		btnOnlyEmptyValues.setText(Messages.TitleAreaFilterDialogWithEmptyOptions_onlyEmptyValues);
+		btnOnlyEmptyValues.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				setEmptyFilterOption(EmptyFilterOption.ONLY);
+			}
+		});
+
+		String toolTip = Messages.TitleAreaFilterDialogWithEmptyOptions_emptyValueDescription;
+		btnExcludeEmptyValues.setToolTipText(toolTip);
+		btnIncludeEmptyValues.setToolTipText(toolTip);
+		btnOnlyEmptyValues.setToolTipText(toolTip);
+
+		setEmptyFilterOption(EmptyFilterOption.EXCLUDE);
+
+		updateEmptyOptionState();
+
+		parent.pack();
+		return comp;
+	}
+
+	@Override
+	public boolean close() {
+		return super.close();
+	}
+
+	public EmptyFilterOption getEmptyFilterOption() {
+		return emptyFilterOption;
+	}
+
+	public void setEmptyFilterOption(EmptyFilterOption emptyFilterOption) {
+		this.emptyFilterOption = emptyFilterOption;
+		updateUi();
+	}
+
+	private void updateUi() {
+		if (btnExcludeEmptyValues == null) {
+			return;
+		}
+		switch (emptyFilterOption) {
+		case EXCLUDE:
+			btnExcludeEmptyValues.setSelection(true);
+			btnIncludeEmptyValues.setSelection(false);
+			btnOnlyEmptyValues.setSelection(false);
+			break;
+		case INCLUDE:
+			btnExcludeEmptyValues.setSelection(false);
+			btnIncludeEmptyValues.setSelection(true);
+			btnOnlyEmptyValues.setSelection(false);
+			break;
+		case ONLY:
+			btnExcludeEmptyValues.setSelection(false);
+			btnIncludeEmptyValues.setSelection(false);
+			btnOnlyEmptyValues.setSelection(true);
+			break;
+		default:
+			break;
+		}
+	}
+
+	public void setShowEmptyOptions(boolean bShow) {
+		this.bShowEmptyOptions = bShow;
+		updateEmptyOptionState();
+	}
+
+	private void updateEmptyOptionState() {
+		if (compOptions == null) {
+			return;
+		}
+		compOptions.setVisible(bShowEmptyOptions);
+		((GridData) compOptions.getLayoutData()).exclude = bShowEmptyOptions == false;
+		parent.layout();
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties
new file mode 100644
index 0000000000..324ca93bae
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties
@@ -0,0 +1,5 @@
+TitleAreaFilterDialog_enterFilterText=Enter filter text
+TitleAreaFilterDialogWithEmptyOptions_emptyValueDescription=An empty value is defined as a null object, an empty string, or an empty collection.
+TitleAreaFilterDialogWithEmptyOptions_excludeEmptyValues=Exclude Empty Values
+TitleAreaFilterDialogWithEmptyOptions_includeEmptyValues=Include Empty Values
+TitleAreaFilterDialogWithEmptyOptions_onlyEmptyValues=Only Empty Values
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java
new file mode 100644
index 0000000000..4fafe7a1b7
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator;
+
+import java.io.FileOutputStream;
+import java.util.jar.Manifest;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+
+/**
+ * Converts the given install location into a bundle.
+ *
+ * @author Steven Spungin
+ *
+ */
+public class BundleConverter {
+
+	/**
+	 *
+	 * @param installLocation
+	 * @return The bundleId of the bundle, or null if not converted
+	 * @throws Exception
+	 */
+	public static String convertProjectToBundle(String installLocation, IWorkspace workspace) throws Exception {
+		IPath project = Path.fromOSString(installLocation);
+		if (project.toFile().isDirectory() == false) {
+			throw new Exception(Messages.BundleConverter_installLocationNotADirectory);
+		}
+		IPath metaDir = project.append("META-INF"); //$NON-NLS-1$
+		if (metaDir.toFile().isDirectory() == false) {
+			if (metaDir.toFile().mkdir() == false) {
+				throw new Exception(Messages.BundleConverter_couldNotCreateMetaInfDir);
+			}
+		}
+		IPath manifestPath = metaDir.append("MANIFEST.MF"); //$NON-NLS-1$
+		if (manifestPath.toFile().isFile()) {
+			throw new Exception(Messages.BundleConverter_projectIsAlreadyABundle);
+		}
+		Manifest manifest = new Manifest();
+		// TODO prompt for names
+		IPath path = Path.fromOSString(installLocation);
+		String bundleId = path.lastSegment();
+		String bundleName = path.lastSegment();
+		manifest.getMainAttributes().putValue("Manifest-Version", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$
+		manifest.getMainAttributes().putValue("Bundle-SymbolicName", bundleId); //$NON-NLS-1$
+		manifest.getMainAttributes().putValue("Bundle-Name", bundleName); //$NON-NLS-1$
+		manifest.getMainAttributes().putValue("Bundle-Version", "0.0.1"); //$NON-NLS-1$ //$NON-NLS-2$
+		manifest.write(new FileOutputStream(manifestPath.toFile()));
+		IProject targetProject = workspace.getRoot().getProject(bundleId);
+		targetProject.refreshLocal(2, null);
+		return bundleId;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/Messages.java
new file mode 100644
index 0000000000..7f5dfcb106
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/Messages.java
@@ -0,0 +1,72 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.messages"; //$NON-NLS-1$
+	public static String BundleClassDialog_bundle;
+	public static String BundleClassDialog_bundleClassEditor;
+	public static String BundleClassDialog_class;
+	public static String BundleClassDialog_create_goto;
+	public static String BundleClassDialog_find;
+	public static String BundleClassDialog_package;
+	public static String BundleClassDialog_uri;
+	public static String BundleConverter_couldNotCreateMetaInfDir;
+	public static String BundleConverter_installLocationNotADirectory;
+	public static String BundleConverter_projectIsAlreadyABundle;
+	public static String FindContributionDialog_findBundle;
+	public static String FindContributionDialog_findClass;
+	public static String FindContributionDialog_findIcon;
+	public static String FindContributionDialog_findPackage;
+	public static String FindContributionDialog_inBundle;
+	public static String FindContributionDialog_inPackage;
+	public static String FindIconDialog_findIcon;
+	public static String FindIconDialog_searchByFilename;
+	public static String IconDialog_bundle;
+	public static String IconDialog_find;
+	public static String IconDialog_folder;
+	public static String IconDialog_icon;
+	public static String IconDialog_selectIcon;
+	public static String IconDialog_selectIcon_MESSAGE;
+	public static String IconDialog_selectIcon_TITLE;
+	public static String IconDialog_uri;
+	public static String IconDialog_uriEditor;
+	public static String NonReferencedResourceDialog__ast_notInABundle_ast;
+	public static String NonReferencedResourceDialog_2;
+	public static String NonReferencedResourceDialog_ast_notInABundle_ast;
+	public static String NonReferencedResourceDialog_bundle;
+	public static String NonReferencedResourceDialog_class;
+	public static String NonReferencedResourceDialog_convertAndRequire;
+	public static String NonReferencedResourceDialog_copyToReferenedProject;
+	public static String NonReferencedResourceDialog_copyToThisProject;
+	public static String NonReferencedResourceDialog_directory;
+	public static String NonReferencedResourceDialog_error;
+	public static String NonReferencedResourceDialog_importPackage;
+	public static String NonReferencedResourceDialog_installLocation;
+	public static String NonReferencedResourceDialog_package;
+	public static String NonReferencedResourceDialog_requireBundle;
+	public static String NonReferencedResourceDialog_resource;
+	public static String NonReferencedResourceDialog_resourceNotReferenced;
+	public static String NonReferencedResourceDialog_resourceReferenceWarning;
+	public static String NonReferencedResourceDialog_selectProjectToReceiveCopy;
+	public static String NonReferencedResourceDialog_selectTheFolderResourceCopy;
+	public static String NonReferencedResourceDialog_url;
+	public static String NonReferencedResourceDialog_useAnyway;
+	public static String ProjectFolderPickerDialog_0;
+	public static String ProjectFolderPickerDialog_6;
+	public static String ProjectFolderPickerDialog_sourceResourceDirectory;
+	public static String ProjectFolderPickerDialog_sourceResourceName;
+	public static String ProjectFolderPickerDialog_useSourceDirectory;
+	public static String ReferencedProjectPickerDialog_selectReferencedProject;
+	public static String TargetPlatformClassContributionCollector_classes;
+	public static String TargetPlatformContributionCollector_pleaseWait;
+	public static String TargetPlatformContributionCollector_updatingTargetPlatformCache;
+	public static String TargetPlatformIconContributionCollector_images;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java
new file mode 100644
index 0000000000..eea44f5949
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator;
+
+import java.util.regex.Pattern;
+
+/**
+ * A contribution collector encompassing the current target platform.<br />
+ * Uses FilterEx for bundle, package, and location filtering
+ *
+ * @author Steven Spungin
+ *
+ */
+public class TargetPlatformClassContributionCollector extends TargetPlatformContributionCollector {
+
+	protected TargetPlatformClassContributionCollector(String cacheName) {
+		super(cacheName);
+	}
+
+	static final private Pattern pattern = Pattern.compile("(.*/)?([^/]+)\\.class"); //$NON-NLS-1$
+	protected static TargetPlatformClassContributionCollector instance;
+
+	static public TargetPlatformClassContributionCollector getInstance() {
+		if (instance == null) {
+			instance = new TargetPlatformClassContributionCollector(Messages.TargetPlatformClassContributionCollector_classes);
+		}
+		return instance;
+	}
+
+	@Override
+	protected boolean shouldIgnore(String name) {
+		return name.contains("$"); //$NON-NLS-1$
+	}
+
+	@Override
+	protected Pattern getFilePattern() {
+		return pattern;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
new file mode 100644
index 0000000000..1a5addaf25
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
@@ -0,0 +1,515 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.InvocationTargetException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.e4.tools.emf.ui.common.FilterEx;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
+import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider;
+import org.eclipse.e4.tools.emf.ui.common.ResourceSearchScope;
+import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FilteredContributionDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.pde.core.plugin.IPluginBase;
+import org.eclipse.pde.core.plugin.IPluginModelBase;
+import org.eclipse.pde.internal.core.PDECore;
+import org.eclipse.pde.internal.core.TargetPlatformHelper;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+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.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+
+/**
+ * A contribution collector encompassing the current target platform.<br />
+ * Uses FilterEx for bundle, package, and location filtering.<br />
+ * This implementation finds resources based on file names, not by parsing file
+ * contents.
+ *
+ * @author Steven Spungin
+ *
+ */
+public abstract class TargetPlatformContributionCollector extends ClassContributionCollector {
+
+	ArrayList<Entry> cacheEntry = new ArrayList<Entry>();
+	HashSet<String> cacheBundleId = new HashSet<String>();
+	HashSet<String> cachePackage = new HashSet<String>();
+	HashSet<String> cacheLocation = new HashSet<String>();
+	private Pattern patternFile;
+	protected String cacheName;
+
+	static class Entry {
+		String name;
+		String path;
+		String installLocation;
+		String relativePath;
+		String bundleSymName;
+		String pakage;
+	}
+
+	@SuppressWarnings("unused")
+	private TargetPlatformContributionCollector() {
+	}
+
+	protected TargetPlatformContributionCollector(String cacheName) {
+
+		this.cacheName = cacheName;
+		patternFile = getFilePattern();
+
+		addContributor(new IClassContributionProvider() {
+
+			@Override
+			public void findContribution(Filter filter, ContributionResultHandler handler) {
+
+				Pattern patternName = Pattern.compile(filter.namePattern, Pattern.CASE_INSENSITIVE);
+
+				reloadCache(false);
+
+				int maxResults = filter.maxResults;
+				if (maxResults == 0) {
+					maxResults = 100;
+				}
+
+				int found = 0;
+				boolean more = false;
+				for (Entry e : cacheEntry) {
+					// Check for FilterEx filters
+					if (filter instanceof FilterEx) {
+						FilterEx filterEx = (FilterEx) filter;
+						if (E.notEmpty(filterEx.getBundles())) {
+							if (!filterEx.getBundles().contains(e.bundleSymName)) {
+								continue;
+							}
+						}
+						if (E.notEmpty(filterEx.getPackages())) {
+							if (!filterEx.getPackages().contains(e.pakage)) {
+								continue;
+							}
+						}
+						if (E.notEmpty(filterEx.getLocations())) {
+							boolean locationFound = false;
+							for (String location : filterEx.getLocations()) {
+								if (e.installLocation.startsWith(location)) {
+									locationFound = true;
+									break;
+								}
+							}
+							if (!locationFound) {
+								continue;
+							}
+						}
+						if (filterEx.isIncludeNonBundles() == false) {
+							if (e.bundleSymName == null) {
+								continue;
+							}
+						}
+						if (filterEx.getSearchScope().contains(ResourceSearchScope.WORKSPACE)) {
+							if (filter.project != null) {
+								IWorkspace workspace = filter.project.getWorkspace();
+								boolean fnd = false;
+								for (IProject project : workspace.getRoot().getProjects()) {
+									// String path =
+									// project.getLocationURI().getPath();
+									String path = project.getName();
+									if (e.installLocation.contains(path)) {
+										fnd = true;
+										break;
+									}
+								}
+								if (!fnd) {
+									continue;
+								}
+							}
+						}
+					}
+					Matcher m = patternName.matcher(e.name);
+					if (m.find()) {
+						found++;
+						if (found > maxResults) {
+							more = true;
+							handler.moreResults(-1, filter);
+							break;
+						} else {
+							handler.result(makeData(e));
+						}
+					}
+
+				}
+				if (!more) {
+					handler.moreResults(0, filter);
+				}
+			}
+		});
+
+		addModelElementContributor(new IModelElementProvider() {
+
+			@Override
+			public void getModelElements(Filter filter, ModelResultHandler handler) {
+				// TODO Auto-generated method stub
+			}
+
+			@Override
+			public void clearCache() {
+				cacheEntry.clear();
+				cacheBundleId.clear();
+				cachePackage.clear();
+				cacheLocation.clear();
+				outputDirectories.clear();
+			}
+		});
+	}
+
+	protected ContributionData makeData(Entry e) {
+		// If class is in a java project, strip the source directory
+		// String path = e.path;// .replace("/", ".") + e.name;
+		// path = stripSourceDirectory(path, e.installLocation);
+		IPath ip = Path.fromOSString(e.path);
+		ip = ip.addTrailingSeparator().makeRelative();
+		ip = ip.append(e.name);
+		String className = ip.toOSString().replace('/', '.');
+		ContributionData data = new ContributionData(e.bundleSymName, className, "Java", e.installLocation); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		data.installLocation = e.installLocation;
+		data.resourceRelativePath = e.relativePath;
+		return data;
+	}
+
+	/**
+	 *
+	 * @return A copy of the bundle IDs in the cache.
+	 */
+	public Collection<String> getBundleIds() {
+		reloadCache(false);
+		return new ArrayList<String>(cacheBundleId);
+	}
+
+	/**
+	 *
+	 * @return A copy of the bundle IDs in the cache.
+	 */
+	public Collection<String> getPackages() {
+		reloadCache(false);
+		return new ArrayList<String>(cachePackage);
+	}
+
+	/**
+	 *
+	 * @return A copy of the bundle IDs in the cache.
+	 */
+	public Collection<String> getLocations() {
+		reloadCache(false);
+		return new ArrayList<String>(cacheLocation);
+	}
+
+	/**
+	 * Ensures the cache is loaded. By default it is loaded on first access, and
+	 * kept static until forced to reloaded.
+	 *
+	 * @param force
+	 *            true to force reload the cache
+	 */
+	private void reloadCache(boolean force) {
+		if (cacheEntry.isEmpty() || force) {
+			cacheEntry.clear();
+			cacheBundleId.clear();
+			cachePackage.clear();
+			cacheLocation.clear();
+			outputDirectories.clear();
+
+			ProgressMonitorDialog dlg = new ProgressMonitorDialog(Display.getDefault().getActiveShell()) {
+
+				@Override
+				protected Control createContents(Composite parent) {
+					// TODO odd this is not a bean.
+					Composite ret = (Composite) super.createContents(parent);
+					Label label = new Label(ret, SWT.NONE);
+					label.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false, 2, 1));
+					label.setText(Messages.TargetPlatformContributionCollector_pleaseWait);
+
+					return ret;
+				}
+			};
+			try {
+				dlg.run(true, true, new IRunnableWithProgress() {
+
+					@Override
+					public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+
+						// load workspace projects
+						for (final IProject pj : PDECore.getWorkspace().getRoot().getProjects()) {
+							if (monitor.isCanceled()) {
+								break;
+							}
+							String rootDirectory = pj.getLocation().toOSString();
+							TargetPlatformContributionCollector.this.visit(monitor, FilteredContributionDialog.getBundle(rootDirectory), rootDirectory, new File(rootDirectory));
+						}
+
+						// load target platform bundles
+						IPluginModelBase[] models = TargetPlatformHelper.getPDEState().getTargetModels();
+						monitor.beginTask(Messages.TargetPlatformContributionCollector_updatingTargetPlatformCache + cacheName + ")", models.length); //$NON-NLS-2$
+						for (IPluginModelBase pluginModelBase : models) {
+							monitor.subTask(pluginModelBase.getPluginBase().getId());
+							monitor.worked(1);
+							if (monitor.isCanceled()) {
+								break;
+							}
+
+							IPluginBase pluginBase = pluginModelBase.getPluginBase();
+							if (pluginBase == null) {
+								// bundle = getBundle(new File())
+								continue;
+							}
+							URL url;
+							try {
+								String installLocation = pluginModelBase.getInstallLocation();
+								if (installLocation.endsWith(".jar")) { //$NON-NLS-1$
+									url = new URL("file://" + installLocation); //$NON-NLS-1$
+									ZipInputStream zis = new ZipInputStream(url.openStream());
+									while (true) {
+										ZipEntry entry = zis.getNextEntry();
+										if (entry == null) {
+											break;
+										} else {
+											String name2 = entry.getName();
+											if (shouldIgnore(name2)) {
+												continue;
+											}
+											Matcher m = patternFile.matcher(name2);
+											if (m.matches()) {
+												Entry e = new Entry();
+												e.installLocation = installLocation;
+												cacheLocation.add(installLocation);
+												e.name = m.group(2);
+												e.path = m.group(1);
+												if (e.path != null) {
+													e.pakage = e.path.replace("/", "."); //$NON-NLS-1$ //$NON-NLS-2$
+													if (e.pakage.startsWith(".")) { //$NON-NLS-1$
+														e.pakage = e.pakage.substring(1);
+													}
+													if (e.pakage.endsWith(".")) { //$NON-NLS-1$
+														e.pakage = e.pakage.substring(0, e.pakage.length() - 1);
+													}
+												} else {
+													e.pakage = ""; //$NON-NLS-1$
+												}
+												cachePackage.add(e.pakage);
+
+												e.bundleSymName = pluginBase.getId();
+												if (e.path == null) {
+													e.path = ""; //$NON-NLS-1$
+												}
+												cacheEntry.add(e);
+												cacheBundleId.add(pluginBase.getId());
+
+												//
+												// System.out.println(group
+												// + " -> "
+												// +
+												// m.group(2));
+											}
+										}
+									}
+								} else {
+									// not a jar file
+									String bundle = getBundle(new File(installLocation));
+									if (bundle != null) {
+										visit(monitor, bundle, installLocation, new File(installLocation));
+									}
+								}
+							} catch (MalformedURLException e) {
+								// TODO Auto-generated catch block
+								e.printStackTrace();
+							} catch (IOException e) {
+								// TODO Auto-generated catch block
+								e.printStackTrace();
+							}
+						}
+						monitor.done();
+					}
+				});
+			} catch (InvocationTargetException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			} catch (InterruptedException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			}
+		}
+	}
+
+	// @Refactor
+	static public String getBundle(File file) {
+		if (file.isDirectory() == false) {
+			return null;
+		}
+
+		File f = new File(file, "META-INF/MANIFEST.MF"); //$NON-NLS-1$
+
+		if (f.exists() && f.isFile()) {
+			BufferedReader r = null;
+			try {
+				InputStream s = new FileInputStream(f);
+				r = new BufferedReader(new InputStreamReader(s));
+				String line;
+				while ((line = r.readLine()) != null) {
+					if (line.startsWith("Bundle-SymbolicName:")) { //$NON-NLS-1$
+						int start = line.indexOf(':');
+						int end = line.indexOf(';');
+						if (end == -1) {
+							end = line.length();
+						}
+						return line.substring(start + 1, end).trim();
+					}
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			} finally {
+				if (r != null) {
+					try {
+						r.close();
+					} catch (IOException e) {
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	protected void visit(IProgressMonitor monitor, String bundleName, String installLocation, File file) {
+		for (File fChild : file.listFiles()) {
+			if (fChild.isDirectory()) {
+				visit(monitor, bundleName, installLocation, fChild);
+			} else {
+				String name2 = fChild.getAbsolutePath().substring(installLocation.length() + 1);
+				name2 = stripOutputDirectory(name2, installLocation);
+				if (shouldIgnore(name2)) {
+					continue;
+				}
+				Matcher m = patternFile.matcher(name2);
+				if (m.matches()) {
+					Entry e = new Entry();
+					e.installLocation = installLocation;
+					cacheLocation.add(installLocation);
+					e.name = m.group(2);
+					if (e.name.contains("$")) { //$NON-NLS-1$
+						continue;
+					}
+					e.path = m.group(1);
+					if (e.path != null) {
+						e.pakage = e.path.replace("/", "."); //$NON-NLS-1$ //$NON-NLS-2$
+						if (e.pakage.startsWith(".")) { //$NON-NLS-1$
+							e.pakage = e.pakage.substring(1);
+						}
+						if (e.pakage.endsWith(".")) { //$NON-NLS-1$
+							e.pakage = e.pakage.substring(0, e.pakage.length() - 1);
+						}
+					} else {
+						e.pakage = ""; //$NON-NLS-1$
+					}
+					if (e.path == null) {
+						e.path = ""; //$NON-NLS-1$
+					}
+					e.relativePath = Path.fromOSString(file.getAbsolutePath().replace(e.installLocation, "")).makeRelative().toOSString(); //$NON-NLS-1$
+
+					e.bundleSymName = bundleName;
+					// TODO we need project to strip source paths.
+					// e.pakage = e.pakage.replaceAll("^bin.", "");
+					cachePackage.add(e.pakage);
+					cacheEntry.add(e);
+					if (bundleName != null) {
+						cacheBundleId.add(bundleName);
+					}
+				}
+			}
+		}
+
+	}
+
+	static private String stripOutputDirectory(String path, String installLocation) {
+		if (installLocation.matches(".*\\.jar")) { //$NON-NLS-1$
+			return path;
+		}
+		for (String sourceDirectory : getOutputDirectories(installLocation)) {
+			if (path.startsWith(sourceDirectory)) {
+				path = path.substring(sourceDirectory.length());
+				break;
+			}
+		}
+		return path;
+	}
+
+	/**
+	 * A cache of the output directories for install locations (if install
+	 * location has a classpath file with appropriate output entries)
+	 */
+	static private HashMap<String, List<String>> outputDirectories = new HashMap<String, List<String>>();
+
+	// Returns the Eclipse output directories for an install location. The
+	// directories are relative to the install location.
+	// <classpathentry kind="output" path="bin"/>
+	static private List<String> getOutputDirectories(String installLocation) {
+		List<String> ret = outputDirectories.get(installLocation);
+		if (ret == null) {
+			ret = new ArrayList<String>();
+			outputDirectories.put(installLocation, ret);
+			try {
+				Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new File(installLocation + File.separator + ".classpath")); //$NON-NLS-1$
+				XPath xp = XPathFactory.newInstance().newXPath();
+				NodeList list = (NodeList) xp.evaluate("//classpathentry[@kind='output']/@path", doc, XPathConstants.NODESET); //$NON-NLS-1$
+				for (int i = 0; i < list.getLength(); i++) {
+					String value = list.item(i).getNodeValue();
+					ret.add(value);
+				}
+			} catch (Exception e) {
+			}
+		}
+		return ret;
+	}
+
+	protected boolean shouldIgnore(String name) {
+		return false;
+	}
+
+	protected abstract Pattern getFilePattern();
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java
new file mode 100644
index 0000000000..56eeb909c4
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator;
+
+import java.util.regex.Pattern;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
+
+/**
+ * A contribution collector encompassing the current target platform.<br />
+ * Uses FilterEx for bundle, package, and location filtering
+ *
+ * @author Steven Spungin
+ *
+ */
+public class TargetPlatformIconContributionCollector extends TargetPlatformContributionCollector {
+
+	protected TargetPlatformIconContributionCollector(String cacheName) {
+		super(cacheName);
+	}
+
+	static final Pattern pattern = Pattern.compile("(.*/)?([^/]+\\.(jpg|jpeg|png|gif))"); //$NON-NLS-1$
+	protected static TargetPlatformIconContributionCollector instance;
+
+	static public TargetPlatformIconContributionCollector getInstance() {
+		if (instance == null) {
+			instance = new TargetPlatformIconContributionCollector(Messages.TargetPlatformIconContributionCollector_images);
+		}
+		return instance;
+	}
+
+	@Override
+	protected Pattern getFilePattern() {
+		return pattern;
+	};
+
+	@Override
+	protected ContributionData makeData(Entry e) {
+		ContributionData data = new ContributionData(e.bundleSymName, null, "Java", e.path + e.name); //$NON-NLS-1$
+		data.installLocation = e.installLocation;
+		data.resourceRelativePath = data.iconPath;
+		return data;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
new file mode 100644
index 0000000000..27b6dbe4b0
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
@@ -0,0 +1,331 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others. All rights reserved. This
+ * program and the accompanying materials are made available under the 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: Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+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.Link;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
+
+/**
+ * A dialog for creating, editing, replacing, or removing a bundleclass.
+ *
+ * @author Steven Spungin
+ *
+ */
+public class BundleClassDialog extends Dialog implements UriDialog {
+	private Text txtUri;
+	private Text txtBundle;
+	private Text txtClass;
+	private Text txtPackage;
+	public String uri = ""; //$NON-NLS-1$
+	private String bundle = ""; //$NON-NLS-1$
+	private String clazz = ""; //$NON-NLS-1$
+	private String pakage = ""; //$NON-NLS-1$
+	private Composite parent;
+	protected boolean ignoreModify;
+	private IEclipseContext context;
+
+	static Pattern patternBundleClass = Pattern.compile("bundleclass:/*([^/]+)/((.*)\\.)?([^\\.]+)"); //$NON-NLS-1$
+
+	public BundleClassDialog(Shell parentShell, IEclipseContext context) {
+		super(parentShell);
+		this.context = context;
+	}
+
+	@Override
+	protected void configureShell(Shell newShell) {
+		newShell.setText(Messages.BundleClassDialog_bundleClassEditor);
+		super.configureShell(newShell);
+	}
+
+	@Override
+	protected int getShellStyle() {
+		return super.getShellStyle() | SWT.RESIZE;
+	}
+
+	@Override
+	protected Control createDialogArea(final Composite parent) {
+		this.parent = parent;
+		Composite composite = new Composite(parent, SWT.NONE);
+		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		composite.setLayout(new GridLayout(2, false));
+
+		ToolBar toolBar = new ToolBar(composite, SWT.NO_FOCUS);
+		toolBar.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
+
+		{
+			Label lbl = new Label(composite, SWT.NONE);
+			lbl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			lbl.setText(Messages.BundleClassDialog_uri);
+
+			txtUri = new Text(composite, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
+			txtUri.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			txtUri.setText("bundleclass://"); //$NON-NLS-1$
+
+			txtUri.addModifyListener(new ModifyListener() {
+
+				@Override
+				public void modifyText(ModifyEvent e) {
+					if (ignoreModify) {
+						return;
+					}
+					ignoreModify = true;
+					setUri(txtUri.getText());
+					txtBundle.setText(bundle);
+					txtPackage.setText(pakage);
+					txtClass.setText(clazz);
+					ignoreModify = false;
+					parent.pack();
+				}
+			});
+		}
+
+		// common listener for text boxes
+		ModifyListener listener = new ModifyListener() {
+
+			@Override
+			public void modifyText(ModifyEvent e) {
+				if (ignoreModify) {
+					return;
+				}
+				ignoreModify = true;
+				String prefix;
+				prefix = "bundleclass://"; //$NON-NLS-1$
+				setUri(prefix + txtBundle.getText() + "/" + txtPackage.getText() + "." + txtClass.getText()); //$NON-NLS-1$//$NON-NLS-2$
+				txtUri.setText(getUri());
+				ignoreModify = false;
+			}
+		};
+
+		{
+			Link lbl = new Link(composite, SWT.NONE);
+			lbl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			lbl.setText("<A>" + Messages.BundleClassDialog_bundle + "</A>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+			txtBundle = new Text(composite, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
+			txtBundle.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			txtBundle.addModifyListener(listener);
+
+			lbl.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					IEclipseContext childCtx = context.createChild();
+					childCtx.set(Bundle.class, FrameworkUtil.getBundle(FindContributionDialog.class));
+					childCtx.set("bundle", getBundle()); //$NON-NLS-1$
+					childCtx.set("package", getPackage()); //$NON-NLS-1$
+					childCtx.set("mode", "show-bundles"); //$NON-NLS-1$ //$NON-NLS-2$
+					FindContributionDialog dlg = new FindContributionDialog(childCtx);
+					if (dlg.open() == Dialog.OK) {
+						String uri = getUri(dlg);
+						Matcher matcher = getMatcher(uri);
+						if (matcher.matches()) {
+							txtBundle.setText(matcher.group(1));
+						}
+					}
+				}
+			});
+		}
+
+		{
+			Link lbl = new Link(composite, SWT.NONE);
+			lbl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			lbl.setText("<A>" + Messages.BundleClassDialog_package + "</A>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+			txtPackage = new Text(composite, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
+			txtPackage.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			txtPackage.addModifyListener(listener);
+
+			lbl.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					IEclipseContext childCtx = context.createChild();
+					childCtx.set(Bundle.class, FrameworkUtil.getBundle(FindContributionDialog.class));
+					childCtx.set("bundle", getBundle()); //$NON-NLS-1$
+					childCtx.set("package", getPackage()); //$NON-NLS-1$
+					childCtx.set("mode", "show-packages"); //$NON-NLS-1$ //$NON-NLS-2$
+					FindContributionDialog dlg = new FindContributionDialog(childCtx);
+					if (dlg.open() == Dialog.OK) {
+						String uri = getUri(dlg);
+						Matcher matcher = getMatcher(uri);
+						if (matcher.matches()) {
+							txtPackage.setText(matcher.group(3));
+						}
+					}
+				}
+			});
+		}
+
+		{
+			Link lbl = new Link(composite, SWT.NONE);
+			lbl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			lbl.setText("<A>" + Messages.BundleClassDialog_class + "</A>"); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
+
+			txtClass = new Text(composite, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
+			txtClass.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			txtClass.addModifyListener(listener);
+
+			lbl.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					IEclipseContext childCtx = context.createChild();
+					childCtx.set(Bundle.class, FrameworkUtil.getBundle(FindContributionDialog.class));
+					childCtx.set("bundle", getBundle()); //$NON-NLS-1$
+					childCtx.set("package", getPackage()); //$NON-NLS-1$
+
+					FindContributionDialog dlg = new FindContributionDialog(childCtx);
+					if (dlg.open() == Window.OK) {
+						txtUri.setText(getUri(dlg));
+					}
+				}
+			});
+		}
+
+		ToolItem btnGo = new ToolItem(toolBar, SWT.PUSH);
+		// btnGo.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false,
+		// false, 2, 1));
+		btnGo.setText(Messages.BundleClassDialog_create_goto);
+		btnGo.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				try {
+					MPart dummyPart = MBasicFactory.INSTANCE.createPart();
+					dummyPart.setContributionURI(getUri());
+					final IContributionClassCreator c = context.get(ModelEditor.class).getContributionCreator(org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.PART);
+					c.createOpen(dummyPart, context.get(EditingDomain.class), context.get(IProject.class), getShell());
+					setUri(dummyPart.getContributionURI());
+					okPressed();
+				} catch (Exception e2) {
+					// TODO: handle exception
+				}
+			}
+		});
+
+		ToolItem btnFind = new ToolItem(toolBar, SWT.PUSH);
+		// btnFind.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false,
+		// false, 2, 1));
+		btnFind.setText(Messages.BundleClassDialog_find + "..."); //$NON-NLS-2$ //$NON-NLS-1$
+		btnFind.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				IEclipseContext childCtx = context.createChild();
+				childCtx.set(Bundle.class, FrameworkUtil.getBundle(FindContributionDialog.class));
+				FindContributionDialog dialog = new FindContributionDialog(childCtx);
+				if (dialog.open() == Dialog.OK) {
+					txtUri.setText(getUri(dialog));
+				}
+			}
+		});
+
+		ToolItem btnRemove = new ToolItem(toolBar, SWT.PUSH);
+		// btnRemove.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER,
+		// false, false, 2, 1));
+		btnRemove.setText("Remove"); //$NON-NLS-1$
+		btnRemove.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				txtUri.setText(""); //$NON-NLS-1$
+				close();
+			}
+		});
+
+		txtUri.setText(uri);
+		txtBundle.setText(bundle);
+		txtClass.setText(clazz);
+		return composite;
+	}
+
+	protected String getUri(FindContributionDialog dlg) {
+		return dlg.getBundleclassUri();
+	}
+
+	@Override
+	public int open() {
+		int ret = super.open();
+		return ret;
+	}
+
+	@Override
+	public String getUri() {
+		return uri;
+	}
+
+	@Override
+	public void setUri(String uri) {
+		this.uri = uri == null ? "" : uri.toString(); //$NON-NLS-1$
+		Matcher matcher = getMatcher(this.uri);
+		if (matcher.matches()) {
+			bundle = matcher.group(1);
+			pakage = matcher.group(3);
+			if (pakage == null) {
+				pakage = ""; //$NON-NLS-1$
+			}
+			clazz = matcher.group(4);
+		} else {
+			bundle = ""; //$NON-NLS-1$
+			pakage = ""; //$NON-NLS-1$
+			clazz = ""; //$NON-NLS-1$
+		}
+	}
+
+	protected String getBundle() {
+		return bundle;
+	}
+
+	protected void setBundle(String bundle) {
+		this.bundle = bundle;
+	}
+
+	protected String getClazz() {
+		return clazz;
+	}
+
+	protected void setClazz(String clazz) {
+		this.clazz = clazz;
+	}
+
+	protected String getPackage() {
+		return pakage;
+	}
+
+	protected void setPackage(String pakage) {
+		this.pakage = pakage;
+	}
+
+	private Matcher getMatcher(String uri) {
+		return patternBundleClass.matcher(uri);
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
new file mode 100644
index 0000000000..7a42234eac
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
@@ -0,0 +1,424 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *	   Lars Vogel <lars.vogel@gmail.com> - Enhancements
+ *     Steven Spungin <steven@spungin.tv> - Modified to be generic picker, Bug 424730
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
+
+import java.util.Iterator;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionResultHandler;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.graphics.Image;
+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.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * A find dialog for model contributions. List can be filtered by bundle and/or
+ * package
+ *
+ * @author Steven Spungin
+ *
+ */
+public class FindContributionDialog extends TitleAreaDialog {
+	private IProject project;
+	private Image javaClassImage;
+	private TableViewer viewer;
+	private Messages Messages;
+	private String bundleclassUri;
+	@SuppressWarnings("unused")
+	private IEclipseContext context;
+	private String packageFilter;
+	private String bundleFilter;
+	private Bundle bundle;
+	private String mode;
+	private Image titleImage;
+	private String platformUri;
+
+	public FindContributionDialog(IEclipseContext context) {
+		super(context.get(Shell.class));
+		this.context = context;
+		this.project = context.get(IProject.class);
+		this.Messages = context.get(Messages.class);
+		packageFilter = (String) context.get("package"); //$NON-NLS-1$
+		bundleFilter = (String) context.get("bundle"); //$NON-NLS-1$
+		bundle = context.get(Bundle.class);
+		mode = (String) context.get("mode"); //$NON-NLS-1$
+	}
+
+	@Override
+	protected boolean isResizable() {
+		return true;
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite comp = (Composite) super.createDialogArea(parent);
+
+		// TODO param
+		getShell().setText(Messages.ContributionClassDialog_ShellTitle);
+
+		if ("show-bundles".equals(mode)) { //$NON-NLS-1$
+			// TODO create icon
+		} else if ("show-packages".equals(mode)) { //$NON-NLS-1$
+			// TODO create icon
+		} else if ("show-icons".equals(mode)) { //$NON-NLS-1$
+			// TODO create icon
+		} else {
+			titleImage = new Image(comp.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newclass_wiz.png")); //$NON-NLS-1$
+			setTitleImage(titleImage);
+		}
+
+		getShell().addDisposeListener(new DisposeListener() {
+
+			@Override
+			public void widgetDisposed(DisposeEvent e) {
+				javaClassImage.dispose();
+				if (titleImage != null) {
+					titleImage.dispose();
+				}
+			}
+		});
+
+		javaClassImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/class_obj.gif")); //$NON-NLS-1$
+
+		Composite container = new Composite(comp, SWT.NONE);
+		container.setLayoutData(new GridData(GridData.FILL_BOTH));
+		container.setLayout(new GridLayout(2, false));
+
+		Label l = new Label(container, SWT.NONE);
+		// TODO param
+		l.setText(Messages.ContributionClassDialog_Label_Classname);
+
+		final Text t = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		// TODO param
+		t.setMessage(Messages.ContributionClassDialog_FilterText_Message);
+
+		new Label(container, SWT.NONE);
+
+		viewer = new TableViewer(container, SWT.FULL_SELECTION);
+		GridData gd = new GridData(GridData.FILL_BOTH);
+		viewer.getControl().setLayoutData(gd);
+		viewer.setContentProvider(new ObservableListContentProvider());
+		viewer.setLabelProvider(new StyledCellLabelProvider() {
+			@Override
+			public void update(ViewerCell cell) {
+				ContributionData data = (ContributionData) cell.getElement();
+				StyledString styledString = new StyledString();
+				if ("show-bundles".equals(mode)) { //$NON-NLS-1$
+					styledString.append(data.bundleName, StyledString.DECORATIONS_STYLER);
+				} else if ("show-packages".equals(mode)) { //$NON-NLS-1$
+					int dot = data.className.lastIndexOf("."); //$NON-NLS-1$
+					String packageName;
+					if (dot >= 0) {
+						packageName = data.className.substring(0, dot);
+					} else {
+						packageName = ""; //$NON-NLS-1$
+					}
+					styledString.append(packageName, StyledString.DECORATIONS_STYLER);
+				} else if ("show-icons".equals(mode)) { //$NON-NLS-1$
+					styledString.append(data.iconPath, null);
+
+					if (data.bundleName != null) {
+						styledString.append(" - " + data.bundleName, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+					}
+
+					if (data.sourceType != null) {
+						styledString.append(" - ", StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+						styledString.append(data.sourceType + "", StyledString.COUNTER_STYLER); //$NON-NLS-1$
+					}
+
+					if (data.iconPath == null) {
+						cell.setImage(javaClassImage);
+					}
+				} else {
+					styledString.append(data.className, null);
+
+					if (data.bundleName != null) {
+						styledString.append(" - " + data.bundleName, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+					}
+
+					if (data.sourceType != null) {
+						styledString.append(" - ", StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+						styledString.append(data.sourceType + "", StyledString.COUNTER_STYLER); //$NON-NLS-1$
+					}
+
+					if (data.iconPath == null) {
+						cell.setImage(javaClassImage);
+					}
+				}
+
+				cell.setText(styledString.getString());
+				cell.setStyleRanges(styledString.getStyleRanges());
+			}
+		});
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+
+			@Override
+			public void doubleClick(DoubleClickEvent event) {
+				okPressed();
+			}
+		});
+
+		final WritableList list = new WritableList();
+		viewer.setInput(list);
+
+		final ClassContributionCollector collector = getCollector();
+
+		t.addModifyListener(new ModifyListener() {
+			private ContributionResultHandlerImpl currentResultHandler;
+
+			@Override
+			public void modifyText(ModifyEvent e) {
+				if (currentResultHandler != null) {
+					currentResultHandler.cancled = true;
+				}
+				list.clear();
+				currentResultHandler = new ContributionResultHandlerImpl(list);
+				Filter filter = new Filter(project, t.getText());
+				collector.findContributions(filter, currentResultHandler);
+				t.addKeyListener(new KeyAdapter() {
+					@Override
+					public void keyPressed(KeyEvent e) {
+						if (e.keyCode == SWT.ARROW_DOWN) {
+							if (viewer.getTable().getItemCount() > 0) {
+								viewer.getTable().setFocus();
+								viewer.getTable().select(0);
+							}
+						}
+					}
+				});
+				viewer.getTable().addKeyListener(new KeyAdapter() {
+					@Override
+					public void keyPressed(KeyEvent e) {
+						super.keyPressed(e);
+						if ((e.keyCode == SWT.ARROW_UP) && (viewer.getTable().getSelectionIndex() == 0)) {
+							t.setFocus();
+						}
+					}
+				});
+			}
+		});
+
+		viewer.setFilters(new ViewerFilter[] { new ViewerFilter() {
+
+			@Override
+			public boolean select(Viewer viewer, Object parentElement, Object element) {
+				ContributionData cd = (ContributionData) element;
+				if ("show-bundles".equals(mode)) { //$NON-NLS-1$
+					// only add first item from each bundle
+					boolean found = false;
+					for (Iterator it = list.iterator(); it.hasNext();) {
+						ContributionData cd2 = (ContributionData) it.next();
+						if (cd2.bundleName == null || cd2.bundleName.equals(cd.bundleName)) {
+							if (found == false) {
+								found = true;
+							} else {
+								return false;
+							}
+						}
+					}
+					return true;
+				} else if ("show-packages".equals(mode)) { //$NON-NLS-1$
+					if (bundleFilter != null && bundleFilter.isEmpty() == false) {
+						if (!bundleFilter.equals(cd.bundleName)) {
+							return false;
+						}
+					}
+					String packageName;
+					int last = cd.className.lastIndexOf("."); //$NON-NLS-1$
+					if (last >= 0) {
+						packageName = cd.className.substring(0, last);
+					} else {
+						packageName = ""; //$NON-NLS-1$
+					}
+					// only add first item from each package
+					boolean found = false;
+					for (Iterator it = list.iterator(); it.hasNext();) {
+						boolean matches = false;
+						ContributionData cd2 = (ContributionData) it.next();
+						if (packageName.isEmpty() && cd2.className.contains(".") == false) { //$NON-NLS-1$
+							matches = true;
+						} else if (cd2.className.startsWith(packageName + ".")) { //$NON-NLS-1$
+							matches = true;
+						}
+						if (matches) {
+							if (found == false) {
+								found = true;
+							} else {
+								return false;
+							}
+						}
+					}
+					return true;
+				} else if ("show-icons".equals(mode)) { //$NON-NLS-1$
+					if (cd.iconPath == null) {
+						return false;
+					}
+					if (bundleFilter != null && bundleFilter.isEmpty() == false) {
+						if (!bundleFilter.equals(cd.bundleName)) {
+							return false;
+						}
+					}
+					if (packageFilter != null && packageFilter.isEmpty() == false) {
+						if (!cd.className.startsWith(packageFilter + ".")) { //$NON-NLS-1$
+							return false;
+						}
+					}
+					return true;
+				} else {
+					if (bundleFilter != null && bundleFilter.isEmpty() == false) {
+						if (!bundleFilter.equals(cd.bundleName)) {
+							return false;
+						}
+					}
+					if (packageFilter != null && packageFilter.isEmpty() == false) {
+						if (!cd.className.startsWith(packageFilter + ".")) { //$NON-NLS-1$
+							return false;
+						}
+					}
+
+					return true;
+				}
+			}
+		} });
+
+		StringBuilder sbFind = new StringBuilder();
+
+		if ("show-bundles".equals(mode)) { //$NON-NLS-1$
+			setTitle(org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_findBundle);
+			sbFind.append(org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_findBundle);
+		} else if ("show-packages".equals(mode)) { //$NON-NLS-1$
+			setTitle(org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_findPackage);
+			sbFind.append(org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_findPackage);
+			if (E.notEmpty(bundleFilter)) {
+				sbFind.append(" " + org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_inBundle + " " + bundleFilter); //$NON-NLS-1$ //$NON-NLS-3$
+			}
+		} else if ("show-icons".equals(mode)) { //$NON-NLS-1$
+			setTitle(org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_findIcon);
+			sbFind.append(org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_findIcon);
+			if (E.notEmpty(bundleFilter)) {
+				sbFind.append(" " + org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_inBundle + " " + bundleFilter); //$NON-NLS-1$ //$NON-NLS-3$
+			}
+			if (E.notEmpty(packageFilter)) {
+				sbFind.append(" " + org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_inPackage + " " + packageFilter); //$NON-NLS-1$ //$NON-NLS-3$
+			}
+		} else {
+			setTitle(org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_findClass);
+			sbFind.append(org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_findClass);
+			if (E.notEmpty(bundleFilter)) {
+				sbFind.append(" " + org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_inBundle + " " + bundleFilter); //$NON-NLS-1$ //$NON-NLS-3$
+			}
+			if (E.notEmpty(packageFilter)) {
+				sbFind.append(" " + org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_inPackage + " " + packageFilter); //$NON-NLS-1$ //$NON-NLS-3$
+			}
+		}
+		setMessage(sbFind.toString());
+
+		// preload list if few items
+		if (list.size() <= 30) {
+			t.notifyListeners(SWT.Modify, null);
+		}
+		return comp;
+	}
+
+	@Override
+	protected void okPressed() {
+		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+		if (!s.isEmpty()) {
+			ContributionData cd = (ContributionData) s.getFirstElement();
+			String uri = "bundleclass://" + cd.bundleName + "/" + cd.className; //$NON-NLS-1$ //$NON-NLS-2$
+			platformUri = "platform:/plugin/" + cd.bundleName + "/" + cd.className; //$NON-NLS-1$ //$NON-NLS-2$
+			setBundleclassUri(uri);
+			super.okPressed();
+		} else {
+			super.cancelPressed();
+		}
+	}
+
+	private ClassContributionCollector getCollector() {
+		if (bundle == null) {
+			return null;
+		}
+		BundleContext context = bundle.getBundleContext();
+		ServiceReference ref = context.getServiceReference(ClassContributionCollector.class.getName());
+		if (ref != null) {
+			return (ClassContributionCollector) context.getService(ref);
+		}
+		return null;
+	}
+
+	public String getBundleclassUri() {
+		return bundleclassUri;
+	}
+
+	public String getPlatformUri() {
+		return platformUri;
+	}
+
+	public void setBundleclassUri(String bundleclass) {
+		this.bundleclassUri = bundleclass;
+	}
+
+	private static class ContributionResultHandlerImpl implements ContributionResultHandler {
+		private boolean cancled = false;
+		private IObservableList list;
+
+		public ContributionResultHandlerImpl(IObservableList list) {
+			this.list = list;
+		}
+
+		@Override
+		public void result(ContributionData data) {
+			if (!cancled) {
+				list.add(data);
+			}
+		}
+
+		@Override
+		public void moreResults(int hint, Filter filter) {
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java
new file mode 100644
index 0000000000..d4716fa3f1
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ *******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
+
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AbstractIconDialogWithScopeAndFilter;
+import org.eclipse.swt.widgets.Shell;
+
+final class FindIconDialog extends AbstractIconDialogWithScopeAndFilter {
+	FindIconDialog(Shell parentShell, IEclipseContext context) {
+		super(parentShell, context);
+	}
+
+	@Override
+	protected String getShellTitle() {
+		return Messages.FindIconDialog_findIcon;
+	}
+
+	@Override
+	protected String getDialogTitle() {
+		return Messages.FindIconDialog_findIcon;
+	}
+
+	@Override
+	protected String getDialogMessage() {
+		return Messages.FindIconDialog_searchByFilename;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
new file mode 100644
index 0000000000..312364bc3d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
@@ -0,0 +1,307 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others. All rights reserved. This
+ * program and the accompanying materials are made available under the 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: Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AbstractIconDialogWithHardcodedScope;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AbstractIconDialogWithScopeAndFilter;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+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.Link;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
+
+/**
+ * A dialog for creating, editing, replacing, or removing a bundleclass.
+ *
+ * @author Steven Spungin
+ *
+ */
+public class IconDialog extends Dialog implements UriDialog {
+	private Text txtUri;
+	private Text txtBundle;
+	private Text txtIcon;
+	private Text txtPath;
+	public String uri = ""; //$NON-NLS-1$
+	private String bundle = ""; //$NON-NLS-1$
+	private String icon = ""; //$NON-NLS-1$
+	private String path = ""; //$NON-NLS-1$
+	protected boolean ignoreModify;
+	private IEclipseContext context;
+
+	static Pattern patternIcon = Pattern.compile("platform:/plugin/*([^/]+)/((.*)/)?([^/]+)"); //$NON-NLS-1$
+
+	public IconDialog(Shell parentShell, IEclipseContext context) {
+		super(parentShell);
+		this.context = context;
+	}
+
+	@Override
+	protected int getShellStyle() {
+		return super.getShellStyle() | SWT.RESIZE;
+	}
+
+	@Override
+	protected void configureShell(Shell newShell) {
+		newShell.setText(Messages.IconDialog_uriEditor);
+		super.configureShell(newShell);
+	}
+
+	@Override
+	protected Control createDialogArea(final Composite parent) {
+		Composite composite = new Composite(parent, SWT.NONE);
+		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		composite.setLayout(new GridLayout(2, false));
+
+		ToolBar toolBar = new ToolBar(composite, SWT.NO_FOCUS);
+		toolBar.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
+
+		{
+			Label lbl = new Label(composite, SWT.NONE);
+			lbl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			lbl.setText(Messages.IconDialog_uri);
+
+			txtUri = new Text(composite, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
+			txtUri.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			txtUri.setText("platform://plugin/"); //$NON-NLS-1$
+
+			txtUri.addModifyListener(new ModifyListener() {
+
+				@Override
+				public void modifyText(ModifyEvent e) {
+					if (ignoreModify) {
+						return;
+					}
+					ignoreModify = true;
+					setUri(txtUri.getText());
+					txtBundle.setText(bundle);
+					txtPath.setText(path);
+					txtIcon.setText(icon);
+					ignoreModify = false;
+					parent.pack();
+				}
+			});
+		}
+
+		// common listener for text boxes
+		ModifyListener listener = new ModifyListener() {
+
+			@Override
+			public void modifyText(ModifyEvent e) {
+				if (ignoreModify) {
+					return;
+				}
+				ignoreModify = true;
+				String prefix;
+
+				prefix = "platform:/plugin/"; //$NON-NLS-1$
+				setUri(prefix + txtBundle.getText() + "/" + txtPath.getText() + "/" + txtIcon.getText()); //$NON-NLS-1$//$NON-NLS-2$
+
+				txtUri.setText(getUri());
+				ignoreModify = false;
+			}
+		};
+
+		{
+			Link lbl = new Link(composite, SWT.NONE);
+			lbl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			lbl.setText("<A>" + Messages.IconDialog_bundle + "</A>"); //$NON-NLS-1$ //$NON-NLS-2$
+
+			txtBundle = new Text(composite, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
+			txtBundle.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			txtBundle.addModifyListener(listener);
+
+			lbl.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					IEclipseContext childCtx = context.createChild();
+					childCtx.set(Bundle.class, FrameworkUtil.getBundle(FindContributionDialog.class));
+					childCtx.set("bundle", getBundle()); //$NON-NLS-1$
+					childCtx.set("package", getPath()); //$NON-NLS-1$
+					childCtx.set("mode", "show-bundles"); //$NON-NLS-1$ //$NON-NLS-2$
+					FindContributionDialog dlg = new FindContributionDialog(childCtx);
+					if (dlg.open() == Dialog.OK) {
+						String uri = getUri(dlg);
+						Matcher matcher = getMatcher(uri);
+						if (matcher.matches()) {
+							txtBundle.setText(matcher.group(1));
+						}
+					}
+				}
+			});
+		}
+
+		{
+			Link lbl = new Link(composite, SWT.NONE);
+			lbl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			lbl.setText("path"); //$NON-NLS-1$
+
+			txtPath = new Text(composite, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
+			txtPath.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			txtPath.addModifyListener(listener);
+		}
+
+		{
+			Link lbl = new Link(composite, SWT.NONE);
+			lbl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			lbl.setText("<A>" + Messages.IconDialog_icon + "</A>"); //$NON-NLS-1$ //$NON-NLS-2$
+
+			txtIcon = new Text(composite, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
+			txtIcon.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			txtIcon.addModifyListener(listener);
+
+			lbl.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					IEclipseContext childCtx = context.createChild();
+					childCtx.set(Bundle.class, FrameworkUtil.getBundle(FindContributionDialog.class));
+					childCtx.set(Messages.IconDialog_bundle, getBundle());
+					childCtx.set(Messages.IconDialog_folder, getPath());
+					AbstractIconDialogWithHardcodedScope dlg = new AbstractIconDialogWithHardcodedScope(getParentShell(), childCtx) {
+
+						@Override
+						protected String getShellTitle() {
+							return org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.IconDialog_selectIcon;
+						}
+
+						@Override
+						protected String getDialogTitle() {
+							return org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.IconDialog_selectIcon_TITLE;
+						}
+
+						@Override
+						protected String getDialogMessage() {
+							return org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.IconDialog_selectIcon_MESSAGE;
+						}
+					};
+					if (dlg.open() == Dialog.OK) {
+						txtUri.setText(dlg.getValue());
+					}
+				}
+			});
+		}
+
+		ToolItem btnFind = new ToolItem(toolBar, SWT.PUSH);
+		// btnFind.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false,
+		// false, 2, 1));
+		btnFind.setText(Messages.IconDialog_find + "..."); //$NON-NLS-1$
+		btnFind.setImage(new Image(getShell().getDisplay(), getClass().getResourceAsStream("/icons/full/obj16/find.png"))); //$NON-NLS-1$
+		btnFind.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				IEclipseContext childCtx = context.createChild();
+				AbstractIconDialogWithScopeAndFilter dlg = new FindIconDialog(getParentShell(), childCtx);
+				if (dlg.open() == Dialog.OK) {
+					txtUri.setText(dlg.getValue());
+					// getContents().pack(true);
+					getShell().pack();
+				}
+			}
+		});
+
+		ToolItem btnRemove = new ToolItem(toolBar, SWT.PUSH);
+		// btnRemove.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER,
+		// false, false, 2, 1));
+		btnRemove.setText("Remove"); //$NON-NLS-1$
+		btnRemove.setImage(new Image(getShell().getDisplay(), getClass().getResourceAsStream("/icons/full/obj16/remove_filter.png"))); //$NON-NLS-1$
+		btnRemove.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				txtUri.setText(""); //$NON-NLS-1$
+				close();
+			}
+		});
+
+		txtUri.setText(uri);
+		txtBundle.setText(bundle);
+		txtIcon.setText(icon);
+		return composite;
+	}
+
+	protected String getUri(FindContributionDialog dlg) {
+		return dlg.getPlatformUri();
+	}
+
+	@Override
+	public int open() {
+		int ret = super.open();
+		return ret;
+	}
+
+	@Override
+	public String getUri() {
+		return uri;
+	}
+
+	@Override
+	public void setUri(String uri) {
+		this.uri = uri == null ? "" : uri.toString(); //$NON-NLS-1$
+		Matcher matcher = getMatcher(this.uri);
+		if (matcher.matches()) {
+			bundle = matcher.group(1);
+			path = matcher.group(3);
+			if (path == null) {
+				path = ""; //$NON-NLS-1$
+			}
+			icon = matcher.group(4);
+		} else {
+			bundle = ""; //$NON-NLS-1$
+			path = ""; //$NON-NLS-1$
+			icon = ""; //$NON-NLS-1$
+		}
+	}
+
+	protected String getBundle() {
+		return bundle;
+	}
+
+	protected void setBundle(String bundle) {
+		this.bundle = bundle;
+	}
+
+	protected String getIcon() {
+		return icon;
+	}
+
+	protected void setIcon(String icon) {
+		this.icon = icon;
+	}
+
+	protected String getPath() {
+		return path;
+	}
+
+	protected void setPath(String pakage) {
+		this.path = pakage;
+	}
+
+	private Matcher getMatcher(String uri) {
+		Matcher matcher;
+		matcher = patternIcon.matcher(uri);
+		return matcher;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
new file mode 100644
index 0000000000..49d7837bbb
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
@@ -0,0 +1,512 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.jar.Manifest;
+import java.util.zip.ZipFile;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionDataFile;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FilteredContributionDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.BundleConverter;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.pde.internal.core.util.CoreUtility;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+
+public class NonReferencedResourceDialog extends TitleAreaDialog {
+	private String bundle;
+	private final IFile file;
+	private IFile result;
+	private IProject project;
+	private String className;
+	private String installLocation;
+	protected Runnable okAction;
+	private BundleImageCache imageCache;
+	private IEclipseContext context;
+
+	public NonReferencedResourceDialog(Shell parentShell, IProject project, String bundle, IFile file, String installLocation, IEclipseContext context) {
+		super(parentShell);
+		this.project = project;
+		this.bundle = bundle;
+		this.file = file;
+		this.installLocation = installLocation;
+		this.context = context;
+
+		if (bundle == null && installLocation != null) {
+			this.bundle = FilteredContributionDialog.getBundle(installLocation);
+		}
+		if (file instanceof ContributionDataFile) {
+			ContributionDataFile cdf = (ContributionDataFile) file;
+			this.className = cdf.getContributionData().className;
+		}
+	}
+
+	@Override
+	protected void okPressed() {
+		if (okAction != null) {
+			try {
+				okAction.run();
+				super.okPressed();
+			} catch (Exception e) {
+			}
+		} else {
+			super.okPressed();
+		}
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite comp = (Composite) super.createDialogArea(parent);
+
+		Composite compInfo = new Composite(comp, SWT.NONE);
+		compInfo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		compInfo.setLayout(new GridLayout(2, false));
+
+		String message = ""; //$NON-NLS-1$
+		Button defaultButton = null;
+
+		if (installLocation != null) {
+			Label label = new Label(compInfo, SWT.NONE);
+			label.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			label.setText(Messages.NonReferencedResourceDialog_installLocation);
+
+			Label label2 = new Label(compInfo, SWT.NONE);
+			label2.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			label2.setText(installLocation);
+		}
+
+		if (className != null) {
+			ContributionData cd = ((ContributionDataFile) file).getContributionData();
+			Label label = new Label(compInfo, SWT.NONE);
+			label.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			label.setText(Messages.NonReferencedResourceDialog_2);
+
+			Label label2 = new Label(compInfo, SWT.NONE);
+			label2.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			if (bundle != null) {
+				label2.setText(bundle);
+			} else {
+				label2.setText(Messages.NonReferencedResourceDialog__ast_notInABundle_ast);
+			}
+
+			Label label3 = new Label(compInfo, SWT.NONE);
+			label3.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			label3.setText(Messages.NonReferencedResourceDialog_package);
+
+			Label label4 = new Label(compInfo, SWT.NONE);
+			label4.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			label4.setText(getPackageFromClassName(className));
+
+			Label label5 = new Label(compInfo, SWT.NONE);
+			label5.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			label5.setText(Messages.NonReferencedResourceDialog_class);
+
+			Label label6 = new Label(compInfo, SWT.NONE);
+			label6.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			label6.setText(cd.className.substring(cd.className.lastIndexOf('.') + 1));
+
+			if (bundle != null) {
+				Label label7 = new Label(compInfo, SWT.NONE);
+				label7.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+				label7.setText(Messages.NonReferencedResourceDialog_url);
+
+				Label label8 = new Label(compInfo, SWT.NONE);
+				label8.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+				label8.setText("bundleclass://" + bundle + "/" + className); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+		} else {
+			Label label = new Label(compInfo, SWT.NONE);
+			label.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			label.setText(Messages.NonReferencedResourceDialog_bundle);
+
+			Label label2 = new Label(compInfo, SWT.NONE);
+			label2.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			if (bundle != null) {
+				label2.setText(bundle);
+			} else {
+				label2.setText(Messages.NonReferencedResourceDialog_ast_notInABundle_ast);
+			}
+
+			Label label7 = new Label(compInfo, SWT.NONE);
+			label7.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			label7.setText(Messages.NonReferencedResourceDialog_directory);
+
+			Label label8 = new Label(compInfo, SWT.NONE);
+			label8.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			label8.setText(file.getFullPath().removeFirstSegments(1).removeLastSegments(1).toOSString());
+
+			Label label3 = new Label(compInfo, SWT.NONE);
+			label3.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			label3.setText(Messages.NonReferencedResourceDialog_resource);
+
+			Label label4 = new Label(compInfo, SWT.NONE);
+			label4.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			label4.setText(file.getFullPath().lastSegment());
+
+			if (bundle != null) {
+				Label label5 = new Label(compInfo, SWT.NONE);
+				label5.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+				label5.setText(Messages.NonReferencedResourceDialog_url);
+
+				Label label6 = new Label(compInfo, SWT.NONE);
+				label6.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+				label6.setText("platform:/plugin/" + bundle + "/" + file.getFullPath().removeFirstSegments(1).toOSString()); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+		}
+
+		Label lblMessage = new Label(comp, SWT.NONE);
+		lblMessage.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+		lblMessage.setText(message);
+
+		if (bundle != null) {
+			final Button btnRequire = new Button(comp, SWT.RADIO);
+			btnRequire.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			btnRequire.setText(Messages.NonReferencedResourceDialog_requireBundle);
+			btnRequire.setImage(imageCache.loadFromKey(ResourceProvider.IMG_Obj16_bundle));
+			btnRequire.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (btnRequire.getSelection()) {
+						okAction = new Runnable() {
+
+							@Override
+							public void run() {
+								doRequireBundle(bundle, installLocation);
+							}
+						};
+					}
+				}
+			});
+			defaultButton = btnRequire;
+		}
+
+		// make sure className is not in the default package (contains '.')
+		if (className != null && bundle != null && className.contains(".")) { //$NON-NLS-1$
+			final Button btnImport = new Button(comp, SWT.RADIO);
+			btnImport.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			btnImport.setText(Messages.NonReferencedResourceDialog_importPackage);
+			btnImport.setImage(imageCache.create("/icons/full/obj16/package_obj.gif")); //$NON-NLS-1$
+			btnImport.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (btnImport.getSelection()) {
+						okAction = new Runnable() {
+							@Override
+							public void run() {
+								IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
+								Manifest manifest;
+								try {
+									manifest = new Manifest(fileManifest.getContents());
+									String value = manifest.getMainAttributes().getValue("Import-Package"); //$NON-NLS-1$
+
+									String packageName = getPackageFromClassName(className);
+									// TODO ensure the packageName is not
+									// already in the manifest (although it
+									// should not be if we are here)
+									if (value == null) {
+										value = packageName;
+									} else {
+										value += "," + packageName; //$NON-NLS-1$
+									}
+									manifest.getMainAttributes().putValue("Import-Package", value); //$NON-NLS-1$
+									ByteArrayOutputStream bos = new ByteArrayOutputStream();
+									manifest.write(bos);
+									ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+									fileManifest.setContents(bis, true, true, null);
+									result = file;
+								} catch (Exception e) {
+									e.printStackTrace();
+								}
+							}
+						};
+					}
+				}
+			});
+		}
+
+		if (bundle != null) {
+			final Button btnUseAnyway = new Button(comp, SWT.RADIO);
+			btnUseAnyway.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			btnUseAnyway.setText(Messages.NonReferencedResourceDialog_useAnyway);
+			btnUseAnyway.setImage(imageCache.create("/icons/full/obj16/use_anyway.gif")); //$NON-NLS-1$
+			btnUseAnyway.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (btnUseAnyway.getSelection()) {
+						result = file;
+						okAction = null;
+					}
+				}
+			});
+
+		} else {
+			if (file instanceof ContributionDataFile) {
+				final ContributionDataFile cdf = (ContributionDataFile) file;
+				final Button btnConvertToBundle = new Button(comp, SWT.RADIO);
+				btnConvertToBundle.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+				btnConvertToBundle.setText(Messages.NonReferencedResourceDialog_convertAndRequire);
+				btnConvertToBundle.setImage(imageCache.create("/icons/full/obj16/bundle.png")); //$NON-NLS-1$
+				btnConvertToBundle.addSelectionListener(new SelectionAdapter() {
+					@Override
+					public void widgetSelected(SelectionEvent e) {
+						if (btnConvertToBundle.getSelection()) {
+							okAction = new Runnable() {
+
+								@Override
+								public void run() {
+									String bundleId;
+									try {
+										ContributionData contributionData = cdf.getContributionData();
+										bundleId = BundleConverter.convertProjectToBundle(contributionData.installLocation, project.getWorkspace());
+										if (bundleId != null) {
+
+											ContributionData cdConverted = new ContributionData(bundleId, contributionData.className, contributionData.sourceType, contributionData.iconPath);
+											cdConverted.installLocation = installLocation;
+											cdConverted.resourceRelativePath = Path.fromOSString(contributionData.iconPath).removeFirstSegments(1).toOSString();
+											doRequireBundle(bundleId, installLocation);
+											result = new ContributionDataFile(cdConverted);
+										}
+									} catch (Exception e1) {
+										MessageDialog.openError(getShell(), Messages.NonReferencedResourceDialog_error, e1.getMessage());
+									}
+								}
+							};
+						}
+					}
+				});
+			}
+		}
+
+		if (className == null) {
+			final Button btnCopy = new Button(comp, SWT.RADIO);
+			defaultButton = btnCopy;
+			btnCopy.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			btnCopy.setText(Messages.NonReferencedResourceDialog_copyToThisProject);
+			btnCopy.setImage(imageCache.create("/icons/full/obj16/copy_to_project.png")); //$NON-NLS-1$
+			btnCopy.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (btnCopy.getSelection()) {
+						okAction = new Runnable() {
+
+							@Override
+							public void run() {
+								copyResourceToProject(project);
+							}
+						};
+					}
+				}
+			});
+		}
+
+		if (className == null) {
+			final Button btnCopy2 = new Button(comp, SWT.RADIO);
+			btnCopy2.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			btnCopy2.setText(Messages.NonReferencedResourceDialog_copyToReferenedProject);
+			btnCopy2.setImage(imageCache.create("/icons/full/obj16/copy_to_project.png")); //$NON-NLS-1$
+			btnCopy2.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (btnCopy2.getSelection()) {
+						okAction = new Runnable() {
+
+							@Override
+							public void run() {
+								ReferencedProjectPickerDialog dlg = new ReferencedProjectPickerDialog(getShell(), project) {
+									@Override
+									protected Control createContents(Composite parent) {
+										Control ret = super.createContents(parent);
+										setMessage(Messages.NonReferencedResourceDialog_selectProjectToReceiveCopy);
+										setTitleImage(imageCache.create("/icons/full/wizban/plugin_wiz.gif")); //$NON-NLS-1$
+
+										return ret;
+									}
+								};
+								if (dlg.open() == IDialogConstants.OK_ID) {
+									copyResourceToProject((IProject) dlg.getFirstElement());
+								}
+							}
+						};
+					}
+				}
+			});
+		}
+
+		if (defaultButton != null) {
+			defaultButton.setSelection(true);
+			defaultButton.notifyListeners(SWT.Selection, new Event());
+		}
+		return comp;
+	}
+
+	// @Refactor
+	static public String getPackageFromClassName(String className) {
+		int index = className.lastIndexOf('.');
+		if (index >= 0) {
+			return className.substring(0, index);
+		} else {
+			return ""; //$NON-NLS-1$
+		}
+	}
+
+	@Override
+	protected Control createContents(Composite parent) {
+		imageCache = new BundleImageCache(parent.getDisplay(), getClass().getClassLoader(), context);
+		getShell().addDisposeListener(new DisposeListener() {
+
+			@Override
+			public void widgetDisposed(DisposeEvent e) {
+				imageCache.dispose();
+			}
+		});
+
+		Control ret = super.createContents(parent);
+		setMessage(Messages.NonReferencedResourceDialog_resourceNotReferenced);
+		String message = getMessage();
+		setMessage(message);
+		setTitle(Messages.NonReferencedResourceDialog_resourceReferenceWarning);
+		getShell().setText(Messages.NonReferencedResourceDialog_resourceReferenceWarning);
+		try {
+			setTitleImage(imageCache.create("org.eclipse.e4.tools.emf.ui", "/icons/full/wizban/newefix_wizban.png")); //$NON-NLS-1$ //$NON-NLS-2$
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return ret;
+	}
+
+	public IFile getResult() {
+		return result;
+	}
+
+	public void copyResourceToProject(IProject project) {
+		try {
+			ProjectFolderPickerDialog dlg = new ProjectFolderPickerDialog(getShell(), project, file.getFullPath().toOSString()) {
+				@Override
+				protected Control createContents(Composite parent) {
+					Control ret = super.createContents(parent);
+					setMessage(Messages.NonReferencedResourceDialog_selectTheFolderResourceCopy);
+					setTitleImage(imageCache.create("org.eclipse.e4.tools.emf.ui", "/icons/full/wizban/add_to_dir_wiz.png")); //$NON-NLS-1$ //$NON-NLS-2$
+
+					return ret;
+				}
+			};
+
+			if (dlg.open() == IDialogConstants.OK_ID) {
+				// String filename = ((ContributionDataFile)
+				// file).getContributionData().className + ".class";
+				IPath newPath = Path.fromOSString(dlg.getValue());
+				if (newPath.isEmpty() == false) {
+					CoreUtility.createFolder(project.getFolder(newPath));
+				}
+				if (className != null) {
+					newPath.append(className + ".class"); //$NON-NLS-1$
+				} else {
+					String name = file.getFullPath().lastSegment();
+					newPath = newPath.append(name);
+				}
+				IFile fileClone = project.getFile(newPath);
+				fileClone.create(file.getContents(), false, null);
+				result = fileClone;
+			}
+		} catch (CoreException e1) {
+			e1.printStackTrace();
+			MessageDialog.openError(getShell(), "Error", e1.getMessage()); //$NON-NLS-1$
+
+		}
+	}
+
+	public void doRequireBundle(String bundle, String installLocation) {
+
+		// Get source bundle version from manifest
+		String version = null;
+		InputStream srcStream = null;
+		try {
+			Manifest manifestSource;
+			if (installLocation.endsWith(".jar")) { //$NON-NLS-1$
+				ZipFile zip = new ZipFile(installLocation);
+				srcStream = zip.getInputStream(zip.getEntry("META-INF/MANIFEST.MF")); //$NON-NLS-1$
+				manifestSource = new Manifest(srcStream);
+				zip.close();
+			} else {
+				srcStream = new BufferedInputStream(new FileInputStream(installLocation + "/META-INF/MANIFEST.MF")); //$NON-NLS-1$
+				manifestSource = new Manifest(srcStream);
+			}
+			version = manifestSource.getMainAttributes().getValue("Bundle-Version"); //$NON-NLS-1$
+			if (version != null) {
+				version = version.replaceFirst("\\.qualifier", ""); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			return;
+		} finally {
+			try {
+				srcStream.close();
+			} catch (Exception e) {
+			}
+		}
+
+		IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
+		Manifest manifest;
+		try {
+			manifest = new Manifest(fileManifest.getContents());
+			String value = manifest.getMainAttributes().getValue("Require-Bundle"); //$NON-NLS-1$
+			if (value == null) {
+				manifest.getMainAttributes().putValue("Require-Bundle", bundle); //$NON-NLS-1$
+			} else {
+				value += "," + bundle; //$NON-NLS-1$
+				if (version != null) {
+					value += ";bundle-version=" + version; //$NON-NLS-1$
+				}
+				manifest.getMainAttributes().putValue("Require-Bundle", value); //$NON-NLS-1$
+			}
+			ByteArrayOutputStream bos = new ByteArrayOutputStream();
+			manifest.write(bos);
+			// StringReader reader = new
+			ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+			fileManifest.setContents(bis, true, true, null);
+			result = file;
+		} catch (IOException e1) {
+			e1.printStackTrace();
+		} catch (CoreException e1) {
+			e1.printStackTrace();
+		}
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
new file mode 100644
index 0000000000..0c918abacf
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
@@ -0,0 +1,257 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ *******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
+
+import java.net.URL;
+import java.util.ArrayList;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceProxy;
+import org.eclipse.core.resources.IResourceProxyVisitor;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+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;
+
+public class ProjectFolderPickerDialog extends TitleAreaDialog {
+
+	private TreeViewer viewer;
+	private IProject project;
+	private String srcPath;
+	private String value;
+
+	protected ProjectFolderPickerDialog(Shell parentShell, IProject project, String srcPath) {
+		super(parentShell);
+		this.project = project;
+		this.srcPath = srcPath;
+	}
+
+	static class ProjectContentProvider implements ITreeContentProvider {
+
+		private IProject project;
+
+		public ProjectContentProvider() {
+		}
+
+		@Override
+		public void dispose() {
+		}
+
+		@Override
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+			this.project = (IProject) newInput;
+		}
+
+		@Override
+		public Object[] getElements(Object inputElement) {
+			return new Object[] { project.getName() };
+		}
+
+		@Override
+		public Object[] getChildren(final Object parentElement) {
+			if (parentElement instanceof String) {
+				return getChildren(project);
+			}
+			final IResource resource = (IResource) parentElement;
+			final ArrayList<Object> list = new ArrayList<Object>();
+			IResourceProxyVisitor visitor = new IResourceProxyVisitor() {
+
+				@Override
+				public boolean visit(IResourceProxy proxy) throws CoreException {
+					if (proxy.getType() == IResource.FOLDER && proxy.requestResource().getParent() == resource) {
+						if (proxy.requestResource().equals(resource) == false) {
+							list.add(proxy.requestResource());
+						}
+					}
+					return true;
+				}
+			};
+			try {
+				resource.accept(visitor, IResource.DEPTH_ONE);
+			} catch (CoreException e) {
+				e.printStackTrace();
+			}
+			return list.toArray(new Object[0]);
+		}
+
+		@Override
+		public Object getParent(Object element) {
+			IResource resource = (IResource) element;
+			return resource.getParent();
+		}
+
+		Boolean found = false;
+
+		@Override
+		public boolean hasChildren(Object element) {
+			if (element instanceof String) {
+				return true;
+			}
+			final IResource resource = (IResource) element;
+			try {
+				found = false;
+				resource.accept(new IResourceProxyVisitor() {
+
+					@Override
+					public boolean visit(IResourceProxy proxy) throws CoreException {
+						if (proxy.getType() == IResource.FOLDER && proxy.requestResource().equals(resource) == false) {
+							found = true;
+							return false;
+						}
+						return true;
+					}
+				}, IResource.DEPTH_ONE);
+			} catch (CoreException e) {
+				e.printStackTrace();
+			}
+			return found;
+		}
+	}
+
+	static class ProjectLabelProvider extends ColumnLabelProvider {
+		@Override
+		public String getText(Object element) {
+			if (element instanceof String) {
+				return element.toString();
+			}
+			IResource resource = (IResource) element;
+			return resource.getName();
+		}
+
+		@Override
+		public Image getImage(Object element) {
+			try {
+				if (element instanceof String) {
+					return new Image(Display.getDefault(), new URL(Messages.ProjectFolderPickerDialog_0).openStream());
+				}
+				return new Image(Display.getDefault(), new URL("platform:/plugin/org.eclipse.ui.ide/icons/full/obj16/folder.png").openStream()); //$NON-NLS-1$
+			} catch (Exception e) {
+				return super.getImage(element);
+			}
+		}
+	}
+
+	@Override
+	protected boolean isResizable() {
+		return true;
+	}
+
+	@Override
+	protected void createButtonsForButtonBar(Composite parent) {
+		super.createButtonsForButtonBar(parent);
+
+		Button button = new Button(parent, SWT.PUSH);
+		button.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+		button.setText(Messages.ProjectFolderPickerDialog_useSourceDirectory);
+		button.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				value = Path.fromOSString(srcPath).removeLastSegments(1).toOSString();
+				ProjectFolderPickerDialog.super.okPressed();
+			}
+		});
+		button.moveAbove(getButton(IDialogConstants.CANCEL_ID));
+
+		((GridLayout) parent.getLayout()).numColumns = 3;
+	}
+
+	@Override
+	protected void okPressed() {
+		Object selected = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+		if (selected == null || selected instanceof String) {
+			value = ""; //$NON-NLS-1$
+		} else {
+			IResource resource = (IResource) selected;
+			value = resource.getFullPath().removeFirstSegments(1).toOSString();
+		}
+
+		super.okPressed();
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		// TODO Auto-generated method stub
+		Composite ret = (Composite) super.createDialogArea(parent);
+
+		viewer = new TreeViewer(ret);
+		viewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
+		viewer.setContentProvider(new ProjectContentProvider());
+		viewer.setLabelProvider(new ProjectLabelProvider());
+		viewer.setInput(project);
+		viewer.expandToLevel(2);
+
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+
+			@Override
+			public void doubleClick(DoubleClickEvent event) {
+				okPressed();
+			}
+		});
+
+		if (srcPath != null) {
+
+			IPath path = Path.fromOSString(srcPath);
+
+			Composite compPath = new Composite(ret, SWT.NONE);
+			compPath.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+			compPath.setLayout(new GridLayout(2, false));
+
+			Label label = new Label(compPath, SWT.NONE);
+			label.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			label.setText(Messages.ProjectFolderPickerDialog_sourceResourceName);
+
+			Label label2 = new Label(compPath, SWT.NONE);
+			label2.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			label2.setText(path.lastSegment());
+
+			Label label3 = new Label(compPath, SWT.NONE);
+			label3.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			label3.setText(Messages.ProjectFolderPickerDialog_sourceResourceDirectory);
+
+			Label lblResourcePath = new Label(compPath, SWT.NONE);
+			lblResourcePath.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			lblResourcePath.setText(path.removeLastSegments(1).toOSString());
+		}
+
+		String message = Messages.ProjectFolderPickerDialog_6;
+		getShell().setText(message);
+		setTitle(message);
+		setMessage(message);
+		return ret;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
new file mode 100644
index 0000000000..be0019102b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ *******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.TitleAreaFilterDialog;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+public class ReferencedProjectPickerDialog extends TitleAreaFilterDialog {
+
+	private IProject project;
+	private BundleImageCache imageCache;
+	static protected Image imgProject;
+
+	protected ReferencedProjectPickerDialog(final Shell parentShell, IProject project) {
+		super(parentShell, new ColumnLabelProvider() {
+			@Override
+			public String getText(Object element) {
+				IProject project = (IProject) element;
+				return project.getName();
+			}
+
+			@Override
+			public Image getImage(Object element) {
+				return imgProject;
+			}
+		});
+		this.project = project;
+	}
+
+	@Override
+	protected Control createContents(Composite parent) {
+		imageCache = new BundleImageCache(parent.getDisplay(), getClass().getClassLoader());
+		getShell().addDisposeListener(new DisposeListener() {
+
+			@Override
+			public void widgetDisposed(DisposeEvent e) {
+				imageCache.dispose();
+				imgProject = null;
+			}
+		});
+		imgProject = imageCache.create("/icons/full/obj16/projects.png"); //$NON-NLS-1$
+
+		Control ret = super.createContents(parent);
+		try {
+			setElements(project.getReferencedProjects());
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+		String message = Messages.ReferencedProjectPickerDialog_selectReferencedProject;
+		setMessage(message);
+		getShell().setText(message);
+		setTitle(message);
+		return ret;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java
new file mode 100644
index 0000000000..dd945d56af
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
+
+/**
+ * An interface for a URI Dialog
+ *
+ * @author Steven Spungin
+ *
+ */
+public interface UriDialog {
+
+	void setUri(String uri);
+
+	String getUri();
+
+	/**
+	 * See @org.eclipse.jface.dialogs.Dialog.open
+	 *
+	 * @return Dialog.OK if the user submitted a response.
+	 */
+	int open();
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java
new file mode 100644
index 0000000000..31b180bf1c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
+
+/**
+ * Enum of various URI Dialog Types
+ *
+ * @author Steven Spungin
+ *
+ */
+public enum UriDialogType {
+	BUNDLECLASS, ICON
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/messages.properties
new file mode 100644
index 0000000000..bed4ce9aab
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/messages.properties
@@ -0,0 +1,58 @@
+BundleClassDialog_bundle=bundle
+BundleClassDialog_bundleClassEditor=BundleClass Editor
+BundleClassDialog_class=class
+BundleClassDialog_create_goto=Create/Goto
+BundleClassDialog_find=Find
+BundleClassDialog_package=package
+BundleClassDialog_uri=URI
+BundleConverter_couldNotCreateMetaInfDir=Could not create META-INF directory
+BundleConverter_installLocationNotADirectory=Install location is not a directory
+BundleConverter_projectIsAlreadyABundle=Project is already a bundle
+FindContributionDialog_findBundle=Find Bundle
+FindContributionDialog_findClass=Find Class
+FindContributionDialog_findIcon=Find Icon
+FindContributionDialog_findPackage=Find Package
+FindContributionDialog_inBundle=In Bundle
+FindContributionDialog_inPackage=In Package
+FindIconDialog_findIcon=Find Icon
+FindIconDialog_searchByFilename=Search By Filename
+IconDialog_bundle=bundle
+IconDialog_find=Find
+IconDialog_folder=folder
+IconDialog_icon=icon
+IconDialog_selectIcon=Select Icon
+IconDialog_selectIcon_MESSAGE=Select Icon
+IconDialog_selectIcon_TITLE=Select Icon
+IconDialog_uri=URI
+IconDialog_uriEditor=URI Editor
+NonReferencedResourceDialog__ast_notInABundle_ast=*** NOT IN A BUNDLE ***
+NonReferencedResourceDialog_2=Bundle
+NonReferencedResourceDialog_ast_notInABundle_ast=*** NOT IN A BUNDLE ***
+NonReferencedResourceDialog_bundle=Bundle
+NonReferencedResourceDialog_class=Class
+NonReferencedResourceDialog_convertAndRequire=Convert Resource's Project To A Bundle And Require It
+NonReferencedResourceDialog_copyToReferenedProject=Copy To A Referenced Project...
+NonReferencedResourceDialog_copyToThisProject=Copy To This Project...
+NonReferencedResourceDialog_directory=Directory
+NonReferencedResourceDialog_error=Error
+NonReferencedResourceDialog_importPackage=Import Package
+NonReferencedResourceDialog_installLocation=Install Location
+NonReferencedResourceDialog_package=Package
+NonReferencedResourceDialog_requireBundle=Require Bundle
+NonReferencedResourceDialog_resource=Resource
+NonReferencedResourceDialog_resourceNotReferenced=The resource's bundle is not referenced by this project's bundle.
+NonReferencedResourceDialog_resourceReferenceWarning=Resource Reference Warning
+NonReferencedResourceDialog_selectProjectToReceiveCopy=Select the project to receive the copied resource:
+NonReferencedResourceDialog_selectTheFolderResourceCopy=Select the folder where the resource will be copied to:
+NonReferencedResourceDialog_url=URL
+NonReferencedResourceDialog_useAnyway=Use Anyway (Resolve Later)
+ProjectFolderPickerDialog_0=platform:/plugin/org.eclipse.ui.images/eclipse-png/org.eclipse.jdt.ui/icons/full/eview16/projects.png
+ProjectFolderPickerDialog_6=Select Project Folder
+ProjectFolderPickerDialog_sourceResourceDirectory=Source Resource Directory
+ProjectFolderPickerDialog_sourceResourceName=Source Resource Name
+ProjectFolderPickerDialog_useSourceDirectory=Use source resource directory
+ReferencedProjectPickerDialog_selectReferencedProject=Select Referenced Project
+TargetPlatformClassContributionCollector_classes=Classes
+TargetPlatformContributionCollector_pleaseWait=Please wait while the target platform lookup cache updates...
+TargetPlatformContributionCollector_updatingTargetPlatformCache=Updating Target Platform Cache (
+TargetPlatformIconContributionCollector_images=Images
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java
new file mode 100644
index 0000000000..62a9074ebd
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432372
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.handlers;
+
+import javax.inject.Named;
+import org.eclipse.e4.core.di.annotations.CanExecute;
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.IViewEObjects;
+
+public class AbstractHandler {
+
+	static final public String VIEWER_KEY = "org.eclipse.e4.tools.active-object-viewer"; //$NON-NLS-1$
+
+	@CanExecute
+	public boolean canExecute(@Optional @Named(VIEWER_KEY) IViewEObjects viewer) {
+		return (viewer != null);
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
new file mode 100644
index 0000000000..b3cc7ff8fb
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432372
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.handlers;
+
+import java.util.Collection;
+import java.util.HashSet;
+import javax.inject.Named;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.IViewEObjects;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.TitleAreaFilterDialogWithEmptyOptions;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+public class MarkDuplicateAttributesHandler extends MarkDuplicateItemsBase {
+
+	@Execute
+	public void execute(@Named(VIEWER_KEY) IViewEObjects viewer, IEclipseContext context) {
+		final HashSet<String> set = new HashSet<String>();
+		Collection<EObject> allEObjects = viewer.getAllEObjects();
+		for (EObject obj : allEObjects) {
+			for (EAttribute attribute : obj.eClass().getEAllAttributes()) {
+				set.add(attribute.getName());
+			}
+		}
+		ILabelProvider renderer = new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				return String.valueOf(element);
+			}
+		};
+
+		TitleAreaFilterDialogWithEmptyOptions dlg = new TitleAreaFilterDialogWithEmptyOptions(context.get(Shell.class), renderer) {
+			@Override
+			protected Control createContents(Composite parent) {
+				Control ret = super.createContents(parent);
+				setMessage("Select an attribute to mark duplicate values");
+				setTitle("Mark Duplicates");
+				setElements(set.toArray(new String[0]));
+				return ret;
+			}
+		};
+		if (dlg.open() == Window.OK) {
+			Collection<EObject> marked = getDuplicateList(dlg.getFirstElement().toString(), allEObjects);
+			applyEmptyOption(marked, dlg.getFirstElement().toString(), dlg.getEmptyFilterOption());
+			viewer.highlightEObjects(marked);
+		}
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateElementIdsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateElementIdsHandler.java
new file mode 100644
index 0000000000..b8cb1453af
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateElementIdsHandler.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432372
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.handlers;
+
+public class MarkDuplicateElementIdsHandler extends MarkDuplicateItemsBase {
+
+	public MarkDuplicateElementIdsHandler() {
+		setAttributeName("elementId"); //$NON-NLS-1$
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java
new file mode 100644
index 0000000000..848e40a6e3
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432372
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.handlers;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.EmfUtil;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.IViewEObjects;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.EmptyFilterOption;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EObject;
+
+public class MarkDuplicateItemsBase extends AbstractHandler {
+
+	private String attName;
+
+	@Execute
+	public void execute(IEclipseContext context) {
+		IViewEObjects viewer = (IViewEObjects) context.get(VIEWER_KEY);
+		Collection<EObject> duplicates = getDuplicateList(getAttName(), viewer.getAllEObjects());
+		applyEmptyOption(duplicates, getAttName(), EmptyFilterOption.EXCLUDE);
+		viewer.highlightEObjects(duplicates);
+	}
+
+	static Collection<EObject> getDuplicateList(String attName, Collection<EObject> all) {
+		Map<String, List<EObject>> map = getDuplicateMap(attName, all);
+		List<EObject> duplicates = new ArrayList<EObject>();
+		for (String key : map.keySet()) {
+			List<EObject> list = map.get(key);
+			if (list.size() > 1) {
+				duplicates.addAll(list);
+			}
+		}
+		return duplicates;
+	}
+
+	static Map<String, List<EObject>> getDuplicateMap(String attName, Collection<EObject> selected) {
+		ConcurrentHashMap<String, List<EObject>> map = new ConcurrentHashMap<String, List<EObject>>();
+		for (Iterator<?> it = selected.iterator(); it.hasNext();) {
+			Object object = it.next();
+			if (object instanceof EObject) {
+				EObject item = (EObject) object;
+				EAttribute att = EmfUtil.getAttribute(item, attName);
+				if (att != null) {
+					String attValue;
+					Object obj = item.eGet(att);
+					if (obj == null) {
+						attValue = ""; //$NON-NLS-1$
+					} else {
+						attValue = String.valueOf(obj);
+					}
+					List<EObject> list = map.get(attValue);
+					if (list == null) {
+						list = new ArrayList<EObject>();
+						map.put(attValue, list);
+					}
+					list.add(item);
+				}
+			}
+		}
+		return map;
+	}
+
+	public String getAttName() {
+		return attName;
+	}
+
+	public void setAttributeName(String attName) {
+		this.attName = attName;
+	}
+
+	static protected void applyEmptyOption(Collection<EObject> marked, String attName, EmptyFilterOption emptyFilterOption) {
+		switch (emptyFilterOption) {
+		case EXCLUDE:
+			for (Iterator<?> it = marked.iterator(); it.hasNext();) {
+				EObject eObject = (EObject) it.next();
+				if (E.isEmpty(EmfUtil.getAttributeValue(eObject, attName))) {
+					it.remove();
+				}
+			}
+			break;
+		case ONLY:
+			for (Iterator<?> it = marked.iterator(); it.hasNext();) {
+				EObject eObject = (EObject) it.next();
+				if (E.notEmpty(EmfUtil.getAttributeValue(eObject, attName))) {
+					it.remove();
+				}
+			}
+			break;
+		case INCLUDE:
+		default:
+			break;
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateLabelsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateLabelsHandler.java
new file mode 100644
index 0000000000..e352bc1357
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateLabelsHandler.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432372
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.handlers;
+
+public class MarkDuplicateLabelsHandler extends MarkDuplicateItemsBase {
+
+	public MarkDuplicateLabelsHandler() {
+		setAttributeName("label"); //$NON-NLS-1$
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java
new file mode 100644
index 0000000000..a0eae910f5
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432372
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.handlers;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.annotations.CanExecute;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.EmfUtil;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.IViewEObjects;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.EmptyFilterOption;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+public class RepairDuplicateItemsHandler extends MarkDuplicateItemsBase {
+
+	static public String name = "org.eclipse.e4.tools.active-object-viewer"; //$NON-NLS-1$
+	static String attName = "elementId"; //$NON-NLS-1$
+
+	@Override
+	@Execute
+	public void execute(IEclipseContext context) {
+		IViewEObjects viewer = (IViewEObjects) context.get(name);
+		Collection<EObject> all = viewer.getAllEObjects();
+		Map<String, List<EObject>> map = MarkDuplicateElementIdsHandler.getDuplicateMap(attName, all);
+		Iterator<Entry<String, List<EObject>>> it = map.entrySet().iterator();
+		CompoundCommand compoundCommand = new CompoundCommand();
+		EditingDomain editingDomain = viewer.getEditingDomain();
+
+		while (it.hasNext()) {
+			Entry<String, List<EObject>> entry = it.next();
+			List<EObject> listDups = entry.getValue();
+			if (listDups.size() > 1) {
+				ArrayList<EObject> toFix = new ArrayList<EObject>(listDups.subList(1, listDups.size()));
+				Iterator<EObject> itToFix = toFix.iterator();
+				while (itToFix.hasNext()) {
+					EObject eObject = itToFix.next();
+					EAttribute att = EmfUtil.getAttribute(eObject, attName);
+					String value = (String) eObject.eGet(att);
+					// do not repair empty or null values
+					if (E.isEmpty(value)) {
+						break;
+					}
+					int index = -1;
+					while (map.containsKey(value)) {
+						index++;
+						int lastDot = value.lastIndexOf('.');
+						if (lastDot == -1) {
+							lastDot = value.length();
+						}
+						try {
+							String suffix = value.substring(lastDot + 1);
+							Integer.parseInt(suffix);
+							// ends with integer
+							value = value.substring(0, lastDot);
+						} catch (Exception e) {
+						}
+						value = value + "." + index; //$NON-NLS-1$
+					}
+					Command cmd = SetCommand.create(editingDomain, eObject, att, value);
+					compoundCommand.append(cmd);
+					// Note: If the compound command cannot execute, we
+					// must revert these changes
+					listDups.remove(eObject);
+					List<EObject> newList = new ArrayList<EObject>();
+					newList.add(eObject);
+					map.put(value, newList);
+					// Note: end
+
+				}
+			}
+		}
+
+		if (compoundCommand.isEmpty() == false) {
+			if (compoundCommand.canExecute()) {
+				editingDomain.getCommandStack().execute(compoundCommand);
+			} else {
+				// this will rollback our local map changes
+				// Object obj =
+				// ContextInjectionFactory.make(MarkDuplicateItemsHandler.class,
+				// context);
+				// ContextInjectionFactory.invoke(obj, Execute.class, context);
+			}
+			Collection<EObject> duplicateList = MarkDuplicateElementIdsHandler.getDuplicateList(attName, all);
+			applyEmptyOption(duplicateList, attName, EmptyFilterOption.EXCLUDE);
+			viewer.highlightEObjects(duplicateList);
+		}
+	}
+
+	@CanExecute
+	public boolean canExecute(IEclipseContext context) {
+		IViewEObjects viewer = (IViewEObjects) context.get(name);
+		return (viewer != null);
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java
new file mode 100644
index 0000000000..b791888912
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432372
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.handlers;
+
+import java.util.Collections;
+import javax.inject.Named;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.IViewEObjects;
+import org.eclipse.emf.ecore.EObject;
+
+public class UnmarkItemsHandler extends AbstractHandler {
+
+	@Execute
+	public void execute(@Named(VIEWER_KEY) IViewEObjects viewer) {
+		viewer.highlightEObjects(Collections.<EObject> emptyList());
+	}
+
+}
\ No newline at end of file

From c08acca78e8b42e862b707b585c8ee7a406e9deb Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Wed, 7 May 2014 22:06:32 +0200
Subject: [PATCH 0754/1286] Bug 434371 - Application model extract into
 fragment should add plugin dependencies

Change-Id: I8dc69320f3ed1772f1b34e4282870b7202896350
Signed-off-by: Marco Descher <marco@descher.at>
---
 .../model/BaseApplicationModelWizard.java     | 97 ++++++++++++++++++
 .../model/ExtractContributionModelWizard.java |  9 +-
 .../model/NewContributionModelWizard.java     | 99 +------------------
 3 files changed, 107 insertions(+), 98 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index 0f3ed9f5b7..19edbf1f95 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 408712
+ *     Marco Descher <marco@descher.at> - Bug 434371
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.model;
 
@@ -46,8 +47,17 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.osgi.service.resolver.BundleDescription;
 import org.eclipse.pde.core.build.IBuildEntry;
+import org.eclipse.pde.core.plugin.IMatchRules;
+import org.eclipse.pde.core.plugin.IPluginElement;
+import org.eclipse.pde.core.plugin.IPluginExtension;
+import org.eclipse.pde.core.plugin.IPluginImport;
+import org.eclipse.pde.core.plugin.IPluginModelBase;
+import org.eclipse.pde.core.plugin.IPluginObject;
+import org.eclipse.pde.core.plugin.PluginRegistry;
 import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
+import org.eclipse.pde.internal.core.bundle.WorkspaceBundlePluginModel;
 import org.eclipse.pde.internal.core.project.PDEProject;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
@@ -302,4 +312,91 @@ private void adjustBuildPropertiesFile(IFile file)
 	 */
 	protected void adjustDependencies(IFile file) {
 	}
+	
+	/**
+	 * Add the required dependencies (org.eclipse.e4.ui.model.workbench) and
+	 * register fragment.e4xmi at the required extension point
+	 * (org.eclipse.e4.workbench.model)
+	 */
+	protected void adjustFragmentDependencies(IFile file) {
+		IProject project = file.getProject();
+		IFile pluginXml = PDEProject.getPluginXml(project);
+		IFile manifest = PDEProject.getManifest(project);
+
+		WorkspaceBundlePluginModel fModel = new WorkspaceBundlePluginModel(
+				manifest, pluginXml);
+		try {
+			addWorkbenchDependencyIfRequired(fModel);
+			registerWithExtensionPointIfRequired(project, fModel, file);
+		} catch (CoreException e) {
+			e.printStackTrace();
+			MessageDialog.openError(getShell(), "Error", e.getMessage());
+		}
+	}
+	
+	private void addWorkbenchDependencyIfRequired(
+			WorkspaceBundlePluginModel fModel) throws CoreException {
+		IPluginImport[] imports = fModel.getPluginBase().getImports();
+
+		final String WORKBENCH_IMPORT_ID = "org.eclipse.e4.ui.model.workbench"; //$NON-NLS-1$
+
+		for (IPluginImport iPluginImport : imports) {
+			if (WORKBENCH_IMPORT_ID.equalsIgnoreCase(iPluginImport.getId()))
+				return;
+		}
+
+		String version = "";
+		IPluginModelBase findModel = PluginRegistry
+				.findModel(WORKBENCH_IMPORT_ID);
+		if (findModel != null) {
+			BundleDescription bundleDescription = findModel
+					.getBundleDescription();
+			if (bundleDescription != null)
+				version = bundleDescription.getVersion().toString()
+						.replaceFirst("\\.qualifier$", "");
+		}
+
+		IPluginImport workbenchImport = fModel.getPluginFactory()
+				.createImport();
+		workbenchImport.setId(WORKBENCH_IMPORT_ID);
+		workbenchImport.setVersion(version);
+		workbenchImport.setMatch(IMatchRules.GREATER_OR_EQUAL);
+		fModel.getPluginBase().add(workbenchImport);
+		fModel.save();
+	}
+
+	/**
+	 * Register the fragment.e4xmi with the org.eclipse.e4.workbench.model
+	 * extension point, if there is not already a fragment registered.
+	 */
+	private void registerWithExtensionPointIfRequired(IProject project,
+			WorkspaceBundlePluginModel fModel, IFile file) throws CoreException {
+		IPluginExtension[] extensions = fModel.getPluginBase().getExtensions();
+
+		final String WORKBENCH_MODEL_EP_ID = "org.eclipse.e4.workbench.model"; //$NON-NLS-1$
+		final String FRAGMENT = "fragment";
+
+		for (IPluginExtension iPluginExtension : extensions) {
+			if (WORKBENCH_MODEL_EP_ID
+					.equalsIgnoreCase(iPluginExtension.getId())) {
+				IPluginObject[] children = iPluginExtension.getChildren();
+				for (IPluginObject child : children) {
+					if (FRAGMENT.equalsIgnoreCase(child.getName())) //$NON-NLS-1$
+						return;
+				}
+			}
+		}
+
+		IPluginExtension extPointFragmentRegister = fModel.getPluginFactory()
+				.createExtension();
+		IPluginElement element = extPointFragmentRegister.getModel()
+				.getFactory().createElement(extPointFragmentRegister);
+		element.setName(FRAGMENT);
+		element.setAttribute("uri", file.getName()); //$NON-NLS-1$
+		extPointFragmentRegister.setId(project.getName() + "." + FRAGMENT); //$NON-NLS-1$
+		extPointFragmentRegister.setPoint(WORKBENCH_MODEL_EP_ID);
+		extPointFragmentRegister.add(element);
+		fModel.getPluginBase().add(extPointFragmentRegister);
+		fModel.save();
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
index 2f9a89d675..98cef782a0 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010-2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Sopot Cela <sopotcela@gmail.com> - initial API and implementation
+ *     Marco Descher <marco@descher.at> - Bug 434371
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.model;
 
@@ -15,6 +16,7 @@
 import java.util.HashMap;
 import java.util.List;
 
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
@@ -116,5 +118,10 @@ public void setup(IProject project){
 	protected NewModelFilePage createWizardPage(ISelection selection) {
 		return new NewModelFilePage(selection,getDefaultFileName());
 	}
+	
+	@Override
+	protected void adjustDependencies(IFile file) {
+		super.adjustFragmentDependencies(file);
+	}
 
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
index 6c3a10adfe..50d187284b 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
@@ -7,27 +7,14 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Marco Descher <marco@descher.at> - Bug 392907
+ *     Marco Descher <marco@descher.at> - Bug 392907, Bug 434371
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.model;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.pde.core.plugin.IMatchRules;
-import org.eclipse.pde.core.plugin.IPluginElement;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.IPluginObject;
-import org.eclipse.pde.core.plugin.PluginRegistry;
-import org.eclipse.pde.internal.core.bundle.WorkspaceBundlePluginModel;
-import org.eclipse.pde.internal.core.project.PDEProject;
 
 public class NewContributionModelWizard extends BaseApplicationModelWizard {
 
@@ -46,90 +33,8 @@ protected NewModelFilePage createWizardPage(ISelection selection) {
 		return new NewModelFilePage(selection, getDefaultFileName());
 	}
 
-	/**
-	 * Add the required dependencies (org.eclipse.e4.ui.model.workbench) and
-	 * register fragment.e4xmi at the required extension point
-	 * (org.eclipse.e4.workbench.model)
-	 */
 	@Override
 	protected void adjustDependencies(IFile file) {
-		IProject project = file.getProject();
-		IFile pluginXml = PDEProject.getPluginXml(project);
-		IFile manifest = PDEProject.getManifest(project);
-
-		WorkspaceBundlePluginModel fModel = new WorkspaceBundlePluginModel(
-				manifest, pluginXml);
-		try {
-			addWorkbenchDependencyIfRequired(fModel);
-			registerWithExtensionPointIfRequired(project, fModel, file);
-		} catch (CoreException e) {
-			e.printStackTrace();
-			MessageDialog.openError(getShell(), "Error", e.getMessage());
-		}
-	}
-
-	private void addWorkbenchDependencyIfRequired(
-			WorkspaceBundlePluginModel fModel) throws CoreException {
-		IPluginImport[] imports = fModel.getPluginBase().getImports();
-
-		final String WORKBENCH_IMPORT_ID = "org.eclipse.e4.ui.model.workbench"; //$NON-NLS-1$
-
-		for (IPluginImport iPluginImport : imports) {
-			if (WORKBENCH_IMPORT_ID.equalsIgnoreCase(iPluginImport.getId()))
-				return;
-		}
-
-		String version = "";
-		IPluginModelBase findModel = PluginRegistry
-				.findModel(WORKBENCH_IMPORT_ID);
-		if (findModel != null) {
-			BundleDescription bundleDescription = findModel
-					.getBundleDescription();
-			if (bundleDescription != null)
-				version = bundleDescription.getVersion().toString();
-		}
-
-		IPluginImport workbenchImport = fModel.getPluginFactory()
-				.createImport();
-		workbenchImport.setId(WORKBENCH_IMPORT_ID);
-		workbenchImport.setVersion(version);
-		workbenchImport.setMatch(IMatchRules.GREATER_OR_EQUAL);
-		fModel.getPluginBase().add(workbenchImport);
-		fModel.save();
-	}
-
-	/**
-	 * Register the fragment.e4xmi with the org.eclipse.e4.workbench.model
-	 * extension point, if there is not already a fragment registered.
-	 */
-	private void registerWithExtensionPointIfRequired(IProject project,
-			WorkspaceBundlePluginModel fModel, IFile file) throws CoreException {
-		IPluginExtension[] extensions = fModel.getPluginBase().getExtensions();
-
-		final String WORKBENCH_MODEL_EP_ID = "org.eclipse.e4.workbench.model"; //$NON-NLS-1$
-		final String FRAGMENT = "fragment";
-
-		for (IPluginExtension iPluginExtension : extensions) {
-			if (WORKBENCH_MODEL_EP_ID
-					.equalsIgnoreCase(iPluginExtension.getId())) {
-				IPluginObject[] children = iPluginExtension.getChildren();
-				for (IPluginObject child : children) {
-					if (FRAGMENT.equalsIgnoreCase(child.getName())) //$NON-NLS-1$
-						return;
-				}
-			}
-		}
-
-		IPluginExtension extPointFragmentRegister = fModel.getPluginFactory()
-				.createExtension();
-		IPluginElement element = extPointFragmentRegister.getModel()
-				.getFactory().createElement(extPointFragmentRegister);
-		element.setName(FRAGMENT);
-		element.setAttribute("uri", file.getName()); //$NON-NLS-1$
-		extPointFragmentRegister.setId(project.getName() + "." + FRAGMENT); //$NON-NLS-1$
-		extPointFragmentRegister.setPoint(WORKBENCH_MODEL_EP_ID);
-		extPointFragmentRegister.add(element);
-		fModel.getPluginBase().add(extPointFragmentRegister);
-		fModel.save();
+		super.adjustFragmentDependencies(file);
 	}
 }
\ No newline at end of file

From 2aaa6aa5cbbba87e17b74b1de9fe845bccef2f41 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Thu, 8 May 2014 21:42:06 +0200
Subject: [PATCH 0755/1286] Bug 434450 - Cannot install tools and live editor
 anymore

Change-Id: I9fa65c3fd33ffae5737c689c23996fa8b527eeb3
Signed-off-by: Wim Jongman <wim.jongman@remainsoftware.com>
---
 features/org.eclipse.e4.core.tools.feature/feature.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 0c251f92dc..814e39e33a 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -45,13 +45,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.e4.tools.emf.liveeditor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.e4.tools"
          download-size="0"

From f6dc4da5efbc30a620ee82a65f294bb37fdae2d6 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Sat, 10 May 2014 16:22:55 +0200
Subject: [PATCH 0756/1286] Bug 434450 - Cannot install tools and live editor
 anymore

Change-Id: I2be8c6209545553f7337e6b47658d2b873c7cd45
---
 features/org.eclipse.e4.core.tools.feature/feature.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 814e39e33a..8a4e84bd4c 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -73,4 +73,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.e4.tools.emf.liveeditor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

From cd6939ffd6ea5a6a47644544c7fb5ebd4441db05 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Fri, 23 May 2014 12:25:09 -0400
Subject: [PATCH 0757/1286] Bug 435625 - [target platform search] Do search in
 background thread

Change-Id: If8676d05437fd2e3c93a7392291205e2ac211123
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../e4/tools/emf/ui/common/FilterEx.java      |  12 +-
 .../dialogs/FilteredContributionDialog.java   | 167 +++++++++----
 .../TargetPlatformContributionCollector.java  | 227 ++++++++++--------
 3 files changed, 249 insertions(+), 157 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/FilterEx.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/FilterEx.java
index 765aca7266..4ff10efc30 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/FilterEx.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/FilterEx.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.common;
@@ -14,6 +14,7 @@
 import java.util.EnumSet;
 import java.util.List;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
 
 /**
@@ -30,6 +31,7 @@ public class FilterEx extends Filter {
 	private List<String> locations;
 	private EnumSet<ResourceSearchScope> searchScope = EnumSet.noneOf(ResourceSearchScope.class);
 	private boolean includeNonBundles;
+	private IProgressMonitor progressMonitor;
 
 	public FilterEx(IProject project, String regNamePattern) {
 		super(project, regNamePattern);
@@ -101,4 +103,12 @@ public boolean isIncludeNonBundles() {
 		return includeNonBundles;
 	}
 
+	public IProgressMonitor getProgressMonitor() {
+		return progressMonitor;
+	}
+
+	public void setProgressMonitor(IProgressMonitor progressMonitor) {
+		this.progressMonitor = progressMonitor;
+	}
+
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index e31df87457..6ce706ed76 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, 424730
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
@@ -29,6 +29,10 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
+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.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.FilterEx;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
@@ -116,6 +120,8 @@ public abstract class FilteredContributionDialog extends TitleAreaDialog {
 	private Button btnIncludeNoneBundle;
 	private WritableList viewerList;
 	protected BundleImageCache imageCache;
+	protected Job currentSearchThread;
+	private ContributionResultHandlerImpl currentResultHandler;
 
 	abstract protected ClassContributionCollector getCollector();
 
@@ -129,7 +135,7 @@ public abstract class FilteredContributionDialog extends TitleAreaDialog {
 
 	abstract protected String getShellTitle();
 
-	private static class ContributionResultHandlerImpl implements ContributionResultHandler {
+	private class ContributionResultHandlerImpl implements ContributionResultHandler {
 		private boolean cancled = false;
 		private IObservableList list;
 
@@ -138,25 +144,45 @@ public ContributionResultHandlerImpl(IObservableList list) {
 		}
 
 		@Override
-		public void result(ContributionData data) {
+		public void result(final ContributionData data) {
 			if (!cancled) {
-				list.add(data);
+				getShell().getDisplay().syncExec(new Runnable() {
+
+					@Override
+					public void run() {
+						list.add(data);
+					}
+				});
 			}
 		}
 
 		@Override
-		public void moreResults(int hint, Filter filter) {
-			FilteredContributionDialog dlg = (FilteredContributionDialog) filter.userData;
-			// dlg.setStatus("More than " + filter.maxResults +
-			// " items were found and have not been displayed");
-			if (hint != 0) {
-				dlg.setMessage("More than " + filter.maxResults + " items were found.  Not all results have been displayed.");
-			} else {
-				dlg.setMessage("");
+		public void moreResults(final int hint, final Filter filter) {
+			if (!cancled) {
+				getShell().getDisplay().syncExec(new Runnable() {
+
+					@Override
+					public void run() {
+						FilteredContributionDialog dlg = (FilteredContributionDialog) filter.userData;
+						// dlg.setStatus("More than " + filter.maxResults +
+						// " items were found and have not been displayed");
+						if (hint != 0) {
+							dlg.setMessage("More than " + filter.maxResults + " items were found.  Not all results have been displayed.");
+						} else {
+							dlg.setMessage("");
+						}
+					}
+				});
 			}
 		}
 	}
 
+	@Override
+	public boolean close() {
+		stopSearchThread(true);
+		return super.close();
+	}
+
 	@Override
 	protected Control createContents(Composite parent) {
 		Control ret = super.createContents(parent);
@@ -254,57 +280,80 @@ public void widgetDisposed(DisposeEvent e) {
 
 		collector = getCollector();
 
-		textBox.addModifyListener(new ModifyListener() {
-			private ContributionResultHandlerImpl currentResultHandler;
+		textBox.addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyPressed(KeyEvent e) {
+				if (e.keyCode == SWT.ARROW_DOWN) {
+					if (viewer.getTable().getItemCount() > 0) {
+						viewer.getTable().setFocus();
+						viewer.getTable().select(0);
+					}
+				}
+			}
+		});
 
+		viewer.getTable().addKeyListener(new KeyAdapter() {
 			@Override
-			public void modifyText(ModifyEvent e) {
-				if (currentResultHandler != null) {
-					currentResultHandler.cancled = true;
+			public void keyPressed(KeyEvent e) {
+				super.keyPressed(e);
+				if ((e.keyCode == SWT.ARROW_UP) && (viewer.getTable().getSelectionIndex() == 0)) {
+					textBox.setFocus();
 				}
-				viewerList.clear();
+			}
+		});
+
+		textBox.addModifyListener(new ModifyListener() {
 
+			@Override
+			public void modifyText(ModifyEvent e) {
+				stopSearchThread(true);
 				setMessage(""); //$NON-NLS-1$
+
+				viewerList.clear();
 				if (doSearch() == true) {
 					return;
 				}
+				setMessage("Searching...");
+
+				currentSearchThread = new Job("Contribution Search") {
+
+					FilterEx filter;
 
-				currentResultHandler = new ContributionResultHandlerImpl(viewerList);
-				FilterEx filter;
-				if (searchScopes.contains(ResourceSearchScope.PROJECT)) {
-					filter = new FilterEx(context.get(IProject.class), textBox.getText());
-				} else {
-					// filter = new FilterEx(null, textBox.getText());
-					filter = new FilterEx(context.get(IProject.class), textBox.getText());
-				}
-				filter.maxResults = MAX_RESULTS;
-				filter.userData = FilteredContributionDialog.this;
-				filter.setBundles(filterBundles);
-				filter.setPackages(filterPackages);
-				filter.setLocations(filterLocations);
-				filter.setSearchScope(searchScopes);
-				filter.setIncludeNonBundles(includeNonBundles);
-				collector.findContributions(filter, currentResultHandler);
-				textBox.addKeyListener(new KeyAdapter() {
 					@Override
-					public void keyPressed(KeyEvent e) {
-						if (e.keyCode == SWT.ARROW_DOWN) {
-							if (viewer.getTable().getItemCount() > 0) {
-								viewer.getTable().setFocus();
-								viewer.getTable().select(0);
+					protected IStatus run(IProgressMonitor monitor) {
+						monitor.beginTask("Contribution Search", IProgressMonitor.UNKNOWN);
+						currentResultHandler = new ContributionResultHandlerImpl(viewerList);
+						getShell().getDisplay().syncExec(new Runnable() {
+
+							@Override
+							public void run() {
+								if (searchScopes.contains(ResourceSearchScope.PROJECT)) {
+									filter = new FilterEx(context.get(IProject.class), textBox.getText());
+								} else {
+									// filter = new FilterEx(null,
+									// textBox.getText());
+									filter = new FilterEx(context.get(IProject.class), textBox.getText());
+								}
 							}
-						}
+						});
+						filter.maxResults = MAX_RESULTS;
+						filter.userData = FilteredContributionDialog.this;
+						filter.setBundles(filterBundles);
+						filter.setPackages(filterPackages);
+						filter.setLocations(filterLocations);
+						filter.setSearchScope(searchScopes);
+						filter.setIncludeNonBundles(includeNonBundles);
+						filter.setProgressMonitor(monitor);
+						collector.findContributions(filter, currentResultHandler);
+						currentSearchThread = null;
+						monitor.done();
+						return Status.OK_STATUS;
 					}
-				});
-				viewer.getTable().addKeyListener(new KeyAdapter() {
-					@Override
-					public void keyPressed(KeyEvent e) {
-						super.keyPressed(e);
-						if ((e.keyCode == SWT.ARROW_UP) && (viewer.getTable().getSelectionIndex() == 0)) {
-							textBox.setFocus();
-						}
-					}
-				});
+
+				};
+
+				currentSearchThread.schedule();
+
 			}
 		});
 
@@ -879,6 +928,22 @@ protected EnumSet<ResourceSearchScope> getSearchScopes() {
 		return searchScopes;
 	}
 
+	public void stopSearchThread(boolean bJoin) {
+		if (currentSearchThread != null) {
+			currentResultHandler.cancled = true;
+			currentSearchThread.cancel();
+			if (bJoin) {
+				try {
+					currentSearchThread.join();
+					currentSearchThread = null;
+				} catch (InterruptedException e) {
+				}
+			} else {
+				currentSearchThread = null;
+			}
+		}
+	}
+
 	static public String getBundle(IFile file) {
 
 		if (file instanceof ContributionDataFile) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
index 1a5addaf25..68a7b704db 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator;
@@ -114,9 +114,19 @@ public void findContribution(Filter filter, ContributionResultHandler handler) {
 				int found = 0;
 				boolean more = false;
 				for (Entry e : cacheEntry) {
+
 					// Check for FilterEx filters
 					if (filter instanceof FilterEx) {
 						FilterEx filterEx = (FilterEx) filter;
+						IProgressMonitor monitor = filterEx.getProgressMonitor();
+						if (monitor != null) {
+							if (monitor.isCanceled()) {
+								break;
+							} else {
+								monitor.subTask("Searching " + e.installLocation);
+							}
+						}
+
 						if (E.notEmpty(filterEx.getBundles())) {
 							if (!filterEx.getBundles().contains(e.bundleSymName)) {
 								continue;
@@ -208,7 +218,7 @@ protected ContributionData makeData(Entry e) {
 		ip = ip.addTrailingSeparator().makeRelative();
 		ip = ip.append(e.name);
 		String className = ip.toOSString().replace('/', '.');
-		ContributionData data = new ContributionData(e.bundleSymName, className, "Java", e.installLocation); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		ContributionData data = new ContributionData(e.bundleSymName, className, "Java", e.installLocation); //$NON-NLS-1$
 		data.installLocation = e.installLocation;
 		data.resourceRelativePath = e.relativePath;
 		return data;
@@ -256,124 +266,131 @@ private void reloadCache(boolean force) {
 			cacheLocation.clear();
 			outputDirectories.clear();
 
-			ProgressMonitorDialog dlg = new ProgressMonitorDialog(Display.getDefault().getActiveShell()) {
+			Display.getDefault().syncExec(new Runnable() {
 
 				@Override
-				protected Control createContents(Composite parent) {
-					// TODO odd this is not a bean.
-					Composite ret = (Composite) super.createContents(parent);
-					Label label = new Label(ret, SWT.NONE);
-					label.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false, 2, 1));
-					label.setText(Messages.TargetPlatformContributionCollector_pleaseWait);
-
-					return ret;
-				}
-			};
-			try {
-				dlg.run(true, true, new IRunnableWithProgress() {
+				public void run() {
+					ProgressMonitorDialog dlg = new ProgressMonitorDialog(Display.getDefault().getActiveShell()) {
+
+						@Override
+						protected Control createContents(Composite parent) {
+							// TODO odd this is not a bean.
+							Composite ret = (Composite) super.createContents(parent);
+							Label label = new Label(ret, SWT.NONE);
+							label.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false, 2, 1));
+							label.setText(Messages.TargetPlatformContributionCollector_pleaseWait);
+
+							return ret;
+						}
+					};
+					try {
+						dlg.run(true, true, new IRunnableWithProgress() {
 
-					@Override
-					public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+							@Override
+							public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
 
-						// load workspace projects
-						for (final IProject pj : PDECore.getWorkspace().getRoot().getProjects()) {
-							if (monitor.isCanceled()) {
-								break;
-							}
-							String rootDirectory = pj.getLocation().toOSString();
-							TargetPlatformContributionCollector.this.visit(monitor, FilteredContributionDialog.getBundle(rootDirectory), rootDirectory, new File(rootDirectory));
-						}
+								// load workspace projects
+								for (final IProject pj : PDECore.getWorkspace().getRoot().getProjects()) {
+									if (monitor.isCanceled()) {
+										break;
+									}
+									String rootDirectory = pj.getLocation().toOSString();
+									TargetPlatformContributionCollector.this.visit(monitor, FilteredContributionDialog.getBundle(rootDirectory), rootDirectory, new File(rootDirectory));
+								}
 
-						// load target platform bundles
-						IPluginModelBase[] models = TargetPlatformHelper.getPDEState().getTargetModels();
-						monitor.beginTask(Messages.TargetPlatformContributionCollector_updatingTargetPlatformCache + cacheName + ")", models.length); //$NON-NLS-2$
-						for (IPluginModelBase pluginModelBase : models) {
-							monitor.subTask(pluginModelBase.getPluginBase().getId());
-							monitor.worked(1);
-							if (monitor.isCanceled()) {
-								break;
-							}
+								// load target platform bundles
+								IPluginModelBase[] models = TargetPlatformHelper.getPDEState().getTargetModels();
+								monitor.beginTask(Messages.TargetPlatformContributionCollector_updatingTargetPlatformCache + cacheName + ")", models.length); //$NON-NLS-1$
+								for (IPluginModelBase pluginModelBase : models) {
+									monitor.subTask(pluginModelBase.getPluginBase().getId());
+									monitor.worked(1);
+									if (monitor.isCanceled()) {
+										break;
+									}
 
-							IPluginBase pluginBase = pluginModelBase.getPluginBase();
-							if (pluginBase == null) {
-								// bundle = getBundle(new File())
-								continue;
-							}
-							URL url;
-							try {
-								String installLocation = pluginModelBase.getInstallLocation();
-								if (installLocation.endsWith(".jar")) { //$NON-NLS-1$
-									url = new URL("file://" + installLocation); //$NON-NLS-1$
-									ZipInputStream zis = new ZipInputStream(url.openStream());
-									while (true) {
-										ZipEntry entry = zis.getNextEntry();
-										if (entry == null) {
-											break;
-										} else {
-											String name2 = entry.getName();
-											if (shouldIgnore(name2)) {
-												continue;
-											}
-											Matcher m = patternFile.matcher(name2);
-											if (m.matches()) {
-												Entry e = new Entry();
-												e.installLocation = installLocation;
-												cacheLocation.add(installLocation);
-												e.name = m.group(2);
-												e.path = m.group(1);
-												if (e.path != null) {
-													e.pakage = e.path.replace("/", "."); //$NON-NLS-1$ //$NON-NLS-2$
-													if (e.pakage.startsWith(".")) { //$NON-NLS-1$
-														e.pakage = e.pakage.substring(1);
+									IPluginBase pluginBase = pluginModelBase.getPluginBase();
+									if (pluginBase == null) {
+										// bundle = getBundle(new File())
+										continue;
+									}
+									URL url;
+									try {
+										String installLocation = pluginModelBase.getInstallLocation();
+										if (installLocation.endsWith(".jar")) { //$NON-NLS-1$
+											url = new URL("file://" + installLocation); //$NON-NLS-1$
+											ZipInputStream zis = new ZipInputStream(url.openStream());
+											while (true) {
+												ZipEntry entry = zis.getNextEntry();
+												if (entry == null) {
+													break;
+												} else {
+													String name2 = entry.getName();
+													if (shouldIgnore(name2)) {
+														continue;
 													}
-													if (e.pakage.endsWith(".")) { //$NON-NLS-1$
-														e.pakage = e.pakage.substring(0, e.pakage.length() - 1);
+													Matcher m = patternFile.matcher(name2);
+													if (m.matches()) {
+														Entry e = new Entry();
+														e.installLocation = installLocation;
+														cacheLocation.add(installLocation);
+														e.name = m.group(2);
+														e.path = m.group(1);
+														if (e.path != null) {
+															e.pakage = e.path.replace("/", "."); //$NON-NLS-1$ //$NON-NLS-2$
+															if (e.pakage.startsWith(".")) { //$NON-NLS-1$
+																e.pakage = e.pakage.substring(1);
+															}
+															if (e.pakage.endsWith(".")) { //$NON-NLS-1$
+																e.pakage = e.pakage.substring(0, e.pakage.length() - 1);
+															}
+														} else {
+															e.pakage = ""; //$NON-NLS-1$
+														}
+														cachePackage.add(e.pakage);
+
+														e.bundleSymName = pluginBase.getId();
+														if (e.path == null) {
+															e.path = ""; //$NON-NLS-1$
+														}
+														cacheEntry.add(e);
+														cacheBundleId.add(pluginBase.getId());
+
+														//
+														// System.out.println(group
+														// + " -> "
+														// +
+														// m.group(2));
 													}
-												} else {
-													e.pakage = ""; //$NON-NLS-1$
 												}
-												cachePackage.add(e.pakage);
-
-												e.bundleSymName = pluginBase.getId();
-												if (e.path == null) {
-													e.path = ""; //$NON-NLS-1$
-												}
-												cacheEntry.add(e);
-												cacheBundleId.add(pluginBase.getId());
-
-												//
-												// System.out.println(group
-												// + " -> "
-												// +
-												// m.group(2));
+											}
+										} else {
+											// not a jar file
+											String bundle = getBundle(new File(installLocation));
+											if (bundle != null) {
+												visit(monitor, bundle, installLocation, new File(installLocation));
 											}
 										}
-									}
-								} else {
-									// not a jar file
-									String bundle = getBundle(new File(installLocation));
-									if (bundle != null) {
-										visit(monitor, bundle, installLocation, new File(installLocation));
+									} catch (MalformedURLException e) {
+										// TODO Auto-generated catch block
+										e.printStackTrace();
+									} catch (IOException e) {
+										// TODO Auto-generated catch block
+										e.printStackTrace();
 									}
 								}
-							} catch (MalformedURLException e) {
-								// TODO Auto-generated catch block
-								e.printStackTrace();
-							} catch (IOException e) {
-								// TODO Auto-generated catch block
-								e.printStackTrace();
+								monitor.done();
 							}
-						}
-						monitor.done();
+						});
+					} catch (InvocationTargetException e1) {
+						// TODO Auto-generated catch block
+						e1.printStackTrace();
+					} catch (InterruptedException e1) {
+						// TODO Auto-generated catch block
+						e1.printStackTrace();
 					}
-				});
-			} catch (InvocationTargetException e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			} catch (InterruptedException e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			}
+				}
+			});
+
 		}
 	}
 

From 94715b10140d9c239e796f5979bce2b183842128 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Mon, 3 Mar 2014 15:52:30 +0100
Subject: [PATCH 0758/1286] Bug 428903 - Having a common 'debug' window for all
 spies

Define a new plugin org.eclipse.e4.tools.spy, used as common for all
spies. It contains the spyPart extension point, SpyProcessor (reads the
extensions), and SpyHandler (open the E4 spies window).

Define the context spy and live model editor using this plugin and its
extension point.

Fix versions in plugin.xml of org.eclipse.e4.tools.spy and others


Fix 5 :
 - add comments in the spyPart extension point schema
 - manage the event spy using spyPart extension
 - Remove unused code to declare commands (processor in model editor,
installer in event spy)
 - Now live model editor, event spy and context spy are updated.


Change-Id: I1b50e43bbbb0fbb4c296747fbef97fac3c97d59a
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>

From df9a2ced1aac571762d4afb0decdcd3de2a29bf4 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Wed, 28 May 2014 19:40:08 +0200
Subject: [PATCH 0759/1286] Bug 428903 - Having a common 'debug' window for all
 spies

Add org.eclipse.e4.tools.spy to all features to fix the broken build and
update the build.properties (some files were missing)...

Change-Id: I98de4ab50a11a3f460f78b7f8c2ecd6dc7c99529
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 features/org.eclipse.e4.core.tools.feature/feature.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 8a4e84bd4c..e2cf7a83bd 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -80,4 +80,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.e4.tools.spy"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

From c25820b7b755d9a7e89a890e8e2df6ee4b4c8056 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Thu, 29 May 2014 10:58:57 +0200
Subject: [PATCH 0760/1286] Bug 428903 - Having a common 'debug' window for all
 spies

Fix a problem on Icon in E4 window toolbar (Url path was not well
computed) and remove import warnings.

Change-Id: I7200d85c0663fe273d77357b9bfb48c0b8e6975c
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>

From eda034f65ddd784964673872734ba453e366a207 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Wed, 28 May 2014 23:40:54 -0400
Subject: [PATCH 0761/1286] Bug 436132 - [target platform search] Clicking the
 Target platform radio button freezes the ui for a few seconds before the
 dialog window with the job kicks in

Bug 436133 - [target platform search] Clearing cache while search in
progress causes CME

Other notable changes:

Added borders to TableViewers.

Refactored constants for more results hint parameter of
ContributionResultHandler

Change-Id: I31a96a09f8fa6b88794d2897131c097895fd3041
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../ui/common/IClassContributionProvider.java | 18 ++++++++--
 .../AbstractIconDialogWithHardcodedScope.java |  2 +-
 .../dialogs/FilteredContributionDialog.java   |  8 +++--
 .../TargetPlatformContributionCollector.java  | 36 ++++++++++++++-----
 .../dialogs/FindContributionDialog.java       |  2 +-
 5 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
index 16f3e60ca7..a7fd6cdf89 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
@@ -51,15 +51,27 @@ public Filter(IProject project, String namePattern) {
 	}
 
 	public interface ContributionResultHandler {
+		// hints for flags paramter
+		/**
+		 * There are more results to display, but the amount is not known
+		 */
+		static public final int MORE_UNKNOWN = -1;
+		/**
+		 * The operation was canceled. There may be additional results.
+		 */
+		static public final int MORE_CANCELED = -2;
+
 		public void result(ContributionData data);
 
 		/**
 		 * This method is called at the end of a search. If the search
 		 * terminated because maxResults was exceeded, the hint parameter will
-		 * contain the number of additional results, or -1 if there are an
-		 * unspecified number of additional results.
+		 * contain the number of additional results, or MORE_UNKNOWN if there
+		 * are an unspecified number of additional results.
+		 *
+		 * If the search was cancelled, the hint will be MORE_CANCELED
 		 *
-		 * No there are no additional results, hint will be 0.
+		 * If there are no additional results, hint will be 0
 		 */
 		public void moreResults(int hint, Filter filter);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
index 8fb47c6d7f..4304f641ce 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
@@ -155,7 +155,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		new Label(container, SWT.NONE);
 
-		viewer = new TableViewer(container, SWT.FULL_SELECTION);
+		viewer = new TableViewer(container, SWT.FULL_SELECTION | SWT.BORDER);
 		GridData gd = new GridData(GridData.FILL_BOTH);
 		viewer.getControl().setLayoutData(gd);
 		viewer.setContentProvider(new ObservableListContentProvider());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index 6ce706ed76..5b894dcc76 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -167,7 +167,11 @@ public void run() {
 						// dlg.setStatus("More than " + filter.maxResults +
 						// " items were found and have not been displayed");
 						if (hint != 0) {
-							dlg.setMessage("More than " + filter.maxResults + " items were found.  Not all results have been displayed.");
+							if (hint == ContributionResultHandler.MORE_CANCELED) {
+								dlg.setMessage("The search was cancelled.  Not all results may have been displayed.");
+							} else {
+								dlg.setMessage("More than " + filter.maxResults + " items were found.  Not all results have been displayed.");
+							}
 						} else {
 							dlg.setMessage("");
 						}
@@ -727,7 +731,7 @@ protected void rebuildViewer() {
 		viewerList = new WritableList();
 
 		TableViewer oldViewer = viewer;
-		viewer = new TableViewer(compOptions, SWT.FULL_SELECTION);
+		viewer = new TableViewer(compOptions, SWT.FULL_SELECTION | SWT.BORDER);
 		if (oldViewer != null) {
 			viewer.getTable().moveAbove(oldViewer.getTable());
 			oldViewer.getTable().dispose();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
index 68a7b704db..f4d8c5baab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625, Bug 436133, Bug 436132
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator;
@@ -25,6 +25,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
@@ -72,12 +73,13 @@
  */
 public abstract class TargetPlatformContributionCollector extends ClassContributionCollector {
 
-	ArrayList<Entry> cacheEntry = new ArrayList<Entry>();
+	CopyOnWriteArrayList<Entry> cacheEntry = new CopyOnWriteArrayList<Entry>();
 	HashSet<String> cacheBundleId = new HashSet<String>();
 	HashSet<String> cachePackage = new HashSet<String>();
 	HashSet<String> cacheLocation = new HashSet<String>();
 	private Pattern patternFile;
 	protected String cacheName;
+	protected boolean stopFiltering;
 
 	static class Entry {
 		String name;
@@ -113,14 +115,19 @@ public void findContribution(Filter filter, ContributionResultHandler handler) {
 
 				int found = 0;
 				boolean more = false;
-				for (Entry e : cacheEntry) {
 
+				stopFiltering = false;
+				for (Entry e : cacheEntry) {
+					if (stopFiltering) {
+						break;
+					}
 					// Check for FilterEx filters
 					if (filter instanceof FilterEx) {
 						FilterEx filterEx = (FilterEx) filter;
 						IProgressMonitor monitor = filterEx.getProgressMonitor();
 						if (monitor != null) {
 							if (monitor.isCanceled()) {
+								stopFiltering = true;
 								break;
 							} else {
 								monitor.subTask("Searching " + e.installLocation);
@@ -178,7 +185,7 @@ public void findContribution(Filter filter, ContributionResultHandler handler) {
 						found++;
 						if (found > maxResults) {
 							more = true;
-							handler.moreResults(-1, filter);
+							handler.moreResults(ContributionResultHandler.MORE_UNKNOWN, filter);
 							break;
 						} else {
 							handler.result(makeData(e));
@@ -187,7 +194,11 @@ public void findContribution(Filter filter, ContributionResultHandler handler) {
 
 				}
 				if (!more) {
-					handler.moreResults(0, filter);
+					if (stopFiltering) {
+						handler.moreResults(ContributionResultHandler.MORE_CANCELED, filter);
+					} else {
+						handler.moreResults(0, filter);
+					}
 				}
 			}
 		});
@@ -201,6 +212,7 @@ public void getModelElements(Filter filter, ModelResultHandler handler) {
 
 			@Override
 			public void clearCache() {
+				stopFiltering = true;
 				cacheEntry.clear();
 				cacheBundleId.clear();
 				cachePackage.clear();
@@ -290,17 +302,22 @@ protected Control createContents(Composite parent) {
 							public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
 
 								// load workspace projects
-								for (final IProject pj : PDECore.getWorkspace().getRoot().getProjects()) {
+								IProject[] projects = PDECore.getWorkspace().getRoot().getProjects();
+								IPluginModelBase[] models = TargetPlatformHelper.getPDEState().getTargetModels();
+								int total = projects.length + models.length;
+								monitor.beginTask(Messages.TargetPlatformContributionCollector_updatingTargetPlatformCache + cacheName + ")", total); //$NON-NLS-1$
+
+								for (final IProject pj : projects) {
 									if (monitor.isCanceled()) {
 										break;
 									}
 									String rootDirectory = pj.getLocation().toOSString();
+									monitor.subTask(rootDirectory);
+									monitor.worked(1);
 									TargetPlatformContributionCollector.this.visit(monitor, FilteredContributionDialog.getBundle(rootDirectory), rootDirectory, new File(rootDirectory));
 								}
 
 								// load target platform bundles
-								IPluginModelBase[] models = TargetPlatformHelper.getPDEState().getTargetModels();
-								monitor.beginTask(Messages.TargetPlatformContributionCollector_updatingTargetPlatformCache + cacheName + ")", models.length); //$NON-NLS-1$
 								for (IPluginModelBase pluginModelBase : models) {
 									monitor.subTask(pluginModelBase.getPluginBase().getId());
 									monitor.worked(1);
@@ -434,6 +451,9 @@ static public String getBundle(File file) {
 
 	protected void visit(IProgressMonitor monitor, String bundleName, String installLocation, File file) {
 		for (File fChild : file.listFiles()) {
+			if (monitor.isCanceled()) {
+				break;
+			}
 			if (fChild.isDirectory()) {
 				visit(monitor, bundleName, installLocation, fChild);
 			} else {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
index 7a42234eac..463bea0bf0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
@@ -137,7 +137,7 @@ public void widgetDisposed(DisposeEvent e) {
 
 		new Label(container, SWT.NONE);
 
-		viewer = new TableViewer(container, SWT.FULL_SELECTION);
+		viewer = new TableViewer(container, SWT.FULL_SELECTION | SWT.BORDER);
 		GridData gd = new GridData(GridData.FILL_BOTH);
 		viewer.getControl().setLayoutData(gd);
 		viewer.setContentProvider(new ObservableListContentProvider());

From 741fffb5dcfc11f609ac77d1348bb1c748a3e64e Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Sat, 31 May 2014 08:36:27 -0400
Subject: [PATCH 0762/1286] Bug 436283 - [target platform search] The job
 window should have "run in background" option Bug 436281 - Combine the
 FilterEx with the IClassContributionProvider.Filter class Bug 436280 - PDE
 ContributionClass Provider should fire ContributionResultHandler.moreResults
 at the end of the search

Change-Id: I2eadf60e4be68f09fd201edfe49fb3c79d8f6b2a
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../PDEClassContributionProvider.java         |  16 +-
 .../e4/tools/emf/ui/common/FilterEx.java      | 114 ------
 .../ui/common/IClassContributionProvider.java | 103 ++++-
 .../ui/common/IProviderStatusCallback.java    |  21 +
 .../tools/emf/ui/common/ProviderStatus.java   |  22 ++
 .../AbstractIconDialogWithScopeAndFilter.java |  10 +-
 .../dialogs/FilteredContributionDialog.java   | 100 ++++-
 .../TargetPlatformContributionCollector.java  | 358 ++++++++++--------
 8 files changed, 444 insertions(+), 300 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/FilterEx.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index 5702b9e29c..bde3a2a1c6 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 424730
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 436281, Bug 436280
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
@@ -21,7 +21,6 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.e4.tools.emf.ui.common.FilterEx;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider;
 import org.eclipse.e4.tools.emf.ui.common.ResourceSearchScope;
 import org.eclipse.jdt.core.IJavaProject;
@@ -42,16 +41,12 @@ public PDEClassContributionProvider() {
 	}
 
 	@SuppressWarnings("restriction")
-	public void findContribution(final Filter filter,  final ContributionResultHandler handler) {
+	public void findContribution(final Filter filter, final ContributionResultHandler handler) {
 		boolean followReferences = true;
-		if (filter instanceof FilterEx) {
-			FilterEx filterEx = (FilterEx) filter;
-			if (filterEx.getSearchScope().contains(ResourceSearchScope.PROJECT) &&
-					!filterEx.getSearchScope().contains(ResourceSearchScope.REFERENCES)) {
-				followReferences = false;
-			}
-
+		if (filter.getSearchScope().contains(ResourceSearchScope.PROJECT) && !filter.getSearchScope().contains(ResourceSearchScope.REFERENCES)) {
+			followReferences = false;
 		}
+
 		IJavaSearchScope scope = null;
 		if (followReferences == false){
 			IJavaProject javaProject = JavaCore.create(filter.project);
@@ -181,6 +176,7 @@ public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
 			e.printStackTrace();
 		}
 		
+		handler.moreResults(0, filter);
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/FilterEx.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/FilterEx.java
deleted file mode 100644
index 4ff10efc30..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/FilterEx.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625
- *******************************************************************************/
-
-package org.eclipse.e4.tools.emf.ui.common;
-
-import java.util.EnumSet;
-import java.util.List;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
-
-/**
- * An extension to the Filter class, allowing for bundles, packages, and
- * locations to be specified.
- *
- * @author Steven Spungin
- *
- */
-public class FilterEx extends Filter {
-
-	private List<String> bundles;
-	private List<String> packages;
-	private List<String> locations;
-	private EnumSet<ResourceSearchScope> searchScope = EnumSet.noneOf(ResourceSearchScope.class);
-	private boolean includeNonBundles;
-	private IProgressMonitor progressMonitor;
-
-	public FilterEx(IProject project, String regNamePattern) {
-		super(project, regNamePattern);
-	}
-
-	/**
-	 * Sets the bundles to filter on
-	 *
-	 * @param filterBundles
-	 */
-	public void setBundles(List<String> filterBundles) {
-		bundles = filterBundles;
-	}
-
-	public void setPackages(List<String> filterPackages) {
-		packages = filterPackages;
-	}
-
-	public List<String> getBundles() {
-		return bundles;
-	}
-
-	/**
-	 * Sets the packages to filter on
-	 *
-	 * @return
-	 */
-	public List<String> getPackages() {
-		return packages;
-	}
-
-	public List<String> getLocations() {
-		return locations;
-	}
-
-	/**
-	 * Sets the installed project locations to filter on
-	 *
-	 * @param locations
-	 */
-	public void setLocations(List<String> locations) {
-		this.locations = locations;
-	}
-
-	public EnumSet<ResourceSearchScope> getSearchScope() {
-		return searchScope;
-	}
-
-	/**
-	 * Sets the scope for the search.
-	 *
-	 * @param searchScope
-	 */
-	public void setSearchScope(EnumSet<ResourceSearchScope> searchScope) {
-		this.searchScope = searchScope;
-	}
-
-	/**
-	 * Include plain old java projects, resource projects, and others in
-	 * searches. No manifest required.
-	 *
-	 * @param includeNonBundles
-	 */
-	public void setIncludeNonBundles(boolean includeNonBundles) {
-		this.includeNonBundles = includeNonBundles;
-	}
-
-	public boolean isIncludeNonBundles() {
-		return includeNonBundles;
-	}
-
-	public IProgressMonitor getProgressMonitor() {
-		return progressMonitor;
-	}
-
-	public void setProgressMonitor(IProgressMonitor progressMonitor) {
-		this.progressMonitor = progressMonitor;
-	}
-
-}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
index a7fd6cdf89..7ed891ffc6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
@@ -7,11 +7,14 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 424730
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 436281
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
+import java.util.EnumSet;
+import java.util.List;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
 
 public interface IClassContributionProvider {
 	public class ContributionData {
@@ -44,14 +47,110 @@ public class Filter {
 		public int maxResults;
 		public Object userData;
 
+		// These items were added for extended filter functionality
+		private List<String> bundles;
+		private List<String> packages;
+		private List<String> locations;
+		private EnumSet<ResourceSearchScope> searchScope = EnumSet.noneOf(ResourceSearchScope.class);
+		private boolean includeNonBundles;
+		private IProgressMonitor progressMonitor;
+		/**
+		 * This member can be null. It provides a way for the provider to signal
+		 * various state changes.
+		 */
+		private IProviderStatusCallback providerStatusCallback;
+
 		public Filter(IProject project, String namePattern) {
 			this.project = project;
 			this.namePattern = namePattern;
 		}
+
+		/**
+		 * Sets the bundles to filter on
+		 *
+		 * @param filterBundles
+		 */
+		public void setBundles(List<String> filterBundles) {
+			bundles = filterBundles;
+		}
+
+		public void setPackages(List<String> filterPackages) {
+			packages = filterPackages;
+		}
+
+		public List<String> getBundles() {
+			return bundles;
+		}
+
+		/**
+		 * Sets the packages to filter on
+		 *
+		 * @return
+		 */
+		public List<String> getPackages() {
+			return packages;
+		}
+
+		public List<String> getLocations() {
+			return locations;
+		}
+
+		/**
+		 * Sets the installed project locations to filter on
+		 *
+		 * @param locations
+		 */
+		public void setLocations(List<String> locations) {
+			this.locations = locations;
+		}
+
+		public EnumSet<ResourceSearchScope> getSearchScope() {
+			return searchScope;
+		}
+
+		/**
+		 * Sets the scope for the search.
+		 *
+		 * @param searchScope
+		 */
+		public void setSearchScope(EnumSet<ResourceSearchScope> searchScope) {
+			this.searchScope = searchScope;
+		}
+
+		/**
+		 * Include plain old java projects, resource projects, and others in
+		 * searches. No manifest required.
+		 *
+		 * @param includeNonBundles
+		 */
+		public void setIncludeNonBundles(boolean includeNonBundles) {
+			this.includeNonBundles = includeNonBundles;
+		}
+
+		public boolean isIncludeNonBundles() {
+			return includeNonBundles;
+		}
+
+		public IProgressMonitor getProgressMonitor() {
+			return progressMonitor;
+		}
+
+		public void setProgressMonitor(IProgressMonitor progressMonitor) {
+			this.progressMonitor = progressMonitor;
+		}
+
+		public IProviderStatusCallback getProviderStatusCallback() {
+			return providerStatusCallback;
+		}
+
+		public void setProviderStatusCallback(IProviderStatusCallback providerStatusCallback) {
+			this.providerStatusCallback = providerStatusCallback;
+		}
+
 	}
 
 	public interface ContributionResultHandler {
-		// hints for flags paramter
+		// hints for flags parameter
 		/**
 		 * There are more results to display, but the amount is not known
 		 */
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java
new file mode 100644
index 0000000000..9128c86d65
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 436283
+ *******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.common;
+
+/**
+ * A callback used for a provider to notify a client of status changes
+ * 
+ * @author Steven Spungin
+ *
+ */
+public interface IProviderStatusCallback {
+	void onStatusChanged(ProviderStatus status);
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java
new file mode 100644
index 0000000000..e882b7aa77
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 436283
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.common;
+
+/**
+ * Provider status used in IProviderStatusCallback
+ *
+ * @author Steven Spungin
+ *
+ */
+public enum ProviderStatus {
+	INITIALIZING, READY, CANCELLED
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
index 6aa99a2481..20ec2d01ff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 404136, 424730
+ *     Steven Spungin <steven@spungin.tv> - Bug 404136, Bug 424730, Bug 436281
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -29,8 +29,8 @@
 import org.eclipse.core.resources.IResourceVisitor;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.tools.emf.ui.common.FilterEx;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
 import org.eclipse.e4.tools.emf.ui.common.ResourceSearchScope;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.StringMatcher;
@@ -303,7 +303,7 @@ protected boolean doSearch() {
 			clearImages();
 
 			callback = new IconMatchCallback((IObservableList) getViewer().getInput());
-			FilterEx filter = new FilterEx(project, getFilterTextBox().getText());
+			Filter filter = new Filter(project, getFilterTextBox().getText());
 			filter.setSearchScope(getSearchScopes());
 			filter.setBundles(getFilterBundles());
 			filter.setLocations(getFilterLocations());
@@ -374,10 +374,10 @@ private static class SearchThread extends TimerTask {
 		private final StringMatcher matcherGif;
 		private final StringMatcher matcherJpg;
 		private final StringMatcher matcherPng;
-		private FilterEx filter;
+		private Filter filter;
 		private boolean includeNonBundles;
 
-		public SearchThread(IconMatchCallback callback, FilterEx filter) {
+		public SearchThread(IconMatchCallback callback, Filter filter) {
 			this.matcherGif = new StringMatcher("*" + filter.namePattern + "*.gif", true, false); //$NON-NLS-1$//$NON-NLS-2$
 			this.matcherJpg = new StringMatcher("*" + filter.namePattern + "*.jpg", true, false); //$NON-NLS-1$//$NON-NLS-2$
 			this.matcherPng = new StringMatcher("*" + filter.namePattern + "*.png", true, false); //$NON-NLS-1$//$NON-NLS-2$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index 5b894dcc76..3766445361 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625, Bug 436281
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
@@ -34,16 +34,18 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.tools.emf.ui.common.FilterEx;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionResultHandler;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
+import org.eclipse.e4.tools.emf.ui.common.IProviderStatusCallback;
+import org.eclipse.e4.tools.emf.ui.common.ProviderStatus;
 import org.eclipse.e4.tools.emf.ui.common.ResourceSearchScope;
 import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AbstractIconDialogWithScopeAndFilter.Entry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.TitleAreaFilterDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.TargetPlatformClassContributionCollector;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.TargetPlatformContributionCollector;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.TargetPlatformIconContributionCollector;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.NonReferencedResourceDialog;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
@@ -122,6 +124,10 @@ public abstract class FilteredContributionDialog extends TitleAreaDialog {
 	protected BundleImageCache imageCache;
 	protected Job currentSearchThread;
 	private ContributionResultHandlerImpl currentResultHandler;
+	protected ProviderStatus providerStatus;
+	protected int hint;
+	protected int maxResults;
+	protected boolean searching;
 
 	abstract protected ClassContributionCollector getCollector();
 
@@ -135,6 +141,38 @@ public abstract class FilteredContributionDialog extends TitleAreaDialog {
 
 	abstract protected String getShellTitle();
 
+	private void updateStatusMessage() {
+		String message = ""; //$NON-NLS-1$
+		if (searching) {
+			message += "Searching...\n";
+		}
+		// dlg.setStatus("More than " + filter.maxResults +
+		// " items were found and have not been displayed");
+		if (hint != 0) {
+			if (hint == ContributionResultHandler.MORE_CANCELED) {
+				message += "The search was cancelled.  Not all results may have been displayed.\n";
+			} else {
+				message += "More than " + maxResults + " items were found.  Not all results have been displayed.\n";
+			}
+		}
+
+		if (getCollector() instanceof TargetPlatformContributionCollector) {
+			if (providerStatus != null) {
+				switch (providerStatus) {
+				case READY:
+					break;
+				case INITIALIZING:
+					message += "The provider is initializing.  Results will refresh when complete.";
+					break;
+				case CANCELLED:
+					message += "The provider was cancelled while initializing.  Results may be incomplete.";
+					break;
+				}
+			}
+		}
+		setMessage(message);
+	}
+
 	private class ContributionResultHandlerImpl implements ContributionResultHandler {
 		private boolean cancled = false;
 		private IObservableList list;
@@ -164,17 +202,9 @@ public void moreResults(final int hint, final Filter filter) {
 					@Override
 					public void run() {
 						FilteredContributionDialog dlg = (FilteredContributionDialog) filter.userData;
-						// dlg.setStatus("More than " + filter.maxResults +
-						// " items were found and have not been displayed");
-						if (hint != 0) {
-							if (hint == ContributionResultHandler.MORE_CANCELED) {
-								dlg.setMessage("The search was cancelled.  Not all results may have been displayed.");
-							} else {
-								dlg.setMessage("More than " + filter.maxResults + " items were found.  Not all results have been displayed.");
-							}
-						} else {
-							dlg.setMessage("");
-						}
+						dlg.hint = hint;
+						dlg.maxResults = filter.maxResults;
+						dlg.updateStatusMessage();
 					}
 				});
 			}
@@ -317,11 +347,12 @@ public void modifyText(ModifyEvent e) {
 				if (doSearch() == true) {
 					return;
 				}
-				setMessage("Searching...");
+				searching = true;
+				updateStatusMessage();
 
 				currentSearchThread = new Job("Contribution Search") {
 
-					FilterEx filter;
+					Filter filter;
 
 					@Override
 					protected IStatus run(IProgressMonitor monitor) {
@@ -332,11 +363,11 @@ protected IStatus run(IProgressMonitor monitor) {
 							@Override
 							public void run() {
 								if (searchScopes.contains(ResourceSearchScope.PROJECT)) {
-									filter = new FilterEx(context.get(IProject.class), textBox.getText());
+									filter = new Filter(context.get(IProject.class), textBox.getText());
 								} else {
-									// filter = new FilterEx(null,
+									// filter = new Filter(null,
 									// textBox.getText());
-									filter = new FilterEx(context.get(IProject.class), textBox.getText());
+									filter = new Filter(context.get(IProject.class), textBox.getText());
 								}
 							}
 						});
@@ -348,9 +379,39 @@ public void run() {
 						filter.setSearchScope(searchScopes);
 						filter.setIncludeNonBundles(includeNonBundles);
 						filter.setProgressMonitor(monitor);
+						filter.setProviderStatusCallback(new IProviderStatusCallback() {
+
+							@Override
+							public void onStatusChanged(final ProviderStatus status) {
+								FilteredContributionDialog.this.providerStatus = status;
+								getShell().getDisplay().asyncExec(new Runnable() {
+
+									@Override
+									public void run() {
+										updateStatusMessage();
+										switch (status) {
+										case READY:
+											refreshSearch();
+											break;
+										case CANCELLED:
+										case INITIALIZING:
+											break;
+										}
+									}
+								});
+							}
+						});
 						collector.findContributions(filter, currentResultHandler);
 						currentSearchThread = null;
 						monitor.done();
+						searching = false;
+						getShell().getDisplay().asyncExec(new Runnable() {
+
+							@Override
+							public void run() {
+								updateStatusMessage();
+							}
+						});
 						return Status.OK_STATUS;
 					}
 
@@ -939,8 +1000,9 @@ public void stopSearchThread(boolean bJoin) {
 			if (bJoin) {
 				try {
 					currentSearchThread.join();
-					currentSearchThread = null;
 				} catch (InterruptedException e) {
+				} finally {
+					currentSearchThread = null;
 				}
 			} else {
 				currentSearchThread = null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
index f4d8c5baab..4e03ae51cf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625, Bug 436133, Bug 436132
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625, Bug 436133, Bug 436132, Bug 436283, Bug 436281
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator;
@@ -38,11 +38,15 @@
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.e4.tools.emf.ui.common.FilterEx;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
 import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider;
+import org.eclipse.e4.tools.emf.ui.common.IProviderStatusCallback;
+import org.eclipse.e4.tools.emf.ui.common.ProviderStatus;
 import org.eclipse.e4.tools.emf.ui.common.ResourceSearchScope;
 import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FilteredContributionDialog;
@@ -54,7 +58,10 @@
 import org.eclipse.pde.internal.core.PDECore;
 import org.eclipse.pde.internal.core.TargetPlatformHelper;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
@@ -64,7 +71,7 @@
 
 /**
  * A contribution collector encompassing the current target platform.<br />
- * Uses FilterEx for bundle, package, and location filtering.<br />
+ * Uses filter for bundle, package, and location filtering.<br />
  * This implementation finds resources based on file names, not by parsing file
  * contents.
  *
@@ -106,7 +113,7 @@ public void findContribution(Filter filter, ContributionResultHandler handler) {
 
 				Pattern patternName = Pattern.compile(filter.namePattern, Pattern.CASE_INSENSITIVE);
 
-				reloadCache(false);
+				reloadCache(false, filter.getProviderStatusCallback());
 
 				int maxResults = filter.maxResults;
 				if (maxResults == 0) {
@@ -121,65 +128,62 @@ public void findContribution(Filter filter, ContributionResultHandler handler) {
 					if (stopFiltering) {
 						break;
 					}
-					// Check for FilterEx filters
-					if (filter instanceof FilterEx) {
-						FilterEx filterEx = (FilterEx) filter;
-						IProgressMonitor monitor = filterEx.getProgressMonitor();
-						if (monitor != null) {
-							if (monitor.isCanceled()) {
-								stopFiltering = true;
-								break;
-							} else {
-								monitor.subTask("Searching " + e.installLocation);
-							}
+					IProgressMonitor monitor = filter.getProgressMonitor();
+					if (monitor != null) {
+						if (monitor.isCanceled()) {
+							stopFiltering = true;
+							break;
+						} else {
+							monitor.subTask("Searching " + e.installLocation);
 						}
+					}
 
-						if (E.notEmpty(filterEx.getBundles())) {
-							if (!filterEx.getBundles().contains(e.bundleSymName)) {
-								continue;
-							}
+					if (E.notEmpty(filter.getBundles())) {
+						if (!filter.getBundles().contains(e.bundleSymName)) {
+							continue;
 						}
-						if (E.notEmpty(filterEx.getPackages())) {
-							if (!filterEx.getPackages().contains(e.pakage)) {
-								continue;
+					}
+					if (E.notEmpty(filter.getPackages())) {
+						if (!filter.getPackages().contains(e.pakage)) {
+							continue;
+						}
+					}
+					if (E.notEmpty(filter.getLocations())) {
+						boolean locationFound = false;
+						for (String location : filter.getLocations()) {
+							if (e.installLocation.startsWith(location)) {
+								locationFound = true;
+								break;
 							}
 						}
-						if (E.notEmpty(filterEx.getLocations())) {
-							boolean locationFound = false;
-							for (String location : filterEx.getLocations()) {
-								if (e.installLocation.startsWith(location)) {
-									locationFound = true;
+						if (!locationFound) {
+							continue;
+						}
+					}
+					if (filter.isIncludeNonBundles() == false) {
+						if (e.bundleSymName == null) {
+							continue;
+						}
+					}
+					if (filter.getSearchScope().contains(ResourceSearchScope.WORKSPACE)) {
+						if (filter.project != null) {
+							IWorkspace workspace = filter.project.getWorkspace();
+							boolean fnd = false;
+							for (IProject project : workspace.getRoot().getProjects()) {
+								// String path =
+								// project.getLocationURI().getPath();
+								String path = project.getName();
+								if (e.installLocation.contains(path)) {
+									fnd = true;
 									break;
 								}
 							}
-							if (!locationFound) {
+							if (!fnd) {
 								continue;
 							}
 						}
-						if (filterEx.isIncludeNonBundles() == false) {
-							if (e.bundleSymName == null) {
-								continue;
-							}
-						}
-						if (filterEx.getSearchScope().contains(ResourceSearchScope.WORKSPACE)) {
-							if (filter.project != null) {
-								IWorkspace workspace = filter.project.getWorkspace();
-								boolean fnd = false;
-								for (IProject project : workspace.getRoot().getProjects()) {
-									// String path =
-									// project.getLocationURI().getPath();
-									String path = project.getName();
-									if (e.installLocation.contains(path)) {
-										fnd = true;
-										break;
-									}
-								}
-								if (!fnd) {
-									continue;
-								}
-							}
-						}
 					}
+
 					Matcher m = patternName.matcher(e.name);
 					if (m.find()) {
 						found++;
@@ -241,7 +245,7 @@ protected ContributionData makeData(Entry e) {
 	 * @return A copy of the bundle IDs in the cache.
 	 */
 	public Collection<String> getBundleIds() {
-		reloadCache(false);
+		reloadCache(false, null);
 		return new ArrayList<String>(cacheBundleId);
 	}
 
@@ -250,7 +254,7 @@ public Collection<String> getBundleIds() {
 	 * @return A copy of the bundle IDs in the cache.
 	 */
 	public Collection<String> getPackages() {
-		reloadCache(false);
+		reloadCache(false, null);
 		return new ArrayList<String>(cachePackage);
 	}
 
@@ -259,7 +263,7 @@ public Collection<String> getPackages() {
 	 * @return A copy of the bundle IDs in the cache.
 	 */
 	public Collection<String> getLocations() {
-		reloadCache(false);
+		reloadCache(false, null);
 		return new ArrayList<String>(cacheLocation);
 	}
 
@@ -269,17 +273,139 @@ public Collection<String> getLocations() {
 	 *
 	 * @param force
 	 *            true to force reload the cache
+	 * @param providerStatusCallback
 	 */
-	private void reloadCache(boolean force) {
+	private void reloadCache(boolean force, final IProviderStatusCallback providerStatusCallback) {
 		if (cacheEntry.isEmpty() || force) {
+			if (providerStatusCallback != null) {
+				providerStatusCallback.onStatusChanged(ProviderStatus.INITIALIZING);
+			}
 			cacheEntry.clear();
 			cacheBundleId.clear();
 			cachePackage.clear();
 			cacheLocation.clear();
 			outputDirectories.clear();
 
+			final Job job = new Job("Build Target Platform Index") {
+
+				@Override
+				protected IStatus run(IProgressMonitor monitor) {
+					// load workspace projects
+					IProject[] projects = PDECore.getWorkspace().getRoot().getProjects();
+					IPluginModelBase[] models = TargetPlatformHelper.getPDEState().getTargetModels();
+					int total = projects.length + models.length;
+					monitor.beginTask(Messages.TargetPlatformContributionCollector_updatingTargetPlatformCache + cacheName + ")", total); //$NON-NLS-1$
+
+					for (final IProject pj : projects) {
+						if (monitor.isCanceled()) {
+							break;
+						}
+						String rootDirectory = pj.getLocation().toOSString();
+						monitor.subTask(rootDirectory);
+						monitor.worked(1);
+						TargetPlatformContributionCollector.this.visit(monitor, FilteredContributionDialog.getBundle(rootDirectory), rootDirectory, new File(rootDirectory));
+					}
+
+					// load target platform bundles
+					for (IPluginModelBase pluginModelBase : models) {
+						monitor.subTask(pluginModelBase.getPluginBase().getId());
+						monitor.worked(1);
+						if (monitor.isCanceled()) {
+							break;
+						}
+
+						IPluginBase pluginBase = pluginModelBase.getPluginBase();
+						if (pluginBase == null) {
+							// bundle = getBundle(new File())
+							continue;
+						}
+						URL url;
+						try {
+							String installLocation = pluginModelBase.getInstallLocation();
+							if (installLocation.endsWith(".jar")) { //$NON-NLS-1$
+								url = new URL("file://" + installLocation); //$NON-NLS-1$
+								ZipInputStream zis = new ZipInputStream(url.openStream());
+								while (true) {
+									ZipEntry entry = zis.getNextEntry();
+									if (entry == null) {
+										break;
+									} else {
+										String name2 = entry.getName();
+										if (shouldIgnore(name2)) {
+											continue;
+										}
+										Matcher m = patternFile.matcher(name2);
+										if (m.matches()) {
+											Entry e = new Entry();
+											e.installLocation = installLocation;
+											cacheLocation.add(installLocation);
+											e.name = m.group(2);
+											e.path = m.group(1);
+											if (e.path != null) {
+												e.pakage = e.path.replace("/", "."); //$NON-NLS-1$ //$NON-NLS-2$
+												if (e.pakage.startsWith(".")) { //$NON-NLS-1$
+													e.pakage = e.pakage.substring(1);
+												}
+												if (e.pakage.endsWith(".")) { //$NON-NLS-1$
+													e.pakage = e.pakage.substring(0, e.pakage.length() - 1);
+												}
+											} else {
+												e.pakage = ""; //$NON-NLS-1$
+											}
+											cachePackage.add(e.pakage);
+
+											e.bundleSymName = pluginBase.getId();
+											if (e.path == null) {
+												e.path = ""; //$NON-NLS-1$
+											}
+											cacheEntry.add(e);
+											cacheBundleId.add(pluginBase.getId());
+
+											//
+											// System.out.println(group
+											// + " -> "
+											// +
+											// m.group(2));
+										}
+									}
+								}
+							} else {
+								// not a jar file
+								String bundle = getBundle(new File(installLocation));
+								if (bundle != null) {
+									visit(monitor, bundle, installLocation, new File(installLocation));
+								}
+							}
+						} catch (MalformedURLException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						} catch (IOException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
+					}
+					monitor.done();
+					if (monitor.isCanceled()) {
+						if (providerStatusCallback != null) {
+							providerStatusCallback.onStatusChanged(ProviderStatus.CANCELLED);
+						}
+						return Status.CANCEL_STATUS;
+					} else {
+						if (providerStatusCallback != null) {
+							providerStatusCallback.onStatusChanged(ProviderStatus.READY);
+						}
+						return Status.OK_STATUS;
+					}
+				}
+			};
+			job.schedule();
+
+			// User Job will not display dialog if called from a modal dialog,
+			// so we wrap a plain ol' job in a ProgressMonitorDialog
 			Display.getDefault().syncExec(new Runnable() {
 
+				boolean runInBackground = false;
+
 				@Override
 				public void run() {
 					ProgressMonitorDialog dlg = new ProgressMonitorDialog(Display.getDefault().getActiveShell()) {
@@ -294,106 +420,38 @@ protected Control createContents(Composite parent) {
 
 							return ret;
 						}
+
+						@Override
+						protected void createButtonsForButtonBar(Composite parent) {
+							Button button = createButton(parent, 101, "Run In Background", false);
+							// TODO JA
+							button.addSelectionListener(new SelectionAdapter() {
+								@Override
+								public void widgetSelected(SelectionEvent e) {
+									runInBackground = true;
+								}
+							});
+							super.createButtonsForButtonBar(parent);
+
+							// Do not use arrow cursor until calling super
+							// TODO ProgressMonitorDialog should encapsulate
+							// arrowCurson
+							button.setCursor(arrowCursor);
+						}
+
+						@Override
+						protected void cancelPressed() {
+							job.cancel();
+						}
 					};
 					try {
 						dlg.run(true, true, new IRunnableWithProgress() {
 
 							@Override
 							public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-
-								// load workspace projects
-								IProject[] projects = PDECore.getWorkspace().getRoot().getProjects();
-								IPluginModelBase[] models = TargetPlatformHelper.getPDEState().getTargetModels();
-								int total = projects.length + models.length;
-								monitor.beginTask(Messages.TargetPlatformContributionCollector_updatingTargetPlatformCache + cacheName + ")", total); //$NON-NLS-1$
-
-								for (final IProject pj : projects) {
-									if (monitor.isCanceled()) {
-										break;
-									}
-									String rootDirectory = pj.getLocation().toOSString();
-									monitor.subTask(rootDirectory);
-									monitor.worked(1);
-									TargetPlatformContributionCollector.this.visit(monitor, FilteredContributionDialog.getBundle(rootDirectory), rootDirectory, new File(rootDirectory));
-								}
-
-								// load target platform bundles
-								for (IPluginModelBase pluginModelBase : models) {
-									monitor.subTask(pluginModelBase.getPluginBase().getId());
-									monitor.worked(1);
-									if (monitor.isCanceled()) {
-										break;
-									}
-
-									IPluginBase pluginBase = pluginModelBase.getPluginBase();
-									if (pluginBase == null) {
-										// bundle = getBundle(new File())
-										continue;
-									}
-									URL url;
-									try {
-										String installLocation = pluginModelBase.getInstallLocation();
-										if (installLocation.endsWith(".jar")) { //$NON-NLS-1$
-											url = new URL("file://" + installLocation); //$NON-NLS-1$
-											ZipInputStream zis = new ZipInputStream(url.openStream());
-											while (true) {
-												ZipEntry entry = zis.getNextEntry();
-												if (entry == null) {
-													break;
-												} else {
-													String name2 = entry.getName();
-													if (shouldIgnore(name2)) {
-														continue;
-													}
-													Matcher m = patternFile.matcher(name2);
-													if (m.matches()) {
-														Entry e = new Entry();
-														e.installLocation = installLocation;
-														cacheLocation.add(installLocation);
-														e.name = m.group(2);
-														e.path = m.group(1);
-														if (e.path != null) {
-															e.pakage = e.path.replace("/", "."); //$NON-NLS-1$ //$NON-NLS-2$
-															if (e.pakage.startsWith(".")) { //$NON-NLS-1$
-																e.pakage = e.pakage.substring(1);
-															}
-															if (e.pakage.endsWith(".")) { //$NON-NLS-1$
-																e.pakage = e.pakage.substring(0, e.pakage.length() - 1);
-															}
-														} else {
-															e.pakage = ""; //$NON-NLS-1$
-														}
-														cachePackage.add(e.pakage);
-
-														e.bundleSymName = pluginBase.getId();
-														if (e.path == null) {
-															e.path = ""; //$NON-NLS-1$
-														}
-														cacheEntry.add(e);
-														cacheBundleId.add(pluginBase.getId());
-
-														//
-														// System.out.println(group
-														// + " -> "
-														// +
-														// m.group(2));
-													}
-												}
-											}
-										} else {
-											// not a jar file
-											String bundle = getBundle(new File(installLocation));
-											if (bundle != null) {
-												visit(monitor, bundle, installLocation, new File(installLocation));
-											}
-										}
-									} catch (MalformedURLException e) {
-										// TODO Auto-generated catch block
-										e.printStackTrace();
-									} catch (IOException e) {
-										// TODO Auto-generated catch block
-										e.printStackTrace();
-									}
+								monitor.beginTask("Waiting for target platform indexing to complete", IProgressMonitor.UNKNOWN);
+								while (job.getState() == job.RUNNING && !runInBackground) {
+									Thread.sleep(100);
 								}
 								monitor.done();
 							}
@@ -406,8 +464,8 @@ public void run(final IProgressMonitor monitor) throws InvocationTargetException
 						e1.printStackTrace();
 					}
 				}
-			});
 
+			});
 		}
 	}
 

From ffda24db06ac1a76069f374e580b0eb75285baa7 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Sat, 31 May 2014 22:28:54 +0200
Subject: [PATCH 0763/1286] Bug 436299 - NonReferencedResourceDialog layout
 changes

Changed the layout of the panel to confirm a bit more to Eclipse standards.

Change-Id: I32c6df2bcd2330ad50bd1556f00911b56ed419c9
---
 .../dialogs/NonReferencedResourceDialog.java  | 106 ++++++++++--------
 1 file changed, 57 insertions(+), 49 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
index 49d7837bbb..56b157cc5f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
@@ -11,8 +11,6 @@
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
-
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -33,6 +31,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionDataFile;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FilteredContributionDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.BundleConverter;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
@@ -48,8 +47,10 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
 
 public class NonReferencedResourceDialog extends TitleAreaDialog {
 	private String bundle;
@@ -94,110 +95,117 @@ protected void okPressed() {
 
 	@Override
 	protected Control createDialogArea(Composite parent) {
-		Composite comp = (Composite) super.createDialogArea(parent);
+		Composite compParent = (Composite) super.createDialogArea(parent);
 
-		Composite compInfo = new Composite(comp, SWT.NONE);
-		compInfo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		compInfo.setLayout(new GridLayout(2, false));
+		Composite comp = new Composite(compParent, SWT.NONE);
+		GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
+		layoutData.horizontalSpan = 2;
+		comp.setLayoutData(layoutData);
+		comp.setLayout(new GridLayout(2, false));
 
 		String message = ""; //$NON-NLS-1$
 		Button defaultButton = null;
 
 		if (installLocation != null) {
-			Label label = new Label(compInfo, SWT.NONE);
-			label.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			Label label = new Label(comp, SWT.NONE);
+			label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label.setText(Messages.NonReferencedResourceDialog_installLocation);
 
-			Label label2 = new Label(compInfo, SWT.NONE);
-			label2.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			Text label2 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			label2.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			label2.setText(installLocation);
 		}
 
 		if (className != null) {
 			ContributionData cd = ((ContributionDataFile) file).getContributionData();
-			Label label = new Label(compInfo, SWT.NONE);
-			label.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			Label label = new Label(comp, SWT.NONE);
+			label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label.setText(Messages.NonReferencedResourceDialog_2);
 
-			Label label2 = new Label(compInfo, SWT.NONE);
-			label2.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			Text label2 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			label2.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			if (bundle != null) {
 				label2.setText(bundle);
 			} else {
 				label2.setText(Messages.NonReferencedResourceDialog__ast_notInABundle_ast);
 			}
 
-			Label label3 = new Label(compInfo, SWT.NONE);
-			label3.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			Label label3 = new Label(comp, SWT.NONE);
+			label3.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label3.setText(Messages.NonReferencedResourceDialog_package);
 
-			Label label4 = new Label(compInfo, SWT.NONE);
-			label4.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			Text label4 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			label4.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			label4.setText(getPackageFromClassName(className));
 
-			Label label5 = new Label(compInfo, SWT.NONE);
-			label5.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			Label label5 = new Label(comp, SWT.NONE);
+			label5.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label5.setText(Messages.NonReferencedResourceDialog_class);
 
-			Label label6 = new Label(compInfo, SWT.NONE);
-			label6.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			Text label6 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			label6.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			label6.setText(cd.className.substring(cd.className.lastIndexOf('.') + 1));
 
 			if (bundle != null) {
-				Label label7 = new Label(compInfo, SWT.NONE);
-				label7.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+				Label label7 = new Label(comp, SWT.NONE);
+				label7.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 				label7.setText(Messages.NonReferencedResourceDialog_url);
 
-				Label label8 = new Label(compInfo, SWT.NONE);
-				label8.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+				Text label8 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+				label8.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 				label8.setText("bundleclass://" + bundle + "/" + className); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		} else {
-			Label label = new Label(compInfo, SWT.NONE);
-			label.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			Label label = new Label(comp, SWT.NONE);
+			label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label.setText(Messages.NonReferencedResourceDialog_bundle);
 
-			Label label2 = new Label(compInfo, SWT.NONE);
-			label2.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			Text label2 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			label2.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			if (bundle != null) {
 				label2.setText(bundle);
 			} else {
 				label2.setText(Messages.NonReferencedResourceDialog_ast_notInABundle_ast);
 			}
 
-			Label label7 = new Label(compInfo, SWT.NONE);
-			label7.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			Label label7 = new Label(comp, SWT.NONE);
+			label7.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label7.setText(Messages.NonReferencedResourceDialog_directory);
 
-			Label label8 = new Label(compInfo, SWT.NONE);
-			label8.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			Text label8 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			label8.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			label8.setText(file.getFullPath().removeFirstSegments(1).removeLastSegments(1).toOSString());
 
-			Label label3 = new Label(compInfo, SWT.NONE);
-			label3.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+			Label label3 = new Label(comp, SWT.NONE);
+			label3.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label3.setText(Messages.NonReferencedResourceDialog_resource);
 
-			Label label4 = new Label(compInfo, SWT.NONE);
-			label4.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+			Text label4 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			label4.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			label4.setText(file.getFullPath().lastSegment());
 
 			if (bundle != null) {
-				Label label5 = new Label(compInfo, SWT.NONE);
-				label5.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+				Label label5 = new Label(comp, SWT.NONE);
+				label5.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 				label5.setText(Messages.NonReferencedResourceDialog_url);
 
-				Label label6 = new Label(compInfo, SWT.NONE);
-				label6.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+				Text label6 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+				label6.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 				label6.setText("platform:/plugin/" + bundle + "/" + file.getFullPath().removeFirstSegments(1).toOSString()); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		}
 
 		Label lblMessage = new Label(comp, SWT.NONE);
-		lblMessage.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+		lblMessage.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 0));
 		lblMessage.setText(message);
 
+		Group group = new Group(comp, SWT.NONE);
+		group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 0));
+		group.setLayout(new GridLayout(1, false));
+		group.setText("Action");
+
 		if (bundle != null) {
-			final Button btnRequire = new Button(comp, SWT.RADIO);
+			final Button btnRequire = new Button(group, SWT.RADIO);
 			btnRequire.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			btnRequire.setText(Messages.NonReferencedResourceDialog_requireBundle);
 			btnRequire.setImage(imageCache.loadFromKey(ResourceProvider.IMG_Obj16_bundle));
@@ -220,7 +228,7 @@ public void run() {
 
 		// make sure className is not in the default package (contains '.')
 		if (className != null && bundle != null && className.contains(".")) { //$NON-NLS-1$
-			final Button btnImport = new Button(comp, SWT.RADIO);
+			final Button btnImport = new Button(group, SWT.RADIO);
 			btnImport.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			btnImport.setText(Messages.NonReferencedResourceDialog_importPackage);
 			btnImport.setImage(imageCache.create("/icons/full/obj16/package_obj.gif")); //$NON-NLS-1$
@@ -263,7 +271,7 @@ public void run() {
 		}
 
 		if (bundle != null) {
-			final Button btnUseAnyway = new Button(comp, SWT.RADIO);
+			final Button btnUseAnyway = new Button(group, SWT.RADIO);
 			btnUseAnyway.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			btnUseAnyway.setText(Messages.NonReferencedResourceDialog_useAnyway);
 			btnUseAnyway.setImage(imageCache.create("/icons/full/obj16/use_anyway.gif")); //$NON-NLS-1$
@@ -280,7 +288,7 @@ public void widgetSelected(SelectionEvent e) {
 		} else {
 			if (file instanceof ContributionDataFile) {
 				final ContributionDataFile cdf = (ContributionDataFile) file;
-				final Button btnConvertToBundle = new Button(comp, SWT.RADIO);
+				final Button btnConvertToBundle = new Button(group, SWT.RADIO);
 				btnConvertToBundle.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 				btnConvertToBundle.setText(Messages.NonReferencedResourceDialog_convertAndRequire);
 				btnConvertToBundle.setImage(imageCache.create("/icons/full/obj16/bundle.png")); //$NON-NLS-1$
@@ -316,7 +324,7 @@ public void run() {
 		}
 
 		if (className == null) {
-			final Button btnCopy = new Button(comp, SWT.RADIO);
+			final Button btnCopy = new Button(group, SWT.RADIO);
 			defaultButton = btnCopy;
 			btnCopy.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			btnCopy.setText(Messages.NonReferencedResourceDialog_copyToThisProject);
@@ -338,7 +346,7 @@ public void run() {
 		}
 
 		if (className == null) {
-			final Button btnCopy2 = new Button(comp, SWT.RADIO);
+			final Button btnCopy2 = new Button(group, SWT.RADIO);
 			btnCopy2.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			btnCopy2.setText(Messages.NonReferencedResourceDialog_copyToReferenedProject);
 			btnCopy2.setImage(imageCache.create("/icons/full/obj16/copy_to_project.png")); //$NON-NLS-1$

From 876b396d28a047f6d579a8ceb397f699aff96ebd Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Fri, 6 Jun 2014 10:24:04 -0400
Subject: [PATCH 0764/1286] Bug 436847 - [nonreferenced resource dialog] null
 pointer used when calculating url Bug 436848 - [nonreferenced resource
 dialog] Dialog should be a wizard Bug 436849 - [find contributions dialog]
 Dispose error if closing while provider is indexing

Change-Id: Ib958a4aa065bc31ce27a15fb700d95af40fa1c3a
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../dialogs/ContributionClassDialog.java      |  11 +-
 .../dialogs/FilteredContributionDialog.java   |  66 +--
 .../dialogs/DynamicWizard.java                | 119 +++++
 .../dialogs/NonReferencedAction.java          |  22 +
 .../dialogs/NonReferencedActionPage.java      | 492 ++++++++++++++++++
 .../dialogs/NonReferencedResourceWizard.java  | 115 ++++
 .../dialogs/PickProjectFolderPage.java        | 156 ++++++
 .../dialogs/PickProjectPage.java              | 134 +++++
 8 files changed, 1080 insertions(+), 35 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index ff07eea58c..5c84961d53 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -8,19 +8,18 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *	   Lars Vogel <lars.vogel@gmail.com> - Enhancements
- *     Steven Spungin <steven@spungin.tv> - Bug 424730
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 436847
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.TargetPlatformClassContributionCollector;
-import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.TargetPlatformContributionCollector;
-
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.TargetPlatformClassContributionCollector;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.TargetPlatformContributionCollector;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -64,6 +63,10 @@ protected void okPressed() {
 			ContributionDataFile cdf = new ContributionDataFile(cd);
 			IFile file = checkResourceAccessible(cdf, cd.installLocation);
 			if (file != null) {
+				if (file instanceof ContributionDataFile) {
+					cdf = (ContributionDataFile) file;
+					cd = cdf.getContributionData();
+				}
 				String uri = "bundleclass://" + cd.bundleName + "/" + cd.className; //$NON-NLS-1$ //$NON-NLS-2$
 				Command cmd = SetCommand.create(editingDomain, contribution, feature, uri);
 				if (cmd.canExecute()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index 3766445361..3d2ce7f1eb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -48,6 +48,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.TargetPlatformContributionCollector;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.TargetPlatformIconContributionCollector;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.NonReferencedResourceDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.NonReferencedResourceWizard;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -61,6 +62,7 @@
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.pde.internal.core.project.PDEProject;
 import org.eclipse.pde.internal.core.text.bundle.BundleModel;
 import org.eclipse.pde.internal.core.text.bundle.ImportPackageHeader;
@@ -384,21 +386,26 @@ public void run() {
 							@Override
 							public void onStatusChanged(final ProviderStatus status) {
 								FilteredContributionDialog.this.providerStatus = status;
-								getShell().getDisplay().asyncExec(new Runnable() {
-
-									@Override
-									public void run() {
-										updateStatusMessage();
-										switch (status) {
-										case READY:
-											refreshSearch();
-											break;
-										case CANCELLED:
-										case INITIALIZING:
-											break;
+								try {
+									getShell().getDisplay().asyncExec(new Runnable() {
+
+										@Override
+										public void run() {
+											updateStatusMessage();
+											switch (status) {
+											case READY:
+												refreshSearch();
+												break;
+											case CANCELLED:
+											case INITIALIZING:
+												break;
+											}
 										}
-									}
-								});
+									});
+								} catch (Exception e2) {
+									// Dialog may have been closed while
+									// provider was still indexing
+								}
 							}
 						});
 						collector.findContributions(filter, currentResultHandler);
@@ -910,23 +917,16 @@ protected IFile checkResourceAccessible(final IFile file, String installLocation
 		// Not a bundle
 		final String bundle = getBundle(file);
 		if (bundle == null) {
-			NonReferencedResourceDialog dlg = new NonReferencedResourceDialog(getShell(), context.get(IProject.class), bundle, file, installLocation, context) {
-				@Override
-				public String getMessage() {
-					String message = "The resource is not contained in a bundle.";
-					// message +=
-					// "\nTo access during runtime, you need to copy the resource into this project, or into a referenced project.";
-					// message +=
-					// "\nYou can also convert the resource's project into a bundle and then import reference the bundle";
-					return message;
-				}
-			};
-			if (dlg.open() == IDialogConstants.OK_ID) {
-				return dlg.getResult();
+			String message = "The selected resource is not contained in a bundle.";
+			NonReferencedResourceWizard wizard = new NonReferencedResourceWizard(getShell(), context.get(IProject.class), bundle, file, installLocation, context);
+			wizard.setMessage(message);
+			WizardDialog wizDlg = new WizardDialog(getShell(), wizard);
+			wizDlg.setBlockOnOpen(true);
+			if (wizDlg.open() == IDialogConstants.OK_ID) {
+				return wizard.getResult();
 			} else {
 				return null;
 			}
-
 		}
 
 		// Reference by current project
@@ -969,9 +969,13 @@ public String getMessage() {
 			}
 
 			if (!found) {
-				NonReferencedResourceDialog dlg = new NonReferencedResourceDialog(getShell(), context.get(IProject.class), bundle, file, installLocation, context);
-				if (dlg.open() == IDialogConstants.OK_ID) {
-					return dlg.getResult();
+				String message = "The selected resource's bundle is not referenced by this bundle.";
+				NonReferencedResourceWizard wizard = new NonReferencedResourceWizard(getShell(), context.get(IProject.class), bundle, file, installLocation, context);
+				wizard.setMessage(message);
+				WizardDialog wiz = new WizardDialog(getShell(), wizard);
+				wiz.setBlockOnOpen(true);
+				if (wiz.open() == IDialogConstants.OK_ID) {
+					return wizard.getResult();
 				} else {
 					return null;
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
new file mode 100644
index 0000000000..1e698bf0b7
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
+
+import java.util.ArrayList;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+
+/**
+ * Adds features for wizards with dynamic pages. The <em>pages</em> member is
+ * private in the base class...
+ *
+ * @author Steven Spungin
+ *
+ */
+public class DynamicWizard extends Wizard {
+
+	protected ArrayList<IWizardPage> pages = new ArrayList<IWizardPage>();
+	private String message;
+
+	public DynamicWizard() {
+		setForcePreviousAndNextButtons(true);
+	}
+
+	@Override
+	public boolean performFinish() {
+		return true;
+	}
+
+	@Override
+	public boolean canFinish() {
+		for (IWizardPage page : pages) {
+			if (page.isPageComplete() == false) {
+				return false;
+			}
+		}
+		IWizardPage cur = getContainer().getCurrentPage();
+		return getNextPage(cur) == null;
+	}
+
+	@Override
+	public void addPage(IWizardPage page) {
+		page.setWizard(this);
+		pages.add(page);
+
+		// Only add the first page to the base class
+		if (super.getPageCount() == 0) {
+			super.addPage(page);
+			updateMessage();
+		}
+
+	}
+
+	/**
+	 * Override the message on the first page if specified
+	 *
+	 * @param page
+	 */
+	private void updateMessage() {
+		if (E.notEmpty(message) && pages.size() > 0) {
+			// TODO file bug: IWizardPage is missing the setMessage method!
+			IWizardPage page = pages.get(0);
+			if (page instanceof WizardPage) {
+				WizardPage wizPage = (WizardPage) page;
+				wizPage.setMessage(message);
+			}
+		}
+	}
+
+	@Override
+	public IWizardPage getPreviousPage(IWizardPage page) {
+		IWizardPage cur = getContainer().getCurrentPage();
+		int index = pages.indexOf(cur);
+		if (index > 0) {
+			return pages.get(index - 1);
+		} else {
+			return null;
+		}
+	}
+
+	@Override
+	public IWizardPage getNextPage(IWizardPage page) {
+		int index = pages.indexOf(page);
+		if (index < pages.size() - 1) {
+			return pages.get(index + 1);
+		} else {
+			return null;
+		}
+	}
+
+	public void clearDynamicPages() {
+		while (pages.size() > 1) {
+			pages.remove(pages.size() - 1);
+		}
+
+	}
+
+	/**
+	 * Overrides the message of the first page if not <em>empty</em>
+	 *
+	 * @param message
+	 */
+	public void setMessage(String message) {
+		this.message = message;
+		updateMessage();
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java
new file mode 100644
index 0000000000..e3816c9f0c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
+
+/**
+ * Actions used to resolve non referenced resource issues.
+ * 
+ * @author Steven Spungin
+ *
+ */
+public enum NonReferencedAction {
+	REQUIRE, IMPORT, COPY, COPY_TO_OTHER, USE_ANYWAY, CONVERT_AND_REQUIRE
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
new file mode 100644
index 0000000000..d62536d1f5
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
@@ -0,0 +1,492 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.jar.Manifest;
+import java.util.zip.ZipFile;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionDataFile;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FilteredContributionDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.BundleConverter;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.pde.internal.core.util.CoreUtility;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * This page displays information about a non-referenced resource along with
+ * actions to resolve issues.
+ *
+ * @author Steven Spungin
+ *
+ */
+public class NonReferencedActionPage extends WizardPage implements IWizardPage {
+
+	private IProject project;
+	private String bundle;
+	private IFile file;
+	private String installLocation;
+	private IEclipseContext context;
+	private String className;
+	private BundleImageCache imageCache;
+
+	protected NonReferencedActionPage(IProject project, String bundle, IFile file, String installLocation, IEclipseContext context) {
+		super("Nonreferenced Resource Action");
+
+		this.project = project;
+		this.bundle = bundle;
+		this.file = file;
+		this.installLocation = installLocation;
+		this.context = context;
+
+		imageCache = context.get(BundleImageCache.class);
+
+		setImageDescriptor(ImageDescriptor.createFromImage(imageCache.create("org.eclipse.e4.tools.emf.ui", "/icons/full/wizban/newefix_wizban.png"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+		if (bundle == null && installLocation != null) {
+			this.bundle = FilteredContributionDialog.getBundle(installLocation);
+		}
+		if (file instanceof ContributionDataFile) {
+			ContributionDataFile cdf = (ContributionDataFile) file;
+			this.className = cdf.getContributionData().className;
+		}
+
+		setTitle("Nonreferenced Resource Action");
+		setMessage("Nonreferenced Resource Action");
+	}
+
+	@Override
+	public void setDescription(String description) {
+		super.setDescription(description);
+		super.setMessage(description);
+	}
+
+	@Override
+	public void createControl(Composite compParent) {
+		Composite comp = new Composite(compParent, SWT.NONE);
+		GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
+		layoutData.horizontalSpan = 2;
+		comp.setLayoutData(layoutData);
+		comp.setLayout(new GridLayout(2, false));
+
+		String message = ""; //$NON-NLS-1$
+		Button defaultButton = null;
+
+		if (installLocation != null) {
+			Label label = new Label(comp, SWT.NONE);
+			label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			label.setText(Messages.NonReferencedResourceDialog_installLocation);
+
+			Text label2 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			label2.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			label2.setText(installLocation);
+		}
+
+		if (className != null) {
+			ContributionData cd = ((ContributionDataFile) file).getContributionData();
+			Label label = new Label(comp, SWT.NONE);
+			label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			label.setText(Messages.NonReferencedResourceDialog_2);
+
+			Text label2 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			label2.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			if (bundle != null) {
+				label2.setText(bundle);
+			} else {
+				label2.setText(Messages.NonReferencedResourceDialog__ast_notInABundle_ast);
+			}
+
+			Label label3 = new Label(comp, SWT.NONE);
+			label3.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			label3.setText(Messages.NonReferencedResourceDialog_package);
+
+			Text label4 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			label4.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			label4.setText(getPackageFromClassName(className));
+
+			Label label5 = new Label(comp, SWT.NONE);
+			label5.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			label5.setText(Messages.NonReferencedResourceDialog_class);
+
+			Text label6 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			label6.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			label6.setText(cd.className.substring(cd.className.lastIndexOf('.') + 1));
+
+			if (bundle != null) {
+				Label label7 = new Label(comp, SWT.NONE);
+				label7.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+				label7.setText(Messages.NonReferencedResourceDialog_url);
+
+				Text label8 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+				label8.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+				label8.setText("bundleclass://" + bundle + "/" + className); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+		} else {
+			Label label = new Label(comp, SWT.NONE);
+			label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			label.setText(Messages.NonReferencedResourceDialog_bundle);
+
+			Text label2 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			label2.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			if (bundle != null) {
+				label2.setText(bundle);
+			} else {
+				label2.setText(Messages.NonReferencedResourceDialog_ast_notInABundle_ast);
+			}
+
+			Label label7 = new Label(comp, SWT.NONE);
+			label7.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			label7.setText(Messages.NonReferencedResourceDialog_directory);
+
+			Text label8 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			label8.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			label8.setText(file.getFullPath().removeFirstSegments(1).removeLastSegments(1).toOSString());
+
+			Label label3 = new Label(comp, SWT.NONE);
+			label3.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			label3.setText(Messages.NonReferencedResourceDialog_resource);
+
+			Text label4 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			label4.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			label4.setText(file.getFullPath().lastSegment());
+
+			if (bundle != null) {
+				Label label5 = new Label(comp, SWT.NONE);
+				label5.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+				label5.setText(Messages.NonReferencedResourceDialog_url);
+
+				Text label6 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+				label6.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+				label6.setText("platform:/plugin/" + bundle + "/" + file.getFullPath().removeFirstSegments(1).toOSString()); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+		}
+
+		Label lblMessage = new Label(comp, SWT.NONE);
+		lblMessage.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 0));
+		lblMessage.setText(message);
+
+		Group group = new Group(comp, SWT.NONE);
+		group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 0));
+		group.setLayout(new GridLayout(1, false));
+		group.setText("Action");
+
+		if (bundle != null) {
+			final Button btnRequire = new Button(group, SWT.RADIO);
+			btnRequire.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			btnRequire.setText(Messages.NonReferencedResourceDialog_requireBundle);
+			btnRequire.setImage(imageCache.loadFromKey(ResourceProvider.IMG_Obj16_bundle));
+			btnRequire.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (btnRequire.getSelection()) {
+						Runnable okAction = new Runnable() {
+
+							@Override
+							public void run() {
+								doRequireBundle(bundle, installLocation);
+							}
+						};
+						setAction(NonReferencedAction.REQUIRE, okAction);
+					}
+				}
+			});
+			defaultButton = btnRequire;
+		}
+
+		// make sure className is not in the default package (contains '.')
+		if (className != null && bundle != null && className.contains(".")) { //$NON-NLS-1$
+			final Button btnImport = new Button(group, SWT.RADIO);
+			btnImport.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			btnImport.setText(Messages.NonReferencedResourceDialog_importPackage);
+			btnImport.setImage(imageCache.create("/icons/full/obj16/package_obj.gif")); //$NON-NLS-1$
+			btnImport.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (btnImport.getSelection()) {
+						Runnable okAction = new Runnable() {
+							@Override
+							public void run() {
+								IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
+								Manifest manifest;
+								try {
+									manifest = new Manifest(fileManifest.getContents());
+									String value = manifest.getMainAttributes().getValue("Import-Package"); //$NON-NLS-1$
+
+									String packageName = getPackageFromClassName(className);
+									// TODO ensure the packageName is not
+									// already in the manifest (although it
+									// should not be if we are here)
+									if (value == null) {
+										value = packageName;
+									} else {
+										value += "," + packageName; //$NON-NLS-1$
+									}
+									manifest.getMainAttributes().putValue("Import-Package", value); //$NON-NLS-1$
+									ByteArrayOutputStream bos = new ByteArrayOutputStream();
+									manifest.write(bos);
+									ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+									fileManifest.setContents(bis, true, true, null);
+									context.set("resolvedFile", file); //$NON-NLS-1$
+								} catch (Exception e) {
+									e.printStackTrace();
+								}
+							}
+						};
+						setAction(NonReferencedAction.IMPORT, okAction);
+					}
+				}
+			});
+		}
+
+		if (bundle != null) {
+			final Button btnUseAnyway = new Button(group, SWT.RADIO);
+			btnUseAnyway.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			btnUseAnyway.setText(Messages.NonReferencedResourceDialog_useAnyway);
+			btnUseAnyway.setImage(imageCache.create("/icons/full/obj16/use_anyway.gif")); //$NON-NLS-1$
+			btnUseAnyway.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (btnUseAnyway.getSelection()) {
+						setAction(NonReferencedAction.USE_ANYWAY, new Runnable() {
+							@Override
+							public void run() {
+								context.set("resolvedFile", file); //$NON-NLS-1$
+							}
+						});
+					}
+				}
+			});
+
+		} else {
+			if (file instanceof ContributionDataFile) {
+				final ContributionDataFile cdf = (ContributionDataFile) file;
+				final Button btnConvertToBundle = new Button(group, SWT.RADIO);
+				defaultButton = btnConvertToBundle;
+				btnConvertToBundle.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+				btnConvertToBundle.setText(Messages.NonReferencedResourceDialog_convertAndRequire);
+				btnConvertToBundle.setImage(imageCache.create("/icons/full/obj16/bundle.png")); //$NON-NLS-1$
+				btnConvertToBundle.addSelectionListener(new SelectionAdapter() {
+					@Override
+					public void widgetSelected(SelectionEvent e) {
+						if (btnConvertToBundle.getSelection()) {
+							Runnable okAction = new Runnable() {
+
+								@Override
+								public void run() {
+									String bundleId;
+									try {
+										ContributionData contributionData = cdf.getContributionData();
+										bundleId = BundleConverter.convertProjectToBundle(contributionData.installLocation, project.getWorkspace());
+										if (bundleId != null) {
+
+											ContributionData cdConverted = new ContributionData(bundleId, contributionData.className, contributionData.sourceType, contributionData.iconPath);
+											cdConverted.installLocation = installLocation;
+											cdConverted.resourceRelativePath = Path.fromOSString(contributionData.iconPath).removeFirstSegments(1).toOSString();
+											doRequireBundle(bundleId, installLocation);
+											context.set("resolvedFile", new ContributionDataFile(cdConverted)); //$NON-NLS-1$
+										}
+									} catch (Exception e1) {
+										MessageDialog.openError(getShell(), Messages.NonReferencedResourceDialog_error, e1.getMessage());
+									}
+								}
+							};
+							setAction(NonReferencedAction.CONVERT_AND_REQUIRE, okAction);
+						}
+					}
+				});
+			}
+		}
+
+		if (className == null) {
+			final Button btnCopy = new Button(group, SWT.RADIO);
+			defaultButton = btnCopy;
+			btnCopy.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			btnCopy.setText(Messages.NonReferencedResourceDialog_copyToThisProject);
+			btnCopy.setImage(imageCache.create("/icons/full/obj16/copy_to_project.png")); //$NON-NLS-1$
+			btnCopy.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (btnCopy.getSelection()) {
+						Runnable okAction = new Runnable() {
+
+							@Override
+							public void run() {
+								copyResourceToProject();
+							}
+						};
+						context.set("projectToCopyTo", project); //$NON-NLS-1$
+						setAction(NonReferencedAction.COPY, okAction);
+					}
+				}
+			});
+		}
+
+		if (className == null) {
+			final Button btnCopy2 = new Button(group, SWT.RADIO);
+			btnCopy2.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			btnCopy2.setText(Messages.NonReferencedResourceDialog_copyToReferenedProject);
+			btnCopy2.setImage(imageCache.create("/icons/full/obj16/copy_to_project.png")); //$NON-NLS-1$
+			btnCopy2.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (btnCopy2.getSelection()) {
+
+						Runnable okAction = new Runnable() {
+
+							@Override
+							public void run() {
+								copyResourceToProject();
+							}
+						};
+						setAction(NonReferencedAction.COPY_TO_OTHER, okAction);
+					}
+				}
+			});
+		}
+
+		if (defaultButton != null) {
+			defaultButton.setSelection(true);
+			defaultButton.notifyListeners(SWT.Selection, new Event());
+		}
+
+		setControl(comp);
+
+	}
+
+	protected void setAction(NonReferencedAction action, Runnable runnable) {
+		context.set(NonReferencedAction.class, action);
+		context.set(Runnable.class, runnable);
+		if (getContainer().getCurrentPage() != null) {
+			getContainer().updateButtons();
+		}
+	}
+
+	public void copyResourceToProject() {
+		IProject project = (IProject) context.get("projectToCopyTo"); //$NON-NLS-1$
+		String path = (String) context.get("folderToCopyTo"); //$NON-NLS-1$
+		try {
+			// String filename = ((ContributionDataFile)
+			// file).getContributionData().className + ".class";
+			IPath newPath = Path.fromOSString(path);
+			if (newPath.isEmpty() == false) {
+				CoreUtility.createFolder(project.getFolder(newPath));
+			}
+			if (className != null) {
+				newPath.append(className + ".class"); //$NON-NLS-1$
+			} else {
+				String name = file.getFullPath().lastSegment();
+				newPath = newPath.append(name);
+			}
+			IFile fileClone = project.getFile(newPath);
+			fileClone.create(file.getContents(), false, null);
+			context.set("resolvedFile", fileClone); //$NON-NLS-1$
+		} catch (CoreException e1) {
+			e1.printStackTrace();
+			MessageDialog.openError(getShell(), "Error", e1.getMessage()); //$NON-NLS-1$
+		}
+	}
+
+	public void doRequireBundle(String bundle, String installLocation) {
+
+		// Get source bundle version from manifest
+		String version = null;
+		InputStream srcStream = null;
+		try {
+			Manifest manifestSource;
+			if (installLocation.endsWith(".jar")) { //$NON-NLS-1$
+				ZipFile zip = new ZipFile(installLocation);
+				srcStream = zip.getInputStream(zip.getEntry("META-INF/MANIFEST.MF")); //$NON-NLS-1$
+				manifestSource = new Manifest(srcStream);
+				zip.close();
+			} else {
+				srcStream = new BufferedInputStream(new FileInputStream(installLocation + "/META-INF/MANIFEST.MF")); //$NON-NLS-1$
+				manifestSource = new Manifest(srcStream);
+			}
+			version = manifestSource.getMainAttributes().getValue("Bundle-Version"); //$NON-NLS-1$
+			if (version != null) {
+				version = version.replaceFirst("\\.qualifier", ""); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			return;
+		} finally {
+			try {
+				srcStream.close();
+			} catch (Exception e) {
+			}
+		}
+
+		IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
+		Manifest manifest;
+		try {
+			manifest = new Manifest(fileManifest.getContents());
+			String value = manifest.getMainAttributes().getValue("Require-Bundle"); //$NON-NLS-1$
+			if (value == null) {
+				manifest.getMainAttributes().putValue("Require-Bundle", bundle); //$NON-NLS-1$
+			} else {
+				value += "," + bundle; //$NON-NLS-1$
+				if (version != null) {
+					value += ";bundle-version=" + version; //$NON-NLS-1$
+				}
+				manifest.getMainAttributes().putValue("Require-Bundle", value); //$NON-NLS-1$
+			}
+			ByteArrayOutputStream bos = new ByteArrayOutputStream();
+			manifest.write(bos);
+			// StringReader reader = new
+			ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+			fileManifest.setContents(bis, true, true, null);
+			context.set("resolvedFile", file); //$NON-NLS-1$
+		} catch (IOException e1) {
+			e1.printStackTrace();
+		} catch (CoreException e1) {
+			e1.printStackTrace();
+		}
+	}
+
+	// @Refactor
+	static public String getPackageFromClassName(String className) {
+		int index = className.lastIndexOf('.');
+		if (index >= 0) {
+			return className.substring(0, index);
+		} else {
+			return ""; //$NON-NLS-1$
+		}
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
new file mode 100644
index 0000000000..dbb731cae0
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 436848
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * A Wizard for resolving unreferenced resources
+ *
+ * @author Steven Spungin
+ *
+ */
+public class NonReferencedResourceWizard extends DynamicWizard {
+
+	private NonReferencedActionPage nonReferencedActionPage;
+	protected IProject project;
+	IEclipseContext wizContext;
+
+	BundleImageCache imageCache;
+
+	public NonReferencedResourceWizard(Shell parentShell, IProject project, String bundle, IFile file, String installLocation, IEclipseContext context) {
+		this.project = project;
+
+		wizContext = context.createChild();
+		wizContext.set(IProject.class, project);
+		wizContext.set("srcPath", file.getFullPath().toOSString()); //$NON-NLS-1$
+		wizContext.set(Runnable.class, null);
+		wizContext.set("resolvedFile", null); //$NON-NLS-1$
+
+		imageCache = new BundleImageCache(parentShell.getDisplay(), getClass().getClassLoader(), context);
+		parentShell.addDisposeListener(new DisposeListener() {
+
+			@Override
+			public void widgetDisposed(DisposeEvent e) {
+				imageCache.dispose();
+			}
+		});
+		wizContext.set(BundleImageCache.class, imageCache);
+
+		nonReferencedActionPage = new NonReferencedActionPage(project, bundle, file, installLocation, wizContext);
+	}
+
+	@Override
+	public boolean performFinish() {
+		Runnable action = wizContext.get(Runnable.class);
+		if (action != null) {
+			action.run();
+		}
+		return true;
+	}
+
+	public IFile getResult() {
+		return (IFile) wizContext.get("resolvedFile"); //$NON-NLS-1$
+	}
+
+	@Override
+	public IWizardPage getNextPage(IWizardPage page) {
+		if (page instanceof NonReferencedActionPage) {
+			clearDynamicPages();
+			NonReferencedAction action = wizContext.get(NonReferencedAction.class);
+			if (action == null) {
+				return null;
+			}
+			switch (action) {
+			case COPY: {
+				PickProjectFolderPage pickProjectFolderPage = new PickProjectFolderPage(wizContext);
+				addPage(pickProjectFolderPage);
+				return pickProjectFolderPage;
+			}
+			case COPY_TO_OTHER:
+				PickProjectPage pickProjectPage = new PickProjectPage(wizContext);
+				addPage(pickProjectPage);
+				PickProjectFolderPage pickProjectFolderPage = new PickProjectFolderPage(wizContext);
+				addPage(pickProjectFolderPage);
+				return pickProjectPage;
+			case USE_ANYWAY:
+				return null;
+			case IMPORT:
+				// TODO Page to set version
+				return null;
+			case REQUIRE:
+				// TODO Page to set version
+				return null;
+			case CONVERT_AND_REQUIRE:
+				// TODO Page for new bundle's information
+				return null;
+			default:
+				return null;
+			}
+		} else {
+			return super.getNextPage(page);
+		}
+	}
+
+	@Override
+	public void addPages() {
+		addPage(nonReferencedActionPage);
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
new file mode 100644
index 0000000000..0c5f8c24cf
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
@@ -0,0 +1,156 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.ProjectFolderPickerDialog.ProjectContentProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.ProjectFolderPickerDialog.ProjectLabelProvider;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+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.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+/**
+ * Wizard page to select a project folder
+ *
+ * @author Steven Spungin
+ *
+ */
+public class PickProjectFolderPage extends WizardPage {
+
+	private TreeViewer viewer;
+	private String value;
+	private IEclipseContext context;
+	private IPath path;
+
+	private Label label2;
+	private Label label3;
+	private Label lblResourcePath;
+
+	protected PickProjectFolderPage(IEclipseContext context) {
+		super("Select Project Folder", "Select Project Folder", null);
+		this.context = context;
+
+		setMessage(Messages.NonReferencedResourceDialog_selectProjectToReceiveCopy);
+		Image image = context.get(BundleImageCache.class).create("/icons/full/wizban/plugin_wiz.gif"); //$NON-NLS-1$
+		setImageDescriptor(ImageDescriptor.createFromImage(image));
+		setPageComplete(false);
+	}
+
+	@Override
+	public void createControl(Composite parent) {
+		// TODO Auto-generated method stub
+		Composite ret = new Composite(parent, SWT.NONE);
+		// ret.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		ret.setLayout(new GridLayout(1, false));
+
+		viewer = new TreeViewer(ret);
+		viewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
+		viewer.setContentProvider(new ProjectContentProvider());
+		viewer.setLabelProvider(new ProjectLabelProvider());
+		viewer.expandToLevel(2);
+
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+
+			@Override
+			public void doubleClick(DoubleClickEvent event) {
+				onChanged();
+			}
+		});
+
+		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+
+			@Override
+			public void selectionChanged(SelectionChangedEvent event) {
+				onChanged();
+			}
+		});
+
+		Composite compPath = new Composite(ret, SWT.NONE);
+		compPath.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		compPath.setLayout(new GridLayout(2, false));
+
+		Label label = new Label(compPath, SWT.NONE);
+		label.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+		label.setText(Messages.ProjectFolderPickerDialog_sourceResourceName);
+
+		label2 = new Label(compPath, SWT.NONE);
+		label2.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+
+		label3 = new Label(compPath, SWT.NONE);
+		label3.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+
+		lblResourcePath = new Label(compPath, SWT.NONE);
+		lblResourcePath.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+
+		compPath.setVisible(false);
+
+		String message = Messages.ProjectFolderPickerDialog_6;
+
+		getShell().setText(message);
+		setTitle(message);
+		setMessage(message);
+		setControl(ret);
+	}
+
+	@Override
+	public void setVisible(boolean visible) {
+		if (visible) {
+			IProject project = (IProject) context.get("projectToCopyTo"); //$NON-NLS-1$
+			viewer.setInput(project);
+
+			Object object = context.get("folderToCopyTo.obj"); //$NON-NLS-1$
+			if (object != null) {
+				viewer.setSelection(new StructuredSelection(object));
+			} else {
+				viewer.setSelection(new StructuredSelection());
+			}
+			setPageComplete(viewer.getSelection().isEmpty() == false);
+
+			path = new Path((String) context.get("srcPath")); //$NON-NLS-1$
+			label2.setText(path.lastSegment());
+			label3.setText(Messages.ProjectFolderPickerDialog_sourceResourceDirectory);
+			lblResourcePath.setText(path.removeLastSegments(1).toOSString());
+		}
+		super.setVisible(visible);
+	}
+
+	protected void onChanged() {
+		Object selected = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+		if (selected == null || selected instanceof String) {
+			value = ""; //$NON-NLS-1$
+		} else {
+			IResource resource = (IResource) selected;
+			value = resource.getFullPath().removeFirstSegments(1).toOSString();
+		}
+		context.set("folderToCopyTo", value); //$NON-NLS-1$
+		context.set("folderToCopyTo.obj", selected); //$NON-NLS-1$
+		setPageComplete(selected != null);
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
new file mode 100644
index 0000000000..14a837d0e4
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
@@ -0,0 +1,134 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * Wizard page to select a referenced project
+ *
+ * @author Steven Spungin
+ *
+ */
+public class PickProjectPage extends WizardPage implements IWizardPage {
+
+	private TableViewer viewer;
+	private BundleImageCache imageCache;
+	private Image imgProject;
+	private IProject[] projects;
+	private IEclipseContext context;
+
+	protected PickProjectPage(IEclipseContext context) {
+		super("Select Referenced Project");
+		this.context = context;
+		try {
+			this.projects = context.get(IProject.class).getReferencedProjects();
+		} catch (CoreException e) {
+			setErrorMessage(e.getMessage());
+			e.printStackTrace();
+		}
+		setPageComplete(false);
+	}
+
+	@Override
+	public void createControl(Composite parent) {
+
+		imageCache = new BundleImageCache(parent.getDisplay(), getClass().getClassLoader());
+		getShell().addDisposeListener(new DisposeListener() {
+
+			@Override
+			public void widgetDisposed(DisposeEvent e) {
+				imageCache.dispose();
+				imgProject = null;
+			}
+		});
+		imgProject = imageCache.create("/icons/full/obj16/projects.png"); //$NON-NLS-1$
+
+		Composite comp = new Composite(parent, SWT.NONE);
+		comp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		comp.setLayout(new GridLayout(1, false));
+
+		viewer = new TableViewer(comp, SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER | SWT.FULL_SELECTION);
+		viewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
+		viewer.setLabelProvider(new ColumnLabelProvider() {
+			@Override
+			public String getText(Object element) {
+				IProject project = (IProject) element;
+				return project.getName();
+			}
+
+			@Override
+			public Image getImage(Object element) {
+				return imgProject;
+			}
+		});
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
+
+		viewer.setInput(projects);
+
+		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+
+			@Override
+			public void selectionChanged(SelectionChangedEvent event) {
+				Object firstElement = ((StructuredSelection) event.getSelection()).getFirstElement();
+				context.set("projectToCopyTo", firstElement); //$NON-NLS-1$
+				setPageComplete(firstElement != null);
+				getContainer().updateButtons();
+			}
+		});
+
+		String message = Messages.ReferencedProjectPickerDialog_selectReferencedProject;
+		setMessage(message);
+		getShell().setText(message);
+		setTitle(message);
+
+		Image image = context.get(BundleImageCache.class).create("/icons/full/obj16/projects.png"); //$NON-NLS-1$
+		setImageDescriptor(ImageDescriptor.createFromImage(image));
+
+		setControl(comp);
+	}
+
+	@Override
+	public void setVisible(boolean visible) {
+		Object object = context.get("projectToCopyTo"); //$NON-NLS-1$
+		if (visible) {
+			if (object != null) {
+				viewer.setSelection(new StructuredSelection(object));
+			} else {
+				viewer.setSelection(new StructuredSelection());
+			}
+		}
+		setPageComplete(viewer.getSelection().isEmpty() == false);
+		super.setVisible(visible);
+	}
+
+}

From ecf393646f5fb1fd1e6106002924edc0f6bb2a3e Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Fri, 6 Jun 2014 20:45:02 -0400
Subject: [PATCH 0765/1286] Bug 436889 - [model editor] Save/restore the list
 tab columns upon editor activation Bug 436908 - [compatibility] Forward
 DIEditorPart @Persist and @PersistState to wrapped component Other Changes:
 removed autosizing and updated pack logic added autosize columns toolbar menu
 item added reset to default toolbar menu item all columns are now movable all
 columns now persist state refactored code into TableViewerUtil

Change-Id: I1ec44d962063e0f08d4342db0c43b2cc8a1aeec7
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../e4/tools/compat/parts/DIEditorPart.java   |   7 +
 .../fragment.e4xmi                            |   4 +
 .../emf/ui/internal/common/ModelEditor.java   |   8 +
 .../common/component/tabs/DocUtil.java        |  39 ++
 .../tabs/EAttributeTableViewerColumn.java     |  18 +-
 .../common/component/tabs/IViewEObjects.java  |  13 +-
 .../common/component/tabs/ListTab.java        | 462 ++++++++++++++----
 .../component/tabs/TableViewerUtil.java       |  39 +-
 .../handlers/AutosizeColumnsHandler.java      |  25 +
 .../handlers/ResetToDefaultHandler.java       |  25 +
 10 files changed, 518 insertions(+), 122 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index ca4a7b3bc5..f247c89e5e 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -9,6 +9,7 @@
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Jonas Helming <jhelming@eclipsesource.com>
  *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
+ *     Steven Spungin <steven@spungin.tv> - Bug 436889
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.parts;
 
@@ -23,6 +24,7 @@
 import org.eclipse.e4.tools.services.IDirtyProviderService;
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.di.Persist;
+import org.eclipse.e4.ui.di.PersistState;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorInput;
@@ -102,6 +104,11 @@ public void createPartControl(Composite parent) {
 		makeActions();
 	}
 
+	@PersistState
+	public void persistState() {
+		ContextInjectionFactory.invoke(component, PersistState.class, context);
+	}
+
 	protected IEclipseContext getContext() {
 		return context;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi b/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
index cadc6334a5..0762936b08 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
+++ b/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
@@ -6,6 +6,8 @@
     <elements xsi:type="commands:Command" xmi:id="_RObi4L2MEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_attributes" commandName="Mark Duplicate Model Attributes..." description="Marks Duplicate Model Attributes"/>
     <elements xsi:type="commands:Command" xmi:id="_dySeYLzDEeO8eO1Rpb-rFA" elementId="org.eclipse.e4.tools.emf.ui.command.repair_duplicate_ids" commandName="Repair Duplicate Model Element IDs" description="Repairs Duplicate Model Element IDs"/>
     <elements xsi:type="commands:Command" xmi:id="_CFlw8L2LEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.unmark" commandName="Unmark Model Items" description="Unmarks All Model Items"/>
+    <elements xsi:type="commands:Command" xmi:id="_jd7xgO5mEeOQXaYP-M2JBA" elementId="org.eclipse.e4.tools.emf.ui.command.autosizeColumns" commandName="Autosize Columns" description="Autosizes all columns to their content"/>
+    <elements xsi:type="commands:Command" xmi:id="_vsQXAPFwEeOSJuCPb-hb7A" elementId="org.eclipse.e4.tools.emf.ui.command.resetToDefault" commandName="Reset To Default" description="Resets the table to default values"/>
   </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_jtmcsLy3EeOxWJvPH-7sUQ" featurename="handlers" parentElementId="org.eclipse.e4.legacy.ide.application">
     <elements xsi:type="commands:Handler" xmi:id="_p45hULy3EeOxWJvPH-7sUQ" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateElementIdsHandler" command="_RRp7QLy2EeOxWJvPH-7sUQ"/>
@@ -13,5 +15,7 @@
     <elements xsi:type="commands:Handler" xmi:id="_TgJt4L2MEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_attributes" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateAttributesHandler" command="_RObi4L2MEeOqSr2XZwfnmA"/>
     <elements xsi:type="commands:Handler" xmi:id="_smaaALzDEeO8eO1Rpb-rFA" elementId="org.eclipse.e4.tools.emf.ui.handler.repair_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.RepairDuplicateItemsHandler" command="_dySeYLzDEeO8eO1Rpb-rFA"/>
     <elements xsi:type="commands:Handler" xmi:id="_Fin4gL2LEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.unmark" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.UnmarkItemsHandler" command="_CFlw8L2LEeOqSr2XZwfnmA"/>
+    <elements xsi:type="commands:Handler" xmi:id="_hZcKMO5mEeOQXaYP-M2JBA" elementId="org.eclipse.e4.tools.emf.ui.handler.autosizeColumns" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.AutosizeColumnsHandler" command="_jd7xgO5mEeOQXaYP-M2JBA"/>
+    <elements xsi:type="commands:Handler" xmi:id="_8AHVUPFwEeOSJuCPb-hb7A" elementId="org.eclipse.e4.tools.emf.ui.handler.resetToDefault" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.ResetToDefaultHandler" command="_vsQXAPFwEeOSJuCPb-hb7A"/>
   </fragments>
 </fragment:ModelFragments>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 5538517f54..121cbac848 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -144,6 +144,7 @@
 import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.di.Persist;
+import org.eclipse.e4.ui.di.PersistState;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
@@ -381,6 +382,13 @@ public void run() {
 		labelFeaturePaths.add(FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 	}
 
+	@PersistState
+	protected void persistState() {
+		if (listTab != null) {
+			listTab.saveSettings();
+		}
+	}
+
 	@PostConstruct
 	void postCreate(Composite composite) {
 		if (project == null) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
new file mode 100644
index 0000000000..12800b29fb
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * Helper functions for working with documents.
+ * 
+ * @author Steven Spungin
+ *
+ */
+public class DocUtil {
+
+	public static Element createChild(Element parent, String name) {
+		Element element = parent.getOwnerDocument().createElement(name);
+		parent.appendChild(element);
+		return element;
+	}
+
+	public static Document createDocument(String name) throws ParserConfigurationException {
+		Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+		doc.appendChild(doc.createElement(name));
+		return doc;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
index e003e3d45e..ef145a1f5f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555, Bug 436889
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
@@ -32,7 +32,7 @@
  */
 public class EAttributeTableViewerColumn {
 
-	private TableViewerColumn tlc;
+	private TableViewerColumn tableViewerColumn;
 	private IResourcePool resourcePool;
 	private String attName;
 	private TableViewer tvResults;
@@ -40,13 +40,13 @@ public class EAttributeTableViewerColumn {
 	public EAttributeTableViewerColumn(final TableViewer tvResults, String label, final String attName, final IEclipseContext context) {
 		this.tvResults = tvResults;
 		this.attName = attName;
-		tlc = new TableViewerColumn(tvResults, SWT.NONE);
+		tableViewerColumn = new TableViewerColumn(tvResults, SWT.NONE);
 
 		// CAN be null. Used for checkbox icon.
 		resourcePool = context.get(IResourcePool.class);
 
-		tlc.getColumn().setText(label);
-		tlc.setLabelProvider(new ColumnLabelProvider() {
+		tableViewerColumn.getColumn().setText(label);
+		tableViewerColumn.setLabelProvider(new ColumnLabelProvider() {
 			@Override
 			public String getText(Object element) {
 				EObject eObject = (EObject) element;
@@ -93,7 +93,7 @@ public Color getBackground(Object element) {
 				return EAttributeTableViewerColumn.this.getBackground(element);
 			}
 		});
-		tlc.setEditingSupport(new EAttributeEditingSupport(tvResults, attName, context));
+		tableViewerColumn.setEditingSupport(new EAttributeEditingSupport(tvResults, attName, context));
 	}
 
 	public Color getBackground(Object element) {
@@ -107,7 +107,11 @@ public Color getBackground(Object element) {
 	}
 
 	public void dispose() {
-		tlc.getColumn().dispose();
+		tableViewerColumn.getColumn().dispose();
+	}
+
+	public TableViewerColumn getTableViewerColumn() {
+		return tableViewerColumn;
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
index a7ec21d88b..98730b7f41 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555, Bug 436889
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
@@ -61,4 +61,15 @@ public interface IViewEObjects {
 	 * @return The editing domain for the implementor's model.
 	 */
 	EditingDomain getEditingDomain();
+
+	/**
+	 * Sizes widgets to fit their content. For example, columns will adjust
+	 * their width.
+	 */
+	void autosizeContent();
+
+	/**
+	 * Reverts the view to default settings
+	 */
+	void resetToDefault();
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index d1ab894ad1..f17fa63994 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -6,21 +6,39 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555, Bug 436889
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
 
+import java.io.StringReader;
+import java.io.StringWriter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -75,9 +93,15 @@
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.swt.widgets.ToolItem;
+import org.osgi.service.prefs.BackingStoreException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
 
 /**
  * A tab that contains a list EObjects, and provides editable columns for
@@ -90,9 +114,6 @@ public class ListTab implements IViewEObjects {
 
 	static final String ELIPSIS = "..."; //$NON-NLS-1$
 
-	// The table will only include EObjects that define this attribute
-	private static final String FILTER_ATTRIBUTE_ID = "elementId"; //$NON-NLS-1$
-
 	ConcurrentHashMap<String, List<EObject>> mapId_Object = new ConcurrentHashMap<String, List<EObject>>();
 
 	@Inject
@@ -126,14 +147,21 @@ public class ListTab implements IViewEObjects {
 
 	private Collection<?> highlightedItems;
 
-	HashMap<String, EAttributeTableViewerColumn> defaultColumns = new HashMap<String, EAttributeTableViewerColumn>();
-	HashMap<String, EAttributeTableViewerColumn> optionalColumns = new HashMap<String, EAttributeTableViewerColumn>();
+	protected Image imgMarkedItem;
+
+	LinkedHashMap<String, EAttributeTableViewerColumn> defaultColumns = new LinkedHashMap<String, EAttributeTableViewerColumn>();
+	LinkedHashMap<String, EAttributeTableViewerColumn> optionalColumns = new LinkedHashMap<String, EAttributeTableViewerColumn>();
+	LinkedHashMap<String, TableColumn> requiredColumns = new LinkedHashMap<String, TableColumn>();
+	private TableViewerColumn colItem;
+	private TableViewerColumn colGo;
+	private TableViewerColumn colGoXmi;
+	private TableViewerColumn colMarked;
 
 	private ToolItem filterByItem;
-
 	private ToolItem filterByAttribute;
-
-	protected Image imgMarkedItem;
+	private String filterByAttrName;
+	private String filterByItemName;
+	private EmptyFilterOption filterByAttrEmptyOption;
 
 	@PreDestroy
 	public void preDestroy() {
@@ -143,6 +171,176 @@ public void preDestroy() {
 		context.get(EMFDocumentResourceMediator.class).getDocument().removeDocumentListener(documentListener);
 	}
 
+	// save custom column and filter settings
+	public void saveSettings() {
+		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode("org.eclipse.e4.tools.emf.ui"); //$NON-NLS-1$
+		try {
+			Document doc = DocUtil.createDocument("list-tab"); //$NON-NLS-1$
+			Element cols = DocUtil.createChild(doc.getDocumentElement(), "columns"); //$NON-NLS-1$
+
+			final ArrayList<TableColumn> allCols = TableViewerUtil.getColumnsInDisplayOrder(tvResults);
+			for (TableColumn col : allCols) {
+				String id;
+				if (requiredColumns.containsValue(col)) {
+					id = getKey(requiredColumns, col);
+				} else {
+					id = col.getText();
+				}
+				saveColumn(cols, id, col);
+			}
+
+			Element filters = DocUtil.createChild(doc.getDocumentElement(), "filters"); //$NON-NLS-1$
+			if (E.notEmpty(filterByAttrName)) {
+				Element filter = DocUtil.createChild(filters, "filter"); //$NON-NLS-1$
+				DocUtil.createChild(filter, "type").setTextContent("attribute"); //$NON-NLS-1$//$NON-NLS-2$
+				DocUtil.createChild(filter, "condition").setTextContent(filterByAttrName); //$NON-NLS-1$
+				DocUtil.createChild(filter, "emptyOption").setTextContent(filterByAttrEmptyOption.name()); //$NON-NLS-1$
+			}
+			if (E.notEmpty(filterByItemName)) {
+				Element filter = DocUtil.createChild(filters, "filter"); //$NON-NLS-1$
+				DocUtil.createChild(filter, "type").setTextContent("item"); //$NON-NLS-1$ //$NON-NLS-2$
+				DocUtil.createChild(filter, "condition").setTextContent(filterByItemName); //$NON-NLS-1$
+			}
+
+			pref.put("list-tab-xml", docToString(doc)); //$NON-NLS-1$
+		} catch (ParserConfigurationException e1) {
+			e1.printStackTrace();
+		} catch (TransformerException e) {
+			e.printStackTrace();
+		}
+
+		try {
+			pref.flush();
+		} catch (BackingStoreException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private String getKey(Map<String, ?> map, Object value) {
+		for (Entry<String, ?> entry : map.entrySet()) {
+			if (entry.getValue().equals(value)) {
+				return entry.getKey();
+			}
+		}
+		return null;
+	}
+
+	private void saveColumn(Element eleCols, String columnName, TableColumn objCol) {
+		Element col = DocUtil.createChild(eleCols, "column"); //$NON-NLS-1$
+
+		DocUtil.createChild(col, "attribute").setTextContent(columnName); //$NON-NLS-1$
+
+		Integer width = objCol.getWidth();
+		DocUtil.createChild(col, "width").setTextContent(width.toString()); //$NON-NLS-1$
+	}
+
+	// load custom column and filter settings
+	private void loadSettings() {
+		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode("org.eclipse.e4.tools.emf.ui"); //$NON-NLS-1$
+		String xml = pref.get("list-tab-xml", ""); //$NON-NLS-1$ //$NON-NLS-2$
+		if (E.notEmpty(xml)) {
+			try {
+				Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(xml)));
+				XPath xpath = XPathFactory.newInstance().newXPath();
+				NodeList list;
+
+				// restore columns and column widths
+				list = (NodeList) xpath.evaluate("//columns/column", doc, XPathConstants.NODESET); //$NON-NLS-1$
+				for (int i = 0; i < list.getLength(); i++) {
+					Element ele = (Element) list.item(i);
+					TableColumn col;
+					String colName = xpath.evaluate("attribute/text()", ele); //$NON-NLS-1$
+					if (colName.isEmpty()) {
+						continue;
+					}
+					col = requiredColumns.get(colName);
+					if (col == null) {
+						col = addColumn(colName).getTableViewerColumn().getColumn();
+					}
+
+					// move it to the end of the list.
+					int currentIndex = getVisibleColumnIndex(tvResults, col);
+					int[] order = tvResults.getTable().getColumnOrder();
+					for (int idx = 0; idx < order.length; idx++) {
+						if (order[idx] > currentIndex) {
+							order[idx]--;
+						} else if (order[idx] == currentIndex) {
+							order[idx] = order.length - 1;
+						}
+					}
+					tvResults.getTable().setColumnOrder(order);
+
+					//					if ("Item".equals(colName)) { //$NON-NLS-1$
+					// col = colItem;
+					//					} else if ("Item".equals(colName)) { //$NON-NLS-1$
+					// col = colItem;
+					// }
+
+					String sWidth = xpath.evaluate("width/text()", ele); //$NON-NLS-1$
+					try {
+						col.setWidth(Integer.parseInt(sWidth));
+					} catch (Exception e) {
+					}
+				}
+
+				// restore filters
+				list = (NodeList) xpath.evaluate("//filters/filter", doc, XPathConstants.NODESET); //$NON-NLS-1$
+				for (int i = 0; i < list.getLength(); i++) {
+					Element ele = (Element) list.item(i);
+					String type = xpath.evaluate("type/text()", ele); //$NON-NLS-1$
+					String condition = xpath.evaluate("condition/text()", ele); //$NON-NLS-1$
+					String emptyOption = xpath.evaluate("emptyOption/text()", ele); //$NON-NLS-1$
+					if ("item".equals(type)) { //$NON-NLS-1$
+						filterByItem(condition);
+					} else if ("attribute".equals(type)) { //$NON-NLS-1$
+						EmptyFilterOption emptyFilterOption;
+						try {
+							emptyFilterOption = EmptyFilterOption.valueOf(emptyOption);
+						} catch (Exception e) {
+							emptyFilterOption = EmptyFilterOption.INCLUDE;
+						}
+						filterByAttribute(condition, emptyFilterOption);
+					}
+				}
+			} catch (Exception e) {
+			}
+		}
+	}
+
+	// @Refactor
+	static public int getVisibleColumnIndex(TableViewer tvResults2, TableColumn col) {
+		int createOrder = Arrays.asList(tvResults2.getTable().getColumns()).indexOf(col);
+		if (createOrder == -1) {
+			return -1;
+		} else {
+			return tvResults2.getTable().getColumnOrder()[createOrder];
+		}
+	}
+
+	// @Refactor
+	static private String docToString(Document doc) throws TransformerException {
+		TransformerFactory tf = TransformerFactory.newInstance();
+		Transformer transformer = tf.newTransformer();
+		transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); //$NON-NLS-1$
+		StringWriter writer = new StringWriter();
+		transformer.transform(new DOMSource(doc), new StreamResult(writer));
+		String output = writer.getBuffer().toString().replaceAll("\n|\r", ""); //$NON-NLS-1$ //$NON-NLS-2$
+		return output;
+	}
+
+	// @Refactor
+	static String join(Collection<String> items, String separator) {
+		StringBuilder sb = new StringBuilder();
+		for (String item : items) {
+			sb.append(item);
+			sb.append(separator);
+		}
+		if (sb.length() > 0) {
+			sb.setLength(sb.length() - separator.length());
+		}
+		return sb.toString();
+	}
+
 	@PostConstruct
 	public void postConstruct(final CTabFolder tabFolder) {
 		imageCache = new BundleImageCache(context.get(Display.class), getClass().getClassLoader());
@@ -198,7 +396,9 @@ public void widgetSelected(SelectionEvent e) {
 					if (dlg.open() == dlg.OK) {
 						// Add Column
 						String attName = dlg.getFirstElement().toString();
-						addColumn(attName);
+						EAttributeTableViewerColumn col = addColumn(attName);
+						col.getTableViewerColumn().getColumn().pack();
+						tvResults.refresh();
 					}
 				}
 			});
@@ -216,7 +416,6 @@ public void widgetSelected(SelectionEvent e) {
 						col.dispose();
 					}
 					optionalColumns.clear();
-					TableViewerUtil.refreshAndPack(tvResults);
 				}
 			});
 		}
@@ -230,33 +429,12 @@ public void widgetSelected(SelectionEvent e) {
 			filterByItem.setImage(imageCache.create("/icons/full/obj16/filter_by_item.gif")); //$NON-NLS-1$
 
 			filterByItem.addSelectionListener(new SelectionAdapter() {
+
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final TitleAreaFilterDialog dlg = createElementTypePicker(Messages.ListTab_filterByItem);
 					if (dlg.open() == Window.OK) {
-						final String name = dlg.getFirstElement().toString();
-						mapId_Object.clear();
-						final ArrayList<EObject> filtered = new ArrayList<EObject>();
-						for (EObject object : getAllEObjects()) {
-							if (object.eClass().getName().equals(name)) {
-								filtered.add(object);
-								// filter.setText(Messages.ListTab_7 +
-								// attFilter);
-
-							}
-
-							ViewerFilter viewerFilter = new ViewerFilter() {
-
-								@Override
-								public boolean select(Viewer viewer, Object parentElement, Object element) {
-									return filtered.contains(element);
-								}
-
-							};
-							tvResults.setFilters(new ViewerFilter[] { viewerFilter });
-							filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS + "(" + name + ")"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-							filterByAttribute.setText(Messages.ListTab_filterByAttribute + ELIPSIS);
-						}
+						filterByItem(dlg.getFirstElement().toString());
 					}
 				};
 			});
@@ -273,53 +451,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 				public void widgetSelected(SelectionEvent e) {
 					TitleAreaFilterDialogWithEmptyOptions dlg = createEObjectAttributePicker(Messages.ListTab_filterByAttribute);
 					if (dlg.open() == dlg.OK) {
-						final String attFilter = dlg.getFirstElement().toString();
-						final EmptyFilterOption emptyOption = dlg.getEmptyFilterOption();
-						mapId_Object.clear();
-						final ArrayList<EObject> filtered = new ArrayList<EObject>();
-						for (EObject object : getAllEObjects()) {
-							if (EmfUtil.getAttribute(object, attFilter) != null) {
-								filtered.add(object);
-								ViewerFilter viewerFilter = new ViewerFilter() {
-
-									@Override
-									public boolean select(Viewer viewer, Object parentElement, Object element) {
-										// if filtering on attribute, always
-										// reject if not defined for model
-										// element
-										if (EmfUtil.getAttribute((EObject) element, attFilter) == null) {
-											return false;
-										}
-										switch (emptyOption) {
-										case EXCLUDE:
-											if (E.isEmpty(EmfUtil.getAttributeValue((EObject) element, attFilter))) {
-												return false;
-											} else {
-												return filtered.contains(element);
-											}
-										case ONLY:
-											if (E.notEmpty((EmfUtil.getAttributeValue((EObject) element, attFilter)))) {
-												return false;
-											} else {
-												return true;
-											}
-										default:
-										case INCLUDE:
-											if (E.isEmpty(EmfUtil.getAttributeValue((EObject) element, attFilter))) {
-												return true;
-											} else {
-												return filtered.contains(element);
-											}
-										}
-									}
-								};
-								tvResults.setFilters(new ViewerFilter[] { viewerFilter });
-								filterByAttribute.setText(Messages.ListTab_filterByAttribute + ELIPSIS + "(" + attFilter + ")"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-								filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS);
-
-							}
-						}
-						addColumn(attFilter);
+						filterByAttribute(dlg.getFirstElement().toString(), dlg.getEmptyFilterOption());
 					}
 				};
 			});
@@ -333,6 +465,8 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 			filterRemove.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
+					filterByItemName = null;
+					filterByAttrName = null;
 					tvResults.setFilters(new ViewerFilter[0]);
 					filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS);
 					filterByAttribute.setText(Messages.ListTab_markAttribute + ELIPSIS);
@@ -353,8 +487,10 @@ public void widgetSelected(SelectionEvent e) {
 			commandIds.add("org.eclipse.e4.tools.emf.ui.command.repair_duplicate_ids"); //$NON-NLS-1$
 			commandIds.add(E4ToolItemMenu.SEPARATOR);
 			commandIds.add("org.eclipse.e4.tools.emf.ui.command.unmark"); //$NON-NLS-1$
+			commandIds.add(E4ToolItemMenu.SEPARATOR);
+			commandIds.add("org.eclipse.e4.tools.emf.ui.command.autosizeColumns"); //$NON-NLS-1$
+			commandIds.add("org.eclipse.e4.tools.emf.ui.command.resetToDefault"); //$NON-NLS-1$
 			tiCommands.addCommands(commandIds);
-
 		}
 
 		tvResults = new TableViewer(composite, SWT.FULL_SELECTION);
@@ -370,9 +506,9 @@ public void widgetSelected(SelectionEvent e) {
 		final Image imgForm = resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_application_form);
 		final Image imgXmi = resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_chart_organisation);
 
-		final TableViewerColumn colGo = new TableViewerColumn(tvResults, SWT.NONE);
+		colGo = new TableViewerColumn(tvResults, SWT.NONE);
 		colGo.getColumn().setText(Messages.ListTab_col_go);
-
+		requiredColumns.put("GoTree", colGo.getColumn());
 		colGo.setLabelProvider(new ColumnLabelProvider() {
 			@Override
 			public Image getImage(Object element) {
@@ -385,9 +521,9 @@ public String getText(Object element) {
 			}
 		});
 
-		final TableViewerColumn colGoXmi = new TableViewerColumn(tvResults, SWT.NONE);
+		colGoXmi = new TableViewerColumn(tvResults, SWT.NONE);
 		colGoXmi.getColumn().setText(Messages.ListTab_col_go);
-
+		requiredColumns.put("GoXmi", colGoXmi.getColumn());
 		colGoXmi.setLabelProvider(new ColumnLabelProvider() {
 			@Override
 			public String getText(Object element) {
@@ -411,9 +547,10 @@ public void mouseDown(MouseEvent e) {
 			}
 		});
 
-		TableViewerColumn colMarked = new TableViewerColumn(tvResults, SWT.NONE);
+		colMarked = new TableViewerColumn(tvResults, SWT.NONE);
 		colMarked.getColumn().setWidth(16);
 		colMarked.getColumn().setText(Messages.ListTab_mark);
+		requiredColumns.put("Marked", colMarked.getColumn());
 		colMarked.setLabelProvider(new ColumnLabelProvider() {
 			@Override
 			public Image getImage(Object element) {
@@ -422,7 +559,7 @@ public Image getImage(Object element) {
 					try {
 						ret = imgMarkedItem;
 					} catch (Exception e) {
-					} //$NON-NLS-1$
+					}
 				} else {
 					ret = null;
 				}
@@ -435,8 +572,9 @@ public String getText(Object element) {
 			}
 		});
 
-		TableViewerColumn colItem = new TableViewerColumn(tvResults, SWT.NONE);
+		colItem = new TableViewerColumn(tvResults, SWT.NONE);
 		colItem.getColumn().setText(Messages.ListTab_col_item);
+		requiredColumns.put("Item", colItem.getColumn());
 		colItem.setLabelProvider(new ColumnLabelProvider_Markable() {
 			@Override
 			public String getText(Object element) {
@@ -447,20 +585,10 @@ public String getText(Object element) {
 
 		app.getContext().set("org.eclipse.e4.tools.active-object-viewer", this); //$NON-NLS-1$
 
-		TableViewerColumn colId = new TableViewerColumn(tvResults, SWT.NONE);
-		colId.getColumn().setText("elementId"); //$NON-NLS-1$
-		colId.setLabelProvider(new ColumnLabelProvider_Markable() {
-			@Override
-			public String getText(Object element) {
-				EObject eObject = (EObject) element;
-				EAttribute eAtt = EmfUtil.getAttribute(eObject, "elementId"); //$NON-NLS-1$
-				return super.getText(eObject.eGet(eAtt));
-			}
-		});
-		colId.setEditingSupport(new EAttributeEditingSupport(tvResults, FILTER_ATTRIBUTE_ID, context));
+		EAttributeTableViewerColumn colId = new EAttributeTableViewerColumn(tvResults, "elementId", "elementId", context);
+		defaultColumns.put("elementId", colId); //$NON-NLS-1$
 
 		EAttributeTableViewerColumn colLabel = new EAttributeTableViewerColumn_Markable(tvResults, "label", "label", context); //$NON-NLS-1$ //$NON-NLS-2$
-
 		defaultColumns.put("label", colLabel); //$NON-NLS-1$
 
 		// Custom selection for marked items
@@ -492,12 +620,21 @@ public void handleEvent(Event event) {
 		});
 
 		tvResults.getTable().setFocus();
+
+		for (EAttributeTableViewerColumn col : defaultColumns.values()) {
+			col.getTableViewerColumn().getColumn().setMoveable(true);
+		}
+		for (TableColumn col : requiredColumns.values()) {
+			col.setMoveable(true);
+		}
+
 		reload();
+		TableViewerUtil.refreshAndPack(tvResults);
+		loadSettings();
 	}
 
 	public void reload() {
 		tvResults.setInput(modelResource);
-		TableViewerUtil.refreshAndPack(tvResults);
 	}
 
 	public TableViewer getViewer() {
@@ -628,13 +765,20 @@ protected Control createContents(Composite parent) {
 	 * Adds a column if it does not already exist
 	 *
 	 * @param attName
+	 * @return The existing or newly created column
 	 */
-	private void addColumn(String attName) {
-		if (optionalColumns.containsKey(attName) == false && defaultColumns.containsKey(attName) == false) {
-			EAttributeTableViewerColumn colName = new EAttributeTableViewerColumn_Markable(tvResults, attName, attName, context);
-			TableViewerUtil.refreshAndPack(tvResults);
-			optionalColumns.put(attName, colName);
+	private EAttributeTableViewerColumn addColumn(String attName) {
+		EAttributeTableViewerColumn colName = defaultColumns.get(attName);
+		if (colName == null) {
+			colName = optionalColumns.get(colName);
+			if (colName == null) {
+				colName = new EAttributeTableViewerColumn_Markable(tvResults, attName, attName, context);
+				optionalColumns.put(attName, colName);
+				colName.getTableViewerColumn().getColumn().setMoveable(true);
+				tvResults.refresh();
+			}
 		}
+		return colName;
 	}
 
 	private class EAttributeTableViewerColumn_Markable extends EAttributeTableViewerColumn {
@@ -675,4 +819,106 @@ public EditingDomain getEditingDomain() {
 	public boolean isHighlighted(Object element) {
 		return highlightedItems != null && highlightedItems.contains(element);
 	}
+
+	private void filterByItem(String name) {
+		filterByItemName = name;
+		filterByAttrName = null;
+		filterByAttrEmptyOption = null;
+		mapId_Object.clear();
+		final ArrayList<EObject> filtered = new ArrayList<EObject>();
+		for (EObject object : getAllEObjects()) {
+			if (object.eClass().getName().equals(filterByItemName)) {
+				filtered.add(object);
+				// filter.setText(Messages.ListTab_7 +
+				// attFilter);
+
+			}
+
+			ViewerFilter viewerFilter = new ViewerFilter() {
+
+				@Override
+				public boolean select(Viewer viewer, Object parentElement, Object element) {
+					return filtered.contains(element);
+				}
+
+			};
+			tvResults.setFilters(new ViewerFilter[] { viewerFilter });
+			filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS + "(" + filterByItemName + ")"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+			filterByAttribute.setText(Messages.ListTab_filterByAttribute + ELIPSIS);
+		}
+	}
+
+	private void filterByAttribute(String name, final EmptyFilterOption emptyOption) {
+		filterByAttrName = name;
+		filterByAttrEmptyOption = emptyOption;
+		filterByItemName = null;
+		mapId_Object.clear();
+		final ArrayList<EObject> filtered = new ArrayList<EObject>();
+		for (EObject object : getAllEObjects()) {
+			if (EmfUtil.getAttribute(object, filterByAttrName) != null) {
+				filtered.add(object);
+				ViewerFilter viewerFilter = new ViewerFilter() {
+
+					@Override
+					public boolean select(Viewer viewer, Object parentElement, Object element) {
+						// if filtering on attribute, always
+						// reject if not defined for model
+						// element
+						if (EmfUtil.getAttribute((EObject) element, filterByAttrName) == null) {
+							return false;
+						}
+						switch (emptyOption) {
+						case EXCLUDE:
+							if (E.isEmpty(EmfUtil.getAttributeValue((EObject) element, filterByAttrName))) {
+								return false;
+							} else {
+								return filtered.contains(element);
+							}
+						case ONLY:
+							if (E.notEmpty((EmfUtil.getAttributeValue((EObject) element, filterByAttrName)))) {
+								return false;
+							} else {
+								return true;
+							}
+						default:
+						case INCLUDE:
+							if (E.isEmpty(EmfUtil.getAttributeValue((EObject) element, filterByAttrName))) {
+								return true;
+							} else {
+								return filtered.contains(element);
+							}
+						}
+					}
+				};
+				tvResults.setFilters(new ViewerFilter[] { viewerFilter });
+				filterByAttribute.setText(Messages.ListTab_filterByAttribute + ELIPSIS + "(" + filterByAttrName + ")"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+				filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS);
+
+			}
+		}
+		TableViewerColumn viewerColumn = addColumn(filterByAttrName).getTableViewerColumn();
+		viewerColumn.getColumn().pack();
+	}
+
+	@Override
+	public void autosizeContent() {
+		for (TableColumn col : tvResults.getTable().getColumns()) {
+			col.pack();
+			if (col.getWidth() < 10) {
+				col.setWidth(10);
+			}
+		}
+	}
+
+	@Override
+	public void resetToDefault() {
+		for (EAttributeTableViewerColumn col : optionalColumns.values()) {
+			col.dispose();
+		}
+		optionalColumns.clear();
+
+		TableViewerUtil.resetColumnOrder(tvResults);
+		TableViewerUtil.packAllColumns(tvResults);
+	}
+
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
index 252cffd5a8..c18223244c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
@@ -11,6 +11,10 @@
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+
 import java.util.Arrays;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
@@ -22,16 +26,12 @@
 public class TableViewerUtil {
 	static public void refreshAndPack(TableViewer viewer) {
 		viewer.refresh();
-		for (TableColumn col : viewer.getTable().getColumns()) {
-			col.pack();
-		}
+		packAllColumns(viewer);
 	}
 
 	static public void updateAndPack(TableViewer viewer, Object object) {
 		viewer.update(object, null);
-		for (TableColumn col : viewer.getTable().getColumns()) {
-			col.pack();
-		}
+		packAllColumns(viewer);
 	}
 
 	public static boolean isColumnClicked(TableViewer viewer, MouseEvent e, TableViewerColumn tvColumn) {
@@ -58,4 +58,31 @@ public static Object getData(TableViewer viewer, MouseEvent e) {
 			return cell.getElement();
 		}
 	}
+
+	public static void packAllColumns(TableViewer viewer) {
+		for (TableColumn col : viewer.getTable().getColumns()) {
+			col.pack();
+		}
+	}
+
+	static public void resetColumnOrder(TableViewer tvResults) {
+		int[] order = tvResults.getTable().getColumnOrder();
+		for (int i = 0; i < order.length; i++) {
+			order[i] = i;
+		}
+		tvResults.getTable().setColumnOrder(order);
+	}
+
+	static public ArrayList<TableColumn> getColumnsInDisplayOrder(TableViewer viewer) {
+		final ArrayList<TableColumn> allCols = new ArrayList<TableColumn>(Arrays.asList(viewer.getTable().getColumns()));
+		final int[] order = viewer.getTable().getColumnOrder();
+		Collections.sort(allCols, new Comparator<TableColumn>() {
+	
+			@Override
+			public int compare(TableColumn o1, TableColumn o2) {
+				return order[allCols.indexOf(o1)] - order[allCols.indexOf(o2)];
+			}
+		});
+		return allCols;
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java
new file mode 100644
index 0000000000..b09dec2521
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 436889
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.handlers;
+
+import javax.inject.Named;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.IViewEObjects;
+
+public class AutosizeColumnsHandler extends MarkDuplicateItemsBase {
+	@Execute
+	public void execute(@Named(VIEWER_KEY) IViewEObjects viewer, IEclipseContext context) {
+		viewer.autosizeContent();
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java
new file mode 100644
index 0000000000..9411611167
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.handlers;
+
+import javax.inject.Named;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.IViewEObjects;
+
+public class ResetToDefaultHandler extends AbstractHandler {
+
+	@Execute
+	public void execute(@Named(VIEWER_KEY) IViewEObjects viewer) {
+		viewer.resetToDefault();
+	}
+
+}
\ No newline at end of file

From c1cc8c5009686e0d619da20a3f785aaf4d03eeec Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Wed, 11 Jun 2014 21:48:25 -0400
Subject: [PATCH 0766/1286] Bug 391089 - Add possibility to search and replace
 in Application Model editor Bug 437236 - [model editor] xmi tab does not
 update when changes are made to tree tab Other changes: Refactored XMI tab to
 class, and used injection instead of passing in a gazillion parameters.

Change-Id: Ia35bb03f07e29906316e3f9ed5a2761e3b456860
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../emf/ui/internal/common/ModelEditor.java   |  96 ++-------
 .../common/component/tabs/XmiTab.java         | 185 ++++++++++++++++++
 .../xml/EMFDocumentResourceMediator.java      |  25 ++-
 3 files changed, 228 insertions(+), 78 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 121cbac848..46db1ba6cb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,7 +10,7 @@
  *     Wim Jongman <wim.jongman@remainsoftware.com> - Maintenance
  *     Marco Descher <marco@descher.at> - Bug395982, 426653, 422465
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 396902, 431755, 431735, 424730, 424730
+ *     Steven Spungin <steven@spungin.tv> - Bug 396902, 431755, 431735, 424730, 424730, 391089, 437236
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
@@ -108,6 +108,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.EmfUtil;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.IGotoObject;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.ListTab;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.XmiTab;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationAddons;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationCategoriesEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationWindowEditor;
@@ -134,10 +135,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.properties.ExportIdsHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.properties.ExternalizeStringHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.properties.ProjectOSGiTranslationProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.xml.AnnotationAccess;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.EMFDocumentResourceMediator;
-import org.eclipse.e4.tools.emf.ui.internal.common.xml.XMLConfiguration;
-import org.eclipse.e4.tools.emf.ui.internal.common.xml.XMLPartitionScanner;
 import org.eclipse.e4.tools.services.IClipboardService;
 import org.eclipse.e4.tools.services.IClipboardService.Handler;
 import org.eclipse.e4.tools.services.IResourcePool;
@@ -170,7 +168,6 @@
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.CommandParameter;
@@ -189,17 +186,6 @@
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.resource.StringConverter;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.text.rules.FastPartitioner;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.AnnotationModel;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.text.source.VerticalRuler;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -272,8 +258,6 @@ public class ModelEditor implements IGotoObject {
 	public static final String VIRTUAL_PERSPECTIVE_CONTROLS = ModelEditor.class.getName() + "VIRTUAL_PERSPECTIVE_CONTROLS"; //$NON-NLS-1$
 	public static final String VIRTUAL_SNIPPETS = ModelEditor.class.getName() + "VIRTUAL_SNIPPETS"; //$NON-NLS-1$
 
-	private static final int VERTICAL_RULER_WIDTH = 20;
-
 	public static final int TAB_FORM = 0;
 	public static final int TAB_XMI = 1;
 	public static final int TAB_LIST = 2;
@@ -339,8 +323,6 @@ public class ModelEditor implements IGotoObject {
 
 	private CTabFolder editorTabFolder;
 
-	private SourceViewer sourceViewer;
-
 	private boolean mod1Down = false;
 
 	private boolean saving;
@@ -353,6 +335,8 @@ public class ModelEditor implements IGotoObject {
 
 	private CTabItem tabItemTree;
 
+	private XmiTab xmiTab;
+
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project, final IResourcePool resourcePool) {
 		this.resourcePool = resourcePool;
 		this.modelProvider = modelProvider;
@@ -437,12 +421,13 @@ public void handleEvent(Event event) {
 
 		tabItemXmi = new CTabItem(editorTabFolder, SWT.NONE);
 		tabItemXmi.setText(messages.ModelEditor_XMI);
-		tabItemXmi.setControl(createXMITab(editorTabFolder));
+		xmiTab = createXMITab(editorTabFolder);
+		tabItemXmi.setControl(xmiTab);
 		tabItemXmi.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_chart_organisation));
 		editorTabFolder.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				if (editorTabFolder.getSelectionIndex() == 1) {
+				if (editorTabFolder.getSelectionIndex() == getTabIndex(tabItemXmi)) {
 					emfDocumentProvider.updateFromEMF();
 				}
 			}
@@ -508,50 +493,14 @@ private MApplicationElement findModelElement(Control control) {
 		return null;
 	}
 
-	private Control createXMITab(Composite composite) {
-
-		final AnnotationModel model = new AnnotationModel();
-		VerticalRuler verticalRuler = new VerticalRuler(VERTICAL_RULER_WIDTH, new AnnotationAccess(resourcePool));
-		int styles = SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION;
-		sourceViewer = new SourceViewer(composite, verticalRuler, styles);
-		sourceViewer.configure(new XMLConfiguration(resourcePool));
-		sourceViewer.setEditable(project != null);
-		sourceViewer.getTextWidget().setFont(JFaceResources.getTextFont());
-
-		final IDocument document = emfDocumentProvider.getDocument();
-		IDocumentPartitioner partitioner = new FastPartitioner(new XMLPartitionScanner(), new String[] { XMLPartitionScanner.XML_TAG, XMLPartitionScanner.XML_COMMENT });
-		partitioner.connect(document);
-		document.setDocumentPartitioner(partitioner);
-		sourceViewer.setDocument(document);
-		verticalRuler.setModel(model);
-
-		emfDocumentProvider.setValidationChangedCallback(new Runnable() {
-
-			@Override
-			public void run() {
-				model.removeAllAnnotations();
-
-				for (Diagnostic d : emfDocumentProvider.getErrorList()) {
-					Annotation a = new Annotation("e4xmi.error", false, d.getMessage()); //$NON-NLS-1$
-					int l;
-					try {
-						l = document.getLineOffset(d.getLine() - 1);
-						model.addAnnotation(a, new Position(l));
-					} catch (BadLocationException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-			}
-		});
-
-		String property = System.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
-		if (property != null || preferences.getBoolean("tab-form-search-show", false)) { //$NON-NLS-1$
-			sourceViewer.setEditable(false);
-			sourceViewer.getTextWidget().setEnabled(false);
-		}
-
-		return sourceViewer.getControl();
+	private XmiTab createXMITab(Composite composite) {
+		IEclipseContext childContext = context.createChild();
+		childContext.set(Composite.class, composite);
+		childContext.set(EMFDocumentResourceMediator.class, emfDocumentProvider);
+		childContext.set(IEclipsePreferences.class, preferences);
+		childContext.set(IResourcePool.class, resourcePool);
+		XmiTab ret = ContextInjectionFactory.make(XmiTab.class, childContext);
+		return ret;
 	}
 
 	private Composite createFormTab(Composite composite) {
@@ -1481,6 +1430,7 @@ void dispose() {
 		if (project == null) {
 			context.get(Display.class).removeFilter(SWT.MouseUp, keyListener);
 		}
+		ContextInjectionFactory.uninject(xmiTab, xmiTab.getContext());
 	}
 
 	public IModelResource getModelProvider() {
@@ -1498,7 +1448,7 @@ public void paste() {
 					currentEditor.handlePaste();
 				}
 			} else {
-				sourceViewer.getTextWidget().paste();
+				xmiTab.paste();
 			}
 		}
 
@@ -1570,7 +1520,7 @@ public void copy() {
 					currentEditor.handleCopy();
 				}
 			} else {
-				sourceViewer.getTextWidget().copy();
+				xmiTab.copy();
 			}
 		}
 
@@ -1592,7 +1542,7 @@ public void cut() {
 					currentEditor.handleCut();
 				}
 			} else {
-				sourceViewer.getTextWidget().cut();
+				xmiTab.cut();
 			}
 		}
 
@@ -1855,13 +1805,7 @@ public void gotoEObject(int targetHint, EObject object) {
 				emfDocumentProvider.updateFromEMF();
 
 				try {
-					// select the entire start tag
-					IRegion region = emfDocumentProvider.findStartTag(object);
-					if (region != null) {
-						sourceViewer.setSelection(new TextSelection(region.getOffset(), region.getLength()), true);
-					} else {
-						sourceViewer.setSelection(new TextSelection(0, 0), true);
-					}
+					xmiTab.gotoEObject(object);
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
new file mode 100644
index 0000000000..6498d2c029
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
@@ -0,0 +1,185 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2010-2014 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 391089
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.internal.common.xml.AnnotationAccess;
+import org.eclipse.e4.tools.emf.ui.internal.common.xml.EMFDocumentResourceMediator;
+import org.eclipse.e4.tools.emf.ui.internal.common.xml.XMLConfiguration;
+import org.eclipse.e4.tools.emf.ui.internal.common.xml.XMLPartitionScanner;
+import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentPartitioner;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.TextSelection;
+import org.eclipse.jface.text.rules.FastPartitioner;
+import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.jface.text.source.AnnotationModel;
+import org.eclipse.jface.text.source.SourceViewer;
+import org.eclipse.jface.text.source.VerticalRuler;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+
+public class XmiTab extends Composite {
+
+	private static final String ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED = "org.eclipse.e4.tools.modeleditor.filteredtree.enabled.xmitab.disabled";//$NON-NLS-1$
+	private static final int VERTICAL_RULER_WIDTH = 20;
+
+	@Inject
+	private IEclipseContext context;
+	@Inject
+	private IProject project;
+	@Inject
+	private EMFDocumentResourceMediator emfDocumentProvider;
+	@Inject
+	private IResourcePool resourcePool;
+	@Inject
+	private IEclipsePreferences preferences;
+
+	private Text text;
+	protected int offsetStart;
+	private SourceViewer sourceViewer;
+
+	@Inject
+	public XmiTab(Composite parent) {
+		super(parent, SWT.NONE);
+		setLayout(new GridLayout(1, false));
+	}
+
+	@PostConstruct
+	protected void postConstruct() {
+
+		text = new Text(this, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
+		text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+		text.setMessage("type text to search (press <ENTER> to search for next instance)");
+		text.addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyPressed(KeyEvent e) {
+				if (e.keyCode != SWT.CR) {
+					offsetStart = 0;
+				}
+				offsetStart = searchAndHighlight(text.getText(), offsetStart);
+			}
+		});
+
+		final AnnotationModel model = new AnnotationModel();
+		VerticalRuler verticalRuler = new VerticalRuler(VERTICAL_RULER_WIDTH, new AnnotationAccess(resourcePool));
+		int styles = SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION;
+		sourceViewer = new SourceViewer(this, verticalRuler, styles);
+		sourceViewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+		sourceViewer.configure(new XMLConfiguration(resourcePool));
+		sourceViewer.setEditable(project != null);
+		sourceViewer.getTextWidget().setFont(JFaceResources.getTextFont());
+
+		final IDocument document = emfDocumentProvider.getDocument();
+		IDocumentPartitioner partitioner = new FastPartitioner(new XMLPartitionScanner(), new String[] { XMLPartitionScanner.XML_TAG, XMLPartitionScanner.XML_COMMENT });
+		partitioner.connect(document);
+		document.setDocumentPartitioner(partitioner);
+		sourceViewer.setDocument(document);
+		verticalRuler.setModel(model);
+
+		emfDocumentProvider.setValidationChangedCallback(new Runnable() {
+
+			@Override
+			public void run() {
+				model.removeAllAnnotations();
+
+				for (Diagnostic d : emfDocumentProvider.getErrorList()) {
+					Annotation a = new Annotation("e4xmi.error", false, d.getMessage()); //$NON-NLS-1$
+					int l;
+					try {
+						l = document.getLineOffset(d.getLine() - 1);
+						model.addAnnotation(a, new Position(l));
+					} catch (BadLocationException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+			}
+		});
+
+		String property = System.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
+		if (property != null || preferences.getBoolean("tab-form-search-show", false)) { //$NON-NLS-1$
+			sourceViewer.setEditable(false);
+			sourceViewer.getTextWidget().setEnabled(false);
+		}
+	}
+
+	/**
+	 *
+	 * @param text
+	 * @param startOffset
+	 * @return The endOFfset, or -1 if not found
+	 */
+	protected int searchAndHighlight(String text, int startOffset) {
+		try {
+			// select the entire start tag
+			IRegion region;
+			region = emfDocumentProvider.findText(text, startOffset);
+			if (region == null && startOffset > 0) {
+				region = emfDocumentProvider.findText(text, 0);
+			}
+			if (region != null) {
+				sourceViewer.setSelection(new TextSelection(region.getOffset(), region.getLength()), true);
+				return region.getOffset() + region.getLength();
+			} else {
+				sourceViewer.setSelection(new TextSelection(0, 0), true);
+				return -1;
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			return -1;
+		}
+	}
+
+	public IEclipseContext getContext() {
+		return context;
+	}
+
+	public void gotoEObject(EObject object) {
+		// select the entire start tag
+		IRegion region = emfDocumentProvider.findStartTag(object);
+		if (region != null) {
+			sourceViewer.setSelection(new TextSelection(region.getOffset(), region.getLength()), true);
+		} else {
+			sourceViewer.setSelection(new TextSelection(0, 0), true);
+		}
+	}
+
+	public void paste() {
+		sourceViewer.getTextWidget().paste();
+	}
+
+	public void copy() {
+		sourceViewer.getTextWidget().copy();
+	}
+
+	public void cut() {
+		sourceViewer.getTextWidget().cut();
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
index 9a4c036a75..50e129ae7c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - Bug 431735
+ *     Steven Spungin <steven@spungin.tv> - Bug 431735, Bug 391089
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.xml;
@@ -12,6 +12,7 @@
 import java.util.Collections;
 import java.util.List;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
 import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
@@ -106,7 +107,7 @@ private String toXMI(EObject root) {
 	 * @return The region for the start tag of the EObject, or null if not found.
 	 */
 	public IRegion findStartTag(EObject object) {
-		if (object == null){
+		if (object == null) {
 			return null;
 		}
 		E4XMIResource root = (E4XMIResource) ((EObject) modelResource.getRoot().get(0)).eResource();
@@ -123,4 +124,24 @@ public IRegion findStartTag(EObject object) {
 		}
 	}
 
+	/**
+	 * @param object
+	 * @return The region for the start of the text, or null if not found or the
+	 *         text is empty.
+	 */
+	public IRegion findText(String text, int startOffset) {
+		if (E.isEmpty(text)) {
+			return null;
+		}
+
+		FindReplaceDocumentAdapter find = new FindReplaceDocumentAdapter(document);
+		IRegion region;
+		try {
+			region = find.find(startOffset, text, true, true, false, false); //$NON-NLS-1$ //$NON-NLS-2$
+			return region;
+		} catch (BadLocationException e) {
+			return null;
+		}
+	}
+
 }

From 734bea6fb4697750d0055c94ac9a29660eca0102 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Thu, 12 Jun 2014 07:45:02 -0400
Subject: [PATCH 0767/1286] Bug 436889 - [model editor] Save/restore the list
 tab columns upon editor activation

This patch has a workaround until
Bug 437207 - [ViewMgmt] [compatibility]
Forward DIEditorPart @Persist and @PersistState to wrapped component
is merged

Change-Id: Id9ad67a7098931f4c89daef47cc42e96290283cd
---
 .../e4/tools/emf/ui/internal/common/ModelEditor.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 46db1ba6cb..4c4a8d87a9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -209,6 +209,8 @@
 import org.eclipse.swt.dnd.DragSourceEvent;
 import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.dnd.TransferData;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.KeyListener;
@@ -364,6 +366,16 @@ public void run() {
 		}
 		labelFeaturePaths.add(FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		labelFeaturePaths.add(FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+
+		// This is a workaround until Bug 437207 is merged.
+		// @PersistState will not be invoked.
+		composite.addDisposeListener(new DisposeListener() {
+
+			@Override
+			public void widgetDisposed(DisposeEvent arg0) {
+				persistState();
+			}
+		});
 	}
 
 	@PersistState

From 202cfd56ccc23c86bc33a72fb4ff1b3ada167a4f Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Thu, 12 Jun 2014 21:30:48 -0400
Subject: [PATCH 0768/1286] Bug 437321 - [target platform search] Deadlock
 occurs if progress monitor dialog is not closed before indexing is completed

Change-Id: Iaab29624665aa84f70bc763b158e2a85a6c8c813
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../dialogs/FilteredContributionDialog.java         | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index 3d2ce7f1eb..93b52811a8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -387,13 +387,18 @@ public void run() {
 							public void onStatusChanged(final ProviderStatus status) {
 								FilteredContributionDialog.this.providerStatus = status;
 								try {
-									getShell().getDisplay().asyncExec(new Runnable() {
+									getShell().getDisplay().syncExec(new Runnable() {
 
 										@Override
 										public void run() {
 											updateStatusMessage();
 											switch (status) {
 											case READY:
+												// This will deadlock if currentSearchThread is not null
+												currentSearchThread = null;
+												if (currentResultHandler != null) {
+													currentResultHandler.cancled = true;
+												}
 												refreshSearch();
 												break;
 											case CANCELLED:
@@ -409,10 +414,11 @@ public void run() {
 							}
 						});
 						collector.findContributions(filter, currentResultHandler);
-						currentSearchThread = null;
+
 						monitor.done();
 						searching = false;
-						getShell().getDisplay().asyncExec(new Runnable() {
+						currentSearchThread = null;
+						getShell().getDisplay().syncExec(new Runnable() {
 
 							@Override
 							public void run() {
@@ -423,7 +429,6 @@ public void run() {
 					}
 
 				};
-
 				currentSearchThread.schedule();
 
 			}

From 7b2c26f3e57cc7bc8157b36800079fe3af9d5c0f Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Fri, 13 Jun 2014 08:49:49 -0400
Subject: [PATCH 0769/1286] Bug 437368 - [target platform search] Finish button
 does not activate for import and require actions in the non referenced
 resource wizard for icons

Change-Id: I91a66d988a582bc7e7d938dfd2740ca18441b04f
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../common/resourcelocator/dialogs/DynamicWizard.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
index 1e698bf0b7..1be8e4f366 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
@@ -40,13 +40,17 @@ public boolean performFinish() {
 
 	@Override
 	public boolean canFinish() {
+
+		IWizardPage cur = getContainer().getCurrentPage();
+		IWizardPage nextPage = getNextPage(cur);
+
+		// We need to call get next page first, as that may add or remove pages
 		for (IWizardPage page : pages) {
 			if (page.isPageComplete() == false) {
 				return false;
 			}
 		}
-		IWizardPage cur = getContainer().getCurrentPage();
-		return getNextPage(cur) == null;
+		return nextPage == null;
 	}
 
 	@Override

From b4b6dabf4bbe9eb61451c2fb6a441cabde94bf2c Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Fri, 13 Jun 2014 10:26:06 -0400
Subject: [PATCH 0770/1286] Bug 437372 - [model editor] [list tab] add ability
 to sort by clicking on column

Change-Id: I748520f0e8ebf4af5c8db2ecdd5dc3ccc81f8255
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../common/component/tabs/ListTab.java        |  80 +++++++---
 .../component/tabs/TableViewerUtil.java       | 146 +++++++++++++++++-
 2 files changed, 204 insertions(+), 22 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index f17fa63994..667cc819f0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555, Bug 436889
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555, Bug 436889, Bug 437372
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
@@ -14,7 +14,6 @@
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -45,6 +44,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.EAttributeEditingSupport.ATT_TYPE;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.EmptyFilterOption;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.TitleAreaFilterDialog;
@@ -259,7 +259,7 @@ private void loadSettings() {
 					}
 
 					// move it to the end of the list.
-					int currentIndex = getVisibleColumnIndex(tvResults, col);
+					int currentIndex = TableViewerUtil.getVisibleColumnIndex(tvResults, col);
 					int[] order = tvResults.getTable().getColumnOrder();
 					for (int idx = 0; idx < order.length; idx++) {
 						if (order[idx] > currentIndex) {
@@ -307,16 +307,6 @@ private void loadSettings() {
 		}
 	}
 
-	// @Refactor
-	static public int getVisibleColumnIndex(TableViewer tvResults2, TableColumn col) {
-		int createOrder = Arrays.asList(tvResults2.getTable().getColumns()).indexOf(col);
-		if (createOrder == -1) {
-			return -1;
-		} else {
-			return tvResults2.getTable().getColumnOrder()[createOrder];
-		}
-	}
-
 	// @Refactor
 	static private String docToString(Document doc) throws TransformerException {
 		TransformerFactory tf = TransformerFactory.newInstance();
@@ -585,11 +575,11 @@ public String getText(Object element) {
 
 		app.getContext().set("org.eclipse.e4.tools.active-object-viewer", this); //$NON-NLS-1$
 
-		EAttributeTableViewerColumn colId = new EAttributeTableViewerColumn(tvResults, "elementId", "elementId", context);
-		defaultColumns.put("elementId", colId); //$NON-NLS-1$
+		EAttributeTableViewerColumn colId = new EAttributeTableViewerColumn(tvResults, "elementId", "elementId", context); //$NON-NLS-2$
+		defaultColumns.put("elementId", colId);
 
-		EAttributeTableViewerColumn colLabel = new EAttributeTableViewerColumn_Markable(tvResults, "label", "label", context); //$NON-NLS-1$ //$NON-NLS-2$
-		defaultColumns.put("label", colLabel); //$NON-NLS-1$
+		EAttributeTableViewerColumn colLabel = new EAttributeTableViewerColumn_Markable(tvResults, "label", "label", context); //$NON-NLS-2$
+		defaultColumns.put("label", colLabel);
 
 		// Custom selection for marked items
 		tvResults.getTable().addListener(SWT.EraseItem, new Listener() {
@@ -621,18 +611,41 @@ public void handleEvent(Event event) {
 
 		tvResults.getTable().setFocus();
 
-		for (EAttributeTableViewerColumn col : defaultColumns.values()) {
+		for (final EAttributeTableViewerColumn col : defaultColumns.values()) {
 			col.getTableViewerColumn().getColumn().setMoveable(true);
 		}
 		for (TableColumn col : requiredColumns.values()) {
 			col.setMoveable(true);
 		}
 
+		makeSortable(colId.getTableViewerColumn().getColumn(), new AttributeColumnLabelSorter(colId.getTableViewerColumn().getColumn(), "elementId")); //$NON-NLS-1$
+		makeSortable(colLabel.getTableViewerColumn().getColumn(), new AttributeColumnLabelSorter(colLabel.getTableViewerColumn().getColumn(), "label")); //$NON-NLS-1$
+		makeSortable(colItem.getColumn(), new TableViewerUtil.ColumnLabelSorter(colItem.getColumn()));
+		makeSortable(colMarked.getColumn(), new TableViewerUtil.AbstractInvertableTableSorter() {
+
+			@Override
+			public int compare(Viewer viewer, Object e1, Object e2) {
+				boolean mark1 = isHighlighted(e1);
+				boolean mark2 = isHighlighted(e2);
+				if (mark1 && !mark2) {
+					return -1;
+				} else if (mark2 && !mark1) {
+					return 1;
+				} else {
+					return 0;
+				}
+			}
+		});
+
 		reload();
 		TableViewerUtil.refreshAndPack(tvResults);
 		loadSettings();
 	}
 
+	private void makeSortable(TableColumn column, TableViewerUtil.AbstractInvertableTableSorter sorter) {
+		new TableViewerUtil.TableSortSelectionListener(tvResults, column, sorter, SWT.UP, false);
+	}
+
 	public void reload() {
 		tvResults.setInput(modelResource);
 	}
@@ -775,12 +788,43 @@ private EAttributeTableViewerColumn addColumn(String attName) {
 				colName = new EAttributeTableViewerColumn_Markable(tvResults, attName, attName, context);
 				optionalColumns.put(attName, colName);
 				colName.getTableViewerColumn().getColumn().setMoveable(true);
+				makeSortable(colName.getTableViewerColumn().getColumn(), new AttributeColumnLabelSorter(colName.getTableViewerColumn().getColumn(), attName));
 				tvResults.refresh();
 			}
 		}
 		return colName;
 	}
 
+	static private class AttributeColumnLabelSorter extends TableViewerUtil.ColumnLabelSorter {
+
+		private String attName;
+
+		AttributeColumnLabelSorter(TableColumn col, String attName) {
+			super(col);
+			this.attName = attName;
+		}
+
+		@Override
+		public int compare(Viewer viewer, Object e1, Object e2) {
+			// if either is boolean, use boolean value, otherwise use text value
+			ATT_TYPE e1Type = EAttributeEditingSupport.getAttributeType(e1, attName);
+			ATT_TYPE e2Type = EAttributeEditingSupport.getAttributeType(e2, attName);
+			if (e1Type == ATT_TYPE.BOOLEAN || e2Type == ATT_TYPE.BOOLEAN) {
+				Boolean b1 = (Boolean) (EmfUtil.getAttributeValue((EObject) e1, attName));
+				Boolean b2 = (Boolean) (EmfUtil.getAttributeValue((EObject) e2, attName));
+				if (b1 == null && b2 != null) {
+					return -2;
+				} else if (b2 == null && b1 != null) {
+					return 2;
+				} else {
+					return (b1.compareTo(b2));
+				}
+			} else {
+				return super.compare(viewer, e1, e2);
+			}
+		}
+	}
+
 	private class EAttributeTableViewerColumn_Markable extends EAttributeTableViewerColumn {
 		public EAttributeTableViewerColumn_Markable(TableViewer tvResults, String label, String attName, IEclipseContext context) {
 			super(tvResults, label, attName, context);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
index c18223244c..728cf3fb37 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
@@ -6,24 +6,153 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, ongoing maintenance
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
-
-import java.util.Arrays;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.TableColumn;
 
 public class TableViewerUtil {
+
+	// Sorts the column by the provider's text value
+	static class ColumnLabelSorter extends TableViewerUtil.AbstractInvertableTableSorter {
+		private final TableColumn col;
+
+		ColumnLabelSorter(TableColumn col) {
+			this.col = col;
+		}
+
+		@Override
+		public int compare(Viewer viewer, Object e1, Object e2) {
+			TableViewer tableViewer = (TableViewer) viewer;
+			ColumnLabelProvider labelProvider = (ColumnLabelProvider) tableViewer.getLabelProvider(Arrays.asList(tableViewer.getTable().getColumns()).indexOf(col));
+			return labelProvider.getText(e1).compareTo(labelProvider.getText(e2));
+		}
+	}
+
+	static abstract class InvertableSorter extends ViewerSorter {
+		@Override
+		public abstract int compare(Viewer viewer, Object e1, Object e2);
+
+		abstract InvertableSorter getInverseSorter();
+
+		public abstract int getSortDirection();
+	}
+
+	static public abstract class AbstractInvertableTableSorter extends InvertableSorter {
+		private final InvertableSorter inverse = new InvertableSorter() {
+
+			@Override
+			public int compare(Viewer viewer, Object e1, Object e2) {
+				return (-1) * AbstractInvertableTableSorter.this.compare(viewer, e1, e2);
+			}
+
+			@Override
+			InvertableSorter getInverseSorter() {
+				return AbstractInvertableTableSorter.this;
+			}
+
+			@Override
+			public int getSortDirection() {
+				return SWT.DOWN;
+			}
+		};
+
+		@Override
+		InvertableSorter getInverseSorter() {
+			return inverse;
+		}
+
+		@Override
+		public int getSortDirection() {
+			return SWT.UP;
+		}
+	}
+
+	static public class TableSortSelectionListener implements SelectionListener {
+		private final TableViewer viewer;
+		private final TableColumn column;
+		private final InvertableSorter sorter;
+		private final boolean keepDirection;
+		private InvertableSorter currentSorter;
+
+		/**
+		 * The constructor of this listener.
+		 *
+		 * @param viewer
+		 *            the tableviewer this listener belongs to
+		 * @param column
+		 *            the column this listener is responsible for
+		 * @param sorter
+		 *            the sorter this listener uses
+		 * @param defaultDirection
+		 *            the default sorting direction of this Listener. Possible
+		 *            values are {@link SWT.UP} and {@link SWT.DOWN}
+		 * @param keepDirection
+		 *            if true, the listener will remember the last sorting
+		 *            direction of the associated column and restore it when the
+		 *            column is reselected. If false, the listener will use the
+		 *            default sorting direction
+		 */
+		public TableSortSelectionListener(TableViewer viewer, TableColumn column, AbstractInvertableTableSorter sorter, int defaultDirection, boolean keepDirection) {
+			this.viewer = viewer;
+			this.column = column;
+			this.keepDirection = keepDirection;
+			this.sorter = (defaultDirection == SWT.UP) ? sorter : sorter.getInverseSorter();
+			this.currentSorter = this.sorter;
+
+			this.column.addSelectionListener(this);
+		}
+
+		/**
+		 * Chooses the column of this listener for sorting of the table. Mainly
+		 * used when first initializing the table.
+		 */
+		public void chooseColumnForSorting() {
+			viewer.getTable().setSortColumn(column);
+			viewer.getTable().setSortDirection(currentSorter.getSortDirection());
+			viewer.setSorter(currentSorter);
+		}
+
+		@Override
+		public void widgetSelected(SelectionEvent e) {
+			InvertableSorter newSorter;
+			if (viewer.getTable().getSortColumn() == column) {
+				newSorter = ((InvertableSorter) viewer.getSorter()).getInverseSorter();
+			} else {
+				if (keepDirection) {
+					newSorter = currentSorter;
+				} else {
+					newSorter = sorter;
+				}
+			}
+
+			currentSorter = newSorter;
+			chooseColumnForSorting();
+		}
+
+		@Override
+		public void widgetDefaultSelected(SelectionEvent e) {
+			widgetSelected(e);
+		}
+	}
+
 	static public void refreshAndPack(TableViewer viewer) {
 		viewer.refresh();
 		packAllColumns(viewer);
@@ -77,7 +206,7 @@ static public ArrayList<TableColumn> getColumnsInDisplayOrder(TableViewer viewer
 		final ArrayList<TableColumn> allCols = new ArrayList<TableColumn>(Arrays.asList(viewer.getTable().getColumns()));
 		final int[] order = viewer.getTable().getColumnOrder();
 		Collections.sort(allCols, new Comparator<TableColumn>() {
-	
+
 			@Override
 			public int compare(TableColumn o1, TableColumn o2) {
 				return order[allCols.indexOf(o1)] - order[allCols.indexOf(o2)];
@@ -85,4 +214,13 @@ public int compare(TableColumn o1, TableColumn o2) {
 		});
 		return allCols;
 	}
+
+	static public int getVisibleColumnIndex(TableViewer tvResults2, TableColumn col) {
+		int createOrder = Arrays.asList(tvResults2.getTable().getColumns()).indexOf(col);
+		if (createOrder == -1) {
+			return -1;
+		} else {
+			return tvResults2.getTable().getColumnOrder()[createOrder];
+		}
+	}
 }
\ No newline at end of file

From d18ead5e58034cfbbeaf11a8448fc6e7b65a9fbe Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Mon, 16 Jun 2014 09:37:25 +0200
Subject: [PATCH 0771/1286] Bug 437504 - Add newWizard description

Signed-off-by: Marco Descher <marco@descher.at>
---
 .../OSGI-INF/l10n/bundle.properties           |  7 +++++++
 bundles/org.eclipse.e4.tools/plugin.xml       | 21 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
index 2445b90e3c..f129e2aa5c 100644
--- a/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
@@ -3,11 +3,18 @@ category.name = Eclipse 4
 category.name.0 = Classes
 category.name.1 = Model
 wizard.name = Eclipse 4 Application Project
+wizard.name.description = Create an Eclipse 4 application project
 wizard.name.0 = New Application Model
+wizard.name.0.description = Create an Eclipse 4 application model
 wizard.name.1 = New Model Fragment
+wizard.name.1.description = Create an Eclipse 4 model fragment
 wizard.name.2 = New Handler Class
+wizard.name.2.description = Create an Eclipse 4 command handler class
 wizard.name.3 = New Part Class
+wizard.name.3.description = Create an Eclipse 4 part class
 wizard.name.4 = New Addon Class
+wizard.name.4.description = Create an Eclipse 4 add-on class
 wizard.name.5 = New Tool Control Class
+wizard.name.5.description = Create an Eclipse 4 tool control class
 Bundle-Name = Tools
 Bundle-Vendor = Eclipse.org
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/plugin.xml b/bundles/org.eclipse.e4.tools/plugin.xml
index 8a6a20cf32..9dc10a451a 100644
--- a/bundles/org.eclipse.e4.tools/plugin.xml
+++ b/bundles/org.eclipse.e4.tools/plugin.xml
@@ -24,6 +24,9 @@
             id="org.eclipse.e4.tools.E4NewProjectWizard"
             name="%wizard.name"
             project="true">
+         <description>
+            %wizard.name.description
+         </description>
       </wizard>
       <wizard
             category="org.eclipse.e4.tools/org.eclipse.e4.tools.model"
@@ -31,6 +34,9 @@
             icon="icons/full/obj16/application_view_tile.png"
             id="org.eclipse.e4.tools.newappmodel"
             name="%wizard.name.0">
+         <description>
+            %wizard.name.0.description
+         </description>
       </wizard>
       <wizard
             category="org.eclipse.e4.tools/org.eclipse.e4.tools.model"
@@ -38,6 +44,9 @@
             icon="icons/full/obj16/plugin.png"
             id="org.eclipse.e4.tools.newmodelfragment"
             name="%wizard.name.1">
+         <description>
+            %wizard.name.1.description
+         </description>
       </wizard>
       <wizard
             category="org.eclipse.e4.tools/org.eclipse.e4.tools.classes"
@@ -45,6 +54,9 @@
             icon="icons/full/obj16/class_obj.gif"
             id="org.eclipse.e4.tools.newhandler"
             name="%wizard.name.2">
+         <description>
+            %wizard.name.2.description
+         </description>
       </wizard>
       <wizard
             category="org.eclipse.e4.tools/org.eclipse.e4.tools.classes"
@@ -52,6 +64,9 @@
             icon="icons/full/obj16/Part.gif"
             id="org.eclipse.e4.tools.newpart"
             name="%wizard.name.3">
+         <description>
+            %wizard.name.3.description
+         </description>
       </wizard>
       <wizard
             category="org.eclipse.e4.tools/org.eclipse.e4.tools.classes"
@@ -59,6 +74,9 @@
             icon="icons/full/obj16/Addons.png"
             id="org.eclipse.e4.tools.newaddon"
             name="%wizard.name.4">
+         <description>
+            %wizard.name.4.description
+         </description>
       </wizard>
       <wizard
             category="org.eclipse.e4.tools/org.eclipse.e4.tools.classes"
@@ -66,6 +84,9 @@
             icon="icons/full/obj16/ToolControl.gif"
             id="org.eclipse.e4.tools.newtoolcontrol"
             name="%wizard.name.5">
+         <description>
+            %wizard.name.5.description
+         </description>
       </wizard>
    </extension>
 </plugin>

From 0de4f968a17bcb7603481fd379e8cd53c742a536 Mon Sep 17 00:00:00 2001
From: Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com>
Date: Mon, 19 May 2014 00:00:58 +0200
Subject: [PATCH 0772/1286] Bug 395283 - Store and restore window size and
 location of subdialogs while editing Applicatione4xmi

Change-Id: Idbff52a385aee352e7862f0ac1d66788b188f2ad
Signed-off-by: Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com>
---
 .../AbstractCommandSelectionDialog.java       |  4 +-
 .../AbstractIconDialogWithHardcodedScope.java |  4 +-
 .../component/dialogs/AbstractIdDialog.java   |  7 +-
 .../BindingContextSelectionDialog.java        |  6 +-
 .../CommandCategorySelectionDialog.java       |  6 +-
 .../component/dialogs/ExpressionIdDialog.java |  6 +-
 .../dialogs/FeatureSelectionDialog.java       |  6 +-
 .../dialogs/FilteredContributionDialog.java   |  4 +-
 .../dialogs/FindImportElementDialog.java      |  6 +-
 .../SaveDialogBoundsSettingsDialog.java       | 66 +++++++++++++++++++
 .../dialogs/SharedElementsDialog.java         |  6 +-
 11 files changed, 93 insertions(+), 28 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index 5f96c0fd1f..ece8294e0b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -23,7 +24,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -47,7 +47,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-public abstract class AbstractCommandSelectionDialog extends TitleAreaDialog {
+public abstract class AbstractCommandSelectionDialog extends SaveDialogBoundsSettingsDialog {
 	private IModelResource resource;
 	private TableViewer viewer;
 	protected Messages Messages;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
index 4304f641ce..44293532c5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Steven Spungin <steven@spungin.tv> - Bug 404136, 424730
+ *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -36,7 +37,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.StringMatcher;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -70,7 +70,7 @@
  * @author Steven Spungin
  *
  */
-public abstract class AbstractIconDialogWithHardcodedScope extends TitleAreaDialog {
+public abstract class AbstractIconDialogWithHardcodedScope extends SaveDialogBoundsSettingsDialog {
 	private TableViewer viewer;
 	private IProject project;
 	private Map<IFile, Image> icons = Collections.synchronizedMap(new HashMap<IFile, Image>());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
index a59855592c..1fcde1e2e4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013
+ * Copyright (c) 2013 - 2014 fhv.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     Nicolaj Hoess <nicohoess@gmail.com> - initial implementation (Bug 396975)
- *     Andrej Brummelhuis <andrejbrummelhuis@gmail.com> - initial implementation (Bug 396975)
+ *     Andrej Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 396975, 395283
  *     Adrian Alcaide - initial implementation (Bug 396975)
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
@@ -23,7 +23,6 @@
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -44,7 +43,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-public abstract class AbstractIdDialog<ContributionClass, ElementClass extends MApplicationElement> extends TitleAreaDialog {
+public abstract class AbstractIdDialog<ContributionClass, ElementClass extends MApplicationElement> extends SaveDialogBoundsSettingsDialog {
 
 	protected EModelService modelService;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
index 85e319cf97..dad7b1bcdd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010-2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -21,7 +22,6 @@
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -45,7 +45,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-public class BindingContextSelectionDialog extends TitleAreaDialog {
+public class BindingContextSelectionDialog extends SaveDialogBoundsSettingsDialog {
 	private IModelResource resource;
 	private TableViewer viewer;
 	private MBindingContext selectedContext;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
index 92d0925575..7211295489 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010-2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -24,7 +25,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -48,7 +48,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-public class CommandCategorySelectionDialog extends TitleAreaDialog {
+public class CommandCategorySelectionDialog extends SaveDialogBoundsSettingsDialog {
 	private IModelResource resource;
 	private TableViewer viewer;
 	private MCommand command;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
index 9ed5253a42..4e3db84a11 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010-2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -23,7 +24,6 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -45,7 +45,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-public class ExpressionIdDialog extends TitleAreaDialog {
+public class ExpressionIdDialog extends SaveDialogBoundsSettingsDialog {
 	private IExtensionLookup lookup;
 	private TableViewer viewer;
 	private EditingDomain domain;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index e8b804562d..9f3918f82c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010-2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -27,7 +28,6 @@
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ILabelProvider;
@@ -58,7 +58,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-public class FeatureSelectionDialog extends TitleAreaDialog {
+public class FeatureSelectionDialog extends SaveDialogBoundsSettingsDialog {
 	private TreeViewer viewer;
 	private MStringModelFragment fragment;
 	private EditingDomain editingDomain;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index 93b52811a8..394cae8101 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625, Bug 436281
+ *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
@@ -52,7 +53,6 @@
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -98,7 +98,7 @@
  * @author Steven Spungin
  *
  */
-public abstract class FilteredContributionDialog extends TitleAreaDialog {
+public abstract class FilteredContributionDialog extends SaveDialogBoundsSettingsDialog {
 
 	private static final int MAX_RESULTS = 500;
 	private Image contributionTypeImage;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index b15b5f4af8..c6746c259b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010-2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -24,7 +25,6 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -53,7 +53,7 @@
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
 
-public class FindImportElementDialog extends TitleAreaDialog {
+public class FindImportElementDialog extends SaveDialogBoundsSettingsDialog {
 	private EObject element;
 	private AbstractComponentEditor editor;
 	private TableViewer viewer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
new file mode 100644
index 0000000000..a713f64200
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2014 fhv.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - initial implementation (Bug 395283)
+ *******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.dialogs.DialogSettings;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.swt.widgets.Shell;
+import org.osgi.service.prefs.BackingStoreException;
+import org.osgi.service.prefs.Preferences;
+
+public abstract class SaveDialogBoundsSettingsDialog extends TitleAreaDialog {
+
+	private static final String ORG_ECLIPSE_E4_TOOLS_EMF_UI = "org.eclipse.e4.tools.emf.ui"; //$NON-NLS-1$
+
+	private static final String DIALOG_ORIGIN_X = "DIALOG_X_ORIGIN"; //$NON-NLS-1$
+	private static final String DIALOG_ORIGIN_Y = "DIALOG_Y_ORIGIN"; //$NON-NLS-1$
+	private static final String DIALOG_WIDTH = "DIALOG_WIDTH"; //$NON-NLS-1$
+	private static final String DIALOG_HEIGHT = "DIALOG_HEIGHT"; //$NON-NLS-1$
+
+	private IDialogSettings dialogSettings;
+
+	private Preferences preferences = InstanceScope.INSTANCE.getNode(ORG_ECLIPSE_E4_TOOLS_EMF_UI);
+
+	public SaveDialogBoundsSettingsDialog(Shell parentShell) {
+		super(parentShell);
+	}
+
+	@Override
+	protected IDialogSettings getDialogBoundsSettings() {
+		dialogSettings = new DialogSettings(ORG_ECLIPSE_E4_TOOLS_EMF_UI);
+		dialogSettings.put(DIALOG_HEIGHT, preferences.getInt(DIALOG_HEIGHT, -1));
+		dialogSettings.put(DIALOG_WIDTH, preferences.getInt(DIALOG_WIDTH, -1));
+		dialogSettings.put(DIALOG_ORIGIN_X, preferences.getInt(DIALOG_ORIGIN_X, -1));
+		dialogSettings.put(DIALOG_ORIGIN_Y, preferences.getInt(DIALOG_ORIGIN_Y, -1));
+		return dialogSettings;
+	}
+
+	private void saveDialogSettings() {
+		preferences.put(DIALOG_HEIGHT, dialogSettings.get(DIALOG_HEIGHT));
+		preferences.put(DIALOG_WIDTH, dialogSettings.get(DIALOG_WIDTH));
+		preferences.put(DIALOG_ORIGIN_X, dialogSettings.get(DIALOG_ORIGIN_X));
+		preferences.put(DIALOG_ORIGIN_Y, dialogSettings.get(DIALOG_ORIGIN_Y));
+		try {
+			preferences.flush();
+		} catch (BackingStoreException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public boolean close() {
+		boolean returnValue = super.close();
+		saveDialogSettings();
+		return returnValue;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index 16d641472b..9743e7097d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010-2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -36,7 +37,6 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -58,7 +58,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-public class SharedElementsDialog extends TitleAreaDialog {
+public class SharedElementsDialog extends SaveDialogBoundsSettingsDialog {
 	private TableViewer viewer;
 	private MPlaceholder placeholder;
 	private IModelResource resource;

From 7297ea9c3b822c6ed79e923be930dc727c1c6ab5 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Mon, 16 Jun 2014 11:35:01 -0400
Subject: [PATCH 0773/1286] Bug 437543 - [model editor] Live editor has
 injection error creating XmiTab

Change-Id: I809b912825d2e5b4baa84b553e7716774641cc8c
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../tools/emf/ui/internal/common/component/tabs/XmiTab.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
index 6498d2c029..009de5586b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 391089
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 391089, Bug 437543
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
@@ -17,6 +17,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.AnnotationAccess;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.EMFDocumentResourceMediator;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.XMLConfiguration;
@@ -51,6 +52,8 @@ public class XmiTab extends Composite {
 
 	@Inject
 	private IEclipseContext context;
+
+	@Optional
 	@Inject
 	private IProject project;
 	@Inject

From ff776845643599e594bdfaf730e9577ddce81816 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Sun, 15 Jun 2014 00:12:58 -0400
Subject: [PATCH 0774/1286] Bug 437469 - [model editor] add autocomplete combo
 box to FindParentReferenceElementDialog

Change-Id: If300beb121a667d9b91292c0babb48170aae11d0
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../FindParentReferenceElementDialog.java     | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index 89ca837b47..76c83b9101 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Bug 437469
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
@@ -31,6 +33,8 @@
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.fieldassist.AutoCompleteField;
+import org.eclipse.jface.fieldassist.ComboContentAdapter;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -39,6 +43,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.TableViewer;
@@ -56,6 +61,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
@@ -75,6 +81,7 @@ public class FindParentReferenceElementDialog extends TitleAreaDialog {
 	private WritableList list;
 	private ComboViewer eClassViewer;
 	private Text searchText;
+	private AutoCompleteField acText;
 
 	public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEditor editor, MStringModelFragment fragment, Messages Messages) {
 		super(parentShell);
@@ -113,7 +120,8 @@ public void widgetDisposed(DisposeEvent e) {
 		Label l = new Label(container, SWT.NONE);
 		l.setText(Messages.FindParentReferenceElementDialog_ContainerType);
 
-		eClassViewer = new ComboViewer(container);
+		Combo combo = new Combo(container, SWT.NONE);
+		eClassViewer = new ComboViewer(combo);
 		eClassViewer.setLabelProvider(new LabelProvider() {
 			@Override
 			public String getText(Object element) {
@@ -121,7 +129,7 @@ public String getText(Object element) {
 			}
 		});
 		eClassViewer.setContentProvider(new ArrayContentProvider());
-		List<EClass> eClassList = new ArrayList<EClass>();
+		final List<EClass> eClassList = new ArrayList<EClass>();
 		for (InternalPackage p : Util.loadPackages()) {
 			eClassList.addAll(p.getAllClasses());
 		}
@@ -141,10 +149,25 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 			@Override
 			public void selectionChanged(SelectionChangedEvent event) {
 				updateSearch();
-
 			}
 		});
 
+		ArrayList<String> vals = new ArrayList<String>();
+		for (EClass item : eClassList) {
+			vals.add(item.getName());
+		}
+		final String[] values = vals.toArray(new String[0]);
+		ComboContentAdapter textContentAdapter = new ComboContentAdapter() {
+			@Override
+			public void setControlContents(Control control, String text1, int cursorPosition) {
+				super.setControlContents(control, text1, cursorPosition);
+				int index = Arrays.asList(values).indexOf(text1);
+				EClass eClass = eClassList.get(index);
+				eClassViewer.setSelection(new StructuredSelection(eClass));
+			}
+		};
+		acText = new AutoCompleteField(combo, textContentAdapter, values);
+
 		l = new Label(container, SWT.NONE);
 		l.setText(Messages.FindParentReferenceElementDialog_Search);
 

From ab8366b81dbd02be380a7df8dc7f01764c946aaf Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Mon, 16 Jun 2014 13:40:52 -0400
Subject: [PATCH 0775/1286] Bug 437552 - [model editor] NPE when opening live
 model editor without list tab enabled

Change-Id: Ia6e47c514438614c9b248c405deab5d229028cf2
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../e4/tools/emf/ui/internal/common/ModelEditor.java        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 4c4a8d87a9..9069318806 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,7 +10,7 @@
  *     Wim Jongman <wim.jongman@remainsoftware.com> - Maintenance
  *     Marco Descher <marco@descher.at> - Bug395982, 426653, 422465
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 396902, 431755, 431735, 424730, 424730, 391089, 437236
+ *     Steven Spungin <steven@spungin.tv> - Bug 396902, 431755, 431735, 424730, 424730, 391089, 437236, 437552
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
@@ -454,7 +454,7 @@ public void widgetSelected(SelectionEvent e) {
 				// Eventually, all 3 tabs, or even the ModelEditor itself, could
 				// implement the interface.
 				String key = "org.eclipse.e4.tools.active-object-viewer"; //$NON-NLS-1$
-				if (editorTabFolder.getSelectionIndex() == getTabIndex(listTab.getTabItem())) {
+				if (listTab != null && editorTabFolder.getSelectionIndex() == getTabIndex(listTab.getTabItem())) {
 					app.getContext().set(key, listTab);
 				} else {
 					app.getContext().set(key, null);
@@ -1823,7 +1823,7 @@ public void gotoEObject(int targetHint, EObject object) {
 				}
 				break;
 			case TAB_LIST:
-				if (tabItemList != null) {
+				if (tabItemList != null && listTab != null) {
 					editorTabFolder.setSelection(getTabIndex(tabItemList));
 					listTab.getViewer().setSelection(new StructuredSelection(object), true);
 				}

From 55bbd1e1ff7b028bb180d7a5e117a67e558a1344 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Mon, 16 Jun 2014 23:52:51 -0400
Subject: [PATCH 0776/1286] Bug 437569 - [nonreferenced resource dialog]
 Install location text box should not have value selected

Change-Id: I7dace84c9916e3f5895d3f90e5fcbb21dda7241e
---
 .../resourcelocator/dialogs/NonReferencedActionPage.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
index d62536d1f5..ba15ca37b3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 437569
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
@@ -385,6 +385,7 @@ public void run() {
 			defaultButton.notifyListeners(SWT.Selection, new Event());
 		}
 
+		comp.setFocus();
 		setControl(comp);
 
 	}

From ac01ae5186eb077ba4b44e8d20d4130ec24c1862 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Tue, 24 Jun 2014 09:25:16 -0400
Subject: [PATCH 0777/1286] Bug 437890 - [Model Editor] Tab List should be
 visible by default

Change-Id: I944361424f290114ec3e64c612c3161f9b570334
---
 .../editor3x/ModelEditorPreferencePage.java   | 24 ++-----------------
 .../ui/internal/PreferenceInitializer.java    |  9 ++-----
 .../emf/ui/internal/common/ModelEditor.java   |  5 ++--
 3 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
index f1a2207657..2b5015744c 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - Bug 431735
+ *     Steven Spungin <steven@spungin.tv> - Bug 431735, Bug 437890
  ******************************************************************************/
 
 package org.eclipse.e4.tools.emf.editor3x;
@@ -27,7 +27,6 @@ public class ModelEditorPreferencePage extends PreferencePage implements IWorkbe
 	private ColorFieldEditor fColorValueNotRendered;
 	private ColorFieldEditor fColorValueNotVisible;
 	private ColorFieldEditor fColorValueNotVisibleAndRendered;
-	private BooleanFieldEditor fShowListTab;
 	private BooleanFieldEditor fShowSearch;
 
 	public ModelEditorPreferencePage() {
@@ -101,7 +100,7 @@ protected Control createContents(Composite parent) {
 				fShowXMIId.setPreferenceStore(getPreferenceStore());
 				fShowXMIId.load();
 			}
-
+			
 			{
 				Composite container = new Composite(group, SWT.NONE);
 				container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
@@ -110,23 +109,6 @@ protected Control createContents(Composite parent) {
 				fShowSearch.setPreferenceStore(getPreferenceStore());
 				fShowSearch.load();
 			}
-
-		}
-
-		{
-			Group group = new Group(result, SWT.NONE);
-			group.setText("Tabs");
-			group.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
-			group.setLayout(new GridLayout(2, false));
-
-			{
-				Composite container = new Composite(group, SWT.NONE);
-				container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
-				fShowListTab = new BooleanFieldEditor("tab-list-show", "Show List Tab", container);
-				fShowListTab.setPage(this);
-				fShowListTab.setPreferenceStore(getPreferenceStore());
-				fShowListTab.load();
-			}
 		}
 
 		return result;
@@ -139,7 +121,6 @@ public boolean performOk() {
 		fColorValueNotRendered.store();
 		fColorValueNotVisible.store();
 		fColorValueNotVisibleAndRendered.store();
-		fShowListTab.store();
 		fShowSearch.store();
 		return super.performOk();
 	}
@@ -151,7 +132,6 @@ protected void performDefaults() {
 		fColorValueNotRendered.loadDefault();
 		fColorValueNotVisible.loadDefault();
 		fColorValueNotVisibleAndRendered.loadDefault();
-		fShowListTab.loadDefault();
 		fShowSearch.loadDefault();
 		super.performDefaults();
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
index 2587345ef7..7a9d2fccee 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - Bug 431735
+ *     Steven Spungin <steven@spungin.tv> - Bug 431735, Bug 437890
  ******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal;
@@ -36,12 +36,7 @@ public void initializeDefaultPreferences() {
 		if (pref.get("autoCreateElementId", null) == null) { //$NON-NLS-1$
 			pref.putBoolean("autoCreateElementId", true); //$NON-NLS-1$
 		}
-
-		// TODO: if accepted, this should default to true
-		if (pref.get("tab-list-show", null) == null) { //$NON-NLS-1$
-			pref.putBoolean("tab-list-show", false); //$NON-NLS-1$
-		}
-
+		
 		// TODO: After XMI tab is not forced disabled, this should default to
 		// true
 		if (pref.get("tab-form-search-show", null) == null) { //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 9069318806..65b418d491 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -429,7 +429,7 @@ public void handleEvent(Event event) {
 		tabItemTree.setControl(createFormTab(editorTabFolder));
 		tabItemTree.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_application_form));
 
-		tab_list_show(preferences.getBoolean("tab-list-show", false)); //$NON-NLS-1$
+		tab_list_show(true);
 
 		tabItemXmi = new CTabItem(editorTabFolder, SWT.NONE);
 		tabItemXmi.setText(messages.ModelEditor_XMI);
@@ -1281,8 +1281,7 @@ private void registerDefaultEditors() {
 		registerEditor(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT, ContextInjectionFactory.make(StringModelFragment.class, context));
 	}
 
-	@Inject
-	public void tab_list_show(@Preference("tab-list-show") Boolean show) {
+	public void tab_list_show(Boolean show) {
 		if (editorTabFolder == null) {
 			return;
 		}

From af4e217d4849bc88595e3b797a75d2ba1b1fe654 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Mon, 30 Jun 2014 19:09:34 +0200
Subject: [PATCH 0778/1286] Bug 428903 - Having a common 'debug' window for all
 spies

Add the css spy and the css scratch pad in the E4 spies window

Change-Id: I2ff59bd98fe23323f7c34b020231fa389a19f8ca
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>

From 0237ba1965fbab2677a401a05c031e87c1ba6715 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Thu, 3 Jul 2014 19:51:56 +0200
Subject: [PATCH 0779/1286] Bug 428903 - Having a common 'debug' window for all
 spies

Add icons for css spy and css scratch pad

Change-Id: Id1f4098cc4503b963278085f51a04bf4f60b65c1
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>

From 9e1167d8d6e04015c31b17d09e1a9e3e384e5914 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Mon, 7 Jul 2014 19:28:26 +0200
Subject: [PATCH 0780/1286] Bug 428903 - Having a common debug window for all
 spies

Clean the last useless classes after refactoring

Change-Id: I9131927ef65c5918a4b7e14dd754b58e428e3415
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>

From c03b3ebcd04dc86eeb6c9a24a0c194249424b14d Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Wed, 2 Jul 2014 22:29:01 +0200
Subject: [PATCH 0781/1286] Bug 437478 - [context spy] the search should
 propose an option to display only the results

Change-Id: Ieb6dac27cad93c166e538c12a1d91337a5a98672
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>

From feb41f83c051689583713ea31d218965a3374360 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Sun, 13 Jul 2014 11:02:29 -0400
Subject: [PATCH 0782/1286] Bug 439284 - [model editor] make list a combo with
 autocomplete for add part descriptor

Change-Id: I894ebacf3c5058684933ae4895d448f03dfa8061
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../ui/common/ComboViewerAutoComplete.java    | 111 ++++++++++++++++++
 .../common/component/StringModelFragment.java |  19 +--
 .../common/uistructure/ViewerElement.java     |   6 +-
 3 files changed, 117 insertions(+), 19 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
new file mode 100644
index 0000000000..5468385f8d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.common;
+
+import java.util.Arrays;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import org.eclipse.jface.fieldassist.ComboContentAdapter;
+import org.eclipse.jface.fieldassist.ContentProposalAdapter;
+import org.eclipse.jface.fieldassist.IContentProposal;
+import org.eclipse.jface.fieldassist.SimpleContentProposalProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * Adds auto complete functionality to a combo viewer. It is assumed that the
+ * viewer is created with SWT.SIMPLE and SWT.READONLY flags. The proposals will
+ * be dynamically generated from the viewers current contents.
+ *
+ * @author Steven Spungin
+ *
+ */
+public class ComboViewerAutoComplete {
+
+	private ContentProposalAdapter adapter;
+
+	public ComboViewerAutoComplete(final ComboViewer dropDown) {
+		// use all items in the wrapped combo as proposals to filter instead of
+		// static String[]
+		SimpleContentProposalProvider proposalProvider = new SimpleContentProposalProvider(new String[0]) {
+			@Override
+			public IContentProposal[] getProposals(String contents, int position) {
+				String[] proposals = dropDown.getCombo().getItems();
+				setProposals(proposals);
+				return super.getProposals(contents, position);
+			}
+		};
+		// set the viewer instead of the wrapped combo
+		ComboContentAdapter contentAdapter = new ComboContentAdapter() {
+			@Override
+			public void setControlContents(Control control, String text1, int cursorPosition) {
+				super.setControlContents(control, text1, cursorPosition);
+				int index = Arrays.asList(dropDown.getCombo().getItems()).indexOf(text1);
+				Object object = dropDown.getElementAt(index);
+				dropDown.setSelection(new StructuredSelection(object));
+			}
+		};
+		proposalProvider.setFiltering(true);
+		adapter = new ContentProposalAdapter(dropDown.getCombo(), contentAdapter, proposalProvider, null, null);
+		adapter.setPropagateKeys(true);
+		adapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE);
+
+		// Focus the entire field after tab or click
+		dropDown.getCombo().addFocusListener(new FocusListener() {
+
+			private Object valueWhenFocused;
+
+			@Override
+			public void focusLost(FocusEvent e) {
+				// Do not allow a null value (e.g. the user clicks with
+				// autocomplete text not set
+				Object object = (((IStructuredSelection) dropDown.getSelection())).getFirstElement();
+				if (object == null) {
+					dropDown.setSelection(new StructuredSelection(valueWhenFocused));
+				}
+			}
+
+			@Override
+			public void focusGained(FocusEvent e) {
+				valueWhenFocused = (((IStructuredSelection) dropDown.getSelection())).getFirstElement();
+
+				// If the user clicks the text field (versus tab), the
+				// text will be unselected after we set the selection, so we
+				// need to delay the call
+				// THIS IS A WORKAROUND
+				final ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(1);
+				executor.schedule(new Runnable() {
+					@Override
+					public void run() {
+						dropDown.getCombo().getDisplay().syncExec(new Runnable() {
+
+							@Override
+							public void run() {
+								dropDown.getCombo().setSelection(new Point(0, dropDown.getCombo().getText().length()));
+							}
+						});
+					}
+				}, 200, TimeUnit.MILLISECONDS);
+			}
+		});
+	}
+
+	public boolean isProposalPopupOpen() {
+		return adapter.isProposalPopupOpen();
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index b45b6f99b0..8abf07f2b0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steve@spungin.tv> - Ongoing Maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -237,24 +238,6 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 				}
 			});
 
-			tableElement.getDropDown().setContentProvider(new ArrayContentProvider());
-			tableElement.getDropDown().setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					FeatureClass eclass = (FeatureClass) element;
-					return eclass.label;
-				}
-			});
-
-			tableElement.getDropDown().setComparator(new ViewerComparator() {
-				@Override
-				public int compare(Viewer viewer, Object e1, Object e2) {
-					FeatureClass eClass1 = (FeatureClass) e1;
-					FeatureClass eClass2 = (FeatureClass) e2;
-					return eClass1.label.compareTo(eClass2.label);
-				}
-			});
-
 			tableElement.getButtonAdd().addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
index 5b5a547f9f..b053d3d7e5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
@@ -7,12 +7,14 @@
  *
  * Contributors:
  *     Wim Jongman <wim.jongman@remainsoftware.com> - initial API and implementation
+ *     Steven Spungin <steve@spungin.tv> -Bug 439284 - [model editor] make list a combo with autocomplete for add part descriptor
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.uistructure;
 
 import javax.inject.Inject;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.common.ComboViewerAutoComplete;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -157,9 +159,11 @@ private void createTopButtons() {
 		buttonCompTopLayout.marginHeight = 0;
 		buttonCompTop.setLayout(buttonCompTopLayout);
 
-		dropDown = new ComboViewer(buttonCompTop);
+		dropDown = new ComboViewer(buttonCompTop, SWT.READ_ONLY | SWT.SIMPLE);
 		dropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
+		ComboViewerAutoComplete autocomplete = new ComboViewerAutoComplete(dropDown);
+
 		addButton = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);
 		addButton.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_add));
 		addButton.setText(Messages.ModelTooling_Common_AddEllipsis);

From 3ba443d9f9c865f6eab9349df0f7e7fd4895f396 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Mon, 14 Jul 2014 10:32:46 +0200
Subject: [PATCH 0783/1286] Bug 434450 - Cannot install tools and live editor
 anymore

Change-Id: I5825fece6161c47e52afcea98e782027ae66b360
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>

From 653560f953e0464dae07c051d2b63b83318ff4c7 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Mon, 14 Jul 2014 13:01:47 +0200
Subject: [PATCH 0784/1286] Bug 434450 - Cannot install tools and live editor
 anymore

Fix the name for model spy and restore context spy name

Change-Id: Id8d16f9316f5a2d82d1037d556b518616b33fa52
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>

From fcf328a6b212739dfa4457d8818752e7758c7d0d Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Tue, 24 Jun 2014 08:27:05 -0400
Subject: [PATCH 0785/1286] Bug 437951 - [model editor] add option to update id
 suffix when changing label

Change-Id: Ib87fce899d2111e07865b484f2ed1da242f3de81
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../component/AbstractComponentEditor.java    |  34 +++-
 .../emf/ui/common/component/IdGenerator.java  | 161 ++++++++++++++++++
 .../component/BindingContextEditor.java       |   2 +
 .../common/component/CategoryEditor.java      |   2 +
 .../common/component/CommandEditor.java       |   2 +
 .../internal/common/component/MenuEditor.java |   3 +-
 .../common/component/MenuItemEditor.java      |   3 +-
 .../component/PartDescriptorEditor.java       |   3 +-
 .../internal/common/component/PartEditor.java |   5 +-
 .../common/component/PerspectiveEditor.java   |   3 +-
 .../common/component/ToolItemEditor.java      |   3 +-
 .../common/component/WindowEditor.java        |   3 +-
 12 files changed, 215 insertions(+), 9 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 882dda6dba..baef0d6b00 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Marco Descher <marco@descher.at> - Bug 422465
+ *     Steven Spungin <steven@spungin.tv> - Bug 437951
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common.component;
 
@@ -33,6 +34,8 @@
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
@@ -85,6 +88,8 @@ public abstract class AbstractComponentEditor {
 
 	private Composite editorControl;
 
+	private IdGenerator generator;
+
 	public EditingDomain getEditingDomain() {
 		return editingDomain;
 	}
@@ -126,7 +131,11 @@ public ImageDescriptor createImageDescriptor(String key) {
 	public abstract String getDescription(Object element);
 
 	public Composite getEditor(Composite parent, Object object) {
-		return editorControl = doGetEditor(parent, object);
+		if (generator != null) {
+			generator.stopGenerating();
+			generator = null;
+		}
+		return doGetEditor(parent, object);
 	}
 
 	protected abstract Composite doGetEditor(Composite parent, Object object);
@@ -249,4 +258,27 @@ protected void createContributedEditorTabs(CTabFolder folder, EMFDataBindingCont
 		}
 
 	}
+
+	/**
+	 * Generates an ID when the another field changes. Must be called after
+	 * master is set with the objects value.
+	 *
+	 * @param attSource
+	 *            The source attribute
+	 * @param attId
+	 *            The id attribute to generate
+	 * @param control
+	 *            optional control to disable generator after losing focus or
+	 *            disposing
+	 */
+	protected void enableIdGenerator(EAttribute attSource, EAttribute attId, Control control) {
+		if (generator != null) {
+			generator.stopGenerating();
+			generator = null;
+		}
+		if (getEditor().isAutoCreateElementId()) {
+			generator = new IdGenerator();
+			generator.bind(getMaster(), EMFEditProperties.value(getEditingDomain(), attSource), EMFEditProperties.value(getEditingDomain(), attId), control);
+		}
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
new file mode 100644
index 0000000000..a1ac8e2388
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
@@ -0,0 +1,161 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 437951
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.common.component;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.FocusAdapter;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * Auto generates an id based on another field's current value.
+ *
+ * @author Steven Spungin
+ *
+ */
+public class IdGenerator {
+
+	private IValueChangeListener listener;
+	private IObservableValue observableValue;
+	protected boolean ignore;
+	private IValueChangeListener listener2;
+	private IObservableValue observableValue2;
+	static Pattern patternId = Pattern.compile("^(.*\\.)\\d+$"); //$NON-NLS-1$
+
+	/**
+	 * Bind must be called AFTER the master observable value is set in order to
+	 * properly initialize.
+	 * 
+	 * @param master
+	 * @param ebpLabel
+	 * @param evpId
+	 * @param control
+	 *            Optional control.
+	 */
+	public void bind(final IObservableValue master, final IEMFEditValueProperty ebpLabel, final IEMFEditValueProperty evpId, Control control) {
+
+		// RULES
+		// Only start generating if the label is initially empty and the id ends
+		// with a '.'
+		// followed by an integer
+		// If the id is manually changed, stop generating
+		// If the control loses focus, stop generating
+
+		final String origLabel = (String) ebpLabel.getValue(master.getValue());
+		if (E.notEmpty(origLabel)) {
+			stopGenerating();
+			return;
+		}
+		String origId = (String) evpId.getValue(master.getValue());
+		if (origId == null) {
+			origId = "id.0"; //$NON-NLS-1$
+		}
+		Matcher m = patternId.matcher(origId);
+		if (!m.matches()) {
+			stopGenerating();
+			return;
+		}
+		final String baseId = m.group(1);
+
+		if (control != null) {
+			control.addFocusListener(new FocusAdapter() {
+				@Override
+				public void focusLost(org.eclipse.swt.events.FocusEvent e) {
+					stopGenerating();
+				};
+			});
+
+			control.addDisposeListener(new DisposeListener() {
+
+				@Override
+				public void widgetDisposed(DisposeEvent e) {
+					stopGenerating();
+				}
+			});
+		}
+
+		observableValue2 = evpId.observe(master.getValue());
+		observableValue2.addValueChangeListener(listener2 = new IValueChangeListener() {
+
+			@Override
+			public void handleValueChange(ValueChangeEvent event) {
+				if (!ignore) {
+					stopGenerating();
+				}
+			}
+		});
+
+		observableValue = ebpLabel.observe(master.getValue());
+		observableValue.addValueChangeListener(listener = new IValueChangeListener() {
+
+			@Override
+			public void handleValueChange(ValueChangeEvent event) {
+				String labelValue = (String) ebpLabel.getValue(master.getValue());
+				if (labelValue == null) {
+					labelValue = ""; //$NON-NLS-1$
+				}
+				String camelCase = camelCase(labelValue);
+				ignore = true;
+				evpId.setValue(master.getValue(), baseId + camelCase);
+				ignore = false;
+			}
+		});
+
+	}
+
+	/**
+	 * Strips all illegal id characters, and camel cases each word.
+	 *
+	 * @param value
+	 * @return
+	 */
+	protected static String camelCase(String value) {
+		String[] parts = value.split("\\s+"); //$NON-NLS-1$
+		String ret = ""; //$NON-NLS-1$
+		boolean first = true;
+		for (String part : parts) {
+			part = part.replaceAll("[^0-9a-zA-Z_-]", ""); //$NON-NLS-1$ //$NON-NLS-2$
+			if (first) {
+				first = false;
+				ret = part.toLowerCase();
+			} else {
+				part = part.substring(0, 1).toUpperCase() + part.substring(1).toLowerCase();
+				ret += part;
+			}
+		}
+		return ret;
+	}
+
+	/**
+	 * Removes all listeners and prevents the id from changing
+	 */
+	public void stopGenerating() {
+		if (observableValue != null) {
+			observableValue.removeValueChangeListener(listener);
+			listener = null;
+			observableValue = null;
+		}
+		if (observableValue2 != null) {
+			observableValue2.removeValueChangeListener(listener2);
+			listener2 = null;
+			observableValue2 = null;
+		}
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 1be16537be..f2652cbcde 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Steven Spungin <steven@spungin.tv> - Bug 437951
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -143,6 +144,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
+		enableIdGenerator(CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index 49fa788c1e..3b669a63df 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Steven Spungin <steven@spungin.tv> - Bug 437951
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -95,6 +96,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
+		enableIdGenerator(CommandsPackageImpl.Literals.CATEGORY__NAME, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index b26546c303..d460a7ccda 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Steven Spungin <steven@spungin.tv> - Bug 437951
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -133,6 +134,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
+		enableIdGenerator(CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 118c37f911..b354830c6b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -9,7 +9,7 @@
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Marco Descher <marco@descher.at> - Bug 395982
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 424730
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -224,6 +224,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
+		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index eeadda4132..2cadfd3488 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 424730
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -150,6 +150,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
+		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index aebc5b3cb2..5411f8e12c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 404166, 424730
+ *     Steven Spungin <steven@spungin.tv> - Bug 404166, 424730, 437951
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -141,6 +141,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
+		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 15be9c08ab..e8b3462c85 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -7,8 +7,8 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 424730
-******************************************************************************/
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
@@ -157,6 +157,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
+		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 
 		return composite;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index fbff8850f6..6ca961618d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 424730
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -187,6 +187,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
+		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index ea2c36786c..7e967324e2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 424730
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -129,6 +129,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
+		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 604612b864..b6538652cc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 424730
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -166,6 +166,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
+		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 
 		return composite;
 	}

From 1af2cfe30b56857ab8026521985cc19fa55f1a0b Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Mon, 14 Jul 2014 13:18:02 -0400
Subject: [PATCH 0786/1286] Bug 439532 - [model editor] display the feature
 name next to ModelFragment in the TreeTab tree

Change-Id: Ib0c4351fcedafb68a26af44636e4d2743af40cc9
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../common/component/StringModelFragment.java | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 8abf07f2b0..0042e9fac0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steve@spungin.tv> - Ongoing Maintenance
+ *     Steven Spungin <steve@spungin.tv> - Ongoing Maintenance, Bug 439532
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -28,14 +28,17 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FeatureSelectionDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindParentReferenceElementDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.ViewerElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.fragment.MModelFragment;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
+import org.eclipse.e4.ui.model.fragment.impl.StringModelFragmentImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
@@ -110,9 +113,26 @@ public String getLabel(Object element) {
 		return Messages.StringModelFragment_Label;
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME), FeaturePath.fromList(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID) };
+	}
+
 	@Override
 	public String getDetailLabel(Object element) {
-		return null;
+		if (element instanceof StringModelFragmentImpl) {
+			StringModelFragmentImpl fragment = (StringModelFragmentImpl) element;
+			String ret = ""; //$NON-NLS-1$
+			if (E.notEmpty(fragment.getFeaturename())) {
+				ret += fragment.getFeaturename();
+			}
+			if (E.notEmpty(fragment.getParentElementId())) {
+				ret += " (" + fragment.getParentElementId() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			return ret;
+		} else {
+			return null;
+		}
 	}
 
 	@Override

From 19b87e6be2e12dcbd229f4b3c0b920bdb7525760 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Wed, 16 Jul 2014 01:32:39 -0400
Subject: [PATCH 0787/1286] Bug 439671 - [model editor] [list tab] fragment
 commands and handlers were added to legacy but not native app

Change-Id: I1b0f91c38ac7556a15b0df2c718fcb5c9b19f551
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../org.eclipse.e4.tools.emf.ui/fragment.e4xmi | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi b/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
index 0762936b08..9c5b109bf7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
+++ b/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
@@ -18,4 +18,22 @@
     <elements xsi:type="commands:Handler" xmi:id="_hZcKMO5mEeOQXaYP-M2JBA" elementId="org.eclipse.e4.tools.emf.ui.handler.autosizeColumns" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.AutosizeColumnsHandler" command="_jd7xgO5mEeOQXaYP-M2JBA"/>
     <elements xsi:type="commands:Handler" xmi:id="_8AHVUPFwEeOSJuCPb-hb7A" elementId="org.eclipse.e4.tools.emf.ui.handler.resetToDefault" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.ResetToDefaultHandler" command="_vsQXAPFwEeOSJuCPb-hb7A"/>
   </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_ph2FwAykEeS6HrzpXti93Q" featurename="commands" parentElementId="org.eclipse.e4.ide.application">
+    <elements xsi:type="commands:Command" xmi:id="_ph2FwQykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_ids" commandName="Mark Duplicate Model Element Ids" description="Marks Duplicate Model Element Ids"/>
+    <elements xsi:type="commands:Command" xmi:id="_ph2FwgykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_labels" commandName="Mark Duplicate Model Labels" description="Marks Duplicate Model Labels"/>
+    <elements xsi:type="commands:Command" xmi:id="_ph2FwwykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_attributes" commandName="Mark Duplicate Model Attributes..." description="Marks Duplicate Model Attributes"/>
+    <elements xsi:type="commands:Command" xmi:id="_ph2FxAykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.command.repair_duplicate_ids" commandName="Repair Duplicate Model Element IDs" description="Repairs Duplicate Model Element IDs"/>
+    <elements xsi:type="commands:Command" xmi:id="_ph2FxQykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.command.unmark" commandName="Unmark Model Items" description="Unmarks All Model Items"/>
+    <elements xsi:type="commands:Command" xmi:id="_ph2FxgykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.command.autosizeColumns" commandName="Autosize Columns" description="Autosizes all columns to their content"/>
+    <elements xsi:type="commands:Command" xmi:id="_ph2FxwykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.command.resetToDefault" commandName="Reset To Default" description="Resets the table to default values"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_rSPFUAykEeS6HrzpXti93Q" featurename="handlers" parentElementId="org.eclipse.e4.ide.application">
+    <elements xsi:type="commands:Handler" xmi:id="_rSPFUQykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateElementIdsHandler" command="_RRp7QLy2EeOxWJvPH-7sUQ"/>
+    <elements xsi:type="commands:Handler" xmi:id="_rSPFUgykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_labels" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateLabelsHandler" command="_9ITpgL2IEeOqSr2XZwfnmA"/>
+    <elements xsi:type="commands:Handler" xmi:id="_rSPFUwykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_attributes" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateAttributesHandler" command="_RObi4L2MEeOqSr2XZwfnmA"/>
+    <elements xsi:type="commands:Handler" xmi:id="_rSPFVAykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.handler.repair_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.RepairDuplicateItemsHandler" command="_dySeYLzDEeO8eO1Rpb-rFA"/>
+    <elements xsi:type="commands:Handler" xmi:id="_rSPFVQykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.handler.unmark" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.UnmarkItemsHandler" command="_CFlw8L2LEeOqSr2XZwfnmA"/>
+    <elements xsi:type="commands:Handler" xmi:id="_rSPFVgykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.handler.autosizeColumns" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.AutosizeColumnsHandler" command="_jd7xgO5mEeOQXaYP-M2JBA"/>
+    <elements xsi:type="commands:Handler" xmi:id="_rSPFVwykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.handler.resetToDefault" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.ResetToDefaultHandler" command="_vsQXAPFwEeOSJuCPb-hb7A"/>
+  </fragments>
 </fragment:ModelFragments>

From c27e48d2a0092031a23837cd1937b53bc4198f0b Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Wed, 16 Jul 2014 18:14:35 +0200
Subject: [PATCH 0788/1286] Bug 439734 - Remove .cvsignore from tools projects

Change-Id: I86cd5d787010a2dbbeac9380cc1f66d01ef33f44
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/.cvsignore | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/.cvsignore

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.cvsignore b/bundles/org.eclipse.e4.tools.emf.ui/.cvsignore
deleted file mode 100644
index ba077a4031..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin

From 92a3af4ce07cbb604ade34f6541b14e1e73346a4 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Thu, 17 Jul 2014 16:22:19 +0200
Subject: [PATCH 0789/1286] Bug 439808 - [ModelTooling] Add support for
 CompositePart

---
 .../e4/tools/emf/ui/internal/Messages.java    |  15 +
 .../tools/emf/ui/internal/Messages.properties |  15 +
 .../emf/ui/internal/common/ModelEditor.java   |   2 +
 .../common/component/CompositePartEditor.java | 494 ++++++++++++++++++
 .../common/component/PartStackEditor.java     |   7 +
 5 files changed, 533 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 23d7128f5f..4a052e7a06 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -219,6 +219,7 @@ public class Messages {
 	public String PartStackEditor_ContainerData;
 	public String PartStackEditor_AddPart;
 	public String PartStackEditor_AddPlaceholder;
+	public String PartStackEditor_AddCompositePart;
 
 	public String PerspectiveEditor_Label;
 	public String PerspectiveEditor_Description;
@@ -693,4 +694,18 @@ public class Messages {
 	public static String ListTab_resetColumns;
 	public static String ListTab_selectAnAttribute;
 	public static String ListTab_selectAType;
+
+	public String CompositePartEditor_AddPartSashContainer;
+	public String CompositePartEditor_AddPartStack;
+	public String CompositePartEditor_AddPart;
+	public String CompositePartEditor_AddArea;
+	public String CompositePartEditor_AddPlaceholder;
+	public String CompositePartEditor_Label;
+	public String CompositePartEditor_Description;
+	public String CompositePartEditor_Orientation;
+	public String CompositePartEditor_Horizontal;
+	public String CompositePartEditor_Vertical;
+	public String CompositePartEditor_SelectedElement;
+	public String CompositePartEditor_ContainerData;
+	public String CompositePartEditor_Controls;
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index cb892aa479..de75370015 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -226,6 +226,7 @@ PartStackEditor_Parts=Parts
 PartStackEditor_ContainerData=Container Data
 PartStackEditor_AddPart=Part
 PartStackEditor_AddPlaceholder=Placeholder
+PartStackEditor_AddCompositePart=CompositePart
 
 PerspectiveEditor_Label=Perspective
 PerspectiveEditor_Description=Perspective Bla Bla Bla
@@ -703,3 +704,17 @@ ListTab_removeFilter=Remove Filter
 ListTab_resetColumns=Reset Columns
 ListTab_selectAnAttribute=Select an attribute
 ListTab_selectAType=Select a type
+
+CompositePartEditor_AddPartSashContainer=PartSashContainer
+CompositePartEditor_AddPartStack=PartStack
+CompositePartEditor_AddPart=Part
+CompositePartEditor_AddArea=Area
+CompositePartEditor_AddPlaceholder=Placeholder
+CompositePartEditor_Label=CompositePart
+CompositePartEditor_Description=CompositePart
+CompositePartEditor_Orientation=Orientation
+CompositePartEditor_Horizontal=Horizontal
+CompositePartEditor_Vertical=Vertical
+CompositePartEditor_SelectedElement=Selected Element
+CompositePartEditor_ContainerData=Container Data
+CompositePartEditor_Controls=Controls
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 65b418d491..78a47c4154 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -72,6 +72,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CategoryEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CommandEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CommandParameterEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.CompositePartEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CoreExpressionEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DefaultEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DialogEditor;
@@ -1261,6 +1262,7 @@ private void registerDefaultEditors() {
 
 		registerEditor(UiPackageImpl.Literals.CORE_EXPRESSION, ContextInjectionFactory.make(CoreExpressionEditor.class, context));
 
+		registerEditor(BasicPackageImpl.Literals.COMPOSITE_PART, ContextInjectionFactory.make(CompositePartEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.PART, ContextInjectionFactory.make(PartEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.WINDOW, ContextInjectionFactory.make(WindowEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW, ContextInjectionFactory.make(TrimmedWindowEditor.class, context));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
new file mode 100644
index 0000000000..cfd4b6ce10
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -0,0 +1,494 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
+import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
+import org.eclipse.e4.tools.emf.ui.internal.imp.RegistryUtil;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.MCompositePart;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.databinding.IEMFListProperty;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+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;
+
+public class CompositePartEditor extends AbstractComponentEditor {
+
+	private Composite composite;
+	private EMFDataBindingContext context;
+
+	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private StackLayout stackLayout;
+	private List<Action> actions = new ArrayList<Action>();
+	private List<Action> actionsImport = new ArrayList<Action>();
+
+	@Inject
+	@Optional
+	private IProject project;
+
+	@Inject
+	private Shell shell;
+
+	@Inject
+	public CompositePartEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
+		actions.add(new Action(Messages.CompositePartEditor_AddPartSashContainer, createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.COMPOSITE_PART);
+			}
+		});
+		actions.add(new Action(Messages.CompositePartEditor_AddPartStack, createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.PART_STACK);
+			}
+		});
+		actions.add(new Action(Messages.CompositePartEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.PART);
+			}
+		});
+
+		actions.add(new Action(Messages.CompositePartEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area)) {
+			@Override
+			public void run() {
+				handleAddChild(AdvancedPackageImpl.Literals.AREA);
+			}
+		});
+		actions.add(new Action(Messages.CompositePartEditor_AddPlaceholder, createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
+			@Override
+			public void run() {
+				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
+			}
+		});
+		for (FeatureClass c : getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN)) {
+			final EClass ec = c.eClass;
+			actions.add(new Action(c.label, createImageDescriptor(c.iconId)) {
+				@Override
+				public void run() {
+					handleAddChild(ec);
+				}
+			});
+		}
+
+		// --- Import Actions ---
+		actionsImport.add(new Action("Views", createImageDescriptor(ResourceProvider.IMG_Part)) { //$NON-NLS-1$
+			@Override
+			public void run() {
+				handleImportChild(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_VIEW);
+			}
+		});
+		actionsImport.add(new Action("Editors", createImageDescriptor(ResourceProvider.IMG_Part)) { //$NON-NLS-1$
+			@Override
+			public void run() {
+				handleImportChild(BasicPackageImpl.Literals.INPUT_PART, RegistryUtil.HINT_EDITOR);
+			}
+		});
+
+	}
+
+	@Override
+	public Image getImage(Object element, Display display) {
+		boolean horizontal = ((MCompositePart) element).isHorizontal();
+
+		if (!horizontal) {
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				return createImage(ResourceProvider.IMG_PartSashContainer_vertical);
+			} else {
+				return createImage(ResourceProvider.IMG_Tbr_PartSashContainer_vertical);
+			}
+		}
+
+		if (horizontal) {
+			MUIElement uiElement = (MUIElement) element;
+			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
+				return createImage(ResourceProvider.IMG_PartSashContainer);
+			} else {
+				return createImage(ResourceProvider.IMG_Tbr_PartSashContainer);
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.CompositePartEditor_Label;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return Messages.CompositePartEditor_Description;
+	}
+
+	@Override
+	public Composite doGetEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+
+		if (getEditor().isModelFragment()) {
+			Control topControl;
+			if (Util.isImport((EObject) object)) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];
+			}
+
+			if (stackLayout.topControl != topControl) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
+		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
+		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		if (isImport) {
+			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
+			return folder;
+		}
+
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.CompositePartEditor_Orientation);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			ComboViewer viewer = new ComboViewer(parent);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			viewer.getControl().setLayoutData(gd);
+			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					return ((Boolean) element).booleanValue() ? Messages.CompositePartEditor_Horizontal : Messages.CompositePartEditor_Vertical;
+				}
+			});
+			viewer.setInput(new Boolean[] { Boolean.TRUE, Boolean.FALSE });
+			IViewerValueProperty vProp = ViewerProperties.singleSelection();
+			context.bindValue(vProp.observe(viewer), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL).observeDetail(getMaster()));
+		}
+
+		ControlFactory.createSelectedElement(parent, this, context, Messages.CompositePartEditor_SelectedElement);
+		ControlFactory.createTextField(parent, Messages.CompositePartEditor_ContainerData, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
+
+		{
+
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.CompositePartEditor_Controls);
+			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+
+			Composite buttonCompTop = new Composite(parent, SWT.NONE);
+			GridData span2 = new GridData(GridData.FILL, GridData.BEGINNING, false, false, 2, 1);
+			buttonCompTop.setLayoutData(span2);
+			GridLayout gl = new GridLayout(2, false);
+			gl.marginLeft = 0;
+			gl.marginRight = 0;
+			gl.marginWidth = 0;
+			gl.marginHeight = 0;
+			buttonCompTop.setLayout(gl);
+
+			final ComboViewer childrenDropDown = new ComboViewer(buttonCompTop);
+			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			childrenDropDown.setContentProvider(new ArrayContentProvider());
+			childrenDropDown.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					FeatureClass eFeatureClass = (FeatureClass) element;
+					return eFeatureClass.eClass.getName();
+				}
+			});
+			List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
+			eClassList.add(new FeatureClass("PartSashContainer", BasicPackageImpl.Literals.PART_SASH_CONTAINER)); //$NON-NLS-1$
+			eClassList.add(new FeatureClass("PartStack", BasicPackageImpl.Literals.PART_STACK)); //$NON-NLS-1$
+			eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART)); //$NON-NLS-1$
+			eClassList.add(new FeatureClass("InputPart", BasicPackageImpl.Literals.INPUT_PART)); //$NON-NLS-1$
+			eClassList.add(new FeatureClass("Area", AdvancedPackageImpl.Literals.AREA)); //$NON-NLS-1$
+			eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER)); //$NON-NLS-1$
+			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.COMPOSITE_PART, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
+			childrenDropDown.setInput(eClassList);
+			childrenDropDown.setSelection(new StructuredSelection(eClassList.get(0)));
+
+			Button b = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_AddEllipsis);
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!childrenDropDown.getSelection().isEmpty()) {
+						EClass eClass = ((FeatureClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement()).eClass;
+						handleAddChild(eClass);
+					}
+				}
+			});
+
+			new Label(parent, SWT.NONE);
+
+			final TableViewer viewer = new TableViewer(parent);
+			GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1);
+			viewer.getControl().setLayoutData(gd);
+			ObservableListContentProvider cp = new ObservableListContentProvider();
+			viewer.setContentProvider(cp);
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
+
+			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(getMaster()));
+
+			new Label(parent, SWT.NONE);
+
+			Composite buttonCompBot = new Composite(parent, SWT.NONE);
+			buttonCompBot.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 2, 1));
+			buttonCompBot.setLayout(new FillLayout());
+
+			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Up);
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) - 1;
+							if (idx >= 0) {
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Down);
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						if (s.size() == 1) {
+							Object obj = s.getFirstElement();
+							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							int idx = container.getChildren().indexOf(obj) + 1;
+							if (idx < container.getChildren().size()) {
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
+									viewer.setSelection(new StructuredSelection(obj));
+								}
+							}
+
+						}
+					}
+				}
+			});
+
+			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
+			b.setText(Messages.ModelTooling_Common_Remove);
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (!viewer.getSelection().isEmpty()) {
+						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
+						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
+						if (cmd.canExecute()) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+				}
+			});
+		}
+
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+
+		if (project == null) {
+			createUITreeInspection(folder);
+		}
+
+		createContributedEditorTabs(folder, context, getMaster(), MCompositePart.class);
+
+		folder.setSelection(0);
+
+		return folder;
+	}
+
+	private void createUITreeInspection(CTabFolder folder) {
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		UIViewer objectViewer = new UIViewer();
+		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+	}
+
+	protected void handleAddChild(EClass eClass) {
+		EObject eObject = EcoreUtil.create(eClass);
+		addToModel(eObject);
+	}
+
+	private void addToModel(EObject eObject) {
+		setElementId(eObject);
+
+		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(eObject);
+		}
+	}
+
+	protected void handleImportChild(EClass eClass, String hint) {
+
+		if (eClass == BasicPackageImpl.Literals.PART) {
+			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, hint, resourcePool);
+			WizardDialog wizardDialog = new WizardDialog(shell, wizard);
+			if (wizardDialog.open() == Window.OK) {
+				MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
+				for (MPart part : parts) {
+					addToModel((EObject) part);
+				}
+			}
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
+
+	@Override
+	public List<Action> getActionsImport(Object element) {
+		ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		l.addAll(actionsImport);
+		return l;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index d1267cb14c..db2cd4dc28 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -109,6 +109,12 @@ public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
 			}
 		});
+		actions.add(new Action(Messages.PartStackEditor_AddCompositePart, createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
+			@Override
+			public void run() {
+				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
+			}
+		});
 
 		List<FeatureClass> list = getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
@@ -251,6 +257,7 @@ public String getText(Object element) {
 			});
 			List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
 			eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART));
+			eClassList.add(new FeatureClass("CompositePart", BasicPackageImpl.Literals.COMPOSITE_PART));
 			eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER));
 			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
 			childrenDropDown.setInput(eClassList);

From 54bc0446f0289a5910bc247aa7f5c2ed966692cd Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Wed, 16 Jul 2014 22:37:35 +0200
Subject: [PATCH 0790/1286] Bug 429674 - Application Model Editor moves only
 single element in case multiple elements are selected

Signed-off-by: Marco Descher <marco@descher.at>
---
 .../emf/ui/internal/common/ModelEditor.java    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 78a47c4154..dfd00152c4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Wim Jongman <wim.jongman@remainsoftware.com> - Maintenance
- *     Marco Descher <marco@descher.at> - Bug395982, 426653, 422465
+ *     Marco Descher <marco@descher.at> - Bug395982, 426653, 422465, 429674
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  *     Steven Spungin <steven@spungin.tv> - Bug 396902, 431755, 431735, 424730, 424730, 391089, 437236, 437552
  ******************************************************************************/
@@ -1609,8 +1609,7 @@ public void dragStart(DragSourceEvent event) {
 		@Override
 		public void dragSetData(DragSourceEvent event) {
 			IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
-			Object o = selection.getFirstElement();
-			event.data = o;
+			event.data = selection.toArray();
 		}
 	}
 
@@ -1622,9 +1621,19 @@ protected DropListener(Viewer viewer, EditingDomain domain) {
 			this.domain = domain;
 		}
 
-		@SuppressWarnings("unchecked")
 		@Override
 		public boolean performDrop(Object data) {
+			Object[] dropDataArray = (Object[]) data;
+			for (Object object : dropDataArray) {
+				boolean result = performSingleDrop(object);
+				if (!result)
+					return false;
+			}
+			return true;
+		}
+
+		@SuppressWarnings("unchecked")
+		public boolean performSingleDrop(Object data) {
 			if (getCurrentLocation() == LOCATION_ON) {
 				EStructuralFeature feature = null;
 				EObject parent = null;
@@ -1659,6 +1668,7 @@ public boolean performDrop(Object data) {
 								((MElementContainer<MUIElement>) parent).setSelectedElement((MUIElement) data);
 							}
 						}
+						return true;
 					}
 				}
 			} else if (getCurrentLocation() == LOCATION_AFTER || getCurrentLocation() == LOCATION_BEFORE) {

From 35822963f2782e45a20235f33502ea6ad0e78ab5 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Thu, 17 Jul 2014 13:37:02 +0200
Subject: [PATCH 0791/1286] Bug 439771 - Find Contribution Class Dialog did not
 set focus to search box

Change-Id: Idb9632c48191ec65424f02b5eb602e9c0ab19891
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../common/component/dialogs/FilteredContributionDialog.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index 394cae8101..2801f17e0e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -223,6 +223,7 @@ public boolean close() {
 	protected Control createContents(Composite parent) {
 		Control ret = super.createContents(parent);
 		textBox.notifyListeners(SWT.Modify, new Event());
+		textBox.setFocus();
 		return ret;
 	}
 
@@ -394,7 +395,9 @@ public void run() {
 											updateStatusMessage();
 											switch (status) {
 											case READY:
-												// This will deadlock if currentSearchThread is not null
+												// This will deadlock if
+												// currentSearchThread is not
+												// null
 												currentSearchThread = null;
 												if (currentResultHandler != null) {
 													currentResultHandler.cancled = true;

From d456b63886bd03aeeacde5733de879ce04db62a3 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Tue, 22 Jul 2014 22:54:37 +0200
Subject: [PATCH 0792/1286] Bug 440159 - Use "Part Descriptor" instead of
 "PartDescriptor" in model editor

Change-Id: I6220ea49f10c6a7b3c6880959664b322176e6986
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../e4/tools/emf/ui/internal/Messages.properties      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index de75370015..2cda31389c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -7,9 +7,10 @@
 # *
 # * Contributors:
 # *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
-# *		Sopot Cela <sopotcela@gmail.com> - enhancements
+# *     Sopot Cela <sopotcela@gmail.com> - enhancements
 # *     Marco Descher <marco@descher.at> - Bug 395982, 396975, 426653
 # *     Steven Spungin <steven@spungin.tv> - Bug 431735, 430717
+# *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 440159
 # ******************************************************************************
 ModelTooling_Common_Up=Up
 ModelTooling_Common_Down=Down
@@ -172,8 +173,8 @@ MenuItemEditor_AddCoreExpression=VisibleWhen Core Expression
 
 MenuSeparatorEditor_Label=Separator
 
-PartDescriptorEditor_Label=PartDescriptor
-PartDescriptorEditor_Descriptor=PartDescriptor Bla Bla Bla Bla
+PartDescriptorEditor_Label=Part Descriptor
+PartDescriptorEditor_Descriptor=Part Descriptor Bla Bla Bla Bla
 PartDescriptorEditor_LabelLabel=Label
 PartDescriptorEditor_Tooltip=Tooltip
 PartDescriptorEditor_IconURI=Icon URI
@@ -452,8 +453,8 @@ VModelImportsEditor_Imports=Imports
 
 VPartDescriptor_TreeLabel=Part Descriptors
 VPartDescriptor_TreeLabelDescription=Part Descriptors Bla Bla Bla Bla Bla
-VPartDescriptor_Descriptors=Descriptors
-VPartDescriptor_AddPartDescriptor=Descriptor
+VPartDescriptor_Descriptors= Part Descriptors
+VPartDescriptor_AddPartDescriptor=Part Descriptor
 
 VSnippetsEditor_Snippets=Snippets;
 

From dc71e3e2c8c760f6f953df89fc0d0d7108fde6a5 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Wed, 23 Jul 2014 20:30:27 -0400
Subject: [PATCH 0793/1286] Bug 439709 - Copy and paste via keyboard shortcut
 not working in model editor

Change-Id: Id2a959624a8794ef0fb2c370accef53bc556ac47
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../emf/ui/common/component/AbstractComponentEditor.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index baef0d6b00..079c871032 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Marco Descher <marco@descher.at> - Bug 422465
- *     Steven Spungin <steven@spungin.tv> - Bug 437951
+ *     Steven Spungin <steven@spungin.tv> - Bug 437951, Bug 439709
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common.component;
 
@@ -135,7 +135,8 @@ public Composite getEditor(Composite parent, Object object) {
 			generator.stopGenerating();
 			generator = null;
 		}
-		return doGetEditor(parent, object);
+		editorControl = doGetEditor(parent, object);
+		return editorControl;
 	}
 
 	protected abstract Composite doGetEditor(Composite parent, Object object);

From 509d42065094675a47b27f96d246f47814da9778 Mon Sep 17 00:00:00 2001
From: Fabian Miehe <fabian.miehe@cassidian.com>
Date: Thu, 24 Jul 2014 11:49:30 +0200
Subject: [PATCH 0794/1286] Bug 440311 - PartStack Popupmenu "Add
 Child"->"CompositePart" adds Placeholder

Change-Id: I4044f0c21016d60bd6813abca97cde6aa80b1cd0
Signed-off-by: Fabian Miehe <fabian.miehe@cassidian.com>
---
 .../emf/ui/internal/common/component/PartStackEditor.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index db2cd4dc28..de78522831 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -103,13 +103,13 @@ public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART);
 			}
 		});
-		actions.add(new Action(Messages.PartStackEditor_AddPlaceholder, createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
+		actions.add(new Action(Messages.PartStackEditor_AddCompositePart, createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
 			@Override
 			public void run() {
-				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
+				handleAddChild(BasicPackageImpl.Literals.COMPOSITE_PART);
 			}
 		});
-		actions.add(new Action(Messages.PartStackEditor_AddCompositePart, createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
+		actions.add(new Action(Messages.PartStackEditor_AddPlaceholder, createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
 			@Override
 			public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);

From 723af693495cbb2fa16cd102e00c1724d5d3619b Mon Sep 17 00:00:00 2001
From: Fabian Miehe <fabian.miehe@cassidian.com>
Date: Thu, 24 Jul 2014 13:52:41 +0200
Subject: [PATCH 0795/1286] Bug 440327 - "Find Contribution Class" in
 Application Model Editor creates wrong Class URI

Change-Id: I326a3ec8a65e876573d44d3cf47226961edabd31
Signed-off-by: Fabian Miehe <fabian.miehe@cassidian.com>
---
 .../resourcelocator/TargetPlatformContributionCollector.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
index 4e03ae51cf..9192060092 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625, Bug 436133, Bug 436132, Bug 436283, Bug 436281
+ *     Fabian Miehe - Bug 440327
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator;
@@ -233,7 +234,7 @@ protected ContributionData makeData(Entry e) {
 		IPath ip = Path.fromOSString(e.path);
 		ip = ip.addTrailingSeparator().makeRelative();
 		ip = ip.append(e.name);
-		String className = ip.toOSString().replace('/', '.');
+		String className = ip.toOSString().replace('\\', '.');
 		ContributionData data = new ContributionData(e.bundleSymName, className, "Java", e.installLocation); //$NON-NLS-1$
 		data.installLocation = e.installLocation;
 		data.resourceRelativePath = e.relativePath;

From a173c3ebd372d544566083eb28083ff08191749f Mon Sep 17 00:00:00 2001
From: toni umbreit <tumbreit@web.de>
Date: Thu, 24 Jul 2014 09:18:07 +0200
Subject: [PATCH 0796/1286] Bug 440289 - Combo Box in Editor 'Controls'
 inconsistent

Change-Id: Id8afd22fd2e9bac5711b4887d195ee2c92d717cd
Signed-off-by: toni umbreit <tumbreit@web.de>
---
 .../common/uistructure/ViewerElement.java     | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
index b053d3d7e5..b333f08534 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 Remain BV and others
+ * Copyright (c) 2012, 2014 Remain BV and others
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,13 +8,13 @@
  * Contributors:
  *     Wim Jongman <wim.jongman@remainsoftware.com> - initial API and implementation
  *     Steven Spungin <steve@spungin.tv> -Bug 439284 - [model editor] make list a combo with autocomplete for add part descriptor
+ *     Toni Umbreit - Bug 440289
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.uistructure;
 
 import javax.inject.Inject;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.tools.emf.ui.common.ComboViewerAutoComplete;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -31,9 +31,9 @@
 
 /**
  * A viewer with buttons.
- * 
+ *
  * @author wim.jongman@remainsoftware.com
- * 
+ *
  */
 public class ViewerElement {
 
@@ -112,7 +112,7 @@ private void createBottomButtons() {
 	/**
 	 * Returns the button that removes an element from the list. Use it to add
 	 * your {@link SelectionListener} to it.
-	 * 
+	 *
 	 * @return
 	 */
 	public Button getButtonRemove() {
@@ -122,7 +122,7 @@ public Button getButtonRemove() {
 	/**
 	 * Returns the button that adds an element to the list. Use it to add your
 	 * {@link SelectionListener} to it.
-	 * 
+	 *
 	 * @return
 	 */
 	public Button getButtonAdd() {
@@ -132,7 +132,7 @@ public Button getButtonAdd() {
 	/**
 	 * Returns the button that moves an element down in the list. Use it to add
 	 * your {@link SelectionListener} to it.
-	 * 
+	 *
 	 * @return
 	 */
 	public Button getButtonDown() {
@@ -142,7 +142,7 @@ public Button getButtonDown() {
 	/**
 	 * Returns the button that moves an element up in the list. Use it to add
 	 * your {@link SelectionListener} to it.
-	 * 
+	 *
 	 * @return
 	 */
 	public Button getButtonUp() {
@@ -159,15 +159,13 @@ private void createTopButtons() {
 		buttonCompTopLayout.marginHeight = 0;
 		buttonCompTop.setLayout(buttonCompTopLayout);
 
-		dropDown = new ComboViewer(buttonCompTop, SWT.READ_ONLY | SWT.SIMPLE);
+		dropDown = new ComboViewer(buttonCompTop, SWT.READ_ONLY | SWT.DROP_DOWN);
 		dropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
-		ComboViewerAutoComplete autocomplete = new ComboViewerAutoComplete(dropDown);
-
 		addButton = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);
 		addButton.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_add));
 		addButton.setText(Messages.ModelTooling_Common_AddEllipsis);
-		addButton.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		addButton.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 
 	}
 
@@ -178,7 +176,7 @@ public ComboViewer getDropDown() {
 	/**
 	 * Creates and returns a new instance of this class based on the supplied
 	 * context.
-	 * 
+	 *
 	 * @param parentContext
 	 * @param parent
 	 * @param reference

From 7646a9bd90e712e3bfe6a572c533c5ee5dba3b0b Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Fri, 25 Jul 2014 10:18:36 +0200
Subject: [PATCH 0797/1286] Bug 440417 - [ModelTooling] CompositePart editor
 should support to set icon, label and tooltip

---
 .../e4/tools/emf/ui/internal/Messages.java    |  4 ++
 .../tools/emf/ui/internal/Messages.properties |  4 ++
 .../common/component/CompositePartEditor.java | 50 +++++++++++++++++++
 3 files changed, 58 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 4a052e7a06..622dfba090 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -708,4 +708,8 @@ public class Messages {
 	public String CompositePartEditor_SelectedElement;
 	public String CompositePartEditor_ContainerData;
 	public String CompositePartEditor_Controls;
+	public String CompositePartEditor_LabelLabel;
+	public String CompositePartEditor_Tooltip;
+	public String CompositePartEditor_IconURI;
+	public String CompositePartEditor_IconURI_Tooltip;
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 2cda31389c..f41c3c3342 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -719,3 +719,7 @@ CompositePartEditor_Vertical=Vertical
 CompositePartEditor_SelectedElement=Selected Element
 CompositePartEditor_ContainerData=Container Data
 CompositePartEditor_Controls=Controls
+CompositePartEditor_LabelLabel=Label
+CompositePartEditor_Tooltip=Tooltip
+CompositePartEditor_IconURI=Icon URI
+CompositePartEditor_IconURI_Tooltip=Choose the icon of your part here
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index cfd4b6ce10..9974d3b646 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -8,24 +8,30 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
+import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.tools.emf.ui.internal.imp.RegistryUtil;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MCompositePart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -67,6 +73,7 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
 
 public class CompositePartEditor extends AbstractComponentEditor {
 
@@ -85,6 +92,9 @@ public class CompositePartEditor extends AbstractComponentEditor {
 	@Inject
 	private Shell shell;
 
+	@Inject
+	IEclipseContext eclipseContext;
+
 	@Inject
 	public CompositePartEditor() {
 		super();
@@ -239,6 +249,46 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createTextField(parent, Messages.CompositePartEditor_LabelLabel, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
+		ControlFactory.createTextField(parent, Messages.CompositePartEditor_Tooltip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
+
+		// ------------------------------------------------------------
+		{
+			Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.CompositePartEditor_IconURI);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setToolTipText(Messages.CompositePartEditor_IconURI_Tooltip);
+
+			final Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+
+			new ImageTooltip(t, Messages) {
+
+				@Override
+				protected URI getImageURI() {
+					MUILabel part = (MUILabel) getMaster().getValue();
+					String uri = part.getIconURI();
+					if (uri == null || uri.trim().length() == 0) {
+						return null;
+					}
+					return URI.createURI(part.getIconURI());
+				}
+			};
+
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MPart) getMaster().getValue(), Messages);
+					dialog.open();
+				}
+			});
+		}
 
 		// ------------------------------------------------------------
 		{

From 831956f67c1681c873b13657e63cb85493196857 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Fri, 25 Jul 2014 21:33:50 -0400
Subject: [PATCH 0798/1286] Bug 440469 - [model editor] add option to disable
 list tab persistence of filter and columns

Change-Id: I1625b0ffa9cdede39f350939a8380460fec12fef
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../editor3x/ModelEditorPreferencePage.java   |  33 +++++-
 .../ui/internal/PreferenceInitializer.java    |  12 +-
 .../common/component/tabs/ListTab.java        | 110 ++++++++++--------
 3 files changed, 101 insertions(+), 54 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
index 2b5015744c..acb7735f5c 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - Bug 431735, Bug 437890
+ *     Steven Spungin <steven@spungin.tv> - Bug 431735, Bug 437890, Bug 440469
  ******************************************************************************/
 
 package org.eclipse.e4.tools.emf.editor3x;
@@ -28,6 +28,8 @@ public class ModelEditorPreferencePage extends PreferencePage implements IWorkbe
 	private ColorFieldEditor fColorValueNotVisible;
 	private ColorFieldEditor fColorValueNotVisibleAndRendered;
 	private BooleanFieldEditor fShowSearch;
+	private BooleanFieldEditor fRememberColumns;
+	private BooleanFieldEditor fRememberFilters;
 
 	public ModelEditorPreferencePage() {
 	}
@@ -100,7 +102,7 @@ protected Control createContents(Composite parent) {
 				fShowXMIId.setPreferenceStore(getPreferenceStore());
 				fShowXMIId.load();
 			}
-			
+
 			{
 				Composite container = new Composite(group, SWT.NONE);
 				container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
@@ -109,6 +111,29 @@ protected Control createContents(Composite parent) {
 				fShowSearch.setPreferenceStore(getPreferenceStore());
 				fShowSearch.load();
 			}
+
+		}
+
+		{
+			Group group = new Group(result, SWT.NONE);
+			group.setText("List Tab");
+			group.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
+			group.setLayout(new GridLayout(2, false));
+
+			{
+				Composite container = new Composite(group, SWT.NONE);
+				container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
+
+				fRememberColumns = new BooleanFieldEditor("list-tab-remember-columns", "Remember column settings when reopening editor  ", container);
+				fRememberColumns.setPage(this);
+				fRememberColumns.setPreferenceStore(getPreferenceStore());
+				fRememberColumns.load();
+
+				fRememberFilters = new BooleanFieldEditor("list-tab-remember-filters", "Remember filter settings when reopening editor", container);
+				fRememberFilters.setPage(this);
+				fRememberFilters.setPreferenceStore(getPreferenceStore());
+				fRememberFilters.load();
+			}
 		}
 
 		return result;
@@ -122,6 +147,8 @@ public boolean performOk() {
 		fColorValueNotVisible.store();
 		fColorValueNotVisibleAndRendered.store();
 		fShowSearch.store();
+		fRememberColumns.store();
+		fRememberFilters.store();
 		return super.performOk();
 	}
 
@@ -133,6 +160,8 @@ protected void performDefaults() {
 		fColorValueNotVisible.loadDefault();
 		fColorValueNotVisibleAndRendered.loadDefault();
 		fShowSearch.loadDefault();
+		fRememberColumns.loadDefault();
+		fRememberFilters.loadDefault();
 		super.performDefaults();
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
index 7a9d2fccee..e3d8143416 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - Bug 431735, Bug 437890
+ *     Steven Spungin <steven@spungin.tv> - Bug 431735, Bug 437890, Bug 440469
  ******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal;
@@ -36,12 +36,20 @@ public void initializeDefaultPreferences() {
 		if (pref.get("autoCreateElementId", null) == null) { //$NON-NLS-1$
 			pref.putBoolean("autoCreateElementId", true); //$NON-NLS-1$
 		}
-		
+
 		// TODO: After XMI tab is not forced disabled, this should default to
 		// true
 		if (pref.get("tab-form-search-show", null) == null) { //$NON-NLS-1$
 			pref.putBoolean("tab-form-search-show", false); //$NON-NLS-1$
 		}
+
+		if (pref.get("list-tab-remember-filters", null) == null) { //$NON-NLS-1$
+			pref.putBoolean("list-tab-remember-filters", false); //$NON-NLS-1$
+		}
+
+		if (pref.get("list-tab-remember-columns", null) == null) { //$NON-NLS-1$
+			pref.putBoolean("list-tab-remember-columns", false); //$NON-NLS-1$
+		}
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index 667cc819f0..c779244bd0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555, Bug 436889, Bug 437372
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555, Bug 436889, Bug 437372, Bug 440469
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
@@ -237,69 +237,79 @@ private void saveColumn(Element eleCols, String columnName, TableColumn objCol)
 	// load custom column and filter settings
 	private void loadSettings() {
 		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode("org.eclipse.e4.tools.emf.ui"); //$NON-NLS-1$
+
+		boolean restoreColumns = pref.getBoolean("list-tab-remember-columns", false); //$NON-NLS-1$
+		boolean restoreFilters = pref.getBoolean("list-tab-remember-filters", false); //$NON-NLS-1$
+		if (!restoreColumns && !restoreFilters) {
+			return;
+		}
+
 		String xml = pref.get("list-tab-xml", ""); //$NON-NLS-1$ //$NON-NLS-2$
 		if (E.notEmpty(xml)) {
 			try {
 				Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(xml)));
 				XPath xpath = XPathFactory.newInstance().newXPath();
 				NodeList list;
+				if (restoreColumns) {
+					// restore columns and column widths
+					list = (NodeList) xpath.evaluate("//columns/column", doc, XPathConstants.NODESET); //$NON-NLS-1$
+					for (int i = 0; i < list.getLength(); i++) {
+						Element ele = (Element) list.item(i);
+						TableColumn col;
+						String colName = xpath.evaluate("attribute/text()", ele); //$NON-NLS-1$
+						if (colName.isEmpty()) {
+							continue;
+						}
+						col = requiredColumns.get(colName);
+						if (col == null) {
+							col = addColumn(colName).getTableViewerColumn().getColumn();
+						}
 
-				// restore columns and column widths
-				list = (NodeList) xpath.evaluate("//columns/column", doc, XPathConstants.NODESET); //$NON-NLS-1$
-				for (int i = 0; i < list.getLength(); i++) {
-					Element ele = (Element) list.item(i);
-					TableColumn col;
-					String colName = xpath.evaluate("attribute/text()", ele); //$NON-NLS-1$
-					if (colName.isEmpty()) {
-						continue;
-					}
-					col = requiredColumns.get(colName);
-					if (col == null) {
-						col = addColumn(colName).getTableViewerColumn().getColumn();
-					}
-
-					// move it to the end of the list.
-					int currentIndex = TableViewerUtil.getVisibleColumnIndex(tvResults, col);
-					int[] order = tvResults.getTable().getColumnOrder();
-					for (int idx = 0; idx < order.length; idx++) {
-						if (order[idx] > currentIndex) {
-							order[idx]--;
-						} else if (order[idx] == currentIndex) {
-							order[idx] = order.length - 1;
+						// move it to the end of the list.
+						int currentIndex = TableViewerUtil.getVisibleColumnIndex(tvResults, col);
+						int[] order = tvResults.getTable().getColumnOrder();
+						for (int idx = 0; idx < order.length; idx++) {
+							if (order[idx] > currentIndex) {
+								order[idx]--;
+							} else if (order[idx] == currentIndex) {
+								order[idx] = order.length - 1;
+							}
 						}
-					}
-					tvResults.getTable().setColumnOrder(order);
+						tvResults.getTable().setColumnOrder(order);
 
-					//					if ("Item".equals(colName)) { //$NON-NLS-1$
-					// col = colItem;
-					//					} else if ("Item".equals(colName)) { //$NON-NLS-1$
-					// col = colItem;
-					// }
+						//					if ("Item".equals(colName)) { //$NON-NLS-1$
+						// col = colItem;
+						//					} else if ("Item".equals(colName)) { //$NON-NLS-1$
+						// col = colItem;
+						// }
 
-					String sWidth = xpath.evaluate("width/text()", ele); //$NON-NLS-1$
-					try {
-						col.setWidth(Integer.parseInt(sWidth));
-					} catch (Exception e) {
+						String sWidth = xpath.evaluate("width/text()", ele); //$NON-NLS-1$
+						try {
+							col.setWidth(Integer.parseInt(sWidth));
+						} catch (Exception e) {
+						}
 					}
 				}
 
-				// restore filters
-				list = (NodeList) xpath.evaluate("//filters/filter", doc, XPathConstants.NODESET); //$NON-NLS-1$
-				for (int i = 0; i < list.getLength(); i++) {
-					Element ele = (Element) list.item(i);
-					String type = xpath.evaluate("type/text()", ele); //$NON-NLS-1$
-					String condition = xpath.evaluate("condition/text()", ele); //$NON-NLS-1$
-					String emptyOption = xpath.evaluate("emptyOption/text()", ele); //$NON-NLS-1$
-					if ("item".equals(type)) { //$NON-NLS-1$
-						filterByItem(condition);
-					} else if ("attribute".equals(type)) { //$NON-NLS-1$
-						EmptyFilterOption emptyFilterOption;
-						try {
-							emptyFilterOption = EmptyFilterOption.valueOf(emptyOption);
-						} catch (Exception e) {
-							emptyFilterOption = EmptyFilterOption.INCLUDE;
+				if (restoreFilters) {
+					// restore filters
+					list = (NodeList) xpath.evaluate("//filters/filter", doc, XPathConstants.NODESET); //$NON-NLS-1$
+					for (int i = 0; i < list.getLength(); i++) {
+						Element ele = (Element) list.item(i);
+						String type = xpath.evaluate("type/text()", ele); //$NON-NLS-1$
+						String condition = xpath.evaluate("condition/text()", ele); //$NON-NLS-1$
+						String emptyOption = xpath.evaluate("emptyOption/text()", ele); //$NON-NLS-1$
+						if ("item".equals(type)) { //$NON-NLS-1$
+							filterByItem(condition);
+						} else if ("attribute".equals(type)) { //$NON-NLS-1$
+							EmptyFilterOption emptyFilterOption;
+							try {
+								emptyFilterOption = EmptyFilterOption.valueOf(emptyOption);
+							} catch (Exception e) {
+								emptyFilterOption = EmptyFilterOption.INCLUDE;
+							}
+							filterByAttribute(condition, emptyFilterOption);
 						}
-						filterByAttribute(condition, emptyFilterOption);
 					}
 				}
 			} catch (Exception e) {

From 56e820cd12182d2aa3c35563ffafee8cf06c74fc Mon Sep 17 00:00:00 2001
From: Fabian Miehe <fabian.miehe@cassidian.com>
Date: Mon, 28 Jul 2014 13:52:11 +0200
Subject: [PATCH 0799/1286] Bug 440533 - Undo/Redo should be possible after
 save

Change-Id: I0e34f4433f789172e670ec29c9cfb79cfb5baecd
Signed-off-by: Fabian Miehe <fabian.miehe@cassidian.com>
---
 .../e4/tools/emf/ui/common/XMIModelResource.java    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
index 1695e22f0f..bdacafc478 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
@@ -45,7 +45,7 @@ public class XMIModelResource implements IModelResource {
 	private EditingDomain editingDomain;
 	private Resource resource;
 	private List<ModelListener> listeners = new ArrayList<IModelResource.ModelListener>();
-	private boolean dirty;
+
 	private IObservableList list;
 
 	public XMIModelResource(URI uri) {
@@ -58,7 +58,6 @@ public XMIModelResource(URI uri) {
 
 			@Override
 			public void commandStackChanged(EventObject event) {
-				dirty = true;
 				fireDirtyChanged();
 				fireCommandStackChanged();
 			}
@@ -126,7 +125,7 @@ public void removeModelListener(ModelListener listener) {
 
 	@Override
 	public boolean isDirty() {
-		return dirty && getEditingDomain().getCommandStack().canUndo();
+		return ((BasicCommandStack) getEditingDomain().getCommandStack()).isSaveNeeded();
 	}
 
 	private void fireDirtyChanged() {
@@ -146,10 +145,13 @@ public IStatus save() {
 		Map<String, String> map = new HashMap<String, String>();
 		try {
 			resource.save(map);
-			editingDomain.getCommandStack().flush();
-			dirty = false;
+
+			BasicCommandStack commandStack = (BasicCommandStack) getEditingDomain().getCommandStack();
+			commandStack.saveIsDone();
+
 			fireDirtyChanged();
 			fireCommandStackChanged();
+
 		} catch (Exception e) {
 			// TODO: handle exception
 			e.printStackTrace();
@@ -157,5 +159,4 @@ public IStatus save() {
 
 		return Status.OK_STATUS;
 	}
-
 }

From 9eef678913aad105834aefbef3489378c20c97c3 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Tue, 5 Aug 2014 20:32:29 -0400
Subject: [PATCH 0800/1286] Bug 438591 - [tooling] Add option to generate
 lifecycle class when creating application

Change-Id: Ieac47eacf4ac35c9ec4a557f435d7acd1fb911b0
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../wizards/project/E4NewProjectWizard.java   |  27 +++-
 .../project/LifeCycleClassCodeGenerator.java  | 130 ++++++++++++++++++
 .../project/NewApplicationWizardPage.java     |   3 +
 .../tools/wizards/project/SimpleTemplate.java |  33 +++++
 .../templates/E4LifeCycle.java                |  43 ++++++
 5 files changed, 233 insertions(+), 3 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/LifeCycleClassCodeGenerator.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/SimpleTemplate.java
 create mode 100644 bundles/org.eclipse.e4.tools/templates/E4LifeCycle.java

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 99e03629e6..256a3da63b 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -11,6 +11,7 @@
  *     Sopot Cela - ongoing enhancements
  *     Lars Vogel - ongoing enhancements
  *     Wim Jongman - ongoing enhancements
+ *     Steven Spungin - ongoing enhancements, Bug 438591
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -292,6 +293,15 @@ public void createProductsExtension(IProject project) {
 						cssValue);
 			}
 
+			String lifeCycleValue = map
+					.get(NewApplicationWizardPage.APPLICATION_LIFECYCLE_PROPERTY);
+			if (lifeCycleValue != null) {
+				lifeCycleValue = "bundleclass://" + fPluginData.getId() + "/"
+						+ fPluginData.getId().toLowerCase() + "." + lifeCycleValue;
+				map.put(NewApplicationWizardPage.APPLICATION_LIFECYCLE_PROPERTY,
+						lifeCycleValue);
+			}
+
 			extension.setPoint("org.eclipse.core.runtime.products");
 			extension.setId("product");
 			IPluginElement productElement = fmodel.getFactory().createElement(
@@ -363,9 +373,20 @@ public void createApplicationResources(IProject project,
 		// If the project has invalid characters, the plug-in name would replace
 		// them with underscores, product name does the same
 		String pluginName = fPluginData.getId();
-
-		// If there's no Activator created we create default package
-		if (!fPluginData.doGenerateClass()) {
+		
+		// BEGIN Generate E4Lifecycle class with annotations
+		String classname = fPluginData.getId() + "." + map.get(NewApplicationWizardPage.APPLICATION_LIFECYCLE_PROPERTY);
+		LifeCycleClassCodeGenerator fGenerator = new LifeCycleClassCodeGenerator(project, classname, fPluginData, false, getContainer());
+		try {
+			fGenerator.generate(new NullProgressMonitor());
+		} catch (CoreException e2) {
+			e2.printStackTrace();
+		}
+		boolean lifeCycleCreated = true;
+		// END Generate E4Lifecycle class with annotations
+		
+		// If there's no Activator or LifeCycle created we create default package
+		if (!fPluginData.doGenerateClass() && !lifeCycleCreated) {
 			String packageName = fPluginData.getId();
 			IPath path = new Path(packageName.replace('.', '/'));
 			if (fPluginData.getSourceFolderName().trim().length() > 0)
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/LifeCycleClassCodeGenerator.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/LifeCycleClassCodeGenerator.java
new file mode 100644
index 0000000000..aed4af238c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/LifeCycleClassCodeGenerator.java
@@ -0,0 +1,130 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.internal.tools.wizards.project;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.wizard.IWizardContainer;
+import org.eclipse.pde.internal.core.util.CoreUtility;
+import org.eclipse.pde.internal.ui.PDEPlugin;
+import org.eclipse.pde.internal.ui.wizards.plugin.PluginFieldData;
+import org.osgi.framework.FrameworkUtil;
+
+public class LifeCycleClassCodeGenerator {
+	private PluginFieldData fPluginData;
+	private IProject fProject;
+	private String fQualifiedClassName;
+	private boolean fGenerateTemplate;
+	private IWizardContainer fWizardContainer;
+
+	public LifeCycleClassCodeGenerator(IProject project, String qualifiedClassName, PluginFieldData data, boolean generateTemplate, IWizardContainer wizardContainer) {
+		fProject = project;
+		fQualifiedClassName = qualifiedClassName;
+		fPluginData = data;
+		fGenerateTemplate = generateTemplate;
+		fWizardContainer = wizardContainer;
+	}
+
+	public IFile generate(IProgressMonitor monitor) throws CoreException {
+		int nameloc = fQualifiedClassName.lastIndexOf('.');
+		String packageName = (nameloc == -1) ? "" : fQualifiedClassName.substring(0, nameloc); //$NON-NLS-1$
+		//CoreUtility.createFolder was throwing exception if Activator was already created with lower case package and this method called it with different case.
+		packageName = packageName.toLowerCase();
+		String className = fQualifiedClassName.substring(nameloc + 1);
+
+		IPath path = new Path(packageName.replace('.', '/'));
+		if (fPluginData.getSourceFolderName().trim().length() > 0) {
+			path = new Path(fPluginData.getSourceFolderName()).append(path);
+		}
+
+		CoreUtility.createFolder(fProject.getFolder(path));
+
+		IFile file = fProject.getFile(path.append(className + ".java")); //$NON-NLS-1$
+		StringWriter swriter = new StringWriter();
+		PrintWriter writer = new PrintWriter(swriter);
+		generateClass(packageName, className, swriter);
+		writer.flush();
+
+		try {
+			swriter.close();
+			ByteArrayInputStream stream = new ByteArrayInputStream(swriter.toString().getBytes(fProject.getDefaultCharset()));
+			if (file.exists())
+				file.setContents(stream, false, true, monitor);
+			else
+				file.create(stream, false, monitor);
+			stream.close();
+		} catch (Exception e) {
+
+		}
+		return file;
+	}
+
+	private void generateClass(String packageName, String className, StringWriter writer) {
+
+		Map<String, String> map = new HashMap<String, String>();
+		if (packageName.equals("")) {
+			map.put("PACKAGE_DECLARATION", "");
+		} else {
+			map.put("PACKAGE_DECLARATION", "package " + packageName + ";");
+		}
+		map.put("PACKAGE_NAME", packageName);
+		map.put("CLASS_NAME", className);
+
+		try {
+			String template = getResourceAsString(this.getClass(), "/templates/E4LifeCycle.java");
+			template = SimpleTemplate.process(template, map);
+			writer.write(template);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+	}
+
+	public static String getResourceAsString(Class<?> classInBundle, String templatePath) throws FileNotFoundException, IOException {
+		URL url = FrameworkUtil.getBundle(classInBundle).getResource(templatePath);
+		return readTextFile(url.openStream());
+	}
+
+	public static String readTextFile(InputStream stream) throws IOException, FileNotFoundException {
+		StringBuilder sb = new StringBuilder();
+		BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
+
+		char[] chars = new char[1024];
+		int numRead = 0;
+		while ((numRead = reader.read(chars)) > -1) {
+			sb.append(String.copyValueOf(chars, 0, numRead));
+		}
+
+		reader.close();
+		return sb.toString();
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
index a248d910f2..1faac6564b 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
@@ -51,6 +51,7 @@
 public class NewApplicationWizardPage extends WizardPage {
 	public static final String E4_APPLICATION = "org.eclipse.e4.ui.workbench.swt.E4Application";
 	public static final String APPLICATION_CSS_PROPERTY = "applicationCSS";
+	public static final String APPLICATION_LIFECYCLE_PROPERTY = "lifeCycleURI";
 	public static final String PRODUCT_NAME = "productName";
 	public static final String APPLICATION = "application";
 	public static final String CLEAR_PERSISTED_STATE = "clearPersistedState";
@@ -424,6 +425,8 @@ protected PropertyData[] getPropertyData() {
 			PROPERTIES = new PropertyData[] {
 					new PropertyData(APPLICATION_CSS_PROPERTY, "CSS Style:",
 							"css/default.css", String.class, true),
+					new PropertyData(APPLICATION_LIFECYCLE_PROPERTY, "LifeCycle Class Name:",
+							"E4LifeCycle", String.class, true),
 					new PropertyData(
 							IProductConstants.PREFERENCE_CUSTOMIZATION,
 							"Preference Customization:", "", String.class, true),
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/SimpleTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/SimpleTemplate.java
new file mode 100644
index 0000000000..d13efba8d9
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/SimpleTemplate.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.project;
+
+import java.util.Map;
+
+/**
+ * A <em>very</em> basic template processor.<br />
+ * Any value between pairs of @@ will be substituted by the value in a map.<br />
+ * Any values not in the map will be replaced by an empty string.
+ * <br /> <br />
+ * Behavior is undefined if keys or values contain the @@ marker.
+ * @author Steven Spungin
+ *
+ */
+public class SimpleTemplate {
+
+	public static String process(String source, Map<String, String> substitutionMap) {
+		for (String key : substitutionMap.keySet()) {
+			source = source.replaceAll("@@" + key + "@@", substitutionMap.get(key));
+		}
+		source = source.replaceAll("@@.*?@@", "");
+		return source;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools/templates/E4LifeCycle.java b/bundles/org.eclipse.e4.tools/templates/E4LifeCycle.java
new file mode 100644
index 0000000000..eb63e04f38
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/templates/E4LifeCycle.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+@@PACKAGE_DECLARATION@@
+
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.ui.workbench.lifecycle.PostContextCreate;
+import org.eclipse.e4.ui.workbench.lifecycle.PreSave;
+import org.eclipse.e4.ui.workbench.lifecycle.ProcessAdditions;
+import org.eclipse.e4.ui.workbench.lifecycle.ProcessRemovals;
+
+/**
+ * This is a stub implementation containing e4 LifeCycle annotated methods.<br />
+ * There is a corresponding entry in <em>plugin.xml</em> (under the
+ * <em>org.eclipse.core.runtime.products' extension point</em>) that references
+ * this class.
+ **/
+@SuppressWarnings("restriction")
+public class @@CLASS_NAME@@ {
+
+	@PostContextCreate
+	void postContextCreate(IEclipseContext workbenchContext) {
+	}
+
+	@PreSave
+	void preSave(IEclipseContext workbenchContext) {
+	}
+
+	@ProcessAdditions
+	void processAdditions(IEclipseContext workbenchContext) {
+	}
+
+	@ProcessRemovals
+	void processRemovals(IEclipseContext workbenchContext) {
+	}
+}

From 1619bad84b315ae66036e63483b9c38202aac5fc Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Tue, 5 Aug 2014 20:32:29 -0400
Subject: [PATCH 0801/1286] Bug 438591 - [tooling] Add option to generate
 lifecycle class when creating application

Change-Id: Ib84106a2777bbd422acc197057b5573ffbd0404c
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../wizards/project/E4NewProjectWizard.java   | 38 +++++++-----
 .../project/NewApplicationWizardPage.java     | 61 ++++++++++++++++---
 2 files changed, 76 insertions(+), 23 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 256a3da63b..355302a09f 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -293,13 +293,15 @@ public void createProductsExtension(IProject project) {
 						cssValue);
 			}
 
-			String lifeCycleValue = map
-					.get(NewApplicationWizardPage.APPLICATION_LIFECYCLE_PROPERTY);
-			if (lifeCycleValue != null) {
-				lifeCycleValue = "bundleclass://" + fPluginData.getId() + "/"
-						+ fPluginData.getId().toLowerCase() + "." + lifeCycleValue;
-				map.put(NewApplicationWizardPage.APPLICATION_LIFECYCLE_PROPERTY,
-						lifeCycleValue);
+			if ("TRUE".equals(map.get(NewApplicationWizardPage.generateLifecycle))){
+				String lifeCycleValue = map
+						.get(NewApplicationWizardPage.generateLifecycleName);
+				if (lifeCycleValue != null && lifeCycleValue.isEmpty() == false) {
+					lifeCycleValue = "bundleclass://" + fPluginData.getId() + "/"
+							+ fPluginData.getId().toLowerCase() + "." + lifeCycleValue;
+					map.put(NewApplicationWizardPage.LIFECYCLE_URI_PROPERTY,
+							lifeCycleValue);
+				}
 			}
 
 			extension.setPoint("org.eclipse.core.runtime.products");
@@ -333,6 +335,10 @@ public void createProductsExtension(IProject project) {
 										NewApplicationWizardPage.APPLICATION)
 								|| entry.getKey().equals(
 										NewApplicationWizardPage.richSample)
+								|| entry.getKey().equals(
+												NewApplicationWizardPage.generateLifecycle)
+								|| entry.getKey().equals(
+												NewApplicationWizardPage.generateLifecycleName)
 								|| entry.getKey()
 										.equals(NewApplicationWizardPage.CLEAR_PERSISTED_STATE)) {
 							continue;
@@ -374,15 +380,17 @@ public void createApplicationResources(IProject project,
 		// them with underscores, product name does the same
 		String pluginName = fPluginData.getId();
 		
-		// BEGIN Generate E4Lifecycle class with annotations
-		String classname = fPluginData.getId() + "." + map.get(NewApplicationWizardPage.APPLICATION_LIFECYCLE_PROPERTY);
-		LifeCycleClassCodeGenerator fGenerator = new LifeCycleClassCodeGenerator(project, classname, fPluginData, false, getContainer());
-		try {
-			fGenerator.generate(new NullProgressMonitor());
-		} catch (CoreException e2) {
-			e2.printStackTrace();
+		// BEGIN Generate E4Lifecycle class with annotations	
+		boolean lifeCycleCreated = "TRUE".equals(map.get(NewApplicationWizardPage.generateLifecycle));
+		if (lifeCycleCreated){
+			String classname = fPluginData.getId() + "." + map.get(NewApplicationWizardPage.generateLifecycleName);
+			LifeCycleClassCodeGenerator fGenerator = new LifeCycleClassCodeGenerator(project, classname, fPluginData, false, getContainer());
+			try {
+				fGenerator.generate(new NullProgressMonitor());
+			} catch (CoreException e2) {
+				e2.printStackTrace();
+			}
 		}
-		boolean lifeCycleCreated = true;
 		// END Generate E4Lifecycle class with annotations
 		
 		// If there's no Activator or LifeCycle created we create default package
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
index 1faac6564b..d52b353529 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
@@ -10,6 +10,7 @@
  *     IBM Corporation - ongoing enhancements
  *     Lars Vogel, vogella GmbH - ongoing enhancements
  *     Sopot Cela - ongoing enhancements
+ *     Steven Spungin - ongoing enhancements, Bug 438591
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -24,8 +25,11 @@
 import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
 import org.eclipse.pde.internal.ui.wizards.plugin.AbstractFieldData;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.events.VerifyEvent;
 import org.eclipse.swt.events.VerifyListener;
 import org.eclipse.swt.graphics.Color;
@@ -51,12 +55,15 @@
 public class NewApplicationWizardPage extends WizardPage {
 	public static final String E4_APPLICATION = "org.eclipse.e4.ui.workbench.swt.E4Application";
 	public static final String APPLICATION_CSS_PROPERTY = "applicationCSS";
-	public static final String APPLICATION_LIFECYCLE_PROPERTY = "lifeCycleURI";
+	public static final String LIFECYCLE_URI_PROPERTY = "lifeCycleURI";
 	public static final String PRODUCT_NAME = "productName";
 	public static final String APPLICATION = "application";
 	public static final String CLEAR_PERSISTED_STATE = "clearPersistedState";
 	public static final String EOL = System.getProperty("line.separator");
 	public static final String richSample = "RICH_SAMPLE";
+	public static final String generateLifecycle = "GENERATE_LIFECYCLE";
+	public static final String generateLifecycleName = "GENERATE_LIFECYCLE_NAME";
+
 	private final Map<String, String> data;
 
 	private IProject project;
@@ -67,6 +74,8 @@ public class NewApplicationWizardPage extends WizardPage {
 
 	private PropertyData[] PROPERTIES;
 	private Button richSampleCheckbox;
+	protected Button generateLifecycleClassCheckbox;
+	protected Text lifeCycleName;
 
 	protected NewApplicationWizardPage(IProjectProvider projectProvider,
 			AbstractFieldData pluginData) {
@@ -114,22 +123,60 @@ public void createControl(Composite parent) {
 
 	private Group createTemplateGroup(Composite parent) {
 		Group group = new Group(parent, SWT.NONE);
-		group.setLayout(new GridLayout(1, false));
+		group.setLayout(new GridLayout(3, false));
 		group.setText("Template option");
-		
+
 		richSampleCheckbox = new Button(group, SWT.CHECK);
-		
+
 		richSampleCheckbox.setSelection(false);
 		richSampleCheckbox.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				data.put(richSample, richSampleCheckbox.getSelection() ? "TRUE"
-						: "FALSE");
+				data.put(richSample, richSampleCheckbox.getSelection() ? "TRUE" : "FALSE");
 			}
 		});
 		richSampleCheckbox.setText("Create sample content (parts, menu etc.)");
+		richSampleCheckbox.setLayoutData(new GridData(SWT.BEGINNING, SWT.TOP, false, false, 2, 1));
+
+		{
+			SelectionListener listener= new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					lifeCycleName.setEnabled(generateLifecycleClassCheckbox.getSelection());
+					data.put(generateLifecycle, generateLifecycleClassCheckbox.getSelection() ? "TRUE" : "FALSE");
+				}
+			};		
+			
+			generateLifecycleClassCheckbox = new Button(group, SWT.CHECK);
+			generateLifecycleClassCheckbox.setSelection(false);
+
+			generateLifecycleClassCheckbox.setText("Create an e4 lifecycle annotated class");
+			generateLifecycleClassCheckbox.setLayoutData(new GridData(SWT.BEGINNING, SWT.TOP, false, false, 2, 1));
+			generateLifecycleClassCheckbox.addSelectionListener(listener);
+
+			new Label(group, SWT.NONE);
+			Label lbl = new Label(group, SWT.NONE);
+			lbl.setText("LifeCycle class name:");
+			GridData gd = new GridData();
+			gd.horizontalIndent = 20;
+			lbl.setLayoutData(gd);
+			
+			lifeCycleName = new Text(group, SWT.BORDER);
+			lifeCycleName.setText("E4LifeCycle");
+			lifeCycleName.setEnabled(false);
+			lifeCycleName.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
+			lifeCycleName.addModifyListener(new ModifyListener() {
+				
+				@Override
+				public void modifyText(ModifyEvent e) {
+					data.put(generateLifecycleName, lifeCycleName.getText());
+				}
+			});
+			data.put(generateLifecycleName, lifeCycleName.getText());
+		}
 		return group;
 	}
+
 	
 	static class PropertyData {
 		private String name;
@@ -425,8 +472,6 @@ protected PropertyData[] getPropertyData() {
 			PROPERTIES = new PropertyData[] {
 					new PropertyData(APPLICATION_CSS_PROPERTY, "CSS Style:",
 							"css/default.css", String.class, true),
-					new PropertyData(APPLICATION_LIFECYCLE_PROPERTY, "LifeCycle Class Name:",
-							"E4LifeCycle", String.class, true),
 					new PropertyData(
 							IProductConstants.PREFERENCE_CUSTOMIZATION,
 							"Preference Customization:", "", String.class, true),

From 80cff7272a53f08c7a583a8baf6ef6a61352ff21 Mon Sep 17 00:00:00 2001
From: Paul Webster <pwebster@ca.ibm.com>
Date: Fri, 8 Aug 2014 15:08:30 -0400
Subject: [PATCH 0802/1286] Bug 441443 - [releng] Update parent poms to
 0.17.0-SNAPSHOT

---
 bundles/org.eclipse.e4.tools.compat/pom.xml        | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml  | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml        | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml               | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index d5a7722caa..c6196d3676 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.16.0-SNAPSHOT</version>
+    <version>0.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 878d795953..211129c03c 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.16.0-SNAPSHOT</version>
+    <version>0.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index faca210081..25973f9ccc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.16.0-SNAPSHOT</version>
+    <version>0.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index d330625c80..c7ab963db8 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.16.0-SNAPSHOT</version>
+    <version>0.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 01b2d36383..1e3a49e203 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.16.0-SNAPSHOT</version>
+    <version>0.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index a292648956..8d876aa19a 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.16.0-SNAPSHOT</version>
+    <version>0.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 370046ee10..dcaf8f4cb4 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.e4.tools</groupId>
     <artifactId>e4-tools-aggregator</artifactId>
-    <version>0.16.0-SNAPSHOT</version>
+    <version>0.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 

From 0fba2f0a500f6a44e265f9d15aa1441f4d614f42 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Mon, 11 Aug 2014 10:18:17 +0200
Subject: [PATCH 0803/1286] Bug 441485 - [Model Editor] Adjust ModelEditor to
 change in FilteredTree

Change-Id: Ib457d01003dfad740cd31391cbad101338f222eb
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index dfd00152c4..1734293c98 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -1042,7 +1042,7 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		TreeViewer tempViewer = null;
 		String property = System.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
 		if (property != null || preferences.getBoolean("tab-form-search-show", false)) { //$NON-NLS-1$
-			FilteredTree viewParent = new FilteredTree(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(), true);
+			FilteredTree viewParent = new FilteredTree(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter());
 			tempViewer = viewParent.getViewer();
 		} else {
 			tempViewer = new TreeViewerEx(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, emfDocumentProvider, modelProvider);

From 2209e75f1aeccf17d70561e57a43cc7c0da6b4cd Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Wed, 27 Aug 2014 18:07:03 +0200
Subject: [PATCH 0804/1286] Bug 442725 - Use less technical name for lifecycle
 class in the e4 wizard

Change-Id: I518b74ca0c348364f1bbe258eecbdf6077cc13ad
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../tools/wizards/project/NewApplicationWizardPage.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
index d52b353529..26ee180392 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
@@ -150,7 +150,7 @@ public void widgetSelected(SelectionEvent e) {
 			generateLifecycleClassCheckbox = new Button(group, SWT.CHECK);
 			generateLifecycleClassCheckbox.setSelection(false);
 
-			generateLifecycleClassCheckbox.setText("Create an e4 lifecycle annotated class");
+			generateLifecycleClassCheckbox.setText("Add a lifecycle class");
 			generateLifecycleClassCheckbox.setLayoutData(new GridData(SWT.BEGINNING, SWT.TOP, false, false, 2, 1));
 			generateLifecycleClassCheckbox.addSelectionListener(listener);
 

From ef8578496a0e68593a9897609fbb0b301c21de4a Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Fri, 29 Aug 2014 12:14:04 +0200
Subject: [PATCH 0805/1286] Bug 442647 - Persist scope selection in Find
 Contribution Class Dialog

Signed-off-by: Marco Descher <marco@descher.at>
---
 .../dialogs/FilteredContributionDialog.java   | 19 +++++++++++++++++++
 .../SaveDialogBoundsSettingsDialog.java       | 17 +++++++++++------
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index 2801f17e0e..42dc97ba90 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625, Bug 436281
  *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
+ *     Marco Descher <marco@descher.at> - Bug 442647
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
@@ -103,7 +104,9 @@ public abstract class FilteredContributionDialog extends SaveDialogBoundsSetting
 	private static final int MAX_RESULTS = 500;
 	private Image contributionTypeImage;
 	private TableViewer viewer;
+	private static final String PREF_SEARCHSCOPE = "searchScope"; //$NON-NLS-1$
 	private ResourceSearchScope searchScope = ResourceSearchScope.PROJECT;
+	private static final String PREF_SEARCHSCOPES = "searchScopes"; //$NON-NLS-1$
 	private EnumSet<ResourceSearchScope> searchScopes = EnumSet.of(ResourceSearchScope.PROJECT);
 	// private EnumSet<SearchScope> searchScopes =
 	// EnumSet.of(SearchScope.PROJECT, SearchScope.REFERENCES);
@@ -216,6 +219,8 @@ public void run() {
 	@Override
 	public boolean close() {
 		stopSearchThread(true);
+		getPreferences().put(PREF_SEARCHSCOPE, searchScope.toString());
+		getPreferences().put(PREF_SEARCHSCOPES, searchScopes.toString());
 		return super.close();
 	}
 
@@ -231,6 +236,20 @@ public FilteredContributionDialog(Shell parentShell, IEclipseContext context) {
 		super(parentShell);
 		this.context = context;
 		imageCache = new BundleImageCache(context.get(Display.class), getClass().getClassLoader());
+
+		String searchScopeString = getPreferences().get(PREF_SEARCHSCOPE, ResourceSearchScope.PROJECT.toString());
+		searchScope = ResourceSearchScope.valueOf(searchScopeString);
+
+		String searchScopesString = getPreferences().get(PREF_SEARCHSCOPES, EnumSet.of(ResourceSearchScope.PROJECT).toString());
+		searchScopes = valueOf(ResourceSearchScope.class, searchScopesString);
+	}
+
+	public static <E extends Enum<E>> EnumSet<E> valueOf(Class<E> eClass, String str) {
+		String[] arr = str.substring(1, str.length() - 1).split(",");
+		EnumSet<E> set = EnumSet.noneOf(eClass);
+		for (String e : arr)
+			set.add(E.valueOf(eClass, e.trim()));
+		return set;
 	}
 
 	public void setStatus(final String message) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
index a713f64200..01db113dff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - initial implementation (Bug 395283)
+ *     Marco Descher <marco@descher.at> - Bug 442647
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -27,22 +28,17 @@ public abstract class SaveDialogBoundsSettingsDialog extends TitleAreaDialog {
 	private static final String DIALOG_WIDTH = "DIALOG_WIDTH"; //$NON-NLS-1$
 	private static final String DIALOG_HEIGHT = "DIALOG_HEIGHT"; //$NON-NLS-1$
 
-	private IDialogSettings dialogSettings;
+	private IDialogSettings dialogSettings = new DialogSettings(ORG_ECLIPSE_E4_TOOLS_EMF_UI);
 
 	private Preferences preferences = InstanceScope.INSTANCE.getNode(ORG_ECLIPSE_E4_TOOLS_EMF_UI);
 
 	public SaveDialogBoundsSettingsDialog(Shell parentShell) {
 		super(parentShell);
-	}
 
-	@Override
-	protected IDialogSettings getDialogBoundsSettings() {
-		dialogSettings = new DialogSettings(ORG_ECLIPSE_E4_TOOLS_EMF_UI);
 		dialogSettings.put(DIALOG_HEIGHT, preferences.getInt(DIALOG_HEIGHT, -1));
 		dialogSettings.put(DIALOG_WIDTH, preferences.getInt(DIALOG_WIDTH, -1));
 		dialogSettings.put(DIALOG_ORIGIN_X, preferences.getInt(DIALOG_ORIGIN_X, -1));
 		dialogSettings.put(DIALOG_ORIGIN_Y, preferences.getInt(DIALOG_ORIGIN_Y, -1));
-		return dialogSettings;
 	}
 
 	private void saveDialogSettings() {
@@ -63,4 +59,13 @@ public boolean close() {
 		saveDialogSettings();
 		return returnValue;
 	}
+
+	@Override
+	protected IDialogSettings getDialogBoundsSettings() {
+		return dialogSettings;
+	}
+
+	public Preferences getPreferences() {
+		return preferences;
+	}
 }

From 264729a0d2b92da1316d4a15b0ea28e010aea7ef Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Mon, 8 Sep 2014 19:45:02 -0400
Subject: [PATCH 0806/1286] Bug 443510 - bundleclass reference incorrect if
 Target Platform is used and no reference in MANIFEST.MF

Change-Id: Iac6e352a1c11c6b7afee92d50f553dbcf974c554
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../resourcelocator/TargetPlatformContributionCollector.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
index 9192060092..e16a428c51 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625, Bug 436133, Bug 436132, Bug 436283, Bug 436281
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625, Bug 436133, Bug 436132, Bug 436283, Bug 436281, Bug 443510
  *     Fabian Miehe - Bug 440327
  *******************************************************************************/
 
@@ -234,7 +234,7 @@ protected ContributionData makeData(Entry e) {
 		IPath ip = Path.fromOSString(e.path);
 		ip = ip.addTrailingSeparator().makeRelative();
 		ip = ip.append(e.name);
-		String className = ip.toOSString().replace('\\', '.');
+		String className = ip.toOSString().replace(File.separatorChar, '.');
 		ContributionData data = new ContributionData(e.bundleSymName, className, "Java", e.installLocation); //$NON-NLS-1$
 		data.installLocation = e.installLocation;
 		data.resourceRelativePath = e.relativePath;

From eb5c0f8990075d9210493b44910b388cc909f58d Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Tue, 16 Sep 2014 16:09:53 +0200
Subject: [PATCH 0807/1286] Bug 371345 - plugin org.eclipse.e4.tools.emf.ui
 does not contain schema definitions - schema definition was already exported,
 but not all packages were exported.

---
 .../org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index f8fcbafb3e..ef451317f9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -48,5 +48,16 @@ Export-Package: org.eclipse.e4.tools.emf.ui.common,
  org.eclipse.e4.tools.emf.ui.internal.common;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.common.component;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty;x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.objectdata;x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.properties;x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator;x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.uistructure;x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.xml;x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.handlers;x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.imp;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.wbm;x-friends:="org.eclipse.e4.tools.emf.editor"
 Service-Component: OSGI-INF/contributioncollector.xml, OSGI-INF/resourceprovider.xml

From 4f410323789ef9048ba22ed3b87db8013700172c Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Thu, 18 Sep 2014 10:53:31 +0200
Subject: [PATCH 0808/1286] Bug 444340 - Externalize Strings - Applied
 Formatter in preparation to externalize all Strings

---
 .../ObservableColumnLabelProvider.java        |  11 +-
 .../tools/emf/ui/internal/StringMatcher.java  | 756 +++++++++---------
 .../UnsettableUpdateValueStrategy.java        |   2 +-
 .../PartDescriptorIconDialogEditor.java       |   2 +-
 .../xml/EMFDocumentResourceMediator.java      |   6 +-
 .../xml/NonRuleBasedDamagerRepairer.java      |  83 +-
 .../common/xml/XMLDoubleClickStrategy.java    |   2 +
 .../emf/ui/internal/imp/RegistryStruct.java   |   3 +-
 8 files changed, 442 insertions(+), 423 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
index 90f011a034..22a8d2bddc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
@@ -28,9 +28,7 @@ public class ObservableColumnLabelProvider<M> extends CellLabelProvider {
 		@Override
 		public void handleMapChange(MapChangeEvent event) {
 			Set<?> affectedElements = event.diff.getChangedKeys();
-			LabelProviderChangedEvent newEvent = new LabelProviderChangedEvent(
-					ObservableColumnLabelProvider.this, affectedElements
-							.toArray());
+			LabelProviderChangedEvent newEvent = new LabelProviderChangedEvent(ObservableColumnLabelProvider.this, affectedElements.toArray());
 			fireLabelProviderChanged(newEvent);
 		}
 	};
@@ -52,9 +50,7 @@ public ObservableColumnLabelProvider(IObservableMap attributeMap) {
 	 * @param attributeMaps
 	 */
 	protected ObservableColumnLabelProvider(IObservableMap[] attributeMaps) {
-		System.arraycopy(attributeMaps, 0,
-				this.attributeMaps = new IObservableMap[attributeMaps.length],
-				0, attributeMaps.length);
+		System.arraycopy(attributeMaps, 0, this.attributeMaps = new IObservableMap[attributeMaps.length], 0, attributeMaps.length);
 		for (int i = 0; i < attributeMaps.length; i++) {
 			attributeMaps[i].addMapChangeListener(mapChangeListener);
 		}
@@ -85,7 +81,7 @@ public String getText(M element) {
 		Object value = attributeMaps[0].get(element);
 		return value == null ? "" : value.toString(); //$NON-NLS-1$
 	}
-	
+
 	public Font getFont(M element) {
 		return null;
 	}
@@ -98,7 +94,6 @@ public Color getForeground(M element) {
 		return null;
 	}
 
-
 	public Image getImage(M element) {
 		return null;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
index cfd8768709..e66e52dc02 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
@@ -16,436 +16,474 @@
  * A string pattern matcher, suppporting "*" and "?" wildcards.
  */
 public class StringMatcher {
-    protected String fPattern;
-
-    protected int fLength; // pattern length
-
-    protected boolean fIgnoreWildCards;
-
-    protected boolean fIgnoreCase;
-
-    protected boolean fHasLeadingStar;
-
-    protected boolean fHasTrailingStar;
-
-    protected String fSegments[]; //the given pattern is split into * separated segments
-
-    /* boundary value beyond which we don't need to search in the text */
-    protected int fBound = 0;
-
-    protected static final char fSingleWildCard = '\u0000';
-
-    public static class Position {
-        int start; //inclusive
-
-        int end; //exclusive
-
-        public Position(int start, int end) {
-            this.start = start;
-            this.end = end;
-        }
-
-        public int getStart() {
-            return start;
-        }
-
-        public int getEnd() {
-            return end;
-        }
-    }
-
-    /**
-     * StringMatcher constructor takes in a String object that is a simple 
-     * pattern which may contain '*' for 0 and many characters and
-     * '?' for exactly one character.  
-     *
-     * Literal '*' and '?' characters must be escaped in the pattern 
-     * e.g., "\*" means literal "*", etc.
-     *
-     * Escaping any other character (including the escape character itself), 
-     * just results in that character in the pattern.
-     * e.g., "\a" means "a" and "\\" means "\"
-     *
-     * If invoking the StringMatcher with string literals in Java, don't forget
-     * escape characters are represented by "\\".
-     *
-     * @param pattern the pattern to match text against
-     * @param ignoreCase if true, case is ignored
-     * @param ignoreWildCards if true, wild cards and their escape sequences are ignored
-     * 		  (everything is taken literally).
-     */
-    public StringMatcher(String pattern, boolean ignoreCase,
-            boolean ignoreWildCards) {
-        if (pattern == null) {
+	protected String fPattern;
+
+	protected int fLength; // pattern length
+
+	protected boolean fIgnoreWildCards;
+
+	protected boolean fIgnoreCase;
+
+	protected boolean fHasLeadingStar;
+
+	protected boolean fHasTrailingStar;
+
+	protected String fSegments[]; // the given pattern is split into * separated
+									// segments
+
+	/* boundary value beyond which we don't need to search in the text */
+	protected int fBound = 0;
+
+	protected static final char fSingleWildCard = '\u0000';
+
+	public static class Position {
+		int start; // inclusive
+
+		int end; // exclusive
+
+		public Position(int start, int end) {
+			this.start = start;
+			this.end = end;
+		}
+
+		public int getStart() {
+			return start;
+		}
+
+		public int getEnd() {
+			return end;
+		}
+	}
+
+	/**
+	 * StringMatcher constructor takes in a String object that is a simple
+	 * pattern which may contain '*' for 0 and many characters and '?' for
+	 * exactly one character.
+	 *
+	 * Literal '*' and '?' characters must be escaped in the pattern e.g.,
+	 * "\*" means literal "*", etc.
+	 *
+	 * Escaping any other character (including the escape character itself),
+	 * just results in that character in the pattern. e.g., "\a" means "a" and
+	 * "\\" means "\"
+	 *
+	 * If invoking the StringMatcher with string literals in Java, don't forget
+	 * escape characters are represented by "\\".
+	 *
+	 * @param pattern
+	 *            the pattern to match text against
+	 * @param ignoreCase
+	 *            if true, case is ignored
+	 * @param ignoreWildCards
+	 *            if true, wild cards and their escape sequences are ignored
+	 *            (everything is taken literally).
+	 */
+	public StringMatcher(String pattern, boolean ignoreCase, boolean ignoreWildCards) {
+		if (pattern == null) {
 			throw new IllegalArgumentException();
 		}
-        fIgnoreCase = ignoreCase;
-        fIgnoreWildCards = ignoreWildCards;
-        fPattern = pattern;
-        fLength = pattern.length();
-
-        if (fIgnoreWildCards) {
-            parseNoWildCards();
-        } else {
-            parseWildCards();
-        }
-    }
-
-    /**
-     * Find the first occurrence of the pattern between <code>start</code)(inclusive) 
-     * and <code>end</code>(exclusive).  
-     * @param text the String object to search in 
-     * @param start the starting index of the search range, inclusive
-     * @param end the ending index of the search range, exclusive
-     * @return an <code>StringMatcher.Position</code> object that keeps the starting 
-     * (inclusive) and ending positions (exclusive) of the first occurrence of the 
-     * pattern in the specified range of the text; return null if not found or subtext
-     * is empty (start==end). A pair of zeros is returned if pattern is empty string
-     * Note that for pattern like "*abc*" with leading and trailing stars, position of "abc"
-     * is returned. For a pattern like"*??*" in text "abcdf", (1,3) is returned
-     */
-    public StringMatcher.Position find(String text, int start, int end) {
-        if (text == null) {
+		fIgnoreCase = ignoreCase;
+		fIgnoreWildCards = ignoreWildCards;
+		fPattern = pattern;
+		fLength = pattern.length();
+
+		if (fIgnoreWildCards) {
+			parseNoWildCards();
+		} else {
+			parseWildCards();
+		}
+	}
+
+	/**
+	 * Find the first occurrence of the pattern between <code>start</code
+	 * )(inclusive) and <code>end</code>(exclusive).
+	 * 
+	 * @param text
+	 *            the String object to search in
+	 * @param start
+	 *            the starting index of the search range, inclusive
+	 * @param end
+	 *            the ending index of the search range, exclusive
+	 * @return an <code>StringMatcher.Position</code> object that keeps the
+	 *         starting (inclusive) and ending positions (exclusive) of the
+	 *         first occurrence of the pattern in the specified range of the
+	 *         text; return null if not found or subtext is empty (start==end).
+	 *         A pair of zeros is returned if pattern is empty string Note that
+	 *         for pattern like "*abc*" with leading and trailing stars,
+	 *         position of "abc" is returned. For a pattern like"*??*" in text
+	 *         "abcdf", (1,3) is returned
+	 */
+	public StringMatcher.Position find(String text, int start, int end) {
+		if (text == null) {
 			throw new IllegalArgumentException();
 		}
 
-        int tlen = text.length();
-        if (start < 0) {
+		int tlen = text.length();
+		if (start < 0) {
 			start = 0;
 		}
-        if (end > tlen) {
+		if (end > tlen) {
 			end = tlen;
 		}
-        if (end < 0 || start >= end) {
+		if (end < 0 || start >= end) {
 			return null;
 		}
-        if (fLength == 0) {
+		if (fLength == 0) {
 			return new Position(start, start);
 		}
-        if (fIgnoreWildCards) {
-            int x = posIn(text, start, end);
-            if (x < 0) {
+		if (fIgnoreWildCards) {
+			int x = posIn(text, start, end);
+			if (x < 0) {
 				return null;
 			}
-            return new Position(x, x + fLength);
-        }
+			return new Position(x, x + fLength);
+		}
 
-        int segCount = fSegments.length;
-        if (segCount == 0) {
+		int segCount = fSegments.length;
+		if (segCount == 0) {
 			return new Position(start, end);
 		}
 
-        int curPos = start;
-        int matchStart = -1;
-        int i;
-        for (i = 0; i < segCount && curPos < end; ++i) {
-            String current = fSegments[i];
-            int nextMatch = regExpPosIn(text, curPos, end, current);
-            if (nextMatch < 0) {
+		int curPos = start;
+		int matchStart = -1;
+		int i;
+		for (i = 0; i < segCount && curPos < end; ++i) {
+			String current = fSegments[i];
+			int nextMatch = regExpPosIn(text, curPos, end, current);
+			if (nextMatch < 0) {
 				return null;
 			}
-            if (i == 0) {
+			if (i == 0) {
 				matchStart = nextMatch;
 			}
-            curPos = nextMatch + current.length();
-        }
-        if (i < segCount) {
+			curPos = nextMatch + current.length();
+		}
+		if (i < segCount) {
 			return null;
 		}
-        return new Position(matchStart, curPos);
-    }
-
-    /**
-     * match the given <code>text</code> with the pattern 
-     * @return true if matched otherwise false
-     * @param text a String object 
-     */
-    public boolean match(String text) {
-    	if(text == null) {
+		return new Position(matchStart, curPos);
+	}
+
+	/**
+	 * match the given <code>text</code> with the pattern
+	 * 
+	 * @return true if matched otherwise false
+	 * @param text
+	 *            a String object
+	 */
+	public boolean match(String text) {
+		if (text == null) {
 			return false;
 		}
-        return match(text, 0, text.length());
-    }
-
-    /**
-     * Given the starting (inclusive) and the ending (exclusive) positions in the   
-     * <code>text</code>, determine if the given substring matches with aPattern  
-     * @return true if the specified portion of the text matches the pattern
-     * @param text a String object that contains the substring to match 
-     * @param start marks the starting position (inclusive) of the substring
-     * @param end marks the ending index (exclusive) of the substring 
-     */
-    public boolean match(String text, int start, int end) {
-        if (null == text) {
+		return match(text, 0, text.length());
+	}
+
+	/**
+	 * Given the starting (inclusive) and the ending (exclusive) positions in
+	 * the <code>text</code>, determine if the given substring matches with
+	 * aPattern
+	 * 
+	 * @return true if the specified portion of the text matches the pattern
+	 * @param text
+	 *            a String object that contains the substring to match
+	 * @param start
+	 *            marks the starting position (inclusive) of the substring
+	 * @param end
+	 *            marks the ending index (exclusive) of the substring
+	 */
+	public boolean match(String text, int start, int end) {
+		if (null == text) {
 			throw new IllegalArgumentException();
 		}
 
-        if (start > end) {
+		if (start > end) {
 			return false;
 		}
 
-        if (fIgnoreWildCards) {
-			return (end - start == fLength)
-                    && fPattern.regionMatches(fIgnoreCase, 0, text, start,
-                            fLength);
+		if (fIgnoreWildCards) {
+			return (end - start == fLength) && fPattern.regionMatches(fIgnoreCase, 0, text, start, fLength);
 		}
-        int segCount = fSegments.length;
-        if (segCount == 0 && (fHasLeadingStar || fHasTrailingStar)) {
+		int segCount = fSegments.length;
+		if (segCount == 0 && (fHasLeadingStar || fHasTrailingStar)) {
 			return true;
 		}
-        if (start == end) {
+		if (start == end) {
 			return fLength == 0;
 		}
-        if (fLength == 0) {
+		if (fLength == 0) {
 			return start == end;
 		}
 
-        int tlen = text.length();
-        if (start < 0) {
+		int tlen = text.length();
+		if (start < 0) {
 			start = 0;
 		}
-        if (end > tlen) {
+		if (end > tlen) {
 			end = tlen;
 		}
 
-        int tCurPos = start;
-        int bound = end - fBound;
-        if (bound < 0) {
+		int tCurPos = start;
+		int bound = end - fBound;
+		if (bound < 0) {
 			return false;
 		}
-        int i = 0;
-        String current = fSegments[i];
-        int segLength = current.length();
-
-        /* process first segment */
-        if (!fHasLeadingStar) {
-            if (!regExpRegionMatches(text, start, current, 0, segLength)) {
-                return false;
-            } else {
-                ++i;
-                tCurPos = tCurPos + segLength;
-            }
-        }
-        if ((fSegments.length == 1) && (!fHasLeadingStar)
-                && (!fHasTrailingStar)) {
-            // only one segment to match, no wildcards specified
-            return tCurPos == end;
-        }
-        /* process middle segments */
-        while (i < segCount) {
-            current = fSegments[i];
-            int currentMatch;
-            int k = current.indexOf(fSingleWildCard);
-            if (k < 0) {
-                currentMatch = textPosIn(text, tCurPos, end, current);
-                if (currentMatch < 0) {
+		int i = 0;
+		String current = fSegments[i];
+		int segLength = current.length();
+
+		/* process first segment */
+		if (!fHasLeadingStar) {
+			if (!regExpRegionMatches(text, start, current, 0, segLength)) {
+				return false;
+			} else {
+				++i;
+				tCurPos = tCurPos + segLength;
+			}
+		}
+		if ((fSegments.length == 1) && (!fHasLeadingStar) && (!fHasTrailingStar)) {
+			// only one segment to match, no wildcards specified
+			return tCurPos == end;
+		}
+		/* process middle segments */
+		while (i < segCount) {
+			current = fSegments[i];
+			int currentMatch;
+			int k = current.indexOf(fSingleWildCard);
+			if (k < 0) {
+				currentMatch = textPosIn(text, tCurPos, end, current);
+				if (currentMatch < 0) {
 					return false;
 				}
-            } else {
-                currentMatch = regExpPosIn(text, tCurPos, end, current);
-                if (currentMatch < 0) {
+			} else {
+				currentMatch = regExpPosIn(text, tCurPos, end, current);
+				if (currentMatch < 0) {
 					return false;
 				}
-            }
-            tCurPos = currentMatch + current.length();
-            i++;
-        }
-
-        /* process final segment */
-        if (!fHasTrailingStar && tCurPos != end) {
-            int clen = current.length();
-            return regExpRegionMatches(text, end - clen, current, 0, clen);
-        }
-        return i == segCount;
-    }
-
-    /**
-     * This method parses the given pattern into segments seperated by wildcard '*' characters.
-     * Since wildcards are not being used in this case, the pattern consists of a single segment.
-     */
-    private void parseNoWildCards() {
-        fSegments = new String[1];
-        fSegments[0] = fPattern;
-        fBound = fLength;
-    }
-
-    /**
-     * Parses the given pattern into segments seperated by wildcard '*' characters.
-     * @param p, a String object that is a simple regular expression with '*' and/or '?'
-     */
-    private void parseWildCards() {
-        if (fPattern.startsWith("*")) { //$NON-NLS-1$
+			}
+			tCurPos = currentMatch + current.length();
+			i++;
+		}
+
+		/* process final segment */
+		if (!fHasTrailingStar && tCurPos != end) {
+			int clen = current.length();
+			return regExpRegionMatches(text, end - clen, current, 0, clen);
+		}
+		return i == segCount;
+	}
+
+	/**
+	 * This method parses the given pattern into segments seperated by wildcard
+	 * '*' characters. Since wildcards are not being used in this case, the
+	 * pattern consists of a single segment.
+	 */
+	private void parseNoWildCards() {
+		fSegments = new String[1];
+		fSegments[0] = fPattern;
+		fBound = fLength;
+	}
+
+	/**
+	 * Parses the given pattern into segments seperated by wildcard '*'
+	 * characters.
+	 * 
+	 * @param p
+	 *            , a String object that is a simple regular expression with '*'
+	 *            and/or '?'
+	 */
+	private void parseWildCards() {
+		if (fPattern.startsWith("*")) { //$NON-NLS-1$
 			fHasLeadingStar = true;
 		}
-        if (fPattern.endsWith("*")) {//$NON-NLS-1$
-            /* make sure it's not an escaped wildcard */
-            if (fLength > 1 && fPattern.charAt(fLength - 2) != '\\') {
-                fHasTrailingStar = true;
-            }
-        }
-
-        Vector<String> temp = new Vector<String>();
-
-        int pos = 0;
-        StringBuffer buf = new StringBuffer();
-        while (pos < fLength) {
-            char c = fPattern.charAt(pos++);
-            switch (c) {
-            case '\\':
-                if (pos >= fLength) {
-                    buf.append(c);
-                } else {
-                    char next = fPattern.charAt(pos++);
-                    /* if it's an escape sequence */
-                    if (next == '*' || next == '?' || next == '\\') {
-                        buf.append(next);
-                    } else {
-                        /* not an escape sequence, just insert literally */
-                        buf.append(c);
-                        buf.append(next);
-                    }
-                }
-                break;
-            case '*':
-                if (buf.length() > 0) {
-                    /* new segment */
-                    temp.addElement(buf.toString());
-                    fBound += buf.length();
-                    buf.setLength(0);
-                }
-                break;
-            case '?':
-                /* append special character representing single match wildcard */
-                buf.append(fSingleWildCard);
-                break;
-            default:
-                buf.append(c);
-            }
-        }
-
-        /* add last buffer to segment list */
-        if (buf.length() > 0) {
-            temp.addElement(buf.toString());
-            fBound += buf.length();
-        }
-
-        fSegments = new String[temp.size()];
-        temp.copyInto(fSegments);
-    }
-
-    /** 
-     * @param text a string which contains no wildcard
-     * @param start the starting index in the text for search, inclusive
-     * @param end the stopping point of search, exclusive
-     * @return the starting index in the text of the pattern , or -1 if not found 
-     */
-    protected int posIn(String text, int start, int end) {//no wild card in pattern
-        int max = end - fLength;
-
-        if (!fIgnoreCase) {
-            int i = text.indexOf(fPattern, start);
-            if (i == -1 || i > max) {
+		if (fPattern.endsWith("*")) {//$NON-NLS-1$
+			/* make sure it's not an escaped wildcard */
+			if (fLength > 1 && fPattern.charAt(fLength - 2) != '\\') {
+				fHasTrailingStar = true;
+			}
+		}
+
+		Vector<String> temp = new Vector<String>();
+
+		int pos = 0;
+		StringBuffer buf = new StringBuffer();
+		while (pos < fLength) {
+			char c = fPattern.charAt(pos++);
+			switch (c) {
+			case '\\':
+				if (pos >= fLength) {
+					buf.append(c);
+				} else {
+					char next = fPattern.charAt(pos++);
+					/* if it's an escape sequence */
+					if (next == '*' || next == '?' || next == '\\') {
+						buf.append(next);
+					} else {
+						/* not an escape sequence, just insert literally */
+						buf.append(c);
+						buf.append(next);
+					}
+				}
+				break;
+			case '*':
+				if (buf.length() > 0) {
+					/* new segment */
+					temp.addElement(buf.toString());
+					fBound += buf.length();
+					buf.setLength(0);
+				}
+				break;
+			case '?':
+				/* append special character representing single match wildcard */
+				buf.append(fSingleWildCard);
+				break;
+			default:
+				buf.append(c);
+			}
+		}
+
+		/* add last buffer to segment list */
+		if (buf.length() > 0) {
+			temp.addElement(buf.toString());
+			fBound += buf.length();
+		}
+
+		fSegments = new String[temp.size()];
+		temp.copyInto(fSegments);
+	}
+
+	/**
+	 * @param text
+	 *            a string which contains no wildcard
+	 * @param start
+	 *            the starting index in the text for search, inclusive
+	 * @param end
+	 *            the stopping point of search, exclusive
+	 * @return the starting index in the text of the pattern , or -1 if not
+	 *         found
+	 */
+	protected int posIn(String text, int start, int end) {// no wild card in
+															// pattern
+		int max = end - fLength;
+
+		if (!fIgnoreCase) {
+			int i = text.indexOf(fPattern, start);
+			if (i == -1 || i > max) {
 				return -1;
 			}
-            return i;
-        }
+			return i;
+		}
 
-        for (int i = start; i <= max; ++i) {
-            if (text.regionMatches(true, i, fPattern, 0, fLength)) {
+		for (int i = start; i <= max; ++i) {
+			if (text.regionMatches(true, i, fPattern, 0, fLength)) {
 				return i;
 			}
-        }
-
-        return -1;
-    }
-
-    /** 
-     * @param text a simple regular expression that may only contain '?'(s)
-     * @param start the starting index in the text for search, inclusive
-     * @param end the stopping point of search, exclusive
-     * @param p a simple regular expression that may contains '?'
-     * @return the starting index in the text of the pattern , or -1 if not found 
-     */
-    protected int regExpPosIn(String text, int start, int end, String p) {
-        int plen = p.length();
-
-        int max = end - plen;
-        for (int i = start; i <= max; ++i) {
-            if (regExpRegionMatches(text, i, p, 0, plen)) {
+		}
+
+		return -1;
+	}
+
+	/**
+	 * @param text
+	 *            a simple regular expression that may only contain '?'(s)
+	 * @param start
+	 *            the starting index in the text for search, inclusive
+	 * @param end
+	 *            the stopping point of search, exclusive
+	 * @param p
+	 *            a simple regular expression that may contains '?'
+	 * @return the starting index in the text of the pattern , or -1 if not
+	 *         found
+	 */
+	protected int regExpPosIn(String text, int start, int end, String p) {
+		int plen = p.length();
+
+		int max = end - plen;
+		for (int i = start; i <= max; ++i) {
+			if (regExpRegionMatches(text, i, p, 0, plen)) {
 				return i;
 			}
-        }
-        return -1;
-    }
-
-    /**
-     * 
-     * @return boolean
-     * @param text a String to match
-     * @param start int that indicates the starting index of match, inclusive
-     * @param end</code> int that indicates the ending index of match, exclusive
-     * @param p String,  String, a simple regular expression that may contain '?'
-     * @param ignoreCase boolean indicating wether code>p</code> is case sensitive
-     */
-    protected boolean regExpRegionMatches(String text, int tStart, String p,
-            int pStart, int plen) {
-        while (plen-- > 0) {
-            char tchar = text.charAt(tStart++);
-            char pchar = p.charAt(pStart++);
-
-            /* process wild cards */
-            if (!fIgnoreWildCards) {
-                /* skip single wild cards */
-                if (pchar == fSingleWildCard) {
-                    continue;
-                }
-            }
-            if (pchar == tchar) {
+		}
+		return -1;
+	}
+
+	/**
+	 * 
+	 * @return boolean
+	 * @param text
+	 *            a String to match
+	 * @param start
+	 *            int that indicates the starting index of match, inclusive
+	 * @param end
+	 *            </code> int that indicates the ending index of match,
+	 *            exclusive
+	 * @param p
+	 *            String, String, a simple regular expression that may contain
+	 *            '?'
+	 * @param ignoreCase
+	 *            boolean indicating wether code>p</code> is case sensitive
+	 */
+	protected boolean regExpRegionMatches(String text, int tStart, String p, int pStart, int plen) {
+		while (plen-- > 0) {
+			char tchar = text.charAt(tStart++);
+			char pchar = p.charAt(pStart++);
+
+			/* process wild cards */
+			if (!fIgnoreWildCards) {
+				/* skip single wild cards */
+				if (pchar == fSingleWildCard) {
+					continue;
+				}
+			}
+			if (pchar == tchar) {
 				continue;
 			}
-            if (fIgnoreCase) {
-                if (Character.toUpperCase(tchar) == Character
-                        .toUpperCase(pchar)) {
+			if (fIgnoreCase) {
+				if (Character.toUpperCase(tchar) == Character.toUpperCase(pchar)) {
 					continue;
 				}
-                // comparing after converting to upper case doesn't handle all cases;
-                // also compare after converting to lower case
-                if (Character.toLowerCase(tchar) == Character
-                        .toLowerCase(pchar)) {
+				// comparing after converting to upper case doesn't handle all
+				// cases;
+				// also compare after converting to lower case
+				if (Character.toLowerCase(tchar) == Character.toLowerCase(pchar)) {
 					continue;
 				}
-            }
-            return false;
-        }
-        return true;
-    }
-
-    /** 
-     * @param text the string to match
-     * @param start the starting index in the text for search, inclusive
-     * @param end the stopping point of search, exclusive
-     * @param p a pattern string that has no wildcard
-     * @return the starting index in the text of the pattern , or -1 if not found 
-     */
-    protected int textPosIn(String text, int start, int end, String p) {
-
-        int plen = p.length();
-        int max = end - plen;
-
-        if (!fIgnoreCase) {
-            int i = text.indexOf(p, start);
-            if (i == -1 || i > max) {
+			}
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * @param text
+	 *            the string to match
+	 * @param start
+	 *            the starting index in the text for search, inclusive
+	 * @param end
+	 *            the stopping point of search, exclusive
+	 * @param p
+	 *            a pattern string that has no wildcard
+	 * @return the starting index in the text of the pattern , or -1 if not
+	 *         found
+	 */
+	protected int textPosIn(String text, int start, int end, String p) {
+
+		int plen = p.length();
+		int max = end - plen;
+
+		if (!fIgnoreCase) {
+			int i = text.indexOf(p, start);
+			if (i == -1 || i > max) {
 				return -1;
 			}
-            return i;
-        }
+			return i;
+		}
 
-        for (int i = start; i <= max; ++i) {
-            if (text.regionMatches(true, i, p, 0, plen)) {
+		for (int i = start; i <= max; ++i) {
+			if (text.regionMatches(true, i, p, 0, plen)) {
 				return i;
 			}
-        }
+		}
 
-        return -1;
-    }
+		return -1;
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
index f4e134c453..3db082a5d8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
@@ -103,7 +103,7 @@ public Object convert(Object fromObject) {
 
 	/*
 	 * (non-Javadoc)
-	 *
+	 * 
 	 * @see
 	 * org.eclipse.core.databinding.UpdateValueStrategy#doSet(org.eclipse.core
 	 * .databinding.observable.value.IObservableValue, java.lang.Object)
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
index abce02f93e..0583f21525 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Steven Spungin <steven@spungin.tv> - Bug 424730
-******************************************************************************/
+ ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IProject;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
index 50e129ae7c..63f6957345 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
@@ -104,7 +104,8 @@ private String toXMI(EObject root) {
 
 	/**
 	 * @param object
-	 * @return The region for the start tag of the EObject, or null if not found.
+	 * @return The region for the start tag of the EObject, or null if not
+	 *         found.
 	 */
 	public IRegion findStartTag(EObject object) {
 		if (object == null) {
@@ -116,7 +117,8 @@ public IRegion findStartTag(EObject object) {
 		FindReplaceDocumentAdapter find = new FindReplaceDocumentAdapter(document);
 		IRegion region;
 		try {
-			//TODO This will not work if the element has '<' or '>' in an attribute value
+			// TODO This will not work if the element has '<' or '>' in an
+			// attribute value
 			region = find.find(0, "<.*?" + xmiId + ".*?>", true, true, false, true); //$NON-NLS-1$ //$NON-NLS-2$
 			return region;
 		} catch (BadLocationException e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java
index b3726387e5..a331cbf7f7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java
@@ -23,14 +23,16 @@
 import org.eclipse.jface.text.presentation.IPresentationRepairer;
 import org.eclipse.swt.custom.StyleRange;
 
-public class NonRuleBasedDamagerRepairer
-	implements IPresentationDamager, IPresentationRepairer {
+public class NonRuleBasedDamagerRepairer implements IPresentationDamager, IPresentationRepairer {
 
 	/** The document this object works on */
 	protected IDocument fDocument;
-	/** The default text attribute if non is returned as data by the current token */
+	/**
+	 * The default text attribute if non is returned as data by the current
+	 * token
+	 */
 	protected TextAttribute fDefaultTextAttribute;
-	
+
 	/**
 	 * Constructor for NonRuleBasedDamagerRepairer.
 	 */
@@ -50,11 +52,14 @@ public void setDocument(IDocument document) {
 
 	/**
 	 * Returns the end offset of the line that contains the specified offset or
-	 * if the offset is inside a line delimiter, the end offset of the next line.
+	 * if the offset is inside a line delimiter, the end offset of the next
+	 * line.
 	 *
-	 * @param offset the offset whose line end offset must be computed
+	 * @param offset
+	 *            the offset whose line end offset must be computed
 	 * @return the line end offset for the given offset
-	 * @exception BadLocationException if offset is invalid in the current document
+	 * @exception BadLocationException
+	 *                if offset is invalid in the current document
 	 */
 	protected int endOfLineOf(int offset) throws BadLocationException {
 
@@ -72,37 +77,26 @@ protected int endOfLineOf(int offset) throws BadLocationException {
 	}
 
 	/**
-	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
+	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent,
+	 *      boolean)
 	 */
 	@Override
-	public IRegion getDamageRegion(
-		ITypedRegion partition,
-		DocumentEvent event,
-		boolean documentPartitioningChanged) {
+	public IRegion getDamageRegion(ITypedRegion partition, DocumentEvent event, boolean documentPartitioningChanged) {
 		if (!documentPartitioningChanged) {
 			try {
 
-				IRegion info =
-					fDocument.getLineInformationOfOffset(event.getOffset());
+				IRegion info = fDocument.getLineInformationOfOffset(event.getOffset());
 				int start = Math.max(partition.getOffset(), info.getOffset());
 
-				int end =
-					event.getOffset()
-						+ (event.getText() == null
-							? event.getLength()
-							: event.getText().length());
+				int end = event.getOffset() + (event.getText() == null ? event.getLength() : event.getText().length());
 
-				if (info.getOffset() <= end
-					&& end <= info.getOffset() + info.getLength()) {
+				if (info.getOffset() <= end && end <= info.getOffset() + info.getLength()) {
 					// optimize the case of the same line
 					end = info.getOffset() + info.getLength();
 				} else
 					end = endOfLineOf(end);
 
-				end =
-					Math.min(
-						partition.getOffset() + partition.getLength(),
-						end);
+				end = Math.min(partition.getOffset() + partition.getLength(), end);
 				return new Region(start, end - start);
 
 			} catch (BadLocationException x) {
@@ -113,39 +107,28 @@ public IRegion getDamageRegion(
 	}
 
 	/**
-	 * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion)
+	 * @see IPresentationRepairer#createPresentation(TextPresentation,
+	 *      ITypedRegion)
 	 */
 	@Override
-	public void createPresentation(
-		TextPresentation presentation,
-		ITypedRegion region) {
-		addRange(
-			presentation,
-			region.getOffset(),
-			region.getLength(),
-			fDefaultTextAttribute);
+	public void createPresentation(TextPresentation presentation, ITypedRegion region) {
+		addRange(presentation, region.getOffset(), region.getLength(), fDefaultTextAttribute);
 	}
 
 	/**
 	 * Adds style information to the given text presentation.
 	 *
-	 * @param presentation the text presentation to be extended
-	 * @param offset the offset of the range to be styled
-	 * @param length the length of the range to be styled
-	 * @param attr the attribute describing the style of the range to be styled
+	 * @param presentation
+	 *            the text presentation to be extended
+	 * @param offset
+	 *            the offset of the range to be styled
+	 * @param length
+	 *            the length of the range to be styled
+	 * @param attr
+	 *            the attribute describing the style of the range to be styled
 	 */
-	protected void addRange(
-		TextPresentation presentation,
-		int offset,
-		int length,
-		TextAttribute attr) {
+	protected void addRange(TextPresentation presentation, int offset, int length, TextAttribute attr) {
 		if (attr != null)
-			presentation.addStyleRange(
-				new StyleRange(
-					offset,
-					length,
-					attr.getForeground(),
-					attr.getBackground(),
-					attr.getStyle()));
+			presentation.addStyleRange(new StyleRange(offset, length, attr.getForeground(), attr.getBackground(), attr.getStyle()));
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java
index 5aae88439c..6f05a9b6ef 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java
@@ -31,6 +31,7 @@ public void doubleClicked(ITextViewer part) {
 			selectWord(pos);
 		}
 	}
+
 	protected boolean selectComment(int caretPos) {
 		IDocument doc = fText.getDocument();
 		int startPos, endPos;
@@ -79,6 +80,7 @@ protected boolean selectComment(int caretPos) {
 
 		return false;
 	}
+
 	protected boolean selectWord(int caretPos) {
 
 		IDocument doc = fText.getDocument();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryStruct.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryStruct.java
index 09dc6fa9d8..2ba95e8412 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryStruct.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryStruct.java
@@ -7,8 +7,7 @@ public class RegistryStruct {
 	String extensionPointName;
 	String mappingName;
 
-	public RegistryStruct(String bundle, String extensionPoint,
-			String extensionPointName, String mappingName) {
+	public RegistryStruct(String bundle, String extensionPoint, String extensionPointName, String mappingName) {
 		super();
 		this.bundle = bundle;
 		this.extensionPoint = extensionPoint;

From 9a96a6782e984da308be78189566bca45f8ffa3e Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Thu, 18 Sep 2014 11:11:38 +0200
Subject: [PATCH 0809/1286] Bug 444340 - Externalize Strings - Refactored
 Plugin ID to a constant

---
 .../tools/emf/ui/common/ContributionURIValidator.java | 11 +++++------
 .../org/eclipse/e4/tools/emf/ui/internal/Plugin.java  |  6 ++++++
 .../tools/emf/ui/internal/PreferenceInitializer.java  |  2 +-
 .../e4/tools/emf/ui/internal/common/ModelEditor.java  |  7 ++++---
 .../internal/common/component/KeyBindingEditor.java   | 11 ++++++-----
 .../dialogs/SaveDialogBoundsSettingsDialog.java       |  7 +++----
 .../ui/internal/common/component/tabs/ListTab.java    |  9 +++++----
 .../dialogs/NonReferencedActionPage.java              |  3 ++-
 .../dialogs/NonReferencedResourceDialog.java          |  5 +++--
 9 files changed, 35 insertions(+), 26 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Plugin.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
index ae3d97b1e1..000a715dbb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
@@ -13,26 +13,25 @@
 import org.eclipse.core.databinding.validation.IValidator;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.e4.tools.emf.ui.internal.Plugin;
 import org.eclipse.emf.common.util.URI;
 
 public class ContributionURIValidator implements IValidator {
 
-	private static final String PLUGIN_ID = "org.eclipse.e4.tools.emf.ui";
-
 	@Override
 	public IStatus validate(Object value) {
 		if (value == null) {
-			return new Status(IStatus.ERROR, PLUGIN_ID, "The URI must not be empty!");
+			return new Status(IStatus.ERROR, Plugin.ID, "The URI must not be empty!");
 		} else if (!value.toString().startsWith("bundleclass:")) {
-			return new Status(IStatus.ERROR, PLUGIN_ID, "The URI has to start with 'platform:/plugin'");
+			return new Status(IStatus.ERROR, Plugin.ID, "The URI has to start with 'platform:/plugin'");
 		} else {
 			try {
 				URI uri = URI.createURI(value.toString());
 				if (uri.authority() == null || uri.authority().length() == 0 || uri.segmentCount() != 1) {
-					return new Status(IStatus.ERROR, PLUGIN_ID, "The uri has to have the format 'bundleclass://$$bundleId$$/$$className$$'");
+					return new Status(IStatus.ERROR, Plugin.ID, "The uri has to have the format 'bundleclass://$$bundleId$$/$$className$$'");
 				}
 			} catch (Exception e) {
-				return new Status(IStatus.ERROR, PLUGIN_ID, e.getMessage());
+				return new Status(IStatus.ERROR, Plugin.ID, e.getMessage());
 			}
 
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Plugin.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Plugin.java
new file mode 100644
index 0000000000..42a2ee643a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Plugin.java
@@ -0,0 +1,6 @@
+package org.eclipse.e4.tools.emf.ui.internal;
+
+public interface Plugin {
+
+	public static final String ID = "org.eclipse.e4.tools.emf.ui"; //$NON-NLS-1$
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
index e3d8143416..958f77530d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
@@ -16,7 +16,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
 
 	@Override
 	public void initializeDefaultPreferences() {
-		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode("org.eclipse.e4.tools.emf.ui"); //$NON-NLS-1$
+		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(Plugin.ID); //$NON-NLS-1$
 
 		if (pref.get("notRenderedColor", null) == null) { //$NON-NLS-1$
 			String val = StringConverter.asString(new RGB(200, 200, 200));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 1734293c98..3e955a4e52 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -63,6 +63,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
+import org.eclipse.e4.tools.emf.ui.internal.Plugin;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.AddonsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ApplicationEditor;
@@ -291,15 +292,15 @@ public class ModelEditor implements IGotoObject {
 	private IClipboardService clipboardService;
 
 	@Inject
-	@Preference(nodePath = "org.eclipse.e4.tools.emf.ui", value = "autoCreateElementId")
+	@Preference(nodePath = Plugin.ID, value = "autoCreateElementId")
 	private boolean autoCreateElementId;
 
 	@Inject
-	@Preference(nodePath = "org.eclipse.e4.tools.emf.ui", value = "showXMIId")
+	@Preference(nodePath = Plugin.ID, value = "showXMIId")
 	private boolean showXMIId;
 
 	@Inject
-	@Preference(nodePath = "org.eclipse.e4.tools.emf.ui")
+	@Preference(nodePath = Plugin.ID)
 	IEclipsePreferences preferences;
 
 	@Inject
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 8eb61b521d..f94341bbdb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -26,6 +26,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Plugin;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
@@ -359,22 +360,22 @@ public IStatus validate(Object value) {
 				try {
 					KeySequence keySequence = KeySequence.getInstance(value.toString());
 					if (!keySequence.isComplete()) {
-						return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", Messages.KeyBindingEditor_SequenceNotComplete); //$NON-NLS-1$
+						return new Status(statusCode, Plugin.ID, Messages.KeyBindingEditor_SequenceNotComplete); //$NON-NLS-1$
 					}
 					if (keySequence.isEmpty()) {
-						return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", Messages.KeyBindingEditor_SequenceEmpty); //$NON-NLS-1$
+						return new Status(statusCode, Plugin.ID, Messages.KeyBindingEditor_SequenceEmpty); //$NON-NLS-1$
 					}
 					if (!value.toString().toUpperCase().equals(value.toString())) {
-						return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", Messages.KeyBindingEditor_SequenceLowercase); //$NON-NLS-1$
+						return new Status(IStatus.ERROR, Plugin.ID, Messages.KeyBindingEditor_SequenceLowercase); //$NON-NLS-1$
 					}
 
 					return Status.OK_STATUS;
 				} catch (Exception e) {
-					return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", e.getMessage(), e); //$NON-NLS-1$
+					return new Status(statusCode, Plugin.ID, e.getMessage(), e); //$NON-NLS-1$
 				}
 			}
 
-			return new Status(statusCode, "org.eclipse.e4.tools.emf.ui", Messages.KeyBindingEditor_SequenceEmpty); //$NON-NLS-1$
+			return new Status(statusCode, Plugin.ID, Messages.KeyBindingEditor_SequenceEmpty); //$NON-NLS-1$
 		}
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
index 01db113dff..37f9dc2ea4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
@@ -12,6 +12,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.e4.tools.emf.ui.internal.Plugin;
 import org.eclipse.jface.dialogs.DialogSettings;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
@@ -21,16 +22,14 @@
 
 public abstract class SaveDialogBoundsSettingsDialog extends TitleAreaDialog {
 
-	private static final String ORG_ECLIPSE_E4_TOOLS_EMF_UI = "org.eclipse.e4.tools.emf.ui"; //$NON-NLS-1$
-
 	private static final String DIALOG_ORIGIN_X = "DIALOG_X_ORIGIN"; //$NON-NLS-1$
 	private static final String DIALOG_ORIGIN_Y = "DIALOG_Y_ORIGIN"; //$NON-NLS-1$
 	private static final String DIALOG_WIDTH = "DIALOG_WIDTH"; //$NON-NLS-1$
 	private static final String DIALOG_HEIGHT = "DIALOG_HEIGHT"; //$NON-NLS-1$
 
-	private IDialogSettings dialogSettings = new DialogSettings(ORG_ECLIPSE_E4_TOOLS_EMF_UI);
+	private IDialogSettings dialogSettings = new DialogSettings(Plugin.ID);
 
-	private Preferences preferences = InstanceScope.INSTANCE.getNode(ORG_ECLIPSE_E4_TOOLS_EMF_UI);
+	private Preferences preferences = InstanceScope.INSTANCE.getNode(Plugin.ID);
 
 	public SaveDialogBoundsSettingsDialog(Shell parentShell) {
 		super(parentShell);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index c779244bd0..f88d04f13d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -41,6 +41,7 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.Plugin;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
@@ -173,7 +174,7 @@ public void preDestroy() {
 
 	// save custom column and filter settings
 	public void saveSettings() {
-		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode("org.eclipse.e4.tools.emf.ui"); //$NON-NLS-1$
+		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(Plugin.ID); //$NON-NLS-1$
 		try {
 			Document doc = DocUtil.createDocument("list-tab"); //$NON-NLS-1$
 			Element cols = DocUtil.createChild(doc.getDocumentElement(), "columns"); //$NON-NLS-1$
@@ -236,7 +237,7 @@ private void saveColumn(Element eleCols, String columnName, TableColumn objCol)
 
 	// load custom column and filter settings
 	private void loadSettings() {
-		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode("org.eclipse.e4.tools.emf.ui"); //$NON-NLS-1$
+		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(Plugin.ID); //$NON-NLS-1$
 
 		boolean restoreColumns = pref.getBoolean("list-tab-remember-columns", false); //$NON-NLS-1$
 		boolean restoreFilters = pref.getBoolean("list-tab-remember-filters", false); //$NON-NLS-1$
@@ -352,7 +353,7 @@ public void widgetDisposed(DisposeEvent e) {
 			}
 		});
 		try {
-			imgMarkedItem = imageCache.create("org.eclipse.e4.tools.emf.ui", "/icons/full/obj16/mark_occurrences.png"); //$NON-NLS-1$//$NON-NLS-2$
+			imgMarkedItem = imageCache.create(Plugin.ID, "/icons/full/obj16/mark_occurrences.png"); //$NON-NLS-1$//$NON-NLS-2$
 		} catch (Exception e2) {
 			e2.printStackTrace();
 		}
@@ -741,7 +742,7 @@ protected Control createContents(Composite parent) {
 				Control ret = super.createContents(parent);
 				setMessage(Messages.ListTab_selectAnAttribute);
 				try {
-					setTitleImage(imageCache.create("org.eclipse.e4.tools.emf.ui", "/icons/full/wizban/attribute_wiz.gif")); //$NON-NLS-1$ //$NON-NLS-2$
+					setTitleImage(imageCache.create(Plugin.ID, "/icons/full/wizban/attribute_wiz.gif")); //$NON-NLS-1$ //$NON-NLS-2$
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
index ba15ca37b3..3075c5f06e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
@@ -26,6 +26,7 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
+import org.eclipse.e4.tools.emf.ui.internal.Plugin;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionDataFile;
@@ -77,7 +78,7 @@ protected NonReferencedActionPage(IProject project, String bundle, IFile file, S
 
 		imageCache = context.get(BundleImageCache.class);
 
-		setImageDescriptor(ImageDescriptor.createFromImage(imageCache.create("org.eclipse.e4.tools.emf.ui", "/icons/full/wizban/newefix_wizban.png"))); //$NON-NLS-1$ //$NON-NLS-2$
+		setImageDescriptor(ImageDescriptor.createFromImage(imageCache.create(Plugin.ID, "/icons/full/wizban/newefix_wizban.png"))); //$NON-NLS-1$ //$NON-NLS-2$
 
 		if (bundle == null && installLocation != null) {
 			this.bundle = FilteredContributionDialog.getBundle(installLocation);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
index 56b157cc5f..7c8cf61d7a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
@@ -26,6 +26,7 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
+import org.eclipse.e4.tools.emf.ui.internal.Plugin;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionDataFile;
@@ -413,7 +414,7 @@ public void widgetDisposed(DisposeEvent e) {
 		setTitle(Messages.NonReferencedResourceDialog_resourceReferenceWarning);
 		getShell().setText(Messages.NonReferencedResourceDialog_resourceReferenceWarning);
 		try {
-			setTitleImage(imageCache.create("org.eclipse.e4.tools.emf.ui", "/icons/full/wizban/newefix_wizban.png")); //$NON-NLS-1$ //$NON-NLS-2$
+			setTitleImage(imageCache.create(Plugin.ID, "/icons/full/wizban/newefix_wizban.png")); //$NON-NLS-1$ //$NON-NLS-2$
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -431,7 +432,7 @@ public void copyResourceToProject(IProject project) {
 				protected Control createContents(Composite parent) {
 					Control ret = super.createContents(parent);
 					setMessage(Messages.NonReferencedResourceDialog_selectTheFolderResourceCopy);
-					setTitleImage(imageCache.create("org.eclipse.e4.tools.emf.ui", "/icons/full/wizban/add_to_dir_wiz.png")); //$NON-NLS-1$ //$NON-NLS-2$
+					setTitleImage(imageCache.create(Plugin.ID, "/icons/full/wizban/add_to_dir_wiz.png")); //$NON-NLS-1$ //$NON-NLS-2$
 
 					return ret;
 				}

From 7fe5d33917c69f753588a77858c4156929cdc550 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Thu, 18 Sep 2014 12:40:31 +0200
Subject: [PATCH 0810/1286] Bug 444340 - Externalize Strings

---
 .../ui/common/ContributionURIValidator.java   |  9 ++-
 .../e4/tools/emf/ui/internal/Messages.java    | 40 +++++++++
 .../tools/emf/ui/internal/Messages.properties | 37 +++++++++
 .../ui/internal/PreferenceInitializer.java    |  2 +-
 .../component/dialogs/AbstractIconDialog.java |  6 +-
 .../AbstractIconDialogWithHardcodedScope.java |  8 +-
 .../dialogs/AreaIconDialogEditor.java         |  4 +-
 .../dialogs/ContributionDataFile.java         |  2 +-
 .../dialogs/FilteredContributionDialog.java   | 81 ++++++++++---------
 .../xml/EMFDocumentResourceMediator.java      |  2 +-
 10 files changed, 134 insertions(+), 57 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
index 000a715dbb..3c7b837504 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
@@ -13,6 +13,7 @@
 import org.eclipse.core.databinding.validation.IValidator;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.Plugin;
 import org.eclipse.emf.common.util.URI;
 
@@ -21,14 +22,14 @@ public class ContributionURIValidator implements IValidator {
 	@Override
 	public IStatus validate(Object value) {
 		if (value == null) {
-			return new Status(IStatus.ERROR, Plugin.ID, "The URI must not be empty!");
-		} else if (!value.toString().startsWith("bundleclass:")) {
-			return new Status(IStatus.ERROR, Plugin.ID, "The URI has to start with 'platform:/plugin'");
+			return new Status(IStatus.ERROR, Plugin.ID, Messages.ContributionURIValidator_No_Empty_URI);
+		} else if (!value.toString().startsWith("bundleclass:")) { //$NON-NLS-1$
+			return new Status(IStatus.ERROR, Plugin.ID, Messages.ContributionURIValidator_URI_starts_with_platform);
 		} else {
 			try {
 				URI uri = URI.createURI(value.toString());
 				if (uri.authority() == null || uri.authority().length() == 0 || uri.segmentCount() != 1) {
-					return new Status(IStatus.ERROR, Plugin.ID, "The uri has to have the format 'bundleclass://$$bundleId$$/$$className$$'");
+					return new Status(IStatus.ERROR, Plugin.ID, Messages.ContributionURIValidator_Malformed_URI);
 				}
 			} catch (Exception e) {
 				return new Status(IStatus.ERROR, Plugin.ID, e.getMessage());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 622dfba090..b1976f3e1e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -9,11 +9,50 @@
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Marco Descher <marco@descher.at> - Bug 395982, 396975, 426653
  *     Steven Spungin <steven@spungin.tv> - Bug 431735, 430717
+ *     Jonas Helming <jhelming@eclipsesource.com - Bug 444340
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
 public class Messages {
 
+	public static String FilteredContributionDialog_SearchWasCancelled;
+	public static String FilteredContributionDialog_MoreThan;
+	public static String FilteredContributionDialog_itemsWereFound;
+	public static String FilteredContributionDialog_ProviderInitializing;
+	public static String FilteredContributionDialog_ProviderWasCancelled;
+	public static String FilteredContributionDialog_ClearCache;
+	public static String FilteredContributionDialog_ContributionSearch;
+	public static String FilteredContributionDialog_Scope;
+	public static String FilteredContributionDialog_ProjectOnly;
+	public static String FilteredContributionDialog_ProjectAndReferences;
+	public static String FilteredContributionDialog_Workspace;
+	public static String FilteredContributionDialog_TargetPlatform;
+	public static String FilteredContributionDialog_ScopeFilter;
+	public static String FilteredContributionDialog_None;
+	public static String FilteredContributionDialog_Package;
+	public static String FilteredContributionDialog_Location;
+	public static String FilteredContributionDialog_NonBundles;
+	public static String FilteredContributionDialog_SelectTheBundle;
+	public static String FilteredContributionDialog_SelectThePackage;
+	public static String FilteredContributionDialog_PackageFilter;
+	public static String FilteredContributionDialog_SelectTheLocation;
+	public static String FilteredContributionDialog_LocationFilter;
+	public static String FilteredContributionDialog_Java;
+	public static String FilteredContributionDialog_ResourceIsNotContainedInABundle;
+	public static String FilteredContributionDialog_ResourceIsNotReferencedByThisBundle;
+	public static String FilteredContributionDialog_Bundle;
+	public static String FilteredContributionDialog_BundleFilter;
+	public static String FilteredContributionDialog_Searching;
+	public String AreaIconDialogEditor_Icon;
+	public String AreaIconDialogEditor_Enter_Text;
+	public String AbstractIconDialogWithHardcodedScope_Project;
+	public String AbstractIconDialogWithHardcodedScope_Workspace;
+	public String AbstractIconDialog_Icon_Name;
+	public String AbstractIconDialog_Type_To_Start_Search;
+	public static String ContributionURIValidator_Malformed_URI;
+	public static String ContributionURIValidator_No_Empty_URI;
+	public static String ContributionURIValidator_URI_starts_with_platform;
+
 	public String ModelTooling_Empty_Warning;
 	public String ModelTooling_Common_Up;
 	public String ModelTooling_Common_Down;
@@ -712,4 +751,5 @@ public class Messages {
 	public String CompositePartEditor_Tooltip;
 	public String CompositePartEditor_IconURI;
 	public String CompositePartEditor_IconURI_Tooltip;
+
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index f41c3c3342..913848753a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -295,6 +295,9 @@ ContributionClassDialog_DialogTitle=Find Contribution Class
 ContributionClassDialog_Label_Classname=Class Name
 ContributionClassDialog_FilterText_Message=Type to start search
 ContributionClassDialog_ShellTitle=Find Contribution Class
+ContributionURIValidator_Malformed_URI=The uri has to have the format 'bundleclass://$$bundleId$$/$$className$$'
+ContributionURIValidator_No_Empty_URI=The URI must not be empty\!
+ContributionURIValidator_URI_starts_with_platform=The URI has to start with 'bundleclass://'
 
 MenuContributionEditor_MenuItems=Menu Items
 MenuContributionEditor_MenuItemType=Type
@@ -497,8 +500,12 @@ VWindowTrimEditor_TreeLabelDescription=Window Trims Bla Bla Bla Bla Bla
 VWindowTrimEditor_Controls=Controls
 VWindowTrimEditor_AddWindowTrim=Window Trim
 
+AbstractIconDialog_Icon_Name=Icon Name
 AbstractIconDialog_IconName=IconName
+AbstractIconDialog_Type_To_Start_Search=Type to start search
 
+AbstractIconDialogWithHardcodedScope_Project=Project
+AbstractIconDialogWithHardcodedScope_Workspace=Workspace
 AbstractIconDialogWithScopeAndFilter_details=Details
 AbstractIconDialogWithScopeAndFilter_icon=Icon
 AbstractIconDialogWithScopeAndFilter_iconName=Icon Name
@@ -514,6 +521,34 @@ CommandCategorySelectionDialog_ShellTitle=Command Category Dialog
 CommandCategorySelectionDialog_Title=Command Category
 CommandCategorySelectionDialog_Message=Search for a Command Category
 
+FilteredContributionDialog_Bundle=Bundle
+FilteredContributionDialog_BundleFilter=Bundle Filter
+FilteredContributionDialog_ClearCache=Clear Model Cache
+FilteredContributionDialog_ContributionSearch=Contribution Search
+FilteredContributionDialog_itemsWereFound=\ items were found.  Not all results have been displayed.\n
+FilteredContributionDialog_Java=Java
+FilteredContributionDialog_Location=Location
+FilteredContributionDialog_LocationFilter=Location Filter
+FilteredContributionDialog_MoreThan=More than 
+FilteredContributionDialog_NonBundles=Non Bundles
+FilteredContributionDialog_None=None
+FilteredContributionDialog_Package=Package
+FilteredContributionDialog_PackageFilter=Package Filter
+FilteredContributionDialog_ProjectAndReferences=Project and References
+FilteredContributionDialog_ProjectOnly=Project Only
+FilteredContributionDialog_ProviderInitializing=The provider is initializing.  Results will refresh when complete.
+FilteredContributionDialog_ProviderWasCancelled=The provider was cancelled while initializing.  Results may be incomplete.
+FilteredContributionDialog_ResourceIsNotContainedInABundle=The selected resource is not contained in a bundle.
+FilteredContributionDialog_ResourceIsNotReferencedByThisBundle=The selected resource's bundle is not referenced by this bundle.
+FilteredContributionDialog_Scope=Scope
+FilteredContributionDialog_ScopeFilter=Scope Filter
+FilteredContributionDialog_Searching=Searching...\n
+FilteredContributionDialog_SearchWasCancelled=The search was cancelled.  Not all results may have been displayed.\n
+FilteredContributionDialog_SelectTheBundle=Select the bundle to filter on.
+FilteredContributionDialog_SelectTheLocation=Select the location to filter on.
+FilteredContributionDialog_SelectThePackage=Select the package to filter on.
+FilteredContributionDialog_TargetPlatform=Target Platform
+FilteredContributionDialog_Workspace=Workspace
 FindImportElementDialog_ShellTitle=Find Import Elements
 FindImportElementDialog_Title=Find Import Elements
 FindImportElementDialog_Message=Search for an elements whose ID you'd like to import
@@ -637,6 +672,8 @@ AreaEditor_IconURI=Icon URI
 AreaIconDialogEditor_ShellTitle=Area Icon Search
 AreaIconDialogEditor_DialogTitle=Area Icon Search
 AreaIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
+AreaIconDialogEditor_Enter_Text=Enter text
+AreaIconDialogEditor_Icon=Icon
 
 ModelEditor_Delete=Remove
 ModelEditor_ExpandSubtree=Expand/Collapse (CTRL + Mouse)
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
index 958f77530d..aff3e13890 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
@@ -16,7 +16,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
 
 	@Override
 	public void initializeDefaultPreferences() {
-		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(Plugin.ID); //$NON-NLS-1$
+		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(Plugin.ID);
 
 		if (pref.get("notRenderedColor", null) == null) { //$NON-NLS-1$
 			String val = StringConverter.asString(new RGB(200, 200, 200));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
index 4de500e544..b6e9aef66e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
@@ -22,7 +22,6 @@
 import org.eclipse.swt.widgets.Shell;
 
 public abstract class AbstractIconDialog extends AbstractIconDialogWithScopeAndFilter {
-	private IProject project;
 	private MApplicationElement element;
 	private EStructuralFeature feature;
 	private EditingDomain editingDomain;
@@ -36,19 +35,18 @@ public AbstractIconDialog(Shell parentShell, IEclipseContext context, IProject p
 		this.editingDomain = editingDomain;
 		this.element = element;
 		this.feature = feature;
-		this.project = project;
 		this.Messages = Messages;
 		context.set(Messages.class, Messages);
 	}
 
 	@Override
 	protected String getFilterTextMessage() {
-		return "Type to start search";
+		return Messages.AbstractIconDialog_Type_To_Start_Search;
 	}
 
 	@Override
 	protected String getResourceNameText() {
-		return "Icon Name";
+		return Messages.AbstractIconDialog_Icon_Name;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
index 44293532c5..28bebe904b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
@@ -105,7 +105,7 @@ protected Control createDialogArea(Composite parent) {
 		getShell().setText(getShellTitle());
 		setTitle(getDialogTitle());
 		setMessage(getDialogMessage());
-		String bundleFilter = (String) context.get("bundle");
+		String bundleFilter = (String) context.get("bundle"); //$NON-NLS-1$
 		if (E.notEmpty(bundleFilter)) {
 			setMessage("Filtering by bundle " + bundleFilter); //$NON-NLS-1$
 		}
@@ -120,7 +120,7 @@ protected Control createDialogArea(Composite parent) {
 
 		if (E.isEmpty(bundleFilter)) {
 			Button btnProject = new Button(compOptions, SWT.RADIO);
-			btnProject.setText("Project");
+			btnProject.setText(Messages.AbstractIconDialogWithHardcodedScope_Project);
 			btnProject.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -132,7 +132,7 @@ public void widgetSelected(SelectionEvent e) {
 			btnProject.setSelection(true);
 
 			Button btnWorkspace = new Button(compOptions, SWT.RADIO);
-			btnWorkspace.setText("Workspace");
+			btnWorkspace.setText(Messages.AbstractIconDialogWithHardcodedScope_Workspace);
 			btnWorkspace.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -373,7 +373,7 @@ public void run() {
 						continue;
 					}
 					// Only search target bundle if specified
-					String bundle = (String) context.get("bundle");
+					String bundle = (String) context.get("bundle"); //$NON-NLS-1$
 					if (E.notEmpty(bundle)) {
 						InputStream inputStream = null;
 						try {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
index 7a76c3734c..2fe2faaf96 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
@@ -42,11 +42,11 @@ protected String getDialogMessage() {
 
 	@Override
 	protected String getFilterTextMessage() {
-		return "Enter text";
+		return Messages.AreaIconDialogEditor_Enter_Text;
 	}
 
 	@Override
 	protected String getResourceNameText() {
-		return "Icon";
+		return Messages.AreaIconDialogEditor_Icon;
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
index cd90c844ab..e712402742 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
@@ -569,7 +569,7 @@ public IContentDescription getContentDescription() throws CoreException {
 	public InputStream getContents() throws CoreException {
 		URL url;
 		try {
-			if (path.getFileExtension().equals("jar")) {
+			if (path.getFileExtension().equals("jar")) { //$NON-NLS-1$
 				ZipFile zip = new ZipFile(path.toOSString());
 				ZipEntry entry;
 				if (getContributionData().className != null) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index 42dc97ba90..eebcc4ce25 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -42,6 +42,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IProviderStatusCallback;
 import org.eclipse.e4.tools.emf.ui.common.ProviderStatus;
 import org.eclipse.e4.tools.emf.ui.common.ResourceSearchScope;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AbstractIconDialogWithScopeAndFilter.Entry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
@@ -149,15 +150,15 @@ public abstract class FilteredContributionDialog extends SaveDialogBoundsSetting
 	private void updateStatusMessage() {
 		String message = ""; //$NON-NLS-1$
 		if (searching) {
-			message += "Searching...\n";
+			message += Messages.FilteredContributionDialog_Searching;
 		}
 		// dlg.setStatus("More than " + filter.maxResults +
 		// " items were found and have not been displayed");
 		if (hint != 0) {
 			if (hint == ContributionResultHandler.MORE_CANCELED) {
-				message += "The search was cancelled.  Not all results may have been displayed.\n";
+				message += Messages.FilteredContributionDialog_SearchWasCancelled;
 			} else {
-				message += "More than " + maxResults + " items were found.  Not all results have been displayed.\n";
+				message += Messages.FilteredContributionDialog_MoreThan + maxResults + Messages.FilteredContributionDialog_itemsWereFound;
 			}
 		}
 
@@ -167,10 +168,10 @@ private void updateStatusMessage() {
 				case READY:
 					break;
 				case INITIALIZING:
-					message += "The provider is initializing.  Results will refresh when complete.";
+					message += Messages.FilteredContributionDialog_ProviderInitializing;
 					break;
 				case CANCELLED:
-					message += "The provider was cancelled while initializing.  Results may be incomplete.";
+					message += Messages.FilteredContributionDialog_ProviderWasCancelled;
 					break;
 				}
 			}
@@ -245,7 +246,7 @@ public FilteredContributionDialog(Shell parentShell, IEclipseContext context) {
 	}
 
 	public static <E extends Enum<E>> EnumSet<E> valueOf(Class<E> eClass, String str) {
-		String[] arr = str.substring(1, str.length() - 1).split(",");
+		String[] arr = str.substring(1, str.length() - 1).split(","); //$NON-NLS-1$
 		EnumSet<E> set = EnumSet.noneOf(eClass);
 		for (String e : arr)
 			set.add(E.valueOf(eClass, e.trim()));
@@ -268,7 +269,7 @@ protected void createButtonsForButtonBar(Composite parent) {
 		((GridLayout) parent.getLayout()).numColumns = 4;
 
 		btnClearCache = new Button(parent, SWT.PUSH);
-		btnClearCache.setText("Clear Model Cache");
+		btnClearCache.setText(Messages.FilteredContributionDialog_ClearCache);
 		btnClearCache.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -372,13 +373,13 @@ public void modifyText(ModifyEvent e) {
 				searching = true;
 				updateStatusMessage();
 
-				currentSearchThread = new Job("Contribution Search") {
+				currentSearchThread = new Job(Messages.FilteredContributionDialog_ContributionSearch) {
 
 					Filter filter;
 
 					@Override
 					protected IStatus run(IProgressMonitor monitor) {
-						monitor.beginTask("Contribution Search", IProgressMonitor.UNKNOWN);
+						monitor.beginTask(Messages.FilteredContributionDialog_ContributionSearch, IProgressMonitor.UNKNOWN);
 						currentResultHandler = new ContributionResultHandlerImpl(viewerList);
 						getShell().getDisplay().syncExec(new Runnable() {
 
@@ -467,14 +468,14 @@ protected void createOptions(Composite compOptions) {
 		{
 			Label lblScope = new Label(compOptions, SWT.NONE);
 			lblScope.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
-			lblScope.setText("Scope");
+			lblScope.setText(Messages.FilteredContributionDialog_Scope);
 
 			Composite compScope = new Composite(compOptions, SWT.NONE);
 			compScope.setLayoutData(new GridData(SWT.BEGINNING, SWT.TOP, false, false));
 			compScope.setLayout(new RowLayout());
 
 			final Button btnScopeProject = new Button(compScope, SWT.RADIO);
-			btnScopeProject.setText("Project Only");
+			btnScopeProject.setText(Messages.FilteredContributionDialog_ProjectOnly);
 			btnScopeProject.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -490,7 +491,7 @@ public void widgetSelected(SelectionEvent e) {
 			btnScopeProject.setSelection(searchScopes.contains(ResourceSearchScope.PROJECT) && !searchScopes.contains(ResourceSearchScope.REFERENCES));
 
 			final Button btnProjectAndReferences = new Button(compScope, SWT.RADIO);
-			btnProjectAndReferences.setText("Project and References");
+			btnProjectAndReferences.setText(Messages.FilteredContributionDialog_ProjectAndReferences);
 			btnProjectAndReferences.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -506,7 +507,7 @@ public void widgetSelected(SelectionEvent e) {
 			btnProjectAndReferences.setSelection(searchScopes.contains(ResourceSearchScope.PROJECT) && searchScopes.contains(ResourceSearchScope.REFERENCES));
 
 			final Button btnScopeWorkspace = new Button(compScope, SWT.RADIO);
-			btnScopeWorkspace.setText("Workspace");
+			btnScopeWorkspace.setText(Messages.FilteredContributionDialog_Workspace);
 			btnScopeWorkspace.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -522,7 +523,7 @@ public void widgetSelected(SelectionEvent e) {
 			btnScopeWorkspace.setSelection(searchScopes.contains(ResourceSearchScope.WORKSPACE));
 
 			final Button btnScopeTargetPlatform = new Button(compScope, SWT.RADIO);
-			btnScopeTargetPlatform.setText("Target Platform");
+			btnScopeTargetPlatform.setText(Messages.FilteredContributionDialog_TargetPlatform);
 			btnScopeTargetPlatform.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -541,14 +542,14 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label lblFilter = new Label(compOptions, SWT.NONE);
 			lblFilter.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
-			lblFilter.setText("Scope Filter");
+			lblFilter.setText(Messages.FilteredContributionDialog_ScopeFilter);
 
 			Composite compFilter = new Composite(compOptions, SWT.NONE);
 			compFilter.setLayoutData(new GridData(SWT.BEGINNING, SWT.TOP, false, false));
 			compFilter.setLayout(new RowLayout());
 
 			btnFilterNone = new Button(compFilter, SWT.CHECK);
-			btnFilterNone.setText("None");
+			btnFilterNone.setText(Messages.FilteredContributionDialog_None);
 			btnFilterNone.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -559,7 +560,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			btnFilterBundle = new Button(compFilter, SWT.CHECK);
-			btnFilterBundle.setText("Bundle");
+			btnFilterBundle.setText(Messages.FilteredContributionDialog_Bundle);
 			btnFilterBundle.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -574,7 +575,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			btnFilterPackage = new Button(compFilter, SWT.CHECK);
-			btnFilterPackage.setText("Package");
+			btnFilterPackage.setText(Messages.FilteredContributionDialog_Package);
 			btnFilterPackage.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -589,7 +590,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			btnFilterLocation = new Button(compFilter, SWT.CHECK);
-			btnFilterLocation.setText("Location");
+			btnFilterLocation.setText(Messages.FilteredContributionDialog_Location);
 			btnFilterLocation.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -607,11 +608,11 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Label lblIncludeNoneBundle = new Label(compOptions, SWT.NONE);
 			lblIncludeNoneBundle.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
-			lblIncludeNoneBundle.setText("Non Bundles");
+			lblIncludeNoneBundle.setText(Messages.FilteredContributionDialog_NonBundles);
 
 			btnIncludeNoneBundle = new Button(compOptions, SWT.CHECK);
 			btnIncludeNoneBundle.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
-			btnIncludeNoneBundle.setText("");
+			btnIncludeNoneBundle.setText(""); //$NON-NLS-1$
 			btnIncludeNoneBundle.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -709,11 +710,11 @@ protected void showBundleFilter() {
 			protected Control createContents(Composite parent) {
 				Control ret = super.createContents(parent);
 				getViewer().setInput(sorted);
-				setMessage("Select the bundle to filter on.");
-				setTitle("Bundle Filter");
-				getShell().setText("Bundle Filter");
+				setMessage(Messages.FilteredContributionDialog_SelectTheBundle);
+				setTitle(Messages.FilteredContributionDialog_BundleFilter);
+				getShell().setText(Messages.FilteredContributionDialog_BundleFilter);
 				try {
-					setTitleImage(imageCache.create("/icons/full/wizban/plugin_wiz.gif"));
+					setTitleImage(imageCache.create("/icons/full/wizban/plugin_wiz.gif")); //$NON-NLS-1$
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
@@ -747,10 +748,10 @@ protected void showPackageFilter() {
 			protected Control createContents(Composite parent) {
 				Control ret = super.createContents(parent);
 				getViewer().setInput(sorted);
-				setMessage("Select the package to filter on.");
-				setTitle("Package Filter");
-				getShell().setText("Package Filter");
-				setTitleImage(imageCache.create("/icons/full/wizban/package_wiz.png"));
+				setMessage(Messages.FilteredContributionDialog_SelectThePackage);
+				setTitle(Messages.FilteredContributionDialog_PackageFilter);
+				getShell().setText(Messages.FilteredContributionDialog_PackageFilter);
+				setTitleImage(imageCache.create("/icons/full/wizban/package_wiz.png")); //$NON-NLS-1$
 				return ret;
 			}
 		};
@@ -788,7 +789,7 @@ protected void showLocationFilter() {
 		// add all parent paths
 		final HashSet<String> parentLocations = new HashSet<String>();
 		for (String location : locations) {
-			if (location.endsWith(".jar")) {
+			if (location.endsWith(".jar")) { //$NON-NLS-1$
 				int index = location.lastIndexOf(File.separator);
 				if (index >= 0) {
 					location = location.substring(0, index);
@@ -807,10 +808,10 @@ protected void showLocationFilter() {
 			protected Control createContents(Composite parent) {
 				Control ret = super.createContents(parent);
 				getViewer().setInput(sorted);
-				setMessage("Select the location to filter on.");
-				setTitle("Location Filter");
-				getShell().setText("Location Filter");
-				setTitleImage(imageCache.create("/icons/full/wizban/location_wiz.png"));
+				setMessage(Messages.FilteredContributionDialog_SelectTheLocation);
+				setTitle(Messages.FilteredContributionDialog_LocationFilter);
+				getShell().setText(Messages.FilteredContributionDialog_LocationFilter);
+				setTitleImage(imageCache.create("/icons/full/wizban/location_wiz.png")); //$NON-NLS-1$
 				return ret;
 			}
 		};
@@ -913,7 +914,7 @@ protected IFile getSelectedIfile() {
 				return (IFile) selected;
 			} else if (selected instanceof Entry) {
 				Entry entry = (Entry) selected;
-				ContributionData cd = new ContributionData(null, null, "Java", entry.file.getFullPath().toOSString());
+				ContributionData cd = new ContributionData(null, null, Messages.FilteredContributionDialog_Java, entry.file.getFullPath().toOSString());
 				cd.installLocation = entry.installLocation;
 				cd.resourceRelativePath = entry.file.getProjectRelativePath().toOSString();
 				return new ContributionDataFile(cd);
@@ -944,7 +945,7 @@ protected IFile checkResourceAccessible(final IFile file, String installLocation
 		// Not a bundle
 		final String bundle = getBundle(file);
 		if (bundle == null) {
-			String message = "The selected resource is not contained in a bundle.";
+			String message = Messages.FilteredContributionDialog_ResourceIsNotContainedInABundle;
 			NonReferencedResourceWizard wizard = new NonReferencedResourceWizard(getShell(), context.get(IProject.class), bundle, file, installLocation, context);
 			wizard.setMessage(message);
 			WizardDialog wizDlg = new WizardDialog(getShell(), wizard);
@@ -964,7 +965,7 @@ protected IFile checkResourceAccessible(final IFile file, String installLocation
 			try {
 				BundleModel model = loadBundleModel(currentProject);
 
-				RequireBundleHeader rbh = (RequireBundleHeader) model.getBundle().getManifestHeader("Require-Bundle");
+				RequireBundleHeader rbh = (RequireBundleHeader) model.getBundle().getManifestHeader("Require-Bundle"); //$NON-NLS-1$
 				if (rbh != null) {
 					for (RequireBundleObject item : rbh.getRequiredBundles()) {
 						if (item.getValue().equals(bundle)) {
@@ -980,7 +981,7 @@ protected IFile checkResourceAccessible(final IFile file, String installLocation
 						String className = cdFile.getContributionData().className;
 						if (className != null) {
 							String pakage = NonReferencedResourceDialog.getPackageFromClassName(className);
-							ImportPackageHeader iph = (ImportPackageHeader) model.getBundle().getManifestHeader("Import-Package");
+							ImportPackageHeader iph = (ImportPackageHeader) model.getBundle().getManifestHeader("Import-Package"); //$NON-NLS-1$
 							if (iph != null) {
 								for (ImportPackageObject item : iph.getPackages()) {
 									if (item.getValue().equals(pakage)) {
@@ -996,7 +997,7 @@ protected IFile checkResourceAccessible(final IFile file, String installLocation
 			}
 
 			if (!found) {
-				String message = "The selected resource's bundle is not referenced by this bundle.";
+				String message = Messages.FilteredContributionDialog_ResourceIsNotReferencedByThisBundle;
 				NonReferencedResourceWizard wizard = new NonReferencedResourceWizard(getShell(), context.get(IProject.class), bundle, file, installLocation, context);
 				wizard.setMessage(message);
 				WizardDialog wiz = new WizardDialog(getShell(), wizard);
@@ -1013,7 +1014,7 @@ protected IFile checkResourceAccessible(final IFile file, String installLocation
 
 	public BundleModel loadBundleModel(IProject currentProject) throws CoreException {
 		Document document = new Document();
-		String content = new Scanner(PDEProject.getManifest(currentProject).getContents()).useDelimiter("\\Z").next();
+		String content = new Scanner(PDEProject.getManifest(currentProject).getContents()).useDelimiter("\\Z").next(); //$NON-NLS-1$
 		document.set(content);
 		BundleModel model = new BundleModel(document, false);
 		model.load();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
index 63f6957345..e2c10bd2d0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
@@ -139,7 +139,7 @@ public IRegion findText(String text, int startOffset) {
 		FindReplaceDocumentAdapter find = new FindReplaceDocumentAdapter(document);
 		IRegion region;
 		try {
-			region = find.find(startOffset, text, true, true, false, false); //$NON-NLS-1$ //$NON-NLS-2$
+			region = find.find(startOffset, text, true, true, false, false);
 			return region;
 		} catch (BadLocationException e) {
 			return null;

From a6c9ad9d23879d4c8b0590c42fed63a8146d582e Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Tue, 16 Sep 2014 10:36:21 -0400
Subject: [PATCH 0811/1286] Bug 443945 - [model editor] make better use of
 space for list box et al

Change-Id: Ibc83a25cca6c8232a83d01a5d500cfbc1fa1bdd3
---
 .../tools/emf/ui/internal/Messages.properties |  58 +--
 .../ui/internal/common/AbstractPickList.java  | 200 ++++++++
 .../emf/ui/internal/common/Autocomplete.java  | 104 ++++
 .../emf/ui/internal/common/E4PickList.java    | 234 +++++++++
 .../ui/internal/common/E4StringPickList.java  | 193 +++++++
 .../internal/common/EClassLabelProvider.java  |  41 ++
 .../common/FeatureClassLabelProvider.java     |  43 ++
 .../internal/common/component/AreaEditor.java | 125 +----
 .../component/BindingContextEditor.java       | 124 +----
 .../common/component/BindingTableEditor.java  | 120 +----
 .../common/component/CommandEditor.java       | 120 +----
 .../common/component/CompositePartEditor.java |  12 +-
 .../common/component/ControlFactory.java      | 472 +++++-------------
 .../common/component/KeyBindingEditor.java    | 129 +----
 .../component/MenuContributionEditor.java     | 153 +-----
 .../internal/common/component/MenuEditor.java | 156 +-----
 .../internal/common/component/PartEditor.java |   3 +
 .../component/PartSashContainerEditor.java    | 138 +----
 .../common/component/PartStackEditor.java     | 143 +-----
 .../common/component/PerspectiveEditor.java   |   7 +-
 .../component/PerspectiveStackEditor.java     | 115 +----
 .../component/ToolBarContributionEditor.java  | 159 +-----
 .../common/component/ToolBarEditor.java       | 148 +-----
 .../common/component/TrimBarEditor.java       | 132 +----
 .../component/TrimContributionEditor.java     | 117 +----
 .../component/virtual/VApplicationAddons.java | 118 +----
 .../virtual/VApplicationCategoriesEditor.java | 113 +----
 .../virtual/VBindingTableEditor.java          | 119 +----
 .../component/virtual/VCommandEditor.java     | 115 +----
 .../component/virtual/VHandlerEditor.java     | 115 +----
 .../virtual/VItemParametersEditor.java        | 115 +----
 .../virtual/VMenuContributionsEditor.java     | 116 +----
 .../common/component/virtual/VMenuEditor.java | 115 ++---
 .../virtual/VModelFragmentsEditor.java        | 119 +----
 .../component/virtual/VPartDescriptor.java    | 114 +----
 .../virtual/VPerspectiveControlEditor.java    | 126 +----
 .../virtual/VRootBindingContexts.java         | 108 +---
 .../component/virtual/VSnippetsEditor.java    | 141 +-----
 .../virtual/VToolBarContributionsEditor.java  | 117 +----
 .../virtual/VTrimContributionsEditor.java     | 117 +----
 .../virtual/VWindowControlEditor.java         | 106 +---
 .../component/virtual/VWindowEditor.java      | 164 ++----
 .../virtual/VWindowSharedElementsEditor.java  | 112 +----
 .../component/virtual/VWindowTrimEditor.java  |  61 +--
 44 files changed, 1532 insertions(+), 3925 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 913848753a..72ff72ebc6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -9,7 +9,7 @@
 # *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
 # *     Sopot Cela <sopotcela@gmail.com> - enhancements
 # *     Marco Descher <marco@descher.at> - Bug 395982, 396975, 426653
-# *     Steven Spungin <steven@spungin.tv> - Bug 431735, 430717
+# *     Steven Spungin <steven@spungin.tv> - Bug 431735, 430717, Ongoing Maintenance
 # *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 440159
 # ******************************************************************************
 ModelTooling_Common_Up=Up
@@ -87,8 +87,8 @@ DialogEditor_Label=Dialog
 
 WizardDialogEditor_Label=Wizard
 
-DirectMenuItemEditor_Label=DirectMenuItem
-DirectMenuItemEditor_Description=DirectMenuItem bla bla bla
+DirectMenuItemEditor_Label=Direct Menu Item
+DirectMenuItemEditor_Description=Direct Menu Item bla bla bla
 DirectMenuItemEditor_ClassURI=Class URI
 
 ControlFactory_Key=Key
@@ -99,15 +99,15 @@ DirectToolItemEditor_ClassURI=Class URI
 DirectToolItemEditor_Label=Direct Tool Item
 DirectToolItemEditor_Description=Direct Tool Item bla bla bla
 
-HandledMenuItemEditor_Label=HandledMenuItem
-HandledMenuItemEditor_Description=HandledMenuItem bla bla bla
+HandledMenuItemEditor_Label=Handled Menu Item
+HandledMenuItemEditor_Description=Handled Menu Item bla bla bla
 HandledMenuItemEditor_Command=Command
 HandledMenuItemEditor_Parameters=Parameters
 HandledMenuItemEditor_Tag=Name
 HandledMenuItemEditor_Value=Value
 
-DynamicMenuContributionEditor_Label=DynamicMenuContribution
-DynamicMenuContributionEditor_Description=DynamicMenuContribution blablabla
+DynamicMenuContributionEditor_Label=Dynamic Menu Contribution
+DynamicMenuContributionEditor_Description=Dynamic Menu Contribution blablabla
 
 DynamicMenuContributionEditor_ClassURI=Class URI
 DynamicMenuContributionEditor_LabelLabel=Label
@@ -142,22 +142,22 @@ MenuEditor_Description=Menu bla bla bla
 MenuEditor_MenuItems=MenuItems
 MenuEditor_MenuItemType=Type
 MenuEditor_MenuItemItemType=Item Type
-MenuEditor_HandledMenuItem=Handled MenuItem
-MenuEditor_DynamicMenuContribution=DynamicMenuContribution
+MenuEditor_HandledMenuItem=Handled Menu Item
+MenuEditor_DynamicMenuContribution=Dynamic Menu Contribution
 MenuEditor_Separator=Separator
 MenuEditor_Menu=Menu
-MenuEditor_DirectMenuItem=Direct MenuItem
+MenuEditor_DirectMenuItem=Direct Menu Item
 MenuEditor_LabelLabel=Label
 MenuEditor_Tooltip=Tooltip
 MenuEditor_IconURI=Icon URI
 MenuEditor_MainMenu=Main Menu
 MenuEditor_Children=Children
 MenuEditor_Mnemonics=Mnemonics
-MenuEditor_AddHandledMenuItem=HandledMenuItem
+MenuEditor_AddHandledMenuItem=Handled Menu Item
 MenuEditor_AddMenu=Menu
-MenuEditor_AddDirectMenuItem=DirectMenuItem
+MenuEditor_AddDirectMenuItem=Direct Menu Item
 MenuEditor_AddSeparator=Separator
-MenuEditor_AddDynamicMenuContribution=DynamicMenuContribution
+MenuEditor_AddDynamicMenuContribution=Dynamic Menu Contribution
 MenuEditor_AddCoreExpression=VisibleWhen Core Expression
 
 
@@ -206,7 +206,7 @@ PartEditor_ContainerData=Container Data
 PartEditor_ToolBar=ToolBar
 PartEditor_BindingContexts=Binding Contexts
 
-PartSashContainerEditor_Label=PartSashContainer
+PartSashContainerEditor_Label=Part Sash Container
 PartSashContainerEditor_Description=Sash bla bla bla
 PartSashContainerEditor_Orientation=Orientation
 PartSashContainerEditor_Vertical=Vertical
@@ -214,8 +214,8 @@ PartSashContainerEditor_Horizontal=Horizontal
 PartSashContainerEditor_SelectedElement=Selected Element
 PartSashContainerEditor_Controls=Controls
 PartSashContainerEditor_ContainerData=Container Data
-PartSashContainerEditor_AddPartSashContainer=PartSashContainer
-PartSashContainerEditor_AddPartStack=PartStack
+PartSashContainerEditor_AddPartSashContainer=Part Sash Container
+PartSashContainerEditor_AddPartStack=Part Stack
 PartSashContainerEditor_AddPart=Part
 PartSashContainerEditor_AddArea=Area
 PartSashContainerEditor_AddPlaceholder=Placeholder
@@ -227,7 +227,7 @@ PartStackEditor_Parts=Parts
 PartStackEditor_ContainerData=Container Data
 PartStackEditor_AddPart=Part
 PartStackEditor_AddPlaceholder=Placeholder
-PartStackEditor_AddCompositePart=CompositePart
+PartStackEditor_AddCompositePart=Composite Part
 
 PerspectiveEditor_Label=Perspective
 PerspectiveEditor_Description=Perspective Bla Bla Bla
@@ -237,8 +237,8 @@ PerspectiveEditor_Label=Perspective
 PerspectiveEditor_Tooltip=Tooltip
 PerspectiveEditor_IconURI=Icon URI
 PerspectiveEditor_Controls=Controls
-PerspectiveEditor_AddPartSashContainer=PartSashContainer
-PerspectiveEditor_AddPartStack=PartStack
+PerspectiveEditor_AddPartSashContainer=Part Sash Container
+PerspectiveEditor_AddPartStack=Part Stack
 PerspectiveEditor_AddPart=Part
 PerspectiveEditor_AddInputPart=InputPart
 PerspectiveEditor_AddArea=Area
@@ -273,7 +273,7 @@ ToolBarEditor_AddToolBarSeparator=Separator
 
 ToolBarSeparatorEditor_Label=Separator
 
-ToolControlEditor_Label=ToolControl
+ToolControlEditor_Label=Tool Control
 ToolControlEditor_Description=ToolControl bla bla bla
 ToolControlEditor_ClassURI=Class URI
 
@@ -302,11 +302,11 @@ ContributionURIValidator_URI_starts_with_platform=The URI has to start with 'bun
 MenuContributionEditor_MenuItems=Menu Items
 MenuContributionEditor_MenuItemType=Type
 MenuContributionEditor_MenuItemItemType=Item Type
-MenuContributionEditor_HandledMenuItem=Handled MenuItem
-MenuContributionEditor_DynamicMenuContribution=DynamicMenuContribution
+MenuContributionEditor_HandledMenuItem=Handled Menu Item
+MenuContributionEditor_DynamicMenuContribution=Dynamic Menu Contribution
 MenuContributionEditor_Separator=Separator
 MenuContributionEditor_Menu=Menu
-MenuContributionEditor_DirectMenuItem=Direct MenuItem
+MenuContributionEditor_DirectMenuItem=Direct Menu Item
 MenuContributionEditor_ParentId=Parent-ID
 MenuContributionEditor_Position=Position
 MenuContributionEditor_TreeLabel=Menu Contribution
@@ -365,8 +365,8 @@ PopupMenuEditor_TreeLabelDescription=Popup Menu Bla Bla Bla Bla
 
 RenderedMenuEditor_TreeLabel=Rendered Menu
 
-RenderedMenuItem_TreeLabel=Rendered MenuItem
-RenderedMenuItem_TreeLabelDescription=Rendered MenuItem Bla Bla Bla Bla
+RenderedMenuItem_TreeLabel=Rendered Menu Item
+RenderedMenuItem_TreeLabelDescription=Rendered Menu Item Bla Bla Bla Bla
 
 RenderedToolBarEditor_TreeLabel=Rendered ToolBar
 
@@ -743,13 +743,13 @@ ListTab_resetColumns=Reset Columns
 ListTab_selectAnAttribute=Select an attribute
 ListTab_selectAType=Select a type
 
-CompositePartEditor_AddPartSashContainer=PartSashContainer
-CompositePartEditor_AddPartStack=PartStack
+CompositePartEditor_AddPartSashContainer=Part Sash Container
+CompositePartEditor_AddPartStack=Part Stack
 CompositePartEditor_AddPart=Part
 CompositePartEditor_AddArea=Area
 CompositePartEditor_AddPlaceholder=Placeholder
-CompositePartEditor_Label=CompositePart
-CompositePartEditor_Description=CompositePart
+CompositePartEditor_Label=Composite Part
+CompositePartEditor_Description=Composite Part
 CompositePartEditor_Orientation=Orientation
 CompositePartEditor_Horizontal=Horizontal
 CompositePartEditor_Vertical=Vertical
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
new file mode 100644
index 0000000000..4b573ef6cf
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -0,0 +1,200 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common;
+
+import java.util.List;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+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.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+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.swt.widgets.Group;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+
+/**
+ * <p>
+ * A composite widget containing a combo for picking items, a list with
+ * selectable items, and action buttons for modifying the list.
+ * </p>
+ *
+ * @author Steven Spungin
+ *
+ */
+public abstract class AbstractPickList extends Composite {
+
+	public static enum PickListFeatures {
+		NO_ORDER, NO_PICKER
+	}
+
+	protected ComboViewer picker;
+	protected TableViewer viewer;
+
+	private Group group;
+	private ToolBar toolBar;
+	private ToolItem tiRemove;
+	private ToolItem tiUp;
+	private ToolItem tiDown;
+	private ToolItem tiAdd;
+
+	public AbstractPickList(Composite parent, int style, List<PickListFeatures> listFeatures, Messages messages, AbstractComponentEditor componentEditor) {
+		super(parent, style);
+
+		// TODO remove dependency to Messages and AbstractComponentEditor. They
+		// are only needed for labels and icons.
+
+		setLayout(new FillLayout());
+
+		group = new Group(this, SWT.NONE);
+		// gridData.horizontalIndent = 30;
+		group.setLayout(new GridLayout(1, false));
+
+		toolBar = new ToolBar(group, SWT.FLAT);
+		toolBar.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
+
+		tiAdd = new ToolItem(toolBar, SWT.PUSH);
+		tiAdd.setText(messages.ModelTooling_Common_AddEllipsis);
+		tiAdd.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_table_add));
+		tiAdd.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				addPressed();
+			}
+		});
+
+		new ToolItem(toolBar, SWT.SEPARATOR_FILL);
+
+		tiDown = new ToolItem(toolBar, SWT.PUSH);
+		tiDown.setText(messages.ModelTooling_Common_Down);
+		tiDown.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_arrow_down));
+		tiDown.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				moveDownPressed();
+			}
+		});
+
+		tiUp = new ToolItem(toolBar, SWT.PUSH);
+		tiUp.setText(messages.ModelTooling_Common_Up);
+		tiUp.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_arrow_up));
+		tiUp.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				moveUpPressed();
+			}
+		});
+		tiRemove = new ToolItem(toolBar, SWT.PUSH);
+		tiRemove.setText(messages.ModelTooling_Common_Remove);
+		tiRemove.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_table_delete));
+		tiRemove.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				removePressed();
+			}
+		});
+
+		picker = new ComboViewer(group, SWT.SIMPLE);
+		picker.getControl().setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+
+		Autocomplete.installOn(picker);
+
+		picker.getCombo().addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyPressed(KeyEvent e) {
+				if (e.keyCode == SWT.CR) {
+					addPressed();
+				}
+			}
+		});
+
+		viewer = new TableViewer(group);
+		GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1);
+		viewer.getControl().setLayoutData(gd);
+
+		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+
+			@Override
+			public void selectionChanged(SelectionChangedEvent event) {
+				updateUiState();
+			}
+		});
+
+		updateUiState();
+
+		if (listFeatures != null) {
+			if (listFeatures.contains(PickListFeatures.NO_ORDER)) {
+				tiDown.dispose();
+				tiUp.dispose();
+			}
+			if (listFeatures.contains(PickListFeatures.NO_PICKER)) {
+				((GridData) picker.getControl().getLayoutData()).exclude = true;
+				picker.getControl().setVisible(false);
+				pack();
+			}
+		}
+
+	}
+
+	protected void addPressed() {
+	}
+
+	abstract protected int getItemCount();
+
+	public TableViewer getList() {
+		return viewer;
+	}
+
+	public ComboViewer getPicker() {
+		return picker;
+	}
+
+	protected ToolBar getToolBar() {
+		return toolBar;
+	}
+
+	protected void moveDownPressed() {
+	}
+
+	protected void moveUpPressed() {
+	}
+
+	protected void removePressed() {
+	}
+
+	public void setText(String text) {
+		group.setText(text);
+	}
+
+	public void updateUiState() {
+		IStructuredSelection selection = (IStructuredSelection) getList().getSelection();
+		boolean selected = selection.size() > 0;
+		int count = getItemCount();
+		if (tiDown.isDisposed() == false) {
+			tiDown.setEnabled(selected && count > 1);
+			tiUp.setEnabled(selected && count > 1);
+		}
+		tiRemove.setEnabled(selected);
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java
new file mode 100644
index 0000000000..884a9293b5
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.FocusAdapter;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Combo;
+
+/**
+ *
+ * @author Steven Spungin
+ *
+ */
+public class Autocomplete {
+
+	public static void installOn(ComboViewer comboViewer) {
+		final Combo combo = comboViewer.getCombo();
+
+		combo.addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyReleased(KeyEvent keyEvent) {
+				setClosestMatch(combo);
+			}
+
+			@Override
+			public void keyPressed(KeyEvent keyEvent) {
+				if (keyEvent.keyCode == SWT.BS) {
+					Point pt = combo.getSelection();
+					combo.setSelection(new Point(Math.max(0, pt.x - 1), pt.y));
+				}
+			}
+		});
+
+		combo.addFocusListener(new FocusAdapter() {
+			@Override
+			public void focusLost(FocusEvent e) {
+				combo.setSelection(new Point(0, combo.getText().length()));
+			}
+
+			@Override
+			public void focusGained(FocusEvent e) {
+				combo.setSelection(new Point(0, combo.getText().length()));
+			}
+		});
+
+		combo.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseUp(MouseEvent e) {
+				combo.setSelection(new Point(0, combo.getText().length()));
+			}
+		});
+	}
+
+	private static void setClosestMatch(Combo combo) {
+		String[] items = combo.getItems();
+		if (items.length == 0) {
+			return;
+		}
+
+		// TODO this would be faster using binary search if we could insure that
+		// the items are sorted in natural order.
+
+		String str = combo.getText();
+		Pattern pattern = Pattern.compile(str + ".*", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
+
+		int index = -1;
+		int length = 0;
+		for (int i = 0; i < items.length; i++) {
+			Matcher m = pattern.matcher(items[i]);
+			if (m.matches()) {
+				if (index == -1 || items[i].length() < length) {
+					length = items[i].length();
+					index = i;
+				}
+			}
+		}
+		if (index == -1) {
+			index = 0;
+		}
+		Point pt = combo.getSelection();
+		String selectedText = items[index];
+		combo.select(index);
+		combo.setText(selectedText);
+		combo.setSelection(new Point(pt.x, selectedText.length()));
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
new file mode 100644
index 0000000000..88850a6059
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
@@ -0,0 +1,234 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common;
+
+import java.util.List;
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * <p>
+ * Pressing CR in the combo will execute the ADD command.
+ * </p>
+ * <p>
+ * <em>E4 specific:</em> The default feature is
+ * UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN. Other features must
+ * override appropriate methods. The picker uses an Array Content Provider. The
+ * list uses an ObservableListContentProvider and a Struct class to contain the
+ * object and label.
+ * </p>
+ *
+ * @author Steven Spungin
+ *
+ */
+public class E4PickList extends AbstractPickList {
+
+	AbstractComponentEditor componentEditor;
+	EStructuralFeature feature;
+
+	public static class Struct {
+		final public String label;
+		final public EClass eClass;
+		final public boolean separator;
+
+		public Struct(String label, EClass eClass, boolean separator) {
+			this.label = label;
+			this.eClass = eClass;
+			this.separator = separator;
+		}
+	}
+
+	public E4PickList(Composite parent, int style, List<PickListFeatures> listFeatures, final Messages messages, final AbstractComponentEditor componentEditor, final EStructuralFeature feature) {
+		super(parent, style, listFeatures, messages, componentEditor);
+
+		this.componentEditor = componentEditor;
+		this.feature = feature;
+
+		picker.setContentProvider(new ArrayContentProvider());
+		picker.setLabelProvider(new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				Struct struct = (Struct) element;
+				return struct.label;
+			}
+		});
+
+		viewer.setLabelProvider(new ComponentLabelProvider(componentEditor.getEditor(), messages));
+		ObservableListContentProvider cp = new ObservableListContentProvider();
+		viewer.setContentProvider(cp);
+	}
+
+	/**
+	 * Used for StringToString maps
+	 *
+	 * @param obj
+	 * @param container
+	 * @param i
+	 */
+	protected void tryEObjectMove(Object obj, EObject container, int delta) {
+		List<?> l = (List<?>) container.eGet(feature);
+		int idx = l.indexOf(obj) + delta;
+		if ((delta > 0 && idx < l.size()) || (delta < 0 && idx >= 0)) {
+			Command cmd = MoveCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster().getValue(), feature, obj, idx);
+
+			if (cmd.canExecute()) {
+				componentEditor.getEditingDomain().getCommandStack().execute(cmd);
+				viewer.setSelection(new StructuredSelection(obj));
+			}
+		}
+	}
+
+	@Override
+	protected void addPressed() {
+		if (!picker.getSelection().isEmpty()) {
+			Struct struct = (Struct) ((IStructuredSelection) picker.getSelection()).getFirstElement();
+			EClass eClass = struct.eClass;
+			_handleAdd(eClass, struct.separator);
+		}
+	}
+
+	protected void _handleAdd(EClass eClass, boolean separator) {
+		MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
+		setElementId(eObject);
+		Command cmd = AddCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster().getValue(), feature, eObject);
+
+		if (cmd.canExecute()) {
+			componentEditor.getEditingDomain().getCommandStack().execute(cmd);
+			if (!separator) {
+				componentEditor.getEditor().setSelection(eObject);
+			}
+		}
+	}
+
+	protected void setElementId(Object element) {
+		if (componentEditor.getEditor().isAutoCreateElementId() && element instanceof MApplicationElement) {
+			MApplicationElement el = (MApplicationElement) element;
+			if (el.getElementId() == null || el.getElementId().trim().length() == 0) {
+				el.setElementId(Util.getDefaultElementId(((EObject) componentEditor.getMaster().getValue()).eResource(), el, componentEditor.getEditor().getProject()));
+			}
+		}
+	}
+
+	protected List<?> getContainerChildren(Object master) {
+		if (master instanceof MElementContainer<?>) {
+			return ((MElementContainer<?>) master).getChildren();
+		} else {
+			return null;
+		}
+	}
+
+	@Override
+	protected void moveUpPressed() {
+		if (!viewer.getSelection().isEmpty()) {
+			IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+			if (s.size() == 1) {
+				Object obj = s.getFirstElement();
+				Object container = componentEditor.getMaster().getValue();
+				if (feature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE) {
+					tryEObjectMove(obj, (EObject) container, -1);
+					return;
+				}
+				List<?> children = getContainerChildren(container);
+				if (children == null) {
+					return;
+				}
+				int idx = children.indexOf(obj) - 1;
+				if (idx >= 0) {
+					if (obj instanceof MUIElement && feature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+						if (Util.moveElementByIndex(componentEditor.getEditingDomain(), (MUIElement) obj, componentEditor.getEditor().isLiveModel(), idx)) {
+							viewer.setSelection(new StructuredSelection(obj));
+						}
+					} else if (obj instanceof MApplicationElement) {
+						Command cmd = MoveCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster().getValue(), feature, obj, idx);
+						if (cmd.canExecute()) {
+							componentEditor.getEditingDomain().getCommandStack().execute(cmd);
+							viewer.setSelection(new StructuredSelection(obj));
+						}
+					}
+				}
+			}
+		}
+	}
+
+	@Override
+	protected void moveDownPressed() {
+		if (!viewer.getSelection().isEmpty()) {
+			IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+			if (s.size() == 1) {
+				Object obj = s.getFirstElement();
+				Object container = componentEditor.getMaster().getValue();
+				if (feature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE) {
+					tryEObjectMove(obj, (EObject) container, 1);
+					return;
+				}
+				List<?> children = getContainerChildren(container);
+				if (children == null) {
+					return;
+				}
+				int idx = children.indexOf(obj) + 1;
+				if (idx < children.size()) {
+					if (obj instanceof MUIElement && feature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+						if (Util.moveElementByIndex(componentEditor.getEditingDomain(), (MUIElement) obj, componentEditor.getEditor().isLiveModel(), idx)) {
+							viewer.setSelection(new StructuredSelection(obj));
+						}
+					} else if (obj instanceof MApplicationElement) {
+						Command cmd = MoveCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster().getValue(), feature, obj, idx);
+						if (cmd.canExecute()) {
+							componentEditor.getEditingDomain().getCommandStack().execute(cmd);
+							viewer.setSelection(new StructuredSelection(obj));
+						}
+					}
+				}
+			}
+		}
+	}
+
+	@Override
+	protected void removePressed() {
+		if (!viewer.getSelection().isEmpty()) {
+			List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
+			Command cmd = RemoveCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster().getValue(), feature, keybinding);
+			if (cmd.canExecute()) {
+				componentEditor.getEditingDomain().getCommandStack().execute(cmd);
+			}
+		}
+	}
+
+	@Override
+	protected int getItemCount() {
+		if (viewer.getContentProvider() == null || viewer.getInput() == null) {
+			return 0;
+		}
+		return ((ObservableListContentProvider) viewer.getContentProvider()).getElements(viewer.getInput()).length;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
new file mode 100644
index 0000000000..a258a0c15c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
@@ -0,0 +1,193 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common;
+
+import java.util.Arrays;
+import java.util.List;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.ToolItem;
+
+/**
+ * A PickList for creating a string list. Action include ordering, adding,
+ * removing, and replacing.
+ *
+ * @author Steven Spungin
+ *
+ */
+public class E4StringPickList extends AbstractPickList {
+
+	private Text text;
+	private ToolItem tiReplace;
+	private AbstractComponentEditor editor;
+	private EStructuralFeature feature;
+
+	public E4StringPickList(Composite parent, int flags, List<PickListFeatures> list, Messages messages, AbstractComponentEditor editor, EStructuralFeature feature) {
+		super(parent, flags, Arrays.asList(PickListFeatures.NO_PICKER), messages, editor);
+
+		this.editor = editor;
+		this.feature = feature;
+
+		// TODO does not respect NO_ORDER yet
+
+		tiReplace = new ToolItem(getToolBar(), SWT.PUSH, 2);
+		tiReplace.setText("Replace");
+		tiReplace.setImage(editor.createImage(ResourceProvider.IMG_Obj16_world_edit));
+
+		text = new Text(getToolBar().getParent(), SWT.SINGLE | SWT.LEAD | SWT.BORDER);
+		text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+		text.moveBelow(getToolBar());
+
+		tiReplace.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				handleReplaceText();
+			}
+		});
+
+		getList().setContentProvider(new ObservableListContentProvider());
+
+		text.addModifyListener(new ModifyListener() {
+
+			@Override
+			public void modifyText(ModifyEvent e) {
+				updateUiState();
+			}
+		});
+
+		updateUiState();
+
+	}
+
+	@Override
+	protected void moveUpPressed() {
+		if (!viewer.getSelection().isEmpty()) {
+			IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+			if (s.size() == 1) {
+				Object obj = s.getFirstElement();
+				Object container = editor.getMaster().getValue();
+				tryEObjectMove(obj, (EObject) container, -1);
+			}
+		}
+	}
+
+	@Override
+	protected void moveDownPressed() {
+		if (!viewer.getSelection().isEmpty()) {
+			IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+			if (s.size() == 1) {
+				Object obj = s.getFirstElement();
+				Object container = editor.getMaster().getValue();
+				tryEObjectMove(obj, (EObject) container, 1);
+			}
+		}
+	}
+
+	@Override
+	protected void removePressed() {
+		if (!viewer.getSelection().isEmpty()) {
+			List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
+			Command cmd = RemoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), feature, keybinding);
+			if (cmd.canExecute()) {
+				editor.getEditingDomain().getCommandStack().execute(cmd);
+			}
+		}
+	}
+
+	protected void handleReplaceText() {
+		if (getTextWidget().getText().trim().length() > 0) {
+			if (!viewer.getSelection().isEmpty()) {
+				String[] tags = getTextWidget().getText().split(";"); //$NON-NLS-1$
+				for (int i = 0; i < tags.length; i++) {
+					tags[i] = tags[i].trim();
+				}
+
+				MApplicationElement appEl = (MApplicationElement) editor.getMaster().getValue();
+				EObject el = (EObject) editor.getMaster().getValue();
+				List<?> ids = ((IStructuredSelection) viewer.getSelection()).toList();
+				Object curVal = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+				EObject container = (EObject) editor.getMaster().getValue();
+				List<?> l = (List<?>) container.eGet(feature);
+				int idx = l.indexOf(curVal);
+				if (idx >= 0) {
+					Command cmdRemove = RemoveCommand.create(editor.getEditingDomain(), el, feature, ids);
+					Command cmdInsert = AddCommand.create(editor.getEditingDomain(), appEl, feature, Arrays.asList(tags), idx);
+					if (cmdRemove.canExecute() && cmdInsert.canExecute()) {
+						editor.getEditingDomain().getCommandStack().execute(cmdRemove);
+						editor.getEditingDomain().getCommandStack().execute(cmdInsert);
+					}
+					getTextWidget().setText(""); //$NON-NLS-1$
+				}
+			}
+		}
+	}
+
+	@Override
+	public void updateUiState() {
+		super.updateUiState();
+
+		if (getTextWidget() != null) {
+			IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
+			Object firstViewerElement = sel.getFirstElement();
+			boolean diff = !getTextWidget().getText().equals(firstViewerElement);
+			tiReplace.setEnabled(firstViewerElement != null && !getTextWidget().getText().isEmpty() && diff);
+		}
+	}
+
+	@Override
+	protected int getItemCount() {
+		if (viewer.getContentProvider() == null || viewer.getInput() == null) {
+			return 0;
+		}
+		return ((ObservableListContentProvider) viewer.getContentProvider()).getElements(viewer.getInput()).length;
+	}
+
+	protected ToolItem getReplaceWidget() {
+		return tiReplace;
+	}
+
+	public Text getTextWidget() {
+		return text;
+	}
+
+	protected void tryEObjectMove(Object obj, EObject container, int delta) {
+		List<?> l = (List<?>) container.eGet(feature);
+		int idx = l.indexOf(obj) + delta;
+		if ((delta > 0 && idx < l.size()) || (delta < 0 && idx >= 0)) {
+			Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), feature, obj, idx);
+
+			if (cmd.canExecute()) {
+				editor.getEditingDomain().getCommandStack().execute(cmd);
+				viewer.setSelection(new StructuredSelection(obj));
+			}
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
new file mode 100644
index 0000000000..8bf286bff2
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common;
+
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.jface.viewers.LabelProvider;
+
+/**
+ * Uses the default editor for the EClass to calculate the label
+ *
+ * @author Steven Spungin
+ *
+ */
+public class EClassLabelProvider extends LabelProvider {
+	private ModelEditor editor;
+
+	public EClassLabelProvider(ModelEditor editor) {
+		this.editor = editor;
+	}
+
+	@Override
+	public String getText(Object element) {
+		EClass eclass = (EClass) element;
+		AbstractComponentEditor elementEditor = editor.getEditor(eclass);
+		if (elementEditor != null) {
+			return elementEditor.getLabel(element);
+		} else {
+			return eclass.getName();
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
new file mode 100644
index 0000000000..16cc4c3916
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.internal.common;
+
+import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.jface.viewers.LabelProvider;
+
+/**
+ * Uses the default editor for the FeatureClass EClass to calculate the label
+ *
+ * @author Steven Spungin
+ *
+ */
+public class FeatureClassLabelProvider extends LabelProvider {
+	private ModelEditor editor;
+
+	public FeatureClassLabelProvider(ModelEditor editor) {
+		this.editor = editor;
+	}
+
+	@Override
+	public String getText(Object element) {
+		FeatureClass eFeatureClass = (FeatureClass) element;
+		EClass eclass = eFeatureClass.eClass;
+		AbstractComponentEditor elementEditor = editor.getEditor(eclass);
+		if (elementEditor != null) {
+			return elementEditor.getLabel(null);
+		} else {
+			return eclass.getName();
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 4aa400a7a2..2e07648a33 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -26,13 +26,13 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AreaIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
@@ -51,12 +51,10 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
@@ -292,120 +290,25 @@ public String getText(Object element) {
 		ControlFactory.createTextField(parent, Messages.AreaEditor_ContainerData, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.AreaEditor_Controls);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+				@Override
+				protected void addPressed() {
+					EClass eClass = (EClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+					handleAddChild(eClass);
+				}
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			pickList.setText(Messages.AreaEditor_Controls);
 
-			final TableViewer viewer = new TableViewer(parent);
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
+			final TableViewer viewer = pickList.getList();
 
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) - 1;
-							if (idx >= 0) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) + 1;
-							if (idx < container.getChildren().size()) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					EClass eclass = (EClass) element;
-					return eclass.getName();
-				}
-			});
+			final ComboViewer childrenDropDown = pickList.getPicker();
+			childrenDropDown.setLabelProvider(new EClassLabelProvider(getEditor()));
 			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!childrenDropDown.getSelection().isEmpty()) {
-						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-						handleAddChild(eClass);
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
-
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index f2652cbcde..3d9b0b0981 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -13,6 +13,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -22,7 +23,8 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.ui.model.application.commands.MBindingContext;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
@@ -35,29 +37,19 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-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;
 
 public class BindingContextEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -173,111 +165,23 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME), Messages.BindingContextEditor_NameWarning);
 		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Description, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__DESCRIPTION));
 
-		Label l = new Label(parent, SWT.NONE);
-		l.setText(Messages.BindingContextEditor_Subcontexts);
-		l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-		final TableViewer viewer = new TableViewer(parent);
-		ObservableListContentProvider cp = new ObservableListContentProvider();
-		viewer.setContentProvider(cp);
-
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		viewer.getControl().setLayoutData(gd);
-		viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-		IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
-		viewer.setInput(prop.observeDetail(master));
-
-		Composite buttonComp = new Composite(parent, SWT.NONE);
-		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		GridLayout gl = new GridLayout();
-		gl.marginLeft = 0;
-		gl.marginRight = 0;
-		gl.marginWidth = 0;
-		gl.marginHeight = 0;
-		buttonComp.setLayout(gl);
-
-		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Up);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						MBindingContext container = (MBindingContext) getMaster().getValue();
-						int idx = container.getChildren().indexOf(obj) - 1;
-						if (idx >= 0) {
-							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN, obj, idx);
-
-							if (cmd.canExecute()) {
-								getEditingDomain().getCommandStack().execute(cmd);
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
-				}
-			}
-		});
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Down);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
+		E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN) {
 			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						MBindingContext container = (MBindingContext) getMaster().getValue();
-						int idx = container.getChildren().indexOf(obj) + 1;
-						if (idx < container.getChildren().size()) {
-							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN, obj, idx);
-
-							if (cmd.canExecute()) {
-								getEditingDomain().getCommandStack().execute(cmd);
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
-				}
-			}
-		});
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_AddEllipsis);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
+			protected void addPressed() {
 				handleAddContext();
 			}
-		});
 
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Remove);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
 			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
-					Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN, keybinding);
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-					}
-				}
+			protected List<?> getContainerChildren(Object master) {
+				return ((MBindingContext) master).getChildren();
 			}
-		});
+		};
+		pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+		pickList.setText(Messages.BindingContextEditor_Subcontexts);
+
+		final TableViewer viewer = pickList.getList();
+		IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
+		viewer.setInput(prop.observeDetail(master));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index ece088a72a..2fe426b049 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -8,10 +8,12 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -21,7 +23,8 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BindingContextSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MBindingTable;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
@@ -36,15 +39,10 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
@@ -55,7 +53,6 @@
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -197,111 +194,24 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.BindingTableEditor_Keybindings);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-			final TableViewer viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			IEMFListProperty prop = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
-			viewer.setInput(prop.observeDetail(getMaster()));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MBindingTable container = (MBindingTable) getMaster().getValue();
-							int idx = container.getBindings().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
+				protected void addPressed() {
+					handleAddKeyBinding();
 				}
-			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MBindingTable container = (MBindingTable) getMaster().getValue();
-							int idx = container.getBindings().indexOf(obj) + 1;
-							if (idx < container.getBindings().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
+				protected List<?> getContainerChildren(Object master) {
+					return ((MBindingTable) master).getBindings();
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			pickList.setText(Messages.BindingTableEditor_Keybindings);
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					handleAddKeyBinding();
-				}
-			});
+			final TableViewer viewer = pickList.getList();
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, keybinding);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
+			IEMFListProperty prop = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
+			viewer.setInput(prop.observeDetail(getMaster()));
 		}
 
 		item = new CTabItem(folder, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index d460a7ccda..b6f0ce74d6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -14,6 +14,7 @@
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -22,7 +23,8 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.CommandCategorySelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
@@ -37,14 +39,9 @@
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -54,7 +51,6 @@
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -191,111 +187,25 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.CommandEditor_Parameters);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-			final TableViewer viewer = new TableViewer(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.BORDER);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-
-			IEMFEditListProperty mProp = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
-			viewer.setInput(mProp.observeDetail(getMaster()));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.COMMAND__PARAMETERS) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MCommand container = (MCommand) getMaster().getValue();
-							int idx = container.getParameters().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
+				protected void addPressed() {
+					handleAddCommandParameter();
 				}
-			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MCommand container = (MCommand) getMaster().getValue();
-							int idx = container.getParameters().indexOf(obj) + 1;
-							if (idx < container.getParameters().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
+				protected List<?> getContainerChildren(Object master) {
+					return ((MCommand) master).getParameters();
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					handleAddCommandParameter();
-				}
-			});
+			pickList.setText(Messages.CommandEditor_Parameters);
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS, keybinding);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
+			final TableViewer viewer = pickList.getList();
+
+			IEMFEditListProperty mProp = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
+			viewer.setInput(mProp.observeDetail(getMaster()));
 		}
 
 		item = new CTabItem(folder, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index 9974d3b646..857122d9e6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -16,6 +16,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.FeatureClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
@@ -332,15 +333,8 @@ public String getText(Object element) {
 			buttonCompTop.setLayout(gl);
 
 			final ComboViewer childrenDropDown = new ComboViewer(buttonCompTop);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					FeatureClass eFeatureClass = (FeatureClass) element;
-					return eFeatureClass.eClass.getName();
-				}
-			});
+			childrenDropDown.setLabelProvider(new FeatureClassLabelProvider(getEditor()));
+
 			List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
 			eClassList.add(new FeatureClass("PartSashContainer", BasicPackageImpl.Literals.PART_SASH_CONTAINER)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("PartStack", BasicPackageImpl.Literals.PART_STACK)); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 645a07c8fa..aad107aa64 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -9,6 +9,7 @@
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Dirk Fauth <dirk.fauth@googlemail.com> - Bug 426986
  *     Steven Spungin <steven@spungin.tv> - Bug 430660, 430664, Bug 430809, 430717
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -34,7 +35,9 @@
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4StringPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BindingContextSelectionDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.properties.ProjectOSGiTranslationProvider;
@@ -42,7 +45,6 @@
 import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
-import org.eclipse.e4.ui.model.application.commands.MBindings;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationFactoryImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -60,7 +62,6 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -179,25 +180,77 @@ public void handleValueChange(ValueChangeEvent event) {
 		});
 	}
 
-	public static void createMapProperties(Composite parent, final Messages Messages, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
-		createMapProperties(parent, Messages, editor, label, null, feature, vIndent);
+	public static Composite createMapProperties(Composite parent, final Messages Messages, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
+		return createMapProperties(parent, Messages, editor, label, null, feature, vIndent);
 	}
 
-	public static void createMapProperties(Composite parent, final Messages Messages, final AbstractComponentEditor editor, String label, String tooltip, final EStructuralFeature feature, int vIndent) {
-		Label l = new Label(parent, SWT.NONE);
-		l.setText(label);
+	public static Composite createMapProperties(Composite parent, final Messages Messages, final AbstractComponentEditor editor, String label, String tooltip, final EStructuralFeature feature, int vIndent) {
+
+		E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, editor, feature) {
+			@Override
+			protected List<?> getContainerChildren(Object master) {
+				return null;
+			}
+
+			@Override
+			protected void addPressed() {
+				Dialog dialog = new Dialog(getShell()) {
+					private Text key;
+					private Text value;
+
+					@Override
+					protected Control createDialogArea(Composite parent) {
+						getShell().setText(Messages.ControlFactory_KeyValueShellTitle);
+						Composite comp = (Composite) super.createDialogArea(parent);
+						Composite container = new Composite(comp, SWT.NONE);
+						container.setLayout(new GridLayout(2, false));
+						container.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+						Label l = new Label(container, SWT.NONE);
+						l.setText(Messages.ControlFactory_Key);
+
+						key = new Text(container, SWT.BORDER);
+						key.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+						l = new Label(container, SWT.NONE);
+						l.setText(Messages.ControlFactory_Value);
+
+						value = new Text(container, SWT.BORDER);
+						value.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+						return comp;
+					}
+
+					@Override
+					protected void okPressed() {
+						if (key.getText().trim().length() > 0) {
+							BasicEMap.Entry<String, String> entry = (org.eclipse.emf.common.util.BasicEMap.Entry<String, String>) ApplicationFactoryImpl.eINSTANCE.createStringToStringMap();
+							entry.setHash(key.hashCode());
+							entry.setKey(key.getText());
+							entry.setValue(value.getText().trim().length() > 0 ? value.getText() : null);
+							Command cmd = AddCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), feature, entry);
+							if (cmd.canExecute()) {
+								editor.getEditingDomain().getCommandStack().execute(cmd);
+								super.okPressed();
+							}
+						}
+					}
+				};
+				dialog.open();
+			}
+		};
+		pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+		pickList.setText(label);
 		if (tooltip != null) {
-			l.setToolTipText(tooltip);
+			pickList.setToolTipText(tooltip);
 		}
-		GridData gd = new GridData(GridData.END, GridData.BEGINNING, false, false);
-		gd.verticalIndent = vIndent;
-		l.setLayoutData(gd);
 
-		final TableViewer tableviewer = new TableViewer(parent);
+		final TableViewer tableviewer = pickList.getList();
 		tableviewer.getTable().setHeaderVisible(true);
 		ObservableListContentProvider cp = new ObservableListContentProvider();
 		tableviewer.setContentProvider(cp);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
+
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.heightHint = 80;
 		gd.verticalIndent = vIndent;
 		tableviewer.getControl().setLayoutData(gd);
@@ -298,85 +351,7 @@ public void handleListChange(ListChangeEvent event) {
 			}
 		});
 
-		final Composite buttonComp = new Composite(parent, SWT.NONE);
-		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		GridLayout gl = new GridLayout();
-		gl.marginLeft = 0;
-		gl.marginRight = 0;
-		gl.marginWidth = 0;
-		gl.marginHeight = 0;
-		buttonComp.setLayout(gl);
-
-		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_AddEllipsis);
-		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_add));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				Dialog dialog = new Dialog(buttonComp.getShell()) {
-					private Text key;
-					private Text value;
-
-					@Override
-					protected Control createDialogArea(Composite parent) {
-						getShell().setText(Messages.ControlFactory_KeyValueShellTitle);
-						Composite comp = (Composite) super.createDialogArea(parent);
-						Composite container = new Composite(comp, SWT.NONE);
-						container.setLayout(new GridLayout(2, false));
-						container.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-						Label l = new Label(container, SWT.NONE);
-						l.setText(Messages.ControlFactory_Key);
-
-						key = new Text(container, SWT.BORDER);
-						key.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-						l = new Label(container, SWT.NONE);
-						l.setText(Messages.ControlFactory_Value);
-
-						value = new Text(container, SWT.BORDER);
-						value.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-						return comp;
-					}
-
-					@Override
-					protected void okPressed() {
-						if (key.getText().trim().length() > 0) {
-							BasicEMap.Entry<String, String> entry = (org.eclipse.emf.common.util.BasicEMap.Entry<String, String>) ApplicationFactoryImpl.eINSTANCE.createStringToStringMap();
-							entry.setHash(key.hashCode());
-							entry.setKey(key.getText());
-							entry.setValue(value.getText().trim().length() > 0 ? value.getText() : null);
-							Command cmd = AddCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), feature, entry);
-							if (cmd.canExecute()) {
-								editor.getEditingDomain().getCommandStack().execute(cmd);
-								super.okPressed();
-							}
-						}
-					}
-				};
-				dialog.open();
-
-			}
-		});
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Remove);
-		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_delete));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) tableviewer.getSelection();
-				if (!selection.isEmpty()) {
-					Command cmd = RemoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), feature, selection.toList());
-					if (cmd.canExecute()) {
-						editor.getEditingDomain().getCommandStack().execute(cmd);
-					}
-				}
-			}
-		});
+		return pickList;
 	}
 
 	public static void createTextField(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp) {
@@ -578,92 +553,10 @@ public static void createBindingContextWiget(Composite parent, final Messages Me
 
 	public static void createBindingContextWiget(Composite parent, final Messages Messages, final AbstractComponentEditor editor, String label, String tooltip) {
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(label);
-			if (tooltip != null) {
-				l.setToolTipText(tooltip);
-			}
-			l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
-			final TableViewer viewer = new TableViewer(parent);
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			gd.heightHint = 120;
-			viewer.getControl().setLayoutData(gd);
-			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(editor.getEditor(), Messages));
-			viewer.setInput(EMFProperties.list(CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS).observeDetail(editor.getMaster()));
-
-			final Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MBindings container = (MBindings) editor.getMaster().getValue();
-							int idx = container.getBindingContexts().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
-
-								if (cmd.canExecute()) {
-									editor.getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_ORDER, PickListFeatures.NO_PICKER), Messages, editor, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MBindings container = (MBindings) editor.getMaster().getValue();
-							int idx = container.getBindingContexts().indexOf(obj) + 1;
-							if (idx < container.getBindingContexts().size()) {
-								Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, obj, idx);
-
-								if (cmd.canExecute()) {
-									editor.getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(buttonComp.getShell(), editor.getEditor().getModelProvider(), Messages);
+				protected void addPressed() {
+					BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(getShell(), editor.getEditor().getModelProvider(), Messages);
 					if (dialog.open() == IDialogConstants.OK_ID) {
 						Command cmd = AddCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, dialog.getSelectedContext());
 						if (cmd.canExecute()) {
@@ -671,42 +564,34 @@ public void widgetSelected(SelectionEvent e) {
 						}
 					}
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					Command cmd = RemoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, ((IStructuredSelection) viewer.getSelection()).toList());
-					if (cmd.canExecute()) {
-						editor.getEditingDomain().getCommandStack().execute(cmd);
-					}
-				}
-			});
+			pickList.setText(label);
+			pickList.getList().setInput(EMFProperties.list(CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS).observeDetail(editor.getMaster()));
 		}
 	}
 
-	public static void createStringListWidget(Composite parent, Messages Messages, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
-		createStringListWidget(parent, Messages, editor, label, null, feature, vIndent);
+	public static Composite createStringListWidget(Composite parent, Messages Messages, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
+		return createStringListWidget(parent, Messages, editor, label, null, feature, vIndent);
 	}
 
-	public static void createStringListWidget(Composite parent, Messages Messages, final AbstractComponentEditor editor, String label, String tooltip, final EStructuralFeature feature, int vIndent) {
-		Label l = new Label(parent, SWT.NONE);
-		l.setText(label);
+	public static Composite createStringListWidget(Composite parent, Messages Messages, final AbstractComponentEditor editor, String label, String tooltip, final EStructuralFeature feature, int vIndent) {
+
+		E4StringPickList pickList = new E4StringPickList(parent, SWT.NONE, null, Messages, editor, feature) {
+			@Override
+			protected void addPressed() {
+				handleAddText(editor, feature, getTextWidget());
+			}
+		};
+
+		pickList.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
+		pickList.setText(label);
 		if (tooltip != null) {
-			l.setToolTipText(tooltip);
+			pickList.setToolTipText(tooltip);
 		}
-		GridData gd = new GridData(GridData.END, GridData.BEGINNING, false, false);
-		gd.verticalIndent = vIndent;
-		l.setLayoutData(gd);
 
-		final Text t = new Text(parent, SWT.BORDER);
-		gd = new GridData(GridData.FILL, GridData.BEGINNING, true, false);
-		gd.verticalIndent = vIndent;
-		t.setLayoutData(gd);
+		final Text t = pickList.getTextWidget();
 		t.addKeyListener(new KeyAdapter() {
 			@Override
 			public void keyPressed(KeyEvent e) {
@@ -718,30 +603,14 @@ public void keyPressed(KeyEvent e) {
 
 		TextPasteHandler.createFor(t);
 
-		final Button btnAdd = new Button(parent, SWT.PUSH | SWT.FLAT);
-		btnAdd.setText(Messages.ModelTooling_Common_Add);
-		btnAdd.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_add));
-		gd = new GridData(GridData.FILL, GridData.CENTER, false, false);
-		gd.verticalIndent = vIndent;
-		btnAdd.setLayoutData(gd);
-		btnAdd.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				handleAddText(editor, feature, t);
-			}
-		});
-
-		new Label(parent, SWT.NONE);
-
-		final TableViewer viewer = new TableViewer(parent);
+		final TableViewer viewer = pickList.getList();
 		viewer.setLabelProvider(new LabelProvider());
-		viewer.setContentProvider(new ObservableListContentProvider());
-		gd = new GridData(GridData.FILL_HORIZONTAL);
+		GridData gd = (GridData) viewer.getTable().getLayoutData();
 		gd.heightHint = 150;
-		viewer.getControl().setLayoutData(gd);
 
 		IEMFListProperty prop = EMFProperties.list(feature);
 		viewer.setInput(prop.observeDetail(editor.getMaster()));
+
 		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			@Override
@@ -751,137 +620,32 @@ public void selectionChanged(SelectionChangedEvent event) {
 			}
 		});
 
-		Composite compButton = new Composite(parent, SWT.NONE);
-		compButton.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		GridLayout gl = new GridLayout();
-		gl.marginLeft = 0;
-		gl.marginRight = 0;
-		gl.marginWidth = 0;
-		gl.marginHeight = 0;
-		compButton.setLayout(gl);
-
-		final Button btnReplace = new Button(compButton, SWT.PUSH | SWT.FLAT);
-		// TODO need to add icon for replace
-		btnReplace.setText(Messages.ModelTooling_Common_Replace);
-		btnReplace.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_add));
-		gd = new GridData(GridData.FILL, GridData.CENTER, false, false);
-		gd.verticalIndent = vIndent;
-		btnReplace.setLayoutData(gd);
-		btnReplace.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				handleReplaceText(editor, feature, t, viewer);
-			}
-		});
-
-		final Button btnUp = new Button(compButton, SWT.PUSH | SWT.FLAT);
-		btnUp.setText(Messages.ModelTooling_Common_Up);
-		btnUp.setImage(editor.createImage(ResourceProvider.IMG_Obj16_arrow_up));
-		btnUp.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		btnUp.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						EObject container = (EObject) editor.getMaster().getValue();
-						List<?> l = (List<?>) container.eGet(feature);
-						int idx = l.indexOf(obj) - 1;
-						if (idx >= 0) {
-							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), feature, obj, idx);
-
-							if (cmd.canExecute()) {
-								editor.getEditingDomain().getCommandStack().execute(cmd);
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
-				}
-			}
-		});
-
-		final Button btnDown = new Button(compButton, SWT.PUSH | SWT.FLAT);
-		btnDown.setText(Messages.ModelTooling_Common_Down);
-		btnDown.setImage(editor.createImage(ResourceProvider.IMG_Obj16_arrow_down));
-		btnDown.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		btnDown.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						EObject container = (EObject) editor.getMaster().getValue();
-						List<?> l = (List<?>) container.eGet(feature);
-						int idx = l.indexOf(obj) + 1;
-						if (idx < l.size()) {
-							Command cmd = MoveCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), feature, obj, idx);
-
-							if (cmd.canExecute()) {
-								editor.getEditingDomain().getCommandStack().execute(cmd);
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
-				}
-			}
-		});
-
-		final Button btnDelete = new Button(compButton, SWT.PUSH | SWT.FLAT);
-		btnDelete.setText(Messages.ModelTooling_Common_Remove);
-		btnDelete.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_delete));
-		btnDelete.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		btnDelete.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					EObject el = (EObject) editor.getMaster().getValue();
-					List<?> ids = ((IStructuredSelection) viewer.getSelection()).toList();
-					Command cmd = RemoveCommand.create(editor.getEditingDomain(), el, feature, ids);
-					if (cmd.canExecute()) {
-						editor.getEditingDomain().getCommandStack().execute(cmd);
-						if (ids.size() > 0) {
-							viewer.setSelection(new StructuredSelection(ids.get(0)));
-						}
-					}
-				}
-			}
-		});
-
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				updateUiState(viewer, t, btnAdd, btnReplace, btnDelete, btnDown, btnUp);
-			}
-		});
-
-		t.addModifyListener(new ModifyListener() {
-
-			@Override
-			public void modifyText(ModifyEvent e) {
-				updateUiState(viewer, t, btnAdd, btnReplace, btnDelete, btnDown, btnUp);
-			}
-		});
-
-		updateUiState(viewer, t, btnAdd, btnReplace, btnDelete, btnDown, btnUp);
-	}
-
-	private static void updateUiState(TableViewer viewer, Text t, Button btnAdd, Button btnReplace, Button btnDelete, Button btnDown, Button btnUp) {
-		IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
-		Object firstViewerElement = sel.getFirstElement();
-		boolean diff = !t.getText().equals(firstViewerElement);
-
-		btnReplace.setEnabled(firstViewerElement != null && !t.getText().isEmpty() && diff);
-		// TODO check valid value and not already in list
-		btnAdd.setEnabled(!t.getText().isEmpty());
+		//
+		// final Button btnDelete = new Button(compButton, SWT.PUSH | SWT.FLAT);
+		// btnDelete.setText(Messages.ModelTooling_Common_Remove);
+		// btnDelete.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_delete));
+		// btnDelete.setLayoutData(new GridData(GridData.FILL, GridData.CENTER,
+		// true, false));
+		// btnDelete.addSelectionListener(new SelectionAdapter() {
+		// @Override
+		// public void widgetSelected(SelectionEvent e) {
+		// if (!viewer.getSelection().isEmpty()) {
+		// EObject el = (EObject) editor.getMaster().getValue();
+		// List<?> ids = ((IStructuredSelection)
+		// viewer.getSelection()).toList();
+		// Command cmd = RemoveCommand.create(editor.getEditingDomain(), el,
+		// feature, ids);
+		// if (cmd.canExecute()) {
+		// editor.getEditingDomain().getCommandStack().execute(cmd);
+		// if (ids.size() > 0) {
+		// viewer.setSelection(new StructuredSelection(ids.get(0)));
+		// }
+		// }
+		// }
+		// }
+		// });
 
-		btnUp.setEnabled(firstViewerElement != null);
-		btnDown.setEnabled(firstViewerElement != null);
-		btnDelete.setEnabled(firstViewerElement != null);
+		return pickList;
 	}
 
 	private static void handleAddText(AbstractComponentEditor editor, EStructuralFeature feature, Text tagText) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index f94341bbdb..daab013b0d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -8,10 +8,12 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -28,9 +30,11 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Plugin;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.KeyBindingCommandSelectionDialog;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
 import org.eclipse.e4.ui.model.application.commands.MKeySequence;
@@ -44,15 +48,10 @@
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.bindings.keys.KeySequence;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -62,7 +61,6 @@
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -208,113 +206,26 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		Label l = new Label(parent, SWT.NONE);
-		l.setText(Messages.KeyBindingEditor_Parameters);
-		l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-		final TableViewer viewer = new TableViewer(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.BORDER);
-		ObservableListContentProvider cp = new ObservableListContentProvider();
-		viewer.setContentProvider(cp);
-		viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		viewer.getControl().setLayoutData(gd);
-
-		viewer.setInput(KEY_BINDING__PARAMETERS.observeDetail(getMaster()));
-
-		Composite buttonComp = new Composite(parent, SWT.NONE);
-		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		GridLayout gl = new GridLayout();
-		gl.marginLeft = 0;
-		gl.marginRight = 0;
-		gl.marginWidth = 0;
-		gl.marginHeight = 0;
-		buttonComp.setLayout(gl);
-
-		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Up);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						MKeyBinding container = (MKeyBinding) getMaster().getValue();
-						int idx = container.getParameters().indexOf(obj) - 1;
-						if (idx >= 0) {
-							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS, obj, idx);
-
-							if (cmd.canExecute()) {
-								getEditingDomain().getCommandStack().execute(cmd);
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
+		{
+			E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS) {
+				@Override
+				protected void addPressed() {
+					handleAddParameter();
 				}
-			}
-		});
 
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Down);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						MKeyBinding container = (MKeyBinding) getMaster().getValue();
-						int idx = container.getParameters().indexOf(obj) + 1;
-						if (idx < container.getParameters().size()) {
-							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS, obj, idx);
-
-							if (cmd.canExecute()) {
-								getEditingDomain().getCommandStack().execute(cmd);
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
+				@Override
+				protected List<?> getContainerChildren(Object master) {
+					return ((MCommand) master).getParameters();
 				}
-			}
-		});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			pickList.setText(Messages.KeyBindingEditor_Parameters);
 
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_AddEllipsis);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				handleAddParameter();
-			}
-		});
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Remove);
-		b.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-				if (!s.isEmpty()) {
-					MKeyBinding item = (MKeyBinding) getMaster().getValue();
-					Command cmd = RemoveCommand.create(getEditingDomain(), item, CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS, s.toList());
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-					}
-				}
-			}
+			final TableViewer viewer = pickList.getList();
 
-		});
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			viewer.setInput(KEY_BINDING__PARAMETERS.observeDetail(getMaster()));
+		}
+		//
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 43f7804a8a..d52525ff6a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -10,6 +10,7 @@
  *     Marco Descher <marco@descher.at> - Bug 397650, Bug 395982, Bug 396975
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  *     Nicolaj Hoess <nicohoess@gmail.com> - Bug 396975
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -24,11 +25,11 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList.Struct;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIdDialog;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
@@ -45,15 +46,11 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
@@ -64,7 +61,6 @@
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -86,18 +82,6 @@ public class MenuContributionEditor extends AbstractComponentEditor {
 	@Inject
 	private EModelService modelService;
 
-	private static class Struct {
-		private final String label;
-		private final EClass eClass;
-		private final boolean separator;
-
-		public Struct(String label, EClass eClass, boolean separator) {
-			this.label = label;
-			this.eClass = eClass;
-			this.separator = separator;
-		}
-	}
-
 	@Inject
 	public MenuContributionEditor() {
 		super();
@@ -251,132 +235,35 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuContributionEditor_MenuItems);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-			final TableViewer viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-
-			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(master));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
+			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) - 1;
-							if (idx >= 0) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
+				protected void addPressed() {
+					Struct struct = (Struct) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+					EClass eClass = struct.eClass;
+					MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
 
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) + 1;
-							if (idx < container.getChildren().size()) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						if (!struct.separator) {
+							getEditor().setSelection(eObject);
 						}
 					}
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			pickList.setText(Messages.MenuContributionEditor_MenuItems);
 
-			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					Struct struct = (Struct) element;
-					return struct.label;
-				}
-			});
+			final TableViewer viewer = pickList.getList();
+			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(master));
 
+			final ComboViewer childrenDropDown = pickList.getPicker();
 			Struct defaultStruct = new Struct(Messages.MenuContributionEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
 			childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuContributionEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuContributionEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuContributionEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false), new Struct(Messages.MenuContributionEditor_DynamicMenuContribution, MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
 			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!childrenDropDown.getSelection().isEmpty()) {
-						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-						EClass eClass = struct.eClass;
-						MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
-
-						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-							if (!struct.separator) {
-								getEditor().setSelection(eObject);
-							}
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
 		}
 
 		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index b354830c6b..ca7ebc2985 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 BestSolution.at and others.
+f * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,6 +13,9 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList.Struct;
+
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -34,7 +37,6 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EClass2EObject;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EObject2EClass;
@@ -42,7 +44,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MExpression;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
@@ -64,19 +65,15 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -85,7 +82,6 @@
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -114,18 +110,6 @@ public class MenuEditor extends AbstractComponentEditor {
 
 	private Action addExpression;
 
-	private static class Struct {
-		private final String label;
-		private final EClass eClass;
-		private final boolean separator;
-
-		public Struct(String label, EClass eClass, boolean separator) {
-			this.label = label;
-			this.eClass = eClass;
-			this.separator = separator;
-		}
-	}
-
 	@Inject
 	public MenuEditor() {
 		super();
@@ -259,130 +243,26 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		ControlFactory.createTextField(parent, Messages.MenuEditor_Mnemonics, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS));
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuEditor_Children);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			GridData span2 = new GridData(GridData.FILL, GridData.BEGINNING, false, false, 2, 1);
-			buttonComp.setLayoutData(span2);
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					Struct struct = (Struct) element;
-					return struct.label;
-				}
-			});
-
-			Struct defaultStruct = new Struct(Messages.MenuEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
-			childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false), new Struct(Messages.MenuEditor_DynamicMenuContribution, MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
-			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
 
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!childrenDropDown.getSelection().isEmpty()) {
-						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-						EClass eClass = struct.eClass;
-						handleAdd(eClass, struct.separator);
-					}
-				}
-			});
-
-			new Label(parent, SWT.None);
+			// Label l = new Label(parent, SWT.NONE);
+			// l.setText(Messages.MenuEditor_Children);
+			// l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING,
+			// false, false));
+			//
+			// new Label(parent, SWT.NONE);
+			// new Label(parent, SWT.NONE);
 
-			final TableViewer viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
+			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			pickList.setText(Messages.MenuEditor_Children);
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 
-			GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1);
-			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
+			Struct defaultStruct = new Struct(Messages.MenuEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
+			pickList.getPicker().setInput(new Struct[] { new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false), new Struct(Messages.MenuEditor_DynamicMenuContribution, MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
+			pickList.getPicker().setSelection(new StructuredSelection(defaultStruct));
 
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(master));
-
-			new Label(parent, SWT.None);
-
-			Composite buttonComp2 = new Composite(parent, SWT.NONE);
-			buttonComp2.setLayoutData(span2);
-			buttonComp2.setLayout(new FillLayout());
-
-			b = new Button(buttonComp2, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) - 1;
-							if (idx >= 0) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp2, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) + 1;
-							if (idx < container.getChildren().size()) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
+			pickList.getList().setInput(prop.observeDetail(master));
 
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp2, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
 		}
 
 		// ------------------------------------------------------------
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index e8b3462c85..53df5899e4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -115,6 +115,9 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	public String getLabel(Object element) {
+		if (element == BasicPackageImpl.Literals.INPUT_PART) {
+			return "Input Part";
+		}
 		return Messages.PartEditor_Label;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 898b1b7829..08349ac2c9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -23,12 +24,12 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.FeatureClassLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.tools.emf.ui.internal.imp.RegistryUtil;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
@@ -45,12 +46,10 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
@@ -65,13 +64,9 @@
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
@@ -276,31 +271,19 @@ public String getText(Object element) {
 		ControlFactory.createTextField(parent, Messages.PartSashContainerEditor_ContainerData, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		{
-
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartSashContainerEditor_Controls);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-			Composite buttonCompTop = new Composite(parent, SWT.NONE);
-			GridData span2 = new GridData(GridData.FILL, GridData.BEGINNING, false, false, 2, 1);
-			buttonCompTop.setLayoutData(span2);
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonCompTop.setLayout(gl);
-
-			final ComboViewer childrenDropDown = new ComboViewer(buttonCompTop);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
+			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
-				public String getText(Object element) {
-					FeatureClass eFeatureClass = (FeatureClass) element;
-					return eFeatureClass.eClass.getName();
+				protected void addPressed() {
+					EClass eClass = ((FeatureClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement()).eClass;
+					handleAddChild(eClass);
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			pickList.setText(Messages.PartSashContainerEditor_Controls);
+
+			final ComboViewer childrenDropDown = pickList.getPicker();
+			childrenDropDown.setLabelProvider(new FeatureClassLabelProvider(getEditor()));
+
 			List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
 			eClassList.add(new FeatureClass("PartSashContainer", BasicPackageImpl.Literals.PART_SASH_CONTAINER)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("PartStack", BasicPackageImpl.Literals.PART_STACK)); //$NON-NLS-1$
@@ -312,100 +295,9 @@ public String getText(Object element) {
 			childrenDropDown.setInput(eClassList);
 			childrenDropDown.setSelection(new StructuredSelection(eClassList.get(0)));
 
-			Button b = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!childrenDropDown.getSelection().isEmpty()) {
-						EClass eClass = ((FeatureClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement()).eClass;
-						handleAddChild(eClass);
-					}
-				}
-			});
-
-			new Label(parent, SWT.NONE);
-
-			final TableViewer viewer = new TableViewer(parent);
-			GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1);
-			viewer.getControl().setLayoutData(gd);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
+			final TableViewer viewer = pickList.getList();
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
-
-			new Label(parent, SWT.NONE);
-
-			Composite buttonCompBot = new Composite(parent, SWT.NONE);
-			buttonCompBot.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 2, 1));
-			buttonCompBot.setLayout(new FillLayout());
-
-			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) - 1;
-							if (idx >= 0) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) + 1;
-							if (idx < container.getChildren().size()) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
-
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index de78522831..a340895420 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -23,11 +24,11 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.FeatureClassLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MInputPart;
@@ -45,15 +46,11 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -63,17 +60,12 @@
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-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;
 
 public class PartStackEditor extends AbstractComponentEditor {
 
@@ -231,129 +223,32 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartStackEditor_Parts);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-			Composite buttonCompTop = new Composite(parent, SWT.NONE);
-			GridData span2 = new GridData(GridData.FILL, GridData.BEGINNING, false, false, 2, 1);
-			buttonCompTop.setLayoutData(span2);
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonCompTop.setLayout(gl);
-
-			final ComboViewer childrenDropDown = new ComboViewer(buttonCompTop);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					FeatureClass eclass = (FeatureClass) element;
-					return eclass.label;
-				}
-			});
-			List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
-			eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART));
-			eClassList.add(new FeatureClass("CompositePart", BasicPackageImpl.Literals.COMPOSITE_PART));
-			eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER));
-			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
-			childrenDropDown.setInput(eClassList);
-			childrenDropDown.setSelection(new StructuredSelection(eClassList.get(0)));
 
-			Button b = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					EClass eClass = ((FeatureClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement()).eClass;
+				protected void addPressed() {
+					EClass eClass = ((FeatureClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement()).eClass;
 					handleAddChild(eClass);
 				}
-			});
-
-			new Label(parent, SWT.NONE);
-
-			viewer = new TableViewer(parent);
-			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-			GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1);
-			viewer.getControl().setLayoutData(gd);
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			pickList.setText(Messages.PartStackEditor_Parts);
 
+			viewer = pickList.getList();
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
-			new Label(parent, SWT.NONE);
-
-			Composite buttonCompBot = new Composite(parent, SWT.NONE);
-			buttonCompBot.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 2, 1));
-			buttonCompBot.setLayout(new FillLayout());
+			final ComboViewer childrenDropDown = pickList.getPicker();
+			childrenDropDown.setLabelProvider(new FeatureClassLabelProvider(getEditor()));
 
-			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) - 1;
-							if (idx >= 0) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							@SuppressWarnings("unchecked")
-							MElementContainer<MUIElement> container = (MElementContainer<MUIElement>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) + 1;
-							if (idx < container.getChildren().size()) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-						}
-					}
-				}
-			});
+			List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
+			eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART));
+			eClassList.add(new FeatureClass("CompositePart", BasicPackageImpl.Literals.COMPOSITE_PART));
+			eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER));
+			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
+			childrenDropDown.setInput(eClassList);
+			childrenDropDown.setSelection(new StructuredSelection(eClassList.get(0)));
 
-			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
-
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 6ca961618d..69b3780c67 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -257,8 +257,11 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		Composite comp0 = ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+		comp0.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 3, 1));
+
+		Composite comp = ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		comp.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 3, 1));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index eb52d7a65c..ec5e87a3ca 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -23,10 +25,11 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
@@ -40,13 +43,10 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.window.Window;
@@ -55,16 +55,12 @@
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-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;
 
 public class PerspectiveStackEditor extends AbstractComponentEditor {
@@ -195,104 +191,21 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PerspectiveStackEditor_Perspectives);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
-			final TableViewer viewer = new TableViewer(parent);
-			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-
-			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(getMaster()));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) - 1;
-							if (idx >= 0) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) + 1;
-							if (idx < container.getChildren().size()) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
+				protected void addPressed() {
 					handleAddPerspective();
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			pickList.setText(Messages.PerspectiveStackEditor_Perspectives);
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
-
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
+			final TableViewer viewer = pickList.getList();
+			viewer.setContentProvider(new ObservableListContentProvider());
+			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
+			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(getMaster()));
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 4c1eb25d57..fff95367c5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -10,6 +10,7 @@
  *     Marco Descher <marco@descher.at> - Bug 397650
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  *     Nicolaj Hoess <nicohoess@gmail.com> - Bug 396975
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -26,12 +27,12 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList.Struct;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ToolBarIdDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
@@ -48,15 +49,11 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -94,18 +91,6 @@ public class ToolBarContributionEditor extends AbstractComponentEditor {
 	@Inject
 	private EModelService modelService;
 
-	private static class Struct {
-		private final String label;
-		private final EClass eClass;
-		private final boolean separator;
-
-		public Struct(String label, EClass eClass, boolean separator) {
-			this.label = label;
-			this.eClass = eClass;
-			this.separator = separator;
-		}
-	}
-
 	@Inject
 	public ToolBarContributionEditor() {
 		super();
@@ -253,133 +238,35 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ToolBarEditor_ToolbarItems);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-			final TableViewer viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(master));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
+			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) - 1;
-							if (idx >= 0) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) + 1;
-							if (idx < container.getChildren().size()) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
+				protected void addPressed() {
+					Struct struct = (Struct) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+					EClass eClass = struct.eClass;
+					MToolBarElement eObject = (MToolBarElement) EcoreUtil.create(eClass);
+					setElementId(eObject);
+
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						if (!struct.separator) {
+							getEditor().setSelection(eObject);
 						}
 					}
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			pickList.setText(Messages.ToolBarEditor_ToolbarItems);
+			TableViewer viewer = pickList.getList();
 
-			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					Struct struct = (Struct) element;
-					return struct.label;
-				}
-			});
+			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(master));
 
+			ComboViewer childrenDropDown = pickList.getPicker();
 			Struct defaultStruct = new Struct(Messages.ToolBarEditor_HandledToolItem, MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
 			childrenDropDown.setInput(new Struct[] { defaultStruct, new Struct(Messages.ToolBarEditor_DirectToolItem, MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false), new Struct(Messages.ToolBarEditor_ToolControl, MenuPackageImpl.Literals.TOOL_CONTROL, false), new Struct(Messages.ToolBarEditor_Separator, MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true) });
 			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!childrenDropDown.getSelection().isEmpty()) {
-						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-						EClass eClass = struct.eClass;
-						MToolBarElement eObject = (MToolBarElement) EcoreUtil.create(eClass);
-						setElementId(eObject);
-
-						Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-							if (!struct.separator) {
-								getEditor().setSelection(eObject);
-							}
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index aa645f4569..4e9d50645b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -21,9 +22,9 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList.Struct;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
@@ -39,31 +40,22 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-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;
 
 public class ToolBarEditor extends AbstractComponentEditor {
 
@@ -74,18 +66,6 @@ public class ToolBarEditor extends AbstractComponentEditor {
 	private StackLayout stackLayout;
 	private List<Action> actions = new ArrayList<Action>();
 
-	private static class Struct {
-		private final String label;
-		private final EClass eClass;
-		private final boolean separator;
-
-		public Struct(String label, EClass eClass, boolean separator) {
-			this.label = label;
-			this.eClass = eClass;
-			this.separator = separator;
-		}
-	}
-
 	@Inject
 	public ToolBarEditor() {
 		super();
@@ -202,123 +182,25 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ToolBarEditor_ToolbarItems);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-			final TableViewer viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(master));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
+			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) - 1;
-							if (idx >= 0) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
+				protected void addPressed() {
+					Struct struct = (Struct) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+					EClass eClass = struct.eClass;
+					handleAddChild(eClass, struct.separator);
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			pickList.setText(Messages.ToolBarEditor_ToolbarItems);
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) + 1;
-							if (idx < container.getChildren().size()) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					Struct struct = (Struct) element;
-					return struct.label;
-				}
-			});
+			TableViewer viewer = pickList.getList();
+			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			viewer.setInput(prop.observeDetail(master));
 
+			final ComboViewer childrenDropDown = pickList.getPicker();
 			Struct defaultStruct = new Struct(Messages.ToolBarEditor_HandledToolItem, MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
 			childrenDropDown.setInput(new Struct[] { defaultStruct, new Struct(Messages.ToolBarEditor_DirectToolItem, MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false), new Struct(Messages.ToolBarEditor_ToolControl, MenuPackageImpl.Literals.TOOL_CONTROL, false), new Struct(Messages.ToolBarEditor_Separator, MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true) });
 			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!childrenDropDown.getSelection().isEmpty()) {
-						Struct struct = (Struct) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-						EClass eClass = struct.eClass;
-						handleAddChild(eClass, struct.separator);
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, keybinding);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
 		}
 
 		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 029c8b6447..a6ed7cfd4b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -8,10 +8,12 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -24,11 +26,12 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.SideValue;
@@ -45,16 +48,13 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -62,13 +62,9 @@
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
@@ -210,121 +206,25 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.TrimBarEditor_Controls);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
-
-			Composite buttonCompTop = new Composite(parent, SWT.NONE);
-			buttonCompTop.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 2, 1));
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonCompTop.setLayout(gl);
-
-			final ComboViewer typeViewer = new ComboViewer(buttonCompTop, SWT.READ_ONLY);
-			typeViewer.setContentProvider(new ArrayContentProvider());
-			typeViewer.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					return ((EClass) element).getName();
-				}
-			});
-			typeViewer.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
-			typeViewer.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
-			typeViewer.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-
-			Button b = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					EClass eClass = (EClass) ((IStructuredSelection) typeViewer.getSelection()).getFirstElement();
+				protected void addPressed() {
+					EClass eClass = (EClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
 					handleAddChild(eClass);
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			pickList.setText(Messages.TrimBarEditor_Controls);
 
-			new Label(parent, SWT.NONE);
+			final TableViewer viewer = pickList.getList();
 
-			final TableViewer viewer = new TableViewer(parent);
-			viewer.setLabelProvider(new ComponentLabelProvider(editor, Messages));
-			viewer.setContentProvider(new ObservableListContentProvider());
-			GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1);
-			viewer.getControl().setLayoutData(gd);
+			final ComboViewer typeViewer = pickList.getPicker();
+			typeViewer.setLabelProvider(new EClassLabelProvider(getEditor()));
+			typeViewer.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
+			typeViewer.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
 
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
-
-			new Label(parent, SWT.NONE);
-
-			Composite buttonCompBot = new Composite(parent, SWT.NONE);
-			buttonCompBot.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 2, 1));
-			buttonCompBot.setLayout(new FillLayout());
-
-			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) - 1;
-							if (idx >= 0) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) + 1;
-							if (idx < container.getChildren().size()) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
-
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 9c97f06f83..bd329de05c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -10,9 +10,12 @@
  *     Marco Descher <marco@descher.at> - Bug 397650
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  *     Nicolaj Hoess <nicohoess@gmail.com> - Bug 396975
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -31,7 +34,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.TrimIdDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
@@ -47,7 +49,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -228,77 +229,23 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.TrimContributionEditor_Controls);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+				@Override
+				protected void addPressed() {
+					EClass eClass = (EClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+					handleAddChild(eClass);
+				}
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			pickList.setText(Messages.TrimContributionEditor_Controls);
 
-			final TableViewer viewer = new TableViewer(parent);
+			final TableViewer viewer = pickList.getList();
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 			viewer.setContentProvider(new ObservableListContentProvider());
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) - 1;
-							if (idx >= 0) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) + 1;
-							if (idx < container.getChildren().size()) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			final ComboViewer typeViewer = new ComboViewer(buttonComp, SWT.READ_ONLY);
+			final ComboViewer typeViewer = pickList.getPicker();
 			typeViewer.setContentProvider(new ArrayContentProvider());
 			typeViewer.setLabelProvider(new LabelProvider() {
 				@Override
@@ -308,42 +255,6 @@ public String getText(Object element) {
 			});
 			typeViewer.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
 			typeViewer.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					EObject toolbar = EcoreUtil.create((EClass) ((IStructuredSelection) typeViewer.getSelection()).getFirstElement());
-					setElementId(toolbar);
-
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(toolbar);
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
-
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index 28e69d2218..234bb55b79 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -8,10 +8,12 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Tracy Miranda <tracymiranda@yahoo.com> - bugfix for 430663
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -19,7 +21,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MAddon;
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -28,22 +32,13 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -111,99 +106,19 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, ApplicationPackageImpl.Literals.APPLICATION__ADDONS) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MApplication container = (MApplication) getMaster().getValue();
-							int idx = container.getAddons().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__ADDONS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MApplication container = (MApplication) getMaster().getValue();
-							int idx = container.getAddons().indexOf(obj) + 1;
-							if (idx < container.getAddons().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__ADDONS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
+				protected void addPressed() {
 					handleAddAddon();
-				}
-			});
+				};
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						handleRemoveAddons(((IStructuredSelection) viewer.getSelection()).toList());
-					}
+				protected List<?> getContainerChildren(Object container) {
+					return ((MApplication) container).getAddons();
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			viewer = pickList.getList();
 		}
 
 		folder.setSelection(0);
@@ -223,13 +138,6 @@ private void handleAddAddon() {
 		}
 	}
 
-	private void handleRemoveAddons(List<?> addons) {
-		Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__ADDONS, addons);
-		if (cmd.canExecute()) {
-			getEditingDomain().getCommandStack().execute(cmd);
-		}
-	}
-
 	@Override
 	public IObservableList getChildList(Object element) {
 		return null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index f7d1cc2183..9fde785247 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -18,7 +20,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -28,24 +32,15 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -131,103 +126,19 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MApplication container = (MApplication) getMaster().getValue();
-							int idx = container.getCategories().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MApplication container = (MApplication) getMaster().getValue();
-							int idx = container.getCategories().indexOf(obj) + 1;
-							if (idx < container.getCategories().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
+				protected void addPressed() {
 					handleAdd();
 				}
-			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> commands = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES, commands);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
+				protected List<?> getContainerChildren(Object container) {
+					return ((MApplication) container).getCategories();
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			viewer = pickList.getList();
 		}
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index d703c46427..c3e718f023 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -18,38 +20,31 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.MBindingTable;
-import org.eclipse.e4.ui.model.application.commands.MBindingTableContainer;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 public class VBindingTableEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private TableViewer bindingViewer;
+	private TableViewer viewer;
 	private List<Action> actions = new ArrayList<Action>();
 
 	@Inject
@@ -95,7 +90,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 		}
 		VirtualEntry<?> o = (VirtualEntry<?>) object;
-		bindingViewer.setInput(o.getList());
+		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
@@ -110,103 +105,19 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			bindingViewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			bindingViewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			bindingViewer.getControl().setLayoutData(gd);
-			bindingViewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!bindingViewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) bindingViewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MBindingTableContainer container = (MBindingTableContainer) getMaster().getValue();
-							int idx = container.getBindingTables().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									bindingViewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!bindingViewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) bindingViewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MBindingTableContainer container = (MBindingTableContainer) getMaster().getValue();
-							int idx = container.getBindingTables().indexOf(obj) + 1;
-							if (idx < container.getBindingTables().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									bindingViewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
+				protected void addPressed() {
 					handleAdd();
 				}
-			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!bindingViewer.getSelection().isEmpty()) {
-						List<?> commands = ((IStructuredSelection) bindingViewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES, commands);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
+				protected List<?> getContainerChildren(Object container) {
+					return ((MApplication) container).getBindingTables();
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			viewer = pickList.getList();
 		}
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 7153fe2c7e..cac2b9a8d8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -18,7 +20,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -29,24 +33,15 @@
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -124,103 +119,19 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MApplication container = (MApplication) getMaster().getValue();
-							int idx = container.getCommands().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), commandsFeature, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, ApplicationPackageImpl.Literals.APPLICATION__COMMANDS) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MApplication container = (MApplication) getMaster().getValue();
-							int idx = container.getCommands().indexOf(obj) + 1;
-							if (idx < container.getCommands().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), commandsFeature, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
+				protected void addPressed() {
 					handleAdd();
-				}
-			});
+				};
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> commands = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), commandsFeature, commands);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
+				protected List<?> getContainerChildren(Object container) {
+					return ((MApplication) container).getCommands();
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			viewer = pickList.getList();
 		}
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 5f0a49f233..13b0059ef7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -18,7 +20,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
@@ -28,24 +32,15 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -121,103 +116,23 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MHandlerContainer container = (MHandlerContainer) getMaster().getValue();
-							int idx = container.getHandlers().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MHandlerContainer container = (MHandlerContainer) getMaster().getValue();
-							int idx = container.getHandlers().indexOf(obj) + 1;
-							if (idx < container.getHandlers().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
+				protected void addPressed() {
 					handleAdd();
 				}
-			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> handlers = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, handlers);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
+				protected List<?> getContainerChildren(Object container) {
+					if (container instanceof MHandlerContainer) {
+						return ((MHandlerContainer) container).getHandlers();
+					} else {
+						return null;
 					}
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			viewer = pickList.getList();
 		}
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
index c12a38667b..98ee033c5b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -18,7 +20,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
@@ -29,22 +33,13 @@
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -113,103 +108,23 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MHandledItem container = (MHandledItem) getMaster().getValue();
-							int idx = container.getParameters().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MHandledItem container = (MHandledItem) getMaster().getValue();
-							int idx = container.getParameters().indexOf(obj) + 1;
-							if (idx < container.getParameters().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
+				protected void addPressed() {
 					handleAdd();
 				}
-			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> handlers = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, handlers);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
+				protected List<?> getContainerChildren(Object container) {
+					if (container instanceof MHandledItem) {
+						return ((MHandledItem) container).getParameters();
+					} else {
+						return null;
 					}
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			viewer = pickList.getList();
 		}
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index 70c2d3a53f..2e39a06275 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -18,31 +20,24 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -110,103 +105,20 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MMenuContributions container = (MMenuContributions) getMaster().getValue();
-							int idx = container.getMenuContributions().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MMenuContributions container = (MMenuContributions) getMaster().getValue();
-							int idx = container.getMenuContributions().indexOf(obj) + 1;
-							if (idx < container.getMenuContributions().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
+				protected void addPressed() {
 					handleAdd();
 				}
-			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> commands = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS, commands);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
+				protected List<?> getContainerChildren(Object container) {
+					return ((MApplication) container).getMenuContributions();
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			viewer = pickList.getList();
+
 		}
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 2f4fc4d4f1..42f4ae4610 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -7,9 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -19,10 +22,10 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.ViewerElement;
-import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
@@ -33,11 +36,9 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -45,9 +46,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -135,60 +135,36 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		final ViewerElement tableElement = ViewerElement.create(eclipseContext, parent, this);
-		viewer = tableElement.getViewer();
-		viewer.setContentProvider(new ObservableListContentProvider());
-		viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-		tableElement.getButtonUp().addSelectionListener(new SelectionAdapter() {
+		AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, feature) {
 			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						EObject container = (EObject) getMaster().getValue();
-						int idx = ((List<?>) container.eGet(feature)).indexOf(obj) - 1;
-						if (idx >= 0) {
-							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), feature, obj, idx);
-
-							if (cmd.canExecute()) {
-								getEditingDomain().getCommandStack().execute(cmd);
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
+			protected void addPressed() {
+				Types t = (Types) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+				if (t == Types.MENU) {
+					handleAdd(MenuPackageImpl.Literals.MENU);
+				} else if (t == Types.POPUP_MENU) {
+					handleAdd(MenuPackageImpl.Literals.POPUP_MENU);
+				} else {
+					handleAddViewMenu();
 				}
 			}
-		});
 
-		tableElement.getButtonDown().addSelectionListener(new SelectionAdapter() {
 			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						EObject container = (EObject) getMaster().getValue();
-						List<?> list = (List<?>) container.eGet(feature);
-						int idx = list.indexOf(obj) + 1;
-						if (idx < list.size()) {
-							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), feature, obj, idx);
-
-							if (cmd.canExecute()) {
-								getEditingDomain().getCommandStack().execute(cmd);
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
+			protected List<?> getContainerChildren(Object container) {
+				if (container instanceof MPartDescriptor) {
+					return ((MPartDescriptor) container).getMenus();
+				} else if (container instanceof MPart) {
+					return ((MPart) container).getMenus();
+				} else {
+					return null;
 				}
 			}
-		});
+		};
+		pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+		viewer = pickList.getList();
 
-		tableElement.getDropDown().setContentProvider(new ArrayContentProvider());
-		tableElement.getDropDown().setLabelProvider(new LabelProvider() {
+		ComboViewer picker = pickList.getPicker();
+		picker.setContentProvider(new ArrayContentProvider());
+		picker.setLabelProvider(new LabelProvider() {
 			@Override
 			public String getText(Object element) {
 				if (element == Types.MENU) {
@@ -199,35 +175,8 @@ public String getText(Object element) {
 				return Messages.MenuEditor_Label_ViewMenu;
 			}
 		});
-		tableElement.getDropDown().setInput(Types.values());
-		tableElement.getDropDown().setSelection(new StructuredSelection(Types.MENU));
-
-		tableElement.getButtonAdd().addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				Types t = (Types) ((IStructuredSelection) tableElement.getDropDown().getSelection()).getFirstElement();
-				if (t == Types.MENU) {
-					handleAdd(MenuPackageImpl.Literals.MENU);
-				} else if (t == Types.POPUP_MENU) {
-					handleAdd(MenuPackageImpl.Literals.POPUP_MENU);
-				} else {
-					handleAddViewMenu();
-				}
-			}
-		});
-
-		tableElement.getButtonRemove().addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					List<?> windows = ((IStructuredSelection) viewer.getSelection()).toList();
-					Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART__MENUS, windows);
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-					}
-				}
-			}
-		});
+		picker.setInput(Types.values());
+		picker.setSelection(new StructuredSelection(Types.MENU));
 
 		folder.setSelection(0);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index d5aa32a950..f42d95912f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -18,7 +20,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
@@ -27,22 +31,13 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -109,109 +104,19 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			gd.horizontalSpan = 3;
-			viewer.getControl().setLayoutData(gd);
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(4, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 1, 1));
-			b.addSelectionListener(new SelectionAdapter() {
+			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MModelFragments container = (MModelFragments) getMaster().getValue();
-							int idx = container.getFragments().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 1, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MModelFragments container = (MModelFragments) getMaster().getValue();
-							int idx = container.getFragments().indexOf(obj) + 1;
-							if (idx < container.getFragments().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-
+				protected void addPressed() {
 					handleAdd();
-
 				}
 
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 1, 1));
-			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
-
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, elements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
+				protected List<?> getContainerChildren(Object container) {
+					return ((MModelFragments) container).getFragments();
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			viewer = pickList.getList();
 		}
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index 484f14eca3..8ab66aba7e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -18,7 +20,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.tools.emf.ui.internal.imp.RegistryUtil;
@@ -30,24 +34,15 @@
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -136,103 +131,20 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MPartDescriptorContainer container = (MPartDescriptorContainer) getMaster().getValue();
-							int idx = container.getDescriptors().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MPartDescriptorContainer container = (MPartDescriptorContainer) getMaster().getValue();
-							int idx = container.getDescriptors().indexOf(obj) + 1;
-							if (idx < container.getDescriptors().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
+				protected void addPressed() {
 					handleAdd();
 				}
-			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> commands = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, commands);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
+				protected List<?> getContainerChildren(Object container) {
+					MPartDescriptorContainer c = (MPartDescriptorContainer) container;
+					return c.getDescriptors();
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			viewer = pickList.getList();
 		}
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index bcf9e7553d..7006292058 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -7,22 +7,23 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -32,24 +33,17 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -143,113 +137,21 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) - 1;
-							if (idx >= 0) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
+			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) + 1;
-							if (idx < container.getChildren().size()) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-						}
-					}
+				protected void addPressed() {
+					EClass eClass = (EClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+					handleAdd(eClass);
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			viewer = pickList.getList();
 
-			final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-			childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+			final ComboViewer childrenDropDown = pickList.getPicker();
 			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					EClass eclass = (EClass) element;
-					return eclass.getName();
-				}
-			});
+			childrenDropDown.setLabelProvider(new EClassLabelProvider(getEditor()));
 			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
 			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!childrenDropDown.getSelection().isEmpty()) {
-						EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
-						handleAdd(eClass);
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
-
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
 		}
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
index cb58e9424e..f200f421d6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -18,7 +20,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.MBindingContext;
@@ -27,22 +31,14 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -110,99 +106,19 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MApplication container = (MApplication) getMaster().getValue();
-							int idx = container.getAddons().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MApplication container = (MApplication) getMaster().getValue();
-							int idx = container.getAddons().indexOf(obj) + 1;
-							if (idx < container.getAddons().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
+				protected void addPressed() {
 					handleAddContext();
 				}
-			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						handleRemoveContexts(((IStructuredSelection) viewer.getSelection()).toList());
-					}
+				protected List<?> getContainerChildren(Object container) {
+					return ((MApplication) container).getRootContext();
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			viewer = pickList.getList();
 		}
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index 1709b863f6..0e9abd1cea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -1,5 +1,10 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+/*
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ */
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -7,13 +12,12 @@
 import javax.annotation.PostConstruct;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -24,24 +28,15 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -190,118 +185,24 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		viewer = new TableViewer(parent);
-		ObservableListContentProvider cp = new ObservableListContentProvider();
-		viewer.setContentProvider(cp);
-		viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		viewer.getControl().setLayoutData(gd);
-
-		Composite buttonComp = new Composite(parent, SWT.NONE);
-		buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-		GridLayout gl = new GridLayout(2, false);
-		gl.marginLeft = 0;
-		gl.marginRight = 0;
-		gl.marginWidth = 0;
-		gl.marginHeight = 0;
-		buttonComp.setLayout(gl);
-
-		Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-
-		b.setText(Messages.ModelTooling_Common_Up);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-		b.addSelectionListener(new SelectionAdapter() {
-			@SuppressWarnings("unchecked")
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						EObject container = (EObject) getMaster().getValue();
-						List<Object> l = (List<Object>) container.eGet(targetFeature);
-						int idx = l.indexOf(obj) - 1;
-						if (idx >= 0) {
-							if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx, targetFeature)) {
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
-				}
-			}
-		});
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Down);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-		b.addSelectionListener(new SelectionAdapter() {
-			@SuppressWarnings("unchecked")
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						EObject container = (EObject) getMaster().getValue();
-						List<Object> l = (List<Object>) container.eGet(targetFeature);
-						int idx = l.indexOf(obj) + 1;
-						if (idx < l.size()) {
-							if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx, targetFeature)) {
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-					}
-				}
-			}
-		});
-
-		final ComboViewer childrenDropDown = new ComboViewer(buttonComp);
-		childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		childrenDropDown.setContentProvider(new ArrayContentProvider());
-		childrenDropDown.setLabelProvider(new LabelProvider() {
+		AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, targetFeature) {
 			@Override
-			public String getText(Object element) {
-				EClass eclass = (EClass) element;
-				return eclass.getName();
-			}
-		});
-		childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW, AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, AdvancedPackageImpl.Literals.PERSPECTIVE, AdvancedPackageImpl.Literals.AREA, BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, BasicPackageImpl.Literals.TRIM_BAR, BasicPackageImpl.Literals.TRIM_ELEMENT, });
-		childrenDropDown.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE));
-
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+			protected void addPressed() {
+				EClass eClass = (EClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
 				handleAdd(eClass);
-			}
-		});
+			};
 
-		b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Remove);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-		b.addSelectionListener(new SelectionAdapter() {
 			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					List<?> windows = ((IStructuredSelection) viewer.getSelection()).toList();
-					MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-					Command cmd = RemoveCommand.create(getEditingDomain(), container, targetFeature, windows);
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						if (container.getChildren().size() > 0) {
-							viewer.setSelection(new StructuredSelection(container.getChildren().get(0)));
-						}
-					}
-				}
+			protected List<?> getContainerChildren(Object container) {
+				return ((MApplication) container).getSnippets();
 			}
-		});
+		};
+		pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+		viewer = pickList.getList();
+
+		pickList.getPicker().setLabelProvider(new EClassLabelProvider(getEditor()));
+		pickList.getPicker().setInput(new EClass[] { BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW, AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, AdvancedPackageImpl.Literals.PERSPECTIVE, AdvancedPackageImpl.Literals.AREA, BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, BasicPackageImpl.Literals.TRIM_BAR, BasicPackageImpl.Literals.TRIM_ELEMENT, });
+		pickList.getPicker().setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE));
 
 		folder.setSelection(0);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index ab026ff2cd..857d35077d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -18,31 +20,24 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContributions;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -109,103 +104,19 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MToolBarContributions container = (MToolBarContributions) getMaster().getValue();
-							int idx = container.getToolBarContributions().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MToolBarContributions container = (MToolBarContributions) getMaster().getValue();
-							int idx = container.getToolBarContributions().indexOf(obj) + 1;
-							if (idx < container.getToolBarContributions().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
+				protected void addPressed() {
 					handleAdd();
-				}
-			});
+				};
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> commands = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS, commands);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
+				protected List<?> getContainerChildren(Object container) {
+					return ((MApplication) container).getToolBarContributions();
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			viewer = pickList.getList();
 		}
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index 196ed27447..b0509b1cb7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -18,31 +20,24 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
-import org.eclipse.e4.ui.model.application.ui.menu.MTrimContributions;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -109,103 +104,19 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MTrimContributions container = (MTrimContributions) getMaster().getValue();
-							int idx = container.getTrimContributions().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MTrimContributions container = (MTrimContributions) getMaster().getValue();
-							int idx = container.getTrimContributions().indexOf(obj) + 1;
-							if (idx < container.getTrimContributions().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
+				protected void addPressed() {
 					handleAdd();
-				}
-			});
+				};
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> commands = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS, commands);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
+				protected List<?> getContainerChildren(Object container) {
+					return ((MApplication) container).getTrimContributions();
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			viewer = pickList.getList();
 		}
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 2e56bda402..3ac3a01f7c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -7,9 +7,13 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -19,14 +23,9 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.ViewerElement;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -36,19 +35,17 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -56,7 +53,7 @@ public class VWindowControlEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private List<Action> actions = new ArrayList<Action>();
-	private ViewerElement tableElement;
+	private TableViewer viewer;
 
 	@Inject
 	IEclipseContext eclipseContext;
@@ -138,7 +135,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			composite = createForm(parent, context, getMaster());
 		}
 		VirtualEntry<?> o = (VirtualEntry<?>) object;
-		tableElement.getViewer().setInput(o.getList());
+		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
@@ -153,14 +150,19 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
+			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+				@Override
+				protected void addPressed() {
+					EClass eClass = (EClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+					handleAdd(eClass);
+				};
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			viewer = pickList.getList();
 
-			tableElement = ViewerElement.create(eclipseContext, parent, this);
-			tableElement.getViewer().setContentProvider(new ObservableListContentProvider());
-			tableElement.getViewer().setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			tableElement.getDropDown().setContentProvider(new ArrayContentProvider());
+			ComboViewer picker = pickList.getPicker();
 
-			tableElement.getDropDown().setLabelProvider(new LabelProvider() {
+			picker.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
 					EClass eclass = (EClass) element;
@@ -168,72 +170,8 @@ public String getText(Object element) {
 				}
 			});
 
-			tableElement.getButtonAdd().addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!tableElement.getDropDown().getSelection().isEmpty()) {
-						EClass eClass = (EClass) ((IStructuredSelection) tableElement.getDropDown().getSelection()).getFirstElement();
-						handleAdd(eClass);
-					}
-				}
-			});
-
-			tableElement.getButtonRemove().addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!tableElement.getViewer().getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) tableElement.getViewer().getSelection()).toList();
-
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
-
-			tableElement.getButtonDown().addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!tableElement.getViewer().getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) tableElement.getViewer().getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) + 1;
-							if (idx < container.getChildren().size()) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									tableElement.getViewer().setSelection(new StructuredSelection(obj));
-								}
-							}
-						}
-					}
-				}
-			});
-
-			tableElement.getButtonUp().addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!tableElement.getViewer().getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) tableElement.getViewer().getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) - 1;
-							if (idx >= 0) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
-									tableElement.getViewer().setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			tableElement.getDropDown().setInput(new EClass[] { AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA });
-			tableElement.getDropDown().setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK));
-
+			picker.setInput(new EClass[] { AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA });
+			picker.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK));
 		}
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 5ddd02da73..d490f8e7b6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -7,21 +7,23 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -30,24 +32,16 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -132,128 +126,46 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		Composite buttonCompTop = new Composite(parent, SWT.NONE);
-		buttonCompTop.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 3, 1));
-		GridLayout gl = new GridLayout(2, false);
-		gl.marginLeft = 0;
-		gl.marginRight = 0;
-		gl.marginWidth = 0;
-		gl.marginHeight = 0;
-		buttonCompTop.setLayout(gl);
-
-		final ComboViewer childrenDropDown = new ComboViewer(buttonCompTop);
-		childrenDropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		childrenDropDown.setContentProvider(new ArrayContentProvider());
-		childrenDropDown.setLabelProvider(new LabelProvider() {
+		AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, targetFeature) {
 			@Override
-			public String getText(Object element) {
-				EClass eclass = (EClass) element;
-				return eclass.getName();
-			}
-		});
-		childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.DIALOG, BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW, BasicPackageImpl.Literals.WIZARD_DIALOG });
-		childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.TRIMMED_WINDOW));
-
-		Button b = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_AddEllipsis);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				EClass eClass = (EClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement();
+			protected void addPressed() {
+				EClass eClass = (EClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
 				handleAdd(eClass);
 			}
-		});
-
-		viewer = new TableViewer(parent);
-		ObservableListContentProvider cp = new ObservableListContentProvider();
-		viewer.setContentProvider(cp);
-		viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-		GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 3, 1);
-		viewer.getControl().setLayoutData(gd);
-
-		Composite buttonCompBot = new Composite(parent, SWT.NONE);
-		buttonCompBot.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 3, 1));
-		GridLayout gl1 = new GridLayout(3, false);
-		gl1.marginLeft = 0;
-		gl1.marginRight = 0;
-		gl1.marginWidth = 0;
-		gl1.marginHeight = 0;
-		buttonCompBot.setLayout(gl1);
 
-		b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-
-		b.setText(Messages.ModelTooling_Common_Up);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@SuppressWarnings("unchecked")
 			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						EObject container = (EObject) getMaster().getValue();
-						List<Object> l = (List<Object>) container.eGet(targetFeature);
-						int idx = l.indexOf(obj) - 1;
-						if (idx >= 0) {
-							if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx, targetFeature)) {
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
-				}
+			protected List<?> getContainerChildren(Object container) {
+				return ((MApplication) container).getChildren();
 			}
-		});
+		};
+		pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+		viewer = pickList.getList();
 
-		b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Down);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@SuppressWarnings("unchecked")
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						EObject container = (EObject) getMaster().getValue();
-						List<Object> l = (List<Object>) container.eGet(targetFeature);
-						int idx = l.indexOf(obj) + 1;
-						if (idx < l.size()) {
-							if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx, targetFeature)) {
-								viewer.setSelection(new StructuredSelection(obj));
-							}
-						}
-					}
-				}
-			}
-		});
+		final ComboViewer childrenDropDown = pickList.getPicker();
+		childrenDropDown.setLabelProvider(new EClassLabelProvider(getEditor()));
+		childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.DIALOG, BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW, BasicPackageImpl.Literals.WIZARD_DIALOG });
+		childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.TRIMMED_WINDOW));
 
-		b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_Remove);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!viewer.getSelection().isEmpty()) {
-					List<?> windows = ((IStructuredSelection) viewer.getSelection()).toList();
-					MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-					Command cmd = RemoveCommand.create(getEditingDomain(), container, targetFeature, windows);
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						if (container.getChildren().size() > 0) {
-							viewer.setSelection(new StructuredSelection(container.getChildren().get(0)));
-						}
-					}
-				}
-			}
-		});
+		// @SuppressWarnings("unchecked")
+		// @Override
+		// public void widgetSelected(SelectionEvent e) {
+		// if (!viewer.getSelection().isEmpty()) {
+		// IStructuredSelection s = (IStructuredSelection)
+		// viewer.getSelection();
+		// if (s.size() == 1) {
+		// Object obj = s.getFirstElement();
+		// EObject container = (EObject) getMaster().getValue();
+		// List<Object> l = (List<Object>) container.eGet(targetFeature);
+		// int idx = l.indexOf(obj) - 1;
+		// if (idx >= 0) {
+		// if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj,
+		// getEditor().isLiveModel(), idx, targetFeature)) {
+		// viewer.setSelection(new StructuredSelection(obj));
+		// }
+		// }
+		//
+		// }
+		// }
 
 		folder.setSelection(0);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 78b28e5d41..c74bd9e6e2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Wim Jongman <wim.jongman@remainsoftware.com> - bug 400804
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
@@ -20,13 +21,15 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.ViewerElement;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.tools.emf.ui.internal.imp.RegistryUtil;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -36,13 +39,9 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.window.Window;
@@ -50,9 +49,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -167,94 +165,28 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 
-			final ViewerElement tableElement = ViewerElement.create(eclipseContext, parent, this);
-			viewer = tableElement.getViewer();
-			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
-			viewer.setInput(prop.observeDetail(getMaster()));
-
-			tableElement.getButtonUp().addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							EObject container = (EObject) getMaster().getValue();
-							int idx = ((List<?>) container.eGet(BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS)).indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-						}
-					}
-				}
-			});
-
-			tableElement.getButtonDown().addSelectionListener(new SelectionAdapter() {
+			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							EObject container = (EObject) getMaster().getValue();
-							List<?> list = (List<?>) container.eGet(BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
-							int idx = list.indexOf(obj) + 1;
-							if (idx < list.size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-						}
-					}
+				protected void addPressed() {
+					EClass eClass = (EClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+					handleAdd(eClass);
 				}
-			});
 
-			tableElement.getDropDown().setContentProvider(new ArrayContentProvider());
-			tableElement.getDropDown().setLabelProvider(new LabelProvider() {
 				@Override
-				public String getText(Object element) {
-					EClass eclass = (EClass) element;
-					return eclass.getName();
+				protected List<?> getContainerChildren(Object container) {
+					return ((MWindow) container).getSharedElements();
 				}
-			});
-			tableElement.getDropDown().setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, BasicPackageImpl.Literals.PART_STACK, AdvancedPackageImpl.Literals.AREA });
-			tableElement.getDropDown().setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			viewer = pickList.getList();
 
-			tableElement.getButtonAdd().addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!tableElement.getDropDown().getSelection().isEmpty()) {
-						EClass eClass = (EClass) ((IStructuredSelection) tableElement.getDropDown().getSelection()).getFirstElement();
-						handleAdd(eClass);
-					}
-				}
-			});
+			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
+			viewer.setInput(prop.observeDetail(getMaster()));
 
-			tableElement.getButtonRemove().addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
-
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, elements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
+			final ComboViewer tableElement = pickList.getPicker();
+			tableElement.setLabelProvider(new EClassLabelProvider(getEditor()));
+			tableElement.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, BasicPackageImpl.Literals.PART_STACK, AdvancedPackageImpl.Literals.AREA });
+			tableElement.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
 		}
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index 0ffae0236a..5409c072d9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -18,28 +20,24 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
 import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -106,50 +104,23 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			viewer = new TableViewer(parent);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout();
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
+				protected void addPressed() {
 					handleAdd();
 				}
-			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> trimElements = ((IStructuredSelection) viewer.getSelection()).toList();
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS, trimElements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
+				protected List<?> getContainerChildren(Object master) {
+					if (master instanceof MTrimmedWindow) {
+						return ((MTrimmedWindow) master).getTrimBars();
+					} else {
+						return null;
 					}
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			viewer = pickList.getList();
 		}
 
 		folder.setSelection(0);

From 29db4b085afe389fd826c57780ab77831662c55b Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Sat, 20 Sep 2014 18:51:36 -0400
Subject: [PATCH 0812/1286] Bug 444340 - Externalize Strings

This is an installment patch.  Do not close bug yet.

Change-Id: I71f400ad12da7bf783b43574a1c7b9657411bad8
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../e4/tools/emf/ui/internal/Messages.java    | 92 +++++++++++++------
 .../tools/emf/ui/internal/Messages.properties | 41 ++++++++-
 .../ui/internal/common/E4StringPickList.java  |  4 +-
 .../emf/ui/internal/common/ModelEditor.java   | 12 +--
 .../common/component/ApplicationEditor.java   | 53 +++++------
 .../common/component/KeyBindingEditor.java    | 10 +-
 .../internal/common/component/PartEditor.java |  4 +-
 .../common/component/PartStackEditor.java     | 10 +-
 .../common/component/TrimBarEditor.java       |  6 ++
 .../UnsettableUpdateValueStrategy.java        | 10 +-
 .../common/component/tabs/EmfUtil.java        |  5 +-
 .../common/component/tabs/ListTab.java        | 34 +++----
 .../common/component/tabs/Messages.java       |  2 +
 .../common/component/tabs/XmiTab.java         | 10 +-
 .../common/component/tabs/messages.properties |  1 +
 .../component/virtual/VCommandEditor.java     | 10 +-
 .../component/virtual/VPartDescriptor.java    |  6 +-
 .../virtual/VWindowSharedElementsEditor.java  |  6 +-
 .../common/resourcelocator/Messages.java      |  9 ++
 .../TargetPlatformContributionCollector.java  | 10 +-
 .../dialogs/BundleClassDialog.java            | 15 ++-
 .../dialogs/FindContributionDialog.java       | 12 +--
 .../dialogs/NonReferencedActionPage.java      | 12 +--
 .../dialogs/NonReferencedResourceDialog.java  |  8 +-
 .../dialogs/PickProjectFolderPage.java        |  4 +-
 .../dialogs/PickProjectPage.java              |  4 +-
 .../resourcelocator/messages.properties       |  9 ++
 .../MarkDuplicateAttributesHandler.java       |  9 +-
 .../tools/emf/ui/internal/imp/Messages.java   | 26 ++++++
 .../emf/ui/internal/imp/ModelImportPage1.java | 21 +++--
 .../ui/internal/imp/ModelImportWizard.java    | 17 ++--
 .../emf/ui/internal/imp/RegistryUtil.java     | 27 +++---
 .../emf/ui/internal/imp/messages.properties   | 11 +++
 33 files changed, 334 insertions(+), 176 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/Messages.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/messages.properties

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index b1976f3e1e..4ba2c1665d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -15,6 +15,45 @@
 
 public class Messages {
 
+	public String PartEditor_InputPart;
+	public String XmiTab_TypeTextToSearch;
+	public String ModelEditor_Import3x;
+	public String E4StringPickList_Replace;
+	public String MarkDuplicateAttributesHandler_MarkDuplicates;
+	public String MarkDuplicateAttributesHandler_SelectAnAttributeToMarkeDuplicate;
+	public String VCommandEditor_ImportCommands;
+	public String VPartDescriptor_Editors;
+	public String VPartDescriptor_ViewAsCompatibilityView;
+	public String VPartDescriptor_Views;
+	public String VWindowSharedElementsEditor_Editors;
+	public String VWindowSharedElementsEditor_ViewAsCompatibilityView;
+	public String VWindowSharedElementsEditor_Views;
+
+	public String ApplicationEditor_BindingTable;
+	public String ApplicationEditor_Class;
+	public String ApplicationEditor_Command_Slash_Handler;
+	public String ApplicationEditor_HandledMenuItem;
+	public String ApplicationEditor_HandledToolbarItem;
+	public String ApplicationEditor_HandlerAndCommand;
+	public String ApplicationEditor_Icon;
+	public String ApplicationEditor_Id;
+	public String ApplicationEditor_InertInfosForAHandledMenuItem;
+	public String ApplicationEditor_InsertInfosForAToolbarItem;
+	public String ApplicationEditor_InsertInfosForCommandAndHandler;
+	public String ApplicationEditor_InsertInfosForKeybinding;
+	public String ApplicationEditor_Keybinding;
+	public String ApplicationEditor_Menu;
+	public String ApplicationEditor_Name;
+	public String ApplicationEditor_Parent;
+	public String ApplicationEditor_Sequence;
+	public String ApplicationEditor_Toolbar;
+	public String ApplicationEditor_Type;
+	public String PartStackEditor_CompositePart;
+	public String PartStackEditor_Editors;
+	public String PartStackEditor_Part;
+	public String PartStackEditor_Placeholder;
+	public String PartStackEditor_Views;
+
 	public static String FilteredContributionDialog_SearchWasCancelled;
 	public static String FilteredContributionDialog_MoreThan;
 	public static String FilteredContributionDialog_itemsWereFound;
@@ -706,33 +745,32 @@ public class Messages {
 	public String KeyBindingEditor_SequenceLowercase;
 	public String ModelTooling_CommandId_tooltip;
 
-	public static String ModelEditor_goto_list;
-	public static String ModelEditor_goto_xmi;
-	public static String EmfUtil_ex_attribute_not_found;
-	public static String ListTab_0;
-	public static String ListTab_1;
-	public static String ListTab_2;
-	public static String ListTab_3;
-	public static String ListTab_4;
-	public static String ListTab_5;
-	public static String ListTab_6;
-	public static String ListTab_7;
-	public static String ListTab_8;
-	public static String ListTab_9;
-	public static String ListTab_col_id;
-	public static String ListTab_col_item;
-	public static String ListTab_col_label;
-	public static String ListTab_col_go;
-
-	public static String ListTab_addColumn;
-	public static String ListTab_filterByAttribute;
-	public static String ListTab_filterByItem;
-	public static String ListTab_mark;
-	public static String ListTab_markAttribute;
-	public static String ListTab_removeFilter;
-	public static String ListTab_resetColumns;
-	public static String ListTab_selectAnAttribute;
-	public static String ListTab_selectAType;
+	public String ModelEditor_goto_list;
+	public String ModelEditor_goto_xmi;
+	public String ListTab_0;
+	public String ListTab_1;
+	public String ListTab_2;
+	public String ListTab_3;
+	public String ListTab_4;
+	public String ListTab_5;
+	public String ListTab_6;
+	public String ListTab_7;
+	public String ListTab_8;
+	public String ListTab_9;
+	public String ListTab_col_id;
+	public String ListTab_col_item;
+	public String ListTab_col_label;
+	public String ListTab_col_go;
+
+	public String ListTab_addColumn;
+	public String ListTab_filterByAttribute;
+	public String ListTab_filterByItem;
+	public String ListTab_mark;
+	public String ListTab_markAttribute;
+	public String ListTab_removeFilter;
+	public String ListTab_resetColumns;
+	public String ListTab_selectAnAttribute;
+	public String ListTab_selectAType;
 
 	public String CompositePartEditor_AddPartSashContainer;
 	public String CompositePartEditor_AddPartStack;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 72ff72ebc6..c0f667445d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -12,6 +12,22 @@
 # *     Steven Spungin <steven@spungin.tv> - Bug 431735, 430717, Ongoing Maintenance
 # *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 440159
 # ******************************************************************************
+
+PartEditor_InputPart=Input Part
+XmiTab_TypeTextToSearch0=type text to search (press <ENTER> to search for next instance)
+ModelEditor_Import3x=Import 3x
+E4StringPickList_Replace=Replace
+MarkDuplicateAttributesHandler_MarkDuplicates=Mark Duplicates
+MarkDuplicateAttributesHandler_SelectAnAttributeToMarkeDuplicate=Select an attribute to mark duplicate values
+VCommandEditor_ImportCommands=Import Commands
+VPartDescriptor_Editors=Editors
+VPartDescriptor_ViewAsCompatibilityView=View as CompatibilityView
+VPartDescriptor_Views=Views
+VWindowSharedElementsEditor_Editors=Editors
+VWindowSharedElementsEditor_ViewAsCompatibilityView=View as CompatibilityView
+VWindowSharedElementsEditor_Views=Views
+
+
 ModelTooling_Common_Up=Up
 ModelTooling_Common_Down=Down
 ModelTooling_Common_AddEllipsis=Add ...
@@ -59,6 +75,25 @@ ApplicationEditor_TrimContributions=Trim Contributions
 ApplicationEditor_RootContexts=Binding Contexts
 ApplicationEditor_BindingContexts=Binding Contexts
 ApplicationEditor_Categories=Command Categories
+ApplicationEditor_BindingTable=Binding Table
+ApplicationEditor_Class=Class
+ApplicationEditor_Command_Slash_Handler=Command/Handler
+ApplicationEditor_HandledMenuItem=Handled Menu Item
+ApplicationEditor_HandledToolbarItem=Handled Toolbar Item
+ApplicationEditor_HandlerAndCommand=Handler and Command
+ApplicationEditor_Icon=Icon
+ApplicationEditor_Id=Id
+ApplicationEditor_InertInfosForAHandledMenuItem=Insert informations for a Handled Menu Item
+ApplicationEditor_InsertInfosForAToolbarItem=Insert informations for a Toolbar Item
+ApplicationEditor_InsertInfosForCommandAndHandler=Insert informations for Command and Handler
+ApplicationEditor_InsertInfosForKeybinding=Insert informations for a keybinding
+ApplicationEditor_Keybinding=Keybinding
+ApplicationEditor_Menu=Menu
+ApplicationEditor_Name=Name
+ApplicationEditor_Parent=Parent
+ApplicationEditor_Sequence=Sequence
+ApplicationEditor_Toolbar=Toolbar
+ApplicationEditor_Type=Type
 
 BindingTableEditor_Label=BindingTable
 BindingTableEditor_Description=BindingTable bla bla bla
@@ -228,6 +263,11 @@ PartStackEditor_ContainerData=Container Data
 PartStackEditor_AddPart=Part
 PartStackEditor_AddPlaceholder=Placeholder
 PartStackEditor_AddCompositePart=Composite Part
+PartStackEditor_CompositePart=CompositePart
+PartStackEditor_Editors=Editors
+PartStackEditor_Part=Part
+PartStackEditor_Placeholder=Placeholder
+PartStackEditor_Views=Views
 
 PerspectiveEditor_Label=Perspective
 PerspectiveEditor_Description=Perspective Bla Bla Bla
@@ -717,7 +757,6 @@ KeyBindingEditor_SequenceLowercase=Key sequences should be specified in uppercas
 ModelTooling_CommandId_tooltip=Command identifier. Must be defined for a command to work properly.
 
 
-EmfUtil_ex_attribute_not_found=Attribute not found: 
 ListTab_0=List
 ListTab_1=Mark Duplicate IDs
 ListTab_2=Duplicate IDs will be highlighted
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
index a258a0c15c..b1dfd1f5d8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Ongoing Maintenance
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common;
@@ -59,7 +59,7 @@ public E4StringPickList(Composite parent, int flags, List<PickListFeatures> list
 		// TODO does not respect NO_ORDER yet
 
 		tiReplace = new ToolItem(getToolBar(), SWT.PUSH, 2);
-		tiReplace.setText("Replace");
+		tiReplace.setText(messages.E4StringPickList_Replace);
 		tiReplace.setImage(editor.createImage(ResourceProvider.IMG_Obj16_world_edit));
 
 		text = new Text(getToolBar().getParent(), SWT.SINGLE | SWT.LEAD | SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 3e955a4e52..1ce0a57637 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -10,7 +10,7 @@
  *     Wim Jongman <wim.jongman@remainsoftware.com> - Maintenance
  *     Marco Descher <marco@descher.at> - Bug395982, 426653, 422465, 429674
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 396902, 431755, 431735, 424730, 424730, 391089, 437236, 437552
+ *     Steven Spungin <steven@spungin.tv> - Bug 396902, 431755, 431735, 424730, 424730, 391089, 437236, 437552, Ongoing Maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
@@ -658,7 +658,7 @@ public void menuAboutToShow(IMenuManager manager) {
 
 						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId()).getActionsImport(s.getFirstElement());
 						if (actions.size() > 0) {
-							MenuManager menu = new MenuManager("Import 3x");
+							MenuManager menu = new MenuManager(messages.ModelEditor_Import3x);
 							for (Action a : actions) {
 								addSeparator = true;
 								menu.add(a);
@@ -699,7 +699,7 @@ public void menuAboutToShow(IMenuManager manager) {
 
 						if (actions.size() > 0) {
 							// TODO WIM - extract nls
-							MenuManager menu = new MenuManager("Import 3x");
+							MenuManager menu = new MenuManager(messages.ModelEditor_Import3x);
 							for (Action a : actions) {
 								addSeparator = true;
 								menu.add(a);
@@ -880,7 +880,7 @@ public void run() {
 				if (s.getFirstElement() instanceof EObject) {
 					manager.add(new Separator());
 					final EObject el = (EObject) s.getFirstElement();
-					Action gotoXmiAction = new Action(Messages.ModelEditor_goto_xmi) {
+					Action gotoXmiAction = new Action(messages.ModelEditor_goto_xmi) {
 						@Override
 						public void run() {
 							gotoEObject(TAB_XMI, el);
@@ -890,7 +890,7 @@ public void run() {
 
 					if (listTab != null) {
 						if (EmfUtil.getAttribute(el, "elementId") != null) { //$NON-NLS-1$
-							Action gotoListAction = new Action(Messages.ModelEditor_goto_list) {
+							Action gotoListAction = new Action(messages.ModelEditor_goto_list) {
 								@Override
 								public void run() {
 									gotoEObject(TAB_LIST, el);
@@ -1231,7 +1231,7 @@ public List<AbstractElementEditorContribution> getTabContributionsForClass(Class
 	}
 
 	private void registerDefaultEditors() {
-		System.err.println(getClass().getName() + ".registerDefaultEditors: " + resourcePool);
+		System.err.println(getClass().getName() + ".registerDefaultEditors: " + resourcePool); //$NON-NLS-1$
 
 		registerEditor(ApplicationPackageImpl.Literals.APPLICATION, ContextInjectionFactory.make(ApplicationEditor.class, context));
 		registerEditor(ApplicationPackageImpl.Literals.ADDON, ContextInjectionFactory.make(AddonsEditor.class, context));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index a69a589155..c82605c66b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -90,7 +90,8 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES);
 	private IListProperty APPLICATION__COMMANDS = EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__COMMANDS);
-	private IListProperty APPLICATION__DIALOGS = EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__DIALOGS);
+	// private IListProperty APPLICATION__DIALOGS =
+	// EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__DIALOGS);
 	private IListProperty PART_DESCRIPTOR_CONTAINER__DESCRIPTORS = EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS);
 	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private IListProperty APPLICATION__ADDONS = EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__ADDONS);
@@ -376,16 +377,16 @@ public CommandWizard(MApplication application) {
 		public void addPages() {
 			getShell().setText(Messages.CommandWizard_ShellTitle);
 			setDefaultPageImageDescriptor(ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Wizban16_newexp_wiz)));
-			handlerPage = new HandlerCommandPage("Handler and Command");
+			handlerPage = new HandlerCommandPage(Messages.ApplicationEditor_HandlerAndCommand);
 			addPage(handlerPage);
 
-			keyPage = new KeybindingPage("Keybinding", application);
+			keyPage = new KeybindingPage(Messages.ApplicationEditor_Keybinding, application);
 			addPage(keyPage);
 
-			menuPage = new MenuWizardPage("Menu", application);
+			menuPage = new MenuWizardPage(Messages.ApplicationEditor_Menu, application);
 			addPage(menuPage);
 
-			toolbarPage = new ToolbarWizardPage("Toolbar", application);
+			toolbarPage = new ToolbarWizardPage(Messages.ApplicationEditor_Toolbar, application);
 			addPage(toolbarPage);
 		}
 
@@ -444,8 +445,8 @@ public HandlerCommandPage(String pageName) {
 
 		@Override
 		public void createControl(Composite parent) {
-			setTitle("Command/Handler");
-			setMessage("Insert informations for Command and Handler");
+			setTitle(Messages.ApplicationEditor_Command_Slash_Handler);
+			setMessage(Messages.ApplicationEditor_InsertInfosForCommandAndHandler);
 
 			Composite group = new Composite(parent, SWT.NONE);
 			group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -453,7 +454,7 @@ public void createControl(Composite parent) {
 
 			{
 				Label l = new Label(group, SWT.NONE);
-				l.setText("Id");
+				l.setText(Messages.ApplicationEditor_Id);
 
 				idField = new Text(group, SWT.BORDER);
 				idField.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
@@ -461,7 +462,7 @@ public void createControl(Composite parent) {
 
 			{
 				Label l = new Label(group, SWT.NONE);
-				l.setText("Name" + "*");
+				l.setText(Messages.ApplicationEditor_Name + "*"); //$NON-NLS-1$
 
 				nameField = new Text(group, SWT.BORDER);
 				nameField.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
@@ -476,7 +477,7 @@ public void modifyText(ModifyEvent e) {
 
 			{
 				Label l = new Label(group, SWT.NONE);
-				l.setText("Class");
+				l.setText(Messages.ApplicationEditor_Class);
 
 				Text t = new Text(group, SWT.BORDER);
 				t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -507,8 +508,8 @@ public KeybindingPage(String pageName, MApplication application) {
 
 		@Override
 		public void createControl(Composite parent) {
-			setTitle("Keybinding");
-			setMessage("Insert informations for a keybinding");
+			setTitle(Messages.ApplicationEditor_Keybinding);
+			setMessage(Messages.ApplicationEditor_InsertInfosForKeybinding);
 
 			Composite group = new Composite(parent, SWT.NONE);
 			group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -516,7 +517,7 @@ public void createControl(Composite parent) {
 
 			{
 				Label l = new Label(group, SWT.NONE);
-				l.setText("Sequence");
+				l.setText(Messages.ApplicationEditor_Sequence);
 
 				keyField = new Text(group, SWT.BORDER);
 				keyField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -532,7 +533,7 @@ public void modifyText(ModifyEvent e) {
 
 			{
 				Label l = new Label(group, SWT.NONE);
-				l.setText("Binding Table");
+				l.setText(Messages.ApplicationEditor_BindingTable);
 				l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 				bindtableViewer = new TableViewer(group);
@@ -580,8 +581,8 @@ public MenuWizardPage(String pageName, MApplication application) {
 
 		@Override
 		public void createControl(Composite parent) {
-			setTitle("Handled Menu Item");
-			setMessage("Insert informations for a Handled Menu Item");
+			setTitle(Messages.ApplicationEditor_HandledMenuItem);
+			setMessage(Messages.ApplicationEditor_InertInfosForAHandledMenuItem);
 
 			Composite group = new Composite(parent, SWT.NONE);
 			group.setLayout(new GridLayout(2, false));
@@ -589,7 +590,7 @@ public void createControl(Composite parent) {
 
 			{
 				Label l = new Label(group, SWT.NONE);
-				l.setText("Label");
+				l.setText(Messages.ApplicationEditor_Label);
 
 				labelField = new Text(group, SWT.BORDER);
 				labelField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -597,7 +598,7 @@ public void createControl(Composite parent) {
 
 			{
 				Label l = new Label(group, SWT.NONE);
-				l.setText("Icon");
+				l.setText(Messages.ApplicationEditor_Icon);
 
 				iconField = new Text(group, SWT.BORDER);
 				iconField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -605,7 +606,7 @@ public void createControl(Composite parent) {
 
 			{
 				Label l = new Label(group, SWT.NONE);
-				l.setText("Type");
+				l.setText(Messages.ApplicationEditor_Type);
 
 				typeViewer = new ComboViewer(group, SWT.READ_ONLY);
 				typeViewer.setContentProvider(new ArrayContentProvider());
@@ -615,7 +616,7 @@ public void createControl(Composite parent) {
 
 			{
 				Label l = new Label(group, SWT.NONE);
-				l.setText("Parent");
+				l.setText(Messages.ApplicationEditor_Parent);
 				l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 				menuViewer = new TableViewer(group);
@@ -671,8 +672,8 @@ public ToolbarWizardPage(String pageName, MApplication application) {
 
 		@Override
 		public void createControl(Composite parent) {
-			setTitle("Handled Toolbar Item");
-			setMessage("Insert informations for a Toolbar Item");
+			setTitle(Messages.ApplicationEditor_HandledToolbarItem);
+			setMessage(Messages.ApplicationEditor_InsertInfosForAToolbarItem);
 
 			Composite group = new Composite(parent, SWT.NONE);
 			group.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false, 2, 1));
@@ -680,7 +681,7 @@ public void createControl(Composite parent) {
 
 			{
 				Label l = new Label(group, SWT.NONE);
-				l.setText("Label");
+				l.setText(Messages.ApplicationEditor_Label);
 
 				labelField = new Text(group, SWT.BORDER);
 				labelField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -688,7 +689,7 @@ public void createControl(Composite parent) {
 
 			{
 				Label l = new Label(group, SWT.NONE);
-				l.setText("Icon");
+				l.setText(Messages.ApplicationEditor_Icon);
 
 				iconField = new Text(group, SWT.BORDER);
 				iconField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -696,7 +697,7 @@ public void createControl(Composite parent) {
 
 			{
 				Label l = new Label(group, SWT.NONE);
-				l.setText("Type");
+				l.setText(Messages.ApplicationEditor_Type);
 
 				typeViewer = new ComboViewer(group, SWT.READ_ONLY);
 				// viewer.setLabelProvider(labelProvider)
@@ -706,7 +707,7 @@ public void createControl(Composite parent) {
 
 			{
 				Label l = new Label(group, SWT.NONE);
-				l.setText("Parent");
+				l.setText(Messages.ApplicationEditor_Parent);
 				l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 				toolbarViewer = new TableViewer(group);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index daab013b0d..88f39e88ed 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -271,22 +271,22 @@ public IStatus validate(Object value) {
 				try {
 					KeySequence keySequence = KeySequence.getInstance(value.toString());
 					if (!keySequence.isComplete()) {
-						return new Status(statusCode, Plugin.ID, Messages.KeyBindingEditor_SequenceNotComplete); //$NON-NLS-1$
+						return new Status(statusCode, Plugin.ID, Messages.KeyBindingEditor_SequenceNotComplete); 
 					}
 					if (keySequence.isEmpty()) {
-						return new Status(statusCode, Plugin.ID, Messages.KeyBindingEditor_SequenceEmpty); //$NON-NLS-1$
+						return new Status(statusCode, Plugin.ID, Messages.KeyBindingEditor_SequenceEmpty); 
 					}
 					if (!value.toString().toUpperCase().equals(value.toString())) {
-						return new Status(IStatus.ERROR, Plugin.ID, Messages.KeyBindingEditor_SequenceLowercase); //$NON-NLS-1$
+						return new Status(IStatus.ERROR, Plugin.ID, Messages.KeyBindingEditor_SequenceLowercase); 
 					}
 
 					return Status.OK_STATUS;
 				} catch (Exception e) {
-					return new Status(statusCode, Plugin.ID, e.getMessage(), e); //$NON-NLS-1$
+					return new Status(statusCode, Plugin.ID, e.getMessage(), e); 
 				}
 			}
 
-			return new Status(statusCode, Plugin.ID, Messages.KeyBindingEditor_SequenceEmpty); //$NON-NLS-1$
+			return new Status(statusCode, Plugin.ID, Messages.KeyBindingEditor_SequenceEmpty); 
 		}
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 53df5899e4..5a48411859 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951, Ongoing Maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -116,7 +116,7 @@ public Image getImage(Object element, Display display) {
 	@Override
 	public String getLabel(Object element) {
 		if (element == BasicPackageImpl.Literals.INPUT_PART) {
-			return "Input Part";
+			return Messages.PartEditor_InputPart;
 		}
 		return Messages.PartEditor_Label;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index a340895420..bbb914d17a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -123,13 +123,13 @@ public void run() {
 		}
 
 		// --- Import Actions ---
-		actionsImport.add(new Action("Views", createImageDescriptor(ResourceProvider.IMG_Part)) {
+		actionsImport.add(new Action(Messages.PartStackEditor_Views, createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
 				handleImportChild(BasicPackageImpl.Literals.PART);
 			}
 		});
-		actionsImport.add(new Action("Editors", createImageDescriptor(ResourceProvider.IMG_Part)) {
+		actionsImport.add(new Action(Messages.PartStackEditor_Editors, createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
 				handleImportChild(BasicPackageImpl.Literals.INPUT_PART);
@@ -242,9 +242,9 @@ protected void addPressed() {
 			childrenDropDown.setLabelProvider(new FeatureClassLabelProvider(getEditor()));
 
 			List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
-			eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART));
-			eClassList.add(new FeatureClass("CompositePart", BasicPackageImpl.Literals.COMPOSITE_PART));
-			eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER));
+			eClassList.add(new FeatureClass(Messages.PartStackEditor_Part, BasicPackageImpl.Literals.PART));
+			eClassList.add(new FeatureClass(Messages.PartStackEditor_CompositePart, BasicPackageImpl.Literals.COMPOSITE_PART));
+			eClassList.add(new FeatureClass(Messages.PartStackEditor_Placeholder, AdvancedPackageImpl.Literals.PLACEHOLDER));
 			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
 			childrenDropDown.setInput(eClassList);
 			childrenDropDown.setSelection(new StructuredSelection(eClassList.get(0)));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index a6ed7cfd4b..2c8007ab80 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -25,12 +25,14 @@
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
+import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -86,6 +88,10 @@ public class TrimBarEditor extends AbstractComponentEditor {
 	@Inject
 	private ModelEditor editor;
 
+	@Inject
+	@Translation
+	protected Messages Messages;
+
 	@Inject
 	public TrimBarEditor() {
 		super();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
index 3db082a5d8..8dba05f897 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
@@ -1,3 +1,7 @@
+/*******************************************************************************
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ ******************************************************************************/
+
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
@@ -59,7 +63,7 @@ public Object convert(Object fromObject) {
 						if (eAttribute.isMany()) {
 							List<Object> result = new ArrayList<Object>();
 							if (value != null) {
-								for (String element : value.split(" ")) {
+								for (String element : value.split(" ")) { //$NON-NLS-1$
 									result.add(eFactory.createFromString(eDataType, element));
 								}
 							}
@@ -90,7 +94,7 @@ public Object convert(Object fromObject) {
 						} else {
 							// If the value
 							if (fromObject == SetCommand.UNSET_VALUE || fromObject == null || fromObject.equals(eAttribute.getDefaultValue())) {
-								return "";
+								return ""; //$NON-NLS-1$
 							}
 							return eFactory.convertToString(eDataType, fromObject);
 						}
@@ -103,7 +107,7 @@ public Object convert(Object fromObject) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.eclipse.core.databinding.UpdateValueStrategy#doSet(org.eclipse.core
 	 * .databinding.observable.value.IObservableValue, java.lang.Object)
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
index 36c1557d5c..ccbfe5a976 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
@@ -6,12 +6,11 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Ongoing Maintenance
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
 
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;
 
@@ -77,7 +76,7 @@ static public Object getAttributeValue(EObject eObject, String attName) {
 	static public Object getAttributeValueThrows(EObject eObject, String attName) throws Exception {
 		EAttribute att = getAttribute(eObject, attName);
 		if (att == null) {
-			throw new Exception(Messages.EmfUtil_ex_attribute_not_found + attName);
+			throw new Exception(Messages.EmfUtil_ex_attribute_not_found + " : " + attName); //$NON-NLS-1$
 		} else {
 			return eObject.eGet(att);
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index f88d04f13d..a81cde8b31 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555, Bug 436889, Bug 437372, Bug 440469
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555, Bug 436889, Bug 437372, Bug 440469, Ongoing Maintenance
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
@@ -174,7 +174,7 @@ public void preDestroy() {
 
 	// save custom column and filter settings
 	public void saveSettings() {
-		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(Plugin.ID); //$NON-NLS-1$
+		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(Plugin.ID);
 		try {
 			Document doc = DocUtil.createDocument("list-tab"); //$NON-NLS-1$
 			Element cols = DocUtil.createChild(doc.getDocumentElement(), "columns"); //$NON-NLS-1$
@@ -237,7 +237,7 @@ private void saveColumn(Element eleCols, String columnName, TableColumn objCol)
 
 	// load custom column and filter settings
 	private void loadSettings() {
-		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(Plugin.ID); //$NON-NLS-1$
+		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(Plugin.ID);
 
 		boolean restoreColumns = pref.getBoolean("list-tab-remember-columns", false); //$NON-NLS-1$
 		boolean restoreFilters = pref.getBoolean("list-tab-remember-filters", false); //$NON-NLS-1$
@@ -353,7 +353,7 @@ public void widgetDisposed(DisposeEvent e) {
 			}
 		});
 		try {
-			imgMarkedItem = imageCache.create(Plugin.ID, "/icons/full/obj16/mark_occurrences.png"); //$NON-NLS-1$//$NON-NLS-2$
+			imgMarkedItem = imageCache.create(Plugin.ID, "/icons/full/obj16/mark_occurrences.png"); //$NON-NLS-1$
 		} catch (Exception e2) {
 			e2.printStackTrace();
 		}
@@ -394,7 +394,7 @@ public void documentAboutToBeChanged(DocumentEvent event) {
 				public void widgetSelected(SelectionEvent e) {
 					TitleAreaFilterDialogWithEmptyOptions dlg = createEObjectAttributePicker(Messages.ListTab_addColumn);
 					dlg.setShowEmptyOptions(false);
-					if (dlg.open() == dlg.OK) {
+					if (dlg.open() == Window.OK) {
 						// Add Column
 						String attName = dlg.getFirstElement().toString();
 						EAttributeTableViewerColumn col = addColumn(attName);
@@ -451,7 +451,7 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					TitleAreaFilterDialogWithEmptyOptions dlg = createEObjectAttributePicker(Messages.ListTab_filterByAttribute);
-					if (dlg.open() == dlg.OK) {
+					if (dlg.open() == Window.OK) {
 						filterByAttribute(dlg.getFirstElement().toString(), dlg.getEmptyFilterOption());
 					}
 				};
@@ -509,7 +509,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		colGo = new TableViewerColumn(tvResults, SWT.NONE);
 		colGo.getColumn().setText(Messages.ListTab_col_go);
-		requiredColumns.put("GoTree", colGo.getColumn());
+		requiredColumns.put("GoTree", colGo.getColumn()); //$NON-NLS-1$
 		colGo.setLabelProvider(new ColumnLabelProvider() {
 			@Override
 			public Image getImage(Object element) {
@@ -524,7 +524,7 @@ public String getText(Object element) {
 
 		colGoXmi = new TableViewerColumn(tvResults, SWT.NONE);
 		colGoXmi.getColumn().setText(Messages.ListTab_col_go);
-		requiredColumns.put("GoXmi", colGoXmi.getColumn());
+		requiredColumns.put("GoXmi", colGoXmi.getColumn()); //$NON-NLS-1$
 		colGoXmi.setLabelProvider(new ColumnLabelProvider() {
 			@Override
 			public String getText(Object element) {
@@ -551,7 +551,7 @@ public void mouseDown(MouseEvent e) {
 		colMarked = new TableViewerColumn(tvResults, SWT.NONE);
 		colMarked.getColumn().setWidth(16);
 		colMarked.getColumn().setText(Messages.ListTab_mark);
-		requiredColumns.put("Marked", colMarked.getColumn());
+		requiredColumns.put("Marked", colMarked.getColumn()); //$NON-NLS-1$
 		colMarked.setLabelProvider(new ColumnLabelProvider() {
 			@Override
 			public Image getImage(Object element) {
@@ -575,7 +575,7 @@ public String getText(Object element) {
 
 		colItem = new TableViewerColumn(tvResults, SWT.NONE);
 		colItem.getColumn().setText(Messages.ListTab_col_item);
-		requiredColumns.put("Item", colItem.getColumn());
+		requiredColumns.put("Item", colItem.getColumn()); //$NON-NLS-1$
 		colItem.setLabelProvider(new ColumnLabelProvider_Markable() {
 			@Override
 			public String getText(Object element) {
@@ -586,11 +586,11 @@ public String getText(Object element) {
 
 		app.getContext().set("org.eclipse.e4.tools.active-object-viewer", this); //$NON-NLS-1$
 
-		EAttributeTableViewerColumn colId = new EAttributeTableViewerColumn(tvResults, "elementId", "elementId", context); //$NON-NLS-2$
-		defaultColumns.put("elementId", colId);
+		EAttributeTableViewerColumn colId = new EAttributeTableViewerColumn(tvResults, "elementId", "elementId", context); //$NON-NLS-1$//$NON-NLS-2$
+		defaultColumns.put("elementId", colId); //$NON-NLS-1$
 
-		EAttributeTableViewerColumn colLabel = new EAttributeTableViewerColumn_Markable(tvResults, "label", "label", context); //$NON-NLS-2$
-		defaultColumns.put("label", colLabel);
+		EAttributeTableViewerColumn colLabel = new EAttributeTableViewerColumn_Markable(tvResults, "label", "label", context); //$NON-NLS-1$//$NON-NLS-2$
+		defaultColumns.put("label", colLabel); //$NON-NLS-1$
 
 		// Custom selection for marked items
 		tvResults.getTable().addListener(SWT.EraseItem, new Listener() {
@@ -742,7 +742,7 @@ protected Control createContents(Composite parent) {
 				Control ret = super.createContents(parent);
 				setMessage(Messages.ListTab_selectAnAttribute);
 				try {
-					setTitleImage(imageCache.create(Plugin.ID, "/icons/full/wizban/attribute_wiz.gif")); //$NON-NLS-1$ //$NON-NLS-2$
+					setTitleImage(imageCache.create(Plugin.ID, "/icons/full/wizban/attribute_wiz.gif")); //$NON-NLS-1$
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
@@ -898,7 +898,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 
 			};
 			tvResults.setFilters(new ViewerFilter[] { viewerFilter });
-			filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS + "(" + filterByItemName + ")"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+			filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS + "(" + filterByItemName + ")"); //$NON-NLS-1$//$NON-NLS-2$
 			filterByAttribute.setText(Messages.ListTab_filterByAttribute + ELIPSIS);
 		}
 	}
@@ -946,7 +946,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 					}
 				};
 				tvResults.setFilters(new ViewerFilter[] { viewerFilter });
-				filterByAttribute.setText(Messages.ListTab_filterByAttribute + ELIPSIS + "(" + filterByAttrName + ")"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+				filterByAttribute.setText(Messages.ListTab_filterByAttribute + ELIPSIS + "(" + filterByAttrName + ")"); //$NON-NLS-1$//$NON-NLS-2$
 				filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS);
 
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/Messages.java
index 7981b5b919..9873751369 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/Messages.java
@@ -9,6 +9,8 @@ public class Messages extends NLS {
 	public static String TitleAreaFilterDialogWithEmptyOptions_excludeEmptyValues;
 	public static String TitleAreaFilterDialogWithEmptyOptions_includeEmptyValues;
 	public static String TitleAreaFilterDialogWithEmptyOptions_onlyEmptyValues;
+	public static String EmfUtil_ex_attribute_not_found;
+
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
index 009de5586b..ab8dd421ad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 391089, Bug 437543
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 391089, Bug 437543, Ongoing Maintenance
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
@@ -18,11 +18,13 @@
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.AnnotationAccess;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.EMFDocumentResourceMediator;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.XMLConfiguration;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.XMLPartitionScanner;
 import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
 import org.eclipse.jface.resource.JFaceResources;
@@ -63,6 +65,10 @@ public class XmiTab extends Composite {
 	@Inject
 	private IEclipsePreferences preferences;
 
+	@Inject
+	@Translation
+	protected Messages Messages;
+
 	private Text text;
 	protected int offsetStart;
 	private SourceViewer sourceViewer;
@@ -78,7 +84,7 @@ protected void postConstruct() {
 
 		text = new Text(this, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
 		text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-		text.setMessage("type text to search (press <ENTER> to search for next instance)");
+		text.setMessage(Messages.XmiTab_TypeTextToSearch);
 		text.addKeyListener(new KeyAdapter() {
 			@Override
 			public void keyPressed(KeyEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties
index 324ca93bae..69b1b868c4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties
@@ -3,3 +3,4 @@ TitleAreaFilterDialogWithEmptyOptions_emptyValueDescription=An empty value is de
 TitleAreaFilterDialogWithEmptyOptions_excludeEmptyValues=Exclude Empty Values
 TitleAreaFilterDialogWithEmptyOptions_includeEmptyValues=Include Empty Values
 TitleAreaFilterDialogWithEmptyOptions_onlyEmptyValues=Only Empty Values
+EmfUtil_ex_attribute_not_found=Attribute not found
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index cac2b9a8d8..149e179419 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -19,12 +19,14 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
+import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl;
@@ -54,6 +56,10 @@ public class VCommandEditor extends AbstractComponentEditor {
 	private List<Action> actions = new ArrayList<Action>();
 	private List<Action> actionsImport = new ArrayList<Action>();
 
+	@Inject
+	@Translation
+	protected Messages Messages;
+
 	@Inject
 	public VCommandEditor() {
 		super();
@@ -69,7 +75,7 @@ public void run() {
 			}
 		});
 
-		actionsImport.add(new Action("Import Commands", createImageDescriptor(ResourceProvider.IMG_Command)) {
+		actionsImport.add(new Action(Messages.VCommandEditor_ImportCommands, createImageDescriptor(ResourceProvider.IMG_Command)) {
 			@Override
 			public void run() {
 				handleImport();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index 8ab66aba7e..a36c2fd843 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -68,20 +68,20 @@ public void run() {
 		});
 
 		// --- Import Actions ---
-		actionsImport.add(new Action("Views", createImageDescriptor(ResourceProvider.IMG_Part)) {
+		actionsImport.add(new Action(Messages.VPartDescriptor_Views, createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
 				handleImport(BasicPackageImpl.Literals.PART_DESCRIPTOR, RegistryUtil.HINT_VIEW);
 			}
 		});
-		actionsImport.add(new Action("Editors", createImageDescriptor(ResourceProvider.IMG_Part)) {
+		actionsImport.add(new Action(Messages.VPartDescriptor_Editors, createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
 				handleImport(BasicPackageImpl.Literals.PART_DESCRIPTOR, RegistryUtil.HINT_EDITOR);
 			}
 		});
 
-		actionsImport.add(new Action("View as CompatibilityView", createImageDescriptor(ResourceProvider.IMG_Part)) {
+		actionsImport.add(new Action(Messages.VPartDescriptor_ViewAsCompatibilityView, createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
 				handleImport(BasicPackageImpl.Literals.PART_DESCRIPTOR, RegistryUtil.HINT_COMPAT_VIEW);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index c74bd9e6e2..8ec4e96cc7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -100,21 +100,21 @@ public void run() {
 		});
 
 		// -- IMPORT ACTIONS --
-		actionsImport.add(new Action("Views", createImageDescriptor(ResourceProvider.IMG_Part)) {
+		actionsImport.add(new Action(Messages.VWindowSharedElementsEditor_Views, createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
 				handleImport(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_VIEW);
 			}
 		});
 
-		actionsImport.add(new Action("Editors", createImageDescriptor(ResourceProvider.IMG_Part)) {
+		actionsImport.add(new Action(Messages.VWindowSharedElementsEditor_Editors, createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
 				handleImport(BasicPackageImpl.Literals.INPUT_PART, RegistryUtil.HINT_EDITOR);
 			}
 		});
 
-		actionsImport.add(new Action("View as CompatibilityView", createImageDescriptor(ResourceProvider.IMG_Part)) {
+		actionsImport.add(new Action(Messages.VWindowSharedElementsEditor_ViewAsCompatibilityView, createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
 				handleImport(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_COMPAT_VIEW);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/Messages.java
index 7f5dfcb106..c9a800f28a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/Messages.java
@@ -31,8 +31,11 @@ public class Messages extends NLS {
 	public static String IconDialog_selectIcon_TITLE;
 	public static String IconDialog_uri;
 	public static String IconDialog_uriEditor;
+	public static String NonReferencedActionPage_Action;
+	public static String NonReferencedActionPage_NonreferencedResourceAction;
 	public static String NonReferencedResourceDialog__ast_notInABundle_ast;
 	public static String NonReferencedResourceDialog_2;
+	public static String NonReferencedResourceDialog_Action;
 	public static String NonReferencedResourceDialog_ast_notInABundle_ast;
 	public static String NonReferencedResourceDialog_bundle;
 	public static String NonReferencedResourceDialog_class;
@@ -52,6 +55,8 @@ public class Messages extends NLS {
 	public static String NonReferencedResourceDialog_selectTheFolderResourceCopy;
 	public static String NonReferencedResourceDialog_url;
 	public static String NonReferencedResourceDialog_useAnyway;
+	public static String PickProjectFolderPage_SelectProjectFolder;
+	public static String PickProjectPage_SelectReferencedProject;
 	public static String ProjectFolderPickerDialog_0;
 	public static String ProjectFolderPickerDialog_6;
 	public static String ProjectFolderPickerDialog_sourceResourceDirectory;
@@ -59,8 +64,12 @@ public class Messages extends NLS {
 	public static String ProjectFolderPickerDialog_useSourceDirectory;
 	public static String ReferencedProjectPickerDialog_selectReferencedProject;
 	public static String TargetPlatformClassContributionCollector_classes;
+	public static String TargetPlatformContributionCollector_BuildTargetPlatformIndex;
 	public static String TargetPlatformContributionCollector_pleaseWait;
+	public static String TargetPlatformContributionCollector_RunInBackground;
+	public static String TargetPlatformContributionCollector_Searching;
 	public static String TargetPlatformContributionCollector_updatingTargetPlatformCache;
+	public static String TargetPlatformContributionCollector_WaitingForTargetPlatformIndexingToComplete;
 	public static String TargetPlatformIconContributionCollector_images;
 	static {
 		// initialize resource bundle
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
index e16a428c51..e18e2b5395 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
@@ -135,7 +135,7 @@ public void findContribution(Filter filter, ContributionResultHandler handler) {
 							stopFiltering = true;
 							break;
 						} else {
-							monitor.subTask("Searching " + e.installLocation);
+							monitor.subTask(Messages.TargetPlatformContributionCollector_Searching + " " + e.installLocation); //$NON-NLS-1$
 						}
 					}
 
@@ -287,7 +287,7 @@ private void reloadCache(boolean force, final IProviderStatusCallback providerSt
 			cacheLocation.clear();
 			outputDirectories.clear();
 
-			final Job job = new Job("Build Target Platform Index") {
+			final Job job = new Job(Messages.TargetPlatformContributionCollector_BuildTargetPlatformIndex) {
 
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {
@@ -424,7 +424,7 @@ protected Control createContents(Composite parent) {
 
 						@Override
 						protected void createButtonsForButtonBar(Composite parent) {
-							Button button = createButton(parent, 101, "Run In Background", false);
+							Button button = createButton(parent, 101, Messages.TargetPlatformContributionCollector_RunInBackground, false);
 							// TODO JA
 							button.addSelectionListener(new SelectionAdapter() {
 								@Override
@@ -450,8 +450,8 @@ protected void cancelPressed() {
 
 							@Override
 							public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-								monitor.beginTask("Waiting for target platform indexing to complete", IProgressMonitor.UNKNOWN);
-								while (job.getState() == job.RUNNING && !runInBackground) {
+								monitor.beginTask(Messages.TargetPlatformContributionCollector_WaitingForTargetPlatformIndexingToComplete, IProgressMonitor.UNKNOWN);
+								while (job.getState() == Job.RUNNING && !runInBackground) {
 									Thread.sleep(100);
 								}
 								monitor.done();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
index 27b6dbe4b0..e7dda07143 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
@@ -4,19 +4,18 @@
  * the Eclipse Public License v1.0 which accompanies this distribution, and is
  * available at http://www.eclipse.org/legal/epl-v10.html
  *
- * Contributors: Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ * Contributors: Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Ongoing Maintenance
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
 import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -55,7 +54,6 @@ public class BundleClassDialog extends Dialog implements UriDialog {
 	private String bundle = ""; //$NON-NLS-1$
 	private String clazz = ""; //$NON-NLS-1$
 	private String pakage = ""; //$NON-NLS-1$
-	private Composite parent;
 	protected boolean ignoreModify;
 	private IEclipseContext context;
 
@@ -79,7 +77,6 @@ protected int getShellStyle() {
 
 	@Override
 	protected Control createDialogArea(final Composite parent) {
-		this.parent = parent;
 		Composite composite = new Composite(parent, SWT.NONE);
 		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		composite.setLayout(new GridLayout(2, false));
@@ -134,7 +131,7 @@ public void modifyText(ModifyEvent e) {
 		{
 			Link lbl = new Link(composite, SWT.NONE);
 			lbl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
-			lbl.setText("<A>" + Messages.BundleClassDialog_bundle + "</A>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			lbl.setText("<A>" + Messages.BundleClassDialog_bundle + "</A>"); //$NON-NLS-1$ //$NON-NLS-2$
 
 			txtBundle = new Text(composite, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
 			txtBundle.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
@@ -163,7 +160,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Link lbl = new Link(composite, SWT.NONE);
 			lbl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
-			lbl.setText("<A>" + Messages.BundleClassDialog_package + "</A>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			lbl.setText("<A>" + Messages.BundleClassDialog_package + "</A>"); //$NON-NLS-1$ //$NON-NLS-2$
 
 			txtPackage = new Text(composite, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
 			txtPackage.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
@@ -192,7 +189,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			Link lbl = new Link(composite, SWT.NONE);
 			lbl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
-			lbl.setText("<A>" + Messages.BundleClassDialog_class + "</A>"); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
+			lbl.setText("<A>" + Messages.BundleClassDialog_class + "</A>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-2
 
 			txtClass = new Text(composite, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
 			txtClass.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
@@ -237,7 +234,7 @@ public void widgetSelected(SelectionEvent e) {
 		ToolItem btnFind = new ToolItem(toolBar, SWT.PUSH);
 		// btnFind.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false,
 		// false, 2, 1));
-		btnFind.setText(Messages.BundleClassDialog_find + "..."); //$NON-NLS-2$ //$NON-NLS-1$
+		btnFind.setText(Messages.BundleClassDialog_find + "..."); //$NON-NLS-1$
 		btnFind.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
index 463bea0bf0..5d9bae6048 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *	   Lars Vogel <lars.vogel@gmail.com> - Enhancements
- *     Steven Spungin <steven@spungin.tv> - Modified to be generic picker, Bug 424730
+ *     Steven Spungin <steven@spungin.tv> - Modified to be generic picker, Bug 424730, Ongoing Maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
 
@@ -333,25 +333,25 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 			setTitle(org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_findPackage);
 			sbFind.append(org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_findPackage);
 			if (E.notEmpty(bundleFilter)) {
-				sbFind.append(" " + org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_inBundle + " " + bundleFilter); //$NON-NLS-1$ //$NON-NLS-3$
+				sbFind.append(" " + org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_inBundle + " " + bundleFilter); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		} else if ("show-icons".equals(mode)) { //$NON-NLS-1$
 			setTitle(org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_findIcon);
 			sbFind.append(org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_findIcon);
 			if (E.notEmpty(bundleFilter)) {
-				sbFind.append(" " + org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_inBundle + " " + bundleFilter); //$NON-NLS-1$ //$NON-NLS-3$
+				sbFind.append(" " + org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_inBundle + " " + bundleFilter); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 			if (E.notEmpty(packageFilter)) {
-				sbFind.append(" " + org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_inPackage + " " + packageFilter); //$NON-NLS-1$ //$NON-NLS-3$
+				sbFind.append(" " + org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_inPackage + " " + packageFilter); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		} else {
 			setTitle(org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_findClass);
 			sbFind.append(org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_findClass);
 			if (E.notEmpty(bundleFilter)) {
-				sbFind.append(" " + org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_inBundle + " " + bundleFilter); //$NON-NLS-1$ //$NON-NLS-3$
+				sbFind.append(" " + org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_inBundle + " " + bundleFilter); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 			if (E.notEmpty(packageFilter)) {
-				sbFind.append(" " + org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_inPackage + " " + packageFilter); //$NON-NLS-1$ //$NON-NLS-3$
+				sbFind.append(" " + org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages.FindContributionDialog_inPackage + " " + packageFilter); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		}
 		setMessage(sbFind.toString());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
index 3075c5f06e..c2a71fb437 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 437569
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 437569, Ongoing Maintenance
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
@@ -68,7 +68,7 @@ public class NonReferencedActionPage extends WizardPage implements IWizardPage {
 	private BundleImageCache imageCache;
 
 	protected NonReferencedActionPage(IProject project, String bundle, IFile file, String installLocation, IEclipseContext context) {
-		super("Nonreferenced Resource Action");
+		super(Messages.NonReferencedActionPage_NonreferencedResourceAction);
 
 		this.project = project;
 		this.bundle = bundle;
@@ -78,7 +78,7 @@ protected NonReferencedActionPage(IProject project, String bundle, IFile file, S
 
 		imageCache = context.get(BundleImageCache.class);
 
-		setImageDescriptor(ImageDescriptor.createFromImage(imageCache.create(Plugin.ID, "/icons/full/wizban/newefix_wizban.png"))); //$NON-NLS-1$ //$NON-NLS-2$
+		setImageDescriptor(ImageDescriptor.createFromImage(imageCache.create(Plugin.ID, "/icons/full/wizban/newefix_wizban.png"))); //$NON-NLS-1$
 
 		if (bundle == null && installLocation != null) {
 			this.bundle = FilteredContributionDialog.getBundle(installLocation);
@@ -88,8 +88,8 @@ protected NonReferencedActionPage(IProject project, String bundle, IFile file, S
 			this.className = cdf.getContributionData().className;
 		}
 
-		setTitle("Nonreferenced Resource Action");
-		setMessage("Nonreferenced Resource Action");
+		setTitle(Messages.NonReferencedActionPage_NonreferencedResourceAction);
+		setMessage(Messages.NonReferencedActionPage_NonreferencedResourceAction);
 	}
 
 	@Override
@@ -205,7 +205,7 @@ public void createControl(Composite compParent) {
 		Group group = new Group(comp, SWT.NONE);
 		group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 0));
 		group.setLayout(new GridLayout(1, false));
-		group.setText("Action");
+		group.setText(Messages.NonReferencedActionPage_Action);
 
 		if (bundle != null) {
 			final Button btnRequire = new Button(group, SWT.RADIO);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
index 7c8cf61d7a..fde88603d2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Ongoing Maintenance
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
@@ -203,7 +203,7 @@ protected Control createDialogArea(Composite parent) {
 		Group group = new Group(comp, SWT.NONE);
 		group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 0));
 		group.setLayout(new GridLayout(1, false));
-		group.setText("Action");
+		group.setText(Messages.NonReferencedResourceDialog_Action);
 
 		if (bundle != null) {
 			final Button btnRequire = new Button(group, SWT.RADIO);
@@ -414,7 +414,7 @@ public void widgetDisposed(DisposeEvent e) {
 		setTitle(Messages.NonReferencedResourceDialog_resourceReferenceWarning);
 		getShell().setText(Messages.NonReferencedResourceDialog_resourceReferenceWarning);
 		try {
-			setTitleImage(imageCache.create(Plugin.ID, "/icons/full/wizban/newefix_wizban.png")); //$NON-NLS-1$ //$NON-NLS-2$
+			setTitleImage(imageCache.create(Plugin.ID, "/icons/full/wizban/newefix_wizban.png")); //$NON-NLS-1$
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -432,7 +432,7 @@ public void copyResourceToProject(IProject project) {
 				protected Control createContents(Composite parent) {
 					Control ret = super.createContents(parent);
 					setMessage(Messages.NonReferencedResourceDialog_selectTheFolderResourceCopy);
-					setTitleImage(imageCache.create(Plugin.ID, "/icons/full/wizban/add_to_dir_wiz.png")); //$NON-NLS-1$ //$NON-NLS-2$
+					setTitleImage(imageCache.create(Plugin.ID, "/icons/full/wizban/add_to_dir_wiz.png")); //$NON-NLS-1$
 
 					return ret;
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
index 0c5f8c24cf..d374dc8575 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Ongoing Maintenance
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
@@ -54,7 +54,7 @@ public class PickProjectFolderPage extends WizardPage {
 	private Label lblResourcePath;
 
 	protected PickProjectFolderPage(IEclipseContext context) {
-		super("Select Project Folder", "Select Project Folder", null);
+		super(Messages.PickProjectFolderPage_SelectProjectFolder, Messages.PickProjectFolderPage_SelectProjectFolder, null);
 		this.context = context;
 
 		setMessage(Messages.NonReferencedResourceDialog_selectProjectToReceiveCopy);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
index 14a837d0e4..e5dff6b14b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Ongoing Maintenance
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
@@ -48,7 +48,7 @@ public class PickProjectPage extends WizardPage implements IWizardPage {
 	private IEclipseContext context;
 
 	protected PickProjectPage(IEclipseContext context) {
-		super("Select Referenced Project");
+		super(Messages.PickProjectPage_SelectReferencedProject);
 		this.context = context;
 		try {
 			this.projects = context.get(IProject.class).getReferencedProjects();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/messages.properties
index bed4ce9aab..e585bf1696 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/messages.properties
@@ -25,8 +25,11 @@ IconDialog_selectIcon_MESSAGE=Select Icon
 IconDialog_selectIcon_TITLE=Select Icon
 IconDialog_uri=URI
 IconDialog_uriEditor=URI Editor
+NonReferencedActionPage_Action=Action
+NonReferencedActionPage_NonreferencedResourceAction=Nonreferenced Resource Action
 NonReferencedResourceDialog__ast_notInABundle_ast=*** NOT IN A BUNDLE ***
 NonReferencedResourceDialog_2=Bundle
+NonReferencedResourceDialog_Action=Action
 NonReferencedResourceDialog_ast_notInABundle_ast=*** NOT IN A BUNDLE ***
 NonReferencedResourceDialog_bundle=Bundle
 NonReferencedResourceDialog_class=Class
@@ -46,6 +49,8 @@ NonReferencedResourceDialog_selectProjectToReceiveCopy=Select the project to rec
 NonReferencedResourceDialog_selectTheFolderResourceCopy=Select the folder where the resource will be copied to:
 NonReferencedResourceDialog_url=URL
 NonReferencedResourceDialog_useAnyway=Use Anyway (Resolve Later)
+PickProjectFolderPage_SelectProjectFolder=Select Project Folder
+PickProjectPage_SelectReferencedProject=Select Referenced Project
 ProjectFolderPickerDialog_0=platform:/plugin/org.eclipse.ui.images/eclipse-png/org.eclipse.jdt.ui/icons/full/eview16/projects.png
 ProjectFolderPickerDialog_6=Select Project Folder
 ProjectFolderPickerDialog_sourceResourceDirectory=Source Resource Directory
@@ -53,6 +58,10 @@ ProjectFolderPickerDialog_sourceResourceName=Source Resource Name
 ProjectFolderPickerDialog_useSourceDirectory=Use source resource directory
 ReferencedProjectPickerDialog_selectReferencedProject=Select Referenced Project
 TargetPlatformClassContributionCollector_classes=Classes
+TargetPlatformContributionCollector_BuildTargetPlatformIndex=Build Target Platform Index
 TargetPlatformContributionCollector_pleaseWait=Please wait while the target platform lookup cache updates...
+TargetPlatformContributionCollector_RunInBackground=Run In Background
+TargetPlatformContributionCollector_Searching=Searching
 TargetPlatformContributionCollector_updatingTargetPlatformCache=Updating Target Platform Cache (
+TargetPlatformContributionCollector_WaitingForTargetPlatformIndexingToComplete=Waiting for target platform indexing to complete
 TargetPlatformIconContributionCollector_images=Images
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
index b3cc7ff8fb..d00cc705d4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432372
+ *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432372, Ongoing Maintenance
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.handlers;
@@ -16,6 +16,7 @@
 import javax.inject.Named;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.IViewEObjects;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.TitleAreaFilterDialogWithEmptyOptions;
 import org.eclipse.emf.ecore.EAttribute;
@@ -30,7 +31,7 @@
 public class MarkDuplicateAttributesHandler extends MarkDuplicateItemsBase {
 
 	@Execute
-	public void execute(@Named(VIEWER_KEY) IViewEObjects viewer, IEclipseContext context) {
+	public void execute(@Named(VIEWER_KEY) IViewEObjects viewer, IEclipseContext context, final Messages Messages) {
 		final HashSet<String> set = new HashSet<String>();
 		Collection<EObject> allEObjects = viewer.getAllEObjects();
 		for (EObject obj : allEObjects) {
@@ -49,8 +50,8 @@ public String getText(Object element) {
 			@Override
 			protected Control createContents(Composite parent) {
 				Control ret = super.createContents(parent);
-				setMessage("Select an attribute to mark duplicate values");
-				setTitle("Mark Duplicates");
+				setMessage(Messages.MarkDuplicateAttributesHandler_SelectAnAttributeToMarkeDuplicate);
+				setTitle(Messages.MarkDuplicateAttributesHandler_MarkDuplicates);
 				setElements(set.toArray(new String[0]));
 				return ret;
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/Messages.java
new file mode 100644
index 0000000000..06bed42cc6
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/Messages.java
@@ -0,0 +1,26 @@
+package org.eclipse.e4.tools.emf.ui.internal.imp;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.e4.tools.emf.ui.internal.imp.messages"; //$NON-NLS-1$
+	public static String ModelImportPage1_SelectPluginAndElements;
+	public static String ModelImportPage1_Description;
+	public static String ModelImportPage1_Go;
+	public static String ModelImportPage1_Import;
+	public static String ModelImportPage1_Import1;
+	public static String ModelImportPage1_SelectPlugInAndElementsToImport;
+	public static String ModelImportPage1_ToImport;
+	public static String ModelImportPage1_WizardPage;
+	public static String ModelImportPage1_WrongInput;
+	public static String ModelImportWizard_ImportWizard;
+	public static String ModelImportWizard_Model;
+	public static String ModelImportWizard_UnknownElement;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
index 8724ce5827..c001fdc455 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2013 Remain BV, Industrial-TSI BV and others.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  *
  * Contributors:
  *     Wim Jongmam <wim.jongman@remainsoftware.com> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing Maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.imp;
 
@@ -65,7 +66,7 @@ private class TableContentProvider implements IStructuredContentProvider {
 		public Object[] getElements(Object inputElement) {
 
 			if (!(inputElement instanceof RegistryStruct)) {
-				return new String[] { "Wrong input" };
+				return new String[] { Messages.ModelImportPage1_WrongInput };
 			}
 
 			RegistryStruct input = (RegistryStruct) inputElement;
@@ -101,16 +102,16 @@ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 	 * Create the wizard.
 	 */
 	public ModelImportPage1() {
-		super("wizardPage");
-		setTitle("Import ");
-		setDescription("Select plug-in and elements to import");
+		super(Messages.ModelImportPage1_WizardPage);
+		setTitle(Messages.ModelImportPage1_Import + " "); //$NON-NLS-1$
+		setDescription(Messages.ModelImportPage1_SelectPlugInAndElementsToImport);
 		wizard = (ModelImportWizard) getWizard();
 		setPageComplete(false);
 	}
 
 	/**
 	 * Create contents of the wizard.
-	 * 
+	 *
 	 * @param parent
 	 */
 	@Override
@@ -135,12 +136,12 @@ public void createControl(Composite parent) {
 		TableColumn column = tableViewerColumn.getColumn();
 		column.setResizable(false);
 		tcl_composite.setColumnData(column, new ColumnWeightData(1, ColumnWeightData.MINIMUM_WIDTH, true));
-		column.setText("Description");
+		column.setText(Messages.ModelImportPage1_Description);
 		checkboxTableViewer.setLabelProvider(new TableLabelProvider());
 		checkboxTableViewer.setContentProvider(new TableContentProvider());
 		comboViewer.setContentProvider(new ComboContentProvider());
 
-		comboViewer.setInput("go");
+		comboViewer.setInput(Messages.ModelImportPage1_Go);
 
 		comboViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 
@@ -170,11 +171,11 @@ public void checkStateChanged(CheckStateChangedEvent event) {
 	@Override
 	public void setWizard(IWizard newWizard) {
 		this.wizard = (ModelImportWizard) newWizard;
-		setTitle("Import " + wizard.getApplicationElement().getSimpleName());
+		setTitle(Messages.ModelImportPage1_Import + " " + wizard.getApplicationElement().getSimpleName()); //$NON-NLS-1$
 
 		String hint = wizard.getHint();
 		if (hint != null && hint.length() > 0) {
-			setDescription("Select plug-in and elements (" + hint + ") to import");
+			setDescription(Messages.ModelImportPage1_SelectPluginAndElements + " (" + hint + ") " + Messages.ModelImportPage1_ToImport); //$NON-NLS-1$//$NON-NLS-2$
 			// else already set
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
index 134ab8c13f..f09d4a1e00 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2013 Remain BV, Industrial-TSI BV and others.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  *
  * Contributors:
  *     Wim Jongmam <wim.jongman@remainsoftware.com> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing Maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.imp;
 
@@ -34,7 +35,7 @@ public class ModelImportWizard extends Wizard {
 	private final String hint;
 
 	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, AbstractComponentEditor editor, IResourcePool resourcePool) {
-		this(applicationElement, editor, "", resourcePool);
+		this(applicationElement, editor, "", resourcePool); //$NON-NLS-1$
 	}
 
 	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, AbstractComponentEditor editor, String hint, IResourcePool resourcePool) {
@@ -42,9 +43,9 @@ public ModelImportWizard(Class<? extends MApplicationElement> applicationElement
 		this.editor = editor;
 		this.hint = hint;
 		this.application = (MApplication) editor.getEditor().getModelProvider().getRoot().get(0);
-		setWindowTitle("Model " + applicationElement.getSimpleName() + " Import Wizard");
+		setWindowTitle(Messages.ModelImportWizard_Model + " " + applicationElement.getSimpleName() + " " + Messages.ModelImportWizard_ImportWizard); //$NON-NLS-1$ //$NON-NLS-2$
 		setDefaultPageImageDescriptor(ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Wizban16_imp3x_wiz)));
-		Assert.isNotNull(RegistryUtil.getStruct(applicationElement, getHint()), "Unknown Element: " + applicationElement.getClass().getName());
+		Assert.isNotNull(RegistryUtil.getStruct(applicationElement, getHint()), Messages.ModelImportWizard_UnknownElement + ": " + applicationElement.getClass().getName()); //$NON-NLS-1$
 	}
 
 	@Override
@@ -101,9 +102,9 @@ protected String getMappingName() {
 	/**
 	 * Returns the list of {@link MApplicationElement}s of the type passed in
 	 * the constructor of the wizard.
-	 * 
+	 *
 	 * @param <T>
-	 * 
+	 *
 	 * @return
 	 */
 	public MApplicationElement[] getElements(Class<? extends MApplicationElement> type) {
@@ -116,7 +117,7 @@ public AbstractComponentEditor getEditor() {
 
 	/**
 	 * Returns if this is a live model.
-	 * 
+	 *
 	 * @return true or false
 	 */
 	public boolean isLiveModel() {
@@ -125,7 +126,7 @@ public boolean isLiveModel() {
 
 	/**
 	 * Returns the hint that explains the meaning of the caller.
-	 * 
+	 *
 	 * @return
 	 */
 	public String getHint() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
index b49b6a7a86..b9d7fe03ef 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2013 Remain BV, Industrial-TSI BV and others.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  *
  * Contributors:
  *     Wim Jongmam <wim.jongman@remainsoftware.com> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing Maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.imp;
 
@@ -65,7 +66,7 @@ public class RegistryUtil {
 	public final static String HINT_COMPAT_VIEW = "compatibilityView"; //$NON-NLS-1$
 
 	/**
-	 * 
+	 *
 	 * @param t
 	 * @param application
 	 * @param elements
@@ -230,15 +231,15 @@ private static MPart[] getEditors(IConfigurationElement[] elements) {
 
 		ArrayList<MPart> result = new ArrayList<MPart>();
 		for (IConfigurationElement element : elements) {
-			if ("editor".equals(element.getName())) /* Sanity Check */{
+			if ("editor".equals(element.getName())) /* Sanity Check */{ //$NON-NLS-1$
 				MPart part = (MPart) EcoreUtil.create(BasicPackageImpl.Literals.PART);
-				part.setElementId(element.getAttribute("id"));
-				part.setLabel(element.getAttribute("name"));
-				part.setIconURI(getIconURI(element, "icon"));
-				if (element.getAttribute("class") != null) {
-					part.setContributionURI(getContributionURI(element, "class"));
+				part.setElementId(element.getAttribute("id")); //$NON-NLS-1$
+				part.setLabel(element.getAttribute("name")); //$NON-NLS-1$
+				part.setIconURI(getIconURI(element, "icon")); //$NON-NLS-1$
+				if (element.getAttribute("class") != null) { //$NON-NLS-1$
+					part.setContributionURI(getContributionURI(element, "class")); //$NON-NLS-1$
 				} else {
-					part.setContributionURI(getContributionURI(element, "launcher"));
+					part.setContributionURI(getContributionURI(element, "launcher")); //$NON-NLS-1$
 				}
 				part.setToBeRendered(true);
 				part.setVisible(true);
@@ -351,7 +352,7 @@ private static String getContributionURI(IConfigurationElement element, String a
 	/**
 	 * Returns a list of bundle id's that have extension to the passed extension
 	 * point.
-	 * 
+	 *
 	 * @param registry
 	 * @param extensionPoint
 	 * @return
@@ -382,7 +383,7 @@ public static String[] getProvidingBundles(IExtensionRegistry registry, String e
 	}
 
 	/**
-	 * 
+	 *
 	 * @param registry
 	 * @param struct
 	 * @return the array of {@link IConfigurationElement} objects that meets the
@@ -415,7 +416,7 @@ public static IConfigurationElement[] getExtensions(IExtensionRegistry registry,
 	/**
 	 * This will return a structure that contains the registry information we
 	 * are looking for.
-	 * 
+	 *
 	 * @param applicationElement
 	 * @return the structure that matches the extension registry to the passed
 	 *         {@link ApplicationElement}
@@ -442,7 +443,7 @@ else if (applicationElement == MPart.class) {
 		}
 
 		else if (applicationElement == MInputPart.class) {
-			return new RegistryStruct("", "org.eclipse.ui.editors", "editor", "name");
+			return new RegistryStruct("", "org.eclipse.ui.editors", "editor", "name"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 		}
 
 		else if (applicationElement == MPartDescriptor.class) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/messages.properties
new file mode 100644
index 0000000000..b2d9b523d8
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/messages.properties
@@ -0,0 +1,11 @@
+ModelImportPage1_SelectPluginAndElements=Select plug-in and elements
+ModelImportPage1_Description=Description
+ModelImportPage1_Go=go
+ModelImportPage1_Import=Import
+ModelImportPage1_SelectPlugInAndElementsToImport=Select plug-in and elements to import
+ModelImportPage1_ToImport=to import
+ModelImportPage1_WizardPage=wizardPage
+ModelImportPage1_WrongInput=Wrong input
+ModelImportWizard_ImportWizard=Import Wizard
+ModelImportWizard_Model=Model
+ModelImportWizard_UnknownElement=Unknown Element

From c6b5658fd2045487418a7f5f1687ea5200233e75 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Sun, 21 Sep 2014 10:03:53 -0400
Subject: [PATCH 0813/1286] Bug 443945 - [model editor] make better use of
 space for list box et al

This installment added functionality to model fragments (previous
installment only covered the application model)

Change-Id: I9ddaf698d71230dc987742a0a741d4604be2cbd1
---
 .../emf/ui/internal/common/E4PickList.java    |   4 +-
 .../component/ModelFragmentsEditor.java       | 233 ++++--------------
 .../common/component/StringModelFragment.java | 114 ++-------
 .../virtual/VModelFragmentsEditor.java        |  10 +-
 .../virtual/VModelImportsEditor.java          | 117 +++------
 5 files changed, 106 insertions(+), 372 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
index 88850a6059..87a3383e7f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
@@ -168,7 +168,7 @@ protected void moveUpPressed() {
 						if (Util.moveElementByIndex(componentEditor.getEditingDomain(), (MUIElement) obj, componentEditor.getEditor().isLiveModel(), idx)) {
 							viewer.setSelection(new StructuredSelection(obj));
 						}
-					} else if (obj instanceof MApplicationElement) {
+					} else if (obj instanceof MApplicationElement || obj instanceof org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container) {
 						Command cmd = MoveCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster().getValue(), feature, obj, idx);
 						if (cmd.canExecute()) {
 							componentEditor.getEditingDomain().getCommandStack().execute(cmd);
@@ -201,7 +201,7 @@ protected void moveDownPressed() {
 						if (Util.moveElementByIndex(componentEditor.getEditingDomain(), (MUIElement) obj, componentEditor.getEditor().isLiveModel(), idx)) {
 							viewer.setSelection(new StructuredSelection(obj));
 						}
-					} else if (obj instanceof MApplicationElement) {
+					} else if (obj instanceof MApplicationElement || obj instanceof org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container) {
 						Command cmd = MoveCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster().getValue(), feature, obj, idx);
 						if (cmd.canExecute()) {
 							componentEditor.getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index f4bd0881ef..fa6e157042 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance, Bug 443945
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -21,10 +23,11 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.ViewerElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
 import org.eclipse.e4.ui.model.fragment.MModelFragment;
@@ -39,25 +42,17 @@
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -118,94 +113,9 @@ private void createFragmentsTab(CTabFolder folder) {
 
 		{
 
-			Composite fragCompo = new Composite(parent, SWT.NONE);
-			fragCompo.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 3, 1));
-			GridLayout fragCompoLayout = new GridLayout(1, false);
-			fragCompoLayout.marginLeft = 0;
-			fragCompoLayout.marginRight = 0;
-			fragCompoLayout.marginWidth = 0;
-			fragCompoLayout.marginHeight = 0;
-			fragCompo.setLayout(fragCompoLayout);
-
-			final TableViewer viewer = new TableViewer(fragCompo);
-			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			viewer.getControl().setLayoutData(gd);
-
-			IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
-			viewer.setInput(prop.observeDetail(getMaster()));
-
-			Composite buttonComp = new Composite(parent, SWT.NONE);
-			buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
-			GridLayout gl = new GridLayout(4, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonComp.setLayout(gl);
-
-			Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
+			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS) {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MModelFragments container = (MModelFragments) getMaster().getValue();
-							int idx = container.getFragments().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MModelFragments container = (MModelFragments) getMaster().getValue();
-							int idx = container.getFragments().indexOf(obj) + 1;
-							if (idx < container.getFragments().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									viewer.setSelection(new StructuredSelection(obj));
-								}
-							}
-
-						}
-					}
-				}
-			});
-
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
+				protected void addPressed() {
 					MModelFragment component = MFragmentFactory.INSTANCE.createStringModelFragment();
 
 					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, component);
@@ -215,25 +125,21 @@ public void widgetSelected(SelectionEvent e) {
 						getEditor().setSelection(component);
 					}
 				}
-			});
 
-			b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-			b.addSelectionListener(new SelectionAdapter() {
 				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
-
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, elements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
+				protected List<?> getContainerChildren(Object container) {
+					if (container instanceof MModelFragments) {
+						return ((MModelFragments) container).getFragments();
+					} else {
+						return null;
 					}
 				}
-			});
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			TableViewer viewer = pickList.getList();
+
+			IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
+			viewer.setInput(prop.observeDetail(getMaster()));
 		}
 
 	}
@@ -250,31 +156,10 @@ private void createImportsTab(CTabFolder folder) {
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final ViewerElement tableElement = ViewerElement.create(context, parent, this);
-		tableElement.getViewer().setContentProvider(new ObservableListContentProvider());
-		tableElement.getViewer().setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-		tableElement.getDropDown().setContentProvider(new ArrayContentProvider());
-		tableElement.getDropDown().setLabelProvider(new LabelProvider() {
+		E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
 			@Override
-			public String getText(Object element) {
-				FeatureClass eclass = (FeatureClass) element;
-				return eclass.label;
-			}
-		});
-		tableElement.getDropDown().setComparator(new ViewerComparator() {
-			@Override
-			public int compare(Viewer viewer, Object e1, Object e2) {
-				FeatureClass eClass1 = (FeatureClass) e1;
-				FeatureClass eClass2 = (FeatureClass) e2;
-				return eClass1.label.compareTo(eClass2.label);
-			}
-		});
-
-		tableElement.getButtonAdd().addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				EClass eClass = ((FeatureClass) ((IStructuredSelection) tableElement.getDropDown().getSelection()).getFirstElement()).eClass;
+			protected void addPressed() {
+				EClass eClass = ((FeatureClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement()).eClass;
 				EObject eObject = EcoreUtil.create(eClass);
 
 				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, eObject);
@@ -284,64 +169,34 @@ public void widgetSelected(SelectionEvent e) {
 					getEditor().setSelection(eObject);
 				}
 			}
-		});
 
-		tableElement.getButtonRemove().addSelectionListener(new SelectionAdapter() {
 			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!tableElement.getViewer().getSelection().isEmpty()) {
-					List<?> elements = ((IStructuredSelection) tableElement.getViewer().getSelection()).toList();
-
-					Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, elements);
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-					}
-				}
+			protected List<?> getContainerChildren(Object master) {
+				// TODO What object is master? We need to cast.
+				return super.getContainerChildren(master);
 			}
-		});
+		};
 
-		tableElement.getButtonDown().addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!tableElement.getViewer().getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) tableElement.getViewer().getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						MModelFragments container = (MModelFragments) getMaster().getValue();
-						int idx = container.getImports().indexOf(obj) + 1;
-						if (idx < container.getImports().size()) {
-							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, obj, idx);
-
-							if (cmd.canExecute()) {
-								getEditingDomain().getCommandStack().execute(cmd);
-								tableElement.getViewer().setSelection(new StructuredSelection(obj));
-							}
-						}
+		pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+		pickList.setText(Messages.PartSashContainerEditor_Controls);
 
-					}
-				}
+		TableViewer viewer = pickList.getList();
+		ComboViewer picker = pickList.getPicker();
+
+		picker.setLabelProvider(new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				FeatureClass eclass = (FeatureClass) element;
+				return eclass.label;
 			}
 		});
 
-		tableElement.getButtonUp().addSelectionListener(new SelectionAdapter() {
+		picker.setComparator(new ViewerComparator() {
 			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!tableElement.getViewer().getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) tableElement.getViewer().getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						MModelFragments container = (MModelFragments) getMaster().getValue();
-						int idx = container.getImports().indexOf(obj) - 1;
-						if (idx >= 0) {
-							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, obj, idx);
-
-							if (cmd.canExecute()) {
-								getEditingDomain().getCommandStack().execute(cmd);
-								tableElement.getViewer().setSelection(new StructuredSelection(obj));
-							}
-						}
-					}
-				}
+			public int compare(Viewer viewer, Object e1, Object e2) {
+				FeatureClass eClass1 = (FeatureClass) e1;
+				FeatureClass eClass2 = (FeatureClass) e2;
+				return eClass1.label.compareTo(eClass2.label);
 			}
 		});
 
@@ -349,11 +204,11 @@ public void widgetSelected(SelectionEvent e) {
 		Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
 		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
 
-		tableElement.getDropDown().setInput(list);
-		tableElement.getDropDown().getCombo().select(0);
+		picker.setInput(list);
+		picker.getCombo().select(0);
 
 		IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
-		tableElement.getViewer().setInput(prop.observeDetail(getMaster()));
+		viewer.setInput(prop.observeDetail(getMaster()));
 	}
 
 	public void addClasses(EPackage ePackage, List<FeatureClass> list) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 0042e9fac0..12598385ed 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steve@spungin.tv> - Ongoing Maintenance, Bug 439532
+ *     Steven Spungin <steve@spungin.tv> - Ongoing Maintenance, Bug 439532, Bug 443945
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -24,14 +24,12 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FeatureSelectionDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindParentReferenceElementDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
-import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.ViewerElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.fragment.MModelFragment;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.e4.ui.model.fragment.impl.StringModelFragmentImpl;
@@ -45,16 +43,12 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
@@ -235,13 +229,24 @@ public void widgetSelected(SelectionEvent e) {
 		// ------------------------------------------------------------
 		{
 
-			final ViewerElement tableElement = ViewerElement.create(eclipseContext, parent, this);
+			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS) {
+				@Override
+				protected void addPressed() {
+					EClass eClass = ((FeatureClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement()).eClass;
+					handleAdd(eClass, false);
+				}
 
-			tableElement.getViewer().setContentProvider(new ObservableListContentProvider());
-			tableElement.getViewer().setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
+				@Override
+				protected List<?> getContainerChildren(Object master) {
+					return ((StringModelFragmentImpl) master).getElements();
+				}
+			};
 
-			tableElement.getDropDown().setContentProvider(new ArrayContentProvider());
-			tableElement.getDropDown().setLabelProvider(new LabelProvider() {
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			pickList.setText(""); //$NON-NLS-1$
+
+			ComboViewer picker = pickList.getPicker();
+			picker.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
 					FeatureClass eclass = (FeatureClass) element;
@@ -249,7 +254,7 @@ public String getText(Object element) {
 				}
 			});
 
-			tableElement.getDropDown().setComparator(new ViewerComparator() {
+			picker.setComparator(new ViewerComparator() {
 				@Override
 				public int compare(Viewer viewer, Object e1, Object e2) {
 					FeatureClass eClass1 = (FeatureClass) e1;
@@ -258,88 +263,15 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 				}
 			});
 
-			tableElement.getButtonAdd().addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					EClass eClass = ((FeatureClass) ((IStructuredSelection) tableElement.getDropDown().getSelection()).getFirstElement()).eClass;
-					EObject eObject = EcoreUtil.create(eClass);
-					setElementId(eObject);
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, eObject);
-
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-						getEditor().setSelection(eObject);
-					}
-				}
-			});
-
-			tableElement.getButtonRemove().addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!tableElement.getViewer().getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) tableElement.getViewer().getSelection()).toList();
-
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, elements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
-					}
-				}
-			});
-
-			tableElement.getButtonDown().addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!tableElement.getViewer().getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) tableElement.getViewer().getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MModelFragment container = (MModelFragment) getMaster().getValue();
-							int idx = container.getElements().indexOf(obj) + 1;
-							if (idx < container.getElements().size()) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									tableElement.getViewer().setSelection(new StructuredSelection(obj));
-								}
-							}
-						}
-					}
-				}
-			});
-
-			tableElement.getButtonUp().addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!tableElement.getViewer().getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) tableElement.getViewer().getSelection();
-						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MModelFragment container = (MModelFragment) getMaster().getValue();
-							int idx = container.getElements().indexOf(obj) - 1;
-							if (idx >= 0) {
-								Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, obj, idx);
-
-								if (cmd.canExecute()) {
-									getEditingDomain().getCommandStack().execute(cmd);
-									tableElement.getViewer().setSelection(new StructuredSelection(obj));
-								}
-							}
-						}
-					}
-				}
-			});
-
 			List<FeatureClass> list = new ArrayList<FeatureClass>();
 			Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
 			list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
 
-			tableElement.getDropDown().setInput(list);
-			tableElement.getDropDown().getCombo().select(0);
+			picker.setInput(list);
+			picker.getCombo().select(0);
 
 			IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
-			tableElement.getViewer().setInput(prop.observeDetail(getMaster()));
+			pickList.getList().setInput(prop.observeDetail(getMaster()));
 
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index f42d95912f..37f083092f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance, Bug 443945
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
@@ -20,9 +20,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
@@ -112,7 +112,11 @@ protected void addPressed() {
 
 				@Override
 				protected List<?> getContainerChildren(Object container) {
-					return ((MModelFragments) container).getFragments();
+					if (container instanceof MModelFragments) {
+						return ((MModelFragments) container).getFragments();
+					} else {
+						return null;
+					}
 				}
 			};
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index 482c9e1444..a0151a7c0d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance, Bug 443945
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
@@ -19,43 +20,38 @@
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.ViewerElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
+import org.eclipse.e4.ui.model.fragment.impl.ModelFragmentsImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 public class VModelImportsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private ViewerElement tableElement;
 
 	@Inject
 	IEclipseContext eclipseContext;
+	private TableViewer viewer;
 
 	@Inject
 	public VModelImportsEditor() {
@@ -89,7 +85,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			composite = createForm(parent, context, getMaster());
 		}
 		VirtualEntry<?> o = (VirtualEntry<?>) object;
-		tableElement.getViewer().setInput(o.getList());
+		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
@@ -104,31 +100,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		tableElement = ViewerElement.create(eclipseContext, parent, this);
-		tableElement.getViewer().setContentProvider(new ObservableListContentProvider());
-		tableElement.getViewer().setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-
-		tableElement.getDropDown().setContentProvider(new ArrayContentProvider());
-		tableElement.getDropDown().setLabelProvider(new LabelProvider() {
-			@Override
-			public String getText(Object element) {
-				FeatureClass eclass = (FeatureClass) element;
-				return eclass.label;
-			}
-		});
-		tableElement.getDropDown().setComparator(new ViewerComparator() {
-			@Override
-			public int compare(Viewer viewer, Object e1, Object e2) {
-				FeatureClass eClass1 = (FeatureClass) e1;
-				FeatureClass eClass2 = (FeatureClass) e2;
-				return eClass1.label.compareTo(eClass2.label);
-			}
-		});
-
-		tableElement.getButtonAdd().addSelectionListener(new SelectionAdapter() {
+		E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
 			@Override
-			public void widgetSelected(SelectionEvent e) {
-				EClass eClass = ((FeatureClass) ((IStructuredSelection) tableElement.getDropDown().getSelection()).getFirstElement()).eClass;
+			protected void addPressed() {
+				EClass eClass = ((FeatureClass) ((IStructuredSelection) picker.getSelection()).getFirstElement()).eClass;
 				EObject eObject = EcoreUtil.create(eClass);
 
 				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, eObject);
@@ -138,64 +113,32 @@ public void widgetSelected(SelectionEvent e) {
 					getEditor().setSelection(eObject);
 				}
 			}
-		});
 
-		tableElement.getButtonRemove().addSelectionListener(new SelectionAdapter() {
 			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!tableElement.getViewer().getSelection().isEmpty()) {
-					List<?> elements = ((IStructuredSelection) tableElement.getViewer().getSelection()).toList();
-
-					Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, elements);
-					if (cmd.canExecute()) {
-						getEditingDomain().getCommandStack().execute(cmd);
-					}
-				}
+			protected List<?> getContainerChildren(Object master) {
+				return ((ModelFragmentsImpl) master).getImports();
 			}
-		});
+		};
+		viewer = pickList.getList();
 
-		tableElement.getButtonDown().addSelectionListener(new SelectionAdapter() {
+		pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+		pickList.setText(""); //$NON-NLS-1$
+		ComboViewer picker = pickList.getPicker();
+
+		picker.setLabelProvider(new LabelProvider() {
 			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!tableElement.getViewer().getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) tableElement.getViewer().getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						MModelFragments container = (MModelFragments) getMaster().getValue();
-						int idx = container.getImports().indexOf(obj) + 1;
-						if (idx < container.getImports().size()) {
-							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, obj, idx);
-
-							if (cmd.canExecute()) {
-								getEditingDomain().getCommandStack().execute(cmd);
-								tableElement.getViewer().setSelection(new StructuredSelection(obj));
-							}
-						}
-
-					}
-				}
+			public String getText(Object element) {
+				FeatureClass eclass = (FeatureClass) element;
+				return eclass.label;
 			}
 		});
 
-		tableElement.getButtonUp().addSelectionListener(new SelectionAdapter() {
+		picker.setComparator(new ViewerComparator() {
 			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!tableElement.getViewer().getSelection().isEmpty()) {
-					IStructuredSelection s = (IStructuredSelection) tableElement.getViewer().getSelection();
-					if (s.size() == 1) {
-						Object obj = s.getFirstElement();
-						MModelFragments container = (MModelFragments) getMaster().getValue();
-						int idx = container.getImports().indexOf(obj) - 1;
-						if (idx >= 0) {
-							Command cmd = MoveCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, obj, idx);
-
-							if (cmd.canExecute()) {
-								getEditingDomain().getCommandStack().execute(cmd);
-								tableElement.getViewer().setSelection(new StructuredSelection(obj));
-							}
-						}
-					}
-				}
+			public int compare(Viewer viewer, Object e1, Object e2) {
+				FeatureClass eClass1 = (FeatureClass) e1;
+				FeatureClass eClass2 = (FeatureClass) e2;
+				return eClass1.label.compareTo(eClass2.label);
 			}
 		});
 
@@ -203,8 +146,8 @@ public void widgetSelected(SelectionEvent e) {
 		Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
 		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
 
-		tableElement.getDropDown().setInput(list);
-		tableElement.getDropDown().getCombo().select(0);
+		picker.setInput(list);
+		picker.getCombo().select(0);
 
 		folder.setSelection(0);
 

From 74a1efc8e595926b8dfa4dedf2a8d2cbecc2aca6 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Sun, 21 Sep 2014 19:56:36 +0200
Subject: [PATCH 0814/1286] Bug 444692 - Remove Warnings

---
 .../e4/tools/emf/ui/internal/common/ModelEditor.java   |  6 +++---
 .../emf/ui/internal/common/component/AddonsEditor.java |  2 +-
 .../common/component/DirectMenuItemEditor.java         |  2 +-
 .../common/component/DirectToolItemEditor.java         |  2 +-
 .../component/DynamicMenuContributionEditor.java       |  2 +-
 .../ui/internal/common/component/HandlerEditor.java    |  2 +-
 .../common/component/PartDescriptorEditor.java         |  2 +-
 .../emf/ui/internal/common/component/PartEditor.java   |  2 +-
 .../ui/internal/common/component/PartStackEditor.java  |  2 +-
 .../internal/common/component/ToolControlEditor.java   |  2 +-
 .../component/dialogs/ContributionClassDialog.java     |  5 +----
 .../common/component/dialogs/ContributionDataFile.java |  2 +-
 .../component/dialogs/FindImportElementDialog.java     |  2 +-
 .../dialogs/FindParentReferenceElementDialog.java      |  5 ++---
 .../common/component/virtual/VRootBindingContexts.java | 10 +---------
 .../ui/internal/common/objectdata/JavaAttribute.java   |  8 --------
 .../emf/ui/internal/common/objectdata/JavaObject.java  |  1 -
 .../dialogs/FindContributionDialog.java                |  6 +++---
 .../common/uistructure/WidgetContentProvider.java      |  9 ++++-----
 .../e4/tools/services/impl/ResourcePoolFactory.java    |  1 -
 20 files changed, 25 insertions(+), 48 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 1ce0a57637..d2b22ebf1d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -639,7 +639,7 @@ public void run() {
 			@Override
 			public void menuAboutToShow(IMenuManager manager) {
 				final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-				final List listOfSelections = s.toList();
+				final List<?> listOfSelections = s.toList();
 				int noSelected = listOfSelections.size();
 
 				boolean addSeparator = false;
@@ -735,7 +735,7 @@ public void run() {
 										VirtualEntry<?> ve = (VirtualEntry<?>) objSelect;
 										container = (EObject) ve.getOriginalParent();
 										IObservableList list = ve.getList();
-										Iterator iterator = list.iterator();
+										Iterator<?> iterator = list.iterator();
 										while (iterator.hasNext()) {
 											maes.add((MApplicationElement) iterator.next());
 										}
@@ -1043,7 +1043,7 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		TreeViewer tempViewer = null;
 		String property = System.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
 		if (property != null || preferences.getBoolean("tab-form-search-show", false)) { //$NON-NLS-1$
-			FilteredTree viewParent = new FilteredTree(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter());
+			FilteredTree viewParent = new FilteredTree(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(), false);
 			tempViewer = viewParent.getViewer();
 		} else {
 			tempViewer = new TreeViewerEx(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, emfDocumentProvider, modelProvider);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index f33cb1c1ca..fa44114cb3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -196,7 +196,7 @@ public void modifyText(ModifyEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index bdaefb4376..3ed7c8b5ae 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -163,7 +163,7 @@ public void modifyText(ModifyEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index b2a0720add..491be59d69 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -126,7 +126,7 @@ public void modifyText(ModifyEvent e) {
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+				ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 				dialog.open();
 			}
 		});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
index c2603eda9e..fa879a2376 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
@@ -203,7 +203,7 @@ public void modifyText(ModifyEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index c79c9b35cb..0248273444 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -220,7 +220,7 @@ public void modifyText(ModifyEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 5411f8e12c..6e26e0f3f5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -253,7 +253,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, project, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI, Messages);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 5a48411859..72bf31ed8c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -276,7 +276,7 @@ public void modifyText(ModifyEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index bbb914d17a..3b0926305a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -24,8 +24,8 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.FeatureClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.FeatureClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index ac9d5bfb3a..75dd2dff53 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -192,7 +192,7 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index 5c84961d53..27580b7a94 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -13,7 +13,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -35,15 +34,13 @@
 
 public class ContributionClassDialog extends FilteredContributionDialog {
 
-	private IProject project;
 	private MApplicationElement contribution;
 	private EditingDomain editingDomain;
 	private EStructuralFeature feature;
 	private Messages Messages;
 
-	public ContributionClassDialog(Shell parentShell, IEclipseContext context, IProject project, EditingDomain editingDomain, MApplicationElement contribution, EStructuralFeature feature, Messages Messages) {
+	public ContributionClassDialog(Shell parentShell, IEclipseContext context, EditingDomain editingDomain, MApplicationElement contribution, EStructuralFeature feature, Messages Messages) {
 		super(parentShell, context);
-		this.project = project;
 		this.contribution = contribution;
 		this.editingDomain = editingDomain;
 		this.feature = feature;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
index e712402742..a0a623777e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
@@ -482,7 +482,7 @@ public void touch(IProgressMonitor monitor) throws CoreException {
 	}
 
 	@Override
-	public Object getAdapter(Class adapter) {
+	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
 		// TODO Auto-generated method stub
 		return null;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index c6746c259b..c4de676968 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -181,7 +181,7 @@ protected void okPressed() {
 	private ClassContributionCollector getCollector() {
 		Bundle bundle = FrameworkUtil.getBundle(FindImportElementDialog.class);
 		BundleContext context = bundle.getBundleContext();
-		ServiceReference ref = context.getServiceReference(ClassContributionCollector.class.getName());
+		ServiceReference<?> ref = context.getServiceReference(ClassContributionCollector.class.getName());
 		if (ref != null) {
 			return (ClassContributionCollector) context.getService(ref);
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index 76c83b9101..604727521e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -81,7 +81,6 @@ public class FindParentReferenceElementDialog extends TitleAreaDialog {
 	private WritableList list;
 	private ComboViewer eClassViewer;
 	private Text searchText;
-	private AutoCompleteField acText;
 
 	public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEditor editor, MStringModelFragment fragment, Messages Messages) {
 		super(parentShell);
@@ -166,7 +165,7 @@ public void setControlContents(Control control, String text1, int cursorPosition
 				eClassViewer.setSelection(new StructuredSelection(eClass));
 			}
 		};
-		acText = new AutoCompleteField(combo, textContentAdapter, values);
+		new AutoCompleteField(combo, textContentAdapter, values);
 
 		l = new Label(container, SWT.NONE);
 		l.setText(Messages.FindParentReferenceElementDialog_Search);
@@ -268,7 +267,7 @@ protected void okPressed() {
 	private ClassContributionCollector getCollector() {
 		Bundle bundle = FrameworkUtil.getBundle(FindParentReferenceElementDialog.class);
 		BundleContext context = bundle.getBundleContext();
-		ServiceReference ref = context.getServiceReference(ClassContributionCollector.class.getName());
+		ServiceReference<?> ref = context.getServiceReference(ClassContributionCollector.class.getName());
 		if (ref != null) {
 			return (ClassContributionCollector) context.getService(ref);
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
index f200f421d6..8c75adeba1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
@@ -20,9 +20,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.MBindingContext;
@@ -31,7 +31,6 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
@@ -137,13 +136,6 @@ private void handleAddContext() {
 		}
 	}
 
-	private void handleRemoveContexts(List<?> contexts) {
-		Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT, contexts);
-		if (cmd.canExecute()) {
-			getEditingDomain().getCommandStack().execute(cmd);
-		}
-	}
-
 	@Override
 	public IObservableList getChildList(Object element) {
 		return null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
index b47d1e832b..2e428d2d1e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
@@ -14,7 +14,6 @@
 
 public class JavaAttribute {
 	private JavaObject object;
-	private JavaAttribute attribute;
 
 	private Field field;
 
@@ -24,13 +23,6 @@ public JavaAttribute(JavaObject object, Field field) {
 		this.field.setAccessible(true);
 	}
 
-	public JavaAttribute(JavaObject object, JavaAttribute attribute, Field field) {
-		this.object = object;
-		this.field = field;
-		this.field.setAccessible(true);
-		this.attribute = attribute;
-	}
-
 	public boolean isInjected() {
 		return this.field.getAnnotation(Inject.class) != null;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java
index 841f9103da..7bcb2c99a0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java
@@ -7,7 +7,6 @@
 public class JavaObject {
 	private Object instance;
 	private List<JavaAttribute> attributes;
-	private List<JavaMethod> methods;
 
 	public JavaObject(Object instance) {
 		this.instance = instance;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
index 5d9bae6048..a1398add58 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
@@ -249,7 +249,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 				if ("show-bundles".equals(mode)) { //$NON-NLS-1$
 					// only add first item from each bundle
 					boolean found = false;
-					for (Iterator it = list.iterator(); it.hasNext();) {
+					for (Iterator<?> it = list.iterator(); it.hasNext();) {
 						ContributionData cd2 = (ContributionData) it.next();
 						if (cd2.bundleName == null || cd2.bundleName.equals(cd.bundleName)) {
 							if (found == false) {
@@ -275,7 +275,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 					}
 					// only add first item from each package
 					boolean found = false;
-					for (Iterator it = list.iterator(); it.hasNext();) {
+					for (Iterator<?> it = list.iterator(); it.hasNext();) {
 						boolean matches = false;
 						ContributionData cd2 = (ContributionData) it.next();
 						if (packageName.isEmpty() && cd2.className.contains(".") == false) { //$NON-NLS-1$
@@ -382,7 +382,7 @@ private ClassContributionCollector getCollector() {
 			return null;
 		}
 		BundleContext context = bundle.getBundleContext();
-		ServiceReference ref = context.getServiceReference(ClassContributionCollector.class.getName());
+		ServiceReference<?> ref = context.getServiceReference(ClassContributionCollector.class.getName());
 		if (ref != null) {
 			return (ClassContributionCollector) context.getService(ref);
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
index 6a2433fd29..d6da259309 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
@@ -15,7 +15,6 @@
 import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.swt.widgets.TabFolder;
 import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.swt.widgets.ToolItem;
 import org.eclipse.swt.widgets.Tree;
@@ -76,16 +75,16 @@ public Object[] getChildren(Object parentElement) {
 				return new Object[] { item.getControl() };
 			}
 		} else if (parentElement instanceof Tree) {
-			Tree tree = (Tree) parentElement;
+			// No children
 
 		} else if (parentElement instanceof Tree) {
-			Table table = (Table) parentElement;
+			// No children
 
 		} else if (parentElement instanceof List) {
-			List list = (List) parentElement;
+			// No children
 
 		} else if (parentElement instanceof Combo) {
-			Combo combo = (Combo) parentElement;
+			// No children
 
 		} else if (parentElement instanceof CTabFolder) {
 			CTabFolder tabFolder = (CTabFolder) parentElement;
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java
index 1808b9f401..ac602dd2e7 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java
@@ -15,7 +15,6 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.services.impl.ResourceService.ResourcePool;
 
-@SuppressWarnings("restriction")
 public class ResourcePoolFactory extends ContextFunction {
 
 	@Override

From 553519e2beaef15f637778606519d8102182b2e3 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Mon, 22 Sep 2014 13:32:12 +0200
Subject: [PATCH 0815/1286] Bug 444692 - Remove Warnings - Added live editor as
 x friend to core tools bundle

---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index ef451317f9..b5dbab6a25 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -59,5 +59,5 @@ Export-Package: org.eclipse.e4.tools.emf.ui.common,
  org.eclipse.e4.tools.emf.ui.internal.common.xml;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.handlers;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.imp;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.wbm;x-friends:="org.eclipse.e4.tools.emf.editor"
+ org.eclipse.e4.tools.emf.ui.internal.wbm;x-friends:="org.eclipse.e4.tools.emf.editor,org.eclipse.e4.tools.emf.liveeditor"
 Service-Component: OSGI-INF/contributioncollector.xml, OSGI-INF/resourceprovider.xml

From 9226374c6320bcc15d1865ed71b55b0e707f0622 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Mon, 22 Sep 2014 13:56:44 +0200
Subject: [PATCH 0816/1286] Bug 444692 - Remove Warnings - Adapted
 TitleAreaFilterDialog

---
 .../dialogs/FilteredContributionDialog.java         | 12 +++++++++---
 .../component/tabs/empty/TitleAreaFilterDialog.java | 13 ++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index eebcc4ce25..e3ad7d08d4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -722,7 +722,9 @@ protected Control createContents(Composite parent) {
 			}
 		};
 		if (dlg.open() == Dialog.OK) {
-			setFilterBundles((List<String>) dlg.asList());
+			ArrayList<String> result = new ArrayList<String>();
+			result.add(dlg.getFirstSelection());
+			setFilterBundles(result);
 			refreshSearch();
 		}
 		updateUiState();
@@ -756,7 +758,9 @@ protected Control createContents(Composite parent) {
 			}
 		};
 		if (dlg.open() == Dialog.OK) {
-			setFilterPackages((List<String>) dlg.asList());
+			ArrayList<String> result = new ArrayList<String>();
+			result.add(dlg.getFirstSelection());
+			setFilterBundles(result);
 			refreshSearch();
 		}
 		updateUiState();
@@ -816,7 +820,9 @@ protected Control createContents(Composite parent) {
 			}
 		};
 		if (dlg.open() == Dialog.OK) {
-			setFilterLocations((List<String>) dlg.asList());
+			ArrayList<String> result = new ArrayList<String>();
+			result.add(dlg.getFirstSelection());
+			setFilterBundles(result);
 			refreshSearch();
 		}
 		updateUiState();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
index df02c420bc..4be363353a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
@@ -12,10 +12,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty;
 
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.Messages;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -151,13 +147,12 @@ protected Text getText() {
 		return text;
 	}
 
-	public List<?> asList() {
+	public String getFirstSelection() {
 		Object firstElement = getFirstElement();
-		if (firstElement == null) {
-			return Collections.EMPTY_LIST;
-		} else {
-			return Arrays.asList(firstElement);
+		if (firstElement instanceof String) {
+			return (String) firstElement;
 		}
+		return firstElement.toString();
 	}
 
 }

From 56b188bfe2b9692ba6ca329b3a5d70a286279c91 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Mon, 22 Sep 2014 08:19:27 -0400
Subject: [PATCH 0817/1286] Bug 444692 - Remove Warnings

Change-Id: I632122d7d70559146d9eb2d06314117464f10afa
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../dialogs/ContributionDataFile.java         | 10 ++++++++-
 .../dialogs/FilteredContributionDialog.java   | 21 ++++++++++++-------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
index a0a623777e..2750f6138a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
@@ -568,9 +568,10 @@ public IContentDescription getContentDescription() throws CoreException {
 	@Override
 	public InputStream getContents() throws CoreException {
 		URL url;
+		ZipFile zip = null;
 		try {
 			if (path.getFileExtension().equals("jar")) { //$NON-NLS-1$
-				ZipFile zip = new ZipFile(path.toOSString());
+				zip = new ZipFile(path.toOSString());
 				ZipEntry entry;
 				if (getContributionData().className != null) {
 					entry = zip.getEntry(getContributionData().className.replace('.', '/') + ".class"); //$NON-NLS-1$
@@ -595,6 +596,13 @@ public InputStream getContents() throws CoreException {
 			// perhaps not a bundle
 			// e.printStackTrace();
 			throw new CoreException(Status.CANCEL_STATUS);
+		} finally {
+			if (zip != null) {
+				try {
+					zip.close();
+				} catch (IOException e) {
+				}
+			}
 		}
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index e3ad7d08d4..1ee9389b39 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -245,11 +245,11 @@ public FilteredContributionDialog(Shell parentShell, IEclipseContext context) {
 		searchScopes = valueOf(ResourceSearchScope.class, searchScopesString);
 	}
 
-	public static <E extends Enum<E>> EnumSet<E> valueOf(Class<E> eClass, String str) {
+	public static <TheType extends Enum<TheType>> EnumSet<TheType> valueOf(Class<TheType> eClass, String str) {
 		String[] arr = str.substring(1, str.length() - 1).split(","); //$NON-NLS-1$
-		EnumSet<E> set = EnumSet.noneOf(eClass);
+		EnumSet<TheType> set = EnumSet.noneOf(eClass);
 		for (String e : arr)
-			set.add(E.valueOf(eClass, e.trim()));
+			set.add(TheType.valueOf(eClass, e.trim()));
 		return set;
 	}
 
@@ -1020,11 +1020,16 @@ protected IFile checkResourceAccessible(final IFile file, String installLocation
 
 	public BundleModel loadBundleModel(IProject currentProject) throws CoreException {
 		Document document = new Document();
-		String content = new Scanner(PDEProject.getManifest(currentProject).getContents()).useDelimiter("\\Z").next(); //$NON-NLS-1$
-		document.set(content);
-		BundleModel model = new BundleModel(document, false);
-		model.load();
-		return model;
+		Scanner scanner = new Scanner(PDEProject.getManifest(currentProject).getContents());
+		try {
+			String content = scanner.useDelimiter("\\Z").next(); //$NON-NLS-1$
+			document.set(content);
+			BundleModel model = new BundleModel(document, false);
+			model.load();
+			return model;
+		} finally {
+			scanner.close();
+		}
 	}
 
 	protected EnumSet<ResourceSearchScope> getSearchScopes() {

From 2377e7c9c7ca21553882146c3f4bb4344062ec79 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Mon, 22 Sep 2014 08:40:44 -0400
Subject: [PATCH 0818/1286] Bug 444692 - Remove Warnings

Change-Id: I464ab83cd73da5dce61a6d97e029b9e307580dd4
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index d2b22ebf1d..c3416f6b22 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1043,7 +1043,7 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		TreeViewer tempViewer = null;
 		String property = System.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
 		if (property != null || preferences.getBoolean("tab-form-search-show", false)) { //$NON-NLS-1$
-			FilteredTree viewParent = new FilteredTree(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(), false);
+			FilteredTree viewParent = new FilteredTree(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter());
 			tempViewer = viewParent.getViewer();
 		} else {
 			tempViewer = new TreeViewerEx(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, emfDocumentProvider, modelProvider);

From 713181ec420281f0d06eb390fbb77cde57d8b737 Mon Sep 17 00:00:00 2001
From: Steven Spungin <steven@spungin.tv>
Date: Mon, 22 Sep 2014 17:45:00 -0400
Subject: [PATCH 0819/1286] Bug 444692 - Remove Warnings

Change-Id: I2b9381e406c9a66feb0771c307885ae5e6c0dbfa
Signed-off-by: Steven Spungin <steven@spungin.tv>
---
 .../emf/ui/internal/common/component/ControlFactory.java     | 5 ++++-
 .../emf/ui/internal/common/component/PartStackEditor.java    | 1 +
 .../eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java   | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index aad107aa64..c9ab96da81 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -282,6 +282,7 @@ protected void setValue(Object element, Object value) {
 
 			@Override
 			protected Object getValue(Object element) {
+				@SuppressWarnings("unchecked")
 				Entry<String, String> entry = (Entry<String, String>) element;
 				return entry.getKey();
 			}
@@ -302,9 +303,9 @@ protected boolean canEdit(Object element) {
 		column.getColumn().setText(Messages.ControlFactory_Value);
 		column.getColumn().setWidth(200);
 		column.setLabelProvider(new ColumnLabelProvider() {
-			@SuppressWarnings("unchecked")
 			@Override
 			public String getText(Object element) {
+				@SuppressWarnings("unchecked")
 				Entry<String, String> entry = (Entry<String, String>) element;
 				return entry.getValue();
 			}
@@ -664,6 +665,8 @@ private static void handleAddText(AbstractComponentEditor editor, EStructuralFea
 		}
 	}
 
+	// This method is left in for reference purposes
+	@SuppressWarnings("unused")
 	private static void handleReplaceText(AbstractComponentEditor editor, EStructuralFeature feature, Text tagText, TableViewer viewer) {
 		if (tagText.getText().trim().length() > 0) {
 			if (!viewer.getSelection().isEmpty()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 3b0926305a..b85b5085ac 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -67,6 +67,7 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 
+@SuppressWarnings("deprecation")
 public class PartStackEditor extends AbstractComponentEditor {
 
 	private Composite composite;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
index b9d7fe03ef..71c377ec0e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
@@ -43,6 +43,7 @@
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 
+@SuppressWarnings("deprecation")
 public class RegistryUtil {
 
 	private static final String PLATFORM = "platform:"; //$NON-NLS-1$

From 98840a4dfe986941fc52dbb1701947106f2b401f Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Wed, 24 Sep 2014 00:16:07 +0200
Subject: [PATCH 0820/1286] Bug 439511 - Live model editor freezes the Eclipse
 IDE

Change-Id: I4195f71b5d724ff6283eb538a536c2cbdedfd8a3
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../tabs/ModelResourceContentProvider.java    | 82 +++++++++----------
 1 file changed, 40 insertions(+), 42 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
index 1f3db3a4f4..d0ccfa9cf6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
@@ -13,11 +13,9 @@
 
 import java.util.ArrayList;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
-import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EContentAdapter;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
@@ -25,48 +23,47 @@
 public class ModelResourceContentProvider implements IStructuredContentProvider {
 
 	private Object[] items = new Object[0];
-	private EContentAdapter adapter;
 	private Viewer viewer;
 
 	public ModelResourceContentProvider() {
-		adapter = new EContentAdapter() {
-			@Override
-			public void notifyChanged(Notification notification) {
-				switch (notification.getEventType()) {
-				case Notification.REMOVING_ADAPTER:
-					return;
-				}
-
-				if (viewer != null && viewer.getControl().isDisposed() == false) {
-					viewer.refresh();
-				}
-				super.notifyChanged(notification);
-
-				// boolean optimize = false;
-				// switch (notification.getEventType()) {
-				//
-				// case Notification.SET:
-				// // optimized to only update row if SET and not elementId
-				// // if the id is modified, we need to reindex our id map
-				// // (by forcing input)
-				//						if (notification.getFeature() != EmfUtil.getAttribute((EObject) notification.getFeature(), "elementId")) { //$NON-NLS-1$
-				// if (viewer instanceof TableViewer) {
-				// optimize = true;
-				// }
-				// }
-				// break;
-				// default:
-				// break;
-				// }
-				// if (optimize) {
-				// EClass eClass = (EClass) ((EAttribute)
-				// notification.getFeature()).eContainer();
-				// ((TableViewer) viewer).update(eClass, null);
-				// } else {
-				// viewer.setInput(viewer.getInput());
-				// }
-			}
-		};
+		// adapter = new EContentAdapter() {
+		// @Override
+		// public void notifyChanged(Notification notification) {
+		// switch (notification.getEventType()) {
+		// case Notification.REMOVING_ADAPTER:
+		// return;
+		// }
+		//
+		// if (viewer != null && viewer.getControl().isDisposed() == false) {
+		// viewer.refresh();
+		// }
+		// super.notifyChanged(notification);
+		//
+		// // boolean optimize = false;
+		// // switch (notification.getEventType()) {
+		// //
+		// // case Notification.SET:
+		// // // optimized to only update row if SET and not elementId
+		// // // if the id is modified, we need to reindex our id map
+		// // // (by forcing input)
+		//				//						if (notification.getFeature() != EmfUtil.getAttribute((EObject) notification.getFeature(), "elementId")) { //$NON-NLS-1$
+		// // if (viewer instanceof TableViewer) {
+		// // optimize = true;
+		// // }
+		// // }
+		// // break;
+		// // default:
+		// // break;
+		// // }
+		// // if (optimize) {
+		// // EClass eClass = (EClass) ((EAttribute)
+		// // notification.getFeature()).eContainer();
+		// // ((TableViewer) viewer).update(eClass, null);
+		// // } else {
+		// // viewer.setInput(viewer.getInput());
+		// // }
+		// }
+		// };
 	}
 
 	@Override
@@ -80,7 +77,8 @@ public void inputChanged(final Viewer viewer, Object oldInput, Object newInput)
 		ArrayList<EObject> list = new ArrayList<EObject>();
 		IModelResource modelProvider = (IModelResource) newInput;
 		if (newInput != oldInput && newInput != null) {
-			((EObject) modelProvider.getRoot().get(0)).eAdapters().add(adapter);
+			// ((EObject)
+			// modelProvider.getRoot().get(0)).eAdapters().add(adapter);
 		}
 		if (newInput != null) {
 			TreeIterator<Object> itTree = EcoreUtil.getAllContents(modelProvider.getRoot());

From 1908456adc13ae3f02fa80f771d7413574eb3d0d Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Wed, 24 Sep 2014 00:11:59 +0200
Subject: [PATCH 0821/1286] Bug 433982 - Remove "CSS Editor" from e4 tools

Change-Id: I6c68cfdbff0d6248bc96ce9f2cf04c2e9cfc2fbe
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

From 363d87e3f9fddd560f816a22d8fad4140031e9c3 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Thu, 25 Sep 2014 13:53:05 +0200
Subject: [PATCH 0822/1286] Bug 444692 - Remove Warnings- Removed deprecated
 constructor call

---
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index c3416f6b22..d2b22ebf1d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1043,7 +1043,7 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		TreeViewer tempViewer = null;
 		String property = System.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
 		if (property != null || preferences.getBoolean("tab-form-search-show", false)) { //$NON-NLS-1$
-			FilteredTree viewParent = new FilteredTree(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter());
+			FilteredTree viewParent = new FilteredTree(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(), false);
 			tempViewer = viewParent.getViewer();
 		} else {
 			tempViewer = new TreeViewerEx(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, emfDocumentProvider, modelProvider);

From 602ec5c3579d443814a3aa11f5a4db3f78494de2 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Thu, 25 Sep 2014 16:37:44 +0200
Subject: [PATCH 0823/1286] Bug 421456 - Remove translation service from e4
 tools

---
 .../component/AbstractComponentEditor.java    |   2 +-
 .../emf/ui/internal/common/ModelEditor.java   |   2 +-
 .../internal/common/component/AreaEditor.java |   2 +-
 .../component/BindingContextEditor.java       |   2 +-
 .../common/component/BindingTableEditor.java  |   2 +-
 .../common/component/CommandEditor.java       |   2 +-
 .../common/component/KeyBindingEditor.java    |   2 +-
 .../internal/common/component/MenuEditor.java |   5 +-
 .../component/PartSashContainerEditor.java    |   2 +-
 .../component/PerspectiveStackEditor.java     |   2 +-
 .../common/component/TrimBarEditor.java       |   2 +-
 .../component/TrimContributionEditor.java     |   3 +-
 .../tabs/ContributionUriCellEditor.java       |   3 +-
 .../tabs/EAttributeEditingSupport.java        |   3 +-
 .../common/component/tabs/ListTab.java        |   2 +-
 .../common/component/tabs/XmiTab.java         |   2 +-
 ...TitleAreaFilterDialogWithEmptyOptions.java |   1 -
 .../component/virtual/VApplicationAddons.java |   2 +-
 .../virtual/VApplicationCategoriesEditor.java |   2 +-
 .../virtual/VBindingTableEditor.java          |   2 +-
 .../component/virtual/VCommandEditor.java     |   2 +-
 .../component/virtual/VHandlerEditor.java     |   2 +-
 .../virtual/VItemParametersEditor.java        |   2 +-
 .../virtual/VMenuContributionsEditor.java     |   2 +-
 .../common/component/virtual/VMenuEditor.java |   3 +-
 .../component/virtual/VPartDescriptor.java    |   2 +-
 .../virtual/VPerspectiveControlEditor.java    |   5 +-
 .../component/virtual/VSnippetsEditor.java    |   5 +-
 .../virtual/VToolBarContributionsEditor.java  |   2 +-
 .../virtual/VTrimContributionsEditor.java     |   2 +-
 .../virtual/VWindowControlEditor.java         |   5 +-
 .../component/virtual/VWindowEditor.java      |   5 +-
 .../virtual/VWindowSharedElementsEditor.java  |   2 +-
 .../component/virtual/VWindowTrimEditor.java  |   2 +-
 .../common/objectdata/JavaAttribute.java      |   2 +-
 .../common/properties/ExportIdsHandler.java   |   2 +-
 .../properties/ExternalizeStringHandler.java  |   2 +-
 .../dialogs/FindIconDialog.java               |   3 +-
 .../dialogs/ProjectFolderPickerDialog.java    |   3 +-
 .../ReferencedProjectPickerDialog.java        |   3 +-
 .../common/uistructure/ViewerElement.java     |   2 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../OSGI-INF/messagefactoryservice.xml        |   7 -
 .../OSGI-INF/translationsupplier.xml          |   8 -
 .../services/IMessageFactoryService.java      |  25 --
 .../eclipse/e4/tools/services/Message.java    |  14 -
 .../e4/tools/services/Translation.java        |  16 --
 .../impl/MessageFactoryServiceImpl.java       | 247 ------------------
 .../impl/TranslationObjectSupplier.java       | 173 ------------
 49 files changed, 46 insertions(+), 549 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.services/OSGI-INF/messagefactoryservice.xml
 delete mode 100644 bundles/org.eclipse.e4.tools.services/OSGI-INF/translationsupplier.xml
 delete mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java
 delete mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Message.java
 delete mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Translation.java
 delete mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java
 delete mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 079c871032..eea1dd0d7c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -19,6 +19,7 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.core.services.nls.Translation;
 import org.eclipse.e4.core.services.translation.TranslationService;
 import org.eclipse.e4.tools.emf.ui.common.AbstractElementEditorContribution;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -28,7 +29,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.properties.ProjectOSGiTranslationProvider;
 import org.eclipse.e4.tools.services.IClipboardService.Handler;
 import org.eclipse.e4.tools.services.IResourcePool;
-import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.e4.tools.services.impl.ResourceBundleTranslationProvider;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index d2b22ebf1d..7cd44ab43f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -48,6 +48,7 @@
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.Preference;
 import org.eclipse.e4.core.services.contributions.IContributionFactory;
+import org.eclipse.e4.core.services.nls.Translation;
 import org.eclipse.e4.core.services.translation.TranslationService;
 import org.eclipse.e4.tools.emf.ui.common.AbstractElementEditorContribution;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
@@ -141,7 +142,6 @@
 import org.eclipse.e4.tools.services.IClipboardService;
 import org.eclipse.e4.tools.services.IClipboardService.Handler;
 import org.eclipse.e4.tools.services.IResourcePool;
-import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.di.Persist;
 import org.eclipse.e4.ui.di.PersistState;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 2e07648a33..7b969a05b7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -26,8 +26,8 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AreaIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 3d9b0b0981..66bbb5e535 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -23,8 +23,8 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.ui.model.application.commands.MBindingContext;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 2fe426b049..32420161c7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -23,8 +23,8 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BindingContextSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MBindingTable;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index b6f0ce74d6..5e4aa8ae9b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -23,8 +23,8 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.CommandCategorySelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 88f39e88ed..e20b77db57 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -30,8 +30,8 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Plugin;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.KeyBindingCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index ca7ebc2985..874cca5d36 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -13,9 +13,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList.Struct;
-
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -37,6 +34,8 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList.Struct;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EClass2EObject;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EObject2EClass;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 08349ac2c9..608a2c28b7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -24,8 +24,8 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.FeatureClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.FeatureClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.tools.emf.ui.internal.imp.RegistryUtil;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index ec5e87a3ca..86c1fe9f8b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -24,9 +24,9 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
-import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 2c8007ab80..225596dea3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -23,6 +23,7 @@
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.core.services.nls.Translation;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -32,7 +33,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
-import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index bd329de05c..ec9907ba9e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -14,8 +14,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
-
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -30,6 +28,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.TrimIdDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
index 66f14b4717..534fdde4ed 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
@@ -9,12 +9,11 @@
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
 
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.BundleClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.IconDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.UriDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.UriDialogType;
-
-import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.viewers.DialogCellEditor;
 import org.eclipse.swt.widgets.Composite;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
index 68a7c6dd1b..097cb9881a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
@@ -11,9 +11,8 @@
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.UriDialogType;
-
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.UriDialogType;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index a81cde8b31..afcf8a8601 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -39,6 +39,7 @@
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.services.nls.Translation;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.Plugin;
@@ -52,7 +53,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.TitleAreaFilterDialogWithEmptyOptions;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.EMFDocumentResourceMediator;
 import org.eclipse.e4.tools.services.IResourcePool;
-import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.util.TreeIterator;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
index ab8dd421ad..f569860698 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
@@ -18,13 +18,13 @@
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.core.services.nls.Translation;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.AnnotationAccess;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.EMFDocumentResourceMediator;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.XMLConfiguration;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.XMLPartitionScanner;
 import org.eclipse.e4.tools.services.IResourcePool;
-import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
 import org.eclipse.jface.resource.JFaceResources;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
index 2ef35a9c36..a417657fec 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
@@ -9,7 +9,6 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty;
 
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.Messages;
-
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index 234bb55b79..2b6e112737 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -21,9 +21,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MAddon;
 import org.eclipse.e4.ui.model.application.MApplication;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index 9fde785247..2debfdd720 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -20,9 +20,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.ui.model.application.MApplication;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index c3e718f023..32824bdfe6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -20,9 +20,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.MBindingTable;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 149e179419..226c656e5e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -18,6 +18,7 @@
 import javax.inject.Inject;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.core.services.nls.Translation;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -26,7 +27,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
-import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 13b0059ef7..80c3673857 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -20,9 +20,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
index 98ee033c5b..1084fb64c6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -20,9 +20,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index 2e39a06275..e66ebaa87e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -20,9 +20,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 42f4ae4610..2670f8f11b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -11,8 +11,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
-
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -22,6 +20,7 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index a36c2fd843..34478f6285 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -20,9 +20,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.tools.emf.ui.internal.imp.RegistryUtil;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index 7006292058..869ba353ec 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -11,8 +11,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
-
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -21,8 +19,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index 0e9abd1cea..1173576544 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -3,8 +3,6 @@
 /*
  * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  */
-import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -14,8 +12,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index 857d35077d..3ae28e172a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -20,9 +20,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index b0509b1cb7..c43395079e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -20,9 +20,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 3ac3a01f7c..fe8f5d49ca 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -11,9 +11,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
-
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -25,6 +22,8 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index d490f8e7b6..9366ee08ea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -11,8 +11,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
-
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -20,8 +18,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 8ec4e96cc7..e1c2228351 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -21,9 +21,9 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.tools.emf.ui.internal.imp.RegistryUtil;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index 5409c072d9..c3459ac0e2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -20,9 +20,9 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
 import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
index 2e428d2d1e..dd81738fb9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
@@ -8,7 +8,7 @@
 import javax.inject.Named;
 import org.eclipse.e4.core.di.extensions.EventTopic;
 import org.eclipse.e4.core.di.extensions.Preference;
-import org.eclipse.e4.tools.services.Translation;
+import org.eclipse.e4.core.services.nls.Translation;
 import org.eclipse.e4.ui.di.UIEventTopic;
 import org.osgi.framework.FrameworkUtil;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
index 7d8dc03293..51c164fc32 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
@@ -25,11 +25,11 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.core.services.nls.Translation;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.services.IResourcePool;
-import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.emf.common.util.TreeIterator;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
index f994cd5782..b4f8f21af4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
@@ -16,11 +16,11 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.core.services.nls.Translation;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.services.IResourcePool;
-import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java
index d4716fa3f1..4889711b8a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java
@@ -10,10 +10,9 @@
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
-
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AbstractIconDialogWithScopeAndFilter;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
 import org.eclipse.swt.widgets.Shell;
 
 final class FindIconDialog extends AbstractIconDialogWithScopeAndFilter {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
index 0c918abacf..bf4bc045bf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
-
 import java.net.URL;
 import java.util.ArrayList;
 import org.eclipse.core.resources.IProject;
@@ -21,6 +19,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
index be0019102b..cb301c2bea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
@@ -10,12 +10,11 @@
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
 
-import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
-
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.TitleAreaFilterDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
index b333f08534..c5e3613332 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
@@ -15,10 +15,10 @@
 import javax.inject.Inject;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.services.nls.Translation;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.services.Translation;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.TableViewer;
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 4d07898ac1..bf5d2f26e4 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0",
  org.eclipse.osgi;bundle-version="3.7.0",
  org.eclipse.e4.core.services;bundle-version="0.9.1"
-Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml, OSGI-INF/messagefactoryservice.xml, OSGI-INF/translationsupplier.xml
+Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.0.0",
  javax.inject;version="1.0.0"
diff --git a/bundles/org.eclipse.e4.tools.services/OSGI-INF/messagefactoryservice.xml b/bundles/org.eclipse.e4.tools.services/OSGI-INF/messagefactoryservice.xml
deleted file mode 100644
index 6331e45327..0000000000
--- a/bundles/org.eclipse.e4.tools.services/OSGI-INF/messagefactoryservice.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.services.messagefactoryservice">
-   <implementation class="org.eclipse.e4.tools.services.impl.MessageFactoryServiceImpl"/>
-   <service>
-      <provide interface="org.eclipse.e4.tools.services.IMessageFactoryService"/>
-   </service>
-</scr:component>
diff --git a/bundles/org.eclipse.e4.tools.services/OSGI-INF/translationsupplier.xml b/bundles/org.eclipse.e4.tools.services/OSGI-INF/translationsupplier.xml
deleted file mode 100644
index a25fcdfb93..0000000000
--- a/bundles/org.eclipse.e4.tools.services/OSGI-INF/translationsupplier.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.e4.tools.services.translationsupplier">
-   <implementation class="org.eclipse.e4.tools.services.impl.TranslationObjectSupplier"/>
-   <service>
-      <provide interface="org.eclipse.e4.core.di.suppliers.ExtendedObjectSupplier"/>
-   </service>
-   <property name="dependency.injection.annotation" type="String" value="org.eclipse.e4.tools.services.Translation"/>
-</scr:component>
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java
deleted file mode 100644
index 94080225ed..0000000000
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IMessageFactoryService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.e4.tools.services;
-
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import org.eclipse.osgi.service.localization.BundleLocalization;
-
-/**
- * Service that is responsible for creating and managing message class instances.
- */
-public interface IMessageFactoryService {
-	
-	/**
-	 * Returns an instance of the of a given messages class for the given {@link Locale}.
-	 * If configured it caches the created instances and return the already created instances.
-	 * Otherwise a new instance will be created.
-	 * 
-	 * @param locale The {@link Locale} for which the message class instance is requested.
-	 * @param messages The type of the message class whose instance is requested.
-	 * @param localization The service that is needed to retrieve {@link ResourceBundle} objects from a bundle 
-	 * 			with a given locale.
-	 * @return An instance of the given messages class and {@link Locale}.
-	 */
-	public <M> M getMessageInstance(final Locale locale, final Class<M> messages, BundleLocalization localization);
-}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Message.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Message.java
deleted file mode 100644
index 05afcf7f30..0000000000
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Message.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.eclipse.e4.tools.services;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Message {
-	public enum ReferenceType {
-		NONE, SOFT, WEAK
-	}
-
-	ReferenceType referenceType() default ReferenceType.SOFT;
-	String contributorURI() default "";
-}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Translation.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Translation.java
deleted file mode 100644
index ca92d445ee..0000000000
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/Translation.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.eclipse.e4.tools.services;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import javax.inject.Qualifier;
-
-@Qualifier
-@Documented
-@Target({ElementType.FIELD, ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Translation {
-
-}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java
deleted file mode 100644
index 4273532fb2..0000000000
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/MessageFactoryServiceImpl.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Dirk Fauth <dirk.fauth@gmail.com> - modifications to instance creation
- ******************************************************************************/
-package org.eclipse.e4.tools.services.impl;
-
-import java.lang.ref.Reference;
-import java.lang.ref.SoftReference;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import javax.annotation.PostConstruct;
-
-import org.eclipse.e4.tools.services.IMessageFactoryService;
-import org.eclipse.e4.tools.services.Message;
-import org.eclipse.e4.tools.services.Message.ReferenceType;
-import org.eclipse.e4.tools.services.ToolsServicesActivator;
-import org.eclipse.osgi.service.localization.BundleLocalization;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.service.log.LogService;
-
-public class MessageFactoryServiceImpl implements IMessageFactoryService {
-
-	private static LogService logService = ToolsServicesActivator.getDefault().getLogService();
-
-	// Cache so when multiple instance use the same message class
-	private Map<Object, Reference<Object>> SOFT_CACHE = Collections
-			.synchronizedMap(new HashMap<Object, Reference<Object>>());
-
-	private Map<Object, Reference<Object>> WEAK_CACHE = Collections
-			.synchronizedMap(new HashMap<Object, Reference<Object>>());
-
-	private int CLEANUPCOUNT = 0;
-
-	@Override
-	public <M> M getMessageInstance(final Locale locale, final Class<M> messages, final BundleLocalization localization) {
-		String key = messages.getName() + "_" + locale; //$NON-NLS-1$
-
-		final Message annotation = messages.getAnnotation(Message.class);
-		Map<Object, Reference<Object>> cache = null;
-		ReferenceType type = ReferenceType.NONE;
-
-		if (++CLEANUPCOUNT > 1000) {
-			Iterator<Entry<Object, Reference<Object>>> it = WEAK_CACHE
-					.entrySet().iterator();
-			while (it.hasNext()) {
-				if (it.next().getValue().get() == null) {
-					it.remove();
-				}
-			}
-
-			it = SOFT_CACHE.entrySet().iterator();
-			while (it.hasNext()) {
-				if (it.next().getValue().get() == null) {
-					it.remove();
-				}
-			}
-			CLEANUPCOUNT = 0;
-		}
-
-		if (annotation == null
-				|| annotation.referenceType() == ReferenceType.SOFT) {
-			cache = SOFT_CACHE;
-			type = ReferenceType.SOFT;
-		} else if (annotation.referenceType() == ReferenceType.WEAK) {
-			cache = WEAK_CACHE;
-			type = ReferenceType.WEAK;
-		}
-
-		if (cache != null && cache.containsKey(key)) {
-			@SuppressWarnings("unchecked")
-			Reference<M> ref = (Reference<M>) cache.get(key);
-			M o = ref.get();
-			if (o != null) {
-				return o;
-			}
-			cache.remove(key);
-		}
-
-		M instance;
-
-		if (System.getSecurityManager() == null) {
-			instance = createInstance(locale, messages, annotation, localization);
-		} else {
-			instance = AccessController.doPrivileged(new PrivilegedAction<M>() {
-
-				public M run() {
-					return createInstance(locale, messages, annotation, localization);
-				}
-
-			});
-		}
-
-		if (cache != null) {
-			if (type == ReferenceType.SOFT) {
-				cache.put(key, new SoftReference<Object>(instance));
-			} else if (type == ReferenceType.WEAK) {
-				cache.put(key, new WeakReference<Object>(instance));
-			}
-		}
-
-		return instance;
-	}
-
-	/**
-	 * Creates and returns an instance of the of a given messages class for the given {@link Locale}.
-	 * The message class gets instantiated and the fields are initialized with values out of a {@link ResourceBundle}.
-	 * As there are several options to specify the location of the {@link ResourceBundle} to load, the 
-	 * following search order is used:
-	 * <ol>
-	 * <li>URI location<br/>
-	 * 		If the message class is annotated with <code>@Message</code> and the <i>contributorURI</i>
-	 * 		attribute is set, the {@link ResourceBundle} is searched at the specified location</li> 
-	 * <li>Relative location<br/>
-	 * 		If the message class is not annotated with <code>@Message</code> and a contributorURI
-	 * 		attribute value or there is no {@link ResourceBundle} found at the specified location, a 
-	 * 		{@link ResourceBundle} with the same name in the same package as the message class is searched.</li> 
-	 * <li>Bundle localization<br/>
-	 * 		If there is no {@link ResourceBundle} found by URI or relative location, the OSGi {@link ResourceBundle}
-	 * 		configured in the MANIFEST.MF is tried to load.</li> 
-	 * </ol>
-	 * Note: Even if there is no {@link ResourceBundle} found in any of the mentioned locations, this method will
-	 * 		 not break. In this case the fields of the message class will get initialized with values that look 
-	 * 		 like <code>!key!</code> to indicate that there is no translation value found for that key.
-	 * 
-	 * @param locale The {@link Locale} for which the message class instance is requested.
-	 * @param messages The type of the message class whose instance is requested.
-	 * @param annotation The annotation that is used in the message class. If specified it is needed
-	 * 			to retrieve the URI of the location to search for the {@link ResourceBundle}.
-	 * @param localization The service that is needed to retrieve {@link ResourceBundle} objects from a bundle 
-	 * 			with a given locale.
-	 * 
-	 * @return The created instance of the given messages class and {@link Locale} or <code>null</code>
-	 * 			if an error occured on creating the instance.
-	 */
-	private static <M> M createInstance(Locale locale, Class<M> messages,
-			Message annotation, BundleLocalization localization) {
-
-		ResourceBundle resourceBundle = null;
-		if (annotation != null && annotation.contributorURI().length() > 0) {
-			resourceBundle = ResourceBundleHelper.getResourceBundleForUri(annotation.contributorURI(), locale, localization);
-		}
-		
-		if (resourceBundle == null) {
-			//check for the resource bundle relative to the messages class
-			String baseName = messages.getName().replace('.', '/');
-			
-			try {
-				resourceBundle = ResourceBundleHelper.getEquinoxResourceBundle(baseName, locale, messages.getClassLoader());
-			}
-			catch (MissingResourceException e) {
-				//do nothing as this just means there is no resource bundle named
-				//like the messages class in the same package
-				//therefore we will go on and search for the OSGi resource bundle
-			}
-		}
-		
-		if (resourceBundle == null) {
-			//retrieve the OSGi resource bundle
-			Bundle bundle = FrameworkUtil.getBundle(messages);
-			resourceBundle = localization.getLocalization(bundle, locale.toString());
-		}
-		
-		//always create a provider, if there is no resource bundle found, simply the modified keys will
-		//be returned by this provider to show that there is something wrong on loading it
-		ResourceBundleTranslationProvider provider = new ResourceBundleTranslationProvider(resourceBundle);
-		
-		M instance = null;
-		try {
-			instance = messages.newInstance();
-			Field[] fields = messages.getDeclaredFields();
-			
-			for (int i = 0; i < fields.length; i++) {
-				if (!fields[i].isAccessible()) {
-					fields[i].setAccessible(true);
-				}
-				
-				fields[i].set(instance,
-						provider.translate(fields[i].getName()));
-			}
-		} catch (InstantiationException e) {
-			if (logService != null)
-				logService.log(LogService.LOG_ERROR,
-						"Instantiation of messages class failed", e); //$NON-NLS-1$
-		} catch (IllegalAccessException e) {
-			if (logService != null)
-				logService.log(LogService.LOG_ERROR,
-						"Failed to access messages class", e); //$NON-NLS-1$
-		}
-		
-		//invoke the method annotated with @PostConstruct
-		processPostConstruct(instance, messages);
-		
-		return instance;
-	}
-	
-	/**
-	 * Searches for the method annotated {@link PostConstruct} in the messages class.
-	 * If there is one found it will be executed.
-	 * <p>
-	 * Note: The method annotated with {@link PostConstruct} does not support method injection
-	 * 		 because we are not using the injection mechanism to call.
-	 * @param messageObject The message instance of the given class where the method annotated with
-	 * 			{@link PostConstruct} should be called
-	 * @param messageClass The type of the message class whose instance is requested.
-	 */
-	private static void processPostConstruct(Object messageObject, Class<?> messageClass) {
-		if (messageObject != null) {
-			Method[] methods = messageClass.getDeclaredMethods();
-			for (int i = 0; i < methods.length; i++) {
-				Method method = methods[i];
-				if (!method.isAnnotationPresent(PostConstruct.class)) {
-					continue;
-				}
-				else {
-					try {
-						method.invoke(messageObject);
-					} catch (Exception e) {
-						if (logService != null)
-							logService.log(LogService.LOG_ERROR,
-								"Exception on trying to execute the @PostConstruct annotated method in " + messageClass, e); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java
deleted file mode 100644
index c52c2afdb3..0000000000
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/TranslationObjectSupplier.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Dirk Fauth <dirk.fauth@gmail.com> - modifications to support locale changes at runtime
- ******************************************************************************/
-package org.eclipse.e4.tools.services.impl;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.core.di.suppliers.ExtendedObjectSupplier;
-import org.eclipse.e4.core.di.suppliers.IObjectDescriptor;
-import org.eclipse.e4.core.di.suppliers.IRequestor;
-import org.eclipse.e4.core.services.translation.TranslationService;
-import org.eclipse.e4.tools.services.IMessageFactoryService;
-import org.eclipse.e4.tools.services.Message;
-import org.eclipse.e4.tools.services.ToolsServicesActivator;
-import org.eclipse.osgi.service.localization.BundleLocalization;
-import org.osgi.service.log.LogService;
-
-@SuppressWarnings("rawtypes")
-public class TranslationObjectSupplier extends ExtendedObjectSupplier {
-
-	private static LogService logService = ToolsServicesActivator.getDefault().getLogService();
-
-	/**
-	 * The current active locale that gets injected for updating the message instances.
-	 */
-	private Locale locale;
-
-	/**
-	 * The service that gets {@link ResourceBundle} objects from a bundle with a given locale. 
-	 */
-	@Inject
-	private BundleLocalization localization;
-
-	/**
-	 * The service that creates instances of message classes based on the current active locale,
-	 * the {@link BundleLocalization} and the configuration used in the {@link Message} annotation.
-	 */
-	@Inject
-	private IMessageFactoryService factoryService;
-	
-	/**
-	 * Map that contains all {@link IRequestor} that requested an instance of a messages class.
-	 * Used to inform all requestor if the instances have changed due to a locale change.
-	 */
-	private Map<Class, Set<IRequestor>> listeners = new HashMap<Class, Set<IRequestor>>();
-
-	@Override
-	public Object get(IObjectDescriptor descriptor, IRequestor requestor,
-			boolean track, boolean group) {
-
-		Class<?> descriptorsClass = getDesiredClass(descriptor.getDesiredType());
-
-		if (track)
-			 addListener(descriptorsClass, requestor);
-
-		return getMessageInstance(descriptorsClass);
-	}
-
-	/**
-	 * Setting the {@link Locale} by using this method will cause to create new instances for all
-	 * message classes that were requested before. It also notifys all {@link IRequestor} that requested
-	 * those messages instance which causes dynamic reinjection.
-	 * @param locale The {@link Locale} to use for creating the message instances.
-	 */
-	@Inject
-	public void setLocale(@Optional @Named(TranslationService.LOCALE) String locale) {
-		try {
-			this.locale = locale == null ? Locale.getDefault() : ResourceBundleHelper.toLocale(locale);
-		}
-		catch (IllegalArgumentException e) {
-			//parsing the locale String to a Locale failed because of invalid String, use the default locale
-			if (logService != null)
-				logService.log(LogService.LOG_ERROR, e.getMessage() + " - Default Locale will be used instead."); //$NON-NLS-1$
-			this.locale = Locale.getDefault();
-		}
-		catch (Exception e) {
-			//parsing the locale String to a Locale failed, so we use the default Locale
-			if (logService != null)
-				logService.log(LogService.LOG_ERROR, "Invalid locale", e); //$NON-NLS-1$
-			this.locale = Locale.getDefault();
-		}
-		
-		//update listener
-		updateMessages();
-	}
-
-	/**
-	 * Notify the {@link IRequestor}s of those instances that they need to update their message class instances.
-	 */
-	private void updateMessages() {
-		for (Map.Entry<Class, Set<IRequestor>> entry : this.listeners.entrySet()) {
-			notifyRequestor(entry.getValue());
-		}
-	}
-	
-	/**
-	 * Checks if for the specified descriptor class there is already an instance in the local
-	 * cache. If not a new instance is created using the local configuration on {@link Locale},
-	 * {@link BundleLocalization} and given descriptor class.
-	 * @param descriptorsClass The class for which an instance is requested.
-	 * @return The instance of the requested message class
-	 */
-	private Object getMessageInstance(Class<?> descriptorsClass) {
-		return this.factoryService.getMessageInstance(this.locale, descriptorsClass, this.localization);
-	}
-	
-	/**
-	 * Remember the {@link IRequestor} that requested an instance of the given descriptor class.
-	 * This is needed to be able to inform all {@link IRequestor} if the {@link Locale} changes 
-	 * at runtime.
-	 * @param descriptorsClass The class for which an instance was requested.
-	 * @param requestor The {@link IRequestor} that requested the instance.
-	 */
-	private void addListener(Class<?> descriptorsClass, IRequestor requestor) {
-		Set<IRequestor> registered = this.listeners.get(descriptorsClass);
-		if (registered == null) {
-			registered = new HashSet<IRequestor>();
-			this.listeners.put(descriptorsClass, registered);
-		}
-		registered.add(requestor);
-	}
-
-	/**
-	 * Notify all given {@link IRequestor} about changes for their injected values.
-	 * This way the dynamic injection is performed. 
-	 * @param requestors The {@link IRequestor} to inform about the instance changes.
-	 */
-	private void notifyRequestor(Collection<IRequestor> requestors) {
-		if (requestors != null) {
-			for (Iterator<IRequestor> it = requestors.iterator(); it.hasNext();) {
-				IRequestor requestor = it.next();
-				if (!requestor.isValid()) {
-					it.remove();
-					continue;
-				}
-				requestor.resolveArguments(false);
-				requestor.execute();
-			}
-		}
-	}
-
-	private Class<?> getDesiredClass(Type desiredType) {
-		if (desiredType instanceof Class<?>)
-			return (Class<?>) desiredType;
-		if (desiredType instanceof ParameterizedType) {
-			Type rawType = ((ParameterizedType) desiredType).getRawType();
-			if (rawType instanceof Class<?>)
-				return (Class<?>) rawType;
-		}
-		return null;
-	}
-}
\ No newline at end of file

From 3647a047e1b85d0e70d100930edc4c939d580173 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Mon, 29 Sep 2014 10:00:31 +0200
Subject: [PATCH 0824/1286] Bug 421456 - Remove translation service from e4
 tools - Removed unused Dependency

---
 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index bf5d2f26e4..f37cd87ba9 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -10,9 +10,8 @@ Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
  org.eclipse.equinox.common;bundle-version="3.6.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",
- org.eclipse.e4.core.di;bundle-version="0.9.0",
  org.eclipse.osgi;bundle-version="3.7.0",
- org.eclipse.e4.core.services;bundle-version="0.9.1"
+ org.eclipse.e4.core.di;bundle-version="0.9.0"
 Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.0.0",

From 2ab54bfd6ff0f2c52cf42f76479fb2160b21d05b Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Tue, 30 Sep 2014 10:27:23 +0200
Subject: [PATCH 0825/1286] Bug 444692 - Remove Warnings Applied proper project
 specific setting on tools.services and fixed all remaining warnings

---
 .../org.eclipse.core.resources.prefs          |   6 +
 .../.settings/org.eclipse.jdt.core.prefs      | 411 +++++++++++++
 .../.settings/org.eclipse.jdt.launching.prefs |   2 +
 .../.settings/org.eclipse.jdt.ui.prefs        | 115 ++++
 .../.settings/org.eclipse.pde.api.tools.prefs |  97 +++
 .../.settings/org.eclipse.pde.prefs           |  32 +
 .../META-INF/MANIFEST.MF                      |   4 +-
 .../tools/services/BasicResourceProvider.java |  39 +-
 .../services/ToolsServicesActivator.java      |  15 +-
 .../e4/tools/services/impl/Messages.java      |  31 +
 .../services/impl/ResourceBundleHelper.java   | 574 +++++++++---------
 .../services/impl/ResourcePoolFactory.java    |   4 +-
 .../tools/services/impl/ResourceService.java  | 117 ++--
 .../tools/services/impl/messages.properties   |   2 +
 14 files changed, 1097 insertions(+), 352 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.resources.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.launching.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.api.tools.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/messages.properties

diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..f548abbf0b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
index c537b63063..c94829777b 100644
--- a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,418 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000000..3bb235278e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..791508d164
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,115 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=true
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=true
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000000..e4e3c0071e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,97 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..0bbee3c4b8
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index f37cd87ba9..d583f38b6d 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -4,8 +4,8 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
 Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.e4.tools.services,
- org.eclipse.e4.tools.services.impl;x-friends:="org.eclipse.e4.tools.emf.ui"
+Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier",
+ org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
  org.eclipse.equinox.common;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java
index 30944d79fe..e79a071cfc 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java
@@ -17,50 +17,53 @@
 public abstract class BasicResourceProvider implements IResourceProviderService {
 	protected Map<String, String> properties;
 	protected BundleContext context;
-	
+
 	public void activate(BundleContext context, Map<String, String> properties) {
 		this.properties = properties;
 		this.context = context;
 	}
-	
+
+	@Override
 	public Image getImage(Display display, String key) {
-		URL url = FileLocator.find(context.getBundle(),new Path(properties.get(key)),null);
-		
-		if( url != null ) {
+		final URL url = FileLocator.find(context.getBundle(), new Path(properties.get(key)), null);
+
+		if (url != null) {
 			InputStream stream = null;
 			try {
 				stream = url.openStream();
 				return new Image(display, stream);
-			} catch (Exception e) {
+			} catch (final Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			} finally {
-				if( stream != null ) {
+				if (stream != null) {
 					try {
 						stream.close();
-					} catch (IOException e) {
+					} catch (final IOException e) {
 					}
 				}
 			}
 		}
-		
+
 		// TODO Auto-generated method stub
 		return null;
 	}
-	
+
+	@Override
 	public Font getFont(Display display, String key) {
 		return null;
 	}
 
+	@Override
 	public Color getColor(Display display, String key) {
-		String color = properties.get(key);
-		if (color.startsWith("rgb")) {
-			String rgb = color.substring(color.indexOf('(')+1, color.indexOf(')'));
-			String[] cols = rgb.split(",");
-			int r = Integer.parseInt(cols[0].trim());
-			int g = Integer.parseInt(cols[1].trim());
-			int b = Integer.parseInt(cols[2].trim());
-			return new Color(display, new RGB(r,g,b));
+		final String color = properties.get(key);
+		if (color.startsWith("rgb")) { //$NON-NLS-1$
+			final String rgb = color.substring(color.indexOf('(') + 1, color.indexOf(')'));
+			final String[] cols = rgb.split(","); //$NON-NLS-1$
+			final int r = Integer.parseInt(cols[0].trim());
+			final int g = Integer.parseInt(cols[1].trim());
+			final int b = Integer.parseInt(cols[2].trim());
+			return new Color(display, new RGB(r, g, b));
 		}
 		return null;
 	}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java
index 04d636723a..b9104c4cbb 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java
@@ -13,6 +13,7 @@ public class ToolsServicesActivator implements BundleActivator {
 	private BundleContext bundleContext;
 	private ServiceTracker<PackageAdmin, PackageAdmin> pkgAdminTracker;
 	private ServiceTracker<LogService, LogService> logTracker;
+	public static final String PLUGIN_ID = "org.eclipse.e4.tools.services"; //$NON-NLS-1$
 
 	public ToolsServicesActivator() {
 		defaultInstance = this;
@@ -22,10 +23,12 @@ public static ToolsServicesActivator getDefault() {
 		return defaultInstance;
 	}
 
+	@Override
 	public void start(BundleContext context) throws Exception {
 		bundleContext = context;
 	}
 
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		if (pkgAdminTracker != null) {
 			pkgAdminTracker.close();
@@ -40,21 +43,23 @@ public void stop(BundleContext context) throws Exception {
 
 	public PackageAdmin getPackageAdmin() {
 		if (pkgAdminTracker == null) {
-			if (bundleContext == null)
+			if (bundleContext == null) {
 				return null;
+			}
 			pkgAdminTracker = new ServiceTracker<PackageAdmin, PackageAdmin>(bundleContext,
-					PackageAdmin.class, null);
+				PackageAdmin.class, null);
 			pkgAdminTracker.open();
 		}
-		return (PackageAdmin) pkgAdminTracker.getService();
+		return pkgAdminTracker.getService();
 	}
 
 	public LogService getLogService() {
 		if (logTracker == null) {
-			if (bundleContext == null)
+			if (bundleContext == null) {
 				return null;
+			}
 			logTracker = new ServiceTracker<LogService, LogService>(bundleContext,
-					LogService.class, null);
+				LogService.class, null);
 			logTracker.open();
 		}
 		return logTracker.getService();
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java
new file mode 100644
index 0000000000..149c954bdd
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ * Jonas - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.services.impl;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author Jonas
+ *
+ */
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.e4.tools.services.impl.messages"; //$NON-NLS-1$
+	public static String ResourceService_NoProvider;
+	public static String ResourceService_PoolDisposed;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
index 2201ab5da6..4aa8f66335 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Dirk Fauth <dirk.fauth@gmail.com> - initial API and implementation
+ * Dirk Fauth <dirk.fauth@gmail.com> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.services.impl;
 
@@ -34,7 +34,7 @@
 
 /**
  * Helper class for retrieving {@link ResourceBundle}s out of OSGi {@link Bundle}s.
- * 
+ *
  * @author Dirk Fauth
  */
 // There is no replacement for PackageAdmin#getBundles()
@@ -61,39 +61,46 @@ public class ResourceBundleHelper {
 	 * The separator character for paths in the platform schema
 	 */
 	private static final String PATH_SEPARATOR = "/"; //$NON-NLS-1$
-	
+
 	/**
-	 * Parses the specified contributor URI and loads the {@link ResourceBundle} for the specified {@link Locale}
-	 * out of an OSGi {@link Bundle}.
-	 * <p>Following URIs are supported:
+	 * Parses the specified contributor URI and loads the {@link ResourceBundle} for the specified {@link Locale} out of
+	 * an OSGi {@link Bundle}.
+	 * <p>
+	 * Following URIs are supported:
 	 * <ul>
 	 * <li>platform:/[plugin|fragment]/[Bundle-SymbolicName]<br>
 	 * Load the OSGi resource bundle out of the bundle/fragment named [Bundle-SymbolicName]</li>
 	 * <li>platform:/[plugin|fragment]/[Bundle-SymbolicName]/[Path]/[Basename]<br>
-	 * Load the resource bundle specified by [Path] and [Basename] out of the bundle/fragment named [Bundle-SymbolicName].</li>
+	 * Load the resource bundle specified by [Path] and [Basename] out of the bundle/fragment named
+	 * [Bundle-SymbolicName].</li>
 	 * <li>bundleclass://[plugin|fragment]/[Full-Qualified-Classname]<br>
-	 * Instantiate the class specified by [Full-Qualified-Classname] out of the bundle/fragment named [Bundle-SymbolicName].
-	 * Note that the class needs to be a subtype of {@link ResourceBundle}.</li>
+	 * Instantiate the class specified by [Full-Qualified-Classname] out of the bundle/fragment named
+	 * [Bundle-SymbolicName]. Note that the class needs to be a subtype of {@link ResourceBundle}.</li>
 	 * </ul>
 	 * </p>
+	 *
 	 * @param contributorURI The URI that points to a {@link ResourceBundle}
 	 * @param locale The {@link Locale} to use for loading the {@link ResourceBundle}
 	 * @param localization The service for retrieving a {@link ResourceBundle} for a given {@link Locale} out of
-	 * 			the given {@link Bundle} which is specified by URI.
-	 * @return
+	 *            the given {@link Bundle} which is specified by URI.
+	 * @return the resource bundle
 	 */
-	public static ResourceBundle getResourceBundleForUri(String contributorURI, Locale locale, BundleLocalization localization) {
-		if (contributorURI == null)
+	public static ResourceBundle getResourceBundleForUri(String contributorURI, Locale locale,
+		BundleLocalization localization) {
+		if (contributorURI == null) {
 			return null;
-		
-		LogService logService = ToolsServicesActivator.getDefault().getLogService();
+		}
+
+		final LogService logService = ToolsServicesActivator.getDefault().getLogService();
 
 		URI uri;
 		try {
 			uri = new URI(contributorURI);
-		} catch (URISyntaxException e) {
+		} catch (final URISyntaxException e) {
 			if (logService != null)
+			{
 				logService.log(LogService.LOG_ERROR, "Invalid contributor URI: " + contributorURI); //$NON-NLS-1$
+			}
 			return null;
 		}
 
@@ -101,15 +108,16 @@ public static ResourceBundle getResourceBundleForUri(String contributorURI, Loca
 		Bundle bundle = null;
 		String resourcePath = null;
 		String classPath = null;
-		
-		//the uri follows the platform schema, so we search for .properties files in the bundle
+
+		// the uri follows the platform schema, so we search for .properties files in the bundle
 		if (PLATFORM_SCHEMA.equals(uri.getScheme())) {
 			bundleName = uri.getPath();
-			if (bundleName.startsWith(PLUGIN_SEGMENT))
+			if (bundleName.startsWith(PLUGIN_SEGMENT)) {
 				bundleName = bundleName.substring(PLUGIN_SEGMENT.length());
-			else if (bundleName.startsWith(FRAGMENT_SEGMENT))
+			} else if (bundleName.startsWith(FRAGMENT_SEGMENT)) {
 				bundleName = bundleName.substring(FRAGMENT_SEGMENT.length());
-			
+			}
+
 			resourcePath = ""; //$NON-NLS-1$
 			if (bundleName.contains(PATH_SEPARATOR)) {
 				resourcePath = bundleName.substring(bundleName.indexOf(PATH_SEPARATOR) + 1);
@@ -118,52 +126,58 @@ else if (bundleName.startsWith(FRAGMENT_SEGMENT))
 		} else if (BUNDLECLASS_SCHEMA.equals(uri.getScheme())) {
 			if (uri.getAuthority() == null) {
 				if (logService != null)
+				{
 					logService.log(LogService.LOG_ERROR, "Failed to get bundle for: " + contributorURI); //$NON-NLS-1$
+				}
 			}
 			bundleName = uri.getAuthority();
-			//remove the leading /
+			// remove the leading /
 			classPath = uri.getPath().substring(1);
 		}
-		
+
 		ResourceBundle result = null;
 
 		if (bundleName != null) {
 			bundle = getBundleForName(bundleName);
-			
+
 			if (bundle != null) {
 				if (resourcePath == null && classPath != null) {
-					//the URI points to a class within the bundle classpath
-					//therefore we are trying to instantiate the class
+					// the URI points to a class within the bundle classpath
+					// therefore we are trying to instantiate the class
 					try {
-						Class<?> resourceBundleClass = bundle.loadClass(classPath);
+						final Class<?> resourceBundleClass = bundle.loadClass(classPath);
 						result = getEquinoxResourceBundle(classPath, locale, resourceBundleClass.getClassLoader());
-					} catch (Exception e) {
+					} catch (final Exception e) {
 						if (logService != null)
-							logService.log(LogService.LOG_ERROR, "Failed to load specified ResourceBundle: " + contributorURI, e); //$NON-NLS-1$
+						{
+							logService.log(LogService.LOG_ERROR,
+								"Failed to load specified ResourceBundle: " + contributorURI, e); //$NON-NLS-1$
+						}
 					}
 				}
 				else if (resourcePath.length() > 0) {
-					//the specified URI points to a resource 
-					//therefore we try to load the .properties files into a ResourceBundle
+					// the specified URI points to a resource
+					// therefore we try to load the .properties files into a ResourceBundle
 					result = getEquinoxResourceBundle(resourcePath.replace('.', '/'), locale, bundle);
 				}
 				else {
-					//there is no class and no special resource specified within the URI 
-					//therefore we load the OSGi resource bundle out of the specified Bundle
-					//for the current Locale
+					// there is no class and no special resource specified within the URI
+					// therefore we load the OSGi resource bundle out of the specified Bundle
+					// for the current Locale
 					result = localization.getLocalization(bundle, locale.toString());
 				}
 			}
 		}
-		
+
 		return result;
 	}
-	
+
 	/**
-	 * This method searches for the {@link ResourceBundle} in a modified way by inspecting the configuration option 
-	 * <code>equinox.root.locale</code>. 
+	 * This method searches for the {@link ResourceBundle} in a modified way by inspecting the configuration option
+	 * <code>equinox.root.locale</code>.
 	 * <p>
-	 * If the value for this system property is set to an empty String the default search order for ResourceBundles is used:
+	 * If the value for this system property is set to an empty String the default search order for ResourceBundles is
+	 * used:
 	 * <ul>
 	 * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
 	 * <li>bn + Ls + "_" + Cs</li>
@@ -173,8 +187,8 @@ else if (resourcePath.length() > 0) {
 	 * <li>bn + Ld</li>
 	 * <li>bn</li>
 	 * </ul>
-	 * Where bn is this bundle's localization basename, Ls, Cs and Vs are the specified locale (language, country, variant) and 
-	 * Ld, Cd and Vd are the default locale (language, country, variant).
+	 * Where bn is this bundle's localization basename, Ls, Cs and Vs are the specified locale (language, country,
+	 * variant) and Ld, Cd and Vd are the default locale (language, country, variant).
 	 * </p>
 	 * <p>
 	 * If Ls equals the value of <code>equinox.root.locale</code> then the following search order is used:
@@ -189,65 +203,67 @@ else if (resourcePath.length() > 0) {
 	 * <li>bn</li>
 	 * </ul>
 	 * </p>
-	 * If <code>equinox.root.locale=en</code> and en_XX or en is asked for then this allows the root file to be used instead of 
+	 * If <code>equinox.root.locale=en</code> and en_XX or en is asked for then this allows the root file to be used
+	 * instead of
 	 * falling back to the default locale.
-	 * 
-     * @param baseName the base name of the resource bundle, a fully qualified class name
-     * @param locale the locale for which a resource bundle is desired
-     * @param loader the class loader from which to load the resource bundle
-     * @return a resource bundle for the given base name and locale
-	 * 
+	 *
+	 * @param baseName the base name of the resource bundle, a fully qualified class name
+	 * @param locale the locale for which a resource bundle is desired
+	 * @param loader the class loader from which to load the resource bundle
+	 * @return a resource bundle for the given base name and locale
+	 *
 	 * @see ResourceBundle#getBundle(String, Locale, ClassLoader)
 	 */
 	public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale locale, ClassLoader loader) {
 		ResourceBundle resourceBundle = null;
-		
-		String equinoxLocale = getEquinoxRootLocale();
-        //if the equinox.root.locale is not empty and the specified locale equals the equinox.root.locale
+
+		final String equinoxLocale = getEquinoxRootLocale();
+		// if the equinox.root.locale is not empty and the specified locale equals the equinox.root.locale
 		// -> use the special search order
-        if (equinoxLocale.length() > 0 && locale.toString().startsWith(equinoxLocale)) {
-        	//there is a equinox.root.locale configured that matches the specified locale 
-        	//so the special search order is used
-        	//to achieve this we first search without a fallback to the default locale
-        	try {
-        		resourceBundle = ResourceBundle.getBundle(baseName, locale, loader,
-        				ResourceBundle.Control.getNoFallbackControl(Control.FORMAT_DEFAULT));
-        	}
-        	catch (MissingResourceException e) {
-        		//do nothing
-        	}
-        	//if there is no ResourceBundle found for that path, we will now search for the default locale ResourceBundle
-        	if (resourceBundle == null) {
-        		try {
-        			resourceBundle = ResourceBundle.getBundle(baseName, Locale.getDefault(), loader,
-        					ResourceBundle.Control.getNoFallbackControl(Control.FORMAT_DEFAULT));
-        		}
-            	catch (MissingResourceException e) {
-            		//do nothing
-            	}
-        	}
-        }
-        else {
-        	//there is either no equinox.root.locale configured or it does not match the specified locale
-        	// -> use the default search order
-        	try {
-        		resourceBundle = ResourceBundle.getBundle(baseName, locale, loader);
-        	}
-        	catch (MissingResourceException e) {
-        		//do nothing
-        	}
-        }
-
-        return resourceBundle;
-    }
-	
+		if (equinoxLocale.length() > 0 && locale.toString().startsWith(equinoxLocale)) {
+			// there is a equinox.root.locale configured that matches the specified locale
+			// so the special search order is used
+			// to achieve this we first search without a fallback to the default locale
+			try {
+				resourceBundle = ResourceBundle.getBundle(baseName, locale, loader,
+					ResourceBundle.Control.getNoFallbackControl(Control.FORMAT_DEFAULT));
+			} catch (final MissingResourceException e) {
+				// do nothing
+			}
+			// if there is no ResourceBundle found for that path, we will now search for the default locale
+			// ResourceBundle
+			if (resourceBundle == null) {
+				try {
+					resourceBundle = ResourceBundle.getBundle(baseName, Locale.getDefault(), loader,
+						ResourceBundle.Control.getNoFallbackControl(Control.FORMAT_DEFAULT));
+				} catch (final MissingResourceException e) {
+					// do nothing
+				}
+			}
+		}
+		else {
+			// there is either no equinox.root.locale configured or it does not match the specified locale
+			// -> use the default search order
+			try {
+				resourceBundle = ResourceBundle.getBundle(baseName, locale, loader);
+			} catch (final MissingResourceException e) {
+				// do nothing
+			}
+		}
+
+		return resourceBundle;
+	}
+
 	/**
-	 * This method searches for the {@link ResourceBundle} in a modified way by inspecting the configuration option 
+	 * This method searches for the {@link ResourceBundle} in a modified way by inspecting the configuration option
 	 * <code>equinox.root.locale</code>. It uses the {@link BundleResourceBundleControl} to load the resources out
 	 * of a {@link Bundle}.
-	 * <p><b>Note: This method will only search for ResourceBundles based on properties files.</b></p>
 	 * <p>
-	 * If the value for this system property is set to an empty String the default search order for ResourceBundles is used:
+	 * <b>Note: This method will only search for ResourceBundles based on properties files.</b>
+	 * </p>
+	 * <p>
+	 * If the value for this system property is set to an empty String the default search order for ResourceBundles is
+	 * used:
 	 * <ul>
 	 * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
 	 * <li>bn + Ls + "_" + Cs</li>
@@ -257,8 +273,8 @@ public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale lo
 	 * <li>bn + Ld</li>
 	 * <li>bn</li>
 	 * </ul>
-	 * Where bn is this bundle's localization basename, Ls, Cs and Vs are the specified locale (language, country, variant) and 
-	 * Ld, Cd and Vd are the default locale (language, country, variant).
+	 * Where bn is this bundle's localization basename, Ls, Cs and Vs are the specified locale (language, country,
+	 * variant) and Ld, Cd and Vd are the default locale (language, country, variant).
 	 * </p>
 	 * <p>
 	 * If Ls equals the value of <code>equinox.root.locale</code> then the following search order is used:
@@ -273,27 +289,31 @@ public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale lo
 	 * <li>bn</li>
 	 * </ul>
 	 * </p>
-	 * If <code>equinox.root.locale=en</code> and en_XX or en is asked for then this allows the root file to be used instead of 
+	 * If <code>equinox.root.locale=en</code> and en_XX or en is asked for then this allows the root file to be used
+	 * instead of
 	 * falling back to the default locale.
-	 * 
-     * @param baseName the base name of the resource bundle, a fully qualified class name
-     * @param locale the locale for which a resource bundle is desired
+	 *
+	 * @param baseName the base name of the resource bundle, a fully qualified class name
+	 * @param locale the locale for which a resource bundle is desired
 	 * @param bundle The OSGi {@link Bundle} to lookup the {@link ResourceBundle}
-     * @return a resource bundle for the given base name and locale
-	 * 
+	 * @return a resource bundle for the given base name and locale
+	 *
 	 * @see ResourceBundle#getBundle(String, Locale, Control)
 	 */
 	public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale locale, Bundle bundle) {
-		return getEquinoxResourceBundle(baseName, locale, 
-				new BundleResourceBundleControl(bundle, true), new BundleResourceBundleControl(bundle, false));
+		return getEquinoxResourceBundle(baseName, locale,
+			new BundleResourceBundleControl(bundle, true), new BundleResourceBundleControl(bundle, false));
 	}
 
 	/**
-	 * This method searches for the {@link ResourceBundle} in a modified way by inspecting the configuration option 
+	 * This method searches for the {@link ResourceBundle} in a modified way by inspecting the configuration option
 	 * <code>equinox.root.locale</code>.
-	 * <p><b>Note: This method will only search for ResourceBundles based on properties files.</b></p>
 	 * <p>
-	 * If the value for this system property is set to an empty String the default search order for ResourceBundles is used:
+	 * <b>Note: This method will only search for ResourceBundles based on properties files.</b>
+	 * </p>
+	 * <p>
+	 * If the value for this system property is set to an empty String the default search order for ResourceBundles is
+	 * used:
 	 * <ul>
 	 * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
 	 * <li>bn + Ls + "_" + Cs</li>
@@ -303,8 +323,8 @@ public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale lo
 	 * <li>bn + Ld</li>
 	 * <li>bn</li>
 	 * </ul>
-	 * Where bn is this bundle's localization basename, Ls, Cs and Vs are the specified locale (language, country, variant) and 
-	 * Ld, Cd and Vd are the default locale (language, country, variant).
+	 * Where bn is this bundle's localization basename, Ls, Cs and Vs are the specified locale (language, country,
+	 * variant) and Ld, Cd and Vd are the default locale (language, country, variant).
 	 * </p>
 	 * <p>
 	 * If Ls equals the value of <code>equinox.root.locale</code> then the following search order is used:
@@ -319,60 +339,61 @@ public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale lo
 	 * <li>bn</li>
 	 * </ul>
 	 * </p>
-	 * If <code>equinox.root.locale=en</code> and en_XX or en is asked for then this allows the root file to be used instead of 
+	 * If <code>equinox.root.locale=en</code> and en_XX or en is asked for then this allows the root file to be used
+	 * instead of
 	 * falling back to the default locale.
-	 * 
-     * @param baseName the base name of the resource bundle, a fully qualified class name
-     * @param locale the locale for which a resource bundle is desired
+	 *
+	 * @param baseName the base name of the resource bundle, a fully qualified class name
+	 * @param locale the locale for which a resource bundle is desired
 	 * @param withFallback The {@link Control} that uses the default locale fallback on searching for resource bundles.
-	 * @param withoutFallback The {@link Control} that doesn't use the default locale fallback on searching for resource bundles.
-     * @return a resource bundle for the given base name and locale
-	 * 
+	 * @param withoutFallback The {@link Control} that doesn't use the default locale fallback on searching for resource
+	 *            bundles.
+	 * @return a resource bundle for the given base name and locale
+	 *
 	 * @see ResourceBundle#getBundle(String, Locale, Control)
 	 */
-	public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale locale, Control withFallback, Control withoutFallback) {
+	public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale locale, Control withFallback,
+		Control withoutFallback) {
 		ResourceBundle resourceBundle = null;
-		
-		String equinoxLocale = getEquinoxRootLocale();
-        //if the equinox.root.locale is not empty and the specified locale equals the equinox.root.locale
+
+		final String equinoxLocale = getEquinoxRootLocale();
+		// if the equinox.root.locale is not empty and the specified locale equals the equinox.root.locale
 		// -> use the special search order
-        if (equinoxLocale.length() > 0 && locale.toString().startsWith(equinoxLocale)) {
-        	//there is a equinox.root.locale configured that matches the specified locale 
-        	//so the special search order is used
-        	//to achieve this we first search without a fallback to the default locale
-        	try {
-        		resourceBundle = ResourceBundle.getBundle(baseName, locale, withoutFallback);
-        	}
-        	catch (MissingResourceException e) {
-        		//do nothing
-        	}
-        	//if there is no ResourceBundle found for that path, we will now search for the default locale ResourceBundle
-        	if (resourceBundle == null) {
-        		try {
-        			resourceBundle = ResourceBundle.getBundle(baseName, Locale.getDefault(), withoutFallback);
-        		}
-            	catch (MissingResourceException e) {
-            		//do nothing
-            	}
-        	}
-        }
-        else {
-        	//there is either no equinox.root.locale configured or it does not match the specified locale
-        	// -> use the default search order
-        	try {
-        		resourceBundle = ResourceBundle.getBundle(baseName, locale, withFallback);
-        	}
-        	catch (MissingResourceException e) {
-        		//do nothing
-        	}
-        }
-		
+		if (equinoxLocale.length() > 0 && locale.toString().startsWith(equinoxLocale)) {
+			// there is a equinox.root.locale configured that matches the specified locale
+			// so the special search order is used
+			// to achieve this we first search without a fallback to the default locale
+			try {
+				resourceBundle = ResourceBundle.getBundle(baseName, locale, withoutFallback);
+			} catch (final MissingResourceException e) {
+				// do nothing
+			}
+			// if there is no ResourceBundle found for that path, we will now search for the default locale
+			// ResourceBundle
+			if (resourceBundle == null) {
+				try {
+					resourceBundle = ResourceBundle.getBundle(baseName, Locale.getDefault(), withoutFallback);
+				} catch (final MissingResourceException e) {
+					// do nothing
+				}
+			}
+		}
+		else {
+			// there is either no equinox.root.locale configured or it does not match the specified locale
+			// -> use the default search order
+			try {
+				resourceBundle = ResourceBundle.getBundle(baseName, locale, withFallback);
+			} catch (final MissingResourceException e) {
+				// do nothing
+			}
+		}
+
 		return resourceBundle;
 	}
 
 	/**
 	 * @return The value for the system property for key <code>equinox.root.locale</code>.
-	 * 			If none is specified than <b>en</b> will be returned as default.
+	 *         If none is specified than <b>en</b> will be returned as default.
 	 */
 	private static String getEquinoxRootLocale() {
 		// Logic from FrameworkProperties.getProperty("equinox.root.locale", "en")
@@ -386,16 +407,17 @@ private static String getEquinoxRootLocale() {
 	/**
 	 * This method is copied out of org.eclipse.e4.ui.internal.workbench.Activator
 	 * because as it is a internal resource, it is not accessible for us.
-	 * 
+	 *
 	 * @param bundleName
 	 *            the bundle id
 	 * @return A bundle if found, or <code>null</code>
 	 */
 	public static Bundle getBundleForName(String bundleName) {
-		PackageAdmin packageAdmin = ToolsServicesActivator.getDefault().getPackageAdmin();
-		Bundle[] bundles = packageAdmin.getBundles(bundleName, null);
-		if (bundles == null)
+		final PackageAdmin packageAdmin = ToolsServicesActivator.getDefault().getPackageAdmin();
+		final Bundle[] bundles = packageAdmin.getBundles(bundleName, null);
+		if (bundles == null) {
 			return null;
+		}
 		// Return the first bundle that is not installed or uninstalled
 		for (int i = 0; i < bundles.length; i++) {
 			if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
@@ -404,177 +426,179 @@ public static Bundle getBundleForName(String bundleName) {
 		}
 		return null;
 	}
-	
-    /**
-     * <p>Converts a String to a Locale.</p>
-     *
-     * <p>This method takes the string format of a locale and creates the
-     * locale object from it.</p>
-     *
-     * <pre>
-     *   MessageFactoryServiceImpl.toLocale("en")         = new Locale("en", "")
-     *   MessageFactoryServiceImpl.toLocale("en_GB")      = new Locale("en", "GB")
-     *   MessageFactoryServiceImpl.toLocale("en_GB_xxx")  = new Locale("en", "GB", "xxx")
-     * </pre>
-     *
-     * <p>This method validates the input strictly.
-     * The language code must be lowercase.
-     * The country code must be uppercase.
-     * The separator must be an underscore.
-     * The length must be correct.
-     * </p>
-     *
-     * <p>This method is inspired by <code>org.apache.commons.lang.LocaleUtils.toLocale(String)</code> by
-     * fixing the parsing error for uncommon Locales like having a language and a variant code but
-     * no country code, or a Locale that only consists of a country code.
-     * </p>
-     *  
-     * @param str the locale String to convert 
-     * @return a Locale that matches the specified locale String or <code>null</code> 
-     * 			if the specified String is <code>null</code>
-     * @throws IllegalArgumentException if the String is an invalid format
-     */	
+
+	/**
+	 * <p>
+	 * Converts a String to a Locale.
+	 * </p>
+	 *
+	 * <p>
+	 * This method takes the string format of a locale and creates the locale object from it.
+	 * </p>
+	 *
+	 * <pre>
+	 *   MessageFactoryServiceImpl.toLocale("en")         = new Locale("en", "")
+	 *   MessageFactoryServiceImpl.toLocale("en_GB")      = new Locale("en", "GB")
+	 *   MessageFactoryServiceImpl.toLocale("en_GB_xxx")  = new Locale("en", "GB", "xxx")
+	 * </pre>
+	 *
+	 * <p>
+	 * This method validates the input strictly. The language code must be lowercase. The country code must be
+	 * uppercase. The separator must be an underscore. The length must be correct.
+	 * </p>
+	 *
+	 * <p>
+	 * This method is inspired by <code>org.apache.commons.lang.LocaleUtils.toLocale(String)</code> by fixing the
+	 * parsing error for uncommon Locales like having a language and a variant code but no country code, or a Locale
+	 * that only consists of a country code.
+	 * </p>
+	 *
+	 * @param str the locale String to convert
+	 * @return a Locale that matches the specified locale String or <code>null</code> if the specified String is
+	 *         <code>null</code>
+	 * @throws IllegalArgumentException if the String is an invalid format
+	 */
 	public static Locale toLocale(String str) {
-        if (str == null) {
-            return null;
-        }
-        
-        String language = ""; //$NON-NLS-1$
-        String country = ""; //$NON-NLS-1$
-        String variant = ""; //$NON-NLS-1$
-        
-        String[] localeParts = str.split("_"); //$NON-NLS-1$
-        if (localeParts.length == 0 || localeParts.length > 3 
-        		|| (localeParts.length == 1 && localeParts[0].length() == 0)) {
-            throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
-        } else {
-        	if (localeParts[0].length() == 1 || localeParts[0].length() > 2) {
-                throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
-        	}
-        	else if (localeParts[0].length() == 2) {
-        		char ch0 = localeParts[0].charAt(0);
-        		char ch1 = localeParts[0].charAt(1);
-        		if (ch0 < 'a' || ch0 > 'z' || ch1 < 'a' || ch1 > 'z') {
-        			throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
-        		}
-        	}
-            
-            language = localeParts[0];
-            
-            if (localeParts.length > 1) {
-            	if (localeParts[1].length() == 1 || localeParts[1].length() > 2) {
-                    throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
-            	}
-            	else if (localeParts[1].length() == 2) {
-            		char ch3 = localeParts[1].charAt(0);
-            		char ch4 = localeParts[1].charAt(1);
-            		if (ch3 < 'A' || ch3 > 'Z' || ch4 < 'A' || ch4 > 'Z') {
-            			throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
-            		}
-            	}
-           	
-                country = localeParts[1];
-            }
-            
-            if (localeParts.length == 3) {
-            	if (localeParts[0].length() == 0 && localeParts[1].length() == 0) {
-            		throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
-            	}
-            	variant = localeParts[2];
-            }
-        }
-        
-        return new Locale(language, country, variant);
-    }
-	
+		if (str == null) {
+			return null;
+		}
+
+		String language = ""; //$NON-NLS-1$
+		String country = ""; //$NON-NLS-1$
+		String variant = ""; //$NON-NLS-1$
+
+		final String[] localeParts = str.split("_"); //$NON-NLS-1$
+		if (localeParts.length == 0 || localeParts.length > 3
+			|| localeParts.length == 1 && localeParts[0].length() == 0) {
+			throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
+		}
+		if (localeParts[0].length() == 1 || localeParts[0].length() > 2) {
+			throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
+		}
+		else if (localeParts[0].length() == 2) {
+			final char ch0 = localeParts[0].charAt(0);
+			final char ch1 = localeParts[0].charAt(1);
+			if (ch0 < 'a' || ch0 > 'z' || ch1 < 'a' || ch1 > 'z') {
+				throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
+			}
+		}
+
+		language = localeParts[0];
+
+		if (localeParts.length > 1) {
+			if (localeParts[1].length() == 1 || localeParts[1].length() > 2) {
+				throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
+			}
+			else if (localeParts[1].length() == 2) {
+				final char ch3 = localeParts[1].charAt(0);
+				final char ch4 = localeParts[1].charAt(1);
+				if (ch3 < 'A' || ch3 > 'Z' || ch4 < 'A' || ch4 > 'Z') {
+					throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
+				}
+			}
+
+			country = localeParts[1];
+		}
+
+		if (localeParts.length == 3) {
+			if (localeParts[0].length() == 0 && localeParts[1].length() == 0) {
+				throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
+			}
+			variant = localeParts[2];
+		}
+
+		return new Locale(language, country, variant);
+	}
+
 	/**
 	 * Specialization of {@link Control} which loads the {@link ResourceBundle} out of an
 	 * OSGi {@link Bundle} instead of using a classloader.
-	 * 
-	 * <p>It only supports properties based {@link ResourceBundle}s. If you want to use 
-	 * source based {@link ResourceBundle}s you have to use the bundleclass URI with the
-	 * Message annotation.
-	 * 
+	 *
+	 * <p>
+	 * It only supports properties based {@link ResourceBundle}s. If you want to use source based {@link ResourceBundle}
+	 * s you have to use the bundleclass URI with the Message annotation.
+	 *
 	 * @author Dirk Fauth
 	 *
 	 */
 	static class BundleResourceBundleControl extends ResourceBundle.Control {
-		
+
 		/**
 		 * Flag to determine whether the default locale should be used as fallback locale
 		 * in case there is no {@link ResourceBundle} found for the specified locale.
 		 */
 		private final boolean useFallback;
-		
+
 		/**
 		 * The OSGi {@link Bundle} to lookup the {@link ResourceBundle}
 		 */
 		private final Bundle osgiBundle;
-		
+
 		/**
-		 * 
+		 *
 		 * @param osgiBundle The OSGi {@link Bundle} to lookup the {@link ResourceBundle}
 		 * @param useFallback <code>true</code> if the default locale should be used as fallback
-		 * 			locale in the search path or <code>false</code> if there should be no fallback.
+		 *            locale in the search path or <code>false</code> if there should be no fallback.
 		 */
 		public BundleResourceBundleControl(Bundle osgiBundle, boolean useFallback) {
 			this.osgiBundle = osgiBundle;
 			this.useFallback = useFallback;
 		}
-		
+
 		@Override
 		public ResourceBundle newBundle(String baseName, Locale locale,
-				String format, ClassLoader loader, boolean reload)
+			String format, ClassLoader loader, boolean reload)
 				throws IllegalAccessException, InstantiationException, IOException {
 
-		    String bundleName = toBundleName(baseName, locale);
-		    ResourceBundle bundle = null;
-		    if (format.equals("java.properties")) { //$NON-NLS-1$
+			final String bundleName = toBundleName(baseName, locale);
+			ResourceBundle bundle = null;
+			if (format.equals("java.properties")) { //$NON-NLS-1$
 				final String resourceName = toResourceName(bundleName, "properties"); //$NON-NLS-1$
 				InputStream stream = null;
 				try {
-				    stream = AccessController.doPrivileged(
+					stream = AccessController.doPrivileged(
 						new PrivilegedExceptionAction<InputStream>() {
-						    public InputStream run() throws IOException {
+							@Override
+							public InputStream run() throws IOException {
 								InputStream is = null;
-								URL url = osgiBundle.getEntry(resourceName);
-							    if (url != null) {
-									URLConnection connection = url.openConnection();
+								final URL url = osgiBundle.getEntry(resourceName);
+								if (url != null) {
+									final URLConnection connection = url.openConnection();
 									if (connection != null) {
-									    // Disable caches to get fresh data for
-									    // reloading.
-									    connection.setUseCaches(false);
-									    is = connection.getInputStream();
+										// Disable caches to get fresh data for
+										// reloading.
+										connection.setUseCaches(false);
+										is = connection.getInputStream();
 									}
-							    }
+								}
 								return is;
-						    }
+							}
 						});
-				} catch (PrivilegedActionException e) {
-				    throw (IOException) e.getException();
+				} catch (final PrivilegedActionException e) {
+					throw (IOException) e.getException();
 				}
 				if (stream != null) {
-				    try {
-				    	bundle = new PropertyResourceBundle(stream);
-				    } finally {
-				    	stream.close();
-				    }
+					try {
+						bundle = new PropertyResourceBundle(stream);
+					} finally {
+						stream.close();
+					}
 				}
-		    } 
-		    else {
-		    	throw new IllegalArgumentException("unknown format: " + format); //$NON-NLS-1$
-		    }
-		    return bundle;
+			}
+			else {
+				throw new IllegalArgumentException("unknown format: " + format); //$NON-NLS-1$
+			}
+			return bundle;
 		}
-		
+
 		@Override
 		public List<String> getFormats(String baseName) {
 			return FORMAT_PROPERTIES;
 		}
-		
+
 		@Override
 		public Locale getFallbackLocale(String baseName, Locale locale) {
-			return this.useFallback ? super.getFallbackLocale(baseName, locale) : null;
+			return useFallback ? super.getFallbackLocale(baseName, locale) : null;
 		}
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java
index ac602dd2e7..43b46b710d 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.services.impl;
 
@@ -18,7 +18,7 @@
 public class ResourcePoolFactory extends ContextFunction {
 
 	@Override
-	public Object compute(IEclipseContext context) {
+	public Object compute(IEclipseContext context, String contextKey) {
 		return ContextInjectionFactory.make(ResourcePool.class, context);
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
index 468cfaf978..773cfdf101 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.services.impl;
 
@@ -25,6 +25,7 @@
 import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.tools.services.IResourceProviderService;
 import org.eclipse.e4.tools.services.IResourceService;
+import org.eclipse.e4.tools.services.ToolsServicesActivator;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.graphics.Color;
@@ -45,30 +46,33 @@ private enum Type {
 	}
 
 	static class PooledResource<T extends Resource> implements
-			IPooledResource<T> {
-		private Display display;
+		IPooledResource<T> {
+		private final Display display;
 		private int count;
 		private T resource;
 		private String id;
 		private ResourceService resourceService;
 
 		PooledResource(Display display, ResourceService resourceService,
-				String id, T resource) {
+			String id, T resource) {
 			this.display = display;
 			this.id = id;
 			this.count = 1;
 			this.resourceService = resourceService;
 			this.resource = resource;
 		}
-		
+
+		@Override
 		public String getId() {
 			return id;
 		}
 
+		@Override
 		public T getResource() {
 			return resource;
 		}
 
+		@Override
 		public void dispose() {
 			this.count--;
 			if (this.count == 0) {
@@ -89,24 +93,25 @@ public static class ResourcePool implements IDiposeableResourcePool {
 		private List<IPooledResource<Image>> pooledImages = new ArrayList<IPooledResource<Image>>();
 		private List<IPooledResource<Font>> pooledFonts = new ArrayList<IPooledResource<Font>>();
 		private List<IPooledResource<Color>> pooledColors = new ArrayList<IPooledResource<Color>>();
-		private Display display;
+		private final Display display;
 
 		@Inject
 		public ResourcePool(IResourceService resourceService, Display display) {
 			this.display = display;
-			this.resourceService = (ResourceService) resourceService;
+			this.resourceService = resourceService;
 		}
 
+		@Override
 		public Image getImage(String key) throws CoreException {
 			if (resourceService == null) {
 				throw new CoreException(
-						new Status(IStatus.ERROR,
-								"org.eclipse.e4.tools.services",
-								"The pool is disposed"));
+					new Status(IStatus.ERROR,
+						ToolsServicesActivator.PLUGIN_ID,
+						Messages.ResourceService_PoolDisposed));
 			}
 			IPooledResource<Image> image = null;
 
-			for (IPooledResource<Image> img : pooledImages) {
+			for (final IPooledResource<Image> img : pooledImages) {
 				if (img.getId().equals(key)) {
 					image = img;
 				}
@@ -115,87 +120,93 @@ public Image getImage(String key) throws CoreException {
 				image = resourceService.getImage(display, key);
 				pooledImages.add(image);
 			}
-			
+
 			return image.getResource();
 		}
 
+		@Override
 		public Font getFont(String key) throws CoreException {
 			if (resourceService == null) {
 				throw new CoreException(
-						new Status(IStatus.ERROR,
-								"org.eclipse.e4.tools.services",
-								"The pool is disposed"));
+					new Status(IStatus.ERROR,
+						ToolsServicesActivator.PLUGIN_ID,
+						Messages.ResourceService_PoolDisposed));
 			}
-			
+
 			IPooledResource<Font> font = null;
-			for (IPooledResource<Font> fon : pooledFonts) {
+			for (final IPooledResource<Font> fon : pooledFonts) {
 				if (fon.getId().equals(key)) {
 					font = fon;
 				}
 			}
-			if( font == null ) {
+			if (font == null) {
 				font = resourceService.getFont(display, key);
-				pooledFonts.add(font);				
+				pooledFonts.add(font);
 			}
 			return font.getResource();
 		}
 
+		@Override
 		public Color getColor(String key) throws CoreException {
 			if (resourceService == null) {
 				throw new CoreException(
-						new Status(IStatus.ERROR,
-								"org.eclipse.e4.tools.services",
-								"The pool is disposed"));
+					new Status(IStatus.ERROR,
+						ToolsServicesActivator.PLUGIN_ID,
+						Messages.ResourceService_PoolDisposed));
 			}
 			IPooledResource<Color> color = null;
-			
-			for (IPooledResource<Color> col : pooledColors) {
+
+			for (final IPooledResource<Color> col : pooledColors) {
 				if (col.getId().equals(key)) {
 					color = col;
 				}
 			}
-			
-			if( color == null ) {
+
+			if (color == null) {
 				color = resourceService.getColor(display,
-						key);
-				pooledColors.add(color);				
+					key);
+				pooledColors.add(color);
 			}
 			return color.getResource();
 		}
 
+		@Override
 		public Image getImageUnchecked(String key) {
 			try {
 				return getImage(key);
-			} catch (CoreException e) {
+			} catch (final CoreException e) {
 				return null;
 			}
 		}
 
+		@Override
 		public Font getFontUnchecked(String key) {
 			try {
 				return getFont(key);
-			} catch (CoreException e) {
+			} catch (final CoreException e) {
 				return null;
 			}
 		}
 
+		@Override
 		public Color getColorUnchecked(String key) {
 			try {
 				return getColor(key);
-			} catch (CoreException e) {
+			} catch (final CoreException e) {
 				return null;
 			}
 		}
 
+		@Override
 		@PreDestroy
 		public void dispose() {
-			for (IPooledResource<Image> img : pooledImages) {
+			for (final IPooledResource<Image> img : pooledImages) {
 				img.dispose();
 			}
-			for (IPooledResource<Font> font : pooledFonts) {
+			for (final IPooledResource<Font> font : pooledFonts) {
 				font.dispose();
 			}
-			for (IPooledResource<Color> col : pooledColors) {
+			for (final IPooledResource<Color> col : pooledColors) {
 				col.dispose();
 			}
 			resourceService = null;
@@ -232,17 +243,17 @@ public Map<String, PooledResource<Font>> getFontPool() {
 		}
 	}
 
-	private Map<Display, DisplayPool> displayPool = new HashMap<Display, ResourceService.DisplayPool>();
+	private final Map<Display, DisplayPool> displayPool = new HashMap<Display, ResourceService.DisplayPool>();
 	// private Map<String, IResourceProviderService> imagekey2providers = new
 	// HashMap<String, IResourceProviderService>();
 	// private Map<String, IResourceProviderService> fontkey2providers = new
 	// HashMap<String, IResourceProviderService>();
 	// private Map<String, IResourceProviderService> colorkey2providers = new
 	// HashMap<String, IResourceProviderService>();
-	private BundleContext context;
+	private final BundleContext context;
 
 	public ResourceService() {
-		Bundle b = FrameworkUtil.getBundle(ResourceService.class);
+		final Bundle b = FrameworkUtil.getBundle(ResourceService.class);
 		context = b.getBundleContext();
 	}
 
@@ -258,7 +269,7 @@ protected void removePooledResource(PooledResource<?> resource) {
 
 	@SuppressWarnings("unchecked")
 	private <R extends Resource> PooledResource<R> loadResource(
-			Display display, String key, Type type) {
+		Display display, String key, Type type) {
 		DisplayPool p = displayPool.get(display);
 		PooledResource<R> resource = null;
 
@@ -276,7 +287,7 @@ private <R extends Resource> PooledResource<R> loadResource(
 			resource.count++;
 		} else {
 			resource = new PooledResource<R>(display, this, key,
-					(R) lookupResource(display, key, type));
+				(R) lookupResource(display, key, type));
 
 			if (p == null) {
 				p = new DisplayPool();
@@ -300,37 +311,37 @@ private <R extends Resource> PooledResource<R> loadResource(
 	private <R> R lookupResource(Display display, String key, Type type) {
 
 		if (type == Type.IMAGE) {
-			IResourceProviderService provider = lookupOSGI(key);
+			final IResourceProviderService provider = lookupOSGI(key);
 			if (provider != null) {
 				return (R) provider.getImage(display, key);
 			}
 		} else if (type == Type.COLOR) {
-			IResourceProviderService provider = lookupOSGI(key);
+			final IResourceProviderService provider = lookupOSGI(key);
 			if (provider != null) {
 				return (R) provider.getColor(display, key);
 			}
 
 		} else {
-			IResourceProviderService provider = lookupOSGI(key);
+			final IResourceProviderService provider = lookupOSGI(key);
 			if (provider != null) {
 				return (R) provider.getFont(display, key);
 			}
 		}
-		throw new IllegalArgumentException("No provider known for '" + key
-				+ "'.");
+		throw new IllegalArgumentException(Messages.ResourceService_NoProvider + key
+			+ "'."); //$NON-NLS-1$
 	}
 
 	private IResourceProviderService lookupOSGI(String key) {
 		try {
-			Collection<ServiceReference<IResourceProviderService>> refs = context
-					.getServiceReferences(IResourceProviderService.class, "("
-							+ key + "=*)");
+			final Collection<ServiceReference<IResourceProviderService>> refs = context
+				.getServiceReferences(IResourceProviderService.class, "(" //$NON-NLS-1$
+					+ key + "=*)"); //$NON-NLS-1$
 			if (!refs.isEmpty()) {
-				ServiceReference<IResourceProviderService> ref = refs
-						.iterator().next();
+				final ServiceReference<IResourceProviderService> ref = refs
+					.iterator().next();
 				return context.getService(ref);
 			}
-		} catch (InvalidSyntaxException e) {
+		} catch (final InvalidSyntaxException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
@@ -363,26 +374,32 @@ private IResourceProviderService lookupOSGI(String key) {
 	// }
 	// }
 
+	@Override
 	public PooledResource<Image> getImage(Display display, String key) {
 		return loadResource(display, key, Type.IMAGE);
 	}
 
+	@Override
 	public PooledResource<Color> getColor(Display display, String key) {
 		return loadResource(display, key, Type.COLOR);
 	}
 
+	@Override
 	public PooledResource<Font> getFont(Display display, String key) {
 		return loadResource(display, key, Type.FONT);
 	}
 
+	@Override
 	public IDiposeableResourcePool getResourcePool(Display display) {
 		return new ResourcePool(this, display);
 	}
 
+	@Override
 	public IResourcePool getControlPool(Control control) {
 		final ResourcePool pool = new ResourcePool(this, control.getDisplay());
 		control.addDisposeListener(new DisposeListener() {
 
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				pool.dispose();
 			}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/messages.properties b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/messages.properties
new file mode 100644
index 0000000000..e7f5b65041
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/messages.properties
@@ -0,0 +1,2 @@
+ResourceService_NoProvider=No provider known for '
+ResourceService_PoolDisposed=The pool is disposed

From f3525fe722310e50ef206ec16b71a32d12939022 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Wed, 1 Oct 2014 09:59:08 +0200
Subject: [PATCH 0826/1286] Bug 444693 - Review API of editor and e4 tools
 services - made packages x-internal

---
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF      | 3 ++-
 .../org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF    | 3 +++
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF      | 4 ++--
 .../org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF   | 2 +-
 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF    | 2 +-
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF             | 4 +++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 9f915bb1ce..ad7b0ab609 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -14,7 +14,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
  org.eclipse.e4.ui.di;bundle-version="0.9.0",
  org.eclipse.core.databinding;bundle-version="1.4.0"
-Export-Package: org.eclipse.e4.tools.compat.parts
+Export-Package: org.eclipse.e4.tools.compat.internal;x-internal:=true,
+ org.eclipse.e4.tools.compat.parts;x-internal:=true
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
 Import-Package: javax.inject;version="1.0.0"
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index c5ec6f40c9..88edf8b716 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -35,3 +35,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
 Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/projectfunction.xml, OSGI-INF/pdee4xmiprovider.xml, OSGI-INF/pdeextensionlookup.xml, OSGI-INF/modelextractor.xml 
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
+Export-Package: org.eclipse.e4.tools.emf.editor3x;x-internal:=true,
+ org.eclipse.e4.tools.emf.editor3x.emf;x-internal:=true,
+ org.eclipse.e4.tools.emf.editor3x.extension;x-internal:=true
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index b5dbab6a25..c3d097082b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -42,8 +42,8 @@ Import-Package: javax.annotation;version="1.0.0",
  javax.inject;version="1.0.0",
  org.eclipse.core.runtime.jobs,
  org.osgi.framework;version="1.5.0"
-Export-Package: org.eclipse.e4.tools.emf.ui.common,
- org.eclipse.e4.tools.emf.ui.common.component,
+Export-Package: org.eclipse.e4.tools.emf.ui.common;x-friends:="org.eclipse.e4.tools.emf.liveeditor",
+ org.eclipse.e4.tools.emf.ui.common.component;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.common;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.common.component;x-internal:=true,
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index cfd280664f..352567673e 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -9,4 +9,4 @@ Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.jface.text;bundle-version="3.6.0",
  org.eclipse.jdt.core;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0"
-Export-Package: org.eclipse.e4.internal.tools.jdt.templates
+Export-Package: org.eclipse.e4.internal.tools.jdt.templates;x-internal:=true
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index d583f38b6d..7885c035d0 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
 Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier",
+Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 8ea9d1c856..7c857749b1 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -22,7 +22,9 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.pde.ui;bundle-version="3.8.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.e4.internal.tools.ToolsPlugin
-Export-Package: org.eclipse.e4.internal.tools.wizards.classes;x-internal:=true,
+Export-Package: org.eclipse.e4.internal.tools;x-internal:=true,
+ org.eclipse.e4.internal.tools.wizards.classes;x-internal:=true,
+ org.eclipse.e4.internal.tools.wizards.classes.templates;x-internal:=true,
  org.eclipse.e4.internal.tools.wizards.model;x-internal:=true,
  org.eclipse.e4.internal.tools.wizards.project;x-internal:=true
 Bundle-Vendor: %Bundle-Vendor

From 90ed64787ec6a319e7f8c97ccfc0cd05542c8f6d Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Thu, 2 Oct 2014 10:53:00 +0200
Subject: [PATCH 0827/1286] Bug 444692 - Remove Warnings Applied proper project
 specific setting on org.eclipse.e4.tools

---
 .../org.eclipse.core.resources.prefs          |   6 +
 .../.settings/org.eclipse.jdt.core.prefs      | 411 ++++++++++++++++++
 .../.settings/org.eclipse.jdt.launching.prefs |   2 +
 .../.settings/org.eclipse.jdt.ui.prefs        | 115 +++++
 .../.settings/org.eclipse.pde.api.tools.prefs |  97 +++++
 .../.settings/org.eclipse.pde.prefs           |  32 ++
 6 files changed, 663 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.resources.prefs
 create mode 100644 bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.launching.prefs
 create mode 100644 bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
 create mode 100644 bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.api.tools.prefs
 create mode 100644 bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.prefs

diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..f548abbf0b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
index c537b63063..c94829777b 100644
--- a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,418 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000000..3bb235278e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..791508d164
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,115 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=true
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=true
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000000..e4e3c0071e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,97 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..0bbee3c4b8
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1

From d5458cb2d9989d051ff991d0a71539c83231d3b3 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Thu, 2 Oct 2014 10:55:49 +0200
Subject: [PATCH 0828/1286] Bug 444340 - Externalize Strings

Added Message class to org.eclipse.e4.tools, started to externalize Strings
---
 .../eclipse/e4/internal/tools/Messages.java   |  40 +++
 .../e4/internal/tools/messages.properties     |  11 +
 .../wizards/classes/AbstractNewClassPage.java | 285 ++++++++++--------
 3 files changed, 210 insertions(+), 126 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
new file mode 100644
index 0000000000..5675ca476c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ * Jonas - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.internal.tools;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author Jonas
+ *
+ */
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.e4.internal.tools.messages"; //$NON-NLS-1$
+	public static String AbstractNewClassPage_Browse;
+	public static String AbstractNewClassPage_ChooseAPackage;
+	public static String AbstractNewClassPage_ChoosePackage;
+	public static String AbstractNewClassPage_ClassExists;
+	public static String AbstractNewClassPage_Name;
+	public static String AbstractNewClassPage_NameMustBeQualified;
+	public static String AbstractNewClassPage_NameNotEmpty;
+	public static String AbstractNewClassPage_NeedToSelectAPackage;
+	public static String AbstractNewClassPage_Package;
+	public static String AbstractNewClassPage_SourceFolder;
+	public static String AbstractNewClassPage_SourceFolderNotEmpty;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
new file mode 100644
index 0000000000..f8a00b47a7
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
@@ -0,0 +1,11 @@
+AbstractNewClassPage_Browse=Browse ...
+AbstractNewClassPage_ChooseAPackage=Choose a Package
+AbstractNewClassPage_ChoosePackage=Choose Package
+AbstractNewClassPage_ClassExists=Java Class already exists
+AbstractNewClassPage_Name=Name
+AbstractNewClassPage_NameMustBeQualified=Name must not be qualified or contain spaces
+AbstractNewClassPage_NameNotEmpty=Name must not be empty
+AbstractNewClassPage_NeedToSelectAPackage=You need to select a package
+AbstractNewClassPage_Package=Package
+AbstractNewClassPage_SourceFolder=Source folder
+AbstractNewClassPage_SourceFolderNotEmpty=Source folder must not be empty
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index 3cbd9364a4..9e5a276909 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Sopot Cela <sopotcela@gmail.com>
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Sopot Cela <sopotcela@gmail.com>
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
@@ -27,6 +27,7 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.internal.tools.ToolsPlugin;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaElement;
@@ -68,8 +69,15 @@
 import org.eclipse.ui.dialogs.ElementListSelectionDialog;
 import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
 
+@SuppressWarnings("restriction")
 public abstract class AbstractNewClassPage extends WizardPage {
+	private static final String BUNDLECLASS = "bundleclass://"; //$NON-NLS-1$
+	private static final String FRAGMENT_ROOT = "fragmentRoot"; //$NON-NLS-1$
+	public static final String PACKAGE_FRAGMENT = "packageFragment"; //$NON-NLS-1$
+	public static final String PROPERTY_NAME = "name"; //$NON-NLS-1$
+
 	public static class JavaClass {
+
 		protected PropertyChangeSupport support = new PropertyChangeSupport(this);
 
 		private IPackageFragmentRoot fragmentRoot;
@@ -85,7 +93,7 @@ public IPackageFragmentRoot getFragmentRoot() {
 		}
 
 		public void setFragmentRoot(IPackageFragmentRoot fragmentRoot) {
-			support.firePropertyChange("fragementRoot", this.fragmentRoot, this.fragmentRoot = fragmentRoot);
+			support.firePropertyChange(FRAGMENT_ROOT, this.fragmentRoot, this.fragmentRoot = fragmentRoot);
 		}
 
 		public IPackageFragment getPackageFragment() {
@@ -93,7 +101,7 @@ public IPackageFragment getPackageFragment() {
 		}
 
 		public void setPackageFragment(IPackageFragment packageFragment) {
-			support.firePropertyChange("packageFragment", this.packageFragment, this.packageFragment = packageFragment);
+			support.firePropertyChange(PACKAGE_FRAGMENT, this.packageFragment, this.packageFragment = packageFragment);
 		}
 
 		public String getName() {
@@ -101,7 +109,7 @@ public String getName() {
 		}
 
 		public void setName(String name) {
-			support.firePropertyChange("name", this.name, this.name = name);
+			support.firePropertyChange(PROPERTY_NAME, this.name, this.name = name);
 		}
 
 		public void addPropertyChangeListener(PropertyChangeListener listener) {
@@ -112,20 +120,21 @@ public void removePropertyChangeListener(PropertyChangeListener listener) {
 			support.removePropertyChangeListener(listener);
 		}
 
-		public static boolean exists(IPackageFragmentRoot pFragmentRoot, IPackageFragment pPackageFragment, String pName){
+		public static boolean exists(IPackageFragmentRoot pFragmentRoot, IPackageFragment pPackageFragment, String pName) {
 
-			if( pFragmentRoot==null )
+			if (pFragmentRoot == null) {
 				return false;
+			}
 
-			String cuName = pName + ".java";
+			final String cuName = pName + ".java"; //$NON-NLS-1$
 			IFile file;
 
-			if( pPackageFragment != null ) {
-				ICompilationUnit unit = pPackageFragment.getCompilationUnit(cuName);
-				IResource resource = unit.getResource();
+			if (pPackageFragment != null) {
+				final ICompilationUnit unit = pPackageFragment.getCompilationUnit(cuName);
+				final IResource resource = unit.getResource();
 				file = (IFile) resource;
 			} else {
-				IFolder p = (IFolder) pFragmentRoot.getResource();
+				final IFolder p = (IFolder) pFragmentRoot.getResource();
 				file = p.getFile(cuName);
 			}
 			return file.exists();
@@ -137,7 +146,8 @@ public static boolean exists(IPackageFragmentRoot pFragmentRoot, IPackageFragmen
 	private final IWorkspaceRoot fWorkspaceRoot;
 	private String initialString;
 
-	protected AbstractNewClassPage(String pageName, String title, String description, IPackageFragmentRoot froot, IWorkspaceRoot fWorkspaceRoot) {
+	protected AbstractNewClassPage(String pageName, String title, String description, IPackageFragmentRoot froot,
+		IWorkspaceRoot fWorkspaceRoot) {
 		super(pageName);
 		this.froot = froot;
 		this.fWorkspaceRoot = fWorkspaceRoot;
@@ -146,17 +156,21 @@ protected AbstractNewClassPage(String pageName, String title, String description
 		setDescription(description);
 	}
 
-	protected AbstractNewClassPage(String pageName, String title, String description, IPackageFragmentRoot froot, IWorkspaceRoot fWorkspaceRoot, String initialString){
-		this(pageName,title,description,froot,fWorkspaceRoot);
-		this.initialString=initialString;
+	protected AbstractNewClassPage(String pageName, String title, String description, IPackageFragmentRoot froot,
+		IWorkspaceRoot fWorkspaceRoot, String initialString) {
+		this(pageName, title, description, froot, fWorkspaceRoot);
+		this.initialString = initialString;
 	}
 
+	@Override
 	public void createControl(Composite parent) {
-		final Image img = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newclass_wiz.png"));
+		final Image img = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream(
+			"/icons/full/wizban/newclass_wiz.png")); //$NON-NLS-1$
 		setImageDescriptor(ImageDescriptor.createFromImage(img));
 
 		parent.addDisposeListener(new DisposeListener() {
 
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				img.dispose();
 				setImageDescriptor(null);
@@ -168,35 +182,36 @@ public void widgetDisposed(DisposeEvent e) {
 		parent.setLayout(new GridLayout(3, false));
 
 		clazz = createInstance();
-		if ((froot!=null)&&(initialString!=null)){
-		clazz.setPackageFragment(froot.getPackageFragment(parseInitialStringForPackage(initialString)==null?"":parseInitialStringForPackage(initialString)));
-		clazz.setName(parseInitialStringForClassName(initialString));
+		if (froot != null && initialString != null) {
+			clazz.setPackageFragment(froot.getPackageFragment(parseInitialStringForPackage(initialString) == null ? "" //$NON-NLS-1$
+				: parseInitialStringForPackage(initialString)));
+			clazz.setName(parseInitialStringForClassName(initialString));
 		}
-		DataBindingContext dbc = new DataBindingContext();
+		final DataBindingContext dbc = new DataBindingContext();
 		WizardPageSupport.create(this, dbc);
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText("Source folder");
+			final Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.AbstractNewClassPage_SourceFolder);
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
 
 			final Binding bd = dbc.bindValue(
-					WidgetProperties.text().observe(t),
-					BeanProperties.value("fragmentRoot").observe(clazz),
-					new UpdateValueStrategy().setBeforeSetValidator(new PFRootValidator()),
-					new UpdateValueStrategy().setConverter(new PackageFragmentRootToStringConverter())
-			);
-
-			Button b = new Button(parent, SWT.PUSH);
-			b.setText("Browse ...");
+				WidgetProperties.text().observe(t),
+				BeanProperties.value(FRAGMENT_ROOT).observe(clazz),
+				new UpdateValueStrategy().setBeforeSetValidator(new PFRootValidator()),
+				new UpdateValueStrategy().setConverter(new PackageFragmentRootToStringConverter())
+				);
+
+			final Button b = new Button(parent, SWT.PUSH);
+			b.setText(Messages.AbstractNewClassPage_Browse);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					IPackageFragmentRoot root = choosePackageRoot();
-					if( root != null ) {
+					final IPackageFragmentRoot root = choosePackageRoot();
+					if (root != null) {
 						froot = root;
 						clazz.setFragmentRoot(root);
 					}
@@ -206,48 +221,48 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		{
-			Label l = new Label(parent, SWT.NONE);
-			l.setText("Package");
-			Text t = new Text(parent, SWT.BORDER);
+			final Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.AbstractNewClassPage_Package);
+			final Text t = new Text(parent, SWT.BORDER);
 			t.setEditable(true);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			final Binding bd = dbc.bindValue(
-					WidgetProperties.text(SWT.Modify).observe(t),
-					BeanProperties.value("packageFragment").observe(clazz),
-					new UpdateValueStrategy().setConverter(new StringToPackageFragmentConverter(clazz)),
-					new UpdateValueStrategy().setConverter(new PackageFragmentToStringConverter())
-			);
-
-			Button b = new Button(parent, SWT.PUSH);
-			b.setText("Browse ...");
+				WidgetProperties.text(SWT.Modify).observe(t),
+				BeanProperties.value(PACKAGE_FRAGMENT).observe(clazz),
+				new UpdateValueStrategy().setConverter(new StringToPackageFragmentConverter(clazz)),
+				new UpdateValueStrategy().setConverter(new PackageFragmentToStringConverter())
+				);
+
+			final Button b = new Button(parent, SWT.PUSH);
+			b.setText(Messages.AbstractNewClassPage_Browse);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					IPackageFragment fragment = choosePackage();
-					if( fragment != null ) {
+					final IPackageFragment fragment = choosePackage();
+					if (fragment != null) {
 						clazz.setPackageFragment(fragment);
 					}
-					bd.updateModelToTarget(); //TODO Find out why this is needed
+					bd.updateModelToTarget(); // TODO Find out why this is needed
 				}
 			});
 		}
 
 		{
-			IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+			final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-			Label l = new Label(parent, SWT.NONE);
-			l.setText("Name");
+			final Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.AbstractNewClassPage_Name);
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			dbc.bindValue(textProp.observe(t), BeanProperties.value("name", String.class).observe(clazz),
-					new UpdateValueStrategy().setBeforeSetValidator(new ClassnameValidator(clazz)),null);
+			dbc.bindValue(textProp.observe(t), BeanProperties.value(PROPERTY_NAME, String.class).observe(clazz),
+				new UpdateValueStrategy().setBeforeSetValidator(new ClassnameValidator(clazz)), null);
 
 			new Label(parent, SWT.NONE);
 		}
 
 		{
-			Label l = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
+			final Label l = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
 			l.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 3, 1));
 		}
 
@@ -256,73 +271,78 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	private String parseInitialStringForPackage(String initialString2) {
-		if (initialString2==null) return null;
-		int ioBC = initialString2.indexOf("bundleclass://");
-		int iSecondSlash = initialString2.lastIndexOf('/');
+		if (initialString2 == null) {
+			return null;
+		}
+		final int ioBC = initialString2.indexOf(BUNDLECLASS);
+		final int iSecondSlash = initialString2.lastIndexOf('/');
 		if (
 
-			(initialString2.length()==0)||//empty
-			(ioBC==-1)||//no bundle class
-			(iSecondSlash==-1)||//no package &| class name
-			(initialString2.indexOf('.')==-1)//no package
-			){
+			initialString2.length() == 0 || // empty
+			ioBC == -1 || // no bundle class
+			iSecondSlash == -1 || // no package &| class name
+			initialString2.indexOf('.') == -1// no package
+			) {
 			return null;
 		}
 
-		int lastDot = initialString2.lastIndexOf('.');
-		String packageString = initialString2.substring(iSecondSlash+1, lastDot);
+		final int lastDot = initialString2.lastIndexOf('.');
+		final String packageString = initialString2.substring(iSecondSlash + 1, lastDot);
 		return packageString;
 	}
 
-	private String parseInitialStringForClassName(String initialString){
-		if (initialString==null) return null;
-		int ioBC = initialString.indexOf("bundleclass://");
-		int iSecondSlash = initialString.lastIndexOf('/');
+	private String parseInitialStringForClassName(String initialString) {
+		if (initialString == null) {
+			return null;
+		}
+		final int ioBC = initialString.indexOf(BUNDLECLASS);
+		final int iSecondSlash = initialString.lastIndexOf('/');
 		if (
 
-			(initialString.length()==0)||//empty
-			(ioBC==-1)||//no bundle class
-			(iSecondSlash==-1)||//no package &| class name
-			(initialString.indexOf('.')==-1)//no package
-			){
+			initialString.length() == 0 || // empty
+			ioBC == -1 || // no bundle class
+			iSecondSlash == -1 || // no package &| class name
+			initialString.indexOf('.') == -1// no package
+			) {
 			return null;
 		}
-		int lastDot = initialString.lastIndexOf('.');
-		if (lastDot!=-1)
-			return initialString.substring(lastDot+1);
+		final int lastDot = initialString.lastIndexOf('.');
+		if (lastDot != -1) {
+			return initialString.substring(lastDot + 1);
+		}
 		return null;
 	}
 
 	private IPackageFragmentRoot choosePackageRoot() {
-		IJavaElement initElement= clazz.getFragmentRoot();
-		Class[] acceptedClasses= new Class[] { IPackageFragmentRoot.class, IJavaProject.class };
-		TypedElementSelectionValidator validator= new TypedElementSelectionValidator(acceptedClasses, false) {
+		final IJavaElement initElement = clazz.getFragmentRoot();
+		Class[] acceptedClasses = new Class[] { IPackageFragmentRoot.class, IJavaProject.class };
+		final TypedElementSelectionValidator validator = new TypedElementSelectionValidator(acceptedClasses, false) {
 			@Override
 			public boolean isSelectedValid(Object element) {
 				try {
 					if (element instanceof IJavaProject) {
-						IJavaProject jproject= (IJavaProject)element;
-						IPath path= jproject.getProject().getFullPath();
-						return (jproject.findPackageFragmentRoot(path) != null);
+						final IJavaProject jproject = (IJavaProject) element;
+						final IPath path = jproject.getProject().getFullPath();
+						return jproject.findPackageFragmentRoot(path) != null;
 					} else if (element instanceof IPackageFragmentRoot) {
-						return (((IPackageFragmentRoot)element).getKind() == IPackageFragmentRoot.K_SOURCE);
+						return ((IPackageFragmentRoot) element).getKind() == IPackageFragmentRoot.K_SOURCE;
 					}
 					return true;
-				} catch (JavaModelException e) {
+				} catch (final JavaModelException e) {
 					JavaPlugin.log(e.getStatus()); // just log, no UI in validation
 				}
 				return false;
 			}
 		};
 
-		acceptedClasses= new Class[] { IJavaModel.class, IPackageFragmentRoot.class, IJavaProject.class };
-		ViewerFilter filter= new TypedViewerFilter(acceptedClasses) {
+		acceptedClasses = new Class[] { IJavaModel.class, IPackageFragmentRoot.class, IJavaProject.class };
+		final ViewerFilter filter = new TypedViewerFilter(acceptedClasses) {
 			@Override
 			public boolean select(Viewer viewer, Object parent, Object element) {
 				if (element instanceof IPackageFragmentRoot) {
 					try {
-						return (((IPackageFragmentRoot)element).getKind() == IPackageFragmentRoot.K_SOURCE);
-					} catch (JavaModelException e) {
+						return ((IPackageFragmentRoot) element).getKind() == IPackageFragmentRoot.K_SOURCE;
+					} catch (final JavaModelException e) {
 						JavaPlugin.log(e.getStatus()); // just log, no UI in validation
 						return false;
 					}
@@ -331,9 +351,9 @@ public boolean select(Viewer viewer, Object parent, Object element) {
 			}
 		};
 
-		StandardJavaElementContentProvider provider= new StandardJavaElementContentProvider();
-		ILabelProvider labelProvider= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
-		ElementTreeSelectionDialog dialog= new ElementTreeSelectionDialog(getShell(), labelProvider, provider);
+		final StandardJavaElementContentProvider provider = new StandardJavaElementContentProvider();
+		final ILabelProvider labelProvider = new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
+		final ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), labelProvider, provider);
 		dialog.setValidator(validator);
 		dialog.setComparator(new JavaElementComparator());
 		dialog.setTitle(NewWizardMessages.NewContainerWizardPage_ChooseSourceContainerDialog_title);
@@ -344,12 +364,12 @@ public boolean select(Viewer viewer, Object parent, Object element) {
 		dialog.setHelpAvailable(false);
 
 		if (dialog.open() == Window.OK) {
-			Object element= dialog.getFirstResult();
+			final Object element = dialog.getFirstResult();
 			if (element instanceof IJavaProject) {
-				IJavaProject jproject= (IJavaProject)element;
+				final IJavaProject jproject = (IJavaProject) element;
 				return jproject.getPackageFragmentRoot(jproject.getProject());
 			} else if (element instanceof IPackageFragmentRoot) {
-				return (IPackageFragmentRoot)element;
+				return (IPackageFragmentRoot) element;
 			}
 			return null;
 		}
@@ -357,26 +377,27 @@ public boolean select(Viewer viewer, Object parent, Object element) {
 	}
 
 	private IPackageFragment choosePackage() {
-		IJavaElement[] packages= null;
+		IJavaElement[] packages = null;
 		try {
 			if (froot != null && froot.exists()) {
-				packages= froot.getChildren();
+				packages = froot.getChildren();
 			}
-		} catch (JavaModelException e) {
+		} catch (final JavaModelException e) {
 			e.printStackTrace();
 		}
 		if (packages == null) {
-			packages= new IJavaElement[0];
+			packages = new IJavaElement[0];
 		}
 
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT));
+		final ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(),
+			new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT));
 		dialog.setIgnoreCase(false);
-		dialog.setTitle("Choose Package");
-		dialog.setMessage("Choose a Package");
-		dialog.setEmptyListMessage("You need to select a package");
+		dialog.setTitle(Messages.AbstractNewClassPage_ChoosePackage);
+		dialog.setMessage(Messages.AbstractNewClassPage_ChooseAPackage);
+		dialog.setEmptyListMessage(Messages.AbstractNewClassPage_NeedToSelectAPackage);
 		dialog.setElements(packages);
 		dialog.setHelpAvailable(false);
-		IPackageFragment pack= clazz.getPackageFragment();
+		final IPackageFragment pack = clazz.getPackageFragment();
 		if (pack != null) {
 			dialog.setInitialSelections(new Object[] { pack });
 		}
@@ -403,28 +424,35 @@ public ClassnameValidator(JavaClass clazz) {
 			this.clazz = clazz;
 		}
 
+		@Override
 		public IStatus validate(Object value) {
-			String name = value.toString();
-			if (name.length()==0)
-				return new Status(IStatus.ERROR,ToolsPlugin.PLUGIN_ID,"Name must not be empty");
-			if ((name.indexOf('.')!=-1)||(name.trim().indexOf(' ')!=-1))
-				return new Status(IStatus.ERROR,ToolsPlugin.PLUGIN_ID,"Name must not be qualified or contain spaces");
-			if( JavaClass.exists(clazz.getFragmentRoot(), clazz.getPackageFragment(), name) )
-				return new Status(IStatus.ERROR,ToolsPlugin.PLUGIN_ID,"Java Class already exists");
+			final String name = value.toString();
+			if (name.length() == 0) {
+				return new Status(IStatus.ERROR, ToolsPlugin.PLUGIN_ID, Messages.AbstractNewClassPage_NameNotEmpty);
+			}
+			if (name.indexOf('.') != -1 || name.trim().indexOf(' ') != -1) {
+				return new Status(IStatus.ERROR, ToolsPlugin.PLUGIN_ID,
+					Messages.AbstractNewClassPage_NameMustBeQualified);
+			}
+			if (JavaClass.exists(clazz.getFragmentRoot(), clazz.getPackageFragment(), name)) {
+				return new Status(IStatus.ERROR, ToolsPlugin.PLUGIN_ID, Messages.AbstractNewClassPage_ClassExists);
+			}
 
-			return JavaConventions.validateJavaTypeName(name,JavaCore.VERSION_1_3,JavaCore.VERSION_1_3);
+			return JavaConventions.validateJavaTypeName(name, JavaCore.VERSION_1_3, JavaCore.VERSION_1_3);
 		}
 	}
 
 	static class PFRootValidator implements IValidator {
 
+		@Override
 		public IStatus validate(Object value) {
-			String name = value.toString();
-			if (name.length()==0)
-				return new Status(IStatus.ERROR,ToolsPlugin.PLUGIN_ID,"Source folder must not be empty");
-
+			final String name = value.toString();
+			if (name.length() == 0) {
+				return new Status(IStatus.ERROR, ToolsPlugin.PLUGIN_ID,
+					Messages.AbstractNewClassPage_SourceFolderNotEmpty);
+			}
 
-			return new Status(IStatus.OK,ToolsPlugin.PLUGIN_ID,"");
+			return new Status(IStatus.OK, ToolsPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
 		}
 	}
 
@@ -434,10 +462,11 @@ public PackageFragmentRootToStringConverter() {
 			super(IPackageFragmentRoot.class, String.class);
 		}
 
+		@Override
 		public Object convert(Object fromObject) {
-			IPackageFragmentRoot f = (IPackageFragmentRoot) fromObject;
-			if( f == null ) {
-				return "";
+			final IPackageFragmentRoot f = (IPackageFragmentRoot) fromObject;
+			if (f == null) {
+				return ""; //$NON-NLS-1$
 			}
 			return f.getPath().makeRelative().toString();
 		}
@@ -449,11 +478,12 @@ public PackageFragmentToStringConverter() {
 			super(IPackageFragment.class, String.class);
 		}
 
+		@Override
 		public Object convert(Object fromObject) {
-			if( fromObject == null ) {
-				return "";
+			if (fromObject == null) {
+				return ""; //$NON-NLS-1$
 			}
-			IPackageFragment f = (IPackageFragment) fromObject;
+			final IPackageFragment f = (IPackageFragment) fromObject;
 			return f.getElementName();
 		}
 	}
@@ -467,13 +497,16 @@ public StringToPackageFragmentConverter(JavaClass clazz) {
 			this.clazz = clazz;
 		}
 
+		@Override
 		public Object convert(Object fromObject) {
-			if (clazz.getFragmentRoot()==null) return null;
+			if (clazz.getFragmentRoot() == null) {
+				return null;
+			}
 			if (fromObject == null) {
-				return clazz.getFragmentRoot().getPackageFragment("");
+				return clazz.getFragmentRoot().getPackageFragment(""); //$NON-NLS-1$
 			}
 
-				return clazz.getFragmentRoot().getPackageFragment((String) fromObject);
+			return clazz.getFragmentRoot().getPackageFragment((String) fromObject);
 
 		}
 	}

From 6febc4b48a2826913453399e5391770584030bcc Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Sun, 5 Oct 2014 13:58:51 +0200
Subject: [PATCH 0829/1286] Bug 444340 - Externalize Strings

---
 .../eclipse/e4/internal/tools/Messages.java   |   6 +
 .../e4/internal/tools/messages.properties     |   6 +
 .../classes/AbstractNewClassWizard.java       | 135 +++++++++---------
 .../wizards/classes/NewAddonClassWizard.java  |  47 +++---
 ...NewDynamicMenuContributionClassWizard.java |  96 +++++++------
 5 files changed, 155 insertions(+), 135 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
index 5675ca476c..ed3c140bf9 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
@@ -30,6 +30,12 @@ public class Messages extends NLS {
 	public static String AbstractNewClassPage_Package;
 	public static String AbstractNewClassPage_SourceFolder;
 	public static String AbstractNewClassPage_SourceFolderNotEmpty;
+	public static String AbstractNewClassWizard_NewClass;
+	public static String NewAddonClassWizard_NewAddon;
+	public static String NewAddonClassWizard_NewAddonClass;
+	public static String NewDynamicMenuContributionClassWizard_AboutToShowMethod;
+	public static String NewDynamicMenuContributionClassWizard_CreateNewContribution;
+	public static String NewDynamicMenuContributionClassWizard_NewDynamicContribution;
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
index f8a00b47a7..71a6932e52 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
@@ -9,3 +9,9 @@ AbstractNewClassPage_NeedToSelectAPackage=You need to select a package
 AbstractNewClassPage_Package=Package
 AbstractNewClassPage_SourceFolder=Source folder
 AbstractNewClassPage_SourceFolderNotEmpty=Source folder must not be empty
+AbstractNewClassWizard_NewClass=New contribution class
+NewAddonClassWizard_NewAddon=New Addon
+NewAddonClassWizard_NewAddonClass=Create a new addon class
+NewDynamicMenuContributionClassWizard_AboutToShowMethod=AboutToShow Method
+NewDynamicMenuContributionClassWizard_CreateNewContribution=Create a new dynamic menu contribution class
+NewDynamicMenuContributionClassWizard_NewDynamicContribution=New Dynamic Menu Contribution
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
index 21371d9af2..f38d1a130c 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Sopot Cela <sopotcela@gmail.com>
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Sopot Cela <sopotcela@gmail.com>
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
@@ -25,6 +25,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaElement;
@@ -47,11 +48,15 @@
 import org.osgi.framework.ServiceReference;
 
 public abstract class AbstractNewClassWizard extends Wizard implements INewWizard {
+	private static final String JAVA = ".java"; //$NON-NLS-1$
 	protected IPackageFragmentRoot root;
 	protected IFile file;
+
 	public AbstractNewClassWizard() {
-		this.setWindowTitle("New contribution class");
+		setWindowTitle(Messages.AbstractNewClassWizard_NewClass);
 	}
+
+	@Override
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
 		root = getFragmentRoot(getInitialJavaElement(selection));
 	}
@@ -59,22 +64,22 @@ public void init(IWorkbench workbench, IStructuredSelection selection) {
 	protected IJavaElement getInitialJavaElement(IStructuredSelection selection) {
 		IJavaElement jelem = null;
 		if (selection != null && !selection.isEmpty()) {
-			Object selectedElement = selection.getFirstElement();
+			final Object selectedElement = selection.getFirstElement();
 			if (selectedElement instanceof IAdaptable) {
-				IAdaptable adaptable = (IAdaptable) selectedElement;
+				final IAdaptable adaptable = (IAdaptable) selectedElement;
 
 				jelem = (IJavaElement) adaptable.getAdapter(IJavaElement.class);
 				if (jelem == null || !jelem.exists()) {
 					jelem = null;
 					IResource resource = (IResource) adaptable
-							.getAdapter(IResource.class);
+						.getAdapter(IResource.class);
 					if (resource != null
-							&& resource.getType() != IResource.ROOT) {
+						&& resource.getType() != IResource.ROOT) {
 						while (jelem == null
-								&& resource.getType() != IResource.PROJECT) {
+							&& resource.getType() != IResource.PROJECT) {
 							resource = resource.getParent();
 							jelem = (IJavaElement) resource
-									.getAdapter(IJavaElement.class);
+								.getAdapter(IJavaElement.class);
 						}
 						if (jelem == null) {
 							jelem = JavaCore.create(resource); // java project
@@ -91,16 +96,16 @@ protected IPackageFragmentRoot getFragmentRoot(IJavaElement elem) {
 		IPackageFragmentRoot initRoot = null;
 		if (elem != null) {
 			initRoot = (IPackageFragmentRoot) elem
-					.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
+				.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
 			try {
 				if (initRoot == null
-						|| initRoot.getKind() != IPackageFragmentRoot.K_SOURCE) {
-					IJavaProject jproject = elem.getJavaProject();
+					|| initRoot.getKind() != IPackageFragmentRoot.K_SOURCE) {
+					final IJavaProject jproject = elem.getJavaProject();
 					if (jproject != null) {
 						initRoot = null;
 						if (jproject.exists()) {
-							IPackageFragmentRoot[] roots = jproject
-									.getPackageFragmentRoots();
+							final IPackageFragmentRoot[] roots = jproject
+								.getPackageFragmentRoots();
 							for (int i = 0; i < roots.length; i++) {
 								if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE) {
 									initRoot = roots[i];
@@ -110,11 +115,11 @@ protected IPackageFragmentRoot getFragmentRoot(IJavaElement elem) {
 						}
 						if (initRoot == null) {
 							initRoot = jproject.getPackageFragmentRoot(jproject
-									.getResource());
+								.getResource());
 						}
 					}
 				}
-			} catch (JavaModelException e) {
+			} catch (final JavaModelException e) {
 				// TODO
 				e.printStackTrace();
 			}
@@ -123,112 +128,112 @@ protected IPackageFragmentRoot getFragmentRoot(IJavaElement elem) {
 	}
 
 	protected abstract String getContent();
-	
+
 	public JavaClass getDomainClass() {
 		return ((AbstractNewClassPage) getPages()[0]).getClazz();
 	}
-	
+
 	protected void checkRequiredBundles() {
-		IProject project = getDomainClass().getFragmentRoot().getJavaProject().getProject();
-		BundleContext context = FrameworkUtil.getBundle(NewAddonClassWizard.class).getBundleContext();
-		ServiceReference<IBundleProjectService> ref = context.getServiceReference(IBundleProjectService.class);
-		IBundleProjectService service = context.getService(ref);
+		final IProject project = getDomainClass().getFragmentRoot().getJavaProject().getProject();
+		final BundleContext context = FrameworkUtil.getBundle(NewAddonClassWizard.class).getBundleContext();
+		final ServiceReference<IBundleProjectService> ref = context.getServiceReference(IBundleProjectService.class);
+		final IBundleProjectService service = context.getService(ref);
 		try {
-			IBundleProjectDescription description = service.getDescription(project);
-			Set<String> requiredBundles = getRequiredBundles();
-			IRequiredBundleDescription[] arTmp = description.getRequiredBundles();
-			List<IRequiredBundleDescription> descs = new ArrayList<IRequiredBundleDescription>();
-			if( arTmp != null ) {
+			final IBundleProjectDescription description = service.getDescription(project);
+			final Set<String> requiredBundles = getRequiredBundles();
+			final IRequiredBundleDescription[] arTmp = description.getRequiredBundles();
+			final List<IRequiredBundleDescription> descs = new ArrayList<IRequiredBundleDescription>();
+			if (arTmp != null) {
 				descs.addAll(Arrays.asList(arTmp));
 			}
-			for( IRequiredBundleDescription bd : descs ) {
+			for (final IRequiredBundleDescription bd : descs) {
 				requiredBundles.remove(bd.getName());
 			}
-			
-			if( requiredBundles.size() > 0 ) {
-				for( String b : requiredBundles ) {
+
+			if (requiredBundles.size() > 0) {
+				for (final String b : requiredBundles) {
 					descs.add(service.newRequiredBundle(b, null, false, false));
 				}
 				description.setRequiredBundles(descs.toArray(new IRequiredBundleDescription[0]));
 				description.apply(new NullProgressMonitor());
 			}
-		} catch (CoreException e) {
+		} catch (final CoreException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 	}
-	
+
 	protected Set<String> getRequiredBundles() {
-		Set<String> rv = new HashSet<String>();
-		rv.add("javax.inject");
+		final Set<String> rv = new HashSet<String>();
+		rv.add("javax.inject"); //$NON-NLS-1$
 		return rv;
 	}
-	
+
 	@Override
 	public boolean performFinish() {
-		JavaClass clazz = getDomainClass();
-		String content = getContent();
-		
-		if( clazz.getFragmentRoot() == null ) {
+		final JavaClass clazz = getDomainClass();
+		final String content = getContent();
+
+		if (clazz.getFragmentRoot() == null) {
 			return false;
 		}
-		
+
 		checkRequiredBundles();
-		
+
 		IPackageFragment fragment = clazz.getPackageFragment();
 		boolean exists = false;
 		if (fragment != null) {
 			IJavaElement[] children;
 			try {
 				children = clazz.getFragmentRoot().getChildren();
-			
-					for (IJavaElement iJavaElement : children) {
-						IPackageFragment pf = (IPackageFragment) iJavaElement;
-						if (pf.getElementName().equals(fragment.getElementName())){
+
+				for (final IJavaElement iJavaElement : children) {
+					final IPackageFragment pf = (IPackageFragment) iJavaElement;
+					if (pf.getElementName().equals(fragment.getElementName())) {
 						exists = true;
 						break;
-						}
 					}
-			;
-			
-			if (!exists)
-				fragment = clazz.getFragmentRoot().createPackageFragment(fragment.getElementName(), true, null);
-			} catch (JavaModelException e1) {
+				}
+
+				if (!exists) {
+					fragment = clazz.getFragmentRoot().createPackageFragment(fragment.getElementName(), true, null);
+				}
+			} catch (final JavaModelException e1) {
 				// TODO Auto-generated catch block
 				e1.printStackTrace();
 			}
-			String cuName = clazz.getName() + ".java";
-			ICompilationUnit unit = fragment.getCompilationUnit(cuName); 
-			IResource resource = unit.getResource();
+			final String cuName = clazz.getName() + JAVA;
+			final ICompilationUnit unit = fragment.getCompilationUnit(cuName);
+			final IResource resource = unit.getResource();
 			file = (IFile) resource;
 			try {
 				if (!file.exists()) {
 					file.create(new ByteArrayInputStream(content.getBytes()),
-							true, null);
+						true, null);
 				} else {
 					file.setContents(new ByteArrayInputStream(content.getBytes()),
-							IResource.FORCE | IResource.KEEP_HISTORY, null);
+						IResource.FORCE | IResource.KEEP_HISTORY, null);
 				}
 				IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
-//				unit.open(null);
-			} catch (CoreException e) {
+				// unit.open(null);
+			} catch (final CoreException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 		} else {
-			String cuName = clazz.getName() + ".java";
-			IFolder p = (IFolder) clazz.getFragmentRoot().getResource();
+			final String cuName = clazz.getName() + JAVA;
+			final IFolder p = (IFolder) clazz.getFragmentRoot().getResource();
 			file = p.getFile(cuName);
 			try {
 				if (!file.exists()) {
 					file.create(new ByteArrayInputStream(content.getBytes()),
-							true, null);
+						true, null);
 				} else {
 					file.setContents(new ByteArrayInputStream(content.getBytes()),
-							IResource.FORCE | IResource.KEEP_HISTORY, null);
+						IResource.FORCE | IResource.KEEP_HISTORY, null);
 				}
 				IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
-			} catch (CoreException e) {
+			} catch (final CoreException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
@@ -237,7 +242,7 @@ public boolean performFinish() {
 		return true;
 
 	}
-	
+
 	public IFile getFile() {
 		return file;
 	}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
index d5a73559c0..3c333bd7f0 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Sopot Cela <sopotcela@gmail.com>
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Sopot Cela <sopotcela@gmail.com>
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
@@ -15,6 +15,7 @@
 
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.internal.tools.wizards.classes.templates.AddonTemplate;
 import org.eclipse.swt.widgets.Composite;
 
@@ -22,43 +23,43 @@ public class NewAddonClassWizard extends AbstractNewClassWizard {
 	private String initialString;
 
 	public NewAddonClassWizard(String contributionURI) {
-		this.initialString = contributionURI;
+		initialString = contributionURI;
 	}
-	
+
 	public NewAddonClassWizard() {
-		// Intentially left empty 
+		// Intentially left empty
 	}
 
 	@Override
 	public void addPages() {
-		addPage(new AbstractNewClassPage("Classinformation",
-				"New Addon",
-				"Create a new addon class", root, ResourcesPlugin.getWorkspace().getRoot(), initialString) {
+		addPage(new AbstractNewClassPage("Classinformation", //$NON-NLS-1$
+			Messages.NewAddonClassWizard_NewAddon,
+			Messages.NewAddonClassWizard_NewAddonClass, root, ResourcesPlugin.getWorkspace().getRoot(), initialString) {
+
+			@Override
+			protected void createFields(Composite parent,
+				DataBindingContext dbc) {
+			}
 
-					@Override
-					protected void createFields(Composite parent,
-							DataBindingContext dbc) {
-					}
+			@Override
+			protected JavaClass createInstance() {
+				return new JavaClass(root);
+			}
 
-					@Override
-					protected JavaClass createInstance() {
-						return new JavaClass(root);
-					}
-			
 		});
 	}
-	
+
 	@Override
 	protected String getContent() {
-		AddonTemplate template = new AddonTemplate();
+		final AddonTemplate template = new AddonTemplate();
 		return template.generate(getDomainClass());
 	}
-	
+
 	@Override
 	protected Set<String> getRequiredBundles() {
-		Set<String> rv = super.getRequiredBundles();
-		rv.add("javax.annotation");
-		rv.add("org.eclipse.e4.core.services");
+		final Set<String> rv = super.getRequiredBundles();
+		rv.add("javax.annotation"); //$NON-NLS-1$
+		rv.add("org.eclipse.e4.core.services"); //$NON-NLS-1$
 		return rv;
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
index 59c8b2bc63..5e0fa426b6 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Marco Descher <marco@descher.at> - initial API and implementation
+ * Marco Descher <marco@descher.at> - initial API and implementation
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
@@ -15,11 +15,9 @@
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.beans.BeanProperties;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage;
-import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassWizard;
+import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
 import org.eclipse.e4.internal.tools.wizards.classes.templates.DynamicMenuContributionTemplate;
-
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -31,25 +29,29 @@
 import org.eclipse.swt.widgets.Text;
 
 public class NewDynamicMenuContributionClassWizard extends
-		AbstractNewClassWizard {
+AbstractNewClassWizard {
+
+	private static final String ABOUT_TO_SHOW_METHOD_NAME = "aboutToShowMethodName"; //$NON-NLS-1$
+	private static final String ABOUT_TO_HIDE_METHOD_NAME = "aboutToHideMethodName"; //$NON-NLS-1$
+	private static final String USE_ABOUT_TO_HIDE = "useAboutToHide"; //$NON-NLS-1$
+	private final String initialString;
 
-	private String initialString;
-	
 	public NewDynamicMenuContributionClassWizard(String contributionURI) {
-		this.initialString = contributionURI;
+		initialString = contributionURI;
 	}
 
 	@Override
 	protected String getContent() {
-		DynamicMenuContributionTemplate template = new DynamicMenuContributionTemplate();
+		final DynamicMenuContributionTemplate template = new DynamicMenuContributionTemplate();
 		return template.generate(getDomainClass());
 	}
-	
+
 	@Override
 	public void addPages() {
-		addPage(new AbstractNewClassPage("Classinformation",
-				"New Dynamic Menu Contribution",
-				"Create a new dynamic menu contribution class", root, ResourcesPlugin.getWorkspace().getRoot(),initialString) {
+		addPage(new AbstractNewClassPage("Classinformation", //$NON-NLS-1$
+			Messages.NewDynamicMenuContributionClassWizard_NewDynamicContribution,
+			Messages.NewDynamicMenuContributionClassWizard_CreateNewContribution, root, ResourcesPlugin.getWorkspace().getRoot(),
+			initialString) {
 
 			@Override
 			protected JavaClass createInstance() {
@@ -58,58 +60,58 @@ protected JavaClass createInstance() {
 
 			@Override
 			protected void createFields(Composite parent, DataBindingContext dbc) {
-				IWidgetValueProperty textProp = WidgetProperties
-						.text(SWT.Modify);
+				final IWidgetValueProperty textProp = WidgetProperties
+					.text(SWT.Modify);
 
 				{
 					Label l = new Label(parent, SWT.NONE);
-					l.setText("AboutToShow Method");
+					l.setText(Messages.NewDynamicMenuContributionClassWizard_AboutToShowMethod);
 
-					Text t = new Text(parent, SWT.BORDER);
+					final Text t = new Text(parent, SWT.BORDER);
 					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 					dbc.bindValue(
-							textProp.observe(t),
-							BeanProperties.value("aboutToShowMethodName").observe(
-									getClazz()));
+						textProp.observe(t),
+						BeanProperties.value(ABOUT_TO_SHOW_METHOD_NAME).observe(
+							getClazz()));
 
 					l = new Label(parent, SWT.NONE);
 				}
 
 				{
-					Label l = new Label(parent, SWT.NONE);
-					l.setText("AboutToShow Method");
+					final Label l = new Label(parent, SWT.NONE);
+					l.setText(Messages.NewDynamicMenuContributionClassWizard_AboutToShowMethod);
 
-					Text t = new Text(parent, SWT.BORDER);
+					final Text t = new Text(parent, SWT.BORDER);
 					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 					dbc.bindValue(textProp.observe(t),
-							BeanProperties.value("aboutToHideMethodName")
-									.observe(getClazz()));
+						BeanProperties.value(ABOUT_TO_HIDE_METHOD_NAME)
+						.observe(getClazz()));
 					dbc.bindValue(
-							WidgetProperties.enabled().observe(t),
-							BeanProperties.value("useAboutToHide").observe(
-									getClazz()));
+						WidgetProperties.enabled().observe(t),
+						BeanProperties.value(USE_ABOUT_TO_HIDE).observe(
+							getClazz()));
 
-					Button b = new Button(parent, SWT.CHECK);
+					final Button b = new Button(parent, SWT.CHECK);
 					dbc.bindValue(
-							WidgetProperties.selection().observe(b),
-							BeanProperties.value("useAboutToHide").observe(
-									getClazz()));
+						WidgetProperties.selection().observe(b),
+						BeanProperties.value(USE_ABOUT_TO_HIDE).observe(
+							getClazz()));
 				}
 			}
 		});
 	}
-	
+
 	@Override
 	protected Set<String> getRequiredBundles() {
-		Set<String> set = super.getRequiredBundles();
-		set.add("org.eclipse.e4.ui.di");
-		set.add("org.eclipse.e4.ui.model.workbench");
+		final Set<String> set = super.getRequiredBundles();
+		set.add("org.eclipse.e4.ui.di"); //$NON-NLS-1$
+		set.add("org.eclipse.e4.ui.model.workbench"); //$NON-NLS-1$
 		return set;
 	}
-	
+
 	public static class DynamicMenuContributionClass extends JavaClass {
-		private String aboutToShowMethodName = "aboutToShow";
-		private String aboutToHideMethodName = "aboutToHide";
+		private String aboutToShowMethodName = "aboutToShow"; //$NON-NLS-1$
+		private String aboutToHideMethodName = "aboutToHide"; //$NON-NLS-1$
 		private boolean useAboutToHide = false;
 
 		public DynamicMenuContributionClass(IPackageFragmentRoot root) {
@@ -121,9 +123,9 @@ public String getAboutToShowMethodName() {
 		}
 
 		public void setAboutToShowMethodName(String executeMethodName) {
-			support.firePropertyChange("aboutToShowMethodName",
-					this.aboutToShowMethodName,
-					this.aboutToShowMethodName = executeMethodName);
+			support.firePropertyChange(ABOUT_TO_SHOW_METHOD_NAME,
+				aboutToShowMethodName,
+				aboutToShowMethodName = executeMethodName);
 		}
 
 		public String getAboutToHideMethodName() {
@@ -131,9 +133,9 @@ public String getAboutToHideMethodName() {
 		}
 
 		public void setAboutToHideMethodName(String canExecuteMethodName) {
-			support.firePropertyChange("aboutToHideMethodName",
-					this.aboutToHideMethodName,
-					this.aboutToHideMethodName = canExecuteMethodName);
+			support.firePropertyChange(ABOUT_TO_HIDE_METHOD_NAME,
+				aboutToHideMethodName,
+				aboutToHideMethodName = canExecuteMethodName);
 		}
 
 		public boolean isUseAboutToHide() {
@@ -141,8 +143,8 @@ public boolean isUseAboutToHide() {
 		}
 
 		public void setUseAboutToHide(boolean useAboutToHide) {
-			support.firePropertyChange("useAboutToHide", this.useAboutToHide,
-					this.useAboutToHide = useAboutToHide);
+			support.firePropertyChange(USE_ABOUT_TO_HIDE, this.useAboutToHide,
+				this.useAboutToHide = useAboutToHide);
 		}
 	}
 

From 07827ace25a8d0aac8276277d85f220ae0ce20e6 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Mon, 6 Oct 2014 10:00:16 +0200
Subject: [PATCH 0830/1286] Bug 444692 - Remove Warnings

---
 .../e4/internal/tools/ToolsPlugin.java        | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
index 18b87cae44..4d408c2697 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
@@ -11,14 +11,13 @@
 public class ToolsPlugin extends AbstractUIPlugin {
 	// The plug-in ID
 	public static final String PLUGIN_ID = "org.eclipse.e4.tools"; //$NON-NLS-1$
- 
+
 	private static ToolsPlugin plugin;
-	
+
 	private ResourceLocator resourceLocator;
-	
+
 	/*
 	 * (non-Javadoc)
-	 * 
 	 * @see
 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
 	 * )
@@ -31,7 +30,6 @@ public void start(BundleContext context) throws Exception {
 
 	/*
 	 * (non-Javadoc)
-	 * 
 	 * @see
 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
 	 * )
@@ -44,38 +42,44 @@ public void stop(BundleContext context) throws Exception {
 
 	/**
 	 * Returns the shared instance
-	 * 
+	 *
 	 * @return the shared instance
 	 */
 	public static ToolsPlugin getDefault() {
 		return plugin;
 	}
-	
+
 	public ResourceLocator getResourceLocator() {
 		if (resourceLocator == null) {
 			resourceLocator = new ResourceLocator() {
-				
+
+				@Override
 				public String getString(String key, Object[] substitutions,
-						boolean translate) {
+					boolean translate) {
 					return null;
 				}
-				
+
+				@Override
 				public String getString(String key, Object[] substitutions) {
 					return null;
 				}
-				
+
+				@Override
 				public String getString(String key, boolean translate) {
 					return null;
 				}
-				
+
+				@Override
 				public String getString(String key) {
 					return null;
 				}
-				
+
+				@Override
 				public Object getImage(String key) {
 					return null;
 				}
-				
+
+				@Override
 				public URL getBaseURL() {
 					return null;
 				}
@@ -83,11 +87,11 @@ public URL getBaseURL() {
 		}
 		return resourceLocator;
 	}
-	
+
 	public static void log(IStatus status, int nesting, boolean appendLogger) {
 		getDefault().getLog().log(status);
 	}
-	
+
 	/**
 	 * Log Throwable Error
 	 */
@@ -106,14 +110,14 @@ public static void logError(Throwable t, int nesting) {
 	public static void logError(Throwable t, int nesting, boolean appendLogger) {
 		log(newStatus(IStatus.ERROR, t.getMessage(), t), nesting, appendLogger);
 	}
-	
+
 	/**
 	 * Create an IStatus
-	 * 
+	 *
 	 * @return a new IStatus
 	 */
 	public static IStatus newStatus(int severity, String message,
-			Throwable exception) {
+		Throwable exception) {
 		return new Status(severity, PLUGIN_ID, 0, message, exception);
 	}
 }

From 2c07c37b2e3e263378a1e6504beb6817a201c524 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Mon, 6 Oct 2014 10:00:34 +0200
Subject: [PATCH 0831/1286] Bug 444340 - Externalize Strings

---
 .../eclipse/e4/internal/tools/Messages.java   |  14 ++
 .../e4/internal/tools/messages.properties     |  14 ++
 .../classes/NewHandlerClassWizard.java        |  92 ++++----
 .../wizards/classes/NewPartClassWizard.java   | 206 +++++++++---------
 .../classes/NewToolControlClassWizard.java    |  77 +++----
 5 files changed, 225 insertions(+), 178 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
index ed3c140bf9..acfee216fd 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
@@ -36,6 +36,20 @@ public class Messages extends NLS {
 	public static String NewDynamicMenuContributionClassWizard_AboutToShowMethod;
 	public static String NewDynamicMenuContributionClassWizard_CreateNewContribution;
 	public static String NewDynamicMenuContributionClassWizard_NewDynamicContribution;
+	public static String NewHandlerClassWizard_CanExecuteMethod;
+	public static String NewHandlerClassWizard_CreateNewHandler;
+	public static String NewHandlerClassWizard_ExecuteMethod;
+	public static String NewHandlerClassWizard_NewHandler;
+	public static String NewPartClassWizard_CreateNewPart;
+	public static String NewPartClassWizard_FocusMethod;
+	public static String NewPartClassWizard_NewPart;
+	public static String NewPartClassWizard_PersistMethod;
+	public static String NewPartClassWizard_PostConstructMethod;
+	public static String NewPartClassWizard_PredestroyMethod;
+	public static String NewToolControlClassWizard_CreateDefaultConstructor;
+	public static String NewToolControlClassWizard_CreateGUIMethod;
+	public static String NewToolControlClassWizard_CreateNewToolControl;
+	public static String NewToolControlClassWizard_NewToolControl;
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
index 71a6932e52..828c0c6372 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
@@ -15,3 +15,17 @@ NewAddonClassWizard_NewAddonClass=Create a new addon class
 NewDynamicMenuContributionClassWizard_AboutToShowMethod=AboutToShow Method
 NewDynamicMenuContributionClassWizard_CreateNewContribution=Create a new dynamic menu contribution class
 NewDynamicMenuContributionClassWizard_NewDynamicContribution=New Dynamic Menu Contribution
+NewHandlerClassWizard_CanExecuteMethod=Can-Execute Method
+NewHandlerClassWizard_CreateNewHandler=Create a new handler class
+NewHandlerClassWizard_ExecuteMethod=Execute Method
+NewHandlerClassWizard_NewHandler=New Handler
+NewPartClassWizard_CreateNewPart=Create a new part class
+NewPartClassWizard_FocusMethod=Focus Method
+NewPartClassWizard_NewPart=New Part
+NewPartClassWizard_PersistMethod=Persist Method
+NewPartClassWizard_PostConstructMethod=PostContruct Method
+NewPartClassWizard_PredestroyMethod=Predestroy Method
+NewToolControlClassWizard_CreateDefaultConstructor=Create Default Constructor
+NewToolControlClassWizard_CreateGUIMethod=Create GUI Method
+NewToolControlClassWizard_CreateNewToolControl=Create a new tool control class
+NewToolControlClassWizard_NewToolControl=New Tool Control
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
index 244b498e1a..9c675f961f 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Sopot Cela <sopotcela@gmail.com>
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Sopot Cela <sopotcela@gmail.com>
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
@@ -16,6 +16,7 @@
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.beans.BeanProperties;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
 import org.eclipse.e4.internal.tools.wizards.classes.templates.HandlerTemplate;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
@@ -29,27 +30,32 @@
 import org.eclipse.swt.widgets.Text;
 
 public class NewHandlerClassWizard extends AbstractNewClassWizard {
+	private static final String USE_CAN_EXECUTE = "useCanExecute"; //$NON-NLS-1$
+	private static final String CAN_EXECUTE_METHOD_NAME = "canExecuteMethodName"; //$NON-NLS-1$
+	private static final String EXECUTE_METHOD_NAME = "executeMethodName"; //$NON-NLS-1$
 	private String initialString;
 
 	public NewHandlerClassWizard(String contributionURI) {
-		this.initialString = contributionURI;
+		initialString = contributionURI;
 	}
-	
+
 	public NewHandlerClassWizard() {
-		// Intentially left empty 
+		// Intentially left empty
 	}
 
 	@Override
 	protected String getContent() {
-		HandlerTemplate template = new HandlerTemplate();
+		final HandlerTemplate template = new HandlerTemplate();
 		return template.generate(getDomainClass());
 	}
-	
+
 	@Override
 	public void addPages() {
-		addPage(new AbstractNewClassPage("Classinformation",
-				"New Handler",
-				"Create a new handler class", root, ResourcesPlugin.getWorkspace().getRoot(),initialString) {
+		addPage(new AbstractNewClassPage(
+			"Classinformation", //$NON-NLS-1$
+			Messages.NewHandlerClassWizard_NewHandler,
+			Messages.NewHandlerClassWizard_CreateNewHandler, root, ResourcesPlugin.getWorkspace().getRoot(),
+			initialString) {
 
 			@Override
 			protected JavaClass createInstance() {
@@ -58,57 +64,57 @@ protected JavaClass createInstance() {
 
 			@Override
 			protected void createFields(Composite parent, DataBindingContext dbc) {
-				IWidgetValueProperty textProp = WidgetProperties
-						.text(SWT.Modify);
+				final IWidgetValueProperty textProp = WidgetProperties
+					.text(SWT.Modify);
 
 				{
 					Label l = new Label(parent, SWT.NONE);
-					l.setText("Execute Method");
+					l.setText(Messages.NewHandlerClassWizard_ExecuteMethod);
 
-					Text t = new Text(parent, SWT.BORDER);
+					final Text t = new Text(parent, SWT.BORDER);
 					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 					dbc.bindValue(
-							textProp.observe(t),
-							BeanProperties.value("executeMethodName").observe(
-									getClazz()));
+						textProp.observe(t),
+						BeanProperties.value(EXECUTE_METHOD_NAME).observe(
+							getClazz()));
 
 					l = new Label(parent, SWT.NONE);
 				}
 
 				{
-					Label l = new Label(parent, SWT.NONE);
-					l.setText("Can-Execute Method");
+					final Label l = new Label(parent, SWT.NONE);
+					l.setText(Messages.NewHandlerClassWizard_CanExecuteMethod);
 
-					Text t = new Text(parent, SWT.BORDER);
+					final Text t = new Text(parent, SWT.BORDER);
 					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 					dbc.bindValue(textProp.observe(t),
-							BeanProperties.value("canExecuteMethodName")
-									.observe(getClazz()));
+						BeanProperties.value(CAN_EXECUTE_METHOD_NAME)
+						.observe(getClazz()));
 					dbc.bindValue(
-							WidgetProperties.enabled().observe(t),
-							BeanProperties.value("useCanExecute").observe(
-									getClazz()));
+						WidgetProperties.enabled().observe(t),
+						BeanProperties.value(USE_CAN_EXECUTE).observe(
+							getClazz()));
 
-					Button b = new Button(parent, SWT.CHECK);
+					final Button b = new Button(parent, SWT.CHECK);
 					dbc.bindValue(
-							WidgetProperties.selection().observe(b),
-							BeanProperties.value("useCanExecute").observe(
-									getClazz()));
+						WidgetProperties.selection().observe(b),
+						BeanProperties.value(USE_CAN_EXECUTE).observe(
+							getClazz()));
 				}
 			}
 		});
 	}
-	
+
 	@Override
 	protected Set<String> getRequiredBundles() {
-		Set<String> set = super.getRequiredBundles();
-		set.add("org.eclipse.e4.core.di");
+		final Set<String> set = super.getRequiredBundles();
+		set.add("org.eclipse.e4.core.di"); //$NON-NLS-1$
 		return set;
 	}
-	
+
 	public static class HandlerClass extends JavaClass {
-		private String executeMethodName = "execute";
-		private String canExecuteMethodName = "canExecute";
+		private String executeMethodName = "execute"; //$NON-NLS-1$
+		private String canExecuteMethodName = "canExecute"; //$NON-NLS-1$
 		private boolean useCanExecute = false;
 
 		public HandlerClass(IPackageFragmentRoot root) {
@@ -120,9 +126,9 @@ public String getExecuteMethodName() {
 		}
 
 		public void setExecuteMethodName(String executeMethodName) {
-			support.firePropertyChange("executeMethodName",
-					this.executeMethodName,
-					this.executeMethodName = executeMethodName);
+			support.firePropertyChange(EXECUTE_METHOD_NAME,
+				this.executeMethodName,
+				this.executeMethodName = executeMethodName);
 		}
 
 		public String getCanExecuteMethodName() {
@@ -130,9 +136,9 @@ public String getCanExecuteMethodName() {
 		}
 
 		public void setCanExecuteMethodName(String canExecuteMethodName) {
-			support.firePropertyChange("canExecuteMethodName",
-					this.canExecuteMethodName,
-					this.canExecuteMethodName = canExecuteMethodName);
+			support.firePropertyChange(CAN_EXECUTE_METHOD_NAME,
+				this.canExecuteMethodName,
+				this.canExecuteMethodName = canExecuteMethodName);
 		}
 
 		public boolean isUseCanExecute() {
@@ -140,8 +146,8 @@ public boolean isUseCanExecute() {
 		}
 
 		public void setUseCanExecute(boolean useCanExecute) {
-			support.firePropertyChange("useCanExecute", this.useCanExecute,
-					this.useCanExecute = useCanExecute);
+			support.firePropertyChange(USE_CAN_EXECUTE, this.useCanExecute,
+				this.useCanExecute = useCanExecute);
 		}
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
index a28c2d0111..e82ad1189b 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Sopot Cela <sopotcela@gmail.com>
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Sopot Cela <sopotcela@gmail.com>
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
@@ -18,6 +18,7 @@
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.beans.BeanProperties;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
 import org.eclipse.e4.internal.tools.wizards.classes.templates.PartTemplate;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
@@ -32,110 +33,118 @@
 
 public class NewPartClassWizard extends AbstractNewClassWizard {
 
+	private static final String PERSIST_METHOD_NAME = "persistMethodName"; //$NON-NLS-1$
+	private static final String USE_PERSIST = "usePersist"; //$NON-NLS-1$
+	private static final String USE_FOCUS = "useFocus"; //$NON-NLS-1$
+	private static final String FOCUS_METHOD_NAME = "focusMethodName"; //$NON-NLS-1$
+	private static final String USE_PREDESTROY = "usePredestroy"; //$NON-NLS-1$
+	private static final String PRE_DESTROY_METHOD_NAME = "preDestroyMethodName"; //$NON-NLS-1$
+	private static final String USE_POST_CONSTRUCT = "usePostConstruct"; //$NON-NLS-1$
+	private static final String POST_CONSTRUCT_METHOD_NAME = "postConstructMethodName"; //$NON-NLS-1$
 	private String initialString;
 
 	public NewPartClassWizard(String contributionURI) {
-		this.initialString = contributionURI;
+		initialString = contributionURI;
 	}
-	
+
 	public NewPartClassWizard() {
-		// Intentially left empty 
+		// Intentially left empty
 	}
 
 	@Override
 	public void addPages() {
-		addPage(new AbstractNewClassPage("Classinformation", "New Part",
-				"Create a new part class", root, ResourcesPlugin.getWorkspace()
-						.getRoot(), initialString) {
+		addPage(new AbstractNewClassPage("Classinformation", Messages.NewPartClassWizard_NewPart, //$NON-NLS-1$
+			Messages.NewPartClassWizard_CreateNewPart, root, ResourcesPlugin.getWorkspace()
+			.getRoot(), initialString) {
 
 			@Override
 			protected void createFields(Composite parent, DataBindingContext dbc) {
-				IWidgetValueProperty textProp = WidgetProperties
-						.text(SWT.Modify);
-				IWidgetValueProperty enabledProp = WidgetProperties.enabled();
+				final IWidgetValueProperty textProp = WidgetProperties
+					.text(SWT.Modify);
+				final IWidgetValueProperty enabledProp = WidgetProperties.enabled();
 
 				{
-					Label l = new Label(parent, SWT.NONE);
-					l.setText("PostContruct Method");
+					final Label l = new Label(parent, SWT.NONE);
+					l.setText(Messages.NewPartClassWizard_PostConstructMethod);
 
-					Text t = new Text(parent, SWT.BORDER);
+					final Text t = new Text(parent, SWT.BORDER);
 					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 					dbc.bindValue(textProp.observe(t),
-							BeanProperties.value("postConstructMethodName")
-									.observe(getClazz()));
+						BeanProperties.value(POST_CONSTRUCT_METHOD_NAME)
+						.observe(getClazz()));
 					dbc.bindValue(
-							enabledProp.observe(t),
-							BeanProperties.value("usePostConstruct").observe(
-									getClazz()));
+						enabledProp.observe(t),
+						BeanProperties.value(USE_POST_CONSTRUCT).observe(
+							getClazz()));
 
-					Button b = new Button(parent, SWT.CHECK);
+					final Button b = new Button(parent, SWT.CHECK);
 					dbc.bindValue(
-							WidgetProperties.selection().observe(b),
-							BeanProperties.value("usePostConstruct").observe(
-									getClazz()));
+						WidgetProperties.selection().observe(b),
+						BeanProperties.value(USE_POST_CONSTRUCT).observe(
+							getClazz()));
 				}
-				
+
 				{
-					Label l = new Label(parent, SWT.NONE);
-					l.setText("Predestroy Method");
+					final Label l = new Label(parent, SWT.NONE);
+					l.setText(Messages.NewPartClassWizard_PredestroyMethod);
 
-					Text t = new Text(parent, SWT.BORDER);
+					final Text t = new Text(parent, SWT.BORDER);
 					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 					dbc.bindValue(textProp.observe(t),
-							BeanProperties.value("preDestroyMethodName")
-									.observe(getClazz()));
+						BeanProperties.value(PRE_DESTROY_METHOD_NAME)
+						.observe(getClazz()));
 					dbc.bindValue(
-							enabledProp.observe(t),
-							BeanProperties.value("usePredestroy").observe(
-									getClazz()));
+						enabledProp.observe(t),
+						BeanProperties.value(USE_PREDESTROY).observe(
+							getClazz()));
 
-					Button b = new Button(parent, SWT.CHECK);
+					final Button b = new Button(parent, SWT.CHECK);
 					dbc.bindValue(
-							WidgetProperties.selection().observe(b),
-							BeanProperties.value("usePredestroy").observe(
-									getClazz()));
+						WidgetProperties.selection().observe(b),
+						BeanProperties.value(USE_PREDESTROY).observe(
+							getClazz()));
 				}
-				
+
 				{
-					Label l = new Label(parent, SWT.NONE);
-					l.setText("Focus Method");
+					final Label l = new Label(parent, SWT.NONE);
+					l.setText(Messages.NewPartClassWizard_FocusMethod);
 
-					Text t = new Text(parent, SWT.BORDER);
+					final Text t = new Text(parent, SWT.BORDER);
 					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 					dbc.bindValue(textProp.observe(t),
-							BeanProperties.value("focusMethodName")
-									.observe(getClazz()));
+						BeanProperties.value(FOCUS_METHOD_NAME)
+						.observe(getClazz()));
 					dbc.bindValue(
-							enabledProp.observe(t),
-							BeanProperties.value("useFocus").observe(
-									getClazz()));
+						enabledProp.observe(t),
+						BeanProperties.value(USE_FOCUS).observe(
+							getClazz()));
 
-					Button b = new Button(parent, SWT.CHECK);
+					final Button b = new Button(parent, SWT.CHECK);
 					dbc.bindValue(
-							WidgetProperties.selection().observe(b),
-							BeanProperties.value("useFocus").observe(
-									getClazz()));
+						WidgetProperties.selection().observe(b),
+						BeanProperties.value(USE_FOCUS).observe(
+							getClazz()));
 				}
-				
+
 				{
-					Label l = new Label(parent, SWT.NONE);
-					l.setText("Persist Method");
+					final Label l = new Label(parent, SWT.NONE);
+					l.setText(Messages.NewPartClassWizard_PersistMethod);
 
-					Text t = new Text(parent, SWT.BORDER);
+					final Text t = new Text(parent, SWT.BORDER);
 					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 					dbc.bindValue(textProp.observe(t),
-							BeanProperties.value("persistMethodName")
-									.observe(getClazz()));
+						BeanProperties.value(PERSIST_METHOD_NAME)
+						.observe(getClazz()));
 					dbc.bindValue(
-							enabledProp.observe(t),
-							BeanProperties.value("usePersist").observe(
-									getClazz()));
+						enabledProp.observe(t),
+						BeanProperties.value(USE_PERSIST).observe(
+							getClazz()));
 
-					Button b = new Button(parent, SWT.CHECK);
+					final Button b = new Button(parent, SWT.CHECK);
 					dbc.bindValue(
-							WidgetProperties.selection().observe(b),
-							BeanProperties.value("usePersist").observe(
-									getClazz()));
+						WidgetProperties.selection().observe(b),
+						BeanProperties.value(USE_PERSIST).observe(
+							getClazz()));
 				}
 			}
 
@@ -146,45 +155,46 @@ protected JavaClass createInstance() {
 
 		});
 	}
-	
+
 	@Override
 	protected Set<String> getRequiredBundles() {
-		Set<String> rv = super.getRequiredBundles();
-		PartClass cl = (PartClass)getDomainClass();
-		if( cl.usePostConstruct || cl.usePredestroy ) {
-			rv.add("javax.annotation");
-		} else if( cl.useFocus || cl.usePersist ) {
-			rv.add("org.eclipse.e4.ui.di");
+		final Set<String> rv = super.getRequiredBundles();
+		final PartClass cl = (PartClass) getDomainClass();
+		if (cl.usePostConstruct || cl.usePredestroy) {
+			rv.add("javax.annotation"); //$NON-NLS-1$
+		} else if (cl.useFocus || cl.usePersist) {
+			rv.add("org.eclipse.e4.ui.di"); //$NON-NLS-1$
 		}
-		
+
 		return rv;
 	}
-	
+
 	@Override
 	protected String getContent() {
-		PartTemplate template = new PartTemplate();
+		final PartTemplate template = new PartTemplate();
 		return template.generate(getDomainClass());
 	}
 
 	public static class PartClass extends JavaClass {
-		private PropertyChangeSupport support = new PropertyChangeSupport(this);
+
+		private final PropertyChangeSupport support = new PropertyChangeSupport(this);
 
 		private boolean usePostConstruct = true;
-		private String postConstructMethodName = "postConstruct";
+		private String postConstructMethodName = "postConstruct"; //$NON-NLS-1$
 
 		private boolean usePredestroy;
-		private String preDestroyMethodName = "preDestroy";
+		private String preDestroyMethodName = "preDestroy"; //$NON-NLS-1$
 
 		private boolean useFocus;
-		private String focusMethodName = "onFocus";
+		private String focusMethodName = "onFocus"; //$NON-NLS-1$
 
 		private boolean usePersist;
-		private String persistMethodName = "save";
+		private String persistMethodName = "save"; //$NON-NLS-1$
 
 		public PartClass(IPackageFragmentRoot fragmentRoot) {
 			super(fragmentRoot);
 		}
-		
+
 		@Override
 		public void addPropertyChangeListener(PropertyChangeListener listener) {
 			support.addPropertyChangeListener(listener);
@@ -200,9 +210,9 @@ public boolean isUsePostConstruct() {
 		}
 
 		public void setUsePostConstruct(boolean usePostConstruct) {
-			support.firePropertyChange("usePostConstruct",
-					this.usePostConstruct,
-					this.usePostConstruct = usePostConstruct);
+			support.firePropertyChange(USE_POST_CONSTRUCT,
+				this.usePostConstruct,
+				this.usePostConstruct = usePostConstruct);
 		}
 
 		public String getPostConstructMethodName() {
@@ -210,9 +220,9 @@ public String getPostConstructMethodName() {
 		}
 
 		public void setPostConstructMethodName(String postConstructMethodName) {
-			support.firePropertyChange("postConstructMethodName",
-					this.postConstructMethodName,
-					this.postConstructMethodName = postConstructMethodName);
+			support.firePropertyChange(POST_CONSTRUCT_METHOD_NAME,
+				this.postConstructMethodName,
+				this.postConstructMethodName = postConstructMethodName);
 		}
 
 		public boolean isUsePredestroy() {
@@ -220,8 +230,8 @@ public boolean isUsePredestroy() {
 		}
 
 		public void setUsePredestroy(boolean usePredestroy) {
-			support.firePropertyChange("usePredestroy", this.usePredestroy,
-					this.usePredestroy = usePredestroy);
+			support.firePropertyChange(USE_PREDESTROY, this.usePredestroy,
+				this.usePredestroy = usePredestroy);
 		}
 
 		public String getPreDestroyMethodName() {
@@ -229,9 +239,9 @@ public String getPreDestroyMethodName() {
 		}
 
 		public void setPreDestroyMethodName(String preDestroyMethodName) {
-			support.firePropertyChange("preDestroyMethodName",
-					this.preDestroyMethodName,
-					this.preDestroyMethodName = preDestroyMethodName);
+			support.firePropertyChange(PRE_DESTROY_METHOD_NAME,
+				this.preDestroyMethodName,
+				this.preDestroyMethodName = preDestroyMethodName);
 		}
 
 		public boolean isUseFocus() {
@@ -239,8 +249,8 @@ public boolean isUseFocus() {
 		}
 
 		public void setUseFocus(boolean useFocus) {
-			support.firePropertyChange("useFocus", this.useFocus,
-					this.useFocus = useFocus);
+			support.firePropertyChange(USE_FOCUS, this.useFocus,
+				this.useFocus = useFocus);
 		}
 
 		public String getFocusMethodName() {
@@ -248,8 +258,8 @@ public String getFocusMethodName() {
 		}
 
 		public void setFocusMethodName(String focusMethodName) {
-			support.firePropertyChange("focusMethodName", this.focusMethodName,
-					this.focusMethodName = focusMethodName);
+			support.firePropertyChange(FOCUS_METHOD_NAME, this.focusMethodName,
+				this.focusMethodName = focusMethodName);
 		}
 
 		public boolean isUsePersist() {
@@ -257,8 +267,8 @@ public boolean isUsePersist() {
 		}
 
 		public void setUsePersist(boolean usePersist) {
-			support.firePropertyChange("usePersist", this.usePersist,
-					this.usePersist = usePersist);
+			support.firePropertyChange(USE_PERSIST, this.usePersist,
+				this.usePersist = usePersist);
 		}
 
 		public String getPersistMethodName() {
@@ -266,9 +276,9 @@ public String getPersistMethodName() {
 		}
 
 		public void setPersistMethodName(String persistMethodName) {
-			support.firePropertyChange("persistMethodName",
-					this.persistMethodName,
-					this.persistMethodName = persistMethodName);
+			support.firePropertyChange(PERSIST_METHOD_NAME,
+				this.persistMethodName,
+				this.persistMethodName = persistMethodName);
 		}
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
index 43804f70a5..ccb1f02926 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 412672
+ * Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 412672
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
@@ -15,6 +15,7 @@
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.beans.BeanProperties;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
 import org.eclipse.e4.internal.tools.wizards.classes.templates.ToolControlTemplate;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
@@ -28,10 +29,12 @@
 import org.eclipse.swt.widgets.Text;
 
 public class NewToolControlClassWizard extends AbstractNewClassWizard {
+	private static final String CREATE_DEFAULT_CONSTRUCTOR = "createDefaultConstructor"; //$NON-NLS-1$
+	private static final String CREATE_GUI_METHOD_NAME = "createGuiMethodName"; //$NON-NLS-1$
 	private String initialString;
 
 	public NewToolControlClassWizard(String contributionURI) {
-		this.initialString = contributionURI;
+		initialString = contributionURI;
 	}
 
 	public NewToolControlClassWizard() {
@@ -40,15 +43,15 @@ public NewToolControlClassWizard() {
 
 	@Override
 	protected String getContent() {
-		ToolControlTemplate template = new ToolControlTemplate();
+		final ToolControlTemplate template = new ToolControlTemplate();
 		return template.generate(getDomainClass());
 	}
 
 	@Override
 	public void addPages() {
-		addPage(new AbstractNewClassPage("Classinformation",
-				"New Tool Control",
-				"Create a new tool control class", root, ResourcesPlugin.getWorkspace().getRoot(),initialString) {
+		addPage(new AbstractNewClassPage("Classinformation", //$NON-NLS-1$
+			Messages.NewToolControlClassWizard_NewToolControl,
+			Messages.NewToolControlClassWizard_CreateNewToolControl, root, ResourcesPlugin.getWorkspace().getRoot(), initialString) {
 
 			@Override
 			protected JavaClass createInstance() {
@@ -57,39 +60,39 @@ protected JavaClass createInstance() {
 
 			@Override
 			protected void createFields(Composite parent, DataBindingContext dbc) {
-				IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+				final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 				{
 					Label l = new Label(parent, SWT.NONE);
-					l.setText("Create GUI Method");
+					l.setText(Messages.NewToolControlClassWizard_CreateGUIMethod);
 
-					Text t = new Text(parent, SWT.BORDER);
+					final Text t = new Text(parent, SWT.BORDER);
 					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 					dbc.bindValue(
-							textProp.observe(t),
-							BeanProperties.value("createGuiMethodName").observe(
-									getClazz()));
+						textProp.observe(t),
+						BeanProperties.value(CREATE_GUI_METHOD_NAME).observe(
+							getClazz()));
 
 					l = new Label(parent, SWT.NONE);
 				}
 				{
-					Label l = new Label(parent, SWT.NONE);
-					l.setText("Create Default Constructor");
-
-//					Text t = new Text(parent, SWT.BORDER);
-//					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-//					dbc.bindValue(textProp.observe(t),
-//							BeanProperties.value("defaultConstructorName")
-//									.observe(getClazz()));
-//					dbc.bindValue(
-//							WidgetProperties.enabled().observe(t),
-//							BeanProperties.value("useDefaultConstructor").observe(
-//									getClazz()));
-
-					Button b = new Button(parent, SWT.CHECK);
+					final Label l = new Label(parent, SWT.NONE);
+					l.setText(Messages.NewToolControlClassWizard_CreateDefaultConstructor);
+
+					// Text t = new Text(parent, SWT.BORDER);
+					// t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+					// dbc.bindValue(textProp.observe(t),
+					// BeanProperties.value("defaultConstructorName")
+					// .observe(getClazz()));
+					// dbc.bindValue(
+					// WidgetProperties.enabled().observe(t),
+					// BeanProperties.value("useDefaultConstructor").observe(
+					// getClazz()));
+
+					final Button b = new Button(parent, SWT.CHECK);
 					dbc.bindValue(
-							WidgetProperties.selection().observe(b),
-							BeanProperties.value("createDefaultConstructor").observe(
-									getClazz()));
+						WidgetProperties.selection().observe(b),
+						BeanProperties.value(CREATE_DEFAULT_CONSTRUCTOR).observe(
+							getClazz()));
 				}
 			}
 		});
@@ -97,13 +100,13 @@ protected void createFields(Composite parent, DataBindingContext dbc) {
 
 	@Override
 	protected Set<String> getRequiredBundles() {
-		Set<String> set = super.getRequiredBundles();
-		set.add("org.eclipse.e4.core.di");
+		final Set<String> set = super.getRequiredBundles();
+		set.add("org.eclipse.e4.core.di"); //$NON-NLS-1$
 		return set;
 	}
 
 	public static class ToolControlClass extends JavaClass {
-		private String createGuiMethodName = "createGui";
+		private String createGuiMethodName = "createGui"; //$NON-NLS-1$
 		private boolean createDefaultCostructor = false;
 
 		public ToolControlClass(IPackageFragmentRoot root) {
@@ -115,9 +118,9 @@ public String getCreateGuiMethodName() {
 		}
 
 		public void setCreateGuiMethodName(String createGuiMethodName) {
-			support.firePropertyChange("createGuiMethodName",
-					this.createGuiMethodName,
-					this.createGuiMethodName = createGuiMethodName);
+			support.firePropertyChange(CREATE_GUI_METHOD_NAME,
+				this.createGuiMethodName,
+				this.createGuiMethodName = createGuiMethodName);
 		}
 
 		public boolean isCreateDefaultConstructor() {
@@ -125,8 +128,8 @@ public boolean isCreateDefaultConstructor() {
 		}
 
 		public void setCreateDefaultConstructor(boolean createDefaultConstructor) {
-			support.firePropertyChange("createDefaultConstructor", this.createDefaultCostructor,
-					this.createDefaultCostructor = createDefaultConstructor);
+			support.firePropertyChange(CREATE_DEFAULT_CONSTRUCTOR, createDefaultCostructor,
+				createDefaultCostructor = createDefaultConstructor);
 		}
 	}
 }

From da7e95c61b3d5d0406addd345825c18347ca3eb4 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Tue, 7 Oct 2014 11:10:17 +0200
Subject: [PATCH 0832/1286] Bug 444340 - Externalize Strings

---
 .../eclipse/e4/internal/tools/Messages.java   |   4 +
 .../e4/internal/tools/messages.properties     |   4 +
 .../classes/templates/AddonTemplate.java      |   2 +-
 .../DynamicMenuContributionTemplate.java      |   2 +-
 .../classes/templates/HandlerTemplate.java    |   2 +-
 .../classes/templates/PartTemplate.java       |   2 +-
 .../templates/ToolControlTemplate.java        |   2 +-
 .../model/BaseApplicationModelWizard.java     | 233 +++++++++---------
 8 files changed, 135 insertions(+), 116 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
index acfee216fd..610b27a425 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
@@ -31,6 +31,10 @@ public class Messages extends NLS {
 	public static String AbstractNewClassPage_SourceFolder;
 	public static String AbstractNewClassPage_SourceFolderNotEmpty;
 	public static String AbstractNewClassWizard_NewClass;
+	public static String BaseApplicationModelWizard_AddExtractedNode;
+	public static String BaseApplicationModelWizard_Error;
+	public static String BaseApplicationModelWizard_FileExists;
+	public static String BaseApplicationModelWizard_TheFileAlreadyExists;
 	public static String NewAddonClassWizard_NewAddon;
 	public static String NewAddonClassWizard_NewAddonClass;
 	public static String NewDynamicMenuContributionClassWizard_AboutToShowMethod;
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
index 828c0c6372..1c2f1cd3e5 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
@@ -10,6 +10,10 @@ AbstractNewClassPage_Package=Package
 AbstractNewClassPage_SourceFolder=Source folder
 AbstractNewClassPage_SourceFolderNotEmpty=Source folder must not be empty
 AbstractNewClassWizard_NewClass=New contribution class
+BaseApplicationModelWizard_AddExtractedNode=Would you like to add the extracted node to this file?
+BaseApplicationModelWizard_Error=Error
+BaseApplicationModelWizard_FileExists=File exists
+BaseApplicationModelWizard_TheFileAlreadyExists=The file already exists. 
 NewAddonClassWizard_NewAddon=New Addon
 NewAddonClassWizard_NewAddonClass=Create a new addon class
 NewDynamicMenuContributionClassWizard_AboutToShowMethod=AboutToShow Method
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
index 316a8ddee6..75bbfcd9b6 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
@@ -1,7 +1,7 @@
 package org.eclipse.e4.internal.tools.wizards.classes.templates;
 
 import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
-
+@SuppressWarnings("nls")
 public class AddonTemplate
 {
   protected static String nl;
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
index 20a79b84f7..5810b06551 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
@@ -1,7 +1,7 @@
 package org.eclipse.e4.internal.tools.wizards.classes.templates;
 
 import org.eclipse.e4.internal.tools.wizards.classes.NewDynamicMenuContributionClassWizard.DynamicMenuContributionClass;
-
+@SuppressWarnings("nls")
 public class DynamicMenuContributionTemplate
 {
   protected static String nl;
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
index f9cfd2ceea..bd0f997f0b 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
@@ -1,7 +1,7 @@
 package org.eclipse.e4.internal.tools.wizards.classes.templates;
 
 import org.eclipse.e4.internal.tools.wizards.classes.NewHandlerClassWizard.HandlerClass;
-
+@SuppressWarnings("nls")
 public class HandlerTemplate
 {
   protected static String nl;
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
index 20843b9887..38c4b91d8d 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
@@ -1,7 +1,7 @@
 package org.eclipse.e4.internal.tools.wizards.classes.templates;
 
 import org.eclipse.e4.internal.tools.wizards.classes.NewPartClassWizard.PartClass;
-
+@SuppressWarnings("nls")
 public class PartTemplate
 {
   protected static String nl;
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
index 5a0405f536..ecfff8dd1b 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
@@ -1,7 +1,7 @@
 package org.eclipse.e4.internal.tools.wizards.classes.templates;
 
 import org.eclipse.e4.internal.tools.wizards.classes.NewToolControlClassWizard.ToolControlClass;
-
+@SuppressWarnings("nls")
 public class ToolControlTemplate
 {
   protected static String nl;
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index 19edbf1f95..8d80be271c 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -6,13 +6,12 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 408712
- *     Marco Descher <marco@descher.at> - Bug 434371
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 408712
+ * Marco Descher <marco@descher.at> - Bug 434371
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.model;
 
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -29,6 +28,7 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
@@ -70,6 +70,7 @@
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.part.ISetSelectionTarget;
 
+@SuppressWarnings("restriction")
 public abstract class BaseApplicationModelWizard extends Wizard implements INewWizard {
 	private NewModelFilePage page;
 	private ISelection selection;
@@ -105,31 +106,31 @@ public boolean performFinish() {
 			//
 			final IFile modelFile = getModelFile();
 
-			if( modelFile.exists() ) {
-				if( ! MessageDialog.openQuestion(getShell(), "File exists", "The file already exists. "
-						+ "Would you like to add the extracted node to this file?")) {
+			if (modelFile.exists()) {
+				if (!MessageDialog.openQuestion(getShell(), Messages.BaseApplicationModelWizard_FileExists, Messages.BaseApplicationModelWizard_TheFileAlreadyExists
+					+ Messages.BaseApplicationModelWizard_AddExtractedNode)) {
 					return false;
 				}
 			}
 
 			// Do the work within an operation.
 			//
-			WorkspaceModifyOperation operation =
+			final WorkspaceModifyOperation operation =
 				new WorkspaceModifyOperation() {
 					@Override
 					protected void execute(IProgressMonitor progressMonitor) {
 						try {
 							// Create a resource set
 							//
-							ResourceSet resourceSet = new ResourceSetImpl();
+							final ResourceSet resourceSet = new ResourceSetImpl();
 
 							// Get the URI of the model file.
 							//
-							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+							final URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
 
 							// Create a resource for this file.
 							//
-							Resource resource = resourceSet.createResource(fileURI);
+							final Resource resource = resourceSet.createResource(fileURI);
 
 							// If target file already exists, load its content
 							//
@@ -139,60 +140,65 @@ protected void execute(IProgressMonitor progressMonitor) {
 
 							// Add the initial model object to the contents.
 							//
-							EObject rootObject = createInitialModel();
+							final EObject rootObject = createInitialModel();
 							if (rootObject != null) {
 								if (resource.getContents().size() == 0) {
-									//If target model is empty (file just created) => add as is
+									// If target model is empty (file just created) => add as is
 									resource.getContents().add(rootObject);
 								} else {
-									//Otherwise (file already exists) => take the roots of source and target models
-									//and copy multiple attributes 'imports' and 'fragments' objects from source to target
-									MModelFragments sourceFragments = (MModelFragments) rootObject;
-									MModelFragments targetFragments = (MModelFragments) resource.getContents().get(0);
-
-
-									List<MCommand> listOfAllImportsFromElements=new ArrayList<MCommand>();
-									for (MModelFragment fragment : sourceFragments.getFragments()) {
-										List<MCommand> commandsToImport=new ArrayList<MCommand>();
-										EObject eObject=(EObject) fragment;
-										TreeIterator<EObject> eAllContents = eObject.eAllContents();
-										while(eAllContents.hasNext()){
-											EObject next = eAllContents.next();
-											MApplicationElement mApplicationElement=(MApplicationElement) next;
-											if(mApplicationElement instanceof MHandler){
-												MHandler mHandler=(MHandler)mApplicationElement;
-												MCommand command = mHandler.getCommand();
+									// Otherwise (file already exists) => take the roots of source and target models
+									// and copy multiple attributes 'imports' and 'fragments' objects from source to
+								// target
+									final MModelFragments sourceFragments = (MModelFragments) rootObject;
+									final MModelFragments targetFragments = (MModelFragments) resource.getContents()
+									.get(0);
+
+								final List<MCommand> listOfAllImportsFromElements = new ArrayList<MCommand>();
+									for (final MModelFragment fragment : sourceFragments.getFragments()) {
+										final List<MCommand> commandsToImport = new ArrayList<MCommand>();
+										final EObject eObject = (EObject) fragment;
+										final TreeIterator<EObject> eAllContents = eObject.eAllContents();
+										while (eAllContents.hasNext()) {
+											final EObject next = eAllContents.next();
+											final MApplicationElement mApplicationElement = (MApplicationElement) next;
+											if (mApplicationElement instanceof MHandler) {
+												final MHandler mHandler = (MHandler) mApplicationElement;
+												final MCommand command = mHandler.getCommand();
 												commandsToImport.add(command);
-												MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject)command);
+												final MApplicationElement copy = (MApplicationElement) EcoreUtil
+												.copy((EObject) command);
 												targetFragments.getImports().add(copy);
 												mHandler.setCommand((MCommand) copy);
 											}
-											else if(mApplicationElement instanceof MHandledItem){
-												MHandledItem mHandledItem=(MHandledItem)mApplicationElement;
-												MCommand command = mHandledItem.getCommand();
+											else if (mApplicationElement instanceof MHandledItem) {
+												final MHandledItem mHandledItem = (MHandledItem) mApplicationElement;
+												final MCommand command = mHandledItem.getCommand();
 												commandsToImport.add(command);
-												MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject)command);
+												final MApplicationElement copy = (MApplicationElement) EcoreUtil
+												.copy((EObject) command);
 												targetFragments.getImports().add(copy);
 												mHandledItem.setCommand((MCommand) copy);
 											}
 
 										}
 										listOfAllImportsFromElements.addAll(commandsToImport);
-										targetFragments.getFragments().add((MModelFragment) EcoreUtil.copy((EObject) fragment));
+										targetFragments.getFragments().add(
+										(MModelFragment) EcoreUtil.copy((EObject) fragment));
 
 									}
-									for (MApplicationElement element : sourceFragments.getImports()) {
-										boolean isAlreadyImport=true;
-					  					for (MCommand mCommand : listOfAllImportsFromElements) {
+									for (final MApplicationElement element : sourceFragments.getImports()) {
+										boolean isAlreadyImport = true;
+									for (final MCommand mCommand : listOfAllImportsFromElements) {
 
-											if(!mCommand.getElementId().equals(element.getElementId())){
+											if (!mCommand.getElementId().equals(element.getElementId())) {
 
-											    isAlreadyImport=false;
+											isAlreadyImport = false;
 												break;
 											}
-											if(!isAlreadyImport){
+											if (!isAlreadyImport) {
 
-												targetFragments.getImports().add((MApplicationElement) EcoreUtil.copy((EObject)element));
+												targetFragments.getImports().add(
+												(MApplicationElement) EcoreUtil.copy((EObject) element));
 											}
 
 										}
@@ -204,12 +210,12 @@ else if(mApplicationElement instanceof MHandledItem){
 
 							// Save the contents of the resource to the file system.
 							//
-							Map<Object, Object> options = new HashMap<Object, Object>();
+							final Map<Object, Object> options = new HashMap<Object, Object>();
 							resource.save(options);
-							adjustBuildPropertiesFile( modelFile );
-							adjustDependencies( modelFile );
+							adjustBuildPropertiesFile(modelFile);
+							adjustDependencies(modelFile);
 						}
-						catch (Exception exception) {
+						catch (final Exception exception) {
 							throw new RuntimeException(exception);
 						}
 						finally {
@@ -222,17 +228,18 @@ else if(mApplicationElement instanceof MHandledItem){
 
 			// Select the new file resource in the current view.
 			//
-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			final IWorkbenchPage page = workbenchWindow.getActivePage();
 			final IWorkbenchPart activePart = page.getActivePart();
 			if (activePart instanceof ISetSelectionTarget) {
 				final ISelection targetSelection = new StructuredSelection(modelFile);
 				getShell().getDisplay().asyncExec
 					(new Runnable() {
-						 public void run() {
-							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
-						 }
-					 });
+					@Override
+						public void run() {
+						((ISetSelectionTarget) activePart).selectReveal(targetSelection);
+					}
+				});
 			}
 
 			// Open an editor on the new file.
@@ -240,18 +247,16 @@ public void run() {
 			try {
 				page.openEditor
 					(new FileEditorInput(modelFile),
-					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
-			}
-			catch (PartInitException exception) {
+					workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
+			} catch (final PartInitException exception) {
 				MessageDialog.openError(workbenchWindow.getShell(), "Could not init editor", exception.getMessage()); //$NON-NLS-1$
 				return false;
 			}
 
 			return true;
-		}
-		catch (Exception exception) {
+		} catch (final Exception exception) {
 			exception.printStackTrace();
-			MessageDialog.openError(getShell(), "Error", exception.getMessage());
+			MessageDialog.openError(getShell(), Messages.BaseApplicationModelWizard_Error, exception.getMessage());
 			return false;
 		}
 	}
@@ -259,21 +264,20 @@ public void run() {
 	protected abstract EObject createInitialModel();
 
 	protected IFile getModelFile() throws CoreException {
-		String containerName = page.getContainerName();
-		String fileName = page.getFileName();
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		IResource resource = root.findMember(new Path(containerName));
+		final String containerName = page.getContainerName();
+		final String fileName = page.getFileName();
+		final IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+		final IResource resource = root.findMember(new Path(containerName));
 		if (!resource.exists() || !(resource instanceof IContainer)) {
-			throwCoreException("Container \"" + containerName
-					+ "\" does not exist.");
+			throwCoreException("Container \"" + containerName //$NON-NLS-1$
+				+ "\" does not exist."); //$NON-NLS-1$
 		}
-		IContainer container = (IContainer) resource;
+		final IContainer container = (IContainer) resource;
 		return container.getFile(new Path(fileName));
 	}
 
 	private void throwCoreException(String message) throws CoreException {
-		IStatus status = new Status(IStatus.ERROR,
-				"org.eclipse.e4.tools.emf.editor3x", IStatus.OK, message, null);
+		final IStatus status = new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.editor3x", IStatus.OK, message, null); //$NON-NLS-1$
 		throw new CoreException(status);
 	}
 
@@ -283,81 +287,87 @@ private void throwCoreException(String message) throws CoreException {
 	 *
 	 * @see IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
 	 */
+	@Override
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
 		this.workbench = workbench;
 		this.selection = selection;
 	}
+
 	/**
 	 * Adds other file to the build.properties file.
 	 */
 	private void adjustBuildPropertiesFile(IFile file)
-			throws CoreException {
-		IProject project = file.getProject();
-		IFile buildPropertiesFile = PDEProject.getBuildProperties(project);
+		throws CoreException {
+		final IProject project = file.getProject();
+		final IFile buildPropertiesFile = PDEProject.getBuildProperties(project);
 		if (buildPropertiesFile.exists()) {
-			WorkspaceBuildModel model = new WorkspaceBuildModel(buildPropertiesFile);
-			IBuildEntry entry = model.getBuild().getEntry(IBuildEntry.BIN_INCLUDES);
-			String token = file.getProjectRelativePath().toString();
-			if(!entry.contains(token)) entry.addToken(token);
+			final WorkspaceBuildModel model = new WorkspaceBuildModel(buildPropertiesFile);
+			final IBuildEntry entry = model.getBuild().getEntry(IBuildEntry.BIN_INCLUDES);
+			final String token = file.getProjectRelativePath().toString();
+			if (!entry.contains(token)) {
+				entry.addToken(token);
+			}
 			model.save();
 		}
 	}
-	
+
 	/**
 	 * Callback hook to allow for after-file-creation modifications. Default
 	 * implementation does nothing.
-	 * 
+	 *
 	 * @param file
 	 *            the file created by the wizard
 	 */
 	protected void adjustDependencies(IFile file) {
 	}
-	
+
 	/**
 	 * Add the required dependencies (org.eclipse.e4.ui.model.workbench) and
 	 * register fragment.e4xmi at the required extension point
 	 * (org.eclipse.e4.workbench.model)
 	 */
 	protected void adjustFragmentDependencies(IFile file) {
-		IProject project = file.getProject();
-		IFile pluginXml = PDEProject.getPluginXml(project);
-		IFile manifest = PDEProject.getManifest(project);
+		final IProject project = file.getProject();
+		final IFile pluginXml = PDEProject.getPluginXml(project);
+		final IFile manifest = PDEProject.getManifest(project);
 
-		WorkspaceBundlePluginModel fModel = new WorkspaceBundlePluginModel(
-				manifest, pluginXml);
+		final WorkspaceBundlePluginModel fModel = new WorkspaceBundlePluginModel(
+			manifest, pluginXml);
 		try {
 			addWorkbenchDependencyIfRequired(fModel);
 			registerWithExtensionPointIfRequired(project, fModel, file);
-		} catch (CoreException e) {
+		} catch (final CoreException e) {
 			e.printStackTrace();
-			MessageDialog.openError(getShell(), "Error", e.getMessage());
+			MessageDialog.openError(getShell(), Messages.BaseApplicationModelWizard_Error, e.getMessage());
 		}
 	}
-	
+
 	private void addWorkbenchDependencyIfRequired(
-			WorkspaceBundlePluginModel fModel) throws CoreException {
-		IPluginImport[] imports = fModel.getPluginBase().getImports();
+		WorkspaceBundlePluginModel fModel) throws CoreException {
+		final IPluginImport[] imports = fModel.getPluginBase().getImports();
 
 		final String WORKBENCH_IMPORT_ID = "org.eclipse.e4.ui.model.workbench"; //$NON-NLS-1$
 
-		for (IPluginImport iPluginImport : imports) {
-			if (WORKBENCH_IMPORT_ID.equalsIgnoreCase(iPluginImport.getId()))
+		for (final IPluginImport iPluginImport : imports) {
+			if (WORKBENCH_IMPORT_ID.equalsIgnoreCase(iPluginImport.getId())) {
 				return;
+			}
 		}
 
-		String version = "";
-		IPluginModelBase findModel = PluginRegistry
-				.findModel(WORKBENCH_IMPORT_ID);
+		String version = ""; //$NON-NLS-1$
+		final IPluginModelBase findModel = PluginRegistry
+			.findModel(WORKBENCH_IMPORT_ID);
 		if (findModel != null) {
-			BundleDescription bundleDescription = findModel
-					.getBundleDescription();
-			if (bundleDescription != null)
+			final BundleDescription bundleDescription = findModel
+				.getBundleDescription();
+			if (bundleDescription != null) {
 				version = bundleDescription.getVersion().toString()
-						.replaceFirst("\\.qualifier$", "");
+					.replaceFirst("\\.qualifier$", ""); //$NON-NLS-1$ //$NON-NLS-2$
+			}
 		}
 
-		IPluginImport workbenchImport = fModel.getPluginFactory()
-				.createImport();
+		final IPluginImport workbenchImport = fModel.getPluginFactory()
+			.createImport();
 		workbenchImport.setId(WORKBENCH_IMPORT_ID);
 		workbenchImport.setVersion(version);
 		workbenchImport.setMatch(IMatchRules.GREATER_OR_EQUAL);
@@ -370,27 +380,28 @@ private void addWorkbenchDependencyIfRequired(
 	 * extension point, if there is not already a fragment registered.
 	 */
 	private void registerWithExtensionPointIfRequired(IProject project,
-			WorkspaceBundlePluginModel fModel, IFile file) throws CoreException {
-		IPluginExtension[] extensions = fModel.getPluginBase().getExtensions();
+		WorkspaceBundlePluginModel fModel, IFile file) throws CoreException {
+		final IPluginExtension[] extensions = fModel.getPluginBase().getExtensions();
 
 		final String WORKBENCH_MODEL_EP_ID = "org.eclipse.e4.workbench.model"; //$NON-NLS-1$
-		final String FRAGMENT = "fragment";
+		final String FRAGMENT = "fragment"; //$NON-NLS-1$
 
-		for (IPluginExtension iPluginExtension : extensions) {
+		for (final IPluginExtension iPluginExtension : extensions) {
 			if (WORKBENCH_MODEL_EP_ID
-					.equalsIgnoreCase(iPluginExtension.getId())) {
-				IPluginObject[] children = iPluginExtension.getChildren();
-				for (IPluginObject child : children) {
-					if (FRAGMENT.equalsIgnoreCase(child.getName())) //$NON-NLS-1$
+				.equalsIgnoreCase(iPluginExtension.getId())) {
+				final IPluginObject[] children = iPluginExtension.getChildren();
+				for (final IPluginObject child : children) {
+					if (FRAGMENT.equalsIgnoreCase(child.getName())) {
 						return;
+					}
 				}
 			}
 		}
 
-		IPluginExtension extPointFragmentRegister = fModel.getPluginFactory()
-				.createExtension();
-		IPluginElement element = extPointFragmentRegister.getModel()
-				.getFactory().createElement(extPointFragmentRegister);
+		final IPluginExtension extPointFragmentRegister = fModel.getPluginFactory()
+			.createExtension();
+		final IPluginElement element = extPointFragmentRegister.getModel()
+			.getFactory().createElement(extPointFragmentRegister);
 		element.setName(FRAGMENT);
 		element.setAttribute("uri", file.getName()); //$NON-NLS-1$
 		extPointFragmentRegister.setId(project.getName() + "." + FRAGMENT); //$NON-NLS-1$

From 2b812e7ede45b7c49d9ff8e4d495c43ccc399035 Mon Sep 17 00:00:00 2001
From: Simon Scholz <simon.scholz@vogella.com>
Date: Tue, 7 Oct 2014 19:02:21 +0200
Subject: [PATCH 0833/1286] Bug 446194 - The AddonTemplate should use the new
 @EventTopic API

Change-Id: I7b0822f491d3ffe58211b912d972c88c346d852a
Signed-off-by: Simon Scholz <simon.scholz@vogella.com>
---
 .../classes/templates/AddonTemplate.java      |  8 +++---
 .../templates/addon.txtjet                    | 25 +++++++++----------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
index 75bbfcd9b6..0f1e1f6436 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
@@ -1,7 +1,7 @@
 package org.eclipse.e4.internal.tools.wizards.classes.templates;
 
 import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
-@SuppressWarnings("nls")
+
 public class AddonTemplate
 {
   protected static String nl;
@@ -17,8 +17,9 @@ public static synchronized AddonTemplate create(String lineSeparator)
   protected final String TEXT_1 = " ";
   protected final String TEXT_2 = NL + "package ";
   protected final String TEXT_3 = ";";
-  protected final String TEXT_4 = NL + NL + "import javax.inject.Inject;" + NL + "import javax.annotation.PostConstruct;" + NL + "import javax.annotation.PreDestroy;" + NL + "" + NL + "import org.eclipse.e4.core.services.events.IEventBroker;" + NL + "" + NL + "public class ";
-  protected final String TEXT_5 = " {" + NL + "\t@Inject" + NL + "\tIEventBroker eventBroker;" + NL + "\t" + NL + "\t@PostConstruct" + NL + "\tvoid hookListeners() {" + NL + "\t\t// Hook event listeners" + NL + "\t}" + NL + "\t" + NL + "\t@PreDestroy" + NL + "\tvoid unhookListeners() {" + NL + "\t\t// Unhook event listeners" + NL + "\t}" + NL + "}";
+  protected final String TEXT_4 = NL + NL + "import javax.inject.Inject;" + NL + "" + NL + "import org.eclipse.e4.core.di.annotations.Optional;" + NL + "import org.eclipse.e4.core.di.extensions.EventTopic;" + NL + "import org.eclipse.e4.ui.workbench.UIEvents;" + NL + "import org.osgi.service.event.Event;" + NL + "" + NL + "import org.eclipse.e4.core.services.events.IEventBroker;" + NL + "" + NL + "public class ";
+  protected final String TEXT_5 = " {" + NL + "" + NL + "\t@Inject" + NL + "\t@Optional" + NL + "\tpublic void applicationStarted(" + NL + "\t\t\t@EventTopic(UIEvents.UILifeCycle.APP_STARTUP_COMPLETE) Event event) {" + NL + "\t\t// TODO Modify the UIEvents.UILifeCycle.APP_STARTUP_COMPLETE EventTopic to a certain event you want to listen to." + NL + "\t}" + NL + "" + NL + "}";
+  protected final String TEXT_6 = NL;
 
   public String generate(Object argument)
   {
@@ -33,6 +34,7 @@ public String generate(Object argument)
     stringBuffer.append(TEXT_4);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_5);
+    stringBuffer.append(TEXT_6);
     return stringBuffer.toString();
   }
 }
diff --git a/bundles/org.eclipse.e4.tools/templates/addon.txtjet b/bundles/org.eclipse.e4.tools/templates/addon.txtjet
index b980609312..7404b0a00d 100644
--- a/bundles/org.eclipse.e4.tools/templates/addon.txtjet
+++ b/bundles/org.eclipse.e4.tools/templates/addon.txtjet
@@ -5,22 +5,21 @@ package <%= domainClass.getPackageFragment().getElementName() %>;
 <% } %>
 
 import javax.inject.Inject;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.core.di.extensions.EventTopic;
+import org.eclipse.e4.ui.workbench.UIEvents;
+import org.osgi.service.event.Event;
 
 import org.eclipse.e4.core.services.events.IEventBroker;
 
 public class <%= domainClass.getName() %> {
+
 	@Inject
-	IEventBroker eventBroker;
-	
-	@PostConstruct
-	void hookListeners() {
-		// Hook event listeners
+	@Optional
+	public void applicationStarted(
+			@EventTopic(UIEvents.UILifeCycle.APP_STARTUP_COMPLETE) Event event) {
+		// TODO Modify the UIEvents.UILifeCycle.APP_STARTUP_COMPLETE EventTopic to a certain event you want to listen to.
 	}
-	
-	@PreDestroy
-	void unhookListeners() {
-		// Unhook event listeners
-	}
-}
\ No newline at end of file
+
+}

From c8d85c7a28afbaded994ee6a6bf8299ef648db08 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Wed, 8 Oct 2014 10:10:51 +0200
Subject: [PATCH 0834/1286] Bug 444340 - Externalize Strings

---
 .../eclipse/e4/internal/tools/Messages.java   |  13 ++
 .../e4/internal/tools/messages.properties     |  13 ++
 .../model/ExtractContributionModelWizard.java | 129 +++++++++---------
 .../model/NewApplicationModelWizard.java      |  59 ++++----
 .../model/NewContributionModelWizard.java     |   6 +-
 .../tools/wizards/model/NewModelFilePage.java |  97 ++++++-------
 6 files changed, 179 insertions(+), 138 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
index 610b27a425..550169e66d 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
@@ -37,6 +37,7 @@ public class Messages extends NLS {
 	public static String BaseApplicationModelWizard_TheFileAlreadyExists;
 	public static String NewAddonClassWizard_NewAddon;
 	public static String NewAddonClassWizard_NewAddonClass;
+	public static String NewApplicationModelWizard_IncludeDefaultAddons;
 	public static String NewDynamicMenuContributionClassWizard_AboutToShowMethod;
 	public static String NewDynamicMenuContributionClassWizard_CreateNewContribution;
 	public static String NewDynamicMenuContributionClassWizard_NewDynamicContribution;
@@ -44,6 +45,18 @@ public class Messages extends NLS {
 	public static String NewHandlerClassWizard_CreateNewHandler;
 	public static String NewHandlerClassWizard_ExecuteMethod;
 	public static String NewHandlerClassWizard_NewHandler;
+	public static String NewModelFilePage_Browse;
+	public static String NewModelFilePage_Container;
+	public static String NewModelFilePage_FileContainerMustBeSpecified;
+	public static String NewModelFilePage_FileContainerMustExists;
+	public static String NewModelFilePage_FileExtensionMustBeE4XMI;
+	public static String NewModelFilePage_FileName;
+	public static String NewModelFilePage_FileNameMustBeSpecified;
+	public static String NewModelFilePage_FileNameMustBeValid;
+	public static String NewModelFilePage_NewApplicationModel;
+	public static String NewModelFilePage_ProjectMustBeWritable;
+	public static String NewModelFilePage_SelectTheNewContainer;
+	public static String NewModelFilePage_TheWizardCreates;
 	public static String NewPartClassWizard_CreateNewPart;
 	public static String NewPartClassWizard_FocusMethod;
 	public static String NewPartClassWizard_NewPart;
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
index 1c2f1cd3e5..9c51ab9734 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
@@ -16,6 +16,7 @@ BaseApplicationModelWizard_FileExists=File exists
 BaseApplicationModelWizard_TheFileAlreadyExists=The file already exists. 
 NewAddonClassWizard_NewAddon=New Addon
 NewAddonClassWizard_NewAddonClass=Create a new addon class
+NewApplicationModelWizard_IncludeDefaultAddons=Include default addons
 NewDynamicMenuContributionClassWizard_AboutToShowMethod=AboutToShow Method
 NewDynamicMenuContributionClassWizard_CreateNewContribution=Create a new dynamic menu contribution class
 NewDynamicMenuContributionClassWizard_NewDynamicContribution=New Dynamic Menu Contribution
@@ -23,6 +24,18 @@ NewHandlerClassWizard_CanExecuteMethod=Can-Execute Method
 NewHandlerClassWizard_CreateNewHandler=Create a new handler class
 NewHandlerClassWizard_ExecuteMethod=Execute Method
 NewHandlerClassWizard_NewHandler=New Handler
+NewModelFilePage_Browse=Browse...
+NewModelFilePage_Container=&Container:
+NewModelFilePage_FileContainerMustBeSpecified=File container must be specified
+NewModelFilePage_FileContainerMustExists=File container must exist
+NewModelFilePage_FileExtensionMustBeE4XMI=File extension must be "e4xmi"
+NewModelFilePage_FileName=&File name:
+NewModelFilePage_FileNameMustBeSpecified=File name must be specified
+NewModelFilePage_FileNameMustBeValid=File name must be valid
+NewModelFilePage_NewApplicationModel=New application model
+NewModelFilePage_ProjectMustBeWritable=Project must be writable
+NewModelFilePage_SelectTheNewContainer=Select new file container
+NewModelFilePage_TheWizardCreates=This wizard creates a new Eclipse 4 application model
 NewPartClassWizard_CreateNewPart=Create a new part class
 NewPartClassWizard_FocusMethod=Focus Method
 NewPartClassWizard_NewPart=New Part
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
index 98cef782a0..bbbc1b179c 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
@@ -6,12 +6,11 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Sopot Cela <sopotcela@gmail.com> - initial API and implementation
- *     Marco Descher <marco@descher.at> - Bug 434371
+ * Sopot Cela <sopotcela@gmail.com> - initial API and implementation
+ * Marco Descher <marco@descher.at> - Bug 434371
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.model;
 
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -32,93 +31,97 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.ui.PlatformUI;
 
-
 public class ExtractContributionModelWizard extends BaseApplicationModelWizard {
 
-	private List<MApplicationElement> oes= new ArrayList<MApplicationElement>();
+	private final List<MApplicationElement> oes = new ArrayList<MApplicationElement>();
 
-	public ExtractContributionModelWizard(MApplicationElement oe){
+	public ExtractContributionModelWizard(MApplicationElement oe) {
 		super();
 		oes.add(oe);
 	}
 
-	public ExtractContributionModelWizard(List<MApplicationElement> oes){
+	public ExtractContributionModelWizard(List<MApplicationElement> oes) {
 		this.oes.addAll(oes);
 	}
 
-	public ExtractContributionModelWizard(){
+	public ExtractContributionModelWizard() {
 		super();
 	}
 
 	@Override
 	public String getDefaultFileName() {
-		return "fragment.e4xmi";
+		return "fragment.e4xmi"; //$NON-NLS-1$
 	}
-	HashMap<String, MCommand> importCommands=new HashMap<String, MCommand>();
-    public void resolveCommandImports(MApplicationElement moe,MModelFragments mModelFragments){
-    	if (moe instanceof MHandler) {
-
-    		MHandler mhandler = (MHandler) moe;
-    		MCommand command = ((MHandler) moe).getCommand();
-    		MCommand existImportCommand = importCommands.get(command.getElementId());
-    		if(existImportCommand==null){
-    			MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject)command);
-    			mhandler.setCommand((MCommand) copy);
-    			importCommands.put(copy.getElementId(), (MCommand) copy);
+
+	HashMap<String, MCommand> importCommands = new HashMap<String, MCommand>();
+
+	public void resolveCommandImports(MApplicationElement moe, MModelFragments mModelFragments) {
+		if (moe instanceof MHandler) {
+
+			final MHandler mhandler = (MHandler) moe;
+			final MCommand command = ((MHandler) moe).getCommand();
+			final MCommand existImportCommand = importCommands.get(command.getElementId());
+			if (existImportCommand == null) {
+				final MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject) command);
+				mhandler.setCommand((MCommand) copy);
+				importCommands.put(copy.getElementId(), (MCommand) copy);
+				mModelFragments.getImports().add(copy);
+			} else {
+				mhandler.setCommand(existImportCommand);
+			}
+		} else if (moe instanceof MHandledItem) {
+			final MHandledItem mh = (MHandledItem) moe;
+			final MCommand command = mh.getCommand();
+			final MCommand existImportCommand = importCommands.get(command.getElementId());
+			if (existImportCommand == null) {
+				final MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject) command);
+				mh.setCommand((MCommand) copy);
+				importCommands.put(copy.getElementId(), command);
 				mModelFragments.getImports().add(copy);
-    		}else{
-    			mhandler.setCommand(existImportCommand);
-    		}
-    	}else if(moe instanceof MHandledItem){
-    		MHandledItem mh=(MHandledItem) moe;
-    		MCommand command = mh.getCommand();
-    		MCommand existImportCommand = importCommands.get(command.getElementId());
-    		if(existImportCommand==null){
-    			MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject)command);
-    			mh.setCommand((MCommand) copy);
-    			importCommands.put(copy.getElementId(), command);
-    			mModelFragments.getImports().add(copy);
-    		}else{
-    			mh.setCommand(existImportCommand);
-    		}
-    	}
-    }
+			} else {
+				mh.setCommand(existImportCommand);
+			}
+		}
+	}
 
 	@Override
 	protected EObject createInitialModel() {
-		MModelFragments createModelFragments = MFragmentFactory.INSTANCE.createModelFragments();
-		for (MApplicationElement moe : oes) {
-		EObject eObject=(EObject) moe;
-		TreeIterator<EObject> eAllContents = eObject.eAllContents();
-		boolean hasNext = eAllContents.hasNext();
-		if(!hasNext){
-			resolveCommandImports(moe, createModelFragments);
-		}
-		while(hasNext){
-			MApplicationElement next=(MApplicationElement) eAllContents.next();
-			resolveCommandImports(next, createModelFragments);
-			hasNext=eAllContents.hasNext();
-		}
-	    MStringModelFragment createStringModelFragment = MFragmentFactory.INSTANCE.createStringModelFragment();
-		MApplicationElement e = (MApplicationElement) EcoreUtil.copy((EObject) moe);
-		String featurename = ((EObject) moe).eContainmentFeature().getName();
-		createStringModelFragment.setParentElementId(((MApplicationElement) ((EObject) moe).eContainer()).getElementId());
-		createStringModelFragment.getElements().add(e);
-		createStringModelFragment.setFeaturename(featurename);
-
-		createModelFragments.getFragments().add(createStringModelFragment);
+		final MModelFragments createModelFragments = MFragmentFactory.INSTANCE.createModelFragments();
+		for (final MApplicationElement moe : oes) {
+			final EObject eObject = (EObject) moe;
+			final TreeIterator<EObject> eAllContents = eObject.eAllContents();
+			boolean hasNext = eAllContents.hasNext();
+			if (!hasNext) {
+				resolveCommandImports(moe, createModelFragments);
+			}
+			while (hasNext) {
+				final MApplicationElement next = (MApplicationElement) eAllContents.next();
+				resolveCommandImports(next, createModelFragments);
+				hasNext = eAllContents.hasNext();
+			}
+			final MStringModelFragment createStringModelFragment = MFragmentFactory.INSTANCE
+				.createStringModelFragment();
+			final MApplicationElement e = (MApplicationElement) EcoreUtil.copy((EObject) moe);
+			final String featurename = ((EObject) moe).eContainmentFeature().getName();
+			createStringModelFragment.setParentElementId(((MApplicationElement) ((EObject) moe).eContainer())
+				.getElementId());
+			createStringModelFragment.getElements().add(e);
+			createStringModelFragment.setFeaturename(featurename);
+
+			createModelFragments.getFragments().add(createStringModelFragment);
 		}
-		return (EObject)createModelFragments;
+		return (EObject) createModelFragments;
 	}
 
-	public void setup(IProject project){
-		this.init(PlatformUI.getWorkbench(),new StructuredSelection(project));
+	public void setup(IProject project) {
+		init(PlatformUI.getWorkbench(), new StructuredSelection(project));
 	}
+
 	@Override
 	protected NewModelFilePage createWizardPage(ISelection selection) {
-		return new NewModelFilePage(selection,getDefaultFileName());
+		return new NewModelFilePage(selection, getDefaultFileName());
 	}
-	
+
 	@Override
 	protected void adjustDependencies(IFile file) {
 		super.adjustFragmentDependencies(file);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
index f4ab3393d5..3af8280042 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
@@ -6,11 +6,12 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.model;
 
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.ui.model.application.MAddon;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
@@ -21,50 +22,56 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 
-
 public class NewApplicationModelWizard extends BaseApplicationModelWizard {
 
 	@Override
 	public String getDefaultFileName() {
-		return "Application.e4xmi";
+		return "Application.e4xmi"; //$NON-NLS-1$
 	}
-	
+
 	@Override
 	protected EObject createInitialModel() {
-		MApplication application = MApplicationFactory.INSTANCE.createApplication();
+		final MApplication application = MApplicationFactory.INSTANCE.createApplication();
 		try {
-			application.setElementId(getModelFile().getProject().getName() + ".application");
-			if( ((ModelFilePageImpl)getPages()[0]).includeDefaultAddons.getSelection() ) {
-				String[][] addons = { 
-					{ "org.eclipse.e4.core.commands.service", "bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon" },
-					{ "org.eclipse.e4.ui.contexts.service", "bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon" },
-					{ "org.eclipse.e4.ui.bindings.service", "bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon" },
-					{ "org.eclipse.e4.ui.workbench.commands.model", "bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon" },
-					{ "org.eclipse.e4.ui.workbench.contexts.model", "bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon" },
-					{ "org.eclipse.e4.ui.workbench.bindings.model", "bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon" },
-					{ "org.eclipse.e4.ui.workbench.handler.model", "bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon" }
-					
+			application.setElementId(getModelFile().getProject().getName() + ".application"); //$NON-NLS-1$
+			if (((ModelFilePageImpl) getPages()[0]).includeDefaultAddons.getSelection()) {
+				final String[][] addons = {
+					{
+						"org.eclipse.e4.core.commands.service", "bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon" }, //$NON-NLS-1$ //$NON-NLS-2$
+						{
+							"org.eclipse.e4.ui.contexts.service", "bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon" }, //$NON-NLS-1$ //$NON-NLS-2$
+							{
+								"org.eclipse.e4.ui.bindings.service", "bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon" }, //$NON-NLS-1$ //$NON-NLS-2$
+								{
+									"org.eclipse.e4.ui.workbench.commands.model", "bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon" }, //$NON-NLS-1$ //$NON-NLS-2$
+									{
+										"org.eclipse.e4.ui.workbench.contexts.model", "bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon" }, //$NON-NLS-1$ //$NON-NLS-2$
+										{
+											"org.eclipse.e4.ui.workbench.bindings.model", "bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon" }, //$NON-NLS-1$ //$NON-NLS-2$
+											{
+												"org.eclipse.e4.ui.workbench.handler.model", "bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon" } //$NON-NLS-1$ //$NON-NLS-2$
+
 				};
-				
-				for( String[] a : addons ) {
-					MAddon addon = MApplicationFactory.INSTANCE.createAddon();
+
+				for (final String[] a : addons) {
+					final MAddon addon = MApplicationFactory.INSTANCE.createAddon();
 					addon.setElementId(a[0]);
 					addon.setContributionURI(a[1]);
 					application.getAddons().add(addon);
 				}
 			}
-		} catch (CoreException e) {
+		} catch (final CoreException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		return (EObject) application;
 	}
-	
+
 	@Override
 	protected NewModelFilePage createWizardPage(ISelection selection) {
-		return new ModelFilePageImpl(selection,getDefaultFileName());
+		return new ModelFilePageImpl(selection, getDefaultFileName());
 	}
-	
+
 	static class ModelFilePageImpl extends NewModelFilePage {
 
 		private Button includeDefaultAddons;
@@ -76,11 +83,11 @@ public ModelFilePageImpl(ISelection selection, String defaultFilename) {
 		@Override
 		protected void createAdditionalControls(Composite parent) {
 			super.createAdditionalControls(parent);
-			
+
 			new Label(parent, SWT.NONE);
-			
+
 			includeDefaultAddons = new Button(parent, SWT.CHECK);
-			includeDefaultAddons.setText("Include default addons");
+			includeDefaultAddons.setText(Messages.NewApplicationModelWizard_IncludeDefaultAddons);
 			includeDefaultAddons.setSelection(true);
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
index 50d187284b..076f4737aa 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Marco Descher <marco@descher.at> - Bug 392907, Bug 434371
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Marco Descher <marco@descher.at> - Bug 392907, Bug 434371
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.model;
 
@@ -20,7 +20,7 @@ public class NewContributionModelWizard extends BaseApplicationModelWizard {
 
 	@Override
 	public String getDefaultFileName() {
-		return "fragment.e4xmi";
+		return "fragment.e4xmi"; //$NON-NLS-1$
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
index 4533ca4c82..00dc0e1e66 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.model;
 
@@ -14,6 +14,7 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jface.dialogs.IDialogPage;
@@ -45,19 +46,18 @@ public class NewModelFilePage extends WizardPage {
 
 	private Text fileText;
 
-	private ISelection selection;
-	
-	private String defaultFilename;
+	private final ISelection selection;
+
+	private final String defaultFilename;
 
 	/**
 	 * Constructor for SampleNewWizardPage.
-	 * 
-	 * @param pageName
+	 *
 	 */
 	public NewModelFilePage(ISelection selection, String defaultFilename) {
-		super("wizardPage");
-		setTitle("New application model");
-		setDescription("This wizard creates a new Eclipse 4 application model");
+		super("wizardPage"); //$NON-NLS-1$
+		setTitle(Messages.NewModelFilePage_NewApplicationModel);
+		setDescription(Messages.NewModelFilePage_TheWizardCreates);
 		this.selection = selection;
 		this.defaultFilename = defaultFilename;
 	}
@@ -65,26 +65,28 @@ public NewModelFilePage(ISelection selection, String defaultFilename) {
 	/**
 	 * @see IDialogPage#createControl(Composite)
 	 */
+	@Override
 	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
+		final Composite container = new Composite(parent, SWT.NULL);
+		final GridLayout layout = new GridLayout();
 		container.setLayout(layout);
 		layout.numColumns = 3;
 		layout.verticalSpacing = 9;
 		Label label = new Label(container, SWT.NULL);
-		label.setText("&Container:");
+		label.setText(Messages.NewModelFilePage_Container);
 
 		containerText = new Text(container, SWT.BORDER | SWT.SINGLE);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		containerText.setLayoutData(gd);
 		containerText.addModifyListener(new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				dialogChanged();
 			}
 		});
 
-		Button button = new Button(container, SWT.PUSH);
-		button.setText("Browse...");
+		final Button button = new Button(container, SWT.PUSH);
+		button.setText(Messages.NewModelFilePage_Browse);
 		button.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -92,19 +94,20 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 		label = new Label(container, SWT.NULL);
-		label.setText("&File name:");
+		label.setText(Messages.NewModelFilePage_FileName);
 
 		fileText = new Text(container, SWT.BORDER | SWT.SINGLE);
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		fileText.setLayoutData(gd);
 		fileText.addModifyListener(new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				dialogChanged();
 			}
 		});
-		
+
 		new Label(container, SWT.NONE);
-		
+
 		createAdditionalControls(container);
 		initialize();
 		dialogChanged();
@@ -112,33 +115,35 @@ public void modifyText(ModifyEvent e) {
 	}
 
 	protected void createAdditionalControls(Composite parent) {
-		
+
 	}
-	
+
 	/**
 	 * Tests if the current workbench selection is a suitable container to use.
 	 */
 
 	private void initialize() {
 		if (selection != null && selection.isEmpty() == false
-				&& selection instanceof IStructuredSelection) {
-			IStructuredSelection ssel = (IStructuredSelection) selection;
-			if (ssel.size() > 1)
+			&& selection instanceof IStructuredSelection) {
+			final IStructuredSelection ssel = (IStructuredSelection) selection;
+			if (ssel.size() > 1) {
 				return;
-			Object obj = ssel.getFirstElement();
-			
+			}
+			final Object obj = ssel.getFirstElement();
+
 			if (obj instanceof IResource) {
 				IContainer container;
-				if (obj instanceof IContainer)
+				if (obj instanceof IContainer) {
 					container = (IContainer) obj;
-				else
+				} else {
 					container = ((IResource) obj).getParent();
+				}
 				containerText.setText(container.getFullPath().toString());
-			} else if( obj instanceof IJavaProject ) {
-				IJavaProject container = (IJavaProject) obj;
+			} else if (obj instanceof IJavaProject) {
+				final IJavaProject container = (IJavaProject) obj;
 				try {
 					containerText.setText(container.getCorrespondingResource().getFullPath().toString());
-				} catch(JavaModelException e) {
+				} catch (final JavaModelException e) {
 					e.printStackTrace();
 				}
 			}
@@ -152,11 +157,11 @@ private void initialize() {
 	 */
 
 	private void handleBrowse() {
-		ContainerSelectionDialog dialog = new ContainerSelectionDialog(
-				getShell(), ResourcesPlugin.getWorkspace().getRoot(), false,
-				"Select new file container");
+		final ContainerSelectionDialog dialog = new ContainerSelectionDialog(
+			getShell(), ResourcesPlugin.getWorkspace().getRoot(), false,
+			Messages.NewModelFilePage_SelectTheNewContainer);
 		if (dialog.open() == Window.OK) {
-			Object[] result = dialog.getResult();
+			final Object[] result = dialog.getResult();
 			if (result.length == 1) {
 				containerText.setText(((Path) result[0]).toString());
 			}
@@ -168,36 +173,36 @@ private void handleBrowse() {
 	 */
 
 	private void dialogChanged() {
-		IResource container = ResourcesPlugin.getWorkspace().getRoot()
-				.findMember(new Path(getContainerName()));
-		String fileName = getFileName();
+		final IResource container = ResourcesPlugin.getWorkspace().getRoot()
+			.findMember(new Path(getContainerName()));
+		final String fileName = getFileName();
 
 		if (getContainerName().length() == 0) {
-			updateStatus("File container must be specified");
+			updateStatus(Messages.NewModelFilePage_FileContainerMustBeSpecified);
 			return;
 		}
 		if (container == null
-				|| (container.getType() & (IResource.PROJECT | IResource.FOLDER)) == 0) {
-			updateStatus("File container must exist");
+			|| (container.getType() & (IResource.PROJECT | IResource.FOLDER)) == 0) {
+			updateStatus(Messages.NewModelFilePage_FileContainerMustExists);
 			return;
 		}
 		if (!container.isAccessible()) {
-			updateStatus("Project must be writable");
+			updateStatus(Messages.NewModelFilePage_ProjectMustBeWritable);
 			return;
 		}
 		if (fileName.length() == 0) {
-			updateStatus("File name must be specified");
+			updateStatus(Messages.NewModelFilePage_FileNameMustBeSpecified);
 			return;
 		}
 		if (fileName.replace('\\', '/').indexOf('/', 1) > 0) {
-			updateStatus("File name must be valid");
+			updateStatus(Messages.NewModelFilePage_FileNameMustBeValid);
 			return;
 		}
-		int dotLoc = fileName.lastIndexOf('.');
+		final int dotLoc = fileName.lastIndexOf('.');
 		if (dotLoc != -1) {
-			String ext = fileName.substring(dotLoc + 1);
-			if (ext.equalsIgnoreCase("e4xmi") == false) {
-				updateStatus("File extension must be \"e4xmi\"");
+			final String ext = fileName.substring(dotLoc + 1);
+			if (ext.equalsIgnoreCase("e4xmi") == false) { //$NON-NLS-1$
+				updateStatus(Messages.NewModelFilePage_FileExtensionMustBeE4XMI);
 				return;
 			}
 		}

From fdd290c970b6e69ce72426ebe0545d80b88fa321 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Thu, 9 Oct 2014 17:39:26 +0200
Subject: [PATCH 0835/1286] Bug 444340 - Externalize Strings

---
 .../eclipse/e4/internal/tools/Messages.java   |  14 +-
 .../e4/internal/tools/messages.properties     |  10 +
 .../wizards/project/E4NewProjectWizard.java   | 632 +++++++++---------
 .../project/LifeCycleClassCodeGenerator.java  |  75 ++-
 .../project/NewApplicationWizardPage.java     | 194 +++---
 5 files changed, 482 insertions(+), 443 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
index 550169e66d..4b568bcb9e 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the 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:
  * Jonas - initial API and implementation
  ******************************************************************************/
@@ -67,6 +67,16 @@ public class Messages extends NLS {
 	public static String NewToolControlClassWizard_CreateGUIMethod;
 	public static String NewToolControlClassWizard_CreateNewToolControl;
 	public static String NewToolControlClassWizard_NewToolControl;
+	public static String E4NewProjectWizard_About;
+	public static String E4NewProjectWizard_File;
+	public static String E4NewProjectWizard_Help;
+	public static String E4NewProjectWizard_InDialogs;
+	public static String E4NewProjectWizard_InDialogsAndWindows;
+	public static String E4NewProjectWizard_InWindows;
+	public static String E4NewProjectWizard_Open;
+	public static String E4NewProjectWizard_Quit;
+	public static String E4NewProjectWizard_SamplePart;
+	public static String E4NewProjectWizard_Save;
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
index 9c51ab9734..5299e7d2c0 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
@@ -14,6 +14,16 @@ BaseApplicationModelWizard_AddExtractedNode=Would you like to add the extracted
 BaseApplicationModelWizard_Error=Error
 BaseApplicationModelWizard_FileExists=File exists
 BaseApplicationModelWizard_TheFileAlreadyExists=The file already exists. 
+E4NewProjectWizard_About=About
+E4NewProjectWizard_File=File
+E4NewProjectWizard_Help=Help
+E4NewProjectWizard_InDialogs=In Dialogs
+E4NewProjectWizard_InDialogsAndWindows=In Dialog and Windows
+E4NewProjectWizard_InWindows=In Windows
+E4NewProjectWizard_Open=Open
+E4NewProjectWizard_Quit=Quit
+E4NewProjectWizard_SamplePart=Sample Part
+E4NewProjectWizard_Save=Save
 NewAddonClassWizard_NewAddon=New Addon
 NewAddonClassWizard_NewAddonClass=Create a new addon class
 NewApplicationModelWizard_IncludeDefaultAddons=Include default addons
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 355302a09f..990998534f 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -6,12 +6,12 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Soyatec - initial API and implementation
- *     IBM Corporation - ongoing enhancements
- *     Sopot Cela - ongoing enhancements
- *     Lars Vogel - ongoing enhancements
- *     Wim Jongman - ongoing enhancements
- *     Steven Spungin - ongoing enhancements, Bug 438591
+ * Soyatec - initial API and implementation
+ * IBM Corporation - ongoing enhancements
+ * Sopot Cela - ongoing enhancements
+ * Lars Vogel - ongoing enhancements
+ * Wim Jongman - ongoing enhancements
+ * Steven Spungin - ongoing enhancements, Bug 438591
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -37,6 +37,7 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.ui.model.application.MAddon;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
@@ -87,7 +88,6 @@
 import org.eclipse.pde.internal.core.project.PDEProject;
 import org.eclipse.pde.internal.core.util.CoreUtility;
 import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
 import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
 import org.eclipse.pde.internal.ui.wizards.plugin.NewPluginProjectWizard;
 import org.eclipse.pde.internal.ui.wizards.plugin.NewProjectCreationOperation;
@@ -107,12 +107,17 @@
 /**
  * @author jin.liu (jin.liu@soyatec.com)
  */
+@SuppressWarnings("restriction")
 public class E4NewProjectWizard extends NewPluginProjectWizard {
 
-	private static final String PLUGIN_XML = "plugin.xml";
-	private static final String MODEL_EDITOR_ID = "org.eclipse.e4.tools.emf.editor3x.e4wbm";
-	private static final String APPLICATION_MODEL = "Application.e4xmi";
-	private PluginFieldData fPluginData;
+	private static final String NAME = "name"; //$NON-NLS-1$
+	private static final String APPLICATION = "application"; //$NON-NLS-1$
+	private static final String PRODUCT = "product"; //$NON-NLS-1$
+	private static final String TRUE = "TRUE"; //$NON-NLS-1$
+	private static final String PLUGIN_XML = "plugin.xml"; //$NON-NLS-1$
+	private static final String MODEL_EDITOR_ID = "org.eclipse.e4.tools.emf.editor3x.e4wbm"; //$NON-NLS-1$
+	private static final String APPLICATION_MODEL = "Application.e4xmi"; //$NON-NLS-1$
+	private final PluginFieldData fPluginData;
 	private NewApplicationWizardPage fApplicationPage;
 	private IProjectProvider fProjectProvider;
 	private PluginContentPage fContentPage;
@@ -124,46 +129,47 @@ public E4NewProjectWizard() {
 
 	@Override
 	public void addPages() {
-		fMainPage = new E4NewProjectWizardPage(
-				"main", fPluginData, false, getSelection()); //$NON-NLS-1$
-		fMainPage.setTitle(PDEUIMessages.NewProjectWizard_MainPage_title);
-		fMainPage.setDescription(PDEUIMessages.NewProjectWizard_MainPage_desc);
-		String pname = getDefaultValue(DEF_PROJECT_NAME);
-		if (pname != null)
+		fMainPage = new E4NewProjectWizardPage("main", fPluginData, false, getSelection()); //$NON-NLS-1$
+		fMainPage.setTitle(""); //$NON-NLS-1$
+		fMainPage.setDescription(""); //$NON-NLS-1$
+		final String pname = getDefaultValue(DEF_PROJECT_NAME);
+		if (pname != null) {
 			fMainPage.setInitialProjectName(pname);
+		}
 		addPage(fMainPage);
 
 		fProjectProvider = new IProjectProvider() {
+			@Override
 			public String getProjectName() {
 				return fMainPage.getProjectName();
 			}
 
+			@Override
 			public IProject getProject() {
 				return fMainPage.getProjectHandle();
 			}
 
+			@Override
 			public IPath getLocationPath() {
 				return fMainPage.getLocationPath();
 			}
 		};
 
-		fContentPage = new PluginContentPage(
-				"page2", fProjectProvider, fMainPage, fPluginData); //$NON-NLS-1$
+		fContentPage = new PluginContentPage("page2", fProjectProvider, fMainPage, fPluginData); //$NON-NLS-1$
 
 		fApplicationPage = new NewApplicationWizardPage(fProjectProvider,
-				fPluginData);
+			fPluginData);
 
 		addPage(fContentPage);
 		addPage(fApplicationPage);
 	}
 
 	@Override
-	@SuppressWarnings("restriction")
 	public boolean performFinish() {
 		try {
 			fMainPage.updateData();
 			fContentPage.updateData();
-			IDialogSettings settings = getDialogSettings();
+			final IDialogSettings settings = getDialogSettings();
 			if (settings != null) {
 				fMainPage.saveSettings(settings);
 				fContentPage.saveSettings(settings);
@@ -171,31 +177,32 @@ public boolean performFinish() {
 
 			// Create the project
 			getContainer().run(
-					false,
-					true,
-					new NewProjectCreationOperation(fPluginData,
-							fProjectProvider, new ContentWizard()) {
-						private WorkspacePluginModelBase model;
-
-						@Override
-						protected void setPluginLibraries(
-								WorkspacePluginModelBase model)
-								throws CoreException {
-							this.model = model;
-							super.setPluginLibraries(model);
-						}
-					});
+				false,
+				true,
+				new NewProjectCreationOperation(fPluginData,
+					fProjectProvider, new ContentWizard()) {
+					private WorkspacePluginModelBase model;
+
+					@Override
+					protected void setPluginLibraries(
+						WorkspacePluginModelBase model)
+						throws CoreException {
+						this.model = model;
+						super.setPluginLibraries(model);
+					}
+				});
 
 			// Add Project to working set
-			IWorkingSet[] workingSets = fMainPage.getSelectedWorkingSets();
-			if (workingSets.length > 0)
+			final IWorkingSet[] workingSets = fMainPage.getSelectedWorkingSets();
+			if (workingSets.length > 0) {
 				getWorkbench().getWorkingSetManager().addToWorkingSets(
-						fProjectProvider.getProject(), workingSets);
+					fProjectProvider.getProject(), workingSets);
+			}
 
-			this.createProductsExtension(fProjectProvider.getProject());
+			createProductsExtension(fProjectProvider.getProject());
 
-			this.createApplicationResources(fProjectProvider.getProject(),
-					new NullProgressMonitor());
+			createApplicationResources(fProjectProvider.getProject(),
+				new NullProgressMonitor());
 
 			// Add the resources to build.properties
 			adjustBuildPropertiesFile(fProjectProvider.getProject());
@@ -204,10 +211,10 @@ protected void setPluginLibraries(
 			openEditorForApplicationModel();
 
 			return true;
-		} catch (InvocationTargetException e) {
+		} catch (final InvocationTargetException e) {
 			PDEPlugin.logException(e);
-		} catch (InterruptedException e) {
-		} catch (CoreException e) {
+		} catch (final InterruptedException e) {
+		} catch (final CoreException e) {
 			PDEPlugin.logException(e);
 		}
 		return false;
@@ -215,32 +222,32 @@ protected void setPluginLibraries(
 
 	/**
 	 * Opens the model editor after the project was created.
-	 * 
+	 *
 	 * @throws PartInitException
 	 */
 	private void openEditorForApplicationModel() throws PartInitException {
-		IFile file = fProjectProvider.getProject().getFile(APPLICATION_MODEL);
+		final IFile file = fProjectProvider.getProject().getFile(APPLICATION_MODEL);
 		if (file != null) {
-			FileEditorInput input = new FileEditorInput(file);
-			IWorkbenchWindow window = PlatformUI.getWorkbench()
-					.getActiveWorkbenchWindow();
-			IWorkbenchPage page = window.getActivePage();
+			final FileEditorInput input = new FileEditorInput(file);
+			final IWorkbenchWindow window = PlatformUI.getWorkbench()
+				.getActiveWorkbenchWindow();
+			final IWorkbenchPage page = window.getActivePage();
 			page.openEditor(input, MODEL_EDITOR_ID);
 		}
 	}
 
 	/**
 	 * Adds other resources to the build.properties file.
-	 * 
+	 *
 	 * @param project
 	 * @throws CoreException
 	 */
 	private void adjustBuildPropertiesFile(IProject project)
-			throws CoreException {
-		IFile file = PDEProject.getBuildProperties(project);
+		throws CoreException {
+		final IFile file = PDEProject.getBuildProperties(project);
 		if (file.exists()) {
-			WorkspaceBuildModel model = new WorkspaceBuildModel(file);
-			IBuildEntry e = model.getBuild().getEntry(IBuildEntry.BIN_INCLUDES);
+			final WorkspaceBuildModel model = new WorkspaceBuildModel(file);
+			final IBuildEntry e = model.getBuild().getEntry(IBuildEntry.BIN_INCLUDES);
 
 			e.addToken(PLUGIN_XML);
 			e.addToken(APPLICATION_MODEL);
@@ -249,12 +256,12 @@ private void adjustBuildPropertiesFile(IProject project)
 			// it seems appropriate to only add it if it contains
 			// some content
 			if (!isMinimalist) {
-				e.addToken("icons/");
+				e.addToken("icons/"); //$NON-NLS-1$
 			}
 
-			Map<String, String> map = fApplicationPage.getData();
-			String cssEntry = map
-					.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
+			final Map<String, String> map = fApplicationPage.getData();
+			final String cssEntry = map
+				.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
 			if (cssEntry != null) {
 				e.addToken(cssEntry);
 			}
@@ -265,89 +272,89 @@ private void adjustBuildPropertiesFile(IProject project)
 
 	/**
 	 * create products extension detail
-	 * 
+	 *
 	 * @param project
 	 */
-	@SuppressWarnings("restriction")
 	public void createProductsExtension(IProject project) {
-		Map<String, String> map = fApplicationPage.getData();
+		final Map<String, String> map = fApplicationPage.getData();
 		if (map == null
-				|| map.get(NewApplicationWizardPage.PRODUCT_NAME) == null)
+			|| map.get(NewApplicationWizardPage.PRODUCT_NAME) == null) {
 			return;
+		}
 
-		WorkspacePluginModelBase fmodel = new WorkspaceBundlePluginModel(
-				project.getFile(ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR),
-				project.getFile(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR));
-		IPluginExtension extension = fmodel.getFactory().createExtension();
+		final WorkspacePluginModelBase fmodel = new WorkspaceBundlePluginModel(
+			project.getFile(ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR),
+			project.getFile(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR));
+		final IPluginExtension extension = fmodel.getFactory().createExtension();
 		try {
-			String productName = map.get(NewApplicationWizardPage.PRODUCT_NAME);
-			String applicationName = map
-					.get(NewApplicationWizardPage.APPLICATION);
+			final String productName = map.get(NewApplicationWizardPage.PRODUCT_NAME);
+			final String applicationName = map
+				.get(NewApplicationWizardPage.APPLICATION);
 
 			String cssValue = map
-					.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
+				.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
 			if (cssValue != null) {
-				cssValue = "platform:/plugin/" + fPluginData.getId() + "/"
-						+ cssValue;
+				cssValue = "platform:/plugin/" + fPluginData.getId() + "/" //$NON-NLS-1$ //$NON-NLS-2$
+					+ cssValue;
 				map.put(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY,
-						cssValue);
+					cssValue);
 			}
 
-			if ("TRUE".equals(map.get(NewApplicationWizardPage.generateLifecycle))){
+			if (TRUE.equals(map.get(NewApplicationWizardPage.generateLifecycle))) {
 				String lifeCycleValue = map
-						.get(NewApplicationWizardPage.generateLifecycleName);
+					.get(NewApplicationWizardPage.generateLifecycleName);
 				if (lifeCycleValue != null && lifeCycleValue.isEmpty() == false) {
-					lifeCycleValue = "bundleclass://" + fPluginData.getId() + "/"
-							+ fPluginData.getId().toLowerCase() + "." + lifeCycleValue;
+					lifeCycleValue = "bundleclass://" + fPluginData.getId() + "/" //$NON-NLS-1$ //$NON-NLS-2$
+						+ fPluginData.getId().toLowerCase() + "." + lifeCycleValue; //$NON-NLS-1$
 					map.put(NewApplicationWizardPage.LIFECYCLE_URI_PROPERTY,
-							lifeCycleValue);
+						lifeCycleValue);
 				}
 			}
 
-			extension.setPoint("org.eclipse.core.runtime.products");
-			extension.setId("product");
-			IPluginElement productElement = fmodel.getFactory().createElement(
-					extension);
+			extension.setPoint("org.eclipse.core.runtime.products"); //$NON-NLS-1$
+			extension.setId(PRODUCT);
+			final IPluginElement productElement = fmodel.getFactory().createElement(
+				extension);
 
-			productElement.setName("product");
+			productElement.setName(PRODUCT);
 			if (applicationName != null) {
-				productElement.setAttribute("application", applicationName);
+				productElement.setAttribute(APPLICATION, applicationName);
 			} else {
-				productElement.setAttribute("application",
-						NewApplicationWizardPage.E4_APPLICATION);
+				productElement.setAttribute(APPLICATION,
+					NewApplicationWizardPage.E4_APPLICATION);
 			}
-			productElement.setAttribute("name", productName);
+			productElement.setAttribute(NAME, productName);
 
-			Set<Entry<String, String>> set = map.entrySet();
+			final Set<Entry<String, String>> set = map.entrySet();
 			if (set != null) {
-				Iterator<Entry<String, String>> it = set.iterator();
+				final Iterator<Entry<String, String>> it = set.iterator();
 				if (it != null) {
 					while (it.hasNext()) {
-						Entry<String, String> entry = it.next();
-						String value = entry.getValue();
+						final Entry<String, String> entry = it.next();
+						final String value = entry.getValue();
 						if (value == null || value.trim().length() == 0) {
 							continue;
 						}
 
 						if (entry.getKey().equals(
-								NewApplicationWizardPage.PRODUCT_NAME)
-								|| entry.getKey().equals(
-										NewApplicationWizardPage.APPLICATION)
-								|| entry.getKey().equals(
-										NewApplicationWizardPage.richSample)
-								|| entry.getKey().equals(
-												NewApplicationWizardPage.generateLifecycle)
-								|| entry.getKey().equals(
-												NewApplicationWizardPage.generateLifecycleName)
-								|| entry.getKey()
-										.equals(NewApplicationWizardPage.CLEAR_PERSISTED_STATE)) {
+							NewApplicationWizardPage.PRODUCT_NAME)
+							|| entry.getKey().equals(
+								NewApplicationWizardPage.APPLICATION)
+							|| entry.getKey().equals(
+								NewApplicationWizardPage.richSample)
+							|| entry.getKey().equals(
+								NewApplicationWizardPage.generateLifecycle)
+							|| entry.getKey().equals(
+								NewApplicationWizardPage.generateLifecycleName)
+							|| entry.getKey()
+								.equals(NewApplicationWizardPage.CLEAR_PERSISTED_STATE)) {
 							continue;
 						}
-						IPluginElement element = fmodel.getFactory()
-								.createElement(productElement);
-						element.setName("property");
-						element.setAttribute("name", entry.getKey());
-						element.setAttribute("value", value);
+						final IPluginElement element = fmodel.getFactory()
+							.createElement(productElement);
+						element.setName("property"); //$NON-NLS-1$
+						element.setAttribute(NAME, entry.getKey());
+						element.setAttribute("value", value); //$NON-NLS-1$
 						productElement.add(element);
 					}
 				}
@@ -356,211 +363,220 @@ public void createProductsExtension(IProject project) {
 			fmodel.getPluginBase().add(extension);
 			fmodel.save();
 
-		} catch (CoreException e) {
+		} catch (final CoreException e) {
 			PDEPlugin.logException(e);
 		}
 	}
 
 	/**
 	 * create products extension detail
-	 * 
+	 *
 	 * @param project
 	 */
-	@SuppressWarnings("restriction")
 	public void createApplicationResources(IProject project,
-			IProgressMonitor monitor) {
-		Map<String, String> map = fApplicationPage.getData();
+		IProgressMonitor monitor) {
+		final Map<String, String> map = fApplicationPage.getData();
 		isMinimalist = !map.get(NewApplicationWizardPage.richSample)
-				.equalsIgnoreCase("TRUE");
+			.equalsIgnoreCase(TRUE);
 		if (map == null
-				|| map.get(NewApplicationWizardPage.PRODUCT_NAME) == null)
+			|| map.get(NewApplicationWizardPage.PRODUCT_NAME) == null) {
 			return;
+		}
 
 		// If the project has invalid characters, the plug-in name would replace
 		// them with underscores, product name does the same
-		String pluginName = fPluginData.getId();
-		
-		// BEGIN Generate E4Lifecycle class with annotations	
-		boolean lifeCycleCreated = "TRUE".equals(map.get(NewApplicationWizardPage.generateLifecycle));
-		if (lifeCycleCreated){
-			String classname = fPluginData.getId() + "." + map.get(NewApplicationWizardPage.generateLifecycleName);
-			LifeCycleClassCodeGenerator fGenerator = new LifeCycleClassCodeGenerator(project, classname, fPluginData, false, getContainer());
+		final String pluginName = fPluginData.getId();
+
+		// BEGIN Generate E4Lifecycle class with annotations
+		final boolean lifeCycleCreated = TRUE.equals(map.get(NewApplicationWizardPage.generateLifecycle));
+		if (lifeCycleCreated) {
+			final String classname = fPluginData.getId() + "." //$NON-NLS-1$
+				+ map.get(NewApplicationWizardPage.generateLifecycleName);
+			final LifeCycleClassCodeGenerator fGenerator = new LifeCycleClassCodeGenerator(project, classname,
+				fPluginData, false, getContainer());
 			try {
 				fGenerator.generate(new NullProgressMonitor());
-			} catch (CoreException e2) {
+			} catch (final CoreException e2) {
 				e2.printStackTrace();
 			}
 		}
 		// END Generate E4Lifecycle class with annotations
-		
+
 		// If there's no Activator or LifeCycle created we create default package
 		if (!fPluginData.doGenerateClass() && !lifeCycleCreated) {
-			String packageName = fPluginData.getId();
+			final String packageName = fPluginData.getId();
 			IPath path = new Path(packageName.replace('.', '/'));
-			if (fPluginData.getSourceFolderName().trim().length() > 0)
+			if (fPluginData.getSourceFolderName().trim().length() > 0) {
 				path = new Path(fPluginData.getSourceFolderName()).append(path);
+			}
 
 			try {
 				CoreUtility.createFolder(project.getFolder(path));
-			} catch (CoreException e) {
+			} catch (final CoreException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 		}
 
-		IJavaProject javaProject = JavaCore.create(project);
+		final IJavaProject javaProject = JavaCore.create(project);
 		IPackageFragment fragment = null;
 
 		try {
-			for (IPackageFragment element : javaProject.getPackageFragments()) {
+			for (final IPackageFragment element : javaProject.getPackageFragments()) {
 				if (element.getKind() == IPackageFragmentRoot.K_SOURCE) {
 					fragment = element;
 				}
 			}
-		} catch (JavaModelException e1) {
+		} catch (final JavaModelException e1) {
 			e1.printStackTrace();
 		}
 
 		createApplicationModel(project, pluginName, fragment);
 
-		String cssPath = map
-				.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
+		final String cssPath = map
+			.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
 		if (cssPath != null && cssPath.trim().length() > 0) {
-			IFile file = project.getFile(cssPath);
+			final IFile file = project.getFile(cssPath);
 
 			try {
 				prepareFolder(file.getParent(), monitor);
 
-				URL corePath = ResourceLocator
-						.getProjectTemplateFiles("css/default.css");
+				final URL corePath = ResourceLocator
+					.getProjectTemplateFiles("css/default.css"); //$NON-NLS-1$
 				file.create(corePath.openStream(), true, monitor);
-			} catch (Exception e) {
+			} catch (final Exception e) {
 				PDEPlugin.logException(e);
 			}
 		}
 
-		String template_id = "common";
-		Set<String> binaryExtentions = new HashSet<String>();
-		binaryExtentions.add(".gif");
-		binaryExtentions.add(".png");
-
-		Map<String, String> keys = new HashMap<String, String>();
-		keys.put("projectName", pluginName);
-		keys.put("productFileName",
-				map.get(NewApplicationWizardPage.PRODUCT_NAME));
-		String elementName = fragment.getElementName();
-		keys.put("packageName", (elementName.equals("") ? "" : elementName
-				+ ".")
-				+ "handlers");
-		keys.put("packageName2", (elementName.equals("") ? "" : elementName
-				+ ".")
-				+ "parts");
-		keys.put(
-				"programArgs",
-				"true".equalsIgnoreCase(map
-						.get(NewApplicationWizardPage.CLEAR_PERSISTED_STATE)) ? "-clearPersistedState"
-						: "");
+		final String template_id = "common"; //$NON-NLS-1$
+		final Set<String> binaryExtentions = new HashSet<String>();
+		binaryExtentions.add(".gif"); //$NON-NLS-1$
+		binaryExtentions.add(".png"); //$NON-NLS-1$
+
+		final Map<String, String> keys = new HashMap<String, String>();
+		keys.put("projectName", pluginName); //$NON-NLS-1$
+		keys.put("productFileName", //$NON-NLS-1$
+			map.get(NewApplicationWizardPage.PRODUCT_NAME));
+		final String elementName = fragment.getElementName();
+		keys.put("packageName", (elementName.equals("") ? "" : elementName //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			+ ".") //$NON-NLS-1$
+			+ "handlers"); //$NON-NLS-1$
+		keys.put("packageName2", (elementName.equals("") ? "" : elementName //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			+ ".") //$NON-NLS-1$
+			+ "parts"); //$NON-NLS-1$
+		keys.put("programArgs", //$NON-NLS-1$
+			"true".equalsIgnoreCase(map //$NON-NLS-1$
+				.get(NewApplicationWizardPage.CLEAR_PERSISTED_STATE)) ? "-clearPersistedState" //$NON-NLS-1$
+				: ""); //$NON-NLS-1$
 		try {
-			URL corePath = ResourceLocator.getProjectTemplateFiles(template_id);
-			IRunnableWithProgress op = new TemplateOperation(corePath, project,
-					keys, binaryExtentions, isMinimalist);
+			final URL corePath = ResourceLocator.getProjectTemplateFiles(template_id);
+			final IRunnableWithProgress op = new TemplateOperation(corePath, project,
+				keys, binaryExtentions, isMinimalist);
 			getContainer().run(false, true, op);
-		} catch (Exception e) {
+		} catch (final Exception e) {
 			PDEPlugin.logException(e);
 		}
 		if (!isMinimalist) {
 			try {
-				URL corePath = ResourceLocator.getProjectTemplateFiles("src");
-				IRunnableWithProgress op = new TemplateOperation(corePath,
-						(IContainer) fragment.getResource(), keys,
-						binaryExtentions, isMinimalist);
+				final URL corePath = ResourceLocator.getProjectTemplateFiles("src"); //$NON-NLS-1$
+				final IRunnableWithProgress op = new TemplateOperation(corePath,
+					(IContainer) fragment.getResource(), keys,
+					binaryExtentions, isMinimalist);
 				getContainer().run(false, true, op);
-			} catch (Exception e) {
+			} catch (final Exception e) {
 				PDEPlugin.logException(e);
 			}
 		}
 	}
 
 	private void createApplicationModel(IProject project, String pluginName,
-			IPackageFragment fragment) {
-		Map<String, String> map = fApplicationPage.getData();
-		boolean isMinimalist = !map.get(NewApplicationWizardPage.richSample)
-				.equalsIgnoreCase("TRUE");
+		IPackageFragment fragment) {
+		final Map<String, String> map = fApplicationPage.getData();
+		final boolean isMinimalist = !map.get(NewApplicationWizardPage.richSample)
+			.equalsIgnoreCase(TRUE);
 		if (APPLICATION_MODEL != null && APPLICATION_MODEL.trim().length() > 0) {
 
 			// Create a resource set
 			//
-			ResourceSet resourceSet = new ResourceSetImpl();
+			final ResourceSet resourceSet = new ResourceSetImpl();
 
 			// Get the URI of the model file.
 			//
-			URI fileURI = URI.createPlatformResourceURI(project.getName() + "/"
-					+ APPLICATION_MODEL, true);
+			final URI fileURI = URI.createPlatformResourceURI(project.getName() + "/" //$NON-NLS-1$
+				+ APPLICATION_MODEL, true);
 
 			// Create a resource for this file.
 			//
-			Resource resource = resourceSet.createResource(fileURI);
+			final Resource resource = resourceSet.createResource(fileURI);
 
-			MApplication application = MApplicationFactory.INSTANCE
-					.createApplication();
+			final MApplication application = MApplicationFactory.INSTANCE
+				.createApplication();
 
-			application.setElementId("org.eclipse.e4.ide.application");
+			application.setElementId("org.eclipse.e4.ide.application"); //$NON-NLS-1$
 
 			MAddon addon = MApplicationFactory.INSTANCE.createAddon();
-			addon.setElementId("org.eclipse.e4.core.commands.service");
-			addon.setContributionURI("bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon");
+			addon.setElementId("org.eclipse.e4.core.commands.service"); //$NON-NLS-1$
+			addon
+				.setContributionURI("bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"); //$NON-NLS-1$
 			application.getAddons().add(addon);
 
 			addon = MApplicationFactory.INSTANCE.createAddon();
-			addon.setElementId("org.eclipse.e4.ui.contexts.service");
-			addon.setContributionURI("bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon");
+			addon.setElementId("org.eclipse.e4.ui.contexts.service"); //$NON-NLS-1$
+			addon
+				.setContributionURI("bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"); //$NON-NLS-1$
 			application.getAddons().add(addon);
 
 			addon = MApplicationFactory.INSTANCE.createAddon();
-			addon.setElementId("org.eclipse.e4.ui.bindings.service");
-			addon.setContributionURI("bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon");
+			addon.setElementId("org.eclipse.e4.ui.bindings.service"); //$NON-NLS-1$
+			addon
+				.setContributionURI("bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon"); //$NON-NLS-1$
 			application.getAddons().add(addon);
 
 			addon = MApplicationFactory.INSTANCE.createAddon();
-			addon.setElementId("org.eclipse.e4.ui.workbench.commands.model");
-			addon.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon");
+			addon.setElementId("org.eclipse.e4.ui.workbench.commands.model"); //$NON-NLS-1$
+			addon
+				.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon"); //$NON-NLS-1$
 			application.getAddons().add(addon);
 
 			addon = MApplicationFactory.INSTANCE.createAddon();
-			addon.setElementId("org.eclipse.e4.ui.workbench.handler.model");
-			addon.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon");
+			addon.setElementId("org.eclipse.e4.ui.workbench.handler.model"); //$NON-NLS-1$
+			addon
+				.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"); //$NON-NLS-1$
 			application.getAddons().add(addon);
 
 			addon = MApplicationFactory.INSTANCE.createAddon();
-			addon.setElementId("org.eclipse.e4.ui.workbench.contexts.model");
-			addon.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon");
+			addon.setElementId("org.eclipse.e4.ui.workbench.contexts.model"); //$NON-NLS-1$
+			addon
+				.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon"); //$NON-NLS-1$
 			application.getAddons().add(addon);
 
 			addon = MApplicationFactory.INSTANCE.createAddon();
-			addon.setElementId("org.eclipse.e4.ui.workbench.bindings.model");
-			addon.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon");
+			addon.setElementId("org.eclipse.e4.ui.workbench.bindings.model"); //$NON-NLS-1$
+			addon
+				.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon"); //$NON-NLS-1$
 			application.getAddons().add(addon);
-			MTrimmedWindow mainWindow = MBasicFactory.INSTANCE
-					.createTrimmedWindow();
+			final MTrimmedWindow mainWindow = MBasicFactory.INSTANCE
+				.createTrimmedWindow();
 			application.getChildren().add(mainWindow);
 			mainWindow.setLabel(pluginName);
 			mainWindow.setWidth(500);
 			mainWindow.setHeight(400);
 			resource.getContents().add((EObject) application);
-			MBindingContext rootContext = MCommandsFactory.INSTANCE
-					.createBindingContext();
-			rootContext.setElementId("org.eclipse.ui.contexts.dialogAndWindow");
-			rootContext.setName("In Dialog and Windows");
+			final MBindingContext rootContext = MCommandsFactory.INSTANCE
+				.createBindingContext();
+			rootContext.setElementId("org.eclipse.ui.contexts.dialogAndWindow"); //$NON-NLS-1$
+			rootContext.setName(Messages.E4NewProjectWizard_InDialogsAndWindows);
 
 			MBindingContext childContext = MCommandsFactory.INSTANCE
-					.createBindingContext();
-			childContext.setElementId("org.eclipse.ui.contexts.window");
-			childContext.setName("In Windows");
+				.createBindingContext();
+			childContext.setElementId("org.eclipse.ui.contexts.window"); //$NON-NLS-1$
+			childContext.setName(Messages.E4NewProjectWizard_InWindows);
 			rootContext.getChildren().add(childContext);
 
 			childContext = MCommandsFactory.INSTANCE.createBindingContext();
-			childContext.setElementId("org.eclipse.ui.contexts.dialog");
-			childContext.setName("In Dialogs");
+			childContext.setElementId("org.eclipse.ui.contexts.dialog"); //$NON-NLS-1$
+			childContext.setName(Messages.E4NewProjectWizard_InDialogs);
 			rootContext.getChildren().add(childContext);
 
 			application.getRootContext().add(rootContext);
@@ -568,120 +584,117 @@ private void createApplicationModel(IProject project, String pluginName,
 			if (!isMinimalist) {
 
 				// Create Quit command
-				MCommand quitCommand = createCommand(
-						"org.eclipse.ui.file.exit", "quitCommand",
-						"QuitHandler", "M1+Q", pluginName, fragment,
-						application);
-
-				MCommand openCommand = createCommand(pluginName + ".open",
-						"openCommand", "OpenHandler", "M1+O", pluginName,
-						fragment, application);
-
-				MCommand saveCommand = createCommand(
-						"org.eclipse.ui.file.save", "saveCommand",
-						"SaveHandler", "M1+S", pluginName, fragment,
-						application);
-
-				MCommand aboutCommand = createCommand(
-						"org.eclipse.ui.help.aboutAction", "aboutCommand",
-						"AboutHandler", "M1+A", pluginName, fragment,
-						application);
-
-				MMenu menu = MMenuFactory.INSTANCE.createMenu();
+				final MCommand quitCommand = createCommand("org.eclipse.ui.file.exit", "quitCommand", //$NON-NLS-1$ //$NON-NLS-2$
+					"QuitHandler", "M1+Q", pluginName, fragment, //$NON-NLS-1$ //$NON-NLS-2$
+					application);
+
+				final MCommand openCommand = createCommand(pluginName + ".open", //$NON-NLS-1$
+					"openCommand", "OpenHandler", "M1+O", pluginName, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+					fragment, application);
+
+				final MCommand saveCommand = createCommand("org.eclipse.ui.file.save", "saveCommand", //$NON-NLS-1$ //$NON-NLS-2$
+					"SaveHandler", "M1+S", pluginName, fragment, //$NON-NLS-1$ //$NON-NLS-2$
+					application);
+
+				final MCommand aboutCommand = createCommand("org.eclipse.ui.help.aboutAction", "aboutCommand", //$NON-NLS-1$ //$NON-NLS-2$
+					"AboutHandler", "M1+A", pluginName, fragment, //$NON-NLS-1$//$NON-NLS-2$
+					application);
+
+				final MMenu menu = MMenuFactory.INSTANCE.createMenu();
 				mainWindow.setMainMenu(menu);
-				menu.setElementId("menu:org.eclipse.ui.main.menu");
+				menu.setElementId("menu:org.eclipse.ui.main.menu"); //$NON-NLS-1$
 
-				MMenu fileMenuItem = MMenuFactory.INSTANCE.createMenu();
+				final MMenu fileMenuItem = MMenuFactory.INSTANCE.createMenu();
 				menu.getChildren().add(fileMenuItem);
-				fileMenuItem.setLabel("File");
+				fileMenuItem.setLabel(Messages.E4NewProjectWizard_File);
 				{
-					MHandledMenuItem menuItemOpen = MMenuFactory.INSTANCE
-							.createHandledMenuItem();
+					final MHandledMenuItem menuItemOpen = MMenuFactory.INSTANCE
+						.createHandledMenuItem();
 					fileMenuItem.getChildren().add(menuItemOpen);
-					menuItemOpen.setLabel("Open");
-					menuItemOpen.setIconURI("platform:/plugin/" + pluginName
-							+ "/icons/sample.png");
+					menuItemOpen.setLabel(Messages.E4NewProjectWizard_Open);
+					menuItemOpen.setIconURI("platform:/plugin/" + pluginName //$NON-NLS-1$
+						+ "/icons/sample.png"); //$NON-NLS-1$
 					menuItemOpen.setCommand(openCommand);
 
-					MHandledMenuItem menuItemSave = MMenuFactory.INSTANCE
-							.createHandledMenuItem();
+					final MHandledMenuItem menuItemSave = MMenuFactory.INSTANCE
+						.createHandledMenuItem();
 					fileMenuItem.getChildren().add(menuItemSave);
-					menuItemSave.setLabel("Save");
-					menuItemSave.setIconURI("platform:/plugin/" + pluginName
-							+ "/icons/save_edit.png");
+					menuItemSave.setLabel(Messages.E4NewProjectWizard_Save);
+					menuItemSave.setIconURI("platform:/plugin/" + pluginName //$NON-NLS-1$
+						+ "/icons/save_edit.png"); //$NON-NLS-1$
 					menuItemSave.setCommand(saveCommand);
 
-					MHandledMenuItem menuItemQuit = MMenuFactory.INSTANCE
-							.createHandledMenuItem();
+					final MHandledMenuItem menuItemQuit = MMenuFactory.INSTANCE
+						.createHandledMenuItem();
 					fileMenuItem.getChildren().add(menuItemQuit);
-					menuItemQuit.setLabel("Quit");
+					menuItemQuit.setLabel(Messages.E4NewProjectWizard_Quit);
 					menuItemQuit.setCommand(quitCommand);
 				}
-				MMenu helpMenuItem = MMenuFactory.INSTANCE.createMenu();
+				final MMenu helpMenuItem = MMenuFactory.INSTANCE.createMenu();
 				menu.getChildren().add(helpMenuItem);
-				helpMenuItem.setLabel("Help");
+				helpMenuItem.setLabel(Messages.E4NewProjectWizard_Help);
 				{
-					MHandledMenuItem menuItemAbout = MMenuFactory.INSTANCE
-							.createHandledMenuItem();
+					final MHandledMenuItem menuItemAbout = MMenuFactory.INSTANCE
+						.createHandledMenuItem();
 					helpMenuItem.getChildren().add(menuItemAbout);
-					menuItemAbout.setLabel("About");
+					menuItemAbout.setLabel(Messages.E4NewProjectWizard_About);
 					menuItemAbout.setCommand(aboutCommand);
 				}
 
 				// PerspectiveStack
-				MPerspectiveStack perspectiveStack = MAdvancedFactory.INSTANCE
-						.createPerspectiveStack();
+				final MPerspectiveStack perspectiveStack = MAdvancedFactory.INSTANCE
+					.createPerspectiveStack();
 				mainWindow.getChildren().add(perspectiveStack);
 
-				MPerspective perspective = MAdvancedFactory.INSTANCE
-						.createPerspective();
+				final MPerspective perspective = MAdvancedFactory.INSTANCE
+					.createPerspective();
 				perspectiveStack.getChildren().add(perspective);
 				{
 					// Part Container
-					MPartSashContainer partSashContainer = MBasicFactory.INSTANCE
-							.createPartSashContainer();
+					final MPartSashContainer partSashContainer = MBasicFactory.INSTANCE
+						.createPartSashContainer();
 					perspective.getChildren().add(partSashContainer);
 
-					MPartStack partStack = MBasicFactory.INSTANCE
-							.createPartStack();
+					final MPartStack partStack = MBasicFactory.INSTANCE
+						.createPartStack();
 					partSashContainer.getChildren().add(partStack);
 
-					MPart part = MBasicFactory.INSTANCE.createPart();
+					final MPart part = MBasicFactory.INSTANCE.createPart();
 					partStack.getChildren().add(part);
-					part.setLabel("Sample Part");
-					part.setContributionURI("bundleclass://" + pluginName + "/"
-							+ fragment.getElementName() + ".parts"
-							+ ".SamplePart");
+					part.setLabel(Messages.E4NewProjectWizard_SamplePart);
+					part.setContributionURI("bundleclass://" + pluginName + "/" //$NON-NLS-1$ //$NON-NLS-2$
+						+ fragment.getElementName() + ".parts" //$NON-NLS-1$
+						+ ".SamplePart"); //$NON-NLS-1$
 
 				}
 
 				// WindowTrim
-				MTrimBar trimBar = MBasicFactory.INSTANCE.createTrimBar();
+				final MTrimBar trimBar = MBasicFactory.INSTANCE.createTrimBar();
 				mainWindow.getTrimBars().add(trimBar);
 
-				MToolBar toolBar = MMenuFactory.INSTANCE.createToolBar();
-				toolBar.setElementId("toolbar:org.eclipse.ui.main.toolbar");
+				final MToolBar toolBar = MMenuFactory.INSTANCE.createToolBar();
+				toolBar.setElementId("toolbar:org.eclipse.ui.main.toolbar"); //$NON-NLS-1$
 				trimBar.getChildren().add(toolBar);
 
-				MHandledToolItem toolItemOpen = MMenuFactory.INSTANCE
-						.createHandledToolItem();
+				final MHandledToolItem toolItemOpen = MMenuFactory.INSTANCE
+					.createHandledToolItem();
 				toolBar.getChildren().add(toolItemOpen);
-				toolItemOpen.setIconURI("platform:/plugin/" + pluginName
-						+ "/icons/sample.png");
+				toolItemOpen.setIconURI("platform:/plugin/" + pluginName //$NON-NLS-1$
+					+ "/icons/sample.png"); //$NON-NLS-1$
 				toolItemOpen.setCommand(openCommand);
 
-				MHandledToolItem toolItemSave = MMenuFactory.INSTANCE
-						.createHandledToolItem();
+				final MHandledToolItem toolItemSave = MMenuFactory.INSTANCE
+					.createHandledToolItem();
 				toolBar.getChildren().add(toolItemSave);
-				toolItemSave.setIconURI("platform:/plugin/" + pluginName
-						+ "/icons/save_edit.png");
+				toolItemSave.setIconURI("platform:/plugin/" + pluginName //$NON-NLS-1$
+					+ "/icons/save_edit.png"); //$NON-NLS-1$
 				toolItemSave.setCommand(saveCommand);
 			}
-			Map<Object, Object> options = new HashMap<Object, Object>();
-			options.put(XMLResource.OPTION_ENCODING, "UTF-8");
+			final Map<Object, Object> options = new HashMap<Object, Object>();
+			options.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
 			try {
 				resource.save(options);
-			} catch (IOException e) {
+			} catch (final IOException e) {
 				PDEPlugin.logException(e);
 
 			}
@@ -689,42 +702,42 @@ private void createApplicationModel(IProject project, String pluginName,
 	}
 
 	private MCommand createCommand(String commandId, String name,
-			String className, String keyBinding, String projectName,
-			IPackageFragment fragment, MApplication application) {
-		MCommand command = MCommandsFactory.INSTANCE.createCommand();
+		String className, String keyBinding, String projectName,
+		IPackageFragment fragment, MApplication application) {
+		final MCommand command = MCommandsFactory.INSTANCE.createCommand();
 		command.setCommandName(name);
 		command.setElementId(commandId);
 		application.getCommands().add(command);
 		{
 			// Create handler for command
-			MHandler handler = MCommandsFactory.INSTANCE.createHandler();
+			final MHandler handler = MCommandsFactory.INSTANCE.createHandler();
 			handler.setCommand(command);
-			String elementName = fragment.getElementName();
-			handler.setContributionURI("bundleclass://" + projectName + "/"
-					+ (elementName.equals("") ? "" : elementName + ".")
-					+ "handlers." + className);
-			handler.setElementId(projectName + ".handler." + name);
+			final String elementName = fragment.getElementName();
+			handler.setContributionURI("bundleclass://" + projectName + "/" //$NON-NLS-1$ //$NON-NLS-2$
+				+ (elementName.equals("") ? "" : elementName + ".") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				+ "handlers." + className); //$NON-NLS-1$
+			handler.setElementId(projectName + ".handler." + name); //$NON-NLS-1$
 			application.getHandlers().add(handler);
 
 			// create binding for the command
-			MKeyBinding binding = MCommandsFactory.INSTANCE.createKeyBinding();
+			final MKeyBinding binding = MCommandsFactory.INSTANCE.createKeyBinding();
 			binding.setKeySequence(keyBinding);
 			binding.setCommand(command);
-			List<MBindingTable> tables = application.getBindingTables();
+			final List<MBindingTable> tables = application.getBindingTables();
 			if (tables.size() == 0) {
 				MBindingContext rootContext = null;
 				if (application.getRootContext().size() > 0) {
 					rootContext = application.getRootContext().get(0);
 				} else {
 					rootContext = MCommandsFactory.INSTANCE
-							.createBindingContext();
+						.createBindingContext();
 					rootContext
-							.setElementId("org.eclipse.ui.contexts.dialogAndWindow");
-					rootContext.setName("In Dialog and Windows");
+						.setElementId("org.eclipse.ui.contexts.dialogAndWindow"); //$NON-NLS-1$
+					rootContext.setName(Messages.E4NewProjectWizard_InDialogsAndWindows);
 					application.getRootContext().add(rootContext);
 				}
-				MBindingTable table = MCommandsFactory.INSTANCE
-						.createBindingTable();
+				final MBindingTable table = MCommandsFactory.INSTANCE
+					.createBindingTable();
 				table.setBindingContext(rootContext);
 				tables.add(table);
 			}
@@ -734,13 +747,13 @@ private MCommand createCommand(String commandId, String name,
 	}
 
 	private void prepareFolder(IContainer container, IProgressMonitor monitor)
-			throws CoreException {
-		IContainer parent = container.getParent();
+		throws CoreException {
+		final IContainer parent = container.getParent();
 		if (parent instanceof IFolder) {
 			prepareFolder(parent, monitor);
 		}
 		if (!container.exists() && container instanceof IFolder) {
-			IFolder folder = (IFolder) container;
+			final IFolder folder = (IFolder) container;
 			folder.create(true, true, monitor);
 		}
 	}
@@ -757,44 +770,49 @@ public String getPluginVersion() {
 
 	private class ContentWizard extends Wizard implements IBundleContentWizard {
 
-		String[] dependencies = new String[] { "javax.inject",
-				"org.eclipse.core.runtime", "org.eclipse.swt",
-				"org.eclipse.e4.ui.model.workbench", "org.eclipse.jface",
-				"org.eclipse.e4.ui.services", "org.eclipse.e4.ui.workbench",
-				"org.eclipse.e4.core.di", "org.eclipse.e4.ui.di",
-				"org.eclipse.e4.core.contexts", };
+		String[] dependencies = new String[] { "javax.inject", //$NON-NLS-1$
+			"org.eclipse.core.runtime", "org.eclipse.swt", //$NON-NLS-1$//$NON-NLS-2$
+			"org.eclipse.e4.ui.model.workbench", "org.eclipse.jface", //$NON-NLS-1$ //$NON-NLS-2$
+			"org.eclipse.e4.ui.services", "org.eclipse.e4.ui.workbench", //$NON-NLS-1$ //$NON-NLS-2$
+			"org.eclipse.e4.core.di", "org.eclipse.e4.ui.di", //$NON-NLS-1$ //$NON-NLS-2$
+			"org.eclipse.e4.core.contexts", }; //$NON-NLS-1$
 
+		@Override
 		public void init(IFieldData data) {
 		}
 
+		@Override
 		public IPluginReference[] getDependencies(String schemaVersion) {
-			ArrayList<IPluginReference> result = new ArrayList<IPluginReference>(
-					dependencies.length);
-			for (String dependency : dependencies) {
-				Bundle bundle = Platform.getBundle(dependency);
-				String versionString = "0.0.0";
+			final ArrayList<IPluginReference> result = new ArrayList<IPluginReference>(
+				dependencies.length);
+			for (final String dependency : dependencies) {
+				final Bundle bundle = Platform.getBundle(dependency);
+				String versionString = "0.0.0"; //$NON-NLS-1$
 				if (dependency != null) {
-					Version version = bundle.getVersion();
-					versionString = version.getMajor() + "."
-							+ version.getMinor() + "." + version.getMicro();
+					final Version version = bundle.getVersion();
+					versionString = version.getMajor() + "." //$NON-NLS-1$
+						+ version.getMinor() + "." + version.getMicro(); //$NON-NLS-1$
 				}
 				result.add(new PluginReference(dependency, versionString,
-						IMatchRules.GREATER_OR_EQUAL));
+					IMatchRules.GREATER_OR_EQUAL));
 			}
 			return result.toArray(new IPluginReference[0]);
 		}
 
+		@Override
 		public String[] getNewFiles() {
 			return new String[0];
 		}
 
+		@Override
 		public boolean performFinish(IProject project, IPluginModelBase model,
-				IProgressMonitor monitor) {
+			IProgressMonitor monitor) {
 			return true;
 		}
 
+		@Override
 		public String[] getImportPackages() {
-			return new String[] { };
+			return new String[] {};
 		}
 
 		@Override
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/LifeCycleClassCodeGenerator.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/LifeCycleClassCodeGenerator.java
index aed4af238c..d625ccdbba 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/LifeCycleClassCodeGenerator.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/LifeCycleClassCodeGenerator.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation
  *******************************************************************************/
 
 package org.eclipse.e4.internal.tools.wizards.project;
@@ -21,32 +21,29 @@
 import java.io.StringWriter;
 import java.net.URL;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
-import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.wizard.IWizardContainer;
 import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.PDEPlugin;
 import org.eclipse.pde.internal.ui.wizards.plugin.PluginFieldData;
 import org.osgi.framework.FrameworkUtil;
 
 public class LifeCycleClassCodeGenerator {
-	private PluginFieldData fPluginData;
-	private IProject fProject;
-	private String fQualifiedClassName;
-	private boolean fGenerateTemplate;
-	private IWizardContainer fWizardContainer;
-
-	public LifeCycleClassCodeGenerator(IProject project, String qualifiedClassName, PluginFieldData data, boolean generateTemplate, IWizardContainer wizardContainer) {
+	private static final String PACKAGE_DECLARATION = "PACKAGE_DECLARATION"; //$NON-NLS-1$
+	private final PluginFieldData fPluginData;
+	private final IProject fProject;
+	private final String fQualifiedClassName;
+	private final boolean fGenerateTemplate;
+	private final IWizardContainer fWizardContainer;
+
+	public LifeCycleClassCodeGenerator(IProject project, String qualifiedClassName, PluginFieldData data,
+		boolean generateTemplate, IWizardContainer wizardContainer) {
 		fProject = project;
 		fQualifiedClassName = qualifiedClassName;
 		fPluginData = data;
@@ -55,11 +52,12 @@ public LifeCycleClassCodeGenerator(IProject project, String qualifiedClassName,
 	}
 
 	public IFile generate(IProgressMonitor monitor) throws CoreException {
-		int nameloc = fQualifiedClassName.lastIndexOf('.');
-		String packageName = (nameloc == -1) ? "" : fQualifiedClassName.substring(0, nameloc); //$NON-NLS-1$
-		//CoreUtility.createFolder was throwing exception if Activator was already created with lower case package and this method called it with different case.
+		final int nameloc = fQualifiedClassName.lastIndexOf('.');
+		String packageName = nameloc == -1 ? "" : fQualifiedClassName.substring(0, nameloc); //$NON-NLS-1$
+		// CoreUtility.createFolder was throwing exception if Activator was already created with lower case package and
+		// this method called it with different case.
 		packageName = packageName.toLowerCase();
-		String className = fQualifiedClassName.substring(nameloc + 1);
+		final String className = fQualifiedClassName.substring(nameloc + 1);
 
 		IPath path = new Path(packageName.replace('.', '/'));
 		if (fPluginData.getSourceFolderName().trim().length() > 0) {
@@ -68,21 +66,23 @@ public IFile generate(IProgressMonitor monitor) throws CoreException {
 
 		CoreUtility.createFolder(fProject.getFolder(path));
 
-		IFile file = fProject.getFile(path.append(className + ".java")); //$NON-NLS-1$
-		StringWriter swriter = new StringWriter();
-		PrintWriter writer = new PrintWriter(swriter);
+		final IFile file = fProject.getFile(path.append(className + ".java")); //$NON-NLS-1$
+		final StringWriter swriter = new StringWriter();
+		final PrintWriter writer = new PrintWriter(swriter);
 		generateClass(packageName, className, swriter);
 		writer.flush();
 
 		try {
 			swriter.close();
-			ByteArrayInputStream stream = new ByteArrayInputStream(swriter.toString().getBytes(fProject.getDefaultCharset()));
-			if (file.exists())
+			final ByteArrayInputStream stream = new ByteArrayInputStream(swriter.toString().getBytes(
+				fProject.getDefaultCharset()));
+			if (file.exists()) {
 				file.setContents(stream, false, true, monitor);
-			else
+			} else {
 				file.create(stream, false, monitor);
+			}
 			stream.close();
-		} catch (Exception e) {
+		} catch (final Exception e) {
 
 		}
 		return file;
@@ -90,35 +90,36 @@ public IFile generate(IProgressMonitor monitor) throws CoreException {
 
 	private void generateClass(String packageName, String className, StringWriter writer) {
 
-		Map<String, String> map = new HashMap<String, String>();
-		if (packageName.equals("")) {
-			map.put("PACKAGE_DECLARATION", "");
+		final Map<String, String> map = new HashMap<String, String>();
+		if (packageName.equals("")) { //$NON-NLS-1$
+			map.put(PACKAGE_DECLARATION, ""); //$NON-NLS-1$
 		} else {
-			map.put("PACKAGE_DECLARATION", "package " + packageName + ";");
+			map.put(PACKAGE_DECLARATION, "package " + packageName + ";"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
-		map.put("PACKAGE_NAME", packageName);
-		map.put("CLASS_NAME", className);
+		map.put("PACKAGE_NAME", packageName); //$NON-NLS-1$
+		map.put("CLASS_NAME", className); //$NON-NLS-1$
 
 		try {
-			String template = getResourceAsString(this.getClass(), "/templates/E4LifeCycle.java");
+			String template = getResourceAsString(this.getClass(), "/templates/E4LifeCycle.java"); //$NON-NLS-1$
 			template = SimpleTemplate.process(template, map);
 			writer.write(template);
-		} catch (Exception e) {
+		} catch (final Exception e) {
 			e.printStackTrace();
 		}
 
 	}
 
-	public static String getResourceAsString(Class<?> classInBundle, String templatePath) throws FileNotFoundException, IOException {
-		URL url = FrameworkUtil.getBundle(classInBundle).getResource(templatePath);
+	public static String getResourceAsString(Class<?> classInBundle, String templatePath) throws FileNotFoundException,
+		IOException {
+		final URL url = FrameworkUtil.getBundle(classInBundle).getResource(templatePath);
 		return readTextFile(url.openStream());
 	}
 
 	public static String readTextFile(InputStream stream) throws IOException, FileNotFoundException {
-		StringBuilder sb = new StringBuilder();
-		BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
+		final StringBuilder sb = new StringBuilder();
+		final BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
 
-		char[] chars = new char[1024];
+		final char[] chars = new char[1024];
 		int numRead = 0;
 		while ((numRead = reader.read(chars)) > -1) {
 			sb.append(String.copyValueOf(chars, 0, numRead));
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
index 26ee180392..dfe2e28d1e 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
@@ -6,11 +6,11 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Soyatec - initial API and implementation
- *     IBM Corporation - ongoing enhancements
- *     Lars Vogel, vogella GmbH - ongoing enhancements
- *     Sopot Cela - ongoing enhancements
- *     Steven Spungin - ongoing enhancements, Bug 438591
+ * Soyatec - initial API and implementation
+ * IBM Corporation - ongoing enhancements
+ * Lars Vogel, vogella GmbH - ongoing enhancements
+ * Sopot Cela - ongoing enhancements
+ * Steven Spungin - ongoing enhancements, Bug 438591
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -53,24 +53,24 @@
  * @author jin.liu (jin.liu@soyatec.com)
  */
 public class NewApplicationWizardPage extends WizardPage {
-	public static final String E4_APPLICATION = "org.eclipse.e4.ui.workbench.swt.E4Application";
-	public static final String APPLICATION_CSS_PROPERTY = "applicationCSS";
-	public static final String LIFECYCLE_URI_PROPERTY = "lifeCycleURI";
-	public static final String PRODUCT_NAME = "productName";
-	public static final String APPLICATION = "application";
-	public static final String CLEAR_PERSISTED_STATE = "clearPersistedState";
-	public static final String EOL = System.getProperty("line.separator");
-	public static final String richSample = "RICH_SAMPLE";
-	public static final String generateLifecycle = "GENERATE_LIFECYCLE";
-	public static final String generateLifecycleName = "GENERATE_LIFECYCLE_NAME";
+	public static final String E4_APPLICATION = "org.eclipse.e4.ui.workbench.swt.E4Application"; //$NON-NLS-1$
+	public static final String APPLICATION_CSS_PROPERTY = "applicationCSS"; //$NON-NLS-1$
+	public static final String LIFECYCLE_URI_PROPERTY = "lifeCycleURI"; //$NON-NLS-1$
+	public static final String PRODUCT_NAME = "productName"; //$NON-NLS-1$
+	public static final String APPLICATION = "application"; //$NON-NLS-1$
+	public static final String CLEAR_PERSISTED_STATE = "clearPersistedState"; //$NON-NLS-1$
+	public static final String EOL = System.getProperty("line.separator"); //$NON-NLS-1$
+	public static final String richSample = "RICH_SAMPLE"; //$NON-NLS-1$
+	public static final String generateLifecycle = "GENERATE_LIFECYCLE"; //$NON-NLS-1$
+	public static final String generateLifecycleName = "GENERATE_LIFECYCLE_NAME"; //$NON-NLS-1$
 
 	private final Map<String, String> data;
 
 	private IProject project;
-	private IProjectProvider projectProvider;
+	private final IProjectProvider projectProvider;
 	private Text proNameText;
 	private Group propertyGroup;
-	private AbstractFieldData pluginData;
+	private final AbstractFieldData pluginData;
 
 	private PropertyData[] PROPERTIES;
 	private Button richSampleCheckbox;
@@ -78,7 +78,7 @@ public class NewApplicationWizardPage extends WizardPage {
 	protected Text lifeCycleName;
 
 	protected NewApplicationWizardPage(IProjectProvider projectProvider,
-			AbstractFieldData pluginData) {
+		AbstractFieldData pluginData) {
 		super("New Eclipse 4 Application Wizard Page");
 		this.projectProvider = projectProvider;
 		this.pluginData = pluginData;
@@ -101,28 +101,28 @@ public void setProject(IProject project) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
 	 * @see
 	 * org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets
 	 * .Composite)
 	 */
+	@Override
 	public void createControl(Composite parent) {
-		Composite control = new Composite(parent, SWT.NONE);
+		final Composite control = new Composite(parent, SWT.NONE);
 		control.setLayout(new GridLayout());
 
-		Group productGroup = createProductGroup(control);
+		final Group productGroup = createProductGroup(control);
 		productGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		propertyGroup = createPropertyGroup(control);
 		propertyGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
-		Group templateGroup = createTemplateGroup(control);
+		final Group templateGroup = createTemplateGroup(control);
 		templateGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		setControl(control);
 	}
 
 	private Group createTemplateGroup(Composite parent) {
-		Group group = new Group(parent, SWT.NONE);
+		final Group group = new Group(parent, SWT.NONE);
 		group.setLayout(new GridLayout(3, false));
 		group.setText("Template option");
 
@@ -139,14 +139,14 @@ public void widgetSelected(SelectionEvent e) {
 		richSampleCheckbox.setLayoutData(new GridData(SWT.BEGINNING, SWT.TOP, false, false, 2, 1));
 
 		{
-			SelectionListener listener= new SelectionAdapter() {
+			final SelectionListener listener = new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					lifeCycleName.setEnabled(generateLifecycleClassCheckbox.getSelection());
 					data.put(generateLifecycle, generateLifecycleClassCheckbox.getSelection() ? "TRUE" : "FALSE");
 				}
-			};		
-			
+			};
+
 			generateLifecycleClassCheckbox = new Button(group, SWT.CHECK);
 			generateLifecycleClassCheckbox.setSelection(false);
 
@@ -155,18 +155,18 @@ public void widgetSelected(SelectionEvent e) {
 			generateLifecycleClassCheckbox.addSelectionListener(listener);
 
 			new Label(group, SWT.NONE);
-			Label lbl = new Label(group, SWT.NONE);
+			final Label lbl = new Label(group, SWT.NONE);
 			lbl.setText("LifeCycle class name:");
-			GridData gd = new GridData();
+			final GridData gd = new GridData();
 			gd.horizontalIndent = 20;
 			lbl.setLayoutData(gd);
-			
+
 			lifeCycleName = new Text(group, SWT.BORDER);
 			lifeCycleName.setText("E4LifeCycle");
 			lifeCycleName.setEnabled(false);
 			lifeCycleName.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
 			lifeCycleName.addModifyListener(new ModifyListener() {
-				
+
 				@Override
 				public void modifyText(ModifyEvent e) {
 					data.put(generateLifecycleName, lifeCycleName.getText());
@@ -177,18 +177,17 @@ public void modifyText(ModifyEvent e) {
 		return group;
 	}
 
-	
 	static class PropertyData {
-		private String name;
-		private String label;
+		private final String name;
+		private final String label;
 		private String extraTooltipInfo;
 
-		private String value;
-		private Class<?> type;
-		private boolean editable;
+		private final String value;
+		private final Class<?> type;
+		private final boolean editable;
 
 		public PropertyData(String name, String label, String value,
-				Class<?> type, boolean editable) {
+			Class<?> type, boolean editable) {
 			this.name = name;
 			this.value = value;
 			this.label = label;
@@ -197,7 +196,7 @@ public PropertyData(String name, String label, String value,
 		}
 
 		public PropertyData(String name, String label, String value,
-				Class<?> type, boolean editable, String extraTooltipInfo) {
+			Class<?> type, boolean editable, String extraTooltipInfo) {
 			this.name = name;
 			this.value = value;
 			this.label = label;
@@ -233,7 +232,7 @@ public String getExtraTooltipInfo() {
 	}
 
 	private Group createPropertyGroup(Composite control) {
-		Group group = new Group(control, SWT.NONE);
+		final Group group = new Group(control, SWT.NONE);
 		group.setText("Properties");
 
 		group.setLayout(new GridLayout(3, false));
@@ -242,8 +241,7 @@ private Group createPropertyGroup(Composite control) {
 	}
 
 	private void createPropertyItem(final Composite parent,
-			final PropertyData property) {
-		
+		final PropertyData property) {
 
 		if (property.getType() == Boolean.class) {
 			final Button button = new Button(parent, SWT.CHECK);
@@ -252,7 +250,7 @@ private void createPropertyItem(final Composite parent,
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					handleCheckBoxEvent(property.getName(),
-							button.getSelection());
+						button.getSelection());
 				}
 			});
 			button.setText(property.getLabel());
@@ -261,20 +259,21 @@ public void widgetSelected(SelectionEvent e) {
 			createLabelForField(parent, property);
 			final Text valueText = new Text(parent, SWT.BORDER);
 			valueText.setText(property.getValue());
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+			final GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
 			valueText.setLayoutData(gridData);
 			if (!property.isEditable()) {
 				valueText.setEditable(false);
 			}
 			valueText.addListener(SWT.Modify, new Listener() {
+				@Override
 				public void handleEvent(Event event) {
 					handleTextEvent(property.getName(), valueText);
 				}
 			});
 
 			if (property.getType() == Color.class
-					|| property.getType() == Rectangle.class) {
-				Button button = new Button(parent, SWT.PUSH);
+				|| property.getType() == Rectangle.class) {
+				final Button button = new Button(parent, SWT.PUSH);
 				button.setText("...");
 				button.addSelectionListener(new SelectionAdapter() {
 					@Override
@@ -290,41 +289,40 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	private void createLabelForField(final Composite parent,
-			final PropertyData property) {
-		Label label = new Label(parent, SWT.NONE);
+		final PropertyData property) {
+		final Label label = new Label(parent, SWT.NONE);
 		label.setText(property.getLabel());
 		label.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_BLUE));
 		label.setToolTipText("Property \"" + property.getName() + "\"");
 		if (property.getExtraTooltipInfo() != null) {
 			label.setToolTipText(label.getToolTipText() + EOL
-					+ property.getExtraTooltipInfo());
+				+ property.getExtraTooltipInfo());
 		}
 	}
 
 	private void handleLinkEvent(PropertyData property, Text valueText,
-			Shell shell) {
+		Shell shell) {
 		if (property == null || valueText == null || valueText.isDisposed()) {
 			return;
 		}
 		if (property.getType() == Color.class) {
-			ColorDialog colorDialog = new ColorDialog(shell);
-			RGB selectRGB = colorDialog.open();
+			final ColorDialog colorDialog = new ColorDialog(shell);
+			final RGB selectRGB = colorDialog.open();
 			if (selectRGB != null) {
-				valueText.setText((this.hexColorConvert(Integer
-						.toHexString(selectRGB.blue))
-						+ this.hexColorConvert(Integer
-								.toHexString(selectRGB.green)) + this
-						.hexColorConvert(Integer.toHexString(selectRGB.red)))
-						.toUpperCase());
+				valueText.setText((hexColorConvert(Integer
+					.toHexString(selectRGB.blue))
+					+ hexColorConvert(Integer
+						.toHexString(selectRGB.green)) + hexColorConvert(Integer.toHexString(selectRGB.red)))
+					.toUpperCase());
 			}
 		} else if (property.getType() == Rectangle.class) {
-			this.createRectDialog(shell, valueText).open();
+			createRectDialog(shell, valueText).open();
 		}
 	}
 
 	/**
 	 * exchange the color pattern of hex numeric
-	 * 
+	 *
 	 * @param number
 	 * @return
 	 */
@@ -337,7 +335,7 @@ public String hexColorConvert(String color) {
 
 	/**
 	 * create Rect Set dialog
-	 * 
+	 *
 	 * @param parent
 	 * @param valueText
 	 * @return
@@ -348,36 +346,36 @@ public Dialog createRectDialog(final Composite parent, final Text valueText) {
 
 			@Override
 			protected Button createButton(Composite parent, int id,
-					String label, boolean defaultButton) {
+				String label, boolean defaultButton) {
 				return super.createButton(parent, id, label, defaultButton);
 			}
 
 			@Override
 			protected Control createDialogArea(final Composite parent) {
-				Composite composite = (Composite) super
-						.createDialogArea(parent);
+				final Composite composite = (Composite) super
+					.createDialogArea(parent);
 				composite.getShell().setText("Set Rect");
-				Group group = new Group(composite, SWT.NONE);
+				final Group group = new Group(composite, SWT.NONE);
 				group.setText("Rect");
-				GridLayout gridLayout = new GridLayout();
+				final GridLayout gridLayout = new GridLayout();
 				gridLayout.numColumns = 4;
 				group.setLayout(gridLayout);
 
-				Label xPointLabel = new Label(group, SWT.NONE);
+				final Label xPointLabel = new Label(group, SWT.NONE);
 				xPointLabel.setText("X:");
 				xPointText = new Text(group, SWT.BORDER);
-				VerifyListener verifyListener = createVerifyListener(parent
-						.getShell());
+				final VerifyListener verifyListener = createVerifyListener(parent
+					.getShell());
 				xPointText.addVerifyListener(verifyListener);
-				Label yPointLabel = new Label(group, SWT.NONE);
+				final Label yPointLabel = new Label(group, SWT.NONE);
 				yPointLabel.setText("Y:");
 				yPointText = new Text(group, SWT.BORDER);
 				yPointText.addVerifyListener(verifyListener);
-				Label widthLabel = new Label(group, SWT.NONE);
+				final Label widthLabel = new Label(group, SWT.NONE);
 				widthLabel.setText("Width:");
 				widthText = new Text(group, SWT.BORDER);
 				widthText.addVerifyListener(verifyListener);
-				Label heighttLabel = new Label(group, SWT.NONE);
+				final Label heighttLabel = new Label(group, SWT.NONE);
 				heighttLabel.setText("Height:");
 				heightText = new Text(group, SWT.BORDER);
 				heightText.addVerifyListener(verifyListener);
@@ -388,18 +386,18 @@ protected Control createDialogArea(final Composite parent) {
 			@Override
 			protected void buttonPressed(int buttonId) {
 				if (IDialogConstants.OK_ID == buttonId) {
-					String xPoint = xPointText.getText();
-					String yPoint = yPointText.getText();
-					String width = widthText.getText();
-					String height = heightText.getText();
+					final String xPoint = xPointText.getText();
+					final String yPoint = yPointText.getText();
+					final String width = widthText.getText();
+					final String height = heightText.getText();
 					if (xPoint.length() == 0 || yPoint.length() == 0
-							|| width.length() == 0 || height.length() == 0) {
+						|| width.length() == 0 || height.length() == 0) {
 						MessageDialog.openWarning(parent.getShell(),
-								"Input value empty",
-								"Value shoud not be empty!");
+							"Input value empty",
+							"Value shoud not be empty!");
 					} else {
 						valueText.setText(xPoint + "," + yPoint + "," + width
-								+ "," + height);
+							+ "," + height);
 						okPressed();
 					}
 				} else if (IDialogConstants.CANCEL_ID == buttonId) {
@@ -411,18 +409,19 @@ protected void buttonPressed(int buttonId) {
 
 	/**
 	 * create verify Listener
-	 * 
+	 *
 	 * @param shell
 	 * @return
 	 */
 	public VerifyListener createVerifyListener(final Shell shell) {
 		return new VerifyListener() {
+			@Override
 			public void verifyText(VerifyEvent e) {
-				char c = e.character;
+				final char c = e.character;
 				if ("0123456789".indexOf(c) == -1) {
 					e.doit = false;
 					MessageDialog.openWarning(shell, "Input value error",
-							"Only numeric is allowed!");
+						"Only numeric is allowed!");
 					return;
 				}
 			}
@@ -448,18 +447,19 @@ protected void handleCheckBoxEvent(String property, boolean selection) {
 	}
 
 	private Group createProductGroup(Composite control) {
-		Group proGroup = new Group(control, SWT.NONE);
+		final Group proGroup = new Group(control, SWT.NONE);
 		proGroup.setText("Product");
 
 		proGroup.setLayout(new GridLayout(2, false));
 
-		Label proNameLabel = new Label(proGroup, SWT.NONE);
+		final Label proNameLabel = new Label(proGroup, SWT.NONE);
 		proNameLabel.setText("Name:*");
 
 		proNameText = new Text(proGroup, SWT.BORDER);
 		proNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		proNameText.addListener(SWT.Modify, new Listener() {
+			@Override
 			public void handleEvent(Event event) {
 				handleTextEvent(PRODUCT_NAME, proNameText);
 			}
@@ -470,15 +470,15 @@ public void handleEvent(Event event) {
 	protected PropertyData[] getPropertyData() {
 		if (PROPERTIES == null) {
 			PROPERTIES = new PropertyData[] {
-					new PropertyData(APPLICATION_CSS_PROPERTY, "CSS Style:",
-							"css/default.css", String.class, true),
-					new PropertyData(
-							IProductConstants.PREFERENCE_CUSTOMIZATION,
-							"Preference Customization:", "", String.class, true),
-					new PropertyData(CLEAR_PERSISTED_STATE,
-							"Enable development mode for application model",
-							"true", Boolean.class, true,
-							"Add option -clearPersistedState to the Product's Program Arguments") }; // plugin_customization.ini
+				new PropertyData(APPLICATION_CSS_PROPERTY, "CSS Style:",
+					"css/default.css", String.class, true),
+				new PropertyData(
+					IProductConstants.PREFERENCE_CUSTOMIZATION,
+					"Preference Customization:", "", String.class, true),
+				new PropertyData(CLEAR_PERSISTED_STATE,
+					"Enable development mode for application model",
+					"true", Boolean.class, true,
+					"Add option -clearPersistedState to the Product's Program Arguments") }; // plugin_customization.ini
 		}
 		return PROPERTIES;
 	}
@@ -491,7 +491,7 @@ public void setVisible(boolean visible) {
 			// can contain illegal characters)
 			proNameText.setText(pluginData.getId());
 
-			for (PropertyData property : getPropertyData()) {
+			for (final PropertyData property : getPropertyData()) {
 				createPropertyItem(propertyGroup, property);
 			}
 			propertyGroup.getParent().layout();
@@ -504,18 +504,18 @@ public void setVisible(boolean visible) {
 	 */
 	public Map<String, String> getData() {
 		if (PROPERTIES == null) {
-			for (PropertyData property : getPropertyData()) {
+			for (final PropertyData property : getPropertyData()) {
 				data.put(property.getName(), property.getValue());
 			}
 
 			// Use the plug-in name for the product name (not project name which
 			// can contain illegal characters)
-			String productName = pluginData.getId();
+			final String productName = pluginData.getId();
 
 			data.put(PRODUCT_NAME, productName);
 			data.put(APPLICATION, E4_APPLICATION);
 		}
-		Map<String, String> map = new HashMap<String, String>();
+		final Map<String, String> map = new HashMap<String, String>();
 		map.putAll(data);
 		return map;
 	}

From 64bc97b92f8b32bbd43a4f7b329bcfffbbd0baf7 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Fri, 10 Oct 2014 12:14:07 +0200
Subject: [PATCH 0836/1286] Bug 444340 - Externalize Strings - finished
 e4.tools

---
 .../eclipse/e4/internal/tools/Messages.java   |  27 +++
 .../e4/internal/tools/messages.properties     |  27 +++
 .../project/NewApplicationWizardPage.java     |  88 +++----
 .../wizards/project/ResourceLocator.java      |  20 +-
 .../tools/wizards/project/SimpleTemplate.java |  13 +-
 .../wizards/project/TemplateOperation.java    | 215 ++++++++++--------
 6 files changed, 232 insertions(+), 158 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
index 4b568bcb9e..1c484b1b7f 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
@@ -38,6 +38,33 @@ public class Messages extends NLS {
 	public static String NewAddonClassWizard_NewAddon;
 	public static String NewAddonClassWizard_NewAddonClass;
 	public static String NewApplicationModelWizard_IncludeDefaultAddons;
+	public static String NewApplicationWizardPage_AddLifecycleClass;
+	public static String NewApplicationWizardPage_AddOptionCleanPersistedState;
+	public static String NewApplicationWizardPage_ConfigureApplication;
+	public static String NewApplicationWizardPage_CreateSampleContent;
+	public static String NewApplicationWizardPage_CSSStyle;
+	public static String NewApplicationWizardPage_Dots;
+	public static String NewApplicationWizardPage_E4Lifecycle;
+	public static String NewApplicationWizardPage_Eclipse4Application;
+	public static String NewApplicationWizardPage_EnableDevelopmentMode;
+	public static String NewApplicationWizardPage_Height;
+	public static String NewApplicationWizardPage_InputValueEmpty;
+	public static String NewApplicationWizardPage_InputValueError;
+	public static String NewApplicationWizardPage_LifecycleClassName;
+	public static String NewApplicationWizardPage_Name;
+	public static String NewApplicationWizardPage_NewE4ApplicationWizardPage;
+	public static String NewApplicationWizardPage_OnlyNumericValues;
+	public static String NewApplicationWizardPage_PreferenceCustomization;
+	public static String NewApplicationWizardPage_Product;
+	public static String NewApplicationWizardPage_Properties;
+	public static String NewApplicationWizardPage_Property;
+	public static String NewApplicationWizardPage_Rectangle;
+	public static String NewApplicationWizardPage_SetRectangle;
+	public static String NewApplicationWizardPage_TemplateOption;
+	public static String NewApplicationWizardPage_ValueShouldNotBeEmpty;
+	public static String NewApplicationWizardPage_Width;
+	public static String NewApplicationWizardPage_X;
+	public static String NewApplicationWizardPage_Y;
 	public static String NewDynamicMenuContributionClassWizard_AboutToShowMethod;
 	public static String NewDynamicMenuContributionClassWizard_CreateNewContribution;
 	public static String NewDynamicMenuContributionClassWizard_NewDynamicContribution;
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
index 5299e7d2c0..8a4f5dda56 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
@@ -27,6 +27,33 @@ E4NewProjectWizard_Save=Save
 NewAddonClassWizard_NewAddon=New Addon
 NewAddonClassWizard_NewAddonClass=Create a new addon class
 NewApplicationModelWizard_IncludeDefaultAddons=Include default addons
+NewApplicationWizardPage_AddLifecycleClass=Add a lifecycle class
+NewApplicationWizardPage_AddOptionCleanPersistedState=Add option -clearPersistedState to the Product's Program Arguments
+NewApplicationWizardPage_ConfigureApplication=Configure application with special values.
+NewApplicationWizardPage_CreateSampleContent=Create sample content (parts, menu etc.)
+NewApplicationWizardPage_CSSStyle=CSS Style:
+NewApplicationWizardPage_Dots=...
+NewApplicationWizardPage_E4Lifecycle=E4LifeCycle
+NewApplicationWizardPage_Eclipse4Application=Eclipse 4 Application
+NewApplicationWizardPage_EnableDevelopmentMode=Enable development mode for application model
+NewApplicationWizardPage_Height=Height:
+NewApplicationWizardPage_InputValueEmpty=Input value empty
+NewApplicationWizardPage_InputValueError=Input value error
+NewApplicationWizardPage_LifecycleClassName=LifeCycle class name:
+NewApplicationWizardPage_Name=Name:*
+NewApplicationWizardPage_NewE4ApplicationWizardPage=New Eclipse 4 Application Wizard Page
+NewApplicationWizardPage_OnlyNumericValues=Only numeric is allowed\!
+NewApplicationWizardPage_PreferenceCustomization=Preference Customization:
+NewApplicationWizardPage_Product=Product
+NewApplicationWizardPage_Properties=Properties
+NewApplicationWizardPage_Property=Property "
+NewApplicationWizardPage_Rectangle=Rect
+NewApplicationWizardPage_SetRectangle=Set Rect
+NewApplicationWizardPage_TemplateOption=Template option
+NewApplicationWizardPage_ValueShouldNotBeEmpty=Value shoud not be empty\!
+NewApplicationWizardPage_Width=Width:
+NewApplicationWizardPage_X=X:
+NewApplicationWizardPage_Y=Y:
 NewDynamicMenuContributionClassWizard_AboutToShowMethod=AboutToShow Method
 NewDynamicMenuContributionClassWizard_CreateNewContribution=Create a new dynamic menu contribution class
 NewDynamicMenuContributionClassWizard_NewDynamicContribution=New Dynamic Menu Contribution
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
index dfe2e28d1e..fe9d24e542 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
@@ -18,6 +18,7 @@
 import java.util.Map;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -53,6 +54,9 @@
  * @author jin.liu (jin.liu@soyatec.com)
  */
 public class NewApplicationWizardPage extends WizardPage {
+	private static final String TRUE = "TRUE"; //$NON-NLS-1$
+	private static final String TRUESMALL = "true"; //$NON-NLS-1$
+	private static final String FALSE = "FALSE"; //$NON-NLS-1$
 	public static final String E4_APPLICATION = "org.eclipse.e4.ui.workbench.swt.E4Application"; //$NON-NLS-1$
 	public static final String APPLICATION_CSS_PROPERTY = "applicationCSS"; //$NON-NLS-1$
 	public static final String LIFECYCLE_URI_PROPERTY = "lifeCycleURI"; //$NON-NLS-1$
@@ -79,13 +83,13 @@ public class NewApplicationWizardPage extends WizardPage {
 
 	protected NewApplicationWizardPage(IProjectProvider projectProvider,
 		AbstractFieldData pluginData) {
-		super("New Eclipse 4 Application Wizard Page");
+		super(Messages.NewApplicationWizardPage_NewE4ApplicationWizardPage);
 		this.projectProvider = projectProvider;
 		this.pluginData = pluginData;
 		data = new HashMap<String, String>();
-		data.put(richSample, "FALSE");// minimalist by default
-		setTitle("Eclipse 4 Application");
-		setMessage("Configure application with special values.");
+		data.put(richSample, FALSE);// minimalist by default
+		setTitle(Messages.NewApplicationWizardPage_Eclipse4Application);
+		setMessage(Messages.NewApplicationWizardPage_ConfigureApplication);
 	}
 
 	public IProject getProject() {
@@ -124,7 +128,7 @@ public void createControl(Composite parent) {
 	private Group createTemplateGroup(Composite parent) {
 		final Group group = new Group(parent, SWT.NONE);
 		group.setLayout(new GridLayout(3, false));
-		group.setText("Template option");
+		group.setText(Messages.NewApplicationWizardPage_TemplateOption);
 
 		richSampleCheckbox = new Button(group, SWT.CHECK);
 
@@ -132,10 +136,10 @@ private Group createTemplateGroup(Composite parent) {
 		richSampleCheckbox.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				data.put(richSample, richSampleCheckbox.getSelection() ? "TRUE" : "FALSE");
+				data.put(richSample, richSampleCheckbox.getSelection() ? TRUE : FALSE);
 			}
 		});
-		richSampleCheckbox.setText("Create sample content (parts, menu etc.)");
+		richSampleCheckbox.setText(Messages.NewApplicationWizardPage_CreateSampleContent);
 		richSampleCheckbox.setLayoutData(new GridData(SWT.BEGINNING, SWT.TOP, false, false, 2, 1));
 
 		{
@@ -143,26 +147,26 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					lifeCycleName.setEnabled(generateLifecycleClassCheckbox.getSelection());
-					data.put(generateLifecycle, generateLifecycleClassCheckbox.getSelection() ? "TRUE" : "FALSE");
+					data.put(generateLifecycle, generateLifecycleClassCheckbox.getSelection() ? TRUE : FALSE);
 				}
 			};
 
 			generateLifecycleClassCheckbox = new Button(group, SWT.CHECK);
 			generateLifecycleClassCheckbox.setSelection(false);
 
-			generateLifecycleClassCheckbox.setText("Add a lifecycle class");
+			generateLifecycleClassCheckbox.setText(Messages.NewApplicationWizardPage_AddLifecycleClass);
 			generateLifecycleClassCheckbox.setLayoutData(new GridData(SWT.BEGINNING, SWT.TOP, false, false, 2, 1));
 			generateLifecycleClassCheckbox.addSelectionListener(listener);
 
 			new Label(group, SWT.NONE);
 			final Label lbl = new Label(group, SWT.NONE);
-			lbl.setText("LifeCycle class name:");
+			lbl.setText(Messages.NewApplicationWizardPage_LifecycleClassName);
 			final GridData gd = new GridData();
 			gd.horizontalIndent = 20;
 			lbl.setLayoutData(gd);
 
 			lifeCycleName = new Text(group, SWT.BORDER);
-			lifeCycleName.setText("E4LifeCycle");
+			lifeCycleName.setText(Messages.NewApplicationWizardPage_E4Lifecycle);
 			lifeCycleName.setEnabled(false);
 			lifeCycleName.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
 			lifeCycleName.addModifyListener(new ModifyListener() {
@@ -233,7 +237,7 @@ public String getExtraTooltipInfo() {
 
 	private Group createPropertyGroup(Composite control) {
 		final Group group = new Group(control, SWT.NONE);
-		group.setText("Properties");
+		group.setText(Messages.NewApplicationWizardPage_Properties);
 
 		group.setLayout(new GridLayout(3, false));
 
@@ -245,7 +249,7 @@ private void createPropertyItem(final Composite parent,
 
 		if (property.getType() == Boolean.class) {
 			final Button button = new Button(parent, SWT.CHECK);
-			button.setSelection("true".equalsIgnoreCase(property.getValue()));
+			button.setSelection(TRUESMALL.equalsIgnoreCase(property.getValue()));
 			button.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -274,7 +278,7 @@ public void handleEvent(Event event) {
 			if (property.getType() == Color.class
 				|| property.getType() == Rectangle.class) {
 				final Button button = new Button(parent, SWT.PUSH);
-				button.setText("...");
+				button.setText(Messages.NewApplicationWizardPage_Dots);
 				button.addSelectionListener(new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
@@ -293,7 +297,7 @@ private void createLabelForField(final Composite parent,
 		final Label label = new Label(parent, SWT.NONE);
 		label.setText(property.getLabel());
 		label.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_BLUE));
-		label.setToolTipText("Property \"" + property.getName() + "\"");
+		label.setToolTipText(Messages.NewApplicationWizardPage_Property + property.getName() + "\""); //$NON-NLS-1$
 		if (property.getExtraTooltipInfo() != null) {
 			label.setToolTipText(label.getToolTipText() + EOL
 				+ property.getExtraTooltipInfo());
@@ -323,12 +327,12 @@ private void handleLinkEvent(PropertyData property, Text valueText,
 	/**
 	 * exchange the color pattern of hex numeric
 	 *
-	 * @param number
+	 * @param color
 	 * @return
 	 */
 	public String hexColorConvert(String color) {
 		if (color.length() == 1) {
-			return "0" + color;
+			return "0" + color; //$NON-NLS-1$
 		}
 		return color;
 	}
@@ -354,29 +358,29 @@ protected Button createButton(Composite parent, int id,
 			protected Control createDialogArea(final Composite parent) {
 				final Composite composite = (Composite) super
 					.createDialogArea(parent);
-				composite.getShell().setText("Set Rect");
+				composite.getShell().setText(Messages.NewApplicationWizardPage_SetRectangle);
 				final Group group = new Group(composite, SWT.NONE);
-				group.setText("Rect");
+				group.setText(Messages.NewApplicationWizardPage_Rectangle);
 				final GridLayout gridLayout = new GridLayout();
 				gridLayout.numColumns = 4;
 				group.setLayout(gridLayout);
 
 				final Label xPointLabel = new Label(group, SWT.NONE);
-				xPointLabel.setText("X:");
+				xPointLabel.setText(Messages.NewApplicationWizardPage_X);
 				xPointText = new Text(group, SWT.BORDER);
 				final VerifyListener verifyListener = createVerifyListener(parent
 					.getShell());
 				xPointText.addVerifyListener(verifyListener);
 				final Label yPointLabel = new Label(group, SWT.NONE);
-				yPointLabel.setText("Y:");
+				yPointLabel.setText(Messages.NewApplicationWizardPage_Y);
 				yPointText = new Text(group, SWT.BORDER);
 				yPointText.addVerifyListener(verifyListener);
 				final Label widthLabel = new Label(group, SWT.NONE);
-				widthLabel.setText("Width:");
+				widthLabel.setText(Messages.NewApplicationWizardPage_Width);
 				widthText = new Text(group, SWT.BORDER);
 				widthText.addVerifyListener(verifyListener);
 				final Label heighttLabel = new Label(group, SWT.NONE);
-				heighttLabel.setText("Height:");
+				heighttLabel.setText(Messages.NewApplicationWizardPage_Height);
 				heightText = new Text(group, SWT.BORDER);
 				heightText.addVerifyListener(verifyListener);
 
@@ -393,11 +397,11 @@ protected void buttonPressed(int buttonId) {
 					if (xPoint.length() == 0 || yPoint.length() == 0
 						|| width.length() == 0 || height.length() == 0) {
 						MessageDialog.openWarning(parent.getShell(),
-							"Input value empty",
-							"Value shoud not be empty!");
+							Messages.NewApplicationWizardPage_InputValueEmpty,
+							Messages.NewApplicationWizardPage_ValueShouldNotBeEmpty);
 					} else {
-						valueText.setText(xPoint + "," + yPoint + "," + width
-							+ "," + height);
+						valueText.setText(xPoint + "," + yPoint + "," + width //$NON-NLS-1$ //$NON-NLS-2$
+							+ "," + height); //$NON-NLS-1$
 						okPressed();
 					}
 				} else if (IDialogConstants.CANCEL_ID == buttonId) {
@@ -418,10 +422,10 @@ public VerifyListener createVerifyListener(final Shell shell) {
 			@Override
 			public void verifyText(VerifyEvent e) {
 				final char c = e.character;
-				if ("0123456789".indexOf(c) == -1) {
+				if ("0123456789".indexOf(c) == -1) { //$NON-NLS-1$
 					e.doit = false;
-					MessageDialog.openWarning(shell, "Input value error",
-						"Only numeric is allowed!");
+					MessageDialog.openWarning(shell, Messages.NewApplicationWizardPage_InputValueError,
+						Messages.NewApplicationWizardPage_OnlyNumericValues);
 					return;
 				}
 			}
@@ -433,7 +437,7 @@ private void handleTextEvent(String property, Text valueText) {
 			return;
 		}
 		String value = valueText.getText();
-		if (value.equals("")) {
+		if (value.equals("")) { //$NON-NLS-1$
 			value = null;
 		}
 		data.put(property, value);
@@ -448,12 +452,12 @@ protected void handleCheckBoxEvent(String property, boolean selection) {
 
 	private Group createProductGroup(Composite control) {
 		final Group proGroup = new Group(control, SWT.NONE);
-		proGroup.setText("Product");
+		proGroup.setText(Messages.NewApplicationWizardPage_Product);
 
 		proGroup.setLayout(new GridLayout(2, false));
 
 		final Label proNameLabel = new Label(proGroup, SWT.NONE);
-		proNameLabel.setText("Name:*");
+		proNameLabel.setText(Messages.NewApplicationWizardPage_Name);
 
 		proNameText = new Text(proGroup, SWT.BORDER);
 		proNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -470,15 +474,15 @@ public void handleEvent(Event event) {
 	protected PropertyData[] getPropertyData() {
 		if (PROPERTIES == null) {
 			PROPERTIES = new PropertyData[] {
-				new PropertyData(APPLICATION_CSS_PROPERTY, "CSS Style:",
-					"css/default.css", String.class, true),
-				new PropertyData(
-					IProductConstants.PREFERENCE_CUSTOMIZATION,
-					"Preference Customization:", "", String.class, true),
-				new PropertyData(CLEAR_PERSISTED_STATE,
-					"Enable development mode for application model",
-					"true", Boolean.class, true,
-					"Add option -clearPersistedState to the Product's Program Arguments") }; // plugin_customization.ini
+				new PropertyData(APPLICATION_CSS_PROPERTY, Messages.NewApplicationWizardPage_CSSStyle,
+					"css/default.css", String.class, true), //$NON-NLS-1$
+					new PropertyData(
+						IProductConstants.PREFERENCE_CUSTOMIZATION,
+						Messages.NewApplicationWizardPage_PreferenceCustomization, "", String.class, true), //$NON-NLS-1$
+						new PropertyData(CLEAR_PERSISTED_STATE,
+					Messages.NewApplicationWizardPage_EnableDevelopmentMode,
+					TRUESMALL, Boolean.class, true,
+					Messages.NewApplicationWizardPage_AddOptionCleanPersistedState) }; // plugin_customization.ini
 		}
 		return PROPERTIES;
 	}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/ResourceLocator.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/ResourceLocator.java
index 1e2c5e29ff..ecb0627c5b 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/ResourceLocator.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/ResourceLocator.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Soyatec - initial API and implementation
+ * Soyatec - initial API and implementation
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -18,7 +18,7 @@
 import org.eclipse.e4.internal.tools.ToolsPlugin;
 
 public class ResourceLocator {
-	private static final String TEMPLATE_FOLDER = "templates";
+	private static final String TEMPLATE_FOLDER = "templates"; //$NON-NLS-1$
 
 	private static ResourceLocator instance = new ResourceLocator();
 
@@ -30,19 +30,19 @@ public static ResourceLocator getInstance() {
 	}
 
 	public static URL getProjectTemplateFiles(String folder)
-			throws IOException {
-		Plugin plugin = getResorucePlugin();
-		URL installURL = plugin.getBundle().getEntry(
-				"/" + TEMPLATE_FOLDER + "/" + folder);
+		throws IOException {
+		final Plugin plugin = getResorucePlugin();
+		final URL installURL = plugin.getBundle().getEntry(
+			"/" + TEMPLATE_FOLDER + "/" + folder); //$NON-NLS-1$ //$NON-NLS-2$
 		// FileLocator.toFileURL(installURL);
-		URL corePath = FileLocator.resolve(installURL);
+		final URL corePath = FileLocator.resolve(installURL);
 		return corePath;
 	}
 
 	public static URL getFile(String relativePath) throws IOException {
-		Plugin plugin = getResorucePlugin();
-		URL installURL = plugin.getBundle().getEntry(relativePath);
-		URL corePath = FileLocator.resolve(installURL);
+		final Plugin plugin = getResorucePlugin();
+		final URL installURL = plugin.getBundle().getEntry(relativePath);
+		final URL corePath = FileLocator.resolve(installURL);
 		return corePath;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/SimpleTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/SimpleTemplate.java
index d13efba8d9..57a52b6e67 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/SimpleTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/SimpleTemplate.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -15,19 +15,20 @@
 /**
  * A <em>very</em> basic template processor.<br />
  * Any value between pairs of @@ will be substituted by the value in a map.<br />
- * Any values not in the map will be replaced by an empty string.
- * <br /> <br />
+ * Any values not in the map will be replaced by an empty string. <br />
+ * <br />
  * Behavior is undefined if keys or values contain the @@ marker.
+ * 
  * @author Steven Spungin
  *
  */
 public class SimpleTemplate {
 
 	public static String process(String source, Map<String, String> substitutionMap) {
-		for (String key : substitutionMap.keySet()) {
-			source = source.replaceAll("@@" + key + "@@", substitutionMap.get(key));
+		for (final String key : substitutionMap.keySet()) {
+			source = source.replaceAll("@@" + key + "@@", substitutionMap.get(key)); //$NON-NLS-1$ //$NON-NLS-2$
 		}
-		source = source.replaceAll("@@.*?@@", "");
+		source = source.replaceAll("@@.*?@@", ""); //$NON-NLS-1$ //$NON-NLS-2$
 		return source;
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java
index ce2c7f49bc..69558522db 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java
@@ -4,10 +4,10 @@
  * are made available under the 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:
- *     Soyatec - initial API and implementation
- *     Sopot Cela - ongoing enhancements
+ * Soyatec - initial API and implementation
+ * Sopot Cela - ongoing enhancements
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -42,109 +42,116 @@
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 
 public class TemplateOperation extends WorkspaceModifyOperation implements
-		IVariableProvider {
+IVariableProvider {
 
 	private final URL templateDirectory;
 	private final IContainer target;
 	private final Map<String, String> keys;
 	private final Set<String> binaryExtentions;
-	private boolean isMinimalist;
+	private final boolean isMinimalist;
 
 	public TemplateOperation(URL source, IContainer target,
-			Map<String, String> keys, Set<String> binaryExtentions, boolean justProduct) {
+		Map<String, String> keys, Set<String> binaryExtentions, boolean justProduct) {
 		templateDirectory = source;
 		this.binaryExtentions = binaryExtentions;
 		this.target = target;
 		this.keys = keys;
-		this.isMinimalist = justProduct;
+		isMinimalist = justProduct;
 	}
 
 	@Override
 	protected void execute(IProgressMonitor monitor) throws CoreException,
-			InvocationTargetException, InterruptedException {
+	InvocationTargetException, InterruptedException {
 		monitor.setTaskName(PDEUIMessages.AbstractTemplateSection_generating);
 
 		if ("jar".equals(templateDirectory.getProtocol())) { //$NON-NLS-1$
-			String file = templateDirectory.getFile();
-			int exclamation = file.indexOf('!');
-			if (exclamation < 0)
+			final String file = templateDirectory.getFile();
+			final int exclamation = file.indexOf('!');
+			if (exclamation < 0) {
 				return;
+			}
 			URL fileUrl = null;
 			try {
 				fileUrl = new URL(file.substring(0, exclamation));
-			} catch (MalformedURLException mue) {
+			} catch (final MalformedURLException mue) {
 				ToolsPlugin.logError(mue);
 				return;
 			}
-			File pluginJar = new File(fileUrl.getFile());
-			if (!pluginJar.exists())
+			final File pluginJar = new File(fileUrl.getFile());
+			if (!pluginJar.exists()) {
 				return;
-			String templateDirectory = file.substring(exclamation + 1); // "/some/path/"
-			IPath path = new Path(templateDirectory);
+			}
+			final String templateDirectory = file.substring(exclamation + 1); // "/some/path/"
+			final IPath path = new Path(templateDirectory);
 			ZipFile zipFile = null;
 			try {
 				zipFile = new ZipFile(pluginJar);
 				generateFiles(zipFile, path, target, monitor);
-			} catch (ZipException ze) {
-			} catch (IOException ioe) {
+			} catch (final ZipException ze) {
+			} catch (final IOException ioe) {
 			} finally {
 				if (zipFile != null) {
 					try {
 						zipFile.close();
-					} catch (IOException e) {
+					} catch (final IOException e) {
 					}
 				}
 			}
 		} else if ("file".equals(templateDirectory.getProtocol())) { //$NON-NLS-1$
-			File directory = new File(templateDirectory.getFile());
-			if (!directory.exists())
+			final File directory = new File(templateDirectory.getFile());
+			if (!directory.exists()) {
 				return;
+			}
 			generateFiles(directory, target, true, monitor);
 		}
 	}
 
 	private void generateFiles(File src, IContainer dst, boolean firstLevel,
-			IProgressMonitor monitor) throws CoreException {
-		if ((!firstLevel)&&(isMinimalist))
-		return;
-		File[] members = src.listFiles();
+		IProgressMonitor monitor) throws CoreException {
+		if (!firstLevel && isMinimalist) {
+			return;
+		}
+		final File[] members = src.listFiles();
 
 		for (int i = 0; i < members.length; i++) {
-			File member = members[i];
-			String name = member.getName();
+			final File member = members[i];
+			final String name = member.getName();
 			if (member.isDirectory()) {
-				if (".svn".equals(name) || "cvs".equalsIgnoreCase(name))
+				if (".svn".equals(name) || "cvs".equalsIgnoreCase(name)) { //$NON-NLS-1$ //$NON-NLS-2$
 					continue;
+				}
 				IContainer dstContainer = null;
 
 				if (dstContainer == null) {
-					String folderName = getProcessedString(name, name);
+					final String folderName = getProcessedString(name, name);
 					dstContainer = dst.getFolder(new Path(folderName));
 				}
-				if (dstContainer != null && !dstContainer.exists())
+				if (dstContainer != null && !dstContainer.exists()) {
 					((IFolder) dstContainer).create(true, true, monitor);
-			
+				}
+
 				generateFiles(member, dstContainer, false, monitor);
 			} else {
 				InputStream in = null;
 				try {
 					in = new FileInputStream(member);
 					copyFile(name, in, dst, monitor);
-				} catch (IOException ioe) {
+				} catch (final IOException ioe) {
 				} finally {
-					if (in != null)
+					if (in != null) {
 						try {
 							in.close();
-						} catch (IOException ioe2) {
+						} catch (final IOException ioe2) {
 						}
+					}
 				}
 			}
 		}
 	}
 
 	/**
-	 * 
-	 * 
+	 *
+	 *
 	 * @param zipFile
 	 * @param path
 	 * @param dst
@@ -152,15 +159,15 @@ private void generateFiles(File src, IContainer dst, boolean firstLevel,
 	 * @throws CoreException
 	 */
 	private void generateFiles(ZipFile zipFile, IPath path, IContainer dst,
-			IProgressMonitor monitor) throws CoreException {
-		int pathLength = path.segmentCount();
+		IProgressMonitor monitor) throws CoreException {
+		final int pathLength = path.segmentCount();
 		// Immidiate children
-		Map childZipEntries = new HashMap(); // "dir/" or "dir/file.java"
+		final Map childZipEntries = new HashMap(); // "dir/" or "dir/file.java"
 
-		for (Enumeration zipEntries = zipFile.entries(); zipEntries
-				.hasMoreElements();) {
-			ZipEntry zipEntry = (ZipEntry) zipEntries.nextElement();
-			IPath entryPath = new Path(zipEntry.getName());
+		for (final Enumeration zipEntries = zipFile.entries(); zipEntries
+			.hasMoreElements();) {
+			final ZipEntry zipEntry = (ZipEntry) zipEntries.nextElement();
+			final IPath entryPath = new Path(zipEntry.getName());
 			if (entryPath.segmentCount() <= pathLength) {
 				// ancestor or current directory
 				continue;
@@ -172,55 +179,57 @@ private void generateFiles(ZipFile zipFile, IPath path, IContainer dst,
 			if (entryPath.segmentCount() == pathLength + 1) {
 				childZipEntries.put(zipEntry.getName(), zipEntry);
 			} else {
-				String name = entryPath.uptoSegment(pathLength + 1)
-						.addTrailingSeparator().toString();
+				final String name = entryPath.uptoSegment(pathLength + 1)
+					.addTrailingSeparator().toString();
 				if (!childZipEntries.containsKey(name)) {
-					ZipEntry dirEntry = new ZipEntry(name);
+					final ZipEntry dirEntry = new ZipEntry(name);
 					childZipEntries.put(name, dirEntry);
 				}
 			}
 		}
 
-		for (Iterator it = childZipEntries.values().iterator(); it.hasNext();) {
-			ZipEntry zipEnry = (ZipEntry) it.next();
-			String name = new Path(zipEnry.getName()).lastSegment().toString();
+		for (final Iterator it = childZipEntries.values().iterator(); it.hasNext();) {
+			final ZipEntry zipEnry = (ZipEntry) it.next();
+			final String name = new Path(zipEnry.getName()).lastSegment().toString();
 			if (zipEnry.isDirectory()) {
 				IContainer dstContainer = null;
 
 				if (dstContainer == null) {
-					String folderName = getProcessedString(name, name);
+					final String folderName = getProcessedString(name, name);
 					dstContainer = dst.getFolder(new Path(folderName));
 				}
-				if (dstContainer != null && !dstContainer.exists())
+				if (dstContainer != null && !dstContainer.exists()) {
 					((IFolder) dstContainer).create(true, true, monitor);
+				}
 				generateFiles(zipFile, path.append(name), dstContainer, monitor);
 			} else {
 				InputStream in = null;
 				try {
 					in = zipFile.getInputStream(zipEnry);
 					copyFile(name, in, dst, monitor);
-				} catch (IOException ioe) {
+				} catch (final IOException ioe) {
 				} finally {
-					if (in != null)
+					if (in != null) {
 						try {
 							in.close();
-						} catch (IOException ioe2) {
+						} catch (final IOException ioe2) {
 						}
+					}
 				}
 			}
 		}
 	}
 
 	private void copyFile(String fileName, InputStream input, IContainer dst,
-			IProgressMonitor monitor) throws CoreException {
-		String targetFileName = getProcessedString(fileName, fileName);
+		IProgressMonitor monitor) throws CoreException {
+		final String targetFileName = getProcessedString(fileName, fileName);
 
 		monitor.subTask(targetFileName);
-		IFile dstFile = dst.getFile(new Path(targetFileName));
+		final IFile dstFile = dst.getFile(new Path(targetFileName));
 
 		try {
-			InputStream stream = isBinary(fileName) ? input
-					: getProcessedStream(fileName, input);
+			final InputStream stream = isBinary(fileName) ? input
+				: getProcessedStream(fileName, input);
 			if (dstFile.exists()) {
 				dstFile.setContents(stream, true, true, monitor);
 			} else {
@@ -228,12 +237,12 @@ private void copyFile(String fileName, InputStream input, IContainer dst,
 			}
 			stream.close();
 
-		} catch (IOException e) {
+		} catch (final IOException e) {
 		}
 	}
 
 	protected void copyFile(String fileName, InputStream input, IContainer dst,
-			final String destPath, IProgressMonitor monitor)
+		final String destPath, IProgressMonitor monitor)
 			throws CoreException {
 		String targetFileName = null;
 		if (destPath == null) {
@@ -243,11 +252,11 @@ protected void copyFile(String fileName, InputStream input, IContainer dst,
 		}
 
 		monitor.subTask(targetFileName);
-		IFile dstFile = dst.getFile(new Path(targetFileName));
+		final IFile dstFile = dst.getFile(new Path(targetFileName));
 
 		try {
-			InputStream stream = isBinary(fileName) ? input
-					: getProcessedStream(fileName, input);
+			final InputStream stream = isBinary(fileName) ? input
+				: getProcessedStream(fileName, input);
 			if (dstFile.exists()) {
 				dstFile.setContents(stream, true, true, monitor);
 			} else {
@@ -255,12 +264,12 @@ protected void copyFile(String fileName, InputStream input, IContainer dst,
 			}
 			stream.close();
 
-		} catch (IOException e) {
+		} catch (final IOException e) {
 		}
 	}
 
 	/**
-	 * 
+	 *
 	 * @param fileName
 	 * @param input
 	 * @param dst
@@ -269,21 +278,21 @@ protected void copyFile(String fileName, InputStream input, IContainer dst,
 	 * @throws CoreException
 	 */
 	public void copyFile(String fileName, InputStream input, IContainer dst,
-			final String basePath, final String destName,
-			IProgressMonitor monitor) throws CoreException {
-		if (basePath == null || basePath.equals("")) {
+		final String basePath, final String destName,
+		IProgressMonitor monitor) throws CoreException {
+		if (basePath == null || basePath.equals("")) { //$NON-NLS-1$
 			copyFile(fileName, input, dst, monitor);
 		}
 
-		String targetFileName = destName == null ? getProcessedString(fileName,
-				fileName) : destName;
+		final String targetFileName = destName == null ? getProcessedString(fileName,
+			fileName) : destName;
 
 		monitor.subTask(targetFileName);
-		IFile dstFile = dst.getFile(new Path(basePath + targetFileName));
+		final IFile dstFile = dst.getFile(new Path(basePath + targetFileName));
 
 		try {
-			InputStream stream = isBinary(fileName) ? input
-					: getProcessedStream(fileName, input);
+			final InputStream stream = isBinary(fileName) ? input
+				: getProcessedStream(fileName, input);
 			if (dstFile.exists()) {
 				dstFile.setContents(stream, true, true, monitor);
 			} else {
@@ -291,7 +300,7 @@ public void copyFile(String fileName, InputStream input, IContainer dst,
 			}
 			stream.close();
 
-		} catch (IOException e) {
+		} catch (final IOException e) {
 		}
 	}
 
@@ -300,27 +309,29 @@ private boolean isBinary(String fileName) {
 			return false;
 		}
 
-		String ext = getfileExtention(fileName);
-		if (ext == null)
+		final String ext = getfileExtention(fileName);
+		if (ext == null) {
 			return false;
+		}
 		return binaryExtentions.contains(ext);
 	}
 
 	private String getfileExtention(String name) {
-		int indexOf = name.lastIndexOf('.');
-		if (indexOf == -1)
+		final int indexOf = name.lastIndexOf('.');
+		if (indexOf == -1) {
 			return null;
+		}
 		return name.substring(indexOf);
 	}
 
 	private InputStream getProcessedStream(String fileName, InputStream stream)
-			throws IOException, CoreException {
-		InputStreamReader reader = new InputStreamReader(stream);
-		int bufsize = 1024;
-		char[] cbuffer = new char[bufsize];
+		throws IOException, CoreException {
+		final InputStreamReader reader = new InputStreamReader(stream);
+		final int bufsize = 1024;
+		final char[] cbuffer = new char[bufsize];
 		int read = 0;
-		StringBuffer keyBuffer = new StringBuffer();
-		StringBuffer outBuffer = new StringBuffer();
+		final StringBuffer keyBuffer = new StringBuffer();
+		final StringBuffer outBuffer = new StringBuffer();
 
 		boolean replacementMode = false;
 		boolean almostReplacementMode = false;
@@ -328,10 +339,10 @@ private InputStream getProcessedStream(String fileName, InputStream stream)
 		while (read != -1) {
 			read = reader.read(cbuffer);
 			for (int i = 0; i < read; i++) {
-				char c = cbuffer[i];
+				final char c = cbuffer[i];
 
 				if (escape) {
-					StringBuffer buf = outBuffer;
+					final StringBuffer buf = outBuffer;
 					buf.append(c);
 					escape = false;
 					continue;
@@ -342,9 +353,9 @@ private InputStream getProcessedStream(String fileName, InputStream stream)
 						almostReplacementMode = false;
 					} else if (replacementMode) {
 						replacementMode = false;
-						String key = keyBuffer.toString();
-						String value = key.length() == 0 ? "@@" //$NON-NLS-1$
-								: getReplacementString(key);
+						final String key = keyBuffer.toString();
+						final String value = key.length() == 0 ? "@@" //$NON-NLS-1$
+							: getReplacementString(key);
 						outBuffer.append(value);
 						keyBuffer.delete(0, keyBuffer.length());
 					} else if (almostReplacementMode) {
@@ -353,11 +364,12 @@ private InputStream getProcessedStream(String fileName, InputStream stream)
 						almostReplacementMode = true;
 					}
 				} else {
-					if (replacementMode)
+					if (replacementMode) {
 						keyBuffer.append(c);
-					else {
-						if (almostReplacementMode)
+					} else {
+						if (almostReplacementMode) {
 							outBuffer.append('@');
+						}
 						outBuffer.append(c);
 						almostReplacementMode = false;
 					}
@@ -371,17 +383,18 @@ private InputStream getProcessedStream(String fileName, InputStream stream)
 	}
 
 	private String getProcessedString(String fileName, String source) {
-		if (source.indexOf('$') == -1)
+		if (source.indexOf('$') == -1) {
 			return source;
+		}
 		int loc = -1;
-		StringBuffer buffer = new StringBuffer();
+		final StringBuffer buffer = new StringBuffer();
 		boolean replacementMode = false;
 		for (int i = 0; i < source.length(); i++) {
-			char c = source.charAt(i);
+			final char c = source.charAt(i);
 			if (c == '$') {
 				if (replacementMode) {
-					String key = source.substring(loc, i);
-					String value = key.length() == 0 ? "$" : getReplacementString(key); //$NON-NLS-1$
+					final String key = source.substring(loc, i);
+					final String value = key.length() == 0 ? "$" : getReplacementString(key); //$NON-NLS-1$
 					buffer.append(value);
 					replacementMode = false;
 				} else {
@@ -389,17 +402,19 @@ private String getProcessedString(String fileName, String source) {
 					loc = i + 1;
 					continue;
 				}
-			} else if (!replacementMode)
+			} else if (!replacementMode) {
 				buffer.append(c);
+			}
 		}
 		return buffer.toString();
 	}
 
 	public String getReplacementString(String key) {
-		String result = keys.get(key);
+		final String result = keys.get(key);
 		return result != null ? result : key;
 	}
 
+	@Override
 	public Object getValue(String variable) {
 		return getReplacementString(variable);
 	}

From b25bfefc92beb6721172a818d46afce08346bee7 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Tue, 14 Oct 2014 07:13:24 +0200
Subject: [PATCH 0837/1286] Bug 444692 - Remove Warnings - Applied proper
 project specific setting on org.eclipse.e4.tools.emf.editor3x

---
 .../org.eclipse.core.resources.prefs          |   6 +
 .../.settings/org.eclipse.jdt.core.prefs      | 411 ++++++++++++++++++
 .../.settings/org.eclipse.jdt.launching.prefs |   2 +
 .../.settings/org.eclipse.jdt.ui.prefs        | 115 +++++
 .../.settings/org.eclipse.pde.api.tools.prefs |  97 +++++
 .../.settings/org.eclipse.pde.prefs           |  32 ++
 6 files changed, 663 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.resources.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.launching.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.api.tools.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.prefs

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..f548abbf0b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
index c537b63063..c94829777b 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,418 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000000..3bb235278e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..791508d164
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,115 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=true
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=true
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000000..e4e3c0071e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,97 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..0bbee3c4b8
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1

From 5bd0ce2bb8fd2dcd20b30dd65dfbccd4ef77a91b Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Wed, 15 Oct 2014 19:31:41 +0200
Subject: [PATCH 0838/1286] Bug 444340 - Externalize Strings - Refactored
 Preferences to constants

---
 .../editor3x/ModelEditorPreferencePage.java   | 48 ++++++++++++-------
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../ui/common/ContributionURIValidator.java   |  1 -
 .../emf/ui/common/ModelEditorPreferences.java | 14 ++++++
 .../emf/ui/{internal => common}/Plugin.java   |  2 +-
 .../ui/internal/PreferenceInitializer.java    | 30 ++++++------
 .../emf/ui/internal/common/ModelEditor.java   | 15 +++---
 .../common/component/KeyBindingEditor.java    |  3 +-
 .../SaveDialogBoundsSettingsDialog.java       |  3 +-
 .../common/component/tabs/ListTab.java        |  7 +--
 .../dialogs/NonReferencedActionPage.java      |  3 +-
 .../dialogs/NonReferencedResourceDialog.java  |  3 +-
 12 files changed, 82 insertions(+), 49 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ModelEditorPreferences.java
 rename bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/{internal => common}/Plugin.java (70%)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
index acb7735f5c..b97ffe5808 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
@@ -1,12 +1,14 @@
 /*******************************************************************************
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - Bug 431735, Bug 437890, Bug 440469
+ * Steven Spungin <steven@spungin.tv> - Bug 431735, Bug 437890, Bug 440469
  ******************************************************************************/
 
 package org.eclipse.e4.tools.emf.editor3x;
 
 import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.e4.tools.emf.ui.common.ModelEditorPreferences;
+import org.eclipse.e4.tools.emf.ui.common.Plugin;
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.ColorFieldEditor;
 import org.eclipse.jface.preference.PreferencePage;
@@ -42,37 +44,42 @@ public ModelEditorPreferencePage(String title, ImageDescriptor image) {
 		super(title, image);
 	}
 
+	@Override
 	public void init(IWorkbench workbench) {
-		setPreferenceStore(new ScopedPreferenceStore(InstanceScope.INSTANCE, "org.eclipse.e4.tools.emf.ui"));
+		setPreferenceStore(new ScopedPreferenceStore(InstanceScope.INSTANCE, Plugin.ID));
 	}
 
 	@Override
 	protected Control createContents(Composite parent) {
-		Composite result = new Composite(parent, SWT.NONE);
+		final Composite result = new Composite(parent, SWT.NONE);
 		result.setLayout(new GridLayout());
 
 		{
-			Group group = new Group(result, SWT.NONE);
+			final Group group = new Group(result, SWT.NONE);
 			group.setText("Color");
 			group.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
 			group.setLayout(new GridLayout(2, false));
 
 			{
-				fColorValueNotRendered = new ColorFieldEditor("notRenderedColor", "Not rendered color", group);
+				fColorValueNotRendered = new ColorFieldEditor(ModelEditorPreferences.NOT_RENDERED_COLOR,
+					"Not rendered color", group);
 				fColorValueNotRendered.setPage(this);
 				fColorValueNotRendered.setPreferenceStore(getPreferenceStore());
 				fColorValueNotRendered.load();
 			}
 
 			{
-				fColorValueNotVisible = new ColorFieldEditor("notVisibleColor", "Not visible color", group);
+				fColorValueNotVisible = new ColorFieldEditor(ModelEditorPreferences.NOT_VISIBLE_COLOR,
+					"Not visible color", group);
 				fColorValueNotVisible.setPage(this);
 				fColorValueNotVisible.setPreferenceStore(getPreferenceStore());
 				fColorValueNotVisible.load();
 			}
 
 			{
-				fColorValueNotVisibleAndRendered = new ColorFieldEditor("notVisibleAndRenderedColor", "Not visible and not rendered color", group);
+				fColorValueNotVisibleAndRendered = new ColorFieldEditor(
+					ModelEditorPreferences.NOT_VISIBLE_AND_RENDERED_COLOR,
+					"Not visible and not rendered color", group);
 				fColorValueNotVisibleAndRendered.setPage(this);
 				fColorValueNotVisibleAndRendered.setPreferenceStore(getPreferenceStore());
 				fColorValueNotVisibleAndRendered.load();
@@ -80,33 +87,36 @@ protected Control createContents(Composite parent) {
 		}
 
 		{
-			Group group = new Group(result, SWT.NONE);
+			final Group group = new Group(result, SWT.NONE);
 			group.setText("Form Tab");
 			group.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
 			group.setLayout(new GridLayout(2, false));
 
 			{
-				Composite container = new Composite(group, SWT.NONE);
+				final Composite container = new Composite(group, SWT.NONE);
 				container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
-				fAutoGeneratedId = new BooleanFieldEditor("autoCreateElementId", "Autogenerate Element-Id", container);
+				fAutoGeneratedId = new BooleanFieldEditor(ModelEditorPreferences.AUTO_CREATE_ELEMENT_ID,
+					"Autogenerate Element-Id", container);
 				fAutoGeneratedId.setPage(this);
 				fAutoGeneratedId.setPreferenceStore(getPreferenceStore());
 				fAutoGeneratedId.load();
 			}
 
 			{
-				Composite container = new Composite(group, SWT.NONE);
+				final Composite container = new Composite(group, SWT.NONE);
 				container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
-				fShowXMIId = new BooleanFieldEditor("showXMIId", "Show XMI:ID", container);
+				fShowXMIId = new BooleanFieldEditor(ModelEditorPreferences.SHOW_XMI_ID, "Show XMI:ID", container);
 				fShowXMIId.setPage(this);
 				fShowXMIId.setPreferenceStore(getPreferenceStore());
 				fShowXMIId.load();
 			}
 
 			{
-				Composite container = new Composite(group, SWT.NONE);
+				final Composite container = new Composite(group, SWT.NONE);
 				container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
-				fShowSearch = new BooleanFieldEditor("tab-form-search-show", "Searchable tree on form tab\n" + "(forces read only XMI tab)\n" + "(requires reopening model)", container);
+				fShowSearch = new BooleanFieldEditor(ModelEditorPreferences.TAB_FORM_SEARCH_SHOW,
+					"Searchable tree on form tab\n"
+						+ "(forces read only XMI tab)\n" + "(requires reopening model)", container);
 				fShowSearch.setPage(this);
 				fShowSearch.setPreferenceStore(getPreferenceStore());
 				fShowSearch.load();
@@ -115,21 +125,23 @@ protected Control createContents(Composite parent) {
 		}
 
 		{
-			Group group = new Group(result, SWT.NONE);
+			final Group group = new Group(result, SWT.NONE);
 			group.setText("List Tab");
 			group.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
 			group.setLayout(new GridLayout(2, false));
 
 			{
-				Composite container = new Composite(group, SWT.NONE);
+				final Composite container = new Composite(group, SWT.NONE);
 				container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
 
-				fRememberColumns = new BooleanFieldEditor("list-tab-remember-columns", "Remember column settings when reopening editor  ", container);
+				fRememberColumns = new BooleanFieldEditor(ModelEditorPreferences.LIST_TAB_REMEMBER_COLUMNS,
+					"Remember column settings when reopening editor  ", container);
 				fRememberColumns.setPage(this);
 				fRememberColumns.setPreferenceStore(getPreferenceStore());
 				fRememberColumns.load();
 
-				fRememberFilters = new BooleanFieldEditor("list-tab-remember-filters", "Remember filter settings when reopening editor", container);
+				fRememberFilters = new BooleanFieldEditor(ModelEditorPreferences.LIST_TAB_REMEMBER_FILTERS,
+					"Remember filter settings when reopening editor", container);
 				fRememberFilters.setPage(this);
 				fRememberFilters.setPreferenceStore(getPreferenceStore());
 				fRememberFilters.load();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index c3d097082b..207e185a48 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -42,7 +42,7 @@ Import-Package: javax.annotation;version="1.0.0",
  javax.inject;version="1.0.0",
  org.eclipse.core.runtime.jobs,
  org.osgi.framework;version="1.5.0"
-Export-Package: org.eclipse.e4.tools.emf.ui.common;x-friends:="org.eclipse.e4.tools.emf.liveeditor",
+Export-Package: org.eclipse.e4.tools.emf.ui.common;x-friends:="org.eclipse.e4.tools.emf.liveeditor,org.eclipse.e4.tools.emf.editor3x",
  org.eclipse.e4.tools.emf.ui.common.component;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal;x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.common;x-internal:=true,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
index 3c7b837504..449f39a997 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
@@ -14,7 +14,6 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.Plugin;
 import org.eclipse.emf.common.util.URI;
 
 public class ContributionURIValidator implements IValidator {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ModelEditorPreferences.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ModelEditorPreferences.java
new file mode 100644
index 0000000000..74dc1d8e9a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ModelEditorPreferences.java
@@ -0,0 +1,14 @@
+package org.eclipse.e4.tools.emf.ui.common;
+
+public interface ModelEditorPreferences {
+
+	public static final String LIST_TAB_REMEMBER_COLUMNS = "list-tab-remember-columns"; //$NON-NLS-1$
+	public static final String LIST_TAB_REMEMBER_FILTERS = "list-tab-remember-filters"; //$NON-NLS-1$
+	public static final String TAB_FORM_SEARCH_SHOW = "tab-form-search-show"; //$NON-NLS-1$
+	public static final String AUTO_CREATE_ELEMENT_ID = "autoCreateElementId"; //$NON-NLS-1$
+	public static final String NOT_VISIBLE_AND_RENDERED_COLOR = "notVisibleAndRenderedColor"; //$NON-NLS-1$
+	public static final String NOT_VISIBLE_COLOR = "notVisibleColor"; //$NON-NLS-1$
+	public static final String NOT_RENDERED_COLOR = "notRenderedColor"; //$NON-NLS-1$
+	public static final String SHOW_XMI_ID = "showXMIId"; //$NON-NLS-1$
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Plugin.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Plugin.java
similarity index 70%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Plugin.java
rename to bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Plugin.java
index 42a2ee643a..bdb46217c0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Plugin.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Plugin.java
@@ -1,4 +1,4 @@
-package org.eclipse.e4.tools.emf.ui.internal;
+package org.eclipse.e4.tools.emf.ui.common;
 
 public interface Plugin {
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
index aff3e13890..571e523bb5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
@@ -9,6 +9,8 @@
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.e4.tools.emf.ui.common.ModelEditorPreferences;
+import org.eclipse.e4.tools.emf.ui.common.Plugin;
 import org.eclipse.jface.resource.StringConverter;
 import org.eclipse.swt.graphics.RGB;
 
@@ -18,37 +20,37 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
 	public void initializeDefaultPreferences() {
 		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(Plugin.ID);
 
-		if (pref.get("notRenderedColor", null) == null) { //$NON-NLS-1$
+		if (pref.get(ModelEditorPreferences.NOT_RENDERED_COLOR, null) == null) {
 			String val = StringConverter.asString(new RGB(200, 200, 200));
-			pref.put("notRenderedColor", val); //$NON-NLS-1$
+			pref.put(ModelEditorPreferences.NOT_RENDERED_COLOR, val);
 		}
 
-		if (pref.get("notVisibleColor", null) == null) { //$NON-NLS-1$
+		if (pref.get(ModelEditorPreferences.NOT_VISIBLE_COLOR, null) == null) {
 			String val = StringConverter.asString(new RGB(200, 200, 200));
-			pref.put("notVisibleColor", val); //$NON-NLS-1$
+			pref.put(ModelEditorPreferences.NOT_VISIBLE_COLOR, val);
 		}
 
-		if (pref.get("notVisibleAndRenderedColor", null) == null) { //$NON-NLS-1$
+		if (pref.get(ModelEditorPreferences.NOT_VISIBLE_AND_RENDERED_COLOR, null) == null) {
 			String val = StringConverter.asString(new RGB(200, 200, 200));
-			pref.put("notVisibleAndRenderedColor", val); //$NON-NLS-1$
+			pref.put(ModelEditorPreferences.NOT_VISIBLE_AND_RENDERED_COLOR, val);
 		}
 
-		if (pref.get("autoCreateElementId", null) == null) { //$NON-NLS-1$
-			pref.putBoolean("autoCreateElementId", true); //$NON-NLS-1$
+		if (pref.get(ModelEditorPreferences.AUTO_CREATE_ELEMENT_ID, null) == null) {
+			pref.putBoolean(ModelEditorPreferences.AUTO_CREATE_ELEMENT_ID, true);
 		}
 
 		// TODO: After XMI tab is not forced disabled, this should default to
 		// true
-		if (pref.get("tab-form-search-show", null) == null) { //$NON-NLS-1$
-			pref.putBoolean("tab-form-search-show", false); //$NON-NLS-1$
+		if (pref.get(ModelEditorPreferences.TAB_FORM_SEARCH_SHOW, null) == null) {
+			pref.putBoolean(ModelEditorPreferences.TAB_FORM_SEARCH_SHOW, false);
 		}
 
-		if (pref.get("list-tab-remember-filters", null) == null) { //$NON-NLS-1$
-			pref.putBoolean("list-tab-remember-filters", false); //$NON-NLS-1$
+		if (pref.get(ModelEditorPreferences.LIST_TAB_REMEMBER_FILTERS, null) == null) {
+			pref.putBoolean(ModelEditorPreferences.LIST_TAB_REMEMBER_FILTERS, false);
 		}
 
-		if (pref.get("list-tab-remember-columns", null) == null) { //$NON-NLS-1$
-			pref.putBoolean("list-tab-remember-columns", false); //$NON-NLS-1$
+		if (pref.get(ModelEditorPreferences.LIST_TAB_REMEMBER_COLUMNS, null) == null) {
+			pref.putBoolean(ModelEditorPreferences.LIST_TAB_REMEMBER_COLUMNS, false);
 		}
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 7cd44ab43f..ea1d5ecb09 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -60,11 +60,12 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.IScriptingSupport;
 import org.eclipse.e4.tools.emf.ui.common.MemoryTransfer;
+import org.eclipse.e4.tools.emf.ui.common.ModelEditorPreferences;
+import org.eclipse.e4.tools.emf.ui.common.Plugin;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
-import org.eclipse.e4.tools.emf.ui.internal.Plugin;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.AddonsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ApplicationEditor;
@@ -292,11 +293,11 @@ public class ModelEditor implements IGotoObject {
 	private IClipboardService clipboardService;
 
 	@Inject
-	@Preference(nodePath = Plugin.ID, value = "autoCreateElementId")
+	@Preference(nodePath = Plugin.ID, value = ModelEditorPreferences.AUTO_CREATE_ELEMENT_ID)
 	private boolean autoCreateElementId;
 
 	@Inject
-	@Preference(nodePath = Plugin.ID, value = "showXMIId")
+	@Preference(nodePath = Plugin.ID, value = ModelEditorPreferences.SHOW_XMI_ID)
 	private boolean showXMIId;
 
 	@Inject
@@ -1042,7 +1043,7 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 
 		TreeViewer tempViewer = null;
 		String property = System.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
-		if (property != null || preferences.getBoolean("tab-form-search-show", false)) { //$NON-NLS-1$
+		if (property != null || preferences.getBoolean(ModelEditorPreferences.TAB_FORM_SEARCH_SHOW, false)) { //$NON-NLS-1$
 			FilteredTree viewParent = new FilteredTree(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(), false);
 			tempViewer = viewParent.getViewer();
 		} else {
@@ -1309,7 +1310,7 @@ public void tab_list_show(Boolean show) {
 	}
 
 	@Inject
-	public void setNotVisibleColor(@Preference("notVisibleColor") String color) {
+	public void setNotVisibleColor(@Preference(ModelEditorPreferences.NOT_VISIBLE_COLOR) String color) {
 		RGB current = JFaceResources.getColorRegistry().getRGB(ComponentLabelProvider.NOT_VISIBLE_KEY);
 
 		if (current == null || !current.equals(color)) {
@@ -1323,7 +1324,7 @@ public void setNotVisibleColor(@Preference("notVisibleColor") String color) {
 	}
 
 	@Inject
-	public void setNotRenderedColor(@Preference("notRenderedColor") String color) {
+	public void setNotRenderedColor(@Preference(ModelEditorPreferences.NOT_RENDERED_COLOR) String color) {
 		RGB current = JFaceResources.getColorRegistry().getRGB(ComponentLabelProvider.NOT_RENDERED_KEY);
 
 		if (current == null || !current.equals(color)) {
@@ -1337,7 +1338,7 @@ public void setNotRenderedColor(@Preference("notRenderedColor") String color) {
 	}
 
 	@Inject
-	public void setNotVisibleRenderedColor(@Preference("notVisibleAndRenderedColor") String color) {
+	public void setNotVisibleRenderedColor(@Preference(ModelEditorPreferences.NOT_VISIBLE_AND_RENDERED_COLOR) String color) {
 		RGB current = JFaceResources.getColorRegistry().getRGB(ComponentLabelProvider.NOT_VISIBLE_AND_RENDERED_KEY);
 
 		if (current == null || !current.equals(color)) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index e20b77db57..79c3ec80da 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -12,6 +12,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import org.eclipse.e4.tools.emf.ui.common.Plugin;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -28,7 +30,6 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Plugin;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
index 37f9dc2ea4..a0257e2c04 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
@@ -11,8 +11,9 @@
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
+import org.eclipse.e4.tools.emf.ui.common.Plugin;
+
 import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.e4.tools.emf.ui.internal.Plugin;
 import org.eclipse.jface.dialogs.DialogSettings;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index afcf8a8601..43b5a992f2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -41,8 +41,9 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.services.nls.Translation;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.common.ModelEditorPreferences;
+import org.eclipse.e4.tools.emf.ui.common.Plugin;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.Plugin;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
@@ -239,8 +240,8 @@ private void saveColumn(Element eleCols, String columnName, TableColumn objCol)
 	private void loadSettings() {
 		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(Plugin.ID);
 
-		boolean restoreColumns = pref.getBoolean("list-tab-remember-columns", false); //$NON-NLS-1$
-		boolean restoreFilters = pref.getBoolean("list-tab-remember-filters", false); //$NON-NLS-1$
+		boolean restoreColumns = pref.getBoolean(ModelEditorPreferences.LIST_TAB_REMEMBER_COLUMNS, false);
+		boolean restoreFilters = pref.getBoolean(ModelEditorPreferences.LIST_TAB_REMEMBER_FILTERS, false);
 		if (!restoreColumns && !restoreFilters) {
 			return;
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
index c2a71fb437..fedab5d709 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
@@ -11,6 +11,8 @@
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
 
+import org.eclipse.e4.tools.emf.ui.common.Plugin;
+
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -26,7 +28,6 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
-import org.eclipse.e4.tools.emf.ui.internal.Plugin;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionDataFile;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
index fde88603d2..410ed63ddc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
@@ -11,6 +11,8 @@
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
 
+import org.eclipse.e4.tools.emf.ui.common.Plugin;
+
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -26,7 +28,6 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
-import org.eclipse.e4.tools.emf.ui.internal.Plugin;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionDataFile;

From 0076e46d7df32eab4745a86304f674f82295d39b Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Sun, 19 Oct 2014 13:00:20 +0200
Subject: [PATCH 0839/1286] Bug 444340 - Externalize Strings - Added Message
 classes to editor3x

---
 .../e4/tools/emf/editor3x/Messages.java       |  45 ++++++
 .../editor3x/ModelEditorPreferencePage.java   |  24 ++--
 .../emf/editor3x/ModelMoveParticipant.java    |  86 +++++------
 .../emf/editor3x/ModelRenameParticipant.java  |  95 ++++++------
 .../PDEClassContributionProvider.java         | 136 +++++++++---------
 .../e4/tools/emf/editor3x/RedoAction.java     |  14 +-
 .../editor3x/RefactorParticipantDelegate.java |  64 +++++----
 .../emf/editor3x/TargetElementProviders.java  | 124 ++++++++--------
 .../e4/tools/emf/editor3x/UndoAction.java     |  14 +-
 .../e4/tools/emf/editor3x/emf/EditUIUtil.java |  30 ++--
 .../e4/tools/emf/editor3x/messages.properties |  16 +++
 11 files changed, 364 insertions(+), 284 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/messages.properties

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
new file mode 100644
index 0000000000..ba3b753765
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ * Jonas - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author Jonas
+ *
+ */
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.e4.tools.emf.editor3x.messages"; //$NON-NLS-1$
+	public static String ModelEditorPreferencePage_Color;
+	public static String ModelEditorPreferencePage_ForcesReadOnlyXMITab;
+	public static String ModelEditorPreferencePage_FormTab;
+	public static String ModelEditorPreferencePage_GeneratedID;
+	public static String ModelEditorPreferencePage_ListTabe;
+	public static String ModelEditorPreferencePage_NotRenderedColor;
+	public static String ModelEditorPreferencePage_NotVisibleAndNotRenderedColor;
+	public static String ModelEditorPreferencePage_NotVisibleColor;
+	public static String ModelEditorPreferencePage_RememberColumnSettings;
+	public static String ModelEditorPreferencePage_RememberFilterSettings;
+	public static String ModelEditorPreferencePage_RequiresReopeningModel;
+	public static String ModelEditorPreferencePage_SearchableTree;
+	public static String ModelEditorPreferencePage_ShowID;
+	public static String ModelMoveParticipant_CreatingChange;
+	public static String RedoAction_Redo;
+	public static String UndoAction_Undo;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
index b97ffe5808..4512b79ecd 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
@@ -56,13 +56,13 @@ protected Control createContents(Composite parent) {
 
 		{
 			final Group group = new Group(result, SWT.NONE);
-			group.setText("Color");
+			group.setText(Messages.ModelEditorPreferencePage_Color);
 			group.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
 			group.setLayout(new GridLayout(2, false));
 
 			{
 				fColorValueNotRendered = new ColorFieldEditor(ModelEditorPreferences.NOT_RENDERED_COLOR,
-					"Not rendered color", group);
+					Messages.ModelEditorPreferencePage_NotRenderedColor, group);
 				fColorValueNotRendered.setPage(this);
 				fColorValueNotRendered.setPreferenceStore(getPreferenceStore());
 				fColorValueNotRendered.load();
@@ -70,7 +70,7 @@ protected Control createContents(Composite parent) {
 
 			{
 				fColorValueNotVisible = new ColorFieldEditor(ModelEditorPreferences.NOT_VISIBLE_COLOR,
-					"Not visible color", group);
+					Messages.ModelEditorPreferencePage_NotVisibleColor, group);
 				fColorValueNotVisible.setPage(this);
 				fColorValueNotVisible.setPreferenceStore(getPreferenceStore());
 				fColorValueNotVisible.load();
@@ -79,7 +79,7 @@ protected Control createContents(Composite parent) {
 			{
 				fColorValueNotVisibleAndRendered = new ColorFieldEditor(
 					ModelEditorPreferences.NOT_VISIBLE_AND_RENDERED_COLOR,
-					"Not visible and not rendered color", group);
+					Messages.ModelEditorPreferencePage_NotVisibleAndNotRenderedColor, group);
 				fColorValueNotVisibleAndRendered.setPage(this);
 				fColorValueNotVisibleAndRendered.setPreferenceStore(getPreferenceStore());
 				fColorValueNotVisibleAndRendered.load();
@@ -88,7 +88,7 @@ protected Control createContents(Composite parent) {
 
 		{
 			final Group group = new Group(result, SWT.NONE);
-			group.setText("Form Tab");
+			group.setText(Messages.ModelEditorPreferencePage_FormTab);
 			group.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
 			group.setLayout(new GridLayout(2, false));
 
@@ -96,7 +96,7 @@ protected Control createContents(Composite parent) {
 				final Composite container = new Composite(group, SWT.NONE);
 				container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
 				fAutoGeneratedId = new BooleanFieldEditor(ModelEditorPreferences.AUTO_CREATE_ELEMENT_ID,
-					"Autogenerate Element-Id", container);
+					Messages.ModelEditorPreferencePage_GeneratedID, container);
 				fAutoGeneratedId.setPage(this);
 				fAutoGeneratedId.setPreferenceStore(getPreferenceStore());
 				fAutoGeneratedId.load();
@@ -105,7 +105,7 @@ protected Control createContents(Composite parent) {
 			{
 				final Composite container = new Composite(group, SWT.NONE);
 				container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
-				fShowXMIId = new BooleanFieldEditor(ModelEditorPreferences.SHOW_XMI_ID, "Show XMI:ID", container);
+				fShowXMIId = new BooleanFieldEditor(ModelEditorPreferences.SHOW_XMI_ID, Messages.ModelEditorPreferencePage_ShowID, container);
 				fShowXMIId.setPage(this);
 				fShowXMIId.setPreferenceStore(getPreferenceStore());
 				fShowXMIId.load();
@@ -115,8 +115,8 @@ protected Control createContents(Composite parent) {
 				final Composite container = new Composite(group, SWT.NONE);
 				container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
 				fShowSearch = new BooleanFieldEditor(ModelEditorPreferences.TAB_FORM_SEARCH_SHOW,
-					"Searchable tree on form tab\n"
-						+ "(forces read only XMI tab)\n" + "(requires reopening model)", container);
+					Messages.ModelEditorPreferencePage_SearchableTree
+						+ Messages.ModelEditorPreferencePage_ForcesReadOnlyXMITab + Messages.ModelEditorPreferencePage_RequiresReopeningModel, container);
 				fShowSearch.setPage(this);
 				fShowSearch.setPreferenceStore(getPreferenceStore());
 				fShowSearch.load();
@@ -126,7 +126,7 @@ protected Control createContents(Composite parent) {
 
 		{
 			final Group group = new Group(result, SWT.NONE);
-			group.setText("List Tab");
+			group.setText(Messages.ModelEditorPreferencePage_ListTabe);
 			group.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
 			group.setLayout(new GridLayout(2, false));
 
@@ -135,13 +135,13 @@ protected Control createContents(Composite parent) {
 				container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
 
 				fRememberColumns = new BooleanFieldEditor(ModelEditorPreferences.LIST_TAB_REMEMBER_COLUMNS,
-					"Remember column settings when reopening editor  ", container);
+					Messages.ModelEditorPreferencePage_RememberColumnSettings, container);
 				fRememberColumns.setPage(this);
 				fRememberColumns.setPreferenceStore(getPreferenceStore());
 				fRememberColumns.load();
 
 				fRememberFilters = new BooleanFieldEditor(ModelEditorPreferences.LIST_TAB_REMEMBER_FILTERS,
-					"Remember filter settings when reopening editor", container);
+					Messages.ModelEditorPreferencePage_RememberFilterSettings, container);
 				fRememberFilters.setPage(this);
 				fRememberFilters.setPreferenceStore(getPreferenceStore());
 				fRememberFilters.load();
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java
index 10d825f657..fbef832d92 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Wim Jongman <wim.jongman@remainsoftware.com> - Bug 395174: e4xmi should participate in package renaming 
- *                                                    Bug 432892: Eclipse 4 Application does not work after renaming the project name
+ * Wim Jongman <wim.jongman@remainsoftware.com> - Bug 395174: e4xmi should participate in package renaming
+ * Bug 432892: Eclipse 4 Application does not work after renaming the project name
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
@@ -62,13 +62,13 @@ public String getName() {
 
 	@Override
 	public RefactoringStatus checkConditions(IProgressMonitor pMonitor,
-			CheckConditionsContext pContext) throws OperationCanceledException {
+		CheckConditionsContext pContext) throws OperationCanceledException {
 		return new RefactoringStatus();
 	}
 
 	@Override
 	public Change createChange(IProgressMonitor pMonitor) throws CoreException,
-			OperationCanceledException {
+		OperationCanceledException {
 
 		pMonitor.beginTask("Creating Change ..", IProgressMonitor.UNKNOWN);
 
@@ -92,21 +92,21 @@ else if (fFile != null) {
 	}
 
 	private Change createFileChange(IProgressMonitor pMonitor, IFile file)
-			throws CoreException {
+		throws CoreException {
 
-		String newUrl = "platform:/plugin/";
+		String newUrl = "platform:/plugin/"; //$NON-NLS-1$
 		if (getArguments().getDestination() instanceof IFolder) {
-			IFolder folder = (IFolder) getArguments().getDestination();
-			newUrl += folder.getProject().getName() + "/"
-					+ folder.getProjectRelativePath().toString() + "/"
-					+ file.getName();
+			final IFolder folder = (IFolder) getArguments().getDestination();
+			newUrl += folder.getProject().getName() + "/" //$NON-NLS-1$
+				+ folder.getProjectRelativePath().toString() + "/" //$NON-NLS-1$
+				+ file.getName();
 		} else {
-			IProject project = (IProject) getArguments().getDestination();
-			newUrl += project.getName() + "/" + file.getName();
+			final IProject project = (IProject) getArguments().getDestination();
+			newUrl += project.getName() + "/" + file.getName(); //$NON-NLS-1$
 
 		}
 
-		String oldUrl = "platform:/plugin" + file.getFullPath();
+		final String oldUrl = "platform:/plugin" + file.getFullPath(); //$NON-NLS-1$
 
 		fModel.addTextRename(oldUrl, newUrl);
 
@@ -114,21 +114,21 @@ private Change createFileChange(IProgressMonitor pMonitor, IFile file)
 	}
 
 	private Change createPackageChange(IProgressMonitor pMonitor,
-			IPackageFragment pPckage) throws CoreException,
-			OperationCanceledException {
-		String fromBundle = Util.getBundleSymbolicName(pPckage.getJavaProject()
-				.getProject());
+		IPackageFragment pPckage) throws CoreException,
+		OperationCanceledException {
+		final String fromBundle = Util.getBundleSymbolicName(pPckage.getJavaProject()
+			.getProject());
 
-		IPackageFragmentRoot fragmentRoot = (IPackageFragmentRoot) getArguments()
-				.getDestination();
-		String toBundle = Util.getBundleSymbolicName(fragmentRoot
-				.getJavaProject().getProject());
+		final IPackageFragmentRoot fragmentRoot = (IPackageFragmentRoot) getArguments()
+			.getDestination();
+		final String toBundle = Util.getBundleSymbolicName(fragmentRoot
+			.getJavaProject().getProject());
 
-		final String newUrl = "bundleclass://" + toBundle + "/"
-				+ pPckage.getElementName();
+		final String newUrl = "bundleclass://" + toBundle + "/" //$NON-NLS-1$ //$NON-NLS-2$
+			+ pPckage.getElementName();
 
-		String oldUrl = "bundleclass://" + fromBundle + "/"
-				+ pPckage.getElementName();
+		final String oldUrl = "bundleclass://" + fromBundle + "/" //$NON-NLS-1$ //$NON-NLS-2$
+			+ pPckage.getElementName();
 
 		fModel.addTextRename(oldUrl, newUrl);
 
@@ -136,24 +136,24 @@ private Change createPackageChange(IProgressMonitor pMonitor,
 	}
 
 	private Change createClassChange(IProgressMonitor pMonitor, IType pType)
-			throws CoreException, OperationCanceledException {
-		String fromBundle = Util.getBundleSymbolicName(fType.getJavaProject()
-				.getProject());
-		String fromClassname = pType.getFullyQualifiedName();
-
-		IPackageFragment fragment = (IPackageFragment) getArguments()
-				.getDestination();
-		String toBundle = Util.getBundleSymbolicName(fragment.getJavaProject()
-				.getProject());
-		String toClassName = fragment.getElementName().length() == 0 ? pType
-				.getElementName() : fragment.getElementName() + "."
-				+ pType.getElementName();
-
-		return RefactorParticipantDelegate.createChange(
-				pMonitor,
-				fModel.addTextRename("bundleclass://" + fromBundle + "/"
-						+ fromClassname, "bundleclass://" + toBundle + "/"
-						+ toClassName));
+		throws CoreException, OperationCanceledException {
+		final String fromBundle = Util.getBundleSymbolicName(fType.getJavaProject()
+			.getProject());
+		final String fromClassname = pType.getFullyQualifiedName();
+
+		final IPackageFragment fragment = (IPackageFragment) getArguments()
+			.getDestination();
+		final String toBundle = Util.getBundleSymbolicName(fragment.getJavaProject()
+			.getProject());
+		final String toClassName = fragment.getElementName().length() == 0 ? pType
+			.getElementName() : fragment.getElementName() + "." //$NON-NLS-1$
+			+ pType.getElementName();
+
+			return RefactorParticipantDelegate.createChange(
+			pMonitor,
+			fModel.addTextRename("bundleclass://" + fromBundle + "/" //$NON-NLS-1$ //$NON-NLS-2$
+				+ fromClassname, "bundleclass://" + toBundle + "/" //$NON-NLS-1$ //$NON-NLS-2$
+				+ toClassName));
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelRenameParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelRenameParticipant.java
index 439e91343c..6a2952e665 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelRenameParticipant.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelRenameParticipant.java
@@ -6,9 +6,9 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Wim Jongman <wim.jongman@remainsoftware.com> - Bug 395174: e4xmi should participate in package renaming 
- *                                                    Bug 432892: Eclipse 4 Application does not work after renaming the project name
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Wim Jongman <wim.jongman@remainsoftware.com> - Bug 395174: e4xmi should participate in package renaming
+ * Bug 432892: Eclipse 4 Application does not work after renaming the project name
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
@@ -27,7 +27,7 @@
 import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
 
 public class ModelRenameParticipant extends
-		org.eclipse.ltk.core.refactoring.participants.RenameParticipant {
+org.eclipse.ltk.core.refactoring.participants.RenameParticipant {
 	private IType fType;
 	private IPackageFragment fPckage;
 	private IFile fFile;
@@ -68,18 +68,18 @@ protected boolean initialize(Object element) {
 
 	@Override
 	public String getName() {
-		return "Workbench Model Contribution Participant";
+		return "Workbench Model Contribution Participant"; //$NON-NLS-1$
 	}
 
 	@Override
 	public RefactoringStatus checkConditions(IProgressMonitor pm,
-			CheckConditionsContext context) throws OperationCanceledException {
+		CheckConditionsContext context) throws OperationCanceledException {
 		return new RefactoringStatus();
 	}
 
 	@Override
 	public Change createChange(IProgressMonitor pm) throws CoreException,
-			OperationCanceledException {
+	OperationCanceledException {
 
 		fModel = RefactorModel.getModel(this);
 
@@ -107,36 +107,37 @@ public Change createChange(IProgressMonitor pm) throws CoreException,
 	}
 
 	private Change createProjectChange(IProgressMonitor pm, IProject project)
-			throws CoreException {
+		throws CoreException {
 
-		if (!getArguments().getUpdateReferences())
+		if (!getArguments().getUpdateReferences()) {
 			return null;
+		}
 
-		fModel.addTextRename("platform:/plugin/" + project.getName() + "/",
-				"platform:/plugin/" + getArguments().getNewName() + "/");
-		fModel.addTextRename("bundleclass://" + project.getName() + "/",
-				"bundleclass://" + getArguments().getNewName() + "/");
+		fModel.addTextRename("platform:/plugin/" + project.getName() + "/", //$NON-NLS-1$ //$NON-NLS-2$
+			"platform:/plugin/" + getArguments().getNewName() + "/"); //$NON-NLS-1$ //$NON-NLS-2$
+		fModel.addTextRename("bundleclass://" + project.getName() + "/", //$NON-NLS-1$ //$NON-NLS-2$
+			"bundleclass://" + getArguments().getNewName() + "/"); //$NON-NLS-1$ //$NON-NLS-2$
 
 		fModel.setProjectRename(project, ((IWorkspaceRoot) project.getParent())
-				.getProject(getArguments().getNewName()));
+			.getProject(getArguments().getNewName()));
 
 		return RefactorParticipantDelegate.createChange(pm, fModel);
 
 	}
 
 	private Change createFolderChange(IProgressMonitor pm, IFolder folder)
-			throws CoreException {
+		throws CoreException {
 
-		String SPLIT = "/";
+		String SPLIT = "/"; //$NON-NLS-1$
 		if (folder.getParent().getFullPath().segmentCount() == 1) {
-			SPLIT = "";
+			SPLIT = ""; //$NON-NLS-1$
 		}
 
-		String newUrl = "platform:/plugin/" + folder.getProject().getName()
-				+ "/" + folder.getParent().getProjectRelativePath().toString()
-				+ SPLIT + getArguments().getNewName();
+		final String newUrl = "platform:/plugin/" + folder.getProject().getName() //$NON-NLS-1$
+			+ "/" + folder.getParent().getProjectRelativePath().toString() //$NON-NLS-1$
+			+ SPLIT + getArguments().getNewName();
 
-		String oldUrl = "platform:/plugin" + folder.getFullPath();
+		final String oldUrl = "platform:/plugin" + folder.getFullPath(); //$NON-NLS-1$
 
 		fModel.addTextRename(oldUrl, newUrl);
 
@@ -144,49 +145,49 @@ private Change createFolderChange(IProgressMonitor pm, IFolder folder)
 	}
 
 	private Change createFileChange(IProgressMonitor pm, IFile file)
-			throws CoreException {
+		throws CoreException {
 
-		String SPLIT = "/";
+		String SPLIT = "/"; //$NON-NLS-1$
 		if (file.getParent().getFullPath().segmentCount() == 1) {
-			SPLIT = "";
+			SPLIT = ""; //$NON-NLS-1$
 		}
-		String newUrl = "platform:/plugin/" + file.getProject().getName() + "/"
-				+ file.getParent().getProjectRelativePath().toString() + SPLIT
-				+ getArguments().getNewName();
-		String oldUrl = "platform:/plugin" + file.getFullPath();
+		final String newUrl = "platform:/plugin/" + file.getProject().getName() + "/" //$NON-NLS-1$ //$NON-NLS-2$
+			+ file.getParent().getProjectRelativePath().toString() + SPLIT
+			+ getArguments().getNewName();
+		final String oldUrl = "platform:/plugin" + file.getFullPath(); //$NON-NLS-1$
 		fModel.addTextRename(oldUrl, newUrl);
 
 		return RefactorParticipantDelegate.createChange(pm, fModel);
 	}
 
 	private Change createPackageChange(IProgressMonitor pm,
-			IPackageFragment pckage) throws CoreException {
-		String bundle = Util.getBundleSymbolicName(pckage.getJavaProject()
-				.getProject());
+		IPackageFragment pckage) throws CoreException {
+		final String bundle = Util.getBundleSymbolicName(pckage.getJavaProject()
+			.getProject());
 
-		final String newUrl = "bundleclass://" + bundle + "/"
-				+ getArguments().getNewName();
+		final String newUrl = "bundleclass://" + bundle + "/" //$NON-NLS-1$ //$NON-NLS-2$
+			+ getArguments().getNewName();
 
-		String oldUrl = "bundleclass://" + bundle + "/"
-				+ pckage.getElementName();
+		final String oldUrl = "bundleclass://" + bundle + "/" //$NON-NLS-1$ //$NON-NLS-2$
+			+ pckage.getElementName();
 		fModel.addTextRename(oldUrl, newUrl);
 
 		return RefactorParticipantDelegate.createChange(pm, fModel);
 	}
 
 	private Change createClassChange(IProgressMonitor pm, IType type)
-			throws CoreException {
-		String bundle = Util.getBundleSymbolicName(type.getJavaProject()
-				.getProject());
-
-		final String newUrl = "bundleclass://"
-				+ bundle
-				+ "/"
-				+ (type.getPackageFragment().getElementName().length() == 0 ? getArguments()
-						.getNewName() : type.getPackageFragment()
-						.getElementName() + "." + getArguments().getNewName());
-		String oldUrl = "bundleclass://" + bundle + "/"
-				+ type.getFullyQualifiedName().replace(".", "\\.");
+		throws CoreException {
+		final String bundle = Util.getBundleSymbolicName(type.getJavaProject()
+			.getProject());
+
+		final String newUrl = "bundleclass://" //$NON-NLS-1$
+			+ bundle
+			+ "/" //$NON-NLS-1$
+			+ (type.getPackageFragment().getElementName().length() == 0 ? getArguments()
+				.getNewName() : type.getPackageFragment()
+				.getElementName() + "." + getArguments().getNewName()); //$NON-NLS-1$
+		final String oldUrl = "bundleclass://" + bundle + "/" //$NON-NLS-1$ //$NON-NLS-2$
+			+ type.getFullyQualifiedName().replace(".", "\\."); //$NON-NLS-1$//$NON-NLS-2$
 		fModel.addTextRename(oldUrl, newUrl);
 
 		return RefactorParticipantDelegate.createChange(pm, fModel);
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index bde3a2a1c6..29fa40b62d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 436281, Bug 436280
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 436281, Bug 436280
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
@@ -35,52 +35,55 @@
 import org.eclipse.pde.internal.core.util.PDEJavaHelper;
 
 public class PDEClassContributionProvider implements IClassContributionProvider {
-	private SearchEngine searchEngine;
+	private final SearchEngine searchEngine;
+
 	public PDEClassContributionProvider() {
 		searchEngine = new SearchEngine();
 	}
 
+	@Override
 	@SuppressWarnings("restriction")
 	public void findContribution(final Filter filter, final ContributionResultHandler handler) {
 		boolean followReferences = true;
-		if (filter.getSearchScope().contains(ResourceSearchScope.PROJECT) && !filter.getSearchScope().contains(ResourceSearchScope.REFERENCES)) {
+		if (filter.getSearchScope().contains(ResourceSearchScope.PROJECT)
+			&& !filter.getSearchScope().contains(ResourceSearchScope.REFERENCES)) {
 			followReferences = false;
 		}
 
 		IJavaSearchScope scope = null;
-		if (followReferences == false){
-			IJavaProject javaProject = JavaCore.create(filter.project);
+		if (followReferences == false) {
+			final IJavaProject javaProject = JavaCore.create(filter.project);
 			IPackageFragmentRoot[] roots;
 			try {
 				roots = javaProject.getPackageFragmentRoots();
 				scope = SearchEngine.createJavaSearchScope(roots, false);
-			} catch (JavaModelException e) {
+			} catch (final JavaModelException e) {
 				e.printStackTrace();
 			}
-		}else{
+		} else {
 			// filter.project may be null in the live editor
 			scope = filter.project != null ? PDEJavaHelper
-					.getSearchScope(filter.project) : SearchEngine
-					.createWorkspaceScope();
+				.getSearchScope(filter.project) : SearchEngine
+				.createWorkspaceScope();
 		}
 		char[] packageName = null;
 		char[] typeName = null;
 		String currentContent = filter.namePattern;
-		int index = currentContent.lastIndexOf('.');
+		final int index = currentContent.lastIndexOf('.');
 
 		if (index == -1) {
 			// There is no package qualification
 			// Perform the search only on the type name
 			typeName = currentContent.toCharArray();
-			if( currentContent.startsWith("*") ) {
-				if( ! currentContent.endsWith("*") ) {
-					currentContent += "*";
+			if (currentContent.startsWith("*")) { //$NON-NLS-1$
+				if (!currentContent.endsWith("*")) { //$NON-NLS-1$
+					currentContent += "*"; //$NON-NLS-1$
 				}
 				typeName = currentContent.toCharArray();
-				packageName = "*".toCharArray();
+				packageName = "*".toCharArray(); //$NON-NLS-1$
 			}
-			
-		} else if ((index + 1) == currentContent.length()) {
+
+		} else if (index + 1 == currentContent.length()) {
 			// There is a package qualification and the last character is a
 			// dot
 			// Perform the search for all types under the given package
@@ -89,93 +92,96 @@ public void findContribution(final Filter filter, final ContributionResultHandle
 			// Package name without the trailing dot
 			packageName = currentContent.substring(0, index).toCharArray();
 		} else {
-			// There is a package qualification, followed by a dot, and 
+			// There is a package qualification, followed by a dot, and
 			// a type fragment
 			// Type name without the package qualification
 			typeName = currentContent.substring(index + 1).toCharArray();
 			// Package name without the trailing dot
 			packageName = currentContent.substring(0, index).toCharArray();
 		}
-		
-//		char[] packageName = "at.bestsolution.e4.handlers".toCharArray();
-//		char[] typeName = "*".toCharArray();
-		
-		TypeNameRequestor req = new TypeNameRequestor() {
+
+		// char[] packageName = "at.bestsolution.e4.handlers".toCharArray();
+		// char[] typeName = "*".toCharArray();
+
+		final TypeNameRequestor req = new TypeNameRequestor() {
 			@Override
-			public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path) {
+			public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
+				char[][] enclosingTypeNames, String path) {
 				// Accept search results from the JDT SearchEngine
-				String cName = new String(simpleTypeName);
-				String pName = new String(packageName);
-//				String label = cName + " - " + pName; //$NON-NLS-1$
-				String content = pName.length() == 0 ? cName : pName + "." + cName; //$NON-NLS-1$
-				
-//				System.err.println("Found: " + label + " => " + pName + " => " + path);
-				
-				IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
-				
-				if( resource != null ) {
-					IProject project = resource.getProject();
-					IFile f = project.getFile("/META-INF/MANIFEST.MF");
-					
-					if( f != null && f.exists() ) {
+				final String cName = new String(simpleTypeName);
+				final String pName = new String(packageName);
+				//				String label = cName + " - " + pName; //$NON-NLS-1$
+				final String content = pName.length() == 0 ? cName : pName + "." + cName; //$NON-NLS-1$
+
+				// System.err.println("Found: " + label + " => " + pName + " => " + path);
+
+				final IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
+
+				if (resource != null) {
+					final IProject project = resource.getProject();
+					final IFile f = project.getFile("/META-INF/MANIFEST.MF"); //$NON-NLS-1$
+
+					if (f != null && f.exists()) {
 						BufferedReader r = null;
 						try {
-							InputStream s = f.getContents();
+							final InputStream s = f.getContents();
 							r = new BufferedReader(new InputStreamReader(s));
 							String line;
-							while( (line = r.readLine()) != null ) {
-								if( line.startsWith("Bundle-SymbolicName:") ) {
-									int start = line.indexOf(':');
+							while ((line = r.readLine()) != null) {
+								if (line.startsWith("Bundle-SymbolicName:")) { //$NON-NLS-1$
+									final int start = line.indexOf(':');
 									int end = line.indexOf(';');
-									if( end == -1 ) {
+									if (end == -1) {
 										end = line.length();
 									}
-									ContributionData data = new ContributionData(line.substring(start+1,end).trim(), content, "Java", null);
+									final ContributionData data = new ContributionData(line.substring(start + 1, end)
+										.trim(), content, "Java", null); //$NON-NLS-1$
 									handler.result(data);
 									break;
 								}
 							}
-								
-						} catch (CoreException e) {
+
+						} catch (final CoreException e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
-						} catch (IOException e) {
+						} catch (final IOException e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
 						} finally {
-							if( r != null ) {
+							if (r != null) {
 								try {
 									r.close();
-								} catch (IOException e) {
+								} catch (final IOException e) {
 									// TODO Auto-generated catch block
 									e.printStackTrace();
-								}								
+								}
 							}
 						}
 					}
 				}
-				
-				
-				//Image image = (Flags.isInterface(modifiers)) ? PDEPluginImages.get(PDEPluginImages.OBJ_DESC_GENERATE_INTERFACE) : PDEPluginImages.get(PDEPluginImages.OBJ_DESC_GENERATE_CLASS);
-				//addProposalToCollection(c, startOffset, length, label, content, image);
+
+				// Image image = (Flags.isInterface(modifiers)) ?
+				// PDEPluginImages.get(PDEPluginImages.OBJ_DESC_GENERATE_INTERFACE) :
+				// PDEPluginImages.get(PDEPluginImages.OBJ_DESC_GENERATE_CLASS);
+				// addProposalToCollection(c, startOffset, length, label, content, image);
 			}
 		};
-		
+
 		try {
 			searchEngine.searchAllTypeNames(
-					packageName, 
-					SearchPattern.R_PATTERN_MATCH, 
-					typeName, 
-					SearchPattern.R_PATTERN_MATCH | SearchPattern.R_CAMELCASE_MATCH, 
-					IJavaSearchConstants.CLASS, 
-					scope, 
-					req, 
-					IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, null);
-		} catch (JavaModelException e) {
+				packageName,
+				SearchPattern.R_PATTERN_MATCH,
+				typeName,
+				SearchPattern.R_PATTERN_MATCH | SearchPattern.R_CAMELCASE_MATCH,
+				IJavaSearchConstants.CLASS,
+				scope,
+				req,
+				IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, null);
+		} catch (final JavaModelException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		
+
 		handler.moreResults(0, filter);
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
index 36c0b85a8d..4a1a5f5789 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
@@ -19,12 +19,14 @@ public class RedoAction extends Action {
 
 	public RedoAction(IModelResource resource) {
 		this.resource = resource;
-		this.listener = new IModelResource.ModelListener() {
+		listener = new IModelResource.ModelListener() {
 
+			@Override
 			public void commandStackChanged() {
 				update();
 			}
 
+			@Override
 			public void dirtyChanged() {
 
 			}
@@ -43,12 +45,12 @@ public void run() {
 
 	private void update() {
 		if (resource.getEditingDomain().getCommandStack().canRedo()) {
-			setText("Redo "
-					+ resource.getEditingDomain().getCommandStack()
-							.getRedoCommand().getLabel());
+			setText(Messages.RedoAction_Redo + " " //$NON-NLS-1$
+				+ resource.getEditingDomain().getCommandStack()
+					.getRedoCommand().getLabel());
 			setEnabled(true);
 		} else {
-			setText("Redo");
+			setText(Messages.RedoAction_Redo);
 			setEnabled(false);
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
index ba25f7743a..802c284d98 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
@@ -6,8 +6,9 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Wim Jongman <wim.jongman@remainsoftware.com>  Bug 432892: Eclipse 4 Application does not work after renaming the project name
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Wim Jongman <wim.jongman@remainsoftware.com> Bug 432892: Eclipse 4 Application does not work after renaming the
+ * project name
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
@@ -34,12 +35,12 @@
 
 class RefactorParticipantDelegate {
 
-	private static final String E4_MODEL_CHANGES = "Eclipse 4 Application Model Changes";
+	private static final String E4_MODEL_CHANGES = "Eclipse 4 Application Model Changes"; //$NON-NLS-1$
 
 	/**
 	 * Creates a set of changes and returns a new {@link CompositeChange} or
 	 * adds the changes to the passed {@link CompositeChange}.
-	 * 
+	 *
 	 * @param pProgressMonitor
 	 * @param pParticipant
 	 * @param pOldUrl
@@ -53,44 +54,44 @@ class RefactorParticipantDelegate {
 	 * @throws OperationCanceledException
 	 */
 	public static CompositeChange createChange(
-			IProgressMonitor pProgressMonitor, final RefactorModel pModel)
+		IProgressMonitor pProgressMonitor, final RefactorModel pModel)
 			throws CoreException, OperationCanceledException {
 
-		String[] filenames = { "*.e4xmi", "plugin.xml" };
-		FileTextSearchScope scope = FileTextSearchScope.newWorkspaceScope(
-				filenames, false);
+		final String[] filenames = { "*.e4xmi", "plugin.xml" }; //$NON-NLS-1$ //$NON-NLS-2$
+		final FileTextSearchScope scope = FileTextSearchScope.newWorkspaceScope(
+			filenames, false);
 
 		final Map<IFile, TextFileChange> changes = new HashMap<IFile, TextFileChange>();
-		TextSearchRequestor searchRequestor = new TextSearchRequestor() {
+		final TextSearchRequestor searchRequestor = new TextSearchRequestor() {
 
 			@Override
 			public boolean acceptPatternMatch(TextSearchMatchAccess matchAccess)
-					throws CoreException {
-				IFile file = matchAccess.getFile();
+				throws CoreException {
+				final IFile file = matchAccess.getFile();
 				TextFileChange change = changes.get(file);
 
 				if (change == null) {
-					TextChange textChange = pModel.getTextChange(file);
+					final TextChange textChange = pModel.getTextChange(file);
 					if (textChange != null) {
 						return false;
 					}
 
 					if (pModel.isProjectRename()
-							&& file.getProject().equals(pModel.getOldProject())) {
+						&& file.getProject().equals(pModel.getOldProject())) {
 						// The project/resources get refactored before the
 						// TextChange is applied, therefore we need their
 						// future locations
-						IProject newProject = pModel.getNewProject();
+						final IProject newProject = pModel.getNewProject();
 
 						// If the model is in a non-standard location the
 						// new project will keep that location, only the project
 						// will be changed
-						IPath oldFile = file.getFullPath().removeFirstSegments(
-								1);
-						IFile newFile = newProject.getFile(oldFile);
+						final IPath oldFile = file.getFullPath().removeFirstSegments(
+							1);
+						final IFile newFile = newProject.getFile(oldFile);
 
 						change = new MovedTextFileChange(file.getName(),
-								newFile, file);
+							newFile, file);
 						change.setEdit(new MultiTextEdit());
 						changes.put(file, change);
 
@@ -101,34 +102,35 @@ public boolean acceptPatternMatch(TextSearchMatchAccess matchAccess)
 					}
 				}
 
-				ReplaceEdit edit = new ReplaceEdit(
-						matchAccess.getMatchOffset(),
-						matchAccess.getMatchLength(),
-						pModel.getNewTextCurrentIndex());
+				final ReplaceEdit edit = new ReplaceEdit(
+					matchAccess.getMatchOffset(),
+					matchAccess.getMatchLength(),
+					pModel.getNewTextCurrentIndex());
 				change.addEdit(edit);
 				change.addTextEditGroup(new TextEditGroup(E4_MODEL_CHANGES,
-						edit)); //$NON-NLS-1$
+					edit));
 				return true;
 			}
 		};
 
 		CompositeChange result;
-		TextSearchEngine searchEngine = TextSearchEngine.create();
+		final TextSearchEngine searchEngine = TextSearchEngine.create();
 		for (int count = pModel.getRenameCount(); count > 0; count--) {
 			pModel.setIndex(count - 1);
 			searchEngine.search(
-					scope,
-					searchRequestor,
-					TextSearchEngine.createPattern(
-							pModel.getOldTextCurrentIndex(), true, false),
+				scope,
+				searchRequestor,
+				TextSearchEngine.createPattern(
+					pModel.getOldTextCurrentIndex(), true, false),
 					pProgressMonitor);
 		}
 
-		if (changes.isEmpty())
+		if (changes.isEmpty()) {
 			return null;
+		}
 
-		result = new CompositeChange(E4_MODEL_CHANGES); //$NON-NLS-1$
-		for (TextFileChange c : changes.values()) {
+		result = new CompositeChange(E4_MODEL_CHANGES);
+		for (final TextFileChange c : changes.values()) {
 			result.add(c);
 		}
 		return result;
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
index 39356e0912..d48b3c9728 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
@@ -17,109 +17,115 @@
 import org.eclipse.pde.internal.core.PDEExtensionRegistry;
 
 public class TargetElementProviders implements IModelElementProvider {
-	private static final String APP_E4XMI_DEFAULT = "Application.e4xmi";
+	private static final String APP_E4XMI_DEFAULT = "Application.e4xmi"; //$NON-NLS-1$
 	private ResourceSet resourceSet;
-	
+
+	@Override
 	public void getModelElements(Filter filter, ModelResultHandler handler) {
-		if( resourceSet == null ) {
+		if (resourceSet == null) {
 			resourceSet = new ResourceSetImpl();
-			PDEExtensionRegistry reg = new PDEExtensionRegistry();
-			IExtension[] extensions = reg.findExtensions("org.eclipse.e4.workbench.model", true);
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			
-			for( IExtension ext : extensions ) {
-				for( IConfigurationElement el : ext.getConfigurationElements() ) {
-					if( el.getName().equals("fragment") ) {
+			final PDEExtensionRegistry reg = new PDEExtensionRegistry();
+			IExtension[] extensions = reg.findExtensions("org.eclipse.e4.workbench.model", true); //$NON-NLS-1$
+			final IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+
+			for (final IExtension ext : extensions) {
+				for (final IConfigurationElement el : ext.getConfigurationElements()) {
+					if (el.getName().equals("fragment")) { //$NON-NLS-1$
 						URI uri;
-//						System.err.println("Model-Ext: Checking: " + ext.getContributor().getName());
-						IProject p = root.getProject(ext.getContributor().getName());
-						if( p.exists() && p.isOpen() ) {
-							uri = URI.createPlatformResourceURI(ext.getContributor().getName() + "/" + el.getAttribute("uri"), true);	
+						// System.err.println("Model-Ext: Checking: " + ext.getContributor().getName());
+						final IProject p = root.getProject(ext.getContributor().getName());
+						if (p.exists() && p.isOpen()) {
+							uri = URI.createPlatformResourceURI(
+								ext.getContributor().getName() + "/" + el.getAttribute("uri"), true); //$NON-NLS-1$ //$NON-NLS-2$
 						} else {
-							uri = URI.createURI("platform:/plugin/" + ext.getContributor().getName() + "/" + el.getAttribute("uri") );							
+							uri = URI.createURI("platform:/plugin/" + ext.getContributor().getName() + "/" //$NON-NLS-1$ //$NON-NLS-2$
+								+ el.getAttribute("uri")); //$NON-NLS-1$
 						}
-//						System.err.println(uri);
+						// System.err.println(uri);
 						try {
-							resourceSet.getResource(uri, true);							
-						} catch (Exception e) {
+							resourceSet.getResource(uri, true);
+						} catch (final Exception e) {
 							e.printStackTrace();
-//							System.err.println("=============> Failing");
+							// System.err.println("=============> Failing");
 						}
 
 					}
 				}
 			}
-			
-			extensions = reg.findExtensions("org.eclipse.core.runtime.products", true);
-			for( IExtension ext : extensions ) {
-				for( IConfigurationElement el : ext.getConfigurationElements() ) {
-					if( el.getName().equals("product") ) {
+
+			extensions = reg.findExtensions("org.eclipse.core.runtime.products", true); //$NON-NLS-1$
+			for (final IExtension ext : extensions) {
+				for (final IConfigurationElement el : ext.getConfigurationElements()) {
+					if (el.getName().equals("product")) { //$NON-NLS-1$
 						boolean xmiPropertyPresent = false;
-						for( IConfigurationElement prop: el.getChildren("property") ) {
-							if( prop.getAttribute("name").equals("applicationXMI") ) {
-								String v = prop.getAttribute("value");
+						for (final IConfigurationElement prop : el.getChildren("property")) { //$NON-NLS-1$
+							if (prop.getAttribute("name").equals("applicationXMI")) { //$NON-NLS-1$//$NON-NLS-2$
+								final String v = prop.getAttribute("value"); //$NON-NLS-1$
 								setUpResourceSet(root, v);
 								xmiPropertyPresent = true;
 								break;
 							}
 						}
-						if (!xmiPropertyPresent){
-							setUpResourceSet(root, ext.getNamespaceIdentifier()+"/"+APP_E4XMI_DEFAULT);
+						if (!xmiPropertyPresent) {
+							setUpResourceSet(root, ext.getNamespaceIdentifier() + "/" + APP_E4XMI_DEFAULT); //$NON-NLS-1$
 							break;
 						}
 					}
 				}
-			}			
+			}
 		}
-		
+
 		applyFilter(filter, handler);
 	}
 
 	private void setUpResourceSet(IWorkspaceRoot root, String v) {
-		String[] s = v.split("/");
+		final String[] s = v.split("/"); //$NON-NLS-1$
 		URI uri;
-//								System.err.println("Product-Ext: Checking: " + v + " => P:" +  s[0] + "");
-		IProject p = root.getProject(s[0]);
-		if( p.exists() && p.isOpen() ) {
-			uri = URI.createPlatformResourceURI(v, true );	
+		// System.err.println("Product-Ext: Checking: " + v + " => P:" + s[0] + "");
+		final IProject p = root.getProject(s[0]);
+		if (p.exists() && p.isOpen()) {
+			uri = URI.createPlatformResourceURI(v, true);
 		} else {
-			uri = URI.createURI("platform:/plugin/" + v );
+			uri = URI.createURI("platform:/plugin/" + v); //$NON-NLS-1$
 		}
-		
-//		System.err.println(uri);
+
+		// System.err.println(uri);
 		try {
-			//prevent some unnecessary calls by checking the uri 
-			if (resourceSet.getURIConverter().exists(uri, null)
-					)
-			resourceSet.getResource(uri, true);							
-		} catch (Exception e) {
+			// prevent some unnecessary calls by checking the uri
+			if (resourceSet.getURIConverter().exists(uri, null)) {
+				resourceSet.getResource(uri, true);
+			}
+		} catch (final Exception e) {
 			e.printStackTrace();
-//									System.err.println("=============> Failing");
+			// System.err.println("=============> Failing");
 		}
 	}
-	
+
 	private void applyFilter(Filter filter, ModelResultHandler handler) {
-		for (Resource res : resourceSet.getResources()) {
-				TreeIterator<EObject> it = EcoreUtil.getAllContents(res,
-						true);
-				while (it.hasNext()) {
-					EObject o = it.next();
-					if (o.eContainingFeature() != FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
-						if (o.eClass().equals(filter.eClass)) {
-//							System.err.println("Found: " + o);
-							handler.result(o);
-						}
+		for (final Resource res : resourceSet.getResources()) {
+			final TreeIterator<EObject> it = EcoreUtil.getAllContents(res,
+				true);
+			while (it.hasNext()) {
+				final EObject o = it.next();
+				if (o.eContainingFeature() != FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
+					if (o.eClass().equals(filter.eClass)) {
+						// System.err.println("Found: " + o);
+						handler.result(o);
 					}
 				}
+			}
 		}
 	}
 
+	@Override
 	public void clearCache() {
-		if (resourceSet==null) return;
-		for (Resource r : resourceSet.getResources()) {
+		if (resourceSet == null) {
+			return;
+		}
+		for (final Resource r : resourceSet.getResources()) {
 			r.unload();
 		}
 		resourceSet = null;
 	}
-	
+
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
index 6988d3d117..4612c913ee 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
@@ -19,12 +19,14 @@ public class UndoAction extends Action {
 
 	public UndoAction(IModelResource resource) {
 		this.resource = resource;
-		this.listener = new IModelResource.ModelListener() {
+		listener = new IModelResource.ModelListener() {
 
+			@Override
 			public void commandStackChanged() {
 				update();
 			}
 
+			@Override
 			public void dirtyChanged() {
 			}
 		};
@@ -41,12 +43,12 @@ public void run() {
 
 	private void update() {
 		if (resource.getEditingDomain().getCommandStack().canUndo()) {
-			setText("Undo "
-					+ resource.getEditingDomain().getCommandStack()
-							.getUndoCommand().getLabel());
+			setText(Messages.UndoAction_Undo + " " //$NON-NLS-2$
+				+ resource.getEditingDomain().getCommandStack()
+				.getUndoCommand().getLabel());
 			setEnabled(true);
 		} else {
-			setText("Undo");
+			setText(Messages.UndoAction_Undo);
 			setEnabled(false);
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java
index 4052b79be8..9ec1db74ad 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java
@@ -15,7 +15,7 @@ public class EditUIUtil {
 		Class<?> fileClass = null;
 		try {
 			fileClass = IFile.class;
-		} catch (Exception exception) {
+		} catch (final Exception exception) {
 			// Ignore any exceptions and assume the class isn't available.
 		}
 		FILE_CLASS = fileClass;
@@ -26,15 +26,15 @@ public class EditUIUtil {
 	static {
 		Class<?> fileRevisionClass = null;
 		Method fileRevisionGetURIMethod = null;
-		Bundle bundle = Platform.getBundle("org.eclipse.team.core");
+		final Bundle bundle = Platform.getBundle("org.eclipse.team.core"); //$NON-NLS-1$
 		if (bundle != null
-				&& (bundle.getState() & (Bundle.ACTIVE | Bundle.STARTING | Bundle.RESOLVED)) != 0) {
+			&& (bundle.getState() & (Bundle.ACTIVE | Bundle.STARTING | Bundle.RESOLVED)) != 0) {
 			try {
 				fileRevisionClass = bundle
-						.loadClass("org.eclipse.team.core.history.IFileRevision");
+					.loadClass("org.eclipse.team.core.history.IFileRevision"); //$NON-NLS-1$
 				fileRevisionGetURIMethod = fileRevisionClass
-						.getMethod("getURI");
-			} catch (Exception exeption) {
+					.getMethod("getURI"); //$NON-NLS-1$
+			} catch (final Exception exeption) {
 				// Ignore any exceptions and assume the class isn't available.
 			}
 		}
@@ -47,7 +47,7 @@ public class EditUIUtil {
 		Class<?> uriEditorInputClass = null;
 		try {
 			uriEditorInputClass = IURIEditorInput.class;
-		} catch (Exception exception) {
+		} catch (final Exception exception) {
 			// The class is not available.
 		}
 		URI_EDITOR_INPUT_CLASS = uriEditorInputClass;
@@ -56,20 +56,20 @@ public class EditUIUtil {
 	public static URI getURI(IEditorInput editorInput) {
 
 		if (FILE_CLASS != null) {
-			IFile file = (IFile) editorInput.getAdapter(FILE_CLASS);
+			final IFile file = (IFile) editorInput.getAdapter(FILE_CLASS);
 			if (file != null) {
 				return URI.createPlatformResourceURI(file.getFullPath()
-						.toString(), true);
+					.toString(), true);
 			}
 		}
 		if (FILE_REVISION_CLASS != null) {
-			Object fileRevision = editorInput.getAdapter(FILE_REVISION_CLASS);
+			final Object fileRevision = editorInput.getAdapter(FILE_REVISION_CLASS);
 			if (fileRevision != null) {
 				try {
 					return URI
-							.createURI(((java.net.URI) FILE_REVISION_GET_URI_METHOD
-									.invoke(fileRevision)).toString());
-				} catch (Exception exception) {
+						.createURI(((java.net.URI) FILE_REVISION_GET_URI_METHOD
+							.invoke(fileRevision)).toString());
+				} catch (final Exception exception) {
 					// TODO Log error
 				}
 			}
@@ -77,8 +77,8 @@ public static URI getURI(IEditorInput editorInput) {
 		if (URI_EDITOR_INPUT_CLASS != null) {
 			if (editorInput instanceof IURIEditorInput) {
 				return URI.createURI(
-						((IURIEditorInput) editorInput).getURI().toString())
-						.trimFragment();
+					((IURIEditorInput) editorInput).getURI().toString())
+					.trimFragment();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/messages.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/messages.properties
new file mode 100644
index 0000000000..9df9660e35
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/messages.properties
@@ -0,0 +1,16 @@
+ModelEditorPreferencePage_Color=Color
+ModelEditorPreferencePage_ForcesReadOnlyXMITab=(forces read only XMI tab)\n
+ModelEditorPreferencePage_FormTab=Form Tab
+ModelEditorPreferencePage_GeneratedID=Autogenerate Element-Id
+ModelEditorPreferencePage_ListTabe=List Tab
+ModelEditorPreferencePage_NotRenderedColor=Not rendered color
+ModelEditorPreferencePage_NotVisibleAndNotRenderedColor=Not visible and not rendered color
+ModelEditorPreferencePage_NotVisibleColor=Not visible color
+ModelEditorPreferencePage_RememberColumnSettings=Remember column settings when reopening editor  
+ModelEditorPreferencePage_RememberFilterSettings=Remember filter settings when reopening editor
+ModelEditorPreferencePage_RequiresReopeningModel=(requires reopening model)
+ModelEditorPreferencePage_SearchableTree=Searchable tree on form tab\n
+ModelEditorPreferencePage_ShowID=Show XMI:ID
+ModelMoveParticipant_CreatingChange=Creating Change ..
+RedoAction_Redo=Redo
+UndoAction_Undo=Undo

From fc5e80a740cd7f41eb0e014417ce8ea7b36fcad9 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 9 Oct 2014 11:44:40 +0200
Subject: [PATCH 0840/1286] Bug 446429 - Use Add-on instead of Addon in the
 model editor

Change-Id: I18380325892250a700c808fb1b318767c590db44
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../e4/tools/emf/ui/internal/Messages.properties     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index c0f667445d..90402a7f95 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -67,7 +67,7 @@ ApplicationEditor_PartDescriptors=Part Descriptors
 ApplicationEditor_BindingTables=BindingTables
 ApplicationEditor_Commands=Commands
 ApplicationEditor_Windows=Windows and Dialogs
-ApplicationEditor_Addons=Addons
+ApplicationEditor_Addons=Add-ons
 ApplicationEditor_MenuContributions=Menu Contributions
 ApplicationEditor_Snippets=Snippets
 ApplicationEditor_ToolBarContributions=Toolbar Contributions
@@ -326,8 +326,8 @@ VBindingTableEditor_BindingTables=Binding Tables
 VBindingTableEditor_AddBindingTable=Binding Table
 
 AddonsEditor_ClassURI=Class URI
-AddonsEditor_TreeLabel=Addon
-AddonsEditor_TreeLabelDescription=Addon Bla Bla Bla
+AddonsEditor_TreeLabel=Add-on
+AddonsEditor_TreeLabelDescription=Add-on Bla Bla Bla
 AddonsEditor_Tags=Tags
 
 ContributionClassDialog_DialogMessage=Enter the name of the contributing class
@@ -454,9 +454,9 @@ WindowEditor_Windows=Windows and Dialogs
 WindowEditor_Controls=Controls
 WindowEditor_SharedElements=Shared Elements
 
-VApplicationAddons_AddAddon=Addon
-VApplicationAddons_TreeLabel=Addons
-VApplicationAddons_TreeLabelDescription=Addons bla bla bla bla
+VApplicationAddons_AddAddon=Add-on
+VApplicationAddons_TreeLabel=Add-ons
+VApplicationAddons_TreeLabelDescription=Add-ons bla bla bla bla
 VApplicationAddons_Commands=Commands
 
 VApplicationCategoriesEditor_TreeLabel=Command Categories

From 4f10b915566390344ee641a0878e4d2f4f6b9e8b Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 21 Oct 2014 09:43:19 +0200
Subject: [PATCH 0841/1286] Bug 448015 - Remove hard version dependency from
 org.eclipse.e4.tools.e3x.bridge.feature

Change-Id: Iddda722459dacd1fe42bbbb0d489b4bf0153d715
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

From 2a578eec1db398df0737e3633ba27e10769af4aa Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 21 Oct 2014 14:17:19 +0200
Subject: [PATCH 0842/1286] Bug 448068 - Adjust e4 tools to new local handling

Change-Id: I3ae73df26c0461ad6a1b9abbf35f16d87fd36e89
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../emf/ui/internal/common/ModelEditor.java   | 10 +++++++-
 .../ProjectOSGiTranslationProvider.java       | 24 ++++++++++++++-----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index ea1d5ecb09..601f235d79 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -350,7 +350,15 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 		this.context.set(ModelEditor.class, this);
 		this.obsManager = new ObservablesManager();
 		if (project != null) {
-			ProjectOSGiTranslationProvider translationProvider = new ProjectOSGiTranslationProvider(project, (String) this.context.get(TranslationService.LOCALE)) {
+			String localeString = ""; //$NON-NLS-1$
+			Object object = this.context.get(TranslationService.LOCALE);
+			// TODO simplify once we break e4 tools
+			// compatibility with Luna, in Luna we representation has changed to
+			// be Locale instead of String
+			if (object != null) {
+				localeString = object.toString();
+			}
+			ProjectOSGiTranslationProvider translationProvider = new ProjectOSGiTranslationProvider(project, localeString) {
 				@Override
 				protected void updateResourceBundle() {
 					super.updateResourceBundle();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
index 6cefaa958d..74c7f6f2e1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
@@ -55,6 +55,8 @@ public class ProjectOSGiTranslationProvider extends ResourceBundleTranslationPro
 	 *            The initial {@link Locale} for which this translation provider
 	 *            should be created.
 	 */
+	// TODO change parameter to Locale instead of String once we break e4 tools
+	// compatibility with Luna
 	public ProjectOSGiTranslationProvider(IProject project, String locale) {
 		// create the translation provider with no initial ResourceBundle as we
 		// need to calculate it first
@@ -91,6 +93,8 @@ public boolean visit(IResourceDelta delta) throws CoreException {
 		}
 	}
 
+	// TODO remove once we break e4 tools
+	// compatibility with Luna
 	@Inject
 	void setLocale(@Named(TranslationService.LOCALE) String locale, @Optional Boolean performUpdate) {
 		try {
@@ -103,8 +107,16 @@ void setLocale(@Named(TranslationService.LOCALE) String locale, @Optional Boolea
 			updateResourceBundle();
 	}
 
+	@Inject
+	void setLocale(@Named(TranslationService.LOCALE) Locale locale, @Optional Boolean performUpdate) {
+		this.locale = locale == null ? Locale.getDefault() : locale;
+
+		if (performUpdate == null || performUpdate)
+			updateResourceBundle();
+	}
+
 	/**
-	 * 
+	 *
 	 * @param delta
 	 *            The resource delta that represents the changes in the state of
 	 *            a resource tree between two discrete points in time.
@@ -154,7 +166,7 @@ boolean visit(IResourceDelta delta) {
 	 * Will check if the manifest header identifying the base name of the
 	 * bundle's localization entries has changed and if so it will update the
 	 * underlying {@link ResourceBundle} and clear the caches.
-	 * 
+	 *
 	 * @param file
 	 *            The reference to the manifest file of the current project.
 	 */
@@ -181,7 +193,7 @@ private void handleManifestChange(IFile file) {
 	/**
 	 * Extracts the manifest header identifying the base name of the bundle's
 	 * localization entries.
-	 * 
+	 *
 	 * @param file
 	 *            The reference to the manifest file of the current project.
 	 * @return The manifest header identifying the base name of the bundle's
@@ -190,7 +202,7 @@ private void handleManifestChange(IFile file) {
 	 *             If loading the contents of the given {@link IFile} fails
 	 * @throws IOException
 	 *             If reading out of the given file fails.
-	 * 
+	 *
 	 * @see IFile#getContents()
 	 */
 	public static String extractBasenameFromManifest(IFile file) throws CoreException, IOException {
@@ -219,7 +231,7 @@ protected void updateResourceBundle() {
 	/**
 	 * Specialization of {@link Control} which loads the {@link ResourceBundle}
 	 * by using file structures of a project instead of using a classloader.
-	 * 
+	 *
 	 * @author Dirk Fauth
 	 */
 	class ProjectResourceBundleControl extends ResourceBundle.Control {
@@ -275,7 +287,7 @@ public InputStream run() throws IOException {
 		/**
 		 * Loads the properties file by using the {@link IProject} of the
 		 * {@link ProjectOSGiTranslationProvider}.
-		 * 
+		 *
 		 * @param name
 		 * @return The {@link InputStream} to the properties file to load
 		 */

From ece387029fd0ed3370d6336755a19fe885951b96 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Tue, 21 Oct 2014 06:25:41 +0200
Subject: [PATCH 0843/1286] Bug 444340 - Externalize Strings - and Bug 444692

---
 .../emf/editor3x/E4WorkbenchModelEditor.java  |  27 ++--
 .../emf/editor3x/EditorProjectFunction.java   |   6 +-
 .../e4/tools/emf/editor3x/Messages.java       |   3 +
 .../e4/tools/emf/editor3x/ModelExtractor.java |  16 +-
 .../emf/editor3x/ModelMoveParticipant.java    |  16 +-
 .../PDEClassContributionProvider.java         |   2 +-
 .../emf/editor3x/PDEExtensionLookup.java      |  13 +-
 .../e4/tools/emf/editor3x/RefactorModel.java  |  61 ++++----
 .../editor3x/RefactorParticipantDelegate.java |  10 +-
 .../emf/editor3x/TargetElementProviders.java  |   1 +
 .../e4/tools/emf/editor3x/UndoAction.java     |   4 +-
 .../emf/editor3x/XMIResourceFunction.java     |  14 +-
 .../extension/AddonContributionEditor.java    | 144 +++++++++---------
 ...micMenuContributionContributionEditor.java | 107 +++++++------
 .../extension/HandlerContributionEditor.java  | 117 +++++++-------
 .../extension/PartContributionEditor.java     | 142 ++++++++---------
 .../ToolControlContributionEditor.java        |  99 ++++++------
 .../e4/tools/emf/editor3x/messages.properties |   3 +
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../org.eclipse.e4.tools/META-INF/MANIFEST.MF |   2 +-
 20 files changed, 419 insertions(+), 370 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
index 5502f73712..781dd7ed27 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
@@ -19,23 +19,25 @@
 
 @SuppressWarnings("restriction")
 public class E4WorkbenchModelEditor extends
-		DIEditorPart<ApplicationModelEditor> {
+	DIEditorPart<ApplicationModelEditor> {
 	private UndoAction undoAction;
 	private RedoAction redoAction;
 
-	private ModelListener listener = new ModelListener() {
+	private final ModelListener listener = new ModelListener() {
 
+		@Override
 		public void dirtyChanged() {
 			firePropertyChange(PROP_DIRTY);
 		}
 
+		@Override
 		public void commandStackChanged() {
 
 		}
 	};
 
 	public E4WorkbenchModelEditor() {
-		super(ApplicationModelEditor.class, COPY|CUT|PASTE);
+		super(ApplicationModelEditor.class, COPY | CUT | PASTE);
 	}
 
 	@Override
@@ -43,32 +45,35 @@ public void createPartControl(Composite parent) {
 		super.createPartControl(parent);
 		setPartName(getEditorInput().getName());
 	}
-	
+
 	@Override
 	protected void makeActions() {
 		super.makeActions();
 		undoAction = new UndoAction(getComponent().getModelProvider());
 		undoAction.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_UNDO);
-		
+
 		redoAction = new RedoAction(getComponent().getModelProvider());
 		redoAction.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_REDO);
 
 		getEditorSite().getActionBars().setGlobalActionHandler(
-				ActionFactory.UNDO.getId(), undoAction);
+			ActionFactory.UNDO.getId(), undoAction);
 		getEditorSite().getActionBars().setGlobalActionHandler(
-				ActionFactory.REDO.getId(), redoAction);
+			ActionFactory.REDO.getId(), redoAction);
 	}
 
 	@Override
 	public void dispose() {
-		if (undoAction != null)
+		if (undoAction != null) {
 			undoAction.dispose();
+		}
 
-		if (redoAction != null)
+		if (redoAction != null) {
 			redoAction.dispose();
+		}
 
-		if (listener != null && getComponent() != null && getComponent().getModelProvider() != null)
+		if (listener != null && getComponent() != null && getComponent().getModelProvider() != null) {
 			getComponent().getModelProvider().removeModelListener(listener);
+		}
 
 		super.dispose();
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java
index 742cb743b4..70c0970a61 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java
@@ -8,10 +8,10 @@
 public class EditorProjectFunction extends ContextFunction {
 
 	@Override
-	public Object compute(IEclipseContext context) {
+	public Object compute(IEclipseContext context, String contextKex) {
 		final IEditorInput input = context.get(IEditorInput.class);
-		if( input != null && input instanceof IFileEditorInput ) {
-			return ((IFileEditorInput)input).getFile().getProject();	
+		if (input != null && input instanceof IFileEditorInput) {
+			return ((IFileEditorInput) input).getFile().getProject();
 		}
 		return null;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
index ba3b753765..3e967532c4 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
@@ -19,6 +19,9 @@
  */
 public class Messages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.e4.tools.emf.editor3x.messages"; //$NON-NLS-1$
+	public static String ContributionEditor_CurrentURLIsInvalid;
+	public static String ContributionEditor_FailedToOpenEditor;
+	public static String ContributionEditor_InvalidURL;
 	public static String ModelEditorPreferencePage_Color;
 	public static String ModelEditorPreferencePage_ForcesReadOnlyXMITab;
 	public static String ModelEditorPreferencePage_FormTab;
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java
index c0b46b8725..2b488922f0 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java
@@ -7,19 +7,19 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelExtractor;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog; 
+import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.widgets.Shell;
- 
+
 @SuppressWarnings("restriction")
-public class ModelExtractor implements IModelExtractor { 
-	
+public class ModelExtractor implements IModelExtractor {
+
+	@Override
 	public boolean extract(Shell shell, IProject project,
-			List<MApplicationElement> maes) {
-		ExtractContributionModelWizard extractContributionModelWizard = new ExtractContributionModelWizard(maes);
+		List<MApplicationElement> maes) {
+		final ExtractContributionModelWizard extractContributionModelWizard = new ExtractContributionModelWizard(maes);
 		extractContributionModelWizard.setup(project);
-		WizardDialog wizardDialog = new WizardDialog(shell, extractContributionModelWizard);
+		final WizardDialog wizardDialog = new WizardDialog(shell, extractContributionModelWizard);
 		return wizardDialog.open() == Window.OK;
 	}
 
-
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java
index fbef832d92..2b7fbc2fa3 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java
@@ -57,7 +57,7 @@ protected boolean initialize(Object pElement) {
 
 	@Override
 	public String getName() {
-		return "Workbench Model Contribution Participant";
+		return "Workbench Model Contribution Participant"; //$NON-NLS-1$
 	}
 
 	@Override
@@ -68,9 +68,9 @@ public RefactoringStatus checkConditions(IProgressMonitor pMonitor,
 
 	@Override
 	public Change createChange(IProgressMonitor pMonitor) throws CoreException,
-		OperationCanceledException {
+	OperationCanceledException {
 
-		pMonitor.beginTask("Creating Change ..", IProgressMonitor.UNKNOWN);
+		pMonitor.beginTask(Messages.ModelMoveParticipant_CreatingChange, IProgressMonitor.UNKNOWN);
 
 		Change change = null;
 
@@ -149,11 +149,11 @@ private Change createClassChange(IProgressMonitor pMonitor, IType pType)
 			.getElementName() : fragment.getElementName() + "." //$NON-NLS-1$
 			+ pType.getElementName();
 
-			return RefactorParticipantDelegate.createChange(
-			pMonitor,
-			fModel.addTextRename("bundleclass://" + fromBundle + "/" //$NON-NLS-1$ //$NON-NLS-2$
-				+ fromClassname, "bundleclass://" + toBundle + "/" //$NON-NLS-1$ //$NON-NLS-2$
-				+ toClassName));
+		return RefactorParticipantDelegate.createChange(
+				pMonitor,
+				fModel.addTextRename("bundleclass://" + fromBundle + "/" //$NON-NLS-1$ //$NON-NLS-2$
+					+ fromClassname, "bundleclass://" + toBundle + "/" //$NON-NLS-1$ //$NON-NLS-2$
+					+ toClassName));
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index 29fa40b62d..9c42f01d29 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -34,6 +34,7 @@
 import org.eclipse.jdt.core.search.TypeNameRequestor;
 import org.eclipse.pde.internal.core.util.PDEJavaHelper;
 
+@SuppressWarnings("restriction")
 public class PDEClassContributionProvider implements IClassContributionProvider {
 	private final SearchEngine searchEngine;
 
@@ -42,7 +43,6 @@ public PDEClassContributionProvider() {
 	}
 
 	@Override
-	@SuppressWarnings("restriction")
 	public void findContribution(final Filter filter, final ContributionResultHandler handler) {
 		boolean followReferences = true;
 		if (filter.getSearchScope().contains(ResourceSearchScope.PROJECT)
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java
index 88c4114e12..0bb1ad183d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
@@ -16,16 +16,17 @@
 import org.eclipse.e4.tools.emf.ui.common.IExtensionLookup;
 import org.eclipse.pde.internal.core.PDEExtensionRegistry;
 
+@SuppressWarnings("restriction")
 public class PDEExtensionLookup implements IExtensionLookup {
 
+	@Override
 	public IExtension[] findExtensions(String extensionPointId, boolean liveModel) {
-		if( liveModel ) {
-			IExtensionRegistry registry = RegistryFactory.getRegistry();
+		if (liveModel) {
+			final IExtensionRegistry registry = RegistryFactory.getRegistry();
 			return registry.getExtensionPoint(extensionPointId).getExtensions();
-		} else {
-			PDEExtensionRegistry reg = new PDEExtensionRegistry();
-			return reg.findExtensions(extensionPointId, true);			
 		}
+		final PDEExtensionRegistry reg = new PDEExtensionRegistry();
+		return reg.findExtensions(extensionPointId, true);
 	}
 
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
index 58d71e2ead..05cfa68f5f 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
@@ -6,7 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Wim Jongman <wim.jongman@remainsoftware.com> - Bug 432892: Eclipse 4 Application does not work after renaming the project name
+ * Wim Jongman <wim.jongman@remainsoftware.com> - Bug 432892: Eclipse 4 Application does not work after renaming the
+ * project name
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
@@ -22,7 +23,7 @@
 /**
  * A temporary data storage for Ecipse 4 model refactoring. Use the static
  * methods to get hold of an instance.
- * 
+ *
  * @author Remain Software - Wim Jongman
  *
  */
@@ -39,10 +40,9 @@ public class RefactorModel {
 	private RefactoringParticipant fParticipant;
 
 	/**
-	 * Factory for an empty model. Use the
-	 * {@link #addTextRename(String, String)} method to add one or more text
+	 * Factory for an empty model. Use the {@link #addTextRename(String, String)} method to add one or more text
 	 * renames.
-	 * 
+	 *
 	 * @param pParticipant
 	 * @return the model
 	 */
@@ -51,27 +51,27 @@ public static RefactorModel getModel(RefactoringParticipant pParticipant) {
 	}
 
 	/**
-	 * Factory for a model with one rename. Use the
-	 * {@link #addTextRename(String, String)} method to add one or more text
+	 * Factory for a model with one rename. Use the {@link #addTextRename(String, String)} method to add one or more
+	 * text
 	 * renames.
-	 * 
+	 *
 	 * @param pParticipant
 	 * @param pOldText
 	 * @param pNewText
 	 * @return the model.
 	 */
 	public static RefactorModel getModel(RefactoringParticipant pParticipant,
-			String pOldText, String pNewText) {
+		String pOldText, String pNewText) {
 		return new RefactorModel().addTextRename(pOldText, pNewText);
 	}
 
 	/**
 	 * Factory for a model with one rename and a project rename. The project
 	 * rename uses the old and new project because the refactoring framework
-	 * expects the already renamed filenames. Use the
-	 * {@link #addTextRename(String, String)} method to add one or more text
+	 * expects the already renamed filenames. Use the {@link #addTextRename(String, String)} method to add one or more
+	 * text
 	 * renames and the old and the new project.
-	 * 
+	 *
 	 * @param pParticipant
 	 * @param pOldText
 	 * @param pNewText
@@ -80,18 +80,17 @@ public static RefactorModel getModel(RefactoringParticipant pParticipant,
 	 * @return the model.
 	 */
 	public static RefactorModel getModel(RefactoringParticipant pParticipant,
-			String pOldText, String pNewText, IProject pOldProject,
-			IProject pNewProject) {
+		String pOldText, String pNewText, IProject pOldProject,
+		IProject pNewProject) {
 		return new RefactorModel().addTextRename(pOldText, pNewText)
-				.setProjectRename(pOldProject, pNewProject)
-				.setRefactorParticipant(pParticipant);
+			.setProjectRename(pOldProject, pNewProject)
+			.setRefactorParticipant(pParticipant);
 	}
 
 	/**
 	 * Adds a text rename to be processed later. For example, if the project
-	 * name changes there can be <code>bundlclass://</code> and
-	 * <code>platform:/plugin</code> changes.
-	 * 
+	 * name changes there can be <code>bundlclass://</code> and <code>platform:/plugin</code> changes.
+	 *
 	 * @param oldText
 	 * @param newText
 	 * @return the model
@@ -107,7 +106,7 @@ public RefactorModel addTextRename(String oldText, String newText) {
 	/**
 	 * When project renaming this returns the new project. This project does not
 	 * necessarily exist yet.
-	 * 
+	 *
 	 * @return the new project or null if it was not set
 	 * @see RefactorModel#setProjectRename(IProject, IProject)
 	 */
@@ -124,7 +123,7 @@ public String getNewTextCurrentIndex() {
 
 	/**
 	 * When project renaming this returns the old project.
-	 * 
+	 *
 	 * @return the new project or null if it was not set
 	 * @see RefactorModel#setProjectRename(IProject, IProject)
 	 */
@@ -133,7 +132,7 @@ public IProject getOldProject() {
 	}
 
 	/**
-	 * 
+	 *
 	 * @return the old text in the current index.
 	 */
 	public String getOldTextCurrentIndex() {
@@ -141,7 +140,7 @@ public String getOldTextCurrentIndex() {
 	}
 
 	/**
-	 * @return
+	 * @return the refactoring participant
 	 */
 	public RefactoringParticipant getRefactoringParticipant() {
 		return fParticipant;
@@ -156,7 +155,7 @@ public int getRenameCount() {
 
 	/**
 	 * Delegates to the same method of the embedded RefactoringParticipant.
-	 * 
+	 *
 	 * @param file
 	 * @return a TextChange object
 	 * @see RefactoringParticipant#getTextChange(Object)
@@ -174,26 +173,26 @@ public boolean isProjectRename() {
 
 	/**
 	 * Sets the current 0-based index. May not be out of bounds.
-	 * 
+	 *
 	 * @param index
 	 * @return the model
 	 */
 	public RefactorModel setIndex(int index) {
 		Assert.isTrue(index >= 0);
 		Assert.isTrue(index < fOldTexts.size());
-		this.fIndex = index;
+		fIndex = index;
 		return this;
 	}
 
 	/**
 	 * Sets the old and the new project in case of project renaming.
-	 * 
+	 *
 	 * @param oldProject
 	 * @param newProject
 	 * @return the model
 	 */
 	public RefactorModel setProjectRename(IProject oldProject,
-			IProject newProject) {
+		IProject newProject) {
 		Assert.isNotNull(oldProject);
 		Assert.isNotNull(newProject);
 		fOldProject = oldProject;
@@ -203,14 +202,14 @@ public RefactorModel setProjectRename(IProject oldProject,
 
 	/**
 	 * Sets the RefactoringParticipant.
-	 * 
+	 *
 	 * @param pParticipant
 	 * @return the model
 	 * @see RefactoringParticipant
 	 */
 	public RefactorModel setRefactorParticipant(
-			RefactoringParticipant pParticipant) {
-		this.fParticipant = pParticipant;
+		RefactoringParticipant pParticipant) {
+		fParticipant = pParticipant;
 		return this;
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
index 802c284d98..faab30eb2a 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
@@ -33,6 +33,7 @@
 import org.eclipse.text.edits.ReplaceEdit;
 import org.eclipse.text.edits.TextEditGroup;
 
+@SuppressWarnings("restriction")
 class RefactorParticipantDelegate {
 
 	private static final String E4_MODEL_CHANGES = "Eclipse 4 Application Model Changes"; //$NON-NLS-1$
@@ -42,13 +43,8 @@ class RefactorParticipantDelegate {
 	 * adds the changes to the passed {@link CompositeChange}.
 	 *
 	 * @param pProgressMonitor
-	 * @param pParticipant
-	 * @param pOldUrl
-	 *            String[] containing the old texts
-	 * @param pNewUrl
-	 *            String[] containing the new texts
-	 * @param pNewProject
-	 *            The name of the project if this is a project change else null.
+	 * @param pModel
+	 * 
 	 * @return a set of changes in a {@link CompositeChange}
 	 * @throws CoreException
 	 * @throws OperationCanceledException
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
index d48b3c9728..ff99aa5f99 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
@@ -16,6 +16,7 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.pde.internal.core.PDEExtensionRegistry;
 
+@SuppressWarnings("restriction")
 public class TargetElementProviders implements IModelElementProvider {
 	private static final String APP_E4XMI_DEFAULT = "Application.e4xmi"; //$NON-NLS-1$
 	private ResourceSet resourceSet;
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
index 4612c913ee..28eebf0f8e 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
@@ -43,9 +43,9 @@ public void run() {
 
 	private void update() {
 		if (resource.getEditingDomain().getCommandStack().canUndo()) {
-			setText(Messages.UndoAction_Undo + " " //$NON-NLS-2$
+			setText(Messages.UndoAction_Undo + " " //$NON-NLS-1$
 				+ resource.getEditingDomain().getCommandStack()
-				.getUndoCommand().getLabel());
+					.getUndoCommand().getLabel());
 			setEnabled(true);
 		} else {
 			setText(Messages.UndoAction_Undo);
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
index 2b64fcb824..8517bca0bb 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
@@ -12,21 +12,23 @@
 public class XMIResourceFunction extends ContextFunction {
 
 	@Override
-	public Object compute(final IEclipseContext context) {
+	public Object compute(final IEclipseContext context, String contextKey) {
 		final IEditorInput input = context.get(IEditorInput.class);
 		final IDirtyProviderService dirtyProvider = context.get(IDirtyProviderService.class);
-		
-		if( input != null ) {
-			URI resourceURI = EditUIUtil.getURI(input);
+
+		if (input != null) {
+			final URI resourceURI = EditUIUtil.getURI(input);
 			final XMIModelResource resource = new XMIModelResource(resourceURI);
 			resource.addModelListener(new ModelListener() {
-				
+
+				@Override
 				public void dirtyChanged() {
 					dirtyProvider.setDirtyState(resource.isDirty());
 				}
 
+				@Override
 				public void commandStackChanged() {
-					
+
 				}
 			});
 			return resource;
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
index 6b3d9f20d6..56aa6f1f41 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Sopot Cela <sopotcela@gmail.com>
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Sopot Cela <sopotcela@gmail.com>
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x.extension;
 
@@ -15,6 +15,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.e4.internal.tools.wizards.classes.NewAddonClassWizard;
+import org.eclipse.e4.tools.emf.editor3x.Messages;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -36,97 +37,104 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PartInitException;
 
+@SuppressWarnings("restriction")
 public class AddonContributionEditor implements IContributionClassCreator {
 
+	@Override
 	public boolean isSupported(EClass element) {
 		return Util.isTypeOrSuper(ApplicationPackageImpl.Literals.ADDON, element);
 	}
-	
+
+	@Override
 	public void createOpen(MContribution contribution, EditingDomain domain,
-			IProject project, Shell shell) {
+		IProject project, Shell shell) {
 		createOpen(contribution, domain, project, shell, false);
 	}
 
 	private void createOpen(MContribution contribution, EditingDomain domain,
-			IProject project, Shell shell, boolean forceNew) {
-		if( forceNew || contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 || !contribution.getContributionURI().startsWith("bundleclass:") ) {
-			NewAddonClassWizard wizard = new NewAddonClassWizard(contribution.getContributionURI());
-			wizard.init( null, new StructuredSelection(project));
-			WizardDialog dialog = new WizardDialog(shell, wizard);
-			if( dialog.open() == Window.OK ) {
-				IFile f = wizard.getFile();
-				ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
+		IProject project, Shell shell, boolean forceNew) {
+		if (forceNew || contribution.getContributionURI() == null
+			|| contribution.getContributionURI().trim().length() == 0
+			|| !contribution.getContributionURI().startsWith("bundleclass:")) { //$NON-NLS-1$
+			final NewAddonClassWizard wizard = new NewAddonClassWizard(contribution.getContributionURI());
+			wizard.init(null, new StructuredSelection(project));
+			final WizardDialog dialog = new WizardDialog(shell, wizard);
+			if (dialog.open() == Window.OK) {
+				final IFile f = wizard.getFile();
+				final ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
 				try {
 					String fullyQualified;
-					if( el.getPackageDeclarations() != null && el.getPackageDeclarations().length > 0 ) {
-						String packageName = el.getPackageDeclarations()[0].getElementName();
-						String className = wizard.getDomainClass().getName();
-						if( packageName.trim().length() > 0 ) {
-							fullyQualified = packageName + "." + className;	
+					if (el.getPackageDeclarations() != null && el.getPackageDeclarations().length > 0) {
+						final String packageName = el.getPackageDeclarations()[0].getElementName();
+						final String className = wizard.getDomainClass().getName();
+						if (packageName.trim().length() > 0) {
+							fullyQualified = packageName + "." + className; //$NON-NLS-1$
 						} else {
 							fullyQualified = className;
 						}
 					} else {
 						fullyQualified = wizard.getDomainClass().getName();
 					}
-					
-					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "bundleclass://" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified);
-					if( cmd.canExecute() ) {
+
+					final Command cmd = SetCommand.create(domain, contribution,
+						ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
+						"bundleclass://" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified); //$NON-NLS-1$ //$NON-NLS-2$
+					if (cmd.canExecute()) {
 						domain.getCommandStack().execute(cmd);
 					}
-				} catch (JavaModelException e) {
+				} catch (final JavaModelException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 			}
 		} else {
-            URI uri = URI.createURI(contribution.getContributionURI());
-            if (uri.hasAuthority() && uri.segmentCount() == 1) {
-                String symbolicName = uri.authority();
-                String fullyQualified = uri.segment(0);
-                IProject p = ResourcesPlugin.getWorkspace().getRoot()
-                        .getProject(symbolicName);
-                
-                if( ! p.exists() ) {
-                    for( IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects() ) {
-                        String name = Util.getBundleSymbolicName(check);
-                        if( symbolicName.equals(name) ) {
-                            p = check;
-                            break;
-                        }
-                    }
-                }
-                
-                // TODO If this is not a WS-Resource we need to open differently
-                if (p != null) {
-                    IJavaProject jp = JavaCore.create(p);
-                    IType t = null;
-                    try {
-                    	if (p.exists()){
-                    		t = jp.findType(fullyQualified);
-                    	}
-                    	else
-                    	{
-                    		IJavaProject pprim = JavaCore.create(project);
-                    		t = pprim.findType(fullyQualified);
-                    	}
-                        if( t != null ) {
-                            JavaUI.openInEditor(t);
-                        } else {
-                                createOpen(contribution, domain, project, shell, true);
-                        }
-                    } catch (JavaModelException e) {
-                            createOpen(contribution, domain, project, shell, true);
-                    } catch (PartInitException e) {
-                        MessageDialog.openError(shell, "Failed to open editor", e.getMessage());
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                }
-            } else {
-                MessageDialog.openError(shell, "Invalid URL",
-                        "The current url is invalid");
-            }
+			final URI uri = URI.createURI(contribution.getContributionURI());
+			if (uri.hasAuthority() && uri.segmentCount() == 1) {
+				final String symbolicName = uri.authority();
+				final String fullyQualified = uri.segment(0);
+				IProject p = ResourcesPlugin.getWorkspace().getRoot()
+					.getProject(symbolicName);
+
+				if (!p.exists()) {
+					for (final IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
+						final String name = Util.getBundleSymbolicName(check);
+						if (symbolicName.equals(name)) {
+							p = check;
+							break;
+						}
+					}
+				}
+
+				// TODO If this is not a WS-Resource we need to open differently
+				if (p != null) {
+					final IJavaProject jp = JavaCore.create(p);
+					IType t = null;
+					try {
+						if (p.exists()) {
+							t = jp.findType(fullyQualified);
+						}
+						else
+						{
+							final IJavaProject pprim = JavaCore.create(project);
+							t = pprim.findType(fullyQualified);
+						}
+						if (t != null) {
+							JavaUI.openInEditor(t);
+						} else {
+							createOpen(contribution, domain, project, shell, true);
+						}
+					} catch (final JavaModelException e) {
+						createOpen(contribution, domain, project, shell, true);
+					} catch (final PartInitException e) {
+						MessageDialog.openError(shell, Messages.ContributionEditor_FailedToOpenEditor, e.getMessage());
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+			} else {
+				MessageDialog.openError(shell, Messages.ContributionEditor_InvalidURL,
+					Messages.ContributionEditor_CurrentURLIsInvalid);
+			}
 		}
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java
index a147c583e2..0b441cb385 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Marco Descher <marco@descher.at> - initial API and implementation
+ * Marco Descher <marco@descher.at> - initial API and implementation
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x.extension;
 
@@ -14,6 +14,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.e4.internal.tools.wizards.classes.NewDynamicMenuContributionClassWizard;
+import org.eclipse.e4.tools.emf.editor3x.Messages;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -36,96 +37,104 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PartInitException;
 
+@SuppressWarnings("restriction")
 public class DynamicMenuContributionContributionEditor implements
-		IContributionClassCreator {
+	IContributionClassCreator {
 
+	@Override
 	public void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell) {
 		createOpen(contribution, domain, project, shell, false);
 	}
 
 	public void createOpen(MContribution contribution, EditingDomain domain,
-			IProject project, Shell shell, boolean forceNew) {
-		if( forceNew || contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 || !contribution.getContributionURI().startsWith("bundleclass:") ) {
-			NewDynamicMenuContributionClassWizard wizard = new NewDynamicMenuContributionClassWizard(contribution.getContributionURI());
-			wizard.init( null, new StructuredSelection(project));
-			WizardDialog dialog = new WizardDialog(shell, wizard);
-			if( dialog.open() == Window.OK ) {
-				IFile f = wizard.getFile();
-				ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
+		IProject project, Shell shell, boolean forceNew) {
+		if (forceNew || contribution.getContributionURI() == null
+			|| contribution.getContributionURI().trim().length() == 0
+			|| !contribution.getContributionURI().startsWith("bundleclass:")) { //$NON-NLS-1$
+			final NewDynamicMenuContributionClassWizard wizard = new NewDynamicMenuContributionClassWizard(
+				contribution.getContributionURI());
+			wizard.init(null, new StructuredSelection(project));
+			final WizardDialog dialog = new WizardDialog(shell, wizard);
+			if (dialog.open() == Window.OK) {
+				final IFile f = wizard.getFile();
+				final ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
 				try {
 					String fullyQualified;
-					if( el.getPackageDeclarations() != null && el.getPackageDeclarations().length > 0 ) {
-						String packageName = el.getPackageDeclarations()[0].getElementName();
-						String className = wizard.getDomainClass().getName();
-						if( packageName.trim().length() > 0 ) {
-							fullyQualified = packageName + "." + className;	
+					if (el.getPackageDeclarations() != null && el.getPackageDeclarations().length > 0) {
+						final String packageName = el.getPackageDeclarations()[0].getElementName();
+						final String className = wizard.getDomainClass().getName();
+						if (packageName.trim().length() > 0) {
+							fullyQualified = packageName + "." + className; //$NON-NLS-1$
 						} else {
 							fullyQualified = className;
 						}
 					} else {
 						fullyQualified = wizard.getDomainClass().getName();
 					}
-					
-					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "bundleclass://" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified);
-					if( cmd.canExecute() ) {
+
+					final Command cmd = SetCommand.create(domain, contribution,
+						ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
+						"bundleclass://" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified); //$NON-NLS-1$ //$NON-NLS-2$
+					if (cmd.canExecute()) {
 						domain.getCommandStack().execute(cmd);
 					}
-				} catch (JavaModelException e) {
+				} catch (final JavaModelException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 			}
 		} else {
-			URI uri = URI.createURI(contribution.getContributionURI());
+			final URI uri = URI.createURI(contribution.getContributionURI());
 			if (uri.hasAuthority() && uri.segmentCount() == 1) {
-			    String symbolicName = uri.authority();
-			    String fullyQualified = uri.segment(0);
+				final String symbolicName = uri.authority();
+				final String fullyQualified = uri.segment(0);
 				IProject p = ResourcesPlugin.getWorkspace().getRoot()
-						.getProject(symbolicName);
-				
-				if( ! p.exists() ) {
-					for( IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects() ) {
-						String name = Util.getBundleSymbolicName(check);
-						if( symbolicName.equals(name) ) {
+					.getProject(symbolicName);
+
+				if (!p.exists()) {
+					for (final IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
+						final String name = Util.getBundleSymbolicName(check);
+						if (symbolicName.equals(name)) {
 							p = check;
 							break;
 						}
 					}
 				}
-				
+
 				// TODO If this is not a WS-Resource we need to open differently
 				if (p != null) {
-					IJavaProject jp = JavaCore.create(p);
+					final IJavaProject jp = JavaCore.create(p);
 					IType t = null;
-                    try {
-                    	if (p.exists()){
-                    		t = jp.findType(fullyQualified);
-                    	}
-                    	else
-                    	{
-                    		IJavaProject pprim = JavaCore.create(project);
-                    		t = pprim.findType(fullyQualified);
-                    	}
-                        if( t != null ) {
-                            JavaUI.openInEditor(t);
-                        } else {
-                                createOpen(contribution, domain, project, shell, true);
-                        }
-					} catch (JavaModelException e) {
+					try {
+						if (p.exists()) {
+							t = jp.findType(fullyQualified);
+						}
+						else
+						{
+							final IJavaProject pprim = JavaCore.create(project);
+							t = pprim.findType(fullyQualified);
+						}
+						if (t != null) {
+							JavaUI.openInEditor(t);
+						} else {
 							createOpen(contribution, domain, project, shell, true);
-					} catch (PartInitException e) {
-						MessageDialog.openError(shell, "Failed to open editor", e.getMessage());
+						}
+					} catch (final JavaModelException e) {
+						createOpen(contribution, domain, project, shell, true);
+					} catch (final PartInitException e) {
+						MessageDialog.openError(shell, Messages.ContributionEditor_FailedToOpenEditor, e.getMessage());
 						// TODO Auto-generated catch block
 						e.printStackTrace();
 					}
 				}
 			} else {
-				MessageDialog.openError(shell, "Invalid URL",
-						"The current url is invalid");
+				MessageDialog.openError(shell, Messages.ContributionEditor_InvalidURL,
+					Messages.ContributionEditor_CurrentURLIsInvalid);
 			}
 		}
 	}
 
+	@Override
 	public boolean isSupported(EClass element) {
 		return Util.isTypeOrSuper(MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, element);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
index f1379dd071..cb9d5874a7 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Sopot Cela <sopotcela@gmail.com>
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Sopot Cela <sopotcela@gmail.com>
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x.extension;
 
@@ -15,6 +15,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.e4.internal.tools.wizards.classes.NewHandlerClassWizard;
+import org.eclipse.e4.tools.emf.editor3x.Messages;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
@@ -38,101 +39,107 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PartInitException;
 
+@SuppressWarnings("restriction")
 public class HandlerContributionEditor implements IContributionClassCreator {
+	@Override
 	public void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell) {
 		createOpen(contribution, domain, project, shell, false);
 	}
-	
-	private void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell, boolean forceNew) {
-		if( forceNew || contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 || !contribution.getContributionURI().startsWith("bundleclass:") ) {
-			NewHandlerClassWizard wizard = new NewHandlerClassWizard(contribution.getContributionURI());
-			wizard.init( null, new StructuredSelection(project));
-			WizardDialog dialog = new WizardDialog(shell, wizard);
-			if( dialog.open() == Window.OK ) {
-				IFile f = wizard.getFile();
-				ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
+
+	private void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell,
+		boolean forceNew) {
+		if (forceNew || contribution.getContributionURI() == null
+			|| contribution.getContributionURI().trim().length() == 0
+			|| !contribution.getContributionURI().startsWith("bundleclass:")) { //$NON-NLS-1$
+			final NewHandlerClassWizard wizard = new NewHandlerClassWizard(contribution.getContributionURI());
+			wizard.init(null, new StructuredSelection(project));
+			final WizardDialog dialog = new WizardDialog(shell, wizard);
+			if (dialog.open() == Window.OK) {
+				final IFile f = wizard.getFile();
+				final ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
 				try {
 					String fullyQualified;
-					if( el.getPackageDeclarations() != null && el.getPackageDeclarations().length > 0 ) {
-						String packageName = el.getPackageDeclarations()[0].getElementName();
-						String className = wizard.getDomainClass().getName();
-						if( packageName.trim().length() > 0 ) {
-							fullyQualified = packageName + "." + className;	
+					if (el.getPackageDeclarations() != null && el.getPackageDeclarations().length > 0) {
+						final String packageName = el.getPackageDeclarations()[0].getElementName();
+						final String className = wizard.getDomainClass().getName();
+						if (packageName.trim().length() > 0) {
+							fullyQualified = packageName + "." + className; //$NON-NLS-1$
 						} else {
 							fullyQualified = className;
 						}
 					} else {
 						fullyQualified = wizard.getDomainClass().getName();
 					}
-					
-					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "bundleclass://" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified);
-					if( cmd.canExecute() ) {
+
+					final Command cmd = SetCommand.create(domain, contribution,
+						ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
+						"bundleclass://" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified); //$NON-NLS-1$//$NON-NLS-2$
+					if (cmd.canExecute()) {
 						domain.getCommandStack().execute(cmd);
 					}
-				} catch (JavaModelException e) {
+				} catch (final JavaModelException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 			}
 		} else {
-			URI uri = URI.createURI(contribution.getContributionURI());
+			final URI uri = URI.createURI(contribution.getContributionURI());
 			if (uri.hasAuthority() && uri.segmentCount() == 1) {
-			    String symbolicName = uri.authority();
-			    String fullyQualified = uri.segment(0);
+				final String symbolicName = uri.authority();
+				final String fullyQualified = uri.segment(0);
 				IProject p = ResourcesPlugin.getWorkspace().getRoot()
-						.getProject(symbolicName);
-				
-				if( ! p.exists() ) {
-					for( IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects() ) {
-						String name = Util.getBundleSymbolicName(check);
-						if( symbolicName.equals(name) ) {
+					.getProject(symbolicName);
+
+				if (!p.exists()) {
+					for (final IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
+						final String name = Util.getBundleSymbolicName(check);
+						if (symbolicName.equals(name)) {
 							p = check;
 							break;
 						}
 					}
 				}
-				
+
 				// TODO If this is not a WS-Resource we need to open differently
 				if (p != null) {
-					IJavaProject jp = JavaCore.create(p);
+					final IJavaProject jp = JavaCore.create(p);
 					IType t = null;
-                    try {
-                    	if (p.exists()){
-                    		t = jp.findType(fullyQualified);
-                    	}
-                    	else
-                    	{
-                    		IJavaProject pprim = JavaCore.create(project);
-                    		t = pprim.findType(fullyQualified);
-                    	}
-                        if( t != null ) {
-                            JavaUI.openInEditor(t);
-                        } else {
-                                createOpen(contribution, domain, project, shell, true);
-                        }
-					} catch (JavaModelException e) {
+					try {
+						if (p.exists()) {
+							t = jp.findType(fullyQualified);
+						}
+						else
+						{
+							final IJavaProject pprim = JavaCore.create(project);
+							t = pprim.findType(fullyQualified);
+						}
+						if (t != null) {
+							JavaUI.openInEditor(t);
+						} else {
 							createOpen(contribution, domain, project, shell, true);
-					} catch (PartInitException e) {
-						MessageDialog.openError(shell, "Failed to open editor", e.getMessage());
+						}
+					} catch (final JavaModelException e) {
+						createOpen(contribution, domain, project, shell, true);
+					} catch (final PartInitException e) {
+						MessageDialog.openError(shell, Messages.ContributionEditor_FailedToOpenEditor, e.getMessage());
 						// TODO Auto-generated catch block
 						e.printStackTrace();
 					}
 				}
 			} else {
-				MessageDialog.openError(shell, "Invalid URL",
-						"The current url is invalid");
+				MessageDialog.openError(shell, Messages.ContributionEditor_InvalidURL,
+					Messages.ContributionEditor_CurrentURLIsInvalid);
 			}
 		}
 	}
 
+	@Override
 	public boolean isSupported(EClass element) {
-		return 
-			Util.isTypeOrSuper(CommandsPackageImpl.Literals.HANDLER,element)
-			|| 
+		return Util.isTypeOrSuper(CommandsPackageImpl.Literals.HANDLER, element)
+			||
 			Util.isTypeOrSuper(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, element)
 			||
 			Util.isTypeOrSuper(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, element);
 	}
-	
-	
+
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
index c1aa9a4000..574ada9a2e 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Sopot Cela <sopotcela@gmail.com>
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Sopot Cela <sopotcela@gmail.com>
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x.extension;
 
@@ -15,6 +15,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.e4.internal.tools.wizards.classes.NewPartClassWizard;
+import org.eclipse.e4.tools.emf.editor3x.Messages;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -37,97 +38,102 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PartInitException;
 
+@SuppressWarnings("restriction")
 public class PartContributionEditor implements IContributionClassCreator {
+	@Override
 	public void createOpen(MContribution contribution, EditingDomain domain,
-			IProject project, Shell shell) {
+		IProject project, Shell shell) {
 		createOpen(contribution, domain, project, shell, false);
 	}
-	
+
 	private void createOpen(MContribution contribution, EditingDomain domain,
-			IProject project, Shell shell, boolean forceNew) {
-		if ( forceNew || contribution.getContributionURI() == null
-				|| contribution.getContributionURI().trim().length() == 0
-				|| !contribution.getContributionURI().startsWith("bundleclass:")) {
-			NewPartClassWizard wizard = new NewPartClassWizard(contribution.getContributionURI());
+		IProject project, Shell shell, boolean forceNew) {
+		if (forceNew || contribution.getContributionURI() == null
+			|| contribution.getContributionURI().trim().length() == 0
+			|| !contribution.getContributionURI().startsWith("bundleclass:")) { //$NON-NLS-1$
+			final NewPartClassWizard wizard = new NewPartClassWizard(contribution.getContributionURI());
 			wizard.init(null, new StructuredSelection(project));
-			WizardDialog dialog = new WizardDialog(shell, wizard);
+			final WizardDialog dialog = new WizardDialog(shell, wizard);
 			if (dialog.open() == Window.OK) {
-				IFile f = wizard.getFile();
-				ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
+				final IFile f = wizard.getFile();
+				final ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
 				try {
 					String fullyQualified;
-					if( el.getPackageDeclarations() != null && el.getPackageDeclarations().length > 0 ) {
-						String packageName = el.getPackageDeclarations()[0].getElementName();
-						String className = wizard.getDomainClass().getName();
-						if( packageName.trim().length() > 0 ) {
-							fullyQualified = packageName + "." + className;	
+					if (el.getPackageDeclarations() != null && el.getPackageDeclarations().length > 0) {
+						final String packageName = el.getPackageDeclarations()[0].getElementName();
+						final String className = wizard.getDomainClass().getName();
+						if (packageName.trim().length() > 0) {
+							fullyQualified = packageName + "." + className; //$NON-NLS-1$
 						} else {
 							fullyQualified = className;
 						}
 					} else {
 						fullyQualified = wizard.getDomainClass().getName();
 					}
-					
-					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "bundleclass://" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified);
-					if( cmd.canExecute() ) {
+
+					final Command cmd = SetCommand.create(domain, contribution,
+						ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
+						"bundleclass://" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified); //$NON-NLS-1$ //$NON-NLS-2$
+					if (cmd.canExecute()) {
 						domain.getCommandStack().execute(cmd);
 					}
-				} catch (JavaModelException e) {
+				} catch (final JavaModelException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 			}
 		} else {
-            URI uri = URI.createURI(contribution.getContributionURI());
-            if (uri.hasAuthority() && uri.segmentCount() == 1) {
-                String symbolicName = uri.authority();
-                String fullyQualified = uri.segment(0);
-                IProject p = ResourcesPlugin.getWorkspace().getRoot()
-                        .getProject(symbolicName);
-                
-                if( ! p.exists() ) {
-                    for( IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects() ) {
-                        String name = Util.getBundleSymbolicName(check);
-                        if( symbolicName.equals(name) ) {
-                            p = check;
-                            break;
-                        }
-                    }
-                }
-                
-                // TODO If this is not a WS-Resource we need to open differently
-                if (p != null) {
-                    IJavaProject jp = JavaCore.create(p);
-                    IType t = null;
-                    try {
-                    	if (p.exists()){
-                    		t = jp.findType(fullyQualified);
-                    	}
-                    	else
-                    	{
-                    		IJavaProject pprim = JavaCore.create(project);
-                    		t = pprim.findType(fullyQualified);
-                    	}
-                        if( t != null ) {
-                            JavaUI.openInEditor(t);
-                        } else {
-                                createOpen(contribution, domain, project, shell, true);
-                        }
-                    } catch (JavaModelException e) {
-                            createOpen(contribution, domain, project, shell, true);
-                    } catch (PartInitException e) {
-                        MessageDialog.openError(shell, "Failed to open editor", e.getMessage());
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                }
-            } else {
-                MessageDialog.openError(shell, "Invalid URL",
-                        "The current url is invalid");
-            }
+			final URI uri = URI.createURI(contribution.getContributionURI());
+			if (uri.hasAuthority() && uri.segmentCount() == 1) {
+				final String symbolicName = uri.authority();
+				final String fullyQualified = uri.segment(0);
+				IProject p = ResourcesPlugin.getWorkspace().getRoot()
+					.getProject(symbolicName);
+
+				if (!p.exists()) {
+					for (final IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
+						final String name = Util.getBundleSymbolicName(check);
+						if (symbolicName.equals(name)) {
+							p = check;
+							break;
+						}
+					}
+				}
+
+				// TODO If this is not a WS-Resource we need to open differently
+				if (p != null) {
+					final IJavaProject jp = JavaCore.create(p);
+					IType t = null;
+					try {
+						if (p.exists()) {
+							t = jp.findType(fullyQualified);
+						}
+						else
+						{
+							final IJavaProject pprim = JavaCore.create(project);
+							t = pprim.findType(fullyQualified);
+						}
+						if (t != null) {
+							JavaUI.openInEditor(t);
+						} else {
+							createOpen(contribution, domain, project, shell, true);
+						}
+					} catch (final JavaModelException e) {
+						createOpen(contribution, domain, project, shell, true);
+					} catch (final PartInitException e) {
+						MessageDialog.openError(shell, Messages.ContributionEditor_FailedToOpenEditor, e.getMessage());
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+			} else {
+				MessageDialog.openError(shell, Messages.ContributionEditor_InvalidURL,
+					Messages.ContributionEditor_CurrentURLIsInvalid);
+			}
 		}
 	}
 
+	@Override
 	public boolean isSupported(EClass element) {
 		return Util.isTypeOrSuper(BasicPackageImpl.Literals.PART, element);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java
index e5e472e4f6..4fbc09b821 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 412672
+ * Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 412672
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x.extension;
 
@@ -14,9 +14,9 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.e4.internal.tools.wizards.classes.NewToolControlClassWizard;
+import org.eclipse.e4.tools.emf.editor3x.Messages;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.ui.model.application.MContribution;
-import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -37,26 +37,31 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PartInitException;
 
+@SuppressWarnings("restriction")
 public class ToolControlContributionEditor implements IContributionClassCreator {
+	@Override
 	public void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell) {
 		createOpen(contribution, domain, project, shell, false);
 	}
 
-	private void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell, boolean forceNew) {
-		if( forceNew || contribution.getContributionURI() == null || contribution.getContributionURI().trim().length() == 0 || !contribution.getContributionURI().startsWith("bundleclass:") ) {
-			NewToolControlClassWizard wizard = new NewToolControlClassWizard(contribution.getContributionURI());
-			wizard.init( null, new StructuredSelection(project));
-			WizardDialog dialog = new WizardDialog(shell, wizard);
-			if( dialog.open() == Window.OK ) {
-				IFile f = wizard.getFile();
-				ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
+	private void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell,
+		boolean forceNew) {
+		if (forceNew || contribution.getContributionURI() == null
+			|| contribution.getContributionURI().trim().length() == 0
+			|| !contribution.getContributionURI().startsWith("bundleclass:")) { //$NON-NLS-1$
+			final NewToolControlClassWizard wizard = new NewToolControlClassWizard(contribution.getContributionURI());
+			wizard.init(null, new StructuredSelection(project));
+			final WizardDialog dialog = new WizardDialog(shell, wizard);
+			if (dialog.open() == Window.OK) {
+				final IFile f = wizard.getFile();
+				final ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
 				try {
 					String fullyQualified;
-					if( el.getPackageDeclarations() != null && el.getPackageDeclarations().length > 0 ) {
-						String packageName = el.getPackageDeclarations()[0].getElementName();
-						String className = wizard.getDomainClass().getName();
-						if( packageName.trim().length() > 0 ) {
-							fullyQualified = packageName + "." + className;
+					if (el.getPackageDeclarations() != null && el.getPackageDeclarations().length > 0) {
+						final String packageName = el.getPackageDeclarations()[0].getElementName();
+						final String className = wizard.getDomainClass().getName();
+						if (packageName.trim().length() > 0) {
+							fullyQualified = packageName + "." + className; //$NON-NLS-1$
 						} else {
 							fullyQualified = className;
 						}
@@ -64,26 +69,28 @@ private void createOpen(MContribution contribution, EditingDomain domain, IProje
 						fullyQualified = wizard.getDomainClass().getName();
 					}
 
-					Command cmd = SetCommand.create(domain, contribution, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, "bundleclass://" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified);
-					if( cmd.canExecute() ) {
+					final Command cmd = SetCommand.create(domain, contribution,
+						ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
+						"bundleclass://" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified); //$NON-NLS-1$ //$NON-NLS-2$
+					if (cmd.canExecute()) {
 						domain.getCommandStack().execute(cmd);
 					}
-				} catch (JavaModelException e) {
+				} catch (final JavaModelException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 			}
 		} else {
-			URI uri = URI.createURI(contribution.getContributionURI());
+			final URI uri = URI.createURI(contribution.getContributionURI());
 			if (uri.hasAuthority() && uri.segmentCount() == 1) {
-			    String symbolicName = uri.authority();
-			    String fullyQualified = uri.segment(0);
+				final String symbolicName = uri.authority();
+				final String fullyQualified = uri.segment(0);
 				IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(symbolicName);
 
-				if( ! p.exists() ) {
-					for( IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects() ) {
-						String name = Util.getBundleSymbolicName(check);
-						if( symbolicName.equals(name) ) {
+				if (!p.exists()) {
+					for (final IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
+						final String name = Util.getBundleSymbolicName(check);
+						if (symbolicName.equals(name)) {
 							p = check;
 							break;
 						}
@@ -92,37 +99,39 @@ private void createOpen(MContribution contribution, EditingDomain domain, IProje
 
 				// TODO If this is not a WS-Resource we need to open differently
 				if (p != null) {
-					IJavaProject jp = JavaCore.create(p);
+					final IJavaProject jp = JavaCore.create(p);
 					IType t = null;
-                    try {
-                        if (p.exists()){
-                            t = jp.findType(fullyQualified);
-                        }
-                        else
-                        {
-                            IJavaProject pprim = JavaCore.create(project);
-                            t = pprim.findType(fullyQualified);
-                        }
-                        if( t != null ) {
-                            JavaUI.openInEditor(t);
-                        } else {
-                                createOpen(contribution, domain, project, shell, true);
-                        }
-					} catch (JavaModelException e) {
+					try {
+						if (p.exists()) {
+							t = jp.findType(fullyQualified);
+						}
+						else
+						{
+							final IJavaProject pprim = JavaCore.create(project);
+							t = pprim.findType(fullyQualified);
+						}
+						if (t != null) {
+							JavaUI.openInEditor(t);
+						} else {
 							createOpen(contribution, domain, project, shell, true);
-					} catch (PartInitException e) {
-						MessageDialog.openError(shell, "Failed to open editor", e.getMessage());
+						}
+					} catch (final JavaModelException e) {
+						createOpen(contribution, domain, project, shell, true);
+					} catch (final PartInitException e) {
+						MessageDialog.openError(shell, Messages.ContributionEditor_FailedToOpenEditor, e.getMessage());
 						// TODO Auto-generated catch block
 						e.printStackTrace();
 					}
 				}
 			} else {
-				MessageDialog.openError(shell, "Invalid URL", "The current url is invalid");
+				MessageDialog.openError(shell, Messages.ContributionEditor_InvalidURL,
+					Messages.ContributionEditor_CurrentURLIsInvalid);
 			}
 		}
 	}
 
+	@Override
 	public boolean isSupported(EClass element) {
-		return Util.isTypeOrSuper(MenuPackageImpl.Literals.TOOL_CONTROL,element);
+		return Util.isTypeOrSuper(MenuPackageImpl.Literals.TOOL_CONTROL, element);
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/messages.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/messages.properties
index 9df9660e35..c711b366ef 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/messages.properties
@@ -1,3 +1,6 @@
+ContributionEditor_CurrentURLIsInvalid=The current url is invalid
+ContributionEditor_FailedToOpenEditor=Failed to open editor
+ContributionEditor_InvalidURL=Invalid URL
 ModelEditorPreferencePage_Color=Color
 ModelEditorPreferencePage_ForcesReadOnlyXMITab=(forces read only XMI tab)\n
 ModelEditorPreferencePage_FormTab=Form Tab
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 7885c035d0..073063eb25 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
 Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat",
+Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 7c857749b1..e8c6bd9e78 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.e4.internal.tools.ToolsPlugin
 Export-Package: org.eclipse.e4.internal.tools;x-internal:=true,
- org.eclipse.e4.internal.tools.wizards.classes;x-internal:=true,
+ org.eclipse.e4.internal.tools.wizards.classes;x-friends:="org.eclipse.e4.tools.emf.editor3x",
  org.eclipse.e4.internal.tools.wizards.classes.templates;x-internal:=true,
  org.eclipse.e4.internal.tools.wizards.model;x-internal:=true,
  org.eclipse.e4.internal.tools.wizards.project;x-internal:=true

From 27041d01aa884a25908b18b075dd3cd5b3e5a653 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 6 Nov 2014 19:19:33 +0100
Subject: [PATCH 0844/1286] Bug 425866 - Add README.md to the e4 tools projects

Change-Id: I7dc8b813f222b9d9053ced1fd24d925687c7cb47
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/README.md b/bundles/org.eclipse.e4.tools.emf.ui/README.md
index 891a57e8f9..a467bc3f02 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/README.md
+++ b/bundles/org.eclipse.e4.tools.emf.ui/README.md
@@ -3,6 +3,8 @@ org.eclipse.e4.tools.emf.ui
 
 Provides the e4 model editor and the org.eclipse.e4.tools.emf.ui.editors extension point which can be used to add editor pages for custom model elements.
 
+The ModelEditor class is the main wiring point for the model editor.
+
 For more information, refer to the [Eclipse e4 wiki page] [1].
 
 License

From 15a975c6b1aabea6ed2f2c39148992949354f7fd Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 7 Nov 2014 17:19:14 +0100
Subject: [PATCH 0845/1286] Bug 450409 - Use descriptive category for Eclipse
 runtime spies

Change-Id: I864902747c81e378ac8d255a5119dcb08cb25b07
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

From 945a9caa91b0aacd2339723c1e48861998c76469 Mon Sep 17 00:00:00 2001
From: Fabian Miehe <fabian.miehe@cassidian.com>
Date: Tue, 11 Nov 2014 17:16:15 +0100
Subject: [PATCH 0846/1286] Bug 440289 - Combo Box in Editor 'Controls'
 inconsistent

- Changed combobox stylebit from SWT.SIMPLE (not useful on windows) to
SWT.DROP_DOWN
- use of JFace class AutoCompleteField instead of plugin class
Autocomplete

Change-Id: Ifd0e2502b02fa960197b6063504e795b04db7f8e
Signed-off-by: Fabian Miehe <fabian.miehe@cassidian.com>
---
 .../ui/internal/common/AbstractPickList.java  | 101 +++++++++++++++---
 .../internal/common/component/AreaEditor.java |   9 +-
 .../component/MenuContributionEditor.java     |   8 +-
 .../internal/common/component/MenuEditor.java |   4 +-
 .../component/ModelFragmentsEditor.java       |  15 +--
 .../component/PartSashContainerEditor.java    |   9 +-
 .../common/component/PartStackEditor.java     |  10 +-
 .../common/component/StringModelFragment.java |  15 +--
 .../component/ToolBarContributionEditor.java  |   8 +-
 .../common/component/ToolBarEditor.java       |   8 +-
 .../common/component/TrimBarEditor.java       |   9 +-
 .../component/TrimContributionEditor.java     |  12 +--
 .../common/component/virtual/VMenuEditor.java |  12 +--
 .../virtual/VModelImportsEditor.java          |  31 +++---
 .../virtual/VPerspectiveControlEditor.java    |  12 +--
 .../component/virtual/VSnippetsEditor.java    |   8 +-
 .../virtual/VWindowControlEditor.java         |  11 +-
 .../component/virtual/VWindowEditor.java      |  10 +-
 .../virtual/VWindowSharedElementsEditor.java  |  10 +-
 19 files changed, 181 insertions(+), 121 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index 4b573ef6cf..a3e7d4db37 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -11,24 +11,37 @@
 
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
+import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.jface.fieldassist.AutoCompleteField;
+import org.eclipse.jface.fieldassist.ComboContentAdapter;
 import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IContentProvider;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IOpenListener;
+import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.OpenEvent;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.FillLayout;
 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.Group;
 import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.swt.widgets.ToolItem;
@@ -57,6 +70,8 @@ public static enum PickListFeatures {
 	private ToolItem tiUp;
 	private ToolItem tiDown;
 	private ToolItem tiAdd;
+	private AutoCompleteField autoCompleteField;
+	private Map<String, Object> proposals;
 
 	public AbstractPickList(Composite parent, int style, List<PickListFeatures> listFeatures, Messages messages, AbstractComponentEditor componentEditor) {
 		super(parent, style);
@@ -83,7 +98,7 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		new ToolItem(toolBar, SWT.SEPARATOR_FILL);
+		// new ToolItem(toolBar, SWT.SEPARATOR_FILL);
 
 		tiDown = new ToolItem(toolBar, SWT.PUSH);
 		tiDown.setText(messages.ModelTooling_Common_Down);
@@ -114,18 +129,28 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		picker = new ComboViewer(group, SWT.SIMPLE);
-		picker.getControl().setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+		picker = new ComboViewer(group, SWT.DROP_DOWN);
+		Combo control = picker.getCombo();
+		control.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
 
-		Autocomplete.installOn(picker);
-
-		picker.getCombo().addKeyListener(new KeyAdapter() {
+		ComboContentAdapter controlContentAdapter = new ComboContentAdapter() {
 			@Override
-			public void keyPressed(KeyEvent e) {
-				if (e.keyCode == SWT.CR) {
-					addPressed();
+			public void setControlContents(Control control, String text1, int cursorPosition) {
+				super.setControlContents(control, text1, cursorPosition);
+				Object valueInModel = proposals.get(text1);
+				if (valueInModel != null) {
+					getPicker().setSelection(new StructuredSelection(valueInModel));
 				}
 			}
+		};
+		autoCompleteField = new AutoCompleteField(control, controlContentAdapter, new String[0]);
+
+		picker.addOpenListener(new IOpenListener() {
+
+			@Override
+			public void open(OpenEvent event) {
+				addPressed();
+			}
 		});
 
 		viewer = new TableViewer(group);
@@ -165,10 +190,61 @@ public TableViewer getList() {
 		return viewer;
 	}
 
-	public ComboViewer getPicker() {
+	public void setInput(Object input) {
+		getPicker().setInput(input);
+
+		proposals = toProposals(input);
+		Set<String> keySet = proposals.keySet();
+		autoCompleteField.setProposals(keySet.toArray(new String[keySet.size()]));
+	}
+
+	public ISelection getSelection() {
+		return getPicker().getSelection();
+	}
+
+	public void setSelection(ISelection selection) {
+		getPicker().setSelection(selection);
+	}
+
+	private Map<String, Object> toProposals(Object inputElement) {
+
+		Map<String, Object> props = new TreeMap<String, Object>();
+
+		if (inputElement instanceof Object[]) {
+			for (Object value : (Object[]) inputElement) {
+				props.put(getTextualValue(value), value);
+			}
+		}
+		if (inputElement instanceof Collection) {
+			for (Object value : (Collection<Object>) inputElement) {
+				props.put(getTextualValue(value), value);
+			}
+
+		}
+
+		return props;
+	}
+
+	private String getTextualValue(Object value) {
+		return ((ILabelProvider) getPicker().getLabelProvider()).getText(value);
+	}
+
+	public void setContentProvider(IContentProvider contentProvider) {
+		getPicker().setContentProvider(contentProvider);
+	}
+
+	public void setLabelProvider(ILabelProvider labelProvider) {
+		getPicker().setLabelProvider(labelProvider);
+	}
+
+	private ComboViewer getPicker() {
 		return picker;
 	}
 
+	public void setComparator(ViewerComparator comparator) {
+		getPicker().setComparator(comparator);
+	}
+
 	protected ToolBar getToolBar() {
 		return toolBar;
 	}
@@ -196,5 +272,4 @@ public void updateUiState() {
 		}
 		tiRemove.setEnabled(selected);
 	}
-
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 7b969a05b7..076c60b221 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -293,7 +293,7 @@ public String getText(Object element) {
 			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					EClass eClass = (EClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+					EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
 					handleAddChild(eClass);
 				}
 			};
@@ -305,10 +305,9 @@ protected void addPressed() {
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
-			final ComboViewer childrenDropDown = pickList.getPicker();
-			childrenDropDown.setLabelProvider(new EClassLabelProvider(getEditor()));
-			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
-			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
+			pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
+			pickList.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
+			pickList.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index d52525ff6a..c71c83e0ac 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -49,7 +49,6 @@
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
@@ -238,7 +237,7 @@ public void widgetSelected(SelectionEvent e) {
 			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					Struct struct = (Struct) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+					Struct struct = (Struct) ((IStructuredSelection) getSelection()).getFirstElement();
 					EClass eClass = struct.eClass;
 					MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
 
@@ -259,10 +258,9 @@ protected void addPressed() {
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
 
-			final ComboViewer childrenDropDown = pickList.getPicker();
 			Struct defaultStruct = new Struct(Messages.MenuContributionEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
-			childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuContributionEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuContributionEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuContributionEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false), new Struct(Messages.MenuContributionEditor_DynamicMenuContribution, MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
-			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
+			pickList.setInput(new Struct[] { new Struct(Messages.MenuContributionEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuContributionEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuContributionEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false), new Struct(Messages.MenuContributionEditor_DynamicMenuContribution, MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
+			pickList.setSelection(new StructuredSelection(defaultStruct));
 
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 874cca5d36..b30f22ad32 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -256,8 +256,8 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 
 			Struct defaultStruct = new Struct(Messages.MenuEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
-			pickList.getPicker().setInput(new Struct[] { new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false), new Struct(Messages.MenuEditor_DynamicMenuContribution, MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
-			pickList.getPicker().setSelection(new StructuredSelection(defaultStruct));
+			pickList.setInput(new Struct[] { new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false), new Struct(Messages.MenuEditor_DynamicMenuContribution, MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
+			pickList.setSelection(new StructuredSelection(defaultStruct));
 
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			pickList.getList().setInput(prop.observeDetail(master));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index fa6e157042..3a5ee85783 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -42,9 +42,9 @@
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
@@ -159,7 +159,7 @@ private void createImportsTab(CTabFolder folder) {
 		E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
 			@Override
 			protected void addPressed() {
-				EClass eClass = ((FeatureClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement()).eClass;
+				EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
 				EObject eObject = EcoreUtil.create(eClass);
 
 				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, eObject);
@@ -181,9 +181,8 @@ protected List<?> getContainerChildren(Object master) {
 		pickList.setText(Messages.PartSashContainerEditor_Controls);
 
 		TableViewer viewer = pickList.getList();
-		ComboViewer picker = pickList.getPicker();
 
-		picker.setLabelProvider(new LabelProvider() {
+		pickList.setLabelProvider(new LabelProvider() {
 			@Override
 			public String getText(Object element) {
 				FeatureClass eclass = (FeatureClass) element;
@@ -191,7 +190,7 @@ public String getText(Object element) {
 			}
 		});
 
-		picker.setComparator(new ViewerComparator() {
+		pickList.setComparator(new ViewerComparator() {
 			@Override
 			public int compare(Viewer viewer, Object e1, Object e2) {
 				FeatureClass eClass1 = (FeatureClass) e1;
@@ -204,8 +203,10 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 		Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
 		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
 
-		picker.setInput(list);
-		picker.getCombo().select(0);
+		pickList.setInput(list);
+		if (list.size() > 0) {
+			pickList.setSelection(new StructuredSelection(list.get(0)));
+		}
 
 		IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
 		viewer.setInput(prop.observeDetail(getMaster()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 608a2c28b7..a027ca46ca 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -274,15 +274,14 @@ public String getText(Object element) {
 			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					EClass eClass = ((FeatureClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement()).eClass;
+					EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
 					handleAddChild(eClass);
 				}
 			};
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 			pickList.setText(Messages.PartSashContainerEditor_Controls);
 
-			final ComboViewer childrenDropDown = pickList.getPicker();
-			childrenDropDown.setLabelProvider(new FeatureClassLabelProvider(getEditor()));
+			pickList.setLabelProvider(new FeatureClassLabelProvider(getEditor()));
 
 			List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
 			eClassList.add(new FeatureClass("PartSashContainer", BasicPackageImpl.Literals.PART_SASH_CONTAINER)); //$NON-NLS-1$
@@ -292,8 +291,8 @@ protected void addPressed() {
 			eClassList.add(new FeatureClass("Area", AdvancedPackageImpl.Literals.AREA)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER)); //$NON-NLS-1$
 			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_SASH_CONTAINER, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
-			childrenDropDown.setInput(eClassList);
-			childrenDropDown.setSelection(new StructuredSelection(eClassList.get(0)));
+			pickList.setInput(eClassList);
+			pickList.setSelection(new StructuredSelection(eClassList.get(0)));
 
 			final TableViewer viewer = pickList.getList();
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index b85b5085ac..c6d4f37b09 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -49,7 +49,6 @@
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
@@ -228,7 +227,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					EClass eClass = ((FeatureClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement()).eClass;
+					EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
 					handleAddChild(eClass);
 				}
 			};
@@ -239,16 +238,15 @@ protected void addPressed() {
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
-			final ComboViewer childrenDropDown = pickList.getPicker();
-			childrenDropDown.setLabelProvider(new FeatureClassLabelProvider(getEditor()));
+			pickList.setLabelProvider(new FeatureClassLabelProvider(getEditor()));
 
 			List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
 			eClassList.add(new FeatureClass(Messages.PartStackEditor_Part, BasicPackageImpl.Literals.PART));
 			eClassList.add(new FeatureClass(Messages.PartStackEditor_CompositePart, BasicPackageImpl.Literals.COMPOSITE_PART));
 			eClassList.add(new FeatureClass(Messages.PartStackEditor_Placeholder, AdvancedPackageImpl.Literals.PLACEHOLDER));
 			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
-			childrenDropDown.setInput(eClassList);
-			childrenDropDown.setSelection(new StructuredSelection(eClassList.get(0)));
+			pickList.setInput(eClassList);
+			pickList.setSelection(new StructuredSelection(eClassList.get(0)));
 
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 12598385ed..b680894777 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -46,9 +46,9 @@
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
@@ -232,7 +232,7 @@ public void widgetSelected(SelectionEvent e) {
 			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS) {
 				@Override
 				protected void addPressed() {
-					EClass eClass = ((FeatureClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement()).eClass;
+					EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
 					handleAdd(eClass, false);
 				}
 
@@ -245,8 +245,7 @@ protected List<?> getContainerChildren(Object master) {
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 			pickList.setText(""); //$NON-NLS-1$
 
-			ComboViewer picker = pickList.getPicker();
-			picker.setLabelProvider(new LabelProvider() {
+			pickList.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
 					FeatureClass eclass = (FeatureClass) element;
@@ -254,7 +253,7 @@ public String getText(Object element) {
 				}
 			});
 
-			picker.setComparator(new ViewerComparator() {
+			pickList.setComparator(new ViewerComparator() {
 				@Override
 				public int compare(Viewer viewer, Object e1, Object e2) {
 					FeatureClass eClass1 = (FeatureClass) e1;
@@ -267,8 +266,10 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 			Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
 			list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
 
-			picker.setInput(list);
-			picker.getCombo().select(0);
+			pickList.setInput(list);
+			if (list.size() > 0) {
+				pickList.setSelection(new StructuredSelection(list.get(0)));
+			}
 
 			IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
 			pickList.getList().setInput(prop.observeDetail(getMaster()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index fff95367c5..9833a21f0c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -52,7 +52,6 @@
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
@@ -241,7 +240,7 @@ public void widgetSelected(SelectionEvent e) {
 			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					Struct struct = (Struct) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+					Struct struct = (Struct) ((IStructuredSelection) getSelection()).getFirstElement();
 					EClass eClass = struct.eClass;
 					MToolBarElement eObject = (MToolBarElement) EcoreUtil.create(eClass);
 					setElementId(eObject);
@@ -263,10 +262,9 @@ protected void addPressed() {
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
 
-			ComboViewer childrenDropDown = pickList.getPicker();
 			Struct defaultStruct = new Struct(Messages.ToolBarEditor_HandledToolItem, MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
-			childrenDropDown.setInput(new Struct[] { defaultStruct, new Struct(Messages.ToolBarEditor_DirectToolItem, MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false), new Struct(Messages.ToolBarEditor_ToolControl, MenuPackageImpl.Literals.TOOL_CONTROL, false), new Struct(Messages.ToolBarEditor_Separator, MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true) });
-			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
+			pickList.setInput(new Struct[] { defaultStruct, new Struct(Messages.ToolBarEditor_DirectToolItem, MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false), new Struct(Messages.ToolBarEditor_ToolControl, MenuPackageImpl.Literals.TOOL_CONTROL, false), new Struct(Messages.ToolBarEditor_Separator, MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true) });
+			pickList.setSelection(new StructuredSelection(defaultStruct));
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 4e9d50645b..4d08fc72ea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -43,7 +43,6 @@
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
@@ -185,7 +184,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					Struct struct = (Struct) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+					Struct struct = (Struct) ((IStructuredSelection) getSelection()).getFirstElement();
 					EClass eClass = struct.eClass;
 					handleAddChild(eClass, struct.separator);
 				}
@@ -197,10 +196,9 @@ protected void addPressed() {
 			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
 
-			final ComboViewer childrenDropDown = pickList.getPicker();
 			Struct defaultStruct = new Struct(Messages.ToolBarEditor_HandledToolItem, MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
-			childrenDropDown.setInput(new Struct[] { defaultStruct, new Struct(Messages.ToolBarEditor_DirectToolItem, MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false), new Struct(Messages.ToolBarEditor_ToolControl, MenuPackageImpl.Literals.TOOL_CONTROL, false), new Struct(Messages.ToolBarEditor_Separator, MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true) });
-			childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
+			pickList.setInput(new Struct[] { defaultStruct, new Struct(Messages.ToolBarEditor_DirectToolItem, MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false), new Struct(Messages.ToolBarEditor_ToolControl, MenuPackageImpl.Literals.TOOL_CONTROL, false), new Struct(Messages.ToolBarEditor_Separator, MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true) });
+			pickList.setSelection(new StructuredSelection(defaultStruct));
 		}
 
 		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 225596dea3..ceb970a761 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -215,7 +215,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					EClass eClass = (EClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+					EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
 					handleAddChild(eClass);
 				}
 			};
@@ -224,10 +224,9 @@ protected void addPressed() {
 
 			final TableViewer viewer = pickList.getList();
 
-			final ComboViewer typeViewer = pickList.getPicker();
-			typeViewer.setLabelProvider(new EClassLabelProvider(getEditor()));
-			typeViewer.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
-			typeViewer.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
+			pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
+			pickList.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
+			pickList.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
 
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index ec9907ba9e..c4bebe9f91 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -53,7 +53,6 @@
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -231,7 +230,7 @@ public void widgetSelected(SelectionEvent e) {
 			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					EClass eClass = (EClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+					EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
 					handleAddChild(eClass);
 				}
 			};
@@ -244,16 +243,15 @@ protected void addPressed() {
 			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
-			final ComboViewer typeViewer = pickList.getPicker();
-			typeViewer.setContentProvider(new ArrayContentProvider());
-			typeViewer.setLabelProvider(new LabelProvider() {
+			pickList.setContentProvider(new ArrayContentProvider());
+			pickList.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
 					return ((EClass) element).getName();
 				}
 			});
-			typeViewer.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
-			typeViewer.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
+			pickList.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
+			pickList.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 2670f8f11b..c0cbeefc6a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -37,7 +37,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -137,7 +136,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, feature) {
 			@Override
 			protected void addPressed() {
-				Types t = (Types) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+				Types t = (Types) ((IStructuredSelection) getSelection()).getFirstElement();
 				if (t == Types.MENU) {
 					handleAdd(MenuPackageImpl.Literals.MENU);
 				} else if (t == Types.POPUP_MENU) {
@@ -161,9 +160,8 @@ protected List<?> getContainerChildren(Object container) {
 		pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 		viewer = pickList.getList();
 
-		ComboViewer picker = pickList.getPicker();
-		picker.setContentProvider(new ArrayContentProvider());
-		picker.setLabelProvider(new LabelProvider() {
+		pickList.setContentProvider(ArrayContentProvider.getInstance());
+		pickList.setLabelProvider(new LabelProvider() {
 			@Override
 			public String getText(Object element) {
 				if (element == Types.MENU) {
@@ -174,8 +172,8 @@ public String getText(Object element) {
 				return Messages.MenuEditor_Label_ViewMenu;
 			}
 		});
-		picker.setInput(Types.values());
-		picker.setSelection(new StructuredSelection(Types.MENU));
+		pickList.setInput(Types.values());
+		pickList.setSelection(new StructuredSelection(Types.MENU));
 
 		folder.setSelection(0);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index a0151a7c0d..5b2b71c6c8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -31,9 +31,9 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
@@ -103,14 +103,20 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
 			@Override
 			protected void addPressed() {
-				EClass eClass = ((FeatureClass) ((IStructuredSelection) picker.getSelection()).getFirstElement()).eClass;
-				EObject eObject = EcoreUtil.create(eClass);
 
-				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, eObject);
+				Object firstElement = ((IStructuredSelection) getSelection()).getFirstElement();
 
-				if (cmd.canExecute()) {
-					getEditingDomain().getCommandStack().execute(cmd);
-					getEditor().setSelection(eObject);
+				if (firstElement != null) {
+					FeatureClass featureClass = (FeatureClass) firstElement;
+					EClass eClass = featureClass.eClass;
+					EObject eObject = EcoreUtil.create(eClass);
+
+					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, eObject);
+
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
+						getEditor().setSelection(eObject);
+					}
 				}
 			}
 
@@ -123,9 +129,8 @@ protected List<?> getContainerChildren(Object master) {
 
 		pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 		pickList.setText(""); //$NON-NLS-1$
-		ComboViewer picker = pickList.getPicker();
 
-		picker.setLabelProvider(new LabelProvider() {
+		pickList.setLabelProvider(new LabelProvider() {
 			@Override
 			public String getText(Object element) {
 				FeatureClass eclass = (FeatureClass) element;
@@ -133,7 +138,7 @@ public String getText(Object element) {
 			}
 		});
 
-		picker.setComparator(new ViewerComparator() {
+		pickList.setComparator(new ViewerComparator() {
 			@Override
 			public int compare(Viewer viewer, Object e1, Object e2) {
 				FeatureClass eClass1 = (FeatureClass) e1;
@@ -146,8 +151,10 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 		Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
 		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
 
-		picker.setInput(list);
-		picker.getCombo().select(0);
+		pickList.setInput(list);
+		if (list.size() > 0) {
+			pickList.setSelection(new StructuredSelection(list.get(0)));
+		}
 
 		folder.setSelection(0);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index 869ba353ec..b174e7651e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -34,7 +34,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
@@ -139,18 +138,17 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					EClass eClass = (EClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+					EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
 					handleAdd(eClass);
 				}
 			};
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 			viewer = pickList.getList();
 
-			final ComboViewer childrenDropDown = pickList.getPicker();
-			childrenDropDown.setContentProvider(new ArrayContentProvider());
-			childrenDropDown.setLabelProvider(new EClassLabelProvider(getEditor()));
-			childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
-			childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
+			pickList.setContentProvider(new ArrayContentProvider());
+			pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
+			pickList.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
+			pickList.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
 		}
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index 1173576544..d0b7d3e333 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -187,7 +187,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, targetFeature) {
 			@Override
 			protected void addPressed() {
-				EClass eClass = (EClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+				EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
 				handleAdd(eClass);
 			};
 
@@ -199,9 +199,9 @@ protected List<?> getContainerChildren(Object container) {
 		pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 		viewer = pickList.getList();
 
-		pickList.getPicker().setLabelProvider(new EClassLabelProvider(getEditor()));
-		pickList.getPicker().setInput(new EClass[] { BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW, AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, AdvancedPackageImpl.Literals.PERSPECTIVE, AdvancedPackageImpl.Literals.AREA, BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, BasicPackageImpl.Literals.TRIM_BAR, BasicPackageImpl.Literals.TRIM_ELEMENT, });
-		pickList.getPicker().setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE));
+		pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
+		pickList.setInput(new EClass[] { BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW, AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, AdvancedPackageImpl.Literals.PERSPECTIVE, AdvancedPackageImpl.Literals.AREA, BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, BasicPackageImpl.Literals.TRIM_BAR, BasicPackageImpl.Literals.TRIM_ELEMENT, });
+		pickList.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE));
 
 		folder.setSelection(0);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index fe8f5d49ca..d49669cae7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -35,7 +35,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -152,16 +151,14 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					EClass eClass = (EClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+					EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
 					handleAdd(eClass);
 				};
 			};
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 			viewer = pickList.getList();
 
-			ComboViewer picker = pickList.getPicker();
-
-			picker.setLabelProvider(new LabelProvider() {
+			pickList.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
 					EClass eclass = (EClass) element;
@@ -169,8 +166,8 @@ public String getText(Object element) {
 				}
 			});
 
-			picker.setInput(new EClass[] { AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA });
-			picker.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK));
+			pickList.setInput(new EClass[] { AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA });
+			pickList.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK));
 		}
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 9366ee08ea..9a5c0bec11 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -32,7 +32,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
@@ -128,7 +127,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, targetFeature) {
 			@Override
 			protected void addPressed() {
-				EClass eClass = (EClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+				EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
 				handleAdd(eClass);
 			}
 
@@ -140,10 +139,9 @@ protected List<?> getContainerChildren(Object container) {
 		pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 		viewer = pickList.getList();
 
-		final ComboViewer childrenDropDown = pickList.getPicker();
-		childrenDropDown.setLabelProvider(new EClassLabelProvider(getEditor()));
-		childrenDropDown.setInput(new EClass[] { BasicPackageImpl.Literals.DIALOG, BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW, BasicPackageImpl.Literals.WIZARD_DIALOG });
-		childrenDropDown.setSelection(new StructuredSelection(BasicPackageImpl.Literals.TRIMMED_WINDOW));
+		pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
+		pickList.setInput(new EClass[] { BasicPackageImpl.Literals.DIALOG, BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW, BasicPackageImpl.Literals.WIZARD_DIALOG });
+		pickList.setSelection(new StructuredSelection(BasicPackageImpl.Literals.TRIMMED_WINDOW));
 
 		// @SuppressWarnings("unchecked")
 		// @Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index e1c2228351..4d8e1ea0df 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -40,7 +40,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
@@ -168,7 +167,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS) {
 				@Override
 				protected void addPressed() {
-					EClass eClass = (EClass) ((IStructuredSelection) getPicker().getSelection()).getFirstElement();
+					EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
 					handleAdd(eClass);
 				}
 
@@ -183,10 +182,9 @@ protected List<?> getContainerChildren(Object container) {
 			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
-			final ComboViewer tableElement = pickList.getPicker();
-			tableElement.setLabelProvider(new EClassLabelProvider(getEditor()));
-			tableElement.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, BasicPackageImpl.Literals.PART_STACK, AdvancedPackageImpl.Literals.AREA });
-			tableElement.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
+			pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
+			pickList.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, BasicPackageImpl.Literals.PART_STACK, AdvancedPackageImpl.Literals.AREA });
+			pickList.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
 		}
 
 		folder.setSelection(0);

From 58e2bec21392972671a3b2362a5c564e4e87e8b1 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Tue, 4 Nov 2014 08:33:46 +0100
Subject: [PATCH 0847/1286] Bug 444692 - Remove Warnings - removed remaining
 warnings in e4.tools

---
 .../wizards/project/E4NewProjectWizard.java   |  52 ++++----
 .../project/E4NewProjectWizardPage.java       |   7 +-
 .../project/LifeCycleClassCodeGenerator.java  |  10 +-
 .../project/NewApplicationWizardPage.java     |   7 +-
 .../wizards/project/PluginContentPage.java    | 115 +++++++++++-------
 .../wizards/project/TemplateOperation.java    |  29 ++---
 6 files changed, 114 insertions(+), 106 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index 990998534f..715982ac4d 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -180,17 +180,7 @@ public boolean performFinish() {
 				false,
 				true,
 				new NewProjectCreationOperation(fPluginData,
-					fProjectProvider, new ContentWizard()) {
-					private WorkspacePluginModelBase model;
-
-					@Override
-					protected void setPluginLibraries(
-						WorkspacePluginModelBase model)
-						throws CoreException {
-						this.model = model;
-						super.setPluginLibraries(model);
-					}
-				});
+					fProjectProvider, new ContentWizard()));
 
 			// Add Project to working set
 			final IWorkingSet[] workingSets = fMainPage.getSelectedWorkingSets();
@@ -340,14 +330,14 @@ public void createProductsExtension(IProject project) {
 							NewApplicationWizardPage.PRODUCT_NAME)
 							|| entry.getKey().equals(
 								NewApplicationWizardPage.APPLICATION)
-							|| entry.getKey().equals(
-								NewApplicationWizardPage.richSample)
-							|| entry.getKey().equals(
-								NewApplicationWizardPage.generateLifecycle)
-							|| entry.getKey().equals(
-								NewApplicationWizardPage.generateLifecycleName)
-							|| entry.getKey()
-								.equals(NewApplicationWizardPage.CLEAR_PERSISTED_STATE)) {
+								|| entry.getKey().equals(
+									NewApplicationWizardPage.richSample)
+									|| entry.getKey().equals(
+										NewApplicationWizardPage.generateLifecycle)
+										|| entry.getKey().equals(
+											NewApplicationWizardPage.generateLifecycleName)
+											|| entry.getKey()
+											.equals(NewApplicationWizardPage.CLEAR_PERSISTED_STATE)) {
 							continue;
 						}
 						final IPluginElement element = fmodel.getFactory()
@@ -376,12 +366,12 @@ public void createProductsExtension(IProject project) {
 	public void createApplicationResources(IProject project,
 		IProgressMonitor monitor) {
 		final Map<String, String> map = fApplicationPage.getData();
-		isMinimalist = !map.get(NewApplicationWizardPage.richSample)
-			.equalsIgnoreCase(TRUE);
 		if (map == null
 			|| map.get(NewApplicationWizardPage.PRODUCT_NAME) == null) {
 			return;
 		}
+		isMinimalist = !map.get(NewApplicationWizardPage.richSample)
+			.equalsIgnoreCase(TRUE);
 
 		// If the project has invalid characters, the plug-in name would replace
 		// them with underscores, product name does the same
@@ -393,7 +383,7 @@ public void createApplicationResources(IProject project,
 			final String classname = fPluginData.getId() + "." //$NON-NLS-1$
 				+ map.get(NewApplicationWizardPage.generateLifecycleName);
 			final LifeCycleClassCodeGenerator fGenerator = new LifeCycleClassCodeGenerator(project, classname,
-				fPluginData, false, getContainer());
+				fPluginData);
 			try {
 				fGenerator.generate(new NullProgressMonitor());
 			} catch (final CoreException e2) {
@@ -468,7 +458,7 @@ public void createApplicationResources(IProject project,
 		keys.put("programArgs", //$NON-NLS-1$
 			"true".equalsIgnoreCase(map //$NON-NLS-1$
 				.get(NewApplicationWizardPage.CLEAR_PERSISTED_STATE)) ? "-clearPersistedState" //$NON-NLS-1$
-				: ""); //$NON-NLS-1$
+					: ""); //$NON-NLS-1$
 		try {
 			final URL corePath = ResourceLocator.getProjectTemplateFiles(template_id);
 			final IRunnableWithProgress op = new TemplateOperation(corePath, project,
@@ -518,43 +508,43 @@ private void createApplicationModel(IProject project, String pluginName,
 			MAddon addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.core.commands.service"); //$NON-NLS-1$
 			addon
-				.setContributionURI("bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"); //$NON-NLS-1$
+			.setContributionURI("bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"); //$NON-NLS-1$
 			application.getAddons().add(addon);
 
 			addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.ui.contexts.service"); //$NON-NLS-1$
 			addon
-				.setContributionURI("bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"); //$NON-NLS-1$
+			.setContributionURI("bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"); //$NON-NLS-1$
 			application.getAddons().add(addon);
 
 			addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.ui.bindings.service"); //$NON-NLS-1$
 			addon
-				.setContributionURI("bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon"); //$NON-NLS-1$
+			.setContributionURI("bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon"); //$NON-NLS-1$
 			application.getAddons().add(addon);
 
 			addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.ui.workbench.commands.model"); //$NON-NLS-1$
 			addon
-				.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon"); //$NON-NLS-1$
+			.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon"); //$NON-NLS-1$
 			application.getAddons().add(addon);
 
 			addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.ui.workbench.handler.model"); //$NON-NLS-1$
 			addon
-				.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"); //$NON-NLS-1$
+			.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"); //$NON-NLS-1$
 			application.getAddons().add(addon);
 
 			addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.ui.workbench.contexts.model"); //$NON-NLS-1$
 			addon
-				.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon"); //$NON-NLS-1$
+			.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon"); //$NON-NLS-1$
 			application.getAddons().add(addon);
 
 			addon = MApplicationFactory.INSTANCE.createAddon();
 			addon.setElementId("org.eclipse.e4.ui.workbench.bindings.model"); //$NON-NLS-1$
 			addon
-				.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon"); //$NON-NLS-1$
+			.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon"); //$NON-NLS-1$
 			application.getAddons().add(addon);
 			final MTrimmedWindow mainWindow = MBasicFactory.INSTANCE
 				.createTrimmedWindow();
@@ -732,7 +722,7 @@ private MCommand createCommand(String commandId, String name,
 					rootContext = MCommandsFactory.INSTANCE
 						.createBindingContext();
 					rootContext
-						.setElementId("org.eclipse.ui.contexts.dialogAndWindow"); //$NON-NLS-1$
+					.setElementId("org.eclipse.ui.contexts.dialogAndWindow"); //$NON-NLS-1$
 					rootContext.setName(Messages.E4NewProjectWizard_InDialogsAndWindows);
 					application.getRootContext().add(rootContext);
 				}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizardPage.java
index 9465cd4ce4..00e7d07b7f 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizardPage.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Soyatec - initial API and implementation
+ * Soyatec - initial API and implementation
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -14,9 +14,11 @@
 import org.eclipse.pde.internal.ui.wizards.plugin.AbstractFieldData;
 import org.eclipse.swt.widgets.Composite;
 
+@SuppressWarnings("restriction")
 public class E4NewProjectWizardPage extends org.eclipse.pde.internal.ui.wizards.plugin.NewProjectCreationPage {
 
-	public E4NewProjectWizardPage(String pageName, AbstractFieldData data, boolean fragment, IStructuredSelection selection) {
+	public E4NewProjectWizardPage(String pageName, AbstractFieldData data, boolean fragment,
+		IStructuredSelection selection) {
 		super(pageName, data, fragment, selection);
 	}
 
@@ -29,4 +31,3 @@ public void createControl(Composite parent) {
 		fEclipseCombo.setEnabled(false);
 	}
 }
-
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/LifeCycleClassCodeGenerator.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/LifeCycleClassCodeGenerator.java
index d625ccdbba..5c803e1b18 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/LifeCycleClassCodeGenerator.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/LifeCycleClassCodeGenerator.java
@@ -29,26 +29,22 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.wizard.IWizardContainer;
 import org.eclipse.pde.internal.core.util.CoreUtility;
 import org.eclipse.pde.internal.ui.wizards.plugin.PluginFieldData;
 import org.osgi.framework.FrameworkUtil;
 
+@SuppressWarnings("restriction")
 public class LifeCycleClassCodeGenerator {
 	private static final String PACKAGE_DECLARATION = "PACKAGE_DECLARATION"; //$NON-NLS-1$
 	private final PluginFieldData fPluginData;
 	private final IProject fProject;
 	private final String fQualifiedClassName;
-	private final boolean fGenerateTemplate;
-	private final IWizardContainer fWizardContainer;
 
-	public LifeCycleClassCodeGenerator(IProject project, String qualifiedClassName, PluginFieldData data,
-		boolean generateTemplate, IWizardContainer wizardContainer) {
+	public LifeCycleClassCodeGenerator(IProject project, String qualifiedClassName, PluginFieldData data) {
 		fProject = project;
 		fQualifiedClassName = qualifiedClassName;
 		fPluginData = data;
-		fGenerateTemplate = generateTemplate;
-		fWizardContainer = wizardContainer;
+
 	}
 
 	public IFile generate(IProgressMonitor monitor) throws CoreException {
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
index fe9d24e542..71a85c9982 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
@@ -53,6 +53,7 @@
 /**
  * @author jin.liu (jin.liu@soyatec.com)
  */
+@SuppressWarnings("restriction")
 public class NewApplicationWizardPage extends WizardPage {
 	private static final String TRUE = "TRUE"; //$NON-NLS-1$
 	private static final String TRUESMALL = "true"; //$NON-NLS-1$
@@ -328,7 +329,7 @@ private void handleLinkEvent(PropertyData property, Text valueText,
 	 * exchange the color pattern of hex numeric
 	 *
 	 * @param color
-	 * @return
+	 * @return the converted hex color
 	 */
 	public String hexColorConvert(String color) {
 		if (color.length() == 1) {
@@ -342,7 +343,7 @@ public String hexColorConvert(String color) {
 	 *
 	 * @param parent
 	 * @param valueText
-	 * @return
+	 * @return a rect dialog
 	 */
 	public Dialog createRectDialog(final Composite parent, final Text valueText) {
 		return new Dialog(parent.getShell()) {
@@ -415,7 +416,7 @@ protected void buttonPressed(int buttonId) {
 	 * create verify Listener
 	 *
 	 * @param shell
-	 * @return
+	 * @return a new verify listener
 	 */
 	public VerifyListener createVerifyListener(final Shell shell) {
 		return new VerifyListener() {
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
index 275f1657f0..5894a7aa19 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
@@ -6,9 +6,9 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Soyatec - port to e4
- *     Lars Vogel, vogella GmbH - ongoing enhancements
+ * IBM Corporation - initial API and implementation
+ * Soyatec - port to e4
+ * Lars Vogel, vogella GmbH - ongoing enhancements
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.project;
 
@@ -56,6 +56,7 @@
 /**
  * Content wizard page for the New Plugin Project wizard (page 2)
  */
+@SuppressWarnings("restriction")
 public class PluginContentPage extends ContentPage {
 	private Text fClassText;
 	protected Button fGenerateActivator;
@@ -84,32 +85,38 @@ public class PluginContentPage extends ContentPage {
 	/**
 	 * default tText modify listener
 	 */
-	private ModifyListener classListener = new ModifyListener() {
+	private final ModifyListener classListener = new ModifyListener() {
+		@Override
 		public void modifyText(ModifyEvent e) {
-			if (fInitialized)
+			if (fInitialized) {
 				fChangedGroups |= P_CLASS_GROUP;
+			}
 			validatePage();
 		}
 	};
 
 	/**
 	 * Constructor
+	 *
 	 * @param pageName
 	 * @param provider
 	 * @param page
 	 * @param data
 	 */
-	public PluginContentPage(String pageName, IProjectProvider provider, NewProjectCreationPage page, AbstractFieldData data) {
+	public PluginContentPage(String pageName, IProjectProvider provider, NewProjectCreationPage page,
+		AbstractFieldData data) {
 		super(pageName, provider, page, data);
 		setTitle(PDEUIMessages.ContentPage_title);
 		setDescription(PDEUIMessages.ContentPage_desc);
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#createControl(org.eclipse.swt.widgets.Composite)
 	 */
+	@Override
 	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
+		final Composite container = new Composite(parent, SWT.NONE);
 		container.setLayout(new GridLayout());
 
 		createPluginPropertiesGroup(container);
@@ -122,10 +129,12 @@ public void createControl(Composite parent) {
 
 	/**
 	 * Creates all of the plugin properties widgets
+	 *
 	 * @param container
 	 */
 	private void createPluginPropertiesGroup(Composite container) {
-		Group propertiesGroup = SWTFactory.createGroup(container, PDEUIMessages.ContentPage_pGroup, 3, 1, GridData.FILL_HORIZONTAL);
+		final Group propertiesGroup = SWTFactory.createGroup(container, PDEUIMessages.ContentPage_pGroup, 3, 1,
+			GridData.FILL_HORIZONTAL);
 
 		Label label = new Label(propertiesGroup, SWT.NONE);
 		label.setText(PDEUIMessages.ContentPage_pid);
@@ -148,6 +157,7 @@ private void createPluginPropertiesGroup(Composite container) {
 
 	/**
 	 * Creates all of the EE widgets
+	 *
 	 * @param container
 	 */
 	private void createExecutionEnvironmentControls(Composite container) {
@@ -159,16 +169,16 @@ private void createExecutionEnvironmentControls(Composite container) {
 		fEEChoice = new Combo(container, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
 		fEEChoice.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
-		// Gather EEs 
-		IExecutionEnvironment[] exeEnvs = VMUtil.getExecutionEnvironments();
-		TreeSet availableEEs = new TreeSet();
+		// Gather EEs
+		final IExecutionEnvironment[] exeEnvs = VMUtil.getExecutionEnvironments();
+		final TreeSet<String> availableEEs = new TreeSet<String>();
 		for (int i = 0; i < exeEnvs.length; i++) {
 			availableEEs.add(exeEnvs[i].getId());
 		}
 		availableEEs.add(NO_EXECUTION_ENVIRONMENT);
 
-		// Set data 
-		fEEChoice.setItems((String[]) availableEEs.toArray(new String[availableEEs.size() - 1]));
+		// Set data
+		fEEChoice.setItems(availableEEs.toArray(new String[availableEEs.size() - 1]));
 		fEEChoice.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -177,8 +187,8 @@ public void widgetSelected(SelectionEvent e) {
 		});
 
 		// Set default EE based on strict match to default VM
-		IVMInstall defaultVM = JavaRuntime.getDefaultVMInstall();
-		String[] EEChoices = fEEChoice.getItems();
+		final IVMInstall defaultVM = JavaRuntime.getDefaultVMInstall();
+		final String[] EEChoices = fEEChoice.getItems();
 		for (int i = 0; i < EEChoices.length; i++) {
 			if (!EEChoices[i].equals(NO_EXECUTION_ENVIRONMENT)) {
 				if (VMUtil.getExecutionEnvironment(EEChoices[i]).isStrictlyCompatible(defaultVM)) {
@@ -193,23 +203,27 @@ public void widgetSelected(SelectionEvent e) {
 		fExeEnvButton.setLayoutData(new GridData());
 		fExeEnvButton.setText(PDEUIMessages.NewProjectCreationPage_environmentsButton);
 		fExeEnvButton.addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event event) {
 				PreferencesUtil.createPreferenceDialogOn(getShell(), "org.eclipse.jdt.debug.ui.jreProfiles", //$NON-NLS-1$
-						new String[] {"org.eclipse.jdt.debug.ui.jreProfiles"}, null).open(); //$NON-NLS-1$ 
+					new String[] { "org.eclipse.jdt.debug.ui.jreProfiles" }, null).open(); //$NON-NLS-1$
 			}
 		});
 	}
 
 	/**
 	 * Creates all of the plugin options widgets
+	 *
 	 * @param container
 	 */
 	protected void createPluginClassGroup(Composite container) {
-		Group classGroup = SWTFactory.createGroup(container, PDEUIMessages.ContentPage_pClassGroup, 2, 1, GridData.FILL_HORIZONTAL);
+		final Group classGroup = SWTFactory.createGroup(container, PDEUIMessages.ContentPage_pClassGroup, 2, 1,
+			GridData.FILL_HORIZONTAL);
 
-		IDialogSettings settings = getDialogSettings();
+		final IDialogSettings settings = getDialogSettings();
 
-		fGenerateActivator = SWTFactory.createCheckButton(classGroup, PDEUIMessages.ContentPage_generate, null, false, 2);
+		fGenerateActivator = SWTFactory.createCheckButton(classGroup, PDEUIMessages.ContentPage_generate, null, false,
+			2);
 		fGenerateActivator.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -222,12 +236,13 @@ public void widgetSelected(SelectionEvent e) {
 
 		fClassLabel = new Label(classGroup, SWT.NONE);
 		fClassLabel.setText(PDEUIMessages.ContentPage_classname);
-		GridData gd = new GridData();
+		final GridData gd = new GridData();
 		gd.horizontalIndent = 20;
 		fClassLabel.setLayoutData(gd);
 		fClassText = createText(classGroup, classListener);
 
-		fUIPlugin = SWTFactory.createCheckButton(classGroup, PDEUIMessages.ContentPage_uicontribution, null, (settings != null) ? !settings.getBoolean(S_UI_PLUGIN) : true, 2);
+		fUIPlugin = SWTFactory.createCheckButton(classGroup, PDEUIMessages.ContentPage_uicontribution, null,
+			settings != null ? !settings.getBoolean(S_UI_PLUGIN) : true, 2);
 		fUIPlugin.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -236,8 +251,9 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		fApiAnalysisButton = SWTFactory.createCheckButton(classGroup, PDEUIMessages.PluginContentPage_enable_api_analysis, null, false, 2);
-		fApiAnalysisButton.setSelection((settings != null) ? settings.getBoolean(S_API_ANALYSIS) : false);
+		fApiAnalysisButton = SWTFactory.createCheckButton(classGroup,
+			PDEUIMessages.PluginContentPage_enable_api_analysis, null, false, 2);
+		fApiAnalysisButton.setSelection(settings != null ? settings.getBoolean(S_API_ANALYSIS) : false);
 		fApiAnalysisButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -247,13 +263,14 @@ public void widgetSelected(SelectionEvent e) {
 		});
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#updateData()
 	 */
 	@Override
 	public void updateData() {
 		super.updateData();
-		PluginFieldData data = (PluginFieldData) fData;
+		final PluginFieldData data = (PluginFieldData) fData;
 		data.setClassname(fClassText.getText().trim());
 		data.setUIPlugin(fUIPlugin.getSelection());
 		data.setDoGenerateClass(fGenerateActivator.getSelection());
@@ -266,15 +283,16 @@ public void updateData() {
 		}
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#setVisible(boolean)
 	 */
 	@Override
 	public void setVisible(boolean visible) {
 		if (visible) {
 			fMainPage.updateData();
-			
-			boolean wasGenActivatorEnabled = fGenerateActivator.isEnabled();
+
+			final boolean wasGenActivatorEnabled = fGenerateActivator.isEnabled();
 			fGenerateActivator.setEnabled(!fData.isSimple());
 			// if fGenerateActivator is disabled, set selection to false
 			if (!fGenerateActivator.isEnabled()) {
@@ -286,7 +304,7 @@ else if (!wasGenActivatorEnabled) {
 			}
 			fClassLabel.setEnabled(!fData.isSimple() && fGenerateActivator.getSelection());
 			fClassText.setEnabled(!fData.isSimple() && fGenerateActivator.getSelection());
-			boolean wasUIPluginEnabled = fUIPlugin.isEnabled();
+			final boolean wasUIPluginEnabled = fUIPlugin.isEnabled();
 			fUIPlugin.setEnabled(!fData.isSimple() && !isPureOSGi());
 			// if fUIPlugin is disabled, set selection to false
 			if (!fUIPlugin.isEnabled()) {
@@ -298,13 +316,13 @@ else if (!wasUIPluginEnabled) {
 			}
 
 			// plugin class group
-			if (((fChangedGroups & P_CLASS_GROUP) == 0)) {
-				int oldfChanged = fChangedGroups;
+			if ((fChangedGroups & P_CLASS_GROUP) == 0) {
+				final int oldfChanged = fChangedGroups;
 				fClassText.setText(computeId().replaceAll("-", "_").toLowerCase(Locale.ENGLISH) + ".Activator"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 				fChangedGroups = oldfChanged;
 			}
 
-			boolean allowEESelection = !fData.isSimple() && fData.hasBundleStructure();
+			final boolean allowEESelection = !fData.isSimple() && fData.hasBundleStructure();
 			fEELabel.setEnabled(allowEESelection);
 			fEEChoice.setEnabled(allowEESelection);
 			fExeEnvButton.setEnabled(allowEESelection);
@@ -326,14 +344,16 @@ private boolean isPureOSGi() {
 		return ((PluginFieldData) fData).getOSGiFramework() != null;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#validatePage()
 	 */
 	@Override
 	protected void validatePage() {
 		String errorMessage = validateProperties();
 		if (errorMessage == null && fGenerateActivator.getSelection()) {
-			IStatus status = JavaConventions.validateJavaTypeName(fClassText.getText().trim(), PDEJavaHelper.getJavaSourceLevel(null), PDEJavaHelper.getJavaComplianceLevel(null));
+			final IStatus status = JavaConventions.validateJavaTypeName(fClassText.getText().trim(),
+				PDEJavaHelper.getJavaSourceLevel(null), PDEJavaHelper.getJavaComplianceLevel(null));
 			if (status.getSeverity() == IStatus.ERROR) {
 				errorMessage = status.getMessage();
 			} else if (status.getSeverity() == IStatus.WARNING) {
@@ -341,9 +361,9 @@ protected void validatePage() {
 			}
 		}
 		if (errorMessage == null) {
-			String eeid = fEEChoice.getText();
+			final String eeid = fEEChoice.getText();
 			if (fEEChoice.isEnabled()) {
-				IExecutionEnvironment ee = VMUtil.getExecutionEnvironment(eeid);
+				final IExecutionEnvironment ee = VMUtil.getExecutionEnvironment(eeid);
 				if (ee != null && ee.getCompatibleVMs().length == 0) {
 					errorMessage = PDEUIMessages.NewProjectCreationPage_invalidEE;
 				}
@@ -355,6 +375,7 @@ protected void validatePage() {
 
 	/**
 	 * Saves the current state of widgets of interest in the dialog settings for the wizard
+	 *
 	 * @param settings
 	 */
 	@Override
@@ -371,38 +392,40 @@ public void saveSettings(IDialogSettings settings) {
 		settings.put(S_RCP_PLUGIN, true);
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
 	 */
 	@Override
 	public boolean canFlipToNextPage() {
 		if (getNextPage() instanceof TemplateListSelectionPage) {
-			TemplateListSelectionPage templatePage = (TemplateListSelectionPage) getNextPage();
+			final TemplateListSelectionPage templatePage = (TemplateListSelectionPage) getNextPage();
 			return super.canFlipToNextPage() && templatePage.isAnyTemplateAvailable();
 		}
 		return super.canFlipToNextPage();
 	}
-	
-	/* (non-Javadoc)
+
+	/*
+	 * (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#computeId()
 	 */
 	@Override
 	protected String computeId() {
 		String id = super.computeId();
-		// In addition to removed illegal characters, the xmi model does not recognize plug-in uris if they end in a version number
+		// In addition to removed illegal characters, the xmi model does not recognize plug-in uris if they end in a
+		// version number
 		// See PlatformURLPluginConnection.parse()
 		int underScore = id.lastIndexOf('_');
-		Version version;
 		while (underScore >= 0) {
 			try {
-				version = Version.parseVersion(id.substring(underScore + 1));
+				Version.parseVersion(id.substring(underScore + 1));
 				// name cannot end with a valid version, remove it
 				id = id.substring(0, underScore);
-			} catch (IllegalArgumentException iae) {
+			} catch (final IllegalArgumentException iae) {
 				// valid name so far, continue to next underscore
 			}
 			underScore = id.lastIndexOf('_', underScore - 1);
-			
+
 		}
 		return id;
 	}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java
index 69558522db..e41d259e8e 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java
@@ -41,8 +41,9 @@
 import org.eclipse.pde.ui.templates.IVariableProvider;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 
+@SuppressWarnings("restriction")
 public class TemplateOperation extends WorkspaceModifyOperation implements
-IVariableProvider {
+	IVariableProvider {
 
 	private final URL templateDirectory;
 	private final IContainer target;
@@ -61,7 +62,7 @@ public TemplateOperation(URL source, IContainer target,
 
 	@Override
 	protected void execute(IProgressMonitor monitor) throws CoreException,
-	InvocationTargetException, InterruptedException {
+		InvocationTargetException, InterruptedException {
 		monitor.setTaskName(PDEUIMessages.AbstractTemplateSection_generating);
 
 		if ("jar".equals(templateDirectory.getProtocol())) { //$NON-NLS-1$
@@ -122,10 +123,8 @@ private void generateFiles(File src, IContainer dst, boolean firstLevel,
 				}
 				IContainer dstContainer = null;
 
-				if (dstContainer == null) {
-					final String folderName = getProcessedString(name, name);
-					dstContainer = dst.getFolder(new Path(folderName));
-				}
+				final String folderName = getProcessedString(name, name);
+				dstContainer = dst.getFolder(new Path(folderName));
 				if (dstContainer != null && !dstContainer.exists()) {
 					((IFolder) dstContainer).create(true, true, monitor);
 				}
@@ -162,11 +161,11 @@ private void generateFiles(ZipFile zipFile, IPath path, IContainer dst,
 		IProgressMonitor monitor) throws CoreException {
 		final int pathLength = path.segmentCount();
 		// Immidiate children
-		final Map childZipEntries = new HashMap(); // "dir/" or "dir/file.java"
+		final Map<String, ZipEntry> childZipEntries = new HashMap<String, ZipEntry>(); // "dir/" or "dir/file.java"
 
-		for (final Enumeration zipEntries = zipFile.entries(); zipEntries
+		for (final Enumeration<? extends ZipEntry> zipEntries = zipFile.entries(); zipEntries
 			.hasMoreElements();) {
-			final ZipEntry zipEntry = (ZipEntry) zipEntries.nextElement();
+			final ZipEntry zipEntry = zipEntries.nextElement();
 			final IPath entryPath = new Path(zipEntry.getName());
 			if (entryPath.segmentCount() <= pathLength) {
 				// ancestor or current directory
@@ -188,16 +187,14 @@ private void generateFiles(ZipFile zipFile, IPath path, IContainer dst,
 			}
 		}
 
-		for (final Iterator it = childZipEntries.values().iterator(); it.hasNext();) {
-			final ZipEntry zipEnry = (ZipEntry) it.next();
+		for (final Iterator<ZipEntry> it = childZipEntries.values().iterator(); it.hasNext();) {
+			final ZipEntry zipEnry = it.next();
 			final String name = new Path(zipEnry.getName()).lastSegment().toString();
 			if (zipEnry.isDirectory()) {
 				IContainer dstContainer = null;
 
-				if (dstContainer == null) {
-					final String folderName = getProcessedString(name, name);
-					dstContainer = dst.getFolder(new Path(folderName));
-				}
+				final String folderName = getProcessedString(name, name);
+				dstContainer = dst.getFolder(new Path(folderName));
 				if (dstContainer != null && !dstContainer.exists()) {
 					((IFolder) dstContainer).create(true, true, monitor);
 				}
@@ -243,7 +240,7 @@ private void copyFile(String fileName, InputStream input, IContainer dst,
 
 	protected void copyFile(String fileName, InputStream input, IContainer dst,
 		final String destPath, IProgressMonitor monitor)
-			throws CoreException {
+		throws CoreException {
 		String targetFileName = null;
 		if (destPath == null) {
 			targetFileName = getProcessedString(fileName, fileName);

From 028fb51ec6b4ea3a839857195e08dfc3d9f4738a Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Wed, 5 Nov 2014 09:26:59 +0100
Subject: [PATCH 0848/1286] Bug 444692 - Remove Warnings - applied proper
 settings for compat bundle

---
 .../org.eclipse.core.resources.prefs          |   6 +
 .../.settings/org.eclipse.jdt.core.prefs      | 411 ++++++++++++++++++
 .../.settings/org.eclipse.jdt.launching.prefs |   2 +
 .../.settings/org.eclipse.jdt.ui.prefs        |  81 +++-
 .../.settings/org.eclipse.pde.api.tools.prefs |  97 +++++
 .../.settings/org.eclipse.pde.prefs           |  32 ++
 6 files changed, 619 insertions(+), 10 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.launching.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs

diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..f548abbf0b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
index c537b63063..c94829777b 100644
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,418 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000000..3bb235278e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
index a7a4847848..791508d164 100644
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
@@ -1,5 +1,66 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=true
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
@@ -14,14 +75,14 @@ sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=false
 sp_cleanup.always_use_this_for_non_static_method_access=false
 sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
+sp_cleanup.correct_indentation=true
 sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.format_source_code_changes_only=false
 sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
 sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.make_variable_declarations_final=true
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
 sp_cleanup.on_save_use_additional_actions=true
@@ -29,14 +90,14 @@ sp_cleanup.organize_imports=true
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
 sp_cleanup.remove_unused_imports=true
 sp_cleanup.remove_unused_local_variables=false
 sp_cleanup.remove_unused_private_fields=true
@@ -45,10 +106,10 @@ sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access=true
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000000..e4e3c0071e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,97 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..0bbee3c4b8
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1

From 547fd8d97a3c83905e5e2c459b09dfae5849765c Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Thu, 13 Nov 2014 18:53:41 +0100
Subject: [PATCH 0849/1286] Bug 444340 - Externalize Strings - and Bug 444692

---
 .../META-INF/MANIFEST.MF                      |   4 +-
 .../internal/ContextServiceFactory.java       |  55 ++++---
 .../e4/tools/compat/internal/CopyAction.java  |  10 +-
 .../e4/tools/compat/internal/CutAction.java   |   2 +-
 .../internal/DefaultLoggerProvider.java       |   3 +-
 .../e4/tools/compat/internal/Messages.java    |  32 ++++
 .../e4/tools/compat/internal/PartHelper.java  |  94 ++++++------
 .../e4/tools/compat/internal/PasteAction.java |   2 +-
 .../ReflectionContributionFactory.java        | 141 +++++++++---------
 .../e4/tools/compat/internal/Util.java        |  15 +-
 .../compat/internal/WorkbenchLogger.java      |  32 ++--
 .../tools/compat/internal/messages.properties |   3 +
 .../e4/tools/compat/parts/DIHandler.java      |  18 +--
 13 files changed, 228 insertions(+), 183 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index ad7b0ab609..c1c3677d57 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -14,8 +14,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
  org.eclipse.e4.ui.di;bundle-version="0.9.0",
  org.eclipse.core.databinding;bundle-version="1.4.0"
-Export-Package: org.eclipse.e4.tools.compat.internal;x-internal:=true,
- org.eclipse.e4.tools.compat.parts;x-internal:=true
+Export-Package: org.eclipse.e4.tools.compat.internal;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.compat.parts;version="0.12.0.qualifier";x-internal:=true
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
 Import-Package: javax.inject;version="1.0.0"
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index 11f4440830..bb54e56371 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.internal;
 
@@ -46,25 +46,24 @@ public class ContextServiceFactory extends AbstractServiceFactory {
 
 	@Override
 	public Object create(@SuppressWarnings("rawtypes") Class serviceInterface, IServiceLocator parentLocator,
-			IServiceLocator locator) {
-		if( ! IEclipseContext.class.equals(serviceInterface) ) {
+		IServiceLocator locator) {
+		if (!IEclipseContext.class.equals(serviceInterface)) {
 			return null;
 		}
 
-
-		IWorkbenchLocationService wls = (IWorkbenchLocationService) locator.getService(IWorkbenchLocationService.class);
+		final IWorkbenchLocationService wls = (IWorkbenchLocationService) locator
+			.getService(IWorkbenchLocationService.class);
 		final IWorkbenchWindow window = wls.getWorkbenchWindow();
 		final IWorkbenchPartSite site = wls.getPartSite();
 
-		Object o = parentLocator.getService(serviceInterface);
+		final Object o = parentLocator.getService(serviceInterface);
 
 		// This happens when we run in plain 3.x
 		// We need to create a parent service context
-		if( window == null && site == null ) {
-			Bundle bundle = FrameworkUtil.getBundle(ContextServiceFactory.class);
-			BundleContext bundleContext = bundle.getBundleContext();
-			IEclipseContext serviceContext = EclipseContextFactory.getServiceContext(bundleContext);
-
+		if (window == null && site == null) {
+			final Bundle bundle = FrameworkUtil.getBundle(ContextServiceFactory.class);
+			final BundleContext bundleContext = bundle.getBundleContext();
+			final IEclipseContext serviceContext = EclipseContextFactory.getServiceContext(bundleContext);
 
 			final IEclipseContext appContext = serviceContext.createChild("WorkbenchContext"); //$NON-NLS-1$
 			appContext.set(Display.class, Display.getCurrent());
@@ -86,10 +85,11 @@ public void asyncExec(Runnable runnable) {
 				}
 			});
 
-			IContributionFactory contributionFactory = ContextInjectionFactory.make(ReflectionContributionFactory.class, appContext);
-			appContext.set(IContributionFactory.class.getName(),contributionFactory);
+			final IContributionFactory contributionFactory = ContextInjectionFactory.make(
+				ReflectionContributionFactory.class, appContext);
+			appContext.set(IContributionFactory.class.getName(), contributionFactory);
 
-			IThemeManager manager = serviceContext.get(IThemeManager.class);
+			final IThemeManager manager = serviceContext.get(IThemeManager.class);
 			final IThemeEngine engine = manager.getEngineForDisplay(Display.getCurrent());
 			appContext.set(IThemeEngine.class, engine);
 
@@ -97,8 +97,7 @@ public void asyncExec(Runnable runnable) {
 
 				@Override
 				public void setClassname(Object widget, String classname) {
-					((Widget) widget).setData(
-							"org.eclipse.e4.ui.css.CssClassName", classname); //$NON-NLS-1$
+					((Widget) widget).setData("org.eclipse.e4.ui.css.CssClassName", classname); //$NON-NLS-1$
 					engine.applyStyles(widget, true);
 				}
 
@@ -120,21 +119,21 @@ public CSSStyleDeclaration getStyle(Object widget) {
 
 				@Override
 				public void setClassnameAndId(Object widget, String classname,
-						String id) {
-					((Widget) widget).setData(
-							"org.eclipse.e4.ui.css.CssClassName", classname); //$NON-NLS-1$
+					String id) {
+					((Widget) widget).setData("org.eclipse.e4.ui.css.CssClassName", classname); //$NON-NLS-1$
 					((Widget) widget).setData("org.eclipse.e4.ui.css.id", id); //$NON-NLS-1$
 					engine.applyStyles(widget, true);
 				}
 			});
 
-			if( appContext.get(ILoggerProvider.class) == null ) {
-				appContext.set(ILoggerProvider.class, ContextInjectionFactory.make(DefaultLoggerProvider.class, appContext));
+			if (appContext.get(ILoggerProvider.class) == null) {
+				appContext.set(ILoggerProvider.class,
+					ContextInjectionFactory.make(DefaultLoggerProvider.class, appContext));
 			}
 
 			return appContext;
-		} else if( o != null && site == null ) {
-			final IEclipseContext windowContext = ((IEclipseContext)o).createChild("WindowContext("+window+")");
+		} else if (o != null && site == null) {
+			final IEclipseContext windowContext = ((IEclipseContext) o).createChild("WindowContext(" + window + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 			windowContext.set(ISelectionService.class, window.getSelectionService());
 
 			windowContext.declareModifiable(IServiceConstants.ACTIVE_SELECTION);
@@ -142,10 +141,10 @@ public void setClassnameAndId(Object widget, String classname,
 
 				@Override
 				public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-					if( ! selection.isEmpty() ) {
-						if( selection instanceof IStructuredSelection ) {
-							IStructuredSelection s = (IStructuredSelection) selection;
-							if( s.size() == 1 ) {
+					if (!selection.isEmpty()) {
+						if (selection instanceof IStructuredSelection) {
+							final IStructuredSelection s = (IStructuredSelection) selection;
+							if (s.size() == 1) {
 								windowContext.set(IServiceConstants.ACTIVE_SELECTION, s.getFirstElement());
 							} else {
 								windowContext.set(IServiceConstants.ACTIVE_SELECTION, s.toList());
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
index a6493fee25..153fc5b473 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.internal;
 
@@ -14,13 +14,13 @@
 import org.eclipse.jface.action.Action;
 
 public class CopyAction extends Action {
-	private IClipboardService service;
-	
+	private final IClipboardService service;
+
 	public CopyAction(IClipboardService service) {
-		super("Copy");
+		super(Messages.CopyAction);
 		this.service = service;
 	}
-	
+
 	@Override
 	public void run() {
 		service.copy();
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
index 02a0c9dd35..88f8fbb74f 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
@@ -17,7 +17,7 @@ public class CutAction extends Action {
 	private IClipboardService service;
 	
 	public CutAction(IClipboardService service) {
-		super("Cut");
+		super(Messages.CutAction);
 		this.service = service;
 	}
 	
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
index ea751895c0..cfa745ba2e 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
@@ -8,13 +8,14 @@
 import org.eclipse.e4.core.services.log.Logger;
 import org.osgi.framework.FrameworkUtil;
 
+@SuppressWarnings("restriction")
 public class DefaultLoggerProvider implements ILoggerProvider {
 	@Inject
 	private IEclipseContext context;
 
 	@Override
 	public Logger getClassLogger(Class<?> clazz) {
-		IEclipseContext childContext = context.createChild();
+		final IEclipseContext childContext = context.createChild();
 		childContext.set("logger.bundlename", FrameworkUtil.getBundle(clazz).getSymbolicName()); //$NON-NLS-1$
 		return ContextInjectionFactory.make(WorkbenchLogger.class, childContext);
 	}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
new file mode 100644
index 0000000000..c1fe7f676d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ * Jonas - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.internal;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author Jonas
+ *
+ */
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.e4.tools.compat.internal.messages"; //$NON-NLS-1$
+	public static String CopyAction;
+	public static String CutAction;
+	public static String PasteAction;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
index d752045cc1..996cbad804 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.internal;
 
@@ -30,82 +30,84 @@
 import org.eclipse.ui.part.WorkbenchPart;
 
 public class PartHelper {
+	private static final String ORG_ECLIPSE_E4_UI_WORKBENCH_I_PRESENTATION_ENGINE = "org.eclipse.e4.ui.workbench.IPresentationEngine"; //$NON-NLS-1$
+
 	public static IEclipseContext createPartContext(WorkbenchPart part) throws PartInitException {
-		IWorkbenchPartSite site = part.getSite();
-		IEclipseContext parentContext = (IEclipseContext) site.getService(IEclipseContext.class);
-		
+		final IWorkbenchPartSite site = part.getSite();
+		final IEclipseContext parentContext = (IEclipseContext) site.getService(IEclipseContext.class);
+
 		// Check if running in 4.x
-		if( parentContext.get("org.eclipse.e4.ui.workbench.IPresentationEngine") != null ) {
+		if (parentContext.get(ORG_ECLIPSE_E4_UI_WORKBENCH_I_PRESENTATION_ENGINE) != null) {
 			// Hack to get the MPart-Context
 			try {
-				Class<?> clazz = Util.getBundle("org.eclipse.e4.ui.model.workbench").loadClass("org.eclipse.e4.ui.model.application.ui.basic.MPart");
-				Object instance = site.getService(clazz);
-				Method m = clazz.getMethod("getContext", new Class[0]);
+				final Class<?> clazz = Util.getBundle("org.eclipse.e4.ui.model.workbench").loadClass( //$NON-NLS-1$
+					"org.eclipse.e4.ui.model.application.ui.basic.MPart"); //$NON-NLS-1$
+				final Object instance = site.getService(clazz);
+				final Method m = clazz.getMethod("getContext", new Class[0]); //$NON-NLS-1$
 				IEclipseContext ctx = (IEclipseContext) m.invoke(instance);
-				IEclipseContext rv = ctx;
-				while( ctx.getParent() != null ) {
+				final IEclipseContext rv = ctx;
+				while (ctx.getParent() != null) {
 					ctx = ctx.getParent();
 				}
 				ctx.set(IClipboardService.class, new ClipboardServiceImpl());
 				return rv;
-			} catch (Exception e) {
-				throw new PartInitException("Could not create context",e);
+			} catch (final Exception e) {
+				throw new PartInitException("Could not create context", e); //$NON-NLS-1$
 			}
-		} else {
-			return parentContext.createChild("EditPart('"+part.getPartName()+"')"); //$NON-NLS-1$	
 		}
+		return parentContext.createChild("EditPart('" + part.getPartName() + "')"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	}
-	
+
 	public static <C> C createComponent(Composite parent, IEclipseContext context, Class<C> clazz, WorkbenchPart part) {
-		ISelectionProvider s = new SelectionProviderImpl();
+		final ISelectionProvider s = new SelectionProviderImpl();
 		context.set(ISelectionProvider.class, s);
 		part.getSite().setSelectionProvider(s);
-		
-		IStylingEngine styleEngine = context.get(IStylingEngine.class);
-		Composite comp = new Composite(parent, SWT.NONE);
+
+		final IStylingEngine styleEngine = context.get(IStylingEngine.class);
+		final Composite comp = new Composite(parent, SWT.NONE);
 		comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
-		
-		//FIXME This should be read from the CSS
-		FillLayout layout = new FillLayout();
+
+		// FIXME This should be read from the CSS
+		final FillLayout layout = new FillLayout();
 		layout.marginWidth = 10;
 		layout.marginHeight = 10;
 		comp.setLayout(layout);
-		
+
 		context.set(Composite.class.getName(), comp);
-		C component = ContextInjectionFactory.make(clazz, context);
-		
+		final C component = ContextInjectionFactory.make(clazz, context);
+
 		styleEngine.setClassname(comp, part.getClass().getSimpleName());
-		
+
 		return component;
 	}
-	
+
 	static class SelectionProviderImpl implements ISelectionProvider {
 		private ISelection currentSelection = StructuredSelection.EMPTY;
-		
-		private ListenerList listeners = new ListenerList();
-		
+
+		private final ListenerList listeners = new ListenerList();
+
 		@Override
 		public void setSelection(ISelection selection) {
 			currentSelection = selection;
-			SelectionChangedEvent evt = new SelectionChangedEvent(this, selection);
-			
-			for( Object l : listeners.getListeners() ) {
-				((ISelectionChangedListener)l).selectionChanged(evt);
+			final SelectionChangedEvent evt = new SelectionChangedEvent(this, selection);
+
+			for (final Object l : listeners.getListeners()) {
+				((ISelectionChangedListener) l).selectionChanged(evt);
 			}
 		}
-				
+
 		@Override
 		public void removeSelectionChangedListener(
-				ISelectionChangedListener listener) {
+			ISelectionChangedListener listener) {
 			listeners.remove(listener);
 		}
-		
+
 		@Override
 		public ISelection getSelection() {
 			return currentSelection;
 		}
-		
+
 		@Override
 		public void addSelectionChangedListener(ISelectionChangedListener listener) {
 			listeners.add(listener);
@@ -113,14 +115,14 @@ public void addSelectionChangedListener(ISelectionChangedListener listener) {
 	}
 
 	public static void disposeContextIfE3(IEclipseContext parentContext,
-			IEclipseContext context) {
-			// Check if running in 3.x, otherwise there was no dedicated context
-			// created
-			if (parentContext
-					.get("org.eclipse.e4.ui.workbench.IPresentationEngine") == null) {
-				context.dispose();
-				context = null;
+		IEclipseContext context) {
+		// Check if running in 3.x, otherwise there was no dedicated context
+		// created
+		if (parentContext
+			.get(ORG_ECLIPSE_E4_UI_WORKBENCH_I_PRESENTATION_ENGINE) == null) {
+			context.dispose();
+			context = null;
 		}
-		
+
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
index 9e3b40a229..cb2cbbc2f1 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
@@ -16,7 +16,7 @@
 public class PasteAction extends Action {
 	private IClipboardService service;
 	public PasteAction(IClipboardService service) {
-		super("Paste");
+		super(Messages.PasteAction);
 		this.service = service;
 	}
 	
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
index fc626d064f..c473d72550 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
@@ -24,21 +24,21 @@
 /**
  * Create the contribution factory.
  */
-@SuppressWarnings("restriction")
+@SuppressWarnings({ "restriction", "deprecation" })
 public class ReflectionContributionFactory implements IContributionFactory {
 
-	private IExtensionRegistry registry;
+	private final IExtensionRegistry registry;
 	private Map<String, Object> languages;
 
 	@Inject
 	private PackageAdmin packageAdmin;
-	
+
 	@Inject
 	private Logger logger;
-	
+
 	/**
 	 * Create a reflection factory.
-	 * 
+	 *
 	 * @param registry
 	 *            to read languages.
 	 */
@@ -67,64 +67,65 @@ private Object doCreate(String uriString, IEclipseContext context, IEclipseConte
 		if (uriString.startsWith("platform:/plugin/")) { //$NON-NLS-1$
 			logger.error("platform-style URIs deprecated for referencing types: " + uriString); //$NON-NLS-1$
 			uriString = uriString
-					.replace("platform:/plugin/", "bundleclass://"); //$NON-NLS-1$ //$NON-NLS-2$
+				.replace("platform:/plugin/", "bundleclass://"); //$NON-NLS-1$ //$NON-NLS-2$
 			logger.error("URI rewritten as: " + uriString); //$NON-NLS-1$
 		}
 
-		URI uri = URI.createURI(uriString);
-		Bundle bundle = getBundle(uri);
+		final URI uri = URI.createURI(uriString);
+		final Bundle bundle = getBundle(uri);
 		Object contribution;
 		if (bundle != null) {
 			contribution = createFromBundle(bundle, context, staticContext, uri);
 		} else {
 			contribution = null;
 			logger.error("Unable to retrive the bundle from the URI: " //$NON-NLS-1$
-					+ uriString);
+				+ uriString);
 		}
 		return contribution;
 	}
 
 	protected Object createFromBundle(Bundle bundle, IEclipseContext context,
-			IEclipseContext staticContext, URI uri) {
+		IEclipseContext staticContext, URI uri) {
 		Object contribution;
 		if (uri.segmentCount() > 1) {
-			String prefix = uri.segment(0);
-			IContributionFactorySpi factory = (IContributionFactorySpi) languages.get(prefix);
-			if(factory == null) {
-			    String message = "Unsupported contribution factory type '" + prefix + "'"; //$NON-NLS-1$ //$NON-NLS-2$
-			    logger.error(message);
-			    return null;
+			final String prefix = uri.segment(0);
+			final IContributionFactorySpi factory = (IContributionFactorySpi) languages.get(prefix);
+			if (factory == null) {
+				final String message = "Unsupported contribution factory type '" + prefix + "'"; //$NON-NLS-1$ //$NON-NLS-2$
+				logger.error(message);
+				return null;
 			}
-			StringBuffer resource = new StringBuffer(uri.segment(1));
+			final StringBuffer resource = new StringBuffer(uri.segment(1));
 			for (int i = 2; i < uri.segmentCount(); i++) {
 				resource.append('/');
 				resource.append(uri.segment(i));
 			}
 			contribution = factory.create(bundle, resource.toString(), context);
 		} else {
-			String clazz = uri.segment(0);
+			final String clazz = uri.segment(0);
 			try {
-				Class<?> targetClass = bundle.loadClass(clazz);
-				if (staticContext == null)
+				final Class<?> targetClass = bundle.loadClass(clazz);
+				if (staticContext == null) {
 					contribution = ContextInjectionFactory.make(targetClass, context);
-				else
+				} else {
 					contribution = ContextInjectionFactory
-							.make(targetClass, context, staticContext);
+						.make(targetClass, context, staticContext);
+				}
 
 				if (contribution == null) {
-					String message = "Unable to load class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
-							+ bundle.getBundleId() + "'"; //$NON-NLS-1$
+					final String message = "Unable to load class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
+						+ bundle.getBundleId() + "'"; //$NON-NLS-1$
 					logger.error(message);
 				}
-			} catch (ClassNotFoundException e) {
+			} catch (final ClassNotFoundException e) {
 				contribution = null;
-				String message = "Unable to load class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
-						+ bundle.getBundleId() + "'"; //$NON-NLS-1$
-				logger.error(e,message);
-			} catch (InjectionException e) {
+				final String message = "Unable to load class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
+					+ bundle.getBundleId() + "'"; //$NON-NLS-1$
+				logger.error(e, message);
+			} catch (final InjectionException e) {
 				contribution = null;
-				String message = "Unable to create class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
-						+ bundle.getBundleId() + "'"; //$NON-NLS-1$
+				final String message = "Unable to create class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
+					+ bundle.getBundleId() + "'"; //$NON-NLS-1$
 				logger.error(e, message);
 			}
 		}
@@ -133,24 +134,23 @@ protected Object createFromBundle(Bundle bundle, IEclipseContext context,
 
 	protected void processLanguages() {
 		languages = new HashMap<String, Object>();
-		String extId = "org.eclipse.e4.languages"; //$NON-NLS-1$
-		IConfigurationElement[] languageElements = registry.getConfigurationElementsFor(extId);
+		final String extId = "org.eclipse.e4.languages"; //$NON-NLS-1$
+		final IConfigurationElement[] languageElements = registry.getConfigurationElementsFor(extId);
 		for (int i = 0; i < languageElements.length; i++) {
-			IConfigurationElement languageElement = languageElements[i];
+			final IConfigurationElement languageElement = languageElements[i];
 			try {
 				languages.put(languageElement.getAttribute("name"), //$NON-NLS-1$
-						languageElement.createExecutableExtension("contributionFactory")); //$NON-NLS-1$
-			} catch (InvalidRegistryObjectException e) {
+					languageElement.createExecutableExtension("contributionFactory")); //$NON-NLS-1$
+			} catch (final InvalidRegistryObjectException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
-			} catch (CoreException e) {
+			} catch (final CoreException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 		}
 	}
 
-
 	protected Bundle getBundle(URI platformURI) {
 		return getBundleForName(platformURI.authority());
 	}
@@ -159,18 +159,19 @@ protected Bundle getBundle(URI platformURI) {
 	public Bundle getBundle(String uriString) {
 		return getBundle(new URI(uriString));
 	}
-	
+
 	public Bundle getBundleForName(String bundlename) {
-		if( packageAdmin == null ) {
-			Bundle bundle =  FrameworkUtil.getBundle(getClass());
-			BundleContext context = bundle.getBundleContext();
-			ServiceReference reference = context.getServiceReference(PackageAdmin.class.getName());
-			packageAdmin = (PackageAdmin) context.getService(reference);			
+		if (packageAdmin == null) {
+			final Bundle bundle = FrameworkUtil.getBundle(getClass());
+			final BundleContext context = bundle.getBundleContext();
+			final ServiceReference<?> reference = context.getServiceReference(PackageAdmin.class.getName());
+			packageAdmin = (PackageAdmin) context.getService(reference);
 		}
-		
-		Bundle[] bundles = packageAdmin.getBundles(bundlename, null);
-		if (bundles == null)
+
+		final Bundle[] bundles = packageAdmin.getBundles(bundlename, null);
+		if (bundles == null) {
 			return null;
+		}
 		// Return the first bundle that is not installed or uninstalled
 		for (int i = 0; i < bundles.length; i++) {
 			if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
@@ -179,35 +180,37 @@ public Bundle getBundleForName(String bundlename) {
 		}
 		return null;
 	}
-	
+
 	static class URI {
-	    String scheme;
+		String scheme;
 		String authority;
 		String[] segments = new String[0];
-		
+
 		URI(String uriString) {
-		    int colon = uriString.indexOf(':');
-		    if(colon < 0) { throw new IllegalArgumentException("invalid URI"); }
-		    scheme = uriString.substring(0, colon);
-		    uriString = uriString.substring(colon + 1);
-		    if(uriString.startsWith("//")) {
-		        int authEnd = uriString.indexOf('/', 2);
-		        if(authEnd < 0) {
-		            authority = uriString.substring(2);
-		        } else {
-		            authority = uriString.substring(2, authEnd);
-		            segments = uriString.substring(authEnd + 1).split("/");
-		        }
-		    } else {
-		        segments = uriString.substring(uriString.indexOf('/')+1).split("/");
-		    }
+			final int colon = uriString.indexOf(':');
+			if (colon < 0) {
+				throw new IllegalArgumentException("invalid URI"); //$NON-NLS-1$
+			}
+			scheme = uriString.substring(0, colon);
+			uriString = uriString.substring(colon + 1);
+			if (uriString.startsWith("//")) { //$NON-NLS-1$
+				final int authEnd = uriString.indexOf('/', 2);
+				if (authEnd < 0) {
+					authority = uriString.substring(2);
+				} else {
+					authority = uriString.substring(2, authEnd);
+					segments = uriString.substring(authEnd + 1).split("/"); //$NON-NLS-1$
+				}
+			} else {
+				segments = uriString.substring(uriString.indexOf('/') + 1).split("/"); //$NON-NLS-1$
+			}
 		}
-		
+
 		public String authority() {
-            return authority;
-        }
+			return authority;
+		}
 
-        public String segment(int i) {
+		public String segment(int i) {
 			return segments[i];
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java
index 567fcc2b2f..a72f261a96 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java
@@ -6,15 +6,18 @@
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.packageadmin.PackageAdmin;
 
+@SuppressWarnings("deprecation")
 public class Util {
 	public static Bundle getBundle(String bundleName) {
-		Bundle bundle = FrameworkUtil.getBundle(Util.class);
-		BundleContext ctx = bundle.getBundleContext();
-		ServiceReference ref = bundle.getBundleContext().getServiceReference(PackageAdmin.class.getName());
-		PackageAdmin bundleAdmin = (PackageAdmin) ctx.getService(ref);
-		Bundle[] bundles = bundleAdmin.getBundles(bundleName, null);
-		if (bundles == null)
+		final Bundle bundle = FrameworkUtil.getBundle(Util.class);
+		final BundleContext ctx = bundle.getBundleContext();
+		final ServiceReference<PackageAdmin> ref = bundle.getBundleContext().getServiceReference(
+			PackageAdmin.class);
+		final PackageAdmin bundleAdmin = ctx.getService(ref);
+		final Bundle[] bundles = bundleAdmin.getBundles(bundleName, null);
+		if (bundles == null) {
 			return null;
+		}
 		// Return the first bundle that is not installed or uninstalled
 		for (int i = 0; i < bundles.length; i++) {
 			if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
index eb14dfa4d2..3806c8d0cc 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
@@ -18,10 +18,11 @@
 /**
  * The workbench implementation of the logger service.
  */
+@SuppressWarnings("restriction")
 public final class WorkbenchLogger extends Logger {
 	protected DebugTrace trace;
 	protected FrameworkLog log;
-	private Bundle bundle = FrameworkUtil.getBundle(WorkbenchLogger.class);
+	private final Bundle bundle = FrameworkUtil.getBundle(WorkbenchLogger.class);
 
 	/**
 	 * Creates a new workbench logger
@@ -43,43 +44,43 @@ public void debug(Throwable t, String message) {
 	@Override
 	public void error(Throwable t, String message) {
 		log(new Status(IStatus.ERROR, bundle.getSymbolicName(),
-				message, t));
+			message, t));
 	}
 
 	/**
 	 * Copied from PlatformLogWriter in core runtime.
 	 */
 	private static FrameworkLogEntry getLog(IStatus status) {
-		Throwable t = status.getException();
-		ArrayList childlist = new ArrayList();
+		final Throwable t = status.getException();
+		final ArrayList<FrameworkLogEntry> childlist = new ArrayList<FrameworkLogEntry>();
 
-		int stackCode = t instanceof CoreException ? 1 : 0;
+		final int stackCode = t instanceof CoreException ? 1 : 0;
 		// ensure a substatus inside a CoreException is properly logged
 		if (stackCode == 1) {
-			IStatus coreStatus = ((CoreException) t).getStatus();
+			final IStatus coreStatus = ((CoreException) t).getStatus();
 			if (coreStatus != null) {
 				childlist.add(getLog(coreStatus));
 			}
 		}
 
 		if (status.isMultiStatus()) {
-			IStatus[] children = status.getChildren();
+			final IStatus[] children = status.getChildren();
 			for (int i = 0; i < children.length; i++) {
 				childlist.add(getLog(children[i]));
 			}
 		}
 
-		FrameworkLogEntry[] children = (FrameworkLogEntry[]) (childlist.size() == 0 ? null
-				: childlist.toArray(new FrameworkLogEntry[childlist.size()]));
+		final FrameworkLogEntry[] children = childlist.size() == 0 ? null
+			: childlist.toArray(new FrameworkLogEntry[childlist.size()]);
 
 		return new FrameworkLogEntry(status.getPlugin(), status.getSeverity(), status.getCode(),
-				status.getMessage(), stackCode, t, children);
+			status.getMessage(), stackCode, t, children);
 	}
 
 	@Override
 	public void info(Throwable t, String message) {
 		log(new Status(IStatus.INFO, bundle.getSymbolicName(), message,
-				t));
+			t));
 	}
 
 	@Override
@@ -112,21 +113,22 @@ private void log(IStatus status) {
 			log.log(getLog(status));
 		} else {
 			System.out.println(status.getMessage());
-			if (status.getException() != null)
+			if (status.getException() != null) {
 				status.getException().printStackTrace();
+			}
 		}
 	}
 
 	/**
 	 * Sets the debug options service for this logger.
-	 * 
+	 *
 	 * @param options
 	 *            The debug options to be used by this logger
 	 */
 	@Inject
 	public void setDebugOptions(DebugOptions options) {
 		if (options != null) {
-			this.trace = options.newDebugTrace(bundle.getSymbolicName(), WorkbenchLogger.class);
+			trace = options.newDebugTrace(bundle.getSymbolicName(), WorkbenchLogger.class);
 		}
 	}
 
@@ -151,6 +153,6 @@ public void trace(Throwable t, String message) {
 	@Override
 	public void warn(Throwable t, String message) {
 		log(new Status(IStatus.WARNING, bundle.getSymbolicName(),
-				message, t));
+			message, t));
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties
new file mode 100644
index 0000000000..d60d7bac31
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties
@@ -0,0 +1,3 @@
+CopyAction=Copy
+CutAction=Cut
+PasteAction=Paste
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
index 97b46ad0b8..ede67b2d53 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Jonas Helming <jhelming@eclipsesource.com> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
+ * Jonas Helming <jhelming@eclipsesource.com> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
  ******************************************************************************/
 package org.eclipse.e4.tools.compat.parts;
 
@@ -18,37 +18,37 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.ui.PlatformUI;
+
 /**
  * This is a preliminary implementation of a Handler wrapper. It does not support @CanExecute yet
+ * 
  * @author Jonas
  *
  * @param <C>
  */
 public class DIHandler<C> extends AbstractHandler {
 
-	private Class<C> clazz;
-	private C component;
+	private final C component;
 
 	public DIHandler(Class<C> clazz) {
-		this.clazz = clazz;
-		IEclipseContext context = getActiveContext();
+		final IEclipseContext context = getActiveContext();
 		component = ContextInjectionFactory.make(clazz, context);
 	}
 
 	private static IEclipseContext getActiveContext() {
-		IEclipseContext parentContext = getParentContext();
+		final IEclipseContext parentContext = getParentContext();
 		return parentContext.getActiveLeaf();
 	}
 
 	private static IEclipseContext getParentContext() {
 		return (IEclipseContext) PlatformUI.getWorkbench().getService(
-				IEclipseContext.class);
+			IEclipseContext.class);
 	}
 
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		return ContextInjectionFactory.invoke(component, Execute.class,
-				getActiveContext());
+			getActiveContext());
 	}
 
 }
\ No newline at end of file

From 1fd0066293f071a2190d8cc1bd93d0dec827acea Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Fri, 14 Nov 2014 10:14:12 +0100
Subject: [PATCH 0850/1286] Bug 444692 - Remove Warnings - removed remaining
 warnings in e4.tools

---
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF      | 10 +++++-----
 .../tools/wizards/classes/AbstractNewClassPage.java    | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index e8c6bd9e78..119e50a364 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -22,9 +22,9 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.pde.ui;bundle-version="3.8.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.e4.internal.tools.ToolsPlugin
-Export-Package: org.eclipse.e4.internal.tools;x-internal:=true,
- org.eclipse.e4.internal.tools.wizards.classes;x-friends:="org.eclipse.e4.tools.emf.editor3x",
- org.eclipse.e4.internal.tools.wizards.classes.templates;x-internal:=true,
- org.eclipse.e4.internal.tools.wizards.model;x-internal:=true,
- org.eclipse.e4.internal.tools.wizards.project;x-internal:=true
+Export-Package: org.eclipse.e4.internal.tools;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.internal.tools.wizards.classes;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor3x",
+ org.eclipse.e4.internal.tools.wizards.classes.templates;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.internal.tools.wizards.model;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.internal.tools.wizards.project;version="0.12.0.qualifier";x-internal:=true
 Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index 9e5a276909..9b8b43f3db 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -278,11 +278,11 @@ private String parseInitialStringForPackage(String initialString2) {
 		final int iSecondSlash = initialString2.lastIndexOf('/');
 		if (
 
-			initialString2.length() == 0 || // empty
+		initialString2.length() == 0 || // empty
 			ioBC == -1 || // no bundle class
 			iSecondSlash == -1 || // no package &| class name
 			initialString2.indexOf('.') == -1// no package
-			) {
+		) {
 			return null;
 		}
 
@@ -299,11 +299,11 @@ private String parseInitialStringForClassName(String initialString) {
 		final int iSecondSlash = initialString.lastIndexOf('/');
 		if (
 
-			initialString.length() == 0 || // empty
+		initialString.length() == 0 || // empty
 			ioBC == -1 || // no bundle class
 			iSecondSlash == -1 || // no package &| class name
 			initialString.indexOf('.') == -1// no package
-			) {
+		) {
 			return null;
 		}
 		final int lastDot = initialString.lastIndexOf('.');
@@ -315,7 +315,7 @@ private String parseInitialStringForClassName(String initialString) {
 
 	private IPackageFragmentRoot choosePackageRoot() {
 		final IJavaElement initElement = clazz.getFragmentRoot();
-		Class[] acceptedClasses = new Class[] { IPackageFragmentRoot.class, IJavaProject.class };
+		Class<?>[] acceptedClasses = new Class[] { IPackageFragmentRoot.class, IJavaProject.class };
 		final TypedElementSelectionValidator validator = new TypedElementSelectionValidator(acceptedClasses, false) {
 			@Override
 			public boolean isSelectedValid(Object element) {

From 51951de0f092ae496f7609976d990d53adf64da7 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Fri, 14 Nov 2014 10:14:28 +0100
Subject: [PATCH 0851/1286] Bug 444692 - Remove Warnings - applied proper
 settings for jdt bundle

---
 .../org.eclipse.core.resources.prefs          |   6 +
 .../.settings/org.eclipse.jdt.core.prefs      | 411 ++++++++++++++++++
 .../.settings/org.eclipse.jdt.launching.prefs |   2 +
 .../.settings/org.eclipse.jdt.ui.prefs        | 115 +++++
 .../.settings/org.eclipse.pde.api.tools.prefs |  97 +++++
 .../.settings/org.eclipse.pde.prefs           |  32 ++
 6 files changed, 663 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.resources.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.launching.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.api.tools.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.prefs

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..f548abbf0b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
index c537b63063..c94829777b 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,418 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000000..3bb235278e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..791508d164
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,115 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=true
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=true
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000000..e4e3c0071e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,97 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..0bbee3c4b8
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1

From 2378ee020cf085737f3ec8662a73f2ebcebd94a5 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Tue, 18 Nov 2014 10:56:47 +0100
Subject: [PATCH 0852/1286] Bug 444692 - Remove Warnings - added versions to
 packages

---
 .../META-INF/MANIFEST.MF                                  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 88edf8b716..761277f801 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -31,10 +31,10 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.search;bundle-version="3.7.0",
  org.eclipse.text;bundle-version="3.5.100",
  org.eclipse.e4.ui.model.workbench;bundle-version="1.0.0",
- org.eclipse.pde.ui
+ org.eclipse.pde.ui;bundle-version="3.8.0"
 Service-Component: OSGI-INF/pdecontributionprovider.xml, OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/projectfunction.xml, OSGI-INF/pdee4xmiprovider.xml, OSGI-INF/pdeextensionlookup.xml, OSGI-INF/modelextractor.xml 
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.e4.tools.emf.editor3x;x-internal:=true,
- org.eclipse.e4.tools.emf.editor3x.emf;x-internal:=true,
- org.eclipse.e4.tools.emf.editor3x.extension;x-internal:=true
+Export-Package: org.eclipse.e4.tools.emf.editor3x;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.emf.editor3x.emf;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.emf.editor3x.extension;version="0.12.0.qualifier";x-internal:=true

From e34e17b4868b23239c140b4e283ecda90439ecf9 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Tue, 18 Nov 2014 12:16:35 +0100
Subject: [PATCH 0853/1286] Bug 452028 - Extention points expects at least one
 editor tab

---
 .../schema/org.eclipse.e4.tools.emf.ui.editors.exsd             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd b/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
index df0055ba69..c6127d977c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
+++ b/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
@@ -30,7 +30,7 @@ This extension point allows three distinct extensions:
             <element ref="virtualeditor" minOccurs="0" maxOccurs="unbounded"/>
             <element ref="editorfeature" minOccurs="0" maxOccurs="unbounded"/>
             <element ref="contributionClassCreator" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="editorTab" minOccurs="1" maxOccurs="unbounded"/>
+            <element ref="editorTab" minOccurs="0" maxOccurs="unbounded"/>
          </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>

From ddcbfb1269cc7861f17f807e785834636198069c Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Wed, 19 Nov 2014 09:38:17 +0100
Subject: [PATCH 0854/1286] Bug 444692 - Remove Warnings - removed all warnings
 in *jdt.templates

---
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../tools/jdt/templates/E4ContextType.java    | 13 +--
 .../E4TemplateCompletionProposalComputer.java | 84 +++++++++++--------
 4 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.prefs
index 0bbee3c4b8..406a608568 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.prefs
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.prefs
@@ -11,7 +11,7 @@ compilers.p.build.output.library=1
 compilers.p.build.source.library=1
 compilers.p.build.src.includes=1
 compilers.p.deprecated=1
-compilers.p.discouraged-class=1
+compilers.p.discouraged-class=2
 compilers.p.internal=1
 compilers.p.missing-packages=1
 compilers.p.missing-version-export-package=1
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index 352567673e..d539c7ced2 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -9,4 +9,4 @@ Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.jface.text;bundle-version="3.6.0",
  org.eclipse.jdt.core;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0"
-Export-Package: org.eclipse.e4.internal.tools.jdt.templates;x-internal:=true
+Export-Package: org.eclipse.e4.internal.tools.jdt.templates;version="0.12.0.qualifier";x-internal:=true
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
index 1fdf5ff922..4cf75ec038 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation (adapted from JDT's SWTContextType)
+ * IBM Corporation - initial API and implementation (adapted from JDT's SWTContextType)
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.jdt.templates;
 
@@ -22,25 +22,28 @@
  * <li>templates for statement locations</li>
  * </dl>
  */
+@SuppressWarnings("restriction")
 public class E4ContextType extends AbstractJavaContextType {
 
 	/**
 	 * The context type id for templates working on all Java code locations in e4 projects
 	 */
-	public static final String ID_ALL= "e4"; //$NON-NLS-1$
+	public static final String ID_ALL = "e4"; //$NON-NLS-1$
 
 	/**
 	 * The context type id for templates working on member locations in e4 projects
 	 */
-	public static final String ID_MEMBERS= "e4-members"; //$NON-NLS-1$
+	public static final String ID_MEMBERS = "e4-members"; //$NON-NLS-1$
 
 	/**
 	 * The context type id for templates working on statement locations in e4 projects
 	 */
-	public static final String ID_STATEMENTS= "e4-statements"; //$NON-NLS-1$
+	public static final String ID_STATEMENTS = "e4-statements"; //$NON-NLS-1$
 
+	@Override
 	protected void initializeContext(JavaContext context) {
-		if (!getId().equals(E4ContextType.ID_ALL)) { // a specific context must also allow the templates that work everywhere
+		if (!getId().equals(E4ContextType.ID_ALL)) { // a specific context must also allow the templates that work
+			// everywhere
 			context.addCompatibleContextType(E4ContextType.ID_ALL);
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
index fc49a7fb4d..45575bccf5 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation (adapted from JDT's SWTTemplateCompletionProposalComputer)
+ * IBM Corporation - initial API and implementation (adapted from JDT's SWTTemplateCompletionProposalComputer)
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.jdt.templates;
 
@@ -31,28 +31,30 @@
  * Computer that computes the template proposals for the E4 context type.
  *
  */
+@SuppressWarnings("restriction")
 public class E4TemplateCompletionProposalComputer extends AbstractTemplateCompletionProposalComputer {
 
 	/**
 	 * The name of <code>javax.inject.Inject</code> used to detect
 	 * if a project uses e4.
 	 */
-	private static final String E4_TYPE_NAME= "org.eclipse.e4.ui.di.Focus"; //$NON-NLS-1$
-
+	private static final String E4_TYPE_NAME = "org.eclipse.e4.ui.di.Focus"; //$NON-NLS-1$
 
 	/**
 	 * Listener that resets the cached java project if its build path changes.
 	 */
 	private final class BuildPathChangeListener implements IElementChangedListener {
 
+		@Override
 		public void elementChanged(ElementChangedEvent event) {
-			IJavaProject javaProject= getCachedJavaProject();
-			if (javaProject == null)
+			final IJavaProject javaProject = getCachedJavaProject();
+			if (javaProject == null) {
 				return;
+			}
 
-			IJavaElementDelta[] children= event.getDelta().getChangedChildren();
-			for (int i= 0; i < children.length; i++) {
-				IJavaElementDelta child= children[i];
+			final IJavaElementDelta[] children = event.getDelta().getChangedChildren();
+			for (int i = 0; i < children.length; i++) {
+				final IJavaElementDelta child = children[i];
 				if (javaProject.equals(child.getElement())) {
 					if (isClasspathChange(child)) {
 						setCachedJavaProject(null);
@@ -63,19 +65,22 @@ public void elementChanged(ElementChangedEvent event) {
 
 		/**
 		 * Does the delta indicate a classpath change?
+		 * 
 		 * @param delta the delta to inspect
 		 * @return true if classpath has changed
 		 */
 		private boolean isClasspathChange(IJavaElementDelta delta) {
-			int flags= delta.getFlags();
-			if (isClasspathChangeFlag(flags))
+			final int flags = delta.getFlags();
+			if (isClasspathChangeFlag(flags)) {
 				return true;
+			}
 
 			if ((flags & IJavaElementDelta.F_CHILDREN) != 0) {
-				IJavaElementDelta[] children= delta.getAffectedChildren();
-				for (int i= 0; i < children.length; i++) {
-					if (isClasspathChangeFlag(children[i].getFlags()))
+				final IJavaElementDelta[] children = delta.getAffectedChildren();
+				for (int i = 0; i < children.length; i++) {
+					if (isClasspathChangeFlag(children[i].getFlags())) {
 						return true;
+					}
 				}
 			}
 
@@ -84,27 +89,31 @@ private boolean isClasspathChange(IJavaElementDelta delta) {
 
 		/**
 		 * Do the flags indicate a classpath change?
+		 * 
 		 * @param flags the flags to inspect
 		 * @return true if the flag flags a classpath change
 		 */
 		private boolean isClasspathChangeFlag(int flags) {
-			if ((flags & IJavaElementDelta.F_RESOLVED_CLASSPATH_CHANGED) != 0)
+			if ((flags & IJavaElementDelta.F_RESOLVED_CLASSPATH_CHANGED) != 0) {
 				return true;
+			}
 
-			if ((flags & IJavaElementDelta.F_ADDED_TO_CLASSPATH) != 0)
+			if ((flags & IJavaElementDelta.F_ADDED_TO_CLASSPATH) != 0) {
 				return true;
+			}
 
-			if ((flags & IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) != 0)
+			if ((flags & IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) != 0) {
 				return true;
+			}
 
-			if ((flags & IJavaElementDelta.F_ARCHIVE_CONTENT_CHANGED) != 0)
+			if ((flags & IJavaElementDelta.F_ARCHIVE_CONTENT_CHANGED) != 0) {
 				return true;
+			}
 
 			return false;
 		}
 	}
 
-
 	/**
 	 * Engine used to compute the proposals for this computer
 	 */
@@ -124,33 +133,36 @@ private boolean isClasspathChangeFlag(int flags) {
 	private boolean fIsE4OnClasspath;
 
 	public E4TemplateCompletionProposalComputer() {
-		ContextTypeRegistry templateContextRegistry= JavaPlugin.getDefault().getTemplateContextRegistry();
-		fE4TemplateEngine= createTemplateEngine(templateContextRegistry, E4ContextType.ID_ALL);
-		fE4MembersTemplateEngine= createTemplateEngine(templateContextRegistry, E4ContextType.ID_MEMBERS);
-		fE4StatementsTemplateEngine= createTemplateEngine(templateContextRegistry, E4ContextType.ID_STATEMENTS);
+		final ContextTypeRegistry templateContextRegistry = JavaPlugin.getDefault().getTemplateContextRegistry();
+		fE4TemplateEngine = createTemplateEngine(templateContextRegistry, E4ContextType.ID_ALL);
+		fE4MembersTemplateEngine = createTemplateEngine(templateContextRegistry, E4ContextType.ID_MEMBERS);
+		fE4StatementsTemplateEngine = createTemplateEngine(templateContextRegistry, E4ContextType.ID_STATEMENTS);
 
 		JavaCore.addElementChangedListener(new BuildPathChangeListener());
 	}
 
 	private static TemplateEngine createTemplateEngine(ContextTypeRegistry templateContextRegistry, String contextTypeId) {
-		TemplateContextType contextType= templateContextRegistry.getContextType(contextTypeId);
+		final TemplateContextType contextType = templateContextRegistry.getContextType(contextTypeId);
 		Assert.isNotNull(contextType);
 		return new TemplateEngine(contextType);
 	}
 
+	@Override
 	protected TemplateEngine computeCompletionEngine(JavaContentAssistInvocationContext context) {
-		ICompilationUnit unit= context.getCompilationUnit();
-		if (unit == null)
+		final ICompilationUnit unit = context.getCompilationUnit();
+		if (unit == null) {
 			return null;
+		}
 
-		IJavaProject javaProject= unit.getJavaProject();
-		if (javaProject == null)
+		final IJavaProject javaProject = unit.getJavaProject();
+		if (javaProject == null) {
 			return null;
+		}
 
 		if (isE4OnClasspath(javaProject)) {
-			CompletionContext coreContext= context.getCoreContext();
+			final CompletionContext coreContext = context.getCoreContext();
 			if (coreContext != null) {
-				int tokenLocation= coreContext.getTokenLocation();
+				final int tokenLocation = coreContext.getTokenLocation();
 				if ((tokenLocation & CompletionContext.TL_MEMBER_START) != 0) {
 					return fE4MembersTemplateEngine;
 				}
@@ -166,18 +178,18 @@ protected TemplateEngine computeCompletionEngine(JavaContentAssistInvocationCont
 
 	/**
 	 * Tells whether E4 is on the given project's class path.
-	 * 
+	 *
 	 * @param javaProject the Java project
 	 * @return <code>true</code> if the given project's class path
 	 */
 	private synchronized boolean isE4OnClasspath(IJavaProject javaProject) {
 		if (!javaProject.equals(fCachedJavaProject)) {
-			fCachedJavaProject= javaProject;
+			fCachedJavaProject = javaProject;
 			try {
-				IType type= javaProject.findType(E4_TYPE_NAME);
-				fIsE4OnClasspath= type != null;
-			} catch (JavaModelException e) {
-				fIsE4OnClasspath= false;
+				final IType type = javaProject.findType(E4_TYPE_NAME);
+				fIsE4OnClasspath = type != null;
+			} catch (final JavaModelException e) {
+				fIsE4OnClasspath = false;
 			}
 		}
 		return fIsE4OnClasspath;
@@ -198,7 +210,7 @@ private synchronized IJavaProject getCachedJavaProject() {
 	 * @param project or <code>null</code> to reset the cache
 	 */
 	private synchronized void setCachedJavaProject(IJavaProject project) {
-		fCachedJavaProject= project;
+		fCachedJavaProject = project;
 	}
 
 }

From 44c22c3eb2198933c3d8b179357ec3dda264b1a7 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Thu, 20 Nov 2014 10:00:36 +0100
Subject: [PATCH 0855/1286] Bug 444692 - Remove Warnings - applied proper
 settings for emf.ui bundle

---
 .../org.eclipse.core.resources.prefs          |   6 +
 .../.settings/org.eclipse.jdt.core.prefs      | 159 ++++++++++++-----
 .../.settings/org.eclipse.jdt.launching.prefs |   2 +
 .../.settings/org.eclipse.jdt.ui.prefs        |  89 ++++++++--
 .../.settings/org.eclipse.pde.api.tools.prefs |  97 ++++++++++
 .../.settings/org.eclipse.pde.prefs           |  32 ++++
 .../ui/common/CommandToStringConverter.java   |  11 +-
 .../ui/common/IClassContributionProvider.java |  10 +-
 .../eclipse/e4/tools/emf/ui/common/Util.java  | 108 ++++++------
 .../tools/emf/ui/common/XMIModelResource.java |  44 ++---
 .../emf/ui/common/component/IdGenerator.java  |  16 +-
 .../tools/emf/ui/internal/PatternFilter.java  |  14 +-
 .../tools/emf/ui/internal/StringMatcher.java  |  76 ++++----
 .../AbstractCommandSelectionDialog.java       |  35 ++--
 .../AbstractIconDialogWithScopeAndFilter.java | 165 +++++++++---------
 .../component/dialogs/AbstractIdDialog.java   |  35 ++--
 .../META-INF/MANIFEST.MF                      |   2 +-
 17 files changed, 597 insertions(+), 304 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.resources.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.launching.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.api.tools.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.prefs

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..f548abbf0b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
index fa824f42ed..c94829777b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,29 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
@@ -6,6 +31,8 @@ org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -13,50 +40,79 @@ org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
 org.eclipse.jdt.core.compiler.problem.deadCode=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
@@ -71,30 +127,38 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
 org.eclipse.jdt.core.formatter.blank_lines_after_package=1
 org.eclipse.jdt.core.formatter.blank_lines_before_field=0
@@ -117,10 +181,10 @@ org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_header=true
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
@@ -128,12 +192,18 @@ org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
 org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
 org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
@@ -151,6 +221,7 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
@@ -217,12 +288,14 @@ org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invoca
 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
 org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
 org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
@@ -246,6 +319,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invoc
 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
 org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
@@ -301,6 +375,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invoc
 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
 org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
 org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
@@ -310,6 +385,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=inser
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -319,13 +395,13 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.lineSplit=120
 org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
@@ -333,5 +409,10 @@ org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
 org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000000..3bb235278e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
index d4d8200d6e..791508d164 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -1,11 +1,66 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=true
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_custom
-formatter_settings_version=11
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
@@ -20,14 +75,14 @@ sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=false
 sp_cleanup.always_use_this_for_non_static_method_access=false
 sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
+sp_cleanup.correct_indentation=true
 sp_cleanup.format_source_code=true
 sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
 sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.make_variable_declarations_final=true
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
 sp_cleanup.on_save_use_additional_actions=true
@@ -35,15 +90,15 @@ sp_cleanup.organize_imports=true
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
 sp_cleanup.remove_unused_local_variables=false
 sp_cleanup.remove_unused_private_fields=true
 sp_cleanup.remove_unused_private_members=false
@@ -51,10 +106,10 @@ sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access=true
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000000..e4e3c0071e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,97 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..0bbee3c4b8
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
index d3979790ac..afebef3ba2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
@@ -17,8 +17,9 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 
+@SuppressWarnings("restriction")
 public class CommandToStringConverter extends Converter {
-	private Messages Messages;
+	private final Messages Messages;
 
 	public CommandToStringConverter(Messages Messages) {
 		super(MCommand.class, String.class);
@@ -27,7 +28,7 @@ public CommandToStringConverter(Messages Messages) {
 
 	@Override
 	public Object convert(Object fromObject) {
-		MCommand cmd = (MCommand) fromObject;
+		final MCommand cmd = (MCommand) fromObject;
 		String elementId = null;
 		if (cmd != null && cmd.getElementId() != null && cmd.getElementId().trim().length() > 0) {
 			elementId = cmd.getElementId();
@@ -39,9 +40,9 @@ public Object convert(Object fromObject) {
 		} else if (elementId != null) {
 			return elementId;
 		} else {
-			Resource res = ((EObject) cmd).eResource();
+			final Resource res = ((EObject) cmd).eResource();
 			if (res instanceof E4XMIResource) {
-				String v = ((E4XMIResource) res).getID((EObject) cmd);
+				final String v = ((E4XMIResource) res).getID((EObject) cmd);
 				if (v != null && v.trim().length() > 0) {
 					return v;
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
index 7ed891ffc6..059be46358 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
@@ -6,13 +6,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 436281
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 436281
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
 import java.util.EnumSet;
 import java.util.List;
+
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IProgressMonitor;
 
@@ -82,11 +83,6 @@ public List<String> getBundles() {
 			return bundles;
 		}
 
-		/**
-		 * Sets the packages to filter on
-		 *
-		 * @return
-		 */
 		public List<String> getPackages() {
 			return packages;
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index a3b77af41f..6fa6d0717a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
@@ -15,6 +15,7 @@
 import java.util.Map.Entry;
 import java.util.SortedSet;
 import java.util.TreeSet;
+
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
@@ -44,6 +45,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Control;
 
+@SuppressWarnings("restriction")
 public class Util {
 	public static final boolean isNullOrEmpty(String element) {
 		return element == null || element.trim().length() == 0;
@@ -54,16 +56,18 @@ public static final boolean isImport(EObject object) {
 	}
 
 	public static final void addClasses(EPackage ePackage, List<FeatureClass> list) {
-		for (EClassifier c : ePackage.getEClassifiers()) {
+		for (final EClassifier c : ePackage.getEClassifiers()) {
 			if (c instanceof EClass) {
-				EClass eclass = (EClass) c;
-				if (eclass != ApplicationPackageImpl.Literals.APPLICATION && !eclass.isAbstract() && !eclass.isInterface() && eclass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT)) {
+				final EClass eclass = (EClass) c;
+				if (eclass != ApplicationPackageImpl.Literals.APPLICATION && !eclass.isAbstract()
+					&& !eclass.isInterface()
+					&& eclass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT)) {
 					list.add(new FeatureClass(eclass.getName(), eclass));
 				}
 			}
 		}
 
-		for (EPackage eSubPackage : ePackage.getESubpackages()) {
+		for (final EPackage eSubPackage : ePackage.getESubpackages()) {
 			addClasses(eSubPackage, list);
 		}
 	}
@@ -72,25 +76,25 @@ public static final void addClasses(EPackage ePackage, List<FeatureClass> list)
 	// ${project}.${classname}.${counter}
 	public static final String getDefaultElementId(Resource resource, MApplicationElement element, IProject project) {
 		try {
-			EObject o = (EObject) element;
-			String className = o.eClass().getName();
-			String projectName = project.getName();
+			final EObject o = (EObject) element;
+			final String className = o.eClass().getName();
+			final String projectName = project.getName();
 
-			String prefix = (projectName + "." + className).toLowerCase(); //$NON-NLS-1$
+			final String prefix = (projectName + "." + className).toLowerCase(); //$NON-NLS-1$
 
-			TreeIterator<EObject> it = resource.getAllContents();
-			SortedSet<Integer> numbers = new TreeSet<Integer>();
+			final TreeIterator<EObject> it = resource.getAllContents();
+			final SortedSet<Integer> numbers = new TreeSet<Integer>();
 
 			while (it.hasNext()) {
-				EObject tmp = it.next();
+				final EObject tmp = it.next();
 				if (tmp instanceof MApplicationElement) {
-					String elementId = ((MApplicationElement) tmp).getElementId();
+					final String elementId = ((MApplicationElement) tmp).getElementId();
 					if (elementId != null && elementId.length() > prefix.length() && elementId.startsWith(prefix)) {
-						String suffix = elementId.substring(prefix.length());
+						final String suffix = elementId.substring(prefix.length());
 						if (suffix.startsWith(".") && suffix.length() > 1) { //$NON-NLS-1$
 							try {
 								numbers.add(Integer.parseInt(suffix.substring(1)));
-							} catch (Exception e) {
+							} catch (final Exception e) {
 								// TODO: handle exception
 							}
 						}
@@ -99,15 +103,15 @@ public static final String getDefaultElementId(Resource resource, MApplicationEl
 			}
 
 			int lastNumber = -1;
-			for (Integer number : numbers) {
-				if ((lastNumber + 1) != number) {
+			for (final Integer number : numbers) {
+				if (lastNumber + 1 != number) {
 					break;
 				}
 				lastNumber = number;
 			}
 
 			return (prefix + "." + ++lastNumber).toLowerCase(); //$NON-NLS-1$
-		} catch (Exception e) {
+		} catch (final Exception e) {
 			// TODO: handle exception
 			e.printStackTrace();
 		}
@@ -115,22 +119,22 @@ public static final String getDefaultElementId(Resource resource, MApplicationEl
 	}
 
 	public static List<InternalPackage> loadPackages() {
-		List<InternalPackage> packs = new ArrayList<InternalPackage>();
+		final List<InternalPackage> packs = new ArrayList<InternalPackage>();
 
-		for (Entry<String, Object> regEntry : EPackage.Registry.INSTANCE.entrySet()) {
+		for (final Entry<String, Object> regEntry : EPackage.Registry.INSTANCE.entrySet()) {
 			if (regEntry.getValue() instanceof EPackage) {
-				EPackage ePackage = (EPackage) regEntry.getValue();
-				InternalPackage iePackage = new InternalPackage(ePackage);
+				final EPackage ePackage = (EPackage) regEntry.getValue();
+				final InternalPackage iePackage = new InternalPackage(ePackage);
 				boolean found = false;
-				for (EClassifier cl : ePackage.getEClassifiers()) {
+				for (final EClassifier cl : ePackage.getEClassifiers()) {
 					if (cl instanceof EClass) {
-						EClass eClass = (EClass) cl;
+						final EClass eClass = (EClass) cl;
 						if (eClass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT)) {
 							if (!eClass.isInterface() && !eClass.isAbstract()) {
 								found = true;
-								InternalClass ieClass = new InternalClass(iePackage, eClass);
+								final InternalClass ieClass = new InternalClass(iePackage, eClass);
 								iePackage.classes.add(ieClass);
-								for (EReference f : eClass.getEAllReferences()) {
+								for (final EReference f : eClass.getEAllReferences()) {
 									ieClass.features.add(new InternalFeature(ieClass, f));
 								}
 							}
@@ -146,10 +150,11 @@ public static List<InternalPackage> loadPackages() {
 		return packs;
 	}
 
-	public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement element, boolean liveModel, int index, EStructuralFeature feature) {
+	public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement element, boolean liveModel,
+		int index, EStructuralFeature feature) {
 		if (liveModel) {
-			EObject container = ((EObject) element).eContainer();
-			List<Object> l = (List<Object>) container.eGet(feature);
+			final EObject container = ((EObject) element).eContainer();
+			final List<Object> l = (List<Object>) container.eGet(feature);
 			l.remove(element);
 
 			if (index >= 0) {
@@ -159,21 +164,21 @@ public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement
 			}
 
 			return true;
-		} else {
-			EObject container = ((EObject) element).eContainer();
-			Command cmd = MoveCommand.create(editingDomain, container, feature, element, index);
+		}
+		final EObject container = ((EObject) element).eContainer();
+		final Command cmd = MoveCommand.create(editingDomain, container, feature, element, index);
 
-			if (cmd.canExecute()) {
-				editingDomain.getCommandStack().execute(cmd);
-				return true;
-			}
-			return false;
+		if (cmd.canExecute()) {
+			editingDomain.getCommandStack().execute(cmd);
+			return true;
 		}
+		return false;
 	}
 
-	public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement element, boolean liveModel, int index) {
+	public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement element, boolean liveModel,
+		int index) {
 		if (liveModel) {
-			MElementContainer<MUIElement> container = element.getParent();
+			final MElementContainer<MUIElement> container = element.getParent();
 			container.getChildren().remove(element);
 
 			if (index >= 0) {
@@ -184,16 +189,16 @@ public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement
 
 			container.setSelectedElement(element);
 			return true;
-		} else {
-			MElementContainer<MUIElement> container = element.getParent();
-			Command cmd = MoveCommand.create(editingDomain, container, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, element, index);
+		}
+		final MElementContainer<MUIElement> container = element.getParent();
+		final Command cmd = MoveCommand.create(editingDomain, container,
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, element, index);
 
-			if (cmd.canExecute()) {
-				editingDomain.getCommandStack().execute(cmd);
-				return true;
-			}
-			return false;
+		if (cmd.canExecute()) {
+			editingDomain.getCommandStack().execute(cmd);
+			return true;
 		}
+		return false;
 	}
 
 	public static final void addDecoration(Control control, Binding binding) {
@@ -202,7 +207,7 @@ public static final void addDecoration(Control control, Binding binding) {
 
 			@Override
 			public void handleValueChange(ValueChangeEvent event) {
-				IStatus s = (IStatus) event.getObservableValue().getValue();
+				final IStatus s = (IStatus) event.getObservableValue().getValue();
 				if (s.isOK()) {
 					dec.setDescriptionText(null);
 					dec.setImage(null);
@@ -222,7 +227,8 @@ public void handleValueChange(ValueChangeEvent event) {
 						fieldDecorationID = FieldDecorationRegistry.DEC_ERROR;
 						break;
 					}
-					FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(fieldDecorationID);
+					final FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(
+						fieldDecorationID);
 					dec.setImage(fieldDecoration == null ? null : fieldDecoration.getImage());
 				}
 			}
@@ -243,8 +249,8 @@ public String toString() {
 		}
 
 		public List<EClass> getAllClasses() {
-			ArrayList<EClass> rv = new ArrayList<EClass>(classes.size());
-			for (InternalClass c : classes) {
+			final ArrayList<EClass> rv = new ArrayList<EClass>(classes.size());
+			for (final InternalClass c : classes) {
 				rv.add(c.eClass);
 			}
 			return rv;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
index bdacafc478..405b9fe8fb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
@@ -17,6 +17,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -41,19 +42,21 @@
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
 
+@SuppressWarnings("restriction")
 public class XMIModelResource implements IModelResource {
-	private EditingDomain editingDomain;
-	private Resource resource;
-	private List<ModelListener> listeners = new ArrayList<IModelResource.ModelListener>();
+	private final EditingDomain editingDomain;
+	private final Resource resource;
+	private final List<ModelListener> listeners = new ArrayList<IModelResource.ModelListener>();
 
 	private IObservableList list;
 
 	public XMIModelResource(URI uri) {
-		ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+		final ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
+			ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
 		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
 
-		ResourceSet resourceSet = new ResourceSetImpl();
-		BasicCommandStack commandStack = new BasicCommandStack();
+		final ResourceSet resourceSet = new ResourceSetImpl();
+		final BasicCommandStack commandStack = new BasicCommandStack();
 		commandStack.addCommandStackListener(new CommandStackListener() {
 
 			@Override
@@ -63,7 +66,8 @@ public void commandStackChanged(EventObject event) {
 			}
 		});
 		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, resourceSet);
-		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, new E4XMIResourceFactory());
+		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
+			.put(Resource.Factory.Registry.DEFAULT_EXTENSION, new E4XMIResourceFactory());
 		resource = resourceSet.getResource(uri, true);
 	}
 
@@ -81,24 +85,24 @@ public IObservableList getRoot() {
 	@Override
 	public void replaceRoot(EObject eObject) {
 		E4XMIResource resource = (E4XMIResource) eObject.eResource();
-		Map<EObject, String> idMap = new HashMap<EObject, String>();
+		final Map<EObject, String> idMap = new HashMap<EObject, String>();
 		idMap.put(eObject, resource.getID(eObject));
 
-		TreeIterator<EObject> it = EcoreUtil.getAllContents(eObject, true);
+		final TreeIterator<EObject> it = EcoreUtil.getAllContents(eObject, true);
 		while (it.hasNext()) {
-			EObject o = it.next();
+			final EObject o = it.next();
 			resource = (E4XMIResource) o.eResource();
 			idMap.put(o, resource.getID(o));
 		}
 
 		resource = (E4XMIResource) ((EObject) list.get(0)).eResource();
 
-		Command cmdRemove = new RemoveCommand(getEditingDomain(), resource.getContents(), list.get(0));
-		Command cmdAdd = new AddCommand(getEditingDomain(), resource.getContents(), eObject);
-		CompoundCommand cmd = new CompoundCommand(Arrays.asList(cmdRemove, cmdAdd));
+		final Command cmdRemove = new RemoveCommand(getEditingDomain(), resource.getContents(), list.get(0));
+		final Command cmdAdd = new AddCommand(getEditingDomain(), resource.getContents(), eObject);
+		final CompoundCommand cmd = new CompoundCommand(Arrays.asList(cmdRemove, cmdAdd));
 		getEditingDomain().getCommandStack().execute(cmd);
 
-		for (Entry<EObject, String> e : idMap.entrySet()) {
+		for (final Entry<EObject, String> e : idMap.entrySet()) {
 			resource.setID(e.getKey(), e.getValue());
 		}
 	}
@@ -129,30 +133,30 @@ public boolean isDirty() {
 	}
 
 	private void fireDirtyChanged() {
-		for (ModelListener listener : listeners) {
+		for (final ModelListener listener : listeners) {
 			listener.dirtyChanged();
 		}
 	}
 
 	private void fireCommandStackChanged() {
-		for (ModelListener listener : listeners) {
+		for (final ModelListener listener : listeners) {
 			listener.commandStackChanged();
 		}
 	}
 
 	@Override
 	public IStatus save() {
-		Map<String, String> map = new HashMap<String, String>();
+		final Map<String, String> map = new HashMap<String, String>();
 		try {
 			resource.save(map);
 
-			BasicCommandStack commandStack = (BasicCommandStack) getEditingDomain().getCommandStack();
+			final BasicCommandStack commandStack = (BasicCommandStack) getEditingDomain().getCommandStack();
 			commandStack.saveIsDone();
 
 			fireDirtyChanged();
 			fireCommandStackChanged();
 
-		} catch (Exception e) {
+		} catch (final Exception e) {
 			// TODO: handle exception
 			e.printStackTrace();
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
index a1ac8e2388..f9342c5acd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
@@ -6,13 +6,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 437951
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 437951
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.common.component;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
@@ -41,14 +42,15 @@ public class IdGenerator {
 	/**
 	 * Bind must be called AFTER the master observable value is set in order to
 	 * properly initialize.
-	 * 
+	 *
 	 * @param master
 	 * @param ebpLabel
 	 * @param evpId
 	 * @param control
 	 *            Optional control.
 	 */
-	public void bind(final IObservableValue master, final IEMFEditValueProperty ebpLabel, final IEMFEditValueProperty evpId, Control control) {
+	public void bind(final IObservableValue master, final IEMFEditValueProperty ebpLabel,
+		final IEMFEditValueProperty evpId, Control control) {
 
 		// RULES
 		// Only start generating if the label is initially empty and the id ends
@@ -66,7 +68,7 @@ public void bind(final IObservableValue master, final IEMFEditValueProperty ebpL
 		if (origId == null) {
 			origId = "id.0"; //$NON-NLS-1$
 		}
-		Matcher m = patternId.matcher(origId);
+		final Matcher m = patternId.matcher(origId);
 		if (!m.matches()) {
 			stopGenerating();
 			return;
@@ -78,7 +80,7 @@ public void bind(final IObservableValue master, final IEMFEditValueProperty ebpL
 				@Override
 				public void focusLost(org.eclipse.swt.events.FocusEvent e) {
 					stopGenerating();
-				};
+				}
 			});
 
 			control.addDisposeListener(new DisposeListener() {
@@ -110,7 +112,7 @@ public void handleValueChange(ValueChangeEvent event) {
 				if (labelValue == null) {
 					labelValue = ""; //$NON-NLS-1$
 				}
-				String camelCase = camelCase(labelValue);
+				final String camelCase = camelCase(labelValue);
 				ignore = true;
 				evpId.setValue(master.getValue(), baseId + camelCase);
 				ignore = false;
@@ -126,7 +128,7 @@ public void handleValueChange(ValueChangeEvent event) {
 	 * @return
 	 */
 	protected static String camelCase(String value) {
-		String[] parts = value.split("\\s+"); //$NON-NLS-1$
+		final String[] parts = value.split("\\s+"); //$NON-NLS-1$
 		String ret = ""; //$NON-NLS-1$
 		boolean first = true;
 		for (String part : parts) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
index f9b79cb676..6bf458481c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Wim Jongman - Maintenance (391086)
+ * IBM Corporation - initial API and implementation
+ * Wim Jongman - Maintenance (391086)
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
@@ -15,11 +15,11 @@
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.Viewer;
 
+@SuppressWarnings("restriction")
 public class PatternFilter extends org.eclipse.e4.ui.workbench.swt.internal.copy.PatternFilter {
 
 	/**
-	 * This constructor will call {@link #setIncludeLeadingWildcard(boolean)}
-	 * with boolean=true.
+	 * This constructor will call {@link #setIncludeLeadingWildcard(boolean)} with boolean=true.
 	 */
 	public PatternFilter() {
 		setIncludeLeadingWildcard(true);
@@ -28,9 +28,9 @@ public PatternFilter() {
 	/**
 	 * Check if the current (leaf) element is a match with the filter text. The
 	 * default behavior checks that the label of the element is a match.
-	 * 
+	 *
 	 * Subclasses should override this method.
-	 * 
+	 *
 	 * @param viewer
 	 *            the viewer that contains the element
 	 * @param element
@@ -40,7 +40,7 @@ public PatternFilter() {
 	@Override
 	protected boolean isLeafMatch(Viewer viewer, Object element) {
 
-		Object labelProvider = ((StructuredViewer) viewer).getLabelProvider();
+		final Object labelProvider = ((StructuredViewer) viewer).getLabelProvider();
 		String labelText = null;
 
 		if (labelProvider instanceof ILabelProvider) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
index e66e52dc02..4187c6490e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ * IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
@@ -29,7 +29,7 @@ public class StringMatcher {
 	protected boolean fHasTrailingStar;
 
 	protected String fSegments[]; // the given pattern is split into * separated
-									// segments
+	// segments
 
 	/* boundary value beyond which we don't need to search in the text */
 	protected int fBound = 0;
@@ -95,9 +95,8 @@ public StringMatcher(String pattern, boolean ignoreCase, boolean ignoreWildCards
 	}
 
 	/**
-	 * Find the first occurrence of the pattern between <code>start</code
-	 * )(inclusive) and <code>end</code>(exclusive).
-	 * 
+	 * Find the first occurrence of the pattern between <code>start</code )(inclusive) and <code>end</code>(exclusive).
+	 *
 	 * @param text
 	 *            the String object to search in
 	 * @param start
@@ -118,7 +117,7 @@ public StringMatcher.Position find(String text, int start, int end) {
 			throw new IllegalArgumentException();
 		}
 
-		int tlen = text.length();
+		final int tlen = text.length();
 		if (start < 0) {
 			start = 0;
 		}
@@ -132,14 +131,14 @@ public StringMatcher.Position find(String text, int start, int end) {
 			return new Position(start, start);
 		}
 		if (fIgnoreWildCards) {
-			int x = posIn(text, start, end);
+			final int x = posIn(text, start, end);
 			if (x < 0) {
 				return null;
 			}
 			return new Position(x, x + fLength);
 		}
 
-		int segCount = fSegments.length;
+		final int segCount = fSegments.length;
 		if (segCount == 0) {
 			return new Position(start, end);
 		}
@@ -148,8 +147,8 @@ public StringMatcher.Position find(String text, int start, int end) {
 		int matchStart = -1;
 		int i;
 		for (i = 0; i < segCount && curPos < end; ++i) {
-			String current = fSegments[i];
-			int nextMatch = regExpPosIn(text, curPos, end, current);
+			final String current = fSegments[i];
+			final int nextMatch = regExpPosIn(text, curPos, end, current);
 			if (nextMatch < 0) {
 				return null;
 			}
@@ -166,7 +165,7 @@ public StringMatcher.Position find(String text, int start, int end) {
 
 	/**
 	 * match the given <code>text</code> with the pattern
-	 * 
+	 *
 	 * @return true if matched otherwise false
 	 * @param text
 	 *            a String object
@@ -182,7 +181,7 @@ public boolean match(String text) {
 	 * Given the starting (inclusive) and the ending (exclusive) positions in
 	 * the <code>text</code>, determine if the given substring matches with
 	 * aPattern
-	 * 
+	 *
 	 * @return true if the specified portion of the text matches the pattern
 	 * @param text
 	 *            a String object that contains the substring to match
@@ -201,9 +200,9 @@ public boolean match(String text, int start, int end) {
 		}
 
 		if (fIgnoreWildCards) {
-			return (end - start == fLength) && fPattern.regionMatches(fIgnoreCase, 0, text, start, fLength);
+			return end - start == fLength && fPattern.regionMatches(fIgnoreCase, 0, text, start, fLength);
 		}
-		int segCount = fSegments.length;
+		final int segCount = fSegments.length;
 		if (segCount == 0 && (fHasLeadingStar || fHasTrailingStar)) {
 			return true;
 		}
@@ -214,7 +213,7 @@ public boolean match(String text, int start, int end) {
 			return start == end;
 		}
 
-		int tlen = text.length();
+		final int tlen = text.length();
 		if (start < 0) {
 			start = 0;
 		}
@@ -223,24 +222,23 @@ public boolean match(String text, int start, int end) {
 		}
 
 		int tCurPos = start;
-		int bound = end - fBound;
+		final int bound = end - fBound;
 		if (bound < 0) {
 			return false;
 		}
 		int i = 0;
 		String current = fSegments[i];
-		int segLength = current.length();
+		final int segLength = current.length();
 
 		/* process first segment */
 		if (!fHasLeadingStar) {
 			if (!regExpRegionMatches(text, start, current, 0, segLength)) {
 				return false;
-			} else {
-				++i;
-				tCurPos = tCurPos + segLength;
 			}
+			++i;
+			tCurPos = tCurPos + segLength;
 		}
-		if ((fSegments.length == 1) && (!fHasLeadingStar) && (!fHasTrailingStar)) {
+		if (fSegments.length == 1 && !fHasLeadingStar && !fHasTrailingStar) {
 			// only one segment to match, no wildcards specified
 			return tCurPos == end;
 		}
@@ -248,7 +246,7 @@ public boolean match(String text, int start, int end) {
 		while (i < segCount) {
 			current = fSegments[i];
 			int currentMatch;
-			int k = current.indexOf(fSingleWildCard);
+			final int k = current.indexOf(fSingleWildCard);
 			if (k < 0) {
 				currentMatch = textPosIn(text, tCurPos, end, current);
 				if (currentMatch < 0) {
@@ -266,7 +264,7 @@ public boolean match(String text, int start, int end) {
 
 		/* process final segment */
 		if (!fHasTrailingStar && tCurPos != end) {
-			int clen = current.length();
+			final int clen = current.length();
 			return regExpRegionMatches(text, end - clen, current, 0, clen);
 		}
 		return i == segCount;
@@ -286,7 +284,7 @@ private void parseNoWildCards() {
 	/**
 	 * Parses the given pattern into segments seperated by wildcard '*'
 	 * characters.
-	 * 
+	 *
 	 * @param p
 	 *            , a String object that is a simple regular expression with '*'
 	 *            and/or '?'
@@ -302,18 +300,18 @@ private void parseWildCards() {
 			}
 		}
 
-		Vector<String> temp = new Vector<String>();
+		final Vector<String> temp = new Vector<String>();
 
 		int pos = 0;
-		StringBuffer buf = new StringBuffer();
+		final StringBuffer buf = new StringBuffer();
 		while (pos < fLength) {
-			char c = fPattern.charAt(pos++);
+			final char c = fPattern.charAt(pos++);
 			switch (c) {
 			case '\\':
 				if (pos >= fLength) {
 					buf.append(c);
 				} else {
-					char next = fPattern.charAt(pos++);
+					final char next = fPattern.charAt(pos++);
 					/* if it's an escape sequence */
 					if (next == '*' || next == '?' || next == '\\') {
 						buf.append(next);
@@ -362,11 +360,11 @@ private void parseWildCards() {
 	 *         found
 	 */
 	protected int posIn(String text, int start, int end) {// no wild card in
-															// pattern
-		int max = end - fLength;
+		// pattern
+		final int max = end - fLength;
 
 		if (!fIgnoreCase) {
-			int i = text.indexOf(fPattern, start);
+			final int i = text.indexOf(fPattern, start);
 			if (i == -1 || i > max) {
 				return -1;
 			}
@@ -395,9 +393,9 @@ protected int posIn(String text, int start, int end) {// no wild card in
 	 *         found
 	 */
 	protected int regExpPosIn(String text, int start, int end, String p) {
-		int plen = p.length();
+		final int plen = p.length();
 
-		int max = end - plen;
+		final int max = end - plen;
 		for (int i = start; i <= max; ++i) {
 			if (regExpRegionMatches(text, i, p, 0, plen)) {
 				return i;
@@ -407,7 +405,7 @@ protected int regExpPosIn(String text, int start, int end, String p) {
 	}
 
 	/**
-	 * 
+	 *
 	 * @return boolean
 	 * @param text
 	 *            a String to match
@@ -424,8 +422,8 @@ protected int regExpPosIn(String text, int start, int end, String p) {
 	 */
 	protected boolean regExpRegionMatches(String text, int tStart, String p, int pStart, int plen) {
 		while (plen-- > 0) {
-			char tchar = text.charAt(tStart++);
-			char pchar = p.charAt(pStart++);
+			final char tchar = text.charAt(tStart++);
+			final char pchar = p.charAt(pStart++);
 
 			/* process wild cards */
 			if (!fIgnoreWildCards) {
@@ -467,11 +465,11 @@ protected boolean regExpRegionMatches(String text, int tStart, String p, int pSt
 	 */
 	protected int textPosIn(String text, int start, int end, String p) {
 
-		int plen = p.length();
-		int max = end - plen;
+		final int plen = p.length();
+		final int max = end - plen;
 
 		if (!fIgnoreCase) {
-			int i = text.indexOf(p, start);
+			final int i = text.indexOf(p, start);
 			if (i == -1 || i > max) {
 				return -1;
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index ece8294e0b..e97ff8a858 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -6,13 +6,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
@@ -47,8 +48,9 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
+@SuppressWarnings("restriction")
 public abstract class AbstractCommandSelectionDialog extends SaveDialogBoundsSettingsDialog {
-	private IModelResource resource;
+	private final IModelResource resource;
 	private TableViewer viewer;
 	protected Messages Messages;
 
@@ -66,12 +68,13 @@ public AbstractCommandSelectionDialog(Shell parentShell, IModelResource resource
 
 	@Override
 	protected Control createDialogArea(Composite parent) {
-		Composite composite = (Composite) super.createDialogArea(parent);
+		final Composite composite = (Composite) super.createDialogArea(parent);
 		getShell().setText(getShellTitle());
 		setTitle(getDialogTitle());
 		setMessage(getDialogMessage());
 
-		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
+		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream(
+			"/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
 
@@ -81,14 +84,14 @@ public void widgetDisposed(DisposeEvent e) {
 			}
 		});
 
-		Composite container = new Composite(composite, SWT.NONE);
+		final Composite container = new Composite(composite, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 		container.setLayout(new GridLayout(2, false));
 
-		Label l = new Label(container, SWT.NONE);
+		final Label l = new Label(container, SWT.NONE);
 		l.setText(Messages.AbstractCommandSelectionDialog_Label_CommandId);
 
-		Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		final Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		new Label(container, SWT.NONE);
@@ -104,10 +107,10 @@ public void doubleClick(DoubleClickEvent event) {
 			}
 		});
 
-		List<EObject> commands = new ArrayList<EObject>();
-		TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
+		final List<EObject> commands = new ArrayList<EObject>();
+		final TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
 		while (it.hasNext()) {
-			EObject o = it.next();
+			final EObject o = it.next();
 			if (o.eClass() == CommandsPackageImpl.Literals.COMMAND) {
 				commands.add(o);
 			}
@@ -129,9 +132,9 @@ protected boolean isParentMatch(Viewer viewer, Object element) {
 
 	@Override
 	protected void okPressed() {
-		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+		final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 		if (!s.isEmpty()) {
-			Command cmd = createStoreCommand(resource.getEditingDomain(), (MCommand) s.getFirstElement());
+			final Command cmd = createStoreCommand(resource.getEditingDomain(), (MCommand) s.getFirstElement());
 			if (cmd.canExecute()) {
 				resource.getEditingDomain().getCommandStack().execute(cmd);
 				super.okPressed();
@@ -150,9 +153,9 @@ private static class LabelProviderImpl extends StyledCellLabelProvider implement
 
 		@Override
 		public void update(final ViewerCell cell) {
-			MCommand cmd = (MCommand) cell.getElement();
+			final MCommand cmd = (MCommand) cell.getElement();
 
-			StyledString styledString = new StyledString();
+			final StyledString styledString = new StyledString();
 			if (cmd.getCommandName() != null) {
 				styledString.append(cmd.getCommandName());
 			}
@@ -173,7 +176,7 @@ public Image getImage(Object element) {
 
 		@Override
 		public String getText(Object element) {
-			MCommand command = (MCommand) element;
+			final MCommand command = (MCommand) element;
 			String s = ""; //$NON-NLS-1$
 			if (command.getCommandName() != null) {
 				s += command.getCommandName();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
index 20ec2d01ff..8647a0282d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
-
+ *
  * Copyright (c) 2010 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -7,8 +7,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 404136, Bug 424730, Bug 436281
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Bug 404136, Bug 424730, Bug 436281
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -22,6 +22,7 @@
 import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -62,19 +63,18 @@
  * A FilteredContributionDialog with additional options for icon resources.
  * Features in include
  * <ul>
- * <li>Rebuilding the viewer when row height decreases. (Workaround for an SWT
- * limitation)
+ * <li>Rebuilding the viewer when row height decreases. (Workaround for an SWT limitation)
  * <li>Icon previews are displace in the first column.
  * <li>Limited the maximum image size.
  * </ul>
  *
  * @author "Steven Spungin"
  *
- * @see @FilteredContributionDialog
+ * @see FilteredContributionDialog
  */
 public abstract class AbstractIconDialogWithScopeAndFilter extends FilteredContributionDialog {
-	private IProject project;
-	private Map<IFile, Image> icons = Collections.synchronizedMap(new HashMap<IFile, Image>());
+	private final IProject project;
+	private final Map<IFile, Image> icons = Collections.synchronizedMap(new HashMap<IFile, Image>());
 
 	static public class Entry {
 		IFile file;
@@ -87,7 +87,7 @@ static public class Entry {
 
 	public AbstractIconDialogWithScopeAndFilter(Shell parentShell, IEclipseContext context) {
 		super(parentShell, context);
-		this.project = context.get(IProject.class);
+		project = context.get(IProject.class);
 	}
 
 	@Override
@@ -112,7 +112,7 @@ protected ClassContributionCollector getCollector() {
 	protected void createOptions(Composite compOptions) {
 		super.createOptions(compOptions);
 
-		Label lblMaxSize = new Label(compOptions, SWT.NONE);
+		final Label lblMaxSize = new Label(compOptions, SWT.NONE);
 		lblMaxSize.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
 		lblMaxSize.setText(Messages.AbstractIconDialogWithScopeAndFilter_maxDisplayedImageSize);
 
@@ -148,9 +148,9 @@ protected void rebuildViewer() {
 
 		((GridData) getViewer().getTable().getLayoutData()).minimumHeight = 100;
 
-		TableViewerColumn colIcon = new TableViewerColumn(getViewer(), SWT.NONE);
+		final TableViewerColumn colIcon = new TableViewerColumn(getViewer(), SWT.NONE);
 		colIcon.getColumn().setText(Messages.AbstractIconDialogWithScopeAndFilter_icon);
-		TableViewerColumn colText = new TableViewerColumn(getViewer(), SWT.NONE);
+		final TableViewerColumn colText = new TableViewerColumn(getViewer(), SWT.NONE);
 		colText.getColumn().setText(Messages.AbstractIconDialogWithScopeAndFilter_details);
 
 		// resize the row height using a MeasureItem listener
@@ -181,14 +181,14 @@ public void update(ViewerCell cell) {
 						in = file.getContents();
 						img = new Image(cell.getControl().getDisplay(), in);
 						icons.put(file, img);
-					} catch (Exception e) {
+					} catch (final Exception e) {
 						// e.printStackTrace();
 						return;
 					} finally {
 						if (in != null) {
 							try {
 								in.close();
-							} catch (IOException e) {
+							} catch (final IOException e) {
 								// TODO Auto-generated catch block
 								// e.printStackTrace();
 							}
@@ -198,32 +198,35 @@ public void update(ViewerCell cell) {
 
 				// scale image if larger then max height
 				// also remember max width for column resizing
-				if (img != null) {
-					double scale1 = ((double) maxDisplayedImageSize) / img.getImageData().height;
-					double scale2 = ((double) maxDisplayedImageSize) / img.getImageData().width;
-					if (scale2 < scale1) {
-						scale1 = scale2;
-					}
-					if (scale1 < 1) {
-						int width = (int) (img.getImageData().width * scale1);
-						if (width == 0)
-							width = 1;
-						int height = (int) (img.getImageData().height * scale1);
-						if (height == 0)
-							height = 1;
-						Image img2 = new Image(img.getDevice(), img.getImageData().scaledTo(width, height));
-						img.dispose();
-						img = img2;
-						icons.put(file, img);
-					}
-					int width = AbstractIconDialogWithScopeAndFilter.this.getViewer().getTable().getColumn(0).getWidth();
-					if (img.getImageData().width > width) {
-						AbstractIconDialogWithScopeAndFilter.this.getViewer().getTable().getColumn(0).setWidth(img.getImageData().width);
+
+				double scale1 = (double) maxDisplayedImageSize / img.getImageData().height;
+				final double scale2 = (double) maxDisplayedImageSize / img.getImageData().width;
+				if (scale2 < scale1) {
+					scale1 = scale2;
+				}
+				if (scale1 < 1) {
+					int width = (int) (img.getImageData().width * scale1);
+					if (width == 0) {
+						width = 1;
 					}
-					int height = img.getImageData().height;
-					if (height > maxImageHeight) {
-						maxImageHeight = height;
+					int height = (int) (img.getImageData().height * scale1);
+					if (height == 0) {
+						height = 1;
 					}
+					final Image img2 = new Image(img.getDevice(), img.getImageData().scaledTo(width, height));
+					img.dispose();
+					img = img2;
+					icons.put(file, img);
+				}
+				final int width = AbstractIconDialogWithScopeAndFilter.this.getViewer().getTable().getColumn(0)
+					.getWidth();
+				if (img.getImageData().width > width) {
+					AbstractIconDialogWithScopeAndFilter.this.getViewer().getTable().getColumn(0)
+					.setWidth(img.getImageData().width);
+				}
+				final int height = img.getImageData().height;
+				if (height > maxImageHeight) {
+					maxImageHeight = height;
 				}
 
 				cell.setImage(img);
@@ -237,7 +240,7 @@ public void update(ViewerCell cell) {
 				IFile file;
 				String installLocation = null;
 				if (cell.getElement() instanceof ContributionData) {
-					ContributionData contributionData = (ContributionData) cell.getElement();
+					final ContributionData contributionData = (ContributionData) cell.getElement();
 					file = new ContributionDataFile(contributionData);
 					installLocation = contributionData.installLocation;
 				} else if (cell.getElement() instanceof Entry) {
@@ -246,8 +249,8 @@ public void update(ViewerCell cell) {
 				} else {
 					file = (IFile) cell.getElement();
 				}
-				StyledString styledString = new StyledString(file.getProjectRelativePath().toString(), null);
-				String bundle = FilteredContributionDialog.getBundle(file);
+				final StyledString styledString = new StyledString(file.getProjectRelativePath().toString(), null);
+				final String bundle = FilteredContributionDialog.getBundle(file);
 				if (bundle != null) {
 					styledString.append(" - " + bundle, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 				} else if (installLocation != null) {
@@ -271,7 +274,7 @@ public void widgetDisposed(DisposeEvent e) {
 
 	@Override
 	protected Control createDialogArea(Composite parent) {
-		Composite comp = (Composite) super.createDialogArea(parent);
+		final Composite comp = (Composite) super.createDialogArea(parent);
 		maxDisplayedImageSize = 20;
 		rebuildViewer();
 
@@ -289,35 +292,34 @@ protected boolean doSearch() {
 		// getSearchScopes().contains(SearchScope.WORKSPACE)) {
 		if (getSearchScopes().contains(ResourceSearchScope.TARGET_PLATFORM)) {
 			return false;
-		} else {
-			Timer timer = new Timer(true);
+		}
+		final Timer timer = new Timer(true);
 
-			if (callback != null) {
-				callback.cancel = true;
-			}
-			if (task != null) {
-				task.cancel();
-			}
-			task = null;
-
-			clearImages();
-
-			callback = new IconMatchCallback((IObservableList) getViewer().getInput());
-			Filter filter = new Filter(project, getFilterTextBox().getText());
-			filter.setSearchScope(getSearchScopes());
-			filter.setBundles(getFilterBundles());
-			filter.setLocations(getFilterLocations());
-			filter.setPackages(getFilterPackages());
-			filter.setIncludeNonBundles(includeNonBundles);
-			task = new SearchThread(callback, filter);
-			timer.schedule(task, 500);
-			// }
-			return true;
+		if (callback != null) {
+			callback.cancel = true;
+		}
+		if (task != null) {
+			task.cancel();
 		}
+		task = null;
+
+		clearImages();
+
+		callback = new IconMatchCallback((IObservableList) getViewer().getInput());
+		final Filter filter = new Filter(project, getFilterTextBox().getText());
+		filter.setSearchScope(getSearchScopes());
+		filter.setBundles(getFilterBundles());
+		filter.setLocations(getFilterLocations());
+		filter.setPackages(getFilterPackages());
+		filter.setIncludeNonBundles(includeNonBundles);
+		task = new SearchThread(callback, filter);
+		timer.schedule(task, 500);
+		// }
+		return true;
 	}
 
 	private void clearImages() {
-		for (Image img : icons.values()) {
+		for (final Image img : icons.values()) {
 			img.dispose();
 		}
 		icons.clear();
@@ -330,13 +332,13 @@ protected void okPressed() {
 		if (file != null) {
 			String installLocation = null;
 			if (file instanceof ContributionDataFile) {
-				ContributionDataFile cdf = (ContributionDataFile) file;
+				final ContributionDataFile cdf = (ContributionDataFile) file;
 				installLocation = cdf.getContributionData().installLocation;
 
 			}
 			file = checkResourceAccessible(file, installLocation);
 			if (file != null) {
-				String bundle = getBundle(file);
+				final String bundle = getBundle(file);
 				String uri;
 				uri = "platform:/plugin/" + bundle + "/" + file.getProjectRelativePath().toString(); //$NON-NLS-1$ //$NON-NLS-2$
 				returnValue = uri;
@@ -347,7 +349,7 @@ protected void okPressed() {
 
 	private class IconMatchCallback {
 		private volatile boolean cancel;
-		private IObservableList list;
+		private final IObservableList list;
 
 		private IconMatchCallback(IObservableList list) {
 			this.list = list;
@@ -359,7 +361,7 @@ public void match(final IFile file, final String installLocation) {
 
 					@Override
 					public void run() {
-						Entry entry = new Entry();
+						final Entry entry = new Entry();
 						entry.file = file;
 						entry.installLocation = installLocation;
 						list.add(entry);
@@ -374,13 +376,13 @@ private static class SearchThread extends TimerTask {
 		private final StringMatcher matcherGif;
 		private final StringMatcher matcherJpg;
 		private final StringMatcher matcherPng;
-		private Filter filter;
+		private final Filter filter;
 		private boolean includeNonBundles;
 
 		public SearchThread(IconMatchCallback callback, Filter filter) {
-			this.matcherGif = new StringMatcher("*" + filter.namePattern + "*.gif", true, false); //$NON-NLS-1$//$NON-NLS-2$
-			this.matcherJpg = new StringMatcher("*" + filter.namePattern + "*.jpg", true, false); //$NON-NLS-1$//$NON-NLS-2$
-			this.matcherPng = new StringMatcher("*" + filter.namePattern + "*.png", true, false); //$NON-NLS-1$//$NON-NLS-2$
+			matcherGif = new StringMatcher("*" + filter.namePattern + "*.gif", true, false); //$NON-NLS-1$//$NON-NLS-2$
+			matcherJpg = new StringMatcher("*" + filter.namePattern + "*.jpg", true, false); //$NON-NLS-1$//$NON-NLS-2$
+			matcherPng = new StringMatcher("*" + filter.namePattern + "*.png", true, false); //$NON-NLS-1$//$NON-NLS-2$
 			this.callback = callback;
 			this.filter = filter;
 		}
@@ -399,10 +401,10 @@ public void run() {
 					projects = new ArrayList<IProject>();
 					projects.add(filter.project);
 					try {
-						for (IProject ref : filter.project.getReferencedProjects()) {
+						for (final IProject ref : filter.project.getReferencedProjects()) {
 							projects.add(ref);
 						}
-					} catch (CoreException e) {
+					} catch (final CoreException e) {
 						e.printStackTrace();
 					}
 				} else {
@@ -429,10 +431,11 @@ public boolean visit(IResource resource) throws CoreException {
 							if (resource.getType() == IResource.FOLDER || resource.getType() == IResource.PROJECT) {
 								return true;
 							} else if (resource.getType() == IResource.FILE && !resource.isLinked()) {
-								String path = resource.getProjectRelativePath().toString();
+								final String path = resource.getProjectRelativePath().toString();
 								if (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path)) {
 									if (E.notEmpty(filter.getPackages())) {
-										if (!filter.getPackages().contains(resource.getProjectRelativePath().removeLastSegments(1).toOSString())) {
+										if (!filter.getPackages().contains(
+											resource.getProjectRelativePath().removeLastSegments(1).toOSString())) {
 											return false;
 										}
 									}
@@ -442,13 +445,13 @@ public boolean visit(IResource resource) throws CoreException {
 										}
 									}
 									if (E.notEmpty(filter.getBundles())) {
-										String bundle = getBundle(project);
+										final String bundle = getBundle(project);
 										if (bundle == null || !filter.getBundles().contains(bundle)) {
 											return false;
 										}
 									}
 									if (!filter.isIncludeNonBundles()) {
-										String bundle = getBundle(project);
+										final String bundle = getBundle(project);
 										if (bundle == null) {
 											return false;
 										}
@@ -462,7 +465,7 @@ public boolean visit(IResource resource) throws CoreException {
 
 					});
 				}
-			} catch (CoreException e) {
+			} catch (final CoreException e) {
 				e.printStackTrace();
 			}
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
index 1fcde1e2e4..2abd149a21 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
@@ -6,13 +6,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Nicolaj Hoess <nicohoess@gmail.com> - initial implementation (Bug 396975)
- *     Andrej Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 396975, 395283
- *     Adrian Alcaide - initial implementation (Bug 396975)
+ * Nicolaj Hoess <nicohoess@gmail.com> - initial implementation (Bug 396975)
+ * Andrej Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 396975, 395283
+ * Adrian Alcaide - initial implementation (Bug 396975)
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import java.util.List;
+
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
@@ -43,7 +44,8 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-public abstract class AbstractIdDialog<ContributionClass, ElementClass extends MApplicationElement> extends SaveDialogBoundsSettingsDialog {
+public abstract class AbstractIdDialog<ContributionClass, ElementClass extends MApplicationElement> extends
+	SaveDialogBoundsSettingsDialog {
 
 	protected EModelService modelService;
 
@@ -53,7 +55,8 @@ public abstract class AbstractIdDialog<ContributionClass, ElementClass extends M
 	protected ContributionClass contribution;
 	protected Messages messages;
 
-	public AbstractIdDialog(Shell parentShell, IModelResource resource, ContributionClass toolbarContribution, EditingDomain domain, EModelService modelService, Messages Messages) {
+	public AbstractIdDialog(Shell parentShell, IModelResource resource, ContributionClass toolbarContribution,
+		EditingDomain domain, EModelService modelService, Messages Messages) {
 		super(parentShell);
 		this.resource = resource;
 		this.modelService = modelService;
@@ -86,13 +89,16 @@ protected IBaseLabelProvider getLabelProvider() {
 
 			@Override
 			public void update(ViewerCell cell) {
-				ElementClass el = (ElementClass) cell.getElement();
-				String elementId = (el.getElementId() != null && el.getElementId().trim().length() > 0) ? el.getElementId() : "(Id missing)"; //$NON-NLS-1$
-				StyledString str = new StyledString(elementId);
+				final ElementClass el = (ElementClass) cell.getElement();
+				final String elementId = el.getElementId() != null && el.getElementId().trim().length() > 0 ? el
+					.getElementId() : "(Id missing)"; //$NON-NLS-1$
+				final StyledString str = new StyledString(elementId);
 
-				String infoString = getListItemInformation(el);
+				final String infoString = getListItemInformation(el);
 				if (infoString != null && infoString.trim().length() > 0)
+				{
 					str.append(" - " + getListItemInformation(el), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+				}
 
 				cell.setText(str.getString());
 				cell.setStyleRanges(str.getStyleRanges());
@@ -105,18 +111,19 @@ protected Control createDialogArea(Composite parent) {
 		getShell().setText(getShellTitle());
 		setTitle(getDialogTitle());
 		setMessage(getDialogMessage());
-		Composite comp = (Composite) super.createDialogArea(parent);
-		Composite container = new Composite(comp, SWT.NONE);
+		final Composite comp = (Composite) super.createDialogArea(parent);
+		final Composite container = new Composite(comp, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 		container.setLayout(new GridLayout(2, false));
 
 		Label l = new Label(container, SWT.NONE);
 		l.setText(getLabelText());
 
-		Text idField = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		final Text idField = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		idField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		final PatternFilter filter = new PatternFilter() {
+			@SuppressWarnings("restriction")
 			@Override
 			protected boolean isParentMatch(Viewer viewer, Object element) {
 				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);
@@ -146,8 +153,8 @@ public void doubleClick(DoubleClickEvent event) {
 	@Override
 	protected void okPressed() {
 		if (!viewer.getSelection().isEmpty()) {
-			ElementClass el = (ElementClass) ((IStructuredSelection) viewer.getSelection()).getFirstElement();
-			Command cmd = SetCommand.create(domain, contribution, getFeatureLiteral(), el.getElementId());
+			final ElementClass el = (ElementClass) ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+			final Command cmd = SetCommand.create(domain, contribution, getFeatureLiteral(), el.getElementId());
 			if (cmd.canExecute()) {
 				domain.getCommandStack().execute(cmd);
 				super.okPressed();
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 073063eb25..8830165068 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
 Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x",
+Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.emf.ui",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",

From fb849c93d3fdbf12d5166d190284d20b9e1fb662 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Fri, 21 Nov 2014 17:10:35 +0100
Subject: [PATCH 0856/1286] Bug 444692 - Remove Warnings - configured
 dependencies and exports

---
 .../META-INF/MANIFEST.MF                      | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 207e185a48..786510c910 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -36,28 +36,27 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.9.0",
  org.eclipse.jdt.core,
  org.eclipse.pde.core,
- org.eclipse.e4.core.commands
+ org.eclipse.e4.core.commands;bundle-version="0.10.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.0.0",
  javax.inject;version="1.0.0",
- org.eclipse.core.runtime.jobs,
  org.osgi.framework;version="1.5.0"
-Export-Package: org.eclipse.e4.tools.emf.ui.common;x-friends:="org.eclipse.e4.tools.emf.liveeditor,org.eclipse.e4.tools.emf.editor3x",
- org.eclipse.e4.tools.emf.ui.common.component;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.common;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.common.component;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.common.objectdata;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.common.properties;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.common.uistructure;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.common.xml;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.handlers;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.imp;x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.wbm;x-friends:="org.eclipse.e4.tools.emf.editor,org.eclipse.e4.tools.emf.liveeditor"
+Export-Package: org.eclipse.e4.tools.emf.ui.common;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.liveeditor,org.eclipse.e4.tools.emf.editor3x",
+ org.eclipse.e4.tools.emf.ui.common.component;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.component;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.objectdata;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.properties;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.uistructure;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.common.xml;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.handlers;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.imp;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.emf.ui.internal.wbm;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor,org.eclipse.e4.tools.emf.liveeditor"
 Service-Component: OSGI-INF/contributioncollector.xml, OSGI-INF/resourceprovider.xml

From b742b43910b4f34528445c49375ba07694b38c9c Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Sun, 23 Nov 2014 20:52:58 +0100
Subject: [PATCH 0857/1286] Bug 444692 - Remove Warnings

---
 .../common/component/AddonsEditor.java        |  59 ++--
 .../common/component/ApplicationEditor.java   | 229 +++++++++-------
 .../internal/common/component/AreaEditor.java | 140 ++++++----
 .../component/BindingContextEditor.java       |  61 +++--
 .../common/component/BindingTableEditor.java  |  78 ++++--
 .../common/component/CategoryEditor.java      |  34 ++-
 .../common/component/CommandEditor.java       |  85 +++---
 .../component/CommandParameterEditor.java     |  42 ++-
 .../common/component/CompositePartEditor.java | 181 +++++++-----
 .../common/component/ControlFactory.java      | 257 +++++++++++-------
 .../component/CoreExpressionEditor.java       |  31 ++-
 .../common/component/DialogEditor.java        |  12 +-
 .../component/DirectMenuItemEditor.java       |  56 ++--
 .../component/DirectToolItemEditor.java       |  51 ++--
 14 files changed, 804 insertions(+), 512 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index fa44114cb3..e5b7a76f54 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -6,13 +6,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 424730
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -57,6 +58,7 @@
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
+@SuppressWarnings("restriction")
 public class AddonsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
@@ -87,7 +89,7 @@ public String getLabel(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MContribution contrib = (MContribution) element;
+		final MContribution contrib = (MContribution) element;
 		if (contrib.getContributionURI() != null && contrib.getContributionURI().trim().length() > 0) {
 			return contrib.getContributionURI().substring(contrib.getContributionURI().lastIndexOf('/') + 1);
 		}
@@ -132,8 +134,9 @@ public Composite doGetEditor(Composite parent, Object object) {
 		return composite;
 	}
 
-	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master,
+		boolean isImport) {
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -141,7 +144,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -153,11 +156,14 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		final Link lnk;
 		// ------------------------------------------------------------
 		{
-			final IContributionClassCreator c = getEditor().getContributionCreator(ApplicationPackageImpl.Literals.ADDON);
+			final IContributionClassCreator c = getEditor().getContributionCreator(
+				ApplicationPackageImpl.Literals.ADDON);
 			if (project != null && c != null) {
 				lnk = new Link(parent, SWT.NONE);
 				lnk.setText("<A>" + Messages.PartEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
@@ -165,17 +171,18 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 				lnk.addSelectionListener(new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
-						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, lnk.getShell());
+						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project,
+							lnk.getShell());
 					}
 				});
 			} else {
 				lnk = null;
-				Label l = new Label(parent, SWT.NONE);
+				final Label l = new Label(parent, SWT.NONE);
 				l.setText(Messages.AddonsEditor_ClassURI);
 				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 			}
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.addModifyListener(new ModifyListener() {
@@ -183,11 +190,16 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void modifyText(ModifyEvent e) {
 					if (lnk != null) {
-						lnk.setToolTipText(((Text) (e.getSource())).getText());
+						lnk.setToolTipText(((Text) e.getSource()).getText());
 					}
 				}
 			});
-			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
+			final Binding binding = context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(),
+					ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()),
+				new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+				new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
@@ -196,13 +208,16 @@ public void modifyText(ModifyEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
+						getEditingDomain(), (MContribution) getMaster().getValue(),
+						ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
 		}
 
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -210,7 +225,8 @@ public void widgetSelected(SelectionEvent e) {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.AddonsEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.AddonsEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createInstanceInspection(folder);
@@ -224,14 +240,15 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	private void createInstanceInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeContributionInstance);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		ObjectViewer objectViewer = new ObjectViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
+		final ObjectViewer objectViewer = new ObjectViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container,
+			ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index c82605c66b..72e4bd4052 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -15,8 +15,10 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -82,32 +84,45 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+@SuppressWarnings("restriction")
 public class ApplicationEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
-	private IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES);
-	private IListProperty APPLICATION__COMMANDS = EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__COMMANDS);
+	private final IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties
+		.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
+	private final IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties
+		.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES);
+	private final IListProperty APPLICATION__COMMANDS = EMFProperties
+		.list(ApplicationPackageImpl.Literals.APPLICATION__COMMANDS);
 	// private IListProperty APPLICATION__DIALOGS =
 	// EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__DIALOGS);
-	private IListProperty PART_DESCRIPTOR_CONTAINER__DESCRIPTORS = EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS);
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private IListProperty APPLICATION__ADDONS = EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__ADDONS);
-	private IListProperty MENU_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS);
-	private IListProperty TOOLBAR_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS);
-	private IListProperty TRIM_CONTRIBUTIONS = EMFProperties.list(MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS);
-	private IListProperty APPLICATION__SNIPPETS = EMFProperties.list(UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS);
-	private IListProperty APPLICATION__CATEGORIES = EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES);
-
-	private IListProperty BINDING_TABLE_CONTAINER__ROOT_CONTEXT = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT);
+	private final IListProperty PART_DESCRIPTOR_CONTAINER__DESCRIPTORS = EMFProperties
+		.list(BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS);
+	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
+		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private final IListProperty APPLICATION__ADDONS = EMFProperties
+		.list(ApplicationPackageImpl.Literals.APPLICATION__ADDONS);
+	private final IListProperty MENU_CONTRIBUTIONS = EMFProperties
+		.list(MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS);
+	private final IListProperty TOOLBAR_CONTRIBUTIONS = EMFProperties
+		.list(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS);
+	private final IListProperty TRIM_CONTRIBUTIONS = EMFProperties
+		.list(MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS);
+	private final IListProperty APPLICATION__SNIPPETS = EMFProperties
+		.list(UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS);
+	private final IListProperty APPLICATION__CATEGORIES = EMFProperties
+		.list(ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES);
+
+	private final IListProperty BINDING_TABLE_CONTAINER__ROOT_CONTEXT = EMFProperties
+		.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT);
 
 	@Inject
 	@Optional
 	private IProject project;
 
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	public ApplicationEditor() {
@@ -130,7 +145,8 @@ public List<Action> getActions(Object element) {
 	}
 
 	void doCreateCommandWizard() {
-		WizardDialog dialog = new WizardDialog(composite.getShell(), new CommandWizard((MApplication) getMaster().getValue()));
+		final WizardDialog dialog = new WizardDialog(composite.getShell(), new CommandWizard((MApplication) getMaster()
+			.getValue()));
 		dialog.open();
 	}
 
@@ -139,9 +155,8 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			if (((MUIElement) element).isToBeRendered()) {
 				return createImage(ResourceProvider.IMG_Application);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_Application);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_Application);
 		}
 		return null;
 	}
@@ -168,7 +183,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	protected Composite createForm(Composite parent, EMFDataBindingContext context) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -176,18 +191,24 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp,
+			EMFEditProperties
+			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.ApplicationEditor_BindingContexts);
 
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -195,10 +216,15 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.AddonsEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+			context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables,
+			UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.AddonsEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -212,21 +238,23 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 	}
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
+			getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
 	@Override
 	public IObservableList getChildList(final Object element) {
 		final WritableList list = new WritableList();
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_ADDONS, APPLICATION__ADDONS, element, Messages.ApplicationEditor_Addons) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_ADDONS, APPLICATION__ADDONS, element,
+			Messages.ApplicationEditor_Addons) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -235,7 +263,8 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_ROOT_CONTEXTS, BINDING_TABLE_CONTAINER__ROOT_CONTEXT, element, Messages.ApplicationEditor_RootContexts) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_ROOT_CONTEXTS, BINDING_TABLE_CONTAINER__ROOT_CONTEXT,
+			element, Messages.ApplicationEditor_RootContexts) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -244,7 +273,8 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element, Messages.ApplicationEditor_BindingTables) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element,
+			Messages.ApplicationEditor_BindingTables) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -253,7 +283,8 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.ApplicationEditor_Handlers) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element,
+			Messages.ApplicationEditor_Handlers) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -262,7 +293,8 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_COMMAND, APPLICATION__COMMANDS, element, Messages.ApplicationEditor_Commands) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_COMMAND, APPLICATION__COMMANDS, element,
+			Messages.ApplicationEditor_Commands) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -270,7 +302,8 @@ protected boolean accepted(Object o) {
 			}
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_CATEGORIES, APPLICATION__CATEGORIES, element, Messages.ApplicationEditor_Categories) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_CATEGORIES, APPLICATION__CATEGORIES, element,
+			Messages.ApplicationEditor_Categories) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -278,7 +311,8 @@ protected boolean accepted(Object o) {
 			}
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_APPLICATION_WINDOWS, ELEMENT_CONTAINER__CHILDREN, element, Messages.ApplicationEditor_Windows) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_APPLICATION_WINDOWS, ELEMENT_CONTAINER__CHILDREN,
+			element, Messages.ApplicationEditor_Windows) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -287,7 +321,8 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PART_DESCRIPTORS, PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, element, Messages.ApplicationEditor_PartDescriptors) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PART_DESCRIPTORS, PART_DESCRIPTOR_CONTAINER__DESCRIPTORS,
+			element, Messages.ApplicationEditor_PartDescriptors) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -296,27 +331,31 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MENU_CONTRIBUTIONS, MENU_CONTRIBUTIONS, element, Messages.ApplicationEditor_MenuContributions) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MENU_CONTRIBUTIONS, MENU_CONTRIBUTIONS, element,
+			Messages.ApplicationEditor_MenuContributions) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
 			}
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_TOOLBAR_CONTRIBUTIONS, TOOLBAR_CONTRIBUTIONS, element, Messages.ApplicationEditor_ToolBarContributions) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_TOOLBAR_CONTRIBUTIONS, TOOLBAR_CONTRIBUTIONS, element,
+			Messages.ApplicationEditor_ToolBarContributions) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
 			}
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_TRIM_CONTRIBUTIONS, TRIM_CONTRIBUTIONS, element, Messages.ApplicationEditor_TrimContributions) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_TRIM_CONTRIBUTIONS, TRIM_CONTRIBUTIONS, element,
+			Messages.ApplicationEditor_TrimContributions) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
 			}
 		});
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_SNIPPETS, APPLICATION__SNIPPETS, element, Messages.ApplicationEditor_Snippets) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_SNIPPETS, APPLICATION__SNIPPETS, element,
+			Messages.ApplicationEditor_Snippets) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
@@ -362,7 +401,7 @@ public FeaturePath[] getLabelProperties() {
 	}
 
 	class CommandWizard extends Wizard {
-		private MApplication application;
+		private final MApplication application;
 
 		private HandlerCommandPage handlerPage;
 		private KeybindingPage keyPage;
@@ -376,7 +415,8 @@ public CommandWizard(MApplication application) {
 		@Override
 		public void addPages() {
 			getShell().setText(Messages.CommandWizard_ShellTitle);
-			setDefaultPageImageDescriptor(ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Wizban16_newexp_wiz)));
+			setDefaultPageImageDescriptor(ImageDescriptor.createFromImage(resourcePool
+				.getImageUnchecked(ResourceProvider.IMG_Wizban16_newexp_wiz)));
 			handlerPage = new HandlerCommandPage(Messages.ApplicationEditor_HandlerAndCommand);
 			addPage(handlerPage);
 
@@ -393,13 +433,13 @@ public void addPages() {
 		@Override
 		public boolean performFinish() {
 
-			MCommand command = CommandsFactoryImpl.eINSTANCE.createCommand();
-			MHandler handler = CommandsFactoryImpl.eINSTANCE.createHandler();
+			final MCommand command = CommandsFactoryImpl.eINSTANCE.createCommand();
+			final MHandler handler = CommandsFactoryImpl.eINSTANCE.createHandler();
 			MKeyBinding keyBinding = null;
 
-			String parentId = application.getElementId();
+			final String parentId = application.getElementId();
 
-			String prefix = parentId != null && parentId.trim().length() > 0 ? parentId + "." : ""; //$NON-NLS-1$ //$NON-NLS-2$
+			final String prefix = parentId != null && parentId.trim().length() > 0 ? parentId + "." : ""; //$NON-NLS-1$ //$NON-NLS-2$
 
 			if (handlerPage.idField.getText().trim().length() > 0) {
 				command.setElementId(prefix + "commands." + handlerPage.idField.getText().trim()); //$NON-NLS-1$
@@ -418,12 +458,16 @@ public boolean performFinish() {
 			command.setCommandName(handlerPage.nameField.getText());
 			handler.setCommand(command);
 
-			CompoundCommand cmd = new CompoundCommand();
-			cmd.append(AddCommand.create(getEditingDomain(), application, ApplicationPackageImpl.Literals.APPLICATION__COMMANDS, command));
-			cmd.append(AddCommand.create(getEditingDomain(), application, CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, handler));
+			final CompoundCommand cmd = new CompoundCommand();
+			cmd.append(AddCommand.create(getEditingDomain(), application,
+				ApplicationPackageImpl.Literals.APPLICATION__COMMANDS, command));
+			cmd.append(AddCommand.create(getEditingDomain(), application,
+				CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, handler));
 
 			if (keyBinding != null) {
-				cmd.append(AddCommand.create(getEditingDomain(), ((IStructuredSelection) keyPage.bindtableViewer.getSelection()).getFirstElement(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, keyBinding));
+				cmd.append(AddCommand.create(getEditingDomain(),
+					((IStructuredSelection) keyPage.bindtableViewer.getSelection()).getFirstElement(),
+					CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, keyBinding));
 			}
 
 			if (cmd.canExecute()) {
@@ -448,12 +492,12 @@ public void createControl(Composite parent) {
 			setTitle(Messages.ApplicationEditor_Command_Slash_Handler);
 			setMessage(Messages.ApplicationEditor_InsertInfosForCommandAndHandler);
 
-			Composite group = new Composite(parent, SWT.NONE);
+			final Composite group = new Composite(parent, SWT.NONE);
 			group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			group.setLayout(new GridLayout(3, false));
 
 			{
-				Label l = new Label(group, SWT.NONE);
+				final Label l = new Label(group, SWT.NONE);
 				l.setText(Messages.ApplicationEditor_Id);
 
 				idField = new Text(group, SWT.BORDER);
@@ -461,7 +505,7 @@ public void createControl(Composite parent) {
 			}
 
 			{
-				Label l = new Label(group, SWT.NONE);
+				final Label l = new Label(group, SWT.NONE);
 				l.setText(Messages.ApplicationEditor_Name + "*"); //$NON-NLS-1$
 
 				nameField = new Text(group, SWT.BORDER);
@@ -476,13 +520,13 @@ public void modifyText(ModifyEvent e) {
 			}
 
 			{
-				Label l = new Label(group, SWT.NONE);
+				final Label l = new Label(group, SWT.NONE);
 				l.setText(Messages.ApplicationEditor_Class);
 
-				Text t = new Text(group, SWT.BORDER);
+				final Text t = new Text(group, SWT.BORDER);
 				t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
-				Button b = new Button(group, SWT.PUSH | SWT.FLAT);
+				final Button b = new Button(group, SWT.PUSH | SWT.FLAT);
 				b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			}
 
@@ -499,7 +543,7 @@ class KeybindingPage extends WizardPage {
 
 		private Text keyField;
 		private TableViewer bindtableViewer;
-		private MApplication application;
+		private final MApplication application;
 
 		public KeybindingPage(String pageName, MApplication application) {
 			super(pageName);
@@ -511,12 +555,12 @@ public void createControl(Composite parent) {
 			setTitle(Messages.ApplicationEditor_Keybinding);
 			setMessage(Messages.ApplicationEditor_InsertInfosForKeybinding);
 
-			Composite group = new Composite(parent, SWT.NONE);
+			final Composite group = new Composite(parent, SWT.NONE);
 			group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			group.setLayout(new GridLayout(2, false));
 
 			{
-				Label l = new Label(group, SWT.NONE);
+				final Label l = new Label(group, SWT.NONE);
 				l.setText(Messages.ApplicationEditor_Sequence);
 
 				keyField = new Text(group, SWT.BORDER);
@@ -532,7 +576,7 @@ public void modifyText(ModifyEvent e) {
 			}
 
 			{
-				Label l = new Label(group, SWT.NONE);
+				final Label l = new Label(group, SWT.NONE);
 				l.setText(Messages.ApplicationEditor_BindingTable);
 				l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
@@ -548,7 +592,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 					}
 				});
 				bindtableViewer.setSelection(new StructuredSelection(application.getBindingTables().get(0)));
-				GridData gd = new GridData(GridData.FILL_BOTH);
+				final GridData gd = new GridData(GridData.FILL_BOTH);
 				gd.heightHint = bindtableViewer.getTable().getItemHeight() * 5;
 				bindtableViewer.getControl().setLayoutData(gd);
 				bindtableViewer.getControl().setEnabled(false);
@@ -561,14 +605,13 @@ public void selectionChanged(SelectionChangedEvent event) {
 		public boolean isPageComplete() {
 			if (keyField.getText().trim().length() == 0) {
 				return true;
-			} else {
-				return !bindtableViewer.getSelection().isEmpty();
 			}
+			return !bindtableViewer.getSelection().isEmpty();
 		}
 	}
 
 	class MenuWizardPage extends WizardPage {
-		private MApplication application;
+		private final MApplication application;
 		private Text labelField;
 		private Text iconField;
 		private ComboViewer typeViewer;
@@ -584,12 +627,12 @@ public void createControl(Composite parent) {
 			setTitle(Messages.ApplicationEditor_HandledMenuItem);
 			setMessage(Messages.ApplicationEditor_InertInfosForAHandledMenuItem);
 
-			Composite group = new Composite(parent, SWT.NONE);
+			final Composite group = new Composite(parent, SWT.NONE);
 			group.setLayout(new GridLayout(2, false));
 			group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 			{
-				Label l = new Label(group, SWT.NONE);
+				final Label l = new Label(group, SWT.NONE);
 				l.setText(Messages.ApplicationEditor_Label);
 
 				labelField = new Text(group, SWT.BORDER);
@@ -597,7 +640,7 @@ public void createControl(Composite parent) {
 			}
 
 			{
-				Label l = new Label(group, SWT.NONE);
+				final Label l = new Label(group, SWT.NONE);
 				l.setText(Messages.ApplicationEditor_Icon);
 
 				iconField = new Text(group, SWT.BORDER);
@@ -605,7 +648,7 @@ public void createControl(Composite parent) {
 			}
 
 			{
-				Label l = new Label(group, SWT.NONE);
+				final Label l = new Label(group, SWT.NONE);
 				l.setText(Messages.ApplicationEditor_Type);
 
 				typeViewer = new ComboViewer(group, SWT.READ_ONLY);
@@ -615,7 +658,7 @@ public void createControl(Composite parent) {
 			}
 
 			{
-				Label l = new Label(group, SWT.NONE);
+				final Label l = new Label(group, SWT.NONE);
 				l.setText(Messages.ApplicationEditor_Parent);
 				l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
@@ -623,10 +666,10 @@ public void createControl(Composite parent) {
 				menuViewer.setLabelProvider(new HiearchyLabelProvider());
 				menuViewer.setContentProvider(new ArrayContentProvider());
 
-				List<MMenu> menuList = new ArrayList<MMenu>();
-				Iterator<EObject> it = EcoreUtil.getAllContents(Collections.singleton(application));
+				final List<MMenu> menuList = new ArrayList<MMenu>();
+				final Iterator<EObject> it = EcoreUtil.getAllContents(Collections.singleton(application));
 				while (it.hasNext()) {
-					EObject o = it.next();
+					final EObject o = it.next();
 					if (MenuPackageImpl.Literals.MENU.isSuperTypeOf(o.eClass())) {
 						menuList.add((MMenu) o);
 					}
@@ -639,7 +682,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 						setPageComplete(isPageComplete());
 					}
 				});
-				GridData gd = new GridData(GridData.FILL_BOTH);
+				final GridData gd = new GridData(GridData.FILL_BOTH);
 				gd.heightHint = menuViewer.getTable().getItemHeight() * 5;
 				menuViewer.getControl().setLayoutData(gd);
 				menuViewer.setSelection(new StructuredSelection(menuList.get(0)));
@@ -652,14 +695,13 @@ public void selectionChanged(SelectionChangedEvent event) {
 		public boolean isPageComplete() {
 			if (labelField.getText().trim().length() == 0 && iconField.getText().trim().length() == 0) {
 				return true;
-			} else {
-				return !menuViewer.getSelection().isEmpty();
 			}
+			return !menuViewer.getSelection().isEmpty();
 		}
 	}
 
 	class ToolbarWizardPage extends WizardPage {
-		private MApplication application;
+		private final MApplication application;
 		private Text labelField;
 		private Text iconField;
 		private ComboViewer typeViewer;
@@ -675,12 +717,12 @@ public void createControl(Composite parent) {
 			setTitle(Messages.ApplicationEditor_HandledToolbarItem);
 			setMessage(Messages.ApplicationEditor_InsertInfosForAToolbarItem);
 
-			Composite group = new Composite(parent, SWT.NONE);
+			final Composite group = new Composite(parent, SWT.NONE);
 			group.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false, 2, 1));
 			group.setLayout(new GridLayout(2, false));
 
 			{
-				Label l = new Label(group, SWT.NONE);
+				final Label l = new Label(group, SWT.NONE);
 				l.setText(Messages.ApplicationEditor_Label);
 
 				labelField = new Text(group, SWT.BORDER);
@@ -688,7 +730,7 @@ public void createControl(Composite parent) {
 			}
 
 			{
-				Label l = new Label(group, SWT.NONE);
+				final Label l = new Label(group, SWT.NONE);
 				l.setText(Messages.ApplicationEditor_Icon);
 
 				iconField = new Text(group, SWT.BORDER);
@@ -696,7 +738,7 @@ public void createControl(Composite parent) {
 			}
 
 			{
-				Label l = new Label(group, SWT.NONE);
+				final Label l = new Label(group, SWT.NONE);
 				l.setText(Messages.ApplicationEditor_Type);
 
 				typeViewer = new ComboViewer(group, SWT.READ_ONLY);
@@ -706,7 +748,7 @@ public void createControl(Composite parent) {
 			}
 
 			{
-				Label l = new Label(group, SWT.NONE);
+				final Label l = new Label(group, SWT.NONE);
 				l.setText(Messages.ApplicationEditor_Parent);
 				l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
@@ -714,10 +756,10 @@ public void createControl(Composite parent) {
 				toolbarViewer.setLabelProvider(new HiearchyLabelProvider());
 				toolbarViewer.setContentProvider(new ArrayContentProvider());
 
-				List<MToolBar> toolbarList = new ArrayList<MToolBar>();
-				Iterator<EObject> it = EcoreUtil.getAllContents(Collections.singleton(application));
+				final List<MToolBar> toolbarList = new ArrayList<MToolBar>();
+				final Iterator<EObject> it = EcoreUtil.getAllContents(Collections.singleton(application));
 				while (it.hasNext()) {
-					EObject o = it.next();
+					final EObject o = it.next();
 					if (MenuPackageImpl.Literals.TOOL_BAR.isSuperTypeOf(o.eClass())) {
 						toolbarList.add((MToolBar) o);
 					}
@@ -730,7 +772,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 						setPageComplete(isPageComplete());
 					}
 				});
-				GridData gd = new GridData(GridData.FILL_BOTH);
+				final GridData gd = new GridData(GridData.FILL_BOTH);
 				gd.heightHint = toolbarViewer.getTable().getItemHeight() * 5;
 				toolbarViewer.getControl().setLayoutData(gd);
 				toolbarViewer.setSelection(new StructuredSelection(toolbarList.get(0)));
@@ -743,9 +785,8 @@ public void selectionChanged(SelectionChangedEvent event) {
 		public boolean isPageComplete() {
 			if (labelField.getText().trim().length() == 0 && iconField.getText().trim().length() == 0) {
 				return true;
-			} else {
-				return !toolbarViewer.getSelection().isEmpty();
 			}
+			return !toolbarViewer.getSelection().isEmpty();
 		}
 	}
 
@@ -764,7 +805,7 @@ public void update(ViewerCell cell) {
 				img = elementEditor.getImage(o, composite.getDisplay());
 			}
 
-			List<String> parentPath = new ArrayList<String>();
+			final List<String> parentPath = new ArrayList<String>();
 			while (o.eContainer() != null) {
 				o = o.eContainer();
 				elementEditor = getEditor().getEditor(o.eClass());
@@ -774,11 +815,11 @@ public void update(ViewerCell cell) {
 			}
 
 			String parentString = ""; //$NON-NLS-1$
-			for (String p : parentPath) {
+			for (final String p : parentPath) {
 				parentString += "/" + p; //$NON-NLS-1$
 			}
 
-			StyledString s = new StyledString(label);
+			final StyledString s = new StyledString(label);
 			s.append(" - " + parentString, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 			cell.setStyleRanges(s.getStyleRanges());
 			cell.setText(s.getString());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 076c60b221..006c99be59 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -6,16 +6,18 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 433408, 424730
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Steven Spungin <steven@spungin.tv> - Bug 433408, 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -79,15 +81,17 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+@SuppressWarnings("restriction")
 public class AreaEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
+		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	@Optional
@@ -103,31 +107,36 @@ public AreaEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.PartSashContainerEditor_AddPartSashContainer, createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
+		actions.add(new Action(Messages.PartSashContainerEditor_AddPartSashContainer,
+			createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
 			}
 		});
-		actions.add(new Action(Messages.PartSashContainerEditor_AddPartStack, createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+		actions.add(new Action(Messages.PartSashContainerEditor_AddPartStack,
+			createImageDescriptor(ResourceProvider.IMG_PartStack)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART_STACK);
 			}
 		});
-		actions.add(new Action(Messages.PartSashContainerEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+		actions.add(new Action(Messages.PartSashContainerEditor_AddPart,
+			createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART);
 			}
 		});
-		actions.add(new Action(Messages.PartSashContainerEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area)) {
+		actions.add(new Action(Messages.PartSashContainerEditor_AddArea,
+			createImageDescriptor(ResourceProvider.IMG_Area)) {
 			@Override
 			public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.AREA);
 			}
 		});
-		actions.add(new Action(Messages.PartSashContainerEditor_AddPlaceholder, createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
+		actions.add(new Action(Messages.PartSashContainerEditor_AddPlaceholder,
+			createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
 			@Override
 			public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
@@ -137,24 +146,22 @@ public void run() {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		boolean horizontal = ((MPartSashContainer) element).isHorizontal();
+		final boolean horizontal = ((MPartSashContainer) element).isHorizontal();
 
 		if (!horizontal) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_Area_vertical);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_Area_vertical);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_Area_vertical);
 		}
 
 		if (horizontal) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_Area);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_Area);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_Area);
 		}
 		return null;
 	}
@@ -202,8 +209,9 @@ public Composite doGetEditor(Composite parent, Object object) {
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
+		boolean isImport) {
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -215,7 +223,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -223,27 +231,34 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.AreaEditor_LabelLabel, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
-		ControlFactory.createTextField(parent, Messages.AreaEditor_Tooltip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.AreaEditor_LabelLabel, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
+		ControlFactory.createTextField(parent, Messages.AreaEditor_Tooltip, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.AreaEditor_IconURI);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
+					master));
 
 			new ImageTooltip(t, Messages) {
 
 				@Override
 				protected URI getImageURI() {
-					MUILabel part = (MUILabel) getMaster().getValue();
-					String uri = part.getIconURI();
+					final MUILabel part = (MUILabel) getMaster().getValue();
+					final String uri = part.getIconURI();
 					if (uri == null || uri.trim().length() == 0) {
 						return null;
 					}
@@ -258,7 +273,8 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					AreaIconDialogEditor dialog = new AreaIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MApplicationElement) getMaster().getValue(), Messages);
+					final AreaIconDialogEditor dialog = new AreaIconDialogEditor(b.getShell(), eclipseContext, project,
+						getEditingDomain(), (MApplicationElement) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -266,34 +282,39 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.AreaEditor_Orientation);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			ComboViewer viewer = new ComboViewer(parent);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			final ComboViewer viewer = new ComboViewer(parent);
+			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			viewer.getControl().setLayoutData(gd);
 			viewer.setContentProvider(new ArrayContentProvider());
 			viewer.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
-					return ((Boolean) element).booleanValue() ? Messages.AreaEditor_Horizontal : Messages.AreaEditor_Vertical;
+					return ((Boolean) element).booleanValue() ? Messages.AreaEditor_Horizontal
+						: Messages.AreaEditor_Vertical;
 				}
 			});
 			viewer.setInput(new Boolean[] { Boolean.TRUE, Boolean.FALSE });
-			IViewerValueProperty vProp = ViewerProperties.singleSelection();
-			context.bindValue(vProp.observe(viewer), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL).observeDetail(getMaster()));
+			final IViewerValueProperty vProp = ViewerProperties.singleSelection();
+			context.bindValue(vProp.observe(viewer),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL)
+					.observeDetail(getMaster()));
 		}
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.AreaEditor_SelectedElement);
-		ControlFactory.createTextField(parent, Messages.AreaEditor_ContainerData, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
+		ControlFactory.createTextField(parent, Messages.AreaEditor_ContainerData, getMaster(), context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		{
-			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
+					final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
 					handleAddChild(eClass);
 				}
 			};
@@ -302,16 +323,23 @@ protected void addPressed() {
 
 			final TableViewer viewer = pickList.getList();
 
-			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
 			pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
-			pickList.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
+			pickList.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER,
+				BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART,
+				BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA,
+				AdvancedPackageImpl.Literals.PLACEHOLDER });
 			pickList.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
 		}
 
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -319,9 +347,13 @@ protected void addPressed() {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+			context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -335,22 +367,24 @@ protected void addPressed() {
 	}
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
+			getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
 	protected void handleAddChild(EClass eClass) {
-		EObject eObject = EcoreUtil.create(eClass);
+		final EObject eObject = EcoreUtil.create(eClass);
 		setElementId(eObject);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -370,12 +404,14 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL),
+			FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL),
+			FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 66bbb5e535..453c2ef473 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -6,17 +6,19 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 437951
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Steven Spungin <steven@spungin.tv> - Bug 437951
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -51,14 +53,16 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 
+@SuppressWarnings("restriction")
 public class BindingContextEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
 	private StackLayout stackLayout;
-	private IListProperty BINDING_CONTEXT__CHILDREN = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
+	private final IListProperty BINDING_CONTEXT__CHILDREN = EMFProperties
+		.list(CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
 
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	public BindingContextEditor() {
@@ -67,7 +71,8 @@ public BindingContextEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.BindingContextEditor_AddContext, createImageDescriptor(ResourceProvider.IMG_BindingContext)) {
+		actions.add(new Action(Messages.BindingContextEditor_AddContext,
+			createImageDescriptor(ResourceProvider.IMG_BindingContext)) {
 			@Override
 			public void run() {
 				handleAddContext();
@@ -87,7 +92,7 @@ public String getLabel(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MBindingContext context = (MBindingContext) element;
+		final MBindingContext context = (MBindingContext) element;
 		if (context.getName() != null && context.getName().trim().length() > 0) {
 			return context.getName().trim();
 		} else if (context.getElementId() != null && context.getElementId().trim().length() > 0) {
@@ -98,7 +103,8 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME), FeaturePath.fromList(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID) };
+		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME),
+			FeaturePath.fromList(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID) };
 	}
 
 	@Override
@@ -136,12 +142,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
-		enableIdGenerator(CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+		enableIdGenerator(CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -149,7 +156,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -161,11 +168,17 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME), Messages.BindingContextEditor_NameWarning);
-		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Description, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__DESCRIPTION));
-
-		E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN) {
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Name, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME),
+			Messages.BindingContextEditor_NameWarning);
+		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Description, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__DESCRIPTION));
+
+		final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
+			Messages, this, CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN) {
 			@Override
 			protected void addPressed() {
 				handleAddContext();
@@ -180,7 +193,8 @@ protected List<?> getContainerChildren(Object master) {
 		pickList.setText(Messages.BindingContextEditor_Subcontexts);
 
 		final TableViewer viewer = pickList.getList();
-		IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
+		final IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(),
+			CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
 		viewer.setInput(prop.observeDetail(master));
 
 		item = new CTabItem(folder, SWT.NONE);
@@ -189,8 +203,10 @@ protected List<?> getContainerChildren(Object master) {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createContributedEditorTabs(folder, context, getMaster(), MBindingContext.class);
 
@@ -205,10 +221,11 @@ public IObservableList getChildList(Object element) {
 	}
 
 	protected void handleAddContext() {
-		MBindingContext eObject = MCommandsFactory.INSTANCE.createBindingContext();
+		final MBindingContext eObject = MCommandsFactory.INSTANCE.createBindingContext();
 		setElementId(eObject);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN, eObject);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -219,7 +236,7 @@ protected void handleAddContext() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 32420161c7..025f10ee21 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -6,17 +6,19 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -60,14 +62,16 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+@SuppressWarnings("restriction")
 public class BindingTableEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private IListProperty BINDING_TABLE__BINDINGS = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
+	private final IListProperty BINDING_TABLE__BINDINGS = EMFProperties
+		.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
 	private StackLayout stackLayout;
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	public BindingTableEditor() {
@@ -76,7 +80,8 @@ public BindingTableEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.BindingTableEditor_AddKeyBinding, createImageDescriptor(ResourceProvider.IMG_KeyBinding)) {
+		actions.add(new Action(Messages.BindingTableEditor_AddKeyBinding,
+			createImageDescriptor(ResourceProvider.IMG_KeyBinding)) {
 			@Override
 			public void run() {
 				handleAddKeyBinding();
@@ -132,8 +137,9 @@ public Composite doGetEditor(Composite parent, Object object) {
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master,
+		boolean isImport) {
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -141,7 +147,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -154,26 +160,34 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		}
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ModelTooling_Common_Id);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			final Text t = new Text(parent, SWT.BORDER);
+			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+			context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(),
+					ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.BindingTableEditor_ContextId);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
+			context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(
+					getEditingDomain(),
+					FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT,
+						ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
@@ -182,9 +196,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(b.getShell(), getEditor().getModelProvider(), Messages);
+					final BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(b.getShell(),
+						getEditor().getModelProvider(), Messages);
 					if (dialog.open() == Window.OK) {
-						Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT, dialog.getSelectedContext());
+						final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(),
+							CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT, dialog.getSelectedContext());
 						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -194,7 +210,8 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		{
-			E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS) {
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
+				Messages, this, CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS) {
 				@Override
 				protected void addPressed() {
 					handleAddKeyBinding();
@@ -210,7 +227,7 @@ protected List<?> getContainerChildren(Object master) {
 
 			final TableViewer viewer = pickList.getList();
 
-			IEMFListProperty prop = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
+			final IEMFListProperty prop = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
 			viewer.setInput(prop.observeDetail(getMaster()));
 		}
 
@@ -220,8 +237,10 @@ protected List<?> getContainerChildren(Object master) {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createContributedEditorTabs(folder, context, getMaster(), MBindingTable.class);
 
@@ -237,8 +256,9 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MBindingTable cmd = (MBindingTable) element;
-		if (cmd.getBindingContext() != null && cmd.getBindingContext().getName() != null && cmd.getBindingContext().getName().trim().length() > 0) {
+		final MBindingTable cmd = (MBindingTable) element;
+		if (cmd.getBindingContext() != null && cmd.getBindingContext().getName() != null
+			&& cmd.getBindingContext().getName().trim().length() > 0) {
 			return cmd.getBindingContext().getName();
 		}
 
@@ -247,19 +267,21 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT, CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME) };
+		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT,
+			CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME) };
 	}
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	protected void handleAddKeyBinding() {
-		MKeyBinding handler = MCommandsFactory.INSTANCE.createKeyBinding();
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, handler);
+		final MKeyBinding handler = MCommandsFactory.INSTANCE.createKeyBinding();
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, handler);
 		setElementId(handler);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index 3b669a63df..6e8078b38f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -6,13 +6,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 437951
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Steven Spungin <steven@spungin.tv> - Bug 437951
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -35,6 +36,7 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 
+@SuppressWarnings("restriction")
 public class CategoryEditor extends AbstractComponentEditor {
 
 	private Composite composite;
@@ -96,12 +98,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
-		enableIdGenerator(CommandsPackageImpl.Literals.CATEGORY__NAME, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+		enableIdGenerator(CommandsPackageImpl.Literals.CATEGORY__NAME,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master,
+		boolean isImport) {
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -109,7 +113,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -121,9 +125,13 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.CategoryEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__NAME));
-		ControlFactory.createTextField(parent, Messages.CategoryEditor_Description, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__DESCRIPTION));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.CategoryEditor_Name, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__NAME));
+		ControlFactory.createTextField(parent, Messages.CategoryEditor_Description, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__DESCRIPTION));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -131,8 +139,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createContributedEditorTabs(folder, context, getMaster(), MCategory.class);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 5e4aa8ae9b..b7e5342262 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -6,9 +6,9 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 437951
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Steven Spungin <steven@spungin.tv> - Bug 437951
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -16,8 +16,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -58,15 +60,17 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+@SuppressWarnings("restriction")
 public class CommandEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private StackLayout stackLayout;
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 	private MessageFormat newCommandParameterName;
 
-	private IEMFEditListProperty COMMAND__PARAMETERS = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
+	private final IEMFEditListProperty COMMAND__PARAMETERS = EMFEditProperties.list(getEditingDomain(),
+		CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
 
 	@Inject
 	public CommandEditor() {
@@ -75,7 +79,8 @@ public CommandEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.CommandEditor_AddCommandParameter, createImageDescriptor(ResourceProvider.IMG_CommandParameter)) {
+		actions.add(new Action(Messages.CommandEditor_AddCommandParameter,
+			createImageDescriptor(ResourceProvider.IMG_CommandParameter)) {
 			@Override
 			public void run() {
 				handleAddCommandParameter();
@@ -130,12 +135,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
-		enableIdGenerator(CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+		enableIdGenerator(CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master,
+		boolean isImport) {
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -143,7 +150,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -155,22 +162,32 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, Messages.ModelTooling_CommandId_tooltip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID), Messages.ModelTooling_Empty_Warning);
-		ControlFactory.createTextField(parent, Messages.CommandEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME));
-		ControlFactory.createTextField(parent, Messages.CommandEditor_LabelDescription, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__DESCRIPTION));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id,
+			Messages.ModelTooling_CommandId_tooltip, master, context, textProp, EMFEditProperties.value(
+				getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID),
+			Messages.ModelTooling_Empty_Warning);
+		ControlFactory.createTextField(parent, Messages.CommandEditor_Name, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME));
+		ControlFactory.createTextField(parent, Messages.CommandEditor_LabelDescription, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__DESCRIPTION));
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CommandEditor_Category);
 			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			t.setEditable(false);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FeaturePath.fromList(CommandsPackageImpl.Literals.COMMAND__CATEGORY, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
+			context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(
+					getEditingDomain(),
+					FeaturePath.fromList(CommandsPackageImpl.Literals.COMMAND__CATEGORY,
+						ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -179,7 +196,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					CommandCategorySelectionDialog dialog = new CommandCategorySelectionDialog(b.getShell(), getEditor().getModelProvider(), (MCommand) getMaster().getValue(), Messages);
+					final CommandCategorySelectionDialog dialog = new CommandCategorySelectionDialog(b.getShell(),
+						getEditor().getModelProvider(), (MCommand) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -187,7 +205,8 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		{
-			E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.COMMAND__PARAMETERS) {
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
+				Messages, this, CommandsPackageImpl.Literals.COMMAND__PARAMETERS) {
 				@Override
 				protected void addPressed() {
 					handleAddCommandParameter();
@@ -204,7 +223,8 @@ protected List<?> getContainerChildren(Object master) {
 
 			final TableViewer viewer = pickList.getList();
 
-			IEMFEditListProperty mProp = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
+			final IEMFEditListProperty mProp = EMFEditProperties.list(getEditingDomain(),
+				CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
 			viewer.setInput(mProp.observeDetail(getMaster()));
 		}
 
@@ -214,8 +234,10 @@ protected List<?> getContainerChildren(Object master) {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createContributedEditorTabs(folder, context, getMaster(), MCommand.class);
 
@@ -231,7 +253,7 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MCommand cmd = (MCommand) element;
+		final MCommand cmd = (MCommand) element;
 		if (cmd.getCommandName() != null && cmd.getCommandName().trim().length() > 0) {
 			return translate(cmd.getCommandName());
 		}
@@ -244,11 +266,12 @@ public FeaturePath[] getLabelProperties() {
 	}
 
 	protected void handleAddCommandParameter() {
-		MCommandParameter param = MCommandsFactory.INSTANCE.createCommandParameter();
+		final MCommandParameter param = MCommandsFactory.INSTANCE.createCommandParameter();
 		setElementId(param);
 		param.setName(newCommandParameterName.format(new Object[] { getParameterCount() }));
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.COMMAND__PARAMETERS, param);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			CommandsPackageImpl.Literals.COMMAND__PARAMETERS, param);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -258,23 +281,21 @@ protected void handleAddCommandParameter() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	/**
-	 * Returns the current amount of {@link MCommandParameter}s the edited
-	 * {@link MCommand} has.
+	 * Returns the current amount of {@link MCommandParameter}s the edited {@link MCommand} has.
 	 *
-	 * @return the amount of {@link MCommandParameter}s of the edited
-	 *         {@link MCommand}
+	 * @return the amount of {@link MCommandParameter}s of the edited {@link MCommand}
 	 */
 	private int getParameterCount() {
 		// getChildList() will always create a new IObservableList and
 		// this method uses the normal EMF way to retrieve the count manually.
-		EObject command = (EObject) getMaster().getValue();
-		List<?> commandParameters = (List<?>) command.eGet(CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
+		final EObject command = (EObject) getMaster().getValue();
+		final List<?> commandParameters = (List<?>) command.eGet(CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
 		return commandParameters.size();
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 76912023a3..b25b473523 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -6,12 +6,13 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -39,6 +40,7 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 
+@SuppressWarnings("restriction")
 public class CommandParameterEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
@@ -52,7 +54,8 @@ public CommandParameterEditor() {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME), FeaturePath.fromList(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID) };
+		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME),
+			FeaturePath.fromList(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID) };
 	}
 
 	@Override
@@ -67,7 +70,7 @@ public String getLabel(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MCommandParameter param = (MCommandParameter) element;
+		final MCommandParameter param = (MCommandParameter) element;
 		if (param.getName() != null && param.getName().trim().length() > 0) {
 			return param.getName().trim();
 		} else if (param.getElementId() != null && param.getElementId().trim().length() > 0) {
@@ -115,7 +118,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -123,7 +126,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -135,20 +138,27 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID), Messages.ModelTooling_Empty_Warning);
-		ControlFactory.createTextField(parent, Messages.CommandParameterEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME), Messages.ModelTooling_Empty_Warning);
-		ControlFactory.createTextField(parent, Messages.CommandParameterEditor_TypeId, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__TYPE_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID),
+			Messages.ModelTooling_Empty_Warning);
+		ControlFactory.createTextField(parent, Messages.CommandParameterEditor_Name, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME),
+			Messages.ModelTooling_Empty_Warning);
+		ControlFactory.createTextField(parent, Messages.CommandParameterEditor_TypeId, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__TYPE_ID));
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CommandParameterEditor_Optional);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Button checkbox = new Button(parent, SWT.CHECK);
+			final Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
 
-			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__OPTIONAL);
-			IWidgetValueProperty uiProp = WidgetProperties.selection();
+			final IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(),
+				CommandsPackageImpl.Literals.COMMAND_PARAMETER__OPTIONAL);
+			final IWidgetValueProperty uiProp = WidgetProperties.selection();
 
 			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
 		}
@@ -159,8 +169,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createContributedEditorTabs(folder, context, getMaster(), MCommandParameter.class);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index 857122d9e6..176383c8a7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -2,8 +2,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -76,15 +78,17 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
+@SuppressWarnings("restriction")
 public class CompositePartEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
+		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private List<Action> actions = new ArrayList<Action>();
-	private List<Action> actionsImport = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actionsImport = new ArrayList<Action>();
 
 	@Inject
 	@Optional
@@ -103,13 +107,15 @@ public CompositePartEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.CompositePartEditor_AddPartSashContainer, createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
+		actions.add(new Action(Messages.CompositePartEditor_AddPartSashContainer,
+			createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.COMPOSITE_PART);
 			}
 		});
-		actions.add(new Action(Messages.CompositePartEditor_AddPartStack, createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+		actions.add(new Action(Messages.CompositePartEditor_AddPartStack,
+			createImageDescriptor(ResourceProvider.IMG_PartStack)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART_STACK);
@@ -128,13 +134,15 @@ public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.AREA);
 			}
 		});
-		actions.add(new Action(Messages.CompositePartEditor_AddPlaceholder, createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
+		actions.add(new Action(Messages.CompositePartEditor_AddPlaceholder,
+			createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
 			@Override
 			public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
 			}
 		});
-		for (FeatureClass c : getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN)) {
+		for (final FeatureClass c : getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK,
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN)) {
 			final EClass ec = c.eClass;
 			actions.add(new Action(c.label, createImageDescriptor(c.iconId)) {
 				@Override
@@ -162,24 +170,22 @@ public void run() {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		boolean horizontal = ((MCompositePart) element).isHorizontal();
+		final boolean horizontal = ((MCompositePart) element).isHorizontal();
 
 		if (!horizontal) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_PartSashContainer_vertical);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_PartSashContainer_vertical);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_PartSashContainer_vertical);
 		}
 
 		if (horizontal) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_PartSashContainer);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_PartSashContainer);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_PartSashContainer);
 		}
 		return null;
 	}
@@ -227,8 +233,9 @@ public Composite doGetEditor(Composite parent, Object object) {
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
+		boolean isImport) {
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -240,7 +247,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -248,14 +255,20 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-		ControlFactory.createTextField(parent, Messages.CompositePartEditor_LabelLabel, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
-		ControlFactory.createTextField(parent, Messages.CompositePartEditor_Tooltip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+			context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createTextField(parent, Messages.CompositePartEditor_LabelLabel, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
+		ControlFactory.createTextField(parent, Messages.CompositePartEditor_Tooltip, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CompositePartEditor_IconURI);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 			l.setToolTipText(Messages.CompositePartEditor_IconURI_Tooltip);
@@ -263,14 +276,17 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
+					master));
 
 			new ImageTooltip(t, Messages) {
 
 				@Override
 				protected URI getImageURI() {
-					MUILabel part = (MUILabel) getMaster().getValue();
-					String uri = part.getIconURI();
+					final MUILabel part = (MUILabel) getMaster().getValue();
+					final String uri = part.getIconURI();
 					if (uri == null || uri.trim().length() == 0) {
 						return null;
 					}
@@ -285,7 +301,8 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MPart) getMaster().getValue(), Messages);
+					final PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), eclipseContext, project,
+						getEditingDomain(), (MPart) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -293,39 +310,43 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CompositePartEditor_Orientation);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			ComboViewer viewer = new ComboViewer(parent);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			final ComboViewer viewer = new ComboViewer(parent);
+			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			viewer.getControl().setLayoutData(gd);
 			viewer.setContentProvider(new ArrayContentProvider());
 			viewer.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
-					return ((Boolean) element).booleanValue() ? Messages.CompositePartEditor_Horizontal : Messages.CompositePartEditor_Vertical;
+					return ((Boolean) element).booleanValue() ? Messages.CompositePartEditor_Horizontal
+						: Messages.CompositePartEditor_Vertical;
 				}
 			});
 			viewer.setInput(new Boolean[] { Boolean.TRUE, Boolean.FALSE });
-			IViewerValueProperty vProp = ViewerProperties.singleSelection();
-			context.bindValue(vProp.observe(viewer), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL).observeDetail(getMaster()));
+			final IViewerValueProperty vProp = ViewerProperties.singleSelection();
+			context.bindValue(vProp.observe(viewer),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL)
+				.observeDetail(getMaster()));
 		}
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.CompositePartEditor_SelectedElement);
-		ControlFactory.createTextField(parent, Messages.CompositePartEditor_ContainerData, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
+		ControlFactory.createTextField(parent, Messages.CompositePartEditor_ContainerData, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		{
 
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CompositePartEditor_Controls);
 			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
 
-			Composite buttonCompTop = new Composite(parent, SWT.NONE);
-			GridData span2 = new GridData(GridData.FILL, GridData.BEGINNING, false, false, 2, 1);
+			final Composite buttonCompTop = new Composite(parent, SWT.NONE);
+			final GridData span2 = new GridData(GridData.FILL, GridData.BEGINNING, false, false, 2, 1);
 			buttonCompTop.setLayoutData(span2);
-			GridLayout gl = new GridLayout(2, false);
+			final GridLayout gl = new GridLayout(2, false);
 			gl.marginLeft = 0;
 			gl.marginRight = 0;
 			gl.marginWidth = 0;
@@ -335,14 +356,15 @@ public String getText(Object element) {
 			final ComboViewer childrenDropDown = new ComboViewer(buttonCompTop);
 			childrenDropDown.setLabelProvider(new FeatureClassLabelProvider(getEditor()));
 
-			List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
+			final List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
 			eClassList.add(new FeatureClass("PartSashContainer", BasicPackageImpl.Literals.PART_SASH_CONTAINER)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("PartStack", BasicPackageImpl.Literals.PART_STACK)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("InputPart", BasicPackageImpl.Literals.INPUT_PART)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("Area", AdvancedPackageImpl.Literals.AREA)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER)); //$NON-NLS-1$
-			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.COMPOSITE_PART, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
+			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.COMPOSITE_PART,
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
 			childrenDropDown.setInput(eClassList);
 			childrenDropDown.setSelection(new StructuredSelection(eClassList.get(0)));
 
@@ -354,7 +376,8 @@ public String getText(Object element) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (!childrenDropDown.getSelection().isEmpty()) {
-						EClass eClass = ((FeatureClass) ((IStructuredSelection) childrenDropDown.getSelection()).getFirstElement()).eClass;
+						final EClass eClass = ((FeatureClass) ((IStructuredSelection) childrenDropDown.getSelection())
+							.getFirstElement()).eClass;
 						handleAddChild(eClass);
 					}
 				}
@@ -363,18 +386,18 @@ public void widgetSelected(SelectionEvent e) {
 			new Label(parent, SWT.NONE);
 
 			final TableViewer viewer = new TableViewer(parent);
-			GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1);
+			final GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1);
 			viewer.getControl().setLayoutData(gd);
-			ObservableListContentProvider cp = new ObservableListContentProvider();
+			final ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 
-			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
 			new Label(parent, SWT.NONE);
 
-			Composite buttonCompBot = new Composite(parent, SWT.NONE);
+			final Composite buttonCompBot = new Composite(parent, SWT.NONE);
 			buttonCompBot.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 2, 1));
 			buttonCompBot.setLayout(new FillLayout());
 
@@ -385,13 +408,14 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) - 1;
+							final Object obj = s.getFirstElement();
+							final MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							final int idx = container.getChildren().indexOf(obj) - 1;
 							if (idx >= 0) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor()
+									.isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
@@ -408,13 +432,14 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (!viewer.getSelection().isEmpty()) {
-						IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+						final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 						if (s.size() == 1) {
-							Object obj = s.getFirstElement();
-							MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							int idx = container.getChildren().indexOf(obj) + 1;
+							final Object obj = s.getFirstElement();
+							final MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
+							final int idx = container.getChildren().indexOf(obj) + 1;
 							if (idx < container.getChildren().size()) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(), idx)) {
+								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor()
+									.isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
@@ -431,9 +456,10 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (!viewer.getSelection().isEmpty()) {
-						List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+						final List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
 
-						Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
+						final Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(),
+							UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
 						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -442,8 +468,12 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -451,8 +481,10 @@ public void widgetSelected(SelectionEvent e) {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -466,14 +498,15 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
+			getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -489,18 +522,20 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL),
+			FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 	protected void handleAddChild(EClass eClass) {
-		EObject eObject = EcoreUtil.create(eClass);
+		final EObject eObject = EcoreUtil.create(eClass);
 		addToModel(eObject);
 	}
 
 	private void addToModel(EObject eObject) {
 		setElementId(eObject);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -511,11 +546,11 @@ private void addToModel(EObject eObject) {
 	protected void handleImportChild(EClass eClass, String hint) {
 
 		if (eClass == BasicPackageImpl.Literals.PART) {
-			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, hint, resourcePool);
-			WizardDialog wizardDialog = new WizardDialog(shell, wizard);
+			final ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, hint, resourcePool);
+			final WizardDialog wizardDialog = new WizardDialog(shell, wizard);
 			if (wizardDialog.open() == Window.OK) {
-				MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
-				for (MPart part : parts) {
+				final MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
+				for (final MPart part : parts) {
 					addToModel((EObject) part);
 				}
 			}
@@ -524,14 +559,14 @@ protected void handleImportChild(EClass eClass, String hint) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	@Override
 	public List<Action> getActionsImport(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
 		l.addAll(actionsImport);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index c9ab96da81..2930a6e897 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -6,16 +6,17 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Dirk Fauth <dirk.fauth@googlemail.com> - Bug 426986
- *     Steven Spungin <steven@spungin.tv> - Bug 430660, 430664, Bug 430809, 430717
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Dirk Fauth <dirk.fauth@googlemail.com> - Bug 426986
+ * Steven Spungin <steven@spungin.tv> - Bug 430660, 430664, Bug 430809, 430717
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map.Entry;
+
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IListChangeListener;
@@ -106,6 +107,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+@SuppressWarnings("restriction")
 public class ControlFactory {
 	public static final String COPY_HANDLER = ControlFactory.class.getName() + ".COPY_HANDLER"; //$NON-NLS-1$
 
@@ -122,8 +124,8 @@ public static void createFor(Text t) {
 
 		@Override
 		public void paste() {
-			Clipboard cp = new Clipboard(t.getDisplay());
-			Object o = cp.getContents(TextTransfer.getInstance());
+			final Clipboard cp = new Clipboard(t.getDisplay());
+			final Object o = cp.getContents(TextTransfer.getInstance());
 			cp.dispose();
 			if (o == null) {
 				return;
@@ -150,13 +152,13 @@ public boolean validate(String text) {
 	}
 
 	public static void createXMIId(Composite parent, AbstractComponentEditor editor) {
-		Label l = new Label(parent, SWT.NONE);
+		final Label l = new Label(parent, SWT.NONE);
 		l.setText("XMI:ID"); //$NON-NLS-1$
 		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		final Text t = new Text(parent, SWT.BORDER);
 		t.setEditable(false);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 2;
 		t.setLayoutData(gd);
 
@@ -166,11 +168,11 @@ public static void createXMIId(Composite parent, AbstractComponentEditor editor)
 
 			@Override
 			public void handleValueChange(ValueChangeEvent event) {
-				Object val = event.diff.getNewValue();
+				final Object val = event.diff.getNewValue();
 				if (val != null && val instanceof EObject && !t.isDisposed()) {
-					Resource res = ((EObject) val).eResource();
+					final Resource res = ((EObject) val).eResource();
 					if (res instanceof E4XMIResource) {
-						String v = ((E4XMIResource) res).getID((EObject) val);
+						final String v = ((E4XMIResource) res).getID((EObject) val);
 						if (v != null && v.trim().length() > 0) {
 							t.setText(v);
 						}
@@ -180,13 +182,17 @@ public void handleValueChange(ValueChangeEvent event) {
 		});
 	}
 
-	public static Composite createMapProperties(Composite parent, final Messages Messages, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
+	public static Composite createMapProperties(Composite parent, final Messages Messages,
+		final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
 		return createMapProperties(parent, Messages, editor, label, null, feature, vIndent);
 	}
 
-	public static Composite createMapProperties(Composite parent, final Messages Messages, final AbstractComponentEditor editor, String label, String tooltip, final EStructuralFeature feature, int vIndent) {
+	public static Composite createMapProperties(Composite parent, final Messages Messages,
+		final AbstractComponentEditor editor, String label, String tooltip, final EStructuralFeature feature,
+		int vIndent) {
 
-		E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, editor, feature) {
+		final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
+			Messages, editor, feature) {
 			@Override
 			protected List<?> getContainerChildren(Object master) {
 				return null;
@@ -194,15 +200,15 @@ protected List<?> getContainerChildren(Object master) {
 
 			@Override
 			protected void addPressed() {
-				Dialog dialog = new Dialog(getShell()) {
+				final Dialog dialog = new Dialog(getShell()) {
 					private Text key;
 					private Text value;
 
 					@Override
 					protected Control createDialogArea(Composite parent) {
 						getShell().setText(Messages.ControlFactory_KeyValueShellTitle);
-						Composite comp = (Composite) super.createDialogArea(parent);
-						Composite container = new Composite(comp, SWT.NONE);
+						final Composite comp = (Composite) super.createDialogArea(parent);
+						final Composite container = new Composite(comp, SWT.NONE);
 						container.setLayout(new GridLayout(2, false));
 						container.setLayoutData(new GridData(GridData.FILL_BOTH));
 
@@ -224,11 +230,13 @@ protected Control createDialogArea(Composite parent) {
 					@Override
 					protected void okPressed() {
 						if (key.getText().trim().length() > 0) {
-							BasicEMap.Entry<String, String> entry = (org.eclipse.emf.common.util.BasicEMap.Entry<String, String>) ApplicationFactoryImpl.eINSTANCE.createStringToStringMap();
+							final BasicEMap.Entry<String, String> entry = (org.eclipse.emf.common.util.BasicEMap.Entry<String, String>) ApplicationFactoryImpl.eINSTANCE
+								.createStringToStringMap();
 							entry.setHash(key.hashCode());
 							entry.setKey(key.getText());
 							entry.setValue(value.getText().trim().length() > 0 ? value.getText() : null);
-							Command cmd = AddCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), feature, entry);
+							final Command cmd = AddCommand.create(editor.getEditingDomain(), editor.getMaster()
+								.getValue(), feature, entry);
 							if (cmd.canExecute()) {
 								editor.getEditingDomain().getCommandStack().execute(cmd);
 								super.okPressed();
@@ -247,10 +255,10 @@ protected void okPressed() {
 
 		final TableViewer tableviewer = pickList.getList();
 		tableviewer.getTable().setHeaderVisible(true);
-		ObservableListContentProvider cp = new ObservableListContentProvider();
+		final ObservableListContentProvider cp = new ObservableListContentProvider();
 		tableviewer.setContentProvider(cp);
 
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.heightHint = 80;
 		gd.verticalIndent = vIndent;
 		tableviewer.getControl().setLayoutData(gd);
@@ -262,7 +270,7 @@ protected void okPressed() {
 			@SuppressWarnings("unchecked")
 			@Override
 			public String getText(Object element) {
-				Entry<String, String> entry = (Entry<String, String>) element;
+				final Entry<String, String> entry = (Entry<String, String>) element;
 				return entry.getKey();
 			}
 		});
@@ -272,7 +280,9 @@ public String getText(Object element) {
 
 			@Override
 			protected void setValue(Object element, Object value) {
-				Command cmd = SetCommand.create(editor.getEditingDomain(), element, ApplicationPackageImpl.Literals.STRING_TO_STRING_MAP__KEY, value.toString().trim().length() == 0 ? null : value.toString());
+				final Command cmd = SetCommand.create(editor.getEditingDomain(), element,
+					ApplicationPackageImpl.Literals.STRING_TO_STRING_MAP__KEY,
+					value.toString().trim().length() == 0 ? null : value.toString());
 				if (cmd.canExecute()) {
 					editor.getEditingDomain().getCommandStack().execute(cmd);
 					tableviewer.refresh();
@@ -283,7 +293,7 @@ protected void setValue(Object element, Object value) {
 			@Override
 			protected Object getValue(Object element) {
 				@SuppressWarnings("unchecked")
-				Entry<String, String> entry = (Entry<String, String>) element;
+				final Entry<String, String> entry = (Entry<String, String>) element;
 				return entry.getKey();
 			}
 
@@ -306,7 +316,7 @@ protected boolean canEdit(Object element) {
 			@Override
 			public String getText(Object element) {
 				@SuppressWarnings("unchecked")
-				Entry<String, String> entry = (Entry<String, String>) element;
+				final Entry<String, String> entry = (Entry<String, String>) element;
 				return entry.getValue();
 			}
 		});
@@ -316,7 +326,9 @@ public String getText(Object element) {
 
 			@Override
 			protected void setValue(Object element, Object value) {
-				Command cmd = SetCommand.create(editor.getEditingDomain(), element, ApplicationPackageImpl.Literals.STRING_TO_STRING_MAP__VALUE, value.toString().trim().length() == 0 ? null : value.toString());
+				final Command cmd = SetCommand.create(editor.getEditingDomain(), element,
+					ApplicationPackageImpl.Literals.STRING_TO_STRING_MAP__VALUE,
+					value.toString().trim().length() == 0 ? null : value.toString());
 				if (cmd.canExecute()) {
 					editor.getEditingDomain().getCommandStack().execute(cmd);
 					tableviewer.refresh();
@@ -326,7 +338,7 @@ protected void setValue(Object element, Object value) {
 			@SuppressWarnings("unchecked")
 			@Override
 			protected Object getValue(Object element) {
-				Entry<String, String> entry = (Entry<String, String>) element;
+				final Entry<String, String> entry = (Entry<String, String>) element;
 				return entry.getValue() == null ? "" : entry.getValue(); //$NON-NLS-1$
 			}
 
@@ -341,8 +353,8 @@ protected boolean canEdit(Object element) {
 			}
 		});
 
-		IEMFEditListProperty prop = EMFEditProperties.list(editor.getEditingDomain(), feature);
-		IObservableList observableList = prop.observeDetail(editor.getMaster());
+		final IEMFEditListProperty prop = EMFEditProperties.list(editor.getEditingDomain(), feature);
+		final IObservableList observableList = prop.observeDetail(editor.getMaster());
 		tableviewer.setInput(observableList);
 		observableList.addListChangeListener(new IListChangeListener() {
 
@@ -355,15 +367,19 @@ public void handleListChange(ListChangeEvent event) {
 		return pickList;
 	}
 
-	public static void createTextField(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp) {
+	public static void createTextField(Composite parent, String label, IObservableValue master,
+		EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp) {
 		createTextField(parent, label, null, master, context, textProp, modelProp, null);
 	}
 
-	public static void createTextField(Composite parent, String label, String tooltip, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp) {
+	public static void createTextField(Composite parent, String label, String tooltip, IObservableValue master,
+		EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp) {
 		createTextField(parent, label, tooltip, master, context, textProp, modelProp, null);
 	}
 
-	public static void createTextField(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp, final String warningText) {
+	public static void createTextField(Composite parent, String label, IObservableValue master,
+		EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp,
+		final String warningText) {
 		createTextField(parent, label, null, master, context, textProp, modelProp, warningText);
 	}
 
@@ -379,8 +395,10 @@ public static void createTextField(Composite parent, String label, IObservableVa
 	 *            Non null warningText means that a warning with this non-null
 	 *            text will be shown when the field is left empty
 	 */
-	public static void createTextField(Composite parent, String label, String tooltip, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp, final String warningText) {
-		Label l = new Label(parent, SWT.NONE);
+	public static void createTextField(Composite parent, String label, String tooltip, IObservableValue master,
+		EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp,
+		final String warningText) {
+		final Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
 		if (tooltip != null) {
 			l.setToolTipText(tooltip);
@@ -388,16 +406,17 @@ public static void createTextField(Composite parent, String label, String toolti
 		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		final Text t = new Text(parent, SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 2;
 		t.setLayoutData(gd);
 		TextPasteHandler.createFor(t);
 		if (warningText != null) {
 			final ControlDecoration controlDecoration = new ControlDecoration(t, SWT.LEFT | SWT.TOP);
 			controlDecoration.setDescriptionText(warningText);
-			FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_WARNING);
+			final FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(
+				FieldDecorationRegistry.DEC_WARNING);
 			controlDecoration.setImage(fieldDecoration.getImage());
-			IValidator iv = new IValidator() {
+			final IValidator iv = new IValidator() {
 
 				@Override
 				public IStatus validate(Object value) {
@@ -406,7 +425,7 @@ public IStatus validate(Object value) {
 						return ValidationStatus.warning(warningText);
 					}
 					if (value instanceof String) {
-						String text = (String) value;
+						final String text = (String) value;
 						if (text.trim().length() == 0) {
 							controlDecoration.show();
 							return ValidationStatus.warning(warningText);
@@ -416,18 +435,23 @@ public IStatus validate(Object value) {
 					return Status.OK_STATUS;
 				}
 			};
-			UpdateValueStrategy acv = new UpdateValueStrategy().setAfterConvertValidator(iv);
+			final UpdateValueStrategy acv = new UpdateValueStrategy().setAfterConvertValidator(iv);
 			context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master), acv, acv);
-		} else
+		} else {
 			context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master));
+		}
 	}
 
-	public static void createTranslatedTextField(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp, IResourcePool resourcePool, IProject project) {
+	public static void createTranslatedTextField(Composite parent, String label, IObservableValue master,
+		EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp,
+		IResourcePool resourcePool, IProject project) {
 		createTranslatedTextField(parent, label, null, master, context, textProp, modelProp, resourcePool, project);
 	}
 
-	public static void createTranslatedTextField(Composite parent, String label, String tooltip, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp, IResourcePool resourcePool, IProject project) {
-		Label l = new Label(parent, SWT.NONE);
+	public static void createTranslatedTextField(Composite parent, String label, String tooltip,
+		IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp,
+		IEMFEditValueProperty modelProp, IResourcePool resourcePool, IProject project) {
+		final Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
 		if (tooltip != null) {
 			l.setToolTipText(tooltip);
@@ -435,7 +459,7 @@ public static void createTranslatedTextField(Composite parent, String label, Str
 		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		final Text t = new Text(parent, SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		if (project == null) {
 			gd.horizontalSpan = 2;
 		} else {
@@ -453,20 +477,24 @@ public static void createTranslatedTextField(Composite parent, String label, Str
 		// }
 	}
 
-	public static void createFindImport(Composite parent, final Messages Messages, final AbstractComponentEditor editor, EMFDataBindingContext context) {
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+	public static void createFindImport(Composite parent, final Messages Messages,
+		final AbstractComponentEditor editor, EMFDataBindingContext context) {
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		Label l = new Label(parent, SWT.NONE);
+		final Label l = new Label(parent, SWT.NONE);
 		l.setText(Messages.ModelTooling_Common_RefId);
 		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 		final Text t = new Text(parent, SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		t.setLayoutData(gd);
 
 		TextPasteHandler.createFor(t);
 
-		context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(editor.getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(editor.getMaster()));
+		context.bindValue(
+			textProp.observeDelayed(200, t),
+			EMFEditProperties.value(editor.getEditingDomain(),
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(editor.getMaster()));
 
 		final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -474,30 +502,36 @@ public static void createFindImport(Composite parent, final Messages Messages, f
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				FindImportElementDialog dialog = new FindImportElementDialog(b.getShell(), editor, (EObject) editor.getMaster().getValue(), Messages);
+				final FindImportElementDialog dialog = new FindImportElementDialog(b.getShell(), editor,
+					(EObject) editor.getMaster().getValue(), Messages);
 				dialog.open();
 			}
 		});
 	}
 
-	public static void createSelectedElement(Composite parent, final AbstractComponentEditor editor, final EMFDataBindingContext context, String label) {
-		Label l = new Label(parent, SWT.NONE);
+	public static void createSelectedElement(Composite parent, final AbstractComponentEditor editor,
+		final EMFDataBindingContext context, String label) {
+		final Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
 		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-		ComboViewer viewer = new ComboViewer(parent);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		final ComboViewer viewer = new ComboViewer(parent);
+		final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 2;
 		viewer.getControl().setLayoutData(gd);
-		IEMFEditListProperty listProp = EMFEditProperties.list(editor.getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-		IEMFEditValueProperty labelProp = EMFEditProperties.value(editor.getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL);
-		IEMFEditValueProperty idProp = EMFEditProperties.value(editor.getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
+		final IEMFEditListProperty listProp = EMFEditProperties.list(editor.getEditingDomain(),
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+		final IEMFEditValueProperty labelProp = EMFEditProperties.value(editor.getEditingDomain(),
+			UiPackageImpl.Literals.UI_LABEL__LABEL);
+		final IEMFEditValueProperty idProp = EMFEditProperties.value(editor.getEditingDomain(),
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
 
-		IViewerValueProperty vProp = ViewerProperties.singleSelection();
+		final IViewerValueProperty vProp = ViewerProperties.singleSelection();
 
 		final Binding[] binding = new Binding[1];
 		final IObservableValue uiObs = vProp.observe(viewer);
-		final IObservableValue mObs = EMFEditProperties.value(editor.getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(editor.getMaster());
+		final IObservableValue mObs = EMFEditProperties.value(editor.getEditingDomain(),
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(editor.getMaster());
 		editor.getMaster().addValueChangeListener(new IValueChangeListener() {
 
 			@Override
@@ -510,17 +544,18 @@ public void handleValueChange(ValueChangeEvent event) {
 		});
 
 		final IObservableList list = listProp.observeDetail(editor.getMaster());
-		ObservableListContentProvider cp = new ObservableListContentProvider();
+		final ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
-		IObservableMap[] attributeMaps = { labelProp.observeDetail(cp.getKnownElements()), idProp.observeDetail(cp.getKnownElements()) };
+		final IObservableMap[] attributeMaps = { labelProp.observeDetail(cp.getKnownElements()),
+			idProp.observeDetail(cp.getKnownElements()) };
 		viewer.setLabelProvider(new ObservableMapLabelProvider(attributeMaps) {
 			@Override
 			public String getText(Object element) {
-				EObject o = (EObject) element;
-				String rv = o.eClass().getName();
+				final EObject o = (EObject) element;
+				final String rv = o.eClass().getName();
 
 				if (element instanceof MUILabel) {
-					MUILabel label = (MUILabel) element;
+					final MUILabel label = (MUILabel) element;
 					if (!Util.isNullOrEmpty(label.getLabel())) {
 						return rv + " - " + label.getLabel().trim(); //$NON-NLS-1$
 					}
@@ -528,7 +563,7 @@ public String getText(Object element) {
 				}
 
 				if (element instanceof MApplicationElement) {
-					MApplicationElement appEl = (MApplicationElement) element;
+					final MApplicationElement appEl = (MApplicationElement) element;
 					if (!Util.isNullOrEmpty(appEl.getElementId())) {
 						return rv + " - " + appEl.getElementId(); //$NON-NLS-1$
 					}
@@ -548,18 +583,23 @@ public void handleValueChange(ValueChangeEvent event) {
 		});
 	}
 
-	public static void createBindingContextWiget(Composite parent, final Messages Messages, final AbstractComponentEditor editor, String label) {
+	public static void createBindingContextWiget(Composite parent, final Messages Messages,
+		final AbstractComponentEditor editor, String label) {
 		createBindingContextWiget(parent, Messages, editor, label, null);
 	}
 
-	public static void createBindingContextWiget(Composite parent, final Messages Messages, final AbstractComponentEditor editor, String label, String tooltip) {
+	public static void createBindingContextWiget(Composite parent, final Messages Messages,
+		final AbstractComponentEditor editor, String label, String tooltip) {
 		{
-			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_ORDER, PickListFeatures.NO_PICKER), Messages, editor, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS) {
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_ORDER,
+				PickListFeatures.NO_PICKER), Messages, editor, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS) {
 				@Override
 				protected void addPressed() {
-					BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(getShell(), editor.getEditor().getModelProvider(), Messages);
+					final BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(getShell(), editor
+						.getEditor().getModelProvider(), Messages);
 					if (dialog.open() == IDialogConstants.OK_ID) {
-						Command cmd = AddCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(), CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, dialog.getSelectedContext());
+						final Command cmd = AddCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(),
+							CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, dialog.getSelectedContext());
 						if (cmd.canExecute()) {
 							editor.getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -569,17 +609,22 @@ protected void addPressed() {
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 
 			pickList.setText(label);
-			pickList.getList().setInput(EMFProperties.list(CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS).observeDetail(editor.getMaster()));
+			pickList.getList().setInput(
+				EMFProperties.list(CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS).observeDetail(
+					editor.getMaster()));
 		}
 	}
 
-	public static Composite createStringListWidget(Composite parent, Messages Messages, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
+	public static Composite createStringListWidget(Composite parent, Messages Messages,
+		final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
 		return createStringListWidget(parent, Messages, editor, label, null, feature, vIndent);
 	}
 
-	public static Composite createStringListWidget(Composite parent, Messages Messages, final AbstractComponentEditor editor, String label, String tooltip, final EStructuralFeature feature, int vIndent) {
+	public static Composite createStringListWidget(Composite parent, Messages Messages,
+		final AbstractComponentEditor editor, String label, String tooltip, final EStructuralFeature feature,
+		int vIndent) {
 
-		E4StringPickList pickList = new E4StringPickList(parent, SWT.NONE, null, Messages, editor, feature) {
+		final E4StringPickList pickList = new E4StringPickList(parent, SWT.NONE, null, Messages, editor, feature) {
 			@Override
 			protected void addPressed() {
 				handleAddText(editor, feature, getTextWidget());
@@ -606,17 +651,17 @@ public void keyPressed(KeyEvent e) {
 
 		final TableViewer viewer = pickList.getList();
 		viewer.setLabelProvider(new LabelProvider());
-		GridData gd = (GridData) viewer.getTable().getLayoutData();
+		final GridData gd = (GridData) viewer.getTable().getLayoutData();
 		gd.heightHint = 150;
 
-		IEMFListProperty prop = EMFProperties.list(feature);
+		final IEMFListProperty prop = EMFProperties.list(feature);
 		viewer.setInput(prop.observeDetail(editor.getMaster()));
 
 		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
 
 			@Override
 			public void selectionChanged(SelectionChangedEvent event) {
-				String strSelected = (String) ((StructuredSelection) event.getSelection()).getFirstElement();
+				final String strSelected = (String) ((StructuredSelection) event.getSelection()).getFirstElement();
 				t.setText(strSelected != null ? strSelected : ""); //$NON-NLS-1$
 			}
 		});
@@ -651,13 +696,13 @@ public void selectionChanged(SelectionChangedEvent event) {
 
 	private static void handleAddText(AbstractComponentEditor editor, EStructuralFeature feature, Text tagText) {
 		if (tagText.getText().trim().length() > 0) {
-			String[] tags = tagText.getText().split(";"); //$NON-NLS-1$
+			final String[] tags = tagText.getText().split(";"); //$NON-NLS-1$
 			for (int i = 0; i < tags.length; i++) {
 				tags[i] = tags[i].trim();
 			}
 
-			MApplicationElement appEl = (MApplicationElement) editor.getMaster().getValue();
-			Command cmd = AddCommand.create(editor.getEditingDomain(), appEl, feature, Arrays.asList(tags));
+			final MApplicationElement appEl = (MApplicationElement) editor.getMaster().getValue();
+			final Command cmd = AddCommand.create(editor.getEditingDomain(), appEl, feature, Arrays.asList(tags));
 			if (cmd.canExecute()) {
 				editor.getEditingDomain().getCommandStack().execute(cmd);
 			}
@@ -667,24 +712,26 @@ private static void handleAddText(AbstractComponentEditor editor, EStructuralFea
 
 	// This method is left in for reference purposes
 	@SuppressWarnings("unused")
-	private static void handleReplaceText(AbstractComponentEditor editor, EStructuralFeature feature, Text tagText, TableViewer viewer) {
+	private static void handleReplaceText(AbstractComponentEditor editor, EStructuralFeature feature, Text tagText,
+		TableViewer viewer) {
 		if (tagText.getText().trim().length() > 0) {
 			if (!viewer.getSelection().isEmpty()) {
-				String[] tags = tagText.getText().split(";"); //$NON-NLS-1$
+				final String[] tags = tagText.getText().split(";"); //$NON-NLS-1$
 				for (int i = 0; i < tags.length; i++) {
 					tags[i] = tags[i].trim();
 				}
 
-				MApplicationElement appEl = (MApplicationElement) editor.getMaster().getValue();
-				EObject el = (EObject) editor.getMaster().getValue();
-				List<?> ids = ((IStructuredSelection) viewer.getSelection()).toList();
-				Object curVal = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
-				EObject container = (EObject) editor.getMaster().getValue();
-				List<?> l = (List<?>) container.eGet(feature);
-				int idx = l.indexOf(curVal);
+				final MApplicationElement appEl = (MApplicationElement) editor.getMaster().getValue();
+				final EObject el = (EObject) editor.getMaster().getValue();
+				final List<?> ids = ((IStructuredSelection) viewer.getSelection()).toList();
+				final Object curVal = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+				final EObject container = (EObject) editor.getMaster().getValue();
+				final List<?> l = (List<?>) container.eGet(feature);
+				final int idx = l.indexOf(curVal);
 				if (idx >= 0) {
-					Command cmdRemove = RemoveCommand.create(editor.getEditingDomain(), el, feature, ids);
-					Command cmdInsert = AddCommand.create(editor.getEditingDomain(), appEl, feature, Arrays.asList(tags), idx);
+					final Command cmdRemove = RemoveCommand.create(editor.getEditingDomain(), el, feature, ids);
+					final Command cmdInsert = AddCommand.create(editor.getEditingDomain(), appEl, feature,
+						Arrays.asList(tags), idx);
 					if (cmdRemove.canExecute() && cmdInsert.canExecute()) {
 						editor.getEditingDomain().getCommandStack().execute(cmdRemove);
 						editor.getEditingDomain().getCommandStack().execute(cmdInsert);
@@ -695,38 +742,42 @@ private static void handleReplaceText(AbstractComponentEditor editor, EStructura
 		}
 	}
 
-	public static void createCheckBox(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty selectionProp, IEMFEditValueProperty modelProp) {
+	public static void createCheckBox(Composite parent, String label, IObservableValue master,
+		EMFDataBindingContext context, IWidgetValueProperty selectionProp, IEMFEditValueProperty modelProp) {
 		createCheckBox(parent, label, null, master, context, selectionProp, modelProp);
 	}
 
-	public static void createCheckBox(Composite parent, String label, String tooltip, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty selectionProp, IEMFEditValueProperty modelProp) {
-		Label l = new Label(parent, SWT.NONE);
+	public static void createCheckBox(Composite parent, String label, String tooltip, IObservableValue master,
+		EMFDataBindingContext context, IWidgetValueProperty selectionProp, IEMFEditValueProperty modelProp) {
+		final Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
 		if (tooltip != null) {
 			l.setToolTipText(tooltip);
 		}
 		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-		Button t = new Button(parent, SWT.CHECK);
+		final Button t = new Button(parent, SWT.CHECK);
 		t.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 		context.bindValue(selectionProp.observe(t), modelProp.observeDetail(master));
 
 	}
 
 	public static String getLocalizedLabel(ProjectOSGiTranslationProvider translationProvider, MUILabel element) {
-		return getLocalizedValue(translationProvider, (MApplicationElement) element, UiPackageImpl.Literals.UI_LABEL__LABEL, UiPackageImpl.Literals.UI_LABEL__LOCALIZED_LABEL);
+		return getLocalizedValue(translationProvider, (MApplicationElement) element,
+			UiPackageImpl.Literals.UI_LABEL__LABEL, UiPackageImpl.Literals.UI_LABEL__LOCALIZED_LABEL);
 	}
 
-	public static String getLocalizedValue(ProjectOSGiTranslationProvider translationProvider, MApplicationElement element, EStructuralFeature feature, EStructuralFeature localizedFeature) {
-		EObject eo = (EObject) element;
+	public static String getLocalizedValue(ProjectOSGiTranslationProvider translationProvider,
+		MApplicationElement element, EStructuralFeature feature, EStructuralFeature localizedFeature) {
+		final EObject eo = (EObject) element;
 		if (translationProvider == null) {
-			String value = (String) eo.eGet(localizedFeature);
+			final String value = (String) eo.eGet(localizedFeature);
 			if (value != null && value.trim().length() > 0) {
 				return value;
 			}
 		}
 
-		String value = (String) eo.eGet(feature);
+		final String value = (String) eo.eGet(feature);
 		if (value != null && value.trim().length() > 0) {
 			return tr(translationProvider, value);
 		}
@@ -736,8 +787,8 @@ public static String getLocalizedValue(ProjectOSGiTranslationProvider translatio
 
 	public static String tr(ProjectOSGiTranslationProvider translationProvider, String label) {
 		if (label.startsWith("%") && translationProvider != null) { //$NON-NLS-1$
-			String key = label.substring(1);
-			String translation = translationProvider.translate(key);
+			final String key = label.substring(1);
+			final String translation = translationProvider.translate(key);
 			return translation == key ? label : translation;
 		}
 		return label;
@@ -750,7 +801,7 @@ public void modifyText(ModifyEvent e) {
 				filter.setPattern(((Text) e.widget).getText());
 				viewer.refresh();
 				if (viewer.getTable().getItemCount() > 0) {
-					Object data = viewer.getTable().getItem(0).getData();
+					final Object data = viewer.getTable().getItem(0).getData();
 					viewer.setSelection(new StructuredSelection(data));
 				}
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index c1244db12b..f0f21c6d4c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -6,11 +6,12 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -38,6 +39,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+@SuppressWarnings("restriction")
 public class CoreExpressionEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
@@ -59,7 +61,8 @@ public String getLabel(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		if (((MCoreExpression) element).getCoreExpressionId() != null && ((MCoreExpression) element).getCoreExpressionId().trim().length() > 0) {
+		if (((MCoreExpression) element).getCoreExpressionId() != null
+			&& ((MCoreExpression) element).getCoreExpressionId().trim().length() > 0) {
 			return ((MCoreExpression) element).getCoreExpressionId();
 		}
 		return null;
@@ -83,7 +86,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -95,29 +98,33 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CoreExpressionEditor_ExpressionId);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.CORE_EXPRESSION__CORE_EXPRESSION_ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.CORE_EXPRESSION__CORE_EXPRESSION_ID)
+					.observeDetail(getMaster()));
 
 			if (getEditor().getExtensionLookup() == null) {
 				gd.horizontalSpan = 2;
 			} else {
-				Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+				final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 				b.setText(Messages.ModelTooling_Common_FindEllipsis);
 				b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 				b.addSelectionListener(new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
-						ExpressionIdDialog dialog = new ExpressionIdDialog(t.getShell(), getEditor().getExtensionLookup(), (MCoreExpression) getMaster().getValue(), getEditingDomain(), getEditor().isLiveModel(), Messages);
+						final ExpressionIdDialog dialog = new ExpressionIdDialog(t.getShell(), getEditor()
+							.getExtensionLookup(), (MCoreExpression) getMaster().getValue(), getEditingDomain(),
+							getEditor().isLiveModel(), Messages);
 						dialog.open();
 					}
 				});
@@ -130,8 +137,10 @@ public void widgetSelected(SelectionEvent e) {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createContributedEditorTabs(folder, context, getMaster(), MCoreExpression.class);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java
index 44495c0b3a..5985a49aab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java
@@ -6,12 +6,13 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.basic.MDialog;
@@ -24,12 +25,11 @@ public class DialogEditor extends WindowEditor {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_Dialog);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_Dialog);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_Dialog);
 		}
 
 		return null;
@@ -42,9 +42,9 @@ public String getLabel(Object element) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		List<Action> actions = new ArrayList<Action>();
+		final List<Action> actions = new ArrayList<Action>();
 
-		MDialog dialog = (MDialog) element;
+		final MDialog dialog = (MDialog) element;
 		if (dialog.getMainMenu() == null) {
 			actions.add(getActionAddMainMenu());
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 3ed7c8b5ae..1b24c05f75 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -6,12 +6,13 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 424730
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -57,8 +58,10 @@
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
+@SuppressWarnings("restriction")
 public class DirectMenuItemEditor extends MenuItemEditor {
-	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
+	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
+		.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
 	@Inject
 	IEclipseContext eclipseContext;
@@ -71,37 +74,37 @@ public DirectMenuItemEditor() {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_DirectMenuItem);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_DirectMenuItem);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_DirectMenuItem);
 		}
 
 		return null;
 	}
 
 	@Override
-	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master,
+		boolean isImport) {
 		if (!isImport) {
-			CTabFolder folder = super.createForm(parent, context, master, isImport);
+			final CTabFolder folder = super.createForm(parent, context, master, isImport);
 			createInstanceInspection(folder);
 			return folder;
-		} else {
-			return super.createForm(parent, context, master, isImport);
 		}
+		return super.createForm(parent, context, master, isImport);
 	}
 
 	private void createInstanceInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeContributionInstance);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		ObjectViewer objectViewer = new ObjectViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
+		final ObjectViewer objectViewer = new ObjectViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container,
+			ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
 	}
@@ -118,12 +121,13 @@ public String getDescription(Object element) {
 
 	@Override
 	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		// ------------------------------------------------------------
 		final Link lnk;
 		{
-			final IContributionClassCreator c = getEditor().getContributionCreator(MenuPackageImpl.Literals.DIRECT_MENU_ITEM);
+			final IContributionClassCreator c = getEditor().getContributionCreator(
+				MenuPackageImpl.Literals.DIRECT_MENU_ITEM);
 			if (project != null && c != null) {
 				lnk = new Link(parent, SWT.NONE);
 				lnk.setText("<A>" + Messages.DirectMenuItemEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
@@ -131,17 +135,18 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 				lnk.addSelectionListener(new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
-						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, lnk.getShell());
+						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project,
+							lnk.getShell());
 					}
 				});
 			} else {
 				lnk = null;
-				Label l = new Label(parent, SWT.NONE);
+				final Label l = new Label(parent, SWT.NONE);
 				l.setText(Messages.DirectMenuItemEditor_ClassURI);
 				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 			}
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.addModifyListener(new ModifyListener() {
@@ -149,11 +154,16 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void modifyText(ModifyEvent e) {
 					if (lnk != null) {
-						lnk.setToolTipText(((Text) (e.getSource())).getText());
+						lnk.setToolTipText(((Text) e.getSource()).getText());
 					}
 				}
 			});
-			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
+			final Binding binding = context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(),
+					ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master),
+				new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+				new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
@@ -163,7 +173,9 @@ public void modifyText(ModifyEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
+						getEditingDomain(), (MContribution) getMaster().getValue(),
+						ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 491be59d69..a36a712efe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -6,12 +6,13 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 424730
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -56,8 +57,10 @@
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
+@SuppressWarnings("restriction")
 public class DirectToolItemEditor extends ToolItemEditor {
-	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
+	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
+		.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
 	@Inject
 	IEclipseContext eclipseContext;
@@ -70,12 +73,11 @@ public DirectToolItemEditor() {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_DirectToolItem);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_DirectToolItem);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_DirectToolItem);
 		}
 
 		return null;
@@ -83,9 +85,10 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		final IContributionClassCreator c = getEditor().getContributionCreator(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM);
+		final IContributionClassCreator c = getEditor().getContributionCreator(
+			MenuPackageImpl.Literals.DIRECT_TOOL_ITEM);
 		final Link lnk;
 		if (project != null && c != null) {
 			lnk = new Link(parent, SWT.NONE);
@@ -99,12 +102,12 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		} else {
 			lnk = null;
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.DirectToolItemEditor_ClassURI);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 		}
 
-		Text t = new Text(parent, SWT.BORDER);
+		final Text t = new Text(parent, SWT.BORDER);
 		TextPasteHandler.createFor(t);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		t.addModifyListener(new ModifyListener() {
@@ -112,11 +115,14 @@ public void widgetSelected(SelectionEvent e) {
 			@Override
 			public void modifyText(ModifyEvent e) {
 				if (lnk != null) {
-					lnk.setToolTipText(((Text) (e.getSource())).getText());
+					lnk.setToolTipText(((Text) e.getSource()).getText());
 				}
 			}
 		});
-		Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
+		final Binding binding = context.bindValue(textProp.observeDelayed(200, t),
+			EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI)
+			.observeDetail(master), new UpdateValueStrategy()
+		.setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
 		Util.addDecoration(t, binding);
 
 		final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
@@ -126,32 +132,35 @@ public void modifyText(ModifyEvent e) {
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+				final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
+					getEditingDomain(), (MContribution) getMaster().getValue(),
+					ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 				dialog.open();
 			}
 		});
 	}
 
 	@Override
-	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master,
+		boolean isImport) {
 		if (!isImport) {
-			CTabFolder folder = super.createForm(parent, context, master, isImport);
+			final CTabFolder folder = super.createForm(parent, context, master, isImport);
 			createInstanceInspection(folder);
 			return folder;
-		} else {
-			return super.createForm(parent, context, master, isImport);
 		}
+		return super.createForm(parent, context, master, isImport);
 	}
 
 	private void createInstanceInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeContributionInstance);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		ObjectViewer objectViewer = new ObjectViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
+		final ObjectViewer objectViewer = new ObjectViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container,
+			ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
 	}

From 9bc490283835e1ae77101218e3efddc811761beb Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Sun, 23 Nov 2014 23:38:18 +0100
Subject: [PATCH 0858/1286] Bug 445742 - Which bundles are transfered to
 Platform? Removed liveeditor.js and spy (spy is part of the spy features)

---
 .../feature.xml                               | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index e2cf7a83bd..a87926e158 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -52,20 +52,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.e4.tools.emf.ui.script.js"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.mozilla.javascript"
-         download-size="0"
-         install-size="0"
-         version="1.7.2.qualifier"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.e4.tools.jdt.templates"
          download-size="0"
@@ -80,11 +66,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.e4.tools.spy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>

From 273b2e747f262cdc328df0ce076e71655bf41f45 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Tue, 25 Nov 2014 18:45:44 +0100
Subject: [PATCH 0859/1286] Bug 444692 - Remove Warnings

---
 .../dialogs/AreaIconDialogEditor.java         | 11 ++-
 .../BindingContextSelectionDialog.java        | 37 +++----
 .../component/dialogs/BundleImageCache.java   | 28 +++---
 .../CommandCategorySelectionDialog.java       | 43 ++++----
 .../dialogs/ContributionDataFile.java         | 55 ++++++-----
 .../component/dialogs/ExpressionIdDialog.java | 43 ++++----
 .../dialogs/FeatureSelectionDialog.java       | 98 ++++++++++---------
 .../dialogs/FindImportElementDialog.java      | 67 +++++++------
 .../FindParentReferenceElementDialog.java     | 90 +++++++++--------
 ...HandledMenuItemCommandSelectionDialog.java |  8 +-
 10 files changed, 269 insertions(+), 211 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
index 2fe2faaf96..03c813d3a1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 433408, 424730
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Bug 433408, 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -19,10 +19,13 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
+@SuppressWarnings("restriction")
 public class AreaIconDialogEditor extends AbstractIconDialog {
 
-	public AreaIconDialogEditor(Shell parentShell, IEclipseContext context, IProject project, EditingDomain editingDomain, MApplicationElement element, Messages Messages) {
-		super(parentShell, context, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
+	public AreaIconDialogEditor(Shell parentShell, IEclipseContext context, IProject project,
+		EditingDomain editingDomain, MApplicationElement element, Messages Messages) {
+		super(parentShell, context, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI,
+			Messages);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
index dad7b1bcdd..b491829606 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
@@ -6,13 +6,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
@@ -45,11 +46,12 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
+@SuppressWarnings("restriction")
 public class BindingContextSelectionDialog extends SaveDialogBoundsSettingsDialog {
-	private IModelResource resource;
+	private final IModelResource resource;
 	private TableViewer viewer;
 	private MBindingContext selectedContext;
-	private Messages Messages;
+	private final Messages Messages;
 
 	public BindingContextSelectionDialog(Shell parentShell, IModelResource resource, Messages Messages) {
 		super(parentShell);
@@ -63,12 +65,13 @@ public MBindingContext getSelectedContext() {
 
 	@Override
 	protected Control createDialogArea(Composite parent) {
-		Composite composite = (Composite) super.createDialogArea(parent);
+		final Composite composite = (Composite) super.createDialogArea(parent);
 		getShell().setText(Messages.BindingContextSelectionDialog_ShellTitle);
 		setTitle(Messages.BindingContextSelectionDialog_Title);
 		setMessage(Messages.BindingContextSelectionDialog_Message);
 
-		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
+		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream(
+			"/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
 
@@ -78,14 +81,14 @@ public void widgetDisposed(DisposeEvent e) {
 			}
 		});
 
-		Composite container = new Composite(composite, SWT.NONE);
+		final Composite container = new Composite(composite, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 		container.setLayout(new GridLayout(2, false));
 
-		Label l = new Label(container, SWT.NONE);
+		final Label l = new Label(container, SWT.NONE);
 		l.setText(Messages.BindingContextSelectionDialog_LabelContextId);
 
-		Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		final Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		new Label(container, SWT.NONE);
@@ -101,10 +104,10 @@ public void doubleClick(DoubleClickEvent event) {
 			}
 		});
 
-		List<EObject> categories = new ArrayList<EObject>();
-		TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
+		final List<EObject> categories = new ArrayList<EObject>();
+		final TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
 		while (it.hasNext()) {
-			EObject o = it.next();
+			final EObject o = it.next();
 			if (o.eClass() == CommandsPackageImpl.Literals.BINDING_CONTEXT) {
 				categories.add(o);
 			}
@@ -126,9 +129,9 @@ protected boolean isParentMatch(Viewer viewer, Object element) {
 
 	@Override
 	protected void okPressed() {
-		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+		final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 		if (!s.isEmpty()) {
-			selectedContext = ((MBindingContext) s.getFirstElement());
+			selectedContext = (MBindingContext) s.getFirstElement();
 			if (selectedContext != null) {
 				super.okPressed();
 			} else {
@@ -141,9 +144,9 @@ private static class LabelProviderImpl extends StyledCellLabelProvider implement
 
 		@Override
 		public void update(final ViewerCell cell) {
-			MBindingContext cmd = (MBindingContext) cell.getElement();
+			final MBindingContext cmd = (MBindingContext) cell.getElement();
 
-			StyledString styledString = new StyledString();
+			final StyledString styledString = new StyledString();
 			if (cmd.getName() != null) {
 				styledString.append(cmd.getName());
 			}
@@ -169,7 +172,7 @@ public Image getImage(Object element) {
 
 		@Override
 		public String getText(Object element) {
-			MBindingContext command = (MBindingContext) element;
+			final MBindingContext command = (MBindingContext) element;
 			String s = ""; //$NON-NLS-1$
 			if (command.getName() != null) {
 				s += command.getName();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
index 470eb0aa71..45f014b948 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
@@ -6,13 +6,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Iterator;
+
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.swt.graphics.Image;
@@ -34,11 +35,11 @@
  */
 public class BundleImageCache {
 
-	private Display display;
-	private ClassLoader classloader;
+	private final Display display;
+	private final ClassLoader classloader;
 	ArrayList<Image> images;
 	static private Image imgPlaceholder;
-	private IEclipseContext context;
+	private final IEclipseContext context;
 
 	public BundleImageCache(Display display, ClassLoader classloader) {
 		this(display, classloader, null);
@@ -55,14 +56,14 @@ public BundleImageCache(Display display, ClassLoader classloader, IEclipseContex
 	 * Creates the image, and tracks it for a bulk dispose operation.
 	 *
 	 * @param path
-	 * @return
+	 * @return the {@link Image}
 	 */
 	public Image create(String path) {
 		Image img;
 		try {
 			img = new Image(display, classloader.getResourceAsStream(path));
 			images.add(img);
-		} catch (Exception e) {
+		} catch (final Exception e) {
 			e.printStackTrace();
 			img = getPlaceholder();
 		}
@@ -71,15 +72,15 @@ public Image create(String path) {
 
 	/**
 	 * Uses IResourcePool to obtain image. Does not track object.
-	 * 
+	 *
 	 * @param key
-	 * @return
+	 * @return The {@link Image}
 	 */
 	public Image loadFromKey(String key) {
 		Image ret = null;
 		try {
 			ret = context.get(IResourcePool.class).getImageUnchecked(key);
-		} catch (Exception ex) {
+		} catch (final Exception ex) {
 			ex.printStackTrace();
 		}
 		if (ret == null) {
@@ -90,7 +91,8 @@ public Image loadFromKey(String key) {
 
 	protected Image getPlaceholder() {
 		if (imgPlaceholder == null) {
-			imgPlaceholder = new Image(Display.getDefault(), classloader.getResourceAsStream("/icons/full/obj16/missing_image_placeholder.png")); //$NON-NLS-1$
+			imgPlaceholder = new Image(Display.getDefault(),
+				classloader.getResourceAsStream("/icons/full/obj16/missing_image_placeholder.png")); //$NON-NLS-1$
 		}
 		return imgPlaceholder;
 	}
@@ -103,8 +105,8 @@ protected void finalize() throws Throwable {
 	}
 
 	public void dispose() {
-		for (Iterator<Image> it = images.iterator(); it.hasNext();) {
-			Image image = it.next();
+		for (final Iterator<Image> it = images.iterator(); it.hasNext();) {
+			final Image image = it.next();
 			if (image.isDisposed() == false) {
 				image.dispose();
 			}
@@ -120,7 +122,7 @@ public Image create(String bundleId, String path) {
 		try {
 			img = new Image(display, new URL("platform:/plugin/" + bundleId + path).openStream()); //$NON-NLS-1$
 			images.add(img);
-		} catch (Exception e) {
+		} catch (final Exception e) {
 			e.printStackTrace();
 			img = getPlaceholder();
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
index 7211295489..83f71d945b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -6,13 +6,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
@@ -48,13 +49,15 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
+@SuppressWarnings("restriction")
 public class CommandCategorySelectionDialog extends SaveDialogBoundsSettingsDialog {
-	private IModelResource resource;
+	private final IModelResource resource;
 	private TableViewer viewer;
-	private MCommand command;
-	private Messages Messages;
+	private final MCommand command;
+	private final Messages Messages;
 
-	public CommandCategorySelectionDialog(Shell parentShell, IModelResource resource, MCommand command, Messages Messages) {
+	public CommandCategorySelectionDialog(Shell parentShell, IModelResource resource, MCommand command,
+		Messages Messages) {
 		super(parentShell);
 		this.resource = resource;
 		this.command = command;
@@ -63,12 +66,13 @@ public CommandCategorySelectionDialog(Shell parentShell, IModelResource resource
 
 	@Override
 	protected Control createDialogArea(Composite parent) {
-		Composite composite = (Composite) super.createDialogArea(parent);
+		final Composite composite = (Composite) super.createDialogArea(parent);
 		getShell().setText(Messages.CommandCategorySelectionDialog_ShellTitle);
 		setTitle(Messages.CommandCategorySelectionDialog_Title);
 		setMessage(Messages.CommandCategorySelectionDialog_Message);
 
-		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
+		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream(
+			"/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
 
@@ -78,14 +82,14 @@ public void widgetDisposed(DisposeEvent e) {
 			}
 		});
 
-		Composite container = new Composite(composite, SWT.NONE);
+		final Composite container = new Composite(composite, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 		container.setLayout(new GridLayout(2, false));
 
-		Label l = new Label(container, SWT.NONE);
+		final Label l = new Label(container, SWT.NONE);
 		l.setText(Messages.CommandCategorySelectionDialog_LabelCategoryId);
 
-		Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		final Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		new Label(container, SWT.NONE);
@@ -101,10 +105,10 @@ public void doubleClick(DoubleClickEvent event) {
 			}
 		});
 
-		List<EObject> categories = new ArrayList<EObject>();
-		TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
+		final List<EObject> categories = new ArrayList<EObject>();
+		final TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
 		while (it.hasNext()) {
-			EObject o = it.next();
+			final EObject o = it.next();
 			if (o.eClass() == CommandsPackageImpl.Literals.CATEGORY) {
 				categories.add(o);
 			}
@@ -126,9 +130,10 @@ protected boolean isParentMatch(Viewer viewer, Object element) {
 
 	@Override
 	protected void okPressed() {
-		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+		final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 		if (!s.isEmpty()) {
-			Command cmd = SetCommand.create(resource.getEditingDomain(), command, CommandsPackageImpl.Literals.COMMAND__CATEGORY, s.getFirstElement());
+			final Command cmd = SetCommand.create(resource.getEditingDomain(), command,
+				CommandsPackageImpl.Literals.COMMAND__CATEGORY, s.getFirstElement());
 			if (cmd.canExecute()) {
 				resource.getEditingDomain().getCommandStack().execute(cmd);
 				super.okPressed();
@@ -140,9 +145,9 @@ private static class LabelProviderImpl extends StyledCellLabelProvider implement
 
 		@Override
 		public void update(final ViewerCell cell) {
-			MCategory cmd = (MCategory) cell.getElement();
+			final MCategory cmd = (MCategory) cell.getElement();
 
-			StyledString styledString = new StyledString();
+			final StyledString styledString = new StyledString();
 			if (cmd.getName() != null) {
 				styledString.append(cmd.getName());
 			}
@@ -165,7 +170,7 @@ public Image getImage(Object element) {
 
 		@Override
 		public String getText(Object element) {
-			MCategory command = (MCategory) element;
+			final MCategory command = (MCategory) element;
 			String s = ""; //$NON-NLS-1$
 			if (command.getName() != null) {
 				s += command.getName();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
index 2750f6138a..82461709c9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
@@ -22,6 +22,7 @@
 import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
+
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFileState;
@@ -53,13 +54,13 @@
  */
 public class ContributionDataFile implements IFile {
 
-	private ContributionData data;
+	private final ContributionData data;
 	private IPath path;
 
 	public ContributionDataFile(ContributionData data) {
 		this.data = data;
 		if (data.iconPath != null) {
-			this.path = Path.fromOSString(data.iconPath);
+			path = Path.fromOSString(data.iconPath);
 		}
 	}
 
@@ -75,9 +76,8 @@ public ContributionData getContributionData() {
 	public IPath getProjectRelativePath() {
 		if (getContributionData().installLocation != null) {
 			return new Path(data.resourceRelativePath);
-		} else {
-			return new Path(data.iconPath);
 		}
+		return new Path(data.iconPath);
 	}
 
 	@Override
@@ -349,6 +349,7 @@ public boolean isLinked(int options) {
 		return false;
 	}
 
+	@Deprecated
 	@Override
 	public boolean isLocal(int depth) {
 		// TODO Auto-generated method stub
@@ -392,7 +393,8 @@ public void move(IPath destination, int updateFlags, IProgressMonitor monitor) t
 	}
 
 	@Override
-	public void move(IProjectDescription description, boolean force, boolean keepHistory, IProgressMonitor monitor) throws CoreException {
+	public void move(IProjectDescription description, boolean force, boolean keepHistory, IProgressMonitor monitor)
+		throws CoreException {
 		// TODO Auto-generated method stub
 
 	}
@@ -415,6 +417,7 @@ public void revertModificationStamp(long value) throws CoreException {
 
 	}
 
+	@Deprecated
 	@Override
 	public void setDerived(boolean isDerived) throws CoreException {
 		// TODO Auto-generated method stub
@@ -433,6 +436,7 @@ public void setHidden(boolean isHidden) throws CoreException {
 
 	}
 
+	@Deprecated
 	@Override
 	public void setLocal(boolean flag, int depth, IProgressMonitor monitor) throws CoreException {
 		// TODO Auto-generated method stub
@@ -451,6 +455,7 @@ public void setPersistentProperty(QualifiedName key, String value) throws CoreEx
 
 	}
 
+	@Deprecated
 	@Override
 	public void setReadOnly(boolean readOnly) {
 		// TODO Auto-generated method stub
@@ -500,7 +505,8 @@ public boolean isConflicting(ISchedulingRule rule) {
 	}
 
 	@Override
-	public void appendContents(InputStream source, boolean force, boolean keepHistory, IProgressMonitor monitor) throws CoreException {
+	public void appendContents(InputStream source, boolean force, boolean keepHistory, IProgressMonitor monitor)
+		throws CoreException {
 		// TODO Auto-generated method stub
 
 	}
@@ -579,20 +585,20 @@ public InputStream getContents() throws CoreException {
 					entry = zip.getEntry(data.iconPath);
 				}
 				return zip.getInputStream(entry);
-			} else {
-				url = new URL("platform:/plugin/" + data.bundleName + "/" + data.iconPath); //$NON-NLS-1$ //$NON-NLS-2$
-				InputStream ret;
-				try {
-					ret = url.openStream();
-				} catch (Exception e) {
-					return new BufferedInputStream(new FileInputStream(data.installLocation + "/" + data.resourceRelativePath)); //$NON-NLS-1$
-				}
-				return ret;
 			}
-		} catch (MalformedURLException e) {
+			url = new URL("platform:/plugin/" + data.bundleName + "/" + data.iconPath); //$NON-NLS-1$ //$NON-NLS-2$
+			InputStream ret;
+			try {
+				ret = url.openStream();
+			} catch (final Exception e) {
+				return new BufferedInputStream(new FileInputStream(data.installLocation
+					+ "/" + data.resourceRelativePath)); //$NON-NLS-1$
+			}
+			return ret;
+		} catch (final MalformedURLException e) {
 			e.printStackTrace();
 			throw new CoreException(Status.CANCEL_STATUS);
-		} catch (IOException e) {
+		} catch (final IOException e) {
 			// perhaps not a bundle
 			// e.printStackTrace();
 			throw new CoreException(Status.CANCEL_STATUS);
@@ -600,7 +606,7 @@ public InputStream getContents() throws CoreException {
 			if (zip != null) {
 				try {
 					zip.close();
-				} catch (IOException e) {
+				} catch (final IOException e) {
 				}
 			}
 		}
@@ -612,6 +618,7 @@ public InputStream getContents(boolean force) throws CoreException {
 		return null;
 	}
 
+	@Deprecated
 	@Override
 	public int getEncoding() throws CoreException {
 		// TODO Auto-generated method stub
@@ -642,11 +649,13 @@ public boolean isReadOnly() {
 	}
 
 	@Override
-	public void move(IPath destination, boolean force, boolean keepHistory, IProgressMonitor monitor) throws CoreException {
+	public void move(IPath destination, boolean force, boolean keepHistory, IProgressMonitor monitor)
+		throws CoreException {
 		// TODO Auto-generated method stub
 
 	}
 
+	@Deprecated
 	@Override
 	public void setCharset(String newCharset) throws CoreException {
 		// TODO Auto-generated method stub
@@ -660,13 +669,15 @@ public void setCharset(String newCharset, IProgressMonitor monitor) throws CoreE
 	}
 
 	@Override
-	public void setContents(InputStream source, boolean force, boolean keepHistory, IProgressMonitor monitor) throws CoreException {
+	public void setContents(InputStream source, boolean force, boolean keepHistory, IProgressMonitor monitor)
+		throws CoreException {
 		// TODO Auto-generated method stub
 
 	}
 
 	@Override
-	public void setContents(IFileState source, boolean force, boolean keepHistory, IProgressMonitor monitor) throws CoreException {
+	public void setContents(IFileState source, boolean force, boolean keepHistory, IProgressMonitor monitor)
+		throws CoreException {
 		// TODO Auto-generated method stub
 
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
index 4e3db84a11..f3f859b4b6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
@@ -6,13 +6,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.e4.tools.emf.ui.common.IExtensionLookup;
@@ -45,15 +46,17 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
+@SuppressWarnings("restriction")
 public class ExpressionIdDialog extends SaveDialogBoundsSettingsDialog {
-	private IExtensionLookup lookup;
+	private final IExtensionLookup lookup;
 	private TableViewer viewer;
-	private EditingDomain domain;
-	private MCoreExpression expression;
-	private boolean liveModel;
-	private Messages Messages;
+	private final EditingDomain domain;
+	private final MCoreExpression expression;
+	private final boolean liveModel;
+	private final Messages Messages;
 
-	public ExpressionIdDialog(Shell parentShell, IExtensionLookup lookup, MCoreExpression expression, EditingDomain domain, boolean liveModel, Messages Messages) {
+	public ExpressionIdDialog(Shell parentShell, IExtensionLookup lookup, MCoreExpression expression,
+		EditingDomain domain, boolean liveModel, Messages Messages) {
 		super(parentShell);
 		this.lookup = lookup;
 		this.expression = expression;
@@ -67,15 +70,15 @@ protected Control createDialogArea(Composite parent) {
 		getShell().setText(Messages.ExpressionIdDialog_ShellTitle);
 		setTitle(Messages.ExpressionIdDialog_DialogTitle);
 		setMessage(Messages.ExpressionIdDialog_DialogMessage);
-		Composite comp = (Composite) super.createDialogArea(parent);
-		Composite container = new Composite(comp, SWT.NONE);
+		final Composite comp = (Composite) super.createDialogArea(parent);
+		final Composite container = new Composite(comp, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 		container.setLayout(new GridLayout(2, false));
 
 		Label l = new Label(container, SWT.NONE);
 		l.setText(Messages.ExpressionIdDialog_Id);
 
-		Text idField = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		final Text idField = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		idField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		final PatternFilter filter = new PatternFilter() {
@@ -108,8 +111,10 @@ public void doubleClick(DoubleClickEvent event) {
 	@Override
 	protected void okPressed() {
 		if (!viewer.getSelection().isEmpty()) {
-			IConfigurationElement el = (IConfigurationElement) ((IStructuredSelection) viewer.getSelection()).getFirstElement();
-			Command cmd = SetCommand.create(domain, expression, UiPackageImpl.Literals.CORE_EXPRESSION__CORE_EXPRESSION_ID, el.getAttribute("id")); //$NON-NLS-1$
+			final IConfigurationElement el = (IConfigurationElement) ((IStructuredSelection) viewer.getSelection())
+				.getFirstElement();
+			final Command cmd = SetCommand.create(domain, expression,
+				UiPackageImpl.Literals.CORE_EXPRESSION__CORE_EXPRESSION_ID, el.getAttribute("id")); //$NON-NLS-1$
 			if (cmd.canExecute()) {
 				domain.getCommandStack().execute(cmd);
 				super.okPressed();
@@ -118,9 +123,9 @@ protected void okPressed() {
 	}
 
 	private List<IConfigurationElement> getElements(IExtensionLookup lookup) {
-		List<IConfigurationElement> list = new ArrayList<IConfigurationElement>();
-		for (IExtension ext : lookup.findExtensions("org.eclipse.core.expressions.definitions", liveModel)) { //$NON-NLS-1$
-			for (IConfigurationElement el : ext.getConfigurationElements()) {
+		final List<IConfigurationElement> list = new ArrayList<IConfigurationElement>();
+		for (final IExtension ext : lookup.findExtensions("org.eclipse.core.expressions.definitions", liveModel)) { //$NON-NLS-1$
+			for (final IConfigurationElement el : ext.getConfigurationElements()) {
 				list.add(el);
 			}
 		}
@@ -130,8 +135,8 @@ private List<IConfigurationElement> getElements(IExtensionLookup lookup) {
 	static class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
 		@Override
 		public void update(ViewerCell cell) {
-			IConfigurationElement el = (IConfigurationElement) cell.getElement();
-			StyledString str = new StyledString(el.getAttribute("id")); //$NON-NLS-1$
+			final IConfigurationElement el = (IConfigurationElement) cell.getElement();
+			final StyledString str = new StyledString(el.getAttribute("id")); //$NON-NLS-1$
 			str.append(" - " + el.getContributor().getName(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 			cell.setText(str.getString());
 			cell.setStyleRanges(str.getStyleRanges());
@@ -144,7 +149,7 @@ public Image getImage(Object element) {
 
 		@Override
 		public String getText(Object element) {
-			IConfigurationElement el = (IConfigurationElement) element;
+			final IConfigurationElement el = (IConfigurationElement) element;
 			return el.getAttribute("id") + " " + el.getContributor().getName(); //$NON-NLS-1$//$NON-NLS-2$
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index 9f3918f82c..866fcd9fd0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -6,14 +6,15 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import java.text.BreakIterator;
 import java.util.ArrayList;
 import java.util.List;
+
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.Util.InternalClass;
 import org.eclipse.e4.tools.emf.ui.common.Util.InternalFeature;
@@ -58,14 +59,16 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
+@SuppressWarnings("restriction")
 public class FeatureSelectionDialog extends SaveDialogBoundsSettingsDialog {
 	private TreeViewer viewer;
-	private MStringModelFragment fragment;
-	private EditingDomain editingDomain;
-	private Messages Messages;
+	private final MStringModelFragment fragment;
+	private final EditingDomain editingDomain;
+	private final Messages Messages;
 	private ViewerFilterImpl filter;
 
-	public FeatureSelectionDialog(Shell parentShell, EditingDomain editingDomain, MStringModelFragment fragment, Messages Messages) {
+	public FeatureSelectionDialog(Shell parentShell, EditingDomain editingDomain, MStringModelFragment fragment,
+		Messages Messages) {
 		super(parentShell);
 		this.fragment = fragment;
 		this.editingDomain = editingDomain;
@@ -83,12 +86,16 @@ protected Control createDialogArea(Composite parent) {
 		setTitle(Messages.FeatureSelectionDialog_DialogTitle);
 		setMessage(Messages.FeatureSelectionDialog_DialogMessage);
 
-		Composite composite = (Composite) super.createDialogArea(parent);
+		final Composite composite = (Composite) super.createDialogArea(parent);
 
-		final Image packageImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/EPackage.gif")); //$NON-NLS-1$
-		final Image classImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/class_obj.gif")); //$NON-NLS-1$
-		final Image featureImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/field_public_obj.gif")); //$NON-NLS-1$
-		final Image newTitleImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/fieldrefact_wiz.png")); //$NON-NLS-1$
+		final Image packageImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream(
+			"/icons/full/obj16/EPackage.gif")); //$NON-NLS-1$
+		final Image classImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream(
+			"/icons/full/obj16/class_obj.gif")); //$NON-NLS-1$
+		final Image featureImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream(
+			"/icons/full/obj16/field_public_obj.gif")); //$NON-NLS-1$
+		final Image newTitleImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream(
+			"/icons/full/wizban/fieldrefact_wiz.png")); //$NON-NLS-1$
 
 		setTitleImage(newTitleImage);
 
@@ -103,11 +110,11 @@ public void widgetDisposed(DisposeEvent e) {
 			}
 		});
 
-		Composite container = new Composite(composite, SWT.NONE);
+		final Composite container = new Composite(composite, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 		container.setLayout(new GridLayout(2, false));
 
-		Label l = new Label(container, SWT.NONE);
+		final Label l = new Label(container, SWT.NONE);
 		l.setText(Messages.FeatureSelectionDialog_Filter);
 
 		final Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
@@ -132,7 +139,7 @@ public void modifyText(ModifyEvent e) {
 		});
 		new Label(container, SWT.NONE);
 		viewer = new TreeViewer(container);
-		GridData gd = new GridData(GridData.FILL_BOTH);
+		final GridData gd = new GridData(GridData.FILL_BOTH);
 		gd.heightHint = 200;
 		viewer.getControl().setLayoutData(gd);
 		viewer.setContentProvider(new ContentProviderImpl());
@@ -148,7 +155,8 @@ public void doubleClick(DoubleClickEvent event) {
 			@Override
 			public int compare(Viewer viewer, Object e1, Object e2) {
 				if (e1.getClass() == InternalPackage.class) {
-					return ((InternalPackage) e1).ePackage.getNsURI().compareTo(((InternalPackage) e2).ePackage.getNsURI());
+					return ((InternalPackage) e1).ePackage.getNsURI().compareTo(
+						((InternalPackage) e2).ePackage.getNsURI());
 				} else if (e1.getClass() == InternalClass.class) {
 					return ((InternalClass) e1).eClass.getName().compareTo(((InternalClass) e2).eClass.getName());
 				} else if (e1.getClass() == InternalFeature.class) {
@@ -160,12 +168,13 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
 			@Override
 			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-				Button buttonOk = getButton(IDialogConstants.OK_ID);
-				if (!selection.isEmpty() && selection.getFirstElement().getClass() == InternalFeature.class)
+				final IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+				final Button buttonOk = getButton(IDialogConstants.OK_ID);
+				if (!selection.isEmpty() && selection.getFirstElement().getClass() == InternalFeature.class) {
 					buttonOk.setEnabled(true);
-				else
+				} else {
 					buttonOk.setEnabled(false);
+				}
 			}
 		});
 
@@ -180,10 +189,11 @@ public void selectionChanged(SelectionChangedEvent event) {
 
 	@Override
 	protected void okPressed() {
-		IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
+		final IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
 		if (!sel.isEmpty() && sel.getFirstElement().getClass() == InternalFeature.class) {
-			InternalFeature f = (InternalFeature) sel.getFirstElement();
-			Command cmd = SetCommand.create(editingDomain, fragment, FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME, f.feature.getName());
+			final InternalFeature f = (InternalFeature) sel.getFirstElement();
+			final Command cmd = SetCommand.create(editingDomain, fragment,
+				FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME, f.feature.getName());
 
 			if (cmd.canExecute()) {
 				editingDomain.getCommandStack().execute(cmd);
@@ -250,21 +260,21 @@ public LabelProviderImpl(Image packageImage, Image classImage, Image featureImag
 		@Override
 		public void update(final ViewerCell cell) {
 			if (cell.getElement().getClass() == InternalPackage.class) {
-				InternalPackage o = (InternalPackage) cell.getElement();
-				StyledString styledString = new StyledString(o.ePackage.getName());
+				final InternalPackage o = (InternalPackage) cell.getElement();
+				final StyledString styledString = new StyledString(o.ePackage.getName());
 				styledString.append(" - " + o.ePackage.getNsURI(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 				cell.setText(styledString.getString());
 				cell.setStyleRanges(styledString.getStyleRanges());
 				cell.setImage(packageImage);
 			} else if (cell.getElement().getClass() == InternalClass.class) {
-				InternalClass o = (InternalClass) cell.getElement();
+				final InternalClass o = (InternalClass) cell.getElement();
 				cell.setText(o.eClass.getName());
 				cell.setImage(classImage);
 			} else {
-				InternalFeature o = (InternalFeature) cell.getElement();
-				StyledString styledString = new StyledString(o.feature.getName());
+				final InternalFeature o = (InternalFeature) cell.getElement();
+				final StyledString styledString = new StyledString(o.feature.getName());
 
-				EClassifier type = ModelUtils.getTypeArgument(o.clazz.eClass, o.feature.getEGenericType());
+				final EClassifier type = ModelUtils.getTypeArgument(o.clazz.eClass, o.feature.getEGenericType());
 				if (o.feature.isMany()) {
 					styledString.append(" : List<" + type.getName() + ">", StyledString.DECORATIONS_STYLER); //$NON-NLS-1$ //$NON-NLS-2$
 				} else {
@@ -285,13 +295,13 @@ public Image getImage(Object element) {
 		@Override
 		public String getText(Object element) {
 			if (element.getClass() == InternalPackage.class) {
-				InternalPackage o = (InternalPackage) element;
+				final InternalPackage o = (InternalPackage) element;
 				return o.ePackage.getName();
 			} else if (element.getClass() == InternalClass.class) {
-				InternalClass o = (InternalClass) element;
+				final InternalClass o = (InternalClass) element;
 				return o.eClass.getName();
 			} else {
-				InternalFeature o = (InternalFeature) element;
+				final InternalFeature o = (InternalFeature) element;
 				return o.feature.getName();
 			}
 		}
@@ -303,14 +313,14 @@ static class ViewerFilterImpl extends ViewerFilter {
 
 		@Override
 		public boolean select(Viewer viewer, Object parentElement, Object element) {
-			ILabelProvider pv = (ILabelProvider) ((StructuredViewer) viewer).getLabelProvider();
+			final ILabelProvider pv = (ILabelProvider) ((StructuredViewer) viewer).getLabelProvider();
 
 			if (element.getClass() == InternalPackage.class) {
-				for (InternalClass c : ((InternalPackage) element).classes) {
+				for (final InternalClass c : ((InternalPackage) element).classes) {
 					if (match(pv.getText(c))) {
 						return true;
 					}
-					for (InternalFeature f : c.features) {
+					for (final InternalFeature f : c.features) {
 						if (match(pv.getText(f))) {
 							return true;
 						}
@@ -321,7 +331,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 				if (match(pv.getText(element))) {
 					return true;
 				}
-				for (InternalFeature f : ((InternalClass) element).features) {
+				for (final InternalFeature f : ((InternalClass) element).features) {
 					if (match(pv.getText(f))) {
 						return true;
 					}
@@ -344,9 +354,9 @@ protected boolean wordMatches(String text) {
 			}
 
 			// Otherwise check if any of the words of the text matches
-			String[] words = getWords(text);
+			final String[] words = getWords(text);
 			for (int i = 0; i < words.length; i++) {
-				String word = words[i];
+				final String word = words[i];
 				if (match(word)) {
 					return true;
 				}
@@ -357,10 +367,10 @@ protected boolean wordMatches(String text) {
 
 		/**
 		 * Answers whether the given String matches the pattern.
-		 * 
+		 *
 		 * @param string
 		 *            the String to test
-		 * 
+		 *
 		 * @return whether the string matches the pattern
 		 */
 		private boolean match(String string) {
@@ -373,7 +383,7 @@ private boolean match(String string) {
 		/**
 		 * The pattern string for which this filter should select elements in
 		 * the viewer.
-		 * 
+		 *
 		 * @param patternString
 		 */
 		public void setPattern(String patternString) {
@@ -392,12 +402,12 @@ public void setPattern(String patternString) {
 		/**
 		 * Take the given filter text and break it down into words using a
 		 * BreakIterator.
-		 * 
+		 *
 		 * @param text
 		 * @return an array of words
 		 */
 		private String[] getWords(String text) {
-			List<String> words = new ArrayList<String>();
+			final List<String> words = new ArrayList<String>();
 			// Break the text up into words, separating based on whitespace and
 			// common punctuation.
 			// Previously used String.split(..., "\\W"), where "\W" is a regular
@@ -408,7 +418,7 @@ private String[] getWords(String text) {
 			// Also need to do this in an NL-sensitive way. The use of
 			// BreakIterator
 			// was suggested in bug 90579.
-			BreakIterator iter = BreakIterator.getWordInstance();
+			final BreakIterator iter = BreakIterator.getWordInstance();
 			iter.setText(text);
 			int i = iter.first();
 			while (i != java.text.BreakIterator.DONE && i < text.length()) {
@@ -418,7 +428,7 @@ private String[] getWords(String text) {
 				}
 				// match the word
 				if (Character.isLetterOrDigit(text.charAt(i))) {
-					String word = text.substring(i, j);
+					final String word = text.substring(i, j);
 					words.add(word);
 				}
 				i = j;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index c4de676968..25e5a20d58 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -53,11 +53,12 @@
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
 
+@SuppressWarnings("restriction")
 public class FindImportElementDialog extends SaveDialogBoundsSettingsDialog {
-	private EObject element;
-	private AbstractComponentEditor editor;
+	private final EObject element;
+	private final AbstractComponentEditor editor;
 	private TableViewer viewer;
-	private Messages Messages;
+	private final Messages Messages;
 
 	public FindImportElementDialog(Shell parentShell, AbstractComponentEditor editor, EObject element, Messages Messages) {
 		super(parentShell);
@@ -68,9 +69,10 @@ public FindImportElementDialog(Shell parentShell, AbstractComponentEditor editor
 
 	@Override
 	protected Control createDialogArea(Composite parent) {
-		Composite comp = (Composite) super.createDialogArea(parent);
+		final Composite comp = (Composite) super.createDialogArea(parent);
 
-		final Image titleImage = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/import_wiz.png")); //$NON-NLS-1$
+		final Image titleImage = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream(
+			"/icons/full/wizban/import_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
 
@@ -84,7 +86,7 @@ public void widgetDisposed(DisposeEvent e) {
 		setTitle(Messages.FindImportElementDialog_Title);
 		setMessage(Messages.FindImportElementDialog_Message);
 
-		Composite container = new Composite(comp, SWT.NONE);
+		final Composite container = new Composite(comp, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 		container.setLayout(new GridLayout(2, false));
 
@@ -104,12 +106,14 @@ public void widgetDisposed(DisposeEvent e) {
 		viewer.setLabelProvider(new StyledCellLabelProvider() {
 			@Override
 			public void update(ViewerCell cell) {
-				EObject o = (EObject) cell.getElement();
+				final EObject o = (EObject) cell.getElement();
 				cell.setImage(editor.getImage(o, searchText.getDisplay()));
 
-				MApplicationElement appEl = (MApplicationElement) o;
-				StyledString styledString = new StyledString(editor.getLabel(o) + " (" + (appEl.getElementId() == null ? "<" + Messages.FindImportElementDialog_noId + ">" : appEl.getElementId()) + ")", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-				String detailLabel = editor.getDetailLabel(o);
+				final MApplicationElement appEl = (MApplicationElement) o;
+				final StyledString styledString = new StyledString(
+					editor.getLabel(o)
+					+ " (" + (appEl.getElementId() == null ? "<" + Messages.FindImportElementDialog_noId + ">" : appEl.getElementId()) + ")", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+				final String detailLabel = editor.getDetailLabel(o);
 				if (detailLabel != null && !detailLabel.equals(appEl.getElementId())) {
 					styledString.append(" - " + detailLabel, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 				}
@@ -142,13 +146,13 @@ public void modifyText(ModifyEvent e) {
 					currentResultHandler.cancled = true;
 				}
 				list.clear();
-				Filter filter = new Filter(element.eClass(), searchText.getText());
+				final Filter filter = new Filter(element.eClass(), searchText.getText());
 				currentResultHandler = new ModelResultHandlerImpl(list, filter, editor, element.eResource());
 				collector.findModelElements(filter, currentResultHandler);
 			}
 		});
 
-		Button button = new Button(container, SWT.PUSH);
+		final Button button = new Button(container, SWT.PUSH);
 		button.setText(Messages.FindImportElementDialog_ClearCache);
 		button.setLayoutData(new GridData(GridData.END, GridData.CENTER, true, false, 2, 1));
 		button.addSelectionListener(new SelectionAdapter() {
@@ -163,11 +167,12 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	protected void okPressed() {
-		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+		final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 		if (!s.isEmpty()) {
-			MApplicationElement el = (MApplicationElement) s.getFirstElement();
+			final MApplicationElement el = (MApplicationElement) s.getFirstElement();
 			if (el.getElementId() != null && el.getElementId().trim().length() > 0) {
-				Command cmd = SetCommand.create(editor.getEditingDomain(), element, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, el.getElementId());
+				final Command cmd = SetCommand.create(editor.getEditingDomain(), element,
+					ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, el.getElementId());
 				if (cmd.canExecute()) {
 					editor.getEditingDomain().getCommandStack().execute(cmd);
 					super.okPressed();
@@ -179,9 +184,9 @@ protected void okPressed() {
 	}
 
 	private ClassContributionCollector getCollector() {
-		Bundle bundle = FrameworkUtil.getBundle(FindImportElementDialog.class);
-		BundleContext context = bundle.getBundleContext();
-		ServiceReference<?> ref = context.getServiceReference(ClassContributionCollector.class.getName());
+		final Bundle bundle = FrameworkUtil.getBundle(FindImportElementDialog.class);
+		final BundleContext context = bundle.getBundleContext();
+		final ServiceReference<?> ref = context.getServiceReference(ClassContributionCollector.class.getName());
 		if (ref != null) {
 			return (ClassContributionCollector) context.getService(ref);
 		}
@@ -190,12 +195,13 @@ private ClassContributionCollector getCollector() {
 
 	private static class ModelResultHandlerImpl implements ModelResultHandler {
 		private boolean cancled = false;
-		private IObservableList list;
-		private Filter filter;
-		private AbstractComponentEditor editor;
-		private Resource resource;
+		private final IObservableList list;
+		private final Filter filter;
+		private final AbstractComponentEditor editor;
+		private final Resource resource;
 
-		public ModelResultHandlerImpl(IObservableList list, Filter filter, AbstractComponentEditor editor, Resource resource) {
+		public ModelResultHandlerImpl(IObservableList list, Filter filter, AbstractComponentEditor editor,
+			Resource resource) {
 			this.list = list;
 			this.filter = filter;
 			this.editor = editor;
@@ -205,28 +211,29 @@ public ModelResultHandlerImpl(IObservableList list, Filter filter, AbstractCompo
 		@Override
 		public void result(EObject data) {
 			if (!cancled) {
-				if (!resource.getURI().equals(data.eResource().getURI()))
+				if (!resource.getURI().equals(data.eResource().getURI())) {
 					if (data instanceof MApplicationElement) {
-						String elementId = ((MApplicationElement) data).getElementId();
+						final String elementId = ((MApplicationElement) data).getElementId();
 						if (elementId == null) {
 							list.add(data);
 							return;
 						}
 
-						if (elementId != null && elementId.trim().length() > 0) {
+						if (elementId.trim().length() > 0) {
 							if (filter.elementIdPattern.matcher(elementId).matches()) {
 								list.add(data);
 								return;
 							}
 						}
 
-						String label = editor.getDetailLabel(data);
-						if (elementId != null && label != null && label.trim().length() > 0) {
+						final String label = editor.getDetailLabel(data);
+						if (label != null && label.trim().length() > 0) {
 							if (filter.elementIdPattern.matcher(label).matches()) {
 								list.add(data);
 							}
 						}
 					}
+				}
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index 604727521e..e8d1591846 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -6,14 +6,15 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 437469
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Bug 437469
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.Filter;
@@ -72,17 +73,19 @@
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
 
+@SuppressWarnings("restriction")
 public class FindParentReferenceElementDialog extends TitleAreaDialog {
-	private MStringModelFragment fragment;
-	private AbstractComponentEditor editor;
+	private final MStringModelFragment fragment;
+	private final AbstractComponentEditor editor;
 	private TableViewer viewer;
-	private Messages Messages;
+	private final Messages Messages;
 	private ModelResultHandlerImpl currentResultHandler;
 	private WritableList list;
 	private ComboViewer eClassViewer;
 	private Text searchText;
 
-	public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEditor editor, MStringModelFragment fragment, Messages Messages) {
+	public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEditor editor,
+		MStringModelFragment fragment, Messages Messages) {
 		super(parentShell);
 		this.fragment = fragment;
 		this.editor = editor;
@@ -96,9 +99,10 @@ protected boolean isResizable() {
 
 	@Override
 	protected Control createDialogArea(Composite parent) {
-		Composite comp = (Composite) super.createDialogArea(parent);
+		final Composite comp = (Composite) super.createDialogArea(parent);
 
-		final Image titleImage = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/import_wiz.png")); //$NON-NLS-1$
+		final Image titleImage = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream(
+			"/icons/full/wizban/import_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
 
@@ -112,14 +116,14 @@ public void widgetDisposed(DisposeEvent e) {
 		setTitle(Messages.FindParentReferenceElementDialog_Title);
 		setMessage(Messages.FindParentReferenceElementDialog_Message);
 
-		Composite container = new Composite(comp, SWT.NONE);
+		final Composite container = new Composite(comp, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 		container.setLayout(new GridLayout(2, false));
 
 		Label l = new Label(container, SWT.NONE);
 		l.setText(Messages.FindParentReferenceElementDialog_ContainerType);
 
-		Combo combo = new Combo(container, SWT.NONE);
+		final Combo combo = new Combo(container, SWT.NONE);
 		eClassViewer = new ComboViewer(combo);
 		eClassViewer.setLabelProvider(new LabelProvider() {
 			@Override
@@ -129,14 +133,14 @@ public String getText(Object element) {
 		});
 		eClassViewer.setContentProvider(new ArrayContentProvider());
 		final List<EClass> eClassList = new ArrayList<EClass>();
-		for (InternalPackage p : Util.loadPackages()) {
+		for (final InternalPackage p : Util.loadPackages()) {
 			eClassList.addAll(p.getAllClasses());
 		}
 		eClassViewer.setComparator(new ViewerComparator() {
 			@Override
 			public int compare(Viewer viewer, Object e1, Object e2) {
-				EClass ec1 = (EClass) e1;
-				EClass ec2 = (EClass) e2;
+				final EClass ec1 = (EClass) e1;
+				final EClass ec2 = (EClass) e2;
 				return ec1.getName().compareTo(ec2.getName());
 			}
 		});
@@ -151,17 +155,17 @@ public void selectionChanged(SelectionChangedEvent event) {
 			}
 		});
 
-		ArrayList<String> vals = new ArrayList<String>();
-		for (EClass item : eClassList) {
+		final ArrayList<String> vals = new ArrayList<String>();
+		for (final EClass item : eClassList) {
 			vals.add(item.getName());
 		}
 		final String[] values = vals.toArray(new String[0]);
-		ComboContentAdapter textContentAdapter = new ComboContentAdapter() {
+		final ComboContentAdapter textContentAdapter = new ComboContentAdapter() {
 			@Override
 			public void setControlContents(Control control, String text1, int cursorPosition) {
 				super.setControlContents(control, text1, cursorPosition);
-				int index = Arrays.asList(values).indexOf(text1);
-				EClass eClass = eClassList.get(index);
+				final int index = Arrays.asList(values).indexOf(text1);
+				final EClass eClass = eClassList.get(index);
 				eClassViewer.setSelection(new StructuredSelection(eClass));
 			}
 		};
@@ -183,14 +187,17 @@ public void setControlContents(Control control, String text1, int cursorPosition
 		viewer.setLabelProvider(new StyledCellLabelProvider() {
 			@Override
 			public void update(ViewerCell cell) {
-				EObject o = (EObject) cell.getElement();
-				AbstractComponentEditor editor = FindParentReferenceElementDialog.this.editor.getEditor().getEditor(o.eClass());
+				final EObject o = (EObject) cell.getElement();
+				final AbstractComponentEditor editor = FindParentReferenceElementDialog.this.editor.getEditor()
+					.getEditor(o.eClass());
 				cell.setImage(editor.getImage(o, searchText.getDisplay()));
 
-				MApplicationElement appEl = (MApplicationElement) o;
+				final MApplicationElement appEl = (MApplicationElement) o;
 
-				StyledString styledString = new StyledString(editor.getLabel(o) + " (" + (appEl.getElementId() == null ? "<" + Messages.FindParentReferenceElementDialog_NoId + ">" : appEl.getElementId()) + ")", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-				String detailLabel = editor.getDetailLabel(o);
+				final StyledString styledString = new StyledString(
+					editor.getLabel(o)
+					+ " (" + (appEl.getElementId() == null ? "<" + Messages.FindParentReferenceElementDialog_NoId + ">" : appEl.getElementId()) + ")", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+				final String detailLabel = editor.getDetailLabel(o);
 				if (detailLabel != null && !detailLabel.equals(appEl.getElementId())) {
 					styledString.append(" - " + detailLabel, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 				}
@@ -222,7 +229,7 @@ public void modifyText(ModifyEvent e) {
 			}
 		});
 
-		Button button = new Button(container, SWT.PUSH);
+		final Button button = new Button(container, SWT.PUSH);
 		button.setText(Messages.FindParentReferenceElementDialog_ClearCache);
 		button.setLayoutData(new GridData(GridData.END, GridData.CENTER, true, false, 2, 1));
 		button.addSelectionListener(new SelectionAdapter() {
@@ -240,7 +247,8 @@ protected void updateSearch() {
 		}
 		list.clear();
 
-		Filter filter = new Filter((EClass) ((IStructuredSelection) eClassViewer.getSelection()).getFirstElement(), searchText.getText());
+		final Filter filter = new Filter(
+			(EClass) ((IStructuredSelection) eClassViewer.getSelection()).getFirstElement(), searchText.getText());
 
 		currentResultHandler = new ModelResultHandlerImpl(list, filter, editor, ((EObject) fragment).eResource());
 		getCollector().findModelElements(filter, currentResultHandler);
@@ -249,11 +257,12 @@ protected void updateSearch() {
 
 	@Override
 	protected void okPressed() {
-		IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+		final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 		if (!s.isEmpty()) {
-			MApplicationElement el = (MApplicationElement) s.getFirstElement();
+			final MApplicationElement el = (MApplicationElement) s.getFirstElement();
 			if (el.getElementId() != null && el.getElementId().trim().length() > 0) {
-				Command cmd = SetCommand.create(editor.getEditingDomain(), fragment, FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID, el.getElementId());
+				final Command cmd = SetCommand.create(editor.getEditingDomain(), fragment,
+					FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID, el.getElementId());
 				if (cmd.canExecute()) {
 					editor.getEditingDomain().getCommandStack().execute(cmd);
 					super.okPressed();
@@ -265,9 +274,9 @@ protected void okPressed() {
 	}
 
 	private ClassContributionCollector getCollector() {
-		Bundle bundle = FrameworkUtil.getBundle(FindParentReferenceElementDialog.class);
-		BundleContext context = bundle.getBundleContext();
-		ServiceReference<?> ref = context.getServiceReference(ClassContributionCollector.class.getName());
+		final Bundle bundle = FrameworkUtil.getBundle(FindParentReferenceElementDialog.class);
+		final BundleContext context = bundle.getBundleContext();
+		final ServiceReference<?> ref = context.getServiceReference(ClassContributionCollector.class.getName());
 		if (ref != null) {
 			return (ClassContributionCollector) context.getService(ref);
 		}
@@ -276,12 +285,13 @@ private ClassContributionCollector getCollector() {
 
 	private static class ModelResultHandlerImpl implements ModelResultHandler {
 		private boolean cancled = false;
-		private IObservableList list;
-		private Filter filter;
-		private AbstractComponentEditor editor;
-		private Resource resource;
+		private final IObservableList list;
+		private final Filter filter;
+		private final AbstractComponentEditor editor;
+		private final Resource resource;
 
-		public ModelResultHandlerImpl(IObservableList list, Filter filter, AbstractComponentEditor editor, Resource resource) {
+		public ModelResultHandlerImpl(IObservableList list, Filter filter, AbstractComponentEditor editor,
+			Resource resource) {
 			this.list = list;
 			this.filter = filter;
 			this.editor = editor;
@@ -293,21 +303,21 @@ public void result(EObject data) {
 			if (!cancled) {
 				if (!resource.getURI().equals(data.eResource().getURI())) {
 					if (data instanceof MApplicationElement) {
-						String elementId = ((MApplicationElement) data).getElementId();
+						final String elementId = ((MApplicationElement) data).getElementId();
 						if (elementId == null) {
 							list.add(data);
 							return;
 						}
 
-						if (elementId != null && elementId.trim().length() > 0) {
+						if (elementId.trim().length() > 0) {
 							if (filter.elementIdPattern.matcher(elementId).matches()) {
 								list.add(data);
 								return;
 							}
 						}
 
-						String label = editor.getDetailLabel(data);
-						if (elementId != null && label != null && label.trim().length() > 0) {
+						final String label = editor.getDetailLabel(data);
+						if (label != null && label.trim().length() > 0) {
 							if (filter.elementIdPattern.matcher(label).matches()) {
 								list.add(data);
 								return;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
index a2ae60fe08..1fb224d42e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -20,10 +20,12 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
+@SuppressWarnings("restriction")
 public class HandledMenuItemCommandSelectionDialog extends AbstractCommandSelectionDialog {
-	private MHandledItem handler;
+	private final MHandledItem handler;
 
-	public HandledMenuItemCommandSelectionDialog(Shell parentShell, MHandledItem handler, IModelResource resource, Messages Messages) {
+	public HandledMenuItemCommandSelectionDialog(Shell parentShell, MHandledItem handler, IModelResource resource,
+		Messages Messages) {
 		super(parentShell, resource, Messages);
 		this.handler = handler;
 	}

From e2e8d4e4f62f65316e431e61b19e292b00f55ce3 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Thu, 27 Nov 2014 14:15:25 +0100
Subject: [PATCH 0860/1286] Bug 444692 - Remove Warnings Added org.eclipse.e4
 to accesible packages in emf.ui bundle

---
 .../org.eclipse.e4.tools.emf.ui/.classpath    |   6 +-
 .../ui/common/CommandToStringConverter.java   |   1 -
 .../eclipse/e4/tools/emf/ui/common/Util.java  |   1 -
 .../tools/emf/ui/common/XMIModelResource.java |   3 +-
 .../tools/emf/ui/internal/PatternFilter.java  |   1 -
 .../emf/ui/internal/common/E4PickList.java    |  88 +--
 .../internal/common/EClassLabelProvider.java  |  11 +-
 .../emf/ui/internal/common/ModelEditor.java   | 634 ++++++++++--------
 .../common/component/AddonsEditor.java        |   7 +-
 .../common/component/ApplicationEditor.java   |   3 +-
 .../internal/common/component/AreaEditor.java |   5 +-
 .../component/BindingContextEditor.java       |   3 +-
 .../common/component/BindingTableEditor.java  |   1 -
 .../common/component/CategoryEditor.java      |   3 +-
 .../common/component/CommandEditor.java       |   3 +-
 .../component/CommandParameterEditor.java     |   3 +-
 .../common/component/CompositePartEditor.java |  25 +-
 .../common/component/ControlFactory.java      |   1 -
 .../component/CoreExpressionEditor.java       |   3 +-
 .../component/DirectMenuItemEditor.java       |   5 +-
 .../component/DirectToolItemEditor.java       |   5 +-
 .../DynamicMenuContributionEditor.java        |  50 +-
 .../component/HandledMenuItemEditor.java      |  31 +-
 .../component/HandledToolItemEditor.java      |  31 +-
 .../component/MenuContributionEditor.java     | 112 ++--
 .../internal/common/component/MenuEditor.java | 161 +++--
 .../common/component/MenuItemEditor.java      | 147 ++--
 .../component/ModelFragmentsEditor.java       |  81 ++-
 .../internal/common/component/PartEditor.java | 142 ++--
 .../component/PartSashContainerEditor.java    | 131 ++--
 .../common/component/PartStackEditor.java     | 126 ++--
 .../common/component/PerspectiveEditor.java   | 117 ++--
 .../component/PerspectiveStackEditor.java     |  84 ++-
 .../common/component/StringModelFragment.java |  92 ++-
 .../component/ToolBarContributionEditor.java  | 118 ++--
 .../common/component/ToolBarEditor.java       |  85 ++-
 .../component/ToolBarSeparatorEditor.java     |  45 +-
 .../common/component/ToolControlEditor.java   |  80 ++-
 .../common/component/TrimBarEditor.java       |  87 ++-
 .../component/TrimContributionEditor.java     |  95 ++-
 .../UnsettableUpdateValueStrategy.java        |  63 +-
 .../common/component/WindowEditor.java        | 156 +++--
 .../common/component/WizardDialogEditor.java  |  12 +-
 ...HandledToolItemCommandSelectionDialog.java |   8 +-
 .../HandlerCommandSelectionDialog.java        |   5 +-
 .../tabs/ContributionUriCellEditor.java       |   7 +-
 46 files changed, 1728 insertions(+), 1150 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.classpath b/bundles/org.eclipse.e4.tools.emf.ui/.classpath
index ad32c83a78..64449070b7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.classpath
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.classpath
@@ -1,7 +1,11 @@
 <?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/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<accessrules>
+			<accessrule kind="accessible" pattern="org/eclipse/e4/**"/>
+		</accessrules>
+	</classpathentry>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
index afebef3ba2..1372aa5ba9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
@@ -17,7 +17,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 
-@SuppressWarnings("restriction")
 public class CommandToStringConverter extends Converter {
 	private final Messages Messages;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index 6fa6d0717a..939337a25e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -45,7 +45,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Control;
 
-@SuppressWarnings("restriction")
 public class Util {
 	public static final boolean isNullOrEmpty(String element) {
 		return element == null || element.trim().length() == 0;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
index 405b9fe8fb..caf35ad2f3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
@@ -42,7 +42,6 @@
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
 
-@SuppressWarnings("restriction")
 public class XMIModelResource implements IModelResource {
 	private final EditingDomain editingDomain;
 	private final Resource resource;
@@ -67,7 +66,7 @@ public void commandStackChanged(EventObject event) {
 		});
 		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, resourceSet);
 		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
-			.put(Resource.Factory.Registry.DEFAULT_EXTENSION, new E4XMIResourceFactory());
+		.put(Resource.Factory.Registry.DEFAULT_EXTENSION, new E4XMIResourceFactory());
 		resource = resourceSet.getResource(uri, true);
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
index 6bf458481c..9da394cf0c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
@@ -15,7 +15,6 @@
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.Viewer;
 
-@SuppressWarnings("restriction")
 public class PatternFilter extends org.eclipse.e4.ui.workbench.swt.internal.copy.PatternFilter {
 
 	/**
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
index 87a3383e7f..edad4587be 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
@@ -6,12 +6,13 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
 import java.util.List;
+
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -41,11 +42,9 @@
  * Pressing CR in the combo will execute the ADD command.
  * </p>
  * <p>
- * <em>E4 specific:</em> The default feature is
- * UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN. Other features must
- * override appropriate methods. The picker uses an Array Content Provider. The
- * list uses an ObservableListContentProvider and a Struct class to contain the
- * object and label.
+ * <em>E4 specific:</em> The default feature is UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN. Other features must
+ * override appropriate methods. The picker uses an Array Content Provider. The list uses an
+ * ObservableListContentProvider and a Struct class to contain the object and label.
  * </p>
  *
  * @author Steven Spungin
@@ -68,7 +67,8 @@ public Struct(String label, EClass eClass, boolean separator) {
 		}
 	}
 
-	public E4PickList(Composite parent, int style, List<PickListFeatures> listFeatures, final Messages messages, final AbstractComponentEditor componentEditor, final EStructuralFeature feature) {
+	public E4PickList(Composite parent, int style, List<PickListFeatures> listFeatures, final Messages messages,
+		final AbstractComponentEditor componentEditor, final EStructuralFeature feature) {
 		super(parent, style, listFeatures, messages, componentEditor);
 
 		this.componentEditor = componentEditor;
@@ -78,13 +78,13 @@ public E4PickList(Composite parent, int style, List<PickListFeatures> listFeatur
 		picker.setLabelProvider(new LabelProvider() {
 			@Override
 			public String getText(Object element) {
-				Struct struct = (Struct) element;
+				final Struct struct = (Struct) element;
 				return struct.label;
 			}
 		});
 
 		viewer.setLabelProvider(new ComponentLabelProvider(componentEditor.getEditor(), messages));
-		ObservableListContentProvider cp = new ObservableListContentProvider();
+		final ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
 	}
 
@@ -96,10 +96,11 @@ public String getText(Object element) {
 	 * @param i
 	 */
 	protected void tryEObjectMove(Object obj, EObject container, int delta) {
-		List<?> l = (List<?>) container.eGet(feature);
-		int idx = l.indexOf(obj) + delta;
-		if ((delta > 0 && idx < l.size()) || (delta < 0 && idx >= 0)) {
-			Command cmd = MoveCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster().getValue(), feature, obj, idx);
+		final List<?> l = (List<?>) container.eGet(feature);
+		final int idx = l.indexOf(obj) + delta;
+		if (delta > 0 && idx < l.size() || delta < 0 && idx >= 0) {
+			final Command cmd = MoveCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster()
+				.getValue(), feature, obj, idx);
 
 			if (cmd.canExecute()) {
 				componentEditor.getEditingDomain().getCommandStack().execute(cmd);
@@ -111,16 +112,17 @@ protected void tryEObjectMove(Object obj, EObject container, int delta) {
 	@Override
 	protected void addPressed() {
 		if (!picker.getSelection().isEmpty()) {
-			Struct struct = (Struct) ((IStructuredSelection) picker.getSelection()).getFirstElement();
-			EClass eClass = struct.eClass;
+			final Struct struct = (Struct) ((IStructuredSelection) picker.getSelection()).getFirstElement();
+			final EClass eClass = struct.eClass;
 			_handleAdd(eClass, struct.separator);
 		}
 	}
 
 	protected void _handleAdd(EClass eClass, boolean separator) {
-		MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
+		final MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
 		setElementId(eObject);
-		Command cmd = AddCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster().getValue(), feature, eObject);
+		final Command cmd = AddCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster()
+			.getValue(), feature, eObject);
 
 		if (cmd.canExecute()) {
 			componentEditor.getEditingDomain().getCommandStack().execute(cmd);
@@ -132,9 +134,11 @@ protected void _handleAdd(EClass eClass, boolean separator) {
 
 	protected void setElementId(Object element) {
 		if (componentEditor.getEditor().isAutoCreateElementId() && element instanceof MApplicationElement) {
-			MApplicationElement el = (MApplicationElement) element;
+			final MApplicationElement el = (MApplicationElement) element;
 			if (el.getElementId() == null || el.getElementId().trim().length() == 0) {
-				el.setElementId(Util.getDefaultElementId(((EObject) componentEditor.getMaster().getValue()).eResource(), el, componentEditor.getEditor().getProject()));
+				el.setElementId(Util.getDefaultElementId(
+					((EObject) componentEditor.getMaster().getValue()).eResource(), el, componentEditor.getEditor()
+						.getProject()));
 			}
 		}
 	}
@@ -142,34 +146,36 @@ protected void setElementId(Object element) {
 	protected List<?> getContainerChildren(Object master) {
 		if (master instanceof MElementContainer<?>) {
 			return ((MElementContainer<?>) master).getChildren();
-		} else {
-			return null;
 		}
+		return null;
 	}
 
 	@Override
 	protected void moveUpPressed() {
 		if (!viewer.getSelection().isEmpty()) {
-			IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+			final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 			if (s.size() == 1) {
-				Object obj = s.getFirstElement();
-				Object container = componentEditor.getMaster().getValue();
+				final Object obj = s.getFirstElement();
+				final Object container = componentEditor.getMaster().getValue();
 				if (feature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE) {
 					tryEObjectMove(obj, (EObject) container, -1);
 					return;
 				}
-				List<?> children = getContainerChildren(container);
+				final List<?> children = getContainerChildren(container);
 				if (children == null) {
 					return;
 				}
-				int idx = children.indexOf(obj) - 1;
+				final int idx = children.indexOf(obj) - 1;
 				if (idx >= 0) {
 					if (obj instanceof MUIElement && feature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
-						if (Util.moveElementByIndex(componentEditor.getEditingDomain(), (MUIElement) obj, componentEditor.getEditor().isLiveModel(), idx)) {
+						if (Util.moveElementByIndex(componentEditor.getEditingDomain(), (MUIElement) obj,
+							componentEditor.getEditor().isLiveModel(), idx)) {
 							viewer.setSelection(new StructuredSelection(obj));
 						}
-					} else if (obj instanceof MApplicationElement || obj instanceof org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container) {
-						Command cmd = MoveCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster().getValue(), feature, obj, idx);
+					} else if (obj instanceof MApplicationElement
+						|| obj instanceof org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container) {
+						final Command cmd = MoveCommand.create(componentEditor.getEditingDomain(), componentEditor
+							.getMaster().getValue(), feature, obj, idx);
 						if (cmd.canExecute()) {
 							componentEditor.getEditingDomain().getCommandStack().execute(cmd);
 							viewer.setSelection(new StructuredSelection(obj));
@@ -183,26 +189,29 @@ protected void moveUpPressed() {
 	@Override
 	protected void moveDownPressed() {
 		if (!viewer.getSelection().isEmpty()) {
-			IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+			final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 			if (s.size() == 1) {
-				Object obj = s.getFirstElement();
-				Object container = componentEditor.getMaster().getValue();
+				final Object obj = s.getFirstElement();
+				final Object container = componentEditor.getMaster().getValue();
 				if (feature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE) {
 					tryEObjectMove(obj, (EObject) container, 1);
 					return;
 				}
-				List<?> children = getContainerChildren(container);
+				final List<?> children = getContainerChildren(container);
 				if (children == null) {
 					return;
 				}
-				int idx = children.indexOf(obj) + 1;
+				final int idx = children.indexOf(obj) + 1;
 				if (idx < children.size()) {
 					if (obj instanceof MUIElement && feature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
-						if (Util.moveElementByIndex(componentEditor.getEditingDomain(), (MUIElement) obj, componentEditor.getEditor().isLiveModel(), idx)) {
+						if (Util.moveElementByIndex(componentEditor.getEditingDomain(), (MUIElement) obj,
+							componentEditor.getEditor().isLiveModel(), idx)) {
 							viewer.setSelection(new StructuredSelection(obj));
 						}
-					} else if (obj instanceof MApplicationElement || obj instanceof org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container) {
-						Command cmd = MoveCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster().getValue(), feature, obj, idx);
+					} else if (obj instanceof MApplicationElement
+						|| obj instanceof org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container) {
+						final Command cmd = MoveCommand.create(componentEditor.getEditingDomain(), componentEditor
+							.getMaster().getValue(), feature, obj, idx);
 						if (cmd.canExecute()) {
 							componentEditor.getEditingDomain().getCommandStack().execute(cmd);
 							viewer.setSelection(new StructuredSelection(obj));
@@ -216,8 +225,9 @@ protected void moveDownPressed() {
 	@Override
 	protected void removePressed() {
 		if (!viewer.getSelection().isEmpty()) {
-			List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
-			Command cmd = RemoveCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster().getValue(), feature, keybinding);
+			final List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
+			final Command cmd = RemoveCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster()
+				.getValue(), feature, keybinding);
 			if (cmd.canExecute()) {
 				componentEditor.getEditingDomain().getCommandStack().execute(cmd);
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
index 8bf286bff2..9ec9da8f10 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common;
@@ -22,7 +22,7 @@
  *
  */
 public class EClassLabelProvider extends LabelProvider {
-	private ModelEditor editor;
+	private final ModelEditor editor;
 
 	public EClassLabelProvider(ModelEditor editor) {
 		this.editor = editor;
@@ -30,12 +30,11 @@ public EClassLabelProvider(ModelEditor editor) {
 
 	@Override
 	public String getText(Object element) {
-		EClass eclass = (EClass) element;
-		AbstractComponentEditor elementEditor = editor.getEditor(eclass);
+		final EClass eclass = (EClass) element;
+		final AbstractComponentEditor elementEditor = editor.getEditor(eclass);
 		if (elementEditor != null) {
 			return elementEditor.getLabel(element);
-		} else {
-			return eclass.getName();
 		}
+		return eclass.getName();
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 601f235d79..07b3e16c2d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -6,11 +6,12 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Wim Jongman <wim.jongman@remainsoftware.com> - Maintenance
- *     Marco Descher <marco@descher.at> - Bug395982, 426653, 422465, 429674
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 396902, 431755, 431735, 424730, 424730, 391089, 437236, 437552, Ongoing Maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Wim Jongman <wim.jongman@remainsoftware.com> - Maintenance
+ * Marco Descher <marco@descher.at> - Bug395982, 426653, 422465, 429674
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Steven Spungin <steven@spungin.tv> - Bug 396902, 431755, 431735, 424730, 424730, 391089, 437236, 437552, Ongoing
+ * Maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
@@ -20,9 +21,11 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.ObservablesManager;
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -242,41 +245,48 @@ public class ModelEditor implements IGotoObject {
 	public static final String VIRTUAL_HANDLER = ModelEditor.class.getName() + ".VIRTUAL_HANDLER"; //$NON-NLS-1$
 	public static final String VIRTUAL_BINDING_TABLE = ModelEditor.class.getName() + ".VIRTUAL_BINDING_TABLE"; //$NON-NLS-1$
 	public static final String VIRTUAL_COMMAND = ModelEditor.class.getName() + ".VIRTUAL_COMMAND"; //$NON-NLS-1$
-	public static final String VIRTUAL_APPLICATION_WINDOWS = ModelEditor.class.getName() + ".VIRTUAL_APPLICATION_WINDOWS"; //$NON-NLS-1$
-	public static final String VIRTUAL_PERSPECTIVE_WINDOWS = ModelEditor.class.getName() + ".VIRTUAL_PERSPECTIVE_WINDOWS"; //$NON-NLS-1$
+	public static final String VIRTUAL_APPLICATION_WINDOWS = ModelEditor.class.getName()
+		+ ".VIRTUAL_APPLICATION_WINDOWS"; //$NON-NLS-1$
+	public static final String VIRTUAL_PERSPECTIVE_WINDOWS = ModelEditor.class.getName()
+		+ ".VIRTUAL_PERSPECTIVE_WINDOWS"; //$NON-NLS-1$
 	public static final String VIRTUAL_WINDOW_WINDOWS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_WINDOWS"; //$NON-NLS-1$
 	public static final String VIRTUAL_WINDOW_CONTROLS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_CONTROLS"; //$NON-NLS-1$
 	public static final String VIRTUAL_PART_DESCRIPTORS = ModelEditor.class.getName() + ".VIRTUAL_PART_DESCRIPTORS"; //$NON-NLS-1$
-	public static final String VIRTUAL_PARTDESCRIPTOR_MENU = ModelEditor.class.getName() + ".VIRTUAL_PARTDESCRIPTOR_MENU"; //$NON-NLS-1$
-	public static final String VIRTUAL_TRIMMED_WINDOW_TRIMS = ModelEditor.class.getName() + ".VIRTUAL_TRIMMED_WINDOW_TRIMS"; //$NON-NLS-1$
+	public static final String VIRTUAL_PARTDESCRIPTOR_MENU = ModelEditor.class.getName()
+		+ ".VIRTUAL_PARTDESCRIPTOR_MENU"; //$NON-NLS-1$
+	public static final String VIRTUAL_TRIMMED_WINDOW_TRIMS = ModelEditor.class.getName()
+		+ ".VIRTUAL_TRIMMED_WINDOW_TRIMS"; //$NON-NLS-1$
 	public static final String VIRTUAL_ADDONS = ModelEditor.class.getName() + ".VIRTUAL_ADDONS"; //$NON-NLS-1$
 	public static final String VIRTUAL_MENU_CONTRIBUTIONS = ModelEditor.class.getName() + ".VIRTUAL_MENU_CONTRIBUTIONS"; //$NON-NLS-1$
-	public static final String VIRTUAL_TOOLBAR_CONTRIBUTIONS = ModelEditor.class.getName() + ".VIRTUAL_TOOLBAR_CONTRIBUTIONS"; //$NON-NLS-1$
+	public static final String VIRTUAL_TOOLBAR_CONTRIBUTIONS = ModelEditor.class.getName()
+		+ ".VIRTUAL_TOOLBAR_CONTRIBUTIONS"; //$NON-NLS-1$
 	public static final String VIRTUAL_TRIM_CONTRIBUTIONS = ModelEditor.class.getName() + ".VIRTUAL_TRIM_CONTRIBUTIONS"; //$NON-NLS-1$
-	public static final String VIRTUAL_WINDOW_SHARED_ELEMENTS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_SHARED_ELEMENTS"; //$NON-NLS-1$
+	public static final String VIRTUAL_WINDOW_SHARED_ELEMENTS = ModelEditor.class.getName()
+		+ ".VIRTUAL_WINDOW_SHARED_ELEMENTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_MODEL_FRAGEMENTS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_FRAGEMENTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_MODEL_IMPORTS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_IMPORTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_CATEGORIES = ModelEditor.class.getName() + ".VIRTUAL_CATEGORIES"; //$NON-NLS-1$
 	public static final String VIRTUAL_PARAMETERS = ModelEditor.class.getName() + ".VIRTUAL_PARAMETERS"; //$NON-NLS-1$
 	public static final String VIRTUAL_MENUELEMENTS = ModelEditor.class.getName() + ".VIRTUAL_MENUELEMENTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_ROOT_CONTEXTS = ModelEditor.class.getName() + ".VIRTUAL_ROOT_CONTEXTS"; //$NON-NLS-1$
-	public static final String VIRTUAL_PERSPECTIVE_CONTROLS = ModelEditor.class.getName() + "VIRTUAL_PERSPECTIVE_CONTROLS"; //$NON-NLS-1$
+	public static final String VIRTUAL_PERSPECTIVE_CONTROLS = ModelEditor.class.getName()
+		+ "VIRTUAL_PERSPECTIVE_CONTROLS"; //$NON-NLS-1$
 	public static final String VIRTUAL_SNIPPETS = ModelEditor.class.getName() + "VIRTUAL_SNIPPETS"; //$NON-NLS-1$
 
 	public static final int TAB_FORM = 0;
 	public static final int TAB_XMI = 1;
 	public static final int TAB_LIST = 2;
 
-	private Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
-	private Map<String, AbstractComponentEditor> virtualEditors = new HashMap<String, AbstractComponentEditor>();
-	private Map<Class<?>, List<AbstractElementEditorContribution>> tabContributions = new HashMap<Class<?>, List<AbstractElementEditorContribution>>();
-	private List<FeaturePath> labelFeaturePaths = new ArrayList<FeaturePath>();
-	private List<IEditorFeature> editorFeatures = new ArrayList<IEditorFeature>();
-	private List<IContributionClassCreator> contributionCreator = new ArrayList<IContributionClassCreator>();
+	private final Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
+	private final Map<String, AbstractComponentEditor> virtualEditors = new HashMap<String, AbstractComponentEditor>();
+	private final Map<Class<?>, List<AbstractElementEditorContribution>> tabContributions = new HashMap<Class<?>, List<AbstractElementEditorContribution>>();
+	private final List<FeaturePath> labelFeaturePaths = new ArrayList<FeaturePath>();
+	private final List<IEditorFeature> editorFeatures = new ArrayList<IEditorFeature>();
+	private final List<IContributionClassCreator> contributionCreator = new ArrayList<IContributionClassCreator>();
 
 	private TreeViewer viewer;
-	private IModelResource modelProvider;
-	private IProject project;
+	private final IModelResource modelProvider;
+	private final IProject project;
 
 	@Inject
 	ESelectionService selectionService;
@@ -284,7 +294,7 @@ public class ModelEditor implements IGotoObject {
 	@Inject
 	MApplication app;
 
-	private IEclipseContext context;
+	private final IEclipseContext context;
 	private boolean fragment;
 	private Handler clipboardHandler;
 
@@ -316,7 +326,7 @@ public class ModelEditor implements IGotoObject {
 	@Optional
 	private IModelExtractor modelExtractor;
 
-	private ObservablesManager obsManager;
+	private final ObservablesManager obsManager;
 
 	private final IResourcePool resourcePool;
 
@@ -342,23 +352,25 @@ public class ModelEditor implements IGotoObject {
 
 	private XmiTab xmiTab;
 
-	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project, final IResourcePool resourcePool) {
+	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project,
+		final IResourcePool resourcePool) {
 		this.resourcePool = resourcePool;
 		this.modelProvider = modelProvider;
 		this.project = project;
 		this.context = context;
 		this.context.set(ModelEditor.class, this);
-		this.obsManager = new ObservablesManager();
+		obsManager = new ObservablesManager();
 		if (project != null) {
 			String localeString = ""; //$NON-NLS-1$
-			Object object = this.context.get(TranslationService.LOCALE);
+			final Object object = this.context.get(TranslationService.LOCALE);
 			// TODO simplify once we break e4 tools
 			// compatibility with Luna, in Luna we representation has changed to
 			// be Locale instead of String
 			if (object != null) {
 				localeString = object.toString();
 			}
-			ProjectOSGiTranslationProvider translationProvider = new ProjectOSGiTranslationProvider(project, localeString) {
+			final ProjectOSGiTranslationProvider translationProvider = new ProjectOSGiTranslationProvider(project,
+				localeString) {
 				@Override
 				protected void updateResourceBundle() {
 					super.updateResourceBundle();
@@ -464,7 +476,7 @@ public void widgetSelected(SelectionEvent e) {
 				// This allows external commands to interact with the view.
 				// Eventually, all 3 tabs, or even the ModelEditor itself, could
 				// implement the interface.
-				String key = "org.eclipse.e4.tools.active-object-viewer"; //$NON-NLS-1$
+				final String key = "org.eclipse.e4.tools.active-object-viewer"; //$NON-NLS-1$
 				if (listTab != null && editorTabFolder.getSelectionIndex() == getTabIndex(listTab.getTabItem())) {
 					app.getContext().set(key, listTab);
 				} else {
@@ -487,9 +499,9 @@ static public int getTabIndex(CTabItem tabItem) {
 	private void findAndHighlight(Control control) {
 		if (control != null) {
 			MApplicationElement m = findModelElement(control);
-			MApplicationElement o = m;
+			final MApplicationElement o = m;
 			if (m != null) {
-				List<MApplicationElement> l = new ArrayList<MApplicationElement>();
+				final List<MApplicationElement> l = new ArrayList<MApplicationElement>();
 				do {
 					l.add(m);
 					m = (MApplicationElement) ((EObject) m).eContainer();
@@ -497,7 +509,8 @@ private void findAndHighlight(Control control) {
 
 				if (o instanceof MPart) {
 					System.err.println(getClass().getName() + ".findAndHighLight: " + o); //$NON-NLS-1$
-					System.err.println(getClass().getName() + ".findAndHighLight: " + ((EObject) o).eContainingFeature()); //$NON-NLS-1$
+					System.err.println(getClass().getName()
+						+ ".findAndHighLight: " + ((EObject) o).eContainingFeature()); //$NON-NLS-1$
 				}
 
 				viewer.setSelection(new StructuredSelection(o));
@@ -517,30 +530,30 @@ private MApplicationElement findModelElement(Control control) {
 	}
 
 	private XmiTab createXMITab(Composite composite) {
-		IEclipseContext childContext = context.createChild();
+		final IEclipseContext childContext = context.createChild();
 		childContext.set(Composite.class, composite);
 		childContext.set(EMFDocumentResourceMediator.class, emfDocumentProvider);
 		childContext.set(IEclipsePreferences.class, preferences);
 		childContext.set(IResourcePool.class, resourcePool);
-		XmiTab ret = ContextInjectionFactory.make(XmiTab.class, childContext);
+		final XmiTab ret = ContextInjectionFactory.make(XmiTab.class, childContext);
 		return ret;
 	}
 
 	private Composite createFormTab(Composite composite) {
-		SashForm form = new SashForm(composite, SWT.HORIZONTAL);
+		final SashForm form = new SashForm(composite, SWT.HORIZONTAL);
 		form.setBackground(form.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 
 		viewer = createTreeViewerArea(form);
 
-		Composite parent = new Composite(form, SWT.NONE);
-		FillLayout l = new FillLayout();
+		final Composite parent = new Composite(form, SWT.NONE);
+		final FillLayout l = new FillLayout();
 		parent.setLayout(l);
 
-		Composite editingArea = new Composite(parent, SWT.BORDER);
-		GridLayout gl = new GridLayout();
+		final Composite editingArea = new Composite(parent, SWT.BORDER);
+		final GridLayout gl = new GridLayout();
 		editingArea.setLayout(gl);
 
-		Composite headerContainer = new Composite(editingArea, SWT.NONE);
+		final Composite headerContainer = new Composite(editingArea, SWT.NONE);
 		headerContainer.setLayout(new GridLayout(3, false));
 		headerContainer.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
@@ -550,7 +563,7 @@ private Composite createFormTab(Composite composite) {
 		final Label sectionHeaderLabel = new Label(headerContainer, SWT.NONE);
 		sectionHeaderLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		final Label separatorLabel = new Label(headerContainer, SWT.SEPARATOR | SWT.HORIZONTAL);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+		final GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
 		gridData.horizontalSpan = 2;
 		separatorLabel.setLayoutData(gridData);
 
@@ -564,17 +577,17 @@ private Composite createFormTab(Composite composite) {
 			@Override
 			public void keyReleased(final KeyEvent e) {
 				if (e.keyCode == SWT.DEL) {
-					List<EObject> list = new ArrayList<EObject>();
+					final List<EObject> list = new ArrayList<EObject>();
 					final IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
-					for (Object o : ((StructuredSelection) selection).toList()) {
+					for (final Object o : ((StructuredSelection) selection).toList()) {
 						if (o instanceof EObject) {
 							list.add((EObject) o);
 						}
 					}
 					if (list.isEmpty() == false) {
-						Command cmd = DeleteCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), list);
+						final Command cmd = DeleteCommand.create(modelProvider.getEditingDomain(), list);
 						if (cmd.canExecute()) {
-							ModelEditor.this.modelProvider.getEditingDomain().getCommandStack().execute(cmd);
+							modelProvider.getEditingDomain().getCommandStack().execute(cmd);
 						}
 					}
 				}
@@ -587,7 +600,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 				if (!event.getSelection().isEmpty()) {
 					final IStructuredSelection s = (IStructuredSelection) event.getSelection();
 					if (s.getFirstElement() instanceof EObject) {
-						EObject obj = (EObject) s.getFirstElement();
+						final EObject obj = (EObject) s.getFirstElement();
 						final AbstractComponentEditor editor = getEditor(obj.eClass());
 						if (editor != null) {
 							currentEditor = editor;
@@ -597,7 +610,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 
 								@Override
 								public void run() {
-									Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
+									final Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
 									comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
 									layout.topControl = comp;
 									contentContainer.layout(true);
@@ -605,7 +618,7 @@ public void run() {
 							});
 						}
 					} else {
-						VirtualEntry<?> entry = (VirtualEntry<?>) s.getFirstElement();
+						final VirtualEntry<?> entry = (VirtualEntry<?>) s.getFirstElement();
 						final AbstractComponentEditor editor = virtualEditors.get(entry.getId());
 						if (editor != null) {
 							currentEditor = editor;
@@ -615,7 +628,7 @@ public void run() {
 
 								@Override
 								public void run() {
-									Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
+									final Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
 									comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
 									layout.topControl = comp;
 									contentContainer.layout(true);
@@ -641,7 +654,7 @@ public void run() {
 
 		form.setWeights(new int[] { 3, 4 });
 
-		MenuManager mgr = new MenuManager();
+		final MenuManager mgr = new MenuManager();
 		mgr.setRemoveAllWhenShown(true);
 		mgr.addMenuListener(new IMenuListener() {
 
@@ -649,39 +662,42 @@ public void run() {
 			public void menuAboutToShow(IMenuManager manager) {
 				final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 				final List<?> listOfSelections = s.toList();
-				int noSelected = listOfSelections.size();
+				final int noSelected = listOfSelections.size();
 
 				boolean addSeparator = false;
 				if (!s.isEmpty() && noSelected == 1) {
 					List<Action> actions;
 					if (s.getFirstElement() instanceof VirtualEntry<?>) {
-						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId()).getActions(s.getFirstElement());
+						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId()).getActions(
+							s.getFirstElement());
 						if (actions.size() > 0) {
-							MenuManager addMenu = new MenuManager(messages.ModelEditor_AddChild);
-							for (Action a : actions) {
+							final MenuManager addMenu = new MenuManager(messages.ModelEditor_AddChild);
+							for (final Action a : actions) {
 								addSeparator = true;
 								addMenu.add(a);
 							}
 							manager.add(addMenu);
 						}
 
-						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId()).getActionsImport(s.getFirstElement());
+						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId()).getActionsImport(
+							s.getFirstElement());
 						if (actions.size() > 0) {
-							MenuManager menu = new MenuManager(messages.ModelEditor_Import3x);
-							for (Action a : actions) {
+							final MenuManager menu = new MenuManager(messages.ModelEditor_Import3x);
+							for (final Action a : actions) {
 								addSeparator = true;
 								menu.add(a);
 							}
 							manager.add(menu);
 						}
 
-						if (addSeparator)
+						if (addSeparator) {
 							manager.add(new Separator());
+						}
 
 					} else {
 
 						final EObject o = (EObject) s.getFirstElement();
-						AbstractComponentEditor editor = getEditor(o.eClass());
+						final AbstractComponentEditor editor = getEditor(o.eClass());
 
 						// Build Add Child menu
 						if (editor != null) {
@@ -691,8 +707,8 @@ public void menuAboutToShow(IMenuManager manager) {
 						}
 
 						if (actions.size() > 0) {
-							MenuManager addMenu = new MenuManager(messages.ModelEditor_AddChild);
-							for (Action a : actions) {
+							final MenuManager addMenu = new MenuManager(messages.ModelEditor_AddChild);
+							for (final Action a : actions) {
 								addSeparator = true;
 								addMenu.add(a);
 							}
@@ -708,8 +724,8 @@ public void menuAboutToShow(IMenuManager manager) {
 
 						if (actions.size() > 0) {
 							// TODO WIM - extract nls
-							MenuManager menu = new MenuManager(messages.ModelEditor_Import3x);
-							for (Action a : actions) {
+							final MenuManager menu = new MenuManager(messages.ModelEditor_Import3x);
+							for (final Action a : actions) {
 								addSeparator = true;
 								menu.add(a);
 							}
@@ -718,12 +734,13 @@ public void menuAboutToShow(IMenuManager manager) {
 
 						if (o.eContainer() != null) {
 							addSeparator = true;
-							manager.add(new Action(messages.ModelEditor_Delete, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
+							manager.add(new Action(messages.ModelEditor_Delete, ImageDescriptor
+								.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
 								@Override
 								public void run() {
-									Command cmd = DeleteCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), o);
+									final Command cmd = DeleteCommand.create(modelProvider.getEditingDomain(), o);
 									if (cmd.canExecute()) {
-										ModelEditor.this.modelProvider.getEditingDomain().getCommandStack().execute(cmd);
+										modelProvider.getEditingDomain().getCommandStack().execute(cmd);
 									}
 								}
 							});
@@ -732,38 +749,40 @@ public void run() {
 				}
 				// multi selection
 				if (noSelected > 0) {
-					if ((!isModelFragment()) && modelExtractor != null)
-						manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {
+					if (!isModelFragment() && modelExtractor != null) {
+						manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor
+							.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {
 							@Override
 							public void run() {
-								ArrayList<MApplicationElement> maes = new ArrayList<MApplicationElement>();
-								for (Object objSelect : listOfSelections) {
+								final ArrayList<MApplicationElement> maes = new ArrayList<MApplicationElement>();
+								for (final Object objSelect : listOfSelections) {
 									EObject container = null;
 									if (objSelect instanceof VirtualEntry<?>) {
 
-										VirtualEntry<?> ve = (VirtualEntry<?>) objSelect;
+										final VirtualEntry<?> ve = (VirtualEntry<?>) objSelect;
 										container = (EObject) ve.getOriginalParent();
-										IObservableList list = ve.getList();
-										Iterator<?> iterator = list.iterator();
+										final IObservableList list = ve.getList();
+										final Iterator<?> iterator = list.iterator();
 										while (iterator.hasNext()) {
 											maes.add((MApplicationElement) iterator.next());
 										}
 
 									} else {
 										container = ((EObject) objSelect).eContainer();
-										MApplicationElement objSelect2 = (MApplicationElement) objSelect;
-										if (!(objSelect2 instanceof MApplication))
+										final MApplicationElement objSelect2 = (MApplicationElement) objSelect;
+										if (!(objSelect2 instanceof MApplication)) {
 											maes.add(objSelect2);
-										else {
+										} else {
 											// can't extract application
 											return;
 										}
 
 									}
 
-									String containerId = ((MApplicationElement) container).getElementId();
+									final String containerId = ((MApplicationElement) container).getElementId();
 									if (containerId == null || containerId.length() == 0) {
-										MessageDialog.openError(viewer.getControl().getShell(), null, messages.ModelEditor_ExtractFragment_NoParentId);
+										MessageDialog.openError(viewer.getControl().getShell(), null,
+											messages.ModelEditor_ExtractFragment_NoParentId);
 
 										return;
 									}
@@ -771,54 +790,57 @@ public void run() {
 								}
 
 								if (modelExtractor.extract(viewer.getControl().getShell(), project, maes)) {
-									Command cmd = DeleteCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), maes);
+									final Command cmd = DeleteCommand.create(modelProvider.getEditingDomain(), maes);
 									if (cmd.canExecute()) {
-										ModelEditor.this.modelProvider.getEditingDomain().getCommandStack().execute(cmd);
+										modelProvider.getEditingDomain().getCommandStack().execute(cmd);
 									}
 								}
 
-							};
+							}
 						});
+					}
 
 				}
 
-				IExtensionRegistry registry = RegistryFactory.getRegistry();
-				IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.scripting"); //$NON-NLS-1$
+				final IExtensionRegistry registry = RegistryFactory.getRegistry();
+				final IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.scripting"); //$NON-NLS-1$
 				final IConfigurationElement[] elements = extPoint.getConfigurationElements();
 
-				if (elements.length > 0 && !s.isEmpty() && s.getFirstElement() instanceof MApplicationElement && noSelected == 1) {
+				if (elements.length > 0 && !s.isEmpty() && s.getFirstElement() instanceof MApplicationElement
+					&& noSelected == 1) {
 					if (addSeparator) {
 						manager.add(new Separator());
 					}
 
 					addSeparator = false;
 
-					MenuManager scriptExecute = new MenuManager(messages.ModelEditor_Script);
+					final MenuManager scriptExecute = new MenuManager(messages.ModelEditor_Script);
 					manager.add(scriptExecute);
-					for (IConfigurationElement e : elements) {
+					for (final IConfigurationElement e : elements) {
 						final IConfigurationElement le = e;
 						scriptExecute.add(new Action(e.getAttribute("label")) { //$NON-NLS-1$
-							@Override
-							public void run() {
-								try {
-									MApplicationElement o = (MApplicationElement) s.getFirstElement();
-									IScriptingSupport support = (IScriptingSupport) le.createExecutableExtension("class"); //$NON-NLS-1$
-									IEclipseContext ctx = null;
-									if (project == null) {
-										if (o instanceof MContext) {
-											ctx = ((MContext) o).getContext();
-										} else {
-											ctx = ModelUtils.getContainingContext(o);
+								@Override
+								public void run() {
+									try {
+										final MApplicationElement o = (MApplicationElement) s.getFirstElement();
+										final IScriptingSupport support = (IScriptingSupport) le
+											.createExecutableExtension("class"); //$NON-NLS-1$
+										IEclipseContext ctx = null;
+										if (project == null) {
+											if (o instanceof MContext) {
+												ctx = ((MContext) o).getContext();
+											} else {
+												ctx = ModelUtils.getContainingContext(o);
+											}
 										}
-									}
 
-									support.openEditor(viewer.getControl().getShell(), s.getFirstElement(), ctx);
-								} catch (CoreException e) {
-									// TODO Auto-generated catch block
-									e.printStackTrace();
+										support.openEditor(viewer.getControl().getShell(), s.getFirstElement(), ctx);
+									} catch (final CoreException e) {
+										// TODO Auto-generated catch block
+										e.printStackTrace();
+									}
 								}
-							}
-						});
+							});
 					}
 				}
 
@@ -828,18 +850,19 @@ public void run() {
 						manager.add(new Separator());
 					}
 
-					Action nlsAction = new Action(messages.ModelEditor_ExternalizeStrings) {
+					final Action nlsAction = new Action(messages.ModelEditor_ExternalizeStrings) {
 						@Override
 						public void run() {
-							ExternalizeStringHandler h = ContextInjectionFactory.make(ExternalizeStringHandler.class, context);
+							final ExternalizeStringHandler h = ContextInjectionFactory.make(
+								ExternalizeStringHandler.class, context);
 							ContextInjectionFactory.invoke(h, Execute.class, context);
 						}
 					};
 
-					Action extIdAction = new Action(messages.ModelEditor_ExportIds) {
+					final Action extIdAction = new Action(messages.ModelEditor_ExportIds) {
 						@Override
 						public void run() {
-							ExportIdsHandler h = ContextInjectionFactory.make(ExportIdsHandler.class, context);
+							final ExportIdsHandler h = ContextInjectionFactory.make(ExportIdsHandler.class, context);
 							ContextInjectionFactory.invoke(h, Execute.class, context);
 						}
 					};
@@ -871,7 +894,7 @@ public void run() {
 					manager.add(new Separator());
 				}
 
-				Action expandAction = new Action(messages.ModelEditor_ExpandSubtree) {
+				final Action expandAction = new Action(messages.ModelEditor_ExpandSubtree) {
 					@Override
 					public void run() {
 						if (!s.isEmpty()) {
@@ -889,7 +912,7 @@ public void run() {
 				if (s.getFirstElement() instanceof EObject) {
 					manager.add(new Separator());
 					final EObject el = (EObject) s.getFirstElement();
-					Action gotoXmiAction = new Action(messages.ModelEditor_goto_xmi) {
+					final Action gotoXmiAction = new Action(messages.ModelEditor_goto_xmi) {
 						@Override
 						public void run() {
 							gotoEObject(TAB_XMI, el);
@@ -899,7 +922,7 @@ public void run() {
 
 					if (listTab != null) {
 						if (EmfUtil.getAttribute(el, "elementId") != null) { //$NON-NLS-1$
-							Action gotoListAction = new Action(messages.ModelEditor_goto_list) {
+							final Action gotoListAction = new Action(messages.ModelEditor_goto_list) {
 								@Override
 								public void run() {
 									gotoEObject(TAB_LIST, el);
@@ -979,17 +1002,17 @@ public boolean isShowXMIId() {
 	}
 
 	private void loadContributionCreators() {
-		IExtensionRegistry registry = RegistryFactory.getRegistry();
-		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
+		final IExtensionRegistry registry = RegistryFactory.getRegistry();
+		final IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
 
-		for (IConfigurationElement el : extPoint.getConfigurationElements()) {
+		for (final IConfigurationElement el : extPoint.getConfigurationElements()) {
 			if (!"contributionClassCreator".equals(el.getName())) { //$NON-NLS-1$
 				continue;
 			}
 
 			try {
 				contributionCreator.add((IContributionClassCreator) el.createExecutableExtension("class")); //$NON-NLS-1$
-			} catch (CoreException e) {
+			} catch (final CoreException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
@@ -997,7 +1020,7 @@ private void loadContributionCreators() {
 	}
 
 	public IContributionClassCreator getContributionCreator(EClass eClass) {
-		for (IContributionClassCreator c : contributionCreator) {
+		for (final IContributionClassCreator c : contributionCreator) {
 			if (c.isSupported(eClass)) {
 				return c;
 			}
@@ -1006,17 +1029,17 @@ public IContributionClassCreator getContributionCreator(EClass eClass) {
 	}
 
 	private void loadEditorFeatures() {
-		IExtensionRegistry registry = RegistryFactory.getRegistry();
-		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
+		final IExtensionRegistry registry = RegistryFactory.getRegistry();
+		final IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
 
-		for (IConfigurationElement el : extPoint.getConfigurationElements()) {
+		for (final IConfigurationElement el : extPoint.getConfigurationElements()) {
 			if (!"editorfeature".equals(el.getName())) { //$NON-NLS-1$
 				continue;
 			}
 
 			try {
 				editorFeatures.add((IEditorFeature) el.createExecutableExtension("class")); //$NON-NLS-1$
-			} catch (CoreException e) {
+			} catch (final CoreException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
@@ -1032,9 +1055,9 @@ public boolean isLiveModel() {
 	}
 
 	public List<FeatureClass> getFeatureClasses(EClass eClass, EStructuralFeature feature) {
-		List<FeatureClass> list = new ArrayList<IEditorFeature.FeatureClass>();
+		final List<FeatureClass> list = new ArrayList<IEditorFeature.FeatureClass>();
 
-		for (IEditorFeature f : editorFeatures) {
+		for (final IEditorFeature f : editorFeatures) {
 			list.addAll(f.getFeatureClasses(eClass, feature));
 		}
 
@@ -1050,18 +1073,22 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		treeArea.setBackgroundMode(SWT.INHERIT_DEFAULT);
 
 		TreeViewer tempViewer = null;
-		String property = System.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
-		if (property != null || preferences.getBoolean(ModelEditorPreferences.TAB_FORM_SEARCH_SHOW, false)) { //$NON-NLS-1$
-			FilteredTree viewParent = new FilteredTree(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(), false);
+		final String property = System
+			.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
+		if (property != null || preferences.getBoolean(ModelEditorPreferences.TAB_FORM_SEARCH_SHOW, false)) {
+			final FilteredTree viewParent = new FilteredTree(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL
+				| SWT.V_SCROLL, new PatternFilter(), false);
 			tempViewer = viewParent.getViewer();
 		} else {
-			tempViewer = new TreeViewerEx(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, emfDocumentProvider, modelProvider);
+			tempViewer = new TreeViewerEx(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL,
+				emfDocumentProvider, modelProvider);
 		}
 		final TreeViewer viewer = tempViewer;
 
 		viewer.setLabelProvider(new ComponentLabelProvider(this, messages));
-		ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(new ObservableFactoryImpl(), new TreeStructureAdvisor() {
-		});
+		final ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(
+			new ObservableFactoryImpl(), new TreeStructureAdvisor() {
+			});
 		viewer.setContentProvider(contentProvider);
 
 		final WritableSet clearedSet = new WritableSet();
@@ -1070,13 +1097,13 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 
 			@Override
 			public void handleSetChange(SetChangeEvent event) {
-				for (Object o : event.diff.getAdditions()) {
+				for (final Object o : event.diff.getAdditions()) {
 					if (o instanceof EObject) {
 						clearedSet.add(o);
 					}
 				}
 
-				for (Object o : event.diff.getRemovals()) {
+				for (final Object o : event.diff.getRemovals()) {
 					if (o instanceof EObject) {
 						clearedSet.remove(o);
 					}
@@ -1084,8 +1111,8 @@ public void handleSetChange(SetChangeEvent event) {
 			}
 		});
 
-		for (FeaturePath p : labelFeaturePaths) {
-			IObservableMap map = EMFProperties.value(p).observeDetail(clearedSet);
+		for (final FeaturePath p : labelFeaturePaths) {
+			final IObservableMap map = EMFProperties.value(p).observeDetail(clearedSet);
 			map.addMapChangeListener(new IMapChangeListener() {
 
 				@Override
@@ -1102,14 +1129,15 @@ public void handleMapChange(MapChangeEvent event) {
 
 			@Override
 			public void doubleClick(DoubleClickEvent event) {
-				TreeViewer viewer = (TreeViewer) event.getViewer();
-				IStructuredSelection thisSelection = (IStructuredSelection) event.getSelection();
-				Object selectedNode = thisSelection.getFirstElement();
+				final TreeViewer viewer = (TreeViewer) event.getViewer();
+				final IStructuredSelection thisSelection = (IStructuredSelection) event.getSelection();
+				final Object selectedNode = thisSelection.getFirstElement();
 				if (mod1Down) {
-					if (viewer.getExpandedState(selectedNode))
+					if (viewer.getExpandedState(selectedNode)) {
 						viewer.setExpandedState(selectedNode, false);
-					else
+					} else {
 						viewer.expandToLevel(selectedNode, AbstractTreeViewer.ALL_LEVELS);
+					}
 				} else {
 					viewer.setExpandedState(selectedNode, !viewer.getExpandedState(selectedNode));
 				}
@@ -1125,24 +1153,26 @@ public void treeCollapsed(TreeEvent e) {
 			}
 		});
 
-		int ops = DND.DROP_MOVE;
+		final int ops = DND.DROP_MOVE;
 		viewer.addDragSupport(ops, new Transfer[] { MemoryTransfer.getInstance() }, new DragListener(viewer));
-		viewer.addDropSupport(ops, new Transfer[] { MemoryTransfer.getInstance() }, new DropListener(viewer, modelProvider.getEditingDomain()));
+		viewer.addDropSupport(ops, new Transfer[] { MemoryTransfer.getInstance() }, new DropListener(viewer,
+			modelProvider.getEditingDomain()));
 
 		return viewer;
 	}
 
 	private void registerContributedVirtualEditors() {
-		IExtensionRegistry registry = RegistryFactory.getRegistry();
-		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
+		final IExtensionRegistry registry = RegistryFactory.getRegistry();
+		final IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
 
-		for (IConfigurationElement el : extPoint.getConfigurationElements()) {
+		for (final IConfigurationElement el : extPoint.getConfigurationElements()) {
 			if (!"virtualeditor".equals(el.getName())) { //$NON-NLS-1$
 				continue;
 			}
 
-			IContributionFactory fact = context.get(IContributionFactory.class);
-			AbstractComponentEditor editor = (AbstractComponentEditor) fact.create("bundleclass://" + el.getContributor().getName() + "/" + el.getAttribute("class"), context); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			final IContributionFactory fact = context.get(IContributionFactory.class);
+			final AbstractComponentEditor editor = (AbstractComponentEditor) fact.create(
+				"bundleclass://" + el.getContributor().getName() + "/" + el.getAttribute("class"), context); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			registerVirtualEditor(el.getAttribute("id"), editor); //$NON-NLS-1$
 		}
 	}
@@ -1152,24 +1182,36 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_HANDLER, ContextInjectionFactory.make(VHandlerEditor.class, context));
 		registerVirtualEditor(VIRTUAL_BINDING_TABLE, ContextInjectionFactory.make(VBindingTableEditor.class, context));
 		registerVirtualEditor(VIRTUAL_COMMAND, ContextInjectionFactory.make(VCommandEditor.class, context));
-		registerVirtualEditor(VIRTUAL_APPLICATION_WINDOWS, ContextInjectionFactory.make(VApplicationWindowEditor.class, context));
+		registerVirtualEditor(VIRTUAL_APPLICATION_WINDOWS,
+			ContextInjectionFactory.make(VApplicationWindowEditor.class, context));
 		registerVirtualEditor(VIRTUAL_WINDOW_WINDOWS, ContextInjectionFactory.make(VWindowWindowsEditor.class, context));
-		registerVirtualEditor(VIRTUAL_PERSPECTIVE_WINDOWS, ContextInjectionFactory.make(VPerspectiveWindowsEditor.class, context));
-		registerVirtualEditor(VIRTUAL_WINDOW_CONTROLS, ContextInjectionFactory.make(VWindowControlEditor.class, context));
+		registerVirtualEditor(VIRTUAL_PERSPECTIVE_WINDOWS,
+			ContextInjectionFactory.make(VPerspectiveWindowsEditor.class, context));
+		registerVirtualEditor(VIRTUAL_WINDOW_CONTROLS,
+			ContextInjectionFactory.make(VWindowControlEditor.class, context));
 		registerVirtualEditor(VIRTUAL_PART_DESCRIPTORS, ContextInjectionFactory.make(VPartDescriptor.class, context));
-		registerVirtualEditor(VIRTUAL_PARTDESCRIPTOR_MENU, ContextInjectionFactory.make(VPartDescriptorMenuEditor.class, context));
-		registerVirtualEditor(VIRTUAL_TRIMMED_WINDOW_TRIMS, ContextInjectionFactory.make(VWindowTrimEditor.class, context));
+		registerVirtualEditor(VIRTUAL_PARTDESCRIPTOR_MENU,
+			ContextInjectionFactory.make(VPartDescriptorMenuEditor.class, context));
+		registerVirtualEditor(VIRTUAL_TRIMMED_WINDOW_TRIMS,
+			ContextInjectionFactory.make(VWindowTrimEditor.class, context));
 		registerVirtualEditor(VIRTUAL_ADDONS, ContextInjectionFactory.make(VApplicationAddons.class, context));
-		registerVirtualEditor(VIRTUAL_MENU_CONTRIBUTIONS, ContextInjectionFactory.make(VMenuContributionsEditor.class, context));
-		registerVirtualEditor(VIRTUAL_TOOLBAR_CONTRIBUTIONS, ContextInjectionFactory.make(VToolBarContributionsEditor.class, context));
-		registerVirtualEditor(VIRTUAL_TRIM_CONTRIBUTIONS, ContextInjectionFactory.make(VTrimContributionsEditor.class, context));
-		registerVirtualEditor(VIRTUAL_WINDOW_SHARED_ELEMENTS, ContextInjectionFactory.make(VWindowSharedElementsEditor.class, context));
-		registerVirtualEditor(VIRTUAL_MODEL_FRAGEMENTS, ContextInjectionFactory.make(VModelFragmentsEditor.class, context));
+		registerVirtualEditor(VIRTUAL_MENU_CONTRIBUTIONS,
+			ContextInjectionFactory.make(VMenuContributionsEditor.class, context));
+		registerVirtualEditor(VIRTUAL_TOOLBAR_CONTRIBUTIONS,
+			ContextInjectionFactory.make(VToolBarContributionsEditor.class, context));
+		registerVirtualEditor(VIRTUAL_TRIM_CONTRIBUTIONS,
+			ContextInjectionFactory.make(VTrimContributionsEditor.class, context));
+		registerVirtualEditor(VIRTUAL_WINDOW_SHARED_ELEMENTS,
+			ContextInjectionFactory.make(VWindowSharedElementsEditor.class, context));
+		registerVirtualEditor(VIRTUAL_MODEL_FRAGEMENTS,
+			ContextInjectionFactory.make(VModelFragmentsEditor.class, context));
 		registerVirtualEditor(VIRTUAL_MODEL_IMPORTS, ContextInjectionFactory.make(VModelImportsEditor.class, context));
-		registerVirtualEditor(VIRTUAL_CATEGORIES, ContextInjectionFactory.make(VApplicationCategoriesEditor.class, context));
+		registerVirtualEditor(VIRTUAL_CATEGORIES,
+			ContextInjectionFactory.make(VApplicationCategoriesEditor.class, context));
 		registerVirtualEditor(VIRTUAL_PARAMETERS, ContextInjectionFactory.make(VItemParametersEditor.class, context));
 		registerVirtualEditor(VIRTUAL_ROOT_CONTEXTS, ContextInjectionFactory.make(VRootBindingContexts.class, context));
-		registerVirtualEditor(VIRTUAL_PERSPECTIVE_CONTROLS, ContextInjectionFactory.make(VPerspectiveControlEditor.class, context));
+		registerVirtualEditor(VIRTUAL_PERSPECTIVE_CONTROLS,
+			ContextInjectionFactory.make(VPerspectiveControlEditor.class, context));
 		registerVirtualEditor(VIRTUAL_SNIPPETS, ContextInjectionFactory.make(VSnippetsEditor.class, context));
 	}
 
@@ -1182,30 +1224,31 @@ public void setSelection(Object element) {
 	}
 
 	private void registerContributedEditors() {
-		IExtensionRegistry registry = RegistryFactory.getRegistry();
-		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
+		final IExtensionRegistry registry = RegistryFactory.getRegistry();
+		final IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
 
-		for (IConfigurationElement el : extPoint.getConfigurationElements()) {
+		for (final IConfigurationElement el : extPoint.getConfigurationElements()) {
 			if (!"editor".equals(el.getName())) { //$NON-NLS-1$
 				continue;
 			}
 
 			try {
-				IEditorDescriptor desc = (IEditorDescriptor) el.createExecutableExtension("descriptorClass"); //$NON-NLS-1$
-				EClass eClass = desc.getEClass();
-				IContributionFactory fact = context.get(IContributionFactory.class);
-				AbstractComponentEditor editor = (AbstractComponentEditor) fact.create("bundleclass://" + el.getContributor().getName() + "/" + desc.getEditorClass().getName(), context); //$NON-NLS-1$ //$NON-NLS-2$
+				final IEditorDescriptor desc = (IEditorDescriptor) el.createExecutableExtension("descriptorClass"); //$NON-NLS-1$
+				final EClass eClass = desc.getEClass();
+				final IContributionFactory fact = context.get(IContributionFactory.class);
+				final AbstractComponentEditor editor = (AbstractComponentEditor) fact.create(
+					"bundleclass://" + el.getContributor().getName() + "/" + desc.getEditorClass().getName(), context); //$NON-NLS-1$ //$NON-NLS-2$
 				registerEditor(eClass, editor);
-			} catch (CoreException e) {
+			} catch (final CoreException e) {
 				e.printStackTrace();
 			}
 		}
 	}
 
 	private void registerContributedEditorTabs() {
-		IExtensionRegistry registry = RegistryFactory.getRegistry();
-		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
-		for (IConfigurationElement el : extPoint.getConfigurationElements()) {
+		final IExtensionRegistry registry = RegistryFactory.getRegistry();
+		final IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.editors"); //$NON-NLS-1$
+		for (final IConfigurationElement el : extPoint.getConfigurationElements()) {
 			if (!"editorTab".equals(el.getName())) { //$NON-NLS-1$
 				continue;
 			}
@@ -1213,28 +1256,30 @@ private void registerContributedEditorTabs() {
 			try {
 				final Object o = el.createExecutableExtension("contribution"); //$NON-NLS-1$
 				if (o instanceof AbstractElementEditorContribution) {
-					AbstractElementEditorContribution contribution = (AbstractElementEditorContribution) o;
+					final AbstractElementEditorContribution contribution = (AbstractElementEditorContribution) o;
 					ContextInjectionFactory.inject(contribution, context);
-					Class<?> contribElem = contribution.getContributableTo();
-					if (contribElem == null)
+					final Class<?> contribElem = contribution.getContributableTo();
+					if (contribElem == null) {
 						continue;
+					}
 					if (!tabContributions.containsKey(contribElem)) {
 						tabContributions.put(contribElem, new ArrayList<AbstractElementEditorContribution>());
 					}
-					List<AbstractElementEditorContribution> res = tabContributions.get(contribElem);
+					final List<AbstractElementEditorContribution> res = tabContributions.get(contribElem);
 					res.add(contribution);
 				}
-			} catch (CoreException e) {
+			} catch (final CoreException e) {
 				e.printStackTrace();
 			}
 		}
 	}
 
 	public List<AbstractElementEditorContribution> getTabContributionsForClass(Class<?> clazz) {
-		List<AbstractElementEditorContribution> ret = new ArrayList<AbstractElementEditorContribution>();
-		for (Class<?> clasz : tabContributions.keySet()) {
-			if (clasz.isAssignableFrom(clazz))
+		final List<AbstractElementEditorContribution> ret = new ArrayList<AbstractElementEditorContribution>();
+		for (final Class<?> clasz : tabContributions.keySet()) {
+			if (clasz.isAssignableFrom(clazz)) {
 				ret.addAll(tabContributions.get(clasz));
+			}
 		}
 		return ret;
 	}
@@ -1242,55 +1287,87 @@ public List<AbstractElementEditorContribution> getTabContributionsForClass(Class
 	private void registerDefaultEditors() {
 		System.err.println(getClass().getName() + ".registerDefaultEditors: " + resourcePool); //$NON-NLS-1$
 
-		registerEditor(ApplicationPackageImpl.Literals.APPLICATION, ContextInjectionFactory.make(ApplicationEditor.class, context));
+		registerEditor(ApplicationPackageImpl.Literals.APPLICATION,
+			ContextInjectionFactory.make(ApplicationEditor.class, context));
 		registerEditor(ApplicationPackageImpl.Literals.ADDON, ContextInjectionFactory.make(AddonsEditor.class, context));
 
-		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING, ContextInjectionFactory.make(KeyBindingEditor.class, context));
+		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING,
+			ContextInjectionFactory.make(KeyBindingEditor.class, context));
 		registerEditor(CommandsPackageImpl.Literals.HANDLER, ContextInjectionFactory.make(HandlerEditor.class, context));
 		registerEditor(CommandsPackageImpl.Literals.COMMAND, ContextInjectionFactory.make(CommandEditor.class, context));
-		registerEditor(CommandsPackageImpl.Literals.COMMAND_PARAMETER, ContextInjectionFactory.make(CommandParameterEditor.class, context));
-		registerEditor(CommandsPackageImpl.Literals.PARAMETER, ContextInjectionFactory.make(ParameterEditor.class, context));
-		registerEditor(CommandsPackageImpl.Literals.BINDING_TABLE, ContextInjectionFactory.make(BindingTableEditor.class, context));
-		registerEditor(CommandsPackageImpl.Literals.BINDING_CONTEXT, ContextInjectionFactory.make(BindingContextEditor.class, context));
-		registerEditor(CommandsPackageImpl.Literals.CATEGORY, ContextInjectionFactory.make(CategoryEditor.class, context));
+		registerEditor(CommandsPackageImpl.Literals.COMMAND_PARAMETER,
+			ContextInjectionFactory.make(CommandParameterEditor.class, context));
+		registerEditor(CommandsPackageImpl.Literals.PARAMETER,
+			ContextInjectionFactory.make(ParameterEditor.class, context));
+		registerEditor(CommandsPackageImpl.Literals.BINDING_TABLE,
+			ContextInjectionFactory.make(BindingTableEditor.class, context));
+		registerEditor(CommandsPackageImpl.Literals.BINDING_CONTEXT,
+			ContextInjectionFactory.make(BindingContextEditor.class, context));
+		registerEditor(CommandsPackageImpl.Literals.CATEGORY,
+			ContextInjectionFactory.make(CategoryEditor.class, context));
 
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR, ContextInjectionFactory.make(ToolBarEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, ContextInjectionFactory.make(DirectToolItemEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, ContextInjectionFactory.make(HandledToolItemEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, ContextInjectionFactory.make(ToolBarSeparatorEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.TOOL_CONTROL, ContextInjectionFactory.make(ToolControlEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM,
+			ContextInjectionFactory.make(DirectToolItemEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM,
+			ContextInjectionFactory.make(HandledToolItemEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR,
+			ContextInjectionFactory.make(ToolBarSeparatorEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.TOOL_CONTROL,
+			ContextInjectionFactory.make(ToolControlEditor.class, context));
 
 		registerEditor(MenuPackageImpl.Literals.MENU, ContextInjectionFactory.make(MenuEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.POPUP_MENU, ContextInjectionFactory.make(PopupMenuEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.MENU_SEPARATOR, ContextInjectionFactory.make(MenuSeparatorEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, ContextInjectionFactory.make(HandledMenuItemEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, ContextInjectionFactory.make(DirectMenuItemEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION, ContextInjectionFactory.make(MenuContributionEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION, ContextInjectionFactory.make(ToolBarContributionEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION, ContextInjectionFactory.make(TrimContributionEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, ContextInjectionFactory.make(DynamicMenuContributionEditor.class, context));
-
-		registerEditor(UiPackageImpl.Literals.CORE_EXPRESSION, ContextInjectionFactory.make(CoreExpressionEditor.class, context));
-
-		registerEditor(BasicPackageImpl.Literals.COMPOSITE_PART, ContextInjectionFactory.make(CompositePartEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.POPUP_MENU,
+			ContextInjectionFactory.make(PopupMenuEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.MENU_SEPARATOR,
+			ContextInjectionFactory.make(MenuSeparatorEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM,
+			ContextInjectionFactory.make(HandledMenuItemEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM,
+			ContextInjectionFactory.make(DirectMenuItemEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION,
+			ContextInjectionFactory.make(MenuContributionEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION,
+			ContextInjectionFactory.make(ToolBarContributionEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION,
+			ContextInjectionFactory.make(TrimContributionEditor.class, context));
+		registerEditor(MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION,
+			ContextInjectionFactory.make(DynamicMenuContributionEditor.class, context));
+
+		registerEditor(UiPackageImpl.Literals.CORE_EXPRESSION,
+			ContextInjectionFactory.make(CoreExpressionEditor.class, context));
+
+		registerEditor(BasicPackageImpl.Literals.COMPOSITE_PART,
+			ContextInjectionFactory.make(CompositePartEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.PART, ContextInjectionFactory.make(PartEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.WINDOW, ContextInjectionFactory.make(WindowEditor.class, context));
-		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW, ContextInjectionFactory.make(TrimmedWindowEditor.class, context));
-		registerEditor(BasicPackageImpl.Literals.PART_SASH_CONTAINER, ContextInjectionFactory.make(PartSashContainerEditor.class, context));
+		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW,
+			ContextInjectionFactory.make(TrimmedWindowEditor.class, context));
+		registerEditor(BasicPackageImpl.Literals.PART_SASH_CONTAINER,
+			ContextInjectionFactory.make(PartSashContainerEditor.class, context));
 		registerEditor(AdvancedPackageImpl.Literals.AREA, ContextInjectionFactory.make(AreaEditor.class, context));
-		registerEditor(BasicPackageImpl.Literals.PART_STACK, ContextInjectionFactory.make(PartStackEditor.class, context));
+		registerEditor(BasicPackageImpl.Literals.PART_STACK,
+			ContextInjectionFactory.make(PartStackEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.TRIM_BAR, ContextInjectionFactory.make(TrimBarEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.DIALOG, ContextInjectionFactory.make(DialogEditor.class, context));
-		registerEditor(BasicPackageImpl.Literals.WIZARD_DIALOG, ContextInjectionFactory.make(WizardDialogEditor.class, context));
-
-		registerEditor(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR, ContextInjectionFactory.make(PartDescriptorEditor.class, context));
-
-		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, ContextInjectionFactory.make(PerspectiveStackEditor.class, context));
-		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE, ContextInjectionFactory.make(PerspectiveEditor.class, context));
-		registerEditor(AdvancedPackageImpl.Literals.PLACEHOLDER, ContextInjectionFactory.make(PlaceholderEditor.class, context));
-
-		registerEditor(FragmentPackageImpl.Literals.MODEL_FRAGMENTS, ContextInjectionFactory.make(ModelFragmentsEditor.class, context));
-		registerEditor(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT, ContextInjectionFactory.make(StringModelFragment.class, context));
+		registerEditor(BasicPackageImpl.Literals.WIZARD_DIALOG,
+			ContextInjectionFactory.make(WizardDialogEditor.class, context));
+
+		registerEditor(
+			org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR,
+			ContextInjectionFactory.make(PartDescriptorEditor.class, context));
+
+		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
+			ContextInjectionFactory.make(PerspectiveStackEditor.class, context));
+		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE,
+			ContextInjectionFactory.make(PerspectiveEditor.class, context));
+		registerEditor(AdvancedPackageImpl.Literals.PLACEHOLDER,
+			ContextInjectionFactory.make(PlaceholderEditor.class, context));
+
+		registerEditor(FragmentPackageImpl.Literals.MODEL_FRAGMENTS,
+			ContextInjectionFactory.make(ModelFragmentsEditor.class, context));
+		registerEditor(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT,
+			ContextInjectionFactory.make(StringModelFragment.class, context));
 	}
 
 	public void tab_list_show(Boolean show) {
@@ -1306,7 +1383,7 @@ public void tab_list_show(Boolean show) {
 			}
 		} else {
 			if (listTab == null) {
-				IEclipseContext child = context.createChild();
+				final IEclipseContext child = context.createChild();
 				child.set(CTabFolder.class, editorTabFolder);
 				child.set(EMFDocumentResourceMediator.class, emfDocumentProvider);
 				child.set(IGotoObject.class, this);
@@ -1319,10 +1396,11 @@ public void tab_list_show(Boolean show) {
 
 	@Inject
 	public void setNotVisibleColor(@Preference(ModelEditorPreferences.NOT_VISIBLE_COLOR) String color) {
-		RGB current = JFaceResources.getColorRegistry().getRGB(ComponentLabelProvider.NOT_VISIBLE_KEY);
+		final RGB current = JFaceResources.getColorRegistry().getRGB(ComponentLabelProvider.NOT_VISIBLE_KEY);
 
 		if (current == null || !current.equals(color)) {
-			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_VISIBLE_KEY, StringConverter.asRGB(color, new RGB(200, 200, 200)));
+			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_VISIBLE_KEY,
+				StringConverter.asRGB(color, new RGB(200, 200, 200)));
 		}
 
 		if (viewer != null) {
@@ -1333,10 +1411,11 @@ public void setNotVisibleColor(@Preference(ModelEditorPreferences.NOT_VISIBLE_CO
 
 	@Inject
 	public void setNotRenderedColor(@Preference(ModelEditorPreferences.NOT_RENDERED_COLOR) String color) {
-		RGB current = JFaceResources.getColorRegistry().getRGB(ComponentLabelProvider.NOT_RENDERED_KEY);
+		final RGB current = JFaceResources.getColorRegistry().getRGB(ComponentLabelProvider.NOT_RENDERED_KEY);
 
 		if (current == null || !current.equals(color)) {
-			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_RENDERED_KEY, StringConverter.asRGB(color, new RGB(200, 200, 200)));
+			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_RENDERED_KEY,
+				StringConverter.asRGB(color, new RGB(200, 200, 200)));
 		}
 
 		if (viewer != null) {
@@ -1346,11 +1425,14 @@ public void setNotRenderedColor(@Preference(ModelEditorPreferences.NOT_RENDERED_
 	}
 
 	@Inject
-	public void setNotVisibleRenderedColor(@Preference(ModelEditorPreferences.NOT_VISIBLE_AND_RENDERED_COLOR) String color) {
-		RGB current = JFaceResources.getColorRegistry().getRGB(ComponentLabelProvider.NOT_VISIBLE_AND_RENDERED_KEY);
+	public void setNotVisibleRenderedColor(
+		@Preference(ModelEditorPreferences.NOT_VISIBLE_AND_RENDERED_COLOR) String color) {
+		final RGB current = JFaceResources.getColorRegistry().getRGB(
+			ComponentLabelProvider.NOT_VISIBLE_AND_RENDERED_KEY);
 
 		if (current == null || !current.equals(color)) {
-			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_VISIBLE_AND_RENDERED_KEY, StringConverter.asRGB(color, new RGB(200, 200, 200)));
+			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_VISIBLE_AND_RENDERED_KEY,
+				StringConverter.asRGB(color, new RGB(200, 200, 200)));
 		}
 
 		if (viewer != null) {
@@ -1362,9 +1444,9 @@ public void setNotVisibleRenderedColor(@Preference(ModelEditorPreferences.NOT_VI
 	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
 		editorMap.put(eClass, editor);
 
-		for (FeaturePath p : editor.getLabelProperties()) {
+		for (final FeaturePath p : editor.getLabelProperties()) {
 			boolean found = false;
-			for (FeaturePath tmp : labelFeaturePaths) {
+			for (final FeaturePath tmp : labelFeaturePaths) {
 				if (equalsPaths(p, tmp)) {
 					found = true;
 					break;
@@ -1394,14 +1476,15 @@ private boolean equalsPaths(FeaturePath p1, FeaturePath p2) {
 	public AbstractComponentEditor getEditor(EClass eClass) {
 		AbstractComponentEditor editor = editorMap.get(eClass);
 		if (editor == null) {
-			for (EClass cl : eClass.getESuperTypes()) {
+			for (final EClass cl : eClass.getESuperTypes()) {
 				editor = getEditor(cl);
 				if (editor != null) {
 					return editor;
 				}
 			}
-			if (editor == null)
+			if (editor == null) {
 				editor = ContextInjectionFactory.make(DefaultEditor.class, context);
+			}
 		}
 		return editor;
 	}
@@ -1446,7 +1529,7 @@ public void setFocus() {
 	void dispose() {
 		try {
 			obsManager.dispose();
-		} catch (Exception e) {
+		} catch (final Exception e) {
 			e.printStackTrace();
 		}
 
@@ -1477,7 +1560,7 @@ public void paste() {
 
 		@SuppressWarnings("unchecked")
 		private void handleStructurePaste() {
-			Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
+			final Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
 			Object o = clip.getContents(MemoryTransfer.getInstance());
 			clip.dispose();
 			if (o == null) {
@@ -1486,12 +1569,12 @@ private void handleStructurePaste() {
 
 			o = EcoreUtil.copy((EObject) o);
 
-			Object parent = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+			final Object parent = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
 
 			EStructuralFeature feature = null;
 			EObject container = null;
 			if (parent instanceof VirtualEntry<?>) {
-				VirtualEntry<?> v = (VirtualEntry<?>) parent;
+				final VirtualEntry<?> v = (VirtualEntry<?>) parent;
 				feature = ((IEMFProperty) v.getProperty()).getStructuralFeature();
 				container = (EObject) v.getOriginalParent();
 			} else {
@@ -1500,9 +1583,9 @@ private void handleStructurePaste() {
 					container = (EObject) parent;
 				} else if (parent instanceof EObject) {
 					container = (EObject) parent;
-					EClass eClass = container.eClass();
+					final EClass eClass = container.eClass();
 
-					for (EStructuralFeature f : eClass.getEAllStructuralFeatures()) {
+					for (final EStructuralFeature f : eClass.getEAllStructuralFeatures()) {
 						if (ModelUtils.getTypeArgument(eClass, f.getEGenericType()).isInstance(o)) {
 							feature = f;
 							break;
@@ -1512,9 +1595,9 @@ private void handleStructurePaste() {
 			}
 
 			if (feature == FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS && container != null) {
-				MApplicationElement el = (MApplicationElement) EcoreUtil.create(((EObject) o).eClass());
+				final MApplicationElement el = (MApplicationElement) EcoreUtil.create(((EObject) o).eClass());
 				el.setElementId(((MApplicationElement) o).getElementId());
-				Command cmd = AddCommand.create(getModelProvider().getEditingDomain(), container, feature, el);
+				final Command cmd = AddCommand.create(getModelProvider().getEditingDomain(), container, feature, el);
 				if (cmd.canExecute()) {
 					getModelProvider().getEditingDomain().getCommandStack().execute(cmd);
 				}
@@ -1522,7 +1605,7 @@ private void handleStructurePaste() {
 			}
 
 			if (feature != null && container != null) {
-				Command cmd = AddCommand.create(getModelProvider().getEditingDomain(), container, feature, o);
+				final Command cmd = AddCommand.create(getModelProvider().getEditingDomain(), container, feature, o);
 				if (cmd.canExecute()) {
 					getModelProvider().getEditingDomain().getCommandStack().execute(cmd);
 					if (isLiveModel()) {
@@ -1548,10 +1631,11 @@ public void copy() {
 		}
 
 		private void handleStructureCopy() {
-			Object o = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+			final Object o = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
 			if (o != null && o instanceof EObject) {
-				Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
-				clip.setContents(new Object[] { EcoreUtil.copy((EObject) o) }, new Transfer[] { MemoryTransfer.getInstance() });
+				final Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
+				clip.setContents(new Object[] { EcoreUtil.copy((EObject) o) },
+					new Transfer[] { MemoryTransfer.getInstance() });
 				clip.dispose();
 			}
 		}
@@ -1570,13 +1654,14 @@ public void cut() {
 		}
 
 		private void handleStructureCut() {
-			Object o = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+			final Object o = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
 			if (o != null && o instanceof EObject) {
-				Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
+				final Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
 				clip.setContents(new Object[] { o }, new Transfer[] { MemoryTransfer.getInstance() });
 				clip.dispose();
-				EObject eObj = (EObject) o;
-				Command cmd = RemoveCommand.create(getModelProvider().getEditingDomain(), eObj.eContainer(), eObj.eContainingFeature(), eObj);
+				final EObject eObj = (EObject) o;
+				final Command cmd = RemoveCommand.create(getModelProvider().getEditingDomain(), eObj.eContainer(),
+					eObj.eContainingFeature(), eObj);
 				if (cmd.canExecute()) {
 					getModelProvider().getEditingDomain().getCommandStack().execute(cmd);
 				}
@@ -1593,7 +1678,7 @@ public IObservable createObservable(Object target) {
 			} else if (target instanceof VirtualEntry<?>) {
 				return ((VirtualEntry<?>) target).getList();
 			} else {
-				AbstractComponentEditor editor = getEditor(((EObject) target).eClass());
+				final AbstractComponentEditor editor = getEditor(((EObject) target).eClass());
 				if (editor != null) {
 					return editor.getChildList(target);
 				}
@@ -1612,19 +1697,19 @@ public DragListener(TreeViewer viewer) {
 
 		@Override
 		public void dragStart(DragSourceEvent event) {
-			IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
+			final IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
 			event.doit = !selection.isEmpty() && selection.getFirstElement() instanceof MApplicationElement;
 		}
 
 		@Override
 		public void dragSetData(DragSourceEvent event) {
-			IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
+			final IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
 			event.data = selection.toArray();
 		}
 	}
 
 	class DropListener extends ViewerDropAdapter {
-		private EditingDomain domain;
+		private final EditingDomain domain;
 
 		protected DropListener(Viewer viewer, EditingDomain domain) {
 			super(viewer);
@@ -1633,11 +1718,12 @@ protected DropListener(Viewer viewer, EditingDomain domain) {
 
 		@Override
 		public boolean performDrop(Object data) {
-			Object[] dropDataArray = (Object[]) data;
-			for (Object object : dropDataArray) {
-				boolean result = performSingleDrop(object);
-				if (!result)
+			final Object[] dropDataArray = (Object[]) data;
+			for (final Object object : dropDataArray) {
+				final boolean result = performSingleDrop(object);
+				if (!result) {
 					return false;
+				}
 			}
 			return true;
 		}
@@ -1651,8 +1737,8 @@ public boolean performSingleDrop(Object data) {
 					feature = UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN;
 					parent = (EObject) getCurrentTarget();
 				} else if (getCurrentTarget() instanceof VirtualEntry<?>) {
-					VirtualEntry<?> entry = (VirtualEntry<?>) getCurrentTarget();
-					IListProperty prop = entry.getProperty();
+					final VirtualEntry<?> entry = (VirtualEntry<?>) getCurrentTarget();
+					final IListProperty prop = entry.getProperty();
 					if (prop instanceof IEMFProperty) {
 						feature = ((IEMFProperty) prop).getStructuralFeature();
 						parent = (EObject) entry.getOriginalParent();
@@ -1660,8 +1746,8 @@ public boolean performSingleDrop(Object data) {
 					}
 				} else if (getCurrentTarget() instanceof EObject) {
 					parent = (EObject) getCurrentTarget();
-					for (EStructuralFeature f : parent.eClass().getEAllStructuralFeatures()) {
-						EClassifier cl = ModelUtils.getTypeArgument(parent.eClass(), f.getEGenericType());
+					for (final EStructuralFeature f : parent.eClass().getEAllStructuralFeatures()) {
+						final EClassifier cl = ModelUtils.getTypeArgument(parent.eClass(), f.getEGenericType());
 						if (cl.isInstance(data)) {
 							feature = f;
 							break;
@@ -1670,7 +1756,7 @@ public boolean performSingleDrop(Object data) {
 				}
 
 				if (feature != null && parent != null) {
-					Command cmd = AddCommand.create(domain, parent, feature, data);
+					final Command cmd = AddCommand.create(domain, parent, feature, data);
 					if (cmd.canExecute()) {
 						domain.getCommandStack().execute(cmd);
 						if (isLiveModel()) {
@@ -1685,12 +1771,12 @@ public boolean performSingleDrop(Object data) {
 				EStructuralFeature feature = null;
 				EObject parent = null;
 
-				TreeItem item = (TreeItem) getCurrentEvent().item;
+				final TreeItem item = (TreeItem) getCurrentEvent().item;
 				if (item != null) {
-					TreeItem parentItem = item.getParentItem();
+					final TreeItem parentItem = item.getParentItem();
 					if (item != null) {
 						if (parentItem.getData() instanceof VirtualEntry<?>) {
-							VirtualEntry<?> vE = (VirtualEntry<?>) parentItem.getData();
+							final VirtualEntry<?> vE = (VirtualEntry<?>) parentItem.getData();
 							parent = (EObject) vE.getOriginalParent();
 							feature = ((IEMFProperty) vE.getProperty()).getStructuralFeature();
 						} else if (parentItem.getData() instanceof MElementContainer<?>) {
@@ -1698,8 +1784,8 @@ public boolean performSingleDrop(Object data) {
 							feature = UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN;
 						} else if (parentItem.getData() instanceof EObject) {
 							parent = (EObject) parentItem.getData();
-							for (EStructuralFeature f : parent.eClass().getEAllStructuralFeatures()) {
-								EClassifier cl = ModelUtils.getTypeArgument(parent.eClass(), f.getEGenericType());
+							for (final EStructuralFeature f : parent.eClass().getEAllStructuralFeatures()) {
+								final EClassifier cl = ModelUtils.getTypeArgument(parent.eClass(), f.getEGenericType());
 								if (cl.isInstance(data)) {
 									feature = f;
 									break;
@@ -1710,9 +1796,9 @@ public boolean performSingleDrop(Object data) {
 				}
 
 				if (feature == FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS && parent != null) {
-					MApplicationElement el = (MApplicationElement) EcoreUtil.create(((EObject) data).eClass());
+					final MApplicationElement el = (MApplicationElement) EcoreUtil.create(((EObject) data).eClass());
 					el.setElementId(((MApplicationElement) data).getElementId());
-					Command cmd = AddCommand.create(domain, parent, feature, el);
+					final Command cmd = AddCommand.create(domain, parent, feature, el);
 					if (cmd.canExecute()) {
 						domain.getCommandStack().execute(cmd);
 					}
@@ -1720,7 +1806,7 @@ public boolean performSingleDrop(Object data) {
 				}
 
 				if (feature != null && parent != null && parent.eGet(feature) instanceof List<?>) {
-					List<Object> list = (List<Object>) parent.eGet(feature);
+					final List<Object> list = (List<Object>) parent.eGet(feature);
 					int index = list.indexOf(getCurrentTarget());
 
 					if (index >= list.size()) {
@@ -1731,7 +1817,7 @@ public boolean performSingleDrop(Object data) {
 						if (parent instanceof MElementContainer<?> && data instanceof MUIElement) {
 							Util.moveElementByIndex(domain, (MUIElement) data, isLiveModel(), index);
 						} else {
-							Command cmd = MoveCommand.create(domain, parent, feature, data, index);
+							final Command cmd = MoveCommand.create(domain, parent, feature, data, index);
 							if (cmd.canExecute()) {
 								domain.getCommandStack().execute(cmd);
 								return true;
@@ -1743,7 +1829,7 @@ public boolean performSingleDrop(Object data) {
 							data = EcoreUtil.copy((EObject) data);
 						}
 
-						Command cmd = AddCommand.create(domain, parent, feature, data, index);
+						final Command cmd = AddCommand.create(domain, parent, feature, data, index);
 						if (cmd.canExecute()) {
 							domain.getCommandStack().execute(cmd);
 							if (isLiveModel()) {
@@ -1784,28 +1870,31 @@ public boolean validateDrop(Object target, int operation, TransferData transferT
 		private boolean isValidDrop(Object target, MApplicationElement instance, boolean isIndex) {
 			if (target instanceof MElementContainer<?>) {
 				@SuppressWarnings("unchecked")
-				MElementContainer<MUIElement> container = (MElementContainer<MUIElement>) target;
+				final MElementContainer<MUIElement> container = (MElementContainer<MUIElement>) target;
 
 				if (isIndex || !container.getChildren().contains(instance)) {
-					EClassifier classifier = ModelUtils.getTypeArgument(((EObject) container).eClass(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN.getEGenericType());
+					final EClassifier classifier = ModelUtils.getTypeArgument(((EObject) container).eClass(),
+						UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN.getEGenericType());
 					return classifier.isInstance(instance);
 				}
 			} else if (target instanceof VirtualEntry<?>) {
 				@SuppressWarnings("unchecked")
-				VirtualEntry<Object> vTarget = (VirtualEntry<Object>) target;
+				final VirtualEntry<Object> vTarget = (VirtualEntry<Object>) target;
 				if (isIndex || !vTarget.getList().contains(instance)) {
 					if (vTarget.getProperty() instanceof IEMFProperty) {
-						EStructuralFeature feature = ((IEMFProperty) vTarget.getProperty()).getStructuralFeature();
-						EObject parent = (EObject) vTarget.getOriginalParent();
-						EClassifier classifier = ModelUtils.getTypeArgument(parent.eClass(), feature.getEGenericType());
+						final EStructuralFeature feature = ((IEMFProperty) vTarget.getProperty())
+							.getStructuralFeature();
+						final EObject parent = (EObject) vTarget.getOriginalParent();
+						final EClassifier classifier = ModelUtils.getTypeArgument(parent.eClass(),
+							feature.getEGenericType());
 						return classifier.isInstance(instance);
 					}
 
 				}
 			} else if (target instanceof EObject) {
-				EObject eObj = (EObject) target;
-				for (EStructuralFeature f : eObj.eClass().getEAllStructuralFeatures()) {
-					EClassifier cl = ModelUtils.getTypeArgument(eObj.eClass(), f.getEGenericType());
+				final EObject eObj = (EObject) target;
+				for (final EStructuralFeature f : eObj.eClass().getEAllStructuralFeatures()) {
+					final EClassifier cl = ModelUtils.getTypeArgument(eObj.eClass(), f.getEGenericType());
 					if (cl.isInstance(instance)) {
 						return true;
 					}
@@ -1824,7 +1913,8 @@ public void gotoEObject(int targetHint, EObject object) {
 			switch (targetHint) {
 			case TAB_FORM:
 				// make sure tree node has been instantiated
-				ObservableListTreeContentProvider provider = (ObservableListTreeContentProvider) viewer.getContentProvider();
+				final ObservableListTreeContentProvider provider = (ObservableListTreeContentProvider) viewer
+					.getContentProvider();
 				getFirstMatchingItem(object, provider, provider.getChildren(viewer.getInput()));
 
 				viewer.reveal(object);
@@ -1839,7 +1929,7 @@ public void gotoEObject(int targetHint, EObject object) {
 
 				try {
 					xmiTab.gotoEObject(object);
-				} catch (Exception e) {
+				} catch (final Exception e) {
 					e.printStackTrace();
 				}
 				break;
@@ -1863,7 +1953,7 @@ private Object getFirstMatchingItem(EObject target, ObservableListTreeContentPro
 			if (items[i] == target) {
 				return items[i];
 			}
-			Object found = getFirstMatchingItem(target, provider, provider.getChildren(items[i]));
+			final Object found = getFirstMatchingItem(target, provider, provider.getChildren(items[i]));
 			if (found != null) {
 				return found;
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index e5b7a76f54..a4168da623 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -58,7 +58,6 @@
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
-@SuppressWarnings("restriction")
 public class AddonsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
@@ -158,7 +157,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
 			EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		final Link lnk;
 		// ------------------------------------------------------------
 		{
@@ -198,8 +197,8 @@ public void modifyText(ModifyEvent e) {
 				textProp.observeDelayed(200, t),
 				EMFEditProperties.value(getEditingDomain(),
 					ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()),
-				new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
-				new UpdateValueStrategy());
+					new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+					new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 72e4bd4052..7ec370f327 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -84,7 +84,6 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-@SuppressWarnings("restriction")
 public class ApplicationEditor extends AbstractComponentEditor {
 
 	private Composite composite;
@@ -199,7 +198,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp,
 			EMFEditProperties
-			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.ApplicationEditor_BindingContexts);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 006c99be59..dea1d51b04 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -81,7 +81,6 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-@SuppressWarnings("restriction")
 public class AreaEditor extends AbstractComponentEditor {
 
 	private Composite composite;
@@ -233,7 +232,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp,
 			EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.AreaEditor_LabelLabel, master, context, textProp,
 			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
 		ControlFactory.createTextField(parent, Messages.AreaEditor_Tooltip, master, context, textProp,
@@ -302,7 +301,7 @@ public String getText(Object element) {
 			final IViewerValueProperty vProp = ViewerProperties.singleSelection();
 			context.bindValue(vProp.observe(viewer),
 				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL)
-					.observeDetail(getMaster()));
+				.observeDetail(getMaster()));
 		}
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.AreaEditor_SelectedElement);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 453c2ef473..b036df1891 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -53,7 +53,6 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 
-@SuppressWarnings("restriction")
 public class BindingContextEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
@@ -170,7 +169,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
 			EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Name, master, context, textProp,
 			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME),
 			Messages.BindingContextEditor_NameWarning);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 025f10ee21..68f99664b1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -62,7 +62,6 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-@SuppressWarnings("restriction")
 public class BindingTableEditor extends AbstractComponentEditor {
 
 	private Composite composite;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index 6e8078b38f..147b1d2138 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -36,7 +36,6 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 
-@SuppressWarnings("restriction")
 public class CategoryEditor extends AbstractComponentEditor {
 
 	private Composite composite;
@@ -127,7 +126,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
 			EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.CategoryEditor_Name, master, context, textProp,
 			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__NAME));
 		ControlFactory.createTextField(parent, Messages.CategoryEditor_Description, master, context, textProp,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index b7e5342262..c5645349a6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -60,7 +60,6 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-@SuppressWarnings("restriction")
 public class CommandEditor extends AbstractComponentEditor {
 
 	private Composite composite;
@@ -165,7 +164,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id,
 			Messages.ModelTooling_CommandId_tooltip, master, context, textProp, EMFEditProperties.value(
 				getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID),
-			Messages.ModelTooling_Empty_Warning);
+				Messages.ModelTooling_Empty_Warning);
 		ControlFactory.createTextField(parent, Messages.CommandEditor_Name, master, context, textProp,
 			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME));
 		ControlFactory.createTextField(parent, Messages.CommandEditor_LabelDescription, master, context, textProp,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index b25b473523..3db9f0a885 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -40,7 +40,6 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 
-@SuppressWarnings("restriction")
 public class CommandParameterEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
@@ -140,7 +139,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
 			EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID),
+			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID),
 			Messages.ModelTooling_Empty_Warning);
 		ControlFactory.createTextField(parent, Messages.CommandParameterEditor_Name, master, context, textProp,
 			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME),
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index 176383c8a7..ca2c906083 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -78,7 +78,6 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-@SuppressWarnings("restriction")
 public class CompositePartEditor extends AbstractComponentEditor {
 
 	private Composite composite;
@@ -154,17 +153,17 @@ public void run() {
 
 		// --- Import Actions ---
 		actionsImport.add(new Action("Views", createImageDescriptor(ResourceProvider.IMG_Part)) { //$NON-NLS-1$
-			@Override
-			public void run() {
-				handleImportChild(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_VIEW);
-			}
-		});
+				@Override
+				public void run() {
+					handleImportChild(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_VIEW);
+				}
+			});
 		actionsImport.add(new Action("Editors", createImageDescriptor(ResourceProvider.IMG_Part)) { //$NON-NLS-1$
-			@Override
-			public void run() {
-				handleImportChild(BasicPackageImpl.Literals.INPUT_PART, RegistryUtil.HINT_EDITOR);
-			}
-		});
+				@Override
+				public void run() {
+					handleImportChild(BasicPackageImpl.Literals.INPUT_PART, RegistryUtil.HINT_EDITOR);
+				}
+			});
 
 	}
 
@@ -257,7 +256,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
 			EMFEditProperties
-			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
 			context, textProp,
 			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
@@ -330,7 +329,7 @@ public String getText(Object element) {
 			final IViewerValueProperty vProp = ViewerProperties.singleSelection();
 			context.bindValue(vProp.observe(viewer),
 				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL)
-				.observeDetail(getMaster()));
+					.observeDetail(getMaster()));
 		}
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.CompositePartEditor_SelectedElement);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 2930a6e897..d7766c13f5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -107,7 +107,6 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-@SuppressWarnings("restriction")
 public class ControlFactory {
 	public static final String COPY_HANDLER = ControlFactory.class.getName() + ".COPY_HANDLER"; //$NON-NLS-1$
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index f0f21c6d4c..0c81147f4e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -39,7 +39,6 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-@SuppressWarnings("restriction")
 public class CoreExpressionEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
@@ -111,7 +110,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t),
 				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.CORE_EXPRESSION__CORE_EXPRESSION_ID)
-					.observeDetail(getMaster()));
+				.observeDetail(getMaster()));
 
 			if (getEditor().getExtensionLookup() == null) {
 				gd.horizontalSpan = 2;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 1b24c05f75..4298b057aa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -58,7 +58,6 @@
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
-@SuppressWarnings("restriction")
 public class DirectMenuItemEditor extends MenuItemEditor {
 	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
 		.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
@@ -162,8 +161,8 @@ public void modifyText(ModifyEvent e) {
 				textProp.observeDelayed(200, t),
 				EMFEditProperties.value(getEditingDomain(),
 					ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master),
-				new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
-				new UpdateValueStrategy());
+					new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+					new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index a36a712efe..ffe3a7eb3e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -57,7 +57,6 @@
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
-@SuppressWarnings("restriction")
 public class DirectToolItemEditor extends ToolItemEditor {
 	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
 		.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
@@ -121,8 +120,8 @@ public void modifyText(ModifyEvent e) {
 		});
 		final Binding binding = context.bindValue(textProp.observeDelayed(200, t),
 			EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI)
-			.observeDetail(master), new UpdateValueStrategy()
-		.setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
+				.observeDetail(master), new UpdateValueStrategy()
+				.setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
 		Util.addDecoration(t, binding);
 
 		final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
index fa879a2376..216c817d8f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
@@ -6,13 +6,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Marco Descher <marco@descher.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 424730
+ * Marco Descher <marco@descher.at> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Steven Spungin <steven@spungin.tv> - Bug 424730
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -90,9 +91,8 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			if (((MUIElement) element).isToBeRendered()) {
 				return createImage(ResourceProvider.IMG_DynamicMenuContribution);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_DynamicMenuContribution);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_DynamicMenuContribution);
 		}
 
 		return null;
@@ -136,10 +136,11 @@ protected Composite doGetEditor(Composite parent, Object object) {
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
+		boolean isImport) {
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
@@ -149,7 +150,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -157,13 +158,18 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTranslatedTextField(parent, Messages.DynamicMenuContributionEditor_LabelLabel, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTranslatedTextField(parent, Messages.DynamicMenuContributionEditor_LabelLabel,
+			getMaster(), context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
 
 		// ------------------------------------------------------------
 		final Link lnk;
 		{
-			final IContributionClassCreator c = getEditor().getContributionCreator(MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION);
+			final IContributionClassCreator c = getEditor().getContributionCreator(
+				MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION);
 			if (project != null && c != null) {
 				lnk = new Link(parent, SWT.NONE);
 				lnk.setText("<A>" + Messages.DynamicMenuContributionEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
@@ -171,17 +177,18 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 				lnk.addSelectionListener(new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
-						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, lnk.getShell());
+						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project,
+							lnk.getShell());
 					}
 				});
 			} else {
 				lnk = null;
-				Label l = new Label(parent, SWT.NONE);
+				final Label l = new Label(parent, SWT.NONE);
 				l.setText(Messages.DynamicMenuContributionEditor_ClassURI);
 				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 			}
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.addModifyListener(new ModifyListener() {
@@ -189,11 +196,16 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void modifyText(ModifyEvent e) {
 					if (lnk != null) {
-						lnk.setToolTipText(((Text) (e.getSource())).getText());
+						lnk.setToolTipText(((Text) e.getSource()).getText());
 					}
 				}
 			});
-			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
+			final Binding binding = context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(),
+					ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()),
+				new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+				new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
@@ -203,7 +215,9 @@ public void modifyText(ModifyEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
+						getEditingDomain(), (MContribution) getMaster().getValue(),
+						ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index ac3297d06f..c60364c1e5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -6,11 +6,12 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
@@ -50,8 +51,10 @@
 
 public class HandledMenuItemEditor extends MenuItemEditor {
 
-	private IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
-	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
+	private final IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(),
+		MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
+	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
+		.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
 	@Inject
 	private IModelResource resource;
@@ -64,12 +67,11 @@ public HandledMenuItemEditor() {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_HandledMenuItem);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_HandledMenuItem);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_HandledMenuItem);
 		}
 
 		return null;
@@ -87,19 +89,22 @@ public String getDescription(Object element) {
 
 	@Override
 	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, final WritableValue master) {
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.HandledMenuItemEditor_Command);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND).observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter(Messages)));
+			context.bindValue(textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND)
+					.observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy()
+					.setConverter(new CommandToStringConverter(Messages)));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -108,7 +113,8 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					HandledMenuItemCommandSelectionDialog dialog = new HandledMenuItemCommandSelectionDialog(b.getShell(), (MHandledItem) getMaster().getValue(), resource, Messages);
+					final HandledMenuItemCommandSelectionDialog dialog = new HandledMenuItemCommandSelectionDialog(b
+						.getShell(), (MHandledItem) getMaster().getValue(), resource, Messages);
 					dialog.open();
 				}
 			});
@@ -137,7 +143,8 @@ public void handleValueChange(ValueChangeEvent event) {
 			}
 		});
 
-		list.add(new VirtualEntry<MParameter>(ModelEditor.VIRTUAL_PARAMETERS, HANDLED_ITEM__PARAMETERS, element, Messages.HandledMenuItemEditor_Parameters) {
+		list.add(new VirtualEntry<MParameter>(ModelEditor.VIRTUAL_PARAMETERS, HANDLED_ITEM__PARAMETERS, element,
+			Messages.HandledMenuItemEditor_Parameters) {
 			@Override
 			protected boolean accepted(MParameter o) {
 				return true;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 9234824be7..0110964f8d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -6,11 +6,12 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
@@ -49,8 +50,10 @@
 
 public class HandledToolItemEditor extends ToolItemEditor {
 
-	private IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
-	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
+	private final IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(),
+		MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
+	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
+		.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
 	@Inject
 	private IModelResource resource;
@@ -63,12 +66,11 @@ public HandledToolItemEditor() {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_HandledToolItem);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_HandledToolItem);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_HandledToolItem);
 		}
 
 		return null;
@@ -76,18 +78,21 @@ public Image getImage(Object element, Display display) {
 
 	@Override
 	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, final WritableValue master) {
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.HandledToolItemEditor_Command);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND).observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter(Messages)));
+			context.bindValue(textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND)
+					.observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy()
+					.setConverter(new CommandToStringConverter(Messages)));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -96,7 +101,8 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					HandledToolItemCommandSelectionDialog dialog = new HandledToolItemCommandSelectionDialog(b.getShell(), (MHandledItem) getMaster().getValue(), resource, Messages);
+					final HandledToolItemCommandSelectionDialog dialog = new HandledToolItemCommandSelectionDialog(b
+						.getShell(), (MHandledItem) getMaster().getValue(), resource, Messages);
 					dialog.open();
 				}
 			});
@@ -136,7 +142,8 @@ public void handleValueChange(ValueChangeEvent event) {
 			}
 		});
 
-		list.add(new VirtualEntry<MParameter>(ModelEditor.VIRTUAL_PARAMETERS, HANDLED_ITEM__PARAMETERS, element, Messages.HandledToolItemEditor_Parameters) {
+		list.add(new VirtualEntry<MParameter>(ModelEditor.VIRTUAL_PARAMETERS, HANDLED_ITEM__PARAMETERS, element,
+			Messages.HandledToolItemEditor_Parameters) {
 			@Override
 			protected boolean accepted(MParameter o) {
 				return true;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index c71c83e0ac..2f16ac52d6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -6,18 +6,20 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Marco Descher <marco@descher.at> - Bug 397650, Bug 395982, Bug 396975
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Nicolaj Hoess <nicohoess@gmail.com> - Bug 396975
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Marco Descher <marco@descher.at> - Bug 397650, Bug 395982, Bug 396975
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Nicolaj Hoess <nicohoess@gmail.com> - Bug 396975
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -71,9 +73,10 @@ public class MenuContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
+		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	private IModelResource resource;
@@ -88,7 +91,8 @@ public MenuContributionEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.MenuEditor_AddHandledMenuItem, createImageDescriptor(ResourceProvider.IMG_HandledMenuItem)) {
+		actions.add(new Action(Messages.MenuEditor_AddHandledMenuItem,
+			createImageDescriptor(ResourceProvider.IMG_HandledMenuItem)) {
 			@Override
 			public void run() {
 				handleAdd(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
@@ -100,19 +104,22 @@ public void run() {
 				handleAdd(MenuPackageImpl.Literals.MENU, false);
 			}
 		});
-		actions.add(new Action(Messages.MenuEditor_AddDirectMenuItem, createImageDescriptor(ResourceProvider.IMG_DirectMenuItem)) {
+		actions.add(new Action(Messages.MenuEditor_AddDirectMenuItem,
+			createImageDescriptor(ResourceProvider.IMG_DirectMenuItem)) {
 			@Override
 			public void run() {
 				handleAdd(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false);
 			}
 		});
-		actions.add(new Action(Messages.MenuEditor_AddSeparator, createImageDescriptor(ResourceProvider.IMG_MenuSeparator)) {
+		actions.add(new Action(Messages.MenuEditor_AddSeparator,
+			createImageDescriptor(ResourceProvider.IMG_MenuSeparator)) {
 			@Override
 			public void run() {
 				handleAdd(MenuPackageImpl.Literals.MENU_SEPARATOR, true);
 			}
 		});
-		actions.add(new Action(Messages.MenuEditor_AddDynamicMenuContribution, createImageDescriptor(ResourceProvider.IMG_DynamicMenuContribution)) {
+		actions.add(new Action(Messages.MenuEditor_AddDynamicMenuContribution,
+			createImageDescriptor(ResourceProvider.IMG_DynamicMenuContribution)) {
 			@Override
 			public void run() {
 				handleAdd(MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false);
@@ -125,9 +132,8 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			if (((MUIElement) element).isToBeRendered()) {
 				return createImage(ResourceProvider.IMG_MenuContribution);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_MenuContribution);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_MenuContribution);
 		}
 
 		return null;
@@ -182,7 +188,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -194,7 +200,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -202,46 +208,58 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+			context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_ParentId);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID)
+					.observeDetail(getMaster()));
 
-			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MenuIdDialog dialog = new MenuIdDialog(t.getShell(), resource, (MMenuContribution) getMaster().getValue(), getEditingDomain(), modelService, Messages);
+					final MenuIdDialog dialog = new MenuIdDialog(t.getShell(), resource,
+						(MMenuContribution) getMaster().getValue(), getEditingDomain(), modelService, Messages);
 					dialog.open();
 				}
 			});
 
 		}
 
-		ControlFactory.createTextField(parent, Messages.MenuContributionEditor_Position, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__POSITION_IN_PARENT));
+		ControlFactory
+			.createTextField(parent, Messages.MenuContributionEditor_Position, master, context, textProp,
+				EMFEditProperties.value(getEditingDomain(),
+					MenuPackageImpl.Literals.MENU_CONTRIBUTION__POSITION_IN_PARENT));
 
 		// ------------------------------------------------------------
 		{
-			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					Struct struct = (Struct) ((IStructuredSelection) getSelection()).getFirstElement();
-					EClass eClass = struct.eClass;
-					MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
+					final Struct struct = (Struct) ((IStructuredSelection) getSelection()).getFirstElement();
+					final EClass eClass = struct.eClass;
+					final MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
 
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+					final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+						UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
@@ -255,17 +273,32 @@ protected void addPressed() {
 			pickList.setText(Messages.MenuContributionEditor_MenuItems);
 
 			final TableViewer viewer = pickList.getList();
-			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			final IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(),
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
 
-			Struct defaultStruct = new Struct(Messages.MenuContributionEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
-			pickList.setInput(new Struct[] { new Struct(Messages.MenuContributionEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuContributionEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuContributionEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false), new Struct(Messages.MenuContributionEditor_DynamicMenuContribution, MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
+			final Struct defaultStruct = new Struct(Messages.MenuContributionEditor_HandledMenuItem,
+				MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
+			pickList.setInput(new Struct[] {
+				new Struct(Messages.MenuContributionEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true),
+				new Struct(Messages.MenuContributionEditor_Menu, MenuPackageImpl.Literals.MENU, false),
+				defaultStruct,
+				new Struct(Messages.MenuContributionEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM,
+					false),
+				new Struct(Messages.MenuContributionEditor_DynamicMenuContribution,
+					MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
 			pickList.setSelection(new StructuredSelection(defaultStruct));
 
 		}
 
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory
+			.createCheckBox(
+				parent,
+				"To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory
+			.createCheckBox(
+				parent,
+				"Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -273,8 +306,10 @@ protected void addPressed() {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createContributedEditorTabs(folder, context, getMaster(), MMenuContribution.class);
 
@@ -294,9 +329,10 @@ public FeaturePath[] getLabelProperties() {
 	}
 
 	protected void handleAdd(EClass eClass, boolean separator) {
-		MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
+		final MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
 		setElementId(eObject);
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -308,7 +344,7 @@ protected void handleAdd(EClass eClass, boolean separator) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index b30f22ad32..e70ee3e1c7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -1,22 +1,24 @@
 /*******************************************************************************
-f * Copyright (c) 2010, 2014 BestSolution.at and others.
+ * f * Copyright (c) 2010, 2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Marco Descher <marco@descher.at> - Bug 395982
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Marco Descher <marco@descher.at> - Bug 395982
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IListChangeListener;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -95,10 +97,12 @@ public class MenuEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
+	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
+		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
+		.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 	private StackLayout stackLayout;
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	@Optional
@@ -116,7 +120,8 @@ public MenuEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.MenuEditor_AddHandledMenuItem, createImageDescriptor(ResourceProvider.IMG_HandledMenuItem)) {
+		actions.add(new Action(Messages.MenuEditor_AddHandledMenuItem,
+			createImageDescriptor(ResourceProvider.IMG_HandledMenuItem)) {
 			@Override
 			public void run() {
 				handleAdd(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
@@ -128,29 +133,34 @@ public void run() {
 				handleAdd(MenuPackageImpl.Literals.MENU, false);
 			}
 		});
-		actions.add(new Action(Messages.MenuEditor_AddDirectMenuItem, createImageDescriptor(ResourceProvider.IMG_DirectMenuItem)) {
+		actions.add(new Action(Messages.MenuEditor_AddDirectMenuItem,
+			createImageDescriptor(ResourceProvider.IMG_DirectMenuItem)) {
 			@Override
 			public void run() {
 				handleAdd(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false);
 			}
 		});
-		actions.add(new Action(Messages.MenuEditor_AddSeparator, createImageDescriptor(ResourceProvider.IMG_MenuSeparator)) {
+		actions.add(new Action(Messages.MenuEditor_AddSeparator,
+			createImageDescriptor(ResourceProvider.IMG_MenuSeparator)) {
 			@Override
 			public void run() {
 				handleAdd(MenuPackageImpl.Literals.MENU_SEPARATOR, true);
 			}
 		});
-		actions.add(new Action(Messages.MenuEditor_AddDynamicMenuContribution, createImageDescriptor(ResourceProvider.IMG_DynamicMenuContribution)) {
+		actions.add(new Action(Messages.MenuEditor_AddDynamicMenuContribution,
+			createImageDescriptor(ResourceProvider.IMG_DynamicMenuContribution)) {
 			@Override
 			public void run() {
 				handleAdd(MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false);
 			}
 		});
-		addExpression = new Action(Messages.MenuEditor_AddCoreExpression, createImageDescriptor(ResourceProvider.IMG_CoreExpression)) {
+		addExpression = new Action(Messages.MenuEditor_AddCoreExpression,
+			createImageDescriptor(ResourceProvider.IMG_CoreExpression)) {
 			@Override
 			public void run() {
-				MUIElement e = (MUIElement) getMaster().getValue();
-				Command cmd = SetCommand.create(getEditingDomain(), e, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN, MUiFactory.INSTANCE.createCoreExpression());
+				final MUIElement e = (MUIElement) getMaster().getValue();
+				final Command cmd = SetCommand.create(getEditingDomain(), e,
+					UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN, MUiFactory.INSTANCE.createCoreExpression());
 				if (cmd.canExecute()) {
 					getEditingDomain().getCommandStack().execute(cmd);
 				}
@@ -161,12 +171,11 @@ public void run() {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_Menu);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_Menu);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_Menu);
 		}
 
 		return null;
@@ -191,7 +200,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 				createForm(composite, context, getMaster(), false, true);
 			}
 		}
-		EObject o = (EObject) object;
+		final EObject o = (EObject) object;
 		Control topControl;
 		if (Util.isImport(o) && getEditor().isModelFragment()) {
 			topControl = composite.getChildren()[2];
@@ -207,12 +216,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
-		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
-	protected Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean rootMenu, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+	protected Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master,
+		boolean rootMenu, boolean isImport) {
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -224,7 +235,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -232,14 +243,19 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		// ------------------------------------------------------------
 		if (!rootMenu) {
-			ControlFactory.createTranslatedTextField(parent, Messages.MenuEditor_LabelLabel, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
+			ControlFactory.createTranslatedTextField(parent, Messages.MenuEditor_LabelLabel, master, context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool,
+				project);
 		}
 
-		ControlFactory.createTextField(parent, Messages.MenuEditor_Mnemonics, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS));
+		ControlFactory.createTextField(parent, Messages.MenuEditor_Mnemonics, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS));
 
 		{
 
@@ -251,41 +267,55 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			// new Label(parent, SWT.NONE);
 			// new Label(parent, SWT.NONE);
 
-			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			pickList.setText(Messages.MenuEditor_Children);
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 
-			Struct defaultStruct = new Struct(Messages.MenuEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
-			pickList.setInput(new Struct[] { new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false), new Struct(Messages.MenuEditor_DynamicMenuContribution, MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
+			final Struct defaultStruct = new Struct(Messages.MenuEditor_HandledMenuItem,
+				MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
+			pickList.setInput(new Struct[] {
+				new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true),
+				new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false),
+				defaultStruct,
+				new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false),
+				new Struct(Messages.MenuEditor_DynamicMenuContribution,
+					MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
 			pickList.setSelection(new StructuredSelection(defaultStruct));
 
-			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			final IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(),
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			pickList.getList().setInput(prop.observeDetail(master));
 
 		}
 
 		// ------------------------------------------------------------
 		if (!rootMenu) {
-			ControlFactory.createTranslatedTextField(parent, Messages.MenuEditor_Tooltip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool, project);
+			ControlFactory.createTranslatedTextField(parent, Messages.MenuEditor_Tooltip, master, context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool,
+				project);
 		}
 
 		// ------------------------------------------------------------
 		if (!rootMenu) {
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuEditor_IconURI);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
+					master));
 
 			new ImageTooltip(t, Messages) {
 
 				@Override
 				protected URI getImageURI() {
-					MUILabel part = (MUILabel) getMaster().getValue();
-					String uri = part.getIconURI();
+					final MUILabel part = (MUILabel) getMaster().getValue();
+					final String uri = part.getIconURI();
 					if (uri == null || uri.trim().length() == 0) {
 						return null;
 					}
@@ -300,41 +330,50 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MenuIconDialogEditor dialog = new MenuIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MMenu) getMaster().getValue(), Messages);
+					final MenuIconDialogEditor dialog = new MenuIconDialogEditor(b.getShell(), eclipseContext, project,
+						getEditingDomain(), (MMenu) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
 		}
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ModelTooling_UIElement_VisibleWhen);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			ComboViewer combo = new ComboViewer(parent);
+			final ComboViewer combo = new ComboViewer(parent);
 			combo.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			combo.setContentProvider(new ArrayContentProvider());
 			combo.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
 					if (element instanceof EClass) {
-						EClass eClass = (EClass) element;
+						final EClass eClass = (EClass) element;
 						return eClass.getName();
 					}
 
 					return super.getText(element);
 				}
 			});
-			List<Object> list = new ArrayList<Object>();
+			final List<Object> list = new ArrayList<Object>();
 			list.add(Messages.MenuItemEditor_NoExpression);
 			list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
-			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
+			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION,
+				UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
 			combo.setInput(list);
-			context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)), new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
+			context.bindValue(ViewerProperties.singleSelection().observe(combo),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN)
+					.observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)),
+				new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
 		}
 
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -342,9 +381,13 @@ public String getText(Object element) {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+			context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -358,14 +401,15 @@ public String getText(Object element) {
 	}
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
+			getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -391,7 +435,7 @@ public void handleValueChange(ValueChangeEvent event) {
 			}
 		});
 
-		IObservableList l = ELEMENT_CONTAINER__CHILDREN.observe(element);
+		final IObservableList l = ELEMENT_CONTAINER__CHILDREN.observe(element);
 		l.addListChangeListener(new IListChangeListener() {
 
 			@Override
@@ -426,9 +470,9 @@ public void handleAdd(int index, Object element) {
 
 	@Override
 	public String getLabel(Object element) {
-		MMenu menu = (MMenu) element;
+		final MMenu menu = (MMenu) element;
 		if (menu.getParent() == null) {
-			EObject o = (EObject) element;
+			final EObject o = (EObject) element;
 			if (o.eContainer() instanceof MWindow) {
 				return Messages.MenuEditor_MainMenu;
 			} else if (menu.getTags().contains(VMenuEditor.VIEW_MENU_TAG)) {
@@ -451,9 +495,10 @@ public FeaturePath[] getLabelProperties() {
 	}
 
 	protected void handleAdd(EClass eClass, boolean separator) {
-		MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
+		final MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
 		setElementId(eObject);
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -465,7 +510,7 @@ protected void handleAdd(EClass eClass, boolean separator) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		if (((MUIElement) getMaster().getValue()).getVisibleWhen() == null) {
 			l.add(addExpression);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 2cadfd3488..8c455a2694 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -6,16 +6,18 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -95,11 +97,13 @@ public MenuItemEditor() {
 
 	@PostConstruct
 	void init() {
-		addExpression = new Action(Messages.MenuItemEditor_AddCoreExpression, createImageDescriptor(ResourceProvider.IMG_CoreExpression)) {
+		addExpression = new Action(Messages.MenuItemEditor_AddCoreExpression,
+			createImageDescriptor(ResourceProvider.IMG_CoreExpression)) {
 			@Override
 			public void run() {
-				MUIElement e = (MUIElement) getMaster().getValue();
-				Command cmd = SetCommand.create(getEditingDomain(), e, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN, MUiFactory.INSTANCE.createCoreExpression());
+				final MUIElement e = (MUIElement) getMaster().getValue();
+				final Command cmd = SetCommand.create(getEditingDomain(), e,
+					UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN, MUiFactory.INSTANCE.createCoreExpression());
 				if (cmd.canExecute()) {
 					getEditingDomain().getCommandStack().execute(cmd);
 				}
@@ -112,9 +116,8 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			if (((MUIElement) element).isToBeRendered()) {
 				return createImage(ResourceProvider.IMG_MenuItem);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_MenuItem);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_MenuItem);
 		}
 
 		return null;
@@ -150,12 +153,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
-		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
-	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master,
+		boolean isImport) {
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -163,9 +168,9 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-		IWidgetValueProperty checkProp = WidgetProperties.selection();
-		IWidgetValueProperty enabled = WidgetProperties.enabled();
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty checkProp = WidgetProperties.selection();
+		final IWidgetValueProperty enabled = WidgetProperties.enabled();
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -177,47 +182,57 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		if (this.getClass() != MenuItemEditor.class) {
 			// ------------------------------------------------------------
 			{
-				Label l = new Label(parent, SWT.NONE);
+				final Label l = new Label(parent, SWT.NONE);
 				l.setText(Messages.MenuItemEditor_Type);
 				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-				ComboViewer viewer = new ComboViewer(parent);
+				final ComboViewer viewer = new ComboViewer(parent);
 				viewer.setContentProvider(new ArrayContentProvider());
 				viewer.setInput(new ItemType[] { ItemType.CHECK, ItemType.PUSH, ItemType.RADIO });
-				GridData gd = new GridData();
+				final GridData gd = new GridData();
 				gd.horizontalSpan = 2;
 				viewer.getControl().setLayoutData(gd);
-				IObservableValue itemTypeObs = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(master);
+				final IObservableValue itemTypeObs = EMFEditProperties.value(getEditingDomain(),
+					MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(master);
 				context.bindValue(ViewerProperties.singleSelection().observe(viewer), itemTypeObs);
 			}
 		}
 
-		ControlFactory.createTranslatedTextField(parent, Messages.MenuItemEditor_Label, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
-		ControlFactory.createTextField(parent, Messages.MenuItemEditor_Mnemonics, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS));
-		ControlFactory.createTranslatedTextField(parent, Messages.MenuItemEditor_Tooltip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool, project);
+		ControlFactory.createTranslatedTextField(parent, Messages.MenuItemEditor_Label, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
+		ControlFactory.createTextField(parent, Messages.MenuItemEditor_Mnemonics, getMaster(), context, textProp,
+			EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS));
+		ControlFactory.createTranslatedTextField(parent, Messages.MenuItemEditor_Tooltip, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool,
+			project);
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuItemEditor_IconURI);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
+					master));
 
 			new ImageTooltip(t, Messages) {
 
 				@Override
 				protected URI getImageURI() {
-					MUILabel part = (MUILabel) getMaster().getValue();
-					String uri = part.getIconURI();
+					final MUILabel part = (MUILabel) getMaster().getValue();
+					final String uri = part.getIconURI();
 					if (uri == null || uri.trim().length() == 0) {
 						return null;
 					}
@@ -232,32 +247,39 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MenuItemIconDialogEditor dialog = new MenuItemIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MMenuItem) getMaster().getValue(), Messages);
+					final MenuItemIconDialogEditor dialog = new MenuItemIconDialogEditor(b.getShell(), eclipseContext,
+						project, getEditingDomain(), (MMenuItem) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
 		}
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuItemEditor_Enabled);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Button b = new Button(parent, SWT.CHECK);
+			final Button b = new Button(parent, SWT.CHECK);
 			b.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
-			context.bindValue(checkProp.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__ENABLED).observeDetail(getMaster()));
+			context.bindValue(
+				checkProp.observe(b),
+				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__ENABLED).observeDetail(
+					getMaster()));
 		}
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuItemEditor_Selected);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Button b = new Button(parent, SWT.CHECK);
+			final Button b = new Button(parent, SWT.CHECK);
 			b.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
-			context.bindValue(checkProp.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__SELECTED).observeDetail(getMaster()));
+			context.bindValue(
+				checkProp.observe(b),
+				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__SELECTED).observeDetail(
+					getMaster()));
 
-			UpdateValueStrategy t2m = new UpdateValueStrategy();
+			final UpdateValueStrategy t2m = new UpdateValueStrategy();
 			t2m.setConverter(new Converter(boolean.class, ItemType.class) {
 
 				@Override
@@ -265,7 +287,7 @@ public Object convert(Object fromObject) {
 					return null;
 				}
 			});
-			UpdateValueStrategy m2t = new UpdateValueStrategy();
+			final UpdateValueStrategy m2t = new UpdateValueStrategy();
 			m2t.setConverter(new Converter(ItemType.class, boolean.class) {
 
 				@Override
@@ -274,41 +296,52 @@ public Object convert(Object fromObject) {
 				}
 			});
 
-			context.bindValue(enabled.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(getMaster()), t2m, m2t);
+			context.bindValue(
+				enabled.observe(b),
+				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(
+					getMaster()), t2m, m2t);
 
 		}
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ModelTooling_UIElement_VisibleWhen);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			ComboViewer combo = new ComboViewer(parent);
+			final ComboViewer combo = new ComboViewer(parent);
 			combo.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			combo.setContentProvider(new ArrayContentProvider());
 			combo.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
 					if (element instanceof EClass) {
-						EClass eClass = (EClass) element;
+						final EClass eClass = (EClass) element;
 						return eClass.getName();
 					}
 
 					return super.getText(element);
 				}
 			});
-			List<Object> list = new ArrayList<Object>();
+			final List<Object> list = new ArrayList<Object>();
 			list.add(Messages.MenuItemEditor_NoExpression);
 			list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
-			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
+			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION,
+				UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
 			combo.setInput(list);
-			context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)), new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
+			context.bindValue(ViewerProperties.singleSelection().observe(combo),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN)
+					.observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)),
+				new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
 		}
 
 		createFormSubTypeForm(parent, context, master);
 
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -316,10 +349,14 @@ public String getText(Object element) {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+			context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -335,14 +372,15 @@ public String getText(Object element) {
 	protected abstract void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master);
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
+			getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -358,12 +396,13 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL),
+			FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		if (((MUIElement) getMaster().getValue()).getVisibleWhen() == null) {
 			l.add(addExpression);
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index 3a5ee85783..413f698a4a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -6,15 +6,17 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance, Bug 443945
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance, Bug 443945
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -58,8 +60,10 @@
 
 public class ModelFragmentsEditor extends AbstractComponentEditor {
 
-	private IListProperty MODEL_FRAGMENTS__FRAGMENTS = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
-	private IListProperty MODEL_FRAGMENTS__IMPORTS = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
+	private final IListProperty MODEL_FRAGMENTS__FRAGMENTS = EMFProperties
+		.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
+	private final IListProperty MODEL_FRAGMENTS__IMPORTS = EMFProperties
+		.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
 
 	private Composite composite;
 
@@ -96,7 +100,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 		createFragmentsTab(folder);
 		createImportsTab(folder);
 		folder.setSelection(0);
@@ -105,20 +109,23 @@ private Composite createForm(Composite parent) {
 
 	private void createFragmentsTab(CTabFolder folder) {
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelFragmentsEditor_ModelFragments);
 
-		Composite parent = createScrollableContainer(folder);
+		final Composite parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
 		{
 
-			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
+				Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
+				FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS) {
 				@Override
 				protected void addPressed() {
-					MModelFragment component = MFragmentFactory.INSTANCE.createStringModelFragment();
+					final MModelFragment component = MFragmentFactory.INSTANCE.createStringModelFragment();
 
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, component);
+					final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+						FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, component);
 
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
@@ -130,15 +137,14 @@ protected void addPressed() {
 				protected List<?> getContainerChildren(Object container) {
 					if (container instanceof MModelFragments) {
 						return ((MModelFragments) container).getFragments();
-					} else {
-						return null;
 					}
+					return null;
 				}
 			};
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
-			TableViewer viewer = pickList.getList();
+			final TableViewer viewer = pickList.getList();
 
-			IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
+			final IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
 			viewer.setInput(prop.observeDetail(getMaster()));
 		}
 
@@ -146,23 +152,25 @@ protected List<?> getContainerChildren(Object container) {
 
 	private void createImportsTab(CTabFolder folder) {
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelFragmentsEditor_Imports);
 
-		Composite parent = createScrollableContainer(folder);
+		final Composite parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
+		final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+			FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
 			@Override
 			protected void addPressed() {
-				EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
-				EObject eObject = EcoreUtil.create(eClass);
+				final EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
+				final EObject eObject = EcoreUtil.create(eClass);
 
-				Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, eObject);
+				final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+					FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, eObject);
 
 				if (cmd.canExecute()) {
 					getEditingDomain().getCommandStack().execute(cmd);
@@ -180,12 +188,12 @@ protected List<?> getContainerChildren(Object master) {
 		pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 		pickList.setText(Messages.PartSashContainerEditor_Controls);
 
-		TableViewer viewer = pickList.getList();
+		final TableViewer viewer = pickList.getList();
 
 		pickList.setLabelProvider(new LabelProvider() {
 			@Override
 			public String getText(Object element) {
-				FeatureClass eclass = (FeatureClass) element;
+				final FeatureClass eclass = (FeatureClass) element;
 				return eclass.label;
 			}
 		});
@@ -193,50 +201,55 @@ public String getText(Object element) {
 		pickList.setComparator(new ViewerComparator() {
 			@Override
 			public int compare(Viewer viewer, Object e1, Object e2) {
-				FeatureClass eClass1 = (FeatureClass) e1;
-				FeatureClass eClass2 = (FeatureClass) e2;
+				final FeatureClass eClass1 = (FeatureClass) e1;
+				final FeatureClass eClass2 = (FeatureClass) e2;
 				return eClass1.label.compareTo(eClass2.label);
 			}
 		});
 
-		List<FeatureClass> list = new ArrayList<FeatureClass>();
+		final List<FeatureClass> list = new ArrayList<FeatureClass>();
 		Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
-		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
+		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT,
+			FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
 
 		pickList.setInput(list);
 		if (list.size() > 0) {
 			pickList.setSelection(new StructuredSelection(list.get(0)));
 		}
 
-		IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
+		final IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
 		viewer.setInput(prop.observeDetail(getMaster()));
 	}
 
 	public void addClasses(EPackage ePackage, List<FeatureClass> list) {
-		for (EClassifier c : ePackage.getEClassifiers()) {
+		for (final EClassifier c : ePackage.getEClassifiers()) {
 			if (c instanceof EClass) {
-				EClass eclass = (EClass) c;
-				if (eclass != ApplicationPackageImpl.Literals.APPLICATION && !eclass.isAbstract() && !eclass.isInterface() && eclass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT)) {
+				final EClass eclass = (EClass) c;
+				if (eclass != ApplicationPackageImpl.Literals.APPLICATION && !eclass.isAbstract()
+					&& !eclass.isInterface()
+					&& eclass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT)) {
 					list.add(new FeatureClass(eclass.getName(), eclass));
 				}
 			}
 		}
 
-		for (EPackage eSubPackage : ePackage.getESubpackages()) {
+		for (final EPackage eSubPackage : ePackage.getESubpackages()) {
 			addClasses(eSubPackage, list);
 		}
 	}
 
 	@Override
 	public IObservableList getChildList(Object element) {
-		WritableList list = new WritableList();
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MODEL_IMPORTS, MODEL_FRAGMENTS__IMPORTS, element, Messages.ModelFragmentsEditor_Imports) {
+		final WritableList list = new WritableList();
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MODEL_IMPORTS, MODEL_FRAGMENTS__IMPORTS, element,
+			Messages.ModelFragmentsEditor_Imports) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
 			}
 		});
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MODEL_FRAGEMENTS, MODEL_FRAGMENTS__FRAGMENTS, element, Messages.ModelFragmentsEditor_ModelFragments) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MODEL_FRAGEMENTS, MODEL_FRAGMENTS__FRAGMENTS, element,
+			Messages.ModelFragmentsEditor_ModelFragments) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 72bf31ed8c..609304a3ab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -6,12 +6,13 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951, Ongoing Maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951, Ongoing Maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -82,9 +83,10 @@ public class PartEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private IListProperty PART__MENUS = EMFProperties.list(BasicPackageImpl.Literals.PART__MENUS);
-	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
-	private IValueProperty PART__TOOLBAR = EMFProperties.value(BasicPackageImpl.Literals.PART__TOOLBAR);
+	private final IListProperty PART__MENUS = EMFProperties.list(BasicPackageImpl.Literals.PART__MENUS);
+	private final IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties
+		.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
+	private final IValueProperty PART__TOOLBAR = EMFProperties.value(BasicPackageImpl.Literals.PART__TOOLBAR);
 	private Button createRemoveToolBar;
 	private StackLayout stackLayout;
 
@@ -105,9 +107,8 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			if (((MUIElement) element).isToBeRendered()) {
 				return createImage(ResourceProvider.IMG_Part);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_Part);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_Part);
 		}
 
 		return null;
@@ -160,13 +161,15 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
-		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 
 		return composite;
 	}
 
-	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master,
+		boolean isImport) {
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.BORDER);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -178,7 +181,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -186,14 +189,20 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.PartEditor_LabelLabel, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-		ControlFactory.createTextField(parent, Messages.PartEditor_Tooltip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.PartEditor_LabelLabel, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, master, context,
+			textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createTextField(parent, Messages.PartEditor_Tooltip, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_IconURI);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 			l.setToolTipText(Messages.PartEditor_IconURI_Tooltip);
@@ -201,14 +210,17 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
+					master));
 
 			new ImageTooltip(t, Messages) {
 
 				@Override
 				protected URI getImageURI() {
-					MUILabel part = (MUILabel) getMaster().getValue();
-					String uri = part.getIconURI();
+					final MUILabel part = (MUILabel) getMaster().getValue();
+					final String uri = part.getIconURI();
 					if (uri == null || uri.trim().length() == 0) {
 						return null;
 					}
@@ -223,7 +235,8 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MPart) getMaster().getValue(), Messages);
+					final PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), eclipseContext, project,
+						getEditingDomain(), (MPart) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -240,7 +253,8 @@ public void widgetSelected(SelectionEvent e) {
 				lnk.addSelectionListener(new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
-						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, lnk.getShell());
+						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project,
+							lnk.getShell());
 					}
 				});
 			} else {
@@ -248,12 +262,12 @@ public void widgetSelected(SelectionEvent e) {
 				// and screws up the layout: see https://bugs.eclipse.org/421369
 				lnk = null;
 
-				Label l = new Label(parent, SWT.NONE);
+				final Label l = new Label(parent, SWT.NONE);
 				l.setText(Messages.PartEditor_ClassURI);
 				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 			}
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.addModifyListener(new ModifyListener() {
@@ -262,11 +276,16 @@ public void widgetSelected(SelectionEvent e) {
 				public void modifyText(ModifyEvent e) {
 					// lnk might be disposed if else branch above taken
 					if (lnk != null) {
-						lnk.setToolTipText(((Text) (e.getSource())).getText());
+						lnk.setToolTipText(((Text) e.getSource()).getText());
 					}
 				}
 			});
-			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
+			final Binding binding = context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(),
+					ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master),
+				new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+				new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
@@ -276,19 +295,22 @@ public void modifyText(ModifyEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
+						getEditingDomain(), (MContribution) getMaster().getValue(),
+						ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
 		}
 
 		// ------------------------------------------------------------
-		ControlFactory.createTextField(parent, Messages.PartEditor_ContainerData, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
+		ControlFactory.createTextField(parent, Messages.PartEditor_ContainerData, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		createSubformElements(parent, context, master);
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_ToolBar);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
@@ -296,7 +318,7 @@ public void widgetSelected(SelectionEvent e) {
 			createRemoveToolBar.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MPart window = (MPart) getMaster().getValue();
+					final MPart window = (MPart) getMaster().getValue();
 					if (window.getToolbar() == null) {
 						addToolBar();
 					} else {
@@ -307,15 +329,23 @@ public void widgetSelected(SelectionEvent e) {
 			createRemoveToolBar.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 		}
 
-		ControlFactory.createCheckBox(parent, Messages.PartEditor_Closeable, Messages.PartEditor_Closeable_Tooltip, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART__CLOSEABLE));
+		ControlFactory.createCheckBox(parent, Messages.PartEditor_Closeable, Messages.PartEditor_Closeable_Tooltip,
+			getMaster(), context, WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART__CLOSEABLE));
 
 		// ------------------------------------------------------------
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.PartEditor_BindingContexts);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties,
+			UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -323,8 +353,11 @@ public void widgetSelected(SelectionEvent e) {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, Messages.ModelTooling_Context_Variables_Tooltip, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables,
+			Messages.ModelTooling_Context_Variables_Tooltip, UiPackageImpl.Literals.CONTEXT__VARIABLES,
+			VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createInstanceInspection(folder);
@@ -339,41 +372,45 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	private void createInstanceInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeContributionInstance);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		ObjectViewer objectViewer = new ObjectViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
+		final ObjectViewer objectViewer = new ObjectViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container,
+			ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
+			getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
 	private void addToolBar() {
-		MToolBar menu = MMenuFactory.INSTANCE.createToolBar();
+		final MToolBar menu = MMenuFactory.INSTANCE.createToolBar();
 		setElementId(menu);
 
-		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART__TOOLBAR, menu);
+		final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(),
+			BasicPackageImpl.Literals.PART__TOOLBAR, menu);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
 	}
 
 	private void removeToolBar() {
-		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART__TOOLBAR, null);
+		final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(),
+			BasicPackageImpl.Literals.PART__TOOLBAR, null);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
@@ -391,7 +428,8 @@ public IObservableList getChildList(final Object element) {
 			return list;
 		}
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PART_MENU, PART__MENUS, element, Messages.PartEditor_Menus) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PART_MENU, PART__MENUS, element,
+			Messages.PartEditor_Menus) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -400,7 +438,8 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.PartEditor_Handlers) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element,
+			Messages.PartEditor_Handlers) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -409,7 +448,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		MPart window = (MPart) element;
+		final MPart window = (MPart) element;
 		if (window.getToolbar() != null) {
 			list.add(0, window.getToolbar());
 		}
@@ -445,6 +484,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL),
+			FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index a027ca46ca..275dc82317 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -6,15 +6,17 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -78,10 +80,11 @@ public class PartSashContainerEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
+		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private List<Action> actions = new ArrayList<Action>();
-	private List<Action> actionsImport = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actionsImport = new ArrayList<Action>();
 
 	@Inject
 	@Optional
@@ -97,38 +100,44 @@ public PartSashContainerEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.PartSashContainerEditor_AddPartSashContainer, createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
+		actions.add(new Action(Messages.PartSashContainerEditor_AddPartSashContainer,
+			createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
 			}
 		});
-		actions.add(new Action(Messages.PartSashContainerEditor_AddPartStack, createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+		actions.add(new Action(Messages.PartSashContainerEditor_AddPartStack,
+			createImageDescriptor(ResourceProvider.IMG_PartStack)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART_STACK);
 			}
 		});
-		actions.add(new Action(Messages.PartSashContainerEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+		actions.add(new Action(Messages.PartSashContainerEditor_AddPart,
+			createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART);
 			}
 		});
 
-		actions.add(new Action(Messages.PartSashContainerEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area)) {
+		actions.add(new Action(Messages.PartSashContainerEditor_AddArea,
+			createImageDescriptor(ResourceProvider.IMG_Area)) {
 			@Override
 			public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.AREA);
 			}
 		});
-		actions.add(new Action(Messages.PartSashContainerEditor_AddPlaceholder, createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
+		actions.add(new Action(Messages.PartSashContainerEditor_AddPlaceholder,
+			createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
 			@Override
 			public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
 			}
 		});
-		for (FeatureClass c : getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN)) {
+		for (final FeatureClass c : getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK,
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN)) {
 			final EClass ec = c.eClass;
 			actions.add(new Action(c.label, createImageDescriptor(c.iconId)) {
 				@Override
@@ -156,24 +165,22 @@ public void run() {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		boolean horizontal = ((MPartSashContainer) element).isHorizontal();
+		final boolean horizontal = ((MPartSashContainer) element).isHorizontal();
 
 		if (!horizontal) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_PartSashContainer_vertical);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_PartSashContainer_vertical);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_PartSashContainer_vertical);
 		}
 
 		if (horizontal) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_PartSashContainer);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_PartSashContainer);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_PartSashContainer);
 		}
 		return null;
 	}
@@ -221,8 +228,9 @@ public Composite doGetEditor(Composite parent, Object object) {
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
+		boolean isImport) {
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -234,7 +242,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -242,39 +250,48 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+			context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartSashContainerEditor_Orientation);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			ComboViewer viewer = new ComboViewer(parent);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			final ComboViewer viewer = new ComboViewer(parent);
+			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			viewer.getControl().setLayoutData(gd);
 			viewer.setContentProvider(new ArrayContentProvider());
 			viewer.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
-					return ((Boolean) element).booleanValue() ? Messages.PartSashContainerEditor_Horizontal : Messages.PartSashContainerEditor_Vertical;
+					return ((Boolean) element).booleanValue() ? Messages.PartSashContainerEditor_Horizontal
+						: Messages.PartSashContainerEditor_Vertical;
 				}
 			});
 			viewer.setInput(new Boolean[] { Boolean.TRUE, Boolean.FALSE });
-			IViewerValueProperty vProp = ViewerProperties.singleSelection();
-			context.bindValue(vProp.observe(viewer), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL).observeDetail(getMaster()));
+			final IViewerValueProperty vProp = ViewerProperties.singleSelection();
+			context.bindValue(vProp.observe(viewer),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL)
+				.observeDetail(getMaster()));
 		}
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PartSashContainerEditor_SelectedElement);
-		ControlFactory.createTextField(parent, Messages.PartSashContainerEditor_ContainerData, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
+		ControlFactory.createTextField(parent, Messages.PartSashContainerEditor_ContainerData, master, context,
+			textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		{
-			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
+					final EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
 					handleAddChild(eClass);
 				}
 			};
@@ -283,24 +300,29 @@ protected void addPressed() {
 
 			pickList.setLabelProvider(new FeatureClassLabelProvider(getEditor()));
 
-			List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
+			final List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
 			eClassList.add(new FeatureClass("PartSashContainer", BasicPackageImpl.Literals.PART_SASH_CONTAINER)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("PartStack", BasicPackageImpl.Literals.PART_STACK)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("InputPart", BasicPackageImpl.Literals.INPUT_PART)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("Area", AdvancedPackageImpl.Literals.AREA)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER)); //$NON-NLS-1$
-			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_SASH_CONTAINER, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
+			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_SASH_CONTAINER,
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
 			pickList.setInput(eClassList);
 			pickList.setSelection(new StructuredSelection(eClassList.get(0)));
 
 			final TableViewer viewer = pickList.getList();
-			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 		}
 
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -308,8 +330,10 @@ protected void addPressed() {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -323,14 +347,15 @@ protected void addPressed() {
 	}
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
+			getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -346,18 +371,20 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL),
+			FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 	protected void handleAddChild(EClass eClass) {
-		EObject eObject = EcoreUtil.create(eClass);
+		final EObject eObject = EcoreUtil.create(eClass);
 		addToModel(eObject);
 	}
 
 	private void addToModel(EObject eObject) {
 		setElementId(eObject);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -368,11 +395,11 @@ private void addToModel(EObject eObject) {
 	protected void handleImportChild(EClass eClass, String hint) {
 
 		if (eClass == BasicPackageImpl.Literals.PART) {
-			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, hint, resourcePool);
-			WizardDialog wizardDialog = new WizardDialog(shell, wizard);
+			final ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, hint, resourcePool);
+			final WizardDialog wizardDialog = new WizardDialog(shell, wizard);
 			if (wizardDialog.open() == Window.OK) {
-				MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
-				for (MPart part : parts) {
+				final MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
+				for (final MPart part : parts) {
 					addToModel((EObject) part);
 				}
 			}
@@ -381,14 +408,14 @@ protected void handleImportChild(EClass eClass, String hint) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	@Override
 	public List<Action> getActionsImport(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
 		l.addAll(actionsImport);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index c6d4f37b09..aa35b8d089 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -6,15 +6,17 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -72,10 +74,11 @@ public class PartStackEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
+		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private List<Action> actions = new ArrayList<Action>();
-	private List<Action> actionsImport = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actionsImport = new ArrayList<Action>();
 
 	@Inject
 	@Optional
@@ -95,23 +98,26 @@ public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART);
 			}
 		});
-		actions.add(new Action(Messages.PartStackEditor_AddCompositePart, createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
+		actions.add(new Action(Messages.PartStackEditor_AddCompositePart,
+			createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.COMPOSITE_PART);
 			}
 		});
-		actions.add(new Action(Messages.PartStackEditor_AddPlaceholder, createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
+		actions.add(new Action(Messages.PartStackEditor_AddPlaceholder,
+			createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
 			@Override
 			public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
 			}
 		});
 
-		List<FeatureClass> list = getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+		final List<FeatureClass> list = getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK,
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
 		if (!list.isEmpty()) {
-			for (FeatureClass c : list) {
+			for (final FeatureClass c : list) {
 				final EClass ec = c.eClass;
 				actions.add(new Action(c.label, createImageDescriptor(c.iconId)) {
 					@Override
@@ -129,12 +135,13 @@ public void run() {
 				handleImportChild(BasicPackageImpl.Literals.PART);
 			}
 		});
-		actionsImport.add(new Action(Messages.PartStackEditor_Editors, createImageDescriptor(ResourceProvider.IMG_Part)) {
-			@Override
-			public void run() {
-				handleImportChild(BasicPackageImpl.Literals.INPUT_PART);
-			}
-		});
+		actionsImport
+			.add(new Action(Messages.PartStackEditor_Editors, createImageDescriptor(ResourceProvider.IMG_Part)) {
+				@Override
+				public void run() {
+					handleImportChild(BasicPackageImpl.Literals.INPUT_PART);
+				}
+			});
 
 	}
 
@@ -143,9 +150,8 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			if (((MUIElement) element).isToBeRendered()) {
 				return createImage(ResourceProvider.IMG_Part);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_Part);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_Part);
 		}
 
 		return null;
@@ -189,14 +195,15 @@ public Composite doGetEditor(Composite parent, Object object) {
 				composite.layout(true, true);
 			}
 		}
-		IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+		final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 		viewer.setInput(prop.observeDetail(getMaster()));
 		getMaster().setValue(object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
+		boolean isImport) {
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -208,7 +215,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -216,18 +223,24 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+			context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PartStackEditor_SelectedElement);
-		ControlFactory.createTextField(parent, Messages.PartStackEditor_ContainerData, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
+		ControlFactory.createTextField(parent, Messages.PartStackEditor_ContainerData, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		// ------------------------------------------------------------
 		{
 
-			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
+					final EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
 					handleAddChild(eClass);
 				}
 			};
@@ -235,23 +248,30 @@ protected void addPressed() {
 			pickList.setText(Messages.PartStackEditor_Parts);
 
 			viewer = pickList.getList();
-			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
 			pickList.setLabelProvider(new FeatureClassLabelProvider(getEditor()));
 
-			List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
+			final List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
 			eClassList.add(new FeatureClass(Messages.PartStackEditor_Part, BasicPackageImpl.Literals.PART));
-			eClassList.add(new FeatureClass(Messages.PartStackEditor_CompositePart, BasicPackageImpl.Literals.COMPOSITE_PART));
-			eClassList.add(new FeatureClass(Messages.PartStackEditor_Placeholder, AdvancedPackageImpl.Literals.PLACEHOLDER));
-			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
+			eClassList.add(new FeatureClass(Messages.PartStackEditor_CompositePart,
+				BasicPackageImpl.Literals.COMPOSITE_PART));
+			eClassList.add(new FeatureClass(Messages.PartStackEditor_Placeholder,
+				AdvancedPackageImpl.Literals.PLACEHOLDER));
+			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK,
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
 			pickList.setInput(eClassList);
 			pickList.setSelection(new StructuredSelection(eClassList.get(0)));
 
 		}
 
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -259,8 +279,10 @@ protected void addPressed() {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -274,14 +296,15 @@ protected void addPressed() {
 	}
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
+			getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -301,14 +324,15 @@ public FeaturePath[] getLabelProperties() {
 	}
 
 	protected void handleAddChild(EClass eClass) {
-		EObject eObject = EcoreUtil.create(eClass);
+		final EObject eObject = EcoreUtil.create(eClass);
 		addToModel(eObject);
 	}
 
 	private void addToModel(EObject eObject) {
 		setElementId(eObject);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -319,22 +343,22 @@ private void addToModel(EObject eObject) {
 	protected void handleImportChild(EClass eClass) {
 
 		if (eClass == BasicPackageImpl.Literals.PART) {
-			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, resourcePool);
-			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
+			final ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, resourcePool);
+			final WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
 			if (wizardDialog.open() == Window.OK) {
-				MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
-				for (MPart part : parts) {
+				final MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
+				for (final MPart part : parts) {
 					addToModel((EObject) part);
 				}
 			}
 		}
 
 		if (eClass == BasicPackageImpl.Literals.INPUT_PART) {
-			ModelImportWizard wizard = new ModelImportWizard(MInputPart.class, this, resourcePool);
-			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
+			final ModelImportWizard wizard = new ModelImportWizard(MInputPart.class, this, resourcePool);
+			final WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
 			if (wizardDialog.open() == Window.OK) {
-				MPart[] parts = (MPart[]) wizard.getElements(MInputPart.class);
-				for (MPart part : parts) {
+				final MPart[] parts = (MPart[]) wizard.getElements(MInputPart.class);
+				for (final MPart part : parts) {
 					addToModel((EObject) part);
 				}
 			}
@@ -343,14 +367,14 @@ protected void handleImportChild(EClass eClass) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	@Override
 	public List<Action> getActionsImport(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
 		l.addAll(actionsImport);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 69b3780c67..e19b656530 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -6,15 +6,17 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -72,10 +74,12 @@ public class PerspectiveEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private IListProperty PERSPECTIVE__WINDOWS = EMFProperties.list(AdvancedPackageImpl.Literals.PERSPECTIVE__WINDOWS);
+	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
+		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private final IListProperty PERSPECTIVE__WINDOWS = EMFProperties
+		.list(AdvancedPackageImpl.Literals.PERSPECTIVE__WINDOWS);
 	private StackLayout stackLayout;
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	@Optional
@@ -91,13 +95,15 @@ public PerspectiveEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.PerspectiveEditor_AddPartSashContainer, createImageDescriptor(ResourceProvider.IMG_Perspective)) {
+		actions.add(new Action(Messages.PerspectiveEditor_AddPartSashContainer,
+			createImageDescriptor(ResourceProvider.IMG_Perspective)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
 			}
 		});
-		actions.add(new Action(Messages.PerspectiveEditor_AddPartStack, createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+		actions.add(new Action(Messages.PerspectiveEditor_AddPartStack,
+			createImageDescriptor(ResourceProvider.IMG_PartStack)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART_STACK);
@@ -115,7 +121,8 @@ public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.AREA);
 			}
 		});
-		actions.add(new Action(Messages.PerspectiveEditor_AddPlaceholder, createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
+		actions.add(new Action(Messages.PerspectiveEditor_AddPlaceholder,
+			createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
 			@Override
 			public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
@@ -126,12 +133,11 @@ public void run() {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_Perspective);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_Perspective);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_Perspective);
 		}
 
 		return null;
@@ -149,7 +155,8 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL),
+			FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 	@Override
@@ -187,12 +194,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
-		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
+		boolean isImport) {
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -204,7 +213,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -212,29 +221,40 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+			context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PerspectiveEditor_SelectedElement);
-		ControlFactory.createTranslatedTextField(parent, Messages.PerspectiveEditor_LabelLabel, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
-		ControlFactory.createTranslatedTextField(parent, Messages.PerspectiveEditor_Tooltip, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool, project);
+		ControlFactory.createTranslatedTextField(parent, Messages.PerspectiveEditor_LabelLabel, getMaster(), context,
+			textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL),
+			resourcePool, project);
+		ControlFactory.createTranslatedTextField(parent, Messages.PerspectiveEditor_Tooltip, getMaster(), context,
+			textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP),
+			resourcePool, project);
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PerspectiveEditor_IconURI);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
+					master));
 
 			new ImageTooltip(t, Messages) {
 
 				@Override
 				protected URI getImageURI() {
-					MUILabel part = (MUILabel) getMaster().getValue();
-					String uri = part.getIconURI();
+					final MUILabel part = (MUILabel) getMaster().getValue();
+					final String uri = part.getIconURI();
 					if (uri == null || uri.trim().length() == 0) {
 						return null;
 					}
@@ -248,19 +268,28 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					PerspectiveIconDialogEditor dialog = new PerspectiveIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MPerspective) getMaster().getValue(), Messages);
+					final PerspectiveIconDialogEditor dialog = new PerspectiveIconDialogEditor(b.getShell(),
+						eclipseContext, project, getEditingDomain(), (MPerspective) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
 		}
 
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		Composite comp0 = ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+		final Composite comp0 = ControlFactory.createMapProperties(parent, Messages, this,
+			Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES,
+			VERTICAL_LIST_WIDGET_INDENT);
 		comp0.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 3, 1));
 
-		Composite comp = ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		final Composite comp = ControlFactory.createStringListWidget(parent, Messages, this,
+			Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES,
+			VERTICAL_LIST_WIDGET_INDENT);
 		comp.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 3, 1));
 
 		item = new CTabItem(folder, SWT.NONE);
@@ -269,8 +298,10 @@ public void widgetSelected(SelectionEvent e) {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -284,21 +315,23 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
+			getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
 	@Override
 	public IObservableList getChildList(Object element) {
 		final WritableList list = new WritableList();
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PERSPECTIVE_WINDOWS, PERSPECTIVE__WINDOWS, element, Messages.WindowEditor_Windows) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PERSPECTIVE_WINDOWS, PERSPECTIVE__WINDOWS, element,
+			Messages.WindowEditor_Windows) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -306,7 +339,8 @@ protected boolean accepted(Object o) {
 			}
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PERSPECTIVE_CONTROLS, ELEMENT_CONTAINER__CHILDREN, element, Messages.PerspectiveEditor_Controls) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PERSPECTIVE_CONTROLS, ELEMENT_CONTAINER__CHILDREN,
+			element, Messages.PerspectiveEditor_Controls) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -318,10 +352,11 @@ protected boolean accepted(Object o) {
 	}
 
 	protected void handleAddChild(EClass eClass) {
-		EObject eObject = EcoreUtil.create(eClass);
+		final EObject eObject = EcoreUtil.create(eClass);
 		setElementId(eObject);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -331,7 +366,7 @@ protected void handleAddChild(EClass eClass) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 86c1fe9f8b..5c316be27d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -6,16 +6,18 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -67,10 +69,11 @@ public class PerspectiveStackEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
+		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private List<Action> actions = new ArrayList<Action>();
-	private List<Action> actionsImport = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actionsImport = new ArrayList<Action>();
 
 	@Inject
 	@Optional
@@ -86,7 +89,8 @@ public PerspectiveStackEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.PerspectiveStackEditor_AddPerspective, createImageDescriptor(ResourceProvider.IMG_Perspective)) {
+		actions.add(new Action(Messages.PerspectiveStackEditor_AddPerspective,
+			createImageDescriptor(ResourceProvider.IMG_Perspective)) {
 			@Override
 			public void run() {
 				handleAddPerspective();
@@ -94,7 +98,8 @@ public void run() {
 		});
 
 		// --- import ---
-		actionsImport.add(new Action(Messages.PerspectiveStackEditor_AddPerspective, createImageDescriptor(ResourceProvider.IMG_Perspective)) {
+		actionsImport.add(new Action(Messages.PerspectiveStackEditor_AddPerspective,
+			createImageDescriptor(ResourceProvider.IMG_Perspective)) {
 			@Override
 			public void run() {
 				handleImportPerspective();
@@ -105,12 +110,11 @@ public void run() {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_PerspectiveStack);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_PerspectiveStack);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_PerspectiveStack);
 		}
 
 		return null;
@@ -164,8 +168,9 @@ public Composite doGetEditor(Composite parent, Object object) {
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
+		boolean isImport) {
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -177,7 +182,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -185,14 +190,19 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+			context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PerspectiveStackEditor_SelectedElement);
 
 		// ------------------------------------------------------------
 		{
 
-			E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
+				Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
 					handleAddPerspective();
@@ -204,12 +214,16 @@ protected void addPressed() {
 			final TableViewer viewer = pickList.getList();
 			viewer.setContentProvider(new ObservableListContentProvider());
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
-			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 		}
 
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -217,8 +231,10 @@ protected void addPressed() {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -232,14 +248,15 @@ protected void addPressed() {
 	}
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
+			getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -254,16 +271,16 @@ public FeaturePath[] getLabelProperties() {
 	}
 
 	protected void handleAddPerspective() {
-		MPerspective eObject = MAdvancedFactory.INSTANCE.createPerspective();
+		final MPerspective eObject = MAdvancedFactory.INSTANCE.createPerspective();
 		addToModel(eObject);
 	}
 
 	protected void handleImportPerspective() {
-		ModelImportWizard wizard = new ModelImportWizard(MPerspective.class, this, resourcePool);
-		WizardDialog wizardDialog = new WizardDialog(shell, wizard);
+		final ModelImportWizard wizard = new ModelImportWizard(MPerspective.class, this, resourcePool);
+		final WizardDialog wizardDialog = new WizardDialog(shell, wizard);
 		if (wizardDialog.open() == Window.OK) {
-			MPerspective[] elements = (MPerspective[]) wizard.getElements(MPerspective.class);
-			for (MPerspective category : elements) {
+			final MPerspective[] elements = (MPerspective[]) wizard.getElements(MPerspective.class);
+			for (final MPerspective category : elements) {
 				addToModel(category);
 			}
 		}
@@ -271,7 +288,8 @@ protected void handleImportPerspective() {
 
 	private void addToModel(MPerspective perspective) {
 		setElementId(perspective);
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, perspective);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, perspective);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 			getEditor().setSelection(perspective);
@@ -280,14 +298,14 @@ private void addToModel(MPerspective perspective) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	@Override
 	public List<Action> getActionsImport(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
 		l.addAll(actionsImport);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index b680894777..fcfd9c0c0f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steve@spungin.tv> - Ongoing Maintenance, Bug 439532, Bug 443945
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steve@spungin.tv> - Ongoing Maintenance, Bug 439532, Bug 443945
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -15,8 +15,10 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -69,9 +71,10 @@ public class StringModelFragment extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private IListProperty MODEL_FRAGMENT__ELEMENTS = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
+	private final IListProperty MODEL_FRAGMENT__ELEMENTS = EMFProperties
+		.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
 
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	IEclipseContext eclipseContext;
@@ -83,9 +86,10 @@ public StringModelFragment() {
 
 	@PostConstruct
 	public void init() {
-		List<FeatureClass> list = new ArrayList<FeatureClass>();
+		final List<FeatureClass> list = new ArrayList<FeatureClass>();
 		Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
-		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
+		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT,
+			FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
 		for (final FeatureClass featureClass : list) {
 			actions.add(new Action(featureClass.label) {
 
@@ -109,13 +113,15 @@ public String getLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME), FeaturePath.fromList(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID) };
+		return new FeaturePath[] {
+			FeaturePath.fromList(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME),
+			FeaturePath.fromList(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID) };
 	}
 
 	@Override
 	public String getDetailLabel(Object element) {
 		if (element instanceof StringModelFragmentImpl) {
-			StringModelFragmentImpl fragment = (StringModelFragmentImpl) element;
+			final StringModelFragmentImpl fragment = (StringModelFragmentImpl) element;
 			String ret = ""; //$NON-NLS-1$
 			if (E.notEmpty(fragment.getFeaturename())) {
 				ret += fragment.getFeaturename();
@@ -124,9 +130,8 @@ public String getDetailLabel(Object element) {
 				ret += " (" + fragment.getParentElementId() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
 			}
 			return ret;
-		} else {
-			return null;
 		}
+		return null;
 	}
 
 	@Override
@@ -145,9 +150,9 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
@@ -157,82 +162,93 @@ private Composite createForm(Composite parent) {
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.StringModelFragment_ParentId);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Composite comp = new Composite(parent, SWT.NONE);
+			final Composite comp = new Composite(parent, SWT.NONE);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			comp.setLayoutData(gd);
-			GridLayout gl = new GridLayout(2, false);
+			final GridLayout gl = new GridLayout(2, false);
 			gl.marginWidth = gl.marginHeight = 0;
 			gl.verticalSpacing = 0;
 			gl.marginLeft = gl.marginBottom = gl.marginRight = gl.marginTop = 0;
 			comp.setLayout(gl);
 
-			Text t = new Text(comp, SWT.BORDER);
+			final Text t = new Text(comp, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			// t.setEditable(false);
 			gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID).observeDetail(getMaster()));
+			context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(),
+					FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID).observeDetail(getMaster()));
 
 			final Button b = new Button(comp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					FindParentReferenceElementDialog dialog = new FindParentReferenceElementDialog(b.getShell(), StringModelFragment.this, (MStringModelFragment) getMaster().getValue(), Messages);
+					final FindParentReferenceElementDialog dialog = new FindParentReferenceElementDialog(b.getShell(),
+						StringModelFragment.this, (MStringModelFragment) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
 		}
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.StringModelFragment_Featurename);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Composite comp = new Composite(parent, SWT.NONE);
+			final Composite comp = new Composite(parent, SWT.NONE);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			comp.setLayoutData(gd);
-			GridLayout gl = new GridLayout(2, false);
+			final GridLayout gl = new GridLayout(2, false);
 			gl.marginWidth = gl.marginHeight = 0;
 			gl.verticalSpacing = 0;
 			gl.marginLeft = gl.marginBottom = gl.marginRight = gl.marginTop = 0;
 			comp.setLayout(gl);
 
-			Text t = new Text(comp, SWT.BORDER);
+			final Text t = new Text(comp, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME).observeDetail(getMaster()));
+			context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(),
+					FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME).observeDetail(getMaster()));
 
 			final Button button = new Button(comp, SWT.PUSH | SWT.FLAT);
 			button.setText(Messages.ModelTooling_Common_FindEllipsis);
 			button.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					FeatureSelectionDialog dialog = new FeatureSelectionDialog(button.getShell(), getEditingDomain(), (MStringModelFragment) getMaster().getValue(), Messages);
+					final FeatureSelectionDialog dialog = new FeatureSelectionDialog(button.getShell(),
+						getEditingDomain(), (MStringModelFragment) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
 
 		}
 
-		ControlFactory.createTextField(parent, Messages.StringModelFragment_PositionInList, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__POSITION_IN_LIST));
+		ControlFactory.createTextField(parent, Messages.StringModelFragment_PositionInList, getMaster(), context,
+			textProp, EMFEditProperties.value(getEditingDomain(),
+				FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__POSITION_IN_LIST));
 
 		// ------------------------------------------------------------
 		{
 
-			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS) {
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+				FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS) {
 				@Override
 				protected void addPressed() {
-					EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
+					final EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
 					handleAdd(eClass, false);
 				}
 
@@ -248,7 +264,7 @@ protected List<?> getContainerChildren(Object master) {
 			pickList.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
-					FeatureClass eclass = (FeatureClass) element;
+					final FeatureClass eclass = (FeatureClass) element;
 					return eclass.label;
 				}
 			});
@@ -256,22 +272,23 @@ public String getText(Object element) {
 			pickList.setComparator(new ViewerComparator() {
 				@Override
 				public int compare(Viewer viewer, Object e1, Object e2) {
-					FeatureClass eClass1 = (FeatureClass) e1;
-					FeatureClass eClass2 = (FeatureClass) e2;
+					final FeatureClass eClass1 = (FeatureClass) e1;
+					final FeatureClass eClass2 = (FeatureClass) e2;
 					return eClass1.label.compareTo(eClass2.label);
 				}
 			});
 
-			List<FeatureClass> list = new ArrayList<FeatureClass>();
+			final List<FeatureClass> list = new ArrayList<FeatureClass>();
 			Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
-			list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
+			list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT,
+				FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
 
 			pickList.setInput(list);
 			if (list.size() > 0) {
 				pickList.setSelection(new StructuredSelection(list.get(0)));
 			}
 
-			IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
+			final IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
 			pickList.getList().setInput(prop.observeDetail(getMaster()));
 
 		}
@@ -301,9 +318,10 @@ public IObservableList getChildList(Object element) {
 	}
 
 	protected void handleAdd(EClass eClass, boolean separator) {
-		EObject eObject = EcoreUtil.create(eClass);
+		final EObject eObject = EcoreUtil.create(eClass);
 		setElementId(eObject);
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, eObject);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -313,7 +331,7 @@ protected void handleAdd(EClass eClass, boolean separator) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		Collections.sort(l, new Comparator<Action>() {
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 9833a21f0c..57072d7c31 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -6,18 +6,20 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Marco Descher <marco@descher.at> - Bug 397650
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Nicolaj Hoess <nicohoess@gmail.com> - Bug 396975
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Marco Descher <marco@descher.at> - Bug 397650
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Nicolaj Hoess <nicohoess@gmail.com> - Bug 396975
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -76,9 +78,10 @@ public class ToolBarContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
+		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	@Optional
@@ -97,25 +100,29 @@ public ToolBarContributionEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.ToolBarEditor_AddHandledToolItem, createImageDescriptor(ResourceProvider.IMG_HandledToolItem)) {
+		actions.add(new Action(Messages.ToolBarEditor_AddHandledToolItem,
+			createImageDescriptor(ResourceProvider.IMG_HandledToolItem)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
 			}
 		});
-		actions.add(new Action(Messages.ToolBarEditor_AddDirectToolItem, createImageDescriptor(ResourceProvider.IMG_DirectToolItem)) {
+		actions.add(new Action(Messages.ToolBarEditor_AddDirectToolItem,
+			createImageDescriptor(ResourceProvider.IMG_DirectToolItem)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false);
 			}
 		});
-		actions.add(new Action(Messages.ToolBarEditor_AddToolControl, createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
+		actions.add(new Action(Messages.ToolBarEditor_AddToolControl,
+			createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.TOOL_CONTROL, false);
 			}
 		});
-		actions.add(new Action(Messages.ToolBarEditor_AddToolBarSeparator, createImageDescriptor(ResourceProvider.IMG_ToolBarSeparator)) {
+		actions.add(new Action(Messages.ToolBarEditor_AddToolBarSeparator,
+			createImageDescriptor(ResourceProvider.IMG_ToolBarSeparator)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true);
@@ -126,12 +133,11 @@ public void run() {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_ToolBarContribution);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_ToolBarContribution);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_ToolBarContribution);
 		}
 
 		return null;
@@ -186,7 +192,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -198,7 +204,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -206,46 +212,57 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+			context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_ParentId);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__PARENT_ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__PARENT_ID)
+					.observeDetail(getMaster()));
 
-			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ToolBarIdDialog dialog = new ToolBarIdDialog(t.getShell(), resource, (MToolBarContribution) getMaster().getValue(), getEditingDomain(), modelService, Messages);
+					final ToolBarIdDialog dialog = new ToolBarIdDialog(t.getShell(), resource,
+						(MToolBarContribution) getMaster().getValue(), getEditingDomain(), modelService, Messages);
 					dialog.open();
 				}
 			});
 		}
 
-		ControlFactory.createTextField(parent, Messages.MenuContributionEditor_Position, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__POSITION_IN_PARENT));
+		ControlFactory.createTextField(parent, Messages.MenuContributionEditor_Position, master, context, textProp,
+			EMFEditProperties.value(getEditingDomain(),
+				MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__POSITION_IN_PARENT));
 
 		// ------------------------------------------------------------
 		{
-			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					Struct struct = (Struct) ((IStructuredSelection) getSelection()).getFirstElement();
-					EClass eClass = struct.eClass;
-					MToolBarElement eObject = (MToolBarElement) EcoreUtil.create(eClass);
+					final Struct struct = (Struct) ((IStructuredSelection) getSelection()).getFirstElement();
+					final EClass eClass = struct.eClass;
+					final MToolBarElement eObject = (MToolBarElement) EcoreUtil.create(eClass);
 					setElementId(eObject);
 
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+					final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+						UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
@@ -257,18 +274,27 @@ protected void addPressed() {
 			};
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 			pickList.setText(Messages.ToolBarEditor_ToolbarItems);
-			TableViewer viewer = pickList.getList();
+			final TableViewer viewer = pickList.getList();
 
-			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			final IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(),
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
 
-			Struct defaultStruct = new Struct(Messages.ToolBarEditor_HandledToolItem, MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
-			pickList.setInput(new Struct[] { defaultStruct, new Struct(Messages.ToolBarEditor_DirectToolItem, MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false), new Struct(Messages.ToolBarEditor_ToolControl, MenuPackageImpl.Literals.TOOL_CONTROL, false), new Struct(Messages.ToolBarEditor_Separator, MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true) });
+			final Struct defaultStruct = new Struct(Messages.ToolBarEditor_HandledToolItem,
+				MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
+			pickList.setInput(new Struct[] { defaultStruct,
+				new Struct(Messages.ToolBarEditor_DirectToolItem, MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false),
+				new Struct(Messages.ToolBarEditor_ToolControl, MenuPackageImpl.Literals.TOOL_CONTROL, false),
+				new Struct(Messages.ToolBarEditor_Separator, MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true) });
 			pickList.setSelection(new StructuredSelection(defaultStruct));
 		}
 
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -276,8 +302,10 @@ protected void addPressed() {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -291,14 +319,15 @@ protected void addPressed() {
 	}
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
+			getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -314,16 +343,17 @@ public FeaturePath[] getLabelProperties() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	protected void handleAddChild(EClass eClass, boolean separator) {
-		MToolBarElement eObject = (MToolBarElement) EcoreUtil.create(eClass);
+		final MToolBarElement eObject = (MToolBarElement) EcoreUtil.create(eClass);
 		setElementId(eObject);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 4d08fc72ea..82e887f79b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -6,16 +6,18 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -61,9 +63,10 @@ public class ToolBarEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
+		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	public ToolBarEditor() {
@@ -72,25 +75,29 @@ public ToolBarEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.ToolBarEditor_AddHandledToolItem, createImageDescriptor(ResourceProvider.IMG_HandledToolItem)) {
+		actions.add(new Action(Messages.ToolBarEditor_AddHandledToolItem,
+			createImageDescriptor(ResourceProvider.IMG_HandledToolItem)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
 			}
 		});
-		actions.add(new Action(Messages.ToolBarEditor_AddDirectToolItem, createImageDescriptor(ResourceProvider.IMG_DirectToolItem)) {
+		actions.add(new Action(Messages.ToolBarEditor_AddDirectToolItem,
+			createImageDescriptor(ResourceProvider.IMG_DirectToolItem)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false);
 			}
 		});
-		actions.add(new Action(Messages.ToolBarEditor_AddToolControl, createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
+		actions.add(new Action(Messages.ToolBarEditor_AddToolControl,
+			createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.TOOL_CONTROL, false);
 			}
 		});
-		actions.add(new Action(Messages.ToolBarEditor_AddToolBarSeparator, createImageDescriptor(ResourceProvider.IMG_ToolBarSeparator)) {
+		actions.add(new Action(Messages.ToolBarEditor_AddToolBarSeparator,
+			createImageDescriptor(ResourceProvider.IMG_ToolBarSeparator)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true);
@@ -101,12 +108,11 @@ public void run() {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_ToolBar);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_ToolBar);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_ToolBar);
 		}
 
 		return null;
@@ -156,7 +162,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -168,7 +174,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -176,33 +182,49 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+			context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		// ------------------------------------------------------------
 		{
-			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					Struct struct = (Struct) ((IStructuredSelection) getSelection()).getFirstElement();
-					EClass eClass = struct.eClass;
+					final Struct struct = (Struct) ((IStructuredSelection) getSelection()).getFirstElement();
+					final EClass eClass = struct.eClass;
 					handleAddChild(eClass, struct.separator);
 				}
 			};
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 			pickList.setText(Messages.ToolBarEditor_ToolbarItems);
 
-			TableViewer viewer = pickList.getList();
-			IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			final TableViewer viewer = pickList.getList();
+			final IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(),
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
 
-			Struct defaultStruct = new Struct(Messages.ToolBarEditor_HandledToolItem, MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
-			pickList.setInput(new Struct[] { defaultStruct, new Struct(Messages.ToolBarEditor_DirectToolItem, MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false), new Struct(Messages.ToolBarEditor_ToolControl, MenuPackageImpl.Literals.TOOL_CONTROL, false), new Struct(Messages.ToolBarEditor_Separator, MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true) });
+			final Struct defaultStruct = new Struct(Messages.ToolBarEditor_HandledToolItem,
+				MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
+			pickList.setInput(new Struct[] { defaultStruct,
+				new Struct(Messages.ToolBarEditor_DirectToolItem, MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false),
+				new Struct(Messages.ToolBarEditor_ToolControl, MenuPackageImpl.Literals.TOOL_CONTROL, false),
+				new Struct(Messages.ToolBarEditor_Separator, MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true) });
 			pickList.setSelection(new StructuredSelection(defaultStruct));
 		}
 
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory
+			.createCheckBox(
+				parent,
+				"To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory
+			.createCheckBox(
+				parent,
+				"Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -210,8 +232,10 @@ protected void addPressed() {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createContributedEditorTabs(folder, context, getMaster(), MToolBar.class);
 
@@ -237,16 +261,17 @@ public FeaturePath[] getLabelProperties() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	protected void handleAddChild(EClass eClass, boolean separator) {
-		MToolBarElement eObject = (MToolBarElement) EcoreUtil.create(eClass);
+		final MToolBarElement eObject = (MToolBarElement) EcoreUtil.create(eClass);
 		setElementId(eObject);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 6604a30544..7e91c33756 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -6,12 +6,13 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
@@ -59,12 +60,11 @@ public ToolBarSeparatorEditor() {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_ToolBarSeparator);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_ToolBarSeparator);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_ToolBarSeparator);
 		}
 
 		return null;
@@ -119,7 +119,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -131,7 +131,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -139,10 +139,18 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+			context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -150,8 +158,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -165,14 +175,15 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 	}
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
+			getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 75dd2dff53..89bd7f1406 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -6,14 +6,15 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 412672
- *     Steven Spungin <steven@spungin.tv> - Bug 424730
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 412672
+ * Steven Spungin <steven@spungin.tv> - Bug 424730
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
@@ -87,12 +88,11 @@ public String getDescription(Object element) {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_ToolControl);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_ToolControl);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_ToolControl);
 		}
 
 		return null;
@@ -138,7 +138,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -150,7 +150,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -158,12 +158,17 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+			context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		// ------------------------------------------------------------
 		{
-			final IContributionClassCreator c = getEditor().getContributionCreator(MenuPackageImpl.Literals.TOOL_CONTROL);
+			final IContributionClassCreator c = getEditor().getContributionCreator(
+				MenuPackageImpl.Literals.TOOL_CONTROL);
 			if (project != null && c != null) {
 				final Link lnk = new Link(parent, SWT.NONE);
 				lnk.setText("<A>" + Messages.ToolControlEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
@@ -171,19 +176,23 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 				lnk.addSelectionListener(new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
-						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, lnk.getShell());
+						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project,
+							lnk.getShell());
 					}
 				});
 			} else {
-				Label l = new Label(parent, SWT.NONE);
+				final Label l = new Label(parent, SWT.NONE);
 				l.setText(Messages.ToolControlEditor_ClassURI);
 				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 			}
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
+			context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(),
+					ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
@@ -192,16 +201,23 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
+						getEditingDomain(), (MContribution) getMaster().getValue(),
+						ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
 		}
 
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -209,8 +225,10 @@ public void widgetSelected(SelectionEvent e) {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createInstanceInspection(folder);
@@ -225,27 +243,29 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	private void createInstanceInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeContributionInstance);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		ObjectViewer objectViewer = new ObjectViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
+		final ObjectViewer objectViewer = new ObjectViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container,
+			ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
 	}
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
+			getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index ceb970a761..f1988b4742 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -6,17 +6,19 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -77,9 +79,10 @@ public class TrimBarEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
+		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	@Optional
@@ -105,7 +108,8 @@ public void run() {
 				handleAddChild(MenuPackageImpl.Literals.TOOL_BAR);
 			}
 		});
-		actions.add(new Action(Messages.TrimBarEditor_AddToolControl, createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
+		actions.add(new Action(Messages.TrimBarEditor_AddToolControl,
+			createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.TOOL_CONTROL);
@@ -116,12 +120,11 @@ public void run() {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_WindowTrim);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_WindowTrim);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_WindowTrim);
 		}
 
 		return null;
@@ -171,7 +174,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -183,7 +186,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -191,31 +194,37 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+			context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.TrimBarEditor_Side);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			ComboViewer viewer = new ComboViewer(parent);
+			final ComboViewer viewer = new ComboViewer(parent);
 			viewer.setContentProvider(new ArrayContentProvider());
 			viewer.setInput(SideValue.values());
-			GridData gd = new GridData();
+			final GridData gd = new GridData();
 			gd.horizontalSpan = 2;
 			viewer.getControl().setLayoutData(gd);
-			IObservableValue sideValueObs = EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TRIM_CONTAINER__SIDE).observeDetail(master);
+			final IObservableValue sideValueObs = EMFEditProperties.value(getEditingDomain(),
+				UiPackageImpl.Literals.GENERIC_TRIM_CONTAINER__SIDE).observeDetail(master);
 			context.bindValue(ViewerProperties.singleSelection().observe(viewer), sideValueObs);
 		}
 
 		// ------------------------------------------------------------
 		{
-			E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
+				Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
+					final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
 					handleAddChild(eClass);
 				}
 			};
@@ -225,15 +234,20 @@ protected void addPressed() {
 			final TableViewer viewer = pickList.getList();
 
 			pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
-			pickList.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
+			pickList
+				.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
 			pickList.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
 
-			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 		}
 
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -241,8 +255,10 @@ protected void addPressed() {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -256,14 +272,15 @@ protected void addPressed() {
 	}
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
+			getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -274,7 +291,7 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MGenericTrimContainer<?> trim = (MGenericTrimContainer<?>) element;
+		final MGenericTrimContainer<?> trim = (MGenericTrimContainer<?>) element;
 
 		if (trim.getSide() != null) {
 			return trim.getSide().toString();
@@ -285,14 +302,16 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TRIM_CONTAINER__SIDE), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TRIM_CONTAINER__SIDE),
+			FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 	protected void handleAddChild(EClass eClass) {
-		EObject toolbar = EcoreUtil.create(eClass);
+		final EObject toolbar = EcoreUtil.create(eClass);
 		setElementId(toolbar);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -302,7 +321,7 @@ protected void handleAddChild(EClass eClass) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index c4bebe9f91..7c2387520e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -6,18 +6,20 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Marco Descher <marco@descher.at> - Bug 397650
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Nicolaj Hoess <nicohoess@gmail.com> - Bug 396975
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Marco Descher <marco@descher.at> - Bug 397650
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Nicolaj Hoess <nicohoess@gmail.com> - Bug 396975
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -78,9 +80,10 @@ public class TrimContributionEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
+		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	@Optional
@@ -105,7 +108,8 @@ public void run() {
 				handleAddChild(MenuPackageImpl.Literals.TOOL_BAR);
 			}
 		});
-		actions.add(new Action(Messages.TrimBarEditor_AddToolControl, createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
+		actions.add(new Action(Messages.TrimBarEditor_AddToolControl,
+			createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.TOOL_CONTROL);
@@ -116,12 +120,11 @@ public void run() {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_TrimContribution);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_TrimContribution);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_TrimContribution);
 		}
 
 		return null;
@@ -176,7 +179,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -188,7 +191,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -196,41 +199,52 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+			context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_ParentId);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID)
+					.observeDetail(getMaster()));
 
-			Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					TrimIdDialog dialog = new TrimIdDialog(t.getShell(), resource, (MTrimContribution) getMaster().getValue(), getEditingDomain(), modelService, Messages);
+					final TrimIdDialog dialog = new TrimIdDialog(t.getShell(), resource,
+						(MTrimContribution) getMaster().getValue(), getEditingDomain(), modelService, Messages);
 					dialog.open();
 				}
 			});
 
 		}
 
-		ControlFactory.createTextField(parent, Messages.TrimContributionEditor_Position, master, context, textProp, EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__POSITION_IN_PARENT));
+		ControlFactory
+			.createTextField(parent, Messages.TrimContributionEditor_Position, master, context, textProp,
+				EMFEditProperties.value(getEditingDomain(),
+					MenuPackageImpl.Literals.TRIM_CONTRIBUTION__POSITION_IN_PARENT));
 
 		// ------------------------------------------------------------
 		{
-			E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
+					final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
 					handleAddChild(eClass);
 				}
 			};
@@ -240,7 +254,7 @@ protected void addPressed() {
 			final TableViewer viewer = pickList.getList();
 			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
 			viewer.setContentProvider(new ObservableListContentProvider());
-			IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
 			pickList.setContentProvider(new ArrayContentProvider());
@@ -250,12 +264,17 @@ public String getText(Object element) {
 					return ((EClass) element).getName();
 				}
 			});
-			pickList.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
+			pickList
+				.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
 			pickList.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
 		}
 
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+			WidgetProperties.selection(),
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -263,8 +282,10 @@ public String getText(Object element) {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -278,14 +299,15 @@ public String getText(Object element) {
 	}
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
+			getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -300,10 +322,11 @@ public FeaturePath[] getLabelProperties() {
 	}
 
 	protected void handleAddChild(EClass eClass) {
-		EObject toolbar = EcoreUtil.create(eClass);
+		final EObject toolbar = EcoreUtil.create(eClass);
 		setElementId(toolbar);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -313,7 +336,7 @@ protected void handleAddChild(EClass eClass) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
index 8dba05f897..e942474dbd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
@@ -1,11 +1,12 @@
 /*******************************************************************************
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.conversion.IConverter;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -18,31 +19,25 @@
 import org.eclipse.emf.edit.command.SetCommand;
 
 /**
- * An updater to deal with unsettable primitive attributes on EMF objects. EMF's
- * {@link EMFEditValueProperty}/{@link EMFValueProperty} does an eGet to
+ * An updater to deal with unsettable primitive attributes on EMF objects. EMF's {@link EMFEditValueProperty}/
+ * {@link EMFValueProperty} does an eGet to
  * retrieve the attribute value, with no regard as to whether the attribute is
  * unset. If the attribute is unset, then eGet() will return the default value.
  *
  * This implementation makes several assumptions:
  * <ul>
- * <li>Assumes that these unsettable attributes have a nonsensical default value
- * that can be used to detect an eGet of an unset attribute.</li>
- * <li>Assumes that we are using EMFEditObservables so that changes are
- * described using {@link SetCommand}, such that we can provide
- * {@link SetCommand#UNSET_VALUE} to remove a value.</li>
+ * <li>Assumes that these unsettable attributes have a nonsensical default value that can be used to detect an eGet of
+ * an unset attribute.</li>
+ * <li>Assumes that we are using EMFEditObservables so that changes are described using {@link SetCommand}, such that we
+ * can provide {@link SetCommand#UNSET_VALUE} to remove a value.</li>
  * </ul>
  * See the following discussions for background details:
  * <ul>
- * <li><a
- * href="http://www.eclipse.org/forums/index.php?t=msg&th=165026/">Dynamic eGet
- * for unsettable attributes</a></li>
- * <li><a
- * href="http://www.eclipsezone.com/eclipse/forums/t114431.html?start=15">
- * Creating a ComboViewer for an EReference</a> particularly the later postings
- * from Tom Schindl on handling null values</li>
- * <li><a href="http://www.eclipse.org/forums/index.php?t=msg&th=174967/">
- * ObservableMapCellLabelProvider doesn't work well with unsettable features</a>
- * </li>
+ * <li><a href="http://www.eclipse.org/forums/index.php?t=msg&th=165026/">Dynamic eGet for unsettable attributes</a></li>
+ * <li><a href="http://www.eclipsezone.com/eclipse/forums/t114431.html?start=15"> Creating a ComboViewer for an
+ * EReference</a> particularly the later postings from Tom Schindl on handling null values</li>
+ * <li><a href="http://www.eclipse.org/forums/index.php?t=msg&th=174967/"> ObservableMapCellLabelProvider doesn't work
+ * well with unsettable features</a></li>
  * </ul>
  */
 public class UnsettableUpdateValueStrategy extends EMFUpdateValueStrategy {
@@ -56,21 +51,20 @@ protected IConverter createConverter(Object fromType, Object toType) {
 				return new Converter(fromType, toType) {
 					@Override
 					public Object convert(Object fromObject) {
-						String value = fromObject == null ? null : fromObject.toString();
+						final String value = fromObject == null ? null : fromObject.toString();
 						if (value == null || value.length() == 0) {
 							return SetCommand.UNSET_VALUE;
 						}
 						if (eAttribute.isMany()) {
-							List<Object> result = new ArrayList<Object>();
-							if (value != null) {
-								for (String element : value.split(" ")) { //$NON-NLS-1$
-									result.add(eFactory.createFromString(eDataType, element));
-								}
+							final List<Object> result = new ArrayList<Object>();
+
+							for (final String element : value.split(" ")) { //$NON-NLS-1$
+								result.add(eFactory.createFromString(eDataType, element));
+
 							}
 							return result;
-						} else {
-							return eFactory.createFromString(eDataType, value);
 						}
+						return eFactory.createFromString(eDataType, value);
 					}
 				};
 			}
@@ -83,21 +77,21 @@ public Object convert(Object fromObject) {
 					@Override
 					public Object convert(Object fromObject) {
 						if (eAttribute.isMany()) {
-							StringBuilder result = new StringBuilder();
-							for (Object value : (List<?>) fromObject) {
+							final StringBuilder result = new StringBuilder();
+							for (final Object value : (List<?>) fromObject) {
 								if (result.length() == 0) {
 									result.append(' ');
 								}
 								result.append(eFactory.convertToString(eDataType, value));
 							}
 							return result.toString();
-						} else {
-							// If the value
-							if (fromObject == SetCommand.UNSET_VALUE || fromObject == null || fromObject.equals(eAttribute.getDefaultValue())) {
-								return ""; //$NON-NLS-1$
-							}
-							return eFactory.convertToString(eDataType, fromObject);
 						}
+						// If the value
+						if (fromObject == SetCommand.UNSET_VALUE || fromObject == null
+							|| fromObject.equals(eAttribute.getDefaultValue())) {
+							return ""; //$NON-NLS-1$
+						}
+						return eFactory.convertToString(eDataType, fromObject);
 					}
 				};
 			}
@@ -107,7 +101,6 @@ public Object convert(Object fromObject) {
 
 	/*
 	 * (non-Javadoc)
-	 *
 	 * @see
 	 * org.eclipse.core.databinding.UpdateValueStrategy#doSet(org.eclipse.core
 	 * .databinding.observable.value.IObservableValue, java.lang.Object)
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index b6538652cc..b25ad1e551 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -6,16 +6,18 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
- *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
@@ -76,11 +78,13 @@ public class WindowEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
-	private IListProperty WINDOW__WINDOWS = EMFProperties.list(BasicPackageImpl.Literals.WINDOW__WINDOWS);
-	private IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private IListProperty SHARED_ELEMENTS = EMFProperties.list(BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
-	private IValueProperty WINDOW__MAIN_MENU = EMFProperties.value(BasicPackageImpl.Literals.WINDOW__MAIN_MENU);
+	private final IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties
+		.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
+	private final IListProperty WINDOW__WINDOWS = EMFProperties.list(BasicPackageImpl.Literals.WINDOW__WINDOWS);
+	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
+		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	private final IListProperty SHARED_ELEMENTS = EMFProperties.list(BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
+	private final IValueProperty WINDOW__MAIN_MENU = EMFProperties.value(BasicPackageImpl.Literals.WINDOW__MAIN_MENU);
 
 	private Action addMainMenu;
 	private Button createRemoveMainMenu;
@@ -111,12 +115,11 @@ public void run() {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_Window);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_Window);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_Window);
 		}
 
 		return null;
@@ -166,13 +169,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
-		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -184,7 +188,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -192,59 +196,79 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp,
+			EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.WindowEditor_Bounds);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Composite comp = new Composite(parent, SWT.NONE);
-			GridLayout layout = new GridLayout(4, true);
+			final Composite comp = new Composite(parent, SWT.NONE);
+			final GridLayout layout = new GridLayout(4, true);
 			layout.marginWidth = 0;
 			layout.marginHeight = 0;
 			comp.setLayout(layout);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			comp.setLayoutData(gd);
 
 			Text t = new Text(comp, SWT.BORDER | SWT.TRAIL);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__X).observeDetail(getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
+			context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__X).observeDetail(
+					getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
 
 			t = new Text(comp, SWT.BORDER | SWT.TRAIL);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__Y).observeDetail(getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
+			context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__Y).observeDetail(
+					getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
 
 			t = new Text(comp, SWT.BORDER | SWT.TRAIL);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__WIDTH).observeDetail(getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
+			context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__WIDTH).observeDetail(
+					getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
 
 			t = new Text(comp, SWT.BORDER | SWT.TRAIL);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__HEIGHT).observeDetail(getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
+			context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__HEIGHT).observeDetail(
+					getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
 		}
 
-		ControlFactory.createTranslatedTextField(parent, Messages.WindowEditor_Label, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
-		ControlFactory.createTranslatedTextField(parent, Messages.WindowEditor_Tooltip, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool, project);
+		ControlFactory.createTranslatedTextField(parent, Messages.WindowEditor_Label, getMaster(), context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
+		ControlFactory.createTranslatedTextField(parent, Messages.WindowEditor_Tooltip, getMaster(), context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool,
+			project);
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.WindowEditor_IconURI);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
+					master));
 
 			new ImageTooltip(t, Messages) {
 
 				@Override
 				protected URI getImageURI() {
-					MUILabel part = (MUILabel) getMaster().getValue();
-					String uri = part.getIconURI();
+					final MUILabel part = (MUILabel) getMaster().getValue();
+					final String uri = part.getIconURI();
 					if (uri == null || uri.trim().length() == 0) {
 						return null;
 					}
@@ -259,14 +283,15 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					WindowIconDialogEditor dialog = new WindowIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MWindow) getMaster().getValue(), Messages);
+					final WindowIconDialogEditor dialog = new WindowIconDialogEditor(b.getShell(), eclipseContext,
+						project, getEditingDomain(), (MWindow) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
 		}
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.WindowEditor_MainMenu);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
@@ -274,7 +299,7 @@ public void widgetSelected(SelectionEvent e) {
 			createRemoveMainMenu.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MWindow window = (MWindow) getMaster().getValue();
+					final MWindow window = (MWindow) getMaster().getValue();
 					if (window.getMainMenu() == null) {
 						addMenu();
 					} else {
@@ -285,12 +310,19 @@ public void widgetSelected(SelectionEvent e) {
 			createRemoveMainMenu.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 		}
 
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory
+			.createCheckBox(
+				parent,
+				"To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		ControlFactory
+			.createCheckBox(
+				parent,
+				"Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.WindowEditor_SelectedElement);
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.WindowEditor_BindingContexts);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties,
+			UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -298,10 +330,16 @@ public void widgetSelected(SelectionEvent e) {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createTranslatedTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE), resourcePool, project);
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createTranslatedTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase,
+			getMaster(), context, textProp,
+			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE),
+			resourcePool, project);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables,
+			UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -315,29 +353,32 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
+			getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
 	void removeMenu() {
-		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__MAIN_MENU, null);
+		final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(),
+			BasicPackageImpl.Literals.WINDOW__MAIN_MENU, null);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
 	}
 
 	void addMenu() {
-		MMenu menu = MMenuFactory.INSTANCE.createMenu();
+		final MMenu menu = MMenuFactory.INSTANCE.createMenu();
 		setElementId(menu);
 
-		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__MAIN_MENU, menu);
+		final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(),
+			BasicPackageImpl.Literals.WINDOW__MAIN_MENU, menu);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
@@ -350,7 +391,8 @@ public IObservableList getChildList(final Object element) {
 			return list;
 		}
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.WindowEditor_Handlers) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element,
+			Messages.WindowEditor_Handlers) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -359,7 +401,8 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_WINDOWS, WINDOW__WINDOWS, element, Messages.WindowEditor_Windows) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_WINDOWS, WINDOW__WINDOWS, element,
+			Messages.WindowEditor_Windows) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -368,7 +411,8 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_CONTROLS, ELEMENT_CONTAINER__CHILDREN, element, Messages.WindowEditor_Controls) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_CONTROLS, ELEMENT_CONTAINER__CHILDREN, element,
+			Messages.WindowEditor_Controls) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -377,14 +421,15 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_SHARED_ELEMENTS, SHARED_ELEMENTS, element, Messages.WindowEditor_SharedElements) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_SHARED_ELEMENTS, SHARED_ELEMENTS, element,
+			Messages.WindowEditor_SharedElements) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
 			}
 		});
 
-		MWindow window = (MWindow) element;
+		final MWindow window = (MWindow) element;
 		if (window.getMainMenu() != null) {
 			list.add(0, window.getMainMenu());
 		}
@@ -419,14 +464,15 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL),
+			FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 	@Override
 	public List<Action> getActions(Object element) {
-		List<Action> actions = new ArrayList<Action>();
+		final List<Action> actions = new ArrayList<Action>();
 
-		MWindow window = (MWindow) element;
+		final MWindow window = (MWindow) element;
 		if (window.getMainMenu() == null) {
 			actions.add(getActionAddMainMenu());
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java
index 7389d7e153..ebabc7ae35 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java
@@ -6,12 +6,13 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.basic.MWizardDialog;
@@ -24,12 +25,11 @@ public class WizardDialogEditor extends WindowEditor {
 	@Override
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
-			MUIElement uiElement = (MUIElement) element;
+			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
 				return createImage(ResourceProvider.IMG_WizardDialog);
-			} else {
-				return createImage(ResourceProvider.IMG_Tbr_WizardDialog);
 			}
+			return createImage(ResourceProvider.IMG_Tbr_WizardDialog);
 		}
 
 		return null;
@@ -42,9 +42,9 @@ public String getLabel(Object element) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		List<Action> actions = new ArrayList<Action>();
+		final List<Action> actions = new ArrayList<Action>();
 
-		MWizardDialog dialog = (MWizardDialog) element;
+		final MWizardDialog dialog = (MWizardDialog) element;
 		if (dialog.getMainMenu() == null) {
 			actions.add(getActionAddMainMenu());
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
index 48c62637a8..44a2a07435 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -20,10 +20,12 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
+@SuppressWarnings("restriction")
 public class HandledToolItemCommandSelectionDialog extends AbstractCommandSelectionDialog {
-	private MHandledItem handler;
+	private final MHandledItem handler;
 
-	public HandledToolItemCommandSelectionDialog(Shell parentShell, MHandledItem handler, IModelResource resource, Messages Messages) {
+	public HandledToolItemCommandSelectionDialog(Shell parentShell, MHandledItem handler, IModelResource resource,
+		Messages Messages) {
 		super(parentShell, resource, Messages);
 		this.handler = handler;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
index afa6facb4c..2cda1c4522 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -20,8 +20,9 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
+@SuppressWarnings("restriction")
 public class HandlerCommandSelectionDialog extends AbstractCommandSelectionDialog {
-	private MHandler handler;
+	private final MHandler handler;
 
 	public HandlerCommandSelectionDialog(Shell parentShell, MHandler handler, IModelResource resource, Messages Messages) {
 		super(parentShell, resource, Messages);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
index 534fdde4ed..c409cfffd6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
@@ -14,8 +14,8 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.IconDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.UriDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.UriDialogType;
-import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.viewers.DialogCellEditor;
+import org.eclipse.jface.window.Window;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
@@ -46,10 +46,9 @@ public ContributionUriCellEditor(Composite parent, int style, IEclipseContext co
 	@Override
 	protected Object openDialogBox(Control cellEditorWindow) {
 		dlg.setUri((String) getValue());
-		if (dlg.open() == Dialog.OK) {
+		if (dlg.open() == Window.OK) {
 			return dlg.getUri();
-		} else {
-			return getValue();
 		}
+		return getValue();
 	}
 }

From 61290ea4132c25d68a791f3a928e80aef431684e Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 28 Nov 2014 11:46:51 +0100
Subject: [PATCH 0861/1286] Revert "Bug 445742 - Which bundles are transfered
 to Platform? Removed liveeditor.js and spy (spy is part of the spy features)"

This reverts commit 77198308c2cbc5b150125134ab3b9d51819792d4.
---
 .../feature.xml                               | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index a87926e158..e2cf7a83bd 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -52,6 +52,20 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.e4.tools.emf.ui.script.js"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.mozilla.javascript"
+         download-size="0"
+         install-size="0"
+         version="1.7.2.qualifier"
+         unpack="false"/>
+
    <plugin
          id="org.eclipse.e4.tools.jdt.templates"
          download-size="0"
@@ -66,4 +80,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.e4.tools.spy"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

From 355a8766eb627cda5a2a260e03eb709dfec5d610 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Wed, 3 Dec 2014 12:01:46 +0100
Subject: [PATCH 0862/1286] Bug 444692 - Remove Warnings

---
 .../common/component/tabs/E4ToolItemMenu.java |  31 +--
 .../tabs/EAttributeEditingSupport.java        |  45 ++--
 .../tabs/EAttributeTableViewerColumn.java     |  21 +-
 .../common/component/tabs/EmfUtil.java        |  15 +-
 .../common/component/tabs/ListTab.java        | 222 +++++++++---------
 .../common/component/tabs/empty/E.java        |  12 +-
 .../component/virtual/VApplicationAddons.java |  42 ++--
 .../component/virtual/VCommandEditor.java     |  58 +++--
 .../component/virtual/VHandlerEditor.java     |  56 +++--
 .../virtual/VItemParametersEditor.java        |  34 +--
 .../virtual/VModelFragmentsEditor.java        |  31 ++-
 .../component/virtual/VSnippetsEditor.java    |  72 +++---
 .../virtual/VToolBarContributionsEditor.java  |  30 ++-
 .../virtual/VTrimContributionsEditor.java     |  30 ++-
 .../virtual/VWindowControlEditor.java         |  61 +++--
 .../component/virtual/VWindowTrimEditor.java  |  31 ++-
 .../common/objectdata/JavaAttribute.java      |  58 ++---
 .../common/objectdata/ObjectViewer.java       |  68 +++---
 .../ProjectOSGiTranslationProvider.java       |  63 ++---
 .../dialogs/NonReferencedActionPage.java      | 146 ++++++------
 .../common/uistructure/ViewerElement.java     |  40 ++--
 .../xml/EMFDocumentResourceMediator.java      |  35 +--
 .../ui/internal/imp/ModelImportWizard.java    |  41 ++--
 .../emf/ui/internal/imp/RegistryUtil.java     | 162 ++++++-------
 24 files changed, 755 insertions(+), 649 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
index 3dbba0f5f3..ca8c49c7c5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
@@ -6,13 +6,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
 
 import java.util.ArrayList;
 import java.util.Collection;
+
 import org.eclipse.core.commands.ParameterizedCommand;
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.e4.core.commands.ECommandService;
@@ -38,12 +39,12 @@
 public class E4ToolItemMenu {
 
 	public static final String SEPARATOR = "~separator~"; //$NON-NLS-1$
-	private IEclipseContext context;
-	private ArrayList<String> commandIds = new ArrayList<String>();
-	private Menu menu;
-	private ECommandService commandService;
-	private EHandlerService handlerService;
-	private ToolItem toolItem;
+	private final IEclipseContext context;
+	private final ArrayList<String> commandIds = new ArrayList<String>();
+	private final Menu menu;
+	private final ECommandService commandService;
+	private final EHandlerService handlerService;
+	private final ToolItem toolItem;
 
 	public E4ToolItemMenu(final ToolBar parent, IEclipseContext context) {
 
@@ -58,35 +59,35 @@ public E4ToolItemMenu(final ToolBar parent, IEclipseContext context) {
 			@Override
 			public void widgetSelected(SelectionEvent event) {
 				// if (event.detail == SWT.ARROW) {
-				Rectangle rect = toolItem.getBounds();
+				final Rectangle rect = toolItem.getBounds();
 				Point pt = new Point(rect.x, rect.y + rect.height);
 				pt = parent.toDisplay(pt);
 				menu.setLocation(pt.x, pt.y);
 				menu.setVisible(true);
-				for (MenuItem mi : menu.getItems()) {
+				for (final MenuItem mi : menu.getItems()) {
 					if (mi.getData() instanceof ParameterizedCommand) {
-						ParameterizedCommand cmd = (ParameterizedCommand) mi.getData();
+						final ParameterizedCommand cmd = (ParameterizedCommand) mi.getData();
 						mi.setEnabled(handlerService.canExecute(cmd));
 					}
 				}
 				// }
-			};
+			}
 		});
 	}
 
 	public void addCommands(Collection<String> commandIds) {
 		this.commandIds.addAll(commandIds);
 
-		for (String id : commandIds) {
+		for (final String id : commandIds) {
 			if (id.equals(SEPARATOR)) {
 				new MenuItem(menu, SWT.SEPARATOR);
 			} else {
-				ParameterizedCommand myCommand = commandService.createCommand(id, null);
+				final ParameterizedCommand myCommand = commandService.createCommand(id, null);
 				if (myCommand != null) {
 					final MenuItem item = new MenuItem(menu, SWT.PUSH);
 					try {
 						item.setText(myCommand.getName());
-					} catch (NotDefinedException e1) {
+					} catch (final NotDefinedException e1) {
 						item.setText(id);
 						e1.printStackTrace();
 					}
@@ -95,7 +96,7 @@ public void addCommands(Collection<String> commandIds) {
 
 						@Override
 						public void widgetSelected(SelectionEvent e) {
-							ParameterizedCommand cmd = (ParameterizedCommand) item.getData();
+							final ParameterizedCommand cmd = (ParameterizedCommand) item.getData();
 							handlerService.executeHandler(cmd);
 						}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
index 097cb9881a..cb66d8d117 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
@@ -30,10 +30,10 @@
 // Restrictions: Only handles boolean and String types
 class EAttributeEditingSupport extends EditingSupport {
 
-	private String attName;
-	private TableViewer tableViewer;
+	private final String attName;
+	private final TableViewer tableViewer;
 	private boolean wasNull;
-	private IEclipseContext context;
+	private final IEclipseContext context;
 
 	static public enum ATT_TYPE {
 		STRING, BOOLEAN, INTEGER, NOT_AN_ATTRIBUTE, OTHER;
@@ -55,7 +55,8 @@ protected CellEditor getCellEditor(Object element) {
 		case INTEGER:
 		default:
 			if ("contributionURI".equals(attName)) { //$NON-NLS-1$
-				return new ContributionUriCellEditor(tableViewer.getTable(), SWT.NONE, context, UriDialogType.BUNDLECLASS);
+				return new ContributionUriCellEditor(tableViewer.getTable(), SWT.NONE, context,
+					UriDialogType.BUNDLECLASS);
 			}
 			if ("iconURI".equals(attName)) { //$NON-NLS-1$
 				return new ContributionUriCellEditor(tableViewer.getTable(), SWT.NONE, context, UriDialogType.ICON);
@@ -65,11 +66,11 @@ protected CellEditor getCellEditor(Object element) {
 	}
 
 	static public ATT_TYPE getAttributeType(Object element, String attName) {
-		EAttribute att = EmfUtil.getAttribute((EObject) element, attName);
+		final EAttribute att = EmfUtil.getAttribute((EObject) element, attName);
 		if (att == null) {
 			return ATT_TYPE.NOT_AN_ATTRIBUTE;
 		}
-		String instanceTypeName = att.getEType().getInstanceTypeName();
+		final String instanceTypeName = att.getEType().getInstanceTypeName();
 		if (instanceTypeName.equals(String.class.getName())) {
 			return ATT_TYPE.STRING;
 		} else if (instanceTypeName.equals(boolean.class.getName())) {
@@ -83,26 +84,25 @@ static public ATT_TYPE getAttributeType(Object element, String attName) {
 
 	@Override
 	protected boolean canEdit(Object element) {
-		EAttribute att = EmfUtil.getAttribute((EObject) element, attName);
+		final EAttribute att = EmfUtil.getAttribute((EObject) element, attName);
 		if (att == null) {
 			return false;
+		}
+		final String instanceTypeName = att.getEType().getInstanceTypeName();
+		if (instanceTypeName.equals(String.class.getName())) {
+			return true;
+		} else if (instanceTypeName.equals(boolean.class.getName())) {
+			return true;
+		} else if (instanceTypeName.equals(int.class.getName())) {
+			return true;
 		} else {
-			String instanceTypeName = att.getEType().getInstanceTypeName();
-			if (instanceTypeName.equals(String.class.getName())) {
-				return true;
-			} else if (instanceTypeName.equals(boolean.class.getName())) {
-				return true;
-			} else if (instanceTypeName.equals(int.class.getName())) {
-				return true;
-			} else {
-				return false;
-			}
+			return false;
 		}
 	}
 
 	@Override
 	protected Object getValue(Object element) {
-		EObject eObject = (EObject) element;
+		final EObject eObject = (EObject) element;
 		Object value = eObject.eGet(EmfUtil.getAttribute(eObject, attName));
 		switch (getAttributeType(element, attName)) {
 		case BOOLEAN:
@@ -131,7 +131,7 @@ protected Object getValue(Object element) {
 
 	@Override
 	protected void setValue(Object element, Object value) {
-		EObject eObject = (EObject) element;
+		final EObject eObject = (EObject) element;
 		switch (getAttributeType(element, attName)) {
 		case INTEGER:
 			if (value.equals("")) { //$NON-NLS-1$
@@ -139,7 +139,7 @@ protected void setValue(Object element, Object value) {
 			} else {
 				try {
 					value = Integer.parseInt(value.toString());
-				} catch (Exception e) {
+				} catch (final Exception e) {
 					return;
 				}
 			}
@@ -152,7 +152,8 @@ protected void setValue(Object element, Object value) {
 			}
 			break;
 		}
-		Command cmd = SetCommand.create(context.get(EditingDomain.class), eObject, EmfUtil.getAttribute(eObject, attName), value);
+		final Command cmd = SetCommand.create(context.get(EditingDomain.class), eObject,
+			EmfUtil.getAttribute(eObject, attName), value);
 		context.get(EditingDomain.class).getCommandStack().execute(cmd);
 		TableViewerUtil.updateAndPack(tableViewer, eObject);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
index ef145a1f5f..f6850a30de 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555, Bug 436889
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555, Bug 436889
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
@@ -37,7 +37,8 @@ public class EAttributeTableViewerColumn {
 	private String attName;
 	private TableViewer tvResults;
 
-	public EAttributeTableViewerColumn(final TableViewer tvResults, String label, final String attName, final IEclipseContext context) {
+	public EAttributeTableViewerColumn(final TableViewer tvResults, String label, final String attName,
+		final IEclipseContext context) {
 		this.tvResults = tvResults;
 		this.attName = attName;
 		tableViewerColumn = new TableViewerColumn(tvResults, SWT.NONE);
@@ -49,8 +50,8 @@ public EAttributeTableViewerColumn(final TableViewer tvResults, String label, fi
 		tableViewerColumn.setLabelProvider(new ColumnLabelProvider() {
 			@Override
 			public String getText(Object element) {
-				EObject eObject = (EObject) element;
-				EAttribute eAtt = EmfUtil.getAttribute(eObject, attName);
+				final EObject eObject = (EObject) element;
+				final EAttribute eAtt = EmfUtil.getAttribute(eObject, attName);
 				Object value;
 				if (eAtt != null) {
 					value = eObject.eGet(eAtt);
@@ -60,7 +61,7 @@ public String getText(Object element) {
 				switch (EAttributeEditingSupport.getAttributeType(element, attName)) {
 				case BOOLEAN:
 					// if no icons provided, use text instead of checkbox
-					return resourcePool == null && ((Boolean) value) ? "X" : ""; //$NON-NLS-1$ //$NON-NLS-2$
+					return resourcePool == null && (Boolean) value ? "X" : ""; //$NON-NLS-1$ //$NON-NLS-2$
 				case STRING:
 				case NOT_AN_ATTRIBUTE:
 				case OTHER:
@@ -74,12 +75,13 @@ public Image getImage(Object element) {
 				switch (EAttributeEditingSupport.getAttributeType(element, attName)) {
 				case BOOLEAN:
 					if (resourcePool != null) {
-						Object value = EmfUtil.getAttributeValue((EObject) element, attName);
+						final Object value = EmfUtil.getAttributeValue((EObject) element, attName);
 						if (value != null && value.equals(true)) {
 							return resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_checkbox_obj);
 						}
 					}
 					// fall through
+					//$FALL-THROUGH$
 				case STRING:
 				case NOT_AN_ATTRIBUTE:
 				case OTHER:
@@ -97,13 +99,12 @@ public Color getBackground(Object element) {
 	}
 
 	public Color getBackground(Object element) {
-		EObject eObject = (EObject) element;
-		EAttribute eAtt = EmfUtil.getAttribute(eObject, attName);
+		final EObject eObject = (EObject) element;
+		final EAttribute eAtt = EmfUtil.getAttribute(eObject, attName);
 		if (eAtt == null) {
 			return tvResults.getTable().getDisplay().getSystemColor(SWT.COLOR_GRAY);
-		} else {
-			return null;
 		}
+		return null;
 	}
 
 	public void dispose() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
index ccbfe5a976..8287cde6e7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Ongoing Maintenance
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation, Ongoing Maintenance
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
@@ -36,7 +36,7 @@ static public EAttribute getAttribute(EObject eObject, String attName) {
 		}
 		// return (EAttribute)
 		// eObject.eGet(eObject.eClass().getEStructuralFeature(attName));
-		for (EAttribute att : eObject.eClass().getEAllAttributes()) {
+		for (final EAttribute att : eObject.eClass().getEAllAttributes()) {
 			if (attName.equals(att.getName())) {
 				return att;
 			}
@@ -56,12 +56,11 @@ static public EAttribute getAttribute(EObject eObject, String attName) {
 	 *         or has null as the value.
 	 */
 	static public Object getAttributeValue(EObject eObject, String attName) {
-		EAttribute att = getAttribute(eObject, attName);
+		final EAttribute att = getAttribute(eObject, attName);
 		if (att == null) {
 			return null;
-		} else {
-			return eObject.eGet(att);
 		}
+		return eObject.eGet(att);
 	}
 
 	/**
@@ -70,15 +69,13 @@ static public Object getAttributeValue(EObject eObject, String attName) {
 	 *
 	 * @param eObject
 	 * @param attName
-	 * @return
 	 * @throws Exception
 	 */
 	static public Object getAttributeValueThrows(EObject eObject, String attName) throws Exception {
-		EAttribute att = getAttribute(eObject, attName);
+		final EAttribute att = getAttribute(eObject, attName);
 		if (att == null) {
 			throw new Exception(Messages.EmfUtil_ex_attribute_not_found + " : " + attName); //$NON-NLS-1$
-		} else {
-			return eObject.eGet(att);
 		}
+		return eObject.eGet(att);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index 43b5a992f2..268d734213 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -6,7 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555, Bug 436889, Bug 437372, Bug 440469, Ongoing Maintenance
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555, Bug 436889, Bug 437372, Bug 440469,
+ * Ongoing Maintenance
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
@@ -22,6 +23,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
+
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
@@ -36,6 +38,7 @@
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathFactory;
+
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -175,13 +178,13 @@ public void preDestroy() {
 
 	// save custom column and filter settings
 	public void saveSettings() {
-		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(Plugin.ID);
+		final IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(Plugin.ID);
 		try {
-			Document doc = DocUtil.createDocument("list-tab"); //$NON-NLS-1$
-			Element cols = DocUtil.createChild(doc.getDocumentElement(), "columns"); //$NON-NLS-1$
+			final Document doc = DocUtil.createDocument("list-tab"); //$NON-NLS-1$
+			final Element cols = DocUtil.createChild(doc.getDocumentElement(), "columns"); //$NON-NLS-1$
 
 			final ArrayList<TableColumn> allCols = TableViewerUtil.getColumnsInDisplayOrder(tvResults);
-			for (TableColumn col : allCols) {
+			for (final TableColumn col : allCols) {
 				String id;
 				if (requiredColumns.containsValue(col)) {
 					id = getKey(requiredColumns, col);
@@ -191,35 +194,35 @@ public void saveSettings() {
 				saveColumn(cols, id, col);
 			}
 
-			Element filters = DocUtil.createChild(doc.getDocumentElement(), "filters"); //$NON-NLS-1$
+			final Element filters = DocUtil.createChild(doc.getDocumentElement(), "filters"); //$NON-NLS-1$
 			if (E.notEmpty(filterByAttrName)) {
-				Element filter = DocUtil.createChild(filters, "filter"); //$NON-NLS-1$
+				final Element filter = DocUtil.createChild(filters, "filter"); //$NON-NLS-1$
 				DocUtil.createChild(filter, "type").setTextContent("attribute"); //$NON-NLS-1$//$NON-NLS-2$
 				DocUtil.createChild(filter, "condition").setTextContent(filterByAttrName); //$NON-NLS-1$
 				DocUtil.createChild(filter, "emptyOption").setTextContent(filterByAttrEmptyOption.name()); //$NON-NLS-1$
 			}
 			if (E.notEmpty(filterByItemName)) {
-				Element filter = DocUtil.createChild(filters, "filter"); //$NON-NLS-1$
+				final Element filter = DocUtil.createChild(filters, "filter"); //$NON-NLS-1$
 				DocUtil.createChild(filter, "type").setTextContent("item"); //$NON-NLS-1$ //$NON-NLS-2$
 				DocUtil.createChild(filter, "condition").setTextContent(filterByItemName); //$NON-NLS-1$
 			}
 
 			pref.put("list-tab-xml", docToString(doc)); //$NON-NLS-1$
-		} catch (ParserConfigurationException e1) {
+		} catch (final ParserConfigurationException e1) {
 			e1.printStackTrace();
-		} catch (TransformerException e) {
+		} catch (final TransformerException e) {
 			e.printStackTrace();
 		}
 
 		try {
 			pref.flush();
-		} catch (BackingStoreException e) {
+		} catch (final BackingStoreException e) {
 			e.printStackTrace();
 		}
 	}
 
 	private String getKey(Map<String, ?> map, Object value) {
-		for (Entry<String, ?> entry : map.entrySet()) {
+		for (final Entry<String, ?> entry : map.entrySet()) {
 			if (entry.getValue().equals(value)) {
 				return entry.getKey();
 			}
@@ -228,37 +231,38 @@ private String getKey(Map<String, ?> map, Object value) {
 	}
 
 	private void saveColumn(Element eleCols, String columnName, TableColumn objCol) {
-		Element col = DocUtil.createChild(eleCols, "column"); //$NON-NLS-1$
+		final Element col = DocUtil.createChild(eleCols, "column"); //$NON-NLS-1$
 
 		DocUtil.createChild(col, "attribute").setTextContent(columnName); //$NON-NLS-1$
 
-		Integer width = objCol.getWidth();
+		final Integer width = objCol.getWidth();
 		DocUtil.createChild(col, "width").setTextContent(width.toString()); //$NON-NLS-1$
 	}
 
 	// load custom column and filter settings
 	private void loadSettings() {
-		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(Plugin.ID);
+		final IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(Plugin.ID);
 
-		boolean restoreColumns = pref.getBoolean(ModelEditorPreferences.LIST_TAB_REMEMBER_COLUMNS, false);
-		boolean restoreFilters = pref.getBoolean(ModelEditorPreferences.LIST_TAB_REMEMBER_FILTERS, false);
+		final boolean restoreColumns = pref.getBoolean(ModelEditorPreferences.LIST_TAB_REMEMBER_COLUMNS, false);
+		final boolean restoreFilters = pref.getBoolean(ModelEditorPreferences.LIST_TAB_REMEMBER_FILTERS, false);
 		if (!restoreColumns && !restoreFilters) {
 			return;
 		}
 
-		String xml = pref.get("list-tab-xml", ""); //$NON-NLS-1$ //$NON-NLS-2$
+		final String xml = pref.get("list-tab-xml", ""); //$NON-NLS-1$ //$NON-NLS-2$
 		if (E.notEmpty(xml)) {
 			try {
-				Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(xml)));
-				XPath xpath = XPathFactory.newInstance().newXPath();
+				final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder()
+					.parse(new InputSource(new StringReader(xml)));
+				final XPath xpath = XPathFactory.newInstance().newXPath();
 				NodeList list;
 				if (restoreColumns) {
 					// restore columns and column widths
 					list = (NodeList) xpath.evaluate("//columns/column", doc, XPathConstants.NODESET); //$NON-NLS-1$
 					for (int i = 0; i < list.getLength(); i++) {
-						Element ele = (Element) list.item(i);
+						final Element ele = (Element) list.item(i);
 						TableColumn col;
-						String colName = xpath.evaluate("attribute/text()", ele); //$NON-NLS-1$
+						final String colName = xpath.evaluate("attribute/text()", ele); //$NON-NLS-1$
 						if (colName.isEmpty()) {
 							continue;
 						}
@@ -268,8 +272,8 @@ private void loadSettings() {
 						}
 
 						// move it to the end of the list.
-						int currentIndex = TableViewerUtil.getVisibleColumnIndex(tvResults, col);
-						int[] order = tvResults.getTable().getColumnOrder();
+						final int currentIndex = TableViewerUtil.getVisibleColumnIndex(tvResults, col);
+						final int[] order = tvResults.getTable().getColumnOrder();
 						for (int idx = 0; idx < order.length; idx++) {
 							if (order[idx] > currentIndex) {
 								order[idx]--;
@@ -285,10 +289,10 @@ private void loadSettings() {
 						// col = colItem;
 						// }
 
-						String sWidth = xpath.evaluate("width/text()", ele); //$NON-NLS-1$
+						final String sWidth = xpath.evaluate("width/text()", ele); //$NON-NLS-1$
 						try {
 							col.setWidth(Integer.parseInt(sWidth));
-						} catch (Exception e) {
+						} catch (final Exception e) {
 						}
 					}
 				}
@@ -297,43 +301,43 @@ private void loadSettings() {
 					// restore filters
 					list = (NodeList) xpath.evaluate("//filters/filter", doc, XPathConstants.NODESET); //$NON-NLS-1$
 					for (int i = 0; i < list.getLength(); i++) {
-						Element ele = (Element) list.item(i);
-						String type = xpath.evaluate("type/text()", ele); //$NON-NLS-1$
-						String condition = xpath.evaluate("condition/text()", ele); //$NON-NLS-1$
-						String emptyOption = xpath.evaluate("emptyOption/text()", ele); //$NON-NLS-1$
+						final Element ele = (Element) list.item(i);
+						final String type = xpath.evaluate("type/text()", ele); //$NON-NLS-1$
+						final String condition = xpath.evaluate("condition/text()", ele); //$NON-NLS-1$
+						final String emptyOption = xpath.evaluate("emptyOption/text()", ele); //$NON-NLS-1$
 						if ("item".equals(type)) { //$NON-NLS-1$
 							filterByItem(condition);
 						} else if ("attribute".equals(type)) { //$NON-NLS-1$
 							EmptyFilterOption emptyFilterOption;
 							try {
 								emptyFilterOption = EmptyFilterOption.valueOf(emptyOption);
-							} catch (Exception e) {
+							} catch (final Exception e) {
 								emptyFilterOption = EmptyFilterOption.INCLUDE;
 							}
 							filterByAttribute(condition, emptyFilterOption);
 						}
 					}
 				}
-			} catch (Exception e) {
+			} catch (final Exception e) {
 			}
 		}
 	}
 
 	// @Refactor
 	static private String docToString(Document doc) throws TransformerException {
-		TransformerFactory tf = TransformerFactory.newInstance();
-		Transformer transformer = tf.newTransformer();
+		final TransformerFactory tf = TransformerFactory.newInstance();
+		final Transformer transformer = tf.newTransformer();
 		transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); //$NON-NLS-1$
-		StringWriter writer = new StringWriter();
+		final StringWriter writer = new StringWriter();
 		transformer.transform(new DOMSource(doc), new StreamResult(writer));
-		String output = writer.getBuffer().toString().replaceAll("\n|\r", ""); //$NON-NLS-1$ //$NON-NLS-2$
+		final String output = writer.getBuffer().toString().replaceAll("\n|\r", ""); //$NON-NLS-1$ //$NON-NLS-2$
 		return output;
 	}
 
 	// @Refactor
 	static String join(Collection<String> items, String separator) {
-		StringBuilder sb = new StringBuilder();
-		for (String item : items) {
+		final StringBuilder sb = new StringBuilder();
+		for (final String item : items) {
 			sb.append(item);
 			sb.append(separator);
 		}
@@ -355,7 +359,7 @@ public void widgetDisposed(DisposeEvent e) {
 		});
 		try {
 			imgMarkedItem = imageCache.create(Plugin.ID, "/icons/full/obj16/mark_occurrences.png"); //$NON-NLS-1$
-		} catch (Exception e2) {
+		} catch (final Exception e2) {
 			e2.printStackTrace();
 		}
 
@@ -374,7 +378,7 @@ public void documentAboutToBeChanged(DocumentEvent event) {
 
 		tabItem = new CTabItem(tabFolder, SWT.NONE, 1);
 
-		Composite composite = new Composite(tabFolder, SWT.NONE);
+		final Composite composite = new Composite(tabFolder, SWT.NONE);
 		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		composite.setLayout(new GridLayout(2, false));
 		tabItem.setControl(composite);
@@ -386,19 +390,19 @@ public void documentAboutToBeChanged(DocumentEvent event) {
 		toolBar.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
 
 		{
-			ToolItem button = new ToolItem(toolBar, SWT.PUSH);
+			final ToolItem button = new ToolItem(toolBar, SWT.PUSH);
 			button.setText(Messages.ListTab_addColumn + ELIPSIS);
 			button.setImage(imageCache.create("/icons/full/obj16/add_column.gif")); //$NON-NLS-1$
 
 			button.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					TitleAreaFilterDialogWithEmptyOptions dlg = createEObjectAttributePicker(Messages.ListTab_addColumn);
+					final TitleAreaFilterDialogWithEmptyOptions dlg = createEObjectAttributePicker(Messages.ListTab_addColumn);
 					dlg.setShowEmptyOptions(false);
 					if (dlg.open() == Window.OK) {
 						// Add Column
-						String attName = dlg.getFirstElement().toString();
-						EAttributeTableViewerColumn col = addColumn(attName);
+						final String attName = dlg.getFirstElement().toString();
+						final EAttributeTableViewerColumn col = addColumn(attName);
 						col.getTableViewerColumn().getColumn().pack();
 						tvResults.refresh();
 					}
@@ -407,14 +411,14 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		{
-			ToolItem button = new ToolItem(toolBar, SWT.PUSH);
+			final ToolItem button = new ToolItem(toolBar, SWT.PUSH);
 			button.setText(Messages.ListTab_resetColumns);
 			button.setImage(imageCache.create("/icons/full/obj16/reset_columns.gif")); //$NON-NLS-1$
 
 			button.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					for (EAttributeTableViewerColumn col : optionalColumns.values()) {
+					for (final EAttributeTableViewerColumn col : optionalColumns.values()) {
 						col.dispose();
 					}
 					optionalColumns.clear();
@@ -438,7 +442,7 @@ public void widgetSelected(SelectionEvent e) {
 					if (dlg.open() == Window.OK) {
 						filterByItem(dlg.getFirstElement().toString());
 					}
-				};
+				}
 			});
 		}
 
@@ -451,11 +455,11 @@ public void widgetSelected(SelectionEvent e) {
 			filterByAttribute.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					TitleAreaFilterDialogWithEmptyOptions dlg = createEObjectAttributePicker(Messages.ListTab_filterByAttribute);
+					final TitleAreaFilterDialogWithEmptyOptions dlg = createEObjectAttributePicker(Messages.ListTab_filterByAttribute);
 					if (dlg.open() == Window.OK) {
 						filterByAttribute(dlg.getFirstElement().toString(), dlg.getEmptyFilterOption());
 					}
-				};
+				}
 			});
 		}
 
@@ -472,7 +476,7 @@ public void widgetSelected(SelectionEvent e) {
 					tvResults.setFilters(new ViewerFilter[0]);
 					filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS);
 					filterByAttribute.setText(Messages.ListTab_markAttribute + ELIPSIS);
-				};
+				}
 			});
 		}
 
@@ -482,7 +486,7 @@ public void widgetSelected(SelectionEvent e) {
 			final E4ToolItemMenu tiCommands = new E4ToolItemMenu(toolBar, context);
 			tiCommands.getToolItem().setImage(imageCache.create("/icons/full/obj16/command.gif")); //$NON-NLS-1$
 
-			ArrayList<String> commandIds = new ArrayList<String>();
+			final ArrayList<String> commandIds = new ArrayList<String>();
 			commandIds.add("org.eclipse.e4.tools.emf.ui.command.mark_duplicate_attributes"); //$NON-NLS-1$
 			commandIds.add("org.eclipse.e4.tools.emf.ui.command.mark_duplicate_ids"); //$NON-NLS-1$
 			commandIds.add("org.eclipse.e4.tools.emf.ui.command.mark_duplicate_labels"); //$NON-NLS-1$
@@ -530,12 +534,12 @@ public String getText(Object element) {
 			@Override
 			public String getText(Object element) {
 				return ""; //$NON-NLS-1$
-			};
+			}
 
 			@Override
 			public Image getImage(Object element) {
 				return imgXmi;
-			};
+			}
 		});
 
 		tvResults.getTable().addMouseListener(new MouseAdapter() {
@@ -560,10 +564,8 @@ public Image getImage(Object element) {
 				if (isHighlighted(element)) {
 					try {
 						ret = imgMarkedItem;
-					} catch (Exception e) {
+					} catch (final Exception e) {
 					}
-				} else {
-					ret = null;
 				}
 				return ret;
 			}
@@ -580,17 +582,19 @@ public String getText(Object element) {
 		colItem.setLabelProvider(new ColumnLabelProvider_Markable() {
 			@Override
 			public String getText(Object element) {
-				EObject eObject = (EObject) element;
+				final EObject eObject = (EObject) element;
 				return super.getText(eObject.eClass().getName());
 			}
 		});
 
 		app.getContext().set("org.eclipse.e4.tools.active-object-viewer", this); //$NON-NLS-1$
 
-		EAttributeTableViewerColumn colId = new EAttributeTableViewerColumn(tvResults, "elementId", "elementId", context); //$NON-NLS-1$//$NON-NLS-2$
+		final EAttributeTableViewerColumn colId = new EAttributeTableViewerColumn(tvResults,
+			"elementId", "elementId", context); //$NON-NLS-1$//$NON-NLS-2$
 		defaultColumns.put("elementId", colId); //$NON-NLS-1$
 
-		EAttributeTableViewerColumn colLabel = new EAttributeTableViewerColumn_Markable(tvResults, "label", "label", context); //$NON-NLS-1$//$NON-NLS-2$
+		final EAttributeTableViewerColumn colLabel = new EAttributeTableViewerColumn_Markable(tvResults,
+			"label", "label", context); //$NON-NLS-1$//$NON-NLS-2$
 		defaultColumns.put("label", colLabel); //$NON-NLS-1$
 
 		// Custom selection for marked items
@@ -599,14 +603,16 @@ public String getText(Object element) {
 			public void handleEvent(Event event) {
 				event.detail &= ~SWT.HOT;
 				if ((event.detail & SWT.SELECTED) == 0)
+				{
 					return; // / item not selected
+				}
 
-				TableItem item = (TableItem) event.item;
+				final TableItem item = (TableItem) event.item;
 				if (isHighlighted(item.getData())) {
 
-					Table table = (Table) event.widget;
-					int clientWidth = table.getClientArea().width;
-					GC gc = event.gc;
+					final Table table = (Table) event.widget;
+					final int clientWidth = table.getClientArea().width;
+					final GC gc = event.gc;
 					// Color oldForeground = gc.getForeground();
 					// Color oldBackground = gc.getBackground();
 
@@ -626,19 +632,21 @@ public void handleEvent(Event event) {
 		for (final EAttributeTableViewerColumn col : defaultColumns.values()) {
 			col.getTableViewerColumn().getColumn().setMoveable(true);
 		}
-		for (TableColumn col : requiredColumns.values()) {
+		for (final TableColumn col : requiredColumns.values()) {
 			col.setMoveable(true);
 		}
 
-		makeSortable(colId.getTableViewerColumn().getColumn(), new AttributeColumnLabelSorter(colId.getTableViewerColumn().getColumn(), "elementId")); //$NON-NLS-1$
-		makeSortable(colLabel.getTableViewerColumn().getColumn(), new AttributeColumnLabelSorter(colLabel.getTableViewerColumn().getColumn(), "label")); //$NON-NLS-1$
+		makeSortable(colId.getTableViewerColumn().getColumn(), new AttributeColumnLabelSorter(colId
+			.getTableViewerColumn().getColumn(), "elementId")); //$NON-NLS-1$
+		makeSortable(colLabel.getTableViewerColumn().getColumn(), new AttributeColumnLabelSorter(colLabel
+			.getTableViewerColumn().getColumn(), "label")); //$NON-NLS-1$
 		makeSortable(colItem.getColumn(), new TableViewerUtil.ColumnLabelSorter(colItem.getColumn()));
 		makeSortable(colMarked.getColumn(), new TableViewerUtil.AbstractInvertableTableSorter() {
 
 			@Override
 			public int compare(Viewer viewer, Object e1, Object e2) {
-				boolean mark1 = isHighlighted(e1);
-				boolean mark2 = isHighlighted(e2);
+				final boolean mark1 = isHighlighted(e1);
+				final boolean mark2 = isHighlighted(e2);
 				if (mark1 && !mark2) {
 					return -1;
 				} else if (mark2 && !mark1) {
@@ -682,12 +690,12 @@ public void highlightEObjects(Collection<EObject> items) {
 
 	@Override
 	public List<EObject> getAllEObjects() {
-		ArrayList<EObject> list = new ArrayList<EObject>();
-		TreeIterator<Object> itTree = EcoreUtil.getAllContents(modelResource.getRoot());
+		final ArrayList<EObject> list = new ArrayList<EObject>();
+		final TreeIterator<Object> itTree = EcoreUtil.getAllContents(modelResource.getRoot());
 		while (itTree.hasNext()) {
-			Object object = itTree.next();
-			EObject eObject = (EObject) object;
-			EAttribute att = EmfUtil.getAttribute(eObject, "elementId"); //$NON-NLS-1$
+			final Object object = itTree.next();
+			final EObject eObject = (EObject) object;
+			final EAttribute att = EmfUtil.getAttribute(eObject, "elementId"); //$NON-NLS-1$
 			if (att != null) {
 				list.add(eObject);
 			}
@@ -697,8 +705,8 @@ public List<EObject> getAllEObjects() {
 
 	@Override
 	public Collection<EObject> getSelectedEObjects() {
-		ArrayList<EObject> selected = new ArrayList<EObject>();
-		for (Object item : ((IStructuredSelection) tvResults.getSelection()).toList()) {
+		final ArrayList<EObject> selected = new ArrayList<EObject>();
+		for (final Object item : ((IStructuredSelection) tvResults.getSelection()).toList()) {
 			if (item instanceof EObject) {
 				selected.add((EObject) item);
 
@@ -710,7 +718,7 @@ public Collection<EObject> getSelectedEObjects() {
 	@Override
 	public void deleteEObjects(Collection<EObject> list) {
 		if (list.isEmpty() == false) {
-			Command cmd = DeleteCommand.create(modelResource.getEditingDomain(), list);
+			final Command cmd = DeleteCommand.create(modelResource.getEditingDomain(), list);
 			if (cmd.canExecute()) {
 				modelResource.getEditingDomain().getCommandStack().execute(cmd);
 			}
@@ -721,9 +729,9 @@ public void deleteEObjects(Collection<EObject> list) {
 	private TitleAreaFilterDialogWithEmptyOptions createEObjectAttributePicker(final String title) {
 		// Get Attribute Names
 		final HashSet<String> set = new HashSet<String>();
-		Collection<EObject> allEObjects = getAllEObjects();
-		for (EObject obj : allEObjects) {
-			for (EAttribute attribute : obj.eClass().getEAllAttributes()) {
+		final Collection<EObject> allEObjects = getAllEObjects();
+		for (final EObject obj : allEObjects) {
+			for (final EAttribute attribute : obj.eClass().getEAllAttributes()) {
 				set.add(attribute.getName());
 			}
 		}
@@ -731,20 +739,21 @@ private TitleAreaFilterDialogWithEmptyOptions createEObjectAttributePicker(final
 		Collections.sort(sorted);
 
 		// Select Attribute
-		ILabelProvider renderer = new LabelProvider() {
+		final ILabelProvider renderer = new LabelProvider() {
 			@Override
 			public String getText(Object element) {
 				return String.valueOf(element);
 			}
 		};
-		TitleAreaFilterDialogWithEmptyOptions dlg = new TitleAreaFilterDialogWithEmptyOptions(context.get(Shell.class), renderer) {
+		final TitleAreaFilterDialogWithEmptyOptions dlg = new TitleAreaFilterDialogWithEmptyOptions(
+			context.get(Shell.class), renderer) {
 			@Override
 			protected Control createContents(Composite parent) {
-				Control ret = super.createContents(parent);
+				final Control ret = super.createContents(parent);
 				setMessage(Messages.ListTab_selectAnAttribute);
 				try {
 					setTitleImage(imageCache.create(Plugin.ID, "/icons/full/wizban/attribute_wiz.gif")); //$NON-NLS-1$
-				} catch (Exception e) {
+				} catch (final Exception e) {
 					e.printStackTrace();
 				}
 				setTitle(title);
@@ -758,25 +767,25 @@ protected Control createContents(Composite parent) {
 	private TitleAreaFilterDialog createElementTypePicker(final String title) {
 		// Get Attribute Names
 		final HashSet<String> set = new HashSet<String>();
-		Collection<EObject> allEObjects = getAllEObjects();
-		for (EObject obj : allEObjects) {
+		final Collection<EObject> allEObjects = getAllEObjects();
+		for (final EObject obj : allEObjects) {
 			set.add(obj.eClass().getName());
 		}
 
 		final ArrayList<String> sorted = new ArrayList<String>(set);
 		Collections.sort(sorted);
 
-		ILabelProvider renderer = new LabelProvider() {
+		final ILabelProvider renderer = new LabelProvider() {
 			@Override
 			public String getText(Object element) {
 				return String.valueOf(element);
 			}
 		};
-		TitleAreaFilterDialog dlg = new TitleAreaFilterDialog(context.get(Shell.class), renderer) {
+		final TitleAreaFilterDialog dlg = new TitleAreaFilterDialog(context.get(Shell.class), renderer) {
 
 			@Override
 			protected Control createContents(Composite parent) {
-				Control ret = super.createContents(parent);
+				final Control ret = super.createContents(parent);
 				setMessage(Messages.ListTab_selectAType);
 				setTitle(title);
 				setElements(sorted.toArray(new String[0]));
@@ -800,7 +809,8 @@ private EAttributeTableViewerColumn addColumn(String attName) {
 				colName = new EAttributeTableViewerColumn_Markable(tvResults, attName, attName, context);
 				optionalColumns.put(attName, colName);
 				colName.getTableViewerColumn().getColumn().setMoveable(true);
-				makeSortable(colName.getTableViewerColumn().getColumn(), new AttributeColumnLabelSorter(colName.getTableViewerColumn().getColumn(), attName));
+				makeSortable(colName.getTableViewerColumn().getColumn(), new AttributeColumnLabelSorter(colName
+					.getTableViewerColumn().getColumn(), attName));
 				tvResults.refresh();
 			}
 		}
@@ -809,7 +819,7 @@ private EAttributeTableViewerColumn addColumn(String attName) {
 
 	static private class AttributeColumnLabelSorter extends TableViewerUtil.ColumnLabelSorter {
 
-		private String attName;
+		private final String attName;
 
 		AttributeColumnLabelSorter(TableColumn col, String attName) {
 			super(col);
@@ -819,26 +829,26 @@ static private class AttributeColumnLabelSorter extends TableViewerUtil.ColumnLa
 		@Override
 		public int compare(Viewer viewer, Object e1, Object e2) {
 			// if either is boolean, use boolean value, otherwise use text value
-			ATT_TYPE e1Type = EAttributeEditingSupport.getAttributeType(e1, attName);
-			ATT_TYPE e2Type = EAttributeEditingSupport.getAttributeType(e2, attName);
+			final ATT_TYPE e1Type = EAttributeEditingSupport.getAttributeType(e1, attName);
+			final ATT_TYPE e2Type = EAttributeEditingSupport.getAttributeType(e2, attName);
 			if (e1Type == ATT_TYPE.BOOLEAN || e2Type == ATT_TYPE.BOOLEAN) {
-				Boolean b1 = (Boolean) (EmfUtil.getAttributeValue((EObject) e1, attName));
-				Boolean b2 = (Boolean) (EmfUtil.getAttributeValue((EObject) e2, attName));
+				final Boolean b1 = (Boolean) EmfUtil.getAttributeValue((EObject) e1, attName);
+				final Boolean b2 = (Boolean) EmfUtil.getAttributeValue((EObject) e2, attName);
 				if (b1 == null && b2 != null) {
 					return -2;
 				} else if (b2 == null && b1 != null) {
 					return 2;
 				} else {
-					return (b1.compareTo(b2));
+					return b1.compareTo(b2);
 				}
-			} else {
-				return super.compare(viewer, e1, e2);
 			}
+			return super.compare(viewer, e1, e2);
 		}
 	}
 
 	private class EAttributeTableViewerColumn_Markable extends EAttributeTableViewerColumn {
-		public EAttributeTableViewerColumn_Markable(TableViewer tvResults, String label, String attName, IEclipseContext context) {
+		public EAttributeTableViewerColumn_Markable(TableViewer tvResults, String label, String attName,
+			IEclipseContext context) {
 			super(tvResults, label, attName, context);
 		}
 
@@ -882,7 +892,7 @@ private void filterByItem(String name) {
 		filterByAttrEmptyOption = null;
 		mapId_Object.clear();
 		final ArrayList<EObject> filtered = new ArrayList<EObject>();
-		for (EObject object : getAllEObjects()) {
+		for (final EObject object : getAllEObjects()) {
 			if (object.eClass().getName().equals(filterByItemName)) {
 				filtered.add(object);
 				// filter.setText(Messages.ListTab_7 +
@@ -890,7 +900,7 @@ private void filterByItem(String name) {
 
 			}
 
-			ViewerFilter viewerFilter = new ViewerFilter() {
+			final ViewerFilter viewerFilter = new ViewerFilter() {
 
 				@Override
 				public boolean select(Viewer viewer, Object parentElement, Object element) {
@@ -910,10 +920,10 @@ private void filterByAttribute(String name, final EmptyFilterOption emptyOption)
 		filterByItemName = null;
 		mapId_Object.clear();
 		final ArrayList<EObject> filtered = new ArrayList<EObject>();
-		for (EObject object : getAllEObjects()) {
+		for (final EObject object : getAllEObjects()) {
 			if (EmfUtil.getAttribute(object, filterByAttrName) != null) {
 				filtered.add(object);
-				ViewerFilter viewerFilter = new ViewerFilter() {
+				final ViewerFilter viewerFilter = new ViewerFilter() {
 
 					@Override
 					public boolean select(Viewer viewer, Object parentElement, Object element) {
@@ -931,7 +941,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 								return filtered.contains(element);
 							}
 						case ONLY:
-							if (E.notEmpty((EmfUtil.getAttributeValue((EObject) element, filterByAttrName)))) {
+							if (E.notEmpty(EmfUtil.getAttributeValue((EObject) element, filterByAttrName))) {
 								return false;
 							} else {
 								return true;
@@ -952,13 +962,13 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 
 			}
 		}
-		TableViewerColumn viewerColumn = addColumn(filterByAttrName).getTableViewerColumn();
+		final TableViewerColumn viewerColumn = addColumn(filterByAttrName).getTableViewerColumn();
 		viewerColumn.getColumn().pack();
 	}
 
 	@Override
 	public void autosizeContent() {
-		for (TableColumn col : tvResults.getTable().getColumns()) {
+		for (final TableColumn col : tvResults.getTable().getColumns()) {
 			col.pack();
 			if (col.getWidth() < 10) {
 				col.setWidth(10);
@@ -968,7 +978,7 @@ public void autosizeContent() {
 
 	@Override
 	public void resetToDefault() {
-		for (EAttributeTableViewerColumn col : optionalColumns.values()) {
+		for (final EAttributeTableViewerColumn col : optionalColumns.values()) {
 			col.dispose();
 		}
 		optionalColumns.clear();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java
index 8f6a4cab91..b667d444a8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty;
 
@@ -35,11 +35,11 @@ public static boolean notEmpty(Object object) {
 	}
 
 	public static boolean isEmpty(String object) {
-		return (object == null || object.isEmpty());
+		return object == null || object.isEmpty();
 	}
 
 	public static boolean isEmpty(Collection<?> object) {
-		return (object == null || object.isEmpty());
+		return object == null || object.isEmpty();
 	}
 
 	public static boolean isEmpty(Object object) {
@@ -65,9 +65,8 @@ static public boolean equals(Object obj1, Object obj2) {
 		if (obj1 == null) {
 			if (obj2 == null) {
 				return true;
-			} else {
-				return false;
 			}
+			return false;
 		} else if (obj2 == null) {
 			return false;
 		} else {
@@ -88,9 +87,8 @@ static public <T> int compareTo(Comparable<T> obj1, T obj2) {
 		if (obj1 == null) {
 			if (obj2 == null) {
 				return 0;
-			} else {
-				return -1;
 			}
+			return -1;
 		} else if (obj2 == null) {
 			return 1;
 		} else {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index 2b6e112737..6c67aae0bb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -6,17 +6,19 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Tracy Miranda <tracymiranda@yahoo.com> - bugfix for 430663
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Tracy Miranda <tracymiranda@yahoo.com> - bugfix for 430663
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -47,7 +49,7 @@ public class VApplicationAddons extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private EMFDataBindingContext context;
 
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	public VApplicationAddons() {
@@ -56,12 +58,13 @@ public VApplicationAddons() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.VApplicationAddons_AddAddon, createImageDescriptor(ResourceProvider.IMG_Addons)) {
-			@Override
-			public void run() {
-				handleAddAddon();
-			}
-		});
+		actions
+			.add(new Action(Messages.VApplicationAddons_AddAddon, createImageDescriptor(ResourceProvider.IMG_Addons)) {
+				@Override
+				public void run() {
+					handleAddAddon();
+				}
+			});
 	}
 
 	@Override
@@ -90,27 +93,29 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
 		{
-			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, ApplicationPackageImpl.Literals.APPLICATION__ADDONS) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
+				Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
+				ApplicationPackageImpl.Literals.APPLICATION__ADDONS) {
 				@Override
 				protected void addPressed() {
 					handleAddAddon();
-				};
+				}
 
 				@Override
 				protected List<?> getContainerChildren(Object container) {
@@ -127,10 +132,11 @@ protected List<?> getContainerChildren(Object container) {
 	}
 
 	private void handleAddAddon() {
-		MAddon addon = MApplicationFactory.INSTANCE.createAddon();
+		final MAddon addon = MApplicationFactory.INSTANCE.createAddon();
 		setElementId(addon);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__ADDONS, addon);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			ApplicationPackageImpl.Literals.APPLICATION__ADDONS, addon);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -145,7 +151,7 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 226c656e5e..95d4ce8cba 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -6,16 +6,18 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.services.nls.Translation;
@@ -52,9 +54,9 @@ public class VCommandEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
 
-	private EStructuralFeature commandsFeature;
-	private List<Action> actions = new ArrayList<Action>();
-	private List<Action> actionsImport = new ArrayList<Action>();
+	private final EStructuralFeature commandsFeature;
+	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actionsImport = new ArrayList<Action>();
 
 	@Inject
 	@Translation
@@ -63,19 +65,21 @@ public class VCommandEditor extends AbstractComponentEditor {
 	@Inject
 	public VCommandEditor() {
 		super();
-		this.commandsFeature = ApplicationPackageImpl.Literals.APPLICATION__COMMANDS;
+		commandsFeature = ApplicationPackageImpl.Literals.APPLICATION__COMMANDS;
 	}
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.VCommandEditor_AddCommand, createImageDescriptor(ResourceProvider.IMG_Command)) {
-			@Override
-			public void run() {
-				handleAdd();
-			}
-		});
+		actions
+			.add(new Action(Messages.VCommandEditor_AddCommand, createImageDescriptor(ResourceProvider.IMG_Command)) {
+				@Override
+				public void run() {
+					handleAdd();
+				}
+			});
 
-		actionsImport.add(new Action(Messages.VCommandEditor_ImportCommands, createImageDescriptor(ResourceProvider.IMG_Command)) {
+		actionsImport.add(new Action(Messages.VCommandEditor_ImportCommands,
+			createImageDescriptor(ResourceProvider.IMG_Command)) {
 			@Override
 			public void run() {
 				handleImport();
@@ -109,27 +113,29 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
 		{
-			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, ApplicationPackageImpl.Literals.APPLICATION__COMMANDS) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
+				Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
+				ApplicationPackageImpl.Literals.APPLICATION__COMMANDS) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
-				};
+				}
 
 				@Override
 				protected List<?> getContainerChildren(Object container) {
@@ -146,13 +152,13 @@ protected List<?> getContainerChildren(Object container) {
 	}
 
 	protected void handleAdd() {
-		MCommand command = CommandsFactoryImpl.eINSTANCE.createCommand();
+		final MCommand command = CommandsFactoryImpl.eINSTANCE.createCommand();
 		addCommand(command);
 	}
 
 	private void addCommand(MCommand command) {
 		setElementId(command);
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), commandsFeature, command);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), commandsFeature, command);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -161,11 +167,11 @@ private void addCommand(MCommand command) {
 	}
 
 	protected void handleImport() {
-		ModelImportWizard wizard = new ModelImportWizard(MCommand.class, this, resourcePool);
-		WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
+		final ModelImportWizard wizard = new ModelImportWizard(MCommand.class, this, resourcePool);
+		final WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
 		if (wizardDialog.open() == Window.OK) {
-			MCommand[] elements = (MCommand[]) wizard.getElements(MCommand.class);
-			for (MCommand mCommand : elements) {
+			final MCommand[] elements = (MCommand[]) wizard.getElements(MCommand.class);
+			for (final MCommand mCommand : elements) {
 				addCommand(mCommand);
 			}
 		}
@@ -178,14 +184,14 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	@Override
 	public List<Action> getActionsImport(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actionsImport);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 80c3673857..97e6c33872 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -6,16 +6,18 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -48,8 +50,8 @@ public class VHandlerEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private List<Action> actions = new ArrayList<Action>();
-	private List<Action> actionsImport = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actionsImport = new ArrayList<Action>();
 
 	@Inject
 	public VHandlerEditor() {
@@ -58,15 +60,17 @@ public VHandlerEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.VHandlerEditor_AddHandler, createImageDescriptor(ResourceProvider.IMG_Handler)) {
-			@Override
-			public void run() {
-				handleAdd();
-			}
-		});
+		actions
+			.add(new Action(Messages.VHandlerEditor_AddHandler, createImageDescriptor(ResourceProvider.IMG_Handler)) {
+				@Override
+				public void run() {
+					handleAdd();
+				}
+			});
 
 		// -- import --
-		actionsImport.add(new Action(Messages.VHandlerEditor_AddHandler, createImageDescriptor(ResourceProvider.IMG_Handler)) {
+		actionsImport.add(new Action(Messages.VHandlerEditor_AddHandler,
+			createImageDescriptor(ResourceProvider.IMG_Handler)) {
 			@Override
 			public void run() {
 				handleImport();
@@ -100,23 +104,25 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
 		{
-			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
+				Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
+				CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
@@ -126,9 +132,8 @@ protected void addPressed() {
 				protected List<?> getContainerChildren(Object container) {
 					if (container instanceof MHandlerContainer) {
 						return ((MHandlerContainer) container).getHandlers();
-					} else {
-						return null;
 					}
+					return null;
 				}
 			};
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
@@ -146,13 +151,14 @@ public IObservableList getChildList(Object element) {
 	}
 
 	protected void handleAdd() {
-		MHandler handler = MCommandsFactory.INSTANCE.createHandler();
+		final MHandler handler = MCommandsFactory.INSTANCE.createHandler();
 		addToModel(handler);
 	}
 
 	private void addToModel(MHandler handler) {
 		setElementId(handler);
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, handler);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, handler);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 			getEditor().setSelection(handler);
@@ -160,11 +166,11 @@ private void addToModel(MHandler handler) {
 	}
 
 	protected void handleImport() {
-		ModelImportWizard wizard = new ModelImportWizard(MHandler.class, this, resourcePool);
-		WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
+		final ModelImportWizard wizard = new ModelImportWizard(MHandler.class, this, resourcePool);
+		final WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
 		if (wizardDialog.open() == Window.OK) {
-			MHandler[] elements = (MHandler[]) wizard.getElements(MHandler.class);
-			for (MHandler handler : elements) {
+			final MHandler[] elements = (MHandler[]) wizard.getElements(MHandler.class);
+			for (final MHandler handler : elements) {
 				addToModel(handler);
 			}
 		}
@@ -172,14 +178,14 @@ protected void handleImport() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	@Override
 	public List<Action> getActionsImport(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
 		l.addAll(actionsImport);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
index 1084fb64c6..f0ea6bbada 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -6,16 +6,18 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -47,9 +49,10 @@ public class VItemParametersEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
-	private IEMFListProperty HANDLED_ITEM__PARAMETERS = EMFProperties.list(MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
+	private final IEMFListProperty HANDLED_ITEM__PARAMETERS = EMFProperties
+		.list(MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
 
 	@Inject
 	public VItemParametersEditor() {
@@ -58,7 +61,8 @@ public VItemParametersEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.VItemParametersEditor_AddParameter, createImageDescriptor(ResourceProvider.IMG_Parameter)) {
+		actions.add(new Action(Messages.VItemParametersEditor_AddParameter,
+			createImageDescriptor(ResourceProvider.IMG_Parameter)) {
 			@Override
 			public void run() {
 				handleAdd();
@@ -92,23 +96,25 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
 		{
-			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
+				Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
+				MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
@@ -118,9 +124,8 @@ protected void addPressed() {
 				protected List<?> getContainerChildren(Object container) {
 					if (container instanceof MHandledItem) {
 						return ((MHandledItem) container).getParameters();
-					} else {
-						return null;
 					}
+					return null;
 				}
 			};
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
@@ -138,10 +143,11 @@ public IObservableList getChildList(Object element) {
 	}
 
 	protected void handleAdd() {
-		MParameter handler = MCommandsFactory.INSTANCE.createParameter();
+		final MParameter handler = MCommandsFactory.INSTANCE.createParameter();
 		setElementId(handler);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, handler);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, handler);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -151,7 +157,7 @@ protected void handleAdd() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index 37f083092f..46a7d539a2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -6,16 +6,18 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance, Bug 443945
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance, Bug 443945
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -45,7 +47,7 @@ public class VModelFragmentsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	public VModelFragmentsEditor() {
@@ -54,7 +56,8 @@ public VModelFragmentsEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.VModelFragmentsEditor_AddFragment, createImageDescriptor(ResourceProvider.IMG_ModelFragments)) {
+		actions.add(new Action(Messages.VModelFragmentsEditor_AddFragment,
+			createImageDescriptor(ResourceProvider.IMG_ModelFragments)) {
 			@Override
 			public void run() {
 				handleAdd();
@@ -88,23 +91,25 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
 		{
-			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
+				Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
+				FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
@@ -114,9 +119,8 @@ protected void addPressed() {
 				protected List<?> getContainerChildren(Object container) {
 					if (container instanceof MModelFragments) {
 						return ((MModelFragments) container).getFragments();
-					} else {
-						return null;
 					}
+					return null;
 				}
 			};
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
@@ -135,14 +139,15 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	private void handleAdd() {
-		MStringModelFragment eObject = MFragmentFactory.INSTANCE.createStringModelFragment();
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, eObject);
+		final MStringModelFragment eObject = MFragmentFactory.INSTANCE.createStringModelFragment();
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index d0b7d3e333..3540865ce1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -7,7 +7,9 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -43,18 +45,19 @@ public class VSnippetsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private List<Action> actions = new ArrayList<Action>();
-	private EStructuralFeature targetFeature;
+	private final List<Action> actions = new ArrayList<Action>();
+	private final EStructuralFeature targetFeature;
 
 	public VSnippetsEditor() {
 		super();
-		this.targetFeature = UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS;
+		targetFeature = UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS;
 	}
 
 	@PostConstruct
 	void init() {
 
-		actions.add(new Action(Messages.VWindowControlEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area_vertical)) {
+		actions.add(new Action(Messages.VWindowControlEditor_AddArea,
+			createImageDescriptor(ResourceProvider.IMG_Area_vertical)) {
 			@Override
 			public void run() {
 				handleAdd(AdvancedPackageImpl.Literals.AREA);
@@ -68,48 +71,55 @@ public void run() {
 			}
 		});
 
-		actions.add(new Action(Messages.VWindowControlEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
-			@Override
-			public void run() {
-				handleAdd(BasicPackageImpl.Literals.PART);
-			}
-		});
+		actions
+			.add(new Action(Messages.VWindowControlEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+				@Override
+				public void run() {
+					handleAdd(BasicPackageImpl.Literals.PART);
+				}
+			});
 
-		actions.add(new Action(Messages.VWindowControlEditor_AddPartSashContainer, createImageDescriptor(ResourceProvider.IMG_PartSashContainer_vertical)) {
+		actions.add(new Action(Messages.VWindowControlEditor_AddPartSashContainer,
+			createImageDescriptor(ResourceProvider.IMG_PartSashContainer_vertical)) {
 			@Override
 			public void run() {
 				handleAdd(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
 			}
 		});
 
-		actions.add(new Action(Messages.VWindowControlEditor_AddPartStack, createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+		actions.add(new Action(Messages.VWindowControlEditor_AddPartStack,
+			createImageDescriptor(ResourceProvider.IMG_PartStack)) {
 			@Override
 			public void run() {
 				handleAdd(BasicPackageImpl.Literals.PART_STACK);
 			}
 		});
 
-		actions.add(new Action(Messages.VWindowControlEditor_AddPerspectiveStack, createImageDescriptor(ResourceProvider.IMG_PerspectiveStack)) {
+		actions.add(new Action(Messages.VWindowControlEditor_AddPerspectiveStack,
+			createImageDescriptor(ResourceProvider.IMG_PerspectiveStack)) {
 			@Override
 			public void run() {
 				handleAdd(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK);
 			}
 		});
-		actions.add(new Action(Messages.PerspectiveStackEditor_AddPerspective, createImageDescriptor(ResourceProvider.IMG_Perspective)) {
+		actions.add(new Action(Messages.PerspectiveStackEditor_AddPerspective,
+			createImageDescriptor(ResourceProvider.IMG_Perspective)) {
 			@Override
 			public void run() {
 				handleAdd(AdvancedPackageImpl.Literals.PERSPECTIVE);
 			}
 		});
 
-		actions.add(new Action(Messages.VTrimContributionsEditor_AddTrimContribution, createImageDescriptor(ResourceProvider.IMG_TrimContribution)) {
+		actions.add(new Action(Messages.VTrimContributionsEditor_AddTrimContribution,
+			createImageDescriptor(ResourceProvider.IMG_TrimContribution)) {
 			@Override
 			public void run() {
 				handleAdd(BasicPackageImpl.Literals.TRIM_ELEMENT);
 			}
 		});
 
-		actions.add(new Action(Messages.VWindowEditor_AddTrimmedWindow, createImageDescriptor(ResourceProvider.IMG_Window)) {
+		actions.add(new Action(Messages.VWindowEditor_AddTrimmedWindow,
+			createImageDescriptor(ResourceProvider.IMG_Window)) {
 			@Override
 			public void run() {
 				handleAdd(BasicPackageImpl.Literals.TRIMMED_WINDOW);
@@ -121,13 +131,15 @@ public void run() {
 				handleAdd(BasicPackageImpl.Literals.WINDOW);
 			}
 		});
-		actions.add(new Action(Messages.VWindowTrimEditor_AddWindowTrim, createImageDescriptor(ResourceProvider.IMG_WindowTrim)) {
+		actions.add(new Action(Messages.VWindowTrimEditor_AddWindowTrim,
+			createImageDescriptor(ResourceProvider.IMG_WindowTrim)) {
 			@Override
 			public void run() {
 				handleAdd(BasicPackageImpl.Literals.TRIM_BAR);
 			}
 		});
-		actions.add(new Action(Messages.VWindowEditor_AddWizardDialog, createImageDescriptor(ResourceProvider.IMG_WizardDialog)) {
+		actions.add(new Action(Messages.VWindowEditor_AddWizardDialog,
+			createImageDescriptor(ResourceProvider.IMG_WizardDialog)) {
 			@Override
 			public void run() {
 				handleAdd(BasicPackageImpl.Literals.WIZARD_DIALOG);
@@ -169,27 +181,27 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, targetFeature) {
+		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, targetFeature) {
 			@Override
 			protected void addPressed() {
-				EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
+				final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
 				handleAdd(eClass);
-			};
+			}
 
 			@Override
 			protected List<?> getContainerChildren(Object container) {
@@ -200,7 +212,11 @@ protected List<?> getContainerChildren(Object container) {
 		viewer = pickList.getList();
 
 		pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
-		pickList.setInput(new EClass[] { BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW, AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, AdvancedPackageImpl.Literals.PERSPECTIVE, AdvancedPackageImpl.Literals.AREA, BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, BasicPackageImpl.Literals.TRIM_BAR, BasicPackageImpl.Literals.TRIM_ELEMENT, });
+		pickList.setInput(new EClass[] { BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW,
+			AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, AdvancedPackageImpl.Literals.PERSPECTIVE,
+			AdvancedPackageImpl.Literals.AREA, BasicPackageImpl.Literals.PART_SASH_CONTAINER,
+			BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART,
+			BasicPackageImpl.Literals.TRIM_BAR, BasicPackageImpl.Literals.TRIM_ELEMENT, });
 		pickList.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE));
 
 		folder.setSelection(0);
@@ -215,16 +231,16 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	protected void handleAdd(EClass eClass) {
-		EObject handler = EcoreUtil.create(eClass);
+		final EObject handler = EcoreUtil.create(eClass);
 		setElementId(handler);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), targetFeature, handler);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), targetFeature, handler);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index 3ae28e172a..39d6a57812 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -6,16 +6,18 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -45,7 +47,7 @@ public class VToolBarContributionsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	public VToolBarContributionsEditor() {
@@ -54,7 +56,8 @@ public VToolBarContributionsEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.VToolBarContributionsEditor_AddToolBarContribution, createImageDescriptor(ResourceProvider.IMG_ToolBarContribution)) {
+		actions.add(new Action(Messages.VToolBarContributionsEditor_AddToolBarContribution,
+			createImageDescriptor(ResourceProvider.IMG_ToolBarContribution)) {
 			@Override
 			public void run() {
 				handleAdd();
@@ -88,27 +91,29 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
 		{
-			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
+				Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
+				MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
-				};
+				}
 
 				@Override
 				protected List<?> getContainerChildren(Object container) {
@@ -130,10 +135,11 @@ public IObservableList getChildList(Object element) {
 	}
 
 	protected void handleAdd() {
-		MToolBarContribution command = MMenuFactory.INSTANCE.createToolBarContribution();
+		final MToolBarContribution command = MMenuFactory.INSTANCE.createToolBarContribution();
 		setElementId(command);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS, command);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS, command);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -143,7 +149,7 @@ protected void handleAdd() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index c43395079e..2588e523f2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -6,16 +6,18 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -45,7 +47,7 @@ public class VTrimContributionsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	public VTrimContributionsEditor() {
@@ -54,7 +56,8 @@ public VTrimContributionsEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.VTrimContributionsEditor_AddTrimContribution, createImageDescriptor(ResourceProvider.IMG_TrimContribution)) {
+		actions.add(new Action(Messages.VTrimContributionsEditor_AddTrimContribution,
+			createImageDescriptor(ResourceProvider.IMG_TrimContribution)) {
 			@Override
 			public void run() {
 				handleAdd();
@@ -88,27 +91,29 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
 		{
-			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
+				Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
+				MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
-				};
+				}
 
 				@Override
 				protected List<?> getContainerChildren(Object container) {
@@ -130,10 +135,11 @@ public IObservableList getChildList(Object element) {
 	}
 
 	protected void handleAdd() {
-		MTrimContribution command = MMenuFactory.INSTANCE.createTrimContribution();
+		final MTrimContribution command = MMenuFactory.INSTANCE.createTrimContribution();
 		setElementId(command);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS, command);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS, command);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -143,7 +149,7 @@ protected void handleAdd() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index d49669cae7..1a0753a769 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
@@ -15,8 +15,10 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -50,7 +52,7 @@
 public class VWindowControlEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 	private TableViewer viewer;
 
 	@Inject
@@ -64,34 +66,39 @@ public VWindowControlEditor() {
 	@PostConstruct
 	void init() {
 
-		actions.add(new Action(Messages.VWindowControlEditor_AddPerspectiveStack, createImageDescriptor(ResourceProvider.IMG_PerspectiveStack)) {
+		actions.add(new Action(Messages.VWindowControlEditor_AddPerspectiveStack,
+			createImageDescriptor(ResourceProvider.IMG_PerspectiveStack)) {
 			@Override
 			public void run() {
 				handleAdd(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK);
 			}
 		});
 
-		actions.add(new Action(Messages.VWindowControlEditor_AddPartSashContainer, createImageDescriptor(ResourceProvider.IMG_PartSashContainer_vertical)) {
+		actions.add(new Action(Messages.VWindowControlEditor_AddPartSashContainer,
+			createImageDescriptor(ResourceProvider.IMG_PartSashContainer_vertical)) {
 			@Override
 			public void run() {
 				handleAdd(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
 			}
 		});
 
-		actions.add(new Action(Messages.VWindowControlEditor_AddPartStack, createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+		actions.add(new Action(Messages.VWindowControlEditor_AddPartStack,
+			createImageDescriptor(ResourceProvider.IMG_PartStack)) {
 			@Override
 			public void run() {
 				handleAdd(BasicPackageImpl.Literals.PART_STACK);
 			}
 		});
 
-		actions.add(new Action(Messages.VWindowControlEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
-			@Override
-			public void run() {
-				handleAdd(BasicPackageImpl.Literals.PART);
-			}
-		});
-		actions.add(new Action(Messages.VWindowControlEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area_vertical)) {
+		actions
+			.add(new Action(Messages.VWindowControlEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+				@Override
+				public void run() {
+					handleAdd(BasicPackageImpl.Literals.PART);
+				}
+			});
+		actions.add(new Action(Messages.VWindowControlEditor_AddArea,
+			createImageDescriptor(ResourceProvider.IMG_Area_vertical)) {
 			@Override
 			public void run() {
 				handleAdd(AdvancedPackageImpl.Literals.AREA);
@@ -132,28 +139,29 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
 		{
-			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
+					final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
 					handleAdd(eClass);
-				};
+				}
 			};
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 			viewer = pickList.getList();
@@ -161,12 +169,16 @@ protected void addPressed() {
 			pickList.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
-					EClass eclass = (EClass) element;
+					final EClass eclass = (EClass) element;
 					return eclass.getName();
 				}
 			});
 
-			pickList.setInput(new EClass[] { AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA });
+			pickList
+				.setInput(new EClass[] { AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
+					BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK,
+					BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART,
+					AdvancedPackageImpl.Literals.AREA });
 			pickList.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK));
 		}
 
@@ -181,11 +193,12 @@ public IObservableList getChildList(Object element) {
 	}
 
 	private void handleAdd(EClass eClass) {
-		EObject eObject = EcoreUtil.create(eClass);
+		final EObject eObject = EcoreUtil.create(eClass);
 
 		setElementId(eObject);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -195,7 +208,7 @@ private void handleAdd(EClass eClass) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index c3459ac0e2..bd9f1e2df0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -6,16 +6,18 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -45,7 +47,7 @@ public class VWindowTrimEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	public VWindowTrimEditor() {
@@ -54,7 +56,8 @@ public VWindowTrimEditor() {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.VWindowTrimEditor_AddWindowTrim, createImageDescriptor(ResourceProvider.IMG_WindowTrim)) {
+		actions.add(new Action(Messages.VWindowTrimEditor_AddWindowTrim,
+			createImageDescriptor(ResourceProvider.IMG_WindowTrim)) {
 			@Override
 			public void run() {
 				handleAdd();
@@ -88,23 +91,25 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
 		{
-			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
+				Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
+				BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
@@ -114,9 +119,8 @@ protected void addPressed() {
 				protected List<?> getContainerChildren(Object master) {
 					if (master instanceof MTrimmedWindow) {
 						return ((MTrimmedWindow) master).getTrimBars();
-					} else {
-						return null;
 					}
+					return null;
 				}
 			};
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
@@ -134,10 +138,11 @@ public IObservableList getChildList(Object element) {
 	}
 
 	protected void handleAdd() {
-		MTrimBar handler = MBasicFactory.INSTANCE.createTrimBar();
+		final MTrimBar handler = MBasicFactory.INSTANCE.createTrimBar();
 		setElementId(handler);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS, handler);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+			BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS, handler);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -147,7 +152,7 @@ protected void handleAdd() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
index dd81738fb9..da701e26f3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
@@ -4,8 +4,10 @@
 import java.lang.reflect.Modifier;
 import java.util.Collections;
 import java.util.List;
+
 import javax.inject.Inject;
 import javax.inject.Named;
+
 import org.eclipse.e4.core.di.extensions.EventTopic;
 import org.eclipse.e4.core.di.extensions.Preference;
 import org.eclipse.e4.core.services.nls.Translation;
@@ -13,9 +15,9 @@
 import org.osgi.framework.FrameworkUtil;
 
 public class JavaAttribute {
-	private JavaObject object;
+	private final JavaObject object;
 
-	private Field field;
+	private final Field field;
 
 	public JavaAttribute(JavaObject object, Field field) {
 		this.object = object;
@@ -24,32 +26,31 @@ public JavaAttribute(JavaObject object, Field field) {
 	}
 
 	public boolean isInjected() {
-		return this.field.getAnnotation(Inject.class) != null;
+		return field.getAnnotation(Inject.class) != null;
 	}
 
 	public boolean isStatic() {
-		return (this.field.getModifiers() & Modifier.STATIC) == Modifier.STATIC;
+		return (field.getModifiers() & Modifier.STATIC) == Modifier.STATIC;
 	}
 
 	public String getValue() {
-		Object value = getFieldValue();
+		final Object value = getFieldValue();
 		if (field.getType().isPrimitive()) {
 			return value + ""; //$NON-NLS-1$
+		}
+		if (value == null) {
+			return "<null>"; //$NON-NLS-1$
+		} else if (value instanceof String) {
+			return value.toString();
 		} else {
-			if (value == null) {
-				return "<null>"; //$NON-NLS-1$
-			} else if (value instanceof String) {
-				return value.toString();
+			String name;
+			if (value.getClass().isAnonymousClass()) {
+				name = value.getClass().getName().substring(value.getClass().getPackage().getName().length() + 1);
 			} else {
-				String name;
-				if (value.getClass().isAnonymousClass()) {
-					name = value.getClass().getName().substring(value.getClass().getPackage().getName().length() + 1);
-				} else {
-					name = value.getClass().getSimpleName();
-				}
-
-				return name + " (id = " + Integer.toHexString(System.identityHashCode(value)) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+				name = value.getClass().getSimpleName();
 			}
+
+			return name + " (id = " + Integer.toHexString(System.identityHashCode(value)) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
@@ -57,14 +58,13 @@ public List<JavaAttribute> getAttributes() {
 		try {
 			if (field.getType().isPrimitive()) {
 				return Collections.emptyList();
-			} else {
-				return new JavaObject(field.get(object.getInstance())).getAttributes();
 			}
+			return new JavaObject(field.get(object.getInstance())).getAttributes();
 
-		} catch (IllegalArgumentException e) {
+		} catch (final IllegalArgumentException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
-		} catch (IllegalAccessException e) {
+		} catch (final IllegalAccessException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
@@ -80,7 +80,7 @@ public String getType() {
 	}
 
 	public AccessLevel getAccessLevel() {
-		int m = field.getModifiers();
+		final int m = field.getModifiers();
 		if ((m & Modifier.PUBLIC) == Modifier.PUBLIC) {
 			return AccessLevel.PUBLIC;
 		} else if ((m & Modifier.PRIVATE) == Modifier.PRIVATE) {
@@ -94,12 +94,12 @@ public AccessLevel getAccessLevel() {
 
 	public String getContextKey() {
 		if (isInjected()) {
-			Named named = field.getAnnotation(Named.class);
+			final Named named = field.getAnnotation(Named.class);
 			if (named != null) {
 				return "@Named(" + named.value() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
 			}
 
-			Preference preference = field.getAnnotation(Preference.class);
+			final Preference preference = field.getAnnotation(Preference.class);
 			if (preference != null) {
 				String path = preference.nodePath();
 				if (path == null || path.trim().length() == 0) {
@@ -108,18 +108,18 @@ public String getContextKey() {
 				return "@Preference(" + preference.nodePath() + "/" + preference.value() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			}
 
-			EventTopic topic = field.getAnnotation(EventTopic.class);
+			final EventTopic topic = field.getAnnotation(EventTopic.class);
 
 			if (topic != null) {
 				return "@Topic(" + topic.value() + ")"; //$NON-NLS-1$//$NON-NLS-2$
 			}
 
-			UIEventTopic uiTopic = field.getAnnotation(UIEventTopic.class);
+			final UIEventTopic uiTopic = field.getAnnotation(UIEventTopic.class);
 			if (uiTopic != null) {
 				return "@UITopic(" + uiTopic.value() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
 			}
 
-			Translation translation = field.getAnnotation(Translation.class);
+			final Translation translation = field.getAnnotation(Translation.class);
 			if (translation != null) {
 				return "@Translation(" + field.getType().getName() + ")"; //$NON-NLS-1$//$NON-NLS-2$
 			}
@@ -133,10 +133,10 @@ public String getContextKey() {
 	public Object getFieldValue() {
 		try {
 			return field.get(object.getInstance());
-		} catch (IllegalArgumentException e) {
+		} catch (final IllegalArgumentException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
-		} catch (IllegalAccessException e) {
+		} catch (final IllegalAccessException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
index 646673e7ff..87691d66db 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
@@ -2,6 +2,7 @@
 
 import java.util.Collection;
 import java.util.Collections;
+
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
@@ -43,13 +44,14 @@
 import org.eclipse.swt.widgets.Label;
 
 public class ObjectViewer {
-	public TreeViewer createViewer(Composite parent, EStructuralFeature feature, final IObservableValue master, IResourcePool resourcePool, final Messages messages) {
+	public TreeViewer createViewer(Composite parent, EStructuralFeature feature, final IObservableValue master,
+		IResourcePool resourcePool, final Messages messages) {
 		final TreeViewer viewer = new TreeViewer(parent);
 		viewer.setContentProvider(new ContentProviderImpl());
 		viewer.setLabelProvider(new LabelProviderImpl(resourcePool));
 		viewer.setComparator(new ViewerComparatorImpl());
-		IEMFValueProperty property = EMFProperties.value(feature);
-		IObservableValue value = property.observeDetail(master);
+		final IEMFValueProperty property = EMFProperties.value(feature);
+		final IObservableValue value = property.observeDetail(master);
 		value.addValueChangeListener(new IValueChangeListener() {
 
 			@Override
@@ -63,8 +65,8 @@ public void handleValueChange(ValueChangeEvent event) {
 			}
 		});
 
-		IExtensionRegistry registry = RegistryFactory.getRegistry();
-		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.scripting"); //$NON-NLS-1$
+		final IExtensionRegistry registry = RegistryFactory.getRegistry();
+		final IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.scripting"); //$NON-NLS-1$
 		final IConfigurationElement[] elements = extPoint.getConfigurationElements();
 
 		if (elements.length > 0) {
@@ -78,16 +80,18 @@ public void menuAboutToShow(IMenuManager manager) {
 						return;
 					}
 
-					MenuManager scriptExecute = new MenuManager(messages.ObjectViewer_Script);
+					final MenuManager scriptExecute = new MenuManager(messages.ObjectViewer_Script);
 					mgr.add(scriptExecute);
-					for (IConfigurationElement e : elements) {
+					for (final IConfigurationElement e : elements) {
 						final IConfigurationElement le = e;
 						scriptExecute.add(new Action(e.getAttribute("label")) { //$NON-NLS-1$
 							@Override
 							public void run() {
 								try {
-									IScriptingSupport support = (IScriptingSupport) le.createExecutableExtension("class"); //$NON-NLS-1$
-									Object o = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+									final IScriptingSupport support = (IScriptingSupport) le
+										.createExecutableExtension("class"); //$NON-NLS-1$
+									final Object o = ((IStructuredSelection) viewer.getSelection())
+										.getFirstElement();
 									Object mainObject = null;
 									if (o instanceof JavaObject) {
 										mainObject = ((JavaObject) o).getInstance();
@@ -96,10 +100,11 @@ public void run() {
 									}
 
 									if (mainObject != null) {
-										MApplicationElement value = (MApplicationElement) master.getValue();
-										support.openEditor(viewer.getControl().getShell(), mainObject, ModelUtils.getContainingContext(value));
+										final MApplicationElement value = (MApplicationElement) master.getValue();
+										support.openEditor(viewer.getControl().getShell(), mainObject,
+											ModelUtils.getContainingContext(value));
 									}
-								} catch (CoreException e) {
+								} catch (final CoreException e) {
 									// TODO Auto-generated catch block
 									e.printStackTrace();
 								}
@@ -117,10 +122,11 @@ public void run() {
 	}
 
 	class TooltipSupportImpl extends ColumnViewerToolTipSupport {
-		private IResourcePool resourcePool;
-		private Messages messages;
+		private final IResourcePool resourcePool;
+		private final Messages messages;
 
-		protected TooltipSupportImpl(ColumnViewer viewer, int style, boolean manualActivation, IResourcePool resourcePool, Messages messages) {
+		protected TooltipSupportImpl(ColumnViewer viewer, int style, boolean manualActivation,
+			IResourcePool resourcePool, Messages messages) {
 			super(viewer, style, manualActivation);
 			this.resourcePool = resourcePool;
 			this.messages = messages;
@@ -128,26 +134,26 @@ protected TooltipSupportImpl(ColumnViewer viewer, int style, boolean manualActiv
 
 		@Override
 		protected Composite createViewerToolTipContentArea(Event event, ViewerCell cell, Composite parent) {
-			JavaAttribute attribute = (JavaAttribute) cell.getElement();
+			final JavaAttribute attribute = (JavaAttribute) cell.getElement();
 
-			Composite container = new Composite(parent, SWT.NONE);
+			final Composite container = new Composite(parent, SWT.NONE);
 			container.setBackground(container.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 			container.setLayout(new GridLayout(2, false));
 
 			{
-				Composite headerContainer = new Composite(container, SWT.NONE);
+				final Composite headerContainer = new Composite(container, SWT.NONE);
 				headerContainer.setBackgroundMode(SWT.INHERIT_DEFAULT);
 				headerContainer.setData(ModelEditor.CSS_CLASS_KEY, "headerSectionContainer"); //$NON-NLS-1$
-				GridLayout fl = new GridLayout(2, false);
+				final GridLayout fl = new GridLayout(2, false);
 				fl.marginHeight = 5;
 				fl.marginWidth = 5;
 				headerContainer.setLayout(fl);
 				headerContainer.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false, 2, 1));
 
-				Label iconLabel = new Label(headerContainer, SWT.NONE);
+				final Label iconLabel = new Label(headerContainer, SWT.NONE);
 				iconLabel.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_bullet_go));
 
-				Label textLabel = new Label(headerContainer, SWT.NONE);
+				final Label textLabel = new Label(headerContainer, SWT.NONE);
 				textLabel.setText(attribute.getName());
 				textLabel.setData(ModelEditor.CSS_CLASS_KEY, "sectionHeader"); //$NON-NLS-1$
 			}
@@ -177,8 +183,8 @@ class ViewerComparatorImpl extends ViewerComparator {
 		public int compare(Viewer viewer, Object e1, Object e2) {
 			if (e1 instanceof JavaAttribute) {
 				if (e2 instanceof JavaAttribute) {
-					JavaAttribute a1 = (JavaAttribute) e1;
-					JavaAttribute a2 = (JavaAttribute) e2;
+					final JavaAttribute a1 = (JavaAttribute) e1;
+					final JavaAttribute a2 = (JavaAttribute) e2;
 
 					if (a1.isStatic() && !a2.isStatic()) {
 						return -1;
@@ -186,15 +192,13 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 						return 1;
 					}
 
-					int rv = Integer.valueOf(a1.getAccessLevel().value).compareTo(a2.getAccessLevel().value);
+					final int rv = Integer.valueOf(a1.getAccessLevel().value).compareTo(a2.getAccessLevel().value);
 					if (rv == 0) {
 						return a1.getName().compareTo(a2.getName());
-					} else {
-						return rv;
 					}
-				} else {
-					return -1;
+					return rv;
 				}
+				return -1;
 			}
 			return super.compare(viewer, e1, e2);
 		}
@@ -202,7 +206,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 
 	class LabelProviderImpl extends StyledCellLabelProvider {
 
-		private IResourcePool resourcePool;
+		private final IResourcePool resourcePool;
 
 		public LabelProviderImpl(IResourcePool resourcePool) {
 			this.resourcePool = resourcePool;
@@ -219,12 +223,12 @@ public String getToolTipText(Object element) {
 		@Override
 		public void update(ViewerCell cell) {
 			if (cell.getElement() instanceof JavaObject) {
-				JavaObject o = (JavaObject) cell.getElement();
+				final JavaObject o = (JavaObject) cell.getElement();
 				cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_class_obj));
 				cell.setText(o.getName());
 			} else if (cell.getElement() instanceof JavaAttribute) {
-				JavaAttribute o = (JavaAttribute) cell.getElement();
-				StyledString string = new StyledString();
+				final JavaAttribute o = (JavaAttribute) cell.getElement();
+				final StyledString string = new StyledString();
 				if (o.isInjected()) {
 					string.append("<injected> ", StyledString.COUNTER_STYLER); //$NON-NLS-1$
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
index 74c7f6f2e1..1a964c761d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
@@ -12,8 +12,10 @@
 import java.util.PropertyResourceBundle;
 import java.util.ResourceBundle;
 import java.util.ResourceBundle.Control;
+
 import javax.inject.Inject;
 import javax.inject.Named;
+
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResourceChangeEvent;
@@ -76,7 +78,7 @@ public boolean visit(IResourceDelta delta) throws CoreException {
 								return ProjectOSGiTranslationProvider.this.visit(delta);
 							}
 						});
-					} catch (CoreException e) {
+					} catch (final CoreException e) {
 						// TODO Auto-generated catch block
 						e.printStackTrace();
 					}
@@ -85,7 +87,7 @@ public boolean visit(IResourceDelta delta) throws CoreException {
 		});
 		setLocale(locale, false);
 
-		IFile f = this.project.getFile(MANIFEST_DEFAULT_PATH);
+		final IFile f = this.project.getFile(MANIFEST_DEFAULT_PATH);
 		if (f.exists()) {
 			handleManifestChange(f);
 		} else {
@@ -99,20 +101,22 @@ public boolean visit(IResourceDelta delta) throws CoreException {
 	void setLocale(@Named(TranslationService.LOCALE) String locale, @Optional Boolean performUpdate) {
 		try {
 			this.locale = locale == null ? Locale.getDefault() : ResourceBundleHelper.toLocale(locale);
-		} catch (Exception e) {
+		} catch (final Exception e) {
 			this.locale = Locale.getDefault();
 		}
 
-		if (performUpdate == null || performUpdate)
+		if (performUpdate == null || performUpdate) {
 			updateResourceBundle();
+		}
 	}
 
 	@Inject
 	void setLocale(@Named(TranslationService.LOCALE) Locale locale, @Optional Boolean performUpdate) {
 		this.locale = locale == null ? Locale.getDefault() : locale;
 
-		if (performUpdate == null || performUpdate)
+		if (performUpdate == null || performUpdate) {
 			updateResourceBundle();
+		}
 	}
 
 	/**
@@ -126,7 +130,7 @@ void setLocale(@Named(TranslationService.LOCALE) Locale locale, @Optional Boolea
 	boolean visit(IResourceDelta delta) {
 		if (delta.getResource() instanceof IWorkspaceRoot) {
 			return true;
-		} else if (delta.getResource().equals(this.project)) {
+		} else if (delta.getResource().equals(project)) {
 			return true;
 		} else if (delta.getResource().getProjectRelativePath().toString().equals(META_INF_DIRECTORY_NAME)) {
 			return true;
@@ -134,21 +138,21 @@ boolean visit(IResourceDelta delta) {
 			handleManifestChange((IFile) delta.getResource());
 			return false;
 		} else if (delta.getResource() instanceof IFile) {
-			String filename = ((IFile) delta.getResource()).getName();
+			final String filename = ((IFile) delta.getResource()).getName();
 			// extract base bundle name out of local basename
-			String fileBaseName = this.basename.substring(this.basename.lastIndexOf("/") + 1, this.basename.length()); //$NON-NLS-1$
+			final String fileBaseName = basename.substring(basename.lastIndexOf("/") + 1, basename.length()); //$NON-NLS-1$
 			if (filename.startsWith(fileBaseName)) {
 				updateResourceBundle();
 				return false;
 			}
 		}
 
-		if (delta.getResource().getProjectRelativePath().toString().equals(this.basename)) {
+		if (delta.getResource().getProjectRelativePath().toString().equals(basename)) {
 			updateResourceBundle();
 			return false;
 		}
 
-		String[] p = this.basename.split("/"); //$NON-NLS-1$
+		final String[] p = basename.split("/"); //$NON-NLS-1$
 		int i = 0;
 		String path = ""; //$NON-NLS-1$
 		do {
@@ -172,7 +176,7 @@ boolean visit(IResourceDelta delta) {
 	 */
 	private void handleManifestChange(IFile file) {
 		try {
-			String newValue = extractBasenameFromManifest(file);
+			final String newValue = extractBasenameFromManifest(file);
 
 			if (!newValue.equals(basename)) {
 				basename = newValue;
@@ -181,10 +185,10 @@ private void handleManifestChange(IFile file) {
 				}
 			}
 
-		} catch (CoreException e) {
+		} catch (final CoreException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
-		} catch (IOException e) {
+		} catch (final IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
@@ -206,8 +210,8 @@ private void handleManifestChange(IFile file) {
 	 * @see IFile#getContents()
 	 */
 	public static String extractBasenameFromManifest(IFile file) throws CoreException, IOException {
-		InputStream in = file.getContents();
-		BufferedReader r = new BufferedReader(new InputStreamReader(in));
+		final InputStream in = file.getContents();
+		final BufferedReader r = new BufferedReader(new InputStreamReader(in));
 		String line;
 		String newValue = Constants.BUNDLE_LOCALIZATION_DEFAULT_BASENAME;
 		while ((line = r.readLine()) != null) {
@@ -225,12 +229,13 @@ public static String extractBasenameFromManifest(IFile file) throws CoreExceptio
 	 * Reloads the underlying ResourceBundle.
 	 */
 	protected void updateResourceBundle() {
-		setResourceBundle(ResourceBundleHelper.getEquinoxResourceBundle(this.basename, this.locale, new ProjectResourceBundleControl(true), new ProjectResourceBundleControl(false)));
+		setResourceBundle(ResourceBundleHelper.getEquinoxResourceBundle(basename, locale,
+			new ProjectResourceBundleControl(true), new ProjectResourceBundleControl(false)));
 	}
 
 	/**
-	 * Specialization of {@link Control} which loads the {@link ResourceBundle}
-	 * by using file structures of a project instead of using a classloader.
+	 * Specialization of {@link Control} which loads the {@link ResourceBundle} by using file structures of a project
+	 * instead of using a classloader.
 	 *
 	 * @author Dirk Fauth
 	 */
@@ -246,17 +251,17 @@ class ProjectResourceBundleControl extends ResourceBundle.Control {
 		/**
 		 * @param useFallback
 		 *            <code>true</code> if the default locale should be used as
-		 *            fallback locale in the search path or <code>false</code>
-		 *            if there should be no fallback.
+		 *            fallback locale in the search path or <code>false</code> if there should be no fallback.
 		 */
 		ProjectResourceBundleControl(boolean useFallback) {
 			this.useFallback = useFallback;
 		}
 
 		@Override
-		public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader, boolean reload) throws IllegalAccessException, InstantiationException, IOException {
+		public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader,
+			boolean reload) throws IllegalAccessException, InstantiationException, IOException {
 
-			String bundleName = toBundleName(baseName, locale);
+			final String bundleName = toBundleName(baseName, locale);
 			ResourceBundle bundle = null;
 			if (format.equals("java.properties")) { //$NON-NLS-1$
 				final String resourceName = toResourceName(bundleName, "properties"); //$NON-NLS-1$
@@ -268,7 +273,7 @@ public InputStream run() throws IOException {
 							return getResourceAsStream(resourceName);
 						}
 					});
-				} catch (PrivilegedActionException e) {
+				} catch (final PrivilegedActionException e) {
 					throw (IOException) e.getException();
 				}
 				if (stream != null) {
@@ -285,21 +290,19 @@ public InputStream run() throws IOException {
 		}
 
 		/**
-		 * Loads the properties file by using the {@link IProject} of the
-		 * {@link ProjectOSGiTranslationProvider}.
+		 * Loads the properties file by using the {@link IProject} of the {@link ProjectOSGiTranslationProvider}.
 		 *
 		 * @param name
 		 * @return The {@link InputStream} to the properties file to load
 		 */
 		protected InputStream getResourceAsStream(String name) {
-			IFile f = project.getFile(name);
+			final IFile f = project.getFile(name);
 			try {
 				if (f.exists()) {
 					return f.getContents();
-				} else {
-					return null;
 				}
-			} catch (CoreException e) {
+				return null;
+			} catch (final CoreException e) {
 				return null;
 			}
 		}
@@ -311,7 +314,7 @@ public List<String> getFormats(String baseName) {
 
 		@Override
 		public Locale getFallbackLocale(String baseName, Locale locale) {
-			return this.useFallback ? super.getFallbackLocale(baseName, locale) : null;
+			return useFallback ? super.getFallbackLocale(baseName, locale) : null;
 		}
 
 		// this implementation simply doesn't cache the values in the
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
index fedab5d709..d1a55456a3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
@@ -6,13 +6,11 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 437569, Ongoing Maintenance
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 437569, Ongoing Maintenance
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
 
-import org.eclipse.e4.tools.emf.ui.common.Plugin;
-
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -21,6 +19,7 @@
 import java.io.InputStream;
 import java.util.jar.Manifest;
 import java.util.zip.ZipFile;
+
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
@@ -28,6 +27,7 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
+import org.eclipse.e4.tools.emf.ui.common.Plugin;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionDataFile;
@@ -36,7 +36,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.pde.internal.core.util.CoreUtility;
 import org.eclipse.swt.SWT;
@@ -58,17 +57,18 @@
  * @author Steven Spungin
  *
  */
-public class NonReferencedActionPage extends WizardPage implements IWizardPage {
+public class NonReferencedActionPage extends WizardPage {
 
-	private IProject project;
+	private final IProject project;
 	private String bundle;
-	private IFile file;
-	private String installLocation;
-	private IEclipseContext context;
+	private final IFile file;
+	private final String installLocation;
+	private final IEclipseContext context;
 	private String className;
-	private BundleImageCache imageCache;
+	private final BundleImageCache imageCache;
 
-	protected NonReferencedActionPage(IProject project, String bundle, IFile file, String installLocation, IEclipseContext context) {
+	protected NonReferencedActionPage(IProject project, String bundle, IFile file, String installLocation,
+		IEclipseContext context) {
 		super(Messages.NonReferencedActionPage_NonreferencedResourceAction);
 
 		this.project = project;
@@ -79,14 +79,15 @@ protected NonReferencedActionPage(IProject project, String bundle, IFile file, S
 
 		imageCache = context.get(BundleImageCache.class);
 
-		setImageDescriptor(ImageDescriptor.createFromImage(imageCache.create(Plugin.ID, "/icons/full/wizban/newefix_wizban.png"))); //$NON-NLS-1$
+		setImageDescriptor(ImageDescriptor.createFromImage(imageCache.create(Plugin.ID,
+			"/icons/full/wizban/newefix_wizban.png"))); //$NON-NLS-1$
 
 		if (bundle == null && installLocation != null) {
 			this.bundle = FilteredContributionDialog.getBundle(installLocation);
 		}
 		if (file instanceof ContributionDataFile) {
-			ContributionDataFile cdf = (ContributionDataFile) file;
-			this.className = cdf.getContributionData().className;
+			final ContributionDataFile cdf = (ContributionDataFile) file;
+			className = cdf.getContributionData().className;
 		}
 
 		setTitle(Messages.NonReferencedActionPage_NonreferencedResourceAction);
@@ -101,32 +102,32 @@ public void setDescription(String description) {
 
 	@Override
 	public void createControl(Composite compParent) {
-		Composite comp = new Composite(compParent, SWT.NONE);
-		GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
+		final Composite comp = new Composite(compParent, SWT.NONE);
+		final GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
 		layoutData.horizontalSpan = 2;
 		comp.setLayoutData(layoutData);
 		comp.setLayout(new GridLayout(2, false));
 
-		String message = ""; //$NON-NLS-1$
+		final String message = ""; //$NON-NLS-1$
 		Button defaultButton = null;
 
 		if (installLocation != null) {
-			Label label = new Label(comp, SWT.NONE);
+			final Label label = new Label(comp, SWT.NONE);
 			label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label.setText(Messages.NonReferencedResourceDialog_installLocation);
 
-			Text label2 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			final Text label2 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 			label2.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			label2.setText(installLocation);
 		}
 
 		if (className != null) {
-			ContributionData cd = ((ContributionDataFile) file).getContributionData();
-			Label label = new Label(comp, SWT.NONE);
+			final ContributionData cd = ((ContributionDataFile) file).getContributionData();
+			final Label label = new Label(comp, SWT.NONE);
 			label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label.setText(Messages.NonReferencedResourceDialog_2);
 
-			Text label2 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			final Text label2 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 			label2.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			if (bundle != null) {
 				label2.setText(bundle);
@@ -134,37 +135,37 @@ public void createControl(Composite compParent) {
 				label2.setText(Messages.NonReferencedResourceDialog__ast_notInABundle_ast);
 			}
 
-			Label label3 = new Label(comp, SWT.NONE);
+			final Label label3 = new Label(comp, SWT.NONE);
 			label3.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label3.setText(Messages.NonReferencedResourceDialog_package);
 
-			Text label4 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			final Text label4 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 			label4.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			label4.setText(getPackageFromClassName(className));
 
-			Label label5 = new Label(comp, SWT.NONE);
+			final Label label5 = new Label(comp, SWT.NONE);
 			label5.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label5.setText(Messages.NonReferencedResourceDialog_class);
 
-			Text label6 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			final Text label6 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 			label6.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			label6.setText(cd.className.substring(cd.className.lastIndexOf('.') + 1));
 
 			if (bundle != null) {
-				Label label7 = new Label(comp, SWT.NONE);
+				final Label label7 = new Label(comp, SWT.NONE);
 				label7.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 				label7.setText(Messages.NonReferencedResourceDialog_url);
 
-				Text label8 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+				final Text label8 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 				label8.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 				label8.setText("bundleclass://" + bundle + "/" + className); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		} else {
-			Label label = new Label(comp, SWT.NONE);
+			final Label label = new Label(comp, SWT.NONE);
 			label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label.setText(Messages.NonReferencedResourceDialog_bundle);
 
-			Text label2 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			final Text label2 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 			label2.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			if (bundle != null) {
 				label2.setText(bundle);
@@ -172,38 +173,39 @@ public void createControl(Composite compParent) {
 				label2.setText(Messages.NonReferencedResourceDialog_ast_notInABundle_ast);
 			}
 
-			Label label7 = new Label(comp, SWT.NONE);
+			final Label label7 = new Label(comp, SWT.NONE);
 			label7.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label7.setText(Messages.NonReferencedResourceDialog_directory);
 
-			Text label8 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			final Text label8 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 			label8.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			label8.setText(file.getFullPath().removeFirstSegments(1).removeLastSegments(1).toOSString());
 
-			Label label3 = new Label(comp, SWT.NONE);
+			final Label label3 = new Label(comp, SWT.NONE);
 			label3.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label3.setText(Messages.NonReferencedResourceDialog_resource);
 
-			Text label4 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			final Text label4 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 			label4.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			label4.setText(file.getFullPath().lastSegment());
 
 			if (bundle != null) {
-				Label label5 = new Label(comp, SWT.NONE);
+				final Label label5 = new Label(comp, SWT.NONE);
 				label5.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 				label5.setText(Messages.NonReferencedResourceDialog_url);
 
-				Text label6 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+				final Text label6 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 				label6.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-				label6.setText("platform:/plugin/" + bundle + "/" + file.getFullPath().removeFirstSegments(1).toOSString()); //$NON-NLS-1$ //$NON-NLS-2$
+				label6
+					.setText("platform:/plugin/" + bundle + "/" + file.getFullPath().removeFirstSegments(1).toOSString()); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		}
 
-		Label lblMessage = new Label(comp, SWT.NONE);
+		final Label lblMessage = new Label(comp, SWT.NONE);
 		lblMessage.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 0));
 		lblMessage.setText(message);
 
-		Group group = new Group(comp, SWT.NONE);
+		final Group group = new Group(comp, SWT.NONE);
 		group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 0));
 		group.setLayout(new GridLayout(1, false));
 		group.setText(Messages.NonReferencedActionPage_Action);
@@ -217,7 +219,7 @@ public void createControl(Composite compParent) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (btnRequire.getSelection()) {
-						Runnable okAction = new Runnable() {
+						final Runnable okAction = new Runnable() {
 
 							@Override
 							public void run() {
@@ -241,16 +243,16 @@ public void run() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (btnImport.getSelection()) {
-						Runnable okAction = new Runnable() {
+						final Runnable okAction = new Runnable() {
 							@Override
 							public void run() {
-								IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
+								final IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
 								Manifest manifest;
 								try {
 									manifest = new Manifest(fileManifest.getContents());
 									String value = manifest.getMainAttributes().getValue("Import-Package"); //$NON-NLS-1$
 
-									String packageName = getPackageFromClassName(className);
+									final String packageName = getPackageFromClassName(className);
 									// TODO ensure the packageName is not
 									// already in the manifest (although it
 									// should not be if we are here)
@@ -260,12 +262,12 @@ public void run() {
 										value += "," + packageName; //$NON-NLS-1$
 									}
 									manifest.getMainAttributes().putValue("Import-Package", value); //$NON-NLS-1$
-									ByteArrayOutputStream bos = new ByteArrayOutputStream();
+									final ByteArrayOutputStream bos = new ByteArrayOutputStream();
 									manifest.write(bos);
-									ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+									final ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
 									fileManifest.setContents(bis, true, true, null);
 									context.set("resolvedFile", file); //$NON-NLS-1$
-								} catch (Exception e) {
+								} catch (final Exception e) {
 									e.printStackTrace();
 								}
 							}
@@ -307,24 +309,30 @@ public void run() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
 						if (btnConvertToBundle.getSelection()) {
-							Runnable okAction = new Runnable() {
+							final Runnable okAction = new Runnable() {
 
 								@Override
 								public void run() {
 									String bundleId;
 									try {
-										ContributionData contributionData = cdf.getContributionData();
-										bundleId = BundleConverter.convertProjectToBundle(contributionData.installLocation, project.getWorkspace());
+										final ContributionData contributionData = cdf.getContributionData();
+										bundleId = BundleConverter.convertProjectToBundle(
+											contributionData.installLocation, project.getWorkspace());
 										if (bundleId != null) {
 
-											ContributionData cdConverted = new ContributionData(bundleId, contributionData.className, contributionData.sourceType, contributionData.iconPath);
+											final ContributionData cdConverted = new ContributionData(bundleId,
+												contributionData.className, contributionData.sourceType,
+												contributionData.iconPath);
 											cdConverted.installLocation = installLocation;
-											cdConverted.resourceRelativePath = Path.fromOSString(contributionData.iconPath).removeFirstSegments(1).toOSString();
+											cdConverted.resourceRelativePath = Path
+												.fromOSString(contributionData.iconPath).removeFirstSegments(1)
+												.toOSString();
 											doRequireBundle(bundleId, installLocation);
 											context.set("resolvedFile", new ContributionDataFile(cdConverted)); //$NON-NLS-1$
 										}
-									} catch (Exception e1) {
-										MessageDialog.openError(getShell(), Messages.NonReferencedResourceDialog_error, e1.getMessage());
+									} catch (final Exception e1) {
+										MessageDialog.openError(getShell(), Messages.NonReferencedResourceDialog_error,
+											e1.getMessage());
 									}
 								}
 							};
@@ -345,7 +353,7 @@ public void run() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (btnCopy.getSelection()) {
-						Runnable okAction = new Runnable() {
+						final Runnable okAction = new Runnable() {
 
 							@Override
 							public void run() {
@@ -369,7 +377,7 @@ public void run() {
 				public void widgetSelected(SelectionEvent e) {
 					if (btnCopy2.getSelection()) {
 
-						Runnable okAction = new Runnable() {
+						final Runnable okAction = new Runnable() {
 
 							@Override
 							public void run() {
@@ -401,8 +409,8 @@ protected void setAction(NonReferencedAction action, Runnable runnable) {
 	}
 
 	public void copyResourceToProject() {
-		IProject project = (IProject) context.get("projectToCopyTo"); //$NON-NLS-1$
-		String path = (String) context.get("folderToCopyTo"); //$NON-NLS-1$
+		final IProject project = (IProject) context.get("projectToCopyTo"); //$NON-NLS-1$
+		final String path = (String) context.get("folderToCopyTo"); //$NON-NLS-1$
 		try {
 			// String filename = ((ContributionDataFile)
 			// file).getContributionData().className + ".class";
@@ -413,13 +421,13 @@ public void copyResourceToProject() {
 			if (className != null) {
 				newPath.append(className + ".class"); //$NON-NLS-1$
 			} else {
-				String name = file.getFullPath().lastSegment();
+				final String name = file.getFullPath().lastSegment();
 				newPath = newPath.append(name);
 			}
-			IFile fileClone = project.getFile(newPath);
+			final IFile fileClone = project.getFile(newPath);
 			fileClone.create(file.getContents(), false, null);
 			context.set("resolvedFile", fileClone); //$NON-NLS-1$
-		} catch (CoreException e1) {
+		} catch (final CoreException e1) {
 			e1.printStackTrace();
 			MessageDialog.openError(getShell(), "Error", e1.getMessage()); //$NON-NLS-1$
 		}
@@ -433,7 +441,7 @@ public void doRequireBundle(String bundle, String installLocation) {
 		try {
 			Manifest manifestSource;
 			if (installLocation.endsWith(".jar")) { //$NON-NLS-1$
-				ZipFile zip = new ZipFile(installLocation);
+				final ZipFile zip = new ZipFile(installLocation);
 				srcStream = zip.getInputStream(zip.getEntry("META-INF/MANIFEST.MF")); //$NON-NLS-1$
 				manifestSource = new Manifest(srcStream);
 				zip.close();
@@ -445,17 +453,17 @@ public void doRequireBundle(String bundle, String installLocation) {
 			if (version != null) {
 				version = version.replaceFirst("\\.qualifier", ""); //$NON-NLS-1$ //$NON-NLS-2$
 			}
-		} catch (Exception e) {
+		} catch (final Exception e) {
 			e.printStackTrace();
 			return;
 		} finally {
 			try {
 				srcStream.close();
-			} catch (Exception e) {
+			} catch (final Exception e) {
 			}
 		}
 
-		IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
+		final IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
 		Manifest manifest;
 		try {
 			manifest = new Manifest(fileManifest.getContents());
@@ -469,22 +477,22 @@ public void doRequireBundle(String bundle, String installLocation) {
 				}
 				manifest.getMainAttributes().putValue("Require-Bundle", value); //$NON-NLS-1$
 			}
-			ByteArrayOutputStream bos = new ByteArrayOutputStream();
+			final ByteArrayOutputStream bos = new ByteArrayOutputStream();
 			manifest.write(bos);
 			// StringReader reader = new
-			ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+			final ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
 			fileManifest.setContents(bis, true, true, null);
 			context.set("resolvedFile", file); //$NON-NLS-1$
-		} catch (IOException e1) {
+		} catch (final IOException e1) {
 			e1.printStackTrace();
-		} catch (CoreException e1) {
+		} catch (final CoreException e1) {
 			e1.printStackTrace();
 		}
 	}
 
 	// @Refactor
 	static public String getPackageFromClassName(String className) {
-		int index = className.lastIndexOf('.');
+		final int index = className.lastIndexOf('.');
 		if (index >= 0) {
 			return className.substring(0, index);
 		} else {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
index c5e3613332..6502826d30 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
@@ -6,13 +6,15 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Wim Jongman <wim.jongman@remainsoftware.com> - initial API and implementation
- *     Steven Spungin <steve@spungin.tv> -Bug 439284 - [model editor] make list a combo with autocomplete for add part descriptor
- *     Toni Umbreit - Bug 440289
+ * Wim Jongman <wim.jongman@remainsoftware.com> - initial API and implementation
+ * Steven Spungin <steve@spungin.tv> -Bug 439284 - [model editor] make list a combo with autocomplete for add part
+ * descriptor
+ * Toni Umbreit - Bug 440289
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.uistructure;
 
 import javax.inject.Inject;
+
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.services.nls.Translation;
@@ -40,10 +42,10 @@ public class ViewerElement {
 	Messages Messages;
 
 	private StructuredViewer viewer;
-	private AbstractComponentEditor editor;
+	private final AbstractComponentEditor editor;
 	private ComboViewer dropDown;
 	private Button addButton;
-	private Composite parent;
+	private final Composite parent;
 
 	private Button removeButton;
 
@@ -53,7 +55,6 @@ public class ViewerElement {
 
 	/**
 	 * @param parent
-	 * @param reference
 	 * @param editor
 	 */
 	@Inject
@@ -72,10 +73,11 @@ public void createControl() {
 
 		createTopButtons();
 
-		if (viewer == null)
+		if (viewer == null) {
 			viewer = new TableViewer(parent);
+		}
 
-		GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 3, 1);
+		final GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 3, 1);
 		viewer.getControl().setLayoutData(gd);
 
 		createBottomButtons();
@@ -83,9 +85,9 @@ public void createControl() {
 	}
 
 	private void createBottomButtons() {
-		Composite buttonCompBot = new Composite(parent, SWT.NONE);
+		final Composite buttonCompBot = new Composite(parent, SWT.NONE);
 		buttonCompBot.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 3, 1));
-		GridLayout gl = new GridLayout(3, false);
+		final GridLayout gl = new GridLayout(3, false);
 		gl.marginLeft = 0;
 		gl.marginRight = 0;
 		gl.marginWidth = 0;
@@ -113,17 +115,16 @@ private void createBottomButtons() {
 	 * Returns the button that removes an element from the list. Use it to add
 	 * your {@link SelectionListener} to it.
 	 *
-	 * @return
+	 * @return the {@link Button}
 	 */
 	public Button getButtonRemove() {
 		return removeButton;
 	}
 
 	/**
-	 * Returns the button that adds an element to the list. Use it to add your
-	 * {@link SelectionListener} to it.
+	 * Returns the button that adds an element to the list. Use it to add your {@link SelectionListener} to it.
 	 *
-	 * @return
+	 * @return the {@link Button}
 	 */
 	public Button getButtonAdd() {
 		return addButton;
@@ -133,7 +134,7 @@ public Button getButtonAdd() {
 	 * Returns the button that moves an element down in the list. Use it to add
 	 * your {@link SelectionListener} to it.
 	 *
-	 * @return
+	 * @return the {@link Button}
 	 */
 	public Button getButtonDown() {
 		return downButton;
@@ -143,16 +144,16 @@ public Button getButtonDown() {
 	 * Returns the button that moves an element up in the list. Use it to add
 	 * your {@link SelectionListener} to it.
 	 *
-	 * @return
+	 * @return the {@link Button}
 	 */
 	public Button getButtonUp() {
 		return upButton;
 	}
 
 	private void createTopButtons() {
-		Composite buttonCompTop = new Composite(parent, SWT.NONE);
+		final Composite buttonCompTop = new Composite(parent, SWT.NONE);
 		buttonCompTop.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 3, 1));
-		GridLayout buttonCompTopLayout = new GridLayout(2, false);
+		final GridLayout buttonCompTopLayout = new GridLayout(2, false);
 		buttonCompTopLayout.marginLeft = 0;
 		buttonCompTopLayout.marginRight = 0;
 		buttonCompTopLayout.marginWidth = 0;
@@ -179,12 +180,11 @@ public ComboViewer getDropDown() {
 	 *
 	 * @param parentContext
 	 * @param parent
-	 * @param reference
 	 * @param editor
 	 * @return a new {@link ViewerElement}
 	 */
 	public static ViewerElement create(IEclipseContext parentContext, Composite parent, AbstractComponentEditor editor) {
-		IEclipseContext mycontext = parentContext.createChild();
+		final IEclipseContext mycontext = parentContext.createChild();
 		mycontext.set(Composite.class, parent);
 		mycontext.set(AbstractComponentEditor.class, editor);
 		return ContextInjectionFactory.make(ViewerElement.class, mycontext);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
index e2c10bd2d0..1896f56e66 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - Bug 431735, Bug 391089
+ * Steven Spungin <steven@spungin.tv> - Bug 431735, Bug 391089
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.xml;
@@ -11,6 +11,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
 import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
@@ -33,8 +34,8 @@ public class EMFDocumentResourceMediator {
 
 	public EMFDocumentResourceMediator(final IModelResource modelResource) {
 		this.modelResource = modelResource;
-		this.document = new Document();
-		this.document.addDocumentListener(new IDocumentListener() {
+		document = new Document();
+		document.addDocumentListener(new IDocumentListener() {
 
 			@Override
 			public void documentChanged(DocumentEvent event) {
@@ -42,8 +43,8 @@ public void documentChanged(DocumentEvent event) {
 					return;
 				}
 
-				String doc = document.get();
-				E4XMIResource res = new E4XMIResource();
+				final String doc = document.get();
+				final E4XMIResource res = new E4XMIResource();
 				try {
 					res.load(new InputSource(new StringReader(doc)), null);
 					modelResource.replaceRoot(res.getContents().get(0));
@@ -51,7 +52,7 @@ public void documentChanged(DocumentEvent event) {
 					if (documentValidationChanged != null) {
 						documentValidationChanged.run();
 					}
-				} catch (IOException e) {
+				} catch (final IOException e) {
 					errorList = res.getErrors();
 					if (documentValidationChanged != null) {
 						documentValidationChanged.run();
@@ -79,7 +80,7 @@ public List<Diagnostic> getErrorList() {
 	public void updateFromEMF() {
 		try {
 			updateFromEMF = true;
-			this.document.set(toXMI((EObject) modelResource.getRoot().get(0)));
+			document.set(toXMI((EObject) modelResource.getRoot().get(0)));
 		} finally {
 			updateFromEMF = false;
 		}
@@ -90,12 +91,12 @@ public Document getDocument() {
 	}
 
 	private String toXMI(EObject root) {
-		E4XMIResource resource = (E4XMIResource) root.eResource();
+		final E4XMIResource resource = (E4XMIResource) root.eResource();
 		// resource.getContents().add(EcoreUtil.copy(root));
-		StringWriter writer = new StringWriter();
+		final StringWriter writer = new StringWriter();
 		try {
 			resource.save(writer, null);
-		} catch (IOException e) {
+		} catch (final IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
@@ -111,23 +112,23 @@ public IRegion findStartTag(EObject object) {
 		if (object == null) {
 			return null;
 		}
-		E4XMIResource root = (E4XMIResource) ((EObject) modelResource.getRoot().get(0)).eResource();
-		String xmiId = root.getID(object);
+		final E4XMIResource root = (E4XMIResource) ((EObject) modelResource.getRoot().get(0)).eResource();
+		final String xmiId = root.getID(object);
 
-		FindReplaceDocumentAdapter find = new FindReplaceDocumentAdapter(document);
+		final FindReplaceDocumentAdapter find = new FindReplaceDocumentAdapter(document);
 		IRegion region;
 		try {
 			// TODO This will not work if the element has '<' or '>' in an
 			// attribute value
 			region = find.find(0, "<.*?" + xmiId + ".*?>", true, true, false, true); //$NON-NLS-1$ //$NON-NLS-2$
 			return region;
-		} catch (BadLocationException e) {
+		} catch (final BadLocationException e) {
 			return null;
 		}
 	}
 
 	/**
-	 * @param object
+	 * 
 	 * @return The region for the start of the text, or null if not found or the
 	 *         text is empty.
 	 */
@@ -136,12 +137,12 @@ public IRegion findText(String text, int startOffset) {
 			return null;
 		}
 
-		FindReplaceDocumentAdapter find = new FindReplaceDocumentAdapter(document);
+		final FindReplaceDocumentAdapter find = new FindReplaceDocumentAdapter(document);
 		IRegion region;
 		try {
 			region = find.find(startOffset, text, true, true, false, false);
 			return region;
-		} catch (BadLocationException e) {
+		} catch (final BadLocationException e) {
 			return null;
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
index f09d4a1e00..e9afdeef53 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
@@ -7,8 +7,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Wim Jongmam <wim.jongman@remainsoftware.com> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Ongoing Maintenance
+ * Wim Jongmam <wim.jongman@remainsoftware.com> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Ongoing Maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.imp;
 
@@ -24,28 +24,33 @@
 
 public class ModelImportWizard extends Wizard {
 
-	private Class<? extends MApplicationElement> applicationElement;
+	private final Class<? extends MApplicationElement> applicationElement;
 
 	private ModelImportPage1 page1;
 
-	private MApplication application;
+	private final MApplication application;
 
-	private AbstractComponentEditor editor;
+	private final AbstractComponentEditor editor;
 
 	private final String hint;
 
-	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, AbstractComponentEditor editor, IResourcePool resourcePool) {
+	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, AbstractComponentEditor editor,
+		IResourcePool resourcePool) {
 		this(applicationElement, editor, "", resourcePool); //$NON-NLS-1$
 	}
 
-	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, AbstractComponentEditor editor, String hint, IResourcePool resourcePool) {
+	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, AbstractComponentEditor editor,
+		String hint, IResourcePool resourcePool) {
 		this.applicationElement = applicationElement;
 		this.editor = editor;
 		this.hint = hint;
-		this.application = (MApplication) editor.getEditor().getModelProvider().getRoot().get(0);
-		setWindowTitle(Messages.ModelImportWizard_Model + " " + applicationElement.getSimpleName() + " " + Messages.ModelImportWizard_ImportWizard); //$NON-NLS-1$ //$NON-NLS-2$
-		setDefaultPageImageDescriptor(ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Wizban16_imp3x_wiz)));
-		Assert.isNotNull(RegistryUtil.getStruct(applicationElement, getHint()), Messages.ModelImportWizard_UnknownElement + ": " + applicationElement.getClass().getName()); //$NON-NLS-1$
+		application = (MApplication) editor.getEditor().getModelProvider().getRoot().get(0);
+		setWindowTitle(Messages.ModelImportWizard_Model
+			+ " " + applicationElement.getSimpleName() + " " + Messages.ModelImportWizard_ImportWizard); //$NON-NLS-1$ //$NON-NLS-2$
+		setDefaultPageImageDescriptor(ImageDescriptor.createFromImage(resourcePool
+			.getImageUnchecked(ResourceProvider.IMG_Wizban16_imp3x_wiz)));
+		Assert.isNotNull(RegistryUtil.getStruct(applicationElement, getHint()),
+			Messages.ModelImportWizard_UnknownElement + ": " + applicationElement.getClass().getName()); //$NON-NLS-1$
 	}
 
 	@Override
@@ -69,8 +74,8 @@ public Class<? extends MApplicationElement> getApplicationElement() {
 	}
 
 	/**
-	 * @return the extension point name associated with the
-	 *         {@link MApplicationElement} that is passed in the constructor of
+	 * @return the extension point name associated with the {@link MApplicationElement} that is passed in the
+	 *         constructor of
 	 *         this wizard.
 	 * @see #MAPPING_EXTENSION
 	 * @see #getApplicationElement()
@@ -80,8 +85,8 @@ protected String getExtensionPointName() {
 	}
 
 	/**
-	 * @return the extension point id associated with the
-	 *         {@link MApplicationElement} that is passed in the constructor of
+	 * @return the extension point id associated with the {@link MApplicationElement} that is passed in the constructor
+	 *         of
 	 *         this wizard.
 	 * @see #MAPPING_EXTENSION
 	 * @see #getApplicationElement()
@@ -103,9 +108,9 @@ protected String getMappingName() {
 	 * Returns the list of {@link MApplicationElement}s of the type passed in
 	 * the constructor of the wizard.
 	 *
-	 * @param <T>
 	 *
-	 * @return
+	 *
+	 * @return an array of {@link MApplicationElement}
 	 */
 	public MApplicationElement[] getElements(Class<? extends MApplicationElement> type) {
 		return RegistryUtil.getModelElements(type, getHint(), application, page1.getConfigurationElements());
@@ -127,7 +132,7 @@ public boolean isLiveModel() {
 	/**
 	 * Returns the hint that explains the meaning of the caller.
 	 *
-	 * @return
+	 * @return the hint as a String
 	 */
 	public String getHint() {
 		return hint;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
index 71c377ec0e..537a449415 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
@@ -7,8 +7,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Wim Jongmam <wim.jongman@remainsoftware.com> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Ongoing Maintenance
+ * Wim Jongmam <wim.jongman@remainsoftware.com> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Ongoing Maintenance
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.imp;
 
@@ -16,6 +16,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
@@ -71,9 +72,9 @@ public class RegistryUtil {
 	 * @param t
 	 * @param application
 	 * @param elements
-	 * @return
 	 */
-	public static MApplicationElement[] getModelElements(Class<? extends MApplicationElement> t, String hint, MApplication application, IConfigurationElement... elements) {
+	public static MApplicationElement[] getModelElements(Class<? extends MApplicationElement> t, String hint,
+		MApplication application, IConfigurationElement... elements) {
 
 		Assert.isNotNull(t);
 		Assert.isNotNull(elements);
@@ -105,21 +106,21 @@ public static MApplicationElement[] getModelElements(Class<? extends MApplicatio
 
 	private static MCommand[] getCommands(IConfigurationElement[] elements, MApplication application) {
 
-		ArrayList<MCommand> result = new ArrayList<MCommand>();
+		final ArrayList<MCommand> result = new ArrayList<MCommand>();
 
-		MCommandsFactory commandsFactory = MCommandsFactory.INSTANCE;
+		final MCommandsFactory commandsFactory = MCommandsFactory.INSTANCE;
 
-		for (IConfigurationElement element : elements) {
+		for (final IConfigurationElement element : elements) {
 
-			MCommand command = commandsFactory.createCommand();
+			final MCommand command = commandsFactory.createCommand();
 			command.setCommandName(element.getAttribute(NAME));
 			command.setDescription(element.getAttribute(DESCRIPTION));
 			command.setElementId(element.getAttribute(ID));
-			String catId = element.getAttribute(CATEGORY_ID);
+			final String catId = element.getAttribute(CATEGORY_ID);
 
 			if (catId != null && catId.trim().length() > 0) {
-				List<MCategory> categories = application.getCategories();
-				for (MCategory category : categories) {
+				final List<MCategory> categories = application.getCategories();
+				for (final MCategory category : categories) {
 					if (category.getElementId().equals(catId)) {
 						command.setCategory(category);
 						break;
@@ -135,12 +136,12 @@ private static MCommand[] getCommands(IConfigurationElement[] elements, MApplica
 
 	private static MPerspective[] getPerspectives(IConfigurationElement[] elements) {
 
-		ArrayList<MPerspective> result = new ArrayList<MPerspective>();
+		final ArrayList<MPerspective> result = new ArrayList<MPerspective>();
 
-		MAdvancedFactory factory = MAdvancedFactory.INSTANCE;
+		final MAdvancedFactory factory = MAdvancedFactory.INSTANCE;
 
-		for (IConfigurationElement element : elements) {
-			MPerspective perspective = factory.createPerspective();
+		for (final IConfigurationElement element : elements) {
+			final MPerspective perspective = factory.createPerspective();
 			perspective.setLabel(element.getAttribute(NAME));
 			perspective.setIconURI(getIconURI(element, ICON));
 			perspective.setElementId(element.getAttribute(ID));
@@ -154,13 +155,13 @@ private static MPerspective[] getPerspectives(IConfigurationElement[] elements)
 
 	private static MCategory[] getCategories(IConfigurationElement[] elements) {
 
-		ArrayList<MCategory> result = new ArrayList<MCategory>();
+		final ArrayList<MCategory> result = new ArrayList<MCategory>();
 
-		MCommandsFactory commandsFactory = MCommandsFactory.INSTANCE;
+		final MCommandsFactory commandsFactory = MCommandsFactory.INSTANCE;
 
-		for (IConfigurationElement element : elements) {
+		for (final IConfigurationElement element : elements) {
 
-			MCategory category = commandsFactory.createCategory();
+			final MCategory category = commandsFactory.createCategory();
 			category.setDescription(element.getAttribute(DESCRIPTION));
 			category.setElementId(element.getAttribute(ID));
 			category.setName(element.getAttribute(NAME));
@@ -173,9 +174,9 @@ private static MCategory[] getCategories(IConfigurationElement[] elements) {
 
 	private static MPart[] getViews(IConfigurationElement[] elements) {
 
-		ArrayList<MPart> result = new ArrayList<MPart>();
-		for (IConfigurationElement element : elements) {
-			MPart part = (MPart) EcoreUtil.create(BasicPackageImpl.Literals.PART);
+		final ArrayList<MPart> result = new ArrayList<MPart>();
+		for (final IConfigurationElement element : elements) {
+			final MPart part = (MPart) EcoreUtil.create(BasicPackageImpl.Literals.PART);
 			part.setElementId(element.getAttribute(ID));
 			part.setLabel(element.getAttribute(NAME));
 			part.setIconURI(getIconURI(element, ICON));
@@ -196,22 +197,22 @@ private static MPart[] getViews(IConfigurationElement[] elements) {
 	}
 
 	private static MToolBar createToolBar(MPart part) {
-		MToolBar toolBar = MMenuFactory.INSTANCE.createToolBar();
+		final MToolBar toolBar = MMenuFactory.INSTANCE.createToolBar();
 		toolBar.setElementId(part.getElementId());
 		return toolBar;
 	}
 
 	private static MMenu createViewMenu(MPart part) {
-		MMenu menu = MMenuFactory.INSTANCE.createMenu();
+		final MMenu menu = MMenuFactory.INSTANCE.createMenu();
 		menu.setElementId(part.getElementId());
 		menu.getTags().add(VIEW_MENU);
 		return menu;
 	}
 
 	private static MPart[] getViewsAsCompatibilityViews(IConfigurationElement[] elements) {
-		ArrayList<MPart> result = new ArrayList<MPart>();
-		MPart[] parts = getViews(elements);
-		for (MPart part : parts) {
+		final ArrayList<MPart> result = new ArrayList<MPart>();
+		final MPart[] parts = getViews(elements);
+		for (final MPart part : parts) {
 			part.setContributionURI(COMPATIBILITY_VIEW);
 			result.add(part);
 		}
@@ -219,9 +220,9 @@ private static MPart[] getViewsAsCompatibilityViews(IConfigurationElement[] elem
 	}
 
 	private static MPartDescriptor[] getPartDescriptorsAsCompatibilyViews(IConfigurationElement[] elements) {
-		ArrayList<MPartDescriptor> result = new ArrayList<MPartDescriptor>();
-		MPartDescriptor[] parts = getViewPartDescriptors(elements);
-		for (MPartDescriptor part : parts) {
+		final ArrayList<MPartDescriptor> result = new ArrayList<MPartDescriptor>();
+		final MPartDescriptor[] parts = getViewPartDescriptors(elements);
+		for (final MPartDescriptor part : parts) {
 			part.setContributionURI(COMPATIBILITY_VIEW);
 			result.add(part);
 		}
@@ -230,10 +231,10 @@ private static MPartDescriptor[] getPartDescriptorsAsCompatibilyViews(IConfigura
 
 	private static MPart[] getEditors(IConfigurationElement[] elements) {
 
-		ArrayList<MPart> result = new ArrayList<MPart>();
-		for (IConfigurationElement element : elements) {
+		final ArrayList<MPart> result = new ArrayList<MPart>();
+		for (final IConfigurationElement element : elements) {
 			if ("editor".equals(element.getName())) /* Sanity Check */{ //$NON-NLS-1$
-				MPart part = (MPart) EcoreUtil.create(BasicPackageImpl.Literals.PART);
+				final MPart part = (MPart) EcoreUtil.create(BasicPackageImpl.Literals.PART);
 				part.setElementId(element.getAttribute("id")); //$NON-NLS-1$
 				part.setLabel(element.getAttribute("name")); //$NON-NLS-1$
 				part.setIconURI(getIconURI(element, "icon")); //$NON-NLS-1$
@@ -256,9 +257,10 @@ private static MPart[] getEditors(IConfigurationElement[] elements) {
 
 	private static MPartDescriptor[] getEditorPartDescriptors(IConfigurationElement[] elements) {
 
-		ArrayList<MPartDescriptor> result = new ArrayList<MPartDescriptor>();
-		for (IConfigurationElement element : elements) {
-			MPartDescriptor part = (MPartDescriptor) EcoreUtil.create(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR);
+		final ArrayList<MPartDescriptor> result = new ArrayList<MPartDescriptor>();
+		for (final IConfigurationElement element : elements) {
+			final MPartDescriptor part = (MPartDescriptor) EcoreUtil
+				.create(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR);
 			part.setElementId(element.getAttribute(ID));
 			part.setLabel(element.getAttribute(NAME));
 			part.setIconURI(getIconURI(element, ICON));
@@ -270,11 +272,11 @@ private static MPartDescriptor[] getEditorPartDescriptors(IConfigurationElement[
 			part.setDirtyable(true);
 			part.setAllowMultiple(true);
 
-			MToolBar toolBar = MMenuFactory.INSTANCE.createToolBar();
+			final MToolBar toolBar = MMenuFactory.INSTANCE.createToolBar();
 			toolBar.setElementId(part.getElementId());
 			part.setToolbar(toolBar);
 
-			MMenu menu = MMenuFactory.INSTANCE.createMenu();
+			final MMenu menu = MMenuFactory.INSTANCE.createMenu();
 			menu.setElementId(part.getElementId());
 			menu.getTags().add(VIEW_MENU);
 			part.getMenus().add(menu);
@@ -288,18 +290,19 @@ private static MPartDescriptor[] getEditorPartDescriptors(IConfigurationElement[
 
 	private static MPartDescriptor[] getViewPartDescriptors(IConfigurationElement[] elements) {
 
-		ArrayList<MPartDescriptor> result = new ArrayList<MPartDescriptor>();
-		for (IConfigurationElement element : elements) {
-			MPartDescriptor part = (MPartDescriptor) EcoreUtil.create(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR);
+		final ArrayList<MPartDescriptor> result = new ArrayList<MPartDescriptor>();
+		for (final IConfigurationElement element : elements) {
+			final MPartDescriptor part = (MPartDescriptor) EcoreUtil
+				.create(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR);
 			part.setElementId(element.getAttribute(ID));
 			part.setLabel(element.getAttribute(NAME));
 			part.setIconURI(getIconURI(element, ICON));
 
-			MToolBar toolBar = MMenuFactory.INSTANCE.createToolBar();
+			final MToolBar toolBar = MMenuFactory.INSTANCE.createToolBar();
 			toolBar.setElementId(part.getElementId());
 			part.setToolbar(toolBar);
 
-			MMenu menu = MMenuFactory.INSTANCE.createMenu();
+			final MMenu menu = MMenuFactory.INSTANCE.createMenu();
 			menu.setElementId(part.getElementId());
 			menu.getTags().add(VIEW_MENU);
 			part.getMenus().add(menu);
@@ -313,17 +316,17 @@ private static MPartDescriptor[] getViewPartDescriptors(IConfigurationElement[]
 
 	private static MHandler[] getHandlers(IConfigurationElement[] elements, MApplication application) {
 
-		ArrayList<MHandler> result = new ArrayList<MHandler>();
-		for (IConfigurationElement element : elements) {
-			MHandler hand = MCommandsFactory.INSTANCE.createHandler();
+		final ArrayList<MHandler> result = new ArrayList<MHandler>();
+		for (final IConfigurationElement element : elements) {
+			final MHandler hand = MCommandsFactory.INSTANCE.createHandler();
 			hand.setElementId(element.getAttribute(ID));
 			hand.setContributionURI(getContributionURI(element, CLASS));
 
-			String cmdId = element.getAttribute(COMMAND_ID);
+			final String cmdId = element.getAttribute(COMMAND_ID);
 
 			if (cmdId != null && cmdId.trim().length() > 0) {
-				List<MCommand> categories = application.getCommands();
-				for (MCommand command : categories) {
+				final List<MCommand> categories = application.getCommands();
+				for (final MCommand command : categories) {
 					if (command.getElementId().equals(cmdId)) {
 						hand.setCommand(command);
 						break;
@@ -356,29 +359,29 @@ private static String getContributionURI(IConfigurationElement element, String a
 	 *
 	 * @param registry
 	 * @param extensionPoint
-	 * @return
+	 * @return the bundle ids as an array of Strings
 	 */
 	public static String[] getProvidingBundles(IExtensionRegistry registry, String extensionPoint, boolean isLive) {
 
-		IExtensionLookup service = getService(IExtensionLookup.class, null);
+		final IExtensionLookup service = getService(IExtensionLookup.class, null);
 
 		if (service == null) {
 			return new String[] { "No " + IExtensionLookup.class.getName() + " service found." }; //$NON-NLS-1$ //$NON-NLS-2$
 		}
 
-		ArrayList<String> result = new ArrayList<String>();
+		final ArrayList<String> result = new ArrayList<String>();
 
-		IExtension[] extensions = service.findExtensions(extensionPoint, isLive);
-		for (IExtension extension : extensions) {
-			IConfigurationElement[] elements = extension.getConfigurationElements();
-			for (IConfigurationElement element : elements) {
+		final IExtension[] extensions = service.findExtensions(extensionPoint, isLive);
+		for (final IExtension extension : extensions) {
+			final IConfigurationElement[] elements = extension.getConfigurationElements();
+			for (final IConfigurationElement element : elements) {
 				if (!result.contains(element.getContributor().getName())) {
 					result.add(element.getContributor().getName());
 				}
 			}
 		}
 
-		String[] resultArray = result.toArray(new String[0]);
+		final String[] resultArray = result.toArray(new String[0]);
 		Arrays.sort(resultArray);
 		return resultArray;
 	}
@@ -390,19 +393,20 @@ public static String[] getProvidingBundles(IExtensionRegistry registry, String e
 	 * @return the array of {@link IConfigurationElement} objects that meets the
 	 *         passed criteria.
 	 */
-	public static IConfigurationElement[] getExtensions(IExtensionRegistry registry, RegistryStruct struct, boolean isLive) {
+	public static IConfigurationElement[] getExtensions(IExtensionRegistry registry, RegistryStruct struct,
+		boolean isLive) {
 
-		IExtensionLookup service = getService(IExtensionLookup.class, null);
+		final IExtensionLookup service = getService(IExtensionLookup.class, null);
 		if (struct == null || service == null) {
 			return new IConfigurationElement[0];
 		}
 
-		ArrayList<IConfigurationElement> result = new ArrayList<IConfigurationElement>();
+		final ArrayList<IConfigurationElement> result = new ArrayList<IConfigurationElement>();
 
-		IExtension[] extensions = service.findExtensions(struct.getExtensionPoint(), isLive);
-		for (IExtension extension : extensions) {
-			IConfigurationElement[] elements = extension.getConfigurationElements();
-			for (IConfigurationElement element : elements) {
+		final IExtension[] extensions = service.findExtensions(struct.getExtensionPoint(), isLive);
+		for (final IExtension extension : extensions) {
+			final IConfigurationElement[] elements = extension.getConfigurationElements();
+			for (final IConfigurationElement element : elements) {
 				if (element.getContributor().getName().equals(struct.getBundle())) {
 					if (element.getName().equals(struct.getExtensionPointName())) {
 						result.add(element);
@@ -419,27 +423,21 @@ public static IConfigurationElement[] getExtensions(IExtensionRegistry registry,
 	 * are looking for.
 	 *
 	 * @param applicationElement
-	 * @return the structure that matches the extension registry to the passed
-	 *         {@link ApplicationElement}
+	 * @return the structure that matches the extension registry to the passed {@link ApplicationElement}
 	 */
 	public static RegistryStruct getStruct(Class<? extends MApplicationElement> applicationElement, String hint) {
 
-		if (applicationElement == MCommand.class)
+		if (applicationElement == MCommand.class) {
 			return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.commands", "command", NAME); //$NON-NLS-1$ //$NON-NLS-2$
-
-		else if (applicationElement == MCategory.class)
+		} else if (applicationElement == MCategory.class) {
 			return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.commands", CATEGORY, NAME); //$NON-NLS-1$
-
-		else if (applicationElement == MPerspective.class)
+		} else if (applicationElement == MPerspective.class) {
 			return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.perspectives", "perspective", NAME); //$NON-NLS-1$ //$NON-NLS-2$
-
-		else if (applicationElement == MPart.class)
+		} else if (applicationElement == MPart.class) {
 			return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.views", "view", NAME); //$NON-NLS-1$ //$NON-NLS-2$
-
-		else if (applicationElement == MHandler.class)
+		} else if (applicationElement == MHandler.class) {
 			return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.handlers", "handler", COMMAND_ID); //$NON-NLS-1$ //$NON-NLS-2$
-
-		else if (applicationElement == MPart.class) {
+		} else if (applicationElement == MPart.class) {
 			return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.views", "view", NAME); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 
@@ -449,9 +447,13 @@ else if (applicationElement == MInputPart.class) {
 
 		else if (applicationElement == MPartDescriptor.class) {
 			if (hint == HINT_EDITOR)
+			{
 				return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.editors", EDITOR, NAME); //$NON-NLS-1$
+			}
 			if (hint == HINT_VIEW || hint == HINT_COMPAT_VIEW)
+			{
 				return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.views", "view", NAME); //$NON-NLS-1$ //$NON-NLS-2$
+			}
 		}
 
 		return null;
@@ -460,13 +462,13 @@ else if (applicationElement == MPartDescriptor.class) {
 	private static <T> T getService(Class<T> clazz, String filter) {
 
 		try {
-			BundleContext context = FrameworkUtil.getBundle(RegistryUtil.class).getBundleContext();
+			final BundleContext context = FrameworkUtil.getBundle(RegistryUtil.class).getBundleContext();
 			Collection<ServiceReference<T>> references;
 			references = context.getServiceReferences(clazz, filter);
-			for (ServiceReference<T> reference : references) {
+			for (final ServiceReference<T> reference : references) {
 				return context.getService(reference);
 			}
-		} catch (InvalidSyntaxException e) {
+		} catch (final InvalidSyntaxException e) {
 			// FIXME log
 		}
 		return null;

From cb0bfd471b71fa08ccff3b101adc06eafbbea2bd Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Sun, 7 Dec 2014 14:39:33 +0100
Subject: [PATCH 0863/1286] Bug 444692 - Remove Warnings

---
 .../ui/internal/common/AbstractPickList.java  |  46 ++--
 .../common/FeatureClassLabelProvider.java     |  13 +-
 .../emf/ui/internal/common/ModelEditor.java   |   7 +-
 .../AbstractCommandSelectionDialog.java       |   1 -
 .../component/dialogs/AbstractIdDialog.java   |  19 +-
 .../dialogs/AreaIconDialogEditor.java         |   1 -
 .../BindingContextSelectionDialog.java        |   1 -
 .../CommandCategorySelectionDialog.java       |   1 -
 .../component/dialogs/ExpressionIdDialog.java |   1 -
 .../dialogs/FeatureSelectionDialog.java       |   1 -
 .../dialogs/FilteredContributionDialog.java   | 194 +++++++++--------
 .../dialogs/FindImportElementDialog.java      |   3 +-
 .../FindParentReferenceElementDialog.java     |   3 +-
 ...HandledMenuItemCommandSelectionDialog.java |   1 -
 ...HandledToolItemCommandSelectionDialog.java |   1 -
 .../HandlerCommandSelectionDialog.java        |   1 -
 .../dialogs/SharedElementsDialog.java         |  64 +++---
 .../common/component/tabs/ListTab.java        |  12 +-
 .../component/tabs/TableViewerUtil.java       |  35 ++--
 .../common/component/tabs/XmiTab.java         |  28 +--
 .../TargetPlatformContributionCollector.java  | 197 +++++++++---------
 ...rgetPlatformIconContributionCollector.java |  10 +-
 .../dialogs/DynamicWizard.java                |  25 ++-
 .../dialogs/NonReferencedActionPage.java      |   5 +-
 .../dialogs/NonReferencedResourceDialog.java  | 145 +++++++------
 .../dialogs/NonReferencedResourceWizard.java  |  20 +-
 .../dialogs/PickProjectPage.java              |  23 +-
 .../internal/common/xml/AnnotationAccess.java |   5 +-
 28 files changed, 442 insertions(+), 421 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index a3e7d4db37..f487aa0c01 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common;
@@ -16,6 +16,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -48,8 +49,8 @@
 
 /**
  * <p>
- * A composite widget containing a combo for picking items, a list with
- * selectable items, and action buttons for modifying the list.
+ * A composite widget containing a combo for picking items, a list with selectable items, and action buttons for
+ * modifying the list.
  * </p>
  *
  * @author Steven Spungin
@@ -64,16 +65,17 @@ public static enum PickListFeatures {
 	protected ComboViewer picker;
 	protected TableViewer viewer;
 
-	private Group group;
-	private ToolBar toolBar;
-	private ToolItem tiRemove;
-	private ToolItem tiUp;
-	private ToolItem tiDown;
-	private ToolItem tiAdd;
-	private AutoCompleteField autoCompleteField;
+	private final Group group;
+	private final ToolBar toolBar;
+	private final ToolItem tiRemove;
+	private final ToolItem tiUp;
+	private final ToolItem tiDown;
+	private final ToolItem tiAdd;
+	private final AutoCompleteField autoCompleteField;
 	private Map<String, Object> proposals;
 
-	public AbstractPickList(Composite parent, int style, List<PickListFeatures> listFeatures, Messages messages, AbstractComponentEditor componentEditor) {
+	public AbstractPickList(Composite parent, int style, List<PickListFeatures> listFeatures, Messages messages,
+		AbstractComponentEditor componentEditor) {
 		super(parent, style);
 
 		// TODO remove dependency to Messages and AbstractComponentEditor. They
@@ -130,14 +132,14 @@ public void widgetSelected(SelectionEvent e) {
 		});
 
 		picker = new ComboViewer(group, SWT.DROP_DOWN);
-		Combo control = picker.getCombo();
+		final Combo control = picker.getCombo();
 		control.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
 
-		ComboContentAdapter controlContentAdapter = new ComboContentAdapter() {
+		final ComboContentAdapter controlContentAdapter = new ComboContentAdapter() {
 			@Override
 			public void setControlContents(Control control, String text1, int cursorPosition) {
 				super.setControlContents(control, text1, cursorPosition);
-				Object valueInModel = proposals.get(text1);
+				final Object valueInModel = proposals.get(text1);
 				if (valueInModel != null) {
 					getPicker().setSelection(new StructuredSelection(valueInModel));
 				}
@@ -154,7 +156,7 @@ public void open(OpenEvent event) {
 		});
 
 		viewer = new TableViewer(group);
-		GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1);
+		final GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1);
 		viewer.getControl().setLayoutData(gd);
 
 		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
@@ -194,7 +196,7 @@ public void setInput(Object input) {
 		getPicker().setInput(input);
 
 		proposals = toProposals(input);
-		Set<String> keySet = proposals.keySet();
+		final Set<String> keySet = proposals.keySet();
 		autoCompleteField.setProposals(keySet.toArray(new String[keySet.size()]));
 	}
 
@@ -208,15 +210,15 @@ public void setSelection(ISelection selection) {
 
 	private Map<String, Object> toProposals(Object inputElement) {
 
-		Map<String, Object> props = new TreeMap<String, Object>();
+		final Map<String, Object> props = new TreeMap<String, Object>();
 
 		if (inputElement instanceof Object[]) {
-			for (Object value : (Object[]) inputElement) {
+			for (final Object value : (Object[]) inputElement) {
 				props.put(getTextualValue(value), value);
 			}
 		}
 		if (inputElement instanceof Collection) {
-			for (Object value : (Collection<Object>) inputElement) {
+			for (final Object value : (Collection<Object>) inputElement) {
 				props.put(getTextualValue(value), value);
 			}
 
@@ -263,9 +265,9 @@ public void setText(String text) {
 	}
 
 	public void updateUiState() {
-		IStructuredSelection selection = (IStructuredSelection) getList().getSelection();
-		boolean selected = selection.size() > 0;
-		int count = getItemCount();
+		final IStructuredSelection selection = (IStructuredSelection) getList().getSelection();
+		final boolean selected = selection.size() > 0;
+		final int count = getItemCount();
 		if (tiDown.isDisposed() == false) {
 			tiDown.setEnabled(selected && count > 1);
 			tiUp.setEnabled(selected && count > 1);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
index 16cc4c3916..64900bd964 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common;
@@ -23,7 +23,7 @@
  *
  */
 public class FeatureClassLabelProvider extends LabelProvider {
-	private ModelEditor editor;
+	private final ModelEditor editor;
 
 	public FeatureClassLabelProvider(ModelEditor editor) {
 		this.editor = editor;
@@ -31,13 +31,12 @@ public FeatureClassLabelProvider(ModelEditor editor) {
 
 	@Override
 	public String getText(Object element) {
-		FeatureClass eFeatureClass = (FeatureClass) element;
-		EClass eclass = eFeatureClass.eClass;
-		AbstractComponentEditor elementEditor = editor.getEditor(eclass);
+		final FeatureClass eFeatureClass = (FeatureClass) element;
+		final EClass eclass = eFeatureClass.eClass;
+		final AbstractComponentEditor elementEditor = editor.getEditor(eclass);
 		if (elementEditor != null) {
 			return elementEditor.getLabel(null);
-		} else {
-			return eclass.getName();
 		}
+		return eclass.getName();
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 07b3e16c2d..8d95a5487c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1482,9 +1482,8 @@ public AbstractComponentEditor getEditor(EClass eClass) {
 					return editor;
 				}
 			}
-			if (editor == null) {
-				editor = ContextInjectionFactory.make(DefaultEditor.class, context);
-			}
+
+			editor = ContextInjectionFactory.make(DefaultEditor.class, context);
 		}
 		return editor;
 	}
@@ -1774,7 +1773,7 @@ public boolean performSingleDrop(Object data) {
 				final TreeItem item = (TreeItem) getCurrentEvent().item;
 				if (item != null) {
 					final TreeItem parentItem = item.getParentItem();
-					if (item != null) {
+					if (parentItem != null) {
 						if (parentItem.getData() instanceof VirtualEntry<?>) {
 							final VirtualEntry<?> vE = (VirtualEntry<?>) parentItem.getData();
 							parent = (EObject) vE.getOriginalParent();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index e97ff8a858..66ccc2521f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -48,7 +48,6 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-@SuppressWarnings("restriction")
 public abstract class AbstractCommandSelectionDialog extends SaveDialogBoundsSettingsDialog {
 	private final IModelResource resource;
 	private TableViewer viewer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
index 2abd149a21..5299094b24 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
@@ -45,7 +45,7 @@
 import org.eclipse.swt.widgets.Text;
 
 public abstract class AbstractIdDialog<ContributionClass, ElementClass extends MApplicationElement> extends
-	SaveDialogBoundsSettingsDialog {
+SaveDialogBoundsSettingsDialog {
 
 	protected EModelService modelService;
 
@@ -92,16 +92,16 @@ public void update(ViewerCell cell) {
 				final ElementClass el = (ElementClass) cell.getElement();
 				final String elementId = el.getElementId() != null && el.getElementId().trim().length() > 0 ? el
 					.getElementId() : "(Id missing)"; //$NON-NLS-1$
-				final StyledString str = new StyledString(elementId);
+					final StyledString str = new StyledString(elementId);
 
-				final String infoString = getListItemInformation(el);
-				if (infoString != null && infoString.trim().length() > 0)
-				{
-					str.append(" - " + getListItemInformation(el), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
-				}
+					final String infoString = getListItemInformation(el);
+					if (infoString != null && infoString.trim().length() > 0)
+					{
+						str.append(" - " + getListItemInformation(el), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+					}
 
-				cell.setText(str.getString());
-				cell.setStyleRanges(str.getStyleRanges());
+					cell.setText(str.getString());
+					cell.setStyleRanges(str.getStyleRanges());
 			}
 		};
 	}
@@ -123,7 +123,6 @@ protected Control createDialogArea(Composite parent) {
 		idField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		final PatternFilter filter = new PatternFilter() {
-			@SuppressWarnings("restriction")
 			@Override
 			protected boolean isParentMatch(Viewer viewer, Object element) {
 				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
index 03c813d3a1..0d1a53917d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
@@ -19,7 +19,6 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
-@SuppressWarnings("restriction")
 public class AreaIconDialogEditor extends AbstractIconDialog {
 
 	public AreaIconDialogEditor(Shell parentShell, IEclipseContext context, IProject project,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
index b491829606..37fdb2632f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
@@ -46,7 +46,6 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-@SuppressWarnings("restriction")
 public class BindingContextSelectionDialog extends SaveDialogBoundsSettingsDialog {
 	private final IModelResource resource;
 	private TableViewer viewer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
index 83f71d945b..c78e9907d3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -49,7 +49,6 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-@SuppressWarnings("restriction")
 public class CommandCategorySelectionDialog extends SaveDialogBoundsSettingsDialog {
 	private final IModelResource resource;
 	private TableViewer viewer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
index f3f859b4b6..9f6ccf0fc8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
@@ -46,7 +46,6 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-@SuppressWarnings("restriction")
 public class ExpressionIdDialog extends SaveDialogBoundsSettingsDialog {
 	private final IExtensionLookup lookup;
 	private TableViewer viewer;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index 866fcd9fd0..43ff0299f2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -59,7 +59,6 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-@SuppressWarnings("restriction")
 public class FeatureSelectionDialog extends SaveDialogBoundsSettingsDialog {
 	private TreeViewer viewer;
 	private final MStringModelFragment fragment;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index 1ee9389b39..bb9c845a73 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -6,9 +6,9 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625, Bug 436281
- *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
- *     Marco Descher <marco@descher.at> - Bug 442647
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625, Bug 436281
+ * Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
+ * Marco Descher <marco@descher.at> - Bug 442647
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
@@ -26,6 +26,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Scanner;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.resources.IFile;
@@ -53,7 +54,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.NonReferencedResourceDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.NonReferencedResourceWizard;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
@@ -64,6 +64,7 @@
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.pde.internal.core.project.PDEProject;
 import org.eclipse.pde.internal.core.text.bundle.BundleModel;
@@ -121,7 +122,7 @@ public abstract class FilteredContributionDialog extends SaveDialogBoundsSetting
 	private Button btnFilterLocation;
 	private List<String> filterLocations;
 	private Button btnClearCache;
-	private IEclipseContext context;
+	private final IEclipseContext context;
 	private Composite compOptions;
 	protected boolean includeNonBundles;
 	private Label lblStatus;
@@ -158,7 +159,8 @@ private void updateStatusMessage() {
 			if (hint == ContributionResultHandler.MORE_CANCELED) {
 				message += Messages.FilteredContributionDialog_SearchWasCancelled;
 			} else {
-				message += Messages.FilteredContributionDialog_MoreThan + maxResults + Messages.FilteredContributionDialog_itemsWereFound;
+				message += Messages.FilteredContributionDialog_MoreThan + maxResults
+					+ Messages.FilteredContributionDialog_itemsWereFound;
 			}
 		}
 
@@ -181,7 +183,7 @@ private void updateStatusMessage() {
 
 	private class ContributionResultHandlerImpl implements ContributionResultHandler {
 		private boolean cancled = false;
-		private IObservableList list;
+		private final IObservableList list;
 
 		public ContributionResultHandlerImpl(IObservableList list) {
 			this.list = list;
@@ -207,7 +209,7 @@ public void moreResults(final int hint, final Filter filter) {
 
 					@Override
 					public void run() {
-						FilteredContributionDialog dlg = (FilteredContributionDialog) filter.userData;
+						final FilteredContributionDialog dlg = (FilteredContributionDialog) filter.userData;
 						dlg.hint = hint;
 						dlg.maxResults = filter.maxResults;
 						dlg.updateStatusMessage();
@@ -227,7 +229,7 @@ public boolean close() {
 
 	@Override
 	protected Control createContents(Composite parent) {
-		Control ret = super.createContents(parent);
+		final Control ret = super.createContents(parent);
 		textBox.notifyListeners(SWT.Modify, new Event());
 		textBox.setFocus();
 		return ret;
@@ -238,18 +240,20 @@ public FilteredContributionDialog(Shell parentShell, IEclipseContext context) {
 		this.context = context;
 		imageCache = new BundleImageCache(context.get(Display.class), getClass().getClassLoader());
 
-		String searchScopeString = getPreferences().get(PREF_SEARCHSCOPE, ResourceSearchScope.PROJECT.toString());
+		final String searchScopeString = getPreferences().get(PREF_SEARCHSCOPE, ResourceSearchScope.PROJECT.toString());
 		searchScope = ResourceSearchScope.valueOf(searchScopeString);
 
-		String searchScopesString = getPreferences().get(PREF_SEARCHSCOPES, EnumSet.of(ResourceSearchScope.PROJECT).toString());
+		final String searchScopesString = getPreferences().get(PREF_SEARCHSCOPES,
+			EnumSet.of(ResourceSearchScope.PROJECT).toString());
 		searchScopes = valueOf(ResourceSearchScope.class, searchScopesString);
 	}
 
 	public static <TheType extends Enum<TheType>> EnumSet<TheType> valueOf(Class<TheType> eClass, String str) {
-		String[] arr = str.substring(1, str.length() - 1).split(","); //$NON-NLS-1$
-		EnumSet<TheType> set = EnumSet.noneOf(eClass);
-		for (String e : arr)
-			set.add(TheType.valueOf(eClass, e.trim()));
+		final String[] arr = str.substring(1, str.length() - 1).split(","); //$NON-NLS-1$
+		final EnumSet<TheType> set = EnumSet.noneOf(eClass);
+		for (final String e : arr) {
+			set.add(Enum.valueOf(eClass, e.trim()));
+		}
 		return set;
 	}
 
@@ -292,7 +296,7 @@ public void widgetSelected(SelectionEvent e) {
 	// TODO add results found (and/or more indicator)
 	@Override
 	protected Control createDialogArea(Composite parent) {
-		Composite comp = (Composite) super.createDialogArea(parent);
+		final Composite comp = (Composite) super.createDialogArea(parent);
 		getShell().addDisposeListener(new DisposeListener() {
 
 			@Override
@@ -324,7 +328,7 @@ public void widgetDisposed(DisposeEvent e) {
 
 		createOptions(compOptions);
 
-		Label l = new Label(compOptions, SWT.NONE);
+		final Label l = new Label(compOptions, SWT.NONE);
 		l.setText(getResourceNameText());
 
 		textBox = new Text(compOptions, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
@@ -353,7 +357,7 @@ public void keyPressed(KeyEvent e) {
 			@Override
 			public void keyPressed(KeyEvent e) {
 				super.keyPressed(e);
-				if ((e.keyCode == SWT.ARROW_UP) && (viewer.getTable().getSelectionIndex() == 0)) {
+				if (e.keyCode == SWT.ARROW_UP && viewer.getTable().getSelectionIndex() == 0) {
 					textBox.setFocus();
 				}
 			}
@@ -379,7 +383,8 @@ public void modifyText(ModifyEvent e) {
 
 					@Override
 					protected IStatus run(IProgressMonitor monitor) {
-						monitor.beginTask(Messages.FilteredContributionDialog_ContributionSearch, IProgressMonitor.UNKNOWN);
+						monitor.beginTask(Messages.FilteredContributionDialog_ContributionSearch,
+							IProgressMonitor.UNKNOWN);
 						currentResultHandler = new ContributionResultHandlerImpl(viewerList);
 						getShell().getDisplay().syncExec(new Runnable() {
 
@@ -406,7 +411,7 @@ public void run() {
 
 							@Override
 							public void onStatusChanged(final ProviderStatus status) {
-								FilteredContributionDialog.this.providerStatus = status;
+								providerStatus = status;
 								try {
 									getShell().getDisplay().syncExec(new Runnable() {
 
@@ -430,7 +435,7 @@ public void run() {
 											}
 										}
 									});
-								} catch (Exception e2) {
+								} catch (final Exception e2) {
 									// Dialog may have been closed while
 									// provider was still indexing
 								}
@@ -466,11 +471,11 @@ protected Image getTitleImage() {
 
 	protected void createOptions(Composite compOptions) {
 		{
-			Label lblScope = new Label(compOptions, SWT.NONE);
+			final Label lblScope = new Label(compOptions, SWT.NONE);
 			lblScope.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
 			lblScope.setText(Messages.FilteredContributionDialog_Scope);
 
-			Composite compScope = new Composite(compOptions, SWT.NONE);
+			final Composite compScope = new Composite(compOptions, SWT.NONE);
 			compScope.setLayoutData(new GridData(SWT.BEGINNING, SWT.TOP, false, false));
 			compScope.setLayout(new RowLayout());
 
@@ -488,7 +493,8 @@ public void widgetSelected(SelectionEvent e) {
 					}
 				}
 			});
-			btnScopeProject.setSelection(searchScopes.contains(ResourceSearchScope.PROJECT) && !searchScopes.contains(ResourceSearchScope.REFERENCES));
+			btnScopeProject.setSelection(searchScopes.contains(ResourceSearchScope.PROJECT)
+				&& !searchScopes.contains(ResourceSearchScope.REFERENCES));
 
 			final Button btnProjectAndReferences = new Button(compScope, SWT.RADIO);
 			btnProjectAndReferences.setText(Messages.FilteredContributionDialog_ProjectAndReferences);
@@ -504,7 +510,8 @@ public void widgetSelected(SelectionEvent e) {
 					}
 				}
 			});
-			btnProjectAndReferences.setSelection(searchScopes.contains(ResourceSearchScope.PROJECT) && searchScopes.contains(ResourceSearchScope.REFERENCES));
+			btnProjectAndReferences.setSelection(searchScopes.contains(ResourceSearchScope.PROJECT)
+				&& searchScopes.contains(ResourceSearchScope.REFERENCES));
 
 			final Button btnScopeWorkspace = new Button(compScope, SWT.RADIO);
 			btnScopeWorkspace.setText(Messages.FilteredContributionDialog_Workspace);
@@ -540,11 +547,11 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		{
-			Label lblFilter = new Label(compOptions, SWT.NONE);
+			final Label lblFilter = new Label(compOptions, SWT.NONE);
 			lblFilter.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
 			lblFilter.setText(Messages.FilteredContributionDialog_ScopeFilter);
 
-			Composite compFilter = new Composite(compOptions, SWT.NONE);
+			final Composite compFilter = new Composite(compOptions, SWT.NONE);
 			compFilter.setLayoutData(new GridData(SWT.BEGINNING, SWT.TOP, false, false));
 			compFilter.setLayout(new RowLayout());
 
@@ -606,7 +613,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		}
 		{
-			Label lblIncludeNoneBundle = new Label(compOptions, SWT.NONE);
+			final Label lblIncludeNoneBundle = new Label(compOptions, SWT.NONE);
 			lblIncludeNoneBundle.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
 			lblIncludeNoneBundle.setText(Messages.FilteredContributionDialog_NonBundles);
 
@@ -640,7 +647,7 @@ protected void updateUiState() {
 
 		// original (default) contribution filter does not support this
 		// filtering API
-		boolean enabled = !searchScopes.contains(ResourceSearchScope.PROJECT);
+		final boolean enabled = !searchScopes.contains(ResourceSearchScope.PROJECT);
 		btnFilterNone.setEnabled(enabled);
 		btnFilterBundle.setEnabled(enabled);
 		btnFilterLocation.setEnabled(enabled);
@@ -705,24 +712,24 @@ protected void showBundleFilter() {
 		final ArrayList<String> sorted = new ArrayList<String>(bundleIds);
 		Collections.sort(sorted);
 
-		TitleAreaFilterDialog dlg = new TitleAreaFilterDialog(getShell(), new ColumnLabelProvider()) {
+		final TitleAreaFilterDialog dlg = new TitleAreaFilterDialog(getShell(), new ColumnLabelProvider()) {
 			@Override
 			protected Control createContents(Composite parent) {
-				Control ret = super.createContents(parent);
+				final Control ret = super.createContents(parent);
 				getViewer().setInput(sorted);
 				setMessage(Messages.FilteredContributionDialog_SelectTheBundle);
 				setTitle(Messages.FilteredContributionDialog_BundleFilter);
 				getShell().setText(Messages.FilteredContributionDialog_BundleFilter);
 				try {
 					setTitleImage(imageCache.create("/icons/full/wizban/plugin_wiz.gif")); //$NON-NLS-1$
-				} catch (Exception e) {
+				} catch (final Exception e) {
 					e.printStackTrace();
 				}
 				return ret;
 			}
 		};
-		if (dlg.open() == Dialog.OK) {
-			ArrayList<String> result = new ArrayList<String>();
+		if (dlg.open() == Window.OK) {
+			final ArrayList<String> result = new ArrayList<String>();
 			result.add(dlg.getFirstSelection());
 			setFilterBundles(result);
 			refreshSearch();
@@ -745,10 +752,10 @@ protected void showPackageFilter() {
 		final ArrayList<String> sorted = new ArrayList<String>(packages);
 		Collections.sort(sorted);
 
-		TitleAreaFilterDialog dlg = new TitleAreaFilterDialog(getShell(), new ColumnLabelProvider()) {
+		final TitleAreaFilterDialog dlg = new TitleAreaFilterDialog(getShell(), new ColumnLabelProvider()) {
 			@Override
 			protected Control createContents(Composite parent) {
-				Control ret = super.createContents(parent);
+				final Control ret = super.createContents(parent);
 				getViewer().setInput(sorted);
 				setMessage(Messages.FilteredContributionDialog_SelectThePackage);
 				setTitle(Messages.FilteredContributionDialog_PackageFilter);
@@ -757,8 +764,8 @@ protected Control createContents(Composite parent) {
 				return ret;
 			}
 		};
-		if (dlg.open() == Dialog.OK) {
-			ArrayList<String> result = new ArrayList<String>();
+		if (dlg.open() == Window.OK) {
+			final ArrayList<String> result = new ArrayList<String>();
 			result.add(dlg.getFirstSelection());
 			setFilterBundles(result);
 			refreshSearch();
@@ -771,7 +778,7 @@ public ResourceSearchScope getScope() {
 	}
 
 	public void setScope(ResourceSearchScope scope) {
-		this.searchScope = scope;
+		searchScope = scope;
 	}
 
 	public void setCollector(ClassContributionCollector collector) {
@@ -794,7 +801,7 @@ protected void showLocationFilter() {
 		final HashSet<String> parentLocations = new HashSet<String>();
 		for (String location : locations) {
 			if (location.endsWith(".jar")) { //$NON-NLS-1$
-				int index = location.lastIndexOf(File.separator);
+				final int index = location.lastIndexOf(File.separator);
 				if (index >= 0) {
 					location = location.substring(0, index);
 					parentLocations.add(location);
@@ -807,10 +814,10 @@ protected void showLocationFilter() {
 		final ArrayList<String> sorted = new ArrayList<String>(parentLocations);
 		Collections.sort(sorted);
 
-		TitleAreaFilterDialog dlg = new TitleAreaFilterDialog(getShell(), new ColumnLabelProvider()) {
+		final TitleAreaFilterDialog dlg = new TitleAreaFilterDialog(getShell(), new ColumnLabelProvider()) {
 			@Override
 			protected Control createContents(Composite parent) {
-				Control ret = super.createContents(parent);
+				final Control ret = super.createContents(parent);
 				getViewer().setInput(sorted);
 				setMessage(Messages.FilteredContributionDialog_SelectTheLocation);
 				setTitle(Messages.FilteredContributionDialog_LocationFilter);
@@ -819,8 +826,8 @@ protected Control createContents(Composite parent) {
 				return ret;
 			}
 		};
-		if (dlg.open() == Dialog.OK) {
-			ArrayList<String> result = new ArrayList<String>();
+		if (dlg.open() == Window.OK) {
+			final ArrayList<String> result = new ArrayList<String>();
 			result.add(dlg.getFirstSelection());
 			setFilterBundles(result);
 			refreshSearch();
@@ -832,13 +839,13 @@ protected void rebuildViewer() {
 
 		viewerList = new WritableList();
 
-		TableViewer oldViewer = viewer;
+		final TableViewer oldViewer = viewer;
 		viewer = new TableViewer(compOptions, SWT.FULL_SELECTION | SWT.BORDER);
 		if (oldViewer != null) {
 			viewer.getTable().moveAbove(oldViewer.getTable());
 			oldViewer.getTable().dispose();
 		}
-		GridData gd = new GridData(GridData.FILL_BOTH);
+		final GridData gd = new GridData(GridData.FILL_BOTH);
 		viewer.getControl().setLayoutData(gd);
 		viewer.setContentProvider(new ObservableListContentProvider());
 		viewer.setLabelProvider(new StyledCellLabelProvider() {
@@ -853,7 +860,7 @@ public void update(ViewerCell cell) {
 					return;
 				}
 
-				StyledString styledString = new StyledString();
+				final StyledString styledString = new StyledString();
 				if (data.className != null) {
 					styledString.append(data.className, null);
 				}
@@ -910,17 +917,18 @@ public ResourceSearchScope getSearchScope() {
 	}
 
 	protected IFile getSelectedIfile() {
-		IStructuredSelection s = (IStructuredSelection) getViewer().getSelection();
+		final IStructuredSelection s = (IStructuredSelection) getViewer().getSelection();
 		if (!s.isEmpty()) {
-			Object selected = s.getFirstElement();
+			final Object selected = s.getFirstElement();
 			if (selected instanceof ContributionData) {
-				ContributionData contributionData = (ContributionData) selected;
+				final ContributionData contributionData = (ContributionData) selected;
 				return new ContributionDataFile(contributionData);
 			} else if (selected instanceof IFile) {
 				return (IFile) selected;
 			} else if (selected instanceof Entry) {
-				Entry entry = (Entry) selected;
-				ContributionData cd = new ContributionData(null, null, Messages.FilteredContributionDialog_Java, entry.file.getFullPath().toOSString());
+				final Entry entry = (Entry) selected;
+				final ContributionData cd = new ContributionData(null, null, Messages.FilteredContributionDialog_Java,
+					entry.file.getFullPath().toOSString());
 				cd.installLocation = entry.installLocation;
 				cd.resourceRelativePath = entry.file.getProjectRelativePath().toOSString();
 				return new ContributionDataFile(cd);
@@ -951,29 +959,30 @@ protected IFile checkResourceAccessible(final IFile file, String installLocation
 		// Not a bundle
 		final String bundle = getBundle(file);
 		if (bundle == null) {
-			String message = Messages.FilteredContributionDialog_ResourceIsNotContainedInABundle;
-			NonReferencedResourceWizard wizard = new NonReferencedResourceWizard(getShell(), context.get(IProject.class), bundle, file, installLocation, context);
+			final String message = Messages.FilteredContributionDialog_ResourceIsNotContainedInABundle;
+			final NonReferencedResourceWizard wizard = new NonReferencedResourceWizard(getShell(),
+				context.get(IProject.class), bundle, file, installLocation, context);
 			wizard.setMessage(message);
-			WizardDialog wizDlg = new WizardDialog(getShell(), wizard);
+			final WizardDialog wizDlg = new WizardDialog(getShell(), wizard);
 			wizDlg.setBlockOnOpen(true);
 			if (wizDlg.open() == IDialogConstants.OK_ID) {
 				return wizard.getResult();
-			} else {
-				return null;
 			}
+			return null;
 		}
 
 		// Reference by current project
-		IProject currentProject = context.get(IProject.class);
+		final IProject currentProject = context.get(IProject.class);
 		if (currentProject != null && !getBundle(currentProject).equals(bundle)) {
 			boolean found = false;
 			// search the current project's manifest for require-bundle
 			try {
-				BundleModel model = loadBundleModel(currentProject);
+				final BundleModel model = loadBundleModel(currentProject);
 
-				RequireBundleHeader rbh = (RequireBundleHeader) model.getBundle().getManifestHeader("Require-Bundle"); //$NON-NLS-1$
+				final RequireBundleHeader rbh = (RequireBundleHeader) model.getBundle().getManifestHeader(
+					"Require-Bundle"); //$NON-NLS-1$
 				if (rbh != null) {
-					for (RequireBundleObject item : rbh.getRequiredBundles()) {
+					for (final RequireBundleObject item : rbh.getRequiredBundles()) {
 						if (item.getValue().equals(bundle)) {
 							found = true;
 							break;
@@ -983,13 +992,14 @@ protected IFile checkResourceAccessible(final IFile file, String installLocation
 				// search the current project's manifest for import-package
 				if (!found) {
 					if (file instanceof ContributionDataFile) {
-						ContributionDataFile cdFile = (ContributionDataFile) file;
-						String className = cdFile.getContributionData().className;
+						final ContributionDataFile cdFile = (ContributionDataFile) file;
+						final String className = cdFile.getContributionData().className;
 						if (className != null) {
-							String pakage = NonReferencedResourceDialog.getPackageFromClassName(className);
-							ImportPackageHeader iph = (ImportPackageHeader) model.getBundle().getManifestHeader("Import-Package"); //$NON-NLS-1$
+							final String pakage = NonReferencedResourceDialog.getPackageFromClassName(className);
+							final ImportPackageHeader iph = (ImportPackageHeader) model.getBundle().getManifestHeader(
+								"Import-Package"); //$NON-NLS-1$
 							if (iph != null) {
-								for (ImportPackageObject item : iph.getPackages()) {
+								for (final ImportPackageObject item : iph.getPackages()) {
 									if (item.getValue().equals(pakage)) {
 										found = true;
 										break;
@@ -999,32 +1009,32 @@ protected IFile checkResourceAccessible(final IFile file, String installLocation
 						}
 					}
 				}
-			} catch (Exception e) {
+			} catch (final Exception e) {
 			}
 
 			if (!found) {
-				String message = Messages.FilteredContributionDialog_ResourceIsNotReferencedByThisBundle;
-				NonReferencedResourceWizard wizard = new NonReferencedResourceWizard(getShell(), context.get(IProject.class), bundle, file, installLocation, context);
+				final String message = Messages.FilteredContributionDialog_ResourceIsNotReferencedByThisBundle;
+				final NonReferencedResourceWizard wizard = new NonReferencedResourceWizard(getShell(),
+					context.get(IProject.class), bundle, file, installLocation, context);
 				wizard.setMessage(message);
-				WizardDialog wiz = new WizardDialog(getShell(), wizard);
+				final WizardDialog wiz = new WizardDialog(getShell(), wizard);
 				wiz.setBlockOnOpen(true);
 				if (wiz.open() == IDialogConstants.OK_ID) {
 					return wizard.getResult();
-				} else {
-					return null;
 				}
+				return null;
 			}
 		}
 		return file;
 	}
 
 	public BundleModel loadBundleModel(IProject currentProject) throws CoreException {
-		Document document = new Document();
-		Scanner scanner = new Scanner(PDEProject.getManifest(currentProject).getContents());
+		final Document document = new Document();
+		final Scanner scanner = new Scanner(PDEProject.getManifest(currentProject).getContents());
 		try {
-			String content = scanner.useDelimiter("\\Z").next(); //$NON-NLS-1$
+			final String content = scanner.useDelimiter("\\Z").next(); //$NON-NLS-1$
 			document.set(content);
-			BundleModel model = new BundleModel(document, false);
+			final BundleModel model = new BundleModel(document, false);
 			model.load();
 			return model;
 		} finally {
@@ -1043,7 +1053,7 @@ public void stopSearchThread(boolean bJoin) {
 			if (bJoin) {
 				try {
 					currentSearchThread.join();
-				} catch (InterruptedException e) {
+				} catch (final InterruptedException e) {
 				} finally {
 					currentSearchThread = null;
 				}
@@ -1056,8 +1066,8 @@ public void stopSearchThread(boolean bJoin) {
 	static public String getBundle(IFile file) {
 
 		if (file instanceof ContributionDataFile) {
-			ContributionDataFile cdFile = (ContributionDataFile) file;
-			String ret = cdFile.getBundle();
+			final ContributionDataFile cdFile = (ContributionDataFile) file;
+			final String ret = cdFile.getBundle();
 			if (ret != null) {
 				return ret;
 			} else if (cdFile.getContributionData().installLocation != null) {
@@ -1067,22 +1077,22 @@ static public String getBundle(IFile file) {
 			}
 		}
 
-		IProject project = file.getProject();
+		final IProject project = file.getProject();
 		return getBundle(project);
 	}
 
 	static String getBundle(IProject project) {
-		IFile f = project.getFile("/META-INF/MANIFEST.MF"); //$NON-NLS-1$
+		final IFile f = project.getFile("/META-INF/MANIFEST.MF"); //$NON-NLS-1$
 
 		if (f != null && f.exists()) {
 			BufferedReader r = null;
 			try {
-				InputStream s = f.getContents();
+				final InputStream s = f.getContents();
 				r = new BufferedReader(new InputStreamReader(s));
 				String line;
 				while ((line = r.readLine()) != null) {
 					if (line.startsWith("Bundle-SymbolicName:")) { //$NON-NLS-1$
-						int start = line.indexOf(':');
+						final int start = line.indexOf(':');
 						int end = line.indexOf(';');
 						if (end == -1) {
 							end = line.length();
@@ -1090,15 +1100,15 @@ static String getBundle(IProject project) {
 						return line.substring(start + 1, end).trim();
 					}
 				}
-			} catch (CoreException e) {
+			} catch (final CoreException e) {
 				e.printStackTrace();
-			} catch (IOException e) {
+			} catch (final IOException e) {
 				e.printStackTrace();
 			} finally {
 				if (r != null) {
 					try {
 						r.close();
-					} catch (IOException e) {
+					} catch (final IOException e) {
 					}
 				}
 			}
@@ -1110,20 +1120,20 @@ static String getBundle(IProject project) {
 	 * Searches the directory for a manifest and parses the symbolic name.
 	 *
 	 * @param rootDirectory
-	 * @return
+	 * @return the id of the bundle if existing
 	 */
 	public static String getBundle(String rootDirectory) {
-		File f = new File(new File(rootDirectory), "/META-INF/MANIFEST.MF"); //$NON-NLS-1$
+		final File f = new File(new File(rootDirectory), "/META-INF/MANIFEST.MF"); //$NON-NLS-1$
 
 		if (f.exists()) {
 			BufferedReader r = null;
 			try {
-				InputStream s = new FileInputStream(f);
+				final InputStream s = new FileInputStream(f);
 				r = new BufferedReader(new InputStreamReader(s));
 				String line;
 				while ((line = r.readLine()) != null) {
 					if (line.startsWith("Bundle-SymbolicName:")) { //$NON-NLS-1$
-						int start = line.indexOf(':');
+						final int start = line.indexOf(':');
 						int end = line.indexOf(';');
 						if (end == -1) {
 							end = line.length();
@@ -1131,13 +1141,13 @@ public static String getBundle(String rootDirectory) {
 						return line.substring(start + 1, end).trim();
 					}
 				}
-			} catch (IOException e) {
+			} catch (final IOException e) {
 				e.printStackTrace();
 			} finally {
 				if (r != null) {
 					try {
 						r.close();
-					} catch (IOException e) {
+					} catch (final IOException e) {
 					}
 				}
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index 25e5a20d58..e0e4c007e3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -53,7 +53,6 @@
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
 
-@SuppressWarnings("restriction")
 public class FindImportElementDialog extends SaveDialogBoundsSettingsDialog {
 	private final EObject element;
 	private final AbstractComponentEditor editor;
@@ -112,7 +111,7 @@ public void update(ViewerCell cell) {
 				final MApplicationElement appEl = (MApplicationElement) o;
 				final StyledString styledString = new StyledString(
 					editor.getLabel(o)
-					+ " (" + (appEl.getElementId() == null ? "<" + Messages.FindImportElementDialog_noId + ">" : appEl.getElementId()) + ")", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+						+ " (" + (appEl.getElementId() == null ? "<" + Messages.FindImportElementDialog_noId + ">" : appEl.getElementId()) + ")", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 				final String detailLabel = editor.getDetailLabel(o);
 				if (detailLabel != null && !detailLabel.equals(appEl.getElementId())) {
 					styledString.append(" - " + detailLabel, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index e8d1591846..ddef900866 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -73,7 +73,6 @@
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
 
-@SuppressWarnings("restriction")
 public class FindParentReferenceElementDialog extends TitleAreaDialog {
 	private final MStringModelFragment fragment;
 	private final AbstractComponentEditor editor;
@@ -196,7 +195,7 @@ public void update(ViewerCell cell) {
 
 				final StyledString styledString = new StyledString(
 					editor.getLabel(o)
-					+ " (" + (appEl.getElementId() == null ? "<" + Messages.FindParentReferenceElementDialog_NoId + ">" : appEl.getElementId()) + ")", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+						+ " (" + (appEl.getElementId() == null ? "<" + Messages.FindParentReferenceElementDialog_NoId + ">" : appEl.getElementId()) + ")", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 				final String detailLabel = editor.getDetailLabel(o);
 				if (detailLabel != null && !detailLabel.equals(appEl.getElementId())) {
 					styledString.append(" - " + detailLabel, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
index 1fb224d42e..7f0d166b63 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
@@ -20,7 +20,6 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
-@SuppressWarnings("restriction")
 public class HandledMenuItemCommandSelectionDialog extends AbstractCommandSelectionDialog {
 	private final MHandledItem handler;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
index 44a2a07435..fdb375df96 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
@@ -20,7 +20,6 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
-@SuppressWarnings("restriction")
 public class HandledToolItemCommandSelectionDialog extends AbstractCommandSelectionDialog {
 	private final MHandledItem handler;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
index 2cda1c4522..e566e1b1f5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
@@ -20,7 +20,6 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.swt.widgets.Shell;
 
-@SuppressWarnings("restriction")
 public class HandlerCommandSelectionDialog extends AbstractCommandSelectionDialog {
 	private final MHandler handler;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index 9743e7097d..9ba04e589d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -6,14 +6,15 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -60,12 +61,13 @@
 
 public class SharedElementsDialog extends SaveDialogBoundsSettingsDialog {
 	private TableViewer viewer;
-	private MPlaceholder placeholder;
-	private IModelResource resource;
-	private ModelEditor editor;
-	private Messages Messages;
+	private final MPlaceholder placeholder;
+	private final IModelResource resource;
+	private final ModelEditor editor;
+	private final Messages Messages;
 
-	public SharedElementsDialog(Shell parentShell, ModelEditor editor, MPlaceholder placeholder, IModelResource resource, Messages Messages) {
+	public SharedElementsDialog(Shell parentShell, ModelEditor editor, MPlaceholder placeholder,
+		IModelResource resource, Messages Messages) {
 		super(parentShell);
 		this.editor = editor;
 		this.placeholder = placeholder;
@@ -75,20 +77,20 @@ public SharedElementsDialog(Shell parentShell, ModelEditor editor, MPlaceholder
 
 	@Override
 	protected Control createDialogArea(Composite parent) {
-		Composite comp = (Composite) super.createDialogArea(parent);
+		final Composite comp = (Composite) super.createDialogArea(parent);
 
 		getShell().setText(Messages.SharedElementsDialog_ShellTitle);
 		setTitle(Messages.SharedElementsDialog_Title);
 		setMessage(Messages.SharedElementsDialog_Message);
 
-		Composite container = new Composite(comp, SWT.NONE);
+		final Composite container = new Composite(comp, SWT.NONE);
 		container.setLayout(new GridLayout(2, false));
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
 
 		Label l = new Label(container, SWT.NONE);
 		l.setText(Messages.SharedElementsDialog_Name);
 
-		Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
+		final Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		l = new Label(container, SWT.NONE);
@@ -107,14 +109,14 @@ public void doubleClick(DoubleClickEvent event) {
 		});
 
 		if (resource.getRoot().get(0) instanceof MApplication) {
-			List<MUIElement> list = new ArrayList<MUIElement>();
-			for (MWindow m : ((MApplication) resource.getRoot().get(0)).getChildren()) {
+			final List<MUIElement> list = new ArrayList<MUIElement>();
+			for (final MWindow m : ((MApplication) resource.getRoot().get(0)).getChildren()) {
 				list.addAll(filter(m.getSharedElements()));
 			}
 			viewer.setInput(list);
 		} else if (resource.getRoot().get(0) instanceof MModelFragments) {
-			List<MApplicationElement> list = new ArrayList<MApplicationElement>();
-			for (MModelFragment f : ((MModelFragments) resource.getRoot().get(0)).getFragments()) {
+			final List<MApplicationElement> list = new ArrayList<MApplicationElement>();
+			for (final MModelFragment f : ((MModelFragments) resource.getRoot().get(0)).getFragments()) {
 				if (f instanceof MStringModelFragment) {
 					if (((MStringModelFragment) f).getFeaturename().equals("sharedElements")) { //$NON-NLS-1$
 						list.addAll(filter(f.getElements()));
@@ -123,7 +125,7 @@ public void doubleClick(DoubleClickEvent event) {
 			}
 
 			// NEW IMPLEMENTATION:
-			for (MApplicationElement f : ((MModelFragments) resource.getRoot().get(0)).getImports()) {
+			for (final MApplicationElement f : ((MModelFragments) resource.getRoot().get(0)).getImports()) {
 				// let filter() do its job
 				list.addAll(filter(Collections.singletonList(f)));
 			}
@@ -146,8 +148,9 @@ protected boolean isParentMatch(Viewer viewer, Object element) {
 	@Override
 	protected void okPressed() {
 		if (!viewer.getSelection().isEmpty()) {
-			IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-			Command cmd = SetCommand.create(resource.getEditingDomain(), placeholder, AdvancedPackageImpl.Literals.PLACEHOLDER__REF, s.getFirstElement());
+			final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+			final Command cmd = SetCommand.create(resource.getEditingDomain(), placeholder,
+				AdvancedPackageImpl.Literals.PLACEHOLDER__REF, s.getFirstElement());
 			if (cmd.canExecute()) {
 				resource.getEditingDomain().getCommandStack().execute(cmd);
 				super.okPressed();
@@ -156,8 +159,8 @@ protected void okPressed() {
 	}
 
 	private static <T> List<T> filter(List<T> o) {
-		List<T> rv = new ArrayList<T>();
-		for (T i : o) {
+		final List<T> rv = new ArrayList<T>();
+		for (final T i : o) {
 			if (i instanceof MPart || i instanceof MPartSashContainer || i instanceof MArea || i instanceof MPartStack) {
 				rv.add(i);
 			}
@@ -168,15 +171,15 @@ private static <T> List<T> filter(List<T> o) {
 	private class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
 		@Override
 		public void update(final ViewerCell cell) {
-			EObject o = (EObject) cell.getElement();
+			final EObject o = (EObject) cell.getElement();
 
-			StyledString string = new StyledString(getTypename(o));
+			final StyledString string = new StyledString(getTypename(o));
 
 			if (o instanceof MUILabel) {
 				string.append(" - " + ((MUILabel) o).getLabel(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 			}
 
-			MApplicationElement el = (MApplicationElement) o;
+			final MApplicationElement el = (MApplicationElement) o;
 			string.append(" - " + el.getElementId(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 
 			cell.setText(string.getString());
@@ -186,29 +189,28 @@ public void update(final ViewerCell cell) {
 
 		@Override
 		public String getText(Object element) {
-			EObject o = (EObject) element;
-			MApplicationElement el = (MApplicationElement) o;
+			final EObject o = (EObject) element;
+			final MApplicationElement el = (MApplicationElement) o;
 
 			if (el instanceof MUILabel) {
-				MUILabel label = (MUILabel) el;
+				final MUILabel label = (MUILabel) el;
 				return getTypename(o) + " - " + el.getElementId() + " - " + label.getLabel(); //$NON-NLS-1$ //$NON-NLS-2$
-			} else {
-				return getTypename(o) + " - " + el.getElementId() + " - "; //$NON-NLS-1$ //$NON-NLS-2$
 			}
+			return getTypename(o) + " - " + el.getElementId() + " - "; //$NON-NLS-1$ //$NON-NLS-2$
 		}
 
 		private String getTypename(EObject o) {
-			AbstractComponentEditor editor = SharedElementsDialog.this.editor.getEditor((o).eClass());
+			final AbstractComponentEditor editor = SharedElementsDialog.this.editor.getEditor(o.eClass());
 			if (editor != null) {
 				return editor.getLabel(o);
-			} else {
-				return o.eClass().getName();
 			}
+			return o.eClass().getName();
 		}
 
 		@Override
 		public Image getImage(Object element) {
-			AbstractComponentEditor editor = SharedElementsDialog.this.editor.getEditor(((EObject) element).eClass());
+			final AbstractComponentEditor editor = SharedElementsDialog.this.editor.getEditor(((EObject) element)
+				.eClass());
 			if (editor != null) {
 				return editor.getImage(element, getShell().getDisplay());
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index 268d734213..f81eb4d77a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -857,9 +857,8 @@ public Color getBackground(Object element) {
 			Color ret;
 			if (isHighlighted(element)) {
 				return ret = tvResults.getTable().getDisplay().getSystemColor(SWT.COLOR_YELLOW);
-			} else {
-				ret = super.getBackground(element);
 			}
+			ret = super.getBackground(element);
 			return ret;
 		}
 	}
@@ -937,22 +936,19 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 						case EXCLUDE:
 							if (E.isEmpty(EmfUtil.getAttributeValue((EObject) element, filterByAttrName))) {
 								return false;
-							} else {
-								return filtered.contains(element);
 							}
+							return filtered.contains(element);
 						case ONLY:
 							if (E.notEmpty(EmfUtil.getAttributeValue((EObject) element, filterByAttrName))) {
 								return false;
-							} else {
-								return true;
 							}
+							return true;
 						default:
 						case INCLUDE:
 							if (E.isEmpty(EmfUtil.getAttributeValue((EObject) element, filterByAttrName))) {
 								return true;
-							} else {
-								return filtered.contains(element);
 							}
+							return filtered.contains(element);
 						}
 					}
 				};
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
index 728cf3fb37..1440b0606a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, ongoing maintenance
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation, ongoing maintenance
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
@@ -15,6 +15,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
+
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
@@ -40,8 +41,9 @@ static class ColumnLabelSorter extends TableViewerUtil.AbstractInvertableTableSo
 
 		@Override
 		public int compare(Viewer viewer, Object e1, Object e2) {
-			TableViewer tableViewer = (TableViewer) viewer;
-			ColumnLabelProvider labelProvider = (ColumnLabelProvider) tableViewer.getLabelProvider(Arrays.asList(tableViewer.getTable().getColumns()).indexOf(col));
+			final TableViewer tableViewer = (TableViewer) viewer;
+			final ColumnLabelProvider labelProvider = (ColumnLabelProvider) tableViewer.getLabelProvider(Arrays.asList(
+				tableViewer.getTable().getColumns()).indexOf(col));
 			return labelProvider.getText(e1).compareTo(labelProvider.getText(e2));
 		}
 	}
@@ -60,7 +62,7 @@ static public abstract class AbstractInvertableTableSorter extends InvertableSor
 
 			@Override
 			public int compare(Viewer viewer, Object e1, Object e2) {
-				return (-1) * AbstractInvertableTableSorter.this.compare(viewer, e1, e2);
+				return -1 * AbstractInvertableTableSorter.this.compare(viewer, e1, e2);
 			}
 
 			@Override
@@ -110,12 +112,13 @@ static public class TableSortSelectionListener implements SelectionListener {
 		 *            column is reselected. If false, the listener will use the
 		 *            default sorting direction
 		 */
-		public TableSortSelectionListener(TableViewer viewer, TableColumn column, AbstractInvertableTableSorter sorter, int defaultDirection, boolean keepDirection) {
+		public TableSortSelectionListener(TableViewer viewer, TableColumn column, AbstractInvertableTableSorter sorter,
+			int defaultDirection, boolean keepDirection) {
 			this.viewer = viewer;
 			this.column = column;
 			this.keepDirection = keepDirection;
-			this.sorter = (defaultDirection == SWT.UP) ? sorter : sorter.getInverseSorter();
-			this.currentSorter = this.sorter;
+			this.sorter = defaultDirection == SWT.UP ? sorter : sorter.getInverseSorter();
+			currentSorter = this.sorter;
 
 			this.column.addSelectionListener(this);
 		}
@@ -165,11 +168,11 @@ static public void updateAndPack(TableViewer viewer, Object object) {
 
 	public static boolean isColumnClicked(TableViewer viewer, MouseEvent e, TableViewerColumn tvColumn) {
 		boolean ret;
-		ViewerCell cell = viewer.getCell(new Point(e.x, e.y));
+		final ViewerCell cell = viewer.getCell(new Point(e.x, e.y));
 		if (cell == null) {
 			ret = false;
 		} else {
-			int index = Arrays.asList(viewer.getTable().getColumns()).indexOf(tvColumn.getColumn());
+			final int index = Arrays.asList(viewer.getTable().getColumns()).indexOf(tvColumn.getColumn());
 			if (index == -1) {
 				ret = false;
 			} else {
@@ -180,22 +183,21 @@ public static boolean isColumnClicked(TableViewer viewer, MouseEvent e, TableVie
 	}
 
 	public static Object getData(TableViewer viewer, MouseEvent e) {
-		ViewerCell cell = viewer.getCell(new Point(e.x, e.y));
+		final ViewerCell cell = viewer.getCell(new Point(e.x, e.y));
 		if (cell == null) {
 			return null;
-		} else {
-			return cell.getElement();
 		}
+		return cell.getElement();
 	}
 
 	public static void packAllColumns(TableViewer viewer) {
-		for (TableColumn col : viewer.getTable().getColumns()) {
+		for (final TableColumn col : viewer.getTable().getColumns()) {
 			col.pack();
 		}
 	}
 
 	static public void resetColumnOrder(TableViewer tvResults) {
-		int[] order = tvResults.getTable().getColumnOrder();
+		final int[] order = tvResults.getTable().getColumnOrder();
 		for (int i = 0; i < order.length; i++) {
 			order[i] = i;
 		}
@@ -216,11 +218,10 @@ public int compare(TableColumn o1, TableColumn o2) {
 	}
 
 	static public int getVisibleColumnIndex(TableViewer tvResults2, TableColumn col) {
-		int createOrder = Arrays.asList(tvResults2.getTable().getColumns()).indexOf(col);
+		final int createOrder = Arrays.asList(tvResults2.getTable().getColumns()).indexOf(col);
 		if (createOrder == -1) {
 			return -1;
-		} else {
-			return tvResults2.getTable().getColumnOrder()[createOrder];
 		}
+		return tvResults2.getTable().getColumnOrder()[createOrder];
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
index f569860698..7887ffc4ba 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
@@ -7,13 +7,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 391089, Bug 437543, Ongoing Maintenance
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 391089, Bug 437543, Ongoing Maintenance
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -96,8 +97,8 @@ public void keyPressed(KeyEvent e) {
 		});
 
 		final AnnotationModel model = new AnnotationModel();
-		VerticalRuler verticalRuler = new VerticalRuler(VERTICAL_RULER_WIDTH, new AnnotationAccess(resourcePool));
-		int styles = SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION;
+		final VerticalRuler verticalRuler = new VerticalRuler(VERTICAL_RULER_WIDTH, new AnnotationAccess(resourcePool));
+		final int styles = SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION;
 		sourceViewer = new SourceViewer(this, verticalRuler, styles);
 		sourceViewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
@@ -106,7 +107,8 @@ public void keyPressed(KeyEvent e) {
 		sourceViewer.getTextWidget().setFont(JFaceResources.getTextFont());
 
 		final IDocument document = emfDocumentProvider.getDocument();
-		IDocumentPartitioner partitioner = new FastPartitioner(new XMLPartitionScanner(), new String[] { XMLPartitionScanner.XML_TAG, XMLPartitionScanner.XML_COMMENT });
+		final IDocumentPartitioner partitioner = new FastPartitioner(new XMLPartitionScanner(), new String[] {
+			XMLPartitionScanner.XML_TAG, XMLPartitionScanner.XML_COMMENT });
 		partitioner.connect(document);
 		document.setDocumentPartitioner(partitioner);
 		sourceViewer.setDocument(document);
@@ -118,13 +120,13 @@ public void keyPressed(KeyEvent e) {
 			public void run() {
 				model.removeAllAnnotations();
 
-				for (Diagnostic d : emfDocumentProvider.getErrorList()) {
-					Annotation a = new Annotation("e4xmi.error", false, d.getMessage()); //$NON-NLS-1$
+				for (final Diagnostic d : emfDocumentProvider.getErrorList()) {
+					final Annotation a = new Annotation("e4xmi.error", false, d.getMessage()); //$NON-NLS-1$
 					int l;
 					try {
 						l = document.getLineOffset(d.getLine() - 1);
 						model.addAnnotation(a, new Position(l));
-					} catch (BadLocationException e) {
+					} catch (final BadLocationException e) {
 						// TODO Auto-generated catch block
 						e.printStackTrace();
 					}
@@ -132,7 +134,8 @@ public void run() {
 			}
 		});
 
-		String property = System.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
+		final String property = System
+			.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
 		if (property != null || preferences.getBoolean("tab-form-search-show", false)) { //$NON-NLS-1$
 			sourceViewer.setEditable(false);
 			sourceViewer.getTextWidget().setEnabled(false);
@@ -156,11 +159,10 @@ protected int searchAndHighlight(String text, int startOffset) {
 			if (region != null) {
 				sourceViewer.setSelection(new TextSelection(region.getOffset(), region.getLength()), true);
 				return region.getOffset() + region.getLength();
-			} else {
-				sourceViewer.setSelection(new TextSelection(0, 0), true);
-				return -1;
 			}
-		} catch (Exception e) {
+			sourceViewer.setSelection(new TextSelection(0, 0), true);
+			return -1;
+		} catch (final Exception e) {
 			e.printStackTrace();
 			return -1;
 		}
@@ -172,7 +174,7 @@ public IEclipseContext getContext() {
 
 	public void gotoEObject(EObject object) {
 		// select the entire start tag
-		IRegion region = emfDocumentProvider.findStartTag(object);
+		final IRegion region = emfDocumentProvider.findStartTag(object);
 		if (region != null) {
 			sourceViewer.setSelection(new TextSelection(region.getOffset(), region.getLength()), true);
 		} else {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
index e18e2b5395..b6b17902bc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
@@ -6,8 +6,9 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625, Bug 436133, Bug 436132, Bug 436283, Bug 436281, Bug 443510
- *     Fabian Miehe - Bug 440327
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625, Bug 436133, Bug 436132,
+ * Bug 436283, Bug 436281, Bug 443510
+ * Fabian Miehe - Bug 440327
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator;
@@ -31,10 +32,12 @@
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
+
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathFactory;
+
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.runtime.IPath;
@@ -112,7 +115,7 @@ protected TargetPlatformContributionCollector(String cacheName) {
 			@Override
 			public void findContribution(Filter filter, ContributionResultHandler handler) {
 
-				Pattern patternName = Pattern.compile(filter.namePattern, Pattern.CASE_INSENSITIVE);
+				final Pattern patternName = Pattern.compile(filter.namePattern, Pattern.CASE_INSENSITIVE);
 
 				reloadCache(false, filter.getProviderStatusCallback());
 
@@ -125,18 +128,18 @@ public void findContribution(Filter filter, ContributionResultHandler handler) {
 				boolean more = false;
 
 				stopFiltering = false;
-				for (Entry e : cacheEntry) {
+				for (final Entry e : cacheEntry) {
 					if (stopFiltering) {
 						break;
 					}
-					IProgressMonitor monitor = filter.getProgressMonitor();
+					final IProgressMonitor monitor = filter.getProgressMonitor();
 					if (monitor != null) {
 						if (monitor.isCanceled()) {
 							stopFiltering = true;
 							break;
-						} else {
-							monitor.subTask(Messages.TargetPlatformContributionCollector_Searching + " " + e.installLocation); //$NON-NLS-1$
 						}
+						monitor.subTask(Messages.TargetPlatformContributionCollector_Searching
+							+ " " + e.installLocation); //$NON-NLS-1$
 					}
 
 					if (E.notEmpty(filter.getBundles())) {
@@ -151,7 +154,7 @@ public void findContribution(Filter filter, ContributionResultHandler handler) {
 					}
 					if (E.notEmpty(filter.getLocations())) {
 						boolean locationFound = false;
-						for (String location : filter.getLocations()) {
+						for (final String location : filter.getLocations()) {
 							if (e.installLocation.startsWith(location)) {
 								locationFound = true;
 								break;
@@ -168,12 +171,12 @@ public void findContribution(Filter filter, ContributionResultHandler handler) {
 					}
 					if (filter.getSearchScope().contains(ResourceSearchScope.WORKSPACE)) {
 						if (filter.project != null) {
-							IWorkspace workspace = filter.project.getWorkspace();
+							final IWorkspace workspace = filter.project.getWorkspace();
 							boolean fnd = false;
-							for (IProject project : workspace.getRoot().getProjects()) {
+							for (final IProject project : workspace.getRoot().getProjects()) {
 								// String path =
 								// project.getLocationURI().getPath();
-								String path = project.getName();
+								final String path = project.getName();
 								if (e.installLocation.contains(path)) {
 									fnd = true;
 									break;
@@ -185,16 +188,15 @@ public void findContribution(Filter filter, ContributionResultHandler handler) {
 						}
 					}
 
-					Matcher m = patternName.matcher(e.name);
+					final Matcher m = patternName.matcher(e.name);
 					if (m.find()) {
 						found++;
 						if (found > maxResults) {
 							more = true;
 							handler.moreResults(ContributionResultHandler.MORE_UNKNOWN, filter);
 							break;
-						} else {
-							handler.result(makeData(e));
 						}
+						handler.result(makeData(e));
 					}
 
 				}
@@ -234,8 +236,8 @@ protected ContributionData makeData(Entry e) {
 		IPath ip = Path.fromOSString(e.path);
 		ip = ip.addTrailingSeparator().makeRelative();
 		ip = ip.append(e.name);
-		String className = ip.toOSString().replace(File.separatorChar, '.');
-		ContributionData data = new ContributionData(e.bundleSymName, className, "Java", e.installLocation); //$NON-NLS-1$
+		final String className = ip.toOSString().replace(File.separatorChar, '.');
+		final ContributionData data = new ContributionData(e.bundleSymName, className, "Java", e.installLocation); //$NON-NLS-1$
 		data.installLocation = e.installLocation;
 		data.resourceRelativePath = e.relativePath;
 		return data;
@@ -292,95 +294,97 @@ private void reloadCache(boolean force, final IProviderStatusCallback providerSt
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					// load workspace projects
-					IProject[] projects = PDECore.getWorkspace().getRoot().getProjects();
-					IPluginModelBase[] models = TargetPlatformHelper.getPDEState().getTargetModels();
-					int total = projects.length + models.length;
-					monitor.beginTask(Messages.TargetPlatformContributionCollector_updatingTargetPlatformCache + cacheName + ")", total); //$NON-NLS-1$
+					final IProject[] projects = PDECore.getWorkspace().getRoot().getProjects();
+					final IPluginModelBase[] models = TargetPlatformHelper.getPDEState().getTargetModels();
+					final int total = projects.length + models.length;
+					monitor.beginTask(Messages.TargetPlatformContributionCollector_updatingTargetPlatformCache
+						+ cacheName + ")", total); //$NON-NLS-1$
 
 					for (final IProject pj : projects) {
 						if (monitor.isCanceled()) {
 							break;
 						}
-						String rootDirectory = pj.getLocation().toOSString();
+						final String rootDirectory = pj.getLocation().toOSString();
 						monitor.subTask(rootDirectory);
 						monitor.worked(1);
-						TargetPlatformContributionCollector.this.visit(monitor, FilteredContributionDialog.getBundle(rootDirectory), rootDirectory, new File(rootDirectory));
+						TargetPlatformContributionCollector.this
+						.visit(monitor, FilteredContributionDialog.getBundle(rootDirectory), rootDirectory,
+							new File(rootDirectory));
 					}
 
 					// load target platform bundles
-					for (IPluginModelBase pluginModelBase : models) {
+					for (final IPluginModelBase pluginModelBase : models) {
 						monitor.subTask(pluginModelBase.getPluginBase().getId());
 						monitor.worked(1);
 						if (monitor.isCanceled()) {
 							break;
 						}
 
-						IPluginBase pluginBase = pluginModelBase.getPluginBase();
+						final IPluginBase pluginBase = pluginModelBase.getPluginBase();
 						if (pluginBase == null) {
 							// bundle = getBundle(new File())
 							continue;
 						}
 						URL url;
 						try {
-							String installLocation = pluginModelBase.getInstallLocation();
+							final String installLocation = pluginModelBase.getInstallLocation();
 							if (installLocation.endsWith(".jar")) { //$NON-NLS-1$
 								url = new URL("file://" + installLocation); //$NON-NLS-1$
-								ZipInputStream zis = new ZipInputStream(url.openStream());
+								final ZipInputStream zis = new ZipInputStream(url.openStream());
 								while (true) {
-									ZipEntry entry = zis.getNextEntry();
+									final ZipEntry entry = zis.getNextEntry();
 									if (entry == null) {
 										break;
-									} else {
-										String name2 = entry.getName();
-										if (shouldIgnore(name2)) {
-											continue;
-										}
-										Matcher m = patternFile.matcher(name2);
-										if (m.matches()) {
-											Entry e = new Entry();
-											e.installLocation = installLocation;
-											cacheLocation.add(installLocation);
-											e.name = m.group(2);
-											e.path = m.group(1);
-											if (e.path != null) {
-												e.pakage = e.path.replace("/", "."); //$NON-NLS-1$ //$NON-NLS-2$
-												if (e.pakage.startsWith(".")) { //$NON-NLS-1$
-													e.pakage = e.pakage.substring(1);
-												}
-												if (e.pakage.endsWith(".")) { //$NON-NLS-1$
-													e.pakage = e.pakage.substring(0, e.pakage.length() - 1);
-												}
-											} else {
-												e.pakage = ""; //$NON-NLS-1$
+									}
+									final String name2 = entry.getName();
+									if (shouldIgnore(name2)) {
+										continue;
+									}
+									final Matcher m = patternFile.matcher(name2);
+									if (m.matches()) {
+										final Entry e = new Entry();
+										e.installLocation = installLocation;
+										cacheLocation.add(installLocation);
+										e.name = m.group(2);
+										e.path = m.group(1);
+										if (e.path != null) {
+											e.pakage = e.path.replace("/", "."); //$NON-NLS-1$ //$NON-NLS-2$
+											if (e.pakage.startsWith(".")) { //$NON-NLS-1$
+												e.pakage = e.pakage.substring(1);
 											}
-											cachePackage.add(e.pakage);
-
-											e.bundleSymName = pluginBase.getId();
-											if (e.path == null) {
-												e.path = ""; //$NON-NLS-1$
+											if (e.pakage.endsWith(".")) { //$NON-NLS-1$
+												e.pakage = e.pakage.substring(0, e.pakage.length() - 1);
 											}
-											cacheEntry.add(e);
-											cacheBundleId.add(pluginBase.getId());
-
-											//
-											// System.out.println(group
-											// + " -> "
-											// +
-											// m.group(2));
+										} else {
+											e.pakage = ""; //$NON-NLS-1$
 										}
+										cachePackage.add(e.pakage);
+
+										e.bundleSymName = pluginBase.getId();
+										if (e.path == null) {
+											e.path = ""; //$NON-NLS-1$
+										}
+										cacheEntry.add(e);
+										cacheBundleId.add(pluginBase.getId());
+
+										//
+										// System.out.println(group
+										// + " -> "
+										// +
+										// m.group(2));
 									}
 								}
 							} else {
 								// not a jar file
-								String bundle = getBundle(new File(installLocation));
+								final String bundle = getBundle(new File(installLocation));
 								if (bundle != null) {
 									visit(monitor, bundle, installLocation, new File(installLocation));
 								}
 							}
-						} catch (MalformedURLException e) {
+						} catch (final MalformedURLException e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
-						} catch (IOException e) {
+						} catch (final IOException e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
 						}
@@ -391,12 +395,11 @@ protected IStatus run(IProgressMonitor monitor) {
 							providerStatusCallback.onStatusChanged(ProviderStatus.CANCELLED);
 						}
 						return Status.CANCEL_STATUS;
-					} else {
-						if (providerStatusCallback != null) {
-							providerStatusCallback.onStatusChanged(ProviderStatus.READY);
-						}
-						return Status.OK_STATUS;
 					}
+					if (providerStatusCallback != null) {
+						providerStatusCallback.onStatusChanged(ProviderStatus.READY);
+					}
+					return Status.OK_STATUS;
 				}
 			};
 			job.schedule();
@@ -409,13 +412,13 @@ protected IStatus run(IProgressMonitor monitor) {
 
 				@Override
 				public void run() {
-					ProgressMonitorDialog dlg = new ProgressMonitorDialog(Display.getDefault().getActiveShell()) {
+					final ProgressMonitorDialog dlg = new ProgressMonitorDialog(Display.getDefault().getActiveShell()) {
 
 						@Override
 						protected Control createContents(Composite parent) {
 							// TODO odd this is not a bean.
-							Composite ret = (Composite) super.createContents(parent);
-							Label label = new Label(ret, SWT.NONE);
+							final Composite ret = (Composite) super.createContents(parent);
+							final Label label = new Label(ret, SWT.NONE);
 							label.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false, 2, 1));
 							label.setText(Messages.TargetPlatformContributionCollector_pleaseWait);
 
@@ -424,7 +427,8 @@ protected Control createContents(Composite parent) {
 
 						@Override
 						protected void createButtonsForButtonBar(Composite parent) {
-							Button button = createButton(parent, 101, Messages.TargetPlatformContributionCollector_RunInBackground, false);
+							final Button button = createButton(parent, 101,
+								Messages.TargetPlatformContributionCollector_RunInBackground, false);
 							// TODO JA
 							button.addSelectionListener(new SelectionAdapter() {
 								@Override
@@ -449,18 +453,22 @@ protected void cancelPressed() {
 						dlg.run(true, true, new IRunnableWithProgress() {
 
 							@Override
-							public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-								monitor.beginTask(Messages.TargetPlatformContributionCollector_WaitingForTargetPlatformIndexingToComplete, IProgressMonitor.UNKNOWN);
+							public void run(final IProgressMonitor monitor) throws InvocationTargetException,
+							InterruptedException {
+								monitor
+								.beginTask(
+									Messages.TargetPlatformContributionCollector_WaitingForTargetPlatformIndexingToComplete,
+									IProgressMonitor.UNKNOWN);
 								while (job.getState() == Job.RUNNING && !runInBackground) {
 									Thread.sleep(100);
 								}
 								monitor.done();
 							}
 						});
-					} catch (InvocationTargetException e1) {
+					} catch (final InvocationTargetException e1) {
 						// TODO Auto-generated catch block
 						e1.printStackTrace();
-					} catch (InterruptedException e1) {
+					} catch (final InterruptedException e1) {
 						// TODO Auto-generated catch block
 						e1.printStackTrace();
 					}
@@ -476,17 +484,17 @@ static public String getBundle(File file) {
 			return null;
 		}
 
-		File f = new File(file, "META-INF/MANIFEST.MF"); //$NON-NLS-1$
+		final File f = new File(file, "META-INF/MANIFEST.MF"); //$NON-NLS-1$
 
 		if (f.exists() && f.isFile()) {
 			BufferedReader r = null;
 			try {
-				InputStream s = new FileInputStream(f);
+				final InputStream s = new FileInputStream(f);
 				r = new BufferedReader(new InputStreamReader(s));
 				String line;
 				while ((line = r.readLine()) != null) {
 					if (line.startsWith("Bundle-SymbolicName:")) { //$NON-NLS-1$
-						int start = line.indexOf(':');
+						final int start = line.indexOf(':');
 						int end = line.indexOf(';');
 						if (end == -1) {
 							end = line.length();
@@ -494,13 +502,13 @@ static public String getBundle(File file) {
 						return line.substring(start + 1, end).trim();
 					}
 				}
-			} catch (IOException e) {
+			} catch (final IOException e) {
 				e.printStackTrace();
 			} finally {
 				if (r != null) {
 					try {
 						r.close();
-					} catch (IOException e) {
+					} catch (final IOException e) {
 					}
 				}
 			}
@@ -509,7 +517,7 @@ static public String getBundle(File file) {
 	}
 
 	protected void visit(IProgressMonitor monitor, String bundleName, String installLocation, File file) {
-		for (File fChild : file.listFiles()) {
+		for (final File fChild : file.listFiles()) {
 			if (monitor.isCanceled()) {
 				break;
 			}
@@ -521,9 +529,9 @@ protected void visit(IProgressMonitor monitor, String bundleName, String install
 				if (shouldIgnore(name2)) {
 					continue;
 				}
-				Matcher m = patternFile.matcher(name2);
+				final Matcher m = patternFile.matcher(name2);
 				if (m.matches()) {
-					Entry e = new Entry();
+					final Entry e = new Entry();
 					e.installLocation = installLocation;
 					cacheLocation.add(installLocation);
 					e.name = m.group(2);
@@ -545,7 +553,8 @@ protected void visit(IProgressMonitor monitor, String bundleName, String install
 					if (e.path == null) {
 						e.path = ""; //$NON-NLS-1$
 					}
-					e.relativePath = Path.fromOSString(file.getAbsolutePath().replace(e.installLocation, "")).makeRelative().toOSString(); //$NON-NLS-1$
+					e.relativePath = Path
+						.fromOSString(file.getAbsolutePath().replace(e.installLocation, "")).makeRelative().toOSString(); //$NON-NLS-1$
 
 					e.bundleSymName = bundleName;
 					// TODO we need project to strip source paths.
@@ -565,7 +574,7 @@ static private String stripOutputDirectory(String path, String installLocation)
 		if (installLocation.matches(".*\\.jar")) { //$NON-NLS-1$
 			return path;
 		}
-		for (String sourceDirectory : getOutputDirectories(installLocation)) {
+		for (final String sourceDirectory : getOutputDirectories(installLocation)) {
 			if (path.startsWith(sourceDirectory)) {
 				path = path.substring(sourceDirectory.length());
 				break;
@@ -589,14 +598,16 @@ static private List<String> getOutputDirectories(String installLocation) {
 			ret = new ArrayList<String>();
 			outputDirectories.put(installLocation, ret);
 			try {
-				Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new File(installLocation + File.separator + ".classpath")); //$NON-NLS-1$
-				XPath xp = XPathFactory.newInstance().newXPath();
-				NodeList list = (NodeList) xp.evaluate("//classpathentry[@kind='output']/@path", doc, XPathConstants.NODESET); //$NON-NLS-1$
+				final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder()
+					.parse(new File(installLocation + File.separator + ".classpath")); //$NON-NLS-1$
+				final XPath xp = XPathFactory.newInstance().newXPath();
+				final NodeList list = (NodeList) xp.evaluate(
+					"//classpathentry[@kind='output']/@path", doc, XPathConstants.NODESET); //$NON-NLS-1$
 				for (int i = 0; i < list.getLength(); i++) {
-					String value = list.item(i).getNodeValue();
+					final String value = list.item(i).getNodeValue();
 					ret.add(value);
 				}
-			} catch (Exception e) {
+			} catch (final Exception e) {
 			}
 		}
 		return ret;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java
index 56eeb909c4..b50ff3b7a7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java
@@ -6,12 +6,13 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator;
 
 import java.util.regex.Pattern;
+
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
 
 /**
@@ -32,7 +33,8 @@ protected TargetPlatformIconContributionCollector(String cacheName) {
 
 	static public TargetPlatformIconContributionCollector getInstance() {
 		if (instance == null) {
-			instance = new TargetPlatformIconContributionCollector(Messages.TargetPlatformIconContributionCollector_images);
+			instance = new TargetPlatformIconContributionCollector(
+				Messages.TargetPlatformIconContributionCollector_images);
 		}
 		return instance;
 	}
@@ -40,11 +42,11 @@ static public TargetPlatformIconContributionCollector getInstance() {
 	@Override
 	protected Pattern getFilePattern() {
 		return pattern;
-	};
+	}
 
 	@Override
 	protected ContributionData makeData(Entry e) {
-		ContributionData data = new ContributionData(e.bundleSymName, null, "Java", e.path + e.name); //$NON-NLS-1$
+		final ContributionData data = new ContributionData(e.bundleSymName, null, "Java", e.path + e.name); //$NON-NLS-1$
 		data.installLocation = e.installLocation;
 		data.resourceRelativePath = data.iconPath;
 		return data;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
index 1be8e4f366..467b76682c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
@@ -6,12 +6,13 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
 
 import java.util.ArrayList;
+
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
 import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.jface.wizard.Wizard;
@@ -41,11 +42,11 @@ public boolean performFinish() {
 	@Override
 	public boolean canFinish() {
 
-		IWizardPage cur = getContainer().getCurrentPage();
-		IWizardPage nextPage = getNextPage(cur);
+		final IWizardPage cur = getContainer().getCurrentPage();
+		final IWizardPage nextPage = getNextPage(cur);
 
 		// We need to call get next page first, as that may add or remove pages
-		for (IWizardPage page : pages) {
+		for (final IWizardPage page : pages) {
 			if (page.isPageComplete() == false) {
 				return false;
 			}
@@ -74,9 +75,9 @@ public void addPage(IWizardPage page) {
 	private void updateMessage() {
 		if (E.notEmpty(message) && pages.size() > 0) {
 			// TODO file bug: IWizardPage is missing the setMessage method!
-			IWizardPage page = pages.get(0);
+			final IWizardPage page = pages.get(0);
 			if (page instanceof WizardPage) {
-				WizardPage wizPage = (WizardPage) page;
+				final WizardPage wizPage = (WizardPage) page;
 				wizPage.setMessage(message);
 			}
 		}
@@ -84,23 +85,21 @@ private void updateMessage() {
 
 	@Override
 	public IWizardPage getPreviousPage(IWizardPage page) {
-		IWizardPage cur = getContainer().getCurrentPage();
-		int index = pages.indexOf(cur);
+		final IWizardPage cur = getContainer().getCurrentPage();
+		final int index = pages.indexOf(cur);
 		if (index > 0) {
 			return pages.get(index - 1);
-		} else {
-			return null;
 		}
+		return null;
 	}
 
 	@Override
 	public IWizardPage getNextPage(IWizardPage page) {
-		int index = pages.indexOf(page);
+		final int index = pages.indexOf(page);
 		if (index < pages.size() - 1) {
 			return pages.get(index + 1);
-		} else {
-			return null;
 		}
+		return null;
 	}
 
 	public void clearDynamicPages() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
index d1a55456a3..f84d3e037c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
@@ -197,7 +197,7 @@ public void createControl(Composite compParent) {
 				final Text label6 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 				label6.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 				label6
-					.setText("platform:/plugin/" + bundle + "/" + file.getFullPath().removeFirstSegments(1).toOSString()); //$NON-NLS-1$ //$NON-NLS-2$
+				.setText("platform:/plugin/" + bundle + "/" + file.getFullPath().removeFirstSegments(1).toOSString()); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		}
 
@@ -495,9 +495,8 @@ static public String getPackageFromClassName(String className) {
 		final int index = className.lastIndexOf('.');
 		if (index >= 0) {
 			return className.substring(0, index);
-		} else {
-			return ""; //$NON-NLS-1$
 		}
+		return ""; //$NON-NLS-1$
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
index 410ed63ddc..969c9260c9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
@@ -6,13 +6,11 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Ongoing Maintenance
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Ongoing Maintenance
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
 
-import org.eclipse.e4.tools.emf.ui.common.Plugin;
-
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -21,6 +19,7 @@
 import java.io.InputStream;
 import java.util.jar.Manifest;
 import java.util.zip.ZipFile;
+
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
@@ -28,6 +27,7 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
+import org.eclipse.e4.tools.emf.ui.common.Plugin;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionDataFile;
@@ -58,14 +58,15 @@ public class NonReferencedResourceDialog extends TitleAreaDialog {
 	private String bundle;
 	private final IFile file;
 	private IFile result;
-	private IProject project;
+	private final IProject project;
 	private String className;
-	private String installLocation;
+	private final String installLocation;
 	protected Runnable okAction;
 	private BundleImageCache imageCache;
-	private IEclipseContext context;
+	private final IEclipseContext context;
 
-	public NonReferencedResourceDialog(Shell parentShell, IProject project, String bundle, IFile file, String installLocation, IEclipseContext context) {
+	public NonReferencedResourceDialog(Shell parentShell, IProject project, String bundle, IFile file,
+		String installLocation, IEclipseContext context) {
 		super(parentShell);
 		this.project = project;
 		this.bundle = bundle;
@@ -77,8 +78,8 @@ public NonReferencedResourceDialog(Shell parentShell, IProject project, String b
 			this.bundle = FilteredContributionDialog.getBundle(installLocation);
 		}
 		if (file instanceof ContributionDataFile) {
-			ContributionDataFile cdf = (ContributionDataFile) file;
-			this.className = cdf.getContributionData().className;
+			final ContributionDataFile cdf = (ContributionDataFile) file;
+			className = cdf.getContributionData().className;
 		}
 	}
 
@@ -88,7 +89,7 @@ protected void okPressed() {
 			try {
 				okAction.run();
 				super.okPressed();
-			} catch (Exception e) {
+			} catch (final Exception e) {
 			}
 		} else {
 			super.okPressed();
@@ -97,34 +98,34 @@ protected void okPressed() {
 
 	@Override
 	protected Control createDialogArea(Composite parent) {
-		Composite compParent = (Composite) super.createDialogArea(parent);
+		final Composite compParent = (Composite) super.createDialogArea(parent);
 
-		Composite comp = new Composite(compParent, SWT.NONE);
-		GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
+		final Composite comp = new Composite(compParent, SWT.NONE);
+		final GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
 		layoutData.horizontalSpan = 2;
 		comp.setLayoutData(layoutData);
 		comp.setLayout(new GridLayout(2, false));
 
-		String message = ""; //$NON-NLS-1$
+		final String message = ""; //$NON-NLS-1$
 		Button defaultButton = null;
 
 		if (installLocation != null) {
-			Label label = new Label(comp, SWT.NONE);
+			final Label label = new Label(comp, SWT.NONE);
 			label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label.setText(Messages.NonReferencedResourceDialog_installLocation);
 
-			Text label2 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			final Text label2 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 			label2.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			label2.setText(installLocation);
 		}
 
 		if (className != null) {
-			ContributionData cd = ((ContributionDataFile) file).getContributionData();
-			Label label = new Label(comp, SWT.NONE);
+			final ContributionData cd = ((ContributionDataFile) file).getContributionData();
+			final Label label = new Label(comp, SWT.NONE);
 			label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label.setText(Messages.NonReferencedResourceDialog_2);
 
-			Text label2 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			final Text label2 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 			label2.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			if (bundle != null) {
 				label2.setText(bundle);
@@ -132,37 +133,37 @@ protected Control createDialogArea(Composite parent) {
 				label2.setText(Messages.NonReferencedResourceDialog__ast_notInABundle_ast);
 			}
 
-			Label label3 = new Label(comp, SWT.NONE);
+			final Label label3 = new Label(comp, SWT.NONE);
 			label3.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label3.setText(Messages.NonReferencedResourceDialog_package);
 
-			Text label4 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			final Text label4 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 			label4.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			label4.setText(getPackageFromClassName(className));
 
-			Label label5 = new Label(comp, SWT.NONE);
+			final Label label5 = new Label(comp, SWT.NONE);
 			label5.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label5.setText(Messages.NonReferencedResourceDialog_class);
 
-			Text label6 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			final Text label6 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 			label6.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			label6.setText(cd.className.substring(cd.className.lastIndexOf('.') + 1));
 
 			if (bundle != null) {
-				Label label7 = new Label(comp, SWT.NONE);
+				final Label label7 = new Label(comp, SWT.NONE);
 				label7.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 				label7.setText(Messages.NonReferencedResourceDialog_url);
 
-				Text label8 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+				final Text label8 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 				label8.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 				label8.setText("bundleclass://" + bundle + "/" + className); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		} else {
-			Label label = new Label(comp, SWT.NONE);
+			final Label label = new Label(comp, SWT.NONE);
 			label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label.setText(Messages.NonReferencedResourceDialog_bundle);
 
-			Text label2 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			final Text label2 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 			label2.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			if (bundle != null) {
 				label2.setText(bundle);
@@ -170,38 +171,39 @@ protected Control createDialogArea(Composite parent) {
 				label2.setText(Messages.NonReferencedResourceDialog_ast_notInABundle_ast);
 			}
 
-			Label label7 = new Label(comp, SWT.NONE);
+			final Label label7 = new Label(comp, SWT.NONE);
 			label7.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label7.setText(Messages.NonReferencedResourceDialog_directory);
 
-			Text label8 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			final Text label8 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 			label8.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			label8.setText(file.getFullPath().removeFirstSegments(1).removeLastSegments(1).toOSString());
 
-			Label label3 = new Label(comp, SWT.NONE);
+			final Label label3 = new Label(comp, SWT.NONE);
 			label3.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			label3.setText(Messages.NonReferencedResourceDialog_resource);
 
-			Text label4 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+			final Text label4 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 			label4.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			label4.setText(file.getFullPath().lastSegment());
 
 			if (bundle != null) {
-				Label label5 = new Label(comp, SWT.NONE);
+				final Label label5 = new Label(comp, SWT.NONE);
 				label5.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 				label5.setText(Messages.NonReferencedResourceDialog_url);
 
-				Text label6 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
+				final Text label6 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 				label6.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-				label6.setText("platform:/plugin/" + bundle + "/" + file.getFullPath().removeFirstSegments(1).toOSString()); //$NON-NLS-1$ //$NON-NLS-2$
+				label6
+					.setText("platform:/plugin/" + bundle + "/" + file.getFullPath().removeFirstSegments(1).toOSString()); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		}
 
-		Label lblMessage = new Label(comp, SWT.NONE);
+		final Label lblMessage = new Label(comp, SWT.NONE);
 		lblMessage.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 0));
 		lblMessage.setText(message);
 
-		Group group = new Group(comp, SWT.NONE);
+		final Group group = new Group(comp, SWT.NONE);
 		group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 0));
 		group.setLayout(new GridLayout(1, false));
 		group.setText(Messages.NonReferencedResourceDialog_Action);
@@ -241,13 +243,13 @@ public void widgetSelected(SelectionEvent e) {
 						okAction = new Runnable() {
 							@Override
 							public void run() {
-								IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
+								final IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
 								Manifest manifest;
 								try {
 									manifest = new Manifest(fileManifest.getContents());
 									String value = manifest.getMainAttributes().getValue("Import-Package"); //$NON-NLS-1$
 
-									String packageName = getPackageFromClassName(className);
+									final String packageName = getPackageFromClassName(className);
 									// TODO ensure the packageName is not
 									// already in the manifest (although it
 									// should not be if we are here)
@@ -257,12 +259,12 @@ public void run() {
 										value += "," + packageName; //$NON-NLS-1$
 									}
 									manifest.getMainAttributes().putValue("Import-Package", value); //$NON-NLS-1$
-									ByteArrayOutputStream bos = new ByteArrayOutputStream();
+									final ByteArrayOutputStream bos = new ByteArrayOutputStream();
 									manifest.write(bos);
-									ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+									final ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
 									fileManifest.setContents(bis, true, true, null);
 									result = file;
-								} catch (Exception e) {
+								} catch (final Exception e) {
 									e.printStackTrace();
 								}
 							}
@@ -304,18 +306,24 @@ public void widgetSelected(SelectionEvent e) {
 								public void run() {
 									String bundleId;
 									try {
-										ContributionData contributionData = cdf.getContributionData();
-										bundleId = BundleConverter.convertProjectToBundle(contributionData.installLocation, project.getWorkspace());
+										final ContributionData contributionData = cdf.getContributionData();
+										bundleId = BundleConverter.convertProjectToBundle(
+											contributionData.installLocation, project.getWorkspace());
 										if (bundleId != null) {
 
-											ContributionData cdConverted = new ContributionData(bundleId, contributionData.className, contributionData.sourceType, contributionData.iconPath);
+											final ContributionData cdConverted = new ContributionData(bundleId,
+												contributionData.className, contributionData.sourceType,
+												contributionData.iconPath);
 											cdConverted.installLocation = installLocation;
-											cdConverted.resourceRelativePath = Path.fromOSString(contributionData.iconPath).removeFirstSegments(1).toOSString();
+											cdConverted.resourceRelativePath = Path
+												.fromOSString(contributionData.iconPath).removeFirstSegments(1)
+												.toOSString();
 											doRequireBundle(bundleId, installLocation);
 											result = new ContributionDataFile(cdConverted);
 										}
-									} catch (Exception e1) {
-										MessageDialog.openError(getShell(), Messages.NonReferencedResourceDialog_error, e1.getMessage());
+									} catch (final Exception e1) {
+										MessageDialog.openError(getShell(), Messages.NonReferencedResourceDialog_error,
+											e1.getMessage());
 									}
 								}
 							};
@@ -360,10 +368,11 @@ public void widgetSelected(SelectionEvent e) {
 
 							@Override
 							public void run() {
-								ReferencedProjectPickerDialog dlg = new ReferencedProjectPickerDialog(getShell(), project) {
+								final ReferencedProjectPickerDialog dlg = new ReferencedProjectPickerDialog(getShell(),
+									project) {
 									@Override
 									protected Control createContents(Composite parent) {
-										Control ret = super.createContents(parent);
+										final Control ret = super.createContents(parent);
 										setMessage(Messages.NonReferencedResourceDialog_selectProjectToReceiveCopy);
 										setTitleImage(imageCache.create("/icons/full/wizban/plugin_wiz.gif")); //$NON-NLS-1$
 
@@ -389,12 +398,11 @@ protected Control createContents(Composite parent) {
 
 	// @Refactor
 	static public String getPackageFromClassName(String className) {
-		int index = className.lastIndexOf('.');
+		final int index = className.lastIndexOf('.');
 		if (index >= 0) {
 			return className.substring(0, index);
-		} else {
-			return ""; //$NON-NLS-1$
 		}
+		return ""; //$NON-NLS-1$
 	}
 
 	@Override
@@ -408,15 +416,15 @@ public void widgetDisposed(DisposeEvent e) {
 			}
 		});
 
-		Control ret = super.createContents(parent);
+		final Control ret = super.createContents(parent);
 		setMessage(Messages.NonReferencedResourceDialog_resourceNotReferenced);
-		String message = getMessage();
+		final String message = getMessage();
 		setMessage(message);
 		setTitle(Messages.NonReferencedResourceDialog_resourceReferenceWarning);
 		getShell().setText(Messages.NonReferencedResourceDialog_resourceReferenceWarning);
 		try {
 			setTitleImage(imageCache.create(Plugin.ID, "/icons/full/wizban/newefix_wizban.png")); //$NON-NLS-1$
-		} catch (Exception e) {
+		} catch (final Exception e) {
 			e.printStackTrace();
 		}
 		return ret;
@@ -428,10 +436,11 @@ public IFile getResult() {
 
 	public void copyResourceToProject(IProject project) {
 		try {
-			ProjectFolderPickerDialog dlg = new ProjectFolderPickerDialog(getShell(), project, file.getFullPath().toOSString()) {
+			final ProjectFolderPickerDialog dlg = new ProjectFolderPickerDialog(getShell(), project, file.getFullPath()
+				.toOSString()) {
 				@Override
 				protected Control createContents(Composite parent) {
-					Control ret = super.createContents(parent);
+					final Control ret = super.createContents(parent);
 					setMessage(Messages.NonReferencedResourceDialog_selectTheFolderResourceCopy);
 					setTitleImage(imageCache.create(Plugin.ID, "/icons/full/wizban/add_to_dir_wiz.png")); //$NON-NLS-1$
 
@@ -449,14 +458,14 @@ protected Control createContents(Composite parent) {
 				if (className != null) {
 					newPath.append(className + ".class"); //$NON-NLS-1$
 				} else {
-					String name = file.getFullPath().lastSegment();
+					final String name = file.getFullPath().lastSegment();
 					newPath = newPath.append(name);
 				}
-				IFile fileClone = project.getFile(newPath);
+				final IFile fileClone = project.getFile(newPath);
 				fileClone.create(file.getContents(), false, null);
 				result = fileClone;
 			}
-		} catch (CoreException e1) {
+		} catch (final CoreException e1) {
 			e1.printStackTrace();
 			MessageDialog.openError(getShell(), "Error", e1.getMessage()); //$NON-NLS-1$
 
@@ -471,7 +480,7 @@ public void doRequireBundle(String bundle, String installLocation) {
 		try {
 			Manifest manifestSource;
 			if (installLocation.endsWith(".jar")) { //$NON-NLS-1$
-				ZipFile zip = new ZipFile(installLocation);
+				final ZipFile zip = new ZipFile(installLocation);
 				srcStream = zip.getInputStream(zip.getEntry("META-INF/MANIFEST.MF")); //$NON-NLS-1$
 				manifestSource = new Manifest(srcStream);
 				zip.close();
@@ -483,17 +492,17 @@ public void doRequireBundle(String bundle, String installLocation) {
 			if (version != null) {
 				version = version.replaceFirst("\\.qualifier", ""); //$NON-NLS-1$ //$NON-NLS-2$
 			}
-		} catch (Exception e) {
+		} catch (final Exception e) {
 			e.printStackTrace();
 			return;
 		} finally {
 			try {
 				srcStream.close();
-			} catch (Exception e) {
+			} catch (final Exception e) {
 			}
 		}
 
-		IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
+		final IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
 		Manifest manifest;
 		try {
 			manifest = new Manifest(fileManifest.getContents());
@@ -507,15 +516,15 @@ public void doRequireBundle(String bundle, String installLocation) {
 				}
 				manifest.getMainAttributes().putValue("Require-Bundle", value); //$NON-NLS-1$
 			}
-			ByteArrayOutputStream bos = new ByteArrayOutputStream();
+			final ByteArrayOutputStream bos = new ByteArrayOutputStream();
 			manifest.write(bos);
 			// StringReader reader = new
-			ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+			final ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
 			fileManifest.setContents(bis, true, true, null);
 			result = file;
-		} catch (IOException e1) {
+		} catch (final IOException e1) {
 			e1.printStackTrace();
-		} catch (CoreException e1) {
+		} catch (final CoreException e1) {
 			e1.printStackTrace();
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
index dbb731cae0..5868da52ab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 436848
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 436848
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
@@ -28,13 +28,14 @@
  */
 public class NonReferencedResourceWizard extends DynamicWizard {
 
-	private NonReferencedActionPage nonReferencedActionPage;
+	private final NonReferencedActionPage nonReferencedActionPage;
 	protected IProject project;
 	IEclipseContext wizContext;
 
 	BundleImageCache imageCache;
 
-	public NonReferencedResourceWizard(Shell parentShell, IProject project, String bundle, IFile file, String installLocation, IEclipseContext context) {
+	public NonReferencedResourceWizard(Shell parentShell, IProject project, String bundle, IFile file,
+		String installLocation, IEclipseContext context) {
 		this.project = project;
 
 		wizContext = context.createChild();
@@ -58,7 +59,7 @@ public void widgetDisposed(DisposeEvent e) {
 
 	@Override
 	public boolean performFinish() {
-		Runnable action = wizContext.get(Runnable.class);
+		final Runnable action = wizContext.get(Runnable.class);
 		if (action != null) {
 			action.run();
 		}
@@ -73,20 +74,20 @@ public IFile getResult() {
 	public IWizardPage getNextPage(IWizardPage page) {
 		if (page instanceof NonReferencedActionPage) {
 			clearDynamicPages();
-			NonReferencedAction action = wizContext.get(NonReferencedAction.class);
+			final NonReferencedAction action = wizContext.get(NonReferencedAction.class);
 			if (action == null) {
 				return null;
 			}
 			switch (action) {
 			case COPY: {
-				PickProjectFolderPage pickProjectFolderPage = new PickProjectFolderPage(wizContext);
+				final PickProjectFolderPage pickProjectFolderPage = new PickProjectFolderPage(wizContext);
 				addPage(pickProjectFolderPage);
 				return pickProjectFolderPage;
 			}
 			case COPY_TO_OTHER:
-				PickProjectPage pickProjectPage = new PickProjectPage(wizContext);
+				final PickProjectPage pickProjectPage = new PickProjectPage(wizContext);
 				addPage(pickProjectPage);
-				PickProjectFolderPage pickProjectFolderPage = new PickProjectFolderPage(wizContext);
+				final PickProjectFolderPage pickProjectFolderPage = new PickProjectFolderPage(wizContext);
 				addPage(pickProjectFolderPage);
 				return pickProjectPage;
 			case USE_ANYWAY:
@@ -103,9 +104,8 @@ public IWizardPage getNextPage(IWizardPage page) {
 			default:
 				return null;
 			}
-		} else {
-			return super.getNextPage(page);
 		}
+		return super.getNextPage(page);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
index e5dff6b14b..572054aa7d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Ongoing Maintenance
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation, Ongoing Maintenance
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
@@ -23,7 +23,6 @@
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
@@ -39,20 +38,20 @@
  * @author Steven Spungin
  *
  */
-public class PickProjectPage extends WizardPage implements IWizardPage {
+public class PickProjectPage extends WizardPage {
 
 	private TableViewer viewer;
 	private BundleImageCache imageCache;
 	private Image imgProject;
 	private IProject[] projects;
-	private IEclipseContext context;
+	private final IEclipseContext context;
 
 	protected PickProjectPage(IEclipseContext context) {
 		super(Messages.PickProjectPage_SelectReferencedProject);
 		this.context = context;
 		try {
-			this.projects = context.get(IProject.class).getReferencedProjects();
-		} catch (CoreException e) {
+			projects = context.get(IProject.class).getReferencedProjects();
+		} catch (final CoreException e) {
 			setErrorMessage(e.getMessage());
 			e.printStackTrace();
 		}
@@ -73,7 +72,7 @@ public void widgetDisposed(DisposeEvent e) {
 		});
 		imgProject = imageCache.create("/icons/full/obj16/projects.png"); //$NON-NLS-1$
 
-		Composite comp = new Composite(parent, SWT.NONE);
+		final Composite comp = new Composite(parent, SWT.NONE);
 		comp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		comp.setLayout(new GridLayout(1, false));
 
@@ -82,7 +81,7 @@ public void widgetDisposed(DisposeEvent e) {
 		viewer.setLabelProvider(new ColumnLabelProvider() {
 			@Override
 			public String getText(Object element) {
-				IProject project = (IProject) element;
+				final IProject project = (IProject) element;
 				return project.getName();
 			}
 
@@ -99,19 +98,19 @@ public Image getImage(Object element) {
 
 			@Override
 			public void selectionChanged(SelectionChangedEvent event) {
-				Object firstElement = ((StructuredSelection) event.getSelection()).getFirstElement();
+				final Object firstElement = ((StructuredSelection) event.getSelection()).getFirstElement();
 				context.set("projectToCopyTo", firstElement); //$NON-NLS-1$
 				setPageComplete(firstElement != null);
 				getContainer().updateButtons();
 			}
 		});
 
-		String message = Messages.ReferencedProjectPickerDialog_selectReferencedProject;
+		final String message = Messages.ReferencedProjectPickerDialog_selectReferencedProject;
 		setMessage(message);
 		getShell().setText(message);
 		setTitle(message);
 
-		Image image = context.get(BundleImageCache.class).create("/icons/full/obj16/projects.png"); //$NON-NLS-1$
+		final Image image = context.get(BundleImageCache.class).create("/icons/full/obj16/projects.png"); //$NON-NLS-1$
 		setImageDescriptor(ImageDescriptor.createFromImage(image));
 
 		setControl(comp);
@@ -119,7 +118,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 
 	@Override
 	public void setVisible(boolean visible) {
-		Object object = context.get("projectToCopyTo"); //$NON-NLS-1$
+		final Object object = context.get("projectToCopyTo"); //$NON-NLS-1$
 		if (visible) {
 			if (object != null) {
 				viewer.setSelection(new StructuredSelection(object));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java
index fcbc3e8b04..e6ef7aaa8f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java
@@ -10,7 +10,7 @@
 import org.eclipse.swt.widgets.Canvas;
 
 public class AnnotationAccess implements IAnnotationAccess, IAnnotationAccessExtension {
-	private IResourcePool pool;
+	private final IResourcePool pool;
 
 	public AnnotationAccess(IResourcePool pool) {
 		this.pool = pool;
@@ -49,18 +49,21 @@ public Object[] getSupertypes(Object annotationType) {
 		return null;
 	}
 
+	@Deprecated
 	@Override
 	public Object getType(Annotation annotation) {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
+	@Deprecated
 	@Override
 	public boolean isMultiLine(Annotation annotation) {
 		// TODO Auto-generated method stub
 		return false;
 	}
 
+	@Deprecated
 	@Override
 	public boolean isTemporary(Annotation annotation) {
 		// TODO Auto-generated method stub

From c492e9cffadfa8452c8afaae9fff4fd8837606dd Mon Sep 17 00:00:00 2001
From: Fabian Miehe <fabian.miehe@cassidian.com>
Date: Thu, 13 Nov 2014 10:11:03 +0100
Subject: [PATCH 0864/1286] Bug 440289 - Combo Box in Editor 'Controls'
 inconsistent

- Changed the layout of the toolbar
- ToolItems converted to buttons
- ComboViewer is READ_ONLY again.

Change-Id: Ic3aff77b50b3475e4a3d63f824ffb8857aa5c018
Signed-off-by: Fabian Miehe <fabian.miehe@cassidian.com>
---
 .../tools/emf/ui/internal/Messages.properties |   2 +-
 .../ui/internal/common/AbstractPickList.java  | 122 ++++++++++--------
 .../ui/internal/common/E4StringPickList.java  |  11 +-
 3 files changed, 73 insertions(+), 62 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 90402a7f95..c41e0e58a0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -30,7 +30,7 @@ VWindowSharedElementsEditor_Views=Views
 
 ModelTooling_Common_Up=Up
 ModelTooling_Common_Down=Down
-ModelTooling_Common_AddEllipsis=Add ...
+ModelTooling_Common_AddEllipsis=Add
 ModelTooling_Common_Add=Add
 ModelTooling_Common_Remove=Remove
 ModelTooling_Common_Replace=Replace
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index f487aa0c01..a09077704d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -14,14 +14,11 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.TreeMap;
 
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.jface.fieldassist.AutoCompleteField;
-import org.eclipse.jface.fieldassist.ComboContentAdapter;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.ILabelProvider;
@@ -31,7 +28,6 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.OpenEvent;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
@@ -40,12 +36,10 @@
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
 
 /**
  * <p>
@@ -66,12 +60,12 @@ public static enum PickListFeatures {
 	protected TableViewer viewer;
 
 	private final Group group;
-	private final ToolBar toolBar;
-	private final ToolItem tiRemove;
-	private final ToolItem tiUp;
-	private final ToolItem tiDown;
-	private final ToolItem tiAdd;
-	private final AutoCompleteField autoCompleteField;
+	private final Composite toolBar;
+	private final Button tiRemove;
+	private final Button tiUp;
+	private final Button tiDown;
+	private final Button tiAdd;
+	// private final AutoCompleteField autoCompleteField;
 	private Map<String, Object> proposals;
 
 	public AbstractPickList(Composite parent, int style, List<PickListFeatures> listFeatures, Messages messages,
@@ -87,11 +81,51 @@ public AbstractPickList(Composite parent, int style, List<PickListFeatures> list
 		// gridData.horizontalIndent = 30;
 		group.setLayout(new GridLayout(1, false));
 
-		toolBar = new ToolBar(group, SWT.FLAT);
+		final Composite comp = new Composite(group, SWT.NONE);
+
+		GridLayout layout = new GridLayout(2, false);
+		layout.marginHeight = 0;
+		layout.marginWidth = 0;
+		comp.setLayout(layout);
+		comp.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
+
+		picker = new ComboViewer(comp, SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
+		final Combo control = picker.getCombo();
+		control.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+
+		// ComboContentAdapter controlContentAdapter = new ComboContentAdapter()
+		// {
+		// @Override
+		// public void setControlContents(Control control, String text1, int
+		// cursorPosition) {
+		// super.setControlContents(control, text1, cursorPosition);
+		// Object valueInModel = proposals.get(text1);
+		// if (valueInModel != null) {
+		// getPicker().setSelection(new StructuredSelection(valueInModel));
+		// }
+		// }
+		// };
+		// autoCompleteField = new AutoCompleteField(control,
+		// controlContentAdapter, new String[0]);
+
+		toolBar = new Composite(comp, SWT.NONE);
+		layout = new GridLayout(5, true);
+		layout.marginHeight = 0;
+		layout.marginWidth = 0;
+		toolBar.setLayout(layout);
 		toolBar.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
 
-		tiAdd = new ToolItem(toolBar, SWT.PUSH);
+		picker.addOpenListener(new IOpenListener() {
+
+			@Override
+			public void open(OpenEvent event) {
+				addPressed();
+			}
+		});
+
+		tiAdd = new Button(toolBar, SWT.PUSH);
 		tiAdd.setText(messages.ModelTooling_Common_AddEllipsis);
+		tiAdd.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		tiAdd.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_table_add));
 		tiAdd.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -100,9 +134,19 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		// new ToolItem(toolBar, SWT.SEPARATOR_FILL);
+		tiRemove = new Button(toolBar, SWT.PUSH);
+		tiRemove.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+		tiRemove.setText(messages.ModelTooling_Common_Remove);
+		tiRemove.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_table_delete));
+		tiRemove.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				removePressed();
+			}
+		});
 
-		tiDown = new ToolItem(toolBar, SWT.PUSH);
+		tiDown = new Button(toolBar, SWT.PUSH);
+		tiDown.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		tiDown.setText(messages.ModelTooling_Common_Down);
 		tiDown.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_arrow_down));
 		tiDown.addSelectionListener(new SelectionAdapter() {
@@ -112,7 +156,8 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		tiUp = new ToolItem(toolBar, SWT.PUSH);
+		tiUp = new Button(toolBar, SWT.PUSH);
+		tiUp.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		tiUp.setText(messages.ModelTooling_Common_Up);
 		tiUp.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_arrow_up));
 		tiUp.addSelectionListener(new SelectionAdapter() {
@@ -121,39 +166,6 @@ public void widgetSelected(SelectionEvent e) {
 				moveUpPressed();
 			}
 		});
-		tiRemove = new ToolItem(toolBar, SWT.PUSH);
-		tiRemove.setText(messages.ModelTooling_Common_Remove);
-		tiRemove.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_table_delete));
-		tiRemove.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				removePressed();
-			}
-		});
-
-		picker = new ComboViewer(group, SWT.DROP_DOWN);
-		final Combo control = picker.getCombo();
-		control.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
-
-		final ComboContentAdapter controlContentAdapter = new ComboContentAdapter() {
-			@Override
-			public void setControlContents(Control control, String text1, int cursorPosition) {
-				super.setControlContents(control, text1, cursorPosition);
-				final Object valueInModel = proposals.get(text1);
-				if (valueInModel != null) {
-					getPicker().setSelection(new StructuredSelection(valueInModel));
-				}
-			}
-		};
-		autoCompleteField = new AutoCompleteField(control, controlContentAdapter, new String[0]);
-
-		picker.addOpenListener(new IOpenListener() {
-
-			@Override
-			public void open(OpenEvent event) {
-				addPressed();
-			}
-		});
 
 		viewer = new TableViewer(group);
 		final GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1);
@@ -195,9 +207,9 @@ public TableViewer getList() {
 	public void setInput(Object input) {
 		getPicker().setInput(input);
 
-		proposals = toProposals(input);
-		final Set<String> keySet = proposals.keySet();
-		autoCompleteField.setProposals(keySet.toArray(new String[keySet.size()]));
+		// proposals = toProposals(input);
+		// final Set<String> keySet = proposals.keySet();
+		// autoCompleteField.setProposals(keySet.toArray(new String[keySet.size()]));
 	}
 
 	public ISelection getSelection() {
@@ -247,7 +259,7 @@ public void setComparator(ViewerComparator comparator) {
 		getPicker().setComparator(comparator);
 	}
 
-	protected ToolBar getToolBar() {
+	protected Composite getToolBar() {
 		return toolBar;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
index b1dfd1f5d8..aa9c06e9a0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
@@ -32,9 +32,9 @@
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.ToolItem;
 
 /**
  * A PickList for creating a string list. Action include ordering, adding,
@@ -46,7 +46,7 @@
 public class E4StringPickList extends AbstractPickList {
 
 	private Text text;
-	private ToolItem tiReplace;
+	private Button tiReplace;
 	private AbstractComponentEditor editor;
 	private EStructuralFeature feature;
 
@@ -58,13 +58,12 @@ public E4StringPickList(Composite parent, int flags, List<PickListFeatures> list
 
 		// TODO does not respect NO_ORDER yet
 
-		tiReplace = new ToolItem(getToolBar(), SWT.PUSH, 2);
+		tiReplace = new Button(getToolBar(), SWT.PUSH);
 		tiReplace.setText(messages.E4StringPickList_Replace);
 		tiReplace.setImage(editor.createImage(ResourceProvider.IMG_Obj16_world_edit));
 
 		text = new Text(getToolBar().getParent(), SWT.SINGLE | SWT.LEAD | SWT.BORDER);
-		text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-		text.moveBelow(getToolBar());
+		text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
 
 		tiReplace.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -170,7 +169,7 @@ protected int getItemCount() {
 		return ((ObservableListContentProvider) viewer.getContentProvider()).getElements(viewer.getInput()).length;
 	}
 
-	protected ToolItem getReplaceWidget() {
+	protected Button getReplaceWidget() {
 		return tiReplace;
 	}
 

From ba32e6098fb902f84111cf2a9acf5bbd0c54a8ae Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Fri, 19 Dec 2014 12:09:57 +0100
Subject: [PATCH 0865/1286] Bug 453921 - Remove *ui.js bundle from core tools
 feature

---
 .../org.eclipse.e4.core.tools.feature/feature.xml  | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index e2cf7a83bd..c56c91e93d 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -52,20 +52,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.e4.tools.emf.ui.script.js"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.mozilla.javascript"
-         download-size="0"
-         install-size="0"
-         version="1.7.2.qualifier"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.e4.tools.jdt.templates"
          download-size="0"

From 545294d62e58bbdfcc5d4633cc876f28023c6502 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Fri, 19 Dec 2014 12:15:58 +0100
Subject: [PATCH 0866/1286] Bug 453528 - The E4 spies should be packed in only
 one feature

+ Added spies feature
+ Added model spy feature w includes the live editor
+ Changed category for update site
+ Added new modules to parent pom
+ removed live editor from core

Change-Id: I7d9e0f710b6dda29085e9c23d28ef8f9114debdb
Signed-off-by: Wim Jongman <wim.jongman@remainsoftware.com>
---
 .../org.eclipse.e4.core.tools.feature/feature.xml  | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index c56c91e93d..75f368c95a 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -59,18 +59,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.e4.tools.emf.liveeditor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.e4.tools.spy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>

From 81d133b351997f433fb1a5c5548d7bf4f48cbb55 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Thu, 25 Dec 2014 18:28:14 +0100
Subject: [PATCH 0867/1286] Bug 456179 - Fix About.html and Bundle Vendors for
 bundles moved to the platform

---
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../about.html                                | 45 +++++++++++++++++++
 .../build.properties                          |  4 +-
 .../plugin.properties                         | 10 +++++
 4 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/about.html
 create mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index d539c7ced2..06c4dd894e 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: e4 Templates
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
 Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
@@ -10,3 +10,4 @@ Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.jdt.core;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0"
 Export-Package: org.eclipse.e4.internal.tools.jdt.templates;version="0.12.0.qualifier";x-internal:=true
+Bundle-Vendor: %providerName
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/about.html b/bundles/org.eclipse.e4.tools.jdt.templates/about.html
new file mode 100644
index 0000000000..c1343aa318
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/about.html
@@ -0,0 +1,45 @@
+<!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>December 3, 2009</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  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>Silk icon set Version 1.3</h4>
+<p>
+This plugin contains icons from the Silk icon set created by Mark James. The original files can
+be found at:
+<ul>
+<a href="http://www.famfamfam.com/lab/icons/silk/">http://www.famfamfam.com/lab/icons/silk/</a></ul>
+<p>The license can be found at:</p>
+<ul>
+ <li><a href="http://creativecommons.org/licenses/by/2.5/">http://creativecommons.org/licenses/by/2.5/</a></li>
+</ul>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/build.properties b/bundles/org.eclipse.e4.tools.jdt.templates/build.properties
index 3337a4a309..d4135f901c 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/build.properties
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/build.properties
@@ -3,5 +3,7 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
+               plugin.properties,\
                templates/,\
-               icons/
+               icons/,\
+               about.html
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties b/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties
new file mode 100644
index 0000000000..195bb41596
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties
@@ -0,0 +1,10 @@
+
+# <copyright>
+# </copyright>
+#
+# $Id: plugin.properties,v 1.2 2010/07/20 21:48:42 tschindl Exp $
+
+pluginName = EMF ModelTooling JDT Templates
+providerName = Eclipse.org
+
+extension-point.name = Editors
\ No newline at end of file

From d3a514634ac1a3fae4096c52cead4f1c20cf378d Mon Sep 17 00:00:00 2001
From: Veselin Markov <veselin_m84@yahoo.com>
Date: Sun, 4 Jan 2015 17:29:37 +0100
Subject: [PATCH 0868/1286] Bug 456529 - Parameter "Name" should be "Command
 Parameter ID"

Label of Parameter Editor changed from "Name" to "Command Parameter ID".
A find button added that lets the user to choose only from the
parameters of the referenced command.

Bug: 456529
Change-Id: I63d100639cefda847eb79206ce5ae264bf41286f
Signed-off-by: Veselin Markov <veselin_m84@yahoo.com>
---
 .../e4/tools/emf/ui/internal/Messages.java    |   7 +-
 .../tools/emf/ui/internal/Messages.properties |   7 +-
 .../common/component/ParameterEditor.java     |  53 ++++-
 .../dialogs/ParameterIdSelectionDialog.java   | 211 ++++++++++++++++++
 4 files changed, 275 insertions(+), 3 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 4ba2c1665d..360ab30fa7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -426,9 +426,14 @@ public class Messages {
 
 	public String ParameterEditor_TreeLabel;
 	public String ParameterEditor_TreeLabelDescription;
-	public String ParameterEditor_Name;
+	public String ParameterEditor_Command_Parameter_ID;
 	public String ParameterEditor_Value;
 
+	public String ParameterIdSelectionDialog_ShellTitle;
+	public String ParameterIdSelectionDialog_DialogTitle;
+	public String ParameterIdSelectionDialog_DialogMessage;
+	public String ParameterIdSelectionDialog_LabelText;
+
 	public String PopupMenuEditor_TreeLabel;
 	public String PopupMenuEditor_TreeLabelDescription;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index c41e0e58a0..85a1900516 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -397,9 +397,14 @@ CommandParameterEditor_Optional=Optional
 
 ParameterEditor_TreeLabel=Parameter
 ParameterEditor_TreeLabelDescription=Parameter Bla Bla Bla Bla
-ParameterEditor_Name=Name
+ParameterEditor_Command_Parameter_ID=Command Parameter ID
 ParameterEditor_Value=Value
 
+ParameterIdSelectionDialog_ShellTitle=Find command parameter id
+ParameterIdSelectionDialog_DialogTitle=Find command parameter id
+ParameterIdSelectionDialog_DialogMessage=Find the command parameter id to be referenced by this parameter.
+ParameterIdSelectionDialog_LabelText=Command Parameter Id
+
 PopupMenuEditor_TreeLabel=Popup Menu
 PopupMenuEditor_TreeLabelDescription=Popup Menu Bla Bla Bla Bla
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index e2b4d437ea..d198fe1c70 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -12,16 +12,23 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.EclipseContextFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ParameterIdSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -29,10 +36,16 @@
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+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.Text;
 
 public class ParameterEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -40,6 +53,9 @@ public class ParameterEditor extends AbstractComponentEditor {
 
 	private StackLayout stackLayout;
 
+	@Inject
+	private IEclipseContext eclipseContext;
+
 	@Inject
 	public ParameterEditor() {
 		super();
@@ -126,7 +142,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.ParameterEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__NAME));
+		createParameterNameRow(parent, textProp);
 		ControlFactory.createTextField(parent, Messages.ParameterEditor_Value, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__VALUE));
 
 		item = new CTabItem(folder, SWT.NONE);
@@ -150,4 +166,39 @@ public IObservableList getChildList(Object element) {
 		return null;
 	}
 
+	private void createParameterNameRow(Composite parent, IWidgetValueProperty textProp) {
+		{
+			Label commandParameterIdLabel = new Label(parent, SWT.NONE);
+			commandParameterIdLabel.setText(Messages.ParameterEditor_Command_Parameter_ID);
+			commandParameterIdLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			Text commandParameterIdValue = new Text(parent, SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			commandParameterIdValue.setLayoutData(gd);
+			TextPasteHandler.createFor(commandParameterIdValue);
+			IEMFEditValueProperty modelProp = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__NAME);
+			context.bindValue(textProp.observeDelayed(200, commandParameterIdValue), modelProp.observeDetail(getMaster()));
+		}
+
+		Button chooseParameterButton = new Button(parent, SWT.PUSH | SWT.FLAT);
+		chooseParameterButton.setText(Messages.ModelTooling_Common_FindEllipsis);
+		chooseParameterButton.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
+		chooseParameterButton.addSelectionListener(new ChooseParameterButtonSelectionListener());
+		chooseParameterButton.setLayoutData(new GridData());
+	}
+
+	private final class ChooseParameterButtonSelectionListener extends SelectionAdapter {
+		@Override
+		public void widgetSelected(SelectionEvent e) {
+			WritableValue master = getMaster();
+			if (master == null || !(master.getValue() instanceof MParameter)) {
+				return;
+			}
+
+			IEclipseContext staticContext = EclipseContextFactory.create("ParameterIdSelectionDialog static context"); //$NON-NLS-1$
+			staticContext.set(MParameter.class, (MParameter) master.getValue());
+			ParameterIdSelectionDialog dialog = ContextInjectionFactory.make(ParameterIdSelectionDialog.class, eclipseContext, staticContext);
+			dialog.open();
+		}
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
new file mode 100644
index 0000000000..ca9ed68ecb
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
@@ -0,0 +1,211 @@
+/*******************************************************************************
+ * Copyright (c) 2015-2015 Veselin Markov.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ * Veselin Markov <veselin_m84@yahoo.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.inject.Inject;
+
+import org.eclipse.e4.core.services.nls.Translation;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.commands.MCommandParameter;
+import org.eclipse.e4.ui.model.application.commands.MParameter;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.viewers.IBaseLabelProvider;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * This dialog presents to the user in a table the available {@link MCommandParameter}s that
+ * may be referenced by the specified {@link MParameter}.
+ *
+ * @author Markov
+ * @noinstantiate this dialog uses DI an should not be instantiated by the user.
+ */
+public class ParameterIdSelectionDialog extends AbstractIdDialog<MParameter, MCommandParameter> {
+
+	@Inject
+	protected ModelEditor editor;
+
+	/** The parameter, which {@link MParameter#getName() name} feature has to be modified. */
+	protected MParameter parameter;
+	protected Set<EStructuralFeature> parametersFeatures = new HashSet<EStructuralFeature>();
+	protected Set<EStructuralFeature> commandsFeatures = new HashSet<EStructuralFeature>();
+
+	@Inject
+	public ParameterIdSelectionDialog(Shell parentShell, IModelResource resource, MParameter parameter,
+		EditingDomain domain, EModelService modelService, @Translation Messages messages) {
+		super(parentShell, resource, parameter, domain, modelService, messages);
+
+		this.parameter = parameter;
+		parametersFeatures.add(MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
+		commandsFeatures.add(MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND);
+	}
+
+	@Override
+	protected IBaseLabelProvider getLabelProvider() {
+		return new ComponentLabelProvider(editor, messages);
+	}
+
+	@Override
+	protected String getShellTitle() {
+		return messages.ParameterIdSelectionDialog_ShellTitle;
+	}
+
+	@Override
+	protected String getDialogTitle() {
+		return messages.ParameterIdSelectionDialog_DialogTitle;
+	}
+
+	@Override
+	protected String getDialogMessage() {
+		return messages.ParameterIdSelectionDialog_DialogMessage;
+	}
+
+	@Override
+	protected String getLabelText() {
+		return messages.ParameterIdSelectionDialog_LabelText;
+	}
+
+	@Override
+	protected List<MCommandParameter> getViewerInput() {
+		return getParametersOfParentNodesCommand();
+	}
+
+	@Override
+	protected EAttribute getFeatureLiteral() {
+		return CommandsPackageImpl.Literals.PARAMETER__NAME;
+	}
+
+	@Override
+	protected String getListItemInformation(MCommandParameter listItem) {
+		return null;
+	}
+
+	/**
+	 * Reads the parameters of the MComand in the {@link EObject} referencing the given {@link #parameter}.
+	 *
+	 * Searches for the parent element of {@linkplain #parameter}. Once found reads the {@link MCommandParameter}s of
+	 * the referenced {@link MCommand}, given the found parent references a MCommand.
+	 *
+	 * @return all found MCommandParameters or an empty {@link List}, never a {@code null} value.
+	 */
+	protected List<MCommandParameter> getParametersOfParentNodesCommand() {
+		TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
+		while (it.hasNext()) {
+			EObject containerObjectWithCommand = it.next();
+			if (containerObjectWithCommand != null && canSupplyParameters(containerObjectWithCommand)) {
+				List<MCommandParameter> commandParameters = getCommandParameters(containerObjectWithCommand);
+				return commandParameters;
+			}
+		}
+		return Collections.emptyList();
+	}
+
+	/**
+	 * Checks if the given {@code object} references a {@link MCommand} and the {@link #parameter}.
+	 *
+	 * @param object the object to be checked. May not be {@code null}.
+	 * @return {@code true} if {@code object} is a model-element that references a command and a list of parameters with
+	 *         {@link #parameter}, {@code false} otherwise.
+	 */
+	protected boolean canSupplyParameters(EObject object) {
+		return referencesCommand(object) && referencesParameters(object)
+			&& containsSearchedParameter(object);
+	}
+
+	/**
+	 * Checks whether the given {@code object} has a {@link EReference} to a {@link MCommand} feature.
+	 *
+	 * @param object that will be checked. May not be {@code null}.
+	 * @return {@code true} if the given {@code object} can reference a MCommand, {@code false} otherwise.
+	 */
+	protected boolean referencesCommand(EObject object) {
+		EList<EReference> eAllReferences = object.eClass().getEAllReferences();
+		for (EReference r : eAllReferences) {
+			if (commandsFeatures.contains(r)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Checks whether the given {@code object} has a {@link EReference} to a list of {@link MParameter}s feature.
+	 *
+	 * @param object that will be checked. May not be {@code null}.
+	 * @return {@code true} if the given {@code object} can reference a MParameters, {@code false} otherwise.
+	 */
+	protected boolean referencesParameters(EObject object) {
+		EList<EReference> eAllReferences = object.eClass().getEAllReferences();
+		for (EReference r : eAllReferences) {
+			if (parametersFeatures.contains(r)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if the {@link #parameter} is contained in the {@link MParameter}s feature of the given {@code object}.
+	 *
+	 * @param object that may contain the {@code parameter} we look for.
+	 * @return true if {@code object} contains the {@code parameter}, false otherwise.
+	 */
+	protected boolean containsSearchedParameter(EObject object) {
+		for (EStructuralFeature parametersFeature : parametersFeatures) {
+			Object parameters = object.eGet(parametersFeature);
+			if (parameters != null && parameters instanceof Collection<?>) {
+				return ((Collection<?>) parameters).contains(parameter);
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Reads the {@link MCommandParameter}s from the {@link MCommand} from the given {@code containerObjectWithCommand}.
+	 *
+	 * @param containerObjectWithCommand an object containing a {@link EReference} to an {@link MCommand}
+	 * @return a {@link List} with the {@link MCommandParameter}s or an empty list but never {@code null} value.
+	 *
+	 * @throws IllegalArgumentException if {@code containerObjectWithCommand} contains no {@link MCommand}. See
+	 *             {@link #referencesCommand(EObject)}.
+	 */
+	protected List<MCommandParameter> getCommandParameters(EObject containerObjectWithCommand) {
+		Object command = containerObjectWithCommand.eGet(MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND);
+
+		if (command != null && command instanceof MCommand) {
+			List<MCommandParameter> parameters = ((MCommand) command).getParameters();
+			if (parameters != null)
+				return parameters;
+			return Collections.emptyList();
+		}
+		throw new IllegalArgumentException("The parameter contains no MCommand"); //$NON-NLS-1$
+	}
+}

From cd808ad3748eefcfaf2ece69e00788b073d25d75 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Thu, 8 Jan 2015 16:40:29 +0100
Subject: [PATCH 0869/1286] Bug 436836 - Extract into fragment remove extension
 in target plugin

Copy the existing extensions before trying to add the fragment
extension.

Change-Id: If79939677199b699464f528ef2e9a3d64962b160
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../model/BaseApplicationModelWizard.java     | 268 +++++++++++-------
 1 file changed, 166 insertions(+), 102 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index 8d80be271c..9e093e72a0 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -49,7 +49,9 @@
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.osgi.service.resolver.BundleDescription;
 import org.eclipse.pde.core.build.IBuildEntry;
+import org.eclipse.pde.core.plugin.IExtensionsModelFactory;
 import org.eclipse.pde.core.plugin.IMatchRules;
+import org.eclipse.pde.core.plugin.IPluginAttribute;
 import org.eclipse.pde.core.plugin.IPluginElement;
 import org.eclipse.pde.core.plugin.IPluginExtension;
 import org.eclipse.pde.core.plugin.IPluginImport;
@@ -57,6 +59,7 @@
 import org.eclipse.pde.core.plugin.IPluginObject;
 import org.eclipse.pde.core.plugin.PluginRegistry;
 import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
+import org.eclipse.pde.internal.core.bundle.BundlePluginModel;
 import org.eclipse.pde.internal.core.bundle.WorkspaceBundlePluginModel;
 import org.eclipse.pde.internal.core.project.PDEProject;
 import org.eclipse.ui.INewWizard;
@@ -107,8 +110,9 @@ public boolean performFinish() {
 			final IFile modelFile = getModelFile();
 
 			if (modelFile.exists()) {
-				if (!MessageDialog.openQuestion(getShell(), Messages.BaseApplicationModelWizard_FileExists, Messages.BaseApplicationModelWizard_TheFileAlreadyExists
-					+ Messages.BaseApplicationModelWizard_AddExtractedNode)) {
+				if (!MessageDialog.openQuestion(getShell(), Messages.BaseApplicationModelWizard_FileExists,
+					Messages.BaseApplicationModelWizard_TheFileAlreadyExists
+						+ Messages.BaseApplicationModelWizard_AddExtractedNode)) {
 					return false;
 				}
 			}
@@ -117,112 +121,112 @@ public boolean performFinish() {
 			//
 			final WorkspaceModifyOperation operation =
 				new WorkspaceModifyOperation() {
-					@Override
-					protected void execute(IProgressMonitor progressMonitor) {
-						try {
-							// Create a resource set
-							//
-							final ResourceSet resourceSet = new ResourceSetImpl();
-
-							// Get the URI of the model file.
-							//
-							final URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
-
-							// Create a resource for this file.
-							//
-							final Resource resource = resourceSet.createResource(fileURI);
-
-							// If target file already exists, load its content
-							//
-							if (modelFile.exists()) {
-								resource.load(null);
-							}
-
-							// Add the initial model object to the contents.
-							//
-							final EObject rootObject = createInitialModel();
-							if (rootObject != null) {
-								if (resource.getContents().size() == 0) {
-									// If target model is empty (file just created) => add as is
-									resource.getContents().add(rootObject);
-								} else {
-									// Otherwise (file already exists) => take the roots of source and target models
-									// and copy multiple attributes 'imports' and 'fragments' objects from source to
-								// target
-									final MModelFragments sourceFragments = (MModelFragments) rootObject;
-									final MModelFragments targetFragments = (MModelFragments) resource.getContents()
-									.get(0);
-
-								final List<MCommand> listOfAllImportsFromElements = new ArrayList<MCommand>();
-									for (final MModelFragment fragment : sourceFragments.getFragments()) {
-										final List<MCommand> commandsToImport = new ArrayList<MCommand>();
-										final EObject eObject = (EObject) fragment;
-										final TreeIterator<EObject> eAllContents = eObject.eAllContents();
-										while (eAllContents.hasNext()) {
-											final EObject next = eAllContents.next();
-											final MApplicationElement mApplicationElement = (MApplicationElement) next;
-											if (mApplicationElement instanceof MHandler) {
-												final MHandler mHandler = (MHandler) mApplicationElement;
-												final MCommand command = mHandler.getCommand();
-												commandsToImport.add(command);
-												final MApplicationElement copy = (MApplicationElement) EcoreUtil
-												.copy((EObject) command);
-												targetFragments.getImports().add(copy);
-												mHandler.setCommand((MCommand) copy);
-											}
-											else if (mApplicationElement instanceof MHandledItem) {
-												final MHandledItem mHandledItem = (MHandledItem) mApplicationElement;
-												final MCommand command = mHandledItem.getCommand();
-												commandsToImport.add(command);
-												final MApplicationElement copy = (MApplicationElement) EcoreUtil
-												.copy((EObject) command);
-												targetFragments.getImports().add(copy);
-												mHandledItem.setCommand((MCommand) copy);
-											}
+				@Override
+				protected void execute(IProgressMonitor progressMonitor) {
+					try {
+						// Create a resource set
+						//
+						final ResourceSet resourceSet = new ResourceSetImpl();
+
+						// Get the URI of the model file.
+						//
+						final URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+						// Create a resource for this file.
+						//
+						final Resource resource = resourceSet.createResource(fileURI);
+
+						// If target file already exists, load its content
+						//
+						if (modelFile.exists()) {
+							resource.load(null);
+						}
 
+						// Add the initial model object to the contents.
+						//
+						final EObject rootObject = createInitialModel();
+						if (rootObject != null) {
+							if (resource.getContents().size() == 0) {
+								// If target model is empty (file just created) => add as is
+								resource.getContents().add(rootObject);
+							} else {
+								// Otherwise (file already exists) => take the roots of source and target models
+								// and copy multiple attributes 'imports' and 'fragments' objects from source to
+									// target
+								final MModelFragments sourceFragments = (MModelFragments) rootObject;
+								final MModelFragments targetFragments = (MModelFragments) resource.getContents()
+										.get(0);
+
+									final List<MCommand> listOfAllImportsFromElements = new ArrayList<MCommand>();
+								for (final MModelFragment fragment : sourceFragments.getFragments()) {
+									final List<MCommand> commandsToImport = new ArrayList<MCommand>();
+									final EObject eObject = (EObject) fragment;
+									final TreeIterator<EObject> eAllContents = eObject.eAllContents();
+									while (eAllContents.hasNext()) {
+										final EObject next = eAllContents.next();
+										final MApplicationElement mApplicationElement = (MApplicationElement) next;
+										if (mApplicationElement instanceof MHandler) {
+											final MHandler mHandler = (MHandler) mApplicationElement;
+											final MCommand command = mHandler.getCommand();
+											commandsToImport.add(command);
+											final MApplicationElement copy = (MApplicationElement) EcoreUtil
+													.copy((EObject) command);
+											targetFragments.getImports().add(copy);
+											mHandler.setCommand((MCommand) copy);
+										}
+										else if (mApplicationElement instanceof MHandledItem) {
+											final MHandledItem mHandledItem = (MHandledItem) mApplicationElement;
+											final MCommand command = mHandledItem.getCommand();
+											commandsToImport.add(command);
+											final MApplicationElement copy = (MApplicationElement) EcoreUtil
+													.copy((EObject) command);
+											targetFragments.getImports().add(copy);
+											mHandledItem.setCommand((MCommand) copy);
 										}
-										listOfAllImportsFromElements.addAll(commandsToImport);
-										targetFragments.getFragments().add(
-										(MModelFragment) EcoreUtil.copy((EObject) fragment));
 
 									}
-									for (final MApplicationElement element : sourceFragments.getImports()) {
-										boolean isAlreadyImport = true;
-									for (final MCommand mCommand : listOfAllImportsFromElements) {
+									listOfAllImportsFromElements.addAll(commandsToImport);
+									targetFragments.getFragments().add(
+											(MModelFragment) EcoreUtil.copy((EObject) fragment));
 
-											if (!mCommand.getElementId().equals(element.getElementId())) {
+								}
+								for (final MApplicationElement element : sourceFragments.getImports()) {
+									boolean isAlreadyImport = true;
+										for (final MCommand mCommand : listOfAllImportsFromElements) {
 
-											isAlreadyImport = false;
-												break;
-											}
-											if (!isAlreadyImport) {
+										if (!mCommand.getElementId().equals(element.getElementId())) {
 
-												targetFragments.getImports().add(
-												(MApplicationElement) EcoreUtil.copy((EObject) element));
-											}
+												isAlreadyImport = false;
+											break;
+										}
+										if (!isAlreadyImport) {
 
+											targetFragments.getImports().add(
+													(MApplicationElement) EcoreUtil.copy((EObject) element));
 										}
 
 									}
 
 								}
-							}
 
-							// Save the contents of the resource to the file system.
-							//
-							final Map<Object, Object> options = new HashMap<Object, Object>();
-							resource.save(options);
-							adjustBuildPropertiesFile(modelFile);
-							adjustDependencies(modelFile);
-						}
-						catch (final Exception exception) {
-							throw new RuntimeException(exception);
-						}
-						finally {
-							progressMonitor.done();
+							}
 						}
+
+						// Save the contents of the resource to the file system.
+						//
+						final Map<Object, Object> options = new HashMap<Object, Object>();
+						resource.save(options);
+						adjustBuildPropertiesFile(modelFile);
+						adjustDependencies(modelFile);
+					}
+					catch (final Exception exception) {
+						throw new RuntimeException(exception);
 					}
-				};
+					finally {
+						progressMonitor.done();
+					}
+				}
+			};
 
 			getContainer().run(false, false, operation);
 
@@ -234,20 +238,20 @@ else if (mApplicationElement instanceof MHandledItem) {
 			if (activePart instanceof ISetSelectionTarget) {
 				final ISelection targetSelection = new StructuredSelection(modelFile);
 				getShell().getDisplay().asyncExec
-					(new Runnable() {
-					@Override
-						public void run() {
-						((ISetSelectionTarget) activePart).selectReveal(targetSelection);
-					}
-				});
+				(new Runnable() {
+						@Override
+					public void run() {
+							((ISetSelectionTarget) activePart).selectReveal(targetSelection);
+						}
+					});
 			}
 
 			// Open an editor on the new file.
 			//
 			try {
 				page.openEditor
-					(new FileEditorInput(modelFile),
-					workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
+				(new FileEditorInput(modelFile),
+						workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
 			} catch (final PartInitException exception) {
 				MessageDialog.openError(workbenchWindow.getShell(), "Could not init editor", exception.getMessage()); //$NON-NLS-1$
 				return false;
@@ -381,14 +385,26 @@ private void addWorkbenchDependencyIfRequired(
 	 */
 	private void registerWithExtensionPointIfRequired(IProject project,
 		WorkspaceBundlePluginModel fModel, IFile file) throws CoreException {
-		final IPluginExtension[] extensions = fModel.getPluginBase().getExtensions();
 
 		final String WORKBENCH_MODEL_EP_ID = "org.eclipse.e4.workbench.model"; //$NON-NLS-1$
 		final String FRAGMENT = "fragment"; //$NON-NLS-1$
 
+		// Fix bug #436836 : the received fModel is an empty plugin model without extension.
+		// We must copy extensions found in registry plugin model into it
+		// The registry plugin model is read only and must be copied inside the new extension value..
+		final BundlePluginModel registryModel = (BundlePluginModel) PluginRegistry.findModel(project.getName());
+		// The registry Model is not modifiable and may be contains some existing extensions.
+		// Must copy them in the new created fModel
+		for (final IPluginExtension e : registryModel.getPluginBase().getExtensions()) {
+			final IPluginExtension clonedExtens = copyExtension(fModel.getFactory(), e);
+			fModel.getPluginBase().add(clonedExtens);
+		}
+
+		// Can now check if we must add this extension (may be already inside).
+		final IPluginExtension[] extensions = fModel.getPluginBase().getExtensions();
 		for (final IPluginExtension iPluginExtension : extensions) {
 			if (WORKBENCH_MODEL_EP_ID
-				.equalsIgnoreCase(iPluginExtension.getId())) {
+				.equalsIgnoreCase(iPluginExtension.getPoint())) {
 				final IPluginObject[] children = iPluginExtension.getChildren();
 				for (final IPluginObject child : children) {
 					if (FRAGMENT.equalsIgnoreCase(child.getName())) {
@@ -410,4 +426,52 @@ private void registerWithExtensionPointIfRequired(IProject project,
 		fModel.getPluginBase().add(extPointFragmentRegister);
 		fModel.save();
 	}
+
+	// Used to Fix bug #436836
+	private IPluginExtension copyExtension(IExtensionsModelFactory factory, final IPluginExtension ext) {
+		try
+		{
+			final IPluginExtension clonedExt = factory.createExtension();
+			clonedExt.setPoint(ext.getPoint());
+			final IPluginObject[] _children = ext.getChildren();
+			for (final IPluginObject elt : _children) {
+				if (elt instanceof IPluginElement) {
+					final IPluginElement ipe = (IPluginElement) elt;
+					final IPluginElement clonedElt = copyExtensionElement(factory, ipe, ext);
+					clonedExt.add(clonedElt);
+				}
+			}
+			return clonedExt;
+		} catch (final Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+
+	}
+
+	// Used to Fix bug #436836
+	private IPluginElement copyExtensionElement(IExtensionsModelFactory factory, final IPluginElement elt,
+		final IPluginObject parent) {
+		try
+		{
+			final IPluginElement clonedElt = factory.createElement(parent);
+			clonedElt.setName(elt.getName());
+			for (final IPluginAttribute a : elt.getAttributes()) {
+				clonedElt.setAttribute(a.getName(), a.getValue());
+			}
+			for (final IPluginObject e : elt.getChildren()) {
+				if (e instanceof IPluginElement) {
+					final IPluginElement ipe = (IPluginElement) e;
+					final IPluginElement copyExtensionElement = copyExtensionElement(factory, ipe, clonedElt);
+					clonedElt.add(copyExtensionElement);
+				}
+			}
+			return clonedElt;
+		} catch (final Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+
+	}
+
 }
\ No newline at end of file

From 09066fd3df0110ba5c67b44901ef5e6227e499de Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Wed, 21 Jan 2015 15:11:18 +0100
Subject: [PATCH 0870/1286] Bug 457890 - Increase Version numbers of core tools
 to 1.0.0

---
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF        | 2 +-
 bundles/org.eclipse.e4.tools.compat/pom.xml                     | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF  | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml               | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF        | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml                     | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml              | 2 +-
 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF      | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml                   | 2 +-
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF               | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                            | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml          | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml              | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index c1c3677d57..c44e84123a 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index c6196d3676..c3808a5415 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.compat</artifactId>
-  <version>0.12.0.qualifier</version>
+  <version>1.0.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 761277f801..ac9b4548e3 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 211129c03c..ae0a46a9bf 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.emf.editor3x</artifactId>
-  <version>0.12.0.qualifier</version>
+  <version>1.0.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 786510c910..f16d42ae1e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 25973f9ccc..dc0353b0e3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>0.12.0.qualifier</version>
+  <version>1.0.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index 06c4dd894e..1b45a2005b 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index c7ab963db8..b59f3b3947 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.jdt.templates</artifactId>
-  <version>0.12.0.qualifier</version>
+  <version>1.0.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 8830165068..530a0c7fe0 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.emf.ui",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 1e3a49e203..b427ba1ba5 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.services</artifactId>
-  <version>0.12.0.qualifier</version>
+  <version>1.0.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 119e50a364..91c57f915e 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 8d876aa19a..7f36ec483b 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>0.12.0.qualifier</version>
+  <version>1.0.0.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 75f368c95a..66fc4300a4 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="0.14.0.qualifier"
+      version="1.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index dcaf8f4cb4..4fc9ce61d2 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>0.14.0.qualifier</version>
+  <version>1.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
 
   <build>

From 7671627e9a9c3622878ed2cd65712a8b049937c8 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Thu, 19 Feb 2015 20:08:43 +0100
Subject: [PATCH 0871/1286] Bug 441171 - Remove the dependency on
 org.eclipse.pde.core from org.eclipse.e4.tools.emf.ui

---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index f16d42ae1e..b0216f1cb5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -34,8 +34,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.equinox.preferences;bundle-version="3.4.0",
  org.eclipse.e4.ui.workbench.swt;bundle-version="0.10.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.9.0",
- org.eclipse.jdt.core,
- org.eclipse.pde.core,
+ org.eclipse.jdt.core;resolution:=optional,
+ org.eclipse.pde.core;resolution:=optional,
  org.eclipse.e4.core.commands;bundle-version="0.10.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.0.0",

From 951023d356ed0e990b64f6723619e900dc869fb8 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 23 Mar 2015 09:25:22 +0100
Subject: [PATCH 0872/1286] Bug 459799 - Integrate eclipse.platform.ui.tools
 Git repo into platform build

Change-Id: I40a4238951a71ea2a8bd47bcbb1064b7d37894aa
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.compat/pom.xml        | 6 +++---
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml  | 8 ++++----
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml        | 6 +++---
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml | 6 +++---
 bundles/org.eclipse.e4.tools.services/pom.xml      | 6 +++---
 bundles/org.eclipse.e4.tools/pom.xml               | 8 ++++----
 features/org.eclipse.e4.core.tools.feature/pom.xml | 6 +++---
 7 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index c3808a5415..fc9a6befd0 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -2,15 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.e4.tools</groupId>
-    <artifactId>e4-tools-aggregator</artifactId>
+    <groupId>org.eclipse</groupId>
+    <artifactId>eclipse.platform.ui.tools</artifactId>
     <version>0.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.compat</artifactId>
-  <version>1.0.0.qualifier</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index ae0a46a9bf..28c66a3561 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.e4.tools</groupId>
-    <artifactId>e4-tools-aggregator</artifactId>
+   <parent>
+    <groupId>org.eclipse</groupId>
+    <artifactId>eclipse.platform.ui.tools</artifactId>
     <version>0.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.emf.editor3x</artifactId>
-  <version>1.0.0.qualifier</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index dc0353b0e3..89908722d8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -2,15 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.e4.tools</groupId>
-    <artifactId>e4-tools-aggregator</artifactId>
+    <groupId>org.eclipse</groupId>
+    <artifactId>eclipse.platform.ui.tools</artifactId>
     <version>0.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>1.0.0.qualifier</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index b59f3b3947..32c33ec0de 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -2,15 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.e4.tools</groupId>
-    <artifactId>e4-tools-aggregator</artifactId>
+    <groupId>org.eclipse</groupId>
+    <artifactId>eclipse.platform.ui.tools</artifactId>
     <version>0.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.jdt.templates</artifactId>
-  <version>1.0.0.qualifier</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index b427ba1ba5..6ea5b0f8d4 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -2,15 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.e4.tools</groupId>
-    <artifactId>e4-tools-aggregator</artifactId>
+    <groupId>org.eclipse</groupId>
+    <artifactId>eclipse.platform.ui.tools</artifactId>
     <version>0.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.tools.services</artifactId>
-  <version>1.0.0.qualifier</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 7f36ec483b..b311b05aac 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -2,15 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.e4.tools</groupId>
-    <artifactId>e4-tools-aggregator</artifactId>
+    <groupId>org.eclipse</groupId>
+    <artifactId>eclipse.platform.ui.tools</artifactId>
     <version>0.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
-  <groupId>org.eclipse.e4</groupId>
+  <groupId>org.eclipse</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>1.0.0.qualifier</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 4fc9ce61d2..68e3c26948 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -2,15 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.e4.tools</groupId>
-    <artifactId>e4-tools-aggregator</artifactId>
+    <groupId>org.eclipse</groupId>
+    <artifactId>eclipse.platform.ui.tools</artifactId>
     <version>0.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>1.0.0.qualifier</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>

From 58a934abc80e839fabc5b57c268c9dc6f6eb66a1 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Thu, 26 Mar 2015 13:22:32 +0100
Subject: [PATCH 0873/1286] Bug 403583 - show icons in the model editor tree
 Change editors of MUILabel elements (getImage)

Change-Id: I9931c0d2bbb430c36e1fd68f2f0a0575219a28d8
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../component/AbstractComponentEditor.java    |  79 +++++++---
 .../common/component/DialogEditor.java        |   3 +-
 .../component/DirectToolItemEditor.java       |   7 +-
 .../component/HandledMenuItemEditor.java      |   7 +-
 .../component/HandledToolItemEditor.java      |   7 +-
 .../internal/common/component/MenuEditor.java |   7 +-
 .../common/component/MenuItemEditor.java      |   7 +-
 .../component/PartDescriptorEditor.java       | 145 +++++++++++-------
 .../internal/common/component/PartEditor.java |   9 +-
 .../common/component/PerspectiveEditor.java   |   5 +-
 .../common/component/WindowEditor.java        |  17 +-
 11 files changed, 189 insertions(+), 104 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index eea1dd0d7c..ef9f4a43b5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -6,15 +6,20 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Marco Descher <marco@descher.at> - Bug 422465
- *     Steven Spungin <steven@spungin.tv> - Bug 437951, Bug 439709
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Marco Descher <marco@descher.at> - Bug 422465
+ * Steven Spungin <steven@spungin.tv> - Bug 437951, Bug 439709
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> Bug 403583
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common.component;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Collections;
 import java.util.List;
+
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
@@ -40,6 +45,7 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -57,7 +63,7 @@
 public abstract class AbstractComponentEditor {
 	private static final String CSS_CLASS_KEY = "org.eclipse.e4.ui.css.CssClassName"; //$NON-NLS-1$
 
-	private WritableValue master = new WritableValue();
+	private final WritableValue master = new WritableValue();
 
 	public static final int SEARCH_IMAGE = 0;
 	public static final int TABLE_ADD_IMAGE = 1;
@@ -86,6 +92,9 @@ public abstract class AbstractComponentEditor {
 	@Optional
 	private ProjectOSGiTranslationProvider translationProvider;
 
+	/** An imageregistry for dynamic component images (see bug #403583) */
+	private static ImageRegistry componentImages = new ImageRegistry();
+
 	private Composite editorControl;
 
 	private IdGenerator generator;
@@ -104,9 +113,10 @@ public WritableValue getMaster() {
 
 	protected void setElementId(Object element) {
 		if (getEditor().isAutoCreateElementId() && element instanceof MApplicationElement) {
-			MApplicationElement el = (MApplicationElement) element;
+			final MApplicationElement el = (MApplicationElement) element;
 			if (el.getElementId() == null || el.getElementId().trim().length() == 0) {
-				el.setElementId(Util.getDefaultElementId(((EObject) getMaster().getValue()).eResource(), el, getEditor().getProject()));
+				el.setElementId(Util.getDefaultElementId(((EObject) getMaster().getValue()).eResource(), el,
+					getEditor().getProject()));
 			}
 		}
 	}
@@ -122,6 +132,35 @@ public ImageDescriptor createImageDescriptor(String key) {
 		return ImageDescriptor.createFromImage(createImage(key));
 	}
 
+	/**
+	 * Get the image described in element if this is a MUILabel
+	 *
+	 * @param element the element in tree to be displayed
+	 * @return image of element if iconUri is correct, else returns null
+	 */
+	public Image getImageFromIconURI(Object element) {
+		Image img = null;
+		if (element instanceof MUILabel) {
+			final String iconUri = ((MUILabel) element).getIconURI();
+			if (iconUri != null) {
+				img = componentImages.get(iconUri);
+				if (img == null) {
+					try {
+						final URL url = new URL(iconUri);
+						final ImageDescriptor idesc = ImageDescriptor
+							.createFromURL(url);
+						componentImages.put(iconUri, idesc);
+						img = componentImages.get(iconUri);
+					} catch (final MalformedURLException e) {
+						// Nothing to do at this.. no image
+					}
+				}
+
+			}
+		}
+		return img;
+	}
+
 	public abstract Image getImage(Object element, Display display);
 
 	public abstract String getLabel(Object element);
@@ -152,8 +191,8 @@ public List<Action> getActions(Object element) {
 	}
 
 	/**
-	 * Translates an input <code>String</code> using the current
-	 * {@link ResourceBundleTranslationProvider} and <code>locale</code> from
+	 * Translates an input <code>String</code> using the current {@link ResourceBundleTranslationProvider} and
+	 * <code>locale</code> from
 	 * the {@link TranslationService}.
 	 *
 	 * @param string
@@ -188,7 +227,7 @@ private boolean isFocusChild(Control control) {
 
 	public void handleCopy() {
 		if (editorControl != null) {
-			Control focusControl = editorControl.getDisplay().getFocusControl();
+			final Control focusControl = editorControl.getDisplay().getFocusControl();
 
 			if (isFocusChild(focusControl) && focusControl.getData(ControlFactory.COPY_HANDLER) != null) {
 				((Handler) focusControl.getData(ControlFactory.COPY_HANDLER)).copy();
@@ -198,7 +237,7 @@ public void handleCopy() {
 
 	public void handlePaste() {
 		if (editorControl != null) {
-			Control focusControl = editorControl.getDisplay().getFocusControl();
+			final Control focusControl = editorControl.getDisplay().getFocusControl();
 
 			if (isFocusChild(focusControl) && focusControl.getData(ControlFactory.COPY_HANDLER) != null) {
 				((Handler) focusControl.getData(ControlFactory.COPY_HANDLER)).paste();
@@ -208,7 +247,7 @@ public void handlePaste() {
 
 	public void handleCut() {
 		if (editorControl != null) {
-			Control focusControl = editorControl.getDisplay().getFocusControl();
+			final Control focusControl = editorControl.getDisplay().getFocusControl();
 
 			if (isFocusChild(focusControl) && focusControl.getData(ControlFactory.COPY_HANDLER) != null) {
 				((Handler) focusControl.getData(ControlFactory.COPY_HANDLER)).cut();
@@ -231,28 +270,29 @@ protected Composite createScrollableContainer(Composite parent) {
 		scrolling.addControlListener(new ControlAdapter() {
 			@Override
 			public void controlResized(ControlEvent e) {
-				Rectangle r = scrolling.getClientArea();
+				final Rectangle r = scrolling.getClientArea();
 				scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT));
 			}
 		});
 
 		scrolling.setLayoutData(new GridData(GridData.FILL_BOTH));
 
-		GridLayout gl = new GridLayout(3, false);
+		final GridLayout gl = new GridLayout(3, false);
 		gl.horizontalSpacing = 10;
 		contentContainer.setLayout(gl);
 
 		return contentContainer;
 	}
 
-	protected void createContributedEditorTabs(CTabFolder folder, EMFDataBindingContext context, WritableValue master, Class<?> clazz) {
-		List<AbstractElementEditorContribution> contributionList = editor.getTabContributionsForClass(clazz);
+	protected void createContributedEditorTabs(CTabFolder folder, EMFDataBindingContext context, WritableValue master,
+		Class<?> clazz) {
+		final List<AbstractElementEditorContribution> contributionList = editor.getTabContributionsForClass(clazz);
 
-		for (AbstractElementEditorContribution eec : contributionList) {
-			CTabItem item = new CTabItem(folder, SWT.BORDER);
+		for (final AbstractElementEditorContribution eec : contributionList) {
+			final CTabItem item = new CTabItem(folder, SWT.BORDER);
 			item.setText(eec.getTabLabel());
 
-			Composite parent = createScrollableContainer(folder);
+			final Composite parent = createScrollableContainer(folder);
 			item.setControl(parent.getParent());
 
 			eec.createContributedEditorTab(parent, context, master, getEditingDomain(), project);
@@ -279,7 +319,8 @@ protected void enableIdGenerator(EAttribute attSource, EAttribute attId, Control
 		}
 		if (getEditor().isAutoCreateElementId()) {
 			generator = new IdGenerator();
-			generator.bind(getMaster(), EMFEditProperties.value(getEditingDomain(), attSource), EMFEditProperties.value(getEditingDomain(), attId), control);
+			generator.bind(getMaster(), EMFEditProperties.value(getEditingDomain(), attSource),
+				EMFEditProperties.value(getEditingDomain(), attId), control);
 		}
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java
index 5985a49aab..4f531b0eb5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java
@@ -27,7 +27,8 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_Dialog);
+				final Image img = getImageFromIconURI(uiElement);
+				return img != null ? img : createImage(ResourceProvider.IMG_Dialog);
 			}
 			return createImage(ResourceProvider.IMG_Tbr_Dialog);
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index ffe3a7eb3e..59fffc2332 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -74,7 +74,8 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_DirectToolItem);
+				final Image img = getImageFromIconURI(uiElement);
+				return img != null ? img : createImage(ResourceProvider.IMG_DirectToolItem);
 			}
 			return createImage(ResourceProvider.IMG_Tbr_DirectToolItem);
 		}
@@ -120,8 +121,8 @@ public void modifyText(ModifyEvent e) {
 		});
 		final Binding binding = context.bindValue(textProp.observeDelayed(200, t),
 			EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI)
-				.observeDetail(master), new UpdateValueStrategy()
-				.setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
+			.observeDetail(master), new UpdateValueStrategy()
+		.setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
 		Util.addDecoration(t, binding);
 
 		final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index c60364c1e5..fcafdf9806 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -69,7 +69,8 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_HandledMenuItem);
+				final Image img = getImageFromIconURI(uiElement);
+				return img != null ? img : createImage(ResourceProvider.IMG_HandledMenuItem);
 			}
 			return createImage(ResourceProvider.IMG_Tbr_HandledMenuItem);
 		}
@@ -103,8 +104,8 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			t.setEditable(false);
 			context.bindValue(textProp.observeDelayed(200, t),
 				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND)
-					.observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy()
-					.setConverter(new CommandToStringConverter(Messages)));
+				.observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy()
+			.setConverter(new CommandToStringConverter(Messages)));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 0110964f8d..5c4258f765 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -68,7 +68,8 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_HandledToolItem);
+				final Image img = getImageFromIconURI(uiElement);
+				return img != null ? img : createImage(ResourceProvider.IMG_HandledToolItem);
 			}
 			return createImage(ResourceProvider.IMG_Tbr_HandledToolItem);
 		}
@@ -91,8 +92,8 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 			t.setEditable(false);
 			context.bindValue(textProp.observeDelayed(200, t),
 				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND)
-					.observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy()
-					.setConverter(new CommandToStringConverter(Messages)));
+				.observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy()
+			.setConverter(new CommandToStringConverter(Messages)));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index e70ee3e1c7..e8e0f63cba 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -173,7 +173,8 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_Menu);
+				final Image img = getImageFromIconURI(uiElement);
+				return img != null ? img : createImage(ResourceProvider.IMG_Menu);
 			}
 			return createImage(ResourceProvider.IMG_Tbr_Menu);
 		}
@@ -245,7 +246,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
 			EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		// ------------------------------------------------------------
 		if (!rootMenu) {
@@ -364,7 +365,7 @@ public String getText(Object element) {
 			combo.setInput(list);
 			context.bindValue(ViewerProperties.singleSelection().observe(combo),
 				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN)
-					.observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)),
+				.observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)),
 				new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 8c455a2694..3bdcd1b638 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -115,7 +115,8 @@ public void run() {
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			if (((MUIElement) element).isToBeRendered()) {
-				return createImage(ResourceProvider.IMG_MenuItem);
+				final Image img = getImageFromIconURI(element);
+				return img != null ? img : createImage(ResourceProvider.IMG_MenuItem);
 			}
 			return createImage(ResourceProvider.IMG_Tbr_MenuItem);
 		}
@@ -184,7 +185,7 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
 			EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		if (this.getClass() != MenuItemEditor.class) {
 			// ------------------------------------------------------------
@@ -330,7 +331,7 @@ public String getText(Object element) {
 			combo.setInput(list);
 			context.bindValue(ViewerProperties.singleSelection().observe(combo),
 				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN)
-					.observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)),
+				.observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)),
 				new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 6e26e0f3f5..f46d7c6f93 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -6,12 +6,13 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Steven Spungin <steven@spungin.tv> - Bug 404166, 424730, 437951
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steven@spungin.tv> - Bug 404166, 424730, 437951
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -81,9 +82,11 @@ public class PartDescriptorEditor extends AbstractComponentEditor {
 	@Inject
 	IEclipseContext eclipseContext;
 
-	private IListProperty PART__MENUS = EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS);
-	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
-	private IValueProperty PART__TOOLBAR = EMFProperties.value(BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR);
+	private final IListProperty PART__MENUS = EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS);
+	private final IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties
+		.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
+	private final IValueProperty PART__TOOLBAR = EMFProperties
+		.value(BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR);
 	private Button createRemoveToolBar;
 	private StackLayout stackLayout;
 
@@ -94,7 +97,8 @@ public PartDescriptorEditor() {
 
 	@Override
 	public Image getImage(Object element, Display display) {
-		return createImage(ResourceProvider.IMG_PartDescriptor);
+		final Image img = getImageFromIconURI(element);
+		return img != null ? img : createImage(ResourceProvider.IMG_PartDescriptor);
 	}
 
 	@Override
@@ -141,12 +145,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
-		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
-	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master,
+		boolean isImport) {
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -158,7 +164,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -166,27 +172,36 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTranslatedTextField(parent, Messages.PartDescriptorEditor_LabelLabel, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
-		ControlFactory.createTranslatedTextField(parent, Messages.PartDescriptorEditor_Tooltip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool, project);
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+			EMFEditProperties
+			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTranslatedTextField(parent, Messages.PartDescriptorEditor_LabelLabel, master, context,
+			textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL),
+			resourcePool, project);
+		ControlFactory.createTranslatedTextField(parent, Messages.PartDescriptorEditor_Tooltip, master, context,
+			textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP),
+			resourcePool, project);
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_IconURI);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
+					master));
 
 			new ImageTooltip(t, Messages) {
 
 				@Override
 				protected URI getImageURI() {
-					MUILabel part = (MUILabel) getMaster().getValue();
-					String uri = part.getIconURI();
+					final MUILabel part = (MUILabel) getMaster().getValue();
+					final String uri = part.getIconURI();
 					if (uri == null || uri.trim().length() == 0) {
 						return null;
 					}
@@ -201,7 +216,8 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					PartDescriptorIconDialogEditor dialog = new PartDescriptorIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), Messages);
+					final PartDescriptorIconDialogEditor dialog = new PartDescriptorIconDialogEditor(b.getShell(),
+						eclipseContext, project, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -216,7 +232,8 @@ public void widgetSelected(SelectionEvent e) {
 			 * creative here
 			 */
 			//
-			final IContributionClassCreator c = getEditor().getContributionCreator(org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.PART);
+			final IContributionClassCreator c = getEditor().getContributionCreator(
+				org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.PART);
 			if (project != null && c != null) {
 				lnk = new Link(parent, SWT.NONE);
 				lnk.setText("<A>" + Messages.PartEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
@@ -225,8 +242,8 @@ public void widgetSelected(SelectionEvent e) {
 				lnk.addSelectionListener(new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
-						MPart dummyPart = MBasicFactory.INSTANCE.createPart();
-						String contributionURI = ((MPartDescriptor) getMaster().getValue()).getContributionURI();
+						final MPart dummyPart = MBasicFactory.INSTANCE.createPart();
+						final String contributionURI = ((MPartDescriptor) getMaster().getValue()).getContributionURI();
 						dummyPart.setContributionURI(contributionURI);
 						c.createOpen(dummyPart, getEditingDomain(), project, lnk.getShell());
 						((MPartDescriptor) masterFinal.getValue()).setContributionURI(dummyPart.getContributionURI());
@@ -236,14 +253,17 @@ public void widgetSelected(SelectionEvent e) {
 				// Dispose the lnk widget, which is unused in this else branch
 				// and screws up the layout: see https://bugs.eclipse.org/421369
 				lnk = null;
-				Label l = new Label(parent, SWT.NONE);
+				final Label l = new Label(parent, SWT.NONE);
 				l.setText(Messages.PartDescriptorEditor_ClassURI);
 				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 			}
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t),
+				EMFEditProperties
+				.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI)
+				.observeDetail(master));
 			TextPasteHandler.createFor(t);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
@@ -253,7 +273,9 @@ public void widgetSelected(SelectionEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI, Messages);
+					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
+						getEditingDomain(), (MPartDescriptor) getMaster().getValue(),
+						BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
@@ -261,7 +283,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_ToolBar);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
@@ -269,7 +291,7 @@ public void widgetSelected(SelectionEvent e) {
 			createRemoveToolBar.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MPartDescriptor window = (MPartDescriptor) getMaster().getValue();
+					final MPartDescriptor window = (MPartDescriptor) getMaster().getValue();
 					if (window.getToolbar() == null) {
 						addToolBar();
 					} else {
@@ -282,71 +304,78 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_ContainerData);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			final Text t = new Text(parent, SWT.BORDER);
+			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA)
+				.observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_Dirtyable);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Button checkbox = new Button(parent, SWT.CHECK);
+			final Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
 
-			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__DIRTYABLE);
-			IWidgetValueProperty uiProp = WidgetProperties.selection();
+			final IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(),
+				BasicPackageImpl.Literals.PART_DESCRIPTOR__DIRTYABLE);
+			final IWidgetValueProperty uiProp = WidgetProperties.selection();
 
 			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_Closeable);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Button checkbox = new Button(parent, SWT.CHECK);
+			final Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
 
-			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CLOSEABLE);
-			IWidgetValueProperty uiProp = WidgetProperties.selection();
+			final IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(),
+				BasicPackageImpl.Literals.PART_DESCRIPTOR__CLOSEABLE);
+			final IWidgetValueProperty uiProp = WidgetProperties.selection();
 
 			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_Multiple);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Button checkbox = new Button(parent, SWT.CHECK);
+			final Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
 
-			IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__ALLOW_MULTIPLE);
-			IWidgetValueProperty uiProp = WidgetProperties.selection();
+			final IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(),
+				BasicPackageImpl.Literals.PART_DESCRIPTOR__ALLOW_MULTIPLE);
+			final IWidgetValueProperty uiProp = WidgetProperties.selection();
 
 			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_Category);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false, 2, 1));
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CATEGORY).observeDetail(master));
+			context.bindValue(textProp.observeDelayed(200, t),
+				EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CATEGORY)
+				.observeDetail(master));
 		}
 
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.PartEditor_BindingContexts);
@@ -357,8 +386,10 @@ public void widgetSelected(SelectionEvent e) {
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createContributedEditorTabs(folder, context, getMaster(), MPartDescriptor.class);
 
@@ -368,17 +399,19 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	private void addToolBar() {
-		MToolBar menu = MMenuFactory.INSTANCE.createToolBar();
+		final MToolBar menu = MMenuFactory.INSTANCE.createToolBar();
 		setElementId(menu);
 
-		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR, menu);
+		final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(),
+			BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR, menu);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
 	}
 
 	private void removeToolBar() {
-		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR, null);
+		final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(),
+			BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR, null);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
@@ -392,7 +425,8 @@ public IObservableList getChildList(final Object element) {
 			return list;
 		}
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PARTDESCRIPTOR_MENU, PART__MENUS, element, Messages.PartDescriptorEditor_Menus) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PARTDESCRIPTOR_MENU, PART__MENUS, element,
+			Messages.PartDescriptorEditor_Menus) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -401,7 +435,8 @@ protected boolean accepted(Object o) {
 
 		});
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element, Messages.PartDescriptorEditor_Handlers) {
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element,
+			Messages.PartDescriptorEditor_Handlers) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -410,7 +445,7 @@ protected boolean accepted(Object o) {
 
 		});
 
-		MPartDescriptor window = (MPartDescriptor) element;
+		final MPartDescriptor window = (MPartDescriptor) element;
 		if (window.getToolbar() != null) {
 			list.add(0, window.getToolbar());
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 609304a3ab..fcdb972c17 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -106,7 +106,8 @@ public PartEditor() {
 	public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			if (((MUIElement) element).isToBeRendered()) {
-				return createImage(ResourceProvider.IMG_Part);
+				final Image img = getImageFromIconURI(element);
+				return img != null ? img : createImage(ResourceProvider.IMG_Part);
 			}
 			return createImage(ResourceProvider.IMG_Tbr_Part);
 		}
@@ -191,7 +192,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
 			EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.PartEditor_LabelLabel, master, context, textProp,
 			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, master, context,
@@ -284,8 +285,8 @@ public void modifyText(ModifyEvent e) {
 				textProp.observeDelayed(200, t),
 				EMFEditProperties.value(getEditingDomain(),
 					ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master),
-				new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
-				new UpdateValueStrategy());
+					new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+					new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index e19b656530..6a76947660 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -135,7 +135,8 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_Perspective);
+				final Image img = getImageFromIconURI(uiElement);
+				return img != null ? img : createImage(ResourceProvider.IMG_Perspective);
 			}
 			return createImage(ResourceProvider.IMG_Tbr_Perspective);
 		}
@@ -223,7 +224,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
 			EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
 			context, textProp,
 			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index b25ad1e551..f153ba7aa5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -117,7 +117,8 @@ public Image getImage(Object element, Display display) {
 		if (element instanceof MUIElement) {
 			final MUIElement uiElement = (MUIElement) element;
 			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_Window);
+				final Image img = getImageFromIconURI(uiElement);
+				return img != null ? img : createImage(ResourceProvider.IMG_Window);
 			}
 			return createImage(ResourceProvider.IMG_Tbr_Window);
 		}
@@ -198,7 +199,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp,
 			EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		// ------------------------------------------------------------
 		{
@@ -311,13 +312,13 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		ControlFactory
-			.createCheckBox(
-				parent,
-				"To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+		.createCheckBox(
+			parent,
+			"To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
 		ControlFactory
-			.createCheckBox(
-				parent,
-				"Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		.createCheckBox(
+			parent,
+			"Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.WindowEditor_SelectedElement);
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.WindowEditor_BindingContexts);

From dcee4579f9ba870f535d72ee4a6ccf939569a7d6 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Fri, 27 Mar 2015 10:13:04 +0100
Subject: [PATCH 0874/1286] Bug 463267 - [Tools] Adding CompositePart in model
 throws Exception

---
 .../common/component/CompositePartEditor.java | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index ca2c906083..9e47c63491 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -153,17 +153,17 @@ public void run() {
 
 		// --- Import Actions ---
 		actionsImport.add(new Action("Views", createImageDescriptor(ResourceProvider.IMG_Part)) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleImportChild(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_VIEW);
-				}
-			});
+			@Override
+			public void run() {
+				handleImportChild(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_VIEW);
+			}
+		});
 		actionsImport.add(new Action("Editors", createImageDescriptor(ResourceProvider.IMG_Part)) { //$NON-NLS-1$
-				@Override
-				public void run() {
-					handleImportChild(BasicPackageImpl.Literals.INPUT_PART, RegistryUtil.HINT_EDITOR);
-				}
-			});
+			@Override
+			public void run() {
+				handleImportChild(BasicPackageImpl.Literals.INPUT_PART, RegistryUtil.HINT_EDITOR);
+			}
+		});
 
 	}
 
@@ -256,7 +256,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
 			EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
 			context, textProp,
 			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
@@ -329,7 +329,7 @@ public String getText(Object element) {
 			final IViewerValueProperty vProp = ViewerProperties.singleSelection();
 			context.bindValue(vProp.observe(viewer),
 				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL)
-					.observeDetail(getMaster()));
+				.observeDetail(getMaster()));
 		}
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.CompositePartEditor_SelectedElement);
@@ -354,6 +354,7 @@ public String getText(Object element) {
 
 			final ComboViewer childrenDropDown = new ComboViewer(buttonCompTop);
 			childrenDropDown.setLabelProvider(new FeatureClassLabelProvider(getEditor()));
+			childrenDropDown.setContentProvider(ArrayContentProvider.getInstance());
 
 			final List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
 			eClassList.add(new FeatureClass("PartSashContainer", BasicPackageImpl.Literals.PART_SASH_CONTAINER)); //$NON-NLS-1$

From d223675b64c5b6f161e2649fe997f4fd1826373e Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Fri, 27 Mar 2015 11:04:29 +0100
Subject: [PATCH 0875/1286] Bug 463265 - [Tools] Wizards add a require-bundle
 "javax.annotation" which based on all our advices should be a package import

---
 .../classes/AbstractNewClassWizard.java       | 56 ++++++++++++++++++-
 .../wizards/classes/NewAddonClassWizard.java  |  8 ++-
 .../wizards/classes/NewPartClassWizard.java   | 14 ++++-
 3 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
index f38d1a130c..b380326abd 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
@@ -36,8 +36,10 @@
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.osgi.service.resolver.VersionRange;
 import org.eclipse.pde.core.project.IBundleProjectDescription;
 import org.eclipse.pde.core.project.IBundleProjectService;
+import org.eclipse.pde.core.project.IPackageImportDescription;
 import org.eclipse.pde.core.project.IRequiredBundleDescription;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
@@ -142,7 +144,11 @@ protected void checkRequiredBundles() {
 			final IBundleProjectDescription description = service.getDescription(project);
 			final Set<String> requiredBundles = getRequiredBundles();
 			final IRequiredBundleDescription[] arTmp = description.getRequiredBundles();
+			final IPackageImportDescription[] currentImportPacks = description.getPackageImports();
+			final Set<String> requiredImportPacks = getImportedPackages();
 			final List<IRequiredBundleDescription> descs = new ArrayList<IRequiredBundleDescription>();
+			final List<IPackageImportDescription> imDescs = new ArrayList<IPackageImportDescription>();
+
 			if (arTmp != null) {
 				descs.addAll(Arrays.asList(arTmp));
 			}
@@ -157,15 +163,63 @@ protected void checkRequiredBundles() {
 				description.setRequiredBundles(descs.toArray(new IRequiredBundleDescription[0]));
 				description.apply(new NullProgressMonitor());
 			}
+
+			if (currentImportPacks != null) {
+				imDescs.addAll(Arrays.asList(currentImportPacks));
+			}
+			for (final IPackageImportDescription ds : imDescs) {
+				requiredImportPacks.remove(ds.getName());
+			}
+			if (!requiredImportPacks.isEmpty()) {
+				for (final String i : requiredImportPacks) {
+					// javax.annotation;version="1.0.0";resolution:=optional
+					final String[] parts = i.split(";"); //$NON-NLS-1$
+					final VersionRange r = findVersionRange(parts);
+					final boolean optional = isOptional(parts);
+
+					imDescs.add(service.newPackageImport(parts[0], r, optional));
+				}
+				description.setPackageImports(imDescs.toArray(new IPackageImportDescription[0]));
+				description.apply(new NullProgressMonitor());
+			}
 		} catch (final CoreException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 	}
 
+	private static VersionRange findVersionRange(String[] parts) {
+		for (final String p : parts) {
+			if (p.startsWith("version=")) { //$NON-NLS-1$
+				final String version = p.substring("version=".length() + 1, p.length() - 1); //$NON-NLS-1$
+				return new VersionRange(version.trim());
+			}
+		}
+		return null;
+	}
+
+	private static boolean isOptional(String[] parts) {
+		for (final String p : parts) {
+			if (p.startsWith("resolution:=")) { //$NON-NLS-1$
+				return p.contains("optional"); //$NON-NLS-1$
+			}
+		}
+		return false;
+	}
+
+	// public static void main(String[] args) {
+	// findVersionRange("javax.annotation;version=\"1.0.0\";resolution:=optional".split(";"));
+	// }
+
 	protected Set<String> getRequiredBundles() {
 		final Set<String> rv = new HashSet<String>();
-		rv.add("javax.inject"); //$NON-NLS-1$
+		//		rv.add("javax.inject"); //$NON-NLS-1$
+		return rv;
+	}
+
+	protected Set<String> getImportedPackages() {
+		final Set<String> rv = new HashSet<String>();
+		rv.add("javax.inject;version=\"1.0.0\""); //$NON-NLS-1$
 		return rv;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
index 3c333bd7f0..5b841f0a47 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
@@ -58,8 +58,14 @@ protected String getContent() {
 	@Override
 	protected Set<String> getRequiredBundles() {
 		final Set<String> rv = super.getRequiredBundles();
-		rv.add("javax.annotation"); //$NON-NLS-1$
 		rv.add("org.eclipse.e4.core.services"); //$NON-NLS-1$
 		return rv;
 	}
+
+	@Override
+	protected Set<String> getImportedPackages() {
+		final Set<String> rv = super.getImportedPackages();
+		rv.add("javax.annotation;version=\"1.0.0\";resolution:=optional"); //$NON-NLS-1$
+		return super.getImportedPackages();
+	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
index e82ad1189b..1e6d15ff30 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
@@ -160,15 +160,23 @@ protected JavaClass createInstance() {
 	protected Set<String> getRequiredBundles() {
 		final Set<String> rv = super.getRequiredBundles();
 		final PartClass cl = (PartClass) getDomainClass();
-		if (cl.usePostConstruct || cl.usePredestroy) {
-			rv.add("javax.annotation"); //$NON-NLS-1$
-		} else if (cl.useFocus || cl.usePersist) {
+		if (cl.useFocus || cl.usePersist) {
 			rv.add("org.eclipse.e4.ui.di"); //$NON-NLS-1$
 		}
 
 		return rv;
 	}
 
+	@Override
+	protected Set<String> getImportedPackages() {
+		final Set<String> rv = super.getImportedPackages();
+		final PartClass cl = (PartClass) getDomainClass();
+		if (cl.usePostConstruct || cl.usePredestroy) {
+			rv.add("javax.annotation;version=\"1.0.0\";resolution:=optional"); //$NON-NLS-1$
+		}
+		return rv;
+	}
+
 	@Override
 	protected String getContent() {
 		final PartTemplate template = new PartTemplate();

From adb0195de631cbe3ab706d750fca625a67526656 Mon Sep 17 00:00:00 2001
From: David Williams <david_williams@us.ibm.com>
Date: Fri, 3 Apr 2015 02:34:13 -0400
Subject: [PATCH 0876/1286] Bug 463856 - Trouble doing an I-build of
 org.eclipse.e4.core.tools.feature

Change-Id: I1a452abd6b004f528e517b1e4a04dccae76f3b06
Signed-off-by: David Williams <david_williams@us.ibm.com>
---
 bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt     | 1 +
 .../org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt   | 1 +
 bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt     | 1 +
 .../org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt  | 1 +
 bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt   | 1 +
 bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt            | 1 +
 .../org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt   | 1 +
 7 files changed, 7 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
index 396f08759f..14243173d2 100644
--- a/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
+++ b/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
@@ -1,2 +1,3 @@
 # To force a version qualifier update add the bug here
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
+Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt
index 396f08759f..14243173d2 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt
@@ -1,2 +1,3 @@
 # To force a version qualifier update add the bug here
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
+Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
index 396f08759f..14243173d2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
+++ b/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
@@ -1,2 +1,3 @@
 # To force a version qualifier update add the bug here
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
+Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt
index 396f08759f..14243173d2 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt
@@ -1,2 +1,3 @@
 # To force a version qualifier update add the bug here
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
+Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
diff --git a/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
index 396f08759f..93c4fe3980 100644
--- a/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
+++ b/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
@@ -1,2 +1,3 @@
 # To force a version qualifier update add the bug here
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
+Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
index 396f08759f..93c4fe3980 100644
--- a/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
+++ b/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
@@ -1,2 +1,3 @@
 # To force a version qualifier update add the bug here
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
+Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
\ No newline at end of file
diff --git a/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt b/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt
index 396f08759f..14243173d2 100644
--- a/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt
+++ b/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt
@@ -1,2 +1,3 @@
 # To force a version qualifier update add the bug here
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
+Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature

From 46144b3d2425a7ba6788fc8a223a8a9c7f643c1b Mon Sep 17 00:00:00 2001
From: David Williams <david_williams@us.ibm.com>
Date: Fri, 3 Apr 2015 14:29:13 -0400
Subject: [PATCH 0877/1286] Bug 463912 - [Tools] e4.core.tools feature needs to
 use standard, shared license ..

Change-Id: I17eeff023078ab2ac2a1f2ac99d7f6bbf1bae7a5
Signed-off-by: David Williams <david_williams@us.ibm.com>
---
 .../feature.properties                        | 116 +------
 .../feature.xml                               |   4 +-
 .../eclipse_update_120.jpg                    | Bin 21695 -> 0 bytes
 .../sourceTemplateFeature/epl-v10.html        | 328 ------------------
 .../sourceTemplateFeature/feature.properties  | 144 --------
 .../sourceTemplateFeature/license.html        |  79 -----
 .../sourceTemplatePlugin/build.properties     |  12 -
 7 files changed, 5 insertions(+), 678 deletions(-)
 mode change 100755 => 100644 features/org.eclipse.e4.core.tools.feature/feature.properties
 delete mode 100755 features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/eclipse_update_120.jpg
 delete mode 100755 features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/epl-v10.html
 delete mode 100755 features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/feature.properties
 delete mode 100755 features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/license.html
 delete mode 100755 features/org.eclipse.e4.core.tools.feature/sourceTemplatePlugin/build.properties

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.properties b/features/org.eclipse.e4.core.tools.feature/feature.properties
old mode 100755
new mode 100644
index 41626957c0..56e1f20c90
--- a/features/org.eclipse.e4.core.tools.feature/feature.properties
+++ b/features/org.eclipse.e4.core.tools.feature/feature.properties
@@ -15,20 +15,13 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse e4 Tools (Incubation)
+featureName=Eclipse e4 Tools
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Project Updates
-
-# "secondarySiteName" property - label for the update site
-secondaryUpdateSiteName=Ganymede Discovery Site
-
-
 # "description" property - description of the feature
-description=Eclipse e4 Modeltooling
+description=Eclipse e4 Model Tooling
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
@@ -42,108 +35,3 @@ Contributors:\n\
     BestSolution.at - initial API and implementation\n\
     Soytec - initial API and implementation\n
 ################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 66fc4300a4..2e0fd7bedc 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -3,7 +3,9 @@
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
       version="1.0.0.qualifier"
-      provider-name="%providerName">
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100755
index bfdf708ad617e4974cac04cc5c1c8192b09bbeb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21695
zcmeHvcU)7=((p+_uhNSGp%(=Nr3wV321I%h5riZ_XrTltiYTH8C`eTiL3$Grl<I?2
z1#EOsngSvn=^gT&fbF^Wx%a)#`~BYgm&@;LW@l!1XJ_Z^&e;OtJ>e6uPge`61wfz>
zKnMH-2t(wlntoUZ0MOS5!~g)G0LUSX01Sj6;2!|t1W0#b0I-Mb{{cHgM85GrK^`dp
zjDh{&;{}o4g_%M4W+)aQ`Ia{W{A~pvuts93d%tREoIM6^=!C=Lyq$0!aCH;71=byn
z^YsR#4<D9MJS?jyB?mvOpeQ4wcvKF|1pu%Ike{+Wfc_}o?*Z&5yvqpyWDwXlUb0`?
z0pb4H4v5gN?ErQ1O<sru^heobF5k-glk9}Q(&Y?5v)d+Hb$tLrm<8x|QvmuBSOSF5
z2ZR7L6ciMc6f~5SGz`>K)C?^2G&J-q>`Y87Oib(yG`r#3&tBpmV+buZH7y<OK03O6
z%ye{g%*2R}c`pmYe^LOU24J87`~W`~gb#o+Kwu0I!T{K83PJ+}0ZK^<*$v;C3<C{?
zgp`b&f|80FG>1PEApjKiowyHxkU(Hi5-2G-83ief<_Jh+fRXSrN|CA=*)j2XUX~_f
zj!rE)&M&}XTx);is8?{CI=Nts$=uL9%3Fptt@w(NMyx4Xvo0Mk%hql-j9GXRQs3b-
zvZy5-mvQxJd_(8wrOc8SU8Bq94(F~VWR<?`{<0#cZQ<w}dON$Uv1e?R0f0h5X-Rfv
zA}1r2*%g6Tijf4Az>|-ORQhr>Gf{$C<F>gY0`@~*!7=J4EGX}z^MYhV0my}9>e@je
z(%I0OX0mw9@DCCGwFJUHMIiJ7G_c(|82|)Oi{wp>=YxfmePK;|DXQxvrWTTxXk~1?
z^ePNXDHa!l9_K|0#ONA>QCtjCAX6X)DN1OqMP^*#<-32yEbpl-hv8E_ysyVYi|YpH
z_wmj9%H}+7W~e)u2#VPZAEUWkNBy|qTxz9XGMk&Drkm^Fyow%MPMK>-bpS&Xm4?>n
zmzf6^OG&vOu(&oW4*kxUCj|$xJ<n0ew2}x*3=ORcbF}avA8Z}nSz=pwa5X`8+usa<
z?7cuG-6XPvQ7Pv9>aBDvD){)Bu9LyY#4lB;Z>8x;6}^~2QL_ncF9u9P<lR*GuL`w0
zSgHq8o$$oA)^(}!=jUEOSFSs)c<_TEU67z>l}h7jCzp`Rxd_to{*TD39d(hOkDJ*i
zaQgS}TVz;u%v%>46=lT9E%Ob%N{x-L^f9VqzLsoqEnjvduO#q^So|Ync**pr8uF!X
zxE_04j3~UKD9p2<&!ElsQ{ltX{I#zi4U@I5is;!e>-gw`3S_M&wAY@v-p5J8s(U-%
zc2->TfnQmrUXa$N(#enI2HWcfxoFNQ7sm;X&FBD2mwBX9lz+!(7W#)Kwwa$W{7=x~
z4WTm*3df)DozLSgI^m{&_G$NNv1cDelNL-Vkt8`;qC%=UqVSk=A??N-R~=~w$K)Dx
zAKttcbRsA(NW`dN=dpj*X*px0Am%2aqxK{dpLF&!%ge*&saCMuwq)gF2WKff)+Y!+
zpxQ<=@*=-0Y@8i|*czp$>zyxjiO33kG#6Y_oWsHXHD|}8b$vxI-I+gvBcfg)ELJb4
zqN`kul*&ZBKrag^ZJya75C@M3vY`6TJ_kO>Gv2%;_|^9k?5mmE1=7?|qr7WZmhR8`
zHe?MQI3>AiBp#a)qubs{=xksuN$>sO8>UnBbwm5}gCz0emy8dS7IrMu_lo+j(x+X}
z4sLRdg|PD&s4cYwk#KmviuD=1J@xdnsq)CgWddMY5en^LeRiA;6OlwgQ$Dpx0M-Rf
za+eer)Shv|-aXSM-^gJIxVkPiACSJHRH@TrKcN0v9E;@^gXA3%v&#ZRuVsg1N}CwR
z*~~#5-$Nx32BpJ1euoNI{X7XkQ%*_rgDiRZFPqAaQEi7Oz8vomt+#r4?WwxfC6ZTz
z@)T5?=FQ*>6VOBGsy*3?ymX7?4n;<|2CYpHY0gv9&!%wa#Wf-9*8!>%&7(TZR6_zo
zjhCCv4>lF2mqcDt;EK1pq1WQBB1-<?l~7;hOB=rK;3tnJ;^p5u;##&RUoMqB@acz^
zH*wXgF6BE;l&WCq;t(nWN}T))`7b6(o1gd7Ylemvixo-bO22$v?cW<OZ7g9ZsH8!A
z^^l-O7E<7gbVdwP5JBjEN$2L)VUbcx5pyEhVqZ+BRS<dENjAC|o%4Nk-Ph>D4ExJX
zZ`tM#xEoY>gb5VbOnKQ`(8TD<t}@>Bq~v>ARjGF!DWFV@!O}huW@xN`PLf9?4g>PX
zk@_TpyJPgeZzJ`OA0iDl^NqGQWf7-(;<O9d%_p==qx+EoKwJX$N~GPz5vM@ET~3Z4
zY3|)p7kAT?yD=C+_Ht3}rol;_$RoTb4;4t<3((!1%ex63K+?ehq_~1HI3<Gt@(q)E
zH}MBXdKYg6#@~5lb}`~VF}r21foTBn09}~B46tz``7cR?{~sE$Zla370R5&>qVogn
zx(<69q1a6mH34b?s=D`l(=j)Q{gs!Kn1mt0Xs@-zB&h#y4;5erxC3|q3qGy@20#Pi
zfD}mku3aMU_wXz3d;agV-QQmsz7xI)Nld!?xVnNr#Kw@><9yuF-Ujy0C@}RcpD_wg
zta`WYrl7axigR}a)4SmW#sU9p`Zylv_AN~m1u%AW`c5aN$-G^$D2%tc>j`f#1^H7w
zq`Nc_%?Li^y9uPmFJ+TEdf|LL{)8gKd0`!~?ihC;H!u&4rU|ihgIye$rnU3I<FqmE
z7%w|K1`Q$rQ-2T4H)g6mW+H}2LAp7@!Jq%@_QQO<Tun7CO~I<ZDVM1HKV$U09Wj5x
zklDH7P3;{2grh@Yz<d}#JkndoRR4rM4(CcNkm5V~Pt24~IIjRTSFGcAP0{Z)UgtX+
z%t?;MIN15P;z5w|9L5X(7wqQW(SK&Aws%y=x#GNjQ7*$?`Ny??5Wp<JNt`=T*OYji
zhk*~?8}r>Th%_o!(2)KKOJk42g9i0acxteVo&J%1_x%(h76#CO4+Jr{3-7&|#LtpF
z6W$${NQfK&StuA0)%NYJfj9v`P7R260oXye{kNn4+tL5B^4rn>?dbn@^nW}0|Cf&b
z-W<gX&O`uU0zMGpq(l#>fo>lTum{~gIA91kfiNC?ymukc{RJJRf6oC2)c1<pD}T?=
zBnKDzc55IEv28fv@g9njlJ4FTcElw)2^7vv($CIAQcB{mB%p-w^RPp?VDNBz4CrMk
z3x9o9Eeyw^m4z*2^bhNMsAHV4Issl7lYo<^r~ns~0$LcMLZ#%V=;!9)hQZsx{oGvL
zy%qhGg?9^A1YsgtQW(C=f_G6Cw$wL-<3ZoW1&fD+-#6mY@`vCKUUqI6U!0c<TuMS#
z7%b2W?VxC^q4ljeFr_T~O>SRbUkTqM5;!kMNht*d1<AwGlG4)RAcwfOzdPQ}Pu$&`
zAFORx46NmkY=3Gl)^fMCU`15$-KsP&-Y74u2Of)ahZC!|1ASt=vapX27Of~RC6AGp
zwL2<~b~qv@E+vIl5Vx0BkP%1Qq3op4hh^na4k%$N__r!C;PUEUS4yOOuNDqhA|@4g
zeI*l6;}{hwCCPt8fraj|8Djk~u9g~DH;lVCD58p#^x<#Z|48|BmQ(*S%P$mA1(L)z
z|DuEc1HE|s(uIHO3y=V6<%lHM8UGzYzOO+4buW2*C;!q_KX8gVSZ_Se%U?xF@}F`4
z9r5v4hks#TM9MEh6O)SIcM%4BDTsDWG_Zfd5zS>6X=#k{#<}|JGRjFye&_ua{e$<^
zU-SNo{=xf`)yy4>SCRfE!#|+^JE{W*xxeo7@1q~l1mQ|xN>SYl1AaehfR74sb3**E
zthkh%>G#bEapHCb_y+z1=l9I|I5gJ5|3At63+Io_;An}q!`uBw*?;BzUcj#C;FlRV
z!m8}<Nc`oV%P+!z<NdGofxiB~?*%uv-LYV|BlPtZHE<{&aNNTqHB|Pd6f_P6j><pZ
zKN&PyLE*?@%)c9-cbog?!u~t$MWcQ+)&pDz*qye}C`pVfhS(-=@O_o~)><@5(E;b>
zW`|e7y4g8mB%M7lj!Ke0v41V^-p~!sl;E5x`C}F)+VTH=_+820((!L~{Z`lC(!k$h
z{%u{q)%CYD@VA(MTi0)O{VfgrE#}|W^;=zkO9Ow4`L}ibR@dLsz~5s2ZC$_B^|v(e
zx0wI8)<yMm9UtQkF5dfstMr6n8cU?Qx~-wHffn+F=I(|Ajm`<II}QpS3~_VEdl_pV
zhg+Vqf|I`k4~9^JXH>u=Aa*Ek4}B9Y;^_qdsi_Y42APQP&#=<HcdnsBT*nX&|B3&P
zAO@6&7kK^vVhC~{L4&LCARGe1uD*B=BA&RP&us5PgrUU4D9m1<fFR6HgdO+bL%TeC
zuqqKoySal$KcGaJJ<x7wBHRGN*U$M7kA%QZfbg|*Sd1?ScY?5htB)HNgx5fr*$ra{
z9#h#pD<FW!pup1sB!@vfjhCshItVL)=PhU)e}V0Pf$`wk43HO4$9eego>qX1phV%|
zE`>Z?2jlCC!Q;gZ!OayrFEm^o=jLJO?hgQaZ6@Xd7>T-tgG!c_QjnDumzE%&!1*5j
zE%7_k|L{xf+dY;=quoA(u)g_;`<eMC4wnX=WCG7~!EXJ;+1~|#va0~V-un|L@BrMq
z3ITx9mS5V#O0<_>c5Sd2lmt<sKf?dW@PqST1HaTKL9FkG?%*1Ghg;x8rJ}&YDn4Ft
zZ{ki1T>Kx6_<x=87qNbk<B&1N0po>n2dgp%tqkk#2zIwS8oRr@gmwQ{J^a7S_KOTe
zaL=wmfGJ}KV78S2_O&nru$eai2@^E{vrYynkRSbag3=t^WCQ>Up0Pc<2Vs!D8~-VS
zMuADFH+J{H6rgTw3P<^Po!es}A^wm8RN&?%Gr$3G1N?vpcydh|kOPhZs(>b-3m5>V
zz$w56K!MwsZh#ly3tRv$1J{5E;1&=MBmyZw29OIp0*Zk$;18e{cnQ1)FA#JAeZVJR
z6qo|$fE8d9JgQC(p@lF(I3PR_LC8UfG(;Yv0?~w=fEYtgLC!)PA?^?#$OXt1NCYGX
zk_btK<U)!d6_8p;Go%gj0Wt)cfGj{ZpfD&6lo`qe6@p4a<)La&J*X-44Ac?o2@QaT
zKqH}dplQ&D&{AkE^fj~#`UyG(T?X$KP{UYZyfAT?JWL&C0JDNQz`S4=Vd1a@SQ_jR
ztP<7;>wtZNO~ckn$Viw-;3VQC$4GQY%t%lqo+KAZZjdCB<dBq-G>~+V43W%{?2yuu
z9w0qPsz{0?wIp>U^(DPVnn0RGT0;7Qw2O3<bcKwJjFn87OpZ*4>=c<Z*?F=XWcSGm
z$!f^j$VSMP$;rt%$Pbb$lN*rRk>km)k>4eMNM23ePCiP$MnO%%Lm^F}MPWtZP7zFz
zK#@oBoT8m#jAD~=AEh9rBBcQ(n$n*#iZX+;lCp(zlyZ}bfl8Q4naY&Pnd&mt9jZrE
zFR1#d7OAPJ`KT4Bji|BIm#FVhKc;S?9->~SVWbhGQKzw{@u7*N$)>5H`9QNsOG_(6
zt4eD{i>HmG&84lU9i&~OW1^FwL(-w?g6QtimD07-&C*lS3(~96+t3HlC(u8kZ=s*w
zN4ZaEpZY$#eHZuL+gGu#XWudd6N40k0fQUE4Te01W`=P_az-IWO-3|h2xB^9J>v)y
zjESE~oe9Nsg(-vS1=A=q8M81mlG&L#g1LbC9rGLuBg;`1a~40Adn{EfpIBk6Laazu
zSJo)jV%Bcf4K^+|H8u=e7~3PZcD7aa{p_mj81``XLiR594GuVmCWi}0G)Ec704E8j
z7^e}ZFK0663(o2N%=?e+N9_;aU%bEf0Q7*^0pkPb52PP>b6}Z^n@gL^gX=C=J=Zih
zE4M1QGj|;KbM6TqCLR?YEKeLyHP0lR1+E5nh2McUz~^`m@apjT@TT&<<K5&F<}>39
z<}2hI;HTo3=Xc<b<FDhN6W|fh7q}phFVHJUDJU=KBzRk}QE*jASja*sRH#g7T$o)L
zDI6f2FWfIeD}oU56iE~56eSat7j+T6FWM>w6_XKj61ykXau9k@_8|7){ex|XNDnC-
zazB)Is7IVeTuuC(c)s|M1gpdeiC~E`iCIYjNh`@{$wtYY!!n0m4`&?ilVX(8l?s-s
zlv<D$lSWD3lkPl1dqnF<(2?>Z^G6RJ#T-pO`d)@fMqegWrcP#CR!-JS_L1y_oPgX}
zxg@zBd1iS-`5W?03Zx3h6@nE0P*_)#Rm3Y6D}FsDe$3@q-m!5dVI_=GhSG>KpR%2D
zs`4ilxXM|T2P&Tsya+o)8e&+LUlpyIr8=f2s^+ZrP;K`3;p1M%OOCIqE2;;o*J!{r
zv^Byt-f1#wnrS9#4r=jfIcnu=&1uVMpVzL@A=S~-iPq^sav@R3T;!atoNl0QgC32Z
ziC&`K@CmUKUMDK`q58V|vHJZd1y8!4EHeNMkOr{^1BSweo`%ni$czk)?iqbCmNLFz
z+-SmNVr!CTvSNDNG|IHkOvKE`tj?U?+}b?XeAPn3BF5sArKDw`<?B<Nr?98Wt;ns+
zt+K3^PivlzKRs$KV|~rK`;71zzcbA?oHnjDRkrlDcD7H>lAg6Vn|F50&cH6sZrL7b
zpJYFWQb*lJO`%oMap(z*GA0Hy=Ai5l<1p^1>=^4f;e>EXaGJ)dV-vCS&N|L1&Z{m4
zF4-;wR}0rdHww42ZWZo~?k?^PIBuLDuFd11$2E^no{FCFo^xJ$URmA{?=#-zcxKR<
zdgCMFbJb_)oXWX-=hl49eV_O-___PN@fY(C^B)V)3dlT9avpWQ?gH<H%NK?M)dEv5
zLN3~0tPA1~3JDs$q<typGSy|5%Ws1Z2gd|2U9q@Q8NwBEDP-iT_SO7rbl1GD^@JV^
zO}S2T9ee#<*paZiVLRdI@K+IsBN8IEZlG?wx+!(@&P_t3L*%<C*{I}OWVhUJbw?wj
zb7B}`0%AsD^<zup;Bnz`OYyex%?U>nQf^b-_PPD(&WStacLna=y1SL=l-PCe_`SlU
z14&^?tM}3O+mlt3AEj`mM5Jsyz&?1Ns-0SzCX|+tPL_Ty{Y!><Mq{RYW^NW|Rz%iz
zwtM!c9OImZT)EubyaRbr`Otiy{E3Iw4_gZ~3d$deKT0iREsS^!Job4!S#-9jyI8Nd
z?uq=9M^6QxCY3OigqK1}{Y&S{oXS3xpDJ&w(5<MeJXTrqOyXJgAH09ut755&dQSB`
z<T;@_pnAE+qh`9+v38`+wyv+<vc9vysNvlUy%$X{wO-aYsx?+ODL4Jmtk_)fO8!;Z
zYuVSOZ)Dz-yp?%d@=o?$X^UJ-d8<NeWt&pl^L9jgZHGq3%T8qH>#mbsZQW+w?|ZC!
zKD|f3AOGO`VZQfV?`Gene$xK%fqerBg9irFK8k)U{3QFSYDi<~&9KRE-w0}C>a+Lf
zt<jJ#v|kd&c*b(arN{r6(3)tSJUux&<uSE6eQkzeCTUh=_UTvEuW#lo=SJtf<_QZo
z7C9EPmyRygEgLQmuDGpiu7<C1tmUlBuQzU3Y>aLCZjo=@*%sZd+|k?VC%A#9?tfl>
zQw4p2y~}TVSIhpR82U57euQ6g60dqee-QptfbjG38+cpn=jAtg@bVkz)&gWu@B-J5
zKu$qMN<s;v0<Q&9gJ?1sSpN?qNP>|=DIk;p74<#<3W0&w-(W<Epk$Oj5b$Cg11TdJ
zFF6w*Kq1AfCe6=6X>^>`PT&ZevFBxW`)EP+)S@||qh3@TwQVxOLngAp^D$`}rrw%b
za@r^nGjj{h;=1<X1@sksYzQX(NqxtNsJz3XkC=j@4pJ9%)*PL%&gXpn`~$9D3%wo|
z9v7c*`_A3OjLfX;oZP&pC8cHM6_pJyUN$y0zv}Gj?s@;A_w(qNvGIw?rR9~?we=0K
z`NZpbBrsAE5)v{pQa4a!2JpHbsT3K&$E0RNE^Wu`Npbu#e>976sy*uw$|8Z<Hg&H#
zwxQso;H^D&l*W8ov5*XhsjMbin9BP~tQMXquNlV2TrTA5uE2|;oN*aXiTC#6_b%><
zXj?eQ|G2yN^WvV4rIX+FJ2~Y|@5k2^kf*TzVRv&Ynm<geiz(__IR}I%=2gDxo!t2I
z{kmMc=Et8m#}R6gRbL0rKYB#o^RaT(nkF34I1n7$RVOu7C`JIHs-2W^_3jnqCQB+y
zrcn}k;8U^LV>UIo-BY<*?K4ZvTX=re=ARLS*4!L{xi_(-G=`DvXHEr))i2O*Ha@?y
zZa6nCdxQD2SwKKyB+U)UQ<1FEq+=N)Rzc=!+nEI5`l=NRoXJcjP}If#^{{sQggjrO
zmYCUPvIYhhZ+GnyUe#<Ho#$s1Yp*35d4vppj9S^*vZRZ9h>*xAg<{xRKh9iVok8WZ
zd)8-F-nj6%e}aEIwCdARhi0dYSGL~ybm0`FKxC5Q+vSy>6FwjReG}SpZL?K2=vz?_
z<5*;lE=PBoC|Ia3?Yxdyh(x5WY+Pav7NgfPcW-_C!gQXCcI`}|_A@@KSL_W6Bt>}{
zk4X!b@jUT}p_!wRXGh`|#>aaFUI~V-;1A6V=H=y?*_OD>(Y6wR7xYgV2lI9$?zElY
zRu)^}I%Yva`j($wfBi;O;nJt`c5<Y`!&AK$?f1zl=;HcICKua=KZnP5?VK^EmEmaD
zf2A{(cb+HbrgfA<!lK_(So(hb7y{st8qBE`#AFwQV_LU(;OOJ38~8Nx!=a3eW+c~#
z^r>{%cxe(d<6ztScpQe0$(t&VwrZ-_1l?*zJW2O{WzL#A?0zpf$wQTVx&XO#J8h&w
z?u;1_?deuGSB!){F5gKz&e?DgzloHXC~DAcbUa$Hc=pnElED@lujh+<ZD>(bnry7}
zdV+l2V&_Qf8HDp}uOprScoqkQnFumjQ_~yFwCvjo3LE=ix|!r<F)>4e`tqXs?GD{_
zAw6y3+A<MD2P*-f;6kR)Zas9{`Rs9LBaS?!C^0Lnrs|Q>j18sH+Asm=JdfObrNM8l
z8Wpd-zG1NRs%8S!8h>eqEB8J=+qtZvyMpTJ2i04LZf^7CTLhR_Z1dhfQ&_ioie>qa
z42c5q@t~IatmHvcmQ0J$)`;bmCs~SL!B@a$b+)RfYO~OX(4MOxk>|(1?fEs8I<^%{
z?lI9w55!=|`lDw?>eEGThiZ-G9TpeI9J&<~LuO#Sqs?Zla*Y6tOy?~Giq*`GcT;lm
zQOHmBZ)j&`449xA<hyeMLa%YKvim&tKg4|1&>%NzV{oKk#OE~L%O(liK4v)vsmZv{
zWBs-6m3YO~6E9IbET+M{V(rrTCaU<!?Kz1jI@PxVVH-S!k6#YFg$@UDZf!{SxfWar
ztw={?5Aon~cWiNHHy5}s**_oS3J>FFIQX)Q6ELN&(Z!d>Q^}J=1gXtx7YzuYxj9-2
zwJlC}h^@)S0aVTeKyKstyWGtuo;Mux5*+-|_Pxnk5@Yuk-oCB6Gv!a0ZEuh}E_Y1n
zMhibHsv#*kEMY3s6x+BltqFSL<p@KAN}2Np8mkBOZ6~)j0B;fg_?rdIh>>Li;5J*Y
z%$(fOZn<C?bVhyqYo7@XtZR5!yRTCeXb+NuP3=@w4~9OSX~3td99ZI?c5iz%<BuJe
zrk5~);&Zd3mpfZ|TV+~xzijN=zh*g(&}>DjboR|kpWavOt8T-Mng&H*Q_Lt0JDg{)
zd+}r0*7p7j?z*9p>iRK_rh;ZH*7iEWQHFG7Vru48<Ks2?2Z2{L!4U2S&!$+u=KW^$
zur~E{trrK3LQSeFx&nwJS~a2LVbt*X)1sU&V$*Ij7@e*5(cgU9&|7;~UQBsO(6BqF
zYn@wJ_-5&5dUWcB-%B?R>VlJe#kWNb0@Z8z)>W&f+ZZVjUu{<2nHs&I*VP)VuVkaC
z;&ji<*`(_A$-Oy*##c5~8ju9pE?33OQs^cg@EO_Pc+Gmb=wsd1AP=@3weTS%Vm2Rs
zGaU(?%*?`bUaZdYHw-rD($2n;b3SxE-92%LUC^a9p~D$p%A}M1($f$T;(yU`-8{MK
zz{Tm=ft+)1&BcQA6wuL>cM?=hufjD-1$O+wzL;hynX%A2m)Utq5h;cDW-OySN&v`B
zsTcNpwwarn|KT3OB)So)fS5XeXC>!@k+WjXreZGlyMmjabKp_=J3$9h=2irZ!hMhw
z55{BNn=P7;*j~;FijqUjT&-HasmjG_Z4x&Ahhq{4{aS?WmH}d(ds==;XDk$nOGOL?
ztzMp~c+Svq>(eroK`H^T45}gkFSoOVl||LUm&q5Z=Ztoik~>a#T>QAWl*X$|e_P$a
zbavw0wmoV}2vJ)sef8F{0Fg<{@yH@~*X#NTwwc{;f^?p-?r)skY@>O*BgzZ(%q2sf
zw+yd4zAm&mwKjK``C{>n3ypU`6WLVW&*Md|_I!7`B6Q|z8NO0uBLJ|ksX*%zhskmJ
zQ}bpe^1W9RV$!Uz%n|GZar^f#KvuGCGSkuE#VOxI8vEXlPb|>|@m8*i3(1Mnu*CVT
zofbZ0JTW!baTLoeSS2UJBApg}KCaWhXyw}QplrUN_UqJa$rqc0^Y-XGc=!7S64asq
zeQ}jlJiV7}YrW}bn{1uT>lBZ=|Cl{~{E$w0w;KPpj!ONpYyDTbJ_PKam5OljcW3tx
zIuf;fp_1}QkbraX(S^GQ2NKU{3>y2p^xrGmxH7H4`aXQ)=`vT$sR*XnHr45itqMHl
z;wCwzX@Nmsd1k8a_ti0IlAm7lThj6!9A|nu)}&B978|r$=n_YNGFEp@IIXC{%Wf;<
zv0#Lk!pH<_n-bItZnkh9kf#fOBv6|>&eYs8dbgsSgaDNCe3e`IRG<>bQhGWos-9_`
z=c{n9f21mx$aV9QNs@wko)uQaP;=QPZZ!oP#ht<(sIl|m%O`63>}5p97O;|N(pQg|
zBmf9qK8}(0bk0iq(*!`10Qf&+2s%6S;f3wu_&Yc@`Q}I4FZX0hCpaB@%v4XRWQILc
zxNKO<Z=G;x>0RQToot%Grmf71`z?+kO<m<7Yi^VH%NZ#pI=PE7<Kh*n@Jf&LqGE&!
z;$4;ac37nvc+oi*7f3!X)y-y1m$@=5BfqqSQ$HD{-LQ4~W_6_;S&G?7t9$eZZZC_C
zjJKDX*^VC=-Ip?z5oF*_b-1z6#Gp*p>Y*=nT?O_y{Yrk$&H!o!pSjLkoz=HLi2S(l
ze5r0_R%(^i$wc{~FtyJfFP}zl>k@#_;;J@P4P8&fCjt;LUVk6G@AT<<D`(W!C9wG#
z+ne@|;U7J4+diI42du^xr*9l5|Iq0<94x<dspTAh=fPM70Ro`Dt=)Ms2odET0^>d-
zyJ-JB5PIy2cVh78=GuyldzMVivIKzse9cf}hVk2m*jBl_ub)oWT8%`5gRb3L`D4(L
z;+`bG%Q2pZq)y@<j4oEN$1N+REEir3YDhUJ0I|s-HE4OrC>vk4IkhdmQ*&P9Wkzy*
zPW#h|=ju(Td;8}!zt(OM0Ijl3)J%+vNyjA*F8eT_;;3b}^_|dd+)DHeOZ@~*Ah{kN
z*CDKlE@TOukQXd~s1@#-dr4hgZ820L<E|4M!xc2|<ja_hO}g`9myRwTm3XD{M|cTn
zO_x^uX9^~cT?1V;TFxf&4XyT|k&$)0W|g>x<VljKzLW*L^5&fY_!Oc0Ar)8sjjXJ2
z&Ko3VjAEA-!d$I)^siQ^Z0tkbh|#!qpRLieEC=!+cYRq|PIds-Q=+z0=FhV|sj9q|
zcf)T$B76*YG=tja;j!T*%l?*A=AEeV^v0LZ3J)@w2yRP@lfegS1+JknN;?#*cxRJp
z!%45t3^dR7vrlAC?hlP_PiYC&WLgicG9Nq>3h#cpsD2BW<U7J=sx}I3*jOsI-H13Z
z-k-8OR7fklrA)T{?xD0>*BS+GE}Q_w=Dj*IB7Su=XnEZwsK~akcrl|puF%M!vt!<e
zD&6Og%hewD=3QcIc5VYvtJQdAqetZ(QONK&4P7JyQHZF*&Bl$!#jmDZf{u>Ljaj0C
z5*IU4mcQ=w?*y(TdQLtqG<uCC0Jf7z(3K(pJlKpt%Y}&(*c0o^jM|^dK6yxP2X*mG
z;Z_h|RXU^=CfcS(JHf>zxr%KI;fRYAN*_}umWBIVJ4x2@3ldt2-i@^d%PHBdJmch(
z;LzRV%TdQ`=-n2gXRK%<LRH;*dfNs37X$mA*X)mPY;b8WJ|29bl2P&E*}l5xh?doJ
zMNQS))<r;2)uzHqoxb(k0K{lB0hpXtW|(c<I-}x_s2Sjh@*YzIC)ghFl_ZnrB2&%H
zHaV-;w-uOiYpIescd}uJ^Gmub_t(BdLzv9wwlTXKJGuN##u6%-ofkF4Z-mHgJ>{7`
zP!bSod)Q^C@I&X=%>AYf@s~}>qqlTa0<Ohw9+jNoBCmcE<j`_|GKp?D^GegEuat%U
zF}{I@Q;L4h{E|3}o9KpklDPuG=LN6aJ~)YwEs$JUk6KYQnGL*RJ(F<TsbsGI%F1E#
zt%F+|Y5I;^LGO9ia#UXXz-pEu<I7y<PZ5CVl(o#NwZ{hxY$z^NenRfFf$y3d0oX6Q
zsxERse%X^_v1W?ny!R4M&*DzaMdjjli|lyO<n(9r+iX)V5h?SCR{E)>m3lcIn<Ut1
zWZEAg-rMOL%pO4n1fYh#aWkl(suVjFwH%bcj-M<*boh+hOUoNAqncrtXIL6)nPWT@
z%{cM-8JDy!S<+9E5`aGMoyBRE@<G$0LM@6)?UskjjMvj0gfCGFZ!bT8Ui0kgTO`Y5
zv0Qur;|3?$!`JRfMb+U6iJ=_(FLLYVV)Al~mf6Cv_SIVl&hu=lJENZst}-4oV>}$F
z$M|;hXyFXkKKH^t#`PG3>7gB_w!5o}c)cF*+b+c10iq@_cZiYz1gy524@F*y&OZXA
zWoIS}yEq)Idj)5XBLKZQ5Bb<@cJkPR{Wi{@c!glP_%4L?9OGe{;VY?Q*>Wd8PHumV
zXzFt0OqFJ<bFgCA(I!)=)G09#t(I!-s%L(qDtrRGxi#As96Hoqt)fg{VLu^z|0Rb^
zyD;Yg0-zC{($u<h#uDK;9e%Ru{jqzFooh>9=3}(Ak6dadJI+{Q*&FPya`a)COz(^I
zLy|3Jv%GAw3&;JUx3((ptR7<?kbRvmH2gZM>^h<>>UDwbF(&Ni6`|=jZqu0pov}vd
zo%O@_54AltQSz$$IOCz4Y0xt<4fhchsf(ngm}1Ax2ozT)4x)MEueZE@ogtUF3bWV*
z$Tz#9s##wkC)n5NitegZYwncExnE4WSO~h7lC~+QQ#Tds+HF1sT;E98fZ}#){dw*M
z70hN<`32=~+m24wy3|K)RCn#1eEejwF}HA;<WluWQ&r6d&r1E`Y{-ZbqHCvcE;)&M
zBDN<j?EXX2_uD}acsjQ2W&{?mTE#}j2?Uj83bL@@fNJ(#30jMtK3HzsomM`9_v{dG
z%r-&u*sgw@uRfc<+3u3GG$I?lIKfomEs8V{&L7XJ2|QKtn00JwdjEOvdB-SZb8faa
zPtLiAeFi9$=v10h@dx7%Z=SkSHM7{Lp`=W7vg2aHugRx+E_L4sQd#i5C2RhE-Rm7?
zhyLfT1hp?5HEAh{56lpU188lVhu<`Cw_RSx3vKRSx>87Jd&sHZ75TD5<4)31@16;6
z-O1X|kQq0fn{`ov)PA=ttnWX+l9gWZw8SvyL3N?g<PnaC^@Go!t8pl)Gcju(2v9X<
z9c)+1xw6!wtXQ_7qm|61Y(MeoMs6!dbr&MH8qu?5Q2Zg&S0G{h%e&(ZrX%?*<8<9u
z#G}$baBP&EctOK=h)d%uD(1muRb9Sm|AI6%G|wqs8wtaKGdJI5&h@W~)Gl+UI8CBQ
z?~m(|oV!iG(Ik?wBe=AweLH78GNSRFZN$y$q7voUC*y@lsh3`-q-WmXaM1O8SaE&i
zMrcf%h*c)rQcgm@&S3j&f(m@2oHcu%{&wLy0T|v89lL0`vG#5P9Un*ci9CCFJB4j#
zc{1GVXuRL6=Az|!JzBG4#Ym=nC{+xM)~cQ#;^Ee`qDs$nd8hDoj?pmQE0V%)0WmsB
z>C#Us9PMUJcgP>6!@upbYFy)q1BZ;U9&k`zzWb1J<eu2PJFanQ<D&RXX}l)3BUl=1
zliAUxl)$N5xY3_dO8~3}Uq6zJIqY1M94BCNC40kJ<^~;ve+wbJK>$pqWzLt!S|#BN
zP}D0+BX#tvAHRmJFjhTZdsbPYsNIq=ixOuMIC-k>{r-EAq*1V~z^jrHQ`SrO@5DAL
zBk(CUX6IOk^hXo3?Vgk_+f<5-7M<8}kFVFH5|xYPxtY*@vawAd)qa^?L=9J#lq<Ad
zp0ymrvzc2Kkb@X6E`;nv(^<|5MMUR?xufS=^OA=Zl^M5#J_beoaXaGmgU`<c?N$f?
zas&KAw|h|lt|=Y3(uzLNlTGDYWU^DUII}<U##v|Xc)$8X#oEjw?RxyAH<_)U?5Bq8
zEY9#Ae|aU9C4v=Br%X9#MgY!*co^#n_IqQ!jrOOkax&-hMry(v1<=+E_7v4UeTn9R
zogaZ6$5fyE)@&cqlaU6Nt4U_2api%FhG|6%yip$4>*|f{GH5cK#F<l~q;JwFc$6M;
z!&N*gV4~$KSFugW?%NCuh?6atKx>8%J)3B3+I}87wt1mNbL4YNZB_M$In%E;kDRFv
zyqSM(y_V<CYwfO?bo8bycb2qh+9LObLmEOm*Yrq5%V-N6AC{si4ThFC72#hb44(GO
zoSDfuG$wc<>ceQtN$$9zF6pn_1q07u;zrj8ECZ%7`bsx$t{z>exrsWfRbni2I%<-(
z@v-vEn-%xA76xtZ^sQ}8-_vKh;%>4u2wDa#-3#U6400d<Jv#}ADD>_9`JAguuNu-L
z13Yxh$Xn^>2tfFbepR&fto6x9NzfGD9^q(yp3{KBXAi_+!SpeoawaP|Ge^KEKo7H6
zWSkD{q))Jp-i>M%+eXSgE_*!scGM-YCyScN@JMUeV-<wE{-OyP?xOms(v>vnx7>V2
zf)c)pm-;p4xtNB=1<LZYsgD(|ml)QWae6hDm2Eae4}Nu8*>rPx(1{d&m4q_+qR$=`
zLUoN*%*f~P_@tUzRDG+leUT}CZOe^>p}oz>_+^nvM@L;MDqN%!$V=Z2Q%Vl}%ys`E
z>$$n!-nyc`mk-2p9sp+nMWKp-7?(~Y?R)SOX9dgNsIkCZwCS5wN$A-7a_H=3cgVdD
zzsji{9h{dVkRVh8APP$bY){6Yp7b?UGgqe6%Dd-eQlKO#CdYE(oOivDqAX9(Jv~%Q
zX%}!te=aCA)m5D92FmDR%4DPd+D6)=_GW%PrGiJNtOxFgRezp?tOTFK()sz*CG^=O
zoNZVt&1iZpma#8(^nMI8EY??6DJb}3ujOzToII2}Waah}Oqse|oB$;E$`qmI6tKBY
zIjIa?#sk9Xc{#UuL<6whIzHQ4nUKa$QO-iimLjbs+|QHMQ^`8Yl}MACoCa-dpX8n{
zQ@A?KDVs51>56fR=Fmgxv7AtS%;xkdw|o8>Lo<?X3z1!h2&h-ONH<!lsT71*Fy-WV
z92x1D_->u5U+W=#4*8Zc)BV2r+pg#@G3o9GtQ<)R3{<Z&vyD{+HB5}r*UxBNVu`&(
zzXqj#cjoi!-r~NGR@Gag(YIH0EO+V<&8-eox6d^@w<@SF$Zub(9vT-;8Gb&-_;`P|
zdn37Q(5m3k>U%Jr_Z@{j+lB9~7H`SkRg=B9{60v#>;?glDd#CO7;O{iFHOs^4G+pJ
zT-UbAUduPgJ&kzoEEv)8IkVp0KJ&aK8$*wUS+{tzEJ?>jNnDM<l|I91+S%zB7wQD*
zKfgJ>bF9tVwN3l3d-J+T_9FPnbtRR@ZCUON_|I?h>(8d<yw-f>ut>jUA{Gg7>-y(G
zt_5qsQc5HD`H#eUK5BV&jQibd@q$|}(L2|-XI0K7i4p)^wv2Xa7Y_}+6qDGU!s7cP
zQ)0M_ff3P){FTWiEy#(_;F8Cna=zwxI95z&60-7`itd(F?$qFFcO|$eF==%w?~4vx
zD@GemYUJIrF}OjaPZ~hWcjU1di*V-WC&tsS447>cZ@w_$S(6@V3!TK}FfJ}_L<N}j
z^nWB@3sBaKaE&-^*dM*As4lJ%qr0dNn%P4eq;<@@hW`GP`IXL^qILY0$z%(Ov25pn
zD%mfCZN+#y(zl|?A>vOAMccEFAf!fyaR8z(FV5*Y^^V2VY)+zcU;x7@>vJ6JE0N`D
zckJKtR}ETVxe7P#Hp?NpdmgXEXmmHM<Ly{SPm*&fHYPsi&JQXgetdqAO1@!&Ke|@g
z^x-+;o$WUGg%X|;z_3+WF<>z7L*`m5x6A{M;$O8FXX{jA^eSRhB<@UlVG6+&g20xt
z1eI{dYN3h=gvqJ%i!;ZwHJ%J~S4>3uzqXET9O;cWI2kUK_&iYV7^_MbUq{+%z{n$&
z{)unPJ6#3xQ=Xf)+)-Nd-40XsG*R_}%<i=Jt9uE+0|J2h`XH4uA9?ivd7)0)+(SOb
z@`8FA`jfX}kcZllN867+(S7kb{_ThN3rOLC=E4tcCyM`g*RGJyUA~#iGI=SwKKC%2
zKcfuEZHys8>6UWw{Cu`SBX15YO0R#^ctom`-RX`$G(7J$w-uJO&FZ5O=jrXJQmRC}
zzf4Uq`va2!-Q-xK9)@+5Ua6(tGtpz6nN1Aah2ZQ;KA<EKN8K^i!yhfXZTl55UmY+P
zWxmld)lFU~ys5ptx-mG-H<A5^a7&JtSuE&G;AUP#jkY5t!WJh<Vq@2<H+w*(MJs(?
ZUuG{-=@f&sn|lR}%x;_f*qtGK_<tfu;g<ja

diff --git a/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100755
index ed4b196655..0000000000
--- a/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/feature.properties
deleted file mode 100755
index 7b266ca81c..0000000000
--- a/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the 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:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Eclipse e4 Tools Source (Incubation)
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Project Updates
-
-# "description" property - description of the feature
-description=Source code zips for Eclipse E4 initiative.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/license.html b/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/license.html
deleted file mode 100755
index c6af966b61..0000000000
--- a/features/org.eclipse.e4.core.tools.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.e4.core.tools.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.e4.core.tools.feature/sourceTemplatePlugin/build.properties
deleted file mode 100755
index cdb3ab38f3..0000000000
--- a/features/org.eclipse.e4.core.tools.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the 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:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml, src/**, META-INF/
-sourcePlugin = true

From de0eab3bd3795396aa0b70443f4803ff11a27a8a Mon Sep 17 00:00:00 2001
From: Andrey Loskutov <loskutov@gmx.de>
Date: Sun, 5 Apr 2015 00:26:51 +0200
Subject: [PATCH 0878/1286] Bug 418661 - [Metadata] Get rid of compile warnings
 in platform projects in official build - part 1

Cleaned up and updated to Java 7 org.eclipse.e4.tools.compat

Change-Id: I5a5e58bab68558df29eaf325977e75ec3dbb074c
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
---
 bundles/org.eclipse.e4.tools.compat/.classpath       |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs             | 10 ++++++----
 .../org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF |  2 +-
 bundles/org.eclipse.e4.tools.compat/build.properties |  1 +
 .../tools/compat/internal/ContextServiceFactory.java |  8 ++++----
 .../eclipse/e4/tools/compat/internal/PartHelper.java |  4 ++--
 .../eclipse/e4/tools/compat/parts/DIEditorPart.java  | 12 ++++--------
 .../org/eclipse/e4/tools/compat/parts/DIHandler.java | 10 ++++------
 .../eclipse/e4/tools/compat/parts/DIViewPart.java    |  7 +++----
 9 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/.classpath b/bundles/org.eclipse.e4.tools.compat/.classpath
index ad32c83a78..098194ca4b 100644
--- a/bundles/org.eclipse.e4.tools.compat/.classpath
+++ b/bundles/org.eclipse.e4.tools.compat/.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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
index c94829777b..b2d28cdb60 100644
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
@@ -25,9 +25,10 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -106,7 +107,7 @@ org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
@@ -118,6 +119,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
@@ -130,7 +132,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index c44e84123a..051a06ca23 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",
diff --git a/bundles/org.eclipse.e4.tools.compat/build.properties b/bundles/org.eclipse.e4.tools.compat/build.properties
index aac269a41e..6c23df3341 100644
--- a/bundles/org.eclipse.e4.tools.compat/build.properties
+++ b/bundles/org.eclipse.e4.tools.compat/build.properties
@@ -5,3 +5,4 @@ bin.includes = META-INF/,\
                about.html,\
                OSGI-INF/
 source.. = src/
+jre.compilation.profile = JavaSE-1.7
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index bb54e56371..a721ada319 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2015 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -45,17 +45,17 @@
 public class ContextServiceFactory extends AbstractServiceFactory {
 
 	@Override
-	public Object create(@SuppressWarnings("rawtypes") Class serviceInterface, IServiceLocator parentLocator,
+	public Object create(Class serviceInterface, IServiceLocator parentLocator,
 		IServiceLocator locator) {
 		if (!IEclipseContext.class.equals(serviceInterface)) {
 			return null;
 		}
 
-		final IWorkbenchLocationService wls = (IWorkbenchLocationService) locator
-			.getService(IWorkbenchLocationService.class);
+		final IWorkbenchLocationService wls = locator.getService(IWorkbenchLocationService.class);
 		final IWorkbenchWindow window = wls.getWorkbenchWindow();
 		final IWorkbenchPartSite site = wls.getPartSite();
 
+		@SuppressWarnings("unchecked")
 		final Object o = parentLocator.getService(serviceInterface);
 
 		// This happens when we run in plain 3.x
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
index 996cbad804..785056a9a8 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2015 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -34,7 +34,7 @@ public class PartHelper {
 
 	public static IEclipseContext createPartContext(WorkbenchPart part) throws PartInitException {
 		final IWorkbenchPartSite site = part.getSite();
-		final IEclipseContext parentContext = (IEclipseContext) site.getService(IEclipseContext.class);
+		final IEclipseContext parentContext = site.getService(IEclipseContext.class);
 
 		// Check if running in 4.x
 		if (parentContext.get(ORG_ECLIPSE_E4_UI_WORKBENCH_I_PRESENTATION_ENGINE) != null) {
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index f247c89e5e..d5a86d0461 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2015 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -43,8 +43,7 @@
  *
  * @param <C>
  */
-public abstract class DIEditorPart<C> extends EditorPart implements
-		IDirtyProviderService {
+public abstract class DIEditorPart<C> extends EditorPart implements IDirtyProviderService {
 	private IEclipseContext context;
 	private C component;
 	private Class<C> clazz;
@@ -83,8 +82,7 @@ public boolean isSaveAsAllowed() {
 	}
 
 	@Override
-	public void init(IEditorSite site, IEditorInput input)
-			throws PartInitException {
+	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
 		setSite(site);
 		setInput(input);
 
@@ -157,10 +155,8 @@ public void setFocus() {
 
 	@Override
 	public void dispose() {
-		PartHelper.disposeContextIfE3((IEclipseContext) getSite().getService(
-				IEclipseContext.class), context);
+		PartHelper.disposeContextIfE3(getSite().getService(IEclipseContext.class), context);
 		super.dispose();
 	}
 
-
 }
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
index ede67b2d53..e1bfa9db33 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 EclipseSource München GmbH and others.
+ * Copyright (c) 2012, 2015 EclipseSource München GmbH and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -21,7 +21,7 @@
 
 /**
  * This is a preliminary implementation of a Handler wrapper. It does not support @CanExecute yet
- * 
+ *
  * @author Jonas
  *
  * @param <C>
@@ -41,14 +41,12 @@ private static IEclipseContext getActiveContext() {
 	}
 
 	private static IEclipseContext getParentContext() {
-		return (IEclipseContext) PlatformUI.getWorkbench().getService(
-			IEclipseContext.class);
+		return PlatformUI.getWorkbench().getService(IEclipseContext.class);
 	}
 
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
-		return ContextInjectionFactory.invoke(component, Execute.class,
-			getActiveContext());
+		return ContextInjectionFactory.invoke(component, Execute.class, getActiveContext());
 	}
 
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
index edabb81027..4519e346b3 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2015 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -56,11 +56,10 @@ public C getComponent() {
 	public void setFocus() {
 		ContextInjectionFactory.invoke(component, Focus.class, context);
 	}
-	
+
 	@Override
 	public void dispose() {
-		PartHelper.disposeContextIfE3((IEclipseContext) getSite().getService(
-				IEclipseContext.class), context);
+		PartHelper.disposeContextIfE3(getSite().getService(IEclipseContext.class), context);
 		super.dispose();
 	}
 }
\ No newline at end of file

From 78e7e19e83c956f006a8eb1dbdaf95bd89e3a94e Mon Sep 17 00:00:00 2001
From: Andrey Loskutov <loskutov@gmx.de>
Date: Sun, 5 Apr 2015 09:05:35 +0200
Subject: [PATCH 0879/1286] Bug 418661 - [Metadata] Get rid of compile warnings
 in platform projects in official build - part 2

Cleaned up and updated to Java 7 org.eclipse.e4.tools.emf.ui

Change-Id: I4a9445cefbbc0aae222345b4e5332ee48cceb511
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
---
 .../org.eclipse.e4.tools.emf.ui/.classpath    |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  7 +++--
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../build.properties                          |  1 +
 .../eclipse/e4/tools/emf/ui/common/Util.java  |  3 +-
 .../ui/internal/common/AbstractPickList.java  | 29 +------------------
 .../component/dialogs/AbstractIdDialog.java   | 21 +++++++-------
 .../dialogs/ContributionDataFile.java         |  4 +--
 .../tabs/ModelResourceContentProvider.java    |  5 ++--
 9 files changed, 25 insertions(+), 49 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.classpath b/bundles/org.eclipse.e4.tools.emf.ui/.classpath
index 64449070b7..738c284c5d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.classpath
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
 			<accessrule kind="accessible" pattern="org/eclipse/e4/**"/>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
index c94829777b..1aa4f10498 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -25,9 +25,10 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -130,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index b0216f1cb5..1782b374c1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.core.databinding.property;bundle-version="1.2.100",
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/build.properties b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
index 11fb1086b7..d6a67431d1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
@@ -11,3 +11,4 @@ bin.includes = .,\
 output.. = bin/
 jars.compile.order = .
 source.. = src/
+jre.compilation.profile = JavaSE-1.7
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index 939337a25e..755a77d8c1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2015 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -153,6 +153,7 @@ public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement
 		int index, EStructuralFeature feature) {
 		if (liveModel) {
 			final EObject container = ((EObject) element).eContainer();
+			@SuppressWarnings("unchecked")
 			final List<Object> l = (List<Object>) container.eGet(feature);
 			l.remove(element);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index a09077704d..e10de6e4ce 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2015 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,10 +11,7 @@
 
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
-import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
 
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -66,7 +63,6 @@ public static enum PickListFeatures {
 	private final Button tiDown;
 	private final Button tiAdd;
 	// private final AutoCompleteField autoCompleteField;
-	private Map<String, Object> proposals;
 
 	public AbstractPickList(Composite parent, int style, List<PickListFeatures> listFeatures, Messages messages,
 		AbstractComponentEditor componentEditor) {
@@ -220,29 +216,6 @@ public void setSelection(ISelection selection) {
 		getPicker().setSelection(selection);
 	}
 
-	private Map<String, Object> toProposals(Object inputElement) {
-
-		final Map<String, Object> props = new TreeMap<String, Object>();
-
-		if (inputElement instanceof Object[]) {
-			for (final Object value : (Object[]) inputElement) {
-				props.put(getTextualValue(value), value);
-			}
-		}
-		if (inputElement instanceof Collection) {
-			for (final Object value : (Collection<Object>) inputElement) {
-				props.put(getTextualValue(value), value);
-			}
-
-		}
-
-		return props;
-	}
-
-	private String getTextualValue(Object value) {
-		return ((ILabelProvider) getPicker().getLabelProvider()).getText(value);
-	}
-
 	public void setContentProvider(IContentProvider contentProvider) {
 		getPicker().setContentProvider(contentProvider);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
index 5299094b24..a8661b359c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013 - 2014 fhv.at and others.
+ * Copyright (c) 2013 - 2015 fhv.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -45,7 +45,7 @@
 import org.eclipse.swt.widgets.Text;
 
 public abstract class AbstractIdDialog<ContributionClass, ElementClass extends MApplicationElement> extends
-SaveDialogBoundsSettingsDialog {
+	SaveDialogBoundsSettingsDialog {
 
 	protected EModelService modelService;
 
@@ -89,19 +89,19 @@ protected IBaseLabelProvider getLabelProvider() {
 
 			@Override
 			public void update(ViewerCell cell) {
+				@SuppressWarnings("unchecked")
 				final ElementClass el = (ElementClass) cell.getElement();
 				final String elementId = el.getElementId() != null && el.getElementId().trim().length() > 0 ? el
 					.getElementId() : "(Id missing)"; //$NON-NLS-1$
-					final StyledString str = new StyledString(elementId);
+				final StyledString str = new StyledString(elementId);
 
-					final String infoString = getListItemInformation(el);
-					if (infoString != null && infoString.trim().length() > 0)
-					{
-						str.append(" - " + getListItemInformation(el), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
-					}
+				final String infoString = getListItemInformation(el);
+				if (infoString != null && infoString.trim().length() > 0) {
+					str.append(" - " + getListItemInformation(el), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+				}
 
-					cell.setText(str.getString());
-					cell.setStyleRanges(str.getStyleRanges());
+				cell.setText(str.getString());
+				cell.setStyleRanges(str.getStyleRanges());
 			}
 		};
 	}
@@ -152,6 +152,7 @@ public void doubleClick(DoubleClickEvent event) {
 	@Override
 	protected void okPressed() {
 		if (!viewer.getSelection().isEmpty()) {
+			@SuppressWarnings("unchecked")
 			final ElementClass el = (ElementClass) ((IStructuredSelection) viewer.getSelection()).getFirstElement();
 			final Command cmd = SetCommand.create(domain, contribution, getFeatureLiteral(), el.getElementId());
 			if (cmd.canExecute()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
index 82461709c9..0602d92db5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2015 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -487,7 +487,7 @@ public void touch(IProgressMonitor monitor) throws CoreException {
 	}
 
 	@Override
-	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
+	public <T> T getAdapter(Class<T> adapter) {
 		// TODO Auto-generated method stub
 		return null;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
index d0ccfa9cf6..2b40d470a2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2015 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,6 +12,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
 
 import java.util.ArrayList;
+
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EAttribute;
@@ -23,7 +24,6 @@
 public class ModelResourceContentProvider implements IStructuredContentProvider {
 
 	private Object[] items = new Object[0];
-	private Viewer viewer;
 
 	public ModelResourceContentProvider() {
 		// adapter = new EContentAdapter() {
@@ -73,7 +73,6 @@ public Object[] getElements(Object object) {
 
 	@Override
 	public void inputChanged(final Viewer viewer, Object oldInput, Object newInput) {
-		this.viewer = viewer;
 		ArrayList<EObject> list = new ArrayList<EObject>();
 		IModelResource modelProvider = (IModelResource) newInput;
 		if (newInput != oldInput && newInput != null) {

From 1e2c746d58e7df95fcaf0c68fea6d50a2fb866fe Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 7 Apr 2015 10:43:40 +0200
Subject: [PATCH 0880/1286] Bug 457107 - The code formatter and cleanup profile
 for e4 tools project are 'esm*' and are not managed

Changing the code formatter and cleanup profile to "Eclipse".

Change-Id: Ia3ba94ef34724bf771c80044ce82eb6ff9126c5f
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../.settings/org.eclipse.jdt.core.prefs      | 23 ++++++-----
 .../.settings/org.eclipse.jdt.ui.prefs        | 32 +++++++++-------
 .../.settings/org.eclipse.jdt.core.prefs      | 23 ++++++-----
 .../.settings/org.eclipse.jdt.ui.prefs        | 32 +++++++++-------
 .../.settings/org.eclipse.jdt.core.prefs      | 23 ++++++-----
 .../.settings/org.eclipse.jdt.ui.prefs        | 32 +++++++++-------
 .../.settings/org.eclipse.jdt.core.prefs      | 23 ++++++-----
 .../.settings/org.eclipse.jdt.ui.prefs        | 32 +++++++++-------
 .../.settings/org.eclipse.jdt.core.prefs      | 23 ++++++-----
 .../.settings/org.eclipse.jdt.ui.prefs        | 32 +++++++++-------
 .../.settings/org.eclipse.jdt.core.prefs      | 23 ++++++-----
 .../.settings/org.eclipse.jdt.ui.prefs        | 38 ++++++++++++-------
 12 files changed, 204 insertions(+), 132 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
index b2d28cdb60..06688e97f4 100644
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
@@ -180,13 +180,14 @@ org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
@@ -194,14 +195,14 @@ org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
 org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
 org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
 org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
 org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
@@ -225,6 +226,7 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
@@ -272,6 +274,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -349,6 +352,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -397,8 +401,8 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
 org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
@@ -411,10 +415,11 @@ org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
 org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
index 791508d164..9992f8e9e3 100644
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
@@ -11,29 +11,32 @@ cleanup.always_use_blocks=true
 cleanup.always_use_parentheses_in_expressions=false
 cleanup.always_use_this_for_non_static_field_access=false
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
 cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
 cleanup.make_local_variable_final=true
 cleanup.make_parameters_final=false
 cleanup.make_private_fields_final=true
 cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
+cleanup.make_variable_declarations_final=false
 cleanup.never_use_blocks=false
 cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
+cleanup.organize_imports=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
 cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=false
 cleanup.remove_trailing_whitespaces_all=true
 cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=false
-cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
 cleanup.remove_unused_imports=true
 cleanup.remove_unused_local_variables=false
 cleanup.remove_unused_private_fields=true
@@ -42,18 +45,21 @@ cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
 cleanup.sort_members=false
 cleanup.sort_members_all=false
-cleanup.use_blocks=true
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=false
 cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
 cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access=false
 cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_esmCleanUp
+cleanup.use_type_arguments=false
+cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
 cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
+formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
 formatter_settings_version=12
 org.eclipse.jdt.ui.exception.name=ex
 org.eclipse.jdt.ui.gettersetter.use.is=true
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
index c94829777b..afdb83e715 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
@@ -178,13 +178,14 @@ org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
@@ -192,14 +193,14 @@ org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
 org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
 org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
 org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
 org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
@@ -223,6 +224,7 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
@@ -270,6 +272,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -347,6 +350,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -395,8 +399,8 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
 org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
@@ -409,10 +413,11 @@ org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
 org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
index 791508d164..9992f8e9e3 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
@@ -11,29 +11,32 @@ cleanup.always_use_blocks=true
 cleanup.always_use_parentheses_in_expressions=false
 cleanup.always_use_this_for_non_static_field_access=false
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
 cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
 cleanup.make_local_variable_final=true
 cleanup.make_parameters_final=false
 cleanup.make_private_fields_final=true
 cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
+cleanup.make_variable_declarations_final=false
 cleanup.never_use_blocks=false
 cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
+cleanup.organize_imports=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
 cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=false
 cleanup.remove_trailing_whitespaces_all=true
 cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=false
-cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
 cleanup.remove_unused_imports=true
 cleanup.remove_unused_local_variables=false
 cleanup.remove_unused_private_fields=true
@@ -42,18 +45,21 @@ cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
 cleanup.sort_members=false
 cleanup.sort_members_all=false
-cleanup.use_blocks=true
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=false
 cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
 cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access=false
 cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_esmCleanUp
+cleanup.use_type_arguments=false
+cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
 cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
+formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
 formatter_settings_version=12
 org.eclipse.jdt.ui.exception.name=ex
 org.eclipse.jdt.ui.gettersetter.use.is=true
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
index 1aa4f10498..ccb396a6bf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -179,13 +179,14 @@ org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
@@ -193,14 +194,14 @@ org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
 org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
 org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
 org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
 org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
@@ -224,6 +225,7 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
@@ -271,6 +273,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -348,6 +351,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -396,8 +400,8 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
 org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
@@ -410,10 +414,11 @@ org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
 org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
index 791508d164..9992f8e9e3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -11,29 +11,32 @@ cleanup.always_use_blocks=true
 cleanup.always_use_parentheses_in_expressions=false
 cleanup.always_use_this_for_non_static_field_access=false
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
 cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
 cleanup.make_local_variable_final=true
 cleanup.make_parameters_final=false
 cleanup.make_private_fields_final=true
 cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
+cleanup.make_variable_declarations_final=false
 cleanup.never_use_blocks=false
 cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
+cleanup.organize_imports=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
 cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=false
 cleanup.remove_trailing_whitespaces_all=true
 cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=false
-cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
 cleanup.remove_unused_imports=true
 cleanup.remove_unused_local_variables=false
 cleanup.remove_unused_private_fields=true
@@ -42,18 +45,21 @@ cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
 cleanup.sort_members=false
 cleanup.sort_members_all=false
-cleanup.use_blocks=true
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=false
 cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
 cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access=false
 cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_esmCleanUp
+cleanup.use_type_arguments=false
+cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
 cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
+formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
 formatter_settings_version=12
 org.eclipse.jdt.ui.exception.name=ex
 org.eclipse.jdt.ui.gettersetter.use.is=true
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
index c94829777b..afdb83e715 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
@@ -178,13 +178,14 @@ org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
@@ -192,14 +193,14 @@ org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
 org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
 org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
 org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
 org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
@@ -223,6 +224,7 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
@@ -270,6 +272,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -347,6 +350,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -395,8 +399,8 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
 org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
@@ -409,10 +413,11 @@ org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
 org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
index 791508d164..9992f8e9e3 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
@@ -11,29 +11,32 @@ cleanup.always_use_blocks=true
 cleanup.always_use_parentheses_in_expressions=false
 cleanup.always_use_this_for_non_static_field_access=false
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
 cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
 cleanup.make_local_variable_final=true
 cleanup.make_parameters_final=false
 cleanup.make_private_fields_final=true
 cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
+cleanup.make_variable_declarations_final=false
 cleanup.never_use_blocks=false
 cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
+cleanup.organize_imports=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
 cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=false
 cleanup.remove_trailing_whitespaces_all=true
 cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=false
-cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
 cleanup.remove_unused_imports=true
 cleanup.remove_unused_local_variables=false
 cleanup.remove_unused_private_fields=true
@@ -42,18 +45,21 @@ cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
 cleanup.sort_members=false
 cleanup.sort_members_all=false
-cleanup.use_blocks=true
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=false
 cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
 cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access=false
 cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_esmCleanUp
+cleanup.use_type_arguments=false
+cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
 cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
+formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
 formatter_settings_version=12
 org.eclipse.jdt.ui.exception.name=ex
 org.eclipse.jdt.ui.gettersetter.use.is=true
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
index c94829777b..afdb83e715 100644
--- a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
@@ -178,13 +178,14 @@ org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
@@ -192,14 +193,14 @@ org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
 org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
 org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
 org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
 org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
@@ -223,6 +224,7 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
@@ -270,6 +272,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -347,6 +350,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -395,8 +399,8 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
 org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
@@ -409,10 +413,11 @@ org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
 org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
index 791508d164..9992f8e9e3 100644
--- a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
@@ -11,29 +11,32 @@ cleanup.always_use_blocks=true
 cleanup.always_use_parentheses_in_expressions=false
 cleanup.always_use_this_for_non_static_field_access=false
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
 cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
 cleanup.make_local_variable_final=true
 cleanup.make_parameters_final=false
 cleanup.make_private_fields_final=true
 cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
+cleanup.make_variable_declarations_final=false
 cleanup.never_use_blocks=false
 cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
+cleanup.organize_imports=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
 cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=false
 cleanup.remove_trailing_whitespaces_all=true
 cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=false
-cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
 cleanup.remove_unused_imports=true
 cleanup.remove_unused_local_variables=false
 cleanup.remove_unused_private_fields=true
@@ -42,18 +45,21 @@ cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
 cleanup.sort_members=false
 cleanup.sort_members_all=false
-cleanup.use_blocks=true
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=false
 cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
 cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access=false
 cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_esmCleanUp
+cleanup.use_type_arguments=false
+cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
 cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
+formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
 formatter_settings_version=12
 org.eclipse.jdt.ui.exception.name=ex
 org.eclipse.jdt.ui.gettersetter.use.is=true
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
index c94829777b..afdb83e715 100644
--- a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
@@ -178,13 +178,14 @@ org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
@@ -192,14 +193,14 @@ org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
 org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
 org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
 org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
 org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
@@ -223,6 +224,7 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
@@ -270,6 +272,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -347,6 +350,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -395,8 +399,8 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
 org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
@@ -409,10 +413,11 @@ org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
 org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
index 791508d164..44689082ee 100644
--- a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
@@ -11,29 +11,32 @@ cleanup.always_use_blocks=true
 cleanup.always_use_parentheses_in_expressions=false
 cleanup.always_use_this_for_non_static_field_access=false
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
 cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
 cleanup.make_local_variable_final=true
 cleanup.make_parameters_final=false
 cleanup.make_private_fields_final=true
 cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
+cleanup.make_variable_declarations_final=false
 cleanup.never_use_blocks=false
 cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
+cleanup.organize_imports=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
 cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=false
 cleanup.remove_trailing_whitespaces_all=true
 cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=false
-cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
 cleanup.remove_unused_imports=true
 cleanup.remove_unused_local_variables=false
 cleanup.remove_unused_private_fields=true
@@ -42,18 +45,21 @@ cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
 cleanup.sort_members=false
 cleanup.sort_members_all=false
-cleanup.use_blocks=true
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=false
 cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
 cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access=false
 cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_esmCleanUp
+cleanup.use_type_arguments=false
+cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
 cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
+formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
 formatter_settings_version=12
 org.eclipse.jdt.ui.exception.name=ex
 org.eclipse.jdt.ui.gettersetter.use.is=true
@@ -74,10 +80,12 @@ sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=false
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.correct_indentation=true
 sp_cleanup.format_source_code=true
 sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@ sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=true
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
 sp_cleanup.use_this_for_non_static_method_access=true
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false

From 6c9c5d32ecf77fb053798a9ccef2f21edf842667 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 7 Apr 2015 11:55:08 +0200
Subject: [PATCH 0881/1286] Bug 463913 - [Tools] e4 core tool poms should
 follow conventions of rest of Eclipse

Change-Id: I3c0b9bcca996a6582829beafe7f13bd650285c9c
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF    | 2 +-
 bundles/org.eclipse.e4.tools.compat/pom.xml                 | 6 +++---
 .../org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF  | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml           | 6 +++---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF    | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml                 | 6 +++---
 .../org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml          | 6 +++---
 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF  | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml               | 6 +++---
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF           | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                        | 6 +++---
 features/org.eclipse.e4.core.tools.feature/feature.xml      | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml          | 6 +++---
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 051a06ca23..d8ae01266b 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 4.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index fc9a6befd0..21a2b39110 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>0.17.0-SNAPSHOT</version>
+    <version>4.5.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
-  <groupId>org.eclipse.e4</groupId>
+  <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.compat</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>4.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index ac9b4548e3..94e8366bed 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 4.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 28c66a3561..b5d73453ad 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,13 +4,13 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>0.17.0-SNAPSHOT</version>
+    <version>4.5.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
-  <groupId>org.eclipse.e4</groupId>
+  <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.editor3x</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>4.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 1782b374c1..0a49b4c47a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 4.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 89908722d8..4570c2e62f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>0.17.0-SNAPSHOT</version>
+    <version>4.5.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
-  <groupId>org.eclipse.e4</groupId>
+  <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>4.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index 1b45a2005b..8a953bbd7e 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 4.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 32c33ec0de..fae63a7638 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>0.17.0-SNAPSHOT</version>
+    <version>4.5.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
-  <groupId>org.eclipse.e4</groupId>
+  <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.jdt.templates</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>4.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 530a0c7fe0..7760448758 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 4.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.emf.ui",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 6ea5b0f8d4..f244d6b1b7 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>0.17.0-SNAPSHOT</version>
+    <version>4.5.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
-  <groupId>org.eclipse.e4</groupId>
+  <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.services</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>4.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 91c57f915e..ad77814934 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 4.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index b311b05aac..a542800da5 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>0.17.0-SNAPSHOT</version>
+    <version>4.5.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
-  <groupId>org.eclipse</groupId>
+  <groupId>eclipse.platform.ui.tool</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>4.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 2e0fd7bedc..b98a44df99 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="1.0.0.qualifier"
+      version="4.5.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 68e3c26948..27ea222b38 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>0.17.0-SNAPSHOT</version>
+    <version>4.5.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
-  <groupId>org.eclipse.e4</groupId>
+  <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>4.5.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>

From 0086ba1bfcbd33e03d920532a69bfd25bd4e150f Mon Sep 17 00:00:00 2001
From: Veselin Markov <veselin_m84@yahoo.com>
Date: Sat, 14 Mar 2015 17:22:47 +0100
Subject: [PATCH 0882/1286] Bug 456530 - Rename "Element ID" in Model Fragment
 Editor

"Element ID" renamed to "Extended Element ID". Minor spellign fixed.

Change-Id: I30245fda933a8f6264080c42e8132fd9d2c5def2
Signed-off-by: Veselin Markov <veselin_m84@yahoo.com>
---
 .../e4/tools/emf/ui/internal/Messages.properties     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 85a1900516..049cbf1dc8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -359,14 +359,14 @@ ModelFragmentsEditor_Imports=Imports
 
 StringModelFragment_Label=Model Fragment
 StringModelFragment_Description=Model Fragment Bla Bla Bla
-StringModelFragment_Featurename=Featurename
-StringModelFragment_ParentId=Element ID
+StringModelFragment_Featurename=Feature Name
+StringModelFragment_ParentId=Extended Element ID
 StringModelFragment_PositionInList=Position in list
 StringModelFragment_Elements=Elements
 
 FeatureSelectionDialog_Filter=Filter
-FeatureSelectionDialog_ShellTitle=Find Featurename
-FeatureSelectionDialog_DialogTitle=Featurename
+FeatureSelectionDialog_ShellTitle=Find Feature Name
+FeatureSelectionDialog_DialogTitle=Feature Name
 FeatureSelectionDialog_DialogMessage=Find the name of the feature you want to contribute to
 
 CategoryEditor_TreeLabel=Command Category
@@ -574,7 +574,7 @@ FilteredContributionDialog_itemsWereFound=\ items were found.  Not all results h
 FilteredContributionDialog_Java=Java
 FilteredContributionDialog_Location=Location
 FilteredContributionDialog_LocationFilter=Location Filter
-FilteredContributionDialog_MoreThan=More than 
+FilteredContributionDialog_MoreThan=More than
 FilteredContributionDialog_NonBundles=Non Bundles
 FilteredContributionDialog_None=None
 FilteredContributionDialog_Package=Package
@@ -769,7 +769,7 @@ ListTab_3=Repair Duplicate IDs
 ListTab_4=Duplicate IDs will be replaced using a unique suffix
 ListTab_5=Delete Selected Items
 ListTab_6=Selected items will be deleted
-ListTab_7=Showing items with attribute: 
+ListTab_7=Showing items with attribute:
 ListTab_8=xmi
 ListTab_9=form
 ListTab_col_id=ID

From c08239ca4436023d909e4a70e77ebab7f30591d5 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Wed, 22 Apr 2015 10:53:08 +0200
Subject: [PATCH 0883/1286] Bug 441117 - Creating a Binding Context in the
 model editor does not select the newly created element.

A setSelection was missing. Code format is now ok.

Change-Id: I60bb1383469864908a89629130150daebe7c5cb6
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../internal/common/component/virtual/VRootBindingContexts.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
index 8c75adeba1..c0eacbd335 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
@@ -133,6 +133,7 @@ private void handleAddContext() {
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(context);
 		}
 	}
 

From 1d507f33d9a8c5edb9169edbb7d8158526dee6ed Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Wed, 22 Apr 2015 13:42:39 +0200
Subject: [PATCH 0884/1286] Bug 462818 - Model editor erase parent-id in
 trimContribution

Bad reference to attribute ID. Code format is now ok.

Change-Id: I3d650a5c5b2127bc7df684a9759214af7c61b20b
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../ui/internal/common/component/TrimContributionEditor.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 7c2387520e..ca14152c4f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -11,6 +11,7 @@
  * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  * Nicolaj Hoess <nicohoess@gmail.com> - Bug 396975
  * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Olivier Prouvost <olivier@opcoach.com> - Bug 462818
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -215,7 +216,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID)
+				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__PARENT_ID)
 					.observeDetail(getMaster()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);

From f5c6e25c6663f760ef39ac3b01f4411459de606f Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Wed, 22 Apr 2015 17:18:13 +0200
Subject: [PATCH 0885/1286] Bug 457107 - The code formatter and cleanup profile
 for e4 tools project are 'esm*' and are not managed

Change-Id: I054f8fb5a4584c195d6f31cd8ea88b01833204a7
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../.settings/org.eclipse.jdt.ui.prefs                    | 8 +++++++-
 .../.settings/org.eclipse.jdt.ui.prefs                    | 8 +++++++-
 .../.settings/org.eclipse.jdt.ui.prefs                    | 8 +++++++-
 .../.settings/org.eclipse.jdt.ui.prefs                    | 8 +++++++-
 .../.settings/org.eclipse.jdt.ui.prefs                    | 8 +++++++-
 .../.settings/org.eclipse.jdt.ui.prefs                    | 2 +-
 6 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
index 9992f8e9e3..020dd2aa65 100644
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
@@ -80,10 +80,12 @@ sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=false
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.correct_indentation=true
 sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
@@ -99,6 +101,7 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -112,10 +115,13 @@ sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=true
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
 sp_cleanup.use_this_for_non_static_method_access=true
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
index 9992f8e9e3..020dd2aa65 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
@@ -80,10 +80,12 @@ sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=false
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.correct_indentation=true
 sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
@@ -99,6 +101,7 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -112,10 +115,13 @@ sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=true
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
 sp_cleanup.use_this_for_non_static_method_access=true
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
index 9992f8e9e3..020dd2aa65 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -80,10 +80,12 @@ sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=false
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.correct_indentation=true
 sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
@@ -99,6 +101,7 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -112,10 +115,13 @@ sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=true
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
 sp_cleanup.use_this_for_non_static_method_access=true
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
index 9992f8e9e3..020dd2aa65 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
@@ -80,10 +80,12 @@ sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=false
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.correct_indentation=true
 sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
@@ -99,6 +101,7 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -112,10 +115,13 @@ sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=true
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
 sp_cleanup.use_this_for_non_static_method_access=true
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
index 9992f8e9e3..020dd2aa65 100644
--- a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
@@ -80,10 +80,12 @@ sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=false
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.correct_indentation=true
 sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
@@ -99,6 +101,7 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -112,10 +115,13 @@ sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=true
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
 sp_cleanup.use_this_for_non_static_method_access=true
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
index 44689082ee..020dd2aa65 100644
--- a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
@@ -84,7 +84,7 @@ sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.correct_indentation=true
 sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.format_source_code_changes_only=true
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false

From 3605c659b4ab2087de930da6ff5233cd800531b0 Mon Sep 17 00:00:00 2001
From: psuzzi <psuzzi@gmail.com>
Date: Mon, 13 Apr 2015 01:11:24 +0200
Subject: [PATCH 0886/1286] Bug 464464 - [ModelEditor] suggested ID should be
 in lowercase

According conventions model element's ID should be in lowercase.

Change-Id: I4254dd994158ccc16dd4171d34ae33bfb658924e
Signed-off-by: psuzzi <psuzzi@gmail.com>
---
 .../emf/ui/common/component/IdGenerator.java  | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
index f9342c5acd..30753d9349 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2015 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 437951
+ * Patrik Suzzi <psuzzi@gmail.com> - Bug 464464
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.common.component;
@@ -50,7 +51,7 @@ public class IdGenerator {
 	 *            Optional control.
 	 */
 	public void bind(final IObservableValue master, final IEMFEditValueProperty ebpLabel,
-		final IEMFEditValueProperty evpId, Control control) {
+			final IEMFEditValueProperty evpId, Control control) {
 
 		// RULES
 		// Only start generating if the label is initially empty and the id ends
@@ -112,9 +113,9 @@ public void handleValueChange(ValueChangeEvent event) {
 				if (labelValue == null) {
 					labelValue = ""; //$NON-NLS-1$
 				}
-				final String camelCase = camelCase(labelValue);
+				final String trimmedIdEnding = trimToLowercase(labelValue);
 				ignore = true;
-				evpId.setValue(master.getValue(), baseId + camelCase);
+				evpId.setValue(master.getValue(), baseId + trimmedIdEnding);
 				ignore = false;
 			}
 		});
@@ -122,26 +123,19 @@ public void handleValueChange(ValueChangeEvent event) {
 	}
 
 	/**
-	 * Strips all illegal id characters, and camel cases each word.
+	 * Strips all illegal id characters, and lower cases each word.
 	 *
 	 * @param value
 	 * @return
 	 */
-	protected static String camelCase(String value) {
+	protected static String trimToLowercase(String value) {
 		final String[] parts = value.split("\\s+"); //$NON-NLS-1$
-		String ret = ""; //$NON-NLS-1$
-		boolean first = true;
+		final StringBuilder sb = new StringBuilder();
 		for (String part : parts) {
 			part = part.replaceAll("[^0-9a-zA-Z_-]", ""); //$NON-NLS-1$ //$NON-NLS-2$
-			if (first) {
-				first = false;
-				ret = part.toLowerCase();
-			} else {
-				part = part.substring(0, 1).toUpperCase() + part.substring(1).toLowerCase();
-				ret += part;
-			}
+			sb.append(part.toLowerCase());
 		}
-		return ret;
+		return sb.toString();
 	}
 
 	/**

From db34ebd17ae091fda350386fa418237825a20597 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Tue, 28 Apr 2015 15:47:10 +0200
Subject: [PATCH 0887/1286] Bug 465396 - Remove the @SuppressWarnings("nls") in
 the template files generated

Change-Id: I42aa02969ea86e333449479b822d49a681bfa268
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../classes/templates/DynamicMenuContributionTemplate.java      | 2 +-
 .../tools/wizards/classes/templates/HandlerTemplate.java        | 2 +-
 .../internal/tools/wizards/classes/templates/PartTemplate.java  | 2 +-
 .../tools/wizards/classes/templates/ToolControlTemplate.java    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
index 5810b06551..20a79b84f7 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
@@ -1,7 +1,7 @@
 package org.eclipse.e4.internal.tools.wizards.classes.templates;
 
 import org.eclipse.e4.internal.tools.wizards.classes.NewDynamicMenuContributionClassWizard.DynamicMenuContributionClass;
-@SuppressWarnings("nls")
+
 public class DynamicMenuContributionTemplate
 {
   protected static String nl;
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
index bd0f997f0b..f9cfd2ceea 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
@@ -1,7 +1,7 @@
 package org.eclipse.e4.internal.tools.wizards.classes.templates;
 
 import org.eclipse.e4.internal.tools.wizards.classes.NewHandlerClassWizard.HandlerClass;
-@SuppressWarnings("nls")
+
 public class HandlerTemplate
 {
   protected static String nl;
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
index 38c4b91d8d..20843b9887 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
@@ -1,7 +1,7 @@
 package org.eclipse.e4.internal.tools.wizards.classes.templates;
 
 import org.eclipse.e4.internal.tools.wizards.classes.NewPartClassWizard.PartClass;
-@SuppressWarnings("nls")
+
 public class PartTemplate
 {
   protected static String nl;
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
index ecfff8dd1b..5a0405f536 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
@@ -1,7 +1,7 @@
 package org.eclipse.e4.internal.tools.wizards.classes.templates;
 
 import org.eclipse.e4.internal.tools.wizards.classes.NewToolControlClassWizard.ToolControlClass;
-@SuppressWarnings("nls")
+
 public class ToolControlTemplate
 {
   protected static String nl;

From eff5a97bb265ec4a36eb9a50383c9af6ecbf6a64 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 30 Apr 2015 09:12:47 +0200
Subject: [PATCH 0888/1286] Bug 465871 - missing legal files (about.html) in e4
 tools source

Change-Id: I72f9da92b2c39d4914fcae5826b2df9a1b5c4917
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.compat/build.properties        | 1 +
 bundles/org.eclipse.e4.tools.emf.editor3x/build.properties  | 1 +
 bundles/org.eclipse.e4.tools.emf.ui/build.properties        | 1 +
 bundles/org.eclipse.e4.tools.jdt.templates/build.properties | 1 +
 bundles/org.eclipse.e4.tools.services/build.properties      | 1 +
 bundles/org.eclipse.e4.tools/build.properties               | 1 +
 6 files changed, 6 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.compat/build.properties b/bundles/org.eclipse.e4.tools.compat/build.properties
index 6c23df3341..eceea2a918 100644
--- a/bundles/org.eclipse.e4.tools.compat/build.properties
+++ b/bundles/org.eclipse.e4.tools.compat/build.properties
@@ -6,3 +6,4 @@ bin.includes = META-INF/,\
                OSGI-INF/
 source.. = src/
 jre.compilation.profile = JavaSE-1.7
+src.includes = about.html
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
index 9fb99e10a8..ca221eb8c7 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
@@ -6,3 +6,4 @@ bin.includes = META-INF/,\
                icons/,\
                about.html,\
                OSGI-INF/
+src.includes = about.html
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/build.properties b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
index d6a67431d1..78f085b955 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
@@ -12,3 +12,4 @@ output.. = bin/
 jars.compile.order = .
 source.. = src/
 jre.compilation.profile = JavaSE-1.7
+src.includes = about.html
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/build.properties b/bundles/org.eclipse.e4.tools.jdt.templates/build.properties
index d4135f901c..6422c6f83c 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/build.properties
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/build.properties
@@ -7,3 +7,4 @@ bin.includes = META-INF/,\
                templates/,\
                icons/,\
                about.html
+src.includes = about.html
diff --git a/bundles/org.eclipse.e4.tools.services/build.properties b/bundles/org.eclipse.e4.tools.services/build.properties
index 67344cd64d..8e36148b4e 100644
--- a/bundles/org.eclipse.e4.tools.services/build.properties
+++ b/bundles/org.eclipse.e4.tools.services/build.properties
@@ -4,3 +4,4 @@ bin.includes = META-INF/,\
                about.html,\
                OSGI-INF/
 source.. = src/
+src.includes = about.html
diff --git a/bundles/org.eclipse.e4.tools/build.properties b/bundles/org.eclipse.e4.tools/build.properties
index ecd7b1c601..53379cd9aa 100644
--- a/bundles/org.eclipse.e4.tools/build.properties
+++ b/bundles/org.eclipse.e4.tools/build.properties
@@ -7,3 +7,4 @@ bin.includes = META-INF/,\
                about.html,\
                OSGI-INF/,\
                icons/
+src.includes = about.html

From 7ed6008e858b363b2d454fb81fb70603f9462a5e Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 30 Apr 2015 09:30:35 +0200
Subject: [PATCH 0889/1286] Bug 465871 - missing legal files (about.html) in e4
 tools source

Change-Id: Ifbf9122830ec9181fc0e8a8eae4e567a28947d6e
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../META-INF/MANIFEST.MF                        |  1 +
 .../plugin.properties                           | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index 8a953bbd7e..34a7766baf 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
+Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
 Bundle-Version: 4.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties b/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties
index 195bb41596..f85c6a42dc 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties
@@ -1,10 +1,13 @@
-
-# <copyright>
-# </copyright>
+###############################################################################
+# Copyright (c) 2010, 2015 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
 #
-# $Id: plugin.properties,v 1.2 2010/07/20 21:48:42 tschindl Exp $
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 
-pluginName = EMF ModelTooling JDT Templates
+pluginName = e4 JDT code templates
 providerName = Eclipse.org
-
-extension-point.name = Editors
\ No newline at end of file

From 6dcf15c581a0ef7ba26e91047a731f208eceda62 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Wed, 6 May 2015 17:48:41 +0200
Subject: [PATCH 0890/1286] Bug 466604 - [e4 tools] Template product is missing
 dependencies

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

Change-Id: I31e3da75d2be8250b7ef8f8ebc3429bbc2d9ef22
Signed-off-by: jonas <jonas.helming@googlemail.com>
---
 .../templates/common/$productFileName$.product                 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product b/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
index 838c6abe19..45527eb198 100644
--- a/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
+++ b/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
@@ -22,6 +22,7 @@
       <plugin id="org.apache.batik.css"/>
       <plugin id="org.apache.batik.util"/>
       <plugin id="org.apache.batik.util.gui"/>
+      <plugin id="org.apache.commons.jxpath"/>
       <plugin id="org.apache.commons.logging"/>
       <plugin id="org.eclipse.core.commands"/>
       <plugin id="org.eclipse.core.contenttype"/>
@@ -48,8 +49,10 @@
       <plugin id="org.eclipse.e4.core.commands"/>
       <plugin id="org.eclipse.e4.core.contexts"/>
       <plugin id="org.eclipse.e4.core.di"/>
+      <plugin id="org.eclipse.e4.core.di.annotations"/>
       <plugin id="org.eclipse.e4.core.di.extensions"/>
       <plugin id="org.eclipse.e4.core.services"/>
+      <plugin id="org.eclipse.e4.emf.xpath"/>
       <plugin id="org.eclipse.e4.ui.bindings"/>
       <plugin id="org.eclipse.e4.ui.css.core"/>
       <plugin id="org.eclipse.e4.ui.css.swt"/>

From 4dfebd992078f282e7634e73ec4270781db2dba5 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 11 May 2015 15:16:04 +0200
Subject: [PATCH 0891/1286] Bug 466792 - org.eclipse.e4.tools refer to
 newpprj_wiz.gif in pde.ui (plug-ins should contains there own icons)

Change-Id: Id1146099924f19e759493570140cf669d8af9126
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../icons/full/etool16/newpprj_wiz.png            | Bin 0 -> 697 bytes
 .../icons/full/obj16/class_obj.png                | Bin 0 -> 628 bytes
 bundles/org.eclipse.e4.tools/plugin.xml           |   4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools/icons/full/etool16/newpprj_wiz.png
 create mode 100644 bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.png

diff --git a/bundles/org.eclipse.e4.tools/icons/full/etool16/newpprj_wiz.png b/bundles/org.eclipse.e4.tools/icons/full/etool16/newpprj_wiz.png
new file mode 100644
index 0000000000000000000000000000000000000000..723061883764f67feb8608955b62e12c077af820
GIT binary patch
literal 697
zcmV;q0!ICbP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007jNkl<Zc-ozl
zT}+Zu9LDLQyVg|~Xdlzo%FOP%sI5D@=%%eUyQ?m8wKl7{N^lDJ`jMM23td8#uOIlL
z$Q+UAuvIEbn)9>3FH{KmDnZb6h~R5Jy<#!hbgTZ`Z~vXM^E~G{XXkJ@|5z#_@et>K
zixzRO(?af=Qjl<Y&qbw`btz(bgM)mbT-ZWfshA>28TXIa@3TWG;D+`zA*J;4yvK%s
z*8#tG4tDDV#Km_Ox5O+6uP$J#$C=~^NaPU`@Czg`YVr}ZRv>JZfSDD;*_F)-5)fIM
zieu4XfU+PFF@s#99F4=@p*6eEHsRQ2d=9N<JJbz)&_q&nXU5kX?F!LRw8%0Li_R~Q
zLThDW=xhuOt_{5TJytiDKuIKH!`%Y9Fd0(Or3kCu7c+P)s6q2&I7-`01YMKMDA!ss
z><ppPz78Ebr)nyOwk#F2{5E*P+LgG=%X(6erY|ArEn$qh!YEXXfK-`5*1X05#l`dj
zgHMhKbe*lBx}3PruV0HZC@O15$MhOzd<=5rLm(7pG`^ojQC&a288cw0J_DoT94y{-
z=tt&pFPmm!V&2Qo*ojO#i4uAYABNnl!5|{`XBbzf!fm*Uo{IhGu09PzRSLSPQ`;t$
z8Z&lc^DM*Z4dSb3g-tSw&EOa;x^%4Co}*uO0D*xU2n^n2xrJR57)CrOYcOHju>>JC
zfS-YPn9^RrkFk7o$d9uL(pcCd)t<$!ukk^7Uns9?c(Y^3g<M%Tf~G9=P$$t>mlpXb
zPq^0m>e$67)Zz2H8f1$5uRN6WtV=Z}@JI!8PY;IQ%2SfssS`*3`sdv()#qlGcKY)Q
fAEi?~&Yr?wozeD`Zk92S00000NkvXXu0mjfTxClE

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.png b/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc915da4420060b4ea9984fc662935f10f19449a
GIT binary patch
literal 628
zcmV-)0*n2LP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006zNkl<Zc-qZU
zTWFGD81|yeuG+yvBf5yuMbOPIlKFp{i8XPiX|<S?xu94Fw$%UMl5J9gVTR6WOKI(<
zTG&OoLt|?}6Lu9v;KdpdG1p<kY6mTc6;Gf4Rk}6kt_NN|9{8T;JqiRRD6>g-ia8S4
z)-Hc8;YhlwO+G7fkWfXdbcbL=xD=a2Ea9jq+t6qF<s7!)@@Nyz#TudO)&CGWn7oiB
z&cEs<oV<UxTb;c!b_zX-X54$>Mm!n9z)KIhC(oc`<Rq#)lv$yJSl5Wl?J|XgC97Q{
zRz#+pSXfEnPs}a8fp_9G*hj}9W|@^OtfHzUI~mvCG{8A%#mA*tUi3CSjiKaSykC6B
z^NH6F(H^%z6{x4}5KoaorJY$d-#!fAco+XU|1*z^51Mdxpb;%G3pxi|;EbQ=`LSCj
zNZLrExCNUG=Ds6{B*MJG%=|RZ*9&8>5p<yGA_H2|ytZ2pdyL}^mcK7UA2OjnXh1{6
z4F8iLyrVvz6R(yUkPjsW%vg=P4hQ@ud|F!IO<tvvxcWH2zXeRrOhI`~hg~i;Djm$7
z;u+YO{bEj@QTY$z!hII$%;%ylq`u7IXw-te*L4umd6l=;)~s12Eh|>txi6;<>S2tU
z;TrZJ^el>wAvZK(6I8Ut?U$6_X!ibf52>PAvAL2ZiLGt&oYbd<y2k*`jYFsl8?eW#
zfrw)=wAEnYVmCbJGF$BldeX_lW~d-X<0}<Et+2^tf`5g?rYINu_xKIoPF}KcJA|45
O0000<MNUMnLSTa2d?^<I

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools/plugin.xml b/bundles/org.eclipse.e4.tools/plugin.xml
index 9dc10a451a..6189689973 100644
--- a/bundles/org.eclipse.e4.tools/plugin.xml
+++ b/bundles/org.eclipse.e4.tools/plugin.xml
@@ -20,7 +20,7 @@
       <wizard
             category="org.eclipse.e4.tools"
             class="org.eclipse.e4.internal.tools.wizards.project.E4NewProjectWizard"
-            icon="platform:/plugin/org.eclipse.pde.ui/icons/etool16/newpprj_wiz.gif"
+            icon="icons/full/etool16/newpprj_wiz.png"
             id="org.eclipse.e4.tools.E4NewProjectWizard"
             name="%wizard.name"
             project="true">
@@ -51,7 +51,7 @@
       <wizard
             category="org.eclipse.e4.tools/org.eclipse.e4.tools.classes"
             class="org.eclipse.e4.internal.tools.wizards.classes.NewHandlerClassWizard"
-            icon="icons/full/obj16/class_obj.gif"
+            icon="icons/full/obj16/class_obj.png"
             id="org.eclipse.e4.tools.newhandler"
             name="%wizard.name.2">
          <description>

From c47640b6cc5ae648b71c6596f1fe188af18fde5a Mon Sep 17 00:00:00 2001
From: Patrik Suzzi <psuzzi@gmail.com>
Date: Wed, 6 May 2015 00:59:00 +0200
Subject: [PATCH 0892/1286] Bug 466491 - New contribution class wizard should
 suggest package

Abstract new contribution class wizard and page are now suggesting the
package, in case there is a package selected (+amend for WS)

Change-Id: I4d7570f79dc385184ea1b5e291b4b7af72b6f278
Signed-off-by: Patrik Suzzi <psuzzi@gmail.com>
---
 .../wizards/classes/AbstractNewClassPage.java | 25 ++++++++++++++++++-
 .../classes/AbstractNewClassWizard.java       | 25 ++++++++++++++++++-
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index 9b8b43f3db..e3d45f755a 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2015 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Sopot Cela <sopotcela@gmail.com>
+ * Patrik Suzzi <psuzzi@gmail.com> - Bug 421066
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
@@ -50,6 +51,7 @@
 import org.eclipse.jface.databinding.wizard.WizardPageSupport;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jface.window.Window;
@@ -145,6 +147,7 @@ public static boolean exists(IPackageFragmentRoot pFragmentRoot, IPackageFragmen
 	private IPackageFragmentRoot froot;
 	private final IWorkspaceRoot fWorkspaceRoot;
 	private String initialString;
+	private String initialPackage;
 
 	protected AbstractNewClassPage(String pageName, String title, String description, IPackageFragmentRoot froot,
 		IWorkspaceRoot fWorkspaceRoot) {
@@ -162,6 +165,24 @@ protected AbstractNewClassPage(String pageName, String title, String description
 		this.initialString = initialString;
 	}
 
+	/**
+	 * The wizard owning this page is responsible for calling this method with
+	 * the current selection. The selection is used to initialize the fields of
+	 * the wizard page.
+	 *
+	 * @param selection
+	 *            used to initialize the fields
+	 */
+	public void init(IStructuredSelection selection) {
+		if (selection == null || selection.isEmpty() || selection.getFirstElement() == null) {
+			return;
+		}
+		if (selection.getFirstElement() instanceof IPackageFragment) {
+			final IPackageFragment pkg = (IPackageFragment) selection.getFirstElement();
+			initialPackage = pkg.getElementName();
+		}
+	}
+
 	@Override
 	public void createControl(Composite parent) {
 		final Image img = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream(
@@ -186,6 +207,8 @@ public void widgetDisposed(DisposeEvent e) {
 			clazz.setPackageFragment(froot.getPackageFragment(parseInitialStringForPackage(initialString) == null ? "" //$NON-NLS-1$
 				: parseInitialStringForPackage(initialString)));
 			clazz.setName(parseInitialStringForClassName(initialString));
+		} else if (froot != null && initialPackage != null) {
+			clazz.setPackageFragment(froot.getPackageFragment(initialPackage));
 		}
 		final DataBindingContext dbc = new DataBindingContext();
 		WizardPageSupport.create(this, dbc);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
index b380326abd..e8cae01b62 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2015 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Sopot Cela <sopotcela@gmail.com>
+ * Patrik Suzzi <psuzzi@gmail.com> - Bug 421066
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
@@ -35,6 +36,7 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.osgi.service.resolver.VersionRange;
 import org.eclipse.pde.core.project.IBundleProjectDescription;
@@ -53,6 +55,7 @@ public abstract class AbstractNewClassWizard extends Wizard implements INewWizar
 	private static final String JAVA = ".java"; //$NON-NLS-1$
 	protected IPackageFragmentRoot root;
 	protected IFile file;
+	private IStructuredSelection selection;
 
 	public AbstractNewClassWizard() {
 		setWindowTitle(Messages.AbstractNewClassWizard_NewClass);
@@ -60,9 +63,29 @@ public AbstractNewClassWizard() {
 
 	@Override
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.selection = selection;
 		root = getFragmentRoot(getInitialJavaElement(selection));
 	}
 
+	/**
+	 * @return the selection
+	 */
+	public IStructuredSelection getSelection() {
+		return selection;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see org.eclipse.jface.wizard.Wizard#addPage(org.eclipse.jface.wizard.IWizardPage)
+	 */
+	@Override
+	public void addPage(IWizardPage page) {
+		super.addPage(page);
+		if (page instanceof AbstractNewClassPage) {
+			((AbstractNewClassPage) page).init(getSelection());
+		}
+	}
+
 	protected IJavaElement getInitialJavaElement(IStructuredSelection selection) {
 		IJavaElement jelem = null;
 		if (selection != null && !selection.isEmpty()) {

From a522e0d853fed59ac4f9fa7920b6e2660501bde2 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Tue, 21 Apr 2015 23:21:10 +0200
Subject: [PATCH 0893/1286] Bug 465144 - [e4 Tools] Extract into fragment
 wizard does not handle handlers without commands
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=465144

Change-Id: I8be302baf0816e25a5ad6c2f878ff54b4c83d2ff
Signed-off-by: jonas <jonas.helming@googlemail.com>
---
 .../eclipse/e4/internal/tools/Messages.java   |   2 +
 .../e4/internal/tools/messages.properties     |   2 +
 .../model/BaseApplicationModelWizard.java     | 202 +++++++-----------
 .../model/ExtractContributionModelWizard.java |  95 +++++++-
 4 files changed, 168 insertions(+), 133 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
index 1c484b1b7f..c43d83ca25 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
@@ -34,6 +34,7 @@ public class Messages extends NLS {
 	public static String BaseApplicationModelWizard_AddExtractedNode;
 	public static String BaseApplicationModelWizard_Error;
 	public static String BaseApplicationModelWizard_FileExists;
+	public static String BaseApplicationModelWizard_ModelRootMustNotBeNull;
 	public static String BaseApplicationModelWizard_TheFileAlreadyExists;
 	public static String NewAddonClassWizard_NewAddon;
 	public static String NewAddonClassWizard_NewAddonClass;
@@ -104,6 +105,7 @@ public class Messages extends NLS {
 	public static String E4NewProjectWizard_Quit;
 	public static String E4NewProjectWizard_SamplePart;
 	public static String E4NewProjectWizard_Save;
+	public static String ExtractContributionModelWizard_ExistingFragmentIsCorrupted;
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
index 8a4f5dda56..f3131ab6ca 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
@@ -13,6 +13,7 @@ AbstractNewClassWizard_NewClass=New contribution class
 BaseApplicationModelWizard_AddExtractedNode=Would you like to add the extracted node to this file?
 BaseApplicationModelWizard_Error=Error
 BaseApplicationModelWizard_FileExists=File exists
+BaseApplicationModelWizard_ModelRootMustNotBeNull=Model root object much not be null
 BaseApplicationModelWizard_TheFileAlreadyExists=The file already exists. 
 E4NewProjectWizard_About=About
 E4NewProjectWizard_File=File
@@ -24,6 +25,7 @@ E4NewProjectWizard_Open=Open
 E4NewProjectWizard_Quit=Quit
 E4NewProjectWizard_SamplePart=Sample Part
 E4NewProjectWizard_Save=Save
+ExtractContributionModelWizard_ExistingFragmentIsCorrupted=Existing Fragment file is corrupted
 NewAddonClassWizard_NewAddon=New Addon
 NewAddonClassWizard_NewAddonClass=Create a new addon class
 NewApplicationModelWizard_IncludeDefaultAddons=Include default addons
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index 9e093e72a0..55b6a0e434 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -12,9 +12,7 @@
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.model;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.eclipse.core.resources.IContainer;
@@ -29,19 +27,11 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.internal.tools.Messages;
-import org.eclipse.e4.ui.model.application.MApplicationElement;
-import org.eclipse.e4.ui.model.application.commands.MCommand;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
-import org.eclipse.e4.ui.model.fragment.MModelFragment;
-import org.eclipse.e4.ui.model.fragment.MModelFragments;
-import org.eclipse.emf.common.util.TreeIterator;
 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.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -110,17 +100,16 @@ public boolean performFinish() {
 			final IFile modelFile = getModelFile();
 
 			if (modelFile.exists()) {
-				if (!MessageDialog.openQuestion(getShell(), Messages.BaseApplicationModelWizard_FileExists,
-					Messages.BaseApplicationModelWizard_TheFileAlreadyExists
-						+ Messages.BaseApplicationModelWizard_AddExtractedNode)) {
-					return false;
+				final boolean continueWithExistingFile = handleFileExist();
+				if (!continueWithExistingFile) {
+					return true;
 				}
+
 			}
 
 			// Do the work within an operation.
 			//
-			final WorkspaceModifyOperation operation =
-				new WorkspaceModifyOperation() {
+			final WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
 				@Override
 				protected void execute(IProgressMonitor progressMonitor) {
 					try {
@@ -136,80 +125,22 @@ protected void execute(IProgressMonitor progressMonitor) {
 						//
 						final Resource resource = resourceSet.createResource(fileURI);
 
+						final EObject rootObject = createInitialModel();
+
+						if (rootObject == null) {
+							throw new IllegalArgumentException(Messages.BaseApplicationModelWizard_ModelRootMustNotBeNull);
+						}
+
 						// If target file already exists, load its content
 						//
 						if (modelFile.exists()) {
 							resource.load(null);
-						}
 
-						// Add the initial model object to the contents.
-						//
-						final EObject rootObject = createInitialModel();
-						if (rootObject != null) {
-							if (resource.getContents().size() == 0) {
-								// If target model is empty (file just created) => add as is
-								resource.getContents().add(rootObject);
-							} else {
-								// Otherwise (file already exists) => take the roots of source and target models
-								// and copy multiple attributes 'imports' and 'fragments' objects from source to
-									// target
-								final MModelFragments sourceFragments = (MModelFragments) rootObject;
-								final MModelFragments targetFragments = (MModelFragments) resource.getContents()
-										.get(0);
-
-									final List<MCommand> listOfAllImportsFromElements = new ArrayList<MCommand>();
-								for (final MModelFragment fragment : sourceFragments.getFragments()) {
-									final List<MCommand> commandsToImport = new ArrayList<MCommand>();
-									final EObject eObject = (EObject) fragment;
-									final TreeIterator<EObject> eAllContents = eObject.eAllContents();
-									while (eAllContents.hasNext()) {
-										final EObject next = eAllContents.next();
-										final MApplicationElement mApplicationElement = (MApplicationElement) next;
-										if (mApplicationElement instanceof MHandler) {
-											final MHandler mHandler = (MHandler) mApplicationElement;
-											final MCommand command = mHandler.getCommand();
-											commandsToImport.add(command);
-											final MApplicationElement copy = (MApplicationElement) EcoreUtil
-													.copy((EObject) command);
-											targetFragments.getImports().add(copy);
-											mHandler.setCommand((MCommand) copy);
-										}
-										else if (mApplicationElement instanceof MHandledItem) {
-											final MHandledItem mHandledItem = (MHandledItem) mApplicationElement;
-											final MCommand command = mHandledItem.getCommand();
-											commandsToImport.add(command);
-											final MApplicationElement copy = (MApplicationElement) EcoreUtil
-													.copy((EObject) command);
-											targetFragments.getImports().add(copy);
-											mHandledItem.setCommand((MCommand) copy);
-										}
-
-									}
-									listOfAllImportsFromElements.addAll(commandsToImport);
-									targetFragments.getFragments().add(
-											(MModelFragment) EcoreUtil.copy((EObject) fragment));
-
-								}
-								for (final MApplicationElement element : sourceFragments.getImports()) {
-									boolean isAlreadyImport = true;
-										for (final MCommand mCommand : listOfAllImportsFromElements) {
-
-										if (!mCommand.getElementId().equals(element.getElementId())) {
-
-												isAlreadyImport = false;
-											break;
-										}
-										if (!isAlreadyImport) {
-
-											targetFragments.getImports().add(
-													(MApplicationElement) EcoreUtil.copy((EObject) element));
-										}
-
-									}
-
-								}
-
-							}
+							mergeWithExistingFile(resource, rootObject);
+						} else {
+							// If target model is empty (file just created)
+							// => add as is
+							resource.getContents().add(rootObject);
 						}
 
 						// Save the contents of the resource to the file system.
@@ -218,11 +149,9 @@ else if (mApplicationElement instanceof MHandledItem) {
 						resource.save(options);
 						adjustBuildPropertiesFile(modelFile);
 						adjustDependencies(modelFile);
-					}
-					catch (final Exception exception) {
+					} catch (final Exception exception) {
 						throw new RuntimeException(exception);
-					}
-					finally {
+					} finally {
 						progressMonitor.done();
 					}
 				}
@@ -237,20 +166,18 @@ else if (mApplicationElement instanceof MHandledItem) {
 			final IWorkbenchPart activePart = page.getActivePart();
 			if (activePart instanceof ISetSelectionTarget) {
 				final ISelection targetSelection = new StructuredSelection(modelFile);
-				getShell().getDisplay().asyncExec
-				(new Runnable() {
-						@Override
+				getShell().getDisplay().asyncExec(new Runnable() {
+					@Override
 					public void run() {
-							((ISetSelectionTarget) activePart).selectReveal(targetSelection);
-						}
-					});
+						((ISetSelectionTarget) activePart).selectReveal(targetSelection);
+					}
+				});
 			}
 
 			// Open an editor on the new file.
 			//
 			try {
-				page.openEditor
-				(new FileEditorInput(modelFile),
+				page.openEditor(new FileEditorInput(modelFile),
 						workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
 			} catch (final PartInitException exception) {
 				MessageDialog.openError(workbenchWindow.getShell(), "Could not init editor", exception.getMessage()); //$NON-NLS-1$
@@ -265,6 +192,21 @@ public void run() {
 		}
 	}
 
+	/**
+	 * @return if the wizard should continue in case the file already exists
+	 */
+	protected boolean handleFileExist() {
+		MessageDialog.openInformation(getShell(), Messages.BaseApplicationModelWizard_FileExists,
+				Messages.BaseApplicationModelWizard_TheFileAlreadyExists);
+
+		return false;
+	}
+
+	/**
+	 * Creates the rootObject of the new model file. Must not be null.
+	 *
+	 * @return The root {@link EObject}
+	 */
 	protected abstract EObject createInitialModel();
 
 	protected IFile getModelFile() throws CoreException {
@@ -274,14 +216,15 @@ protected IFile getModelFile() throws CoreException {
 		final IResource resource = root.findMember(new Path(containerName));
 		if (!resource.exists() || !(resource instanceof IContainer)) {
 			throwCoreException("Container \"" + containerName //$NON-NLS-1$
-				+ "\" does not exist."); //$NON-NLS-1$
+					+ "\" does not exist."); //$NON-NLS-1$
 		}
 		final IContainer container = (IContainer) resource;
 		return container.getFile(new Path(fileName));
 	}
 
 	private void throwCoreException(String message) throws CoreException {
-		final IStatus status = new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.editor3x", IStatus.OK, message, null); //$NON-NLS-1$
+		final IStatus status = new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.editor3x", IStatus.OK, message, //$NON-NLS-1$
+				null);
 		throw new CoreException(status);
 	}
 
@@ -300,8 +243,7 @@ public void init(IWorkbench workbench, IStructuredSelection selection) {
 	/**
 	 * Adds other file to the build.properties file.
 	 */
-	private void adjustBuildPropertiesFile(IFile file)
-		throws CoreException {
+	private void adjustBuildPropertiesFile(IFile file) throws CoreException {
 		final IProject project = file.getProject();
 		final IFile buildPropertiesFile = PDEProject.getBuildProperties(project);
 		if (buildPropertiesFile.exists()) {
@@ -335,8 +277,7 @@ protected void adjustFragmentDependencies(IFile file) {
 		final IFile pluginXml = PDEProject.getPluginXml(project);
 		final IFile manifest = PDEProject.getManifest(project);
 
-		final WorkspaceBundlePluginModel fModel = new WorkspaceBundlePluginModel(
-			manifest, pluginXml);
+		final WorkspaceBundlePluginModel fModel = new WorkspaceBundlePluginModel(manifest, pluginXml);
 		try {
 			addWorkbenchDependencyIfRequired(fModel);
 			registerWithExtensionPointIfRequired(project, fModel, file);
@@ -346,8 +287,7 @@ protected void adjustFragmentDependencies(IFile file) {
 		}
 	}
 
-	private void addWorkbenchDependencyIfRequired(
-		WorkspaceBundlePluginModel fModel) throws CoreException {
+	private void addWorkbenchDependencyIfRequired(WorkspaceBundlePluginModel fModel) throws CoreException {
 		final IPluginImport[] imports = fModel.getPluginBase().getImports();
 
 		final String WORKBENCH_IMPORT_ID = "org.eclipse.e4.ui.model.workbench"; //$NON-NLS-1$
@@ -359,19 +299,15 @@ private void addWorkbenchDependencyIfRequired(
 		}
 
 		String version = ""; //$NON-NLS-1$
-		final IPluginModelBase findModel = PluginRegistry
-			.findModel(WORKBENCH_IMPORT_ID);
+		final IPluginModelBase findModel = PluginRegistry.findModel(WORKBENCH_IMPORT_ID);
 		if (findModel != null) {
-			final BundleDescription bundleDescription = findModel
-				.getBundleDescription();
+			final BundleDescription bundleDescription = findModel.getBundleDescription();
 			if (bundleDescription != null) {
-				version = bundleDescription.getVersion().toString()
-					.replaceFirst("\\.qualifier$", ""); //$NON-NLS-1$ //$NON-NLS-2$
+				version = bundleDescription.getVersion().toString().replaceFirst("\\.qualifier$", ""); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		}
 
-		final IPluginImport workbenchImport = fModel.getPluginFactory()
-			.createImport();
+		final IPluginImport workbenchImport = fModel.getPluginFactory().createImport();
 		workbenchImport.setId(WORKBENCH_IMPORT_ID);
 		workbenchImport.setVersion(version);
 		workbenchImport.setMatch(IMatchRules.GREATER_OR_EQUAL);
@@ -383,17 +319,20 @@ private void addWorkbenchDependencyIfRequired(
 	 * Register the fragment.e4xmi with the org.eclipse.e4.workbench.model
 	 * extension point, if there is not already a fragment registered.
 	 */
-	private void registerWithExtensionPointIfRequired(IProject project,
-		WorkspaceBundlePluginModel fModel, IFile file) throws CoreException {
+	private void registerWithExtensionPointIfRequired(IProject project, WorkspaceBundlePluginModel fModel, IFile file)
+			throws CoreException {
 
 		final String WORKBENCH_MODEL_EP_ID = "org.eclipse.e4.workbench.model"; //$NON-NLS-1$
 		final String FRAGMENT = "fragment"; //$NON-NLS-1$
 
-		// Fix bug #436836 : the received fModel is an empty plugin model without extension.
+		// Fix bug #436836 : the received fModel is an empty plugin model
+		// without extension.
 		// We must copy extensions found in registry plugin model into it
-		// The registry plugin model is read only and must be copied inside the new extension value..
+		// The registry plugin model is read only and must be copied inside the
+		// new extension value..
 		final BundlePluginModel registryModel = (BundlePluginModel) PluginRegistry.findModel(project.getName());
-		// The registry Model is not modifiable and may be contains some existing extensions.
+		// The registry Model is not modifiable and may be contains some
+		// existing extensions.
 		// Must copy them in the new created fModel
 		for (final IPluginExtension e : registryModel.getPluginBase().getExtensions()) {
 			final IPluginExtension clonedExtens = copyExtension(fModel.getFactory(), e);
@@ -403,8 +342,7 @@ private void registerWithExtensionPointIfRequired(IProject project,
 		// Can now check if we must add this extension (may be already inside).
 		final IPluginExtension[] extensions = fModel.getPluginBase().getExtensions();
 		for (final IPluginExtension iPluginExtension : extensions) {
-			if (WORKBENCH_MODEL_EP_ID
-				.equalsIgnoreCase(iPluginExtension.getPoint())) {
+			if (WORKBENCH_MODEL_EP_ID.equalsIgnoreCase(iPluginExtension.getPoint())) {
 				final IPluginObject[] children = iPluginExtension.getChildren();
 				for (final IPluginObject child : children) {
 					if (FRAGMENT.equalsIgnoreCase(child.getName())) {
@@ -414,10 +352,9 @@ private void registerWithExtensionPointIfRequired(IProject project,
 			}
 		}
 
-		final IPluginExtension extPointFragmentRegister = fModel.getPluginFactory()
-			.createExtension();
-		final IPluginElement element = extPointFragmentRegister.getModel()
-			.getFactory().createElement(extPointFragmentRegister);
+		final IPluginExtension extPointFragmentRegister = fModel.getPluginFactory().createExtension();
+		final IPluginElement element = extPointFragmentRegister.getModel().getFactory()
+				.createElement(extPointFragmentRegister);
 		element.setName(FRAGMENT);
 		element.setAttribute("uri", file.getName()); //$NON-NLS-1$
 		extPointFragmentRegister.setId(project.getName() + "." + FRAGMENT); //$NON-NLS-1$
@@ -429,8 +366,7 @@ private void registerWithExtensionPointIfRequired(IProject project,
 
 	// Used to Fix bug #436836
 	private IPluginExtension copyExtension(IExtensionsModelFactory factory, final IPluginExtension ext) {
-		try
-		{
+		try {
 			final IPluginExtension clonedExt = factory.createExtension();
 			clonedExt.setPoint(ext.getPoint());
 			final IPluginObject[] _children = ext.getChildren();
@@ -451,9 +387,8 @@ private IPluginExtension copyExtension(IExtensionsModelFactory factory, final IP
 
 	// Used to Fix bug #436836
 	private IPluginElement copyExtensionElement(IExtensionsModelFactory factory, final IPluginElement elt,
-		final IPluginObject parent) {
-		try
-		{
+			final IPluginObject parent) {
+		try {
 			final IPluginElement clonedElt = factory.createElement(parent);
 			clonedElt.setName(elt.getName());
 			for (final IPluginAttribute a : elt.getAttributes()) {
@@ -474,4 +409,13 @@ private IPluginElement copyExtensionElement(IExtensionsModelFactory factory, fin
 
 	}
 
+	/**
+	 * @param resource
+	 * @param rootObject
+	 */
+	protected void mergeWithExistingFile(Resource resource, EObject rootObject) {
+		// do nothing
+
+	}
+
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
index bbbc1b179c..4ac77e5708 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
@@ -12,21 +12,27 @@
 package org.eclipse.e4.internal.tools.wizards.model;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
+import org.eclipse.e4.ui.model.fragment.MModelFragment;
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.ui.PlatformUI;
@@ -60,6 +66,9 @@ public void resolveCommandImports(MApplicationElement moe, MModelFragments mMode
 
 			final MHandler mhandler = (MHandler) moe;
 			final MCommand command = ((MHandler) moe).getCommand();
+			if (command == null) {
+				return;
+			}
 			final MCommand existImportCommand = importCommands.get(command.getElementId());
 			if (existImportCommand == null) {
 				final MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject) command);
@@ -72,6 +81,9 @@ public void resolveCommandImports(MApplicationElement moe, MModelFragments mMode
 		} else if (moe instanceof MHandledItem) {
 			final MHandledItem mh = (MHandledItem) moe;
 			final MCommand command = mh.getCommand();
+			if (command == null) {
+				return;
+			}
 			final MCommand existImportCommand = importCommands.get(command.getElementId());
 			if (existImportCommand == null) {
 				final MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject) command);
@@ -100,11 +112,11 @@ protected EObject createInitialModel() {
 				hasNext = eAllContents.hasNext();
 			}
 			final MStringModelFragment createStringModelFragment = MFragmentFactory.INSTANCE
-				.createStringModelFragment();
+					.createStringModelFragment();
 			final MApplicationElement e = (MApplicationElement) EcoreUtil.copy((EObject) moe);
 			final String featurename = ((EObject) moe).eContainmentFeature().getName();
-			createStringModelFragment.setParentElementId(((MApplicationElement) ((EObject) moe).eContainer())
-				.getElementId());
+			createStringModelFragment
+			.setParentElementId(((MApplicationElement) ((EObject) moe).eContainer()).getElementId());
 			createStringModelFragment.getElements().add(e);
 			createStringModelFragment.setFeaturename(featurename);
 
@@ -127,4 +139,79 @@ protected void adjustDependencies(IFile file) {
 		super.adjustFragmentDependencies(file);
 	}
 
-}
\ No newline at end of file
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.e4.internal.tools.wizards.model.BaseApplicationModelWizard#handleFileExist()
+	 */
+	@Override
+	protected boolean handleFileExist() {
+		return MessageDialog.openQuestion(getShell(), Messages.BaseApplicationModelWizard_FileExists,
+				Messages.BaseApplicationModelWizard_TheFileAlreadyExists
+				+ Messages.BaseApplicationModelWizard_AddExtractedNode);
+
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.e4.internal.tools.wizards.model.BaseApplicationModelWizard#mergeWithExistingFile(org.eclipse.emf.ecore.resource.Resource)
+	 */
+	@Override
+	protected void mergeWithExistingFile(Resource resource, EObject rootObject) {
+
+		final EObject existingRootObject = resource.getContents().get(0);
+		if (!(existingRootObject instanceof MModelFragments)) {
+			throw new IllegalStateException(Messages.ExtractContributionModelWizard_ExistingFragmentIsCorrupted);
+		}
+
+		final MModelFragments sourceFragments = (MModelFragments) rootObject;
+		final MModelFragments targetFragments = (MModelFragments) existingRootObject;
+
+		targetFragments.getFragments().addAll(sourceFragments.getFragments());
+		final List<MApplicationElement> sourceImports = new ArrayList<MApplicationElement>();
+		sourceImports.addAll(sourceFragments.getImports());
+		for (final MApplicationElement source : sourceImports) {
+
+			boolean doImport = true;
+			for (final MApplicationElement target : targetFragments.getImports()) {
+				if (target.getElementId() == null || source.getElementId() == null) {
+					continue;
+				}
+				if (target.getElementId().equals(source.getElementId())) {
+					doImport = false;
+					connectToExistingImport(targetFragments.getFragments(), target, source);
+					break;
+				}
+
+			}
+			if (doImport) {
+				targetFragments.getImports().add(source);
+			}
+
+		}
+
+	}
+
+	/**
+	 * @param fragments
+	 * @param existingImport
+	 * @param source
+	 */
+	private void connectToExistingImport(List<MModelFragment> fragments, MApplicationElement target,
+			MApplicationElement source) {
+		final Collection<Setting> settings = EcoreUtil.UsageCrossReferencer.find((EObject) source, fragments);
+		for (final Setting setting : settings) {
+			if (setting.getEStructuralFeature().isMany()) {
+				@SuppressWarnings("unchecked")
+				final List<MApplicationElement> list = (List<MApplicationElement>) setting.getEObject()
+				.eGet(setting.getEStructuralFeature());
+				list.remove(source);
+				list.add(target);
+			} else {
+				setting.getEObject().eSet(setting.getEStructuralFeature(), target);
+			}
+		}
+
+	}
+}

From aeea139b9165ecc3d498f521a723d8aa6c9665f5 Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Fri, 22 May 2015 17:32:10 +0200
Subject: [PATCH 0894/1286] Bug 468041 - ClassCastException in
 ModelEditor$DropListener.performDrop (1720)

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

Change-Id: I3a74482cc0b837380e2abc7d8351b181e34a176f
Signed-off-by: jonas <jonas.helming@googlemail.com>
---
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 8d95a5487c..09fbd70818 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1717,6 +1717,9 @@ protected DropListener(Viewer viewer, EditingDomain domain) {
 
 		@Override
 		public boolean performDrop(Object data) {
+			if (!(data instanceof Object[])) {
+				return false;
+			}
 			final Object[] dropDataArray = (Object[]) data;
 			for (final Object object : dropDataArray) {
 				final boolean result = performSingleDrop(object);

From e13c71f012ddb24ed2e0a949ccda2292f0b4838b Mon Sep 17 00:00:00 2001
From: Andrey Loskutov <loskutov@gmx.de>
Date: Sun, 24 May 2015 23:55:51 +0200
Subject: [PATCH 0895/1286] Bug 467821 - Deleting a project does not close the
 application model editor

The root cause was accessing UI from non UI thread - fixed this. Also
removed exceptions while closing project with opened model editor and
removes syserror output on editor creation.

Change-Id: I8f6fd8fe5195ba164c1d159ff10c21a8e0f060e0
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
---
 .../e4/tools/emf/ui/internal/common/ModelEditor.java |  2 +-
 .../properties/ProjectOSGiTranslationProvider.java   |  3 +++
 .../emf/ui/internal/wbm/ApplicationModelEditor.java  | 12 +++++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 09fbd70818..941c9df273 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1285,7 +1285,7 @@ public List<AbstractElementEditorContribution> getTabContributionsForClass(Class
 	}
 
 	private void registerDefaultEditors() {
-		System.err.println(getClass().getName() + ".registerDefaultEditors: " + resourcePool); //$NON-NLS-1$
+		// System.err.println(getClass().getName() + ".registerDefaultEditors: " + resourcePool); //$NON-NLS-1$
 
 		registerEditor(ApplicationPackageImpl.Literals.APPLICATION,
 			ContextInjectionFactory.make(ApplicationEditor.class, context));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
index 1a964c761d..1eb8d313d7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
@@ -176,6 +176,9 @@ boolean visit(IResourceDelta delta) {
 	 */
 	private void handleManifestChange(IFile file) {
 		try {
+			if (!file.isAccessible()) {
+				return;
+			}
 			final String newValue = extractBasenameFromManifest(file);
 
 			if (!newValue.equals(basename)) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index f994c56b10..b1961c46e6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -123,15 +123,21 @@ public void resourceChanged(IResourceChangeEvent event) {
 			}
 		}
 
-		private void hidePart(boolean force) {
-			partService.hidePart(part, force);
+		private void hidePart(final boolean force) {
+			sync.asyncExec(new Runnable() {
+
+				@Override
+				public void run() {
+					partService.hidePart(part, force);
+				}
+			});
 		}
 	};
 
 	/**
 	 * Shows an error dialog based on the passed exception. It should never
 	 * occur but if it does, the user can report a problem.
-	 * 
+	 *
 	 * @param exc
 	 */
 	protected void statusDialog(final Exception exc) {

From 0a3c0bd7d9d76142dc1107925a2277ca65f543a1 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 15 Jun 2015 22:26:08 +0200
Subject: [PATCH 0896/1286] Bug 470221 - Update e4 tools templates project

Using enhanced for loop

Change-Id: I7c42e2fea4e5bee9e65daf417b1927eddb06ec64
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../E4TemplateCompletionProposalComputer.java      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
index 45575bccf5..27e1a66835 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  * IBM Corporation - initial API and implementation (adapted from JDT's SWTTemplateCompletionProposalComputer)
+ * Lars Vogel <Lars.Vogel@vogella.com> - Bug 470221
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.jdt.templates;
 
@@ -53,8 +54,7 @@ public void elementChanged(ElementChangedEvent event) {
 			}
 
 			final IJavaElementDelta[] children = event.getDelta().getChangedChildren();
-			for (int i = 0; i < children.length; i++) {
-				final IJavaElementDelta child = children[i];
+			for (final IJavaElementDelta child : children) {
 				if (javaProject.equals(child.getElement())) {
 					if (isClasspathChange(child)) {
 						setCachedJavaProject(null);
@@ -65,7 +65,7 @@ public void elementChanged(ElementChangedEvent event) {
 
 		/**
 		 * Does the delta indicate a classpath change?
-		 * 
+		 *
 		 * @param delta the delta to inspect
 		 * @return true if classpath has changed
 		 */
@@ -77,8 +77,8 @@ private boolean isClasspathChange(IJavaElementDelta delta) {
 
 			if ((flags & IJavaElementDelta.F_CHILDREN) != 0) {
 				final IJavaElementDelta[] children = delta.getAffectedChildren();
-				for (int i = 0; i < children.length; i++) {
-					if (isClasspathChangeFlag(children[i].getFlags())) {
+				for (final IJavaElementDelta element : children) {
+					if (isClasspathChangeFlag(element.getFlags())) {
 						return true;
 					}
 				}
@@ -89,7 +89,7 @@ private boolean isClasspathChange(IJavaElementDelta delta) {
 
 		/**
 		 * Do the flags indicate a classpath change?
-		 * 
+		 *
 		 * @param flags the flags to inspect
 		 * @return true if the flag flags a classpath change
 		 */

From 51f4339bbdb7bcc71edfda4af7581b4059926c5f Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@vogella.com>
Date: Mon, 15 Jun 2015 16:35:58 -0400
Subject: [PATCH 0897/1286] Revert "Bug 470221 - Update e4 tools templates
 project"

This reverts commit 0a3c0bd7d9d76142dc1107925a2277ca65f543a1.

Change-Id: Ia69709d6f803e795517e426cc86bc131398335c7
---
 .../E4TemplateCompletionProposalComputer.java      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
index 27e1a66835..45575bccf5 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2015 IBM Corporation and others.
+ * Copyright (c) 2007, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,7 +7,6 @@
  *
  * Contributors:
  * IBM Corporation - initial API and implementation (adapted from JDT's SWTTemplateCompletionProposalComputer)
- * Lars Vogel <Lars.Vogel@vogella.com> - Bug 470221
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.jdt.templates;
 
@@ -54,7 +53,8 @@ public void elementChanged(ElementChangedEvent event) {
 			}
 
 			final IJavaElementDelta[] children = event.getDelta().getChangedChildren();
-			for (final IJavaElementDelta child : children) {
+			for (int i = 0; i < children.length; i++) {
+				final IJavaElementDelta child = children[i];
 				if (javaProject.equals(child.getElement())) {
 					if (isClasspathChange(child)) {
 						setCachedJavaProject(null);
@@ -65,7 +65,7 @@ public void elementChanged(ElementChangedEvent event) {
 
 		/**
 		 * Does the delta indicate a classpath change?
-		 *
+		 * 
 		 * @param delta the delta to inspect
 		 * @return true if classpath has changed
 		 */
@@ -77,8 +77,8 @@ private boolean isClasspathChange(IJavaElementDelta delta) {
 
 			if ((flags & IJavaElementDelta.F_CHILDREN) != 0) {
 				final IJavaElementDelta[] children = delta.getAffectedChildren();
-				for (final IJavaElementDelta element : children) {
-					if (isClasspathChangeFlag(element.getFlags())) {
+				for (int i = 0; i < children.length; i++) {
+					if (isClasspathChangeFlag(children[i].getFlags())) {
 						return true;
 					}
 				}
@@ -89,7 +89,7 @@ private boolean isClasspathChange(IJavaElementDelta delta) {
 
 		/**
 		 * Do the flags indicate a classpath change?
-		 *
+		 * 
 		 * @param flags the flags to inspect
 		 * @return true if the flag flags a classpath change
 		 */

From c795781248f9d3ef4a772578c496952b117a752f Mon Sep 17 00:00:00 2001
From: Markus Keller <markus_keller@ch.ibm.com>
Date: Fri, 3 Jul 2015 12:55:24 +0200
Subject: [PATCH 0898/1286] Bug 469765 - Prep for 4.6 (Neon) and 4.5 (Mars)
 maintenance builds - update parent poms for 4.6

---
 bundles/org.eclipse.e4.tools.compat/pom.xml        | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml  | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml        | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml               | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 21a2b39110..400ad50c21 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index b5d73453ad..caed454e49 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 4570c2e62f..714eee2566 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index fae63a7638..b70c11556b 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index f244d6b1b7..0287ee804d 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index a542800da5..a22cd87510 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 27ea222b38..5cf1da5a2a 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 

From 243112c73aeaf30d305ece4ea7333f6eab9dd10f Mon Sep 17 00:00:00 2001
From: Markus Keller <markus_keller@ch.ibm.com>
Date: Fri, 3 Jul 2015 16:32:30 +0200
Subject: [PATCH 0899/1286] removed duplicate message IDs

---
 .../org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties    | 1 -
 .../src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties | 1 -
 2 files changed, 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
index cd369c37dc..30fb216fa1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
@@ -131,7 +131,6 @@ IMG_org.eclipse.e4.tools.emf.ui.widgets.toolitempush_obj = /icons/full/widgets/t
 IMG_org.eclipse.e4.tools.emf.ui.widgets.toolitemradio_obj = /icons/full/widgets/toolitemradio_obj.gif
 IMG_org.eclipse.e4.tools.emf.ui.widgets.toolitemseparator_obj = /icons/full/widgets/toolitemseparator_obj.gif
 IMG_org.eclipse.e4.tools.emf.ui.widgets.checkbox_obj = /icons/full/widgets/checkbox_obj.gif
-IMG_org.eclipse.e4.tools.emf.ui.widgets.group_obj = /icons/full/widgets/group_obj.gif
 IMG_org.eclipse.e4.tools.emf.ui.widgets.menu_obj = /icons/full/widgets/menu_obj.gif
 IMG_org.eclipse.e4.tools.emf.ui.widgets.menubar_obj = /icons/full/widgets/menubar_obj.gif
 IMG_org.eclipse.e4.tools.emf.ui.widgets.menuitem_obj = /icons/full/widgets/menuitem_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 049cbf1dc8..b0394e3b91 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -273,7 +273,6 @@ PerspectiveEditor_Label=Perspective
 PerspectiveEditor_Description=Perspective Bla Bla Bla
 PerspectiveEditor_LabelLabel=Label
 PerspectiveEditor_SelectedElement=Selected Element
-PerspectiveEditor_Label=Perspective
 PerspectiveEditor_Tooltip=Tooltip
 PerspectiveEditor_IconURI=Icon URI
 PerspectiveEditor_Controls=Controls

From e279e68a01782b96ac5056eebdb6d4025b9d223f Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 15 Jun 2015 23:39:30 +0200
Subject: [PATCH 0900/1286] Bug 470226 - [Templates] Provide template to inject
 ESelectionService as field and rename existing field templates

Change-Id: I6059d80f1089e7b15ae34edda63ed8da562afd0c
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../templates/default-e4templates.xml                    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
index 025f5b3439..4f546a4c16 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
@@ -16,11 +16,6 @@
 
 <templates>
 
-<template name="Inject - Composite" description="Injected Parent Composite" id="org.eclipse.e4.tools.jdt.templates.parent" context="e4-members" enabled="true" autoinsert="false">@Inject
-Composite parent;
-${imp:import(javax.inject.Inject)}
-</template>
-
 <template name="Inject -  Preference Value" description="Injected Preference Value" id="org.eclipse.e4.tools.jdt.templates.preference" context="e4-members" enabled="true" autoinsert="false">@Inject
 void setPreferenceValue(@Named("preference-PREFERENCE_KEY") String preferenceValue) {
 	${cursor}
@@ -37,6 +32,10 @@ IEventBroker eventBroker;
 ${imp:import(org.eclipse.e4.core.services.events.IEventBroker)}
 </template>
 
+<template name="ESelection service as field" description="Injected ESEectionService" id="org.eclipse.e4.tools.jdt.templates.selectionservice" context="e4-members" enabled="true" autoinsert="false">@Inject
+ESelectionService selectionService;
+${imp:import(org.eclipse.e4.ui.workbench.modeling.ESelectionService)}
+</template>
 
 <template name="Injectject -  Event" description="Event Handler Method" id="org.eclipse.e4.tools.jdt.templates.eventhandler" context="e4-members" enabled="true" autoinsert="false">@EventHandler("some/event/topic")
 void handleSomeEvent(Payload payloadObject) {

From cedde9d7447cd4040899e77d4c6cf8a8606e0383 Mon Sep 17 00:00:00 2001
From: Lars Vogel <lars.vogel@vogella.com>
Date: Mon, 15 Jun 2015 17:02:21 -0400
Subject: [PATCH 0901/1286] Revert "Revert "Bug 470221 - Update e4 tools
 templates project""

This reverts commit 51f4339bbdb7bcc71edfda4af7581b4059926c5f.

Change-Id: I8d28b3d78297bc68073aaca585307204975aa32b
---
 .../E4TemplateCompletionProposalComputer.java      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
index 45575bccf5..27e1a66835 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  * IBM Corporation - initial API and implementation (adapted from JDT's SWTTemplateCompletionProposalComputer)
+ * Lars Vogel <Lars.Vogel@vogella.com> - Bug 470221
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.jdt.templates;
 
@@ -53,8 +54,7 @@ public void elementChanged(ElementChangedEvent event) {
 			}
 
 			final IJavaElementDelta[] children = event.getDelta().getChangedChildren();
-			for (int i = 0; i < children.length; i++) {
-				final IJavaElementDelta child = children[i];
+			for (final IJavaElementDelta child : children) {
 				if (javaProject.equals(child.getElement())) {
 					if (isClasspathChange(child)) {
 						setCachedJavaProject(null);
@@ -65,7 +65,7 @@ public void elementChanged(ElementChangedEvent event) {
 
 		/**
 		 * Does the delta indicate a classpath change?
-		 * 
+		 *
 		 * @param delta the delta to inspect
 		 * @return true if classpath has changed
 		 */
@@ -77,8 +77,8 @@ private boolean isClasspathChange(IJavaElementDelta delta) {
 
 			if ((flags & IJavaElementDelta.F_CHILDREN) != 0) {
 				final IJavaElementDelta[] children = delta.getAffectedChildren();
-				for (int i = 0; i < children.length; i++) {
-					if (isClasspathChangeFlag(children[i].getFlags())) {
+				for (final IJavaElementDelta element : children) {
+					if (isClasspathChangeFlag(element.getFlags())) {
 						return true;
 					}
 				}
@@ -89,7 +89,7 @@ private boolean isClasspathChange(IJavaElementDelta delta) {
 
 		/**
 		 * Do the flags indicate a classpath change?
-		 * 
+		 *
 		 * @param flags the flags to inspect
 		 * @return true if the flag flags a classpath change
 		 */

From 2a55389284afdd5888f15ec8e741bdba4a0032ab Mon Sep 17 00:00:00 2001
From: jonas <jonas.helming@googlemail.com>
Date: Tue, 19 May 2015 10:17:07 +0200
Subject: [PATCH 0902/1286] Bug 465145 - [e4 Tools] Extract into fragment
 wizard does not handle the case if previous imports become extracted elements

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

Change-Id: I33104acde04e050c57afda94e3dec1a0ddc9421c
Signed-off-by: jonas <jonas.helming@googlemail.com>
---
 .../model/ExtractContributionModelWizard.java |  50 +--
 .../wizards/model/FragmentMergeHelper.java    | 157 +++++++
 tests/org.eclipse.e4.tools.test/.classpath    |   7 +
 tests/org.eclipse.e4.tools.test/.project      |  28 ++
 .../org.eclipse.core.resources.prefs          |   6 +
 .../.settings/org.eclipse.core.runtime.prefs  |   2 +
 .../.settings/org.eclipse.jdt.core.prefs      | 425 ++++++++++++++++++
 .../.settings/org.eclipse.jdt.launching.prefs |   2 +
 .../.settings/org.eclipse.jdt.ui.prefs        | 127 ++++++
 .../.settings/org.eclipse.pde.api.tools.prefs |  97 ++++
 .../.settings/org.eclipse.pde.core.prefs      |   3 +
 .../.settings/org.eclipse.pde.prefs           |  32 ++
 .../META-INF/MANIFEST.MF                      |  10 +
 .../build.properties                          |   4 +
 .../tools/test/FragmentMergeHelperTest.java   | 218 +++++++++
 15 files changed, 1120 insertions(+), 48 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java
 create mode 100644 tests/org.eclipse.e4.tools.test/.classpath
 create mode 100644 tests/org.eclipse.e4.tools.test/.project
 create mode 100644 tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.resources.prefs
 create mode 100644 tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.launching.prefs
 create mode 100644 tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs
 create mode 100644 tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.api.tools.prefs
 create mode 100644 tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.core.prefs
 create mode 100644 tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.prefs
 create mode 100644 tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
 create mode 100644 tests/org.eclipse.e4.tools.test/build.properties
 create mode 100644 tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
index 4ac77e5708..ffdae77ab6 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
@@ -12,7 +12,6 @@
 package org.eclipse.e4.internal.tools.wizards.model;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 
@@ -24,12 +23,10 @@
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
-import org.eclipse.e4.ui.model.fragment.MModelFragment;
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature.Setting;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -167,51 +164,8 @@ protected void mergeWithExistingFile(Resource resource, EObject rootObject) {
 
 		final MModelFragments sourceFragments = (MModelFragments) rootObject;
 		final MModelFragments targetFragments = (MModelFragments) existingRootObject;
+		FragmentMergeHelper.merge(sourceFragments, targetFragments);
 
-		targetFragments.getFragments().addAll(sourceFragments.getFragments());
-		final List<MApplicationElement> sourceImports = new ArrayList<MApplicationElement>();
-		sourceImports.addAll(sourceFragments.getImports());
-		for (final MApplicationElement source : sourceImports) {
-
-			boolean doImport = true;
-			for (final MApplicationElement target : targetFragments.getImports()) {
-				if (target.getElementId() == null || source.getElementId() == null) {
-					continue;
-				}
-				if (target.getElementId().equals(source.getElementId())) {
-					doImport = false;
-					connectToExistingImport(targetFragments.getFragments(), target, source);
-					break;
-				}
-
-			}
-			if (doImport) {
-				targetFragments.getImports().add(source);
-			}
-
-		}
-
-	}
-
-	/**
-	 * @param fragments
-	 * @param existingImport
-	 * @param source
-	 */
-	private void connectToExistingImport(List<MModelFragment> fragments, MApplicationElement target,
-			MApplicationElement source) {
-		final Collection<Setting> settings = EcoreUtil.UsageCrossReferencer.find((EObject) source, fragments);
-		for (final Setting setting : settings) {
-			if (setting.getEStructuralFeature().isMany()) {
-				@SuppressWarnings("unchecked")
-				final List<MApplicationElement> list = (List<MApplicationElement>) setting.getEObject()
-				.eGet(setting.getEStructuralFeature());
-				list.remove(source);
-				list.add(target);
-			} else {
-				setting.getEObject().eSet(setting.getEStructuralFeature(), target);
-			}
-		}
 
 	}
-}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java
new file mode 100644
index 0000000000..0a20556921
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java
@@ -0,0 +1,157 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ * Jonas - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.model;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.fragment.MModelFragment;
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+/**
+ * Helper to merge two Fragments Files into one.
+ *
+ * @author Jonas
+ *
+ */
+public class FragmentMergeHelper {
+
+	/**
+	 * Merges a source {@link MModelFragments} into a target. Adds missing
+	 * imports. Replaces existing imports, which get added as elements by those.
+	 *
+	 * @param sourceFragments
+	 *            an {@link MModelFragments}
+	 * @param targetFragments
+	 *            an {@link MModelFragments}
+	 */
+	public static void merge(MModelFragments sourceFragments, MModelFragments targetFragments) {
+		targetFragments.getFragments().addAll(sourceFragments.getFragments());
+		final List<MApplicationElement> sourceImports = new ArrayList<MApplicationElement>();
+
+		consolidateImports(targetFragments);
+
+		sourceImports.addAll(sourceFragments.getImports());
+		for (final MApplicationElement sourceImport : sourceImports) {
+
+			boolean doImport = true;
+			for (final MApplicationElement targetImport : targetFragments.getImports()) {
+				if (haveSameID(sourceImport, targetImport)) {
+					doImport = false;
+					changeReferenceToExistingElement(targetFragments.getFragments(), targetImport, sourceImport);
+					break;
+				}
+
+			}
+			if (doImport) {
+				targetFragments.getImports().add(sourceImport);
+			}
+
+		}
+
+	}
+
+	/**
+	 * Replaces imports by elements which got imported.
+	 *
+	 * @param targetFragments
+	 */
+	private static void consolidateImports(MModelFragments targetFragments) {
+		final List<MModelFragment> fragments = targetFragments.getFragments();
+		for (final MModelFragment fragment : fragments) {
+			final List<MApplicationElement> elements = fragment.getElements();
+			for (final MApplicationElement element : elements) {
+				final MApplicationElement previousImport = getPreviousImport(element, targetFragments);
+				if (previousImport != null) {
+					changeReferenceToExistingElement(targetFragments.getFragments(), element, previousImport);
+				}
+			}
+		}
+
+	}
+
+
+	/**
+	 * Finds imports which have the same ID as an element which got imported.
+	 *
+	 * @param element
+	 *            The {@link MApplicationElement} to search for in the imports
+	 * @param targetFragments
+	 *            The {@link MModelFragments} to search in
+	 * @return The existing import or null if there is none.
+	 */
+	private static MApplicationElement getPreviousImport(MApplicationElement element, MModelFragments targetFragments) {
+
+		final List<MApplicationElement> imports = targetFragments.getImports();
+		for (final MApplicationElement imported : imports) {
+			if (haveSameID(element, imported)) {
+				return imported;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * @param fragments
+	 *            The {@link MModelFragments} to search for existing references
+	 * @param target
+	 *            The element to link to
+	 * @param source
+	 *            The existing element to unlink
+	 */
+	private static void changeReferenceToExistingElement(List<MModelFragment> fragments, MApplicationElement target,
+			MApplicationElement source) {
+		final Collection<Setting> settings = EcoreUtil.UsageCrossReferencer.find((EObject) source, fragments);
+		for (final Setting setting : settings) {
+			if (setting.getEStructuralFeature().isMany()) {
+				@SuppressWarnings("unchecked")
+				final List<MApplicationElement> list = (List<MApplicationElement>) setting.getEObject()
+				.eGet(setting.getEStructuralFeature());
+				list.remove(source);
+				list.add(target);
+			} else {
+				setting.getEObject().eSet(setting.getEStructuralFeature(), target);
+			}
+		}
+		EcoreUtil.delete((EObject) source);
+
+	}
+
+	/**
+	 *
+	 * @param firstElement
+	 *            an {@link MApplicationElement}
+	 * @param secondElement
+	 *            an {@link MApplicationElement}
+	 * @return whether both elements have a non-empty and non-null ID and the
+	 *         IDs are equal
+	 */
+	public static boolean haveSameID(MApplicationElement firstElement, MApplicationElement secondElement) {
+
+		if (firstElement.getElementId() == null || secondElement.getElementId() == null) {
+			return false;
+		}
+		if (firstElement.getElementId().isEmpty() || secondElement.getElementId().isEmpty()) {
+			return false;
+		}
+		if (firstElement.getElementId().equals(secondElement.getElementId())) {
+			return true;
+		}
+		return false;
+	}
+
+}
diff --git a/tests/org.eclipse.e4.tools.test/.classpath b/tests/org.eclipse.e4.tools.test/.classpath
new file mode 100644
index 0000000000..098194ca4b
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.test/.classpath
@@ -0,0 +1,7 @@
+<?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/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/org.eclipse.e4.tools.test/.project b/tests/org.eclipse.e4.tools.test/.project
new file mode 100644
index 0000000000..907fbfb398
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.test/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.test</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..f548abbf0b
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..55e5fb83ac
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,425 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.launching.prefs b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000000..3bb235278e
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..020dd2aa65
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=false
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=false
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=true
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.api.tools.prefs b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000000..e4e3c0071e
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,97 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.core.prefs b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..f29e940a00
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..0bbee3c4b8
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..c765b644dc
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test
+Bundle-SymbolicName: org.eclipse.e4.tools.test
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: org.eclipse.e4.tools;bundle-version="4.5.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.junit;bundle-version="4.0.0",
+ org.eclipse.e4.core.contexts;bundle-version="1.3.100"
+Export-Package: org.eclipse.e4.tools.test;version="1.0.0";x-internal:=true
diff --git a/tests/org.eclipse.e4.tools.test/build.properties b/tests/org.eclipse.e4.tools.test/build.properties
new file mode 100644
index 0000000000..34d2e4d2da
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.test/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java b/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java
new file mode 100644
index 0000000000..75604d19eb
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java
@@ -0,0 +1,218 @@
+package org.eclipse.e4.tools.test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.e4.internal.tools.wizards.model.FragmentMergeHelper;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
+import org.junit.Before;
+import org.junit.Test;
+
+public class FragmentMergeHelperTest {
+
+	private static final String TESTID = "commandID"; //$NON-NLS-1$
+	private static final String OTHERTESTID = "anotherID"; //$NON-NLS-1$
+	private MModelFragments sourceFragments;
+	private MModelFragments targetFragments;
+
+	@Before
+	public void setUpFragments() {
+		sourceFragments = MFragmentFactory.INSTANCE.createModelFragments();
+		targetFragments = MFragmentFactory.INSTANCE.createModelFragments();
+	}
+
+	@Test
+	public void testMergeEmptyFragments() {
+		FragmentMergeHelper.merge(sourceFragments, targetFragments);
+		assertTrue(sourceFragments.getFragments().isEmpty());
+		assertTrue(targetFragments.getFragments().isEmpty());
+	}
+
+	@Test
+	public void testMergeHandlerWithoutCommandEmptyTarget() {
+		final MHandler existingHandler = addHandler(sourceFragments);
+
+		FragmentMergeHelper.merge(sourceFragments, targetFragments);
+
+		assertTrue(sourceFragments.getFragments().isEmpty());
+		final MApplicationElement handler = targetFragments.getFragments().get(0).getElements().get(0);
+		assertSame(existingHandler, handler);
+	}
+
+	private MHandler addHandler(MModelFragments sourceFragments) {
+		final MStringModelFragment modelFragment = MFragmentFactory.INSTANCE.createStringModelFragment();
+		final MHandler testHandler = MCommandsFactory.INSTANCE.createHandler();
+		modelFragment.getElements().add(testHandler);
+		sourceFragments.getFragments().add(modelFragment);
+		return testHandler;
+	}
+
+	private MCommand addCommandToImports(MModelFragments sourceFragments) {
+		final MCommand command = createCommand();
+		sourceFragments.getImports().add(command);
+		return command;
+	}
+
+	private MCommand createCommand() {
+		final MCommand command = MCommandsFactory.INSTANCE.createCommand();
+		command.setElementId(TESTID);
+		return command;
+	}
+
+	@Test
+	public void testMergeHandlerWithCommandEmptyTarget() {
+		final MHandler existingHandler = addHandler(sourceFragments);
+		final MCommand existingCommand = addCommandToImports(sourceFragments);
+
+		existingHandler.setCommand(existingCommand);
+
+		FragmentMergeHelper.merge(sourceFragments, targetFragments);
+		assertTrue(sourceFragments.getFragments().isEmpty());
+
+		final MHandler handler = (MHandler) targetFragments.getFragments().get(0).getElements().get(0);
+		assertSame(existingHandler, handler);
+		assertTrue(targetFragments.getImports().contains(existingCommand));
+		assertSame(existingCommand, handler.getCommand());
+	}
+
+	@Test
+	public void testMergeHandlerWithCommandExistingImport() {
+		final MHandler existingHandler = addHandler(sourceFragments);
+		final MCommand existingCommand = addCommandToImports(sourceFragments);
+
+		existingHandler.setCommand(existingCommand);
+
+		final MCommand existingImport = addCommandToImports(targetFragments);
+
+		FragmentMergeHelper.merge(sourceFragments, targetFragments);
+		assertTrue(sourceFragments.getFragments().isEmpty());
+
+		final MHandler handler = (MHandler) targetFragments.getFragments().get(0).getElements().get(0);
+		assertSame(existingHandler, handler);
+		assertFalse(targetFragments.getImports().contains(existingCommand));
+		assertTrue(targetFragments.getImports().contains(existingImport));
+		assertSame(existingImport, handler.getCommand());
+	}
+
+	@Test
+	public void testMergeCommandWithExistingImport() {
+		final MCommand existingCommand = addCommand(sourceFragments);
+
+		final MHandler existingHandler = addHandler(targetFragments);
+		final MCommand existingImport = addCommandToImports(targetFragments);
+		existingHandler.setCommand(existingImport);
+
+
+		FragmentMergeHelper.merge(sourceFragments, targetFragments);
+		assertTrue(sourceFragments.getFragments().isEmpty());
+
+		final MHandler handler = (MHandler) targetFragments.getFragments().get(0).getElements().get(0);
+		final MCommand command = (MCommand) targetFragments.getFragments().get(1).getElements().get(0);
+		assertSame(existingCommand, command);
+		assertSame(command, handler.getCommand());
+		assertSame(existingHandler, handler);
+		assertTrue(targetFragments.getImports().isEmpty());
+	}
+
+	private MCommand addCommand(MModelFragments fragments) {
+		final MStringModelFragment modelFragment = MFragmentFactory.INSTANCE.createStringModelFragment();
+		final MCommand command = createCommand();
+		modelFragment.getElements().add(command);
+		sourceFragments.getFragments().add(modelFragment);
+		return command;
+	}
+
+	@Test
+	public void testhaveSameIDWithFirstNullID(){
+		final MApplicationElement firstElement = MCommandsFactory.INSTANCE.createCommand();
+		final MApplicationElement secondElement = MCommandsFactory.INSTANCE.createCommand();
+
+		firstElement.setElementId(null);
+		secondElement.setElementId(TESTID);
+		assertFalse(FragmentMergeHelper.haveSameID(firstElement, secondElement));
+
+	}
+
+	@Test
+	public void testhaveSameIDWithSecondNullID(){
+		final MApplicationElement firstElement = MCommandsFactory.INSTANCE.createCommand();
+		final MApplicationElement secondElement = MCommandsFactory.INSTANCE.createCommand();
+
+		firstElement.setElementId(TESTID);
+		secondElement.setElementId(null);
+		assertFalse(FragmentMergeHelper.haveSameID(firstElement, secondElement));
+	}
+
+	@Test
+	public void testhaveSameIDWithBothNullID(){
+		final MApplicationElement firstElement = MCommandsFactory.INSTANCE.createCommand();
+		final MApplicationElement secondElement = MCommandsFactory.INSTANCE.createCommand();
+
+		firstElement.setElementId(null);
+		secondElement.setElementId(null);
+		assertFalse(FragmentMergeHelper.haveSameID(firstElement, secondElement));
+	}
+
+	@Test
+	public void testhaveSameIDWithFirstEmptyID(){
+		final MApplicationElement firstElement = MCommandsFactory.INSTANCE.createCommand();
+		final MApplicationElement secondElement = MCommandsFactory.INSTANCE.createCommand();
+
+		firstElement.setElementId(""); //$NON-NLS-1$
+		secondElement.setElementId(TESTID);
+		assertFalse(FragmentMergeHelper.haveSameID(firstElement, secondElement));
+
+	}
+
+	@Test
+	public void testhaveSameIDWithSecondEmptyID(){
+		final MApplicationElement firstElement = MCommandsFactory.INSTANCE.createCommand();
+		final MApplicationElement secondElement = MCommandsFactory.INSTANCE.createCommand();
+
+		firstElement.setElementId(TESTID);
+		secondElement.setElementId(""); //$NON-NLS-1$
+		assertFalse(FragmentMergeHelper.haveSameID(firstElement, secondElement));
+	}
+
+	@Test
+	public void testhaveSameIDWithBothEmptyID(){
+		final MApplicationElement firstElement = MCommandsFactory.INSTANCE.createCommand();
+		final MApplicationElement secondElement = MCommandsFactory.INSTANCE.createCommand();
+
+		firstElement.setElementId(""); //$NON-NLS-1$
+		secondElement.setElementId(""); //$NON-NLS-1$
+		assertFalse(FragmentMergeHelper.haveSameID(firstElement, secondElement));
+	}
+
+	@Test
+	public void testhaveSameIDWithEqualID(){
+		final MApplicationElement firstElement = MCommandsFactory.INSTANCE.createCommand();
+		final MApplicationElement secondElement = MCommandsFactory.INSTANCE.createCommand();
+
+		firstElement.setElementId(TESTID);
+		secondElement.setElementId(TESTID);
+		assertTrue(FragmentMergeHelper.haveSameID(firstElement, secondElement));
+	}
+
+	@Test
+	public void testhaveSameIDWithNonEqualID(){
+		final MApplicationElement firstElement = MCommandsFactory.INSTANCE.createCommand();
+		final MApplicationElement secondElement = MCommandsFactory.INSTANCE.createCommand();
+
+		firstElement.setElementId(TESTID);
+		secondElement.setElementId(OTHERTESTID);
+		assertFalse(FragmentMergeHelper.haveSameID(firstElement, secondElement));
+	}
+
+
+
+
+
+}

From 1244e99c33f76d5fc768e1f9411f8831c8d02bcc Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Thu, 23 Apr 2015 17:35:03 +0200
Subject: [PATCH 0903/1286] Bug 465271 - Icon enhancement in the application
 model editor

Simplify the icon management (compute automatically the grey image),
search for icon URI if set...

Change-Id: Ib21e4728fc10d52124d4274b9a48c3659e793e3c
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../icons/full/modelelements/tbr/Addons.png   | Bin 543 -> 0 bytes
 .../full/modelelements/tbr/Application.png    | Bin 335 -> 0 bytes
 .../icons/full/modelelements/tbr/Area.gif     | Bin 969 -> 0 bytes
 .../full/modelelements/tbr/Area_vertical.gif  | Bin 937 -> 0 bytes
 .../full/modelelements/tbr/BindingContext.gif | Bin 994 -> 0 bytes
 .../full/modelelements/tbr/BindingTable.png   | Bin 439 -> 0 bytes
 .../modelelements/tbr/CommandParameter.gif    | Bin 1009 -> 0 bytes
 .../icons/full/modelelements/tbr/Dialog.png   | Bin 647 -> 0 bytes
 .../full/modelelements/tbr/DirectMenuItem.gif | Bin 978 -> 0 bytes
 .../full/modelelements/tbr/DirectToolItem.gif | Bin 929 -> 0 bytes
 .../tbr/DynamicMenuContribution.gif           | Bin 962 -> 0 bytes
 .../modelelements/tbr/HandledMenuItem.gif     | Bin 979 -> 0 bytes
 .../modelelements/tbr/HandledToolItem.gif     | Bin 960 -> 0 bytes
 .../icons/full/modelelements/tbr/Menu.gif     | Bin 981 -> 0 bytes
 .../modelelements/tbr/MenuContribution.gif    | Bin 872 -> 0 bytes
 .../icons/full/modelelements/tbr/MenuItem.gif | Bin 941 -> 0 bytes
 .../full/modelelements/tbr/MenuSeparator.gif  | Bin 945 -> 0 bytes
 .../full/modelelements/tbr/ModelFragments.png | Bin 380 -> 0 bytes
 .../full/modelelements/tbr/Parameter.gif      | Bin 877 -> 0 bytes
 .../icons/full/modelelements/tbr/Part.gif     | Bin 942 -> 0 bytes
 .../full/modelelements/tbr/PartDescriptor.gif | Bin 962 -> 0 bytes
 .../modelelements/tbr/PartSashContainer.gif   | Bin 969 -> 0 bytes
 .../tbr/PartSashContainer_vertical.gif        | Bin 937 -> 0 bytes
 .../full/modelelements/tbr/PartStack.gif      | Bin 963 -> 0 bytes
 .../full/modelelements/tbr/Perspective.gif    | Bin 953 -> 0 bytes
 .../modelelements/tbr/PerspectiveStack.gif    | Bin 964 -> 0 bytes
 .../full/modelelements/tbr/Placeholder.gif    | Bin 893 -> 0 bytes
 .../modelelements/tbr/StringModelFragment.png | Bin 442 -> 0 bytes
 .../icons/full/modelelements/tbr/ToolBar.gif  | Bin 981 -> 0 bytes
 .../modelelements/tbr/ToolBarContribution.gif | Bin 872 -> 0 bytes
 .../modelelements/tbr/ToolBarSeparator.gif    | Bin 989 -> 0 bytes
 .../full/modelelements/tbr/ToolControl.gif    | Bin 956 -> 0 bytes
 .../modelelements/tbr/TrimContribution.gif    | Bin 872 -> 0 bytes
 .../icons/full/modelelements/tbr/Window.gif   | Bin 945 -> 0 bytes
 .../full/modelelements/tbr/WindowTrim.gif     | Bin 945 -> 0 bytes
 .../full/modelelements/tbr/WizardDialog.png   | Bin 1444 -> 0 bytes
 .../component/AbstractComponentEditor.java    | 204 ++++++++++++++---
 .../emf/ui/internal/ResourceProvider.java     |  38 +---
 .../common/ComponentLabelProvider.java        |  20 +-
 .../emf/ui/internal/common/ModelEditor.java   | 209 +++++++++---------
 .../common/component/AddonsEditor.java        |  35 ++-
 .../common/component/ApplicationEditor.java   |  96 ++++----
 .../internal/common/component/AreaEditor.java |  92 ++++----
 .../component/BindingContextEditor.java       |  33 ++-
 .../common/component/BindingTableEditor.java  |  43 ++--
 .../common/component/CategoryEditor.java      |  21 +-
 .../common/component/CommandEditor.java       |  45 ++--
 .../component/CommandParameterEditor.java     |  25 +--
 .../common/component/CompositePartEditor.java |  88 ++++----
 .../component/CoreExpressionEditor.java       |  19 +-
 .../common/component/DefaultEditor.java       |   3 +-
 .../common/component/DialogEditor.java        |  15 +-
 .../component/DirectMenuItemEditor.java       |  38 ++--
 .../component/DirectToolItemEditor.java       |  33 +--
 .../DynamicMenuContributionEditor.java        |  39 ++--
 .../component/HandledMenuItemEditor.java      |  29 +--
 .../component/HandledToolItemEditor.java      |  29 +--
 .../common/component/HandlerEditor.java       |  36 +--
 .../common/component/KeyBindingEditor.java    |  58 ++---
 .../component/MenuContributionEditor.java     |  69 +++---
 .../internal/common/component/MenuEditor.java | 102 ++++-----
 .../common/component/MenuItemEditor.java      |  89 ++++----
 .../common/component/MenuSeparatorEditor.java |  18 +-
 .../component/ModelFragmentsEditor.java       |  29 ++-
 .../common/component/ParameterEditor.java     |  27 ++-
 .../component/PartDescriptorEditor.java       |  72 +++---
 .../internal/common/component/PartEditor.java |  94 ++++----
 .../component/PartSashContainerEditor.java    |  76 +++----
 .../common/component/PartStackEditor.java     |  66 +++---
 .../common/component/PerspectiveEditor.java   |  83 +++----
 .../component/PerspectiveStackEditor.java     |  46 ++--
 .../common/component/PlaceholderEditor.java   |  44 ++--
 .../common/component/StringModelFragment.java |  39 ++--
 .../component/ToolBarContributionEditor.java  |  68 +++---
 .../common/component/ToolBarEditor.java       |  52 ++---
 .../component/ToolBarSeparatorEditor.java     |  34 +--
 .../common/component/ToolControlEditor.java   |  52 ++---
 .../common/component/TrimBarEditor.java       |  48 ++--
 .../component/TrimContributionEditor.java     |  52 ++---
 .../common/component/WindowEditor.java        | 101 ++++-----
 .../common/component/WizardDialogEditor.java  |  14 +-
 .../dialogs/FindImportElementDialog.java      |  10 +-
 .../FindParentReferenceElementDialog.java     |  16 +-
 .../dialogs/SharedElementsDialog.java         |   8 +-
 .../component/virtual/VApplicationAddons.java |   6 -
 .../virtual/VApplicationCategoriesEditor.java |  36 ++-
 .../virtual/VBindingTableEditor.java          |  24 +-
 .../component/virtual/VCommandEditor.java     |   7 -
 .../component/virtual/VHandlerEditor.java     |   7 -
 .../virtual/VItemParametersEditor.java        |   6 -
 .../virtual/VMenuContributionsEditor.java     |  24 +-
 .../common/component/virtual/VMenuEditor.java |  33 ++-
 .../virtual/VModelFragmentsEditor.java        |   7 -
 .../virtual/VModelImportsEditor.java          |  35 ++-
 .../component/virtual/VPartDescriptor.java    |  39 ++--
 .../virtual/VPerspectiveControlEditor.java    |  26 +--
 .../virtual/VRootBindingContexts.java         |  25 +--
 .../component/virtual/VSnippetsEditor.java    |   7 -
 .../virtual/VToolBarContributionsEditor.java  |   7 -
 .../virtual/VTrimContributionsEditor.java     |   7 -
 .../virtual/VWindowControlEditor.java         |   7 -
 .../component/virtual/VWindowEditor.java      |  29 +--
 .../virtual/VWindowSharedElementsEditor.java  |  41 ++--
 .../component/virtual/VWindowTrimEditor.java  |   7 -
 104 files changed, 1336 insertions(+), 1601 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Addons.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Application.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Area.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Area_vertical.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/BindingContext.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/BindingTable.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/CommandParameter.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Dialog.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectMenuItem.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectToolItem.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DynamicMenuContribution.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledMenuItem.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledToolItem.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Menu.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuContribution.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuItem.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuSeparator.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ModelFragments.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Parameter.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Part.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartDescriptor.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer_vertical.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartStack.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Perspective.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PerspectiveStack.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Placeholder.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/StringModelFragment.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBar.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarContribution.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarSeparator.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolControl.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/TrimContribution.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Window.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/WindowTrim.gif
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/WizardDialog.png

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Addons.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Addons.png
deleted file mode 100644
index 907e837f127daab508a9abf905b27ad74779346e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3LP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igY+6dMj*
zM2sf@00E;(L_t(2&qa|xYZGArhoASjq}U5-Pm<nM!Jyb7Q=#Y}ICRi2;M~b}7AL_5
z9SRi(@e2f}WGUz;uuu?*K`heHT0$&hu@Vza6?^TydH*>y*k}Cl3_o~;<BSiBdcmOT
z^DoXeaVoUR=D-~3?xmum*&mN}PF=jS3*Z5?s%BfaRiunWk~JzCwujsG>PXnC1WP3^
zjCDsxDJR%SbxQHPS6F&h0Uw55*C8ZP;GuxBkb&eYZ(Qn)J~UP*mQxIW*eAnfd=$sD
zo;;|4Xm08$9mHY6A&qy*<1xaOYd0JL8;2^<J@MAec)$2dhF!kguB=1#R{B~pOOA-=
z)>B9{21kww02GRdCPNaA5w*>qQ(-V0o{*)1H3sb!#TDA@vHwl=gacl!PA_YG-g6y`
z#W5hyCpubXeR%muJ)Gn>SrnEZ7%ZBUt4P0{`XFsA&auT_;su5fi)BEb&+PO~NjPAo
zI=Gwk&d-g1mlzb&l<Dws;4akUDAxV5I+#2f>)tFTto3tZrqJ54bG70Bny1`b>@P?}
hJ^$1dbf&HW{sCC=$cdRWJZ1m@002ovPDHLkV1lCq=h*-N

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Application.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Application.png
deleted file mode 100644
index f4665b36ecaa9427030280927d047b0d18b4824a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 335
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf67>k44ofy`glX(f`FeQ1ryD<E3
z??1C2$m1;Vh%9Dc;1&j9Muu5)B!GhKC7!;n?6=rCM8pi^dhUk<g)V!#IEHAPZ@swC
zkJ(YA^<jRyuK+Kngbh=;Z^4dzj0xLku{1tpHDGCVQ1<*LSiv-}!9iewCkIE?t#>?&
z%qMg$HGU-ie9q4FqScT72hW`+6H~{3qOjX<V(B$?|L51uuf}el`0LX7pE+yiE$hGc
ze0ir;b``Jq3hs9YPv}ZiGyFEX^hi8<;!Vec3}+@9{opyAEup5c_?$%JBF;+vAK4LS
z^0qv<pe&(hb>=``idpmRgm2d$s<y0u@VltJFvNzBubK60bam;KmnEBiUNSS%y}BxQ
cndmNgiPip<>8;Bof!<^AboFyt=akR{07I{U-2eap

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Area.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Area.gif
deleted file mode 100644
index 94bdda3e6dffde4cc34b19432c60a37f5c2d489f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 969
zcmV;)12+6eNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000Q40RIUbNU)&5O$ZYzR46bLx`z)hL4=q|
zphR{U*;PW95#uF+lsK|$*G`g1lI<u7jD*geOLvc2zH}E!pd)nf;Jtgd2&c}SjRYz}
z7q4i%L`03oQzXz3x_MCN6?z(Vo*{vP(AC>oFDuurg9QFTcdzWdv1ZHu5y%G}zPI?=
r!hOp}U><b(^ySNUH}77)0`K6>s}Ij$!gmDLS<JX`V}p<h1_S^*mqydp

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Area_vertical.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Area_vertical.gif
deleted file mode 100644
index f6da4c7a90ed58ccc318b363866fc11a9d7c8eff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 937
zcmV;a16KS;Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000Pv0RIUbNU)$mf{GkPqI4<KCV_SC<l*y2
zkfDSN8$SG32c5@{AU$rZqfZ~cd-dkUgXfMNJ9HyUo=my2<;$4)W~zMWuH8+D`f{S&
z+4CnyJQFJxO0?*aq)L}YhMWo$sL7!<T~_5N6Dv!tICaM3>2oVdp)|=FJu6nNS&0+}
LU2K%mVL$*oB|pUA

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/BindingContext.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/BindingContext.gif
deleted file mode 100644
index 1d6aefeb4d86cfc8e4d568e91d4ac0231da43dec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 994
zcmV<810DQFNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01yBW000QT0R8=AB83W-EL^yZQTM80Lw}1FHLAqP
z)2Uau$f(=M&>s_m1`#S8LndNGe|k8ooT5^l9+c|-$()Hsj2W5rUZ$KmlZ-E6Va(+8
zHz(%5EJzVLf)uIJmO1|97|k*h%O_D+vec8~kImGXRHj&wX^)M+HR_TvTAS?O6rT3h
z_$#B%&ar3D?C>O8X0AF!=hDSPWUsJcdtm&1Q3oh+IzWdFfAQBPtsg*${Opz4#b46T
Qpp*I=O}eyce*pmiJH6cJC;$Ke

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/BindingTable.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/BindingTable.png
deleted file mode 100644
index d572b27c76c114a33182dfedf0354618765b5812..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 439
zcmV;o0Z9IdP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igY+6c-1G
zEqjju00BEmL_t(2&wbHBOH^SL#_`|Gy>S;qwwcJJXca*q2!SPuZdz!#30g!!(84}O
zE?h~gwz=>l_yr0wMg%2r5e15i!YM;r1Wk?H`@XM>8L`FCIg7J-p8t6cr<VM`a^Ag2
z^YKa)ML`r)f}j$&o{dZ19{x>(d%2tB#3tLqsjKe~=9C3F5qAb`@2Ywk0@elyZY$3O
zOnYw%th)<-oe`o;OJ-diY)Eof|0QH5Y?$a1db52>s3dhQJ6f6!-1NqlVL$yb-RKLF
zUB5lmv2W9P4`sglU}&L#<|n%zd*!2HqrQ0Qz%BQDeO~Vo_6%V`>5)mZW|W@bLXi_B
z*KK1_Wk~}a(Te-p-CFXxRgN7sJ{vcp@WYP6HJ2P~muq{q-n(yPmq#0`BNvNI{b*jh
hx$4|;_;%QNZ~_zhl$N_+B8C6}002ovPDHLkV1kwLv)ljx

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/CommandParameter.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/CommandParameter.gif
deleted file mode 100644
index 486f025172d4a3ba0e2f3483f9cf115b734fc193..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1009
zcmV<N0}lL0Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008v>EC2ui01yBW000Qi0PEFLHmZ*wL8+z*T)6Pnpjpgfxw2G<
z7(;>8{*-dYFW4wnr3i()NJ){UXaD*IdqhbRsEc?6`APQgpTA|2C=I&k#ta!@HUC|!
zBlBXLG-iPQTju7Bp+6Tt-PvR8pRzo75b;TMQ5+vZ%a+NZgUC>!d!8;iIwYu`FhG$Y
zEpjA?khY5pt&Q?Sl-9jA^+s`;gs5#jQ}*~F;m5BZ61)PD#LHI(i9W@F2NxFD=G{Gf
f_sZ-83|X6HeW;P#6-?N0J#B4}AZc?KZ$JP${o?6n

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Dialog.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Dialog.png
deleted file mode 100644
index 4a4cbfe0542184c2de194040a9525ea987472d15..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 647
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAP>{XE
z)7O>#9-{!iuHcFIDIdT>t`Q}Ur6n2pMGPy~o$&w)@st3CTvCgZi!uvJGV}8oggF(J
zf#O^sap(Mk%A(Blj1q=5{Aa9yqI_V{qSQo?QiYPt+*AhB@BExV8BUN)aDG}zd16s2
zLu|o+kaBLY;hDwBIf+1}MGV^yZ0QFIbAW`y6N~aP^U@g(NIz=_im^lVmlh?bGJO5t
z{2HdrIX^cyHLrx>+nH(mfnsbRWg(d*IjIaQ-d$2>U|<aLba4!^=v_M5x{JwCpl!dL
zn#2c&G`1uKsZKUFxq}`lf=7hkFq#<|-Yz+K<cbf^o|7%JwAr|{UPxI4-<_Saef`|T
zgH6j;FZ{PYZi~^e4_zzk_WzGtf8GB4^J2CG63y471Pk|FlUgdGbg0H|d4NXE`mojg
z2NMjwWN*C{F2E8ez|tAncU(D9V$#{Pn|a%1_}YE8M*U@K`}efyW7+Q5teM9oigwC)
zX>PeT#Y=UO#wUiFWS+BWpYPk2TgfuGEf(ZUIKQ?vaR$fA5Uq|Aq6$hq$CJe`y#C6N
zVIoz}<hT4XP$*;V%d*|&w##SU?OA<b-OI2Dz3DgKe_tuUaR1Vp8%<)}u8Vd==)^Gw
ziYO}iEDsjHkhi_@iDZtM^dpOX`3tXR*-o7v_Ai*bf7<!yk?XI&`)i^6`uFLlMMksF
y-qSger`nf1{p7h5_x3;HY^eHbUZuaXQU3M6Z?$EeANqjd&EV<k=d#Wzp$P!BKmJ|-

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectMenuItem.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectMenuItem.gif
deleted file mode 100644
index ad4c980d3a418b060b70bbda2110b73f836f7865..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 978
zcmV;@11<bVNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01yBW000QD0R0IZNU$KmS_l&=tW|K9zK0MY(kd7$
zpC(I?6cqxrCts|BukMMwhp(i_R|Q$wyO?p~9($|`GOI_kW=&=U&FI|8bLT)Y^MVSU
z=j@N1M$QIuL5Gf|Mme55O=>gHO17(4oyn2*uWK}_{-lT<%ZJdvMvW{*Iy6wlt+%(@
zr1^*D3>r3c27YOZQ4*bc&@TO}M`)lVrc9lM`P9|jt1yNoNuG=b(IG-;`~?I6JJ3tl
A+5i9m

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectToolItem.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DirectToolItem.gif
deleted file mode 100644
index 3e30ae05adedb8753829505b5132c37c9b778a48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 929
zcmV;S177?`Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01yBW000Pn0R0IZNU)&6g9sBUR5*!{!-o(bPV(1B
zkfMtiGX|2<#~&R<p+brr8A=Qte`^$}TFJ7dDlu#PiBa^crp;b$a`qA<#-A2N(SioW
z+2-HBHodg?i=rr;Q>QtP7Htz{sTwU<u}00AbBMo5L&A#PI(6bfqDGM_B&v3y!GHie
DG=sin

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DynamicMenuContribution.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/DynamicMenuContribution.gif
deleted file mode 100644
index b2caa8a1d6929d89d9c40ac8160af15017304701..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 962
zcmV;z13mmlNk%w1VGsZi0Ou+I000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW3IP59EC2ui01yBW000P|0R0IZNU$KmS_l&=tW|K9zK0MY(kd7$
zpC(I?6cqxrCts|BukMMwhp(i_R|Q$wyO?p~9($|`GOI_kW=&=U&FI|8bLT)Y^MVQ;
zI&aKCF6hv))W|U@mw{HYNu8Qan=VC)bPbfkwJTR$e^jaZqg9}aTWHh%`SkDKr#}O~
kD8;BTjjFb)(hQW8v@g0=cJsE{E2*$yNv+(Z85|G*JN=N+v;Y7A

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledMenuItem.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledMenuItem.gif
deleted file mode 100644
index 6465845d91b843a0c1e6569d1748f810f8a982b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 979
zcmV;^11$VUNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000QE0RIUbNU$KmS_l&=tW|K9zK0MY(kd7$
zpC(I?6cqxrCts|BukMMwhp(i_R|Q$wyO?p~9($|`GOI_kW=&=U&FIwW2F=c$1I5f6
zI&Y0KF=mL48OQ}4x{GLZ`4Se!3_30Ytz_Gpjm#@pv1sK2vs9pzvuDLjqC}}urcR;6
z3{-KeE*M9SAVsRQr3=9?Pc3ob^hwl}EM5vqa*7U1swq~SMp7)PGL<QnGYbp|06X`*
B&&2=$

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledToolItem.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/HandledToolItem.gif
deleted file mode 100644
index 1a4a743602b0f9db3864f8e8047365280dcbb03e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 960
zcmV;x13&ynNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000P`0RIUbNU)&6g9sBUR5*!{!-o(bPWsnJ
zkfMtiGX|2<=N}zKp+brr8A=SDe`^$}TB*tn8kQ@?tobKK(XX4o)+iHW2B#P?|FkHI
zMl>24UA}~cF%wOUmVZ$cg_|0V%qv*2XypPkCJIzFTEc1(Gl>$VN|`#9{5NTcTen~w
iIf4|a(v~h04RYc1Nz|1r3bCY`VrAh!DpL*y1OPj9Xv9AN

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Menu.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Menu.gif
deleted file mode 100644
index 0153af73a851e4d3c50aea94ec723e20b04a6d60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 981
zcmV;`11kJSNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000QG0RIUbNU)&6g9W2Vp>ie57B6AOm`Std
zO&mG@-awLssnaM`vUL42#w=Pjj0&k(!SWCcnTc%Pz`;mnp3R##<GEY6&d|R!=E_A8
zS0`MQa7Dw36L;vRw`|#nMV%@YYST2<o;`!c6`EG9UawMYBXf=&JbU~E8dRuhpLTHL
z%8lFSU!HdM^6IU}m#;lM|KhZ}N4T)zd-&k|L(>kQK75WJM}C~<Uzp37GiyeOFdzUs
Dy<^|m

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuContribution.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuContribution.gif
deleted file mode 100644
index d24701949ebb222200a7e01aff1ac41993829dca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 872
zcmV-u1DE_qNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000O@0RIUbNU)&6g9sBU{C8#HKwwvZIb;Z^
y;X+M-FltH&F(WXH5e;6s;t|-#iWUiW)O0c=LX8<6l1!-(qQr?bC+b8P5CA)SPM)6t

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuItem.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuItem.gif
deleted file mode 100644
index 790a5017cb0e92de30248b62f93adc8a68f4b7fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 941
zcmV;e15*4)Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000Pz0RIUbNU$KmS_l&=tW|K9zK0MY(kd7$
zpC(I?6cqxrCts|BukMMwhp(i_R|Q$wyO?p~9($|`GOI_kW=&=U&FI|8bLT)Y^MVQ;
zI&aKCF6hv))W|U@mw{HYNu8Qa+texprD)yCbt^#?x5A1QtD@i+r5Ks+LFc8Qq@-};
PMsh2uuHCx=0|Ed$YX-#h

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuSeparator.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/MenuSeparator.gif
deleted file mode 100644
index 52408e3e8ec0b4895caa00804a8232be4dda95fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 945
zcmV;i15W%$Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01yBW000P%0R0IZNU$KmO$ZYz+*B}=zK0MYW-53|
zpC(I?6cqxrC*P%ll<?gfiLd0yN(Cj|yO?p~o_mrCLb6w{rp=m=3N{(UvuDpH1OEvf
zO0=lI8Ay{VT{^JCt*20-b||=_9ZQWI*{vuzWZgP;Uc;^%QV@)~t1i`nDX1qMy0>uA
TrOQ(g&z(DV^Ww!LFdzUs6B)#t

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ModelFragments.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ModelFragments.png
deleted file mode 100644
index ebf5a85efdcc132cb677f9525df038d92368b0a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 380
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf67>k44ofy`glX(f`FeQ1ryD<E3
z??1C2$m1;Vh%9Dc;1&j9Muu5)B!GhKC7!;n?6=rCL?raB7|!nkn!w=c;uxZFzIKAG
zmvf?k>-p~-T1ppJI3|~{-fXbmAh?NZy26bcH+J#gZCt=DkS%!7OT=W-f*;NXKhoYs
zNW|aEHoAJimgl)2*E0XyP4n)rc>FN^?p>n^q92P&!ZOwFuZz=Yn7h43!|g_?sK-H9
z4)=;R>dzk@zGIxcKG32=)Wt!_vD#3eJk`^k<vov}V_Qa2>Vb-+KC5_+iOMc>9~<->
z4r$J7x*Tz!kV%jyV<TIP@4o~Vv%XdVz8mrdLdX8xaItV~uCB7Td;Fg-nq~bKj;4f$
z7lkI#lX&DZKl{k1clw58O?2$r+;}<NUUrE%)8W;o`Gq{vj5G8;=GRV(v#qUTWX*2p
UZZF7`0R|6)r>mdKI;Vst04<@2_W%F@

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Parameter.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Parameter.gif
deleted file mode 100644
index 044d786b007237b711909b28187aefa795682a46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 877
zcmV-z1CsnlNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000O|0RIUbNU)&6g9sBUM3N>GHH8Daxth}p
z;y_PZEDG$F<{?BRAVFFTsqr5Yjj2+mgb0e7OHdFg^_ocuBBE0`5kdUJlV?eS0RaFz
DiiDtY

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Part.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Part.gif
deleted file mode 100644
index 6f86ad5bf3cf35ea3e9c58085a6dad2a63eed633..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 942
zcmV;f15x}(Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01yBW000P!0R8=AB83W-EL^yZQTM80Lw}1FHLAqP
z)2Uau$f(=M&>s_m1`#S8LndNGe|k8oT&YeEN_GEY%AEPHp39UpbK3Mb2WHNh_2&4K
z<MU_CdUE`+DQeUn8-Ht<{<OEoUm2-6?Uk{r&Yst=V7-Fz_oZvtvtRsm!J4y+zbtU$
Q%AM=4uHCzM{RIR7J1#%bjQ{`u

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartDescriptor.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartDescriptor.gif
deleted file mode 100644
index cf28a00e0c03288033f3d5bd6f717ff68c2507d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 962
zcmV;z13mmlNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01yBW000P|0R0IZNU$J5MhFuk{Kv4MB7G1e(qhz*
zU?P40n2b^P%Gbny1rOz0v<Md&b;&#)DoE%a6OCiYki=K0;2?c^)alfzN8g}=fN-i~
z_^)11Kn45c%SqH|zCH!_+?z9$VZAx{_7uEhPfpdMa_rqHXlEW9b@tNQV?)nQ!8!4=
k$eo)d-kgGQ+_`(Fm+#&<1>v}PLs&53H*gFpE*KC1JJht(e*gdg

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer.gif
deleted file mode 100644
index 94bdda3e6dffde4cc34b19432c60a37f5c2d489f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 969
zcmV;)12+6eNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000Q40RIUbNU)&5O$ZYzR46bLx`z)hL4=q|
zphR{U*;PW95#uF+lsK|$*G`g1lI<u7jD*geOLvc2zH}E!pd)nf;Jtgd2&c}SjRYz}
z7q4i%L`03oQzXz3x_MCN6?z(Vo*{vP(AC>oFDuurg9QFTcdzWdv1ZHu5y%G}zPI?=
r!hOp}U><b(^ySNUH}77)0`K6>s}Ij$!gmDLS<JX`V}p<h1_S^*mqydp

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer_vertical.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartSashContainer_vertical.gif
deleted file mode 100644
index f6da4c7a90ed58ccc318b363866fc11a9d7c8eff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 937
zcmV;a16KS;Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000Pv0RIUbNU)$mf{GkPqI4<KCV_SC<l*y2
zkfDSN8$SG32c5@{AU$rZqfZ~cd-dkUgXfMNJ9HyUo=my2<;$4)W~zMWuH8+D`f{S&
z+4CnyJQFJxO0?*aq)L}YhMWo$sL7!<T~_5N6Dv!tICaM3>2oVdp)|=FJu6nNS&0+}
LU2K%mVL$*oB|pUA

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartStack.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PartStack.gif
deleted file mode 100644
index 5d94ef32e76d6c9c6e4a2627e6fff9ab8f658a8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 963
zcmV;!13dgkNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008s=EC2ui01yBW000P}0O<)FNU$J5KUuQ)q1Q%;kTwSWi2L_X
zoS$<T&p{lxiK54Un?i~VNpF+Ce<x3(^rsReJxu=k^<z0xrp%a_=vCs!uOCmDKY8-2
zL{HMbqx|+IReJPjBzlbW<(sOns#L4`8qq^EwX0WrT@leEbg!)0vt|d;`(v-I+qZ82
l(9=_|uDyD9@!GAohaR4~fCC4<L$8kE!-x|bTs$x!06Td?*&F}>

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Perspective.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Perspective.gif
deleted file mode 100644
index 6cc4e83788f4bb0e1ed88d23586218f204cbc864..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 953
zcmV;q14jHuNk%w1VGaNe0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01f~S000P<0RIUbNRSUfY5$~!gSRl8rhkhVKAD1K
zibX)y_$>OD%Agfssg{YP$7i3(Zu<aPq&P*3r;LEK@i7R99=(5|Y+56!4bZ=EK5q^p
z_^%5qc>iktqZewaQ+j~HCEfY&&>*X&29*kf6wskihYS++8P3Yhf29VVHT#e4Kd}U@
b{OhLW>>;NE*;>(J#mW-CTK?{x8xR0Ht2NL;

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PerspectiveStack.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/PerspectiveStack.gif
deleted file mode 100644
index c9dc7d45f580e68f8db1126a62a0bd10f93d1d8b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 964
zcmV;#13UajNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000P~0RIUbNU)&6g9f8Skzxf4moH<^sBr^F
z&cHX2AW`B(%GIr4$)Z)WC{W>)Dp<BaG_$5n#etjJ$(%{E-6ojrM(G@7Zzs>20xz|b
zlr5X2o<&F9yEITzyF5kp;8TPS-6DLF1~O_VrfQgcX~L$-w`gFYc2Vrvi?Xk+TS5c<
mpj8;9AKkis2Igtkub)4^{{H&KGq8@~!-x+fT+G;DKma>i^woL*

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Placeholder.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Placeholder.gif
deleted file mode 100644
index 36c1a4b3b3ab29e79b78d7b3bf8f9d51ca43126c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 893
zcmV-@1A_cVNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01yBW000PD0R0IZNU)&6g9sBU^!M-ILV^DpHFAis
zVZ%nVCLa7}sAETPvkXxj_^%JNlPICh>NAp|99=MD>LMklCBri~agri+#wJ9IT`G0)
TS@2(zCPWQ3e8{w^(|`awG@q^J

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/StringModelFragment.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/StringModelFragment.png
deleted file mode 100644
index 7a2780ba83d114f825cca8e554599a0ee0966e48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 442
zcmV;r0Y(0aP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igY+6dD3e
z>G4ef00BNpL_t(2&wbHBZ%knn#_`{sUO`pM7)cS45)m0zHWC{<8;Oq~79>7}_%eI~
zf(VI)2)l_`5Y1IJ2yN7)Zri!<dn~3I(~W0!lJn0=&i^UG|5N@OAHU7r6zSo$tCK)$
zylzLg<8YBK?z}JtuB;B%vkgseCs2eZktJD*`6BtW)}+*G+&nl29>pP9Aj^`FE!k(k
zA2zNR;X!nSU)E)zC2QNQ<Alod?<I{d_Lw!0WkaPS4yd%uY0niS5BKAkz9f{+S<ts;
zQEl_g_7{!N$XdEiS~g|cmddU7CHJB+Ey-#Zobp+z_R6w)WU_HwSh3f<v-)=V<F&1Y
zJJq(RMp!a1tI!h$-l*KJ#wLf7qgGw=%~LNtGh=hItj0UZM<1NGqGu+5t@G~*)uUXl
kPnTU&FMr;+yExg!U$~KpFSFZFeE<Le07*qoM6N<$f(j45YXATM

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBar.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBar.gif
deleted file mode 100644
index 0153af73a851e4d3c50aea94ec723e20b04a6d60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 981
zcmV;`11kJSNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000QG0RIUbNU)&6g9W2Vp>ie57B6AOm`Std
zO&mG@-awLssnaM`vUL42#w=Pjj0&k(!SWCcnTc%Pz`;mnp3R##<GEY6&d|R!=E_A8
zS0`MQa7Dw36L;vRw`|#nMV%@YYST2<o;`!c6`EG9UawMYBXf=&JbU~E8dRuhpLTHL
z%8lFSU!HdM^6IU}m#;lM|KhZ}N4T)zd-&k|L(>kQK75WJM}C~<Uzp37GiyeOFdzUs
Dy<^|m

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarContribution.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarContribution.gif
deleted file mode 100644
index 81e35f1c5cb794d5041d623fc5a5a7b2c1a4f27e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 872
zcmV-u1DE_qNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000O@0RIUbNU)&6g9sBU{C8{NKw!6kIb;Z^
y;lgQvFiuMdF(WXH5e?qD<q_D&iWUiWoOUuKLX8<6l1!-(qQr?bC+b8P5CA*0BA?U%

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarSeparator.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolBarSeparator.gif
deleted file mode 100644
index 92c10a984c2b4fd43e5408d54db0f723f371bfc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 989
zcmV<310wuKNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW008~~EC2ui01yBW000QO0R0IZNU)$mf&XS4^cO`6l`C0(BrIYk
z&6+oH<oJ67NfM?`a1#FcWsF(0Y8o3-v4Tb742o&kyn&;U%)FcPOeHimFP^(~>kRoz
zW3F5jaZnOwsuS+0xI;s|Wy?m4QbI#ivqDW{?b$PEjuJZZ`t{jXi*4R8NhoEHpFo2O
zLG9D7Zry}-?e_7Pr=7jO_7c_`JlGx{e{tH~Tg<reJ$!Kdp=pOtAHK?#F<VaKFO28U
LphGWQ7!UwEsaD@M

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolControl.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/ToolControl.gif
deleted file mode 100644
index 2c3094933808e930896bac8af10012ec7643539e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 956
zcmV;t14H~rNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000P?0RIUbNU-3*O$ZYzR48!MxQ7rUKHMZQ
z(>Qk+Gir2~N#Lc68#i7ONa^CccNkBiL^(+yq;c?K%7phW=DSD&8;y&{Qy$NsJR1pA
zG;ZEJc}9~aRV2{RxO(*JL8TW}YCS^&1&y=EwX0Wqf&~5<cdx8jd}Y!85y)p8zPI__
e!hOp}pq_F0^6K52Pme%6fCCE_Y_RaafB-wL-^=9y

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/TrimContribution.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/TrimContribution.gif
deleted file mode 100644
index 81e35f1c5cb794d5041d623fc5a5a7b2c1a4f27e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 872
zcmV-u1DE_qNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000O@0RIUbNU)&6g9sBU{C8{NKw!6kIb;Z^
y;lgQvFiuMdF(WXH5e?qD<q_D&iWUiWoOUuKLX8<6l1!-(qQr?bC+b8P5CA*0BA?U%

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Window.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/Window.gif
deleted file mode 100644
index ca9858dfb0c215c5ea1e4b1596fb36ab072ab589..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 945
zcmV;i15W%$Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000P%0RIUbNU)&5IC13Av4dxipFo5RC0f)-
z;3HG2UeVeW4B4}4+rEi=bTHw<h7Ti7toV<Uyq7RzzT_m(<-MCYbKax*Pm?^IKs5=>
zBoCj_qe$^(5@@Mt(xjFIQgZtAC?$cB<mKDSwQIge7PWfyO7b70d1JjY5~ygNzPE7W
T>Qf{zk=?s^@fzGqFdzUsBGt{E

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/WindowTrim.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/WindowTrim.gif
deleted file mode 100644
index ca9858dfb0c215c5ea1e4b1596fb36ab072ab589..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 945
zcmV;i15W%$Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LW00930EC2ui01yBW000P%0RIUbNU)&5IC13Av4dxipFo5RC0f)-
z;3HG2UeVeW4B4}4+rEi=bTHw<h7Ti7toV<Uyq7RzzT_m(<-MCYbKax*Pm?^IKs5=>
zBoCj_qe$^(5@@Mt(xjFIQgZtAC?$cB<mKDSwQIge7PWfyO7b70d1JjY5~ygNzPE7W
T>Qf{zk=?s^@fzGqFdzUsBGt{E

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/WizardDialog.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/tbr/WizardDialog.png
deleted file mode 100644
index 2ad3435ee1be32ee23b3c4bccc2518bbab516623..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1444
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^8|%*@QXy1IsjhTh)Z
zIdkSLTC`~S^5tvRtl7A6<M!>_ckI}4>C&a!w{QRd{~xG$6pV(za0&s-8-))T7#JB!
zg8YJkDI5tfAhAaV^XcvkKVaN)7I;J!GcfQS0b$0e+I-SLLG}_)Usv{fi~>Bu3=eYz
z)xbio5haeLB^mie3@g{2@c;_(lmLZXQj3#|G7CyF^Ya*lITe+G;#?qc=lp`oqRjM+
z5{5PWXRLstd|=U{)I^X{g_6wNR0h-U{G31;PLND+ep*R+Vo@qXY{7q!a&EBUnZ?OD
zi9n@A4BHQE=?4mPfP}*ni}Et_(isj&KWhhyu|xEi7A2=LeEr}28m7!SKQ}iuuY}>-
znQ8lhVr(E~A(<sPsSGRLT~Y^%gnPO;hDc0}J=@6FpuoX$;k1s|mw*3@7tie2Xt-_r
zZpMFXSH552San56@p(yiy2G-$Hr{KNxW(~pJ+aZ$A+0s7z_H$vHU3g+L-*kcoNC(y
gHP*gX(hhKu3t7p1vQqd;63_|;Pgg&ebxsLQ0Ac2#zW@LL

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index ef9f4a43b5..7d9b8c1e12 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -13,7 +13,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common.component;
 
-import java.net.MalformedURLException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.util.Collections;
 import java.util.List;
@@ -23,6 +24,7 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.services.nls.Translation;
 import org.eclipse.e4.core.services.translation.TranslationService;
@@ -36,6 +38,7 @@
 import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.tools.services.impl.ResourceBundleTranslationProvider;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -58,9 +61,10 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
 
 public abstract class AbstractComponentEditor {
+	private static final String GREY_SUFFIX = "Grey"; //$NON-NLS-1$
+
 	private static final String CSS_CLASS_KEY = "org.eclipse.e4.ui.css.CssClassName"; //$NON-NLS-1$
 
 	private final WritableValue master = new WritableValue();
@@ -92,8 +96,6 @@ public abstract class AbstractComponentEditor {
 	@Optional
 	private ProjectOSGiTranslationProvider translationProvider;
 
-	/** An imageregistry for dynamic component images (see bug #403583) */
-	private static ImageRegistry componentImages = new ImageRegistry();
 
 	private Composite editorControl;
 
@@ -116,7 +118,7 @@ protected void setElementId(Object element) {
 			final MApplicationElement el = (MApplicationElement) element;
 			if (el.getElementId() == null || el.getElementId().trim().length() == 0) {
 				el.setElementId(Util.getDefaultElementId(((EObject) getMaster().getValue()).eResource(), el,
-					getEditor().getProject()));
+						getEditor().getProject()));
 			}
 		}
 	}
@@ -132,36 +134,187 @@ public ImageDescriptor createImageDescriptor(String key) {
 		return ImageDescriptor.createFromImage(createImage(key));
 	}
 
+	private ImageRegistry getComponentImages() {
+		return editor.getComponentImages();
+	}
+
 	/**
 	 * Get the image described in element if this is a MUILabel
 	 *
-	 * @param element the element in tree to be displayed
-	 * @return image of element if iconUri is correct, else returns null
+	 * @param element
+	 *            the element in tree to be displayed
+	 * @return image of element if iconUri is not empty (returns bad image if
+	 *         bad URI), else returns null
 	 */
-	public Image getImageFromIconURI(Object element) {
+	public Image getImageFromIconURI(MUILabel element) {
+
 		Image img = null;
+		// Returns only an image if there is a non empty Icon URI
+		final String iconUri = element.getIconURI();
+		if (iconUri != null && iconUri.length() > 0) {
+			final boolean greyVersion = shouldBeGrey(element);
+			// Is this image already loaded ?
+			img = getImage(iconUri, greyVersion);
+			if (img == null) {
+				// No image registered yet in ImageRegistry...
+				final ImageDescriptor desc = getImageDescriptorFromUri(iconUri);
+
+				// Can now add this image in the image registry
+				getComponentImages().put(iconUri, desc);
+				img = getImage(iconUri, greyVersion);
+			}
+		}
+
+		return img;
+	}
+
+	/** @return true if the image of this element should be displayed in grey*/
+	private boolean shouldBeGrey(Object element)
+	{
+		// It is grey if a MUIElement is not visible or not rendered
+		// It is not grey if this is not a MUIElement or if it is rendered and
+		// visible.
+		return element instanceof MUIElement
+				&& !(((MUIElement) element).isToBeRendered() && ((MUIElement) element).isVisible());
+	}
+
+	/**
+	 *
+	 * @param key
+	 *            the key of image (can be a constants from ResourceProvider or
+	 *            a platform:/ uri location
+	 * @param grey
+	 *            if true returns the grey version if original image exists
+	 * @return the image with a give key or grey version.
+	 */
+	private Image getImage(String key, boolean grey) {
+
+		// try to get image directly with right key and grey value
+		Image result = getComponentImages().get(key + (grey ? GREY_SUFFIX : "")); //$NON-NLS-1$
+
+		// may be image not yet created
+		if (result == null) {
+			result = getComponentImages().get(key);
+			// If no image found, ask the resource pool to create it...
+			if (result == null && !key.startsWith("platform:")) { //$NON-NLS-1$
+				try {
+					result = createImage(key);
+				} catch (final Exception e) {
+				}
+				if (result != null) {
+					getComponentImages().put(key, result);
+				}
+			}
+
+			// Create the grey version of image and put it in registry
+			if (result != null && grey) {
+				final Image greyImg = new Image(result.getDevice(), result, SWT.IMAGE_GRAY);
+				getComponentImages().put(key + GREY_SUFFIX, greyImg);
+				result = greyImg;
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Get image from an element Implements algorithm described in bug #465271
+	 *
+	 * @param element
+	 *            the Application Element
+	 * @param key
+	 *            the element image key if no icon URI
+	 * @return Image or null if nothing found
+	 */
+	public Image getImage(Object element, String key) {
+		Image result = null;
+
 		if (element instanceof MUILabel) {
-			final String iconUri = ((MUILabel) element).getIconURI();
-			if (iconUri != null) {
-				img = componentImages.get(iconUri);
-				if (img == null) {
+			result = getImageFromIconURI((MUILabel) element);
+		}
+
+		if (result == null) {
+			// This is a model element with a key or a MUILabel without IconUri
+			final boolean greyVersion = shouldBeGrey(element);
+			result = getImage(key, greyVersion);
+		}
+
+		return result;
+
+	}
+
+	/**
+	 * Create a readable ImageDescriptor behind URI.
+	 *
+	 * @param uri
+	 * @return
+	 */
+	private ImageDescriptor getImageDescriptorFromUri(String uri) {
+
+		// SEVERAL CASES are possible here :
+		// * uri = platform:/plugin/myplugin/icons/image.gif
+		// * uri = platform:/resource/myplugin/icons/image.gif
+		// * uri : platform:/plugin/myplugin/$nl$/icons/image.gif
+
+		// We must check if file exists before creating the ImageDescriptor
+		// because ImageRegistry will throw and print a DeviceResourceException
+		// With the E4 editors, the platform:/plugin/ is set for
+		// runtime, but the file can be in workspace during development In this
+		// case, we must rather use platform:/resource/.
+		// Used ideas from the ImageTooltip code around line 70 to fix this
+
+		ImageDescriptor result = null;
+		InputStream stream = null;
+		URL url = null;
+
+		try {
+			final URL uri2url = new URL(uri);
+			url = FileLocator.toFileURL(uri2url);
+			stream = url.openStream();
+		} catch (final IOException e) {
+			// If no stream behind this URL, it is probably a platform:/plugin
+			// which must be found as a platform:/resource (this case occurs in
+			// the model editor when icon URI are set using the dialog)
+			url = null;
+			if (uri.startsWith("platform:/plugin")) //$NON-NLS-1$
+			{
+				try {
+					// Try to get it using 'platform:/resource'
+					final URL resUrl = new URL(uri.replace("platform:/plugin", "platform:/resource")); //$NON-NLS-1$//$NON-NLS-2$
+					url = FileLocator.toFileURL(resUrl);
+					stream = url.openStream();
+
+				} catch (final IOException e2) {
+					// No file behind, may be this is a $nl$ or a $ws$ path..
+					// must use find on FileLocator which does not deal with
+					// platform:/resource !
 					try {
-						final URL url = new URL(iconUri);
-						final ImageDescriptor idesc = ImageDescriptor
-							.createFromURL(url);
-						componentImages.put(iconUri, idesc);
-						img = componentImages.get(iconUri);
-					} catch (final MalformedURLException e) {
-						// Nothing to do at this.. no image
+						url = FileLocator.find(new URL(uri));
+						stream = url.openStream();
+					} catch (final IOException ex) {
+						url = null;
+						// Can't do more !
 					}
 				}
+			}
+		}
 
+		if (stream != null) {
+			try {
+				stream.close();
+			} catch (final IOException ex) {
 			}
 		}
-		return img;
+
+		if (url != null) {
+			result = ImageDescriptor.createFromURL(url);
+		}
+
+		return result;
 	}
 
-	public abstract Image getImage(Object element, Display display);
+	public Image getImage(Object element) {
+		return null;
+	}
 
 	public abstract String getLabel(Object element);
 
@@ -191,8 +344,8 @@ public List<Action> getActions(Object element) {
 	}
 
 	/**
-	 * Translates an input <code>String</code> using the current {@link ResourceBundleTranslationProvider} and
-	 * <code>locale</code> from
+	 * Translates an input <code>String</code> using the current
+	 * {@link ResourceBundleTranslationProvider} and <code>locale</code> from
 	 * the {@link TranslationService}.
 	 *
 	 * @param string
@@ -285,7 +438,7 @@ public void controlResized(ControlEvent e) {
 	}
 
 	protected void createContributedEditorTabs(CTabFolder folder, EMFDataBindingContext context, WritableValue master,
-		Class<?> clazz) {
+			Class<?> clazz) {
 		final List<AbstractElementEditorContribution> contributionList = editor.getTabContributionsForClass(clazz);
 
 		for (final AbstractElementEditorContribution eec : contributionList) {
@@ -320,7 +473,8 @@ protected void enableIdGenerator(EAttribute attSource, EAttribute attId, Control
 		if (getEditor().isAutoCreateElementId()) {
 			generator = new IdGenerator();
 			generator.bind(getMaster(), EMFEditProperties.value(getEditingDomain(), attSource),
-				EMFEditProperties.value(getEditingDomain(), attId), control);
+					EMFEditProperties.value(getEditingDomain(), attId), control);
 		}
 	}
+
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
index dffdc5d04f..a98874283a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
@@ -56,42 +56,6 @@ public class ResourceProvider extends BasicResourceProvider {
 	public static final String IMG_WindowTrim = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.WindowTrim"; //$NON-NLS-1$
 	public static final String IMG_WizardDialog = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.WizardDialog"; //$NON-NLS-1$
 
-	public static final String IMG_Tbr_Addons = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Addons"; //$NON-NLS-1$
-	public static final String IMG_Tbr_Application = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Application"; //$NON-NLS-1$
-	public static final String IMG_Tbr_Area_vertical = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Area_vertical"; //$NON-NLS-1$
-	public static final String IMG_Tbr_Area = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Area"; //$NON-NLS-1$
-	public static final String IMG_Tbr_BindingContext = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.BindingContext"; //$NON-NLS-1$
-	public static final String IMG_Tbr_BindingTable = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.BindingTable"; //$NON-NLS-1$
-	public static final String IMG_Tbr_CommandParameter = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.CommandParameter"; //$NON-NLS-1$
-	public static final String IMG_Tbr_Dialog = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Dialog"; //$NON-NLS-1$
-	public static final String IMG_Tbr_DirectMenuItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.DirectMenuItem"; //$NON-NLS-1$
-	public static final String IMG_Tbr_DirectToolItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.DirectToolItem"; //$NON-NLS-1$
-	public static final String IMG_Tbr_HandledMenuItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.HandledMenuItem"; //$NON-NLS-1$
-	public static final String IMG_Tbr_HandledToolItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.HandledToolItem"; //$NON-NLS-1$
-	public static final String IMG_Tbr_Menu = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Menu"; //$NON-NLS-1$
-	public static final String IMG_Tbr_MenuContribution = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.MenuContribution"; //$NON-NLS-1$
-	public static final String IMG_Tbr_MenuItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.MenuItem"; //$NON-NLS-1$
-	public static final String IMG_Tbr_DynamicMenuContribution = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.DynamicMenuContribution"; //$NON-NLS-1$
-	public static final String IMG_Tbr_MenuSeparator = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.MenuSeparator"; //$NON-NLS-1$
-	public static final String IMG_Tbr_ModelFragments = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.ModelFragments"; //$NON-NLS-1$
-	public static final String IMG_Tbr_Parameter = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Parameter"; //$NON-NLS-1$
-	public static final String IMG_Tbr_Part = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Part"; //$NON-NLS-1$
-	public static final String IMG_Tbr_PartDescriptor = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.PartDescriptor"; //$NON-NLS-1$
-	public static final String IMG_Tbr_PartSashContainer_vertical = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.PartSashContainer_vertical"; //$NON-NLS-1$
-	public static final String IMG_Tbr_PartSashContainer = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.PartSashContainer"; //$NON-NLS-1$
-	public static final String IMG_Tbr_PartStack = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.PartStack"; //$NON-NLS-1$
-	public static final String IMG_Tbr_Perspective = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Perspective"; //$NON-NLS-1$
-	public static final String IMG_Tbr_PerspectiveStack = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.PerspectiveStack"; //$NON-NLS-1$
-	public static final String IMG_Tbr_Placeholder = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Placeholder"; //$NON-NLS-1$
-	public static final String IMG_Tbr_StringModelFragment = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.StringModelFragment"; //$NON-NLS-1$
-	public static final String IMG_Tbr_ToolBar = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.ToolBar"; //$NON-NLS-1$
-	public static final String IMG_Tbr_ToolBarContribution = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.ToolBarContribution"; //$NON-NLS-1$
-	public static final String IMG_Tbr_ToolBarSeparator = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.ToolBarSeparator"; //$NON-NLS-1$
-	public static final String IMG_Tbr_ToolControl = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.ToolControl"; //$NON-NLS-1$
-	public static final String IMG_Tbr_TrimContribution = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.TrimContribution"; //$NON-NLS-1$
-	public static final String IMG_Tbr_Window = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.Window"; //$NON-NLS-1$
-	public static final String IMG_Tbr_WindowTrim = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.WindowTrim"; //$NON-NLS-1$
-	public static final String IMG_Tbr_WizardDialog = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.WizardDialog"; //$NON-NLS-1$
 
 	public static final String IMG_Obj16_arrow_down = "IMG_org.eclipse.e4.tools.emf.ui.obj16.arrow_down"; //$NON-NLS-1$
 	public static final String IMG_Obj16_arrow_up = "IMG_org.eclipse.e4.tools.emf.ui.obj16.arrow_up"; //$NON-NLS-1$
@@ -156,5 +120,5 @@ public class ResourceProvider extends BasicResourceProvider {
 	public static final String COLOR_PROC_INSTR = "COLOR_org.eclipse.e4.tools.emf.ui.PROC_INSTR"; //$NON-NLS-1$
 	public static final String COLOR_STRING = "COLOR_org.eclipse.e4.tools.emf.ui.STRING"; //$NON-NLS-1$
 	public static final String COLOR_DEFAULT = "COLOR_org.eclipse.e4.tools.emf.ui.DEFAULT"; //$NON-NLS-1$
-	public static final String COLOR_TAG = "COLOR_org.eclipse.e4.tools.emf.ui.TAG"; //$NON-NLS-1$	
+	public static final String COLOR_TAG = "COLOR_org.eclipse.e4.tools.emf.ui.TAG"; //$NON-NLS-1$
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index 187d5d0896..045928c90c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -26,7 +26,7 @@
 
 public class ComponentLabelProvider extends StyledCellLabelProvider {
 
-	private ModelEditor editor;
+	private final ModelEditor editor;
 
 	public static final String NOT_RENDERED_KEY = "NOT_RENDERED_STYLER";//$NON-NLS-1$
 
@@ -36,7 +36,7 @@ public class ComponentLabelProvider extends StyledCellLabelProvider {
 
 	private Font font;
 
-	private Messages Messages;
+	private final Messages Messages;
 
 	private static Styler BOTH_STYLER = new Styler() {
 		@Override
@@ -70,11 +70,11 @@ public ComponentLabelProvider(ModelEditor editor, Messages Messages) {
 	public void update(final ViewerCell cell) {
 		if (cell.getElement() instanceof EObject) {
 
-			EObject o = (EObject) cell.getElement();
-			AbstractComponentEditor elementEditor = editor.getEditor(o.eClass());
+			final EObject o = (EObject) cell.getElement();
+			final AbstractComponentEditor elementEditor = editor.getEditor(o.eClass());
 			if (elementEditor != null) {
 				String label = elementEditor.getLabel(o);
-				String detailText = elementEditor.getDetailLabel(o);
+				final String detailText = elementEditor.getDetailLabel(o);
 				Styler styler = null;
 
 				if (o instanceof MUIElement) {
@@ -92,23 +92,23 @@ public void update(final ViewerCell cell) {
 				}
 
 				if (detailText == null) {
-					StyledString styledString = new StyledString(label, styler);
+					final StyledString styledString = new StyledString(label, styler);
 					cell.setText(styledString.getString());
 					cell.setStyleRanges(styledString.getStyleRanges());
 				} else {
-					StyledString styledString = new StyledString(label, styler);
+					final StyledString styledString = new StyledString(label, styler);
 					styledString.append(" - " + detailText, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 					cell.setText(styledString.getString());
 					cell.setStyleRanges(styledString.getStyleRanges());
 				}
-				cell.setImage(elementEditor.getImage(o, cell.getControl().getDisplay()));
+				cell.setImage(elementEditor.getImage(o));
 			} else {
 				cell.setText(cell.getElement().toString());
 			}
 		} else if (cell.getElement() instanceof VirtualEntry<?>) {
-			String s = cell.getElement().toString();
+			final String s = cell.getElement().toString();
 			if (font == null) {
-				FontData[] data = cell.getControl().getFont().getFontData();
+				final FontData[] data = cell.getControl().getFont().getFontData();
 				font = new Font(cell.getControl().getDisplay(), new FontData(data[0].getName(), data[0].getHeight(), SWT.ITALIC));
 			}
 			cell.setFont(font);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 941c9df273..386da632f0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -190,6 +190,7 @@
 import org.eclipse.jface.databinding.viewers.TreeStructureAdvisor;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.resource.StringConverter;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
@@ -246,23 +247,23 @@ public class ModelEditor implements IGotoObject {
 	public static final String VIRTUAL_BINDING_TABLE = ModelEditor.class.getName() + ".VIRTUAL_BINDING_TABLE"; //$NON-NLS-1$
 	public static final String VIRTUAL_COMMAND = ModelEditor.class.getName() + ".VIRTUAL_COMMAND"; //$NON-NLS-1$
 	public static final String VIRTUAL_APPLICATION_WINDOWS = ModelEditor.class.getName()
-		+ ".VIRTUAL_APPLICATION_WINDOWS"; //$NON-NLS-1$
+			+ ".VIRTUAL_APPLICATION_WINDOWS"; //$NON-NLS-1$
 	public static final String VIRTUAL_PERSPECTIVE_WINDOWS = ModelEditor.class.getName()
-		+ ".VIRTUAL_PERSPECTIVE_WINDOWS"; //$NON-NLS-1$
+			+ ".VIRTUAL_PERSPECTIVE_WINDOWS"; //$NON-NLS-1$
 	public static final String VIRTUAL_WINDOW_WINDOWS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_WINDOWS"; //$NON-NLS-1$
 	public static final String VIRTUAL_WINDOW_CONTROLS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_CONTROLS"; //$NON-NLS-1$
 	public static final String VIRTUAL_PART_DESCRIPTORS = ModelEditor.class.getName() + ".VIRTUAL_PART_DESCRIPTORS"; //$NON-NLS-1$
 	public static final String VIRTUAL_PARTDESCRIPTOR_MENU = ModelEditor.class.getName()
-		+ ".VIRTUAL_PARTDESCRIPTOR_MENU"; //$NON-NLS-1$
+			+ ".VIRTUAL_PARTDESCRIPTOR_MENU"; //$NON-NLS-1$
 	public static final String VIRTUAL_TRIMMED_WINDOW_TRIMS = ModelEditor.class.getName()
-		+ ".VIRTUAL_TRIMMED_WINDOW_TRIMS"; //$NON-NLS-1$
+			+ ".VIRTUAL_TRIMMED_WINDOW_TRIMS"; //$NON-NLS-1$
 	public static final String VIRTUAL_ADDONS = ModelEditor.class.getName() + ".VIRTUAL_ADDONS"; //$NON-NLS-1$
 	public static final String VIRTUAL_MENU_CONTRIBUTIONS = ModelEditor.class.getName() + ".VIRTUAL_MENU_CONTRIBUTIONS"; //$NON-NLS-1$
 	public static final String VIRTUAL_TOOLBAR_CONTRIBUTIONS = ModelEditor.class.getName()
-		+ ".VIRTUAL_TOOLBAR_CONTRIBUTIONS"; //$NON-NLS-1$
+			+ ".VIRTUAL_TOOLBAR_CONTRIBUTIONS"; //$NON-NLS-1$
 	public static final String VIRTUAL_TRIM_CONTRIBUTIONS = ModelEditor.class.getName() + ".VIRTUAL_TRIM_CONTRIBUTIONS"; //$NON-NLS-1$
 	public static final String VIRTUAL_WINDOW_SHARED_ELEMENTS = ModelEditor.class.getName()
-		+ ".VIRTUAL_WINDOW_SHARED_ELEMENTS"; //$NON-NLS-1$
+			+ ".VIRTUAL_WINDOW_SHARED_ELEMENTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_MODEL_FRAGEMENTS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_FRAGEMENTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_MODEL_IMPORTS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_IMPORTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_CATEGORIES = ModelEditor.class.getName() + ".VIRTUAL_CATEGORIES"; //$NON-NLS-1$
@@ -270,7 +271,7 @@ public class ModelEditor implements IGotoObject {
 	public static final String VIRTUAL_MENUELEMENTS = ModelEditor.class.getName() + ".VIRTUAL_MENUELEMENTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_ROOT_CONTEXTS = ModelEditor.class.getName() + ".VIRTUAL_ROOT_CONTEXTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_PERSPECTIVE_CONTROLS = ModelEditor.class.getName()
-		+ "VIRTUAL_PERSPECTIVE_CONTROLS"; //$NON-NLS-1$
+			+ "VIRTUAL_PERSPECTIVE_CONTROLS"; //$NON-NLS-1$
 	public static final String VIRTUAL_SNIPPETS = ModelEditor.class.getName() + "VIRTUAL_SNIPPETS"; //$NON-NLS-1$
 
 	public static final int TAB_FORM = 0;
@@ -288,6 +289,10 @@ public class ModelEditor implements IGotoObject {
 	private final IModelResource modelProvider;
 	private final IProject project;
 
+	/** An imageRegistry for dynamic component images (see bug #403583) */
+	private final ImageRegistry componentImages = new ImageRegistry();
+
+
 	@Inject
 	ESelectionService selectionService;
 
@@ -353,7 +358,7 @@ public class ModelEditor implements IGotoObject {
 	private XmiTab xmiTab;
 
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project,
-		final IResourcePool resourcePool) {
+			final IResourcePool resourcePool) {
 		this.resourcePool = resourcePool;
 		this.modelProvider = modelProvider;
 		this.project = project;
@@ -370,7 +375,7 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 				localeString = object.toString();
 			}
 			final ProjectOSGiTranslationProvider translationProvider = new ProjectOSGiTranslationProvider(project,
-				localeString) {
+					localeString) {
 				@Override
 				protected void updateResourceBundle() {
 					super.updateResourceBundle();
@@ -510,7 +515,7 @@ private void findAndHighlight(Control control) {
 				if (o instanceof MPart) {
 					System.err.println(getClass().getName() + ".findAndHighLight: " + o); //$NON-NLS-1$
 					System.err.println(getClass().getName()
-						+ ".findAndHighLight: " + ((EObject) o).eContainingFeature()); //$NON-NLS-1$
+							+ ".findAndHighLight: " + ((EObject) o).eContainingFeature()); //$NON-NLS-1$
 				}
 
 				viewer.setSelection(new StructuredSelection(o));
@@ -605,7 +610,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 						if (editor != null) {
 							currentEditor = editor;
 							sectionHeaderLabel.setText(editor.getLabel(obj));
-							iconLabel.setImage(editor.getImage(obj, iconLabel.getDisplay()));
+							iconLabel.setImage(editor.getImage(obj));
 							obsManager.runAndCollect(new Runnable() {
 
 								@Override
@@ -623,7 +628,7 @@ public void run() {
 						if (editor != null) {
 							currentEditor = editor;
 							sectionHeaderLabel.setText(editor.getLabel(entry));
-							iconLabel.setImage(editor.getImage(entry, iconLabel.getDisplay()));
+							iconLabel.setImage(editor.getImage(entry));
 							obsManager.runAndCollect(new Runnable() {
 
 								@Override
@@ -669,7 +674,7 @@ public void menuAboutToShow(IMenuManager manager) {
 					List<Action> actions;
 					if (s.getFirstElement() instanceof VirtualEntry<?>) {
 						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId()).getActions(
-							s.getFirstElement());
+								s.getFirstElement());
 						if (actions.size() > 0) {
 							final MenuManager addMenu = new MenuManager(messages.ModelEditor_AddChild);
 							for (final Action a : actions) {
@@ -680,7 +685,7 @@ public void menuAboutToShow(IMenuManager manager) {
 						}
 
 						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId()).getActionsImport(
-							s.getFirstElement());
+								s.getFirstElement());
 						if (actions.size() > 0) {
 							final MenuManager menu = new MenuManager(messages.ModelEditor_Import3x);
 							for (final Action a : actions) {
@@ -735,7 +740,7 @@ public void menuAboutToShow(IMenuManager manager) {
 						if (o.eContainer() != null) {
 							addSeparator = true;
 							manager.add(new Action(messages.ModelEditor_Delete, ImageDescriptor
-								.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
+									.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
 								@Override
 								public void run() {
 									final Command cmd = DeleteCommand.create(modelProvider.getEditingDomain(), o);
@@ -751,7 +756,7 @@ public void run() {
 				if (noSelected > 0) {
 					if (!isModelFragment() && modelExtractor != null) {
 						manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor
-							.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {
+								.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {
 							@Override
 							public void run() {
 								final ArrayList<MApplicationElement> maes = new ArrayList<MApplicationElement>();
@@ -782,7 +787,7 @@ public void run() {
 									final String containerId = ((MApplicationElement) container).getElementId();
 									if (containerId == null || containerId.length() == 0) {
 										MessageDialog.openError(viewer.getControl().getShell(), null,
-											messages.ModelEditor_ExtractFragment_NoParentId);
+												messages.ModelEditor_ExtractFragment_NoParentId);
 
 										return;
 									}
@@ -807,7 +812,7 @@ public void run() {
 				final IConfigurationElement[] elements = extPoint.getConfigurationElements();
 
 				if (elements.length > 0 && !s.isEmpty() && s.getFirstElement() instanceof MApplicationElement
-					&& noSelected == 1) {
+						&& noSelected == 1) {
 					if (addSeparator) {
 						manager.add(new Separator());
 					}
@@ -819,28 +824,28 @@ public void run() {
 					for (final IConfigurationElement e : elements) {
 						final IConfigurationElement le = e;
 						scriptExecute.add(new Action(e.getAttribute("label")) { //$NON-NLS-1$
-								@Override
-								public void run() {
-									try {
-										final MApplicationElement o = (MApplicationElement) s.getFirstElement();
-										final IScriptingSupport support = (IScriptingSupport) le
+							@Override
+							public void run() {
+								try {
+									final MApplicationElement o = (MApplicationElement) s.getFirstElement();
+									final IScriptingSupport support = (IScriptingSupport) le
 											.createExecutableExtension("class"); //$NON-NLS-1$
-										IEclipseContext ctx = null;
-										if (project == null) {
-											if (o instanceof MContext) {
-												ctx = ((MContext) o).getContext();
-											} else {
-												ctx = ModelUtils.getContainingContext(o);
-											}
+									IEclipseContext ctx = null;
+									if (project == null) {
+										if (o instanceof MContext) {
+											ctx = ((MContext) o).getContext();
+										} else {
+											ctx = ModelUtils.getContainingContext(o);
 										}
-
-										support.openEditor(viewer.getControl().getShell(), s.getFirstElement(), ctx);
-									} catch (final CoreException e) {
-										// TODO Auto-generated catch block
-										e.printStackTrace();
 									}
+
+									support.openEditor(viewer.getControl().getShell(), s.getFirstElement(), ctx);
+								} catch (final CoreException e) {
+									// TODO Auto-generated catch block
+									e.printStackTrace();
 								}
-							});
+							}
+						});
 					}
 				}
 
@@ -854,7 +859,7 @@ public void run() {
 						@Override
 						public void run() {
 							final ExternalizeStringHandler h = ContextInjectionFactory.make(
-								ExternalizeStringHandler.class, context);
+									ExternalizeStringHandler.class, context);
 							ContextInjectionFactory.invoke(h, Execute.class, context);
 						}
 					};
@@ -997,6 +1002,10 @@ public IProject getProject() {
 		return project;
 	}
 
+	public ImageRegistry getComponentImages() {
+		return componentImages;
+	}
+
 	public boolean isShowXMIId() {
 		return showXMIId;
 	}
@@ -1074,21 +1083,21 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 
 		TreeViewer tempViewer = null;
 		final String property = System
-			.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
+				.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
 		if (property != null || preferences.getBoolean(ModelEditorPreferences.TAB_FORM_SEARCH_SHOW, false)) {
 			final FilteredTree viewParent = new FilteredTree(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL
-				| SWT.V_SCROLL, new PatternFilter(), false);
+					| SWT.V_SCROLL, new PatternFilter(), false);
 			tempViewer = viewParent.getViewer();
 		} else {
 			tempViewer = new TreeViewerEx(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL,
-				emfDocumentProvider, modelProvider);
+					emfDocumentProvider, modelProvider);
 		}
 		final TreeViewer viewer = tempViewer;
 
 		viewer.setLabelProvider(new ComponentLabelProvider(this, messages));
 		final ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(
-			new ObservableFactoryImpl(), new TreeStructureAdvisor() {
-			});
+				new ObservableFactoryImpl(), new TreeStructureAdvisor() {
+				});
 		viewer.setContentProvider(contentProvider);
 
 		final WritableSet clearedSet = new WritableSet();
@@ -1156,7 +1165,7 @@ public void treeCollapsed(TreeEvent e) {
 		final int ops = DND.DROP_MOVE;
 		viewer.addDragSupport(ops, new Transfer[] { MemoryTransfer.getInstance() }, new DragListener(viewer));
 		viewer.addDropSupport(ops, new Transfer[] { MemoryTransfer.getInstance() }, new DropListener(viewer,
-			modelProvider.getEditingDomain()));
+				modelProvider.getEditingDomain()));
 
 		return viewer;
 	}
@@ -1172,7 +1181,7 @@ private void registerContributedVirtualEditors() {
 
 			final IContributionFactory fact = context.get(IContributionFactory.class);
 			final AbstractComponentEditor editor = (AbstractComponentEditor) fact.create(
-				"bundleclass://" + el.getContributor().getName() + "/" + el.getAttribute("class"), context); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+					"bundleclass://" + el.getContributor().getName() + "/" + el.getAttribute("class"), context); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			registerVirtualEditor(el.getAttribute("id"), editor); //$NON-NLS-1$
 		}
 	}
@@ -1183,35 +1192,35 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_BINDING_TABLE, ContextInjectionFactory.make(VBindingTableEditor.class, context));
 		registerVirtualEditor(VIRTUAL_COMMAND, ContextInjectionFactory.make(VCommandEditor.class, context));
 		registerVirtualEditor(VIRTUAL_APPLICATION_WINDOWS,
-			ContextInjectionFactory.make(VApplicationWindowEditor.class, context));
+				ContextInjectionFactory.make(VApplicationWindowEditor.class, context));
 		registerVirtualEditor(VIRTUAL_WINDOW_WINDOWS, ContextInjectionFactory.make(VWindowWindowsEditor.class, context));
 		registerVirtualEditor(VIRTUAL_PERSPECTIVE_WINDOWS,
-			ContextInjectionFactory.make(VPerspectiveWindowsEditor.class, context));
+				ContextInjectionFactory.make(VPerspectiveWindowsEditor.class, context));
 		registerVirtualEditor(VIRTUAL_WINDOW_CONTROLS,
-			ContextInjectionFactory.make(VWindowControlEditor.class, context));
+				ContextInjectionFactory.make(VWindowControlEditor.class, context));
 		registerVirtualEditor(VIRTUAL_PART_DESCRIPTORS, ContextInjectionFactory.make(VPartDescriptor.class, context));
 		registerVirtualEditor(VIRTUAL_PARTDESCRIPTOR_MENU,
-			ContextInjectionFactory.make(VPartDescriptorMenuEditor.class, context));
+				ContextInjectionFactory.make(VPartDescriptorMenuEditor.class, context));
 		registerVirtualEditor(VIRTUAL_TRIMMED_WINDOW_TRIMS,
-			ContextInjectionFactory.make(VWindowTrimEditor.class, context));
+				ContextInjectionFactory.make(VWindowTrimEditor.class, context));
 		registerVirtualEditor(VIRTUAL_ADDONS, ContextInjectionFactory.make(VApplicationAddons.class, context));
 		registerVirtualEditor(VIRTUAL_MENU_CONTRIBUTIONS,
-			ContextInjectionFactory.make(VMenuContributionsEditor.class, context));
+				ContextInjectionFactory.make(VMenuContributionsEditor.class, context));
 		registerVirtualEditor(VIRTUAL_TOOLBAR_CONTRIBUTIONS,
-			ContextInjectionFactory.make(VToolBarContributionsEditor.class, context));
+				ContextInjectionFactory.make(VToolBarContributionsEditor.class, context));
 		registerVirtualEditor(VIRTUAL_TRIM_CONTRIBUTIONS,
-			ContextInjectionFactory.make(VTrimContributionsEditor.class, context));
+				ContextInjectionFactory.make(VTrimContributionsEditor.class, context));
 		registerVirtualEditor(VIRTUAL_WINDOW_SHARED_ELEMENTS,
-			ContextInjectionFactory.make(VWindowSharedElementsEditor.class, context));
+				ContextInjectionFactory.make(VWindowSharedElementsEditor.class, context));
 		registerVirtualEditor(VIRTUAL_MODEL_FRAGEMENTS,
-			ContextInjectionFactory.make(VModelFragmentsEditor.class, context));
+				ContextInjectionFactory.make(VModelFragmentsEditor.class, context));
 		registerVirtualEditor(VIRTUAL_MODEL_IMPORTS, ContextInjectionFactory.make(VModelImportsEditor.class, context));
 		registerVirtualEditor(VIRTUAL_CATEGORIES,
-			ContextInjectionFactory.make(VApplicationCategoriesEditor.class, context));
+				ContextInjectionFactory.make(VApplicationCategoriesEditor.class, context));
 		registerVirtualEditor(VIRTUAL_PARAMETERS, ContextInjectionFactory.make(VItemParametersEditor.class, context));
 		registerVirtualEditor(VIRTUAL_ROOT_CONTEXTS, ContextInjectionFactory.make(VRootBindingContexts.class, context));
 		registerVirtualEditor(VIRTUAL_PERSPECTIVE_CONTROLS,
-			ContextInjectionFactory.make(VPerspectiveControlEditor.class, context));
+				ContextInjectionFactory.make(VPerspectiveControlEditor.class, context));
 		registerVirtualEditor(VIRTUAL_SNIPPETS, ContextInjectionFactory.make(VSnippetsEditor.class, context));
 	}
 
@@ -1237,7 +1246,7 @@ private void registerContributedEditors() {
 				final EClass eClass = desc.getEClass();
 				final IContributionFactory fact = context.get(IContributionFactory.class);
 				final AbstractComponentEditor editor = (AbstractComponentEditor) fact.create(
-					"bundleclass://" + el.getContributor().getName() + "/" + desc.getEditorClass().getName(), context); //$NON-NLS-1$ //$NON-NLS-2$
+						"bundleclass://" + el.getContributor().getName() + "/" + desc.getEditorClass().getName(), context); //$NON-NLS-1$ //$NON-NLS-2$
 				registerEditor(eClass, editor);
 			} catch (final CoreException e) {
 				e.printStackTrace();
@@ -1288,86 +1297,86 @@ private void registerDefaultEditors() {
 		// System.err.println(getClass().getName() + ".registerDefaultEditors: " + resourcePool); //$NON-NLS-1$
 
 		registerEditor(ApplicationPackageImpl.Literals.APPLICATION,
-			ContextInjectionFactory.make(ApplicationEditor.class, context));
+				ContextInjectionFactory.make(ApplicationEditor.class, context));
 		registerEditor(ApplicationPackageImpl.Literals.ADDON, ContextInjectionFactory.make(AddonsEditor.class, context));
 
 		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING,
-			ContextInjectionFactory.make(KeyBindingEditor.class, context));
+				ContextInjectionFactory.make(KeyBindingEditor.class, context));
 		registerEditor(CommandsPackageImpl.Literals.HANDLER, ContextInjectionFactory.make(HandlerEditor.class, context));
 		registerEditor(CommandsPackageImpl.Literals.COMMAND, ContextInjectionFactory.make(CommandEditor.class, context));
 		registerEditor(CommandsPackageImpl.Literals.COMMAND_PARAMETER,
-			ContextInjectionFactory.make(CommandParameterEditor.class, context));
+				ContextInjectionFactory.make(CommandParameterEditor.class, context));
 		registerEditor(CommandsPackageImpl.Literals.PARAMETER,
-			ContextInjectionFactory.make(ParameterEditor.class, context));
+				ContextInjectionFactory.make(ParameterEditor.class, context));
 		registerEditor(CommandsPackageImpl.Literals.BINDING_TABLE,
-			ContextInjectionFactory.make(BindingTableEditor.class, context));
+				ContextInjectionFactory.make(BindingTableEditor.class, context));
 		registerEditor(CommandsPackageImpl.Literals.BINDING_CONTEXT,
-			ContextInjectionFactory.make(BindingContextEditor.class, context));
+				ContextInjectionFactory.make(BindingContextEditor.class, context));
 		registerEditor(CommandsPackageImpl.Literals.CATEGORY,
-			ContextInjectionFactory.make(CategoryEditor.class, context));
+				ContextInjectionFactory.make(CategoryEditor.class, context));
 
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR, ContextInjectionFactory.make(ToolBarEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM,
-			ContextInjectionFactory.make(DirectToolItemEditor.class, context));
+				ContextInjectionFactory.make(DirectToolItemEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM,
-			ContextInjectionFactory.make(HandledToolItemEditor.class, context));
+				ContextInjectionFactory.make(HandledToolItemEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR,
-			ContextInjectionFactory.make(ToolBarSeparatorEditor.class, context));
+				ContextInjectionFactory.make(ToolBarSeparatorEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.TOOL_CONTROL,
-			ContextInjectionFactory.make(ToolControlEditor.class, context));
+				ContextInjectionFactory.make(ToolControlEditor.class, context));
 
 		registerEditor(MenuPackageImpl.Literals.MENU, ContextInjectionFactory.make(MenuEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.POPUP_MENU,
-			ContextInjectionFactory.make(PopupMenuEditor.class, context));
+				ContextInjectionFactory.make(PopupMenuEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.MENU_SEPARATOR,
-			ContextInjectionFactory.make(MenuSeparatorEditor.class, context));
+				ContextInjectionFactory.make(MenuSeparatorEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM,
-			ContextInjectionFactory.make(HandledMenuItemEditor.class, context));
+				ContextInjectionFactory.make(HandledMenuItemEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM,
-			ContextInjectionFactory.make(DirectMenuItemEditor.class, context));
+				ContextInjectionFactory.make(DirectMenuItemEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION,
-			ContextInjectionFactory.make(MenuContributionEditor.class, context));
+				ContextInjectionFactory.make(MenuContributionEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION,
-			ContextInjectionFactory.make(ToolBarContributionEditor.class, context));
+				ContextInjectionFactory.make(ToolBarContributionEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION,
-			ContextInjectionFactory.make(TrimContributionEditor.class, context));
+				ContextInjectionFactory.make(TrimContributionEditor.class, context));
 		registerEditor(MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION,
-			ContextInjectionFactory.make(DynamicMenuContributionEditor.class, context));
+				ContextInjectionFactory.make(DynamicMenuContributionEditor.class, context));
 
 		registerEditor(UiPackageImpl.Literals.CORE_EXPRESSION,
-			ContextInjectionFactory.make(CoreExpressionEditor.class, context));
+				ContextInjectionFactory.make(CoreExpressionEditor.class, context));
 
 		registerEditor(BasicPackageImpl.Literals.COMPOSITE_PART,
-			ContextInjectionFactory.make(CompositePartEditor.class, context));
+				ContextInjectionFactory.make(CompositePartEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.PART, ContextInjectionFactory.make(PartEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.WINDOW, ContextInjectionFactory.make(WindowEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW,
-			ContextInjectionFactory.make(TrimmedWindowEditor.class, context));
+				ContextInjectionFactory.make(TrimmedWindowEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.PART_SASH_CONTAINER,
-			ContextInjectionFactory.make(PartSashContainerEditor.class, context));
+				ContextInjectionFactory.make(PartSashContainerEditor.class, context));
 		registerEditor(AdvancedPackageImpl.Literals.AREA, ContextInjectionFactory.make(AreaEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.PART_STACK,
-			ContextInjectionFactory.make(PartStackEditor.class, context));
+				ContextInjectionFactory.make(PartStackEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.TRIM_BAR, ContextInjectionFactory.make(TrimBarEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.DIALOG, ContextInjectionFactory.make(DialogEditor.class, context));
 		registerEditor(BasicPackageImpl.Literals.WIZARD_DIALOG,
-			ContextInjectionFactory.make(WizardDialogEditor.class, context));
+				ContextInjectionFactory.make(WizardDialogEditor.class, context));
 
 		registerEditor(
-			org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR,
-			ContextInjectionFactory.make(PartDescriptorEditor.class, context));
+				org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR,
+				ContextInjectionFactory.make(PartDescriptorEditor.class, context));
 
 		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
-			ContextInjectionFactory.make(PerspectiveStackEditor.class, context));
+				ContextInjectionFactory.make(PerspectiveStackEditor.class, context));
 		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE,
-			ContextInjectionFactory.make(PerspectiveEditor.class, context));
+				ContextInjectionFactory.make(PerspectiveEditor.class, context));
 		registerEditor(AdvancedPackageImpl.Literals.PLACEHOLDER,
-			ContextInjectionFactory.make(PlaceholderEditor.class, context));
+				ContextInjectionFactory.make(PlaceholderEditor.class, context));
 
 		registerEditor(FragmentPackageImpl.Literals.MODEL_FRAGMENTS,
-			ContextInjectionFactory.make(ModelFragmentsEditor.class, context));
+				ContextInjectionFactory.make(ModelFragmentsEditor.class, context));
 		registerEditor(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT,
-			ContextInjectionFactory.make(StringModelFragment.class, context));
+				ContextInjectionFactory.make(StringModelFragment.class, context));
 	}
 
 	public void tab_list_show(Boolean show) {
@@ -1400,7 +1409,7 @@ public void setNotVisibleColor(@Preference(ModelEditorPreferences.NOT_VISIBLE_CO
 
 		if (current == null || !current.equals(color)) {
 			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_VISIBLE_KEY,
-				StringConverter.asRGB(color, new RGB(200, 200, 200)));
+					StringConverter.asRGB(color, new RGB(200, 200, 200)));
 		}
 
 		if (viewer != null) {
@@ -1415,7 +1424,7 @@ public void setNotRenderedColor(@Preference(ModelEditorPreferences.NOT_RENDERED_
 
 		if (current == null || !current.equals(color)) {
 			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_RENDERED_KEY,
-				StringConverter.asRGB(color, new RGB(200, 200, 200)));
+					StringConverter.asRGB(color, new RGB(200, 200, 200)));
 		}
 
 		if (viewer != null) {
@@ -1426,13 +1435,13 @@ public void setNotRenderedColor(@Preference(ModelEditorPreferences.NOT_RENDERED_
 
 	@Inject
 	public void setNotVisibleRenderedColor(
-		@Preference(ModelEditorPreferences.NOT_VISIBLE_AND_RENDERED_COLOR) String color) {
+			@Preference(ModelEditorPreferences.NOT_VISIBLE_AND_RENDERED_COLOR) String color) {
 		final RGB current = JFaceResources.getColorRegistry().getRGB(
-			ComponentLabelProvider.NOT_VISIBLE_AND_RENDERED_KEY);
+				ComponentLabelProvider.NOT_VISIBLE_AND_RENDERED_KEY);
 
 		if (current == null || !current.equals(color)) {
 			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_VISIBLE_AND_RENDERED_KEY,
-				StringConverter.asRGB(color, new RGB(200, 200, 200)));
+					StringConverter.asRGB(color, new RGB(200, 200, 200)));
 		}
 
 		if (viewer != null) {
@@ -1634,7 +1643,7 @@ private void handleStructureCopy() {
 			if (o != null && o instanceof EObject) {
 				final Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
 				clip.setContents(new Object[] { EcoreUtil.copy((EObject) o) },
-					new Transfer[] { MemoryTransfer.getInstance() });
+						new Transfer[] { MemoryTransfer.getInstance() });
 				clip.dispose();
 			}
 		}
@@ -1660,7 +1669,7 @@ private void handleStructureCut() {
 				clip.dispose();
 				final EObject eObj = (EObject) o;
 				final Command cmd = RemoveCommand.create(getModelProvider().getEditingDomain(), eObj.eContainer(),
-					eObj.eContainingFeature(), eObj);
+						eObj.eContainingFeature(), eObj);
 				if (cmd.canExecute()) {
 					getModelProvider().getEditingDomain().getCommandStack().execute(cmd);
 				}
@@ -1876,7 +1885,7 @@ private boolean isValidDrop(Object target, MApplicationElement instance, boolean
 
 				if (isIndex || !container.getChildren().contains(instance)) {
 					final EClassifier classifier = ModelUtils.getTypeArgument(((EObject) container).eClass(),
-						UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN.getEGenericType());
+							UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN.getEGenericType());
 					return classifier.isInstance(instance);
 				}
 			} else if (target instanceof VirtualEntry<?>) {
@@ -1885,10 +1894,10 @@ private boolean isValidDrop(Object target, MApplicationElement instance, boolean
 				if (isIndex || !vTarget.getList().contains(instance)) {
 					if (vTarget.getProperty() instanceof IEMFProperty) {
 						final EStructuralFeature feature = ((IEMFProperty) vTarget.getProperty())
-							.getStructuralFeature();
+								.getStructuralFeature();
 						final EObject parent = (EObject) vTarget.getOriginalParent();
 						final EClassifier classifier = ModelUtils.getTypeArgument(parent.eClass(),
-							feature.getEGenericType());
+								feature.getEGenericType());
 						return classifier.isInstance(instance);
 					}
 
@@ -1916,7 +1925,7 @@ public void gotoEObject(int targetHint, EObject object) {
 			case TAB_FORM:
 				// make sure tree node has been instantiated
 				final ObservableListTreeContentProvider provider = (ObservableListTreeContentProvider) viewer
-					.getContentProvider();
+				.getContentProvider();
 				getFirstMatchingItem(object, provider, provider.getChildren(viewer.getInput()));
 
 				viewer.reveal(object);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index a4168da623..db5393e417 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -53,7 +53,6 @@
 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.Link;
 import org.eclipse.swt.widgets.Text;
@@ -77,8 +76,8 @@ public AddonsEditor() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		return createImage(ResourceProvider.IMG_Addons);
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_Addons);
 	}
 
 	@Override
@@ -134,7 +133,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master,
-		boolean isImport) {
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -156,13 +155,13 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
-			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		final Link lnk;
 		// ------------------------------------------------------------
 		{
 			final IContributionClassCreator c = getEditor().getContributionCreator(
-				ApplicationPackageImpl.Literals.ADDON);
+					ApplicationPackageImpl.Literals.ADDON);
 			if (project != null && c != null) {
 				lnk = new Link(parent, SWT.NONE);
 				lnk.setText("<A>" + Messages.PartEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
@@ -171,7 +170,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 					@Override
 					public void widgetSelected(SelectionEvent e) {
 						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project,
-							lnk.getShell());
+								lnk.getShell());
 					}
 				});
 			} else {
@@ -194,11 +193,11 @@ public void modifyText(ModifyEvent e) {
 				}
 			});
 			final Binding binding = context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(),
-					ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()),
-					new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
-					new UpdateValueStrategy());
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(),
+							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()),
+							new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+							new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
@@ -208,15 +207,15 @@ public void modifyText(ModifyEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
-						getEditingDomain(), (MContribution) getMaster().getValue(),
-						ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+							getEditingDomain(), (MContribution) getMaster().getValue(),
+							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
 		}
 
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -225,7 +224,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.AddonsEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createInstanceInspection(folder);
@@ -247,7 +246,7 @@ private void createInstanceInspection(CTabFolder folder) {
 
 		final ObjectViewer objectViewer = new ObjectViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container,
-			ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
+				ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 7ec370f327..36187e3d2b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -38,7 +38,6 @@
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
@@ -80,7 +79,6 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
@@ -90,32 +88,32 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private final IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties
-		.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
+			.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private final IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties
-		.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES);
+			.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES);
 	private final IListProperty APPLICATION__COMMANDS = EMFProperties
-		.list(ApplicationPackageImpl.Literals.APPLICATION__COMMANDS);
+			.list(ApplicationPackageImpl.Literals.APPLICATION__COMMANDS);
 	// private IListProperty APPLICATION__DIALOGS =
 	// EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__DIALOGS);
 	private final IListProperty PART_DESCRIPTOR_CONTAINER__DESCRIPTORS = EMFProperties
-		.list(BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS);
+			.list(BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS);
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private final IListProperty APPLICATION__ADDONS = EMFProperties
-		.list(ApplicationPackageImpl.Literals.APPLICATION__ADDONS);
+			.list(ApplicationPackageImpl.Literals.APPLICATION__ADDONS);
 	private final IListProperty MENU_CONTRIBUTIONS = EMFProperties
-		.list(MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS);
+			.list(MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS);
 	private final IListProperty TOOLBAR_CONTRIBUTIONS = EMFProperties
-		.list(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS);
+			.list(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS);
 	private final IListProperty TRIM_CONTRIBUTIONS = EMFProperties
-		.list(MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS);
+			.list(MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS);
 	private final IListProperty APPLICATION__SNIPPETS = EMFProperties
-		.list(UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS);
+			.list(UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS);
 	private final IListProperty APPLICATION__CATEGORIES = EMFProperties
-		.list(ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES);
+			.list(ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES);
 
 	private final IListProperty BINDING_TABLE_CONTAINER__ROOT_CONTEXT = EMFProperties
-		.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT);
+			.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT);
 
 	@Inject
 	@Optional
@@ -145,19 +143,13 @@ public List<Action> getActions(Object element) {
 
 	void doCreateCommandWizard() {
 		final WizardDialog dialog = new WizardDialog(composite.getShell(), new CommandWizard((MApplication) getMaster()
-			.getValue()));
+				.getValue()));
 		dialog.open();
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				return createImage(ResourceProvider.IMG_Application);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_Application);
-		}
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_Application);
 	}
 
 	@Override
@@ -197,17 +189,17 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp,
-			EMFEditProperties
+				EMFEditProperties
 				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.ApplicationEditor_BindingContexts);
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -216,14 +208,14 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 		item.setControl(parent.getParent());
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-			context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables,
-			UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+				UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.AddonsEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -245,7 +237,7 @@ private void createUITreeInspection(CTabFolder folder) {
 
 		final UIViewer objectViewer = new UIViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
-			getMaster(), resourcePool, Messages);
+				getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -253,7 +245,7 @@ private void createUITreeInspection(CTabFolder folder) {
 	public IObservableList getChildList(final Object element) {
 		final WritableList list = new WritableList();
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_ADDONS, APPLICATION__ADDONS, element,
-			Messages.ApplicationEditor_Addons) {
+				Messages.ApplicationEditor_Addons) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -263,7 +255,7 @@ protected boolean accepted(Object o) {
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_ROOT_CONTEXTS, BINDING_TABLE_CONTAINER__ROOT_CONTEXT,
-			element, Messages.ApplicationEditor_RootContexts) {
+				element, Messages.ApplicationEditor_RootContexts) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -273,7 +265,7 @@ protected boolean accepted(Object o) {
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element,
-			Messages.ApplicationEditor_BindingTables) {
+				Messages.ApplicationEditor_BindingTables) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -283,7 +275,7 @@ protected boolean accepted(Object o) {
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element,
-			Messages.ApplicationEditor_Handlers) {
+				Messages.ApplicationEditor_Handlers) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -293,7 +285,7 @@ protected boolean accepted(Object o) {
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_COMMAND, APPLICATION__COMMANDS, element,
-			Messages.ApplicationEditor_Commands) {
+				Messages.ApplicationEditor_Commands) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -302,7 +294,7 @@ protected boolean accepted(Object o) {
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_CATEGORIES, APPLICATION__CATEGORIES, element,
-			Messages.ApplicationEditor_Categories) {
+				Messages.ApplicationEditor_Categories) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -311,7 +303,7 @@ protected boolean accepted(Object o) {
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_APPLICATION_WINDOWS, ELEMENT_CONTAINER__CHILDREN,
-			element, Messages.ApplicationEditor_Windows) {
+				element, Messages.ApplicationEditor_Windows) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -321,7 +313,7 @@ protected boolean accepted(Object o) {
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PART_DESCRIPTORS, PART_DESCRIPTOR_CONTAINER__DESCRIPTORS,
-			element, Messages.ApplicationEditor_PartDescriptors) {
+				element, Messages.ApplicationEditor_PartDescriptors) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -331,7 +323,7 @@ protected boolean accepted(Object o) {
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MENU_CONTRIBUTIONS, MENU_CONTRIBUTIONS, element,
-			Messages.ApplicationEditor_MenuContributions) {
+				Messages.ApplicationEditor_MenuContributions) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
@@ -339,7 +331,7 @@ protected boolean accepted(Object o) {
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_TOOLBAR_CONTRIBUTIONS, TOOLBAR_CONTRIBUTIONS, element,
-			Messages.ApplicationEditor_ToolBarContributions) {
+				Messages.ApplicationEditor_ToolBarContributions) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
@@ -347,14 +339,14 @@ protected boolean accepted(Object o) {
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_TRIM_CONTRIBUTIONS, TRIM_CONTRIBUTIONS, element,
-			Messages.ApplicationEditor_TrimContributions) {
+				Messages.ApplicationEditor_TrimContributions) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
 			}
 		});
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_SNIPPETS, APPLICATION__SNIPPETS, element,
-			Messages.ApplicationEditor_Snippets) {
+				Messages.ApplicationEditor_Snippets) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
@@ -415,7 +407,7 @@ public CommandWizard(MApplication application) {
 		public void addPages() {
 			getShell().setText(Messages.CommandWizard_ShellTitle);
 			setDefaultPageImageDescriptor(ImageDescriptor.createFromImage(resourcePool
-				.getImageUnchecked(ResourceProvider.IMG_Wizban16_newexp_wiz)));
+					.getImageUnchecked(ResourceProvider.IMG_Wizban16_newexp_wiz)));
 			handlerPage = new HandlerCommandPage(Messages.ApplicationEditor_HandlerAndCommand);
 			addPage(handlerPage);
 
@@ -459,14 +451,14 @@ public boolean performFinish() {
 
 			final CompoundCommand cmd = new CompoundCommand();
 			cmd.append(AddCommand.create(getEditingDomain(), application,
-				ApplicationPackageImpl.Literals.APPLICATION__COMMANDS, command));
+					ApplicationPackageImpl.Literals.APPLICATION__COMMANDS, command));
 			cmd.append(AddCommand.create(getEditingDomain(), application,
-				CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, handler));
+					CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, handler));
 
 			if (keyBinding != null) {
 				cmd.append(AddCommand.create(getEditingDomain(),
-					((IStructuredSelection) keyPage.bindtableViewer.getSelection()).getFirstElement(),
-					CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, keyBinding));
+						((IStructuredSelection) keyPage.bindtableViewer.getSelection()).getFirstElement(),
+						CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, keyBinding));
 			}
 
 			if (cmd.canExecute()) {
@@ -801,7 +793,7 @@ public void update(ViewerCell cell) {
 			if (elementEditor != null) {
 				label = elementEditor.getDetailLabel(o);
 				label = label == null ? elementEditor.getLabel(o) : label;
-				img = elementEditor.getImage(o, composite.getDisplay());
+				img = elementEditor.getImage(o);
 			}
 
 			final List<String> parentPath = new ArrayList<String>();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index dea1d51b04..8c069fa88d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -35,7 +35,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
@@ -77,7 +76,6 @@
 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.Text;
 
@@ -87,7 +85,7 @@ public class AreaEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 
 	private final List<Action> actions = new ArrayList<Action>();
@@ -107,35 +105,35 @@ public AreaEditor() {
 	@PostConstruct
 	void init() {
 		actions.add(new Action(Messages.PartSashContainerEditor_AddPartSashContainer,
-			createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
+				createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
 			}
 		});
 		actions.add(new Action(Messages.PartSashContainerEditor_AddPartStack,
-			createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+				createImageDescriptor(ResourceProvider.IMG_PartStack)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART_STACK);
 			}
 		});
 		actions.add(new Action(Messages.PartSashContainerEditor_AddPart,
-			createImageDescriptor(ResourceProvider.IMG_Part)) {
+				createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART);
 			}
 		});
 		actions.add(new Action(Messages.PartSashContainerEditor_AddArea,
-			createImageDescriptor(ResourceProvider.IMG_Area)) {
+				createImageDescriptor(ResourceProvider.IMG_Area)) {
 			@Override
 			public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.AREA);
 			}
 		});
 		actions.add(new Action(Messages.PartSashContainerEditor_AddPlaceholder,
-			createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
+				createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
 			@Override
 			public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
@@ -144,25 +142,11 @@ public void run() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
+	public Image getImage(Object element) {
 		final boolean horizontal = ((MPartSashContainer) element).isHorizontal();
 
-		if (!horizontal) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_Area_vertical);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_Area_vertical);
-		}
-
-		if (horizontal) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_Area);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_Area);
-		}
-		return null;
+		return horizontal ? getImage(element, ResourceProvider.IMG_Area)
+				: getImage(element, ResourceProvider.IMG_Area_vertical);
 	}
 
 	@Override
@@ -209,7 +193,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
-		boolean isImport) {
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -231,12 +215,12 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp,
-			EMFEditProperties
-			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.AreaEditor_LabelLabel, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
 		ControlFactory.createTextField(parent, Messages.AreaEditor_Tooltip, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
 
 		// ------------------------------------------------------------
 		{
@@ -248,9 +232,9 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
-					master));
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
+							master));
 
 			new ImageTooltip(t, Messages) {
 
@@ -273,7 +257,7 @@ protected URI getImageURI() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final AreaIconDialogEditor dialog = new AreaIconDialogEditor(b.getShell(), eclipseContext, project,
-						getEditingDomain(), (MApplicationElement) getMaster().getValue(), Messages);
+							getEditingDomain(), (MApplicationElement) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -294,23 +278,23 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public String getText(Object element) {
 					return ((Boolean) element).booleanValue() ? Messages.AreaEditor_Horizontal
-						: Messages.AreaEditor_Vertical;
+							: Messages.AreaEditor_Vertical;
 				}
 			});
 			viewer.setInput(new Boolean[] { Boolean.TRUE, Boolean.FALSE });
 			final IViewerValueProperty vProp = ViewerProperties.singleSelection();
 			context.bindValue(vProp.observe(viewer),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL)
-				.observeDetail(getMaster()));
+					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL)
+					.observeDetail(getMaster()));
 		}
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.AreaEditor_SelectedElement);
 		ControlFactory.createTextField(parent, Messages.AreaEditor_ContainerData, getMaster(), context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
 					final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
@@ -327,18 +311,18 @@ protected void addPressed() {
 
 			pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
 			pickList.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER,
-				BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART,
-				BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA,
-				AdvancedPackageImpl.Literals.PLACEHOLDER });
+					BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART,
+					BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA,
+					AdvancedPackageImpl.Literals.PLACEHOLDER });
 			pickList.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -347,12 +331,12 @@ protected void addPressed() {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-			context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -374,7 +358,7 @@ private void createUITreeInspection(CTabFolder folder) {
 
 		final UIViewer objectViewer = new UIViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
-			getMaster(), resourcePool, Messages);
+				getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -383,7 +367,7 @@ protected void handleAddChild(EClass eClass) {
 		setElementId(eObject);
 
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -404,8 +388,8 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL),
-			FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL),
-			FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+				FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL),
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index b036df1891..07194fcb20 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -51,7 +51,6 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
 
 public class BindingContextEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -59,7 +58,7 @@ public class BindingContextEditor extends AbstractComponentEditor {
 
 	private StackLayout stackLayout;
 	private final IListProperty BINDING_CONTEXT__CHILDREN = EMFProperties
-		.list(CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
+			.list(CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
 
 	private final List<Action> actions = new ArrayList<Action>();
 
@@ -71,7 +70,7 @@ public BindingContextEditor() {
 	@PostConstruct
 	void init() {
 		actions.add(new Action(Messages.BindingContextEditor_AddContext,
-			createImageDescriptor(ResourceProvider.IMG_BindingContext)) {
+				createImageDescriptor(ResourceProvider.IMG_BindingContext)) {
 			@Override
 			public void run() {
 				handleAddContext();
@@ -80,8 +79,8 @@ public void run() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		return createImage(ResourceProvider.IMG_BindingContext);
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_BindingContext);
 	}
 
 	@Override
@@ -103,7 +102,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME),
-			FeaturePath.fromList(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID) };
+				FeaturePath.fromList(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID) };
 	}
 
 	@Override
@@ -142,7 +141,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 		getMaster().setValue(object);
 		enableIdGenerator(CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
@@ -168,16 +167,16 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
-			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Name, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME),
-			Messages.BindingContextEditor_NameWarning);
+				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME),
+				Messages.BindingContextEditor_NameWarning);
 		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Description, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__DESCRIPTION));
+				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__DESCRIPTION));
 
 		final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
-			Messages, this, CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN) {
+				Messages, this, CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN) {
 			@Override
 			protected void addPressed() {
 				handleAddContext();
@@ -193,7 +192,7 @@ protected List<?> getContainerChildren(Object master) {
 
 		final TableViewer viewer = pickList.getList();
 		final IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(),
-			CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
+				CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
 		viewer.setInput(prop.observeDetail(master));
 
 		item = new CTabItem(folder, SWT.NONE);
@@ -203,9 +202,9 @@ protected List<?> getContainerChildren(Object master) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createContributedEditorTabs(folder, context, getMaster(), MBindingContext.class);
 
@@ -224,7 +223,7 @@ protected void handleAddContext() {
 		setElementId(eObject);
 
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN, eObject);
+				CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 68f99664b1..c0ed63da76 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -58,7 +58,6 @@
 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.Text;
 
@@ -68,7 +67,7 @@ public class BindingTableEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private final IListProperty BINDING_TABLE__BINDINGS = EMFProperties
-		.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
+			.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<Action>();
 
@@ -80,7 +79,7 @@ public BindingTableEditor() {
 	@PostConstruct
 	void init() {
 		actions.add(new Action(Messages.BindingTableEditor_AddKeyBinding,
-			createImageDescriptor(ResourceProvider.IMG_KeyBinding)) {
+				createImageDescriptor(ResourceProvider.IMG_KeyBinding)) {
 			@Override
 			public void run() {
 				handleAddKeyBinding();
@@ -89,8 +88,8 @@ public void run() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		return createImage(ResourceProvider.IMG_BindingTable);
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_BindingTable);
 	}
 
 	@Override
@@ -137,7 +136,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master,
-		boolean isImport) {
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -168,9 +167,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
 			context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(),
-					ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(),
+							ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
 		}
 
 		{
@@ -182,11 +181,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
 			context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(
-					getEditingDomain(),
-					FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT,
-						ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(
+							getEditingDomain(),
+							FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT,
+									ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
@@ -196,10 +195,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(b.getShell(),
-						getEditor().getModelProvider(), Messages);
+							getEditor().getModelProvider(), Messages);
 					if (dialog.open() == Window.OK) {
 						final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(),
-							CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT, dialog.getSelectedContext());
+								CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT, dialog.getSelectedContext());
 						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -210,7 +209,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
-				Messages, this, CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS) {
+					Messages, this, CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS) {
 				@Override
 				protected void addPressed() {
 					handleAddKeyBinding();
@@ -237,9 +236,9 @@ protected List<?> getContainerChildren(Object master) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createContributedEditorTabs(folder, context, getMaster(), MBindingTable.class);
 
@@ -257,7 +256,7 @@ public IObservableList getChildList(Object element) {
 	public String getDetailLabel(Object element) {
 		final MBindingTable cmd = (MBindingTable) element;
 		if (cmd.getBindingContext() != null && cmd.getBindingContext().getName() != null
-			&& cmd.getBindingContext().getName().trim().length() > 0) {
+				&& cmd.getBindingContext().getName().trim().length() > 0) {
 			return cmd.getBindingContext().getName();
 		}
 
@@ -267,7 +266,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT,
-			CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME) };
+				CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME) };
 	}
 
 	@Override
@@ -280,7 +279,7 @@ public List<Action> getActions(Object element) {
 	protected void handleAddKeyBinding() {
 		final MKeyBinding handler = MCommandsFactory.INSTANCE.createKeyBinding();
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, handler);
+				CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS, handler);
 		setElementId(handler);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index 147b1d2138..e42a7423cf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -34,7 +34,6 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
 
 public class CategoryEditor extends AbstractComponentEditor {
 
@@ -48,8 +47,8 @@ public CategoryEditor() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		return createImage(ResourceProvider.IMG_Category);
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_Category);
 	}
 
 	@Override
@@ -98,12 +97,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 		getMaster().setValue(object);
 		enableIdGenerator(CommandsPackageImpl.Literals.CATEGORY__NAME,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master,
-		boolean isImport) {
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -125,12 +124,12 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
-			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.CategoryEditor_Name, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__NAME));
+				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__NAME));
 		ControlFactory.createTextField(parent, Messages.CategoryEditor_Description, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__DESCRIPTION));
+				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__DESCRIPTION));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -139,9 +138,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createContributedEditorTabs(folder, context, getMaster(), MCategory.class);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index c5645349a6..af0c2fd136 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -56,7 +56,6 @@
 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.Text;
 
@@ -69,7 +68,7 @@ public class CommandEditor extends AbstractComponentEditor {
 	private MessageFormat newCommandParameterName;
 
 	private final IEMFEditListProperty COMMAND__PARAMETERS = EMFEditProperties.list(getEditingDomain(),
-		CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
+			CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
 
 	@Inject
 	public CommandEditor() {
@@ -79,7 +78,7 @@ public CommandEditor() {
 	@PostConstruct
 	void init() {
 		actions.add(new Action(Messages.CommandEditor_AddCommandParameter,
-			createImageDescriptor(ResourceProvider.IMG_CommandParameter)) {
+				createImageDescriptor(ResourceProvider.IMG_CommandParameter)) {
 			@Override
 			public void run() {
 				handleAddCommandParameter();
@@ -90,8 +89,8 @@ public void run() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		return createImage(ResourceProvider.IMG_Command);
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_Command);
 	}
 
 	@Override
@@ -135,12 +134,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 		getMaster().setValue(object);
 		enableIdGenerator(CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master,
-		boolean isImport) {
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -162,13 +161,13 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id,
-			Messages.ModelTooling_CommandId_tooltip, master, context, textProp, EMFEditProperties.value(
-				getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID),
-				Messages.ModelTooling_Empty_Warning);
+				Messages.ModelTooling_CommandId_tooltip, master, context, textProp, EMFEditProperties.value(
+						getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID),
+						Messages.ModelTooling_Empty_Warning);
 		ControlFactory.createTextField(parent, Messages.CommandEditor_Name, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME));
+				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME));
 		ControlFactory.createTextField(parent, Messages.CommandEditor_LabelDescription, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__DESCRIPTION));
+				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__DESCRIPTION));
 
 		// ------------------------------------------------------------
 		{
@@ -182,11 +181,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			t.setLayoutData(gd);
 			t.setEditable(false);
 			context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(
-					getEditingDomain(),
-					FeaturePath.fromList(CommandsPackageImpl.Literals.COMMAND__CATEGORY,
-						ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(
+							getEditingDomain(),
+							FeaturePath.fromList(CommandsPackageImpl.Literals.COMMAND__CATEGORY,
+									ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -196,7 +195,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final CommandCategorySelectionDialog dialog = new CommandCategorySelectionDialog(b.getShell(),
-						getEditor().getModelProvider(), (MCommand) getMaster().getValue(), Messages);
+							getEditor().getModelProvider(), (MCommand) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -205,7 +204,7 @@ public void widgetSelected(SelectionEvent e) {
 		// ------------------------------------------------------------
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
-				Messages, this, CommandsPackageImpl.Literals.COMMAND__PARAMETERS) {
+					Messages, this, CommandsPackageImpl.Literals.COMMAND__PARAMETERS) {
 				@Override
 				protected void addPressed() {
 					handleAddCommandParameter();
@@ -223,7 +222,7 @@ protected List<?> getContainerChildren(Object master) {
 			final TableViewer viewer = pickList.getList();
 
 			final IEMFEditListProperty mProp = EMFEditProperties.list(getEditingDomain(),
-				CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
+					CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
 			viewer.setInput(mProp.observeDetail(getMaster()));
 		}
 
@@ -234,9 +233,9 @@ protected List<?> getContainerChildren(Object master) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createContributedEditorTabs(folder, context, getMaster(), MCommand.class);
 
@@ -270,7 +269,7 @@ protected void handleAddCommandParameter() {
 		param.setName(newCommandParameterName.format(new Object[] { getParameterCount() }));
 
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			CommandsPackageImpl.Literals.COMMAND__PARAMETERS, param);
+				CommandsPackageImpl.Literals.COMMAND__PARAMETERS, param);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 3db9f0a885..5abd04f0ca 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -37,7 +37,6 @@
 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;
 
 public class CommandParameterEditor extends AbstractComponentEditor {
@@ -54,12 +53,12 @@ public CommandParameterEditor() {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME),
-			FeaturePath.fromList(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID) };
+				FeaturePath.fromList(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID) };
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		return createImage(ResourceProvider.IMG_CommandParameter);
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_CommandParameter);
 	}
 
 	@Override
@@ -138,14 +137,14 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
-			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID),
-			Messages.ModelTooling_Empty_Warning);
+				EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID),
+				Messages.ModelTooling_Empty_Warning);
 		ControlFactory.createTextField(parent, Messages.CommandParameterEditor_Name, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME),
-			Messages.ModelTooling_Empty_Warning);
+				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME),
+				Messages.ModelTooling_Empty_Warning);
 		ControlFactory.createTextField(parent, Messages.CommandParameterEditor_TypeId, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__TYPE_ID));
+				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__TYPE_ID));
 
 		{
 			final Label l = new Label(parent, SWT.NONE);
@@ -156,7 +155,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
 
 			final IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(),
-				CommandsPackageImpl.Literals.COMMAND_PARAMETER__OPTIONAL);
+					CommandsPackageImpl.Literals.COMMAND_PARAMETER__OPTIONAL);
 			final IWidgetValueProperty uiProp = WidgetProperties.selection();
 
 			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
@@ -169,9 +168,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createContributedEditorTabs(folder, context, getMaster(), MCommandParameter.class);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index 9e47c63491..cf480368b5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -73,7 +73,6 @@
 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.Text;
@@ -84,7 +83,7 @@ public class CompositePartEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<Action>();
 	private final List<Action> actionsImport = new ArrayList<Action>();
@@ -107,14 +106,14 @@ public CompositePartEditor() {
 	@PostConstruct
 	void init() {
 		actions.add(new Action(Messages.CompositePartEditor_AddPartSashContainer,
-			createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
+				createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.COMPOSITE_PART);
 			}
 		});
 		actions.add(new Action(Messages.CompositePartEditor_AddPartStack,
-			createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+				createImageDescriptor(ResourceProvider.IMG_PartStack)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART_STACK);
@@ -134,14 +133,14 @@ public void run() {
 			}
 		});
 		actions.add(new Action(Messages.CompositePartEditor_AddPlaceholder,
-			createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
+				createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
 			@Override
 			public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
 			}
 		});
 		for (final FeatureClass c : getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK,
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN)) {
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN)) {
 			final EClass ec = c.eClass;
 			actions.add(new Action(c.label, createImageDescriptor(c.iconId)) {
 				@Override
@@ -168,25 +167,12 @@ public void run() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
+	public Image getImage(Object element) {
 		final boolean horizontal = ((MCompositePart) element).isHorizontal();
 
-		if (!horizontal) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_PartSashContainer_vertical);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_PartSashContainer_vertical);
-		}
+		return horizontal ? getImage(element, ResourceProvider.IMG_PartSashContainer)
+				: getImage(element, ResourceProvider.IMG_PartSashContainer_vertical);
 
-		if (horizontal) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_PartSashContainer);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_PartSashContainer);
-		}
-		return null;
 	}
 
 	@Override
@@ -233,7 +219,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
-		boolean isImport) {
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -255,15 +241,15 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
-			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-			context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createTextField(parent, Messages.CompositePartEditor_LabelLabel, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
 		ControlFactory.createTextField(parent, Messages.CompositePartEditor_Tooltip, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
 
 		// ------------------------------------------------------------
 		{
@@ -276,9 +262,9 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
-					master));
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
+							master));
 
 			new ImageTooltip(t, Messages) {
 
@@ -301,7 +287,7 @@ protected URI getImageURI() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), eclipseContext, project,
-						getEditingDomain(), (MPart) getMaster().getValue(), Messages);
+							getEditingDomain(), (MPart) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -322,19 +308,19 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public String getText(Object element) {
 					return ((Boolean) element).booleanValue() ? Messages.CompositePartEditor_Horizontal
-						: Messages.CompositePartEditor_Vertical;
+							: Messages.CompositePartEditor_Vertical;
 				}
 			});
 			viewer.setInput(new Boolean[] { Boolean.TRUE, Boolean.FALSE });
 			final IViewerValueProperty vProp = ViewerProperties.singleSelection();
 			context.bindValue(vProp.observe(viewer),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL)
-				.observeDetail(getMaster()));
+					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL)
+					.observeDetail(getMaster()));
 		}
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.CompositePartEditor_SelectedElement);
 		ControlFactory.createTextField(parent, Messages.CompositePartEditor_ContainerData, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		{
 
@@ -364,7 +350,7 @@ public String getText(Object element) {
 			eClassList.add(new FeatureClass("Area", AdvancedPackageImpl.Literals.AREA)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER)); //$NON-NLS-1$
 			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.COMPOSITE_PART,
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
+					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
 			childrenDropDown.setInput(eClassList);
 			childrenDropDown.setSelection(new StructuredSelection(eClassList.get(0)));
 
@@ -377,7 +363,7 @@ public String getText(Object element) {
 				public void widgetSelected(SelectionEvent e) {
 					if (!childrenDropDown.getSelection().isEmpty()) {
 						final EClass eClass = ((FeatureClass) ((IStructuredSelection) childrenDropDown.getSelection())
-							.getFirstElement()).eClass;
+								.getFirstElement()).eClass;
 						handleAddChild(eClass);
 					}
 				}
@@ -415,7 +401,7 @@ public void widgetSelected(SelectionEvent e) {
 							final int idx = container.getChildren().indexOf(obj) - 1;
 							if (idx >= 0) {
 								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor()
-									.isLiveModel(), idx)) {
+										.isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
@@ -439,7 +425,7 @@ public void widgetSelected(SelectionEvent e) {
 							final int idx = container.getChildren().indexOf(obj) + 1;
 							if (idx < container.getChildren().size()) {
 								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor()
-									.isLiveModel(), idx)) {
+										.isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
 								}
 							}
@@ -459,7 +445,7 @@ public void widgetSelected(SelectionEvent e) {
 						final List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
 
 						final Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(),
-							UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
+								UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
 						if (cmd.canExecute()) {
 							getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -469,11 +455,11 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -482,9 +468,9 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -506,7 +492,7 @@ private void createUITreeInspection(CTabFolder folder) {
 
 		final UIViewer objectViewer = new UIViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
-			getMaster(), resourcePool, Messages);
+				getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -523,7 +509,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL),
-			FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 	protected void handleAddChild(EClass eClass) {
@@ -535,7 +521,7 @@ private void addToModel(EObject eObject) {
 		setElementId(eObject);
 
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index 0c81147f4e..e36f7e3aa5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -35,7 +35,6 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
@@ -49,8 +48,8 @@ public CoreExpressionEditor() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		return createImage(ResourceProvider.IMG_CoreExpression);
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_CoreExpression);
 	}
 
 	@Override
@@ -61,7 +60,7 @@ public String getLabel(Object element) {
 	@Override
 	public String getDetailLabel(Object element) {
 		if (((MCoreExpression) element).getCoreExpressionId() != null
-			&& ((MCoreExpression) element).getCoreExpressionId().trim().length() > 0) {
+				&& ((MCoreExpression) element).getCoreExpressionId().trim().length() > 0) {
 			return ((MCoreExpression) element).getCoreExpressionId();
 		}
 		return null;
@@ -109,8 +108,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.CORE_EXPRESSION__CORE_EXPRESSION_ID)
-				.observeDetail(getMaster()));
+					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.CORE_EXPRESSION__CORE_EXPRESSION_ID)
+					.observeDetail(getMaster()));
 
 			if (getEditor().getExtensionLookup() == null) {
 				gd.horizontalSpan = 2;
@@ -122,8 +121,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 					@Override
 					public void widgetSelected(SelectionEvent e) {
 						final ExpressionIdDialog dialog = new ExpressionIdDialog(t.getShell(), getEditor()
-							.getExtensionLookup(), (MCoreExpression) getMaster().getValue(), getEditingDomain(),
-							getEditor().isLiveModel(), Messages);
+								.getExtensionLookup(), (MCoreExpression) getMaster().getValue(), getEditingDomain(),
+								getEditor().isLiveModel(), Messages);
 						dialog.open();
 					}
 				});
@@ -137,9 +136,9 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createContributedEditorTabs(folder, context, getMaster(), MCoreExpression.class);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java
index 784850751a..caf78604b3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java
@@ -5,12 +5,11 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class DefaultEditor extends AbstractComponentEditor {
 
 	@Override
-	public Image getImage(Object element, Display display) {
+	public Image getImage(Object element) {
 		// no image
 		return null;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java
index 4f531b0eb5..40a4aa8ca1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java
@@ -14,26 +14,15 @@
 import java.util.List;
 
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.basic.MDialog;
 import org.eclipse.jface.action.Action;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
 
 public class DialogEditor extends WindowEditor {
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				final Image img = getImageFromIconURI(uiElement);
-				return img != null ? img : createImage(ResourceProvider.IMG_Dialog);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_Dialog);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_Dialog);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 4298b057aa..37d730068e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -30,7 +30,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MDirectMenuItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
@@ -53,14 +52,13 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
 public class DirectMenuItemEditor extends MenuItemEditor {
 	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
-		.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
+			.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
 	@Inject
 	IEclipseContext eclipseContext;
@@ -71,21 +69,13 @@ public DirectMenuItemEditor() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_DirectMenuItem);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_DirectMenuItem);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_DirectMenuItem);
 	}
 
 	@Override
 	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master,
-		boolean isImport) {
+			boolean isImport) {
 		if (!isImport) {
 			final CTabFolder folder = super.createForm(parent, context, master, isImport);
 			createInstanceInspection(folder);
@@ -103,7 +93,7 @@ private void createInstanceInspection(CTabFolder folder) {
 
 		final ObjectViewer objectViewer = new ObjectViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container,
-			ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
+				ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
 	}
@@ -126,7 +116,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 		final Link lnk;
 		{
 			final IContributionClassCreator c = getEditor().getContributionCreator(
-				MenuPackageImpl.Literals.DIRECT_MENU_ITEM);
+					MenuPackageImpl.Literals.DIRECT_MENU_ITEM);
 			if (project != null && c != null) {
 				lnk = new Link(parent, SWT.NONE);
 				lnk.setText("<A>" + Messages.DirectMenuItemEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
@@ -135,7 +125,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 					@Override
 					public void widgetSelected(SelectionEvent e) {
 						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project,
-							lnk.getShell());
+								lnk.getShell());
 					}
 				});
 			} else {
@@ -158,11 +148,11 @@ public void modifyText(ModifyEvent e) {
 				}
 			});
 			final Binding binding = context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(),
-					ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master),
-					new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
-					new UpdateValueStrategy());
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(),
+							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master),
+							new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+							new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
@@ -173,8 +163,8 @@ public void modifyText(ModifyEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
-						getEditingDomain(), (MContribution) getMaster().getValue(),
-						ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+							getEditingDomain(), (MContribution) getMaster().getValue(),
+							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 59fffc2332..871646f3f7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -29,7 +29,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MDirectToolItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
@@ -52,14 +51,13 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
 public class DirectToolItemEditor extends ToolItemEditor {
 	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
-		.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
+			.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
 	@Inject
 	IEclipseContext eclipseContext;
@@ -70,17 +68,8 @@ public DirectToolItemEditor() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				final Image img = getImageFromIconURI(uiElement);
-				return img != null ? img : createImage(ResourceProvider.IMG_DirectToolItem);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_DirectToolItem);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_DirectToolItem);
 	}
 
 	@Override
@@ -88,7 +77,7 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		final IContributionClassCreator c = getEditor().getContributionCreator(
-			MenuPackageImpl.Literals.DIRECT_TOOL_ITEM);
+				MenuPackageImpl.Literals.DIRECT_TOOL_ITEM);
 		final Link lnk;
 		if (project != null && c != null) {
 			lnk = new Link(parent, SWT.NONE);
@@ -120,9 +109,9 @@ public void modifyText(ModifyEvent e) {
 			}
 		});
 		final Binding binding = context.bindValue(textProp.observeDelayed(200, t),
-			EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI)
-			.observeDetail(master), new UpdateValueStrategy()
-		.setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
+				EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI)
+				.observeDetail(master), new UpdateValueStrategy()
+				.setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
 		Util.addDecoration(t, binding);
 
 		final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
@@ -133,8 +122,8 @@ public void modifyText(ModifyEvent e) {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
-					getEditingDomain(), (MContribution) getMaster().getValue(),
-					ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+						getEditingDomain(), (MContribution) getMaster().getValue(),
+						ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 				dialog.open();
 			}
 		});
@@ -142,7 +131,7 @@ public void widgetSelected(SelectionEvent e) {
 
 	@Override
 	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master,
-		boolean isImport) {
+			boolean isImport) {
 		if (!isImport) {
 			final CTabFolder folder = super.createForm(parent, context, master, isImport);
 			createInstanceInspection(folder);
@@ -160,7 +149,7 @@ private void createInstanceInspection(CTabFolder folder) {
 
 		final ObjectViewer objectViewer = new ObjectViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container,
-			ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
+				ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
index 216c817d8f..abdd78aa77 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
@@ -30,7 +30,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MDynamicMenuContribution;
@@ -53,7 +52,6 @@
 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.Link;
 import org.eclipse.swt.widgets.Text;
@@ -87,15 +85,8 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				return createImage(ResourceProvider.IMG_DynamicMenuContribution);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_DynamicMenuContribution);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_DynamicMenuContribution);
 	}
 
 	@Override
@@ -137,7 +128,7 @@ protected Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
-		boolean isImport) {
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -159,17 +150,17 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
+				EMFEditProperties
 				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTranslatedTextField(parent, Messages.DynamicMenuContributionEditor_LabelLabel,
-			getMaster(), context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
+				getMaster(), context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
 
 		// ------------------------------------------------------------
 		final Link lnk;
 		{
 			final IContributionClassCreator c = getEditor().getContributionCreator(
-				MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION);
+					MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION);
 			if (project != null && c != null) {
 				lnk = new Link(parent, SWT.NONE);
 				lnk.setText("<A>" + Messages.DynamicMenuContributionEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
@@ -178,7 +169,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 					@Override
 					public void widgetSelected(SelectionEvent e) {
 						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project,
-							lnk.getShell());
+								lnk.getShell());
 					}
 				});
 			} else {
@@ -201,11 +192,11 @@ public void modifyText(ModifyEvent e) {
 				}
 			});
 			final Binding binding = context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(),
-					ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()),
-				new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
-				new UpdateValueStrategy());
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(),
+							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()),
+							new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+							new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
@@ -216,8 +207,8 @@ public void modifyText(ModifyEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
-						getEditingDomain(), (MContribution) getMaster().getValue(),
-						ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+							getEditingDomain(), (MContribution) getMaster().getValue(),
+							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index fcafdf9806..9c65ccf529 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -26,7 +26,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledMenuItemCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
@@ -45,16 +44,15 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
 public class HandledMenuItemEditor extends MenuItemEditor {
 
 	private final IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(),
-		MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
+			MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
 	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
-		.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
+			.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
 	@Inject
 	private IModelResource resource;
@@ -65,17 +63,8 @@ public HandledMenuItemEditor() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				final Image img = getImageFromIconURI(uiElement);
-				return img != null ? img : createImage(ResourceProvider.IMG_HandledMenuItem);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_HandledMenuItem);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_HandledMenuItem);
 	}
 
 	@Override
@@ -103,9 +92,9 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
 			context.bindValue(textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND)
-				.observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy()
-			.setConverter(new CommandToStringConverter(Messages)));
+					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND)
+					.observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy()
+					.setConverter(new CommandToStringConverter(Messages)));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -115,7 +104,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final HandledMenuItemCommandSelectionDialog dialog = new HandledMenuItemCommandSelectionDialog(b
-						.getShell(), (MHandledItem) getMaster().getValue(), resource, Messages);
+							.getShell(), (MHandledItem) getMaster().getValue(), resource, Messages);
 					dialog.open();
 				}
 			});
@@ -145,7 +134,7 @@ public void handleValueChange(ValueChangeEvent event) {
 		});
 
 		list.add(new VirtualEntry<MParameter>(ModelEditor.VIRTUAL_PARAMETERS, HANDLED_ITEM__PARAMETERS, element,
-			Messages.HandledMenuItemEditor_Parameters) {
+				Messages.HandledMenuItemEditor_Parameters) {
 			@Override
 			protected boolean accepted(MParameter o) {
 				return true;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 5c4258f765..2287f6c9b7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -25,7 +25,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledToolItemCommandSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledToolItem;
@@ -44,16 +43,15 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
 public class HandledToolItemEditor extends ToolItemEditor {
 
 	private final IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(),
-		MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
+			MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
 	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
-		.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
+			.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 
 	@Inject
 	private IModelResource resource;
@@ -64,17 +62,8 @@ public HandledToolItemEditor() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				final Image img = getImageFromIconURI(uiElement);
-				return img != null ? img : createImage(ResourceProvider.IMG_HandledToolItem);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_HandledToolItem);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_HandledToolItem);
 	}
 
 	@Override
@@ -91,9 +80,9 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
 			context.bindValue(textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND)
-				.observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy()
-			.setConverter(new CommandToStringConverter(Messages)));
+					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND)
+					.observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy()
+					.setConverter(new CommandToStringConverter(Messages)));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -103,7 +92,7 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final HandledToolItemCommandSelectionDialog dialog = new HandledToolItemCommandSelectionDialog(b
-						.getShell(), (MHandledItem) getMaster().getValue(), resource, Messages);
+							.getShell(), (MHandledItem) getMaster().getValue(), resource, Messages);
 					dialog.open();
 				}
 			});
@@ -144,7 +133,7 @@ public void handleValueChange(ValueChangeEvent event) {
 		});
 
 		list.add(new VirtualEntry<MParameter>(ModelEditor.VIRTUAL_PARAMETERS, HANDLED_ITEM__PARAMETERS, element,
-			Messages.HandledToolItemEditor_Parameters) {
+				Messages.HandledToolItemEditor_Parameters) {
 			@Override
 			protected boolean accepted(MParameter o) {
 				return true;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 0248273444..ab936eeb1c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -13,6 +13,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -56,7 +57,6 @@
 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.Link;
 import org.eclipse.swt.widgets.Text;
@@ -82,8 +82,8 @@ public HandlerEditor() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		return createImage(ResourceProvider.IMG_Handler);
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_Handler);
 	}
 
 	@Override
@@ -130,7 +130,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -138,7 +138,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -154,11 +154,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.HandlerEditor_Command);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
@@ -171,7 +171,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					HandlerCommandSelectionDialog dialog = new HandlerCommandSelectionDialog(b.getShell(), (MHandler) getMaster().getValue(), resource, Messages);
+					final HandlerCommandSelectionDialog dialog = new HandlerCommandSelectionDialog(b.getShell(), (MHandler) getMaster().getValue(), resource, Messages);
 					dialog.open();
 				}
 			});
@@ -193,12 +193,12 @@ public void widgetSelected(SelectionEvent e) {
 				});
 			} else {
 				lnk = null;
-				Label l = new Label(parent, SWT.NONE);
+				final Label l = new Label(parent, SWT.NONE);
 				l.setText(Messages.HandlerEditor_ClassURI);
 				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 			}
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.addModifyListener(new ModifyListener() {
@@ -206,11 +206,11 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void modifyText(ModifyEvent e) {
 					if (lnk != null) {
-						lnk.setToolTipText(((Text) (e.getSource())).getText());
+						lnk.setToolTipText(((Text) e.getSource()).getText());
 					}
 				}
 			});
-			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
+			final Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
@@ -220,7 +220,7 @@ public void modifyText(ModifyEvent e) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
@@ -246,14 +246,14 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	private void createInstanceInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeContributionInstance);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		ObjectViewer objectViewer = new ObjectViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
+		final ObjectViewer objectViewer = new ObjectViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
 	}
@@ -265,7 +265,7 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MHandler handler = (MHandler) element;
+		final MHandler handler = (MHandler) element;
 		if (handler.getCommand() != null && handler.getCommand().getCommandName() != null && handler.getCommand().getCommandName().trim().length() > 0) {
 			return handler.getCommand().getCommandName();
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 79c3ec80da..33780ec259 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -12,13 +12,13 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import org.eclipse.e4.tools.emf.ui.common.Plugin;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -28,6 +28,7 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.common.Plugin;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -65,7 +66,6 @@
 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.Text;
 
@@ -74,9 +74,9 @@ public class KeyBindingEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private StackLayout stackLayout;
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
-	private IEMFEditListProperty KEY_BINDING__PARAMETERS = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS);
+	private final IEMFEditListProperty KEY_BINDING__PARAMETERS = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS);
 
 	@Inject
 	private IModelResource resource;
@@ -97,8 +97,8 @@ public void run() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		return createImage(ResourceProvider.IMG_KeyBinding);
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_KeyBinding);
 	}
 
 	@Override
@@ -145,7 +145,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -157,7 +157,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -169,26 +169,26 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.KeyBindingEditor_Sequence);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_SEQUENCE__KEY_SEQUENCE).observeDetail(getMaster()), new UpdateValueStrategy().setBeforeSetValidator(new BindingValidator()), new UpdateValueStrategy());
+			final Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_SEQUENCE__KEY_SEQUENCE).observeDetail(getMaster()), new UpdateValueStrategy().setBeforeSetValidator(new BindingValidator()), new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 		}
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.KeyBindingEditor_Command);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
@@ -201,14 +201,14 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					KeyBindingCommandSelectionDialog dialog = new KeyBindingCommandSelectionDialog(b.getShell(), (MKeyBinding) getMaster().getValue(), resource, Messages);
+					final KeyBindingCommandSelectionDialog dialog = new KeyBindingCommandSelectionDialog(b.getShell(), (MKeyBinding) getMaster().getValue(), resource, Messages);
 					dialog.open();
 				}
 			});
 		}
 
 		{
-			E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS) {
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS) {
 				@Override
 				protected void addPressed() {
 					handleAddParameter();
@@ -251,7 +251,7 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MKeySequence seq = (MKeySequence) element;
+		final MKeySequence seq = (MKeySequence) element;
 		if (seq.getKeySequence() != null && seq.getKeySequence().trim().length() > 0) {
 			return seq.getKeySequence();
 		}
@@ -267,36 +267,36 @@ class BindingValidator implements IValidator {
 
 		@Override
 		public IStatus validate(Object value) {
-			int statusCode = getEditor().isLiveModel() ? IStatus.ERROR : IStatus.WARNING;
+			final int statusCode = getEditor().isLiveModel() ? IStatus.ERROR : IStatus.WARNING;
 			if (value != null && value.toString().trim().length() > 0) {
 				try {
-					KeySequence keySequence = KeySequence.getInstance(value.toString());
+					final KeySequence keySequence = KeySequence.getInstance(value.toString());
 					if (!keySequence.isComplete()) {
-						return new Status(statusCode, Plugin.ID, Messages.KeyBindingEditor_SequenceNotComplete); 
+						return new Status(statusCode, Plugin.ID, Messages.KeyBindingEditor_SequenceNotComplete);
 					}
 					if (keySequence.isEmpty()) {
-						return new Status(statusCode, Plugin.ID, Messages.KeyBindingEditor_SequenceEmpty); 
+						return new Status(statusCode, Plugin.ID, Messages.KeyBindingEditor_SequenceEmpty);
 					}
 					if (!value.toString().toUpperCase().equals(value.toString())) {
-						return new Status(IStatus.ERROR, Plugin.ID, Messages.KeyBindingEditor_SequenceLowercase); 
+						return new Status(IStatus.ERROR, Plugin.ID, Messages.KeyBindingEditor_SequenceLowercase);
 					}
 
 					return Status.OK_STATUS;
-				} catch (Exception e) {
-					return new Status(statusCode, Plugin.ID, e.getMessage(), e); 
+				} catch (final Exception e) {
+					return new Status(statusCode, Plugin.ID, e.getMessage(), e);
 				}
 			}
 
-			return new Status(statusCode, Plugin.ID, Messages.KeyBindingEditor_SequenceEmpty); 
+			return new Status(statusCode, Plugin.ID, Messages.KeyBindingEditor_SequenceEmpty);
 		}
 	}
 
 	protected void handleAddParameter() {
-		MKeyBinding item = (MKeyBinding) getMaster().getValue();
-		MParameter param = MCommandsFactory.INSTANCE.createParameter();
+		final MKeyBinding item = (MKeyBinding) getMaster().getValue();
+		final MParameter param = MCommandsFactory.INSTANCE.createParameter();
 		setElementId(param);
 
-		Command cmd = AddCommand.create(getEditingDomain(), item, CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS, param);
+		final Command cmd = AddCommand.create(getEditingDomain(), item, CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS, param);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
@@ -304,7 +304,7 @@ protected void handleAddParameter() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 2f16ac52d6..1b0b4f50ce 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -32,7 +32,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIdDialog;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
@@ -65,7 +64,6 @@
 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.Text;
 
@@ -74,7 +72,7 @@ public class MenuContributionEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<Action>();
 
@@ -92,7 +90,7 @@ public MenuContributionEditor() {
 	@PostConstruct
 	void init() {
 		actions.add(new Action(Messages.MenuEditor_AddHandledMenuItem,
-			createImageDescriptor(ResourceProvider.IMG_HandledMenuItem)) {
+				createImageDescriptor(ResourceProvider.IMG_HandledMenuItem)) {
 			@Override
 			public void run() {
 				handleAdd(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
@@ -105,21 +103,21 @@ public void run() {
 			}
 		});
 		actions.add(new Action(Messages.MenuEditor_AddDirectMenuItem,
-			createImageDescriptor(ResourceProvider.IMG_DirectMenuItem)) {
+				createImageDescriptor(ResourceProvider.IMG_DirectMenuItem)) {
 			@Override
 			public void run() {
 				handleAdd(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false);
 			}
 		});
 		actions.add(new Action(Messages.MenuEditor_AddSeparator,
-			createImageDescriptor(ResourceProvider.IMG_MenuSeparator)) {
+				createImageDescriptor(ResourceProvider.IMG_MenuSeparator)) {
 			@Override
 			public void run() {
 				handleAdd(MenuPackageImpl.Literals.MENU_SEPARATOR, true);
 			}
 		});
 		actions.add(new Action(Messages.MenuEditor_AddDynamicMenuContribution,
-			createImageDescriptor(ResourceProvider.IMG_DynamicMenuContribution)) {
+				createImageDescriptor(ResourceProvider.IMG_DynamicMenuContribution)) {
 			@Override
 			public void run() {
 				handleAdd(MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false);
@@ -128,15 +126,8 @@ public void run() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				return createImage(ResourceProvider.IMG_MenuContribution);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_MenuContribution);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_MenuContribution);
 	}
 
 	@Override
@@ -209,11 +200,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
+				EMFEditProperties
 				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-			context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		{
 			final Label l = new Label(parent, SWT.NONE);
@@ -225,7 +216,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID)
+					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID)
 					.observeDetail(getMaster()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
@@ -236,7 +227,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final MenuIdDialog dialog = new MenuIdDialog(t.getShell(), resource,
-						(MMenuContribution) getMaster().getValue(), getEditingDomain(), modelService, Messages);
+							(MMenuContribution) getMaster().getValue(), getEditingDomain(), modelService, Messages);
 					dialog.open();
 				}
 			});
@@ -244,14 +235,14 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		ControlFactory
-			.createTextField(parent, Messages.MenuContributionEditor_Position, master, context, textProp,
+		.createTextField(parent, Messages.MenuContributionEditor_Position, master, context, textProp,
 				EMFEditProperties.value(getEditingDomain(),
-					MenuPackageImpl.Literals.MENU_CONTRIBUTION__POSITION_IN_PARENT));
+						MenuPackageImpl.Literals.MENU_CONTRIBUTION__POSITION_IN_PARENT));
 
 		// ------------------------------------------------------------
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
 					final Struct struct = (Struct) ((IStructuredSelection) getSelection()).getFirstElement();
@@ -259,7 +250,7 @@ protected void addPressed() {
 					final MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
 
 					final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-						UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+							UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
@@ -274,29 +265,29 @@ protected void addPressed() {
 
 			final TableViewer viewer = pickList.getList();
 			final IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(),
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
 
 			final Struct defaultStruct = new Struct(Messages.MenuContributionEditor_HandledMenuItem,
-				MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
+					MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
 			pickList.setInput(new Struct[] {
-				new Struct(Messages.MenuContributionEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true),
-				new Struct(Messages.MenuContributionEditor_Menu, MenuPackageImpl.Literals.MENU, false),
-				defaultStruct,
-				new Struct(Messages.MenuContributionEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM,
-					false),
-				new Struct(Messages.MenuContributionEditor_DynamicMenuContribution,
-					MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
+					new Struct(Messages.MenuContributionEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true),
+					new Struct(Messages.MenuContributionEditor_Menu, MenuPackageImpl.Literals.MENU, false),
+					defaultStruct,
+					new Struct(Messages.MenuContributionEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM,
+							false),
+							new Struct(Messages.MenuContributionEditor_DynamicMenuContribution,
+									MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
 			pickList.setSelection(new StructuredSelection(defaultStruct));
 
 		}
 
 		ControlFactory
-			.createCheckBox(
+		.createCheckBox(
 				parent,
 				"To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
 		ControlFactory
-			.createCheckBox(
+		.createCheckBox(
 				parent,
 				"Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
@@ -307,9 +298,9 @@ protected void addPressed() {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createContributedEditorTabs(folder, context, getMaster(), MMenuContribution.class);
 
@@ -332,7 +323,7 @@ protected void handleAdd(EClass eClass, boolean separator) {
 		final MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
 		setElementId(eObject);
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index e8e0f63cba..b235e4f587 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -88,7 +88,6 @@
 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.Text;
 
@@ -98,9 +97,9 @@ public class MenuEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
-		.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
+			.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<Action>();
 
@@ -121,7 +120,7 @@ public MenuEditor() {
 	@PostConstruct
 	void init() {
 		actions.add(new Action(Messages.MenuEditor_AddHandledMenuItem,
-			createImageDescriptor(ResourceProvider.IMG_HandledMenuItem)) {
+				createImageDescriptor(ResourceProvider.IMG_HandledMenuItem)) {
 			@Override
 			public void run() {
 				handleAdd(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
@@ -134,33 +133,33 @@ public void run() {
 			}
 		});
 		actions.add(new Action(Messages.MenuEditor_AddDirectMenuItem,
-			createImageDescriptor(ResourceProvider.IMG_DirectMenuItem)) {
+				createImageDescriptor(ResourceProvider.IMG_DirectMenuItem)) {
 			@Override
 			public void run() {
 				handleAdd(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false);
 			}
 		});
 		actions.add(new Action(Messages.MenuEditor_AddSeparator,
-			createImageDescriptor(ResourceProvider.IMG_MenuSeparator)) {
+				createImageDescriptor(ResourceProvider.IMG_MenuSeparator)) {
 			@Override
 			public void run() {
 				handleAdd(MenuPackageImpl.Literals.MENU_SEPARATOR, true);
 			}
 		});
 		actions.add(new Action(Messages.MenuEditor_AddDynamicMenuContribution,
-			createImageDescriptor(ResourceProvider.IMG_DynamicMenuContribution)) {
+				createImageDescriptor(ResourceProvider.IMG_DynamicMenuContribution)) {
 			@Override
 			public void run() {
 				handleAdd(MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false);
 			}
 		});
 		addExpression = new Action(Messages.MenuEditor_AddCoreExpression,
-			createImageDescriptor(ResourceProvider.IMG_CoreExpression)) {
+				createImageDescriptor(ResourceProvider.IMG_CoreExpression)) {
 			@Override
 			public void run() {
 				final MUIElement e = (MUIElement) getMaster().getValue();
 				final Command cmd = SetCommand.create(getEditingDomain(), e,
-					UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN, MUiFactory.INSTANCE.createCoreExpression());
+						UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN, MUiFactory.INSTANCE.createCoreExpression());
 				if (cmd.canExecute()) {
 					getEditingDomain().getCommandStack().execute(cmd);
 				}
@@ -169,17 +168,8 @@ public void run() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				final Image img = getImageFromIconURI(uiElement);
-				return img != null ? img : createImage(ResourceProvider.IMG_Menu);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_Menu);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_Menu);
 	}
 
 	@Override
@@ -218,12 +208,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 		getMaster().setValue(object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master,
-		boolean rootMenu, boolean isImport) {
+			boolean rootMenu, boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -245,18 +235,18 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
-			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		// ------------------------------------------------------------
 		if (!rootMenu) {
 			ControlFactory.createTranslatedTextField(parent, Messages.MenuEditor_LabelLabel, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool,
-				project);
+					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool,
+					project);
 		}
 
 		ControlFactory.createTextField(parent, Messages.MenuEditor_Mnemonics, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS));
+				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS));
 
 		{
 
@@ -269,23 +259,23 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			// new Label(parent, SWT.NONE);
 
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			pickList.setText(Messages.MenuEditor_Children);
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 
 			final Struct defaultStruct = new Struct(Messages.MenuEditor_HandledMenuItem,
-				MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
+					MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
 			pickList.setInput(new Struct[] {
-				new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true),
-				new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false),
-				defaultStruct,
-				new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false),
-				new Struct(Messages.MenuEditor_DynamicMenuContribution,
-					MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
+					new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true),
+					new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false),
+					defaultStruct,
+					new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false),
+					new Struct(Messages.MenuEditor_DynamicMenuContribution,
+							MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
 			pickList.setSelection(new StructuredSelection(defaultStruct));
 
 			final IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(),
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			pickList.getList().setInput(prop.observeDetail(master));
 
 		}
@@ -293,8 +283,8 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		// ------------------------------------------------------------
 		if (!rootMenu) {
 			ControlFactory.createTranslatedTextField(parent, Messages.MenuEditor_Tooltip, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool,
-				project);
+					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool,
+					project);
 		}
 
 		// ------------------------------------------------------------
@@ -307,9 +297,9 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
-					master));
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
+							master));
 
 			new ImageTooltip(t, Messages) {
 
@@ -332,7 +322,7 @@ protected URI getImageURI() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final MenuIconDialogEditor dialog = new MenuIconDialogEditor(b.getShell(), eclipseContext, project,
-						getEditingDomain(), (MMenu) getMaster().getValue(), Messages);
+							getEditingDomain(), (MMenu) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -361,20 +351,20 @@ public String getText(Object element) {
 			list.add(Messages.MenuItemEditor_NoExpression);
 			list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
 			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION,
-				UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
+					UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
 			combo.setInput(list);
 			context.bindValue(ViewerProperties.singleSelection().observe(combo),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN)
-				.observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)),
-				new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
+					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN)
+					.observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)),
+					new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -383,12 +373,12 @@ public String getText(Object element) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-			context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -410,7 +400,7 @@ private void createUITreeInspection(CTabFolder folder) {
 
 		final UIViewer objectViewer = new UIViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
-			getMaster(), resourcePool, Messages);
+				getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -499,7 +489,7 @@ protected void handleAdd(EClass eClass, boolean separator) {
 		final MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
 		setElementId(eObject);
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 3bdcd1b638..7db857de43 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -71,7 +71,6 @@
 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.Text;
 
@@ -98,12 +97,12 @@ public MenuItemEditor() {
 	@PostConstruct
 	void init() {
 		addExpression = new Action(Messages.MenuItemEditor_AddCoreExpression,
-			createImageDescriptor(ResourceProvider.IMG_CoreExpression)) {
+				createImageDescriptor(ResourceProvider.IMG_CoreExpression)) {
 			@Override
 			public void run() {
 				final MUIElement e = (MUIElement) getMaster().getValue();
 				final Command cmd = SetCommand.create(getEditingDomain(), e,
-					UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN, MUiFactory.INSTANCE.createCoreExpression());
+						UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN, MUiFactory.INSTANCE.createCoreExpression());
 				if (cmd.canExecute()) {
 					getEditingDomain().getCommandStack().execute(cmd);
 				}
@@ -112,16 +111,8 @@ public void run() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				final Image img = getImageFromIconURI(element);
-				return img != null ? img : createImage(ResourceProvider.IMG_MenuItem);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_MenuItem);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_MenuItem);
 	}
 
 	@Override
@@ -155,12 +146,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 		getMaster().setValue(object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
 	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master,
-		boolean isImport) {
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -184,8 +175,8 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
-			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		if (this.getClass() != MenuItemEditor.class) {
 			// ------------------------------------------------------------
@@ -201,18 +192,18 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 				gd.horizontalSpan = 2;
 				viewer.getControl().setLayoutData(gd);
 				final IObservableValue itemTypeObs = EMFEditProperties.value(getEditingDomain(),
-					MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(master);
+						MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(master);
 				context.bindValue(ViewerProperties.singleSelection().observe(viewer), itemTypeObs);
 			}
 		}
 
 		ControlFactory.createTranslatedTextField(parent, Messages.MenuItemEditor_Label, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
 		ControlFactory.createTextField(parent, Messages.MenuItemEditor_Mnemonics, getMaster(), context, textProp,
-			EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS));
+				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS));
 		ControlFactory.createTranslatedTextField(parent, Messages.MenuItemEditor_Tooltip, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool,
-			project);
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool,
+				project);
 
 		// ------------------------------------------------------------
 		{
@@ -224,9 +215,9 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
-					master));
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
+							master));
 
 			new ImageTooltip(t, Messages) {
 
@@ -249,7 +240,7 @@ protected URI getImageURI() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final MenuItemIconDialogEditor dialog = new MenuItemIconDialogEditor(b.getShell(), eclipseContext,
-						project, getEditingDomain(), (MMenuItem) getMaster().getValue(), Messages);
+							project, getEditingDomain(), (MMenuItem) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -263,9 +254,9 @@ public void widgetSelected(SelectionEvent e) {
 			final Button b = new Button(parent, SWT.CHECK);
 			b.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 			context.bindValue(
-				checkProp.observe(b),
-				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__ENABLED).observeDetail(
-					getMaster()));
+					checkProp.observe(b),
+					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__ENABLED).observeDetail(
+							getMaster()));
 		}
 
 		{
@@ -276,9 +267,9 @@ public void widgetSelected(SelectionEvent e) {
 			final Button b = new Button(parent, SWT.CHECK);
 			b.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 			context.bindValue(
-				checkProp.observe(b),
-				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__SELECTED).observeDetail(
-					getMaster()));
+					checkProp.observe(b),
+					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__SELECTED).observeDetail(
+							getMaster()));
 
 			final UpdateValueStrategy t2m = new UpdateValueStrategy();
 			t2m.setConverter(new Converter(boolean.class, ItemType.class) {
@@ -298,9 +289,9 @@ public Object convert(Object fromObject) {
 			});
 
 			context.bindValue(
-				enabled.observe(b),
-				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(
-					getMaster()), t2m, m2t);
+					enabled.observe(b),
+					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(
+							getMaster()), t2m, m2t);
 
 		}
 
@@ -327,22 +318,22 @@ public String getText(Object element) {
 			list.add(Messages.MenuItemEditor_NoExpression);
 			list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
 			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION,
-				UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
+					UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
 			combo.setInput(list);
 			context.bindValue(ViewerProperties.singleSelection().observe(combo),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN)
-				.observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)),
-				new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
+					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN)
+					.observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)),
+					new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
 		}
 
 		createFormSubTypeForm(parent, context, master);
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -351,13 +342,13 @@ public String getText(Object element) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-			context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -381,7 +372,7 @@ private void createUITreeInspection(CTabFolder folder) {
 
 		final UIViewer objectViewer = new UIViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
-			getMaster(), resourcePool, Messages);
+				getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -398,7 +389,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL),
-			FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 8afaa3a7a7..351dbe6a64 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -12,6 +12,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
@@ -38,7 +39,6 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
 
 public class MenuSeparatorEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -55,8 +55,8 @@ public MenuSeparatorEditor() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		return createImage(ResourceProvider.IMG_MenuSeparator);
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_MenuSeparator);
 	}
 
 	@Override
@@ -108,7 +108,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -120,7 +120,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -154,14 +154,14 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 	}
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index 413f698a4a..d0c764e250 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -56,14 +56,13 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class ModelFragmentsEditor extends AbstractComponentEditor {
 
 	private final IListProperty MODEL_FRAGMENTS__FRAGMENTS = EMFProperties
-		.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
+			.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
 	private final IListProperty MODEL_FRAGMENTS__IMPORTS = EMFProperties
-		.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
+			.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
 
 	private Composite composite;
 
@@ -76,8 +75,8 @@ public ModelFragmentsEditor() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		return createImage(ResourceProvider.IMG_ModelFragments);
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_ModelFragments);
 	}
 
 	@Override
@@ -118,14 +117,14 @@ private void createFragmentsTab(CTabFolder folder) {
 		{
 
 			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
-				Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
-				FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS) {
+					Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
+					FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS) {
 				@Override
 				protected void addPressed() {
 					final MModelFragment component = MFragmentFactory.INSTANCE.createStringModelFragment();
 
 					final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-						FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, component);
+							FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, component);
 
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
@@ -163,14 +162,14 @@ private void createImportsTab(CTabFolder folder) {
 		}
 
 		final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
-			FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
+				FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
 			@Override
 			protected void addPressed() {
 				final EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
 				final EObject eObject = EcoreUtil.create(eClass);
 
 				final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-					FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, eObject);
+						FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, eObject);
 
 				if (cmd.canExecute()) {
 					getEditingDomain().getCommandStack().execute(cmd);
@@ -210,7 +209,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 		final List<FeatureClass> list = new ArrayList<FeatureClass>();
 		Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
 		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT,
-			FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
+				FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
 
 		pickList.setInput(list);
 		if (list.size() > 0) {
@@ -226,8 +225,8 @@ public void addClasses(EPackage ePackage, List<FeatureClass> list) {
 			if (c instanceof EClass) {
 				final EClass eclass = (EClass) c;
 				if (eclass != ApplicationPackageImpl.Literals.APPLICATION && !eclass.isAbstract()
-					&& !eclass.isInterface()
-					&& eclass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT)) {
+						&& !eclass.isInterface()
+						&& eclass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT)) {
 					list.add(new FeatureClass(eclass.getName(), eclass));
 				}
 			}
@@ -242,14 +241,14 @@ public void addClasses(EPackage ePackage, List<FeatureClass> list) {
 	public IObservableList getChildList(Object element) {
 		final WritableList list = new WritableList();
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MODEL_IMPORTS, MODEL_FRAGMENTS__IMPORTS, element,
-			Messages.ModelFragmentsEditor_Imports) {
+				Messages.ModelFragmentsEditor_Imports) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
 			}
 		});
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MODEL_FRAGEMENTS, MODEL_FRAGMENTS__FRAGMENTS, element,
-			Messages.ModelFragmentsEditor_ModelFragments) {
+				Messages.ModelFragmentsEditor_ModelFragments) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index d198fe1c70..7b5b9166dd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -43,7 +43,6 @@
 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.Text;
 
@@ -62,8 +61,8 @@ public ParameterEditor() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		return createImage(ResourceProvider.IMG_Parameter);
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_Parameter);
 	}
 
 	@Override
@@ -73,7 +72,7 @@ public String getLabel(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MParameter param = (MParameter) element;
+		final MParameter param = (MParameter) element;
 		if (param.getName() != null && param.getName().trim().length() > 0) {
 			return param.getName().trim();
 		} else if (param.getElementId() != null && param.getElementId().trim().length() > 0) {
@@ -121,7 +120,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -133,7 +132,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -168,19 +167,19 @@ public IObservableList getChildList(Object element) {
 
 	private void createParameterNameRow(Composite parent, IWidgetValueProperty textProp) {
 		{
-			Label commandParameterIdLabel = new Label(parent, SWT.NONE);
+			final Label commandParameterIdLabel = new Label(parent, SWT.NONE);
 			commandParameterIdLabel.setText(Messages.ParameterEditor_Command_Parameter_ID);
 			commandParameterIdLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text commandParameterIdValue = new Text(parent, SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			final Text commandParameterIdValue = new Text(parent, SWT.BORDER);
+			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			commandParameterIdValue.setLayoutData(gd);
 			TextPasteHandler.createFor(commandParameterIdValue);
-			IEMFEditValueProperty modelProp = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__NAME);
+			final IEMFEditValueProperty modelProp = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__NAME);
 			context.bindValue(textProp.observeDelayed(200, commandParameterIdValue), modelProp.observeDetail(getMaster()));
 		}
 
-		Button chooseParameterButton = new Button(parent, SWT.PUSH | SWT.FLAT);
+		final Button chooseParameterButton = new Button(parent, SWT.PUSH | SWT.FLAT);
 		chooseParameterButton.setText(Messages.ModelTooling_Common_FindEllipsis);
 		chooseParameterButton.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
 		chooseParameterButton.addSelectionListener(new ChooseParameterButtonSelectionListener());
@@ -190,14 +189,14 @@ private void createParameterNameRow(Composite parent, IWidgetValueProperty textP
 	private final class ChooseParameterButtonSelectionListener extends SelectionAdapter {
 		@Override
 		public void widgetSelected(SelectionEvent e) {
-			WritableValue master = getMaster();
+			final WritableValue master = getMaster();
 			if (master == null || !(master.getValue() instanceof MParameter)) {
 				return;
 			}
 
-			IEclipseContext staticContext = EclipseContextFactory.create("ParameterIdSelectionDialog static context"); //$NON-NLS-1$
+			final IEclipseContext staticContext = EclipseContextFactory.create("ParameterIdSelectionDialog static context"); //$NON-NLS-1$
 			staticContext.set(MParameter.class, (MParameter) master.getValue());
-			ParameterIdSelectionDialog dialog = ContextInjectionFactory.make(ParameterIdSelectionDialog.class, eclipseContext, staticContext);
+			final ParameterIdSelectionDialog dialog = ContextInjectionFactory.make(ParameterIdSelectionDialog.class, eclipseContext, staticContext);
 			dialog.open();
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index f46d7c6f93..dac4001c16 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -65,7 +65,6 @@
 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.Link;
 import org.eclipse.swt.widgets.Text;
@@ -84,9 +83,9 @@ public class PartDescriptorEditor extends AbstractComponentEditor {
 
 	private final IListProperty PART__MENUS = EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS);
 	private final IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties
-		.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
+			.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private final IValueProperty PART__TOOLBAR = EMFProperties
-		.value(BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR);
+			.value(BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR);
 	private Button createRemoveToolBar;
 	private StackLayout stackLayout;
 
@@ -96,9 +95,8 @@ public PartDescriptorEditor() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		final Image img = getImageFromIconURI(element);
-		return img != null ? img : createImage(ResourceProvider.IMG_PartDescriptor);
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_PartDescriptor);
 	}
 
 	@Override
@@ -146,12 +144,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 		getMaster().setValue(object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master,
-		boolean isImport) {
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -173,14 +171,14 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
-			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTranslatedTextField(parent, Messages.PartDescriptorEditor_LabelLabel, master, context,
-			textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL),
-			resourcePool, project);
+				textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL),
+				resourcePool, project);
 		ControlFactory.createTranslatedTextField(parent, Messages.PartDescriptorEditor_Tooltip, master, context,
-			textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP),
-			resourcePool, project);
+				textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP),
+				resourcePool, project);
 
 		// ------------------------------------------------------------
 		{
@@ -192,9 +190,9 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
-					master));
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
+							master));
 
 			new ImageTooltip(t, Messages) {
 
@@ -217,7 +215,7 @@ protected URI getImageURI() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final PartDescriptorIconDialogEditor dialog = new PartDescriptorIconDialogEditor(b.getShell(),
-						eclipseContext, project, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), Messages);
+							eclipseContext, project, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -233,7 +231,7 @@ public void widgetSelected(SelectionEvent e) {
 			 */
 			//
 			final IContributionClassCreator c = getEditor().getContributionCreator(
-				org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.PART);
+					org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.PART);
 			if (project != null && c != null) {
 				lnk = new Link(parent, SWT.NONE);
 				lnk.setText("<A>" + Messages.PartEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
@@ -261,9 +259,9 @@ public void widgetSelected(SelectionEvent e) {
 			final Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observeDelayed(200, t),
-				EMFEditProperties
-				.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI)
-				.observeDetail(master));
+					EMFEditProperties
+					.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI)
+					.observeDetail(master));
 			TextPasteHandler.createFor(t);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
@@ -274,8 +272,8 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
-						getEditingDomain(), (MPartDescriptor) getMaster().getValue(),
-						BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI, Messages);
+							getEditingDomain(), (MPartDescriptor) getMaster().getValue(),
+							BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
@@ -313,8 +311,8 @@ public void widgetSelected(SelectionEvent e) {
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA)
-				.observeDetail(master));
+					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA)
+					.observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -327,7 +325,7 @@ public void widgetSelected(SelectionEvent e) {
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
 
 			final IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(),
-				BasicPackageImpl.Literals.PART_DESCRIPTOR__DIRTYABLE);
+					BasicPackageImpl.Literals.PART_DESCRIPTOR__DIRTYABLE);
 			final IWidgetValueProperty uiProp = WidgetProperties.selection();
 
 			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
@@ -343,7 +341,7 @@ public void widgetSelected(SelectionEvent e) {
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
 
 			final IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(),
-				BasicPackageImpl.Literals.PART_DESCRIPTOR__CLOSEABLE);
+					BasicPackageImpl.Literals.PART_DESCRIPTOR__CLOSEABLE);
 			final IWidgetValueProperty uiProp = WidgetProperties.selection();
 
 			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
@@ -359,7 +357,7 @@ public void widgetSelected(SelectionEvent e) {
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
 
 			final IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(),
-				BasicPackageImpl.Literals.PART_DESCRIPTOR__ALLOW_MULTIPLE);
+					BasicPackageImpl.Literals.PART_DESCRIPTOR__ALLOW_MULTIPLE);
 			final IWidgetValueProperty uiProp = WidgetProperties.selection();
 
 			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
@@ -374,8 +372,8 @@ public void widgetSelected(SelectionEvent e) {
 			final Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false, 2, 1));
 			context.bindValue(textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CATEGORY)
-				.observeDetail(master));
+					EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CATEGORY)
+					.observeDetail(master));
 		}
 
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.PartEditor_BindingContexts);
@@ -387,9 +385,9 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createContributedEditorTabs(folder, context, getMaster(), MPartDescriptor.class);
 
@@ -403,7 +401,7 @@ private void addToolBar() {
 		setElementId(menu);
 
 		final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(),
-			BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR, menu);
+				BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR, menu);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
@@ -411,7 +409,7 @@ private void addToolBar() {
 
 	private void removeToolBar() {
 		final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(),
-			BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR, null);
+				BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR, null);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
@@ -426,7 +424,7 @@ public IObservableList getChildList(final Object element) {
 		}
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PARTDESCRIPTOR_MENU, PART__MENUS, element,
-			Messages.PartDescriptorEditor_Menus) {
+				Messages.PartDescriptorEditor_Menus) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -436,7 +434,7 @@ protected boolean accepted(Object o) {
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element,
-			Messages.PartDescriptorEditor_Handlers) {
+				Messages.PartDescriptorEditor_Handlers) {
 
 			@Override
 			protected boolean accepted(Object o) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index fcdb972c17..d6f84108db 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -41,7 +41,6 @@
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
@@ -73,7 +72,6 @@
 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.Link;
 import org.eclipse.swt.widgets.Text;
@@ -85,7 +83,7 @@ public class PartEditor extends AbstractComponentEditor {
 
 	private final IListProperty PART__MENUS = EMFProperties.list(BasicPackageImpl.Literals.PART__MENUS);
 	private final IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties
-		.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
+			.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private final IValueProperty PART__TOOLBAR = EMFProperties.value(BasicPackageImpl.Literals.PART__TOOLBAR);
 	private Button createRemoveToolBar;
 	private StackLayout stackLayout;
@@ -103,16 +101,8 @@ public PartEditor() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				final Image img = getImageFromIconURI(element);
-				return img != null ? img : createImage(ResourceProvider.IMG_Part);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_Part);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_Part);
 	}
 
 	@Override
@@ -163,13 +153,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 		getMaster().setValue(object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 
 		return composite;
 	}
 
 	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master,
-		boolean isImport) {
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.BORDER);
@@ -191,15 +181,15 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
-			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.PartEditor_LabelLabel, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, master, context,
-			textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createTextField(parent, Messages.PartEditor_Tooltip, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
 
 		// ------------------------------------------------------------
 		{
@@ -212,9 +202,9 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
-					master));
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
+							master));
 
 			new ImageTooltip(t, Messages) {
 
@@ -237,7 +227,7 @@ protected URI getImageURI() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), eclipseContext, project,
-						getEditingDomain(), (MPart) getMaster().getValue(), Messages);
+							getEditingDomain(), (MPart) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -255,7 +245,7 @@ public void widgetSelected(SelectionEvent e) {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
 						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project,
-							lnk.getShell());
+								lnk.getShell());
 					}
 				});
 			} else {
@@ -282,11 +272,11 @@ public void modifyText(ModifyEvent e) {
 				}
 			});
 			final Binding binding = context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(),
-					ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master),
-					new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
-					new UpdateValueStrategy());
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(),
+							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master),
+							new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+							new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
@@ -297,8 +287,8 @@ public void modifyText(ModifyEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
-						getEditingDomain(), (MContribution) getMaster().getValue(),
-						ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+							getEditingDomain(), (MContribution) getMaster().getValue(),
+							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
@@ -306,7 +296,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		ControlFactory.createTextField(parent, Messages.PartEditor_ContainerData, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		createSubformElements(parent, context, master);
 
@@ -331,22 +321,22 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.PartEditor_Closeable, Messages.PartEditor_Closeable_Tooltip,
-			getMaster(), context, WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART__CLOSEABLE));
+				getMaster(), context, WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART__CLOSEABLE));
 
 		// ------------------------------------------------------------
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.PartEditor_BindingContexts);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties,
-			UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+				UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -355,10 +345,10 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables,
-			Messages.ModelTooling_Context_Variables_Tooltip, UiPackageImpl.Literals.CONTEXT__VARIABLES,
-			VERTICAL_LIST_WIDGET_INDENT);
+				Messages.ModelTooling_Context_Variables_Tooltip, UiPackageImpl.Literals.CONTEXT__VARIABLES,
+				VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createInstanceInspection(folder);
@@ -381,7 +371,7 @@ private void createInstanceInspection(CTabFolder folder) {
 
 		final ObjectViewer objectViewer = new ObjectViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container,
-			ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
+				ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -394,7 +384,7 @@ private void createUITreeInspection(CTabFolder folder) {
 
 		final UIViewer objectViewer = new UIViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
-			getMaster(), resourcePool, Messages);
+				getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -403,7 +393,7 @@ private void addToolBar() {
 		setElementId(menu);
 
 		final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(),
-			BasicPackageImpl.Literals.PART__TOOLBAR, menu);
+				BasicPackageImpl.Literals.PART__TOOLBAR, menu);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
@@ -411,7 +401,7 @@ private void addToolBar() {
 
 	private void removeToolBar() {
 		final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(),
-			BasicPackageImpl.Literals.PART__TOOLBAR, null);
+				BasicPackageImpl.Literals.PART__TOOLBAR, null);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
@@ -430,7 +420,7 @@ public IObservableList getChildList(final Object element) {
 		}
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PART_MENU, PART__MENUS, element,
-			Messages.PartEditor_Menus) {
+				Messages.PartEditor_Menus) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -440,7 +430,7 @@ protected boolean accepted(Object o) {
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element,
-			Messages.PartEditor_Handlers) {
+				Messages.PartEditor_Handlers) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -486,6 +476,6 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL),
-			FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 275dc82317..ad440d850e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -32,7 +32,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.tools.emf.ui.internal.imp.RegistryUtil;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
@@ -71,7 +70,6 @@
 import org.eclipse.swt.layout.GridLayout;
 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;
 
@@ -81,7 +79,7 @@ public class PartSashContainerEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<Action>();
 	private final List<Action> actionsImport = new ArrayList<Action>();
@@ -101,21 +99,21 @@ public PartSashContainerEditor() {
 	@PostConstruct
 	void init() {
 		actions.add(new Action(Messages.PartSashContainerEditor_AddPartSashContainer,
-			createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
+				createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
 			}
 		});
 		actions.add(new Action(Messages.PartSashContainerEditor_AddPartStack,
-			createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+				createImageDescriptor(ResourceProvider.IMG_PartStack)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART_STACK);
 			}
 		});
 		actions.add(new Action(Messages.PartSashContainerEditor_AddPart,
-			createImageDescriptor(ResourceProvider.IMG_Part)) {
+				createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART);
@@ -123,21 +121,21 @@ public void run() {
 		});
 
 		actions.add(new Action(Messages.PartSashContainerEditor_AddArea,
-			createImageDescriptor(ResourceProvider.IMG_Area)) {
+				createImageDescriptor(ResourceProvider.IMG_Area)) {
 			@Override
 			public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.AREA);
 			}
 		});
 		actions.add(new Action(Messages.PartSashContainerEditor_AddPlaceholder,
-			createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
+				createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
 			@Override
 			public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
 			}
 		});
 		for (final FeatureClass c : getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK,
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN)) {
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN)) {
 			final EClass ec = c.eClass;
 			actions.add(new Action(c.label, createImageDescriptor(c.iconId)) {
 				@Override
@@ -164,25 +162,11 @@ public void run() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
+	public Image getImage(Object element) {
 		final boolean horizontal = ((MPartSashContainer) element).isHorizontal();
 
-		if (!horizontal) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_PartSashContainer_vertical);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_PartSashContainer_vertical);
-		}
-
-		if (horizontal) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_PartSashContainer);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_PartSashContainer);
-		}
-		return null;
+		return horizontal ? getImage(element, ResourceProvider.IMG_PartSashContainer)
+				: getImage(element, ResourceProvider.IMG_PartSashContainer_vertical);
 	}
 
 	@Override
@@ -229,7 +213,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
-		boolean isImport) {
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -251,11 +235,11 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
-			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-			context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		// ------------------------------------------------------------
 		{
@@ -272,23 +256,23 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 				@Override
 				public String getText(Object element) {
 					return ((Boolean) element).booleanValue() ? Messages.PartSashContainerEditor_Horizontal
-						: Messages.PartSashContainerEditor_Vertical;
+							: Messages.PartSashContainerEditor_Vertical;
 				}
 			});
 			viewer.setInput(new Boolean[] { Boolean.TRUE, Boolean.FALSE });
 			final IViewerValueProperty vProp = ViewerProperties.singleSelection();
 			context.bindValue(vProp.observe(viewer),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL)
-				.observeDetail(getMaster()));
+					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL)
+					.observeDetail(getMaster()));
 		}
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PartSashContainerEditor_SelectedElement);
 		ControlFactory.createTextField(parent, Messages.PartSashContainerEditor_ContainerData, master, context,
-			textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
+				textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
 					final EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
@@ -308,7 +292,7 @@ protected void addPressed() {
 			eClassList.add(new FeatureClass("Area", AdvancedPackageImpl.Literals.AREA)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER)); //$NON-NLS-1$
 			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_SASH_CONTAINER,
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
+					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
 			pickList.setInput(eClassList);
 			pickList.setSelection(new StructuredSelection(eClassList.get(0)));
 
@@ -318,11 +302,11 @@ protected void addPressed() {
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -331,9 +315,9 @@ protected void addPressed() {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -355,7 +339,7 @@ private void createUITreeInspection(CTabFolder folder) {
 
 		final UIViewer objectViewer = new UIViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
-			getMaster(), resourcePool, Messages);
+				getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -372,7 +356,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL),
-			FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 	protected void handleAddChild(EClass eClass) {
@@ -384,7 +368,7 @@ private void addToModel(EObject eObject) {
 		setElementId(eObject);
 
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index aa35b8d089..0b79c1d4f0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -31,7 +31,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MInputPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
@@ -66,7 +65,6 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
 
 @SuppressWarnings("deprecation")
 public class PartStackEditor extends AbstractComponentEditor {
@@ -75,7 +73,7 @@ public class PartStackEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<Action>();
 	private final List<Action> actionsImport = new ArrayList<Action>();
@@ -99,14 +97,14 @@ public void run() {
 			}
 		});
 		actions.add(new Action(Messages.PartStackEditor_AddCompositePart,
-			createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
+				createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.COMPOSITE_PART);
 			}
 		});
 		actions.add(new Action(Messages.PartStackEditor_AddPlaceholder,
-			createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
+				createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
 			@Override
 			public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
@@ -114,7 +112,7 @@ public void run() {
 		});
 
 		final List<FeatureClass> list = getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK,
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 
 		if (!list.isEmpty()) {
 			for (final FeatureClass c : list) {
@@ -136,25 +134,19 @@ public void run() {
 			}
 		});
 		actionsImport
-			.add(new Action(Messages.PartStackEditor_Editors, createImageDescriptor(ResourceProvider.IMG_Part)) {
-				@Override
-				public void run() {
-					handleImportChild(BasicPackageImpl.Literals.INPUT_PART);
-				}
-			});
+		.add(new Action(Messages.PartStackEditor_Editors, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleImportChild(BasicPackageImpl.Literals.INPUT_PART);
+			}
+		});
 
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			if (((MUIElement) element).isToBeRendered()) {
-				return createImage(ResourceProvider.IMG_Part);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_Part);
-		}
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_Part);
 
-		return null;
 	}
 
 	@Override
@@ -202,7 +194,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
-		boolean isImport) {
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -224,20 +216,20 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
+				EMFEditProperties
 				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-			context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PartStackEditor_SelectedElement);
 		ControlFactory.createTextField(parent, Messages.PartStackEditor_ContainerData, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		// ------------------------------------------------------------
 		{
 
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
 					final EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
@@ -256,22 +248,22 @@ protected void addPressed() {
 			final List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
 			eClassList.add(new FeatureClass(Messages.PartStackEditor_Part, BasicPackageImpl.Literals.PART));
 			eClassList.add(new FeatureClass(Messages.PartStackEditor_CompositePart,
-				BasicPackageImpl.Literals.COMPOSITE_PART));
+					BasicPackageImpl.Literals.COMPOSITE_PART));
 			eClassList.add(new FeatureClass(Messages.PartStackEditor_Placeholder,
-				AdvancedPackageImpl.Literals.PLACEHOLDER));
+					AdvancedPackageImpl.Literals.PLACEHOLDER));
 			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK,
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
+					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
 			pickList.setInput(eClassList);
 			pickList.setSelection(new StructuredSelection(eClassList.get(0)));
 
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -280,9 +272,9 @@ protected void addPressed() {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -304,7 +296,7 @@ private void createUITreeInspection(CTabFolder folder) {
 
 		final UIViewer objectViewer = new UIViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
-			getMaster(), resourcePool, Messages);
+				getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -332,7 +324,7 @@ private void addToModel(EObject eObject) {
 		setElementId(eObject);
 
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 6a76947660..b48420d0c0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -34,7 +34,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PerspectiveIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
@@ -66,7 +65,6 @@
 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.Text;
 
@@ -75,9 +73,9 @@ public class PerspectiveEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private final IListProperty PERSPECTIVE__WINDOWS = EMFProperties
-		.list(AdvancedPackageImpl.Literals.PERSPECTIVE__WINDOWS);
+			.list(AdvancedPackageImpl.Literals.PERSPECTIVE__WINDOWS);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<Action>();
 
@@ -96,14 +94,14 @@ public PerspectiveEditor() {
 	@PostConstruct
 	void init() {
 		actions.add(new Action(Messages.PerspectiveEditor_AddPartSashContainer,
-			createImageDescriptor(ResourceProvider.IMG_Perspective)) {
+				createImageDescriptor(ResourceProvider.IMG_Perspective)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
 			}
 		});
 		actions.add(new Action(Messages.PerspectiveEditor_AddPartStack,
-			createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+				createImageDescriptor(ResourceProvider.IMG_PartStack)) {
 			@Override
 			public void run() {
 				handleAddChild(BasicPackageImpl.Literals.PART_STACK);
@@ -122,7 +120,7 @@ public void run() {
 			}
 		});
 		actions.add(new Action(Messages.PerspectiveEditor_AddPlaceholder,
-			createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
+				createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
 			@Override
 			public void run() {
 				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
@@ -131,17 +129,8 @@ public void run() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				final Image img = getImageFromIconURI(uiElement);
-				return img != null ? img : createImage(ResourceProvider.IMG_Perspective);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_Perspective);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_Perspective);
 	}
 
 	@Override
@@ -157,7 +146,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL),
-			FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 	@Override
@@ -196,12 +185,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 		getMaster().setValue(object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
-		boolean isImport) {
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -223,18 +212,18 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
-			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-			context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PerspectiveEditor_SelectedElement);
 		ControlFactory.createTranslatedTextField(parent, Messages.PerspectiveEditor_LabelLabel, getMaster(), context,
-			textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL),
-			resourcePool, project);
+				textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL),
+				resourcePool, project);
 		ControlFactory.createTranslatedTextField(parent, Messages.PerspectiveEditor_Tooltip, getMaster(), context,
-			textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP),
-			resourcePool, project);
+				textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP),
+				resourcePool, project);
 
 		// ------------------------------------------------------------
 		{
@@ -246,9 +235,9 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
-					master));
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
+							master));
 
 			new ImageTooltip(t, Messages) {
 
@@ -270,27 +259,27 @@ protected URI getImageURI() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final PerspectiveIconDialogEditor dialog = new PerspectiveIconDialogEditor(b.getShell(),
-						eclipseContext, project, getEditingDomain(), (MPerspective) getMaster().getValue(), Messages);
+							eclipseContext, project, getEditingDomain(), (MPerspective) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		final Composite comp0 = ControlFactory.createMapProperties(parent, Messages, this,
-			Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES,
-			VERTICAL_LIST_WIDGET_INDENT);
+				Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES,
+				VERTICAL_LIST_WIDGET_INDENT);
 		comp0.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 3, 1));
 
 		final Composite comp = ControlFactory.createStringListWidget(parent, Messages, this,
-			Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES,
-			VERTICAL_LIST_WIDGET_INDENT);
+				Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES,
+				VERTICAL_LIST_WIDGET_INDENT);
 		comp.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 3, 1));
 
 		item = new CTabItem(folder, SWT.NONE);
@@ -300,9 +289,9 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -324,7 +313,7 @@ private void createUITreeInspection(CTabFolder folder) {
 
 		final UIViewer objectViewer = new UIViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
-			getMaster(), resourcePool, Messages);
+				getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -332,7 +321,7 @@ private void createUITreeInspection(CTabFolder folder) {
 	public IObservableList getChildList(Object element) {
 		final WritableList list = new WritableList();
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PERSPECTIVE_WINDOWS, PERSPECTIVE__WINDOWS, element,
-			Messages.WindowEditor_Windows) {
+				Messages.WindowEditor_Windows) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -341,7 +330,7 @@ protected boolean accepted(Object o) {
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PERSPECTIVE_CONTROLS, ELEMENT_CONTAINER__CHILDREN,
-			element, Messages.PerspectiveEditor_Controls) {
+				element, Messages.PerspectiveEditor_Controls) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -357,7 +346,7 @@ protected void handleAddChild(EClass eClass) {
 		setElementId(eObject);
 
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 5c316be27d..ae851ab296 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -32,7 +32,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack;
@@ -62,7 +61,6 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
 public class PerspectiveStackEditor extends AbstractComponentEditor {
@@ -70,7 +68,7 @@ public class PerspectiveStackEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<Action>();
 	private final List<Action> actionsImport = new ArrayList<Action>();
@@ -90,7 +88,7 @@ public PerspectiveStackEditor() {
 	@PostConstruct
 	void init() {
 		actions.add(new Action(Messages.PerspectiveStackEditor_AddPerspective,
-			createImageDescriptor(ResourceProvider.IMG_Perspective)) {
+				createImageDescriptor(ResourceProvider.IMG_Perspective)) {
 			@Override
 			public void run() {
 				handleAddPerspective();
@@ -99,7 +97,7 @@ public void run() {
 
 		// --- import ---
 		actionsImport.add(new Action(Messages.PerspectiveStackEditor_AddPerspective,
-			createImageDescriptor(ResourceProvider.IMG_Perspective)) {
+				createImageDescriptor(ResourceProvider.IMG_Perspective)) {
 			@Override
 			public void run() {
 				handleImportPerspective();
@@ -108,16 +106,8 @@ public void run() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_PerspectiveStack);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_PerspectiveStack);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_PerspectiveStack);
 	}
 
 	@Override
@@ -169,7 +159,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
-		boolean isImport) {
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -191,18 +181,18 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
+				EMFEditProperties
 				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-			context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PerspectiveStackEditor_SelectedElement);
 
 		// ------------------------------------------------------------
 		{
 
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
-				Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+					Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
 					handleAddPerspective();
@@ -219,11 +209,11 @@ protected void addPressed() {
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -232,9 +222,9 @@ protected void addPressed() {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -256,7 +246,7 @@ private void createUITreeInspection(CTabFolder folder) {
 
 		final UIViewer objectViewer = new UIViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
-			getMaster(), resourcePool, Messages);
+				getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -289,7 +279,7 @@ protected void handleImportPerspective() {
 	private void addToModel(MPerspective perspective) {
 		setElementId(perspective);
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, perspective);
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, perspective);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 			getEditor().setSelection(perspective);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index e76ee33ff5..ebc250f276 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -11,6 +11,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -48,7 +49,6 @@
 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.Text;
 
@@ -70,8 +70,8 @@ public PlaceholderEditor() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		return createImage(ResourceProvider.IMG_Placeholder);
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_Placeholder);
 	}
 
 	@Override
@@ -81,14 +81,14 @@ public String getLabel(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MPlaceholder pl = (MPlaceholder) element;
+		final MPlaceholder pl = (MPlaceholder) element;
 		if (pl.getRef() != null) {
-			StringBuilder b = new StringBuilder();
+			final StringBuilder b = new StringBuilder();
 
 			b.append(((EObject) pl.getRef()).eClass().getName());
 			if (pl.getRef() instanceof MUILabel) {
-				MUILabel label = (MUILabel) pl.getRef();
-				String l = getLocalizedLabel(label);
+				final MUILabel label = (MUILabel) pl.getRef();
+				final String l = getLocalizedLabel(label);
 
 				if (l != null && l.trim().length() > 0) {
 					b.append(" (" + l + ")"); //$NON-NLS-1$//$NON-NLS-2$
@@ -150,7 +150,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
@@ -162,7 +162,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -175,17 +175,17 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		ControlFactory.createTextField(parent, Messages.PlaceholderEditor_ContainerData, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PlaceholderEditor_Reference);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setEditable(false);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 
-			UpdateValueStrategy t2m = new UpdateValueStrategy();
+			final UpdateValueStrategy t2m = new UpdateValueStrategy();
 			t2m.setConverter(new Converter(String.class, MUIElement.class) {
 
 				@Override
@@ -193,16 +193,16 @@ public Object convert(Object fromObject) {
 					return null;
 				}
 			});
-			UpdateValueStrategy m2t = new UpdateValueStrategy();
+			final UpdateValueStrategy m2t = new UpdateValueStrategy();
 			m2t.setConverter(new Converter(MUIElement.class, String.class) {
 
 				@Override
 				public Object convert(Object fromObject) {
 					if (fromObject != null) {
-						EObject o = (EObject) fromObject;
+						final EObject o = (EObject) fromObject;
 						if (o instanceof MUILabel) {
-							MUILabel label = (MUILabel) o;
-							String l = getLocalizedLabel(label);
+							final MUILabel label = (MUILabel) o;
+							final String l = getLocalizedLabel(label);
 							if (!Util.isNullOrEmpty(l)) {
 								return o.eClass().getName() + " - " + l; //$NON-NLS-1$
 							}
@@ -222,7 +222,7 @@ public Object convert(Object fromObject) {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					SharedElementsDialog dialog = new SharedElementsDialog(b.getShell(), getEditor(), (MPlaceholder) getMaster().getValue(), resource, Messages);
+					final SharedElementsDialog dialog = new SharedElementsDialog(b.getShell(), getEditor(), (MPlaceholder) getMaster().getValue(), resource, Messages);
 					dialog.open();
 				}
 			});
@@ -254,14 +254,14 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index fcfd9c0c0f..7063fcd4ad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -63,7 +63,6 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
@@ -72,7 +71,7 @@ public class StringModelFragment extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private final IListProperty MODEL_FRAGMENT__ELEMENTS = EMFProperties
-		.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
+			.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
 
 	private final List<Action> actions = new ArrayList<Action>();
 
@@ -89,7 +88,7 @@ public void init() {
 		final List<FeatureClass> list = new ArrayList<FeatureClass>();
 		Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
 		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT,
-			FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
+				FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
 		for (final FeatureClass featureClass : list) {
 			actions.add(new Action(featureClass.label) {
 
@@ -102,8 +101,8 @@ public void run() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		return createImage(ResourceProvider.IMG_StringModelFragment);
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_StringModelFragment);
 	}
 
 	@Override
@@ -114,8 +113,8 @@ public String getLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] {
-			FeaturePath.fromList(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME),
-			FeaturePath.fromList(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID) };
+				FeaturePath.fromList(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME),
+				FeaturePath.fromList(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID) };
 	}
 
 	@Override
@@ -184,9 +183,9 @@ private Composite createForm(Composite parent) {
 			gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(),
-					FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID).observeDetail(getMaster()));
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(),
+							FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID).observeDetail(getMaster()));
 
 			final Button b = new Button(comp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -194,7 +193,7 @@ private Composite createForm(Composite parent) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final FindParentReferenceElementDialog dialog = new FindParentReferenceElementDialog(b.getShell(),
-						StringModelFragment.this, (MStringModelFragment) getMaster().getValue(), Messages);
+							StringModelFragment.this, (MStringModelFragment) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -220,9 +219,9 @@ public void widgetSelected(SelectionEvent e) {
 			gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(),
-					FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME).observeDetail(getMaster()));
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(),
+							FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME).observeDetail(getMaster()));
 
 			final Button button = new Button(comp, SWT.PUSH | SWT.FLAT);
 			button.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -230,7 +229,7 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final FeatureSelectionDialog dialog = new FeatureSelectionDialog(button.getShell(),
-						getEditingDomain(), (MStringModelFragment) getMaster().getValue(), Messages);
+							getEditingDomain(), (MStringModelFragment) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -238,14 +237,14 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		ControlFactory.createTextField(parent, Messages.StringModelFragment_PositionInList, getMaster(), context,
-			textProp, EMFEditProperties.value(getEditingDomain(),
-				FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__POSITION_IN_LIST));
+				textProp, EMFEditProperties.value(getEditingDomain(),
+						FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__POSITION_IN_LIST));
 
 		// ------------------------------------------------------------
 		{
 
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
-				FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS) {
+					FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS) {
 				@Override
 				protected void addPressed() {
 					final EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
@@ -281,7 +280,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 			final List<FeatureClass> list = new ArrayList<FeatureClass>();
 			Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
 			list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT,
-				FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
+					FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
 
 			pickList.setInput(list);
 			if (list.size() > 0) {
@@ -321,7 +320,7 @@ protected void handleAdd(EClass eClass, boolean separator) {
 		final EObject eObject = EcoreUtil.create(eClass);
 		setElementId(eObject);
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, eObject);
+				FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 57072d7c31..f4f2bb6bd8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -35,7 +35,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ToolBarIdDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
@@ -70,7 +69,6 @@
 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.Text;
 
@@ -79,7 +77,7 @@ public class ToolBarContributionEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<Action>();
 
@@ -101,28 +99,28 @@ public ToolBarContributionEditor() {
 	@PostConstruct
 	void init() {
 		actions.add(new Action(Messages.ToolBarEditor_AddHandledToolItem,
-			createImageDescriptor(ResourceProvider.IMG_HandledToolItem)) {
+				createImageDescriptor(ResourceProvider.IMG_HandledToolItem)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
 			}
 		});
 		actions.add(new Action(Messages.ToolBarEditor_AddDirectToolItem,
-			createImageDescriptor(ResourceProvider.IMG_DirectToolItem)) {
+				createImageDescriptor(ResourceProvider.IMG_DirectToolItem)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false);
 			}
 		});
 		actions.add(new Action(Messages.ToolBarEditor_AddToolControl,
-			createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
+				createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.TOOL_CONTROL, false);
 			}
 		});
 		actions.add(new Action(Messages.ToolBarEditor_AddToolBarSeparator,
-			createImageDescriptor(ResourceProvider.IMG_ToolBarSeparator)) {
+				createImageDescriptor(ResourceProvider.IMG_ToolBarSeparator)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true);
@@ -131,16 +129,8 @@ public void run() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_ToolBarContribution);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_ToolBarContribution);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_ToolBarContribution);
 	}
 
 	@Override
@@ -213,11 +203,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
+				EMFEditProperties
 				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-			context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		{
 			final Label l = new Label(parent, SWT.NONE);
@@ -229,7 +219,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__PARENT_ID)
+					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__PARENT_ID)
 					.observeDetail(getMaster()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
@@ -240,20 +230,20 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final ToolBarIdDialog dialog = new ToolBarIdDialog(t.getShell(), resource,
-						(MToolBarContribution) getMaster().getValue(), getEditingDomain(), modelService, Messages);
+							(MToolBarContribution) getMaster().getValue(), getEditingDomain(), modelService, Messages);
 					dialog.open();
 				}
 			});
 		}
 
 		ControlFactory.createTextField(parent, Messages.MenuContributionEditor_Position, master, context, textProp,
-			EMFEditProperties.value(getEditingDomain(),
-				MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__POSITION_IN_PARENT));
+				EMFEditProperties.value(getEditingDomain(),
+						MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__POSITION_IN_PARENT));
 
 		// ------------------------------------------------------------
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
 					final Struct struct = (Struct) ((IStructuredSelection) getSelection()).getFirstElement();
@@ -262,7 +252,7 @@ protected void addPressed() {
 					setElementId(eObject);
 
 					final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-						UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+							UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
@@ -277,24 +267,24 @@ protected void addPressed() {
 			final TableViewer viewer = pickList.getList();
 
 			final IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(),
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
 
 			final Struct defaultStruct = new Struct(Messages.ToolBarEditor_HandledToolItem,
-				MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
+					MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
 			pickList.setInput(new Struct[] { defaultStruct,
-				new Struct(Messages.ToolBarEditor_DirectToolItem, MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false),
-				new Struct(Messages.ToolBarEditor_ToolControl, MenuPackageImpl.Literals.TOOL_CONTROL, false),
-				new Struct(Messages.ToolBarEditor_Separator, MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true) });
+					new Struct(Messages.ToolBarEditor_DirectToolItem, MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false),
+					new Struct(Messages.ToolBarEditor_ToolControl, MenuPackageImpl.Literals.TOOL_CONTROL, false),
+					new Struct(Messages.ToolBarEditor_Separator, MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true) });
 			pickList.setSelection(new StructuredSelection(defaultStruct));
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -303,9 +293,9 @@ protected void addPressed() {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -327,7 +317,7 @@ private void createUITreeInspection(CTabFolder folder) {
 
 		final UIViewer objectViewer = new UIViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
-			getMaster(), resourcePool, Messages);
+				getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -353,7 +343,7 @@ protected void handleAddChild(EClass eClass, boolean separator) {
 		setElementId(eObject);
 
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 82e887f79b..8ac6b80305 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -27,7 +27,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList.Struct;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
@@ -56,7 +55,6 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
 
 public class ToolBarEditor extends AbstractComponentEditor {
 
@@ -64,7 +62,7 @@ public class ToolBarEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<Action>();
 
@@ -76,28 +74,28 @@ public ToolBarEditor() {
 	@PostConstruct
 	void init() {
 		actions.add(new Action(Messages.ToolBarEditor_AddHandledToolItem,
-			createImageDescriptor(ResourceProvider.IMG_HandledToolItem)) {
+				createImageDescriptor(ResourceProvider.IMG_HandledToolItem)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
 			}
 		});
 		actions.add(new Action(Messages.ToolBarEditor_AddDirectToolItem,
-			createImageDescriptor(ResourceProvider.IMG_DirectToolItem)) {
+				createImageDescriptor(ResourceProvider.IMG_DirectToolItem)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false);
 			}
 		});
 		actions.add(new Action(Messages.ToolBarEditor_AddToolControl,
-			createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
+				createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.TOOL_CONTROL, false);
 			}
 		});
 		actions.add(new Action(Messages.ToolBarEditor_AddToolBarSeparator,
-			createImageDescriptor(ResourceProvider.IMG_ToolBarSeparator)) {
+				createImageDescriptor(ResourceProvider.IMG_ToolBarSeparator)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true);
@@ -106,16 +104,8 @@ public void run() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_ToolBar);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_ToolBar);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_ToolBar);
 	}
 
 	@Override
@@ -183,16 +173,16 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
+				EMFEditProperties
 				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-			context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		// ------------------------------------------------------------
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
 					final Struct struct = (Struct) ((IStructuredSelection) getSelection()).getFirstElement();
@@ -205,24 +195,24 @@ protected void addPressed() {
 
 			final TableViewer viewer = pickList.getList();
 			final IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(),
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(master));
 
 			final Struct defaultStruct = new Struct(Messages.ToolBarEditor_HandledToolItem,
-				MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
+					MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
 			pickList.setInput(new Struct[] { defaultStruct,
-				new Struct(Messages.ToolBarEditor_DirectToolItem, MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false),
-				new Struct(Messages.ToolBarEditor_ToolControl, MenuPackageImpl.Literals.TOOL_CONTROL, false),
-				new Struct(Messages.ToolBarEditor_Separator, MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true) });
+					new Struct(Messages.ToolBarEditor_DirectToolItem, MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, false),
+					new Struct(Messages.ToolBarEditor_ToolControl, MenuPackageImpl.Literals.TOOL_CONTROL, false),
+					new Struct(Messages.ToolBarEditor_Separator, MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, true) });
 			pickList.setSelection(new StructuredSelection(defaultStruct));
 		}
 
 		ControlFactory
-			.createCheckBox(
+		.createCheckBox(
 				parent,
 				"To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
 		ControlFactory
-			.createCheckBox(
+		.createCheckBox(
 				parent,
 				"Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
@@ -233,9 +223,9 @@ protected void addPressed() {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		createContributedEditorTabs(folder, context, getMaster(), MToolBar.class);
 
@@ -271,7 +261,7 @@ protected void handleAddChild(EClass eClass, boolean separator) {
 		setElementId(eObject);
 
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 7e91c33756..09f6d0bba2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -22,7 +22,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarSeparator;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -41,7 +40,6 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
 
 public class ToolBarSeparatorEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -58,16 +56,8 @@ public ToolBarSeparatorEditor() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_ToolBarSeparator);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_ToolBarSeparator);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_ToolBarSeparator);
 	}
 
 	@Override
@@ -140,17 +130,17 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
+				EMFEditProperties
 				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-			context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -159,9 +149,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -183,7 +173,7 @@ private void createUITreeInspection(CTabFolder folder) {
 
 		final UIViewer objectViewer = new UIViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
-			getMaster(), resourcePool, Messages);
+				getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 89bd7f1406..db85f52e0d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -30,7 +30,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolControl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
@@ -53,7 +52,6 @@
 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.Link;
 import org.eclipse.swt.widgets.Text;
@@ -86,16 +84,8 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_ToolControl);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_ToolControl);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_ToolControl);
 	}
 
 	@Override
@@ -159,16 +149,16 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
+				EMFEditProperties
 				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-			context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		// ------------------------------------------------------------
 		{
 			final IContributionClassCreator c = getEditor().getContributionCreator(
-				MenuPackageImpl.Literals.TOOL_CONTROL);
+					MenuPackageImpl.Literals.TOOL_CONTROL);
 			if (project != null && c != null) {
 				final Link lnk = new Link(parent, SWT.NONE);
 				lnk.setText("<A>" + Messages.ToolControlEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
@@ -177,7 +167,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 					@Override
 					public void widgetSelected(SelectionEvent e) {
 						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project,
-							lnk.getShell());
+								lnk.getShell());
 					}
 				});
 			} else {
@@ -190,9 +180,9 @@ public void widgetSelected(SelectionEvent e) {
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(),
-					ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(),
+							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
@@ -202,22 +192,22 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
-						getEditingDomain(), (MContribution) getMaster().getValue(),
-						ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+							getEditingDomain(), (MContribution) getMaster().getValue(),
+							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
 			});
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -226,9 +216,9 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createInstanceInspection(folder);
@@ -251,7 +241,7 @@ private void createInstanceInspection(CTabFolder folder) {
 
 		final ObjectViewer objectViewer = new ObjectViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container,
-			ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
+				ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
 	}
@@ -265,7 +255,7 @@ private void createUITreeInspection(CTabFolder folder) {
 
 		final UIViewer objectViewer = new UIViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
-			getMaster(), resourcePool, Messages);
+				getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index f1988b4742..7f7f554ce7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -37,7 +37,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.SideValue;
 import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -71,7 +70,6 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 
 public class TrimBarEditor extends AbstractComponentEditor {
@@ -80,7 +78,7 @@ public class TrimBarEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<Action>();
 
@@ -109,7 +107,7 @@ public void run() {
 			}
 		});
 		actions.add(new Action(Messages.TrimBarEditor_AddToolControl,
-			createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
+				createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.TOOL_CONTROL);
@@ -118,16 +116,8 @@ public void run() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_WindowTrim);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_WindowTrim);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_WindowTrim);
 	}
 
 	@Override
@@ -195,11 +185,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
+				EMFEditProperties
 				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-			context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 
 		// ------------------------------------------------------------
 		{
@@ -214,14 +204,14 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			gd.horizontalSpan = 2;
 			viewer.getControl().setLayoutData(gd);
 			final IObservableValue sideValueObs = EMFEditProperties.value(getEditingDomain(),
-				UiPackageImpl.Literals.GENERIC_TRIM_CONTAINER__SIDE).observeDetail(master);
+					UiPackageImpl.Literals.GENERIC_TRIM_CONTAINER__SIDE).observeDetail(master);
 			context.bindValue(ViewerProperties.singleSelection().observe(viewer), sideValueObs);
 		}
 
 		// ------------------------------------------------------------
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
-				Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+					Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
 					final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
@@ -235,7 +225,7 @@ protected void addPressed() {
 
 			pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
 			pickList
-				.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
+			.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
 			pickList.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
 
 			final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
@@ -243,11 +233,11 @@ protected void addPressed() {
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -256,9 +246,9 @@ protected void addPressed() {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -280,7 +270,7 @@ private void createUITreeInspection(CTabFolder folder) {
 
 		final UIViewer objectViewer = new UIViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
-			getMaster(), resourcePool, Messages);
+				getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -303,7 +293,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TRIM_CONTAINER__SIDE),
-			FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 	protected void handleAddChild(EClass eClass) {
@@ -311,7 +301,7 @@ protected void handleAddChild(EClass eClass) {
 		setElementId(toolbar);
 
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index ca14152c4f..a33c7214af 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -36,7 +36,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.TrimIdDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
@@ -73,7 +72,6 @@
 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.Text;
 
@@ -82,7 +80,7 @@ public class TrimContributionEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<Action>();
 
@@ -110,7 +108,7 @@ public void run() {
 			}
 		});
 		actions.add(new Action(Messages.TrimBarEditor_AddToolControl,
-			createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
+				createImageDescriptor(ResourceProvider.IMG_ToolControl)) {
 			@Override
 			public void run() {
 				handleAddChild(MenuPackageImpl.Literals.TOOL_CONTROL);
@@ -119,16 +117,8 @@ public void run() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_TrimContribution);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_TrimContribution);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_TrimContribution);
 	}
 
 	@Override
@@ -201,11 +191,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-			EMFEditProperties
+				EMFEditProperties
 				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-			context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_ParentId);
@@ -216,7 +206,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__PARENT_ID)
+					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__PARENT_ID)
 					.observeDetail(getMaster()));
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
@@ -227,7 +217,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final TrimIdDialog dialog = new TrimIdDialog(t.getShell(), resource,
-						(MTrimContribution) getMaster().getValue(), getEditingDomain(), modelService, Messages);
+							(MTrimContribution) getMaster().getValue(), getEditingDomain(), modelService, Messages);
 					dialog.open();
 				}
 			});
@@ -235,14 +225,14 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		ControlFactory
-			.createTextField(parent, Messages.TrimContributionEditor_Position, master, context, textProp,
+		.createTextField(parent, Messages.TrimContributionEditor_Position, master, context, textProp,
 				EMFEditProperties.value(getEditingDomain(),
-					MenuPackageImpl.Literals.TRIM_CONTRIBUTION__POSITION_IN_PARENT));
+						MenuPackageImpl.Literals.TRIM_CONTRIBUTION__POSITION_IN_PARENT));
 
 		// ------------------------------------------------------------
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
 					final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
@@ -266,16 +256,16 @@ public String getText(Object element) {
 				}
 			});
 			pickList
-				.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
+			.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
 			pickList.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-			WidgetProperties.selection(),
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.selection(),
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -284,9 +274,9 @@ public String getText(Object element) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -308,7 +298,7 @@ private void createUITreeInspection(CTabFolder folder) {
 
 		final UIViewer objectViewer = new UIViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
-			getMaster(), resourcePool, Messages);
+				getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -327,7 +317,7 @@ protected void handleAddChild(EClass eClass) {
 		setElementId(toolbar);
 
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, toolbar);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index f153ba7aa5..bbbc5e7c34 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -38,7 +38,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
@@ -69,7 +68,6 @@
 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.Text;
 
@@ -79,10 +77,10 @@ public class WindowEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 
 	private final IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties
-		.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
+			.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private final IListProperty WINDOW__WINDOWS = EMFProperties.list(BasicPackageImpl.Literals.WINDOW__WINDOWS);
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-		.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private final IListProperty SHARED_ELEMENTS = EMFProperties.list(BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
 	private final IValueProperty WINDOW__MAIN_MENU = EMFProperties.value(BasicPackageImpl.Literals.WINDOW__MAIN_MENU);
 
@@ -113,17 +111,8 @@ public void run() {
 	}
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				final Image img = getImageFromIconURI(uiElement);
-				return img != null ? img : createImage(ResourceProvider.IMG_Window);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_Window);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_Window);
 	}
 
 	@Override
@@ -171,7 +160,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 		getMaster().setValue(object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 
 		return composite;
 	}
@@ -198,8 +187,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp,
-			EMFEditProperties
-			.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				EMFEditProperties
+				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		// ------------------------------------------------------------
 		{
@@ -219,37 +208,37 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			Text t = new Text(comp, SWT.BORDER | SWT.TRAIL);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__X).observeDetail(
-					getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__X).observeDetail(
+							getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
 
 			t = new Text(comp, SWT.BORDER | SWT.TRAIL);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__Y).observeDetail(
-					getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__Y).observeDetail(
+							getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
 
 			t = new Text(comp, SWT.BORDER | SWT.TRAIL);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__WIDTH).observeDetail(
-					getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__WIDTH).observeDetail(
+							getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
 
 			t = new Text(comp, SWT.BORDER | SWT.TRAIL);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__HEIGHT).observeDetail(
-					getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__HEIGHT).observeDetail(
+							getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
 		}
 
 		ControlFactory.createTranslatedTextField(parent, Messages.WindowEditor_Label, getMaster(), context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
 		ControlFactory.createTranslatedTextField(parent, Messages.WindowEditor_Tooltip, getMaster(), context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool,
-			project);
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool,
+				project);
 
 		// ------------------------------------------------------------
 		{
@@ -260,9 +249,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
-				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
-					master));
+					textProp.observeDelayed(200, t),
+					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
+							master));
 
 			new ImageTooltip(t, Messages) {
 
@@ -285,7 +274,7 @@ protected URI getImageURI() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final WindowIconDialogEditor dialog = new WindowIconDialogEditor(b.getShell(), eclipseContext,
-						project, getEditingDomain(), (MWindow) getMaster().getValue(), Messages);
+							project, getEditingDomain(), (MWindow) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -313,17 +302,17 @@ public void widgetSelected(SelectionEvent e) {
 
 		ControlFactory
 		.createCheckBox(
-			parent,
-			"To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
+				parent,
+				"To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
 		ControlFactory
 		.createCheckBox(
-			parent,
-			"Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+				parent,
+				"Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.WindowEditor_SelectedElement);
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.WindowEditor_BindingContexts);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties,
-			UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+				UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -332,15 +321,15 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createTranslatedTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase,
-			getMaster(), context, textProp,
-			EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE),
-			resourcePool, project);
+				getMaster(), context, textProp,
+				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE),
+				resourcePool, project);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables,
-			UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+				UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		if (project == null) {
 			createUITreeInspection(folder);
@@ -362,13 +351,13 @@ private void createUITreeInspection(CTabFolder folder) {
 
 		final UIViewer objectViewer = new UIViewer();
 		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
-			getMaster(), resourcePool, Messages);
+				getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
 	void removeMenu() {
 		final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(),
-			BasicPackageImpl.Literals.WINDOW__MAIN_MENU, null);
+				BasicPackageImpl.Literals.WINDOW__MAIN_MENU, null);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
@@ -379,7 +368,7 @@ void addMenu() {
 		setElementId(menu);
 
 		final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(),
-			BasicPackageImpl.Literals.WINDOW__MAIN_MENU, menu);
+				BasicPackageImpl.Literals.WINDOW__MAIN_MENU, menu);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
@@ -393,7 +382,7 @@ public IObservableList getChildList(final Object element) {
 		}
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element,
-			Messages.WindowEditor_Handlers) {
+				Messages.WindowEditor_Handlers) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -403,7 +392,7 @@ protected boolean accepted(Object o) {
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_WINDOWS, WINDOW__WINDOWS, element,
-			Messages.WindowEditor_Windows) {
+				Messages.WindowEditor_Windows) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -413,7 +402,7 @@ protected boolean accepted(Object o) {
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_CONTROLS, ELEMENT_CONTAINER__CHILDREN, element,
-			Messages.WindowEditor_Controls) {
+				Messages.WindowEditor_Controls) {
 
 			@Override
 			protected boolean accepted(Object o) {
@@ -423,7 +412,7 @@ protected boolean accepted(Object o) {
 		});
 
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_SHARED_ELEMENTS, SHARED_ELEMENTS, element,
-			Messages.WindowEditor_SharedElements) {
+				Messages.WindowEditor_SharedElements) {
 			@Override
 			protected boolean accepted(Object o) {
 				return true;
@@ -466,7 +455,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL),
-			FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java
index ebabc7ae35..60b464b780 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java
@@ -14,25 +14,15 @@
 import java.util.List;
 
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.basic.MWizardDialog;
 import org.eclipse.jface.action.Action;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
 
 public class WizardDialogEditor extends WindowEditor {
 
 	@Override
-	public Image getImage(Object element, Display display) {
-		if (element instanceof MUIElement) {
-			final MUIElement uiElement = (MUIElement) element;
-			if (uiElement.isToBeRendered() && uiElement.isVisible()) {
-				return createImage(ResourceProvider.IMG_WizardDialog);
-			}
-			return createImage(ResourceProvider.IMG_Tbr_WizardDialog);
-		}
-
-		return null;
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_WizardDialog);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index e0e4c007e3..bf62e9fea4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -71,7 +71,7 @@ protected Control createDialogArea(Composite parent) {
 		final Composite comp = (Composite) super.createDialogArea(parent);
 
 		final Image titleImage = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream(
-			"/icons/full/wizban/import_wiz.png")); //$NON-NLS-1$
+				"/icons/full/wizban/import_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
 
@@ -106,11 +106,11 @@ public void widgetDisposed(DisposeEvent e) {
 			@Override
 			public void update(ViewerCell cell) {
 				final EObject o = (EObject) cell.getElement();
-				cell.setImage(editor.getImage(o, searchText.getDisplay()));
+				cell.setImage(editor.getImage(o));
 
 				final MApplicationElement appEl = (MApplicationElement) o;
 				final StyledString styledString = new StyledString(
-					editor.getLabel(o)
+						editor.getLabel(o)
 						+ " (" + (appEl.getElementId() == null ? "<" + Messages.FindImportElementDialog_noId + ">" : appEl.getElementId()) + ")", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 				final String detailLabel = editor.getDetailLabel(o);
 				if (detailLabel != null && !detailLabel.equals(appEl.getElementId())) {
@@ -171,7 +171,7 @@ protected void okPressed() {
 			final MApplicationElement el = (MApplicationElement) s.getFirstElement();
 			if (el.getElementId() != null && el.getElementId().trim().length() > 0) {
 				final Command cmd = SetCommand.create(editor.getEditingDomain(), element,
-					ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, el.getElementId());
+						ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, el.getElementId());
 				if (cmd.canExecute()) {
 					editor.getEditingDomain().getCommandStack().execute(cmd);
 					super.okPressed();
@@ -200,7 +200,7 @@ private static class ModelResultHandlerImpl implements ModelResultHandler {
 		private final Resource resource;
 
 		public ModelResultHandlerImpl(IObservableList list, Filter filter, AbstractComponentEditor editor,
-			Resource resource) {
+				Resource resource) {
 			this.list = list;
 			this.filter = filter;
 			this.editor = editor;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index ddef900866..033f36cdad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -84,7 +84,7 @@ public class FindParentReferenceElementDialog extends TitleAreaDialog {
 	private Text searchText;
 
 	public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEditor editor,
-		MStringModelFragment fragment, Messages Messages) {
+			MStringModelFragment fragment, Messages Messages) {
 		super(parentShell);
 		this.fragment = fragment;
 		this.editor = editor;
@@ -101,7 +101,7 @@ protected Control createDialogArea(Composite parent) {
 		final Composite comp = (Composite) super.createDialogArea(parent);
 
 		final Image titleImage = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream(
-			"/icons/full/wizban/import_wiz.png")); //$NON-NLS-1$
+				"/icons/full/wizban/import_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
 
@@ -188,13 +188,13 @@ public void setControlContents(Control control, String text1, int cursorPosition
 			public void update(ViewerCell cell) {
 				final EObject o = (EObject) cell.getElement();
 				final AbstractComponentEditor editor = FindParentReferenceElementDialog.this.editor.getEditor()
-					.getEditor(o.eClass());
-				cell.setImage(editor.getImage(o, searchText.getDisplay()));
+						.getEditor(o.eClass());
+				cell.setImage(editor.getImage(o));
 
 				final MApplicationElement appEl = (MApplicationElement) o;
 
 				final StyledString styledString = new StyledString(
-					editor.getLabel(o)
+						editor.getLabel(o)
 						+ " (" + (appEl.getElementId() == null ? "<" + Messages.FindParentReferenceElementDialog_NoId + ">" : appEl.getElementId()) + ")", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 				final String detailLabel = editor.getDetailLabel(o);
 				if (detailLabel != null && !detailLabel.equals(appEl.getElementId())) {
@@ -247,7 +247,7 @@ protected void updateSearch() {
 		list.clear();
 
 		final Filter filter = new Filter(
-			(EClass) ((IStructuredSelection) eClassViewer.getSelection()).getFirstElement(), searchText.getText());
+				(EClass) ((IStructuredSelection) eClassViewer.getSelection()).getFirstElement(), searchText.getText());
 
 		currentResultHandler = new ModelResultHandlerImpl(list, filter, editor, ((EObject) fragment).eResource());
 		getCollector().findModelElements(filter, currentResultHandler);
@@ -261,7 +261,7 @@ protected void okPressed() {
 			final MApplicationElement el = (MApplicationElement) s.getFirstElement();
 			if (el.getElementId() != null && el.getElementId().trim().length() > 0) {
 				final Command cmd = SetCommand.create(editor.getEditingDomain(), fragment,
-					FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID, el.getElementId());
+						FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID, el.getElementId());
 				if (cmd.canExecute()) {
 					editor.getEditingDomain().getCommandStack().execute(cmd);
 					super.okPressed();
@@ -290,7 +290,7 @@ private static class ModelResultHandlerImpl implements ModelResultHandler {
 		private final Resource resource;
 
 		public ModelResultHandlerImpl(IObservableList list, Filter filter, AbstractComponentEditor editor,
-			Resource resource) {
+				Resource resource) {
 			this.list = list;
 			this.filter = filter;
 			this.editor = editor;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index 9ba04e589d..1a3e348869 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -67,7 +67,7 @@ public class SharedElementsDialog extends SaveDialogBoundsSettingsDialog {
 	private final Messages Messages;
 
 	public SharedElementsDialog(Shell parentShell, ModelEditor editor, MPlaceholder placeholder,
-		IModelResource resource, Messages Messages) {
+			IModelResource resource, Messages Messages) {
 		super(parentShell);
 		this.editor = editor;
 		this.placeholder = placeholder;
@@ -150,7 +150,7 @@ protected void okPressed() {
 		if (!viewer.getSelection().isEmpty()) {
 			final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 			final Command cmd = SetCommand.create(resource.getEditingDomain(), placeholder,
-				AdvancedPackageImpl.Literals.PLACEHOLDER__REF, s.getFirstElement());
+					AdvancedPackageImpl.Literals.PLACEHOLDER__REF, s.getFirstElement());
 			if (cmd.canExecute()) {
 				resource.getEditingDomain().getCommandStack().execute(cmd);
 				super.okPressed();
@@ -210,9 +210,9 @@ private String getTypename(EObject o) {
 		@Override
 		public Image getImage(Object element) {
 			final AbstractComponentEditor editor = SharedElementsDialog.this.editor.getEditor(((EObject) element)
-				.eClass());
+					.eClass());
 			if (editor != null) {
-				return editor.getImage(element, getShell().getDisplay());
+				return editor.getImage(element);
 			}
 			return null;
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index 6c67aae0bb..c22facce2f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -39,10 +39,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VApplicationAddons extends AbstractComponentEditor {
 	private Composite composite;
@@ -67,10 +65,6 @@ public void run() {
 			});
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
 
 	@Override
 	public String getLabel(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index 2debfdd720..cc349c1432 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -14,8 +14,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -39,18 +41,16 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VApplicationCategoriesEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private TableViewer viewer;
 	private EMFDataBindingContext context;
 
-	private List<Action> actions = new ArrayList<Action>();
-	private List<Action> actionsImport = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actionsImport = new ArrayList<Action>();
 
 	@Inject
 	public VApplicationCategoriesEditor() {
@@ -74,20 +74,16 @@ public void run() {
 	}
 
 	protected void handleImport() {
-		ModelImportWizard wizard = new ModelImportWizard(MCategory.class, this, resourcePool);
-		WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
+		final ModelImportWizard wizard = new ModelImportWizard(MCategory.class, this, resourcePool);
+		final WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
 		if (wizardDialog.open() == Window.OK) {
-			MCategory[] elements = (MCategory[]) wizard.getElements(MCategory.class);
-			for (MCategory category : elements) {
+			final MCategory[] elements = (MCategory[]) wizard.getElements(MCategory.class);
+			for (final MCategory category : elements) {
 				addCategory(category);
 			}
 		}
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
 
 	@Override
 	public String getLabel(Object element) {
@@ -110,23 +106,23 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
 		{
-			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
@@ -152,14 +148,14 @@ public IObservableList getChildList(Object element) {
 	}
 
 	protected void handleAdd() {
-		MCategory category = CommandsFactoryImpl.eINSTANCE.createCategory();
+		final MCategory category = CommandsFactoryImpl.eINSTANCE.createCategory();
 		addCategory(category);
 	}
 
 	private void addCategory(MCategory category) {
 		setElementId(category);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES, category);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES, category);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -169,14 +165,14 @@ private void addCategory(MCategory category) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	@Override
 	public List<Action> getActionsImport(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actionsImport);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 32824bdfe6..597c23beb9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -14,8 +14,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -36,16 +38,14 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VBindingTableEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	public VBindingTableEditor() {
@@ -62,10 +62,6 @@ public void run() {
 		});
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
 
 	@Override
 	public String getLabel(Object element) {
@@ -89,23 +85,23 @@ public Composite doGetEditor(Composite parent, Object object) {
 			composite = createForm(parent, context, getMaster());
 
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
 		{
-			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
@@ -126,10 +122,10 @@ protected List<?> getContainerChildren(Object container) {
 	}
 
 	protected void handleAdd() {
-		MBindingTable command = MCommandsFactory.INSTANCE.createBindingTable();
+		final MBindingTable command = MCommandsFactory.INSTANCE.createBindingTable();
 		setElementId(command);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES, command);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES, command);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -144,7 +140,7 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 95d4ce8cba..ff7258223f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -44,10 +44,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VCommandEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -87,11 +85,6 @@ public void run() {
 		});
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
-
 	@Override
 	public String getLabel(Object element) {
 		return Messages.VCommandEditor_TreeLabel;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 97e6c33872..4a5136b4a8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -41,10 +41,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VHandlerEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -78,11 +76,6 @@ public void run() {
 		});
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
-
 	@Override
 	public String getLabel(Object element) {
 		return Messages.VHandlerEditor_TreeLabel;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
index f0ea6bbada..273c9fdb8f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -40,10 +40,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VItemParametersEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -70,10 +68,6 @@ public void run() {
 		});
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
 
 	@Override
 	public String getLabel(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index e66ebaa87e..6d3f386380 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -14,8 +14,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -36,17 +38,15 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VMenuContributionsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
 
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	public VMenuContributionsEditor() {
@@ -63,10 +63,6 @@ public void run() {
 		});
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
 
 	@Override
 	public String getLabel(Object element) {
@@ -89,23 +85,23 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
 		{
-			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
@@ -132,10 +128,10 @@ public IObservableList getChildList(Object element) {
 	}
 
 	protected void handleAdd() {
-		MMenuContribution command = MMenuFactory.INSTANCE.createMenuContribution();
+		final MMenuContribution command = MMenuFactory.INSTANCE.createMenuContribution();
 		setElementId(command);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS, command);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS, command);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -145,7 +141,7 @@ protected void handleAdd() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index c0cbeefc6a..4df8c08eba 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -13,8 +13,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -44,17 +46,15 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VMenuEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private StructuredViewer viewer;
-	private List<Action> actions = new ArrayList<Action>();
-	private EStructuralFeature feature;
+	private final List<Action> actions = new ArrayList<Action>();
+	private final EStructuralFeature feature;
 
 	@Inject
 	IEclipseContext eclipseContext;
@@ -92,11 +92,6 @@ public void run() {
 		});
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
-
 	@Override
 	public String getLabel(Object element) {
 		return Messages.VMenuEditor_TreeLabel;
@@ -118,25 +113,25 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, feature) {
+		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, feature) {
 			@Override
 			protected void addPressed() {
-				Types t = (Types) ((IStructuredSelection) getSelection()).getFirstElement();
+				final Types t = (Types) ((IStructuredSelection) getSelection()).getFirstElement();
 				if (t == Types.MENU) {
 					handleAdd(MenuPackageImpl.Literals.MENU);
 				} else if (t == Types.POPUP_MENU) {
@@ -186,10 +181,10 @@ public IObservableList getChildList(Object element) {
 	}
 
 	protected void handleAdd(EClass eClass) {
-		EObject handler = EcoreUtil.create(eClass);
+		final EObject handler = EcoreUtil.create(eClass);
 		setElementId(handler);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), feature, handler);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), feature, handler);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -198,11 +193,11 @@ protected void handleAdd(EClass eClass) {
 	}
 
 	protected void handleAddViewMenu() {
-		MMenu menu = MenuFactoryImpl.eINSTANCE.createMenu();
+		final MMenu menu = MenuFactoryImpl.eINSTANCE.createMenu();
 		menu.getTags().add(VIEW_MENU_TAG);
 		setElementId(menu);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), feature, menu);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), feature, menu);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -212,7 +207,7 @@ protected void handleAddViewMenu() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index 46a7d539a2..3f62ab436f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -38,10 +38,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VModelFragmentsEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -65,11 +63,6 @@ public void run() {
 		});
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
-
 	@Override
 	public String getLabel(Object element) {
 		return Messages.VModelFragmentsEditor_TreeLabel;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index 5b2b71c6c8..4e2fd71661 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -13,7 +13,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -40,10 +42,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VModelImportsEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -58,11 +58,6 @@ public VModelImportsEditor() {
 		super();
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
-
 	@Override
 	public String getLabel(Object element) {
 		return Messages.VModelImportsEditor_TreeLabel;
@@ -84,34 +79,34 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 		composite = folder;
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
+		final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
 			@Override
 			protected void addPressed() {
 
-				Object firstElement = ((IStructuredSelection) getSelection()).getFirstElement();
+				final Object firstElement = ((IStructuredSelection) getSelection()).getFirstElement();
 
 				if (firstElement != null) {
-					FeatureClass featureClass = (FeatureClass) firstElement;
-					EClass eClass = featureClass.eClass;
-					EObject eObject = EcoreUtil.create(eClass);
+					final FeatureClass featureClass = (FeatureClass) firstElement;
+					final EClass eClass = featureClass.eClass;
+					final EObject eObject = EcoreUtil.create(eClass);
 
-					Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, eObject);
+					final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS, eObject);
 
 					if (cmd.canExecute()) {
 						getEditingDomain().getCommandStack().execute(cmd);
@@ -133,7 +128,7 @@ protected List<?> getContainerChildren(Object master) {
 		pickList.setLabelProvider(new LabelProvider() {
 			@Override
 			public String getText(Object element) {
-				FeatureClass eclass = (FeatureClass) element;
+				final FeatureClass eclass = (FeatureClass) element;
 				return eclass.label;
 			}
 		});
@@ -141,13 +136,13 @@ public String getText(Object element) {
 		pickList.setComparator(new ViewerComparator() {
 			@Override
 			public int compare(Viewer viewer, Object e1, Object e2) {
-				FeatureClass eClass1 = (FeatureClass) e1;
-				FeatureClass eClass2 = (FeatureClass) e2;
+				final FeatureClass eClass1 = (FeatureClass) e1;
+				final FeatureClass eClass2 = (FeatureClass) e2;
 				return eClass1.label.compareTo(eClass2.label);
 			}
 		});
 
-		List<FeatureClass> list = new ArrayList<FeatureClass>();
+		final List<FeatureClass> list = new ArrayList<FeatureClass>();
 		Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
 		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index 34478f6285..9713284630 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -14,8 +14,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -41,17 +43,15 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VPartDescriptor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private List<Action> actions = new ArrayList<Action>();
-	private List<Action> actionsImport = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actionsImport = new ArrayList<Action>();
 
 	@Inject
 	public VPartDescriptor() {
@@ -89,11 +89,6 @@ public void run() {
 		});
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
-
 	@Override
 	public String getLabel(Object element) {
 		return Messages.VPartDescriptor_TreeLabel;
@@ -115,23 +110,23 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
 		{
-			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
@@ -139,7 +134,7 @@ protected void addPressed() {
 
 				@Override
 				protected List<?> getContainerChildren(Object container) {
-					MPartDescriptorContainer c = (MPartDescriptorContainer) container;
+					final MPartDescriptorContainer c = (MPartDescriptorContainer) container;
 					return c.getDescriptors();
 				}
 			};
@@ -158,14 +153,14 @@ public IObservableList getChildList(Object element) {
 	}
 
 	protected void handleAdd() {
-		MPartDescriptor partDescription = MBasicFactory.INSTANCE.createPartDescriptor();
+		final MPartDescriptor partDescription = MBasicFactory.INSTANCE.createPartDescriptor();
 		addToModel(partDescription);
 	}
 
 	private void addToModel(MPartDescriptor partDescription) {
 		setElementId(partDescription);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, partDescription);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS, partDescription);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -176,11 +171,11 @@ private void addToModel(MPartDescriptor partDescription) {
 	protected void handleImport(EClass eClass, String hint) {
 
 		if (eClass == BasicPackageImpl.Literals.PART_DESCRIPTOR) {
-			ModelImportWizard wizard = new ModelImportWizard(MPartDescriptor.class, this, hint, resourcePool);
-			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
+			final ModelImportWizard wizard = new ModelImportWizard(MPartDescriptor.class, this, hint, resourcePool);
+			final WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
 			if (wizardDialog.open() == Window.OK) {
-				MPartDescriptor[] parts = (MPartDescriptor[]) wizard.getElements(MPartDescriptor.class);
-				for (MPartDescriptor part : parts) {
+				final MPartDescriptor[] parts = (MPartDescriptor[]) wizard.getElements(MPartDescriptor.class);
+				for (final MPartDescriptor part : parts) {
 					addToModel(part);
 				}
 			}
@@ -189,14 +184,14 @@ protected void handleImport(EClass eClass, String hint) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	@Override
 	public List<Action> getActionsImport(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
 		l.addAll(actionsImport);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index b174e7651e..0c871582c9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -13,8 +13,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -40,16 +42,14 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VPerspectiveControlEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	public VPerspectiveControlEditor() {
@@ -93,10 +93,6 @@ public void run() {
 		});
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
 
 	@Override
 	public String getLabel(Object element) {
@@ -119,26 +115,26 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
 		{
-			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
+					final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
 					handleAdd(eClass);
 				}
 			};
@@ -162,11 +158,11 @@ public IObservableList getChildList(Object element) {
 	}
 
 	private void handleAdd(EClass eClass) {
-		EObject eObject = EcoreUtil.create(eClass);
+		final EObject eObject = EcoreUtil.create(eClass);
 
 		setElementId(eObject);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -176,7 +172,7 @@ private void handleAdd(EClass eClass) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
index c0eacbd335..3e09e6df44 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
@@ -14,8 +14,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -36,17 +38,15 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VRootBindingContexts extends AbstractComponentEditor {
 	private Composite composite;
 	private TableViewer viewer;
 	private EMFDataBindingContext context;
 
-	private List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
 
 	@Inject
 	public VRootBindingContexts() {
@@ -63,11 +63,6 @@ public void run() {
 		});
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
-
 	@Override
 	public String getLabel(Object element) {
 		return Messages.VRootBindingContexts_TreeLabel;
@@ -89,23 +84,23 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
 		{
-			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT) {
 				@Override
 				protected void addPressed() {
 					handleAddContext();
@@ -126,10 +121,10 @@ protected List<?> getContainerChildren(Object container) {
 	}
 
 	private void handleAddContext() {
-		MBindingContext context = MCommandsFactory.INSTANCE.createBindingContext();
+		final MBindingContext context = MCommandsFactory.INSTANCE.createBindingContext();
 		setElementId(context);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT, context);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT, context);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -144,7 +139,7 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index 3540865ce1..1c4e2aad22 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -36,10 +36,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VSnippetsEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -155,11 +153,6 @@ public int compare(Action o1, Action o2) {
 
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
-
 	@Override
 	public String getLabel(Object element) {
 		return Messages.VWindowControlEditor_TreeLabel;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index 39d6a57812..c429a0ad60 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -38,10 +38,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VToolBarContributionsEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -65,11 +63,6 @@ public void run() {
 		});
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
-
 	@Override
 	public String getLabel(Object element) {
 		return Messages.VToolBarContributionsEditor_TreeLabel;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index 2588e523f2..84194caa0b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -38,10 +38,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VTrimContributionsEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -65,11 +63,6 @@ public void run() {
 		});
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
-
 	@Override
 	public String getLabel(Object element) {
 		return Messages.VTrimContributionsEditor_TreeLabel;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 1a0753a769..e977593a1d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -44,10 +44,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VWindowControlEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -113,11 +111,6 @@ public int compare(Action o1, Action o2) {
 		});
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
-
 	@Override
 	public String getLabel(Object element) {
 		return Messages.VWindowControlEditor_TreeLabel;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 9a5c0bec11..74c943b3a2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -13,7 +13,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -38,17 +40,15 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public abstract class VWindowEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private List<Action> actions = new ArrayList<Action>();
-	private EStructuralFeature targetFeature;
+	private final List<Action> actions = new ArrayList<Action>();
+	private final EStructuralFeature targetFeature;
 
 	public VWindowEditor(EStructuralFeature targetFeature) {
 		super();
@@ -83,11 +83,6 @@ public void run() {
 		});
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
-
 	@Override
 	public String getLabel(Object element) {
 		return Messages.VWindowEditor_TreeLabel;
@@ -109,25 +104,25 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, targetFeature) {
+		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, targetFeature) {
 			@Override
 			protected void addPressed() {
-				EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
+				final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
 				handleAdd(eClass);
 			}
 
@@ -176,16 +171,16 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	protected void handleAdd(EClass eClass) {
-		EObject handler = EcoreUtil.create(eClass);
+		final EObject handler = EcoreUtil.create(eClass);
 		setElementId(handler);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), targetFeature, handler);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), targetFeature, handler);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 4d8e1ea0df..277a5f7e8c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -14,8 +14,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -48,17 +50,15 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VWindowSharedElementsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private StructuredViewer viewer;
-	private List<Action> actions = new ArrayList<Action>();
-	private List<Action> actionsImport = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actionsImport = new ArrayList<Action>();
 
 	@Inject
 	IEclipseContext eclipseContext;
@@ -121,11 +121,6 @@ public void run() {
 		});
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
-
 	@Override
 	public String getLabel(Object element) {
 		return Messages.VWindowSharedElementsEditor_TreeLabel;
@@ -147,16 +142,16 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		VirtualEntry<?> o = (VirtualEntry<?>) object;
+		final VirtualEntry<?> o = (VirtualEntry<?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
 	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
@@ -164,10 +159,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 
-			AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS) {
 				@Override
 				protected void addPressed() {
-					EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
+					final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
 					handleAdd(eClass);
 				}
 
@@ -179,7 +174,7 @@ protected List<?> getContainerChildren(Object container) {
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 			viewer = pickList.getList();
 
-			IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
+			final IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
 			viewer.setInput(prop.observeDetail(getMaster()));
 
 			pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
@@ -198,14 +193,14 @@ public IObservableList getChildList(Object element) {
 	}
 
 	protected void handleAdd(EClass eClass) {
-		EObject eObject = EcoreUtil.create(eClass);
+		final EObject eObject = EcoreUtil.create(eClass);
 		addToModel(eObject);
 	}
 
 	private void addToModel(EObject eObject) {
 		setElementId(eObject);
 
-		Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, eObject);
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
@@ -215,11 +210,11 @@ private void addToModel(EObject eObject) {
 
 	protected void handleImport(EClass eClass, String hint) {
 		if (eClass == BasicPackageImpl.Literals.PART) {
-			ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, hint, resourcePool);
-			WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
+			final ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, hint, resourcePool);
+			final WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
 			if (wizardDialog.open() == Window.OK) {
-				MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
-				for (MPart part : parts) {
+				final MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
+				for (final MPart part : parts) {
 					addToModel((EObject) part);
 				}
 			}
@@ -228,14 +223,14 @@ protected void handleImport(EClass eClass, String hint) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	@Override
 	public List<Action> getActionsImport(Object element) {
-		ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		final ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
 		l.addAll(actionsImport);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index bd9f1e2df0..d0ef5796a3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -38,10 +38,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 
 public class VWindowTrimEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -65,11 +63,6 @@ public void run() {
 		});
 	}
 
-	@Override
-	public Image getImage(Object element, Display display) {
-		return null;
-	}
-
 	@Override
 	public String getLabel(Object element) {
 		return Messages.VWindowTrimEditor_TreeLabel;

From b2aa8b3c206a323b5824043d8c6ae32f6a5af9ee Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Wed, 15 Jul 2015 14:53:20 +0200
Subject: [PATCH 0904/1286] Bug 472660 - In model editors, the tooltip for
 Icons is not well computed for URI with $nl$

Use now the AbstractComponentEditor::getImage method.
Simplify the way to compute image in the ImageTooltip
(it is now useless to override the getImageURI method).


Change-Id: I77bcf685a42243a74c65cdc5025174e139f3106f
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../e4/tools/emf/ui/common/ImageTooltip.java  | 208 ++++++------------
 .../tools/emf/ui/internal/Messages.properties |   2 +-
 .../internal/common/component/AreaEditor.java |  14 +-
 .../common/component/CompositePartEditor.java |  15 +-
 .../internal/common/component/MenuEditor.java |  14 +-
 .../common/component/MenuItemEditor.java      |  14 +-
 .../component/PartDescriptorEditor.java       |  14 +-
 .../internal/common/component/PartEditor.java |  18 +-
 .../common/component/PerspectiveEditor.java   |  14 +-
 .../common/component/ToolItemEditor.java      |  95 ++++----
 .../common/component/WindowEditor.java        |  14 +-
 11 files changed, 115 insertions(+), 307 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
index b494088606..6864dd4bc8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
@@ -10,17 +10,11 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.DecimalFormat;
 import java.text.MessageFormat;
+
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.emf.common.util.URI;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.window.ToolTip;
 import org.eclipse.swt.SWT;
@@ -31,13 +25,14 @@
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
 
-public abstract class ImageTooltip extends ToolTip {
-	private Image image;
-	private Messages Messages;
+public class ImageTooltip extends ToolTip {
+	private final Messages Messages;
+	private final AbstractComponentEditor editor;
 
-	public ImageTooltip(Control control, Messages Messages) {
+	public ImageTooltip(Control control, Messages Messages, AbstractComponentEditor editor) {
 		super(control);
 		this.Messages = Messages;
+		this.editor = editor;
 	}
 
 	@Override
@@ -50,152 +45,73 @@ protected boolean shouldCreateToolTip(Event event) {
 
 	@Override
 	protected Composite createToolTipContentArea(Event event, Composite parent) {
-		clearResources();
 		parent = new Composite(parent, SWT.NONE);
 		parent.setBackground(event.widget.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
 		parent.setBackgroundMode(SWT.INHERIT_DEFAULT);
 		parent.setLayout(new GridLayout(2, false));
 
-		URI uri = getImageURI();
-
-		if (uri != null) {
-			int fileSize = -1;
-			ByteArrayOutputStream out = null;
-			InputStream stream = null;
-			InputStream bStream = null;
-			String errorMessage = "<" + Messages.ImageTooltip_UnknownError + ">"; //$NON-NLS-1$ //$NON-NLS-2$
-			try {
-				URL url;
-				try {
-					url = new URL(uri.toString());
-					stream = url.openStream();
-				} catch (Exception e) {
-					// FIXME Temporary fix to show icon
-					// If not found in runtime search in workspace
-					if (stream == null) {
-						String[] segments = uri.segments();
-						URI tmpUri = URI.createPlatformResourceURI(segments[1], true);
-						for (int i = 2; i < segments.length; i++) {
-							tmpUri = tmpUri.appendSegment(segments[i]);
-						}
-
-						url = new URL(tmpUri.toString());
-						stream = url.openStream();
-					}
-				}
-
-				if (stream != null) {
-					out = new ByteArrayOutputStream();
-					byte[] buf = new byte[1024];
-					int length;
-					while ((length = stream.read(buf)) != -1) {
-						out.write(buf, 0, length);
-					}
-					fileSize = out.size();
-					bStream = new ByteArrayInputStream(out.toByteArray());
-					image = new Image(parent.getDisplay(), bStream);
-				}
-			} catch (MalformedURLException e) {
-				errorMessage = e.getMessage();
-			} catch (FileNotFoundException e) {
-				if (uri.isPlatform()) {
-					errorMessage = MessageFormat.format(Messages.ImageTooltip_FileNotFound, e.getMessage(), uri.segment(1));
-				} else {
-					errorMessage = e.getMessage();
-				}
-			} catch (IOException e) {
-				errorMessage = e.getMessage();
-			} catch (Exception e) {
-				errorMessage = e.getMessage();
-			} finally {
-				if (out != null) {
-					try {
-						out.close();
-					} catch (IOException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-
-				if (bStream != null) {
-					try {
-						bStream.close();
-					} catch (IOException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-
-				if (stream != null) {
-					try {
-						stream.close();
-					} catch (IOException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-			}
-
-			// ---------------------------------
-			Label l = new Label(parent, SWT.NONE);
-			l.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
-			l.setText(Messages.ImageTooltip_Icon + ":"); //$NON-NLS-1$
-
-			l = new Label(parent, SWT.NONE);
-			if (image == null) {
-				System.err.println(errorMessage);
-				l.setText(errorMessage);
-			} else {
-				l.setImage(image);
-			}
-
-			// ---------------------------------
-
-			l = new Label(parent, SWT.NONE);
-			l.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
-			l.setText(Messages.ImageTooltip_Name + ":"); //$NON-NLS-1$
-
-			l = new Label(parent, SWT.NONE);
-			l.setText(uri.lastSegment());
-
-			// ---------------------------------
-
-			l = new Label(parent, SWT.NONE);
-			l.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
-			l.setText(Messages.ImageTooltip_Dimension + ":"); //$NON-NLS-1$
-
-			l = new Label(parent, SWT.NONE);
-			if (image != null) {
-				l.setText(image.getBounds().width + "x" + image.getBounds().height + " px"); //$NON-NLS-1$ //$NON-NLS-2$
-			} else {
-				l.setText("0x0 px"); //$NON-NLS-1$
-			}
-
-			// ---------------------------------
-
-			l = new Label(parent, SWT.NONE);
-			l.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
-			l.setText(Messages.ImageTooltip_FileSize + ":"); //$NON-NLS-1$
-
-			l = new Label(parent, SWT.NONE);
-			l.setText(new DecimalFormat("#,##0.00").format((fileSize / 1024.0)) + "KB"); //$NON-NLS-1$ //$NON-NLS-2$
+		final String imageUri = getImageURI();
+		final Image image = imageUri != null ? getImage() : null;
+
+
+		// ---------------------------------
+		Label l = new Label(parent, SWT.NONE);
+		l.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
+		l.setText(Messages.ImageTooltip_Icon + ":"); //$NON-NLS-1$
+
+		l = new Label(parent, SWT.NONE);
+		if (image == null && imageUri != null)
+		{
+			final String errorMessage = MessageFormat.format(Messages.ImageTooltip_FileNotFound, imageUri);
+			l.setText(errorMessage);
+		} else
+
+		{
+			l.setImage(image);
 		}
 
-		return parent;
-	}
+		// ---------------------------------
+		l = new Label(parent, SWT.NONE);
+		l.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
+		l.setText(Messages.ImageTooltip_Name + ":"); //$NON-NLS-1$
+
+		l = new Label(parent, SWT.NONE);
+		final int pos = imageUri.lastIndexOf('/');
+		l.setText(imageUri.substring(pos));
+
+		// ---------------------------------
+		l = new Label(parent, SWT.NONE);
+		l.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
+		l.setText(Messages.ImageTooltip_Dimension + ":"); //$NON-NLS-1$
+
+		l = new Label(parent, SWT.NONE);
+		if (image != null)
+		{
+			l.setText(image.getBounds().width + "x" + image.getBounds().height + " px"); //$NON-NLS-1$ //$NON-NLS-2$
+		} else
+		{
+			l.setText("0x0 px"); //$NON-NLS-1$
+		}
+
+
+		return parent;}
 
 	@Override
 	protected void afterHideToolTip(Event event) {
 		super.afterHideToolTip(event);
-		clearResources();
 	}
 
-	protected abstract URI getImageURI();
+	private String getImageURI() {
+		final MUILabel part = (MUILabel) editor.getMaster().getValue();
+		return part.getIconURI();
 
-	private void clearResources() {
-		if (image != null) {
-			image.dispose();
-			image = null;
-		}
 	}
+
+	protected Image getImage() {
+		final MUILabel part = (MUILabel) editor.getMaster().getValue();
+		final String iconUri = getImageURI();
+
+		return iconUri != null ? editor.getImageFromIconURI(part) : null;
+	}
+
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index b0394e3b91..b9c5d8154a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -660,7 +660,7 @@ WindowIconDialogEditor_DialogTitle=Menu Icon Search
 WindowIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
 
 ImageTooltip_UnknownError=Unknown Error
-ImageTooltip_FileNotFound=File ''{0}'' not found in bundle ''{1}''
+ImageTooltip_FileNotFound=Image file ''{0}'' not found 
 ImageTooltip_Icon=Icon
 ImageTooltip_Name=Name
 ImageTooltip_Dimension=Dimensions
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 8c069fa88d..b9e97c0f26 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -42,7 +42,6 @@
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -236,18 +235,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
 							master));
 
-			new ImageTooltip(t, Messages) {
-
-				@Override
-				protected URI getImageURI() {
-					final MUILabel part = (MUILabel) getMaster().getValue();
-					final String uri = part.getIconURI();
-					if (uri == null || uri.trim().length() == 0) {
-						return null;
-					}
-					return URI.createURI(part.getIconURI());
-				}
-			};
+			new ImageTooltip(t, Messages, this);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index cf480368b5..d3c89f2ed7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -27,14 +27,12 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
-import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MCompositePart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -266,18 +264,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
 							master));
 
-			new ImageTooltip(t, Messages) {
-
-				@Override
-				protected URI getImageURI() {
-					final MUILabel part = (MUILabel) getMaster().getValue();
-					final String uri = part.getIconURI();
-					if (uri == null || uri.trim().length() == 0) {
-						return null;
-					}
-					return URI.createURI(part.getIconURI());
-				}
-			};
+			new ImageTooltip(t, Messages, this);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index b235e4f587..5509860f4e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -55,7 +55,6 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -301,18 +300,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
 							master));
 
-			new ImageTooltip(t, Messages) {
-
-				@Override
-				protected URI getImageURI() {
-					final MUILabel part = (MUILabel) getMaster().getValue();
-					final String uri = part.getIconURI();
-					if (uri == null || uri.trim().length() == 0) {
-						return null;
-					}
-					return URI.createURI(part.getIconURI());
-				}
-			};
+			new ImageTooltip(t, Messages, this);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 7db857de43..362e7f79c4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -43,7 +43,6 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
@@ -219,18 +218,7 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
 							master));
 
-			new ImageTooltip(t, Messages) {
-
-				@Override
-				protected URI getImageURI() {
-					final MUILabel part = (MUILabel) getMaster().getValue();
-					final String uri = part.getIconURI();
-					if (uri == null || uri.trim().length() == 0) {
-						return null;
-					}
-					return URI.createURI(part.getIconURI());
-				}
-			};
+			new ImageTooltip(t, Messages, this);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index dac4001c16..340b672503 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -44,7 +44,6 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -194,18 +193,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
 							master));
 
-			new ImageTooltip(t, Messages) {
-
-				@Override
-				protected URI getImageURI() {
-					final MUILabel part = (MUILabel) getMaster().getValue();
-					final String uri = part.getIconURI();
-					if (uri == null || uri.trim().length() == 0) {
-						return null;
-					}
-					return URI.createURI(part.getIconURI());
-				}
-			};
+			new ImageTooltip(t, Messages, this);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index d6f84108db..1fdc7e7422 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -48,7 +48,6 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -206,18 +205,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
 							master));
 
-			new ImageTooltip(t, Messages) {
-
-				@Override
-				protected URI getImageURI() {
-					final MUILabel part = (MUILabel) getMaster().getValue();
-					final String uri = part.getIconURI();
-					if (uri == null || uri.trim().length() == 0) {
-						return null;
-					}
-					return URI.createURI(part.getIconURI());
-				}
-			};
+			new ImageTooltip(t, Messages, this);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
@@ -275,8 +263,8 @@ public void modifyText(ModifyEvent e) {
 					textProp.observeDelayed(200, t),
 					EMFEditProperties.value(getEditingDomain(),
 							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master),
-							new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
-							new UpdateValueStrategy());
+					new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+					new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index b48420d0c0..0e5675e4a0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -40,7 +40,6 @@
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -239,18 +238,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
 							master));
 
-			new ImageTooltip(t, Messages) {
-
-				@Override
-				protected URI getImageURI() {
-					final MUILabel part = (MUILabel) getMaster().getValue();
-					final String uri = part.getIconURI();
-					if (uri == null || uri.trim().length() == 0) {
-						return null;
-					}
-					return URI.createURI(part.getIconURI());
-				}
-			};
+			new ImageTooltip(t, Messages, this);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 7e967324e2..446cf466db 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -14,7 +14,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -36,7 +38,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ToolItemIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
@@ -44,7 +45,6 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -80,7 +80,7 @@ public abstract class ToolItemEditor extends AbstractComponentEditor {
 
 	private StackLayout stackLayout;
 
-	private IValueProperty TOOL_ITEM__MENU = EMFProperties.value(MenuPackageImpl.Literals.TOOL_ITEM__MENU);
+	private final IValueProperty TOOL_ITEM__MENU = EMFProperties.value(MenuPackageImpl.Literals.TOOL_ITEM__MENU);
 
 	@Inject
 	@Optional
@@ -134,9 +134,9 @@ public Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
-		CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabDefault);
 
 		parent = createScrollableContainer(folder);
@@ -146,7 +146,7 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -170,35 +170,35 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 	}
 
 	private void createUITreeInspection(CTabFolder folder) {
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		Composite container = new Composite(folder, SWT.NONE);
+		final Composite container = new Composite(folder, SWT.NONE);
 		container.setLayout(new GridLayout());
 		item.setControl(container);
 
-		UIViewer objectViewer = new UIViewer();
-		TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET, getMaster(), resourcePool, Messages);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
 	protected void createFormSubTypeForm(Composite parent, CTabFolder folder, EMFDataBindingContext context, final WritableValue master) {
-		IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-		IWidgetValueProperty checkProp = WidgetProperties.selection();
-		IWidgetValueProperty enabled = WidgetProperties.enabled();
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty checkProp = WidgetProperties.selection();
+		final IWidgetValueProperty enabled = WidgetProperties.enabled();
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolItemEditor_Type);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			ComboViewer viewer = new ComboViewer(parent);
+			final ComboViewer viewer = new ComboViewer(parent);
 			viewer.setContentProvider(new ArrayContentProvider());
 			viewer.setInput(new ItemType[] { ItemType.CHECK, ItemType.PUSH, ItemType.RADIO });
-			GridData gd = new GridData();
+			final GridData gd = new GridData();
 			gd.horizontalSpan = 2;
 			viewer.getControl().setLayoutData(gd);
-			IObservableValue itemTypeObs = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(master);
+			final IObservableValue itemTypeObs = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(master);
 			context.bindValue(ViewerProperties.singleSelection().observe(viewer), itemTypeObs);
 		}
 
@@ -208,27 +208,16 @@ protected void createFormSubTypeForm(Composite parent, CTabFolder folder, EMFDat
 
 		// ------------------------------------------------------------
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolItemEditor_IconURI);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Text t = new Text(parent, SWT.BORDER);
+			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
 
-			new ImageTooltip(t, Messages) {
-
-				@Override
-				protected URI getImageURI() {
-					MUILabel part = (MUILabel) getMaster().getValue();
-					String uri = part.getIconURI();
-					if (uri == null || uri.trim().length() == 0) {
-						return null;
-					}
-					return URI.createURI(part.getIconURI());
-				}
-			};
+			new ImageTooltip(t, Messages, this);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -237,14 +226,14 @@ protected URI getImageURI() {
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					ToolItemIconDialogEditor dialog = new ToolItemIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MToolItem) getMaster().getValue(), Messages);
+					final ToolItemIconDialogEditor dialog = new ToolItemIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MToolItem) getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
 		}
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolItemEditor_Menu);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
@@ -252,7 +241,7 @@ public void widgetSelected(SelectionEvent e) {
 			createRemoveMenu.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					MToolItem item = (MToolItem) getMaster().getValue();
+					final MToolItem item = (MToolItem) getMaster().getValue();
 					if (item.getMenu() == null) {
 						addMenu();
 					} else {
@@ -264,25 +253,25 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolItemEditor_Enabled);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Button b = new Button(parent, SWT.CHECK);
+			final Button b = new Button(parent, SWT.CHECK);
 			b.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 			context.bindValue(checkProp.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__ENABLED).observeDetail(getMaster()));
 		}
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolItemEditor_Selected);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			Button b = new Button(parent, SWT.CHECK);
+			final Button b = new Button(parent, SWT.CHECK);
 			b.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 			context.bindValue(checkProp.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__SELECTED).observeDetail(getMaster()));
 
-			UpdateValueStrategy t2m = new UpdateValueStrategy();
+			final UpdateValueStrategy t2m = new UpdateValueStrategy();
 			t2m.setConverter(new Converter(boolean.class, ItemType.class) {
 
 				@Override
@@ -290,7 +279,7 @@ public Object convert(Object fromObject) {
 					return null;
 				}
 			});
-			UpdateValueStrategy m2t = new UpdateValueStrategy();
+			final UpdateValueStrategy m2t = new UpdateValueStrategy();
 			m2t.setConverter(new Converter(ItemType.class, boolean.class) {
 
 				@Override
@@ -304,25 +293,25 @@ public Object convert(Object fromObject) {
 		}
 
 		{
-			Label l = new Label(parent, SWT.NONE);
+			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ModelTooling_UIElement_VisibleWhen);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
-			ComboViewer combo = new ComboViewer(parent);
+			final ComboViewer combo = new ComboViewer(parent);
 			combo.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
 			combo.setContentProvider(new ArrayContentProvider());
 			combo.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
 					if (element instanceof EClass) {
-						EClass eClass = (EClass) element;
+						final EClass eClass = (EClass) element;
 						return eClass.getName();
 					}
 
 					return super.getText(element);
 				}
 			});
-			List<Object> list = new ArrayList<Object>();
+			final List<Object> list = new ArrayList<Object>();
 			list.add(Messages.ToolItemEditor_NoExpression);
 			list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
 			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
@@ -336,7 +325,7 @@ public String getText(Object element) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
 
-		CTabItem item = new CTabItem(folder, SWT.NONE);
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
 
 		parent = createScrollableContainer(folder);
@@ -351,17 +340,17 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 	}
 
 	void removeMenu() {
-		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_ITEM__MENU, null);
+		final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_ITEM__MENU, null);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
 	}
 
 	void addMenu() {
-		MMenu menu = MMenuFactory.INSTANCE.createMenu();
+		final MMenu menu = MMenuFactory.INSTANCE.createMenu();
 		setElementId(menu);
 
-		Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_ITEM__MENU, menu);
+		final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), MenuPackageImpl.Literals.TOOL_ITEM__MENU, menu);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 		}
@@ -371,7 +360,7 @@ void addMenu() {
 	public IObservableList getChildList(final Object element) {
 		final WritableList list = new WritableList();
 
-		MToolItem item = (MToolItem) element;
+		final MToolItem item = (MToolItem) element;
 		if (item.getMenu() != null) {
 			list.add(0, item.getMenu());
 		}
@@ -401,8 +390,8 @@ public void handleValueChange(ValueChangeEvent event) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		MToolItem item = (MToolItem) element;
-		String l = getLocalizedLabel(item);
+		final MToolItem item = (MToolItem) element;
+		final String l = getLocalizedLabel(item);
 
 		if (l != null && l.trim().length() > 0) {
 			return l;
@@ -418,7 +407,7 @@ public FeaturePath[] getLabelProperties() {
 	}
 
 	static class EObject2EClass extends Converter {
-		private Messages Messages;
+		private final Messages Messages;
 
 		public EObject2EClass(Messages Messages) {
 			super(EObject.class, EClass.class);
@@ -435,7 +424,7 @@ public Object convert(Object fromObject) {
 	}
 
 	static class EClass2EObject extends Converter {
-		private Messages Messages;
+		private final Messages Messages;
 
 		public EClass2EObject(Messages Messages) {
 			super(EClass.class, EObject.class);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index bbbc5e7c34..948807e2ff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -45,7 +45,6 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -253,18 +252,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
 							master));
 
-			new ImageTooltip(t, Messages) {
-
-				@Override
-				protected URI getImageURI() {
-					final MUILabel part = (MUILabel) getMaster().getValue();
-					final String uri = part.getIconURI();
-					if (uri == null || uri.trim().length() == 0) {
-						return null;
-					}
-					return URI.createURI(part.getIconURI());
-				}
-			};
+			new ImageTooltip(t, Messages, this);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);

From 22d670f1bb1cc37b5e538c52fb0ada387bb495b3 Mon Sep 17 00:00:00 2001
From: Jonas Helming <jonas.helming@googlemail.com>
Date: Thu, 25 Jun 2015 16:03:16 +0200
Subject: [PATCH 0905/1286] Bug 471002 - [e4 Tools] Add tests for model extract
 wizard

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

Change-Id: Ie690ce88f08844d5f2053bafb554179652a3d0b8
Signed-off-by: Jonas Helming <jonas.helming@googlemail.com>
---
 .../model/ExtractContributionModelWizard.java |  71 +---
 .../wizards/model/FragmentExtractHelper.java  | 110 ++++++
 .../tools/test/FragmentExtractHelperTest.java | 321 ++++++++++++++++++
 3 files changed, 432 insertions(+), 70 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
 create mode 100644 tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
index ffdae77ab6..bd4bad629a 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
@@ -12,23 +12,15 @@
 package org.eclipse.e4.internal.tools.wizards.model;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
-import org.eclipse.e4.ui.model.application.commands.MCommand;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
-import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
-import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
-import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -56,70 +48,9 @@ public String getDefaultFileName() {
 		return "fragment.e4xmi"; //$NON-NLS-1$
 	}
 
-	HashMap<String, MCommand> importCommands = new HashMap<String, MCommand>();
-
-	public void resolveCommandImports(MApplicationElement moe, MModelFragments mModelFragments) {
-		if (moe instanceof MHandler) {
-
-			final MHandler mhandler = (MHandler) moe;
-			final MCommand command = ((MHandler) moe).getCommand();
-			if (command == null) {
-				return;
-			}
-			final MCommand existImportCommand = importCommands.get(command.getElementId());
-			if (existImportCommand == null) {
-				final MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject) command);
-				mhandler.setCommand((MCommand) copy);
-				importCommands.put(copy.getElementId(), (MCommand) copy);
-				mModelFragments.getImports().add(copy);
-			} else {
-				mhandler.setCommand(existImportCommand);
-			}
-		} else if (moe instanceof MHandledItem) {
-			final MHandledItem mh = (MHandledItem) moe;
-			final MCommand command = mh.getCommand();
-			if (command == null) {
-				return;
-			}
-			final MCommand existImportCommand = importCommands.get(command.getElementId());
-			if (existImportCommand == null) {
-				final MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject) command);
-				mh.setCommand((MCommand) copy);
-				importCommands.put(copy.getElementId(), command);
-				mModelFragments.getImports().add(copy);
-			} else {
-				mh.setCommand(existImportCommand);
-			}
-		}
-	}
-
 	@Override
 	protected EObject createInitialModel() {
-		final MModelFragments createModelFragments = MFragmentFactory.INSTANCE.createModelFragments();
-		for (final MApplicationElement moe : oes) {
-			final EObject eObject = (EObject) moe;
-			final TreeIterator<EObject> eAllContents = eObject.eAllContents();
-			boolean hasNext = eAllContents.hasNext();
-			if (!hasNext) {
-				resolveCommandImports(moe, createModelFragments);
-			}
-			while (hasNext) {
-				final MApplicationElement next = (MApplicationElement) eAllContents.next();
-				resolveCommandImports(next, createModelFragments);
-				hasNext = eAllContents.hasNext();
-			}
-			final MStringModelFragment createStringModelFragment = MFragmentFactory.INSTANCE
-					.createStringModelFragment();
-			final MApplicationElement e = (MApplicationElement) EcoreUtil.copy((EObject) moe);
-			final String featurename = ((EObject) moe).eContainmentFeature().getName();
-			createStringModelFragment
-			.setParentElementId(((MApplicationElement) ((EObject) moe).eContainer()).getElementId());
-			createStringModelFragment.getElements().add(e);
-			createStringModelFragment.setFeaturename(featurename);
-
-			createModelFragments.getFragments().add(createStringModelFragment);
-		}
-		return (EObject) createModelFragments;
+		return (EObject) FragmentExtractHelper.createInitialModel(oes);
 	}
 
 	public void setup(IProject project) {
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
new file mode 100644
index 0000000000..ac952b1814
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
@@ -0,0 +1,110 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ * Jonas Helming - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.model;
+
+import java.util.HashMap;
+import java.util.List;
+
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
+import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+/**
+ * @author Jonas
+ *
+ */
+public class FragmentExtractHelper {
+
+	/**
+	 * Imports referenced commands
+	 *
+	 * @param moe
+	 *            elements to resolved referenced commands for
+	 * @param mModelFragments
+	 *            the target {@link MModelFragments}
+	 */
+	public static void resolveCommandImports(MApplicationElement moe, MModelFragments mModelFragments) {
+		final HashMap<String, MCommand> importCommands = new HashMap<String, MCommand>();
+		if (moe instanceof MHandler) {
+
+			final MHandler mhandler = (MHandler) moe;
+			final MCommand command = ((MHandler) moe).getCommand();
+			if (command == null) {
+				return;
+			}
+			final MCommand existImportCommand = importCommands.get(command.getElementId());
+			if (existImportCommand == null) {
+				final MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject) command);
+				mhandler.setCommand((MCommand) copy);
+				importCommands.put(copy.getElementId(), (MCommand) copy);
+				mModelFragments.getImports().add(copy);
+			} else {
+				mhandler.setCommand(existImportCommand);
+			}
+		} else if (moe instanceof MHandledItem) {
+			final MHandledItem mh = (MHandledItem) moe;
+			final MCommand command = mh.getCommand();
+			if (command == null) {
+				return;
+			}
+			final MCommand existImportCommand = importCommands.get(command.getElementId());
+			if (existImportCommand == null) {
+				final MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject) command);
+				mh.setCommand((MCommand) copy);
+				importCommands.put(copy.getElementId(), command);
+				mModelFragments.getImports().add(copy);
+			} else {
+				mh.setCommand(existImportCommand);
+			}
+		}
+	}
+
+	/**
+	 * @param extractedElements
+	 *            the {@link MApplicationElement}s to be extracted
+	 */
+	public static MModelFragments createInitialModel(List<MApplicationElement> extractedElements) {
+		final MModelFragments createModelFragments = MFragmentFactory.INSTANCE.createModelFragments();
+		for (final MApplicationElement moe : extractedElements) {
+			final EObject eObject = (EObject) moe;
+			final TreeIterator<EObject> eAllContents = eObject.eAllContents();
+			boolean hasNext = eAllContents.hasNext();
+			if (!hasNext) {
+				FragmentExtractHelper.resolveCommandImports(moe, createModelFragments);
+			}
+			while (hasNext) {
+				final MApplicationElement next = (MApplicationElement) eAllContents.next();
+				FragmentExtractHelper.resolveCommandImports(next, createModelFragments);
+				hasNext = eAllContents.hasNext();
+			}
+			final MStringModelFragment createStringModelFragment = MFragmentFactory.INSTANCE
+					.createStringModelFragment();
+			final MApplicationElement e = (MApplicationElement) EcoreUtil.copy((EObject) moe);
+			final String featurename = ((EObject) moe).eContainmentFeature().getName();
+			createStringModelFragment
+			.setParentElementId(((MApplicationElement) ((EObject) moe).eContainer()).getElementId());
+			createStringModelFragment.getElements().add(e);
+			createStringModelFragment.setFeaturename(featurename);
+
+			createModelFragments.getFragments().add(createStringModelFragment);
+		}
+		return createModelFragments;
+	}
+
+}
diff --git a/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java b/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
new file mode 100644
index 0000000000..f9d9604d0a
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
@@ -0,0 +1,321 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ * Jonas Helming- initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+
+import org.eclipse.e4.internal.tools.wizards.model.FragmentExtractHelper;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.commands.MCategory;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
+import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.e4.ui.model.fragment.MModelFragment;
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * @author Jonas
+ *
+ */
+public class FragmentExtractHelperTest {
+
+	private static final String WINDOWID = "someID"; //$NON-NLS-1$
+	private static final String PART1ID = "part1id"; //$NON-NLS-1$
+	private static final String PART2ID = "part2id"; //$NON-NLS-1$
+	private static final String HANDLER1ID = "handler1id"; //$NON-NLS-1$
+	private static final String COMMANDID = "commandid"; //$NON-NLS-1$
+	private static final String HANDLER2ID = "handler2id"; //$NON-NLS-1$
+	private MPart part1;
+	private MWindow window;
+	private MPart part2;
+	private MHandler handler1;
+	private MApplication application;
+	private MHandler handler2;
+	private MPlaceholder placeholder;
+	private MPart referencedPart;
+
+	@Before
+	public void setup() {
+		application = MApplicationFactory.INSTANCE.createApplication();
+	}
+
+	@Test
+	public void testExtractSinglePart() {
+		createWindowWithPart();
+		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<MApplicationElement>();
+		elementsToExtract.add(part1);
+		final MModelFragments initialModel = FragmentExtractHelper.createInitialModel(elementsToExtract);
+		assertEquals(1, initialModel.getFragments().size());
+		assertEquals(0, initialModel.getImports().size());
+		final MModelFragment modelFragment = initialModel.getFragments().get(0);
+		assertEquals(1, modelFragment.getElements().size());
+		assertExtractedElement(part1, modelFragment.getElements().get(0));
+	}
+
+	private void assertExtractedElement(MApplicationElement originalElement, MApplicationElement extractedElement) {
+		final EObject extracted = (EObject) extractedElement;
+		final EObject original = (EObject) originalElement;
+
+		EcoreUtil.equals(extracted, original);
+
+		final MStringModelFragment fragment = (MStringModelFragment) extracted.eContainer();
+		final MApplicationElement originalContainer = (MApplicationElement) original.eContainer();
+		final EStructuralFeature originalContainingFeature = original.eContainingFeature();
+
+		assertEquals(originalContainingFeature.getName(), fragment.getFeaturename());
+		assertEquals(originalContainer.getElementId(), fragment.getParentElementId());
+
+	}
+
+	@Test
+	@Ignore
+	/**
+	 * Test for BR 405159, ignored until it is fixed
+	 */
+	public void testExtractPlaceHolder() {
+		createWindowWithPlaceHolder();
+		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<MApplicationElement>();
+		elementsToExtract.add(placeholder);
+		final MModelFragments initialModel = FragmentExtractHelper.createInitialModel(elementsToExtract);
+		assertEquals(1, initialModel.getFragments().size());
+		assertEquals(1, initialModel.getImports().size());
+		final MModelFragment modelFragment = initialModel.getFragments().get(0);
+		assertEquals(1, modelFragment.getElements().size());
+		assertTrue(initialModel.getImports().contains(((MPlaceholder) modelFragment.getElements().get(0)).getRef()));
+		assertExtractedElement(placeholder, modelFragment.getElements().get(0));
+		assertExtractedImport(referencedPart, initialModel.getImports().get(0));
+	}
+
+	private void createWindowWithPlaceHolder() {
+		createWindow();
+		final MPerspectiveStack perspectiveStack = MAdvancedFactory.INSTANCE.createPerspectiveStack();
+		window.getChildren().add(perspectiveStack);
+		final MPerspective perspective = MAdvancedFactory.INSTANCE.createPerspective();
+		perspectiveStack.getChildren().add(perspective);
+		placeholder = MAdvancedFactory.INSTANCE.createPlaceholder();
+		perspective.getChildren().add(placeholder);
+		referencedPart = MBasicFactory.INSTANCE.createPart();
+		window.getSharedElements().add(referencedPart);
+		placeholder.setRef(referencedPart);
+	}
+
+	@Test
+	@Ignore
+	/**
+	 * Test for BR 446206, ignored until it is fixed
+	 */
+	public void testExtractCommandWithCategory() {
+		final MCommand command = createCommand();
+		final MCategory category = createCategoryForCommand(command);
+		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<MApplicationElement>();
+		elementsToExtract.add(command);
+		final MModelFragments initialModel = FragmentExtractHelper.createInitialModel(elementsToExtract);
+		assertEquals(1, initialModel.getFragments().size());
+		assertEquals(1, initialModel.getImports().size());
+		final MModelFragment modelFragment = initialModel.getFragments().get(0);
+		assertEquals(1, modelFragment.getElements().size());
+		final MCategory importedCategory = (MCategory) initialModel.getImports().get(0);
+		final MCommand extractedCommand = (MCommand) modelFragment.getElements().get(0);
+		assertSame(importedCategory, extractedCommand.getCategory());
+		assertExtractedElement(command, modelFragment.getElements().get(0));
+		assertExtractedElement(category, initialModel.getImports().get(0));
+	}
+
+	private MCategory createCategoryForCommand(MCommand command) {
+		final MCategory category = MCommandsFactory.INSTANCE.createCategory();
+		application.getCategories().add(category);
+		command.setCategory(category);
+		return category;
+
+	}
+
+	private void createWindowWithPart() {
+		createWindow();
+		part1 = MBasicFactory.INSTANCE.createPart();
+		part1.setElementId(PART1ID);
+		window.getChildren().add(part1);
+	}
+
+	private void createWindow() {
+		window = MBasicFactory.INSTANCE.createWindow();
+		window.setElementId(WINDOWID);
+		application.getChildren().add(window);
+	}
+
+	@Test
+	@Ignore
+	/**
+	 * Test for BR 470998, ignored until it is fixed
+	 */
+	public void testExtractTwoPartsSameLocation() {
+		createWindowWithPart();
+		addSecondPart();
+		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<MApplicationElement>();
+		elementsToExtract.add(part1);
+		elementsToExtract.add(part2);
+		final MModelFragments initialModel = FragmentExtractHelper.createInitialModel(elementsToExtract);
+		assertEquals(1, initialModel.getFragments().size());
+		assertEquals(0, initialModel.getImports().size());
+		final MModelFragment modelFragment = initialModel.getFragments().get(0);
+		assertEquals(2, modelFragment.getElements().size());
+		assertExtractedElement(part1, modelFragment.getElements().get(0));
+		assertExtractedElement(part2, initialModel.getFragments().get(1).getElements().get(0));
+	}
+
+	@Test
+	public void testExtractHandlerWithoutCommand() {
+		createHandler();
+		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<MApplicationElement>();
+		elementsToExtract.add(handler1);
+		final MModelFragments initialModel = FragmentExtractHelper.createInitialModel(elementsToExtract);
+		assertEquals(1, initialModel.getFragments().size());
+		assertEquals(0, initialModel.getImports().size());
+		final MModelFragment modelFragment = initialModel.getFragments().get(0);
+		assertEquals(1, modelFragment.getElements().size());
+		assertExtractedElement(handler1, modelFragment.getElements().get(0));
+	}
+
+	private void createHandler() {
+		handler1 = MCommandsFactory.INSTANCE.createHandler();
+		handler1.setElementId(HANDLER1ID);
+		application.getHandlers().add(handler1);
+	}
+
+	@Test
+	public void testExtractHandlerWithCommand() {
+		createHandler();
+		final MCommand command = createCommandLinkedWithHandler(handler1);
+		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<MApplicationElement>();
+		elementsToExtract.add(handler1);
+		final MModelFragments initialModel = FragmentExtractHelper.createInitialModel(elementsToExtract);
+		assertEquals(1, initialModel.getFragments().size());
+		assertEquals(1, initialModel.getImports().size());
+		final MModelFragment modelFragment = initialModel.getFragments().get(0);
+		assertEquals(1, modelFragment.getElements().size());
+		final MCommand importedCommand = (MCommand) initialModel.getImports().get(0);
+		final MHandler extractedHandler = (MHandler) modelFragment.getElements().get(0);
+		assertSame(importedCommand, extractedHandler.getCommand());
+		assertExtractedElement(handler1, modelFragment.getElements().get(0));
+		assertExtractedImport(command, initialModel.getImports().get(0));
+	}
+
+	private void assertExtractedImport(MApplicationElement original, MApplicationElement importedElement) {
+		EcoreUtil.equals((EObject) original, (EObject) importedElement);
+
+	}
+
+	private MCommand createCommandLinkedWithHandler(MHandler handler) {
+		final MCommand command = createCommand();
+		command.setElementId(command.getElementId() + handler.getElementId());
+		handler.setCommand(command);
+		return command;
+
+	}
+
+	private MCommand createCommand() {
+		final MCommand command = MCommandsFactory.INSTANCE.createCommand();
+		command.setElementId(COMMANDID);
+		application.getCommands().add(command);
+		return command;
+	}
+
+	@Test
+	@Ignore
+	/**
+	 * Test for BR 470998, ignored until it is fixed
+	 */
+	public void testExtractTwoHandlerWithDifferentCommands() {
+		createHandler();
+		createHandler2();
+		final MCommand command = createCommandLinkedWithHandler(handler1);
+		final MCommand command2 = createCommandLinkedWithHandler(handler2);
+		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<MApplicationElement>();
+		elementsToExtract.add(handler1);
+		elementsToExtract.add(handler2);
+		final MModelFragments initialModel = FragmentExtractHelper.createInitialModel(elementsToExtract);
+		assertEquals(1, initialModel.getFragments().size());
+		assertEquals(2, initialModel.getImports().size());
+		final MModelFragment modelFragment = initialModel.getFragments().get(0);
+		assertEquals(1, modelFragment.getElements().size());
+
+		assertTrue(initialModel.getImports().contains(((MHandler) modelFragment.getElements().get(0)).getCommand()));
+		assertTrue(initialModel.getImports().contains(((MHandler) modelFragment.getElements().get(1)).getCommand()));
+
+		assertExtractedElement(handler1, modelFragment.getElements().get(0));
+		assertExtractedElement(handler2, modelFragment.getElements().get(1));
+		assertExtractedImport(command, initialModel.getImports().get(0));
+		assertExtractedImport(command2, initialModel.getImports().get(1));
+	}
+
+	private void createHandler2() {
+		handler2 = MCommandsFactory.INSTANCE.createHandler();
+		handler2.setElementId(HANDLER2ID);
+		application.getHandlers().add(handler2);
+
+	}
+
+	@Test
+	@Ignore
+	/**
+	 * Test for BR 470998 and 470999, ignored until it is fixed
+	 */
+	public void testExtractTwoHandlerWithSameCommand() {
+		createHandler();
+		createHandler2();
+		final MCommand command = createCommandLinkedWithHandler(handler1);
+		handler2.setCommand(command);
+		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<MApplicationElement>();
+		elementsToExtract.add(handler1);
+		elementsToExtract.add(handler2);
+		final MModelFragments initialModel = FragmentExtractHelper.createInitialModel(elementsToExtract);
+		assertEquals(2, initialModel.getFragments().size());
+		assertEquals(1, initialModel.getImports().size());
+		final MModelFragment modelFragment = initialModel.getFragments().get(0);
+		assertEquals(1, modelFragment.getElements().size());
+		final MModelFragment modelFragment2 = initialModel.getFragments().get(0);
+		assertEquals(1, modelFragment2.getElements().size());
+
+		assertTrue(initialModel.getImports().contains(((MHandler) modelFragment.getElements().get(0)).getCommand()));
+		assertTrue(initialModel.getImports().contains(((MHandler) modelFragment2.getElements().get(0)).getCommand()));
+		assertExtractedElement(handler1, modelFragment.getElements().get(0));
+		assertExtractedElement(handler2, modelFragment.getElements().get(1));
+		assertExtractedImport(command, initialModel.getImports().get(0));
+	}
+
+	private void addSecondPart() {
+		part2 = MBasicFactory.INSTANCE.createPart();
+		part2.setElementId(PART2ID);
+		window.getChildren().add(part2);
+
+	}
+
+}

From 6767e316635a77065e2a000f29e26c4dc819b751 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 15 Jun 2015 23:06:25 +0200
Subject: [PATCH 0906/1286] Bug 470221 - Update and cleanup e4 tools templates
 project

Updates org.eclipse.e4.tools.jdt.templates to Java 7

Change-Id: Ia12530791b1866168c822af97d70c8ec4cbdbce7
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.jdt.templates/.classpath           | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                        | 1 +
 bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.classpath b/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
index ad32c83a78..e8ea977a69 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
@@ -1,7 +1,7 @@
 <?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/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
index afdb83e715..2961b83bdb 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
@@ -25,6 +25,7 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index 34a7766baf..add46f3b7d 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
 Bundle-Version: 4.5.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
  org.eclipse.jface.text;bundle-version="3.6.0",

From e8b08e5a6158f7f6daf51cb7dac7d4a10c2dbd6f Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Sat, 25 Jul 2015 23:57:54 +0200
Subject: [PATCH 0907/1286] Bug 473575 - The 'E4 Application Project' new
 Wizard must be removed

Removed the relative files for this wizard

Change-Id: I71d892996dd7514faedcd2bb9c56e3b09b3020b0
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../org.eclipse.e4.tools/META-INF/MANIFEST.MF |   3 +-
 .../OSGI-INF/l10n/bundle.properties           |   2 -
 bundles/org.eclipse.e4.tools/README.md        |   2 +-
 .../icons/full/etool16/newpprj_wiz.png        | Bin 697 -> 0 bytes
 bundles/org.eclipse.e4.tools/plugin.xml       |  11 -
 .../eclipse/e4/internal/tools/Messages.java   |  10 -
 .../e4/internal/tools/messages.properties     |  10 -
 .../wizards/project/E4NewProjectWizard.java   | 814 ------------------
 .../project/E4NewProjectWizardPage.java       |  33 -
 .../project/LifeCycleClassCodeGenerator.java  | 127 ---
 .../project/NewApplicationWizardPage.java     | 527 ------------
 .../wizards/project/PluginContentPage.java    | 432 ----------
 .../wizards/project/ResourceLocator.java      |  52 --
 .../tools/wizards/project/SimpleTemplate.java |  34 -
 .../wizards/project/TemplateOperation.java    | 419 ---------
 .../templates/E4LifeCycle.java                |  43 -
 .../templates/css/default.css                 |   0
 17 files changed, 2 insertions(+), 2517 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools/icons/full/etool16/newpprj_wiz.png
 delete mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
 delete mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizardPage.java
 delete mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/LifeCycleClassCodeGenerator.java
 delete mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
 delete mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
 delete mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/ResourceLocator.java
 delete mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/SimpleTemplate.java
 delete mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java
 delete mode 100644 bundles/org.eclipse.e4.tools/templates/E4LifeCycle.java
 delete mode 100644 bundles/org.eclipse.e4.tools/templates/css/default.css

diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index ad77814934..c655e8459b 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -25,6 +25,5 @@ Bundle-Activator: org.eclipse.e4.internal.tools.ToolsPlugin
 Export-Package: org.eclipse.e4.internal.tools;version="0.12.0.qualifier";x-internal:=true,
  org.eclipse.e4.internal.tools.wizards.classes;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor3x",
  org.eclipse.e4.internal.tools.wizards.classes.templates;version="0.12.0.qualifier";x-internal:=true,
- org.eclipse.e4.internal.tools.wizards.model;version="0.12.0.qualifier";x-internal:=true,
- org.eclipse.e4.internal.tools.wizards.project;version="0.12.0.qualifier";x-internal:=true
+ org.eclipse.e4.internal.tools.wizards.model;version="0.12.0.qualifier";x-internal:=true
 Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
index f129e2aa5c..20b160586e 100644
--- a/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
@@ -2,8 +2,6 @@
 category.name = Eclipse 4
 category.name.0 = Classes
 category.name.1 = Model
-wizard.name = Eclipse 4 Application Project
-wizard.name.description = Create an Eclipse 4 application project
 wizard.name.0 = New Application Model
 wizard.name.0.description = Create an Eclipse 4 application model
 wizard.name.1 = New Model Fragment
diff --git a/bundles/org.eclipse.e4.tools/README.md b/bundles/org.eclipse.e4.tools/README.md
index 6a7e7a0dc3..8724036fff 100644
--- a/bundles/org.eclipse.e4.tools/README.md
+++ b/bundles/org.eclipse.e4.tools/README.md
@@ -1,7 +1,7 @@
 org.eclipse.e4.tools
 ====================
 
-Provides the e4 wizards for new Eclipse 4 RCP applications, e4 based classses, application models and model fragments.
+Provides the e4 wizards for e4 based classses, application models and model fragments.
 
 For more information, refer to the [Eclipse e4 wiki page] [1].
 
diff --git a/bundles/org.eclipse.e4.tools/icons/full/etool16/newpprj_wiz.png b/bundles/org.eclipse.e4.tools/icons/full/etool16/newpprj_wiz.png
deleted file mode 100644
index 723061883764f67feb8608955b62e12c077af820..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 697
zcmV;q0!ICbP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007jNkl<Zc-ozl
zT}+Zu9LDLQyVg|~Xdlzo%FOP%sI5D@=%%eUyQ?m8wKl7{N^lDJ`jMM23td8#uOIlL
z$Q+UAuvIEbn)9>3FH{KmDnZb6h~R5Jy<#!hbgTZ`Z~vXM^E~G{XXkJ@|5z#_@et>K
zixzRO(?af=Qjl<Y&qbw`btz(bgM)mbT-ZWfshA>28TXIa@3TWG;D+`zA*J;4yvK%s
z*8#tG4tDDV#Km_Ox5O+6uP$J#$C=~^NaPU`@Czg`YVr}ZRv>JZfSDD;*_F)-5)fIM
zieu4XfU+PFF@s#99F4=@p*6eEHsRQ2d=9N<JJbz)&_q&nXU5kX?F!LRw8%0Li_R~Q
zLThDW=xhuOt_{5TJytiDKuIKH!`%Y9Fd0(Or3kCu7c+P)s6q2&I7-`01YMKMDA!ss
z><ppPz78Ebr)nyOwk#F2{5E*P+LgG=%X(6erY|ArEn$qh!YEXXfK-`5*1X05#l`dj
zgHMhKbe*lBx}3PruV0HZC@O15$MhOzd<=5rLm(7pG`^ojQC&a288cw0J_DoT94y{-
z=tt&pFPmm!V&2Qo*ojO#i4uAYABNnl!5|{`XBbzf!fm*Uo{IhGu09PzRSLSPQ`;t$
z8Z&lc^DM*Z4dSb3g-tSw&EOa;x^%4Co}*uO0D*xU2n^n2xrJR57)CrOYcOHju>>JC
zfS-YPn9^RrkFk7o$d9uL(pcCd)t<$!ukk^7Uns9?c(Y^3g<M%Tf~G9=P$$t>mlpXb
zPq^0m>e$67)Zz2H8f1$5uRN6WtV=Z}@JI!8PY;IQ%2SfssS`*3`sdv()#qlGcKY)Q
fAEi?~&Yr?wozeD`Zk92S00000NkvXXu0mjfTxClE

diff --git a/bundles/org.eclipse.e4.tools/plugin.xml b/bundles/org.eclipse.e4.tools/plugin.xml
index 6189689973..ba5b25fde3 100644
--- a/bundles/org.eclipse.e4.tools/plugin.xml
+++ b/bundles/org.eclipse.e4.tools/plugin.xml
@@ -17,17 +17,6 @@
             name="%category.name.1"
             parentCategory="org.eclipse.e4.tools">
       </category>
-      <wizard
-            category="org.eclipse.e4.tools"
-            class="org.eclipse.e4.internal.tools.wizards.project.E4NewProjectWizard"
-            icon="icons/full/etool16/newpprj_wiz.png"
-            id="org.eclipse.e4.tools.E4NewProjectWizard"
-            name="%wizard.name"
-            project="true">
-         <description>
-            %wizard.name.description
-         </description>
-      </wizard>
       <wizard
             category="org.eclipse.e4.tools/org.eclipse.e4.tools.model"
             class="org.eclipse.e4.internal.tools.wizards.model.NewApplicationModelWizard"
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
index c43d83ca25..5d0840c5be 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
@@ -95,16 +95,6 @@ public class Messages extends NLS {
 	public static String NewToolControlClassWizard_CreateGUIMethod;
 	public static String NewToolControlClassWizard_CreateNewToolControl;
 	public static String NewToolControlClassWizard_NewToolControl;
-	public static String E4NewProjectWizard_About;
-	public static String E4NewProjectWizard_File;
-	public static String E4NewProjectWizard_Help;
-	public static String E4NewProjectWizard_InDialogs;
-	public static String E4NewProjectWizard_InDialogsAndWindows;
-	public static String E4NewProjectWizard_InWindows;
-	public static String E4NewProjectWizard_Open;
-	public static String E4NewProjectWizard_Quit;
-	public static String E4NewProjectWizard_SamplePart;
-	public static String E4NewProjectWizard_Save;
 	public static String ExtractContributionModelWizard_ExistingFragmentIsCorrupted;
 	static {
 		// initialize resource bundle
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
index f3131ab6ca..7bd9193b62 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
@@ -15,16 +15,6 @@ BaseApplicationModelWizard_Error=Error
 BaseApplicationModelWizard_FileExists=File exists
 BaseApplicationModelWizard_ModelRootMustNotBeNull=Model root object much not be null
 BaseApplicationModelWizard_TheFileAlreadyExists=The file already exists. 
-E4NewProjectWizard_About=About
-E4NewProjectWizard_File=File
-E4NewProjectWizard_Help=Help
-E4NewProjectWizard_InDialogs=In Dialogs
-E4NewProjectWizard_InDialogsAndWindows=In Dialog and Windows
-E4NewProjectWizard_InWindows=In Windows
-E4NewProjectWizard_Open=Open
-E4NewProjectWizard_Quit=Quit
-E4NewProjectWizard_SamplePart=Sample Part
-E4NewProjectWizard_Save=Save
 ExtractContributionModelWizard_ExistingFragmentIsCorrupted=Existing Fragment file is corrupted
 NewAddonClassWizard_NewAddon=New Addon
 NewAddonClassWizard_NewAddonClass=Create a new addon class
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
deleted file mode 100644
index 715982ac4d..0000000000
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ /dev/null
@@ -1,814 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2013 Soyatec(http://www.soyatec.com) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- * Soyatec - initial API and implementation
- * IBM Corporation - ongoing enhancements
- * Sopot Cela - ongoing enhancements
- * Lars Vogel - ongoing enhancements
- * Wim Jongman - ongoing enhancements
- * Steven Spungin - ongoing enhancements, Bug 438591
- *******************************************************************************/
-package org.eclipse.e4.internal.tools.wizards.project;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.e4.internal.tools.Messages;
-import org.eclipse.e4.ui.model.application.MAddon;
-import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.commands.MBindingContext;
-import org.eclipse.e4.ui.model.application.commands.MBindingTable;
-import org.eclipse.e4.ui.model.application.commands.MCommand;
-import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
-import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
-import org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory;
-import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
-import org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack;
-import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
-import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
-import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
-import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledToolItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
-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.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.core.plugin.IMatchRules;
-import org.eclipse.pde.core.plugin.IPluginElement;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.IPluginReference;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
-import org.eclipse.pde.internal.core.bundle.WorkspaceBundlePluginModel;
-import org.eclipse.pde.internal.core.plugin.WorkspacePluginModelBase;
-import org.eclipse.pde.internal.core.project.PDEProject;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
-import org.eclipse.pde.internal.ui.wizards.plugin.NewPluginProjectWizard;
-import org.eclipse.pde.internal.ui.wizards.plugin.NewProjectCreationOperation;
-import org.eclipse.pde.internal.ui.wizards.plugin.PluginFieldData;
-import org.eclipse.pde.ui.IBundleContentWizard;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.PluginReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Version;
-
-/**
- * @author jin.liu (jin.liu@soyatec.com)
- */
-@SuppressWarnings("restriction")
-public class E4NewProjectWizard extends NewPluginProjectWizard {
-
-	private static final String NAME = "name"; //$NON-NLS-1$
-	private static final String APPLICATION = "application"; //$NON-NLS-1$
-	private static final String PRODUCT = "product"; //$NON-NLS-1$
-	private static final String TRUE = "TRUE"; //$NON-NLS-1$
-	private static final String PLUGIN_XML = "plugin.xml"; //$NON-NLS-1$
-	private static final String MODEL_EDITOR_ID = "org.eclipse.e4.tools.emf.editor3x.e4wbm"; //$NON-NLS-1$
-	private static final String APPLICATION_MODEL = "Application.e4xmi"; //$NON-NLS-1$
-	private final PluginFieldData fPluginData;
-	private NewApplicationWizardPage fApplicationPage;
-	private IProjectProvider fProjectProvider;
-	private PluginContentPage fContentPage;
-	private boolean isMinimalist;
-
-	public E4NewProjectWizard() {
-		fPluginData = new PluginFieldData();
-	}
-
-	@Override
-	public void addPages() {
-		fMainPage = new E4NewProjectWizardPage("main", fPluginData, false, getSelection()); //$NON-NLS-1$
-		fMainPage.setTitle(""); //$NON-NLS-1$
-		fMainPage.setDescription(""); //$NON-NLS-1$
-		final String pname = getDefaultValue(DEF_PROJECT_NAME);
-		if (pname != null) {
-			fMainPage.setInitialProjectName(pname);
-		}
-		addPage(fMainPage);
-
-		fProjectProvider = new IProjectProvider() {
-			@Override
-			public String getProjectName() {
-				return fMainPage.getProjectName();
-			}
-
-			@Override
-			public IProject getProject() {
-				return fMainPage.getProjectHandle();
-			}
-
-			@Override
-			public IPath getLocationPath() {
-				return fMainPage.getLocationPath();
-			}
-		};
-
-		fContentPage = new PluginContentPage("page2", fProjectProvider, fMainPage, fPluginData); //$NON-NLS-1$
-
-		fApplicationPage = new NewApplicationWizardPage(fProjectProvider,
-			fPluginData);
-
-		addPage(fContentPage);
-		addPage(fApplicationPage);
-	}
-
-	@Override
-	public boolean performFinish() {
-		try {
-			fMainPage.updateData();
-			fContentPage.updateData();
-			final IDialogSettings settings = getDialogSettings();
-			if (settings != null) {
-				fMainPage.saveSettings(settings);
-				fContentPage.saveSettings(settings);
-			}
-
-			// Create the project
-			getContainer().run(
-				false,
-				true,
-				new NewProjectCreationOperation(fPluginData,
-					fProjectProvider, new ContentWizard()));
-
-			// Add Project to working set
-			final IWorkingSet[] workingSets = fMainPage.getSelectedWorkingSets();
-			if (workingSets.length > 0) {
-				getWorkbench().getWorkingSetManager().addToWorkingSets(
-					fProjectProvider.getProject(), workingSets);
-			}
-
-			createProductsExtension(fProjectProvider.getProject());
-
-			createApplicationResources(fProjectProvider.getProject(),
-				new NullProgressMonitor());
-
-			// Add the resources to build.properties
-			adjustBuildPropertiesFile(fProjectProvider.getProject());
-
-			// Open the model editor
-			openEditorForApplicationModel();
-
-			return true;
-		} catch (final InvocationTargetException e) {
-			PDEPlugin.logException(e);
-		} catch (final InterruptedException e) {
-		} catch (final CoreException e) {
-			PDEPlugin.logException(e);
-		}
-		return false;
-	}
-
-	/**
-	 * Opens the model editor after the project was created.
-	 *
-	 * @throws PartInitException
-	 */
-	private void openEditorForApplicationModel() throws PartInitException {
-		final IFile file = fProjectProvider.getProject().getFile(APPLICATION_MODEL);
-		if (file != null) {
-			final FileEditorInput input = new FileEditorInput(file);
-			final IWorkbenchWindow window = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow();
-			final IWorkbenchPage page = window.getActivePage();
-			page.openEditor(input, MODEL_EDITOR_ID);
-		}
-	}
-
-	/**
-	 * Adds other resources to the build.properties file.
-	 *
-	 * @param project
-	 * @throws CoreException
-	 */
-	private void adjustBuildPropertiesFile(IProject project)
-		throws CoreException {
-		final IFile file = PDEProject.getBuildProperties(project);
-		if (file.exists()) {
-			final WorkspaceBuildModel model = new WorkspaceBuildModel(file);
-			final IBuildEntry e = model.getBuild().getEntry(IBuildEntry.BIN_INCLUDES);
-
-			e.addToken(PLUGIN_XML);
-			e.addToken(APPLICATION_MODEL);
-
-			// Event though an icons directory is always created
-			// it seems appropriate to only add it if it contains
-			// some content
-			if (!isMinimalist) {
-				e.addToken("icons/"); //$NON-NLS-1$
-			}
-
-			final Map<String, String> map = fApplicationPage.getData();
-			final String cssEntry = map
-				.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
-			if (cssEntry != null) {
-				e.addToken(cssEntry);
-			}
-
-			model.save();
-		}
-	}
-
-	/**
-	 * create products extension detail
-	 *
-	 * @param project
-	 */
-	public void createProductsExtension(IProject project) {
-		final Map<String, String> map = fApplicationPage.getData();
-		if (map == null
-			|| map.get(NewApplicationWizardPage.PRODUCT_NAME) == null) {
-			return;
-		}
-
-		final WorkspacePluginModelBase fmodel = new WorkspaceBundlePluginModel(
-			project.getFile(ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR),
-			project.getFile(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR));
-		final IPluginExtension extension = fmodel.getFactory().createExtension();
-		try {
-			final String productName = map.get(NewApplicationWizardPage.PRODUCT_NAME);
-			final String applicationName = map
-				.get(NewApplicationWizardPage.APPLICATION);
-
-			String cssValue = map
-				.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
-			if (cssValue != null) {
-				cssValue = "platform:/plugin/" + fPluginData.getId() + "/" //$NON-NLS-1$ //$NON-NLS-2$
-					+ cssValue;
-				map.put(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY,
-					cssValue);
-			}
-
-			if (TRUE.equals(map.get(NewApplicationWizardPage.generateLifecycle))) {
-				String lifeCycleValue = map
-					.get(NewApplicationWizardPage.generateLifecycleName);
-				if (lifeCycleValue != null && lifeCycleValue.isEmpty() == false) {
-					lifeCycleValue = "bundleclass://" + fPluginData.getId() + "/" //$NON-NLS-1$ //$NON-NLS-2$
-						+ fPluginData.getId().toLowerCase() + "." + lifeCycleValue; //$NON-NLS-1$
-					map.put(NewApplicationWizardPage.LIFECYCLE_URI_PROPERTY,
-						lifeCycleValue);
-				}
-			}
-
-			extension.setPoint("org.eclipse.core.runtime.products"); //$NON-NLS-1$
-			extension.setId(PRODUCT);
-			final IPluginElement productElement = fmodel.getFactory().createElement(
-				extension);
-
-			productElement.setName(PRODUCT);
-			if (applicationName != null) {
-				productElement.setAttribute(APPLICATION, applicationName);
-			} else {
-				productElement.setAttribute(APPLICATION,
-					NewApplicationWizardPage.E4_APPLICATION);
-			}
-			productElement.setAttribute(NAME, productName);
-
-			final Set<Entry<String, String>> set = map.entrySet();
-			if (set != null) {
-				final Iterator<Entry<String, String>> it = set.iterator();
-				if (it != null) {
-					while (it.hasNext()) {
-						final Entry<String, String> entry = it.next();
-						final String value = entry.getValue();
-						if (value == null || value.trim().length() == 0) {
-							continue;
-						}
-
-						if (entry.getKey().equals(
-							NewApplicationWizardPage.PRODUCT_NAME)
-							|| entry.getKey().equals(
-								NewApplicationWizardPage.APPLICATION)
-								|| entry.getKey().equals(
-									NewApplicationWizardPage.richSample)
-									|| entry.getKey().equals(
-										NewApplicationWizardPage.generateLifecycle)
-										|| entry.getKey().equals(
-											NewApplicationWizardPage.generateLifecycleName)
-											|| entry.getKey()
-											.equals(NewApplicationWizardPage.CLEAR_PERSISTED_STATE)) {
-							continue;
-						}
-						final IPluginElement element = fmodel.getFactory()
-							.createElement(productElement);
-						element.setName("property"); //$NON-NLS-1$
-						element.setAttribute(NAME, entry.getKey());
-						element.setAttribute("value", value); //$NON-NLS-1$
-						productElement.add(element);
-					}
-				}
-			}
-			extension.add(productElement);
-			fmodel.getPluginBase().add(extension);
-			fmodel.save();
-
-		} catch (final CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	/**
-	 * create products extension detail
-	 *
-	 * @param project
-	 */
-	public void createApplicationResources(IProject project,
-		IProgressMonitor monitor) {
-		final Map<String, String> map = fApplicationPage.getData();
-		if (map == null
-			|| map.get(NewApplicationWizardPage.PRODUCT_NAME) == null) {
-			return;
-		}
-		isMinimalist = !map.get(NewApplicationWizardPage.richSample)
-			.equalsIgnoreCase(TRUE);
-
-		// If the project has invalid characters, the plug-in name would replace
-		// them with underscores, product name does the same
-		final String pluginName = fPluginData.getId();
-
-		// BEGIN Generate E4Lifecycle class with annotations
-		final boolean lifeCycleCreated = TRUE.equals(map.get(NewApplicationWizardPage.generateLifecycle));
-		if (lifeCycleCreated) {
-			final String classname = fPluginData.getId() + "." //$NON-NLS-1$
-				+ map.get(NewApplicationWizardPage.generateLifecycleName);
-			final LifeCycleClassCodeGenerator fGenerator = new LifeCycleClassCodeGenerator(project, classname,
-				fPluginData);
-			try {
-				fGenerator.generate(new NullProgressMonitor());
-			} catch (final CoreException e2) {
-				e2.printStackTrace();
-			}
-		}
-		// END Generate E4Lifecycle class with annotations
-
-		// If there's no Activator or LifeCycle created we create default package
-		if (!fPluginData.doGenerateClass() && !lifeCycleCreated) {
-			final String packageName = fPluginData.getId();
-			IPath path = new Path(packageName.replace('.', '/'));
-			if (fPluginData.getSourceFolderName().trim().length() > 0) {
-				path = new Path(fPluginData.getSourceFolderName()).append(path);
-			}
-
-			try {
-				CoreUtility.createFolder(project.getFolder(path));
-			} catch (final CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		final IJavaProject javaProject = JavaCore.create(project);
-		IPackageFragment fragment = null;
-
-		try {
-			for (final IPackageFragment element : javaProject.getPackageFragments()) {
-				if (element.getKind() == IPackageFragmentRoot.K_SOURCE) {
-					fragment = element;
-				}
-			}
-		} catch (final JavaModelException e1) {
-			e1.printStackTrace();
-		}
-
-		createApplicationModel(project, pluginName, fragment);
-
-		final String cssPath = map
-			.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
-		if (cssPath != null && cssPath.trim().length() > 0) {
-			final IFile file = project.getFile(cssPath);
-
-			try {
-				prepareFolder(file.getParent(), monitor);
-
-				final URL corePath = ResourceLocator
-					.getProjectTemplateFiles("css/default.css"); //$NON-NLS-1$
-				file.create(corePath.openStream(), true, monitor);
-			} catch (final Exception e) {
-				PDEPlugin.logException(e);
-			}
-		}
-
-		final String template_id = "common"; //$NON-NLS-1$
-		final Set<String> binaryExtentions = new HashSet<String>();
-		binaryExtentions.add(".gif"); //$NON-NLS-1$
-		binaryExtentions.add(".png"); //$NON-NLS-1$
-
-		final Map<String, String> keys = new HashMap<String, String>();
-		keys.put("projectName", pluginName); //$NON-NLS-1$
-		keys.put("productFileName", //$NON-NLS-1$
-			map.get(NewApplicationWizardPage.PRODUCT_NAME));
-		final String elementName = fragment.getElementName();
-		keys.put("packageName", (elementName.equals("") ? "" : elementName //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			+ ".") //$NON-NLS-1$
-			+ "handlers"); //$NON-NLS-1$
-		keys.put("packageName2", (elementName.equals("") ? "" : elementName //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			+ ".") //$NON-NLS-1$
-			+ "parts"); //$NON-NLS-1$
-		keys.put("programArgs", //$NON-NLS-1$
-			"true".equalsIgnoreCase(map //$NON-NLS-1$
-				.get(NewApplicationWizardPage.CLEAR_PERSISTED_STATE)) ? "-clearPersistedState" //$NON-NLS-1$
-					: ""); //$NON-NLS-1$
-		try {
-			final URL corePath = ResourceLocator.getProjectTemplateFiles(template_id);
-			final IRunnableWithProgress op = new TemplateOperation(corePath, project,
-				keys, binaryExtentions, isMinimalist);
-			getContainer().run(false, true, op);
-		} catch (final Exception e) {
-			PDEPlugin.logException(e);
-		}
-		if (!isMinimalist) {
-			try {
-				final URL corePath = ResourceLocator.getProjectTemplateFiles("src"); //$NON-NLS-1$
-				final IRunnableWithProgress op = new TemplateOperation(corePath,
-					(IContainer) fragment.getResource(), keys,
-					binaryExtentions, isMinimalist);
-				getContainer().run(false, true, op);
-			} catch (final Exception e) {
-				PDEPlugin.logException(e);
-			}
-		}
-	}
-
-	private void createApplicationModel(IProject project, String pluginName,
-		IPackageFragment fragment) {
-		final Map<String, String> map = fApplicationPage.getData();
-		final boolean isMinimalist = !map.get(NewApplicationWizardPage.richSample)
-			.equalsIgnoreCase(TRUE);
-		if (APPLICATION_MODEL != null && APPLICATION_MODEL.trim().length() > 0) {
-
-			// Create a resource set
-			//
-			final ResourceSet resourceSet = new ResourceSetImpl();
-
-			// Get the URI of the model file.
-			//
-			final URI fileURI = URI.createPlatformResourceURI(project.getName() + "/" //$NON-NLS-1$
-				+ APPLICATION_MODEL, true);
-
-			// Create a resource for this file.
-			//
-			final Resource resource = resourceSet.createResource(fileURI);
-
-			final MApplication application = MApplicationFactory.INSTANCE
-				.createApplication();
-
-			application.setElementId("org.eclipse.e4.ide.application"); //$NON-NLS-1$
-
-			MAddon addon = MApplicationFactory.INSTANCE.createAddon();
-			addon.setElementId("org.eclipse.e4.core.commands.service"); //$NON-NLS-1$
-			addon
-			.setContributionURI("bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"); //$NON-NLS-1$
-			application.getAddons().add(addon);
-
-			addon = MApplicationFactory.INSTANCE.createAddon();
-			addon.setElementId("org.eclipse.e4.ui.contexts.service"); //$NON-NLS-1$
-			addon
-			.setContributionURI("bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"); //$NON-NLS-1$
-			application.getAddons().add(addon);
-
-			addon = MApplicationFactory.INSTANCE.createAddon();
-			addon.setElementId("org.eclipse.e4.ui.bindings.service"); //$NON-NLS-1$
-			addon
-			.setContributionURI("bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon"); //$NON-NLS-1$
-			application.getAddons().add(addon);
-
-			addon = MApplicationFactory.INSTANCE.createAddon();
-			addon.setElementId("org.eclipse.e4.ui.workbench.commands.model"); //$NON-NLS-1$
-			addon
-			.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon"); //$NON-NLS-1$
-			application.getAddons().add(addon);
-
-			addon = MApplicationFactory.INSTANCE.createAddon();
-			addon.setElementId("org.eclipse.e4.ui.workbench.handler.model"); //$NON-NLS-1$
-			addon
-			.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"); //$NON-NLS-1$
-			application.getAddons().add(addon);
-
-			addon = MApplicationFactory.INSTANCE.createAddon();
-			addon.setElementId("org.eclipse.e4.ui.workbench.contexts.model"); //$NON-NLS-1$
-			addon
-			.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon"); //$NON-NLS-1$
-			application.getAddons().add(addon);
-
-			addon = MApplicationFactory.INSTANCE.createAddon();
-			addon.setElementId("org.eclipse.e4.ui.workbench.bindings.model"); //$NON-NLS-1$
-			addon
-			.setContributionURI("bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon"); //$NON-NLS-1$
-			application.getAddons().add(addon);
-			final MTrimmedWindow mainWindow = MBasicFactory.INSTANCE
-				.createTrimmedWindow();
-			application.getChildren().add(mainWindow);
-			mainWindow.setLabel(pluginName);
-			mainWindow.setWidth(500);
-			mainWindow.setHeight(400);
-			resource.getContents().add((EObject) application);
-			final MBindingContext rootContext = MCommandsFactory.INSTANCE
-				.createBindingContext();
-			rootContext.setElementId("org.eclipse.ui.contexts.dialogAndWindow"); //$NON-NLS-1$
-			rootContext.setName(Messages.E4NewProjectWizard_InDialogsAndWindows);
-
-			MBindingContext childContext = MCommandsFactory.INSTANCE
-				.createBindingContext();
-			childContext.setElementId("org.eclipse.ui.contexts.window"); //$NON-NLS-1$
-			childContext.setName(Messages.E4NewProjectWizard_InWindows);
-			rootContext.getChildren().add(childContext);
-
-			childContext = MCommandsFactory.INSTANCE.createBindingContext();
-			childContext.setElementId("org.eclipse.ui.contexts.dialog"); //$NON-NLS-1$
-			childContext.setName(Messages.E4NewProjectWizard_InDialogs);
-			rootContext.getChildren().add(childContext);
-
-			application.getRootContext().add(rootContext);
-			application.getBindingContexts().add(rootContext);
-			if (!isMinimalist) {
-
-				// Create Quit command
-				final MCommand quitCommand = createCommand("org.eclipse.ui.file.exit", "quitCommand", //$NON-NLS-1$ //$NON-NLS-2$
-					"QuitHandler", "M1+Q", pluginName, fragment, //$NON-NLS-1$ //$NON-NLS-2$
-					application);
-
-				final MCommand openCommand = createCommand(pluginName + ".open", //$NON-NLS-1$
-					"openCommand", "OpenHandler", "M1+O", pluginName, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					fragment, application);
-
-				final MCommand saveCommand = createCommand("org.eclipse.ui.file.save", "saveCommand", //$NON-NLS-1$ //$NON-NLS-2$
-					"SaveHandler", "M1+S", pluginName, fragment, //$NON-NLS-1$ //$NON-NLS-2$
-					application);
-
-				final MCommand aboutCommand = createCommand("org.eclipse.ui.help.aboutAction", "aboutCommand", //$NON-NLS-1$ //$NON-NLS-2$
-					"AboutHandler", "M1+A", pluginName, fragment, //$NON-NLS-1$//$NON-NLS-2$
-					application);
-
-				final MMenu menu = MMenuFactory.INSTANCE.createMenu();
-				mainWindow.setMainMenu(menu);
-				menu.setElementId("menu:org.eclipse.ui.main.menu"); //$NON-NLS-1$
-
-				final MMenu fileMenuItem = MMenuFactory.INSTANCE.createMenu();
-				menu.getChildren().add(fileMenuItem);
-				fileMenuItem.setLabel(Messages.E4NewProjectWizard_File);
-				{
-					final MHandledMenuItem menuItemOpen = MMenuFactory.INSTANCE
-						.createHandledMenuItem();
-					fileMenuItem.getChildren().add(menuItemOpen);
-					menuItemOpen.setLabel(Messages.E4NewProjectWizard_Open);
-					menuItemOpen.setIconURI("platform:/plugin/" + pluginName //$NON-NLS-1$
-						+ "/icons/sample.png"); //$NON-NLS-1$
-					menuItemOpen.setCommand(openCommand);
-
-					final MHandledMenuItem menuItemSave = MMenuFactory.INSTANCE
-						.createHandledMenuItem();
-					fileMenuItem.getChildren().add(menuItemSave);
-					menuItemSave.setLabel(Messages.E4NewProjectWizard_Save);
-					menuItemSave.setIconURI("platform:/plugin/" + pluginName //$NON-NLS-1$
-						+ "/icons/save_edit.png"); //$NON-NLS-1$
-					menuItemSave.setCommand(saveCommand);
-
-					final MHandledMenuItem menuItemQuit = MMenuFactory.INSTANCE
-						.createHandledMenuItem();
-					fileMenuItem.getChildren().add(menuItemQuit);
-					menuItemQuit.setLabel(Messages.E4NewProjectWizard_Quit);
-					menuItemQuit.setCommand(quitCommand);
-				}
-				final MMenu helpMenuItem = MMenuFactory.INSTANCE.createMenu();
-				menu.getChildren().add(helpMenuItem);
-				helpMenuItem.setLabel(Messages.E4NewProjectWizard_Help);
-				{
-					final MHandledMenuItem menuItemAbout = MMenuFactory.INSTANCE
-						.createHandledMenuItem();
-					helpMenuItem.getChildren().add(menuItemAbout);
-					menuItemAbout.setLabel(Messages.E4NewProjectWizard_About);
-					menuItemAbout.setCommand(aboutCommand);
-				}
-
-				// PerspectiveStack
-				final MPerspectiveStack perspectiveStack = MAdvancedFactory.INSTANCE
-					.createPerspectiveStack();
-				mainWindow.getChildren().add(perspectiveStack);
-
-				final MPerspective perspective = MAdvancedFactory.INSTANCE
-					.createPerspective();
-				perspectiveStack.getChildren().add(perspective);
-				{
-					// Part Container
-					final MPartSashContainer partSashContainer = MBasicFactory.INSTANCE
-						.createPartSashContainer();
-					perspective.getChildren().add(partSashContainer);
-
-					final MPartStack partStack = MBasicFactory.INSTANCE
-						.createPartStack();
-					partSashContainer.getChildren().add(partStack);
-
-					final MPart part = MBasicFactory.INSTANCE.createPart();
-					partStack.getChildren().add(part);
-					part.setLabel(Messages.E4NewProjectWizard_SamplePart);
-					part.setContributionURI("bundleclass://" + pluginName + "/" //$NON-NLS-1$ //$NON-NLS-2$
-						+ fragment.getElementName() + ".parts" //$NON-NLS-1$
-						+ ".SamplePart"); //$NON-NLS-1$
-
-				}
-
-				// WindowTrim
-				final MTrimBar trimBar = MBasicFactory.INSTANCE.createTrimBar();
-				mainWindow.getTrimBars().add(trimBar);
-
-				final MToolBar toolBar = MMenuFactory.INSTANCE.createToolBar();
-				toolBar.setElementId("toolbar:org.eclipse.ui.main.toolbar"); //$NON-NLS-1$
-				trimBar.getChildren().add(toolBar);
-
-				final MHandledToolItem toolItemOpen = MMenuFactory.INSTANCE
-					.createHandledToolItem();
-				toolBar.getChildren().add(toolItemOpen);
-				toolItemOpen.setIconURI("platform:/plugin/" + pluginName //$NON-NLS-1$
-					+ "/icons/sample.png"); //$NON-NLS-1$
-				toolItemOpen.setCommand(openCommand);
-
-				final MHandledToolItem toolItemSave = MMenuFactory.INSTANCE
-					.createHandledToolItem();
-				toolBar.getChildren().add(toolItemSave);
-				toolItemSave.setIconURI("platform:/plugin/" + pluginName //$NON-NLS-1$
-					+ "/icons/save_edit.png"); //$NON-NLS-1$
-				toolItemSave.setCommand(saveCommand);
-			}
-			final Map<Object, Object> options = new HashMap<Object, Object>();
-			options.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
-			try {
-				resource.save(options);
-			} catch (final IOException e) {
-				PDEPlugin.logException(e);
-
-			}
-		}
-	}
-
-	private MCommand createCommand(String commandId, String name,
-		String className, String keyBinding, String projectName,
-		IPackageFragment fragment, MApplication application) {
-		final MCommand command = MCommandsFactory.INSTANCE.createCommand();
-		command.setCommandName(name);
-		command.setElementId(commandId);
-		application.getCommands().add(command);
-		{
-			// Create handler for command
-			final MHandler handler = MCommandsFactory.INSTANCE.createHandler();
-			handler.setCommand(command);
-			final String elementName = fragment.getElementName();
-			handler.setContributionURI("bundleclass://" + projectName + "/" //$NON-NLS-1$ //$NON-NLS-2$
-				+ (elementName.equals("") ? "" : elementName + ".") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				+ "handlers." + className); //$NON-NLS-1$
-			handler.setElementId(projectName + ".handler." + name); //$NON-NLS-1$
-			application.getHandlers().add(handler);
-
-			// create binding for the command
-			final MKeyBinding binding = MCommandsFactory.INSTANCE.createKeyBinding();
-			binding.setKeySequence(keyBinding);
-			binding.setCommand(command);
-			final List<MBindingTable> tables = application.getBindingTables();
-			if (tables.size() == 0) {
-				MBindingContext rootContext = null;
-				if (application.getRootContext().size() > 0) {
-					rootContext = application.getRootContext().get(0);
-				} else {
-					rootContext = MCommandsFactory.INSTANCE
-						.createBindingContext();
-					rootContext
-					.setElementId("org.eclipse.ui.contexts.dialogAndWindow"); //$NON-NLS-1$
-					rootContext.setName(Messages.E4NewProjectWizard_InDialogsAndWindows);
-					application.getRootContext().add(rootContext);
-				}
-				final MBindingTable table = MCommandsFactory.INSTANCE
-					.createBindingTable();
-				table.setBindingContext(rootContext);
-				tables.add(table);
-			}
-			tables.get(0).getBindings().add(binding);
-		}
-		return command;
-	}
-
-	private void prepareFolder(IContainer container, IProgressMonitor monitor)
-		throws CoreException {
-		final IContainer parent = container.getParent();
-		if (parent instanceof IFolder) {
-			prepareFolder(parent, monitor);
-		}
-		if (!container.exists() && container instanceof IFolder) {
-			final IFolder folder = (IFolder) container;
-			folder.create(true, true, monitor);
-		}
-	}
-
-	@Override
-	public String getPluginId() {
-		return fPluginData.getId();
-	}
-
-	@Override
-	public String getPluginVersion() {
-		return fPluginData.getVersion();
-	}
-
-	private class ContentWizard extends Wizard implements IBundleContentWizard {
-
-		String[] dependencies = new String[] { "javax.inject", //$NON-NLS-1$
-			"org.eclipse.core.runtime", "org.eclipse.swt", //$NON-NLS-1$//$NON-NLS-2$
-			"org.eclipse.e4.ui.model.workbench", "org.eclipse.jface", //$NON-NLS-1$ //$NON-NLS-2$
-			"org.eclipse.e4.ui.services", "org.eclipse.e4.ui.workbench", //$NON-NLS-1$ //$NON-NLS-2$
-			"org.eclipse.e4.core.di", "org.eclipse.e4.ui.di", //$NON-NLS-1$ //$NON-NLS-2$
-			"org.eclipse.e4.core.contexts", }; //$NON-NLS-1$
-
-		@Override
-		public void init(IFieldData data) {
-		}
-
-		@Override
-		public IPluginReference[] getDependencies(String schemaVersion) {
-			final ArrayList<IPluginReference> result = new ArrayList<IPluginReference>(
-				dependencies.length);
-			for (final String dependency : dependencies) {
-				final Bundle bundle = Platform.getBundle(dependency);
-				String versionString = "0.0.0"; //$NON-NLS-1$
-				if (dependency != null) {
-					final Version version = bundle.getVersion();
-					versionString = version.getMajor() + "." //$NON-NLS-1$
-						+ version.getMinor() + "." + version.getMicro(); //$NON-NLS-1$
-				}
-				result.add(new PluginReference(dependency, versionString,
-					IMatchRules.GREATER_OR_EQUAL));
-			}
-			return result.toArray(new IPluginReference[0]);
-		}
-
-		@Override
-		public String[] getNewFiles() {
-			return new String[0];
-		}
-
-		@Override
-		public boolean performFinish(IProject project, IPluginModelBase model,
-			IProgressMonitor monitor) {
-			return true;
-		}
-
-		@Override
-		public String[] getImportPackages() {
-			return new String[] {};
-		}
-
-		@Override
-		public boolean performFinish() {
-			return true;
-		}
-
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizardPage.java
deleted file mode 100644
index 00e7d07b7f..0000000000
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizardPage.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 Soyatec(http://www.soyatec.com) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- * Soyatec - initial API and implementation
- *******************************************************************************/
-package org.eclipse.e4.internal.tools.wizards.project;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.internal.ui.wizards.plugin.AbstractFieldData;
-import org.eclipse.swt.widgets.Composite;
-
-@SuppressWarnings("restriction")
-public class E4NewProjectWizardPage extends org.eclipse.pde.internal.ui.wizards.plugin.NewProjectCreationPage {
-
-	public E4NewProjectWizardPage(String pageName, AbstractFieldData data, boolean fragment,
-		IStructuredSelection selection) {
-		super(pageName, data, fragment, selection);
-	}
-
-	@Override
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		fOSGIButton.setSelection(true);
-		fEclipseButton.setSelection(false);
-		fEclipseButton.setEnabled(false);
-		fEclipseCombo.setEnabled(false);
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/LifeCycleClassCodeGenerator.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/LifeCycleClassCodeGenerator.java
deleted file mode 100644
index 5c803e1b18..0000000000
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/LifeCycleClassCodeGenerator.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- * Steven Spungin <steven@spungin.tv> - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.e4.internal.tools.wizards.project;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.wizards.plugin.PluginFieldData;
-import org.osgi.framework.FrameworkUtil;
-
-@SuppressWarnings("restriction")
-public class LifeCycleClassCodeGenerator {
-	private static final String PACKAGE_DECLARATION = "PACKAGE_DECLARATION"; //$NON-NLS-1$
-	private final PluginFieldData fPluginData;
-	private final IProject fProject;
-	private final String fQualifiedClassName;
-
-	public LifeCycleClassCodeGenerator(IProject project, String qualifiedClassName, PluginFieldData data) {
-		fProject = project;
-		fQualifiedClassName = qualifiedClassName;
-		fPluginData = data;
-
-	}
-
-	public IFile generate(IProgressMonitor monitor) throws CoreException {
-		final int nameloc = fQualifiedClassName.lastIndexOf('.');
-		String packageName = nameloc == -1 ? "" : fQualifiedClassName.substring(0, nameloc); //$NON-NLS-1$
-		// CoreUtility.createFolder was throwing exception if Activator was already created with lower case package and
-		// this method called it with different case.
-		packageName = packageName.toLowerCase();
-		final String className = fQualifiedClassName.substring(nameloc + 1);
-
-		IPath path = new Path(packageName.replace('.', '/'));
-		if (fPluginData.getSourceFolderName().trim().length() > 0) {
-			path = new Path(fPluginData.getSourceFolderName()).append(path);
-		}
-
-		CoreUtility.createFolder(fProject.getFolder(path));
-
-		final IFile file = fProject.getFile(path.append(className + ".java")); //$NON-NLS-1$
-		final StringWriter swriter = new StringWriter();
-		final PrintWriter writer = new PrintWriter(swriter);
-		generateClass(packageName, className, swriter);
-		writer.flush();
-
-		try {
-			swriter.close();
-			final ByteArrayInputStream stream = new ByteArrayInputStream(swriter.toString().getBytes(
-				fProject.getDefaultCharset()));
-			if (file.exists()) {
-				file.setContents(stream, false, true, monitor);
-			} else {
-				file.create(stream, false, monitor);
-			}
-			stream.close();
-		} catch (final Exception e) {
-
-		}
-		return file;
-	}
-
-	private void generateClass(String packageName, String className, StringWriter writer) {
-
-		final Map<String, String> map = new HashMap<String, String>();
-		if (packageName.equals("")) { //$NON-NLS-1$
-			map.put(PACKAGE_DECLARATION, ""); //$NON-NLS-1$
-		} else {
-			map.put(PACKAGE_DECLARATION, "package " + packageName + ";"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		map.put("PACKAGE_NAME", packageName); //$NON-NLS-1$
-		map.put("CLASS_NAME", className); //$NON-NLS-1$
-
-		try {
-			String template = getResourceAsString(this.getClass(), "/templates/E4LifeCycle.java"); //$NON-NLS-1$
-			template = SimpleTemplate.process(template, map);
-			writer.write(template);
-		} catch (final Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	public static String getResourceAsString(Class<?> classInBundle, String templatePath) throws FileNotFoundException,
-		IOException {
-		final URL url = FrameworkUtil.getBundle(classInBundle).getResource(templatePath);
-		return readTextFile(url.openStream());
-	}
-
-	public static String readTextFile(InputStream stream) throws IOException, FileNotFoundException {
-		final StringBuilder sb = new StringBuilder();
-		final BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
-
-		final char[] chars = new char[1024];
-		int numRead = 0;
-		while ((numRead = reader.read(chars)) > -1) {
-			sb.append(String.copyValueOf(chars, 0, numRead));
-		}
-
-		reader.close();
-		return sb.toString();
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
deleted file mode 100644
index 71a85c9982..0000000000
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/NewApplicationWizardPage.java
+++ /dev/null
@@ -1,527 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2012 Soyatec (http://www.soyatec.com) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- * Soyatec - initial API and implementation
- * IBM Corporation - ongoing enhancements
- * Lars Vogel, vogella GmbH - ongoing enhancements
- * Sopot Cela - ongoing enhancements
- * Steven Spungin - ongoing enhancements, Bug 438591
- *******************************************************************************/
-package org.eclipse.e4.internal.tools.wizards.project;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.e4.internal.tools.Messages;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
-import org.eclipse.pde.internal.ui.wizards.plugin.AbstractFieldData;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.events.VerifyListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.ColorDialog;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.branding.IProductConstants;
-
-/**
- * @author jin.liu (jin.liu@soyatec.com)
- */
-@SuppressWarnings("restriction")
-public class NewApplicationWizardPage extends WizardPage {
-	private static final String TRUE = "TRUE"; //$NON-NLS-1$
-	private static final String TRUESMALL = "true"; //$NON-NLS-1$
-	private static final String FALSE = "FALSE"; //$NON-NLS-1$
-	public static final String E4_APPLICATION = "org.eclipse.e4.ui.workbench.swt.E4Application"; //$NON-NLS-1$
-	public static final String APPLICATION_CSS_PROPERTY = "applicationCSS"; //$NON-NLS-1$
-	public static final String LIFECYCLE_URI_PROPERTY = "lifeCycleURI"; //$NON-NLS-1$
-	public static final String PRODUCT_NAME = "productName"; //$NON-NLS-1$
-	public static final String APPLICATION = "application"; //$NON-NLS-1$
-	public static final String CLEAR_PERSISTED_STATE = "clearPersistedState"; //$NON-NLS-1$
-	public static final String EOL = System.getProperty("line.separator"); //$NON-NLS-1$
-	public static final String richSample = "RICH_SAMPLE"; //$NON-NLS-1$
-	public static final String generateLifecycle = "GENERATE_LIFECYCLE"; //$NON-NLS-1$
-	public static final String generateLifecycleName = "GENERATE_LIFECYCLE_NAME"; //$NON-NLS-1$
-
-	private final Map<String, String> data;
-
-	private IProject project;
-	private final IProjectProvider projectProvider;
-	private Text proNameText;
-	private Group propertyGroup;
-	private final AbstractFieldData pluginData;
-
-	private PropertyData[] PROPERTIES;
-	private Button richSampleCheckbox;
-	protected Button generateLifecycleClassCheckbox;
-	protected Text lifeCycleName;
-
-	protected NewApplicationWizardPage(IProjectProvider projectProvider,
-		AbstractFieldData pluginData) {
-		super(Messages.NewApplicationWizardPage_NewE4ApplicationWizardPage);
-		this.projectProvider = projectProvider;
-		this.pluginData = pluginData;
-		data = new HashMap<String, String>();
-		data.put(richSample, FALSE);// minimalist by default
-		setTitle(Messages.NewApplicationWizardPage_Eclipse4Application);
-		setMessage(Messages.NewApplicationWizardPage_ConfigureApplication);
-	}
-
-	public IProject getProject() {
-		if (project == null && projectProvider != null) {
-			project = projectProvider.getProject();
-		}
-		return project;
-	}
-
-	public void setProject(IProject project) {
-		this.project = project;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets
-	 * .Composite)
-	 */
-	@Override
-	public void createControl(Composite parent) {
-		final Composite control = new Composite(parent, SWT.NONE);
-		control.setLayout(new GridLayout());
-
-		final Group productGroup = createProductGroup(control);
-		productGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		propertyGroup = createPropertyGroup(control);
-		propertyGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		final Group templateGroup = createTemplateGroup(control);
-		templateGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		setControl(control);
-	}
-
-	private Group createTemplateGroup(Composite parent) {
-		final Group group = new Group(parent, SWT.NONE);
-		group.setLayout(new GridLayout(3, false));
-		group.setText(Messages.NewApplicationWizardPage_TemplateOption);
-
-		richSampleCheckbox = new Button(group, SWT.CHECK);
-
-		richSampleCheckbox.setSelection(false);
-		richSampleCheckbox.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				data.put(richSample, richSampleCheckbox.getSelection() ? TRUE : FALSE);
-			}
-		});
-		richSampleCheckbox.setText(Messages.NewApplicationWizardPage_CreateSampleContent);
-		richSampleCheckbox.setLayoutData(new GridData(SWT.BEGINNING, SWT.TOP, false, false, 2, 1));
-
-		{
-			final SelectionListener listener = new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					lifeCycleName.setEnabled(generateLifecycleClassCheckbox.getSelection());
-					data.put(generateLifecycle, generateLifecycleClassCheckbox.getSelection() ? TRUE : FALSE);
-				}
-			};
-
-			generateLifecycleClassCheckbox = new Button(group, SWT.CHECK);
-			generateLifecycleClassCheckbox.setSelection(false);
-
-			generateLifecycleClassCheckbox.setText(Messages.NewApplicationWizardPage_AddLifecycleClass);
-			generateLifecycleClassCheckbox.setLayoutData(new GridData(SWT.BEGINNING, SWT.TOP, false, false, 2, 1));
-			generateLifecycleClassCheckbox.addSelectionListener(listener);
-
-			new Label(group, SWT.NONE);
-			final Label lbl = new Label(group, SWT.NONE);
-			lbl.setText(Messages.NewApplicationWizardPage_LifecycleClassName);
-			final GridData gd = new GridData();
-			gd.horizontalIndent = 20;
-			lbl.setLayoutData(gd);
-
-			lifeCycleName = new Text(group, SWT.BORDER);
-			lifeCycleName.setText(Messages.NewApplicationWizardPage_E4Lifecycle);
-			lifeCycleName.setEnabled(false);
-			lifeCycleName.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-			lifeCycleName.addModifyListener(new ModifyListener() {
-
-				@Override
-				public void modifyText(ModifyEvent e) {
-					data.put(generateLifecycleName, lifeCycleName.getText());
-				}
-			});
-			data.put(generateLifecycleName, lifeCycleName.getText());
-		}
-		return group;
-	}
-
-	static class PropertyData {
-		private final String name;
-		private final String label;
-		private String extraTooltipInfo;
-
-		private final String value;
-		private final Class<?> type;
-		private final boolean editable;
-
-		public PropertyData(String name, String label, String value,
-			Class<?> type, boolean editable) {
-			this.name = name;
-			this.value = value;
-			this.label = label;
-			this.type = type;
-			this.editable = editable;
-		}
-
-		public PropertyData(String name, String label, String value,
-			Class<?> type, boolean editable, String extraTooltipInfo) {
-			this.name = name;
-			this.value = value;
-			this.label = label;
-			this.type = type;
-			this.editable = editable;
-			this.extraTooltipInfo = extraTooltipInfo;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public String getValue() {
-			return value;
-		}
-
-		public Class<?> getType() {
-			return type;
-		}
-
-		public boolean isEditable() {
-			return editable;
-		}
-
-		public String getLabel() {
-			return label;
-		}
-
-		public String getExtraTooltipInfo() {
-			return extraTooltipInfo;
-		}
-
-	}
-
-	private Group createPropertyGroup(Composite control) {
-		final Group group = new Group(control, SWT.NONE);
-		group.setText(Messages.NewApplicationWizardPage_Properties);
-
-		group.setLayout(new GridLayout(3, false));
-
-		return group;
-	}
-
-	private void createPropertyItem(final Composite parent,
-		final PropertyData property) {
-
-		if (property.getType() == Boolean.class) {
-			final Button button = new Button(parent, SWT.CHECK);
-			button.setSelection(TRUESMALL.equalsIgnoreCase(property.getValue()));
-			button.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					handleCheckBoxEvent(property.getName(),
-						button.getSelection());
-				}
-			});
-			button.setText(property.getLabel());
-			new Label(parent, SWT.NONE);
-		} else {
-			createLabelForField(parent, property);
-			final Text valueText = new Text(parent, SWT.BORDER);
-			valueText.setText(property.getValue());
-			final GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-			valueText.setLayoutData(gridData);
-			if (!property.isEditable()) {
-				valueText.setEditable(false);
-			}
-			valueText.addListener(SWT.Modify, new Listener() {
-				@Override
-				public void handleEvent(Event event) {
-					handleTextEvent(property.getName(), valueText);
-				}
-			});
-
-			if (property.getType() == Color.class
-				|| property.getType() == Rectangle.class) {
-				final Button button = new Button(parent, SWT.PUSH);
-				button.setText(Messages.NewApplicationWizardPage_Dots);
-				button.addSelectionListener(new SelectionAdapter() {
-					@Override
-					public void widgetSelected(SelectionEvent e) {
-						handleLinkEvent(property, valueText, parent.getShell());
-					}
-				});
-			} else {
-				new Label(parent, SWT.NONE);
-			}
-		}
-		data.put(property.getName(), property.getValue());
-	}
-
-	private void createLabelForField(final Composite parent,
-		final PropertyData property) {
-		final Label label = new Label(parent, SWT.NONE);
-		label.setText(property.getLabel());
-		label.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_BLUE));
-		label.setToolTipText(Messages.NewApplicationWizardPage_Property + property.getName() + "\""); //$NON-NLS-1$
-		if (property.getExtraTooltipInfo() != null) {
-			label.setToolTipText(label.getToolTipText() + EOL
-				+ property.getExtraTooltipInfo());
-		}
-	}
-
-	private void handleLinkEvent(PropertyData property, Text valueText,
-		Shell shell) {
-		if (property == null || valueText == null || valueText.isDisposed()) {
-			return;
-		}
-		if (property.getType() == Color.class) {
-			final ColorDialog colorDialog = new ColorDialog(shell);
-			final RGB selectRGB = colorDialog.open();
-			if (selectRGB != null) {
-				valueText.setText((hexColorConvert(Integer
-					.toHexString(selectRGB.blue))
-					+ hexColorConvert(Integer
-						.toHexString(selectRGB.green)) + hexColorConvert(Integer.toHexString(selectRGB.red)))
-					.toUpperCase());
-			}
-		} else if (property.getType() == Rectangle.class) {
-			createRectDialog(shell, valueText).open();
-		}
-	}
-
-	/**
-	 * exchange the color pattern of hex numeric
-	 *
-	 * @param color
-	 * @return the converted hex color
-	 */
-	public String hexColorConvert(String color) {
-		if (color.length() == 1) {
-			return "0" + color; //$NON-NLS-1$
-		}
-		return color;
-	}
-
-	/**
-	 * create Rect Set dialog
-	 *
-	 * @param parent
-	 * @param valueText
-	 * @return a rect dialog
-	 */
-	public Dialog createRectDialog(final Composite parent, final Text valueText) {
-		return new Dialog(parent.getShell()) {
-			Text xPointText, yPointText, widthText, heightText;
-
-			@Override
-			protected Button createButton(Composite parent, int id,
-				String label, boolean defaultButton) {
-				return super.createButton(parent, id, label, defaultButton);
-			}
-
-			@Override
-			protected Control createDialogArea(final Composite parent) {
-				final Composite composite = (Composite) super
-					.createDialogArea(parent);
-				composite.getShell().setText(Messages.NewApplicationWizardPage_SetRectangle);
-				final Group group = new Group(composite, SWT.NONE);
-				group.setText(Messages.NewApplicationWizardPage_Rectangle);
-				final GridLayout gridLayout = new GridLayout();
-				gridLayout.numColumns = 4;
-				group.setLayout(gridLayout);
-
-				final Label xPointLabel = new Label(group, SWT.NONE);
-				xPointLabel.setText(Messages.NewApplicationWizardPage_X);
-				xPointText = new Text(group, SWT.BORDER);
-				final VerifyListener verifyListener = createVerifyListener(parent
-					.getShell());
-				xPointText.addVerifyListener(verifyListener);
-				final Label yPointLabel = new Label(group, SWT.NONE);
-				yPointLabel.setText(Messages.NewApplicationWizardPage_Y);
-				yPointText = new Text(group, SWT.BORDER);
-				yPointText.addVerifyListener(verifyListener);
-				final Label widthLabel = new Label(group, SWT.NONE);
-				widthLabel.setText(Messages.NewApplicationWizardPage_Width);
-				widthText = new Text(group, SWT.BORDER);
-				widthText.addVerifyListener(verifyListener);
-				final Label heighttLabel = new Label(group, SWT.NONE);
-				heighttLabel.setText(Messages.NewApplicationWizardPage_Height);
-				heightText = new Text(group, SWT.BORDER);
-				heightText.addVerifyListener(verifyListener);
-
-				return composite;
-			}
-
-			@Override
-			protected void buttonPressed(int buttonId) {
-				if (IDialogConstants.OK_ID == buttonId) {
-					final String xPoint = xPointText.getText();
-					final String yPoint = yPointText.getText();
-					final String width = widthText.getText();
-					final String height = heightText.getText();
-					if (xPoint.length() == 0 || yPoint.length() == 0
-						|| width.length() == 0 || height.length() == 0) {
-						MessageDialog.openWarning(parent.getShell(),
-							Messages.NewApplicationWizardPage_InputValueEmpty,
-							Messages.NewApplicationWizardPage_ValueShouldNotBeEmpty);
-					} else {
-						valueText.setText(xPoint + "," + yPoint + "," + width //$NON-NLS-1$ //$NON-NLS-2$
-							+ "," + height); //$NON-NLS-1$
-						okPressed();
-					}
-				} else if (IDialogConstants.CANCEL_ID == buttonId) {
-					cancelPressed();
-				}
-			}
-		};
-	}
-
-	/**
-	 * create verify Listener
-	 *
-	 * @param shell
-	 * @return a new verify listener
-	 */
-	public VerifyListener createVerifyListener(final Shell shell) {
-		return new VerifyListener() {
-			@Override
-			public void verifyText(VerifyEvent e) {
-				final char c = e.character;
-				if ("0123456789".indexOf(c) == -1) { //$NON-NLS-1$
-					e.doit = false;
-					MessageDialog.openWarning(shell, Messages.NewApplicationWizardPage_InputValueError,
-						Messages.NewApplicationWizardPage_OnlyNumericValues);
-					return;
-				}
-			}
-		};
-	}
-
-	private void handleTextEvent(String property, Text valueText) {
-		if (property == null || valueText == null || valueText.isDisposed()) {
-			return;
-		}
-		String value = valueText.getText();
-		if (value.equals("")) { //$NON-NLS-1$
-			value = null;
-		}
-		data.put(property, value);
-	}
-
-	protected void handleCheckBoxEvent(String property, boolean selection) {
-		if (property == null) {
-			return;
-		}
-		data.put(property, Boolean.toString(selection));
-	}
-
-	private Group createProductGroup(Composite control) {
-		final Group proGroup = new Group(control, SWT.NONE);
-		proGroup.setText(Messages.NewApplicationWizardPage_Product);
-
-		proGroup.setLayout(new GridLayout(2, false));
-
-		final Label proNameLabel = new Label(proGroup, SWT.NONE);
-		proNameLabel.setText(Messages.NewApplicationWizardPage_Name);
-
-		proNameText = new Text(proGroup, SWT.BORDER);
-		proNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		proNameText.addListener(SWT.Modify, new Listener() {
-			@Override
-			public void handleEvent(Event event) {
-				handleTextEvent(PRODUCT_NAME, proNameText);
-			}
-		});
-		return proGroup;
-	}
-
-	protected PropertyData[] getPropertyData() {
-		if (PROPERTIES == null) {
-			PROPERTIES = new PropertyData[] {
-				new PropertyData(APPLICATION_CSS_PROPERTY, Messages.NewApplicationWizardPage_CSSStyle,
-					"css/default.css", String.class, true), //$NON-NLS-1$
-					new PropertyData(
-						IProductConstants.PREFERENCE_CUSTOMIZATION,
-						Messages.NewApplicationWizardPage_PreferenceCustomization, "", String.class, true), //$NON-NLS-1$
-						new PropertyData(CLEAR_PERSISTED_STATE,
-					Messages.NewApplicationWizardPage_EnableDevelopmentMode,
-					TRUESMALL, Boolean.class, true,
-					Messages.NewApplicationWizardPage_AddOptionCleanPersistedState) }; // plugin_customization.ini
-		}
-		return PROPERTIES;
-	}
-
-	@Override
-	public void setVisible(boolean visible) {
-		if (visible && PROPERTIES == null) {
-
-			// Use the plug-in name for the product name (not project name which
-			// can contain illegal characters)
-			proNameText.setText(pluginData.getId());
-
-			for (final PropertyData property : getPropertyData()) {
-				createPropertyItem(propertyGroup, property);
-			}
-			propertyGroup.getParent().layout();
-		}
-		super.setVisible(visible);
-	}
-
-	/**
-	 * @return the data
-	 */
-	public Map<String, String> getData() {
-		if (PROPERTIES == null) {
-			for (final PropertyData property : getPropertyData()) {
-				data.put(property.getName(), property.getValue());
-			}
-
-			// Use the plug-in name for the product name (not project name which
-			// can contain illegal characters)
-			final String productName = pluginData.getId();
-
-			data.put(PRODUCT_NAME, productName);
-			data.put(APPLICATION, E4_APPLICATION);
-		}
-		final Map<String, String> map = new HashMap<String, String>();
-		map.putAll(data);
-		return map;
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
deleted file mode 100644
index 5894a7aa19..0000000000
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/PluginContentPage.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- * IBM Corporation - initial API and implementation
- * Soyatec - port to e4
- * Lars Vogel, vogella GmbH - ongoing enhancements
- *******************************************************************************/
-package org.eclipse.e4.internal.tools.wizards.project;
-
-import java.util.Locale;
-import java.util.TreeSet;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.pde.internal.core.util.PDEJavaHelper;
-import org.eclipse.pde.internal.core.util.VMUtil;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.SWTFactory;
-import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
-import org.eclipse.pde.internal.ui.wizards.plugin.AbstractFieldData;
-import org.eclipse.pde.internal.ui.wizards.plugin.ContentPage;
-import org.eclipse.pde.internal.ui.wizards.plugin.NewProjectCreationPage;
-import org.eclipse.pde.internal.ui.wizards.plugin.PluginFieldData;
-import org.eclipse.pde.internal.ui.wizards.plugin.TemplateListSelectionPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.osgi.framework.Version;
-
-/**
- * Content wizard page for the New Plugin Project wizard (page 2)
- */
-@SuppressWarnings("restriction")
-public class PluginContentPage extends ContentPage {
-	private Text fClassText;
-	protected Button fGenerateActivator;
-	protected Button fUIPlugin;
-	private Label fClassLabel;
-	private Label fEELabel;
-	private Button fExeEnvButton;
-	private Combo fEEChoice;
-
-	/**
-	 * Button to enable API analysis for the project during project creation
-	 */
-	private Button fApiAnalysisButton;
-
-	/**
-	 * Dialog settings constants
-	 */
-	private final static String S_GENERATE_ACTIVATOR = "generateActivator"; //$NON-NLS-1$
-	private final static String S_UI_PLUGIN = "uiPlugin"; //$NON-NLS-1$
-	private final static String S_RCP_PLUGIN = "rcpPlugin"; //$NON-NLS-1$
-	private final static String S_API_ANALYSIS = "apiAnalysis"; //$NON-NLS-1$
-
-	protected final static int P_CLASS_GROUP = 2;
-	private final static String NO_EXECUTION_ENVIRONMENT = PDEUIMessages.PluginContentPage_noEE;
-
-	/**
-	 * default tText modify listener
-	 */
-	private final ModifyListener classListener = new ModifyListener() {
-		@Override
-		public void modifyText(ModifyEvent e) {
-			if (fInitialized) {
-				fChangedGroups |= P_CLASS_GROUP;
-			}
-			validatePage();
-		}
-	};
-
-	/**
-	 * Constructor
-	 *
-	 * @param pageName
-	 * @param provider
-	 * @param page
-	 * @param data
-	 */
-	public PluginContentPage(String pageName, IProjectProvider provider, NewProjectCreationPage page,
-		AbstractFieldData data) {
-		super(pageName, provider, page, data);
-		setTitle(PDEUIMessages.ContentPage_title);
-		setDescription(PDEUIMessages.ContentPage_desc);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	public void createControl(Composite parent) {
-		final Composite container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout());
-
-		createPluginPropertiesGroup(container);
-		createPluginClassGroup(container);
-
-		Dialog.applyDialogFont(container);
-		setControl(container);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.NEW_PROJECT_REQUIRED_DATA);
-	}
-
-	/**
-	 * Creates all of the plugin properties widgets
-	 *
-	 * @param container
-	 */
-	private void createPluginPropertiesGroup(Composite container) {
-		final Group propertiesGroup = SWTFactory.createGroup(container, PDEUIMessages.ContentPage_pGroup, 3, 1,
-			GridData.FILL_HORIZONTAL);
-
-		Label label = new Label(propertiesGroup, SWT.NONE);
-		label.setText(PDEUIMessages.ContentPage_pid);
-		fIdText = createText(propertiesGroup, propertiesListener, 2);
-
-		label = new Label(propertiesGroup, SWT.NONE);
-		label.setText(PDEUIMessages.ContentPage_pversion);
-		fVersionText = createText(propertiesGroup, propertiesListener, 2);
-
-		label = new Label(propertiesGroup, SWT.NONE);
-		label.setText(PDEUIMessages.ContentPage_pname);
-		fNameText = createText(propertiesGroup, propertiesListener, 2);
-
-		label = new Label(propertiesGroup, SWT.NONE);
-		label.setText(PDEUIMessages.ContentPage_pprovider);
-		fProviderCombo = createProviderCombo(propertiesGroup, propertiesListener, 2);
-
-		createExecutionEnvironmentControls(propertiesGroup);
-	}
-
-	/**
-	 * Creates all of the EE widgets
-	 *
-	 * @param container
-	 */
-	private void createExecutionEnvironmentControls(Composite container) {
-		// Create label
-		fEELabel = new Label(container, SWT.NONE);
-		fEELabel.setText(PDEUIMessages.NewProjectCreationPage_executionEnvironments_label);
-
-		// Create combo
-		fEEChoice = new Combo(container, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
-		fEEChoice.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		// Gather EEs
-		final IExecutionEnvironment[] exeEnvs = VMUtil.getExecutionEnvironments();
-		final TreeSet<String> availableEEs = new TreeSet<String>();
-		for (int i = 0; i < exeEnvs.length; i++) {
-			availableEEs.add(exeEnvs[i].getId());
-		}
-		availableEEs.add(NO_EXECUTION_ENVIRONMENT);
-
-		// Set data
-		fEEChoice.setItems(availableEEs.toArray(new String[availableEEs.size() - 1]));
-		fEEChoice.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				validatePage();
-			}
-		});
-
-		// Set default EE based on strict match to default VM
-		final IVMInstall defaultVM = JavaRuntime.getDefaultVMInstall();
-		final String[] EEChoices = fEEChoice.getItems();
-		for (int i = 0; i < EEChoices.length; i++) {
-			if (!EEChoices[i].equals(NO_EXECUTION_ENVIRONMENT)) {
-				if (VMUtil.getExecutionEnvironment(EEChoices[i]).isStrictlyCompatible(defaultVM)) {
-					fEEChoice.select(i);
-					break;
-				}
-			}
-		}
-
-		// Create button
-		fExeEnvButton = new Button(container, SWT.PUSH);
-		fExeEnvButton.setLayoutData(new GridData());
-		fExeEnvButton.setText(PDEUIMessages.NewProjectCreationPage_environmentsButton);
-		fExeEnvButton.addListener(SWT.Selection, new Listener() {
-			@Override
-			public void handleEvent(Event event) {
-				PreferencesUtil.createPreferenceDialogOn(getShell(), "org.eclipse.jdt.debug.ui.jreProfiles", //$NON-NLS-1$
-					new String[] { "org.eclipse.jdt.debug.ui.jreProfiles" }, null).open(); //$NON-NLS-1$
-			}
-		});
-	}
-
-	/**
-	 * Creates all of the plugin options widgets
-	 *
-	 * @param container
-	 */
-	protected void createPluginClassGroup(Composite container) {
-		final Group classGroup = SWTFactory.createGroup(container, PDEUIMessages.ContentPage_pClassGroup, 2, 1,
-			GridData.FILL_HORIZONTAL);
-
-		final IDialogSettings settings = getDialogSettings();
-
-		fGenerateActivator = SWTFactory.createCheckButton(classGroup, PDEUIMessages.ContentPage_generate, null, false,
-			2);
-		fGenerateActivator.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				fClassLabel.setEnabled(fGenerateActivator.getSelection());
-				fClassText.setEnabled(fGenerateActivator.getSelection());
-				updateData();
-				validatePage();
-			}
-		});
-
-		fClassLabel = new Label(classGroup, SWT.NONE);
-		fClassLabel.setText(PDEUIMessages.ContentPage_classname);
-		final GridData gd = new GridData();
-		gd.horizontalIndent = 20;
-		fClassLabel.setLayoutData(gd);
-		fClassText = createText(classGroup, classListener);
-
-		fUIPlugin = SWTFactory.createCheckButton(classGroup, PDEUIMessages.ContentPage_uicontribution, null,
-			settings != null ? !settings.getBoolean(S_UI_PLUGIN) : true, 2);
-		fUIPlugin.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				updateData();
-				validatePage();
-			}
-		});
-
-		fApiAnalysisButton = SWTFactory.createCheckButton(classGroup,
-			PDEUIMessages.PluginContentPage_enable_api_analysis, null, false, 2);
-		fApiAnalysisButton.setSelection(settings != null ? settings.getBoolean(S_API_ANALYSIS) : false);
-		fApiAnalysisButton.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				updateData();
-				validatePage();
-			}
-		});
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#updateData()
-	 */
-	@Override
-	public void updateData() {
-		super.updateData();
-		final PluginFieldData data = (PluginFieldData) fData;
-		data.setClassname(fClassText.getText().trim());
-		data.setUIPlugin(fUIPlugin.getSelection());
-		data.setDoGenerateClass(fGenerateActivator.getSelection());
-		data.setRCPApplicationPlugin(!fData.isSimple() && !isPureOSGi());
-		data.setEnableAPITooling(fApiAnalysisButton.getSelection());
-		if (fEEChoice.isEnabled() && !fEEChoice.getText().equals(NO_EXECUTION_ENVIRONMENT)) {
-			fData.setExecutionEnvironment(fEEChoice.getText().trim());
-		} else {
-			fData.setExecutionEnvironment(null);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#setVisible(boolean)
-	 */
-	@Override
-	public void setVisible(boolean visible) {
-		if (visible) {
-			fMainPage.updateData();
-
-			final boolean wasGenActivatorEnabled = fGenerateActivator.isEnabled();
-			fGenerateActivator.setEnabled(!fData.isSimple());
-			// if fGenerateActivator is disabled, set selection to false
-			if (!fGenerateActivator.isEnabled()) {
-				fGenerateActivator.setSelection(false);
-			}
-			// if the fGenerateActivator was disabled and is now enabled, then set the selection to true
-			else if (!wasGenActivatorEnabled) {
-				fGenerateActivator.setSelection(true);
-			}
-			fClassLabel.setEnabled(!fData.isSimple() && fGenerateActivator.getSelection());
-			fClassText.setEnabled(!fData.isSimple() && fGenerateActivator.getSelection());
-			final boolean wasUIPluginEnabled = fUIPlugin.isEnabled();
-			fUIPlugin.setEnabled(!fData.isSimple() && !isPureOSGi());
-			// if fUIPlugin is disabled, set selection to false
-			if (!fUIPlugin.isEnabled()) {
-				fUIPlugin.setSelection(false);
-			}
-			// if the fUIPlugin was disabled and is now enabled, then set the selection to true
-			else if (!wasUIPluginEnabled) {
-				fUIPlugin.setSelection(true);
-			}
-
-			// plugin class group
-			if ((fChangedGroups & P_CLASS_GROUP) == 0) {
-				final int oldfChanged = fChangedGroups;
-				fClassText.setText(computeId().replaceAll("-", "_").toLowerCase(Locale.ENGLISH) + ".Activator"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				fChangedGroups = oldfChanged;
-			}
-
-			final boolean allowEESelection = !fData.isSimple() && fData.hasBundleStructure();
-			fEELabel.setEnabled(allowEESelection);
-			fEEChoice.setEnabled(allowEESelection);
-			fExeEnvButton.setEnabled(allowEESelection);
-			// API tooling only works for osgi bundles with java natures
-			fApiAnalysisButton.setEnabled(allowEESelection);
-			if (allowEESelection && getDialogSettings() != null) {
-				fApiAnalysisButton.setSelection(getDialogSettings().getBoolean(S_API_ANALYSIS));
-			} else {
-				fApiAnalysisButton.setSelection(false);
-			}
-		}
-		super.setVisible(visible);
-	}
-
-	/**
-	 * @return if the field data is using the OSGi framework
-	 */
-	private boolean isPureOSGi() {
-		return ((PluginFieldData) fData).getOSGiFramework() != null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#validatePage()
-	 */
-	@Override
-	protected void validatePage() {
-		String errorMessage = validateProperties();
-		if (errorMessage == null && fGenerateActivator.getSelection()) {
-			final IStatus status = JavaConventions.validateJavaTypeName(fClassText.getText().trim(),
-				PDEJavaHelper.getJavaSourceLevel(null), PDEJavaHelper.getJavaComplianceLevel(null));
-			if (status.getSeverity() == IStatus.ERROR) {
-				errorMessage = status.getMessage();
-			} else if (status.getSeverity() == IStatus.WARNING) {
-				setMessage(status.getMessage(), IMessageProvider.WARNING);
-			}
-		}
-		if (errorMessage == null) {
-			final String eeid = fEEChoice.getText();
-			if (fEEChoice.isEnabled()) {
-				final IExecutionEnvironment ee = VMUtil.getExecutionEnvironment(eeid);
-				if (ee != null && ee.getCompatibleVMs().length == 0) {
-					errorMessage = PDEUIMessages.NewProjectCreationPage_invalidEE;
-				}
-			}
-		}
-		setErrorMessage(errorMessage);
-		setPageComplete(errorMessage == null);
-	}
-
-	/**
-	 * Saves the current state of widgets of interest in the dialog settings for the wizard
-	 *
-	 * @param settings
-	 */
-	@Override
-	public void saveSettings(IDialogSettings settings) {
-		if (fGenerateActivator.isEnabled()) {
-			settings.put(S_GENERATE_ACTIVATOR, !fGenerateActivator.getSelection());
-		}
-		if (fUIPlugin.isEnabled()) {
-			settings.put(S_UI_PLUGIN, !fUIPlugin.getSelection());
-		}
-		if (fApiAnalysisButton.isEnabled()) {
-			settings.put(S_API_ANALYSIS, fApiAnalysisButton.getSelection());
-		}
-		settings.put(S_RCP_PLUGIN, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
-	 */
-	@Override
-	public boolean canFlipToNextPage() {
-		if (getNextPage() instanceof TemplateListSelectionPage) {
-			final TemplateListSelectionPage templatePage = (TemplateListSelectionPage) getNextPage();
-			return super.canFlipToNextPage() && templatePage.isAnyTemplateAvailable();
-		}
-		return super.canFlipToNextPage();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#computeId()
-	 */
-	@Override
-	protected String computeId() {
-		String id = super.computeId();
-		// In addition to removed illegal characters, the xmi model does not recognize plug-in uris if they end in a
-		// version number
-		// See PlatformURLPluginConnection.parse()
-		int underScore = id.lastIndexOf('_');
-		while (underScore >= 0) {
-			try {
-				Version.parseVersion(id.substring(underScore + 1));
-				// name cannot end with a valid version, remove it
-				id = id.substring(0, underScore);
-			} catch (final IllegalArgumentException iae) {
-				// valid name so far, continue to next underscore
-			}
-			underScore = id.lastIndexOf('_', underScore - 1);
-
-		}
-		return id;
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/ResourceLocator.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/ResourceLocator.java
deleted file mode 100644
index ecb0627c5b..0000000000
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/ResourceLocator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 Soyatec (http://www.soyatec.com) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- * Soyatec - initial API and implementation
- *******************************************************************************/
-package org.eclipse.e4.internal.tools.wizards.project;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.e4.internal.tools.ToolsPlugin;
-
-public class ResourceLocator {
-	private static final String TEMPLATE_FOLDER = "templates"; //$NON-NLS-1$
-
-	private static ResourceLocator instance = new ResourceLocator();
-
-	private ResourceLocator() {
-	}
-
-	public static ResourceLocator getInstance() {
-		return instance;
-	}
-
-	public static URL getProjectTemplateFiles(String folder)
-		throws IOException {
-		final Plugin plugin = getResorucePlugin();
-		final URL installURL = plugin.getBundle().getEntry(
-			"/" + TEMPLATE_FOLDER + "/" + folder); //$NON-NLS-1$ //$NON-NLS-2$
-		// FileLocator.toFileURL(installURL);
-		final URL corePath = FileLocator.resolve(installURL);
-		return corePath;
-	}
-
-	public static URL getFile(String relativePath) throws IOException {
-		final Plugin plugin = getResorucePlugin();
-		final URL installURL = plugin.getBundle().getEntry(relativePath);
-		final URL corePath = FileLocator.resolve(installURL);
-		return corePath;
-	}
-
-	public static Plugin getResorucePlugin() {
-		return ToolsPlugin.getDefault();
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/SimpleTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/SimpleTemplate.java
deleted file mode 100644
index 57a52b6e67..0000000000
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/SimpleTemplate.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- * Steven Spungin <steven@spungin.tv> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.e4.internal.tools.wizards.project;
-
-import java.util.Map;
-
-/**
- * A <em>very</em> basic template processor.<br />
- * Any value between pairs of @@ will be substituted by the value in a map.<br />
- * Any values not in the map will be replaced by an empty string. <br />
- * <br />
- * Behavior is undefined if keys or values contain the @@ marker.
- * 
- * @author Steven Spungin
- *
- */
-public class SimpleTemplate {
-
-	public static String process(String source, Map<String, String> substitutionMap) {
-		for (final String key : substitutionMap.keySet()) {
-			source = source.replaceAll("@@" + key + "@@", substitutionMap.get(key)); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		source = source.replaceAll("@@.*?@@", ""); //$NON-NLS-1$ //$NON-NLS-2$
-		return source;
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java
deleted file mode 100644
index e41d259e8e..0000000000
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/TemplateOperation.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 Soyatec (http://www.soyatec.com) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- * Soyatec - initial API and implementation
- * Sopot Cela - ongoing enhancements
- *******************************************************************************/
-package org.eclipse.e4.internal.tools.wizards.project;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.e4.internal.tools.ToolsPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.ui.templates.IVariableProvider;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
-@SuppressWarnings("restriction")
-public class TemplateOperation extends WorkspaceModifyOperation implements
-	IVariableProvider {
-
-	private final URL templateDirectory;
-	private final IContainer target;
-	private final Map<String, String> keys;
-	private final Set<String> binaryExtentions;
-	private final boolean isMinimalist;
-
-	public TemplateOperation(URL source, IContainer target,
-		Map<String, String> keys, Set<String> binaryExtentions, boolean justProduct) {
-		templateDirectory = source;
-		this.binaryExtentions = binaryExtentions;
-		this.target = target;
-		this.keys = keys;
-		isMinimalist = justProduct;
-	}
-
-	@Override
-	protected void execute(IProgressMonitor monitor) throws CoreException,
-		InvocationTargetException, InterruptedException {
-		monitor.setTaskName(PDEUIMessages.AbstractTemplateSection_generating);
-
-		if ("jar".equals(templateDirectory.getProtocol())) { //$NON-NLS-1$
-			final String file = templateDirectory.getFile();
-			final int exclamation = file.indexOf('!');
-			if (exclamation < 0) {
-				return;
-			}
-			URL fileUrl = null;
-			try {
-				fileUrl = new URL(file.substring(0, exclamation));
-			} catch (final MalformedURLException mue) {
-				ToolsPlugin.logError(mue);
-				return;
-			}
-			final File pluginJar = new File(fileUrl.getFile());
-			if (!pluginJar.exists()) {
-				return;
-			}
-			final String templateDirectory = file.substring(exclamation + 1); // "/some/path/"
-			final IPath path = new Path(templateDirectory);
-			ZipFile zipFile = null;
-			try {
-				zipFile = new ZipFile(pluginJar);
-				generateFiles(zipFile, path, target, monitor);
-			} catch (final ZipException ze) {
-			} catch (final IOException ioe) {
-			} finally {
-				if (zipFile != null) {
-					try {
-						zipFile.close();
-					} catch (final IOException e) {
-					}
-				}
-			}
-		} else if ("file".equals(templateDirectory.getProtocol())) { //$NON-NLS-1$
-			final File directory = new File(templateDirectory.getFile());
-			if (!directory.exists()) {
-				return;
-			}
-			generateFiles(directory, target, true, monitor);
-		}
-	}
-
-	private void generateFiles(File src, IContainer dst, boolean firstLevel,
-		IProgressMonitor monitor) throws CoreException {
-		if (!firstLevel && isMinimalist) {
-			return;
-		}
-		final File[] members = src.listFiles();
-
-		for (int i = 0; i < members.length; i++) {
-			final File member = members[i];
-			final String name = member.getName();
-			if (member.isDirectory()) {
-				if (".svn".equals(name) || "cvs".equalsIgnoreCase(name)) { //$NON-NLS-1$ //$NON-NLS-2$
-					continue;
-				}
-				IContainer dstContainer = null;
-
-				final String folderName = getProcessedString(name, name);
-				dstContainer = dst.getFolder(new Path(folderName));
-				if (dstContainer != null && !dstContainer.exists()) {
-					((IFolder) dstContainer).create(true, true, monitor);
-				}
-
-				generateFiles(member, dstContainer, false, monitor);
-			} else {
-				InputStream in = null;
-				try {
-					in = new FileInputStream(member);
-					copyFile(name, in, dst, monitor);
-				} catch (final IOException ioe) {
-				} finally {
-					if (in != null) {
-						try {
-							in.close();
-						} catch (final IOException ioe2) {
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 *
-	 *
-	 * @param zipFile
-	 * @param path
-	 * @param dst
-	 * @param monitor
-	 * @throws CoreException
-	 */
-	private void generateFiles(ZipFile zipFile, IPath path, IContainer dst,
-		IProgressMonitor monitor) throws CoreException {
-		final int pathLength = path.segmentCount();
-		// Immidiate children
-		final Map<String, ZipEntry> childZipEntries = new HashMap<String, ZipEntry>(); // "dir/" or "dir/file.java"
-
-		for (final Enumeration<? extends ZipEntry> zipEntries = zipFile.entries(); zipEntries
-			.hasMoreElements();) {
-			final ZipEntry zipEntry = zipEntries.nextElement();
-			final IPath entryPath = new Path(zipEntry.getName());
-			if (entryPath.segmentCount() <= pathLength) {
-				// ancestor or current directory
-				continue;
-			}
-			if (!path.isPrefixOf(entryPath)) {
-				// not a descendant
-				continue;
-			}
-			if (entryPath.segmentCount() == pathLength + 1) {
-				childZipEntries.put(zipEntry.getName(), zipEntry);
-			} else {
-				final String name = entryPath.uptoSegment(pathLength + 1)
-					.addTrailingSeparator().toString();
-				if (!childZipEntries.containsKey(name)) {
-					final ZipEntry dirEntry = new ZipEntry(name);
-					childZipEntries.put(name, dirEntry);
-				}
-			}
-		}
-
-		for (final Iterator<ZipEntry> it = childZipEntries.values().iterator(); it.hasNext();) {
-			final ZipEntry zipEnry = it.next();
-			final String name = new Path(zipEnry.getName()).lastSegment().toString();
-			if (zipEnry.isDirectory()) {
-				IContainer dstContainer = null;
-
-				final String folderName = getProcessedString(name, name);
-				dstContainer = dst.getFolder(new Path(folderName));
-				if (dstContainer != null && !dstContainer.exists()) {
-					((IFolder) dstContainer).create(true, true, monitor);
-				}
-				generateFiles(zipFile, path.append(name), dstContainer, monitor);
-			} else {
-				InputStream in = null;
-				try {
-					in = zipFile.getInputStream(zipEnry);
-					copyFile(name, in, dst, monitor);
-				} catch (final IOException ioe) {
-				} finally {
-					if (in != null) {
-						try {
-							in.close();
-						} catch (final IOException ioe2) {
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private void copyFile(String fileName, InputStream input, IContainer dst,
-		IProgressMonitor monitor) throws CoreException {
-		final String targetFileName = getProcessedString(fileName, fileName);
-
-		monitor.subTask(targetFileName);
-		final IFile dstFile = dst.getFile(new Path(targetFileName));
-
-		try {
-			final InputStream stream = isBinary(fileName) ? input
-				: getProcessedStream(fileName, input);
-			if (dstFile.exists()) {
-				dstFile.setContents(stream, true, true, monitor);
-			} else {
-				dstFile.create(stream, true, monitor);
-			}
-			stream.close();
-
-		} catch (final IOException e) {
-		}
-	}
-
-	protected void copyFile(String fileName, InputStream input, IContainer dst,
-		final String destPath, IProgressMonitor monitor)
-		throws CoreException {
-		String targetFileName = null;
-		if (destPath == null) {
-			targetFileName = getProcessedString(fileName, fileName);
-		} else {
-			targetFileName = destPath;
-		}
-
-		monitor.subTask(targetFileName);
-		final IFile dstFile = dst.getFile(new Path(targetFileName));
-
-		try {
-			final InputStream stream = isBinary(fileName) ? input
-				: getProcessedStream(fileName, input);
-			if (dstFile.exists()) {
-				dstFile.setContents(stream, true, true, monitor);
-			} else {
-				dstFile.create(stream, true, monitor);
-			}
-			stream.close();
-
-		} catch (final IOException e) {
-		}
-	}
-
-	/**
-	 *
-	 * @param fileName
-	 * @param input
-	 * @param dst
-	 * @param basePath
-	 * @param monitor
-	 * @throws CoreException
-	 */
-	public void copyFile(String fileName, InputStream input, IContainer dst,
-		final String basePath, final String destName,
-		IProgressMonitor monitor) throws CoreException {
-		if (basePath == null || basePath.equals("")) { //$NON-NLS-1$
-			copyFile(fileName, input, dst, monitor);
-		}
-
-		final String targetFileName = destName == null ? getProcessedString(fileName,
-			fileName) : destName;
-
-		monitor.subTask(targetFileName);
-		final IFile dstFile = dst.getFile(new Path(basePath + targetFileName));
-
-		try {
-			final InputStream stream = isBinary(fileName) ? input
-				: getProcessedStream(fileName, input);
-			if (dstFile.exists()) {
-				dstFile.setContents(stream, true, true, monitor);
-			} else {
-				dstFile.create(stream, true, monitor);
-			}
-			stream.close();
-
-		} catch (final IOException e) {
-		}
-	}
-
-	private boolean isBinary(String fileName) {
-		if (binaryExtentions == null) {
-			return false;
-		}
-
-		final String ext = getfileExtention(fileName);
-		if (ext == null) {
-			return false;
-		}
-		return binaryExtentions.contains(ext);
-	}
-
-	private String getfileExtention(String name) {
-		final int indexOf = name.lastIndexOf('.');
-		if (indexOf == -1) {
-			return null;
-		}
-		return name.substring(indexOf);
-	}
-
-	private InputStream getProcessedStream(String fileName, InputStream stream)
-		throws IOException, CoreException {
-		final InputStreamReader reader = new InputStreamReader(stream);
-		final int bufsize = 1024;
-		final char[] cbuffer = new char[bufsize];
-		int read = 0;
-		final StringBuffer keyBuffer = new StringBuffer();
-		final StringBuffer outBuffer = new StringBuffer();
-
-		boolean replacementMode = false;
-		boolean almostReplacementMode = false;
-		boolean escape = false;
-		while (read != -1) {
-			read = reader.read(cbuffer);
-			for (int i = 0; i < read; i++) {
-				final char c = cbuffer[i];
-
-				if (escape) {
-					final StringBuffer buf = outBuffer;
-					buf.append(c);
-					escape = false;
-					continue;
-				}
-
-				if (c == '@') {
-					if (replacementMode && almostReplacementMode) {
-						almostReplacementMode = false;
-					} else if (replacementMode) {
-						replacementMode = false;
-						final String key = keyBuffer.toString();
-						final String value = key.length() == 0 ? "@@" //$NON-NLS-1$
-							: getReplacementString(key);
-						outBuffer.append(value);
-						keyBuffer.delete(0, keyBuffer.length());
-					} else if (almostReplacementMode) {
-						replacementMode = true;
-					} else {
-						almostReplacementMode = true;
-					}
-				} else {
-					if (replacementMode) {
-						keyBuffer.append(c);
-					} else {
-						if (almostReplacementMode) {
-							outBuffer.append('@');
-						}
-						outBuffer.append(c);
-						almostReplacementMode = false;
-					}
-				}
-			}
-		}
-		return new ByteArrayInputStream(outBuffer.toString().getBytes());
-		// return new
-		// ByteArrayInputStream(outBuffer.toString().getBytes(project.
-		// getDefaultCharset()));
-	}
-
-	private String getProcessedString(String fileName, String source) {
-		if (source.indexOf('$') == -1) {
-			return source;
-		}
-		int loc = -1;
-		final StringBuffer buffer = new StringBuffer();
-		boolean replacementMode = false;
-		for (int i = 0; i < source.length(); i++) {
-			final char c = source.charAt(i);
-			if (c == '$') {
-				if (replacementMode) {
-					final String key = source.substring(loc, i);
-					final String value = key.length() == 0 ? "$" : getReplacementString(key); //$NON-NLS-1$
-					buffer.append(value);
-					replacementMode = false;
-				} else {
-					replacementMode = true;
-					loc = i + 1;
-					continue;
-				}
-			} else if (!replacementMode) {
-				buffer.append(c);
-			}
-		}
-		return buffer.toString();
-	}
-
-	public String getReplacementString(String key) {
-		final String result = keys.get(key);
-		return result != null ? result : key;
-	}
-
-	@Override
-	public Object getValue(String variable) {
-		return getReplacementString(variable);
-	}
-
-}
diff --git a/bundles/org.eclipse.e4.tools/templates/E4LifeCycle.java b/bundles/org.eclipse.e4.tools/templates/E4LifeCycle.java
deleted file mode 100644
index eb63e04f38..0000000000
--- a/bundles/org.eclipse.e4.tools/templates/E4LifeCycle.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Steven Spungin <steven@spungin.tv> - initial API and implementation
- *******************************************************************************/
-@@PACKAGE_DECLARATION@@
-
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.ui.workbench.lifecycle.PostContextCreate;
-import org.eclipse.e4.ui.workbench.lifecycle.PreSave;
-import org.eclipse.e4.ui.workbench.lifecycle.ProcessAdditions;
-import org.eclipse.e4.ui.workbench.lifecycle.ProcessRemovals;
-
-/**
- * This is a stub implementation containing e4 LifeCycle annotated methods.<br />
- * There is a corresponding entry in <em>plugin.xml</em> (under the
- * <em>org.eclipse.core.runtime.products' extension point</em>) that references
- * this class.
- **/
-@SuppressWarnings("restriction")
-public class @@CLASS_NAME@@ {
-
-	@PostContextCreate
-	void postContextCreate(IEclipseContext workbenchContext) {
-	}
-
-	@PreSave
-	void preSave(IEclipseContext workbenchContext) {
-	}
-
-	@ProcessAdditions
-	void processAdditions(IEclipseContext workbenchContext) {
-	}
-
-	@ProcessRemovals
-	void processRemovals(IEclipseContext workbenchContext) {
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools/templates/css/default.css b/bundles/org.eclipse.e4.tools/templates/css/default.css
deleted file mode 100644
index e69de29bb2..0000000000

From 1baef15c14c9b10cb2b776fc36642006a72b3cc6 Mon Sep 17 00:00:00 2001
From: Jonas Helming <jonas.helming@googlemail.com>
Date: Mon, 27 Jul 2015 16:28:32 +0200
Subject: [PATCH 0908/1286] [e4 Tools] Extract into fragment wizard creates
 mutiple imports for the same element

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

Change-Id: I265ec3b873e184913844095307d81c2b2e04080c

Change-Id: I1efa2e955b0379a8f51b5028cd13b8f9d69b8a1b
Signed-off-by: Jonas Helming <jonas.helming@googlemail.com>
---
 .../wizards/model/FragmentExtractHelper.java  | 37 ++++++----
 .../tools/test/FragmentExtractHelperTest.java | 74 +++++++++++++++++--
 2 files changed, 88 insertions(+), 23 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
index ac952b1814..ccda03976d 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
@@ -13,6 +13,8 @@
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
@@ -36,11 +38,10 @@ public class FragmentExtractHelper {
 	 *
 	 * @param moe
 	 *            elements to resolved referenced commands for
-	 * @param mModelFragments
-	 *            the target {@link MModelFragments}
+	 * @param importCommands
+	 *            already imported Commands
 	 */
-	public static void resolveCommandImports(MApplicationElement moe, MModelFragments mModelFragments) {
-		final HashMap<String, MCommand> importCommands = new HashMap<String, MCommand>();
+	public static void resolveCommandImports(MApplicationElement moe, Map<MCommand, MCommand> importCommands) {
 		if (moe instanceof MHandler) {
 
 			final MHandler mhandler = (MHandler) moe;
@@ -48,12 +49,12 @@ public static void resolveCommandImports(MApplicationElement moe, MModelFragment
 			if (command == null) {
 				return;
 			}
-			final MCommand existImportCommand = importCommands.get(command.getElementId());
+			final MCommand existImportCommand = importCommands.get(command);
 			if (existImportCommand == null) {
 				final MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject) command);
 				mhandler.setCommand((MCommand) copy);
-				importCommands.put(copy.getElementId(), (MCommand) copy);
-				mModelFragments.getImports().add(copy);
+				importCommands.put(command, (MCommand) copy);
+
 			} else {
 				mhandler.setCommand(existImportCommand);
 			}
@@ -63,12 +64,11 @@ public static void resolveCommandImports(MApplicationElement moe, MModelFragment
 			if (command == null) {
 				return;
 			}
-			final MCommand existImportCommand = importCommands.get(command.getElementId());
+			final MCommand existImportCommand = importCommands.get(command);
 			if (existImportCommand == null) {
 				final MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject) command);
 				mh.setCommand((MCommand) copy);
-				importCommands.put(copy.getElementId(), command);
-				mModelFragments.getImports().add(copy);
+				importCommands.put(command, (MCommand) copy);
 			} else {
 				mh.setCommand(existImportCommand);
 			}
@@ -80,17 +80,18 @@ public static void resolveCommandImports(MApplicationElement moe, MModelFragment
 	 *            the {@link MApplicationElement}s to be extracted
 	 */
 	public static MModelFragments createInitialModel(List<MApplicationElement> extractedElements) {
-		final MModelFragments createModelFragments = MFragmentFactory.INSTANCE.createModelFragments();
+		final MModelFragments mModelFragments = MFragmentFactory.INSTANCE.createModelFragments();
+		final HashMap<MCommand, MCommand> importCommands = new HashMap<MCommand, MCommand>();
 		for (final MApplicationElement moe : extractedElements) {
 			final EObject eObject = (EObject) moe;
 			final TreeIterator<EObject> eAllContents = eObject.eAllContents();
 			boolean hasNext = eAllContents.hasNext();
 			if (!hasNext) {
-				FragmentExtractHelper.resolveCommandImports(moe, createModelFragments);
+				FragmentExtractHelper.resolveCommandImports(moe, importCommands);
 			}
 			while (hasNext) {
 				final MApplicationElement next = (MApplicationElement) eAllContents.next();
-				FragmentExtractHelper.resolveCommandImports(next, createModelFragments);
+				FragmentExtractHelper.resolveCommandImports(next, importCommands);
 				hasNext = eAllContents.hasNext();
 			}
 			final MStringModelFragment createStringModelFragment = MFragmentFactory.INSTANCE
@@ -102,9 +103,15 @@ public static MModelFragments createInitialModel(List<MApplicationElement> extra
 			createStringModelFragment.getElements().add(e);
 			createStringModelFragment.setFeaturename(featurename);
 
-			createModelFragments.getFragments().add(createStringModelFragment);
+			mModelFragments.getFragments().add(createStringModelFragment);
+		}
+
+		final Set<MCommand> keySet = importCommands.keySet();
+		for (final MCommand key : keySet) {
+			mModelFragments.getImports().add(importCommands.get(key));
 		}
-		return createModelFragments;
+
+		return mModelFragments;
 	}
 
 }
diff --git a/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java b/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
index f9d9604d0a..1929358d3d 100644
--- a/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
+++ b/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
@@ -16,6 +16,7 @@
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 
 import org.eclipse.e4.internal.tools.wizards.model.FragmentExtractHelper;
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -32,6 +33,8 @@
 import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.fragment.MModelFragment;
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
@@ -283,10 +286,62 @@ private void createHandler2() {
 
 	}
 
+	@Test
+	/**
+	 * Test for BR 470999
+	 */
+	public void testExtractResolveCommandsWithTwoHandlerWithSameCommand() {
+		createHandler();
+		createHandler2();
+		final MCommand command = createCommandLinkedWithHandler(handler1);
+		handler2.setCommand(command);
+		final HashMap<MCommand, MCommand> importCommands = new HashMap<MCommand, MCommand>();
+
+		FragmentExtractHelper.resolveCommandImports(handler1, importCommands);
+		FragmentExtractHelper.resolveCommandImports(handler2, importCommands);
+
+		assertEquals(1, importCommands.size());
+		final MCommand resolvedCommand = importCommands.values().iterator().next();
+		assertSame(resolvedCommand, handler1.getCommand());
+		assertSame(resolvedCommand, handler2.getCommand());
+	}
+
+	@Test
+	/**
+	 * Test for BR 470999
+	 */
+	public void testExtractResolveCommandsWithTwoHandledItemsWithSameCommand() {
+		final MHandledItem handledItem1 = createHandledItem();
+		final MHandledItem handledItem2 = createHandledItem();
+		final MCommand command = createCommand();
+		handledItem1.setCommand(command);
+		handledItem2.setCommand(command);
+		final HashMap<MCommand, MCommand> importCommands = new HashMap<MCommand, MCommand>();
+
+		FragmentExtractHelper.resolveCommandImports(handledItem1, importCommands);
+		FragmentExtractHelper.resolveCommandImports(handledItem2, importCommands);
+
+		assertEquals(1, importCommands.size());
+		final MCommand resolvedCommand = importCommands.values().iterator().next();
+		assertSame(resolvedCommand, handledItem1.getCommand());
+		assertSame(resolvedCommand, handledItem2.getCommand());
+	}
+
+	/**
+	 * @return
+	 *
+	 */
+	private MHandledItem createHandledItem() {
+		final MHandledItem handledItem = MMenuFactory.INSTANCE.createHandledMenuItem();
+		handledItem.setElementId(HANDLER1ID);
+		application.getSnippets().add(handledItem);
+		return handledItem;
+	}
+
 	@Test
 	@Ignore
 	/**
-	 * Test for BR 470998 and 470999, ignored until it is fixed
+	 * Test for BR 470998, ignored until it is fixed
 	 */
 	public void testExtractTwoHandlerWithSameCommand() {
 		createHandler();
@@ -297,17 +352,20 @@ public void testExtractTwoHandlerWithSameCommand() {
 		elementsToExtract.add(handler1);
 		elementsToExtract.add(handler2);
 		final MModelFragments initialModel = FragmentExtractHelper.createInitialModel(elementsToExtract);
-		assertEquals(2, initialModel.getFragments().size());
+		assertEquals(1, initialModel.getFragments().size());
 		assertEquals(1, initialModel.getImports().size());
 		final MModelFragment modelFragment = initialModel.getFragments().get(0);
 		assertEquals(1, modelFragment.getElements().size());
-		final MModelFragment modelFragment2 = initialModel.getFragments().get(0);
-		assertEquals(1, modelFragment2.getElements().size());
 
-		assertTrue(initialModel.getImports().contains(((MHandler) modelFragment.getElements().get(0)).getCommand()));
-		assertTrue(initialModel.getImports().contains(((MHandler) modelFragment2.getElements().get(0)).getCommand()));
-		assertExtractedElement(handler1, modelFragment.getElements().get(0));
-		assertExtractedElement(handler2, modelFragment.getElements().get(1));
+		final MCommand importedCommand = (MCommand) initialModel.getImports().get(0);
+		final MHandler importedHandler1 = (MHandler) modelFragment.getElements().get(0);
+		final MHandler importedHandler2 = (MHandler) modelFragment.getElements().get(1);
+
+		assertSame(importedCommand, importedHandler1.getCommand());
+		assertSame(importedCommand, importedHandler2.getCommand());
+
+		assertExtractedElement(handler1, importedHandler1);
+		assertExtractedElement(handler2, importedHandler2);
 		assertExtractedImport(command, initialModel.getImports().get(0));
 	}
 

From 30f0222f5f35a6451cdb964d96d3807e05ade9e9 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 30 Jul 2015 21:06:22 +0200
Subject: [PATCH 0909/1286] Bug 473159 - org.eclipse.e4.tools.emf.ui causes 234
 compile warnings in official build

Change-Id: I8c5a42ea06b31b6e76efb5f4260a3b6869a85390
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml | 26 +++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 714eee2566..839db4f0d6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -1,4 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2015 vogella GmbH and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+
+  Contributors:
+     Lars Vogel <Lars.Vogel@vogella.com> - initial implementation
+     Lars Vogel <Lars.Vogel@vogella.com> - Bug 473159
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -13,4 +24,19 @@
   <version>4.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-compiler-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <compilerArgs>
+            <arg>-warn:-raw,unchecked</arg>
+          </compilerArgs>
+        </configuration>
+      </plugin>
+    </plugins>
+ </build> 
+  
 </project>

From 3fad052212193d6267f47ae10508a6f570d33b83 Mon Sep 17 00:00:00 2001
From: Jonas Helming <jonas.helming@googlemail.com>
Date: Fri, 31 Jul 2015 15:49:28 +0200
Subject: [PATCH 0910/1286] Bug 474037 - [e4 Tools] Extract fragment should
 import all cross references

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

Change-Id: Ib955f362aacf84139e35e1d8db18aa1789600644

Change-Id: Ib955f362aacf84139e35e1d8db18aa1789600644
Signed-off-by: Jonas Helming <jonas.helming@googlemail.com>
---
 .../wizards/model/FragmentExtractHelper.java  | 69 ++++++++-----------
 .../tools/test/FragmentExtractHelperTest.java | 52 +++++++++++---
 2 files changed, 71 insertions(+), 50 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
index ccda03976d..638a77b70e 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
@@ -17,18 +17,18 @@
 import java.util.Set;
 
 import org.eclipse.e4.ui.model.application.MApplicationElement;
-import org.eclipse.e4.ui.model.application.commands.MCommand;
-import org.eclipse.e4.ui.model.application.commands.MHandler;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.util.EContentsEList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 
 /**
- * @author Jonas
+ * @author Jonas Helming
  *
  */
 public class FragmentExtractHelper {
@@ -38,41 +38,32 @@ public class FragmentExtractHelper {
 	 *
 	 * @param moe
 	 *            elements to resolved referenced commands for
-	 * @param importCommands
-	 *            already imported Commands
+	 * @param importedElements
+	 *            already imported Elements
 	 */
-	public static void resolveCommandImports(MApplicationElement moe, Map<MCommand, MCommand> importCommands) {
-		if (moe instanceof MHandler) {
-
-			final MHandler mhandler = (MHandler) moe;
-			final MCommand command = ((MHandler) moe).getCommand();
-			if (command == null) {
-				return;
-			}
-			final MCommand existImportCommand = importCommands.get(command);
-			if (existImportCommand == null) {
-				final MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject) command);
-				mhandler.setCommand((MCommand) copy);
-				importCommands.put(command, (MCommand) copy);
-
-			} else {
-				mhandler.setCommand(existImportCommand);
-			}
-		} else if (moe instanceof MHandledItem) {
-			final MHandledItem mh = (MHandledItem) moe;
-			final MCommand command = mh.getCommand();
-			if (command == null) {
-				return;
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public static void resolveImports(MApplicationElement moe, Map<MApplicationElement, MApplicationElement> importedElements) {
+		final EObject element = (EObject)moe;
+		for (final EContentsEList.FeatureIterator featureIterator =
+				(EContentsEList.FeatureIterator)element.eCrossReferences().iterator();
+				featureIterator.hasNext(); )
+		{
+			final EObject objectToBeImported = (EObject) featureIterator.next();
+			final EReference eReference = (EReference)featureIterator.feature();
+			MApplicationElement alreadyImportedElement = importedElements.get(objectToBeImported);
+			if(alreadyImportedElement==null){
+				alreadyImportedElement = (MApplicationElement) EcoreUtil.copy(objectToBeImported);
+				importedElements.put((MApplicationElement) objectToBeImported, alreadyImportedElement);
 			}
-			final MCommand existImportCommand = importCommands.get(command);
-			if (existImportCommand == null) {
-				final MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject) command);
-				mh.setCommand((MCommand) copy);
-				importCommands.put(command, (MCommand) copy);
+			if (eReference.isMany()) {
+				final EList<EObject> ref = (EList<EObject>) element.eGet(eReference);
+				ref.remove(objectToBeImported);
+				ref.add((EObject) alreadyImportedElement);
 			} else {
-				mh.setCommand(existImportCommand);
+				element.eSet(eReference, alreadyImportedElement);
 			}
 		}
+
 	}
 
 	/**
@@ -81,17 +72,17 @@ public static void resolveCommandImports(MApplicationElement moe, Map<MCommand,
 	 */
 	public static MModelFragments createInitialModel(List<MApplicationElement> extractedElements) {
 		final MModelFragments mModelFragments = MFragmentFactory.INSTANCE.createModelFragments();
-		final HashMap<MCommand, MCommand> importCommands = new HashMap<MCommand, MCommand>();
+		final HashMap<MApplicationElement, MApplicationElement> importCommands = new HashMap<MApplicationElement, MApplicationElement>();
 		for (final MApplicationElement moe : extractedElements) {
 			final EObject eObject = (EObject) moe;
 			final TreeIterator<EObject> eAllContents = eObject.eAllContents();
 			boolean hasNext = eAllContents.hasNext();
 			if (!hasNext) {
-				FragmentExtractHelper.resolveCommandImports(moe, importCommands);
+				FragmentExtractHelper.resolveImports(moe, importCommands);
 			}
 			while (hasNext) {
 				final MApplicationElement next = (MApplicationElement) eAllContents.next();
-				FragmentExtractHelper.resolveCommandImports(next, importCommands);
+				FragmentExtractHelper.resolveImports(next, importCommands);
 				hasNext = eAllContents.hasNext();
 			}
 			final MStringModelFragment createStringModelFragment = MFragmentFactory.INSTANCE
@@ -106,8 +97,8 @@ public static MModelFragments createInitialModel(List<MApplicationElement> extra
 			mModelFragments.getFragments().add(createStringModelFragment);
 		}
 
-		final Set<MCommand> keySet = importCommands.keySet();
-		for (final MCommand key : keySet) {
+		final Set<MApplicationElement> keySet = importCommands.keySet();
+		for (final MApplicationElement key : keySet) {
 			mModelFragments.getImports().add(importCommands.get(key));
 		}
 
diff --git a/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java b/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
index 1929358d3d..cca29bffd0 100644
--- a/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
+++ b/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
@@ -22,6 +22,7 @@
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.commands.MBindingContext;
 import org.eclipse.e4.ui.model.application.commands.MCategory;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
@@ -100,7 +101,6 @@ private void assertExtractedElement(MApplicationElement originalElement, MApplic
 	}
 
 	@Test
-	@Ignore
 	/**
 	 * Test for BR 405159, ignored until it is fixed
 	 */
@@ -132,7 +132,6 @@ private void createWindowWithPlaceHolder() {
 	}
 
 	@Test
-	@Ignore
 	/**
 	 * Test for BR 446206, ignored until it is fixed
 	 */
@@ -150,7 +149,7 @@ public void testExtractCommandWithCategory() {
 		final MCommand extractedCommand = (MCommand) modelFragment.getElements().get(0);
 		assertSame(importedCategory, extractedCommand.getCategory());
 		assertExtractedElement(command, modelFragment.getElements().get(0));
-		assertExtractedElement(category, initialModel.getImports().get(0));
+		assertExtractedImport(category, initialModel.getImports().get(0));
 	}
 
 	private MCategory createCategoryForCommand(MCommand command) {
@@ -295,13 +294,13 @@ public void testExtractResolveCommandsWithTwoHandlerWithSameCommand() {
 		createHandler2();
 		final MCommand command = createCommandLinkedWithHandler(handler1);
 		handler2.setCommand(command);
-		final HashMap<MCommand, MCommand> importCommands = new HashMap<MCommand, MCommand>();
+		final HashMap<MApplicationElement, MApplicationElement> importCommands = new HashMap<MApplicationElement, MApplicationElement>();
 
-		FragmentExtractHelper.resolveCommandImports(handler1, importCommands);
-		FragmentExtractHelper.resolveCommandImports(handler2, importCommands);
+		FragmentExtractHelper.resolveImports(handler1, importCommands);
+		FragmentExtractHelper.resolveImports(handler2, importCommands);
 
 		assertEquals(1, importCommands.size());
-		final MCommand resolvedCommand = importCommands.values().iterator().next();
+		final MApplicationElement resolvedCommand = importCommands.values().iterator().next();
 		assertSame(resolvedCommand, handler1.getCommand());
 		assertSame(resolvedCommand, handler2.getCommand());
 	}
@@ -316,17 +315,48 @@ public void testExtractResolveCommandsWithTwoHandledItemsWithSameCommand() {
 		final MCommand command = createCommand();
 		handledItem1.setCommand(command);
 		handledItem2.setCommand(command);
-		final HashMap<MCommand, MCommand> importCommands = new HashMap<MCommand, MCommand>();
+		final HashMap<MApplicationElement, MApplicationElement> importCommands = new HashMap<MApplicationElement, MApplicationElement>();
 
-		FragmentExtractHelper.resolveCommandImports(handledItem1, importCommands);
-		FragmentExtractHelper.resolveCommandImports(handledItem2, importCommands);
+		FragmentExtractHelper.resolveImports(handledItem1, importCommands);
+		FragmentExtractHelper.resolveImports(handledItem2, importCommands);
 
 		assertEquals(1, importCommands.size());
-		final MCommand resolvedCommand = importCommands.values().iterator().next();
+		final MApplicationElement resolvedCommand = importCommands.values().iterator().next();
 		assertSame(resolvedCommand, handledItem1.getCommand());
 		assertSame(resolvedCommand, handledItem2.getCommand());
 	}
 
+	@Test
+	/**
+	 * Test for referenced BindingContexts BR 474037
+	 */
+	public void testExtractTwoPartsWithTwoBindingContexts() {
+		final MBindingContext bindingContext1 = MCommandsFactory.INSTANCE.createBindingContext();
+		final MBindingContext bindingContext2 = MCommandsFactory.INSTANCE.createBindingContext();
+
+		final MPart part = MBasicFactory.INSTANCE.createPart();
+		part.getBindingContexts().add(bindingContext1);
+		part.getBindingContexts().add(bindingContext2);
+
+		final MPart part2 = MBasicFactory.INSTANCE.createPart();
+		part2.getBindingContexts().add(bindingContext1);
+
+
+		final HashMap<MApplicationElement, MApplicationElement> importCommands = new HashMap<MApplicationElement, MApplicationElement>();
+
+		FragmentExtractHelper.resolveImports(part, importCommands);
+		FragmentExtractHelper.resolveImports(part2, importCommands);
+
+		assertEquals(2, importCommands.size());
+		final MApplicationElement resolvedBindingContext = importCommands.values().iterator().next();
+		final MApplicationElement resolvedBindingContext2 = importCommands.values().iterator().next();
+		assertTrue(part.getBindingContexts().contains(resolvedBindingContext));
+		assertTrue(part.getBindingContexts().contains(resolvedBindingContext2));
+		assertTrue(part2.getBindingContexts().contains(resolvedBindingContext));
+		assertEquals(2, part.getBindingContexts().size());
+		assertEquals(1, part2.getBindingContexts().size());
+	}
+
 	/**
 	 * @return
 	 *

From 82136708dd6f8b353f9c0ef82fc94a925fdf293c Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 31 Jul 2015 19:45:42 +0200
Subject: [PATCH 0911/1286] Bug 474060 - Use @Override for methods for
 interfaces in eclipse.platform.ui.tools

Change-Id: I0b339915aaae7297f619811e498a8fc2d212f5a6
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.emf.editor3x/.classpath        | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                    | 6 +++---
 .../org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF  | 2 +-
 bundles/org.eclipse.e4.tools.services/.classpath            | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                    | 6 +++---
 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF  | 2 +-
 bundles/org.eclipse.e4.tools/.classpath                     | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                    | 6 +++---
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF           | 2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath b/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
index ad32c83a78..e8ea977a69 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
@@ -1,7 +1,7 @@
 <?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/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
index afdb83e715..8c571a4b6d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
@@ -25,9 +25,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -130,7 +130,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 94e8366bed..29f1835af2 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
 Bundle-Version: 4.5.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.emf.common;bundle-version="2.6.0",
diff --git a/bundles/org.eclipse.e4.tools.services/.classpath b/bundles/org.eclipse.e4.tools.services/.classpath
index ad32c83a78..e8ea977a69 100644
--- a/bundles/org.eclipse.e4.tools.services/.classpath
+++ b/bundles/org.eclipse.e4.tools.services/.classpath
@@ -1,7 +1,7 @@
 <?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/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
index afdb83e715..8c571a4b6d 100644
--- a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
@@ -25,9 +25,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -130,7 +130,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 7760448758..a72088e3e3 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
 Bundle-Version: 4.5.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.emf.ui",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
 Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.e4.tools/.classpath b/bundles/org.eclipse.e4.tools/.classpath
index ad32c83a78..e8ea977a69 100644
--- a/bundles/org.eclipse.e4.tools/.classpath
+++ b/bundles/org.eclipse.e4.tools/.classpath
@@ -1,7 +1,7 @@
 <?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/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
index afdb83e715..8c571a4b6d 100644
--- a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
@@ -25,9 +25,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -130,7 +130,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index c655e8459b..8f5ac8c033 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
 Bundle-Version: 4.5.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",

From 99729535594beb64b94dfa81a3fb15ad388795cb Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 31 Jul 2015 19:50:02 +0200
Subject: [PATCH 0912/1286] Bug 474059 - Remove redundant type arguments (1.7
 or highter) in eclipse.platform.ui.tools

Change-Id: I0a9e730b947d30f05654d438ad4ce5b157464e5f
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../.settings/org.eclipse.jdt.core.prefs      |  2 +-
 .../ReflectionContributionFactory.java        |  2 +-
 .../compat/internal/WorkbenchLogger.java      |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  3 +-
 .../e4/tools/emf/editor3x/RefactorModel.java  |  4 +--
 .../editor3x/RefactorParticipantDelegate.java |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  3 +-
 .../eclipse/e4/tools/emf/ui/common/Util.java  | 10 +++----
 .../tools/emf/ui/common/XMIModelResource.java |  6 ++--
 .../tools/emf/ui/internal/StringMatcher.java  |  2 +-
 .../common/ClassContributionCollector.java    |  4 +--
 .../emf/ui/internal/common/ModelEditor.java   | 30 +++++++++----------
 .../emf/ui/internal/common/TreeViewerEx.java  |  8 ++---
 .../emf/ui/internal/common/VirtualEntry.java  |  2 +-
 .../common/component/ApplicationEditor.java   |  8 ++---
 .../internal/common/component/AreaEditor.java |  4 +--
 .../component/BindingContextEditor.java       |  4 +--
 .../common/component/BindingTableEditor.java  |  4 +--
 .../common/component/CommandEditor.java       |  4 +--
 .../common/component/CompositePartEditor.java | 10 +++----
 .../common/component/DialogEditor.java        |  2 +-
 .../common/component/KeyBindingEditor.java    |  4 +--
 .../component/MenuContributionEditor.java     |  4 +--
 .../internal/common/component/MenuEditor.java |  6 ++--
 .../common/component/MenuItemEditor.java      |  4 +--
 .../component/ModelFragmentsEditor.java       |  2 +-
 .../component/PartSashContainerEditor.java    | 10 +++----
 .../common/component/PartStackEditor.java     | 10 +++----
 .../common/component/PerspectiveEditor.java   |  4 +--
 .../component/PerspectiveStackEditor.java     |  8 ++---
 .../common/component/StringModelFragment.java |  8 ++---
 .../component/ToolBarContributionEditor.java  |  4 +--
 .../common/component/ToolBarEditor.java       |  4 +--
 .../common/component/ToolItemEditor.java      |  2 +-
 .../common/component/TrimBarEditor.java       |  4 +--
 .../component/TrimContributionEditor.java     |  4 +--
 .../UnsettableUpdateValueStrategy.java        |  2 +-
 .../common/component/WindowEditor.java        |  2 +-
 .../common/component/WizardDialogEditor.java  |  2 +-
 .../AbstractCommandSelectionDialog.java       |  2 +-
 .../AbstractIconDialogWithScopeAndFilter.java |  2 +-
 .../BindingContextSelectionDialog.java        |  2 +-
 .../component/dialogs/BundleImageCache.java   |  2 +-
 .../CommandCategorySelectionDialog.java       |  2 +-
 .../component/dialogs/ExpressionIdDialog.java |  2 +-
 .../dialogs/FeatureSelectionDialog.java       |  2 +-
 .../dialogs/FilteredContributionDialog.java   | 14 ++++-----
 .../FindParentReferenceElementDialog.java     |  4 +--
 .../component/dialogs/MenuIdDialog.java       |  2 +-
 .../dialogs/ParameterIdSelectionDialog.java   |  4 +--
 .../dialogs/SharedElementsDialog.java         |  6 ++--
 .../component/dialogs/ToolBarIdDialog.java    |  2 +-
 .../component/dialogs/TrimIdDialog.java       |  2 +-
 .../common/component/tabs/E4ToolItemMenu.java |  2 +-
 .../common/component/tabs/ListTab.java        | 26 ++++++++--------
 .../tabs/ModelResourceContentProvider.java    |  2 +-
 .../component/tabs/TableViewerUtil.java       |  2 +-
 .../component/virtual/VApplicationAddons.java |  4 +--
 .../virtual/VApplicationCategoriesEditor.java |  8 ++---
 .../virtual/VBindingTableEditor.java          |  4 +--
 .../component/virtual/VCommandEditor.java     |  8 ++---
 .../component/virtual/VHandlerEditor.java     |  8 ++---
 .../virtual/VItemParametersEditor.java        |  4 +--
 .../virtual/VMenuContributionsEditor.java     |  4 +--
 .../common/component/virtual/VMenuEditor.java |  4 +--
 .../virtual/VModelFragmentsEditor.java        |  4 +--
 .../virtual/VModelImportsEditor.java          |  2 +-
 .../component/virtual/VPartDescriptor.java    |  8 ++---
 .../virtual/VPerspectiveControlEditor.java    |  4 +--
 .../virtual/VRootBindingContexts.java         |  4 +--
 .../component/virtual/VSnippetsEditor.java    |  4 +--
 .../virtual/VToolBarContributionsEditor.java  |  4 +--
 .../virtual/VTrimContributionsEditor.java     |  4 +--
 .../virtual/VWindowControlEditor.java         |  4 +--
 .../component/virtual/VWindowEditor.java      |  4 +--
 .../virtual/VWindowSharedElementsEditor.java  |  8 ++---
 .../component/virtual/VWindowTrimEditor.java  |  4 +--
 .../common/objectdata/JavaObject.java         |  2 +-
 .../common/properties/ExportIdsHandler.java   |  2 +-
 .../properties/ExternalizeStringHandler.java  |  6 ++--
 .../properties/ResourceBundleEntry.java       |  2 +-
 .../TargetPlatformContributionCollector.java  | 18 +++++------
 .../dialogs/DynamicWizard.java                |  2 +-
 .../dialogs/ProjectFolderPickerDialog.java    |  2 +-
 .../xml/EMFDocumentResourceMediator.java      |  2 +-
 .../MarkDuplicateAttributesHandler.java       |  2 +-
 .../handlers/MarkDuplicateItemsBase.java      |  6 ++--
 .../handlers/RepairDuplicateItemsHandler.java |  4 +--
 .../emf/ui/internal/imp/ModelImportPage1.java |  2 +-
 .../emf/ui/internal/imp/RegistryUtil.java     | 24 +++++++--------
 .../.settings/org.eclipse.jdt.core.prefs      |  3 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  3 +-
 .../services/ToolsServicesActivator.java      |  4 +--
 .../tools/services/impl/ResourceService.java  | 16 +++++-----
 .../.settings/org.eclipse.jdt.core.prefs      |  3 +-
 .../classes/AbstractNewClassWizard.java       |  8 ++---
 .../model/BaseApplicationModelWizard.java     |  2 +-
 .../model/ExtractContributionModelWizard.java |  2 +-
 .../wizards/model/FragmentExtractHelper.java  |  2 +-
 .../wizards/model/FragmentMergeHelper.java    |  2 +-
 100 files changed, 251 insertions(+), 246 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
index 06688e97f4..3bb010ec9d 100644
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
@@ -96,7 +96,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
index c473d72550..7950536089 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
@@ -133,7 +133,7 @@ protected Object createFromBundle(Bundle bundle, IEclipseContext context,
 	}
 
 	protected void processLanguages() {
-		languages = new HashMap<String, Object>();
+		languages = new HashMap<>();
 		final String extId = "org.eclipse.e4.languages"; //$NON-NLS-1$
 		final IConfigurationElement[] languageElements = registry.getConfigurationElementsFor(extId);
 		for (int i = 0; i < languageElements.length; i++) {
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
index 3806c8d0cc..ebbc4e3064 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
@@ -52,7 +52,7 @@ public void error(Throwable t, String message) {
 	 */
 	private static FrameworkLogEntry getLog(IStatus status) {
 		final Throwable t = status.getException();
-		final ArrayList<FrameworkLogEntry> childlist = new ArrayList<FrameworkLogEntry>();
+		final ArrayList<FrameworkLogEntry> childlist = new ArrayList<>();
 
 		final int stackCode = t instanceof CoreException ? 1 : 0;
 		// ensure a substatus inside a CoreException is properly logged
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
index 8c571a4b6d..cd32e5711d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
@@ -95,7 +95,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
@@ -118,6 +118,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
index 05cfa68f5f..3bca6203eb 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
@@ -31,11 +31,11 @@ public class RefactorModel {
 
 	int fIndex = 0;
 	IProject fNewProject;
-	List<String> fNewTexts = new ArrayList<String>();
+	List<String> fNewTexts = new ArrayList<>();
 
 	IProject fOldProject;
 
-	List<String> fOldTexts = new ArrayList<String>();
+	List<String> fOldTexts = new ArrayList<>();
 
 	private RefactoringParticipant fParticipant;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
index faab30eb2a..d83c468ee1 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
@@ -57,7 +57,7 @@ public static CompositeChange createChange(
 		final FileTextSearchScope scope = FileTextSearchScope.newWorkspaceScope(
 			filenames, false);
 
-		final Map<IFile, TextFileChange> changes = new HashMap<IFile, TextFileChange>();
+		final Map<IFile, TextFileChange> changes = new HashMap<>();
 		final TextSearchRequestor searchRequestor = new TextSearchRequestor() {
 
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
index ccb396a6bf..ae6ceaa14a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -96,7 +96,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
@@ -119,6 +119,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index 755a77d8c1..cba1af0320 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -82,7 +82,7 @@ public static final String getDefaultElementId(Resource resource, MApplicationEl
 			final String prefix = (projectName + "." + className).toLowerCase(); //$NON-NLS-1$
 
 			final TreeIterator<EObject> it = resource.getAllContents();
-			final SortedSet<Integer> numbers = new TreeSet<Integer>();
+			final SortedSet<Integer> numbers = new TreeSet<>();
 
 			while (it.hasNext()) {
 				final EObject tmp = it.next();
@@ -118,7 +118,7 @@ public static final String getDefaultElementId(Resource resource, MApplicationEl
 	}
 
 	public static List<InternalPackage> loadPackages() {
-		final List<InternalPackage> packs = new ArrayList<InternalPackage>();
+		final List<InternalPackage> packs = new ArrayList<>();
 
 		for (final Entry<String, Object> regEntry : EPackage.Registry.INSTANCE.entrySet()) {
 			if (regEntry.getValue() instanceof EPackage) {
@@ -237,7 +237,7 @@ public void handleValueChange(ValueChangeEvent event) {
 
 	public static class InternalPackage {
 		public final EPackage ePackage;
-		public List<InternalClass> classes = new ArrayList<InternalClass>();
+		public List<InternalClass> classes = new ArrayList<>();
 
 		public InternalPackage(EPackage ePackage) {
 			this.ePackage = ePackage;
@@ -249,7 +249,7 @@ public String toString() {
 		}
 
 		public List<EClass> getAllClasses() {
-			final ArrayList<EClass> rv = new ArrayList<EClass>(classes.size());
+			final ArrayList<EClass> rv = new ArrayList<>(classes.size());
 			for (final InternalClass c : classes) {
 				rv.add(c.eClass);
 			}
@@ -260,7 +260,7 @@ public List<EClass> getAllClasses() {
 	public static class InternalClass {
 		public final InternalPackage pack;
 		public final EClass eClass;
-		public List<InternalFeature> features = new ArrayList<InternalFeature>();
+		public List<InternalFeature> features = new ArrayList<>();
 
 		public InternalClass(InternalPackage pack, EClass eClass) {
 			this.eClass = eClass;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
index caf35ad2f3..00772d6601 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
@@ -45,7 +45,7 @@
 public class XMIModelResource implements IModelResource {
 	private final EditingDomain editingDomain;
 	private final Resource resource;
-	private final List<ModelListener> listeners = new ArrayList<IModelResource.ModelListener>();
+	private final List<ModelListener> listeners = new ArrayList<>();
 
 	private IObservableList list;
 
@@ -84,7 +84,7 @@ public IObservableList getRoot() {
 	@Override
 	public void replaceRoot(EObject eObject) {
 		E4XMIResource resource = (E4XMIResource) eObject.eResource();
-		final Map<EObject, String> idMap = new HashMap<EObject, String>();
+		final Map<EObject, String> idMap = new HashMap<>();
 		idMap.put(eObject, resource.getID(eObject));
 
 		final TreeIterator<EObject> it = EcoreUtil.getAllContents(eObject, true);
@@ -145,7 +145,7 @@ private void fireCommandStackChanged() {
 
 	@Override
 	public IStatus save() {
-		final Map<String, String> map = new HashMap<String, String>();
+		final Map<String, String> map = new HashMap<>();
 		try {
 			resource.save(map);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
index 4187c6490e..3af8c8a223 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
@@ -300,7 +300,7 @@ private void parseWildCards() {
 			}
 		}
 
-		final Vector<String> temp = new Vector<String>();
+		final Vector<String> temp = new Vector<>();
 
 		int pos = 0;
 		final StringBuffer buf = new StringBuffer();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
index 6862765b12..801ffa5312 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
@@ -18,8 +18,8 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.ModelResultHandler;
 
 public class ClassContributionCollector {
-	private CopyOnWriteArrayList<IClassContributionProvider> providers = new CopyOnWriteArrayList<IClassContributionProvider>();
-	private CopyOnWriteArrayList<IModelElementProvider> modelElementProviders = new CopyOnWriteArrayList<IModelElementProvider>();
+	private CopyOnWriteArrayList<IClassContributionProvider> providers = new CopyOnWriteArrayList<>();
+	private CopyOnWriteArrayList<IModelElementProvider> modelElementProviders = new CopyOnWriteArrayList<>();
 
 	public void addContributor(IClassContributionProvider contributor) {
 		providers.add(contributor);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 386da632f0..782464aa14 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -278,12 +278,12 @@ public class ModelEditor implements IGotoObject {
 	public static final int TAB_XMI = 1;
 	public static final int TAB_LIST = 2;
 
-	private final Map<EClass, AbstractComponentEditor> editorMap = new HashMap<EClass, AbstractComponentEditor>();
-	private final Map<String, AbstractComponentEditor> virtualEditors = new HashMap<String, AbstractComponentEditor>();
-	private final Map<Class<?>, List<AbstractElementEditorContribution>> tabContributions = new HashMap<Class<?>, List<AbstractElementEditorContribution>>();
-	private final List<FeaturePath> labelFeaturePaths = new ArrayList<FeaturePath>();
-	private final List<IEditorFeature> editorFeatures = new ArrayList<IEditorFeature>();
-	private final List<IContributionClassCreator> contributionCreator = new ArrayList<IContributionClassCreator>();
+	private final Map<EClass, AbstractComponentEditor> editorMap = new HashMap<>();
+	private final Map<String, AbstractComponentEditor> virtualEditors = new HashMap<>();
+	private final Map<Class<?>, List<AbstractElementEditorContribution>> tabContributions = new HashMap<>();
+	private final List<FeaturePath> labelFeaturePaths = new ArrayList<>();
+	private final List<IEditorFeature> editorFeatures = new ArrayList<>();
+	private final List<IContributionClassCreator> contributionCreator = new ArrayList<>();
 
 	private TreeViewer viewer;
 	private final IModelResource modelProvider;
@@ -506,7 +506,7 @@ private void findAndHighlight(Control control) {
 			MApplicationElement m = findModelElement(control);
 			final MApplicationElement o = m;
 			if (m != null) {
-				final List<MApplicationElement> l = new ArrayList<MApplicationElement>();
+				final List<MApplicationElement> l = new ArrayList<>();
 				do {
 					l.add(m);
 					m = (MApplicationElement) ((EObject) m).eContainer();
@@ -582,7 +582,7 @@ private Composite createFormTab(Composite composite) {
 			@Override
 			public void keyReleased(final KeyEvent e) {
 				if (e.keyCode == SWT.DEL) {
-					final List<EObject> list = new ArrayList<EObject>();
+					final List<EObject> list = new ArrayList<>();
 					final IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
 					for (final Object o : ((StructuredSelection) selection).toList()) {
 						if (o instanceof EObject) {
@@ -706,9 +706,9 @@ public void menuAboutToShow(IMenuManager manager) {
 
 						// Build Add Child menu
 						if (editor != null) {
-							actions = new ArrayList<Action>(editor.getActions(s.getFirstElement()));
+							actions = new ArrayList<>(editor.getActions(s.getFirstElement()));
 						} else {
-							actions = new ArrayList<Action>();
+							actions = new ArrayList<>();
 						}
 
 						if (actions.size() > 0) {
@@ -722,9 +722,9 @@ public void menuAboutToShow(IMenuManager manager) {
 
 						// Build import menu
 						if (editor != null) {
-							actions = new ArrayList<Action>(editor.getActionsImport(s.getFirstElement()));
+							actions = new ArrayList<>(editor.getActionsImport(s.getFirstElement()));
 						} else {
-							actions = new ArrayList<Action>();
+							actions = new ArrayList<>();
 						}
 
 						if (actions.size() > 0) {
@@ -759,7 +759,7 @@ public void run() {
 								.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {
 							@Override
 							public void run() {
-								final ArrayList<MApplicationElement> maes = new ArrayList<MApplicationElement>();
+								final ArrayList<MApplicationElement> maes = new ArrayList<>();
 								for (final Object objSelect : listOfSelections) {
 									EObject container = null;
 									if (objSelect instanceof VirtualEntry<?>) {
@@ -1064,7 +1064,7 @@ public boolean isLiveModel() {
 	}
 
 	public List<FeatureClass> getFeatureClasses(EClass eClass, EStructuralFeature feature) {
-		final List<FeatureClass> list = new ArrayList<IEditorFeature.FeatureClass>();
+		final List<FeatureClass> list = new ArrayList<>();
 
 		for (final IEditorFeature f : editorFeatures) {
 			list.addAll(f.getFeatureClasses(eClass, feature));
@@ -1284,7 +1284,7 @@ private void registerContributedEditorTabs() {
 	}
 
 	public List<AbstractElementEditorContribution> getTabContributionsForClass(Class<?> clazz) {
-		final List<AbstractElementEditorContribution> ret = new ArrayList<AbstractElementEditorContribution>();
+		final List<AbstractElementEditorContribution> ret = new ArrayList<>();
 		for (final Class<?> clasz : tabContributions.keySet()) {
 			if (clasz.isAssignableFrom(clazz)) {
 				ret.addAll(tabContributions.get(clasz));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
index e05c4acddf..76dc6bcbcc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
@@ -46,7 +46,7 @@ public void documentChanged(DocumentEvent event) {
 				try {
 					// restore Nodes from XmiIds
 					E4XMIResource xmiResource = (E4XMIResource) ((EObject) modelProvider.getRoot().get(0)).eResource();
-					ArrayList<Object> newElements = new ArrayList<Object>();
+					ArrayList<Object> newElements = new ArrayList<>();
 					ObservableListTreeContentProvider provider = (ObservableListTreeContentProvider) getContentProvider();
 					Object[] children = new Object[] { modelProvider.getRoot().get(0) };
 					for (String id : elementsIds) {
@@ -57,7 +57,7 @@ public void documentChanged(DocumentEvent event) {
 							getFirstMatchingItem(eObject, provider, children);
 						}
 					}
-					ArrayList<Object> newSelected = new ArrayList<Object>();
+					ArrayList<Object> newSelected = new ArrayList<>();
 					for (String id : selectedIds) {
 						EObject eObject = xmiResource.getEObject(id);
 						if (eObject != null) {
@@ -88,8 +88,8 @@ private void reloadIds(final IModelResource modelProvider) {
 					Object[] elements = getExpandedElements();
 					List<?> selected = ((IStructuredSelection) getSelection()).toList();
 					E4XMIResource xmiResource = (E4XMIResource) ((EObject) modelProvider.getRoot().get(0)).eResource();
-					elementsIds = new ArrayList<String>();
-					selectedIds = new ArrayList<String>();
+					elementsIds = new ArrayList<>();
+					selectedIds = new ArrayList<>();
 					for (Object obj : elements) {
 						if (obj instanceof EObject) {
 							elementsIds.add(xmiResource.getID((EObject) obj));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
index 2c03f8325b..80636efd05 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
@@ -57,7 +57,7 @@ public IListProperty getProperty() {
 
 	@SuppressWarnings("unchecked")
 	private List<Object> cleanedList(IObservableList list) {
-		List<Object> l = new ArrayList<Object>(list.size());
+		List<Object> l = new ArrayList<>(list.size());
 
 		for (Object o : list) {
 			if (accepted((M) o)) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 36187e3d2b..69a28c3742 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -119,7 +119,7 @@ public class ApplicationEditor extends AbstractComponentEditor {
 	@Optional
 	private IProject project;
 
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	public ApplicationEditor() {
@@ -657,7 +657,7 @@ public void createControl(Composite parent) {
 				menuViewer.setLabelProvider(new HiearchyLabelProvider());
 				menuViewer.setContentProvider(new ArrayContentProvider());
 
-				final List<MMenu> menuList = new ArrayList<MMenu>();
+				final List<MMenu> menuList = new ArrayList<>();
 				final Iterator<EObject> it = EcoreUtil.getAllContents(Collections.singleton(application));
 				while (it.hasNext()) {
 					final EObject o = it.next();
@@ -747,7 +747,7 @@ public void createControl(Composite parent) {
 				toolbarViewer.setLabelProvider(new HiearchyLabelProvider());
 				toolbarViewer.setContentProvider(new ArrayContentProvider());
 
-				final List<MToolBar> toolbarList = new ArrayList<MToolBar>();
+				final List<MToolBar> toolbarList = new ArrayList<>();
 				final Iterator<EObject> it = EcoreUtil.getAllContents(Collections.singleton(application));
 				while (it.hasNext()) {
 					final EObject o = it.next();
@@ -796,7 +796,7 @@ public void update(ViewerCell cell) {
 				img = elementEditor.getImage(o);
 			}
 
-			final List<String> parentPath = new ArrayList<String>();
+			final List<String> parentPath = new ArrayList<>();
 			while (o.eContainer() != null) {
 				o = o.eContainer();
 				elementEditor = getEditor().getEditor(o.eClass());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index b9e97c0f26..ce18e95f1d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -87,7 +87,7 @@ public class AreaEditor extends AbstractComponentEditor {
 			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	@Optional
@@ -382,7 +382,7 @@ public FeaturePath[] getLabelProperties() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 07194fcb20..2645a2cb6f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -60,7 +60,7 @@ public class BindingContextEditor extends AbstractComponentEditor {
 	private final IListProperty BINDING_CONTEXT__CHILDREN = EMFProperties
 			.list(CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
 
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	public BindingContextEditor() {
@@ -234,7 +234,7 @@ protected void handleAddContext() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index c0ed63da76..39ebf6b2db 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -69,7 +69,7 @@ public class BindingTableEditor extends AbstractComponentEditor {
 	private final IListProperty BINDING_TABLE__BINDINGS = EMFProperties
 			.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
 	private StackLayout stackLayout;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	public BindingTableEditor() {
@@ -271,7 +271,7 @@ public FeaturePath[] getLabelProperties() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index af0c2fd136..6f6394b8d8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -64,7 +64,7 @@ public class CommandEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private StackLayout stackLayout;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 	private MessageFormat newCommandParameterName;
 
 	private final IEMFEditListProperty COMMAND__PARAMETERS = EMFEditProperties.list(getEditingDomain(),
@@ -279,7 +279,7 @@ protected void handleAddCommandParameter() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index d3c89f2ed7..8024deb64e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -83,8 +83,8 @@ public class CompositePartEditor extends AbstractComponentEditor {
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
 			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private final List<Action> actions = new ArrayList<Action>();
-	private final List<Action> actionsImport = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
+	private final List<Action> actionsImport = new ArrayList<>();
 
 	@Inject
 	@Optional
@@ -329,7 +329,7 @@ public String getText(Object element) {
 			childrenDropDown.setLabelProvider(new FeatureClassLabelProvider(getEditor()));
 			childrenDropDown.setContentProvider(ArrayContentProvider.getInstance());
 
-			final List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
+			final List<FeatureClass> eClassList = new ArrayList<>();
 			eClassList.add(new FeatureClass("PartSashContainer", BasicPackageImpl.Literals.PART_SASH_CONTAINER)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("PartStack", BasicPackageImpl.Literals.PART_STACK)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART)); //$NON-NLS-1$
@@ -532,14 +532,14 @@ protected void handleImportChild(EClass eClass, String hint) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	@Override
 	public List<Action> getActionsImport(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActionsImport(element));
 		l.addAll(actionsImport);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java
index 40a4aa8ca1..e40c09fae5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java
@@ -32,7 +32,7 @@ public String getLabel(Object element) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final List<Action> actions = new ArrayList<Action>();
+		final List<Action> actions = new ArrayList<>();
 
 		final MDialog dialog = (MDialog) element;
 		if (dialog.getMainMenu() == null) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 33780ec259..982b8fbd74 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -74,7 +74,7 @@ public class KeyBindingEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private StackLayout stackLayout;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	private final IEMFEditListProperty KEY_BINDING__PARAMETERS = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS);
 
@@ -304,7 +304,7 @@ protected void handleAddParameter() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 1b0b4f50ce..3192a178ae 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -74,7 +74,7 @@ public class MenuContributionEditor extends AbstractComponentEditor {
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
 			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	private IModelResource resource;
@@ -335,7 +335,7 @@ protected void handleAdd(EClass eClass, boolean separator) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 5509860f4e..3781993bb4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -100,7 +100,7 @@ public class MenuEditor extends AbstractComponentEditor {
 	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
 			.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 	private StackLayout stackLayout;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	@Optional
@@ -335,7 +335,7 @@ public String getText(Object element) {
 					return super.getText(element);
 				}
 			});
-			final List<Object> list = new ArrayList<Object>();
+			final List<Object> list = new ArrayList<>();
 			list.add(Messages.MenuItemEditor_NoExpression);
 			list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
 			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION,
@@ -489,7 +489,7 @@ protected void handleAdd(EClass eClass, boolean separator) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		if (((MUIElement) getMaster().getValue()).getVisibleWhen() == null) {
 			l.add(addExpression);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 362e7f79c4..99366fa596 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -302,7 +302,7 @@ public String getText(Object element) {
 					return super.getText(element);
 				}
 			});
-			final List<Object> list = new ArrayList<Object>();
+			final List<Object> list = new ArrayList<>();
 			list.add(Messages.MenuItemEditor_NoExpression);
 			list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
 			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION,
@@ -382,7 +382,7 @@ public FeaturePath[] getLabelProperties() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		if (((MUIElement) getMaster().getValue()).getVisibleWhen() == null) {
 			l.add(addExpression);
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index d0c764e250..bd1c5e69f9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -206,7 +206,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 			}
 		});
 
-		final List<FeatureClass> list = new ArrayList<FeatureClass>();
+		final List<FeatureClass> list = new ArrayList<>();
 		Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
 		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT,
 				FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index ad440d850e..45561eef9d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -81,8 +81,8 @@ public class PartSashContainerEditor extends AbstractComponentEditor {
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
 			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private final List<Action> actions = new ArrayList<Action>();
-	private final List<Action> actionsImport = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
+	private final List<Action> actionsImport = new ArrayList<>();
 
 	@Inject
 	@Optional
@@ -284,7 +284,7 @@ protected void addPressed() {
 
 			pickList.setLabelProvider(new FeatureClassLabelProvider(getEditor()));
 
-			final List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
+			final List<FeatureClass> eClassList = new ArrayList<>();
 			eClassList.add(new FeatureClass("PartSashContainer", BasicPackageImpl.Literals.PART_SASH_CONTAINER)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("PartStack", BasicPackageImpl.Literals.PART_STACK)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART)); //$NON-NLS-1$
@@ -392,14 +392,14 @@ protected void handleImportChild(EClass eClass, String hint) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	@Override
 	public List<Action> getActionsImport(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActionsImport(element));
 		l.addAll(actionsImport);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 0b79c1d4f0..de8282347b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -75,8 +75,8 @@ public class PartStackEditor extends AbstractComponentEditor {
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
 			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private final List<Action> actions = new ArrayList<Action>();
-	private final List<Action> actionsImport = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
+	private final List<Action> actionsImport = new ArrayList<>();
 
 	@Inject
 	@Optional
@@ -245,7 +245,7 @@ protected void addPressed() {
 
 			pickList.setLabelProvider(new FeatureClassLabelProvider(getEditor()));
 
-			final List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
+			final List<FeatureClass> eClassList = new ArrayList<>();
 			eClassList.add(new FeatureClass(Messages.PartStackEditor_Part, BasicPackageImpl.Literals.PART));
 			eClassList.add(new FeatureClass(Messages.PartStackEditor_CompositePart,
 					BasicPackageImpl.Literals.COMPOSITE_PART));
@@ -359,14 +359,14 @@ protected void handleImportChild(EClass eClass) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	@Override
 	public List<Action> getActionsImport(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActionsImport(element));
 		l.addAll(actionsImport);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 0e5675e4a0..7363c5cd82 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -76,7 +76,7 @@ public class PerspectiveEditor extends AbstractComponentEditor {
 	private final IListProperty PERSPECTIVE__WINDOWS = EMFProperties
 			.list(AdvancedPackageImpl.Literals.PERSPECTIVE__WINDOWS);
 	private StackLayout stackLayout;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	@Optional
@@ -344,7 +344,7 @@ protected void handleAddChild(EClass eClass) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index ae851ab296..639994a2a6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -70,8 +70,8 @@ public class PerspectiveStackEditor extends AbstractComponentEditor {
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
 			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private final List<Action> actions = new ArrayList<Action>();
-	private final List<Action> actionsImport = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
+	private final List<Action> actionsImport = new ArrayList<>();
 
 	@Inject
 	@Optional
@@ -288,14 +288,14 @@ private void addToModel(MPerspective perspective) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	@Override
 	public List<Action> getActionsImport(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActionsImport(element));
 		l.addAll(actionsImport);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 7063fcd4ad..43e23c56b9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -73,7 +73,7 @@ public class StringModelFragment extends AbstractComponentEditor {
 	private final IListProperty MODEL_FRAGMENT__ELEMENTS = EMFProperties
 			.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
 
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	IEclipseContext eclipseContext;
@@ -85,7 +85,7 @@ public StringModelFragment() {
 
 	@PostConstruct
 	public void init() {
-		final List<FeatureClass> list = new ArrayList<FeatureClass>();
+		final List<FeatureClass> list = new ArrayList<>();
 		Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
 		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT,
 				FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
@@ -277,7 +277,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 				}
 			});
 
-			final List<FeatureClass> list = new ArrayList<FeatureClass>();
+			final List<FeatureClass> list = new ArrayList<>();
 			Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
 			list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT,
 					FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
@@ -330,7 +330,7 @@ protected void handleAdd(EClass eClass, boolean separator) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		Collections.sort(l, new Comparator<Action>() {
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index f4f2bb6bd8..bf16bd6319 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -79,7 +79,7 @@ public class ToolBarContributionEditor extends AbstractComponentEditor {
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
 			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	@Optional
@@ -333,7 +333,7 @@ public FeaturePath[] getLabelProperties() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 8ac6b80305..3dcb5c62b6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -64,7 +64,7 @@ public class ToolBarEditor extends AbstractComponentEditor {
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
 			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	public ToolBarEditor() {
@@ -251,7 +251,7 @@ public FeaturePath[] getLabelProperties() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 446cf466db..11ef80190c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -311,7 +311,7 @@ public String getText(Object element) {
 					return super.getText(element);
 				}
 			});
-			final List<Object> list = new ArrayList<Object>();
+			final List<Object> list = new ArrayList<>();
 			list.add(Messages.ToolItemEditor_NoExpression);
 			list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
 			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 7f7f554ce7..1f81079d54 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -80,7 +80,7 @@ public class TrimBarEditor extends AbstractComponentEditor {
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
 			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	@Optional
@@ -311,7 +311,7 @@ protected void handleAddChild(EClass eClass) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index a33c7214af..f3f95a35f3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -82,7 +82,7 @@ public class TrimContributionEditor extends AbstractComponentEditor {
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
 			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	@Optional
@@ -327,7 +327,7 @@ protected void handleAddChild(EClass eClass) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
index e942474dbd..e112a79280 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
@@ -56,7 +56,7 @@ public Object convert(Object fromObject) {
 							return SetCommand.UNSET_VALUE;
 						}
 						if (eAttribute.isMany()) {
-							final List<Object> result = new ArrayList<Object>();
+							final List<Object> result = new ArrayList<>();
 
 							for (final String element : value.split(" ")) { //$NON-NLS-1$
 								result.add(eFactory.createFromString(eDataType, element));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 948807e2ff..a568d35675 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -448,7 +448,7 @@ public FeaturePath[] getLabelProperties() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final List<Action> actions = new ArrayList<Action>();
+		final List<Action> actions = new ArrayList<>();
 
 		final MWindow window = (MWindow) element;
 		if (window.getMainMenu() == null) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java
index 60b464b780..60fd72755a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java
@@ -32,7 +32,7 @@ public String getLabel(Object element) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final List<Action> actions = new ArrayList<Action>();
+		final List<Action> actions = new ArrayList<>();
 
 		final MWizardDialog dialog = (MWizardDialog) element;
 		if (dialog.getMainMenu() == null) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index 66ccc2521f..9c71592131 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -106,7 +106,7 @@ public void doubleClick(DoubleClickEvent event) {
 			}
 		});
 
-		final List<EObject> commands = new ArrayList<EObject>();
+		final List<EObject> commands = new ArrayList<>();
 		final TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
 		while (it.hasNext()) {
 			final EObject o = it.next();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
index 8647a0282d..1aa3053784 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
@@ -398,7 +398,7 @@ public void run() {
 				projects = Arrays.asList(filter.project.getWorkspace().getRoot().getProjects());
 			} else if (filter.getSearchScope().contains(ResourceSearchScope.PROJECT)) {
 				if (filter.getSearchScope().contains(ResourceSearchScope.REFERENCES)) {
-					projects = new ArrayList<IProject>();
+					projects = new ArrayList<>();
 					projects.add(filter.project);
 					try {
 						for (final IProject ref : filter.project.getReferencedProjects()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
index 37fdb2632f..147690ed1c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
@@ -103,7 +103,7 @@ public void doubleClick(DoubleClickEvent event) {
 			}
 		});
 
-		final List<EObject> categories = new ArrayList<EObject>();
+		final List<EObject> categories = new ArrayList<>();
 		final TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
 		while (it.hasNext()) {
 			final EObject o = it.next();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
index 45f014b948..6c50276055 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
@@ -49,7 +49,7 @@ public BundleImageCache(Display display, ClassLoader classloader, IEclipseContex
 		this.display = display;
 		this.classloader = classloader;
 		this.context = context;
-		images = new ArrayList<Image>();
+		images = new ArrayList<>();
 	}
 
 	/**
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
index c78e9907d3..0d357f300c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -104,7 +104,7 @@ public void doubleClick(DoubleClickEvent event) {
 			}
 		});
 
-		final List<EObject> categories = new ArrayList<EObject>();
+		final List<EObject> categories = new ArrayList<>();
 		final TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
 		while (it.hasNext()) {
 			final EObject o = it.next();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
index 9f6ccf0fc8..cf1af13378 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
@@ -122,7 +122,7 @@ protected void okPressed() {
 	}
 
 	private List<IConfigurationElement> getElements(IExtensionLookup lookup) {
-		final List<IConfigurationElement> list = new ArrayList<IConfigurationElement>();
+		final List<IConfigurationElement> list = new ArrayList<>();
 		for (final IExtension ext : lookup.findExtensions("org.eclipse.core.expressions.definitions", liveModel)) { //$NON-NLS-1$
 			for (final IConfigurationElement el : ext.getConfigurationElements()) {
 				list.add(el);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index 43ff0299f2..006ce6b94b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -406,7 +406,7 @@ public void setPattern(String patternString) {
 		 * @return an array of words
 		 */
 		private String[] getWords(String text) {
-			final List<String> words = new ArrayList<String>();
+			final List<String> words = new ArrayList<>();
 			// Break the text up into words, separating based on whitespace and
 			// common punctuation.
 			// Previously used String.split(..., "\\W"), where "\W" is a regular
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index bb9c845a73..15ac69669a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -709,7 +709,7 @@ protected void showBundleFilter() {
 			return;
 		}
 
-		final ArrayList<String> sorted = new ArrayList<String>(bundleIds);
+		final ArrayList<String> sorted = new ArrayList<>(bundleIds);
 		Collections.sort(sorted);
 
 		final TitleAreaFilterDialog dlg = new TitleAreaFilterDialog(getShell(), new ColumnLabelProvider()) {
@@ -729,7 +729,7 @@ protected Control createContents(Composite parent) {
 			}
 		};
 		if (dlg.open() == Window.OK) {
-			final ArrayList<String> result = new ArrayList<String>();
+			final ArrayList<String> result = new ArrayList<>();
 			result.add(dlg.getFirstSelection());
 			setFilterBundles(result);
 			refreshSearch();
@@ -749,7 +749,7 @@ protected void showPackageFilter() {
 			return;
 		}
 
-		final ArrayList<String> sorted = new ArrayList<String>(packages);
+		final ArrayList<String> sorted = new ArrayList<>(packages);
 		Collections.sort(sorted);
 
 		final TitleAreaFilterDialog dlg = new TitleAreaFilterDialog(getShell(), new ColumnLabelProvider()) {
@@ -765,7 +765,7 @@ protected Control createContents(Composite parent) {
 			}
 		};
 		if (dlg.open() == Window.OK) {
-			final ArrayList<String> result = new ArrayList<String>();
+			final ArrayList<String> result = new ArrayList<>();
 			result.add(dlg.getFirstSelection());
 			setFilterBundles(result);
 			refreshSearch();
@@ -798,7 +798,7 @@ protected void showLocationFilter() {
 		}
 
 		// add all parent paths
-		final HashSet<String> parentLocations = new HashSet<String>();
+		final HashSet<String> parentLocations = new HashSet<>();
 		for (String location : locations) {
 			if (location.endsWith(".jar")) { //$NON-NLS-1$
 				final int index = location.lastIndexOf(File.separator);
@@ -811,7 +811,7 @@ protected void showLocationFilter() {
 			}
 		}
 
-		final ArrayList<String> sorted = new ArrayList<String>(parentLocations);
+		final ArrayList<String> sorted = new ArrayList<>(parentLocations);
 		Collections.sort(sorted);
 
 		final TitleAreaFilterDialog dlg = new TitleAreaFilterDialog(getShell(), new ColumnLabelProvider()) {
@@ -827,7 +827,7 @@ protected Control createContents(Composite parent) {
 			}
 		};
 		if (dlg.open() == Window.OK) {
-			final ArrayList<String> result = new ArrayList<String>();
+			final ArrayList<String> result = new ArrayList<>();
 			result.add(dlg.getFirstSelection());
 			setFilterBundles(result);
 			refreshSearch();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index 033f36cdad..5e36f06bb6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -131,7 +131,7 @@ public String getText(Object element) {
 			}
 		});
 		eClassViewer.setContentProvider(new ArrayContentProvider());
-		final List<EClass> eClassList = new ArrayList<EClass>();
+		final List<EClass> eClassList = new ArrayList<>();
 		for (final InternalPackage p : Util.loadPackages()) {
 			eClassList.addAll(p.getAllClasses());
 		}
@@ -154,7 +154,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 			}
 		});
 
-		final ArrayList<String> vals = new ArrayList<String>();
+		final ArrayList<String> vals = new ArrayList<>();
 		for (final EClass item : eClassList) {
 			vals.add(item.getName());
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
index f17f34b687..b63a6ae03f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
@@ -59,7 +59,7 @@ protected String getLabelText() {
 	@Override
 	protected List<MMenu> getViewerInput() {
 
-		List<MMenu> result = new ArrayList<MMenu>();
+		List<MMenu> result = new ArrayList<>();
 
 		if (resource.getRoot().get(0) instanceof MApplication) {
 			// include Window main-menu instances
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
index ca9ed68ecb..248a5c5fc1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
@@ -55,8 +55,8 @@ public class ParameterIdSelectionDialog extends AbstractIdDialog<MParameter, MCo
 
 	/** The parameter, which {@link MParameter#getName() name} feature has to be modified. */
 	protected MParameter parameter;
-	protected Set<EStructuralFeature> parametersFeatures = new HashSet<EStructuralFeature>();
-	protected Set<EStructuralFeature> commandsFeatures = new HashSet<EStructuralFeature>();
+	protected Set<EStructuralFeature> parametersFeatures = new HashSet<>();
+	protected Set<EStructuralFeature> commandsFeatures = new HashSet<>();
 
 	@Inject
 	public ParameterIdSelectionDialog(Shell parentShell, IModelResource resource, MParameter parameter,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index 1a3e348869..6a3eae22c1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -109,13 +109,13 @@ public void doubleClick(DoubleClickEvent event) {
 		});
 
 		if (resource.getRoot().get(0) instanceof MApplication) {
-			final List<MUIElement> list = new ArrayList<MUIElement>();
+			final List<MUIElement> list = new ArrayList<>();
 			for (final MWindow m : ((MApplication) resource.getRoot().get(0)).getChildren()) {
 				list.addAll(filter(m.getSharedElements()));
 			}
 			viewer.setInput(list);
 		} else if (resource.getRoot().get(0) instanceof MModelFragments) {
-			final List<MApplicationElement> list = new ArrayList<MApplicationElement>();
+			final List<MApplicationElement> list = new ArrayList<>();
 			for (final MModelFragment f : ((MModelFragments) resource.getRoot().get(0)).getFragments()) {
 				if (f instanceof MStringModelFragment) {
 					if (((MStringModelFragment) f).getFeaturename().equals("sharedElements")) { //$NON-NLS-1$
@@ -159,7 +159,7 @@ protected void okPressed() {
 	}
 
 	private static <T> List<T> filter(List<T> o) {
-		final List<T> rv = new ArrayList<T>();
+		final List<T> rv = new ArrayList<>();
 		for (final T i : o) {
 			if (i instanceof MPart || i instanceof MPartSashContainer || i instanceof MArea || i instanceof MPartStack) {
 				rv.add(i);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java
index eae3f2531a..ac31685672 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java
@@ -57,7 +57,7 @@ protected String getLabelText() {
 
 	@Override
 	protected List<MToolBar> getViewerInput() {
-		List<MToolBar> result = new ArrayList<MToolBar>();
+		List<MToolBar> result = new ArrayList<>();
 		if (resource.getRoot().get(0) instanceof MApplication) {
 
 			MApplication ma = ((MApplication) resource.getRoot().get(0));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java
index 10faf26daa..7cc522dd99 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java
@@ -55,7 +55,7 @@ protected String getLabelText() {
 
 	@Override
 	protected List<MTrimBar> getViewerInput() {
-		List<MTrimBar> result = new ArrayList<MTrimBar>();
+		List<MTrimBar> result = new ArrayList<>();
 
 		if (resource.getRoot().get(0) instanceof MApplication) {
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
index ca8c49c7c5..a450489121 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
@@ -40,7 +40,7 @@ public class E4ToolItemMenu {
 
 	public static final String SEPARATOR = "~separator~"; //$NON-NLS-1$
 	private final IEclipseContext context;
-	private final ArrayList<String> commandIds = new ArrayList<String>();
+	private final ArrayList<String> commandIds = new ArrayList<>();
 	private final Menu menu;
 	private final ECommandService commandService;
 	private final EHandlerService handlerService;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index f81eb4d77a..acbbf6d6f2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -119,7 +119,7 @@ public class ListTab implements IViewEObjects {
 
 	static final String ELIPSIS = "..."; //$NON-NLS-1$
 
-	ConcurrentHashMap<String, List<EObject>> mapId_Object = new ConcurrentHashMap<String, List<EObject>>();
+	ConcurrentHashMap<String, List<EObject>> mapId_Object = new ConcurrentHashMap<>();
 
 	@Inject
 	private IEclipseContext context;
@@ -154,9 +154,9 @@ public class ListTab implements IViewEObjects {
 
 	protected Image imgMarkedItem;
 
-	LinkedHashMap<String, EAttributeTableViewerColumn> defaultColumns = new LinkedHashMap<String, EAttributeTableViewerColumn>();
-	LinkedHashMap<String, EAttributeTableViewerColumn> optionalColumns = new LinkedHashMap<String, EAttributeTableViewerColumn>();
-	LinkedHashMap<String, TableColumn> requiredColumns = new LinkedHashMap<String, TableColumn>();
+	LinkedHashMap<String, EAttributeTableViewerColumn> defaultColumns = new LinkedHashMap<>();
+	LinkedHashMap<String, EAttributeTableViewerColumn> optionalColumns = new LinkedHashMap<>();
+	LinkedHashMap<String, TableColumn> requiredColumns = new LinkedHashMap<>();
 	private TableViewerColumn colItem;
 	private TableViewerColumn colGo;
 	private TableViewerColumn colGoXmi;
@@ -486,7 +486,7 @@ public void widgetSelected(SelectionEvent e) {
 			final E4ToolItemMenu tiCommands = new E4ToolItemMenu(toolBar, context);
 			tiCommands.getToolItem().setImage(imageCache.create("/icons/full/obj16/command.gif")); //$NON-NLS-1$
 
-			final ArrayList<String> commandIds = new ArrayList<String>();
+			final ArrayList<String> commandIds = new ArrayList<>();
 			commandIds.add("org.eclipse.e4.tools.emf.ui.command.mark_duplicate_attributes"); //$NON-NLS-1$
 			commandIds.add("org.eclipse.e4.tools.emf.ui.command.mark_duplicate_ids"); //$NON-NLS-1$
 			commandIds.add("org.eclipse.e4.tools.emf.ui.command.mark_duplicate_labels"); //$NON-NLS-1$
@@ -690,7 +690,7 @@ public void highlightEObjects(Collection<EObject> items) {
 
 	@Override
 	public List<EObject> getAllEObjects() {
-		final ArrayList<EObject> list = new ArrayList<EObject>();
+		final ArrayList<EObject> list = new ArrayList<>();
 		final TreeIterator<Object> itTree = EcoreUtil.getAllContents(modelResource.getRoot());
 		while (itTree.hasNext()) {
 			final Object object = itTree.next();
@@ -705,7 +705,7 @@ public List<EObject> getAllEObjects() {
 
 	@Override
 	public Collection<EObject> getSelectedEObjects() {
-		final ArrayList<EObject> selected = new ArrayList<EObject>();
+		final ArrayList<EObject> selected = new ArrayList<>();
 		for (final Object item : ((IStructuredSelection) tvResults.getSelection()).toList()) {
 			if (item instanceof EObject) {
 				selected.add((EObject) item);
@@ -728,14 +728,14 @@ public void deleteEObjects(Collection<EObject> list) {
 
 	private TitleAreaFilterDialogWithEmptyOptions createEObjectAttributePicker(final String title) {
 		// Get Attribute Names
-		final HashSet<String> set = new HashSet<String>();
+		final HashSet<String> set = new HashSet<>();
 		final Collection<EObject> allEObjects = getAllEObjects();
 		for (final EObject obj : allEObjects) {
 			for (final EAttribute attribute : obj.eClass().getEAllAttributes()) {
 				set.add(attribute.getName());
 			}
 		}
-		final ArrayList<String> sorted = new ArrayList<String>(set);
+		final ArrayList<String> sorted = new ArrayList<>(set);
 		Collections.sort(sorted);
 
 		// Select Attribute
@@ -766,13 +766,13 @@ protected Control createContents(Composite parent) {
 
 	private TitleAreaFilterDialog createElementTypePicker(final String title) {
 		// Get Attribute Names
-		final HashSet<String> set = new HashSet<String>();
+		final HashSet<String> set = new HashSet<>();
 		final Collection<EObject> allEObjects = getAllEObjects();
 		for (final EObject obj : allEObjects) {
 			set.add(obj.eClass().getName());
 		}
 
-		final ArrayList<String> sorted = new ArrayList<String>(set);
+		final ArrayList<String> sorted = new ArrayList<>(set);
 		Collections.sort(sorted);
 
 		final ILabelProvider renderer = new LabelProvider() {
@@ -890,7 +890,7 @@ private void filterByItem(String name) {
 		filterByAttrName = null;
 		filterByAttrEmptyOption = null;
 		mapId_Object.clear();
-		final ArrayList<EObject> filtered = new ArrayList<EObject>();
+		final ArrayList<EObject> filtered = new ArrayList<>();
 		for (final EObject object : getAllEObjects()) {
 			if (object.eClass().getName().equals(filterByItemName)) {
 				filtered.add(object);
@@ -918,7 +918,7 @@ private void filterByAttribute(String name, final EmptyFilterOption emptyOption)
 		filterByAttrEmptyOption = emptyOption;
 		filterByItemName = null;
 		mapId_Object.clear();
-		final ArrayList<EObject> filtered = new ArrayList<EObject>();
+		final ArrayList<EObject> filtered = new ArrayList<>();
 		for (final EObject object : getAllEObjects()) {
 			if (EmfUtil.getAttribute(object, filterByAttrName) != null) {
 				filtered.add(object);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
index 2b40d470a2..4502751c1d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
@@ -73,7 +73,7 @@ public Object[] getElements(Object object) {
 
 	@Override
 	public void inputChanged(final Viewer viewer, Object oldInput, Object newInput) {
-		ArrayList<EObject> list = new ArrayList<EObject>();
+		ArrayList<EObject> list = new ArrayList<>();
 		IModelResource modelProvider = (IModelResource) newInput;
 		if (newInput != oldInput && newInput != null) {
 			// ((EObject)
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
index 1440b0606a..780093ae02 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
@@ -205,7 +205,7 @@ static public void resetColumnOrder(TableViewer tvResults) {
 	}
 
 	static public ArrayList<TableColumn> getColumnsInDisplayOrder(TableViewer viewer) {
-		final ArrayList<TableColumn> allCols = new ArrayList<TableColumn>(Arrays.asList(viewer.getTable().getColumns()));
+		final ArrayList<TableColumn> allCols = new ArrayList<>(Arrays.asList(viewer.getTable().getColumns()));
 		final int[] order = viewer.getTable().getColumnOrder();
 		Collections.sort(allCols, new Comparator<TableColumn>() {
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index c22facce2f..78fc5f6adc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -47,7 +47,7 @@ public class VApplicationAddons extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private EMFDataBindingContext context;
 
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	public VApplicationAddons() {
@@ -145,7 +145,7 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index cc349c1432..aabaca31f2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -49,8 +49,8 @@ public class VApplicationCategoriesEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private EMFDataBindingContext context;
 
-	private final List<Action> actions = new ArrayList<Action>();
-	private final List<Action> actionsImport = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
+	private final List<Action> actionsImport = new ArrayList<>();
 
 	@Inject
 	public VApplicationCategoriesEditor() {
@@ -165,14 +165,14 @@ private void addCategory(MCategory category) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	@Override
 	public List<Action> getActionsImport(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actionsImport);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 597c23beb9..625b6284a9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -45,7 +45,7 @@ public class VBindingTableEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	public VBindingTableEditor() {
@@ -140,7 +140,7 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index ff7258223f..e53df4710d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -53,8 +53,8 @@ public class VCommandEditor extends AbstractComponentEditor {
 	private TableViewer viewer;
 
 	private final EStructuralFeature commandsFeature;
-	private final List<Action> actions = new ArrayList<Action>();
-	private final List<Action> actionsImport = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
+	private final List<Action> actionsImport = new ArrayList<>();
 
 	@Inject
 	@Translation
@@ -177,14 +177,14 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	@Override
 	public List<Action> getActionsImport(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actionsImport);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 4a5136b4a8..e1b8a1f1b1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -48,8 +48,8 @@ public class VHandlerEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private final List<Action> actions = new ArrayList<Action>();
-	private final List<Action> actionsImport = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
+	private final List<Action> actionsImport = new ArrayList<>();
 
 	@Inject
 	public VHandlerEditor() {
@@ -171,14 +171,14 @@ protected void handleImport() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	@Override
 	public List<Action> getActionsImport(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActionsImport(element));
 		l.addAll(actionsImport);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
index 273c9fdb8f..a78d405679 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -47,7 +47,7 @@ public class VItemParametersEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	private final IEMFListProperty HANDLED_ITEM__PARAMETERS = EMFProperties
 		.list(MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
@@ -151,7 +151,7 @@ protected void handleAdd() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index 6d3f386380..8d8dd864dc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -46,7 +46,7 @@ public class VMenuContributionsEditor extends AbstractComponentEditor {
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
 
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	public VMenuContributionsEditor() {
@@ -141,7 +141,7 @@ protected void handleAdd() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 4df8c08eba..f9eddc9bd0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -53,7 +53,7 @@ public class VMenuEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private StructuredViewer viewer;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 	private final EStructuralFeature feature;
 
 	@Inject
@@ -207,7 +207,7 @@ protected void handleAddViewMenu() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index 3f62ab436f..5d068ba1bd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -45,7 +45,7 @@ public class VModelFragmentsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	public VModelFragmentsEditor() {
@@ -132,7 +132,7 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index 4e2fd71661..1d15f5c476 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -142,7 +142,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 			}
 		});
 
-		final List<FeatureClass> list = new ArrayList<FeatureClass>();
+		final List<FeatureClass> list = new ArrayList<>();
 		Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
 		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index 9713284630..307bd65d23 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -50,8 +50,8 @@ public class VPartDescriptor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private final List<Action> actions = new ArrayList<Action>();
-	private final List<Action> actionsImport = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
+	private final List<Action> actionsImport = new ArrayList<>();
 
 	@Inject
 	public VPartDescriptor() {
@@ -184,14 +184,14 @@ protected void handleImport(EClass eClass, String hint) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	@Override
 	public List<Action> getActionsImport(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActionsImport(element));
 		l.addAll(actionsImport);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index 0c871582c9..81bf57a4fb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -49,7 +49,7 @@ public class VPerspectiveControlEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	public VPerspectiveControlEditor() {
@@ -172,7 +172,7 @@ private void handleAdd(EClass eClass) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
index 3e09e6df44..80c27f0120 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
@@ -46,7 +46,7 @@ public class VRootBindingContexts extends AbstractComponentEditor {
 	private TableViewer viewer;
 	private EMFDataBindingContext context;
 
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	public VRootBindingContexts() {
@@ -139,7 +139,7 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index 1c4e2aad22..f99fc2da05 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -43,7 +43,7 @@ public class VSnippetsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 	private final EStructuralFeature targetFeature;
 
 	public VSnippetsEditor() {
@@ -224,7 +224,7 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index c429a0ad60..d13c255d0d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -45,7 +45,7 @@ public class VToolBarContributionsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	public VToolBarContributionsEditor() {
@@ -142,7 +142,7 @@ protected void handleAdd() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index 84194caa0b..c794a9045f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -45,7 +45,7 @@ public class VTrimContributionsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	public VTrimContributionsEditor() {
@@ -142,7 +142,7 @@ protected void handleAdd() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index e977593a1d..884c8be1f9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -50,7 +50,7 @@
 public class VWindowControlEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 	private TableViewer viewer;
 
 	@Inject
@@ -201,7 +201,7 @@ private void handleAdd(EClass eClass) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 74c943b3a2..bb2a74125b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -47,7 +47,7 @@ public abstract class VWindowEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 	private final EStructuralFeature targetFeature;
 
 	public VWindowEditor(EStructuralFeature targetFeature) {
@@ -171,7 +171,7 @@ public IObservableList getChildList(Object element) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 277a5f7e8c..e294920b95 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -57,8 +57,8 @@ public class VWindowSharedElementsEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private StructuredViewer viewer;
-	private final List<Action> actions = new ArrayList<Action>();
-	private final List<Action> actionsImport = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
+	private final List<Action> actionsImport = new ArrayList<>();
 
 	@Inject
 	IEclipseContext eclipseContext;
@@ -223,14 +223,14 @@ protected void handleImport(EClass eClass, String hint) {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
 
 	@Override
 	public List<Action> getActionsImport(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActionsImport(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActionsImport(element));
 		l.addAll(actionsImport);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index d0ef5796a3..b5fb4836d7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -45,7 +45,7 @@ public class VWindowTrimEditor extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
-	private final List<Action> actions = new ArrayList<Action>();
+	private final List<Action> actions = new ArrayList<>();
 
 	@Inject
 	public VWindowTrimEditor() {
@@ -145,7 +145,7 @@ protected void handleAdd() {
 
 	@Override
 	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<Action>(super.getActions(element));
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
 		return l;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java
index 7bcb2c99a0..a06040cb2a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java
@@ -24,7 +24,7 @@ public List<JavaAttribute> getAttributes() {
 	}
 
 	private void initAttributes() {
-		attributes = new ArrayList<JavaAttribute>();
+		attributes = new ArrayList<>();
 
 		if (instance == null) {
 			return;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
index 51c164fc32..98bcb7155f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
@@ -186,7 +186,7 @@ public String getText(Object element) {
 				l.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 3, 1));
 			}
 
-			List<Entry> entries = new ArrayList<ExportIdsHandler.Entry>();
+			List<Entry> entries = new ArrayList<>();
 			TreeIterator<EObject> it = EcoreUtil.getAllContents(list);
 
 			while (it.hasNext()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
index b4f8f21af4..ae86a8049b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
@@ -148,12 +148,12 @@ public String getText(Object element) {
 				});
 			}
 
-			List<Entry> entries = new ArrayList<ExternalizeStringHandler.Entry>();
+			List<Entry> entries = new ArrayList<>();
 			TreeIterator<EObject> it = EcoreUtil.getAllContents(list);
 
-			List<String> ids = new ArrayList<String>();
+			List<String> ids = new ArrayList<>();
 
-			List<EStructuralFeature> translatedFeatures = new ArrayList<EStructuralFeature>();
+			List<EStructuralFeature> translatedFeatures = new ArrayList<>();
 			translatedFeatures.add(UiPackageImpl.Literals.UI_LABEL__LABEL);
 			translatedFeatures.add(UiPackageImpl.Literals.UI_LABEL__TOOLTIP);
 			translatedFeatures.add(CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEntry.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEntry.java
index 63b9f4151f..b1a47ebee6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEntry.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEntry.java
@@ -15,5 +15,5 @@
 
 public class ResourceBundleEntry {
 	public String key;
-	public SortedMap<String, String> translations = new TreeMap<String, String>();
+	public SortedMap<String, String> translations = new TreeMap<>();
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
index b6b17902bc..feeeecb31e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
@@ -84,10 +84,10 @@
  */
 public abstract class TargetPlatformContributionCollector extends ClassContributionCollector {
 
-	CopyOnWriteArrayList<Entry> cacheEntry = new CopyOnWriteArrayList<Entry>();
-	HashSet<String> cacheBundleId = new HashSet<String>();
-	HashSet<String> cachePackage = new HashSet<String>();
-	HashSet<String> cacheLocation = new HashSet<String>();
+	CopyOnWriteArrayList<Entry> cacheEntry = new CopyOnWriteArrayList<>();
+	HashSet<String> cacheBundleId = new HashSet<>();
+	HashSet<String> cachePackage = new HashSet<>();
+	HashSet<String> cacheLocation = new HashSet<>();
 	private Pattern patternFile;
 	protected String cacheName;
 	protected boolean stopFiltering;
@@ -249,7 +249,7 @@ protected ContributionData makeData(Entry e) {
 	 */
 	public Collection<String> getBundleIds() {
 		reloadCache(false, null);
-		return new ArrayList<String>(cacheBundleId);
+		return new ArrayList<>(cacheBundleId);
 	}
 
 	/**
@@ -258,7 +258,7 @@ public Collection<String> getBundleIds() {
 	 */
 	public Collection<String> getPackages() {
 		reloadCache(false, null);
-		return new ArrayList<String>(cachePackage);
+		return new ArrayList<>(cachePackage);
 	}
 
 	/**
@@ -267,7 +267,7 @@ public Collection<String> getPackages() {
 	 */
 	public Collection<String> getLocations() {
 		reloadCache(false, null);
-		return new ArrayList<String>(cacheLocation);
+		return new ArrayList<>(cacheLocation);
 	}
 
 	/**
@@ -587,7 +587,7 @@ static private String stripOutputDirectory(String path, String installLocation)
 	 * A cache of the output directories for install locations (if install
 	 * location has a classpath file with appropriate output entries)
 	 */
-	static private HashMap<String, List<String>> outputDirectories = new HashMap<String, List<String>>();
+	static private HashMap<String, List<String>> outputDirectories = new HashMap<>();
 
 	// Returns the Eclipse output directories for an install location. The
 	// directories are relative to the install location.
@@ -595,7 +595,7 @@ static private String stripOutputDirectory(String path, String installLocation)
 	static private List<String> getOutputDirectories(String installLocation) {
 		List<String> ret = outputDirectories.get(installLocation);
 		if (ret == null) {
-			ret = new ArrayList<String>();
+			ret = new ArrayList<>();
 			outputDirectories.put(installLocation, ret);
 			try {
 				final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder()
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
index 467b76682c..75ca2ca916 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
@@ -27,7 +27,7 @@
  */
 public class DynamicWizard extends Wizard {
 
-	protected ArrayList<IWizardPage> pages = new ArrayList<IWizardPage>();
+	protected ArrayList<IWizardPage> pages = new ArrayList<>();
 	private String message;
 
 	public DynamicWizard() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
index bf4bc045bf..e8f12254ca 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
@@ -82,7 +82,7 @@ public Object[] getChildren(final Object parentElement) {
 				return getChildren(project);
 			}
 			final IResource resource = (IResource) parentElement;
-			final ArrayList<Object> list = new ArrayList<Object>();
+			final ArrayList<Object> list = new ArrayList<>();
 			IResourceProxyVisitor visitor = new IResourceProxyVisitor() {
 
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
index 1896f56e66..4c2f94eecc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
@@ -29,7 +29,7 @@ public class EMFDocumentResourceMediator {
 	private IModelResource modelResource;
 	private Document document;
 	private boolean updateFromEMF;
-	private List<Diagnostic> errorList = new ArrayList<Diagnostic>();
+	private List<Diagnostic> errorList = new ArrayList<>();
 	private Runnable documentValidationChanged;
 
 	public EMFDocumentResourceMediator(final IModelResource modelResource) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
index d00cc705d4..4f2001606d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
@@ -32,7 +32,7 @@ public class MarkDuplicateAttributesHandler extends MarkDuplicateItemsBase {
 
 	@Execute
 	public void execute(@Named(VIEWER_KEY) IViewEObjects viewer, IEclipseContext context, final Messages Messages) {
-		final HashSet<String> set = new HashSet<String>();
+		final HashSet<String> set = new HashSet<>();
 		Collection<EObject> allEObjects = viewer.getAllEObjects();
 		for (EObject obj : allEObjects) {
 			for (EAttribute attribute : obj.eClass().getEAllAttributes()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java
index 848e40a6e3..53d9caf5f9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java
@@ -40,7 +40,7 @@ public void execute(IEclipseContext context) {
 
 	static Collection<EObject> getDuplicateList(String attName, Collection<EObject> all) {
 		Map<String, List<EObject>> map = getDuplicateMap(attName, all);
-		List<EObject> duplicates = new ArrayList<EObject>();
+		List<EObject> duplicates = new ArrayList<>();
 		for (String key : map.keySet()) {
 			List<EObject> list = map.get(key);
 			if (list.size() > 1) {
@@ -51,7 +51,7 @@ static Collection<EObject> getDuplicateList(String attName, Collection<EObject>
 	}
 
 	static Map<String, List<EObject>> getDuplicateMap(String attName, Collection<EObject> selected) {
-		ConcurrentHashMap<String, List<EObject>> map = new ConcurrentHashMap<String, List<EObject>>();
+		ConcurrentHashMap<String, List<EObject>> map = new ConcurrentHashMap<>();
 		for (Iterator<?> it = selected.iterator(); it.hasNext();) {
 			Object object = it.next();
 			if (object instanceof EObject) {
@@ -67,7 +67,7 @@ static Map<String, List<EObject>> getDuplicateMap(String attName, Collection<EOb
 					}
 					List<EObject> list = map.get(attValue);
 					if (list == null) {
-						list = new ArrayList<EObject>();
+						list = new ArrayList<>();
 						map.put(attValue, list);
 					}
 					list.add(item);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java
index a0eae910f5..f7f7a5f186 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java
@@ -50,7 +50,7 @@ public void execute(IEclipseContext context) {
 			Entry<String, List<EObject>> entry = it.next();
 			List<EObject> listDups = entry.getValue();
 			if (listDups.size() > 1) {
-				ArrayList<EObject> toFix = new ArrayList<EObject>(listDups.subList(1, listDups.size()));
+				ArrayList<EObject> toFix = new ArrayList<>(listDups.subList(1, listDups.size()));
 				Iterator<EObject> itToFix = toFix.iterator();
 				while (itToFix.hasNext()) {
 					EObject eObject = itToFix.next();
@@ -81,7 +81,7 @@ public void execute(IEclipseContext context) {
 					// Note: If the compound command cannot execute, we
 					// must revert these changes
 					listDups.remove(eObject);
-					List<EObject> newList = new ArrayList<EObject>();
+					List<EObject> newList = new ArrayList<>();
 					newList.add(eObject);
 					map.put(value, newList);
 					// Note: end
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
index c001fdc455..d481198489 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
@@ -183,7 +183,7 @@ public void setWizard(IWizard newWizard) {
 	}
 
 	public IConfigurationElement[] getConfigurationElements() {
-		ArrayList<IConfigurationElement> result = new ArrayList<IConfigurationElement>();
+		ArrayList<IConfigurationElement> result = new ArrayList<>();
 		for (Object element : checkedElements) {
 			if (element instanceof IConfigurationElement) {
 				result.add((IConfigurationElement) element);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
index 537a449415..a3e0d63c9c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
@@ -106,7 +106,7 @@ public static MApplicationElement[] getModelElements(Class<? extends MApplicatio
 
 	private static MCommand[] getCommands(IConfigurationElement[] elements, MApplication application) {
 
-		final ArrayList<MCommand> result = new ArrayList<MCommand>();
+		final ArrayList<MCommand> result = new ArrayList<>();
 
 		final MCommandsFactory commandsFactory = MCommandsFactory.INSTANCE;
 
@@ -136,7 +136,7 @@ private static MCommand[] getCommands(IConfigurationElement[] elements, MApplica
 
 	private static MPerspective[] getPerspectives(IConfigurationElement[] elements) {
 
-		final ArrayList<MPerspective> result = new ArrayList<MPerspective>();
+		final ArrayList<MPerspective> result = new ArrayList<>();
 
 		final MAdvancedFactory factory = MAdvancedFactory.INSTANCE;
 
@@ -155,7 +155,7 @@ private static MPerspective[] getPerspectives(IConfigurationElement[] elements)
 
 	private static MCategory[] getCategories(IConfigurationElement[] elements) {
 
-		final ArrayList<MCategory> result = new ArrayList<MCategory>();
+		final ArrayList<MCategory> result = new ArrayList<>();
 
 		final MCommandsFactory commandsFactory = MCommandsFactory.INSTANCE;
 
@@ -174,7 +174,7 @@ private static MCategory[] getCategories(IConfigurationElement[] elements) {
 
 	private static MPart[] getViews(IConfigurationElement[] elements) {
 
-		final ArrayList<MPart> result = new ArrayList<MPart>();
+		final ArrayList<MPart> result = new ArrayList<>();
 		for (final IConfigurationElement element : elements) {
 			final MPart part = (MPart) EcoreUtil.create(BasicPackageImpl.Literals.PART);
 			part.setElementId(element.getAttribute(ID));
@@ -210,7 +210,7 @@ private static MMenu createViewMenu(MPart part) {
 	}
 
 	private static MPart[] getViewsAsCompatibilityViews(IConfigurationElement[] elements) {
-		final ArrayList<MPart> result = new ArrayList<MPart>();
+		final ArrayList<MPart> result = new ArrayList<>();
 		final MPart[] parts = getViews(elements);
 		for (final MPart part : parts) {
 			part.setContributionURI(COMPATIBILITY_VIEW);
@@ -220,7 +220,7 @@ private static MPart[] getViewsAsCompatibilityViews(IConfigurationElement[] elem
 	}
 
 	private static MPartDescriptor[] getPartDescriptorsAsCompatibilyViews(IConfigurationElement[] elements) {
-		final ArrayList<MPartDescriptor> result = new ArrayList<MPartDescriptor>();
+		final ArrayList<MPartDescriptor> result = new ArrayList<>();
 		final MPartDescriptor[] parts = getViewPartDescriptors(elements);
 		for (final MPartDescriptor part : parts) {
 			part.setContributionURI(COMPATIBILITY_VIEW);
@@ -231,7 +231,7 @@ private static MPartDescriptor[] getPartDescriptorsAsCompatibilyViews(IConfigura
 
 	private static MPart[] getEditors(IConfigurationElement[] elements) {
 
-		final ArrayList<MPart> result = new ArrayList<MPart>();
+		final ArrayList<MPart> result = new ArrayList<>();
 		for (final IConfigurationElement element : elements) {
 			if ("editor".equals(element.getName())) /* Sanity Check */{ //$NON-NLS-1$
 				final MPart part = (MPart) EcoreUtil.create(BasicPackageImpl.Literals.PART);
@@ -257,7 +257,7 @@ private static MPart[] getEditors(IConfigurationElement[] elements) {
 
 	private static MPartDescriptor[] getEditorPartDescriptors(IConfigurationElement[] elements) {
 
-		final ArrayList<MPartDescriptor> result = new ArrayList<MPartDescriptor>();
+		final ArrayList<MPartDescriptor> result = new ArrayList<>();
 		for (final IConfigurationElement element : elements) {
 			final MPartDescriptor part = (MPartDescriptor) EcoreUtil
 				.create(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR);
@@ -290,7 +290,7 @@ private static MPartDescriptor[] getEditorPartDescriptors(IConfigurationElement[
 
 	private static MPartDescriptor[] getViewPartDescriptors(IConfigurationElement[] elements) {
 
-		final ArrayList<MPartDescriptor> result = new ArrayList<MPartDescriptor>();
+		final ArrayList<MPartDescriptor> result = new ArrayList<>();
 		for (final IConfigurationElement element : elements) {
 			final MPartDescriptor part = (MPartDescriptor) EcoreUtil
 				.create(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR);
@@ -316,7 +316,7 @@ private static MPartDescriptor[] getViewPartDescriptors(IConfigurationElement[]
 
 	private static MHandler[] getHandlers(IConfigurationElement[] elements, MApplication application) {
 
-		final ArrayList<MHandler> result = new ArrayList<MHandler>();
+		final ArrayList<MHandler> result = new ArrayList<>();
 		for (final IConfigurationElement element : elements) {
 			final MHandler hand = MCommandsFactory.INSTANCE.createHandler();
 			hand.setElementId(element.getAttribute(ID));
@@ -369,7 +369,7 @@ public static String[] getProvidingBundles(IExtensionRegistry registry, String e
 			return new String[] { "No " + IExtensionLookup.class.getName() + " service found." }; //$NON-NLS-1$ //$NON-NLS-2$
 		}
 
-		final ArrayList<String> result = new ArrayList<String>();
+		final ArrayList<String> result = new ArrayList<>();
 
 		final IExtension[] extensions = service.findExtensions(extensionPoint, isLive);
 		for (final IExtension extension : extensions) {
@@ -401,7 +401,7 @@ public static IConfigurationElement[] getExtensions(IExtensionRegistry registry,
 			return new IConfigurationElement[0];
 		}
 
-		final ArrayList<IConfigurationElement> result = new ArrayList<IConfigurationElement>();
+		final ArrayList<IConfigurationElement> result = new ArrayList<>();
 
 		final IExtension[] extensions = service.findExtensions(struct.getExtensionPoint(), isLive);
 		for (final IExtension extension : extensions) {
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
index 2961b83bdb..f41892c650 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
@@ -96,7 +96,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
@@ -119,6 +119,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
index 8c571a4b6d..cd32e5711d 100644
--- a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
@@ -95,7 +95,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
@@ -118,6 +118,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java
index b9104c4cbb..10a2ed2265 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java
@@ -46,7 +46,7 @@ public PackageAdmin getPackageAdmin() {
 			if (bundleContext == null) {
 				return null;
 			}
-			pkgAdminTracker = new ServiceTracker<PackageAdmin, PackageAdmin>(bundleContext,
+			pkgAdminTracker = new ServiceTracker<>(bundleContext,
 				PackageAdmin.class, null);
 			pkgAdminTracker.open();
 		}
@@ -58,7 +58,7 @@ public LogService getLogService() {
 			if (bundleContext == null) {
 				return null;
 			}
-			logTracker = new ServiceTracker<LogService, LogService>(bundleContext,
+			logTracker = new ServiceTracker<>(bundleContext,
 				LogService.class, null);
 			logTracker.open();
 		}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
index 773cfdf101..e39785d84d 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
@@ -90,9 +90,9 @@ public void dispose() {
 	public static class ResourcePool implements IDiposeableResourcePool {
 		private IResourceService resourceService;
 
-		private List<IPooledResource<Image>> pooledImages = new ArrayList<IPooledResource<Image>>();
-		private List<IPooledResource<Font>> pooledFonts = new ArrayList<IPooledResource<Font>>();
-		private List<IPooledResource<Color>> pooledColors = new ArrayList<IPooledResource<Color>>();
+		private List<IPooledResource<Image>> pooledImages = new ArrayList<>();
+		private List<IPooledResource<Font>> pooledFonts = new ArrayList<>();
+		private List<IPooledResource<Color>> pooledColors = new ArrayList<>();
 		private final Display display;
 
 		@Inject
@@ -223,27 +223,27 @@ static class DisplayPool {
 
 		public Map<String, PooledResource<Color>> getColorPool() {
 			if (colorPool == null) {
-				colorPool = new HashMap<String, ResourceService.PooledResource<Color>>();
+				colorPool = new HashMap<>();
 			}
 			return colorPool;
 		}
 
 		public Map<String, PooledResource<Image>> getImagePool() {
 			if (imagePool == null) {
-				imagePool = new HashMap<String, ResourceService.PooledResource<Image>>();
+				imagePool = new HashMap<>();
 			}
 			return imagePool;
 		}
 
 		public Map<String, PooledResource<Font>> getFontPool() {
 			if (fontPool == null) {
-				fontPool = new HashMap<String, ResourceService.PooledResource<Font>>();
+				fontPool = new HashMap<>();
 			}
 			return fontPool;
 		}
 	}
 
-	private final Map<Display, DisplayPool> displayPool = new HashMap<Display, ResourceService.DisplayPool>();
+	private final Map<Display, DisplayPool> displayPool = new HashMap<>();
 	// private Map<String, IResourceProviderService> imagekey2providers = new
 	// HashMap<String, IResourceProviderService>();
 	// private Map<String, IResourceProviderService> fontkey2providers = new
@@ -286,7 +286,7 @@ private <R extends Resource> PooledResource<R> loadResource(
 		if (resource != null && resource.getResource() != null) {
 			resource.count++;
 		} else {
-			resource = new PooledResource<R>(display, this, key,
+			resource = new PooledResource<>(display, this, key,
 				(R) lookupResource(display, key, type));
 
 			if (p == null) {
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
index 8c571a4b6d..cd32e5711d 100644
--- a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
@@ -95,7 +95,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
@@ -118,6 +118,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
index e8cae01b62..25397bc12e 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
@@ -169,8 +169,8 @@ protected void checkRequiredBundles() {
 			final IRequiredBundleDescription[] arTmp = description.getRequiredBundles();
 			final IPackageImportDescription[] currentImportPacks = description.getPackageImports();
 			final Set<String> requiredImportPacks = getImportedPackages();
-			final List<IRequiredBundleDescription> descs = new ArrayList<IRequiredBundleDescription>();
-			final List<IPackageImportDescription> imDescs = new ArrayList<IPackageImportDescription>();
+			final List<IRequiredBundleDescription> descs = new ArrayList<>();
+			final List<IPackageImportDescription> imDescs = new ArrayList<>();
 
 			if (arTmp != null) {
 				descs.addAll(Arrays.asList(arTmp));
@@ -235,13 +235,13 @@ private static boolean isOptional(String[] parts) {
 	// }
 
 	protected Set<String> getRequiredBundles() {
-		final Set<String> rv = new HashSet<String>();
+		final Set<String> rv = new HashSet<>();
 		//		rv.add("javax.inject"); //$NON-NLS-1$
 		return rv;
 	}
 
 	protected Set<String> getImportedPackages() {
-		final Set<String> rv = new HashSet<String>();
+		final Set<String> rv = new HashSet<>();
 		rv.add("javax.inject;version=\"1.0.0\""); //$NON-NLS-1$
 		return rv;
 	}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index 55b6a0e434..d3addc3c26 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -145,7 +145,7 @@ protected void execute(IProgressMonitor progressMonitor) {
 
 						// Save the contents of the resource to the file system.
 						//
-						final Map<Object, Object> options = new HashMap<Object, Object>();
+						final Map<Object, Object> options = new HashMap<>();
 						resource.save(options);
 						adjustBuildPropertiesFile(modelFile);
 						adjustDependencies(modelFile);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
index bd4bad629a..ebb7c02521 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
@@ -28,7 +28,7 @@
 
 public class ExtractContributionModelWizard extends BaseApplicationModelWizard {
 
-	private final List<MApplicationElement> oes = new ArrayList<MApplicationElement>();
+	private final List<MApplicationElement> oes = new ArrayList<>();
 
 	public ExtractContributionModelWizard(MApplicationElement oe) {
 		super();
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
index 638a77b70e..4d9c847329 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
@@ -72,7 +72,7 @@ public static void resolveImports(MApplicationElement moe, Map<MApplicationEleme
 	 */
 	public static MModelFragments createInitialModel(List<MApplicationElement> extractedElements) {
 		final MModelFragments mModelFragments = MFragmentFactory.INSTANCE.createModelFragments();
-		final HashMap<MApplicationElement, MApplicationElement> importCommands = new HashMap<MApplicationElement, MApplicationElement>();
+		final HashMap<MApplicationElement, MApplicationElement> importCommands = new HashMap<>();
 		for (final MApplicationElement moe : extractedElements) {
 			final EObject eObject = (EObject) moe;
 			final TreeIterator<EObject> eAllContents = eObject.eAllContents();
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java
index 0a20556921..f4861ec98c 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java
@@ -41,7 +41,7 @@ public class FragmentMergeHelper {
 	 */
 	public static void merge(MModelFragments sourceFragments, MModelFragments targetFragments) {
 		targetFragments.getFragments().addAll(sourceFragments.getFragments());
-		final List<MApplicationElement> sourceImports = new ArrayList<MApplicationElement>();
+		final List<MApplicationElement> sourceImports = new ArrayList<>();
 
 		consolidateImports(targetFragments);
 

From dfe1cf45e499183c92dfb3cac50c262e7d7ccd66 Mon Sep 17 00:00:00 2001
From: Simon Scholz <simon.scholz@vogella.com>
Date: Wed, 19 Aug 2015 13:42:43 +0200
Subject: [PATCH 0913/1286] Bug 475365 - [Model Editor] The ModelEditor should
 use a DelegatingStyledCellLabelProvider

Change-Id: I726e900a840392dd198f97cd7a3d0ae84679e0c7
Signed-off-by: Simon Scholz <simon.scholz@vogella.com>
---
 .../common/ComponentLabelProvider.java        | 86 +++++++++++--------
 .../emf/ui/internal/common/E4PickList.java    | 33 ++++---
 .../emf/ui/internal/common/ModelEditor.java   | 10 ++-
 .../common/component/ApplicationEditor.java   | 11 ++-
 .../common/component/CompositePartEditor.java |  8 +-
 .../component/PerspectiveStackEditor.java     | 10 ++-
 .../component/TrimContributionEditor.java     | 10 ++-
 .../dialogs/ParameterIdSelectionDialog.java   |  9 +-
 8 files changed, 117 insertions(+), 60 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index 045928c90c..6d045a6bb7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2015 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Simon Scholz <simon.scholz@vogella.com> - Bug 475365
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
@@ -14,17 +15,20 @@
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.resource.FontDescriptor;
 import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jface.viewers.BaseLabelProvider;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
+import org.eclipse.jface.viewers.IFontProvider;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.StyledString.Styler;
-import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.TextStyle;
 
-public class ComponentLabelProvider extends StyledCellLabelProvider {
+public class ComponentLabelProvider extends BaseLabelProvider implements IStyledLabelProvider, IFontProvider {
 
 	private final ModelEditor editor;
 
@@ -34,7 +38,7 @@ public class ComponentLabelProvider extends StyledCellLabelProvider {
 
 	public static final String NOT_VISIBLE_AND_RENDERED_KEY = "NOT_VISIBLE_AND_RENDERED_KEY";//$NON-NLS-1$
 
-	private Font font;
+	private final FontDescriptor italicFontDescriptor;
 
 	private final Messages Messages;
 
@@ -61,16 +65,28 @@ public void applyStyles(TextStyle textStyle) {
 		}
 	};
 
-	public ComponentLabelProvider(ModelEditor editor, Messages Messages) {
+	private final ResourceManager resourceManager;
+
+	public ComponentLabelProvider(ModelEditor editor, Messages Messages, FontDescriptor italicFontDescriptor) {
 		this.editor = editor;
 		this.Messages = Messages;
+		this.italicFontDescriptor = italicFontDescriptor;
+		resourceManager = new LocalResourceManager(JFaceResources.getResources());
+	}
+
+	@Override
+	public void dispose() {
+		if (resourceManager != null) {
+			resourceManager.dispose();
+		}
+		super.dispose();
 	}
 
 	@Override
-	public void update(final ViewerCell cell) {
-		if (cell.getElement() instanceof EObject) {
+	public StyledString getStyledText(Object element) {
+		if (element instanceof EObject) {
 
-			final EObject o = (EObject) cell.getElement();
+			final EObject o = (EObject) element;
 			final AbstractComponentEditor elementEditor = editor.getEditor(o.eClass());
 			if (elementEditor != null) {
 				String label = elementEditor.getLabel(o);
@@ -80,7 +96,8 @@ public void update(final ViewerCell cell) {
 				if (o instanceof MUIElement) {
 
 					if (!((MUIElement) o).isVisible() && !((MUIElement) o).isToBeRendered()) {
-						label += "<" + Messages.ComponentLabelProvider_invisible + "/" + Messages.ComponentLabelProvider_notrendered + ">"; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+						label += "<" + Messages.ComponentLabelProvider_invisible + "/" //$NON-NLS-1$//$NON-NLS-2$
+								+ Messages.ComponentLabelProvider_notrendered + ">"; //$NON-NLS-1$
 						styler = BOTH_STYLER;
 					} else if (!((MUIElement) o).isVisible()) {
 						label += "<" + Messages.ComponentLabelProvider_invisible + ">"; //$NON-NLS-1$//$NON-NLS-2$
@@ -92,38 +109,33 @@ public void update(final ViewerCell cell) {
 				}
 
 				if (detailText == null) {
-					final StyledString styledString = new StyledString(label, styler);
-					cell.setText(styledString.getString());
-					cell.setStyleRanges(styledString.getStyleRanges());
-				} else {
-					final StyledString styledString = new StyledString(label, styler);
-					styledString.append(" - " + detailText, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
-					cell.setText(styledString.getString());
-					cell.setStyleRanges(styledString.getStyleRanges());
+					return new StyledString(label, styler);
 				}
-				cell.setImage(elementEditor.getImage(o));
-			} else {
-				cell.setText(cell.getElement().toString());
+				final StyledString styledString = new StyledString(label, styler);
+				styledString.append(" - " + detailText, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+				return styledString;
 			}
-		} else if (cell.getElement() instanceof VirtualEntry<?>) {
-			final String s = cell.getElement().toString();
-			if (font == null) {
-				final FontData[] data = cell.getControl().getFont().getFontData();
-				font = new Font(cell.getControl().getDisplay(), new FontData(data[0].getName(), data[0].getHeight(), SWT.ITALIC));
+		}
+		return new StyledString(element.toString());
+	}
+
+	@Override
+	public Image getImage(Object element) {
+		if (element instanceof EObject) {
+			final EObject o = (EObject) element;
+			final AbstractComponentEditor elementEditor = editor.getEditor(o.eClass());
+			if (elementEditor != null) {
+				return elementEditor.getImage(element);
 			}
-			cell.setFont(font);
-			cell.setText(s);
-		} else {
-			cell.setText(cell.getElement().toString());
 		}
+		return null;
 	}
 
 	@Override
-	public void dispose() {
-		if (font != null) {
-			font.dispose();
-			font = null;
+	public Font getFont(Object element) {
+		if(element instanceof VirtualEntry<?>) {
+			return resourceManager.createFont(italicFontDescriptor);
 		}
-		super.dispose();
+		return null;
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
index edad4587be..5c7e824a55 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2015 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation
+ * Simon Scholz <simon.scholz@vogella.com> - Bug 475365
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common;
@@ -31,10 +32,13 @@
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.resource.FontDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 
 /**
@@ -68,7 +72,7 @@ public Struct(String label, EClass eClass, boolean separator) {
 	}
 
 	public E4PickList(Composite parent, int style, List<PickListFeatures> listFeatures, final Messages messages,
-		final AbstractComponentEditor componentEditor, final EStructuralFeature feature) {
+			final AbstractComponentEditor componentEditor, final EStructuralFeature feature) {
 		super(parent, style, listFeatures, messages, componentEditor);
 
 		this.componentEditor = componentEditor;
@@ -83,7 +87,10 @@ public String getText(Object element) {
 			}
 		});
 
-		viewer.setLabelProvider(new ComponentLabelProvider(componentEditor.getEditor(), messages));
+		final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont())
+				.setStyle(SWT.ITALIC);
+		viewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
+				new ComponentLabelProvider(componentEditor.getEditor(), messages, italicFontDescriptor)));
 		final ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
 	}
@@ -100,7 +107,7 @@ protected void tryEObjectMove(Object obj, EObject container, int delta) {
 		final int idx = l.indexOf(obj) + delta;
 		if (delta > 0 && idx < l.size() || delta < 0 && idx >= 0) {
 			final Command cmd = MoveCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster()
-				.getValue(), feature, obj, idx);
+					.getValue(), feature, obj, idx);
 
 			if (cmd.canExecute()) {
 				componentEditor.getEditingDomain().getCommandStack().execute(cmd);
@@ -122,7 +129,7 @@ protected void _handleAdd(EClass eClass, boolean separator) {
 		final MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
 		setElementId(eObject);
 		final Command cmd = AddCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster()
-			.getValue(), feature, eObject);
+				.getValue(), feature, eObject);
 
 		if (cmd.canExecute()) {
 			componentEditor.getEditingDomain().getCommandStack().execute(cmd);
@@ -137,7 +144,7 @@ protected void setElementId(Object element) {
 			final MApplicationElement el = (MApplicationElement) element;
 			if (el.getElementId() == null || el.getElementId().trim().length() == 0) {
 				el.setElementId(Util.getDefaultElementId(
-					((EObject) componentEditor.getMaster().getValue()).eResource(), el, componentEditor.getEditor()
+						((EObject) componentEditor.getMaster().getValue()).eResource(), el, componentEditor.getEditor()
 						.getProject()));
 			}
 		}
@@ -169,13 +176,13 @@ protected void moveUpPressed() {
 				if (idx >= 0) {
 					if (obj instanceof MUIElement && feature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 						if (Util.moveElementByIndex(componentEditor.getEditingDomain(), (MUIElement) obj,
-							componentEditor.getEditor().isLiveModel(), idx)) {
+								componentEditor.getEditor().isLiveModel(), idx)) {
 							viewer.setSelection(new StructuredSelection(obj));
 						}
 					} else if (obj instanceof MApplicationElement
-						|| obj instanceof org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container) {
+							|| obj instanceof org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container) {
 						final Command cmd = MoveCommand.create(componentEditor.getEditingDomain(), componentEditor
-							.getMaster().getValue(), feature, obj, idx);
+								.getMaster().getValue(), feature, obj, idx);
 						if (cmd.canExecute()) {
 							componentEditor.getEditingDomain().getCommandStack().execute(cmd);
 							viewer.setSelection(new StructuredSelection(obj));
@@ -205,13 +212,13 @@ protected void moveDownPressed() {
 				if (idx < children.size()) {
 					if (obj instanceof MUIElement && feature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 						if (Util.moveElementByIndex(componentEditor.getEditingDomain(), (MUIElement) obj,
-							componentEditor.getEditor().isLiveModel(), idx)) {
+								componentEditor.getEditor().isLiveModel(), idx)) {
 							viewer.setSelection(new StructuredSelection(obj));
 						}
 					} else if (obj instanceof MApplicationElement
-						|| obj instanceof org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container) {
+							|| obj instanceof org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container) {
 						final Command cmd = MoveCommand.create(componentEditor.getEditingDomain(), componentEditor
-							.getMaster().getValue(), feature, obj, idx);
+								.getMaster().getValue(), feature, obj, idx);
 						if (cmd.canExecute()) {
 							componentEditor.getEditingDomain().getCommandStack().execute(cmd);
 							viewer.setSelection(new StructuredSelection(obj));
@@ -227,7 +234,7 @@ protected void removePressed() {
 		if (!viewer.getSelection().isEmpty()) {
 			final List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
 			final Command cmd = RemoveCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster()
-				.getValue(), feature, keybinding);
+					.getValue(), feature, keybinding);
 			if (cmd.canExecute()) {
 				componentEditor.getEditingDomain().getCommandStack().execute(cmd);
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 782464aa14..c9e6067f6e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2015 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,6 +12,7 @@
  * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  * Steven Spungin <steven@spungin.tv> - Bug 396902, 431755, 431735, 424730, 424730, 391089, 437236, 437552, Ongoing
  * Maintenance
+ * Simon Scholz <simon.scholz@vogella.com> - Bug 475365
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
@@ -189,11 +190,13 @@
 import org.eclipse.jface.databinding.viewers.ObservableListTreeContentProvider;
 import org.eclipse.jface.databinding.viewers.TreeStructureAdvisor;
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.resource.FontDescriptor;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.resource.StringConverter;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -1094,7 +1097,10 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		}
 		final TreeViewer viewer = tempViewer;
 
-		viewer.setLabelProvider(new ComponentLabelProvider(this, messages));
+		final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont())
+				.setStyle(SWT.ITALIC);
+		viewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
+				new ComponentLabelProvider(this, messages, italicFontDescriptor)));
 		final ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(
 				new ObservableFactoryImpl(), new TreeStructureAdvisor() {
 				});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 69a28c3742..00b54c633f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2015 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
+ * Simon Scholz <simon.scholz@vogella.com> - Bug 475365
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -54,9 +55,11 @@
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.resource.FontDescriptor;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -572,7 +575,11 @@ public void modifyText(ModifyEvent e) {
 				l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
 
 				bindtableViewer = new TableViewer(group);
-				bindtableViewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
+				final FontDescriptor italicFontDescriptor = FontDescriptor
+						.createFrom(bindtableViewer.getControl().getFont())
+						.setStyle(SWT.ITALIC);
+				bindtableViewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
+						new ComponentLabelProvider(getEditor(), Messages, italicFontDescriptor)));
 				bindtableViewer.setContentProvider(new ArrayContentProvider());
 				bindtableViewer.setInput(application.getBindingTables());
 				bindtableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index 8024deb64e..85f0ec824d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -49,8 +49,10 @@
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.resource.FontDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -363,7 +365,11 @@ public void widgetSelected(SelectionEvent e) {
 			viewer.getControl().setLayoutData(gd);
 			final ObservableListContentProvider cp = new ObservableListContentProvider();
 			viewer.setContentProvider(cp);
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
+
+			final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont())
+					.setStyle(SWT.ITALIC);
+			viewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
+					new ComponentLabelProvider(getEditor(), Messages, italicFontDescriptor)));
 
 			final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 639994a2a6..abe3252785 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2015 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Simon Scholz <simon.scholz@vogella.com> - Bug 475365
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -48,6 +49,8 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.resource.FontDescriptor;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.window.Window;
@@ -203,7 +206,10 @@ protected void addPressed() {
 
 			final TableViewer viewer = pickList.getList();
 			viewer.setContentProvider(new ObservableListContentProvider());
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
+			final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont())
+					.setStyle(SWT.ITALIC);
+			viewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
+					new ComponentLabelProvider(getEditor(), Messages, italicFontDescriptor)));
 			final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index f3f95a35f3..2cf92d3543 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2015 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,6 +12,7 @@
  * Nicolaj Hoess <nicohoess@gmail.com> - Bug 396975
  * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  * Olivier Prouvost <olivier@opcoach.com> - Bug 462818
+ * Simon Scholz <simon.scholz@vogella.com> - Bug 475365
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -54,7 +55,9 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.resource.FontDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -243,7 +246,10 @@ protected void addPressed() {
 			pickList.setText(Messages.TrimContributionEditor_Controls);
 
 			final TableViewer viewer = pickList.getList();
-			viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
+			final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont())
+					.setStyle(SWT.ITALIC);
+			viewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
+					new ComponentLabelProvider(getEditor(), Messages, italicFontDescriptor)));
 			viewer.setContentProvider(new ObservableListContentProvider());
 			final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			viewer.setInput(prop.observeDetail(getMaster()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
index 248a5c5fc1..4251c1a1f7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
@@ -8,6 +8,7 @@
  *
  * Contributors:
  * Veselin Markov <veselin_m84@yahoo.com> - initial API and implementation
+ * Simon Scholz <simon.scholz@vogella.com> - Bug 475365
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -38,7 +39,10 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.resource.FontDescriptor;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Shell;
 
 /**
@@ -70,7 +74,10 @@ public ParameterIdSelectionDialog(Shell parentShell, IModelResource resource, MP
 
 	@Override
 	protected IBaseLabelProvider getLabelProvider() {
-		return new ComponentLabelProvider(editor, messages);
+		final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont())
+				.setStyle(SWT.ITALIC);
+		return new DelegatingStyledCellLabelProvider(
+				new ComponentLabelProvider(editor, messages, italicFontDescriptor));
 	}
 
 	@Override

From 8aa15ddd9fbb97a10c671c24167ef5807b219c00 Mon Sep 17 00:00:00 2001
From: Jonas Helming <jonas.helming@googlemail.com>
Date: Wed, 12 Aug 2015 11:11:41 +0200
Subject: [PATCH 0914/1286] Bug 441485 - [Model Editor] Adjust ModelEditor to
 use org.eclipse.e4.ui.dialogs.filteredtree.FilteredTree

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

Change-Id: Ic873b21b3acd07793176d0fd0183fa9687116fc0
Signed-off-by: Jonas Helming <jonas.helming@googlemail.com>
---
 .../META-INF/MANIFEST.MF                      |  4 +-
 .../tools/emf/ui/internal/PatternFilter.java  | 59 -------------------
 .../emf/ui/internal/common/ModelEditor.java   |  6 +-
 .../common/component/ControlFactory.java      |  2 +-
 .../AbstractCommandSelectionDialog.java       |  4 +-
 .../component/dialogs/AbstractIdDialog.java   |  4 +-
 .../BindingContextSelectionDialog.java        |  4 +-
 .../CommandCategorySelectionDialog.java       |  4 +-
 .../component/dialogs/ExpressionIdDialog.java |  4 +-
 .../dialogs/SharedElementsDialog.java         |  4 +-
 10 files changed, 18 insertions(+), 77 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 0a49b4c47a..d5c84fed33 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -32,11 +32,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.jface.text;bundle-version="3.7.0",
  org.eclipse.e4.ui.widgets;bundle-version="0.11.0",
  org.eclipse.equinox.preferences;bundle-version="3.4.0",
- org.eclipse.e4.ui.workbench.swt;bundle-version="0.10.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.9.0",
  org.eclipse.jdt.core;resolution:=optional,
  org.eclipse.pde.core;resolution:=optional,
- org.eclipse.e4.core.commands;bundle-version="0.10.0"
+ org.eclipse.e4.core.commands;bundle-version="0.10.0",
+ org.eclipse.e4.ui.dialogs;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.0.0",
  javax.inject;version="1.0.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
deleted file mode 100644
index 9da394cf0c..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- * IBM Corporation - initial API and implementation
- * Wim Jongman - Maintenance (391086)
- *******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-
-public class PatternFilter extends org.eclipse.e4.ui.workbench.swt.internal.copy.PatternFilter {
-
-	/**
-	 * This constructor will call {@link #setIncludeLeadingWildcard(boolean)} with boolean=true.
-	 */
-	public PatternFilter() {
-		setIncludeLeadingWildcard(true);
-	}
-
-	/**
-	 * Check if the current (leaf) element is a match with the filter text. The
-	 * default behavior checks that the label of the element is a match.
-	 *
-	 * Subclasses should override this method.
-	 *
-	 * @param viewer
-	 *            the viewer that contains the element
-	 * @param element
-	 *            the tree element to check
-	 * @return true if the given element's label matches the filter text
-	 */
-	@Override
-	protected boolean isLeafMatch(Viewer viewer, Object element) {
-
-		final Object labelProvider = ((StructuredViewer) viewer).getLabelProvider();
-		String labelText = null;
-
-		if (labelProvider instanceof ILabelProvider) {
-			labelText = ((ILabelProvider) labelProvider).getText(element);
-		} else {
-			if (element != null) {
-				labelText = element.toString();
-			}
-		}
-
-		if (labelText == null) {
-			return false;
-		}
-		return wordMatches(labelText);
-	}
-
-}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index c9e6067f6e..0d8d114ac3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -69,7 +69,6 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.AddonsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ApplicationEditor;
@@ -150,6 +149,8 @@
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.di.Persist;
 import org.eclipse.e4.ui.di.PersistState;
+import org.eclipse.e4.ui.dialogs.filteredtree.FilteredTree;
+import org.eclipse.e4.ui.dialogs.filteredtree.PatternFilter;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
@@ -166,7 +167,6 @@
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.e4.ui.model.internal.ModelUtils;
 import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
-import org.eclipse.e4.ui.workbench.swt.internal.copy.FilteredTree;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -1089,7 +1089,7 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 				.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
 		if (property != null || preferences.getBoolean(ModelEditorPreferences.TAB_FORM_SEARCH_SHOW, false)) {
 			final FilteredTree viewParent = new FilteredTree(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL
-					| SWT.V_SCROLL, new PatternFilter(), false);
+ | SWT.V_SCROLL, new PatternFilter(true));
 			tempViewer = viewParent.getViewer();
 		} else {
 			tempViewer = new TreeViewerEx(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index d7766c13f5..e9b3f3c1e6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -34,7 +34,6 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
@@ -44,6 +43,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.properties.ProjectOSGiTranslationProvider;
 import org.eclipse.e4.tools.services.IClipboardService.Handler;
 import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.e4.ui.dialogs.filteredtree.PatternFilter;
 import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index 9c71592131..c4458234f7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -16,8 +16,8 @@
 
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
+import org.eclipse.e4.ui.dialogs.filteredtree.PatternFilter;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -116,7 +116,7 @@ public void doubleClick(DoubleClickEvent event) {
 		}
 		viewer.setInput(commands);
 
-		final PatternFilter filter = new PatternFilter() {
+		final PatternFilter filter = new PatternFilter(true) {
 			@Override
 			protected boolean isParentMatch(Viewer viewer, Object element) {
 				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
index a8661b359c..c2dcd346e5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
@@ -16,8 +16,8 @@
 
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
+import org.eclipse.e4.ui.dialogs.filteredtree.PatternFilter;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.workbench.modeling.EModelService;
 import org.eclipse.emf.common.command.Command;
@@ -122,7 +122,7 @@ protected Control createDialogArea(Composite parent) {
 		final Text idField = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		idField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
-		final PatternFilter filter = new PatternFilter() {
+		final PatternFilter filter = new PatternFilter(true) {
 			@Override
 			protected boolean isParentMatch(Viewer viewer, Object element) {
 				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
index 147690ed1c..20ba298290 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
@@ -16,8 +16,8 @@
 
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
+import org.eclipse.e4.ui.dialogs.filteredtree.PatternFilter;
 import org.eclipse.e4.ui.model.application.commands.MBindingContext;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.emf.common.util.TreeIterator;
@@ -113,7 +113,7 @@ public void doubleClick(DoubleClickEvent event) {
 		}
 		viewer.setInput(categories);
 
-		final PatternFilter filter = new PatternFilter() {
+		final PatternFilter filter = new PatternFilter(true) {
 			@Override
 			protected boolean isParentMatch(Viewer viewer, Object element) {
 				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
index 0d357f300c..3f3d35e2c5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -16,8 +16,8 @@
 
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
+import org.eclipse.e4.ui.dialogs.filteredtree.PatternFilter;
 import org.eclipse.e4.ui.model.application.commands.MCategory;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
@@ -114,7 +114,7 @@ public void doubleClick(DoubleClickEvent event) {
 		}
 		viewer.setInput(categories);
 
-		final PatternFilter filter = new PatternFilter() {
+		final PatternFilter filter = new PatternFilter(true) {
 			@Override
 			protected boolean isParentMatch(Viewer viewer, Object element) {
 				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
index cf1af13378..1f600199df 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
@@ -18,8 +18,8 @@
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.e4.tools.emf.ui.common.IExtensionLookup;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
+import org.eclipse.e4.ui.dialogs.filteredtree.PatternFilter;
 import org.eclipse.e4.ui.model.application.ui.MCoreExpression;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -79,8 +79,8 @@ protected Control createDialogArea(Composite parent) {
 
 		final Text idField = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		idField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
		final PatternFilter filter = new PatternFilter(true) {
 
-		final PatternFilter filter = new PatternFilter() {
 			@Override
 			protected boolean isParentMatch(Viewer viewer, Object element) {
 				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index 6a3eae22c1..6d63c09476 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -18,9 +18,9 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
+import org.eclipse.e4.ui.dialogs.filteredtree.PatternFilter;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -132,7 +132,7 @@ public void doubleClick(DoubleClickEvent event) {
 			viewer.setInput(list);
 		}
 
-		final PatternFilter filter = new PatternFilter() {
+		final PatternFilter filter = new PatternFilter(true) {
 			@Override
 			protected boolean isParentMatch(Viewer viewer, Object element) {
 				return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element);

From cfe8f10c0dcac5f853ac43554f662d337e600a1d Mon Sep 17 00:00:00 2001
From: Jonas Helming <jonas.helming@googlemail.com>
Date: Mon, 17 Aug 2015 13:55:58 +0200
Subject: [PATCH 0915/1286] Bug 474966 - Model Editor shall support perspective
 as a handler container

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

Change-Id: I3e6acff02cf0046827974f585769948b98482346
Signed-off-by: Jonas Helming <jonas.helming@googlemail.com>
---
 .../common/component/PerspectiveEditor.java         | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 7363c5cd82..6cd13e40c1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -33,6 +33,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PerspectiveIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
@@ -75,6 +76,8 @@ public class PerspectiveEditor extends AbstractComponentEditor {
 			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private final IListProperty PERSPECTIVE__WINDOWS = EMFProperties
 			.list(AdvancedPackageImpl.Literals.PERSPECTIVE__WINDOWS);
+	private final IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties
+			.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<>();
 
@@ -308,6 +311,16 @@ private void createUITreeInspection(CTabFolder folder) {
 	@Override
 	public IObservableList getChildList(Object element) {
 		final WritableList list = new WritableList();
+
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS,
+				element, Messages.WindowEditor_Handlers) {
+
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+		});
+
 		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PERSPECTIVE_WINDOWS, PERSPECTIVE__WINDOWS, element,
 				Messages.WindowEditor_Windows) {
 

From cf2c58a239f9c16390a88ae52e74851640f47d56 Mon Sep 17 00:00:00 2001
From: Simon Scholz <simon.scholz@vogella.com>
Date: Wed, 26 Aug 2015 16:14:55 +0200
Subject: [PATCH 0916/1286] Bug 475365 - [Model Editor] The ModelEditor should
 use a DelegatingStyledCellLabelProvider

Change-Id: If89196ab1abcc01b45d0fadd6ca2925a548224f0
Signed-off-by: Simon Scholz <simon.scholz@vogella.com>
---
 .../component/dialogs/AbstractIdDialog.java   | 52 +++++++++++--------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
index c2dcd346e5..ec1df656df 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
@@ -9,6 +9,7 @@
  * Nicolaj Hoess <nicohoess@gmail.com> - initial implementation (Bug 396975)
  * Andrej Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 396975, 395283
  * Adrian Alcaide - initial implementation (Bug 396975)
+ * Simon Scholz <simon.scholz@vogella.com> - Bug 475365
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -26,16 +27,18 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.BaseLabelProvider;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -85,25 +88,7 @@ protected boolean isResizable() {
 	}
 
 	protected IBaseLabelProvider getLabelProvider() {
-		return new StyledCellLabelProvider() {
-
-			@Override
-			public void update(ViewerCell cell) {
-				@SuppressWarnings("unchecked")
-				final ElementClass el = (ElementClass) cell.getElement();
-				final String elementId = el.getElementId() != null && el.getElementId().trim().length() > 0 ? el
-					.getElementId() : "(Id missing)"; //$NON-NLS-1$
-				final StyledString str = new StyledString(elementId);
-
-				final String infoString = getListItemInformation(el);
-				if (infoString != null && infoString.trim().length() > 0) {
-					str.append(" - " + getListItemInformation(el), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
-				}
-
-				cell.setText(str.getString());
-				cell.setStyleRanges(str.getStyleRanges());
-			}
-		};
+		return new DelegatingStyledCellLabelProvider(new DefaultStyledLabelProvider());
 	}
 
 	@Override
@@ -162,4 +147,27 @@ protected void okPressed() {
 		}
 	}
 
-}
\ No newline at end of file
+	private class DefaultStyledLabelProvider extends BaseLabelProvider implements IStyledLabelProvider {
+
+		@Override
+		public StyledString getStyledText(Object element) {
+			@SuppressWarnings("unchecked")
+			final ElementClass el = (ElementClass) element;
+			final String elementId = el.getElementId() != null && el.getElementId().trim().length() > 0
+					? el.getElementId() : "(Id missing)"; //$NON-NLS-1$
+					final StyledString str = new StyledString(elementId);
+
+					final String infoString = getListItemInformation(el);
+					if (infoString != null && infoString.trim().length() > 0) {
+						str.append(" - " + getListItemInformation(el), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+					}
+
+					return str;
+		}
+
+		@Override
+		public Image getImage(Object element) {
+			return null;
+		}
+	}
+}

From 27de395ec69d8f839440bec2c9922a8e37ff2995 Mon Sep 17 00:00:00 2001
From: Jonas Helming <jonas.helming@googlemail.com>
Date: Mon, 10 Aug 2015 13:27:18 +0200
Subject: [PATCH 0917/1286] Bug 470998 - [e4 Tools] Extract fragment wizard
 creates multiple fragments for same location

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

Change-Id: I04f8b264db5fb68669a4ed226e47bef83058df2a
Signed-off-by: Jonas Helming <jonas.helming@googlemail.com>
---
 .../wizards/model/FragmentExtractHelper.java  | 21 ++++++++++++-------
 .../tools/test/FragmentExtractHelperTest.java | 17 ++++++++-------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
index 4d9c847329..a01633bff1 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
@@ -73,6 +73,7 @@ public static void resolveImports(MApplicationElement moe, Map<MApplicationEleme
 	public static MModelFragments createInitialModel(List<MApplicationElement> extractedElements) {
 		final MModelFragments mModelFragments = MFragmentFactory.INSTANCE.createModelFragments();
 		final HashMap<MApplicationElement, MApplicationElement> importCommands = new HashMap<>();
+		final HashMap<String, MStringModelFragment> createdFragments = new HashMap<>();
 		for (final MApplicationElement moe : extractedElements) {
 			final EObject eObject = (EObject) moe;
 			final TreeIterator<EObject> eAllContents = eObject.eAllContents();
@@ -85,16 +86,20 @@ public static MModelFragments createInitialModel(List<MApplicationElement> extra
 				FragmentExtractHelper.resolveImports(next, importCommands);
 				hasNext = eAllContents.hasNext();
 			}
-			final MStringModelFragment createStringModelFragment = MFragmentFactory.INSTANCE
-					.createStringModelFragment();
-			final MApplicationElement e = (MApplicationElement) EcoreUtil.copy((EObject) moe);
+			final MApplicationElement copy = (MApplicationElement) EcoreUtil.copy((EObject) moe);
 			final String featurename = ((EObject) moe).eContainmentFeature().getName();
-			createStringModelFragment
-			.setParentElementId(((MApplicationElement) ((EObject) moe).eContainer()).getElementId());
-			createStringModelFragment.getElements().add(e);
-			createStringModelFragment.setFeaturename(featurename);
+			final String containerID = ((MApplicationElement) ((EObject) moe).eContainer()).getElementId();
+			final String combinedID = containerID + featurename;
+			MStringModelFragment modelFragment = createdFragments.get(combinedID);
+			if (modelFragment == null) {
+				modelFragment = MFragmentFactory.INSTANCE.createStringModelFragment();
+				modelFragment.setParentElementId(containerID);
+				modelFragment.setFeaturename(featurename);
+				createdFragments.put(combinedID, modelFragment);
+				mModelFragments.getFragments().add(modelFragment);
+			}
+			modelFragment.getElements().add(copy);
 
-			mModelFragments.getFragments().add(createStringModelFragment);
 		}
 
 		final Set<MApplicationElement> keySet = importCommands.keySet();
diff --git a/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java b/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
index cca29bffd0..1d7b54e651 100644
--- a/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
+++ b/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
@@ -17,6 +17,7 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 
 import org.eclipse.e4.internal.tools.wizards.model.FragmentExtractHelper;
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -43,7 +44,6 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -58,6 +58,7 @@ public class FragmentExtractHelperTest {
 	private static final String HANDLER1ID = "handler1id"; //$NON-NLS-1$
 	private static final String COMMANDID = "commandid"; //$NON-NLS-1$
 	private static final String HANDLER2ID = "handler2id"; //$NON-NLS-1$
+	private static final String APPLICATIONID = "applicationid"; //$NON-NLS-1$
 	private MPart part1;
 	private MWindow window;
 	private MPart part2;
@@ -70,6 +71,7 @@ public class FragmentExtractHelperTest {
 	@Before
 	public void setup() {
 		application = MApplicationFactory.INSTANCE.createApplication();
+		application.setElementId(APPLICATIONID);
 	}
 
 	@Test
@@ -174,7 +176,7 @@ private void createWindow() {
 	}
 
 	@Test
-	@Ignore
+
 	/**
 	 * Test for BR 470998, ignored until it is fixed
 	 */
@@ -190,7 +192,7 @@ public void testExtractTwoPartsSameLocation() {
 		final MModelFragment modelFragment = initialModel.getFragments().get(0);
 		assertEquals(2, modelFragment.getElements().size());
 		assertExtractedElement(part1, modelFragment.getElements().get(0));
-		assertExtractedElement(part2, initialModel.getFragments().get(1).getElements().get(0));
+		assertExtractedElement(part2, modelFragment.getElements().get(1));
 	}
 
 	@Test
@@ -251,7 +253,7 @@ private MCommand createCommand() {
 	}
 
 	@Test
-	@Ignore
+
 	/**
 	 * Test for BR 470998, ignored until it is fixed
 	 */
@@ -267,7 +269,7 @@ public void testExtractTwoHandlerWithDifferentCommands() {
 		assertEquals(1, initialModel.getFragments().size());
 		assertEquals(2, initialModel.getImports().size());
 		final MModelFragment modelFragment = initialModel.getFragments().get(0);
-		assertEquals(1, modelFragment.getElements().size());
+		assertEquals(2, modelFragment.getElements().size());
 
 		assertTrue(initialModel.getImports().contains(((MHandler) modelFragment.getElements().get(0)).getCommand()));
 		assertTrue(initialModel.getImports().contains(((MHandler) modelFragment.getElements().get(1)).getCommand()));
@@ -342,7 +344,7 @@ public void testExtractTwoPartsWithTwoBindingContexts() {
 		part2.getBindingContexts().add(bindingContext1);
 
 
-		final HashMap<MApplicationElement, MApplicationElement> importCommands = new HashMap<MApplicationElement, MApplicationElement>();
+		final HashMap<MApplicationElement, MApplicationElement> importCommands = new LinkedHashMap<MApplicationElement, MApplicationElement>();
 
 		FragmentExtractHelper.resolveImports(part, importCommands);
 		FragmentExtractHelper.resolveImports(part2, importCommands);
@@ -369,7 +371,6 @@ private MHandledItem createHandledItem() {
 	}
 
 	@Test
-	@Ignore
 	/**
 	 * Test for BR 470998, ignored until it is fixed
 	 */
@@ -385,7 +386,7 @@ public void testExtractTwoHandlerWithSameCommand() {
 		assertEquals(1, initialModel.getFragments().size());
 		assertEquals(1, initialModel.getImports().size());
 		final MModelFragment modelFragment = initialModel.getFragments().get(0);
-		assertEquals(1, modelFragment.getElements().size());
+		assertEquals(2, modelFragment.getElements().size());
 
 		final MCommand importedCommand = (MCommand) initialModel.getImports().get(0);
 		final MHandler importedHandler1 = (MHandler) modelFragment.getElements().get(0);

From 274a2d045f43bfb031c1d458432b8af6f54360f3 Mon Sep 17 00:00:00 2001
From: Jonas Helming <jonas.helming@googlemail.com>
Date: Tue, 25 Aug 2015 11:49:39 +0200
Subject: [PATCH 0918/1286] Bug 470376 - English grammar strange in message

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

Change-Id: I13a10c13f6339a4ee536f89f754219a3392d3b94
Signed-off-by: Jonas Helming <jonas.helming@googlemail.com>
---
 .../eclipse/e4/tools/emf/ui/internal/Messages.properties    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index b9c5d8154a..0fba44f6c3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -601,9 +601,9 @@ FindImportElementDialog_noId=no ID
 FindImportElementDialog_ClearCache=Clear Cache
 FindImportElementDialog_NoIdReference=You can not import an element without an ID
 
-FindParentReferenceElementDialog_ShellTitle=Find Parent Elements
-FindParentReferenceElementDialog_Title=Find Parent Elements
-FindParentReferenceElementDialog_Message=Search for an elements who you like to references as parent
+FindParentReferenceElementDialog_ShellTitle=Select Extended Element
+FindParentReferenceElementDialog_Title=Select Extended Element
+FindParentReferenceElementDialog_Message=Search for the element to be extended by the model fragment.
 FindParentReferenceElementDialog_ContainerType=Container-Type
 FindParentReferenceElementDialog_Search=Search
 FindParentReferenceElementDialog_ClearCache=Clear Cache

From 088c4623af270776d9f218746cf805c6c29ca18d Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 3 Sep 2015 21:05:02 +0200
Subject: [PATCH 0919/1286] Bug 476603 - Missing Copyright header in
 FragmentMergeHelperTest

Change-Id: If22d9ce88daab71f49378053f7c6e938d1f15f8c
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../e4/tools/test/FragmentMergeHelperTest.java       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java b/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java
index 75604d19eb..74aff3d8f9 100644
--- a/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java
+++ b/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2015 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ * Jonas Helming- initial API and implementation
+ ******************************************************************************/
+
 package org.eclipse.e4.tools.test;
 
 import static org.junit.Assert.assertFalse;

From f12c40436392be2728ce99c7b048cd57e8cb1d4e Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Fri, 4 Sep 2015 15:10:08 +0200
Subject: [PATCH 0920/1286] Bug 472658 - Icon not refreshed when its URI is
 changed in model editors

The LABEL_ICON_URI property was not added in the listened properties...

Conflicts:
	bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java

Change-Id: I11e0cbb985c607c5c12eb7f90357832b84e8f739
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../emf/ui/common/component/AbstractComponentEditor.java     | 4 ++--
 .../tools/emf/ui/internal/common/component/AreaEditor.java   | 2 ++
 .../tools/emf/ui/internal/common/component/MenuEditor.java   | 5 ++++-
 .../emf/ui/internal/common/component/MenuItemEditor.java     | 2 ++
 .../ui/internal/common/component/PartDescriptorEditor.java   | 4 +++-
 .../tools/emf/ui/internal/common/component/PartEditor.java   | 2 ++
 .../emf/ui/internal/common/component/PerspectiveEditor.java  | 2 ++
 .../emf/ui/internal/common/component/ToolItemEditor.java     | 5 ++++-
 .../tools/emf/ui/internal/common/component/WindowEditor.java | 2 ++
 9 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 7d9b8c1e12..0da4d6926f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -9,7 +9,7 @@
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Marco Descher <marco@descher.at> - Bug 422465
  * Steven Spungin <steven@spungin.tv> - Bug 437951, Bug 439709
- * Olivier Prouvost <olivier.prouvost@opcoach.com> Bug 403583
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> Bug 403583, 472658
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common.component;
 
@@ -289,7 +289,7 @@ private ImageDescriptor getImageDescriptorFromUri(String uri) {
 					// platform:/resource !
 					try {
 						url = FileLocator.find(new URL(uri));
-						stream = url.openStream();
+						stream = url != null ? url.openStream() : null;
 					} catch (final IOException ex) {
 						url = null;
 						// Can't do more !
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index ce18e95f1d..28e9091883 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -9,6 +9,7 @@
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  * Steven Spungin <steven@spungin.tv> - Bug 433408, 424730
+ * Olivier Prouvost <olivier@opcoach.com> - Bug 472658
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -376,6 +377,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL),
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__ICON_URI),
 				FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL),
 				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 3781993bb4..c511ebaee4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -10,6 +10,7 @@
  * Marco Descher <marco@descher.at> - Bug 395982
  * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  * Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
+ * Olivier Prouvost <olivier@opcoach.com> - Bug 472658
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -470,7 +471,9 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL),
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__ICON_URI),
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 	protected void handleAdd(EClass eClass, boolean separator) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 99366fa596..7b533fa389 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -9,6 +9,7 @@
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  * Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
+ * Olivier Prouvost <olivier@opcoach.com> - Bug 472658
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -377,6 +378,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL),
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__ICON_URI),
 				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 340b672503..ec7394ca31 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -8,6 +8,7 @@
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Steven Spungin <steven@spungin.tv> - Bug 404166, 424730, 437951
+ * Olivier Prouvost <olivier@opcoach.com> - Bug 472658
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -467,6 +468,7 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL),
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__ICON_URI) };
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 1fdc7e7422..b29a35a601 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -8,6 +8,7 @@
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951, Ongoing Maintenance
+ * Olivier Prouvost <olivier@opcoach.com> - Bug 472658
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -464,6 +465,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL),
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__ICON_URI),
 				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 6cd13e40c1..f65d55afd8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -8,6 +8,7 @@
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
+ * Olivier Prouvost <olivier@opcoach.com> - Bug 472658
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -148,6 +149,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL),
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__ICON_URI),
 				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 11ef80190c..32f300a00e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -9,6 +9,7 @@
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
+ *     Olivier Prouvost <olivier@opcoach.com> - Bug 472658
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -403,7 +404,9 @@ public String getDetailLabel(Object element) {
 
 	@Override
 	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL), FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__TOOLTIP), FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL),
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__ICON_URI),
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
 	static class EObject2EClass extends Converter {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index a568d35675..d8ec12a94e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -9,6 +9,7 @@
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  * Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
+ * Olivier Prouvost <olivier@opcoach.com> - Bug 472658
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -443,6 +444,7 @@ public String getDetailLabel(Object element) {
 	@Override
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__LABEL),
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__ICON_URI),
 				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 

From 3abc8a9aa7d7743ce180f11ba20ca0cee5a2064b Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 4 Sep 2015 11:54:08 +0200
Subject: [PATCH 0921/1286] Bug 476576 - Add CanExecute template for the e4
 tools

Change-Id: Ia3fa97224c245890f031b125e4b0c0a9473b5a7a
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../templates/default-e4templates.xml                  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
index 4f546a4c16..89f06bb5f9 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
@@ -2,7 +2,7 @@
 
 <!--
 /*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
+ * Copyright (c) 2010, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,7 +10,7 @@
  *
  * Contributors:
  *     Boris Bokowski, IBM Corporation - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Reworked templates
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Ongoing maintenance
  *******************************************************************************/
 -->
 
@@ -71,5 +71,11 @@ public void execute() {
 ${imp:import(org.eclipse.e4.core.di.annotations.Execute)}
 </template>
 
+<template name="CanExecute" description="Creates CanExecute method" id="org.eclipse.e4.tools.jdt.templates.canexecute" context="e4-members" enabled="true" autoinsert="false">@CanExecute
+public boolean canExecute() {
+	return true;
+}
+${imp:import(org.eclipse.e4.core.di.annotations.CanExecute)}
+</template>
 
 </templates>

From 1e4bd0ac31942d850f56d9a42245ed47f3db1465 Mon Sep 17 00:00:00 2001
From: Patrik Suzzi <psuzzi@gmail.com>
Date: Mon, 21 Sep 2015 20:42:50 +0200
Subject: [PATCH 0922/1286] Bug 474841 - Fragment editor suggests incorrect
 name for inner class

Find contribution class now suggests correct class when using inner
classes. Fixed whitespaces.

Change-Id: Idb9d84c5e15e164e1fe999abad81c3907bbf3e8d
Signed-off-by: Patrik Suzzi <psuzzi@gmail.com>
---
 .../tools/emf/editor3x/PDEClassContributionProvider.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index 9c42f01d29..b944454bc5 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -106,9 +106,12 @@ public void findContribution(final Filter filter, final ContributionResultHandle
 		final TypeNameRequestor req = new TypeNameRequestor() {
 			@Override
 			public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
-				char[][] enclosingTypeNames, String path) {
+					char[][] enclosingTypeNames, String path) {
+				// 474841 compute name considering inner classes
+				final boolean isEnclosed = enclosingTypeNames != null && enclosingTypeNames.length > 0;
+				final String ePrefix = isEnclosed ? new String(enclosingTypeNames[0]) + "$" : ""; //$NON-NLS-1$//$NON-NLS-2$
 				// Accept search results from the JDT SearchEngine
-				final String cName = new String(simpleTypeName);
+				final String cName = ePrefix + new String(simpleTypeName);
 				final String pName = new String(packageName);
 				//				String label = cName + " - " + pName; //$NON-NLS-1$
 				final String content = pName.length() == 0 ? cName : pName + "." + cName; //$NON-NLS-1$

From e7282788bae925b339e75df14b637bbeb9591b83 Mon Sep 17 00:00:00 2001
From: Patrik Suzzi <psuzzi@gmail.com>
Date: Tue, 22 Sep 2015 02:07:57 +0200
Subject: [PATCH 0923/1286] Bug 467262 - Model fragment editor should expand
 the model browser on

If the type of the Object is known, the Feature Selection Dialg is now
revealing the node matching the Known Container Class and expanding it

Change-Id: I159dd44b66f51e7c3d6ead1f51a1c7d7484a7d3e
Signed-off-by: Patrik Suzzi <psuzzi@gmail.com>
---
 .../common/component/StringModelFragment.java | 18 ++++++--
 .../dialogs/FeatureSelectionDialog.java       | 41 ++++++++++++++++++-
 .../FindParentReferenceElementDialog.java     | 15 ++++++-
 3 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 43e23c56b9..4c8c16cdc6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2015 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Steven Spungin <steve@spungin.tv> - Ongoing Maintenance, Bug 439532, Bug 443945
+ * Patrik Suzzi <psuzzi@gmail.com> - Bug 467262
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -53,6 +54,7 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -75,6 +77,8 @@ public class StringModelFragment extends AbstractComponentEditor {
 
 	private final List<Action> actions = new ArrayList<>();
 
+	private EClass selectedContainer;
+
 	@Inject
 	IEclipseContext eclipseContext;
 
@@ -195,6 +199,12 @@ public void widgetSelected(SelectionEvent e) {
 					final FindParentReferenceElementDialog dialog = new FindParentReferenceElementDialog(b.getShell(),
 							StringModelFragment.this, (MStringModelFragment) getMaster().getValue(), Messages);
 					dialog.open();
+					// store user selected container
+					if (dialog.getReturnCode() == Window.OK) {
+						selectedContainer = dialog.getSelectedContainer();
+					} else {
+						selectedContainer = null;
+					}
 				}
 			});
 		}
@@ -229,7 +239,8 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final FeatureSelectionDialog dialog = new FeatureSelectionDialog(button.getShell(),
-							getEditingDomain(), (MStringModelFragment) getMaster().getValue(), Messages);
+							getEditingDomain(), (MStringModelFragment) getMaster().getValue(), Messages,
+							selectedContainer);
 					dialog.open();
 				}
 			});
@@ -247,7 +258,8 @@ public void widgetSelected(SelectionEvent e) {
 					FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS) {
 				@Override
 				protected void addPressed() {
-					final EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
+					final EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection())
+							.getFirstElement()).eClass;
 					handleAdd(eClass, false);
 				}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index 006ce6b94b..a5d68f68ff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2014 BestSolution.at and others.
+ * Copyright (c) 2010-2015 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - Bug 395283
+ * Patrik Suzzi <psuzzi@gmail.com> - Bug 467262
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -25,6 +26,7 @@
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.e4.ui.model.internal.ModelUtils;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -36,6 +38,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
@@ -65,13 +68,15 @@ public class FeatureSelectionDialog extends SaveDialogBoundsSettingsDialog {
 	private final EditingDomain editingDomain;
 	private final Messages Messages;
 	private ViewerFilterImpl filter;
+	private final EClass userSelectedContainer;
 
 	public FeatureSelectionDialog(Shell parentShell, EditingDomain editingDomain, MStringModelFragment fragment,
-		Messages Messages) {
+			Messages Messages, EClass userSelectedContainer) {
 		super(parentShell);
 		this.fragment = fragment;
 		this.editingDomain = editingDomain;
 		this.Messages = Messages;
+		this.userSelectedContainer = userSelectedContainer;
 	}
 
 	@Override
@@ -186,6 +191,38 @@ public void selectionChanged(SelectionChangedEvent event) {
 		return composite;
 	}
 
+	@Override
+	protected void createButtonsForButtonBar(Composite parent) {
+		super.createButtonsForButtonBar(parent);
+		// selection has influence on buttons
+		selectTreeElement();
+	}
+
+	/** selects a tree element if userselected container is not null */
+	private void selectTreeElement() {
+		if (userSelectedContainer == null) {
+			return;
+		}
+		// loop through the children of parent element of tree viewer
+		for (final Object item : ((ITreeContentProvider) viewer.getContentProvider()).getElements(viewer.getInput())) {
+			// loop through the chidren of incoming parent element
+			final Object[] contents = ((ITreeContentProvider) viewer.getContentProvider()).getChildren(item);
+			for (final Object content : contents) {
+				if (content instanceof InternalClass) {
+					final EClass eClass = ((InternalClass) content).eClass;
+					// checks with my overrided equals method\
+					if (eClass.equals(userSelectedContainer)) {
+						// expand the particular child
+						viewer.setSelection(new StructuredSelection(content));
+						viewer.reveal(content);
+						viewer.expandToLevel(content, 1);
+						return;
+					}
+				}
+			}
+		}
+	}
+
 	@Override
 	protected void okPressed() {
 		final IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index 5e36f06bb6..34bd76c71c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2015 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Steven Spungin <steven@spungin.tv> - Bug 437469
+ * Patrik Suzzi <psuzzi@gmail.com> - Bug 467262
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -82,6 +83,7 @@ public class FindParentReferenceElementDialog extends TitleAreaDialog {
 	private WritableList list;
 	private ComboViewer eClassViewer;
 	private Text searchText;
+	private EClass selectedContainer;
 
 	public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEditor editor,
 			MStringModelFragment fragment, Messages Messages) {
@@ -263,6 +265,7 @@ protected void okPressed() {
 				final Command cmd = SetCommand.create(editor.getEditingDomain(), fragment,
 						FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID, el.getElementId());
 				if (cmd.canExecute()) {
+					selectedContainer = (EClass) ((IStructuredSelection) eClassViewer.getSelection()).getFirstElement();
 					editor.getEditingDomain().getCommandStack().execute(cmd);
 					super.okPressed();
 				}
@@ -272,6 +275,16 @@ protected void okPressed() {
 		}
 	}
 
+	/**
+	 * Gets the selected EClass container after a successeful selection of the
+	 * parent
+	 *
+	 * @return the selectedContainer
+	 */
+	public EClass getSelectedContainer() {
+		return selectedContainer;
+	}
+
 	private ClassContributionCollector getCollector() {
 		final Bundle bundle = FrameworkUtil.getBundle(FindParentReferenceElementDialog.class);
 		final BundleContext context = bundle.getBundleContext();

From b3d1034d6ebfe9a23092b0ee89e37d4969962574 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 6 Oct 2015 09:36:16 +0200
Subject: [PATCH 0924/1286] Bug 468161 - Remove trailing white spaces in
 eclipse.platform.ui.tools.git

Change-Id: I243d49757b65d0609b212c486e29aad2936c6059
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../e4/tools/compat/internal/CutAction.java   |  4 +-
 .../e4/tools/compat/internal/Messages.java    |  4 +-
 .../e4/tools/compat/internal/PasteAction.java |  2 +-
 .../e4/tools/emf/editor3x/Messages.java       |  4 +-
 .../editor3x/RefactorParticipantDelegate.java |  2 +-
 .../e4/tools/emf/editor3x/extension/Util.java |  4 +-
 .../ui/common/IProviderStatusCallback.java    |  2 +-
 .../ObservableColumnLabelProvider.java        |  4 +-
 .../common/component/tabs/DocUtil.java        |  2 +-
 .../dialogs/NonReferencedAction.java          |  2 +-
 .../xml/EMFDocumentResourceMediator.java      |  2 +-
 .../e4/tools/services/IClipboardService.java  |  2 +-
 .../e4/tools/services/IResourcePool.java      |  4 +-
 .../e4/tools/services/IResourceService.java   |  6 +--
 .../e4/tools/services/impl/Messages.java      |  4 +-
 .../ResourceBundleTranslationProvider.java    |  6 +--
 .../classes/templates/AddonTemplate.java      |  6 +--
 .../DynamicMenuContributionTemplate.java      | 14 +++----
 .../classes/templates/HandlerTemplate.java    | 14 +++----
 .../classes/templates/PartTemplate.java       | 38 +++++++++----------
 .../templates/ToolControlTemplate.java        | 14 +++----
 21 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
index 88f8fbb74f..e99fe89ac1 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
@@ -15,12 +15,12 @@
 
 public class CutAction extends Action {
 	private IClipboardService service;
-	
+
 	public CutAction(IClipboardService service) {
 		super(Messages.CutAction);
 		this.service = service;
 	}
-	
+
 	@Override
 	public void run() {
 		service.cut();
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
index c1fe7f676d..cc3584f4e3 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the 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:
  * Jonas - initial API and implementation
  ******************************************************************************/
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
index cb2cbbc2f1..78ce7e4e96 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
@@ -19,7 +19,7 @@ public PasteAction(IClipboardService service) {
 		super(Messages.PasteAction);
 		this.service = service;
 	}
-	
+
 	@Override
 	public void run() {
 		service.paste();
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
index 3e967532c4..cfc0e533fe 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the 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:
  * Jonas - initial API and implementation
  ******************************************************************************/
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
index d83c468ee1..da7bb546fc 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
@@ -44,7 +44,7 @@ class RefactorParticipantDelegate {
 	 *
 	 * @param pProgressMonitor
 	 * @param pModel
-	 * 
+	 *
 	 * @return a set of changes in a {@link CompositeChange}
 	 * @throws CoreException
 	 * @throws OperationCanceledException
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java
index 23d5bb0bf6..c3e181ed7e 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java
@@ -23,7 +23,7 @@ public class Util {
 	public static boolean isTypeOrSuper(EClass eClass, EClass element) {
 		return eClass.equals(element) || element.getEAllSuperTypes().contains(eClass);
 	}
-	
+
 	public static String getBundleSymbolicName(IProject project) {
 		BundleContext context = FrameworkUtil.getBundle(AddonContributionEditor.class).getBundleContext();
 		ServiceReference<IBundleProjectService> ref = context.getServiceReference(IBundleProjectService.class);
@@ -35,7 +35,7 @@ public static String getBundleSymbolicName(IProject project) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		
+
 		return null;
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java
index 9128c86d65..88d054b36f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java
@@ -12,7 +12,7 @@
 
 /**
  * A callback used for a provider to notify a client of status changes
- * 
+ *
  * @author Steven Spungin
  *
  */
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
index 22a8d2bddc..90de8fadcf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
@@ -35,7 +35,7 @@ public void handleMapChange(MapChangeEvent event) {
 
 	/**
 	 * Creates a new label provider that tracks changes to one attribute.
-	 * 
+	 *
 	 * @param attributeMap
 	 */
 	public ObservableColumnLabelProvider(IObservableMap attributeMap) {
@@ -46,7 +46,7 @@ public ObservableColumnLabelProvider(IObservableMap attributeMap) {
 	 * Creates a new label provider that tracks changes to more than one
 	 * attribute. This constructor should be used by subclasses that override
 	 * {@link #update(ViewerCell)} and make use of more than one attribute.
-	 * 
+	 *
 	 * @param attributeMaps
 	 */
 	protected ObservableColumnLabelProvider(IObservableMap[] attributeMaps) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
index 12800b29fb..bd8f24d9e6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
@@ -18,7 +18,7 @@
 
 /**
  * Helper functions for working with documents.
- * 
+ *
  * @author Steven Spungin
  *
  */
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java
index e3816c9f0c..4ae63053b3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java
@@ -13,7 +13,7 @@
 
 /**
  * Actions used to resolve non referenced resource issues.
- * 
+ *
  * @author Steven Spungin
  *
  */
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
index 4c2f94eecc..4751f43aa8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
@@ -128,7 +128,7 @@ public IRegion findStartTag(EObject object) {
 	}
 
 	/**
-	 * 
+	 *
 	 * @return The region for the start of the text, or null if not found or the
 	 *         text is empty.
 	 */
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java
index 2f1f796afe..aaa453190c 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java
@@ -15,7 +15,7 @@ public interface IClipboardService {
 	public void paste();
 	public void cut();
 	public void setHandler(Handler handler);
-	
+
 	public interface Handler {
 		public void paste();
 		public void copy();
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourcePool.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourcePool.java
index bd06e5ea53..e009c56376 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourcePool.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourcePool.java
@@ -8,10 +8,10 @@
 public interface IResourcePool {
 	public Image getImage(String imageKey) throws CoreException;
 	public Image getImageUnchecked(String imageKey);
-	
+
 	public Color getColor(String imageKey) throws CoreException;
 	public Color getColorUnchecked(String imageKey);
-	
+
 	public Font getFont(String imageKey) throws CoreException;
 	public Font getFontUnchecked(String imageKey);
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java
index a52c0fbdae..29651e8bc1 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java
@@ -22,15 +22,15 @@ public interface IPooledResource<T> {
 		public String getId();
 		public void dispose();
 	}
-	
+
 	public interface IDiposeableResourcePool extends IResourcePool {
 		public void dispose();
 	}
-	
+
 	public IPooledResource<Image> getImage(Display display, String key);
 	public IPooledResource<Color> getColor(Display display, String key);
 	public IPooledResource<Font> getFont(Display display, String key);
-	
+
 	public IDiposeableResourcePool getResourcePool(Display display);
 	public IResourcePool getControlPool(Control control);
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java
index 149c954bdd..d9637bb784 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the 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:
  * Jonas - initial API and implementation
  ******************************************************************************/
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
index 6cd9fd8885..846e920fab 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
@@ -15,7 +15,7 @@
 
 /**
  * Wrapper class for accessing translations out of a {@link ResourceBundle}.
- * 
+ *
  * @author Dirk Fauth
  *
  */
@@ -25,9 +25,9 @@ public class ResourceBundleTranslationProvider {
 	 * The {@link ResourceBundle} to use for translations.
 	 */
 	private ResourceBundle resourceBundle;
-	
+
 	/**
-	 * 
+	 *
 	 * @param resourceBundle The {@link ResourceBundle} to use for translations.
 	 * 			Can be <code>null</code>, which will lead to simply return the key
 	 * 			modified by prefixing and suffixing it with "!" when calling translate(String).
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
index 0f1e1f6436..f511bd037e 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
@@ -24,13 +24,13 @@ public static synchronized AddonTemplate create(String lineSeparator)
   public String generate(Object argument)
   {
     final StringBuffer stringBuffer = new StringBuffer();
-     JavaClass domainClass = (JavaClass)argument; 
+     JavaClass domainClass = (JavaClass)argument;
     stringBuffer.append(TEXT_1);
-     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
     stringBuffer.append(TEXT_2);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
     stringBuffer.append(TEXT_3);
-     } 
+     }
     stringBuffer.append(TEXT_4);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_5);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
index 20a79b84f7..7d4a09e590 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
@@ -29,27 +29,27 @@ public static synchronized DynamicMenuContributionTemplate create(String lineSep
   public String generate(Object argument)
   {
     final StringBuffer stringBuffer = new StringBuffer();
-     DynamicMenuContributionClass domainClass = (DynamicMenuContributionClass)argument; 
+     DynamicMenuContributionClass domainClass = (DynamicMenuContributionClass)argument;
     stringBuffer.append(TEXT_1);
-     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
     stringBuffer.append(TEXT_2);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
     stringBuffer.append(TEXT_3);
-     } 
+     }
     stringBuffer.append(TEXT_4);
-     if( domainClass.isUseAboutToHide() )  { 
+     if( domainClass.isUseAboutToHide() )  {
     stringBuffer.append(TEXT_5);
-     } 
+     }
     stringBuffer.append(TEXT_6);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_7);
     stringBuffer.append( domainClass.getAboutToShowMethodName() );
     stringBuffer.append(TEXT_8);
-     if( domainClass.isUseAboutToHide() )  { 
+     if( domainClass.isUseAboutToHide() )  {
     stringBuffer.append(TEXT_9);
     stringBuffer.append( domainClass.getAboutToHideMethodName() );
     stringBuffer.append(TEXT_10);
-     } 
+     }
     stringBuffer.append(TEXT_11);
     return stringBuffer.toString();
   }
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
index f9cfd2ceea..6f11b13cb5 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
@@ -29,27 +29,27 @@ public static synchronized HandlerTemplate create(String lineSeparator)
   public String generate(Object argument)
   {
     final StringBuffer stringBuffer = new StringBuffer();
-     HandlerClass domainClass = (HandlerClass)argument; 
+     HandlerClass domainClass = (HandlerClass)argument;
     stringBuffer.append(TEXT_1);
-     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
     stringBuffer.append(TEXT_2);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
     stringBuffer.append(TEXT_3);
-     } 
+     }
     stringBuffer.append(TEXT_4);
-     if( domainClass.isUseCanExecute() )  { 
+     if( domainClass.isUseCanExecute() )  {
     stringBuffer.append(TEXT_5);
-     } 
+     }
     stringBuffer.append(TEXT_6);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_7);
     stringBuffer.append( domainClass.getExecuteMethodName() );
     stringBuffer.append(TEXT_8);
-     if( domainClass.isUseCanExecute() )  { 
+     if( domainClass.isUseCanExecute() )  {
     stringBuffer.append(TEXT_9);
     stringBuffer.append( domainClass.getCanExecuteMethodName() );
     stringBuffer.append(TEXT_10);
-     } 
+     }
     stringBuffer.append(TEXT_11);
     return stringBuffer.toString();
   }
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
index 20843b9887..975a84dea1 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
@@ -41,54 +41,54 @@ public static synchronized PartTemplate create(String lineSeparator)
   public String generate(Object argument)
   {
     final StringBuffer stringBuffer = new StringBuffer();
-     PartClass domainClass = (PartClass)argument; 
+     PartClass domainClass = (PartClass)argument;
     stringBuffer.append(TEXT_1);
-     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
     stringBuffer.append(TEXT_2);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
     stringBuffer.append(TEXT_3);
-     } 
+     }
     stringBuffer.append(TEXT_4);
-     if( domainClass.isUsePostConstruct() ) { 
+     if( domainClass.isUsePostConstruct() ) {
     stringBuffer.append(TEXT_5);
-     } 
-     if( domainClass.isUsePredestroy() ) { 
+     }
+     if( domainClass.isUsePredestroy() ) {
     stringBuffer.append(TEXT_6);
-     } 
-     if( domainClass.isUseFocus() ) { 
+     }
+     if( domainClass.isUseFocus() ) {
     stringBuffer.append(TEXT_7);
-     } 
-     if( domainClass.isUsePersist() ) { 
+     }
+     if( domainClass.isUsePersist() ) {
     stringBuffer.append(TEXT_8);
-     } 
+     }
     stringBuffer.append(TEXT_9);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_10);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_11);
-     if( domainClass.isUsePostConstruct() ) { 
+     if( domainClass.isUsePostConstruct() ) {
     stringBuffer.append(TEXT_12);
     stringBuffer.append( domainClass.getPostConstructMethodName()  );
     stringBuffer.append(TEXT_13);
-     } 
+     }
     stringBuffer.append(TEXT_14);
-     if( domainClass.isUsePredestroy() ) { 
+     if( domainClass.isUsePredestroy() ) {
     stringBuffer.append(TEXT_15);
     stringBuffer.append( domainClass.getPreDestroyMethodName()  );
     stringBuffer.append(TEXT_16);
-     } 
+     }
     stringBuffer.append(TEXT_17);
-     if( domainClass.isUseFocus() ) { 
+     if( domainClass.isUseFocus() ) {
     stringBuffer.append(TEXT_18);
     stringBuffer.append( domainClass.getFocusMethodName() );
     stringBuffer.append(TEXT_19);
-     } 
+     }
     stringBuffer.append(TEXT_20);
-     if( domainClass.isUsePersist() ) { 
+     if( domainClass.isUsePersist() ) {
     stringBuffer.append(TEXT_21);
     stringBuffer.append( domainClass.getPersistMethodName() );
     stringBuffer.append(TEXT_22);
-     } 
+     }
     stringBuffer.append(TEXT_23);
     return stringBuffer.toString();
   }
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
index 5a0405f536..55f02dac72 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
@@ -28,24 +28,24 @@ public static synchronized ToolControlTemplate create(String lineSeparator)
   public String generate(Object argument)
   {
     final StringBuffer stringBuffer = new StringBuffer();
-     ToolControlClass domainClass = (ToolControlClass)argument; 
-     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
+     ToolControlClass domainClass = (ToolControlClass)argument;
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
     stringBuffer.append(TEXT_1);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
     stringBuffer.append(TEXT_2);
-     } 
+     }
     stringBuffer.append(TEXT_3);
-     if( domainClass.isCreateDefaultConstructor() )  { 
+     if( domainClass.isCreateDefaultConstructor() )  {
     stringBuffer.append(TEXT_4);
-     } 
+     }
     stringBuffer.append(TEXT_5);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_6);
-     if( domainClass.isCreateDefaultConstructor() )  { 
+     if( domainClass.isCreateDefaultConstructor() )  {
     stringBuffer.append(TEXT_7);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_8);
-     } 
+     }
     stringBuffer.append(TEXT_9);
     stringBuffer.append( domainClass.getCreateGuiMethodName() );
     stringBuffer.append(TEXT_10);

From a6de17acb6dda828f3aa6067170e29965ee8c5cc Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 15 Jun 2015 23:08:56 +0200
Subject: [PATCH 0925/1286] Bug 470224 - [Templates] Use also @PostConstruct
 (not only @Focus) to activate the e4 templates

Change-Id: Iccec981f287b2700a18efb5738ac0e3256cad508
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../E4TemplateCompletionProposalComputer.java         | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
index 27e1a66835..b25bedd76e 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
@@ -36,10 +36,10 @@
 public class E4TemplateCompletionProposalComputer extends AbstractTemplateCompletionProposalComputer {
 
 	/**
-	 * The name of <code>javax.inject.Inject</code> used to detect
-	 * if a project uses e4.
+	 * The following annotations are used to detect if an if a project uses e4.
 	 */
-	private static final String E4_TYPE_NAME = "org.eclipse.e4.ui.di.Focus"; //$NON-NLS-1$
+	private static final String E4_ANNOTATION_FOCUS = "org.eclipPostConstructse.e4.ui.di.Focus"; //$NON-NLS-1$
+	private static final String E4_ANNOTATION_POSTCONSTRUCT = "javax.annotation."; //$NON-NLS-1$
 
 	/**
 	 * Listener that resets the cached java project if its build path changes.
@@ -186,8 +186,9 @@ private synchronized boolean isE4OnClasspath(IJavaProject javaProject) {
 		if (!javaProject.equals(fCachedJavaProject)) {
 			fCachedJavaProject = javaProject;
 			try {
-				final IType type = javaProject.findType(E4_TYPE_NAME);
-				fIsE4OnClasspath = type != null;
+				final IType focucAnnotation = javaProject.findType(E4_ANNOTATION_FOCUS);
+				final IType postConstructAnnotation = javaProject.findType(E4_ANNOTATION_POSTCONSTRUCT);
+				fIsE4OnClasspath = focucAnnotation != null || postConstructAnnotation != null;
 			} catch (final JavaModelException e) {
 				fIsE4OnClasspath = false;
 			}

From 7db4270cf50341cc93342bec6ef0260950c9fcf4 Mon Sep 17 00:00:00 2001
From: Jonas Helming <jhelming@eclipsesource.com>
Date: Mon, 14 Sep 2015 13:49:41 +0200
Subject: [PATCH 0926/1286] Bug 443414 - [model editor] cannot drag to change
 the order of model fragments

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

Change-Id: Ie74f5522e150bf4345b6c192ed15f41db5fffd12
Signed-off-by: Jonas Helming <jhelming@eclipsesource.com>
---
 .../tools/emf/ui/internal/common/ModelEditor.java  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 0d8d114ac3..6652293c5e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -163,6 +163,7 @@
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.e4.ui.model.fragment.MModelFragment;
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.e4.ui.model.internal.ModelUtils;
@@ -1712,7 +1713,8 @@ public DragListener(TreeViewer viewer) {
 		@Override
 		public void dragStart(DragSourceEvent event) {
 			final IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
-			event.doit = !selection.isEmpty() && selection.getFirstElement() instanceof MApplicationElement;
+			event.doit = !selection.isEmpty() && (selection.getFirstElement() instanceof MApplicationElement
+					|| selection.getFirstElement() instanceof MModelFragment);
 		}
 
 		@Override
@@ -1866,16 +1868,16 @@ public boolean performSingleDrop(Object data) {
 
 		@Override
 		public boolean validateDrop(Object target, int operation, TransferData transferType) {
-			boolean rv = false;
-			if (getSelectedObject() instanceof MApplicationElement) {
+			boolean rv = true;
+			if (getSelectedObject() instanceof MApplicationElement || getSelectedObject() instanceof MModelFragment) {
 				if (getCurrentLocation() == LOCATION_ON) {
-					rv = isValidDrop(target, (MApplicationElement) getSelectedObject(), false);
+					rv = isValidDrop(target, getSelectedObject(), false);
 				} else if (getCurrentLocation() == LOCATION_AFTER || getCurrentLocation() == LOCATION_BEFORE) {
 					TreeItem item = (TreeItem) getCurrentEvent().item;
 					if (item != null) {
 						item = item.getParentItem();
 						if (item != null) {
-							rv = isValidDrop(item.getData(), (MApplicationElement) getSelectedObject(), true);
+							rv = isValidDrop(item.getData(), getSelectedObject(), true);
 						}
 					}
 				}
@@ -1884,7 +1886,7 @@ public boolean validateDrop(Object target, int operation, TransferData transferT
 			return rv;
 		}
 
-		private boolean isValidDrop(Object target, MApplicationElement instance, boolean isIndex) {
+		private boolean isValidDrop(Object target, Object instance, boolean isIndex) {
 			if (target instanceof MElementContainer<?>) {
 				@SuppressWarnings("unchecked")
 				final MElementContainer<MUIElement> container = (MElementContainer<MUIElement>) target;

From 7ccaa5eb2475cab83a5f960cc75550159f8ca3b4 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Tue, 3 Nov 2015 17:15:39 +0100
Subject: [PATCH 0927/1286] Bug 481211 - The 'restore default' in
 ModelEditorPreferencePage does not set the default values

Change-Id: I974c858138474594ee0be6e20144e7d50ba1d063
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../tools/emf/ui/internal/PreferenceInitializer.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
index 571e523bb5..627a052d5c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
@@ -7,8 +7,8 @@
 package org.eclipse.e4.tools.emf.ui.internal;
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.e4.tools.emf.ui.common.ModelEditorPreferences;
 import org.eclipse.e4.tools.emf.ui.common.Plugin;
 import org.eclipse.jface.resource.StringConverter;
@@ -18,20 +18,20 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
 
 	@Override
 	public void initializeDefaultPreferences() {
-		IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(Plugin.ID);
+		final IEclipsePreferences pref = DefaultScope.INSTANCE.getNode(Plugin.ID);
 
 		if (pref.get(ModelEditorPreferences.NOT_RENDERED_COLOR, null) == null) {
-			String val = StringConverter.asString(new RGB(200, 200, 200));
+			final String val = StringConverter.asString(new RGB(200, 200, 200));
 			pref.put(ModelEditorPreferences.NOT_RENDERED_COLOR, val);
 		}
 
 		if (pref.get(ModelEditorPreferences.NOT_VISIBLE_COLOR, null) == null) {
-			String val = StringConverter.asString(new RGB(200, 200, 200));
+			final String val = StringConverter.asString(new RGB(200, 200, 200));
 			pref.put(ModelEditorPreferences.NOT_VISIBLE_COLOR, val);
 		}
 
 		if (pref.get(ModelEditorPreferences.NOT_VISIBLE_AND_RENDERED_COLOR, null) == null) {
-			String val = StringConverter.asString(new RGB(200, 200, 200));
+			final String val = StringConverter.asString(new RGB(200, 200, 200));
 			pref.put(ModelEditorPreferences.NOT_VISIBLE_AND_RENDERED_COLOR, val);
 		}
 

From aacbd1d7f915b8f543781e6a84acca2bfa8301cf Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Wed, 4 Nov 2015 16:36:19 +0100
Subject: [PATCH 0928/1286] Bug 481422 - Correct incorrect save actions for
 eclipse.platform.ui.tools plug-ins

Change-Id: I05a31305c56d9af3274e3fe51d1b5f0508ec1925
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../.settings/org.eclipse.jdt.ui.prefs                 | 10 +++++-----
 .../.settings/org.eclipse.jdt.ui.prefs                 | 10 +++++-----
 .../.settings/org.eclipse.jdt.core.prefs               |  2 +-
 .../.settings/org.eclipse.jdt.ui.prefs                 | 10 +++++-----
 .../.settings/org.eclipse.jdt.ui.prefs                 | 10 +++++-----
 .../.settings/org.eclipse.jdt.ui.prefs                 | 10 +++++-----
 .../.settings/org.eclipse.jdt.ui.prefs                 | 10 +++++-----
 .../.settings/org.eclipse.jdt.ui.prefs                 | 10 +++++-----
 8 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
index 020dd2aa65..e0627af010 100644
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
@@ -90,7 +90,7 @@ sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
 sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.make_variable_declarations_final=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
 sp_cleanup.on_save_use_additional_actions=true
@@ -98,7 +98,7 @@ sp_cleanup.organize_imports=true
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_type_arguments=false
@@ -119,9 +119,9 @@ sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
 sp_cleanup.use_lambda=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access=false
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
 sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
index 020dd2aa65..e0627af010 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
@@ -90,7 +90,7 @@ sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
 sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.make_variable_declarations_final=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
 sp_cleanup.on_save_use_additional_actions=true
@@ -98,7 +98,7 @@ sp_cleanup.organize_imports=true
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_type_arguments=false
@@ -119,9 +119,9 @@ sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
 sp_cleanup.use_lambda=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access=false
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
 sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
index ae6ceaa14a..8f1b99fd75 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -245,7 +245,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
index 020dd2aa65..e0627af010 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -90,7 +90,7 @@ sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
 sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.make_variable_declarations_final=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
 sp_cleanup.on_save_use_additional_actions=true
@@ -98,7 +98,7 @@ sp_cleanup.organize_imports=true
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_type_arguments=false
@@ -119,9 +119,9 @@ sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
 sp_cleanup.use_lambda=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access=false
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
 sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
index 020dd2aa65..e0627af010 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
@@ -90,7 +90,7 @@ sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
 sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.make_variable_declarations_final=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
 sp_cleanup.on_save_use_additional_actions=true
@@ -98,7 +98,7 @@ sp_cleanup.organize_imports=true
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_type_arguments=false
@@ -119,9 +119,9 @@ sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
 sp_cleanup.use_lambda=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access=false
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
 sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
index 020dd2aa65..e0627af010 100644
--- a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
@@ -90,7 +90,7 @@ sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
 sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.make_variable_declarations_final=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
 sp_cleanup.on_save_use_additional_actions=true
@@ -98,7 +98,7 @@ sp_cleanup.organize_imports=true
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_type_arguments=false
@@ -119,9 +119,9 @@ sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
 sp_cleanup.use_lambda=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access=false
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
 sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
index 020dd2aa65..e0627af010 100644
--- a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
@@ -90,7 +90,7 @@ sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
 sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.make_variable_declarations_final=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
 sp_cleanup.on_save_use_additional_actions=true
@@ -98,7 +98,7 @@ sp_cleanup.organize_imports=true
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_type_arguments=false
@@ -119,9 +119,9 @@ sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
 sp_cleanup.use_lambda=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access=false
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
 sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs
index 020dd2aa65..e0627af010 100644
--- a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs
@@ -90,7 +90,7 @@ sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
 sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.make_variable_declarations_final=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
 sp_cleanup.on_save_use_additional_actions=true
@@ -98,7 +98,7 @@ sp_cleanup.organize_imports=true
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_type_arguments=false
@@ -119,9 +119,9 @@ sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
 sp_cleanup.use_lambda=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access=false
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
 sp_cleanup.use_type_arguments=false

From 6cbe4cef7cac7ac9a2ec115a8cff7c2b3e8c6687 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Fri, 30 Oct 2015 15:53:19 +0100
Subject: [PATCH 0929/1286] Bug 472706 - Label of shared part not updated in
 placeholder reference within the model editor

Refresh the model tree editor and the placeholder editor when
application model is saved.

Change-Id: Ic83579ea59882020bb1941cc5b6579f5bd25c38d
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../emf/ui/internal/common/ModelEditor.java   | 22 ++++++++++++-
 .../common/component/PlaceholderEditor.java   | 33 ++++++++++++++++++-
 3 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index d5c84fed33..68314b5fe8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -40,7 +40,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.0.0",
  javax.inject;version="1.0.0",
- org.osgi.framework;version="1.5.0"
+ org.osgi.framework;version="1.5.0",
+ org.osgi.service.event;version="1.3.1"
 Export-Package: org.eclipse.e4.tools.emf.ui.common;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.liveeditor,org.eclipse.e4.tools.emf.editor3x",
  org.eclipse.e4.tools.emf.ui.common.component;version="0.12.0.qualifier";x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal;version="0.12.0.qualifier";x-internal:=true,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 6652293c5e..97b82149ea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -13,6 +13,7 @@
  * Steven Spungin <steven@spungin.tv> - Bug 396902, 431755, 431735, 424730, 424730, 391089, 437236, 437552, Ongoing
  * Maintenance
  * Simon Scholz <simon.scholz@vogella.com> - Bug 475365
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 472706
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
@@ -149,6 +150,7 @@
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.di.Persist;
 import org.eclipse.e4.ui.di.PersistState;
+import org.eclipse.e4.ui.di.UIEventTopic;
 import org.eclipse.e4.ui.dialogs.filteredtree.FilteredTree;
 import org.eclipse.e4.ui.dialogs.filteredtree.PatternFilter;
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -167,6 +169,8 @@
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.e4.ui.model.internal.ModelUtils;
+import org.eclipse.e4.ui.workbench.UIEvents;
+import org.eclipse.e4.ui.workbench.UIEvents.EventTags;
 import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -1090,7 +1094,7 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 				.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
 		if (property != null || preferences.getBoolean(ModelEditorPreferences.TAB_FORM_SEARCH_SHOW, false)) {
 			final FilteredTree viewParent = new FilteredTree(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL
- | SWT.V_SCROLL, new PatternFilter(true));
+					| SWT.V_SCROLL, new PatternFilter(true));
 			tempViewer = viewParent.getViewer();
 		} else {
 			tempViewer = new TreeViewerEx(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL,
@@ -1980,4 +1984,20 @@ private Object getFirstMatchingItem(EObject target, ObservableListTreeContentPro
 		return null;
 	}
 
+
+	@Inject
+	@Optional
+	public void refreshOnSave(
+			@UIEventTopic(UIEvents.Dirtyable.TOPIC_DIRTY) org.osgi.service.event.Event event) {
+		// If the application model is saved (-> becomes undirty) we must
+		// refresh tree (bug 472706)
+		final Object type = event.getProperty(EventTags.TYPE);
+		final Object newValue = event.getProperty(EventTags.NEW_VALUE);
+
+		if (UIEvents.EventTypes.SET.equals(type) && Boolean.FALSE.equals(newValue)) {
+			viewer.refresh(true);
+		}
+
+	}
+
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index ebc250f276..066e64fa37 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 472706
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -25,13 +26,17 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.SharedElementsDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
+import org.eclipse.e4.ui.di.UIEventTopic;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.workbench.UIEvents;
+import org.eclipse.e4.ui.workbench.UIEvents.EventTags;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
@@ -214,7 +219,10 @@ public Object convert(Object fromObject) {
 				}
 			});
 
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), AdvancedPackageImpl.Literals.PLACEHOLDER__REF).observeDetail(getMaster()), t2m, m2t);
+			context.bindValue(textProp.observe(t),
+					EMFEditProperties.value(getEditingDomain(), AdvancedPackageImpl.Literals.PLACEHOLDER__REF)
+					.observeDetail(getMaster()),
+					t2m, m2t);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
@@ -270,4 +278,27 @@ public IObservableList getChildList(Object element) {
 		return null;
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(AdvancedPackageImpl.Literals.PLACEHOLDER__REF) };
+	}
+
+
+	/**
+	 * If model is saved (becomes not dirty) must refresh the bindings so as to
+	 * have the correct name in the ref editor
+	 */
+	@Inject
+	@Optional
+	public void refreshOnSave(
+			@UIEventTopic(UIEvents.Dirtyable.TOPIC_DIRTY) org.osgi.service.event.Event event) {
+		// When application model is saved, must refresh values (bug 472706)
+		final Object type = event.getProperty(EventTags.TYPE);
+		final Object newValue = event.getProperty(EventTags.NEW_VALUE);
+
+		if (UIEvents.EventTypes.SET.equals(type) && Boolean.FALSE.equals(newValue)) {
+			context.updateTargets();
+		}
+	}
+
 }

From eea086420f8a284872e4024eda9f56cb264f45a3 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Wed, 4 Nov 2015 18:03:23 +0100
Subject: [PATCH 0930/1286] Bug 481435 - NPE in placeholder editor

Change-Id: Iedd6b60d1024cb6308b80653020700b56b82314e
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java    | 2 +-
 .../emf/ui/internal/common/component/PlaceholderEditor.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 97b82149ea..2488267d3d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1994,7 +1994,7 @@ public void refreshOnSave(
 		final Object type = event.getProperty(EventTags.TYPE);
 		final Object newValue = event.getProperty(EventTags.NEW_VALUE);
 
-		if (UIEvents.EventTypes.SET.equals(type) && Boolean.FALSE.equals(newValue)) {
+		if (UIEvents.EventTypes.SET.equals(type) && Boolean.FALSE.equals(newValue) && viewer != null) {
 			viewer.refresh(true);
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 066e64fa37..14c0fdeb3b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -296,7 +296,7 @@ public void refreshOnSave(
 		final Object type = event.getProperty(EventTags.TYPE);
 		final Object newValue = event.getProperty(EventTags.NEW_VALUE);
 
-		if (UIEvents.EventTypes.SET.equals(type) && Boolean.FALSE.equals(newValue)) {
+		if (UIEvents.EventTypes.SET.equals(type) && Boolean.FALSE.equals(newValue) && context != null) {
 			context.updateTargets();
 		}
 	}

From b8e5a97bc72442dc4d7bb5f44ce3a7cba20fb48c Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 12 Nov 2015 08:57:34 +0100
Subject: [PATCH 0931/1286] Bug 481989 - Fix typo in e4 templates and align
 field injections

Change-Id: I94652f8981d30380772e45bd511a6ce4256ef6e7
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../templates/default-e4templates.xml            | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
index 89f06bb5f9..9fc878bf7a 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
@@ -16,33 +16,33 @@
 
 <templates>
 
-<template name="Inject -  Preference Value" description="Injected Preference Value" id="org.eclipse.e4.tools.jdt.templates.preference" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="Inject -  Preference value as method injection" description="Injected Preference Value" id="org.eclipse.e4.tools.jdt.templates.preference" context="e4-members" enabled="true" autoinsert="false">@Inject
 void setPreferenceValue(@Named("preference-PREFERENCE_KEY") String preferenceValue) {
 	${cursor}
 }</template>
 
-<template name="Inject - Preferences" description="Injected Preferences Service" id="org.eclipse.e4.tools.jdt.templates.preferences" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="Inject - Preferences service as field" description="Injected Preferences Service" id="org.eclipse.e4.tools.jdt.templates.preferences" context="e4-members" enabled="true" autoinsert="false">@Inject
 IEclipsePreferences preferences;</template>
 
-<template name="Inject - Logger" description="Injected Logger" id="org.eclipse.e4.tools.jdt.templates.logger" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="Inject - Logger service as field" description="Injected Logger" id="org.eclipse.e4.tools.jdt.templates.logger" context="e4-members" enabled="true" autoinsert="false">@Inject
 Logger logger;</template>
 
-<template name="Inject - Eventbroker" description="Injected Event Broker" id="org.eclipse.e4.tools.jdt.templates.eventbroker" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="Inject - Eventbroker service as field" description="Injected Event Broker" id="org.eclipse.e4.tools.jdt.templates.eventbroker" context="e4-members" enabled="true" autoinsert="false">@Inject
 IEventBroker eventBroker;
 ${imp:import(org.eclipse.e4.core.services.events.IEventBroker)}
 </template>
 
-<template name="ESelection service as field" description="Injected ESEectionService" id="org.eclipse.e4.tools.jdt.templates.selectionservice" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="Inject - ESelection service as field" description="Injected ESEectionService" id="org.eclipse.e4.tools.jdt.templates.selectionservice" context="e4-members" enabled="true" autoinsert="false">@Inject
 ESelectionService selectionService;
 ${imp:import(org.eclipse.e4.ui.workbench.modeling.ESelectionService)}
 </template>
 
-<template name="Injectject -  Event" description="Event Handler Method" id="org.eclipse.e4.tools.jdt.templates.eventhandler" context="e4-members" enabled="true" autoinsert="false">@EventHandler("some/event/topic")
-void handleSomeEvent(Payload payloadObject) {
+<template name="Inject -  Subscribe to event topic via method" description="Event Handler Method" id="org.eclipse.e4.tools.jdt.templates.eventhandler" context="e4-members" enabled="true" autoinsert="false">@EventHandler("some/event/topic")
+void subscribeTopic(String string) {
 	${cursor}
 }</template>
 
-<template name="Inject - Styling Engine" description="Injected Styling Engine" id="org.eclipse.e4.tools.jdt.templates.stylingengine" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="Inject - IStylingEngine service as field" description="Injected Styling Engine" id="org.eclipse.e4.tools.jdt.templates.stylingengine" context="e4-members" enabled="true" autoinsert="false">@Inject
 IStylingEngine stylingEngine;</template>
 
 

From 2aaed080d01be343827eee6bc5f53b379fb515db Mon Sep 17 00:00:00 2001
From: Jonas Helming <jhelming@eclipsesource.com>
Date: Mon, 4 Jan 2016 16:31:30 +0100
Subject: [PATCH 0932/1286] Bug 482997 - Context Properties are not editable
 for Application in Eclipse 4 Model Editor

Change-Id: I0b4e25d1822d19a7b7f22d7ba2bcd6f915ae0482
Signed-off-by: Jonas Helming <jhelming@eclipsesource.com>
---
 .../emf/ui/internal/common/component/ApplicationEditor.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 00b54c633f..a941043e6f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -196,7 +196,8 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
 
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.ApplicationEditor_BindingContexts);
-
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties,
+				UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
 				WidgetProperties.selection(),
 				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));

From 89383b51981f156eef8b2414e7275cf85d48931b Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Fri, 8 Jan 2016 15:44:02 +0100
Subject: [PATCH 0933/1286] Bug 466731 - Bad readability of textfield at
 application model-->part--> supplementary

Change-Id: Ia4dea236b00fde506c88106e77728333d28cd22b
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../e4/tools/emf/ui/internal/Messages.java    |  3 ++
 .../tools/emf/ui/internal/Messages.properties |  3 ++
 .../ui/internal/common/AbstractPickList.java  | 28 ++++++++++-----
 .../ui/internal/common/E4StringPickList.java  | 34 ++++++++++++++++---
 4 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 360ab30fa7..65e1f1b525 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -10,6 +10,7 @@
  *     Marco Descher <marco@descher.at> - Bug 395982, 396975, 426653
  *     Steven Spungin <steven@spungin.tv> - Bug 431735, 430717
  *     Jonas Helming <jhelming@eclipsesource.com - Bug 444340
+ *     Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 466731
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
@@ -19,6 +20,8 @@ public class Messages {
 	public String XmiTab_TypeTextToSearch;
 	public String ModelEditor_Import3x;
 	public String E4StringPickList_Replace;
+	public String E4StringPickList_NewValue;
+	public String E4StringPickList_ToolTipNewValue;
 	public String MarkDuplicateAttributesHandler_MarkDuplicates;
 	public String MarkDuplicateAttributesHandler_SelectAnAttributeToMarkeDuplicate;
 	public String VCommandEditor_ImportCommands;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 0fba44f6c3..1fa6c0d0b6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -11,12 +11,15 @@
 # *     Marco Descher <marco@descher.at> - Bug 395982, 396975, 426653
 # *     Steven Spungin <steven@spungin.tv> - Bug 431735, 430717, Ongoing Maintenance
 # *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 440159
+# *     Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 466731
 # ******************************************************************************
 
 PartEditor_InputPart=Input Part
 XmiTab_TypeTextToSearch0=type text to search (press <ENTER> to search for next instance)
 ModelEditor_Import3x=Import 3x
 E4StringPickList_Replace=Replace
+E4StringPickList_NewValue=New Value : 
+E4StringPickList_ToolTipNewValue=Enter your value and press Enter or click the Add button to add it. \nYou can add several values using a semi-colon separated string like this :\n value1;value2;value3
 MarkDuplicateAttributesHandler_MarkDuplicates=Mark Duplicates
 MarkDuplicateAttributesHandler_SelectAnAttributeToMarkeDuplicate=Select an attribute to mark duplicate values
 VCommandEditor_ImportCommands=Import Commands
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index e10de6e4ce..b44f1b324b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 466731
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common;
@@ -30,6 +31,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -58,14 +60,14 @@ public static enum PickListFeatures {
 
 	private final Group group;
 	private final Composite toolBar;
-	private final Button tiRemove;
-	private final Button tiUp;
-	private final Button tiDown;
-	private final Button tiAdd;
+	protected final Button tiRemove;
+	protected final Button tiUp;
+	protected final Button tiDown;
+	protected final Button tiAdd;
 	// private final AutoCompleteField autoCompleteField;
 
 	public AbstractPickList(Composite parent, int style, List<PickListFeatures> listFeatures, Messages messages,
-		AbstractComponentEditor componentEditor) {
+			AbstractComponentEditor componentEditor) {
 		super(parent, style);
 
 		// TODO remove dependency to Messages and AbstractComponentEditor. They
@@ -110,6 +112,7 @@ public AbstractPickList(Composite parent, int style, List<PickListFeatures> list
 		layout.marginWidth = 0;
 		toolBar.setLayout(layout);
 		toolBar.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
+		toolBar.setFont(group.getFont());
 
 		picker.addOpenListener(new IOpenListener() {
 
@@ -123,6 +126,7 @@ public void open(OpenEvent event) {
 		tiAdd.setText(messages.ModelTooling_Common_AddEllipsis);
 		tiAdd.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		tiAdd.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_table_add));
+		tiAdd.setFont(getButtonFont());
 		tiAdd.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -134,6 +138,7 @@ public void widgetSelected(SelectionEvent e) {
 		tiRemove.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		tiRemove.setText(messages.ModelTooling_Common_Remove);
 		tiRemove.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_table_delete));
+		tiRemove.setFont(getButtonFont());
 		tiRemove.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -145,6 +150,7 @@ public void widgetSelected(SelectionEvent e) {
 		tiDown.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		tiDown.setText(messages.ModelTooling_Common_Down);
 		tiDown.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_arrow_down));
+		tiDown.setFont(getButtonFont());
 		tiDown.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -156,6 +162,7 @@ public void widgetSelected(SelectionEvent e) {
 		tiUp.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		tiUp.setText(messages.ModelTooling_Common_Up);
 		tiUp.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_arrow_up));
+		tiUp.setFont(getButtonFont());
 		tiUp.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -191,6 +198,10 @@ public void selectionChanged(SelectionChangedEvent event) {
 
 	}
 
+	protected Font getButtonFont() {
+		return group.getFont();
+	}
+
 	protected void addPressed() {
 	}
 
@@ -253,10 +264,11 @@ public void updateUiState() {
 		final IStructuredSelection selection = (IStructuredSelection) getList().getSelection();
 		final boolean selected = selection.size() > 0;
 		final int count = getItemCount();
+		final boolean tableIsFocused = getList().getTable().isFocusControl();
 		if (tiDown.isDisposed() == false) {
-			tiDown.setEnabled(selected && count > 1);
-			tiUp.setEnabled(selected && count > 1);
+			tiDown.setEnabled(selected && count > 1 && tableIsFocused);
+			tiUp.setEnabled(selected && count > 1 && tableIsFocused);
 		}
-		tiRemove.setEnabled(selected);
+		tiRemove.setEnabled(selected && tableIsFocused);
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
index aa9c06e9a0..f86fa915cc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
@@ -7,12 +7,14 @@
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Ongoing Maintenance
+ *     Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 466731
  *******************************************************************************/
 
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
 import java.util.Arrays;
 import java.util.List;
+
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -27,13 +29,17 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.FocusAdapter;
+import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
 /**
@@ -61,9 +67,18 @@ public E4StringPickList(Composite parent, int flags, List<PickListFeatures> list
 		tiReplace = new Button(getToolBar(), SWT.PUSH);
 		tiReplace.setText(messages.E4StringPickList_Replace);
 		tiReplace.setImage(editor.createImage(ResourceProvider.IMG_Obj16_world_edit));
+		tiReplace.setFont(getButtonFont());
+
+		Composite valueParent = new Composite(getToolBar().getParent(), SWT.BORDER);
+		valueParent.setLayout(new GridLayout(2, false));
+		valueParent.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
 
-		text = new Text(getToolBar().getParent(), SWT.SINGLE | SWT.LEAD | SWT.BORDER);
-		text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
+		Label l = new Label(valueParent, SWT.NONE);
+		l.setText(messages.E4StringPickList_NewValue);
+		l.setToolTipText(messages.E4StringPickList_ToolTipNewValue);
+		text = new Text(valueParent, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
+		text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+		text.setToolTipText(messages.E4StringPickList_ToolTipNewValue);
 
 		tiReplace.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -82,6 +97,15 @@ public void modifyText(ModifyEvent e) {
 			}
 		});
 
+		text.addFocusListener(new FocusAdapter() {
+
+			@Override
+			public void focusGained(FocusEvent e) {
+				updateUiState();
+
+			}
+		});
+
 		updateUiState();
 
 	}
@@ -153,11 +177,13 @@ protected void handleReplaceText() {
 	public void updateUiState() {
 		super.updateUiState();
 
-		if (getTextWidget() != null) {
+		if (text != null) {
 			IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
 			Object firstViewerElement = sel.getFirstElement();
-			boolean diff = !getTextWidget().getText().equals(firstViewerElement);
+			String txt = text.getText();
+			boolean diff = !txt.equals(firstViewerElement);
 			tiReplace.setEnabled(firstViewerElement != null && !getTextWidget().getText().isEmpty() && diff);
+			tiAdd.setEnabled(txt.length() > 0 && text.isFocusControl());
 		}
 	}
 

From c175bc65af86777752b647fa4a304056f1aed110 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Fri, 15 Jan 2016 19:01:23 +0100
Subject: [PATCH 0934/1286] Bug 466782 - Rename
 org.eclipse.e4.tools.emf.liveeditor to org.eclipse.e4.tools.model.spy

Change-Id: Icb00d5a0a8b3329e24d27b0743023b864a81115b
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 68314b5fe8..593a7b6737 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -42,7 +42,7 @@ Import-Package: javax.annotation;version="1.0.0",
  javax.inject;version="1.0.0",
  org.osgi.framework;version="1.5.0",
  org.osgi.service.event;version="1.3.1"
-Export-Package: org.eclipse.e4.tools.emf.ui.common;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.liveeditor,org.eclipse.e4.tools.emf.editor3x",
+Export-Package: org.eclipse.e4.tools.emf.ui.common;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.model.spy",
  org.eclipse.e4.tools.emf.ui.common.component;version="0.12.0.qualifier";x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal;version="0.12.0.qualifier";x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.common;version="0.12.0.qualifier";x-internal:=true,
@@ -59,5 +59,5 @@ Export-Package: org.eclipse.e4.tools.emf.ui.common;version="0.12.0.qualifier";x-
  org.eclipse.e4.tools.emf.ui.internal.common.xml;version="0.12.0.qualifier";x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.handlers;version="0.12.0.qualifier";x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.imp;version="0.12.0.qualifier";x-internal:=true,
- org.eclipse.e4.tools.emf.ui.internal.wbm;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor,org.eclipse.e4.tools.emf.liveeditor"
+ org.eclipse.e4.tools.emf.ui.internal.wbm;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor,org.eclipse.e4.tools.model.spy"
 Service-Component: OSGI-INF/contributioncollector.xml, OSGI-INF/resourceprovider.xml

From a2555c1771afc5c39d60f9f57a41d0db68cea33b Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Fri, 22 Jan 2016 10:31:41 +0200
Subject: [PATCH 0935/1286] Bug 486314 - ListenerList should be parameterized

Handle o.e.e4.tools.compat.

Change-Id: I30000242ac167ded234310aa91d841d031b13f4b
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../e4/tools/compat/internal/PartHelper.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
index 785056a9a8..c7900e0146 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 BestSolution.at and others.
+ * Copyright (c) 2010, 2016 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -41,7 +41,7 @@ public static IEclipseContext createPartContext(WorkbenchPart part) throws PartI
 			// Hack to get the MPart-Context
 			try {
 				final Class<?> clazz = Util.getBundle("org.eclipse.e4.ui.model.workbench").loadClass( //$NON-NLS-1$
-					"org.eclipse.e4.ui.model.application.ui.basic.MPart"); //$NON-NLS-1$
+						"org.eclipse.e4.ui.model.application.ui.basic.MPart"); //$NON-NLS-1$
 				final Object instance = site.getService(clazz);
 				final Method m = clazz.getMethod("getContext", new Class[0]); //$NON-NLS-1$
 				IEclipseContext ctx = (IEclipseContext) m.invoke(instance);
@@ -85,21 +85,21 @@ public static <C> C createComponent(Composite parent, IEclipseContext context, C
 	static class SelectionProviderImpl implements ISelectionProvider {
 		private ISelection currentSelection = StructuredSelection.EMPTY;
 
-		private final ListenerList listeners = new ListenerList();
+		private final ListenerList<ISelectionChangedListener> listeners = new ListenerList<>();
 
 		@Override
 		public void setSelection(ISelection selection) {
 			currentSelection = selection;
 			final SelectionChangedEvent evt = new SelectionChangedEvent(this, selection);
 
-			for (final Object l : listeners.getListeners()) {
-				((ISelectionChangedListener) l).selectionChanged(evt);
+			for (final ISelectionChangedListener l : listeners) {
+				l.selectionChanged(evt);
 			}
 		}
 
 		@Override
 		public void removeSelectionChangedListener(
-			ISelectionChangedListener listener) {
+				ISelectionChangedListener listener) {
 			listeners.remove(listener);
 		}
 
@@ -115,11 +115,11 @@ public void addSelectionChangedListener(ISelectionChangedListener listener) {
 	}
 
 	public static void disposeContextIfE3(IEclipseContext parentContext,
-		IEclipseContext context) {
+			IEclipseContext context) {
 		// Check if running in 3.x, otherwise there was no dedicated context
 		// created
 		if (parentContext
-			.get(ORG_ECLIPSE_E4_UI_WORKBENCH_I_PRESENTATION_ENGINE) == null) {
+				.get(ORG_ECLIPSE_E4_UI_WORKBENCH_I_PRESENTATION_ENGINE) == null) {
 			context.dispose();
 			context = null;
 		}

From 32aee5858f14737f1750b391e42311b88cdb793e Mon Sep 17 00:00:00 2001
From: Dani Megert <dmegert>
Date: Fri, 29 Jan 2016 16:25:47 +0100
Subject: [PATCH 0936/1286] Fixed bug 486662: Neon features and bundles that
 might need a version increase

---
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index b98a44df99..a0827744cd 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.5.0.qualifier"
+      version="4.5.100.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 5cf1da5a2a..00e4c3e58d 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.5.100-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>

From e8f59b7ec9482dcd26f9ae16af69a241ccd6e571 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 11 Feb 2016 17:21:13 +0100
Subject: [PATCH 0937/1286] Bug 487646 - Remove versionized dependency to
 javax.annotation

Change-Id: I9ee9df0f95fcac79d83bfff0ac2e94f8ec81cdb4
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF   | 2 +-
 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 593a7b6737..c983902be1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -38,7 +38,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.e4.core.commands;bundle-version="0.10.0",
  org.eclipse.e4.ui.dialogs;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation;version="1.0.0",
+Import-Package: javax.annotation,
  javax.inject;version="1.0.0",
  org.osgi.framework;version="1.5.0",
  org.osgi.service.event;version="1.3.1"
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index a72088e3e3..b61443aae1 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -14,6 +14,6 @@ Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0"
 Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation;version="1.0.0",
+Import-Package: javax.annotation,
  javax.inject;version="1.0.0"
 Bundle-Activator: org.eclipse.e4.tools.services.ToolsServicesActivator

From 0a30d626d468efe9ebea2c05cf9cc42579c088ab Mon Sep 17 00:00:00 2001
From: Jonas Helming <jhelming@eclipsesource.com>
Date: Fri, 26 Feb 2016 15:58:08 +0100
Subject: [PATCH 0938/1286] Bug 483049 - variables and properties are not
 editable for PartDescriptor in Eclipse 4 Model Editor

Change-Id: I94c39f27f529993399151a78c2f91a81ed94e0a4
Signed-off-by: Jonas Helming <jhelming@eclipsesource.com>
---
 .../internal/common/component/PartDescriptorEditor.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index ec7394ca31..e18e317e3e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -367,14 +367,22 @@ public void widgetSelected(SelectionEvent e) {
 
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.PartEditor_BindingContexts);
 
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties,
+				BasicPackageImpl.Literals.PART_DESCRIPTOR__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
 
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables,
+				Messages.ModelTooling_Context_Variables_Tooltip, BasicPackageImpl.Literals.PART_DESCRIPTOR__VARIABLES,
+				VERTICAL_LIST_WIDGET_INDENT);
+
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 

From 62bb406781ed40d400188881966cf3d05acd2fd8 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Tue, 8 Mar 2016 22:23:02 +0100
Subject: [PATCH 0939/1286] Bug 485723 - Extract into fragment or create a new
 model fragment remove extension points in plugin

Change-Id: I87ec59ab46347948ff23f8152107b671d7144b26
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../model/BaseApplicationModelWizard.java     | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index d3addc3c26..2c15955151 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 - 2014 BestSolution.at and others.
+ * Copyright (c) 2010 - 2016 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 408712
  * Marco Descher <marco@descher.at> - Bug 434371
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> Bug 485723, Bug 436836
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.model;
 
@@ -44,6 +45,7 @@
 import org.eclipse.pde.core.plugin.IPluginAttribute;
 import org.eclipse.pde.core.plugin.IPluginElement;
 import org.eclipse.pde.core.plugin.IPluginExtension;
+import org.eclipse.pde.core.plugin.IPluginExtensionPoint;
 import org.eclipse.pde.core.plugin.IPluginImport;
 import org.eclipse.pde.core.plugin.IPluginModelBase;
 import org.eclipse.pde.core.plugin.IPluginObject;
@@ -339,6 +341,12 @@ private void registerWithExtensionPointIfRequired(IProject project, WorkspaceBun
 			fModel.getPluginBase().add(clonedExtens);
 		}
 
+		// Fix 485723 Must do the same for extension points
+		for (final IPluginExtensionPoint ep : registryModel.getPluginBase().getExtensionPoints()) {
+			final IPluginExtensionPoint clonedExtensionPoint = copyExtensionPoint(fModel.getFactory(), ep);
+			fModel.getPluginBase().add(clonedExtensionPoint);
+		}
+
 		// Can now check if we must add this extension (may be already inside).
 		final IPluginExtension[] extensions = fModel.getPluginBase().getExtensions();
 		for (final IPluginExtension iPluginExtension : extensions) {
@@ -385,6 +393,22 @@ private IPluginExtension copyExtension(IExtensionsModelFactory factory, final IP
 
 	}
 
+	// Used to Fix bug #485723
+	private IPluginExtensionPoint copyExtensionPoint(IExtensionsModelFactory factory, final IPluginExtensionPoint ep) {
+		try {
+			final IPluginExtensionPoint clonedExtPt = factory.createExtensionPoint();
+			clonedExtPt.setId(ep.getId());
+			clonedExtPt.setName(ep.getName());
+			clonedExtPt.setSchema(ep.getSchema());
+
+			return clonedExtPt;
+		} catch (final Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+
+	}
+
 	// Used to Fix bug #436836
 	private IPluginElement copyExtensionElement(IExtensionsModelFactory factory, final IPluginElement elt,
 			final IPluginObject parent) {

From 73187f1a84e534b6ed2198f8f083a1188b7dabf7 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Thu, 24 Mar 2016 23:31:10 +0100
Subject: [PATCH 0940/1286] Bug 482589 - Show Snippets also below MWindow in
 the e4 model editor

Change-Id: Iffe83dc506fceb509cd7dd4847d341032759296a
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.java   | 1 +
 .../eclipse/e4/tools/emf/ui/internal/Messages.properties | 1 +
 .../e4/tools/emf/ui/internal/common/ModelEditor.java     | 3 +++
 .../emf/ui/internal/common/component/WindowEditor.java   | 9 +++++++++
 4 files changed, 14 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 65e1f1b525..178cbac034 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -483,6 +483,7 @@ public class Messages {
 	public String WindowEditor_Windows;
 	public String WindowEditor_Controls;
 	public String WindowEditor_SharedElements;
+	public String WindowEditor_Snippets;
 
 	public String VApplicationAddons_AddAddon;
 	public String VApplicationAddons_TreeLabel;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 1fa6c0d0b6..0b0bd774b7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -460,6 +460,7 @@ WindowEditor_Handlers=Handlers
 WindowEditor_Windows=Windows and Dialogs
 WindowEditor_Controls=Controls
 WindowEditor_SharedElements=Shared Elements
+WindowEditor_Snippets=Snippets
 
 VApplicationAddons_AddAddon=Add-on
 VApplicationAddons_TreeLabel=Add-ons
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 2488267d3d..7fd44dc171 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -272,6 +272,8 @@ public class ModelEditor implements IGotoObject {
 	public static final String VIRTUAL_TRIM_CONTRIBUTIONS = ModelEditor.class.getName() + ".VIRTUAL_TRIM_CONTRIBUTIONS"; //$NON-NLS-1$
 	public static final String VIRTUAL_WINDOW_SHARED_ELEMENTS = ModelEditor.class.getName()
 			+ ".VIRTUAL_WINDOW_SHARED_ELEMENTS"; //$NON-NLS-1$
+	public static final String VIRTUAL_WINDOW_SNIPPETS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_SNIPPETS"; //$NON-NLS-1$
+
 	public static final String VIRTUAL_MODEL_FRAGEMENTS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_FRAGEMENTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_MODEL_IMPORTS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_IMPORTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_CATEGORIES = ModelEditor.class.getName() + ".VIRTUAL_CATEGORIES"; //$NON-NLS-1$
@@ -1209,6 +1211,7 @@ private void registerVirtualEditors() {
 				ContextInjectionFactory.make(VPerspectiveWindowsEditor.class, context));
 		registerVirtualEditor(VIRTUAL_WINDOW_CONTROLS,
 				ContextInjectionFactory.make(VWindowControlEditor.class, context));
+		registerVirtualEditor(VIRTUAL_WINDOW_SNIPPETS, ContextInjectionFactory.make(VSnippetsEditor.class, context));
 		registerVirtualEditor(VIRTUAL_PART_DESCRIPTORS, ContextInjectionFactory.make(VPartDescriptor.class, context));
 		registerVirtualEditor(VIRTUAL_PARTDESCRIPTOR_MENU,
 				ContextInjectionFactory.make(VPartDescriptorMenuEditor.class, context));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index d8ec12a94e..c4bc2953ca 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -82,6 +82,7 @@ public class WindowEditor extends AbstractComponentEditor {
 	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
 			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private final IListProperty SHARED_ELEMENTS = EMFProperties.list(BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
+	private final IListProperty SNIPPETS = EMFProperties.list(UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS);
 	private final IValueProperty WINDOW__MAIN_MENU = EMFProperties.value(BasicPackageImpl.Literals.WINDOW__MAIN_MENU);
 
 	private Action addMainMenu;
@@ -408,6 +409,14 @@ protected boolean accepted(Object o) {
 			}
 		});
 
+		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_SNIPPETS, SNIPPETS, element,
+				Messages.WindowEditor_Snippets) {
+			@Override
+			protected boolean accepted(Object o) {
+				return true;
+			}
+		});
+
 		final MWindow window = (MWindow) element;
 		if (window.getMainMenu() != null) {
 			list.add(0, window.getMainMenu());

From 5f18e7b2a5f8c6295af62d325e8c35e5b131d0ae Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Wed, 13 Apr 2016 10:57:46 +0200
Subject: [PATCH 0941/1286] Bug 491534 - comparator error in
 org.eclipse.e4.tools.emf.ui

Change-Id: Ica7ed4be3712d43f04371768e432df5dc2a5db93
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
index 14243173d2..983f2c1f97 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
+++ b/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
@@ -1,3 +1,4 @@
 # To force a version qualifier update add the bug here
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
 Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
+Bug 491534 - comparator error in org.eclipse.e4.tools.emf.ui

From bfb44ed132551f8470b719b1a7209e46abbc9b9c Mon Sep 17 00:00:00 2001
From: Jonas Helming <jhelming@eclipsesource.com>
Date: Fri, 4 Mar 2016 14:12:14 +0100
Subject: [PATCH 0942/1286] Bug 405888 - Hide TypeId from model editor because
 Command parameter TypeId not supported (yet)

Change-Id: I94f3bbcbe2904dea8095fa499a022b941c737b78
Signed-off-by: Jonas Helming <jhelming@eclipsesource.com>
---
 .../ui/internal/common/component/CommandParameterEditor.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 5abd04f0ca..da2e82f9eb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -143,8 +143,6 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		ControlFactory.createTextField(parent, Messages.CommandParameterEditor_Name, master, context, textProp,
 				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME),
 				Messages.ModelTooling_Empty_Warning);
-		ControlFactory.createTextField(parent, Messages.CommandParameterEditor_TypeId, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__TYPE_ID));
 
 		{
 			final Label l = new Label(parent, SWT.NONE);

From 763769066c09ce44997fbb58eed4128c76389281 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Mon, 25 Apr 2016 19:48:06 +0200
Subject: [PATCH 0943/1286]  Bug 492389 - Input Part are still proposed in the
 PartEditorSashContainer

Change-Id: Icc022bf4f704194da9dc4dde2a64e98d0c7481f1
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../ui/internal/common/component/PartSashContainerEditor.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 45561eef9d..ead9a83a5f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -288,7 +288,6 @@ protected void addPressed() {
 			eClassList.add(new FeatureClass("PartSashContainer", BasicPackageImpl.Literals.PART_SASH_CONTAINER)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("PartStack", BasicPackageImpl.Literals.PART_STACK)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART)); //$NON-NLS-1$
-			eClassList.add(new FeatureClass("InputPart", BasicPackageImpl.Literals.INPUT_PART)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("Area", AdvancedPackageImpl.Literals.AREA)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER)); //$NON-NLS-1$
 			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_SASH_CONTAINER,

From 5626f15c164320cee470c06fbb35a2a95d3cf5f9 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Mon, 2 May 2016 09:18:49 -0400
Subject: [PATCH 0944/1286] Bug 491858 - Some bundles (o.e.e4.tools.emf.ui*)
 have decreased version in 4.6, compared to 4.5

Change-Id: I8291a2fa8c409bf8c75ea4a79f69862f7786103a
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index c983902be1..373de636d0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.5.100.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 839db4f0d6..5e393156da 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.5.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>

From 025314a2bc880b9ab9c20348c599130eeccd05aa Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 3 May 2016 11:47:50 +0200
Subject: [PATCH 0945/1286] Bug 492875 - Remove the "strictly compatible JRE"
 per-project override in eclipse.platform.ui project

Change-Id: I750fb793a67c53cf1295ef4902f0290754dc99aa
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../.settings/org.eclipse.jdt.launching.prefs                   | 2 --
 .../.settings/org.eclipse.jdt.launching.prefs                   | 2 --
 .../.settings/org.eclipse.jdt.launching.prefs                   | 2 --
 .../.settings/org.eclipse.jdt.launching.prefs                   | 2 --
 .../.settings/org.eclipse.jdt.launching.prefs                   | 2 --
 .../.settings/org.eclipse.jdt.launching.prefs                   | 2 --
 .../.settings/org.eclipse.jdt.launching.prefs                   | 2 --
 7 files changed, 14 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.launching.prefs
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.launching.prefs
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.launching.prefs
 delete mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.launching.prefs
 delete mode 100644 bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.launching.prefs
 delete mode 100644 bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.launching.prefs
 delete mode 100644 tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.launching.prefs

diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 3bb235278e..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 3bb235278e..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 3bb235278e..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 3bb235278e..0000000000
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 3bb235278e..0000000000
--- a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 3bb235278e..0000000000
--- a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.launching.prefs b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 3bb235278e..0000000000
--- a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore

From f725a39b97e3f659907aadfc3c1752c7ccae668f Mon Sep 17 00:00:00 2001
From: Markus Keller <markus_keller@ch.ibm.com>
Date: Tue, 28 Jun 2016 15:40:35 +0200
Subject: [PATCH 0946/1286] Bug 496465: Prep for 4.7 (Oxygen) builds

---
 bundles/org.eclipse.e4.tools.compat/pom.xml        | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml  | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml        | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml               | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 400ad50c21..b20dfa3425 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.6.0-SNAPSHOT</version>
+    <version>4.7.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index caed454e49..62e8c2c630 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.6.0-SNAPSHOT</version>
+    <version>4.7.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 5e393156da..044f2e9d10 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.6.0-SNAPSHOT</version>
+    <version>4.7.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index b70c11556b..c940c6ea65 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.6.0-SNAPSHOT</version>
+    <version>4.7.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 0287ee804d..f220922a72 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.6.0-SNAPSHOT</version>
+    <version>4.7.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index a22cd87510..31575059a3 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.6.0-SNAPSHOT</version>
+    <version>4.7.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 00e4c3e58d..a61eb640f2 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.6.0-SNAPSHOT</version>
+    <version>4.7.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 

From 68f6091587595ea46524e4661fcf13dcbb0b7054 Mon Sep 17 00:00:00 2001
From: Patrik Suzzi <psuzzi@gmail.com>
Date: Fri, 15 May 2015 12:19:21 +0200
Subject: [PATCH 0947/1286] Bug 421066 - creating a new handler class needs
 multi validator

Added multi-validator in AbstractNewClassPage. This validator now
perform cross-validation of package and class name.

Change-Id: I24187b9a925a185f7f1f637c6582faf1d9b49b01
Signed-off-by: Patrik Suzzi <psuzzi@gmail.com>
---
 .../wizards/classes/AbstractNewClassPage.java | 126 ++++++++++++------
 1 file changed, 83 insertions(+), 43 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index e3d45f755a..1a09133084 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 BestSolution.at and others.
+ * Copyright (c) 2010, 2016 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Sopot Cela <sopotcela@gmail.com>
- * Patrik Suzzi <psuzzi@gmail.com> - Bug 421066
+ * Patrik Suzzi <psuzzi@gmail.com> - Bug 421066, 466491
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
@@ -20,7 +20,10 @@
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.beans.BeanProperties;
 import org.eclipse.core.databinding.conversion.Converter;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.core.databinding.validation.MultiValidator;
+import org.eclipse.core.databinding.validation.ValidationStatus;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IResource;
@@ -46,6 +49,7 @@
 import org.eclipse.jdt.ui.JavaElementComparator;
 import org.eclipse.jdt.ui.JavaElementLabelProvider;
 import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
+import org.eclipse.jface.databinding.swt.ISWTObservableValue;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.wizard.WizardPageSupport;
@@ -150,7 +154,7 @@ public static boolean exists(IPackageFragmentRoot pFragmentRoot, IPackageFragmen
 	private String initialPackage;
 
 	protected AbstractNewClassPage(String pageName, String title, String description, IPackageFragmentRoot froot,
-		IWorkspaceRoot fWorkspaceRoot) {
+			IWorkspaceRoot fWorkspaceRoot) {
 		super(pageName);
 		this.froot = froot;
 		this.fWorkspaceRoot = fWorkspaceRoot;
@@ -160,7 +164,7 @@ protected AbstractNewClassPage(String pageName, String title, String description
 	}
 
 	protected AbstractNewClassPage(String pageName, String title, String description, IPackageFragmentRoot froot,
-		IWorkspaceRoot fWorkspaceRoot, String initialString) {
+			IWorkspaceRoot fWorkspaceRoot, String initialString) {
 		this(pageName, title, description, froot, fWorkspaceRoot);
 		this.initialString = initialString;
 	}
@@ -186,7 +190,7 @@ public void init(IStructuredSelection selection) {
 	@Override
 	public void createControl(Composite parent) {
 		final Image img = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream(
-			"/icons/full/wizban/newclass_wiz.png")); //$NON-NLS-1$
+				"/icons/full/wizban/newclass_wiz.png")); //$NON-NLS-1$
 		setImageDescriptor(ImageDescriptor.createFromImage(img));
 
 		parent.addDisposeListener(new DisposeListener() {
@@ -205,7 +209,7 @@ public void widgetDisposed(DisposeEvent e) {
 		clazz = createInstance();
 		if (froot != null && initialString != null) {
 			clazz.setPackageFragment(froot.getPackageFragment(parseInitialStringForPackage(initialString) == null ? "" //$NON-NLS-1$
-				: parseInitialStringForPackage(initialString)));
+					: parseInitialStringForPackage(initialString)));
 			clazz.setName(parseInitialStringForClassName(initialString));
 		} else if (froot != null && initialPackage != null) {
 			clazz.setPackageFragment(froot.getPackageFragment(initialPackage));
@@ -222,11 +226,11 @@ public void widgetDisposed(DisposeEvent e) {
 			t.setEditable(false);
 
 			final Binding bd = dbc.bindValue(
-				WidgetProperties.text().observe(t),
-				BeanProperties.value(FRAGMENT_ROOT).observe(clazz),
-				new UpdateValueStrategy().setBeforeSetValidator(new PFRootValidator()),
-				new UpdateValueStrategy().setConverter(new PackageFragmentRootToStringConverter())
-				);
+					WidgetProperties.text().observe(t),
+					BeanProperties.value(FRAGMENT_ROOT).observe(clazz),
+					new UpdateValueStrategy().setBeforeSetValidator(new PFRootValidator()),
+					new UpdateValueStrategy().setConverter(new PackageFragmentRootToStringConverter())
+					);
 
 			final Button b = new Button(parent, SWT.PUSH);
 			b.setText(Messages.AbstractNewClassPage_Browse);
@@ -243,18 +247,19 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		final Text tClassPackage;
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.AbstractNewClassPage_Package);
-			final Text t = new Text(parent, SWT.BORDER);
-			t.setEditable(true);
-			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			tClassPackage = new Text(parent, SWT.BORDER);
+			tClassPackage.setEditable(true);
+			tClassPackage.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			final Binding bd = dbc.bindValue(
-				WidgetProperties.text(SWT.Modify).observe(t),
-				BeanProperties.value(PACKAGE_FRAGMENT).observe(clazz),
-				new UpdateValueStrategy().setConverter(new StringToPackageFragmentConverter(clazz)),
-				new UpdateValueStrategy().setConverter(new PackageFragmentToStringConverter())
-				);
+					WidgetProperties.text(SWT.Modify).observe(tClassPackage),
+					BeanProperties.value(PACKAGE_FRAGMENT).observe(clazz),
+					new UpdateValueStrategy().setConverter(new StringToPackageFragmentConverter(clazz)),
+					new UpdateValueStrategy().setConverter(new PackageFragmentToStringConverter())
+					);
 
 			final Button b = new Button(parent, SWT.PUSH);
 			b.setText(Messages.AbstractNewClassPage_Browse);
@@ -270,16 +275,18 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		final Text tClassName;
 		{
 			final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.AbstractNewClassPage_Name);
 
-			final Text t = new Text(parent, SWT.BORDER);
-			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			dbc.bindValue(textProp.observe(t), BeanProperties.value(PROPERTY_NAME, String.class).observe(clazz),
-				new UpdateValueStrategy().setBeforeSetValidator(new ClassnameValidator(clazz)), null);
+			tClassName = new Text(parent, SWT.BORDER);
+			tClassName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			dbc.bindValue(textProp.observe(tClassName),
+					BeanProperties.value(PROPERTY_NAME, String.class).observe(clazz),
+					new UpdateValueStrategy().setBeforeSetValidator(new ClassnameValidator()), null);
 
 			new Label(parent, SWT.NONE);
 		}
@@ -289,6 +296,11 @@ public void widgetSelected(SelectionEvent e) {
 			l.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 3, 1));
 		}
 
+		final ISWTObservableValue obsPackage = WidgetProperties.text(SWT.Modify).observe(tClassPackage);
+		final ISWTObservableValue obsClass = WidgetProperties.text(SWT.Modify).observe(tClassName);
+		final ClassMultiValidator multiValidator = new ClassMultiValidator(clazz, obsPackage, obsClass);
+		dbc.addValidationStatusProvider(multiValidator);
+
 		createFields(parent, dbc);
 		setControl(parent);
 	}
@@ -301,11 +313,11 @@ private String parseInitialStringForPackage(String initialString2) {
 		final int iSecondSlash = initialString2.lastIndexOf('/');
 		if (
 
-		initialString2.length() == 0 || // empty
-			ioBC == -1 || // no bundle class
-			iSecondSlash == -1 || // no package &| class name
-			initialString2.indexOf('.') == -1// no package
-		) {
+				initialString2.length() == 0 || // empty
+				ioBC == -1 || // no bundle class
+				iSecondSlash == -1 || // no package &| class name
+				initialString2.indexOf('.') == -1// no package
+				) {
 			return null;
 		}
 
@@ -322,11 +334,11 @@ private String parseInitialStringForClassName(String initialString) {
 		final int iSecondSlash = initialString.lastIndexOf('/');
 		if (
 
-		initialString.length() == 0 || // empty
-			ioBC == -1 || // no bundle class
-			iSecondSlash == -1 || // no package &| class name
-			initialString.indexOf('.') == -1// no package
-		) {
+				initialString.length() == 0 || // empty
+				ioBC == -1 || // no bundle class
+				iSecondSlash == -1 || // no package &| class name
+				initialString.indexOf('.') == -1// no package
+				) {
 			return null;
 		}
 		final int lastDot = initialString.lastIndexOf('.');
@@ -413,7 +425,7 @@ private IPackageFragment choosePackage() {
 		}
 
 		final ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(),
-			new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT));
+				new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT));
 		dialog.setIgnoreCase(false);
 		dialog.setTitle(Messages.AbstractNewClassPage_ChoosePackage);
 		dialog.setMessage(Messages.AbstractNewClassPage_ChooseAPackage);
@@ -439,14 +451,45 @@ public JavaClass getClazz() {
 		return clazz;
 	}
 
-	static class ClassnameValidator implements IValidator {
+	/**
+	 * Validate the specified class does not already exists
+	 */
+	static class ClassMultiValidator extends MultiValidator {
 
-		private final JavaClass clazz;
+		private final JavaClass javaClass;
+		private final IObservableValue observedPackage;
+		private final IObservableValue observedClass;
 
-		public ClassnameValidator(JavaClass clazz) {
-			this.clazz = clazz;
+		public ClassMultiValidator(JavaClass javaClass, final IObservableValue observedPackage,
+				final IObservableValue observedClass) {
+			this.javaClass = javaClass;
+			this.observedPackage = observedPackage;
+			this.observedClass = observedClass;
+		}
+
+		/**
+		 * {@inheritDoc}
+		 *
+		 * @see org.eclipse.core.databinding.validation.MultiValidator#validate()
+		 */
+		@Override
+		protected IStatus validate() {
+			final String classPackage = (String) observedPackage.getValue();
+			final String className = (String) observedClass.getValue();
+
+			final IPackageFragment packageFragment = javaClass.getFragmentRoot().getPackageFragment(classPackage);
+
+			if (JavaClass.exists(javaClass.getFragmentRoot(), packageFragment, className)) {
+				return new Status(IStatus.ERROR, ToolsPlugin.PLUGIN_ID, Messages.AbstractNewClassPage_ClassExists);
+			}
+
+			return ValidationStatus.ok();
 		}
 
+	}
+
+	static class ClassnameValidator implements IValidator {
+
 		@Override
 		public IStatus validate(Object value) {
 			final String name = value.toString();
@@ -455,10 +498,7 @@ public IStatus validate(Object value) {
 			}
 			if (name.indexOf('.') != -1 || name.trim().indexOf(' ') != -1) {
 				return new Status(IStatus.ERROR, ToolsPlugin.PLUGIN_ID,
-					Messages.AbstractNewClassPage_NameMustBeQualified);
-			}
-			if (JavaClass.exists(clazz.getFragmentRoot(), clazz.getPackageFragment(), name)) {
-				return new Status(IStatus.ERROR, ToolsPlugin.PLUGIN_ID, Messages.AbstractNewClassPage_ClassExists);
+						Messages.AbstractNewClassPage_NameMustBeQualified);
 			}
 
 			return JavaConventions.validateJavaTypeName(name, JavaCore.VERSION_1_3, JavaCore.VERSION_1_3);
@@ -472,7 +512,7 @@ public IStatus validate(Object value) {
 			final String name = value.toString();
 			if (name.length() == 0) {
 				return new Status(IStatus.ERROR, ToolsPlugin.PLUGIN_ID,
-					Messages.AbstractNewClassPage_SourceFolderNotEmpty);
+						Messages.AbstractNewClassPage_SourceFolderNotEmpty);
 			}
 
 			return new Status(IStatus.OK, ToolsPlugin.PLUGIN_ID, ""); //$NON-NLS-1$

From 28373c92d42f48930660c05111ca602ebfd0e9e3 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Tue, 13 Sep 2016 10:36:48 +0300
Subject: [PATCH 0948/1286] Bug 421066 - creating a new handler class needs
 multi validator

Fix the warnings (IObservableValue is a raw type. References to generic
type IObservableValue<T> should be parameterized) introduced with
previous patch in the builds.

Change-Id: I4b2f8d74938ca3d80b8577cc5a00aa6d9302a792
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../tools/wizards/classes/AbstractNewClassPage.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index 1a09133084..034197c5ca 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -457,11 +457,11 @@ public JavaClass getClazz() {
 	static class ClassMultiValidator extends MultiValidator {
 
 		private final JavaClass javaClass;
-		private final IObservableValue observedPackage;
-		private final IObservableValue observedClass;
+		private final IObservableValue<String> observedPackage;
+		private final IObservableValue<String> observedClass;
 
-		public ClassMultiValidator(JavaClass javaClass, final IObservableValue observedPackage,
-				final IObservableValue observedClass) {
+		public ClassMultiValidator(JavaClass javaClass, final IObservableValue<String> observedPackage,
+				final IObservableValue<String> observedClass) {
 			this.javaClass = javaClass;
 			this.observedPackage = observedPackage;
 			this.observedClass = observedClass;
@@ -474,8 +474,8 @@ public ClassMultiValidator(JavaClass javaClass, final IObservableValue observedP
 		 */
 		@Override
 		protected IStatus validate() {
-			final String classPackage = (String) observedPackage.getValue();
-			final String className = (String) observedClass.getValue();
+			final String classPackage = observedPackage.getValue();
+			final String className = observedClass.getValue();
 
 			final IPackageFragment packageFragment = javaClass.getFragmentRoot().getPackageFragment(classPackage);
 

From a37599c8148ef0550e47248af7b91b2a92611979 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mon, 19 Sep 2016 11:18:43 +0300
Subject: [PATCH 0949/1286] Bug 421066 - creating a new handler class needs
 multi validator

Ignore unavoidable generics errors and silence last few warnings due to
the not-fully generified databindings.

Change-Id: Iad0c299c0181f89d2e1926e1f915ff96d32e5a78
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../.settings/org.eclipse.jdt.core.prefs                   | 7 ++++++-
 .../tools/wizards/classes/AbstractNewClassPage.java        | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
index cd32e5711d..c05fbc85d7 100644
--- a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
@@ -21,8 +21,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
@@ -83,12 +86,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -106,7 +111,7 @@ org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index 034197c5ca..ea9b2f7aae 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -298,6 +298,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		final ISWTObservableValue obsPackage = WidgetProperties.text(SWT.Modify).observe(tClassPackage);
 		final ISWTObservableValue obsClass = WidgetProperties.text(SWT.Modify).observe(tClassName);
+		@SuppressWarnings("unchecked")
 		final ClassMultiValidator multiValidator = new ClassMultiValidator(clazz, obsPackage, obsClass);
 		dbc.addValidationStatusProvider(multiValidator);
 

From 1045f1033a087eaf06a272be801caa12fa9e8131 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mon, 19 Sep 2016 11:22:14 +0300
Subject: [PATCH 0950/1286] Remove useless casts in AbstractNewClassWizard.

Change-Id: Ia5b6aa663eff8d7fe85a2e54a73d1551c6af67e5
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../classes/AbstractNewClassWizard.java       | 38 +++++++------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
index 25397bc12e..6581766ffa 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 BestSolution.at and others.
+ * Copyright (c) 2010, 2016 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -93,18 +93,14 @@ protected IJavaElement getInitialJavaElement(IStructuredSelection selection) {
 			if (selectedElement instanceof IAdaptable) {
 				final IAdaptable adaptable = (IAdaptable) selectedElement;
 
-				jelem = (IJavaElement) adaptable.getAdapter(IJavaElement.class);
+				jelem = adaptable.getAdapter(IJavaElement.class);
 				if (jelem == null || !jelem.exists()) {
 					jelem = null;
-					IResource resource = (IResource) adaptable
-						.getAdapter(IResource.class);
-					if (resource != null
-						&& resource.getType() != IResource.ROOT) {
-						while (jelem == null
-							&& resource.getType() != IResource.PROJECT) {
+					IResource resource = adaptable.getAdapter(IResource.class);
+					if (resource != null && resource.getType() != IResource.ROOT) {
+						while (jelem == null && resource.getType() != IResource.PROJECT) {
 							resource = resource.getParent();
-							jelem = (IJavaElement) resource
-								.getAdapter(IJavaElement.class);
+							jelem = resource.getAdapter(IJavaElement.class);
 						}
 						if (jelem == null) {
 							jelem = JavaCore.create(resource); // java project
@@ -120,17 +116,14 @@ protected IJavaElement getInitialJavaElement(IStructuredSelection selection) {
 	protected IPackageFragmentRoot getFragmentRoot(IJavaElement elem) {
 		IPackageFragmentRoot initRoot = null;
 		if (elem != null) {
-			initRoot = (IPackageFragmentRoot) elem
-				.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
+			initRoot = (IPackageFragmentRoot) elem.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
 			try {
-				if (initRoot == null
-					|| initRoot.getKind() != IPackageFragmentRoot.K_SOURCE) {
+				if (initRoot == null || initRoot.getKind() != IPackageFragmentRoot.K_SOURCE) {
 					final IJavaProject jproject = elem.getJavaProject();
 					if (jproject != null) {
 						initRoot = null;
 						if (jproject.exists()) {
-							final IPackageFragmentRoot[] roots = jproject
-								.getPackageFragmentRoots();
+							final IPackageFragmentRoot[] roots = jproject.getPackageFragmentRoots();
 							for (int i = 0; i < roots.length; i++) {
 								if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE) {
 									initRoot = roots[i];
@@ -139,8 +132,7 @@ protected IPackageFragmentRoot getFragmentRoot(IJavaElement elem) {
 							}
 						}
 						if (initRoot == null) {
-							initRoot = jproject.getPackageFragmentRoot(jproject
-								.getResource());
+							initRoot = jproject.getPackageFragmentRoot(jproject.getResource());
 						}
 					}
 				}
@@ -285,11 +277,10 @@ public boolean performFinish() {
 			file = (IFile) resource;
 			try {
 				if (!file.exists()) {
-					file.create(new ByteArrayInputStream(content.getBytes()),
-						true, null);
+					file.create(new ByteArrayInputStream(content.getBytes()), true, null);
 				} else {
 					file.setContents(new ByteArrayInputStream(content.getBytes()),
-						IResource.FORCE | IResource.KEEP_HISTORY, null);
+							IResource.FORCE | IResource.KEEP_HISTORY, null);
 				}
 				IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
 				// unit.open(null);
@@ -303,11 +294,10 @@ public boolean performFinish() {
 			file = p.getFile(cuName);
 			try {
 				if (!file.exists()) {
-					file.create(new ByteArrayInputStream(content.getBytes()),
-						true, null);
+					file.create(new ByteArrayInputStream(content.getBytes()), true, null);
 				} else {
 					file.setContents(new ByteArrayInputStream(content.getBytes()),
-						IResource.FORCE | IResource.KEEP_HISTORY, null);
+							IResource.FORCE | IResource.KEEP_HISTORY, null);
 				}
 				IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
 			} catch (final CoreException e) {

From 634649962bc6c40721d22aa9211bf8433be41ebf Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 13 Sep 2016 13:57:13 +0200
Subject: [PATCH 0951/1286] Bug 501304 - Update version numbers in
 eclipse.platform.ui.tools

Change-Id: I82e85cc633ea33104afebe96058800b0603ea7b9
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF        | 2 +-
 bundles/org.eclipse.e4.tools.compat/pom.xml                     | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF  | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml               | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml              | 2 +-
 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF      | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml                   | 2 +-
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF               | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                            | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml          | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml              | 2 +-
 tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF            | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index d8ae01266b..b938469686 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.7.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index b20dfa3425..680160a86d 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.compat</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.7.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 29f1835af2..d11c25fcc5 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.7.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 62e8c2c630..e699032b30 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.editor3x</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.7.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index add46f3b7d..fcaafa5414 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.7.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index c940c6ea65..2ce4fb31b1 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.jdt.templates</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.7.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index b61443aae1..83aec567df 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.7.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.emf.ui",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index f220922a72..48f52bbf8d 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.services</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.7.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 8f5ac8c033..f357670deb 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.7.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 31575059a3..c0b4641908 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tool</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.7.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index a0827744cd..a1a9b04b3b 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.5.100.qualifier"
+      version="4.7.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index a61eb640f2..f21ea8f09e 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>4.5.100-SNAPSHOT</version>
+  <version>4.7.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
index c765b644dc..f4f7ec294e 100644
--- a/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.e4.tools.test
 Bundle-Version: 1.0.0.qualifier
-Fragment-Host: org.eclipse.e4.tools;bundle-version="4.5.0"
+Fragment-Host: org.eclipse.e4.tools;bundle-version="4.7.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.e4.core.contexts;bundle-version="1.3.100"

From 0268a2cbfb359b250308ac4959474f79a94139a1 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 13 Sep 2016 10:24:12 +0200
Subject: [PATCH 0952/1286] Removes some Non-Javadoc statements

Change-Id: Ibe7cd0a524473e29b1e157a4044c54522f2227d0
---
 .../org/eclipse/e4/internal/tools/ToolsPlugin.java   | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
index 4d408c2697..082a3e52ab 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
@@ -16,24 +16,12 @@ public class ToolsPlugin extends AbstractUIPlugin {
 
 	private ResourceLocator resourceLocator;
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
-	 * )
-	 */
 	@Override
 	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
-	 * )
-	 */
 	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;

From 0ec3757ef6e00e45b70bcb5b99f446faee21910d Mon Sep 17 00:00:00 2001
From: Max Hohenegger <eclipse@hohenegger.eu>
Date: Tue, 25 Oct 2016 20:56:53 +0200
Subject: [PATCH 0953/1286] Bug 506560 - ClassCastException importing 3x parts
 in the e4xmi editor

This happens when you trigger "Import 3x"->"Views" e.g. on a PartStack

Change-Id: I719bb35417a1260f5806cf5ee82abd1ef1aa544f
Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu>
---
 .../e4/tools/emf/ui/internal/imp/ModelImportWizard.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
index e9afdeef53..c9a7b606f5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
@@ -44,7 +44,12 @@ public ModelImportWizard(Class<? extends MApplicationElement> applicationElement
 		this.applicationElement = applicationElement;
 		this.editor = editor;
 		this.hint = hint;
-		application = (MApplication) editor.getEditor().getModelProvider().getRoot().get(0);
+		Object modelSelection = editor.getEditor().getModelProvider().getRoot().get(0);
+		if (modelSelection instanceof MApplication) {
+			application = (MApplication) modelSelection;
+		} else {
+			application = null;
+		}
 		setWindowTitle(Messages.ModelImportWizard_Model
 			+ " " + applicationElement.getSimpleName() + " " + Messages.ModelImportWizard_ImportWizard); //$NON-NLS-1$ //$NON-NLS-2$
 		setDefaultPageImageDescriptor(ImageDescriptor.createFromImage(resourcePool

From 25c51f3310847445b4281025b42f80d2b8a49d9e Mon Sep 17 00:00:00 2001
From: Patrik Suzzi <psuzzi@gmail.com>
Date: Mon, 19 Dec 2016 11:49:55 +0100
Subject: [PATCH 0954/1286] Bug 509430 - Fix e4 code templates

The e4 templates are now working. As an example, to generate the
postconstruct method: type "postcon" press ctrl+space .

see: https://bugs.eclipse.org/bugs/attachment.cgi?id=265937

Note: it doesn't work with "@"

Change-Id: I0b164f2b6611d29dcd078748fc958f5d1390f0d1
Signed-off-by: Patrik Suzzi <psuzzi@gmail.com>
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../jdt/templates/E4TemplateCompletionProposalComputer.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
index b25bedd76e..4fe21c0727 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
@@ -38,8 +38,8 @@ public class E4TemplateCompletionProposalComputer extends AbstractTemplateComple
 	/**
 	 * The following annotations are used to detect if an if a project uses e4.
 	 */
-	private static final String E4_ANNOTATION_FOCUS = "org.eclipPostConstructse.e4.ui.di.Focus"; //$NON-NLS-1$
-	private static final String E4_ANNOTATION_POSTCONSTRUCT = "javax.annotation."; //$NON-NLS-1$
+	private static final String E4_ANNOTATION_FOCUS = "org.eclipse.e4.ui.di.Focus"; //$NON-NLS-1$
+	private static final String E4_ANNOTATION_POSTCONSTRUCT = "javax.annotation.PostConstruct"; //$NON-NLS-1$
 
 	/**
 	 * Listener that resets the cached java project if its build path changes.

From 1ac51579bb46665cbb11a5d41b3346175667bf2f Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Mon, 19 Dec 2016 13:55:04 +0100
Subject: [PATCH 0955/1286] Bug 509439 - The jet builder generates a different
 code than committed code

Change-Id: I34b8b63224d09029cbcc4e4e48578c21f60ed008
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../classes/templates/AddonTemplate.java      |  6 +--
 .../DynamicMenuContributionTemplate.java      | 14 +++----
 .../classes/templates/HandlerTemplate.java    | 14 +++----
 .../classes/templates/PartTemplate.java       | 38 +++++++++----------
 .../templates/ToolControlTemplate.java        | 14 +++----
 5 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
index f511bd037e..0f1e1f6436 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
@@ -24,13 +24,13 @@ public static synchronized AddonTemplate create(String lineSeparator)
   public String generate(Object argument)
   {
     final StringBuffer stringBuffer = new StringBuffer();
-     JavaClass domainClass = (JavaClass)argument;
+     JavaClass domainClass = (JavaClass)argument; 
     stringBuffer.append(TEXT_1);
-     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
     stringBuffer.append(TEXT_2);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
     stringBuffer.append(TEXT_3);
-     }
+     } 
     stringBuffer.append(TEXT_4);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_5);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
index 7d4a09e590..20a79b84f7 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
@@ -29,27 +29,27 @@ public static synchronized DynamicMenuContributionTemplate create(String lineSep
   public String generate(Object argument)
   {
     final StringBuffer stringBuffer = new StringBuffer();
-     DynamicMenuContributionClass domainClass = (DynamicMenuContributionClass)argument;
+     DynamicMenuContributionClass domainClass = (DynamicMenuContributionClass)argument; 
     stringBuffer.append(TEXT_1);
-     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
     stringBuffer.append(TEXT_2);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
     stringBuffer.append(TEXT_3);
-     }
+     } 
     stringBuffer.append(TEXT_4);
-     if( domainClass.isUseAboutToHide() )  {
+     if( domainClass.isUseAboutToHide() )  { 
     stringBuffer.append(TEXT_5);
-     }
+     } 
     stringBuffer.append(TEXT_6);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_7);
     stringBuffer.append( domainClass.getAboutToShowMethodName() );
     stringBuffer.append(TEXT_8);
-     if( domainClass.isUseAboutToHide() )  {
+     if( domainClass.isUseAboutToHide() )  { 
     stringBuffer.append(TEXT_9);
     stringBuffer.append( domainClass.getAboutToHideMethodName() );
     stringBuffer.append(TEXT_10);
-     }
+     } 
     stringBuffer.append(TEXT_11);
     return stringBuffer.toString();
   }
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
index 6f11b13cb5..f9cfd2ceea 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
@@ -29,27 +29,27 @@ public static synchronized HandlerTemplate create(String lineSeparator)
   public String generate(Object argument)
   {
     final StringBuffer stringBuffer = new StringBuffer();
-     HandlerClass domainClass = (HandlerClass)argument;
+     HandlerClass domainClass = (HandlerClass)argument; 
     stringBuffer.append(TEXT_1);
-     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
     stringBuffer.append(TEXT_2);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
     stringBuffer.append(TEXT_3);
-     }
+     } 
     stringBuffer.append(TEXT_4);
-     if( domainClass.isUseCanExecute() )  {
+     if( domainClass.isUseCanExecute() )  { 
     stringBuffer.append(TEXT_5);
-     }
+     } 
     stringBuffer.append(TEXT_6);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_7);
     stringBuffer.append( domainClass.getExecuteMethodName() );
     stringBuffer.append(TEXT_8);
-     if( domainClass.isUseCanExecute() )  {
+     if( domainClass.isUseCanExecute() )  { 
     stringBuffer.append(TEXT_9);
     stringBuffer.append( domainClass.getCanExecuteMethodName() );
     stringBuffer.append(TEXT_10);
-     }
+     } 
     stringBuffer.append(TEXT_11);
     return stringBuffer.toString();
   }
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
index 975a84dea1..20843b9887 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
@@ -41,54 +41,54 @@ public static synchronized PartTemplate create(String lineSeparator)
   public String generate(Object argument)
   {
     final StringBuffer stringBuffer = new StringBuffer();
-     PartClass domainClass = (PartClass)argument;
+     PartClass domainClass = (PartClass)argument; 
     stringBuffer.append(TEXT_1);
-     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
     stringBuffer.append(TEXT_2);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
     stringBuffer.append(TEXT_3);
-     }
+     } 
     stringBuffer.append(TEXT_4);
-     if( domainClass.isUsePostConstruct() ) {
+     if( domainClass.isUsePostConstruct() ) { 
     stringBuffer.append(TEXT_5);
-     }
-     if( domainClass.isUsePredestroy() ) {
+     } 
+     if( domainClass.isUsePredestroy() ) { 
     stringBuffer.append(TEXT_6);
-     }
-     if( domainClass.isUseFocus() ) {
+     } 
+     if( domainClass.isUseFocus() ) { 
     stringBuffer.append(TEXT_7);
-     }
-     if( domainClass.isUsePersist() ) {
+     } 
+     if( domainClass.isUsePersist() ) { 
     stringBuffer.append(TEXT_8);
-     }
+     } 
     stringBuffer.append(TEXT_9);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_10);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_11);
-     if( domainClass.isUsePostConstruct() ) {
+     if( domainClass.isUsePostConstruct() ) { 
     stringBuffer.append(TEXT_12);
     stringBuffer.append( domainClass.getPostConstructMethodName()  );
     stringBuffer.append(TEXT_13);
-     }
+     } 
     stringBuffer.append(TEXT_14);
-     if( domainClass.isUsePredestroy() ) {
+     if( domainClass.isUsePredestroy() ) { 
     stringBuffer.append(TEXT_15);
     stringBuffer.append( domainClass.getPreDestroyMethodName()  );
     stringBuffer.append(TEXT_16);
-     }
+     } 
     stringBuffer.append(TEXT_17);
-     if( domainClass.isUseFocus() ) {
+     if( domainClass.isUseFocus() ) { 
     stringBuffer.append(TEXT_18);
     stringBuffer.append( domainClass.getFocusMethodName() );
     stringBuffer.append(TEXT_19);
-     }
+     } 
     stringBuffer.append(TEXT_20);
-     if( domainClass.isUsePersist() ) {
+     if( domainClass.isUsePersist() ) { 
     stringBuffer.append(TEXT_21);
     stringBuffer.append( domainClass.getPersistMethodName() );
     stringBuffer.append(TEXT_22);
-     }
+     } 
     stringBuffer.append(TEXT_23);
     return stringBuffer.toString();
   }
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
index 55f02dac72..5a0405f536 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
@@ -28,24 +28,24 @@ public static synchronized ToolControlTemplate create(String lineSeparator)
   public String generate(Object argument)
   {
     final StringBuffer stringBuffer = new StringBuffer();
-     ToolControlClass domainClass = (ToolControlClass)argument;
-     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
+     ToolControlClass domainClass = (ToolControlClass)argument; 
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
     stringBuffer.append(TEXT_1);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
     stringBuffer.append(TEXT_2);
-     }
+     } 
     stringBuffer.append(TEXT_3);
-     if( domainClass.isCreateDefaultConstructor() )  {
+     if( domainClass.isCreateDefaultConstructor() )  { 
     stringBuffer.append(TEXT_4);
-     }
+     } 
     stringBuffer.append(TEXT_5);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_6);
-     if( domainClass.isCreateDefaultConstructor() )  {
+     if( domainClass.isCreateDefaultConstructor() )  { 
     stringBuffer.append(TEXT_7);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_8);
-     }
+     } 
     stringBuffer.append(TEXT_9);
     stringBuffer.append( domainClass.getCreateGuiMethodName() );
     stringBuffer.append(TEXT_10);

From 3e0562453964a415bed7d034c0d4434f4c8c5b68 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Mon, 19 Dec 2016 15:58:50 +0100
Subject: [PATCH 0956/1286] Bug 490245 - Model Fragment Editor should display
 tooltips and enhance compulsory fields

Change-Id: Ibb03394790948db113391d863a2e88976ae5a280
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../e4/tools/emf/ui/internal/Messages.java    |   2 +
 .../tools/emf/ui/internal/Messages.properties | 112 +++++++++---------
 .../common/component/StringModelFragment.java |   2 +
 3 files changed, 61 insertions(+), 55 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 178cbac034..c874572da2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -391,7 +391,9 @@ public class Messages {
 	public String StringModelFragment_Label;
 	public String StringModelFragment_Description;
 	public String StringModelFragment_Featurename;
+	public String StringModelFragment_FeaturenameTooltip;
 	public String StringModelFragment_ParentId;
+	public String StringModelFragment_ParentIdTooltip;
 	public String StringModelFragment_PositionInList;
 	public String StringModelFragment_Elements;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 0b0bd774b7..e728f8347b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -64,7 +64,7 @@ ModelTooling_Empty_Warning=Value must not be empty
 AbstractCommandSelectionDialog_Label_CommandId=Command-ID
 
 ApplicationEditor_Label=Application
-ApplicationEditor_Description=Application bla, bla, bla
+ApplicationEditor_Description=Application
 ApplicationEditor_Handlers=Handlers
 ApplicationEditor_PartDescriptors=Part Descriptors
 ApplicationEditor_BindingTables=BindingTables
@@ -99,7 +99,7 @@ ApplicationEditor_Toolbar=Toolbar
 ApplicationEditor_Type=Type
 
 BindingTableEditor_Label=BindingTable
-BindingTableEditor_Description=BindingTable bla bla bla
+BindingTableEditor_Description=BindingTable
 BindingTableEditor_ContextId=Context ID
 BindingTableEditor_Keybindings=Keybindings
 BindingTableEditor_KeySequence=KeySequence
@@ -107,7 +107,7 @@ BindingTableEditor_Command=Command
 BindingTableEditor_AddKeyBinding=Keybinding
 
 CommandEditor_Label=Command
-CommandEditor_Description=Command bla bla bla
+CommandEditor_Description=Command
 CommandEditor_Name=Name
 CommandEditor_LabelDescription=Description
 CommandEditor_Parameters=Parameters
@@ -126,7 +126,7 @@ DialogEditor_Label=Dialog
 WizardDialogEditor_Label=Wizard
 
 DirectMenuItemEditor_Label=Direct Menu Item
-DirectMenuItemEditor_Description=Direct Menu Item bla bla bla
+DirectMenuItemEditor_Description=Direct Menu Item
 DirectMenuItemEditor_ClassURI=Class URI
 
 ControlFactory_Key=Key
@@ -135,17 +135,17 @@ ControlFactory_KeyValueShellTitle=Key/Value Pair
 
 DirectToolItemEditor_ClassURI=Class URI
 DirectToolItemEditor_Label=Direct Tool Item
-DirectToolItemEditor_Description=Direct Tool Item bla bla bla
+DirectToolItemEditor_Description=Direct Tool Item
 
 HandledMenuItemEditor_Label=Handled Menu Item
-HandledMenuItemEditor_Description=Handled Menu Item bla bla bla
+HandledMenuItemEditor_Description=Handled Menu Item
 HandledMenuItemEditor_Command=Command
 HandledMenuItemEditor_Parameters=Parameters
 HandledMenuItemEditor_Tag=Name
 HandledMenuItemEditor_Value=Value
 
 DynamicMenuContributionEditor_Label=Dynamic Menu Contribution
-DynamicMenuContributionEditor_Description=Dynamic Menu Contribution blablabla
+DynamicMenuContributionEditor_Description=Dynamic Menu Contribution
 
 DynamicMenuContributionEditor_ClassURI=Class URI
 DynamicMenuContributionEditor_LabelLabel=Label
@@ -155,10 +155,10 @@ HandledToolItemEditor_Parameters=Parameters
 HandledToolItemEditor_ParametersName=Name
 HandledToolItemEditor_ParametersValue=Value
 HandledToolItemEditor_Label=Handled Tool Item
-HandledToolItemEditor_Description=Handled Tool Item bla bla bla
+HandledToolItemEditor_Description=Handled Tool Item
 
 HandlerEditor_Label=Handler
-HandlerEditor_Description=Handler bla bla bla
+HandlerEditor_Description=Handler
 HandlerEditor_Command=Command
 HandlerEditor_ClassURI=Class URI
 
@@ -166,7 +166,7 @@ InputPartEditor_Label=InputPart
 InputPartEditor_InputURI=Input URI
 
 KeyBindingEditor_Label=KeyBinding
-KeyBindingEditor_Description=Binding bla bla bla
+KeyBindingEditor_Description=Binding
 KeyBindingEditor_Sequence=Sequence
 KeyBindingEditor_Command=Command
 KeyBindingEditor_Parameters=Parameters
@@ -176,7 +176,7 @@ KeyBindingEditor_AddParameter=Parameter
 
 MenuEditor_Label=Menu
 MenuEditor_Label_ViewMenu=View Menu
-MenuEditor_Description=Menu bla bla bla
+MenuEditor_Description=Menu
 MenuEditor_MenuItems=MenuItems
 MenuEditor_MenuItemType=Type
 MenuEditor_MenuItemItemType=Item Type
@@ -212,7 +212,7 @@ MenuItemEditor_AddCoreExpression=VisibleWhen Core Expression
 MenuSeparatorEditor_Label=Separator
 
 PartDescriptorEditor_Label=Part Descriptor
-PartDescriptorEditor_Descriptor=Part Descriptor Bla Bla Bla Bla
+PartDescriptorEditor_Descriptor=Part Descriptor 
 PartDescriptorEditor_LabelLabel=Label
 PartDescriptorEditor_Tooltip=Tooltip
 PartDescriptorEditor_IconURI=Icon URI
@@ -230,7 +230,7 @@ PartDescriptorEditor_Handlers=Handlers
 PartDescriptorEditor_ContainerData=Container Data
 
 PartEditor_Label=Part
-PartEditor_Description=Part Bla Bla Bla Bla
+PartEditor_Description=Part 
 PartEditor_LabelLabel=Label
 PartEditor_Tooltip=Tooltip
 PartEditor_IconURI=Icon URI
@@ -245,7 +245,7 @@ PartEditor_ToolBar=ToolBar
 PartEditor_BindingContexts=Binding Contexts
 
 PartSashContainerEditor_Label=Part Sash Container
-PartSashContainerEditor_Description=Sash bla bla bla
+PartSashContainerEditor_Description=Sash
 PartSashContainerEditor_Orientation=Orientation
 PartSashContainerEditor_Vertical=Vertical
 PartSashContainerEditor_Horizontal=Horizontal
@@ -259,7 +259,7 @@ PartSashContainerEditor_AddArea=Area
 PartSashContainerEditor_AddPlaceholder=Placeholder
 
 PartStackEditor_Label=Part Stack
-PartStackEditor_Description=Stack bla bla bla
+PartStackEditor_Description=Stack
 PartStackEditor_SelectedElement=Selected Element
 PartStackEditor_Parts=Parts
 PartStackEditor_ContainerData=Container Data
@@ -273,7 +273,7 @@ PartStackEditor_Placeholder=Placeholder
 PartStackEditor_Views=Views
 
 PerspectiveEditor_Label=Perspective
-PerspectiveEditor_Description=Perspective Bla Bla Bla
+PerspectiveEditor_Description=Perspective
 PerspectiveEditor_LabelLabel=Label
 PerspectiveEditor_SelectedElement=Selected Element
 PerspectiveEditor_Tooltip=Tooltip
@@ -288,19 +288,19 @@ PerspectiveEditor_AddPlaceholder=Placeholder
 
 
 PerspectiveStackEditor_Label=Perspective Stack
-PerspectiveStackEditor_Description=Perspective Stack Bla Bla Bla
+PerspectiveStackEditor_Description=Perspective Stack
 PerspectiveStackEditor_SelectedElement=Selected Element
 PerspectiveStackEditor_Perspectives=Perspectives
 PerspectiveStackEditor_AddPerspective=Perspective
 
 PlaceholderEditor_Label=Placeholder
-PlaceholderEditor_Descriptor=Placeholder Bla Bla Bla Bla
+PlaceholderEditor_Descriptor=Placeholder 
 PlaceholderEditor_Reference=Reference
 PlaceholderEditor_Closeable=Closeable
 PlaceholderEditor_ContainerData=Container Data
 
 ToolBarEditor_Label=Toolbar
-ToolBarEditor_Description=Toolbar bla bla bla
+ToolBarEditor_Description=Toolbar
 ToolBarEditor_ToolbarItems=Toolbar Items
 ToolBarEditor_ToolbarItemsType=Type
 ToolBarEditor_ToolbarItemsItemType=Item-Type
@@ -316,11 +316,11 @@ ToolBarEditor_AddToolBarSeparator=Separator
 ToolBarSeparatorEditor_Label=Separator
 
 ToolControlEditor_Label=Tool Control
-ToolControlEditor_Description=ToolControl bla bla bla
+ToolControlEditor_Description=ToolControl
 ToolControlEditor_ClassURI=Class URI
 
 VBindingTableEditor_Label=Binding Configuration
-VBindingTableEditor_Description=Binding Configuration Bla Bla Bla Bla
+VBindingTableEditor_Description=Binding Configuration 
 VBindingTableEditor_Contexts=Contexts
 VBindingTableEditor_Name=Name
 VBindingTableEditor_LabelDescription=Description
@@ -329,7 +329,7 @@ VBindingTableEditor_AddBindingTable=Binding Table
 
 AddonsEditor_ClassURI=Class URI
 AddonsEditor_TreeLabel=Add-on
-AddonsEditor_TreeLabelDescription=Add-on Bla Bla Bla
+AddonsEditor_TreeLabelDescription=Add-on
 AddonsEditor_Tags=Tags
 
 ContributionClassDialog_DialogMessage=Enter the name of the contributing class
@@ -352,7 +352,7 @@ MenuContributionEditor_DirectMenuItem=Direct Menu Item
 MenuContributionEditor_ParentId=Parent-ID
 MenuContributionEditor_Position=Position
 MenuContributionEditor_TreeLabel=Menu Contribution
-MenuContributionEditor_TreeLabelDescription=Menu Contribution Bla Bla Bla Bla
+MenuContributionEditor_TreeLabelDescription=Menu Contribution 
 
 ModelFragmentsEditor_ModelFragments=Model Fragments
 ModelFragmentsEditor_Label=Model Fragment Definition
@@ -360,9 +360,11 @@ ModelFragmentsEditor_Description=Description
 ModelFragmentsEditor_Imports=Imports
 
 StringModelFragment_Label=Model Fragment
-StringModelFragment_Description=Model Fragment Bla Bla Bla
-StringModelFragment_Featurename=Feature Name
-StringModelFragment_ParentId=Extended Element ID
+StringModelFragment_Description=Model Fragment
+StringModelFragment_Featurename=Feature Name *
+StringModelFragment_FeaturenameTooltip=Select a feature name to contribute to in the EClass describing the parent ID instance
+StringModelFragment_ParentId=Extended Element ID *
+StringModelFragment_ParentIdTooltip=Select here an element ID from your model, or you can enter 'xpath:/' to access to the application model.
 StringModelFragment_PositionInList=Position in list
 StringModelFragment_Elements=Elements
 
@@ -372,7 +374,7 @@ FeatureSelectionDialog_DialogTitle=Feature Name
 FeatureSelectionDialog_DialogMessage=Find the name of the feature you want to contribute to
 
 CategoryEditor_TreeLabel=Command Category
-CategoryEditor_TreeLabelDescriptor=Command Category Bla Bla Bla
+CategoryEditor_TreeLabelDescriptor=Command Category
 CategoryEditor_Name=Name
 CategoryEditor_Description=Description
 CategoryEditor_Tags=Tags
@@ -384,7 +386,7 @@ ComponentLabelProvider_invisible=invisible
 ComponentLabelProvider_notrendered=not rendered
 
 BindingContextEditor_TreeLabel=Binding Context
-BindingContextEditor_TreeLabelDescription=Binding Context Bla Bla Bla
+BindingContextEditor_TreeLabelDescription=Binding Context
 BindingContextEditor_Name=Name
 BindingContextEditor_Description=Description
 BindingContextEditor_Subcontexts=Subcontexts
@@ -392,13 +394,13 @@ BindingContextEditor_AddContext=Binding Context
 BindingContextEditor_NameWarning=Binding Context name should not be empty
 
 CommandParameterEditor_TreeLabel=Command Parameter
-CommandParameterEditor_TreeLabelDescritpion=Command Parameter Bla Bla Bla
+CommandParameterEditor_TreeLabelDescritpion=Command Parameter
 CommandParameterEditor_Name=Name
 CommandParameterEditor_TypeId=TypeID
 CommandParameterEditor_Optional=Optional
 
 ParameterEditor_TreeLabel=Parameter
-ParameterEditor_TreeLabelDescription=Parameter Bla Bla Bla Bla
+ParameterEditor_TreeLabelDescription=Parameter 
 ParameterEditor_Command_Parameter_ID=Command Parameter ID
 ParameterEditor_Value=Value
 
@@ -408,17 +410,17 @@ ParameterIdSelectionDialog_DialogMessage=Find the command parameter id to be ref
 ParameterIdSelectionDialog_LabelText=Command Parameter Id
 
 PopupMenuEditor_TreeLabel=Popup Menu
-PopupMenuEditor_TreeLabelDescription=Popup Menu Bla Bla Bla Bla
+PopupMenuEditor_TreeLabelDescription=Popup Menu 
 
 RenderedMenuEditor_TreeLabel=Rendered Menu
 
 RenderedMenuItem_TreeLabel=Rendered Menu Item
-RenderedMenuItem_TreeLabelDescription=Rendered Menu Item Bla Bla Bla Bla
+RenderedMenuItem_TreeLabelDescription=Rendered Menu Item 
 
 RenderedToolBarEditor_TreeLabel=Rendered ToolBar
 
 ToolBarContributionEditor_TreeLabel=ToolBar Contribution
-ToolBarContributionEditor_TreeLabelDescription=ToolBar Contribution Bla Bla Bla Bla
+ToolBarContributionEditor_TreeLabelDescription=ToolBar Contribution 
 
 ToolItemEditor_Type=Type
 ToolItemEditor_Label=Label
@@ -430,7 +432,7 @@ ToolItemEditor_NoExpression=<None>
 ToolItemEditor_Menu=Menu
 
 TrimBarEditor_TreeLabel=Window Trim
-TrimBarEditor_TreeLabelDescription=Window Trim bla bla bla
+TrimBarEditor_TreeLabelDescription=Window Trim
 TrimBarEditor_Side=Side
 TrimBarEditor_Controls=Controls
 TrimBarEditor_AddToolBar=Toolbar
@@ -438,7 +440,7 @@ TrimBarEditor_AddToolControl=Toolcontrol
 
 
 TrimContributionEditor_TreeLabel=Trim Contribution
-TrimContributionEditor_TreeLabelDescription=Trim Contribution Bla Bla Bla Bla
+TrimContributionEditor_TreeLabelDescription=Trim Contribution 
 TrimContributionEditor_ParentId=Parent ID
 TrimContributionEditor_Position=Position
 TrimContributionEditor_Controls=Controls
@@ -448,7 +450,7 @@ TrimmedWindowEditor_TreeLabel=Trimmed Window
 
 WindowEditor_AddMainMenu=Main Menu
 WindowEditor_TreeLabel=Window
-WindowEditor_TreeLabelDescription=Window bla bla bla
+WindowEditor_TreeLabelDescription=Window
 WindowEditor_Bounds=Bounds(x,y,w,h)
 WindowEditor_Label=Label
 WindowEditor_Tooltip=Tooltip
@@ -464,63 +466,63 @@ WindowEditor_Snippets=Snippets
 
 VApplicationAddons_AddAddon=Add-on
 VApplicationAddons_TreeLabel=Add-ons
-VApplicationAddons_TreeLabelDescription=Add-ons bla bla bla bla
+VApplicationAddons_TreeLabelDescription=Add-ons 
 VApplicationAddons_Commands=Commands
 
 VApplicationCategoriesEditor_TreeLabel=Command Categories
-VApplicationCategoriesEditor_TreeLabelDescription=Command Categories bla bla bla bla
+VApplicationCategoriesEditor_TreeLabelDescription=Command Categories 
 VApplicationCategoriesEditor_Categories=Categories
 VApplicationCategoriesEditor_AddCategory=Category
 
 VCommandEditor_TreeLabel=Commands
-VCommandEditor_TreeLabelDescription=Commands Bla Bla Bla Bla Bla
+VCommandEditor_TreeLabelDescription=Commands
 VCommandEditor_Commands=Commands
 VCommandEditor_AddCommand=Command
 
 VHandlerEditor_TreeLabel=Handlers
-VHandlerEditor_TreeLabelDescription=Handlers Bla Bla Bla Bla Bla
+VHandlerEditor_TreeLabelDescription=Handlers
 VHandlerEditor_Handlers=Handlers
 VHandlerEditor_AddHandler=Handler
 
 VMenuContributionsEditor_TreeLabel=Menu Contributions
-VMenuContributionsEditor_TreeLabelDescription=Menu Contributions Bla Bla Bla Bla Bla
+VMenuContributionsEditor_TreeLabelDescription=Menu Contributions
 VMenuContributionsEditor_MenuContributions=Menu Contributions
 VMenuContributionsEditor_AddMenuContribution=Menu Contribution
 
 VMenuEditor_TreeLabel=Menus
-VMenuEditor_TreeLabelDescription=Menus Bla Bla Bla Bla Bla
+VMenuEditor_TreeLabelDescription=Menus
 VMenuEditor_Menus=Menus
 VMenuEditor_AddMenuContribution=Menu
 VMenuEditor_AddPopupMenuContribution=Popup Menu
 
 VModelFragmentsEditor_TreeLabel=Fragments
-VModelFragmentsEditor_TreeLabelDescription=Fragments Bla Bla Bla Bla Bla
+VModelFragmentsEditor_TreeLabelDescription=Fragments
 VModelFragmentsEditor_Fragments=Fragments
 VModelFragmentsEditor_AddFragment=Model Fragment
 
 VModelImportsEditor_TreeLabel=Imports
-VModelImportsEditor_TreeLabelDescription=Imports Bla Bla Bla Bla Bla
+VModelImportsEditor_TreeLabelDescription=Imports
 VModelImportsEditor_Imports=Imports
 
 VPartDescriptor_TreeLabel=Part Descriptors
-VPartDescriptor_TreeLabelDescription=Part Descriptors Bla Bla Bla Bla Bla
+VPartDescriptor_TreeLabelDescription=Part Descriptors
 VPartDescriptor_Descriptors= Part Descriptors
 VPartDescriptor_AddPartDescriptor=Part Descriptor
 
 VSnippetsEditor_Snippets=Snippets;
 
 VToolBarContributionsEditor_TreeLabel=ToolBar Contributions
-VToolBarContributionsEditor_TreeLabelDescription=ToolBar Contributions Bla Bla Bla Bla Bla
+VToolBarContributionsEditor_TreeLabelDescription=ToolBar Contributions
 VToolBarContributionsEditor_Contributions=ToolBar Contributions
 VToolBarContributionsEditor_AddToolBarContribution=ToolBar Contribution
 
 VTrimContributionsEditor_TreeLabel=Trim Contributions
-VTrimContributionsEditor_TreeLabelDescription=Trim Contributions Bla Bla Bla Bla Bla
+VTrimContributionsEditor_TreeLabelDescription=Trim Contributions
 VTrimContributionsEditor_Contributions=Trim Contributions
 VTrimContributionsEditor_AddTrimContribution=Trim Contribution
 
 VWindowControlEditor_TreeLabel=Controls
-VWindowControlEditor_TreeLabelDescription=Controls Bla Bla Bla Bla Bla
+VWindowControlEditor_TreeLabelDescription=Controls
 VWindowControlEditor_Controls=Controls
 VWindowControlEditor_AddPerspectiveStack=Perspective Stack
 VWindowControlEditor_AddPartSashContainer=Part Sash Container
@@ -529,7 +531,7 @@ VWindowControlEditor_AddPart=Part
 VWindowControlEditor_AddArea=Area
 
 VWindowEditor_TreeLabel=Windows and Dialogs
-VWindowEditor_TreeLabelDescription=Windows Bla Bla Bla Bla Bla
+VWindowEditor_TreeLabelDescription=Windows
 VWindowEditor_Windows=Windows
 VWindowEditor_AddTrimmedWindow=Trimmed Window
 VWindowEditor_AddWindow=Window
@@ -537,14 +539,14 @@ VWindowEditor_AddDialog=Dialog
 VWindowEditor_AddWizardDialog=Wizard
 
 VWindowSharedElementsEditor_TreeLabel=Shared Elements
-VWindowSharedElementsEditor_TreeLabelDescription=Shared Elements Bla Bla Bla Bla
+VWindowSharedElementsEditor_TreeLabelDescription=Shared Elements 
 VWindowSharedElementsEditor_Controls=Controls
 VWindowSharedElementsEditor_AddPartSashContainer=Part Sash Container
 VWindowSharedElementsEditor_AddPart=Part
 VWindowSharedElementsEditor_AddPartStack=Part Stack
 
 VWindowTrimEditor_TreeLabel=Window Trims
-VWindowTrimEditor_TreeLabelDescription=Window Trims Bla Bla Bla Bla Bla
+VWindowTrimEditor_TreeLabelDescription=Window Trims
 VWindowTrimEditor_Controls=Controls
 VWindowTrimEditor_AddWindowTrim=Window Trim
 
@@ -671,12 +673,12 @@ ImageTooltip_Dimension=Dimensions
 ImageTooltip_FileSize=File-Size
 
 VItemParametersEditor_TreeLabel=Parameters
-VItemParametersEditor_TreeLabelDescription=Parameters Bla Bla Bla
+VItemParametersEditor_TreeLabelDescription=Parameters
 VItemParametersEditor_Parameters=Parameters
 VItemParametersEditor_AddParameter=Parameter
 
 CoreExpressionEditor_TreeLabel=Core Expression
-CoreExpressionEditor_TreeLabelDescription=Core Expression Bla Bla Bla
+CoreExpressionEditor_TreeLabelDescription=Core Expression
 CoreExpressionEditor_ExpressionId=Expression ID
 
 ExpressionIdDialog_ShellTitle=Find Expression ID
@@ -702,11 +704,11 @@ TrimBarIdDialog_Id=Parent Id
 
 VRootBindingContexts_AddContext=Binding Context
 VRootBindingContexts_TreeLabel=Binding Context
-VRootBindingContexts_TreeLabelDescription=Binding Context Bla Bla Bla
+VRootBindingContexts_TreeLabelDescription=Binding Context
 VRootBindingContexts_Contexts=Binding Contexts
 
 AreaEditor_Label=Area
-AreaEditor_Description=Area Bla Bla Bla
+AreaEditor_Description=Area
 AreaEditor_Orientation=Orientation
 AreaEditor_Horizontal=Horizontal
 AreaEditor_SelectedElement=Selected Element
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 4c8c16cdc6..104f8078ce 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -169,6 +169,7 @@ private Composite createForm(Composite parent) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.StringModelFragment_ParentId);
+			l.setToolTipText(Messages.StringModelFragment_ParentIdTooltip);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			final Composite comp = new Composite(parent, SWT.NONE);
@@ -212,6 +213,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.StringModelFragment_Featurename);
+			l.setToolTipText(Messages.StringModelFragment_FeaturenameTooltip);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			final Composite comp = new Composite(parent, SWT.NONE);

From c58f03012e0c3053a872ba1366549dc9aec4ae39 Mon Sep 17 00:00:00 2001
From: Patrik Suzzi <psuzzi@gmail.com>
Date: Mon, 19 Dec 2016 22:23:37 +0100
Subject: [PATCH 0957/1286] Bug 509448 - The Feature Selection Dialog in
 fragment editor should be

..opened on the right Class

With this change, the feature selection editor selects the right class
even when using 'xpath:/'

Change-Id: I6de6c57f61d79c89d496d2dbe1205f9c796ce46f
Signed-off-by: Patrik Suzzi <psuzzi@gmail.com>
Signed-off-by: Olivier Prouvoust <olivier.prouvost@opcoach.com>
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../META-INF/MANIFEST.MF                      |   3 +-
 .../e4/tools/emf/ui/internal/Messages.java    |   1 +
 .../tools/emf/ui/internal/Messages.properties |   3 +-
 .../common/ClassContributionCollector.java    |   3 +-
 .../common/component/StringModelFragment.java | 180 ++++++++++++++++--
 .../FindParentReferenceElementDialog.java     |  85 ++-------
 .../dialogs/ModelResultHandlerImpl.java       |  59 ++++++
 7 files changed, 252 insertions(+), 82 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ModelResultHandlerImpl.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 373de636d0..f85a96c655 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -36,7 +36,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.jdt.core;resolution:=optional,
  org.eclipse.pde.core;resolution:=optional,
  org.eclipse.e4.core.commands;bundle-version="0.10.0",
- org.eclipse.e4.ui.dialogs;bundle-version="1.0.0"
+ org.eclipse.e4.ui.dialogs;bundle-version="1.0.0",
+ org.eclipse.e4.emf.xpath
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation,
  javax.inject;version="1.0.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index c874572da2..797b46c8a6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -605,6 +605,7 @@ public class Messages {
 	public String FindParentReferenceElementDialog_Message;
 	public String FindParentReferenceElementDialog_ContainerType;
 	public String FindParentReferenceElementDialog_Search;
+	public String FindParentReferenceElementDialog_HelpTooltip;
 	public String FindParentReferenceElementDialog_NoId;
 	public String FindParentReferenceElementDialog_ClearCache;
 	public String FindParentReferenceElementDialog_NoReferenceId;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index e728f8347b..417d616a50 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -609,7 +609,8 @@ FindImportElementDialog_NoIdReference=You can not import an element without an I
 
 FindParentReferenceElementDialog_ShellTitle=Select Extended Element
 FindParentReferenceElementDialog_Title=Select Extended Element
-FindParentReferenceElementDialog_Message=Search for the element to be extended by the model fragment.
+FindParentReferenceElementDialog_Message=Search for the element to be contributed by the model fragment
+FindParentReferenceElementDialog_HelpTooltip=Elements of the selected class will be searched in all e4xmi files found in:\n* model fragment extensions\n* applicationXMI parameters of products extension.\n\nIf you need to find a 'live' ID, please use the Model Spy (Alt Shift F9) to get it from your running application.
 FindParentReferenceElementDialog_ContainerType=Container-Type
 FindParentReferenceElementDialog_Search=Search
 FindParentReferenceElementDialog_ClearCache=Clear Cache
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
index 801ffa5312..dc4d1f29d2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
@@ -11,10 +11,11 @@
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
 import java.util.concurrent.CopyOnWriteArrayList;
+
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider;
+import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionResultHandler;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
-import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider;
 import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.ModelResultHandler;
 
 public class ClassContributionCollector {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 104f8078ce..5d6dc29ca1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 BestSolution.at and others.
+ * Copyright (c) 2010, 2016 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,33 +9,47 @@
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Steven Spungin <steve@spungin.tv> - Ongoing Maintenance, Bug 439532, Bug 443945
  * Patrik Suzzi <psuzzi@gmail.com> - Bug 467262
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 509488
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Iterator;
 import java.util.List;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.emf.xpath.EcoreXPathContextFactory;
+import org.eclipse.e4.emf.xpath.XPathContext;
+import org.eclipse.e4.emf.xpath.XPathContextFactory;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
+import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.Filter;
+import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.ModelResultHandler;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FeatureSelectionDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindParentReferenceElementDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ModelResultHandlerImpl;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.impl.ApplicationElementImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.e4.ui.model.fragment.impl.StringModelFragmentImpl;
+import org.eclipse.e4.ui.model.internal.ModelUtils;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -54,10 +68,11 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -67,24 +82,33 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
 
 public class StringModelFragment extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
+	// The local collector used by both dialogs (findParentReference and
+	// FeaturesSelection)
+	private ClassContributionCollector collector;
+	// The selected Container is the class that match the ID.
+	// It can be get from the FindParentReferenceDialog or computed from the ID.
+	private EClass selectedContainer;
 
 	private final IListProperty MODEL_FRAGMENT__ELEMENTS = EMFProperties
 			.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
 
 	private final List<Action> actions = new ArrayList<>();
 
-	private EClass selectedContainer;
-
 	@Inject
 	IEclipseContext eclipseContext;
 
 	@Inject
 	public StringModelFragment() {
 		super();
+		collector = getCollector();
 	}
 
 	@PostConstruct
@@ -152,6 +176,56 @@ public Composite doGetEditor(Composite parent, Object object) {
 		return composite;
 	}
 
+	/**
+	 * Returns the selectedContainer, which is the EClass behind the Extended
+	 * Element ID. It can be known thanks to the dialog or must be computed from
+	 * the ID value
+	 *
+	 * @return
+	 */
+	private EClass getSelectedContainer() {
+
+		if (selectedContainer != null) {
+			return selectedContainer;
+		}
+
+		// we get the StringModelFragment
+		StringModelFragmentImpl modelFragment = getStringModelFragment();
+
+		Filter filter = new Filter(ApplicationPackageImpl.eINSTANCE.getApplication(), ""); //$NON-NLS-1$
+		WritableList list = new WritableList<>();
+		ModelResultHandler resultHandler = new ModelResultHandlerImpl(list, filter, this,
+				modelFragment.eResource());
+
+		collector.findModelElements(filter, resultHandler);
+		List<EClass> globalResult = new ArrayList<>();
+
+		for (Object o : list) {
+			if (o instanceof MApplication) {
+				MApplication mApp = (MApplication) o;
+				List<EClass> targetClass = getTargetClass(mApp);
+				globalResult.addAll(targetClass);
+			}
+		}
+		selectedContainer = globalResult.isEmpty() ? null : globalResult.get(0);
+
+		return selectedContainer;
+	}
+
+	private StringModelFragmentImpl getStringModelFragment() {
+		return ((StringModelFragmentImpl) getMaster().getValue());
+	}
+
+	private ClassContributionCollector getCollector() {
+		final Bundle bundle = FrameworkUtil.getBundle(FindParentReferenceElementDialog.class);
+		final BundleContext context = bundle.getBundleContext();
+		final ServiceReference<?> ref = context.getServiceReference(ClassContributionCollector.class.getName());
+		if (ref != null) {
+			return (ClassContributionCollector) context.getService(ref);
+		}
+		return null;
+	}
+
 	private Composite createForm(Composite parent) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
@@ -192,20 +266,25 @@ private Composite createForm(Composite parent) {
 					EMFEditProperties.value(getEditingDomain(),
 							FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID).observeDetail(getMaster()));
 
+			// Add a modify listener to control the change of the ID -> Must
+			// force the computation of selectedContainer.
+			t.addModifyListener(new ModifyListener() {
+				@Override
+				public void modifyText(ModifyEvent e) {
+					selectedContainer = null;
+				}
+			});
+
 			final Button b = new Button(comp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final FindParentReferenceElementDialog dialog = new FindParentReferenceElementDialog(b.getShell(),
-							StringModelFragment.this, (MStringModelFragment) getMaster().getValue(), Messages);
+							StringModelFragment.this, (MStringModelFragment) getMaster().getValue(), Messages,
+							collector);
 					dialog.open();
-					// store user selected container
-					if (dialog.getReturnCode() == Window.OK) {
-						selectedContainer = dialog.getSelectedContainer();
-					} else {
-						selectedContainer = null;
-					}
+					selectedContainer = dialog.getSelectedContainer();
 				}
 			});
 		}
@@ -242,7 +321,7 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					final FeatureSelectionDialog dialog = new FeatureSelectionDialog(button.getShell(),
 							getEditingDomain(), (MStringModelFragment) getMaster().getValue(), Messages,
-							selectedContainer);
+							getSelectedContainer());
 					dialog.open();
 				}
 			});
@@ -356,4 +435,81 @@ public int compare(Action o1, Action o2) {
 		return l;
 	}
 
+	/**
+	 * This method returns the target class of the element pointed by the
+	 * 'extended element ID' value In case of several matches it returns a list
+	 * of possible classes (but this case means that the ID is used for
+	 * different objects in different models present in the workspace). If the
+	 * parent element ID value is xpath:/ or
+	 * 'org.eclipse.e4.legacy.ide.application', it returns MApplication EClass
+	 *
+	 * @param application
+	 *            : the application to be parsed
+	 * @return the list of EClass
+	 */
+	public List<EClass> getTargetClass(MApplication application) {
+		List<EClass> ret = Collections.emptyList();
+		StringModelFragmentImpl modelFragment = getStringModelFragment();
+
+
+		String idsOrXPath = modelFragment.getParentElementId();
+		if ("xpath:/".equals(idsOrXPath) || "org.eclipse.e4.legacy.ide.application".equals(idsOrXPath)) {
+			ret = new ArrayList<>();
+			ret.add(ApplicationPackageImpl.eINSTANCE.getApplication());
+		} else {
+			// Deal with non default MApplication IDs.
+			if (idsOrXPath.startsWith("xpath:")) {
+				String xPath = idsOrXPath.substring(6);
+				ret = getTargetClassFromXPath(application, xPath);
+			} else {
+
+				MApplicationElement o = ModelUtils.findElementById(application, idsOrXPath);
+				if (o != null) {
+					ret = new ArrayList<>();
+					ret.add(((EObject) o).eClass());
+				}
+			}
+		}
+
+		return ret;
+
+	}
+
+
+
+	/**
+	 * Returns the EClass of the Application element(s) referenced by the xpath
+	 * value (without prefix)
+	 *
+	 * @param application
+	 *            : the application to be parsed
+	 * @param xpath
+	 *            : the xpath value without the 'xpath:' prefix
+	 * @return the list of EClass(es) matching this xpath
+	 */
+	private List<EClass> getTargetClassFromXPath(MApplication application, String xpath) {
+		List<EClass> ret = new ArrayList<>();
+
+		XPathContextFactory<EObject> f = EcoreXPathContextFactory.newInstance();
+		XPathContext xpathContext = f.newContext((EObject) application);
+		Iterator<Object> i = xpathContext.iterate(xpath);
+
+		try {
+			while (i.hasNext()) {
+				Object obj = i.next();
+				if (obj instanceof MApplicationElement) {
+					ApplicationElementImpl ae = (ApplicationElementImpl) obj;
+					ret.add(ae.eClass());
+				}
+			}
+		} catch (Exception ex) {
+			// custom xpath functions will throw exceptions
+			ex.printStackTrace();
+		}
+
+		return ret;
+	}
+
+
+
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index 34bd76c71c..4f1d65a96e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -9,6 +9,7 @@
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Steven Spungin <steven@spungin.tv> - Bug 437469
  * Patrik Suzzi <psuzzi@gmail.com> - Bug 467262
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 509488
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -16,10 +17,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.Filter;
-import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.ModelResultHandler;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.Util.InternalPackage;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -31,7 +30,6 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
@@ -69,10 +67,6 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceReference;
 
 public class FindParentReferenceElementDialog extends TitleAreaDialog {
 	private final MStringModelFragment fragment;
@@ -84,13 +78,15 @@ public class FindParentReferenceElementDialog extends TitleAreaDialog {
 	private ComboViewer eClassViewer;
 	private Text searchText;
 	private EClass selectedContainer;
+	private ClassContributionCollector collector;
 
 	public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEditor editor,
-			MStringModelFragment fragment, Messages Messages) {
+			MStringModelFragment fragment, Messages Messages, ClassContributionCollector collector) {
 		super(parentShell);
 		this.fragment = fragment;
 		this.editor = editor;
 		this.Messages = Messages;
+		this.collector = collector;
 	}
 
 	@Override
@@ -124,8 +120,13 @@ public void widgetDisposed(DisposeEvent e) {
 		Label l = new Label(container, SWT.NONE);
 		l.setText(Messages.FindParentReferenceElementDialog_ContainerType);
 
-		final Combo combo = new Combo(container, SWT.NONE);
+		Composite parentForCombo = new Composite(container, SWT.NONE);
+		parentForCombo.setLayout(new GridLayout(2, false));
+		parentForCombo.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
+
+		final Combo combo = new Combo(parentForCombo, SWT.NONE);
 		eClassViewer = new ComboViewer(combo);
+		combo.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
 		eClassViewer.setLabelProvider(new LabelProvider() {
 			@Override
 			public String getText(Object element) {
@@ -172,6 +173,12 @@ public void setControlContents(Control control, String text1, int cursorPosition
 		};
 		new AutoCompleteField(combo, textContentAdapter, values);
 
+		Label help = new Label(parentForCombo, SWT.NONE);
+		final Image helpImage = new Image(parent.getDisplay(),
+				getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/missing_image_placeholder.png")); //$NON-NLS-1$
+		help.setImage(helpImage);
+		help.setToolTipText(Messages.FindParentReferenceElementDialog_HelpTooltip);
+
 		l = new Label(container, SWT.NONE);
 		l.setText(Messages.FindParentReferenceElementDialog_Search);
 
@@ -220,8 +227,6 @@ public void doubleClick(DoubleClickEvent event) {
 		list = new WritableList();
 		viewer.setInput(list);
 
-		final ClassContributionCollector collector = getCollector();
-
 		searchText.addModifyListener(new ModifyListener() {
 
 			@Override
@@ -244,7 +249,7 @@ public void widgetSelected(SelectionEvent e) {
 
 	protected void updateSearch() {
 		if (currentResultHandler != null) {
-			currentResultHandler.cancled = true;
+			currentResultHandler.cancel();
 		}
 		list.clear();
 
@@ -252,7 +257,7 @@ protected void updateSearch() {
 				(EClass) ((IStructuredSelection) eClassViewer.getSelection()).getFirstElement(), searchText.getText());
 
 		currentResultHandler = new ModelResultHandlerImpl(list, filter, editor, ((EObject) fragment).eResource());
-		getCollector().findModelElements(filter, currentResultHandler);
+		collector.findModelElements(filter, currentResultHandler);
 
 	}
 
@@ -285,60 +290,6 @@ public EClass getSelectedContainer() {
 		return selectedContainer;
 	}
 
-	private ClassContributionCollector getCollector() {
-		final Bundle bundle = FrameworkUtil.getBundle(FindParentReferenceElementDialog.class);
-		final BundleContext context = bundle.getBundleContext();
-		final ServiceReference<?> ref = context.getServiceReference(ClassContributionCollector.class.getName());
-		if (ref != null) {
-			return (ClassContributionCollector) context.getService(ref);
-		}
-		return null;
-	}
 
-	private static class ModelResultHandlerImpl implements ModelResultHandler {
-		private boolean cancled = false;
-		private final IObservableList list;
-		private final Filter filter;
-		private final AbstractComponentEditor editor;
-		private final Resource resource;
-
-		public ModelResultHandlerImpl(IObservableList list, Filter filter, AbstractComponentEditor editor,
-				Resource resource) {
-			this.list = list;
-			this.filter = filter;
-			this.editor = editor;
-			this.resource = resource;
-		}
-
-		@Override
-		public void result(EObject data) {
-			if (!cancled) {
-				if (!resource.getURI().equals(data.eResource().getURI())) {
-					if (data instanceof MApplicationElement) {
-						final String elementId = ((MApplicationElement) data).getElementId();
-						if (elementId == null) {
-							list.add(data);
-							return;
-						}
-
-						if (elementId.trim().length() > 0) {
-							if (filter.elementIdPattern.matcher(elementId).matches()) {
-								list.add(data);
-								return;
-							}
-						}
-
-						final String label = editor.getDetailLabel(data);
-						if (label != null && label.trim().length() > 0) {
-							if (filter.elementIdPattern.matcher(label).matches()) {
-								list.add(data);
-								return;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
 
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ModelResultHandlerImpl.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ModelResultHandlerImpl.java
new file mode 100644
index 0000000000..d01facc5a0
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ModelResultHandlerImpl.java
@@ -0,0 +1,59 @@
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.Filter;
+import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.ModelResultHandler;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+
+public class ModelResultHandlerImpl implements ModelResultHandler {
+	private boolean canceled = false;
+	private final IObservableList list;
+	private final Filter filter;
+	private final AbstractComponentEditor editor;
+	private final Resource resource;
+
+	public ModelResultHandlerImpl(IObservableList list, Filter filter, AbstractComponentEditor editor,
+			Resource resource) {
+		this.list = list;
+		this.filter = filter;
+		this.editor = editor;
+		this.resource = resource;
+	}
+
+	public void cancel() {
+		canceled = true;
+	}
+
+	@Override
+	public void result(EObject data) {
+		if (!canceled) {
+			if (!resource.getURI().equals(data.eResource().getURI())) {
+				if (data instanceof MApplicationElement) {
+					final String elementId = ((MApplicationElement) data).getElementId();
+					if (elementId == null) {
+						list.add(data);
+						return;
+					}
+
+					if (elementId.trim().length() > 0) {
+						if (filter.elementIdPattern.matcher(elementId).matches()) {
+							list.add(data);
+							return;
+						}
+					}
+
+					final String label = editor.getDetailLabel(data);
+					if (label != null && label.trim().length() > 0) {
+						if (filter.elementIdPattern.matcher(label).matches()) {
+							list.add(data);
+							return;
+						}
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file

From d6f50d62cb9ffcab7bb2249e0dc1ce18b849412a Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Tue, 20 Dec 2016 18:31:12 +0100
Subject: [PATCH 0958/1286] Bug 509521 - Combo box to get the selected element
 ID is not well updated and contents is not refreshed

Change-Id: I9cfb2bd2aa5f5526ffcbe2117b451533fe25c954
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../emf/editor3x/TargetElementProviders.java  |  88 +---------
 .../eclipse/e4/tools/emf/ui/common/Util.java  | 109 ++++++++++++-
 .../common/component/StringModelFragment.java | 153 +++++++-----------
 .../dialogs/FindImportElementDialog.java      |  49 +-----
 .../FindParentReferenceElementDialog.java     |  32 +++-
 5 files changed, 196 insertions(+), 235 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
index ff99aa5f99..19d14aabbe 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
@@ -1,116 +1,36 @@
 package org.eclipse.e4.tools.emf.editor3x;
 
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
 import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.emf.common.util.TreeIterator;
-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.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.pde.internal.core.PDEExtensionRegistry;
 
 @SuppressWarnings("restriction")
 public class TargetElementProviders implements IModelElementProvider {
-	private static final String APP_E4XMI_DEFAULT = "Application.e4xmi"; //$NON-NLS-1$
 	private ResourceSet resourceSet;
 
 	@Override
 	public void getModelElements(Filter filter, ModelResultHandler handler) {
 		if (resourceSet == null) {
-			resourceSet = new ResourceSetImpl();
-			final PDEExtensionRegistry reg = new PDEExtensionRegistry();
-			IExtension[] extensions = reg.findExtensions("org.eclipse.e4.workbench.model", true); //$NON-NLS-1$
-			final IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-
-			for (final IExtension ext : extensions) {
-				for (final IConfigurationElement el : ext.getConfigurationElements()) {
-					if (el.getName().equals("fragment")) { //$NON-NLS-1$
-						URI uri;
-						// System.err.println("Model-Ext: Checking: " + ext.getContributor().getName());
-						final IProject p = root.getProject(ext.getContributor().getName());
-						if (p.exists() && p.isOpen()) {
-							uri = URI.createPlatformResourceURI(
-								ext.getContributor().getName() + "/" + el.getAttribute("uri"), true); //$NON-NLS-1$ //$NON-NLS-2$
-						} else {
-							uri = URI.createURI("platform:/plugin/" + ext.getContributor().getName() + "/" //$NON-NLS-1$ //$NON-NLS-2$
-								+ el.getAttribute("uri")); //$NON-NLS-1$
-						}
-						// System.err.println(uri);
-						try {
-							resourceSet.getResource(uri, true);
-						} catch (final Exception e) {
-							e.printStackTrace();
-							// System.err.println("=============> Failing");
-						}
-
-					}
-				}
-			}
-
-			extensions = reg.findExtensions("org.eclipse.core.runtime.products", true); //$NON-NLS-1$
-			for (final IExtension ext : extensions) {
-				for (final IConfigurationElement el : ext.getConfigurationElements()) {
-					if (el.getName().equals("product")) { //$NON-NLS-1$
-						boolean xmiPropertyPresent = false;
-						for (final IConfigurationElement prop : el.getChildren("property")) { //$NON-NLS-1$
-							if (prop.getAttribute("name").equals("applicationXMI")) { //$NON-NLS-1$//$NON-NLS-2$
-								final String v = prop.getAttribute("value"); //$NON-NLS-1$
-								setUpResourceSet(root, v);
-								xmiPropertyPresent = true;
-								break;
-							}
-						}
-						if (!xmiPropertyPresent) {
-							setUpResourceSet(root, ext.getNamespaceIdentifier() + "/" + APP_E4XMI_DEFAULT); //$NON-NLS-1$
-							break;
-						}
-					}
-				}
-			}
+			resourceSet = Util.getModelElementResources();
 		}
 
 		applyFilter(filter, handler);
 	}
 
-	private void setUpResourceSet(IWorkspaceRoot root, String v) {
-		final String[] s = v.split("/"); //$NON-NLS-1$
-		URI uri;
-		// System.err.println("Product-Ext: Checking: " + v + " => P:" + s[0] + "");
-		final IProject p = root.getProject(s[0]);
-		if (p.exists() && p.isOpen()) {
-			uri = URI.createPlatformResourceURI(v, true);
-		} else {
-			uri = URI.createURI("platform:/plugin/" + v); //$NON-NLS-1$
-		}
-
-		// System.err.println(uri);
-		try {
-			// prevent some unnecessary calls by checking the uri
-			if (resourceSet.getURIConverter().exists(uri, null)) {
-				resourceSet.getResource(uri, true);
-			}
-		} catch (final Exception e) {
-			e.printStackTrace();
-			// System.err.println("=============> Failing");
-		}
-	}
 
 	private void applyFilter(Filter filter, ModelResultHandler handler) {
 		for (final Resource res : resourceSet.getResources()) {
 			final TreeIterator<EObject> it = EcoreUtil.getAllContents(res,
-				true);
+					true);
 			while (it.hasNext()) {
 				final EObject o = it.next();
 				if (o.eContainingFeature() != FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
-					if (o.eClass().equals(filter.eClass)) {
-						// System.err.println("Found: " + o);
+					if ((filter.eClass == null) || o.eClass().equals(filter.eClass)) {
 						handler.result(o);
 					}
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index cba1af0320..de7b1b999a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -20,6 +20,10 @@
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
@@ -30,6 +34,7 @@
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
@@ -37,15 +42,21 @@
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.fieldassist.ControlDecoration;
 import org.eclipse.jface.fieldassist.FieldDecoration;
 import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
+import org.eclipse.pde.internal.core.PDEExtensionRegistry;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Control;
 
 public class Util {
+
+	private static final String APP_E4XMI_DEFAULT = "Application.e4xmi"; //$NON-NLS-1$
+
 	public static final boolean isNullOrEmpty(String element) {
 		return element == null || element.trim().length() == 0;
 	}
@@ -59,8 +70,8 @@ public static final void addClasses(EPackage ePackage, List<FeatureClass> list)
 			if (c instanceof EClass) {
 				final EClass eclass = (EClass) c;
 				if (eclass != ApplicationPackageImpl.Literals.APPLICATION && !eclass.isAbstract()
-					&& !eclass.isInterface()
-					&& eclass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT)) {
+						&& !eclass.isInterface()
+						&& eclass.getEAllSuperTypes().contains(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT)) {
 					list.add(new FeatureClass(eclass.getName(), eclass));
 				}
 			}
@@ -150,7 +161,7 @@ public static List<InternalPackage> loadPackages() {
 	}
 
 	public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement element, boolean liveModel,
-		int index, EStructuralFeature feature) {
+			int index, EStructuralFeature feature) {
 		if (liveModel) {
 			final EObject container = ((EObject) element).eContainer();
 			@SuppressWarnings("unchecked")
@@ -176,7 +187,7 @@ public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement
 	}
 
 	public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement element, boolean liveModel,
-		int index) {
+			int index) {
 		if (liveModel) {
 			final MElementContainer<MUIElement> container = element.getParent();
 			container.getChildren().remove(element);
@@ -192,7 +203,7 @@ public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement
 		}
 		final MElementContainer<MUIElement> container = element.getParent();
 		final Command cmd = MoveCommand.create(editingDomain, container,
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, element, index);
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, element, index);
 
 		if (cmd.canExecute()) {
 			editingDomain.getCommandStack().execute(cmd);
@@ -201,6 +212,90 @@ public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement
 		return false;
 	}
 
+	/**
+	 * This method searches for fragments or application model elements
+	 * resources
+	 */
+	public static ResourceSet getModelElementResources() {
+		ResourceSet resourceSet = new ResourceSetImpl();
+		final PDEExtensionRegistry reg = new PDEExtensionRegistry();
+		IExtension[] extensions = reg.findExtensions("org.eclipse.e4.workbench.model", true); //$NON-NLS-1$
+		final IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+
+		for (final IExtension ext : extensions) {
+			for (final IConfigurationElement el : ext.getConfigurationElements()) {
+				if (el.getName().equals("fragment")) { //$NON-NLS-1$
+					URI uri;
+					// System.err.println("Model-Ext: Checking: " +
+					// ext.getContributor().getName());
+					final IProject p = root.getProject(ext.getContributor().getName());
+					if (p.exists() && p.isOpen()) {
+						uri = URI.createPlatformResourceURI(
+								ext.getContributor().getName() + "/" + el.getAttribute("uri"), true); //$NON-NLS-1$ //$NON-NLS-2$
+					} else {
+						uri = URI.createURI("platform:/plugin/" + ext.getContributor().getName() + "/" //$NON-NLS-1$ //$NON-NLS-2$
+								+ el.getAttribute("uri")); //$NON-NLS-1$
+					}
+					// System.err.println(uri);
+					try {
+						resourceSet.getResource(uri, true);
+					} catch (final Exception e) {
+						e.printStackTrace();
+						// System.err.println("=============> Failing");
+					}
+
+				}
+			}
+		}
+
+		extensions = reg.findExtensions("org.eclipse.core.runtime.products", true); //$NON-NLS-1$
+		for (final IExtension ext : extensions) {
+			for (final IConfigurationElement el : ext.getConfigurationElements()) {
+				if (el.getName().equals("product")) { //$NON-NLS-1$
+					boolean xmiPropertyPresent = false;
+					for (final IConfigurationElement prop : el.getChildren("property")) { //$NON-NLS-1$
+						if (prop.getAttribute("name").equals("applicationXMI")) { //$NON-NLS-1$//$NON-NLS-2$
+							final String v = prop.getAttribute("value"); //$NON-NLS-1$
+							setUpResourceSet(resourceSet, root, v);
+							xmiPropertyPresent = true;
+							break;
+						}
+					}
+					if (!xmiPropertyPresent) {
+						setUpResourceSet(resourceSet, root, ext.getNamespaceIdentifier() + "/" + APP_E4XMI_DEFAULT); //$NON-NLS-1$
+						break;
+					}
+				}
+			}
+		}
+		return resourceSet;
+
+	}
+
+	private static void setUpResourceSet(ResourceSet resourceSet, IWorkspaceRoot root, String v) {
+		final String[] s = v.split("/"); //$NON-NLS-1$
+		URI uri;
+		// System.err.println("Product-Ext: Checking: " + v + " => P:" + s[0] +
+		// "");
+		final IProject p = root.getProject(s[0]);
+		if (p.exists() && p.isOpen()) {
+			uri = URI.createPlatformResourceURI(v, true);
+		} else {
+			uri = URI.createURI("platform:/plugin/" + v); //$NON-NLS-1$
+		}
+
+		// System.err.println(uri);
+		try {
+			// prevent some unnecessary calls by checking the uri
+			if (resourceSet.getURIConverter().exists(uri, null)) {
+				resourceSet.getResource(uri, true);
+			}
+		} catch (final Exception e) {
+			e.printStackTrace();
+			// System.err.println("=============> Failing");
+		}
+	}
+
 	public static final void addDecoration(Control control, Binding binding) {
 		final ControlDecoration dec = new ControlDecoration(control, SWT.BOTTOM);
 		binding.getValidationStatus().addValueChangeListener(new IValueChangeListener() {
@@ -227,8 +322,8 @@ public void handleValueChange(ValueChangeEvent event) {
 						fieldDecorationID = FieldDecorationRegistry.DEC_ERROR;
 						break;
 					}
-					final FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(
-						fieldDecorationID);
+					final FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault()
+							.getFieldDecoration(fieldDecorationID);
 					dec.setImage(fieldDecoration == null ? null : fieldDecoration.getImage());
 				}
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 5d6dc29ca1..08f1bb3796 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -23,24 +23,19 @@
 import javax.inject.Inject;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.emf.xpath.EcoreXPathContextFactory;
 import org.eclipse.e4.emf.xpath.XPathContext;
 import org.eclipse.e4.emf.xpath.XPathContextFactory;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
-import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.Filter;
-import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.ModelResultHandler;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FeatureSelectionDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindParentReferenceElementDialog;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ModelResultHandlerImpl;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
@@ -49,8 +44,8 @@
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.e4.ui.model.fragment.impl.StringModelFragmentImpl;
-import org.eclipse.e4.ui.model.internal.ModelUtils;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
@@ -58,6 +53,8 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
@@ -82,17 +79,10 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceReference;
 
 public class StringModelFragment extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
-	// The local collector used by both dialogs (findParentReference and
-	// FeaturesSelection)
-	private ClassContributionCollector collector;
 	// The selected Container is the class that match the ID.
 	// It can be get from the FindParentReferenceDialog or computed from the ID.
 	private EClass selectedContainer;
@@ -102,13 +92,15 @@ public class StringModelFragment extends AbstractComponentEditor {
 
 	private final List<Action> actions = new ArrayList<>();
 
+	// The resource set where to search for element with a specific ID.
+	private ResourceSet resourceSet = null;
+
 	@Inject
 	IEclipseContext eclipseContext;
 
 	@Inject
 	public StringModelFragment() {
 		super();
-		collector = getCollector();
 	}
 
 	@PostConstruct
@@ -189,25 +181,53 @@ private EClass getSelectedContainer() {
 			return selectedContainer;
 		}
 
-		// we get the StringModelFragment
+		// we get the StringModelFragment. If no ID, no search...
 		StringModelFragmentImpl modelFragment = getStringModelFragment();
+		String parentElementId = modelFragment.getParentElementId();
+		if ((parentElementId == null) || (parentElementId.isEmpty())) {
+			return null;
+		}
 
-		Filter filter = new Filter(ApplicationPackageImpl.eINSTANCE.getApplication(), ""); //$NON-NLS-1$
-		WritableList list = new WritableList<>();
-		ModelResultHandler resultHandler = new ModelResultHandlerImpl(list, filter, this,
-				modelFragment.eResource());
+		if ("xpath:/".equals(parentElementId) || "org.eclipse.e4.legacy.ide.application".equals(parentElementId)) {
+			return ApplicationPackageImpl.eINSTANCE.getApplication();
+		}
 
-		collector.findModelElements(filter, resultHandler);
-		List<EClass> globalResult = new ArrayList<>();
+		// We have to proceed to a simple search on all elements in all resource
+		// set...
+		// Must load the models and check for ids.
+		if (resourceSet == null) {
+			resourceSet = Util.getModelElementResources();
+		}
 
-		for (Object o : list) {
-			if (o instanceof MApplication) {
-				MApplication mApp = (MApplication) o;
-				List<EClass> targetClass = getTargetClass(mApp);
-				globalResult.addAll(targetClass);
+		String xpath = parentElementId.startsWith("xpath:") ? parentElementId.substring(6) : null;
+
+		for (final Resource res : resourceSet.getResources()) {
+			final TreeIterator<EObject> it = EcoreUtil.getAllContents(res, true);
+			while (it.hasNext()) {
+				final EObject o = it.next();
+				// We found this element, if this is an application element not
+				// contained in model fragement imports
+				// and having the same ID. We return the first found.
+
+				// Deal with non default MApplication IDs.
+				if (xpath != null) {
+					if (o instanceof MApplication) {
+						EClass found = getTargetClassFromXPath((MApplication) o, xpath);
+						if (found != null) {
+							return found;
+						}
+					}
+				} else {
+					// This is a standard search with ID.
+					if ((o instanceof MApplicationElement)
+							&& (o.eContainingFeature() != FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS)
+							&& parentElementId.equals(((MApplicationElement) o).getElementId())) {
+						selectedContainer = o.eClass();
+						return selectedContainer;
+					}
+				}
 			}
 		}
-		selectedContainer = globalResult.isEmpty() ? null : globalResult.get(0);
 
 		return selectedContainer;
 	}
@@ -216,16 +236,6 @@ private StringModelFragmentImpl getStringModelFragment() {
 		return ((StringModelFragmentImpl) getMaster().getValue());
 	}
 
-	private ClassContributionCollector getCollector() {
-		final Bundle bundle = FrameworkUtil.getBundle(FindParentReferenceElementDialog.class);
-		final BundleContext context = bundle.getBundleContext();
-		final ServiceReference<?> ref = context.getServiceReference(ClassContributionCollector.class.getName());
-		if (ref != null) {
-			return (ClassContributionCollector) context.getService(ref);
-		}
-		return null;
-	}
-
 	private Composite createForm(Composite parent) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
@@ -261,10 +271,11 @@ private Composite createForm(Composite parent) {
 			// t.setEditable(false);
 			gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
-			context.bindValue(
-					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(),
-							FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t),
+					EMFEditProperties
+					.value(getEditingDomain(),
+							FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID)
+					.observeDetail(getMaster()));
 
 			// Add a modify listener to control the change of the ID -> Must
 			// force the computation of selectedContainer.
@@ -282,7 +293,7 @@ public void modifyText(ModifyEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					final FindParentReferenceElementDialog dialog = new FindParentReferenceElementDialog(b.getShell(),
 							StringModelFragment.this, (MStringModelFragment) getMaster().getValue(), Messages,
-							collector);
+							getSelectedContainer());
 					dialog.open();
 					selectedContainer = dialog.getSelectedContainer();
 				}
@@ -309,10 +320,10 @@ public void widgetSelected(SelectionEvent e) {
 			TextPasteHandler.createFor(t);
 			gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
-			context.bindValue(
-					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(),
-							FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t),
+					EMFEditProperties
+					.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME)
+					.observeDetail(getMaster()));
 
 			final Button button = new Button(comp, SWT.PUSH | SWT.FLAT);
 			button.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -435,47 +446,6 @@ public int compare(Action o1, Action o2) {
 		return l;
 	}
 
-	/**
-	 * This method returns the target class of the element pointed by the
-	 * 'extended element ID' value In case of several matches it returns a list
-	 * of possible classes (but this case means that the ID is used for
-	 * different objects in different models present in the workspace). If the
-	 * parent element ID value is xpath:/ or
-	 * 'org.eclipse.e4.legacy.ide.application', it returns MApplication EClass
-	 *
-	 * @param application
-	 *            : the application to be parsed
-	 * @return the list of EClass
-	 */
-	public List<EClass> getTargetClass(MApplication application) {
-		List<EClass> ret = Collections.emptyList();
-		StringModelFragmentImpl modelFragment = getStringModelFragment();
-
-
-		String idsOrXPath = modelFragment.getParentElementId();
-		if ("xpath:/".equals(idsOrXPath) || "org.eclipse.e4.legacy.ide.application".equals(idsOrXPath)) {
-			ret = new ArrayList<>();
-			ret.add(ApplicationPackageImpl.eINSTANCE.getApplication());
-		} else {
-			// Deal with non default MApplication IDs.
-			if (idsOrXPath.startsWith("xpath:")) {
-				String xPath = idsOrXPath.substring(6);
-				ret = getTargetClassFromXPath(application, xPath);
-			} else {
-
-				MApplicationElement o = ModelUtils.findElementById(application, idsOrXPath);
-				if (o != null) {
-					ret = new ArrayList<>();
-					ret.add(((EObject) o).eClass());
-				}
-			}
-		}
-
-		return ret;
-
-	}
-
-
 
 	/**
 	 * Returns the EClass of the Application element(s) referenced by the xpath
@@ -487,8 +457,7 @@ public List<EClass> getTargetClass(MApplication application) {
 	 *            : the xpath value without the 'xpath:' prefix
 	 * @return the list of EClass(es) matching this xpath
 	 */
-	private List<EClass> getTargetClassFromXPath(MApplication application, String xpath) {
-		List<EClass> ret = new ArrayList<>();
+	private EClass getTargetClassFromXPath(MApplication application, String xpath) {
 
 		XPathContextFactory<EObject> f = EcoreXPathContextFactory.newInstance();
 		XPathContext xpathContext = f.newContext((EObject) application);
@@ -499,7 +468,7 @@ private List<EClass> getTargetClassFromXPath(MApplication application, String xp
 				Object obj = i.next();
 				if (obj instanceof MApplicationElement) {
 					ApplicationElementImpl ae = (ApplicationElementImpl) obj;
-					ret.add(ae.eClass());
+					return ae.eClass();
 				}
 			}
 		} catch (Exception ex) {
@@ -507,9 +476,7 @@ private List<EClass> getTargetClassFromXPath(MApplication application, String xp
 			ex.printStackTrace();
 		}
 
-		return ret;
+		return null;
 	}
 
-
-
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index bf62e9fea4..415c26a87d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -11,10 +11,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
-import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.Filter;
-import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.ModelResultHandler;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
@@ -22,7 +20,6 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -142,7 +139,7 @@ public void doubleClick(DoubleClickEvent event) {
 			@Override
 			public void modifyText(ModifyEvent e) {
 				if (currentResultHandler != null) {
-					currentResultHandler.cancled = true;
+					currentResultHandler.cancel();
 				}
 				list.clear();
 				final Filter filter = new Filter(element.eClass(), searchText.getText());
@@ -192,48 +189,4 @@ private ClassContributionCollector getCollector() {
 		return null;
 	}
 
-	private static class ModelResultHandlerImpl implements ModelResultHandler {
-		private boolean cancled = false;
-		private final IObservableList list;
-		private final Filter filter;
-		private final AbstractComponentEditor editor;
-		private final Resource resource;
-
-		public ModelResultHandlerImpl(IObservableList list, Filter filter, AbstractComponentEditor editor,
-				Resource resource) {
-			this.list = list;
-			this.filter = filter;
-			this.editor = editor;
-			this.resource = resource;
-		}
-
-		@Override
-		public void result(EObject data) {
-			if (!cancled) {
-				if (!resource.getURI().equals(data.eResource().getURI())) {
-					if (data instanceof MApplicationElement) {
-						final String elementId = ((MApplicationElement) data).getElementId();
-						if (elementId == null) {
-							list.add(data);
-							return;
-						}
-
-						if (elementId.trim().length() > 0) {
-							if (filter.elementIdPattern.matcher(elementId).matches()) {
-								list.add(data);
-								return;
-							}
-						}
-
-						final String label = editor.getDetailLabel(data);
-						if (label != null && label.trim().length() > 0) {
-							if (filter.elementIdPattern.matcher(label).matches()) {
-								list.add(data);
-							}
-						}
-					}
-				}
-			}
-		}
-	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index 4f1d65a96e..6feecdf744 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -25,6 +25,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -67,6 +68,10 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
 
 public class FindParentReferenceElementDialog extends TitleAreaDialog {
 	private final MStringModelFragment fragment;
@@ -81,12 +86,24 @@ public class FindParentReferenceElementDialog extends TitleAreaDialog {
 	private ClassContributionCollector collector;
 
 	public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEditor editor,
-			MStringModelFragment fragment, Messages Messages, ClassContributionCollector collector) {
+			MStringModelFragment fragment, Messages Messages,
+			EClass previousSelection) {
 		super(parentShell);
 		this.fragment = fragment;
 		this.editor = editor;
 		this.Messages = Messages;
-		this.collector = collector;
+		this.collector = getCollector();
+		this.selectedContainer = previousSelection;
+	}
+
+	private ClassContributionCollector getCollector() {
+		final Bundle bundle = FrameworkUtil.getBundle(FindParentReferenceElementDialog.class);
+		final BundleContext context = bundle.getBundleContext();
+		final ServiceReference<?> ref = context.getServiceReference(ClassContributionCollector.class.getName());
+		if (ref != null) {
+			return (ClassContributionCollector) context.getService(ref);
+		}
+		return null;
 	}
 
 	@Override
@@ -147,7 +164,6 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 			}
 		});
 		eClassViewer.setInput(eClassList);
-		eClassViewer.getCombo().select(0);
 		eClassViewer.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		eClassViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 
@@ -244,6 +260,16 @@ public void widgetSelected(SelectionEvent e) {
 				collector.clearModelCache();
 			}
 		});
+
+		// Manage the current selection on comboviewer (previous or first one).
+		if (selectedContainer != null) {
+			eClassViewer.setSelection(new StructuredSelection(selectedContainer));
+		} else {
+			// Select addon by default (not necessary in the first position in
+			// the eclasslist...)
+			eClassViewer.setSelection(new StructuredSelection(ApplicationPackageImpl.Literals.ADDON));
+		}
+
 		return comp;
 	}
 

From e4de23629f89f28bca8fff8c72c8e6229d9f2572 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Tue, 20 Dec 2016 19:25:53 +0100
Subject: [PATCH 0959/1286] Bug 509464 - [E4 Model Fragment Editor] Filter
 proposals for filters in fragments

It updates also values if a e4xmi files has been saved in the workspace.

Change-Id: I9f2f1adcd4a3975db4f7cb16c1eb04d3178b936a
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../emf/editor3x/TargetElementProviders.java  |  23 +--
 .../tools/emf/ui/common/IEditorFeature.java   |   6 +
 .../eclipse/e4/tools/emf/ui/common/Util.java  |  83 ++++++++-
 .../ui/internal/common/AbstractPickList.java  |   5 +-
 .../common/component/StringModelFragment.java | 159 +++++++++++++-----
 5 files changed, 213 insertions(+), 63 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
index 19d14aabbe..f44f114d7a 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
@@ -11,19 +11,12 @@
 
 @SuppressWarnings("restriction")
 public class TargetElementProviders implements IModelElementProvider {
-	private ResourceSet resourceSet;
 
 	@Override
 	public void getModelElements(Filter filter, ModelResultHandler handler) {
-		if (resourceSet == null) {
-			resourceSet = Util.getModelElementResources();
-		}
-
-		applyFilter(filter, handler);
-	}
 
+		ResourceSet resourceSet = Util.getModelElementResources();
 
-	private void applyFilter(Filter filter, ModelResultHandler handler) {
 		for (final Resource res : resourceSet.getResources()) {
 			final TreeIterator<EObject> it = EcoreUtil.getAllContents(res,
 					true);
@@ -40,13 +33,13 @@ private void applyFilter(Filter filter, ModelResultHandler handler) {
 
 	@Override
 	public void clearCache() {
-		if (resourceSet == null) {
-			return;
-		}
-		for (final Resource r : resourceSet.getResources()) {
-			r.unload();
-		}
-		resourceSet = null;
+		// Should now do nothing, as Util.getModelElementResources is now
+		// listening
+		// to e4xmi changes
+		/*
+		 * if (resourceSet == null) { return; } for (final Resource r :
+		 * resourceSet.getResources()) { r.unload(); } resourceSet = null;
+		 */
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
index 21a8f120a7..07e0ba7640 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
@@ -12,6 +12,7 @@
 package org.eclipse.e4.tools.emf.ui.common;
 
 import java.util.List;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 
@@ -35,6 +36,11 @@ public FeatureClass(String label, String iconId, EClass eClass) {
 			this.iconId = iconId;
 			this.eClass = eClass;
 		}
+
+		@Override
+		public String toString() {
+			return "FeatureClass : " + label;
+		}
 	}
 
 	/**
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index de7b1b999a..ee2c77af4e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> - added some cache for e4xmi resource management
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
@@ -19,7 +20,12 @@
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IConfigurationElement;
@@ -212,12 +218,30 @@ public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement
 		return false;
 	}
 
+	/**
+	 * The set of resources containing model element. Updated when one changes
+	 * in the workspace
+	 */
+	private static ResourceSet modelResourceSet;
+
+	// The lis
+	private static boolean e4ModelResourceListenerRegistered = false;
+
 	/**
 	 * This method searches for fragments or application model elements
-	 * resources
+	 * resources. It is updated when the workspace changes.. else it returns the
+	 * cached values.
 	 */
 	public static ResourceSet getModelElementResources() {
-		ResourceSet resourceSet = new ResourceSetImpl();
+
+		// Return previous computed result while workspace did not change...
+		if (modelResourceSet != null) {
+			return modelResourceSet;
+		}
+
+		registerE4XmiListener(); // Done only once.
+
+		modelResourceSet = new ResourceSetImpl();
 		final PDEExtensionRegistry reg = new PDEExtensionRegistry();
 		IExtension[] extensions = reg.findExtensions("org.eclipse.e4.workbench.model", true); //$NON-NLS-1$
 		final IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
@@ -238,7 +262,7 @@ public static ResourceSet getModelElementResources() {
 					}
 					// System.err.println(uri);
 					try {
-						resourceSet.getResource(uri, true);
+						modelResourceSet.getResource(uri, true);
 					} catch (final Exception e) {
 						e.printStackTrace();
 						// System.err.println("=============> Failing");
@@ -256,22 +280,67 @@ public static ResourceSet getModelElementResources() {
 					for (final IConfigurationElement prop : el.getChildren("property")) { //$NON-NLS-1$
 						if (prop.getAttribute("name").equals("applicationXMI")) { //$NON-NLS-1$//$NON-NLS-2$
 							final String v = prop.getAttribute("value"); //$NON-NLS-1$
-							setUpResourceSet(resourceSet, root, v);
+							setUpResourceSet(modelResourceSet, root, v);
 							xmiPropertyPresent = true;
 							break;
 						}
 					}
 					if (!xmiPropertyPresent) {
-						setUpResourceSet(resourceSet, root, ext.getNamespaceIdentifier() + "/" + APP_E4XMI_DEFAULT); //$NON-NLS-1$
+						setUpResourceSet(modelResourceSet, root,
+								ext.getNamespaceIdentifier() + "/" + APP_E4XMI_DEFAULT); //$NON-NLS-1$
 						break;
 					}
 				}
 			}
 		}
-		return resourceSet;
+		return modelResourceSet;
+	}
 
+	/**
+	 * A listener to reset the cache of e4Xmi resource for the index research
+	 *
+	 */
+	private static void registerE4XmiListener() {
+		// Register once on the workspace.
+		// the listener could be optimized to remember of changed resource since
+		// the last call to getModelElementResources...
+		if (!e4ModelResourceListenerRegistered) {
+			ResourcesPlugin.getWorkspace().addResourceChangeListener(new IResourceChangeListener() {
+				@Override
+				public void resourceChanged(IResourceChangeEvent event) {
+					// Nothing to do if resource set not yet used !
+					if (modelResourceSet == null) {
+						return;
+					}
+					IResourceDelta delta = event.getDelta();
+					checkDeltaContainsE4xmi(delta);
+				}
+
+				private void checkDeltaContainsE4xmi(IResourceDelta delta) {
+					if (modelResourceSet == null) {
+						return;
+					}
+
+					for (IResourceDelta rd : delta.getAffectedChildren()) {
+						IResource r = rd.getResource();
+						if (r instanceof IFile)
+						{
+							if ("e4xmi".equals(((IFile) r).getFileExtension())) {
+								modelResourceSet = null;
+								break;
+							}
+						} else {
+							checkDeltaContainsE4xmi(rd);
+						}
+					}
+
+				}
+			});
+			e4ModelResourceListenerRegistered = true;
+		}
 	}
 
+
 	private static void setUpResourceSet(ResourceSet resourceSet, IWorkspaceRoot root, String v) {
 		final String[] s = v.split("/"); //$NON-NLS-1$
 		URI uri;
@@ -284,7 +353,6 @@ private static void setUpResourceSet(ResourceSet resourceSet, IWorkspaceRoot roo
 			uri = URI.createURI("platform:/plugin/" + v); //$NON-NLS-1$
 		}
 
-		// System.err.println(uri);
 		try {
 			// prevent some unnecessary calls by checking the uri
 			if (resourceSet.getURIConverter().exists(uri, null)) {
@@ -292,7 +360,6 @@ private static void setUpResourceSet(ResourceSet resourceSet, IWorkspaceRoot roo
 			}
 		} catch (final Exception e) {
 			e.printStackTrace();
-			// System.err.println("=============> Failing");
 		}
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index b44f1b324b..2327665b17 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -89,7 +89,10 @@ public AbstractPickList(Composite parent, int style, List<PickListFeatures> list
 
 		picker = new ComboViewer(comp, SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
 		final Combo control = picker.getCombo();
-		control.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+		GridData gdpicker = new GridData(SWT.FILL, SWT.CENTER, true, false);
+		gdpicker.minimumWidth = 180;
+		gdpicker.grabExcessHorizontalSpace = true;
+		control.setLayoutData(gdpicker);
 
 		// ComboContentAdapter controlContentAdapter = new ComboContentAdapter()
 		// {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 08f1bb3796..2c550f2e14 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -30,6 +30,7 @@
 import org.eclipse.e4.emf.xpath.XPathContextFactory;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.Util.InternalPackage;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
@@ -44,6 +45,7 @@
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.e4.ui.model.fragment.impl.StringModelFragmentImpl;
+import org.eclipse.e4.ui.model.internal.ModelUtils;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -53,6 +55,7 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -83,6 +86,7 @@
 public class StringModelFragment extends AbstractComponentEditor {
 	private Composite composite;
 	private EMFDataBindingContext context;
+
 	// The selected Container is the class that match the ID.
 	// It can be get from the FindParentReferenceDialog or computed from the ID.
 	private EClass selectedContainer;
@@ -90,14 +94,16 @@ public class StringModelFragment extends AbstractComponentEditor {
 	private final IListProperty MODEL_FRAGMENT__ELEMENTS = EMFProperties
 			.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
 
+	// This is the list of available 'add child' actions depending on selected
+	// values
 	private final List<Action> actions = new ArrayList<>();
 
-	// The resource set where to search for element with a specific ID.
-	private ResourceSet resourceSet = null;
-
 	@Inject
 	IEclipseContext eclipseContext;
 
+	// The pickList to select the kind of children to add (must be refreshed)
+	private E4PickList pickList;
+
 	@Inject
 	public StringModelFragment() {
 		super();
@@ -105,19 +111,6 @@ public StringModelFragment() {
 
 	@PostConstruct
 	public void init() {
-		final List<FeatureClass> list = new ArrayList<>();
-		Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
-		list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT,
-				FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
-		for (final FeatureClass featureClass : list) {
-			actions.add(new Action(featureClass.label) {
-
-				@Override
-				public void run() {
-					handleAdd(featureClass.eClass, false);
-				}
-			});
-		}
 	}
 
 	@Override
@@ -165,6 +158,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			composite = createForm(parent);
 		}
 		getMaster().setValue(object);
+		updateChildrenChoice();
 		return composite;
 	}
 
@@ -181,23 +175,27 @@ private EClass getSelectedContainer() {
 			return selectedContainer;
 		}
 
-		// we get the StringModelFragment. If no ID, no search...
+		// we get the StringModelFragment. If not initialized, no search...
 		StringModelFragmentImpl modelFragment = getStringModelFragment();
+		if (modelFragment == null) {
+			return null;
+		}
+
+		// If no element ID, no search...
 		String parentElementId = modelFragment.getParentElementId();
 		if ((parentElementId == null) || (parentElementId.isEmpty())) {
 			return null;
 		}
 
+		// known ID for application are directly filtered.
 		if ("xpath:/".equals(parentElementId) || "org.eclipse.e4.legacy.ide.application".equals(parentElementId)) {
-			return ApplicationPackageImpl.eINSTANCE.getApplication();
+			selectedContainer = ApplicationPackageImpl.eINSTANCE.getApplication();
+			return selectedContainer;
 		}
 
 		// We have to proceed to a simple search on all elements in all resource
-		// set...
-		// Must load the models and check for ids.
-		if (resourceSet == null) {
-			resourceSet = Util.getModelElementResources();
-		}
+		// set... this resource set is cached by Util...
+		ResourceSet resourceSet = Util.getModelElementResources();
 
 		String xpath = parentElementId.startsWith("xpath:") ? parentElementId.substring(6) : null;
 
@@ -206,7 +204,7 @@ private EClass getSelectedContainer() {
 			while (it.hasNext()) {
 				final EObject o = it.next();
 				// We found this element, if this is an application element not
-				// contained in model fragement imports
+				// contained in model fragment imports
 				// and having the same ID. We return the first found.
 
 				// Deal with non default MApplication IDs.
@@ -214,7 +212,8 @@ private EClass getSelectedContainer() {
 					if (o instanceof MApplication) {
 						EClass found = getTargetClassFromXPath((MApplication) o, xpath);
 						if (found != null) {
-							return found;
+							selectedContainer = found;
+							return selectedContainer;
 						}
 					}
 				} else {
@@ -324,6 +323,12 @@ public void widgetSelected(SelectionEvent e) {
 					EMFEditProperties
 					.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME)
 					.observeDetail(getMaster()));
+			t.addModifyListener(new ModifyListener() {
+				@Override
+				public void modifyText(ModifyEvent e) {
+					updateChildrenChoice();
+				}
+			});
 
 			final Button button = new Button(comp, SWT.PUSH | SWT.FLAT);
 			button.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -346,7 +351,7 @@ public void widgetSelected(SelectionEvent e) {
 		// ------------------------------------------------------------
 		{
 
-			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+			pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
 					FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS) {
 				@Override
 				protected void addPressed() {
@@ -381,25 +386,14 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 				}
 			});
 
-			final List<FeatureClass> list = new ArrayList<>();
-			Util.addClasses(ApplicationPackageImpl.eINSTANCE, list);
-			list.addAll(getEditor().getFeatureClasses(FragmentPackageImpl.Literals.MODEL_FRAGMENT,
-					FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
-
-			pickList.setInput(list);
-			if (list.size() > 0) {
-				pickList.setSelection(new StructuredSelection(list.get(0)));
-			}
-
-			final IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
-			pickList.getList().setInput(prop.observeDetail(getMaster()));
-
 		}
 
 		createContributedEditorTabs(folder, context, getMaster(), MStringModelFragment.class);
 
 		folder.setSelection(0);
 
+		updateChildrenChoice();
+
 		return folder;
 	}
 
@@ -415,6 +409,38 @@ public void dispose() {
 		}
 	}
 
+	/**
+	 * This method will update the picklist containing the list of possible
+	 * children classes
+	 *
+	 */
+	private void updateChildrenChoice() {
+		selectedContainer = getSelectedContainer();
+
+		final List<FeatureClass> list = getTargetChildrenClasses();
+
+		pickList.setInput(list);
+		if (list.size() > 0) {
+			pickList.setSelection(new StructuredSelection(list.get(0)));
+		}
+
+		// pickList.getList().refresh();
+
+		final IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
+		pickList.getList().setInput(prop.observeDetail(getMaster()));
+
+		// Update the possible actions
+		actions.clear();
+		for (final FeatureClass featureClass : list) {
+			actions.add(new Action(featureClass.label) {
+				@Override
+				public void run() {
+					handleAdd(featureClass.eClass, false);
+				}
+			});
+		}
+	}
+
 	@Override
 	public IObservableList getChildList(Object element) {
 		return MODEL_FRAGMENT__ELEMENTS.observe(element);
@@ -479,4 +505,59 @@ private EClass getTargetClassFromXPath(MApplication application, String xpath) {
 		return null;
 	}
 
+	/**
+	 * This method computes the available classes that can be selected as child
+	 * for the current selected element. The result is cached in a map as the
+	 * meta model will not change !
+	 *
+	 * @return an empty list or the list for possible children
+	 */
+
+	public List<FeatureClass> getTargetChildrenClasses() {
+		List<FeatureClass> result = Collections.emptyList();
+
+		if (selectedContainer != null) {
+
+			// The top level class for children, is the class of the EReference
+			// bound to feature name
+			EReference childRef = null;
+			String featurename = getStringModelFragment().getFeaturename();
+
+			for (EReference ref : selectedContainer.getEAllReferences()) {
+				if (ref.getName().equals(featurename))
+				{
+					childRef = ref;
+					break;
+				}
+			}
+
+			if (childRef == null) {
+				return result;
+			}
+
+			// Get the parent EClass where this childRef is defined...
+			// For instance : for the 'children' reference it will be in
+			// UIElementContainer<T extends UIElement>
+			// We must check if the selectedContainer extends
+			// UIElementContainer<XXX> and in this case childRef is XXX
+			final EClass childClass = (EClass) ModelUtils.getTypeArgument(selectedContainer,
+					childRef.getEGenericType());
+
+			// Search for descendant of ChildClass -> This result could be
+			// cached for all StringModelFragment editors instances and computed
+			// once...
+			result = new ArrayList<>();
+			for (final InternalPackage p : Util.loadPackages()) {
+				for (EClass c : p.getAllClasses()) {
+					if (childClass.isSuperTypeOf(c)) {
+						result.add(new FeatureClass(c.getName(), c));
+					}
+				}
+
+			}
+		}
+		return result;
+
+	}
+
 }

From 2b75b273cbc7ea65c12fdc198eb39e331a14472c Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Wed, 21 Dec 2016 15:19:02 +0100
Subject: [PATCH 0960/1286] Bug 507232 - Application model refactoring
 participants not working anymore

Change-Id: I559651f88e2e0b73e7414b9f51b1ce5a5ada6018
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../plugin.xml                                |  4 +-
 .../ModelMoveParticipant.java                 |  4 +-
 .../ModelRenameParticipant.java               | 90 +++++++++----------
 .../RefactorParticipantDelegate.java          | 40 ++++-----
 .../properties/ResourceBundleEditor.java      | 15 ----
 .../properties/ResourceBundleEntry.java       | 19 ----
 6 files changed, 69 insertions(+), 103 deletions(-)
 rename bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/{ => refactorparticipants}/ModelMoveParticipant.java (96%)
 rename bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/{ => refactorparticipants}/ModelRenameParticipant.java (63%)
 rename bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/{ => refactorparticipants}/RefactorParticipantDelegate.java (83%)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEditor.java
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEntry.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index d4c034552a..95ff227462 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -41,7 +41,7 @@
    <extension
          point="org.eclipse.ltk.core.refactoring.renameParticipants">
       <renameParticipant
-            class="org.eclipse.e4.tools.emf.editor3x.ModelRenameParticipant"
+            class="org.eclipse.e4.tools.emf.editor3x.refactorparticipants.ModelRenameParticipant"
             id="org.eclipse.e4.tools.emf.editor3x.renameParticipant"
             name="Workbench Model Contribution Participant">
          <enablement>
@@ -75,7 +75,7 @@
    <extension
          point="org.eclipse.ltk.core.refactoring.moveParticipants">
       <moveParticipant
-            class="org.eclipse.e4.tools.emf.editor3x.ModelMoveParticipant"
+            class="org.eclipse.e4.tools.emf.editor3x.refactorparticipants.ModelMoveParticipant"
             id="org.eclipse.e4.tools.emf.editor3x.moveParticipant"
             name="Workbench Model Contribution Participant">
          <enablement>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelMoveParticipant.java
similarity index 96%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java
rename to bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelMoveParticipant.java
index 2b7fbc2fa3..315950cdea 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelMoveParticipant.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelMoveParticipant.java
@@ -9,7 +9,7 @@
  * Wim Jongman <wim.jongman@remainsoftware.com> - Bug 395174: e4xmi should participate in package renaming
  * Bug 432892: Eclipse 4 Application does not work after renaming the project name
  ******************************************************************************/
-package org.eclipse.e4.tools.emf.editor3x;
+package org.eclipse.e4.tools.emf.editor3x.refactorparticipants;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -17,6 +17,8 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.e4.tools.emf.editor3x.Messages;
+import org.eclipse.e4.tools.emf.editor3x.RefactorModel;
 import org.eclipse.e4.tools.emf.editor3x.extension.Util;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelRenameParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelRenameParticipant.java
similarity index 63%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelRenameParticipant.java
rename to bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelRenameParticipant.java
index 6a2952e665..e2a5b87fc9 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelRenameParticipant.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelRenameParticipant.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 BestSolution.at and others.
+ * Copyright (c) 2011, 2015 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,7 +10,7 @@
  * Wim Jongman <wim.jongman@remainsoftware.com> - Bug 395174: e4xmi should participate in package renaming
  * Bug 432892: Eclipse 4 Application does not work after renaming the project name
  ******************************************************************************/
-package org.eclipse.e4.tools.emf.editor3x;
+package org.eclipse.e4.tools.emf.editor3x.refactorparticipants;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -19,21 +19,22 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.e4.tools.emf.editor3x.RefactorModel;
 import org.eclipse.e4.tools.emf.editor3x.extension.Util;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.ltk.core.refactoring.Change;
 import org.eclipse.ltk.core.refactoring.RefactoringStatus;
 import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
+import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
 
-public class ModelRenameParticipant extends
-org.eclipse.ltk.core.refactoring.participants.RenameParticipant {
+public class ModelRenameParticipant extends RenameParticipant {
 	private IType fType;
 	private IPackageFragment fPckage;
 	private IFile fFile;
 	private IFolder fFolder;
 	private IProject fProject;
-	private RefactorModel fModel;
+	private RefactorModel refactorModel;
 
 	@Override
 	protected boolean initialize(Object element) {
@@ -72,16 +73,15 @@ public String getName() {
 	}
 
 	@Override
-	public RefactoringStatus checkConditions(IProgressMonitor pm,
-		CheckConditionsContext context) throws OperationCanceledException {
+	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context)
+			throws OperationCanceledException {
 		return new RefactoringStatus();
 	}
 
 	@Override
-	public Change createChange(IProgressMonitor pm) throws CoreException,
-	OperationCanceledException {
+	public Change createChange(IProgressMonitor pm) throws CoreException, OperationCanceledException {
 
-		fModel = RefactorModel.getModel(this);
+		refactorModel = RefactorModel.getModel(this);
 
 		if (fType != null) {
 			return createClassChange(pm, fType);
@@ -107,26 +107,26 @@ public Change createChange(IProgressMonitor pm) throws CoreException,
 	}
 
 	private Change createProjectChange(IProgressMonitor pm, IProject project)
-		throws CoreException {
+			throws CoreException {
 
 		if (!getArguments().getUpdateReferences()) {
 			return null;
 		}
 
-		fModel.addTextRename("platform:/plugin/" + project.getName() + "/", //$NON-NLS-1$ //$NON-NLS-2$
-			"platform:/plugin/" + getArguments().getNewName() + "/"); //$NON-NLS-1$ //$NON-NLS-2$
-		fModel.addTextRename("bundleclass://" + project.getName() + "/", //$NON-NLS-1$ //$NON-NLS-2$
-			"bundleclass://" + getArguments().getNewName() + "/"); //$NON-NLS-1$ //$NON-NLS-2$
+		refactorModel.addTextRename("platform:/plugin/" + project.getName() + "/", //$NON-NLS-1$ //$NON-NLS-2$
+				"platform:/plugin/" + getArguments().getNewName() + "/"); //$NON-NLS-1$ //$NON-NLS-2$
+		refactorModel.addTextRename("bundleclass://" + project.getName() + "/", //$NON-NLS-1$ //$NON-NLS-2$
+				"bundleclass://" + getArguments().getNewName() + "/"); //$NON-NLS-1$ //$NON-NLS-2$
 
-		fModel.setProjectRename(project, ((IWorkspaceRoot) project.getParent())
-			.getProject(getArguments().getNewName()));
+		refactorModel.setProjectRename(project, ((IWorkspaceRoot) project.getParent())
+				.getProject(getArguments().getNewName()));
 
-		return RefactorParticipantDelegate.createChange(pm, fModel);
+		return RefactorParticipantDelegate.createChange(pm, refactorModel);
 
 	}
 
 	private Change createFolderChange(IProgressMonitor pm, IFolder folder)
-		throws CoreException {
+			throws CoreException {
 
 		String SPLIT = "/"; //$NON-NLS-1$
 		if (folder.getParent().getFullPath().segmentCount() == 1) {
@@ -134,63 +134,61 @@ private Change createFolderChange(IProgressMonitor pm, IFolder folder)
 		}
 
 		final String newUrl = "platform:/plugin/" + folder.getProject().getName() //$NON-NLS-1$
-			+ "/" + folder.getParent().getProjectRelativePath().toString() //$NON-NLS-1$
-			+ SPLIT + getArguments().getNewName();
+				+ "/" + folder.getParent().getProjectRelativePath().toString() //$NON-NLS-1$
+				+ SPLIT + getArguments().getNewName();
 
 		final String oldUrl = "platform:/plugin" + folder.getFullPath(); //$NON-NLS-1$
 
-		fModel.addTextRename(oldUrl, newUrl);
+		refactorModel.addTextRename(oldUrl, newUrl);
 
-		return RefactorParticipantDelegate.createChange(pm, fModel);
+		return RefactorParticipantDelegate.createChange(pm, refactorModel);
 	}
 
 	private Change createFileChange(IProgressMonitor pm, IFile file)
-		throws CoreException {
+			throws CoreException {
 
 		String SPLIT = "/"; //$NON-NLS-1$
 		if (file.getParent().getFullPath().segmentCount() == 1) {
 			SPLIT = ""; //$NON-NLS-1$
 		}
 		final String newUrl = "platform:/plugin/" + file.getProject().getName() + "/" //$NON-NLS-1$ //$NON-NLS-2$
-			+ file.getParent().getProjectRelativePath().toString() + SPLIT
-			+ getArguments().getNewName();
+				+ file.getParent().getProjectRelativePath().toString() + SPLIT
+				+ getArguments().getNewName();
 		final String oldUrl = "platform:/plugin" + file.getFullPath(); //$NON-NLS-1$
-		fModel.addTextRename(oldUrl, newUrl);
+		refactorModel.addTextRename(oldUrl, newUrl);
 
-		return RefactorParticipantDelegate.createChange(pm, fModel);
+		return RefactorParticipantDelegate.createChange(pm, refactorModel);
 	}
 
 	private Change createPackageChange(IProgressMonitor pm,
-		IPackageFragment pckage) throws CoreException {
+			IPackageFragment pckage) throws CoreException {
 		final String bundle = Util.getBundleSymbolicName(pckage.getJavaProject()
-			.getProject());
+				.getProject());
 
 		final String newUrl = "bundleclass://" + bundle + "/" //$NON-NLS-1$ //$NON-NLS-2$
-			+ getArguments().getNewName();
+				+ getArguments().getNewName();
 
 		final String oldUrl = "bundleclass://" + bundle + "/" //$NON-NLS-1$ //$NON-NLS-2$
-			+ pckage.getElementName();
-		fModel.addTextRename(oldUrl, newUrl);
+				+ pckage.getElementName();
+		refactorModel.addTextRename(oldUrl, newUrl);
 
-		return RefactorParticipantDelegate.createChange(pm, fModel);
+		return RefactorParticipantDelegate.createChange(pm, refactorModel);
 	}
 
-	private Change createClassChange(IProgressMonitor pm, IType type)
-		throws CoreException {
-		final String bundle = Util.getBundleSymbolicName(type.getJavaProject()
-			.getProject());
+	private Change createClassChange(IProgressMonitor pm, IType type) throws CoreException {
+		final String bundle = Util.getBundleSymbolicName(type.getJavaProject().getProject());
 
 		final String newUrl = "bundleclass://" //$NON-NLS-1$
-			+ bundle
-			+ "/" //$NON-NLS-1$
-			+ (type.getPackageFragment().getElementName().length() == 0 ? getArguments()
-				.getNewName() : type.getPackageFragment()
-				.getElementName() + "." + getArguments().getNewName()); //$NON-NLS-1$
+				+ bundle
+				+ "/" //$NON-NLS-1$
+				+ (type.getPackageFragment().getElementName().length() == 0 ? getArguments()
+						.getNewName() : type.getPackageFragment()
+						.getElementName() + "." + getArguments().getNewName()); //$NON-NLS-1$
 		final String oldUrl = "bundleclass://" + bundle + "/" //$NON-NLS-1$ //$NON-NLS-2$
-			+ type.getFullyQualifiedName().replace(".", "\\."); //$NON-NLS-1$//$NON-NLS-2$
-		fModel.addTextRename(oldUrl, newUrl);
+				+ type.getFullyQualifiedName();
+		refactorModel.addTextRename(oldUrl, newUrl);
 
-		return RefactorParticipantDelegate.createChange(pm, fModel);
+		return RefactorParticipantDelegate.createChange(pm, refactorModel);
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java
similarity index 83%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
rename to bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java
index da7bb546fc..f8d0972bfe 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java
@@ -10,7 +10,7 @@
  * Wim Jongman <wim.jongman@remainsoftware.com> Bug 432892: Eclipse 4 Application does not work after renaming the
  * project name
  ******************************************************************************/
-package org.eclipse.e4.tools.emf.editor3x;
+package org.eclipse.e4.tools.emf.editor3x.refactorparticipants;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -21,6 +21,7 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.e4.tools.emf.editor3x.RefactorModel;
 import org.eclipse.ltk.core.refactoring.CompositeChange;
 import org.eclipse.ltk.core.refactoring.TextChange;
 import org.eclipse.ltk.core.refactoring.TextFileChange;
@@ -49,20 +50,17 @@ class RefactorParticipantDelegate {
 	 * @throws CoreException
 	 * @throws OperationCanceledException
 	 */
-	public static CompositeChange createChange(
-		IProgressMonitor pProgressMonitor, final RefactorModel pModel)
+	public static CompositeChange createChange(IProgressMonitor pProgressMonitor, final RefactorModel pModel)
 			throws CoreException, OperationCanceledException {
 
-		final String[] filenames = { "*.e4xmi", "plugin.xml" }; //$NON-NLS-1$ //$NON-NLS-2$
-		final FileTextSearchScope scope = FileTextSearchScope.newWorkspaceScope(
-			filenames, false);
+		final String[] filenames = { "*.e4xmi" }; //$NON-NLS-1$
+		final FileTextSearchScope scope = FileTextSearchScope.newWorkspaceScope(filenames, false);
 
 		final Map<IFile, TextFileChange> changes = new HashMap<>();
 		final TextSearchRequestor searchRequestor = new TextSearchRequestor() {
 
 			@Override
-			public boolean acceptPatternMatch(TextSearchMatchAccess matchAccess)
-				throws CoreException {
+			public boolean acceptPatternMatch(TextSearchMatchAccess matchAccess) throws CoreException {
 				final IFile file = matchAccess.getFile();
 				TextFileChange change = changes.get(file);
 
@@ -73,7 +71,7 @@ public boolean acceptPatternMatch(TextSearchMatchAccess matchAccess)
 					}
 
 					if (pModel.isProjectRename()
-						&& file.getProject().equals(pModel.getOldProject())) {
+							&& file.getProject().equals(pModel.getOldProject())) {
 						// The project/resources get refactored before the
 						// TextChange is applied, therefore we need their
 						// future locations
@@ -83,11 +81,11 @@ public boolean acceptPatternMatch(TextSearchMatchAccess matchAccess)
 						// new project will keep that location, only the project
 						// will be changed
 						final IPath oldFile = file.getFullPath().removeFirstSegments(
-							1);
+								1);
 						final IFile newFile = newProject.getFile(oldFile);
 
 						change = new MovedTextFileChange(file.getName(),
-							newFile, file);
+								newFile, file);
 						change.setEdit(new MultiTextEdit());
 						changes.put(file, change);
 
@@ -99,26 +97,28 @@ public boolean acceptPatternMatch(TextSearchMatchAccess matchAccess)
 				}
 
 				final ReplaceEdit edit = new ReplaceEdit(
-					matchAccess.getMatchOffset(),
-					matchAccess.getMatchLength(),
-					pModel.getNewTextCurrentIndex());
+						matchAccess.getMatchOffset(),
+						matchAccess.getMatchLength(),
+						pModel.getNewTextCurrentIndex());
 				change.addEdit(edit);
 				change.addTextEditGroup(new TextEditGroup(E4_MODEL_CHANGES,
-					edit));
+						edit));
 				return true;
 			}
 		};
 
 		CompositeChange result;
 		final TextSearchEngine searchEngine = TextSearchEngine.create();
-		for (int count = pModel.getRenameCount(); count > 0; count--) {
+		int count = pModel.getRenameCount();
+		while (count > 0) {
 			pModel.setIndex(count - 1);
 			searchEngine.search(
-				scope,
-				searchRequestor,
-				TextSearchEngine.createPattern(
-					pModel.getOldTextCurrentIndex(), true, false),
+					scope,
+					searchRequestor,
+					TextSearchEngine.createPattern(
+							pModel.getOldTextCurrentIndex(), true, false),
 					pProgressMonitor);
+			count--;
 		}
 
 		if (changes.isEmpty()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEditor.java
deleted file mode 100644
index 4c8495ab5b..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEditor.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.properties;
-
-public class ResourceBundleEditor {
-
-}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEntry.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEntry.java
deleted file mode 100644
index b1a47ebee6..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ResourceBundleEntry.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.properties;
-
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-public class ResourceBundleEntry {
-	public String key;
-	public SortedMap<String, String> translations = new TreeMap<>();
-}

From 465f47fb8d4994cbd1b5c2a4ba1b72c1f5be7a4d Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Wed, 21 Dec 2016 15:21:41 +0100
Subject: [PATCH 0961/1286] Bug 509583 - Reduce usage of margins for
 Application model editor

Change-Id: Id7d076cfc56b130562878258902ff2ccce4ebbcc
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../src/org/eclipse/e4/tools/compat/internal/PartHelper.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
index c7900e0146..cf57c5cf03 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
@@ -70,8 +70,6 @@ public static <C> C createComponent(Composite parent, IEclipseContext context, C
 
 		// FIXME This should be read from the CSS
 		final FillLayout layout = new FillLayout();
-		layout.marginWidth = 10;
-		layout.marginHeight = 10;
 		comp.setLayout(layout);
 
 		context.set(Composite.class.getName(), comp);

From 38a36dff646dc9f37c0db1f1553412532bcf830b Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Wed, 21 Dec 2016 10:30:42 +0100
Subject: [PATCH 0962/1286] Bug 509551 - [Fragment Editor] Choice of classes
 for element ID must be reduced

Reduce the list in element ID and in the choice of the feature names.
Updates also the title of StringModelFragement dialog

Change-Id: I1f597284654f3defaa57a1af79774013784aaf97
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../eclipse/e4/tools/emf/ui/common/Util.java  | 33 ++++++++++++
 .../e4/tools/emf/ui/internal/Messages.java    |  1 +
 .../tools/emf/ui/internal/Messages.properties |  1 +
 .../emf/ui/internal/common/ModelEditor.java   |  8 ++-
 .../common/component/StringModelFragment.java | 11 +++-
 .../dialogs/FeatureSelectionDialog.java       | 33 +++++++++---
 .../FindParentReferenceElementDialog.java     | 51 +++++++++++++------
 7 files changed, 113 insertions(+), 25 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index ee2c77af4e..a2e533d18a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -363,6 +363,39 @@ private static void setUpResourceSet(ResourceSet resourceSet, IWorkspaceRoot roo
 		}
 	}
 
+	/**
+	 * This method checks if an EClass can be extended using a fragment. ie : it
+	 * must have containment EReference to a model object.
+	 *
+	 * @param c
+	 * @return true if at least one reference type is not a StringStringToMap or
+	 *         other no editable type
+	 */
+	public static boolean canBeExtendedInAFragment(EClass c) {
+		boolean result = false;
+		for (EReference r : c.getEAllReferences()) {
+			if (referenceIsModelFragmentCompliant(r)) {
+				result = true;
+				break;
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * This method checks if an EReference can be considered in a model fragment
+	 * ie : it must be containment EReference to a model object.
+	 *
+	 * @param c
+	 * @return true if the reference is containment and type is not a
+	 *         StringStringToMap or other no editable type
+	 */
+	public static boolean referenceIsModelFragmentCompliant(EReference r) {
+		String t = r.getEReferenceType().getName();
+		return (r.isContainment() && !t.equals("StringToStringMap") && !t.equals("StringToObjectMap"));
+
+	}
+
 	public static final void addDecoration(Control control, Binding binding) {
 		final ControlDecoration dec = new ControlDecoration(control, SWT.BOTTOM);
 		binding.getValidationStatus().addValueChangeListener(new IValueChangeListener() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 797b46c8a6..ce4a5429d5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -389,6 +389,7 @@ public class Messages {
 	public String ModelFragmentsEditor_Imports;
 
 	public String StringModelFragment_Label;
+	public String StringModelFragment_LabelFor;
 	public String StringModelFragment_Description;
 	public String StringModelFragment_Featurename;
 	public String StringModelFragment_FeaturenameTooltip;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 417d616a50..104529516c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -360,6 +360,7 @@ ModelFragmentsEditor_Description=Description
 ModelFragmentsEditor_Imports=Imports
 
 StringModelFragment_Label=Model Fragment
+StringModelFragment_LabelFor=Model Fragment for 
 StringModelFragment_Description=Model Fragment
 StringModelFragment_Featurename=Feature Name *
 StringModelFragment_FeaturenameTooltip=Select a feature name to contribute to in the EClass describing the parent ID instance
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 7fd44dc171..f68755dcae 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -367,6 +367,8 @@ public class ModelEditor implements IGotoObject {
 
 	private XmiTab xmiTab;
 
+	private Label sectionHeaderLabel;
+
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project,
 			final IResourcePool resourcePool) {
 		this.resourcePool = resourcePool;
@@ -575,7 +577,7 @@ private Composite createFormTab(Composite composite) {
 		final Label iconLabel = new Label(headerContainer, SWT.NONE);
 		iconLabel.setLayoutData(new GridData(20, 20));
 
-		final Label sectionHeaderLabel = new Label(headerContainer, SWT.NONE);
+		sectionHeaderLabel = new Label(headerContainer, SWT.NONE);
 		sectionHeaderLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		final Label separatorLabel = new Label(headerContainer, SWT.SEPARATOR | SWT.HORIZONTAL);
 		final GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
@@ -1547,6 +1549,10 @@ public void setFocus() {
 		// viewer.getControl().setFocus();
 	}
 
+	public void setHeaderTitle(String title) {
+		sectionHeaderLabel.setText(title);
+	}
+
 	@PreDestroy
 	void dispose() {
 		try {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 2c550f2e14..69a05cf402 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -120,7 +120,12 @@ public Image getImage(Object element) {
 
 	@Override
 	public String getLabel(Object element) {
-		return Messages.StringModelFragment_Label;
+		getSelectedContainer(); // Recompute selected container
+		if (selectedContainer == null) {
+			return Messages.StringModelFragment_Label;
+		} else {
+			return Messages.StringModelFragment_LabelFor + selectedContainer.getName();
+		}
 	}
 
 	@Override
@@ -157,8 +162,10 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent);
 		}
+		selectedContainer = null;
 		getMaster().setValue(object);
 		updateChildrenChoice();
+		getEditor().setHeaderTitle(getLabel(null));
 		return composite;
 	}
 
@@ -228,6 +235,8 @@ private EClass getSelectedContainer() {
 			}
 		}
 
+		getEditor().setHeaderTitle(getLabel(null));
+
 		return selectedContainer;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index a5d68f68ff..5b0c5a46a9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -28,6 +28,7 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -93,13 +94,13 @@ protected Control createDialogArea(Composite parent) {
 		final Composite composite = (Composite) super.createDialogArea(parent);
 
 		final Image packageImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream(
-			"/icons/full/obj16/EPackage.gif")); //$NON-NLS-1$
+				"/icons/full/obj16/EPackage.gif")); //$NON-NLS-1$
 		final Image classImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream(
-			"/icons/full/obj16/class_obj.gif")); //$NON-NLS-1$
+				"/icons/full/obj16/class_obj.gif")); //$NON-NLS-1$
 		final Image featureImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream(
-			"/icons/full/obj16/field_public_obj.gif")); //$NON-NLS-1$
+				"/icons/full/obj16/field_public_obj.gif")); //$NON-NLS-1$
 		final Image newTitleImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream(
-			"/icons/full/wizban/fieldrefact_wiz.png")); //$NON-NLS-1$
+				"/icons/full/wizban/fieldrefact_wiz.png")); //$NON-NLS-1$
 
 		setTitleImage(newTitleImage);
 
@@ -160,7 +161,7 @@ public void doubleClick(DoubleClickEvent event) {
 			public int compare(Viewer viewer, Object e1, Object e2) {
 				if (e1.getClass() == InternalPackage.class) {
 					return ((InternalPackage) e1).ePackage.getNsURI().compareTo(
-						((InternalPackage) e2).ePackage.getNsURI());
+							((InternalPackage) e2).ePackage.getNsURI());
 				} else if (e1.getClass() == InternalClass.class) {
 					return ((InternalClass) e1).eClass.getName().compareTo(((InternalClass) e2).eClass.getName());
 				} else if (e1.getClass() == InternalFeature.class) {
@@ -229,7 +230,7 @@ protected void okPressed() {
 		if (!sel.isEmpty() && sel.getFirstElement().getClass() == InternalFeature.class) {
 			final InternalFeature f = (InternalFeature) sel.getFirstElement();
 			final Command cmd = SetCommand.create(editingDomain, fragment,
-				FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME, f.feature.getName());
+					FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME, f.feature.getName());
 
 			if (cmd.canExecute()) {
 				editingDomain.getCommandStack().execute(cmd);
@@ -258,9 +259,25 @@ public Object[] getElements(Object inputElement) {
 		@Override
 		public Object[] getChildren(Object parentElement) {
 			if (parentElement.getClass() == InternalPackage.class) {
-				return ((InternalPackage) parentElement).classes.toArray();
+				// Must keep only classes that are usable in a fragment...
+				ArrayList<InternalClass> result = new ArrayList<>();
+				for (InternalClass ic : ((InternalPackage) parentElement).classes) {
+					if (Util.canBeExtendedInAFragment(ic.eClass)) {
+						result.add(ic);
+					}
+				}
+				return result.toArray();
 			} else if (parentElement.getClass() == InternalClass.class) {
-				return ((InternalClass) parentElement).features.toArray();
+				ArrayList<InternalFeature> result = new ArrayList<>();
+				for (InternalFeature intf : ((InternalClass) parentElement).features)
+				{
+					if ((intf.feature instanceof EReference) &&
+							Util.referenceIsModelFragmentCompliant((EReference)intf.feature))
+					{
+						result.add(intf);
+					}
+				}
+				return result.toArray();
 			}
 			return new Object[0];
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index 6feecdf744..b397b3c467 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -9,7 +9,7 @@
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Steven Spungin <steven@spungin.tv> - Bug 437469
  * Patrik Suzzi <psuzzi@gmail.com> - Bug 467262
- * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 509488
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 509488, 509551
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -85,9 +85,11 @@ public class FindParentReferenceElementDialog extends TitleAreaDialog {
 	private EClass selectedContainer;
 	private ClassContributionCollector collector;
 
+	/** Remember of classes that can be used for a fragment definition. */
+	private static List<EClass> extendableClasses = null;
+
 	public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEditor editor,
-			MStringModelFragment fragment, Messages Messages,
-			EClass previousSelection) {
+			MStringModelFragment fragment, Messages Messages, EClass previousSelection) {
 		super(parentShell);
 		this.fragment = fragment;
 		this.editor = editor;
@@ -115,8 +117,8 @@ protected boolean isResizable() {
 	protected Control createDialogArea(Composite parent) {
 		final Composite comp = (Composite) super.createDialogArea(parent);
 
-		final Image titleImage = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream(
-				"/icons/full/wizban/import_wiz.png")); //$NON-NLS-1$
+		final Image titleImage = new Image(parent.getDisplay(),
+				getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/import_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
 		getShell().addDisposeListener(new DisposeListener() {
 
@@ -151,10 +153,7 @@ public String getText(Object element) {
 			}
 		});
 		eClassViewer.setContentProvider(new ArrayContentProvider());
-		final List<EClass> eClassList = new ArrayList<>();
-		for (final InternalPackage p : Util.loadPackages()) {
-			eClassList.addAll(p.getAllClasses());
-		}
+		final List<EClass> eClassList = getExtendableClasses();
 		eClassViewer.setComparator(new ViewerComparator() {
 			@Override
 			public int compare(Viewer viewer, Object e1, Object e2) {
@@ -218,9 +217,10 @@ public void update(ViewerCell cell) {
 
 				final MApplicationElement appEl = (MApplicationElement) o;
 
-				final StyledString styledString = new StyledString(
-						editor.getLabel(o)
-						+ " (" + (appEl.getElementId() == null ? "<" + Messages.FindParentReferenceElementDialog_NoId + ">" : appEl.getElementId()) + ")", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+				final StyledString styledString = new StyledString(editor.getLabel(o) + " (" //$NON-NLS-1$
+						+ (appEl.getElementId() == null
+						? "<" + Messages.FindParentReferenceElementDialog_NoId + ">" : appEl.getElementId()) //$NON-NLS-1$ //$NON-NLS-2$
+						+ ")", null); //$NON-NLS-1$
 				final String detailLabel = editor.getDetailLabel(o);
 				if (detailLabel != null && !detailLabel.equals(appEl.getElementId())) {
 					styledString.append(" - " + detailLabel, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
@@ -267,12 +267,35 @@ public void widgetSelected(SelectionEvent e) {
 		} else {
 			// Select addon by default (not necessary in the first position in
 			// the eclasslist...)
-			eClassViewer.setSelection(new StructuredSelection(ApplicationPackageImpl.Literals.ADDON));
+			eClassViewer.setSelection(new StructuredSelection(ApplicationPackageImpl.Literals.APPLICATION));
 		}
 
 		return comp;
 	}
 
+	/**
+	 * This method returns classes that have extensible fields It rejects
+	 * eClasses having only transientData and persistedState for instance Result
+	 * is cached in a singleton for each dialog instances...
+	 *
+	 * @return
+	 */
+	private List<EClass> getExtendableClasses() {
+		if (extendableClasses == null) {
+			extendableClasses = new ArrayList<>();
+			for (final InternalPackage p : Util.loadPackages()) {
+				for (EClass c : p.getAllClasses()) {
+					if (Util.canBeExtendedInAFragment(c)) {
+						extendableClasses.add(c);
+					}
+				}
+			}
+		}
+		return extendableClasses;
+	}
+
+
+
 	protected void updateSearch() {
 		if (currentResultHandler != null) {
 			currentResultHandler.cancel();
@@ -316,6 +339,4 @@ public EClass getSelectedContainer() {
 		return selectedContainer;
 	}
 
-
-
 }
\ No newline at end of file

From 6b2b1c5b76a12397675a768871c18ce24aeb5100 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Wed, 21 Dec 2016 19:18:56 +0100
Subject: [PATCH 0963/1286] Bug 509608 - Update
 org.eclipse.e4.tools.emf.editor3x to Java 1.8

Change-Id: I7d9f8e6036b8d24a840ffad4c5c21563951a512c
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.emf.editor3x/.classpath        | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                    | 6 +++---
 .../org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath b/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
index e8ea977a69..4f83b2397e 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
index cd32e5711d..cab2bbe0e6 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
@@ -25,9 +25,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index d11c25fcc5..bf9f1440b2 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
 Bundle-Version: 4.7.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.emf.common;bundle-version="2.6.0",

From 242499dca778d30c1e4d736ddae31f9d54c86a72 Mon Sep 17 00:00:00 2001
From: Patrik Suzzi <psuzzi@gmail.com>
Date: Thu, 22 Dec 2016 10:50:17 +0100
Subject: [PATCH 0964/1286] Bug 509606 - [Model Fragment Editor] should provide
 content assist in

..feature field name.

With the proposed change we added content assist for the Feature Name,
in the model fragment editor. The content assist works only if an
Extended Element ID is defined.

see anim gif: https://bugs.eclipse.org/bugs/attachment.cgi?id=266022

Change-Id: I6a5c2da53f5c16eaaf788caa0d01254ca9e2de13
Signed-off-by: Patrik Suzzi <psuzzi@gmail.com>
---
 .../e4/tools/emf/ui/internal/Messages.java    |   4 +-
 .../tools/emf/ui/internal/Messages.properties |   4 +-
 .../common/component/StringModelFragment.java | 113 +++++++++++++++++-
 3 files changed, 116 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index ce4a5429d5..705731e782 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2014 BestSolution.at and others.
+ * Copyright (c) 2010-2016 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,6 +11,7 @@
  *     Steven Spungin <steven@spungin.tv> - Bug 431735, 430717
  *     Jonas Helming <jhelming@eclipsesource.com - Bug 444340
  *     Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 466731
+ *     Patrik Suzzi <psuzzi@gmail.com> - Bug 509606
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal;
 
@@ -397,6 +398,7 @@ public class Messages {
 	public String StringModelFragment_ParentIdTooltip;
 	public String StringModelFragment_PositionInList;
 	public String StringModelFragment_Elements;
+	public String StringModelFragment_Ctrl_Space;
 
 	public String FeatureSelectionDialog_Filter;
 	public String FeatureSelectionDialog_ShellTitle;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 104529516c..03aedb503b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -1,5 +1,5 @@
 # ******************************************************************************
-# * Copyright (c) 2010-2014 BestSolution.at and others.
+# * Copyright (c) 2010-2016 BestSolution.at and others.
 # * All rights reserved. This program and the accompanying materials
 # * are made available under the terms of the Eclipse Public License v1.0
 # * which accompanies this distribution, and is available at
@@ -12,6 +12,7 @@
 # *     Steven Spungin <steven@spungin.tv> - Bug 431735, 430717, Ongoing Maintenance
 # *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 440159
 # *     Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 466731
+# *     Patrik Suzzi <psuzzi@gmail.com> - Bug 509606
 # ******************************************************************************
 
 PartEditor_InputPart=Input Part
@@ -368,6 +369,7 @@ StringModelFragment_ParentId=Extended Element ID *
 StringModelFragment_ParentIdTooltip=Select here an element ID from your model, or you can enter 'xpath:/' to access to the application model.
 StringModelFragment_PositionInList=Position in list
 StringModelFragment_Elements=Elements
+StringModelFragment_Ctrl_Space=Use CTRL + SPACE to see possible values
 
 FeatureSelectionDialog_Filter=Filter
 FeatureSelectionDialog_ShellTitle=Find Feature Name
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 69a05cf402..22b5b53034 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -10,6 +10,7 @@
  * Steven Spungin <steve@spungin.tv> - Ongoing Maintenance, Bug 439532, Bug 443945
  * Patrik Suzzi <psuzzi@gmail.com> - Bug 467262
  * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 509488
+ * Patrik Suzzi <psuzzi@gmail.com> - Bug 509606
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -54,6 +55,7 @@
 import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -61,8 +63,17 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
+import org.eclipse.jface.bindings.keys.KeyStroke;
+import org.eclipse.jface.bindings.keys.ParseException;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.fieldassist.ContentProposal;
+import org.eclipse.jface.fieldassist.ContentProposalAdapter;
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
+import org.eclipse.jface.fieldassist.IContentProposal;
+import org.eclipse.jface.fieldassist.IContentProposalProvider;
+import org.eclipse.jface.fieldassist.TextContentAdapter;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -332,6 +343,43 @@ public void widgetSelected(SelectionEvent e) {
 					EMFEditProperties
 					.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME)
 					.observeDetail(getMaster()));
+
+			// create the decoration for the text component
+			final ControlDecoration deco = new ControlDecoration(t, SWT.TOP | SWT.LEFT);
+
+			// use an existing image
+			Image image = FieldDecorationRegistry.getDefault()
+					.getFieldDecoration(FieldDecorationRegistry.DEC_INFORMATION).getImage();
+
+			// set description and image
+			deco.setDescriptionText(Messages.StringModelFragment_Ctrl_Space);
+			deco.setImage(image);
+
+			// always show decoration
+			deco.setShowOnlyOnFocus(false);
+
+			// hide the decoration if the text component has content
+			t.addModifyListener(new ModifyListener() {
+				@Override
+				public void modifyText(ModifyEvent e) {
+					Text text = (Text) e.getSource();
+					if (!text.getText().isEmpty()) {
+						deco.hide();
+					} else {
+						deco.show();
+					}
+				}
+			});
+
+			KeyStroke keyStroke;
+			try {
+				keyStroke = KeyStroke.getInstance("Ctrl+Space");
+				ContentProposalAdapter adapter = new ContentProposalAdapter(t, new TextContentAdapter(),
+						new StringModelFragmentProposalProvider(this, t), keyStroke, null);
+				adapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE);
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
 			t.addModifyListener(new ModifyListener() {
 				@Override
 				public void modifyText(ModifyEvent e) {
@@ -406,6 +454,67 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 		return folder;
 	}
 
+	static class StringModelFragmentProposalProvider implements IContentProposalProvider {
+
+		private StringModelFragment fragment;
+		private Text text;
+
+		/**
+		 * Initialize the class passing the current instance.
+		 */
+		public StringModelFragmentProposalProvider(StringModelFragment fragment, Text t) {
+			this.fragment = fragment;
+			this.text = t;
+		}
+
+		/**
+		 * {@inheritDoc}
+		 *
+		 * @see org.eclipse.jface.fieldassist.IContentProposalProvider#getProposals(java.lang.String,
+		 *      int)
+		 */
+		@Override
+		public IContentProposal[] getProposals(String cont, int position) {
+			List<String[]> contents = new ArrayList<>();
+			StringBuilder sb = new StringBuilder(256);
+			if (fragment.getSelectedContainer() != null) {
+				for (EReference r : fragment.getSelectedContainer().getEAllReferences()) {
+					if (Util.referenceIsModelFragmentCompliant(r) && r.getName().startsWith(text.getText())) {
+						String content = r.getName();
+						sb.setLength(0);
+						sb.append(content).append(": ");
+						final EClassifier type = ModelUtils.getTypeArgument(this.fragment.getSelectedContainer(),
+								r.getEGenericType());
+						if (r.isMany()) {
+							// List<Container>
+							sb.append("List<").append(type.getName()).append(">");
+						} else {
+							// TypeOfTheClass
+							sb.append(type.getName());
+						}
+						contents.add(new String[] { content, sb.toString() });
+					}
+				}
+			}
+
+			Collections.sort(contents, new Comparator<String[]>() {
+
+				@Override
+				public int compare(String[] o1, String[] o2) {
+					// compare
+					return o1[0].compareTo(o2[0]);
+				}
+			});
+
+			IContentProposal[] contentProposals = new IContentProposal[contents.size()];
+			for (int i = 0; i < contents.size(); i++) {
+				contentProposals[i] = new ContentProposal(contents.get(i)[0], contents.get(i)[1], null);
+			}
+			return contentProposals;
+		}
+
+	}
+
 	public void dispose() {
 		if (composite != null) {
 			composite.dispose();
@@ -481,7 +590,6 @@ public int compare(Action o1, Action o2) {
 		return l;
 	}
 
-
 	/**
 	 * Returns the EClass of the Application element(s) referenced by the xpath
 	 * value (without prefix)
@@ -533,8 +641,7 @@ public List<FeatureClass> getTargetChildrenClasses() {
 			String featurename = getStringModelFragment().getFeaturename();
 
 			for (EReference ref : selectedContainer.getEAllReferences()) {
-				if (ref.getName().equals(featurename))
-				{
+				if (ref.getName().equals(featurename)) {
 					childRef = ref;
 					break;
 				}

From aca5571de8afd4ad9dd853268ac383aa343594f2 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Thu, 22 Dec 2016 11:56:25 +0100
Subject: [PATCH 0965/1286] Bug 509637 - StackOverflow when editing in the
 StringFragmentEditor

There was a loop between getLabel and getSelectedContainer

Change-Id: Id37055493600e7d82383872603b6b99de74073b0
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../internal/common/component/StringModelFragment.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 22b5b53034..5b6c259d10 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -131,7 +131,7 @@ public Image getImage(Object element) {
 
 	@Override
 	public String getLabel(Object element) {
-		getSelectedContainer(); // Recompute selected container
+
 		if (selectedContainer == null) {
 			return Messages.StringModelFragment_Label;
 		} else {
@@ -246,11 +246,15 @@ private EClass getSelectedContainer() {
 			}
 		}
 
-		getEditor().setHeaderTitle(getLabel(null));
+		updateTitle();
 
 		return selectedContainer;
 	}
 
+	private void updateTitle() {
+		getEditor().setHeaderTitle(getLabel(null));
+	}
+
 	private StringModelFragmentImpl getStringModelFragment() {
 		return ((StringModelFragmentImpl) getMaster().getValue());
 	}
@@ -315,6 +319,7 @@ public void widgetSelected(SelectionEvent e) {
 							getSelectedContainer());
 					dialog.open();
 					selectedContainer = dialog.getSelectedContainer();
+					updateTitle();
 				}
 			});
 		}

From 0ba6bdf7a13fcdc91f9d9d7103a5ea8bbb9a9114 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Thu, 22 Dec 2016 12:48:20 +0100
Subject: [PATCH 0966/1286] Bug 509576 - e4 model editor shows duplicates
 entries for the application node

Change-Id: Ic61817d6413f6d356de73fcc839c46727d300c50
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index f68755dcae..b672ace1c9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -31,6 +31,7 @@
 import org.eclipse.core.databinding.ObservablesManager;
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.map.IMapChangeListener;
 import org.eclipse.core.databinding.observable.map.IObservableMap;
 import org.eclipse.core.databinding.observable.map.MapChangeEvent;
@@ -1697,12 +1698,12 @@ private void handleStructureCut() {
 		}
 	}
 
-	class ObservableFactoryImpl implements IObservableFactory {
+	public class ObservableFactoryImpl implements IObservableFactory {
 
 		@Override
 		public IObservable createObservable(Object target) {
 			if (target instanceof IObservableList) {
-				return (IObservable) target;
+				return new WritableList((List<?>) target, Object.class);
 			} else if (target instanceof VirtualEntry<?>) {
 				return ((VirtualEntry<?>) target).getList();
 			} else {

From c893a4fb56d10cdec176ecdec25b4111669ad3b0 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Thu, 22 Dec 2016 13:00:45 +0100
Subject: [PATCH 0967/1286] Bug 509603 - [Model Editor] is always reloaded when
 we switch to another editor

Change-Id: I61f12e8e60b706f8da56392f3055d885c5ba0442
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../emf/ui/internal/wbm/ApplicationModelEditor.java      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index b1961c46e6..d44a5efef7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -10,13 +10,16 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Wim Jongman <wim.jongman@remainsoftware.com> - https://bugs.eclipse.org/bugs/show_bug.cgi?id=393150
+ *     Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 509603
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.wbm;
 
 import java.io.IOException;
+
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Named;
+
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceChangeListener;
@@ -100,8 +103,9 @@ public void resourceChanged(IResourceChangeEvent event) {
 				return;
 			}
 
-			if (resource == null)
+			if (resource == null) {
 				return;
+			}
 
 			IResourceDelta delta = event.getDelta().findMember(new Path(resource.getURI().toPlatformString(false)));
 			if (delta == null) {
@@ -117,12 +121,13 @@ public void resourceChanged(IResourceChangeEvent event) {
 			if (!isSaving()) {
 
 				// reload the model if the file has changed
-				if (delta.getKind() == IResourceDelta.CHANGED) {
+				if ((delta.getKind() == IResourceDelta.CHANGED) && (delta.getMarkerDeltas().length == 0)) {
 					reloadModel();
 				}
 			}
 		}
 
+
 		private void hidePart(final boolean force) {
 			sync.asyncExec(new Runnable() {
 

From 726a1ba03fcf96511bf06d79945b9d6b7a8f192e Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Thu, 22 Dec 2016 15:39:27 +0100
Subject: [PATCH 0968/1286] Bug 509598 - [Model Editor] refreshOnSave seems to
 be called for all saves

Change-Id: I8ab01a0ea146233a7346ea463672af7c7a70fe7d
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../tools/emf/ui/internal/common/ModelEditor.java  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index b672ace1c9..0c9706c0e4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -27,6 +27,7 @@
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
+import javax.inject.Named;
 
 import org.eclipse.core.databinding.ObservablesManager;
 import org.eclipse.core.databinding.observable.IObservable;
@@ -170,6 +171,7 @@
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.e4.ui.model.internal.ModelUtils;
+import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.e4.ui.workbench.UIEvents;
 import org.eclipse.e4.ui.workbench.UIEvents.EventTags;
 import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
@@ -342,6 +344,10 @@ public class ModelEditor implements IGotoObject {
 	@Optional
 	private IModelExtractor modelExtractor;
 
+	@Inject
+	@Optional
+	MPart currentPart;
+
 	private final ObservablesManager obsManager;
 
 	private final IResourcePool resourcePool;
@@ -1998,9 +2004,15 @@ private Object getFirstMatchingItem(EObject target, ObservableListTreeContentPro
 	@Inject
 	@Optional
 	public void refreshOnSave(
-			@UIEventTopic(UIEvents.Dirtyable.TOPIC_DIRTY) org.osgi.service.event.Event event) {
+			@UIEventTopic(UIEvents.Dirtyable.TOPIC_DIRTY) org.osgi.service.event.Event event,
+			@Named(IServiceConstants.ACTIVE_PART) MPart part) {
 		// If the application model is saved (-> becomes undirty) we must
 		// refresh tree (bug 472706)
+		// Must react only if editor is the current one... (bug 509598)
+		if (part != currentPart) {
+			return;
+		}
+
 		final Object type = event.getProperty(EventTags.TYPE);
 		final Object newValue = event.getProperty(EventTags.NEW_VALUE);
 

From 581d7d0c2b22970c66f90ed8775a486226530dca Mon Sep 17 00:00:00 2001
From: Sopot Cela <scela@redhat.com>
Date: Thu, 5 Jan 2017 13:47:16 +0100
Subject: [PATCH 0969/1286] Bug 509973 - Comparator errors in I20170105-0320

Change-Id: I068126033538e6a18c4eb8cc1a02104d9f8345e6
Signed-off-by: Sopot Cela <scela@redhat.com>
---
 bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
index 93c4fe3980..dd589f1470 100644
--- a/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
+++ b/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
@@ -1,3 +1,4 @@
 # To force a version qualifier update add the bug here
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
-Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
\ No newline at end of file
+Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
+Bug 509973 - Comparator errors in I20170105-0320
\ No newline at end of file

From 98489717e86da4059167386e385f6bf87eb6f8b8 Mon Sep 17 00:00:00 2001
From: Simon <simon.scholz@vogella.com>
Date: Wed, 11 Jan 2017 19:59:02 +0100
Subject: [PATCH 0970/1286] Bug 510299 - Resolve formatting issues and remove
 unused constructor for PartTemplate

Change-Id: I0a59cf1a6537668274e04e13ef325725f6606b2c
Signed-off-by: Simon <simon.scholz@vogella.com>
---
 .../classes/templates/PartTemplate.java       | 160 ++++++++----------
 1 file changed, 74 insertions(+), 86 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
index 20843b9887..c942904468 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
@@ -4,92 +4,80 @@
 
 public class PartTemplate
 {
-  protected static String nl;
-  public static synchronized PartTemplate create(String lineSeparator)
-  {
-    nl = lineSeparator;
-    PartTemplate result = new PartTemplate();
-    nl = null;
-    return result;
-  }
+	protected static String nl;
+	public static synchronized PartTemplate create(String lineSeparator)
+	{
+		nl = lineSeparator;
+		PartTemplate result = new PartTemplate();
+		nl = null;
+		return result;
+	}
 
-  public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-  protected final String TEXT_1 = " ";
-  protected final String TEXT_2 = NL + "package ";
-  protected final String TEXT_3 = ";";
-  protected final String TEXT_4 = NL + NL + "import javax.inject.Inject;";
-  protected final String TEXT_5 = NL + "import javax.annotation.PostConstruct;" + NL + "import org.eclipse.swt.widgets.Composite;";
-  protected final String TEXT_6 = NL + "import javax.annotation.PreDestroy;";
-  protected final String TEXT_7 = NL + "import org.eclipse.e4.ui.di.Focus;";
-  protected final String TEXT_8 = NL + "import org.eclipse.e4.ui.di.Persist;";
-  protected final String TEXT_9 = NL + NL + "public class ";
-  protected final String TEXT_10 = " {" + NL + "\t@Inject" + NL + "\tpublic ";
-  protected final String TEXT_11 = "() {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
-  protected final String TEXT_12 = NL + "\t@PostConstruct" + NL + "\tpublic void ";
-  protected final String TEXT_13 = "(Composite parent) {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
-  protected final String TEXT_14 = NL + "\t";
-  protected final String TEXT_15 = NL + "\t@PreDestroy" + NL + "\tpublic void ";
-  protected final String TEXT_16 = "() {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
-  protected final String TEXT_17 = NL + "\t";
-  protected final String TEXT_18 = NL + "\t@Focus" + NL + "\tpublic void ";
-  protected final String TEXT_19 = "() {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
-  protected final String TEXT_20 = NL + "\t";
-  protected final String TEXT_21 = NL + "\t@Persist" + NL + "\tpublic void ";
-  protected final String TEXT_22 = "() {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
-  protected final String TEXT_23 = NL + "}";
+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+	protected final String TEXT_1 = NL + "package ";
+	protected final String TEXT_2 = ";";
+	protected final String TEXT_3 = NL + NL + "import javax.annotation.PostConstruct;" + NL
+			+ "import org.eclipse.swt.widgets.Composite;";
+	protected final String TEXT_4 = NL + "import javax.annotation.PreDestroy;";
+	protected final String TEXT_5 = NL + "import org.eclipse.e4.ui.di.Focus;";
+	protected final String TEXT_6 = NL + "import org.eclipse.e4.ui.di.Persist;";
+	protected final String TEXT_7 = NL + NL + "public class ";
+	protected final String TEXT_8 = " {";
+	protected final String TEXT_9 = NL + NL + "\t@PostConstruct" + NL + "\tpublic void ";
+	protected final String TEXT_10 = "(Composite parent) {" + NL + "\t\t" + NL + "\t}" + NL;
+	protected final String TEXT_11 = NL + "\t@PreDestroy" + NL + "\tpublic void ";
+	protected final String TEXT_12 = "() {" + NL + "\t\t" + NL + "\t}" + NL;
+	protected final String TEXT_13 = NL + "\t@Focus" + NL + "\tpublic void ";
+	protected final String TEXT_14 = "() {" + NL + "\t\t" + NL + "\t}" + NL;
+	protected final String TEXT_15 = NL + "\t@Persist" + NL + "\tpublic void ";
+	protected final String TEXT_16 = "() {" + NL + "\t\t" + NL + "\t}" + NL;
+	protected final String TEXT_17 = NL + "}";
 
-  public String generate(Object argument)
-  {
-    final StringBuffer stringBuffer = new StringBuffer();
-     PartClass domainClass = (PartClass)argument; 
-    stringBuffer.append(TEXT_1);
-     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
-    stringBuffer.append(TEXT_2);
-    stringBuffer.append( domainClass.getPackageFragment().getElementName() );
-    stringBuffer.append(TEXT_3);
-     } 
-    stringBuffer.append(TEXT_4);
-     if( domainClass.isUsePostConstruct() ) { 
-    stringBuffer.append(TEXT_5);
-     } 
-     if( domainClass.isUsePredestroy() ) { 
-    stringBuffer.append(TEXT_6);
-     } 
-     if( domainClass.isUseFocus() ) { 
-    stringBuffer.append(TEXT_7);
-     } 
-     if( domainClass.isUsePersist() ) { 
-    stringBuffer.append(TEXT_8);
-     } 
-    stringBuffer.append(TEXT_9);
-    stringBuffer.append( domainClass.getName() );
-    stringBuffer.append(TEXT_10);
-    stringBuffer.append( domainClass.getName() );
-    stringBuffer.append(TEXT_11);
-     if( domainClass.isUsePostConstruct() ) { 
-    stringBuffer.append(TEXT_12);
-    stringBuffer.append( domainClass.getPostConstructMethodName()  );
-    stringBuffer.append(TEXT_13);
-     } 
-    stringBuffer.append(TEXT_14);
-     if( domainClass.isUsePredestroy() ) { 
-    stringBuffer.append(TEXT_15);
-    stringBuffer.append( domainClass.getPreDestroyMethodName()  );
-    stringBuffer.append(TEXT_16);
-     } 
-    stringBuffer.append(TEXT_17);
-     if( domainClass.isUseFocus() ) { 
-    stringBuffer.append(TEXT_18);
-    stringBuffer.append( domainClass.getFocusMethodName() );
-    stringBuffer.append(TEXT_19);
-     } 
-    stringBuffer.append(TEXT_20);
-     if( domainClass.isUsePersist() ) { 
-    stringBuffer.append(TEXT_21);
-    stringBuffer.append( domainClass.getPersistMethodName() );
-    stringBuffer.append(TEXT_22);
-     } 
-    stringBuffer.append(TEXT_23);
-    return stringBuffer.toString();
-  }
+	public String generate(Object argument)
+	{
+		final StringBuffer stringBuffer = new StringBuffer();
+		PartClass domainClass = (PartClass)argument;
+		if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
+			stringBuffer.append(TEXT_1);
+			stringBuffer.append( domainClass.getPackageFragment().getElementName() );
+			stringBuffer.append(TEXT_2);
+		}
+		if( domainClass.isUsePostConstruct() ) {
+			stringBuffer.append(TEXT_3);
+		}
+		if( domainClass.isUsePredestroy() ) {
+			stringBuffer.append(TEXT_4);
+		}
+		if( domainClass.isUseFocus() ) {
+			stringBuffer.append(TEXT_5);
+		}
+		if( domainClass.isUsePersist() ) {
+			stringBuffer.append(TEXT_6);
+		}
+		stringBuffer.append(TEXT_7);
+		stringBuffer.append( domainClass.getName() );
+		stringBuffer.append(TEXT_8);
+		if( domainClass.isUsePostConstruct() ) {
+			stringBuffer.append(TEXT_9);
+			stringBuffer.append( domainClass.getPostConstructMethodName()  );
+			stringBuffer.append(TEXT_10);
+		}
+		if( domainClass.isUsePredestroy() ) {
+			stringBuffer.append(TEXT_11);
+			stringBuffer.append( domainClass.getPreDestroyMethodName()  );
+			stringBuffer.append(TEXT_12);
+		}
+		if( domainClass.isUseFocus() ) {
+			stringBuffer.append(TEXT_13);
+			stringBuffer.append( domainClass.getFocusMethodName() );
+			stringBuffer.append(TEXT_14);
+		}
+		if( domainClass.isUsePersist() ) {
+			stringBuffer.append(TEXT_15);
+			stringBuffer.append( domainClass.getPersistMethodName() );
+			stringBuffer.append(TEXT_16);
+		}
+		stringBuffer.append(TEXT_17);
+		return stringBuffer.toString();
+	}
 }

From 59a57f422892f04cccc32f8b742c166f6737d0f1 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 12 Jan 2017 07:36:11 +0100
Subject: [PATCH 0971/1286] Bug 510330 - I20170111-2000 build failed with
 compilation errors

Update of the org.eclipse.e4.tools.compat BREE to Java 8

Change-Id: I0decc601efc74719ca3eadab069e6ce9c59ae17d
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.compat/.classpath              | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                    | 6 +++---
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/.classpath b/bundles/org.eclipse.e4.tools.compat/.classpath
index 098194ca4b..4f83b2397e 100644
--- a/bundles/org.eclipse.e4.tools.compat/.classpath
+++ b/bundles/org.eclipse.e4.tools.compat/.classpath
@@ -1,7 +1,7 @@
 <?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/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
index 3bb010ec9d..68d9f84612 100644
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
@@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -132,7 +132,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index b938469686..910df9a9c4 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
 Bundle-Version: 4.7.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",

From 22c3a0afc5e4c1af985be6036877ac57dc19f538 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Thu, 12 Jan 2017 09:31:39 +0200
Subject: [PATCH 0972/1286] Bug 510330 - I20170111-2000 build failed with
 compilation errors

Remove jre.compilation.profile.

Change-Id: Ia377d37baeca914cfe74b0d28c8592edd4fe2137
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 bundles/org.eclipse.e4.tools.compat/build.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/build.properties b/bundles/org.eclipse.e4.tools.compat/build.properties
index eceea2a918..789a966a45 100644
--- a/bundles/org.eclipse.e4.tools.compat/build.properties
+++ b/bundles/org.eclipse.e4.tools.compat/build.properties
@@ -5,5 +5,4 @@ bin.includes = META-INF/,\
                about.html,\
                OSGI-INF/
 source.. = src/
-jre.compilation.profile = JavaSE-1.7
 src.includes = about.html

From 5efca5238712f8e335b4cf4b90c55d682f5f804c Mon Sep 17 00:00:00 2001
From: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Date: Thu, 12 Jan 2017 01:19:07 +0530
Subject: [PATCH 0973/1286] Bug 509525 - Stop packaging Unix builds

Change-Id: I85443832c1e220f3c81898a0d39e9639200c74ae
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
---
 .../common/$productFileName$.product          | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product b/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
index 45527eb198..a131d5bbea 100644
--- a/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
+++ b/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
@@ -7,8 +7,10 @@
    </configIni>
 
    <launcherArgs>
-      <programArgs>@@programArgs@@</programArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+      <programArgs>@@programArgs@@
+      </programArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+      </vmArgsMac>
    </launcherArgs>
 
    <windowImages/>
@@ -32,13 +34,10 @@
       <plugin id="org.eclipse.core.databinding.property"/>
       <plugin id="org.eclipse.core.expressions"/>
       <plugin id="org.eclipse.core.filesystem"/>
-      <plugin id="org.eclipse.core.filesystem.aix.ppc" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.hpux.ia64_32" fragment="true"/>
       <plugin id="org.eclipse.core.filesystem.linux.ppc" fragment="true"/>
       <plugin id="org.eclipse.core.filesystem.linux.x86" fragment="true"/>
       <plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true"/>
       <plugin id="org.eclipse.core.filesystem.macosx" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.solaris.sparc" fragment="true"/>
       <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
       <plugin id="org.eclipse.core.filesystem.win32.x86_64" fragment="true"/>
       <plugin id="org.eclipse.core.jobs"/>
@@ -82,31 +81,20 @@
       <plugin id="org.eclipse.jface"/>
       <plugin id="org.eclipse.jface.databinding"/>
       <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.compatibility.state"/>
+      <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.swt"/>
-      <plugin id="org.eclipse.swt.carbon.macosx" fragment="true"/>
-      <plugin id="org.eclipse.swt.cocoa.macosx" fragment="true"/>
       <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
       <plugin id="org.eclipse.swt.gtk.linux.ppc" fragment="true"/>
       <plugin id="org.eclipse.swt.gtk.linux.ppc64" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.s390" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.s390x" fragment="true"/>
       <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
       <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.solaris.sparc" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.solaris.x86" fragment="true"/>
-      <plugin id="org.eclipse.swt.motif.aix.ppc" fragment="true"/>
-      <plugin id="org.eclipse.swt.motif.hpux.ia64_32" fragment="true"/>
-      <plugin id="org.eclipse.swt.motif.linux.x86" fragment="true"/>
-      <plugin id="org.eclipse.swt.motif.solaris.sparc" fragment="true"/>
-      <plugin id="org.eclipse.swt.photon.qnx.x86" fragment="true"/>
       <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
       <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
       <plugin id="org.w3c.css.sac"/>
+      <plugin id="org.w3c.dom.events"/>
       <plugin id="org.w3c.dom.smil"/>
       <plugin id="org.w3c.dom.svg"/>
-      <plugin id="org.w3c.dom.events"/>
    </plugins>
 
 

From ae8c52ee04d5e939f7b4583a40cfef16d5856707 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Date: Thu, 12 Jan 2017 16:58:03 +0530
Subject: [PATCH 0974/1286] Bug 509525 - Stop packaging Unix builds

Change-Id: Iba31f8c6302f3bdf62dc9f0e3267f71369038659
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
---
 .../templates/common/$productFileName$.product         | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product b/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
index a131d5bbea..3dab6326c2 100644
--- a/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
+++ b/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
@@ -7,10 +7,8 @@
    </configIni>
 
    <launcherArgs>
-      <programArgs>@@programArgs@@
-      </programArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
-      </vmArgsMac>
+      <programArgs>@@programArgs@@</programArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
    </launcherArgs>
 
    <windowImages/>
@@ -81,7 +79,7 @@
       <plugin id="org.eclipse.jface"/>
       <plugin id="org.eclipse.jface.databinding"/>
       <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
+      <plugin id="org.eclipse.osgi.compatibility.state"/>
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.swt"/>
       <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
@@ -92,9 +90,9 @@
       <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
       <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
       <plugin id="org.w3c.css.sac"/>
-      <plugin id="org.w3c.dom.events"/>
       <plugin id="org.w3c.dom.smil"/>
       <plugin id="org.w3c.dom.svg"/>
+      <plugin id="org.w3c.dom.events"/>
    </plugins>
 
 

From 8201b101bdd42734d21c22c80687554ff836c12e Mon Sep 17 00:00:00 2001
From: Benedikt Kuntz <benkuntz@web.de>
Date: Fri, 13 Jan 2017 10:23:38 +0100
Subject: [PATCH 0975/1286] Bug 510414 - Typo in TypeTextToSearch Message
 properties in XMI tab

Change-Id: I9f1d467c81eb6ebac4a6c5467fe690b1256b49f8
Signed-off-by: Benedikt Kuntz <benkuntz@web.de>
---
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.properties    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 03aedb503b..6b7cf658a1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -16,7 +16,7 @@
 # ******************************************************************************
 
 PartEditor_InputPart=Input Part
-XmiTab_TypeTextToSearch0=type text to search (press <ENTER> to search for next instance)
+XmiTab_TypeTextToSearch=type text to search (press <ENTER> to search for next instance)
 ModelEditor_Import3x=Import 3x
 E4StringPickList_Replace=Replace
 E4StringPickList_NewValue=New Value : 

From 87d8f3935ba7ca326e228e2d5e8783f7467ed0ec Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 12 Jan 2017 12:48:47 +0100
Subject: [PATCH 0976/1286] Bug 510417 - Delete obsolete content of the old e4
 tools wizard which has been moved to PDE

Retires dead template code

Change-Id: I9171c77290a2f4303bd5ec466f2470ef8879a211
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../common/$productFileName$.product          |  99 ------------------
 .../templates/common/icons/sample.png         | Bin 642 -> 0 bytes
 .../templates/common/icons/save_edit.png      | Bin 933 -> 0 bytes
 .../templates/src/handlers/AboutHandler.java  |  23 ----
 .../templates/src/handlers/OpenHandler.java   |  24 -----
 .../templates/src/handlers/QuitHandler.java   |  28 -----
 .../templates/src/handlers/SaveHandler.java   |  32 ------
 .../templates/src/parts/SamplePart.java       |  70 -------------
 8 files changed, 276 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
 delete mode 100644 bundles/org.eclipse.e4.tools/templates/common/icons/sample.png
 delete mode 100644 bundles/org.eclipse.e4.tools/templates/common/icons/save_edit.png
 delete mode 100644 bundles/org.eclipse.e4.tools/templates/src/handlers/AboutHandler.java
 delete mode 100644 bundles/org.eclipse.e4.tools/templates/src/handlers/OpenHandler.java
 delete mode 100644 bundles/org.eclipse.e4.tools/templates/src/handlers/QuitHandler.java
 delete mode 100644 bundles/org.eclipse.e4.tools/templates/src/handlers/SaveHandler.java
 delete mode 100644 bundles/org.eclipse.e4.tools/templates/src/parts/SamplePart.java

diff --git a/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product b/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
deleted file mode 100644
index 3dab6326c2..0000000000
--- a/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="@@projectName@@" id="@@projectName@@.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <programArgs>@@programArgs@@</programArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
-   </launcherArgs>
-
-   <windowImages/>
-
-   <plugins>
-      <plugin id="@@projectName@@"/>
-      <plugin id="com.ibm.icu"/>
-      <plugin id="javax.annotation"/>
-      <plugin id="javax.inject"/>
-      <plugin id="javax.xml"/>
-      <plugin id="org.apache.batik.css"/>
-      <plugin id="org.apache.batik.util"/>
-      <plugin id="org.apache.batik.util.gui"/>
-      <plugin id="org.apache.commons.jxpath"/>
-      <plugin id="org.apache.commons.logging"/>
-      <plugin id="org.eclipse.core.commands"/>
-      <plugin id="org.eclipse.core.contenttype"/>
-      <plugin id="org.eclipse.core.databinding"/>
-      <plugin id="org.eclipse.core.databinding.beans"/>
-      <plugin id="org.eclipse.core.databinding.observable"/>
-      <plugin id="org.eclipse.core.databinding.property"/>
-      <plugin id="org.eclipse.core.expressions"/>
-      <plugin id="org.eclipse.core.filesystem"/>
-      <plugin id="org.eclipse.core.filesystem.linux.ppc" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.linux.x86" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.macosx" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.win32.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.core.resources"/>
-      <plugin id="org.eclipse.core.resources.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
-      <plugin id="org.eclipse.e4.core.commands"/>
-      <plugin id="org.eclipse.e4.core.contexts"/>
-      <plugin id="org.eclipse.e4.core.di"/>
-      <plugin id="org.eclipse.e4.core.di.annotations"/>
-      <plugin id="org.eclipse.e4.core.di.extensions"/>
-      <plugin id="org.eclipse.e4.core.services"/>
-      <plugin id="org.eclipse.e4.emf.xpath"/>
-      <plugin id="org.eclipse.e4.ui.bindings"/>
-      <plugin id="org.eclipse.e4.ui.css.core"/>
-      <plugin id="org.eclipse.e4.ui.css.swt"/>
-      <plugin id="org.eclipse.e4.ui.css.swt.theme"/>
-      <plugin id="org.eclipse.e4.ui.di"/>
-      <plugin id="org.eclipse.e4.ui.model.workbench"/>
-      <plugin id="org.eclipse.e4.ui.services"/>
-      <plugin id="org.eclipse.e4.ui.widgets"/>
-      <plugin id="org.eclipse.e4.ui.workbench"/>
-      <plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
-      <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa"/>
-      <plugin id="org.eclipse.e4.ui.workbench.swt"/>
-      <plugin id="org.eclipse.e4.ui.workbench3"/>
-      <plugin id="org.eclipse.emf.common"/>
-      <plugin id="org.eclipse.emf.databinding"/>
-      <plugin id="org.eclipse.emf.ecore"/>
-      <plugin id="org.eclipse.emf.ecore.change"/>
-      <plugin id="org.eclipse.emf.ecore.xmi"/>
-      <plugin id="org.eclipse.equinox.app"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.concurrent"/>
-      <plugin id="org.eclipse.equinox.ds"/>
-      <plugin id="org.eclipse.equinox.event"/>
-      <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.equinox.util"/>
-      <plugin id="org.eclipse.jface"/>
-      <plugin id="org.eclipse.jface.databinding"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.compatibility.state"/>
-      <plugin id="org.eclipse.osgi.services"/>
-      <plugin id="org.eclipse.swt"/>
-      <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.ppc" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.ppc64" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
-      <plugin id="org.w3c.css.sac"/>
-      <plugin id="org.w3c.dom.smil"/>
-      <plugin id="org.w3c.dom.svg"/>
-      <plugin id="org.w3c.dom.events"/>
-   </plugins>
-
-
-</product>
diff --git a/bundles/org.eclipse.e4.tools/templates/common/icons/sample.png b/bundles/org.eclipse.e4.tools/templates/common/icons/sample.png
deleted file mode 100644
index 932e4518cdae42e5eaa2b38f655b31e155873367..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 642
zcmV-|0)737P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006>Nkl<Zc-muN
zKmv?F0Hl~1Z~#U|CZHT6E=fiv7+YFWSHsjGBGb}1w#(8au31OjBV0&OUIeBT!w{&=
z41)Z!f*wwlbK}G2{7eX+_dg*Ff)m5%|Bnrs`4VVg2^%XXNGTIY7qZPvLV|K4;eP!W
z;=|_tj|`Xu!oOiSB4E;=$biZJlOh-X_i!qo%?dOGsE-+D2s0}SJ41kH>xQ_{+5aQ_
zC;p5IobnHd|D)l55&jc?CPgm#Z>$%R1q~Axuq%}1%xx1w=lqZG>-!D09SffLKhl5F
z-$?(7e}ViLyxgKZV9n84`x*)wpS{hmefTH8?%_Wm{!a+!)!zSC+W!8bqMC~%gMzBF
zYE<OHGf4?+|0Tq&`kN59`agcW>Q74IhJStm6K3-8NeD66xYfF)W*@kpmbL$HYS#XL
zK>9yEoSL=oZ(8>Lze!npcZ*5sDKoeROvp|xJas*{;`;CGvMYac%C7v!hqEE{zr?)5
zha_c9%)#NHBx7n9A3WoKn0M#z2;biS5xzaxu}{z6aG&nKk$(MeIaoL#F~G#c!ph3Z
z!5rw>x(^hM!1(?d6*TRCRM1p({0|hxplGzSOsfDTA0{SdR#-w}6ctvI2Wq|-7cvW!
z7XCsK(d6HV1U2!0Qp5sKLR!bp#?6eJkl^`1SWsRzz@ud|DCvTdFvvym!1Mu1*1#0{
z&E7Jj3z(Eyp!tCjYi43*W@AuMw6+Fjq6RmIlEseJIdg#-t3XOZM-@HqV9Sw=kc@&i
cJELd@0Km0g2{wxuo&W#<07*qoM6N<$g5ZTN)c^nh

diff --git a/bundles/org.eclipse.e4.tools/templates/common/icons/save_edit.png b/bundles/org.eclipse.e4.tools/templates/common/icons/save_edit.png
deleted file mode 100644
index 2c598e5aef10055fd508a52964ecac7ad00ef2a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 933
zcmV;W16urvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV000AQNkl<Zc-m!=
z>u-})9LJv*F1{ejHrkmuH!p|^iHwD$_&@NHS7;!bkjOHl@dY|yD$2Nsfx$K)s4=Bo
zuj_7YN4u_F*?R9NtXsRacD?UupZ00Hc5M-GPrn}aq6R(5C%=>L`ToA=cXB9-td|-Z
zsK(}9uk37UZsN7Hv^Dei?ae&ie`(vr=eP6t{MJ{SnsyTZj_17;ujRGI@2_5;85B#|
z+cL$5_WnF(oo<+23;)C9bYawBtPyX1KrCgtd(I3|dpkN0jhU@r^F^#BXy`3gJp218
zs()4MR32CG^w|^Siv>)P3)qbkBFPl431y&m@B2`oG|X?6t53F~G*eU0-bb-qK{!d*
z2_@E%%&?%dEGCTRTCx1N#^g%1zT3hr60lz&(OHlyR=Hq|hH82SY^jQLzEmfbD<WH}
zAVM=x>J7*g%7~})`017i)H{3k3q(^EF!>7SUrR!!)gzWI;bAaZ=RqI>Uo3@{cp4JT
zJ<#kX!s|KwFeC=`_6Hq;Kh##NXUp7TFagno1_^fK1>)HP=)xv^(FBBJYQ&i$f^inT
zH-<sIMFM^uw<4M<aSv7#xGB1eMVAUoZWX-lf2-d!in&=C?#NXL(?$5g8T9l^K)v~X
zhv3$z4S`sm^G9=#O_?wxmg0BC2!2y2UtmBafzIkdXnhlpf@z$(Dh1X4-T}d&(uU<Q
z%Pod-SdAC)D8$0J5U*o!#bEX%$P)_iM>nt>$zfqNjjykeZ)_t0{W3cq{+Z=G!7QBq
zG`<}$;HxWIeABNZ=<(f6Bf2h3;+n((Z#YN1EF8WRzPv04^~Rn9f?p(dxK<d>Lk=|7
zHGJMTi6t^kfK20DPC=?$!n7m0tvgpTa0jxO_tNOTNCH~l?G#+PYln3y#X0;LOwN;l
z3mOQgV;D9ia6{$CXFpD0aBKx%T-K7tH0(YGCQlM4&nrN^zPs~KpU_dWcvGC+m%;d4
z2wj&n&@H54^0JT^*U<g54pI}TM4wws!?Mi4NCHlrlXFz-o`VO^-myVri`1swNr?3U
zGMWlDn*k2T3`}M{<l~c2>+a#?MK!ec81(K0l%^m~oL7T-c}HWzkyFDn$9q*c-aE2&
ztak*ToKfOvk9?btPs@p}*xo<ai3i8dD!EV3Y4FkEuG9YjAc*EtH2BH&00000NkvXX
Hu0mjfqjte?

diff --git a/bundles/org.eclipse.e4.tools/templates/src/handlers/AboutHandler.java b/bundles/org.eclipse.e4.tools/templates/src/handlers/AboutHandler.java
deleted file mode 100644
index df0b8ed642..0000000000
--- a/bundles/org.eclipse.e4.tools/templates/src/handlers/AboutHandler.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 - 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     IBM Corporation - initial API and implementation
- *     Lars Vogel <lars.Vogel@gmail.com> - Bug 419770
- *******************************************************************************/
-package @@packageName@@;
-
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
-
-public class AboutHandler {
-	@Execute
-	public void execute(Shell shell) {
-		MessageDialog.openInformation(shell, "About", "Eclipse 4 Application example.");
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools/templates/src/handlers/OpenHandler.java b/bundles/org.eclipse.e4.tools/templates/src/handlers/OpenHandler.java
deleted file mode 100644
index fe13432bd7..0000000000
--- a/bundles/org.eclipse.e4.tools/templates/src/handlers/OpenHandler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     IBM Corporation - initial API and implementation
- *     Lars Vogel <lars.Vogel@gmail.com> - Bug 419770
- *******************************************************************************/
-package @@packageName@@;
-
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Shell;
-public class OpenHandler {
-
-	@Execute
-	public void execute(Shell shell){
-		FileDialog dialog = new FileDialog(shell);
-		dialog.open();
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools/templates/src/handlers/QuitHandler.java b/bundles/org.eclipse.e4.tools/templates/src/handlers/QuitHandler.java
deleted file mode 100644
index 3b1929b5c0..0000000000
--- a/bundles/org.eclipse.e4.tools/templates/src/handlers/QuitHandler.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 - 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     IBM Corporation - initial API and implementation
- *     Lars Vogel <lars.Vogel@gmail.com> - Bug 419770
- *******************************************************************************/
-package @@packageName@@;
-
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.e4.ui.workbench.IWorkbench;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
-
-
-public class QuitHandler {
-	@Execute
-	public void execute(IWorkbench workbench, Shell shell){
-		if (MessageDialog.openConfirm(shell, "Confirmation",
-				"Do you want to exit?")) {
-			workbench.close();
-		}
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools/templates/src/handlers/SaveHandler.java b/bundles/org.eclipse.e4.tools/templates/src/handlers/SaveHandler.java
deleted file mode 100644
index 1127141ead..0000000000
--- a/bundles/org.eclipse.e4.tools/templates/src/handlers/SaveHandler.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 - 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     IBM Corporation - initial API and implementation
- *     Lars Vogel <lars.Vogel@gmail.com> - Bug 419770
- *******************************************************************************/
-package @@packageName@@;
-
-import org.eclipse.e4.core.di.annotations.CanExecute;
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.e4.ui.workbench.modeling.EPartService;
-
-public class SaveHandler {
-
-	@CanExecute
-	public boolean canExecute(EPartService partService) {
-		if (partService != null) {
-			return !partService.getDirtyParts().isEmpty();
-		}
-		return false;
-	}
-
-	@Execute
-	public void execute(EPartService partService) {
-		partService.saveAll(false);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/templates/src/parts/SamplePart.java b/bundles/org.eclipse.e4.tools/templates/src/parts/SamplePart.java
deleted file mode 100644
index 28ae4816f7..0000000000
--- a/bundles/org.eclipse.e4.tools/templates/src/parts/SamplePart.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 - 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- *     IBM Corporation - initial API and implementation
- *     Lars Vogel <lars.Vogel@gmail.com> - Bug 419770
- *******************************************************************************/
-package @@packageName2@@;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
-import org.eclipse.e4.ui.di.Focus;
-import org.eclipse.e4.ui.di.Persist;
-import org.eclipse.e4.ui.model.application.ui.MDirtyable;
-import org.eclipse.jface.viewers.TableViewer;
-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.Text;
-
-public class SamplePart {
-
-	private Text txtInput;
-	private TableViewer tableViewer;
-
-	@Inject
-	private MDirtyable dirty;
-
-	@PostConstruct
-	public void createComposite(Composite parent) {
-		parent.setLayout(new GridLayout(1, false));
-
-		txtInput = new Text(parent, SWT.BORDER);
-		txtInput.setMessage("Enter text to mark part as dirty");
-		txtInput.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				dirty.setDirty(true);
-			}
-		});
-		txtInput.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		tableViewer = new TableViewer(parent);
-
-		tableViewer.add("Sample item 1");
-		tableViewer.add("Sample item 2");
-		tableViewer.add("Sample item 3");
-		tableViewer.add("Sample item 4");
-		tableViewer.add("Sample item 5");
-		tableViewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
-	}
-
-	@Focus
-	public void setFocus() {
-		tableViewer.getTable().setFocus();
-	}
-
-	@Persist
-	public void save() {
-		dirty.setDirty(false);
-	}
-}
\ No newline at end of file

From e856c8fed64ccd60c2ee4eff1038c428d788239b Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Thu, 22 Dec 2016 16:49:50 +0100
Subject: [PATCH 0977/1286] Bug 509553 - [Editors] The E4PickList buttons
 should not contain text

Text is now in tooltip and it is really better ! Forgot the replace for
'supplementary' tab

Change-Id: I3359dabdbee151cdd21377d972f31b23f368ab6c
---
 .../e4/tools/emf/ui/internal/common/AbstractPickList.java | 8 ++++----
 .../e4/tools/emf/ui/internal/common/E4StringPickList.java | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index 2327665b17..17cece3789 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -126,7 +126,7 @@ public void open(OpenEvent event) {
 		});
 
 		tiAdd = new Button(toolBar, SWT.PUSH);
-		tiAdd.setText(messages.ModelTooling_Common_AddEllipsis);
+		tiAdd.setToolTipText(messages.ModelTooling_Common_AddEllipsis);
 		tiAdd.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		tiAdd.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_table_add));
 		tiAdd.setFont(getButtonFont());
@@ -139,7 +139,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		tiRemove = new Button(toolBar, SWT.PUSH);
 		tiRemove.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-		tiRemove.setText(messages.ModelTooling_Common_Remove);
+		tiRemove.setToolTipText(messages.ModelTooling_Common_Remove);
 		tiRemove.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_table_delete));
 		tiRemove.setFont(getButtonFont());
 		tiRemove.addSelectionListener(new SelectionAdapter() {
@@ -151,7 +151,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		tiDown = new Button(toolBar, SWT.PUSH);
 		tiDown.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-		tiDown.setText(messages.ModelTooling_Common_Down);
+		tiDown.setToolTipText(messages.ModelTooling_Common_Down);
 		tiDown.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_arrow_down));
 		tiDown.setFont(getButtonFont());
 		tiDown.addSelectionListener(new SelectionAdapter() {
@@ -163,7 +163,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		tiUp = new Button(toolBar, SWT.PUSH);
 		tiUp.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-		tiUp.setText(messages.ModelTooling_Common_Up);
+		tiUp.setToolTipText(messages.ModelTooling_Common_Up);
 		tiUp.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_arrow_up));
 		tiUp.setFont(getButtonFont());
 		tiUp.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
index f86fa915cc..dbcb180676 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
@@ -65,12 +65,12 @@ public E4StringPickList(Composite parent, int flags, List<PickListFeatures> list
 		// TODO does not respect NO_ORDER yet
 
 		tiReplace = new Button(getToolBar(), SWT.PUSH);
-		tiReplace.setText(messages.E4StringPickList_Replace);
+		tiReplace.setToolTipText(messages.E4StringPickList_Replace);
 		tiReplace.setImage(editor.createImage(ResourceProvider.IMG_Obj16_world_edit));
 		tiReplace.setFont(getButtonFont());
 
 		Composite valueParent = new Composite(getToolBar().getParent(), SWT.BORDER);
-		valueParent.setLayout(new GridLayout(2, false));
+		valueParent.setLayout(new GridLayout(5, false));
 		valueParent.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
 
 		Label l = new Label(valueParent, SWT.NONE);

From 25d18d3c7f01fcc6c92fd7f3a56eb9a96e8c1ed6 Mon Sep 17 00:00:00 2001
From: Simon Scholz <simon.scholz@vogella.com>
Date: Wed, 21 Dec 2016 17:12:08 +0100
Subject: [PATCH 0978/1286] Bug 484398 - Create a programmatic way to define
 core expressions

* Changed the name to imperative expression
* Added tracking property to editor

Change-Id: I4a749962cd8176973f549e5b80f503afc73aef42
Signed-off-by: Simon Scholz <simon.scholz@vogella.com>
---
 .../plugin.xml                                |   3 +
 ...mperativeExpressionContributionEditor.java | 139 ++++++++++++
 .../e4/tools/emf/ui/internal/Messages.java    |   4 +
 .../tools/emf/ui/internal/Messages.properties |   4 +
 .../emf/ui/internal/common/ModelEditor.java   |   3 +
 .../component/ImperativeExpressionEditor.java | 210 ++++++++++++++++++
 .../internal/common/component/MenuEditor.java |   1 +
 .../common/component/MenuItemEditor.java      |   1 +
 .../common/component/ToolItemEditor.java      |   1 +
 .../eclipse/e4/internal/tools/Messages.java   |   3 +
 .../e4/internal/tools/messages.properties     |   3 +
 .../NewImperativeExpressionClassWizard.java   | 110 +++++++++
 .../ImperativeExpressionTemplate.java         |  52 +++++
 13 files changed, 534 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ImperativeExpressionContributionEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java
 create mode 100644 bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
index 95ff227462..0eb33e74f4 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
@@ -29,6 +29,9 @@
       <contributionClassCreator
             class="org.eclipse.e4.tools.emf.editor3x.extension.ToolControlContributionEditor">
       </contributionClassCreator>
+      <contributionClassCreator
+            class="org.eclipse.e4.tools.emf.editor3x.extension.ImperativeExpressionContributionEditor">
+      </contributionClassCreator>
    </extension>
    <extension
          point="org.eclipse.ui.preferencePages">
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ImperativeExpressionContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ImperativeExpressionContributionEditor.java
new file mode 100644
index 0000000000..a08260df4f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ImperativeExpressionContributionEditor.java
@@ -0,0 +1,139 @@
+/*******************************************************************************
+ * Copyright (c) 2016 vogella GmbH and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ * Simon Scholz <simon.scholz@vogella.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.editor3x.extension;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.e4.internal.tools.wizards.classes.NewImperativeExpressionClassWizard;
+import org.eclipse.e4.tools.emf.editor3x.Messages;
+import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
+import org.eclipse.e4.ui.model.application.MContribution;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PartInitException;
+
+@SuppressWarnings("restriction")
+public class ImperativeExpressionContributionEditor implements IContributionClassCreator {
+	@Override
+	public void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell) {
+		createOpen(contribution, domain, project, shell, false);
+	}
+
+	private void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell,
+			boolean forceNew) {
+		if (forceNew || contribution.getContributionURI() == null
+				|| contribution.getContributionURI().trim().length() == 0
+				|| !contribution.getContributionURI().startsWith("bundleclass:")) { //$NON-NLS-1$
+			NewImperativeExpressionClassWizard wizard = new NewImperativeExpressionClassWizard(contribution.getContributionURI());
+			wizard.init(null, new StructuredSelection(project));
+			WizardDialog dialog = new WizardDialog(shell, wizard);
+			if (dialog.open() == Window.OK) {
+				final IFile f = wizard.getFile();
+				final ICompilationUnit el = JavaCore.createCompilationUnitFrom(f);
+				try {
+					String fullyQualified;
+					if (el.getPackageDeclarations() != null && el.getPackageDeclarations().length > 0) {
+						final String packageName = el.getPackageDeclarations()[0].getElementName();
+						final String className = wizard.getDomainClass().getName();
+						if (packageName.trim().length() > 0) {
+							fullyQualified = packageName + "." + className; //$NON-NLS-1$
+						} else {
+							fullyQualified = className;
+						}
+					} else {
+						fullyQualified = wizard.getDomainClass().getName();
+					}
+
+					final Command cmd = SetCommand.create(domain, contribution,
+							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
+							"bundleclass://" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified); //$NON-NLS-1$//$NON-NLS-2$
+					if (cmd.canExecute()) {
+						domain.getCommandStack().execute(cmd);
+					}
+				} catch (final JavaModelException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		} else {
+			final URI uri = URI.createURI(contribution.getContributionURI());
+			if (uri.hasAuthority() && uri.segmentCount() == 1) {
+				final String symbolicName = uri.authority();
+				final String fullyQualified = uri.segment(0);
+				IProject p = ResourcesPlugin.getWorkspace().getRoot()
+						.getProject(symbolicName);
+
+				if (!p.exists()) {
+					for (final IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
+						final String name = Util.getBundleSymbolicName(check);
+						if (symbolicName.equals(name)) {
+							p = check;
+							break;
+						}
+					}
+				}
+
+				// TODO If this is not a WS-Resource we need to open differently
+				if (p != null) {
+					final IJavaProject jp = JavaCore.create(p);
+					IType t = null;
+					try {
+						if (p.exists()) {
+							t = jp.findType(fullyQualified);
+						}
+						else
+						{
+							final IJavaProject pprim = JavaCore.create(project);
+							t = pprim.findType(fullyQualified);
+						}
+						if (t != null) {
+							JavaUI.openInEditor(t);
+						} else {
+							createOpen(contribution, domain, project, shell, true);
+						}
+					} catch (final JavaModelException e) {
+						createOpen(contribution, domain, project, shell, true);
+					} catch (final PartInitException e) {
+						MessageDialog.openError(shell, Messages.ContributionEditor_FailedToOpenEditor, e.getMessage());
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+			} else {
+				MessageDialog.openError(shell, Messages.ContributionEditor_InvalidURL,
+						Messages.ContributionEditor_CurrentURLIsInvalid);
+			}
+		}
+	}
+
+	@Override
+	public boolean isSupported(EClass element) {
+		return Util.isTypeOrSuper(UiPackageImpl.Literals.IMPERATIVE_EXPRESSION, element);
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 705731e782..68def5f837 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -678,6 +678,10 @@ public class Messages {
 	public String CoreExpressionEditor_TreeLabelDescription;
 	public String CoreExpressionEditor_ExpressionId;
 
+	public String ImperativeExpressionEditor_TreeLabel;
+	public String ImperativeExpressionEditor_TreeLabelDescription;
+	public String ImperativeExpressionEditor_TrackingLabel;
+
 	public String ExpressionIdDialog_ShellTitle;
 	public String ExpressionIdDialog_DialogTitle;
 	public String ExpressionIdDialog_DialogMessage;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 6b7cf658a1..e5c7249c29 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -685,6 +685,10 @@ CoreExpressionEditor_TreeLabel=Core Expression
 CoreExpressionEditor_TreeLabelDescription=Core Expression
 CoreExpressionEditor_ExpressionId=Expression ID
 
+ImperativeExpressionEditor_TreeLabel=Imperative Expression
+ImperativeExpressionEditor_TreeLabelDescription=Imperative Expression
+ImperativeExpressionEditor_TrackingLabel=Tracking
+
 ExpressionIdDialog_ShellTitle=Find Expression ID
 ExpressionIdDialog_DialogTitle=Find Expression ID
 ExpressionIdDialog_DialogMessage=Find the expression ID defined through the 'org.eclipse.core.expressions.definitions' extension point
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 0c9706c0e4..6fd042ab82 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -91,6 +91,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledMenuItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.HandlerEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ImperativeExpressionEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.KeyBindingEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuContributionEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuEditor;
@@ -1368,6 +1369,8 @@ private void registerDefaultEditors() {
 
 		registerEditor(UiPackageImpl.Literals.CORE_EXPRESSION,
 				ContextInjectionFactory.make(CoreExpressionEditor.class, context));
+		registerEditor(UiPackageImpl.Literals.IMPERATIVE_EXPRESSION,
+				ContextInjectionFactory.make(ImperativeExpressionEditor.class, context));
 
 		registerEditor(BasicPackageImpl.Literals.COMPOSITE_PART,
 				ContextInjectionFactory.make(CompositePartEditor.class, context));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
new file mode 100644
index 0000000000..90406f433a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
@@ -0,0 +1,210 @@
+/*******************************************************************************
+ * Copyright (c) 2016 vogella GmbH and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ * Simon Scholz <simon.scholz@vogella.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import javax.inject.Inject;
+
+import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.UpdateValueStrategy;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
+import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
+import org.eclipse.e4.ui.model.application.MContribution;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MImperativeExpression;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.jface.databinding.swt.ISWTObservableValue;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
+import org.eclipse.swt.widgets.Text;
+
+public class ImperativeExpressionEditor extends AbstractComponentEditor {
+	private Composite composite;
+	private EMFDataBindingContext context;
+
+	@Inject
+	IEclipseContext eclipseContext;
+
+	@Inject
+	public ImperativeExpressionEditor() {
+		super();
+	}
+
+	@Override
+	public Image getImage(Object element) {
+		return getImage(element, ResourceProvider.IMG_Obj16_class_obj);
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.ImperativeExpressionEditor_TreeLabel;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		String contributionURI = ((MImperativeExpression) element).getContributionURI();
+		if (contributionURI != null && contributionURI.trim().length() > 0) {
+			int lastIndexOf = contributionURI.lastIndexOf("."); //$NON-NLS-1$
+			if (contributionURI.length() > lastIndexOf + 1) {
+				return contributionURI.substring(lastIndexOf + 1);
+			}
+			return contributionURI;
+		}
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return Messages.CoreExpressionEditor_TreeLabelDescription;
+	}
+
+	@Override
+	public Composite doGetEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			composite = new Composite(parent, SWT.NONE);
+			composite.setLayout(new FillLayout());
+			createForm(composite, context, getMaster());
+		}
+		getMaster().setValue(object);
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		final Link lnk;
+		{
+			final IContributionClassCreator c = getEditor()
+					.getContributionCreator(UiPackageImpl.Literals.IMPERATIVE_EXPRESSION);
+			if (project != null && c != null) {
+				lnk = new Link(parent, SWT.NONE);
+				lnk.setText("<A>" + Messages.HandlerEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
+				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+				lnk.addSelectionListener(new SelectionAdapter() {
+					@Override
+					public void widgetSelected(SelectionEvent e) {
+						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project,
+								lnk.getShell());
+					}
+				});
+			} else {
+				lnk = null;
+				final Label l = new Label(parent, SWT.NONE);
+				l.setText(Messages.HandlerEditor_ClassURI);
+				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			}
+
+			final Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			t.addModifyListener(new ModifyListener() {
+
+				@Override
+				public void modifyText(ModifyEvent e) {
+					if (lnk != null) {
+						lnk.setToolTipText(((Text) e.getSource()).getText());
+					}
+				}
+			});
+			final Binding binding = context.bindValue(textProp.observeDelayed(200, t),
+					EMFEditProperties
+					.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI)
+					.observeDetail(getMaster()),
+					new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+					new UpdateValueStrategy());
+			Util.addDecoration(t, binding);
+
+			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
+			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
+							getEditingDomain(), (MContribution) getMaster().getValue(),
+							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
+					dialog.open();
+				}
+			});
+
+			final Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.ImperativeExpressionEditor_TrackingLabel);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+
+			Button trackingButton = new Button(parent, SWT.CHECK);
+			ISWTObservableValue observeTrackingSelection = WidgetProperties.selection().observe(trackingButton);
+			context.bindValue(observeTrackingSelection,
+					EMFEditProperties
+					.value(getEditingDomain(), UiPackageImpl.Literals.IMPERATIVE_EXPRESSION__TRACKING)
+					.observeDetail(getMaster()));
+		}
+
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+
+		createContributedEditorTabs(folder, context, getMaster(), MImperativeExpression.class);
+
+		folder.setSelection(0);
+
+		return folder;
+	}
+
+	@Override
+	public IObservableList getChildList(Object element) {
+		return null;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index c511ebaee4..f6bb19285f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -339,6 +339,7 @@ public String getText(Object element) {
 			final List<Object> list = new ArrayList<>();
 			list.add(Messages.MenuItemEditor_NoExpression);
 			list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
+			list.add(UiPackageImpl.Literals.IMPERATIVE_EXPRESSION);
 			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION,
 					UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
 			combo.setInput(list);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 7b533fa389..552705283e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -306,6 +306,7 @@ public String getText(Object element) {
 			final List<Object> list = new ArrayList<>();
 			list.add(Messages.MenuItemEditor_NoExpression);
 			list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
+			list.add(UiPackageImpl.Literals.IMPERATIVE_EXPRESSION);
 			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION,
 					UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
 			combo.setInput(list);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 32f300a00e..0fc349a156 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -315,6 +315,7 @@ public String getText(Object element) {
 			final List<Object> list = new ArrayList<>();
 			list.add(Messages.ToolItemEditor_NoExpression);
 			list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
+			list.add(UiPackageImpl.Literals.IMPERATIVE_EXPRESSION);
 			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
 			combo.setInput(list);
 			context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)), new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
index 5d0840c5be..70551d861d 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
@@ -73,6 +73,9 @@ public class Messages extends NLS {
 	public static String NewHandlerClassWizard_CreateNewHandler;
 	public static String NewHandlerClassWizard_ExecuteMethod;
 	public static String NewHandlerClassWizard_NewHandler;
+	public static String NewImperativeExpressionClassWizard_CreateNewImperativeExpression;
+	public static String NewImperativeExpressionClassWizard_EvaluateMethod;
+	public static String NewImperativeExpressionClassWizard_NewImperativeExpression;
 	public static String NewModelFilePage_Browse;
 	public static String NewModelFilePage_Container;
 	public static String NewModelFilePage_FileContainerMustBeSpecified;
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
index 7bd9193b62..33c49ca075 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
@@ -53,6 +53,9 @@ NewHandlerClassWizard_CanExecuteMethod=Can-Execute Method
 NewHandlerClassWizard_CreateNewHandler=Create a new handler class
 NewHandlerClassWizard_ExecuteMethod=Execute Method
 NewHandlerClassWizard_NewHandler=New Handler
+NewImperativeExpressionClassWizard_CreateNewImperativeExpression=Create a new Imperative expression class
+NewImperativeExpressionClassWizard_EvaluateMethod=Evaluate method
+NewImperativeExpressionClassWizard_NewImperativeExpression=New Imperative Expression
 NewModelFilePage_Browse=Browse...
 NewModelFilePage_Container=&Container:
 NewModelFilePage_FileContainerMustBeSpecified=File container must be specified
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java
new file mode 100644
index 0000000000..cad413b4a4
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java
@@ -0,0 +1,110 @@
+/*******************************************************************************
+ * Copyright (c) 2016 vogella GmbH and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ * Simon Scholz <simon.scholz@vogella.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.classes;
+
+import java.util.Set;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.e4.internal.tools.Messages;
+import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
+import org.eclipse.e4.internal.tools.wizards.classes.templates.ImperativeExpressionTemplate;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class NewImperativeExpressionClassWizard extends AbstractNewClassWizard {
+	private static final String EVALUATE_METHOD_NAME = "evaluateMethodName"; //$NON-NLS-1$
+
+	private String initialString;
+
+	public NewImperativeExpressionClassWizard(String contributionURI) {
+		initialString = contributionURI;
+	}
+
+	public NewImperativeExpressionClassWizard() {
+		// Intentially left empty
+	}
+
+	@Override
+	protected String getContent() {
+		final ImperativeExpressionTemplate template = new ImperativeExpressionTemplate();
+		return template.generate(getDomainClass());
+	}
+
+	@Override
+	public void addPages() {
+		addPage(new AbstractNewClassPage(
+				"Classinformation", //$NON-NLS-1$
+				Messages.NewImperativeExpressionClassWizard_NewImperativeExpression,
+				Messages.NewImperativeExpressionClassWizard_CreateNewImperativeExpression, root,
+				ResourcesPlugin.getWorkspace().getRoot(),
+				initialString) {
+
+			@Override
+			protected JavaClass createInstance() {
+				return new ImperativeExpressionClass(root);
+			}
+
+			@Override
+			protected void createFields(Composite parent, DataBindingContext dbc) {
+				final IWidgetValueProperty textProp = WidgetProperties
+						.text(SWT.Modify);
+
+				{
+					Label l = new Label(parent, SWT.NONE);
+					l.setText(Messages.NewImperativeExpressionClassWizard_EvaluateMethod);
+
+					final Text t = new Text(parent, SWT.BORDER);
+					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+					dbc.bindValue(
+							textProp.observe(t),
+							BeanProperties.value(EVALUATE_METHOD_NAME).observe(
+									getClazz()));
+
+					l = new Label(parent, SWT.NONE);
+				}
+			}
+		});
+	}
+
+	@Override
+	protected Set<String> getRequiredBundles() {
+		final Set<String> set = super.getRequiredBundles();
+		set.add("org.eclipse.e4.core.di"); //$NON-NLS-1$
+		return set;
+	}
+
+	public static class ImperativeExpressionClass extends JavaClass {
+		private String evaluateMethodName = "evaluate"; //$NON-NLS-1$
+
+		public ImperativeExpressionClass(IPackageFragmentRoot root) {
+			super(root);
+		}
+
+		public String getEvaluateMethodName() {
+			return evaluateMethodName;
+		}
+
+		public void setEvaluateMethodName(String evaluateMethodName) {
+			support.firePropertyChange(EVALUATE_METHOD_NAME,
+					this.evaluateMethodName,
+					this.evaluateMethodName = evaluateMethodName);
+		}
+
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java
new file mode 100644
index 0000000000..9ddc13792b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2016 vogella GmbH and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ * Simon Scholz <simon.scholz@vogella.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.internal.tools.wizards.classes.templates;
+
+import org.eclipse.e4.internal.tools.wizards.classes.NewImperativeExpressionClassWizard.ImperativeExpressionClass;
+
+public class ImperativeExpressionTemplate
+{
+	protected static String nl;
+	public static synchronized ImperativeExpressionTemplate create(String lineSeparator)
+	{
+		nl = lineSeparator;
+		ImperativeExpressionTemplate result = new ImperativeExpressionTemplate();
+		nl = null;
+		return result;
+	}
+
+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+	protected final String TEXT_1 = " ";
+	protected final String TEXT_2 = NL + "package ";
+	protected final String TEXT_3 = ";";
+	protected final String TEXT_4 = NL + NL
+			+ "import org.eclipse.e4.core.di.annotations.Evaluate;" + NL + NL + "public class ";
+	protected final String TEXT_7 = " {" + NL + "\t@Evaluate" + NL + "\tpublic boolean ";
+	protected final String TEXT_8 = "() {" + NL + "\t\treturn true;" + NL + "\t}" + NL + "}" + NL;
+
+	public String generate(Object argument)
+	{
+		final StringBuffer stringBuffer = new StringBuffer();
+		ImperativeExpressionClass domainClass = (ImperativeExpressionClass) argument;
+		stringBuffer.append(TEXT_1);
+		if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
+			stringBuffer.append(TEXT_2);
+			stringBuffer.append( domainClass.getPackageFragment().getElementName() );
+			stringBuffer.append(TEXT_3);
+		}
+		stringBuffer.append(TEXT_4);
+		stringBuffer.append( domainClass.getName() );
+		stringBuffer.append(TEXT_7);
+		stringBuffer.append(domainClass.getEvaluateMethodName());
+		stringBuffer.append(TEXT_8);
+		return stringBuffer.toString();
+	}
+}

From c3d23202f59838f4804d92bd3b2bce6e7ff19126 Mon Sep 17 00:00:00 2001
From: Tommy Redel <redel@subshell.com>
Date: Fri, 10 Mar 2017 21:05:53 +0100
Subject: [PATCH 0979/1286] Bug 513490 - Fixed Cut/Copy/Paste for Filtertext of
 XmiTab

Change-Id: I58f6da8e59c4a3897d33ad4c41b4864b5f941d47
Signed-off-by: Tommy Redel <redel@subshell.com>
---
 .../common/component/tabs/XmiTab.java         | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
index 7887ffc4ba..6c6dad2488 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
@@ -82,7 +82,6 @@ public XmiTab(Composite parent) {
 
 	@PostConstruct
 	protected void postConstruct() {
-
 		text = new Text(this, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
 		text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 		text.setMessage(Messages.XmiTab_TypeTextToSearch);
@@ -108,14 +107,13 @@ public void keyPressed(KeyEvent e) {
 
 		final IDocument document = emfDocumentProvider.getDocument();
 		final IDocumentPartitioner partitioner = new FastPartitioner(new XMLPartitionScanner(), new String[] {
-			XMLPartitionScanner.XML_TAG, XMLPartitionScanner.XML_COMMENT });
+				XMLPartitionScanner.XML_TAG, XMLPartitionScanner.XML_COMMENT });
 		partitioner.connect(document);
 		document.setDocumentPartitioner(partitioner);
 		sourceViewer.setDocument(document);
 		verticalRuler.setModel(model);
 
 		emfDocumentProvider.setValidationChangedCallback(new Runnable() {
-
 			@Override
 			public void run() {
 				model.removeAllAnnotations();
@@ -135,7 +133,7 @@ public void run() {
 		});
 
 		final String property = System
-			.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
+				.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
 		if (property != null || preferences.getBoolean("tab-form-search-show", false)) { //$NON-NLS-1$
 			sourceViewer.setEditable(false);
 			sourceViewer.getTextWidget().setEnabled(false);
@@ -183,14 +181,31 @@ public void gotoEObject(EObject object) {
 	}
 
 	public void paste() {
-		sourceViewer.getTextWidget().paste();
+		if (isFilterTextFocused()) {
+			text.paste();
+		} else {
+			sourceViewer.getTextWidget().paste();
+		}
 	}
 
 	public void copy() {
-		sourceViewer.getTextWidget().copy();
+		if (isFilterTextFocused()) {
+			text.copy();
+		} else {
+			sourceViewer.getTextWidget().copy();
+		}
 	}
 
 	public void cut() {
-		sourceViewer.getTextWidget().cut();
+		if (isFilterTextFocused()) {
+			text.cut();
+		} else {
+			sourceViewer.getTextWidget().cut();
+		}
 	}
+
+	private boolean isFilterTextFocused() {
+		return text.isFocusControl();
+	}
+
 }

From 56dcd92adf2982887cb00eac4b3a7901f784bdc9 Mon Sep 17 00:00:00 2001
From: Tommy Redel <redel@subshell.com>
Date: Fri, 10 Mar 2017 21:44:36 +0100
Subject: [PATCH 0980/1286] Bug 513493 - added place holder/message text for
 the filter text widget

Change-Id: I2376a4b54099bbe6e0d04603be386da2f63b3591
Signed-off-by: Tommy Redel <redel@subshell.com>
---
 .../emf/ui/internal/common/component/tabs/messages.properties    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties
index 69b1b868c4..a68721386c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties
@@ -4,3 +4,4 @@ TitleAreaFilterDialogWithEmptyOptions_excludeEmptyValues=Exclude Empty Values
 TitleAreaFilterDialogWithEmptyOptions_includeEmptyValues=Include Empty Values
 TitleAreaFilterDialogWithEmptyOptions_onlyEmptyValues=Only Empty Values
 EmfUtil_ex_attribute_not_found=Attribute not found
+XmiTab_TypeTextToSearch=Type text to search
\ No newline at end of file

From 5c76b286915778b1caba92cac9562ebdc5d61659 Mon Sep 17 00:00:00 2001
From: Sopot Cela <scela@redhat.com>
Date: Wed, 12 Apr 2017 10:58:10 +0200
Subject: [PATCH 0981/1286] Bug 515159 - Fix 'unlikely argument type' compiler
 warnings

Change-Id: Id189963e084d59c1adb3c26d9a3cca4d12609db0
Signed-off-by: Sopot Cela <scela@redhat.com>
---
 .../tools/emf/ui/internal/common/component/tabs/ListTab.java | 2 +-
 .../internal/tools/wizards/model/FragmentExtractHelper.java  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index acbbf6d6f2..a146115af4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -804,7 +804,7 @@ protected Control createContents(Composite parent) {
 	private EAttributeTableViewerColumn addColumn(String attName) {
 		EAttributeTableViewerColumn colName = defaultColumns.get(attName);
 		if (colName == null) {
-			colName = optionalColumns.get(colName);
+			colName = optionalColumns.get(attName);
 			if (colName == null) {
 				colName = new EAttributeTableViewerColumn_Markable(tvResults, attName, attName, context);
 				optionalColumns.put(attName, colName);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
index a01633bff1..d35d4ba4ad 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
@@ -50,7 +50,10 @@ public static void resolveImports(MApplicationElement moe, Map<MApplicationEleme
 		{
 			final EObject objectToBeImported = (EObject) featureIterator.next();
 			final EReference eReference = (EReference)featureIterator.feature();
-			MApplicationElement alreadyImportedElement = importedElements.get(objectToBeImported);
+			MApplicationElement alreadyImportedElement = null;
+			if (objectToBeImported instanceof MApplicationElement) {
+				alreadyImportedElement = importedElements.get((MApplicationElement) objectToBeImported);
+			}
 			if(alreadyImportedElement==null){
 				alreadyImportedElement = (MApplicationElement) EcoreUtil.copy(objectToBeImported);
 				importedElements.put((MApplicationElement) objectToBeImported, alreadyImportedElement);

From 6654c8f98bbcf07bc814c55b567973f9ae7e077a Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 11 May 2017 11:17:45 +0200
Subject: [PATCH 0982/1286] Bug 516466 - Model spy throws NotDefinedException

Change-Id: I6d70e5fc5949e11b47e296567ef0b2e15f323821
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../fragment.e4xmi                            | 22 ++-----------------
 .../org.eclipse.e4.tools.emf.ui/plugin.xml    |  1 +
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi b/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
index 9c5b109bf7..edea1fe2d1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
+++ b/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_GxnD8Ly2EeOxWJvPH-7sUQ">
-  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_Kmj8QLy2EeOxWJvPH-7sUQ" featurename="commands" parentElementId="org.eclipse.e4.legacy.ide.application">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_Kmj8QLy2EeOxWJvPH-7sUQ" featurename="commands" parentElementId="xpath:/">
     <elements xsi:type="commands:Command" xmi:id="_RRp7QLy2EeOxWJvPH-7sUQ" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_ids" commandName="Mark Duplicate Model Element Ids" description="Marks Duplicate Model Element Ids"/>
     <elements xsi:type="commands:Command" xmi:id="_9ITpgL2IEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_labels" commandName="Mark Duplicate Model Labels" description="Marks Duplicate Model Labels"/>
     <elements xsi:type="commands:Command" xmi:id="_RObi4L2MEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_attributes" commandName="Mark Duplicate Model Attributes..." description="Marks Duplicate Model Attributes"/>
@@ -9,7 +9,7 @@
     <elements xsi:type="commands:Command" xmi:id="_jd7xgO5mEeOQXaYP-M2JBA" elementId="org.eclipse.e4.tools.emf.ui.command.autosizeColumns" commandName="Autosize Columns" description="Autosizes all columns to their content"/>
     <elements xsi:type="commands:Command" xmi:id="_vsQXAPFwEeOSJuCPb-hb7A" elementId="org.eclipse.e4.tools.emf.ui.command.resetToDefault" commandName="Reset To Default" description="Resets the table to default values"/>
   </fragments>
-  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_jtmcsLy3EeOxWJvPH-7sUQ" featurename="handlers" parentElementId="org.eclipse.e4.legacy.ide.application">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_jtmcsLy3EeOxWJvPH-7sUQ" featurename="handlers" parentElementId="xpath:/">
     <elements xsi:type="commands:Handler" xmi:id="_p45hULy3EeOxWJvPH-7sUQ" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateElementIdsHandler" command="_RRp7QLy2EeOxWJvPH-7sUQ"/>
     <elements xsi:type="commands:Handler" xmi:id="_AOEgkL2JEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_labels" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateLabelsHandler" command="_9ITpgL2IEeOqSr2XZwfnmA"/>
     <elements xsi:type="commands:Handler" xmi:id="_TgJt4L2MEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_attributes" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateAttributesHandler" command="_RObi4L2MEeOqSr2XZwfnmA"/>
@@ -18,22 +18,4 @@
     <elements xsi:type="commands:Handler" xmi:id="_hZcKMO5mEeOQXaYP-M2JBA" elementId="org.eclipse.e4.tools.emf.ui.handler.autosizeColumns" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.AutosizeColumnsHandler" command="_jd7xgO5mEeOQXaYP-M2JBA"/>
     <elements xsi:type="commands:Handler" xmi:id="_8AHVUPFwEeOSJuCPb-hb7A" elementId="org.eclipse.e4.tools.emf.ui.handler.resetToDefault" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.ResetToDefaultHandler" command="_vsQXAPFwEeOSJuCPb-hb7A"/>
   </fragments>
-  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_ph2FwAykEeS6HrzpXti93Q" featurename="commands" parentElementId="org.eclipse.e4.ide.application">
-    <elements xsi:type="commands:Command" xmi:id="_ph2FwQykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_ids" commandName="Mark Duplicate Model Element Ids" description="Marks Duplicate Model Element Ids"/>
-    <elements xsi:type="commands:Command" xmi:id="_ph2FwgykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_labels" commandName="Mark Duplicate Model Labels" description="Marks Duplicate Model Labels"/>
-    <elements xsi:type="commands:Command" xmi:id="_ph2FwwykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_attributes" commandName="Mark Duplicate Model Attributes..." description="Marks Duplicate Model Attributes"/>
-    <elements xsi:type="commands:Command" xmi:id="_ph2FxAykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.command.repair_duplicate_ids" commandName="Repair Duplicate Model Element IDs" description="Repairs Duplicate Model Element IDs"/>
-    <elements xsi:type="commands:Command" xmi:id="_ph2FxQykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.command.unmark" commandName="Unmark Model Items" description="Unmarks All Model Items"/>
-    <elements xsi:type="commands:Command" xmi:id="_ph2FxgykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.command.autosizeColumns" commandName="Autosize Columns" description="Autosizes all columns to their content"/>
-    <elements xsi:type="commands:Command" xmi:id="_ph2FxwykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.command.resetToDefault" commandName="Reset To Default" description="Resets the table to default values"/>
-  </fragments>
-  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_rSPFUAykEeS6HrzpXti93Q" featurename="handlers" parentElementId="org.eclipse.e4.ide.application">
-    <elements xsi:type="commands:Handler" xmi:id="_rSPFUQykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateElementIdsHandler" command="_RRp7QLy2EeOxWJvPH-7sUQ"/>
-    <elements xsi:type="commands:Handler" xmi:id="_rSPFUgykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_labels" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateLabelsHandler" command="_9ITpgL2IEeOqSr2XZwfnmA"/>
-    <elements xsi:type="commands:Handler" xmi:id="_rSPFUwykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_attributes" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateAttributesHandler" command="_RObi4L2MEeOqSr2XZwfnmA"/>
-    <elements xsi:type="commands:Handler" xmi:id="_rSPFVAykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.handler.repair_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.RepairDuplicateItemsHandler" command="_dySeYLzDEeO8eO1Rpb-rFA"/>
-    <elements xsi:type="commands:Handler" xmi:id="_rSPFVQykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.handler.unmark" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.UnmarkItemsHandler" command="_CFlw8L2LEeOqSr2XZwfnmA"/>
-    <elements xsi:type="commands:Handler" xmi:id="_rSPFVgykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.handler.autosizeColumns" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.AutosizeColumnsHandler" command="_jd7xgO5mEeOQXaYP-M2JBA"/>
-    <elements xsi:type="commands:Handler" xmi:id="_rSPFVwykEeS6HrzpXti93Q" elementId="org.eclipse.e4.tools.emf.ui.handler.resetToDefault" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.ResetToDefaultHandler" command="_vsQXAPFwEeOSJuCPb-hb7A"/>
-  </fragments>
 </fragment:ModelFragments>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml b/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
index aabe538357..306ac2f84a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
@@ -19,6 +19,7 @@
          id="id1"
          point="org.eclipse.e4.workbench.model">
       <fragment
+            apply="notexists"
             uri="fragment.e4xmi">
       </fragment>
    </extension>

From 1859be9e4e67045bb5715ec817152d034ba6ed2b Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mon, 15 May 2017 19:17:28 +0300
Subject: [PATCH 0983/1286] Bug 516457 - Many of plug-ins need a version
 increase

Service version bump org.eclipse.e4.tools.emf.ui.

Change-Id: Ic2c069af4c762756bd9151a632c345906905bd04
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index f85a96c655..92d7b5db1c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.5.100.qualifier
+Bundle-Version: 4.5.200.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 044f2e9d10..3dd08e2a88 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2015 vogella GmbH and others.
+  Copyright (c) 2012, 2017 vogella GmbH and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.5.100-SNAPSHOT</version>
+  <version>4.5.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>

From 4717b68cf5ad7aa70d971415edc941d4bddcb2f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20N=C3=B6bauer?= <stefan.noebauer@kgu-consulting.com>
Date: Thu, 1 Jun 2017 13:29:03 +0200
Subject: [PATCH 0984/1286] fixed formating of ControlFactory.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

indents not correct formatted.

Change-Id: Ia346025e1ae30cfd9cdb4925a218f5afe66ad410
Signed-off-by: Stefan Nöbauer <stefan.noebauer@kgu-consulting.com>
---
 .../common/component/ControlFactory.java      | 97 ++++++++++---------
 1 file changed, 49 insertions(+), 48 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index e9b3f3c1e6..b27cdd3f6e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -182,16 +182,16 @@ public void handleValueChange(ValueChangeEvent event) {
 	}
 
 	public static Composite createMapProperties(Composite parent, final Messages Messages,
-		final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
+			final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
 		return createMapProperties(parent, Messages, editor, label, null, feature, vIndent);
 	}
 
 	public static Composite createMapProperties(Composite parent, final Messages Messages,
-		final AbstractComponentEditor editor, String label, String tooltip, final EStructuralFeature feature,
-		int vIndent) {
+			final AbstractComponentEditor editor, String label, String tooltip, final EStructuralFeature feature,
+			int vIndent) {
 
 		final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
-			Messages, editor, feature) {
+				Messages, editor, feature) {
 			@Override
 			protected List<?> getContainerChildren(Object master) {
 				return null;
@@ -230,12 +230,12 @@ protected Control createDialogArea(Composite parent) {
 					protected void okPressed() {
 						if (key.getText().trim().length() > 0) {
 							final BasicEMap.Entry<String, String> entry = (org.eclipse.emf.common.util.BasicEMap.Entry<String, String>) ApplicationFactoryImpl.eINSTANCE
-								.createStringToStringMap();
+									.createStringToStringMap();
 							entry.setHash(key.hashCode());
 							entry.setKey(key.getText());
 							entry.setValue(value.getText().trim().length() > 0 ? value.getText() : null);
 							final Command cmd = AddCommand.create(editor.getEditingDomain(), editor.getMaster()
-								.getValue(), feature, entry);
+									.getValue(), feature, entry);
 							if (cmd.canExecute()) {
 								editor.getEditingDomain().getCommandStack().execute(cmd);
 								super.okPressed();
@@ -280,8 +280,8 @@ public String getText(Object element) {
 			@Override
 			protected void setValue(Object element, Object value) {
 				final Command cmd = SetCommand.create(editor.getEditingDomain(), element,
-					ApplicationPackageImpl.Literals.STRING_TO_STRING_MAP__KEY,
-					value.toString().trim().length() == 0 ? null : value.toString());
+						ApplicationPackageImpl.Literals.STRING_TO_STRING_MAP__KEY,
+						value.toString().trim().length() == 0 ? null : value.toString());
 				if (cmd.canExecute()) {
 					editor.getEditingDomain().getCommandStack().execute(cmd);
 					tableviewer.refresh();
@@ -326,8 +326,8 @@ public String getText(Object element) {
 			@Override
 			protected void setValue(Object element, Object value) {
 				final Command cmd = SetCommand.create(editor.getEditingDomain(), element,
-					ApplicationPackageImpl.Literals.STRING_TO_STRING_MAP__VALUE,
-					value.toString().trim().length() == 0 ? null : value.toString());
+						ApplicationPackageImpl.Literals.STRING_TO_STRING_MAP__VALUE,
+						value.toString().trim().length() == 0 ? null : value.toString());
 				if (cmd.canExecute()) {
 					editor.getEditingDomain().getCommandStack().execute(cmd);
 					tableviewer.refresh();
@@ -367,18 +367,18 @@ public void handleListChange(ListChangeEvent event) {
 	}
 
 	public static void createTextField(Composite parent, String label, IObservableValue master,
-		EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp) {
+			EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp) {
 		createTextField(parent, label, null, master, context, textProp, modelProp, null);
 	}
 
 	public static void createTextField(Composite parent, String label, String tooltip, IObservableValue master,
-		EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp) {
+			EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp) {
 		createTextField(parent, label, tooltip, master, context, textProp, modelProp, null);
 	}
 
 	public static void createTextField(Composite parent, String label, IObservableValue master,
-		EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp,
-		final String warningText) {
+			EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp,
+			final String warningText) {
 		createTextField(parent, label, null, master, context, textProp, modelProp, warningText);
 	}
 
@@ -395,8 +395,8 @@ public static void createTextField(Composite parent, String label, IObservableVa
 	 *            text will be shown when the field is left empty
 	 */
 	public static void createTextField(Composite parent, String label, String tooltip, IObservableValue master,
-		EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp,
-		final String warningText) {
+			EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp,
+			final String warningText) {
 		final Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
 		if (tooltip != null) {
@@ -413,7 +413,7 @@ public static void createTextField(Composite parent, String label, String toolti
 			final ControlDecoration controlDecoration = new ControlDecoration(t, SWT.LEFT | SWT.TOP);
 			controlDecoration.setDescriptionText(warningText);
 			final FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(
-				FieldDecorationRegistry.DEC_WARNING);
+					FieldDecorationRegistry.DEC_WARNING);
 			controlDecoration.setImage(fieldDecoration.getImage());
 			final IValidator iv = new IValidator() {
 
@@ -430,6 +430,7 @@ public IStatus validate(Object value) {
 							return ValidationStatus.warning(warningText);
 						}
 					}
+
 					controlDecoration.hide();
 					return Status.OK_STATUS;
 				}
@@ -442,14 +443,14 @@ public IStatus validate(Object value) {
 	}
 
 	public static void createTranslatedTextField(Composite parent, String label, IObservableValue master,
-		EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp,
-		IResourcePool resourcePool, IProject project) {
+			EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp,
+			IResourcePool resourcePool, IProject project) {
 		createTranslatedTextField(parent, label, null, master, context, textProp, modelProp, resourcePool, project);
 	}
 
 	public static void createTranslatedTextField(Composite parent, String label, String tooltip,
-		IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp,
-		IEMFEditValueProperty modelProp, IResourcePool resourcePool, IProject project) {
+			IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp,
+			IEMFEditValueProperty modelProp, IResourcePool resourcePool, IProject project) {
 		final Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
 		if (tooltip != null) {
@@ -477,7 +478,7 @@ public static void createTranslatedTextField(Composite parent, String label, Str
 	}
 
 	public static void createFindImport(Composite parent, final Messages Messages,
-		final AbstractComponentEditor editor, EMFDataBindingContext context) {
+			final AbstractComponentEditor editor, EMFDataBindingContext context) {
 		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		final Label l = new Label(parent, SWT.NONE);
@@ -491,9 +492,9 @@ public static void createFindImport(Composite parent, final Messages Messages,
 		TextPasteHandler.createFor(t);
 
 		context.bindValue(
-			textProp.observeDelayed(200, t),
-			EMFEditProperties.value(editor.getEditingDomain(),
-				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(editor.getMaster()));
+				textProp.observeDelayed(200, t),
+				EMFEditProperties.value(editor.getEditingDomain(),
+						ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(editor.getMaster()));
 
 		final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
 		b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -502,14 +503,14 @@ public static void createFindImport(Composite parent, final Messages Messages,
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				final FindImportElementDialog dialog = new FindImportElementDialog(b.getShell(), editor,
-					(EObject) editor.getMaster().getValue(), Messages);
+						(EObject) editor.getMaster().getValue(), Messages);
 				dialog.open();
 			}
 		});
 	}
 
 	public static void createSelectedElement(Composite parent, final AbstractComponentEditor editor,
-		final EMFDataBindingContext context, String label) {
+			final EMFDataBindingContext context, String label) {
 		final Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
 		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
@@ -519,18 +520,18 @@ public static void createSelectedElement(Composite parent, final AbstractCompone
 		gd.horizontalSpan = 2;
 		viewer.getControl().setLayoutData(gd);
 		final IEMFEditListProperty listProp = EMFEditProperties.list(editor.getEditingDomain(),
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 		final IEMFEditValueProperty labelProp = EMFEditProperties.value(editor.getEditingDomain(),
-			UiPackageImpl.Literals.UI_LABEL__LABEL);
+				UiPackageImpl.Literals.UI_LABEL__LABEL);
 		final IEMFEditValueProperty idProp = EMFEditProperties.value(editor.getEditingDomain(),
-			ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
 
 		final IViewerValueProperty vProp = ViewerProperties.singleSelection();
 
 		final Binding[] binding = new Binding[1];
 		final IObservableValue uiObs = vProp.observe(viewer);
 		final IObservableValue mObs = EMFEditProperties.value(editor.getEditingDomain(),
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(editor.getMaster());
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(editor.getMaster());
 		editor.getMaster().addValueChangeListener(new IValueChangeListener() {
 
 			@Override
@@ -546,7 +547,7 @@ public void handleValueChange(ValueChangeEvent event) {
 		final ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
 		final IObservableMap[] attributeMaps = { labelProp.observeDetail(cp.getKnownElements()),
-			idProp.observeDetail(cp.getKnownElements()) };
+				idProp.observeDetail(cp.getKnownElements()) };
 		viewer.setLabelProvider(new ObservableMapLabelProvider(attributeMaps) {
 			@Override
 			public String getText(Object element) {
@@ -583,22 +584,22 @@ public void handleValueChange(ValueChangeEvent event) {
 	}
 
 	public static void createBindingContextWiget(Composite parent, final Messages Messages,
-		final AbstractComponentEditor editor, String label) {
+			final AbstractComponentEditor editor, String label) {
 		createBindingContextWiget(parent, Messages, editor, label, null);
 	}
 
 	public static void createBindingContextWiget(Composite parent, final Messages Messages,
-		final AbstractComponentEditor editor, String label, String tooltip) {
+			final AbstractComponentEditor editor, String label, String tooltip) {
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_ORDER,
-				PickListFeatures.NO_PICKER), Messages, editor, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS) {
+					PickListFeatures.NO_PICKER), Messages, editor, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS) {
 				@Override
 				protected void addPressed() {
 					final BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(getShell(), editor
-						.getEditor().getModelProvider(), Messages);
+							.getEditor().getModelProvider(), Messages);
 					if (dialog.open() == IDialogConstants.OK_ID) {
 						final Command cmd = AddCommand.create(editor.getEditingDomain(), editor.getMaster().getValue(),
-							CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, dialog.getSelectedContext());
+								CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, dialog.getSelectedContext());
 						if (cmd.canExecute()) {
 							editor.getEditingDomain().getCommandStack().execute(cmd);
 						}
@@ -609,19 +610,19 @@ protected void addPressed() {
 
 			pickList.setText(label);
 			pickList.getList().setInput(
-				EMFProperties.list(CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS).observeDetail(
-					editor.getMaster()));
+					EMFProperties.list(CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS).observeDetail(
+							editor.getMaster()));
 		}
 	}
 
 	public static Composite createStringListWidget(Composite parent, Messages Messages,
-		final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
+			final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
 		return createStringListWidget(parent, Messages, editor, label, null, feature, vIndent);
 	}
 
 	public static Composite createStringListWidget(Composite parent, Messages Messages,
-		final AbstractComponentEditor editor, String label, String tooltip, final EStructuralFeature feature,
-		int vIndent) {
+			final AbstractComponentEditor editor, String label, String tooltip, final EStructuralFeature feature,
+			int vIndent) {
 
 		final E4StringPickList pickList = new E4StringPickList(parent, SWT.NONE, null, Messages, editor, feature) {
 			@Override
@@ -712,7 +713,7 @@ private static void handleAddText(AbstractComponentEditor editor, EStructuralFea
 	// This method is left in for reference purposes
 	@SuppressWarnings("unused")
 	private static void handleReplaceText(AbstractComponentEditor editor, EStructuralFeature feature, Text tagText,
-		TableViewer viewer) {
+			TableViewer viewer) {
 		if (tagText.getText().trim().length() > 0) {
 			if (!viewer.getSelection().isEmpty()) {
 				final String[] tags = tagText.getText().split(";"); //$NON-NLS-1$
@@ -730,7 +731,7 @@ private static void handleReplaceText(AbstractComponentEditor editor, EStructura
 				if (idx >= 0) {
 					final Command cmdRemove = RemoveCommand.create(editor.getEditingDomain(), el, feature, ids);
 					final Command cmdInsert = AddCommand.create(editor.getEditingDomain(), appEl, feature,
-						Arrays.asList(tags), idx);
+							Arrays.asList(tags), idx);
 					if (cmdRemove.canExecute() && cmdInsert.canExecute()) {
 						editor.getEditingDomain().getCommandStack().execute(cmdRemove);
 						editor.getEditingDomain().getCommandStack().execute(cmdInsert);
@@ -742,12 +743,12 @@ private static void handleReplaceText(AbstractComponentEditor editor, EStructura
 	}
 
 	public static void createCheckBox(Composite parent, String label, IObservableValue master,
-		EMFDataBindingContext context, IWidgetValueProperty selectionProp, IEMFEditValueProperty modelProp) {
+			EMFDataBindingContext context, IWidgetValueProperty selectionProp, IEMFEditValueProperty modelProp) {
 		createCheckBox(parent, label, null, master, context, selectionProp, modelProp);
 	}
 
 	public static void createCheckBox(Composite parent, String label, String tooltip, IObservableValue master,
-		EMFDataBindingContext context, IWidgetValueProperty selectionProp, IEMFEditValueProperty modelProp) {
+			EMFDataBindingContext context, IWidgetValueProperty selectionProp, IEMFEditValueProperty modelProp) {
 		final Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
 		if (tooltip != null) {
@@ -763,11 +764,11 @@ public static void createCheckBox(Composite parent, String label, String tooltip
 
 	public static String getLocalizedLabel(ProjectOSGiTranslationProvider translationProvider, MUILabel element) {
 		return getLocalizedValue(translationProvider, (MApplicationElement) element,
-			UiPackageImpl.Literals.UI_LABEL__LABEL, UiPackageImpl.Literals.UI_LABEL__LOCALIZED_LABEL);
+				UiPackageImpl.Literals.UI_LABEL__LABEL, UiPackageImpl.Literals.UI_LABEL__LOCALIZED_LABEL);
 	}
 
 	public static String getLocalizedValue(ProjectOSGiTranslationProvider translationProvider,
-		MApplicationElement element, EStructuralFeature feature, EStructuralFeature localizedFeature) {
+			MApplicationElement element, EStructuralFeature feature, EStructuralFeature localizedFeature) {
 		final EObject eo = (EObject) element;
 		if (translationProvider == null) {
 			final String value = (String) eo.eGet(localizedFeature);

From 05c9568eb21ac4719da24dc533a18fdac6ec8a9a Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Thu, 22 Jun 2017 11:20:56 +0300
Subject: [PATCH 0985/1286] Bug 517929 - Update POMs in the master for 4.8
 release

Point to 4.8 parent pom.

Change-Id: I3cf0b73e3ada9b4d1f2fc4c3eb0e2c16614db7cf
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 bundles/org.eclipse.e4.tools.compat/pom.xml        | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml  | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml        | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml               | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 680160a86d..8321129070 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.7.0-SNAPSHOT</version>
+    <version>4.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index e699032b30..f9155b6397 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.7.0-SNAPSHOT</version>
+    <version>4.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 3dd08e2a88..cafe672581 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.7.0-SNAPSHOT</version>
+    <version>4.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 2ce4fb31b1..b001f91a8a 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.7.0-SNAPSHOT</version>
+    <version>4.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 48f52bbf8d..208fbbffd7 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.7.0-SNAPSHOT</version>
+    <version>4.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index c0b4641908..a488ce9807 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.7.0-SNAPSHOT</version>
+    <version>4.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index f21ea8f09e..1aff2714fd 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.7.0-SNAPSHOT</version>
+    <version>4.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 

From 237e5e73d7e83ab09998b36625ac6606145c9a3f Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 29 Jun 2017 16:14:57 +0200
Subject: [PATCH 0986/1286] Bug 518956 - Icon with white borders in the Find
 Contributors Class dialog

Change-Id: Iafe6db67b51876eb19f8141fcadedc9168cc47d5
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../OSGI-INF/resources.properties               |   2 +-
 .../icons/full/obj16/class_obj.gif              | Bin 586 -> 0 bytes
 .../icons/full/obj16/class_obj.png              | Bin 0 -> 610 bytes
 .../icons/full/obj16/class_obj@2x.png           | Bin 0 -> 1158 bytes
 .../dialogs/FeatureSelectionDialog.java         |   2 +-
 .../dialogs/FilteredContributionDialog.java     |   2 +-
 .../dialogs/FindContributionDialog.java         |   2 +-
 .../icons/full/obj16/class_obj.gif              | Bin 586 -> 0 bytes
 .../icons/full/obj16/class_obj.png              | Bin 628 -> 610 bytes
 .../icons/full/obj16/class_obj@2x.png           | Bin 0 -> 1158 bytes
 10 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj@2x.png
 delete mode 100644 bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.gif
 create mode 100644 bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj@2x.png

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
index 30fb216fa1..899b9c5329 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
@@ -80,7 +80,7 @@ IMG_org.eclipse.e4.tools.emf.ui.modelelements.tbr.WizardDialog=/icons/full/model
 
 IMG_org.eclipse.e4.tools.emf.ui.obj16.arrow_down=/icons/full/obj16/arrow_down.png
 IMG_org.eclipse.e4.tools.emf.ui.obj16.arrow_up=/icons/full/obj16/arrow_up.png
-IMG_org.eclipse.e4.tools.emf.ui.obj16.class_obj=/icons/full/obj16/class_obj.gif
+IMG_org.eclipse.e4.tools.emf.ui.obj16.class_obj=/icons/full/obj16/class_obj.png
 IMG_org.eclipse.e4.tools.emf.ui.obj16.class_default_obj=/icons/full/obj16/class_default_obj.gif
 IMG_org.eclipse.e4.tools.emf.ui.obj16.cross=/icons/full/obj16/cross.png
 IMG_org.eclipse.e4.tools.emf.ui.obj16.EPackage=/icons/full/obj16/EPackage.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.gif
deleted file mode 100644
index e4c2a836f83e7dc72d29873fded01e7206eba2f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 586
zcmZ?wbhEHb6krfwc*ekxv!c<s$=9se-=Q<YsXNN8KQ3fOR@Cf*m^p=Yn<q4Gopkom
z6_qkOy&5;;MsLfufQUJ{vGWR(7nLtMxlXsnMX%OXzt+v54k+vCJt@I!LR|T}_8Twn
z8a23^wRl;#``dR0_3fQy*Wqv15n$II;MN!J-X9S(Eh&3>RsX(Ohwq+z^!{nkw1lu(
zDPc2HV&`P7KEHX-jYA>R6T@ewM9fTyo0E0x)!k<wUj$8y`}qA+!h+12O)Zt{8e4bt
z^z51Z;rqwPnTZ)o@)H-NC(KKmcWmLES9jAFW#uj_C|_66u(_dnV^!t4^7b9Ajhky9
zzJD-rU(e=C8}{7Xx$oBQ`NwB1I6iy#jqQi->_2wz@P-Sk|APSoeSzXn7Dfh!C<Yyn
zwV*g*U|-%4)fB}oD9JA+$lcr%#l`RFG0BmUtG7?qHzF)NEX0#%S~EAlcTnVt6@gxi
z-A(LH!7D=j10wx=oP?TLEnFg9oe#OYxjC>lGm2|QYKe-7h)T#Q@$He9j?`9AQ4ux}
zP&?5iq-<&#X{ezXX|J!t&@97aWMj6{+|Gn&T@xp-YRQ`y8=a5yFmmdtZYWsP+AXH8
bqq4{4!~q5-W`Qq@Pi$O#yuX);k--`O+yTtY

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.png
new file mode 100644
index 0000000000000000000000000000000000000000..18c56b57b04676a8b89212199a6d47e1d6d0a972
GIT binary patch
literal 610
zcmV-o0-gPdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006hNkl<Zc-muN
z7?eP`*iu8X)P9<5rTt~ea@&tm<@V2k^kUIcD+ByG8yr|9%IwOe%I&^H%nkWlyEXBD
z$L`es1#4pe2hR-pD_&~*ORChi6Q_QVt-8&wUz>NP{GWU%>;Lj|?f-XNpZ9;|`Og0n
z4`%#t+MfJhv(e>?c(H9EhGwB6YYWLT+n?2&6aUXVTK)g!r$_&h!Sjy~{`c(7`d_sv
z;lD(g?N^XDQ4EkNw_oo&E#QCkrlkMRK0E|#y8rgp|MeFa{J;I`Dwu!l-k$%J8x#I}
zP4WK=axI$kZQn)B4gKG?y$Y=O@4r9)i`S(7&srA!KWBN||JscOU<~5N%nSQ3U1on7
z#Q@P_o4-+W!v1&f>;N0^^!=0n(Lg>n95yrbzj%qwHxvUTO6~4>P6+s)zq|-+z?UCi
z{s&JD`|mp`@PFv^$p8JjC;ji;*$?JBcKiGnE46urVgN9TmKij;|99;T{D1HD1F#`C
zp5OjIanFqZXCGVu^N-&-_1~%6@4sGy+kc??_2^!(5ihg-?9}V`KXp+q&<oE{VgbYt
zpOx?*BrjfK`$MF}#sMQLfu>GUu5tS2Ix*nC@3gT0RT~@s_W+#^qP?bu{C5G0E7mxE
z1FBnsH6bZ9IB)<ZH%gY<eK+s)`tLl^@4wfyp#L6I0{?^f66Lm^L6(40EdIPuV(SkK
w)RUl?5h=F$Ena5#0+@JqfV@e1&LUtN09*!L)FppDO8@`>07*qoM6N<$f>1<1NdN!<

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj@2x.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3025d966d9d28b0f2ab01890f7882af30ffa4ac1
GIT binary patch
literal 1158
zcmV;11bO?3P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000C{Nkl<Zc-rk(
zUr>})6z8Fb9(piYjA0mKcxard%%+FR{XY7DWpQKqv+U|@LW%`x^haj*0~f&tLaj{@
zaaXj2DKc9}a=<@B0TP-yG*17VRfzy|phEtLXpESGr*kiRZ+>mN%QE!RcxQeu-#Pc3
z-#z!-bIunMa&O&RL9PeorH`pBYFQ-<pR255x5_F^AOO*i_(5e6D??>L6H+4GH>Zy0
zThz~>gLaRznV>V&B4*ABkx;8ph6ZmE!w=<)5MQN->`%;4(zFJuPOhV{AJ2g|>odXd
zemX=KNq-Z;NJUsB)vO$c<w_5rk)y=W0$Bu|GZo63v$<1WsAyjc=2{a(+MZ)XdcyOh
zsM(yno*0O<#Xx@Js(_CFi7hSJuw=8Ak_fe`F9j8eFso4Paek)&omZY%%dxk^1}AzB
zLjTn+xO!s<u1$=<Z)4ridHEY?bUPKg@3iK?<7Ejf5=Up|Jb&pDm1X+Q-#C~7@1hZg
zuX~Tc?WtSfZ~Zj*EtI$A@;#f5t$~L(vb+$p0}?>R2BNGk*I}Z)#PMC<Nto&C9XStM
zn_uO7%{3+#g#nUVeoiliqtfjKvH-6gSP6xPvnU$R)_FM@yD^HSPQjO5N1$)C$4lOH
z?f~Dvp>Z`t7spNK19_f430TA|qC}F%QvV`_{8<)UpBPgZ?;1P@g$+4ehv0N?n?mQx
z_%Pke<T^(Ri-OB{_+|Azq7=V98FD|(pm4U^6^5toOv0wad0fu$x@#5vemBTBCeNr{
z&Ik<qyMJ2k47=0e<vKIPzK$B@{SN)iWx*o6K%^vmR!C2M2V=DnGHO;(9QwXqLEysg
z=eaCcL>5jLC!d9h5zy~6fN8gp!ga=_AkaC`$z{QU6tw^ZrmsNSriWxCL9nCMp&&4R
za~#r~CN2*Kq?h==0#6b?QL2T6iWG`<AFua%V#N(*T+U!{z5sn!`r-1mK@L-OCYKBL
zq`*nYo?-OHScuz}!f|o<l7hg{^$~cbZatSL?N|XFJ!cd;-GdhuHWrs^13yDnh_Dxc
zXxBr0MJh!Ro_KO<(kl`Jc*-C9-1z24y=1mSrF?%JB4UH5JIbOtP$_m1#Yf(XhlI*h
zjt@`opK&Q}a<?e<KDBunJAHptiFAK}HvH@&){NBeC4sgojl<qt34dS``dWWZ-hvNK
zeS}rd$oIr<Pl1Snn80QD-`X+BTCrRYi4FtD^1Z8}{I~;-xxaw3zq%<}F0{d(uWG66
zZe0x$Scv(=+i@@>8XHK$35kki(CtbO3Ywj15LFaAyMcr*WXoDJNy<mx)`G^72G3Wg
z`-N_o0iN8tj1p%f+57@2a@IpB9m7325r(tjqEZb!jk%G4Ax_$3q)5aQ3)sLGZ%M>#
zkKscpiQ>FGY2MuY4_JlPV8(JJt)KJ%140B(Wg}$pUVkAqgH1Z*#{>(R<3IT^`QNU;
Y0Ilh6Oif>JT>t<807*qoM6N<$f`nWmuK)l5

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index 5b0c5a46a9..8a77d967a9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -96,7 +96,7 @@ protected Control createDialogArea(Composite parent) {
 		final Image packageImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream(
 				"/icons/full/obj16/EPackage.gif")); //$NON-NLS-1$
 		final Image classImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream(
-				"/icons/full/obj16/class_obj.gif")); //$NON-NLS-1$
+				"/icons/full/obj16/class_obj.png")); //$NON-NLS-1$
 		final Image featureImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream(
 				"/icons/full/obj16/field_public_obj.gif")); //$NON-NLS-1$
 		final Image newTitleImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream(
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index 15ac69669a..a3c465b6a3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -320,7 +320,7 @@ public void widgetDisposed(DisposeEvent e) {
 		setTitleImage(titleImage);
 
 		// TODO param or context
-		contributionTypeImage = imageCache.create("/icons/full/obj16/class_obj.gif"); //$NON-NLS-1$
+		contributionTypeImage = imageCache.create("/icons/full/obj16/class_obj.png"); //$NON-NLS-1$
 
 		compOptions = new Composite(comp, SWT.NONE);
 		compOptions.setLayoutData(new GridData(GridData.FILL_BOTH));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
index a1398add58..06b7ad8553 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
@@ -120,7 +120,7 @@ public void widgetDisposed(DisposeEvent e) {
 			}
 		});
 
-		javaClassImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/class_obj.gif")); //$NON-NLS-1$
+		javaClassImage = new Image(getShell().getDisplay(), getClass().getClassLoader().getResourceAsStream("/icons/full/obj16/class_obj.png")); //$NON-NLS-1$
 
 		Composite container = new Composite(comp, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
diff --git a/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.gif b/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.gif
deleted file mode 100644
index e4c2a836f83e7dc72d29873fded01e7206eba2f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 586
zcmZ?wbhEHb6krfwc*ekxv!c<s$=9se-=Q<YsXNN8KQ3fOR@Cf*m^p=Yn<q4Gopkom
z6_qkOy&5;;MsLfufQUJ{vGWR(7nLtMxlXsnMX%OXzt+v54k+vCJt@I!LR|T}_8Twn
z8a23^wRl;#``dR0_3fQy*Wqv15n$II;MN!J-X9S(Eh&3>RsX(Ohwq+z^!{nkw1lu(
zDPc2HV&`P7KEHX-jYA>R6T@ewM9fTyo0E0x)!k<wUj$8y`}qA+!h+12O)Zt{8e4bt
z^z51Z;rqwPnTZ)o@)H-NC(KKmcWmLES9jAFW#uj_C|_66u(_dnV^!t4^7b9Ajhky9
zzJD-rU(e=C8}{7Xx$oBQ`NwB1I6iy#jqQi->_2wz@P-Sk|APSoeSzXn7Dfh!C<Yyn
zwV*g*U|-%4)fB}oD9JA+$lcr%#l`RFG0BmUtG7?qHzF)NEX0#%S~EAlcTnVt6@gxi
z-A(LH!7D=j10wx=oP?TLEnFg9oe#OYxjC>lGm2|QYKe-7h)T#Q@$He9j?`9AQ4ux}
zP&?5iq-<&#X{ezXX|J!t&@97aWMj6{+|Gn&T@xp-YRQ`y8=a5yFmmdtZYWsP+AXH8
bqq4{4!~q5-W`Qq@Pi$O#yuX);k--`O+yTtY

diff --git a/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.png b/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.png
index bc915da4420060b4ea9984fc662935f10f19449a..18c56b57b04676a8b89212199a6d47e1d6d0a972 100644
GIT binary patch
delta 585
zcmV-P0=E711mXmcB!4MML_t(|+GAiClt8%HQbV%Tewu8h{bk8=+mBM^_RoRzV$o77
z1N=H099SgE?8>Fe?Y>0J4f$KUHSvGP?$rMUYhwQg&kXu2UTXVGs?@d<r+$#Fy3MX%
zn|G%CpL{6m|MGL~|94!U_kZR2&i@k+X8dp3p8Q|4(dCPHv43qLhGwB6YYWLT+n?2&
z6aUXVTK)g!r$_&h!Sjy~{`c(7`d_sv;lD(g?N^XDQ4EkNw_oo&E#QCkrlkMRK0E|#
zy8rgp|MeFa{J;I`Dwu!l-k$%J8x#I}P4WK=axI$kZQn)B4gKG?y$Y=O@4r9)i`S(7
z&srA!KWBN||9{$z1z-%~$IJ`+FI{GT8N~q6Vw=BFbHe_2@9Y2@@bvwY|It7`HXJrH
z^uKtC%{LSSBuee>c}@uUpTE2aY`~WvU;YPA4g2pqDe!;j^vM7HyC?nc-PsT3J9hj0
z7b~@Sg<=3Oik2BPx&L?V4g7!a^#iaWH=f`AKXK2D|9@v6TmbWr-#PW)soU?rUW40z
zp!)UbUa%1_v;FMU>-Rr(Q7+I6&ro6k#1Eg9@E;^EUSj)0q{PMnBPxNWPExLM`sO+@
z;J@#*u>VyX8~^tJoerYCriT1?0g5ZuIDP}FTY@zqDKt2603|m{mfL+d@AUfbJkjsJ
z*R-Jj9zs(B|AY7v<+h(emVi<${=86P>kkanlc1OpDYp47US{_Kn0R)8yh(b_B48T;
XTn1g#C4W9k00000NkvXXu0mjfUrIij

delta 603
zcmV-h0;K)o1oQ-uB!4?eL_t(|+Raj1Xp&(V_M*$K+QCC3x`@$5(9JHA`G1;;HF2hC
zwV0H-pjZdC)c@a-ZBl|^hR$hAY3-(3*hRTRV{1VZb`?e7#TpSY*I~nI2Q7ycPoMu)
zx;5yo2VOoN_@3uI3Iru6vq^V~ITF~`E`KiJNV=*`J}YvNP=7_MbcbL=xD=a2Ea9jq
z+t6qF<s7!)@@Nyz#TudO)&CGWn7oiB&cEs<oV<UxTb;c!b_zX-X54$>Mm!n9z)KIh
zC(oc`<Rq#)lv$yJSl5Wl?J|XgC97Q{Rz#+pSXfEnPs}a8fp_9G*hj}9W|@^OtfHzU
zI~mvCG{8A%#ec`8Szh!uJ&mE{UA$j>$McET578dCKozK`?GR6qL8YBpHQzoA-*^}Q
zIsY?{iw~M`cAyb0F$+2eTi}eJ=lQW)CP>;yqPPW{4CcNgh$O<i!OZ+L&({lMuMu>h
z=^_JK(!91?4||N`4VJ$zLmx7sK4?Hg#0>wFAiSeKo_`asmKu-`B?in`jk^v9{3d)_
zTHsAyrINV%IKaOJOwLR}c}<61E;TA0%$?#H*qHrdPM%Tu58}do7U|6AqAjGp%;9L%
zg1y&u5Yl;-x7OCIStTtiR^7QTrw;02jGEyZ_8{~uijE;SG+`4|w8ib0l;3Ff{&f$j
zqFJ%Il2j#$t!?t0)Tf2I#{kWZL#PWIu*a)`h+{Ie)nMUbH$3MuTkQ#Y(#gVRs31q<
pD-}Pju*qbCe}%-RC>Q+q_zm7pUb1mJgqi>V002ovPDHLkV1j!9D0%<@

diff --git a/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj@2x.png b/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3025d966d9d28b0f2ab01890f7882af30ffa4ac1
GIT binary patch
literal 1158
zcmV;11bO?3P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000C{Nkl<Zc-rk(
zUr>})6z8Fb9(piYjA0mKcxard%%+FR{XY7DWpQKqv+U|@LW%`x^haj*0~f&tLaj{@
zaaXj2DKc9}a=<@B0TP-yG*17VRfzy|phEtLXpESGr*kiRZ+>mN%QE!RcxQeu-#Pc3
z-#z!-bIunMa&O&RL9PeorH`pBYFQ-<pR255x5_F^AOO*i_(5e6D??>L6H+4GH>Zy0
zThz~>gLaRznV>V&B4*ABkx;8ph6ZmE!w=<)5MQN->`%;4(zFJuPOhV{AJ2g|>odXd
zemX=KNq-Z;NJUsB)vO$c<w_5rk)y=W0$Bu|GZo63v$<1WsAyjc=2{a(+MZ)XdcyOh
zsM(yno*0O<#Xx@Js(_CFi7hSJuw=8Ak_fe`F9j8eFso4Paek)&omZY%%dxk^1}AzB
zLjTn+xO!s<u1$=<Z)4ridHEY?bUPKg@3iK?<7Ejf5=Up|Jb&pDm1X+Q-#C~7@1hZg
zuX~Tc?WtSfZ~Zj*EtI$A@;#f5t$~L(vb+$p0}?>R2BNGk*I}Z)#PMC<Nto&C9XStM
zn_uO7%{3+#g#nUVeoiliqtfjKvH-6gSP6xPvnU$R)_FM@yD^HSPQjO5N1$)C$4lOH
z?f~Dvp>Z`t7spNK19_f430TA|qC}F%QvV`_{8<)UpBPgZ?;1P@g$+4ehv0N?n?mQx
z_%Pke<T^(Ri-OB{_+|Azq7=V98FD|(pm4U^6^5toOv0wad0fu$x@#5vemBTBCeNr{
z&Ik<qyMJ2k47=0e<vKIPzK$B@{SN)iWx*o6K%^vmR!C2M2V=DnGHO;(9QwXqLEysg
z=eaCcL>5jLC!d9h5zy~6fN8gp!ga=_AkaC`$z{QU6tw^ZrmsNSriWxCL9nCMp&&4R
za~#r~CN2*Kq?h==0#6b?QL2T6iWG`<AFua%V#N(*T+U!{z5sn!`r-1mK@L-OCYKBL
zq`*nYo?-OHScuz}!f|o<l7hg{^$~cbZatSL?N|XFJ!cd;-GdhuHWrs^13yDnh_Dxc
zXxBr0MJh!Ro_KO<(kl`Jc*-C9-1z24y=1mSrF?%JB4UH5JIbOtP$_m1#Yf(XhlI*h
zjt@`opK&Q}a<?e<KDBunJAHptiFAK}HvH@&){NBeC4sgojl<qt34dS``dWWZ-hvNK
zeS}rd$oIr<Pl1Snn80QD-`X+BTCrRYi4FtD^1Z8}{I~;-xxaw3zq%<}F0{d(uWG66
zZe0x$Scv(=+i@@>8XHK$35kki(CtbO3Ywj15LFaAyMcr*WXoDJNy<mx)`G^72G3Wg
z`-N_o0iN8tj1p%f+57@2a@IpB9m7325r(tjqEZb!jk%G4Ax_$3q)5aQ3)sLGZ%M>#
zkKscpiQ>FGY2MuY4_JlPV8(JJt)KJ%140B(Wg}$pUVkAqgH1Z*#{>(R<3IT^`QNU;
Y0Ilh6Oif>JT>t<807*qoM6N<$f`nWmuK)l5

literal 0
HcmV?d00001


From 6fcd99e6d44dbf6becda7a717a73d829fe43c118 Mon Sep 17 00:00:00 2001
From: Unai Martinez <umartinez007@gmail.com>
Date: Fri, 30 Jun 2017 09:59:22 +0200
Subject: [PATCH 0987/1286] Bug 518985 - e4 application model editor for
 selecting icons - Use verbs instead of OK

Change-Id: I438896dcf5e6a5aa93d092937ed6e704d7f774e7
Signed-off-by: Unai Martinez <umartinez007@gmail.com>
---
 .../e4/tools/emf/ui/internal/Messages.java    |  1 +
 .../tools/emf/ui/internal/Messages.properties |  1 +
 .../dialogs/FilteredContributionDialog.java   | 25 +++++++++++--------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 68def5f837..d98df76b04 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -75,6 +75,7 @@ public class Messages {
 	public static String FilteredContributionDialog_Package;
 	public static String FilteredContributionDialog_Location;
 	public static String FilteredContributionDialog_NonBundles;
+	public static String FilteredContributionDialog_Select;
 	public static String FilteredContributionDialog_SelectTheBundle;
 	public static String FilteredContributionDialog_SelectThePackage;
 	public static String FilteredContributionDialog_PackageFilter;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index e5c7249c29..7f3814d953 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -597,6 +597,7 @@ FilteredContributionDialog_Scope=Scope
 FilteredContributionDialog_ScopeFilter=Scope Filter
 FilteredContributionDialog_Searching=Searching...\n
 FilteredContributionDialog_SearchWasCancelled=The search was cancelled.  Not all results may have been displayed.\n
+FilteredContributionDialog_Select=Select
 FilteredContributionDialog_SelectTheBundle=Select the bundle to filter on.
 FilteredContributionDialog_SelectTheLocation=Select the location to filter on.
 FilteredContributionDialog_SelectThePackage=Select the package to filter on.
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index a3c465b6a3..c0ba9dd0bf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -160,7 +160,7 @@ private void updateStatusMessage() {
 				message += Messages.FilteredContributionDialog_SearchWasCancelled;
 			} else {
 				message += Messages.FilteredContributionDialog_MoreThan + maxResults
-					+ Messages.FilteredContributionDialog_itemsWereFound;
+						+ Messages.FilteredContributionDialog_itemsWereFound;
 			}
 		}
 
@@ -244,7 +244,7 @@ public FilteredContributionDialog(Shell parentShell, IEclipseContext context) {
 		searchScope = ResourceSearchScope.valueOf(searchScopeString);
 
 		final String searchScopesString = getPreferences().get(PREF_SEARCHSCOPES,
-			EnumSet.of(ResourceSearchScope.PROJECT).toString());
+				EnumSet.of(ResourceSearchScope.PROJECT).toString());
 		searchScopes = valueOf(ResourceSearchScope.class, searchScopesString);
 	}
 
@@ -269,7 +269,10 @@ public void run() {
 
 	@Override
 	protected void createButtonsForButtonBar(Composite parent) {
-		super.createButtonsForButtonBar(parent);
+
+		// Rename the default OK text for the button
+		createButton(parent, IDialogConstants.OK_ID, Messages.FilteredContributionDialog_Select, true);
+		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
 		((GridLayout) parent.getLayout()).numColumns = 4;
 
 		btnClearCache = new Button(parent, SWT.PUSH);
@@ -384,7 +387,7 @@ public void modifyText(ModifyEvent e) {
 					@Override
 					protected IStatus run(IProgressMonitor monitor) {
 						monitor.beginTask(Messages.FilteredContributionDialog_ContributionSearch,
-							IProgressMonitor.UNKNOWN);
+								IProgressMonitor.UNKNOWN);
 						currentResultHandler = new ContributionResultHandlerImpl(viewerList);
 						getShell().getDisplay().syncExec(new Runnable() {
 
@@ -494,7 +497,7 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 			btnScopeProject.setSelection(searchScopes.contains(ResourceSearchScope.PROJECT)
-				&& !searchScopes.contains(ResourceSearchScope.REFERENCES));
+					&& !searchScopes.contains(ResourceSearchScope.REFERENCES));
 
 			final Button btnProjectAndReferences = new Button(compScope, SWT.RADIO);
 			btnProjectAndReferences.setText(Messages.FilteredContributionDialog_ProjectAndReferences);
@@ -511,7 +514,7 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 			btnProjectAndReferences.setSelection(searchScopes.contains(ResourceSearchScope.PROJECT)
-				&& searchScopes.contains(ResourceSearchScope.REFERENCES));
+					&& searchScopes.contains(ResourceSearchScope.REFERENCES));
 
 			final Button btnScopeWorkspace = new Button(compScope, SWT.RADIO);
 			btnScopeWorkspace.setText(Messages.FilteredContributionDialog_Workspace);
@@ -928,7 +931,7 @@ protected IFile getSelectedIfile() {
 			} else if (selected instanceof Entry) {
 				final Entry entry = (Entry) selected;
 				final ContributionData cd = new ContributionData(null, null, Messages.FilteredContributionDialog_Java,
-					entry.file.getFullPath().toOSString());
+						entry.file.getFullPath().toOSString());
 				cd.installLocation = entry.installLocation;
 				cd.resourceRelativePath = entry.file.getProjectRelativePath().toOSString();
 				return new ContributionDataFile(cd);
@@ -961,7 +964,7 @@ protected IFile checkResourceAccessible(final IFile file, String installLocation
 		if (bundle == null) {
 			final String message = Messages.FilteredContributionDialog_ResourceIsNotContainedInABundle;
 			final NonReferencedResourceWizard wizard = new NonReferencedResourceWizard(getShell(),
-				context.get(IProject.class), bundle, file, installLocation, context);
+					context.get(IProject.class), bundle, file, installLocation, context);
 			wizard.setMessage(message);
 			final WizardDialog wizDlg = new WizardDialog(getShell(), wizard);
 			wizDlg.setBlockOnOpen(true);
@@ -980,7 +983,7 @@ protected IFile checkResourceAccessible(final IFile file, String installLocation
 				final BundleModel model = loadBundleModel(currentProject);
 
 				final RequireBundleHeader rbh = (RequireBundleHeader) model.getBundle().getManifestHeader(
-					"Require-Bundle"); //$NON-NLS-1$
+						"Require-Bundle"); //$NON-NLS-1$
 				if (rbh != null) {
 					for (final RequireBundleObject item : rbh.getRequiredBundles()) {
 						if (item.getValue().equals(bundle)) {
@@ -997,7 +1000,7 @@ protected IFile checkResourceAccessible(final IFile file, String installLocation
 						if (className != null) {
 							final String pakage = NonReferencedResourceDialog.getPackageFromClassName(className);
 							final ImportPackageHeader iph = (ImportPackageHeader) model.getBundle().getManifestHeader(
-								"Import-Package"); //$NON-NLS-1$
+									"Import-Package"); //$NON-NLS-1$
 							if (iph != null) {
 								for (final ImportPackageObject item : iph.getPackages()) {
 									if (item.getValue().equals(pakage)) {
@@ -1015,7 +1018,7 @@ protected IFile checkResourceAccessible(final IFile file, String installLocation
 			if (!found) {
 				final String message = Messages.FilteredContributionDialog_ResourceIsNotReferencedByThisBundle;
 				final NonReferencedResourceWizard wizard = new NonReferencedResourceWizard(getShell(),
-					context.get(IProject.class), bundle, file, installLocation, context);
+						context.get(IProject.class), bundle, file, installLocation, context);
 				wizard.setMessage(message);
 				final WizardDialog wiz = new WizardDialog(getShell(), wizard);
 				wiz.setBlockOnOpen(true);

From 3e787edfa13c09d93d9518005e6894f25af19c19 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 30 Jun 2017 12:53:03 +0200
Subject: [PATCH 0988/1286] org.eclipse.e4.tools.emf.ui MANIFEST.MF update for
 4.8

Change-Id: Id488f1b3b38e672275276a930a9c804b060797e1
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 92d7b5db1c..e4a3557762 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.5.200.qualifier
+Bundle-Version: 4.5.300.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index cafe672581..e90ff8d0c9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.5.200-SNAPSHOT</version>
+  <version>4.5.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>

From 352e8bf4170ba9830931d6fbac5b0eecf91a752d Mon Sep 17 00:00:00 2001
From: initialflame <shawn.kleese@wtnet.de>
Date: Sun, 2 Jul 2017 22:28:55 +0200
Subject: [PATCH 0989/1286] Bug 517693 - Allow to specify the filename for the
 extraction of the App Ids in the model editor

Change-Id: Ic08d894441ecb5fab49c190f0fd4632586d7ba21
Signed-off-by: initialflame <shawn.kleese@wtnet.de>
---
 .../e4/tools/emf/ui/internal/Messages.java    |  1 +
 .../tools/emf/ui/internal/Messages.properties |  1 +
 .../common/properties/ExportIdsHandler.java   | 35 +++++++++++++++++--
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index d98df76b04..3c8a96a15b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -750,6 +750,7 @@ public class Messages {
 	public String ExportIdsHandler_Dialog_DialogTitle;
 	public String ExportIdsHandler_Dialog_DialogMessage;
 	public String ExportIdsHandler_Dialog_SelectProject;
+	public String ExportIdsHandler_Dialog_TargetClassName;
 
 	public String ObjectViewer_Tooltip_Value;
 	public String ObjectViewer_Tooltip_InjectionKey;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 7f3814d953..555e793cff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -758,6 +758,7 @@ ExportIdsHandler_Dialog_ShellTitle=Export Element Ids
 ExportIdsHandler_Dialog_DialogTitle=Export Element Ids
 ExportIdsHandler_Dialog_DialogMessage=Export application model element Ids into a java file for static reference
 ExportIdsHandler_Dialog_SelectProject=Please select a Java project to continue
+ExportIdsHandler_Dialog_TargetClassName=Target Classname
 
 ObjectViewer_Tooltip_Value=Value
 ObjectViewer_Tooltip_InjectionKey=Injection key
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
index 98bcb7155f..c9be474797 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
@@ -15,7 +15,9 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
 import javax.inject.Named;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
@@ -50,12 +52,14 @@
 import org.eclipse.jface.viewers.TableViewerColumn;
 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.Table;
 import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Text;
 
 /**
  * This handler exports all Id values within the application model to a file for
@@ -64,6 +68,8 @@
  * <code>AppModelId.java</code>.
  */
 public class ExportIdsHandler {
+	public static final String DEFAULT_APPMODELID_CLASSNAME = "AppModelId";
+
 	@Execute
 	public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell, @Translation Messages messages, IModelResource resource, IResourcePool pool, IProject project) {
 		TitleAreaDialog dialog = new ExportIdDialog(shell, messages, resource.getRoot(), pool, project);
@@ -76,6 +82,7 @@ static class ExportIdDialog extends TitleAreaDialog {
 		private IResourcePool pool;
 		private JavaClass clazz;
 		private CheckboxTableViewer viewer;
+		private Text textClassName;
 
 		public ExportIdDialog(Shell parentShell, Messages messages, IObservableList list, IResourcePool pool, IProject project) {
 			super(parentShell);
@@ -84,7 +91,6 @@ public ExportIdDialog(Shell parentShell, Messages messages, IObservableList list
 			this.pool = pool;
 
 			clazz = new JavaClass();
-			clazz.name = "AppModelId"; //$NON-NLS-1$
 
 			if (JavaProject.hasJavaNature(project)) {
 				try {
@@ -111,8 +117,28 @@ protected Control createDialogArea(Composite parent) {
 			setMessage(messages.ExportIdsHandler_Dialog_DialogMessage);
 			setTitleImage(pool.getImageUnchecked(ResourceProvider.IMG_Wizban16_extstr_wiz));
 
-			Composite container = (Composite) super.createDialogArea(parent);
-			container.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+			Composite content = (Composite) super.createDialogArea(parent);
+			content.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+			Composite container = new Composite(content, SWT.NONE);
+			container.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+			GridLayout gl = new GridLayout(2, false);
+			gl.numColumns = 2;
+			gl.marginBottom = 4;
+
+			container.setLayout(gl);
+			Label lblTargetClass = new Label(container, SWT.NONE);
+			lblTargetClass.setText(messages.ExportIdsHandler_Dialog_TargetClassName);
+
+			textClassName = new Text(container, SWT.BORDER);
+			textClassName.setText(DEFAULT_APPMODELID_CLASSNAME);
+
+			GridData gdcn = new GridData();
+			gdcn.horizontalAlignment = SWT.FILL;
+			gdcn.grabExcessHorizontalSpace = true;
+
+			textClassName.setLayoutData(gdcn);
 			Table t = new Table(container, SWT.BORDER | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.CHECK);
 
 			GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
@@ -120,6 +146,7 @@ protected Control createDialogArea(Composite parent) {
 			container.setLayoutData(gd);
 
 			GridData gd2 = new GridData(SWT.FILL, SWT.FILL, true, true);
+			gd2.horizontalSpan = 2;
 			gd2.heightHint = t.getItemHeight() * 17;
 			t.setHeaderVisible(true);
 			t.setLinesVisible(true);
@@ -219,6 +246,8 @@ public String getText(Object element) {
 
 		@Override
 		protected void okPressed() { // See AbstractNewClassWizard
+			clazz.name = textClassName.getText();
+
 			Object[] els = viewer.getCheckedElements();
 			if (els.length > 0) {
 				try {

From d4fb68e65e11643ae928fcbd7025e091f13831a7 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bsd@mt.ca>
Date: Mon, 26 Jun 2017 12:15:09 -0400
Subject: [PATCH 0990/1286] Bug 518786 - PartContributionEditor.createOpen must
 guard against invalid user inputs

Change-Id: I069730bc3b29211675ea17a7aa6637fd91ac1c6a
---
 .../extension/PartContributionEditor.java     | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
index 574ada9a2e..c837602803 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
@@ -13,6 +13,7 @@
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.e4.internal.tools.wizards.classes.NewPartClassWizard;
 import org.eclipse.e4.tools.emf.editor3x.Messages;
@@ -42,15 +43,15 @@
 public class PartContributionEditor implements IContributionClassCreator {
 	@Override
 	public void createOpen(MContribution contribution, EditingDomain domain,
-		IProject project, Shell shell) {
+			IProject project, Shell shell) {
 		createOpen(contribution, domain, project, shell, false);
 	}
 
 	private void createOpen(MContribution contribution, EditingDomain domain,
-		IProject project, Shell shell, boolean forceNew) {
+			IProject project, Shell shell, boolean forceNew) {
 		if (forceNew || contribution.getContributionURI() == null
-			|| contribution.getContributionURI().trim().length() == 0
-			|| !contribution.getContributionURI().startsWith("bundleclass:")) { //$NON-NLS-1$
+				|| contribution.getContributionURI().trim().length() == 0
+				|| !contribution.getContributionURI().startsWith("bundleclass:")) { //$NON-NLS-1$
 			final NewPartClassWizard wizard = new NewPartClassWizard(contribution.getContributionURI());
 			wizard.init(null, new StructuredSelection(project));
 			final WizardDialog dialog = new WizardDialog(shell, wizard);
@@ -72,8 +73,8 @@ private void createOpen(MContribution contribution, EditingDomain domain,
 					}
 
 					final Command cmd = SetCommand.create(domain, contribution,
-						ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
-						"bundleclass://" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified); //$NON-NLS-1$ //$NON-NLS-2$
+							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
+							"bundleclass://" + Util.getBundleSymbolicName(f.getProject()) + "/" + fullyQualified); //$NON-NLS-1$ //$NON-NLS-2$
 					if (cmd.canExecute()) {
 						domain.getCommandStack().execute(cmd);
 					}
@@ -83,15 +84,18 @@ private void createOpen(MContribution contribution, EditingDomain domain,
 				}
 			}
 		} else {
+			IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
 			final URI uri = URI.createURI(contribution.getContributionURI());
 			if (uri.hasAuthority() && uri.segmentCount() == 1) {
 				final String symbolicName = uri.authority();
 				final String fullyQualified = uri.segment(0);
-				IProject p = ResourcesPlugin.getWorkspace().getRoot()
-					.getProject(symbolicName);
-
-				if (!p.exists()) {
-					for (final IProject check : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
+				IProject p = null;
+				// shortcut: check if there's a project with this symbolicName
+				if (workspaceRoot.getLocation().isValidSegment(symbolicName)) {
+					p = workspaceRoot.getProject(symbolicName);
+				}
+				if (p == null || !p.exists()) {
+					for (final IProject check : workspaceRoot.getProjects()) {
 						final String name = Util.getBundleSymbolicName(check);
 						if (symbolicName.equals(name)) {
 							p = check;
@@ -128,7 +132,7 @@ private void createOpen(MContribution contribution, EditingDomain domain,
 				}
 			} else {
 				MessageDialog.openError(shell, Messages.ContributionEditor_InvalidURL,
-					Messages.ContributionEditor_CurrentURLIsInvalid);
+						Messages.ContributionEditor_CurrentURLIsInvalid);
 			}
 		}
 	}

From a83aaccdae672314b49f50063cde4bd0e20dc271 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 30 Jun 2017 11:45:12 +0200
Subject: [PATCH 0991/1286] Bug 519018 - [Graphics] Replace package_obj.gif
 with png file in org.eclipse.e4.tools.emf.ui

Change-Id: I729af732593345de318026ab9dfe759fbb28646d
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../icons/full/obj16/package_obj.png          | Bin 0 -> 507 bytes
 .../icons/full/obj16/package_obj@2x.png       | Bin 0 -> 1012 bytes
 .../dialogs/NonReferencedActionPage.java      |  18 +++++++-------
 .../dialogs/NonReferencedResourceDialog.java  |  22 +++++++++---------
 4 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj@2x.png

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a55b1a19052127838fe56d7073ab5b4185e6a98
GIT binary patch
literal 507
zcmV<X0R;YuP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005PNkl<Zc-qaA
z+be@%9LN0$E?l~BB^QWXIFvQbnaJcg?44s?p-5xc*4RvP+y$Gl$xM+`vYbXQX~XN3
zLQ=wo3;%!%e7%j>;kj_>sc%nxdip-UK2MLI-@jktxX}GSA7*;WUKuU*#`JR0ex*(j
z1#iY^M9;(mySf|~i*j7s)VN$yz+s@FEf#RB6F1-NV2p;nyX=ivu%Q&=;mClO8!Mhz
zBhKb!m~P6$!=e6*ofyGdrPx%8$OUU1CAi%k!sGEc?wAoASz4g0O#fwjIylWuu(cPG
z3s$5>a89>^os+|9X@h;Z3aUIl9N+A4rVZNz6<C$#`xb~}!|v&XD5wkgFf|A<C{BSQ
zCmynFzH3(sc^ITpF<CD}Ek6=IuS3N|1et2Gz%F*-YI6Xm%NlI!>LAbI;dnuX3tJz~
zS2Wns(U`2xco#*72l`B5p|d%O`X7nxY%6y=&qJca)C@~)2HAnRD$_%v!`$o|+g;+G
zp%GJ+spJBqB+Vu9WM07ulVPjBg7cB<!Pa{yOh}T+1$vR-W3(g*?os6@!kZaN6JCi0
x)}r8mSt=yRJ(Ae4CvRq=BK-gSKZv&7)+hUBTqIF7Rwn=e002ovPDHLkV1ks4?Lz<n

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj@2x.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..427f8e3b6d6c1bed8982d35d2f46369026333a8d
GIT binary patch
literal 1012
zcmV<Q0}K3#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000BKNkl<Zc-rlk
z+f$5T9LN1bTsz$4RG4xoD$TOhVnviuVr#Y(E9oR{v~8uVgh)DSPqmT`ilptZIVESt
zg>hrdd_BM4_AZ5bW?YytJu~0go6mgT@B2Kz_xrxPV8Q&FUw^sOOBRCk{{^_MU-r5^
zQ;oT#1dw4}hKMiH0h}jxKt^!^i&;{<VY~cJ*^ftq<ZjBum^~NcZ3XZ+@-f_!g@Nno
z=&>Azt2hp+TUN4$8h^vpdbu{^e)h5-+a@2tnh^!kv#xV^^QaOZMla#*kOdRHB^Y(&
z;lYgzbXFWfZgdcfxxp#Ut#J9wb(AKsmn}mjAK+G+8l=hoQhXf0jL(xd@abs{UJabb
zxa$la)*H|z?yf98oHf}eIM467&hkU-)tVL|AD~&k4J5jg_ajwo`eCe^19{p`W1#LB
z?p7wjxI36N(QCrH;fwh6MB&Q3+|A>-Q=Z6PE&6cz0F5askjC2!FwtXT!x#5T@c4Ei
zhQ#^yT}>5Rdl1=?fh>>Up8w2s6vEwdiaA&D0rqN236l>{uZsZbVS@p~t=Sm0=V8Q}
zgGXZ6`fJko{2j(vWQ6;(XsdmkO>km(`>zR3?2_$t40|;uhsp=2OWF!jm*oiVUD2aY
zT$Fyht90lnOW=z)XGP=420zv`?kaJ~V(YzJQ)V=K)gRs>AD}id3?yrg2KItoaGue^
zA%3lS8nm2Lqdt8ruIqw*0j6_W*oezgxDfWLOALW@wMH&og!nZ}kQTZMd7AY+>4n;0
zoKgoOJ<Q*C;hEBHTrQ3zK+HuDief@g8W)Bf@tEp2ukf|ztkwO`11PI{e=tZRwp={9
zW8|WF+F67#XFdiSPN26s1uj#(@4~Zj&Z2$nRUI27KLb^<n?O<;?!B)GP2MJ~^){gr
zU>fJ1-k7eE1MF3`Cs00sWzPnX=4wJEz-&#}VNPH#OUyd?0F}GfgEUtY(mas7O*qAQ
zlqM|TCUlt(veyOeTKNFycLsvQO(@J?-lv8$Pc_`HO{g^H56%epEzyKEsc@c+W3P%G
z0rCOLH0wa3K^hhfNasm|=4-f$BrX}{T`)+EY0aL&9pznW&DFA3xyD~UfH`U{NZl8`
z4M+7$cir<-!!>7Vd~d@)az(LdFhsIfY1C@@048++NDkv(w2Kc9n&fuz*g1t^YrYnZ
znUSa!Z#U`)lA~}Yw-44Su0|KiUS{=5`2c5Ct05!hi%5noRxOtgP^?<<O~zFDCX``K
iD!;Gu{|n~V%=I1S@;iej43l&K0000<MNUMnLSTY+3g;C7

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
index f84d3e037c..7afbb72b28 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
@@ -68,7 +68,7 @@ public class NonReferencedActionPage extends WizardPage {
 	private final BundleImageCache imageCache;
 
 	protected NonReferencedActionPage(IProject project, String bundle, IFile file, String installLocation,
-		IEclipseContext context) {
+			IEclipseContext context) {
 		super(Messages.NonReferencedActionPage_NonreferencedResourceAction);
 
 		this.project = project;
@@ -80,7 +80,7 @@ protected NonReferencedActionPage(IProject project, String bundle, IFile file, S
 		imageCache = context.get(BundleImageCache.class);
 
 		setImageDescriptor(ImageDescriptor.createFromImage(imageCache.create(Plugin.ID,
-			"/icons/full/wizban/newefix_wizban.png"))); //$NON-NLS-1$
+				"/icons/full/wizban/newefix_wizban.png"))); //$NON-NLS-1$
 
 		if (bundle == null && installLocation != null) {
 			this.bundle = FilteredContributionDialog.getBundle(installLocation);
@@ -238,7 +238,7 @@ public void run() {
 			final Button btnImport = new Button(group, SWT.RADIO);
 			btnImport.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			btnImport.setText(Messages.NonReferencedResourceDialog_importPackage);
-			btnImport.setImage(imageCache.create("/icons/full/obj16/package_obj.gif")); //$NON-NLS-1$
+			btnImport.setImage(imageCache.create("/icons/full/obj16/package_obj.png")); //$NON-NLS-1$
 			btnImport.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -317,22 +317,22 @@ public void run() {
 									try {
 										final ContributionData contributionData = cdf.getContributionData();
 										bundleId = BundleConverter.convertProjectToBundle(
-											contributionData.installLocation, project.getWorkspace());
+												contributionData.installLocation, project.getWorkspace());
 										if (bundleId != null) {
 
 											final ContributionData cdConverted = new ContributionData(bundleId,
-												contributionData.className, contributionData.sourceType,
-												contributionData.iconPath);
+													contributionData.className, contributionData.sourceType,
+													contributionData.iconPath);
 											cdConverted.installLocation = installLocation;
 											cdConverted.resourceRelativePath = Path
-												.fromOSString(contributionData.iconPath).removeFirstSegments(1)
-												.toOSString();
+													.fromOSString(contributionData.iconPath).removeFirstSegments(1)
+													.toOSString();
 											doRequireBundle(bundleId, installLocation);
 											context.set("resolvedFile", new ContributionDataFile(cdConverted)); //$NON-NLS-1$
 										}
 									} catch (final Exception e1) {
 										MessageDialog.openError(getShell(), Messages.NonReferencedResourceDialog_error,
-											e1.getMessage());
+												e1.getMessage());
 									}
 								}
 							};
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
index 969c9260c9..aee3f7a50c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
@@ -66,7 +66,7 @@ public class NonReferencedResourceDialog extends TitleAreaDialog {
 	private final IEclipseContext context;
 
 	public NonReferencedResourceDialog(Shell parentShell, IProject project, String bundle, IFile file,
-		String installLocation, IEclipseContext context) {
+			String installLocation, IEclipseContext context) {
 		super(parentShell);
 		this.project = project;
 		this.bundle = bundle;
@@ -195,7 +195,7 @@ protected Control createDialogArea(Composite parent) {
 				final Text label6 = new Text(comp, SWT.SINGLE | SWT.LEAD | SWT.READ_ONLY);
 				label6.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 				label6
-					.setText("platform:/plugin/" + bundle + "/" + file.getFullPath().removeFirstSegments(1).toOSString()); //$NON-NLS-1$ //$NON-NLS-2$
+				.setText("platform:/plugin/" + bundle + "/" + file.getFullPath().removeFirstSegments(1).toOSString()); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		}
 
@@ -235,7 +235,7 @@ public void run() {
 			final Button btnImport = new Button(group, SWT.RADIO);
 			btnImport.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			btnImport.setText(Messages.NonReferencedResourceDialog_importPackage);
-			btnImport.setImage(imageCache.create("/icons/full/obj16/package_obj.gif")); //$NON-NLS-1$
+			btnImport.setImage(imageCache.create("/icons/full/obj16/package_obj.png")); //$NON-NLS-1$
 			btnImport.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -308,22 +308,22 @@ public void run() {
 									try {
 										final ContributionData contributionData = cdf.getContributionData();
 										bundleId = BundleConverter.convertProjectToBundle(
-											contributionData.installLocation, project.getWorkspace());
+												contributionData.installLocation, project.getWorkspace());
 										if (bundleId != null) {
 
 											final ContributionData cdConverted = new ContributionData(bundleId,
-												contributionData.className, contributionData.sourceType,
-												contributionData.iconPath);
+													contributionData.className, contributionData.sourceType,
+													contributionData.iconPath);
 											cdConverted.installLocation = installLocation;
 											cdConverted.resourceRelativePath = Path
-												.fromOSString(contributionData.iconPath).removeFirstSegments(1)
-												.toOSString();
+													.fromOSString(contributionData.iconPath).removeFirstSegments(1)
+													.toOSString();
 											doRequireBundle(bundleId, installLocation);
 											result = new ContributionDataFile(cdConverted);
 										}
 									} catch (final Exception e1) {
 										MessageDialog.openError(getShell(), Messages.NonReferencedResourceDialog_error,
-											e1.getMessage());
+												e1.getMessage());
 									}
 								}
 							};
@@ -369,7 +369,7 @@ public void widgetSelected(SelectionEvent e) {
 							@Override
 							public void run() {
 								final ReferencedProjectPickerDialog dlg = new ReferencedProjectPickerDialog(getShell(),
-									project) {
+										project) {
 									@Override
 									protected Control createContents(Composite parent) {
 										final Control ret = super.createContents(parent);
@@ -437,7 +437,7 @@ public IFile getResult() {
 	public void copyResourceToProject(IProject project) {
 		try {
 			final ProjectFolderPickerDialog dlg = new ProjectFolderPickerDialog(getShell(), project, file.getFullPath()
-				.toOSString()) {
+					.toOSString()) {
 				@Override
 				protected Control createContents(Composite parent) {
 					final Control ret = super.createContents(parent);

From 96d1203c16a6adeccca1a7c182718f79396b8514 Mon Sep 17 00:00:00 2001
From: Erdal Karaca <erdal.karaca.de@googlemail.com>
Date: Mon, 17 Jul 2017 21:13:03 +0200
Subject: [PATCH 0992/1286] Bug 519770 - Model editor should support copy of
 multiple elements

Change-Id: Ice5500c5e6b796d484e564d7ee2fb618761ae70e
Signed-off-by: Erdal Karaca <erdal.karaca.de@googlemail.com>
---
 .../emf/ui/internal/common/ModelEditor.java   | 200 ++++++++++++------
 .../common/component/StringModelFragment.java |  62 ++++--
 2 files changed, 185 insertions(+), 77 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 6fd042ab82..783e87774b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -170,6 +170,7 @@
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.e4.ui.model.fragment.MModelFragment;
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
+import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.e4.ui.model.internal.ModelUtils;
 import org.eclipse.e4.ui.services.IServiceConstants;
@@ -177,6 +178,7 @@
 import org.eclipse.e4.ui.workbench.UIEvents.EventTags;
 import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
 import org.eclipse.emf.databinding.IEMFProperty;
@@ -306,7 +308,6 @@ public class ModelEditor implements IGotoObject {
 	/** An imageRegistry for dynamic component images (see bug #403583) */
 	private final ImageRegistry componentImages = new ImageRegistry();
 
-
 	@Inject
 	ESelectionService selectionService;
 
@@ -534,8 +535,8 @@ private void findAndHighlight(Control control) {
 
 				if (o instanceof MPart) {
 					System.err.println(getClass().getName() + ".findAndHighLight: " + o); //$NON-NLS-1$
-					System.err.println(getClass().getName()
-							+ ".findAndHighLight: " + ((EObject) o).eContainingFeature()); //$NON-NLS-1$
+					System.err
+					.println(getClass().getName() + ".findAndHighLight: " + ((EObject) o).eContainingFeature()); //$NON-NLS-1$
 				}
 
 				viewer.setSelection(new StructuredSelection(o));
@@ -693,8 +694,8 @@ public void menuAboutToShow(IMenuManager manager) {
 				if (!s.isEmpty() && noSelected == 1) {
 					List<Action> actions;
 					if (s.getFirstElement() instanceof VirtualEntry<?>) {
-						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId()).getActions(
-								s.getFirstElement());
+						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId())
+								.getActions(s.getFirstElement());
 						if (actions.size() > 0) {
 							final MenuManager addMenu = new MenuManager(messages.ModelEditor_AddChild);
 							for (final Action a : actions) {
@@ -704,8 +705,8 @@ public void menuAboutToShow(IMenuManager manager) {
 							manager.add(addMenu);
 						}
 
-						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId()).getActionsImport(
-								s.getFirstElement());
+						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId())
+								.getActionsImport(s.getFirstElement());
 						if (actions.size() > 0) {
 							final MenuManager menu = new MenuManager(messages.ModelEditor_Import3x);
 							for (final Action a : actions) {
@@ -759,8 +760,8 @@ public void menuAboutToShow(IMenuManager manager) {
 
 						if (o.eContainer() != null) {
 							addSeparator = true;
-							manager.add(new Action(messages.ModelEditor_Delete, ImageDescriptor
-									.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
+							manager.add(new Action(messages.ModelEditor_Delete, ImageDescriptor.createFromImage(
+									resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
 								@Override
 								public void run() {
 									final Command cmd = DeleteCommand.create(modelProvider.getEditingDomain(), o);
@@ -878,8 +879,8 @@ public void run() {
 					final Action nlsAction = new Action(messages.ModelEditor_ExternalizeStrings) {
 						@Override
 						public void run() {
-							final ExternalizeStringHandler h = ContextInjectionFactory.make(
-									ExternalizeStringHandler.class, context);
+							final ExternalizeStringHandler h = ContextInjectionFactory
+									.make(ExternalizeStringHandler.class, context);
 							ContextInjectionFactory.invoke(h, Execute.class, context);
 						}
 					};
@@ -1105,8 +1106,8 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		final String property = System
 				.getProperty(ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED);
 		if (property != null || preferences.getBoolean(ModelEditorPreferences.TAB_FORM_SEARCH_SHOW, false)) {
-			final FilteredTree viewParent = new FilteredTree(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL
-					| SWT.V_SCROLL, new PatternFilter(true));
+			final FilteredTree viewParent = new FilteredTree(treeArea,
+					SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(true));
 			tempViewer = viewParent.getViewer();
 		} else {
 			tempViewer = new TreeViewerEx(treeArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL,
@@ -1187,8 +1188,8 @@ public void treeCollapsed(TreeEvent e) {
 
 		final int ops = DND.DROP_MOVE;
 		viewer.addDragSupport(ops, new Transfer[] { MemoryTransfer.getInstance() }, new DragListener(viewer));
-		viewer.addDropSupport(ops, new Transfer[] { MemoryTransfer.getInstance() }, new DropListener(viewer,
-				modelProvider.getEditingDomain()));
+		viewer.addDropSupport(ops, new Transfer[] { MemoryTransfer.getInstance() },
+				new DropListener(viewer, modelProvider.getEditingDomain()));
 
 		return viewer;
 	}
@@ -1203,8 +1204,8 @@ private void registerContributedVirtualEditors() {
 			}
 
 			final IContributionFactory fact = context.get(IContributionFactory.class);
-			final AbstractComponentEditor editor = (AbstractComponentEditor) fact.create(
-					"bundleclass://" + el.getContributor().getName() + "/" + el.getAttribute("class"), context); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			final AbstractComponentEditor editor = (AbstractComponentEditor) fact
+					.create("bundleclass://" + el.getContributor().getName() + "/" + el.getAttribute("class"), context); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			registerVirtualEditor(el.getAttribute("id"), editor); //$NON-NLS-1$
 		}
 	}
@@ -1216,7 +1217,8 @@ private void registerVirtualEditors() {
 		registerVirtualEditor(VIRTUAL_COMMAND, ContextInjectionFactory.make(VCommandEditor.class, context));
 		registerVirtualEditor(VIRTUAL_APPLICATION_WINDOWS,
 				ContextInjectionFactory.make(VApplicationWindowEditor.class, context));
-		registerVirtualEditor(VIRTUAL_WINDOW_WINDOWS, ContextInjectionFactory.make(VWindowWindowsEditor.class, context));
+		registerVirtualEditor(VIRTUAL_WINDOW_WINDOWS,
+				ContextInjectionFactory.make(VWindowWindowsEditor.class, context));
 		registerVirtualEditor(VIRTUAL_PERSPECTIVE_WINDOWS,
 				ContextInjectionFactory.make(VPerspectiveWindowsEditor.class, context));
 		registerVirtualEditor(VIRTUAL_WINDOW_CONTROLS,
@@ -1270,7 +1272,8 @@ private void registerContributedEditors() {
 				final EClass eClass = desc.getEClass();
 				final IContributionFactory fact = context.get(IContributionFactory.class);
 				final AbstractComponentEditor editor = (AbstractComponentEditor) fact.create(
-						"bundleclass://" + el.getContributor().getName() + "/" + desc.getEditorClass().getName(), context); //$NON-NLS-1$ //$NON-NLS-2$
+						"bundleclass://" + el.getContributor().getName() + "/" + desc.getEditorClass().getName(), //$NON-NLS-1$ //$NON-NLS-2$
+						context);
 				registerEditor(eClass, editor);
 			} catch (final CoreException e) {
 				e.printStackTrace();
@@ -1318,16 +1321,20 @@ public List<AbstractElementEditorContribution> getTabContributionsForClass(Class
 	}
 
 	private void registerDefaultEditors() {
-		// System.err.println(getClass().getName() + ".registerDefaultEditors: " + resourcePool); //$NON-NLS-1$
+		// System.err.println(getClass().getName() + ".registerDefaultEditors: " +
+		// resourcePool); //$NON-NLS-1$
 
 		registerEditor(ApplicationPackageImpl.Literals.APPLICATION,
 				ContextInjectionFactory.make(ApplicationEditor.class, context));
-		registerEditor(ApplicationPackageImpl.Literals.ADDON, ContextInjectionFactory.make(AddonsEditor.class, context));
+		registerEditor(ApplicationPackageImpl.Literals.ADDON,
+				ContextInjectionFactory.make(AddonsEditor.class, context));
 
 		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING,
 				ContextInjectionFactory.make(KeyBindingEditor.class, context));
-		registerEditor(CommandsPackageImpl.Literals.HANDLER, ContextInjectionFactory.make(HandlerEditor.class, context));
-		registerEditor(CommandsPackageImpl.Literals.COMMAND, ContextInjectionFactory.make(CommandEditor.class, context));
+		registerEditor(CommandsPackageImpl.Literals.HANDLER,
+				ContextInjectionFactory.make(HandlerEditor.class, context));
+		registerEditor(CommandsPackageImpl.Literals.COMMAND,
+				ContextInjectionFactory.make(CommandEditor.class, context));
 		registerEditor(CommandsPackageImpl.Literals.COMMAND_PARAMETER,
 				ContextInjectionFactory.make(CommandParameterEditor.class, context));
 		registerEditor(CommandsPackageImpl.Literals.PARAMETER,
@@ -1462,8 +1469,8 @@ public void setNotRenderedColor(@Preference(ModelEditorPreferences.NOT_RENDERED_
 	@Inject
 	public void setNotVisibleRenderedColor(
 			@Preference(ModelEditorPreferences.NOT_VISIBLE_AND_RENDERED_COLOR) String color) {
-		final RGB current = JFaceResources.getColorRegistry().getRGB(
-				ComponentLabelProvider.NOT_VISIBLE_AND_RENDERED_KEY);
+		final RGB current = JFaceResources.getColorRegistry()
+				.getRGB(ComponentLabelProvider.NOT_VISIBLE_AND_RENDERED_KEY);
 
 		if (current == null || !current.equals(color)) {
 			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_VISIBLE_AND_RENDERED_KEY,
@@ -1599,15 +1606,29 @@ public void paste() {
 		@SuppressWarnings("unchecked")
 		private void handleStructurePaste() {
 			final Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
-			Object o = clip.getContents(MemoryTransfer.getInstance());
+			Object contents = clip.getContents(MemoryTransfer.getInstance());
 			clip.dispose();
-			if (o == null) {
+			if (contents == null) {
 				return;
 			}
+			List<EObject> toCopy = new ArrayList<>();
+			if (contents instanceof EObject) {
+				toCopy.add(EcoreUtil.copy((EObject) contents));
+			} else if (contents instanceof List<?>) {
+				List<Object> list = (List<Object>) contents;
+				for (Object object : list) {
+					if (object instanceof EObject) {
+						toCopy.add(EcoreUtil.copy((EObject) object));
+					}
+				}
+			}
 
-			o = EcoreUtil.copy((EObject) o);
+			if (toCopy.isEmpty()) {
+				return;
+			}
 
 			final Object parent = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+			EObject probe = toCopy.get(0);
 
 			EStructuralFeature feature = null;
 			EObject container = null;
@@ -1615,44 +1636,98 @@ private void handleStructurePaste() {
 				final VirtualEntry<?> v = (VirtualEntry<?>) parent;
 				feature = ((IEMFProperty) v.getProperty()).getStructuralFeature();
 				container = (EObject) v.getOriginalParent();
-			} else {
-				if (parent instanceof MElementContainer<?>) {
+			} else if (parent instanceof EObject) {
+				container = (EObject) parent;
+				if (container instanceof MElementContainer<?>) {
 					feature = UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN;
-					container = (EObject) parent;
-				} else if (parent instanceof EObject) {
-					container = (EObject) parent;
-					final EClass eClass = container.eClass();
+				} else {
+					feature = determineTargetFeature(probe, container);
+					if (feature == null && container.eClass().equals(probe.eClass())
+							&& container.eContainer() != null) {
+						// it seems the user has still the original selection active,
+						// try to find the target feature using the container's container
+						container = container.eContainer();
+						feature = determineTargetFeature(probe, container);
+					}
+				}
+			}
 
-					for (final EStructuralFeature f : eClass.getEAllStructuralFeatures()) {
-						if (ModelUtils.getTypeArgument(eClass, f.getEGenericType()).isInstance(o)) {
-							feature = f;
-							break;
+			if (container == null) {
+				// no container selected that we can paste into
+				return;
+			}
+
+			if (feature == null) {
+				// no target feature derivable from current state of the editor
+				return;
+			}
+
+			List<EClass> targetChildrenClasses = new ArrayList<>();
+
+			if (container instanceof MStringModelFragment) {
+				MStringModelFragment stringModelFragment = (MStringModelFragment) container;
+				EClass targetType = StringModelFragment.findContainerType(stringModelFragment);
+				if (targetType != null) {
+					EStructuralFeature targetFeature = targetType
+							.getEStructuralFeature(stringModelFragment.getFeaturename());
+					if (targetFeature != null) {
+						List<FeatureClass> classes = StringModelFragment.getTargetChildrenClasses(targetType,
+								targetFeature.getName());
+						for (FeatureClass fclass : classes) {
+							targetChildrenClasses.add(fclass.eClass);
 						}
 					}
 				}
 			}
 
-			if (feature == FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS && container != null) {
-				final MApplicationElement el = (MApplicationElement) EcoreUtil.create(((EObject) o).eClass());
-				el.setElementId(((MApplicationElement) o).getElementId());
-				final Command cmd = AddCommand.create(getModelProvider().getEditingDomain(), container, feature, el);
-				if (cmd.canExecute()) {
-					getModelProvider().getEditingDomain().getCommandStack().execute(cmd);
+			CompoundCommand cc = new CompoundCommand();
+			for (EObject eObject : toCopy) {
+				if (!ModelUtils.getTypeArgument(eObject.eClass(), feature.getEGenericType()).isInstance(eObject)) {
+					// the object to paste does not fit into the target feature
+					continue;
+				}
+				if (!targetChildrenClasses.isEmpty() && !targetChildrenClasses.contains(eObject.eClass())) {
+					// there is a limited list of allowed target types
+					// and a fragment that is pointing to a different feature
+					continue;
+				}
+
+				if (feature == FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
+					final MApplicationElement el = (MApplicationElement) EcoreUtil.create(eObject.eClass());
+					el.setElementId(((MApplicationElement) eObject).getElementId());
+					final Command cmd = AddCommand.create(getModelProvider().getEditingDomain(), container, feature,
+							el);
+					if (cmd.canExecute()) {
+						cc.append(cmd);
+					}
+					return;
 				}
-				return;
-			}
 
-			if (feature != null && container != null) {
-				final Command cmd = AddCommand.create(getModelProvider().getEditingDomain(), container, feature, o);
+				final Command cmd = AddCommand.create(getModelProvider().getEditingDomain(), container, feature,
+						eObject);
 				if (cmd.canExecute()) {
-					getModelProvider().getEditingDomain().getCommandStack().execute(cmd);
+					cc.append(cmd);
 					if (isLiveModel()) {
-						if (container instanceof MElementContainer<?> && o instanceof MUIElement) {
-							((MElementContainer<MUIElement>) container).setSelectedElement((MUIElement) o);
+						if (container instanceof MElementContainer<?> && probe instanceof MUIElement) {
+							// the last selection wins
+							((MElementContainer<MUIElement>) container).setSelectedElement((MUIElement) eObject);
 						}
 					}
 				}
 			}
+			if (!cc.isEmpty()) {
+				getModelProvider().getEditingDomain().getCommandStack().execute(cc);
+			}
+		}
+
+		private EStructuralFeature determineTargetFeature(EObject probe, EObject container) {
+			final EClass eClass = container.eClass();
+			for (final EStructuralFeature f : eClass.getEAllReferences()) {
+				if (ModelUtils.getTypeArgument(eClass, f.getEGenericType()).isInstance(probe)) {
+					return f;
+				}
+			}
+			return null;
 		}
 
 		@Override
@@ -1669,13 +1744,20 @@ public void copy() {
 		}
 
 		private void handleStructureCopy() {
-			final Object o = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
-			if (o != null && o instanceof EObject) {
-				final Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
-				clip.setContents(new Object[] { EcoreUtil.copy((EObject) o) },
-						new Transfer[] { MemoryTransfer.getInstance() });
-				clip.dispose();
+			IStructuredSelection structuredSelection = (IStructuredSelection) viewer.getSelection();
+			List<EObject> toCopy = new ArrayList<>();
+			for (Object obj : structuredSelection.toList()) {
+				if (obj != null && obj instanceof EObject) {
+					EObject copy = EcoreUtil.copy((EObject) obj);
+					toCopy.add(copy);
+				}
 			}
+			if (toCopy.isEmpty()) {
+				return;
+			}
+			final Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
+			clip.setContents(new Object[] { toCopy }, new Transfer[] { MemoryTransfer.getInstance() });
+			clip.dispose();
 		}
 
 		@Override
@@ -2003,11 +2085,9 @@ private Object getFirstMatchingItem(EObject target, ObservableListTreeContentPro
 		return null;
 	}
 
-
 	@Inject
 	@Optional
-	public void refreshOnSave(
-			@UIEventTopic(UIEvents.Dirtyable.TOPIC_DIRTY) org.osgi.service.event.Event event,
+	public void refreshOnSave(@UIEventTopic(UIEvents.Dirtyable.TOPIC_DIRTY) org.osgi.service.event.Event event,
 			@Named(IServiceConstants.ACTIVE_PART) MPart part) {
 		// If the application model is saved (-> becomes undirty) we must
 		// refresh tree (bug 472706)
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 5b6c259d10..787a9d43c6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -188,13 +188,28 @@ public Composite doGetEditor(Composite parent, Object object) {
 	 * @return
 	 */
 	private EClass getSelectedContainer() {
-
 		if (selectedContainer != null) {
 			return selectedContainer;
 		}
 
 		// we get the StringModelFragment. If not initialized, no search...
 		StringModelFragmentImpl modelFragment = getStringModelFragment();
+		selectedContainer = findContainerType(modelFragment);
+
+		updateTitle();
+
+		return selectedContainer;
+	}
+
+	/**
+	 * Returns the selectedContainer, which is the EClass behind the Extended
+	 * Element ID. It can be known thanks to the dialog or must be computed from the
+	 * ID value
+	 *
+	 * @return
+	 */
+	public static EClass findContainerType(MStringModelFragment modelFragment) {
+		// we get the StringModelFragment. If not initialized, no search...
 		if (modelFragment == null) {
 			return null;
 		}
@@ -207,8 +222,7 @@ private EClass getSelectedContainer() {
 
 		// known ID for application are directly filtered.
 		if ("xpath:/".equals(parentElementId) || "org.eclipse.e4.legacy.ide.application".equals(parentElementId)) {
-			selectedContainer = ApplicationPackageImpl.eINSTANCE.getApplication();
-			return selectedContainer;
+			return ApplicationPackageImpl.eINSTANCE.getApplication();
 		}
 
 		// We have to proceed to a simple search on all elements in all resource
@@ -230,8 +244,7 @@ private EClass getSelectedContainer() {
 					if (o instanceof MApplication) {
 						EClass found = getTargetClassFromXPath((MApplication) o, xpath);
 						if (found != null) {
-							selectedContainer = found;
-							return selectedContainer;
+							return found;
 						}
 					}
 				} else {
@@ -239,16 +252,13 @@ private EClass getSelectedContainer() {
 					if ((o instanceof MApplicationElement)
 							&& (o.eContainingFeature() != FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS)
 							&& parentElementId.equals(((MApplicationElement) o).getElementId())) {
-						selectedContainer = o.eClass();
-						return selectedContainer;
+						return o.eClass();
 					}
 				}
 			}
 		}
 
-		updateTitle();
-
-		return selectedContainer;
+		return null;
 	}
 
 	private void updateTitle() {
@@ -605,7 +615,7 @@ public int compare(Action o1, Action o2) {
 	 *            : the xpath value without the 'xpath:' prefix
 	 * @return the list of EClass(es) matching this xpath
 	 */
-	private EClass getTargetClassFromXPath(MApplication application, String xpath) {
+	private static EClass getTargetClassFromXPath(MApplication application, String xpath) {
 
 		XPathContextFactory<EObject> f = EcoreXPathContextFactory.newInstance();
 		XPathContext xpathContext = f.newContext((EObject) application);
@@ -636,16 +646,35 @@ private EClass getTargetClassFromXPath(MApplication application, String xpath) {
 	 */
 
 	public List<FeatureClass> getTargetChildrenClasses() {
-		List<FeatureClass> result = Collections.emptyList();
-
+		List<FeatureClass> targetChildrenClasses = new ArrayList<>();
 		if (selectedContainer != null) {
+			List<FeatureClass> childTypes = getTargetChildrenClasses(selectedContainer,
+					getStringModelFragment().getFeaturename());
+			targetChildrenClasses.addAll(childTypes);
+		}
+		return targetChildrenClasses;
+	}
 
+	/**
+	 * This method computes the available classes that can be selected as child for
+	 * the current selected element. The result is cached in a map as the meta model
+	 * will not change !
+	 *
+	 * @param targetClass
+	 *            the target class to check against
+	 *
+	 * @return an empty list or the list for possible children
+	 */
+
+	public static List<FeatureClass> getTargetChildrenClasses(EClass targetClass, String featurename) {
+		List<FeatureClass> result = Collections.emptyList();
+
+		if (targetClass != null) {
 			// The top level class for children, is the class of the EReference
 			// bound to feature name
 			EReference childRef = null;
-			String featurename = getStringModelFragment().getFeaturename();
 
-			for (EReference ref : selectedContainer.getEAllReferences()) {
+			for (EReference ref : targetClass.getEAllReferences()) {
 				if (ref.getName().equals(featurename)) {
 					childRef = ref;
 					break;
@@ -661,7 +690,7 @@ public List<FeatureClass> getTargetChildrenClasses() {
 			// UIElementContainer<T extends UIElement>
 			// We must check if the selectedContainer extends
 			// UIElementContainer<XXX> and in this case childRef is XXX
-			final EClass childClass = (EClass) ModelUtils.getTypeArgument(selectedContainer,
+			final EClass childClass = (EClass) ModelUtils.getTypeArgument(targetClass,
 					childRef.getEGenericType());
 
 			// Search for descendant of ChildClass -> This result could be
@@ -678,7 +707,6 @@ public List<FeatureClass> getTargetChildrenClasses() {
 			}
 		}
 		return result;
-
 	}
 
 }

From 46963a0f46241d117d1da4a46da322a00389c9d4 Mon Sep 17 00:00:00 2001
From: Dani Megert <dmegert>
Date: Wed, 16 Aug 2017 15:18:45 +0200
Subject: [PATCH 0993/1286] Increased bundle version for Photon (4.8)

---
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index a1a9b04b3b..e6d43694a9 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.7.0.qualifier"
+      version="4.8.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 1aff2714fd..7143b65e7c 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>4.7.0-SNAPSHOT</version>
+  <version>4.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>

From b3a4952fa7b25da03ebf10839189c034fa1f90ce Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Thu, 17 Aug 2017 15:56:57 +0300
Subject: [PATCH 0994/1286] Bug 521061 - Move o.e.e4.core to Java 1.8

Change-Id: I4772bc491161f7dc8a247bd5c24bb0fd7a55f056
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 bundles/org.eclipse.e4.tools/.classpath              |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs             | 12 ++++++++----
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF    |  4 ++--
 bundles/org.eclipse.e4.tools/pom.xml                 |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/.classpath b/bundles/org.eclipse.e4.tools/.classpath
index e8ea977a69..eca7bdba8f 100644
--- a/bundles/org.eclipse.e4.tools/.classpath
+++ b/bundles/org.eclipse.e4.tools/.classpath
@@ -1,7 +1,7 @@
 <?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/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
index c05fbc85d7..520cf7018e 100644
--- a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
@@ -28,9 +28,10 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -47,7 +48,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -116,6 +117,9 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
@@ -136,7 +140,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index f357670deb..3d8851d2a2 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 4.7.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Version: 4.8.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index a488ce9807..b19fdb7814 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tool</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>4.7.0-SNAPSHOT</version>
+  <version>4.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From 1e188b8bad11968767e563a5f5f99a63265f64ca Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Thu, 17 Aug 2017 16:08:10 +0300
Subject: [PATCH 0995/1286] Increased bundle version for Photon (4.8)

Change-Id: I122b211f176dda0d51a143db180e20c95ec2d7e9
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index bf9f1440b2..9b22c0d0c6 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 4.7.0.qualifier
+Bundle-Version: 4.7.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index f9155b6397..fa6f527fc4 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.editor3x</artifactId>
-  <version>4.7.0-SNAPSHOT</version>
+  <version>4.7.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From 604d1854dbd4c48276315577348c04b3eafa9177 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Thu, 17 Aug 2017 16:18:14 +0300
Subject: [PATCH 0996/1286] Bug 521063 - Move o.e.e4.tools.services to Java 8

Change-Id: I35377dd1d57c8c9825ff7dc5ac57abb8956c192a
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../org.eclipse.e4.tools.services/.classpath  |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  8 +++
 .../.settings/org.eclipse.jdt.ui.prefs        |  4 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../tools/services/BasicResourceProvider.java | 12 +----
 .../services/impl/ResourceBundleHelper.java   | 50 +++++++++----------
 .../tools/services/impl/ResourceService.java  | 38 +++++++-------
 7 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.services/.classpath b/bundles/org.eclipse.e4.tools.services/.classpath
index e8ea977a69..eca7bdba8f 100644
--- a/bundles/org.eclipse.e4.tools.services/.classpath
+++ b/bundles/org.eclipse.e4.tools.services/.classpath
@@ -1,7 +1,7 @@
 <?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/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
index cd32e5711d..e28d402d66 100644
--- a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
@@ -21,8 +21,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
@@ -83,12 +86,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -111,6 +116,9 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
index e0627af010..336d4397f4 100644
--- a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
@@ -80,7 +80,7 @@ sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=false
 sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_functional_interfaces=true
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.correct_indentation=true
 sp_cleanup.format_source_code=true
@@ -118,7 +118,7 @@ sp_cleanup.sort_members_all=false
 sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_lambda=false
+sp_cleanup.use_lambda=true
 sp_cleanup.use_parentheses_in_expressions=false
 sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 83aec567df..3f3d0e3de8 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
 Bundle-Version: 4.7.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.emf.ui",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
 Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java
index e79a071cfc..c7e23f29bc 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java
@@ -1,6 +1,5 @@
 package org.eclipse.e4.tools.services;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.Map;
@@ -28,20 +27,11 @@ public Image getImage(Display display, String key) {
 		final URL url = FileLocator.find(context.getBundle(), new Path(properties.get(key)), null);
 
 		if (url != null) {
-			InputStream stream = null;
-			try {
-				stream = url.openStream();
+			try (InputStream stream = url.openStream()) {
 				return new Image(display, stream);
 			} catch (final Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
-			} finally {
-				if (stream != null) {
-					try {
-						stream.close();
-					} catch (final IOException e) {
-					}
-				}
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
index 4aa8f66335..adfa902f29 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 Dirk Fauth and others.
+ * Copyright (c) 2012, 2017 Dirk Fauth and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -86,7 +86,7 @@ public class ResourceBundleHelper {
 	 * @return the resource bundle
 	 */
 	public static ResourceBundle getResourceBundleForUri(String contributorURI, Locale locale,
-		BundleLocalization localization) {
+			BundleLocalization localization) {
 		if (contributorURI == null) {
 			return null;
 		}
@@ -151,7 +151,7 @@ public static ResourceBundle getResourceBundleForUri(String contributorURI, Loca
 						if (logService != null)
 						{
 							logService.log(LogService.LOG_ERROR,
-								"Failed to load specified ResourceBundle: " + contributorURI, e); //$NON-NLS-1$
+									"Failed to load specified ResourceBundle: " + contributorURI, e); //$NON-NLS-1$
 						}
 					}
 				}
@@ -226,7 +226,7 @@ public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale lo
 			// to achieve this we first search without a fallback to the default locale
 			try {
 				resourceBundle = ResourceBundle.getBundle(baseName, locale, loader,
-					ResourceBundle.Control.getNoFallbackControl(Control.FORMAT_DEFAULT));
+						ResourceBundle.Control.getNoFallbackControl(Control.FORMAT_DEFAULT));
 			} catch (final MissingResourceException e) {
 				// do nothing
 			}
@@ -235,7 +235,7 @@ public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale lo
 			if (resourceBundle == null) {
 				try {
 					resourceBundle = ResourceBundle.getBundle(baseName, Locale.getDefault(), loader,
-						ResourceBundle.Control.getNoFallbackControl(Control.FORMAT_DEFAULT));
+							ResourceBundle.Control.getNoFallbackControl(Control.FORMAT_DEFAULT));
 				} catch (final MissingResourceException e) {
 					// do nothing
 				}
@@ -302,7 +302,7 @@ public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale lo
 	 */
 	public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale locale, Bundle bundle) {
 		return getEquinoxResourceBundle(baseName, locale,
-			new BundleResourceBundleControl(bundle, true), new BundleResourceBundleControl(bundle, false));
+				new BundleResourceBundleControl(bundle, true), new BundleResourceBundleControl(bundle, false));
 	}
 
 	/**
@@ -353,7 +353,7 @@ public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale lo
 	 * @see ResourceBundle#getBundle(String, Locale, Control)
 	 */
 	public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale locale, Control withFallback,
-		Control withoutFallback) {
+			Control withoutFallback) {
 		ResourceBundle resourceBundle = null;
 
 		final String equinoxLocale = getEquinoxRootLocale();
@@ -469,7 +469,7 @@ public static Locale toLocale(String str) {
 
 		final String[] localeParts = str.split("_"); //$NON-NLS-1$
 		if (localeParts.length == 0 || localeParts.length > 3
-			|| localeParts.length == 1 && localeParts[0].length() == 0) {
+				|| localeParts.length == 1 && localeParts[0].length() == 0) {
 			throw new IllegalArgumentException("Invalid locale format: " + str); //$NON-NLS-1$
 		}
 		if (localeParts[0].length() == 1 || localeParts[0].length() > 2) {
@@ -547,8 +547,8 @@ public BundleResourceBundleControl(Bundle osgiBundle, boolean useFallback) {
 
 		@Override
 		public ResourceBundle newBundle(String baseName, Locale locale,
-			String format, ClassLoader loader, boolean reload)
-				throws IllegalAccessException, InstantiationException, IOException {
+				String format, ClassLoader loader, boolean reload)
+						throws IllegalAccessException, InstantiationException, IOException {
 
 			final String bundleName = toBundleName(baseName, locale);
 			ResourceBundle bundle = null;
@@ -557,23 +557,23 @@ public ResourceBundle newBundle(String baseName, Locale locale,
 				InputStream stream = null;
 				try {
 					stream = AccessController.doPrivileged(
-						new PrivilegedExceptionAction<InputStream>() {
-							@Override
-							public InputStream run() throws IOException {
-								InputStream is = null;
-								final URL url = osgiBundle.getEntry(resourceName);
-								if (url != null) {
-									final URLConnection connection = url.openConnection();
-									if (connection != null) {
-										// Disable caches to get fresh data for
-										// reloading.
-										connection.setUseCaches(false);
-										is = connection.getInputStream();
+							new PrivilegedExceptionAction<InputStream>() {
+								@Override
+								public InputStream run() throws IOException {
+									InputStream is = null;
+									final URL url = osgiBundle.getEntry(resourceName);
+									if (url != null) {
+										final URLConnection connection = url.openConnection();
+										if (connection != null) {
+											// Disable caches to get fresh data for
+											// reloading.
+											connection.setUseCaches(false);
+											is = connection.getInputStream();
+										}
 									}
+									return is;
 								}
-								return is;
-							}
-						});
+							});
 				} catch (final PrivilegedActionException e) {
 					throw (IOException) e.getException();
 				}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
index e39785d84d..621db7911e 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 BestSolution.at and others.
+ * Copyright (c) 2011, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -46,7 +46,7 @@ private enum Type {
 	}
 
 	static class PooledResource<T extends Resource> implements
-		IPooledResource<T> {
+	IPooledResource<T> {
 		private final Display display;
 		private int count;
 		private T resource;
@@ -54,7 +54,7 @@ static class PooledResource<T extends Resource> implements
 		private ResourceService resourceService;
 
 		PooledResource(Display display, ResourceService resourceService,
-			String id, T resource) {
+				String id, T resource) {
 			this.display = display;
 			this.id = id;
 			this.count = 1;
@@ -105,9 +105,9 @@ public ResourcePool(IResourceService resourceService, Display display) {
 		public Image getImage(String key) throws CoreException {
 			if (resourceService == null) {
 				throw new CoreException(
-					new Status(IStatus.ERROR,
-						ToolsServicesActivator.PLUGIN_ID,
-						Messages.ResourceService_PoolDisposed));
+						new Status(IStatus.ERROR,
+								ToolsServicesActivator.PLUGIN_ID,
+								Messages.ResourceService_PoolDisposed));
 			}
 			IPooledResource<Image> image = null;
 
@@ -128,9 +128,9 @@ public Image getImage(String key) throws CoreException {
 		public Font getFont(String key) throws CoreException {
 			if (resourceService == null) {
 				throw new CoreException(
-					new Status(IStatus.ERROR,
-						ToolsServicesActivator.PLUGIN_ID,
-						Messages.ResourceService_PoolDisposed));
+						new Status(IStatus.ERROR,
+								ToolsServicesActivator.PLUGIN_ID,
+								Messages.ResourceService_PoolDisposed));
 			}
 
 			IPooledResource<Font> font = null;
@@ -150,9 +150,9 @@ public Font getFont(String key) throws CoreException {
 		public Color getColor(String key) throws CoreException {
 			if (resourceService == null) {
 				throw new CoreException(
-					new Status(IStatus.ERROR,
-						ToolsServicesActivator.PLUGIN_ID,
-						Messages.ResourceService_PoolDisposed));
+						new Status(IStatus.ERROR,
+								ToolsServicesActivator.PLUGIN_ID,
+								Messages.ResourceService_PoolDisposed));
 			}
 			IPooledResource<Color> color = null;
 
@@ -164,7 +164,7 @@ public Color getColor(String key) throws CoreException {
 
 			if (color == null) {
 				color = resourceService.getColor(display,
-					key);
+						key);
 				pooledColors.add(color);
 			}
 			return color.getResource();
@@ -269,7 +269,7 @@ protected void removePooledResource(PooledResource<?> resource) {
 
 	@SuppressWarnings("unchecked")
 	private <R extends Resource> PooledResource<R> loadResource(
-		Display display, String key, Type type) {
+			Display display, String key, Type type) {
 		DisplayPool p = displayPool.get(display);
 		PooledResource<R> resource = null;
 
@@ -287,7 +287,7 @@ private <R extends Resource> PooledResource<R> loadResource(
 			resource.count++;
 		} else {
 			resource = new PooledResource<>(display, this, key,
-				(R) lookupResource(display, key, type));
+					(R) lookupResource(display, key, type));
 
 			if (p == null) {
 				p = new DisplayPool();
@@ -328,17 +328,17 @@ private <R> R lookupResource(Display display, String key, Type type) {
 			}
 		}
 		throw new IllegalArgumentException(Messages.ResourceService_NoProvider + key
-			+ "'."); //$NON-NLS-1$
+				+ "'."); //$NON-NLS-1$
 	}
 
 	private IResourceProviderService lookupOSGI(String key) {
 		try {
 			final Collection<ServiceReference<IResourceProviderService>> refs = context
-				.getServiceReferences(IResourceProviderService.class, "(" //$NON-NLS-1$
-					+ key + "=*)"); //$NON-NLS-1$
+					.getServiceReferences(IResourceProviderService.class, "(" //$NON-NLS-1$
+							+ key + "=*)"); //$NON-NLS-1$
 			if (!refs.isEmpty()) {
 				final ServiceReference<IResourceProviderService> ref = refs
-					.iterator().next();
+						.iterator().next();
 				return context.getService(ref);
 			}
 		} catch (final InvalidSyntaxException e) {

From eb40ebce51ecc6958650ffa52bc637a31f0f56fd Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Thu, 17 Aug 2017 16:30:57 +0300
Subject: [PATCH 0997/1286] Bug 521063 - Move o.e.e4.tools.services to Java 8

Bump version.

Change-Id: I605b15bb0036412fc0d336c6a714891877c1c4ab
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 3f3d0e3de8..436cb62c57 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
-Bundle-Version: 4.7.0.qualifier
+Bundle-Version: 4.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.emf.ui",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 208fbbffd7..241ce71480 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.services</artifactId>
-  <version>4.7.0-SNAPSHOT</version>
+  <version>4.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From 4d294a61e2903613ea38e0b2b807fce033daeb69 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Thu, 17 Aug 2017 17:08:27 +0300
Subject: [PATCH 0998/1286] Bug 521067 - Move o.e.e4.tools.emf.ui to Java 8

Bump minor, convert to lambdas and try-with-resource.

Change-Id: I31306a338ba230b40e86fdbcfc8f7050df8f951f
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../org.eclipse.e4.tools.emf.ui/.classpath    |   2 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  16 +-
 .../META-INF/MANIFEST.MF                      |   4 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml   |   2 +-
 .../eclipse/e4/tools/emf/ui/common/Util.java  |  54 +-
 .../emf/ui/common/component/IdGenerator.java  |  43 +-
 .../emf/ui/internal/common/ModelEditor.java   | 636 ++++++++----------
 .../emf/ui/internal/common/VirtualEntry.java  |  18 +-
 .../common/component/ControlFactory.java      | 122 ++--
 .../component/DirectMenuItemEditor.java       |  36 +-
 .../component/DirectToolItemEditor.java       |  32 +-
 .../component/HandledMenuItemEditor.java      |  20 +-
 .../component/HandledToolItemEditor.java      |  20 +-
 .../internal/common/component/MenuEditor.java |  60 +-
 .../component/PartDescriptorEditor.java       |  30 +-
 .../internal/common/component/PartEditor.java |  44 +-
 .../common/component/ToolItemEditor.java      |  28 +-
 .../common/component/WindowEditor.java        |  28 +-
 .../AbstractIconDialogWithHardcodedScope.java |  41 +-
 .../AbstractIconDialogWithScopeAndFilter.java |  20 +-
 .../dialogs/FilteredContributionDialog.java   |  34 +-
 .../common/objectdata/ObjectViewer.java       |  87 +--
 .../common/properties/ExportIdsHandler.java   |  18 +-
 .../properties/ExternalizeStringHandler.java  |  23 +-
 .../ProjectOSGiTranslationProvider.java       |  22 +-
 .../TargetPlatformContributionCollector.java  |  33 +-
 .../internal/common/uistructure/UIViewer.java |  88 ++-
 27 files changed, 628 insertions(+), 933 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.classpath b/bundles/org.eclipse.e4.tools.emf.ui/.classpath
index 738c284c5d..d3f10d84ab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.classpath
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.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/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
 			<accessrule kind="accessible" pattern="org/eclipse/e4/**"/>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
index 8f1b99fd75..7591ee53e3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -21,14 +21,17 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -45,7 +48,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -84,12 +87,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -112,6 +117,9 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
@@ -132,7 +140,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index e4a3557762..9efae60841 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.5.300.qualifier
+Bundle-Version: 4.6.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.core.databinding.property;bundle-version="1.2.100",
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index e90ff8d0c9..625b87e87f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.5.300-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index a2e533d18a..872a5e84ff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,8 +18,6 @@
 import java.util.TreeSet;
 
 import org.eclipse.core.databinding.Binding;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
@@ -398,34 +396,30 @@ public static boolean referenceIsModelFragmentCompliant(EReference r) {
 
 	public static final void addDecoration(Control control, Binding binding) {
 		final ControlDecoration dec = new ControlDecoration(control, SWT.BOTTOM);
-		binding.getValidationStatus().addValueChangeListener(new IValueChangeListener() {
-
-			@Override
-			public void handleValueChange(ValueChangeEvent event) {
-				final IStatus s = (IStatus) event.getObservableValue().getValue();
-				if (s.isOK()) {
-					dec.setDescriptionText(null);
-					dec.setImage(null);
-				} else {
-					dec.setDescriptionText(s.getMessage());
-
-					String fieldDecorationID = null;
-					switch (s.getSeverity()) {
-					case IStatus.INFO:
-						fieldDecorationID = FieldDecorationRegistry.DEC_INFORMATION;
-						break;
-					case IStatus.WARNING:
-						fieldDecorationID = FieldDecorationRegistry.DEC_WARNING;
-						break;
-					case IStatus.ERROR:
-					case IStatus.CANCEL:
-						fieldDecorationID = FieldDecorationRegistry.DEC_ERROR;
-						break;
-					}
-					final FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault()
-							.getFieldDecoration(fieldDecorationID);
-					dec.setImage(fieldDecoration == null ? null : fieldDecoration.getImage());
+		binding.getValidationStatus().addValueChangeListener(event -> {
+			final IStatus s = (IStatus) event.getObservableValue().getValue();
+			if (s.isOK()) {
+				dec.setDescriptionText(null);
+				dec.setImage(null);
+			} else {
+				dec.setDescriptionText(s.getMessage());
+
+				String fieldDecorationID = null;
+				switch (s.getSeverity()) {
+				case IStatus.INFO:
+					fieldDecorationID = FieldDecorationRegistry.DEC_INFORMATION;
+					break;
+				case IStatus.WARNING:
+					fieldDecorationID = FieldDecorationRegistry.DEC_WARNING;
+					break;
+				case IStatus.ERROR:
+				case IStatus.CANCEL:
+					fieldDecorationID = FieldDecorationRegistry.DEC_ERROR;
+					break;
 				}
+				final FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault()
+						.getFieldDecoration(fieldDecorationID);
+				dec.setImage(fieldDecoration == null ? null : fieldDecoration.getImage());
 			}
 		});
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
index 30753d9349..109155c53b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2015 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,11 +17,8 @@
 
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.FocusAdapter;
 import org.eclipse.swt.widgets.Control;
 
@@ -84,40 +81,26 @@ public void focusLost(org.eclipse.swt.events.FocusEvent e) {
 				}
 			});
 
-			control.addDisposeListener(new DisposeListener() {
-
-				@Override
-				public void widgetDisposed(DisposeEvent e) {
-					stopGenerating();
-				}
-			});
+			control.addDisposeListener(e -> stopGenerating());
 		}
 
 		observableValue2 = evpId.observe(master.getValue());
-		observableValue2.addValueChangeListener(listener2 = new IValueChangeListener() {
-
-			@Override
-			public void handleValueChange(ValueChangeEvent event) {
-				if (!ignore) {
-					stopGenerating();
-				}
+		observableValue2.addValueChangeListener(listener2 = event -> {
+			if (!ignore) {
+				stopGenerating();
 			}
 		});
 
 		observableValue = ebpLabel.observe(master.getValue());
-		observableValue.addValueChangeListener(listener = new IValueChangeListener() {
-
-			@Override
-			public void handleValueChange(ValueChangeEvent event) {
-				String labelValue = (String) ebpLabel.getValue(master.getValue());
-				if (labelValue == null) {
-					labelValue = ""; //$NON-NLS-1$
-				}
-				final String trimmedIdEnding = trimToLowercase(labelValue);
-				ignore = true;
-				evpId.setValue(master.getValue(), baseId + trimmedIdEnding);
-				ignore = false;
+		observableValue.addValueChangeListener(listener = event -> {
+			String labelValue = (String) ebpLabel.getValue(master.getValue());
+			if (labelValue == null) {
+				labelValue = ""; //$NON-NLS-1$
 			}
+			final String trimmedIdEnding = trimToLowercase(labelValue);
+			ignore = true;
+			evpId.setValue(master.getValue(), baseId + trimmedIdEnding);
+			ignore = false;
 		});
 
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 783e87774b..4a92de5373 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -33,12 +33,8 @@
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.core.databinding.observable.map.IMapChangeListener;
 import org.eclipse.core.databinding.observable.map.IObservableMap;
-import org.eclipse.core.databinding.observable.map.MapChangeEvent;
 import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
-import org.eclipse.core.databinding.observable.set.ISetChangeListener;
-import org.eclipse.core.databinding.observable.set.SetChangeEvent;
 import org.eclipse.core.databinding.observable.set.WritableSet;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
@@ -194,8 +190,6 @@
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.databinding.viewers.ObservableListTreeContentProvider;
@@ -208,12 +202,8 @@
 import org.eclipse.jface.resource.StringConverter;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeViewerListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeExpansionEvent;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -230,8 +220,6 @@
 import org.eclipse.swt.dnd.DragSourceEvent;
 import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.KeyListener;
@@ -246,7 +234,6 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.TreeItem;
@@ -401,13 +388,7 @@ public ModelEditor(Composite composite, IEclipseContext context, IModelResource
 				protected void updateResourceBundle() {
 					super.updateResourceBundle();
 					if (viewer != null) {
-						viewer.getControl().getDisplay().asyncExec(new Runnable() {
-
-							@Override
-							public void run() {
-								viewer.refresh();
-							}
-						});
+						viewer.getControl().getDisplay().asyncExec(() -> viewer.refresh());
 					}
 				}
 			};
@@ -418,13 +399,7 @@ public void run() {
 
 		// This is a workaround until Bug 437207 is merged.
 		// @PersistState will not be invoked.
-		composite.addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent arg0) {
-				persistState();
-			}
-		});
+		composite.addDisposeListener(arg0 -> persistState());
 	}
 
 	@PersistState
@@ -437,13 +412,9 @@ protected void persistState() {
 	@PostConstruct
 	void postCreate(Composite composite) {
 		if (project == null) {
-			keyListener = new Listener() {
-
-				@Override
-				public void handleEvent(Event event) {
-					if ((event.stateMask & SWT.ALT) == SWT.ALT) {
-						findAndHighlight(context.get(Display.class).getFocusControl());
-					}
+			keyListener = event -> {
+				if ((event.stateMask & SWT.ALT) == SWT.ALT) {
+					findAndHighlight(context.get(Display.class).getFocusControl());
 				}
 			};
 			context.get(Display.class).addFilter(SWT.MouseUp, keyListener);
@@ -619,62 +590,49 @@ public void keyReleased(final KeyEvent e) {
 				}
 			}
 		});
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				if (!event.getSelection().isEmpty()) {
-					final IStructuredSelection s = (IStructuredSelection) event.getSelection();
-					if (s.getFirstElement() instanceof EObject) {
-						final EObject obj = (EObject) s.getFirstElement();
-						final AbstractComponentEditor editor = getEditor(obj.eClass());
-						if (editor != null) {
-							currentEditor = editor;
-							sectionHeaderLabel.setText(editor.getLabel(obj));
-							iconLabel.setImage(editor.getImage(obj));
-							obsManager.runAndCollect(new Runnable() {
-
-								@Override
-								public void run() {
-									final Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
-									comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
-									layout.topControl = comp;
-									contentContainer.layout(true);
-								}
-							});
-						}
-					} else {
-						final VirtualEntry<?> entry = (VirtualEntry<?>) s.getFirstElement();
-						final AbstractComponentEditor editor = virtualEditors.get(entry.getId());
-						if (editor != null) {
-							currentEditor = editor;
-							sectionHeaderLabel.setText(editor.getLabel(entry));
-							iconLabel.setImage(editor.getImage(entry));
-							obsManager.runAndCollect(new Runnable() {
-
-								@Override
-								public void run() {
-									final Composite comp = editor.getEditor(contentContainer, s.getFirstElement());
-									comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
-									layout.topControl = comp;
-									contentContainer.layout(true);
-								}
-
-							});
-						}
+		viewer.addSelectionChangedListener(event -> {
+			if (!event.getSelection().isEmpty()) {
+				final IStructuredSelection s = (IStructuredSelection) event.getSelection();
+				if (s.getFirstElement() instanceof EObject) {
+					final EObject obj = (EObject) s.getFirstElement();
+					final AbstractComponentEditor editor1 = getEditor(obj.eClass());
+					if (editor1 != null) {
+						currentEditor = editor1;
+						sectionHeaderLabel.setText(editor1.getLabel(obj));
+						iconLabel.setImage(editor1.getImage(obj));
+						obsManager.runAndCollect(() -> {
+							final Composite comp = editor1.getEditor(contentContainer, s.getFirstElement());
+							comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
+							layout.topControl = comp;
+							contentContainer.layout(true);
+						});
 					}
-
-					// Rectangle r = scrolling.getClientArea();
-					// scrolling.setMinSize(contentContainer.computeSize(r.width,
-					// SWT.DEFAULT));
-					// scrolling.setOrigin(0, 0);
-					// scrolling.layout(true, true);
-
-					if (selectionService != null) {
-						selectionService.setSelection(s.getFirstElement());
+				} else {
+					final VirtualEntry<?> entry = (VirtualEntry<?>) s.getFirstElement();
+					final AbstractComponentEditor editor2 = virtualEditors.get(entry.getId());
+					if (editor2 != null) {
+						currentEditor = editor2;
+						sectionHeaderLabel.setText(editor2.getLabel(entry));
+						iconLabel.setImage(editor2.getImage(entry));
+						obsManager.runAndCollect(() -> {
+							final Composite comp = editor2.getEditor(contentContainer, s.getFirstElement());
+							comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
+							layout.topControl = comp;
+							contentContainer.layout(true);
+						});
 					}
+				}
 
+				// Rectangle r = scrolling.getClientArea();
+				// scrolling.setMinSize(contentContainer.computeSize(r.width,
+				// SWT.DEFAULT));
+				// scrolling.setOrigin(0, 0);
+				// scrolling.layout(true, true);
+
+				if (selectionService != null) {
+					selectionService.setSelection(s.getFirstElement());
 				}
+
 			}
 		});
 
@@ -682,283 +640,279 @@ public void run() {
 
 		final MenuManager mgr = new MenuManager();
 		mgr.setRemoveAllWhenShown(true);
-		mgr.addMenuListener(new IMenuListener() {
-
-			@Override
-			public void menuAboutToShow(IMenuManager manager) {
-				final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-				final List<?> listOfSelections = s.toList();
-				final int noSelected = listOfSelections.size();
-
-				boolean addSeparator = false;
-				if (!s.isEmpty() && noSelected == 1) {
-					List<Action> actions;
-					if (s.getFirstElement() instanceof VirtualEntry<?>) {
-						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId())
-								.getActions(s.getFirstElement());
-						if (actions.size() > 0) {
-							final MenuManager addMenu = new MenuManager(messages.ModelEditor_AddChild);
-							for (final Action a : actions) {
-								addSeparator = true;
-								addMenu.add(a);
-							}
-							manager.add(addMenu);
-						}
-
-						actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId())
-								.getActionsImport(s.getFirstElement());
-						if (actions.size() > 0) {
-							final MenuManager menu = new MenuManager(messages.ModelEditor_Import3x);
-							for (final Action a : actions) {
-								addSeparator = true;
-								menu.add(a);
-							}
-							manager.add(menu);
+		mgr.addMenuListener(manager -> {
+			final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+			final List<?> listOfSelections = s.toList();
+			final int noSelected = listOfSelections.size();
+
+			boolean addSeparator = false;
+			if (!s.isEmpty() && noSelected == 1) {
+				List<Action> actions;
+				if (s.getFirstElement() instanceof VirtualEntry<?>) {
+					actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId())
+							.getActions(s.getFirstElement());
+					if (actions.size() > 0) {
+						final MenuManager addMenu1 = new MenuManager(messages.ModelEditor_AddChild);
+						for (final Action a1 : actions) {
+							addSeparator = true;
+							addMenu1.add(a1);
 						}
+						manager.add(addMenu1);
+					}
 
-						if (addSeparator) {
-							manager.add(new Separator());
+					actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId())
+							.getActionsImport(s.getFirstElement());
+					if (actions.size() > 0) {
+						final MenuManager menu1 = new MenuManager(messages.ModelEditor_Import3x);
+						for (final Action a2 : actions) {
+							addSeparator = true;
+							menu1.add(a2);
 						}
+						manager.add(menu1);
+					}
 
-					} else {
+					if (addSeparator) {
+						manager.add(new Separator());
+					}
 
-						final EObject o = (EObject) s.getFirstElement();
-						final AbstractComponentEditor editor = getEditor(o.eClass());
+				} else {
 
-						// Build Add Child menu
-						if (editor != null) {
-							actions = new ArrayList<>(editor.getActions(s.getFirstElement()));
-						} else {
-							actions = new ArrayList<>();
-						}
+					final EObject o = (EObject) s.getFirstElement();
+					final AbstractComponentEditor editor = getEditor(o.eClass());
 
-						if (actions.size() > 0) {
-							final MenuManager addMenu = new MenuManager(messages.ModelEditor_AddChild);
-							for (final Action a : actions) {
-								addSeparator = true;
-								addMenu.add(a);
-							}
-							manager.add(addMenu);
-						}
+					// Build Add Child menu
+					if (editor != null) {
+						actions = new ArrayList<>(editor.getActions(s.getFirstElement()));
+					} else {
+						actions = new ArrayList<>();
+					}
 
-						// Build import menu
-						if (editor != null) {
-							actions = new ArrayList<>(editor.getActionsImport(s.getFirstElement()));
-						} else {
-							actions = new ArrayList<>();
+					if (actions.size() > 0) {
+						final MenuManager addMenu2 = new MenuManager(messages.ModelEditor_AddChild);
+						for (final Action a3 : actions) {
+							addSeparator = true;
+							addMenu2.add(a3);
 						}
+						manager.add(addMenu2);
+					}
 
-						if (actions.size() > 0) {
-							// TODO WIM - extract nls
-							final MenuManager menu = new MenuManager(messages.ModelEditor_Import3x);
-							for (final Action a : actions) {
-								addSeparator = true;
-								menu.add(a);
-							}
-							manager.add(menu);
-						}
+					// Build import menu
+					if (editor != null) {
+						actions = new ArrayList<>(editor.getActionsImport(s.getFirstElement()));
+					} else {
+						actions = new ArrayList<>();
+					}
 
-						if (o.eContainer() != null) {
+					if (actions.size() > 0) {
+						// TODO WIM - extract nls
+						final MenuManager menu2 = new MenuManager(messages.ModelEditor_Import3x);
+						for (final Action a4 : actions) {
 							addSeparator = true;
-							manager.add(new Action(messages.ModelEditor_Delete, ImageDescriptor.createFromImage(
-									resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
-								@Override
-								public void run() {
-									final Command cmd = DeleteCommand.create(modelProvider.getEditingDomain(), o);
-									if (cmd.canExecute()) {
-										modelProvider.getEditingDomain().getCommandStack().execute(cmd);
-									}
-								}
-							});
+							menu2.add(a4);
 						}
+						manager.add(menu2);
 					}
-				}
-				// multi selection
-				if (noSelected > 0) {
-					if (!isModelFragment() && modelExtractor != null) {
-						manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor
-								.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {
+
+					if (o.eContainer() != null) {
+						addSeparator = true;
+						manager.add(new Action(messages.ModelEditor_Delete, ImageDescriptor
+								.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
 							@Override
 							public void run() {
-								final ArrayList<MApplicationElement> maes = new ArrayList<>();
-								for (final Object objSelect : listOfSelections) {
-									EObject container = null;
-									if (objSelect instanceof VirtualEntry<?>) {
-
-										final VirtualEntry<?> ve = (VirtualEntry<?>) objSelect;
-										container = (EObject) ve.getOriginalParent();
-										final IObservableList list = ve.getList();
-										final Iterator<?> iterator = list.iterator();
-										while (iterator.hasNext()) {
-											maes.add((MApplicationElement) iterator.next());
-										}
-
-									} else {
-										container = ((EObject) objSelect).eContainer();
-										final MApplicationElement objSelect2 = (MApplicationElement) objSelect;
-										if (!(objSelect2 instanceof MApplication)) {
-											maes.add(objSelect2);
-										} else {
-											// can't extract application
-											return;
-										}
-
+								final Command cmd = DeleteCommand.create(modelProvider.getEditingDomain(), o);
+								if (cmd.canExecute()) {
+									modelProvider.getEditingDomain().getCommandStack().execute(cmd);
+								}
+							}
+						});
+					}
+				}
+			}
+			// multi selection
+			if (noSelected > 0) {
+				if (!isModelFragment() && modelExtractor != null) {
+					manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor
+							.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {
+						@Override
+						public void run() {
+							final ArrayList<MApplicationElement> maes = new ArrayList<>();
+							for (final Object objSelect : listOfSelections) {
+								EObject container = null;
+								if (objSelect instanceof VirtualEntry<?>) {
+
+									final VirtualEntry<?> ve = (VirtualEntry<?>) objSelect;
+									container = (EObject) ve.getOriginalParent();
+									final IObservableList list = ve.getList();
+									final Iterator<?> iterator = list.iterator();
+									while (iterator.hasNext()) {
+										maes.add((MApplicationElement) iterator.next());
 									}
 
-									final String containerId = ((MApplicationElement) container).getElementId();
-									if (containerId == null || containerId.length() == 0) {
-										MessageDialog.openError(viewer.getControl().getShell(), null,
-												messages.ModelEditor_ExtractFragment_NoParentId);
-
+								} else {
+									container = ((EObject) objSelect).eContainer();
+									final MApplicationElement objSelect2 = (MApplicationElement) objSelect;
+									if (!(objSelect2 instanceof MApplication)) {
+										maes.add(objSelect2);
+									} else {
+										// can't extract application
 										return;
 									}
 
 								}
 
-								if (modelExtractor.extract(viewer.getControl().getShell(), project, maes)) {
-									final Command cmd = DeleteCommand.create(modelProvider.getEditingDomain(), maes);
-									if (cmd.canExecute()) {
-										modelProvider.getEditingDomain().getCommandStack().execute(cmd);
-									}
+								final String containerId = ((MApplicationElement) container).getElementId();
+								if (containerId == null || containerId.length() == 0) {
+									MessageDialog.openError(viewer.getControl().getShell(), null,
+											messages.ModelEditor_ExtractFragment_NoParentId);
+
+									return;
 								}
 
 							}
-						});
-					}
 
+							if (modelExtractor.extract(viewer.getControl().getShell(), project, maes)) {
+								final Command cmd = DeleteCommand.create(modelProvider.getEditingDomain(), maes);
+								if (cmd.canExecute()) {
+									modelProvider.getEditingDomain().getCommandStack().execute(cmd);
+								}
+							}
+
+						}
+					});
 				}
 
-				final IExtensionRegistry registry = RegistryFactory.getRegistry();
-				final IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.scripting"); //$NON-NLS-1$
-				final IConfigurationElement[] elements = extPoint.getConfigurationElements();
+			}
 
-				if (elements.length > 0 && !s.isEmpty() && s.getFirstElement() instanceof MApplicationElement
-						&& noSelected == 1) {
-					if (addSeparator) {
-						manager.add(new Separator());
-					}
+			final IExtensionRegistry registry = RegistryFactory.getRegistry();
+			final IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.scripting"); //$NON-NLS-1$
+			final IConfigurationElement[] elements = extPoint.getConfigurationElements();
 
-					addSeparator = false;
+			if (elements.length > 0 && !s.isEmpty() && s.getFirstElement() instanceof MApplicationElement
+					&& noSelected == 1) {
+				if (addSeparator) {
+					manager.add(new Separator());
+				}
 
-					final MenuManager scriptExecute = new MenuManager(messages.ModelEditor_Script);
-					manager.add(scriptExecute);
-					for (final IConfigurationElement e : elements) {
-						final IConfigurationElement le = e;
-						scriptExecute.add(new Action(e.getAttribute("label")) { //$NON-NLS-1$
-							@Override
-							public void run() {
-								try {
-									final MApplicationElement o = (MApplicationElement) s.getFirstElement();
-									final IScriptingSupport support = (IScriptingSupport) le
-											.createExecutableExtension("class"); //$NON-NLS-1$
-									IEclipseContext ctx = null;
-									if (project == null) {
-										if (o instanceof MContext) {
-											ctx = ((MContext) o).getContext();
-										} else {
-											ctx = ModelUtils.getContainingContext(o);
-										}
-									}
+				addSeparator = false;
 
-									support.openEditor(viewer.getControl().getShell(), s.getFirstElement(), ctx);
-								} catch (final CoreException e) {
-									// TODO Auto-generated catch block
-									e.printStackTrace();
+				final MenuManager scriptExecute = new MenuManager(messages.ModelEditor_Script);
+				manager.add(scriptExecute);
+				for (final IConfigurationElement e : elements) {
+					final IConfigurationElement le = e;
+					scriptExecute.add(new Action(e.getAttribute("label")) { //$NON-NLS-1$
+						@Override
+						public void run() {
+							try {
+								final MApplicationElement o = (MApplicationElement) s.getFirstElement();
+								final IScriptingSupport support = (IScriptingSupport) le
+										.createExecutableExtension("class"); //$NON-NLS-1$
+								IEclipseContext ctx = null;
+								if (project == null) {
+									if (o instanceof MContext) {
+										ctx = ((MContext) o).getContext();
+									} else {
+										ctx = ModelUtils.getContainingContext(o);
+									}
 								}
+
+								support.openEditor(viewer.getControl().getShell(), s.getFirstElement(), ctx);
+							} catch (final CoreException e) {
+								// TODO Auto-generated catch block
+								e.printStackTrace();
 							}
-						});
-					}
+						}
+					});
 				}
+			}
 
-				if (project != null) {
+			if (project != null) {
 
-					if (addSeparator) {
-						manager.add(new Separator());
+				if (addSeparator) {
+					manager.add(new Separator());
+				}
+
+				final Action nlsAction = new Action(messages.ModelEditor_ExternalizeStrings) {
+					@Override
+					public void run() {
+						final ExternalizeStringHandler h = ContextInjectionFactory.make(ExternalizeStringHandler.class,
+								context);
+						ContextInjectionFactory.invoke(h, Execute.class, context);
 					}
+				};
 
-					final Action nlsAction = new Action(messages.ModelEditor_ExternalizeStrings) {
-						@Override
-						public void run() {
-							final ExternalizeStringHandler h = ContextInjectionFactory
-									.make(ExternalizeStringHandler.class, context);
-							ContextInjectionFactory.invoke(h, Execute.class, context);
-						}
-					};
+				final Action extIdAction = new Action(messages.ModelEditor_ExportIds) {
+					@Override
+					public void run() {
+						final ExportIdsHandler h = ContextInjectionFactory.make(ExportIdsHandler.class, context);
+						ContextInjectionFactory.invoke(h, Execute.class, context);
+					}
+				};
 
-					final Action extIdAction = new Action(messages.ModelEditor_ExportIds) {
-						@Override
-						public void run() {
-							final ExportIdsHandler h = ContextInjectionFactory.make(ExportIdsHandler.class, context);
-							ContextInjectionFactory.invoke(h, Execute.class, context);
-						}
-					};
+				manager.add(nlsAction);
+				manager.add(extIdAction);
+			} else {
+				if (addSeparator) {
+					manager.add(new Separator());
+				}
+
+				if (s.getFirstElement() instanceof MUIElement) {
+					final MUIElement el1 = (MUIElement) s.getFirstElement();
+					if (el1.getWidget() instanceof Control) {
+						manager.add(new Action(messages.ModelEditor_ShowControl) {
+
+							@Override
+							public void run() {
+								ControlHighlighter.show((Control) el1.getWidget());
+							}
+						});
 
-					manager.add(nlsAction);
-					manager.add(extIdAction);
-				} else {
-					if (addSeparator) {
-						manager.add(new Separator());
 					}
+				}
 
-					if (s.getFirstElement() instanceof MUIElement) {
-						final MUIElement el = (MUIElement) s.getFirstElement();
-						if (el.getWidget() instanceof Control) {
-							manager.add(new Action(messages.ModelEditor_ShowControl) {
+			}
 
-								@Override
-								public void run() {
-									ControlHighlighter.show((Control) el.getWidget());
-								}
-							});
+			if (addSeparator) {
+				manager.add(new Separator());
+			}
 
+			final Action expandAction = new Action(messages.ModelEditor_ExpandSubtree) {
+				@Override
+				public void run() {
+					if (!s.isEmpty()) {
+						if (viewer.getExpandedState(s.getFirstElement())) {
+							viewer.collapseToLevel(s.getFirstElement(), AbstractTreeViewer.ALL_LEVELS);
+						} else {
+							viewer.expandToLevel(s.getFirstElement(), AbstractTreeViewer.ALL_LEVELS);
 						}
 					}
-
 				}
+			};
 
-				if (addSeparator) {
-					manager.add(new Separator());
-				}
+			manager.add(expandAction);
 
-				final Action expandAction = new Action(messages.ModelEditor_ExpandSubtree) {
+			if (s.getFirstElement() instanceof EObject) {
+				manager.add(new Separator());
+				final EObject el2 = (EObject) s.getFirstElement();
+				final Action gotoXmiAction = new Action(messages.ModelEditor_goto_xmi) {
 					@Override
 					public void run() {
-						if (!s.isEmpty()) {
-							if (viewer.getExpandedState(s.getFirstElement())) {
-								viewer.collapseToLevel(s.getFirstElement(), AbstractTreeViewer.ALL_LEVELS);
-							} else {
-								viewer.expandToLevel(s.getFirstElement(), AbstractTreeViewer.ALL_LEVELS);
-							}
-						}
+						gotoEObject(TAB_XMI, el2);
 					}
 				};
+				manager.add(gotoXmiAction);
 
-				manager.add(expandAction);
-
-				if (s.getFirstElement() instanceof EObject) {
-					manager.add(new Separator());
-					final EObject el = (EObject) s.getFirstElement();
-					final Action gotoXmiAction = new Action(messages.ModelEditor_goto_xmi) {
-						@Override
-						public void run() {
-							gotoEObject(TAB_XMI, el);
-						}
-					};
-					manager.add(gotoXmiAction);
-
-					if (listTab != null) {
-						if (EmfUtil.getAttribute(el, "elementId") != null) { //$NON-NLS-1$
-							final Action gotoListAction = new Action(messages.ModelEditor_goto_list) {
-								@Override
-								public void run() {
-									gotoEObject(TAB_LIST, el);
-								}
-							};
-							manager.add(gotoListAction);
-						}
+				if (listTab != null) {
+					if (EmfUtil.getAttribute(el2, "elementId") != null) { //$NON-NLS-1$
+						final Action gotoListAction = new Action(messages.ModelEditor_goto_list) {
+							@Override
+							public void run() {
+								gotoEObject(TAB_LIST, el2);
+							}
+						};
+						manager.add(gotoListAction);
 					}
-
 				}
+
 			}
 		});
 
@@ -983,24 +937,16 @@ public void keyPressed(KeyEvent e) {
 			@Override
 			public void treeExpanded(final TreeExpansionEvent event) {
 				if (mod1Down) {
-					viewer.getTree().getDisplay().asyncExec(new Runnable() {
-						@Override
-						public void run() {
-							viewer.expandToLevel(event.getElement(), AbstractTreeViewer.ALL_LEVELS);
-						}
-					});
+					viewer.getTree().getDisplay()
+					.asyncExec(() -> viewer.expandToLevel(event.getElement(), AbstractTreeViewer.ALL_LEVELS));
 				}
 			}
 
 			@Override
 			public void treeCollapsed(final TreeExpansionEvent event) {
 				if (mod1Down) {
-					viewer.getTree().getDisplay().asyncExec(new Runnable() {
-						@Override
-						public void run() {
-							viewer.collapseToLevel(event.getElement(), AbstractTreeViewer.ALL_LEVELS);
-						}
-					});
+					viewer.getTree().getDisplay()
+					.asyncExec(() -> viewer.collapseToLevel(event.getElement(), AbstractTreeViewer.ALL_LEVELS));
 				}
 			}
 		});
@@ -1126,56 +1072,42 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 
 		final WritableSet clearedSet = new WritableSet();
 
-		contentProvider.getKnownElements().addSetChangeListener(new ISetChangeListener() {
-
-			@Override
-			public void handleSetChange(SetChangeEvent event) {
-				for (final Object o : event.diff.getAdditions()) {
-					if (o instanceof EObject) {
-						clearedSet.add(o);
-					}
+		contentProvider.getKnownElements().addSetChangeListener(event -> {
+			for (final Object o1 : event.diff.getAdditions()) {
+				if (o1 instanceof EObject) {
+					clearedSet.add(o1);
 				}
+			}
 
-				for (final Object o : event.diff.getRemovals()) {
-					if (o instanceof EObject) {
-						clearedSet.remove(o);
-					}
+			for (final Object o2 : event.diff.getRemovals()) {
+				if (o2 instanceof EObject) {
+					clearedSet.remove(o2);
 				}
 			}
 		});
 
 		for (final FeaturePath p : labelFeaturePaths) {
 			final IObservableMap map = EMFProperties.value(p).observeDetail(clearedSet);
-			map.addMapChangeListener(new IMapChangeListener() {
-
-				@Override
-				public void handleMapChange(MapChangeEvent event) {
-					viewer.update(event.diff.getChangedKeys().toArray(), null);
-				}
-			});
+			map.addMapChangeListener(event -> viewer.update(event.diff.getChangedKeys().toArray(), null));
 		}
 
 		viewer.setInput(modelProvider.getRoot());
 		viewer.setAutoExpandLevel(2);
 		viewer.expandToLevel(viewer.getAutoExpandLevel());
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				final TreeViewer viewer = (TreeViewer) event.getViewer();
-				final IStructuredSelection thisSelection = (IStructuredSelection) event.getSelection();
-				final Object selectedNode = thisSelection.getFirstElement();
-				if (mod1Down) {
-					if (viewer.getExpandedState(selectedNode)) {
-						viewer.setExpandedState(selectedNode, false);
-					} else {
-						viewer.expandToLevel(selectedNode, AbstractTreeViewer.ALL_LEVELS);
-					}
+		viewer.addDoubleClickListener(event -> {
+			final TreeViewer viewer1 = (TreeViewer) event.getViewer();
+			final IStructuredSelection thisSelection = (IStructuredSelection) event.getSelection();
+			final Object selectedNode = thisSelection.getFirstElement();
+			if (mod1Down) {
+				if (viewer1.getExpandedState(selectedNode)) {
+					viewer1.setExpandedState(selectedNode, false);
 				} else {
-					viewer.setExpandedState(selectedNode, !viewer.getExpandedState(selectedNode));
+					viewer1.expandToLevel(selectedNode, AbstractTreeViewer.ALL_LEVELS);
 				}
-
+			} else {
+				viewer1.setExpandedState(selectedNode, !viewer1.getExpandedState(selectedNode));
 			}
+
 		});
 
 		// Effect of filtered tree implementation (bug 391086)
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
index 80636efd05..39c87237cc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,10 +12,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.eclipse.core.databinding.observable.Diffs;
 import org.eclipse.core.databinding.observable.list.IListChangeListener;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.ListChangeEvent;
 import org.eclipse.core.databinding.observable.list.ListDiff;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
@@ -36,15 +36,11 @@ public VirtualEntry(String id, IListProperty property, Object originalParent, St
 		final IObservableList origList = property.observe(originalParent);
 		list.addAll(cleanedList(origList));
 
-		final IListChangeListener listener = new IListChangeListener() {
-
-			@Override
-			public void handleListChange(ListChangeEvent event) {
-				if (!VirtualEntry.this.list.isDisposed()) {
-					List<Object> clean = cleanedList(event.getObservableList());
-					ListDiff diff = Diffs.computeListDiff(VirtualEntry.this.list, clean);
-					diff.applyTo(VirtualEntry.this.list);
-				}
+		final IListChangeListener listener = event -> {
+			if (!VirtualEntry.this.list.isDisposed()) {
+				List<Object> clean = cleanedList(event.getObservableList());
+				ListDiff diff = Diffs.computeListDiff(VirtualEntry.this.list, clean);
+				diff.applyTo(VirtualEntry.this.list);
 			}
 		};
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index b27cdd3f6e..828ccb0ff6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -19,17 +19,12 @@
 
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
-import org.eclipse.core.databinding.observable.list.IListChangeListener;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.ListChangeEvent;
 import org.eclipse.core.databinding.observable.map.IObservableMap;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.validation.IValidator;
 import org.eclipse.core.databinding.validation.ValidationStatus;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -80,10 +75,8 @@
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
@@ -93,12 +86,8 @@
 import org.eclipse.swt.dnd.TextTransfer;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -163,18 +152,14 @@ public static void createXMIId(Composite parent, AbstractComponentEditor editor)
 
 		TextPasteHandler.createFor(t);
 
-		editor.getMaster().addValueChangeListener(new IValueChangeListener() {
-
-			@Override
-			public void handleValueChange(ValueChangeEvent event) {
-				final Object val = event.diff.getNewValue();
-				if (val != null && val instanceof EObject && !t.isDisposed()) {
-					final Resource res = ((EObject) val).eResource();
-					if (res instanceof E4XMIResource) {
-						final String v = ((E4XMIResource) res).getID((EObject) val);
-						if (v != null && v.trim().length() > 0) {
-							t.setText(v);
-						}
+		editor.getMaster().addValueChangeListener(event -> {
+			final Object val = event.diff.getNewValue();
+			if (val != null && val instanceof EObject && !t.isDisposed()) {
+				final Resource res = ((EObject) val).eResource();
+				if (res instanceof E4XMIResource) {
+					final String v = ((E4XMIResource) res).getID((EObject) val);
+					if (v != null && v.trim().length() > 0) {
+						t.setText(v);
 					}
 				}
 			}
@@ -355,13 +340,7 @@ protected boolean canEdit(Object element) {
 		final IEMFEditListProperty prop = EMFEditProperties.list(editor.getEditingDomain(), feature);
 		final IObservableList observableList = prop.observeDetail(editor.getMaster());
 		tableviewer.setInput(observableList);
-		observableList.addListChangeListener(new IListChangeListener() {
-
-			@Override
-			public void handleListChange(ListChangeEvent event) {
-				tableviewer.getTable().getColumn(0).pack();
-			}
-		});
+		observableList.addListChangeListener(event -> tableviewer.getTable().getColumn(0).pack());
 
 		return pickList;
 	}
@@ -415,25 +394,21 @@ public static void createTextField(Composite parent, String label, String toolti
 			final FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(
 					FieldDecorationRegistry.DEC_WARNING);
 			controlDecoration.setImage(fieldDecoration.getImage());
-			final IValidator iv = new IValidator() {
-
-				@Override
-				public IStatus validate(Object value) {
-					if (value == null) {
+			final IValidator iv = value -> {
+				if (value == null) {
+					controlDecoration.show();
+					return ValidationStatus.warning(warningText);
+				}
+				if (value instanceof String) {
+					final String text = (String) value;
+					if (text.trim().length() == 0) {
 						controlDecoration.show();
 						return ValidationStatus.warning(warningText);
 					}
-					if (value instanceof String) {
-						final String text = (String) value;
-						if (text.trim().length() == 0) {
-							controlDecoration.show();
-							return ValidationStatus.warning(warningText);
-						}
-					}
-
-					controlDecoration.hide();
-					return Status.OK_STATUS;
 				}
+
+				controlDecoration.hide();
+				return Status.OK_STATUS;
 			};
 			final UpdateValueStrategy acv = new UpdateValueStrategy().setAfterConvertValidator(iv);
 			context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master), acv, acv);
@@ -532,15 +507,11 @@ public static void createSelectedElement(Composite parent, final AbstractCompone
 		final IObservableValue uiObs = vProp.observe(viewer);
 		final IObservableValue mObs = EMFEditProperties.value(editor.getEditingDomain(),
 				UiPackageImpl.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(editor.getMaster());
-		editor.getMaster().addValueChangeListener(new IValueChangeListener() {
-
-			@Override
-			public void handleValueChange(ValueChangeEvent event) {
-				if (binding[0] != null) {
-					binding[0].dispose();
-				}
-
+		editor.getMaster().addValueChangeListener(event -> {
+			if (binding[0] != null) {
+				binding[0].dispose();
 			}
+
 		});
 
 		final IObservableList list = listProp.observeDetail(editor.getMaster());
@@ -574,13 +545,7 @@ public String getText(Object element) {
 		});
 		viewer.setInput(list);
 
-		editor.getMaster().addValueChangeListener(new IValueChangeListener() {
-
-			@Override
-			public void handleValueChange(ValueChangeEvent event) {
-				binding[0] = context.bindValue(uiObs, mObs);
-			}
-		});
+		editor.getMaster().addValueChangeListener(event -> binding[0] = context.bindValue(uiObs, mObs));
 	}
 
 	public static void createBindingContextWiget(Composite parent, final Messages Messages,
@@ -657,13 +622,9 @@ public void keyPressed(KeyEvent e) {
 		final IEMFListProperty prop = EMFProperties.list(feature);
 		viewer.setInput(prop.observeDetail(editor.getMaster()));
 
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				final String strSelected = (String) ((StructuredSelection) event.getSelection()).getFirstElement();
-				t.setText(strSelected != null ? strSelected : ""); //$NON-NLS-1$
-			}
+		viewer.addSelectionChangedListener(event -> {
+			final String strSelected = (String) ((StructuredSelection) event.getSelection()).getFirstElement();
+			t.setText(strSelected != null ? strSelected : ""); //$NON-NLS-1$
 		});
 
 		//
@@ -795,24 +756,17 @@ public static String tr(ProjectOSGiTranslationProvider translationProvider, Stri
 	}
 
 	public static void attachFiltering(Text searchText, final TableViewer viewer, final PatternFilter filter) {
-		searchText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				filter.setPattern(((Text) e.widget).getText());
-				viewer.refresh();
-				if (viewer.getTable().getItemCount() > 0) {
-					final Object data = viewer.getTable().getItem(0).getData();
-					viewer.setSelection(new StructuredSelection(data));
-				}
+		searchText.addModifyListener(e -> {
+			filter.setPattern(((Text) e.widget).getText());
+			viewer.refresh();
+			if (viewer.getTable().getItemCount() > 0) {
+				final Object data = viewer.getTable().getItem(0).getData();
+				viewer.setSelection(new StructuredSelection(data));
 			}
 		});
-		searchText.addTraverseListener(new TraverseListener() {
-
-			@Override
-			public void keyTraversed(TraverseEvent e) {
-				if (e.keyCode == SWT.ARROW_DOWN && viewer.getTable().getItemCount() > 0) {
-					viewer.getControl().setFocus();
-				}
+		searchText.addTraverseListener(e -> {
+			if (e.keyCode == SWT.ARROW_DOWN && viewer.getTable().getItemCount() > 0) {
+				viewer.getControl().setFocus();
 			}
 		});
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 37d730068e..b3165b3a0f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,8 +17,6 @@
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
@@ -43,8 +41,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -138,21 +134,17 @@ public void widgetSelected(SelectionEvent e) {
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			t.addModifyListener(new ModifyListener() {
-
-				@Override
-				public void modifyText(ModifyEvent e) {
-					if (lnk != null) {
-						lnk.setToolTipText(((Text) e.getSource()).getText());
-					}
+			t.addModifyListener(e -> {
+				if (lnk != null) {
+					lnk.setToolTipText(((Text) e.getSource()).getText());
 				}
 			});
 			final Binding binding = context.bindValue(
 					textProp.observeDelayed(200, t),
 					EMFEditProperties.value(getEditingDomain(),
 							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master),
-							new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
-							new UpdateValueStrategy());
+					new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+					new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
@@ -179,17 +171,13 @@ public IObservableList getChildList(Object element) {
 			list.add(0, ((MDirectMenuItem) element).getVisibleWhen());
 		}
 
-		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() {
-
-			@Override
-			public void handleValueChange(ValueChangeEvent event) {
-				if (event.diff.getOldValue() != null) {
-					list.remove(event.diff.getOldValue());
-				}
+		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(event -> {
+			if (event.diff.getOldValue() != null) {
+				list.remove(event.diff.getOldValue());
+			}
 
-				if (event.diff.getNewValue() != null) {
-					list.add(0, event.diff.getNewValue());
-				}
+			if (event.diff.getNewValue() != null) {
+				list.add(0, event.diff.getNewValue());
 			}
 		});
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index 871646f3f7..c75662529c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,8 +16,6 @@
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
@@ -42,8 +40,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -99,13 +95,9 @@ public void widgetSelected(SelectionEvent e) {
 		final Text t = new Text(parent, SWT.BORDER);
 		TextPasteHandler.createFor(t);
 		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		t.addModifyListener(new ModifyListener() {
-
-			@Override
-			public void modifyText(ModifyEvent e) {
-				if (lnk != null) {
-					lnk.setToolTipText(((Text) e.getSource()).getText());
-				}
+		t.addModifyListener(e -> {
+			if (lnk != null) {
+				lnk.setToolTipText(((Text) e.getSource()).getText());
 			}
 		});
 		final Binding binding = context.bindValue(textProp.observeDelayed(200, t),
@@ -173,17 +165,13 @@ public IObservableList getChildList(Object element) {
 			list.add(0, ((MDirectToolItem) element).getVisibleWhen());
 		}
 
-		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() {
-
-			@Override
-			public void handleValueChange(ValueChangeEvent event) {
-				if (event.diff.getOldValue() != null) {
-					list.remove(event.diff.getOldValue());
-				}
+		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(event -> {
+			if (event.diff.getOldValue() != null) {
+				list.remove(event.diff.getOldValue());
+			}
 
-				if (event.diff.getNewValue() != null) {
-					list.add(0, event.diff.getNewValue());
-				}
+			if (event.diff.getNewValue() != null) {
+				list.add(0, event.diff.getNewValue());
 			}
 		});
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index 9c65ccf529..328c4dc8f5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,8 +15,6 @@
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
@@ -119,17 +117,13 @@ public IObservableList getChildList(Object element) {
 			list.add(0, ((MHandledMenuItem) element).getVisibleWhen());
 		}
 
-		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() {
-
-			@Override
-			public void handleValueChange(ValueChangeEvent event) {
-				if (event.diff.getOldValue() != null) {
-					list.remove(event.diff.getOldValue());
-				}
+		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(event -> {
+			if (event.diff.getOldValue() != null) {
+				list.remove(event.diff.getOldValue());
+			}
 
-				if (event.diff.getNewValue() != null) {
-					list.add(0, event.diff.getNewValue());
-				}
+			if (event.diff.getNewValue() != null) {
+				list.add(0, event.diff.getNewValue());
 			}
 		});
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 2287f6c9b7..e56940c238 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,8 +14,6 @@
 
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
@@ -118,17 +116,13 @@ public IObservableList getChildList(Object element) {
 			list.add(0, ((MHandledToolItem) element).getVisibleWhen());
 		}
 
-		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() {
-
-			@Override
-			public void handleValueChange(ValueChangeEvent event) {
-				if (event.diff.getOldValue() != null) {
-					list.remove(event.diff.getOldValue());
-				}
+		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(event -> {
+			if (event.diff.getOldValue() != null) {
+				list.remove(event.diff.getOldValue());
+			}
 
-				if (event.diff.getNewValue() != null) {
-					list.add(0, event.diff.getNewValue());
-				}
+			if (event.diff.getNewValue() != null) {
+				list.add(0, event.diff.getNewValue());
 			}
 		});
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index f6bb19285f..27962f00c5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * f * Copyright (c) 2010, 2014 BestSolution.at and others.
+ * f * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -21,13 +21,9 @@
 import javax.inject.Inject;
 
 import org.eclipse.core.databinding.UpdateValueStrategy;
-import org.eclipse.core.databinding.observable.list.IListChangeListener;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.ListChangeEvent;
 import org.eclipse.core.databinding.observable.list.ListDiffVisitor;
 import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
@@ -402,48 +398,38 @@ public IObservableList getChildList(Object element) {
 			list.add(0, ((MUIElement) element).getVisibleWhen());
 		}
 
-		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() {
-
-			@Override
-			public void handleValueChange(ValueChangeEvent event) {
-				if (event.diff.getOldValue() != null) {
-					list.remove(event.diff.getOldValue());
-				}
+		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(event -> {
+			if (event.diff.getOldValue() != null) {
+				list.remove(event.diff.getOldValue());
+			}
 
-				if (event.diff.getNewValue() != null) {
-					list.add(0, event.diff.getNewValue());
-				}
+			if (event.diff.getNewValue() != null) {
+				list.add(0, event.diff.getNewValue());
 			}
 		});
 
 		final IObservableList l = ELEMENT_CONTAINER__CHILDREN.observe(element);
-		l.addListChangeListener(new IListChangeListener() {
+		l.addListChangeListener(event -> event.diff.accept(new ListDiffVisitor() {
 
 			@Override
-			public void handleListChange(ListChangeEvent event) {
-				event.diff.accept(new ListDiffVisitor() {
-
-					@Override
-					public void handleRemove(int index, Object element) {
-						list.remove(element);
-					}
+			public void handleRemove(int index, Object element) {
+				list.remove(element);
+			}
 
-					@Override
-					public void handleMove(int oldIndex, int newIndex, Object element) {
-						if (list.get(0) instanceof MExpression) {
-							oldIndex += 1;
-							newIndex += 1;
-						}
-						list.move(oldIndex, newIndex);
-					}
+			@Override
+			public void handleMove(int oldIndex, int newIndex, Object element) {
+				if (list.get(0) instanceof MExpression) {
+					oldIndex += 1;
+					newIndex += 1;
+				}
+				list.move(oldIndex, newIndex);
+			}
 
-					@Override
-					public void handleAdd(int index, Object element) {
-						list.add(element);
-					}
-				});
+			@Override
+			public void handleAdd(int index, Object element) {
+				list.add(element);
 			}
-		});
+		}));
 		list.addAll(l);
 
 		return list;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index e18e317e3e..7e1114f302 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,8 +17,6 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
@@ -445,23 +443,19 @@ protected boolean accepted(Object o) {
 			list.add(0, window.getToolbar());
 		}
 
-		PART__TOOLBAR.observe(element).addValueChangeListener(new IValueChangeListener() {
-
-			@Override
-			public void handleValueChange(ValueChangeEvent event) {
-				if (event.diff.getOldValue() != null) {
-					list.remove(event.diff.getOldValue());
-					if (getMaster().getValue() == element && !createRemoveToolBar.isDisposed()) {
-						createRemoveToolBar.setSelection(false);
-					}
-
+		PART__TOOLBAR.observe(element).addValueChangeListener(event -> {
+			if (event.diff.getOldValue() != null) {
+				list.remove(event.diff.getOldValue());
+				if (getMaster().getValue() == element && !createRemoveToolBar.isDisposed()) {
+					createRemoveToolBar.setSelection(false);
 				}
 
-				if (event.diff.getNewValue() != null) {
-					list.add(0, event.diff.getNewValue());
-					if (getMaster().getValue() == element && !createRemoveToolBar.isDisposed()) {
-						createRemoveToolBar.setSelection(true);
-					}
+			}
+
+			if (event.diff.getNewValue() != null) {
+				list.add(0, event.diff.getNewValue());
+				if (getMaster().getValue() == element && !createRemoveToolBar.isDisposed()) {
+					createRemoveToolBar.setSelection(true);
 				}
 			}
 		});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index b29a35a601..719768c661 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -19,8 +19,6 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
@@ -62,8 +60,6 @@
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -250,14 +246,10 @@ public void widgetSelected(SelectionEvent e) {
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			t.addModifyListener(new ModifyListener() {
-
-				@Override
-				public void modifyText(ModifyEvent e) {
-					// lnk might be disposed if else branch above taken
-					if (lnk != null) {
-						lnk.setToolTipText(((Text) e.getSource()).getText());
-					}
+			t.addModifyListener(e -> {
+				// lnk might be disposed if else branch above taken
+				if (lnk != null) {
+					lnk.setToolTipText(((Text) e.getSource()).getText());
 				}
 			});
 			final Binding binding = context.bindValue(
@@ -433,23 +425,19 @@ protected boolean accepted(Object o) {
 			list.add(0, window.getToolbar());
 		}
 
-		PART__TOOLBAR.observe(element).addValueChangeListener(new IValueChangeListener() {
-
-			@Override
-			public void handleValueChange(ValueChangeEvent event) {
-				if (event.diff.getOldValue() != null) {
-					list.remove(event.diff.getOldValue());
-					if (getMaster().getValue() == element && !createRemoveToolBar.isDisposed()) {
-						createRemoveToolBar.setSelection(false);
-					}
-
+		PART__TOOLBAR.observe(element).addValueChangeListener(event -> {
+			if (event.diff.getOldValue() != null) {
+				list.remove(event.diff.getOldValue());
+				if (getMaster().getValue() == element && !createRemoveToolBar.isDisposed()) {
+					createRemoveToolBar.setSelection(false);
 				}
 
-				if (event.diff.getNewValue() != null) {
-					list.add(0, event.diff.getNewValue());
-					if (getMaster().getValue() == element && !createRemoveToolBar.isDisposed()) {
-						createRemoveToolBar.setSelection(true);
-					}
+			}
+
+			if (event.diff.getNewValue() != null) {
+				list.add(0, event.diff.getNewValue());
+				if (getMaster().getValue() == element && !createRemoveToolBar.isDisposed()) {
+					createRemoveToolBar.setSelection(true);
 				}
 			}
 		});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 0fc349a156..7adfc7558c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -23,8 +23,6 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
@@ -367,22 +365,18 @@ public IObservableList getChildList(final Object element) {
 			list.add(0, item.getMenu());
 		}
 
-		TOOL_ITEM__MENU.observe(element).addValueChangeListener(new IValueChangeListener() {
-
-			@Override
-			public void handleValueChange(ValueChangeEvent event) {
-				if (event.diff.getOldValue() != null) {
-					list.remove(event.diff.getOldValue());
-					if (getMaster().getValue() == element && !createRemoveMenu.isDisposed()) {
-						createRemoveMenu.setSelection(false);
-					}
+		TOOL_ITEM__MENU.observe(element).addValueChangeListener(event -> {
+			if (event.diff.getOldValue() != null) {
+				list.remove(event.diff.getOldValue());
+				if (getMaster().getValue() == element && !createRemoveMenu.isDisposed()) {
+					createRemoveMenu.setSelection(false);
 				}
+			}
 
-				if (event.diff.getNewValue() != null) {
-					list.add(0, event.diff.getNewValue());
-					if (getMaster().getValue() == element && !createRemoveMenu.isDisposed()) {
-						createRemoveMenu.setSelection(true);
-					}
+			if (event.diff.getNewValue() != null) {
+				list.add(0, event.diff.getNewValue());
+				if (getMaster().getValue() == element && !createRemoveMenu.isDisposed()) {
+					createRemoveMenu.setSelection(true);
 				}
 			}
 		});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index c4bc2953ca..f0e777f261 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -21,8 +21,6 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
@@ -422,22 +420,18 @@ protected boolean accepted(Object o) {
 			list.add(0, window.getMainMenu());
 		}
 
-		WINDOW__MAIN_MENU.observe(element).addValueChangeListener(new IValueChangeListener() {
-
-			@Override
-			public void handleValueChange(ValueChangeEvent event) {
-				if (event.diff.getOldValue() != null) {
-					list.remove(event.diff.getOldValue());
-					if (getMaster().getValue() == element && !createRemoveMainMenu.isDisposed()) {
-						createRemoveMainMenu.setSelection(false);
-					}
+		WINDOW__MAIN_MENU.observe(element).addValueChangeListener(event -> {
+			if (event.diff.getOldValue() != null) {
+				list.remove(event.diff.getOldValue());
+				if (getMaster().getValue() == element && !createRemoveMainMenu.isDisposed()) {
+					createRemoveMainMenu.setSelection(false);
 				}
+			}
 
-				if (event.diff.getNewValue() != null) {
-					list.add(0, event.diff.getNewValue());
-					if (getMaster().getValue() == element && !createRemoveMainMenu.isDisposed()) {
-						createRemoveMainMenu.setSelection(true);
-					}
+			if (event.diff.getNewValue() != null) {
+				list.add(0, event.diff.getNewValue());
+				if (getMaster().getValue() == element && !createRemoveMainMenu.isDisposed()) {
+					createRemoveMainMenu.setSelection(true);
 				}
 			}
 		});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
index 28bebe904b..5e014d0b07 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@
 import java.util.Properties;
 import java.util.Timer;
 import java.util.TimerTask;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.resources.IFile;
@@ -167,23 +168,12 @@ public void update(ViewerCell cell) {
 
 				Image img = icons.get(file);
 				if (img == null) {
-					InputStream in = null;
-					try {
-						in = file.getContents();
+					try (InputStream in = file.getContents()) {
 						img = new Image(cell.getControl().getDisplay(), in);
 						icons.put(file, img);
-					} catch (CoreException e) {
+					} catch (CoreException | IOException e) {
 						// TODO Auto-generated catch block
 						e.printStackTrace();
-					} finally {
-						if (in != null) {
-							try {
-								in.close();
-							} catch (IOException e) {
-								// TODO Auto-generated catch block
-								e.printStackTrace();
-							}
-						}
 					}
 				}
 
@@ -274,10 +264,7 @@ private String getBundle(IFile file) {
 		IFile f = project.getFile("/META-INF/MANIFEST.MF"); //$NON-NLS-1$
 
 		if (f != null && f.exists()) {
-			BufferedReader r = null;
-			try {
-				InputStream s = f.getContents();
-				r = new BufferedReader(new InputStreamReader(s));
+			try (InputStream s = f.getContents(); BufferedReader r = new BufferedReader(new InputStreamReader(s));) {
 				String line;
 				while ((line = r.readLine()) != null) {
 					if (line.startsWith("Bundle-SymbolicName:")) { //$NON-NLS-1$
@@ -295,15 +282,6 @@ private String getBundle(IFile file) {
 			} catch (IOException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
-			} finally {
-				if (r != null) {
-					try {
-						r.close();
-					} catch (IOException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
 			}
 		}
 		return null;
@@ -375,9 +353,7 @@ public void run() {
 					// Only search target bundle if specified
 					String bundle = (String) context.get("bundle"); //$NON-NLS-1$
 					if (E.notEmpty(bundle)) {
-						InputStream inputStream = null;
-						try {
-							inputStream = iFile.getContents();
+						try (InputStream inputStream = iFile.getContents();) {
 							Properties props = new Properties();
 							props.load(inputStream);
 							String name = props.getProperty("Bundle-SymbolicName"); //$NON-NLS-1$
@@ -388,11 +364,6 @@ public void run() {
 						} catch (IOException e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
-						} finally {
-							try {
-								inputStream.close();
-							} catch (Exception ex) {
-							}
 						}
 					}
 					project.accept(new IResourceVisitor() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
index 1aa3053784..85409e3c30 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,7 +12,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -176,23 +175,12 @@ public void update(ViewerCell cell) {
 
 				Image img = icons.get(file);
 				if (img == null) {
-					InputStream in = null;
-					try {
-						in = file.getContents();
+					try (InputStream in = file.getContents()) {
 						img = new Image(cell.getControl().getDisplay(), in);
 						icons.put(file, img);
 					} catch (final Exception e) {
 						// e.printStackTrace();
 						return;
-					} finally {
-						if (in != null) {
-							try {
-								in.close();
-							} catch (final IOException e) {
-								// TODO Auto-generated catch block
-								// e.printStackTrace();
-							}
-						}
 					}
 				}
 
@@ -219,7 +207,7 @@ public void update(ViewerCell cell) {
 					icons.put(file, img);
 				}
 				final int width = AbstractIconDialogWithScopeAndFilter.this.getViewer().getTable().getColumn(0)
-					.getWidth();
+						.getWidth();
 				if (img.getImageData().width > width) {
 					AbstractIconDialogWithScopeAndFilter.this.getViewer().getTable().getColumn(0)
 					.setWidth(img.getImageData().width);
@@ -435,7 +423,7 @@ public boolean visit(IResource resource) throws CoreException {
 								if (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path)) {
 									if (E.notEmpty(filter.getPackages())) {
 										if (!filter.getPackages().contains(
-											resource.getProjectRelativePath().removeLastSegments(1).toOSString())) {
+												resource.getProjectRelativePath().removeLastSegments(1).toOSString())) {
 											return false;
 										}
 									}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index c0ba9dd0bf..48d3530c1b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -1033,15 +1033,12 @@ protected IFile checkResourceAccessible(final IFile file, String installLocation
 
 	public BundleModel loadBundleModel(IProject currentProject) throws CoreException {
 		final Document document = new Document();
-		final Scanner scanner = new Scanner(PDEProject.getManifest(currentProject).getContents());
-		try {
+		try (final Scanner scanner = new Scanner(PDEProject.getManifest(currentProject).getContents())) {
 			final String content = scanner.useDelimiter("\\Z").next(); //$NON-NLS-1$
 			document.set(content);
 			final BundleModel model = new BundleModel(document, false);
 			model.load();
 			return model;
-		} finally {
-			scanner.close();
 		}
 	}
 
@@ -1088,10 +1085,8 @@ static String getBundle(IProject project) {
 		final IFile f = project.getFile("/META-INF/MANIFEST.MF"); //$NON-NLS-1$
 
 		if (f != null && f.exists()) {
-			BufferedReader r = null;
-			try {
-				final InputStream s = f.getContents();
-				r = new BufferedReader(new InputStreamReader(s));
+			try (final InputStream s = f.getContents();
+					BufferedReader r = new BufferedReader(new InputStreamReader(s));) {
 				String line;
 				while ((line = r.readLine()) != null) {
 					if (line.startsWith("Bundle-SymbolicName:")) { //$NON-NLS-1$
@@ -1107,13 +1102,6 @@ static String getBundle(IProject project) {
 				e.printStackTrace();
 			} catch (final IOException e) {
 				e.printStackTrace();
-			} finally {
-				if (r != null) {
-					try {
-						r.close();
-					} catch (final IOException e) {
-					}
-				}
 			}
 		}
 		return null;
@@ -1129,10 +1117,9 @@ public static String getBundle(String rootDirectory) {
 		final File f = new File(new File(rootDirectory), "/META-INF/MANIFEST.MF"); //$NON-NLS-1$
 
 		if (f.exists()) {
-			BufferedReader r = null;
-			try {
-				final InputStream s = new FileInputStream(f);
-				r = new BufferedReader(new InputStreamReader(s));
+			try (final InputStream s = new FileInputStream(f);
+					BufferedReader r = new BufferedReader(new InputStreamReader(s))) {
+
 				String line;
 				while ((line = r.readLine()) != null) {
 					if (line.startsWith("Bundle-SymbolicName:")) { //$NON-NLS-1$
@@ -1146,13 +1133,6 @@ public static String getBundle(String rootDirectory) {
 				}
 			} catch (final IOException e) {
 				e.printStackTrace();
-			} finally {
-				if (r != null) {
-					try {
-						r.close();
-					} catch (final IOException e) {
-					}
-				}
 			}
 		}
 		return null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
index 87691d66db..ad08b954cf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
@@ -4,8 +4,6 @@
 import java.util.Collections;
 
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionPoint;
@@ -22,8 +20,6 @@
 import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.ColumnViewer;
 import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
@@ -45,23 +41,19 @@
 
 public class ObjectViewer {
 	public TreeViewer createViewer(Composite parent, EStructuralFeature feature, final IObservableValue master,
-		IResourcePool resourcePool, final Messages messages) {
+			IResourcePool resourcePool, final Messages messages) {
 		final TreeViewer viewer = new TreeViewer(parent);
 		viewer.setContentProvider(new ContentProviderImpl());
 		viewer.setLabelProvider(new LabelProviderImpl(resourcePool));
 		viewer.setComparator(new ViewerComparatorImpl());
 		final IEMFValueProperty property = EMFProperties.value(feature);
 		final IObservableValue value = property.observeDetail(master);
-		value.addValueChangeListener(new IValueChangeListener() {
-
-			@Override
-			public void handleValueChange(ValueChangeEvent event) {
-				if (event.diff.getNewValue() != null) {
-					viewer.setInput(Collections.singleton(new JavaObject(event.diff.getNewValue())));
-					viewer.expandToLevel(2);
-				} else {
-					viewer.setInput(Collections.emptyList());
-				}
+		value.addValueChangeListener(event -> {
+			if (event.diff.getNewValue() != null) {
+				viewer.setInput(Collections.singleton(new JavaObject(event.diff.getNewValue())));
+				viewer.expandToLevel(2);
+			} else {
+				viewer.setInput(Collections.emptyList());
 			}
 		});
 
@@ -72,45 +64,40 @@ public void handleValueChange(ValueChangeEvent event) {
 		if (elements.length > 0) {
 			final MenuManager mgr = new MenuManager();
 			mgr.setRemoveAllWhenShown(true);
-			mgr.addMenuListener(new IMenuListener() {
-
-				@Override
-				public void menuAboutToShow(IMenuManager manager) {
-					if (viewer.getSelection().isEmpty()) {
-						return;
-					}
+			mgr.addMenuListener(manager -> {
+				if (viewer.getSelection().isEmpty()) {
+					return;
+				}
 
-					final MenuManager scriptExecute = new MenuManager(messages.ObjectViewer_Script);
-					mgr.add(scriptExecute);
-					for (final IConfigurationElement e : elements) {
-						final IConfigurationElement le = e;
-						scriptExecute.add(new Action(e.getAttribute("label")) { //$NON-NLS-1$
-							@Override
-							public void run() {
-								try {
-									final IScriptingSupport support = (IScriptingSupport) le
+				final MenuManager scriptExecute = new MenuManager(messages.ObjectViewer_Script);
+				mgr.add(scriptExecute);
+				for (final IConfigurationElement e : elements) {
+					final IConfigurationElement le = e;
+					scriptExecute.add(new Action(e.getAttribute("label")) { //$NON-NLS-1$
+						@Override
+						public void run() {
+							try {
+								final IScriptingSupport support = (IScriptingSupport) le
 										.createExecutableExtension("class"); //$NON-NLS-1$
-									final Object o = ((IStructuredSelection) viewer.getSelection())
-										.getFirstElement();
-									Object mainObject = null;
-									if (o instanceof JavaObject) {
-										mainObject = ((JavaObject) o).getInstance();
-									} else if (o instanceof JavaAttribute) {
-										mainObject = ((JavaAttribute) o).getFieldValue();
-									}
-
-									if (mainObject != null) {
-										final MApplicationElement value = (MApplicationElement) master.getValue();
-										support.openEditor(viewer.getControl().getShell(), mainObject,
+								final Object o = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+								Object mainObject = null;
+								if (o instanceof JavaObject) {
+									mainObject = ((JavaObject) o).getInstance();
+								} else if (o instanceof JavaAttribute) {
+									mainObject = ((JavaAttribute) o).getFieldValue();
+								}
+
+								if (mainObject != null) {
+									final MApplicationElement value = (MApplicationElement) master.getValue();
+									support.openEditor(viewer.getControl().getShell(), mainObject,
 											ModelUtils.getContainingContext(value));
-									}
-								} catch (final CoreException e) {
-									// TODO Auto-generated catch block
-									e.printStackTrace();
 								}
+							} catch (final CoreException e) {
+								// TODO Auto-generated catch block
+								e.printStackTrace();
 							}
-						});
-					}
+						}
+					});
 				}
 			});
 
@@ -126,7 +113,7 @@ class TooltipSupportImpl extends ColumnViewerToolTipSupport {
 		private final Messages messages;
 
 		protected TooltipSupportImpl(ColumnViewer viewer, int style, boolean manualActivation,
-			IResourcePool resourcePool, Messages messages) {
+				IResourcePool resourcePool, Messages messages) {
 			super(viewer, style, manualActivation);
 			this.resourcePool = resourcePool;
 			this.messages = messages;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
index c9be474797..f78c698225 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 MEDEVIT, FHV and others.
+ * Copyright (c) 2014, 2017 MEDEVIT, FHV and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -259,16 +259,16 @@ protected void okPressed() { // See AbstractNewClassWizard
 					IResource resource = unit.getResource();
 					IFile file = (IFile) resource;
 
-					ByteArrayInputStream stream = new ByteArrayInputStream(content.toString().getBytes());
-					if (file.exists()) {
-						file.delete(true, new NullProgressMonitor());
-					}
+					try (ByteArrayInputStream stream = new ByteArrayInputStream(content.toString().getBytes())) {
+						if (file.exists()) {
+							file.delete(true, new NullProgressMonitor());
+						}
 
-					createParent(file.getParent());
-					// NPE
-					file.create(stream, IResource.KEEP_HISTORY, new NullProgressMonitor());
+						createParent(file.getParent());
+						// NPE
+						file.create(stream, IResource.KEEP_HISTORY, new NullProgressMonitor());
 
-					stream.close();
+					}
 					super.okPressed();
 				} catch (CoreException e) {
 					e.printStackTrace();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
index ae86a8049b..d1c28b2b5c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
@@ -6,7 +6,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
+
 import javax.inject.Named;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
@@ -226,16 +228,15 @@ protected void okPressed() {
 						b.append(e.key + " = " + e.value + System.getProperty("line.separator")); //$NON-NLS-1$//$NON-NLS-2$
 					}
 
-					ByteArrayInputStream stream = new ByteArrayInputStream(b.toString().getBytes());
-					if (f.exists()) {
-						f.appendContents(stream, IResource.KEEP_HISTORY, new NullProgressMonitor());
-					} else {
-						createParent(f.getParent());
-						f.create(stream, IResource.KEEP_HISTORY, new NullProgressMonitor());
+					try (ByteArrayInputStream stream = new ByteArrayInputStream(b.toString().getBytes())) {
+						if (f.exists()) {
+							f.appendContents(stream, IResource.KEEP_HISTORY, new NullProgressMonitor());
+						} else {
+							createParent(f.getParent());
+							f.create(stream, IResource.KEEP_HISTORY, new NullProgressMonitor());
+						}
 					}
 
-					stream.close();
-
 					for (Object o : els) {
 						Entry e = (Entry) o;
 						Command cmd = SetCommand.create(resource.getEditingDomain(), e.object, e.feature, "%" + e.key); //$NON-NLS-1$
@@ -280,9 +281,9 @@ private Properties getBaseProperties() {
 				IFile f = getBasePropertyFile();
 				if (f.exists()) {
 
-					InputStream in = f.getContents();
-					prop.load(in);
-					in.close();
+					try (InputStream in = f.getContents()) {
+						prop.load(in);
+					}
 				}
 			} catch (CoreException e) {
 				// TODO Auto-generated catch block
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
index 1eb8d313d7..7c6a7e593d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
@@ -213,18 +213,18 @@ private void handleManifestChange(IFile file) {
 	 * @see IFile#getContents()
 	 */
 	public static String extractBasenameFromManifest(IFile file) throws CoreException, IOException {
-		final InputStream in = file.getContents();
-		final BufferedReader r = new BufferedReader(new InputStreamReader(in));
-		String line;
 		String newValue = Constants.BUNDLE_LOCALIZATION_DEFAULT_BASENAME;
-		while ((line = r.readLine()) != null) {
-			if (line.startsWith(Constants.BUNDLE_LOCALIZATION)) {
-				newValue = line.substring(Constants.BUNDLE_LOCALIZATION.length() + 1).trim();
-				break;
+		try (final InputStream in = file.getContents();
+				final BufferedReader r = new BufferedReader(new InputStreamReader(in))) {
+			String line;
+			while ((line = r.readLine()) != null) {
+				if (line.startsWith(Constants.BUNDLE_LOCALIZATION)) {
+					newValue = line.substring(Constants.BUNDLE_LOCALIZATION.length() + 1).trim();
+					break;
+				}
 			}
-		}
 
-		r.close();
+		}
 		return newValue;
 	}
 
@@ -233,7 +233,7 @@ public static String extractBasenameFromManifest(IFile file) throws CoreExceptio
 	 */
 	protected void updateResourceBundle() {
 		setResourceBundle(ResourceBundleHelper.getEquinoxResourceBundle(basename, locale,
-			new ProjectResourceBundleControl(true), new ProjectResourceBundleControl(false)));
+				new ProjectResourceBundleControl(true), new ProjectResourceBundleControl(false)));
 	}
 
 	/**
@@ -262,7 +262,7 @@ class ProjectResourceBundleControl extends ResourceBundle.Control {
 
 		@Override
 		public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader,
-			boolean reload) throws IllegalAccessException, InstantiationException, IOException {
+				boolean reload) throws IllegalAccessException, InstantiationException, IOException {
 
 			final String bundleName = toBundleName(baseName, locale);
 			ResourceBundle bundle = null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
index feeeecb31e..2ce2f388f7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -139,7 +139,7 @@ public void findContribution(Filter filter, ContributionResultHandler handler) {
 							break;
 						}
 						monitor.subTask(Messages.TargetPlatformContributionCollector_Searching
-							+ " " + e.installLocation); //$NON-NLS-1$
+								+ " " + e.installLocation); //$NON-NLS-1$
 					}
 
 					if (E.notEmpty(filter.getBundles())) {
@@ -298,7 +298,7 @@ protected IStatus run(IProgressMonitor monitor) {
 					final IPluginModelBase[] models = TargetPlatformHelper.getPDEState().getTargetModels();
 					final int total = projects.length + models.length;
 					monitor.beginTask(Messages.TargetPlatformContributionCollector_updatingTargetPlatformCache
-						+ cacheName + ")", total); //$NON-NLS-1$
+							+ cacheName + ")", total); //$NON-NLS-1$
 
 					for (final IProject pj : projects) {
 						if (monitor.isCanceled()) {
@@ -309,7 +309,7 @@ protected IStatus run(IProgressMonitor monitor) {
 						monitor.worked(1);
 						TargetPlatformContributionCollector.this
 						.visit(monitor, FilteredContributionDialog.getBundle(rootDirectory), rootDirectory,
-							new File(rootDirectory));
+								new File(rootDirectory));
 					}
 
 					// load target platform bundles
@@ -428,7 +428,7 @@ protected Control createContents(Composite parent) {
 						@Override
 						protected void createButtonsForButtonBar(Composite parent) {
 							final Button button = createButton(parent, 101,
-								Messages.TargetPlatformContributionCollector_RunInBackground, false);
+									Messages.TargetPlatformContributionCollector_RunInBackground, false);
 							// TODO JA
 							button.addSelectionListener(new SelectionAdapter() {
 								@Override
@@ -457,8 +457,8 @@ public void run(final IProgressMonitor monitor) throws InvocationTargetException
 							InterruptedException {
 								monitor
 								.beginTask(
-									Messages.TargetPlatformContributionCollector_WaitingForTargetPlatformIndexingToComplete,
-									IProgressMonitor.UNKNOWN);
+										Messages.TargetPlatformContributionCollector_WaitingForTargetPlatformIndexingToComplete,
+										IProgressMonitor.UNKNOWN);
 								while (job.getState() == Job.RUNNING && !runInBackground) {
 									Thread.sleep(100);
 								}
@@ -487,10 +487,8 @@ static public String getBundle(File file) {
 		final File f = new File(file, "META-INF/MANIFEST.MF"); //$NON-NLS-1$
 
 		if (f.exists() && f.isFile()) {
-			BufferedReader r = null;
-			try {
-				final InputStream s = new FileInputStream(f);
-				r = new BufferedReader(new InputStreamReader(s));
+			try (final InputStream s = new FileInputStream(f);
+					BufferedReader r = new BufferedReader(new InputStreamReader(s))) {
 				String line;
 				while ((line = r.readLine()) != null) {
 					if (line.startsWith("Bundle-SymbolicName:")) { //$NON-NLS-1$
@@ -504,13 +502,6 @@ static public String getBundle(File file) {
 				}
 			} catch (final IOException e) {
 				e.printStackTrace();
-			} finally {
-				if (r != null) {
-					try {
-						r.close();
-					} catch (final IOException e) {
-					}
-				}
 			}
 		}
 		return null;
@@ -554,7 +545,7 @@ protected void visit(IProgressMonitor monitor, String bundleName, String install
 						e.path = ""; //$NON-NLS-1$
 					}
 					e.relativePath = Path
-						.fromOSString(file.getAbsolutePath().replace(e.installLocation, "")).makeRelative().toOSString(); //$NON-NLS-1$
+							.fromOSString(file.getAbsolutePath().replace(e.installLocation, "")).makeRelative().toOSString(); //$NON-NLS-1$
 
 					e.bundleSymName = bundleName;
 					// TODO we need project to strip source paths.
@@ -599,10 +590,10 @@ static private List<String> getOutputDirectories(String installLocation) {
 			outputDirectories.put(installLocation, ret);
 			try {
 				final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder()
-					.parse(new File(installLocation + File.separator + ".classpath")); //$NON-NLS-1$
+						.parse(new File(installLocation + File.separator + ".classpath")); //$NON-NLS-1$
 				final XPath xp = XPathFactory.newInstance().newXPath();
 				final NodeList list = (NodeList) xp.evaluate(
-					"//classpathentry[@kind='output']/@path", doc, XPathConstants.NODESET); //$NON-NLS-1$
+						"//classpathentry[@kind='output']/@path", doc, XPathConstants.NODESET); //$NON-NLS-1$
 				for (int i = 0; i < list.getLength(); i++) {
 					final String value = list.item(i).getNodeValue();
 					ret.add(value);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
index 902d64b475..f15b5c9b3e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 BestSolution.at and others.
+ * Copyright (c) 2011, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,9 +11,8 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.uistructure;
 
 import java.util.Collections;
+
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionPoint;
@@ -29,8 +28,6 @@
 import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -44,61 +41,54 @@ public TreeViewer createViewer(Composite parent, EStructuralFeature feature, fin
 		viewer.setLabelProvider(new WidgetLabelProvider(resourcePool));
 		IEMFValueProperty property = EMFProperties.value(feature);
 		IObservableValue value = property.observeDetail(master);
-		value.addValueChangeListener(new IValueChangeListener() {
-
-			@Override
-			public void handleValueChange(ValueChangeEvent event) {
-				if (event.diff.getNewValue() != null) {
-					viewer.setInput(Collections.singleton(event.diff.getNewValue()));
-					viewer.expandToLevel(2);
-				} else {
-					viewer.setInput(Collections.emptyList());
-				}
+		value.addValueChangeListener(event -> {
+			if (event.diff.getNewValue() != null) {
+				viewer.setInput(Collections.singleton(event.diff.getNewValue()));
+				viewer.expandToLevel(2);
+			} else {
+				viewer.setInput(Collections.emptyList());
 			}
 		});
 
 		final MenuManager mgr = new MenuManager();
 		mgr.setRemoveAllWhenShown(true);
-		mgr.addMenuListener(new IMenuListener() {
+		mgr.addMenuListener(manager -> {
+			final Object o = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+			if (o instanceof Control) {
+				manager.add(new Action(messages.ModelEditor_ShowControl) {
+					@Override
+					public void run() {
+						ControlHighlighter.show((Control) o);
+					}
+				});
+			}
+
+			IExtensionRegistry registry = RegistryFactory.getRegistry();
+			IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.scripting"); //$NON-NLS-1$
+			final IConfigurationElement[] elements = extPoint.getConfigurationElements();
+
+			final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 
-			@Override
-			public void menuAboutToShow(IMenuManager manager) {
-				final Object o = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
-				if (o instanceof Control) {
-					manager.add(new Action(messages.ModelEditor_ShowControl) {
+			if (elements.length > 0 && !s.isEmpty()) {
+				MenuManager scriptExecute = new MenuManager(messages.ModelEditor_Script);
+				manager.add(scriptExecute);
+				for (IConfigurationElement e : elements) {
+					final IConfigurationElement le = e;
+					scriptExecute.add(new Action(e.getAttribute("label")) { //$NON-NLS-1$
 						@Override
 						public void run() {
-							ControlHighlighter.show((Control) o);
+							try {
+								MApplicationElement o = (MApplicationElement) master.getValue();
+								IScriptingSupport support = (IScriptingSupport) le.createExecutableExtension("class"); //$NON-NLS-1$
+								support.openEditor(viewer.getControl().getShell(), s.getFirstElement(),
+										ModelUtils.getContainingContext(o));
+							} catch (CoreException e) {
+								// TODO Auto-generated catch block
+								e.printStackTrace();
+							}
 						}
 					});
 				}
-
-				IExtensionRegistry registry = RegistryFactory.getRegistry();
-				IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.e4.tools.emf.ui.scripting"); //$NON-NLS-1$
-				final IConfigurationElement[] elements = extPoint.getConfigurationElements();
-
-				final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-
-				if (elements.length > 0 && !s.isEmpty()) {
-					MenuManager scriptExecute = new MenuManager(messages.ModelEditor_Script);
-					manager.add(scriptExecute);
-					for (IConfigurationElement e : elements) {
-						final IConfigurationElement le = e;
-						scriptExecute.add(new Action(e.getAttribute("label")) { //$NON-NLS-1$
-							@Override
-							public void run() {
-								try {
-									MApplicationElement o = (MApplicationElement) master.getValue();
-									IScriptingSupport support = (IScriptingSupport) le.createExecutableExtension("class"); //$NON-NLS-1$
-									support.openEditor(viewer.getControl().getShell(), s.getFirstElement(), ModelUtils.getContainingContext(o));
-								} catch (CoreException e) {
-									// TODO Auto-generated catch block
-									e.printStackTrace();
-								}
-							}
-						});
-					}
-				}
 			}
 		});
 

From e1dd1090f0d4eeff356c7334e5f27df379d6ccb1 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Fri, 18 Aug 2017 07:15:52 +0300
Subject: [PATCH 0999/1286] Bug 521067 - Move o.e.e4.tools.emf.ui to Java 8

Remove compilation profile pointing to Java 7.

Change-Id: Ic083b2744d3b08315eb0e4160b760073885962bd
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/build.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/build.properties b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
index 78f085b955..5778f7d920 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/build.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/build.properties
@@ -11,5 +11,4 @@ bin.includes = .,\
 output.. = bin/
 jars.compile.order = .
 source.. = src/
-jre.compilation.profile = JavaSE-1.7
 src.includes = about.html

From bae45e65980e116f8bf9551b133bf0531c494325 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Fri, 18 Aug 2017 08:33:50 +0300
Subject: [PATCH 1000/1286] Bug 521063 - Move o.e.e4.tools.services to Java 8

Update project settings.

Change-Id: I44432bfb4dc4db4992a5f1301fdc3d466852223e
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../.settings/org.eclipse.jdt.core.prefs                    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
index e28d402d66..57fcaa32f5 100644
--- a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
@@ -28,9 +28,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -139,7 +139,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO

From 7e29604edd791be0535ca08102051b6296eaffa1 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Fri, 18 Aug 2017 09:35:09 +0300
Subject: [PATCH 1001/1286] Bug 521096 - Move o.e.e4.tools.tests to Java 8

Bump minor, stricter warnings and adapt code to Java 8.

Change-Id: I5cdee1daca48fb2798d8cff40e472214e1e3fab8
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 tests/org.eclipse.e4.tools.test/.classpath    |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs      | 20 +++++++++++-----
 .../META-INF/MANIFEST.MF                      |  4 ++--
 .../tools/test/FragmentExtractHelperTest.java | 24 +++++++++----------
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/tests/org.eclipse.e4.tools.test/.classpath b/tests/org.eclipse.e4.tools.test/.classpath
index 098194ca4b..eca7bdba8f 100644
--- a/tests/org.eclipse.e4.tools.test/.classpath
+++ b/tests/org.eclipse.e4.tools.test/.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/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs
index 55e5fb83ac..544ddacfdf 100644
--- a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs
@@ -21,14 +21,17 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -45,7 +48,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -56,7 +59,7 @@ org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
 org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
@@ -84,19 +87,21 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
@@ -112,6 +117,9 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
@@ -132,7 +140,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
index f4f7ec294e..53ccea9672 100644
--- a/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.e4.tools.test
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
 Fragment-Host: org.eclipse.e4.tools;bundle-version="4.7.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.e4.core.contexts;bundle-version="1.3.100"
 Export-Package: org.eclipse.e4.tools.test;version="1.0.0";x-internal:=true
diff --git a/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java b/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
index 1d7b54e651..b246261a52 100644
--- a/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
+++ b/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011, 2017 EclipseSource Muenchen GmbH and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -77,7 +77,7 @@ public void setup() {
 	@Test
 	public void testExtractSinglePart() {
 		createWindowWithPart();
-		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<MApplicationElement>();
+		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<>();
 		elementsToExtract.add(part1);
 		final MModelFragments initialModel = FragmentExtractHelper.createInitialModel(elementsToExtract);
 		assertEquals(1, initialModel.getFragments().size());
@@ -108,7 +108,7 @@ private void assertExtractedElement(MApplicationElement originalElement, MApplic
 	 */
 	public void testExtractPlaceHolder() {
 		createWindowWithPlaceHolder();
-		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<MApplicationElement>();
+		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<>();
 		elementsToExtract.add(placeholder);
 		final MModelFragments initialModel = FragmentExtractHelper.createInitialModel(elementsToExtract);
 		assertEquals(1, initialModel.getFragments().size());
@@ -140,7 +140,7 @@ private void createWindowWithPlaceHolder() {
 	public void testExtractCommandWithCategory() {
 		final MCommand command = createCommand();
 		final MCategory category = createCategoryForCommand(command);
-		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<MApplicationElement>();
+		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<>();
 		elementsToExtract.add(command);
 		final MModelFragments initialModel = FragmentExtractHelper.createInitialModel(elementsToExtract);
 		assertEquals(1, initialModel.getFragments().size());
@@ -183,7 +183,7 @@ private void createWindow() {
 	public void testExtractTwoPartsSameLocation() {
 		createWindowWithPart();
 		addSecondPart();
-		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<MApplicationElement>();
+		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<>();
 		elementsToExtract.add(part1);
 		elementsToExtract.add(part2);
 		final MModelFragments initialModel = FragmentExtractHelper.createInitialModel(elementsToExtract);
@@ -198,7 +198,7 @@ public void testExtractTwoPartsSameLocation() {
 	@Test
 	public void testExtractHandlerWithoutCommand() {
 		createHandler();
-		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<MApplicationElement>();
+		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<>();
 		elementsToExtract.add(handler1);
 		final MModelFragments initialModel = FragmentExtractHelper.createInitialModel(elementsToExtract);
 		assertEquals(1, initialModel.getFragments().size());
@@ -218,7 +218,7 @@ private void createHandler() {
 	public void testExtractHandlerWithCommand() {
 		createHandler();
 		final MCommand command = createCommandLinkedWithHandler(handler1);
-		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<MApplicationElement>();
+		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<>();
 		elementsToExtract.add(handler1);
 		final MModelFragments initialModel = FragmentExtractHelper.createInitialModel(elementsToExtract);
 		assertEquals(1, initialModel.getFragments().size());
@@ -262,7 +262,7 @@ public void testExtractTwoHandlerWithDifferentCommands() {
 		createHandler2();
 		final MCommand command = createCommandLinkedWithHandler(handler1);
 		final MCommand command2 = createCommandLinkedWithHandler(handler2);
-		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<MApplicationElement>();
+		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<>();
 		elementsToExtract.add(handler1);
 		elementsToExtract.add(handler2);
 		final MModelFragments initialModel = FragmentExtractHelper.createInitialModel(elementsToExtract);
@@ -296,7 +296,7 @@ public void testExtractResolveCommandsWithTwoHandlerWithSameCommand() {
 		createHandler2();
 		final MCommand command = createCommandLinkedWithHandler(handler1);
 		handler2.setCommand(command);
-		final HashMap<MApplicationElement, MApplicationElement> importCommands = new HashMap<MApplicationElement, MApplicationElement>();
+		final HashMap<MApplicationElement, MApplicationElement> importCommands = new HashMap<>();
 
 		FragmentExtractHelper.resolveImports(handler1, importCommands);
 		FragmentExtractHelper.resolveImports(handler2, importCommands);
@@ -317,7 +317,7 @@ public void testExtractResolveCommandsWithTwoHandledItemsWithSameCommand() {
 		final MCommand command = createCommand();
 		handledItem1.setCommand(command);
 		handledItem2.setCommand(command);
-		final HashMap<MApplicationElement, MApplicationElement> importCommands = new HashMap<MApplicationElement, MApplicationElement>();
+		final HashMap<MApplicationElement, MApplicationElement> importCommands = new HashMap<>();
 
 		FragmentExtractHelper.resolveImports(handledItem1, importCommands);
 		FragmentExtractHelper.resolveImports(handledItem2, importCommands);
@@ -344,7 +344,7 @@ public void testExtractTwoPartsWithTwoBindingContexts() {
 		part2.getBindingContexts().add(bindingContext1);
 
 
-		final HashMap<MApplicationElement, MApplicationElement> importCommands = new LinkedHashMap<MApplicationElement, MApplicationElement>();
+		final HashMap<MApplicationElement, MApplicationElement> importCommands = new LinkedHashMap<>();
 
 		FragmentExtractHelper.resolveImports(part, importCommands);
 		FragmentExtractHelper.resolveImports(part2, importCommands);
@@ -379,7 +379,7 @@ public void testExtractTwoHandlerWithSameCommand() {
 		createHandler2();
 		final MCommand command = createCommandLinkedWithHandler(handler1);
 		handler2.setCommand(command);
-		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<MApplicationElement>();
+		final ArrayList<MApplicationElement> elementsToExtract = new ArrayList<>();
 		elementsToExtract.add(handler1);
 		elementsToExtract.add(handler2);
 		final MModelFragments initialModel = FragmentExtractHelper.createInitialModel(elementsToExtract);

From 735b6b5de3324f145e2903cb4e990cc3ae283625 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Fri, 18 Aug 2017 10:20:58 +0300
Subject: [PATCH 1002/1286] Bug 521098 - Update o.e.e4.tools.jdt.templates to
 Java 8

Bump minor and compiler settings.

Change-Id: I7e2029d8fa74bea8af9aa1627d52ee278a2443c4
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../.classpath                                 |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs       | 18 +++++++++++++-----
 .../META-INF/MANIFEST.MF                       |  4 ++--
 .../org.eclipse.e4.tools.jdt.templates/pom.xml |  2 +-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.classpath b/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
index e8ea977a69..eca7bdba8f 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
@@ -1,7 +1,7 @@
 <?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/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
index f41892c650..433e2551fe 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
@@ -21,14 +21,17 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -45,7 +48,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -56,7 +59,7 @@ org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
 org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
@@ -84,12 +87,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -112,6 +117,9 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
@@ -132,7 +140,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index fcaafa5414..9c98aa8249 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
-Bundle-Version: 4.7.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Version: 4.8.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
  org.eclipse.jface.text;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index b001f91a8a..fba848687d 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.jdt.templates</artifactId>
-  <version>4.7.0-SNAPSHOT</version>
+  <version>4.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From ebd8048915effad161b7c82dee57f9749387d9c3 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Thu, 24 Aug 2017 09:29:08 +0300
Subject: [PATCH 1003/1286] Bug 521340 - Convert comparators to lambdas in
 org.eclipse.e4.tools.emf.ui

There are few additional changes caused by save actions.

Change-Id: Ie9a6493b1c7ab2c2dfdae8099f65f4e8f1f33177
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../common/component/StringModelFragment.java | 51 ++++---------------
 .../component/tabs/TableViewerUtil.java       | 15 ++----
 .../component/virtual/VSnippetsEditor.java    | 46 ++++++++---------
 .../virtual/VWindowControlEditor.java         | 36 ++++++-------
 4 files changed, 50 insertions(+), 98 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 787a9d43c6..dfa7b0b018 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2016 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,7 +16,6 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 
@@ -82,8 +81,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -312,12 +309,7 @@ private Composite createForm(Composite parent) {
 
 			// Add a modify listener to control the change of the ID -> Must
 			// force the computation of selectedContainer.
-			t.addModifyListener(new ModifyListener() {
-				@Override
-				public void modifyText(ModifyEvent e) {
-					selectedContainer = null;
-				}
-			});
+			t.addModifyListener(e -> selectedContainer = null);
 
 			final Button b = new Button(comp, SWT.PUSH | SWT.FLAT);
 			b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -374,15 +366,12 @@ public void widgetSelected(SelectionEvent e) {
 			deco.setShowOnlyOnFocus(false);
 
 			// hide the decoration if the text component has content
-			t.addModifyListener(new ModifyListener() {
-				@Override
-				public void modifyText(ModifyEvent e) {
-					Text text = (Text) e.getSource();
-					if (!text.getText().isEmpty()) {
-						deco.hide();
-					} else {
-						deco.show();
-					}
+			t.addModifyListener(e -> {
+				Text text = (Text) e.getSource();
+				if (!text.getText().isEmpty()) {
+					deco.hide();
+				} else {
+					deco.show();
 				}
 			});
 
@@ -395,12 +384,7 @@ public void modifyText(ModifyEvent e) {
 			} catch (ParseException e) {
 				e.printStackTrace();
 			}
-			t.addModifyListener(new ModifyListener() {
-				@Override
-				public void modifyText(ModifyEvent e) {
-					updateChildrenChoice();
-				}
-			});
+			t.addModifyListener(e -> updateChildrenChoice());
 
 			final Button button = new Button(comp, SWT.PUSH | SWT.FLAT);
 			button.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -512,14 +496,7 @@ public IContentProposal[] getProposals(String cont, int position) {
 				}
 			}
 
-			Collections.sort(contents, new Comparator<String[]>() {
-
-				@Override
-				public int compare(String[] o1, String[] o2) {
-					// compare
-					return o1[0].compareTo(o2[0]);
-				}
-			});
+			Collections.sort(contents, (o1, o2) -> o1[0].compareTo(o2[0]));
 
 			IContentProposal[] contentProposals = new IContentProposal[contents.size()];
 			for (int i = 0; i < contents.size(); i++) {
@@ -595,13 +572,7 @@ protected void handleAdd(EClass eClass, boolean separator) {
 	public List<Action> getActions(Object element) {
 		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
-		Collections.sort(l, new Comparator<Action>() {
-			@Override
-			public int compare(Action o1, Action o2) {
-
-				return o1.getText().compareTo(o2.getText());
-			}
-		});
+		Collections.sort(l, (o1, o2) -> o1.getText().compareTo(o2.getText()));
 		return l;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
index 780093ae02..71d7b5567c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,7 +14,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Comparator;
 
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
@@ -43,7 +42,7 @@ static class ColumnLabelSorter extends TableViewerUtil.AbstractInvertableTableSo
 		public int compare(Viewer viewer, Object e1, Object e2) {
 			final TableViewer tableViewer = (TableViewer) viewer;
 			final ColumnLabelProvider labelProvider = (ColumnLabelProvider) tableViewer.getLabelProvider(Arrays.asList(
-				tableViewer.getTable().getColumns()).indexOf(col));
+					tableViewer.getTable().getColumns()).indexOf(col));
 			return labelProvider.getText(e1).compareTo(labelProvider.getText(e2));
 		}
 	}
@@ -113,7 +112,7 @@ static public class TableSortSelectionListener implements SelectionListener {
 		 *            default sorting direction
 		 */
 		public TableSortSelectionListener(TableViewer viewer, TableColumn column, AbstractInvertableTableSorter sorter,
-			int defaultDirection, boolean keepDirection) {
+				int defaultDirection, boolean keepDirection) {
 			this.viewer = viewer;
 			this.column = column;
 			this.keepDirection = keepDirection;
@@ -207,13 +206,7 @@ static public void resetColumnOrder(TableViewer tvResults) {
 	static public ArrayList<TableColumn> getColumnsInDisplayOrder(TableViewer viewer) {
 		final ArrayList<TableColumn> allCols = new ArrayList<>(Arrays.asList(viewer.getTable().getColumns()));
 		final int[] order = viewer.getTable().getColumnOrder();
-		Collections.sort(allCols, new Comparator<TableColumn>() {
-
-			@Override
-			public int compare(TableColumn o1, TableColumn o2) {
-				return order[allCols.indexOf(o1)] - order[allCols.indexOf(o2)];
-			}
-		});
+		Collections.sort(allCols, (o1, o2) -> order[allCols.indexOf(o1)] - order[allCols.indexOf(o2)]);
 		return allCols;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index f99fc2da05..b02174c763 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -5,7 +5,6 @@
  */
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 import javax.annotation.PostConstruct;
@@ -55,7 +54,7 @@ public VSnippetsEditor() {
 	void init() {
 
 		actions.add(new Action(Messages.VWindowControlEditor_AddArea,
-			createImageDescriptor(ResourceProvider.IMG_Area_vertical)) {
+				createImageDescriptor(ResourceProvider.IMG_Area_vertical)) {
 			@Override
 			public void run() {
 				handleAdd(AdvancedPackageImpl.Literals.AREA);
@@ -70,15 +69,15 @@ public void run() {
 		});
 
 		actions
-			.add(new Action(Messages.VWindowControlEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
-				@Override
-				public void run() {
-					handleAdd(BasicPackageImpl.Literals.PART);
-				}
-			});
+		.add(new Action(Messages.VWindowControlEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.PART);
+			}
+		});
 
 		actions.add(new Action(Messages.VWindowControlEditor_AddPartSashContainer,
-			createImageDescriptor(ResourceProvider.IMG_PartSashContainer_vertical)) {
+				createImageDescriptor(ResourceProvider.IMG_PartSashContainer_vertical)) {
 			@Override
 			public void run() {
 				handleAdd(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
@@ -86,7 +85,7 @@ public void run() {
 		});
 
 		actions.add(new Action(Messages.VWindowControlEditor_AddPartStack,
-			createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+				createImageDescriptor(ResourceProvider.IMG_PartStack)) {
 			@Override
 			public void run() {
 				handleAdd(BasicPackageImpl.Literals.PART_STACK);
@@ -94,14 +93,14 @@ public void run() {
 		});
 
 		actions.add(new Action(Messages.VWindowControlEditor_AddPerspectiveStack,
-			createImageDescriptor(ResourceProvider.IMG_PerspectiveStack)) {
+				createImageDescriptor(ResourceProvider.IMG_PerspectiveStack)) {
 			@Override
 			public void run() {
 				handleAdd(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK);
 			}
 		});
 		actions.add(new Action(Messages.PerspectiveStackEditor_AddPerspective,
-			createImageDescriptor(ResourceProvider.IMG_Perspective)) {
+				createImageDescriptor(ResourceProvider.IMG_Perspective)) {
 			@Override
 			public void run() {
 				handleAdd(AdvancedPackageImpl.Literals.PERSPECTIVE);
@@ -109,7 +108,7 @@ public void run() {
 		});
 
 		actions.add(new Action(Messages.VTrimContributionsEditor_AddTrimContribution,
-			createImageDescriptor(ResourceProvider.IMG_TrimContribution)) {
+				createImageDescriptor(ResourceProvider.IMG_TrimContribution)) {
 			@Override
 			public void run() {
 				handleAdd(BasicPackageImpl.Literals.TRIM_ELEMENT);
@@ -117,7 +116,7 @@ public void run() {
 		});
 
 		actions.add(new Action(Messages.VWindowEditor_AddTrimmedWindow,
-			createImageDescriptor(ResourceProvider.IMG_Window)) {
+				createImageDescriptor(ResourceProvider.IMG_Window)) {
 			@Override
 			public void run() {
 				handleAdd(BasicPackageImpl.Literals.TRIMMED_WINDOW);
@@ -130,26 +129,21 @@ public void run() {
 			}
 		});
 		actions.add(new Action(Messages.VWindowTrimEditor_AddWindowTrim,
-			createImageDescriptor(ResourceProvider.IMG_WindowTrim)) {
+				createImageDescriptor(ResourceProvider.IMG_WindowTrim)) {
 			@Override
 			public void run() {
 				handleAdd(BasicPackageImpl.Literals.TRIM_BAR);
 			}
 		});
 		actions.add(new Action(Messages.VWindowEditor_AddWizardDialog,
-			createImageDescriptor(ResourceProvider.IMG_WizardDialog)) {
+				createImageDescriptor(ResourceProvider.IMG_WizardDialog)) {
 			@Override
 			public void run() {
 				handleAdd(BasicPackageImpl.Literals.WIZARD_DIALOG);
 			}
 		});
 
-		Collections.sort(actions, new Comparator<Action>() {
-			@Override
-			public int compare(Action o1, Action o2) {
-				return o1.getText().compareTo(o2.getText());
-			}
-		});
+		Collections.sort(actions, (o1, o2) -> o1.getText().compareTo(o2.getText()));
 
 	}
 
@@ -206,10 +200,10 @@ protected List<?> getContainerChildren(Object container) {
 
 		pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
 		pickList.setInput(new EClass[] { BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW,
-			AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, AdvancedPackageImpl.Literals.PERSPECTIVE,
-			AdvancedPackageImpl.Literals.AREA, BasicPackageImpl.Literals.PART_SASH_CONTAINER,
-			BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART,
-			BasicPackageImpl.Literals.TRIM_BAR, BasicPackageImpl.Literals.TRIM_ELEMENT, });
+				AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, AdvancedPackageImpl.Literals.PERSPECTIVE,
+				AdvancedPackageImpl.Literals.AREA, BasicPackageImpl.Literals.PART_SASH_CONTAINER,
+				BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART,
+				BasicPackageImpl.Literals.TRIM_BAR, BasicPackageImpl.Literals.TRIM_ELEMENT, });
 		pickList.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE));
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 884c8be1f9..7c83d2bde4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,7 +13,6 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 import javax.annotation.PostConstruct;
@@ -65,7 +64,7 @@ public VWindowControlEditor() {
 	void init() {
 
 		actions.add(new Action(Messages.VWindowControlEditor_AddPerspectiveStack,
-			createImageDescriptor(ResourceProvider.IMG_PerspectiveStack)) {
+				createImageDescriptor(ResourceProvider.IMG_PerspectiveStack)) {
 			@Override
 			public void run() {
 				handleAdd(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK);
@@ -73,7 +72,7 @@ public void run() {
 		});
 
 		actions.add(new Action(Messages.VWindowControlEditor_AddPartSashContainer,
-			createImageDescriptor(ResourceProvider.IMG_PartSashContainer_vertical)) {
+				createImageDescriptor(ResourceProvider.IMG_PartSashContainer_vertical)) {
 			@Override
 			public void run() {
 				handleAdd(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
@@ -81,7 +80,7 @@ public void run() {
 		});
 
 		actions.add(new Action(Messages.VWindowControlEditor_AddPartStack,
-			createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+				createImageDescriptor(ResourceProvider.IMG_PartStack)) {
 			@Override
 			public void run() {
 				handleAdd(BasicPackageImpl.Literals.PART_STACK);
@@ -89,26 +88,21 @@ public void run() {
 		});
 
 		actions
-			.add(new Action(Messages.VWindowControlEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
-				@Override
-				public void run() {
-					handleAdd(BasicPackageImpl.Literals.PART);
-				}
-			});
-		actions.add(new Action(Messages.VWindowControlEditor_AddArea,
-			createImageDescriptor(ResourceProvider.IMG_Area_vertical)) {
+		.add(new Action(Messages.VWindowControlEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
-				handleAdd(AdvancedPackageImpl.Literals.AREA);
+				handleAdd(BasicPackageImpl.Literals.PART);
 			}
 		});
-
-		Collections.sort(actions, new Comparator<Action>() {
+		actions.add(new Action(Messages.VWindowControlEditor_AddArea,
+				createImageDescriptor(ResourceProvider.IMG_Area_vertical)) {
 			@Override
-			public int compare(Action o1, Action o2) {
-				return o1.getText().compareTo(o2.getText());
+			public void run() {
+				handleAdd(AdvancedPackageImpl.Literals.AREA);
 			}
 		});
+
+		Collections.sort(actions, (o1, o2) -> o1.getText().compareTo(o2.getText()));
 	}
 
 	@Override
@@ -149,7 +143,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
 					final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
@@ -168,7 +162,7 @@ public String getText(Object element) {
 			});
 
 			pickList
-				.setInput(new EClass[] { AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
+			.setInput(new EClass[] { AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
 					BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK,
 					BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART,
 					AdvancedPackageImpl.Literals.AREA });
@@ -191,7 +185,7 @@ private void handleAdd(EClass eClass) {
 		setElementId(eObject);
 
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);

From c3f46f00f1a0933a1ea2c2145f49138104e5cc99 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Thu, 24 Aug 2017 10:33:39 +0300
Subject: [PATCH 1004/1286] Bug 521342 - Lambda conversion in
 eclipse.platform.ui.tools repo

Change-Id: I136fe630a6ba7c019ea4e2ccd39793b69c523296
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../ui/common/ComboViewerAutoComplete.java    |  20 +-
 .../ui/internal/common/AbstractPickList.java  |  22 +-
 .../internal/common/ControlHighlighter.java   |  10 +-
 .../ui/internal/common/E4StringPickList.java  |  12 +-
 .../common/component/AddonsEditor.java        |  18 +-
 .../common/component/ApplicationEditor.java   |  48 +---
 .../DynamicMenuContributionEditor.java        |  18 +-
 .../common/component/HandlerEditor.java       |  14 +-
 .../component/ImperativeExpressionEditor.java |  14 +-
 .../AbstractCommandSelectionDialog.java       |  24 +-
 .../AbstractIconDialogWithHardcodedScope.java |  56 ++---
 .../AbstractIconDialogWithScopeAndFilter.java | 118 ++++------
 .../component/dialogs/AbstractIdDialog.java   |  15 +-
 .../BindingContextSelectionDialog.java        |  24 +-
 .../CommandCategorySelectionDialog.java       |  28 +--
 .../component/dialogs/ExpressionIdDialog.java |  18 +-
 .../dialogs/FeatureSelectionDialog.java       |  71 ++----
 .../dialogs/FilteredContributionDialog.java   | 220 +++++++-----------
 .../dialogs/FindImportElementDialog.java      |  22 +-
 .../FindParentReferenceElementDialog.java     |  42 +---
 .../dialogs/SharedElementsDialog.java         |  12 +-
 .../common/component/tabs/ListTab.java        |  70 +++---
 .../common/component/tabs/XmiTab.java         |  29 ++-
 .../tabs/empty/TitleAreaFilterDialog.java     |  26 +--
 .../dialogs/BundleClassDialog.java            |  50 ++--
 .../dialogs/FindContributionDialog.java       |  27 +--
 .../resourcelocator/dialogs/IconDialog.java   |  52 ++---
 .../dialogs/NonReferencedActionPage.java      | 125 ++++------
 .../dialogs/NonReferencedResourceDialog.java  | 150 +++++-------
 .../dialogs/NonReferencedResourceWizard.java  |  14 +-
 .../dialogs/PickProjectFolderPage.java        |  22 +-
 .../dialogs/PickProjectPage.java              |  30 +--
 .../dialogs/ProjectFolderPickerDialog.java    |  42 ++--
 .../ReferencedProjectPickerDialog.java        |  14 +-
 .../emf/ui/internal/imp/ModelImportPage1.java |  36 ++-
 .../internal/wbm/ApplicationModelEditor.java  |  42 ++--
 .../tools/services/impl/ResourceService.java  |  10 +-
 .../wizards/classes/AbstractNewClassPage.java |  14 +-
 .../model/BaseApplicationModelWizard.java     |  10 +-
 .../tools/wizards/model/NewModelFilePage.java |  28 +--
 40 files changed, 515 insertions(+), 1102 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
index 5468385f8d..5e415c8e5b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,6 +14,7 @@
 import java.util.Arrays;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+
 import org.eclipse.jface.fieldassist.ComboContentAdapter;
 import org.eclipse.jface.fieldassist.ContentProposalAdapter;
 import org.eclipse.jface.fieldassist.IContentProposal;
@@ -88,18 +89,11 @@ public void focusGained(FocusEvent e) {
 				// need to delay the call
 				// THIS IS A WORKAROUND
 				final ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(1);
-				executor.schedule(new Runnable() {
-					@Override
-					public void run() {
-						dropDown.getCombo().getDisplay().syncExec(new Runnable() {
-
-							@Override
-							public void run() {
-								dropDown.getCombo().setSelection(new Point(0, dropDown.getCombo().getText().length()));
-							}
-						});
-					}
-				}, 200, TimeUnit.MILLISECONDS);
+				executor.schedule(
+						() -> dropDown.getCombo().getDisplay()
+						.syncExec(() -> dropDown.getCombo()
+								.setSelection(new Point(0, dropDown.getCombo().getText().length()))),
+						200, TimeUnit.MILLISECONDS);
 			}
 		});
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index 17cece3789..ba53057731 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2015 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -20,12 +20,8 @@
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IOpenListener;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.OpenEvent;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
@@ -117,13 +113,7 @@ public AbstractPickList(Composite parent, int style, List<PickListFeatures> list
 		toolBar.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
 		toolBar.setFont(group.getFont());
 
-		picker.addOpenListener(new IOpenListener() {
-
-			@Override
-			public void open(OpenEvent event) {
-				addPressed();
-			}
-		});
+		picker.addOpenListener(event -> addPressed());
 
 		tiAdd = new Button(toolBar, SWT.PUSH);
 		tiAdd.setToolTipText(messages.ModelTooling_Common_AddEllipsis);
@@ -177,13 +167,7 @@ public void widgetSelected(SelectionEvent e) {
 		final GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1);
 		viewer.getControl().setLayoutData(gd);
 
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				updateUiState();
-			}
-		});
+		viewer.addSelectionChangedListener(event -> updateUiState());
 
 		updateUiState();
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
index 018080f3c7..2faeccdf51 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
@@ -3,8 +3,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 
 public class ControlHighlighter {
@@ -21,13 +19,7 @@ public static void show(Control control) {
 		s.setBackground(s.getDisplay().getSystemColor(SWT.COLOR_RED));
 		s.setAlpha(100);
 		s.open();
-		s.addListener(SWT.MouseDown, new Listener() {
-
-			@Override
-			public void handleEvent(Event event) {
-				hide();
-			}
-		});
+		s.addListener(SWT.MouseDown, event -> hide());
 	}
 
 	public static void hide() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
index dbcb180676..7a43417737 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others.
  * All rights reserved. This program and 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,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusAdapter;
 import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -89,13 +87,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		getList().setContentProvider(new ObservableListContentProvider());
 
-		text.addModifyListener(new ModifyListener() {
-
-			@Override
-			public void modifyText(ModifyEvent e) {
-				updateUiState();
-			}
-		});
+		text.addModifyListener(e -> updateUiState());
 
 		text.addFocusListener(new FocusAdapter() {
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index db5393e417..340a9feb63 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -43,8 +43,6 @@
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -183,21 +181,17 @@ public void widgetSelected(SelectionEvent e) {
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			t.addModifyListener(new ModifyListener() {
-
-				@Override
-				public void modifyText(ModifyEvent e) {
-					if (lnk != null) {
-						lnk.setToolTipText(((Text) e.getSource()).getText());
-					}
+			t.addModifyListener(e -> {
+				if (lnk != null) {
+					lnk.setToolTipText(((Text) e.getSource()).getText());
 				}
 			});
 			final Binding binding = context.bindValue(
 					textProp.observeDelayed(200, t),
 					EMFEditProperties.value(getEditingDomain(),
 							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()),
-							new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
-							new UpdateValueStrategy());
+					new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+					new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index a941043e6f..33844acccf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -60,9 +60,7 @@
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
-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.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
@@ -75,8 +73,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -505,13 +501,7 @@ public void createControl(Composite parent) {
 
 				nameField = new Text(group, SWT.BORDER);
 				nameField.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-				nameField.addModifyListener(new ModifyListener() {
-
-					@Override
-					public void modifyText(ModifyEvent e) {
-						setPageComplete(nameField.getText().trim().length() > 0);
-					}
-				});
+				nameField.addModifyListener(e -> setPageComplete(nameField.getText().trim().length() > 0));
 			}
 
 			{
@@ -560,13 +550,9 @@ public void createControl(Composite parent) {
 
 				keyField = new Text(group, SWT.BORDER);
 				keyField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-				keyField.addModifyListener(new ModifyListener() {
-
-					@Override
-					public void modifyText(ModifyEvent e) {
-						bindtableViewer.getControl().setEnabled(isPageComplete());
-						setPageComplete(isPageComplete());
-					}
+				keyField.addModifyListener(e -> {
+					bindtableViewer.getControl().setEnabled(isPageComplete());
+					setPageComplete(isPageComplete());
 				});
 			}
 
@@ -583,13 +569,7 @@ public void modifyText(ModifyEvent e) {
 						new ComponentLabelProvider(getEditor(), Messages, italicFontDescriptor)));
 				bindtableViewer.setContentProvider(new ArrayContentProvider());
 				bindtableViewer.setInput(application.getBindingTables());
-				bindtableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-					@Override
-					public void selectionChanged(SelectionChangedEvent event) {
-						setPageComplete(isPageComplete());
-					}
-				});
+				bindtableViewer.addSelectionChangedListener(event -> setPageComplete(isPageComplete()));
 				bindtableViewer.setSelection(new StructuredSelection(application.getBindingTables().get(0)));
 				final GridData gd = new GridData(GridData.FILL_BOTH);
 				gd.heightHint = bindtableViewer.getTable().getItemHeight() * 5;
@@ -674,13 +654,7 @@ public void createControl(Composite parent) {
 					}
 				}
 				menuViewer.setInput(menuList);
-				menuViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-					@Override
-					public void selectionChanged(SelectionChangedEvent event) {
-						setPageComplete(isPageComplete());
-					}
-				});
+				menuViewer.addSelectionChangedListener(event -> setPageComplete(isPageComplete()));
 				final GridData gd = new GridData(GridData.FILL_BOTH);
 				gd.heightHint = menuViewer.getTable().getItemHeight() * 5;
 				menuViewer.getControl().setLayoutData(gd);
@@ -764,13 +738,7 @@ public void createControl(Composite parent) {
 					}
 				}
 				toolbarViewer.setInput(toolbarList);
-				toolbarViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-					@Override
-					public void selectionChanged(SelectionChangedEvent event) {
-						setPageComplete(isPageComplete());
-					}
-				});
+				toolbarViewer.addSelectionChangedListener(event -> setPageComplete(isPageComplete()));
 				final GridData gd = new GridData(GridData.FILL_BOTH);
 				gd.heightHint = toolbarViewer.getTable().getItemHeight() * 5;
 				toolbarViewer.getControl().setLayoutData(gd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
index abdd78aa77..73183d4d12 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2014 MEDEVIT, FHV and others.
+ * Copyright (c) 2013, 2017 MEDEVIT, FHV and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -43,8 +43,6 @@
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -182,21 +180,17 @@ public void widgetSelected(SelectionEvent e) {
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			t.addModifyListener(new ModifyListener() {
-
-				@Override
-				public void modifyText(ModifyEvent e) {
-					if (lnk != null) {
-						lnk.setToolTipText(((Text) e.getSource()).getText());
-					}
+			t.addModifyListener(e -> {
+				if (lnk != null) {
+					lnk.setToolTipText(((Text) e.getSource()).getText());
 				}
 			});
 			final Binding binding = context.bindValue(
 					textProp.observeDelayed(200, t),
 					EMFEditProperties.value(getEditingDomain(),
 							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()),
-							new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
-							new UpdateValueStrategy());
+					new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+					new UpdateValueStrategy());
 			Util.addDecoration(t, binding);
 
 			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index ab936eeb1c..b0b2a74787 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -47,8 +47,6 @@
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -201,13 +199,9 @@ public void widgetSelected(SelectionEvent e) {
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			t.addModifyListener(new ModifyListener() {
-
-				@Override
-				public void modifyText(ModifyEvent e) {
-					if (lnk != null) {
-						lnk.setToolTipText(((Text) e.getSource()).getText());
-					}
+			t.addModifyListener(e -> {
+				if (lnk != null) {
+					lnk.setToolTipText(((Text) e.getSource()).getText());
 				}
 			});
 			final Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
index 90406f433a..d3e2130774 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016 vogella GmbH and others.
+ * Copyright (c) 2016, 2017 vogella GmbH and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -36,8 +36,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -141,13 +139,9 @@ public void widgetSelected(SelectionEvent e) {
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			t.addModifyListener(new ModifyListener() {
-
-				@Override
-				public void modifyText(ModifyEvent e) {
-					if (lnk != null) {
-						lnk.setToolTipText(((Text) e.getSource()).getText());
-					}
+			t.addModifyListener(e -> {
+				if (lnk != null) {
+					lnk.setToolTipText(((Text) e.getSource()).getText());
 				}
 			});
 			final Binding binding = context.bindValue(textProp.observeDelayed(200, t),
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index c4458234f7..ba4c58864b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -27,8 +27,6 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
@@ -37,8 +35,6 @@
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -73,15 +69,9 @@ protected Control createDialogArea(Composite parent) {
 		setMessage(getDialogMessage());
 
 		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream(
-			"/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
+				"/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
-		getShell().addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				titleImage.dispose();
-			}
-		});
+		getShell().addDisposeListener(e -> titleImage.dispose());
 
 		final Composite container = new Composite(composite, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -98,13 +88,7 @@ public void widgetDisposed(DisposeEvent e) {
 		viewer.setContentProvider(new ArrayContentProvider());
 		viewer.setLabelProvider(new LabelProviderImpl());
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				okPressed();
-			}
-		});
+		viewer.addDoubleClickListener(event -> okPressed());
 
 		final List<EObject> commands = new ArrayList<>();
 		final TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
index 5e014d0b07..8d5e9d59f0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
@@ -30,7 +30,6 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.ResourceSearchScope;
@@ -38,16 +37,12 @@
 import org.eclipse.e4.tools.emf.ui.internal.StringMatcher;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -190,13 +185,7 @@ public void update(ViewerCell cell) {
 
 		final WritableList list = new WritableList();
 		viewer.setInput(list);
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				okPressed();
-			}
-		});
+		viewer.addDoubleClickListener(event -> okPressed());
 
 		textSearch.addModifyListener(new ModifyListener() {
 			private IconMatchCallback callback;
@@ -221,13 +210,7 @@ public void modifyText(ModifyEvent e) {
 			}
 		});
 
-		getShell().addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				clearImages();
-			}
-		});
+		getShell().addDisposeListener(e -> clearImages());
 
 		textSearch.notifyListeners(SWT.Modify, new Event());
 
@@ -301,13 +284,7 @@ private IconMatchCallback(IObservableList list) {
 
 		public void match(final IFile file) {
 			if (!cancel) {
-				list.getRealm().exec(new Runnable() {
-
-					@Override
-					public void run() {
-						list.add(file);
-					}
-				});
+				list.getRealm().exec(() -> list.add(file));
 			}
 		}
 	}
@@ -366,25 +343,20 @@ public void run() {
 							e.printStackTrace();
 						}
 					}
-					project.accept(new IResourceVisitor() {
-
-						@Override
-						public boolean visit(IResource resource) throws CoreException {
-							if (callback.cancel) {
-								return false;
-							}
-
-							if (resource.getType() == IResource.FOLDER || resource.getType() == IResource.PROJECT) {
-								return true;
-							} else if (resource.getType() == IResource.FILE && !resource.isLinked()) {
-								String path = resource.getProjectRelativePath().toString();
-								if (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path)) {
-									callback.match((IFile) resource);
-								}
-							}
+					project.accept(resource -> {
+						if (callback.cancel) {
 							return false;
 						}
 
+						if (resource.getType() == IResource.FOLDER || resource.getType() == IResource.PROJECT) {
+							return true;
+						} else if (resource.getType() == IResource.FILE && !resource.isLinked()) {
+							String path = resource.getProjectRelativePath().toString();
+							if (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path)) {
+								callback.match((IFile) resource);
+							}
+						}
+						return false;
 					});
 				}
 			} catch (CoreException e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
index 85409e3c30..47d89b4456 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
@@ -26,7 +26,6 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
@@ -38,24 +37,18 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.TargetPlatformIconContributionCollector;
 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.StructuredSelection;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 
 /**
@@ -127,16 +120,12 @@ protected void createOptions(Composite compOptions) {
 		maxDisplayedImageSize = 30;
 		cv.setSelection(new StructuredSelection(maxDisplayedImageSize));
 
-		cv.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				maxDisplayedImageSize = (Integer) ((IStructuredSelection) cv.getSelection()).getFirstElement();
-				rebuildViewer();
-				refreshSearch();
-				// combo viewer cannot make rows smaller, so we will need to
-				// rebuild it in that case.
-			}
+		cv.addSelectionChangedListener(event -> {
+			maxDisplayedImageSize = (Integer) ((IStructuredSelection) cv.getSelection()).getFirstElement();
+			rebuildViewer();
+			refreshSearch();
+			// combo viewer cannot make rows smaller, so we will need to
+			// rebuild it in that case.
 		});
 	}
 
@@ -153,13 +142,7 @@ protected void rebuildViewer() {
 		colText.getColumn().setText(Messages.AbstractIconDialogWithScopeAndFilter_details);
 
 		// resize the row height using a MeasureItem listener
-		getViewer().getTable().addListener(SWT.MeasureItem, new Listener() {
-			@Override
-			public void handleEvent(Event event) {
-				// height cannot be per row so simply set
-				event.height = maxDisplayedImageSize;
-			}
-		});
+		getViewer().getTable().addListener(SWT.MeasureItem, event -> event.height = maxDisplayedImageSize);
 
 		colIcon.setLabelProvider(new StyledCellLabelProvider() {
 			@Override
@@ -251,13 +234,7 @@ public void update(ViewerCell cell) {
 		});
 		colText.getColumn().setWidth(400);
 
-		getShell().addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				clearImages();
-			}
-		});
+		getShell().addDisposeListener(e -> clearImages());
 	}
 
 	@Override
@@ -345,15 +322,11 @@ private IconMatchCallback(IObservableList list) {
 
 		public void match(final IFile file, final String installLocation) {
 			if (!cancel) {
-				list.getRealm().exec(new Runnable() {
-
-					@Override
-					public void run() {
-						final Entry entry = new Entry();
-						entry.file = file;
-						entry.installLocation = installLocation;
-						list.add(entry);
-					}
+				list.getRealm().exec(() -> {
+					final Entry entry = new Entry();
+					entry.file = file;
+					entry.installLocation = installLocation;
+					list.add(entry);
 				});
 			}
 		}
@@ -408,49 +381,44 @@ public void run() {
 					if (includeNonBundles == false && filter.project.getFile("/META-INF/MANIFEST.MF").exists() == false) { //$NON-NLS-1$
 						continue;
 					}
-					project.accept(new IResourceVisitor() {
-
-						@Override
-						public boolean visit(IResource resource) throws CoreException {
-							if (callback.cancel) {
-								return false;
-							}
+					project.accept(resource -> {
+						if (callback.cancel) {
+							return false;
+						}
 
-							if (resource.getType() == IResource.FOLDER || resource.getType() == IResource.PROJECT) {
-								return true;
-							} else if (resource.getType() == IResource.FILE && !resource.isLinked()) {
-								final String path = resource.getProjectRelativePath().toString();
-								if (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path)) {
-									if (E.notEmpty(filter.getPackages())) {
-										if (!filter.getPackages().contains(
-												resource.getProjectRelativePath().removeLastSegments(1).toOSString())) {
-											return false;
-										}
+						if (resource.getType() == IResource.FOLDER || resource.getType() == IResource.PROJECT) {
+							return true;
+						} else if (resource.getType() == IResource.FILE && !resource.isLinked()) {
+							final String path = resource.getProjectRelativePath().toString();
+							if (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path)) {
+								if (E.notEmpty(filter.getPackages())) {
+									if (!filter.getPackages().contains(
+											resource.getProjectRelativePath().removeLastSegments(1).toOSString())) {
+										return false;
 									}
-									if (E.notEmpty(filter.getLocations())) {
-										if (!filter.getLocations().contains(project.getLocation().toOSString())) {
-											return false;
-										}
+								}
+								if (E.notEmpty(filter.getLocations())) {
+									if (!filter.getLocations().contains(project.getLocation().toOSString())) {
+										return false;
 									}
-									if (E.notEmpty(filter.getBundles())) {
-										final String bundle = getBundle(project);
-										if (bundle == null || !filter.getBundles().contains(bundle)) {
-											return false;
-										}
+								}
+								if (E.notEmpty(filter.getBundles())) {
+									final String bundle1 = getBundle(project);
+									if (bundle1 == null || !filter.getBundles().contains(bundle1)) {
+										return false;
 									}
-									if (!filter.isIncludeNonBundles()) {
-										final String bundle = getBundle(project);
-										if (bundle == null) {
-											return false;
-										}
-
+								}
+								if (!filter.isIncludeNonBundles()) {
+									final String bundle2 = getBundle(project);
+									if (bundle2 == null) {
+										return false;
 									}
-									callback.match((IFile) resource, project.getLocation().toOSString());
+
 								}
+								callback.match((IFile) resource, project.getLocation().toOSString());
 							}
-							return false;
 						}
-
+						return false;
 					});
 				}
 			} catch (final CoreException e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
index ec1df656df..fb5bc05143 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013 - 2015 fhv.at and others.
+ * Copyright (c) 2013, 2017 fhv.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,9 +30,7 @@
 import org.eclipse.jface.viewers.BaseLabelProvider;
 import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
 import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.TableViewer;
@@ -48,7 +46,7 @@
 import org.eclipse.swt.widgets.Text;
 
 public abstract class AbstractIdDialog<ContributionClass, ElementClass extends MApplicationElement> extends
-	SaveDialogBoundsSettingsDialog {
+SaveDialogBoundsSettingsDialog {
 
 	protected EModelService modelService;
 
@@ -59,7 +57,7 @@ public abstract class AbstractIdDialog<ContributionClass, ElementClass extends M
 	protected Messages messages;
 
 	public AbstractIdDialog(Shell parentShell, IModelResource resource, ContributionClass toolbarContribution,
-		EditingDomain domain, EModelService modelService, Messages Messages) {
+			EditingDomain domain, EModelService modelService, Messages Messages) {
 		super(parentShell);
 		this.resource = resource;
 		this.modelService = modelService;
@@ -120,12 +118,7 @@ protected boolean isParentMatch(Viewer viewer, Object element) {
 		viewer.setContentProvider(new ArrayContentProvider());
 		viewer.setLabelProvider(getLabelProvider());
 		viewer.addFilter(filter);
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				okPressed();
-			}
-		});
+		viewer.addDoubleClickListener(event -> okPressed());
 
 		ControlFactory.attachFiltering(idField, viewer, filter);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
index 20ba298290..1d6f27dda8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -25,8 +25,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
@@ -35,8 +33,6 @@
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -70,15 +66,9 @@ protected Control createDialogArea(Composite parent) {
 		setMessage(Messages.BindingContextSelectionDialog_Message);
 
 		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream(
-			"/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
+				"/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
-		getShell().addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				titleImage.dispose();
-			}
-		});
+		getShell().addDisposeListener(e -> titleImage.dispose());
 
 		final Composite container = new Composite(composite, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -95,13 +85,7 @@ public void widgetDisposed(DisposeEvent e) {
 		viewer.setContentProvider(new ArrayContentProvider());
 		viewer.setLabelProvider(new LabelProviderImpl());
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				okPressed();
-			}
-		});
+		viewer.addDoubleClickListener(event -> okPressed());
 
 		final List<EObject> categories = new ArrayList<>();
 		final TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
index 3f3d35e2c5..1a2e729bd0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -28,8 +28,6 @@
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
@@ -38,8 +36,6 @@
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -56,7 +52,7 @@ public class CommandCategorySelectionDialog extends SaveDialogBoundsSettingsDial
 	private final Messages Messages;
 
 	public CommandCategorySelectionDialog(Shell parentShell, IModelResource resource, MCommand command,
-		Messages Messages) {
+			Messages Messages) {
 		super(parentShell);
 		this.resource = resource;
 		this.command = command;
@@ -71,15 +67,9 @@ protected Control createDialogArea(Composite parent) {
 		setMessage(Messages.CommandCategorySelectionDialog_Message);
 
 		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream(
-			"/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
+				"/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
-		getShell().addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				titleImage.dispose();
-			}
-		});
+		getShell().addDisposeListener(e -> titleImage.dispose());
 
 		final Composite container = new Composite(composite, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -96,13 +86,7 @@ public void widgetDisposed(DisposeEvent e) {
 		viewer.setContentProvider(new ArrayContentProvider());
 		viewer.setLabelProvider(new LabelProviderImpl());
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				okPressed();
-			}
-		});
+		viewer.addDoubleClickListener(event -> okPressed());
 
 		final List<EObject> categories = new ArrayList<>();
 		final TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
@@ -132,7 +116,7 @@ protected void okPressed() {
 		final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 		if (!s.isEmpty()) {
 			final Command cmd = SetCommand.create(resource.getEditingDomain(), command,
-				CommandsPackageImpl.Literals.COMMAND__CATEGORY, s.getFirstElement());
+					CommandsPackageImpl.Literals.COMMAND__CATEGORY, s.getFirstElement());
 			if (cmd.canExecute()) {
 				resource.getEditingDomain().getCommandStack().execute(cmd);
 				super.okPressed();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
index 1f600199df..73010b23c9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -27,8 +27,6 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
@@ -55,7 +53,7 @@ public class ExpressionIdDialog extends SaveDialogBoundsSettingsDialog {
 	private final Messages Messages;
 
 	public ExpressionIdDialog(Shell parentShell, IExtensionLookup lookup, MCoreExpression expression,
-		EditingDomain domain, boolean liveModel, Messages Messages) {
+			EditingDomain domain, boolean liveModel, Messages Messages) {
 		super(parentShell);
 		this.lookup = lookup;
 		this.expression = expression;
@@ -94,13 +92,7 @@ protected boolean isParentMatch(Viewer viewer, Object element) {
 		viewer.setLabelProvider(new LabelProviderImpl());
 		viewer.addFilter(filter);
 		viewer.setInput(getElements(lookup));
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				okPressed();
-			}
-		});
+		viewer.addDoubleClickListener(event -> okPressed());
 
 		ControlFactory.attachFiltering(idField, viewer, filter);
 
@@ -111,9 +103,9 @@ public void doubleClick(DoubleClickEvent event) {
 	protected void okPressed() {
 		if (!viewer.getSelection().isEmpty()) {
 			final IConfigurationElement el = (IConfigurationElement) ((IStructuredSelection) viewer.getSelection())
-				.getFirstElement();
+					.getFirstElement();
 			final Command cmd = SetCommand.create(domain, expression,
-				UiPackageImpl.Literals.CORE_EXPRESSION__CORE_EXPRESSION_ID, el.getAttribute("id")); //$NON-NLS-1$
+					UiPackageImpl.Literals.CORE_EXPRESSION__CORE_EXPRESSION_ID, el.getAttribute("id")); //$NON-NLS-1$
 			if (cmd.canExecute()) {
 				domain.getCommandStack().execute(cmd);
 				super.okPressed();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index 8a77d967a9..64abfe463d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2015 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -32,13 +32,9 @@
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.dialogs.IDialogConstants;
-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.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
@@ -49,10 +45,6 @@
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -104,15 +96,11 @@ protected Control createDialogArea(Composite parent) {
 
 		setTitleImage(newTitleImage);
 
-		composite.addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				packageImage.dispose();
-				classImage.dispose();
-				featureImage.dispose();
-				newTitleImage.dispose();
-			}
+		composite.addDisposeListener(e -> {
+			packageImage.dispose();
+			classImage.dispose();
+			featureImage.dispose();
+			newTitleImage.dispose();
 		});
 
 		final Composite container = new Composite(composite, SWT.NONE);
@@ -125,19 +113,15 @@ public void widgetDisposed(DisposeEvent e) {
 		final Text searchText = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
-		searchText.addModifyListener(new ModifyListener() {
-
-			@Override
-			public void modifyText(ModifyEvent e) {
-				if (filter != null) {
-					filter.setPattern(searchText.getText());
-					if (viewer != null) {
-						viewer.refresh();
-						if (searchText.getText().length() > 0) {
-							viewer.expandAll();
-						} else {
-							viewer.collapseAll();
-						}
+		searchText.addModifyListener(e -> {
+			if (filter != null) {
+				filter.setPattern(searchText.getText());
+				if (viewer != null) {
+					viewer.refresh();
+					if (searchText.getText().length() > 0) {
+						viewer.expandAll();
+					} else {
+						viewer.collapseAll();
 					}
 				}
 			}
@@ -149,13 +133,7 @@ public void modifyText(ModifyEvent e) {
 		viewer.getControl().setLayoutData(gd);
 		viewer.setContentProvider(new ContentProviderImpl());
 		viewer.setLabelProvider(new LabelProviderImpl(packageImage, classImage, featureImage));
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				okPressed();
-			}
-		});
+		viewer.addDoubleClickListener(event -> okPressed());
 		viewer.setComparator(new ViewerComparator() {
 			@Override
 			public int compare(Viewer viewer, Object e1, Object e2) {
@@ -170,16 +148,13 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 				return super.compare(viewer, e1, e2);
 			}
 		});
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				final IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-				final Button buttonOk = getButton(IDialogConstants.OK_ID);
-				if (!selection.isEmpty() && selection.getFirstElement().getClass() == InternalFeature.class) {
-					buttonOk.setEnabled(true);
-				} else {
-					buttonOk.setEnabled(false);
-				}
+		viewer.addSelectionChangedListener(event -> {
+			final IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+			final Button buttonOk = getButton(IDialogConstants.OK_ID);
+			if (!selection.isEmpty() && selection.getFirstElement().getClass() == InternalFeature.class) {
+				buttonOk.setEnabled(true);
+			} else {
+				buttonOk.setEnabled(false);
 			}
 		});
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index 48d3530c1b..c84de396d5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -40,7 +40,6 @@
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionResultHandler;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
-import org.eclipse.e4.tools.emf.ui.common.IProviderStatusCallback;
 import org.eclipse.e4.tools.emf.ui.common.ProviderStatus;
 import org.eclipse.e4.tools.emf.ui.common.ResourceSearchScope;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -57,8 +56,6 @@
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
@@ -73,12 +70,8 @@
 import org.eclipse.pde.internal.core.text.bundle.RequireBundleHeader;
 import org.eclipse.pde.internal.core.text.bundle.RequireBundleObject;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -192,28 +185,18 @@ public ContributionResultHandlerImpl(IObservableList list) {
 		@Override
 		public void result(final ContributionData data) {
 			if (!cancled) {
-				getShell().getDisplay().syncExec(new Runnable() {
-
-					@Override
-					public void run() {
-						list.add(data);
-					}
-				});
+				getShell().getDisplay().syncExec(() -> list.add(data));
 			}
 		}
 
 		@Override
 		public void moreResults(final int hint, final Filter filter) {
 			if (!cancled) {
-				getShell().getDisplay().syncExec(new Runnable() {
-
-					@Override
-					public void run() {
-						final FilteredContributionDialog dlg = (FilteredContributionDialog) filter.userData;
-						dlg.hint = hint;
-						dlg.maxResults = filter.maxResults;
-						dlg.updateStatusMessage();
-					}
+				getShell().getDisplay().syncExec(() -> {
+					final FilteredContributionDialog dlg = (FilteredContributionDialog) filter.userData;
+					dlg.hint = hint;
+					dlg.maxResults = filter.maxResults;
+					dlg.updateStatusMessage();
 				});
 			}
 		}
@@ -258,13 +241,7 @@ public static <TheType extends Enum<TheType>> EnumSet<TheType> valueOf(Class<The
 	}
 
 	public void setStatus(final String message) {
-		getShell().getDisplay().asyncExec(new Runnable() {
-
-			@Override
-			public void run() {
-				lblStatus.setText(message);
-			}
-		});
+		getShell().getDisplay().asyncExec(() -> lblStatus.setText(message));
 	}
 
 	@Override
@@ -300,18 +277,14 @@ public void widgetSelected(SelectionEvent e) {
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		final Composite comp = (Composite) super.createDialogArea(parent);
-		getShell().addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				imageCache.dispose();
+		getShell().addDisposeListener(e -> {
+			imageCache.dispose();
 
-				if (contributionTypeImage.isDisposed() == false) {
-					contributionTypeImage.dispose();
-				}
-				if (getTitleImageLabel().getImage() != null && getTitleImage().isDisposed() == false) {
-					getTitleImageLabel().getImage().dispose();
-				}
+			if (contributionTypeImage.isDisposed() == false) {
+				contributionTypeImage.dispose();
+			}
+			if (getTitleImageLabel().getImage() != null && getTitleImage().isDisposed() == false) {
+				getTitleImageLabel().getImage().dispose();
 			}
 		});
 
@@ -366,103 +339,80 @@ public void keyPressed(KeyEvent e) {
 			}
 		});
 
-		textBox.addModifyListener(new ModifyListener() {
+		textBox.addModifyListener(e -> {
+			stopSearchThread(true);
+			setMessage(""); //$NON-NLS-1$
 
-			@Override
-			public void modifyText(ModifyEvent e) {
-				stopSearchThread(true);
-				setMessage(""); //$NON-NLS-1$
+			viewerList.clear();
+			if (doSearch() == true) {
+				return;
+			}
+			searching = true;
+			updateStatusMessage();
 
-				viewerList.clear();
-				if (doSearch() == true) {
-					return;
-				}
-				searching = true;
-				updateStatusMessage();
-
-				currentSearchThread = new Job(Messages.FilteredContributionDialog_ContributionSearch) {
-
-					Filter filter;
-
-					@Override
-					protected IStatus run(IProgressMonitor monitor) {
-						monitor.beginTask(Messages.FilteredContributionDialog_ContributionSearch,
-								IProgressMonitor.UNKNOWN);
-						currentResultHandler = new ContributionResultHandlerImpl(viewerList);
-						getShell().getDisplay().syncExec(new Runnable() {
-
-							@Override
-							public void run() {
-								if (searchScopes.contains(ResourceSearchScope.PROJECT)) {
-									filter = new Filter(context.get(IProject.class), textBox.getText());
-								} else {
-									// filter = new Filter(null,
-									// textBox.getText());
-									filter = new Filter(context.get(IProject.class), textBox.getText());
-								}
-							}
-						});
-						filter.maxResults = MAX_RESULTS;
-						filter.userData = FilteredContributionDialog.this;
-						filter.setBundles(filterBundles);
-						filter.setPackages(filterPackages);
-						filter.setLocations(filterLocations);
-						filter.setSearchScope(searchScopes);
-						filter.setIncludeNonBundles(includeNonBundles);
-						filter.setProgressMonitor(monitor);
-						filter.setProviderStatusCallback(new IProviderStatusCallback() {
-
-							@Override
-							public void onStatusChanged(final ProviderStatus status) {
-								providerStatus = status;
-								try {
-									getShell().getDisplay().syncExec(new Runnable() {
-
-										@Override
-										public void run() {
-											updateStatusMessage();
-											switch (status) {
-											case READY:
-												// This will deadlock if
-												// currentSearchThread is not
-												// null
-												currentSearchThread = null;
-												if (currentResultHandler != null) {
-													currentResultHandler.cancled = true;
-												}
-												refreshSearch();
-												break;
-											case CANCELLED:
-											case INITIALIZING:
-												break;
-											}
-										}
-									});
-								} catch (final Exception e2) {
-									// Dialog may have been closed while
-									// provider was still indexing
-								}
-							}
-						});
-						collector.findContributions(filter, currentResultHandler);
+			currentSearchThread = new Job(Messages.FilteredContributionDialog_ContributionSearch) {
 
-						monitor.done();
-						searching = false;
-						currentSearchThread = null;
-						getShell().getDisplay().syncExec(new Runnable() {
+				Filter filter;
 
-							@Override
-							public void run() {
+				@Override
+				protected IStatus run(IProgressMonitor monitor) {
+					monitor.beginTask(Messages.FilteredContributionDialog_ContributionSearch, IProgressMonitor.UNKNOWN);
+					currentResultHandler = new ContributionResultHandlerImpl(viewerList);
+					getShell().getDisplay().syncExec(() -> {
+						if (searchScopes.contains(ResourceSearchScope.PROJECT)) {
+							filter = new Filter(context.get(IProject.class), textBox.getText());
+						} else {
+							// filter = new Filter(null,
+							// textBox.getText());
+							filter = new Filter(context.get(IProject.class), textBox.getText());
+						}
+					});
+					filter.maxResults = MAX_RESULTS;
+					filter.userData = FilteredContributionDialog.this;
+					filter.setBundles(filterBundles);
+					filter.setPackages(filterPackages);
+					filter.setLocations(filterLocations);
+					filter.setSearchScope(searchScopes);
+					filter.setIncludeNonBundles(includeNonBundles);
+					filter.setProgressMonitor(monitor);
+					filter.setProviderStatusCallback(status -> {
+						providerStatus = status;
+						try {
+							getShell().getDisplay().syncExec(() -> {
 								updateStatusMessage();
-							}
-						});
-						return Status.OK_STATUS;
-					}
+								switch (status) {
+								case READY:
+									// This will deadlock if
+									// currentSearchThread is not
+									// null
+									currentSearchThread = null;
+									if (currentResultHandler != null) {
+										currentResultHandler.cancled = true;
+									}
+									refreshSearch();
+									break;
+								case CANCELLED:
+								case INITIALIZING:
+									break;
+								}
+							});
+						} catch (final Exception e2) {
+							// Dialog may have been closed while
+							// provider was still indexing
+						}
+					});
+					collector.findContributions(filter, currentResultHandler);
 
-				};
-				currentSearchThread.schedule();
+					monitor.done();
+					searching = false;
+					currentSearchThread = null;
+					getShell().getDisplay().syncExec(() -> updateStatusMessage());
+					return Status.OK_STATUS;
+				}
+
+			};
+			currentSearchThread.schedule();
 
-			}
 		});
 
 		return comp;
@@ -887,13 +837,7 @@ public void update(ViewerCell cell) {
 				cell.setStyleRanges(styledString.getStyleRanges());
 			}
 		});
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				okPressed();
-			}
-		});
+		viewer.addDoubleClickListener(event -> okPressed());
 
 		viewer.setInput(viewerList);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index 415c26a87d..3c84fbbd21 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -22,16 +22,12 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -70,13 +66,7 @@ protected Control createDialogArea(Composite parent) {
 		final Image titleImage = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream(
 				"/icons/full/wizban/import_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
-		getShell().addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				titleImage.dispose();
-			}
-		});
+		getShell().addDisposeListener(e -> titleImage.dispose());
 
 		getShell().setText(Messages.FindImportElementDialog_ShellTitle);
 		setTitle(Messages.FindImportElementDialog_Title);
@@ -120,13 +110,7 @@ public void update(ViewerCell cell) {
 			}
 		});
 		viewer.setContentProvider(new ObservableListContentProvider());
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				okPressed();
-			}
-		});
+		viewer.addDoubleClickListener(event -> okPressed());
 
 		final WritableList list = new WritableList();
 		viewer.setInput(list);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index b397b3c467..4920e5c106 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and 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,12 +38,8 @@
 import org.eclipse.jface.fieldassist.ComboContentAdapter;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
@@ -52,10 +48,6 @@
 import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -120,13 +112,7 @@ protected Control createDialogArea(Composite parent) {
 		final Image titleImage = new Image(parent.getDisplay(),
 				getClass().getClassLoader().getResourceAsStream("/icons/full/wizban/import_wiz.png")); //$NON-NLS-1$
 		setTitleImage(titleImage);
-		getShell().addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				titleImage.dispose();
-			}
-		});
+		getShell().addDisposeListener(e -> titleImage.dispose());
 
 		getShell().setText(Messages.FindParentReferenceElementDialog_ShellTitle);
 		setTitle(Messages.FindParentReferenceElementDialog_Title);
@@ -164,13 +150,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 		});
 		eClassViewer.setInput(eClassList);
 		eClassViewer.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		eClassViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				updateSearch();
-			}
-		});
+		eClassViewer.addSelectionChangedListener(event -> updateSearch());
 
 		final ArrayList<String> vals = new ArrayList<>();
 		for (final EClass item : eClassList) {
@@ -232,24 +212,12 @@ public void update(ViewerCell cell) {
 			}
 		});
 		viewer.setContentProvider(new ObservableListContentProvider());
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				okPressed();
-			}
-		});
+		viewer.addDoubleClickListener(event -> okPressed());
 
 		list = new WritableList();
 		viewer.setInput(list);
 
-		searchText.addModifyListener(new ModifyListener() {
-
-			@Override
-			public void modifyText(ModifyEvent e) {
-				updateSearch();
-			}
-		});
+		searchText.addModifyListener(e -> updateSearch());
 
 		final Button button = new Button(container, SWT.PUSH);
 		button.setText(Messages.FindParentReferenceElementDialog_ClearCache);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index 6d63c09476..662f976aa5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2014 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -40,8 +40,6 @@
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
@@ -100,13 +98,7 @@ protected Control createDialogArea(Composite parent) {
 		viewer.setLabelProvider(new LabelProviderImpl());
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				okPressed();
-			}
-		});
+		viewer.addDoubleClickListener(event -> okPressed());
 
 		if (resource.getRoot().get(0) instanceof MApplication) {
 			final List<MUIElement> list = new ArrayList<>();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index a146115af4..463e58e6b7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -80,8 +80,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -94,8 +92,6 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
@@ -253,7 +249,7 @@ private void loadSettings() {
 		if (E.notEmpty(xml)) {
 			try {
 				final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder()
-					.parse(new InputSource(new StringReader(xml)));
+						.parse(new InputSource(new StringReader(xml)));
 				final XPath xpath = XPathFactory.newInstance().newXPath();
 				NodeList list;
 				if (restoreColumns) {
@@ -350,13 +346,7 @@ static String join(Collection<String> items, String separator) {
 	@PostConstruct
 	public void postConstruct(final CTabFolder tabFolder) {
 		imageCache = new BundleImageCache(context.get(Display.class), getClass().getClassLoader());
-		tabFolder.addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				imageCache.dispose();
-			}
-		});
+		tabFolder.addDisposeListener(e -> imageCache.dispose());
 		try {
 			imgMarkedItem = imageCache.create(Plugin.ID, "/icons/full/obj16/mark_occurrences.png"); //$NON-NLS-1$
 		} catch (final Exception e2) {
@@ -590,40 +580,36 @@ public String getText(Object element) {
 		app.getContext().set("org.eclipse.e4.tools.active-object-viewer", this); //$NON-NLS-1$
 
 		final EAttributeTableViewerColumn colId = new EAttributeTableViewerColumn(tvResults,
-			"elementId", "elementId", context); //$NON-NLS-1$//$NON-NLS-2$
+				"elementId", "elementId", context); //$NON-NLS-1$//$NON-NLS-2$
 		defaultColumns.put("elementId", colId); //$NON-NLS-1$
 
 		final EAttributeTableViewerColumn colLabel = new EAttributeTableViewerColumn_Markable(tvResults,
-			"label", "label", context); //$NON-NLS-1$//$NON-NLS-2$
+				"label", "label", context); //$NON-NLS-1$//$NON-NLS-2$
 		defaultColumns.put("label", colLabel); //$NON-NLS-1$
 
 		// Custom selection for marked items
-		tvResults.getTable().addListener(SWT.EraseItem, new Listener() {
-			@Override
-			public void handleEvent(Event event) {
-				event.detail &= ~SWT.HOT;
-				if ((event.detail & SWT.SELECTED) == 0)
-				{
-					return; // / item not selected
-				}
+		tvResults.getTable().addListener(SWT.EraseItem, event -> {
+			event.detail &= ~SWT.HOT;
+			if ((event.detail & SWT.SELECTED) == 0) {
+				return; // / item not selected
+			}
 
-				final TableItem item = (TableItem) event.item;
-				if (isHighlighted(item.getData())) {
+			final TableItem item = (TableItem) event.item;
+			if (isHighlighted(item.getData())) {
 
-					final Table table = (Table) event.widget;
-					final int clientWidth = table.getClientArea().width;
-					final GC gc = event.gc;
-					// Color oldForeground = gc.getForeground();
-					// Color oldBackground = gc.getBackground();
+				final Table table = (Table) event.widget;
+				final int clientWidth = table.getClientArea().width;
+				final GC gc = event.gc;
+				// Color oldForeground = gc.getForeground();
+				// Color oldBackground = gc.getBackground();
 
-					// gc.setBackground(item.getDisplay().getSystemColor(SWT.COLOR_YELLOW));
-					gc.setForeground(item.getDisplay().getSystemColor(SWT.COLOR_RED));
-					gc.fillRectangle(0, event.y, clientWidth, event.height);
+				// gc.setBackground(item.getDisplay().getSystemColor(SWT.COLOR_YELLOW));
+				gc.setForeground(item.getDisplay().getSystemColor(SWT.COLOR_RED));
+				gc.fillRectangle(0, event.y, clientWidth, event.height);
 
-					// gc.setForeground(oldForeground);
-					// gc.setBackground(oldBackground);
-					event.detail &= ~SWT.SELECTED;
-				}
+				// gc.setForeground(oldForeground);
+				// gc.setBackground(oldBackground);
+				event.detail &= ~SWT.SELECTED;
 			}
 		});
 
@@ -637,9 +623,9 @@ public void handleEvent(Event event) {
 		}
 
 		makeSortable(colId.getTableViewerColumn().getColumn(), new AttributeColumnLabelSorter(colId
-			.getTableViewerColumn().getColumn(), "elementId")); //$NON-NLS-1$
+				.getTableViewerColumn().getColumn(), "elementId")); //$NON-NLS-1$
 		makeSortable(colLabel.getTableViewerColumn().getColumn(), new AttributeColumnLabelSorter(colLabel
-			.getTableViewerColumn().getColumn(), "label")); //$NON-NLS-1$
+				.getTableViewerColumn().getColumn(), "label")); //$NON-NLS-1$
 		makeSortable(colItem.getColumn(), new TableViewerUtil.ColumnLabelSorter(colItem.getColumn()));
 		makeSortable(colMarked.getColumn(), new TableViewerUtil.AbstractInvertableTableSorter() {
 
@@ -746,7 +732,7 @@ public String getText(Object element) {
 			}
 		};
 		final TitleAreaFilterDialogWithEmptyOptions dlg = new TitleAreaFilterDialogWithEmptyOptions(
-			context.get(Shell.class), renderer) {
+				context.get(Shell.class), renderer) {
 			@Override
 			protected Control createContents(Composite parent) {
 				final Control ret = super.createContents(parent);
@@ -810,7 +796,7 @@ private EAttributeTableViewerColumn addColumn(String attName) {
 				optionalColumns.put(attName, colName);
 				colName.getTableViewerColumn().getColumn().setMoveable(true);
 				makeSortable(colName.getTableViewerColumn().getColumn(), new AttributeColumnLabelSorter(colName
-					.getTableViewerColumn().getColumn(), attName));
+						.getTableViewerColumn().getColumn(), attName));
 				tvResults.refresh();
 			}
 		}
@@ -848,7 +834,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 
 	private class EAttributeTableViewerColumn_Markable extends EAttributeTableViewerColumn {
 		public EAttributeTableViewerColumn_Markable(TableViewer tvResults, String label, String attName,
-			IEclipseContext context) {
+				IEclipseContext context) {
 			super(tvResults, label, attName, context);
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
index 6c6dad2488..2b11f386f8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others.
  * Copyright (c) 2010-2014 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -113,21 +113,18 @@ public void keyPressed(KeyEvent e) {
 		sourceViewer.setDocument(document);
 		verticalRuler.setModel(model);
 
-		emfDocumentProvider.setValidationChangedCallback(new Runnable() {
-			@Override
-			public void run() {
-				model.removeAllAnnotations();
-
-				for (final Diagnostic d : emfDocumentProvider.getErrorList()) {
-					final Annotation a = new Annotation("e4xmi.error", false, d.getMessage()); //$NON-NLS-1$
-					int l;
-					try {
-						l = document.getLineOffset(d.getLine() - 1);
-						model.addAnnotation(a, new Position(l));
-					} catch (final BadLocationException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+		emfDocumentProvider.setValidationChangedCallback(() -> {
+			model.removeAllAnnotations();
+
+			for (final Diagnostic d : emfDocumentProvider.getErrorList()) {
+				final Annotation a = new Annotation("e4xmi.error", false, d.getMessage()); //$NON-NLS-1$
+				int l;
+				try {
+					l = document.getLineOffset(d.getLine() - 1);
+					model.addAnnotation(a, new Position(l));
+				} catch (final BadLocationException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
 			}
 		});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
index 4be363353a..7703c7faee 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,16 +14,12 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.Messages;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 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;
@@ -80,22 +76,12 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 			}
 		} });
 
-		text.addModifyListener(new ModifyListener() {
+		text.addModifyListener(e -> viewer.refresh());
 
-			@Override
-			public void modifyText(ModifyEvent e) {
-				viewer.refresh();
-			}
-		});
-
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				result = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
-				if (result != null) {
-					okPressed();
-				}
+		viewer.addDoubleClickListener(event -> {
+			result = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+			if (result != null) {
+				okPressed();
 			}
 		});
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
index e7dda07143..8d042193f9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others. All rights reserved. This
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others. All rights reserved. This
  * program and the accompanying materials are made available under the terms of
  * the Eclipse Public License v1.0 which accompanies this distribution, and is
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,6 +11,7 @@
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
@@ -22,7 +23,6 @@
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -93,39 +93,31 @@ protected Control createDialogArea(final Composite parent) {
 			txtUri.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			txtUri.setText("bundleclass://"); //$NON-NLS-1$
 
-			txtUri.addModifyListener(new ModifyListener() {
-
-				@Override
-				public void modifyText(ModifyEvent e) {
-					if (ignoreModify) {
-						return;
-					}
-					ignoreModify = true;
-					setUri(txtUri.getText());
-					txtBundle.setText(bundle);
-					txtPackage.setText(pakage);
-					txtClass.setText(clazz);
-					ignoreModify = false;
-					parent.pack();
-				}
-			});
-		}
-
-		// common listener for text boxes
-		ModifyListener listener = new ModifyListener() {
-
-			@Override
-			public void modifyText(ModifyEvent e) {
+			txtUri.addModifyListener(e -> {
 				if (ignoreModify) {
 					return;
 				}
 				ignoreModify = true;
-				String prefix;
-				prefix = "bundleclass://"; //$NON-NLS-1$
-				setUri(prefix + txtBundle.getText() + "/" + txtPackage.getText() + "." + txtClass.getText()); //$NON-NLS-1$//$NON-NLS-2$
-				txtUri.setText(getUri());
+				setUri(txtUri.getText());
+				txtBundle.setText(bundle);
+				txtPackage.setText(pakage);
+				txtClass.setText(clazz);
 				ignoreModify = false;
+				parent.pack();
+			});
+		}
+
+		// common listener for text boxes
+		ModifyListener listener = e -> {
+			if (ignoreModify) {
+				return;
 			}
+			ignoreModify = true;
+			String prefix;
+			prefix = "bundleclass://"; //$NON-NLS-1$
+			setUri(prefix + txtBundle.getText() + "/" + txtPackage.getText() + "." + txtClass.getText()); //$NON-NLS-1$//$NON-NLS-2$
+			txtUri.setText(getUri());
+			ignoreModify = false;
 		};
 
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
index 06b7ad8553..38a42ae693 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,6 +13,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
 
 import java.util.Iterator;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.resources.IProject;
@@ -25,8 +26,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
@@ -35,8 +34,6 @@
 import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.ModifyEvent;
@@ -109,14 +106,10 @@ protected Control createDialogArea(Composite parent) {
 			setTitleImage(titleImage);
 		}
 
-		getShell().addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				javaClassImage.dispose();
-				if (titleImage != null) {
-					titleImage.dispose();
-				}
+		getShell().addDisposeListener(e -> {
+			javaClassImage.dispose();
+			if (titleImage != null) {
+				titleImage.dispose();
 			}
 		});
 
@@ -193,13 +186,7 @@ public void update(ViewerCell cell) {
 				cell.setStyleRanges(styledString.getStyleRanges());
 			}
 		});
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				okPressed();
-			}
-		});
+		viewer.addDoubleClickListener(event -> okPressed());
 
 		final WritableList list = new WritableList();
 		viewer.setInput(list);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
index 312364bc3d..bdfdd4456d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others. All rights reserved. This
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others. All rights reserved. This
  * program and the accompanying materials are made available under the terms of
  * the Eclipse Public License v1.0 which accompanies this distribution, and is
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,13 +11,13 @@
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AbstractIconDialogWithHardcodedScope;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AbstractIconDialogWithScopeAndFilter;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -89,41 +89,33 @@ protected Control createDialogArea(final Composite parent) {
 			txtUri.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			txtUri.setText("platform://plugin/"); //$NON-NLS-1$
 
-			txtUri.addModifyListener(new ModifyListener() {
-
-				@Override
-				public void modifyText(ModifyEvent e) {
-					if (ignoreModify) {
-						return;
-					}
-					ignoreModify = true;
-					setUri(txtUri.getText());
-					txtBundle.setText(bundle);
-					txtPath.setText(path);
-					txtIcon.setText(icon);
-					ignoreModify = false;
-					parent.pack();
+			txtUri.addModifyListener(e -> {
+				if (ignoreModify) {
+					return;
 				}
+				ignoreModify = true;
+				setUri(txtUri.getText());
+				txtBundle.setText(bundle);
+				txtPath.setText(path);
+				txtIcon.setText(icon);
+				ignoreModify = false;
+				parent.pack();
 			});
 		}
 
 		// common listener for text boxes
-		ModifyListener listener = new ModifyListener() {
-
-			@Override
-			public void modifyText(ModifyEvent e) {
-				if (ignoreModify) {
-					return;
-				}
-				ignoreModify = true;
-				String prefix;
+		ModifyListener listener = e -> {
+			if (ignoreModify) {
+				return;
+			}
+			ignoreModify = true;
+			String prefix;
 
-				prefix = "platform:/plugin/"; //$NON-NLS-1$
-				setUri(prefix + txtBundle.getText() + "/" + txtPath.getText() + "/" + txtIcon.getText()); //$NON-NLS-1$//$NON-NLS-2$
+			prefix = "platform:/plugin/"; //$NON-NLS-1$
+			setUri(prefix + txtBundle.getText() + "/" + txtPath.getText() + "/" + txtIcon.getText()); //$NON-NLS-1$//$NON-NLS-2$
 
-				txtUri.setText(getUri());
-				ignoreModify = false;
-			}
+			txtUri.setText(getUri());
+			ignoreModify = false;
 		};
 
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
index 7afbb72b28..ced85b41b4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -219,13 +219,7 @@ public void createControl(Composite compParent) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (btnRequire.getSelection()) {
-						final Runnable okAction = new Runnable() {
-
-							@Override
-							public void run() {
-								doRequireBundle(bundle, installLocation);
-							}
-						};
+						final Runnable okAction = () -> doRequireBundle(bundle, installLocation);
 						setAction(NonReferencedAction.REQUIRE, okAction);
 					}
 				}
@@ -243,33 +237,30 @@ public void run() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (btnImport.getSelection()) {
-						final Runnable okAction = new Runnable() {
-							@Override
-							public void run() {
-								final IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
-								Manifest manifest;
-								try {
-									manifest = new Manifest(fileManifest.getContents());
-									String value = manifest.getMainAttributes().getValue("Import-Package"); //$NON-NLS-1$
-
-									final String packageName = getPackageFromClassName(className);
-									// TODO ensure the packageName is not
-									// already in the manifest (although it
-									// should not be if we are here)
-									if (value == null) {
-										value = packageName;
-									} else {
-										value += "," + packageName; //$NON-NLS-1$
-									}
-									manifest.getMainAttributes().putValue("Import-Package", value); //$NON-NLS-1$
-									final ByteArrayOutputStream bos = new ByteArrayOutputStream();
-									manifest.write(bos);
-									final ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
-									fileManifest.setContents(bis, true, true, null);
-									context.set("resolvedFile", file); //$NON-NLS-1$
-								} catch (final Exception e) {
-									e.printStackTrace();
+						final Runnable okAction = () -> {
+							final IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
+							Manifest manifest;
+							try {
+								manifest = new Manifest(fileManifest.getContents());
+								String value = manifest.getMainAttributes().getValue("Import-Package"); //$NON-NLS-1$
+
+								final String packageName = getPackageFromClassName(className);
+								// TODO ensure the packageName is not
+								// already in the manifest (although it
+								// should not be if we are here)
+								if (value == null) {
+									value = packageName;
+								} else {
+									value += "," + packageName; //$NON-NLS-1$
 								}
+								manifest.getMainAttributes().putValue("Import-Package", value); //$NON-NLS-1$
+								final ByteArrayOutputStream bos = new ByteArrayOutputStream();
+								manifest.write(bos);
+								final ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+								fileManifest.setContents(bis, true, true, null);
+								context.set("resolvedFile", file); //$NON-NLS-1$
+							} catch (final Exception e1) {
+								e1.printStackTrace();
 							}
 						};
 						setAction(NonReferencedAction.IMPORT, okAction);
@@ -287,12 +278,7 @@ public void run() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (btnUseAnyway.getSelection()) {
-						setAction(NonReferencedAction.USE_ANYWAY, new Runnable() {
-							@Override
-							public void run() {
-								context.set("resolvedFile", file); //$NON-NLS-1$
-							}
-						});
+						setAction(NonReferencedAction.USE_ANYWAY, () -> context.set("resolvedFile", file));
 					}
 				}
 			});
@@ -309,31 +295,26 @@ public void run() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
 						if (btnConvertToBundle.getSelection()) {
-							final Runnable okAction = new Runnable() {
-
-								@Override
-								public void run() {
-									String bundleId;
-									try {
-										final ContributionData contributionData = cdf.getContributionData();
-										bundleId = BundleConverter.convertProjectToBundle(
-												contributionData.installLocation, project.getWorkspace());
-										if (bundleId != null) {
-
-											final ContributionData cdConverted = new ContributionData(bundleId,
-													contributionData.className, contributionData.sourceType,
-													contributionData.iconPath);
-											cdConverted.installLocation = installLocation;
-											cdConverted.resourceRelativePath = Path
-													.fromOSString(contributionData.iconPath).removeFirstSegments(1)
-													.toOSString();
-											doRequireBundle(bundleId, installLocation);
-											context.set("resolvedFile", new ContributionDataFile(cdConverted)); //$NON-NLS-1$
-										}
-									} catch (final Exception e1) {
-										MessageDialog.openError(getShell(), Messages.NonReferencedResourceDialog_error,
-												e1.getMessage());
+							final Runnable okAction = () -> {
+								String bundleId;
+								try {
+									final ContributionData contributionData = cdf.getContributionData();
+									bundleId = BundleConverter.convertProjectToBundle(contributionData.installLocation,
+											project.getWorkspace());
+									if (bundleId != null) {
+
+										final ContributionData cdConverted = new ContributionData(bundleId,
+												contributionData.className, contributionData.sourceType,
+												contributionData.iconPath);
+										cdConverted.installLocation = installLocation;
+										cdConverted.resourceRelativePath = Path.fromOSString(contributionData.iconPath)
+												.removeFirstSegments(1).toOSString();
+										doRequireBundle(bundleId, installLocation);
+										context.set("resolvedFile", new ContributionDataFile(cdConverted)); //$NON-NLS-1$
 									}
+								} catch (final Exception e1) {
+									MessageDialog.openError(getShell(), Messages.NonReferencedResourceDialog_error,
+											e1.getMessage());
 								}
 							};
 							setAction(NonReferencedAction.CONVERT_AND_REQUIRE, okAction);
@@ -353,13 +334,7 @@ public void run() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (btnCopy.getSelection()) {
-						final Runnable okAction = new Runnable() {
-
-							@Override
-							public void run() {
-								copyResourceToProject();
-							}
-						};
+						final Runnable okAction = () -> copyResourceToProject();
 						context.set("projectToCopyTo", project); //$NON-NLS-1$
 						setAction(NonReferencedAction.COPY, okAction);
 					}
@@ -377,13 +352,7 @@ public void run() {
 				public void widgetSelected(SelectionEvent e) {
 					if (btnCopy2.getSelection()) {
 
-						final Runnable okAction = new Runnable() {
-
-							@Override
-							public void run() {
-								copyResourceToProject();
-							}
-						};
+						final Runnable okAction = () -> copyResourceToProject();
 						setAction(NonReferencedAction.COPY_TO_OTHER, okAction);
 					}
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
index aee3f7a50c..2d633ef512 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -39,8 +39,6 @@
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.pde.internal.core.util.CoreUtility;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -217,13 +215,7 @@ protected Control createDialogArea(Composite parent) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (btnRequire.getSelection()) {
-						okAction = new Runnable() {
-
-							@Override
-							public void run() {
-								doRequireBundle(bundle, installLocation);
-							}
-						};
+						okAction = () -> doRequireBundle(bundle, installLocation);
 					}
 				}
 			});
@@ -240,33 +232,30 @@ public void run() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (btnImport.getSelection()) {
-						okAction = new Runnable() {
-							@Override
-							public void run() {
-								final IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
-								Manifest manifest;
-								try {
-									manifest = new Manifest(fileManifest.getContents());
-									String value = manifest.getMainAttributes().getValue("Import-Package"); //$NON-NLS-1$
-
-									final String packageName = getPackageFromClassName(className);
-									// TODO ensure the packageName is not
-									// already in the manifest (although it
-									// should not be if we are here)
-									if (value == null) {
-										value = packageName;
-									} else {
-										value += "," + packageName; //$NON-NLS-1$
-									}
-									manifest.getMainAttributes().putValue("Import-Package", value); //$NON-NLS-1$
-									final ByteArrayOutputStream bos = new ByteArrayOutputStream();
-									manifest.write(bos);
-									final ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
-									fileManifest.setContents(bis, true, true, null);
-									result = file;
-								} catch (final Exception e) {
-									e.printStackTrace();
+						okAction = () -> {
+							final IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
+							Manifest manifest;
+							try {
+								manifest = new Manifest(fileManifest.getContents());
+								String value = manifest.getMainAttributes().getValue("Import-Package"); //$NON-NLS-1$
+
+								final String packageName = getPackageFromClassName(className);
+								// TODO ensure the packageName is not
+								// already in the manifest (although it
+								// should not be if we are here)
+								if (value == null) {
+									value = packageName;
+								} else {
+									value += "," + packageName; //$NON-NLS-1$
 								}
+								manifest.getMainAttributes().putValue("Import-Package", value); //$NON-NLS-1$
+								final ByteArrayOutputStream bos = new ByteArrayOutputStream();
+								manifest.write(bos);
+								final ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+								fileManifest.setContents(bis, true, true, null);
+								result = file;
+							} catch (final Exception e1) {
+								e1.printStackTrace();
 							}
 						};
 					}
@@ -300,31 +289,26 @@ public void widgetSelected(SelectionEvent e) {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
 						if (btnConvertToBundle.getSelection()) {
-							okAction = new Runnable() {
-
-								@Override
-								public void run() {
-									String bundleId;
-									try {
-										final ContributionData contributionData = cdf.getContributionData();
-										bundleId = BundleConverter.convertProjectToBundle(
-												contributionData.installLocation, project.getWorkspace());
-										if (bundleId != null) {
-
-											final ContributionData cdConverted = new ContributionData(bundleId,
-													contributionData.className, contributionData.sourceType,
-													contributionData.iconPath);
-											cdConverted.installLocation = installLocation;
-											cdConverted.resourceRelativePath = Path
-													.fromOSString(contributionData.iconPath).removeFirstSegments(1)
-													.toOSString();
-											doRequireBundle(bundleId, installLocation);
-											result = new ContributionDataFile(cdConverted);
-										}
-									} catch (final Exception e1) {
-										MessageDialog.openError(getShell(), Messages.NonReferencedResourceDialog_error,
-												e1.getMessage());
+							okAction = () -> {
+								String bundleId;
+								try {
+									final ContributionData contributionData = cdf.getContributionData();
+									bundleId = BundleConverter.convertProjectToBundle(contributionData.installLocation,
+											project.getWorkspace());
+									if (bundleId != null) {
+
+										final ContributionData cdConverted = new ContributionData(bundleId,
+												contributionData.className, contributionData.sourceType,
+												contributionData.iconPath);
+										cdConverted.installLocation = installLocation;
+										cdConverted.resourceRelativePath = Path.fromOSString(contributionData.iconPath)
+												.removeFirstSegments(1).toOSString();
+										doRequireBundle(bundleId, installLocation);
+										result = new ContributionDataFile(cdConverted);
 									}
+								} catch (final Exception e1) {
+									MessageDialog.openError(getShell(), Messages.NonReferencedResourceDialog_error,
+											e1.getMessage());
 								}
 							};
 						}
@@ -343,13 +327,7 @@ public void run() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (btnCopy.getSelection()) {
-						okAction = new Runnable() {
-
-							@Override
-							public void run() {
-								copyResourceToProject(project);
-							}
-						};
+						okAction = () -> copyResourceToProject(project);
 					}
 				}
 			});
@@ -364,24 +342,20 @@ public void run() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (btnCopy2.getSelection()) {
-						okAction = new Runnable() {
-
-							@Override
-							public void run() {
-								final ReferencedProjectPickerDialog dlg = new ReferencedProjectPickerDialog(getShell(),
-										project) {
-									@Override
-									protected Control createContents(Composite parent) {
-										final Control ret = super.createContents(parent);
-										setMessage(Messages.NonReferencedResourceDialog_selectProjectToReceiveCopy);
-										setTitleImage(imageCache.create("/icons/full/wizban/plugin_wiz.gif")); //$NON-NLS-1$
-
-										return ret;
-									}
-								};
-								if (dlg.open() == IDialogConstants.OK_ID) {
-									copyResourceToProject((IProject) dlg.getFirstElement());
+						okAction = () -> {
+							final ReferencedProjectPickerDialog dlg = new ReferencedProjectPickerDialog(getShell(),
+									project) {
+								@Override
+								protected Control createContents(Composite parent) {
+									final Control ret = super.createContents(parent);
+									setMessage(Messages.NonReferencedResourceDialog_selectProjectToReceiveCopy);
+									setTitleImage(imageCache.create("/icons/full/wizban/plugin_wiz.gif")); //$NON-NLS-1$
+
+									return ret;
 								}
+							};
+							if (dlg.open() == IDialogConstants.OK_ID) {
+								copyResourceToProject((IProject) dlg.getFirstElement());
 							}
 						};
 					}
@@ -408,13 +382,7 @@ static public String getPackageFromClassName(String className) {
 	@Override
 	protected Control createContents(Composite parent) {
 		imageCache = new BundleImageCache(parent.getDisplay(), getClass().getClassLoader(), context);
-		getShell().addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				imageCache.dispose();
-			}
-		});
+		getShell().addDisposeListener(e -> imageCache.dispose());
 
 		final Control ret = super.createContents(parent);
 		setMessage(Messages.NonReferencedResourceDialog_resourceNotReferenced);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
index 5868da52ab..49db282f14 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,8 +16,6 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
 import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.widgets.Shell;
 
 /**
@@ -35,7 +33,7 @@ public class NonReferencedResourceWizard extends DynamicWizard {
 	BundleImageCache imageCache;
 
 	public NonReferencedResourceWizard(Shell parentShell, IProject project, String bundle, IFile file,
-		String installLocation, IEclipseContext context) {
+			String installLocation, IEclipseContext context) {
 		this.project = project;
 
 		wizContext = context.createChild();
@@ -45,13 +43,7 @@ public NonReferencedResourceWizard(Shell parentShell, IProject project, String b
 		wizContext.set("resolvedFile", null); //$NON-NLS-1$
 
 		imageCache = new BundleImageCache(parentShell.getDisplay(), getClass().getClassLoader(), context);
-		parentShell.addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				imageCache.dispose();
-			}
-		});
+		parentShell.addDisposeListener(e -> imageCache.dispose());
 		wizContext.set(BundleImageCache.class, imageCache);
 
 		nonReferencedActionPage = new NonReferencedActionPage(project, bundle, file, installLocation, wizContext);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
index d374dc8575..6d06f49794 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -21,11 +21,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.ProjectFolderPickerDialog.ProjectContentProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs.ProjectFolderPickerDialog.ProjectLabelProvider;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-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;
@@ -76,21 +72,9 @@ public void createControl(Composite parent) {
 		viewer.setLabelProvider(new ProjectLabelProvider());
 		viewer.expandToLevel(2);
 
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
+		viewer.addDoubleClickListener(event -> onChanged());
 
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				onChanged();
-			}
-		});
-
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				onChanged();
-			}
-		});
+		viewer.addSelectionChangedListener(event -> onChanged());
 
 		Composite compPath = new Composite(ret, SWT.NONE);
 		compPath.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
index 572054aa7d..a5125f924a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -19,14 +19,10 @@
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -62,13 +58,9 @@ protected PickProjectPage(IEclipseContext context) {
 	public void createControl(Composite parent) {
 
 		imageCache = new BundleImageCache(parent.getDisplay(), getClass().getClassLoader());
-		getShell().addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				imageCache.dispose();
-				imgProject = null;
-			}
+		getShell().addDisposeListener(e -> {
+			imageCache.dispose();
+			imgProject = null;
 		});
 		imgProject = imageCache.create("/icons/full/obj16/projects.png"); //$NON-NLS-1$
 
@@ -94,15 +86,11 @@ public Image getImage(Object element) {
 
 		viewer.setInput(projects);
 
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				final Object firstElement = ((StructuredSelection) event.getSelection()).getFirstElement();
-				context.set("projectToCopyTo", firstElement); //$NON-NLS-1$
-				setPageComplete(firstElement != null);
-				getContainer().updateButtons();
-			}
+		viewer.addSelectionChangedListener(event -> {
+			final Object firstElement = ((StructuredSelection) event.getSelection()).getFirstElement();
+			context.set("projectToCopyTo", firstElement); //$NON-NLS-1$
+			setPageComplete(firstElement != null);
+			getContainer().updateButtons();
 		});
 
 		final String message = Messages.ReferencedProjectPickerDialog_selectReferencedProject;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
index e8f12254ca..96d553a4ce 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,9 +12,9 @@
 
 import java.net.URL;
 import java.util.ArrayList;
+
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
 import org.eclipse.core.resources.IResourceProxyVisitor;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
@@ -23,8 +23,6 @@
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -83,17 +81,13 @@ public Object[] getChildren(final Object parentElement) {
 			}
 			final IResource resource = (IResource) parentElement;
 			final ArrayList<Object> list = new ArrayList<>();
-			IResourceProxyVisitor visitor = new IResourceProxyVisitor() {
-
-				@Override
-				public boolean visit(IResourceProxy proxy) throws CoreException {
-					if (proxy.getType() == IResource.FOLDER && proxy.requestResource().getParent() == resource) {
-						if (proxy.requestResource().equals(resource) == false) {
-							list.add(proxy.requestResource());
-						}
+			IResourceProxyVisitor visitor = proxy -> {
+				if (proxy.getType() == IResource.FOLDER && proxy.requestResource().getParent() == resource) {
+					if (proxy.requestResource().equals(resource) == false) {
+						list.add(proxy.requestResource());
 					}
-					return true;
 				}
+				return true;
 			};
 			try {
 				resource.accept(visitor, IResource.DEPTH_ONE);
@@ -119,16 +113,12 @@ public boolean hasChildren(Object element) {
 			final IResource resource = (IResource) element;
 			try {
 				found = false;
-				resource.accept(new IResourceProxyVisitor() {
-
-					@Override
-					public boolean visit(IResourceProxy proxy) throws CoreException {
-						if (proxy.getType() == IResource.FOLDER && proxy.requestResource().equals(resource) == false) {
-							found = true;
-							return false;
-						}
-						return true;
+				resource.accept(proxy -> {
+					if (proxy.getType() == IResource.FOLDER && proxy.requestResource().equals(resource) == false) {
+						found = true;
+						return false;
 					}
+					return true;
 				}, IResource.DEPTH_ONE);
 			} catch (CoreException e) {
 				e.printStackTrace();
@@ -209,13 +199,7 @@ protected Control createDialogArea(Composite parent) {
 		viewer.setInput(project);
 		viewer.expandToLevel(2);
 
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				okPressed();
-			}
-		});
+		viewer.addDoubleClickListener(event -> okPressed());
 
 		if (srcPath != null) {
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
index cb301c2bea..403797b228 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2017 TwelveTone LLC and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,8 +16,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.TitleAreaFilterDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -48,13 +46,9 @@ public Image getImage(Object element) {
 	@Override
 	protected Control createContents(Composite parent) {
 		imageCache = new BundleImageCache(parent.getDisplay(), getClass().getClassLoader());
-		getShell().addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				imageCache.dispose();
-				imgProject = null;
-			}
+		getShell().addDisposeListener(e -> {
+			imageCache.dispose();
+			imgProject = null;
 		});
 		imgProject = imageCache.create("/icons/full/obj16/projects.png"); //$NON-NLS-1$
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
index d481198489..9e270c1ab8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013 Remain BV, Industrial-TSI BV and others.
+ * Copyright (c) 2013, 2017 Remain BV, Industrial-TSI BV and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -13,20 +13,17 @@
 package org.eclipse.e4.tools.emf.ui.internal.imp;
 
 import java.util.ArrayList;
+
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.jface.layout.TableColumnLayout;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.wizard.IWizard;
@@ -143,27 +140,20 @@ public void createControl(Composite parent) {
 
 		comboViewer.setInput(Messages.ModelImportPage1_Go);
 
-		comboViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				String bundle = ((IStructuredSelection) event.getSelection()).getFirstElement().toString();
-				RegistryStruct struct = RegistryUtil.getStruct(wizard.getApplicationElement(), wizard.getHint());
-				struct.setBundle(bundle);
-				checkboxTableViewer.setInput(struct);
+		comboViewer.addSelectionChangedListener(event -> {
+			String bundle = ((IStructuredSelection) event.getSelection()).getFirstElement().toString();
+			RegistryStruct struct = RegistryUtil.getStruct(wizard.getApplicationElement(), wizard.getHint());
+			struct.setBundle(bundle);
+			checkboxTableViewer.setInput(struct);
 
-			}
 		});
 
-		checkboxTableViewer.addCheckStateListener(new ICheckStateListener() {
-			@Override
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				checkedElements = checkboxTableViewer.getCheckedElements();
-				if (checkedElements.length > 0) {
-					setPageComplete(true);
-				} else {
-					setPageComplete(false);
-				}
+		checkboxTableViewer.addCheckStateListener(event -> {
+			checkedElements = checkboxTableViewer.getCheckedElements();
+			if (checkedElements.length > 0) {
+				setPageComplete(true);
+			} else {
+				setPageComplete(false);
 			}
 		});
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index d44a5efef7..d96b796fdb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
 
 
  * All rights reserved. This program and the accompanying materials
@@ -129,13 +129,7 @@ public void resourceChanged(IResourceChangeEvent event) {
 
 
 		private void hidePart(final boolean force) {
-			sync.asyncExec(new Runnable() {
-
-				@Override
-				public void run() {
-					partService.hidePart(part, force);
-				}
-			});
+			sync.asyncExec(() -> partService.hidePart(part, force));
 		}
 	};
 
@@ -147,14 +141,11 @@ public void run() {
 	 */
 	protected void statusDialog(final Exception exc) {
 		try {
-			sync.syncExec(new Runnable() {
-				@Override
-				public void run() {
-					String bundle = FrameworkUtil.getBundle(getClass()).getSymbolicName();
-					Status status = new Status(IStatus.ERROR, bundle, exc.getMessage());
-					ErrorDialog.openError(shell, exc.getMessage(), exc.getMessage(), status);
-					exc.printStackTrace(System.err);
-				}
+			sync.syncExec(() -> {
+				String bundle = FrameworkUtil.getBundle(getClass()).getSymbolicName();
+				Status status = new Status(IStatus.ERROR, bundle, exc.getMessage());
+				ErrorDialog.openError(shell, exc.getMessage(), exc.getMessage(), status);
+				exc.printStackTrace(System.err);
 			});
 		} catch (Exception e) {
 		}
@@ -164,17 +155,14 @@ public void run() {
 	 * Reload the model.
 	 */
 	protected void reloadModel() {
-		getModelProvider().getRoot().getRealm().asyncExec(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					resource.unload();
-					resource.load(null);
-					getModelProvider().replaceRoot(resource.getContents().get(0));
-					doSave(new NullProgressMonitor());
-				} catch (IOException e) {
-					statusDialog(e);
-				}
+		getModelProvider().getRoot().getRealm().asyncExec(() -> {
+			try {
+				resource.unload();
+				resource.load(null);
+				getModelProvider().replaceRoot(resource.getContents().get(0));
+				doSave(new NullProgressMonitor());
+			} catch (IOException e) {
+				statusDialog(e);
 			}
 		});
 	}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
index 621db7911e..f3d0a2f282 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
@@ -26,8 +26,6 @@
 import org.eclipse.e4.tools.services.IResourceProviderService;
 import org.eclipse.e4.tools.services.IResourceService;
 import org.eclipse.e4.tools.services.ToolsServicesActivator;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
@@ -397,13 +395,7 @@ public IDiposeableResourcePool getResourcePool(Display display) {
 	@Override
 	public IResourcePool getControlPool(Control control) {
 		final ResourcePool pool = new ResourcePool(this, control.getDisplay());
-		control.addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				pool.dispose();
-			}
-		});
+		control.addDisposeListener(e -> pool.dispose());
 		return pool;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index ea9b2f7aae..b52356a372 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2016 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -61,8 +61,6 @@
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -193,13 +191,9 @@ public void createControl(Composite parent) {
 				"/icons/full/wizban/newclass_wiz.png")); //$NON-NLS-1$
 		setImageDescriptor(ImageDescriptor.createFromImage(img));
 
-		parent.addDisposeListener(new DisposeListener() {
-
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				img.dispose();
-				setImageDescriptor(null);
-			}
+		parent.addDisposeListener(e -> {
+			img.dispose();
+			setImageDescriptor(null);
 		});
 
 		parent = new Composite(parent, SWT.NULL);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index 2c15955151..d05ebf3a46 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 - 2016 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -168,12 +168,8 @@ protected void execute(IProgressMonitor progressMonitor) {
 			final IWorkbenchPart activePart = page.getActivePart();
 			if (activePart instanceof ISetSelectionTarget) {
 				final ISelection targetSelection = new StructuredSelection(modelFile);
-				getShell().getDisplay().asyncExec(new Runnable() {
-					@Override
-					public void run() {
-						((ISetSelectionTarget) activePart).selectReveal(targetSelection);
-					}
-				});
+				getShell().getDisplay()
+				.asyncExec(() -> ((ISetSelectionTarget) activePart).selectReveal(targetSelection));
 			}
 
 			// Open an editor on the new file.
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
index 00dc0e1e66..3962b920ec 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2017 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -23,8 +23,6 @@
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -78,12 +76,7 @@ public void createControl(Composite parent) {
 		containerText = new Text(container, SWT.BORDER | SWT.SINGLE);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		containerText.setLayoutData(gd);
-		containerText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				dialogChanged();
-			}
-		});
+		containerText.addModifyListener(e -> dialogChanged());
 
 		final Button button = new Button(container, SWT.PUSH);
 		button.setText(Messages.NewModelFilePage_Browse);
@@ -99,12 +92,7 @@ public void widgetSelected(SelectionEvent e) {
 		fileText = new Text(container, SWT.BORDER | SWT.SINGLE);
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		fileText.setLayoutData(gd);
-		fileText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				dialogChanged();
-			}
-		});
+		fileText.addModifyListener(e -> dialogChanged());
 
 		new Label(container, SWT.NONE);
 
@@ -124,7 +112,7 @@ protected void createAdditionalControls(Composite parent) {
 
 	private void initialize() {
 		if (selection != null && selection.isEmpty() == false
-			&& selection instanceof IStructuredSelection) {
+				&& selection instanceof IStructuredSelection) {
 			final IStructuredSelection ssel = (IStructuredSelection) selection;
 			if (ssel.size() > 1) {
 				return;
@@ -158,8 +146,8 @@ private void initialize() {
 
 	private void handleBrowse() {
 		final ContainerSelectionDialog dialog = new ContainerSelectionDialog(
-			getShell(), ResourcesPlugin.getWorkspace().getRoot(), false,
-			Messages.NewModelFilePage_SelectTheNewContainer);
+				getShell(), ResourcesPlugin.getWorkspace().getRoot(), false,
+				Messages.NewModelFilePage_SelectTheNewContainer);
 		if (dialog.open() == Window.OK) {
 			final Object[] result = dialog.getResult();
 			if (result.length == 1) {
@@ -174,7 +162,7 @@ private void handleBrowse() {
 
 	private void dialogChanged() {
 		final IResource container = ResourcesPlugin.getWorkspace().getRoot()
-			.findMember(new Path(getContainerName()));
+				.findMember(new Path(getContainerName()));
 		final String fileName = getFileName();
 
 		if (getContainerName().length() == 0) {
@@ -182,7 +170,7 @@ private void dialogChanged() {
 			return;
 		}
 		if (container == null
-			|| (container.getType() & (IResource.PROJECT | IResource.FOLDER)) == 0) {
+				|| (container.getType() & (IResource.PROJECT | IResource.FOLDER)) == 0) {
 			updateStatus(Messages.NewModelFilePage_FileContainerMustExists);
 			return;
 		}

From 34b2e7802254d49f4aa80b89cc3b361c6f5d1827 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Wed, 11 Oct 2017 09:48:54 +0300
Subject: [PATCH 1005/1286] Bug 525783 - Use varargs in
 SimpleContentProposalProvider

Make use of the varargs constructor to force update of e4.tools.emf.ui
bundle.

Change-Id: Ie7699ff602ee4ec793181c05ef41824019ecbe8b
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF        | 2 +-
 .../eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 9efae60841..710a5605ac 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
  org.eclipse.emf.databinding;bundle-version="1.2.0",
  org.eclipse.jface.databinding;bundle-version="1.4.0",
- org.eclipse.jface;bundle-version="3.6.0",
+ org.eclipse.jface;bundle-version="3.14.0",
  org.eclipse.emf.edit;bundle-version="2.6.0",
  org.eclipse.equinox.common;bundle-version="3.6.0",
  org.eclipse.emf.databinding.edit;bundle-version="1.2.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
index 5e415c8e5b..e77c967097 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
@@ -42,7 +42,7 @@ public class ComboViewerAutoComplete {
 	public ComboViewerAutoComplete(final ComboViewer dropDown) {
 		// use all items in the wrapped combo as proposals to filter instead of
 		// static String[]
-		SimpleContentProposalProvider proposalProvider = new SimpleContentProposalProvider(new String[0]) {
+		SimpleContentProposalProvider proposalProvider = new SimpleContentProposalProvider() {
 			@Override
 			public IContentProposal[] getProposals(String contents, int position) {
 				String[] proposals = dropDown.getCombo().getItems();

From 285e9a15820f016668503d20d21a698d0a296c84 Mon Sep 17 00:00:00 2001
From: Karsten Thoms <karsten.thoms@itemis.de>
Date: Mon, 11 Dec 2017 12:17:45 +0100
Subject: [PATCH 1006/1286] Bug 528254 - [Java9] Added Automatic-Module-Name
 Header

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
---
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF        | 1 +
 bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF  | 1 +
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF        | 1 +
 bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF | 1 +
 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF      | 1 +
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF               | 1 +
 tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF            | 1 +
 7 files changed, 7 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 910df9a9c4..db5c99d591 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -19,3 +19,4 @@ Export-Package: org.eclipse.e4.tools.compat.internal;version="0.12.0.qualifier";
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
 Import-Package: javax.inject;version="1.0.0"
+Automatic-Module-Name: org.eclipse.e4.tools.compat
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 9b22c0d0c6..597b87b25a 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -38,3 +38,4 @@ Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.e4.tools.emf.editor3x;version="0.12.0.qualifier";x-internal:=true,
  org.eclipse.e4.tools.emf.editor3x.emf;version="0.12.0.qualifier";x-internal:=true,
  org.eclipse.e4.tools.emf.editor3x.extension;version="0.12.0.qualifier";x-internal:=true
+Automatic-Module-Name: org.eclipse.e4.tools.emf.editor3x
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 710a5605ac..25258d1b8e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -62,3 +62,4 @@ Export-Package: org.eclipse.e4.tools.emf.ui.common;version="0.12.0.qualifier";x-
  org.eclipse.e4.tools.emf.ui.internal.imp;version="0.12.0.qualifier";x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal.wbm;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor,org.eclipse.e4.tools.model.spy"
 Service-Component: OSGI-INF/contributioncollector.xml, OSGI-INF/resourceprovider.xml
+Automatic-Module-Name: org.eclipse.e4.tools.emf.ui
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index 9c98aa8249..cceb5c9ac7 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -12,3 +12,4 @@ Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0"
 Export-Package: org.eclipse.e4.internal.tools.jdt.templates;version="0.12.0.qualifier";x-internal:=true
 Bundle-Vendor: %providerName
+Automatic-Module-Name: org.eclipse.e4.tools.jdt.templates
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 436cb62c57..b4cc6b008c 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@ Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation,
  javax.inject;version="1.0.0"
 Bundle-Activator: org.eclipse.e4.tools.services.ToolsServicesActivator
+Automatic-Module-Name: org.eclipse.e4.tools.services
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 3d8851d2a2..7cc87ee1f8 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -27,3 +27,4 @@ Export-Package: org.eclipse.e4.internal.tools;version="0.12.0.qualifier";x-inter
  org.eclipse.e4.internal.tools.wizards.classes.templates;version="0.12.0.qualifier";x-internal:=true,
  org.eclipse.e4.internal.tools.wizards.model;version="0.12.0.qualifier";x-internal:=true
 Bundle-Vendor: %Bundle-Vendor
+Automatic-Module-Name: org.eclipse.e4.tools
diff --git a/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
index 53ccea9672..ab1751a6bc 100644
--- a/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
@@ -8,3 +8,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.e4.core.contexts;bundle-version="1.3.100"
 Export-Package: org.eclipse.e4.tools.test;version="1.0.0";x-internal:=true
+Automatic-Module-Name: org.eclipse.e4.tools.test

From a8828e944d46eda72dfe8d8fa63ede6fb80f12d1 Mon Sep 17 00:00:00 2001
From: Karsten Thoms <karsten.thoms@itemis.de>
Date: Thu, 21 Dec 2017 08:33:59 +0100
Subject: [PATCH 1007/1286] Bug 528254 - Increment version for Eclipse 4.8
 Photon

Change-Id: If786729522800106902187a4f3b10823131c46ec
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
---
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.compat/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index db5c99d591..6319a71bbb 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 4.7.0.qualifier
+Bundle-Version: 4.7.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 8321129070..af3c019053 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.compat</artifactId>
-  <version>4.7.0-SNAPSHOT</version>
+  <version>4.7.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From 56d5afce91ef2ee3894d5983b394f435a9d06219 Mon Sep 17 00:00:00 2001
From: Shawn Kleese <shawn.kleese@wtnet.de>
Date: Mon, 11 Dec 2017 16:56:07 +0100
Subject: [PATCH 1008/1286] Bug 444360 - ContributionClassDialog Setting Target
 Platform does

Change-Id: I7190720bde433a55298005ea1d2f9415b10acac5
Signed-off-by: Shawn Kleese <shawn.kleese@wtnet.de>
---
 .../resourcelocator/TargetPlatformContributionCollector.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
index 2ce2f388f7..f7cb4a60ab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
@@ -329,7 +329,7 @@ protected IStatus run(IProgressMonitor monitor) {
 						try {
 							final String installLocation = pluginModelBase.getInstallLocation();
 							if (installLocation.endsWith(".jar")) { //$NON-NLS-1$
-								url = new URL("file://" + installLocation); //$NON-NLS-1$
+								url = new URL("file:///" + installLocation); //$NON-NLS-1$
 								final ZipInputStream zis = new ZipInputStream(url.openStream());
 								while (true) {
 									final ZipEntry entry = zis.getNextEntry();

From 502869264d00f16e9c7784c135567233d1ec2fe7 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Mon, 5 Feb 2018 19:52:23 +0100
Subject: [PATCH 1009/1286] Bug 525986 - Model Fragment Definition: Combo not
 updating

The text of the widget must be used instead of the field value which is
not still updated.

Change-Id: I11127e3b785be83e01610c378578d630fdd48357
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../common/component/StringModelFragment.java | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index dfa7b0b018..3f8a3bfdcb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -9,7 +9,7 @@
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Steven Spungin <steve@spungin.tv> - Ongoing Maintenance, Bug 439532, Bug 443945
  * Patrik Suzzi <psuzzi@gmail.com> - Bug 467262
- * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 509488
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 509488, 525986
  * Patrik Suzzi <psuzzi@gmail.com> - Bug 509606
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
@@ -111,6 +111,7 @@ public class StringModelFragment extends AbstractComponentEditor {
 
 	// The pickList to select the kind of children to add (must be refreshed)
 	private E4PickList pickList;
+	private Text featureText;
 
 	@Inject
 	public StringModelFragment() {
@@ -342,17 +343,17 @@ public void widgetSelected(SelectionEvent e) {
 			gl.marginLeft = gl.marginBottom = gl.marginRight = gl.marginTop = 0;
 			comp.setLayout(gl);
 
-			final Text t = new Text(comp, SWT.BORDER);
-			TextPasteHandler.createFor(t);
+			featureText = new Text(comp, SWT.BORDER);
+			TextPasteHandler.createFor(featureText);
 			gd = new GridData(GridData.FILL_HORIZONTAL);
-			t.setLayoutData(gd);
-			context.bindValue(textProp.observeDelayed(200, t),
+			featureText.setLayoutData(gd);
+			context.bindValue(textProp.observeDelayed(200, featureText),
 					EMFEditProperties
 					.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME)
 					.observeDetail(getMaster()));
 
 			// create the decoration for the text component
-			final ControlDecoration deco = new ControlDecoration(t, SWT.TOP | SWT.LEFT);
+			final ControlDecoration deco = new ControlDecoration(featureText, SWT.TOP | SWT.LEFT);
 
 			// use an existing image
 			Image image = FieldDecorationRegistry.getDefault()
@@ -366,7 +367,7 @@ public void widgetSelected(SelectionEvent e) {
 			deco.setShowOnlyOnFocus(false);
 
 			// hide the decoration if the text component has content
-			t.addModifyListener(e -> {
+			featureText.addModifyListener(e -> {
 				Text text = (Text) e.getSource();
 				if (!text.getText().isEmpty()) {
 					deco.hide();
@@ -378,13 +379,13 @@ public void widgetSelected(SelectionEvent e) {
 			KeyStroke keyStroke;
 			try {
 				keyStroke = KeyStroke.getInstance("Ctrl+Space");
-				ContentProposalAdapter adapter = new ContentProposalAdapter(t, new TextContentAdapter(),
-						new StringModelFragmentProposalProvider(this, t), keyStroke, null);
+				ContentProposalAdapter adapter = new ContentProposalAdapter(featureText, new TextContentAdapter(),
+						new StringModelFragmentProposalProvider(this, featureText), keyStroke, null);
 				adapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE);
 			} catch (ParseException e) {
 				e.printStackTrace();
 			}
-			t.addModifyListener(e -> updateChildrenChoice());
+			featureText.addModifyListener(e -> updateChildrenChoice());
 
 			final Button button = new Button(comp, SWT.PUSH | SWT.FLAT);
 			button.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -620,7 +621,7 @@ public List<FeatureClass> getTargetChildrenClasses() {
 		List<FeatureClass> targetChildrenClasses = new ArrayList<>();
 		if (selectedContainer != null) {
 			List<FeatureClass> childTypes = getTargetChildrenClasses(selectedContainer,
-					getStringModelFragment().getFeaturename());
+					featureText.getText());
 			targetChildrenClasses.addAll(childTypes);
 		}
 		return targetChildrenClasses;

From ce8a0fa2ada7d2a3adf69cb827dafd9e9bfaa70e Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Tue, 6 Feb 2018 11:37:45 +0100
Subject: [PATCH 1010/1286] Bug 530749 - Model Fragment Editor should propose
 the 'xpath:/' value when Application is selected

Change-Id: I556f61a518d1b65c0b526c02b436dd8dc68c00ba
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../e4/tools/emf/ui/internal/Messages.java    |  1 +
 .../tools/emf/ui/internal/Messages.properties |  1 +
 .../FindParentReferenceElementDialog.java     | 21 ++++++++++++++++---
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 3c8a96a15b..9148771308 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -613,6 +613,7 @@ public class Messages {
 	public String FindParentReferenceElementDialog_NoId;
 	public String FindParentReferenceElementDialog_ClearCache;
 	public String FindParentReferenceElementDialog_NoReferenceId;
+	public String FindParentReferenceElementDialog_AnyApplication;
 
 	public String HandledMenuItemCommandSelectionDialog_ShellTitle;
 	public String HandledMenuItemCommandSelectionDialog_DialogTitle;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 555e793cff..5189766bd6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -620,6 +620,7 @@ FindParentReferenceElementDialog_Search=Search
 FindParentReferenceElementDialog_ClearCache=Clear Cache
 FindParentReferenceElementDialog_NoReferenceId=You can not reference an element without an ID
 FindParentReferenceElementDialog_NoId=no ID
+FindParentReferenceElementDialog_AnyApplication=Any Application
 
 HandledMenuItemCommandSelectionDialog_ShellTitle=MenuItem Command
 HandledMenuItemCommandSelectionDialog_DialogTitle=MenuItem-Command
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index 4920e5c106..b1c38f5204 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -9,7 +9,7 @@
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Steven Spungin <steven@spungin.tv> - Bug 437469
  * Patrik Suzzi <psuzzi@gmail.com> - Bug 467262
- * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 509488, 509551
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 509488, 509551, 530749
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
@@ -24,7 +24,9 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
+import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
@@ -66,6 +68,9 @@
 import org.osgi.framework.ServiceReference;
 
 public class FindParentReferenceElementDialog extends TitleAreaDialog {
+
+	private static final String XPATH_URI = "xpath:/"; //$NON-NLS-1$
+
 	private final MStringModelFragment fragment;
 	private final AbstractComponentEditor editor;
 	private TableViewer viewer;
@@ -206,7 +211,9 @@ public void update(ViewerCell cell) {
 					styledString.append(" - " + detailLabel, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
 				}
 
-				styledString.append(" - " + o.eResource().getURI(), StyledString.COUNTER_STYLER); //$NON-NLS-1$
+				String resName = (o.eResource() == null ? Messages.FindParentReferenceElementDialog_AnyApplication
+						: o.eResource().getURI().toString());
+				styledString.append(" - " + resName, StyledString.COUNTER_STYLER); //$NON-NLS-1$
 				cell.setStyleRanges(styledString.getStyleRanges());
 				cell.setText(styledString.getString());
 			}
@@ -270,8 +277,16 @@ protected void updateSearch() {
 		}
 		list.clear();
 
+		// Fix bug 530749 : add xpath:/ for application.
+		EClass selectedEClass = (EClass) ((IStructuredSelection) eClassViewer.getSelection()).getFirstElement();
+		if (selectedEClass.getName().equals("Application")) { //$NON-NLS-1$
+			MApplication anyAppli = MApplicationFactory.INSTANCE.createApplication();
+			anyAppli.setElementId(XPATH_URI);
+			list.add(anyAppli);
+		}
+
 		final Filter filter = new Filter(
-				(EClass) ((IStructuredSelection) eClassViewer.getSelection()).getFirstElement(), searchText.getText());
+				selectedEClass, searchText.getText());
 
 		currentResultHandler = new ModelResultHandlerImpl(list, filter, editor, ((EObject) fragment).eResource());
 		collector.findModelElements(filter, currentResultHandler);

From 5dba22b7b09c143fed9a853041a49401bf217987 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Tue, 6 Feb 2018 14:48:40 +0100
Subject: [PATCH 1011/1286] Bug 530772 - Model Fragment Editor should not use
 InputPart in class selection

Change-Id: I0c64413a8fcb019d5d1f639dc43cc63e9cb790ab
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../component/dialogs/FindParentReferenceElementDialog.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index b1c38f5204..b99df97e30 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -260,7 +260,9 @@ private List<EClass> getExtendableClasses() {
 			extendableClasses = new ArrayList<>();
 			for (final InternalPackage p : Util.loadPackages()) {
 				for (EClass c : p.getAllClasses()) {
-					if (Util.canBeExtendedInAFragment(c)) {
+					// Fix 530772 : as far as MInput is still in Application meta model, it should
+					// removed manually ! (see also 509868)
+					if (Util.canBeExtendedInAFragment(c) && !"InputPart".equals(c.getName())) { //$NON-NLS-1$
 						extendableClasses.add(c);
 					}
 				}

From a652e50e28fae2655bd8770a8d9405ca7746cd47 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Fri, 9 Feb 2018 17:37:55 +0100
Subject: [PATCH 1012/1286] Bug 530887 - Mark Dirtyable field from Part
 Descriptor for deletion

Remove it from UI editors as it is useless.

Change-Id: I5f8180a1d9f97fe42c798e47019131b9f10a5058
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../e4/tools/emf/ui/internal/Messages.java    |   1 -
 .../tools/emf/ui/internal/Messages.properties |   1 -
 .../component/PartDescriptorEditor.java       |  17 +-
 .../classes/templates/PartTemplate.java       | 160 ++++++++++--------
 4 files changed, 87 insertions(+), 92 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 9148771308..b366d81d9e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -254,7 +254,6 @@ public class Messages {
 	public String PartDescriptorEditor_Tooltip;
 	public String PartDescriptorEditor_IconURI;
 	public String PartDescriptorEditor_ClassURI;
-	public String PartDescriptorEditor_Dirtyable;
 	public String PartDescriptorEditor_Closeable;
 	public String PartDescriptorEditor_Multiple;
 	public String PartDescriptorEditor_Category;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 5189766bd6..7c2211e41e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -218,7 +218,6 @@ PartDescriptorEditor_LabelLabel=Label
 PartDescriptorEditor_Tooltip=Tooltip
 PartDescriptorEditor_IconURI=Icon URI
 PartDescriptorEditor_ClassURI=Class URI
-PartDescriptorEditor_Dirtyable=Dirtyable
 PartDescriptorEditor_Closeable=Closeable
 PartDescriptorEditor_Multiple=Multiple
 PartDescriptorEditor_Category=Category
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 7e1114f302..144c76c88b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -8,7 +8,7 @@
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Steven Spungin <steven@spungin.tv> - Bug 404166, 424730, 437951
- * Olivier Prouvost <olivier@opcoach.com> - Bug 472658
+ * Olivier Prouvost <olivier@opcoach.com> - Bug 472658, 530887
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -302,21 +302,6 @@ public void widgetSelected(SelectionEvent e) {
 					.observeDetail(master));
 		}
 
-		// ------------------------------------------------------------
-		{
-			final Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartDescriptorEditor_Dirtyable);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			final Button checkbox = new Button(parent, SWT.CHECK);
-			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
-
-			final IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(),
-					BasicPackageImpl.Literals.PART_DESCRIPTOR__DIRTYABLE);
-			final IWidgetValueProperty uiProp = WidgetProperties.selection();
-
-			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
-		}
 
 		// ------------------------------------------------------------
 		{
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
index c942904468..20843b9887 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
@@ -4,80 +4,92 @@
 
 public class PartTemplate
 {
-	protected static String nl;
-	public static synchronized PartTemplate create(String lineSeparator)
-	{
-		nl = lineSeparator;
-		PartTemplate result = new PartTemplate();
-		nl = null;
-		return result;
-	}
+  protected static String nl;
+  public static synchronized PartTemplate create(String lineSeparator)
+  {
+    nl = lineSeparator;
+    PartTemplate result = new PartTemplate();
+    nl = null;
+    return result;
+  }
 
-	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
-	protected final String TEXT_1 = NL + "package ";
-	protected final String TEXT_2 = ";";
-	protected final String TEXT_3 = NL + NL + "import javax.annotation.PostConstruct;" + NL
-			+ "import org.eclipse.swt.widgets.Composite;";
-	protected final String TEXT_4 = NL + "import javax.annotation.PreDestroy;";
-	protected final String TEXT_5 = NL + "import org.eclipse.e4.ui.di.Focus;";
-	protected final String TEXT_6 = NL + "import org.eclipse.e4.ui.di.Persist;";
-	protected final String TEXT_7 = NL + NL + "public class ";
-	protected final String TEXT_8 = " {";
-	protected final String TEXT_9 = NL + NL + "\t@PostConstruct" + NL + "\tpublic void ";
-	protected final String TEXT_10 = "(Composite parent) {" + NL + "\t\t" + NL + "\t}" + NL;
-	protected final String TEXT_11 = NL + "\t@PreDestroy" + NL + "\tpublic void ";
-	protected final String TEXT_12 = "() {" + NL + "\t\t" + NL + "\t}" + NL;
-	protected final String TEXT_13 = NL + "\t@Focus" + NL + "\tpublic void ";
-	protected final String TEXT_14 = "() {" + NL + "\t\t" + NL + "\t}" + NL;
-	protected final String TEXT_15 = NL + "\t@Persist" + NL + "\tpublic void ";
-	protected final String TEXT_16 = "() {" + NL + "\t\t" + NL + "\t}" + NL;
-	protected final String TEXT_17 = NL + "}";
+  public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+  protected final String TEXT_1 = " ";
+  protected final String TEXT_2 = NL + "package ";
+  protected final String TEXT_3 = ";";
+  protected final String TEXT_4 = NL + NL + "import javax.inject.Inject;";
+  protected final String TEXT_5 = NL + "import javax.annotation.PostConstruct;" + NL + "import org.eclipse.swt.widgets.Composite;";
+  protected final String TEXT_6 = NL + "import javax.annotation.PreDestroy;";
+  protected final String TEXT_7 = NL + "import org.eclipse.e4.ui.di.Focus;";
+  protected final String TEXT_8 = NL + "import org.eclipse.e4.ui.di.Persist;";
+  protected final String TEXT_9 = NL + NL + "public class ";
+  protected final String TEXT_10 = " {" + NL + "\t@Inject" + NL + "\tpublic ";
+  protected final String TEXT_11 = "() {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_12 = NL + "\t@PostConstruct" + NL + "\tpublic void ";
+  protected final String TEXT_13 = "(Composite parent) {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_14 = NL + "\t";
+  protected final String TEXT_15 = NL + "\t@PreDestroy" + NL + "\tpublic void ";
+  protected final String TEXT_16 = "() {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_17 = NL + "\t";
+  protected final String TEXT_18 = NL + "\t@Focus" + NL + "\tpublic void ";
+  protected final String TEXT_19 = "() {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_20 = NL + "\t";
+  protected final String TEXT_21 = NL + "\t@Persist" + NL + "\tpublic void ";
+  protected final String TEXT_22 = "() {" + NL + "\t\t" + NL + "\t}" + NL + "\t";
+  protected final String TEXT_23 = NL + "}";
 
-	public String generate(Object argument)
-	{
-		final StringBuffer stringBuffer = new StringBuffer();
-		PartClass domainClass = (PartClass)argument;
-		if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
-			stringBuffer.append(TEXT_1);
-			stringBuffer.append( domainClass.getPackageFragment().getElementName() );
-			stringBuffer.append(TEXT_2);
-		}
-		if( domainClass.isUsePostConstruct() ) {
-			stringBuffer.append(TEXT_3);
-		}
-		if( domainClass.isUsePredestroy() ) {
-			stringBuffer.append(TEXT_4);
-		}
-		if( domainClass.isUseFocus() ) {
-			stringBuffer.append(TEXT_5);
-		}
-		if( domainClass.isUsePersist() ) {
-			stringBuffer.append(TEXT_6);
-		}
-		stringBuffer.append(TEXT_7);
-		stringBuffer.append( domainClass.getName() );
-		stringBuffer.append(TEXT_8);
-		if( domainClass.isUsePostConstruct() ) {
-			stringBuffer.append(TEXT_9);
-			stringBuffer.append( domainClass.getPostConstructMethodName()  );
-			stringBuffer.append(TEXT_10);
-		}
-		if( domainClass.isUsePredestroy() ) {
-			stringBuffer.append(TEXT_11);
-			stringBuffer.append( domainClass.getPreDestroyMethodName()  );
-			stringBuffer.append(TEXT_12);
-		}
-		if( domainClass.isUseFocus() ) {
-			stringBuffer.append(TEXT_13);
-			stringBuffer.append( domainClass.getFocusMethodName() );
-			stringBuffer.append(TEXT_14);
-		}
-		if( domainClass.isUsePersist() ) {
-			stringBuffer.append(TEXT_15);
-			stringBuffer.append( domainClass.getPersistMethodName() );
-			stringBuffer.append(TEXT_16);
-		}
-		stringBuffer.append(TEXT_17);
-		return stringBuffer.toString();
-	}
+  public String generate(Object argument)
+  {
+    final StringBuffer stringBuffer = new StringBuffer();
+     PartClass domainClass = (PartClass)argument; 
+    stringBuffer.append(TEXT_1);
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
+    stringBuffer.append(TEXT_2);
+    stringBuffer.append( domainClass.getPackageFragment().getElementName() );
+    stringBuffer.append(TEXT_3);
+     } 
+    stringBuffer.append(TEXT_4);
+     if( domainClass.isUsePostConstruct() ) { 
+    stringBuffer.append(TEXT_5);
+     } 
+     if( domainClass.isUsePredestroy() ) { 
+    stringBuffer.append(TEXT_6);
+     } 
+     if( domainClass.isUseFocus() ) { 
+    stringBuffer.append(TEXT_7);
+     } 
+     if( domainClass.isUsePersist() ) { 
+    stringBuffer.append(TEXT_8);
+     } 
+    stringBuffer.append(TEXT_9);
+    stringBuffer.append( domainClass.getName() );
+    stringBuffer.append(TEXT_10);
+    stringBuffer.append( domainClass.getName() );
+    stringBuffer.append(TEXT_11);
+     if( domainClass.isUsePostConstruct() ) { 
+    stringBuffer.append(TEXT_12);
+    stringBuffer.append( domainClass.getPostConstructMethodName()  );
+    stringBuffer.append(TEXT_13);
+     } 
+    stringBuffer.append(TEXT_14);
+     if( domainClass.isUsePredestroy() ) { 
+    stringBuffer.append(TEXT_15);
+    stringBuffer.append( domainClass.getPreDestroyMethodName()  );
+    stringBuffer.append(TEXT_16);
+     } 
+    stringBuffer.append(TEXT_17);
+     if( domainClass.isUseFocus() ) { 
+    stringBuffer.append(TEXT_18);
+    stringBuffer.append( domainClass.getFocusMethodName() );
+    stringBuffer.append(TEXT_19);
+     } 
+    stringBuffer.append(TEXT_20);
+     if( domainClass.isUsePersist() ) { 
+    stringBuffer.append(TEXT_21);
+    stringBuffer.append( domainClass.getPersistMethodName() );
+    stringBuffer.append(TEXT_22);
+     } 
+    stringBuffer.append(TEXT_23);
+    return stringBuffer.toString();
+  }
 }

From bb98c7b33e42a78b51d1841b0a5bfe2b30042a45 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Tue, 6 Feb 2018 19:31:55 +0100
Subject: [PATCH 1013/1286] Bug 509868 - Mark MInput and MInputPart for
 deletion

Change-Id: Ia078e6236d682892d256b601a340f3feb6699fce
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../eclipse/e4/tools/emf/ui/internal/Messages.java  |  2 +-
 .../e4/tools/emf/ui/internal/Messages.properties    |  4 +---
 .../ui/internal/common/component/AreaEditor.java    |  2 +-
 .../common/component/CompositePartEditor.java       |  3 +--
 .../ui/internal/common/component/PartEditor.java    |  4 ++--
 .../common/component/PartSashContainerEditor.java   |  2 +-
 .../internal/common/component/PartStackEditor.java  | 13 +------------
 .../virtual/VPerspectiveControlEditor.java          |  4 +++-
 .../common/component/virtual/VSnippetsEditor.java   |  2 +-
 .../component/virtual/VWindowControlEditor.java     |  2 +-
 .../virtual/VWindowSharedElementsEditor.java        |  6 ++++--
 .../e4/tools/emf/ui/internal/imp/RegistryUtil.java  |  7 -------
 12 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index b366d81d9e..71072d4278 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -17,7 +17,7 @@
 
 public class Messages {
 
-	public String PartEditor_InputPart;
+	public String PartEditor_Part;
 	public String XmiTab_TypeTextToSearch;
 	public String ModelEditor_Import3x;
 	public String E4StringPickList_Replace;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 7c2211e41e..e6b4057880 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -15,7 +15,7 @@
 # *     Patrik Suzzi <psuzzi@gmail.com> - Bug 509606
 # ******************************************************************************
 
-PartEditor_InputPart=Input Part
+PartEditor_Part=Part
 XmiTab_TypeTextToSearch=type text to search (press <ENTER> to search for next instance)
 ModelEditor_Import3x=Import 3x
 E4StringPickList_Replace=Replace
@@ -163,8 +163,6 @@ HandlerEditor_Description=Handler
 HandlerEditor_Command=Command
 HandlerEditor_ClassURI=Class URI
 
-InputPartEditor_Label=InputPart
-InputPartEditor_InputURI=Input URI
 
 KeyBindingEditor_Label=KeyBinding
 KeyBindingEditor_Description=Binding
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 28e9091883..8b8219fe8f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -301,7 +301,7 @@ protected void addPressed() {
 			pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
 			pickList.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER,
 					BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART,
-					BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA,
+					AdvancedPackageImpl.Literals.AREA,
 					AdvancedPackageImpl.Literals.PLACEHOLDER });
 			pickList.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index 85f0ec824d..c3fa4539e7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -160,7 +160,7 @@ public void run() {
 		actionsImport.add(new Action("Editors", createImageDescriptor(ResourceProvider.IMG_Part)) { //$NON-NLS-1$
 			@Override
 			public void run() {
-				handleImportChild(BasicPackageImpl.Literals.INPUT_PART, RegistryUtil.HINT_EDITOR);
+				handleImportChild(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_EDITOR);
 			}
 		});
 
@@ -335,7 +335,6 @@ public String getText(Object element) {
 			eClassList.add(new FeatureClass("PartSashContainer", BasicPackageImpl.Literals.PART_SASH_CONTAINER)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("PartStack", BasicPackageImpl.Literals.PART_STACK)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART)); //$NON-NLS-1$
-			eClassList.add(new FeatureClass("InputPart", BasicPackageImpl.Literals.INPUT_PART)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("Area", AdvancedPackageImpl.Literals.AREA)); //$NON-NLS-1$
 			eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER)); //$NON-NLS-1$
 			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.COMPOSITE_PART,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 719768c661..f781e310c3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -103,8 +103,8 @@ public Image getImage(Object element) {
 
 	@Override
 	public String getLabel(Object element) {
-		if (element == BasicPackageImpl.Literals.INPUT_PART) {
-			return Messages.PartEditor_InputPart;
+		if (element == BasicPackageImpl.Literals.PART) {
+			return Messages.PartEditor_Part;
 		}
 		return Messages.PartEditor_Label;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index ead9a83a5f..695783e9cb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -155,7 +155,7 @@ public void run() {
 		actionsImport.add(new Action("Editors", createImageDescriptor(ResourceProvider.IMG_Part)) { //$NON-NLS-1$
 			@Override
 			public void run() {
-				handleImportChild(BasicPackageImpl.Literals.INPUT_PART, RegistryUtil.HINT_EDITOR);
+				handleImportChild(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_EDITOR);
 			}
 		});
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index de8282347b..a8ca47831d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -32,7 +32,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.basic.MInputPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
@@ -137,7 +136,7 @@ public void run() {
 		.add(new Action(Messages.PartStackEditor_Editors, createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
-				handleImportChild(BasicPackageImpl.Literals.INPUT_PART);
+						handleImportChild(BasicPackageImpl.Literals.PART);
 			}
 		});
 
@@ -345,16 +344,6 @@ protected void handleImportChild(EClass eClass) {
 			}
 		}
 
-		if (eClass == BasicPackageImpl.Literals.INPUT_PART) {
-			final ModelImportWizard wizard = new ModelImportWizard(MInputPart.class, this, resourcePool);
-			final WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
-			if (wizardDialog.open() == Window.OK) {
-				final MPart[] parts = (MPart[]) wizard.getElements(MInputPart.class);
-				for (final MPart part : parts) {
-					addToModel((EObject) part);
-				}
-			}
-		}
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index 81bf57a4fb..aa6f62e8d7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -143,7 +143,9 @@ protected void addPressed() {
 
 			pickList.setContentProvider(new ArrayContentProvider());
 			pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
-			pickList.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
+			pickList.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER,
+					BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART,
+					AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
 			pickList.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index b02174c763..7d17f58673 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -202,7 +202,7 @@ protected List<?> getContainerChildren(Object container) {
 		pickList.setInput(new EClass[] { BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW,
 				AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, AdvancedPackageImpl.Literals.PERSPECTIVE,
 				AdvancedPackageImpl.Literals.AREA, BasicPackageImpl.Literals.PART_SASH_CONTAINER,
-				BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART,
+				BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART,
 				BasicPackageImpl.Literals.TRIM_BAR, BasicPackageImpl.Literals.TRIM_ELEMENT, });
 		pickList.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 7c83d2bde4..9cc43a7bad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -164,7 +164,7 @@ public String getText(Object element) {
 			pickList
 			.setInput(new EClass[] { AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
 					BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK,
-					BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART,
+							BasicPackageImpl.Literals.PART,
 					AdvancedPackageImpl.Literals.AREA });
 			pickList.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK));
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index e294920b95..5fbbf31c57 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -109,7 +109,7 @@ public void run() {
 		actionsImport.add(new Action(Messages.VWindowSharedElementsEditor_Editors, createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
-				handleImport(BasicPackageImpl.Literals.INPUT_PART, RegistryUtil.HINT_EDITOR);
+				handleImport(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_EDITOR);
 			}
 		});
 
@@ -178,7 +178,9 @@ protected List<?> getContainerChildren(Object container) {
 			viewer.setInput(prop.observeDetail(getMaster()));
 
 			pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
-			pickList.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, BasicPackageImpl.Literals.PART_STACK, AdvancedPackageImpl.Literals.AREA });
+			pickList.setInput(
+					new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART,
+							BasicPackageImpl.Literals.PART_STACK, AdvancedPackageImpl.Literals.AREA });
 			pickList.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
index a3e0d63c9c..7cf643e11f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
@@ -31,7 +31,6 @@
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
-import org.eclipse.e4.ui.model.application.ui.basic.MInputPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
@@ -90,8 +89,6 @@ public static MApplicationElement[] getModelElements(Class<? extends MApplicatio
 			return getViewsAsCompatibilityViews(elements);
 		} else if (t.equals(MPart.class)) {
 			return getViews(elements);
-		} else if (t.equals(MInputPart.class)) {
-			return getEditors(elements);
 		} else if (t.equals(MHandler.class)) {
 			return getHandlers(elements, application);
 		} else if (t.equals(MPartDescriptor.class) && HINT_EDITOR.equals(hint)) {
@@ -441,10 +438,6 @@ public static RegistryStruct getStruct(Class<? extends MApplicationElement> appl
 			return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.views", "view", NAME); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 
-		else if (applicationElement == MInputPart.class) {
-			return new RegistryStruct("", "org.eclipse.ui.editors", "editor", "name"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		}
-
 		else if (applicationElement == MPartDescriptor.class) {
 			if (hint == HINT_EDITOR)
 			{

From 418ead4f1fcd38870a5e3c9e6d8c2085f1a83061 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Tue, 13 Feb 2018 23:54:45 +0100
Subject: [PATCH 1014/1286] Bug 531054 - Remove Wizard and Dialogs from model
 edit and integrate that they should not be used

Change-Id: I1a4313a272f4c9a92f750587c3888164adaeb4e3
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../icons/full/modelelements/Dialog.png       | Bin 730 -> 0 bytes
 .../icons/full/modelelements/WizardDialog.png | Bin 339 -> 0 bytes
 .../e4/tools/emf/ui/internal/Messages.java    |   6 -
 .../tools/emf/ui/internal/Messages.properties |  12 +-
 .../emf/ui/internal/ResourceProvider.java     |   2 -
 .../emf/ui/internal/common/ModelEditor.java   | 139 +++++++-----------
 .../common/component/DialogEditor.java        |  44 ------
 .../common/component/StringModelFragment.java |  16 +-
 .../common/component/WizardDialogEditor.java  |  44 ------
 .../component/virtual/VSnippetsEditor.java    |  15 +-
 .../component/virtual/VWindowEditor.java      |  35 +----
 11 files changed, 71 insertions(+), 242 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Dialog.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WizardDialog.png
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Dialog.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Dialog.png
deleted file mode 100644
index 681c0a0f1b67cdf71953ee7540e4e41a39586d6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 730
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAP>{XE
z)7O>#9-{!ij$XP_M-N!YHKN3^v?L?Hh+*ZrGaf)8o)VytOKNd)QD#9&W_})nFsGt2
zP@D@S?wnsxS(KTcQNpl>|BMw-ln*Rgl$r=qs!)=do62DNou3mZ!wHfJ&QB{TPb^Ah
zh%NXJQqB!FJhM1CClRQ$h++GIE&V`Y4v=toVo_dZUOK}8>1XXgF?NXl(xT*4hOhsd
zU&E9+=jZ08=9MsfJ2P!RP>c<vEF`leCzWBvyG!Z}42(-XT^vI!dY4Y#pFKHIq;<Zz
zo5qo@=B*1lf@GtNLtO+O^}8Mkyx8X##Lju}<WXOlm@7Q8SN1P(y>oQygKN7&*|+lX
zW|-&-E&lOz-s2CoVxrRAwx@T;oZEYT=X>96H@hyiN^icNo!)o%?U$I1jGW#rOs7vA
z670$Oe`fi6>z^Bc%<=mA<NEc}b7%X%_dUDB+W+2>4+Tq2R-6uaudA&;-*8v8zWb}|
zGwjPdzx~`LXX2Nu{oQDK)!cUn4BKxUJn^qE?Dy^&_Jz~*)%8E?7IQ9mW3XNC-EEe)
z5C7~el4_{>%(}C&HTRPSFI!MjVPc~5>cx{Mw<wt(P*a+br?+0*CQpWCLD=fQmlxcA
zyQnTvfGg$mhB}5x2RZ+yZ=Dpd!eK&S$CLwF29s8XtzNTs?Wg78Og>CsxE;Bc9N0fK
zA);#QmWM2lg@rwivi#LiR?4vXwIS}p968w;j=TR(th=T!;N<b>-&Nbn*G+{Jls?^$
zQs6k*z;!4lIk`P!Ym{Y(QD+P9%k>LRYrnsD{_ec9%S0NTTv#S`=$yX1Z6lL=p}3Ii
lXUm2ySF>d*TxMVNH!%Oz^rvdJ7cdGLJYD@<);T3K0RT@kFIE5m

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WizardDialog.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WizardDialog.png
deleted file mode 100644
index 0889b901bc139ec2d5a0a3ce92880025c319138c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 339
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;V>;F5;{vRv2ef##^i3<Oh
zNdMpIzjEiABWoMhmaF~WV0Cx0%E}FE{(ml<yn6Tl|NnuSfTSKjLnx3XSQ6wH4CJB!
z2GzAQlYo+pN#5=*eEE9~{DB;$4A0;Y237_ZAY^7>0zyV4$iX1Oz{w!Qu>SeKs`o(E
z(j~4DCBgY=CFO}lsSN3vX+{Nk=?VsVW(pcfsU?Y;tL|n_0xFB~ba4!+m=k->o9}=E
z2TQ<;TkD(e{NJ*5Ba`lI&$tGjm-!yAI~cZRJ>{@mzV(LR`I4?28UIU4MUn#3ljEbB
z=W7_w;^Zx!dER%;MUnMCx}3!YT>`$?b$mD>E^>f3^*5ijgZ3J3pgjzpu6{1-oD!M<
D58i(=

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 71072d4278..8346eb00d5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -348,10 +348,6 @@ public class Messages {
 	public String ToolControlEditor_Description;
 	public String ToolControlEditor_ClassURI;
 
-	public String DialogEditor_Label;
-
-	public String WizardDialogEditor_Label;
-
 	public String VBindingTableEditor_Label;
 	public String VBindingTableEditor_Description;
 	public String VBindingTableEditor_Contexts;
@@ -561,8 +557,6 @@ public class Messages {
 	public String VWindowEditor_Windows;
 	public String VWindowEditor_AddTrimmedWindow;
 	public String VWindowEditor_AddWindow;
-	public String VWindowEditor_AddDialog;
-	public String VWindowEditor_AddWizardDialog;
 
 	public String VWindowSharedElementsEditor_TreeLabel;
 	public String VWindowSharedElementsEditor_TreeLabelDescription;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index e6b4057880..7618dcc907 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -70,7 +70,7 @@ ApplicationEditor_Handlers=Handlers
 ApplicationEditor_PartDescriptors=Part Descriptors
 ApplicationEditor_BindingTables=BindingTables
 ApplicationEditor_Commands=Commands
-ApplicationEditor_Windows=Windows and Dialogs
+ApplicationEditor_Windows=Windows
 ApplicationEditor_Addons=Add-ons
 ApplicationEditor_MenuContributions=Menu Contributions
 ApplicationEditor_Snippets=Snippets
@@ -122,10 +122,6 @@ CommandEditor_Category=Category
 CommandEditor_AddCommandParameter=Command Parameter
 CommandEditor_NewCommandParameter=Command Parameter {0}
 
-DialogEditor_Label=Dialog
-
-WizardDialogEditor_Label=Wizard
-
 DirectMenuItemEditor_Label=Direct Menu Item
 DirectMenuItemEditor_Description=Direct Menu Item
 DirectMenuItemEditor_ClassURI=Class URI
@@ -459,7 +455,7 @@ WindowEditor_MainMenu=Main Menu
 WindowEditor_SelectedElement=Selected Element
 WindowEditor_BindingContexts=Binding Contexts
 WindowEditor_Handlers=Handlers
-WindowEditor_Windows=Windows and Dialogs
+WindowEditor_Windows=Windows YYYYY
 WindowEditor_Controls=Controls
 WindowEditor_SharedElements=Shared Elements
 WindowEditor_Snippets=Snippets
@@ -530,13 +526,11 @@ VWindowControlEditor_AddPartStack=Part Stack
 VWindowControlEditor_AddPart=Part
 VWindowControlEditor_AddArea=Area
 
-VWindowEditor_TreeLabel=Windows and Dialogs
+VWindowEditor_TreeLabel=Windows
 VWindowEditor_TreeLabelDescription=Windows
 VWindowEditor_Windows=Windows
 VWindowEditor_AddTrimmedWindow=Trimmed Window
 VWindowEditor_AddWindow=Window
-VWindowEditor_AddDialog=Dialog
-VWindowEditor_AddWizardDialog=Wizard
 
 VWindowSharedElementsEditor_TreeLabel=Shared Elements
 VWindowSharedElementsEditor_TreeLabelDescription=Shared Elements 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
index a98874283a..6d0a1c1dff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
@@ -24,7 +24,6 @@ public class ResourceProvider extends BasicResourceProvider {
 	public static final String IMG_Command = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Command"; //$NON-NLS-1$
 	public static final String IMG_CommandParameter = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.CommandParameter"; //$NON-NLS-1$
 	public static final String IMG_CoreExpression = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.CoreExpression"; //$NON-NLS-1$
-	public static final String IMG_Dialog = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Dialog"; //$NON-NLS-1$
 	public static final String IMG_DirectMenuItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.DirectMenuItem"; //$NON-NLS-1$
 	public static final String IMG_DirectToolItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.DirectToolItem"; //$NON-NLS-1$
 	public static final String IMG_HandledMenuItem = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.HandledMenuItem"; //$NON-NLS-1$
@@ -54,7 +53,6 @@ public class ResourceProvider extends BasicResourceProvider {
 	public static final String IMG_TrimContribution = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.TrimContribution"; //$NON-NLS-1$
 	public static final String IMG_Window = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.Window"; //$NON-NLS-1$
 	public static final String IMG_WindowTrim = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.WindowTrim"; //$NON-NLS-1$
-	public static final String IMG_WizardDialog = "IMG_org.eclipse.e4.tools.emf.ui.modelelements.WizardDialog"; //$NON-NLS-1$
 
 
 	public static final String IMG_Obj16_arrow_down = "IMG_org.eclipse.e4.tools.emf.ui.obj16.arrow_down"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 4a92de5373..36dfee1303 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -80,7 +80,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CompositePartEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.CoreExpressionEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DefaultEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.DialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectMenuItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DirectToolItemEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.DynamicMenuContributionEditor;
@@ -111,7 +110,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.TrimContributionEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.TrimmedWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.WindowEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.WizardDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.EmfUtil;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.IGotoObject;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.ListTab;
@@ -1253,95 +1251,56 @@ public List<AbstractElementEditorContribution> getTabContributionsForClass(Class
 	}
 
 	private void registerDefaultEditors() {
-		// System.err.println(getClass().getName() + ".registerDefaultEditors: " +
-		// resourcePool); //$NON-NLS-1$
-
-		registerEditor(ApplicationPackageImpl.Literals.APPLICATION,
-				ContextInjectionFactory.make(ApplicationEditor.class, context));
-		registerEditor(ApplicationPackageImpl.Literals.ADDON,
-				ContextInjectionFactory.make(AddonsEditor.class, context));
-
-		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING,
-				ContextInjectionFactory.make(KeyBindingEditor.class, context));
-		registerEditor(CommandsPackageImpl.Literals.HANDLER,
-				ContextInjectionFactory.make(HandlerEditor.class, context));
-		registerEditor(CommandsPackageImpl.Literals.COMMAND,
-				ContextInjectionFactory.make(CommandEditor.class, context));
-		registerEditor(CommandsPackageImpl.Literals.COMMAND_PARAMETER,
-				ContextInjectionFactory.make(CommandParameterEditor.class, context));
-		registerEditor(CommandsPackageImpl.Literals.PARAMETER,
-				ContextInjectionFactory.make(ParameterEditor.class, context));
-		registerEditor(CommandsPackageImpl.Literals.BINDING_TABLE,
-				ContextInjectionFactory.make(BindingTableEditor.class, context));
-		registerEditor(CommandsPackageImpl.Literals.BINDING_CONTEXT,
-				ContextInjectionFactory.make(BindingContextEditor.class, context));
-		registerEditor(CommandsPackageImpl.Literals.CATEGORY,
-				ContextInjectionFactory.make(CategoryEditor.class, context));
-
-		registerEditor(MenuPackageImpl.Literals.TOOL_BAR, ContextInjectionFactory.make(ToolBarEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM,
-				ContextInjectionFactory.make(DirectToolItemEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM,
-				ContextInjectionFactory.make(HandledToolItemEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR,
-				ContextInjectionFactory.make(ToolBarSeparatorEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.TOOL_CONTROL,
-				ContextInjectionFactory.make(ToolControlEditor.class, context));
-
-		registerEditor(MenuPackageImpl.Literals.MENU, ContextInjectionFactory.make(MenuEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.POPUP_MENU,
-				ContextInjectionFactory.make(PopupMenuEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.MENU_SEPARATOR,
-				ContextInjectionFactory.make(MenuSeparatorEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM,
-				ContextInjectionFactory.make(HandledMenuItemEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM,
-				ContextInjectionFactory.make(DirectMenuItemEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION,
-				ContextInjectionFactory.make(MenuContributionEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION,
-				ContextInjectionFactory.make(ToolBarContributionEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION,
-				ContextInjectionFactory.make(TrimContributionEditor.class, context));
-		registerEditor(MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION,
-				ContextInjectionFactory.make(DynamicMenuContributionEditor.class, context));
-
-		registerEditor(UiPackageImpl.Literals.CORE_EXPRESSION,
-				ContextInjectionFactory.make(CoreExpressionEditor.class, context));
-		registerEditor(UiPackageImpl.Literals.IMPERATIVE_EXPRESSION,
-				ContextInjectionFactory.make(ImperativeExpressionEditor.class, context));
-
-		registerEditor(BasicPackageImpl.Literals.COMPOSITE_PART,
-				ContextInjectionFactory.make(CompositePartEditor.class, context));
-		registerEditor(BasicPackageImpl.Literals.PART, ContextInjectionFactory.make(PartEditor.class, context));
-		registerEditor(BasicPackageImpl.Literals.WINDOW, ContextInjectionFactory.make(WindowEditor.class, context));
-		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW,
-				ContextInjectionFactory.make(TrimmedWindowEditor.class, context));
-		registerEditor(BasicPackageImpl.Literals.PART_SASH_CONTAINER,
-				ContextInjectionFactory.make(PartSashContainerEditor.class, context));
-		registerEditor(AdvancedPackageImpl.Literals.AREA, ContextInjectionFactory.make(AreaEditor.class, context));
-		registerEditor(BasicPackageImpl.Literals.PART_STACK,
-				ContextInjectionFactory.make(PartStackEditor.class, context));
-		registerEditor(BasicPackageImpl.Literals.TRIM_BAR, ContextInjectionFactory.make(TrimBarEditor.class, context));
-		registerEditor(BasicPackageImpl.Literals.DIALOG, ContextInjectionFactory.make(DialogEditor.class, context));
-		registerEditor(BasicPackageImpl.Literals.WIZARD_DIALOG,
-				ContextInjectionFactory.make(WizardDialogEditor.class, context));
+
+		registerEditor(ApplicationPackageImpl.Literals.APPLICATION, ApplicationEditor.class);
+		registerEditor(ApplicationPackageImpl.Literals.ADDON, AddonsEditor.class);
+
+		registerEditor(CommandsPackageImpl.Literals.KEY_BINDING, KeyBindingEditor.class);
+		registerEditor(CommandsPackageImpl.Literals.HANDLER, HandlerEditor.class);
+		registerEditor(CommandsPackageImpl.Literals.COMMAND, CommandEditor.class);
+		registerEditor(CommandsPackageImpl.Literals.COMMAND_PARAMETER, CommandParameterEditor.class);
+		registerEditor(CommandsPackageImpl.Literals.PARAMETER, ParameterEditor.class);
+		registerEditor(CommandsPackageImpl.Literals.BINDING_TABLE, BindingTableEditor.class);
+		registerEditor(CommandsPackageImpl.Literals.BINDING_CONTEXT, BindingContextEditor.class);
+		registerEditor(CommandsPackageImpl.Literals.CATEGORY, CategoryEditor.class);
+
+		registerEditor(MenuPackageImpl.Literals.TOOL_BAR, ToolBarEditor.class);
+		registerEditor(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM, DirectToolItemEditor.class);
+		registerEditor(MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, HandledToolItemEditor.class);
+		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_SEPARATOR, ToolBarSeparatorEditor.class);
+		registerEditor(MenuPackageImpl.Literals.TOOL_CONTROL, ToolControlEditor.class);
+		registerEditor(MenuPackageImpl.Literals.MENU, MenuEditor.class);
+		registerEditor(MenuPackageImpl.Literals.POPUP_MENU, PopupMenuEditor.class);
+		registerEditor(MenuPackageImpl.Literals.MENU_SEPARATOR, MenuSeparatorEditor.class);
+		registerEditor(MenuPackageImpl.Literals.HANDLED_MENU_ITEM, HandledMenuItemEditor.class);
+		registerEditor(MenuPackageImpl.Literals.DIRECT_MENU_ITEM, DirectMenuItemEditor.class);
+		registerEditor(MenuPackageImpl.Literals.MENU_CONTRIBUTION, MenuContributionEditor.class);
+		registerEditor(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION, ToolBarContributionEditor.class);
+		registerEditor(MenuPackageImpl.Literals.TRIM_CONTRIBUTION, TrimContributionEditor.class);
+		registerEditor(MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, DynamicMenuContributionEditor.class);
+
+		registerEditor(UiPackageImpl.Literals.CORE_EXPRESSION, CoreExpressionEditor.class);
+		registerEditor(UiPackageImpl.Literals.IMPERATIVE_EXPRESSION, ImperativeExpressionEditor.class);
+
+		registerEditor(BasicPackageImpl.Literals.COMPOSITE_PART, CompositePartEditor.class);
+		registerEditor(BasicPackageImpl.Literals.PART, PartEditor.class);
+		registerEditor(BasicPackageImpl.Literals.WINDOW, WindowEditor.class);
+		registerEditor(BasicPackageImpl.Literals.TRIMMED_WINDOW, TrimmedWindowEditor.class);
+		registerEditor(BasicPackageImpl.Literals.PART_SASH_CONTAINER, PartSashContainerEditor.class);
+		registerEditor(AdvancedPackageImpl.Literals.AREA, AreaEditor.class);
+		registerEditor(BasicPackageImpl.Literals.PART_STACK, PartStackEditor.class);
+		registerEditor(BasicPackageImpl.Literals.TRIM_BAR, TrimBarEditor.class);
 
 		registerEditor(
 				org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR,
-				ContextInjectionFactory.make(PartDescriptorEditor.class, context));
-
-		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
-				ContextInjectionFactory.make(PerspectiveStackEditor.class, context));
-		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE,
-				ContextInjectionFactory.make(PerspectiveEditor.class, context));
-		registerEditor(AdvancedPackageImpl.Literals.PLACEHOLDER,
-				ContextInjectionFactory.make(PlaceholderEditor.class, context));
-
-		registerEditor(FragmentPackageImpl.Literals.MODEL_FRAGMENTS,
-				ContextInjectionFactory.make(ModelFragmentsEditor.class, context));
-		registerEditor(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT,
-				ContextInjectionFactory.make(StringModelFragment.class, context));
+				PartDescriptorEditor.class);
+
+		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, PerspectiveStackEditor.class);
+		registerEditor(AdvancedPackageImpl.Literals.PERSPECTIVE, PerspectiveEditor.class);
+		registerEditor(AdvancedPackageImpl.Literals.PLACEHOLDER, PlaceholderEditor.class);
+
+		registerEditor(FragmentPackageImpl.Literals.MODEL_FRAGMENTS, ModelFragmentsEditor.class);
+		registerEditor(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT, StringModelFragment.class);
 	}
 
 	public void tab_list_show(Boolean show) {
@@ -1415,6 +1374,10 @@ public void setNotVisibleRenderedColor(
 		}
 	}
 
+	private void registerEditor(EClass eClass, Class<? extends AbstractComponentEditor> clazz) {
+		registerEditor(eClass, ContextInjectionFactory.make(clazz, context));
+	}
+
 	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
 		editorMap.put(eClass, editor);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java
deleted file mode 100644
index e40c09fae5..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DialogEditor.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.ui.model.application.ui.basic.MDialog;
-import org.eclipse.jface.action.Action;
-import org.eclipse.swt.graphics.Image;
-
-public class DialogEditor extends WindowEditor {
-
-	@Override
-	public Image getImage(Object element) {
-		return getImage(element, ResourceProvider.IMG_Dialog);
-	}
-
-	@Override
-	public String getLabel(Object element) {
-		return Messages.DialogEditor_Label;
-	}
-
-	@Override
-	public List<Action> getActions(Object element) {
-		final List<Action> actions = new ArrayList<>();
-
-		final MDialog dialog = (MDialog) element;
-		if (dialog.getMainMenu() == null) {
-			actions.add(getActionAddMainMenu());
-		}
-
-		return actions;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 3f8a3bfdcb..81606a2e04 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -15,6 +15,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -671,7 +672,7 @@ public static List<FeatureClass> getTargetChildrenClasses(EClass targetClass, St
 			result = new ArrayList<>();
 			for (final InternalPackage p : Util.loadPackages()) {
 				for (EClass c : p.getAllClasses()) {
-					if (childClass.isSuperTypeOf(c)) {
+					if (childClass.isSuperTypeOf(c) && isRelevant(c.getName())) {
 						result.add(new FeatureClass(c.getName(), c));
 					}
 				}
@@ -681,4 +682,17 @@ public static List<FeatureClass> getTargetChildrenClasses(EClass targetClass, St
 		return result;
 	}
 
+	// Fix bug 531054 -> This code could be removed when Dialog and WizardDialog
+	// will disappear from model !
+	static private final List<String> excludeNames = Arrays.asList("Dialog", "WizardDialog");
+
+	// Fix bug 531054 -> This code could be removed when DIalog and WizardDialog
+	// will be definitively removed from code (after 2020).
+	private static boolean isRelevant(String className)
+	{
+		// System.out.println("Checking if " + className + " should be kept : " +
+		// !excludeNames.contains(className));
+		return !excludeNames.contains(className);
+	}
+
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java
deleted file mode 100644
index 60fd72755a..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WizardDialogEditor.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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:
- * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.ui.model.application.ui.basic.MWizardDialog;
-import org.eclipse.jface.action.Action;
-import org.eclipse.swt.graphics.Image;
-
-public class WizardDialogEditor extends WindowEditor {
-
-	@Override
-	public Image getImage(Object element) {
-		return getImage(element, ResourceProvider.IMG_WizardDialog);
-	}
-
-	@Override
-	public String getLabel(Object element) {
-		return Messages.WizardDialogEditor_Label;
-	}
-
-	@Override
-	public List<Action> getActions(Object element) {
-		final List<Action> actions = new ArrayList<>();
-
-		final MWizardDialog dialog = (MWizardDialog) element;
-		if (dialog.getMainMenu() == null) {
-			actions.add(getActionAddMainMenu());
-		}
-
-		return actions;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index 7d17f58673..2768b5139b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -61,12 +61,6 @@ public void run() {
 			}
 		});
 
-		actions.add(new Action(Messages.VWindowEditor_AddDialog, createImageDescriptor(ResourceProvider.IMG_Dialog)) {
-			@Override
-			public void run() {
-				handleAdd(BasicPackageImpl.Literals.DIALOG);
-			}
-		});
 
 		actions
 		.add(new Action(Messages.VWindowControlEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
@@ -135,13 +129,6 @@ public void run() {
 				handleAdd(BasicPackageImpl.Literals.TRIM_BAR);
 			}
 		});
-		actions.add(new Action(Messages.VWindowEditor_AddWizardDialog,
-				createImageDescriptor(ResourceProvider.IMG_WizardDialog)) {
-			@Override
-			public void run() {
-				handleAdd(BasicPackageImpl.Literals.WIZARD_DIALOG);
-			}
-		});
 
 		Collections.sort(actions, (o1, o2) -> o1.getText().compareTo(o2.getText()));
 
@@ -203,7 +190,7 @@ protected List<?> getContainerChildren(Object container) {
 				AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, AdvancedPackageImpl.Literals.PERSPECTIVE,
 				AdvancedPackageImpl.Literals.AREA, BasicPackageImpl.Literals.PART_SASH_CONTAINER,
 				BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART,
-				BasicPackageImpl.Literals.TRIM_BAR, BasicPackageImpl.Literals.TRIM_ELEMENT, });
+				BasicPackageImpl.Literals.TRIM_BAR });
 		pickList.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE));
 
 		folder.setSelection(0);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index bb2a74125b..e05a1ab99e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -57,12 +57,6 @@ public VWindowEditor(EStructuralFeature targetFeature) {
 
 	@PostConstruct
 	void init() {
-		actions.add(new Action(Messages.VWindowEditor_AddDialog, createImageDescriptor(ResourceProvider.IMG_Dialog)) {
-			@Override
-			public void run() {
-				handleAdd(BasicPackageImpl.Literals.DIALOG);
-			}
-		});
 		actions.add(new Action(Messages.VWindowEditor_AddTrimmedWindow, createImageDescriptor(ResourceProvider.IMG_Window)) {
 			@Override
 			public void run() {
@@ -75,12 +69,6 @@ public void run() {
 				handleAdd(BasicPackageImpl.Literals.WINDOW);
 			}
 		});
-		actions.add(new Action(Messages.VWindowEditor_AddWizardDialog, createImageDescriptor(ResourceProvider.IMG_WizardDialog)) {
-			@Override
-			public void run() {
-				handleAdd(BasicPackageImpl.Literals.WIZARD_DIALOG);
-			}
-		});
 	}
 
 	@Override
@@ -135,30 +123,9 @@ protected List<?> getContainerChildren(Object container) {
 		viewer = pickList.getList();
 
 		pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
-		pickList.setInput(new EClass[] { BasicPackageImpl.Literals.DIALOG, BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW, BasicPackageImpl.Literals.WIZARD_DIALOG });
+		pickList.setInput(new EClass[] { BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW });
 		pickList.setSelection(new StructuredSelection(BasicPackageImpl.Literals.TRIMMED_WINDOW));
 
-		// @SuppressWarnings("unchecked")
-		// @Override
-		// public void widgetSelected(SelectionEvent e) {
-		// if (!viewer.getSelection().isEmpty()) {
-		// IStructuredSelection s = (IStructuredSelection)
-		// viewer.getSelection();
-		// if (s.size() == 1) {
-		// Object obj = s.getFirstElement();
-		// EObject container = (EObject) getMaster().getValue();
-		// List<Object> l = (List<Object>) container.eGet(targetFeature);
-		// int idx = l.indexOf(obj) - 1;
-		// if (idx >= 0) {
-		// if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj,
-		// getEditor().isLiveModel(), idx, targetFeature)) {
-		// viewer.setSelection(new StructuredSelection(obj));
-		// }
-		// }
-		//
-		// }
-		// }
-
 		folder.setSelection(0);
 
 		return folder;

From fc14d137d950642143f8157b5105ec481321754d Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Thu, 15 Feb 2018 08:18:55 +0200
Subject: [PATCH 1015/1286] Bug 509868 - Mark MInput and MInputPart for
 deletion

Remove unused private method that generates warning in nightly build.

Change-Id: If2805feb73417f013f0fc21e8acb1c0adecd68a3
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../emf/ui/internal/imp/RegistryUtil.java     | 36 +++----------------
 1 file changed, 5 insertions(+), 31 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
index 7cf643e11f..332a777306 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013 Remain BV, Industrial-TSI BV and others.
+ * Copyright (c) 2013, 2018 Remain BV, Industrial-TSI BV and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -73,7 +73,7 @@ public class RegistryUtil {
 	 * @param elements
 	 */
 	public static MApplicationElement[] getModelElements(Class<? extends MApplicationElement> t, String hint,
-		MApplication application, IConfigurationElement... elements) {
+			MApplication application, IConfigurationElement... elements) {
 
 		Assert.isNotNull(t);
 		Assert.isNotNull(elements);
@@ -226,38 +226,12 @@ private static MPartDescriptor[] getPartDescriptorsAsCompatibilyViews(IConfigura
 		return result.toArray(new MPartDescriptor[0]);
 	}
 
-	private static MPart[] getEditors(IConfigurationElement[] elements) {
-
-		final ArrayList<MPart> result = new ArrayList<>();
-		for (final IConfigurationElement element : elements) {
-			if ("editor".equals(element.getName())) /* Sanity Check */{ //$NON-NLS-1$
-				final MPart part = (MPart) EcoreUtil.create(BasicPackageImpl.Literals.PART);
-				part.setElementId(element.getAttribute("id")); //$NON-NLS-1$
-				part.setLabel(element.getAttribute("name")); //$NON-NLS-1$
-				part.setIconURI(getIconURI(element, "icon")); //$NON-NLS-1$
-				if (element.getAttribute("class") != null) { //$NON-NLS-1$
-					part.setContributionURI(getContributionURI(element, "class")); //$NON-NLS-1$
-				} else {
-					part.setContributionURI(getContributionURI(element, "launcher")); //$NON-NLS-1$
-				}
-				part.setToBeRendered(true);
-				part.setVisible(true);
-				part.setToolbar(createToolBar(part));
-				part.getMenus().add(createViewMenu(part));
-				part.setCloseable(true);
-				result.add(part);
-			}
-		}
-
-		return result.toArray(new MPart[0]);
-	}
-
 	private static MPartDescriptor[] getEditorPartDescriptors(IConfigurationElement[] elements) {
 
 		final ArrayList<MPartDescriptor> result = new ArrayList<>();
 		for (final IConfigurationElement element : elements) {
 			final MPartDescriptor part = (MPartDescriptor) EcoreUtil
-				.create(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR);
+					.create(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR);
 			part.setElementId(element.getAttribute(ID));
 			part.setLabel(element.getAttribute(NAME));
 			part.setIconURI(getIconURI(element, ICON));
@@ -290,7 +264,7 @@ private static MPartDescriptor[] getViewPartDescriptors(IConfigurationElement[]
 		final ArrayList<MPartDescriptor> result = new ArrayList<>();
 		for (final IConfigurationElement element : elements) {
 			final MPartDescriptor part = (MPartDescriptor) EcoreUtil
-				.create(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR);
+					.create(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR);
 			part.setElementId(element.getAttribute(ID));
 			part.setLabel(element.getAttribute(NAME));
 			part.setIconURI(getIconURI(element, ICON));
@@ -391,7 +365,7 @@ public static String[] getProvidingBundles(IExtensionRegistry registry, String e
 	 *         passed criteria.
 	 */
 	public static IConfigurationElement[] getExtensions(IExtensionRegistry registry, RegistryStruct struct,
-		boolean isLive) {
+			boolean isLive) {
 
 		final IExtensionLookup service = getService(IExtensionLookup.class, null);
 		if (struct == null || service == null) {

From 75124f32612ae2a703dca29c6a78da0be177a7d4 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Thu, 15 Feb 2018 13:39:30 +0100
Subject: [PATCH 1016/1286] Bug 412567 - [Model Editor] unable to unset
 classuri to NULL

Final cleanup !

Change-Id: I807f4c551f9af595987276cb7f52bead52aa50a8
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../ui/common/ContributionURIValidator.java   |  12 +-
 .../common/component/AddonsEditor.java        |  70 +--------
 .../common/component/ControlFactory.java      | 139 +++++++++++++++---
 .../component/DirectMenuItemEditor.java       |  72 +--------
 .../component/DirectToolItemEditor.java       |  71 +--------
 .../DynamicMenuContributionEditor.java        |  72 +--------
 .../common/component/HandlerEditor.java       |  55 +------
 .../component/ImperativeExpressionEditor.java |  91 +-----------
 .../common/component/MenuItemEditor.java      |   4 +-
 .../component/PartDescriptorEditor.java       |  76 +++-------
 .../internal/common/component/PartEditor.java |  68 +--------
 .../common/component/ToolItemEditor.java      |   4 +-
 12 files changed, 190 insertions(+), 544 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
index 449f39a997..ed964ee016 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *      Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 412567
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.common;
 
@@ -20,13 +21,16 @@ public class ContributionURIValidator implements IValidator {
 
 	@Override
 	public IStatus validate(Object value) {
-		if (value == null) {
-			return new Status(IStatus.ERROR, Plugin.ID, Messages.ContributionURIValidator_No_Empty_URI);
-		} else if (!value.toString().startsWith("bundleclass:")) { //$NON-NLS-1$
+		String valStr = (value == null) ? null : value.toString();
+
+		if ((valStr == null) || (valStr.length() == 0)) {
+			return new Status(IStatus.WARNING, Plugin.ID, Messages.ContributionURIValidator_No_Empty_URI);
+		} else if (!valStr.startsWith("bundleclass:")) { //$NON-NLS-1$
+
 			return new Status(IStatus.ERROR, Plugin.ID, Messages.ContributionURIValidator_URI_starts_with_platform);
 		} else {
 			try {
-				URI uri = URI.createURI(value.toString());
+				URI uri = URI.createURI(valStr);
 				if (uri.authority() == null || uri.authority().length() == 0 || uri.segmentCount() != 1) {
 					return new Status(IStatus.ERROR, Plugin.ID, Messages.ContributionURIValidator_Malformed_URI);
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 340a9feb63..63908908fb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -9,25 +9,20 @@
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  * Steven Spungin <steven@spungin.tv> - Bug 424730
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 412567
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
 
-import org.eclipse.core.databinding.Binding;
-import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
-import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
 import org.eclipse.e4.ui.model.application.MAddon;
 import org.eclipse.e4.ui.model.application.MContribution;
@@ -43,17 +38,11 @@
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.Text;
 
 public class AddonsEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -127,6 +116,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
+		context.updateModels();
 		return composite;
 	}
 
@@ -155,58 +145,12 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
 				EMFEditProperties
 				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		final Link lnk;
-		// ------------------------------------------------------------
-		{
-			final IContributionClassCreator c = getEditor().getContributionCreator(
-					ApplicationPackageImpl.Literals.ADDON);
-			if (project != null && c != null) {
-				lnk = new Link(parent, SWT.NONE);
-				lnk.setText("<A>" + Messages.PartEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
-				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-				lnk.addSelectionListener(new SelectionAdapter() {
-					@Override
-					public void widgetSelected(SelectionEvent e) {
-						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project,
-								lnk.getShell());
-					}
-				});
-			} else {
-				lnk = null;
-				final Label l = new Label(parent, SWT.NONE);
-				l.setText(Messages.AddonsEditor_ClassURI);
-				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			}
 
-			final Text t = new Text(parent, SWT.BORDER);
-			TextPasteHandler.createFor(t);
-			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			t.addModifyListener(e -> {
-				if (lnk != null) {
-					lnk.setToolTipText(((Text) e.getSource()).getText());
-				}
-			});
-			final Binding binding = context.bindValue(
-					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(),
-							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()),
-					new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
-					new UpdateValueStrategy());
-			Util.addDecoration(t, binding);
-
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
-							getEditingDomain(), (MContribution) getMaster().getValue(),
-							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
-					dialog.open();
-				}
-			});
-		}
+
+		ControlFactory.createClassURIField(parent, Messages, this, Messages.AddonsEditor_ClassURI,
+				ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
+				getEditor().getContributionCreator(ApplicationPackageImpl.Literals.ADDON), project, context,
+				eclipseContext);
 
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 828ccb0ff6..1ea6d171c0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -10,6 +10,7 @@
  * Dirk Fauth <dirk.fauth@googlemail.com> - Bug 426986
  * Steven Spungin <steven@spungin.tv> - Bug 430660, 430664, Bug 430809, 430717
  * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 412567
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -26,6 +27,9 @@
 import org.eclipse.core.databinding.validation.ValidationStatus;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
+import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -34,6 +38,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4StringPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BindingContextSelectionDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindImportElementDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.properties.ProjectOSGiTranslationProvider;
 import org.eclipse.e4.tools.services.IClipboardService.Handler;
@@ -41,6 +46,7 @@
 import org.eclipse.e4.ui.dialogs.filteredtree.PatternFilter;
 import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationFactoryImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -54,6 +60,7 @@
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
+import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -94,8 +101,18 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
+/**
+ * This class creates different widgets in editors...
+ *
+ * As all these widgets are common to a lot of editors. So this class could be
+ * moved in AbstractComponentEditor and the code would be really simplified
+ * because all parameters in static functions are already defined in
+ * AbstractComponentEditor
+ *
+ */
 public class ControlFactory {
 	public static final String COPY_HANDLER = ControlFactory.class.getName() + ".COPY_HANDLER"; //$NON-NLS-1$
 
@@ -627,30 +644,6 @@ public void keyPressed(KeyEvent e) {
 			t.setText(strSelected != null ? strSelected : ""); //$NON-NLS-1$
 		});
 
-		//
-		// final Button btnDelete = new Button(compButton, SWT.PUSH | SWT.FLAT);
-		// btnDelete.setText(Messages.ModelTooling_Common_Remove);
-		// btnDelete.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_delete));
-		// btnDelete.setLayoutData(new GridData(GridData.FILL, GridData.CENTER,
-		// true, false));
-		// btnDelete.addSelectionListener(new SelectionAdapter() {
-		// @Override
-		// public void widgetSelected(SelectionEvent e) {
-		// if (!viewer.getSelection().isEmpty()) {
-		// EObject el = (EObject) editor.getMaster().getValue();
-		// List<?> ids = ((IStructuredSelection)
-		// viewer.getSelection()).toList();
-		// Command cmd = RemoveCommand.create(editor.getEditingDomain(), el,
-		// feature, ids);
-		// if (cmd.canExecute()) {
-		// editor.getEditingDomain().getCommandStack().execute(cmd);
-		// if (ids.size() > 0) {
-		// viewer.setSelection(new StructuredSelection(ids.get(0)));
-		// }
-		// }
-		// }
-		// }
-		// });
 
 		return pickList;
 	}
@@ -770,4 +763,102 @@ public static void attachFiltering(Text searchText, final TableViewer viewer, fi
 			}
 		});
 	}
+
+	/**
+	 * This method create a ClassURI field containing : a link to the class, a text
+	 * field (to set the value bundleclass://....) and a button find to find the
+	 * object. It must be called by all editors that need to get a class URI It adds
+	 * a validator to check if the value exists (OK), or if it is null or empty
+	 * (WARNING), or if the class does not exists (ERROR)
+	 *
+	 * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id= 412567">Bug
+	 *      412567 </a> *
+	 * @param parent
+	 *            the parent composite
+	 * @param Messages
+	 *            The messages container class
+	 * @param editor
+	 *            the current abstractComponentEditor containing a classURI field
+	 * @param title
+	 *            the title of the field
+	 * @param feature
+	 *            the associated Feature in the model
+	 * @param c
+	 *            the Contribution Class creator to use to create the URI class
+	 * @param project
+	 *            current project where application model stands
+	 * @param context
+	 *            the EMFBinding context
+	 * @param eclipseContext
+	 *            the Eclipse context
+	 * @param adapter
+	 *            the selection adapter to use. For objects extending MContribution
+	 *            there is a default adapter. But for MPartDescriptors, which is not
+	 *            a MContribution, a specific adapter must be set (@see
+	 *            MPartDescriptorEditor)
+	 */
+	public static void createClassURIField(Composite parent, final Messages Messages,
+			final AbstractComponentEditor editor, String title, final EAttribute feature, IContributionClassCreator c,
+			IProject project,
+			EMFDataBindingContext context, IEclipseContext eclipseContext, SelectionAdapter adapter) {
+		final Link lnk;
+		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+
+		if (project != null && c != null) {
+			lnk = new Link(parent, SWT.NONE);
+			lnk.setText("<A>" + title + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
+			lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			lnk.addSelectionListener(adapter);
+		} else {
+			lnk = null;
+			final Label l = new Label(parent, SWT.NONE);
+			l.setText(title);
+			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+		}
+
+		final Text t = new Text(parent, SWT.BORDER);
+		TextPasteHandler.createFor(t);
+		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		t.addModifyListener(e -> {
+			if (lnk != null) {
+				lnk.setToolTipText(((Text) e.getSource()).getText());
+			}
+		});
+		final Binding binding = context.bindValue(textProp.observeDelayed(200, t),
+				EMFEditProperties
+				.value(editor.getEditingDomain(), feature)
+				.observeDetail(editor.getMaster()),
+				new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
+				new UpdateValueStrategy());
+		Util.addDecoration(t, binding);
+
+		final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_zoom));
+		b.setText(Messages.ModelTooling_Common_FindEllipsis);
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
+						editor.getEditingDomain(), (MContribution) editor.getMaster().getValue(),
+						feature, Messages);
+				dialog.open();
+			}
+		});
+	}
+
+	public static void createClassURIField(Composite parent, final Messages Messages,
+			final AbstractComponentEditor editor, String title, final EAttribute feature, IContributionClassCreator c,
+			IProject project, EMFDataBindingContext context, IEclipseContext eclipseContext) {
+		createClassURIField(parent, Messages, editor, title, feature, c, project, context, eclipseContext,
+				new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				c.createOpen((MContribution) editor.getMaster().getValue(), editor.getEditingDomain(), project,
+						parent.getShell());
+			}
+		});
+
+	}
+
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index b3165b3a0f..2624b903fe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -8,25 +8,18 @@
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Steven Spungin <steven@spungin.tv> - Bug 424730
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 412567
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
 
-import org.eclipse.core.databinding.Binding;
-import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
-import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
-import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
-import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MDirectMenuItem;
@@ -34,23 +27,16 @@
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFValueProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.Text;
 
 public class DirectMenuItemEditor extends MenuItemEditor {
 	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
@@ -108,59 +94,11 @@ public String getDescription(Object element) {
 	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
 		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
-		// ------------------------------------------------------------
-		final Link lnk;
-		{
-			final IContributionClassCreator c = getEditor().getContributionCreator(
-					MenuPackageImpl.Literals.DIRECT_MENU_ITEM);
-			if (project != null && c != null) {
-				lnk = new Link(parent, SWT.NONE);
-				lnk.setText("<A>" + Messages.DirectMenuItemEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
-				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-				lnk.addSelectionListener(new SelectionAdapter() {
-					@Override
-					public void widgetSelected(SelectionEvent e) {
-						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project,
-								lnk.getShell());
-					}
-				});
-			} else {
-				lnk = null;
-				final Label l = new Label(parent, SWT.NONE);
-				l.setText(Messages.DirectMenuItemEditor_ClassURI);
-				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			}
+		ControlFactory.createClassURIField(parent, Messages, this, Messages.DirectMenuItemEditor_ClassURI,
+				ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
+				getEditor().getContributionCreator(MenuPackageImpl.Literals.DIRECT_MENU_ITEM), project, context,
+				eclipseContext);
 
-			final Text t = new Text(parent, SWT.BORDER);
-			TextPasteHandler.createFor(t);
-			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			t.addModifyListener(e -> {
-				if (lnk != null) {
-					lnk.setToolTipText(((Text) e.getSource()).getText());
-				}
-			});
-			final Binding binding = context.bindValue(
-					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(),
-							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master),
-					new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
-					new UpdateValueStrategy());
-			Util.addDecoration(t, binding);
-
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
-							getEditingDomain(), (MContribution) getMaster().getValue(),
-							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
-					dialog.open();
-				}
-			});
-		}
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index c75662529c..f3bf022a18 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -8,24 +8,17 @@
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Steven Spungin <steven@spungin.tv> - Bug 424730
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 412567
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
 
-import org.eclipse.core.databinding.Binding;
-import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
-import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
-import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
-import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MDirectToolItem;
@@ -33,23 +26,14 @@
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFValueProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.Text;
 
 public class DirectToolItemEditor extends ToolItemEditor {
 	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
@@ -70,55 +54,12 @@ public Image getImage(Object element) {
 
 	@Override
 	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-
-		final IContributionClassCreator c = getEditor().getContributionCreator(
-				MenuPackageImpl.Literals.DIRECT_TOOL_ITEM);
-		final Link lnk;
-		if (project != null && c != null) {
-			lnk = new Link(parent, SWT.NONE);
-			lnk.setText("<A>" + Messages.DirectMenuItemEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
-			lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			lnk.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, lnk.getShell());
-				}
-			});
-		} else {
-			lnk = null;
-			final Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.DirectToolItemEditor_ClassURI);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-		}
 
-		final Text t = new Text(parent, SWT.BORDER);
-		TextPasteHandler.createFor(t);
-		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		t.addModifyListener(e -> {
-			if (lnk != null) {
-				lnk.setToolTipText(((Text) e.getSource()).getText());
-			}
-		});
-		final Binding binding = context.bindValue(textProp.observeDelayed(200, t),
-				EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI)
-				.observeDetail(master), new UpdateValueStrategy()
-				.setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
-		Util.addDecoration(t, binding);
-
-		final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_FindEllipsis);
-		b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-		b.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
-						getEditingDomain(), (MContribution) getMaster().getValue(),
-						ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
-				dialog.open();
-			}
-		});
+		ControlFactory.createClassURIField(parent, Messages, this, Messages.DirectMenuItemEditor_ClassURI,
+				ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
+				getEditor().getContributionCreator(MenuPackageImpl.Literals.DIRECT_TOOL_ITEM), project, context,
+				eclipseContext);
+
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
index 73183d4d12..be0e4f9560 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
@@ -9,26 +9,20 @@
  * Marco Descher <marco@descher.at> - initial API and implementation
  * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  * Steven Spungin <steven@spungin.tv> - Bug 424730
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 412567
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
 
-import org.eclipse.core.databinding.Binding;
-import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
-import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
-import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -43,16 +37,9 @@
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.Text;
 
 public class DynamicMenuContributionEditor extends AbstractComponentEditor {
 
@@ -122,6 +109,8 @@ protected Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
+		context.updateModels();
+
 		return composite;
 	}
 
@@ -155,58 +144,11 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
 
 		// ------------------------------------------------------------
-		final Link lnk;
-		{
-			final IContributionClassCreator c = getEditor().getContributionCreator(
-					MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION);
-			if (project != null && c != null) {
-				lnk = new Link(parent, SWT.NONE);
-				lnk.setText("<A>" + Messages.DynamicMenuContributionEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
-				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-				lnk.addSelectionListener(new SelectionAdapter() {
-					@Override
-					public void widgetSelected(SelectionEvent e) {
-						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project,
-								lnk.getShell());
-					}
-				});
-			} else {
-				lnk = null;
-				final Label l = new Label(parent, SWT.NONE);
-				l.setText(Messages.DynamicMenuContributionEditor_ClassURI);
-				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			}
+		ControlFactory.createClassURIField(parent, Messages, this, Messages.DynamicMenuContributionEditor_ClassURI,
+				ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
+				getEditor().getContributionCreator(MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION), project,
+				context, eclipseContext);
 
-			final Text t = new Text(parent, SWT.BORDER);
-			TextPasteHandler.createFor(t);
-			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			t.addModifyListener(e -> {
-				if (lnk != null) {
-					lnk.setToolTipText(((Text) e.getSource()).getText());
-				}
-			});
-			final Binding binding = context.bindValue(
-					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(),
-							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()),
-					new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
-					new UpdateValueStrategy());
-			Util.addDecoration(t, binding);
-
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
-							getEditingDomain(), (MContribution) getMaster().getValue(),
-							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
-					dialog.open();
-				}
-			});
-		}
 
 		createContributedEditorTabs(folder, context, getMaster(), MDynamicMenuContribution.class);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index b0b2a74787..c75e11f8f9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -9,12 +9,12 @@
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  *     Steven Spungin <steven@spungin.tv> - Bug 424730
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 412567
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
 
-import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -22,17 +22,13 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
-import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
-import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandlerCommandSelectionDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
-import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.MHandler;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -56,7 +52,6 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
 public class HandlerEditor extends AbstractComponentEditor {
@@ -124,6 +119,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
+		context.updateModels();
 		return composite;
 	}
 
@@ -175,50 +171,11 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		// ------------------------------------------------------------
-		final Link lnk;
-		{
-			final IContributionClassCreator c = getEditor().getContributionCreator(CommandsPackageImpl.Literals.HANDLER);
-			if (project != null && c != null) {
-				lnk = new Link(parent, SWT.NONE);
-				lnk.setText("<A>" + Messages.HandlerEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
-				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-				lnk.addSelectionListener(new SelectionAdapter() {
-					@Override
-					public void widgetSelected(SelectionEvent e) {
-						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project, lnk.getShell());
-					}
-				});
-			} else {
-				lnk = null;
-				final Label l = new Label(parent, SWT.NONE);
-				l.setText(Messages.HandlerEditor_ClassURI);
-				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			}
+		ControlFactory.createClassURIField(parent, Messages, this, Messages.HandlerEditor_ClassURI,
+				ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
+				getEditor().getContributionCreator(CommandsPackageImpl.Literals.HANDLER), project, context,
+				eclipseContext);
 
-			final Text t = new Text(parent, SWT.BORDER);
-			TextPasteHandler.createFor(t);
-			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			t.addModifyListener(e -> {
-				if (lnk != null) {
-					lnk.setToolTipText(((Text) e.getSource()).getText());
-				}
-			});
-			final Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(getMaster()), new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()), new UpdateValueStrategy());
-			Util.addDecoration(t, binding);
-
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
-					dialog.open();
-				}
-			});
-		}
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
 		item = new CTabItem(folder, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
index d3e2130774..18d5f6a675 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
@@ -7,45 +7,27 @@
  *
  * Contributors:
  * Simon Scholz <simon.scholz@vogella.com> - initial API and implementation
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 412567
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
 
-import org.eclipse.core.databinding.Binding;
-import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
-import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
-import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
-import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MImperativeExpression;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.jface.databinding.swt.ISWTObservableValue;
-import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.Text;
 
 public class ImperativeExpressionEditor extends AbstractComponentEditor {
 	private Composite composite;
@@ -96,6 +78,8 @@ public Composite doGetEditor(Composite parent, Object object) {
 			createForm(composite, context, getMaster());
 		}
 		getMaster().setValue(object);
+		context.updateModels();
+
 		return composite;
 	}
 
@@ -112,71 +96,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-
-		final Link lnk;
-		{
-			final IContributionClassCreator c = getEditor()
-					.getContributionCreator(UiPackageImpl.Literals.IMPERATIVE_EXPRESSION);
-			if (project != null && c != null) {
-				lnk = new Link(parent, SWT.NONE);
-				lnk.setText("<A>" + Messages.HandlerEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
-				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-				lnk.addSelectionListener(new SelectionAdapter() {
-					@Override
-					public void widgetSelected(SelectionEvent e) {
-						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project,
-								lnk.getShell());
-					}
-				});
-			} else {
-				lnk = null;
-				final Label l = new Label(parent, SWT.NONE);
-				l.setText(Messages.HandlerEditor_ClassURI);
-				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			}
-
-			final Text t = new Text(parent, SWT.BORDER);
-			TextPasteHandler.createFor(t);
-			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			t.addModifyListener(e -> {
-				if (lnk != null) {
-					lnk.setToolTipText(((Text) e.getSource()).getText());
-				}
-			});
-			final Binding binding = context.bindValue(textProp.observeDelayed(200, t),
-					EMFEditProperties
-					.value(getEditingDomain(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI)
-					.observeDetail(getMaster()),
-					new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
-					new UpdateValueStrategy());
-			Util.addDecoration(t, binding);
-
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
-							getEditingDomain(), (MContribution) getMaster().getValue(),
-							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
-					dialog.open();
-				}
-			});
-
-			final Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.ImperativeExpressionEditor_TrackingLabel);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-			Button trackingButton = new Button(parent, SWT.CHECK);
-			ISWTObservableValue observeTrackingSelection = WidgetProperties.selection().observe(trackingButton);
-			context.bindValue(observeTrackingSelection,
-					EMFEditProperties
-					.value(getEditingDomain(), UiPackageImpl.Literals.IMPERATIVE_EXPRESSION__TRACKING)
-					.observeDetail(getMaster()));
-		}
+		ControlFactory.createClassURIField(parent, Messages, this, Messages.HandlerEditor_ClassURI,
+				ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
+				getEditor().getContributionCreator(UiPackageImpl.Literals.IMPERATIVE_EXPRESSION), project,
+				context, eclipseContext);
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 552705283e..9aede68b46 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -9,7 +9,7 @@
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  * Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
- * Olivier Prouvost <olivier@opcoach.com> - Bug 472658
+ * Olivier Prouvost <olivier@opcoach.com> - Bug 472658, 412567
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -147,6 +147,8 @@ public Composite doGetEditor(Composite parent, Object object) {
 		getMaster().setValue(object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+		context.updateModels();
+
 		return composite;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 144c76c88b..d3bbd103ca 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -8,7 +8,7 @@
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Steven Spungin <steven@spungin.tv> - Bug 404166, 424730, 437951
- * Olivier Prouvost <olivier@opcoach.com> - Bug 472658, 530887
+ * Olivier Prouvost <olivier@opcoach.com> - Bug 472658, 530887, 412567
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -30,7 +30,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartDescriptorIconDialogEditor;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
@@ -64,7 +63,6 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
 public class PartDescriptorEditor extends AbstractComponentEditor {
@@ -143,6 +141,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		getMaster().setValue(object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+		context.updateModels();
 		return composite;
 	}
 
@@ -209,62 +208,23 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		// ------------------------------------------------------------
-		final Link lnk;
-		{
-			/*
-			 * IContributionClassCreator accepts MContribitions but
-			 * MPartDescriptor does not implement, so we need to be a bit
-			 * creative here
-			 */
-			//
-			final IContributionClassCreator c = getEditor().getContributionCreator(
-					org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.PART);
-			if (project != null && c != null) {
-				lnk = new Link(parent, SWT.NONE);
-				lnk.setText("<A>" + Messages.PartEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
-				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-				final IObservableValue masterFinal = master;
-				lnk.addSelectionListener(new SelectionAdapter() {
-					@Override
-					public void widgetSelected(SelectionEvent e) {
-						final MPart dummyPart = MBasicFactory.INSTANCE.createPart();
-						final String contributionURI = ((MPartDescriptor) getMaster().getValue()).getContributionURI();
-						dummyPart.setContributionURI(contributionURI);
-						c.createOpen(dummyPart, getEditingDomain(), project, lnk.getShell());
-						((MPartDescriptor) masterFinal.getValue()).setContributionURI(dummyPart.getContributionURI());
-					}
-				});
-			} else {
-				// Dispose the lnk widget, which is unused in this else branch
-				// and screws up the layout: see https://bugs.eclipse.org/421369
-				lnk = null;
-				final Label l = new Label(parent, SWT.NONE);
-				l.setText(Messages.PartDescriptorEditor_ClassURI);
-				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+		IContributionClassCreator contributionCreator = getEditor().getContributionCreator(
+				org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.PART);
+
+		ControlFactory.createClassURIField(parent, Messages, this, Messages.PartEditor_ClassURI,
+				BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI,
+				contributionCreator,
+				project, context,
+				eclipseContext, new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				final MPart dummyPart = MBasicFactory.INSTANCE.createPart();
+				final String contributionURI = ((MPartDescriptor) getMaster().getValue()).getContributionURI();
+				dummyPart.setContributionURI(contributionURI);
+				contributionCreator.createOpen(dummyPart, getEditingDomain(), project, folder.getShell());
+				((MPartDescriptor) master.getValue()).setContributionURI(dummyPart.getContributionURI());
 			}
-
-			final Text t = new Text(parent, SWT.BORDER);
-			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t),
-					EMFEditProperties
-					.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI)
-					.observeDetail(master));
-			TextPasteHandler.createFor(t);
-
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
-							getEditingDomain(), (MPartDescriptor) getMaster().getValue(),
-							BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI, Messages);
-					dialog.open();
-				}
-			});
-		}
+		});
 
 		// ------------------------------------------------------------
 		{
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index f781e310c3..c42d02660b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -8,14 +8,12 @@
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951, Ongoing Maintenance
- * Olivier Prouvost <olivier@opcoach.com> - Bug 472658
+ * Olivier Prouvost <olivier@opcoach.com> - Bug 472658, 412567
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
 
-import org.eclipse.core.databinding.Binding;
-import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -24,8 +22,6 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
-import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -33,11 +29,9 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
-import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
@@ -69,7 +63,6 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
 public class PartEditor extends AbstractComponentEditor {
@@ -150,6 +143,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		getMaster().setValue(object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+		context.updateModels();
 
 		return composite;
 	}
@@ -218,62 +212,10 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		// ------------------------------------------------------------
-		final Link lnk;
-		{
-			final IContributionClassCreator c = getEditor().getContributionCreator(BasicPackageImpl.Literals.PART);
-			if (project != null && c != null) {
-				lnk = new Link(parent, SWT.NONE);
-				lnk.setText("<A>" + Messages.PartEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
-				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-				lnk.addSelectionListener(new SelectionAdapter() {
-					@Override
-					public void widgetSelected(SelectionEvent e) {
-						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project,
-								lnk.getShell());
-					}
-				});
-			} else {
-				// Dispose the lnk widget, which is unused in this else branch
-				// and screws up the layout: see https://bugs.eclipse.org/421369
-				lnk = null;
-
-				final Label l = new Label(parent, SWT.NONE);
-				l.setText(Messages.PartEditor_ClassURI);
-				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-			}
-
-			final Text t = new Text(parent, SWT.BORDER);
-			TextPasteHandler.createFor(t);
-			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			t.addModifyListener(e -> {
-				// lnk might be disposed if else branch above taken
-				if (lnk != null) {
-					lnk.setToolTipText(((Text) e.getSource()).getText());
-				}
-			});
-			final Binding binding = context.bindValue(
-					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(),
-							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master),
-					new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
-					new UpdateValueStrategy());
-			Util.addDecoration(t, binding);
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
-							getEditingDomain(), (MContribution) getMaster().getValue(),
-							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
-					dialog.open();
-				}
-			});
-		}
+		ControlFactory.createClassURIField(parent, Messages, this, Messages.PartEditor_ClassURI,
+				ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
+				getEditor().getContributionCreator(BasicPackageImpl.Literals.PART), project, context, eclipseContext);
 
 		// ------------------------------------------------------------
 		ControlFactory.createTextField(parent, Messages.PartEditor_ContainerData, master, context, textProp,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 7adfc7558c..e37ecb6b2d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -9,7 +9,7 @@
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *     Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance
  *     Steven Spungin <steven@spungin.tv> - Bug 424730, Bug 437951
- *     Olivier Prouvost <olivier@opcoach.com> - Bug 472658
+ *     Olivier Prouvost <olivier@opcoach.com> - Bug 472658, 412567
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
@@ -129,6 +129,8 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 		getMaster().setValue(object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
+		context.updateModels();
+
 		return composite;
 	}
 

From 581e2450563aa724852bb186c950286dce6e6374 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Thu, 15 Feb 2018 18:35:24 +0100
Subject: [PATCH 1017/1286] Bug 531216 - [Model Editor] Unable to create
 TrimContribution as a child of a Snippet

Change-Id: Iee0e50649fce190653a149319f5b364c7288efdf
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../common/component/virtual/VSnippetsEditor.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index 2768b5139b..ab4356d80c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -21,6 +21,7 @@
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.ecore.EClass;
@@ -105,7 +106,7 @@ public void run() {
 				createImageDescriptor(ResourceProvider.IMG_TrimContribution)) {
 			@Override
 			public void run() {
-				handleAdd(BasicPackageImpl.Literals.TRIM_ELEMENT);
+				handleAdd(MenuPackageImpl.Literals.TRIM_CONTRIBUTION);
 			}
 		});
 
@@ -186,10 +187,11 @@ protected List<?> getContainerChildren(Object container) {
 		viewer = pickList.getList();
 
 		pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
-		pickList.setInput(new EClass[] { BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW,
-				AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, AdvancedPackageImpl.Literals.PERSPECTIVE,
-				AdvancedPackageImpl.Literals.AREA, BasicPackageImpl.Literals.PART_SASH_CONTAINER,
-				BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART,
+		pickList.setInput(new EClass[] { AdvancedPackageImpl.Literals.AREA, BasicPackageImpl.Literals.PART,
+				BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK,
+				AdvancedPackageImpl.Literals.PERSPECTIVE, AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
+				MenuPackageImpl.Literals.TRIM_CONTRIBUTION,
+				BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW,
 				BasicPackageImpl.Literals.TRIM_BAR });
 		pickList.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE));
 

From c0bc92b0cc2fc7285c638f448a1516e56797918d Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Sun, 18 Feb 2018 16:28:02 +0100
Subject: [PATCH 1018/1286] Bug 412567 - [Model Editor] unable to unset
 classuri to NULL

Remove the unexpected warning.

Change-Id: Iada84a072a300e108159e012832845aa38a11210
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../emf/ui/internal/common/component/DirectMenuItemEditor.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 2624b903fe..16938b4c19 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -27,8 +27,6 @@
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.IEMFValueProperty;
-import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -92,7 +90,6 @@ public String getDescription(Object element) {
 
 	@Override
 	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
 
 		ControlFactory.createClassURIField(parent, Messages, this, Messages.DirectMenuItemEditor_ClassURI,
 				ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,

From 73c24cb258d6b868049414f1a68f3053a51b3d96 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Thu, 15 Feb 2018 19:49:46 +0100
Subject: [PATCH 1019/1286] Bug 531219 - [Model Fragment Editor] Available
 snippets children are different for windows and fragment

Change-Id: I65fc6ec1d27c1d45e4df5c6e33b231f8d3ca5c57
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../common/component/StringModelFragment.java | 62 +++++++++++--------
 .../component/virtual/VSnippetsEditor.java    | 16 +++--
 2 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 81606a2e04..210b71d5e7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -39,6 +39,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FeatureSelectionDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FindParentReferenceElementDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VSnippetsEditor;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationElementImpl;
@@ -645,38 +646,47 @@ public static List<FeatureClass> getTargetChildrenClasses(EClass targetClass, St
 		if (targetClass != null) {
 			// The top level class for children, is the class of the EReference
 			// bound to feature name
-			EReference childRef = null;
 
-			for (EReference ref : targetClass.getEAllReferences()) {
-				if (ref.getName().equals(featurename)) {
-					childRef = ref;
-					break;
+			// We must manage especially snippets (see bug 531219) No other solution ...
+			if ("snippets".equals(featurename)) {
+				result = new ArrayList<>();
+				for (EClass c : VSnippetsEditor.SNIPPET_CHILDREN) {
+					result.add(new FeatureClass(c.getName(), c));
 				}
-			}
-
-			if (childRef == null) {
-				return result;
-			}
+			} else {
+				EReference childRef = null;
 
-			// Get the parent EClass where this childRef is defined...
-			// For instance : for the 'children' reference it will be in
-			// UIElementContainer<T extends UIElement>
-			// We must check if the selectedContainer extends
-			// UIElementContainer<XXX> and in this case childRef is XXX
-			final EClass childClass = (EClass) ModelUtils.getTypeArgument(targetClass,
-					childRef.getEGenericType());
-
-			// Search for descendant of ChildClass -> This result could be
-			// cached for all StringModelFragment editors instances and computed
-			// once...
-			result = new ArrayList<>();
-			for (final InternalPackage p : Util.loadPackages()) {
-				for (EClass c : p.getAllClasses()) {
-					if (childClass.isSuperTypeOf(c) && isRelevant(c.getName())) {
-						result.add(new FeatureClass(c.getName(), c));
+				for (EReference ref : targetClass.getEAllReferences()) {
+					if (ref.getName().equals(featurename)) {
+						childRef = ref;
+						break;
 					}
 				}
 
+				if (childRef == null) {
+					return result;
+				}
+
+				// Get the parent EClass where this childRef is defined...
+				// For instance : for the 'children' reference it will be in
+				// UIElementContainer<T extends UIElement>
+				// We must check if the selectedContainer extends
+				// UIElementContainer<XXX> and in this case childRef is XXX
+				final EClass childClass = (EClass) ModelUtils.getTypeArgument(targetClass,
+						childRef.getEGenericType());
+
+				// Search for descendant of ChildClass -> This result could be
+				// cached for all StringModelFragment editors instances and computed
+				// once...
+				result = new ArrayList<>();
+				for (final InternalPackage p : Util.loadPackages()) {
+					for (EClass c : p.getAllClasses()) {
+						if (childClass.isSuperTypeOf(c) && isRelevant(c.getName())) {
+							result.add(new FeatureClass(c.getName(), c));
+						}
+					}
+
+				}
 			}
 		}
 		return result;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index ab4356d80c..b7291f73a7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -40,6 +40,15 @@
 import org.eclipse.swt.widgets.Composite;
 
 public class VSnippetsEditor extends AbstractComponentEditor {
+
+	/** Define the classes available to create snippets */
+	public static final EClass[] SNIPPET_CHILDREN = new EClass[] { AdvancedPackageImpl.Literals.AREA, BasicPackageImpl.Literals.PART,
+			BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK,
+			AdvancedPackageImpl.Literals.PERSPECTIVE, AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
+			MenuPackageImpl.Literals.TRIM_CONTRIBUTION,
+			BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW,
+			BasicPackageImpl.Literals.TRIM_BAR };
+
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
@@ -187,12 +196,7 @@ protected List<?> getContainerChildren(Object container) {
 		viewer = pickList.getList();
 
 		pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
-		pickList.setInput(new EClass[] { AdvancedPackageImpl.Literals.AREA, BasicPackageImpl.Literals.PART,
-				BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK,
-				AdvancedPackageImpl.Literals.PERSPECTIVE, AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
-				MenuPackageImpl.Literals.TRIM_CONTRIBUTION,
-				BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW,
-				BasicPackageImpl.Literals.TRIM_BAR });
+		pickList.setInput(SNIPPET_CHILDREN);
 		pickList.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE));
 
 		folder.setSelection(0);

From 920c8bd531dfc3ba857116aaf3f50133025b1e45 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Wed, 21 Feb 2018 19:59:13 +0100
Subject: [PATCH 1020/1286] Bug 531479 - [Model Editor] Icon URI tooltip throws
 an exception when value is wrong

Fix if value is wrong or if value contains only spaces !

Change-Id: I63079d99b55b315538196dd26eff3eaa8224805b
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java    | 6 +++++-
 .../emf/ui/common/component/AbstractComponentEditor.java    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
index 6864dd4bc8..b5d8cfbd33 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
@@ -77,7 +77,11 @@ protected Composite createToolTipContentArea(Event event, Composite parent) {
 
 		l = new Label(parent, SWT.NONE);
 		final int pos = imageUri.lastIndexOf('/');
-		l.setText(imageUri.substring(pos));
+		if (pos != -1) {
+			l.setText(imageUri.substring(pos));
+		} else {
+			l.setText(imageUri);
+		}
 
 		// ---------------------------------
 		l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 0da4d6926f..10fb23d897 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -151,7 +151,7 @@ public Image getImageFromIconURI(MUILabel element) {
 		Image img = null;
 		// Returns only an image if there is a non empty Icon URI
 		final String iconUri = element.getIconURI();
-		if (iconUri != null && iconUri.length() > 0) {
+		if (iconUri != null && iconUri.trim().length() > 0) {
 			final boolean greyVersion = shouldBeGrey(element);
 			// Is this image already loaded ?
 			img = getImage(iconUri, greyVersion);

From 4826df0a3dec54bda1e56e2593cc28dc5b505c04 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Thu, 15 Feb 2018 17:13:18 +0100
Subject: [PATCH 1021/1286] Bug 531189 - [Model Editor] Improve initialization
 and component editor management

Forgot constants. Fix comment in javadoc.

Change-Id: I6b60dbb0383908d7eddd8f2647cb496dbdf58a6f
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../emf/ui/internal/common/ModelEditor.java   | 264 +++++++++++-------
 1 file changed, 162 insertions(+), 102 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 36dfee1303..92d1433989 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -241,46 +241,50 @@ public class ModelEditor implements IGotoObject {
 
 	public static final String CSS_CLASS_KEY = "org.eclipse.e4.ui.css.CssClassName"; //$NON-NLS-1$
 
-	public static final String VIRTUAL_PART_MENU = ModelEditor.class.getName() + ".VIRTUAL_PART_MENU"; //$NON-NLS-1$
-	public static final String VIRTUAL_HANDLER = ModelEditor.class.getName() + ".VIRTUAL_HANDLER"; //$NON-NLS-1$
-	public static final String VIRTUAL_BINDING_TABLE = ModelEditor.class.getName() + ".VIRTUAL_BINDING_TABLE"; //$NON-NLS-1$
-	public static final String VIRTUAL_COMMAND = ModelEditor.class.getName() + ".VIRTUAL_COMMAND"; //$NON-NLS-1$
-	public static final String VIRTUAL_APPLICATION_WINDOWS = ModelEditor.class.getName()
-			+ ".VIRTUAL_APPLICATION_WINDOWS"; //$NON-NLS-1$
-	public static final String VIRTUAL_PERSPECTIVE_WINDOWS = ModelEditor.class.getName()
-			+ ".VIRTUAL_PERSPECTIVE_WINDOWS"; //$NON-NLS-1$
-	public static final String VIRTUAL_WINDOW_WINDOWS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_WINDOWS"; //$NON-NLS-1$
-	public static final String VIRTUAL_WINDOW_CONTROLS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_CONTROLS"; //$NON-NLS-1$
-	public static final String VIRTUAL_PART_DESCRIPTORS = ModelEditor.class.getName() + ".VIRTUAL_PART_DESCRIPTORS"; //$NON-NLS-1$
-	public static final String VIRTUAL_PARTDESCRIPTOR_MENU = ModelEditor.class.getName()
-			+ ".VIRTUAL_PARTDESCRIPTOR_MENU"; //$NON-NLS-1$
-	public static final String VIRTUAL_TRIMMED_WINDOW_TRIMS = ModelEditor.class.getName()
-			+ ".VIRTUAL_TRIMMED_WINDOW_TRIMS"; //$NON-NLS-1$
-	public static final String VIRTUAL_ADDONS = ModelEditor.class.getName() + ".VIRTUAL_ADDONS"; //$NON-NLS-1$
-	public static final String VIRTUAL_MENU_CONTRIBUTIONS = ModelEditor.class.getName() + ".VIRTUAL_MENU_CONTRIBUTIONS"; //$NON-NLS-1$
-	public static final String VIRTUAL_TOOLBAR_CONTRIBUTIONS = ModelEditor.class.getName()
-			+ ".VIRTUAL_TOOLBAR_CONTRIBUTIONS"; //$NON-NLS-1$
-	public static final String VIRTUAL_TRIM_CONTRIBUTIONS = ModelEditor.class.getName() + ".VIRTUAL_TRIM_CONTRIBUTIONS"; //$NON-NLS-1$
-	public static final String VIRTUAL_WINDOW_SHARED_ELEMENTS = ModelEditor.class.getName()
-			+ ".VIRTUAL_WINDOW_SHARED_ELEMENTS"; //$NON-NLS-1$
-	public static final String VIRTUAL_WINDOW_SNIPPETS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_SNIPPETS"; //$NON-NLS-1$
-
-	public static final String VIRTUAL_MODEL_FRAGEMENTS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_FRAGEMENTS"; //$NON-NLS-1$
-	public static final String VIRTUAL_MODEL_IMPORTS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_IMPORTS"; //$NON-NLS-1$
-	public static final String VIRTUAL_CATEGORIES = ModelEditor.class.getName() + ".VIRTUAL_CATEGORIES"; //$NON-NLS-1$
-	public static final String VIRTUAL_PARAMETERS = ModelEditor.class.getName() + ".VIRTUAL_PARAMETERS"; //$NON-NLS-1$
-	public static final String VIRTUAL_MENUELEMENTS = ModelEditor.class.getName() + ".VIRTUAL_MENUELEMENTS"; //$NON-NLS-1$
-	public static final String VIRTUAL_ROOT_CONTEXTS = ModelEditor.class.getName() + ".VIRTUAL_ROOT_CONTEXTS"; //$NON-NLS-1$
-	public static final String VIRTUAL_PERSPECTIVE_CONTROLS = ModelEditor.class.getName()
-			+ "VIRTUAL_PERSPECTIVE_CONTROLS"; //$NON-NLS-1$
-	public static final String VIRTUAL_SNIPPETS = ModelEditor.class.getName() + "VIRTUAL_SNIPPETS"; //$NON-NLS-1$
+	public static final String VIRTUAL_PART_MENU = "org.eclipse.e4.tools.emf.ui.VIRTUAL_PART_MENU"; //$NON-NLS-1$
+	public static final String VIRTUAL_HANDLER = "org.eclipse.e4.tools.emf.ui.VIRTUAL_HANDLER"; //$NON-NLS-1$
+	public static final String VIRTUAL_BINDING_TABLE = "org.eclipse.e4.tools.emf.ui.VIRTUAL_BINDING_TABLE"; //$NON-NLS-1$
+	public static final String VIRTUAL_COMMAND = "org.eclipse.e4.tools.emf.ui.VIRTUAL_COMMAND"; //$NON-NLS-1$
+	public static final String VIRTUAL_APPLICATION_WINDOWS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_APPLICATION_WINDOWS"; //$NON-NLS-1$
+	public static final String VIRTUAL_PERSPECTIVE_WINDOWS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_PERSPECTIVE_WINDOWS"; //$NON-NLS-1$
+	public static final String VIRTUAL_WINDOW_WINDOWS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_WINDOW_WINDOWS"; //$NON-NLS-1$
+	public static final String VIRTUAL_WINDOW_CONTROLS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_WINDOW_CONTROLS"; //$NON-NLS-1$
+	public static final String VIRTUAL_PART_DESCRIPTORS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_PART_DESCRIPTORS"; //$NON-NLS-1$
+	public static final String VIRTUAL_PARTDESCRIPTOR_MENU = "org.eclipse.e4.tools.emf.ui.VIRTUAL_PARTDESCRIPTOR_MENU"; //$NON-NLS-1$
+	public static final String VIRTUAL_TRIMMED_WINDOW_TRIMS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_TRIMMED_WINDOW_TRIMS"; //$NON-NLS-1$
+	public static final String VIRTUAL_ADDONS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_ADDONS"; //$NON-NLS-1$
+	public static final String VIRTUAL_MENU_CONTRIBUTIONS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_MENU_CONTRIBUTIONS"; //$NON-NLS-1$
+	public static final String VIRTUAL_TOOLBAR_CONTRIBUTIONS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_TOOLBAR_CONTRIBUTIONS"; //$NON-NLS-1$
+	public static final String VIRTUAL_TRIM_CONTRIBUTIONS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_TRIM_CONTRIBUTIONS"; //$NON-NLS-1$
+	public static final String VIRTUAL_WINDOW_SHARED_ELEMENTS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_WINDOW_SHARED_ELEMENTS"; //$NON-NLS-1$
+	public static final String VIRTUAL_WINDOW_SNIPPETS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_WINDOW_SNIPPETS"; //$NON-NLS-1$
+
+	public static final String VIRTUAL_MODEL_FRAGEMENTS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_MODEL_FRAGEMENTS"; //$NON-NLS-1$
+	public static final String VIRTUAL_MODEL_IMPORTS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_MODEL_IMPORTS"; //$NON-NLS-1$
+	public static final String VIRTUAL_CATEGORIES = "org.eclipse.e4.tools.emf.ui.VIRTUAL_CATEGORIES"; //$NON-NLS-1$
+	public static final String VIRTUAL_PARAMETERS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_PARAMETERS"; //$NON-NLS-1$
+	public static final String VIRTUAL_MENUELEMENTS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_MENUELEMENTS"; //$NON-NLS-1$
+	public static final String VIRTUAL_ROOT_CONTEXTS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_ROOT_CONTEXTS"; //$NON-NLS-1$
+	public static final String VIRTUAL_PERSPECTIVE_CONTROLS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_PERSPECTIVE_CONTROLS"; //$NON-NLS-1$
+	public static final String VIRTUAL_SNIPPETS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_SNIPPETS"; //$NON-NLS-1$
 
 	public static final int TAB_FORM = 0;
 	public static final int TAB_XMI = 1;
 	public static final int TAB_LIST = 2;
 
-	private final Map<EClass, AbstractComponentEditor> editorMap = new HashMap<>();
-	private final Map<String, AbstractComponentEditor> virtualEditors = new HashMap<>();
+	/**
+	 * A map with key = eClass name or virtual key, value is an
+	 * AbstractComponentEditor instance This map is filled on the fly when getting
+	 * editors
+	 */
+	private final Map<String, AbstractComponentEditor> editors = new HashMap<>();
+
+	/**
+	 * A map with key = eClass name or virtual key, value is a class of
+	 * AbstractComponentEditor. This map is filled on init by registerEditor
+	 */
+	private final Map<String, Class<? extends AbstractComponentEditor>> editorsClasses = new HashMap<>();
+
 	private final Map<Class<?>, List<AbstractElementEditorContribution>> tabContributions = new HashMap<>();
 	private final List<FeaturePath> labelFeaturePaths = new ArrayList<>();
 	private final List<IEditorFeature> editorFeatures = new ArrayList<>();
@@ -607,7 +611,7 @@ public void keyReleased(final KeyEvent e) {
 					}
 				} else {
 					final VirtualEntry<?> entry = (VirtualEntry<?>) s.getFirstElement();
-					final AbstractComponentEditor editor2 = virtualEditors.get(entry.getId());
+					final AbstractComponentEditor editor2 = getEditor(entry.getId());
 					if (editor2 != null) {
 						currentEditor = editor2;
 						sectionHeaderLabel.setText(editor2.getLabel(entry));
@@ -621,12 +625,6 @@ public void keyReleased(final KeyEvent e) {
 					}
 				}
 
-				// Rectangle r = scrolling.getClientArea();
-				// scrolling.setMinSize(contentContainer.computeSize(r.width,
-				// SWT.DEFAULT));
-				// scrolling.setOrigin(0, 0);
-				// scrolling.layout(true, true);
-
 				if (selectionService != null) {
 					selectionService.setSelection(s.getFirstElement());
 				}
@@ -647,7 +645,7 @@ public void keyReleased(final KeyEvent e) {
 			if (!s.isEmpty() && noSelected == 1) {
 				List<Action> actions;
 				if (s.getFirstElement() instanceof VirtualEntry<?>) {
-					actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId())
+					actions = getEditor(((VirtualEntry<?>) s.getFirstElement()).getId())
 							.getActions(s.getFirstElement());
 					if (actions.size() > 0) {
 						final MenuManager addMenu1 = new MenuManager(messages.ModelEditor_AddChild);
@@ -658,7 +656,7 @@ public void keyReleased(final KeyEvent e) {
 						manager.add(addMenu1);
 					}
 
-					actions = virtualEditors.get(((VirtualEntry<?>) s.getFirstElement()).getId())
+					actions = getEditor(((VirtualEntry<?>) s.getFirstElement()).getId())
 							.getActionsImport(s.getFirstElement());
 					if (actions.size() > 0) {
 						final MenuManager menu1 = new MenuManager(messages.ModelEditor_Import3x);
@@ -1136,53 +1134,37 @@ private void registerContributedVirtualEditors() {
 			final IContributionFactory fact = context.get(IContributionFactory.class);
 			final AbstractComponentEditor editor = (AbstractComponentEditor) fact
 					.create("bundleclass://" + el.getContributor().getName() + "/" + el.getAttribute("class"), context); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			registerVirtualEditor(el.getAttribute("id"), editor); //$NON-NLS-1$
+			registerEditor(el.getAttribute("id"), editor); //$NON-NLS-1$
 		}
 	}
 
 	private void registerVirtualEditors() {
-		registerVirtualEditor(VIRTUAL_PART_MENU, ContextInjectionFactory.make(VPartMenuEditor.class, context));
-		registerVirtualEditor(VIRTUAL_HANDLER, ContextInjectionFactory.make(VHandlerEditor.class, context));
-		registerVirtualEditor(VIRTUAL_BINDING_TABLE, ContextInjectionFactory.make(VBindingTableEditor.class, context));
-		registerVirtualEditor(VIRTUAL_COMMAND, ContextInjectionFactory.make(VCommandEditor.class, context));
-		registerVirtualEditor(VIRTUAL_APPLICATION_WINDOWS,
-				ContextInjectionFactory.make(VApplicationWindowEditor.class, context));
-		registerVirtualEditor(VIRTUAL_WINDOW_WINDOWS,
-				ContextInjectionFactory.make(VWindowWindowsEditor.class, context));
-		registerVirtualEditor(VIRTUAL_PERSPECTIVE_WINDOWS,
-				ContextInjectionFactory.make(VPerspectiveWindowsEditor.class, context));
-		registerVirtualEditor(VIRTUAL_WINDOW_CONTROLS,
-				ContextInjectionFactory.make(VWindowControlEditor.class, context));
-		registerVirtualEditor(VIRTUAL_WINDOW_SNIPPETS, ContextInjectionFactory.make(VSnippetsEditor.class, context));
-		registerVirtualEditor(VIRTUAL_PART_DESCRIPTORS, ContextInjectionFactory.make(VPartDescriptor.class, context));
-		registerVirtualEditor(VIRTUAL_PARTDESCRIPTOR_MENU,
-				ContextInjectionFactory.make(VPartDescriptorMenuEditor.class, context));
-		registerVirtualEditor(VIRTUAL_TRIMMED_WINDOW_TRIMS,
-				ContextInjectionFactory.make(VWindowTrimEditor.class, context));
-		registerVirtualEditor(VIRTUAL_ADDONS, ContextInjectionFactory.make(VApplicationAddons.class, context));
-		registerVirtualEditor(VIRTUAL_MENU_CONTRIBUTIONS,
-				ContextInjectionFactory.make(VMenuContributionsEditor.class, context));
-		registerVirtualEditor(VIRTUAL_TOOLBAR_CONTRIBUTIONS,
-				ContextInjectionFactory.make(VToolBarContributionsEditor.class, context));
-		registerVirtualEditor(VIRTUAL_TRIM_CONTRIBUTIONS,
-				ContextInjectionFactory.make(VTrimContributionsEditor.class, context));
-		registerVirtualEditor(VIRTUAL_WINDOW_SHARED_ELEMENTS,
-				ContextInjectionFactory.make(VWindowSharedElementsEditor.class, context));
-		registerVirtualEditor(VIRTUAL_MODEL_FRAGEMENTS,
-				ContextInjectionFactory.make(VModelFragmentsEditor.class, context));
-		registerVirtualEditor(VIRTUAL_MODEL_IMPORTS, ContextInjectionFactory.make(VModelImportsEditor.class, context));
-		registerVirtualEditor(VIRTUAL_CATEGORIES,
-				ContextInjectionFactory.make(VApplicationCategoriesEditor.class, context));
-		registerVirtualEditor(VIRTUAL_PARAMETERS, ContextInjectionFactory.make(VItemParametersEditor.class, context));
-		registerVirtualEditor(VIRTUAL_ROOT_CONTEXTS, ContextInjectionFactory.make(VRootBindingContexts.class, context));
-		registerVirtualEditor(VIRTUAL_PERSPECTIVE_CONTROLS,
-				ContextInjectionFactory.make(VPerspectiveControlEditor.class, context));
-		registerVirtualEditor(VIRTUAL_SNIPPETS, ContextInjectionFactory.make(VSnippetsEditor.class, context));
+		registerEditor(VIRTUAL_PART_MENU, VPartMenuEditor.class);
+		registerEditor(VIRTUAL_HANDLER, VHandlerEditor.class);
+		registerEditor(VIRTUAL_BINDING_TABLE, VBindingTableEditor.class);
+		registerEditor(VIRTUAL_COMMAND, VCommandEditor.class);
+		registerEditor(VIRTUAL_APPLICATION_WINDOWS, VApplicationWindowEditor.class);
+		registerEditor(VIRTUAL_WINDOW_WINDOWS, VWindowWindowsEditor.class);
+		registerEditor(VIRTUAL_PERSPECTIVE_WINDOWS, VPerspectiveWindowsEditor.class);
+		registerEditor(VIRTUAL_WINDOW_CONTROLS, VWindowControlEditor.class);
+		registerEditor(VIRTUAL_WINDOW_SNIPPETS, VSnippetsEditor.class);
+		registerEditor(VIRTUAL_PART_DESCRIPTORS, VPartDescriptor.class);
+		registerEditor(VIRTUAL_PARTDESCRIPTOR_MENU, VPartDescriptorMenuEditor.class);
+		registerEditor(VIRTUAL_TRIMMED_WINDOW_TRIMS, VWindowTrimEditor.class);
+		registerEditor(VIRTUAL_ADDONS, VApplicationAddons.class);
+		registerEditor(VIRTUAL_MENU_CONTRIBUTIONS, VMenuContributionsEditor.class);
+		registerEditor(VIRTUAL_TOOLBAR_CONTRIBUTIONS, VToolBarContributionsEditor.class);
+		registerEditor(VIRTUAL_TRIM_CONTRIBUTIONS, VTrimContributionsEditor.class);
+		registerEditor(VIRTUAL_WINDOW_SHARED_ELEMENTS, VWindowSharedElementsEditor.class);
+		registerEditor(VIRTUAL_MODEL_FRAGEMENTS, VModelFragmentsEditor.class);
+		registerEditor(VIRTUAL_MODEL_IMPORTS, VModelImportsEditor.class);
+		registerEditor(VIRTUAL_CATEGORIES, VApplicationCategoriesEditor.class);
+		registerEditor(VIRTUAL_PARAMETERS, VItemParametersEditor.class);
+		registerEditor(VIRTUAL_ROOT_CONTEXTS, VRootBindingContexts.class);
+		registerEditor(VIRTUAL_PERSPECTIVE_CONTROLS, VPerspectiveControlEditor.class);
+		registerEditor(VIRTUAL_SNIPPETS, VSnippetsEditor.class);
 	}
 
-	private void registerVirtualEditor(String id, AbstractComponentEditor editor) {
-		virtualEditors.put(id, editor);
-	}
 
 	public void setSelection(Object element) {
 		viewer.setSelection(new StructuredSelection(element));
@@ -1375,12 +1357,98 @@ public void setNotVisibleRenderedColor(
 	}
 
 	private void registerEditor(EClass eClass, Class<? extends AbstractComponentEditor> clazz) {
-		registerEditor(eClass, ContextInjectionFactory.make(clazz, context));
+		registerEditor(eClass.getInstanceClassName(), clazz);
 	}
 
-	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
-		editorMap.put(eClass, editor);
+	/**
+	 * Register a class to use to create an editor for a given key
+	 *
+	 * @param ley
+	 * @param clazz
+	 */
+	private void registerEditor(String key, Class<? extends AbstractComponentEditor> clazz) {
+		editorsClasses.put(key, clazz);
+	}
+
+	/**
+	 * Register directly a created editor for a given key
+	 *
+	 * @param instanceClassName
+	 * @param clazz
+	 */
+	private void registerEditor(String key, AbstractComponentEditor editor) {
+		editors.put(key, editor);
+	}
+
+	/**
+	 * Get editor from an eClass. May return the registered editor for this eclass,
+	 * or the editor for a parent EClass or the default editor
+	 *
+	 * @param eClass
+	 *            the eClass to get editor for
+	 * @return the {@link AbstractComponentEditor} found (never null).
+	 */
+	public AbstractComponentEditor getEditor(EClass eClass) {
+		AbstractComponentEditor editor = getEditor(eClass.getInstanceClassName(), false);
+
+		if (editor == null) {
+			// May be can try to use the ancestor editor if not found or the default editor
+			for (final EClass cl : eClass.getESuperTypes()) {
+				editor = getEditor(cl);
+				if (editor != null) {
+					break;
+				}
+			}
+
+			// Editor is still null ? , will use the default editor
+			if (editor == null) {
+				editor = ContextInjectionFactory.make(DefaultEditor.class, context);
+			}
+
+			// register the parent or default editor
+			editors.put(eClass.getInstanceClassName(), editor);
+		}
+
+		return editor;
+
+	}
+
+	public AbstractComponentEditor getEditor(String key) {
+		return getEditor(key, true);
+	}
 
+	/**
+	 * get editor from a string key.
+	 *
+	 * @param key
+	 *            : the editor string key
+	 * @param createDefaultIfNull
+	 *            if true, returns the default editor if no editor found
+	 * @return the {@link AbstractComponentEditor} if exists. Never null if
+	 *         createDefaultIfNull is true
+	 */
+	private AbstractComponentEditor getEditor(String key, boolean createDefaultIfNull) {
+		AbstractComponentEditor editor = editors.get(key);
+
+		if (editor == null) {
+
+			// Editor not yet created in the map... must create instance using registered
+			// class
+			Class<? extends AbstractComponentEditor> cz = editorsClasses.get(key);
+			if (cz != null) {
+				editor = ContextInjectionFactory.make(cz, context);
+				editors.put(key, editor);
+
+				// Then manage the feature maps...
+				manageFeatureMap(editor);
+			}
+
+		}
+
+		return editor;
+	}
+
+	private void manageFeatureMap(AbstractComponentEditor editor) {
 		for (final FeaturePath p : editor.getLabelProperties()) {
 			boolean found = false;
 			for (final FeaturePath tmp : labelFeaturePaths) {
@@ -1394,6 +1462,12 @@ public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
 				labelFeaturePaths.add(p);
 			}
 		}
+
+	}
+
+	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
+		editors.put(eClass.getInstanceClassName(), editor);
+		manageFeatureMap(editor);
 	}
 
 	private boolean equalsPaths(FeaturePath p1, FeaturePath p2) {
@@ -1410,20 +1484,6 @@ private boolean equalsPaths(FeaturePath p1, FeaturePath p2) {
 		return false;
 	}
 
-	public AbstractComponentEditor getEditor(EClass eClass) {
-		AbstractComponentEditor editor = editorMap.get(eClass);
-		if (editor == null) {
-			for (final EClass cl : eClass.getESuperTypes()) {
-				editor = getEditor(cl);
-				if (editor != null) {
-					return editor;
-				}
-			}
-
-			editor = ContextInjectionFactory.make(DefaultEditor.class, context);
-		}
-		return editor;
-	}
 
 	@Persist
 	public void doSave(@Optional IProgressMonitor monitor) {

From c1700430deff57df71cb551e740eebcfbfcbed2d Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Wed, 28 Feb 2018 23:59:47 +0100
Subject: [PATCH 1022/1286] Bug 531740 - E4 model editor shows YYYYY for
 Sub-windows

Change-Id: I801c4843c706df18e7c1212d6aa598f2b6c0446e
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.properties    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 7618dcc907..c45792dcaf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -455,7 +455,7 @@ WindowEditor_MainMenu=Main Menu
 WindowEditor_SelectedElement=Selected Element
 WindowEditor_BindingContexts=Binding Contexts
 WindowEditor_Handlers=Handlers
-WindowEditor_Windows=Windows YYYYY
+WindowEditor_Windows=Windows
 WindowEditor_Controls=Controls
 WindowEditor_SharedElements=Shared Elements
 WindowEditor_Snippets=Snippets

From 1383777f59229871cf139fb15a13139ceaa01938 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Wed, 21 Feb 2018 12:09:20 +0100
Subject: [PATCH 1023/1286] Bug 429684 - Application Model Editor does not
 display element after "Undo" (CTRL+Z) operation

I changed also labels for undo/redo.
I add to revert the code fixed for the bug about classpath URI (#
412567) and this will remove the update of the field decorator when the
editor is opened...

Change-Id: I1490cccdae414ac981a9fbd7898190fef5b1e3f5
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../e4/tools/emf/editor3x/RedoAction.java     |  8 ++-
 .../e4/tools/emf/editor3x/UndoAction.java     | 57 ++++++++++++++++-
 .../e4/tools/emf/ui/internal/Messages.java    |  1 +
 .../tools/emf/ui/internal/Messages.properties |  1 +
 .../emf/ui/internal/common/ModelEditor.java   | 64 +++++++++++++++++--
 .../common/component/AddonsEditor.java        |  1 -
 .../DynamicMenuContributionEditor.java        |  1 -
 .../common/component/HandlerEditor.java       |  1 -
 .../component/ImperativeExpressionEditor.java |  1 -
 .../common/component/MenuItemEditor.java      |  1 -
 .../component/PartDescriptorEditor.java       |  1 -
 .../internal/common/component/PartEditor.java |  1 -
 .../common/component/ToolItemEditor.java      |  1 -
 13 files changed, 122 insertions(+), 17 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
index 4a1a5f5789..09ccb0bc40 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
@@ -11,6 +11,7 @@
 package org.eclipse.e4.tools.emf.editor3x;
 
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.jface.action.Action;
 
 public class RedoAction extends Action {
@@ -45,9 +46,12 @@ public void run() {
 
 	private void update() {
 		if (resource.getEditingDomain().getCommandStack().canRedo()) {
+
+			Command redoCommand = resource.getEditingDomain().getCommandStack().getRedoCommand();
+			String label = UndoAction.getCommandLabel(redoCommand);
+
 			setText(Messages.RedoAction_Redo + " " //$NON-NLS-1$
-				+ resource.getEditingDomain().getCommandStack()
-					.getRedoCommand().getLabel());
+					+ label);
 			setEnabled(true);
 		} else {
 			setText(Messages.RedoAction_Redo);
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
index 28eebf0f8e..26313dd675 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
@@ -10,7 +10,15 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.editor3x;
 
+import java.util.Collection;
+
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.DeleteCommand;
+import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.action.Action;
 
 public class UndoAction extends Action {
@@ -41,11 +49,15 @@ public void run() {
 		}
 	}
 
+	private static int cpt = 0;
+
 	private void update() {
 		if (resource.getEditingDomain().getCommandStack().canUndo()) {
+			Command undoCommand = resource.getEditingDomain().getCommandStack()
+					.getUndoCommand();
+			String label = getCommandLabel(undoCommand);
 			setText(Messages.UndoAction_Undo + " " //$NON-NLS-1$
-				+ resource.getEditingDomain().getCommandStack()
-					.getUndoCommand().getLabel());
+					+ label);
 			setEnabled(true);
 		} else {
 			setText(Messages.UndoAction_Undo);
@@ -53,6 +65,47 @@ private void update() {
 		}
 	}
 
+	/**
+	 * Compute a command label depending on the command for undo/redo label.
+	 *
+	 * For instance : Add Trimmedwindow or Delete 5 objects
+	 *
+	 * @param cmd
+	 * @return a description string for the command
+	 */
+	public static String getCommandLabel(Command cmd) {
+
+		if (cmd instanceof SetCommand) {
+			SetCommand sc = (SetCommand) cmd;
+			return sc.getLabel() + " " + sc.getFeature().getName() + " on " + sc.getOwner().eClass().getName(); //$NON-NLS-1$ //$NON-NLS-2$
+		} else if (cmd instanceof AddCommand) {
+			AddCommand ac = (AddCommand) cmd;
+			return ac.getLabel() + " " + getFirstClassName(ac.getCollection()); //$NON-NLS-1$
+		} else if (cmd instanceof DeleteCommand) {
+			DeleteCommand dc = (DeleteCommand) cmd;
+			Collection<?> deleted = dc.getCollection();
+			if (deleted.size() == 1) {
+				return dc.getLabel() + " " + getFirstClassName(deleted); //$NON-NLS-1$
+			}
+			return dc.getLabel() + " " + dc.getCollection().size() + " Objects"; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		return cmd.getLabel();
+	}
+
+	/**
+	 * Get the eClassname or empty string of the first element in the collection
+	 *
+	 * @param c
+	 * @return name of classname if object is an EObject else an empty string
+	 */
+	private static String getFirstClassName(Collection<?> c)
+	{
+		Object o = c.iterator().next();
+		String clname = (o instanceof EObject) ? ((EObject) o).eClass().getName() : ""; //$NON-NLS-1$
+		String dname = (o instanceof MUILabel) ? ((MUILabel) o).getLabel() : ""; //$NON-NLS-1$
+		return clname + " " + (dname == null ? "" : dname); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
 	/**
 	 * Clean up
 	 */
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 8346eb00d5..86893c8622 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -110,6 +110,7 @@ public class Messages {
 	public String ModelTooling_Common_TabDefault;
 	public String ModelTooling_Common_TabSupplementary;
 	public String ModelEditor_AddChild;
+	public String ModelEditor_Move;
 	public String ModelTooling_Common_RuntimeContributionInstance;
 	public String ModelTooling_Common_RuntimeWidgetTree;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index c45792dcaf..fde97d5ab4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -44,6 +44,7 @@ ModelTooling_Common_FindEllipsis=Find ...
 ModelTooling_Common_TabDefault=Default
 ModelTooling_Common_TabSupplementary=Supplementary
 ModelEditor_AddChild=Add child
+ModelEditor_Move=Move
 ModelTooling_Common_RuntimeContributionInstance=Contrib. Instance
 ModelTooling_Common_RuntimeWidgetTree=Widget Tree
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 92d1433989..ac05f04da1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2017 BestSolution.at and others.
+ * Copyright (c) 2010, 2018 BestSolution.at and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,7 +13,8 @@
  * Steven Spungin <steven@spungin.tv> - Bug 396902, 431755, 431735, 424730, 424730, 391089, 437236, 437552, Ongoing
  * Maintenance
  * Simon Scholz <simon.scholz@vogella.com> - Bug 475365
- * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 472706
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 472706, 429684
+ * Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 429684
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
 
@@ -157,6 +158,7 @@
 import org.eclipse.e4.ui.model.application.ui.MContext;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
@@ -1835,7 +1837,7 @@ public boolean performSingleDrop(Object data) {
 				}
 
 				if (feature != null && parent != null) {
-					final Command cmd = AddCommand.create(domain, parent, feature, data);
+					final Command cmd = createRemoveAddCommand(data, feature, parent, CommandParameter.NO_INDEX);
 					if (cmd.canExecute()) {
 						domain.getCommandStack().execute(cmd);
 						if (isLiveModel()) {
@@ -1877,7 +1879,7 @@ public boolean performSingleDrop(Object data) {
 				if (feature == FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS && parent != null) {
 					final MApplicationElement el = (MApplicationElement) EcoreUtil.create(((EObject) data).eClass());
 					el.setElementId(((MApplicationElement) data).getElementId());
-					final Command cmd = AddCommand.create(domain, parent, feature, el);
+					final Command cmd = createRemoveAddCommand(data, feature, parent, CommandParameter.NO_INDEX);
 					if (cmd.canExecute()) {
 						domain.getCommandStack().execute(cmd);
 					}
@@ -1908,7 +1910,7 @@ public boolean performSingleDrop(Object data) {
 							data = EcoreUtil.copy((EObject) data);
 						}
 
-						final Command cmd = AddCommand.create(domain, parent, feature, data, index);
+						final Command cmd = createRemoveAddCommand(data, feature, parent, index);
 						if (cmd.canExecute()) {
 							domain.getCommandStack().execute(cmd);
 							if (isLiveModel()) {
@@ -1926,6 +1928,58 @@ public boolean performSingleDrop(Object data) {
 			return false;
 		}
 
+		/**
+		 * Create an internal Compound command containing a Remove and a Add so as to
+		 * allow the Undo
+		 *
+		 * @param data
+		 *            the object to be dragged and dropped
+		 * @param destFeature
+		 *            the target feature in the model where data must be dropped
+		 * @param parent
+		 *            the destination parent
+		 * @param index
+		 *            the index in the parent list
+		 * @see bug #429684
+		 * @return the compound command
+		 */
+		private Command createRemoveAddCommand(Object data, EStructuralFeature destFeature, EObject parent, int index) {
+
+			// Remark : this code could be replaced by a MoveCommand, but unfortunately I
+			// could not make it working (its canExecute() method always returns false
+			// because it is not prepared (see canExecute())...)...
+
+			List<Command> listOfCommands = new ArrayList<>();
+			EStructuralFeature sourceFeature = null;
+			if (data instanceof EObject) {
+				sourceFeature = ((EObject) data).eContainmentFeature();
+			}
+			Command removeCommand = RemoveCommand.create(domain, ((EObject) data).eContainer(), sourceFeature, data);
+			if (removeCommand.canExecute()) {
+				listOfCommands.add(removeCommand);
+			}
+
+			Command addCommand = AddCommand.create(domain, parent, destFeature, data, index);
+			listOfCommands.add(addCommand);
+			CompoundCommand compoundCommand = new CompoundCommand(listOfCommands);
+			compoundCommand.setLabel(messages.ModelEditor_Move + " " + getObjectNameForCommand(data)); //$NON-NLS-1$
+			return compoundCommand;
+
+		}
+
+		/**
+		 * compute a valid name for the undo/redo/paste of move commands
+		 *
+		 * @param data
+		 *            the object concerned by the command
+		 * @return a representative string for the object or 'Object' if nothing found
+		 */
+		private String getObjectNameForCommand(Object data) {
+			String clname = (data instanceof EObject) ? ((EObject) data).eClass().getName() : "Object"; //$NON-NLS-1$
+			String dname = (data instanceof MUILabel) ? ((MUILabel) data).getLabel() : ""; //$NON-NLS-1$
+			return clname + " " + dname; //$NON-NLS-1$
+		}
+
 		@Override
 		public boolean validateDrop(Object target, int operation, TransferData transferType) {
 			boolean rv = true;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 63908908fb..dd39f04e3b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -116,7 +116,6 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
-		context.updateModels();
 		return composite;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
index be0e4f9560..e96b68ecf5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
@@ -109,7 +109,6 @@ protected Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
-		context.updateModels();
 
 		return composite;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index c75e11f8f9..43470eee59 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -119,7 +119,6 @@ public Composite doGetEditor(Composite parent, Object object) {
 		}
 
 		getMaster().setValue(object);
-		context.updateModels();
 		return composite;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
index 18d5f6a675..58d8a1fd19 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
@@ -78,7 +78,6 @@ public Composite doGetEditor(Composite parent, Object object) {
 			createForm(composite, context, getMaster());
 		}
 		getMaster().setValue(object);
-		context.updateModels();
 
 		return composite;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 9aede68b46..1c12475eab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -147,7 +147,6 @@ public Composite doGetEditor(Composite parent, Object object) {
 		getMaster().setValue(object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
-		context.updateModels();
 
 		return composite;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index d3bbd103ca..7c302e19d7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -141,7 +141,6 @@ public Composite doGetEditor(Composite parent, Object object) {
 		getMaster().setValue(object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
-		context.updateModels();
 		return composite;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index c42d02660b..e568cee3d3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -143,7 +143,6 @@ public Composite doGetEditor(Composite parent, Object object) {
 		getMaster().setValue(object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
-		context.updateModels();
 
 		return composite;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index e37ecb6b2d..4831fb77e2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -129,7 +129,6 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 		getMaster().setValue(object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
-		context.updateModels();
 
 		return composite;
 	}

From 53d9c46a1815959b1e9bafff0a1f1da1c6928e20 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Wed, 7 Mar 2018 10:22:03 +0100
Subject: [PATCH 1024/1286] Bug 532070 - [Model editor] should support cut of
 multiple elements

Change-Id: I5e7196552aee03c73f1b1afcff6828b9b74f9840
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../e4/tools/emf/ui/internal/Messages.java    |  2 +
 .../tools/emf/ui/internal/Messages.properties |  2 +
 .../emf/ui/internal/common/ModelEditor.java   | 72 +++++++++++++------
 3 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 86893c8622..4e36e776cb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -111,6 +111,8 @@ public class Messages {
 	public String ModelTooling_Common_TabSupplementary;
 	public String ModelEditor_AddChild;
 	public String ModelEditor_Move;
+	public String ModelEditor_Cut;
+	public String ModelEditor_CutObjects;
 	public String ModelTooling_Common_RuntimeContributionInstance;
 	public String ModelTooling_Common_RuntimeWidgetTree;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index fde97d5ab4..1e2c971aa0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -45,6 +45,8 @@ ModelTooling_Common_TabDefault=Default
 ModelTooling_Common_TabSupplementary=Supplementary
 ModelEditor_AddChild=Add child
 ModelEditor_Move=Move
+ModelEditor_Cut=Cut
+ModelEditor_CutObjects=Cut Objects
 ModelTooling_Common_RuntimeContributionInstance=Contrib. Instance
 ModelTooling_Common_RuntimeWidgetTree=Widget Tree
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index ac05f04da1..52d50f0b09 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -20,6 +20,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -173,6 +174,7 @@
 import org.eclipse.e4.ui.workbench.UIEvents;
 import org.eclipse.e4.ui.workbench.UIEvents.EventTags;
 import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
+import org.eclipse.emf.common.command.AbstractCommand;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.command.CompoundCommand;
 import org.eclipse.emf.databinding.EMFProperties;
@@ -1731,18 +1733,43 @@ public void cut() {
 		}
 
 		private void handleStructureCut() {
-			final Object o = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
-			if (o != null && o instanceof EObject) {
-				final Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
-				clip.setContents(new Object[] { o }, new Transfer[] { MemoryTransfer.getInstance() });
-				clip.dispose();
-				final EObject eObj = (EObject) o;
-				final Command cmd = RemoveCommand.create(getModelProvider().getEditingDomain(), eObj.eContainer(),
-						eObj.eContainingFeature(), eObj);
-				if (cmd.canExecute()) {
-					getModelProvider().getEditingDomain().getCommandStack().execute(cmd);
+
+			// Manage multiple cut objects (bug #532070)
+			Collection<EObject> objectsToCut = new ArrayList<>();
+			final Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
+			for (Object o : ((IStructuredSelection) viewer.getSelection()).toList()) {
+				if (o != null && o instanceof EObject) {
+					objectsToCut.add((EObject) o);
 				}
 			}
+
+			Command cmd = null;
+			if (objectsToCut.size() == 0) {
+				return;
+			} else if (objectsToCut.size() == 1) {
+				// Only 1 object to cut... create a removeCommand
+				EObject o = objectsToCut.iterator().next();
+				cmd = RemoveCommand.create(getModelProvider().getEditingDomain(), o.eContainer(),
+						o.eContainingFeature(), o);
+				((AbstractCommand) cmd).setLabel((messages.ModelEditor_Cut + " " + getObjectNameForCommand(o))); //$NON-NLS-1$
+			} else {
+				// There are more than one object to remove -> Compound command.
+				CompoundCommand cc = new CompoundCommand();
+				cc.setLabel(messages.ModelEditor_CutObjects);
+				for (EObject o : objectsToCut) {
+					cc.append(RemoveCommand.create(getModelProvider().getEditingDomain(), o.eContainer(),
+							o.eContainingFeature(), o));
+				}
+				cmd = cc;
+			}
+
+			if (cmd.canExecute()) {
+				// Now can set the clipboard...
+				clip.setContents(new Object[] { objectsToCut }, new Transfer[] { MemoryTransfer.getInstance() });
+				getModelProvider().getEditingDomain().getCommandStack().execute(cmd);
+			}
+
+			clip.dispose();
 		}
 	}
 
@@ -1967,18 +1994,6 @@ private Command createRemoveAddCommand(Object data, EStructuralFeature destFeatu
 
 		}
 
-		/**
-		 * compute a valid name for the undo/redo/paste of move commands
-		 *
-		 * @param data
-		 *            the object concerned by the command
-		 * @return a representative string for the object or 'Object' if nothing found
-		 */
-		private String getObjectNameForCommand(Object data) {
-			String clname = (data instanceof EObject) ? ((EObject) data).eClass().getName() : "Object"; //$NON-NLS-1$
-			String dname = (data instanceof MUILabel) ? ((MUILabel) data).getLabel() : ""; //$NON-NLS-1$
-			return clname + " " + dname; //$NON-NLS-1$
-		}
 
 		@Override
 		public boolean validateDrop(Object target, int operation, TransferData transferType) {
@@ -2038,6 +2053,19 @@ private boolean isValidDrop(Object target, Object instance, boolean isIndex) {
 		}
 	}
 
+	/**
+	 * compute a valid name for the undo/redo/paste of move commands
+	 *
+	 * @param data
+	 *            the object concerned by the command
+	 * @return a representative string for the object or 'Object' if nothing found
+	 */
+	private String getObjectNameForCommand(Object data) {
+		String clname = (data instanceof EObject) ? ((EObject) data).eClass().getName() : "Object"; //$NON-NLS-1$
+		String dname = (data instanceof MUILabel) ? ((MUILabel) data).getLabel() : ""; //$NON-NLS-1$
+		return clname + " " + dname; //$NON-NLS-1$
+	}
+
 	@Override
 	public void gotoEObject(int targetHint, EObject object) {
 		if (object == null) {

From 7ab0a661f042e1e7579c4ea172b32193f8407483 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Wed, 7 Mar 2018 12:08:32 +0100
Subject: [PATCH 1025/1286] Bug 532105 - [Model Editor] undo/redo paste message
 could be better

Change-Id: I7a09c2d2100248d6a3c1ebd146560de095201af5
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../e4/tools/emf/ui/internal/Messages.java        |  2 ++
 .../e4/tools/emf/ui/internal/Messages.properties  |  2 ++
 .../tools/emf/ui/internal/common/ModelEditor.java | 15 +++++++++++++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 4e36e776cb..5a8ca3ea02 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -113,6 +113,8 @@ public class Messages {
 	public String ModelEditor_Move;
 	public String ModelEditor_Cut;
 	public String ModelEditor_CutObjects;
+	public String ModelEditor_Paste;
+	public String ModelEditor_PasteObjects;
 	public String ModelTooling_Common_RuntimeContributionInstance;
 	public String ModelTooling_Common_RuntimeWidgetTree;
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 1e2c971aa0..de985ce980 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -47,6 +47,8 @@ ModelEditor_AddChild=Add child
 ModelEditor_Move=Move
 ModelEditor_Cut=Cut
 ModelEditor_CutObjects=Cut Objects
+ModelEditor_Paste=Paste
+ModelEditor_PasteObjects=Paste Objects
 ModelTooling_Common_RuntimeContributionInstance=Contrib. Instance
 ModelTooling_Common_RuntimeWidgetTree=Widget Tree
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 52d50f0b09..7b6191dfd2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -155,6 +155,7 @@
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationElementImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MContext;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
@@ -1640,6 +1641,7 @@ private void handleStructurePaste() {
 			}
 
 			CompoundCommand cc = new CompoundCommand();
+			Object pastedObject = null; // The single pasted object if single paste (for undo/redo message)
 			for (EObject eObject : toCopy) {
 				if (!ModelUtils.getTypeArgument(eObject.eClass(), feature.getEGenericType()).isInstance(eObject)) {
 					// the object to paste does not fit into the target feature
@@ -1657,6 +1659,7 @@ private void handleStructurePaste() {
 					final Command cmd = AddCommand.create(getModelProvider().getEditingDomain(), container, feature,
 							el);
 					if (cmd.canExecute()) {
+						pastedObject = el;
 						cc.append(cmd);
 					}
 					return;
@@ -1664,6 +1667,7 @@ private void handleStructurePaste() {
 
 				final Command cmd = AddCommand.create(getModelProvider().getEditingDomain(), container, feature,
 						eObject);
+				pastedObject = eObject;
 				if (cmd.canExecute()) {
 					cc.append(cmd);
 					if (isLiveModel()) {
@@ -1675,6 +1679,12 @@ private void handleStructurePaste() {
 				}
 			}
 			if (!cc.isEmpty()) {
+				if (cc.getCommandList().size() == 1) {
+					cc.setLabel(messages.ModelEditor_Paste + " " + getObjectNameForCommand(pastedObject)); //$NON-NLS-1$
+				} else {
+					cc.setLabel(messages.ModelEditor_PasteObjects);
+				}
+
 				getModelProvider().getEditingDomain().getCommandStack().execute(cc);
 			}
 		}
@@ -1751,7 +1761,7 @@ private void handleStructureCut() {
 				EObject o = objectsToCut.iterator().next();
 				cmd = RemoveCommand.create(getModelProvider().getEditingDomain(), o.eContainer(),
 						o.eContainingFeature(), o);
-				((AbstractCommand) cmd).setLabel((messages.ModelEditor_Cut + " " + getObjectNameForCommand(o))); //$NON-NLS-1$
+				((AbstractCommand) cmd).setLabel(messages.ModelEditor_Cut + " " + getObjectNameForCommand(o)); //$NON-NLS-1$
 			} else {
 				// There are more than one object to remove -> Compound command.
 				CompoundCommand cc = new CompoundCommand();
@@ -2061,7 +2071,8 @@ private boolean isValidDrop(Object target, Object instance, boolean isIndex) {
 	 * @return a representative string for the object or 'Object' if nothing found
 	 */
 	private String getObjectNameForCommand(Object data) {
-		String clname = (data instanceof EObject) ? ((EObject) data).eClass().getName() : "Object"; //$NON-NLS-1$
+		String clname = (data instanceof ApplicationElementImpl) ? ((ApplicationElementImpl) data).eClass().getName()
+				: "Object"; //$NON-NLS-1$
 		String dname = (data instanceof MUILabel) ? ((MUILabel) data).getLabel() : ""; //$NON-NLS-1$
 		return clname + " " + dname; //$NON-NLS-1$
 	}

From e1bae38d97b8403c9b1d40645faa910f3d279e05 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Thu, 8 Mar 2018 13:53:50 +0100
Subject: [PATCH 1026/1286] Bug 429684 - Application Model Editor does not
 display element after Undo operation

Fixed the warning.

Change-Id: Iea6841076cdc30f53835cc22446dc6299d8b9c82
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
index 26313dd675..57c5bb335f 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
@@ -49,8 +49,6 @@ public void run() {
 		}
 	}
 
-	private static int cpt = 0;
-
 	private void update() {
 		if (resource.getEditingDomain().getCommandStack().canUndo()) {
 			Command undoCommand = resource.getEditingDomain().getCommandStack()

From d7ddeb1c184706cb52b4ce55986dfd7a25cb3c07 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Mon, 12 Mar 2018 19:06:33 +0100
Subject: [PATCH 1027/1286] Bug 531451 - [Model Editor] Copy Paste with some
 elements throws a NPE or does not work

Use the isValidTarget for both paste and drop.

Change-Id: I4af421c87daa4d13dd5baeaf57ba47f889df6c62
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../emf/ui/internal/common/ModelEditor.java   | 84 ++++++++++---------
 1 file changed, 45 insertions(+), 39 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 7b6191dfd2..4357e5180b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -13,7 +13,7 @@
  * Steven Spungin <steven@spungin.tv> - Bug 396902, 431755, 431735, 424730, 424730, 391089, 437236, 437552, Ongoing
  * Maintenance
  * Simon Scholz <simon.scholz@vogella.com> - Bug 475365
- * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 472706, 429684
+ * Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 472706, 429684, 531451
  * Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 429684
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common;
@@ -456,7 +456,7 @@ void postCreate(Composite composite) {
 		tabItemTree.setControl(createFormTab(editorTabFolder));
 		tabItemTree.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_application_form));
 
-		tab_list_show(true);
+		tabListShow(true);
 
 		tabItemXmi = new CTabItem(editorTabFolder, SWT.NONE);
 		tabItemXmi.setText(messages.ModelEditor_XMI);
@@ -1290,7 +1290,7 @@ private void registerDefaultEditors() {
 		registerEditor(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT, StringModelFragment.class);
 	}
 
-	public void tab_list_show(Boolean show) {
+	public void tabListShow(Boolean show) {
 		if (editorTabFolder == null) {
 			return;
 		}
@@ -1522,8 +1522,6 @@ public void setFocus() {
 		if (clipboardService != null) {
 			clipboardService.setHandler(clipboardHandler);
 		}
-		// See bug 432095.
-		// viewer.getControl().setFocus();
 	}
 
 	public void setHeaderTitle(String title) {
@@ -1643,7 +1641,7 @@ private void handleStructurePaste() {
 			CompoundCommand cc = new CompoundCommand();
 			Object pastedObject = null; // The single pasted object if single paste (for undo/redo message)
 			for (EObject eObject : toCopy) {
-				if (!ModelUtils.getTypeArgument(eObject.eClass(), feature.getEGenericType()).isInstance(eObject)) {
+				if (!isValidTarget(parent, eObject, false)) {
 					// the object to paste does not fit into the target feature
 					continue;
 				}
@@ -1754,7 +1752,7 @@ private void handleStructureCut() {
 			}
 
 			Command cmd = null;
-			if (objectsToCut.size() == 0) {
+			if (objectsToCut.isEmpty()) {
 				return;
 			} else if (objectsToCut.size() == 1) {
 				// Only 1 object to cut... create a removeCommand
@@ -2010,13 +2008,13 @@ public boolean validateDrop(Object target, int operation, TransferData transferT
 			boolean rv = true;
 			if (getSelectedObject() instanceof MApplicationElement || getSelectedObject() instanceof MModelFragment) {
 				if (getCurrentLocation() == LOCATION_ON) {
-					rv = isValidDrop(target, getSelectedObject(), false);
+					rv = isValidTarget(target, getSelectedObject(), false);
 				} else if (getCurrentLocation() == LOCATION_AFTER || getCurrentLocation() == LOCATION_BEFORE) {
 					TreeItem item = (TreeItem) getCurrentEvent().item;
 					if (item != null) {
 						item = item.getParentItem();
 						if (item != null) {
-							rv = isValidDrop(item.getData(), getSelectedObject(), true);
+							rv = isValidTarget(item.getData(), getSelectedObject(), true);
 						}
 					}
 				}
@@ -2025,44 +2023,53 @@ public boolean validateDrop(Object target, int operation, TransferData transferT
 			return rv;
 		}
 
-		private boolean isValidDrop(Object target, Object instance, boolean isIndex) {
-			if (target instanceof MElementContainer<?>) {
-				@SuppressWarnings("unchecked")
-				final MElementContainer<MUIElement> container = (MElementContainer<MUIElement>) target;
+	}
 
-				if (isIndex || !container.getChildren().contains(instance)) {
-					final EClassifier classifier = ModelUtils.getTypeArgument(((EObject) container).eClass(),
-							UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN.getEGenericType());
+	/** This method checks if the target object is a valid target for the current instance.
+	 *  It used both for paste and for drag and drop behavior
+	 * @param target  the target object where instance should be pasted of dropped
+	 * @param instance the instance of object to be pasted or dropped
+	 * @param isIndex if true, means that target is an object in a container
+	 * @return
+	 */
+	private boolean isValidTarget(Object target, Object instance, boolean isIndex) {
+		if (target instanceof MElementContainer<?>) {
+			@SuppressWarnings("unchecked")
+			final MElementContainer<MUIElement> container = (MElementContainer<MUIElement>) target;
+
+			if (isIndex || !container.getChildren().contains(instance)) {
+				final EClassifier classifier = ModelUtils.getTypeArgument(((EObject) container).eClass(),
+						UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN.getEGenericType());
+				return classifier.isInstance(instance);
+			}
+		} else if (target instanceof VirtualEntry<?>) {
+			@SuppressWarnings("unchecked")
+			final VirtualEntry<Object> vTarget = (VirtualEntry<Object>) target;
+			if (isIndex || !vTarget.getList().contains(instance)) {
+				if (vTarget.getProperty() instanceof IEMFProperty) {
+					final EStructuralFeature feature = ((IEMFProperty) vTarget.getProperty())
+							.getStructuralFeature();
+					final EObject parent = (EObject) vTarget.getOriginalParent();
+					final EClassifier classifier = ModelUtils.getTypeArgument(parent.eClass(),
+							feature.getEGenericType());
 					return classifier.isInstance(instance);
 				}
-			} else if (target instanceof VirtualEntry<?>) {
-				@SuppressWarnings("unchecked")
-				final VirtualEntry<Object> vTarget = (VirtualEntry<Object>) target;
-				if (isIndex || !vTarget.getList().contains(instance)) {
-					if (vTarget.getProperty() instanceof IEMFProperty) {
-						final EStructuralFeature feature = ((IEMFProperty) vTarget.getProperty())
-								.getStructuralFeature();
-						final EObject parent = (EObject) vTarget.getOriginalParent();
-						final EClassifier classifier = ModelUtils.getTypeArgument(parent.eClass(),
-								feature.getEGenericType());
-						return classifier.isInstance(instance);
-					}
 
-				}
-			} else if (target instanceof EObject) {
-				final EObject eObj = (EObject) target;
-				for (final EStructuralFeature f : eObj.eClass().getEAllStructuralFeatures()) {
-					final EClassifier cl = ModelUtils.getTypeArgument(eObj.eClass(), f.getEGenericType());
-					if (cl.isInstance(instance)) {
-						return true;
-					}
+			}
+		} else if (target instanceof EObject) {
+			final EObject eObj = (EObject) target;
+			for (final EStructuralFeature f : eObj.eClass().getEAllStructuralFeatures()) {
+				final EClassifier cl = ModelUtils.getTypeArgument(eObj.eClass(), f.getEGenericType());
+				if (cl.isInstance(instance)) {
+					return true;
 				}
 			}
-
-			return false;
 		}
+
+		return false;
 	}
 
+
 	/**
 	 * compute a valid name for the undo/redo/paste of move commands
 	 *
@@ -2114,7 +2121,6 @@ public void gotoEObject(int targetHint, EObject object) {
 			default:
 				break;
 			}
-			// }
 		}
 	}
 

From 4942832d6723a65b7bc515039393aaa8ca66be59 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Mon, 12 Mar 2018 19:55:11 +0100
Subject: [PATCH 1028/1286] Bug 510341 - [ModelEditor] Should add tooltips on
 menuContribution dialog

Change-Id: Ia0d397e1f81ebb9916866114003493614c88eaf5
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.java   | 6 ++++++
 .../eclipse/e4/tools/emf/ui/internal/Messages.properties | 9 ++++++++-
 .../common/component/MenuContributionEditor.java         | 8 +++++---
 .../common/component/ToolBarContributionEditor.java      | 6 ++++--
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 5a8ca3ea02..6938dcd792 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -381,7 +381,9 @@ public class Messages {
 	public String MenuContributionEditor_Menu;
 	public String MenuContributionEditor_DirectMenuItem;
 	public String MenuContributionEditor_ParentId;
+	public String MenuContributionEditor_ParentIdTooltip;
 	public String MenuContributionEditor_Position;
+	public String MenuContributionEditor_PositionTooltip;
 	public String MenuContributionEditor_TreeLabel;
 	public String MenuContributionEditor_TreeLabelDescription;
 
@@ -448,6 +450,10 @@ public class Messages {
 
 	public String ToolBarContributionEditor_TreeLabel;
 	public String ToolBarContributionEditor_TreeLabelDescription;
+	public String ToolBarContributionEditor_ParentId;
+	public String ToolBarContributionEditor_ParentIdTooltip;
+	public String ToolBarContributionEditor_Position;
+	public String ToolBarContributionEditor_PositionTooltip;
 
 	public String ToolItemEditor_Type;
 	public String ToolItemEditor_Label;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index de985ce980..6dd52c1317 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -349,7 +349,9 @@ MenuContributionEditor_Separator=Separator
 MenuContributionEditor_Menu=Menu
 MenuContributionEditor_DirectMenuItem=Direct Menu Item
 MenuContributionEditor_ParentId=Parent-ID
+MenuContributionEditor_ParentIdTooltip=This is the id of the menu or the part into which the contributions should be added. Use 'org.eclipse.ui.main.menu' to contribute to the main menu and use 'popup' to handle contributions which are candidates to appear on any (top level) context menu. 
 MenuContributionEditor_Position=Position
+MenuContributionEditor_PositionTooltip=This is the position of the contribution. It has the form "[placement]=[id]" where placement is one of "before", "after", or "endof" and the id is expected to be the id of something in the menu.
 MenuContributionEditor_TreeLabel=Menu Contribution
 MenuContributionEditor_TreeLabelDescription=Menu Contribution 
 
@@ -421,7 +423,12 @@ RenderedMenuItem_TreeLabelDescription=Rendered Menu Item
 RenderedToolBarEditor_TreeLabel=Rendered ToolBar
 
 ToolBarContributionEditor_TreeLabel=ToolBar Contribution
-ToolBarContributionEditor_TreeLabelDescription=ToolBar Contribution 
+ToolBarContributionEditor_TreeLabelDescription=ToolBar Contribution
+ToolBarContributionEditor_ParentId=Parent-ID
+ToolBarContributionEditor_ParentIdTooltip=This is the id of the toolbar or the part into which the contributions should be added. Use 'org.eclipse.ui.main.toolbar' to contribute to the main toolbar. 
+ToolBarContributionEditor_Position=Position
+ToolBarContributionEditor_PositionTooltip=This is the position of the contribution. It has the form "[placement]=[id]" where placement is one of "before", "after", or "endof" and the id is expected to be the id of something in the toolbar.
+
 
 ToolItemEditor_Type=Type
 ToolItemEditor_Label=Label
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 3192a178ae..bae6a1cdfb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -209,6 +209,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_ParentId);
+			l.setToolTipText(Messages.MenuContributionEditor_ParentIdTooltip);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			final Text t = new Text(parent, SWT.BORDER);
@@ -235,7 +236,8 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		ControlFactory
-		.createTextField(parent, Messages.MenuContributionEditor_Position, master, context, textProp,
+				.createTextField(parent, Messages.MenuContributionEditor_Position,
+						Messages.MenuContributionEditor_PositionTooltip, master, context, textProp,
 				EMFEditProperties.value(getEditingDomain(),
 						MenuPackageImpl.Literals.MENU_CONTRIBUTION__POSITION_IN_PARENT));
 
@@ -276,8 +278,8 @@ protected void addPressed() {
 					defaultStruct,
 					new Struct(Messages.MenuContributionEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM,
 							false),
-							new Struct(Messages.MenuContributionEditor_DynamicMenuContribution,
-									MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
+					new Struct(Messages.MenuContributionEditor_DynamicMenuContribution,
+							MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
 			pickList.setSelection(new StructuredSelection(defaultStruct));
 
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index bf16bd6319..9cddb1785b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -211,7 +211,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			final Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuContributionEditor_ParentId);
+			l.setText(Messages.ToolBarContributionEditor_ParentId);
+			l.setToolTipText(Messages.ToolBarContributionEditor_ParentIdTooltip);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			final Text t = new Text(parent, SWT.BORDER);
@@ -236,7 +237,8 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
-		ControlFactory.createTextField(parent, Messages.MenuContributionEditor_Position, master, context, textProp,
+		ControlFactory.createTextField(parent, Messages.ToolBarContributionEditor_Position,
+				Messages.ToolBarContributionEditor_PositionTooltip, master, context, textProp,
 				EMFEditProperties.value(getEditingDomain(),
 						MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__POSITION_IN_PARENT));
 

From 5842dcd84ad4f70f594a7ee66f00500bd3925fef Mon Sep 17 00:00:00 2001
From: Jonas Helming <jhelming@eclipsesource.com>
Date: Tue, 4 Aug 2015 13:54:13 +0200
Subject: [PATCH 1029/1286] Bug 467552 - [e4 Tools] add
 org.eclipse.e4.tools.test to build

Change-Id: I1faf8c9b236d508310295646b320bee60978fc1a
Signed-off-by: Jonas Helming <jhelming@eclipsesource.com>
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 tests/org.eclipse.e4.tools.test/pom.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 tests/org.eclipse.e4.tools.test/pom.xml

diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
new file mode 100644
index 0000000000..a94b1144b1
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse</groupId>
+		<artifactId>eclipse.platform.ui.tools</artifactId>
+		<version>4.8.0-SNAPSHOT</version>
+		<relativePath>../../</relativePath>
+	</parent>
+
+	<groupId>eclipse.platform.ui.tool</groupId>
+	<artifactId>org.eclipse.e4.tools.test</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
+
+	<packaging>eclipse-test-plugin</packaging>
+
+</project>

From 401d4d8a42e73ff12afa19d4e4c8c0c996ba5b67 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Date: Sat, 12 May 2018 17:02:06 +0530
Subject: [PATCH 1030/1286] Bug 534597 - Unanticipated comparator errors in
 I20180511-2000

Change-Id: Iae6cdf08825ea0c0e467ccb6cedf0b6f209067ec
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt   | 1 +
 bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
index 983f2c1f97..d973feee32 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
+++ b/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
@@ -2,3 +2,4 @@
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
 Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
 Bug 491534 - comparator error in org.eclipse.e4.tools.emf.ui
+Bug 534597 - Unanticipated comparator errors in I20180511-2000
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
index dd589f1470..eff8570a29 100644
--- a/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
+++ b/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
@@ -1,4 +1,5 @@
 # To force a version qualifier update add the bug here
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
 Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
-Bug 509973 - Comparator errors in I20170105-0320
\ No newline at end of file
+Bug 509973 - Comparator errors in I20170105-0320
+Bug 534597 - Unanticipated comparator errors in I20180511-2000
\ No newline at end of file

From bfcb9ebd749f3274c203c3856661047da8c60d71 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Wed, 30 May 2018 14:49:02 +0300
Subject: [PATCH 1031/1286] Bug 535191 - POM version change for 4.9 release

Change-Id: I43d2b1e6b3636c9ac911091cdaf39dfc54989bef
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 bundles/org.eclipse.e4.tools.compat/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml     | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml          | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                   | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 4 ++--
 tests/org.eclipse.e4.tools.test/pom.xml                | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index af3c019053..5a1fb96f34 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index fa6f527fc4..dc89a4c70e 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 625b87e87f..fdb53ac864 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index fba848687d..06ce1622ae 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 241ce71480..44807709da 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index b19fdb7814..10ca4028ce 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index e6d43694a9..8a83548b02 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.8.0.qualifier"
+      version="4.9.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 7143b65e7c..ac47301ad6 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>4.9.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index a94b1144b1..d643be4310 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.8.0-SNAPSHOT</version>
+		<version>4.9.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From 1cf1f144ee5ecfd48f1b7a4b198be17f7ee676f5 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Date: Thu, 31 May 2018 14:41:49 +0530
Subject: [PATCH 1032/1286] Bug 535191 - POM version change for 4.9 release

Change-Id: I4e0442273ccdca21699bbe3bf2553bab3fb2738f
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
---
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 06ce1622ae..ab2f8f328a 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.jdt.templates</artifactId>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>4.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 44807709da..424a57cd89 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.services</artifactId>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>4.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 10ca4028ce..dbfc24525f 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tool</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>4.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From e1e91e2bf27669aa31272600c7415fa3fce495f2 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Date: Thu, 31 May 2018 14:16:47 -0500
Subject: [PATCH 1033/1286] Revert "Bug 535191 - POM version change for 4.9
 release"

This reverts commit 1cf1f144ee5ecfd48f1b7a4b198be17f7ee676f5.

Change-Id: I8ce39e836a6968d279a36b0f820635030af3ed80
---
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index ab2f8f328a..06ce1622ae 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.jdt.templates</artifactId>
-  <version>4.9.0-SNAPSHOT</version>
+  <version>4.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 424a57cd89..44807709da 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.services</artifactId>
-  <version>4.9.0-SNAPSHOT</version>
+  <version>4.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index dbfc24525f..10ca4028ce 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tool</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>4.9.0-SNAPSHOT</version>
+  <version>4.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From 3b5d9f074f37489f995dcb84847561d9c9d0963e Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 1 Jun 2018 12:53:09 +0200
Subject: [PATCH 1034/1286] Version 4.9 update in plaform.ui.tools as prep for
 the EPL 2.0 update

Change-Id: I3fb92ae700cb74887c3b0a93e0b413f988b7d04d
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF        | 2 +-
 bundles/org.eclipse.e4.tools.compat/pom.xml                     | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF  | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml               | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF        | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml                     | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml              | 2 +-
 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF      | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml                   | 2 +-
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF               | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                            | 2 +-
 tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF            | 2 +-
 tests/org.eclipse.e4.tools.test/pom.xml                         | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 6319a71bbb..6a2b1ed376 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 4.7.100.qualifier
+Bundle-Version: 4.7.200.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 5a1fb96f34..2b5df8a72f 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.compat</artifactId>
-  <version>4.7.100-SNAPSHOT</version>
+  <version>4.7.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 597b87b25a..df6bf35cc3 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 4.7.100.qualifier
+Bundle-Version: 4.7.200.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index dc89a4c70e..3b7f95e41b 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.editor3x</artifactId>
-  <version>4.7.100-SNAPSHOT</version>
+  <version>4.7.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 25258d1b8e..e6ce6f8923 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.6.0.qualifier
+Bundle-Version: 4.6.100.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index fdb53ac864..e4141382f8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.6.0-SNAPSHOT</version>
+  <version>4.6.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index cceb5c9ac7..e0a5b1b16a 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
-Bundle-Version: 4.8.0.qualifier
+Bundle-Version: 4.8.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 06ce1622ae..4dd86dac53 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.jdt.templates</artifactId>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>4.8.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index b4cc6b008c..88cf332c58 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
-Bundle-Version: 4.8.0.qualifier
+Bundle-Version: 4.8.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.emf.ui",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 44807709da..0145e85a88 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.services</artifactId>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>4.8.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 7cc87ee1f8..96aa16a7d0 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 4.8.0.qualifier
+Bundle-Version: 4.8.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 10ca4028ce..9916f2b141 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tool</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>4.8.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
index ab1751a6bc..6efa303042 100644
--- a/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.e4.tools.test
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
 Fragment-Host: org.eclipse.e4.tools;bundle-version="4.7.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.0.0",
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index d643be4310..e956582899 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>eclipse.platform.ui.tool</groupId>
 	<artifactId>org.eclipse.e4.tools.test</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.100-SNAPSHOT</version>
 
 	<packaging>eclipse-test-plugin</packaging>
 

From 81bfd7348523fb383f15348fff39d23deb862f40 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 5 Jun 2018 15:28:31 +0200
Subject: [PATCH 1035/1286] Bug 535318 - Update license to EPL-2.0 for
 platform.ui.tools in about.html

Change-Id: I7351287b1e8856d8e022783b9b23ae8389ea00ec
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../org.eclipse.e4.tools.compat/about.html    | 40 ++++++++------
 .../about.html                                | 55 ++++++++-----------
 .../org.eclipse.e4.tools.emf.ui/about.html    | 55 ++++++++-----------
 .../about.html                                | 55 ++++++++-----------
 .../org.eclipse.e4.tools.services/about.html  | 40 ++++++++------
 bundles/org.eclipse.e4.tools/about.html       | 55 ++++++++-----------
 6 files changed, 140 insertions(+), 160 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/about.html b/bundles/org.eclipse.e4.tools.compat/about.html
index 824948673d..164f781a8f 100644
--- a/bundles/org.eclipse.e4.tools.compat/about.html
+++ b/bundles/org.eclipse.e4.tools.compat/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>December 3, 2009</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/bundles/org.eclipse.e4.tools.emf.editor3x/about.html b/bundles/org.eclipse.e4.tools.emf.editor3x/about.html
index c1343aa318..164f781a8f 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/about.html
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/about.html
@@ -2,44 +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>December 3, 2009</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>
 
-<h3>Third Party Content</h3>
-
-<p>The Content includes items  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>Silk icon set Version 1.3</h4>
-<p>
-This plugin contains icons from the Silk icon set created by Mark James. The original files can
-be found at:
-<ul>
-<a href="http://www.famfamfam.com/lab/icons/silk/">http://www.famfamfam.com/lab/icons/silk/</a></ul>
-<p>The license can be found at:</p>
-<ul>
- <li><a href="http://creativecommons.org/licenses/by/2.5/">http://creativecommons.org/licenses/by/2.5/</a></li>
-</ul>
+	<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/bundles/org.eclipse.e4.tools.emf.ui/about.html b/bundles/org.eclipse.e4.tools.emf.ui/about.html
index c1343aa318..164f781a8f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/about.html
+++ b/bundles/org.eclipse.e4.tools.emf.ui/about.html
@@ -2,44 +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>December 3, 2009</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>
 
-<h3>Third Party Content</h3>
-
-<p>The Content includes items  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>Silk icon set Version 1.3</h4>
-<p>
-This plugin contains icons from the Silk icon set created by Mark James. The original files can
-be found at:
-<ul>
-<a href="http://www.famfamfam.com/lab/icons/silk/">http://www.famfamfam.com/lab/icons/silk/</a></ul>
-<p>The license can be found at:</p>
-<ul>
- <li><a href="http://creativecommons.org/licenses/by/2.5/">http://creativecommons.org/licenses/by/2.5/</a></li>
-</ul>
+	<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/bundles/org.eclipse.e4.tools.jdt.templates/about.html b/bundles/org.eclipse.e4.tools.jdt.templates/about.html
index c1343aa318..164f781a8f 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/about.html
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/about.html
@@ -2,44 +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>December 3, 2009</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>
 
-<h3>Third Party Content</h3>
-
-<p>The Content includes items  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>Silk icon set Version 1.3</h4>
-<p>
-This plugin contains icons from the Silk icon set created by Mark James. The original files can
-be found at:
-<ul>
-<a href="http://www.famfamfam.com/lab/icons/silk/">http://www.famfamfam.com/lab/icons/silk/</a></ul>
-<p>The license can be found at:</p>
-<ul>
- <li><a href="http://creativecommons.org/licenses/by/2.5/">http://creativecommons.org/licenses/by/2.5/</a></li>
-</ul>
+	<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/bundles/org.eclipse.e4.tools.services/about.html b/bundles/org.eclipse.e4.tools.services/about.html
index 824948673d..164f781a8f 100644
--- a/bundles/org.eclipse.e4.tools.services/about.html
+++ b/bundles/org.eclipse.e4.tools.services/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>December 3, 2009</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/bundles/org.eclipse.e4.tools/about.html b/bundles/org.eclipse.e4.tools/about.html
index c1343aa318..164f781a8f 100644
--- a/bundles/org.eclipse.e4.tools/about.html
+++ b/bundles/org.eclipse.e4.tools/about.html
@@ -2,44 +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>December 3, 2009</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>
 
-<h3>Third Party Content</h3>
-
-<p>The Content includes items  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>Silk icon set Version 1.3</h4>
-<p>
-This plugin contains icons from the Silk icon set created by Mark James. The original files can
-be found at:
-<ul>
-<a href="http://www.famfamfam.com/lab/icons/silk/">http://www.famfamfam.com/lab/icons/silk/</a></ul>
-<p>The license can be found at:</p>
-<ul>
- <li><a href="http://creativecommons.org/licenses/by/2.5/">http://creativecommons.org/licenses/by/2.5/</a></li>
-</ul>
+	<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

From ee3db4c7fe19b4a1905e1074f013115d955b2f75 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Thu, 1 Jun 2017 13:20:49 +0200
Subject: [PATCH 1036/1286] Bug 517644 - Field validation for Name in
 Application Editor should be ERROR

Changed the validation of field name to ERROR.
Added possibility to define the decoration type in the CreateTextField
method

Change-Id: I3bc07137843f8c28fc6d0806bc090eab865c6d94
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../tools/emf/ui/internal/Messages.properties |  2 +-
 .../component/BindingContextEditor.java       |  5 +-
 .../common/component/ControlFactory.java      | 60 ++++++++++++++++---
 3 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 6dd52c1317..ea00cf13b2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -394,7 +394,7 @@ BindingContextEditor_Name=Name
 BindingContextEditor_Description=Description
 BindingContextEditor_Subcontexts=Subcontexts
 BindingContextEditor_AddContext=Binding Context
-BindingContextEditor_NameWarning=Binding Context name should not be empty
+BindingContextEditor_NameWarning=Binding Context name must not be empty
 
 CommandParameterEditor_TreeLabel=Command Parameter
 CommandParameterEditor_TreeLabelDescritpion=Command Parameter
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 2645a2cb6f..0863e0733f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -42,6 +42,7 @@
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -169,9 +170,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
 				EMFEditProperties
 				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Name, master, context, textProp,
+		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Name, null, master, context, textProp,
 				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME),
-				Messages.BindingContextEditor_NameWarning);
+				Messages.BindingContextEditor_NameWarning, FieldDecorationRegistry.DEC_ERROR);
 		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Description, master, context, textProp,
 				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__DESCRIPTION));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 1ea6d171c0..997a29b6ea 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -26,6 +26,7 @@
 import org.eclipse.core.databinding.validation.IValidator;
 import org.eclipse.core.databinding.validation.ValidationStatus;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
@@ -387,12 +388,37 @@ public static void createTextField(Composite parent, String label, IObservableVa
 	 * @param textProp
 	 * @param modelProp
 	 * @param warningText
-	 *            Non null warningText means that a warning with this non-null
-	 *            text will be shown when the field is left empty
+	 *            Non null warningText means that a warning with this non-null text
+	 *            will be shown when the field is left empty
 	 */
 	public static void createTextField(Composite parent, String label, String tooltip, IObservableValue master,
 			EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp,
 			final String warningText) {
+		createTextField(parent, label, tooltip, master, context, textProp, modelProp, warningText,
+				FieldDecorationRegistry.DEC_WARNING);
+	}
+
+	/**
+	 *
+	 * @param parent
+	 * @param label
+	 * @param master
+	 * @param context
+	 * @param textProp
+	 * @param modelProp
+	 * @param decorationText
+	 *            Non null decorationText means that a message with this non-null
+	 *            text will be shown when the field is left empty
+	 * @param decorationType
+	 *            Non null decorationType describes the type of the decoration.
+	 *            Supported types: FieldDecorationRegistry.DEC_ERROR,
+	 *            FieldDecorationRegistry.DEC_WARNING,
+	 *            FieldDecorationRegistry.DEC_INFORMATION
+	 *
+	 */
+	public static void createTextField(Composite parent, String label, String tooltip, IObservableValue master,
+			EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp,
+			final String decorationText, final String decorationType) {
 		final Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
 		if (tooltip != null) {
@@ -405,23 +431,26 @@ public static void createTextField(Composite parent, String label, String toolti
 		gd.horizontalSpan = 2;
 		t.setLayoutData(gd);
 		TextPasteHandler.createFor(t);
-		if (warningText != null) {
+		if (decorationText != null) {
 			final ControlDecoration controlDecoration = new ControlDecoration(t, SWT.LEFT | SWT.TOP);
-			controlDecoration.setDescriptionText(warningText);
+			controlDecoration.setDescriptionText(decorationText);
 			final FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(
-					FieldDecorationRegistry.DEC_WARNING);
+					decorationType);
 			controlDecoration.setImage(fieldDecoration.getImage());
 			final IValidator iv = value -> {
 				if (value == null) {
 					controlDecoration.show();
-					return ValidationStatus.warning(warningText);
+					return ValidationStatus.warning(decorationText);
 				}
 				if (value instanceof String) {
 					final String text = (String) value;
 					if (text.trim().length() == 0) {
 						controlDecoration.show();
-						return ValidationStatus.warning(warningText);
+						return getValidationStatus(decorationType, decorationText);
 					}
+
+					controlDecoration.hide();
+					return Status.OK_STATUS;
 				}
 
 				controlDecoration.hide();
@@ -469,6 +498,23 @@ public static void createTranslatedTextField(Composite parent, String label, Str
 		// }
 	}
 
+	private static IStatus getValidationStatus(String decorationType, String decorationText) {
+		switch (decorationType) {
+		case FieldDecorationRegistry.DEC_ERROR:
+			return ValidationStatus.error(decorationText);
+		case FieldDecorationRegistry.DEC_WARNING:
+			return ValidationStatus.warning(decorationText);
+		case FieldDecorationRegistry.DEC_INFORMATION:
+			return ValidationStatus.info(decorationText);
+
+		default:
+			break;
+		}
+
+		return ValidationStatus.warning(decorationText);
+	}
+
+
 	public static void createFindImport(Composite parent, final Messages Messages,
 			final AbstractComponentEditor editor, EMFDataBindingContext context) {
 		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);

From 413f00c35e2cb5b894e76e0cb6092af51ff6df3b Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 28 Jun 2018 11:03:47 +0200
Subject: [PATCH 1037/1286] Adjust formatter to Eclipse standard in
 org.eclipse.e4.tools.emf.ui

Change-Id: I68880970ac1b8670df27362e26cf910cc89530fa
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../.settings/org.eclipse.jdt.core.prefs      | 32 ++++++++++++++++---
 .../.settings/org.eclipse.jdt.ui.prefs        |  3 +-
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
index 7591ee53e3..c9e7031d42 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -144,6 +144,7 @@ org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
@@ -155,10 +156,13 @@ org.eclipse.jdt.core.formatter.alignment_for_assignment=0
 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -168,6 +172,8 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
 org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
 org.eclipse.jdt.core.formatter.blank_lines_after_package=1
@@ -192,18 +198,21 @@ org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true
+org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
 org.eclipse.jdt.core.formatter.comment.line_length=80
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -214,7 +223,7 @@ org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
 org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
 org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
 org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false
 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
@@ -226,6 +235,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
 org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
@@ -420,12 +430,24 @@ org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
 org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
index e0627af010..58710421ee 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -60,7 +60,7 @@ cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
-formatter_settings_version=12
+formatter_settings_version=14
 org.eclipse.jdt.ui.exception.name=ex
 org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.javadoc=true
@@ -101,6 +101,7 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_modifiers=false
 sp_cleanup.remove_redundant_type_arguments=false
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true

From 622bdbf33fa829c99cd686cdeb4f858c9ae23db6 Mon Sep 17 00:00:00 2001
From: Jens Lidestrom <jens.lidestrom@rt-labs.com>
Date: Tue, 3 Jul 2018 17:15:52 +0200
Subject: [PATCH 1038/1286] Bug 472674 - Clear warnings after
 org.eclipse.core.databinding update

The following commit introduces type parameters on databinding
classes. This commit cleans up warnings resulting from that.

https://git.eclipse.org/c/platform/eclipse.platform.ui.git/commit/?id=2220dc6057030ca7d761b4ed6b7debb50eec3452

Change-Id: Ibf73d868e3a0db750014329d592db2a97c840760
Signed-off-by: Jens Lidestrom <jens.lidestrom@rt-labs.com>
---
 .../wizards/classes/AbstractNewClassPage.java | 26 +++++++++----------
 ...NewDynamicMenuContributionClassWizard.java |  1 +
 .../classes/NewHandlerClassWizard.java        |  1 +
 .../NewImperativeExpressionClassWizard.java   |  1 +
 .../wizards/classes/NewPartClassWizard.java   |  1 +
 .../classes/NewToolControlClassWizard.java    |  1 +
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index b52356a372..7242c82b7a 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -185,6 +185,7 @@ public void init(IStructuredSelection selection) {
 		}
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public void createControl(Composite parent) {
 		final Image img = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream(
@@ -220,10 +221,9 @@ public void createControl(Composite parent) {
 			t.setEditable(false);
 
 			final Binding bd = dbc.bindValue(
-					WidgetProperties.text().observe(t),
-					BeanProperties.value(FRAGMENT_ROOT).observe(clazz),
-					new UpdateValueStrategy().setBeforeSetValidator(new PFRootValidator()),
-					new UpdateValueStrategy().setConverter(new PackageFragmentRootToStringConverter())
+					WidgetProperties.text().observe(t), BeanProperties.value(FRAGMENT_ROOT).observe(clazz),
+					new UpdateValueStrategy<>().setBeforeSetValidator(new PFRootValidator()),
+					new UpdateValueStrategy<>().setConverter(new PackageFragmentRootToStringConverter())
 					);
 
 			final Button b = new Button(parent, SWT.PUSH);
@@ -251,9 +251,8 @@ public void widgetSelected(SelectionEvent e) {
 			final Binding bd = dbc.bindValue(
 					WidgetProperties.text(SWT.Modify).observe(tClassPackage),
 					BeanProperties.value(PACKAGE_FRAGMENT).observe(clazz),
-					new UpdateValueStrategy().setConverter(new StringToPackageFragmentConverter(clazz)),
-					new UpdateValueStrategy().setConverter(new PackageFragmentToStringConverter())
-					);
+					new UpdateValueStrategy<>().setConverter(new StringToPackageFragmentConverter(clazz)),
+					new UpdateValueStrategy<>().setConverter(new PackageFragmentToStringConverter()));
 
 			final Button b = new Button(parent, SWT.PUSH);
 			b.setText(Messages.AbstractNewClassPage_Browse);
@@ -280,7 +279,7 @@ public void widgetSelected(SelectionEvent e) {
 			tClassName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			dbc.bindValue(textProp.observe(tClassName),
 					BeanProperties.value(PROPERTY_NAME, String.class).observe(clazz),
-					new UpdateValueStrategy().setBeforeSetValidator(new ClassnameValidator()), null);
+					new UpdateValueStrategy<>().setBeforeSetValidator(new ClassnameValidator()), null);
 
 			new Label(parent, SWT.NONE);
 		}
@@ -292,7 +291,6 @@ public void widgetSelected(SelectionEvent e) {
 
 		final ISWTObservableValue obsPackage = WidgetProperties.text(SWT.Modify).observe(tClassPackage);
 		final ISWTObservableValue obsClass = WidgetProperties.text(SWT.Modify).observe(tClassName);
-		@SuppressWarnings("unchecked")
 		final ClassMultiValidator multiValidator = new ClassMultiValidator(clazz, obsPackage, obsClass);
 		dbc.addValidationStatusProvider(multiValidator);
 
@@ -483,7 +481,7 @@ protected IStatus validate() {
 
 	}
 
-	static class ClassnameValidator implements IValidator {
+	static class ClassnameValidator implements IValidator<Object> {
 
 		@Override
 		public IStatus validate(Object value) {
@@ -500,7 +498,7 @@ public IStatus validate(Object value) {
 		}
 	}
 
-	static class PFRootValidator implements IValidator {
+	static class PFRootValidator implements IValidator<Object> {
 
 		@Override
 		public IStatus validate(Object value) {
@@ -514,7 +512,7 @@ public IStatus validate(Object value) {
 		}
 	}
 
-	static class PackageFragmentRootToStringConverter extends Converter {
+	static class PackageFragmentRootToStringConverter extends Converter<Object, Object> {
 
 		public PackageFragmentRootToStringConverter() {
 			super(IPackageFragmentRoot.class, String.class);
@@ -530,7 +528,7 @@ public Object convert(Object fromObject) {
 		}
 	}
 
-	static class PackageFragmentToStringConverter extends Converter {
+	static class PackageFragmentToStringConverter extends Converter<Object, Object> {
 
 		public PackageFragmentToStringConverter() {
 			super(IPackageFragment.class, String.class);
@@ -546,7 +544,7 @@ public Object convert(Object fromObject) {
 		}
 	}
 
-	static class StringToPackageFragmentConverter extends Converter {
+	static class StringToPackageFragmentConverter extends Converter<Object, Object> {
 
 		private final JavaClass clazz;
 
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
index 5e0fa426b6..44cc288b6d 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
@@ -58,6 +58,7 @@ protected JavaClass createInstance() {
 				return new DynamicMenuContributionClass(root);
 			}
 
+			@SuppressWarnings("unchecked")
 			@Override
 			protected void createFields(Composite parent, DataBindingContext dbc) {
 				final IWidgetValueProperty textProp = WidgetProperties
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
index 9c675f961f..26c97e895f 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
@@ -62,6 +62,7 @@ protected JavaClass createInstance() {
 				return new HandlerClass(root);
 			}
 
+			@SuppressWarnings("unchecked")
 			@Override
 			protected void createFields(Composite parent, DataBindingContext dbc) {
 				final IWidgetValueProperty textProp = WidgetProperties
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java
index cad413b4a4..6b059c4191 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java
@@ -60,6 +60,7 @@ protected JavaClass createInstance() {
 				return new ImperativeExpressionClass(root);
 			}
 
+			@SuppressWarnings("unchecked")
 			@Override
 			protected void createFields(Composite parent, DataBindingContext dbc) {
 				final IWidgetValueProperty textProp = WidgetProperties
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
index 1e6d15ff30..1af24fd59d 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
@@ -57,6 +57,7 @@ public void addPages() {
 			Messages.NewPartClassWizard_CreateNewPart, root, ResourcesPlugin.getWorkspace()
 			.getRoot(), initialString) {
 
+			@SuppressWarnings("unchecked")
 			@Override
 			protected void createFields(Composite parent, DataBindingContext dbc) {
 				final IWidgetValueProperty textProp = WidgetProperties
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
index ccb1f02926..944c7d18c1 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
@@ -58,6 +58,7 @@ protected JavaClass createInstance() {
 				return new ToolControlClass(root);
 			}
 
+			@SuppressWarnings("unchecked")
 			@Override
 			protected void createFields(Composite parent, DataBindingContext dbc) {
 				final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);

From 07b2aba5b9b637102ea2c185995141cbc308ded4 Mon Sep 17 00:00:00 2001
From: Patrik Suzzi <psuzzi@itemis.com>
Date: Wed, 1 Aug 2018 00:17:23 +0200
Subject: [PATCH 1039/1286] Bug 534706 - Application model editor - Create
 dialog persist package

The Abstract new class Page now persist the last selected package.
(The solution works also for NewAddonCW, NewDynamicMenuContributionCW,
NewImperativeExplressionCW, NewPartCW, and NewToolControlCW)

Change-Id: I4e3ac01c189ec3fa2441f47c7794bf9d9f451f09
Signed-off-by: Patrik Suzzi <psuzzi@itemis.com>
---
 .../wizards/classes/AbstractNewClassPage.java | 40 +++++++++++++++++--
 .../classes/AbstractNewClassWizard.java       |  7 +++-
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index 7242c82b7a..683f52abf2 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -53,6 +53,7 @@
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.wizard.WizardPageSupport;
+import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -80,6 +81,11 @@ public abstract class AbstractNewClassPage extends WizardPage {
 	public static final String PACKAGE_FRAGMENT = "packageFragment"; //$NON-NLS-1$
 	public static final String PROPERTY_NAME = "name"; //$NON-NLS-1$
 
+	/** Name of the setting section for the new class wizard */
+	private static final String SETTING_SECTION_NEW_CLASS = "org.eclipse.e4.tools.wizards.newclass"; //$NON-NLS-1$
+	/** The package dialog setting */
+	private static final String SETTING_PACKAGE = "package"; //$NON-NLS-1$
+
 	public static class JavaClass {
 
 		protected PropertyChangeSupport support = new PropertyChangeSupport(this);
@@ -176,13 +182,39 @@ protected AbstractNewClassPage(String pageName, String title, String description
 	 *            used to initialize the fields
 	 */
 	public void init(IStructuredSelection selection) {
-		if (selection == null || selection.isEmpty() || selection.getFirstElement() == null) {
-			return;
-		}
-		if (selection.getFirstElement() instanceof IPackageFragment) {
+		if (selection != null && !selection.isEmpty() && selection.getFirstElement() != null
+				&& selection.getFirstElement() instanceof IPackageFragment) {
 			final IPackageFragment pkg = (IPackageFragment) selection.getFirstElement();
 			initialPackage = pkg.getElementName();
+		} else {
+			String settingPackage = getDialogSettings().get(SETTING_PACKAGE);
+			if (settingPackage != null) {
+				initialPackage = settingPackage;
+			}
+		}
+	}
+
+	/**
+	 * Gets called if the wizard is finished
+	 */
+	public void performFinish() {
+		String packageName = clazz.getPackageFragment().getElementName();
+		getDialogSettings().put(SETTING_PACKAGE, packageName);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.jface.wizard.WizardPage#getDialogSettings()
+	 */
+	@Override
+	protected IDialogSettings getDialogSettings() {
+		final IDialogSettings mainSettings = ToolsPlugin.getDefault().getDialogSettings();
+		IDialogSettings settingsSection = mainSettings.getSection(SETTING_SECTION_NEW_CLASS);
+		if (settingsSection == null) {
+			settingsSection = mainSettings.addNewSection(SETTING_SECTION_NEW_CLASS);
 		}
+		return settingsSection;
 	}
 
 	@SuppressWarnings("unchecked")
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
index 6581766ffa..303d9d884e 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
@@ -56,6 +56,7 @@ public abstract class AbstractNewClassWizard extends Wizard implements INewWizar
 	protected IPackageFragmentRoot root;
 	protected IFile file;
 	private IStructuredSelection selection;
+	private AbstractNewClassPage newClassPage;
 
 	public AbstractNewClassWizard() {
 		setWindowTitle(Messages.AbstractNewClassWizard_NewClass);
@@ -82,7 +83,8 @@ public IStructuredSelection getSelection() {
 	public void addPage(IWizardPage page) {
 		super.addPage(page);
 		if (page instanceof AbstractNewClassPage) {
-			((AbstractNewClassPage) page).init(getSelection());
+			newClassPage = ((AbstractNewClassPage) page);
+			newClassPage.init(getSelection());
 		}
 	}
 
@@ -271,6 +273,9 @@ public boolean performFinish() {
 				// TODO Auto-generated catch block
 				e1.printStackTrace();
 			}
+			if (newClassPage != null) {
+				newClassPage.performFinish();
+			}
 			final String cuName = clazz.getName() + JAVA;
 			final ICompilationUnit unit = fragment.getCompilationUnit(cuName);
 			final IResource resource = unit.getResource();

From 5b773810d697ad62da8e7ff7b2fa3f154d41787d Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 21 Aug 2018 12:06:31 +0200
Subject: [PATCH 1040/1286] Bug 530393 - EPL 2.0 update for platform.ui.tools
 feature

Change-Id: Iec558d1de9f5c5cf1bd9467ea8350148816e0271
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../feature.properties                         | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.properties b/features/org.eclipse.e4.core.tools.feature/feature.properties
index 56e1f20c90..bb34fcdc1e 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.properties
+++ b/features/org.eclipse.e4.core.tools.feature/feature.properties
@@ -1,9 +1,12 @@
 ###############################################################################
 # Copyright (c) 2000, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -26,10 +29,13 @@ description=Eclipse e4 Model Tooling
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
 Copyright (c) 2010 BestSolution.at, Soyatec and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n\
 \n\
 Contributors:\n\
     BestSolution.at - initial API and implementation\n\

From 1183317454147e6e0cca0440734b77dd0de613b1 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 21 Aug 2018 12:06:46 +0200
Subject: [PATCH 1041/1286] Bug 530393 - EPL 2.0 update for platform.ui.tools
 tests

Change-Id: Id8f44280053188895ba510563c647374dc46327e
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../eclipse/e4/tools/test/FragmentExtractHelperTest.java  | 8 +++++---
 .../eclipse/e4/tools/test/FragmentMergeHelperTest.java    | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java b/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
index b246261a52..ebe6a1b488 100644
--- a/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
+++ b/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
@@ -1,10 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 EclipseSource Muenchen GmbH and others.
  *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Jonas Helming- initial API and implementation
diff --git a/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java b/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java
index 74aff3d8f9..b5caf0def1 100644
--- a/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java
+++ b/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java
@@ -1,10 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2015 EclipseSource Muenchen GmbH and others.
  *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Jonas Helming- initial API and implementation

From 8b1554940711c81fd5c7716420a8fc68e8580fba Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 21 Aug 2018 12:06:58 +0200
Subject: [PATCH 1042/1286] Bug 530393 - EPL 2.0 update for platform.ui.tools
 plug-ins

Change-Id: Ic8f79f160be52f267fcbc1717d60ff8099be90b6
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../e4/tools/compat/internal/ClipboardServiceImpl.java   | 9 ++++++---
 .../e4/tools/compat/internal/ContextServiceFactory.java  | 9 ++++++---
 .../org/eclipse/e4/tools/compat/internal/CopyAction.java | 9 ++++++---
 .../org/eclipse/e4/tools/compat/internal/CutAction.java  | 9 ++++++---
 .../org/eclipse/e4/tools/compat/internal/Messages.java   | 9 ++++++---
 .../org/eclipse/e4/tools/compat/internal/PartHelper.java | 9 ++++++---
 .../eclipse/e4/tools/compat/internal/PasteAction.java    | 9 ++++++---
 .../org/eclipse/e4/tools/compat/parts/DIEditorPart.java  | 9 ++++++---
 .../src/org/eclipse/e4/tools/compat/parts/DIHandler.java | 9 ++++++---
 .../e4/tools/compat/parts/DIMultiPageEditorPart.java     | 9 ++++++---
 .../e4/tools/compat/parts/DISaveableViewPart.java        | 9 ++++++---
 .../org/eclipse/e4/tools/compat/parts/DIViewPart.java    | 9 ++++++---
 .../e4/tools/emf/editor3x/E4WorkbenchModelEditor.java    | 9 ++++++---
 .../src/org/eclipse/e4/tools/emf/editor3x/Messages.java  | 9 ++++++---
 .../tools/emf/editor3x/PDEClassContributionProvider.java | 9 ++++++---
 .../e4/tools/emf/editor3x/PDEExtensionLookup.java        | 9 ++++++---
 .../org/eclipse/e4/tools/emf/editor3x/RedoAction.java    | 9 ++++++---
 .../org/eclipse/e4/tools/emf/editor3x/RefactorModel.java | 9 ++++++---
 .../org/eclipse/e4/tools/emf/editor3x/UndoAction.java    | 9 ++++++---
 .../emf/editor3x/extension/AddonContributionEditor.java  | 9 ++++++---
 .../DynamicMenuContributionContributionEditor.java       | 9 ++++++---
 .../editor3x/extension/HandlerContributionEditor.java    | 9 ++++++---
 .../ImperativeExpressionContributionEditor.java          | 9 ++++++---
 .../emf/editor3x/extension/PartContributionEditor.java   | 9 ++++++---
 .../extension/ToolControlContributionEditor.java         | 9 ++++++---
 .../eclipse/e4/tools/emf/editor3x/extension/Util.java    | 9 ++++++---
 .../refactorparticipants/ModelMoveParticipant.java       | 9 ++++++---
 .../refactorparticipants/ModelRenameParticipant.java     | 9 ++++++---
 .../RefactorParticipantDelegate.java                     | 9 ++++++---
 .../emf/ui/common/AbstractElementEditorContribution.java | 9 ++++++---
 .../e4/tools/emf/ui/common/ComboViewerAutoComplete.java  | 9 ++++++---
 .../e4/tools/emf/ui/common/CommandToStringConverter.java | 9 ++++++---
 .../e4/tools/emf/ui/common/ContributionURIValidator.java | 9 ++++++---
 .../tools/emf/ui/common/IClassContributionProvider.java  | 9 ++++++---
 .../tools/emf/ui/common/IContributionClassCreator.java   | 9 ++++++---
 .../e4/tools/emf/ui/common/IEditorDescriptor.java        | 9 ++++++---
 .../eclipse/e4/tools/emf/ui/common/IEditorFeature.java   | 9 ++++++---
 .../eclipse/e4/tools/emf/ui/common/IExtensionLookup.java | 9 ++++++---
 .../e4/tools/emf/ui/common/IModelElementProvider.java    | 9 ++++++---
 .../eclipse/e4/tools/emf/ui/common/IModelResource.java   | 9 ++++++---
 .../e4/tools/emf/ui/common/IProviderStatusCallback.java  | 9 ++++++---
 .../tools/emf/ui/common/ISelectionProviderService.java   | 9 ++++++---
 .../org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java | 9 ++++++---
 .../eclipse/e4/tools/emf/ui/common/MemoryTransfer.java   | 9 ++++++---
 .../eclipse/e4/tools/emf/ui/common/ProviderStatus.java   | 9 ++++++---
 .../e4/tools/emf/ui/common/ResourceSearchScope.java      | 9 ++++++---
 .../src/org/eclipse/e4/tools/emf/ui/common/Util.java     | 9 ++++++---
 .../eclipse/e4/tools/emf/ui/common/XMIModelResource.java | 9 ++++++---
 .../emf/ui/common/component/AbstractComponentEditor.java | 9 ++++++---
 .../e4/tools/emf/ui/common/component/IdGenerator.java    | 9 ++++++---
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.java   | 9 ++++++---
 .../eclipse/e4/tools/emf/ui/internal/Messages.properties | 9 ++++++---
 .../emf/ui/internal/ObservableColumnLabelProvider.java   | 9 ++++++---
 .../e4/tools/emf/ui/internal/ResourceProvider.java       | 9 ++++++---
 .../eclipse/e4/tools/emf/ui/internal/StringMatcher.java  | 9 ++++++---
 .../tools/emf/ui/internal/common/AbstractPickList.java   | 9 ++++++---
 .../e4/tools/emf/ui/internal/common/Autocomplete.java    | 9 ++++++---
 .../ui/internal/common/ClassContributionCollector.java   | 9 ++++++---
 .../emf/ui/internal/common/ComponentLabelProvider.java   | 9 ++++++---
 .../e4/tools/emf/ui/internal/common/E4PickList.java      | 9 ++++++---
 .../tools/emf/ui/internal/common/E4StringPickList.java   | 9 ++++++---
 .../emf/ui/internal/common/EClassLabelProvider.java      | 9 ++++++---
 .../ui/internal/common/FeatureClassLabelProvider.java    | 9 ++++++---
 .../e4/tools/emf/ui/internal/common/ModelEditor.java     | 9 ++++++---
 .../e4/tools/emf/ui/internal/common/TreeViewerEx.java    | 9 ++++++---
 .../e4/tools/emf/ui/internal/common/VirtualEntry.java    | 9 ++++++---
 .../emf/ui/internal/common/component/AddonsEditor.java   | 9 ++++++---
 .../ui/internal/common/component/ApplicationEditor.java  | 9 ++++++---
 .../emf/ui/internal/common/component/AreaEditor.java     | 9 ++++++---
 .../internal/common/component/BindingContextEditor.java  | 9 ++++++---
 .../ui/internal/common/component/BindingTableEditor.java | 9 ++++++---
 .../emf/ui/internal/common/component/CategoryEditor.java | 9 ++++++---
 .../emf/ui/internal/common/component/CommandEditor.java  | 9 ++++++---
 .../common/component/CommandParameterEditor.java         | 9 ++++++---
 .../emf/ui/internal/common/component/ControlFactory.java | 9 ++++++---
 .../internal/common/component/CoreExpressionEditor.java  | 9 ++++++---
 .../internal/common/component/DirectMenuItemEditor.java  | 9 ++++++---
 .../internal/common/component/DirectToolItemEditor.java  | 9 ++++++---
 .../common/component/DynamicMenuContributionEditor.java  | 9 ++++++---
 .../internal/common/component/HandledMenuItemEditor.java | 9 ++++++---
 .../internal/common/component/HandledToolItemEditor.java | 9 ++++++---
 .../emf/ui/internal/common/component/HandlerEditor.java  | 9 ++++++---
 .../common/component/ImperativeExpressionEditor.java     | 9 ++++++---
 .../ui/internal/common/component/KeyBindingEditor.java   | 9 ++++++---
 .../common/component/MenuContributionEditor.java         | 9 ++++++---
 .../emf/ui/internal/common/component/MenuEditor.java     | 9 ++++++---
 .../emf/ui/internal/common/component/MenuItemEditor.java | 9 ++++++---
 .../internal/common/component/MenuSeparatorEditor.java   | 9 ++++++---
 .../internal/common/component/ModelFragmentsEditor.java  | 9 ++++++---
 .../ui/internal/common/component/ParameterEditor.java    | 9 ++++++---
 .../internal/common/component/PartDescriptorEditor.java  | 9 ++++++---
 .../emf/ui/internal/common/component/PartEditor.java     | 9 ++++++---
 .../common/component/PartSashContainerEditor.java        | 9 ++++++---
 .../ui/internal/common/component/PartStackEditor.java    | 9 ++++++---
 .../ui/internal/common/component/PerspectiveEditor.java  | 9 ++++++---
 .../common/component/PerspectiveStackEditor.java         | 9 ++++++---
 .../ui/internal/common/component/PlaceholderEditor.java  | 9 ++++++---
 .../ui/internal/common/component/PopupMenuEditor.java    | 9 ++++++---
 .../internal/common/component/StringModelFragment.java   | 9 ++++++---
 .../common/component/ToolBarContributionEditor.java      | 9 ++++++---
 .../emf/ui/internal/common/component/ToolBarEditor.java  | 9 ++++++---
 .../common/component/ToolBarSeparatorEditor.java         | 9 ++++++---
 .../ui/internal/common/component/ToolControlEditor.java  | 9 ++++++---
 .../emf/ui/internal/common/component/ToolItemEditor.java | 9 ++++++---
 .../emf/ui/internal/common/component/TrimBarEditor.java  | 9 ++++++---
 .../common/component/TrimContributionEditor.java         | 9 ++++++---
 .../internal/common/component/TrimmedWindowEditor.java   | 9 ++++++---
 .../emf/ui/internal/common/component/WindowEditor.java   | 9 ++++++---
 .../dialogs/AbstractCommandSelectionDialog.java          | 9 ++++++---
 .../common/component/dialogs/AbstractIconDialog.java     | 9 ++++++---
 .../dialogs/AbstractIconDialogWithHardcodedScope.java    | 9 ++++++---
 .../dialogs/AbstractIconDialogWithScopeAndFilter.java    | 9 ++++++---
 .../common/component/dialogs/AbstractIdDialog.java       | 9 ++++++---
 .../common/component/dialogs/AreaIconDialogEditor.java   | 9 ++++++---
 .../component/dialogs/BindingContextSelectionDialog.java | 9 ++++++---
 .../common/component/dialogs/BundleImageCache.java       | 9 ++++++---
 .../dialogs/CommandCategorySelectionDialog.java          | 9 ++++++---
 .../component/dialogs/ContributionClassDialog.java       | 9 ++++++---
 .../common/component/dialogs/ContributionDataFile.java   | 9 ++++++---
 .../common/component/dialogs/ExpressionIdDialog.java     | 9 ++++++---
 .../common/component/dialogs/FeatureSelectionDialog.java | 9 ++++++---
 .../component/dialogs/FilteredContributionDialog.java    | 9 ++++++---
 .../component/dialogs/FindImportElementDialog.java       | 9 ++++++---
 .../dialogs/FindParentReferenceElementDialog.java        | 9 ++++++---
 .../dialogs/HandledMenuItemCommandSelectionDialog.java   | 9 ++++++---
 .../dialogs/HandledToolItemCommandSelectionDialog.java   | 9 ++++++---
 .../component/dialogs/HandlerCommandSelectionDialog.java | 9 ++++++---
 .../dialogs/KeyBindingCommandSelectionDialog.java        | 9 ++++++---
 .../common/component/dialogs/MenuIconDialogEditor.java   | 9 ++++++---
 .../internal/common/component/dialogs/MenuIdDialog.java  | 9 ++++++---
 .../component/dialogs/MenuItemIconDialogEditor.java      | 9 ++++++---
 .../component/dialogs/ParameterIdSelectionDialog.java    | 9 ++++++---
 .../dialogs/PartDescriptorIconDialogEditor.java          | 9 ++++++---
 .../common/component/dialogs/PartIconDialogEditor.java   | 9 ++++++---
 .../component/dialogs/PerspectiveIconDialogEditor.java   | 9 ++++++---
 .../dialogs/SaveDialogBoundsSettingsDialog.java          | 9 ++++++---
 .../common/component/dialogs/SharedElementsDialog.java   | 9 ++++++---
 .../common/component/dialogs/ToolBarIdDialog.java        | 9 ++++++---
 .../component/dialogs/ToolItemIconDialogEditor.java      | 9 ++++++---
 .../internal/common/component/dialogs/TrimIdDialog.java  | 9 ++++++---
 .../common/component/dialogs/WindowIconDialogEditor.java | 9 ++++++---
 .../common/component/tabs/ContributionUriCellEditor.java | 9 ++++++---
 .../emf/ui/internal/common/component/tabs/DocUtil.java   | 9 ++++++---
 .../internal/common/component/tabs/E4ToolItemMenu.java   | 9 ++++++---
 .../common/component/tabs/EAttributeEditingSupport.java  | 9 ++++++---
 .../component/tabs/EAttributeTableViewerColumn.java      | 9 ++++++---
 .../emf/ui/internal/common/component/tabs/EmfUtil.java   | 9 ++++++---
 .../ui/internal/common/component/tabs/IGotoObject.java   | 9 ++++++---
 .../ui/internal/common/component/tabs/IViewEObjects.java | 9 ++++++---
 .../emf/ui/internal/common/component/tabs/ListTab.java   | 9 ++++++---
 .../component/tabs/ModelResourceContentProvider.java     | 9 ++++++---
 .../internal/common/component/tabs/TableViewerUtil.java  | 9 ++++++---
 .../emf/ui/internal/common/component/tabs/XmiTab.java    | 9 ++++++---
 .../emf/ui/internal/common/component/tabs/empty/E.java   | 9 ++++++---
 .../common/component/tabs/empty/EmptyFilterOption.java   | 9 ++++++---
 .../component/tabs/empty/TitleAreaFilterDialog.java      | 9 ++++++---
 .../empty/TitleAreaFilterDialogWithEmptyOptions.java     | 9 ++++++---
 .../common/component/virtual/VApplicationAddons.java     | 9 ++++++---
 .../component/virtual/VApplicationCategoriesEditor.java  | 9 ++++++---
 .../common/component/virtual/VBindingTableEditor.java    | 9 ++++++---
 .../common/component/virtual/VCommandEditor.java         | 9 ++++++---
 .../common/component/virtual/VHandlerEditor.java         | 9 ++++++---
 .../common/component/virtual/VItemParametersEditor.java  | 9 ++++++---
 .../component/virtual/VMenuContributionsEditor.java      | 9 ++++++---
 .../internal/common/component/virtual/VMenuEditor.java   | 9 ++++++---
 .../common/component/virtual/VModelFragmentsEditor.java  | 9 ++++++---
 .../common/component/virtual/VModelImportsEditor.java    | 9 ++++++---
 .../common/component/virtual/VPartDescriptor.java        | 9 ++++++---
 .../component/virtual/VPerspectiveControlEditor.java     | 9 ++++++---
 .../common/component/virtual/VRootBindingContexts.java   | 9 ++++++---
 .../component/virtual/VToolBarContributionsEditor.java   | 9 ++++++---
 .../component/virtual/VTrimContributionsEditor.java      | 9 ++++++---
 .../common/component/virtual/VWindowControlEditor.java   | 9 ++++++---
 .../internal/common/component/virtual/VWindowEditor.java | 9 ++++++---
 .../component/virtual/VWindowSharedElementsEditor.java   | 9 ++++++---
 .../common/component/virtual/VWindowTrimEditor.java      | 9 ++++++---
 .../ui/internal/common/properties/ExportIdsHandler.java  | 9 ++++++---
 .../internal/common/resourcelocator/BundleConverter.java | 9 ++++++---
 .../TargetPlatformClassContributionCollector.java        | 9 ++++++---
 .../TargetPlatformContributionCollector.java             | 9 ++++++---
 .../TargetPlatformIconContributionCollector.java         | 9 ++++++---
 .../resourcelocator/dialogs/BundleClassDialog.java       | 9 ++++++---
 .../common/resourcelocator/dialogs/DynamicWizard.java    | 9 ++++++---
 .../resourcelocator/dialogs/FindContributionDialog.java  | 9 ++++++---
 .../common/resourcelocator/dialogs/FindIconDialog.java   | 9 ++++++---
 .../common/resourcelocator/dialogs/IconDialog.java       | 9 ++++++---
 .../resourcelocator/dialogs/NonReferencedAction.java     | 9 ++++++---
 .../resourcelocator/dialogs/NonReferencedActionPage.java | 9 ++++++---
 .../dialogs/NonReferencedResourceDialog.java             | 9 ++++++---
 .../dialogs/NonReferencedResourceWizard.java             | 9 ++++++---
 .../resourcelocator/dialogs/PickProjectFolderPage.java   | 9 ++++++---
 .../common/resourcelocator/dialogs/PickProjectPage.java  | 9 ++++++---
 .../dialogs/ProjectFolderPickerDialog.java               | 9 ++++++---
 .../dialogs/ReferencedProjectPickerDialog.java           | 9 ++++++---
 .../common/resourcelocator/dialogs/UriDialog.java        | 9 ++++++---
 .../common/resourcelocator/dialogs/UriDialogType.java    | 9 ++++++---
 .../emf/ui/internal/common/uistructure/UIViewer.java     | 9 ++++++---
 .../ui/internal/common/uistructure/ViewerElement.java    | 9 ++++++---
 .../emf/ui/internal/common/xml/IXMLColorConstants.java   | 9 ++++++---
 .../internal/common/xml/NonRuleBasedDamagerRepairer.java | 9 ++++++---
 .../e4/tools/emf/ui/internal/common/xml/TagRule.java     | 9 ++++++---
 .../emf/ui/internal/common/xml/XMLConfiguration.java     | 9 ++++++---
 .../ui/internal/common/xml/XMLDoubleClickStrategy.java   | 9 ++++++---
 .../emf/ui/internal/common/xml/XMLPartitionScanner.java  | 9 ++++++---
 .../e4/tools/emf/ui/internal/common/xml/XMLScanner.java  | 9 ++++++---
 .../tools/emf/ui/internal/common/xml/XMLTagScanner.java  | 9 ++++++---
 .../ui/internal/common/xml/XMLWhitespaceDetector.java    | 9 ++++++---
 .../tools/emf/ui/internal/handlers/AbstractHandler.java  | 9 ++++++---
 .../emf/ui/internal/handlers/AutosizeColumnsHandler.java | 9 ++++++---
 .../handlers/MarkDuplicateAttributesHandler.java         | 9 ++++++---
 .../handlers/MarkDuplicateElementIdsHandler.java         | 9 ++++++---
 .../emf/ui/internal/handlers/MarkDuplicateItemsBase.java | 9 ++++++---
 .../ui/internal/handlers/MarkDuplicateLabelsHandler.java | 9 ++++++---
 .../internal/handlers/RepairDuplicateItemsHandler.java   | 9 ++++++---
 .../emf/ui/internal/handlers/ResetToDefaultHandler.java  | 9 ++++++---
 .../emf/ui/internal/handlers/UnmarkItemsHandler.java     | 9 ++++++---
 .../e4/tools/emf/ui/internal/imp/ModelImportPage1.java   | 9 ++++++---
 .../e4/tools/emf/ui/internal/imp/ModelImportWizard.java  | 9 ++++++---
 .../e4/tools/emf/ui/internal/imp/RegistryUtil.java       | 9 ++++++---
 .../emf/ui/internal/wbm/ApplicationModelEditor.java      | 9 ++++++---
 .../org.eclipse.e4.tools.jdt.templates/plugin.properties | 9 ++++++---
 .../e4/internal/tools/jdt/templates/E4ContextType.java   | 9 ++++++---
 .../templates/E4TemplateCompletionProposalComputer.java  | 9 ++++++---
 .../templates/default-e4templates.xml                    | 9 ++++++---
 .../org/eclipse/e4/tools/services/IClipboardService.java | 9 ++++++---
 .../eclipse/e4/tools/services/IDirtyProviderService.java | 9 ++++++---
 .../org/eclipse/e4/tools/services/IResourceService.java  | 9 ++++++---
 .../src/org/eclipse/e4/tools/services/impl/Messages.java | 9 ++++++---
 .../e4/tools/services/impl/ResourceBundleHelper.java     | 9 ++++++---
 .../services/impl/ResourceBundleTranslationProvider.java | 9 ++++++---
 .../e4/tools/services/impl/ResourcePoolFactory.java      | 9 ++++++---
 .../eclipse/e4/tools/services/impl/ResourceService.java  | 9 ++++++---
 .../src/org/eclipse/e4/internal/tools/Messages.java      | 9 ++++++---
 .../tools/wizards/classes/AbstractNewClassPage.java      | 9 ++++++---
 .../tools/wizards/classes/AbstractNewClassWizard.java    | 9 ++++++---
 .../tools/wizards/classes/NewAddonClassWizard.java       | 9 ++++++---
 .../classes/NewDynamicMenuContributionClassWizard.java   | 9 ++++++---
 .../tools/wizards/classes/NewHandlerClassWizard.java     | 9 ++++++---
 .../classes/NewImperativeExpressionClassWizard.java      | 9 ++++++---
 .../tools/wizards/classes/NewPartClassWizard.java        | 9 ++++++---
 .../tools/wizards/classes/NewToolControlClassWizard.java | 9 ++++++---
 .../classes/templates/ImperativeExpressionTemplate.java  | 9 ++++++---
 .../tools/wizards/model/BaseApplicationModelWizard.java  | 9 ++++++---
 .../wizards/model/ExtractContributionModelWizard.java    | 9 ++++++---
 .../tools/wizards/model/FragmentExtractHelper.java       | 9 ++++++---
 .../tools/wizards/model/FragmentMergeHelper.java         | 9 ++++++---
 .../tools/wizards/model/NewApplicationModelWizard.java   | 9 ++++++---
 .../tools/wizards/model/NewContributionModelWizard.java  | 9 ++++++---
 .../internal/tools/wizards/model/NewModelFilePage.java   | 9 ++++++---
 249 files changed, 1494 insertions(+), 747 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
index 74b2130997..eb4b601df9 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index a721ada319..b8ad75d99a 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
index 153fc5b473..1d274a2ec1 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
index e99fe89ac1..8315494d58 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
index cc3584f4e3..d77f12ef4f 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
@@ -1,10 +1,13 @@
 /*******************************************************************************
  * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
  *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Jonas - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
index cf57c5cf03..0cbb4407ae 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
index 78ce7e4e96..2496fe221a 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index d5a86d0461..51dfe8441d 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
index e1bfa9db33..5626b68511 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 EclipseSource München GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Jonas Helming <jhelming@eclipsesource.com> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
index 494b9dda55..cfcfdb4f5b 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2013 EclipseSource and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Jonas Helming <jhelming@eclipsesource.com>
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
index ded22cb6d1..4d621c35e8 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
index 4519e346b3..771cf21f42 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
index 781dd7ed27..e4f477180f 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
index cfc0e533fe..7023215ecb 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
@@ -1,10 +1,13 @@
 /*******************************************************************************
  * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
  *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Jonas - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index b944454bc5..1e50fead81 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java
index 0bb1ad183d..80b27e5025 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
index 09ccb0bc40..07cbf29491 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
index 3bca6203eb..a44bdfdb36 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 Remain Software, Industrial-TSI and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Wim Jongman <wim.jongman@remainsoftware.com> - Bug 432892: Eclipse 4 Application does not work after renaming the
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
index 57c5bb335f..1fdf4d134a 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
index 56aa6f1f41..c9d1bdb8a5 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java
index 0b441cb385..ff1d6a4126 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2013 MEDEVIT, FHV and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Marco Descher <marco@descher.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
index cb9d5874a7..85518bc6bd 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ImperativeExpressionContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ImperativeExpressionContributionEditor.java
index a08260df4f..1ca6e42e65 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ImperativeExpressionContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ImperativeExpressionContributionEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2016 vogella GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Simon Scholz <simon.scholz@vogella.com> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
index c837602803..eda6717709 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java
index 4fbc09b821..ffa8d04023 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 412672
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java
index c3e181ed7e..22fa9ac99c 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelMoveParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelMoveParticipant.java
index 315950cdea..aff5ce81a8 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelMoveParticipant.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelMoveParticipant.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2013 Remain Software, Industrial-TSI and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Wim Jongman <wim.jongman@remainsoftware.com> - Bug 395174: e4xmi should participate in package renaming
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelRenameParticipant.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelRenameParticipant.java
index e2a5b87fc9..e56ea9b816 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelRenameParticipant.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelRenameParticipant.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java
index f8d0972bfe..3b167b9059 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2011 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java
index 3c2434e926..6a36e9760b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 MEDEVIT, FHV and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Marco Descher <marco@descher.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
index e77c967097..2f7a46b16d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
index 1372aa5ba9..7fd5bc5f62 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
index ed964ee016..f2d17c255b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
index 059be46358..ca83df70e8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
index a10da50d4a..7f9d1b227d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010-2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java
index e56685d6a8..e455080d51 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010-2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
index 07e0ba7640..f018aba267 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010-2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java
index 24a2ebb11e..d83c3d3f93 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
index a276bdc834..8fc4c19884 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
index 0aead91e4d..248129844b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java
index 88d054b36f..be3e50d779 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 436283
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java
index f4769f1377..600c616fcd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
index b5d8cfbd33..5141d7aa1e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java
index 2ee24af40f..194bdb887e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java
index e882b7aa77..d0ad4aa532 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 436283
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java
index 229b429935..5d034e7341 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 404136, 424730
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index 872a5e84ff..166d8f23f8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
index 00772d6601..760c67ba24 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 10fb23d897..8c5cf482f2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010-2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
index 109155c53b..7703747ace 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 437951
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 6938dcd792..86cd0ed47e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010-2016 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index ea00cf13b2..5c235d7aa5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -1,9 +1,12 @@
 # ******************************************************************************
 # * Copyright (c) 2010-2016 BestSolution.at and others.
-# * All rights reserved. This program and the accompanying materials
-# * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+# * are made available under the terms of the Eclipse Public License 2.0
 # * which accompanies this distribution, and is available at
-# * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
 # *
 # * Contributors:
 # *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
index 90de8fadcf..6821490bd3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
index 6d0a1c1dff..e2b0351251 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2011-2013 BestSolution.at
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
index 3af8c8a223..fa01213200 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index ba53057731..a871bff0d6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java
index 884a9293b5..7171e04400 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
index dc4d1f29d2..f004380bde 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index 6d045a6bb7..e11f74c38a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
index 5c7e824a55..1f097278ab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
index 7a43417737..624cf8e9eb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Ongoing Maintenance
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
index 9ec9da8f10..38a776aaec 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
index 64900bd964..fb97dc1639 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 4357e5180b..b63eeda45a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
index 76dc6bcbcc..efa99ae0f6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 396902, Bug 431847
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
index 39c87237cc..d25932dba2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index dd39f04e3b..f261d2f128 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 33844acccf..865f57d17e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 8b8219fe8f..a04b923661 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 0863e0733f..f6f9d28e02 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 39ebf6b2db..e2387fdada 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index e42a7423cf..6db87576a3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 6f6394b8d8..341acffc84 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index da2e82f9eb..0d505d842c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 997a29b6ea..ac6e973566 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index e36f7e3aa5..7a8fe73af7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 16938b4c19..ea2907224f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index f3bf022a18..b4cf948e6f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
index e96b68ecf5..5a04a31776 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 MEDEVIT, FHV and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Marco Descher <marco@descher.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index 328c4dc8f5..ef7628d230 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index e56940c238..de2f825f90 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 43470eee59..413332c655 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
index 58d8a1fd19..90fd0ab9a4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2017 vogella GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Simon Scholz <simon.scholz@vogella.com> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 982b8fbd74..ab85385808 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index bae6a1cdfb..4b507b4504 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 27962f00c5..c384bbddc8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * f * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 1c12475eab..37b56b4520 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 351dbe6a64..f4c94a6e57 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index bd1c5e69f9..8ba6ad6bc3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index 7b5b9166dd..6769edd847 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 7c302e19d7..ee0ef4ba54 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index e568cee3d3..f97b8b259d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 695783e9cb..15aaf25b24 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index a8ca47831d..f26e6cabb1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index f65d55afd8..2fba1b57fb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index abe3252785..f7f4222992 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 14c0fdeb3b..2278e64730 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
index 799ea94c98..4e868df7dd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 210b71d5e7..5a3183fe0a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 9cddb1785b..e33863ccf1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 3dcb5c62b6..f26f130542 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 09f6d0bba2..9c60f24bc6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index db85f52e0d..352f3cc956 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 4831fb77e2..408fbc0c3a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 1f81079d54..7b1df394ca 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 2cf92d3543..f26da9219d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
index 8a2c35f7b4..7a037c3789 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index f0e777f261..6ba0b21df1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index ba4c58864b..6a9e502530 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
index b6e9aef66e..1de80dff31 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
index 8d5e9d59f0..50979271e2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
index 47d89b4456..be22627021 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
@@ -1,10 +1,13 @@
 /*******************************************************************************
  *
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
index fb5bc05143..4e2fc39847 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 fhv.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Nicolaj Hoess <nicohoess@gmail.com> - initial implementation (Bug 396975)
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
index 0d1a53917d..b8ae61550c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
index 1d6f27dda8..c61920e319 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
index 6c50276055..2b6de00861 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
index 1a2e729bd0..fd6fbd8064 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index 27580b7a94..f96292f408 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
index 0602d92db5..3f070ac90e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
index 73010b23c9..c8534fc366 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index 64abfe463d..61f16c273f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index c84de396d5..d88fa1eb5b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625, Bug 436281
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index 3c84fbbd21..f794602283 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index b99df97e30..a0071711dd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
index 7f0d166b63..ad7c35fbe6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
index fdb375df96..18884c0a1f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
index e566e1b1f5..91cf955d2a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
index 18259a9e12..ecafda9f22 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
index cc1fb68013..ae3bea525a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
index b63a6ae03f..91fd10b122 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2013 MEDEVIT, FHV and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Marco Descher <marco@descher.at> - initial implementation (Bug 396975)
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
index 0a91fe07ed..3811a86aac 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
index 4251c1a1f7..b2de6d8c5b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
@@ -1,10 +1,13 @@
 /*******************************************************************************
  * Copyright (c) 2015-2015 Veselin Markov.
  *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Veselin Markov <veselin_m84@yahoo.com> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
index 0583f21525..a907590d44 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
index ed311dd75d..49e08b9361 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
index 81bf9fefcb..771fcf6e91 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
index a0257e2c04..e48e845019 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 fhv.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Andrej ten Brummelhuis <andrejbrummelhuis@gmail.com> - initial implementation (Bug 395283)
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index 662f976aa5..a0d9816436 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java
index ac31685672..9cd371dd48 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2013
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Nicolaj Hoess <nicohoess@gmail.com> - initial implementation (Bug 396975)
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
index 9d6e1089fd..eb297a4435 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java
index 7cc522dd99..b3fedfbadd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2013
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Nicolaj Hoess <nicohoess@gmail.com> - initial implementation (Bug 396975)
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
index dc22bb1777..0aed3fe19f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
index c409cfffd6..b2598ded52 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
@@ -1,8 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others. All rights reserved. This
+.
+. This
  * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
+ * the Eclipse Public License 2.0 which accompanies this distribution, and is
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0
  *
  * Contributors: Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
  *******************************************************************************/
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
index bd8f24d9e6..45d7a567cc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
index a450489121..08a4aad09e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
index cb66d8d117..a6caf318a4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
index f6850a30de..5dbbd61ee6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555, Bug 436889
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
index 8287cde6e7..4f7274f477 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation, Ongoing Maintenance
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java
index fecd0ee826..adf54eebcd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
index 98730b7f41..1cb496c647 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555, Bug 436889
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index 463e58e6b7..dddd16aa12 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555, Bug 436889, Bug 437372, Bug 440469,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
index 4502751c1d..e0dfb383d1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
index 71d7b5567c..efc635276c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation, ongoing maintenance
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
index 2b11f386f8..ce7c85c6bb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
@@ -1,10 +1,13 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 TwelveTone LLC and others.
  * Copyright (c) 2010-2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 391089, Bug 437543, Ongoing Maintenance
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java
index b667d444a8..0c49fc2b06 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java
index 1bbba60232..ab64a45f2a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
index 7703c7faee..9ca937e627 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
index a417657fec..d0b629bfe3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
@@ -1,8 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others. All rights reserved. This
+.
+. This
  * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
+ * the Eclipse Public License 2.0 which accompanies this distribution, and is
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0
  *
  * Contributors: Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
  *******************************************************************************/
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index 78fc5f6adc..6ce701217a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index aabaca31f2..1139344232 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 625b6284a9..bf76b20f58 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index e53df4710d..216f2a57dd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index e1b8a1f1b1..f3858b0ac3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
index a78d405679..63b88b5076 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index 8d8dd864dc..2b9bb45e39 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index f9eddc9bd0..54a70ebeed 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index 5d068ba1bd..914830156d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index 1d15f5c476..3c73742b65 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index 307bd65d23..d6c8925630 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index aa6f62e8d7..1308207d90 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
index 80c27f0120..0f8576ed20 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index d13c255d0d..148251c922 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index c794a9045f..455b9db5d0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 9cc43a7bad..a37a5c75e1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index e05a1ab99e..c912dc261a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 5fbbf31c57..da91174556 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index b5fb4836d7..94b869cad0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
index f78c698225..5a6c978a60 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 MEDEVIT, FHV and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Marco Descher <marco@descher.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java
index 4fafe7a1b7..d78e89d903 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java
index eea44f5949..cb59615d91 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
index f7cb4a60ab..6cb9d88cfd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Bug 435625, Bug 436133, Bug 436132,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java
index b50ff3b7a7..a9d9f97b1b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
index 8d042193f9..a6357163af 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
@@ -1,8 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2017 TwelveTone LLC and others. All rights reserved. This
+.
+. This
  * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
+ * the Eclipse Public License 2.0 which accompanies this distribution, and is
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0
  *
  * Contributors: Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Ongoing Maintenance
  *******************************************************************************/
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
index 75ca2ca916..b3b7fb6ee8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
index 38a42ae693..8881fc81e0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java
index 4889711b8a..910bbd239a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
index bdfdd4456d..64f1aa09c5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
@@ -1,8 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2017 TwelveTone LLC and others. All rights reserved. This
+.
+. This
  * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
+ * the Eclipse Public License 2.0 which accompanies this distribution, and is
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0
  *
  * Contributors: Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
  *******************************************************************************/
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java
index 4ae63053b3..43fec42ddc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
index ced85b41b4..b5d2dc6d5f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 437569, Ongoing Maintenance
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
index 2d633ef512..64e9308b21 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Ongoing Maintenance
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
index 49db282f14..051d8a2205 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 436848
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
index 6d06f49794..fa5624d32b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Ongoing Maintenance
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
index a5125f924a..b55a4b1650 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - initial API and implementation, Ongoing Maintenance
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
index 96d553a4ce..8f44f6fd43 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
index 403797b228..ce80e5721e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java
index dd945d56af..ee320ae6ad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java
index 31b180bf1c..c97daa986f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
index f15b5c9b3e..b5cddd88f5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
index 6502826d30..6a6dd86f49 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Remain BV and others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Wim Jongman <wim.jongman@remainsoftware.com> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/IXMLColorConstants.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/IXMLColorConstants.java
index 0c7a2a580b..cde70c9f73 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/IXMLColorConstants.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/IXMLColorConstants.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java
index a331cbf7f7..2be34455b4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java
index cb588bc18b..9a908a8d2d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
index 804dcea408..4c82ebd882 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java
index 6f05a9b6ef..db2b94bd8a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLPartitionScanner.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLPartitionScanner.java
index 04ea48a9cc..130e672f50 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLPartitionScanner.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLPartitionScanner.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java
index 1e4329581f..7c079ce1bd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java
index 3a12036884..6fd30dc03e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java
index 91a53aeceb..3b13da3fa8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java
index 62a9074ebd..2a3af868bf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432372
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java
index b09dec2521..ac1fdb4904 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 436889
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
index 4f2001606d..d23e0218e2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432372, Ongoing Maintenance
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateElementIdsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateElementIdsHandler.java
index b8cb1453af..d26f8a62db 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateElementIdsHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateElementIdsHandler.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432372
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java
index 53d9caf5f9..36903e4a08 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432372
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateLabelsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateLabelsHandler.java
index e352bc1357..334e9c44ef 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateLabelsHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateLabelsHandler.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432372
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java
index f7f7a5f186..1feeefa2c5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432372
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java
index 9411611167..6ed99f5c25 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java
index b791888912..0f2002b8e1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 TwelveTone LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432372
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
index 9e270c1ab8..f4bf6472bf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
@@ -1,10 +1,13 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Remain BV, Industrial-TSI BV and others.
  *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Wim Jongmam <wim.jongman@remainsoftware.com> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
index c9a7b606f5..ba28bab2bb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
@@ -1,10 +1,13 @@
 /*******************************************************************************
  * Copyright (c) 2013 Remain BV, Industrial-TSI BV and others.
  *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Wim Jongmam <wim.jongman@remainsoftware.com> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
index 332a777306..f51bc055e1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
@@ -1,10 +1,13 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 Remain BV, Industrial-TSI BV and others.
  *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Wim Jongmam <wim.jongman@remainsoftware.com> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index d96b796fdb..78451c2719 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -2,10 +2,13 @@
  * Copyright (c) 2010, 2017 BestSolution.at and others.
 
 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties b/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties
index f85c6a42dc..a9112acfc2 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties
@@ -1,9 +1,12 @@
 ###############################################################################
 # Copyright (c) 2010, 2015 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
index 4cf75ec038..3ce63ee56a 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * IBM Corporation - initial API and implementation (adapted from JDT's SWTContextType)
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
index 4fe21c0727..450178ac0a 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2015 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * IBM Corporation - initial API and implementation (adapted from JDT's SWTTemplateCompletionProposalComputer)
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
index 9fc878bf7a..983d59076e 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
@@ -3,10 +3,13 @@
 <!--
 /*******************************************************************************
  * Copyright (c) 2010, 2015 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Boris Bokowski, IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java
index aaa453190c..c8141b02cb 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java
index cdbd5489ed..4e2f3f1d23 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java
index 29651e8bc1..a60d05a4da 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2011 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java
index d9637bb784..9a7c2f7a0d 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java
@@ -1,10 +1,13 @@
 /*******************************************************************************
  * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
  *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Jonas - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
index adfa902f29..5521b927ab 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Dirk Fauth and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Dirk Fauth <dirk.fauth@gmail.com> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
index 846e920fab..b619c1bb5a 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2012 Dirk Fauth and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Dirk Fauth <dirk.fauth@gmail.com> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java
index 43b46b710d..abb224994f 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2011 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
index f3d0a2f282..b5dc3e4906 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
index 70551d861d..bc1b40befe 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
@@ -1,10 +1,13 @@
 /*******************************************************************************
  * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
  *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Jonas - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index 683f52abf2..8f320db572 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
index 303d9d884e..954ea0163f 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
index 5b841f0a47..55a19be0b8 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
index 44cc288b6d..cd7d76f8ef 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2013 MEDEVIT, FHV and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Marco Descher <marco@descher.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
index 26c97e895f..20537b2d7c 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java
index 6b059c4191..597bc90d93 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2016 vogella GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Simon Scholz <simon.scholz@vogella.com> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
index 1af24fd59d..1b3200de1b 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
index 944c7d18c1..e62fc66105 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Dmitry Spiridenok <d.spiridenok@gmail.com> - Bug 412672
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java
index 9ddc13792b..4e8de8c880 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2016 vogella GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Simon Scholz <simon.scholz@vogella.com> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index d05ebf3a46..955bf01c19 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
index ebb7c02521..9189844286 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010-2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Sopot Cela <sopotcela@gmail.com> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
index d35d4ba4ad..c63376c7b9 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
@@ -1,10 +1,13 @@
 /*******************************************************************************
  * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
  *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Jonas Helming - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java
index f4861ec98c..a6efba50fa 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java
@@ -1,10 +1,13 @@
 /*******************************************************************************
  * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
  *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Jonas - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
index 3af8280042..9662109042 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
index 076f4737aa..b995d2d3d2 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010-2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
index 3962b920ec..0b151338d1 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation

From 53fb5a1078addf098c3916be27beaf9d6d60e21f Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 21 Aug 2018 16:09:54 +0200
Subject: [PATCH 1043/1286] Bug 535802 - EPL-2.0 for JDT templates in
 platform.ui.tools

Change-Id: I23cab3d2fb96c25491a43e86d05a03bcda2fcf11
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../.settings/org.eclipse.jdt.ui.prefs                          | 2 +-
 .../.settings/org.eclipse.jdt.ui.prefs                          | 2 +-
 .../.settings/org.eclipse.jdt.ui.prefs                          | 2 +-
 .../.settings/org.eclipse.jdt.ui.prefs                          | 2 +-
 .../.settings/org.eclipse.jdt.ui.prefs                          | 2 +-
 bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs | 2 +-
 .../.settings/org.eclipse.jdt.ui.prefs                          | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
index e0627af010..345ae3ec85 100644
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
@@ -66,7 +66,7 @@ org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n *\n * This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License 2.0\r\n * which accompanies this distribution, and is available at\r\n * https://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
index e0627af010..345ae3ec85 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
@@ -66,7 +66,7 @@ org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n *\n * This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License 2.0\r\n * which accompanies this distribution, and is available at\r\n * https://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
index 58710421ee..74dc76f295 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -66,7 +66,7 @@ org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n *\n * This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License 2.0\r\n * which accompanies this distribution, and is available at\r\n * https://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
index e0627af010..345ae3ec85 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
@@ -66,7 +66,7 @@ org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n *\n * This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License 2.0\r\n * which accompanies this distribution, and is available at\r\n * https://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
index 336d4397f4..3ccaa3facd 100644
--- a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
@@ -66,7 +66,7 @@ org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n *\n * This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License 2.0\r\n * which accompanies this distribution, and is available at\r\n * https://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
index e0627af010..345ae3ec85 100644
--- a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
@@ -66,7 +66,7 @@ org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n *\n * This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License 2.0\r\n * which accompanies this distribution, and is available at\r\n * https://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs
index e0627af010..345ae3ec85 100644
--- a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs
@@ -66,7 +66,7 @@ org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n *\n * This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License 2.0\r\n * which accompanies this distribution, and is available at\r\n * https://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true

From dc5ab9f73e8c7c25f3dbdccaf93920d6425c2daf Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 23 Aug 2018 17:01:19 +0200
Subject: [PATCH 1044/1286] Bug 538210- Fixes broken copyright in
 /org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties

Change-Id: Ia62912136c42417e10f258b2326a076dc440b0ac
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../e4/tools/emf/ui/internal/Messages.properties       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 5c235d7aa5..4078222efe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -1,12 +1,12 @@
 # ******************************************************************************
 # * Copyright (c) 2010-2016 BestSolution.at and others.
- *
- * This program and the accompanying materials
+# *
+# * This program and the accompanying materials
 # * are made available under the terms of the Eclipse Public License 2.0
 # * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
+# * https://www.eclipse.org/legal/epl-2.0/
+# *
+# * SPDX-License-Identifier: EPL-2.0
 # *
 # * Contributors:
 # *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation

From 3562630718a76d1763cbcce4be22a76d0d4368ba Mon Sep 17 00:00:00 2001
From: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Date: Tue, 4 Sep 2018 11:51:25 +0530
Subject: [PATCH 1045/1286] Bug 538531 - POM version change for 4.10 release

Change-Id: I4f4aedbc67eb1210c3b92210739e0326c9908b53
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
---
 bundles/org.eclipse.e4.tools.compat/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml     | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml          | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                   | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 4 ++--
 tests/org.eclipse.e4.tools.test/pom.xml                | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 2b5df8a72f..7935f9d39c 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.9.0-SNAPSHOT</version>
+    <version>4.10.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 3b7f95e41b..02bfcfbd1f 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.9.0-SNAPSHOT</version>
+    <version>4.10.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index e4141382f8..e9643925da 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.9.0-SNAPSHOT</version>
+    <version>4.10.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 4dd86dac53..ab274b9b13 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.9.0-SNAPSHOT</version>
+    <version>4.10.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 0145e85a88..148a0ac622 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.9.0-SNAPSHOT</version>
+    <version>4.10.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 9916f2b141..f3e29cb64f 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.9.0-SNAPSHOT</version>
+    <version>4.10.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 8a83548b02..b4838df0f9 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.9.0.qualifier"
+      version="4.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index ac47301ad6..d1283da577 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.9.0-SNAPSHOT</version>
+    <version>4.10.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>4.9.0-SNAPSHOT</version>
+  <version>4.10.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index e956582899..08b4243e1d 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.9.0-SNAPSHOT</version>
+		<version>4.10.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From 74906528d5edde55d4e1f7fe928524573f2b1f2d Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 7 Sep 2018 14:37:36 +0200
Subject: [PATCH 1046/1286] Bug 538778 - Enable auto activation keys for
 content assists in fragment editor

Change-Id: I26018408a1f22a00a7b06e2e4561c90e4375da28
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../emf/ui/internal/common/component/StringModelFragment.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 5a3183fe0a..645378c4d7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -383,9 +383,10 @@ public void widgetSelected(SelectionEvent e) {
 
 			KeyStroke keyStroke;
 			try {
+				char[] autoactivationChar = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.".toCharArray();
 				keyStroke = KeyStroke.getInstance("Ctrl+Space");
 				ContentProposalAdapter adapter = new ContentProposalAdapter(featureText, new TextContentAdapter(),
-						new StringModelFragmentProposalProvider(this, featureText), keyStroke, null);
+						new StringModelFragmentProposalProvider(this, featureText), keyStroke, autoactivationChar);
 				adapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE);
 			} catch (ParseException e) {
 				e.printStackTrace();

From 479b4fa23e4dc011dc3144d9b4678ff2f2a67976 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 7 Sep 2018 14:39:19 +0200
Subject: [PATCH 1047/1286] 4.10 version increase for
 org.eclipse.e4.tools.emf.ui

Change-Id: Iac2dafc26f4cec4759d7b47c4a13a5e1a5255ebc
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index e6ce6f8923..a6e43ab49c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.6.100.qualifier
+Bundle-Version: 4.6.200.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index e9643925da..11cf996184 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.6.100-SNAPSHOT</version>
+  <version>4.6.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>

From ceb1b07b8c6a7235765fb37546265fe12bec3f30 Mon Sep 17 00:00:00 2001
From: Burcu Karlidag <burcu.karlidag@sap.com>
Date: Wed, 12 Sep 2018 18:30:15 +0200
Subject: [PATCH 1048/1286] Bug 538787 - Find class button in Part Descriptor
 in e4 editor not working

Change-Id: I897c7f27c66de4e430698d21bb91f1da4e2cab40
Signed-off-by: Burcu Karlidag <burcu.karlidag@sap.com>
---
 .../tools/emf/ui/internal/common/component/ControlFactory.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index ac6e973566..5304ee90e9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -52,6 +52,7 @@
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationFactoryImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
@@ -889,7 +890,7 @@ public static void createClassURIField(Composite parent, final Messages Messages
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
-						editor.getEditingDomain(), (MContribution) editor.getMaster().getValue(),
+						editor.getEditingDomain(), (MPartDescriptor) editor.getMaster().getValue(),
 						feature, Messages);
 				dialog.open();
 			}

From a96fa615383924758e9b1e0b38818617c81397b4 Mon Sep 17 00:00:00 2001
From: Burcu Karlidag <burcu.karlidag@sap.com>
Date: Wed, 12 Sep 2018 20:14:46 +0200
Subject: [PATCH 1049/1286] Bug 538787 - Find class button in Part Descriptor
 in e4 editor not working

Steps to reproduce:
Create a new Plug-in Project as Rich Client Application
select Eclipse 4 RCP application.

The class URI Button in the Part Descriptor of the created
Application.e4xmi was not working



Change-Id: I498e01bb60e2a023dcbb71bbdae4e9ec67fa9398
Signed-off-by: Burcu Karlidag <burcu.karlidag@sap.com>
---
 .../tools/emf/ui/internal/common/component/ControlFactory.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 5304ee90e9..c2ddeeb431 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -52,7 +52,6 @@
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
-import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.impl.ApplicationFactoryImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
@@ -890,7 +889,7 @@ public static void createClassURIField(Composite parent, final Messages Messages
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
-						editor.getEditingDomain(), (MPartDescriptor) editor.getMaster().getValue(),
+						editor.getEditingDomain(), (MApplicationElement) editor.getMaster().getValue(),
 						feature, Messages);
 				dialog.open();
 			}

From 9f36f16a820950bc78443302cd959a3a92db7cfd Mon Sep 17 00:00:00 2001
From: Christof Joswig <christof.joswig@sap.com>
Date: Thu, 13 Sep 2018 10:48:39 +0200
Subject: [PATCH 1050/1286] Fix right-justified editor labels

Change-Id: Ie0fc86833c346cdde3648d6c1e3cf92afc4be1e4
Signed-off-by: Christof Joswig <christof.joswig@sap.com>
---
 .../ui/internal/common/component/AreaEditor.java |  2 +-
 .../common/component/BindingTableEditor.java     |  4 ++--
 .../internal/common/component/CommandEditor.java |  4 ++--
 .../common/component/CommandParameterEditor.java |  2 +-
 .../common/component/CompositePartEditor.java    |  6 +++---
 .../common/component/ControlFactory.java         | 16 ++++++++--------
 .../common/component/CoreExpressionEditor.java   |  2 +-
 .../common/component/HandledMenuItemEditor.java  |  2 +-
 .../common/component/HandledToolItemEditor.java  |  2 +-
 .../internal/common/component/HandlerEditor.java |  2 +-
 .../common/component/KeyBindingEditor.java       |  4 ++--
 .../common/component/MenuContributionEditor.java |  6 +++---
 .../ui/internal/common/component/MenuEditor.java |  6 +++---
 .../common/component/MenuItemEditor.java         | 10 +++++-----
 .../common/component/ParameterEditor.java        |  2 +-
 .../common/component/PartDescriptorEditor.java   | 12 ++++++------
 .../ui/internal/common/component/PartEditor.java |  4 ++--
 .../component/PartSashContainerEditor.java       |  2 +-
 .../common/component/PerspectiveEditor.java      |  2 +-
 .../common/component/PlaceholderEditor.java      |  2 +-
 .../common/component/StringModelFragment.java    |  4 ++--
 .../component/ToolBarContributionEditor.java     |  2 +-
 .../common/component/ToolControlEditor.java      |  4 ++--
 .../common/component/ToolItemEditor.java         | 12 ++++++------
 .../internal/common/component/TrimBarEditor.java |  2 +-
 .../common/component/TrimContributionEditor.java |  2 +-
 .../internal/common/component/WindowEditor.java  |  6 +++---
 27 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index a04b923661..4000586ec3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -259,7 +259,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.AreaEditor_Orientation);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final ComboViewer viewer = new ComboViewer(parent);
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index e2387fdada..2092eb2b31 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -163,7 +163,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ModelTooling_Common_Id);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -178,7 +178,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.BindingTableEditor_ContextId);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 341acffc84..c8093c6e44 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -166,7 +166,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id,
 				Messages.ModelTooling_CommandId_tooltip, master, context, textProp, EMFEditProperties.value(
 						getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID),
-						Messages.ModelTooling_Empty_Warning);
+				Messages.ModelTooling_Empty_Warning);
 		ControlFactory.createTextField(parent, Messages.CommandEditor_Name, master, context, textProp,
 				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME));
 		ControlFactory.createTextField(parent, Messages.CommandEditor_LabelDescription, master, context, textProp,
@@ -176,7 +176,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CommandEditor_Category);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 0d505d842c..6222e05a8a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -150,7 +150,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CommandParameterEditor_Optional);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index c3fa4539e7..562c2f698f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -255,7 +255,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CompositePartEditor_IconURI);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 			l.setToolTipText(Messages.CompositePartEditor_IconURI_Tooltip);
 
 			final Text t = new Text(parent, SWT.BORDER);
@@ -286,7 +286,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CompositePartEditor_Orientation);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final ComboViewer viewer = new ComboViewer(parent);
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -315,7 +315,7 @@ public String getText(Object element) {
 
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CompositePartEditor_Controls);
-			l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
+			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 
 			final Composite buttonCompTop = new Composite(parent, SWT.NONE);
 			final GridData span2 = new GridData(GridData.FILL, GridData.BEGINNING, false, false, 2, 1);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index c2ddeeb431..f687efbc18 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -163,7 +163,7 @@ public boolean validate(String text) {
 	public static void createXMIId(Composite parent, AbstractComponentEditor editor) {
 		final Label l = new Label(parent, SWT.NONE);
 		l.setText("XMI:ID"); //$NON-NLS-1$
-		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+		l.setLayoutData(new GridData());
 
 		final Text t = new Text(parent, SWT.BORDER);
 		t.setEditable(false);
@@ -427,7 +427,7 @@ public static void createTextField(Composite parent, String label, String toolti
 		if (tooltip != null) {
 			l.setToolTipText(tooltip);
 		}
-		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+		l.setLayoutData(new GridData());
 
 		final Text t = new Text(parent, SWT.BORDER);
 		final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -480,7 +480,7 @@ public static void createTranslatedTextField(Composite parent, String label, Str
 		if (tooltip != null) {
 			l.setToolTipText(tooltip);
 		}
-		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+		l.setLayoutData(new GridData());
 
 		final Text t = new Text(parent, SWT.BORDER);
 		final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -524,7 +524,7 @@ public static void createFindImport(Composite parent, final Messages Messages,
 
 		final Label l = new Label(parent, SWT.NONE);
 		l.setText(Messages.ModelTooling_Common_RefId);
-		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+		l.setLayoutData(new GridData());
 
 		final Text t = new Text(parent, SWT.BORDER);
 		final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -554,7 +554,7 @@ public static void createSelectedElement(Composite parent, final AbstractCompone
 			final EMFDataBindingContext context, String label) {
 		final Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
-		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+		l.setLayoutData(new GridData());
 
 		final ComboViewer viewer = new ComboViewer(parent);
 		final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -757,7 +757,7 @@ public static void createCheckBox(Composite parent, String label, String tooltip
 		if (tooltip != null) {
 			l.setToolTipText(tooltip);
 		}
-		l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+		l.setLayoutData(new GridData());
 
 		final Button t = new Button(parent, SWT.CHECK);
 		t.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
@@ -856,13 +856,13 @@ public static void createClassURIField(Composite parent, final Messages Messages
 		if (project != null && c != null) {
 			lnk = new Link(parent, SWT.NONE);
 			lnk.setText("<A>" + title + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
-			lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			lnk.setLayoutData(new GridData());
 			lnk.addSelectionListener(adapter);
 		} else {
 			lnk = null;
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(title);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 		}
 
 		final Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index 7a8fe73af7..2342f5297e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -104,7 +104,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CoreExpressionEditor_ExpressionId);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index ef7628d230..f5e1cb9304 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -86,7 +86,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.HandledMenuItemEditor_Command);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index de2f825f90..9f54dca63d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -74,7 +74,7 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.HandledToolItemEditor_Command);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 413332c655..1a1ee25b5c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -152,7 +152,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.HandlerEditor_Command);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index ab85385808..ccaa116da3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -174,7 +174,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.KeyBindingEditor_Sequence);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
@@ -189,7 +189,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.KeyBindingEditor_Command);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 4b507b4504..fa9503875b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -213,7 +213,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_ParentId);
 			l.setToolTipText(Messages.MenuContributionEditor_ParentIdTooltip);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
@@ -239,8 +239,8 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		ControlFactory
-				.createTextField(parent, Messages.MenuContributionEditor_Position,
-						Messages.MenuContributionEditor_PositionTooltip, master, context, textProp,
+		.createTextField(parent, Messages.MenuContributionEditor_Position,
+				Messages.MenuContributionEditor_PositionTooltip, master, context, textProp,
 				EMFEditProperties.value(getEditingDomain(),
 						MenuPackageImpl.Literals.MENU_CONTRIBUTION__POSITION_IN_PARENT));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index c384bbddc8..36069066b5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -251,7 +251,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			// Label l = new Label(parent, SWT.NONE);
 			// l.setText(Messages.MenuEditor_Children);
-			// l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING,
+			// l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING,
 			// false, false));
 			//
 			// new Label(parent, SWT.NONE);
@@ -290,7 +290,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		if (!rootMenu) {
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuEditor_IconURI);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
@@ -319,7 +319,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ModelTooling_UIElement_VisibleWhen);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final ComboViewer combo = new ComboViewer(parent);
 			combo.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 37b56b4520..b389832dae 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -187,7 +187,7 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 			{
 				final Label l = new Label(parent, SWT.NONE);
 				l.setText(Messages.MenuItemEditor_Type);
-				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+				l.setLayoutData(new GridData());
 
 				final ComboViewer viewer = new ComboViewer(parent);
 				viewer.setContentProvider(new ArrayContentProvider());
@@ -213,7 +213,7 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuItemEditor_IconURI);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
@@ -242,7 +242,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuItemEditor_Enabled);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Button b = new Button(parent, SWT.CHECK);
 			b.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
@@ -255,7 +255,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuItemEditor_Selected);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Button b = new Button(parent, SWT.CHECK);
 			b.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
@@ -291,7 +291,7 @@ public Object convert(Object fromObject) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ModelTooling_UIElement_VisibleWhen);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final ComboViewer combo = new ComboViewer(parent);
 			combo.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index 6769edd847..63fa9e5f59 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -172,7 +172,7 @@ private void createParameterNameRow(Composite parent, IWidgetValueProperty textP
 		{
 			final Label commandParameterIdLabel = new Label(parent, SWT.NONE);
 			commandParameterIdLabel.setText(Messages.ParameterEditor_Command_Parameter_ID);
-			commandParameterIdLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			commandParameterIdLabel.setLayoutData(new GridData());
 
 			final Text commandParameterIdValue = new Text(parent, SWT.BORDER);
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index ee0ef4ba54..0a4d78f3fa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -183,7 +183,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_IconURI);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
@@ -232,7 +232,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_ToolBar);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			createRemoveToolBar = new Button(parent, SWT.CHECK);
 			createRemoveToolBar.addSelectionListener(new SelectionAdapter() {
@@ -253,7 +253,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_ContainerData);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -269,7 +269,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_Closeable);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
@@ -285,7 +285,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_Multiple);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
@@ -301,7 +301,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartDescriptorEditor_Category);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false, 2, 1));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index f97b8b259d..1147411b0e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -187,7 +187,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_IconURI);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 			l.setToolTipText(Messages.PartEditor_IconURI_Tooltip);
 
 			final Text t = new Text(parent, SWT.BORDER);
@@ -228,7 +228,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartEditor_ToolBar);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			createRemoveToolBar = new Button(parent, SWT.CHECK);
 			createRemoveToolBar.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 15aaf25b24..93c3eacab3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -248,7 +248,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PartSashContainerEditor_Orientation);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final ComboViewer viewer = new ComboViewer(parent);
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 2fba1b57fb..f247cdaec7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -236,7 +236,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PerspectiveEditor_IconURI);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 2278e64730..84b1e71de2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -185,7 +185,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.PlaceholderEditor_Reference);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 645378c4d7..05d0a25017 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -290,7 +290,7 @@ private Composite createForm(Composite parent) {
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.StringModelFragment_ParentId);
 			l.setToolTipText(Messages.StringModelFragment_ParentIdTooltip);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Composite comp = new Composite(parent, SWT.NONE);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -336,7 +336,7 @@ public void widgetSelected(SelectionEvent e) {
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.StringModelFragment_Featurename);
 			l.setToolTipText(Messages.StringModelFragment_FeaturenameTooltip);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Composite comp = new Composite(parent, SWT.NONE);
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index e33863ccf1..30001d31ad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -216,7 +216,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolBarContributionEditor_ParentId);
 			l.setToolTipText(Messages.ToolBarContributionEditor_ParentIdTooltip);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 352f3cc956..a67175dd0b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -165,7 +165,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			if (project != null && c != null) {
 				final Link lnk = new Link(parent, SWT.NONE);
 				lnk.setText("<A>" + Messages.ToolControlEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
-				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+				lnk.setLayoutData(new GridData());
 				lnk.addSelectionListener(new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
@@ -176,7 +176,7 @@ public void widgetSelected(SelectionEvent e) {
 			} else {
 				final Label l = new Label(parent, SWT.NONE);
 				l.setText(Messages.ToolControlEditor_ClassURI);
-				l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+				l.setLayoutData(new GridData());
 			}
 
 			final Text t = new Text(parent, SWT.BORDER);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 408fbc0c3a..87ff1c384c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -193,7 +193,7 @@ protected void createFormSubTypeForm(Composite parent, CTabFolder folder, EMFDat
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolItemEditor_Type);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final ComboViewer viewer = new ComboViewer(parent);
 			viewer.setContentProvider(new ArrayContentProvider());
@@ -213,7 +213,7 @@ protected void createFormSubTypeForm(Composite parent, CTabFolder folder, EMFDat
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolItemEditor_IconURI);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
@@ -238,7 +238,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolItemEditor_Menu);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			createRemoveMenu = new Button(parent, SWT.CHECK);
 			createRemoveMenu.addSelectionListener(new SelectionAdapter() {
@@ -258,7 +258,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolItemEditor_Enabled);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Button b = new Button(parent, SWT.CHECK);
 			b.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
@@ -268,7 +268,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ToolItemEditor_Selected);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Button b = new Button(parent, SWT.CHECK);
 			b.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
@@ -298,7 +298,7 @@ public Object convert(Object fromObject) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.ModelTooling_UIElement_VisibleWhen);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final ComboViewer combo = new ComboViewer(parent);
 			combo.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 7b1df394ca..df310419c3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -198,7 +198,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.TrimBarEditor_Side);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final ComboViewer viewer = new ComboViewer(parent);
 			viewer.setContentProvider(new ArrayContentProvider());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index f26da9219d..74f386f19b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -205,7 +205,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_ParentId);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 6ba0b21df1..b3fb7fdcbb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -196,7 +196,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.WindowEditor_Bounds);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Composite comp = new Composite(parent, SWT.NONE);
 			final GridLayout layout = new GridLayout(4, true);
@@ -246,7 +246,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.WindowEditor_IconURI);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -274,7 +274,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.WindowEditor_MainMenu);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			createRemoveMainMenu = new Button(parent, SWT.CHECK);
 			createRemoveMainMenu.addSelectionListener(new SelectionAdapter() {

From 31119ade81a2d0fe60a23e645e9e7e768d970a8e Mon Sep 17 00:00:00 2001
From: Christof Joswig <christof.joswig@sap.com>
Date: Thu, 13 Sep 2018 11:19:20 +0200
Subject: [PATCH 1051/1286] Fix NPE in Model Fragment Editor

The Feature Name field is empty.
Pressing the Add button in the Table Viewer leads to a NPE exception.

java.lang.NullPointerException
	at org.eclipse.e4.tools.emf.ui.internal.common.component.StringModelFragment$3.addPressed(StringModelFragment.java:422)

Change-Id: I91ef4e45b654ad8c4d091abbcd2dd904b94da362
Signed-off-by: Christof Joswig <christof.joswig@sap.com>
---
 .../ui/internal/common/component/StringModelFragment.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 05d0a25017..bd2edeb26f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -418,9 +418,11 @@ public void widgetSelected(SelectionEvent e) {
 					FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS) {
 				@Override
 				protected void addPressed() {
-					final EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection())
-							.getFirstElement()).eClass;
-					handleAdd(eClass, false);
+					if(!getSelection().isEmpty()) {
+						final EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection())
+								.getFirstElement()).eClass;
+						handleAdd(eClass, false);
+					}
 				}
 
 				@Override

From 7f01e700cf819018a147df3c3f71034282c11304 Mon Sep 17 00:00:00 2001
From: Christof Joswig <christof.joswig@sap.com>
Date: Thu, 13 Sep 2018 12:21:20 +0200
Subject: [PATCH 1052/1286] Remove label comment

Change-Id: I7ff26d1ef258f541176773b10ca6c1ebc69403a2
Signed-off-by: Christof Joswig <christof.joswig@sap.com>
---
 .../emf/ui/internal/common/component/MenuEditor.java     | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 36069066b5..cdb0a070e2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -248,15 +248,6 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS));
 
 		{
-
-			// Label l = new Label(parent, SWT.NONE);
-			// l.setText(Messages.MenuEditor_Children);
-			// l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING,
-			// false, false));
-			//
-			// new Label(parent, SWT.NONE);
-			// new Label(parent, SWT.NONE);
-
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
 					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			pickList.setText(Messages.MenuEditor_Children);

From 9be4344d7eb2dc899f8cc856490374d7e76d5276 Mon Sep 17 00:00:00 2001
From: Christof Joswig <christof.joswig@sap.com>
Date: Thu, 13 Sep 2018 16:00:38 +0200
Subject: [PATCH 1053/1286] Replace getSelection with getStructuredSelection

Change-Id: I18be37d47d978be4ac5c1283b135dd2ee2b98e8a
Signed-off-by: Christof Joswig <christof.joswig@sap.com>
---
 .../e4/tools/emf/ui/internal/common/AbstractPickList.java    | 4 ++--
 .../tools/emf/ui/internal/common/component/AreaEditor.java   | 3 +--
 .../ui/internal/common/component/MenuContributionEditor.java | 3 +--
 .../ui/internal/common/component/ModelFragmentsEditor.java   | 3 +--
 .../internal/common/component/PartSashContainerEditor.java   | 3 +--
 .../emf/ui/internal/common/component/PartStackEditor.java    | 5 ++---
 .../ui/internal/common/component/StringModelFragment.java    | 4 +---
 .../internal/common/component/ToolBarContributionEditor.java | 3 +--
 .../emf/ui/internal/common/component/ToolBarEditor.java      | 3 +--
 .../emf/ui/internal/common/component/TrimBarEditor.java      | 3 +--
 .../ui/internal/common/component/TrimContributionEditor.java | 3 +--
 .../ui/internal/common/component/virtual/VMenuEditor.java    | 3 +--
 .../common/component/virtual/VModelImportsEditor.java        | 3 +--
 .../common/component/virtual/VPerspectiveControlEditor.java  | 3 +--
 .../internal/common/component/virtual/VSnippetsEditor.java   | 3 +--
 .../common/component/virtual/VWindowControlEditor.java       | 5 ++---
 .../ui/internal/common/component/virtual/VWindowEditor.java  | 3 +--
 .../component/virtual/VWindowSharedElementsEditor.java       | 3 +--
 18 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index a871bff0d6..da250fe291 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -209,8 +209,8 @@ public void setInput(Object input) {
 		// autoCompleteField.setProposals(keySet.toArray(new String[keySet.size()]));
 	}
 
-	public ISelection getSelection() {
-		return getPicker().getSelection();
+	public IStructuredSelection getSelection() {
+		return getPicker().getStructuredSelection();
 	}
 
 	public void setSelection(ISelection selection) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 4000586ec3..5c66ec9198 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -62,7 +62,6 @@
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
@@ -289,7 +288,7 @@ public String getText(Object element) {
 					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
+					final EClass eClass = (EClass) getSelection().getFirstElement();
 					handleAddChild(eClass);
 				}
 			};
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index fa9503875b..8346adf9d1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -53,7 +53,6 @@
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
@@ -250,7 +249,7 @@ public void widgetSelected(SelectionEvent e) {
 					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					final Struct struct = (Struct) ((IStructuredSelection) getSelection()).getFirstElement();
+					final Struct struct = (Struct) getSelection().getFirstElement();
 					final EClass eClass = struct.eClass;
 					final MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index 8ba6ad6bc3..bd661df6fa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -47,7 +47,6 @@
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
@@ -168,7 +167,7 @@ private void createImportsTab(CTabFolder folder) {
 				FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
 			@Override
 			protected void addPressed() {
-				final EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
+				final EClass eClass = ((FeatureClass) getSelection().getFirstElement()).eClass;
 				final EObject eObject = EcoreUtil.create(eClass);
 
 				final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 93c3eacab3..aec390bcb7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -57,7 +57,6 @@
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
@@ -278,7 +277,7 @@ public String getText(Object element) {
 					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					final EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
+					final EClass eClass = ((FeatureClass) getSelection().getFirstElement()).eClass;
 					handleAddChild(eClass);
 				}
 			};
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index f26e6cabb1..fa29ac4894 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -52,7 +52,6 @@
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -139,7 +138,7 @@ public void run() {
 		.add(new Action(Messages.PartStackEditor_Editors, createImageDescriptor(ResourceProvider.IMG_Part)) {
 			@Override
 			public void run() {
-						handleImportChild(BasicPackageImpl.Literals.PART);
+				handleImportChild(BasicPackageImpl.Literals.PART);
 			}
 		});
 
@@ -234,7 +233,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					final EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection()).getFirstElement()).eClass;
+					final EClass eClass = ((FeatureClass) getSelection().getFirstElement()).eClass;
 					handleAddChild(eClass);
 				}
 			};
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index bd2edeb26f..21a9047c9d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -78,7 +78,6 @@
 import org.eclipse.jface.fieldassist.IContentProposal;
 import org.eclipse.jface.fieldassist.IContentProposalProvider;
 import org.eclipse.jface.fieldassist.TextContentAdapter;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
@@ -419,8 +418,7 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				protected void addPressed() {
 					if(!getSelection().isEmpty()) {
-						final EClass eClass = ((FeatureClass) ((IStructuredSelection) getSelection())
-								.getFirstElement()).eClass;
+						final EClass eClass = ((FeatureClass) getSelection().getFirstElement()).eClass;
 						handleAdd(eClass, false);
 					}
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 30001d31ad..cf9477ce83 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -56,7 +56,6 @@
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -251,7 +250,7 @@ public void widgetSelected(SelectionEvent e) {
 					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					final Struct struct = (Struct) ((IStructuredSelection) getSelection()).getFirstElement();
+					final Struct struct = (Struct) getSelection().getFirstElement();
 					final EClass eClass = struct.eClass;
 					final MToolBarElement eObject = (MToolBarElement) EcoreUtil.create(eClass);
 					setElementId(eObject);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index f26f130542..ddf25c1254 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -47,7 +47,6 @@
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
@@ -188,7 +187,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					final Struct struct = (Struct) ((IStructuredSelection) getSelection()).getFirstElement();
+					final Struct struct = (Struct) getSelection().getFirstElement();
 					final EClass eClass = struct.eClass;
 					handleAddChild(eClass, struct.separator);
 				}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index df310419c3..4a19484799 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -60,7 +60,6 @@
 import org.eclipse.jface.databinding.viewers.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -217,7 +216,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 					Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
+					final EClass eClass = (EClass) getSelection().getFirstElement();
 					handleAddChild(eClass);
 				}
 			};
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 74f386f19b..a446386f3d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -61,7 +61,6 @@
 import org.eclipse.jface.resource.FontDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
@@ -241,7 +240,7 @@ public void widgetSelected(SelectionEvent e) {
 					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
+					final EClass eClass = (EClass) getSelection().getFirstElement();
 					handleAddChild(eClass);
 				}
 			};
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 54a70ebeed..997e2ddaee 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -42,7 +42,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
@@ -134,7 +133,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, feature) {
 			@Override
 			protected void addPressed() {
-				final Types t = (Types) ((IStructuredSelection) getSelection()).getFirstElement();
+				final Types t = (Types) getSelection().getFirstElement();
 				if (t == Types.MENU) {
 					handleAdd(MenuPackageImpl.Literals.MENU);
 				} else if (t == Types.POPUP_MENU) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index 3c73742b65..9557799225 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -36,7 +36,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
@@ -102,7 +101,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			@Override
 			protected void addPressed() {
 
-				final Object firstElement = ((IStructuredSelection) getSelection()).getFirstElement();
+				final Object firstElement = getSelection().getFirstElement();
 
 				if (firstElement != null) {
 					final FeatureClass featureClass = (FeatureClass) firstElement;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index 1308207d90..d3ae62b272 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -39,7 +39,6 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
@@ -137,7 +136,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
+					final EClass eClass = (EClass) getSelection().getFirstElement();
 					handleAdd(eClass);
 				}
 			};
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index b7291f73a7..9ddf5e2735 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -30,7 +30,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
@@ -183,7 +182,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, targetFeature) {
 			@Override
 			protected void addPressed() {
-				final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
+				final EClass eClass = (EClass) getSelection().getFirstElement();
 				handleAdd(eClass);
 			}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index a37a5c75e1..62493d8878 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -39,7 +39,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
@@ -149,7 +148,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
-					final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
+					final EClass eClass = (EClass) getSelection().getFirstElement();
 					handleAdd(eClass);
 				}
 			};
@@ -167,7 +166,7 @@ public String getText(Object element) {
 			pickList
 			.setInput(new EClass[] { AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
 					BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK,
-							BasicPackageImpl.Literals.PART,
+					BasicPackageImpl.Literals.PART,
 					AdvancedPackageImpl.Literals.AREA });
 			pickList.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK));
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index c912dc261a..1e3fd4cf52 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -37,7 +37,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
@@ -113,7 +112,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, targetFeature) {
 			@Override
 			protected void addPressed() {
-				final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
+				final EClass eClass = (EClass) getSelection().getFirstElement();
 				handleAdd(eClass);
 			}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index da91174556..c44c66099a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -45,7 +45,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.window.Window;
@@ -165,7 +164,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS) {
 				@Override
 				protected void addPressed() {
-					final EClass eClass = (EClass) ((IStructuredSelection) getSelection()).getFirstElement();
+					final EClass eClass = (EClass) getSelection().getFirstElement();
 					handleAdd(eClass);
 				}
 

From 8546af040c28a6179ff9182a81f066662cb04707 Mon Sep 17 00:00:00 2001
From: Christof Joswig <christof.joswig@sap.com>
Date: Thu, 13 Sep 2018 15:47:01 +0200
Subject: [PATCH 1054/1286] Fix selection in table when Up/Down button is
 pressed

- Disable down/up bottons for multip selections
- Disable down/up button when last/first element is selected

Fixed issue on windows:
- Keep focus when pressing up/down buttons

Change-Id: Ic4b899a51df19c018abfdfd5df0dd883ad32aab2
Signed-off-by: Christof Joswig <christof.joswig@sap.com>
---
 .../ui/internal/common/AbstractPickList.java  | 59 ++++++++++++++-----
 1 file changed, 44 insertions(+), 15 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index da250fe291..4644796e57 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -38,11 +38,12 @@
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Table;
 
 /**
  * <p>
- * A composite widget containing a combo for picking items, a list with selectable items, and action buttons for
- * modifying the list.
+ * A composite widget containing a combo for picking items, a list with
+ * selectable items, and action buttons for modifying the list.
  * </p>
  *
  * @author Steven Spungin
@@ -59,10 +60,10 @@ public static enum PickListFeatures {
 
 	private final Group group;
 	private final Composite toolBar;
+	protected final Button tiAdd;
 	protected final Button tiRemove;
 	protected final Button tiUp;
 	protected final Button tiDown;
-	protected final Button tiAdd;
 	// private final AutoCompleteField autoCompleteField;
 
 	public AbstractPickList(Composite parent, int style, List<PickListFeatures> listFeatures, Messages messages,
@@ -151,6 +152,14 @@ public void widgetSelected(SelectionEvent e) {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				moveDownPressed();
+				boolean enable = viewer.getTable().getSelectionIndex() + 1 < getItemCount();
+				if (tiDown.isEnabled() != enable) {
+					tiDown.setEnabled(enable);
+				}
+				if (enable == false && !tiUp.isEnabled()) {
+					tiUp.setEnabled(true);
+				}
+				tiDown.setFocus();
 			}
 		});
 
@@ -163,15 +172,20 @@ public void widgetSelected(SelectionEvent e) {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				moveUpPressed();
+				boolean enable = viewer.getTable().getSelectionIndex() > 0;
+				if (tiUp.isEnabled() != enable) {
+					tiUp.setEnabled(enable);
+				}
+				if (enable == false && !tiDown.isEnabled()) {
+					tiDown.setEnabled(true);
+				}
+				tiUp.setFocus();
 			}
 		});
 
 		viewer = new TableViewer(group);
-		final GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1);
-		viewer.getControl().setLayoutData(gd);
-
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1));
 		viewer.addSelectionChangedListener(event -> updateUiState());
-
 		updateUiState();
 
 		if (listFeatures != null) {
@@ -251,14 +265,29 @@ public void setText(String text) {
 	}
 
 	public void updateUiState() {
-		final IStructuredSelection selection = (IStructuredSelection) getList().getSelection();
-		final boolean selected = selection.size() > 0;
-		final int count = getItemCount();
-		final boolean tableIsFocused = getList().getTable().isFocusControl();
-		if (tiDown.isDisposed() == false) {
-			tiDown.setEnabled(selected && count > 1 && tableIsFocused);
-			tiUp.setEnabled(selected && count > 1 && tableIsFocused);
+		TableViewer tableViewer = getList();
+		Table table = tableViewer.getTable();
+		int itemCount = getItemCount();
+		int selectionCount = table.getSelectionCount();
+		int selectionIndex = table.getSelectionIndex();
+
+		if (tiRemove.isEnabled() != selectionCount > 0) {
+			tiRemove.setEnabled(selectionCount > 0);
+		}
+
+		// supports only single selection
+		boolean enableButtons = selectionCount > 0 && itemCount > 1 && selectionCount == 1;
+
+		// disable if last entry is selected
+		boolean enableDown = (enableButtons) ? selectionIndex + 1 < itemCount : false;
+		if (!tiDown.isDisposed() && tiDown.isEnabled() != enableDown) {
+			tiDown.setEnabled(enableDown);
+		}
+
+		// disable if first entry is selected
+		boolean enableUp = (enableButtons) ? selectionIndex > 0 : false;
+		if (!tiUp.isDisposed() && tiUp.isEnabled() != enableUp) {
+			tiUp.setEnabled(enableUp);
 		}
-		tiRemove.setEnabled(selected && tableIsFocused);
 	}
 }

From cb8f0bf7da8f012c34f47ca18db8b06406fde77e Mon Sep 17 00:00:00 2001
From: Christof Joswig <christof.joswig@sap.com>
Date: Fri, 14 Sep 2018 16:19:48 +0200
Subject: [PATCH 1055/1286] Fix table layout to FILL.BOTH

Goto:
->Model Fragment->Handler->Persisted State table doesn't fill

Change-Id: I07f5baf8d855788d956422b69b4589c35b7ff0e2
Signed-off-by: Christof Joswig <christof.joswig@sap.com>
---
 .../tools/emf/ui/internal/common/component/ControlFactory.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index f687efbc18..89a5a732fb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -263,8 +263,7 @@ protected void okPressed() {
 		final ObservableListContentProvider cp = new ObservableListContentProvider();
 		tableviewer.setContentProvider(cp);
 
-		final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.heightHint = 80;
+		final GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
 		gd.verticalIndent = vIndent;
 		tableviewer.getControl().setLayoutData(gd);
 

From 52cb5af80fb96130f1c467c0a467a8940f38a2f5 Mon Sep 17 00:00:00 2001
From: Christof Joswig <christof.joswig@sap.com>
Date: Sun, 16 Sep 2018 21:41:55 +0200
Subject: [PATCH 1056/1286] Remove unused labels

Change-Id: If33fd165ada604485fc862170dfa9489323f94fb
Signed-off-by: christof.joswig@sap.com <christof.joswig@sap.com>
---
 .../e4/tools/emf/ui/internal/Messages.java        | 15 ---------------
 .../e4/tools/emf/ui/internal/Messages.properties  | 15 ---------------
 .../component/dialogs/ExpressionIdDialog.java     |  2 +-
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 86cd0ed47e..c22bd2afd0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -164,12 +164,6 @@ public class Messages {
 	public String CommandEditor_Name;
 	public String CommandEditor_LabelDescription;
 	public String CommandEditor_Parameters;
-	public String CommandEditor_ParameterName;
-	public String CommandEditor_ParameterTypeId;
-	public String CommandEditor_ParameterOptional;
-	public String CommandEditor_ParameterOptional_No;
-	public String CommandEditor_ParameterOptional_Yes;
-	public String CommandEditor_ParameterId;
 	public String CommandEditor_Category;
 	public String CommandEditor_AddCommandParameter;
 	public String CommandEditor_NewCommandParameter;
@@ -190,8 +184,6 @@ public class Messages {
 	public String HandledMenuItemEditor_Description;
 	public String HandledMenuItemEditor_Command;
 	public String HandledMenuItemEditor_Parameters;
-	public String HandledMenuItemEditor_Tag;
-	public String HandledMenuItemEditor_Value;
 
 	public String DynamicMenuContributionEditor_Label;
 	public String DynamicMenuContributionEditor_Description;
@@ -201,8 +193,6 @@ public class Messages {
 
 	public String HandledToolItemEditor_Command;
 	public String HandledToolItemEditor_Parameters;
-	public String HandledToolItemEditor_ParametersName;
-	public String HandledToolItemEditor_ParametersValue;
 	public String HandledToolItemEditor_Label;
 	public String HandledToolItemEditor_Description;
 
@@ -267,8 +257,6 @@ public class Messages {
 	public String PartDescriptorEditor_Category;
 	public String PartDescriptorEditor_Variables;
 	public String PartDescriptorEditor_Properties;
-	public String PartDescriptorEditor_PropertiesKey;
-	public String PartDescriptorEditor_PropertiesValue;
 	public String PartDescriptorEditor_Menus;
 	public String PartDescriptorEditor_Handlers;
 	public String PartDescriptorEditor_ContainerData;
@@ -435,7 +423,6 @@ public class Messages {
 	public String CommandParameterEditor_TreeLabel;
 	public String CommandParameterEditor_TreeLabelDescritpion;
 	public String CommandParameterEditor_Name;
-	public String CommandParameterEditor_TypeId;
 	public String CommandParameterEditor_Optional;
 
 	public String ParameterEditor_TreeLabel;
@@ -694,7 +681,6 @@ public class Messages {
 	public String ExpressionIdDialog_ShellTitle;
 	public String ExpressionIdDialog_DialogTitle;
 	public String ExpressionIdDialog_DialogMessage;
-	public String ExpressionIdDialog_Id;
 
 	public String MenuIdDialog_ShellTitle;
 	public String MenuIdDialog_DialogTitle;
@@ -716,7 +702,6 @@ public class Messages {
 	public String VRootBindingContexts_AddContext;
 	public String VRootBindingContexts_TreeLabel;
 	public String VRootBindingContexts_TreeLabelDescription;
-	public String VRootBindingContexts_Contexts;
 
 	public String AreaEditor_Label;
 	public String AreaEditor_Description;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 4078222efe..f7ac3295a3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -120,12 +120,6 @@ CommandEditor_Description=Command
 CommandEditor_Name=Name
 CommandEditor_LabelDescription=Description
 CommandEditor_Parameters=Parameters
-CommandEditor_ParameterName=Name
-CommandEditor_ParameterTypeId=Type-ID
-CommandEditor_ParameterOptional=Optional
-CommandEditor_ParameterOptional_Yes=yes
-CommandEditor_ParameterOptional_No=no
-CommandEditor_ParameterId=ID
 CommandEditor_Category=Category
 CommandEditor_AddCommandParameter=Command Parameter
 CommandEditor_NewCommandParameter=Command Parameter {0}
@@ -146,8 +140,6 @@ HandledMenuItemEditor_Label=Handled Menu Item
 HandledMenuItemEditor_Description=Handled Menu Item
 HandledMenuItemEditor_Command=Command
 HandledMenuItemEditor_Parameters=Parameters
-HandledMenuItemEditor_Tag=Name
-HandledMenuItemEditor_Value=Value
 
 DynamicMenuContributionEditor_Label=Dynamic Menu Contribution
 DynamicMenuContributionEditor_Description=Dynamic Menu Contribution
@@ -157,8 +149,6 @@ DynamicMenuContributionEditor_LabelLabel=Label
 
 HandledToolItemEditor_Command=Command
 HandledToolItemEditor_Parameters=Parameters
-HandledToolItemEditor_ParametersName=Name
-HandledToolItemEditor_ParametersValue=Value
 HandledToolItemEditor_Label=Handled Tool Item
 HandledToolItemEditor_Description=Handled Tool Item
 
@@ -225,8 +215,6 @@ PartDescriptorEditor_Multiple=Multiple
 PartDescriptorEditor_Category=Category
 PartDescriptorEditor_Variables=Variables
 PartDescriptorEditor_Properties=Properties
-PartDescriptorEditor_PropertiesKey=Key
-PartDescriptorEditor_PropertiesValue=Value
 PartDescriptorEditor_Menus=Menus
 PartDescriptorEditor_Handlers=Handlers
 PartDescriptorEditor_ContainerData=Container Data
@@ -402,7 +390,6 @@ BindingContextEditor_NameWarning=Binding Context name must not be empty
 CommandParameterEditor_TreeLabel=Command Parameter
 CommandParameterEditor_TreeLabelDescritpion=Command Parameter
 CommandParameterEditor_Name=Name
-CommandParameterEditor_TypeId=TypeID
 CommandParameterEditor_Optional=Optional
 
 ParameterEditor_TreeLabel=Parameter
@@ -700,7 +687,6 @@ ImperativeExpressionEditor_TrackingLabel=Tracking
 ExpressionIdDialog_ShellTitle=Find Expression ID
 ExpressionIdDialog_DialogTitle=Find Expression ID
 ExpressionIdDialog_DialogMessage=Find the expression ID defined through the 'org.eclipse.core.expressions.definitions' extension point
-ExpressionIdDialog_Id=ID
 CommandToStringConverter_None=<None>
 
 MenuIdDialog_ShellTitle=Find Parent Menu Id
@@ -721,7 +707,6 @@ TrimBarIdDialog_Id=Parent Id
 VRootBindingContexts_AddContext=Binding Context
 VRootBindingContexts_TreeLabel=Binding Context
 VRootBindingContexts_TreeLabelDescription=Binding Context
-VRootBindingContexts_Contexts=Binding Contexts
 
 AreaEditor_Label=Area
 AreaEditor_Description=Area
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
index c8534fc366..03b714e9a7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
@@ -76,7 +76,7 @@ protected Control createDialogArea(Composite parent) {
 		container.setLayout(new GridLayout(2, false));
 
 		Label l = new Label(container, SWT.NONE);
-		l.setText(Messages.ExpressionIdDialog_Id);
+		l.setText(Messages.ModelTooling_Common_Id);
 
 		final Text idField = new Text(container, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH);
 		idField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

From 4289b8225beca964e83ac8d78c229b924a3daa18 Mon Sep 17 00:00:00 2001
From: "christof.joswig@sap.com" <christof.joswig@sap.com>
Date: Sun, 16 Sep 2018 21:54:19 +0200
Subject: [PATCH 1057/1286] Fix right-justified label in Area Editor

Change-Id: Ia70b63538cec2b725d1163bd9769a06fdba9a121
Signed-off-by: christof.joswig@sap.com <christof.joswig@sap.com>
---
 .../e4/tools/emf/ui/internal/common/component/AreaEditor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 5c66ec9198..824009c983 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -228,7 +228,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.AreaEditor_IconURI);
-			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);

From 390fca835c28f11928e83bf384cd86f429529180 Mon Sep 17 00:00:00 2001
From: Christof Joswig <christof.joswig@sap.com>
Date: Fri, 14 Sep 2018 15:57:06 +0200
Subject: [PATCH 1058/1286] Bug 539141 - Remove Message Class in E4Model Editor

Change-Id: Id9ef473a54c42b5fac70e550743d23451186536e
Signed-off-by: Christof Joswig <christof.joswig@sap.com>
---
 .../e4/tools/emf/ui/internal/Messages.java    | 16 +++++++--------
 .../ui/internal/common/AbstractPickList.java  | 16 ++++++++++-----
 .../emf/ui/internal/common/E4PickList.java    | 12 ++++++++---
 .../ui/internal/common/E4StringPickList.java  | 16 ++++++++++-----
 .../internal/common/component/AreaEditor.java |  2 +-
 .../component/BindingContextEditor.java       |  2 +-
 .../common/component/BindingTableEditor.java  |  2 +-
 .../common/component/CommandEditor.java       |  2 +-
 .../common/component/ControlFactory.java      |  6 +++---
 .../common/component/KeyBindingEditor.java    |  3 ++-
 .../component/MenuContributionEditor.java     |  2 +-
 .../internal/common/component/MenuEditor.java |  2 +-
 .../component/ModelFragmentsEditor.java       |  4 ++--
 .../component/PartSashContainerEditor.java    |  2 +-
 .../common/component/PartStackEditor.java     |  2 +-
 .../component/PerspectiveStackEditor.java     |  2 +-
 .../common/component/StringModelFragment.java |  2 +-
 .../component/ToolBarContributionEditor.java  |  2 +-
 .../common/component/ToolBarEditor.java       |  2 +-
 .../common/component/TrimBarEditor.java       |  2 +-
 .../component/TrimContributionEditor.java     |  2 +-
 .../component/virtual/VApplicationAddons.java | 18 ++++++++---------
 .../virtual/VApplicationCategoriesEditor.java |  4 +++-
 .../virtual/VBindingTableEditor.java          |  4 +++-
 .../component/virtual/VCommandEditor.java     | 18 ++++++++---------
 .../component/virtual/VHandlerEditor.java     | 20 +++++++++----------
 .../virtual/VItemParametersEditor.java        | 10 +++++-----
 .../virtual/VMenuContributionsEditor.java     |  4 +++-
 .../common/component/virtual/VMenuEditor.java |  2 +-
 .../virtual/VModelFragmentsEditor.java        |  8 ++++----
 .../virtual/VModelImportsEditor.java          |  3 ++-
 .../component/virtual/VPartDescriptor.java    |  4 +++-
 .../virtual/VPerspectiveControlEditor.java    |  3 ++-
 .../virtual/VRootBindingContexts.java         |  4 +++-
 .../component/virtual/VSnippetsEditor.java    |  2 +-
 .../virtual/VToolBarContributionsEditor.java  |  8 ++++----
 .../virtual/VTrimContributionsEditor.java     |  8 ++++----
 .../virtual/VWindowControlEditor.java         |  2 +-
 .../component/virtual/VWindowEditor.java      |  2 +-
 .../virtual/VWindowSharedElementsEditor.java  |  3 ++-
 .../component/virtual/VWindowTrimEditor.java  |  8 ++++----
 41 files changed, 134 insertions(+), 102 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index c22bd2afd0..3af9d3acd6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -23,9 +23,9 @@ public class Messages {
 	public String PartEditor_Part;
 	public String XmiTab_TypeTextToSearch;
 	public String ModelEditor_Import3x;
-	public String E4StringPickList_Replace;
-	public String E4StringPickList_NewValue;
-	public String E4StringPickList_ToolTipNewValue;
+	public static String E4StringPickList_Replace;
+	public static String E4StringPickList_NewValue;
+	public static String E4StringPickList_ToolTipNewValue;
 	public String MarkDuplicateAttributesHandler_MarkDuplicates;
 	public String MarkDuplicateAttributesHandler_SelectAnAttributeToMarkeDuplicate;
 	public String VCommandEditor_ImportCommands;
@@ -101,12 +101,12 @@ public class Messages {
 	public static String ContributionURIValidator_URI_starts_with_platform;
 
 	public String ModelTooling_Empty_Warning;
-	public String ModelTooling_Common_Up;
-	public String ModelTooling_Common_Down;
-	public String ModelTooling_Common_AddEllipsis;
+	public static String ModelTooling_Common_Up;
+	public static String ModelTooling_Common_Down;
+	public static String ModelTooling_Common_AddEllipsis;
 	public String ModelTooling_Common_Add;
-	public String ModelTooling_Common_Remove;
-	public String ModelTooling_Common_Replace;
+	public static String ModelTooling_Common_Remove;
+	public static String ModelTooling_Common_Replace;
 	public String ModelTooling_Common_Id;
 	public String ModelTooling_Common_RefId;
 	public String ModelTooling_Common_FindEllipsis;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index 4644796e57..28f48ff4d0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -66,11 +66,17 @@ public static enum PickListFeatures {
 	protected final Button tiDown;
 	// private final AutoCompleteField autoCompleteField;
 
+	@Deprecated
 	public AbstractPickList(Composite parent, int style, List<PickListFeatures> listFeatures, Messages messages,
 			AbstractComponentEditor componentEditor) {
+		this(parent, style, listFeatures, componentEditor);
+	}
+
+	public AbstractPickList(Composite parent, int style, List<PickListFeatures> listFeatures,
+			AbstractComponentEditor componentEditor) {
 		super(parent, style);
 
-		// TODO remove dependency to Messages and AbstractComponentEditor. They
+		// TODO remove dependency AbstractComponentEditor. They
 		// are only needed for labels and icons.
 
 		setLayout(new FillLayout());
@@ -120,7 +126,7 @@ public AbstractPickList(Composite parent, int style, List<PickListFeatures> list
 		picker.addOpenListener(event -> addPressed());
 
 		tiAdd = new Button(toolBar, SWT.PUSH);
-		tiAdd.setToolTipText(messages.ModelTooling_Common_AddEllipsis);
+		tiAdd.setToolTipText(Messages.ModelTooling_Common_AddEllipsis);
 		tiAdd.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		tiAdd.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_table_add));
 		tiAdd.setFont(getButtonFont());
@@ -133,7 +139,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		tiRemove = new Button(toolBar, SWT.PUSH);
 		tiRemove.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-		tiRemove.setToolTipText(messages.ModelTooling_Common_Remove);
+		tiRemove.setToolTipText(Messages.ModelTooling_Common_Remove);
 		tiRemove.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_table_delete));
 		tiRemove.setFont(getButtonFont());
 		tiRemove.addSelectionListener(new SelectionAdapter() {
@@ -145,7 +151,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		tiDown = new Button(toolBar, SWT.PUSH);
 		tiDown.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-		tiDown.setToolTipText(messages.ModelTooling_Common_Down);
+		tiDown.setToolTipText(Messages.ModelTooling_Common_Down);
 		tiDown.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_arrow_down));
 		tiDown.setFont(getButtonFont());
 		tiDown.addSelectionListener(new SelectionAdapter() {
@@ -165,7 +171,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		tiUp = new Button(toolBar, SWT.PUSH);
 		tiUp.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-		tiUp.setToolTipText(messages.ModelTooling_Common_Up);
+		tiUp.setToolTipText(Messages.ModelTooling_Common_Up);
 		tiUp.setImage(componentEditor.createImage(ResourceProvider.IMG_Obj16_arrow_up));
 		tiUp.setFont(getButtonFont());
 		tiUp.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
index 1f097278ab..c24ed86796 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
@@ -74,9 +74,15 @@ public Struct(String label, EClass eClass, boolean separator) {
 		}
 	}
 
-	public E4PickList(Composite parent, int style, List<PickListFeatures> listFeatures, final Messages messages,
+	@Deprecated
+	public E4PickList(Composite parent, int style, List<PickListFeatures> listFeatures, Messages messages,
+			AbstractComponentEditor componentEditor, final EStructuralFeature feature) {
+		this(parent, style, listFeatures, componentEditor, feature);
+	}
+
+	public E4PickList(Composite parent, int style, List<PickListFeatures> listFeatures,
 			final AbstractComponentEditor componentEditor, final EStructuralFeature feature) {
-		super(parent, style, listFeatures, messages, componentEditor);
+		super(parent, style, listFeatures, componentEditor);
 
 		this.componentEditor = componentEditor;
 		this.feature = feature;
@@ -93,7 +99,7 @@ public String getText(Object element) {
 		final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont())
 				.setStyle(SWT.ITALIC);
 		viewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
-				new ComponentLabelProvider(componentEditor.getEditor(), messages, italicFontDescriptor)));
+				new ComponentLabelProvider(componentEditor.getEditor(), new Messages(), italicFontDescriptor)));
 		final ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
index 624cf8e9eb..55ceeb3961 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
@@ -57,8 +57,14 @@ public class E4StringPickList extends AbstractPickList {
 	private AbstractComponentEditor editor;
 	private EStructuralFeature feature;
 
+	@Deprecated
 	public E4StringPickList(Composite parent, int flags, List<PickListFeatures> list, Messages messages, AbstractComponentEditor editor, EStructuralFeature feature) {
-		super(parent, flags, Arrays.asList(PickListFeatures.NO_PICKER), messages, editor);
+		this(parent, flags, list, editor, feature);
+	}
+
+	public E4StringPickList(Composite parent, int flags, List<PickListFeatures> list, AbstractComponentEditor editor,
+			EStructuralFeature feature) {
+		super(parent, flags, Arrays.asList(PickListFeatures.NO_PICKER), editor);
 
 		this.editor = editor;
 		this.feature = feature;
@@ -66,7 +72,7 @@ public E4StringPickList(Composite parent, int flags, List<PickListFeatures> list
 		// TODO does not respect NO_ORDER yet
 
 		tiReplace = new Button(getToolBar(), SWT.PUSH);
-		tiReplace.setToolTipText(messages.E4StringPickList_Replace);
+		tiReplace.setToolTipText(Messages.E4StringPickList_Replace);
 		tiReplace.setImage(editor.createImage(ResourceProvider.IMG_Obj16_world_edit));
 		tiReplace.setFont(getButtonFont());
 
@@ -75,11 +81,11 @@ public E4StringPickList(Composite parent, int flags, List<PickListFeatures> list
 		valueParent.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
 
 		Label l = new Label(valueParent, SWT.NONE);
-		l.setText(messages.E4StringPickList_NewValue);
-		l.setToolTipText(messages.E4StringPickList_ToolTipNewValue);
+		l.setText(Messages.E4StringPickList_NewValue);
+		l.setToolTipText(Messages.E4StringPickList_ToolTipNewValue);
 		text = new Text(valueParent, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
 		text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-		text.setToolTipText(messages.E4StringPickList_ToolTipNewValue);
+		text.setToolTipText(Messages.E4StringPickList_ToolTipNewValue);
 
 		tiReplace.addSelectionListener(new SelectionAdapter() {
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 824009c983..634496c817 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -284,7 +284,7 @@ public String getText(Object element) {
 				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		{
-			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, this,
 					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index f6f9d28e02..3ed260fe6c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -180,7 +180,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__DESCRIPTION));
 
 		final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
-				Messages, this, CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN) {
+				this, CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN) {
 			@Override
 			protected void addPressed() {
 				handleAddContext();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 2092eb2b31..5ad6e6448a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -212,7 +212,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
-					Messages, this, CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS) {
+					this, CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS) {
 				@Override
 				protected void addPressed() {
 					handleAddKeyBinding();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index c8093c6e44..3b4ab3cb83 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -207,7 +207,7 @@ public void widgetSelected(SelectionEvent e) {
 		// ------------------------------------------------------------
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
-					Messages, this, CommandsPackageImpl.Literals.COMMAND__PARAMETERS) {
+					this, CommandsPackageImpl.Literals.COMMAND__PARAMETERS) {
 				@Override
 				protected void addPressed() {
 					handleAddCommandParameter();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 89a5a732fb..5b6a71d466 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -197,7 +197,7 @@ public static Composite createMapProperties(Composite parent, final Messages Mes
 			int vIndent) {
 
 		final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
-				Messages, editor, feature) {
+				editor, feature) {
 			@Override
 			protected List<?> getContainerChildren(Object master) {
 				return null;
@@ -622,7 +622,7 @@ public static void createBindingContextWiget(Composite parent, final Messages Me
 			final AbstractComponentEditor editor, String label, String tooltip) {
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_ORDER,
-					PickListFeatures.NO_PICKER), Messages, editor, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS) {
+					PickListFeatures.NO_PICKER), editor, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS) {
 				@Override
 				protected void addPressed() {
 					final BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(getShell(), editor
@@ -654,7 +654,7 @@ public static Composite createStringListWidget(Composite parent, Messages Messag
 			final AbstractComponentEditor editor, String label, String tooltip, final EStructuralFeature feature,
 			int vIndent) {
 
-		final E4StringPickList pickList = new E4StringPickList(parent, SWT.NONE, null, Messages, editor, feature) {
+		final E4StringPickList pickList = new E4StringPickList(parent, SWT.NONE, null, editor, feature) {
 			@Override
 			protected void addPressed() {
 				handleAddText(editor, feature, getTextWidget());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index ccaa116da3..5eaf6412a0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -211,7 +211,8 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		{
-			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS) {
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
+					this, CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS) {
 				@Override
 				protected void addPressed() {
 					handleAddParameter();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 8346adf9d1..3eb40cab38 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -245,7 +245,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		{
-			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, this,
 					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index cdb0a070e2..b20f623d01 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -248,7 +248,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS));
 
 		{
-			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, this,
 					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 			pickList.setText(Messages.MenuEditor_Children);
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index bd661df6fa..e607dfa461 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -119,7 +119,7 @@ private void createFragmentsTab(CTabFolder folder) {
 		{
 
 			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
-					Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
+					Arrays.asList(PickListFeatures.NO_PICKER), this,
 					FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS) {
 				@Override
 				protected void addPressed() {
@@ -163,7 +163,7 @@ private void createImportsTab(CTabFolder folder) {
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+		final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, this,
 				FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
 			@Override
 			protected void addPressed() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index aec390bcb7..aebc71d671 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -273,7 +273,7 @@ public String getText(Object element) {
 				textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
 
 		{
-			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, this,
 					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index fa29ac4894..ba8b61bec8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -229,7 +229,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		// ------------------------------------------------------------
 		{
 
-			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, this,
 					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index f7f4222992..55d8a45c27 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -198,7 +198,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		{
 
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
-					Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+					this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
 					handleAddPerspective();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 21a9047c9d..47862b2ad2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -413,7 +413,7 @@ public void widgetSelected(SelectionEvent e) {
 		// ------------------------------------------------------------
 		{
 
-			pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+			pickList = new E4PickList(parent, SWT.NONE, null, this,
 					FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS) {
 				@Override
 				protected void addPressed() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index cf9477ce83..7178b1966d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -246,7 +246,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		{
-			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, this,
 					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index ddf25c1254..975787db74 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -183,7 +183,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		// ------------------------------------------------------------
 		{
-			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, this,
 					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 4a19484799..f4e62d4a10 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -213,7 +213,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		// ------------------------------------------------------------
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
-					Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+					this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
 					final EClass eClass = (EClass) getSelection().getFirstElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index a446386f3d..89e24e9999 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -236,7 +236,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		{
-			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, this,
 					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index 6ce701217a..bdb68c7c2d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -60,12 +60,12 @@ public VApplicationAddons() {
 	@PostConstruct
 	void init() {
 		actions
-			.add(new Action(Messages.VApplicationAddons_AddAddon, createImageDescriptor(ResourceProvider.IMG_Addons)) {
-				@Override
-				public void run() {
-					handleAddAddon();
-				}
-			});
+		.add(new Action(Messages.VApplicationAddons_AddAddon, createImageDescriptor(ResourceProvider.IMG_Addons)) {
+			@Override
+			public void run() {
+				handleAddAddon();
+			}
+		});
 	}
 
 
@@ -107,8 +107,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
-				Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
-				ApplicationPackageImpl.Literals.APPLICATION__ADDONS) {
+					Arrays.asList(PickListFeatures.NO_PICKER), this,
+					ApplicationPackageImpl.Literals.APPLICATION__ADDONS) {
 				@Override
 				protected void addPressed() {
 					handleAddAddon();
@@ -133,7 +133,7 @@ private void handleAddAddon() {
 		setElementId(addon);
 
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			ApplicationPackageImpl.Literals.APPLICATION__ADDONS, addon);
+				ApplicationPackageImpl.Literals.APPLICATION__ADDONS, addon);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index 1139344232..7d5f8ac447 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -125,7 +125,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
+					Arrays.asList(PickListFeatures.NO_PICKER), this,
+					ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index bf76b20f58..7c24958715 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -104,7 +104,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
+					Arrays.asList(PickListFeatures.NO_PICKER), this,
+					CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 216f2a57dd..37b0e6436e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -72,15 +72,15 @@ public VCommandEditor() {
 	@PostConstruct
 	void init() {
 		actions
-			.add(new Action(Messages.VCommandEditor_AddCommand, createImageDescriptor(ResourceProvider.IMG_Command)) {
-				@Override
-				public void run() {
-					handleAdd();
-				}
-			});
+		.add(new Action(Messages.VCommandEditor_AddCommand, createImageDescriptor(ResourceProvider.IMG_Command)) {
+			@Override
+			public void run() {
+				handleAdd();
+			}
+		});
 
 		actionsImport.add(new Action(Messages.VCommandEditor_ImportCommands,
-			createImageDescriptor(ResourceProvider.IMG_Command)) {
+				createImageDescriptor(ResourceProvider.IMG_Command)) {
 			@Override
 			public void run() {
 				handleImport();
@@ -126,8 +126,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
-				Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
-				ApplicationPackageImpl.Literals.APPLICATION__COMMANDS) {
+					Arrays.asList(PickListFeatures.NO_PICKER), this,
+					ApplicationPackageImpl.Literals.APPLICATION__COMMANDS) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index f3858b0ac3..a1f3c78109 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -62,16 +62,16 @@ public VHandlerEditor() {
 	@PostConstruct
 	void init() {
 		actions
-			.add(new Action(Messages.VHandlerEditor_AddHandler, createImageDescriptor(ResourceProvider.IMG_Handler)) {
-				@Override
-				public void run() {
-					handleAdd();
-				}
-			});
+		.add(new Action(Messages.VHandlerEditor_AddHandler, createImageDescriptor(ResourceProvider.IMG_Handler)) {
+			@Override
+			public void run() {
+				handleAdd();
+			}
+		});
 
 		// -- import --
 		actionsImport.add(new Action(Messages.VHandlerEditor_AddHandler,
-			createImageDescriptor(ResourceProvider.IMG_Handler)) {
+				createImageDescriptor(ResourceProvider.IMG_Handler)) {
 			@Override
 			public void run() {
 				handleImport();
@@ -117,8 +117,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
-				Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
-				CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS) {
+					Arrays.asList(PickListFeatures.NO_PICKER), this,
+					CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
@@ -154,7 +154,7 @@ protected void handleAdd() {
 	private void addToModel(MHandler handler) {
 		setElementId(handler);
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, handler);
+				CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS, handler);
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
 			getEditor().setSelection(handler);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
index 63b88b5076..b40f047218 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -53,7 +53,7 @@ public class VItemParametersEditor extends AbstractComponentEditor {
 	private final List<Action> actions = new ArrayList<>();
 
 	private final IEMFListProperty HANDLED_ITEM__PARAMETERS = EMFProperties
-		.list(MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
+			.list(MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
 
 	@Inject
 	public VItemParametersEditor() {
@@ -63,7 +63,7 @@ public VItemParametersEditor() {
 	@PostConstruct
 	void init() {
 		actions.add(new Action(Messages.VItemParametersEditor_AddParameter,
-			createImageDescriptor(ResourceProvider.IMG_Parameter)) {
+				createImageDescriptor(ResourceProvider.IMG_Parameter)) {
 			@Override
 			public void run() {
 				handleAdd();
@@ -110,8 +110,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
-				Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
-				MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS) {
+					Arrays.asList(PickListFeatures.NO_PICKER), this,
+					MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
@@ -144,7 +144,7 @@ protected void handleAdd() {
 		setElementId(handler);
 
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, handler);
+				MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS, handler);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index 2b9bb45e39..272e0173e1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -104,7 +104,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
+					Arrays.asList(PickListFeatures.NO_PICKER), this,
+					MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 997e2ddaee..92357b619a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -130,7 +130,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, feature) {
+		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, this, feature) {
 			@Override
 			protected void addPressed() {
 				final Types t = (Types) getSelection().getFirstElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index 914830156d..40c3f7e041 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -58,7 +58,7 @@ public VModelFragmentsEditor() {
 	@PostConstruct
 	void init() {
 		actions.add(new Action(Messages.VModelFragmentsEditor_AddFragment,
-			createImageDescriptor(ResourceProvider.IMG_ModelFragments)) {
+				createImageDescriptor(ResourceProvider.IMG_ModelFragments)) {
 			@Override
 			public void run() {
 				handleAdd();
@@ -104,8 +104,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
-				Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
-				FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS) {
+					Arrays.asList(PickListFeatures.NO_PICKER), this,
+					FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
@@ -143,7 +143,7 @@ public List<Action> getActions(Object element) {
 	private void handleAdd() {
 		final MStringModelFragment eObject = MFragmentFactory.INSTANCE.createStringModelFragment();
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, eObject);
+				FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS, eObject);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index 9557799225..d28a25b2f4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -97,7 +97,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
+		final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, this,
+				FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
 			@Override
 			protected void addPressed() {
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index d6c8925630..6ecc9993c6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -129,7 +129,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
+					Arrays.asList(PickListFeatures.NO_PICKER), this,
+					BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index d3ae62b272..9b4a0535f4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -133,7 +133,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, this,
+					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
 					final EClass eClass = (EClass) getSelection().getFirstElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
index 0f8576ed20..5eb196266a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
@@ -103,7 +103,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER), Messages, this, CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
+					Arrays.asList(PickListFeatures.NO_PICKER), this,
+					CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT) {
 				@Override
 				protected void addPressed() {
 					handleAddContext();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index 9ddf5e2735..7019501e1b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -179,7 +179,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, targetFeature) {
+		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, this, targetFeature) {
 			@Override
 			protected void addPressed() {
 				final EClass eClass = (EClass) getSelection().getFirstElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index 148251c922..e0b7d25059 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -58,7 +58,7 @@ public VToolBarContributionsEditor() {
 	@PostConstruct
 	void init() {
 		actions.add(new Action(Messages.VToolBarContributionsEditor_AddToolBarContribution,
-			createImageDescriptor(ResourceProvider.IMG_ToolBarContribution)) {
+				createImageDescriptor(ResourceProvider.IMG_ToolBarContribution)) {
 			@Override
 			public void run() {
 				handleAdd();
@@ -104,8 +104,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
-				Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
-				MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS) {
+					Arrays.asList(PickListFeatures.NO_PICKER), this,
+					MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
@@ -135,7 +135,7 @@ protected void handleAdd() {
 		setElementId(command);
 
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS, command);
+				MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS, command);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index 455b9db5d0..5491d2fcd5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -58,7 +58,7 @@ public VTrimContributionsEditor() {
 	@PostConstruct
 	void init() {
 		actions.add(new Action(Messages.VTrimContributionsEditor_AddTrimContribution,
-			createImageDescriptor(ResourceProvider.IMG_TrimContribution)) {
+				createImageDescriptor(ResourceProvider.IMG_TrimContribution)) {
 			@Override
 			public void run() {
 				handleAdd();
@@ -104,8 +104,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
-				Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
-				MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS) {
+					Arrays.asList(PickListFeatures.NO_PICKER), this,
+					MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
@@ -135,7 +135,7 @@ protected void handleAdd() {
 		setElementId(command);
 
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS, command);
+				MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS, command);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 62493d8878..bf565f8f93 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -144,7 +144,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this,
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, this,
 					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 1e3fd4cf52..4fc8d81c9b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -109,7 +109,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, targetFeature) {
+		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, this, targetFeature) {
 			@Override
 			protected void addPressed() {
 				final EClass eClass = (EClass) getSelection().getFirstElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index c44c66099a..4073e496fe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -161,7 +161,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 
-			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, Messages, this, BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, this,
+					BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS) {
 				@Override
 				protected void addPressed() {
 					final EClass eClass = (EClass) getSelection().getFirstElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index 94b869cad0..27058a337a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -58,7 +58,7 @@ public VWindowTrimEditor() {
 	@PostConstruct
 	void init() {
 		actions.add(new Action(Messages.VWindowTrimEditor_AddWindowTrim,
-			createImageDescriptor(ResourceProvider.IMG_WindowTrim)) {
+				createImageDescriptor(ResourceProvider.IMG_WindowTrim)) {
 			@Override
 			public void run() {
 				handleAdd();
@@ -104,8 +104,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
-				Arrays.asList(PickListFeatures.NO_PICKER), Messages, this,
-				BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS) {
+					Arrays.asList(PickListFeatures.NO_PICKER), this,
+					BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS) {
 				@Override
 				protected void addPressed() {
 					handleAdd();
@@ -138,7 +138,7 @@ protected void handleAdd() {
 		setElementId(handler);
 
 		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-			BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS, handler);
+				BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS, handler);
 
 		if (cmd.canExecute()) {
 			getEditingDomain().getCommandStack().execute(cmd);

From faaa8bde1a2832946913fc03f249b4dad294cd03 Mon Sep 17 00:00:00 2001
From: Christof Joswig <christof.joswig@sap.com>
Date: Thu, 13 Sep 2018 21:55:44 +0200
Subject: [PATCH 1059/1286] Bug 539164 - Tabbing is not working in E4 table
 editors

Change-Id: I53468f930e539e46740d16d2d600ca3a89c92a85
Signed-off-by: Christof Joswig <christof.joswig@sap.com>
---
 .../emf/ui/internal/common/E4PickList.java    | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
index c24ed86796..c274e34f47 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
@@ -37,11 +37,20 @@
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.resource.FontDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.CellNavigationStrategy;
+import org.eclipse.jface.viewers.ColumnViewer;
+import org.eclipse.jface.viewers.ColumnViewerEditor;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
 import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
+import org.eclipse.jface.viewers.FocusCellOwnerDrawHighlighter;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewerEditor;
+import org.eclipse.jface.viewers.TableViewerFocusCellManager;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.widgets.Composite;
 
 /**
@@ -61,6 +70,7 @@ public class E4PickList extends AbstractPickList {
 
 	AbstractComponentEditor componentEditor;
 	EStructuralFeature feature;
+	TableViewerFocusCellManager focusCellMgr;
 
 	public static class Struct {
 		final public String label;
@@ -102,6 +112,14 @@ public String getText(Object element) {
 				new ComponentLabelProvider(componentEditor.getEditor(), new Messages(), italicFontDescriptor)));
 		final ObservableListContentProvider cp = new ObservableListContentProvider();
 		viewer.setContentProvider(cp);
+
+		// enable tabbing and keyboard activation
+		this.focusCellMgr = new TableViewerFocusCellManager(viewer, new FocusCellOwnerDrawHighlighter(viewer),
+				new CellNavigationStrategy());
+
+		TableViewerEditor.create(viewer, this.focusCellMgr, new TableViewerEditorActivationStrategy(viewer), //
+				ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR
+				| ColumnViewerEditor.TABBING_VERTICAL | ColumnViewerEditor.KEYBOARD_ACTIVATION);
 	}
 
 	/**
@@ -257,4 +275,37 @@ protected int getItemCount() {
 		}
 		return ((ObservableListContentProvider) viewer.getContentProvider()).getElements(viewer.getInput()).length;
 	}
+
+	private class TableViewerEditorActivationStrategy extends ColumnViewerEditorActivationStrategy {
+
+		public TableViewerEditorActivationStrategy(ColumnViewer viewer) {
+			super(viewer);
+		}
+
+		@Override
+		protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
+			if (event != null) {
+
+				if (event.eventType == ColumnViewerEditorActivationEvent.MOUSE_CLICK_SELECTION) {
+					MouseEvent mouseEvent = (MouseEvent) event.sourceEvent;
+					if ((mouseEvent.stateMask & SWT.MOD1) != 0) {
+						return false;
+					}
+				}
+
+				if (event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL
+						|| event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC
+						|| event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION
+						|| event.eventType == ColumnViewerEditorActivationEvent.MOUSE_CLICK_SELECTION
+						&& ((event.stateMask & SWT.MOD1) == 0)
+						|| (event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED
+						&& (event.keyCode == SWT.F2 || event.keyCode == 32 || event.character == SWT.CR))) {
+
+					return true;
+				}
+			}
+			return false;
+		}
+	}
+
 }

From 791e5e278796c8a216afd29b93bdf344bedf24bd Mon Sep 17 00:00:00 2001
From: Christof Joswig <christof.joswig@sap.com>
Date: Thu, 13 Sep 2018 10:56:44 +0200
Subject: [PATCH 1060/1286] Bug 539142 - Add : to labels in E4Model Editor

Change-Id: I7d4500bfe8b1c576131964c6df4932e366b99557
Signed-off-by: Christof Joswig <christof.joswig@sap.com>
---
 .../e4/tools/emf/ui/internal/Messages.java    |   2 +
 .../tools/emf/ui/internal/Messages.properties | 243 +++++++++---------
 .../common/component/ControlFactory.java      |  12 +-
 3 files changed, 130 insertions(+), 127 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 3af9d3acd6..917164795a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -175,6 +175,8 @@ public class Messages {
 	public String ControlFactory_Key;
 	public String ControlFactory_Value;
 	public String ControlFactory_KeyValueShellTitle;
+	public static String ControlFactory_KeyColumn;
+	public static String ControlFactory_ValueColumn;
 
 	public String DirectToolItemEditor_ClassURI;
 	public String DirectToolItemEditor_Label;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index f7ac3295a3..6ae85d19f7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -17,48 +17,53 @@
 # *     Olivier Prouvost <olivier.prouvost@opcoach.com> - Bug 466731
 # *     Patrik Suzzi <psuzzi@gmail.com> - Bug 509606
 # ******************************************************************************
-
 PartEditor_Part=Part
 XmiTab_TypeTextToSearch=type text to search (press <ENTER> to search for next instance)
 ModelEditor_Import3x=Import 3x
+
 E4StringPickList_Replace=Replace
-E4StringPickList_NewValue=New Value : 
+E4StringPickList_NewValue=New Value\: 
 E4StringPickList_ToolTipNewValue=Enter your value and press Enter or click the Add button to add it. \nYou can add several values using a semi-colon separated string like this :\n value1;value2;value3
+
 MarkDuplicateAttributesHandler_MarkDuplicates=Mark Duplicates
 MarkDuplicateAttributesHandler_SelectAnAttributeToMarkeDuplicate=Select an attribute to mark duplicate values
+
 VCommandEditor_ImportCommands=Import Commands
+
 VPartDescriptor_Editors=Editors
 VPartDescriptor_ViewAsCompatibilityView=View as CompatibilityView
 VPartDescriptor_Views=Views
+
 VWindowSharedElementsEditor_Editors=Editors
 VWindowSharedElementsEditor_ViewAsCompatibilityView=View as CompatibilityView
 VWindowSharedElementsEditor_Views=Views
 
-
 ModelTooling_Common_Up=Up
 ModelTooling_Common_Down=Down
 ModelTooling_Common_AddEllipsis=Add
 ModelTooling_Common_Add=Add
 ModelTooling_Common_Remove=Remove
 ModelTooling_Common_Replace=Replace
-ModelTooling_Common_Id=ID
-ModelTooling_Common_RefId=Reference-ID
+ModelTooling_Common_Id=ID\:
+ModelTooling_Common_RefId=Reference-ID\:
 ModelTooling_Common_FindEllipsis=Find ...
 ModelTooling_Common_TabDefault=Default
 ModelTooling_Common_TabSupplementary=Supplementary
+
 ModelEditor_AddChild=Add child
 ModelEditor_Move=Move
 ModelEditor_Cut=Cut
 ModelEditor_CutObjects=Cut Objects
 ModelEditor_Paste=Paste
 ModelEditor_PasteObjects=Paste Objects
+
 ModelTooling_Common_RuntimeContributionInstance=Contrib. Instance
 ModelTooling_Common_RuntimeWidgetTree=Widget Tree
 
 ModelTooling_UIElement_ToBeRendered=To Be Rendered
 ModelTooling_UIElement_Visible=Visible
 ModelTooling_UIElement_VisibleWhen=Visible-When Expression
-ModelTooling_UIElement_AccessibilityPhrase=Accessibility Phrase
+ModelTooling_UIElement_AccessibilityPhrase=Accessibility Phrase\:
 
 ModelTooling_Context_Variables=Variables
 ModelTooling_Context_Variables_Tooltip=Declares the following variables to be modifiable in the local IEclipseContext (non-modifiable context variables will cause an IllegalArgumentException to be thrown if a modification attempt by a descendant context is made).
@@ -70,7 +75,7 @@ ModelTooling_Contribution_PersistedState=Persisted State
 
 ModelTooling_Empty_Warning=Value must not be empty
 
-AbstractCommandSelectionDialog_Label_CommandId=Command-ID
+AbstractCommandSelectionDialog_Label_CommandId=Command-ID\:
 
 ApplicationEditor_Label=Application
 ApplicationEditor_Description=Application
@@ -104,48 +109,50 @@ ApplicationEditor_Menu=Menu
 ApplicationEditor_Name=Name
 ApplicationEditor_Parent=Parent
 ApplicationEditor_Sequence=Sequence
-ApplicationEditor_Toolbar=Toolbar
-ApplicationEditor_Type=Type
+ApplicationEditor_Toolbar=Toolbar\:
+ApplicationEditor_Type=Type\:
 
 BindingTableEditor_Label=BindingTable
 BindingTableEditor_Description=BindingTable
-BindingTableEditor_ContextId=Context ID
+BindingTableEditor_ContextId=Context-ID\:
 BindingTableEditor_Keybindings=Keybindings
 BindingTableEditor_KeySequence=KeySequence
 BindingTableEditor_Command=Command
 BindingTableEditor_AddKeyBinding=Keybinding
 
-CommandEditor_Label=Command
+CommandEditor_Label=Command\:
 CommandEditor_Description=Command
-CommandEditor_Name=Name
-CommandEditor_LabelDescription=Description
+CommandEditor_Name=Name\:
+CommandEditor_LabelDescription=Description\:
 CommandEditor_Parameters=Parameters
-CommandEditor_Category=Category
+CommandEditor_Category=Category\:
 CommandEditor_AddCommandParameter=Command Parameter
 CommandEditor_NewCommandParameter=Command Parameter {0}
 
 DirectMenuItemEditor_Label=Direct Menu Item
 DirectMenuItemEditor_Description=Direct Menu Item
-DirectMenuItemEditor_ClassURI=Class URI
+DirectMenuItemEditor_ClassURI=Class URI\:
 
-ControlFactory_Key=Key
-ControlFactory_Value=Value
 ControlFactory_KeyValueShellTitle=Key/Value Pair
+ControlFactory_Key=Key\:*
+ControlFactory_Value=Value\:
+ControlFactory_KeyColumn=Key
+ControlFactory_ValueColumn=Value
 
-DirectToolItemEditor_ClassURI=Class URI
 DirectToolItemEditor_Label=Direct Tool Item
 DirectToolItemEditor_Description=Direct Tool Item
+DirectToolItemEditor_ClassURI=Class URI\:
 
 HandledMenuItemEditor_Label=Handled Menu Item
 HandledMenuItemEditor_Description=Handled Menu Item
-HandledMenuItemEditor_Command=Command
+HandledMenuItemEditor_Command=Command\:
 HandledMenuItemEditor_Parameters=Parameters
 
 DynamicMenuContributionEditor_Label=Dynamic Menu Contribution
 DynamicMenuContributionEditor_Description=Dynamic Menu Contribution
 
-DynamicMenuContributionEditor_ClassURI=Class URI
-DynamicMenuContributionEditor_LabelLabel=Label
+DynamicMenuContributionEditor_ClassURI=Class URI\:
+DynamicMenuContributionEditor_LabelLabel=Label\:
 
 HandledToolItemEditor_Command=Command
 HandledToolItemEditor_Parameters=Parameters
@@ -154,9 +161,8 @@ HandledToolItemEditor_Description=Handled Tool Item
 
 HandlerEditor_Label=Handler
 HandlerEditor_Description=Handler
-HandlerEditor_Command=Command
-HandlerEditor_ClassURI=Class URI
-
+HandlerEditor_Command=Command\:
+HandlerEditor_ClassURI=Class URI\:
 
 KeyBindingEditor_Label=KeyBinding
 KeyBindingEditor_Description=Binding
@@ -164,26 +170,26 @@ KeyBindingEditor_Sequence=Sequence
 KeyBindingEditor_Command=Command
 KeyBindingEditor_Parameters=Parameters
 KeyBindingEditor_SequenceNotComplete=Keysequence is not complete
-KeyBindingEditor_SequenceEmpty=Keysequence must not be empty!
+KeyBindingEditor_SequenceEmpty=Keysequence must not be empty
 KeyBindingEditor_AddParameter=Parameter
 
 MenuEditor_Label=Menu
 MenuEditor_Label_ViewMenu=View Menu
 MenuEditor_Description=Menu
 MenuEditor_MenuItems=MenuItems
-MenuEditor_MenuItemType=Type
+MenuEditor_MenuItemType=Type\:
 MenuEditor_MenuItemItemType=Item Type
 MenuEditor_HandledMenuItem=Handled Menu Item
 MenuEditor_DynamicMenuContribution=Dynamic Menu Contribution
 MenuEditor_Separator=Separator
 MenuEditor_Menu=Menu
 MenuEditor_DirectMenuItem=Direct Menu Item
-MenuEditor_LabelLabel=Label
-MenuEditor_Tooltip=Tooltip
-MenuEditor_IconURI=Icon URI
+MenuEditor_LabelLabel=Label\:
+MenuEditor_Tooltip=Tooltip\:
+MenuEditor_IconURI=Icon URI\:
 MenuEditor_MainMenu=Main Menu
 MenuEditor_Children=Children
-MenuEditor_Mnemonics=Mnemonics
+MenuEditor_Mnemonics=Mnemonics\:
 MenuEditor_AddHandledMenuItem=Handled Menu Item
 MenuEditor_AddMenu=Menu
 MenuEditor_AddDirectMenuItem=Direct Menu Item
@@ -191,14 +197,13 @@ MenuEditor_AddSeparator=Separator
 MenuEditor_AddDynamicMenuContribution=Dynamic Menu Contribution
 MenuEditor_AddCoreExpression=VisibleWhen Core Expression
 
-
-MenuItemEditor_Type=Type
-MenuItemEditor_Label=Label
-MenuItemEditor_Tooltip=Tooltip
-MenuItemEditor_IconURI=Icon URI
+MenuItemEditor_Type=Type\:
+MenuItemEditor_Label=Label\:
+MenuItemEditor_Tooltip=Tooltip\:
+MenuItemEditor_IconURI=Icon URI\:
 MenuItemEditor_Enabled=Enabled
 MenuItemEditor_Selected=Selected
-MenuItemEditor_Mnemonics=Mnemonics
+MenuItemEditor_Mnemonics=Mnemonics\:
 MenuItemEditor_NoExpression=<None>
 MenuItemEditor_AddCoreExpression=VisibleWhen Core Expression
 
@@ -206,42 +211,42 @@ MenuSeparatorEditor_Label=Separator
 
 PartDescriptorEditor_Label=Part Descriptor
 PartDescriptorEditor_Descriptor=Part Descriptor 
-PartDescriptorEditor_LabelLabel=Label
-PartDescriptorEditor_Tooltip=Tooltip
-PartDescriptorEditor_IconURI=Icon URI
-PartDescriptorEditor_ClassURI=Class URI
+PartDescriptorEditor_LabelLabel=Label\:
+PartDescriptorEditor_Tooltip=Tooltip\:
+PartDescriptorEditor_IconURI=Icon URI\:
+PartDescriptorEditor_ClassURI=Class URI\:
 PartDescriptorEditor_Closeable=Closeable
 PartDescriptorEditor_Multiple=Multiple
-PartDescriptorEditor_Category=Category
+PartDescriptorEditor_Category=Category\:
 PartDescriptorEditor_Variables=Variables
 PartDescriptorEditor_Properties=Properties
 PartDescriptorEditor_Menus=Menus
 PartDescriptorEditor_Handlers=Handlers
-PartDescriptorEditor_ContainerData=Container Data
+PartDescriptorEditor_ContainerData=Container Data\:
 
 PartEditor_Label=Part
 PartEditor_Description=Part 
-PartEditor_LabelLabel=Label
-PartEditor_Tooltip=Tooltip
-PartEditor_IconURI=Icon URI
+PartEditor_LabelLabel=Label\:
+PartEditor_Tooltip=Tooltip\:
+PartEditor_IconURI=Icon URI\:
 PartEditor_IconURI_Tooltip=Choose the icon of your part here
-PartEditor_ClassURI=Class URI
+PartEditor_ClassURI=Class URI\:
 PartEditor_Closeable=Closeable
 PartEditor_Closeable_Tooltip=If checked, the part can be closed by the user
 PartEditor_Menus=Menus
 PartEditor_Handlers=Handlers
-PartEditor_ContainerData=Container Data
+PartEditor_ContainerData=Container Data\:
 PartEditor_ToolBar=ToolBar
 PartEditor_BindingContexts=Binding Contexts
 
 PartSashContainerEditor_Label=Part Sash Container
 PartSashContainerEditor_Description=Sash
-PartSashContainerEditor_Orientation=Orientation
+PartSashContainerEditor_Orientation=Orientation\:
 PartSashContainerEditor_Vertical=Vertical
 PartSashContainerEditor_Horizontal=Horizontal
-PartSashContainerEditor_SelectedElement=Selected Element
+PartSashContainerEditor_SelectedElement=Selected Element\:
 PartSashContainerEditor_Controls=Controls
-PartSashContainerEditor_ContainerData=Container Data
+PartSashContainerEditor_ContainerData=Container Data\:
 PartSashContainerEditor_AddPartSashContainer=Part Sash Container
 PartSashContainerEditor_AddPartStack=Part Stack
 PartSashContainerEditor_AddPart=Part
@@ -250,9 +255,9 @@ PartSashContainerEditor_AddPlaceholder=Placeholder
 
 PartStackEditor_Label=Part Stack
 PartStackEditor_Description=Stack
-PartStackEditor_SelectedElement=Selected Element
+PartStackEditor_SelectedElement=Selected Element\:
 PartStackEditor_Parts=Parts
-PartStackEditor_ContainerData=Container Data
+PartStackEditor_ContainerData=Container Data\:
 PartStackEditor_AddPart=Part
 PartStackEditor_AddPlaceholder=Placeholder
 PartStackEditor_AddCompositePart=Composite Part
@@ -264,10 +269,10 @@ PartStackEditor_Views=Views
 
 PerspectiveEditor_Label=Perspective
 PerspectiveEditor_Description=Perspective
-PerspectiveEditor_LabelLabel=Label
-PerspectiveEditor_SelectedElement=Selected Element
-PerspectiveEditor_Tooltip=Tooltip
-PerspectiveEditor_IconURI=Icon URI
+PerspectiveEditor_LabelLabel=Label\:
+PerspectiveEditor_SelectedElement=Selected Element\:
+PerspectiveEditor_Tooltip=Tooltip\:
+PerspectiveEditor_IconURI=Icon URI\:
 PerspectiveEditor_Controls=Controls
 PerspectiveEditor_AddPartSashContainer=Part Sash Container
 PerspectiveEditor_AddPartStack=Part Stack
@@ -276,18 +281,17 @@ PerspectiveEditor_AddInputPart=InputPart
 PerspectiveEditor_AddArea=Area
 PerspectiveEditor_AddPlaceholder=Placeholder
 
-
 PerspectiveStackEditor_Label=Perspective Stack
 PerspectiveStackEditor_Description=Perspective Stack
-PerspectiveStackEditor_SelectedElement=Selected Element
+PerspectiveStackEditor_SelectedElement=Selected Element\:
 PerspectiveStackEditor_Perspectives=Perspectives
 PerspectiveStackEditor_AddPerspective=Perspective
 
 PlaceholderEditor_Label=Placeholder
 PlaceholderEditor_Descriptor=Placeholder 
-PlaceholderEditor_Reference=Reference
+PlaceholderEditor_Reference=Reference\:
 PlaceholderEditor_Closeable=Closeable
-PlaceholderEditor_ContainerData=Container Data
+PlaceholderEditor_ContainerData=Container Data\:
 
 ToolBarEditor_Label=Toolbar
 ToolBarEditor_Description=Toolbar
@@ -307,7 +311,7 @@ ToolBarSeparatorEditor_Label=Separator
 
 ToolControlEditor_Label=Tool Control
 ToolControlEditor_Description=ToolControl
-ToolControlEditor_ClassURI=Class URI
+ToolControlEditor_ClassURI=Class URI\:
 
 VBindingTableEditor_Label=Binding Configuration
 VBindingTableEditor_Description=Binding Configuration 
@@ -317,14 +321,14 @@ VBindingTableEditor_LabelDescription=Description
 VBindingTableEditor_BindingTables=Binding Tables
 VBindingTableEditor_AddBindingTable=Binding Table
 
-AddonsEditor_ClassURI=Class URI
 AddonsEditor_TreeLabel=Add-on
 AddonsEditor_TreeLabelDescription=Add-on
+AddonsEditor_ClassURI=Class URI\:
 AddonsEditor_Tags=Tags
 
 ContributionClassDialog_DialogMessage=Enter the name of the contributing class
 ContributionClassDialog_DialogTitle=Find Contribution Class
-ContributionClassDialog_Label_Classname=Class Name
+ContributionClassDialog_Label_Classname=Class Name\:
 ContributionClassDialog_FilterText_Message=Type to start search
 ContributionClassDialog_ShellTitle=Find Contribution Class
 ContributionURIValidator_Malformed_URI=The uri has to have the format 'bundleclass://$$bundleId$$/$$className$$'
@@ -332,16 +336,16 @@ ContributionURIValidator_No_Empty_URI=The URI must not be empty\!
 ContributionURIValidator_URI_starts_with_platform=The URI has to start with 'bundleclass://'
 
 MenuContributionEditor_MenuItems=Menu Items
-MenuContributionEditor_MenuItemType=Type
+MenuContributionEditor_MenuItemType=Type\:
 MenuContributionEditor_MenuItemItemType=Item Type
 MenuContributionEditor_HandledMenuItem=Handled Menu Item
 MenuContributionEditor_DynamicMenuContribution=Dynamic Menu Contribution
 MenuContributionEditor_Separator=Separator
 MenuContributionEditor_Menu=Menu
 MenuContributionEditor_DirectMenuItem=Direct Menu Item
-MenuContributionEditor_ParentId=Parent-ID
+MenuContributionEditor_ParentId=Parent-ID\:
 MenuContributionEditor_ParentIdTooltip=This is the id of the menu or the part into which the contributions should be added. Use 'org.eclipse.ui.main.menu' to contribute to the main menu and use 'popup' to handle contributions which are candidates to appear on any (top level) context menu. 
-MenuContributionEditor_Position=Position
+MenuContributionEditor_Position=Position\:
 MenuContributionEditor_PositionTooltip=This is the position of the contribution. It has the form "[placement]=[id]" where placement is one of "before", "after", or "endof" and the id is expected to be the id of something in the menu.
 MenuContributionEditor_TreeLabel=Menu Contribution
 MenuContributionEditor_TreeLabelDescription=Menu Contribution 
@@ -354,48 +358,48 @@ ModelFragmentsEditor_Imports=Imports
 StringModelFragment_Label=Model Fragment
 StringModelFragment_LabelFor=Model Fragment for 
 StringModelFragment_Description=Model Fragment
-StringModelFragment_Featurename=Feature Name *
+StringModelFragment_Featurename=Feature Name\:*
 StringModelFragment_FeaturenameTooltip=Select a feature name to contribute to in the EClass describing the parent ID instance
-StringModelFragment_ParentId=Extended Element ID *
+StringModelFragment_ParentId=Extended Element-ID\:*
 StringModelFragment_ParentIdTooltip=Select here an element ID from your model, or you can enter 'xpath:/' to access to the application model.
-StringModelFragment_PositionInList=Position in list
+StringModelFragment_PositionInList=Position in list\:
 StringModelFragment_Elements=Elements
 StringModelFragment_Ctrl_Space=Use CTRL + SPACE to see possible values
 
-FeatureSelectionDialog_Filter=Filter
 FeatureSelectionDialog_ShellTitle=Find Feature Name
 FeatureSelectionDialog_DialogTitle=Feature Name
 FeatureSelectionDialog_DialogMessage=Find the name of the feature you want to contribute to
+FeatureSelectionDialog_Filter=Filter\:
 
 CategoryEditor_TreeLabel=Command Category
 CategoryEditor_TreeLabelDescriptor=Command Category
-CategoryEditor_Name=Name
-CategoryEditor_Description=Description
+CategoryEditor_Name=Name\:
+CategoryEditor_Description=Description\:
 CategoryEditor_Tags=Tags
 
-CommandCategorySelectionDialog_LabelCategoryId=Category ID
-BindingContextSelectionDialog_LabelContextId=Context ID
+CommandCategorySelectionDialog_LabelCategoryId=Category-ID\:
+BindingContextSelectionDialog_LabelContextId=Context-ID\:
 
 ComponentLabelProvider_invisible=invisible
 ComponentLabelProvider_notrendered=not rendered
 
 BindingContextEditor_TreeLabel=Binding Context
 BindingContextEditor_TreeLabelDescription=Binding Context
-BindingContextEditor_Name=Name
-BindingContextEditor_Description=Description
+BindingContextEditor_Name=Name\:
+BindingContextEditor_Description=Description\:
 BindingContextEditor_Subcontexts=Subcontexts
 BindingContextEditor_AddContext=Binding Context
 BindingContextEditor_NameWarning=Binding Context name must not be empty
 
 CommandParameterEditor_TreeLabel=Command Parameter
 CommandParameterEditor_TreeLabelDescritpion=Command Parameter
-CommandParameterEditor_Name=Name
+CommandParameterEditor_Name=Name\:
 CommandParameterEditor_Optional=Optional
 
 ParameterEditor_TreeLabel=Parameter
 ParameterEditor_TreeLabelDescription=Parameter 
-ParameterEditor_Command_Parameter_ID=Command Parameter ID
-ParameterEditor_Value=Value
+ParameterEditor_Command_Parameter_ID=Command Parameter-ID\:
+ParameterEditor_Value=Value\:
 
 ParameterIdSelectionDialog_ShellTitle=Find command parameter id
 ParameterIdSelectionDialog_DialogTitle=Find command parameter id
@@ -419,11 +423,10 @@ ToolBarContributionEditor_ParentIdTooltip=This is the id of the toolbar or the p
 ToolBarContributionEditor_Position=Position
 ToolBarContributionEditor_PositionTooltip=This is the position of the contribution. It has the form "[placement]=[id]" where placement is one of "before", "after", or "endof" and the id is expected to be the id of something in the toolbar.
 
-
-ToolItemEditor_Type=Type
-ToolItemEditor_Label=Label
-ToolItemEditor_ToolTip=Tooltip
-ToolItemEditor_IconURI=Icon URI
+ToolItemEditor_Type=Type\:
+ToolItemEditor_Label=Label\:
+ToolItemEditor_ToolTip=Tooltip\:
+ToolItemEditor_IconURI=Icon URI\:
 ToolItemEditor_Enabled=Enabled
 ToolItemEditor_Selected=Selected
 ToolItemEditor_NoExpression=<None>
@@ -436,11 +439,10 @@ TrimBarEditor_Controls=Controls
 TrimBarEditor_AddToolBar=Toolbar
 TrimBarEditor_AddToolControl=Toolcontrol
 
-
 TrimContributionEditor_TreeLabel=Trim Contribution
 TrimContributionEditor_TreeLabelDescription=Trim Contribution 
-TrimContributionEditor_ParentId=Parent ID
-TrimContributionEditor_Position=Position
+TrimContributionEditor_ParentId=Parent-ID
+TrimContributionEditor_Position=Position\:
 TrimContributionEditor_Controls=Controls
 
 TrimmedWindowEditor_TrimBars=TrimBars
@@ -449,12 +451,12 @@ TrimmedWindowEditor_TreeLabel=Trimmed Window
 WindowEditor_AddMainMenu=Main Menu
 WindowEditor_TreeLabel=Window
 WindowEditor_TreeLabelDescription=Window
-WindowEditor_Bounds=Bounds(x,y,w,h)
-WindowEditor_Label=Label
-WindowEditor_Tooltip=Tooltip
-WindowEditor_IconURI=Icon URI
+WindowEditor_Bounds=Bounds(x,y,w,h)\:
+WindowEditor_Label=Label\:
+WindowEditor_Tooltip=Tooltip\:
+WindowEditor_IconURI=Icon URI\:
 WindowEditor_MainMenu=Main Menu
-WindowEditor_SelectedElement=Selected Element
+WindowEditor_SelectedElement=Selected Element\:
 WindowEditor_BindingContexts=Binding Contexts
 WindowEditor_Handlers=Handlers
 WindowEditor_Windows=Windows
@@ -546,7 +548,7 @@ VWindowTrimEditor_TreeLabelDescription=Window Trims
 VWindowTrimEditor_Controls=Controls
 VWindowTrimEditor_AddWindowTrim=Window Trim
 
-AbstractIconDialog_Icon_Name=Icon Name
+AbstractIconDialog_Icon_Name=Icon Name\:
 AbstractIconDialog_IconName=IconName
 AbstractIconDialog_Type_To_Start_Search=Type to start search
 
@@ -596,10 +598,11 @@ FilteredContributionDialog_SelectTheLocation=Select the location to filter on.
 FilteredContributionDialog_SelectThePackage=Select the package to filter on.
 FilteredContributionDialog_TargetPlatform=Target Platform
 FilteredContributionDialog_Workspace=Workspace
+
 FindImportElementDialog_ShellTitle=Find Import Elements
 FindImportElementDialog_Title=Find Import Elements
 FindImportElementDialog_Message=Search for an elements whose ID you'd like to import
-FindImportElementDialog_Search=Search
+FindImportElementDialog_Search=Search\:
 FindImportElementDialog_noId=no ID
 FindImportElementDialog_ClearCache=Clear Cache
 FindImportElementDialog_NoIdReference=You can not import an element without an ID
@@ -608,8 +611,8 @@ FindParentReferenceElementDialog_ShellTitle=Select Extended Element
 FindParentReferenceElementDialog_Title=Select Extended Element
 FindParentReferenceElementDialog_Message=Search for the element to be contributed by the model fragment
 FindParentReferenceElementDialog_HelpTooltip=Elements of the selected class will be searched in all e4xmi files found in:\n* model fragment extensions\n* applicationXMI parameters of products extension.\n\nIf you need to find a 'live' ID, please use the Model Spy (Alt Shift F9) to get it from your running application.
-FindParentReferenceElementDialog_ContainerType=Container-Type
-FindParentReferenceElementDialog_Search=Search
+FindParentReferenceElementDialog_ContainerType=Container-Type\:
+FindParentReferenceElementDialog_Search=Search\:
 FindParentReferenceElementDialog_ClearCache=Clear Cache
 FindParentReferenceElementDialog_NoReferenceId=You can not reference an element without an ID
 FindParentReferenceElementDialog_NoId=no ID
@@ -654,7 +657,7 @@ PerspectiveIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in t
 SharedElementsDialog_ShellTitle=Find Shared Elements
 SharedElementsDialog_Title=Find Shared Elements
 SharedElementsDialog_Message=Find Shared Elements of an Window
-SharedElementsDialog_Name=Name
+SharedElementsDialog_Name=Name\:
 
 ToolItemIconDialogEditor_ShellTitle=ToolItem Icon Search
 ToolItemIconDialogEditor_DialogTitle=ToolItem Icon Search
@@ -678,31 +681,31 @@ VItemParametersEditor_AddParameter=Parameter
 
 CoreExpressionEditor_TreeLabel=Core Expression
 CoreExpressionEditor_TreeLabelDescription=Core Expression
-CoreExpressionEditor_ExpressionId=Expression ID
+CoreExpressionEditor_ExpressionId=Expression-ID\:
 
 ImperativeExpressionEditor_TreeLabel=Imperative Expression
 ImperativeExpressionEditor_TreeLabelDescription=Imperative Expression
 ImperativeExpressionEditor_TrackingLabel=Tracking
 
-ExpressionIdDialog_ShellTitle=Find Expression ID
-ExpressionIdDialog_DialogTitle=Find Expression ID
+ExpressionIdDialog_ShellTitle=Find Expression-ID
+ExpressionIdDialog_DialogTitle=Find Expression-ID
 ExpressionIdDialog_DialogMessage=Find the expression ID defined through the 'org.eclipse.core.expressions.definitions' extension point
 CommandToStringConverter_None=<None>
 
 MenuIdDialog_ShellTitle=Find Parent Menu Id
 MenuIdDialog_DialogTitle=Find Parent Menu Id
 MenuIdDialog_DialogMessage=Find the menu id to be used as parent (in fragment finds the imported menus only)
-MenuIdDialog_Id=Parent Id
+MenuIdDialog_Id=Parent-ID\:
 
 ToolBarIdDialog_ShellTitle=Find Parent Toolbar Id
 ToolBarIdDialog_DialogTitle=Find Parent Toolbar Id
 ToolBarIdDialog_DialogMessage=Find the toolbar id to be used as parent
-ToolBarIdDialog_Id=Parent Id
+ToolBarIdDialog_Id=Parent-ID\:
 
 TrimBarIdDialog_ShellTitle=Find Parent Trimbar Id
 TrimBarIdDialog_DialogTitle=Find Parent Trimbar Id
 TrimBarIdDialog_DialogMessage=Find the trimbar id to be used as parent
-TrimBarIdDialog_Id=Parent Id
+TrimBarIdDialog_Id=Parent-ID\:
 
 VRootBindingContexts_AddContext=Binding Context
 VRootBindingContexts_TreeLabel=Binding Context
@@ -710,21 +713,21 @@ VRootBindingContexts_TreeLabelDescription=Binding Context
 
 AreaEditor_Label=Area
 AreaEditor_Description=Area
-AreaEditor_Orientation=Orientation
+AreaEditor_Orientation=Orientation\:
 AreaEditor_Horizontal=Horizontal
-AreaEditor_SelectedElement=Selected Element
-AreaEditor_ContainerData=Container Data
+AreaEditor_SelectedElement=Selected Element\:
+AreaEditor_ContainerData=Container Data\:
 AreaEditor_Controls=Controls
 AreaEditor_Vertical=Vertical
-AreaEditor_LabelLabel=Label
-AreaEditor_Tooltip=Tooltip
-AreaEditor_IconURI=Icon URI
+AreaEditor_LabelLabel=Label\:
+AreaEditor_Tooltip=Tooltip\:
+AreaEditor_IconURI=Icon URI\:
 
 AreaIconDialogEditor_ShellTitle=Area Icon Search
 AreaIconDialogEditor_DialogTitle=Area Icon Search
 AreaIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
 AreaIconDialogEditor_Enter_Text=Enter text
-AreaIconDialogEditor_Icon=Icon
+AreaIconDialogEditor_Icon=Icon\:
 
 ModelEditor_Delete=Remove
 ModelEditor_ExpandSubtree=Expand/Collapse (CTRL + Mouse)
@@ -750,13 +753,12 @@ ExportIdsHandler_Dialog_ShellTitle=Export Element Ids
 ExportIdsHandler_Dialog_DialogTitle=Export Element Ids
 ExportIdsHandler_Dialog_DialogMessage=Export application model element Ids into a java file for static reference
 ExportIdsHandler_Dialog_SelectProject=Please select a Java project to continue
-ExportIdsHandler_Dialog_TargetClassName=Target Classname
+ExportIdsHandler_Dialog_TargetClassName=Target Classname\:
 
 ObjectViewer_Tooltip_Value=Value
 ObjectViewer_Tooltip_InjectionKey=Injection key
 ObjectViewer_Script=Execute Script
 
-
 CommandWizard_ShellTitle=Command/Handler wizard
 Special_UnknownElement=(unknown model element)
 Special_UnknownElement_Detail= Use an extension point!
@@ -768,7 +770,6 @@ ModelEditor_goto_xmi=Goto XMI
 KeyBindingEditor_SequenceLowercase=Key sequences should be specified in uppercase characters
 ModelTooling_CommandId_tooltip=Command identifier. Must be defined for a command to work properly.
 
-
 ListTab_0=List
 ListTab_1=Mark Duplicate IDs
 ListTab_2=Duplicate IDs will be highlighted
@@ -801,13 +802,13 @@ CompositePartEditor_AddArea=Area
 CompositePartEditor_AddPlaceholder=Placeholder
 CompositePartEditor_Label=Composite Part
 CompositePartEditor_Description=Composite Part
-CompositePartEditor_Orientation=Orientation
+CompositePartEditor_Orientation=Orientation\:
 CompositePartEditor_Horizontal=Horizontal
 CompositePartEditor_Vertical=Vertical
-CompositePartEditor_SelectedElement=Selected Element
-CompositePartEditor_ContainerData=Container Data
-CompositePartEditor_Controls=Controls
-CompositePartEditor_LabelLabel=Label
-CompositePartEditor_Tooltip=Tooltip
-CompositePartEditor_IconURI=Icon URI
-CompositePartEditor_IconURI_Tooltip=Choose the icon of your part here
+CompositePartEditor_SelectedElement=Selected Element\:
+CompositePartEditor_ContainerData=Container Data\:
+CompositePartEditor_Controls=Controls\:
+CompositePartEditor_LabelLabel=Label\:
+CompositePartEditor_Tooltip=Tooltip\:
+CompositePartEditor_IconURI=Icon URI\:
+CompositePartEditor_IconURI_Tooltip=Choose the icon of your part here
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 5b6a71d466..77b7d9e0b6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -192,7 +192,7 @@ public static Composite createMapProperties(Composite parent, final Messages Mes
 		return createMapProperties(parent, Messages, editor, label, null, feature, vIndent);
 	}
 
-	public static Composite createMapProperties(Composite parent, final Messages Messages,
+	public static Composite createMapProperties(Composite parent, final Messages messages,
 			final AbstractComponentEditor editor, String label, String tooltip, final EStructuralFeature feature,
 			int vIndent) {
 
@@ -211,20 +211,20 @@ protected void addPressed() {
 
 					@Override
 					protected Control createDialogArea(Composite parent) {
-						getShell().setText(Messages.ControlFactory_KeyValueShellTitle);
+						getShell().setText(messages.ControlFactory_KeyValueShellTitle);
 						final Composite comp = (Composite) super.createDialogArea(parent);
 						final Composite container = new Composite(comp, SWT.NONE);
 						container.setLayout(new GridLayout(2, false));
 						container.setLayoutData(new GridData(GridData.FILL_BOTH));
 
 						Label l = new Label(container, SWT.NONE);
-						l.setText(Messages.ControlFactory_Key);
+						l.setText(messages.ControlFactory_Key);
 
 						key = new Text(container, SWT.BORDER);
 						key.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 						l = new Label(container, SWT.NONE);
-						l.setText(Messages.ControlFactory_Value);
+						l.setText(messages.ControlFactory_Value);
 
 						value = new Text(container, SWT.BORDER);
 						value.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -268,7 +268,7 @@ protected void okPressed() {
 		tableviewer.getControl().setLayoutData(gd);
 
 		TableViewerColumn column = new TableViewerColumn(tableviewer, SWT.NONE);
-		column.getColumn().setText(Messages.ControlFactory_Key);
+		column.getColumn().setText(Messages.ControlFactory_KeyColumn);
 		column.getColumn().setWidth(200);
 		column.setLabelProvider(new ColumnLabelProvider() {
 			@SuppressWarnings("unchecked")
@@ -314,7 +314,7 @@ protected boolean canEdit(Object element) {
 
 		// FIXME How can we react upon changes in the Map-Value?
 		column = new TableViewerColumn(tableviewer, SWT.NONE);
-		column.getColumn().setText(Messages.ControlFactory_Value);
+		column.getColumn().setText(Messages.ControlFactory_ValueColumn);
 		column.getColumn().setWidth(200);
 		column.setLabelProvider(new ColumnLabelProvider() {
 			@Override

From 2739af690263bbde8d23c1ea0850cc4787a666fc Mon Sep 17 00:00:00 2001
From: "christof.joswig@sap.com" <christof.joswig@sap.com>
Date: Tue, 18 Sep 2018 22:04:28 +0200
Subject: [PATCH 1061/1286] Bug 528860 - Polish e4 Tools

Change-Id: If279b3b8d5c109bc036a13e4281c701702899617
Signed-off-by: christof.joswig@sap.com <christof.joswig@sap.com>
---
 .../tools/emf/ui/internal/Messages.properties | 228 +++++++++---------
 1 file changed, 114 insertions(+), 114 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 6ae85d19f7..11afd83a04 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -22,7 +22,7 @@ XmiTab_TypeTextToSearch=type text to search (press <ENTER> to search for next in
 ModelEditor_Import3x=Import 3x
 
 E4StringPickList_Replace=Replace
-E4StringPickList_NewValue=New Value\: 
+E4StringPickList_NewValue=&New Value\: 
 E4StringPickList_ToolTipNewValue=Enter your value and press Enter or click the Add button to add it. \nYou can add several values using a semi-colon separated string like this :\n value1;value2;value3
 
 MarkDuplicateAttributesHandler_MarkDuplicates=Mark Duplicates
@@ -44,8 +44,8 @@ ModelTooling_Common_AddEllipsis=Add
 ModelTooling_Common_Add=Add
 ModelTooling_Common_Remove=Remove
 ModelTooling_Common_Replace=Replace
-ModelTooling_Common_Id=ID\:
-ModelTooling_Common_RefId=Reference-ID\:
+ModelTooling_Common_Id=&ID\:
+ModelTooling_Common_RefId=&Reference-ID\:
 ModelTooling_Common_FindEllipsis=Find ...
 ModelTooling_Common_TabDefault=Default
 ModelTooling_Common_TabSupplementary=Supplementary
@@ -62,8 +62,8 @@ ModelTooling_Common_RuntimeWidgetTree=Widget Tree
 
 ModelTooling_UIElement_ToBeRendered=To Be Rendered
 ModelTooling_UIElement_Visible=Visible
-ModelTooling_UIElement_VisibleWhen=Visible-When Expression
-ModelTooling_UIElement_AccessibilityPhrase=Accessibility Phrase\:
+ModelTooling_UIElement_VisibleWhen=&Visible-When Expression\:
+ModelTooling_UIElement_AccessibilityPhrase=&Accessibility Phrase\:
 
 ModelTooling_Context_Variables=Variables
 ModelTooling_Context_Variables_Tooltip=Declares the following variables to be modifiable in the local IEclipseContext (non-modifiable context variables will cause an IllegalArgumentException to be thrown if a modification attempt by a descendant context is made).
@@ -75,7 +75,7 @@ ModelTooling_Contribution_PersistedState=Persisted State
 
 ModelTooling_Empty_Warning=Value must not be empty
 
-AbstractCommandSelectionDialog_Label_CommandId=Command-ID\:
+AbstractCommandSelectionDialog_Label_CommandId=&Command-ID\:
 
 ApplicationEditor_Label=Application
 ApplicationEditor_Description=Application
@@ -109,50 +109,50 @@ ApplicationEditor_Menu=Menu
 ApplicationEditor_Name=Name
 ApplicationEditor_Parent=Parent
 ApplicationEditor_Sequence=Sequence
-ApplicationEditor_Toolbar=Toolbar\:
-ApplicationEditor_Type=Type\:
+ApplicationEditor_Toolbar=&Toolbar\:
+ApplicationEditor_Type=T&ype\:
 
 BindingTableEditor_Label=BindingTable
 BindingTableEditor_Description=BindingTable
-BindingTableEditor_ContextId=Context-ID\:
+BindingTableEditor_ContextId=&Context-ID\:
 BindingTableEditor_Keybindings=Keybindings
 BindingTableEditor_KeySequence=KeySequence
 BindingTableEditor_Command=Command
 BindingTableEditor_AddKeyBinding=Keybinding
 
-CommandEditor_Label=Command\:
+CommandEditor_Label=Command
 CommandEditor_Description=Command
-CommandEditor_Name=Name\:
-CommandEditor_LabelDescription=Description\:
+CommandEditor_Name=&Name\:
+CommandEditor_LabelDescription=&Description\:
 CommandEditor_Parameters=Parameters
-CommandEditor_Category=Category\:
+CommandEditor_Category=C&ategory\:
 CommandEditor_AddCommandParameter=Command Parameter
 CommandEditor_NewCommandParameter=Command Parameter {0}
 
 DirectMenuItemEditor_Label=Direct Menu Item
 DirectMenuItemEditor_Description=Direct Menu Item
-DirectMenuItemEditor_ClassURI=Class URI\:
+DirectMenuItemEditor_ClassURI=Class &URI\:
 
 ControlFactory_KeyValueShellTitle=Key/Value Pair
-ControlFactory_Key=Key\:*
-ControlFactory_Value=Value\:
+ControlFactory_Key=&Key\:*
+ControlFactory_Value=&Value\:
 ControlFactory_KeyColumn=Key
 ControlFactory_ValueColumn=Value
 
 DirectToolItemEditor_Label=Direct Tool Item
 DirectToolItemEditor_Description=Direct Tool Item
-DirectToolItemEditor_ClassURI=Class URI\:
+DirectToolItemEditor_ClassURI=Class &URI\:
 
 HandledMenuItemEditor_Label=Handled Menu Item
 HandledMenuItemEditor_Description=Handled Menu Item
-HandledMenuItemEditor_Command=Command\:
+HandledMenuItemEditor_Command=&Command\:
 HandledMenuItemEditor_Parameters=Parameters
 
 DynamicMenuContributionEditor_Label=Dynamic Menu Contribution
 DynamicMenuContributionEditor_Description=Dynamic Menu Contribution
 
-DynamicMenuContributionEditor_ClassURI=Class URI\:
-DynamicMenuContributionEditor_LabelLabel=Label\:
+DynamicMenuContributionEditor_ClassURI=Class &URI\:
+DynamicMenuContributionEditor_LabelLabel=L&abel\:
 
 HandledToolItemEditor_Command=Command
 HandledToolItemEditor_Parameters=Parameters
@@ -161,8 +161,8 @@ HandledToolItemEditor_Description=Handled Tool Item
 
 HandlerEditor_Label=Handler
 HandlerEditor_Description=Handler
-HandlerEditor_Command=Command\:
-HandlerEditor_ClassURI=Class URI\:
+HandlerEditor_Command=&Command\:
+HandlerEditor_ClassURI=Class &URI\:
 
 KeyBindingEditor_Label=KeyBinding
 KeyBindingEditor_Description=Binding
@@ -177,19 +177,19 @@ MenuEditor_Label=Menu
 MenuEditor_Label_ViewMenu=View Menu
 MenuEditor_Description=Menu
 MenuEditor_MenuItems=MenuItems
-MenuEditor_MenuItemType=Type\:
+MenuEditor_MenuItemType=T&ype\:
 MenuEditor_MenuItemItemType=Item Type
 MenuEditor_HandledMenuItem=Handled Menu Item
 MenuEditor_DynamicMenuContribution=Dynamic Menu Contribution
 MenuEditor_Separator=Separator
 MenuEditor_Menu=Menu
 MenuEditor_DirectMenuItem=Direct Menu Item
-MenuEditor_LabelLabel=Label\:
-MenuEditor_Tooltip=Tooltip\:
-MenuEditor_IconURI=Icon URI\:
+MenuEditor_LabelLabel=L&abel\:
+MenuEditor_Tooltip=T&ooltip\:
+MenuEditor_IconURI=Icon &URI\:
 MenuEditor_MainMenu=Main Menu
 MenuEditor_Children=Children
-MenuEditor_Mnemonics=Mnemonics\:
+MenuEditor_Mnemonics=&Mnemonics\:
 MenuEditor_AddHandledMenuItem=Handled Menu Item
 MenuEditor_AddMenu=Menu
 MenuEditor_AddDirectMenuItem=Direct Menu Item
@@ -197,13 +197,13 @@ MenuEditor_AddSeparator=Separator
 MenuEditor_AddDynamicMenuContribution=Dynamic Menu Contribution
 MenuEditor_AddCoreExpression=VisibleWhen Core Expression
 
-MenuItemEditor_Type=Type\:
-MenuItemEditor_Label=Label\:
-MenuItemEditor_Tooltip=Tooltip\:
-MenuItemEditor_IconURI=Icon URI\:
+MenuItemEditor_Type=&Type\:
+MenuItemEditor_Label=L&abel\:
+MenuItemEditor_Tooltip=T&ooltip\:
+MenuItemEditor_IconURI=Icon &URI\:
 MenuItemEditor_Enabled=Enabled
 MenuItemEditor_Selected=Selected
-MenuItemEditor_Mnemonics=Mnemonics\:
+MenuItemEditor_Mnemonics=&Mnemonics\:
 MenuItemEditor_NoExpression=<None>
 MenuItemEditor_AddCoreExpression=VisibleWhen Core Expression
 
@@ -211,42 +211,42 @@ MenuSeparatorEditor_Label=Separator
 
 PartDescriptorEditor_Label=Part Descriptor
 PartDescriptorEditor_Descriptor=Part Descriptor 
-PartDescriptorEditor_LabelLabel=Label\:
-PartDescriptorEditor_Tooltip=Tooltip\:
-PartDescriptorEditor_IconURI=Icon URI\:
-PartDescriptorEditor_ClassURI=Class URI\:
+PartDescriptorEditor_LabelLabel=L&abel\:
+PartDescriptorEditor_Tooltip=T&ooltip\:
+PartDescriptorEditor_IconURI=&Icon URI\:
+PartDescriptorEditor_ClassURI=Class &URI\:
 PartDescriptorEditor_Closeable=Closeable
 PartDescriptorEditor_Multiple=Multiple
-PartDescriptorEditor_Category=Category\:
+PartDescriptorEditor_Category=&Category\:
 PartDescriptorEditor_Variables=Variables
 PartDescriptorEditor_Properties=Properties
 PartDescriptorEditor_Menus=Menus
 PartDescriptorEditor_Handlers=Handlers
-PartDescriptorEditor_ContainerData=Container Data\:
+PartDescriptorEditor_ContainerData=Container &Data\:
 
 PartEditor_Label=Part
 PartEditor_Description=Part 
-PartEditor_LabelLabel=Label\:
-PartEditor_Tooltip=Tooltip\:
-PartEditor_IconURI=Icon URI\:
+PartEditor_LabelLabel=L&abel\:
+PartEditor_Tooltip=T&ooltip\:
+PartEditor_IconURI=&Icon URI\:
 PartEditor_IconURI_Tooltip=Choose the icon of your part here
-PartEditor_ClassURI=Class URI\:
+PartEditor_ClassURI=Class &URI\:
 PartEditor_Closeable=Closeable
 PartEditor_Closeable_Tooltip=If checked, the part can be closed by the user
 PartEditor_Menus=Menus
 PartEditor_Handlers=Handlers
-PartEditor_ContainerData=Container Data\:
+PartEditor_ContainerData=Container &Data\:
 PartEditor_ToolBar=ToolBar
 PartEditor_BindingContexts=Binding Contexts
 
 PartSashContainerEditor_Label=Part Sash Container
 PartSashContainerEditor_Description=Sash
-PartSashContainerEditor_Orientation=Orientation\:
+PartSashContainerEditor_Orientation=&Orientation\:
 PartSashContainerEditor_Vertical=Vertical
 PartSashContainerEditor_Horizontal=Horizontal
-PartSashContainerEditor_SelectedElement=Selected Element\:
+PartSashContainerEditor_SelectedElement=&Selected Element\:
 PartSashContainerEditor_Controls=Controls
-PartSashContainerEditor_ContainerData=Container Data\:
+PartSashContainerEditor_ContainerData=Container &Data\:
 PartSashContainerEditor_AddPartSashContainer=Part Sash Container
 PartSashContainerEditor_AddPartStack=Part Stack
 PartSashContainerEditor_AddPart=Part
@@ -255,9 +255,9 @@ PartSashContainerEditor_AddPlaceholder=Placeholder
 
 PartStackEditor_Label=Part Stack
 PartStackEditor_Description=Stack
-PartStackEditor_SelectedElement=Selected Element\:
+PartStackEditor_SelectedElement=&Selected Element\:
 PartStackEditor_Parts=Parts
-PartStackEditor_ContainerData=Container Data\:
+PartStackEditor_ContainerData=Container &Data\:
 PartStackEditor_AddPart=Part
 PartStackEditor_AddPlaceholder=Placeholder
 PartStackEditor_AddCompositePart=Composite Part
@@ -269,10 +269,10 @@ PartStackEditor_Views=Views
 
 PerspectiveEditor_Label=Perspective
 PerspectiveEditor_Description=Perspective
-PerspectiveEditor_LabelLabel=Label\:
-PerspectiveEditor_SelectedElement=Selected Element\:
-PerspectiveEditor_Tooltip=Tooltip\:
-PerspectiveEditor_IconURI=Icon URI\:
+PerspectiveEditor_LabelLabel=L&abel\:
+PerspectiveEditor_SelectedElement=&Selected Element\:
+PerspectiveEditor_Tooltip=T&ooltip\:
+PerspectiveEditor_IconURI=&Icon URI\:
 PerspectiveEditor_Controls=Controls
 PerspectiveEditor_AddPartSashContainer=Part Sash Container
 PerspectiveEditor_AddPartStack=Part Stack
@@ -283,15 +283,15 @@ PerspectiveEditor_AddPlaceholder=Placeholder
 
 PerspectiveStackEditor_Label=Perspective Stack
 PerspectiveStackEditor_Description=Perspective Stack
-PerspectiveStackEditor_SelectedElement=Selected Element\:
+PerspectiveStackEditor_SelectedElement=&Selected Element\:
 PerspectiveStackEditor_Perspectives=Perspectives
 PerspectiveStackEditor_AddPerspective=Perspective
 
 PlaceholderEditor_Label=Placeholder
 PlaceholderEditor_Descriptor=Placeholder 
-PlaceholderEditor_Reference=Reference\:
+PlaceholderEditor_Reference=&Reference\:
 PlaceholderEditor_Closeable=Closeable
-PlaceholderEditor_ContainerData=Container Data\:
+PlaceholderEditor_ContainerData=Container &Data\:
 
 ToolBarEditor_Label=Toolbar
 ToolBarEditor_Description=Toolbar
@@ -311,7 +311,7 @@ ToolBarSeparatorEditor_Label=Separator
 
 ToolControlEditor_Label=Tool Control
 ToolControlEditor_Description=ToolControl
-ToolControlEditor_ClassURI=Class URI\:
+ToolControlEditor_ClassURI=Class &URI\:
 
 VBindingTableEditor_Label=Binding Configuration
 VBindingTableEditor_Description=Binding Configuration 
@@ -323,12 +323,12 @@ VBindingTableEditor_AddBindingTable=Binding Table
 
 AddonsEditor_TreeLabel=Add-on
 AddonsEditor_TreeLabelDescription=Add-on
-AddonsEditor_ClassURI=Class URI\:
+AddonsEditor_ClassURI=Class &URI\:
 AddonsEditor_Tags=Tags
 
 ContributionClassDialog_DialogMessage=Enter the name of the contributing class
 ContributionClassDialog_DialogTitle=Find Contribution Class
-ContributionClassDialog_Label_Classname=Class Name\:
+ContributionClassDialog_Label_Classname=&Class Name\:
 ContributionClassDialog_FilterText_Message=Type to start search
 ContributionClassDialog_ShellTitle=Find Contribution Class
 ContributionURIValidator_Malformed_URI=The uri has to have the format 'bundleclass://$$bundleId$$/$$className$$'
@@ -336,16 +336,16 @@ ContributionURIValidator_No_Empty_URI=The URI must not be empty\!
 ContributionURIValidator_URI_starts_with_platform=The URI has to start with 'bundleclass://'
 
 MenuContributionEditor_MenuItems=Menu Items
-MenuContributionEditor_MenuItemType=Type\:
+MenuContributionEditor_MenuItemType=&Type\:
 MenuContributionEditor_MenuItemItemType=Item Type
 MenuContributionEditor_HandledMenuItem=Handled Menu Item
 MenuContributionEditor_DynamicMenuContribution=Dynamic Menu Contribution
 MenuContributionEditor_Separator=Separator
 MenuContributionEditor_Menu=Menu
 MenuContributionEditor_DirectMenuItem=Direct Menu Item
-MenuContributionEditor_ParentId=Parent-ID\:
+MenuContributionEditor_ParentId=&Parent-ID\:
 MenuContributionEditor_ParentIdTooltip=This is the id of the menu or the part into which the contributions should be added. Use 'org.eclipse.ui.main.menu' to contribute to the main menu and use 'popup' to handle contributions which are candidates to appear on any (top level) context menu. 
-MenuContributionEditor_Position=Position\:
+MenuContributionEditor_Position=P&osition\:
 MenuContributionEditor_PositionTooltip=This is the position of the contribution. It has the form "[placement]=[id]" where placement is one of "before", "after", or "endof" and the id is expected to be the id of something in the menu.
 MenuContributionEditor_TreeLabel=Menu Contribution
 MenuContributionEditor_TreeLabelDescription=Menu Contribution 
@@ -358,48 +358,48 @@ ModelFragmentsEditor_Imports=Imports
 StringModelFragment_Label=Model Fragment
 StringModelFragment_LabelFor=Model Fragment for 
 StringModelFragment_Description=Model Fragment
-StringModelFragment_Featurename=Feature Name\:*
+StringModelFragment_Featurename=&Feature Name\:*
 StringModelFragment_FeaturenameTooltip=Select a feature name to contribute to in the EClass describing the parent ID instance
-StringModelFragment_ParentId=Extended Element-ID\:*
+StringModelFragment_ParentId=E&xtended Element-ID\:*
 StringModelFragment_ParentIdTooltip=Select here an element ID from your model, or you can enter 'xpath:/' to access to the application model.
-StringModelFragment_PositionInList=Position in list\:
+StringModelFragment_PositionInList=&Position in list\:
 StringModelFragment_Elements=Elements
 StringModelFragment_Ctrl_Space=Use CTRL + SPACE to see possible values
 
 FeatureSelectionDialog_ShellTitle=Find Feature Name
 FeatureSelectionDialog_DialogTitle=Feature Name
 FeatureSelectionDialog_DialogMessage=Find the name of the feature you want to contribute to
-FeatureSelectionDialog_Filter=Filter\:
+FeatureSelectionDialog_Filter=&Filter\:
 
 CategoryEditor_TreeLabel=Command Category
 CategoryEditor_TreeLabelDescriptor=Command Category
-CategoryEditor_Name=Name\:
-CategoryEditor_Description=Description\:
+CategoryEditor_Name=&Name\:
+CategoryEditor_Description=&Description\:
 CategoryEditor_Tags=Tags
 
-CommandCategorySelectionDialog_LabelCategoryId=Category-ID\:
-BindingContextSelectionDialog_LabelContextId=Context-ID\:
+CommandCategorySelectionDialog_LabelCategoryId=&Category-ID\:
+BindingContextSelectionDialog_LabelContextId=C&ontext-ID\:
 
 ComponentLabelProvider_invisible=invisible
 ComponentLabelProvider_notrendered=not rendered
 
 BindingContextEditor_TreeLabel=Binding Context
 BindingContextEditor_TreeLabelDescription=Binding Context
-BindingContextEditor_Name=Name\:
-BindingContextEditor_Description=Description\:
+BindingContextEditor_Name=N&ame\:
+BindingContextEditor_Description=&Description\:
 BindingContextEditor_Subcontexts=Subcontexts
 BindingContextEditor_AddContext=Binding Context
 BindingContextEditor_NameWarning=Binding Context name must not be empty
 
 CommandParameterEditor_TreeLabel=Command Parameter
 CommandParameterEditor_TreeLabelDescritpion=Command Parameter
-CommandParameterEditor_Name=Name\:
+CommandParameterEditor_Name=&Name\:
 CommandParameterEditor_Optional=Optional
 
 ParameterEditor_TreeLabel=Parameter
 ParameterEditor_TreeLabelDescription=Parameter 
-ParameterEditor_Command_Parameter_ID=Command Parameter-ID\:
-ParameterEditor_Value=Value\:
+ParameterEditor_Command_Parameter_ID=Command &Parameter-ID\:
+ParameterEditor_Value=&Value\:
 
 ParameterIdSelectionDialog_ShellTitle=Find command parameter id
 ParameterIdSelectionDialog_DialogTitle=Find command parameter id
@@ -423,10 +423,10 @@ ToolBarContributionEditor_ParentIdTooltip=This is the id of the toolbar or the p
 ToolBarContributionEditor_Position=Position
 ToolBarContributionEditor_PositionTooltip=This is the position of the contribution. It has the form "[placement]=[id]" where placement is one of "before", "after", or "endof" and the id is expected to be the id of something in the toolbar.
 
-ToolItemEditor_Type=Type\:
-ToolItemEditor_Label=Label\:
-ToolItemEditor_ToolTip=Tooltip\:
-ToolItemEditor_IconURI=Icon URI\:
+ToolItemEditor_Type=&Type\:
+ToolItemEditor_Label=L&abel\:
+ToolItemEditor_ToolTip=T&ooltip\:
+ToolItemEditor_IconURI=&Icon URI\:
 ToolItemEditor_Enabled=Enabled
 ToolItemEditor_Selected=Selected
 ToolItemEditor_NoExpression=<None>
@@ -442,7 +442,7 @@ TrimBarEditor_AddToolControl=Toolcontrol
 TrimContributionEditor_TreeLabel=Trim Contribution
 TrimContributionEditor_TreeLabelDescription=Trim Contribution 
 TrimContributionEditor_ParentId=Parent-ID
-TrimContributionEditor_Position=Position\:
+TrimContributionEditor_Position=&Position\:
 TrimContributionEditor_Controls=Controls
 
 TrimmedWindowEditor_TrimBars=TrimBars
@@ -451,12 +451,12 @@ TrimmedWindowEditor_TreeLabel=Trimmed Window
 WindowEditor_AddMainMenu=Main Menu
 WindowEditor_TreeLabel=Window
 WindowEditor_TreeLabelDescription=Window
-WindowEditor_Bounds=Bounds(x,y,w,h)\:
-WindowEditor_Label=Label\:
-WindowEditor_Tooltip=Tooltip\:
-WindowEditor_IconURI=Icon URI\:
+WindowEditor_Bounds=&Bounds(x,y,w,h)\:
+WindowEditor_Label=L&abel\:
+WindowEditor_Tooltip=T&ooltip\:
+WindowEditor_IconURI=&Icon URI\:
 WindowEditor_MainMenu=Main Menu
-WindowEditor_SelectedElement=Selected Element\:
+WindowEditor_SelectedElement=&Selected Element\:
 WindowEditor_BindingContexts=Binding Contexts
 WindowEditor_Handlers=Handlers
 WindowEditor_Windows=Windows
@@ -548,9 +548,9 @@ VWindowTrimEditor_TreeLabelDescription=Window Trims
 VWindowTrimEditor_Controls=Controls
 VWindowTrimEditor_AddWindowTrim=Window Trim
 
-AbstractIconDialog_Icon_Name=Icon Name\:
 AbstractIconDialog_IconName=IconName
 AbstractIconDialog_Type_To_Start_Search=Type to start search
+AbstractIconDialog_Icon_Name=&Icon Name\:
 
 AbstractIconDialogWithHardcodedScope_Project=Project
 AbstractIconDialogWithHardcodedScope_Workspace=Workspace
@@ -602,7 +602,7 @@ FilteredContributionDialog_Workspace=Workspace
 FindImportElementDialog_ShellTitle=Find Import Elements
 FindImportElementDialog_Title=Find Import Elements
 FindImportElementDialog_Message=Search for an elements whose ID you'd like to import
-FindImportElementDialog_Search=Search\:
+FindImportElementDialog_Search=&Search\:
 FindImportElementDialog_noId=no ID
 FindImportElementDialog_ClearCache=Clear Cache
 FindImportElementDialog_NoIdReference=You can not import an element without an ID
@@ -611,8 +611,8 @@ FindParentReferenceElementDialog_ShellTitle=Select Extended Element
 FindParentReferenceElementDialog_Title=Select Extended Element
 FindParentReferenceElementDialog_Message=Search for the element to be contributed by the model fragment
 FindParentReferenceElementDialog_HelpTooltip=Elements of the selected class will be searched in all e4xmi files found in:\n* model fragment extensions\n* applicationXMI parameters of products extension.\n\nIf you need to find a 'live' ID, please use the Model Spy (Alt Shift F9) to get it from your running application.
-FindParentReferenceElementDialog_ContainerType=Container-Type\:
-FindParentReferenceElementDialog_Search=Search\:
+FindParentReferenceElementDialog_ContainerType=&Container-Type\:
+FindParentReferenceElementDialog_Search=&Search\:
 FindParentReferenceElementDialog_ClearCache=Clear Cache
 FindParentReferenceElementDialog_NoReferenceId=You can not reference an element without an ID
 FindParentReferenceElementDialog_NoId=no ID
@@ -657,7 +657,7 @@ PerspectiveIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in t
 SharedElementsDialog_ShellTitle=Find Shared Elements
 SharedElementsDialog_Title=Find Shared Elements
 SharedElementsDialog_Message=Find Shared Elements of an Window
-SharedElementsDialog_Name=Name\:
+SharedElementsDialog_Name=&Name\:
 
 ToolItemIconDialogEditor_ShellTitle=ToolItem Icon Search
 ToolItemIconDialogEditor_DialogTitle=ToolItem Icon Search
@@ -681,7 +681,7 @@ VItemParametersEditor_AddParameter=Parameter
 
 CoreExpressionEditor_TreeLabel=Core Expression
 CoreExpressionEditor_TreeLabelDescription=Core Expression
-CoreExpressionEditor_ExpressionId=Expression-ID\:
+CoreExpressionEditor_ExpressionId=&Expression-ID\:
 
 ImperativeExpressionEditor_TreeLabel=Imperative Expression
 ImperativeExpressionEditor_TreeLabelDescription=Imperative Expression
@@ -695,17 +695,17 @@ CommandToStringConverter_None=<None>
 MenuIdDialog_ShellTitle=Find Parent Menu Id
 MenuIdDialog_DialogTitle=Find Parent Menu Id
 MenuIdDialog_DialogMessage=Find the menu id to be used as parent (in fragment finds the imported menus only)
-MenuIdDialog_Id=Parent-ID\:
+MenuIdDialog_Id=&Parent-ID\:
 
 ToolBarIdDialog_ShellTitle=Find Parent Toolbar Id
 ToolBarIdDialog_DialogTitle=Find Parent Toolbar Id
 ToolBarIdDialog_DialogMessage=Find the toolbar id to be used as parent
-ToolBarIdDialog_Id=Parent-ID\:
+ToolBarIdDialog_Id=&Parent-ID\:
 
 TrimBarIdDialog_ShellTitle=Find Parent Trimbar Id
 TrimBarIdDialog_DialogTitle=Find Parent Trimbar Id
 TrimBarIdDialog_DialogMessage=Find the trimbar id to be used as parent
-TrimBarIdDialog_Id=Parent-ID\:
+TrimBarIdDialog_Id=&Parent-ID\:
 
 VRootBindingContexts_AddContext=Binding Context
 VRootBindingContexts_TreeLabel=Binding Context
@@ -713,21 +713,21 @@ VRootBindingContexts_TreeLabelDescription=Binding Context
 
 AreaEditor_Label=Area
 AreaEditor_Description=Area
-AreaEditor_Orientation=Orientation\:
+AreaEditor_Orientation=&Orientation\:
 AreaEditor_Horizontal=Horizontal
-AreaEditor_SelectedElement=Selected Element\:
-AreaEditor_ContainerData=Container Data\:
+AreaEditor_SelectedElement=&Selected Element\:
+AreaEditor_ContainerData=Container &Data\:
 AreaEditor_Controls=Controls
 AreaEditor_Vertical=Vertical
-AreaEditor_LabelLabel=Label\:
-AreaEditor_Tooltip=Tooltip\:
-AreaEditor_IconURI=Icon URI\:
+AreaEditor_LabelLabel=L&abel\:
+AreaEditor_Tooltip=T&ooltip\:
+AreaEditor_IconURI=&Icon URI\:
 
 AreaIconDialogEditor_ShellTitle=Area Icon Search
 AreaIconDialogEditor_DialogTitle=Area Icon Search
 AreaIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
 AreaIconDialogEditor_Enter_Text=Enter text
-AreaIconDialogEditor_Icon=Icon\:
+AreaIconDialogEditor_Icon=&Icon\:
 
 ModelEditor_Delete=Remove
 ModelEditor_ExpandSubtree=Expand/Collapse (CTRL + Mouse)
@@ -753,7 +753,7 @@ ExportIdsHandler_Dialog_ShellTitle=Export Element Ids
 ExportIdsHandler_Dialog_DialogTitle=Export Element Ids
 ExportIdsHandler_Dialog_DialogMessage=Export application model element Ids into a java file for static reference
 ExportIdsHandler_Dialog_SelectProject=Please select a Java project to continue
-ExportIdsHandler_Dialog_TargetClassName=Target Classname\:
+ExportIdsHandler_Dialog_TargetClassName=&Target Classname\:
 
 ObjectViewer_Tooltip_Value=Value
 ObjectViewer_Tooltip_InjectionKey=Injection key
@@ -785,13 +785,13 @@ ListTab_col_item=Item
 ListTab_col_label=Label
 ListTab_col_go=Go
 
-ListTab_addColumn=Add Column
-ListTab_filterByAttribute=Filter By Attribute
-ListTab_filterByItem=Filter By Item
+ListTab_addColumn=Add &Column
+ListTab_filterByAttribute=Filter By &Attribute
+ListTab_filterByItem=Filter By &Item
 ListTab_mark=Mark
-ListTab_markAttribute=Filter By Attribute
-ListTab_removeFilter=Remove Filter
-ListTab_resetColumns=Reset Columns
+ListTab_markAttribute=&Filter By Attribute
+ListTab_removeFilter=&Remove Filter
+ListTab_resetColumns=R&eset Columns
 ListTab_selectAnAttribute=Select an attribute
 ListTab_selectAType=Select a type
 
@@ -802,13 +802,13 @@ CompositePartEditor_AddArea=Area
 CompositePartEditor_AddPlaceholder=Placeholder
 CompositePartEditor_Label=Composite Part
 CompositePartEditor_Description=Composite Part
-CompositePartEditor_Orientation=Orientation\:
+CompositePartEditor_Orientation=&Orientation\:
 CompositePartEditor_Horizontal=Horizontal
 CompositePartEditor_Vertical=Vertical
-CompositePartEditor_SelectedElement=Selected Element\:
-CompositePartEditor_ContainerData=Container Data\:
-CompositePartEditor_Controls=Controls\:
-CompositePartEditor_LabelLabel=Label\:
-CompositePartEditor_Tooltip=Tooltip\:
-CompositePartEditor_IconURI=Icon URI\:
+CompositePartEditor_SelectedElement=&Selected Element\:
+CompositePartEditor_ContainerData=Container &Data\:
+CompositePartEditor_Controls=&Controls\:
+CompositePartEditor_LabelLabel=L&abel\:
+CompositePartEditor_Tooltip=T&ooltip\:
+CompositePartEditor_IconURI=&Icon URI\:
 CompositePartEditor_IconURI_Tooltip=Choose the icon of your part here
\ No newline at end of file

From 89610e67e710e4f25c61a2d7b62e6a02b48520d5 Mon Sep 17 00:00:00 2001
From: "christof.joswig@sap.com" <christof.joswig@sap.com>
Date: Mon, 17 Sep 2018 21:13:15 +0200
Subject: [PATCH 1062/1286] Bug 539201 - New Option for AbstractPickList to
 hide the empty group

Change-Id: I584cbf5c2ae5bb215a520bd65d1a7b6232d90b9a
Signed-off-by: christof.joswig@sap.com <christof.joswig@sap.com>
---
 .../ui/internal/common/AbstractPickList.java  | 26 ++++++++++++-------
 .../component/ModelFragmentsEditor.java       |  2 +-
 .../common/component/StringModelFragment.java |  4 +--
 .../component/virtual/VHandlerEditor.java     |  2 +-
 .../virtual/VItemParametersEditor.java        |  2 +-
 .../common/component/virtual/VMenuEditor.java |  5 +++-
 .../virtual/VModelFragmentsEditor.java        |  2 +-
 .../virtual/VModelImportsEditor.java          |  5 ++--
 .../virtual/VPerspectiveControlEditor.java    |  6 +++--
 .../component/virtual/VSnippetsEditor.java    |  5 +++-
 .../virtual/VWindowControlEditor.java         |  6 +++--
 .../component/virtual/VWindowEditor.java      |  5 +++-
 .../virtual/VWindowSharedElementsEditor.java  |  6 +++--
 .../component/virtual/VWindowTrimEditor.java  |  2 +-
 14 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index 28f48ff4d0..893f6d2eb8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -52,14 +52,15 @@
 public abstract class AbstractPickList extends Composite {
 
 	public static enum PickListFeatures {
-		NO_ORDER, NO_PICKER
+		NO_ORDER, NO_PICKER, NO_GROUP
 	}
 
 	protected ComboViewer picker;
 	protected TableViewer viewer;
 
-	private final Group group;
+	private final Composite composite;
 	private final Composite toolBar;
+
 	protected final Button tiAdd;
 	protected final Button tiRemove;
 	protected final Button tiUp;
@@ -81,11 +82,14 @@ public AbstractPickList(Composite parent, int style, List<PickListFeatures> list
 
 		setLayout(new FillLayout());
 
-		group = new Group(this, SWT.NONE);
-		// gridData.horizontalIndent = 30;
-		group.setLayout(new GridLayout(1, false));
+		if (listFeatures != null && listFeatures.contains(PickListFeatures.NO_GROUP)) {
+			composite = new Composite(this, SWT.NONE);
+		} else {
+			composite = new Group(this, SWT.NONE);
+		}
+		composite.setLayout(new GridLayout(1, false));
 
-		final Composite comp = new Composite(group, SWT.NONE);
+		final Composite comp = new Composite(composite, SWT.NONE);
 
 		GridLayout layout = new GridLayout(2, false);
 		layout.marginHeight = 0;
@@ -121,7 +125,7 @@ public AbstractPickList(Composite parent, int style, List<PickListFeatures> list
 		layout.marginWidth = 0;
 		toolBar.setLayout(layout);
 		toolBar.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-		toolBar.setFont(group.getFont());
+		toolBar.setFont(composite.getFont());
 
 		picker.addOpenListener(event -> addPressed());
 
@@ -189,7 +193,7 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		viewer = new TableViewer(group);
+		viewer = new TableViewer(composite);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1));
 		viewer.addSelectionChangedListener(event -> updateUiState());
 		updateUiState();
@@ -209,7 +213,7 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	protected Font getButtonFont() {
-		return group.getFont();
+		return toolBar.getFont();
 	}
 
 	protected void addPressed() {
@@ -267,7 +271,9 @@ protected void removePressed() {
 	}
 
 	public void setText(String text) {
-		group.setText(text);
+		if (composite instanceof Group) {
+			((Group) composite).setText(text);
+		}
 	}
 
 	public void updateUiState() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index e607dfa461..07b9f5dfe3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -119,7 +119,7 @@ private void createFragmentsTab(CTabFolder folder) {
 		{
 
 			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
-					Arrays.asList(PickListFeatures.NO_PICKER), this,
+					Arrays.asList(PickListFeatures.NO_PICKER, PickListFeatures.NO_GROUP), this,
 					FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS) {
 				@Override
 				protected void addPressed() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 47862b2ad2..88c0dea335 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -37,6 +37,7 @@
 import org.eclipse.e4.tools.emf.ui.common.Util.InternalPackage;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FeatureSelectionDialog;
@@ -413,7 +414,7 @@ public void widgetSelected(SelectionEvent e) {
 		// ------------------------------------------------------------
 		{
 
-			pickList = new E4PickList(parent, SWT.NONE, null, this,
+			pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_GROUP), this,
 					FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS) {
 				@Override
 				protected void addPressed() {
@@ -430,7 +431,6 @@ protected List<?> getContainerChildren(Object master) {
 			};
 
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
-			pickList.setText(""); //$NON-NLS-1$
 
 			pickList.setLabelProvider(new LabelProvider() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index a1f3c78109..63d88f222c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -117,7 +117,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
-					Arrays.asList(PickListFeatures.NO_PICKER), this,
+					Arrays.asList(PickListFeatures.NO_PICKER, PickListFeatures.NO_GROUP), this,
 					CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS) {
 				@Override
 				protected void addPressed() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
index b40f047218..dcf5cd8140 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -110,7 +110,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
-					Arrays.asList(PickListFeatures.NO_PICKER), this,
+					Arrays.asList(PickListFeatures.NO_PICKER, PickListFeatures.NO_GROUP), this,
 					MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS) {
 				@Override
 				protected void addPressed() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index 92357b619a..a11d587b3a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -15,6 +15,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.annotation.PostConstruct;
@@ -26,6 +27,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
@@ -130,7 +132,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, this, feature) {
+		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_GROUP),
+				this, feature) {
 			@Override
 			protected void addPressed() {
 				final Types t = (Types) getSelection().getFirstElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index 40c3f7e041..0d520f2e85 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -104,7 +104,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
-					Arrays.asList(PickListFeatures.NO_PICKER), this,
+					Arrays.asList(PickListFeatures.NO_PICKER, PickListFeatures.NO_GROUP), this,
 					FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS) {
 				@Override
 				protected void addPressed() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index d28a25b2f4..1f8c01c989 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -15,6 +15,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -25,6 +26,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -97,7 +99,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, this,
+		final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_GROUP), this,
 				FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS) {
 			@Override
 			protected void addPressed() {
@@ -126,7 +128,6 @@ protected List<?> getContainerChildren(Object master) {
 		viewer = pickList.getList();
 
 		pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
-		pickList.setText(""); //$NON-NLS-1$
 
 		pickList.setLabelProvider(new LabelProvider() {
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index 9b4a0535f4..5e74385f3d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -15,6 +15,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.annotation.PostConstruct;
@@ -25,6 +26,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -133,8 +135,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, this,
-					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_GROUP),
+					this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
 					final EClass eClass = (EClass) getSelection().getFirstElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index 7019501e1b..fb4e95884c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -4,6 +4,7 @@
  * Steven Spungin <steven@spungin.tv> - Ongoing maintenance
  */
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -14,6 +15,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -179,7 +181,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, this, targetFeature) {
+		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_GROUP),
+				this, targetFeature) {
 			@Override
 			protected void addPressed() {
 				final EClass eClass = (EClass) getSelection().getFirstElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index bf565f8f93..f8d6556ad6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -15,6 +15,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -27,6 +28,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
@@ -144,8 +146,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		item.setControl(parent.getParent());
 
 		{
-			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, this,
-					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_GROUP),
+					this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
 				@Override
 				protected void addPressed() {
 					final EClass eClass = (EClass) getSelection().getFirstElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 4fc8d81c9b..d7d3faef20 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -15,6 +15,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.annotation.PostConstruct;
@@ -24,6 +25,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -109,7 +111,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, this, targetFeature) {
+		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_GROUP),
+				this, targetFeature) {
 			@Override
 			protected void addPressed() {
 				final EClass eClass = (EClass) getSelection().getFirstElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 4073e496fe..05ac6e56de 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -16,6 +16,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.annotation.PostConstruct;
@@ -27,6 +28,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -161,8 +163,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 
-			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, null, this,
-					BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS) {
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_GROUP),
+					this, BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS) {
 				@Override
 				protected void addPressed() {
 					final EClass eClass = (EClass) getSelection().getFirstElement();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index 27058a337a..32426e9bdf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -104,7 +104,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 		{
 			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
-					Arrays.asList(PickListFeatures.NO_PICKER), this,
+					Arrays.asList(PickListFeatures.NO_PICKER, PickListFeatures.NO_GROUP), this,
 					BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS) {
 				@Override
 				protected void addPressed() {

From 98aac76f1c609b444d8da34e1df512a179fb3aff Mon Sep 17 00:00:00 2001
From: "christof.joswig@sap.com" <christof.joswig@sap.com>
Date: Thu, 20 Sep 2018 22:33:24 +0200
Subject: [PATCH 1063/1286] Fix missing Find ... button icon for Model Fragment
 editor

-> align find buttons in E4 Editor

Change-Id: I913808af3fea831deaad44246f3434063070f4c7
Signed-off-by: christof.joswig@sap.com <christof.joswig@sap.com>
---
 .../component/AbstractComponentEditor.java      |  2 +-
 .../e4/tools/emf/ui/internal/Messages.java      |  2 +-
 .../common/component/ApplicationEditor.java     |  4 +---
 .../internal/common/component/AreaEditor.java   |  5 +----
 .../common/component/BindingTableEditor.java    |  5 +----
 .../common/component/CommandEditor.java         |  5 +----
 .../common/component/CompositePartEditor.java   |  5 +----
 .../common/component/ControlFactory.java        | 17 ++++++++++-------
 .../common/component/CoreExpressionEditor.java  |  4 +---
 .../common/component/HandledMenuItemEditor.java |  5 +----
 .../common/component/HandledToolItemEditor.java |  5 +----
 .../common/component/HandlerEditor.java         |  5 +----
 .../common/component/KeyBindingEditor.java      |  5 +----
 .../component/MenuContributionEditor.java       |  5 +----
 .../internal/common/component/MenuEditor.java   |  5 +----
 .../common/component/MenuItemEditor.java        |  5 +----
 .../common/component/ParameterEditor.java       |  7 ++-----
 .../common/component/PartDescriptorEditor.java  |  5 +----
 .../internal/common/component/PartEditor.java   |  5 +----
 .../common/component/PerspectiveEditor.java     |  4 +---
 .../common/component/PlaceholderEditor.java     |  4 +---
 .../common/component/StringModelFragment.java   | 10 ++++------
 .../component/ToolBarContributionEditor.java    |  5 +----
 .../common/component/ToolControlEditor.java     |  5 +----
 .../common/component/ToolItemEditor.java        |  6 +-----
 .../component/TrimContributionEditor.java       |  5 +----
 .../internal/common/component/WindowEditor.java |  5 +----
 27 files changed, 40 insertions(+), 105 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 8c5cf482f2..a50751d7d1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -85,7 +85,7 @@ public abstract class AbstractComponentEditor {
 	@Inject
 	private ModelEditor editor;
 	@Inject
-	protected IResourcePool resourcePool;
+	public IResourcePool resourcePool;
 
 	@Inject
 	@Optional
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 917164795a..efdcdbf870 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -109,7 +109,7 @@ public class Messages {
 	public static String ModelTooling_Common_Replace;
 	public String ModelTooling_Common_Id;
 	public String ModelTooling_Common_RefId;
-	public String ModelTooling_Common_FindEllipsis;
+	public static String ModelTooling_Common_FindEllipsis;
 	public String ModelTooling_Common_TabDefault;
 	public String ModelTooling_Common_TabSupplementary;
 	public String ModelEditor_AddChild;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 865f57d17e..b8b643143a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -79,7 +79,6 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
@@ -514,8 +513,7 @@ public void createControl(Composite parent) {
 				final Text t = new Text(group, SWT.BORDER);
 				t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
-				final Button b = new Button(group, SWT.PUSH | SWT.FLAT);
-				b.setText(Messages.ModelTooling_Common_FindEllipsis);
+				ControlFactory.createFindButton(group, resourcePool);
 			}
 
 			setControl(group);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 634496c817..9d818a7c7f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -240,10 +240,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			new ImageTooltip(t, Messages, this);
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 5ad6e6448a..328b44d767 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -190,10 +190,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 							FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT,
 									ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 3b4ab3cb83..6a35019172 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -190,10 +190,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 							FeaturePath.fromList(CommandsPackageImpl.Literals.COMMAND__CATEGORY,
 									ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index 562c2f698f..2b10423134 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -268,10 +268,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			new ImageTooltip(t, Messages, this);
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 77b7d9e0b6..f603b5ae1b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -536,9 +536,7 @@ public static void createFindImport(Composite parent, final Messages Messages,
 				EMFEditProperties.value(editor.getEditingDomain(),
 						ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(editor.getMaster()));
 
-		final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-		b.setText(Messages.ModelTooling_Common_FindEllipsis);
-		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_zoom));
+		Button b = ControlFactory.createFindButton(parent, editor.resourcePool);
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -880,10 +878,7 @@ public static void createClassURIField(Composite parent, final Messages Messages
 				new UpdateValueStrategy());
 		Util.addDecoration(t, binding);
 
-		final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-		b.setImage(editor.createImage(ResourceProvider.IMG_Obj16_zoom));
-		b.setText(Messages.ModelTooling_Common_FindEllipsis);
-		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+		Button b = ControlFactory.createFindButton(parent, editor.resourcePool);
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -909,4 +904,12 @@ public void widgetSelected(SelectionEvent e) {
 
 	}
 
+	public static Button createFindButton(Composite parent, IResourcePool resourcePool) {
+		Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
+		b.setText(Messages.ModelTooling_Common_FindEllipsis);
+		b.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_zoom));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+		return b;
+	}
+
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index 2342f5297e..42ddc83335 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -117,9 +117,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			if (getEditor().getExtensionLookup() == null) {
 				gd.horizontalSpan = 2;
 			} else {
-				final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-				b.setText(Messages.ModelTooling_Common_FindEllipsis);
-				b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
+				Button b = ControlFactory.createFindButton(parent, resourcePool);
 				b.addSelectionListener(new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index f5e1cb9304..95da03f97f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -97,10 +97,7 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 					.observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy()
 					.setConverter(new CommandToStringConverter(Messages)));
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 9f54dca63d..1364134835 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -85,10 +85,7 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 					.observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy()
 					.setConverter(new CommandToStringConverter(Messages)));
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 1a1ee25b5c..a31c86d70a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -160,10 +160,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			t.setEditable(false);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.HANDLER__COMMAND).observeDetail(getMaster()), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter(Messages)));
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 5eaf6412a0..a3709e250a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -197,10 +197,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			t.setEditable(false);
 			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__COMMAND).observeDetail(getMaster()), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter(Messages)));
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 3eb40cab38..e49ca52c83 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -222,10 +222,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID)
 					.observeDetail(getMaster()));
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index b20f623d01..1ce617e2a5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -293,10 +293,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			new ImageTooltip(t, Messages, this);
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index b389832dae..59ffb9e220 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -225,10 +225,7 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 
 			new ImageTooltip(t, Messages, this);
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index 63fa9e5f59..6b3bababc2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -182,11 +182,8 @@ private void createParameterNameRow(Composite parent, IWidgetValueProperty textP
 			context.bindValue(textProp.observeDelayed(200, commandParameterIdValue), modelProp.observeDetail(getMaster()));
 		}
 
-		final Button chooseParameterButton = new Button(parent, SWT.PUSH | SWT.FLAT);
-		chooseParameterButton.setText(Messages.ModelTooling_Common_FindEllipsis);
-		chooseParameterButton.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-		chooseParameterButton.addSelectionListener(new ChooseParameterButtonSelectionListener());
-		chooseParameterButton.setLayoutData(new GridData());
+		Button b = ControlFactory.createFindButton(parent, resourcePool);
+		b.addSelectionListener(new ChooseParameterButtonSelectionListener());
 	}
 
 	private final class ChooseParameterButtonSelectionListener extends SelectionAdapter {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 0a4d78f3fa..6ac5e76ae8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -195,10 +195,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			new ImageTooltip(t, Messages, this);
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 1147411b0e..8179ac93e3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -200,10 +200,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 
 			new ImageTooltip(t, Messages, this);
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index f247cdaec7..f343054237 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -248,9 +248,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 
 			new ImageTooltip(t, Messages, this);
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 84b1e71de2..c7259cc200 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -227,9 +227,7 @@ public Object convert(Object fromObject) {
 					.observeDetail(getMaster()),
 					t2m, m2t);
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 88c0dea335..cc348c6285 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -317,8 +317,7 @@ private Composite createForm(Composite parent) {
 			// force the computation of selectedContainer.
 			t.addModifyListener(e -> selectedContainer = null);
 
-			final Button b = new Button(comp, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			Button b = ControlFactory.createFindButton(comp, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -393,12 +392,11 @@ public void widgetSelected(SelectionEvent e) {
 			}
 			featureText.addModifyListener(e -> updateChildrenChoice());
 
-			final Button button = new Button(comp, SWT.PUSH | SWT.FLAT);
-			button.setText(Messages.ModelTooling_Common_FindEllipsis);
-			button.addSelectionListener(new SelectionAdapter() {
+			Button b = ControlFactory.createFindButton(comp, resourcePool);
+			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					final FeatureSelectionDialog dialog = new FeatureSelectionDialog(button.getShell(),
+					final FeatureSelectionDialog dialog = new FeatureSelectionDialog(b.getShell(),
 							getEditingDomain(), (MStringModelFragment) getMaster().getValue(), Messages,
 							getSelectedContainer());
 					dialog.open();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 7178b1966d..4377e377ba 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -225,10 +225,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__PARENT_ID)
 					.observeDetail(getMaster()));
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index a67175dd0b..a68d8683d9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -187,10 +187,7 @@ public void widgetSelected(SelectionEvent e) {
 					EMFEditProperties.value(getEditingDomain(),
 							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 87ff1c384c..9194c97e1a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -35,7 +35,6 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
-import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ToolItemIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
@@ -222,10 +221,7 @@ protected void createFormSubTypeForm(Composite parent, CTabFolder folder, EMFDat
 
 			new ImageTooltip(t, Messages, this);
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 89e24e9999..858e5191cb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -214,10 +214,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__PARENT_ID)
 					.observeDetail(getMaster()));
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index b3fb7fdcbb..906777bb95 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -257,10 +257,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			new ImageTooltip(t, Messages, this);
 
-			final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_FindEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_zoom));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {

From 84db3473ff0a6bd230c52d60feaa35714a625242 Mon Sep 17 00:00:00 2001
From: "christof.joswig@sap.com" <christof.joswig@sap.com>
Date: Mon, 24 Sep 2018 21:17:32 +0200
Subject: [PATCH 1064/1286] Bug 539141 - Fix compiler warnings

Change-Id: Ic441b1f61c8f79c4ab88254bc2d440acd1e12db5
Signed-off-by: christof.joswig@sap.com <christof.joswig@sap.com>
---
 .../ui/internal/common/component/CompositePartEditor.java | 8 ++++----
 .../emf/ui/internal/common/uistructure/ViewerElement.java | 6 +-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index 2b10423134..e9a8b82c7b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -340,7 +340,7 @@ public String getText(Object element) {
 			childrenDropDown.setSelection(new StructuredSelection(eClassList.get(0)));
 
 			Button b = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_AddEllipsis);
+			b.setText(org.eclipse.e4.tools.emf.ui.internal.Messages.ModelTooling_Common_AddEllipsis);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
 			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
 			b.addSelectionListener(new SelectionAdapter() {
@@ -377,7 +377,7 @@ public void widgetSelected(SelectionEvent e) {
 			buttonCompBot.setLayout(new FillLayout());
 
 			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Up);
+			b.setText(org.eclipse.e4.tools.emf.ui.internal.Messages.ModelTooling_Common_Up);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -401,7 +401,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Down);
+			b.setText(org.eclipse.e4.tools.emf.ui.internal.Messages.ModelTooling_Common_Down);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
@@ -425,7 +425,7 @@ public void widgetSelected(SelectionEvent e) {
 			});
 
 			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-			b.setText(Messages.ModelTooling_Common_Remove);
+			b.setText(org.eclipse.e4.tools.emf.ui.internal.Messages.ModelTooling_Common_Remove);
 			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
index 6a6dd86f49..11221cb2fe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
@@ -20,7 +20,6 @@
 
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.services.nls.Translation;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -42,8 +41,6 @@
  */
 public class ViewerElement {
 
-	Messages Messages;
-
 	private StructuredViewer viewer;
 	private final AbstractComponentEditor editor;
 	private ComboViewer dropDown;
@@ -61,10 +58,9 @@ public class ViewerElement {
 	 * @param editor
 	 */
 	@Inject
-	public ViewerElement(@Translation Messages Messages, Composite parent, AbstractComponentEditor editor) {
+	public ViewerElement(Composite parent, AbstractComponentEditor editor) {
 		this.parent = parent;
 		this.editor = editor;
-		this.Messages = Messages;
 		createControl();
 	}
 

From a799c35b81919efae2850ae4acc3ec2a2180472b Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 27 Sep 2018 19:21:15 +0200
Subject: [PATCH 1065/1286] Version 4.10 update of
 bundles/org.eclipse.e4.tools.compat

Change-Id: I8b8a7f3548273a3535af1cf63ad3f2c1c7619453
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.compat/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 6a2b1ed376..858cfe46a1 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 4.7.200.qualifier
+Bundle-Version: 4.7.300.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 7935f9d39c..b3637493bb 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.compat</artifactId>
-  <version>4.7.200-SNAPSHOT</version>
+  <version>4.7.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From 2738d0dc6975371e8c625f308b29f946d8f210d9 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 27 Sep 2018 19:20:38 +0200
Subject: [PATCH 1066/1286] Bug 493655 - Remove org.eclipse.e4.languages
 extension point and related classes

Change-Id: Ibd4496bb5180f825b6aca4f17e439bcdffc497a2
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../internal/ContextServiceFactory.java       |   5 -
 .../ReflectionContributionFactory.java        | 225 ------------------
 2 files changed, 230 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index b8ad75d99a..a35860bca8 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -18,7 +18,6 @@
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.EclipseContextFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.services.contributions.IContributionFactory;
 import org.eclipse.e4.core.services.log.ILoggerProvider;
 import org.eclipse.e4.core.services.log.Logger;
 import org.eclipse.e4.tools.services.IClipboardService;
@@ -88,10 +87,6 @@ public void asyncExec(Runnable runnable) {
 				}
 			});
 
-			final IContributionFactory contributionFactory = ContextInjectionFactory.make(
-				ReflectionContributionFactory.class, appContext);
-			appContext.set(IContributionFactory.class.getName(), contributionFactory);
-
 			final IThemeManager manager = serviceContext.get(IThemeManager.class);
 			final IThemeEngine engine = manager.getEngineForDisplay(Display.getCurrent());
 			appContext.set(IThemeEngine.class, engine);
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
deleted file mode 100644
index 7950536089..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ReflectionContributionFactory.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package org.eclipse.e4.tools.compat.internal;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.InvalidRegistryObjectException;
-import org.eclipse.e4.core.contexts.ContextInjectionFactory;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.di.InjectionException;
-import org.eclipse.e4.core.services.contributions.IContributionFactory;
-import org.eclipse.e4.core.services.contributions.IContributionFactorySpi;
-import org.eclipse.e4.core.services.log.Logger;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.packageadmin.PackageAdmin;
-
-/**
- * Create the contribution factory.
- */
-@SuppressWarnings({ "restriction", "deprecation" })
-public class ReflectionContributionFactory implements IContributionFactory {
-
-	private final IExtensionRegistry registry;
-	private Map<String, Object> languages;
-
-	@Inject
-	private PackageAdmin packageAdmin;
-
-	@Inject
-	private Logger logger;
-
-	/**
-	 * Create a reflection factory.
-	 *
-	 * @param registry
-	 *            to read languages.
-	 */
-	@Inject
-	public ReflectionContributionFactory(IExtensionRegistry registry) {
-		this.registry = registry;
-		processLanguages();
-	}
-
-	@Override
-	public Object create(String uriString, IEclipseContext context, IEclipseContext staticContext) {
-		return doCreate(uriString, context, staticContext);
-	}
-
-	@Override
-	public Object create(String uriString, IEclipseContext context) {
-		return doCreate(uriString, context, null);
-	}
-
-	private Object doCreate(String uriString, IEclipseContext context, IEclipseContext staticContext) {
-		if (uriString == null) {
-			return null;
-		}
-		// translate old-style platform:/plugin/ class specifiers into new-style
-		// bundleclass:// URIs
-		if (uriString.startsWith("platform:/plugin/")) { //$NON-NLS-1$
-			logger.error("platform-style URIs deprecated for referencing types: " + uriString); //$NON-NLS-1$
-			uriString = uriString
-				.replace("platform:/plugin/", "bundleclass://"); //$NON-NLS-1$ //$NON-NLS-2$
-			logger.error("URI rewritten as: " + uriString); //$NON-NLS-1$
-		}
-
-		final URI uri = URI.createURI(uriString);
-		final Bundle bundle = getBundle(uri);
-		Object contribution;
-		if (bundle != null) {
-			contribution = createFromBundle(bundle, context, staticContext, uri);
-		} else {
-			contribution = null;
-			logger.error("Unable to retrive the bundle from the URI: " //$NON-NLS-1$
-				+ uriString);
-		}
-		return contribution;
-	}
-
-	protected Object createFromBundle(Bundle bundle, IEclipseContext context,
-		IEclipseContext staticContext, URI uri) {
-		Object contribution;
-		if (uri.segmentCount() > 1) {
-			final String prefix = uri.segment(0);
-			final IContributionFactorySpi factory = (IContributionFactorySpi) languages.get(prefix);
-			if (factory == null) {
-				final String message = "Unsupported contribution factory type '" + prefix + "'"; //$NON-NLS-1$ //$NON-NLS-2$
-				logger.error(message);
-				return null;
-			}
-			final StringBuffer resource = new StringBuffer(uri.segment(1));
-			for (int i = 2; i < uri.segmentCount(); i++) {
-				resource.append('/');
-				resource.append(uri.segment(i));
-			}
-			contribution = factory.create(bundle, resource.toString(), context);
-		} else {
-			final String clazz = uri.segment(0);
-			try {
-				final Class<?> targetClass = bundle.loadClass(clazz);
-				if (staticContext == null) {
-					contribution = ContextInjectionFactory.make(targetClass, context);
-				} else {
-					contribution = ContextInjectionFactory
-						.make(targetClass, context, staticContext);
-				}
-
-				if (contribution == null) {
-					final String message = "Unable to load class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
-						+ bundle.getBundleId() + "'"; //$NON-NLS-1$
-					logger.error(message);
-				}
-			} catch (final ClassNotFoundException e) {
-				contribution = null;
-				final String message = "Unable to load class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
-					+ bundle.getBundleId() + "'"; //$NON-NLS-1$
-				logger.error(e, message);
-			} catch (final InjectionException e) {
-				contribution = null;
-				final String message = "Unable to create class '" + clazz + "' from bundle '" //$NON-NLS-1$ //$NON-NLS-2$
-					+ bundle.getBundleId() + "'"; //$NON-NLS-1$
-				logger.error(e, message);
-			}
-		}
-		return contribution;
-	}
-
-	protected void processLanguages() {
-		languages = new HashMap<>();
-		final String extId = "org.eclipse.e4.languages"; //$NON-NLS-1$
-		final IConfigurationElement[] languageElements = registry.getConfigurationElementsFor(extId);
-		for (int i = 0; i < languageElements.length; i++) {
-			final IConfigurationElement languageElement = languageElements[i];
-			try {
-				languages.put(languageElement.getAttribute("name"), //$NON-NLS-1$
-					languageElement.createExecutableExtension("contributionFactory")); //$NON-NLS-1$
-			} catch (final InvalidRegistryObjectException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (final CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-	}
-
-	protected Bundle getBundle(URI platformURI) {
-		return getBundleForName(platformURI.authority());
-	}
-
-	@Override
-	public Bundle getBundle(String uriString) {
-		return getBundle(new URI(uriString));
-	}
-
-	public Bundle getBundleForName(String bundlename) {
-		if (packageAdmin == null) {
-			final Bundle bundle = FrameworkUtil.getBundle(getClass());
-			final BundleContext context = bundle.getBundleContext();
-			final ServiceReference<?> reference = context.getServiceReference(PackageAdmin.class.getName());
-			packageAdmin = (PackageAdmin) context.getService(reference);
-		}
-
-		final Bundle[] bundles = packageAdmin.getBundles(bundlename, null);
-		if (bundles == null) {
-			return null;
-		}
-		// Return the first bundle that is not installed or uninstalled
-		for (int i = 0; i < bundles.length; i++) {
-			if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
-				return bundles[i];
-			}
-		}
-		return null;
-	}
-
-	static class URI {
-		String scheme;
-		String authority;
-		String[] segments = new String[0];
-
-		URI(String uriString) {
-			final int colon = uriString.indexOf(':');
-			if (colon < 0) {
-				throw new IllegalArgumentException("invalid URI"); //$NON-NLS-1$
-			}
-			scheme = uriString.substring(0, colon);
-			uriString = uriString.substring(colon + 1);
-			if (uriString.startsWith("//")) { //$NON-NLS-1$
-				final int authEnd = uriString.indexOf('/', 2);
-				if (authEnd < 0) {
-					authority = uriString.substring(2);
-				} else {
-					authority = uriString.substring(2, authEnd);
-					segments = uriString.substring(authEnd + 1).split("/"); //$NON-NLS-1$
-				}
-			} else {
-				segments = uriString.substring(uriString.indexOf('/') + 1).split("/"); //$NON-NLS-1$
-			}
-		}
-
-		public String authority() {
-			return authority;
-		}
-
-		public String segment(int i) {
-			return segments[i];
-		}
-
-		public int segmentCount() {
-			return segments.length;
-		}
-
-		static URI createURI(String uriString) {
-			return new URI(uriString);
-		}
-	}
-}

From 886ba46c56d24c904fd697a0db056ee83fc75661 Mon Sep 17 00:00:00 2001
From: Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com>
Date: Tue, 2 Oct 2018 11:26:48 +0530
Subject: [PATCH 1067/1286] Bug 539713 - Comparator Error in I20181001-1800
 Build

Change-Id: I2a54dcdb5503d46621908049691848252e6dc66b
---
 bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
index 14243173d2..342969748c 100644
--- a/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
+++ b/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
@@ -1,3 +1,4 @@
 # To force a version qualifier update add the bug here
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
 Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
+Bug 539713 - Comparator Error in I20181001-1800 Build
\ No newline at end of file

From e769d567484e8587adf97d9d016942b29b5bb69c Mon Sep 17 00:00:00 2001
From: Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com>
Date: Sat, 13 Oct 2018 08:55:08 +0530
Subject: [PATCH 1068/1286] Bug 540097 - Comparator Errors in I20181012-1800
 Build

Change-Id: I734282a4778dddaf15ffd8e443cdf57d4002feed
Signed-off-by: Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com>
---
 .../org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt b/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt
index 14243173d2..79b8bae102 100644
--- a/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt
+++ b/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt
@@ -1,3 +1,4 @@
 # To force a version qualifier update add the bug here
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
 Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
+Bug 540097 - Comparator Errors in I20181012-1800 Build

From 0117662275f1c43bd8aa252ae164f8d2fb9a60ee Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 8 Oct 2018 14:49:44 +0200
Subject: [PATCH 1069/1286] Bug 539583 - Retire org.eclipse.e4.tools.compat

This plug-in is currently used and can be retired from master.

Change-Id: Id8ef77d57075682094cd7368a114814321435fa1
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../org.eclipse.e4.tools.compat/.classpath    |   7 -
 bundles/org.eclipse.e4.tools.compat/.project  |  33 --
 .../org.eclipse.core.resources.prefs          |   6 -
 .../.settings/org.eclipse.core.runtime.prefs  |   2 -
 .../.settings/org.eclipse.jdt.core.prefs      | 425 ------------------
 .../.settings/org.eclipse.jdt.ui.prefs        | 127 ------
 .../.settings/org.eclipse.pde.api.tools.prefs |  97 ----
 .../.settings/org.eclipse.pde.prefs           |  32 --
 .../META-INF/MANIFEST.MF                      |  22 -
 .../OSGI-INF/l10n/bundle.properties           |   3 -
 .../org.eclipse.e4.tools.compat/about.html    |  36 --
 .../build.properties                          |   8 -
 .../forceQualifierUpdate.txt                  |   4 -
 .../org.eclipse.e4.tools.compat/plugin.xml    |  13 -
 bundles/org.eclipse.e4.tools.compat/pom.xml   |  16 -
 .../compat/internal/ClipboardServiceImpl.java |  45 --
 .../internal/ContextServiceFactory.java       | 161 -------
 .../e4/tools/compat/internal/CopyAction.java  |  31 --
 .../e4/tools/compat/internal/CutAction.java   |  31 --
 .../internal/DefaultLoggerProvider.java       |  22 -
 .../e4/tools/compat/internal/Messages.java    |  35 --
 .../e4/tools/compat/internal/PartHelper.java  | 129 ------
 .../e4/tools/compat/internal/PasteAction.java |  30 --
 .../e4/tools/compat/internal/Util.java        |  29 --
 .../compat/internal/WorkbenchLogger.java      | 158 -------
 .../tools/compat/internal/messages.properties |   3 -
 .../e4/tools/compat/parts/DIEditorPart.java   | 165 -------
 .../e4/tools/compat/parts/DIHandler.java      |  55 ---
 .../compat/parts/DIMultiPageEditorPart.java   |  43 --
 .../compat/parts/DISaveableViewPart.java      |  70 ---
 .../e4/tools/compat/parts/DIViewPart.java     |  68 ---
 .../feature.xml                               |   9 +-
 .../org.eclipse.e4.core.tools.feature/pom.xml |   2 +-
 33 files changed, 2 insertions(+), 1915 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/.classpath
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/.project
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/about.html
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/build.properties
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/plugin.xml
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/pom.xml
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java

diff --git a/bundles/org.eclipse.e4.tools.compat/.classpath b/bundles/org.eclipse.e4.tools.compat/.classpath
deleted file mode 100644
index 4f83b2397e..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.e4.tools.compat/.project b/bundles/org.eclipse.e4.tools.compat/.project
deleted file mode 100644
index e5e9a15272..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.e4.tools.compat</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index f548abbf0b..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-
-encoding//model/etypes.ecore=UTF-8
-
-
-encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22d2a..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 68d9f84612..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,425 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 345ae3ec85..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,127 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=false
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=false
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n *\n * This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License 2.0\r\n * which accompanies this distribution, and is available at\r\n * https://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=true
-sp_cleanup.insert_inferred_type_arguments=false
-sp_cleanup.make_local_variable_final=true
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=false
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_redundant_type_arguments=false
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=false
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_anonymous_class_creation=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_lambda=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index e4e3c0071e..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,97 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Warning
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Ignore
-automatically_removed_unused_problem_filters=Disabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 0bbee3c4b8..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,32 +0,0 @@
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.build.bin.includes=1
-compilers.p.build.encodings=2
-compilers.p.build.java.compiler=2
-compilers.p.build.java.compliance=1
-compilers.p.build.missing.output=2
-compilers.p.build.output.library=1
-compilers.p.build.source.library=1
-compilers.p.build.src.includes=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=1
-compilers.p.missing-version-export-package=1
-compilers.p.missing-version-import-package=1
-compilers.p.missing-version-require-bundle=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
deleted file mode 100644
index 858cfe46a1..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 4.7.300.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
- org.eclipse.core.runtime;bundle-version="3.6.0",
- org.eclipse.e4.core.contexts;bundle-version="0.9.0",
- org.eclipse.e4.core.services;bundle-version="0.9.1",
- org.eclipse.e4.ui.services;bundle-version="0.9.1",
- org.eclipse.e4.core.di;bundle-version="0.9.0",
- org.eclipse.e4.tools.services;bundle-version="0.11.0",
- org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
- org.eclipse.e4.ui.di;bundle-version="0.9.0",
- org.eclipse.core.databinding;bundle-version="1.4.0"
-Export-Package: org.eclipse.e4.tools.compat.internal;version="0.12.0.qualifier";x-internal:=true,
- org.eclipse.e4.tools.compat.parts;version="0.12.0.qualifier";x-internal:=true
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %Bundle-Vendor
-Import-Package: javax.inject;version="1.0.0"
-Automatic-Module-Name: org.eclipse.e4.tools.compat
diff --git a/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 767d1e6f4b..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.e4.tools.compat
-Bundle-Name = Compat
-Bundle-Vendor = Eclipse.org
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/about.html b/bundles/org.eclipse.e4.tools.compat/about.html
deleted file mode 100644
index 164f781a8f..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/about.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!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/bundles/org.eclipse.e4.tools.compat/build.properties b/bundles/org.eclipse.e4.tools.compat/build.properties
deleted file mode 100644
index 789a966a45..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               OSGI-INF/
-source.. = src/
-src.includes = about.html
diff --git a/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
deleted file mode 100644
index 342969748c..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# To force a version qualifier update add the bug here
-Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
-Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
-Bug 539713 - Comparator Error in I20181001-1800 Build
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/plugin.xml b/bundles/org.eclipse.e4.tools.compat/plugin.xml
deleted file mode 100644
index a839686368..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.services">
-      <serviceFactory
-            factoryClass="org.eclipse.e4.tools.compat.internal.ContextServiceFactory">
-         <service
-               serviceClass="org.eclipse.e4.core.contexts.IEclipseContext"></service>
-      </serviceFactory>
-   </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
deleted file mode 100644
index b3637493bb..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse</groupId>
-    <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.10.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-
-  <groupId>eclipse.platform.ui.tools</groupId>
-  <artifactId>org.eclipse.e4.tools.compat</artifactId>
-  <version>4.7.300-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-
-</project>
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
deleted file mode 100644
index eb4b601df9..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2014 BestSolution.at and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
- ******************************************************************************/
-package org.eclipse.e4.tools.compat.internal;
-
-import org.eclipse.e4.tools.services.IClipboardService;
-
-public class ClipboardServiceImpl implements IClipboardService {
-	private Handler handler;
-
-	@Override
-	public void copy() {
-		if( handler != null ) {
-			handler.copy();
-		}
-	}
-
-	@Override
-	public void paste() {
-		if( handler != null ) {
-			handler.paste();
-		}
-	}
-
-	@Override
-	public void setHandler(Handler handler) {
-		this.handler = handler;
-	}
-
-	@Override
-	public void cut() {
-		this.handler.cut();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
deleted file mode 100644
index a35860bca8..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2015 BestSolution.at and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- * Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
- ******************************************************************************/
-package org.eclipse.e4.tools.compat.internal;
-
-import org.eclipse.core.databinding.observable.Realm;
-import org.eclipse.e4.core.contexts.ContextInjectionFactory;
-import org.eclipse.e4.core.contexts.EclipseContextFactory;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.services.log.ILoggerProvider;
-import org.eclipse.e4.core.services.log.Logger;
-import org.eclipse.e4.tools.services.IClipboardService;
-import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
-import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
-import org.eclipse.e4.ui.di.UISynchronize;
-import org.eclipse.e4.ui.services.IServiceConstants;
-import org.eclipse.e4.ui.services.IStylingEngine;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.internal.services.IWorkbenchLocationService;
-import org.eclipse.ui.services.AbstractServiceFactory;
-import org.eclipse.ui.services.IServiceLocator;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.w3c.dom.css.CSSStyleDeclaration;
-
-@SuppressWarnings("restriction")
-public class ContextServiceFactory extends AbstractServiceFactory {
-
-	@Override
-	public Object create(Class serviceInterface, IServiceLocator parentLocator,
-		IServiceLocator locator) {
-		if (!IEclipseContext.class.equals(serviceInterface)) {
-			return null;
-		}
-
-		final IWorkbenchLocationService wls = locator.getService(IWorkbenchLocationService.class);
-		final IWorkbenchWindow window = wls.getWorkbenchWindow();
-		final IWorkbenchPartSite site = wls.getPartSite();
-
-		@SuppressWarnings("unchecked")
-		final Object o = parentLocator.getService(serviceInterface);
-
-		// This happens when we run in plain 3.x
-		// We need to create a parent service context
-		if (window == null && site == null) {
-			final Bundle bundle = FrameworkUtil.getBundle(ContextServiceFactory.class);
-			final BundleContext bundleContext = bundle.getBundleContext();
-			final IEclipseContext serviceContext = EclipseContextFactory.getServiceContext(bundleContext);
-
-			final IEclipseContext appContext = serviceContext.createChild("WorkbenchContext"); //$NON-NLS-1$
-			appContext.set(Display.class, Display.getCurrent());
-			appContext.set(Logger.class, new WorkbenchLogger());
-			appContext.set(IClipboardService.class, new ClipboardServiceImpl());
-			appContext.set(Realm.class, Realm.getDefault());
-
-			final Display d = Display.getCurrent();
-			appContext.set(UISynchronize.class, new UISynchronize() {
-
-				@Override
-				public void syncExec(Runnable runnable) {
-					d.syncExec(runnable);
-				}
-
-				@Override
-				public void asyncExec(Runnable runnable) {
-					d.asyncExec(runnable);
-				}
-			});
-
-			final IThemeManager manager = serviceContext.get(IThemeManager.class);
-			final IThemeEngine engine = manager.getEngineForDisplay(Display.getCurrent());
-			appContext.set(IThemeEngine.class, engine);
-
-			appContext.set(IStylingEngine.class, new IStylingEngine() {
-
-				@Override
-				public void setClassname(Object widget, String classname) {
-					((Widget) widget).setData("org.eclipse.e4.ui.css.CssClassName", classname); //$NON-NLS-1$
-					engine.applyStyles(widget, true);
-				}
-
-				@Override
-				public void setId(Object widget, String id) {
-					((Widget) widget).setData("org.eclipse.e4.ui.css.id", id); //$NON-NLS-1$
-					engine.applyStyles(widget, true);
-				}
-
-				@Override
-				public void style(Object widget) {
-					engine.applyStyles(widget, true);
-				}
-
-				@Override
-				public CSSStyleDeclaration getStyle(Object widget) {
-					return engine.getStyle(widget);
-				}
-
-				@Override
-				public void setClassnameAndId(Object widget, String classname,
-					String id) {
-					((Widget) widget).setData("org.eclipse.e4.ui.css.CssClassName", classname); //$NON-NLS-1$
-					((Widget) widget).setData("org.eclipse.e4.ui.css.id", id); //$NON-NLS-1$
-					engine.applyStyles(widget, true);
-				}
-			});
-
-			if (appContext.get(ILoggerProvider.class) == null) {
-				appContext.set(ILoggerProvider.class,
-					ContextInjectionFactory.make(DefaultLoggerProvider.class, appContext));
-			}
-
-			return appContext;
-		} else if (o != null && site == null) {
-			final IEclipseContext windowContext = ((IEclipseContext) o).createChild("WindowContext(" + window + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-			windowContext.set(ISelectionService.class, window.getSelectionService());
-
-			windowContext.declareModifiable(IServiceConstants.ACTIVE_SELECTION);
-			window.getSelectionService().addSelectionListener(new ISelectionListener() {
-
-				@Override
-				public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-					if (!selection.isEmpty()) {
-						if (selection instanceof IStructuredSelection) {
-							final IStructuredSelection s = (IStructuredSelection) selection;
-							if (s.size() == 1) {
-								windowContext.set(IServiceConstants.ACTIVE_SELECTION, s.getFirstElement());
-							} else {
-								windowContext.set(IServiceConstants.ACTIVE_SELECTION, s.toList());
-							}
-						} else {
-							windowContext.set(IServiceConstants.ACTIVE_SELECTION, selection);
-						}
-					}
-				}
-			});
-			return windowContext;
-		}
-
-		return o;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
deleted file mode 100644
index 1d274a2ec1..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.compat.internal;
-
-import org.eclipse.e4.tools.services.IClipboardService;
-import org.eclipse.jface.action.Action;
-
-public class CopyAction extends Action {
-	private final IClipboardService service;
-
-	public CopyAction(IClipboardService service) {
-		super(Messages.CopyAction);
-		this.service = service;
-	}
-
-	@Override
-	public void run() {
-		service.copy();
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
deleted file mode 100644
index 8315494d58..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.compat.internal;
-
-import org.eclipse.e4.tools.services.IClipboardService;
-import org.eclipse.jface.action.Action;
-
-public class CutAction extends Action {
-	private IClipboardService service;
-
-	public CutAction(IClipboardService service) {
-		super(Messages.CutAction);
-		this.service = service;
-	}
-
-	@Override
-	public void run() {
-		service.cut();
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
deleted file mode 100644
index cfa745ba2e..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.e4.tools.compat.internal;
-
-import javax.inject.Inject;
-
-import org.eclipse.e4.core.contexts.ContextInjectionFactory;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.services.log.ILoggerProvider;
-import org.eclipse.e4.core.services.log.Logger;
-import org.osgi.framework.FrameworkUtil;
-
-@SuppressWarnings("restriction")
-public class DefaultLoggerProvider implements ILoggerProvider {
-	@Inject
-	private IEclipseContext context;
-
-	@Override
-	public Logger getClassLogger(Class<?> clazz) {
-		final IEclipseContext childContext = context.createChild();
-		childContext.set("logger.bundlename", FrameworkUtil.getBundle(clazz).getSymbolicName()); //$NON-NLS-1$
-		return ContextInjectionFactory.make(WorkbenchLogger.class, childContext);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
deleted file mode 100644
index d77f12ef4f..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Jonas - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.compat.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Jonas
- *
- */
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.e4.tools.compat.internal.messages"; //$NON-NLS-1$
-	public static String CopyAction;
-	public static String CutAction;
-	public static String PasteAction;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
deleted file mode 100644
index 0cbb4407ae..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2016 BestSolution.at and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.compat.internal;
-
-import java.lang.reflect.Method;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.e4.core.contexts.ContextInjectionFactory;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.tools.services.IClipboardService;
-import org.eclipse.e4.ui.services.IStylingEngine;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.WorkbenchPart;
-
-public class PartHelper {
-	private static final String ORG_ECLIPSE_E4_UI_WORKBENCH_I_PRESENTATION_ENGINE = "org.eclipse.e4.ui.workbench.IPresentationEngine"; //$NON-NLS-1$
-
-	public static IEclipseContext createPartContext(WorkbenchPart part) throws PartInitException {
-		final IWorkbenchPartSite site = part.getSite();
-		final IEclipseContext parentContext = site.getService(IEclipseContext.class);
-
-		// Check if running in 4.x
-		if (parentContext.get(ORG_ECLIPSE_E4_UI_WORKBENCH_I_PRESENTATION_ENGINE) != null) {
-			// Hack to get the MPart-Context
-			try {
-				final Class<?> clazz = Util.getBundle("org.eclipse.e4.ui.model.workbench").loadClass( //$NON-NLS-1$
-						"org.eclipse.e4.ui.model.application.ui.basic.MPart"); //$NON-NLS-1$
-				final Object instance = site.getService(clazz);
-				final Method m = clazz.getMethod("getContext", new Class[0]); //$NON-NLS-1$
-				IEclipseContext ctx = (IEclipseContext) m.invoke(instance);
-				final IEclipseContext rv = ctx;
-				while (ctx.getParent() != null) {
-					ctx = ctx.getParent();
-				}
-				ctx.set(IClipboardService.class, new ClipboardServiceImpl());
-				return rv;
-			} catch (final Exception e) {
-				throw new PartInitException("Could not create context", e); //$NON-NLS-1$
-			}
-		}
-		return parentContext.createChild("EditPart('" + part.getPartName() + "')"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	}
-
-	public static <C> C createComponent(Composite parent, IEclipseContext context, Class<C> clazz, WorkbenchPart part) {
-		final ISelectionProvider s = new SelectionProviderImpl();
-		context.set(ISelectionProvider.class, s);
-		part.getSite().setSelectionProvider(s);
-
-		final IStylingEngine styleEngine = context.get(IStylingEngine.class);
-		final Composite comp = new Composite(parent, SWT.NONE);
-		comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
-
-		// FIXME This should be read from the CSS
-		final FillLayout layout = new FillLayout();
-		comp.setLayout(layout);
-
-		context.set(Composite.class.getName(), comp);
-		final C component = ContextInjectionFactory.make(clazz, context);
-
-		styleEngine.setClassname(comp, part.getClass().getSimpleName());
-
-		return component;
-	}
-
-	static class SelectionProviderImpl implements ISelectionProvider {
-		private ISelection currentSelection = StructuredSelection.EMPTY;
-
-		private final ListenerList<ISelectionChangedListener> listeners = new ListenerList<>();
-
-		@Override
-		public void setSelection(ISelection selection) {
-			currentSelection = selection;
-			final SelectionChangedEvent evt = new SelectionChangedEvent(this, selection);
-
-			for (final ISelectionChangedListener l : listeners) {
-				l.selectionChanged(evt);
-			}
-		}
-
-		@Override
-		public void removeSelectionChangedListener(
-				ISelectionChangedListener listener) {
-			listeners.remove(listener);
-		}
-
-		@Override
-		public ISelection getSelection() {
-			return currentSelection;
-		}
-
-		@Override
-		public void addSelectionChangedListener(ISelectionChangedListener listener) {
-			listeners.add(listener);
-		}
-	}
-
-	public static void disposeContextIfE3(IEclipseContext parentContext,
-			IEclipseContext context) {
-		// Check if running in 3.x, otherwise there was no dedicated context
-		// created
-		if (parentContext
-				.get(ORG_ECLIPSE_E4_UI_WORKBENCH_I_PRESENTATION_ENGINE) == null) {
-			context.dispose();
-			context = null;
-		}
-
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
deleted file mode 100644
index 2496fe221a..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.compat.internal;
-
-import org.eclipse.e4.tools.services.IClipboardService;
-import org.eclipse.jface.action.Action;
-
-public class PasteAction extends Action {
-	private IClipboardService service;
-	public PasteAction(IClipboardService service) {
-		super(Messages.PasteAction);
-		this.service = service;
-	}
-
-	@Override
-	public void run() {
-		service.paste();
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java
deleted file mode 100644
index a72f261a96..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.e4.tools.compat.internal;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.packageadmin.PackageAdmin;
-
-@SuppressWarnings("deprecation")
-public class Util {
-	public static Bundle getBundle(String bundleName) {
-		final Bundle bundle = FrameworkUtil.getBundle(Util.class);
-		final BundleContext ctx = bundle.getBundleContext();
-		final ServiceReference<PackageAdmin> ref = bundle.getBundleContext().getServiceReference(
-			PackageAdmin.class);
-		final PackageAdmin bundleAdmin = ctx.getService(ref);
-		final Bundle[] bundles = bundleAdmin.getBundles(bundleName, null);
-		if (bundles == null) {
-			return null;
-		}
-		// Return the first bundle that is not installed or uninstalled
-		for (int i = 0; i < bundles.length; i++) {
-			if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
-				return bundles[i];
-			}
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
deleted file mode 100644
index ebbc4e3064..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package org.eclipse.e4.tools.compat.internal;
-
-import java.util.ArrayList;
-
-import javax.inject.Inject;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.e4.core.services.log.Logger;
-import org.eclipse.osgi.framework.log.FrameworkLog;
-import org.eclipse.osgi.framework.log.FrameworkLogEntry;
-import org.eclipse.osgi.service.debug.DebugOptions;
-import org.eclipse.osgi.service.debug.DebugTrace;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.FrameworkUtil;
-
-/**
- * The workbench implementation of the logger service.
- */
-@SuppressWarnings("restriction")
-public final class WorkbenchLogger extends Logger {
-	protected DebugTrace trace;
-	protected FrameworkLog log;
-	private final Bundle bundle = FrameworkUtil.getBundle(WorkbenchLogger.class);
-
-	/**
-	 * Creates a new workbench logger
-	 */
-	public WorkbenchLogger() {
-		super();
-	}
-
-	@Override
-	public void debug(Throwable t) {
-		debug(t, null);
-	}
-
-	@Override
-	public void debug(Throwable t, String message) {
-		trace(t, message);
-	}
-
-	@Override
-	public void error(Throwable t, String message) {
-		log(new Status(IStatus.ERROR, bundle.getSymbolicName(),
-			message, t));
-	}
-
-	/**
-	 * Copied from PlatformLogWriter in core runtime.
-	 */
-	private static FrameworkLogEntry getLog(IStatus status) {
-		final Throwable t = status.getException();
-		final ArrayList<FrameworkLogEntry> childlist = new ArrayList<>();
-
-		final int stackCode = t instanceof CoreException ? 1 : 0;
-		// ensure a substatus inside a CoreException is properly logged
-		if (stackCode == 1) {
-			final IStatus coreStatus = ((CoreException) t).getStatus();
-			if (coreStatus != null) {
-				childlist.add(getLog(coreStatus));
-			}
-		}
-
-		if (status.isMultiStatus()) {
-			final IStatus[] children = status.getChildren();
-			for (int i = 0; i < children.length; i++) {
-				childlist.add(getLog(children[i]));
-			}
-		}
-
-		final FrameworkLogEntry[] children = childlist.size() == 0 ? null
-			: childlist.toArray(new FrameworkLogEntry[childlist.size()]);
-
-		return new FrameworkLogEntry(status.getPlugin(), status.getSeverity(), status.getCode(),
-			status.getMessage(), stackCode, t, children);
-	}
-
-	@Override
-	public void info(Throwable t, String message) {
-		log(new Status(IStatus.INFO, bundle.getSymbolicName(), message,
-			t));
-	}
-
-	@Override
-	public boolean isDebugEnabled() {
-		return false;
-	}
-
-	@Override
-	public boolean isErrorEnabled() {
-		return true;
-	}
-
-	@Override
-	public boolean isInfoEnabled() {
-		return true;
-	}
-
-	@Override
-	public boolean isTraceEnabled() {
-		return false;
-	}
-
-	@Override
-	public boolean isWarnEnabled() {
-		return true;
-	}
-
-	private void log(IStatus status) {
-		if (log != null) {
-			log.log(getLog(status));
-		} else {
-			System.out.println(status.getMessage());
-			if (status.getException() != null) {
-				status.getException().printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * Sets the debug options service for this logger.
-	 *
-	 * @param options
-	 *            The debug options to be used by this logger
-	 */
-	@Inject
-	public void setDebugOptions(DebugOptions options) {
-		if (options != null) {
-			trace = options.newDebugTrace(bundle.getSymbolicName(), WorkbenchLogger.class);
-		}
-	}
-
-	/**
-	 * @param log
-	 */
-	@Inject
-	public void setFrameworkLog(FrameworkLog log) {
-		this.log = log;
-	}
-
-	@Override
-	public void trace(Throwable t, String message) {
-		if (trace != null) {
-			trace.trace(null, message, t);
-		} else {
-			System.out.println(message);
-			t.printStackTrace();
-		}
-	}
-
-	@Override
-	public void warn(Throwable t, String message) {
-		log(new Status(IStatus.WARNING, bundle.getSymbolicName(),
-			message, t));
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties
deleted file mode 100644
index d60d7bac31..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-CopyAction=Copy
-CutAction=Cut
-PasteAction=Paste
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
deleted file mode 100644
index 51dfe8441d..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2015 BestSolution.at and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Jonas Helming <jhelming@eclipsesource.com>
- *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
- *     Steven Spungin <steven@spungin.tv> - Bug 436889
- ******************************************************************************/
-package org.eclipse.e4.tools.compat.parts;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.e4.core.contexts.ContextInjectionFactory;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.tools.compat.internal.CopyAction;
-import org.eclipse.e4.tools.compat.internal.CutAction;
-import org.eclipse.e4.tools.compat.internal.PartHelper;
-import org.eclipse.e4.tools.compat.internal.PasteAction;
-import org.eclipse.e4.tools.services.IClipboardService;
-import org.eclipse.e4.tools.services.IDirtyProviderService;
-import org.eclipse.e4.ui.di.Focus;
-import org.eclipse.e4.ui.di.Persist;
-import org.eclipse.e4.ui.di.PersistState;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.part.EditorPart;
-
-/**
- * This class provides an adapter enabling to plug editors, which are
- * implemented following the e4 programming model into a 3.x workbench. This
- * class is supposed to be sub classed by clients.
- *
- * @author Jonas
- *
- * @param <C>
- */
-public abstract class DIEditorPart<C> extends EditorPart implements IDirtyProviderService {
-	private IEclipseContext context;
-	private C component;
-	private Class<C> clazz;
-	private boolean dirtyState;
-
-	private int features;
-
-	protected static final int COPY = 1;
-	protected static final int PASTE = 1 << 1;
-	protected static final int CUT = 1 << 2;
-
-	public DIEditorPart(Class<C> clazz) {
-		this(clazz, SWT.NONE);
-	}
-
-	public DIEditorPart(Class<C> clazz, int features) {
-		this.clazz = clazz;
-		this.features = features;
-	}
-
-	@Override
-	public void doSave(IProgressMonitor monitor) {
-		IEclipseContext saveContext = context.createChild();
-		ContextInjectionFactory.invoke(component, Persist.class, saveContext);
-		saveContext.dispose();
-	}
-
-	@Override
-	public void doSaveAs() {
-
-	}
-
-	@Override
-	public boolean isSaveAsAllowed() {
-		return false;
-	}
-
-	@Override
-	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-		setSite(site);
-		setInput(input);
-
-		context = PartHelper.createPartContext(this);
-		context.declareModifiable(IEditorInput.class);
-		context.declareModifiable(IEditorPart.class);
-		context.declareModifiable(IDirtyProviderService.class);
-
-		context.set(IEditorPart.class, this);
-		context.set(IDirtyProviderService.class, this);
-		context.set(IEditorInput.class, input);
-	}
-
-	@Override
-	public void createPartControl(Composite parent) {
-		component = PartHelper.createComponent(parent, context, clazz, this);
-		makeActions();
-	}
-
-	@PersistState
-	public void persistState() {
-		ContextInjectionFactory.invoke(component, PersistState.class, context);
-	}
-
-	protected IEclipseContext getContext() {
-		return context;
-	}
-
-	public C getComponent() {
-		return component;
-	}
-
-	protected void makeActions() {
-		if ((features & COPY) == COPY) {
-			IClipboardService clipboard = context.get(IClipboardService.class);
-			getEditorSite().getActionBars().setGlobalActionHandler(
-					ActionFactory.COPY.getId(), new CopyAction(clipboard));
-		}
-
-		if ((features & PASTE) == PASTE) {
-			IClipboardService clipboard = context.get(IClipboardService.class);
-			getEditorSite().getActionBars().setGlobalActionHandler(
-					ActionFactory.PASTE.getId(), new PasteAction(clipboard));
-		}
-
-		if ((features & CUT) == CUT) {
-			IClipboardService clipboard = context.get(IClipboardService.class);
-			getEditorSite().getActionBars().setGlobalActionHandler(
-					ActionFactory.CUT.getId(), new CutAction(clipboard));
-		}
-	}
-
-	@Override
-	public void setDirtyState(boolean dirtyState) {
-		if (dirtyState != this.dirtyState) {
-			this.dirtyState = dirtyState;
-			firePropertyChange(PROP_DIRTY);
-		}
-	}
-
-	@Override
-	public boolean isDirty() {
-		return dirtyState;
-	}
-
-	@Override
-	public void setFocus() {
-		ContextInjectionFactory.invoke(component, Focus.class, context);
-	}
-
-	@Override
-	public void dispose() {
-		PartHelper.disposeContextIfE3(getSite().getService(IEclipseContext.class), context);
-		super.dispose();
-	}
-
-}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
deleted file mode 100644
index 5626b68511..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012, 2015 EclipseSource München GmbH and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Jonas Helming <jhelming@eclipsesource.com> - initial API and implementation
- * Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
- ******************************************************************************/
-package org.eclipse.e4.tools.compat.parts;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.e4.core.contexts.ContextInjectionFactory;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This is a preliminary implementation of a Handler wrapper. It does not support @CanExecute yet
- *
- * @author Jonas
- *
- * @param <C>
- */
-public class DIHandler<C> extends AbstractHandler {
-
-	private final C component;
-
-	public DIHandler(Class<C> clazz) {
-		final IEclipseContext context = getActiveContext();
-		component = ContextInjectionFactory.make(clazz, context);
-	}
-
-	private static IEclipseContext getActiveContext() {
-		final IEclipseContext parentContext = getParentContext();
-		return parentContext.getActiveLeaf();
-	}
-
-	private static IEclipseContext getParentContext() {
-		return PlatformUI.getWorkbench().getService(IEclipseContext.class);
-	}
-
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		return ContextInjectionFactory.invoke(component, Execute.class, getActiveContext());
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
deleted file mode 100644
index cfcfdb4f5b..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 EclipseSource and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Jonas Helming <jhelming@eclipsesource.com>
- ******************************************************************************/
-
-package org.eclipse.e4.tools.compat.parts;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.e4.tools.services.IDirtyProviderService;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.MultiPageEditorPart;
-
-public abstract class DIMultiPageEditorPart extends MultiPageEditorPart
-		implements IDirtyProviderService {
-
-	public <T> int addPage(Class<T> clazz) throws PartInitException {
-		DIEditorPart<T> part = new DIEditorPart<T>(clazz) {};
-		return addPage(part, getEditorInput());
-
-	}
-
-	public DIMultiPageEditorPart() {
-	}
-
-	@Override
-	public void doSave(IProgressMonitor monitor) {
-		for (int i = 0; i < getPageCount(); i++) {
-			IEditorPart e = getEditor(i);
-			e.doSave(monitor);
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
deleted file mode 100644
index 4d621c35e8..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2014 BestSolution.at and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
- ******************************************************************************/
-package org.eclipse.e4.tools.compat.parts;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.e4.core.contexts.ContextInjectionFactory;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.tools.services.IDirtyProviderService;
-import org.eclipse.e4.ui.di.Persist;
-import org.eclipse.ui.ISaveablePart2;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.PartInitException;
-
-public abstract class DISaveableViewPart<C> extends DIViewPart<C> implements ISaveablePart2, IDirtyProviderService {
-	private boolean dirtyState;
-
-	public DISaveableViewPart(Class<C> clazz) {
-		super(clazz);
-	}
-
-	@Override
-	public void doSave(IProgressMonitor monitor) {
-		IEclipseContext saveContext = getContext().createChild();
-		ContextInjectionFactory.invoke(getComponent(), Persist.class, saveContext);
-		saveContext.dispose();
-	}
-
-	@Override
-	public void doSaveAs() {
-
-	}
-
-	@Override
-	public boolean isSaveAsAllowed() {
-		return false;
-	}
-
-	@Override
-	public void setDirtyState(boolean dirtyState) {
-		if( dirtyState != this.dirtyState ) {
-			this.dirtyState = dirtyState;
-			firePropertyChange(PROP_DIRTY);
-		}
-	}
-
-	@Override
-	public boolean isDirty() {
-		return dirtyState;
-	}
-
-	@Override
-	public void init(IViewSite site) throws PartInitException {
-		super.init(site);
-
-		getContext().declareModifiable(IDirtyProviderService.class);
-		getContext().set(IDirtyProviderService.class, this);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
deleted file mode 100644
index 771cf21f42..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2015 BestSolution.at and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.compat.parts;
-
-import org.eclipse.e4.core.contexts.ContextInjectionFactory;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.tools.compat.internal.PartHelper;
-import org.eclipse.e4.ui.di.Focus;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ViewPart;
-
-public abstract class DIViewPart<C> extends ViewPart {
-	private IEclipseContext context;
-	private Class<C> clazz;
-	private C component;
-
-	public DIViewPart(Class<C> clazz) {
-		this.clazz = clazz;
-	}
-
-	@Override
-	public void init(IViewSite site) throws PartInitException {
-		super.init(site);
-		context = PartHelper.createPartContext(this);
-
-		context.declareModifiable(IViewPart.class);
-
-		context.set(IViewPart.class, this);
-	}
-
-	@Override
-	public void createPartControl(Composite parent) {
-		component = PartHelper.createComponent(parent, context, clazz, this);
-	}
-
-	protected IEclipseContext getContext() {
-		return context;
-	}
-
-	public C getComponent() {
-		return component;
-	}
-
-	@Override
-	public void setFocus() {
-		ContextInjectionFactory.invoke(component, Focus.class, context);
-	}
-
-	@Override
-	public void dispose() {
-		PartHelper.disposeContextIfE3(getSite().getService(IEclipseContext.class), context);
-		super.dispose();
-	}
-}
\ No newline at end of file
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index b4838df0f9..7f4b4c5ba1 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.10.0.qualifier"
+      version="4.10.100.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -33,13 +33,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.e4.tools.compat"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.e4.tools.services"
          download-size="0"
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index d1283da577..94fe9a7cf1 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>4.10.0-SNAPSHOT</version>
+  <version>4.10.100-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>

From 94a6b0efd2cae427cae13e241eaad596b5b0359b Mon Sep 17 00:00:00 2001
From: Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com>
Date: Sun, 14 Oct 2018 22:38:37 -0500
Subject: [PATCH 1070/1286] Revert "Bug 539583 - Retire
 org.eclipse.e4.tools.compat"

This reverts commit 0117662275f1c43bd8aa252ae164f8d2fb9a60ee.

Change-Id: Ib556f05593a24478c0d65b6045146cfe284fb74c
---
 .../org.eclipse.e4.tools.compat/.classpath    |   7 +
 bundles/org.eclipse.e4.tools.compat/.project  |  33 ++
 .../org.eclipse.core.resources.prefs          |   6 +
 .../.settings/org.eclipse.core.runtime.prefs  |   2 +
 .../.settings/org.eclipse.jdt.core.prefs      | 425 ++++++++++++++++++
 .../.settings/org.eclipse.jdt.ui.prefs        | 127 ++++++
 .../.settings/org.eclipse.pde.api.tools.prefs |  97 ++++
 .../.settings/org.eclipse.pde.prefs           |  32 ++
 .../META-INF/MANIFEST.MF                      |  22 +
 .../OSGI-INF/l10n/bundle.properties           |   3 +
 .../org.eclipse.e4.tools.compat/about.html    |  36 ++
 .../build.properties                          |   8 +
 .../forceQualifierUpdate.txt                  |   4 +
 .../org.eclipse.e4.tools.compat/plugin.xml    |  13 +
 bundles/org.eclipse.e4.tools.compat/pom.xml   |  16 +
 .../compat/internal/ClipboardServiceImpl.java |  45 ++
 .../internal/ContextServiceFactory.java       | 161 +++++++
 .../e4/tools/compat/internal/CopyAction.java  |  31 ++
 .../e4/tools/compat/internal/CutAction.java   |  31 ++
 .../internal/DefaultLoggerProvider.java       |  22 +
 .../e4/tools/compat/internal/Messages.java    |  35 ++
 .../e4/tools/compat/internal/PartHelper.java  | 129 ++++++
 .../e4/tools/compat/internal/PasteAction.java |  30 ++
 .../e4/tools/compat/internal/Util.java        |  29 ++
 .../compat/internal/WorkbenchLogger.java      | 158 +++++++
 .../tools/compat/internal/messages.properties |   3 +
 .../e4/tools/compat/parts/DIEditorPart.java   | 165 +++++++
 .../e4/tools/compat/parts/DIHandler.java      |  55 +++
 .../compat/parts/DIMultiPageEditorPart.java   |  43 ++
 .../compat/parts/DISaveableViewPart.java      |  70 +++
 .../e4/tools/compat/parts/DIViewPart.java     |  68 +++
 .../feature.xml                               |   9 +-
 .../org.eclipse.e4.core.tools.feature/pom.xml |   2 +-
 33 files changed, 1915 insertions(+), 2 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.compat/.classpath
 create mode 100644 bundles/org.eclipse.e4.tools.compat/.project
 create mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
 create mode 100644 bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties
 create mode 100644 bundles/org.eclipse.e4.tools.compat/about.html
 create mode 100644 bundles/org.eclipse.e4.tools.compat/build.properties
 create mode 100644 bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
 create mode 100644 bundles/org.eclipse.e4.tools.compat/plugin.xml
 create mode 100644 bundles/org.eclipse.e4.tools.compat/pom.xml
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
 create mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java

diff --git a/bundles/org.eclipse.e4.tools.compat/.classpath b/bundles/org.eclipse.e4.tools.compat/.classpath
new file mode 100644
index 0000000000..4f83b2397e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.e4.tools.compat/.project b/bundles/org.eclipse.e4.tools.compat/.project
new file mode 100644
index 0000000000..e5e9a15272
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.compat</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..f548abbf0b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..68d9f84612
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,425 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..345ae3ec85
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=false
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=false
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n *\n * This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License 2.0\r\n * which accompanies this distribution, and is available at\r\n * https://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=true
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000000..e4e3c0071e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,97 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..0bbee3c4b8
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..858cfe46a1
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -0,0 +1,22 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
+Bundle-Version: 4.7.300.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
+ org.eclipse.core.runtime;bundle-version="3.6.0",
+ org.eclipse.e4.core.contexts;bundle-version="0.9.0",
+ org.eclipse.e4.core.services;bundle-version="0.9.1",
+ org.eclipse.e4.ui.services;bundle-version="0.9.1",
+ org.eclipse.e4.core.di;bundle-version="0.9.0",
+ org.eclipse.e4.tools.services;bundle-version="0.11.0",
+ org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
+ org.eclipse.e4.ui.di;bundle-version="0.9.0",
+ org.eclipse.core.databinding;bundle-version="1.4.0"
+Export-Package: org.eclipse.e4.tools.compat.internal;version="0.12.0.qualifier";x-internal:=true,
+ org.eclipse.e4.tools.compat.parts;version="0.12.0.qualifier";x-internal:=true
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %Bundle-Vendor
+Import-Package: javax.inject;version="1.0.0"
+Automatic-Module-Name: org.eclipse.e4.tools.compat
diff --git a/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000000..767d1e6f4b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.e4.tools.compat
+Bundle-Name = Compat
+Bundle-Vendor = Eclipse.org
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/about.html b/bundles/org.eclipse.e4.tools.compat/about.html
new file mode 100644
index 0000000000..164f781a8f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/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/bundles/org.eclipse.e4.tools.compat/build.properties b/bundles/org.eclipse.e4.tools.compat/build.properties
new file mode 100644
index 0000000000..789a966a45
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/build.properties
@@ -0,0 +1,8 @@
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               OSGI-INF/
+source.. = src/
+src.includes = about.html
diff --git a/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
new file mode 100644
index 0000000000..342969748c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
@@ -0,0 +1,4 @@
+# To force a version qualifier update add the bug here
+Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
+Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
+Bug 539713 - Comparator Error in I20181001-1800 Build
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/plugin.xml b/bundles/org.eclipse.e4.tools.compat/plugin.xml
new file mode 100644
index 0000000000..a839686368
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/plugin.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.services">
+      <serviceFactory
+            factoryClass="org.eclipse.e4.tools.compat.internal.ContextServiceFactory">
+         <service
+               serviceClass="org.eclipse.e4.core.contexts.IEclipseContext"></service>
+      </serviceFactory>
+   </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
new file mode 100644
index 0000000000..b3637493bb
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse</groupId>
+    <artifactId>eclipse.platform.ui.tools</artifactId>
+    <version>4.10.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <groupId>eclipse.platform.ui.tools</groupId>
+  <artifactId>org.eclipse.e4.tools.compat</artifactId>
+  <version>4.7.300-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+
+</project>
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
new file mode 100644
index 0000000000..eb4b601df9
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.internal;
+
+import org.eclipse.e4.tools.services.IClipboardService;
+
+public class ClipboardServiceImpl implements IClipboardService {
+	private Handler handler;
+
+	@Override
+	public void copy() {
+		if( handler != null ) {
+			handler.copy();
+		}
+	}
+
+	@Override
+	public void paste() {
+		if( handler != null ) {
+			handler.paste();
+		}
+	}
+
+	@Override
+	public void setHandler(Handler handler) {
+		this.handler = handler;
+	}
+
+	@Override
+	public void cut() {
+		this.handler.cut();
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
new file mode 100644
index 0000000000..a35860bca8
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -0,0 +1,161 @@
+/*******************************************************************************
+ * Copyright (c) 2010, 2015 BestSolution.at and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.internal;
+
+import org.eclipse.core.databinding.observable.Realm;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.EclipseContextFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.services.log.ILoggerProvider;
+import org.eclipse.e4.core.services.log.Logger;
+import org.eclipse.e4.tools.services.IClipboardService;
+import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
+import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
+import org.eclipse.e4.ui.di.UISynchronize;
+import org.eclipse.e4.ui.services.IServiceConstants;
+import org.eclipse.e4.ui.services.IStylingEngine;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.ISelectionListener;
+import org.eclipse.ui.ISelectionService;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.internal.services.IWorkbenchLocationService;
+import org.eclipse.ui.services.AbstractServiceFactory;
+import org.eclipse.ui.services.IServiceLocator;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.w3c.dom.css.CSSStyleDeclaration;
+
+@SuppressWarnings("restriction")
+public class ContextServiceFactory extends AbstractServiceFactory {
+
+	@Override
+	public Object create(Class serviceInterface, IServiceLocator parentLocator,
+		IServiceLocator locator) {
+		if (!IEclipseContext.class.equals(serviceInterface)) {
+			return null;
+		}
+
+		final IWorkbenchLocationService wls = locator.getService(IWorkbenchLocationService.class);
+		final IWorkbenchWindow window = wls.getWorkbenchWindow();
+		final IWorkbenchPartSite site = wls.getPartSite();
+
+		@SuppressWarnings("unchecked")
+		final Object o = parentLocator.getService(serviceInterface);
+
+		// This happens when we run in plain 3.x
+		// We need to create a parent service context
+		if (window == null && site == null) {
+			final Bundle bundle = FrameworkUtil.getBundle(ContextServiceFactory.class);
+			final BundleContext bundleContext = bundle.getBundleContext();
+			final IEclipseContext serviceContext = EclipseContextFactory.getServiceContext(bundleContext);
+
+			final IEclipseContext appContext = serviceContext.createChild("WorkbenchContext"); //$NON-NLS-1$
+			appContext.set(Display.class, Display.getCurrent());
+			appContext.set(Logger.class, new WorkbenchLogger());
+			appContext.set(IClipboardService.class, new ClipboardServiceImpl());
+			appContext.set(Realm.class, Realm.getDefault());
+
+			final Display d = Display.getCurrent();
+			appContext.set(UISynchronize.class, new UISynchronize() {
+
+				@Override
+				public void syncExec(Runnable runnable) {
+					d.syncExec(runnable);
+				}
+
+				@Override
+				public void asyncExec(Runnable runnable) {
+					d.asyncExec(runnable);
+				}
+			});
+
+			final IThemeManager manager = serviceContext.get(IThemeManager.class);
+			final IThemeEngine engine = manager.getEngineForDisplay(Display.getCurrent());
+			appContext.set(IThemeEngine.class, engine);
+
+			appContext.set(IStylingEngine.class, new IStylingEngine() {
+
+				@Override
+				public void setClassname(Object widget, String classname) {
+					((Widget) widget).setData("org.eclipse.e4.ui.css.CssClassName", classname); //$NON-NLS-1$
+					engine.applyStyles(widget, true);
+				}
+
+				@Override
+				public void setId(Object widget, String id) {
+					((Widget) widget).setData("org.eclipse.e4.ui.css.id", id); //$NON-NLS-1$
+					engine.applyStyles(widget, true);
+				}
+
+				@Override
+				public void style(Object widget) {
+					engine.applyStyles(widget, true);
+				}
+
+				@Override
+				public CSSStyleDeclaration getStyle(Object widget) {
+					return engine.getStyle(widget);
+				}
+
+				@Override
+				public void setClassnameAndId(Object widget, String classname,
+					String id) {
+					((Widget) widget).setData("org.eclipse.e4.ui.css.CssClassName", classname); //$NON-NLS-1$
+					((Widget) widget).setData("org.eclipse.e4.ui.css.id", id); //$NON-NLS-1$
+					engine.applyStyles(widget, true);
+				}
+			});
+
+			if (appContext.get(ILoggerProvider.class) == null) {
+				appContext.set(ILoggerProvider.class,
+					ContextInjectionFactory.make(DefaultLoggerProvider.class, appContext));
+			}
+
+			return appContext;
+		} else if (o != null && site == null) {
+			final IEclipseContext windowContext = ((IEclipseContext) o).createChild("WindowContext(" + window + ")"); //$NON-NLS-1$ //$NON-NLS-2$
+			windowContext.set(ISelectionService.class, window.getSelectionService());
+
+			windowContext.declareModifiable(IServiceConstants.ACTIVE_SELECTION);
+			window.getSelectionService().addSelectionListener(new ISelectionListener() {
+
+				@Override
+				public void selectionChanged(IWorkbenchPart part, ISelection selection) {
+					if (!selection.isEmpty()) {
+						if (selection instanceof IStructuredSelection) {
+							final IStructuredSelection s = (IStructuredSelection) selection;
+							if (s.size() == 1) {
+								windowContext.set(IServiceConstants.ACTIVE_SELECTION, s.getFirstElement());
+							} else {
+								windowContext.set(IServiceConstants.ACTIVE_SELECTION, s.toList());
+							}
+						} else {
+							windowContext.set(IServiceConstants.ACTIVE_SELECTION, selection);
+						}
+					}
+				}
+			});
+			return windowContext;
+		}
+
+		return o;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
new file mode 100644
index 0000000000..1d274a2ec1
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.internal;
+
+import org.eclipse.e4.tools.services.IClipboardService;
+import org.eclipse.jface.action.Action;
+
+public class CopyAction extends Action {
+	private final IClipboardService service;
+
+	public CopyAction(IClipboardService service) {
+		super(Messages.CopyAction);
+		this.service = service;
+	}
+
+	@Override
+	public void run() {
+		service.copy();
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
new file mode 100644
index 0000000000..8315494d58
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.internal;
+
+import org.eclipse.e4.tools.services.IClipboardService;
+import org.eclipse.jface.action.Action;
+
+public class CutAction extends Action {
+	private IClipboardService service;
+
+	public CutAction(IClipboardService service) {
+		super(Messages.CutAction);
+		this.service = service;
+	}
+
+	@Override
+	public void run() {
+		service.cut();
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
new file mode 100644
index 0000000000..cfa745ba2e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
@@ -0,0 +1,22 @@
+package org.eclipse.e4.tools.compat.internal;
+
+import javax.inject.Inject;
+
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.services.log.ILoggerProvider;
+import org.eclipse.e4.core.services.log.Logger;
+import org.osgi.framework.FrameworkUtil;
+
+@SuppressWarnings("restriction")
+public class DefaultLoggerProvider implements ILoggerProvider {
+	@Inject
+	private IEclipseContext context;
+
+	@Override
+	public Logger getClassLogger(Class<?> clazz) {
+		final IEclipseContext childContext = context.createChild();
+		childContext.set("logger.bundlename", FrameworkUtil.getBundle(clazz).getSymbolicName()); //$NON-NLS-1$
+		return ContextInjectionFactory.make(WorkbenchLogger.class, childContext);
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
new file mode 100644
index 0000000000..d77f12ef4f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
+ *
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Jonas - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.internal;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author Jonas
+ *
+ */
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.e4.tools.compat.internal.messages"; //$NON-NLS-1$
+	public static String CopyAction;
+	public static String CutAction;
+	public static String PasteAction;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
new file mode 100644
index 0000000000..0cbb4407ae
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
@@ -0,0 +1,129 @@
+/*******************************************************************************
+ * Copyright (c) 2010, 2016 BestSolution.at and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.internal;
+
+import java.lang.reflect.Method;
+
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.services.IClipboardService;
+import org.eclipse.e4.ui.services.IStylingEngine;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.WorkbenchPart;
+
+public class PartHelper {
+	private static final String ORG_ECLIPSE_E4_UI_WORKBENCH_I_PRESENTATION_ENGINE = "org.eclipse.e4.ui.workbench.IPresentationEngine"; //$NON-NLS-1$
+
+	public static IEclipseContext createPartContext(WorkbenchPart part) throws PartInitException {
+		final IWorkbenchPartSite site = part.getSite();
+		final IEclipseContext parentContext = site.getService(IEclipseContext.class);
+
+		// Check if running in 4.x
+		if (parentContext.get(ORG_ECLIPSE_E4_UI_WORKBENCH_I_PRESENTATION_ENGINE) != null) {
+			// Hack to get the MPart-Context
+			try {
+				final Class<?> clazz = Util.getBundle("org.eclipse.e4.ui.model.workbench").loadClass( //$NON-NLS-1$
+						"org.eclipse.e4.ui.model.application.ui.basic.MPart"); //$NON-NLS-1$
+				final Object instance = site.getService(clazz);
+				final Method m = clazz.getMethod("getContext", new Class[0]); //$NON-NLS-1$
+				IEclipseContext ctx = (IEclipseContext) m.invoke(instance);
+				final IEclipseContext rv = ctx;
+				while (ctx.getParent() != null) {
+					ctx = ctx.getParent();
+				}
+				ctx.set(IClipboardService.class, new ClipboardServiceImpl());
+				return rv;
+			} catch (final Exception e) {
+				throw new PartInitException("Could not create context", e); //$NON-NLS-1$
+			}
+		}
+		return parentContext.createChild("EditPart('" + part.getPartName() + "')"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	}
+
+	public static <C> C createComponent(Composite parent, IEclipseContext context, Class<C> clazz, WorkbenchPart part) {
+		final ISelectionProvider s = new SelectionProviderImpl();
+		context.set(ISelectionProvider.class, s);
+		part.getSite().setSelectionProvider(s);
+
+		final IStylingEngine styleEngine = context.get(IStylingEngine.class);
+		final Composite comp = new Composite(parent, SWT.NONE);
+		comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
+
+		// FIXME This should be read from the CSS
+		final FillLayout layout = new FillLayout();
+		comp.setLayout(layout);
+
+		context.set(Composite.class.getName(), comp);
+		final C component = ContextInjectionFactory.make(clazz, context);
+
+		styleEngine.setClassname(comp, part.getClass().getSimpleName());
+
+		return component;
+	}
+
+	static class SelectionProviderImpl implements ISelectionProvider {
+		private ISelection currentSelection = StructuredSelection.EMPTY;
+
+		private final ListenerList<ISelectionChangedListener> listeners = new ListenerList<>();
+
+		@Override
+		public void setSelection(ISelection selection) {
+			currentSelection = selection;
+			final SelectionChangedEvent evt = new SelectionChangedEvent(this, selection);
+
+			for (final ISelectionChangedListener l : listeners) {
+				l.selectionChanged(evt);
+			}
+		}
+
+		@Override
+		public void removeSelectionChangedListener(
+				ISelectionChangedListener listener) {
+			listeners.remove(listener);
+		}
+
+		@Override
+		public ISelection getSelection() {
+			return currentSelection;
+		}
+
+		@Override
+		public void addSelectionChangedListener(ISelectionChangedListener listener) {
+			listeners.add(listener);
+		}
+	}
+
+	public static void disposeContextIfE3(IEclipseContext parentContext,
+			IEclipseContext context) {
+		// Check if running in 3.x, otherwise there was no dedicated context
+		// created
+		if (parentContext
+				.get(ORG_ECLIPSE_E4_UI_WORKBENCH_I_PRESENTATION_ENGINE) == null) {
+			context.dispose();
+			context = null;
+		}
+
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
new file mode 100644
index 0000000000..2496fe221a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.internal;
+
+import org.eclipse.e4.tools.services.IClipboardService;
+import org.eclipse.jface.action.Action;
+
+public class PasteAction extends Action {
+	private IClipboardService service;
+	public PasteAction(IClipboardService service) {
+		super(Messages.PasteAction);
+		this.service = service;
+	}
+
+	@Override
+	public void run() {
+		service.paste();
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java
new file mode 100644
index 0000000000..a72f261a96
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java
@@ -0,0 +1,29 @@
+package org.eclipse.e4.tools.compat.internal;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.packageadmin.PackageAdmin;
+
+@SuppressWarnings("deprecation")
+public class Util {
+	public static Bundle getBundle(String bundleName) {
+		final Bundle bundle = FrameworkUtil.getBundle(Util.class);
+		final BundleContext ctx = bundle.getBundleContext();
+		final ServiceReference<PackageAdmin> ref = bundle.getBundleContext().getServiceReference(
+			PackageAdmin.class);
+		final PackageAdmin bundleAdmin = ctx.getService(ref);
+		final Bundle[] bundles = bundleAdmin.getBundles(bundleName, null);
+		if (bundles == null) {
+			return null;
+		}
+		// Return the first bundle that is not installed or uninstalled
+		for (int i = 0; i < bundles.length; i++) {
+			if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
+				return bundles[i];
+			}
+		}
+		return null;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
new file mode 100644
index 0000000000..ebbc4e3064
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
@@ -0,0 +1,158 @@
+package org.eclipse.e4.tools.compat.internal;
+
+import java.util.ArrayList;
+
+import javax.inject.Inject;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.e4.core.services.log.Logger;
+import org.eclipse.osgi.framework.log.FrameworkLog;
+import org.eclipse.osgi.framework.log.FrameworkLogEntry;
+import org.eclipse.osgi.service.debug.DebugOptions;
+import org.eclipse.osgi.service.debug.DebugTrace;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
+
+/**
+ * The workbench implementation of the logger service.
+ */
+@SuppressWarnings("restriction")
+public final class WorkbenchLogger extends Logger {
+	protected DebugTrace trace;
+	protected FrameworkLog log;
+	private final Bundle bundle = FrameworkUtil.getBundle(WorkbenchLogger.class);
+
+	/**
+	 * Creates a new workbench logger
+	 */
+	public WorkbenchLogger() {
+		super();
+	}
+
+	@Override
+	public void debug(Throwable t) {
+		debug(t, null);
+	}
+
+	@Override
+	public void debug(Throwable t, String message) {
+		trace(t, message);
+	}
+
+	@Override
+	public void error(Throwable t, String message) {
+		log(new Status(IStatus.ERROR, bundle.getSymbolicName(),
+			message, t));
+	}
+
+	/**
+	 * Copied from PlatformLogWriter in core runtime.
+	 */
+	private static FrameworkLogEntry getLog(IStatus status) {
+		final Throwable t = status.getException();
+		final ArrayList<FrameworkLogEntry> childlist = new ArrayList<>();
+
+		final int stackCode = t instanceof CoreException ? 1 : 0;
+		// ensure a substatus inside a CoreException is properly logged
+		if (stackCode == 1) {
+			final IStatus coreStatus = ((CoreException) t).getStatus();
+			if (coreStatus != null) {
+				childlist.add(getLog(coreStatus));
+			}
+		}
+
+		if (status.isMultiStatus()) {
+			final IStatus[] children = status.getChildren();
+			for (int i = 0; i < children.length; i++) {
+				childlist.add(getLog(children[i]));
+			}
+		}
+
+		final FrameworkLogEntry[] children = childlist.size() == 0 ? null
+			: childlist.toArray(new FrameworkLogEntry[childlist.size()]);
+
+		return new FrameworkLogEntry(status.getPlugin(), status.getSeverity(), status.getCode(),
+			status.getMessage(), stackCode, t, children);
+	}
+
+	@Override
+	public void info(Throwable t, String message) {
+		log(new Status(IStatus.INFO, bundle.getSymbolicName(), message,
+			t));
+	}
+
+	@Override
+	public boolean isDebugEnabled() {
+		return false;
+	}
+
+	@Override
+	public boolean isErrorEnabled() {
+		return true;
+	}
+
+	@Override
+	public boolean isInfoEnabled() {
+		return true;
+	}
+
+	@Override
+	public boolean isTraceEnabled() {
+		return false;
+	}
+
+	@Override
+	public boolean isWarnEnabled() {
+		return true;
+	}
+
+	private void log(IStatus status) {
+		if (log != null) {
+			log.log(getLog(status));
+		} else {
+			System.out.println(status.getMessage());
+			if (status.getException() != null) {
+				status.getException().printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * Sets the debug options service for this logger.
+	 *
+	 * @param options
+	 *            The debug options to be used by this logger
+	 */
+	@Inject
+	public void setDebugOptions(DebugOptions options) {
+		if (options != null) {
+			trace = options.newDebugTrace(bundle.getSymbolicName(), WorkbenchLogger.class);
+		}
+	}
+
+	/**
+	 * @param log
+	 */
+	@Inject
+	public void setFrameworkLog(FrameworkLog log) {
+		this.log = log;
+	}
+
+	@Override
+	public void trace(Throwable t, String message) {
+		if (trace != null) {
+			trace.trace(null, message, t);
+		} else {
+			System.out.println(message);
+			t.printStackTrace();
+		}
+	}
+
+	@Override
+	public void warn(Throwable t, String message) {
+		log(new Status(IStatus.WARNING, bundle.getSymbolicName(),
+			message, t));
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties
new file mode 100644
index 0000000000..d60d7bac31
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties
@@ -0,0 +1,3 @@
+CopyAction=Copy
+CutAction=Cut
+PasteAction=Paste
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
new file mode 100644
index 0000000000..51dfe8441d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -0,0 +1,165 @@
+/*******************************************************************************
+ * Copyright (c) 2010, 2015 BestSolution.at and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Jonas Helming <jhelming@eclipsesource.com>
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
+ *     Steven Spungin <steven@spungin.tv> - Bug 436889
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.parts;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.compat.internal.CopyAction;
+import org.eclipse.e4.tools.compat.internal.CutAction;
+import org.eclipse.e4.tools.compat.internal.PartHelper;
+import org.eclipse.e4.tools.compat.internal.PasteAction;
+import org.eclipse.e4.tools.services.IClipboardService;
+import org.eclipse.e4.tools.services.IDirtyProviderService;
+import org.eclipse.e4.ui.di.Focus;
+import org.eclipse.e4.ui.di.Persist;
+import org.eclipse.e4.ui.di.PersistState;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.ActionFactory;
+import org.eclipse.ui.part.EditorPart;
+
+/**
+ * This class provides an adapter enabling to plug editors, which are
+ * implemented following the e4 programming model into a 3.x workbench. This
+ * class is supposed to be sub classed by clients.
+ *
+ * @author Jonas
+ *
+ * @param <C>
+ */
+public abstract class DIEditorPart<C> extends EditorPart implements IDirtyProviderService {
+	private IEclipseContext context;
+	private C component;
+	private Class<C> clazz;
+	private boolean dirtyState;
+
+	private int features;
+
+	protected static final int COPY = 1;
+	protected static final int PASTE = 1 << 1;
+	protected static final int CUT = 1 << 2;
+
+	public DIEditorPart(Class<C> clazz) {
+		this(clazz, SWT.NONE);
+	}
+
+	public DIEditorPart(Class<C> clazz, int features) {
+		this.clazz = clazz;
+		this.features = features;
+	}
+
+	@Override
+	public void doSave(IProgressMonitor monitor) {
+		IEclipseContext saveContext = context.createChild();
+		ContextInjectionFactory.invoke(component, Persist.class, saveContext);
+		saveContext.dispose();
+	}
+
+	@Override
+	public void doSaveAs() {
+
+	}
+
+	@Override
+	public boolean isSaveAsAllowed() {
+		return false;
+	}
+
+	@Override
+	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
+		setSite(site);
+		setInput(input);
+
+		context = PartHelper.createPartContext(this);
+		context.declareModifiable(IEditorInput.class);
+		context.declareModifiable(IEditorPart.class);
+		context.declareModifiable(IDirtyProviderService.class);
+
+		context.set(IEditorPart.class, this);
+		context.set(IDirtyProviderService.class, this);
+		context.set(IEditorInput.class, input);
+	}
+
+	@Override
+	public void createPartControl(Composite parent) {
+		component = PartHelper.createComponent(parent, context, clazz, this);
+		makeActions();
+	}
+
+	@PersistState
+	public void persistState() {
+		ContextInjectionFactory.invoke(component, PersistState.class, context);
+	}
+
+	protected IEclipseContext getContext() {
+		return context;
+	}
+
+	public C getComponent() {
+		return component;
+	}
+
+	protected void makeActions() {
+		if ((features & COPY) == COPY) {
+			IClipboardService clipboard = context.get(IClipboardService.class);
+			getEditorSite().getActionBars().setGlobalActionHandler(
+					ActionFactory.COPY.getId(), new CopyAction(clipboard));
+		}
+
+		if ((features & PASTE) == PASTE) {
+			IClipboardService clipboard = context.get(IClipboardService.class);
+			getEditorSite().getActionBars().setGlobalActionHandler(
+					ActionFactory.PASTE.getId(), new PasteAction(clipboard));
+		}
+
+		if ((features & CUT) == CUT) {
+			IClipboardService clipboard = context.get(IClipboardService.class);
+			getEditorSite().getActionBars().setGlobalActionHandler(
+					ActionFactory.CUT.getId(), new CutAction(clipboard));
+		}
+	}
+
+	@Override
+	public void setDirtyState(boolean dirtyState) {
+		if (dirtyState != this.dirtyState) {
+			this.dirtyState = dirtyState;
+			firePropertyChange(PROP_DIRTY);
+		}
+	}
+
+	@Override
+	public boolean isDirty() {
+		return dirtyState;
+	}
+
+	@Override
+	public void setFocus() {
+		ContextInjectionFactory.invoke(component, Focus.class, context);
+	}
+
+	@Override
+	public void dispose() {
+		PartHelper.disposeContextIfE3(getSite().getService(IEclipseContext.class), context);
+		super.dispose();
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
new file mode 100644
index 0000000000..5626b68511
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2015 EclipseSource München GmbH and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Jonas Helming <jhelming@eclipsesource.com> - initial API and implementation
+ * Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.parts;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * This is a preliminary implementation of a Handler wrapper. It does not support @CanExecute yet
+ *
+ * @author Jonas
+ *
+ * @param <C>
+ */
+public class DIHandler<C> extends AbstractHandler {
+
+	private final C component;
+
+	public DIHandler(Class<C> clazz) {
+		final IEclipseContext context = getActiveContext();
+		component = ContextInjectionFactory.make(clazz, context);
+	}
+
+	private static IEclipseContext getActiveContext() {
+		final IEclipseContext parentContext = getParentContext();
+		return parentContext.getActiveLeaf();
+	}
+
+	private static IEclipseContext getParentContext() {
+		return PlatformUI.getWorkbench().getService(IEclipseContext.class);
+	}
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		return ContextInjectionFactory.invoke(component, Execute.class, getActiveContext());
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
new file mode 100644
index 0000000000..cfcfdb4f5b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2013 EclipseSource and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Jonas Helming <jhelming@eclipsesource.com>
+ ******************************************************************************/
+
+package org.eclipse.e4.tools.compat.parts;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.e4.tools.services.IDirtyProviderService;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.MultiPageEditorPart;
+
+public abstract class DIMultiPageEditorPart extends MultiPageEditorPart
+		implements IDirtyProviderService {
+
+	public <T> int addPage(Class<T> clazz) throws PartInitException {
+		DIEditorPart<T> part = new DIEditorPart<T>(clazz) {};
+		return addPage(part, getEditorInput());
+
+	}
+
+	public DIMultiPageEditorPart() {
+	}
+
+	@Override
+	public void doSave(IProgressMonitor monitor) {
+		for (int i = 0; i < getPageCount(); i++) {
+			IEditorPart e = getEditor(i);
+			e.doSave(monitor);
+		}
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
new file mode 100644
index 0000000000..4d621c35e8
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2010, 2014 BestSolution.at and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 421453
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.parts;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.services.IDirtyProviderService;
+import org.eclipse.e4.ui.di.Persist;
+import org.eclipse.ui.ISaveablePart2;
+import org.eclipse.ui.IViewSite;
+import org.eclipse.ui.PartInitException;
+
+public abstract class DISaveableViewPart<C> extends DIViewPart<C> implements ISaveablePart2, IDirtyProviderService {
+	private boolean dirtyState;
+
+	public DISaveableViewPart(Class<C> clazz) {
+		super(clazz);
+	}
+
+	@Override
+	public void doSave(IProgressMonitor monitor) {
+		IEclipseContext saveContext = getContext().createChild();
+		ContextInjectionFactory.invoke(getComponent(), Persist.class, saveContext);
+		saveContext.dispose();
+	}
+
+	@Override
+	public void doSaveAs() {
+
+	}
+
+	@Override
+	public boolean isSaveAsAllowed() {
+		return false;
+	}
+
+	@Override
+	public void setDirtyState(boolean dirtyState) {
+		if( dirtyState != this.dirtyState ) {
+			this.dirtyState = dirtyState;
+			firePropertyChange(PROP_DIRTY);
+		}
+	}
+
+	@Override
+	public boolean isDirty() {
+		return dirtyState;
+	}
+
+	@Override
+	public void init(IViewSite site) throws PartInitException {
+		super.init(site);
+
+		getContext().declareModifiable(IDirtyProviderService.class);
+		getContext().set(IDirtyProviderService.class, this);
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
new file mode 100644
index 0000000000..771cf21f42
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright (c) 2010, 2015 BestSolution.at and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compat.parts;
+
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.compat.internal.PartHelper;
+import org.eclipse.e4.ui.di.Focus;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IViewSite;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.ViewPart;
+
+public abstract class DIViewPart<C> extends ViewPart {
+	private IEclipseContext context;
+	private Class<C> clazz;
+	private C component;
+
+	public DIViewPart(Class<C> clazz) {
+		this.clazz = clazz;
+	}
+
+	@Override
+	public void init(IViewSite site) throws PartInitException {
+		super.init(site);
+		context = PartHelper.createPartContext(this);
+
+		context.declareModifiable(IViewPart.class);
+
+		context.set(IViewPart.class, this);
+	}
+
+	@Override
+	public void createPartControl(Composite parent) {
+		component = PartHelper.createComponent(parent, context, clazz, this);
+	}
+
+	protected IEclipseContext getContext() {
+		return context;
+	}
+
+	public C getComponent() {
+		return component;
+	}
+
+	@Override
+	public void setFocus() {
+		ContextInjectionFactory.invoke(component, Focus.class, context);
+	}
+
+	@Override
+	public void dispose() {
+		PartHelper.disposeContextIfE3(getSite().getService(IEclipseContext.class), context);
+		super.dispose();
+	}
+}
\ No newline at end of file
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 7f4b4c5ba1..b4838df0f9 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.10.100.qualifier"
+      version="4.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -33,6 +33,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.e4.tools.compat"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="org.eclipse.e4.tools.services"
          download-size="0"
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 94fe9a7cf1..d1283da577 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>4.10.100-SNAPSHOT</version>
+  <version>4.10.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>

From e89d7483c5d9c6bf4fa905f9e6b158aaaa2238f2 Mon Sep 17 00:00:00 2001
From: Alexander Bunkowski <alex.bunkowski@googlemail.com>
Date: Mon, 22 Oct 2018 15:58:20 +0200
Subject: [PATCH 1071/1286] Bug 540370 - Some E4 templates don't set the cursor
 position correctly

Change-Id: I7283fadd877173deebd363361f01639a1d33bb74
Signed-off-by: Alexander Bunkowski <alex.bunkowski@googlemail.com>
---
 .../org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF    | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml             | 2 +-
 .../templates/default-e4templates.xml                          | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index e0a5b1b16a..e680c73d05 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
-Bundle-Version: 4.8.100.qualifier
+Bundle-Version: 4.8.200.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index ab274b9b13..4b8886335d 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.jdt.templates</artifactId>
-  <version>4.8.100-SNAPSHOT</version>
+  <version>4.8.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
index 983d59076e..ad569d561d 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
@@ -58,18 +58,21 @@ ${imp:import(javax.annotation.PostConstruct)}
 
 <template name="Focus" description="Creates @Focus method" id="org.eclipse.e4.tools.jdt.templates.focus" context="e4-members" enabled="true" autoinsert="false">@Focus
 public void onFocus() {
+	${cursor}
 }
 ${imp:import(org.eclipse.e4.ui.di.Focus)}
 </template>
 
 <template name="PreDestroy" description="Creates @PreDestroy method" id="org.eclipse.e4.tools.jdt.templates.dispose" context="e4-members" enabled="true" autoinsert="false">@PreDestroy
 public void preDestroy() {
+	${cursor}
 }
 ${imp:import(javax.annotation.PreDestroy)}
 </template>
 
 <template name="Execute" description="Creates Execute method" id="org.eclipse.e4.tools.jdt.templates.execute" context="e4-members" enabled="true" autoinsert="false">@Execute
 public void execute() {
+	${cursor}
 }
 ${imp:import(org.eclipse.e4.core.di.annotations.Execute)}
 </template>

From 7563d3b2da20391503a795f574cf803b077b122f Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 22 Oct 2018 16:11:03 +0200
Subject: [PATCH 1072/1286] Fixes javax.anntation version in tools.services and
 emf.ui

Change-Id: I37362887efb2f0ff5e021f104e9846446352bddc
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF   | 2 +-
 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF | 4 ++--
 bundles/org.eclipse.e4.tools.services/pom.xml              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index a6e43ab49c..02aec94997 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -39,7 +39,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.e4.ui.dialogs;bundle-version="1.0.0",
  org.eclipse.e4.emf.xpath
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation,
+Import-Package: javax.annotation;version="1.2.0",
  javax.inject;version="1.0.0",
  org.osgi.framework;version="1.5.0",
  org.osgi.service.event;version="1.3.1"
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 88cf332c58..1428b4742d 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
-Bundle-Version: 4.8.100.qualifier
+Bundle-Version: 4.8.200.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.emf.ui",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0"
 Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation,
+Import-Package: javax.annotation;version="1.2.0",
  javax.inject;version="1.0.0"
 Bundle-Activator: org.eclipse.e4.tools.services.ToolsServicesActivator
 Automatic-Module-Name: org.eclipse.e4.tools.services
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 148a0ac622..2dff83a53f 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.services</artifactId>
-  <version>4.8.100-SNAPSHOT</version>
+  <version>4.8.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From 3b0319f2fe8d74cdf37f849bdbf96cc4f1deb3af Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 9 Nov 2018 09:03:56 +0100
Subject: [PATCH 1073/1286] Fixed incorrect e4 event method templates

Change-Id: Ifa3806c63fb3a18b492e0cfb74526c4b146a46cb
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../templates/default-e4templates.xml                  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
index ad569d561d..7a3f52a954 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
@@ -2,7 +2,7 @@
 
 <!--
 /*******************************************************************************
- * Copyright (c) 2010, 2015 IBM Corporation and others.
+ * Copyright (c) 2010, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -40,8 +40,12 @@ ESelectionService selectionService;
 ${imp:import(org.eclipse.e4.ui.workbench.modeling.ESelectionService)}
 </template>
 
-<template name="Inject -  Subscribe to event topic via method" description="Event Handler Method" id="org.eclipse.e4.tools.jdt.templates.eventhandler" context="e4-members" enabled="true" autoinsert="false">@EventHandler("some/event/topic")
-void subscribeTopic(String string) {
+<template name="Inject -  Subscribe to event topic via method" description="Event Handler Method" id="org.eclipse.e4.tools.jdt.templates.eventhandler" context="e4-members" enabled="true" autoinsert="false"> @Inject
+    @Optional
+    private void subscribeApplicationCompleted
+            (@UIEventTopic(UIEvents.UILifeCycle.APP_STARTUP_COMPLETE)
+            final MApplication application,
+            final IWorkbench workbench) {
 	${cursor}
 }</template>
 

From 8a45a062b600b3e30ae24666288ef55a63097ac1 Mon Sep 17 00:00:00 2001
From: Christof Joswig <christof.joswig@sap.com>
Date: Thu, 20 Sep 2018 09:39:19 +0200
Subject: [PATCH 1074/1286] Replace header composite with section in E4 Editor

-simplify container stack
-introduce section with text instead of two labels
-Icon can not be displayed anymore :-(
-reduce margins

Change-Id: I42936ac55fcd521036753fe79b593f98ad603b6d
Signed-off-by: Christof Joswig <christof.joswig@sap.com>
---
 .../META-INF/MANIFEST.MF                      |   3 +-
 .../component/AbstractComponentEditor.java    |  48 ++++-----
 .../ui/internal/common/AbstractPickList.java  |  29 ++++-
 .../emf/ui/internal/common/ModelEditor.java   | 100 ++++++------------
 4 files changed, 80 insertions(+), 100 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 02aec94997..f64ea47912 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -37,7 +37,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.pde.core;resolution:=optional,
  org.eclipse.e4.core.commands;bundle-version="0.10.0",
  org.eclipse.e4.ui.dialogs;bundle-version="1.0.0",
- org.eclipse.e4.emf.xpath
+ org.eclipse.e4.emf.xpath,
+ org.eclipse.ui.forms;bundle-version="3.7.200"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.2.0",
  javax.inject;version="1.0.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index a50751d7d1..330bf71181 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -144,10 +144,9 @@ private ImageRegistry getComponentImages() {
 	/**
 	 * Get the image described in element if this is a MUILabel
 	 *
-	 * @param element
-	 *            the element in tree to be displayed
-	 * @return image of element if iconUri is not empty (returns bad image if
-	 *         bad URI), else returns null
+	 * @param element the element in tree to be displayed
+	 * @return image of element if iconUri is not empty (returns bad image if bad
+	 *         URI), else returns null
 	 */
 	public Image getImageFromIconURI(MUILabel element) {
 
@@ -171,9 +170,8 @@ public Image getImageFromIconURI(MUILabel element) {
 		return img;
 	}
 
-	/** @return true if the image of this element should be displayed in grey*/
-	private boolean shouldBeGrey(Object element)
-	{
+	/** @return true if the image of this element should be displayed in grey */
+	private boolean shouldBeGrey(Object element) {
 		// It is grey if a MUIElement is not visible or not rendered
 		// It is not grey if this is not a MUIElement or if it is rendered and
 		// visible.
@@ -183,11 +181,9 @@ private boolean shouldBeGrey(Object element)
 
 	/**
 	 *
-	 * @param key
-	 *            the key of image (can be a constants from ResourceProvider or
-	 *            a platform:/ uri location
-	 * @param grey
-	 *            if true returns the grey version if original image exists
+	 * @param key  the key of image (can be a constants from ResourceProvider or a
+	 *             platform:/ uri location
+	 * @param grey if true returns the grey version if original image exists
 	 * @return the image with a give key or grey version.
 	 */
 	private Image getImage(String key, boolean grey) {
@@ -222,10 +218,8 @@ private Image getImage(String key, boolean grey) {
 	/**
 	 * Get image from an element Implements algorithm described in bug #465271
 	 *
-	 * @param element
-	 *            the Application Element
-	 * @param key
-	 *            the element image key if no icon URI
+	 * @param element the Application Element
+	 * @param key     the element image key if no icon URI
 	 * @return Image or null if nothing found
 	 */
 	public Image getImage(Object element, String key) {
@@ -348,11 +342,10 @@ public List<Action> getActions(Object element) {
 
 	/**
 	 * Translates an input <code>String</code> using the current
-	 * {@link ResourceBundleTranslationProvider} and <code>locale</code> from
-	 * the {@link TranslationService}.
+	 * {@link ResourceBundleTranslationProvider} and <code>locale</code> from the
+	 * {@link TranslationService}.
 	 *
-	 * @param string
-	 *            the string to translate, may not be null.
+	 * @param string the string to translate, may not be null.
 	 * @return the translated string or the input string if it could not be
 	 *         translated.
 	 */
@@ -457,16 +450,13 @@ protected void createContributedEditorTabs(CTabFolder folder, EMFDataBindingCont
 	}
 
 	/**
-	 * Generates an ID when the another field changes. Must be called after
-	 * master is set with the objects value.
+	 * Generates an ID when the another field changes. Must be called after master
+	 * is set with the objects value.
 	 *
-	 * @param attSource
-	 *            The source attribute
-	 * @param attId
-	 *            The id attribute to generate
-	 * @param control
-	 *            optional control to disable generator after losing focus or
-	 *            disposing
+	 * @param attSource The source attribute
+	 * @param attId     The id attribute to generate
+	 * @param control   optional control to disable generator after losing focus or
+	 *                  disposing
 	 */
 	protected void enableIdGenerator(EAttribute attSource, EAttribute attId, Control control) {
 		if (generator != null) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index 893f6d2eb8..cf6b2c0814 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -75,6 +75,7 @@ public AbstractPickList(Composite parent, int style, List<PickListFeatures> list
 
 	public AbstractPickList(Composite parent, int style, List<PickListFeatures> listFeatures,
 			AbstractComponentEditor componentEditor) {
+
 		super(parent, style);
 
 		// TODO remove dependency AbstractComponentEditor. They
@@ -87,13 +88,25 @@ public AbstractPickList(Composite parent, int style, List<PickListFeatures> list
 		} else {
 			composite = new Group(this, SWT.NONE);
 		}
-		composite.setLayout(new GridLayout(1, false));
 
-		final Composite comp = new Composite(composite, SWT.NONE);
+		GridLayout layout = new GridLayout(1, false);
+		layout.marginHeight = 0;
+		layout.marginWidth = 0;
+		layout.marginRight = 0;
+		layout.marginLeft = 0;
+		layout.horizontalSpacing = 0;
+		layout.verticalSpacing = 0;
+		composite.setLayout(layout);
+
+		Composite comp = new Composite(composite, SWT.NONE);
 
-		GridLayout layout = new GridLayout(2, false);
+		layout = new GridLayout(2, false);
 		layout.marginHeight = 0;
 		layout.marginWidth = 0;
+		layout.marginRight = 0;
+		layout.marginLeft = 0;
+		layout.horizontalSpacing = 0;
+		layout.verticalSpacing = 0;
 		comp.setLayout(layout);
 		comp.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
 
@@ -121,8 +134,14 @@ public AbstractPickList(Composite parent, int style, List<PickListFeatures> list
 
 		toolBar = new Composite(comp, SWT.NONE);
 		layout = new GridLayout(5, true);
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
+		if (listFeatures != null && listFeatures.contains(PickListFeatures.NO_PICKER)) {
+			layout.marginHeight = 0;
+			layout.marginWidth = 0;
+			layout.marginRight = 0;
+			layout.marginLeft = 0;
+		}
+		layout.horizontalSpacing = 2;
+		layout.verticalSpacing = 0;
 		toolBar.setLayout(layout);
 		toolBar.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
 		toolBar.setFont(composite.getFont());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index b63eeda45a..7a3e428e8b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -236,13 +236,13 @@
 import org.eclipse.swt.graphics.RGB;
 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.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.TreeItem;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Section;
 
 public class ModelEditor implements IGotoObject {
 	private static final String ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED = "org.eclipse.e4.tools.modeleditor.filteredtree.enabled.xmitab.disabled";//$NON-NLS-1$
@@ -373,7 +373,7 @@ public class ModelEditor implements IGotoObject {
 
 	private XmiTab xmiTab;
 
-	private Label sectionHeaderLabel;
+	private Section headerContainer;
 
 	public ModelEditor(Composite composite, IEclipseContext context, IModelResource modelProvider, IProject project,
 			final IResourcePool resourcePool) {
@@ -547,39 +547,24 @@ private XmiTab createXMITab(Composite composite) {
 	}
 
 	private Composite createFormTab(Composite composite) {
-		final SashForm form = new SashForm(composite, SWT.HORIZONTAL);
-		form.setBackground(form.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+		SashForm form = new SashForm(composite, SWT.HORIZONTAL);
 
 		viewer = createTreeViewerArea(form);
 
-		final Composite parent = new Composite(form, SWT.NONE);
-		final FillLayout l = new FillLayout();
-		parent.setLayout(l);
+		FormToolkit toolkit = new FormToolkit(form.getDisplay());
 
-		final Composite editingArea = new Composite(parent, SWT.BORDER);
-		final GridLayout gl = new GridLayout();
-		editingArea.setLayout(gl);
+		headerContainer = toolkit.createSection(form, Section.TITLE_BAR);
+		headerContainer.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
 
-		final Composite headerContainer = new Composite(editingArea, SWT.NONE);
-		headerContainer.setLayout(new GridLayout(3, false));
-		headerContainer.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		final Label iconLabel = new Label(headerContainer, SWT.NONE);
-		iconLabel.setLayoutData(new GridData(20, 20));
-
-		sectionHeaderLabel = new Label(headerContainer, SWT.NONE);
-		sectionHeaderLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		final Label separatorLabel = new Label(headerContainer, SWT.SEPARATOR | SWT.HORIZONTAL);
-		final GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = 2;
-		separatorLabel.setLayoutData(gridData);
-
-		final StackLayout layout = new StackLayout();
-		final Composite contentContainer = new Composite(editingArea, SWT.NONE);
-		contentContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
+		// Composite for storing the data
+		Composite contentContainer = toolkit.createComposite(headerContainer, SWT.NONE);
+		headerContainer.setClient(contentContainer);
 
+		StackLayout layout = new StackLayout();
 		contentContainer.setLayout(layout);
 
+		form.setWeights(new int[] { 2, 5 });
+
 		viewer.getTree().addKeyListener(new KeyAdapter() {
 			@Override
 			public void keyReleased(final KeyEvent e) {
@@ -608,11 +593,9 @@ public void keyReleased(final KeyEvent e) {
 					final AbstractComponentEditor editor1 = getEditor(obj.eClass());
 					if (editor1 != null) {
 						currentEditor = editor1;
-						sectionHeaderLabel.setText(editor1.getLabel(obj));
-						iconLabel.setImage(editor1.getImage(obj));
+						headerContainer.setText(editor1.getLabel(obj));
 						obsManager.runAndCollect(() -> {
 							final Composite comp = editor1.getEditor(contentContainer, s.getFirstElement());
-							comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
 							layout.topControl = comp;
 							contentContainer.layout(true);
 						});
@@ -622,11 +605,9 @@ public void keyReleased(final KeyEvent e) {
 					final AbstractComponentEditor editor2 = getEditor(entry.getId());
 					if (editor2 != null) {
 						currentEditor = editor2;
-						sectionHeaderLabel.setText(editor2.getLabel(entry));
-						iconLabel.setImage(editor2.getImage(entry));
+						headerContainer.setText(editor2.getLabel(entry));
 						obsManager.runAndCollect(() -> {
 							final Composite comp = editor2.getEditor(contentContainer, s.getFirstElement());
-							comp.setBackgroundMode(SWT.INHERIT_DEFAULT);
 							layout.topControl = comp;
 							contentContainer.layout(true);
 						});
@@ -636,12 +617,9 @@ public void keyReleased(final KeyEvent e) {
 				if (selectionService != null) {
 					selectionService.setSelection(s.getFirstElement());
 				}
-
 			}
 		});
 
-		form.setWeights(new int[] { 3, 4 });
-
 		final MenuManager mgr = new MenuManager();
 		mgr.setRemoveAllWhenShown(true);
 		mgr.addMenuListener(manager -> {
@@ -1173,7 +1151,6 @@ private void registerVirtualEditors() {
 		registerEditor(VIRTUAL_SNIPPETS, VSnippetsEditor.class);
 	}
 
-
 	public void setSelection(Object element) {
 		viewer.setSelection(new StructuredSelection(element));
 	}
@@ -1392,8 +1369,7 @@ private void registerEditor(String key, AbstractComponentEditor editor) {
 	 * Get editor from an eClass. May return the registered editor for this eclass,
 	 * or the editor for a parent EClass or the default editor
 	 *
-	 * @param eClass
-	 *            the eClass to get editor for
+	 * @param eClass the eClass to get editor for
 	 * @return the {@link AbstractComponentEditor} found (never null).
 	 */
 	public AbstractComponentEditor getEditor(EClass eClass) {
@@ -1428,10 +1404,9 @@ public AbstractComponentEditor getEditor(String key) {
 	/**
 	 * get editor from a string key.
 	 *
-	 * @param key
-	 *            : the editor string key
-	 * @param createDefaultIfNull
-	 *            if true, returns the default editor if no editor found
+	 * @param key                 : the editor string key
+	 * @param createDefaultIfNull if true, returns the default editor if no editor
+	 *                            found
 	 * @return the {@link AbstractComponentEditor} if exists. Never null if
 	 *         createDefaultIfNull is true
 	 */
@@ -1492,7 +1467,6 @@ private boolean equalsPaths(FeaturePath p1, FeaturePath p2) {
 		return false;
 	}
 
-
 	@Persist
 	public void doSave(@Optional IProgressMonitor monitor) {
 
@@ -1528,7 +1502,7 @@ public void setFocus() {
 	}
 
 	public void setHeaderTitle(String title) {
-		sectionHeaderLabel.setText(title);
+		headerContainer.setText(title);
 	}
 
 	@PreDestroy
@@ -1542,7 +1516,9 @@ void dispose() {
 		if (project == null) {
 			context.get(Display.class).removeFilter(SWT.MouseUp, keyListener);
 		}
-		ContextInjectionFactory.uninject(xmiTab, xmiTab.getContext());
+		if (xmiTab != null) {
+			ContextInjectionFactory.uninject(xmiTab, xmiTab.getContext());
+		}
 	}
 
 	public IModelResource getModelProvider() {
@@ -1970,14 +1946,10 @@ public boolean performSingleDrop(Object data) {
 		 * Create an internal Compound command containing a Remove and a Add so as to
 		 * allow the Undo
 		 *
-		 * @param data
-		 *            the object to be dragged and dropped
-		 * @param destFeature
-		 *            the target feature in the model where data must be dropped
-		 * @param parent
-		 *            the destination parent
-		 * @param index
-		 *            the index in the parent list
+		 * @param data        the object to be dragged and dropped
+		 * @param destFeature the target feature in the model where data must be dropped
+		 * @param parent      the destination parent
+		 * @param index       the index in the parent list
 		 * @see bug #429684
 		 * @return the compound command
 		 */
@@ -2005,7 +1977,6 @@ private Command createRemoveAddCommand(Object data, EStructuralFeature destFeatu
 
 		}
 
-
 		@Override
 		public boolean validateDrop(Object target, int operation, TransferData transferType) {
 			boolean rv = true;
@@ -2028,11 +1999,13 @@ public boolean validateDrop(Object target, int operation, TransferData transferT
 
 	}
 
-	/** This method checks if the target object is a valid target for the current instance.
-	 *  It used both for paste and for drag and drop behavior
-	 * @param target  the target object where instance should be pasted of dropped
+	/**
+	 * This method checks if the target object is a valid target for the current
+	 * instance. It used both for paste and for drag and drop behavior
+	 *
+	 * @param target   the target object where instance should be pasted of dropped
 	 * @param instance the instance of object to be pasted or dropped
-	 * @param isIndex if true, means that target is an object in a container
+	 * @param isIndex  if true, means that target is an object in a container
 	 * @return
 	 */
 	private boolean isValidTarget(Object target, Object instance, boolean isIndex) {
@@ -2050,8 +2023,7 @@ private boolean isValidTarget(Object target, Object instance, boolean isIndex) {
 			final VirtualEntry<Object> vTarget = (VirtualEntry<Object>) target;
 			if (isIndex || !vTarget.getList().contains(instance)) {
 				if (vTarget.getProperty() instanceof IEMFProperty) {
-					final EStructuralFeature feature = ((IEMFProperty) vTarget.getProperty())
-							.getStructuralFeature();
+					final EStructuralFeature feature = ((IEMFProperty) vTarget.getProperty()).getStructuralFeature();
 					final EObject parent = (EObject) vTarget.getOriginalParent();
 					final EClassifier classifier = ModelUtils.getTypeArgument(parent.eClass(),
 							feature.getEGenericType());
@@ -2072,12 +2044,10 @@ private boolean isValidTarget(Object target, Object instance, boolean isIndex) {
 		return false;
 	}
 
-
 	/**
 	 * compute a valid name for the undo/redo/paste of move commands
 	 *
-	 * @param data
-	 *            the object concerned by the command
+	 * @param data the object concerned by the command
 	 * @return a representative string for the object or 'Object' if nothing found
 	 */
 	private String getObjectNameForCommand(Object data) {

From bef86a618c34835e8a9781ab8573060efbebf85b Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 13 Nov 2018 09:46:04 +0100
Subject: [PATCH 1075/1286] Minor cleanup in AbstractPickList

Removes commented code
Fixes a few sonar issues

Change-Id: Ieb82a66656ae464c033a03b8e35751413ef6a391
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../ui/internal/common/AbstractPickList.java  | 27 +++----------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index cf6b2c0814..894e012f25 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2017 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2018 TwelveTone LLC and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -46,12 +46,10 @@
  * selectable items, and action buttons for modifying the list.
  * </p>
  *
- * @author Steven Spungin
- *
  */
 public abstract class AbstractPickList extends Composite {
 
-	public static enum PickListFeatures {
+	public enum PickListFeatures {
 		NO_ORDER, NO_PICKER, NO_GROUP
 	}
 
@@ -65,7 +63,6 @@ public static enum PickListFeatures {
 	protected final Button tiRemove;
 	protected final Button tiUp;
 	protected final Button tiDown;
-	// private final AutoCompleteField autoCompleteField;
 
 	@Deprecated
 	public AbstractPickList(Composite parent, int style, List<PickListFeatures> listFeatures, Messages messages,
@@ -117,21 +114,6 @@ public AbstractPickList(Composite parent, int style, List<PickListFeatures> list
 		gdpicker.grabExcessHorizontalSpace = true;
 		control.setLayoutData(gdpicker);
 
-		// ComboContentAdapter controlContentAdapter = new ComboContentAdapter()
-		// {
-		// @Override
-		// public void setControlContents(Control control, String text1, int
-		// cursorPosition) {
-		// super.setControlContents(control, text1, cursorPosition);
-		// Object valueInModel = proposals.get(text1);
-		// if (valueInModel != null) {
-		// getPicker().setSelection(new StructuredSelection(valueInModel));
-		// }
-		// }
-		// };
-		// autoCompleteField = new AutoCompleteField(control,
-		// controlContentAdapter, new String[0]);
-
 		toolBar = new Composite(comp, SWT.NONE);
 		layout = new GridLayout(5, true);
 		if (listFeatures != null && listFeatures.contains(PickListFeatures.NO_PICKER)) {
@@ -238,7 +220,7 @@ protected Font getButtonFont() {
 	protected void addPressed() {
 	}
 
-	abstract protected int getItemCount();
+	protected abstract int getItemCount();
 
 	public TableViewer getList() {
 		return viewer;
@@ -247,9 +229,6 @@ public TableViewer getList() {
 	public void setInput(Object input) {
 		getPicker().setInput(input);
 
-		// proposals = toProposals(input);
-		// final Set<String> keySet = proposals.keySet();
-		// autoCompleteField.setProposals(keySet.toArray(new String[keySet.size()]));
 	}
 
 	public IStructuredSelection getSelection() {

From 9bc09e3a1ecb4ac8951e71444a2b4339b753989a Mon Sep 17 00:00:00 2001
From: Niraj Modi <niraj.modi@in.ibm.com>
Date: Fri, 7 Dec 2018 16:04:47 +0530
Subject: [PATCH 1076/1286] Bug 541822 - POM and product version change for
 4.11 release

Change-Id: Ib7fd82ce12ec57a060d74a8018ea71d91720a7fb
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
---
 bundles/org.eclipse.e4.tools.compat/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml     | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml          | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                   | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 4 ++--
 tests/org.eclipse.e4.tools.test/pom.xml                | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index b3637493bb..b6f2fa9dba 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 02bfcfbd1f..623e8be647 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 11cf996184..cf2951e8ae 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 4b8886335d..f82ca6a8ae 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 2dff83a53f..9e0e938ad5 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index f3e29cb64f..6600d887b7 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index b4838df0f9..d3213b3e9e 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.10.0.qualifier"
+      version="4.11.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index d1283da577..e272d85553 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>4.10.0-SNAPSHOT</version>
+  <version>4.11.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index 08b4243e1d..965d3cae77 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.10.0-SNAPSHOT</version>
+		<version>4.11.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From f8924754c0a7e55f70d4c750ee3dab2ab16aef19 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 11 Feb 2019 10:44:03 +0100
Subject: [PATCH 1077/1286] Version 4.11 update for org.eclipse.e4.tools

Change-Id: I6d6a4d0f2a909be43033062ffc8a6fd0eeeb35cc
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 96aa16a7d0..0f5c894360 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 4.8.100.qualifier
+Bundle-Version: 4.8.200.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 6600d887b7..1dc643e5b3 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tool</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>4.8.100-SNAPSHOT</version>
+  <version>4.8.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From 95874811dcf984918c456ac05ab321b5fa26133e Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 11 Feb 2019 10:44:32 +0100
Subject: [PATCH 1078/1286] Remove unused method in activator for
 org.eclipse.e4.tools

Change-Id: I6e823effdd60a96c07d265751ee405fe9a17248d
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../e4/internal/tools/ToolsPlugin.java        | 41 -------------------
 1 file changed, 41 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
index 082a3e52ab..9e98d249c7 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
@@ -1,7 +1,5 @@
 package org.eclipse.e4.internal.tools;
 
-import java.net.URL;
-
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.common.util.ResourceLocator;
@@ -37,45 +35,6 @@ public static ToolsPlugin getDefault() {
 		return plugin;
 	}
 
-	public ResourceLocator getResourceLocator() {
-		if (resourceLocator == null) {
-			resourceLocator = new ResourceLocator() {
-
-				@Override
-				public String getString(String key, Object[] substitutions,
-					boolean translate) {
-					return null;
-				}
-
-				@Override
-				public String getString(String key, Object[] substitutions) {
-					return null;
-				}
-
-				@Override
-				public String getString(String key, boolean translate) {
-					return null;
-				}
-
-				@Override
-				public String getString(String key) {
-					return null;
-				}
-
-				@Override
-				public Object getImage(String key) {
-					return null;
-				}
-
-				@Override
-				public URL getBaseURL() {
-					return null;
-				}
-			};
-		}
-		return resourceLocator;
-	}
-
 	public static void log(IStatus status, int nesting, boolean appendLogger) {
 		getDefault().getLog().log(status);
 	}

From 49d674dbabd0d0ebdd3b9ca93099771668d55be9 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 11 Feb 2019 10:49:33 +0100
Subject: [PATCH 1079/1286] Remove unused log methods in activator for
 org.eclipse.e4.tools

Change-Id: I75e256ba35cae643008de86d86023317750a23fd
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../e4/internal/tools/ToolsPlugin.java        | 37 -------------------
 1 file changed, 37 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
index 9e98d249c7..af99f7b9e2 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
@@ -1,8 +1,5 @@
 package org.eclipse.e4.internal.tools;
 
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
@@ -12,8 +9,6 @@ public class ToolsPlugin extends AbstractUIPlugin {
 
 	private static ToolsPlugin plugin;
 
-	private ResourceLocator resourceLocator;
-
 	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
@@ -35,36 +30,4 @@ public static ToolsPlugin getDefault() {
 		return plugin;
 	}
 
-	public static void log(IStatus status, int nesting, boolean appendLogger) {
-		getDefault().getLog().log(status);
-	}
-
-	/**
-	 * Log Throwable Error
-	 */
-	public static void logError(Throwable t) {
-		logError(t, 0, true);
-	}
-
-	public static void logError(Throwable t, boolean appendLogger) {
-		logError(t, 0, appendLogger);
-	}
-
-	public static void logError(Throwable t, int nesting) {
-		logError(t, nesting, true);
-	}
-
-	public static void logError(Throwable t, int nesting, boolean appendLogger) {
-		log(newStatus(IStatus.ERROR, t.getMessage(), t), nesting, appendLogger);
-	}
-
-	/**
-	 * Create an IStatus
-	 *
-	 * @return a new IStatus
-	 */
-	public static IStatus newStatus(int severity, String message,
-		Throwable exception) {
-		return new Status(severity, PLUGIN_ID, 0, message, exception);
-	}
 }

From 584076537ee2c4bd30b20b88e0c00e4d082fc4c7 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 11 Feb 2019 11:24:27 +0100
Subject: [PATCH 1080/1286] Version 4.11 update for org.eclipse.e4.tools.emf.ui

Change-Id: I4a54cfc444abb79d7a1a8d42d9bc5d45545bce2d
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index f64ea47912..a5888f4102 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.6.200.qualifier
+Bundle-Version: 4.6.300.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index cf2951e8ae..18657f7f82 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.6.200-SNAPSHOT</version>
+  <version>4.6.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>

From 004da98aae15029bab8a6fe4f43f9d2047e5b779 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 11 Feb 2019 11:03:11 +0100
Subject: [PATCH 1081/1286] Delete unnecessary @inheritDoc comments

We use Override these days.

Change-Id: I9d8249d44b7002acad6fc9f666352e79b2af20f1
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../internal/common/component/StringModelFragment.java |  6 ------
 .../tools/wizards/classes/AbstractNewClassPage.java    | 10 ----------
 .../wizards/model/ExtractContributionModelWizard.java  | 10 ----------
 3 files changed, 26 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index cc348c6285..2108370d7e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -471,12 +471,6 @@ public StringModelFragmentProposalProvider(StringModelFragment fragment, Text t)
 			this.text = t;
 		}
 
-		/**
-		 * {@inheritDoc}
-		 *
-		 * @see org.eclipse.jface.fieldassist.IContentProposalProvider#getProposals(java.lang.String,
-		 *      int)
-		 */
 		@Override
 		public IContentProposal[] getProposals(String cont, int position) {
 			List<String[]> contents = new ArrayList<>();
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index 8f320db572..710afc711a 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -205,11 +205,6 @@ public void performFinish() {
 		getDialogSettings().put(SETTING_PACKAGE, packageName);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.jface.wizard.WizardPage#getDialogSettings()
-	 */
 	@Override
 	protected IDialogSettings getDialogSettings() {
 		final IDialogSettings mainSettings = ToolsPlugin.getDefault().getDialogSettings();
@@ -495,11 +490,6 @@ public ClassMultiValidator(JavaClass javaClass, final IObservableValue<String> o
 			this.observedClass = observedClass;
 		}
 
-		/**
-		 * {@inheritDoc}
-		 *
-		 * @see org.eclipse.core.databinding.validation.MultiValidator#validate()
-		 */
 		@Override
 		protected IStatus validate() {
 			final String classPackage = observedPackage.getValue();
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
index 9189844286..942e29d4bd 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
@@ -70,11 +70,6 @@ protected void adjustDependencies(IFile file) {
 		super.adjustFragmentDependencies(file);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.e4.internal.tools.wizards.model.BaseApplicationModelWizard#handleFileExist()
-	 */
 	@Override
 	protected boolean handleFileExist() {
 		return MessageDialog.openQuestion(getShell(), Messages.BaseApplicationModelWizard_FileExists,
@@ -83,11 +78,6 @@ protected boolean handleFileExist() {
 
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.e4.internal.tools.wizards.model.BaseApplicationModelWizard#mergeWithExistingFile(org.eclipse.emf.ecore.resource.Resource)
-	 */
 	@Override
 	protected void mergeWithExistingFile(Resource resource, EObject rootObject) {
 

From 462cd09e67feb1baf4b18be95ef72b49280d4e21 Mon Sep 17 00:00:00 2001
From: Karsten Thoms <karsten.thoms@itemis.de>
Date: Fri, 15 Feb 2019 04:54:55 +0100
Subject: [PATCH 1082/1286] Bug 544454 - Remove Util class

Use Platform#getBundle in PartHelper instead of Util#getBundle.

Version bump for 4.11


Change-Id: I7934b2f727ce25a794259d1cb8dadbb08b45d7e2
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
---
 .../META-INF/MANIFEST.MF                      |  2 +-
 bundles/org.eclipse.e4.tools.compat/pom.xml   |  2 +-
 .../e4/tools/compat/internal/PartHelper.java  |  3 +-
 .../e4/tools/compat/internal/Util.java        | 29 -------------------
 4 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 858cfe46a1..8fc5685fb3 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 4.7.300.qualifier
+Bundle-Version: 4.7.400.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index b6f2fa9dba..29820049ee 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.compat</artifactId>
-  <version>4.7.300-SNAPSHOT</version>
+  <version>4.7.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
index 0cbb4407ae..3f6c071f77 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
@@ -16,6 +16,7 @@
 import java.lang.reflect.Method;
 
 import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.services.IClipboardService;
@@ -43,7 +44,7 @@ public static IEclipseContext createPartContext(WorkbenchPart part) throws PartI
 		if (parentContext.get(ORG_ECLIPSE_E4_UI_WORKBENCH_I_PRESENTATION_ENGINE) != null) {
 			// Hack to get the MPart-Context
 			try {
-				final Class<?> clazz = Util.getBundle("org.eclipse.e4.ui.model.workbench").loadClass( //$NON-NLS-1$
+				final Class<?> clazz = Platform.getBundle("org.eclipse.e4.ui.model.workbench").loadClass( //$NON-NLS-1$
 						"org.eclipse.e4.ui.model.application.ui.basic.MPart"); //$NON-NLS-1$
 				final Object instance = site.getService(clazz);
 				final Method m = clazz.getMethod("getContext", new Class[0]); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java
deleted file mode 100644
index a72f261a96..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Util.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.e4.tools.compat.internal;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.packageadmin.PackageAdmin;
-
-@SuppressWarnings("deprecation")
-public class Util {
-	public static Bundle getBundle(String bundleName) {
-		final Bundle bundle = FrameworkUtil.getBundle(Util.class);
-		final BundleContext ctx = bundle.getBundleContext();
-		final ServiceReference<PackageAdmin> ref = bundle.getBundleContext().getServiceReference(
-			PackageAdmin.class);
-		final PackageAdmin bundleAdmin = ctx.getService(ref);
-		final Bundle[] bundles = bundleAdmin.getBundles(bundleName, null);
-		if (bundles == null) {
-			return null;
-		}
-		// Return the first bundle that is not installed or uninstalled
-		for (int i = 0; i < bundles.length; i++) {
-			if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
-				return bundles[i];
-			}
-		}
-		return null;
-	}
-}

From 1823f118aff683f2b97826251d8179c6878845c9 Mon Sep 17 00:00:00 2001
From: Niraj Modi <niraj.modi@in.ibm.com>
Date: Fri, 8 Mar 2019 14:51:44 +0530
Subject: [PATCH 1083/1286] Bug 545094 - POM and product version change for
 4.12 release

Change-Id: I813942a139fe3433d4b31e7a1a281d02e872d7fa
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
---
 bundles/org.eclipse.e4.tools.compat/pom.xml        | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml  | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml        | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml               | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml | 4 ++--
 tests/org.eclipse.e4.tools.test/pom.xml            | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 29820049ee..2fbd56933a 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.11.0-SNAPSHOT</version>
+    <version>4.12.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 623e8be647..6bc43bac5d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.11.0-SNAPSHOT</version>
+    <version>4.12.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 18657f7f82..108bddb426 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.11.0-SNAPSHOT</version>
+    <version>4.12.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index f82ca6a8ae..1ec20efa55 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.11.0-SNAPSHOT</version>
+    <version>4.12.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 9e0e938ad5..dbb3c95e25 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.11.0-SNAPSHOT</version>
+    <version>4.12.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 1dc643e5b3..b493c669e2 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.11.0-SNAPSHOT</version>
+    <version>4.12.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index e272d85553..c870f1da88 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.11.0-SNAPSHOT</version>
+    <version>4.12.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>4.11.0-SNAPSHOT</version>
+  <version>4.12.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index 965d3cae77..577e6038f1 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.11.0-SNAPSHOT</version>
+		<version>4.12.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From 8576c0c75402bf7f874465c3c1121ffdbdc7b804 Mon Sep 17 00:00:00 2001
From: Niraj Modi <niraj.modi@in.ibm.com>
Date: Fri, 8 Mar 2019 16:17:35 +0530
Subject: [PATCH 1084/1286] Bug 545094 - POM and product version change for
 4.12 release

Change-Id: Icdd512790e8a87756e660f87de5bb2739613aecf
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
---
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index d3213b3e9e..72e772c730 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.11.0.qualifier"
+      version="4.12.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

From cf80f55fe213fd40b12159b687b9b52ab1f8a157 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 26 Apr 2019 10:24:43 +0200
Subject: [PATCH 1085/1286] Version 4.12 update for org.eclipse.e4.tools

Required for Bug 544303

Change-Id: Id6d66a08d0abb3fd10ae775bca19e253332c02a1
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 0f5c894360..ad836fa6ad 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 4.8.200.qualifier
+Bundle-Version: 4.8.300.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index b493c669e2..c92007efd3 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tool</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>4.8.200-SNAPSHOT</version>
+  <version>4.8.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From 54dd9985e87820d2a1009abdeb929e4c8f068553 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 26 Apr 2019 11:25:19 +0200
Subject: [PATCH 1086/1286] Version 4.12 update for org.eclipse.e4.tools.emf.ui

Required for Bug 544303

Change-Id: If50856cbdf25e183a9d1e7dfe570b41d4daf9b24
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml              | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index a5888f4102..8eb94961f5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.6.300.qualifier
+Bundle-Version: 4.6.400.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 108bddb426..e6576edf50 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.6.300-SNAPSHOT</version>
+  <version>4.6.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
@@ -37,6 +37,6 @@
         </configuration>
       </plugin>
     </plugins>
- </build> 
-  
+ </build>
+
 </project>

From 886f7d929e80b6ea866d47a113fbfacb1fe9c4bd Mon Sep 17 00:00:00 2001
From: Jens Lidestrom <jens.lidestrom@rt-labs.com>
Date: Sat, 9 Feb 2019 12:42:05 +0100
Subject: [PATCH 1087/1286] Bug 544303 - Add type arguments to e4 Tools
 databinding

Type parameters have been added to Eclipse databinding classes,
but the code in e4 tools has not been updated to take advantage
of this. This commit contains such updates.

Changes:
* Move most property creation code to E4Properties.
* Add master type parameter to AbstractComponentEditor.
* Add parent type parameter to VirtualEntry.
* Add default implementation of VirtualEntry#accept.


Change-Id: I360770aa00be5dc4eb8877e3f5eb44a3a3cdb02d
Signed-off-by: Jens Lidestrom <jens.lidestrom@rt-labs.com>
---
 .../AbstractElementEditorContribution.java    |   3 +-
 .../ui/common/CommandToStringConverter.java   |   5 +-
 .../ui/common/ContributionURIValidator.java   |   2 +-
 .../tools/emf/ui/common/IModelResource.java   |   2 +-
 .../e4/tools/emf/ui/common/ImageTooltip.java  |   4 +-
 .../eclipse/e4/tools/emf/ui/common/Util.java  |   2 +-
 .../tools/emf/ui/common/XMIModelResource.java |  10 +-
 .../component/AbstractComponentEditor.java    |  23 +-
 .../emf/ui/common/component/IdGenerator.java  |  20 +-
 .../tools/emf/ui/internal/E4Properties.java   | 554 ++++++++++++++++++
 .../ObservableColumnLabelProvider.java        |  15 +-
 .../ui/internal/common/AbstractPickList.java  |   4 +-
 .../common/ComponentLabelProvider.java        |   6 +-
 .../emf/ui/internal/common/E4PickList.java    |  10 +-
 .../ui/internal/common/E4StringPickList.java  |  12 +-
 .../internal/common/EClassLabelProvider.java  |   2 +-
 .../common/FeatureClassLabelProvider.java     |   2 +-
 .../emf/ui/internal/common/ModelEditor.java   | 120 ++--
 .../emf/ui/internal/common/TreeViewerEx.java  |  10 +-
 .../emf/ui/internal/common/VirtualEntry.java  |  46 +-
 .../common/component/AddonsEditor.java        |  20 +-
 .../common/component/ApplicationEditor.java   | 198 ++-----
 .../internal/common/component/AreaEditor.java |  62 +-
 .../component/BindingContextEditor.java       |  39 +-
 .../common/component/BindingTableEditor.java  |  48 +-
 .../common/component/CategoryEditor.java      |  22 +-
 .../common/component/CommandEditor.java       |  44 +-
 .../component/CommandParameterEditor.java     |  31 +-
 .../common/component/CompositePartEditor.java |  74 +--
 .../common/component/ControlFactory.java      | 166 +++---
 .../component/CoreExpressionEditor.java       |  21 +-
 .../common/component/DefaultEditor.java       |   4 +-
 .../component/DirectMenuItemEditor.java       |  28 +-
 .../component/DirectToolItemEditor.java       |  27 +-
 .../DynamicMenuContributionEditor.java        |  24 +-
 .../component/HandledMenuItemEditor.java      |  49 +-
 .../component/HandledToolItemEditor.java      |  52 +-
 .../common/component/HandlerEditor.java       |  25 +-
 .../component/ImperativeExpressionEditor.java |   9 +-
 .../common/component/KeyBindingEditor.java    |  51 +-
 .../component/MenuContributionEditor.java     |  57 +-
 .../internal/common/component/MenuEditor.java |  83 ++-
 .../common/component/MenuItemEditor.java      |  99 ++--
 .../common/component/MenuSeparatorEditor.java |  28 +-
 .../component/ModelFragmentsEditor.java       |  45 +-
 .../common/component/ParameterEditor.java     |  35 +-
 .../component/PartDescriptorEditor.java       |  97 ++-
 .../internal/common/component/PartEditor.java |  84 +--
 .../component/PartSashContainerEditor.java    |  49 +-
 .../common/component/PartStackEditor.java     |  46 +-
 .../common/component/PerspectiveEditor.java   |  86 +--
 .../component/PerspectiveStackEditor.java     |  42 +-
 .../common/component/PlaceholderEditor.java   |  56 +-
 .../common/component/PopupMenuEditor.java     |   5 +-
 .../common/component/StringModelFragment.java |  40 +-
 .../component/ToolBarContributionEditor.java  |  47 +-
 .../common/component/ToolBarEditor.java       |  46 +-
 .../component/ToolBarSeparatorEditor.java     |  28 +-
 .../common/component/ToolControlEditor.java   |  37 +-
 .../common/component/ToolItemEditor.java      | 105 ++--
 .../common/component/TrimBarEditor.java       |  48 +-
 .../component/TrimContributionEditor.java     |  52 +-
 .../common/component/TrimmedWindowEditor.java |  22 +-
 .../UnsettableUpdateValueStrategy.java        |   7 +
 .../common/component/WindowEditor.java        | 137 ++---
 .../AbstractCommandSelectionDialog.java       |   2 +-
 .../AbstractIconDialogWithHardcodedScope.java |   8 +-
 .../AbstractIconDialogWithScopeAndFilter.java |   8 +-
 .../BindingContextSelectionDialog.java        |   2 +-
 .../CommandCategorySelectionDialog.java       |   2 +-
 .../dialogs/FilteredContributionDialog.java   |  10 +-
 .../dialogs/FindImportElementDialog.java      |   9 +-
 .../FindParentReferenceElementDialog.java     |  12 +-
 .../dialogs/ModelResultHandlerImpl.java       |   6 +-
 .../dialogs/ParameterIdSelectionDialog.java   |   2 +-
 .../dialogs/SharedElementsDialog.java         |   6 +-
 .../component/virtual/VApplicationAddons.java |   9 +-
 .../virtual/VApplicationCategoriesEditor.java |  10 +-
 .../virtual/VApplicationWindowEditor.java     |   4 +-
 .../virtual/VBindingTableEditor.java          |  10 +-
 .../component/virtual/VCommandEditor.java     |   9 +-
 .../component/virtual/VHandlerEditor.java     |  10 +-
 .../virtual/VItemParametersEditor.java        |  17 +-
 .../virtual/VMenuContributionsEditor.java     |  11 +-
 .../common/component/virtual/VMenuEditor.java |   9 +-
 .../virtual/VModelFragmentsEditor.java        |  10 +-
 .../virtual/VModelImportsEditor.java          |  11 +-
 .../component/virtual/VPartDescriptor.java    |  10 +-
 .../virtual/VPartDescriptorMenuEditor.java    |   4 +-
 .../component/virtual/VPartMenuEditor.java    |   4 +-
 .../virtual/VPerspectiveControlEditor.java    |  12 +-
 .../virtual/VPerspectiveWindowsEditor.java    |   4 +-
 .../virtual/VRootBindingContexts.java         |  11 +-
 .../component/virtual/VSnippetsEditor.java    |  11 +-
 .../virtual/VToolBarContributionsEditor.java  |  11 +-
 .../virtual/VTrimContributionsEditor.java     |  11 +-
 .../virtual/VWindowControlEditor.java         |  12 +-
 .../component/virtual/VWindowEditor.java      |   9 +-
 .../virtual/VWindowSharedElementsEditor.java  |  16 +-
 .../component/virtual/VWindowTrimEditor.java  |  10 +-
 .../virtual/VWindowWindowsEditor.java         |   4 +-
 .../common/objectdata/ObjectViewer.java       |   9 +-
 .../common/properties/ExportIdsHandler.java   |   5 +-
 .../properties/ExternalizeStringHandler.java  |   5 +-
 .../dialogs/FindContributionDialog.java       |   8 +-
 .../internal/common/uistructure/UIViewer.java |   6 +-
 .../common/uistructure/ViewerElement.java     |   7 +-
 .../xml/EMFDocumentResourceMediator.java      |   4 +-
 .../ui/internal/imp/ModelImportWizard.java    |  12 +-
 .../wizards/classes/AbstractNewClassPage.java |  55 +-
 ...NewDynamicMenuContributionClassWizard.java |   8 +-
 .../classes/NewHandlerClassWizard.java        |   8 +-
 .../NewImperativeExpressionClassWizard.java   |   8 +-
 .../wizards/classes/NewPartClassWizard.java   |   9 +-
 .../classes/NewToolControlClassWizard.java    |   7 +-
 115 files changed, 1916 insertions(+), 1768 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java
index 6a36e9760b..86690cff60 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java
@@ -56,6 +56,7 @@ public abstract class AbstractElementEditorContribution {
 	 * @param editingDomain
 	 * @param project
 	 */
-	public abstract void createContributedEditorTab(Composite parent, EMFDataBindingContext context, WritableValue master, EditingDomain editingDomain, IProject project);
+	public abstract void createContributedEditorTab(Composite parent, EMFDataBindingContext context,
+			WritableValue<?> master, EditingDomain editingDomain, IProject project);
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
index 7fd5bc5f62..760ef8299b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
@@ -20,7 +20,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 
-public class CommandToStringConverter extends Converter {
+public class CommandToStringConverter extends Converter<MCommand, String> {
 	private final Messages Messages;
 
 	public CommandToStringConverter(Messages Messages) {
@@ -29,8 +29,7 @@ public CommandToStringConverter(Messages Messages) {
 	}
 
 	@Override
-	public Object convert(Object fromObject) {
-		final MCommand cmd = (MCommand) fromObject;
+	public String convert(MCommand cmd) {
 		String elementId = null;
 		if (cmd != null && cmd.getElementId() != null && cmd.getElementId().trim().length() > 0) {
 			elementId = cmd.getElementId();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
index f2d17c255b..4b9e892b44 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
@@ -20,7 +20,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.emf.common.util.URI;
 
-public class ContributionURIValidator implements IValidator {
+public class ContributionURIValidator implements IValidator<Object> {
 
 	@Override
 	public IStatus validate(Object value) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
index 248129844b..8d4cc40ea4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
@@ -19,7 +19,7 @@
 import org.eclipse.emf.edit.domain.EditingDomain;
 
 public interface IModelResource {
-	public IObservableList getRoot();
+	public IObservableList<EObject> getRoot();
 
 	public boolean isSaveable();
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
index 5141d7aa1e..836b0a5627 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
@@ -30,9 +30,9 @@
 
 public class ImageTooltip extends ToolTip {
 	private final Messages Messages;
-	private final AbstractComponentEditor editor;
+	private final AbstractComponentEditor<?> editor;
 
-	public ImageTooltip(Control control, Messages Messages, AbstractComponentEditor editor) {
+	public ImageTooltip(Control control, Messages Messages, AbstractComponentEditor<?> editor) {
 		super(control);
 		this.Messages = Messages;
 		this.editor = editor;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index 166d8f23f8..5e42071e65 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -400,7 +400,7 @@ public static boolean referenceIsModelFragmentCompliant(EReference r) {
 	public static final void addDecoration(Control control, Binding binding) {
 		final ControlDecoration dec = new ControlDecoration(control, SWT.BOTTOM);
 		binding.getValidationStatus().addValueChangeListener(event -> {
-			final IStatus s = (IStatus) event.getObservableValue().getValue();
+			final IStatus s = event.getObservableValue().getValue();
 			if (s.isOK()) {
 				dec.setDescriptionText(null);
 				dec.setImage(null);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
index 760c67ba24..dfa59f27aa 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
@@ -24,6 +24,7 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
 import org.eclipse.e4.ui.internal.workbench.E4XMIResourceFactory;
 import org.eclipse.emf.common.command.BasicCommandStack;
@@ -32,7 +33,6 @@
 import org.eclipse.emf.common.command.CompoundCommand;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -50,7 +50,7 @@ public class XMIModelResource implements IModelResource {
 	private final Resource resource;
 	private final List<ModelListener> listeners = new ArrayList<>();
 
-	private IObservableList list;
+	private IObservableList<EObject> list;
 
 	public XMIModelResource(URI uri) {
 		final ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
@@ -74,12 +74,12 @@ public void commandStackChanged(EventObject event) {
 	}
 
 	@Override
-	public IObservableList getRoot() {
+	public IObservableList<EObject> getRoot() {
 		if (list != null) {
 			return list;
 		}
 
-		list = EMFEditProperties.resource(getEditingDomain()).observe(resource);
+		list = E4Properties.resource(getEditingDomain()).observe(resource);
 
 		return list;
 	}
@@ -97,7 +97,7 @@ public void replaceRoot(EObject eObject) {
 			idMap.put(o, resource.getID(o));
 		}
 
-		resource = (E4XMIResource) ((EObject) list.get(0)).eResource();
+		resource = (E4XMIResource) list.get(0).eResource();
 
 		final Command cmdRemove = new RemoveCommand(getEditingDomain(), resource.getContents(), list.get(0));
 		final Command cmdAdd = new AddCommand(getEditingDomain(), resource.getContents(), eObject);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 330bf71181..bc2d6ce734 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -26,6 +26,7 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.e4.core.di.annotations.Optional;
@@ -65,12 +66,15 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
-public abstract class AbstractComponentEditor {
+/**
+ * @param <M> type of the master object
+ */
+public abstract class AbstractComponentEditor<M> {
 	private static final String GREY_SUFFIX = "Grey"; //$NON-NLS-1$
 
 	private static final String CSS_CLASS_KEY = "org.eclipse.e4.ui.css.CssClassName"; //$NON-NLS-1$
 
-	private final WritableValue master = new WritableValue();
+	private final WritableValue<M> master = new WritableValue<>();
 
 	public static final int SEARCH_IMAGE = 0;
 	public static final int TABLE_ADD_IMAGE = 1;
@@ -112,7 +116,7 @@ public ModelEditor getEditor() {
 		return editor;
 	}
 
-	public WritableValue getMaster() {
+	public WritableValue<M> getMaster() {
 		return master;
 	}
 
@@ -330,7 +334,7 @@ public Composite getEditor(Composite parent, Object object) {
 
 	protected abstract Composite doGetEditor(Composite parent, Object object);
 
-	public abstract IObservableList getChildList(Object element);
+	public abstract IObservableList<?> getChildList(Object element);
 
 	public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] {};
@@ -433,8 +437,8 @@ public void controlResized(ControlEvent e) {
 		return contentContainer;
 	}
 
-	protected void createContributedEditorTabs(CTabFolder folder, EMFDataBindingContext context, WritableValue master,
-			Class<?> clazz) {
+	protected void createContributedEditorTabs(CTabFolder folder, EMFDataBindingContext context,
+			WritableValue<M> master, Class<? super M> clazz) {
 		final List<AbstractElementEditorContribution> contributionList = editor.getTabContributionsForClass(clazz);
 
 		for (final AbstractElementEditorContribution eec : contributionList) {
@@ -465,8 +469,11 @@ protected void enableIdGenerator(EAttribute attSource, EAttribute attId, Control
 		}
 		if (getEditor().isAutoCreateElementId()) {
 			generator = new IdGenerator();
-			generator.bind(getMaster(), EMFEditProperties.value(getEditingDomain(), attSource),
-					EMFEditProperties.value(getEditingDomain(), attId), control);
+			@SuppressWarnings("unchecked")
+			IValueProperty<M, String> addSourceProp = EMFEditProperties.value(getEditingDomain(), attSource);
+			@SuppressWarnings("unchecked")
+			IValueProperty<M, String> attIdProp = EMFEditProperties.value(getEditingDomain(), attId);
+			generator.bind(getMaster(), addSourceProp, attIdProp, control);
 		}
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
index 7703747ace..99d45a07ec 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
@@ -20,8 +20,8 @@
 
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.swt.events.FocusAdapter;
 import org.eclipse.swt.widgets.Control;
 
@@ -33,11 +33,11 @@
  */
 public class IdGenerator {
 
-	private IValueChangeListener listener;
-	private IObservableValue observableValue;
+	private IValueChangeListener<String> listener;
+	private IObservableValue<String> observableValue;
 	protected boolean ignore;
-	private IValueChangeListener listener2;
-	private IObservableValue observableValue2;
+	private IValueChangeListener<String> listener2;
+	private IObservableValue<String> observableValue2;
 	static Pattern patternId = Pattern.compile("^(.*\\.)\\d+$"); //$NON-NLS-1$
 
 	/**
@@ -50,8 +50,8 @@ public class IdGenerator {
 	 * @param control
 	 *            Optional control.
 	 */
-	public void bind(final IObservableValue master, final IEMFEditValueProperty ebpLabel,
-			final IEMFEditValueProperty evpId, Control control) {
+	public <T> void bind(final IObservableValue<T> master, final IValueProperty<T, String> ebpLabel,
+			final IValueProperty<T, String> evpId, Control control) {
 
 		// RULES
 		// Only start generating if the label is initially empty and the id ends
@@ -60,12 +60,12 @@ public void bind(final IObservableValue master, final IEMFEditValueProperty ebpL
 		// If the id is manually changed, stop generating
 		// If the control loses focus, stop generating
 
-		final String origLabel = (String) ebpLabel.getValue(master.getValue());
+		final String origLabel = ebpLabel.getValue(master.getValue());
 		if (E.notEmpty(origLabel)) {
 			stopGenerating();
 			return;
 		}
-		String origId = (String) evpId.getValue(master.getValue());
+		String origId = evpId.getValue(master.getValue());
 		if (origId == null) {
 			origId = "id.0"; //$NON-NLS-1$
 		}
@@ -96,7 +96,7 @@ public void focusLost(org.eclipse.swt.events.FocusEvent e) {
 
 		observableValue = ebpLabel.observe(master.getValue());
 		observableValue.addValueChangeListener(listener = event -> {
-			String labelValue = (String) ebpLabel.getValue(master.getValue());
+			String labelValue = ebpLabel.getValue(master.getValue());
 			if (labelValue == null) {
 				labelValue = ""; //$NON-NLS-1$
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java
new file mode 100644
index 0000000000..f412a6026d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java
@@ -0,0 +1,554 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2019 EclipseSource Muenchen GmbH and others.
+ *
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Jens Lidestrom - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal;
+
+import org.eclipse.core.databinding.property.IProperty;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.e4.ui.model.application.MAddon;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.MContribution;
+import org.eclipse.e4.ui.model.application.commands.MBindingContext;
+import org.eclipse.e4.ui.model.application.commands.MBindingTable;
+import org.eclipse.e4.ui.model.application.commands.MBindingTableContainer;
+import org.eclipse.e4.ui.model.application.commands.MBindings;
+import org.eclipse.e4.ui.model.application.commands.MCategory;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.commands.MCommandParameter;
+import org.eclipse.e4.ui.model.application.commands.MHandler;
+import org.eclipse.e4.ui.model.application.commands.MHandlerContainer;
+import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
+import org.eclipse.e4.ui.model.application.commands.MKeySequence;
+import org.eclipse.e4.ui.model.application.commands.MParameter;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorContainer;
+import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MCoreExpression;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MExpression;
+import org.eclipse.e4.ui.model.application.ui.MGenericTile;
+import org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer;
+import org.eclipse.e4.ui.model.application.ui.MSnippetContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.e4.ui.model.application.ui.SideValue;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContributions;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
+import org.eclipse.e4.ui.model.application.ui.menu.MTrimContributions;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.e4.ui.model.fragment.MModelFragment;
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
+import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+/**
+ * This class contains factory method for {@link IProperty} objects for features
+ * of the e4 model classes.
+ */
+public class E4Properties {
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MApplicationElement, String> elementId(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <E extends MUIElement> IListProperty<MElementContainer<E>, E> children(EditingDomain editingDomain) {
+		return EMFEditProperties.list(editingDomain, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <E extends MUIElement> IListProperty<MElementContainer<E>, E> children() {
+		return EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <E extends MUIElement> IValueProperty<MElementContainer<E>, E> selectedElement(
+			EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, UiPackageImpl.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MUILabel, String> label(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, UiPackageImpl.Literals.UI_LABEL__LABEL);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MUIElement, Boolean> toBeRendered(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MUIElement, Boolean> visible(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MUIElement, MExpression> visibleWhen() {
+		return EMFProperties.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MUIElement, MExpression> visibleWhen(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MCoreExpression, String> coreExpressionId(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, UiPackageImpl.Literals.CORE_EXPRESSION__CORE_EXPRESSION_ID);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MToolItem, MMenu> menu() {
+		return EMFProperties.value(MenuPackageImpl.Literals.TOOL_ITEM__MENU);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MItem, ItemType> type(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, MenuPackageImpl.Literals.ITEM__TYPE);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MItem, Boolean> enabled(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, MenuPackageImpl.Literals.ITEM__ENABLED);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MItem, Boolean> selected(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, MenuPackageImpl.Literals.ITEM__SELECTED);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MUIElement, String> accessibilityPhrase(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MUILabel, String> tooltip(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, UiPackageImpl.Literals.UI_LABEL__TOOLTIP);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MUILabel, String> iconUri(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MHandledItem, MParameter> itemParameters(EditingDomain editingDomain) {
+		return EMFEditProperties.list(editingDomain, MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MHandledItem, MParameter> itemParameters() {
+		return EMFProperties.list(MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MHandledItem, MCommand> itemCommand(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MHandler, MCommand> command(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, CommandsPackageImpl.Literals.HANDLER__COMMAND);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MKeyBinding, MParameter> keyBindingParameters(EditingDomain editingDomain) {
+		return EMFEditProperties.list(editingDomain, CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MKeySequence, String> keySequence(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, CommandsPackageImpl.Literals.KEY_SEQUENCE__KEY_SEQUENCE);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MKeyBinding, MCommand> keyBindingCommand(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, CommandsPackageImpl.Literals.KEY_BINDING__COMMAND);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MMenuContribution, String> menuParentId(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MMenuContribution, String> menuPositionInParent(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, MenuPackageImpl.Literals.MENU_CONTRIBUTION__POSITION_IN_PARENT);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MMenuElement, String> mnemonics(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MModelFragments, MModelFragment> fragments() {
+		return EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MModelFragments, MApplicationElement> imports() {
+		return EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MParameter, String> parameterValue(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, CommandsPackageImpl.Literals.PARAMETER__VALUE);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MParameter, String> parameterName(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, CommandsPackageImpl.Literals.PARAMETER__NAME);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MPartDescriptor, MMenu> partDescriptorMenus() {
+		return EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MHandlerContainer, MHandler> handlers() {
+		return EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MPartDescriptor, MToolBar> partDescriptorToolbar() {
+		return EMFProperties.value(BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MUIElement, String> containerData(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MPartDescriptor, Boolean> closable(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, BasicPackageImpl.Literals.PART_DESCRIPTOR__CLOSEABLE);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MPartDescriptor, Boolean> allowMultiple(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, BasicPackageImpl.Literals.PART_DESCRIPTOR__ALLOW_MULTIPLE);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MPartDescriptor, String> category(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, BasicPackageImpl.Literals.PART_DESCRIPTOR__CATEGORY);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MPart, Boolean> partClosable(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain,
+				org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.PART__CLOSEABLE);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MPart, MMenu> partMenus() {
+		return EMFProperties
+				.list(org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.PART__MENUS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MPart, MToolBar> partToolbar() {
+		return EMFProperties
+				.value(org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.PART__TOOLBAR);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MGenericTile<?>, Boolean> horizontal(
+			EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MPerspective, MWindow> perspectiveWindows() {
+		return EMFProperties.list(AdvancedPackageImpl.Literals.PERSPECTIVE__WINDOWS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MPlaceholder, MUIElement> ref(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, AdvancedPackageImpl.Literals.PLACEHOLDER__REF);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MPlaceholder, Boolean> placeholderClosable(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, AdvancedPackageImpl.Literals.PLACEHOLDER__CLOSEABLE);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MBindingTable, MBindingContext> bindingContext() {
+		return EMFProperties.value(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MBindingTableContainer, MBindingTable> bindingTables() {
+		return EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MApplication, MCommand> applicationCommands() {
+		return EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__COMMANDS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MPartDescriptorContainer, MPartDescriptor> descriptors() {
+		return EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MApplication, MAddon> addons() {
+		return EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__ADDONS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MMenuContributions, MMenuContribution> menuContributions() {
+		return EMFProperties.list(MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MToolBarContributions, MToolBarContribution> toolBarContributions() {
+		return EMFProperties.list(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MTrimContributions, MTrimContribution> trimContributions() {
+		return EMFProperties.list(MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MSnippetContainer, MUIElement> snippets() {
+		return EMFProperties.list(UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MApplication, MCategory> categories() {
+		return EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MBindingTableContainer, MBindingContext> rootContext() {
+		return EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MModelFragment, MApplicationElement> elements() {
+		return (EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS));
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MStringModelFragment, String> parentElementId(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain,
+				FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MStringModelFragment, String> featureName(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MStringModelFragment, String> positionInList(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain,
+				FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__POSITION_IN_LIST);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MToolBarContribution, String> toolBarParentId(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__PARENT_ID);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MToolBarContribution, String> toolBarPositionInParent(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain,
+				MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__POSITION_IN_PARENT);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MContribution, String> contributionURI(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <E extends MUIElement> IValueProperty<MGenericTrimContainer<E>, SideValue> side(
+			EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, UiPackageImpl.Literals.GENERIC_TRIM_CONTAINER__SIDE);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MTrimContribution, String> trimParentId(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, MenuPackageImpl.Literals.TRIM_CONTRIBUTION__PARENT_ID);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MTrimContribution, String> trimPositionInParent(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, MenuPackageImpl.Literals.TRIM_CONTRIBUTION__POSITION_IN_PARENT);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MTrimmedWindow, MTrimBar> trimBars() {
+		return EMFProperties.list(
+				org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MWindow, MWindow> windowWindows() {
+		return EMFProperties
+				.list(org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.WINDOW__WINDOWS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MWindow, MUIElement> sharedElements() {
+		return EMFProperties.list(
+				org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MWindow, MUIElement> sharedElements(EditingDomain editingDomain) {
+		return EMFEditProperties.list(editingDomain,
+				org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MWindow, MMenu> mainMenu() {
+		return EMFProperties
+				.value(org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.WINDOW__MAIN_MENU);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MWindow, Integer> windowX(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain,
+				org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.WINDOW__X);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MWindow, Integer> windowY(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain,
+				org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.WINDOW__Y);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MWindow, Integer> width(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain,
+				org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.WINDOW__WIDTH);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MWindow, Integer> height(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain,
+				org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.WINDOW__HEIGHT);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MBindingContext, String> bindingContextName(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MBindingContext, String> description(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, CommandsPackageImpl.Literals.BINDING_CONTEXT__DESCRIPTION);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MBindingContext, MBindingContext> bindingContextChildren() {
+		return EMFProperties.list(CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MBindings, MBindingContext> contexts() {
+		return EMFProperties.list(CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MBindingContext, MBindingContext> bindingContextChildren(EditingDomain editingDomain) {
+		return EMFEditProperties.list(editingDomain, CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MBindingTable, MKeyBinding> bindings() {
+		return EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MCategory, String> categoryName(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, CommandsPackageImpl.Literals.CATEGORY__NAME);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MCategory, String> categoryDescription(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, CommandsPackageImpl.Literals.CATEGORY__DESCRIPTION);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MCommand, MCommandParameter> commandParameters(EditingDomain editingDomain) {
+		return EMFEditProperties.list(editingDomain, CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MCommand, String> commandName(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MCommand, String> commandDescription(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, CommandsPackageImpl.Literals.COMMAND__DESCRIPTION);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MCommand, MCategory> category() {
+		return EMFProperties.value(CommandsPackageImpl.Literals.COMMAND__CATEGORY);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MCommandParameter, String> commandParameterName(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MCommandParameter, Boolean> optional(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, CommandsPackageImpl.Literals.COMMAND_PARAMETER__OPTIONAL);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<Resource, EObject> resource(EditingDomain editingDomain) {
+		return EMFEditProperties.resource(editingDomain);
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
index 6821490bd3..6283bbc21c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
@@ -14,6 +14,7 @@
 package org.eclipse.e4.tools.emf.ui.internal;
 
 import java.util.Set;
+
 import org.eclipse.core.databinding.observable.map.IMapChangeListener;
 import org.eclipse.core.databinding.observable.map.IObservableMap;
 import org.eclipse.core.databinding.observable.map.MapChangeEvent;
@@ -25,12 +26,12 @@
 import org.eclipse.swt.graphics.Image;
 
 public class ObservableColumnLabelProvider<M> extends CellLabelProvider {
-	private IObservableMap[] attributeMaps;
+	private IObservableMap<M, ?>[] attributeMaps;
 
-	private IMapChangeListener mapChangeListener = new IMapChangeListener() {
+	private IMapChangeListener<M, Object> mapChangeListener = new IMapChangeListener<M, Object>() {
 		@Override
-		public void handleMapChange(MapChangeEvent event) {
-			Set<?> affectedElements = event.diff.getChangedKeys();
+		public void handleMapChange(MapChangeEvent<? extends M, ?> event) {
+			Set<? extends M> affectedElements = event.diff.getChangedKeys();
 			LabelProviderChangedEvent newEvent = new LabelProviderChangedEvent(ObservableColumnLabelProvider.this, affectedElements.toArray());
 			fireLabelProviderChanged(newEvent);
 		}
@@ -41,7 +42,8 @@ public void handleMapChange(MapChangeEvent event) {
 	 *
 	 * @param attributeMap
 	 */
-	public ObservableColumnLabelProvider(IObservableMap attributeMap) {
+	@SuppressWarnings("unchecked")
+	public ObservableColumnLabelProvider(IObservableMap<?, ?> attributeMap) {
 		this(new IObservableMap[] { attributeMap });
 	}
 
@@ -52,7 +54,8 @@ public ObservableColumnLabelProvider(IObservableMap attributeMap) {
 	 *
 	 * @param attributeMaps
 	 */
-	protected ObservableColumnLabelProvider(IObservableMap[] attributeMaps) {
+	@SuppressWarnings("unchecked")
+	protected ObservableColumnLabelProvider(IObservableMap<M, ?>[] attributeMaps) {
 		System.arraycopy(attributeMaps, 0, this.attributeMaps = new IObservableMap[attributeMaps.length], 0, attributeMaps.length);
 		for (int i = 0; i < attributeMaps.length; i++) {
 			attributeMaps[i].addMapChangeListener(mapChangeListener);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index 894e012f25..8c227c5024 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -66,12 +66,12 @@ public enum PickListFeatures {
 
 	@Deprecated
 	public AbstractPickList(Composite parent, int style, List<PickListFeatures> listFeatures, Messages messages,
-			AbstractComponentEditor componentEditor) {
+			AbstractComponentEditor<?> componentEditor) {
 		this(parent, style, listFeatures, componentEditor);
 	}
 
 	public AbstractPickList(Composite parent, int style, List<PickListFeatures> listFeatures,
-			AbstractComponentEditor componentEditor) {
+			AbstractComponentEditor<?> componentEditor) {
 
 		super(parent, style);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index e11f74c38a..b374b800bd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -90,7 +90,7 @@ public StyledString getStyledText(Object element) {
 		if (element instanceof EObject) {
 
 			final EObject o = (EObject) element;
-			final AbstractComponentEditor elementEditor = editor.getEditor(o.eClass());
+			final AbstractComponentEditor<?> elementEditor = editor.getEditor(o.eClass());
 			if (elementEditor != null) {
 				String label = elementEditor.getLabel(o);
 				final String detailText = elementEditor.getDetailLabel(o);
@@ -126,7 +126,7 @@ public StyledString getStyledText(Object element) {
 	public Image getImage(Object element) {
 		if (element instanceof EObject) {
 			final EObject o = (EObject) element;
-			final AbstractComponentEditor elementEditor = editor.getEditor(o.eClass());
+			final AbstractComponentEditor<?> elementEditor = editor.getEditor(o.eClass());
 			if (elementEditor != null) {
 				return elementEditor.getImage(element);
 			}
@@ -136,7 +136,7 @@ public Image getImage(Object element) {
 
 	@Override
 	public Font getFont(Object element) {
-		if(element instanceof VirtualEntry<?>) {
+		if (element instanceof VirtualEntry) {
 			return resourceManager.createFont(italicFontDescriptor);
 		}
 		return null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
index c274e34f47..f9200e10c1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
@@ -68,7 +68,7 @@
  */
 public class E4PickList extends AbstractPickList {
 
-	AbstractComponentEditor componentEditor;
+	AbstractComponentEditor<?> componentEditor;
 	EStructuralFeature feature;
 	TableViewerFocusCellManager focusCellMgr;
 
@@ -86,12 +86,12 @@ public Struct(String label, EClass eClass, boolean separator) {
 
 	@Deprecated
 	public E4PickList(Composite parent, int style, List<PickListFeatures> listFeatures, Messages messages,
-			AbstractComponentEditor componentEditor, final EStructuralFeature feature) {
+			AbstractComponentEditor<?> componentEditor, final EStructuralFeature feature) {
 		this(parent, style, listFeatures, componentEditor, feature);
 	}
 
 	public E4PickList(Composite parent, int style, List<PickListFeatures> listFeatures,
-			final AbstractComponentEditor componentEditor, final EStructuralFeature feature) {
+			final AbstractComponentEditor<?> componentEditor, final EStructuralFeature feature) {
 		super(parent, style, listFeatures, componentEditor);
 
 		this.componentEditor = componentEditor;
@@ -110,7 +110,7 @@ public String getText(Object element) {
 				.setStyle(SWT.ITALIC);
 		viewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
 				new ComponentLabelProvider(componentEditor.getEditor(), new Messages(), italicFontDescriptor)));
-		final ObservableListContentProvider cp = new ObservableListContentProvider();
+		final ObservableListContentProvider<?> cp = new ObservableListContentProvider<>();
 		viewer.setContentProvider(cp);
 
 		// enable tabbing and keyboard activation
@@ -273,7 +273,7 @@ protected int getItemCount() {
 		if (viewer.getContentProvider() == null || viewer.getInput() == null) {
 			return 0;
 		}
-		return ((ObservableListContentProvider) viewer.getContentProvider()).getElements(viewer.getInput()).length;
+		return ((ObservableListContentProvider<?>) viewer.getContentProvider()).getElements(viewer.getInput()).length;
 	}
 
 	private class TableViewerEditorActivationStrategy extends ColumnViewerEditorActivationStrategy {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
index 55ceeb3961..23536a758c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
@@ -54,15 +54,17 @@ public class E4StringPickList extends AbstractPickList {
 
 	private Text text;
 	private Button tiReplace;
-	private AbstractComponentEditor editor;
+	private AbstractComponentEditor<?> editor;
 	private EStructuralFeature feature;
 
 	@Deprecated
-	public E4StringPickList(Composite parent, int flags, List<PickListFeatures> list, Messages messages, AbstractComponentEditor editor, EStructuralFeature feature) {
+	public E4StringPickList(Composite parent, int flags, List<PickListFeatures> list, Messages messages,
+			AbstractComponentEditor<?> editor, EStructuralFeature feature) {
 		this(parent, flags, list, editor, feature);
 	}
 
-	public E4StringPickList(Composite parent, int flags, List<PickListFeatures> list, AbstractComponentEditor editor,
+	public E4StringPickList(Composite parent, int flags, List<PickListFeatures> list,
+			AbstractComponentEditor<?> editor,
 			EStructuralFeature feature) {
 		super(parent, flags, Arrays.asList(PickListFeatures.NO_PICKER), editor);
 
@@ -94,7 +96,7 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		getList().setContentProvider(new ObservableListContentProvider());
+		getList().setContentProvider(new ObservableListContentProvider<>());
 
 		text.addModifyListener(e -> updateUiState());
 
@@ -193,7 +195,7 @@ protected int getItemCount() {
 		if (viewer.getContentProvider() == null || viewer.getInput() == null) {
 			return 0;
 		}
-		return ((ObservableListContentProvider) viewer.getContentProvider()).getElements(viewer.getInput()).length;
+		return ((ObservableListContentProvider<?>) viewer.getContentProvider()).getElements(viewer.getInput()).length;
 	}
 
 	protected Button getReplaceWidget() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
index 38a776aaec..28eb671a07 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
@@ -34,7 +34,7 @@ public EClassLabelProvider(ModelEditor editor) {
 	@Override
 	public String getText(Object element) {
 		final EClass eclass = (EClass) element;
-		final AbstractComponentEditor elementEditor = editor.getEditor(eclass);
+		final AbstractComponentEditor<?> elementEditor = editor.getEditor(eclass);
 		if (elementEditor != null) {
 			return elementEditor.getLabel(element);
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
index fb97dc1639..74c39eaa8d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
@@ -36,7 +36,7 @@ public FeatureClassLabelProvider(ModelEditor editor) {
 	public String getText(Object element) {
 		final FeatureClass eFeatureClass = (FeatureClass) element;
 		final EClass eclass = eFeatureClass.eClass;
-		final AbstractComponentEditor elementEditor = editor.getEditor(eclass);
+		final AbstractComponentEditor<?> elementEditor = editor.getEditor(eclass);
 		if (elementEditor != null) {
 			return elementEditor.getLabel(null);
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 7a3e428e8b..8370451db4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -35,7 +35,6 @@
 import javax.inject.Named;
 
 import org.eclipse.core.databinding.ObservablesManager;
-import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.map.IObservableMap;
@@ -285,13 +284,13 @@ public class ModelEditor implements IGotoObject {
 	 * AbstractComponentEditor instance This map is filled on the fly when getting
 	 * editors
 	 */
-	private final Map<String, AbstractComponentEditor> editors = new HashMap<>();
+	private final Map<String, AbstractComponentEditor<?>> editors = new HashMap<>();
 
 	/**
 	 * A map with key = eClass name or virtual key, value is a class of
 	 * AbstractComponentEditor. This map is filled on init by registerEditor
 	 */
-	private final Map<String, Class<? extends AbstractComponentEditor>> editorsClasses = new HashMap<>();
+	private final Map<String, Class<? extends AbstractComponentEditor<?>>> editorsClasses = new HashMap<>();
 
 	private final Map<Class<?>, List<AbstractElementEditorContribution>> tabContributions = new HashMap<>();
 	private final List<FeaturePath> labelFeaturePaths = new ArrayList<>();
@@ -353,7 +352,7 @@ public class ModelEditor implements IGotoObject {
 
 	private EMFDocumentResourceMediator emfDocumentProvider;
 
-	private AbstractComponentEditor currentEditor;
+	private AbstractComponentEditor<?> currentEditor;
 
 	private Listener keyListener;
 
@@ -590,7 +589,7 @@ public void keyReleased(final KeyEvent e) {
 				final IStructuredSelection s = (IStructuredSelection) event.getSelection();
 				if (s.getFirstElement() instanceof EObject) {
 					final EObject obj = (EObject) s.getFirstElement();
-					final AbstractComponentEditor editor1 = getEditor(obj.eClass());
+					final AbstractComponentEditor<?> editor1 = getEditor(obj.eClass());
 					if (editor1 != null) {
 						currentEditor = editor1;
 						headerContainer.setText(editor1.getLabel(obj));
@@ -601,8 +600,8 @@ public void keyReleased(final KeyEvent e) {
 						});
 					}
 				} else {
-					final VirtualEntry<?> entry = (VirtualEntry<?>) s.getFirstElement();
-					final AbstractComponentEditor editor2 = getEditor(entry.getId());
+					final VirtualEntry<?, ?> entry = (VirtualEntry<?, ?>) s.getFirstElement();
+					final AbstractComponentEditor<?> editor2 = getEditor(entry.getId());
 					if (editor2 != null) {
 						currentEditor = editor2;
 						headerContainer.setText(editor2.getLabel(entry));
@@ -630,8 +629,8 @@ public void keyReleased(final KeyEvent e) {
 			boolean addSeparator = false;
 			if (!s.isEmpty() && noSelected == 1) {
 				List<Action> actions;
-				if (s.getFirstElement() instanceof VirtualEntry<?>) {
-					actions = getEditor(((VirtualEntry<?>) s.getFirstElement()).getId())
+				if (s.getFirstElement() instanceof VirtualEntry) {
+					actions = getEditor(((VirtualEntry<?, ?>) s.getFirstElement()).getId())
 							.getActions(s.getFirstElement());
 					if (actions.size() > 0) {
 						final MenuManager addMenu1 = new MenuManager(messages.ModelEditor_AddChild);
@@ -642,7 +641,7 @@ public void keyReleased(final KeyEvent e) {
 						manager.add(addMenu1);
 					}
 
-					actions = getEditor(((VirtualEntry<?>) s.getFirstElement()).getId())
+					actions = getEditor(((VirtualEntry<?, ?>) s.getFirstElement()).getId())
 							.getActionsImport(s.getFirstElement());
 					if (actions.size() > 0) {
 						final MenuManager menu1 = new MenuManager(messages.ModelEditor_Import3x);
@@ -660,7 +659,7 @@ public void keyReleased(final KeyEvent e) {
 				} else {
 
 					final EObject o = (EObject) s.getFirstElement();
-					final AbstractComponentEditor editor = getEditor(o.eClass());
+					final AbstractComponentEditor<?> editor = getEditor(o.eClass());
 
 					// Build Add Child menu
 					if (editor != null) {
@@ -720,14 +719,15 @@ public void run() {
 							final ArrayList<MApplicationElement> maes = new ArrayList<>();
 							for (final Object objSelect : listOfSelections) {
 								EObject container = null;
-								if (objSelect instanceof VirtualEntry<?>) {
+								if (objSelect instanceof VirtualEntry) {
 
-									final VirtualEntry<?> ve = (VirtualEntry<?>) objSelect;
-									container = (EObject) ve.getOriginalParent();
-									final IObservableList list = ve.getList();
-									final Iterator<?> iterator = list.iterator();
+									@SuppressWarnings("unchecked")
+									final VirtualEntry<EObject, MApplicationElement> ve = (VirtualEntry<EObject, MApplicationElement>) objSelect;
+									container = ve.getOriginalParent();
+									final IObservableList<MApplicationElement> list = ve.getList();
+									final Iterator<MApplicationElement> iterator = list.iterator();
 									while (iterator.hasNext()) {
-										maes.add((MApplicationElement) iterator.next());
+										maes.add(iterator.next());
 									}
 
 								} else {
@@ -1047,17 +1047,17 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 				.setStyle(SWT.ITALIC);
 		viewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
 				new ComponentLabelProvider(this, messages, italicFontDescriptor)));
-		final ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(
-				new ObservableFactoryImpl(), new TreeStructureAdvisor() {
+		final ObservableListTreeContentProvider<Object> contentProvider = new ObservableListTreeContentProvider<>(
+				new ObservableFactoryImpl(), new TreeStructureAdvisor<Object>() {
 				});
 		viewer.setContentProvider(contentProvider);
 
-		final WritableSet clearedSet = new WritableSet();
+		final WritableSet<EObject> clearedSet = new WritableSet<>();
 
 		contentProvider.getKnownElements().addSetChangeListener(event -> {
 			for (final Object o1 : event.diff.getAdditions()) {
 				if (o1 instanceof EObject) {
-					clearedSet.add(o1);
+					clearedSet.add((EObject) o1);
 				}
 			}
 
@@ -1069,7 +1069,8 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		});
 
 		for (final FeaturePath p : labelFeaturePaths) {
-			final IObservableMap map = EMFProperties.value(p).observeDetail(clearedSet);
+			@SuppressWarnings("unchecked")
+			final IObservableMap<EObject, Object> map = EMFProperties.value(p).observeDetail(clearedSet);
 			map.addMapChangeListener(event -> viewer.update(event.diff.getChangedKeys().toArray(), null));
 		}
 
@@ -1118,7 +1119,7 @@ private void registerContributedVirtualEditors() {
 			}
 
 			final IContributionFactory fact = context.get(IContributionFactory.class);
-			final AbstractComponentEditor editor = (AbstractComponentEditor) fact
+			final AbstractComponentEditor<?> editor = (AbstractComponentEditor<?>) fact
 					.create("bundleclass://" + el.getContributor().getName() + "/" + el.getAttribute("class"), context); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			registerEditor(el.getAttribute("id"), editor); //$NON-NLS-1$
 		}
@@ -1168,7 +1169,7 @@ private void registerContributedEditors() {
 				final IEditorDescriptor desc = (IEditorDescriptor) el.createExecutableExtension("descriptorClass"); //$NON-NLS-1$
 				final EClass eClass = desc.getEClass();
 				final IContributionFactory fact = context.get(IContributionFactory.class);
-				final AbstractComponentEditor editor = (AbstractComponentEditor) fact.create(
+				final AbstractComponentEditor<?> editor = (AbstractComponentEditor<?>) fact.create(
 						"bundleclass://" + el.getContributor().getName() + "/" + desc.getEditorClass().getName(), //$NON-NLS-1$ //$NON-NLS-2$
 						context);
 				registerEditor(eClass, editor);
@@ -1341,7 +1342,7 @@ public void setNotVisibleRenderedColor(
 		}
 	}
 
-	private void registerEditor(EClass eClass, Class<? extends AbstractComponentEditor> clazz) {
+	private void registerEditor(EClass eClass, Class<? extends AbstractComponentEditor<?>> clazz) {
 		registerEditor(eClass.getInstanceClassName(), clazz);
 	}
 
@@ -1351,7 +1352,7 @@ private void registerEditor(EClass eClass, Class<? extends AbstractComponentEdit
 	 * @param ley
 	 * @param clazz
 	 */
-	private void registerEditor(String key, Class<? extends AbstractComponentEditor> clazz) {
+	private void registerEditor(String key, Class<? extends AbstractComponentEditor<?>> clazz) {
 		editorsClasses.put(key, clazz);
 	}
 
@@ -1361,7 +1362,7 @@ private void registerEditor(String key, Class<? extends AbstractComponentEditor>
 	 * @param instanceClassName
 	 * @param clazz
 	 */
-	private void registerEditor(String key, AbstractComponentEditor editor) {
+	private void registerEditor(String key, AbstractComponentEditor<?> editor) {
 		editors.put(key, editor);
 	}
 
@@ -1372,8 +1373,8 @@ private void registerEditor(String key, AbstractComponentEditor editor) {
 	 * @param eClass the eClass to get editor for
 	 * @return the {@link AbstractComponentEditor} found (never null).
 	 */
-	public AbstractComponentEditor getEditor(EClass eClass) {
-		AbstractComponentEditor editor = getEditor(eClass.getInstanceClassName(), false);
+	public AbstractComponentEditor<?> getEditor(EClass eClass) {
+		AbstractComponentEditor<?> editor = getEditor(eClass.getInstanceClassName(), false);
 
 		if (editor == null) {
 			// May be can try to use the ancestor editor if not found or the default editor
@@ -1397,7 +1398,7 @@ public AbstractComponentEditor getEditor(EClass eClass) {
 
 	}
 
-	public AbstractComponentEditor getEditor(String key) {
+	public AbstractComponentEditor<?> getEditor(String key) {
 		return getEditor(key, true);
 	}
 
@@ -1410,14 +1411,14 @@ public AbstractComponentEditor getEditor(String key) {
 	 * @return the {@link AbstractComponentEditor} if exists. Never null if
 	 *         createDefaultIfNull is true
 	 */
-	private AbstractComponentEditor getEditor(String key, boolean createDefaultIfNull) {
-		AbstractComponentEditor editor = editors.get(key);
+	private AbstractComponentEditor<?> getEditor(String key, boolean createDefaultIfNull) {
+		AbstractComponentEditor<?> editor = editors.get(key);
 
 		if (editor == null) {
 
 			// Editor not yet created in the map... must create instance using registered
 			// class
-			Class<? extends AbstractComponentEditor> cz = editorsClasses.get(key);
+			Class<? extends AbstractComponentEditor<?>> cz = editorsClasses.get(key);
 			if (cz != null) {
 				editor = ContextInjectionFactory.make(cz, context);
 				editors.put(key, editor);
@@ -1431,7 +1432,7 @@ private AbstractComponentEditor getEditor(String key, boolean createDefaultIfNul
 		return editor;
 	}
 
-	private void manageFeatureMap(AbstractComponentEditor editor) {
+	private void manageFeatureMap(AbstractComponentEditor<?> editor) {
 		for (final FeaturePath p : editor.getLabelProperties()) {
 			boolean found = false;
 			for (final FeaturePath tmp : labelFeaturePaths) {
@@ -1448,7 +1449,7 @@ private void manageFeatureMap(AbstractComponentEditor editor) {
 
 	}
 
-	public void registerEditor(EClass eClass, AbstractComponentEditor editor) {
+	public void registerEditor(EClass eClass, AbstractComponentEditor<?> editor) {
 		editors.put(eClass.getInstanceClassName(), editor);
 		manageFeatureMap(editor);
 	}
@@ -1569,10 +1570,10 @@ private void handleStructurePaste() {
 
 			EStructuralFeature feature = null;
 			EObject container = null;
-			if (parent instanceof VirtualEntry<?>) {
-				final VirtualEntry<?> v = (VirtualEntry<?>) parent;
+			if (parent instanceof VirtualEntry) {
+				final VirtualEntry<EObject, ?> v = (VirtualEntry<EObject, ?>) parent;
 				feature = ((IEMFProperty) v.getProperty()).getStructuralFeature();
-				container = (EObject) v.getOriginalParent();
+				container = v.getOriginalParent();
 			} else if (parent instanceof EObject) {
 				container = (EObject) parent;
 				if (container instanceof MElementContainer<?>) {
@@ -1760,18 +1761,20 @@ private void handleStructureCut() {
 		}
 	}
 
-	public class ObservableFactoryImpl implements IObservableFactory {
+	public class ObservableFactoryImpl implements IObservableFactory<Object, IObservableList<Object>> {
 
+		@SuppressWarnings("unchecked")
 		@Override
-		public IObservable createObservable(Object target) {
+		public IObservableList<Object> createObservable(Object target) {
 			if (target instanceof IObservableList) {
-				return new WritableList((List<?>) target, Object.class);
-			} else if (target instanceof VirtualEntry<?>) {
-				return ((VirtualEntry<?>) target).getList();
+				return new WritableList<>((List<Object>) target, Object.class);
+			} else if (target instanceof VirtualEntry) {
+				return ((VirtualEntry<?, Object>) target).getList();
 			} else {
-				final AbstractComponentEditor editor = getEditor(((EObject) target).eClass());
+				final AbstractComponentEditor<EObject> editor = (AbstractComponentEditor<EObject>) getEditor(
+						((EObject) target).eClass());
 				if (editor != null) {
-					return editor.getChildList(target);
+					return (IObservableList<Object>) editor.getChildList(target);
 				}
 			}
 
@@ -1831,12 +1834,13 @@ public boolean performSingleDrop(Object data) {
 				if (getCurrentTarget() instanceof MElementContainer<?>) {
 					feature = UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN;
 					parent = (EObject) getCurrentTarget();
-				} else if (getCurrentTarget() instanceof VirtualEntry<?>) {
-					final VirtualEntry<?> entry = (VirtualEntry<?>) getCurrentTarget();
-					final IListProperty prop = entry.getProperty();
+				} else if (getCurrentTarget() instanceof VirtualEntry) {
+
+					final VirtualEntry<EObject, ?> entry = (VirtualEntry<EObject, ?>) getCurrentTarget();
+					final IListProperty<?, ?> prop = entry.getProperty();
 					if (prop instanceof IEMFProperty) {
 						feature = ((IEMFProperty) prop).getStructuralFeature();
-						parent = (EObject) entry.getOriginalParent();
+						parent = entry.getOriginalParent();
 
 					}
 				} else if (getCurrentTarget() instanceof EObject) {
@@ -1870,9 +1874,9 @@ public boolean performSingleDrop(Object data) {
 				if (item != null) {
 					final TreeItem parentItem = item.getParentItem();
 					if (parentItem != null) {
-						if (parentItem.getData() instanceof VirtualEntry<?>) {
-							final VirtualEntry<?> vE = (VirtualEntry<?>) parentItem.getData();
-							parent = (EObject) vE.getOriginalParent();
+						if (parentItem.getData() instanceof VirtualEntry) {
+							final VirtualEntry<EObject, ?> vE = (VirtualEntry<EObject, ?>) parentItem.getData();
+							parent = vE.getOriginalParent();
 							feature = ((IEMFProperty) vE.getProperty()).getStructuralFeature();
 						} else if (parentItem.getData() instanceof MElementContainer<?>) {
 							parent = (EObject) parentItem.getData();
@@ -2018,13 +2022,13 @@ private boolean isValidTarget(Object target, Object instance, boolean isIndex) {
 						UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN.getEGenericType());
 				return classifier.isInstance(instance);
 			}
-		} else if (target instanceof VirtualEntry<?>) {
+		} else if (target instanceof VirtualEntry) {
 			@SuppressWarnings("unchecked")
-			final VirtualEntry<Object> vTarget = (VirtualEntry<Object>) target;
+			final VirtualEntry<EObject, ?> vTarget = (VirtualEntry<EObject, ?>) target;
 			if (isIndex || !vTarget.getList().contains(instance)) {
 				if (vTarget.getProperty() instanceof IEMFProperty) {
 					final EStructuralFeature feature = ((IEMFProperty) vTarget.getProperty()).getStructuralFeature();
-					final EObject parent = (EObject) vTarget.getOriginalParent();
+					final EObject parent = vTarget.getOriginalParent();
 					final EClassifier classifier = ModelUtils.getTypeArgument(parent.eClass(),
 							feature.getEGenericType());
 					return classifier.isInstance(instance);
@@ -2065,8 +2069,8 @@ public void gotoEObject(int targetHint, EObject object) {
 			switch (targetHint) {
 			case TAB_FORM:
 				// make sure tree node has been instantiated
-				final ObservableListTreeContentProvider provider = (ObservableListTreeContentProvider) viewer
-				.getContentProvider();
+				final ObservableListTreeContentProvider<?> provider = (ObservableListTreeContentProvider<?>) viewer
+						.getContentProvider();
 				getFirstMatchingItem(object, provider, provider.getChildren(viewer.getInput()));
 
 				viewer.reveal(object);
@@ -2099,7 +2103,7 @@ public void gotoEObject(int targetHint, EObject object) {
 
 	// This will ensure the provider has created the tree node (so we can reveal
 	// it).
-	private Object getFirstMatchingItem(EObject target, ObservableListTreeContentProvider provider, Object[] items) {
+	private Object getFirstMatchingItem(EObject target, ObservableListTreeContentProvider<?> provider, Object[] items) {
 		for (int i = 0; i < items.length; i++) {
 			if (items[i] == target) {
 				return items[i];
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
index efa99ae0f6..5990e7b5cd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
@@ -16,6 +16,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.common.xml.EMFDocumentResourceMediator;
 import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
@@ -48,9 +49,9 @@ public TreeViewerEx(Composite parent, int style, EMFDocumentResourceMediator emf
 			public void documentChanged(DocumentEvent event) {
 				try {
 					// restore Nodes from XmiIds
-					E4XMIResource xmiResource = (E4XMIResource) ((EObject) modelProvider.getRoot().get(0)).eResource();
+					E4XMIResource xmiResource = (E4XMIResource) modelProvider.getRoot().get(0).eResource();
 					ArrayList<Object> newElements = new ArrayList<>();
-					ObservableListTreeContentProvider provider = (ObservableListTreeContentProvider) getContentProvider();
+					ObservableListTreeContentProvider<?> provider = (ObservableListTreeContentProvider<?>) getContentProvider();
 					Object[] children = new Object[] { modelProvider.getRoot().get(0) };
 					for (String id : elementsIds) {
 						EObject eObject = xmiResource.getEObject(id);
@@ -90,7 +91,7 @@ private void reloadIds(final IModelResource modelProvider) {
 					// Stash XmiIds
 					Object[] elements = getExpandedElements();
 					List<?> selected = ((IStructuredSelection) getSelection()).toList();
-					E4XMIResource xmiResource = (E4XMIResource) ((EObject) modelProvider.getRoot().get(0)).eResource();
+					E4XMIResource xmiResource = (E4XMIResource) modelProvider.getRoot().get(0).eResource();
 					elementsIds = new ArrayList<>();
 					selectedIds = new ArrayList<>();
 					for (Object obj : elements) {
@@ -112,7 +113,8 @@ private void reloadIds(final IModelResource modelProvider) {
 
 	// This will ensure the provider has created the tree node (so we can reveal
 	// it).
-	static public Object getFirstMatchingItem(EObject target, ObservableListTreeContentProvider provider, Object[] items) {
+	static public Object getFirstMatchingItem(EObject target, ObservableListTreeContentProvider<?> provider,
+			Object[] items) {
 		for (int i = 0; i < items.length; i++) {
 			if (items[i] == target) {
 				return items[i];
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
index d25932dba2..7c26874865 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
@@ -23,26 +23,30 @@
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.property.list.IListProperty;
 
-public abstract class VirtualEntry<M> {
+/**
+ * @param <P> type of the parent object
+ * @param <E> type of the child elements of the parent
+ */
+public class VirtualEntry<P, E> {
 	private String id;
-	private Object originalParent;
+	private P originalParent;
 	private String label;
-	private IObservableList list;
-	private IListProperty property;
+	private IObservableList<E> list;
+	private IListProperty<? super P, E> property;
 
-	public VirtualEntry(String id, IListProperty property, Object originalParent, String label) {
+	public VirtualEntry(String id, IListProperty<? super P, E> property, P originalParent, String label) {
 		this.id = id;
 		this.originalParent = originalParent;
 		this.label = label;
 		this.property = property;
-		this.list = new WritableList();
-		final IObservableList origList = property.observe(originalParent);
+		this.list = new WritableList<>();
+		final IObservableList<E> origList = property.observe(originalParent);
 		list.addAll(cleanedList(origList));
 
-		final IListChangeListener listener = event -> {
+		final IListChangeListener<E> listener = event -> {
 			if (!VirtualEntry.this.list.isDisposed()) {
-				List<Object> clean = cleanedList(event.getObservableList());
-				ListDiff diff = Diffs.computeListDiff(VirtualEntry.this.list, clean);
+				List<E> clean = cleanedList(event.getObservableList());
+				ListDiff<E> diff = Diffs.computeListDiff(VirtualEntry.this.list, clean);
 				diff.applyTo(VirtualEntry.this.list);
 			}
 		};
@@ -50,16 +54,15 @@ public VirtualEntry(String id, IListProperty property, Object originalParent, St
 		origList.addListChangeListener(listener);
 	}
 
-	public IListProperty getProperty() {
+	public IListProperty<? super P, E> getProperty() {
 		return property;
 	}
 
-	@SuppressWarnings("unchecked")
-	private List<Object> cleanedList(IObservableList list) {
-		List<Object> l = new ArrayList<>(list.size());
+	private List<E> cleanedList(IObservableList<? extends E> list) {
+		List<E> l = new ArrayList<>(list.size());
 
-		for (Object o : list) {
-			if (accepted((M) o)) {
+		for (E o : list) {
+			if (accepted(o)) {
 				l.add(o);
 			}
 		}
@@ -67,13 +70,18 @@ private List<Object> cleanedList(IObservableList list) {
 		return l;
 	}
 
-	protected abstract boolean accepted(M o);
+	/**
+	 * Can be overridden to filter the child elements.
+	 */
+	protected boolean accepted(E o) {
+		return true;
+	}
 
-	public IObservableList getList() {
+	public IObservableList<E> getList() {
 		return list;
 	}
 
-	public Object getOriginalParent() {
+	public P getOriginalParent() {
 		return originalParent;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index f261d2f128..172c5559c4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -25,6 +25,7 @@
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
 import org.eclipse.e4.ui.model.application.MAddon;
@@ -32,10 +33,9 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -46,8 +46,9 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Text;
 
-public class AddonsEditor extends AbstractComponentEditor {
+public class AddonsEditor extends AbstractComponentEditor<MAddon> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
@@ -118,11 +119,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MAddon) object);
 		return composite;
 	}
 
-	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master,
+	protected Composite createForm(Composite parent, EMFDataBindingContext context,
+			IObservableValue<MAddon> master,
 			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
@@ -132,7 +134,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -145,9 +147,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-
+				E4Properties.elementId(getEditingDomain()));
 
 		ControlFactory.createClassURIField(parent, Messages, this, Messages.AddonsEditor_ClassURI,
 				ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
@@ -192,7 +192,7 @@ private void createInstanceInspection(CTabFolder folder) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index b8b643143a..1fefd724eb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -25,10 +25,10 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
@@ -40,7 +40,6 @@
 import org.eclipse.e4.ui.model.application.commands.MKeyBinding;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
-import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
@@ -49,15 +48,13 @@
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.CompoundCommand;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.resource.FontDescriptor;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -83,39 +80,11 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class ApplicationEditor extends AbstractComponentEditor {
+public class ApplicationEditor extends AbstractComponentEditor<MApplication> {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
 
-	private final IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties
-			.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
-	private final IListProperty BINDING_CONTAINER__BINDINGS = EMFProperties
-			.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES);
-	private final IListProperty APPLICATION__COMMANDS = EMFProperties
-			.list(ApplicationPackageImpl.Literals.APPLICATION__COMMANDS);
-	// private IListProperty APPLICATION__DIALOGS =
-	// EMFProperties.list(ApplicationPackageImpl.Literals.APPLICATION__DIALOGS);
-	private final IListProperty PART_DESCRIPTOR_CONTAINER__DESCRIPTORS = EMFProperties
-			.list(BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS);
-	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private final IListProperty APPLICATION__ADDONS = EMFProperties
-			.list(ApplicationPackageImpl.Literals.APPLICATION__ADDONS);
-	private final IListProperty MENU_CONTRIBUTIONS = EMFProperties
-			.list(MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS);
-	private final IListProperty TOOLBAR_CONTRIBUTIONS = EMFProperties
-			.list(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS);
-	private final IListProperty TRIM_CONTRIBUTIONS = EMFProperties
-			.list(MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS);
-	private final IListProperty APPLICATION__SNIPPETS = EMFProperties
-			.list(UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS);
-	private final IListProperty APPLICATION__CATEGORIES = EMFProperties
-			.list(ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES);
-
-	private final IListProperty BINDING_TABLE_CONTAINER__ROOT_CONTEXT = EMFProperties
-			.list(CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT);
-
 	@Inject
 	@Optional
 	private IProject project;
@@ -143,8 +112,7 @@ public List<Action> getActions(Object element) {
 	}
 
 	void doCreateCommandWizard() {
-		final WizardDialog dialog = new WizardDialog(composite.getShell(), new CommandWizard((MApplication) getMaster()
-				.getValue()));
+		final WizardDialog dialog = new WizardDialog(composite.getShell(), new CommandWizard(getMaster().getValue()));
 		dialog.open();
 	}
 
@@ -169,7 +137,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context);
 		}
-		getMaster().setValue(object);
+		getMaster().setValue((MApplication) object);
 
 		return composite;
 	}
@@ -183,25 +151,22 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.ApplicationEditor_BindingContexts);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties,
 				UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -210,8 +175,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context)
 		item.setControl(parent.getParent());
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-				context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables,
 				UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.AddonsEditor_Tags,
@@ -244,118 +208,34 @@ private void createUITreeInspection(CTabFolder folder) {
 	}
 
 	@Override
-	public IObservableList getChildList(final Object element) {
-		final WritableList list = new WritableList();
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_ADDONS, APPLICATION__ADDONS, element,
-				Messages.ApplicationEditor_Addons) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_ROOT_CONTEXTS, BINDING_TABLE_CONTAINER__ROOT_CONTEXT,
-				element, Messages.ApplicationEditor_RootContexts) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_BINDING_TABLE, BINDING_CONTAINER__BINDINGS, element,
-				Messages.ApplicationEditor_BindingTables) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element,
-				Messages.ApplicationEditor_Handlers) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_COMMAND, APPLICATION__COMMANDS, element,
-				Messages.ApplicationEditor_Commands) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-		});
-
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_CATEGORIES, APPLICATION__CATEGORIES, element,
-				Messages.ApplicationEditor_Categories) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-		});
-
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_APPLICATION_WINDOWS, ELEMENT_CONTAINER__CHILDREN,
-				element, Messages.ApplicationEditor_Windows) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PART_DESCRIPTORS, PART_DESCRIPTOR_CONTAINER__DESCRIPTORS,
-				element, Messages.ApplicationEditor_PartDescriptors) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MENU_CONTRIBUTIONS, MENU_CONTRIBUTIONS, element,
-				Messages.ApplicationEditor_MenuContributions) {
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-		});
-
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_TOOLBAR_CONTRIBUTIONS, TOOLBAR_CONTRIBUTIONS, element,
-				Messages.ApplicationEditor_ToolBarContributions) {
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-		});
-
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_TRIM_CONTRIBUTIONS, TRIM_CONTRIBUTIONS, element,
-				Messages.ApplicationEditor_TrimContributions) {
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-		});
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_SNIPPETS, APPLICATION__SNIPPETS, element,
-				Messages.ApplicationEditor_Snippets) {
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-		});
-		//
-		// MApplication application = (MApplication) element;
+	public IObservableList<?> getChildList(final Object element) {
+		final WritableList<VirtualEntry<MApplication, ?>> list = new WritableList<>();
+
+		MApplication application = (MApplication) element;
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_ADDONS, E4Properties.addons(), application,
+				Messages.ApplicationEditor_Addons));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_ROOT_CONTEXTS, E4Properties.rootContext(), application,
+				Messages.ApplicationEditor_RootContexts));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_BINDING_TABLE, E4Properties.bindingTables(), application,
+				Messages.ApplicationEditor_BindingTables));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_HANDLER, E4Properties.handlers(), application,
+				Messages.ApplicationEditor_Handlers));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_COMMAND, E4Properties.applicationCommands(), application,
+				Messages.ApplicationEditor_Commands));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_CATEGORIES, E4Properties.categories(), application,
+				Messages.ApplicationEditor_Categories));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_APPLICATION_WINDOWS, E4Properties.children(), application,
+				Messages.ApplicationEditor_Windows));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_PART_DESCRIPTORS, E4Properties.descriptors(), application,
+				Messages.ApplicationEditor_PartDescriptors));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_MENU_CONTRIBUTIONS, E4Properties.menuContributions(),
+				application, Messages.ApplicationEditor_MenuContributions));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_TOOLBAR_CONTRIBUTIONS, E4Properties.toolBarContributions(),
+				application, Messages.ApplicationEditor_ToolBarContributions));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_TRIM_CONTRIBUTIONS, E4Properties.trimContributions(),
+				application, Messages.ApplicationEditor_TrimContributions));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_SNIPPETS, E4Properties.snippets(), application,
+				Messages.ApplicationEditor_Snippets));
 		// if (application.getRootContext() != null) {
 		// list.add(0, application.getRootContext());
 		// }
@@ -766,7 +646,7 @@ public void update(ViewerCell cell) {
 
 			String label = ""; //$NON-NLS-1$
 			Image img = null;
-			AbstractComponentEditor elementEditor = getEditor().getEditor(o.eClass());
+			AbstractComponentEditor<?> elementEditor = getEditor().getEditor(o.eClass());
 			if (elementEditor != null) {
 				label = elementEditor.getDetailLabel(o);
 				label = label == null ? elementEditor.getLabel(o) : label;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 9d818a7c7f..72548b3339 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -24,42 +24,39 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AreaIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
-import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainerElement;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
-import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -81,13 +78,10 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class AreaEditor extends AbstractComponentEditor {
+public class AreaEditor extends AbstractComponentEditor<MArea> {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-
-	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 
 	private final List<Action> actions = new ArrayList<>();
@@ -190,11 +184,11 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MArea) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
+	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue<MArea> master,
 			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
@@ -208,7 +202,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -217,12 +211,11 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.AreaEditor_LabelLabel, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
+				E4Properties.label(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.AreaEditor_Tooltip, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
+				E4Properties.tooltip(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		{
@@ -233,10 +226,8 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(
-					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
-							master));
+			context.bindValue(textProp.observeDelayed(200, t),
+					E4Properties.iconUri(getEditingDomain()).observeDetail(master));
 
 			new ImageTooltip(t, Messages, this);
 
@@ -245,7 +236,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final AreaIconDialogEditor dialog = new AreaIconDialogEditor(b.getShell(), eclipseContext, project,
-							getEditingDomain(), (MApplicationElement) getMaster().getValue(), Messages);
+							getEditingDomain(), getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -270,15 +261,16 @@ public String getText(Object element) {
 				}
 			});
 			viewer.setInput(new Boolean[] { Boolean.TRUE, Boolean.FALSE });
-			final IViewerValueProperty vProp = ViewerProperties.singleSelection();
+			final IViewerValueProperty<ComboViewer, Boolean> vProp = ViewerProperties.singleSelection();
+
 			context.bindValue(vProp.observe(viewer),
-					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL)
-					.observeDetail(getMaster()));
+					E4Properties.horizontal(getEditingDomain()).observeDetail(getMaster()));
 		}
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.AreaEditor_SelectedElement);
+
 		ControlFactory.createTextField(parent, Messages.AreaEditor_ContainerData, getMaster(), context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
+				E4Properties.containerData(getEditingDomain()));
 
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, this,
@@ -294,8 +286,7 @@ protected void addPressed() {
 
 			final TableViewer viewer = pickList.getList();
 
-			final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(getMaster()));
+			viewer.setInput(E4Properties.<MPartSashContainerElement>children().observeDetail(getMaster()));
 
 			pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
 			pickList.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER,
@@ -306,11 +297,9 @@ protected void addPressed() {
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.selection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.selection(), E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -319,8 +308,7 @@ protected void addPressed() {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-				context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
@@ -364,8 +352,8 @@ protected void handleAddChild(EClass eClass) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	public IObservableList<?> getChildList(Object element) {
+		return E4Properties.<MPartSashContainerElement>children().observe((MArea) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 3ed260fe6c..cfb1ed7f31 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -24,9 +24,9 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
@@ -36,15 +36,12 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
@@ -55,14 +52,13 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Text;
 
-public class BindingContextEditor extends AbstractComponentEditor {
+public class BindingContextEditor extends AbstractComponentEditor<MBindingContext> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
 	private StackLayout stackLayout;
-	private final IListProperty BINDING_CONTEXT__CHILDREN = EMFProperties
-			.list(CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
 
 	private final List<Action> actions = new ArrayList<>();
 
@@ -143,13 +139,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MBindingContext) object);
 		enableIdGenerator(CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue<MBindingContext> master,
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -158,7 +155,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -171,13 +168,12 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Name, null, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__NAME),
-				Messages.BindingContextEditor_NameWarning, FieldDecorationRegistry.DEC_ERROR);
-		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Description, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__DESCRIPTION));
+				E4Properties.bindingContextName(getEditingDomain()), Messages.BindingContextEditor_NameWarning,
+				FieldDecorationRegistry.DEC_ERROR);
+		ControlFactory.createTextField(parent, Messages.BindingContextEditor_Description,
+				master, context, textProp, E4Properties.description(getEditingDomain()));
 
 		final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
 				this, CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN) {
@@ -195,9 +191,8 @@ protected List<?> getContainerChildren(Object master) {
 		pickList.setText(Messages.BindingContextEditor_Subcontexts);
 
 		final TableViewer viewer = pickList.getList();
-		final IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(),
-				CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
-		viewer.setInput(prop.observeDetail(master));
+
+		viewer.setInput(E4Properties.bindingContextChildren(getEditingDomain()).observeDetail(master));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -218,8 +213,8 @@ protected List<?> getContainerChildren(Object master) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		return BINDING_CONTEXT__CHILDREN.observe(element);
+	public IObservableList<?> getChildList(Object element) {
+		return E4Properties.bindingContextChildren().observe((MBindingContext) element);
 	}
 
 	protected void handleAddContext() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 328b44d767..ce69275cfc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -24,9 +24,9 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
@@ -38,16 +38,13 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
@@ -64,13 +61,10 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class BindingTableEditor extends AbstractComponentEditor {
+public class BindingTableEditor extends AbstractComponentEditor<MBindingTable> {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-
-	private final IListProperty BINDING_TABLE__BINDINGS = EMFProperties
-			.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<>();
 
@@ -134,11 +128,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MBindingTable) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master,
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			IObservableValue<MBindingTable> master,
 			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
@@ -148,7 +143,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -169,10 +164,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			context.bindValue(
-					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(),
-							ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, t),
+					E4Properties.elementId(getEditingDomain()).observeDetail(getMaster()));
 		}
 
 		{
@@ -183,12 +176,16 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			final Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
-			context.bindValue(
-					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(
-							getEditingDomain(),
-							FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT,
-									ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
+
+			//			@SuppressWarnings("unchecked")
+			//			IValueProperty<MBindingTable, String> elemId = EMFEditProperties.value(getEditingDomain(),
+			//					FeaturePath.fromList(CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT,
+			//							ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+			//			context.bindValue(textProp.observeDelayed(200, t), elemId.observeDetail(getMaster()));
+
+			// TODO: Verify that this works
+			context.bindValue(textProp.observeDelayed(200, t), E4Properties.bindingContext()
+					.value(E4Properties.elementId(getEditingDomain())).observeDetail(getMaster()));
 
 			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
@@ -225,8 +222,7 @@ protected List<?> getContainerChildren(Object master) {
 
 			final TableViewer viewer = pickList.getList();
 
-			final IEMFListProperty prop = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
-			viewer.setInput(prop.observeDetail(getMaster()));
+			viewer.setInput(E4Properties.bindings().observeDetail(getMaster()));
 		}
 
 		item = new CTabItem(folder, SWT.NONE);
@@ -248,8 +244,8 @@ protected List<?> getContainerChildren(Object master) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		return BINDING_TABLE__BINDINGS.observe(element);
+	public IObservableList<?> getChildList(Object element) {
+		return E4Properties.bindings().observe((MBindingTable) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index 6db87576a3..9df337562c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -21,15 +21,15 @@
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.ui.model.application.commands.MCategory;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -37,8 +37,9 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Text;
 
-public class CategoryEditor extends AbstractComponentEditor {
+public class CategoryEditor extends AbstractComponentEditor<MCategory> {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
@@ -98,13 +99,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MCategory) object);
 		enableIdGenerator(CommandsPackageImpl.Literals.CATEGORY__NAME,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master,
+	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue<MCategory> master,
 			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
@@ -114,7 +115,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -127,12 +128,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.CategoryEditor_Name, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__NAME));
+				E4Properties.categoryName(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.CategoryEditor_Description, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__DESCRIPTION));
+				E4Properties.categoryDescription(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -153,7 +153,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 6a35019172..a453701911 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -27,6 +27,7 @@
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
@@ -40,13 +41,11 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -62,7 +61,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class CommandEditor extends AbstractComponentEditor {
+public class CommandEditor extends AbstractComponentEditor<MCommand> {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
@@ -70,9 +69,6 @@ public class CommandEditor extends AbstractComponentEditor {
 	private final List<Action> actions = new ArrayList<>();
 	private MessageFormat newCommandParameterName;
 
-	private final IEMFEditListProperty COMMAND__PARAMETERS = EMFEditProperties.list(getEditingDomain(),
-			CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
-
 	@Inject
 	public CommandEditor() {
 		super();
@@ -135,13 +131,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MCommand) object);
 		enableIdGenerator(CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master,
+	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue<MCommand> master,
 			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
@@ -151,7 +147,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -164,13 +160,12 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id,
-				Messages.ModelTooling_CommandId_tooltip, master, context, textProp, EMFEditProperties.value(
-						getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID),
-				Messages.ModelTooling_Empty_Warning);
+				Messages.ModelTooling_CommandId_tooltip, master, context, textProp,
+				E4Properties.elementId(getEditingDomain()), Messages.ModelTooling_Empty_Warning);
 		ControlFactory.createTextField(parent, Messages.CommandEditor_Name, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__COMMAND_NAME));
+				E4Properties.commandName(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.CommandEditor_LabelDescription, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND__DESCRIPTION));
+				E4Properties.commandDescription(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		{
@@ -183,19 +178,16 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			t.setEditable(false);
-			context.bindValue(
-					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(
-							getEditingDomain(),
-							FeaturePath.fromList(CommandsPackageImpl.Literals.COMMAND__CATEGORY,
-									ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID)).observeDetail(getMaster()));
+			// TODO: Verify that this works
+			context.bindValue(textProp.observeDelayed(200, t), E4Properties.category()
+					.value(E4Properties.elementId(getEditingDomain())).observeDetail(getMaster()));
 
 			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final CommandCategorySelectionDialog dialog = new CommandCategorySelectionDialog(b.getShell(),
-							getEditor().getModelProvider(), (MCommand) getMaster().getValue(), Messages);
+							getEditor().getModelProvider(), getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -221,9 +213,7 @@ protected List<?> getContainerChildren(Object master) {
 
 			final TableViewer viewer = pickList.getList();
 
-			final IEMFEditListProperty mProp = EMFEditProperties.list(getEditingDomain(),
-					CommandsPackageImpl.Literals.COMMAND__PARAMETERS);
-			viewer.setInput(mProp.observeDetail(getMaster()));
+			viewer.setInput(E4Properties.commandParameters(getEditingDomain()).observeDetail(getMaster()));
 		}
 
 		item = new CTabItem(folder, SWT.NONE);
@@ -245,8 +235,8 @@ protected List<?> getContainerChildren(Object master) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		return COMMAND__PARAMETERS.observe(element);
+	public IObservableList<?> getChildList(Object element) {
+		return E4Properties.commandParameters(getEditingDomain()).observe((MCommand) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 6222e05a8a..6463825fff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -20,17 +20,16 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.ui.model.application.commands.MCommandParameter;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -41,8 +40,9 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
-public class CommandParameterEditor extends AbstractComponentEditor {
+public class CommandParameterEditor extends AbstractComponentEditor<MCommandParameter> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
@@ -114,11 +114,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MCommandParameter) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MCommandParameter> master, boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -127,7 +128,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -140,12 +141,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID),
-				Messages.ModelTooling_Empty_Warning);
+				E4Properties.elementId(getEditingDomain()), Messages.ModelTooling_Empty_Warning);
 		ControlFactory.createTextField(parent, Messages.CommandParameterEditor_Name, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME),
-				Messages.ModelTooling_Empty_Warning);
+				E4Properties.commandParameterName(getEditingDomain()), Messages.ModelTooling_Empty_Warning);
 
 		{
 			final Label l = new Label(parent, SWT.NONE);
@@ -155,11 +153,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
 
-			final IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(),
-					CommandsPackageImpl.Literals.COMMAND_PARAMETER__OPTIONAL);
-			final IWidgetValueProperty uiProp = WidgetProperties.selection();
+			final IWidgetValueProperty<Button, Boolean> uiProp = WidgetProperties.buttonSelection();
 
-			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
+			context.bindValue(uiProp.observe(checkbox),
+					E4Properties.optional(getEditingDomain()).observeDetail(master));
 		}
 
 		item = new CTabItem(folder, SWT.NONE);
@@ -181,7 +178,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index e9a8b82c7b..9b3a75dffc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -8,7 +8,6 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
@@ -16,6 +15,7 @@
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.FeatureClassLabelProvider;
@@ -25,19 +25,16 @@
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.tools.emf.ui.internal.imp.RegistryUtil;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MCompositePart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainerElement;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -45,10 +42,10 @@
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
 import org.eclipse.jface.resource.FontDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
@@ -77,13 +74,9 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-public class CompositePartEditor extends AbstractComponentEditor {
-
+public class CompositePartEditor extends AbstractComponentEditor<MCompositePart> {
 	private Composite composite;
 	private EMFDataBindingContext context;
-
-	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<>();
 	private final List<Action> actionsImport = new ArrayList<>();
@@ -214,12 +207,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MCompositePart) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
-			boolean isImport) {
+	private Composite createForm(Composite parent, final EMFDataBindingContext context,
+			WritableValue<MCompositePart> master, boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -232,7 +225,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -241,15 +234,13 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-				context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.CompositePartEditor_LabelLabel, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
+				E4Properties.label(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.CompositePartEditor_Tooltip, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
+				E4Properties.tooltip(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		{
@@ -261,10 +252,8 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(
-					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
-							master));
+			context.bindValue(textProp.observeDelayed(200, t),
+					E4Properties.iconUri(getEditingDomain()).observeDetail(master));
 
 			new ImageTooltip(t, Messages, this);
 
@@ -273,7 +262,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), eclipseContext, project,
-							getEditingDomain(), (MPart) getMaster().getValue(), Messages);
+							getEditingDomain(), getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -298,15 +287,14 @@ public String getText(Object element) {
 				}
 			});
 			viewer.setInput(new Boolean[] { Boolean.TRUE, Boolean.FALSE });
-			final IViewerValueProperty vProp = ViewerProperties.singleSelection();
+			final IViewerValueProperty<ComboViewer, Boolean> vProp = ViewerProperties.singleSelection(Boolean.class);
 			context.bindValue(vProp.observe(viewer),
-					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL)
-					.observeDetail(getMaster()));
+					E4Properties.horizontal(getEditingDomain()).observeDetail(getMaster()));
 		}
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.CompositePartEditor_SelectedElement);
 		ControlFactory.createTextField(parent, Messages.CompositePartEditor_ContainerData, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
+				E4Properties.containerData(getEditingDomain()));
 
 		{
 
@@ -359,16 +347,14 @@ public void widgetSelected(SelectionEvent e) {
 			final TableViewer viewer = new TableViewer(parent);
 			final GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1);
 			viewer.getControl().setLayoutData(gd);
-			final ObservableListContentProvider cp = new ObservableListContentProvider();
-			viewer.setContentProvider(cp);
+			viewer.setContentProvider(new ObservableListContentProvider<>());
 
 			final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont())
 					.setStyle(SWT.ITALIC);
 			viewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
 					new ComponentLabelProvider(getEditor(), Messages, italicFontDescriptor)));
 
-			final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(getMaster()));
+			viewer.setInput(E4Properties.<MPartSashContainerElement>children().observeDetail(getMaster()));
 
 			new Label(parent, SWT.NONE);
 
@@ -386,8 +372,7 @@ public void widgetSelected(SelectionEvent e) {
 						final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 						if (s.size() == 1) {
 							final Object obj = s.getFirstElement();
-							final MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							final int idx = container.getChildren().indexOf(obj) - 1;
+							final int idx = getMaster().getValue().getChildren().indexOf(obj) - 1;
 							if (idx >= 0) {
 								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor()
 										.isLiveModel(), idx)) {
@@ -410,9 +395,8 @@ public void widgetSelected(SelectionEvent e) {
 						final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
 						if (s.size() == 1) {
 							final Object obj = s.getFirstElement();
-							final MElementContainer<?> container = (MElementContainer<?>) getMaster().getValue();
-							final int idx = container.getChildren().indexOf(obj) + 1;
-							if (idx < container.getChildren().size()) {
+							final int idx = getMaster().getValue().getChildren().indexOf(obj) + 1;
+							if (idx < getMaster().getValue().getChildren().size()) {
 								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor()
 										.isLiveModel(), idx)) {
 									viewer.setSelection(new StructuredSelection(obj));
@@ -444,11 +428,9 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -486,8 +468,8 @@ private void createUITreeInspection(CTabFolder folder) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	public IObservableList<?> getChildList(Object element) {
+		return E4Properties.<MPartSashContainerElement>children().observe((MCompositePart) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index f603b5ae1b..9e53bef960 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -26,6 +26,8 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.map.IObservableMap;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.property.list.IListProperty;
+import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.databinding.validation.IValidator;
 import org.eclipse.core.databinding.validation.ValidationStatus;
 import org.eclipse.core.resources.IProject;
@@ -36,6 +38,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
@@ -51,19 +54,19 @@
 import org.eclipse.e4.ui.internal.workbench.E4XMIResource;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.MContribution;
+import org.eclipse.e4.ui.model.application.commands.MBindings;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationFactoryImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.util.BasicEMap;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -72,11 +75,11 @@
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
-import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.fieldassist.ControlDecoration;
@@ -160,7 +163,7 @@ public boolean validate(String text) {
 		}
 	}
 
-	public static void createXMIId(Composite parent, AbstractComponentEditor editor) {
+	public static <M> void createXMIId(Composite parent, AbstractComponentEditor<M> editor) {
 		final Label l = new Label(parent, SWT.NONE);
 		l.setText("XMI:ID"); //$NON-NLS-1$
 		l.setLayoutData(new GridData());
@@ -174,7 +177,7 @@ public static void createXMIId(Composite parent, AbstractComponentEditor editor)
 		TextPasteHandler.createFor(t);
 
 		editor.getMaster().addValueChangeListener(event -> {
-			final Object val = event.diff.getNewValue();
+			final M val = event.diff.getNewValue();
 			if (val != null && val instanceof EObject && !t.isDisposed()) {
 				final Resource res = ((EObject) val).eResource();
 				if (res instanceof E4XMIResource) {
@@ -188,12 +191,12 @@ public static void createXMIId(Composite parent, AbstractComponentEditor editor)
 	}
 
 	public static Composite createMapProperties(Composite parent, final Messages Messages,
-			final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
+			final AbstractComponentEditor<?> editor, String label, final EStructuralFeature feature, int vIndent) {
 		return createMapProperties(parent, Messages, editor, label, null, feature, vIndent);
 	}
 
 	public static Composite createMapProperties(Composite parent, final Messages messages,
-			final AbstractComponentEditor editor, String label, String tooltip, final EStructuralFeature feature,
+			final AbstractComponentEditor<?> editor, String label, String tooltip, final EStructuralFeature feature,
 			int vIndent) {
 
 		final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
@@ -260,8 +263,7 @@ protected void okPressed() {
 
 		final TableViewer tableviewer = pickList.getList();
 		tableviewer.getTable().setHeaderVisible(true);
-		final ObservableListContentProvider cp = new ObservableListContentProvider();
-		tableviewer.setContentProvider(cp);
+		tableviewer.setContentProvider(new ObservableListContentProvider<>());
 
 		final GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
 		gd.verticalIndent = vIndent;
@@ -357,26 +359,30 @@ protected boolean canEdit(Object element) {
 			}
 		});
 
-		final IEMFEditListProperty prop = EMFEditProperties.list(editor.getEditingDomain(), feature);
-		final IObservableList observableList = prop.observeDetail(editor.getMaster());
+		@SuppressWarnings("unchecked")
+		final IListProperty<Object, Object> prop = EMFEditProperties.list(editor.getEditingDomain(), feature);
+		final IObservableList<Object> observableList = prop.observeDetail(editor.getMaster());
 		tableviewer.setInput(observableList);
 		observableList.addListChangeListener(event -> tableviewer.getTable().getColumn(0).pack());
 
 		return pickList;
 	}
 
-	public static void createTextField(Composite parent, String label, IObservableValue master,
-			EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp) {
+	public static <M> void createTextField(Composite parent, String label, IObservableValue<M> master,
+			EMFDataBindingContext context, IWidgetValueProperty<Text, String> textProp,
+			IValueProperty<? super M, String> modelProp) {
 		createTextField(parent, label, null, master, context, textProp, modelProp, null);
 	}
 
-	public static void createTextField(Composite parent, String label, String tooltip, IObservableValue master,
-			EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp) {
+	public static <M> void createTextField(Composite parent, String label, String tooltip, IObservableValue<M> master,
+			EMFDataBindingContext context, IWidgetValueProperty<Text, String> textProp,
+			IValueProperty<? super M, String> modelProp) {
 		createTextField(parent, label, tooltip, master, context, textProp, modelProp, null);
 	}
 
-	public static void createTextField(Composite parent, String label, IObservableValue master,
-			EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp,
+	public static <M> void createTextField(Composite parent, String label, IObservableValue<M> master,
+			EMFDataBindingContext context, IWidgetValueProperty<Text, String> textProp,
+			IValueProperty<? super M, String> modelProp,
 			final String warningText) {
 		createTextField(parent, label, null, master, context, textProp, modelProp, warningText);
 	}
@@ -393,8 +399,9 @@ public static void createTextField(Composite parent, String label, IObservableVa
 	 *            Non null warningText means that a warning with this non-null text
 	 *            will be shown when the field is left empty
 	 */
-	public static void createTextField(Composite parent, String label, String tooltip, IObservableValue master,
-			EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp,
+	public static <M> void createTextField(Composite parent, String label, String tooltip, IObservableValue<M> master,
+			EMFDataBindingContext context, IWidgetValueProperty<Text, String> textProp,
+			IValueProperty<? super M, String> modelProp,
 			final String warningText) {
 		createTextField(parent, label, tooltip, master, context, textProp, modelProp, warningText,
 				FieldDecorationRegistry.DEC_WARNING);
@@ -418,8 +425,9 @@ public static void createTextField(Composite parent, String label, String toolti
 	 *            FieldDecorationRegistry.DEC_INFORMATION
 	 *
 	 */
-	public static void createTextField(Composite parent, String label, String tooltip, IObservableValue master,
-			EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp,
+	public static <M> void createTextField(Composite parent, String label, String tooltip, IObservableValue<M> master,
+			EMFDataBindingContext context, IWidgetValueProperty<Text, String> textProp,
+			IValueProperty<? super M, String> modelProp,
 			final String decorationText, final String decorationType) {
 		final Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
@@ -439,7 +447,7 @@ public static void createTextField(Composite parent, String label, String toolti
 			final FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(
 					decorationType);
 			controlDecoration.setImage(fieldDecoration.getImage());
-			final IValidator iv = value -> {
+			final IValidator<Object> iv = value -> {
 				if (value == null) {
 					controlDecoration.show();
 					return ValidationStatus.warning(decorationText);
@@ -458,22 +466,24 @@ public static void createTextField(Composite parent, String label, String toolti
 				controlDecoration.hide();
 				return Status.OK_STATUS;
 			};
-			final UpdateValueStrategy acv = new UpdateValueStrategy().setAfterConvertValidator(iv);
+			final UpdateValueStrategy<String, String> acv = new UpdateValueStrategy<String, String>().setAfterConvertValidator(iv);
 			context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master), acv, acv);
 		} else {
 			context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master));
 		}
 	}
 
-	public static void createTranslatedTextField(Composite parent, String label, IObservableValue master,
-			EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp,
+	public static <M> void createTranslatedTextField(Composite parent, String label, IObservableValue<M> master,
+			EMFDataBindingContext context, IWidgetValueProperty<? super Text, String> textProp,
+			IValueProperty<? super M, String> modelProp,
 			IResourcePool resourcePool, IProject project) {
 		createTranslatedTextField(parent, label, null, master, context, textProp, modelProp, resourcePool, project);
 	}
 
-	public static void createTranslatedTextField(Composite parent, String label, String tooltip,
-			IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp,
-			IEMFEditValueProperty modelProp, IResourcePool resourcePool, IProject project) {
+	public static <M> void createTranslatedTextField(Composite parent, String label, String tooltip,
+			IObservableValue<M> master, EMFDataBindingContext context,
+			IWidgetValueProperty<? super Text, String> textProp,
+			IValueProperty<? super M, String> modelProp, IResourcePool resourcePool, IProject project) {
 		final Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
 		if (tooltip != null) {
@@ -518,8 +528,8 @@ private static IStatus getValidationStatus(String decorationType, String decorat
 
 
 	public static void createFindImport(Composite parent, final Messages Messages,
-			final AbstractComponentEditor editor, EMFDataBindingContext context) {
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+			final AbstractComponentEditor<? extends MApplicationElement> editor, EMFDataBindingContext context) {
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		final Label l = new Label(parent, SWT.NONE);
 		l.setText(Messages.ModelTooling_Common_RefId);
@@ -533,8 +543,7 @@ public static void createFindImport(Composite parent, final Messages Messages,
 
 		context.bindValue(
 				textProp.observeDelayed(200, t),
-				EMFEditProperties.value(editor.getEditingDomain(),
-						ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(editor.getMaster()));
+				E4Properties.elementId(editor.getEditingDomain()).observeDetail(editor.getMaster()));
 
 		Button b = ControlFactory.createFindButton(parent, editor.resourcePool);
 		b.addSelectionListener(new SelectionAdapter() {
@@ -547,8 +556,9 @@ public void widgetSelected(SelectionEvent e) {
 		});
 	}
 
-	public static void createSelectedElement(Composite parent, final AbstractComponentEditor editor,
-			final EMFDataBindingContext context, String label) {
+	public static <E extends MUIElement, M extends MElementContainer<E>> void createSelectedElement(
+			Composite parent, final AbstractComponentEditor<M> editor, final EMFDataBindingContext context,
+			String label) {
 		final Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
 		l.setLayoutData(new GridData());
@@ -557,31 +567,27 @@ public static void createSelectedElement(Composite parent, final AbstractCompone
 		final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 2;
 		viewer.getControl().setLayoutData(gd);
-		final IEMFEditListProperty listProp = EMFEditProperties.list(editor.getEditingDomain(),
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-		final IEMFEditValueProperty labelProp = EMFEditProperties.value(editor.getEditingDomain(),
-				UiPackageImpl.Literals.UI_LABEL__LABEL);
-		final IEMFEditValueProperty idProp = EMFEditProperties.value(editor.getEditingDomain(),
-				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
-
-		final IViewerValueProperty vProp = ViewerProperties.singleSelection();
+		final IViewerValueProperty<ComboViewer, E> vProp = ViewerProperties.singleSelection();
 
 		final Binding[] binding = new Binding[1];
-		final IObservableValue uiObs = vProp.observe(viewer);
-		final IObservableValue mObs = EMFEditProperties.value(editor.getEditingDomain(),
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(editor.getMaster());
+		final IObservableValue<E> uiObs = vProp.observe(viewer);
+		final IObservableValue<E> mObs = E4Properties.<E>selectedElement(editor.getEditingDomain())
+				.observeDetail(editor.getMaster());
 		editor.getMaster().addValueChangeListener(event -> {
 			if (binding[0] != null) {
 				binding[0].dispose();
 			}
-
 		});
 
-		final IObservableList list = listProp.observeDetail(editor.getMaster());
-		final ObservableListContentProvider cp = new ObservableListContentProvider();
+		final IObservableList<E> list = E4Properties.<E>children(editor.getEditingDomain())
+				.observeDetail(editor.getMaster());
+		final ObservableListContentProvider<E> cp = new ObservableListContentProvider<>();
 		viewer.setContentProvider(cp);
-		final IObservableMap[] attributeMaps = { labelProp.observeDetail(cp.getKnownElements()),
-				idProp.observeDetail(cp.getKnownElements()) };
+		@SuppressWarnings({ "unchecked", "rawtypes" })
+		final IObservableMap<?, ?>[] attributeMaps = {
+				// Cast, because MUILabel is not part of E's type
+				((IValueProperty) E4Properties.label(editor.getEditingDomain())).observeDetail(cp.getKnownElements()),
+				E4Properties.elementId(editor.getEditingDomain()).observeDetail(cp.getKnownElements()) };
 		viewer.setLabelProvider(new ObservableMapLabelProvider(attributeMaps) {
 			@Override
 			public String getText(Object element) {
@@ -612,12 +618,12 @@ public String getText(Object element) {
 	}
 
 	public static void createBindingContextWiget(Composite parent, final Messages Messages,
-			final AbstractComponentEditor editor, String label) {
+			final AbstractComponentEditor<? extends MBindings> editor, String label) {
 		createBindingContextWiget(parent, Messages, editor, label, null);
 	}
 
 	public static void createBindingContextWiget(Composite parent, final Messages Messages,
-			final AbstractComponentEditor editor, String label, String tooltip) {
+			final AbstractComponentEditor<? extends MBindings> editor, String label, String tooltip) {
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_ORDER,
 					PickListFeatures.NO_PICKER), editor, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS) {
@@ -637,19 +643,19 @@ protected void addPressed() {
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 
 			pickList.setText(label);
-			pickList.getList().setInput(
-					EMFProperties.list(CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS).observeDetail(
-							editor.getMaster()));
+			pickList.getList().setInput(E4Properties.contexts().observeDetail(editor.getMaster()));
 		}
 	}
 
 	public static Composite createStringListWidget(Composite parent, Messages Messages,
-			final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
+			final AbstractComponentEditor<? extends MApplicationElement> editor, String label,
+			final EStructuralFeature feature, int vIndent) {
 		return createStringListWidget(parent, Messages, editor, label, null, feature, vIndent);
 	}
 
 	public static Composite createStringListWidget(Composite parent, Messages Messages,
-			final AbstractComponentEditor editor, String label, String tooltip, final EStructuralFeature feature,
+			final AbstractComponentEditor<? extends MApplicationElement> editor, String label, String tooltip,
+			final EStructuralFeature feature,
 			int vIndent) {
 
 		final E4StringPickList pickList = new E4StringPickList(parent, SWT.NONE, null, editor, feature) {
@@ -682,7 +688,8 @@ public void keyPressed(KeyEvent e) {
 		final GridData gd = (GridData) viewer.getTable().getLayoutData();
 		gd.heightHint = 150;
 
-		final IEMFListProperty prop = EMFProperties.list(feature);
+		@SuppressWarnings("unchecked")
+		final IListProperty<Object, Object> prop = EMFProperties.list(feature);
 		viewer.setInput(prop.observeDetail(editor.getMaster()));
 
 		viewer.addSelectionChangedListener(event -> {
@@ -694,14 +701,15 @@ public void keyPressed(KeyEvent e) {
 		return pickList;
 	}
 
-	private static void handleAddText(AbstractComponentEditor editor, EStructuralFeature feature, Text tagText) {
+	private static void handleAddText(AbstractComponentEditor<? extends MApplicationElement> editor,
+			EStructuralFeature feature, Text tagText) {
 		if (tagText.getText().trim().length() > 0) {
 			final String[] tags = tagText.getText().split(";"); //$NON-NLS-1$
 			for (int i = 0; i < tags.length; i++) {
 				tags[i] = tags[i].trim();
 			}
 
-			final MApplicationElement appEl = (MApplicationElement) editor.getMaster().getValue();
+			final MApplicationElement appEl = editor.getMaster().getValue();
 			final Command cmd = AddCommand.create(editor.getEditingDomain(), appEl, feature, Arrays.asList(tags));
 			if (cmd.canExecute()) {
 				editor.getEditingDomain().getCommandStack().execute(cmd);
@@ -712,8 +720,8 @@ private static void handleAddText(AbstractComponentEditor editor, EStructuralFea
 
 	// This method is left in for reference purposes
 	@SuppressWarnings("unused")
-	private static void handleReplaceText(AbstractComponentEditor editor, EStructuralFeature feature, Text tagText,
-			TableViewer viewer) {
+	private static void handleReplaceText(AbstractComponentEditor<? extends MApplicationElement> editor,
+			EStructuralFeature feature, Text tagText, TableViewer viewer) {
 		if (tagText.getText().trim().length() > 0) {
 			if (!viewer.getSelection().isEmpty()) {
 				final String[] tags = tagText.getText().split(";"); //$NON-NLS-1$
@@ -721,7 +729,7 @@ private static void handleReplaceText(AbstractComponentEditor editor, EStructura
 					tags[i] = tags[i].trim();
 				}
 
-				final MApplicationElement appEl = (MApplicationElement) editor.getMaster().getValue();
+				final MApplicationElement appEl = editor.getMaster().getValue();
 				final EObject el = (EObject) editor.getMaster().getValue();
 				final List<?> ids = ((IStructuredSelection) viewer.getSelection()).toList();
 				final Object curVal = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
@@ -742,13 +750,15 @@ private static void handleReplaceText(AbstractComponentEditor editor, EStructura
 		}
 	}
 
-	public static void createCheckBox(Composite parent, String label, IObservableValue master,
-			EMFDataBindingContext context, IWidgetValueProperty selectionProp, IEMFEditValueProperty modelProp) {
+	public static <M> void createCheckBox(Composite parent, String label, IObservableValue<M> master,
+			EMFDataBindingContext context, IWidgetValueProperty<Button, Boolean> selectionProp,
+			IValueProperty<? super M, Boolean> modelProp) {
 		createCheckBox(parent, label, null, master, context, selectionProp, modelProp);
 	}
 
-	public static void createCheckBox(Composite parent, String label, String tooltip, IObservableValue master,
-			EMFDataBindingContext context, IWidgetValueProperty selectionProp, IEMFEditValueProperty modelProp) {
+	public static <M> void createCheckBox(Composite parent, String label, String tooltip, IObservableValue<M> master,
+			EMFDataBindingContext context, IWidgetValueProperty<Button, Boolean> selectionProp,
+			IValueProperty<? super M, Boolean> modelProp) {
 		final Label l = new Label(parent, SWT.NONE);
 		l.setText(label);
 		if (tooltip != null) {
@@ -844,11 +854,12 @@ public static void attachFiltering(Text searchText, final TableViewer viewer, fi
 	 *            MPartDescriptorEditor)
 	 */
 	public static void createClassURIField(Composite parent, final Messages Messages,
-			final AbstractComponentEditor editor, String title, final EAttribute feature, IContributionClassCreator c,
+			final AbstractComponentEditor<?> editor, String title, final EAttribute feature,
+			IContributionClassCreator c,
 			IProject project,
 			EMFDataBindingContext context, IEclipseContext eclipseContext, SelectionAdapter adapter) {
 		final Link lnk;
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (project != null && c != null) {
 			lnk = new Link(parent, SWT.NONE);
@@ -870,12 +881,12 @@ public static void createClassURIField(Composite parent, final Messages Messages
 				lnk.setToolTipText(((Text) e.getSource()).getText());
 			}
 		});
+		@SuppressWarnings("unchecked")
 		final Binding binding = context.bindValue(textProp.observeDelayed(200, t),
-				EMFEditProperties
-				.value(editor.getEditingDomain(), feature)
+				((IValueProperty<Object, Object>) EMFEditProperties.value(editor.getEditingDomain(), feature))
 				.observeDetail(editor.getMaster()),
-				new UpdateValueStrategy().setAfterConvertValidator(new ContributionURIValidator()),
-				new UpdateValueStrategy());
+				new UpdateValueStrategy<>().setAfterConvertValidator(new ContributionURIValidator()),
+				new UpdateValueStrategy<>());
 		Util.addDecoration(t, binding);
 
 		Button b = ControlFactory.createFindButton(parent, editor.resourcePool);
@@ -891,8 +902,9 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	public static void createClassURIField(Composite parent, final Messages Messages,
-			final AbstractComponentEditor editor, String title, final EAttribute feature, IContributionClassCreator c,
-			IProject project, EMFDataBindingContext context, IEclipseContext eclipseContext) {
+			final AbstractComponentEditor<?> editor, String title, final EAttribute feature,
+			IContributionClassCreator c, IProject project, EMFDataBindingContext context,
+			IEclipseContext eclipseContext) {
 		createClassURIField(parent, Messages, editor, title, feature, c, project, context, eclipseContext,
 				new SelectionAdapter() {
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index 42ddc83335..f077a30616 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -18,16 +18,15 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ExpressionIdDialog;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MCoreExpression;
-import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -41,7 +40,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class CoreExpressionEditor extends AbstractComponentEditor {
+public class CoreExpressionEditor extends AbstractComponentEditor<MCoreExpression> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
@@ -82,11 +81,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			composite.setLayout(new FillLayout());
 			createForm(composite, context, getMaster());
 		}
-		getMaster().setValue(object);
+		getMaster().setValue((MCoreExpression) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MCoreExpression> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -99,7 +99,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		{
 			final Label l = new Label(parent, SWT.NONE);
@@ -111,8 +111,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.CORE_EXPRESSION__CORE_EXPRESSION_ID)
-					.observeDetail(getMaster()));
+					E4Properties.coreExpressionId(getEditingDomain()).observeDetail(getMaster()));
 
 			if (getEditor().getExtensionLookup() == null) {
 				gd.horizontalSpan = 2;
@@ -122,7 +121,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 					@Override
 					public void widgetSelected(SelectionEvent e) {
 						final ExpressionIdDialog dialog = new ExpressionIdDialog(t.getShell(), getEditor()
-								.getExtensionLookup(), (MCoreExpression) getMaster().getValue(), getEditingDomain(),
+								.getExtensionLookup(), getMaster().getValue(), getEditingDomain(),
 								getEditor().isLiveModel(), Messages);
 						dialog.open();
 					}
@@ -149,7 +148,7 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java
index caf78604b3..2bc7445ff0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java
@@ -6,7 +6,7 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 
-public class DefaultEditor extends AbstractComponentEditor {
+public class DefaultEditor extends AbstractComponentEditor<Void> {
 
 	@Override
 	public Image getImage(Object element) {
@@ -35,7 +35,7 @@ protected Composite doGetEditor(Composite parent, Object object) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		// TODO Auto-generated method stub
 		return null;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index ea2907224f..3f65beec81 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -21,15 +21,15 @@
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MExpression;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.menu.MDirectMenuItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -39,10 +39,7 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 
-public class DirectMenuItemEditor extends MenuItemEditor {
-	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
-			.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
-
+public class DirectMenuItemEditor extends MenuItemEditor<MDirectMenuItem> {
 	@Inject
 	IEclipseContext eclipseContext;
 
@@ -57,7 +54,8 @@ public Image getImage(Object element) {
 	}
 
 	@Override
-	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master,
+	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MDirectMenuItem> master,
 			boolean isImport) {
 		if (!isImport) {
 			final CTabFolder folder = super.createForm(parent, context, master, isImport);
@@ -92,7 +90,8 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MDirectMenuItem> master) {
 
 		ControlFactory.createClassURIField(parent, Messages, this, Messages.DirectMenuItemEditor_ClassURI,
 				ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
@@ -102,14 +101,15 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		final WritableList list = new WritableList();
+	public IObservableList<?> getChildList(Object element) {
+		final WritableList<MExpression> list = new WritableList<>();
+		MUIElement uiElement = (MUIElement) element;
 
-		if (((MDirectMenuItem) element).getVisibleWhen() != null) {
-			list.add(0, ((MDirectMenuItem) element).getVisibleWhen());
+		if (uiElement.getVisibleWhen() != null) {
+			list.add(0, uiElement.getVisibleWhen());
 		}
 
-		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(event -> {
+		E4Properties.visibleWhen().observe(uiElement).addValueChangeListener(event -> {
 			if (event.diff.getOldValue() != null) {
 				list.remove(event.diff.getOldValue());
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index b4cf948e6f..d3e76a10ff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -20,15 +20,13 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MDirectToolItem;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -38,10 +36,7 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 
-public class DirectToolItemEditor extends ToolItemEditor {
-	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
-			.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
-
+public class DirectToolItemEditor extends ToolItemEditor<MDirectToolItem> {
 	@Inject
 	IEclipseContext eclipseContext;
 
@@ -56,7 +51,8 @@ public Image getImage(Object element) {
 	}
 
 	@Override
-	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context,
+			WritableValue<MDirectToolItem> master) {
 
 		ControlFactory.createClassURIField(parent, Messages, this, Messages.DirectMenuItemEditor_ClassURI,
 				ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
@@ -66,7 +62,8 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 	}
 
 	@Override
-	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master,
+	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MDirectToolItem> master,
 			boolean isImport) {
 		if (!isImport) {
 			final CTabFolder folder = super.createForm(parent, context, master, isImport);
@@ -100,16 +97,16 @@ public String getDescription(Object element) {
 		return Messages.DirectToolItemEditor_Description;
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
-	public IObservableList getChildList(Object element) {
-		final IObservableList list = super.getChildList(element);
+	public IObservableList<Object> getChildList(Object element) {
+		final IObservableList<Object> list = super.getChildList(element);
+		MDirectToolItem toolElement = (MDirectToolItem) element;
 
-		if (((MDirectToolItem) element).getVisibleWhen() != null) {
-			list.add(0, ((MDirectToolItem) element).getVisibleWhen());
+		if (toolElement.getVisibleWhen() != null) {
+			list.add(0, toolElement.getVisibleWhen());
 		}
 
-		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(event -> {
+		E4Properties.visibleWhen().observe(toolElement).addValueChangeListener(event -> {
 			if (event.diff.getOldValue() != null) {
 				list.remove(event.diff.getOldValue());
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
index 5a04a31776..e6d75284e4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
@@ -25,17 +25,16 @@
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
-import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MDynamicMenuContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -43,8 +42,9 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Text;
 
-public class DynamicMenuContributionEditor extends AbstractComponentEditor {
+public class DynamicMenuContributionEditor extends AbstractComponentEditor<MDynamicMenuContribution> {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
@@ -111,13 +111,13 @@ protected Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MDynamicMenuContribution) object);
 
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
-			boolean isImport) {
+	private Composite createForm(Composite parent, final EMFDataBindingContext context,
+			WritableValue<MDynamicMenuContribution> master, boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -130,7 +130,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -139,11 +139,9 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 		ControlFactory.createTranslatedTextField(parent, Messages.DynamicMenuContributionEditor_LabelLabel,
-				getMaster(), context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
+				getMaster(), context, textProp, E4Properties.label(getEditingDomain()), resourcePool, project);
 
 		// ------------------------------------------------------------
 		ControlFactory.createClassURIField(parent, Messages, this, Messages.DynamicMenuContributionEditor_ClassURI,
@@ -160,7 +158,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index 95da03f97f..4568c0ed95 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -21,23 +21,16 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledMenuItemCommandSelectionDialog;
-import org.eclipse.e4.ui.model.application.commands.MParameter;
-import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFValueProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -48,13 +41,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class HandledMenuItemEditor extends MenuItemEditor {
-
-	private final IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(),
-			MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
-	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
-			.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
-
+public class HandledMenuItemEditor extends MenuItemEditor<MHandledMenuItem> {
 	@Inject
 	private IModelResource resource;
 
@@ -79,8 +66,9 @@ public String getDescription(Object element) {
 	}
 
 	@Override
-	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, final WritableValue master) {
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+	protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext context,
+			final WritableValue<MHandledMenuItem> master) {
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		// ------------------------------------------------------------
 		{
@@ -93,16 +81,15 @@ protected void createFormSubTypeForm(Composite parent, EMFDataBindingContext con
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
 			context.bindValue(textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND)
-					.observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy()
-					.setConverter(new CommandToStringConverter(Messages)));
+					E4Properties.itemCommand(getEditingDomain()).observeDetail(master),
+					new UpdateValueStrategy<>(), UpdateValueStrategy.create(new CommandToStringConverter(Messages)));
 
 			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final HandledMenuItemCommandSelectionDialog dialog = new HandledMenuItemCommandSelectionDialog(b
-							.getShell(), (MHandledItem) getMaster().getValue(), resource, Messages);
+							.getShell(), getMaster().getValue(), resource, Messages);
 					dialog.open();
 				}
 			});
@@ -110,14 +97,15 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		final WritableList list = new WritableList();
+	public IObservableList<?> getChildList(Object element) {
+		final WritableList<Object> list = new WritableList<>();
+		MHandledMenuItem item = (MHandledMenuItem) element;
 
-		if (((MHandledMenuItem) element).getVisibleWhen() != null) {
+		if (item.getVisibleWhen() != null) {
 			list.add(0, ((MHandledMenuItem) element).getVisibleWhen());
 		}
 
-		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(event -> {
+		E4Properties.visibleWhen().observe(item).addValueChangeListener(event -> {
 			if (event.diff.getOldValue() != null) {
 				list.remove(event.diff.getOldValue());
 			}
@@ -127,13 +115,8 @@ public IObservableList getChildList(Object element) {
 			}
 		});
 
-		list.add(new VirtualEntry<MParameter>(ModelEditor.VIRTUAL_PARAMETERS, HANDLED_ITEM__PARAMETERS, element,
-				Messages.HandledMenuItemEditor_Parameters) {
-			@Override
-			protected boolean accepted(MParameter o) {
-				return true;
-			}
-		});
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_PARAMETERS, E4Properties.itemParameters(), item,
+				Messages.HandledMenuItemEditor_Parameters));
 
 		return list;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 1364134835..b7706a9843 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -20,23 +20,16 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandledToolItemCommandSelectionDialog;
-import org.eclipse.e4.ui.model.application.commands.MParameter;
-import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledToolItem;
-import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFValueProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -47,13 +40,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class HandledToolItemEditor extends ToolItemEditor {
-
-	private final IEMFEditListProperty HANDLED_ITEM__PARAMETERS = EMFEditProperties.list(getEditingDomain(),
-			MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
-	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
-			.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
-
+public class HandledToolItemEditor extends ToolItemEditor<MHandledToolItem> {
 	@Inject
 	private IModelResource resource;
 
@@ -68,8 +55,9 @@ public Image getImage(Object element) {
 	}
 
 	@Override
-	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, final WritableValue master) {
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context,
+			final WritableValue<MHandledToolItem> master) {
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		{
 			final Label l = new Label(parent, SWT.NONE);
@@ -81,16 +69,15 @@ protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
 			context.bindValue(textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND)
-					.observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy()
-					.setConverter(new CommandToStringConverter(Messages)));
+					E4Properties.itemCommand(getEditingDomain()).observeDetail(master),
+					new UpdateValueStrategy<>(), UpdateValueStrategy.create(new CommandToStringConverter(Messages)));
 
 			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final HandledToolItemCommandSelectionDialog dialog = new HandledToolItemCommandSelectionDialog(b
-							.getShell(), (MHandledItem) getMaster().getValue(), resource, Messages);
+							.getShell(), getMaster().getValue(), resource, Messages);
 					dialog.open();
 				}
 			});
@@ -107,16 +94,16 @@ public String getDescription(Object element) {
 		return Messages.HandledToolItemEditor_Description;
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
-	public IObservableList getChildList(Object element) {
-		final IObservableList list = super.getChildList(element);
+	public IObservableList<Object> getChildList(Object element) {
+		final IObservableList<Object> list = super.getChildList(element);
+		MHandledToolItem item = (MHandledToolItem) element;
 
-		if (((MHandledToolItem) element).getVisibleWhen() != null) {
-			list.add(0, ((MHandledToolItem) element).getVisibleWhen());
+		if (item.getVisibleWhen() != null) {
+			list.add(0, item.getVisibleWhen());
 		}
 
-		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(event -> {
+		E4Properties.visibleWhen().observe(item).addValueChangeListener(event -> {
 			if (event.diff.getOldValue() != null) {
 				list.remove(event.diff.getOldValue());
 			}
@@ -126,13 +113,8 @@ public IObservableList getChildList(Object element) {
 			}
 		});
 
-		list.add(new VirtualEntry<MParameter>(ModelEditor.VIRTUAL_PARAMETERS, HANDLED_ITEM__PARAMETERS, element,
-				Messages.HandledToolItemEditor_Parameters) {
-			@Override
-			protected boolean accepted(MParameter o) {
-				return true;
-			}
-		});
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_PARAMETERS, E4Properties.itemParameters(getEditingDomain()), item,
+				Messages.HandledToolItemEditor_Parameters));
 
 		return list;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index a31c86d70a..6e97cbe6e3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -28,6 +28,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandlerCommandSelectionDialog;
@@ -37,10 +38,9 @@
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -57,7 +57,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class HandlerEditor extends AbstractComponentEditor {
+public class HandlerEditor extends AbstractComponentEditor<MHandler> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private StackLayout stackLayout;
@@ -121,11 +121,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MHandler) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue<MHandler> master,
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -134,7 +135,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -146,7 +147,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+				E4Properties.elementId(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		{
@@ -158,13 +160,16 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.HANDLER__COMMAND).observeDetail(getMaster()), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter(Messages)));
+			context.bindValue(textProp.observeDelayed(200, t),
+					E4Properties.command(getEditingDomain()).observeDetail(getMaster()),
+					new UpdateValueStrategy<>(), UpdateValueStrategy.create(new CommandToStringConverter(Messages)));
 
 			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					final HandlerCommandSelectionDialog dialog = new HandlerCommandSelectionDialog(b.getShell(), (MHandler) getMaster().getValue(), resource, Messages);
+					final HandlerCommandSelectionDialog dialog = new HandlerCommandSelectionDialog(b.getShell(),
+							getMaster().getValue(), resource, Messages);
 					dialog.open();
 				}
 			});
@@ -209,7 +214,7 @@ private void createInstanceInspection(CTabFolder folder) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
index 90fd0ab9a4..4a43262f79 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
@@ -32,7 +32,7 @@
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
 
-public class ImperativeExpressionEditor extends AbstractComponentEditor {
+public class ImperativeExpressionEditor extends AbstractComponentEditor<MImperativeExpression> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
@@ -80,12 +80,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 			composite.setLayout(new FillLayout());
 			createForm(composite, context, getMaster());
 		}
-		getMaster().setValue(object);
+		getMaster().setValue((MImperativeExpression) object);
 
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MImperativeExpression> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -122,7 +123,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index a3709e250a..471a3dfe18 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -34,6 +34,7 @@
 import org.eclipse.e4.tools.emf.ui.common.Plugin;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
@@ -49,14 +50,12 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.bindings.keys.KeySequence;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -72,15 +71,12 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class KeyBindingEditor extends AbstractComponentEditor {
-
+public class KeyBindingEditor extends AbstractComponentEditor<MKeyBinding> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<>();
 
-	private final IEMFEditListProperty KEY_BINDING__PARAMETERS = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS);
-
 	@Inject
 	private IModelResource resource;
 
@@ -143,11 +139,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MKeyBinding) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master, boolean isImport) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue<MKeyBinding> master,
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -160,7 +157,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -168,7 +165,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+				E4Properties.elementId(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		{
@@ -181,7 +179,10 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
-			final Binding binding = context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_SEQUENCE__KEY_SEQUENCE).observeDetail(getMaster()), new UpdateValueStrategy().setBeforeSetValidator(new BindingValidator()), new UpdateValueStrategy());
+			final Binding binding = context.bindValue(textProp.observeDelayed(200, t),
+					E4Properties.keySequence(getEditingDomain()).observeDetail(getMaster()),
+					new UpdateValueStrategy<String, String>().setBeforeSetValidator(new BindingValidator()),
+					new UpdateValueStrategy<>());
 			Util.addDecoration(t, binding);
 		}
 
@@ -195,13 +196,17 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			t.setEditable(false);
-			context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__COMMAND).observeDetail(getMaster()), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter(Messages)));
+			context.bindValue(textProp.observeDelayed(200, t),
+					E4Properties.keyBindingCommand(getEditingDomain()).observeDetail(getMaster()),
+					new UpdateValueStrategy<>(),
+					UpdateValueStrategy.create(new CommandToStringConverter(Messages)));
 
 			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					final KeyBindingCommandSelectionDialog dialog = new KeyBindingCommandSelectionDialog(b.getShell(), (MKeyBinding) getMaster().getValue(), resource, Messages);
+					final KeyBindingCommandSelectionDialog dialog = new KeyBindingCommandSelectionDialog(b.getShell(),
+							getMaster().getValue(), resource, Messages);
 					dialog.open();
 				}
 			});
@@ -225,7 +230,7 @@ protected List<?> getContainerChildren(Object master) {
 
 			final TableViewer viewer = pickList.getList();
 
-			viewer.setInput(KEY_BINDING__PARAMETERS.observeDetail(getMaster()));
+			viewer.setInput(E4Properties.keyBindingParameters(getEditingDomain()).observeDetail(getMaster()));
 		}
 		//
 
@@ -246,8 +251,8 @@ protected List<?> getContainerChildren(Object master) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		return KEY_BINDING__PARAMETERS.observe(element);
+	public IObservableList<?> getChildList(Object element) {
+		return E4Properties.keyBindingParameters(getEditingDomain()).observe((MKeyBinding) element);
 	}
 
 	@Override
@@ -264,21 +269,21 @@ public FeaturePath[] getLabelProperties() {
 		return new FeaturePath[] { FeaturePath.fromList(CommandsPackageImpl.Literals.KEY_SEQUENCE__KEY_SEQUENCE) };
 	}
 
-	class BindingValidator implements IValidator {
+	class BindingValidator implements IValidator<String> {
 
 		@Override
-		public IStatus validate(Object value) {
+		public IStatus validate(String value) {
 			final int statusCode = getEditor().isLiveModel() ? IStatus.ERROR : IStatus.WARNING;
-			if (value != null && value.toString().trim().length() > 0) {
+			if (value != null && value.trim().length() > 0) {
 				try {
-					final KeySequence keySequence = KeySequence.getInstance(value.toString());
+					final KeySequence keySequence = KeySequence.getInstance(value);
 					if (!keySequence.isComplete()) {
 						return new Status(statusCode, Plugin.ID, Messages.KeyBindingEditor_SequenceNotComplete);
 					}
 					if (keySequence.isEmpty()) {
 						return new Status(statusCode, Plugin.ID, Messages.KeyBindingEditor_SequenceEmpty);
 					}
-					if (!value.toString().toUpperCase().equals(value.toString())) {
+					if (!value.toUpperCase().equals(value)) {
 						return new Status(IStatus.ERROR, Plugin.ID, Messages.KeyBindingEditor_SequenceLowercase);
 					}
 
@@ -293,7 +298,7 @@ public IStatus validate(Object value) {
 	}
 
 	protected void handleAddParameter() {
-		final MKeyBinding item = (MKeyBinding) getMaster().getValue();
+		final MKeyBinding item = getMaster().getValue();
 		final MParameter param = MCommandsFactory.INSTANCE.createParameter();
 		setElementId(param);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index e49ca52c83..638c2b1399 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -25,10 +25,10 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList.Struct;
@@ -42,17 +42,14 @@
 import org.eclipse.e4.ui.workbench.modeling.EModelService;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
@@ -69,12 +66,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class MenuContributionEditor extends AbstractComponentEditor {
+public class MenuContributionEditor extends AbstractComponentEditor<MMenuContribution> {
 	private Composite composite;
 	private EMFDataBindingContext context;
-
-	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<>();
 
@@ -176,11 +170,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MMenuContribution) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MMenuContribution> master, boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -193,7 +188,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -202,11 +197,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-				context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
 
 		{
 			final Label l = new Label(parent, SWT.NONE);
@@ -219,26 +212,23 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_CONTRIBUTION__PARENT_ID)
-					.observeDetail(getMaster()));
+					E4Properties.menuParentId(getEditingDomain()).observeDetail(getMaster()));
 
 			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final MenuIdDialog dialog = new MenuIdDialog(t.getShell(), resource,
-							(MMenuContribution) getMaster().getValue(), getEditingDomain(), modelService, Messages);
+							getMaster().getValue(), getEditingDomain(), modelService, Messages);
 					dialog.open();
 				}
 			});
 
 		}
 
-		ControlFactory
-		.createTextField(parent, Messages.MenuContributionEditor_Position,
+		ControlFactory.createTextField(parent, Messages.MenuContributionEditor_Position,
 				Messages.MenuContributionEditor_PositionTooltip, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(),
-						MenuPackageImpl.Literals.MENU_CONTRIBUTION__POSITION_IN_PARENT));
+				E4Properties.menuPositionInParent(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		{
@@ -265,9 +255,7 @@ protected void addPressed() {
 			pickList.setText(Messages.MenuContributionEditor_MenuItems);
 
 			final TableViewer viewer = pickList.getList();
-			final IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(),
-					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(master));
+			viewer.setInput(E4Properties.<MMenuElement>children(getEditingDomain()).observeDetail(master));
 
 			final Struct defaultStruct = new Struct(Messages.MenuContributionEditor_HandledMenuItem,
 					MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
@@ -283,15 +271,10 @@ protected void addPressed() {
 
 		}
 
-		ControlFactory
-		.createCheckBox(
-				parent,
-				"To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory
-		.createCheckBox(
-				parent,
-				"Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
-
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, //$NON-NLS-1$
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, //$NON-NLS-1$
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
 
@@ -311,8 +294,8 @@ protected void addPressed() {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	public IObservableList<?> getChildList(Object element) {
+		return E4Properties.<MMenuElement>children().observe((MMenuContribution) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 1ce617e2a5..2af0531c78 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -28,13 +28,13 @@
 import org.eclipse.core.databinding.observable.list.ListDiffVisitor;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList.Struct;
@@ -44,6 +44,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MExpression;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -56,11 +57,7 @@
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.IEMFValueProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -68,8 +65,8 @@
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -90,15 +87,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class MenuEditor extends AbstractComponentEditor {
-
+public class MenuEditor extends AbstractComponentEditor<MMenu> {
 	private Composite composite;
 	private EMFDataBindingContext context;
-
-	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private final IEMFValueProperty UI_ELEMENT__VISIBLE_WHEN = EMFProperties
-			.value(UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<>();
 
@@ -156,7 +147,7 @@ public void run() {
 				createImageDescriptor(ResourceProvider.IMG_CoreExpression)) {
 			@Override
 			public void run() {
-				final MUIElement e = (MUIElement) getMaster().getValue();
+				final MUIElement e = getMaster().getValue();
 				final Command cmd = SetCommand.create(getEditingDomain(), e,
 						UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN, MUiFactory.INSTANCE.createCoreExpression());
 				if (cmd.canExecute()) {
@@ -205,13 +196,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 			composite.layout(true, true);
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MMenu) object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
-	protected Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master,
+	protected Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue<MMenu> master,
 			boolean rootMenu, boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
@@ -225,7 +216,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -234,18 +225,16 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		if (!rootMenu) {
 			ControlFactory.createTranslatedTextField(parent, Messages.MenuEditor_LabelLabel, master, context, textProp,
-					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool,
-					project);
+					E4Properties.label(getEditingDomain()), resourcePool, project);
 		}
 
 		ControlFactory.createTextField(parent, Messages.MenuEditor_Mnemonics, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS));
+				E4Properties.mnemonics(getEditingDomain()));
 
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, this,
@@ -264,17 +253,14 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 							MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
 			pickList.setSelection(new StructuredSelection(defaultStruct));
 
-			final IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(),
-					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			pickList.getList().setInput(prop.observeDetail(master));
+			pickList.getList().setInput(E4Properties.<MMenuElement>children(getEditingDomain()).observeDetail(master));
 
 		}
 
 		// ------------------------------------------------------------
 		if (!rootMenu) {
 			ControlFactory.createTranslatedTextField(parent, Messages.MenuEditor_Tooltip, master, context, textProp,
-					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool,
-					project);
+					E4Properties.tooltip(getEditingDomain()), resourcePool, project);
 		}
 
 		// ------------------------------------------------------------
@@ -288,8 +274,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
 					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
-							master));
+					E4Properties.iconUri(getEditingDomain()).observeDetail(master));
 
 			new ImageTooltip(t, Messages, this);
 
@@ -298,7 +283,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final MenuIconDialogEditor dialog = new MenuIconDialogEditor(b.getShell(), eclipseContext, project,
-							getEditingDomain(), (MMenu) getMaster().getValue(), Messages);
+							getEditingDomain(), getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -331,17 +316,15 @@ public String getText(Object element) {
 					UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
 			combo.setInput(list);
 			context.bindValue(ViewerProperties.singleSelection().observe(combo),
-					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN)
-					.observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)),
-					new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
+					E4Properties.visibleWhen(getEditingDomain()).observeDetail(getMaster()),
+					UpdateValueStrategy.create(new EClass2EObject<>(Messages)),
+					UpdateValueStrategy.create(new EObject2EClass<>(Messages)));
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.selection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.selection(), E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -350,8 +333,7 @@ public String getText(Object element) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-				context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
@@ -382,14 +364,15 @@ private void createUITreeInspection(CTabFolder folder) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		final WritableList list = new WritableList();
+	public IObservableList<?> getChildList(Object element) {
+		final WritableList<MApplicationElement> list = new WritableList<>();
+		MMenu menu = (MMenu) element;
 
-		if (((MUIElement) element).getVisibleWhen() != null) {
-			list.add(0, ((MUIElement) element).getVisibleWhen());
+		if (menu.getVisibleWhen() != null) {
+			list.add(0, menu.getVisibleWhen());
 		}
 
-		UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(event -> {
+		E4Properties.visibleWhen().observe(menu).addValueChangeListener(event -> {
 			if (event.diff.getOldValue() != null) {
 				list.remove(event.diff.getOldValue());
 			}
@@ -399,16 +382,16 @@ public IObservableList getChildList(Object element) {
 			}
 		});
 
-		final IObservableList l = ELEMENT_CONTAINER__CHILDREN.observe(element);
-		l.addListChangeListener(event -> event.diff.accept(new ListDiffVisitor() {
+		final IObservableList<MMenuElement> l = E4Properties.<MMenuElement>children().observe(menu);
+		l.addListChangeListener(event -> event.diff.accept(new ListDiffVisitor<MMenuElement>() {
 
 			@Override
-			public void handleRemove(int index, Object element) {
+			public void handleRemove(int index, MMenuElement element) {
 				list.remove(element);
 			}
 
 			@Override
-			public void handleMove(int oldIndex, int newIndex, Object element) {
+			public void handleMove(int oldIndex, int newIndex, MMenuElement element) {
 				if (list.get(0) instanceof MExpression) {
 					oldIndex += 1;
 					newIndex += 1;
@@ -417,7 +400,7 @@ public void handleMove(int oldIndex, int newIndex, Object element) {
 			}
 
 			@Override
-			public void handleAdd(int index, Object element) {
+			public void handleAdd(int index, MMenuElement element) {
 				list.add(element);
 			}
 		}));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 59ffb9e220..dc065d594e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -25,7 +25,6 @@
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -33,6 +32,7 @@
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
@@ -45,19 +45,17 @@
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -77,7 +75,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public abstract class MenuItemEditor extends AbstractComponentEditor {
+public abstract class MenuItemEditor<M extends MMenuItem> extends AbstractComponentEditor<M> {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
@@ -103,7 +101,7 @@ void init() {
 				createImageDescriptor(ResourceProvider.IMG_CoreExpression)) {
 			@Override
 			public void run() {
-				final MUIElement e = (MUIElement) getMaster().getValue();
+				final MUIElement e = getMaster().getValue();
 				final Command cmd = SetCommand.create(getEditingDomain(), e,
 						UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN, MUiFactory.INSTANCE.createCoreExpression());
 				if (cmd.canExecute()) {
@@ -118,6 +116,7 @@ public Image getImage(Object element) {
 		return getImage(element, ResourceProvider.IMG_MenuItem);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
@@ -147,14 +146,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((M) object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 
 		return composite;
 	}
 
-	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master,
+	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue<M> master,
 			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
@@ -164,9 +163,9 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 		parent = createScrollableContainer(folder);
 		item.setControl(parent.getParent());
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-		final IWidgetValueProperty checkProp = WidgetProperties.selection();
-		final IWidgetValueProperty enabled = WidgetProperties.enabled();
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Button, Boolean> checkProp = WidgetProperties.buttonSelection();
+		final IWidgetValueProperty<Button, Boolean> enabled = WidgetProperties.enabled();
 
 		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
 			ControlFactory.createXMIId(parent, this);
@@ -179,8 +178,7 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 
 		if (this.getClass() != MenuItemEditor.class) {
 			// ------------------------------------------------------------
@@ -195,19 +193,17 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 				final GridData gd = new GridData();
 				gd.horizontalSpan = 2;
 				viewer.getControl().setLayoutData(gd);
-				final IObservableValue itemTypeObs = EMFEditProperties.value(getEditingDomain(),
-						MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(master);
-				context.bindValue(ViewerProperties.singleSelection().observe(viewer), itemTypeObs);
+				context.bindValue(ViewerProperties.singleSelection().observe(viewer),
+						E4Properties.type(getEditingDomain()).observeDetail(master));
 			}
 		}
 
 		ControlFactory.createTranslatedTextField(parent, Messages.MenuItemEditor_Label, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
+				E4Properties.label(getEditingDomain()), resourcePool, project);
 		ControlFactory.createTextField(parent, Messages.MenuItemEditor_Mnemonics, getMaster(), context, textProp,
-				EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.MENU_ELEMENT__MNEMONICS));
+				E4Properties.mnemonics(getEditingDomain()));
 		ControlFactory.createTranslatedTextField(parent, Messages.MenuItemEditor_Tooltip, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool,
-				project);
+				E4Properties.tooltip(getEditingDomain()), resourcePool, project);
 
 		// ------------------------------------------------------------
 		{
@@ -220,8 +216,7 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
 					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
-							master));
+					E4Properties.iconUri(getEditingDomain()).observeDetail(master));
 
 			new ImageTooltip(t, Messages, this);
 
@@ -230,7 +225,7 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final MenuItemIconDialogEditor dialog = new MenuItemIconDialogEditor(b.getShell(), eclipseContext,
-							project, getEditingDomain(), (MMenuItem) getMaster().getValue(), Messages);
+							project, getEditingDomain(), getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -243,10 +238,8 @@ public void widgetSelected(SelectionEvent e) {
 
 			final Button b = new Button(parent, SWT.CHECK);
 			b.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
-			context.bindValue(
-					checkProp.observe(b),
-					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__ENABLED).observeDetail(
-							getMaster()));
+			context.bindValue(checkProp.observe(b),
+					E4Properties.enabled(getEditingDomain()).observeDetail(getMaster()));
 		}
 
 		{
@@ -258,30 +251,28 @@ public void widgetSelected(SelectionEvent e) {
 			b.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 			context.bindValue(
 					checkProp.observe(b),
-					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__SELECTED).observeDetail(
-							getMaster()));
+					E4Properties.selected(getEditingDomain()).observeDetail(getMaster()));
 
-			final UpdateValueStrategy t2m = new UpdateValueStrategy();
-			t2m.setConverter(new Converter(boolean.class, ItemType.class) {
+			final UpdateValueStrategy<Boolean, ItemType> t2m = new UpdateValueStrategy<>();
+			t2m.setConverter(new Converter<Boolean, ItemType>(boolean.class, ItemType.class) {
 
 				@Override
-				public Object convert(Object fromObject) {
+				public ItemType convert(Boolean fromObject) {
 					return null;
 				}
 			});
-			final UpdateValueStrategy m2t = new UpdateValueStrategy();
-			m2t.setConverter(new Converter(ItemType.class, boolean.class) {
+			final UpdateValueStrategy<ItemType, Boolean> m2t = new UpdateValueStrategy<>();
+			m2t.setConverter(new Converter<ItemType, Boolean>(ItemType.class, boolean.class) {
 
 				@Override
-				public Object convert(Object fromObject) {
+				public Boolean convert(ItemType fromObject) {
 					return fromObject == ItemType.CHECK || fromObject == ItemType.RADIO;
 				}
 			});
 
 			context.bindValue(
 					enabled.observe(b),
-					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(
-							getMaster()), t2m, m2t);
+					E4Properties.type(getEditingDomain()).observeDetail(getMaster()), t2m, m2t);
 
 		}
 
@@ -312,19 +303,17 @@ public String getText(Object element) {
 					UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
 			combo.setInput(list);
 			context.bindValue(ViewerProperties.singleSelection().observe(combo),
-					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN)
-					.observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)),
-					new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
+					E4Properties.visibleWhen(getEditingDomain()).observeDetail(getMaster()),
+					UpdateValueStrategy.create(new EClass2EObject<>(Messages)),
+					UpdateValueStrategy.create(new EObject2EClass<>(Messages)));
 		}
 
 		createFormSubTypeForm(parent, context, master);
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.selection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.selection(), E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -333,9 +322,7 @@ public String getText(Object element) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-				context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
@@ -352,7 +339,8 @@ public String getText(Object element) {
 		return folder;
 	}
 
-	protected abstract void createFormSubTypeForm(Composite parent, EMFDataBindingContext context, WritableValue master);
+	protected abstract void createFormSubTypeForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<M> master);
 
 	private void createUITreeInspection(CTabFolder folder) {
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -368,7 +356,7 @@ private void createUITreeInspection(CTabFolder folder) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
@@ -393,7 +381,7 @@ public List<Action> getActions(Object element) {
 		return l;
 	}
 
-	static class EObject2EClass extends Converter {
+	static class EObject2EClass<T> extends Converter<T, Object> {
 		Messages Messages;
 
 		public EObject2EClass(Messages Messages) {
@@ -402,7 +390,7 @@ public EObject2EClass(Messages Messages) {
 		}
 
 		@Override
-		public Object convert(Object fromObject) {
+		public Object convert(T fromObject) {
 			if (fromObject == null) {
 				return Messages.MenuItemEditor_NoExpression;
 			}
@@ -410,7 +398,7 @@ public Object convert(Object fromObject) {
 		}
 	}
 
-	static class EClass2EObject extends Converter {
+	static class EClass2EObject<T> extends Converter<Object, T> {
 		Messages Messages;
 
 		public EClass2EObject(Messages Messages) {
@@ -418,12 +406,13 @@ public EClass2EObject(Messages Messages) {
 			this.Messages = Messages;
 		}
 
+		@SuppressWarnings("unchecked")
 		@Override
-		public Object convert(Object fromObject) {
+		public T convert(Object fromObject) {
 			if (fromObject == null || fromObject.toString().equals(Messages.MenuItemEditor_NoExpression)) {
 				return null;
 			}
-			return EcoreUtil.create((EClass) fromObject);
+			return (T) EcoreUtil.create((EClass) fromObject);
 		}
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index f4c94a6e57..f9220d6948 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -22,16 +22,16 @@
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuSeparator;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -42,8 +42,9 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Text;
 
-public class MenuSeparatorEditor extends AbstractComponentEditor {
+public class MenuSeparatorEditor extends AbstractComponentEditor<MMenuSeparator> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private StackLayout stackLayout;
@@ -106,11 +107,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MMenuSeparator) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue<MMenuSeparator> master,
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -123,7 +125,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -131,10 +133,14 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+				E4Properties.elementId(getEditingDomain()));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -169,7 +175,7 @@ private void createUITreeInspection(CTabFolder folder) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index 07b9f5dfe3..e0696f9668 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -22,11 +22,11 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
@@ -39,8 +39,6 @@
 import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
@@ -59,13 +57,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class ModelFragmentsEditor extends AbstractComponentEditor {
-
-	private final IListProperty MODEL_FRAGMENTS__FRAGMENTS = EMFProperties
-			.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
-	private final IListProperty MODEL_FRAGMENTS__IMPORTS = EMFProperties
-			.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
-
+public class ModelFragmentsEditor extends AbstractComponentEditor<MModelFragments> {
 	private Composite composite;
 
 	@Inject
@@ -96,7 +88,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
 			composite = createForm(parent);
 		}
-		getMaster().setValue(object);
+		getMaster().setValue((MModelFragments) object);
 		return composite;
 	}
 
@@ -144,9 +136,7 @@ protected List<?> getContainerChildren(Object container) {
 			};
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 			final TableViewer viewer = pickList.getList();
-
-			final IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__FRAGMENTS);
-			viewer.setInput(prop.observeDetail(getMaster()));
+			viewer.setInput(E4Properties.fragments().observeDetail(getMaster()));
 		}
 
 	}
@@ -218,8 +208,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 			pickList.setSelection(new StructuredSelection(list.get(0)));
 		}
 
-		final IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENTS__IMPORTS);
-		viewer.setInput(prop.observeDetail(getMaster()));
+		viewer.setInput(E4Properties.imports().observeDetail(getMaster()));
 	}
 
 	public void addClasses(EPackage ePackage, List<FeatureClass> list) {
@@ -240,22 +229,14 @@ public void addClasses(EPackage ePackage, List<FeatureClass> list) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		final WritableList list = new WritableList();
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MODEL_IMPORTS, MODEL_FRAGMENTS__IMPORTS, element,
-				Messages.ModelFragmentsEditor_Imports) {
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-		});
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_MODEL_FRAGEMENTS, MODEL_FRAGMENTS__FRAGMENTS, element,
-				Messages.ModelFragmentsEditor_ModelFragments) {
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-		});
+	public IObservableList<?> getChildList(Object element) {
+		MModelFragments fragments = (MModelFragments) element;
+
+		final WritableList<VirtualEntry<MModelFragments, ?>> list = new WritableList<>();
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_MODEL_IMPORTS, E4Properties.imports(), fragments,
+				Messages.ModelFragmentsEditor_Imports));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_MODEL_FRAGEMENTS, E4Properties.fragments(), fragments,
+				Messages.ModelFragmentsEditor_ModelFragments));
 
 		return list;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index 6b3bababc2..542f61ec4b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -23,18 +23,16 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ParameterIdSelectionDialog;
 import org.eclipse.e4.ui.model.application.commands.MParameter;
-import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -49,7 +47,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class ParameterEditor extends AbstractComponentEditor {
+public class ParameterEditor extends AbstractComponentEditor<MParameter> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
@@ -118,11 +116,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MParameter) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue<MParameter> master,
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -135,7 +134,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -143,9 +142,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+				E4Properties.elementId(getEditingDomain()));
 		createParameterNameRow(parent, textProp);
-		ControlFactory.createTextField(parent, Messages.ParameterEditor_Value, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__VALUE));
+		ControlFactory.createTextField(parent, Messages.ParameterEditor_Value, master, context, textProp,
+				E4Properties.parameterValue(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -164,11 +165,11 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
-	private void createParameterNameRow(Composite parent, IWidgetValueProperty textProp) {
+	private void createParameterNameRow(Composite parent, IWidgetValueProperty<Text, String> textProp) {
 		{
 			final Label commandParameterIdLabel = new Label(parent, SWT.NONE);
 			commandParameterIdLabel.setText(Messages.ParameterEditor_Command_Parameter_ID);
@@ -178,8 +179,8 @@ private void createParameterNameRow(Composite parent, IWidgetValueProperty textP
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			commandParameterIdValue.setLayoutData(gd);
 			TextPasteHandler.createFor(commandParameterIdValue);
-			final IEMFEditValueProperty modelProp = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.PARAMETER__NAME);
-			context.bindValue(textProp.observeDelayed(200, commandParameterIdValue), modelProp.observeDetail(getMaster()));
+			context.bindValue(textProp.observeDelayed(200, commandParameterIdValue),
+					E4Properties.parameterName(getEditingDomain()).observeDetail(getMaster()));
 		}
 
 		Button b = ControlFactory.createFindButton(parent, resourcePool);
@@ -189,13 +190,13 @@ private void createParameterNameRow(Composite parent, IWidgetValueProperty textP
 	private final class ChooseParameterButtonSelectionListener extends SelectionAdapter {
 		@Override
 		public void widgetSelected(SelectionEvent e) {
-			final WritableValue master = getMaster();
-			if (master == null || !(master.getValue() instanceof MParameter)) {
+			final WritableValue<MParameter> master = getMaster();
+			if (master == null || master.getValue() == null) {
 				return;
 			}
 
 			final IEclipseContext staticContext = EclipseContextFactory.create("ParameterIdSelectionDialog static context"); //$NON-NLS-1$
-			staticContext.set(MParameter.class, (MParameter) master.getValue());
+			staticContext.set(MParameter.class, master.getValue());
 			final ParameterIdSelectionDialog dialog = ContextInjectionFactory.make(ParameterIdSelectionDialog.class, eclipseContext, staticContext);
 			dialog.open();
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 6ac5e76ae8..f63f1b66b7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -20,7 +20,6 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -29,12 +28,12 @@
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartDescriptorIconDialogEditor;
-import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -46,14 +45,11 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
@@ -68,7 +64,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class PartDescriptorEditor extends AbstractComponentEditor {
+public class PartDescriptorEditor extends AbstractComponentEditor<MPartDescriptor> {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
@@ -80,11 +76,6 @@ public class PartDescriptorEditor extends AbstractComponentEditor {
 	@Inject
 	IEclipseContext eclipseContext;
 
-	private final IListProperty PART__MENUS = EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS);
-	private final IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties
-			.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
-	private final IValueProperty PART__TOOLBAR = EMFProperties
-			.value(BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR);
 	private Button createRemoveToolBar;
 	private StackLayout stackLayout;
 
@@ -141,14 +132,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 			createRemoveToolBar.setSelection(((MPartDescriptor) object).getToolbar() != null);
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MPartDescriptor) object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
-	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master,
-			boolean isImport) {
+	protected Composite createForm(Composite parent, EMFDataBindingContext context,
+			IObservableValue<MPartDescriptor> master, boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -161,7 +152,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -170,14 +161,12 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 		ControlFactory.createTranslatedTextField(parent, Messages.PartDescriptorEditor_LabelLabel, master, context,
-				textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL),
+				textProp, E4Properties.label(getEditingDomain()),
 				resourcePool, project);
 		ControlFactory.createTranslatedTextField(parent, Messages.PartDescriptorEditor_Tooltip, master, context,
-				textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP),
-				resourcePool, project);
+				textProp, E4Properties.tooltip(getEditingDomain()), resourcePool, project);
 
 		// ------------------------------------------------------------
 		{
@@ -190,8 +179,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
 					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
-							master));
+					E4Properties.iconUri(getEditingDomain()).observeDetail(master));
 
 			new ImageTooltip(t, Messages, this);
 
@@ -200,7 +188,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final PartDescriptorIconDialogEditor dialog = new PartDescriptorIconDialogEditor(b.getShell(),
-							eclipseContext, project, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), Messages);
+							eclipseContext, project, getEditingDomain(), getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -218,10 +206,10 @@ eclipseContext, new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				final MPart dummyPart = MBasicFactory.INSTANCE.createPart();
-				final String contributionURI = ((MPartDescriptor) getMaster().getValue()).getContributionURI();
+				final String contributionURI = getMaster().getValue().getContributionURI();
 				dummyPart.setContributionURI(contributionURI);
 				contributionCreator.createOpen(dummyPart, getEditingDomain(), project, folder.getShell());
-				((MPartDescriptor) master.getValue()).setContributionURI(dummyPart.getContributionURI());
+				master.getValue().setContributionURI(dummyPart.getContributionURI());
 			}
 		});
 
@@ -235,7 +223,7 @@ public void widgetSelected(SelectionEvent e) {
 			createRemoveToolBar.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					final MPartDescriptor window = (MPartDescriptor) getMaster().getValue();
+					final MPartDescriptor window = getMaster().getValue();
 					if (window.getToolbar() == null) {
 						addToolBar();
 					} else {
@@ -256,9 +244,12 @@ public void widgetSelected(SelectionEvent e) {
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			t.setLayoutData(gd);
+			// TODO: Is it correct to use containerData on an MPartDescriptor?
+			@SuppressWarnings({ "unchecked", "rawtypes" })
+			IValueProperty<MPartDescriptor, String> containerData = (IValueProperty) E4Properties
+			.containerData(getEditingDomain());
 			context.bindValue(textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA)
-					.observeDetail(master));
+					containerData.observeDetail(master));
 		}
 
 
@@ -271,11 +262,8 @@ public void widgetSelected(SelectionEvent e) {
 			final Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
 
-			final IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(),
-					BasicPackageImpl.Literals.PART_DESCRIPTOR__CLOSEABLE);
-			final IWidgetValueProperty uiProp = WidgetProperties.selection();
-
-			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
+			context.bindValue(WidgetProperties.buttonSelection().observe(checkbox),
+					E4Properties.closable(getEditingDomain()).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -287,11 +275,8 @@ public void widgetSelected(SelectionEvent e) {
 			final Button checkbox = new Button(parent, SWT.CHECK);
 			checkbox.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false, 2, 1));
 
-			final IEMFEditValueProperty mprop = EMFEditProperties.value(getEditingDomain(),
-					BasicPackageImpl.Literals.PART_DESCRIPTOR__ALLOW_MULTIPLE);
-			final IWidgetValueProperty uiProp = WidgetProperties.selection();
-
-			context.bindValue(uiProp.observe(checkbox), mprop.observeDetail(master));
+			context.bindValue(WidgetProperties.buttonSelection().observe(checkbox),
+					E4Properties.allowMultiple(getEditingDomain()).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -303,8 +288,7 @@ public void widgetSelected(SelectionEvent e) {
 			final Text t = new Text(parent, SWT.BORDER);
 			t.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false, 2, 1));
 			context.bindValue(textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CATEGORY)
-					.observeDetail(master));
+					E4Properties.category(getEditingDomain()).observeDetail(master));
 		}
 
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.PartEditor_BindingContexts);
@@ -355,39 +339,24 @@ private void removeToolBar() {
 	}
 
 	@Override
-	public IObservableList getChildList(final Object element) {
-		final WritableList list = new WritableList();
+	public IObservableList<?> getChildList(final Object element) {
+		final WritableList<Object> list = new WritableList<>();
+		final MPartDescriptor window = (MPartDescriptor) element;
 
 		if (getEditor().isModelFragment() && Util.isImport((EObject) element)) {
 			return list;
 		}
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PARTDESCRIPTOR_MENU, PART__MENUS, element,
-				Messages.PartDescriptorEditor_Menus) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element,
-				Messages.PartDescriptorEditor_Handlers) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_PARTDESCRIPTOR_MENU, E4Properties.partDescriptorMenus(), window,
+				Messages.PartDescriptorEditor_Menus));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_HANDLER, E4Properties.handlers(), window,
+				Messages.PartDescriptorEditor_Handlers));
 
-		final MPartDescriptor window = (MPartDescriptor) element;
 		if (window.getToolbar() != null) {
 			list.add(0, window.getToolbar());
 		}
 
-		PART__TOOLBAR.observe(element).addValueChangeListener(event -> {
+		E4Properties.partDescriptorToolbar().observe(window).addValueChangeListener(event -> {
 			if (event.diff.getOldValue() != null) {
 				list.remove(event.diff.getOldValue());
 				if (getMaster().getValue() == element && !createRemoveToolBar.isDisposed()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 8179ac93e3..94c9b98c97 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -20,14 +20,13 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -35,7 +34,6 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
-import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
@@ -45,13 +43,11 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -68,15 +64,10 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class PartEditor extends AbstractComponentEditor {
+public class PartEditor extends AbstractComponentEditor<MPart> {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-
-	private final IListProperty PART__MENUS = EMFProperties.list(BasicPackageImpl.Literals.PART__MENUS);
-	private final IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties
-			.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
-	private final IValueProperty PART__TOOLBAR = EMFProperties.value(BasicPackageImpl.Literals.PART__TOOLBAR);
 	private Button createRemoveToolBar;
 	private StackLayout stackLayout;
 
@@ -143,14 +134,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 			createRemoveToolBar.setSelection(((MPart) object).getToolbar() != null);
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MPart) object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 
 		return composite;
 	}
 
-	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue master,
+	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue<MPart> master,
 			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
@@ -164,7 +155,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -173,15 +164,13 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.PartEditor_LabelLabel, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
+				E4Properties.label(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, master, context,
-				textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.PartEditor_Tooltip, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
+				E4Properties.tooltip(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		{
@@ -195,8 +184,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
 					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
-							master));
+					E4Properties.iconUri(getEditingDomain()).observeDetail(master));
 
 			new ImageTooltip(t, Messages, this);
 
@@ -205,7 +193,7 @@ protected Composite createForm(Composite parent, EMFDataBindingContext context,
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), eclipseContext, project,
-							getEditingDomain(), (MPart) getMaster().getValue(), Messages);
+							getEditingDomain(), getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -218,7 +206,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		// ------------------------------------------------------------
 		ControlFactory.createTextField(parent, Messages.PartEditor_ContainerData, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
+				E4Properties.containerData(getEditingDomain()));
 
 		createSubformElements(parent, context, master);
 
@@ -231,7 +219,7 @@ public void widgetSelected(SelectionEvent e) {
 			createRemoveToolBar.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					final MPart window = (MPart) getMaster().getValue();
+					final MPart window = getMaster().getValue();
 					if (window.getToolbar() == null) {
 						addToolBar();
 					} else {
@@ -243,16 +231,14 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.PartEditor_Closeable, Messages.PartEditor_Closeable_Tooltip,
-				getMaster(), context, WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART__CLOSEABLE));
+				getMaster(), context, WidgetProperties.buttonSelection(),
+				E4Properties.partClosable(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.PartEditor_BindingContexts);
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
@@ -329,44 +315,30 @@ private void removeToolBar() {
 		}
 	}
 
-	protected void createSubformElements(Composite parent, EMFDataBindingContext context, IObservableValue master) {
+	protected void createSubformElements(Composite parent, EMFDataBindingContext context,
+			IObservableValue<MPart> master) {
 
 	}
 
 	@Override
-	public IObservableList getChildList(final Object element) {
-		final WritableList list = new WritableList();
+	public IObservableList<?> getChildList(final Object element) {
+		final WritableList<Object> list = new WritableList<>();
+		final MPart window = (MPart) element;
 
 		if (getEditor().isModelFragment() && Util.isImport((EObject) element)) {
 			return list;
 		}
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PART_MENU, PART__MENUS, element,
-				Messages.PartEditor_Menus) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element,
-				Messages.PartEditor_Handlers) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_PART_MENU, E4Properties.partMenus(), window,
+				Messages.PartEditor_Menus));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_HANDLER, E4Properties.handlers(), window,
+				Messages.PartEditor_Handlers));
 
-		final MPart window = (MPart) element;
 		if (window.getToolbar() != null) {
 			list.add(0, window.getToolbar());
 		}
 
-		PART__TOOLBAR.observe(element).addValueChangeListener(event -> {
+		E4Properties.partToolbar().observe(window).addValueChangeListener(event -> {
 			if (event.diff.getOldValue() != null) {
 				list.remove(event.diff.getOldValue());
 				if (getMaster().getValue() == element && !createRemoveToolBar.isDisposed()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index aebc71d671..093a083aee 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -22,12 +22,12 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.FeatureClassLabelProvider;
@@ -38,23 +38,21 @@
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainerElement;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
-import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -74,14 +72,12 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
 
-public class PartSashContainerEditor extends AbstractComponentEditor {
+public class PartSashContainerEditor extends AbstractComponentEditor<MPartSashContainer> {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-
-	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<>();
 	private final List<Action> actionsImport = new ArrayList<>();
@@ -210,11 +206,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MPartSashContainer) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
+	private Composite createForm(Composite parent, final EMFDataBindingContext context,
+			WritableValue<MPartSashContainer> master,
 			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
@@ -228,7 +225,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -237,11 +234,9 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-				context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		{
@@ -262,15 +257,14 @@ public String getText(Object element) {
 				}
 			});
 			viewer.setInput(new Boolean[] { Boolean.TRUE, Boolean.FALSE });
-			final IViewerValueProperty vProp = ViewerProperties.singleSelection();
+			final IViewerValueProperty<ComboViewer, Boolean> vProp = ViewerProperties.singleSelection(Boolean.class);
 			context.bindValue(vProp.observe(viewer),
-					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL)
-					.observeDetail(getMaster()));
+					E4Properties.horizontal(getEditingDomain()).observeDetail(getMaster()));
 		}
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PartSashContainerEditor_SelectedElement);
 		ControlFactory.createTextField(parent, Messages.PartSashContainerEditor_ContainerData, master, context,
-				textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
+				textProp, E4Properties.containerData(getEditingDomain()));
 
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, null, this,
@@ -298,16 +292,13 @@ protected void addPressed() {
 			pickList.setSelection(new StructuredSelection(eClassList.get(0)));
 
 			final TableViewer viewer = pickList.getList();
-			final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(getMaster()));
+			viewer.setInput(E4Properties.<MPartSashContainerElement>children().observeDetail(getMaster()));
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -345,8 +336,8 @@ private void createUITreeInspection(CTabFolder folder) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	public IObservableList<?> getChildList(Object element) {
+		return E4Properties.<MPartSashContainerElement>children().observe((MPartSashContainer) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index ba8b61bec8..73274e4e86 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -22,12 +22,12 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.FeatureClassLabelProvider;
@@ -37,21 +37,19 @@
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
+import org.eclipse.e4.ui.model.application.ui.basic.MStackElement;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -66,15 +64,13 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Text;
 
 @SuppressWarnings("deprecation")
-public class PartStackEditor extends AbstractComponentEditor {
+public class PartStackEditor extends AbstractComponentEditor<MPartStack> {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-
-	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<>();
 	private final List<Action> actionsImport = new ArrayList<>();
@@ -188,14 +184,13 @@ public Composite doGetEditor(Composite parent, Object object) {
 				composite.layout(true, true);
 			}
 		}
-		final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-		viewer.setInput(prop.observeDetail(getMaster()));
-		getMaster().setValue(object);
+		viewer.setInput(E4Properties.<MStackElement>children().observeDetail(getMaster()));
+		getMaster().setValue((MPartStack) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
-			boolean isImport) {
+	private Composite createForm(Composite parent, final EMFDataBindingContext context,
+			WritableValue<MPartStack> master, boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -208,7 +203,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -217,14 +212,12 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-				context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PartStackEditor_SelectedElement);
 		ControlFactory.createTextField(parent, Messages.PartStackEditor_ContainerData, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
+				E4Properties.containerData(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		{
@@ -241,8 +234,7 @@ protected void addPressed() {
 			pickList.setText(Messages.PartStackEditor_Parts);
 
 			viewer = pickList.getList();
-			final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(getMaster()));
+			viewer.setInput(E4Properties.<MStackElement>children().observeDetail(getMaster()));
 
 			pickList.setLabelProvider(new FeatureClassLabelProvider(getEditor()));
 
@@ -260,11 +252,9 @@ protected void addPressed() {
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -302,8 +292,8 @@ private void createUITreeInspection(CTabFolder folder) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	public IObservableList<?> getChildList(Object element) {
+		return E4Properties.<MStackElement>children().observe((MPartStack) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index f343054237..b86c2b6f3c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -24,20 +24,19 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PerspectiveIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
-import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
@@ -46,16 +45,14 @@
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -72,16 +69,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class PerspectiveEditor extends AbstractComponentEditor {
+public class PerspectiveEditor extends AbstractComponentEditor<MPerspective> {
 	private Composite composite;
 	private EMFDataBindingContext context;
-
-	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private final IListProperty PERSPECTIVE__WINDOWS = EMFProperties
-			.list(AdvancedPackageImpl.Literals.PERSPECTIVE__WINDOWS);
-	private final IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties
-			.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<>();
 
@@ -190,14 +180,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MPerspective) object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
-			boolean isImport) {
+	private Composite createForm(Composite parent, final EMFDataBindingContext context,
+			WritableValue<MPerspective> master, boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -210,7 +200,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -219,18 +209,14 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-				context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PerspectiveEditor_SelectedElement);
 		ControlFactory.createTranslatedTextField(parent, Messages.PerspectiveEditor_LabelLabel, getMaster(), context,
-				textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL),
-				resourcePool, project);
+				textProp, E4Properties.label(getEditingDomain()), resourcePool, project);
 		ControlFactory.createTranslatedTextField(parent, Messages.PerspectiveEditor_Tooltip, getMaster(), context,
-				textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP),
-				resourcePool, project);
+				textProp, E4Properties.tooltip(getEditingDomain()), resourcePool, project);
 
 		// ------------------------------------------------------------
 		{
@@ -243,8 +229,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
 					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
-							master));
+					E4Properties.iconUri(getEditingDomain()).observeDetail(master));
 
 			new ImageTooltip(t, Messages, this);
 
@@ -253,18 +238,16 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final PerspectiveIconDialogEditor dialog = new PerspectiveIconDialogEditor(b.getShell(),
-							eclipseContext, project, getEditingDomain(), (MPerspective) getMaster().getValue(), Messages);
+							eclipseContext, project, getEditingDomain(), getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
 		final Composite comp0 = ControlFactory.createMapProperties(parent, Messages, this,
 				Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES,
@@ -312,35 +295,16 @@ private void createUITreeInspection(CTabFolder folder) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		final WritableList list = new WritableList();
-
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS,
-				element, Messages.WindowEditor_Handlers) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-		});
-
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PERSPECTIVE_WINDOWS, PERSPECTIVE__WINDOWS, element,
-				Messages.WindowEditor_Windows) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-		});
-
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_PERSPECTIVE_CONTROLS, ELEMENT_CONTAINER__CHILDREN,
-				element, Messages.PerspectiveEditor_Controls) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-		});
+	public IObservableList<?> getChildList(Object element) {
+		final WritableList<VirtualEntry<MPerspective, ?>> list = new WritableList<>();
+		MPerspective perspective = (MPerspective) element;
+
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_HANDLER, E4Properties.handlers(), perspective,
+				Messages.WindowEditor_Handlers));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_PERSPECTIVE_WINDOWS, E4Properties.perspectiveWindows(), perspective,
+				Messages.WindowEditor_Windows));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_PERSPECTIVE_CONTROLS, E4Properties.children(), perspective,
+				Messages.PerspectiveEditor_Controls));
 
 		return list;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 55d8a45c27..f13b3ec63f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -24,11 +24,11 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
@@ -42,15 +42,12 @@
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.resource.FontDescriptor;
 import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
@@ -68,13 +65,11 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
 
-public class PerspectiveStackEditor extends AbstractComponentEditor {
+public class PerspectiveStackEditor extends AbstractComponentEditor<MPerspectiveStack> {
 	private Composite composite;
 	private EMFDataBindingContext context;
-
-	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<>();
 	private final List<Action> actionsImport = new ArrayList<>();
@@ -160,12 +155,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MPerspectiveStack) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master,
-			boolean isImport) {
+	private Composite createForm(Composite parent, final EMFDataBindingContext context,
+			WritableValue<MPerspectiveStack> master, boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -178,7 +173,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -187,11 +182,9 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-				context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
 		ControlFactory.createSelectedElement(parent, this, context, Messages.PerspectiveStackEditor_SelectedElement);
 
 		// ------------------------------------------------------------
@@ -208,21 +201,18 @@ protected void addPressed() {
 			pickList.setText(Messages.PerspectiveStackEditor_Perspectives);
 
 			final TableViewer viewer = pickList.getList();
-			viewer.setContentProvider(new ObservableListContentProvider());
+			viewer.setContentProvider(new ObservableListContentProvider<>());
 			final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont())
 					.setStyle(SWT.ITALIC);
 			viewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
 					new ComponentLabelProvider(getEditor(), Messages, italicFontDescriptor)));
-			final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(getMaster()));
+			viewer.setInput(E4Properties.<MPerspective>children().observeDetail(getMaster()));
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -260,8 +250,8 @@ private void createUITreeInspection(CTabFolder folder) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	public IObservableList<?> getChildList(Object element) {
+		return E4Properties.<MPerspective>children().observe((MPerspectiveStack) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index c7259cc200..7ff2b25e94 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -25,6 +25,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.SharedElementsDialog;
@@ -40,10 +41,9 @@
 import org.eclipse.e4.ui.workbench.UIEvents.EventTags;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -60,7 +60,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class PlaceholderEditor extends AbstractComponentEditor {
+public class PlaceholderEditor extends AbstractComponentEditor<MPlaceholder> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private StackLayout stackLayout;
@@ -153,11 +153,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MPlaceholder) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context, WritableValue master, boolean isImport) {
+	private Composite createForm(Composite parent, final EMFDataBindingContext context,
+			WritableValue<MPlaceholder> master, boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -170,7 +171,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -178,9 +179,12 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-		ControlFactory.createTextField(parent, Messages.PlaceholderEditor_ContainerData, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__CONTAINER_DATA));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+				E4Properties.elementId(getEditingDomain()));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
+		ControlFactory.createTextField(parent, Messages.PlaceholderEditor_ContainerData, master, context, textProp,
+				E4Properties.containerData(getEditingDomain()));
 		// ------------------------------------------------------------
 		{
 			final Label l = new Label(parent, SWT.NONE);
@@ -193,19 +197,18 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 
-			final UpdateValueStrategy t2m = new UpdateValueStrategy();
-			t2m.setConverter(new Converter(String.class, MUIElement.class) {
-
+			final UpdateValueStrategy<String, MUIElement> t2m = new UpdateValueStrategy<>();
+			t2m.setConverter(new Converter<String, MUIElement>(String.class, MUIElement.class) {
 				@Override
-				public Object convert(Object fromObject) {
+				public MUIElement convert(String fromObject) {
 					return null;
 				}
 			});
-			final UpdateValueStrategy m2t = new UpdateValueStrategy();
-			m2t.setConverter(new Converter(MUIElement.class, String.class) {
+			final UpdateValueStrategy<MUIElement, String> m2t = new UpdateValueStrategy<>();
+			m2t.setConverter(new Converter<MUIElement, String>(MUIElement.class, String.class) {
 
 				@Override
-				public Object convert(Object fromObject) {
+				public String convert(MUIElement fromObject) {
 					if (fromObject != null) {
 						final EObject o = (EObject) fromObject;
 						if (o instanceof MUILabel) {
@@ -216,31 +219,32 @@ public Object convert(Object fromObject) {
 							}
 						}
 
-						return o.eClass().getName() + " - " + ((MUIElement) fromObject).getElementId(); //$NON-NLS-1$
+						return o.eClass().getName() + " - " + fromObject.getElementId(); //$NON-NLS-1$
 					}
 					return null;
 				}
 			});
 
-			context.bindValue(textProp.observe(t),
-					EMFEditProperties.value(getEditingDomain(), AdvancedPackageImpl.Literals.PLACEHOLDER__REF)
-					.observeDetail(getMaster()),
+			context.bindValue(textProp.observe(t), E4Properties.ref(getEditingDomain()).observeDetail(getMaster()),
 					t2m, m2t);
 
 			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					final SharedElementsDialog dialog = new SharedElementsDialog(b.getShell(), getEditor(), (MPlaceholder) getMaster().getValue(), resource, Messages);
+					final SharedElementsDialog dialog = new SharedElementsDialog(b.getShell(), getEditor(),
+							getMaster().getValue(), resource, Messages);
 					dialog.open();
 				}
 			});
 		}
 
-		ControlFactory.createCheckBox(parent, Messages.PlaceholderEditor_Closeable, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), AdvancedPackageImpl.Literals.PLACEHOLDER__CLOSEABLE));
-
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createCheckBox(parent, Messages.PlaceholderEditor_Closeable, getMaster(), context,
+				WidgetProperties.buttonSelection(), E4Properties.placeholderClosable(getEditingDomain()));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -275,7 +279,7 @@ private void createUITreeInspection(CTabFolder folder) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
index 4e868df7dd..2b15b41064 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
@@ -14,8 +14,10 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.swt.widgets.Composite;
 
@@ -27,7 +29,8 @@ public PopupMenuEditor() {
 	}
 
 	@Override
-	protected Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean rootMenu, boolean isImport) {
+	protected Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue<MMenu> master,
+			boolean rootMenu, boolean isImport) {
 		Composite comp = super.createForm(parent, context, master, rootMenu, isImport);
 		if (!isImport) {
 			ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 2108370d7e..8afc6f7223 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -27,7 +27,6 @@
 import javax.inject.Inject;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.emf.xpath.EcoreXPathContextFactory;
 import org.eclipse.e4.emf.xpath.XPathContext;
@@ -36,6 +35,7 @@
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.Util.InternalPackage;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
@@ -48,6 +48,7 @@
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationElementImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.fragment.MModelFragment;
 import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.e4.ui.model.fragment.impl.StringModelFragmentImpl;
@@ -55,10 +56,7 @@
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
@@ -71,7 +69,7 @@
 import org.eclipse.jface.bindings.keys.KeyStroke;
 import org.eclipse.jface.bindings.keys.ParseException;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.fieldassist.ContentProposal;
 import org.eclipse.jface.fieldassist.ContentProposalAdapter;
 import org.eclipse.jface.fieldassist.ControlDecoration;
@@ -96,7 +94,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class StringModelFragment extends AbstractComponentEditor {
+public class StringModelFragment extends AbstractComponentEditor<MStringModelFragment> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
@@ -104,9 +102,6 @@ public class StringModelFragment extends AbstractComponentEditor {
 	// It can be get from the FindParentReferenceDialog or computed from the ID.
 	private EClass selectedContainer;
 
-	private final IListProperty MODEL_FRAGMENT__ELEMENTS = EMFProperties
-			.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
-
 	// This is the list of available 'add child' actions depending on selected
 	// values
 	private final List<Action> actions = new ArrayList<>();
@@ -177,7 +172,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 			composite = createForm(parent);
 		}
 		selectedContainer = null;
-		getMaster().setValue(object);
+		getMaster().setValue((MStringModelFragment) object);
 		updateChildrenChoice();
 		getEditor().setHeaderTitle(getLabel(null));
 		return composite;
@@ -285,7 +280,7 @@ private Composite createForm(Composite parent) {
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.StringModelFragment_ParentId);
@@ -308,10 +303,7 @@ private Composite createForm(Composite parent) {
 			gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t),
-					EMFEditProperties
-					.value(getEditingDomain(),
-							FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__PARENT_ELEMENT_ID)
-					.observeDetail(getMaster()));
+					E4Properties.parentElementId(getEditingDomain()).observeDetail(getMaster()));
 
 			// Add a modify listener to control the change of the ID -> Must
 			// force the computation of selectedContainer.
@@ -322,7 +314,7 @@ private Composite createForm(Composite parent) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final FindParentReferenceElementDialog dialog = new FindParentReferenceElementDialog(b.getShell(),
-							StringModelFragment.this, (MStringModelFragment) getMaster().getValue(), Messages,
+							StringModelFragment.this, getMaster().getValue(), Messages,
 							getSelectedContainer());
 					dialog.open();
 					selectedContainer = dialog.getSelectedContainer();
@@ -352,9 +344,7 @@ public void widgetSelected(SelectionEvent e) {
 			gd = new GridData(GridData.FILL_HORIZONTAL);
 			featureText.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, featureText),
-					EMFEditProperties
-					.value(getEditingDomain(), FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__FEATURENAME)
-					.observeDetail(getMaster()));
+					E4Properties.featureName(getEditingDomain()).observeDetail(getMaster()));
 
 			// create the decoration for the text component
 			final ControlDecoration deco = new ControlDecoration(featureText, SWT.TOP | SWT.LEFT);
@@ -397,7 +387,7 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final FeatureSelectionDialog dialog = new FeatureSelectionDialog(b.getShell(),
-							getEditingDomain(), (MStringModelFragment) getMaster().getValue(), Messages,
+							getEditingDomain(), getMaster().getValue(), Messages,
 							getSelectedContainer());
 					dialog.open();
 				}
@@ -406,8 +396,7 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		ControlFactory.createTextField(parent, Messages.StringModelFragment_PositionInList, getMaster(), context,
-				textProp, EMFEditProperties.value(getEditingDomain(),
-						FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT__POSITION_IN_LIST));
+				textProp, E4Properties.positionInList(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		{
@@ -535,8 +524,7 @@ private void updateChildrenChoice() {
 
 		// pickList.getList().refresh();
 
-		final IEMFListProperty prop = EMFProperties.list(FragmentPackageImpl.Literals.MODEL_FRAGMENT__ELEMENTS);
-		pickList.getList().setInput(prop.observeDetail(getMaster()));
+		pickList.getList().setInput(E4Properties.elements().observeDetail(getMaster()));
 
 		// Update the possible actions
 		actions.clear();
@@ -551,8 +539,8 @@ public void run() {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		return MODEL_FRAGMENT__ELEMENTS.observe(element);
+	public IObservableList<?> getChildList(Object element) {
+		return E4Properties.elements().observe((MModelFragment) element);
 	}
 
 	protected void handleAdd(EClass eClass, boolean separator) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 4377e377ba..4fa620db5d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -25,12 +25,12 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList.Struct;
@@ -45,17 +45,14 @@
 import org.eclipse.e4.ui.workbench.modeling.EModelService;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -74,12 +71,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class ToolBarContributionEditor extends AbstractComponentEditor {
+public class ToolBarContributionEditor extends AbstractComponentEditor<MToolBarContribution> {
 	private Composite composite;
 	private EMFDataBindingContext context;
-
-	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<>();
 
@@ -179,11 +173,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MToolBarContribution) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MToolBarContribution> master, boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -196,7 +191,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -205,11 +200,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-				context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
 
 		{
 			final Label l = new Label(parent, SWT.NONE);
@@ -222,15 +215,14 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__PARENT_ID)
-					.observeDetail(getMaster()));
+					E4Properties.toolBarParentId(getEditingDomain()).observeDetail(getMaster()));
 
 			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final ToolBarIdDialog dialog = new ToolBarIdDialog(t.getShell(), resource,
-							(MToolBarContribution) getMaster().getValue(), getEditingDomain(), modelService, Messages);
+							getMaster().getValue(), getEditingDomain(), modelService, Messages);
 					dialog.open();
 				}
 			});
@@ -238,8 +230,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		ControlFactory.createTextField(parent, Messages.ToolBarContributionEditor_Position,
 				Messages.ToolBarContributionEditor_PositionTooltip, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(),
-						MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__POSITION_IN_PARENT));
+				E4Properties.toolBarPositionInParent(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		{
@@ -267,9 +258,7 @@ protected void addPressed() {
 			pickList.setText(Messages.ToolBarEditor_ToolbarItems);
 			final TableViewer viewer = pickList.getList();
 
-			final IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(),
-					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(master));
+			viewer.setInput(E4Properties.<MToolBarElement>children(getEditingDomain()).observeDetail(master));
 
 			final Struct defaultStruct = new Struct(Messages.ToolBarEditor_HandledToolItem,
 					MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
@@ -281,11 +270,9 @@ protected void addPressed() {
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -323,8 +310,8 @@ private void createUITreeInspection(CTabFolder folder) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	public IObservableList<?> getChildList(Object element) {
+		return E4Properties.<MToolBarElement>children().observe((MToolBarContribution) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 975787db74..c665102a59 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -23,9 +23,9 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList.Struct;
@@ -36,17 +36,14 @@
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
@@ -57,14 +54,12 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Text;
 
-public class ToolBarEditor extends AbstractComponentEditor {
+public class ToolBarEditor extends AbstractComponentEditor<MToolBar> {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-
-	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<>();
 
@@ -149,11 +144,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MToolBar) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue<MToolBar> master,
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -166,7 +162,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -175,11 +171,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-				context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		{
@@ -196,9 +190,7 @@ protected void addPressed() {
 			pickList.setText(Messages.ToolBarEditor_ToolbarItems);
 
 			final TableViewer viewer = pickList.getList();
-			final IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(),
-					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(master));
+			viewer.setInput(E4Properties.<MToolBarElement>children(getEditingDomain()).observeDetail(master));
 
 			final Struct defaultStruct = new Struct(Messages.ToolBarEditor_HandledToolItem,
 					MenuPackageImpl.Literals.HANDLED_TOOL_ITEM, false);
@@ -209,14 +201,10 @@ protected void addPressed() {
 			pickList.setSelection(new StructuredSelection(defaultStruct));
 		}
 
-		ControlFactory
-		.createCheckBox(
-				parent,
-				"To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory
-		.createCheckBox(
-				parent,
-				"Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context,
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.buttonSelection(),
+				E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -237,8 +225,8 @@ protected void addPressed() {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	public IObservableList<?> getChildList(Object element) {
+		return E4Properties.<MToolBarElement>children().observe((MToolBar) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 9c60f24bc6..529be7ac94 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -22,6 +22,7 @@
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -29,10 +30,9 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarSeparator;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -43,8 +43,9 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Text;
 
-public class ToolBarSeparatorEditor extends AbstractComponentEditor {
+public class ToolBarSeparatorEditor extends AbstractComponentEditor<MToolBarSeparator> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private StackLayout stackLayout;
@@ -107,11 +108,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MToolBarSeparator) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MToolBarSeparator> master, boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -124,7 +126,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -133,17 +135,13 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-				context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -181,7 +179,7 @@ private void createUITreeInspection(CTabFolder folder) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index a68d8683d9..06764f7a71 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -26,22 +26,21 @@
 import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
-import org.eclipse.e4.ui.model.application.MContribution;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolControl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -59,7 +58,7 @@
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
-public class ToolControlEditor extends AbstractComponentEditor {
+public class ToolControlEditor extends AbstractComponentEditor<MToolControl> {
 	private EMFDataBindingContext context;
 	private Composite composite;
 	private StackLayout stackLayout;
@@ -126,11 +125,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MToolControl) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue<MToolControl> master,
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -143,7 +143,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -152,11 +152,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-				context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		{
@@ -169,8 +167,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 				lnk.addSelectionListener(new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
-						c.createOpen((MContribution) getMaster().getValue(), getEditingDomain(), project,
-								lnk.getShell());
+						c.createOpen(getMaster().getValue(), getEditingDomain(), project, lnk.getShell());
 					}
 				});
 			} else {
@@ -184,15 +181,14 @@ public void widgetSelected(SelectionEvent e) {
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
 					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(),
-							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI).observeDetail(master));
+					E4Properties.contributionURI(getEditingDomain()).observeDetail(master));
 
 			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), eclipseContext,
-							getEditingDomain(), (MContribution) getMaster().getValue(),
+							getEditingDomain(), getMaster().getValue(),
 							ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
 					dialog.open();
 				}
@@ -200,12 +196,9 @@ public void widgetSelected(SelectionEvent e) {
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
-
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 
@@ -260,7 +253,7 @@ private void createUITreeInspection(CTabFolder folder) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		// TODO Auto-generated method stub
 		return null;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 9194c97e1a..cd9546599c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -27,13 +27,13 @@
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ToolItemIconDialogEditor;
@@ -47,16 +47,14 @@
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -75,14 +73,12 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public abstract class ToolItemEditor extends AbstractComponentEditor {
+public abstract class ToolItemEditor<M extends MToolItem> extends AbstractComponentEditor<M> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
 	private StackLayout stackLayout;
 
-	private final IValueProperty TOOL_ITEM__MENU = EMFProperties.value(MenuPackageImpl.Literals.TOOL_ITEM__MENU);
-
 	@Inject
 	@Optional
 	protected IProject project;
@@ -96,6 +92,7 @@ public ToolItemEditor() {
 		super();
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
@@ -129,13 +126,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 			createRemoveMenu.setSelection(((MToolItem) object).getMenu() != null);
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((M) object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 
 		return composite;
 	}
 
-	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+	protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue<M> master,
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -148,7 +146,7 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -156,7 +154,8 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 			return folder;
 		}
 
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+				E4Properties.elementId(getEditingDomain()));
 
 		createFormSubTypeForm(parent, folder, context, master);
 
@@ -183,10 +182,11 @@ private void createUITreeInspection(CTabFolder folder) {
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
-	protected void createFormSubTypeForm(Composite parent, CTabFolder folder, EMFDataBindingContext context, final WritableValue master) {
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-		final IWidgetValueProperty checkProp = WidgetProperties.selection();
-		final IWidgetValueProperty enabled = WidgetProperties.enabled();
+	protected void createFormSubTypeForm(Composite parent, CTabFolder folder, EMFDataBindingContext context,
+			final WritableValue<M> master) {
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Button, Boolean> checkProp = WidgetProperties.selection();
+		final IWidgetValueProperty<Button, Boolean> enabled = WidgetProperties.enabled();
 
 		// ------------------------------------------------------------
 		{
@@ -200,13 +200,16 @@ protected void createFormSubTypeForm(Composite parent, CTabFolder folder, EMFDat
 			final GridData gd = new GridData();
 			gd.horizontalSpan = 2;
 			viewer.getControl().setLayoutData(gd);
-			final IObservableValue itemTypeObs = EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(master);
+			final IObservableValue<ItemType> itemTypeObs = E4Properties.type(getEditingDomain()).observeDetail(master);
 			context.bindValue(ViewerProperties.singleSelection().observe(viewer), itemTypeObs);
 		}
 
-		ControlFactory.createTextField(parent, Messages.ToolItemEditor_Label, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
-		ControlFactory.createTextField(parent, Messages.ToolItemEditor_ToolTip, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP));
+		ControlFactory.createTextField(parent, Messages.ToolItemEditor_Label, master, context, textProp,
+				E4Properties.label(getEditingDomain()));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
+		ControlFactory.createTextField(parent, Messages.ToolItemEditor_ToolTip, master, context, textProp,
+				E4Properties.tooltip(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		{
@@ -217,7 +220,7 @@ protected void createFormSubTypeForm(Composite parent, CTabFolder folder, EMFDat
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
+			context.bindValue(textProp.observe(t), E4Properties.iconUri(getEditingDomain()).observeDetail(master));
 
 			new ImageTooltip(t, Messages, this);
 
@@ -225,7 +228,8 @@ protected void createFormSubTypeForm(Composite parent, CTabFolder folder, EMFDat
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					final ToolItemIconDialogEditor dialog = new ToolItemIconDialogEditor(b.getShell(), eclipseContext, project, getEditingDomain(), (MToolItem) getMaster().getValue(), Messages);
+					final ToolItemIconDialogEditor dialog = new ToolItemIconDialogEditor(b.getShell(), eclipseContext,
+							project, getEditingDomain(), getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -240,8 +244,7 @@ public void widgetSelected(SelectionEvent e) {
 			createRemoveMenu.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					final MToolItem item = (MToolItem) getMaster().getValue();
-					if (item.getMenu() == null) {
+					if (getMaster().getValue().getMenu() == null) {
 						addMenu();
 					} else {
 						removeMenu();
@@ -258,7 +261,8 @@ public void widgetSelected(SelectionEvent e) {
 
 			final Button b = new Button(parent, SWT.CHECK);
 			b.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
-			context.bindValue(checkProp.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__ENABLED).observeDetail(getMaster()));
+			context.bindValue(checkProp.observe(b),
+					E4Properties.enabled(getEditingDomain()).observeDetail(getMaster()));
 		}
 
 		{
@@ -268,26 +272,27 @@ public void widgetSelected(SelectionEvent e) {
 
 			final Button b = new Button(parent, SWT.CHECK);
 			b.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
-			context.bindValue(checkProp.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__SELECTED).observeDetail(getMaster()));
-
-			final UpdateValueStrategy t2m = new UpdateValueStrategy();
-			t2m.setConverter(new Converter(boolean.class, ItemType.class) {
+			context.bindValue(checkProp.observe(b),
+					E4Properties.selected(getEditingDomain()).observeDetail(getMaster()));
 
+			final UpdateValueStrategy<Boolean, ItemType> t2m = new UpdateValueStrategy<>();
+			t2m.setConverter(new Converter<Boolean, ItemType>(boolean.class, ItemType.class) {
 				@Override
-				public Object convert(Object fromObject) {
+				public ItemType convert(Boolean fromObject) {
 					return null;
 				}
 			});
-			final UpdateValueStrategy m2t = new UpdateValueStrategy();
-			m2t.setConverter(new Converter(ItemType.class, boolean.class) {
+			final UpdateValueStrategy<ItemType, Boolean> m2t = new UpdateValueStrategy<>();
+			m2t.setConverter(new Converter<ItemType, Boolean>(ItemType.class, boolean.class) {
 
 				@Override
-				public Object convert(Object fromObject) {
+				public Boolean convert(ItemType fromObject) {
 					return fromObject == ItemType.CHECK || fromObject == ItemType.RADIO;
 				}
 			});
 
-			context.bindValue(enabled.observe(b), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.ITEM__TYPE).observeDetail(getMaster()), t2m, m2t);
+			context.bindValue(enabled.observe(b), E4Properties.type(getEditingDomain()).observeDetail(getMaster()),
+					t2m, m2t);
 
 		}
 
@@ -316,14 +321,19 @@ public String getText(Object element) {
 			list.add(UiPackageImpl.Literals.IMPERATIVE_EXPRESSION);
 			list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
 			combo.setInput(list);
-			context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)), new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
+			context.bindValue(ViewerProperties.singleSelection().observe(combo),
+					E4Properties.visibleWhen(getEditingDomain()).observeDetail(getMaster()),
+					UpdateValueStrategy.create(new EClass2EObject<>(Messages)),
+					UpdateValueStrategy.create(new EObject2EClass<>(Messages)));
 		}
 		// ------------------------------------------------------------
 
 		createSubTypeFormElements(parent, context, master);
 
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+				WidgetProperties.selection(), E4Properties.toBeRendered(getEditingDomain()));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+				WidgetProperties.selection(), E4Properties.visible(getEditingDomain()));
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -335,7 +345,7 @@ public String getText(Object element) {
 		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
 	}
 
-	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, WritableValue<M> master) {
 
 	}
 
@@ -357,15 +367,15 @@ void addMenu() {
 	}
 
 	@Override
-	public IObservableList getChildList(final Object element) {
-		final WritableList list = new WritableList();
-
+	public IObservableList<Object> getChildList(final Object element) {
+		final WritableList<Object> list = new WritableList<>();
 		final MToolItem item = (MToolItem) element;
+
 		if (item.getMenu() != null) {
 			list.add(0, item.getMenu());
 		}
 
-		TOOL_ITEM__MENU.observe(element).addValueChangeListener(event -> {
+		E4Properties.menu().observe(item).addValueChangeListener(event -> {
 			if (event.diff.getOldValue() != null) {
 				list.remove(event.diff.getOldValue());
 				if (getMaster().getValue() == element && !createRemoveMenu.isDisposed()) {
@@ -404,7 +414,7 @@ public FeaturePath[] getLabelProperties() {
 				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
 
-	static class EObject2EClass extends Converter {
+	static class EObject2EClass<T> extends Converter<T, Object> {
 		private final Messages Messages;
 
 		public EObject2EClass(Messages Messages) {
@@ -413,7 +423,7 @@ public EObject2EClass(Messages Messages) {
 		}
 
 		@Override
-		public Object convert(Object fromObject) {
+		public Object convert(T fromObject) {
 			if (fromObject == null) {
 				return Messages.MenuItemEditor_NoExpression;
 			}
@@ -421,7 +431,7 @@ public Object convert(Object fromObject) {
 		}
 	}
 
-	static class EClass2EObject extends Converter {
+	static class EClass2EObject<T> extends Converter<Object, T> {
 		private final Messages Messages;
 
 		public EClass2EObject(Messages Messages) {
@@ -429,12 +439,13 @@ public EClass2EObject(Messages Messages) {
 			this.Messages = Messages;
 		}
 
+		@SuppressWarnings("unchecked")
 		@Override
-		public Object convert(Object fromObject) {
+		public T convert(Object fromObject) {
 			if (fromObject == null || fromObject.toString().equals(Messages.MenuItemEditor_NoExpression)) {
 				return null;
 			}
-			return EcoreUtil.create((EClass) fromObject);
+			return (T) EcoreUtil.create((EClass) fromObject);
 		}
 	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index f4e62d4a10..0ab5d0b393 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -23,14 +23,13 @@
 import javax.inject.Inject;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.services.nls.Translation;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
@@ -42,22 +41,20 @@
 import org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer;
 import org.eclipse.e4.ui.model.application.ui.SideValue;
 import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -73,14 +70,12 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
-public class TrimBarEditor extends AbstractComponentEditor {
+public class TrimBarEditor extends AbstractComponentEditor<MTrimBar> {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-
-	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<>();
 
@@ -161,11 +156,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MTrimBar) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue<MTrimBar> master,
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -178,7 +174,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -187,11 +183,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-				context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		{
@@ -205,9 +199,8 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final GridData gd = new GridData();
 			gd.horizontalSpan = 2;
 			viewer.getControl().setLayoutData(gd);
-			final IObservableValue sideValueObs = EMFEditProperties.value(getEditingDomain(),
-					UiPackageImpl.Literals.GENERIC_TRIM_CONTAINER__SIDE).observeDetail(master);
-			context.bindValue(ViewerProperties.singleSelection().observe(viewer), sideValueObs);
+			context.bindValue(ViewerProperties.singleSelection(SideValue.class).observe(viewer),
+					E4Properties.<MTrimElement>side(getEditingDomain()).observeDetail(master));
 		}
 
 		// ------------------------------------------------------------
@@ -230,16 +223,13 @@ protected void addPressed() {
 			.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
 			pickList.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
 
-			final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(getMaster()));
+			viewer.setInput(E4Properties.<MTrimElement>children().observeDetail(getMaster()));
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -277,8 +267,8 @@ private void createUITreeInspection(CTabFolder folder) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	public IObservableList<?> getChildList(Object element) {
+		return E4Properties.<MTrimElement>children().observe((MTrimBar) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 858e5191cb..205741b3b2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -27,12 +27,12 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
@@ -40,23 +40,21 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.TrimIdDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.e4.ui.workbench.modeling.EModelService;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.IEMFListProperty;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.resource.FontDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -80,12 +78,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class TrimContributionEditor extends AbstractComponentEditor {
+public class TrimContributionEditor extends AbstractComponentEditor<MTrimContribution> {
 	private Composite composite;
 	private EMFDataBindingContext context;
-
-	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
 	private StackLayout stackLayout;
 	private final List<Action> actions = new ArrayList<>();
 
@@ -170,11 +165,12 @@ public Composite doGetEditor(Composite parent, Object object) {
 			}
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MTrimContribution) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MTrimContribution> master, boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -187,7 +183,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -196,11 +192,9 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-				context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
+				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_ParentId);
@@ -211,25 +205,22 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			t.setLayoutData(gd);
 			context.bindValue(textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.TRIM_CONTRIBUTION__PARENT_ID)
-					.observeDetail(getMaster()));
+					E4Properties.trimParentId(getEditingDomain()).observeDetail(getMaster()));
 
 			Button b = ControlFactory.createFindButton(parent, resourcePool);
 			b.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final TrimIdDialog dialog = new TrimIdDialog(t.getShell(), resource,
-							(MTrimContribution) getMaster().getValue(), getEditingDomain(), modelService, Messages);
+							getMaster().getValue(), getEditingDomain(), modelService, Messages);
 					dialog.open();
 				}
 			});
 
 		}
 
-		ControlFactory
-		.createTextField(parent, Messages.TrimContributionEditor_Position, master, context, textProp,
-				EMFEditProperties.value(getEditingDomain(),
-						MenuPackageImpl.Literals.TRIM_CONTRIBUTION__POSITION_IN_PARENT));
+		ControlFactory.createTextField(parent, Messages.TrimContributionEditor_Position, master, context, textProp,
+				E4Properties.trimPositionInParent(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		{
@@ -249,9 +240,8 @@ protected void addPressed() {
 					.setStyle(SWT.ITALIC);
 			viewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
 					new ComponentLabelProvider(getEditor(), Messages, italicFontDescriptor)));
-			viewer.setContentProvider(new ObservableListContentProvider());
-			final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-			viewer.setInput(prop.observeDetail(getMaster()));
+			viewer.setContentProvider(new ObservableListContentProvider<>());
+			viewer.setInput(E4Properties.<MTrimElement>children().observeDetail(getMaster()));
 
 			pickList.setContentProvider(new ArrayContentProvider());
 			pickList.setLabelProvider(new LabelProvider() {
@@ -266,11 +256,9 @@ public String getText(Object element) {
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(),
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
@@ -308,8 +296,8 @@ private void createUITreeInspection(CTabFolder folder) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		return ELEMENT_CONTAINER__CHILDREN.observe(element);
+	public IObservableList<?> getChildList(Object element) {
+		return E4Properties.<MTrimElement>children().observe((MTrimContribution) element);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
index 7a037c3789..65b3bb98f2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
@@ -14,39 +14,31 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
 import javax.inject.Inject;
+
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
-import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
 import org.eclipse.emf.ecore.EObject;
 
 public class TrimmedWindowEditor extends WindowEditor {
-	private IListProperty TRIMMED_WINDOW__TRIM_BARS = EMFProperties.list(BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS);
-
 	@Inject
 	public TrimmedWindowEditor() {
 		super();
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		IObservableList list = super.getChildList(element);
+	public IObservableList<Object> getChildList(Object element) {
+		IObservableList<Object> list = super.getChildList(element);
 
 		if (getEditor().isModelFragment() && Util.isImport((EObject) element)) {
 			return list;
 		}
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_TRIMMED_WINDOW_TRIMS, TRIMMED_WINDOW__TRIM_BARS, element, Messages.TrimmedWindowEditor_TrimBars) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_TRIMMED_WINDOW_TRIMS, E4Properties.trimBars(),
+				(MTrimmedWindow) element, Messages.TrimmedWindowEditor_TrimBars));
 		return list;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
index e112a79280..366a512570 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
@@ -7,6 +7,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.conversion.IConverter;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -41,6 +42,7 @@
  * </ul>
  */
 public class UnsettableUpdateValueStrategy extends EMFUpdateValueStrategy {
+	@SuppressWarnings("rawtypes")
 	@Override
 	protected IConverter createConverter(Object fromType, Object toType) {
 		if (fromType == String.class) {
@@ -105,10 +107,15 @@ public Object convert(Object fromObject) {
 	 * org.eclipse.core.databinding.UpdateValueStrategy#doSet(org.eclipse.core
 	 * .databinding.observable.value.IObservableValue, java.lang.Object)
 	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Override
 	protected IStatus doSet(IObservableValue observableValue, Object value) {
 		// TODO Auto-generated method stub
 		return super.doSet(observableValue, value);
 	}
 
+	@SuppressWarnings("unchecked")
+	public static <S, D> UpdateValueStrategy<S, D> create() {
+		return new UnsettableUpdateValueStrategy();
+	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 906777bb95..da63fc7bd2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -25,20 +25,18 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.property.list.IListProperty;
-import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.WindowIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
-import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
@@ -48,14 +46,12 @@
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -72,20 +68,10 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class WindowEditor extends AbstractComponentEditor {
+public class WindowEditor extends AbstractComponentEditor<MWindow> {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-
-	private final IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties
-			.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
-	private final IListProperty WINDOW__WINDOWS = EMFProperties.list(BasicPackageImpl.Literals.WINDOW__WINDOWS);
-	private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
-			.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
-	private final IListProperty SHARED_ELEMENTS = EMFProperties.list(BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
-	private final IListProperty SNIPPETS = EMFProperties.list(UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS);
-	private final IValueProperty WINDOW__MAIN_MENU = EMFProperties.value(BasicPackageImpl.Literals.WINDOW__MAIN_MENU);
-
 	private Action addMainMenu;
 	private Button createRemoveMainMenu;
 	private StackLayout stackLayout;
@@ -160,14 +146,15 @@ public Composite doGetEditor(Composite parent, Object object) {
 			createRemoveMainMenu.setSelection(((MWindow) object).getMainMenu() != null);
 		}
 
-		getMaster().setValue(object);
+		getMaster().setValue((MWindow) object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
 				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, null);
 
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue<MWindow> master,
+			boolean isImport) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -180,7 +167,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			ControlFactory.createXMIId(parent, this);
 		}
 
-		final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 		if (isImport) {
 			ControlFactory.createFindImport(parent, Messages, this, context);
@@ -189,8 +176,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 		}
 
 		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, getMaster(), context, textProp,
-				EMFEditProperties
-				.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
+				E4Properties.elementId(getEditingDomain()));
 
 		// ------------------------------------------------------------
 		{
@@ -211,36 +197,35 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
 					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__X).observeDetail(
-							getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
+					E4Properties.windowX(getEditingDomain()).observeDetail(getMaster()),
+					UnsettableUpdateValueStrategy.create(), UnsettableUpdateValueStrategy.create());
 
 			t = new Text(comp, SWT.BORDER | SWT.TRAIL);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
 					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__Y).observeDetail(
-							getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
+					E4Properties.windowY(getEditingDomain()).observeDetail(getMaster()),
+					UnsettableUpdateValueStrategy.create(), UnsettableUpdateValueStrategy.create());
 
 			t = new Text(comp, SWT.BORDER | SWT.TRAIL);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
 					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__WIDTH).observeDetail(
-							getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
+					E4Properties.width(getEditingDomain()).observeDetail(getMaster()),
+					UnsettableUpdateValueStrategy.create(), UnsettableUpdateValueStrategy.create());
 
 			t = new Text(comp, SWT.BORDER | SWT.TRAIL);
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
 					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__HEIGHT).observeDetail(
-							getMaster()), new UnsettableUpdateValueStrategy(), new UnsettableUpdateValueStrategy());
+					E4Properties.height(getEditingDomain()).observeDetail(getMaster()),
+					UnsettableUpdateValueStrategy.create(), UnsettableUpdateValueStrategy.create());
 		}
 
 		ControlFactory.createTranslatedTextField(parent, Messages.WindowEditor_Label, getMaster(), context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__LABEL), resourcePool, project);
+				E4Properties.label(getEditingDomain()), resourcePool, project);
 		ControlFactory.createTranslatedTextField(parent, Messages.WindowEditor_Tooltip, getMaster(), context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__TOOLTIP), resourcePool,
-				project);
+				E4Properties.tooltip(getEditingDomain()), resourcePool, project);
 
 		// ------------------------------------------------------------
 		{
@@ -252,8 +237,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			context.bindValue(
 					textProp.observeDelayed(200, t),
-					EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(
-							master));
+					E4Properties.iconUri(getEditingDomain()).observeDetail(master));
 
 			new ImageTooltip(t, Messages, this);
 
@@ -262,7 +246,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final WindowIconDialogEditor dialog = new WindowIconDialogEditor(b.getShell(), eclipseContext,
-							project, getEditingDomain(), (MWindow) getMaster().getValue(), Messages);
+							project, getEditingDomain(), getMaster().getValue(), Messages);
 					dialog.open();
 				}
 			});
@@ -277,7 +261,7 @@ public void widgetSelected(SelectionEvent e) {
 			createRemoveMainMenu.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					final MWindow window = (MWindow) getMaster().getValue();
+					final MWindow window = getMaster().getValue();
 					if (window.getMainMenu() == null) {
 						addMenu();
 					} else {
@@ -288,14 +272,10 @@ public void widgetSelected(SelectionEvent e) {
 			createRemoveMainMenu.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 		}
 
-		ControlFactory
-		.createCheckBox(
-				parent,
-				"To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
-		ControlFactory
-		.createCheckBox(
-				parent,
-				"Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context,
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
+		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.buttonSelection(), //$NON-NLS-1$
+				E4Properties.visible(getEditingDomain()));
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.WindowEditor_SelectedElement);
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.WindowEditor_BindingContexts);
@@ -309,8 +289,7 @@ public void widgetSelected(SelectionEvent e) {
 		item.setControl(parent.getParent());
 
 		ControlFactory.createTranslatedTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase,
-				getMaster(), context, textProp,
-				EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE),
+				getMaster(), context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()),
 				resourcePool, project);
 		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables,
 				UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
@@ -363,64 +342,30 @@ void addMenu() {
 	}
 
 	@Override
-	public IObservableList getChildList(final Object element) {
-		final WritableList list = new WritableList();
+	public IObservableList<Object> getChildList(final Object element) {
+		final WritableList<Object> list = new WritableList<>();
 		if (getEditor().isModelFragment() && Util.isImport((EObject) element)) {
 			return list;
 		}
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_HANDLER, HANDLER_CONTAINER__HANDLERS, element,
-				Messages.WindowEditor_Handlers) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_WINDOWS, WINDOW__WINDOWS, element,
-				Messages.WindowEditor_Windows) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_CONTROLS, ELEMENT_CONTAINER__CHILDREN, element,
-				Messages.WindowEditor_Controls) {
-
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-
-		});
-
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_SHARED_ELEMENTS, SHARED_ELEMENTS, element,
-				Messages.WindowEditor_SharedElements) {
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-		});
+		final MWindow window = (MWindow) element;
 
-		list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_SNIPPETS, SNIPPETS, element,
-				Messages.WindowEditor_Snippets) {
-			@Override
-			protected boolean accepted(Object o) {
-				return true;
-			}
-		});
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_HANDLER, E4Properties.handlers(), window,
+				Messages.WindowEditor_Handlers));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_WINDOW_WINDOWS, E4Properties.windowWindows(), window,
+				Messages.WindowEditor_Windows));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_WINDOW_CONTROLS, E4Properties.children(), window,
+				Messages.WindowEditor_Controls));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_WINDOW_SHARED_ELEMENTS, E4Properties.sharedElements(), window,
+				Messages.WindowEditor_SharedElements));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_WINDOW_SNIPPETS, E4Properties.snippets(), window,
+				Messages.WindowEditor_Snippets));
 
-		final MWindow window = (MWindow) element;
 		if (window.getMainMenu() != null) {
 			list.add(0, window.getMainMenu());
 		}
 
-		WINDOW__MAIN_MENU.observe(element).addValueChangeListener(event -> {
+		E4Properties.mainMenu().observe(window).addValueChangeListener(event -> {
 			if (event.diff.getOldValue() != null) {
 				list.remove(event.diff.getOldValue());
 				if (getMaster().getValue() == element && !createRemoveMainMenu.isDisposed()) {
@@ -466,4 +411,4 @@ public List<Action> getActions(Object element) {
 	protected Action getActionAddMainMenu() {
 		return addMainMenu;
 	}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index 6a9e502530..2efc12db06 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -94,7 +94,7 @@ protected Control createDialogArea(Composite parent) {
 		viewer.addDoubleClickListener(event -> okPressed());
 
 		final List<EObject> commands = new ArrayList<>();
-		final TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
+		final TreeIterator<EObject> it = EcoreUtil.getAllContents(resource.getRoot().get(0), true);
 		while (it.hasNext()) {
 			final EObject o = it.next();
 			if (o.eClass() == CommandsPackageImpl.Literals.COMMAND) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
index 50979271e2..532d740138 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
@@ -157,7 +157,7 @@ public void widgetSelected(SelectionEvent e) {
 		viewer = new TableViewer(container, SWT.FULL_SELECTION | SWT.BORDER);
 		GridData gd = new GridData(GridData.FILL_BOTH);
 		viewer.getControl().setLayoutData(gd);
-		viewer.setContentProvider(new ObservableListContentProvider());
+		viewer.setContentProvider(new ObservableListContentProvider<>());
 		viewer.setLabelProvider(new StyledCellLabelProvider() {
 			@Override
 			public void update(ViewerCell cell) {
@@ -186,7 +186,7 @@ public void update(ViewerCell cell) {
 			}
 		});
 
-		final WritableList list = new WritableList();
+		final WritableList<IFile> list = new WritableList<>();
 		viewer.setInput(list);
 		viewer.addDoubleClickListener(event -> okPressed());
 
@@ -279,9 +279,9 @@ public String getValue() {
 
 	private class IconMatchCallback {
 		private volatile boolean cancel;
-		private IObservableList list;
+		private IObservableList<IFile> list;
 
-		private IconMatchCallback(IObservableList list) {
+		private IconMatchCallback(IObservableList<IFile> list) {
 			this.list = list;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
index be22627021..e8e01e255a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
@@ -273,7 +273,9 @@ protected boolean doSearch() {
 
 		clearImages();
 
-		callback = new IconMatchCallback((IObservableList) getViewer().getInput());
+		@SuppressWarnings("unchecked")
+		IObservableList<Entry> fileList = (IObservableList<Entry>) getViewer().getInput();
+		callback = new IconMatchCallback(fileList);
 		final Filter filter = new Filter(project, getFilterTextBox().getText());
 		filter.setSearchScope(getSearchScopes());
 		filter.setBundles(getFilterBundles());
@@ -317,9 +319,9 @@ protected void okPressed() {
 
 	private class IconMatchCallback {
 		private volatile boolean cancel;
-		private final IObservableList list;
+		private final IObservableList<Entry> list;
 
-		private IconMatchCallback(IObservableList list) {
+		private IconMatchCallback(IObservableList<Entry> list) {
 			this.list = list;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
index c61920e319..c5b4594419 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
@@ -91,7 +91,7 @@ protected Control createDialogArea(Composite parent) {
 		viewer.addDoubleClickListener(event -> okPressed());
 
 		final List<EObject> categories = new ArrayList<>();
-		final TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
+		final TreeIterator<EObject> it = EcoreUtil.getAllContents(resource.getRoot().get(0), true);
 		while (it.hasNext()) {
 			final EObject o = it.next();
 			if (o.eClass() == CommandsPackageImpl.Literals.BINDING_CONTEXT) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
index fd6fbd8064..2101df8504 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -92,7 +92,7 @@ protected Control createDialogArea(Composite parent) {
 		viewer.addDoubleClickListener(event -> okPressed());
 
 		final List<EObject> categories = new ArrayList<>();
-		final TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
+		final TreeIterator<EObject> it = EcoreUtil.getAllContents(resource.getRoot().get(0), true);
 		while (it.hasNext()) {
 			final EObject o = it.next();
 			if (o.eClass() == CommandsPackageImpl.Literals.CATEGORY) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index d88fa1eb5b..b4337ac1be 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -123,7 +123,7 @@ public abstract class FilteredContributionDialog extends SaveDialogBoundsSetting
 	protected boolean includeNonBundles;
 	private Label lblStatus;
 	private Button btnIncludeNoneBundle;
-	private WritableList viewerList;
+	private WritableList<ContributionData> viewerList;
 	protected BundleImageCache imageCache;
 	protected Job currentSearchThread;
 	private ContributionResultHandlerImpl currentResultHandler;
@@ -179,9 +179,9 @@ private void updateStatusMessage() {
 
 	private class ContributionResultHandlerImpl implements ContributionResultHandler {
 		private boolean cancled = false;
-		private final IObservableList list;
+		private final IObservableList<ContributionData> list;
 
-		public ContributionResultHandlerImpl(IObservableList list) {
+		public ContributionResultHandlerImpl(IObservableList<ContributionData> list) {
 			this.list = list;
 		}
 
@@ -793,7 +793,7 @@ protected Control createContents(Composite parent) {
 
 	protected void rebuildViewer() {
 
-		viewerList = new WritableList();
+		viewerList = new WritableList<>();
 
 		final TableViewer oldViewer = viewer;
 		viewer = new TableViewer(compOptions, SWT.FULL_SELECTION | SWT.BORDER);
@@ -803,7 +803,7 @@ protected void rebuildViewer() {
 		}
 		final GridData gd = new GridData(GridData.FILL_BOTH);
 		viewer.getControl().setLayoutData(gd);
-		viewer.setContentProvider(new ObservableListContentProvider());
+		viewer.setContentProvider(new ObservableListContentProvider<>());
 		viewer.setLabelProvider(new StyledCellLabelProvider() {
 			@Override
 			public void update(ViewerCell cell) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index f794602283..328e311c69 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -51,11 +51,12 @@
 
 public class FindImportElementDialog extends SaveDialogBoundsSettingsDialog {
 	private final EObject element;
-	private final AbstractComponentEditor editor;
+	private final AbstractComponentEditor<?> editor;
 	private TableViewer viewer;
 	private final Messages Messages;
 
-	public FindImportElementDialog(Shell parentShell, AbstractComponentEditor editor, EObject element, Messages Messages) {
+	public FindImportElementDialog(Shell parentShell, AbstractComponentEditor<?> editor, EObject element,
+			Messages Messages) {
 		super(parentShell);
 		this.element = element;
 		this.editor = editor;
@@ -112,10 +113,10 @@ public void update(ViewerCell cell) {
 				cell.setText(styledString.getString());
 			}
 		});
-		viewer.setContentProvider(new ObservableListContentProvider());
+		viewer.setContentProvider(new ObservableListContentProvider<>());
 		viewer.addDoubleClickListener(event -> okPressed());
 
-		final WritableList list = new WritableList();
+		final WritableList<Object> list = new WritableList<>();
 		viewer.setInput(list);
 
 		final ClassContributionCollector collector = getCollector();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index a0071711dd..72275d7bc8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -75,11 +75,11 @@ public class FindParentReferenceElementDialog extends TitleAreaDialog {
 	private static final String XPATH_URI = "xpath:/"; //$NON-NLS-1$
 
 	private final MStringModelFragment fragment;
-	private final AbstractComponentEditor editor;
+	private final AbstractComponentEditor<?> editor;
 	private TableViewer viewer;
 	private final Messages Messages;
 	private ModelResultHandlerImpl currentResultHandler;
-	private WritableList list;
+	private WritableList<Object> list;
 	private ComboViewer eClassViewer;
 	private Text searchText;
 	private EClass selectedContainer;
@@ -88,7 +88,7 @@ public class FindParentReferenceElementDialog extends TitleAreaDialog {
 	/** Remember of classes that can be used for a fragment definition. */
 	private static List<EClass> extendableClasses = null;
 
-	public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEditor editor,
+	public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEditor<?> editor,
 			MStringModelFragment fragment, Messages Messages, EClass previousSelection) {
 		super(parentShell);
 		this.fragment = fragment;
@@ -199,7 +199,7 @@ public void setControlContents(Control control, String text1, int cursorPosition
 			@Override
 			public void update(ViewerCell cell) {
 				final EObject o = (EObject) cell.getElement();
-				final AbstractComponentEditor editor = FindParentReferenceElementDialog.this.editor.getEditor()
+				final AbstractComponentEditor<?> editor = FindParentReferenceElementDialog.this.editor.getEditor()
 						.getEditor(o.eClass());
 				cell.setImage(editor.getImage(o));
 
@@ -221,10 +221,10 @@ public void update(ViewerCell cell) {
 				cell.setText(styledString.getString());
 			}
 		});
-		viewer.setContentProvider(new ObservableListContentProvider());
+		viewer.setContentProvider(new ObservableListContentProvider<>());
 		viewer.addDoubleClickListener(event -> okPressed());
 
-		list = new WritableList();
+		list = new WritableList<>();
 		viewer.setInput(list);
 
 		searchText.addModifyListener(e -> updateSearch());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ModelResultHandlerImpl.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ModelResultHandlerImpl.java
index d01facc5a0..8bffef8707 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ModelResultHandlerImpl.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ModelResultHandlerImpl.java
@@ -10,12 +10,12 @@
 
 public class ModelResultHandlerImpl implements ModelResultHandler {
 	private boolean canceled = false;
-	private final IObservableList list;
+	private final IObservableList<Object> list;
 	private final Filter filter;
-	private final AbstractComponentEditor editor;
+	private final AbstractComponentEditor<?> editor;
 	private final Resource resource;
 
-	public ModelResultHandlerImpl(IObservableList list, Filter filter, AbstractComponentEditor editor,
+	public ModelResultHandlerImpl(IObservableList<Object> list, Filter filter, AbstractComponentEditor<?> editor,
 			Resource resource) {
 		this.list = list;
 		this.filter = filter;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
index b2de6d8c5b..33a1876ed9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
@@ -127,7 +127,7 @@ protected String getListItemInformation(MCommandParameter listItem) {
 	 * @return all found MCommandParameters or an empty {@link List}, never a {@code null} value.
 	 */
 	protected List<MCommandParameter> getParametersOfParentNodesCommand() {
-		TreeIterator<EObject> it = EcoreUtil.getAllContents((EObject) resource.getRoot().get(0), true);
+		TreeIterator<EObject> it = EcoreUtil.getAllContents(resource.getRoot().get(0), true);
 		while (it.hasNext()) {
 			EObject containerObjectWithCommand = it.next();
 			if (containerObjectWithCommand != null && canSupplyParameters(containerObjectWithCommand)) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index a0d9816436..71b8e673eb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -195,7 +195,7 @@ public String getText(Object element) {
 		}
 
 		private String getTypename(EObject o) {
-			final AbstractComponentEditor editor = SharedElementsDialog.this.editor.getEditor(o.eClass());
+			final AbstractComponentEditor<?> editor = SharedElementsDialog.this.editor.getEditor(o.eClass());
 			if (editor != null) {
 				return editor.getLabel(o);
 			}
@@ -204,8 +204,8 @@ private String getTypename(EObject o) {
 
 		@Override
 		public Image getImage(Object element) {
-			final AbstractComponentEditor editor = SharedElementsDialog.this.editor.getEditor(((EObject) element)
-					.eClass());
+			final AbstractComponentEditor<?> editor = SharedElementsDialog.this.editor
+					.getEditor(((EObject) element).eClass());
 			if (editor != null) {
 				return editor.getImage(element);
 			}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index bdb68c7c2d..cddd46fb92 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -45,7 +45,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VApplicationAddons extends AbstractComponentEditor {
+public class VApplicationAddons extends AbstractComponentEditor<MApplication> {
 	private Composite composite;
 	private TableViewer viewer;
 	private EMFDataBindingContext context;
@@ -90,13 +90,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<MApplication, ?> o = (VirtualEntry<MApplication, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue<MApplication> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -142,7 +143,7 @@ private void handleAddAddon() {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index 7d5f8ac447..17591c19bd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -47,7 +47,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VApplicationCategoriesEditor extends AbstractComponentEditor {
+public class VApplicationCategoriesEditor extends AbstractComponentEditor<MApplication> {
 	private Composite composite;
 	private TableViewer viewer;
 	private EMFDataBindingContext context;
@@ -109,13 +109,15 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		VirtualEntry<MApplication, ?> o = (VirtualEntry<MApplication, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MApplication> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -148,7 +150,7 @@ protected List<?> getContainerChildren(Object container) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java
index 325af803bf..379fea564c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java
@@ -1,9 +1,11 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import javax.inject.Inject;
+
+import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 
-public class VApplicationWindowEditor extends VWindowEditor {
+public class VApplicationWindowEditor extends VWindowEditor<MApplication> {
 
 	@Inject
 	public VApplicationWindowEditor() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index 7c24958715..a8679ed7dc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -31,6 +31,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.MBindingTable;
+import org.eclipse.e4.ui.model.application.commands.MBindingTableContainer;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -44,7 +45,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VBindingTableEditor extends AbstractComponentEditor {
+public class VBindingTableEditor extends AbstractComponentEditor<MBindingTableContainer> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
@@ -88,13 +89,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 			composite = createForm(parent, context, getMaster());
 
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<MBindingTableContainer, ?> o = (VirtualEntry<MBindingTableContainer, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue<MBindingTableContainer> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -139,7 +141,7 @@ protected void handleAdd() {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index 37b0e6436e..c8cb636db7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -50,7 +50,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VCommandEditor extends AbstractComponentEditor {
+public class VCommandEditor extends AbstractComponentEditor<MApplication> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
@@ -109,13 +109,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<MApplication, ?> o = (VirtualEntry<MApplication, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue<MApplication> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -174,7 +175,7 @@ protected void handleImport() {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 63d88f222c..7ed0e46d62 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -47,7 +47,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VHandlerEditor extends AbstractComponentEditor {
+public class VHandlerEditor extends AbstractComponentEditor<MHandlerContainer> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
@@ -100,13 +100,15 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<MHandlerContainer, ?> o = (VirtualEntry<MHandlerContainer, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MHandlerContainer> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -142,7 +144,7 @@ protected List<?> getContainerChildren(Object container) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
index dcf5cd8140..d7a777c6f1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -24,6 +24,7 @@
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
@@ -35,8 +36,6 @@
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.TableViewer;
@@ -46,15 +45,12 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VItemParametersEditor extends AbstractComponentEditor {
+public class VItemParametersEditor extends AbstractComponentEditor<MHandledItem> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
 	private final List<Action> actions = new ArrayList<>();
 
-	private final IEMFListProperty HANDLED_ITEM__PARAMETERS = EMFProperties
-			.list(MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS);
-
 	@Inject
 	public VItemParametersEditor() {
 		super();
@@ -93,13 +89,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<MHandledItem, ?> o = (VirtualEntry<MHandledItem, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue<MHandledItem> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -135,8 +132,8 @@ protected List<?> getContainerChildren(Object container) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
-		return HANDLED_ITEM__PARAMETERS.observe(element);
+	public IObservableList<?> getChildList(Object element) {
+		return E4Properties.itemParameters().observe((MHandledItem) element);
 	}
 
 	protected void handleAdd() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index 272e0173e1..255acd9f6f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -31,6 +31,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -44,7 +45,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VMenuContributionsEditor extends AbstractComponentEditor {
+public class VMenuContributionsEditor extends AbstractComponentEditor<MMenuContributions> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
@@ -88,13 +89,15 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<MMenuContributions, ?> o = (VirtualEntry<MMenuContributions, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MMenuContributions> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -128,7 +131,7 @@ protected List<?> getContainerChildren(Object container) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index a11d587b3a..fb34529b12 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -53,7 +53,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VMenuEditor extends AbstractComponentEditor {
+public class VMenuEditor<M> extends AbstractComponentEditor<M> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private StructuredViewer viewer;
@@ -117,13 +117,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<M, ?> o = (VirtualEntry<M, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue<M> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -181,7 +182,7 @@ public String getText(Object element) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index 0d520f2e85..d0b2cf366b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -44,7 +44,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VModelFragmentsEditor extends AbstractComponentEditor {
+public class VModelFragmentsEditor extends AbstractComponentEditor<MModelFragments> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
@@ -87,13 +87,15 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<MModelFragments, ?> o = (VirtualEntry<MModelFragments, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MModelFragments> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -129,7 +131,7 @@ protected List<?> getContainerChildren(Object container) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index 1f8c01c989..13bff5fb78 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -30,6 +30,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
 import org.eclipse.e4.ui.model.fragment.impl.FragmentPackageImpl;
 import org.eclipse.e4.ui.model.fragment.impl.ModelFragmentsImpl;
 import org.eclipse.emf.common.command.Command;
@@ -49,7 +50,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VModelImportsEditor extends AbstractComponentEditor {
+public class VModelImportsEditor extends AbstractComponentEditor<MModelFragments> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 
@@ -83,13 +84,15 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<MModelFragments, ?> o = (VirtualEntry<MModelFragments, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MModelFragments> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 		composite = folder;
 
@@ -161,7 +164,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index 6ecc9993c6..609b9f69f8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -49,7 +49,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VPartDescriptor extends AbstractComponentEditor {
+public class VPartDescriptor extends AbstractComponentEditor<MPartDescriptorContainer> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
@@ -113,13 +113,15 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<MPartDescriptorContainer, ?> o = (VirtualEntry<MPartDescriptorContainer, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MPartDescriptorContainer> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -153,7 +155,7 @@ protected List<?> getContainerChildren(Object container) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java
index b14dc15b85..a66c1ea614 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java
@@ -2,7 +2,9 @@
 
 import javax.inject.Inject;
 
-public class VPartDescriptorMenuEditor extends VMenuEditor {
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
+
+public class VPartDescriptorMenuEditor extends VMenuEditor<MPartDescriptor> {
 	@Inject
 	public VPartDescriptorMenuEditor() {
 		super(org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java
index 3c5191fd25..1db8853f15 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java
@@ -1,9 +1,11 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import javax.inject.Inject;
+
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 
-public class VPartMenuEditor extends VMenuEditor {
+public class VPartMenuEditor extends VMenuEditor<MPart> {
 	@Inject
 	public VPartMenuEditor() {
 		super(BasicPackageImpl.Literals.PART__MENUS);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index 5e74385f3d..b366bf9c0c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -30,6 +30,8 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -49,7 +51,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VPerspectiveControlEditor extends AbstractComponentEditor {
+public class VPerspectiveControlEditor extends AbstractComponentEditor<MElementContainer<MUIElement>> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
@@ -119,13 +121,15 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<MElementContainer<MUIElement>, ?> o = (VirtualEntry<MElementContainer<MUIElement>, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MElementContainer<MUIElement>> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -160,7 +164,7 @@ protected void addPressed() {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java
index 3d3865a7f8..d9b8a1d058 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java
@@ -1,9 +1,11 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import javax.inject.Inject;
+
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 
-public class VPerspectiveWindowsEditor extends VWindowEditor {
+public class VPerspectiveWindowsEditor extends VWindowEditor<MPerspective> {
 
 	@Inject
 	public VPerspectiveWindowsEditor() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
index 5eb196266a..6026d0ff1e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
@@ -31,6 +31,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.MBindingContext;
+import org.eclipse.e4.ui.model.application.commands.MBindingTableContainer;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.emf.common.command.Command;
@@ -44,7 +45,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VRootBindingContexts extends AbstractComponentEditor {
+public class VRootBindingContexts extends AbstractComponentEditor<MBindingTableContainer> {
 	private Composite composite;
 	private TableViewer viewer;
 	private EMFDataBindingContext context;
@@ -87,13 +88,15 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<MBindingTableContainer, ?> o = (VirtualEntry<MBindingTableContainer, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MBindingTableContainer> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -138,7 +141,7 @@ private void handleAddContext() {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index fb4e95884c..32d68aa886 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -20,6 +20,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.ui.MSnippetContainer;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -40,7 +41,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VSnippetsEditor extends AbstractComponentEditor {
+public class VSnippetsEditor extends AbstractComponentEditor<MSnippetContainer> {
 
 	/** Define the classes available to create snippets */
 	public static final EClass[] SNIPPET_CHILDREN = new EClass[] { AdvancedPackageImpl.Literals.AREA, BasicPackageImpl.Literals.PART,
@@ -166,13 +167,15 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<MSnippetContainer, ?> o = (VirtualEntry<MSnippetContainer, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MSnippetContainer> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -207,7 +210,7 @@ protected List<?> getContainerChildren(Object container) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index e0b7d25059..9d1f85867c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -32,6 +32,7 @@
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContributions;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -44,7 +45,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VToolBarContributionsEditor extends AbstractComponentEditor {
+public class VToolBarContributionsEditor extends AbstractComponentEditor<MToolBarContributions> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
@@ -87,13 +88,15 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<MToolBarContributions, ?> o = (VirtualEntry<MToolBarContributions, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MToolBarContributions> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -126,7 +129,7 @@ protected List<?> getContainerChildren(Object container) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index 5491d2fcd5..cc8ca323cb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -32,6 +32,7 @@
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
 import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
+import org.eclipse.e4.ui.model.application.ui.menu.MTrimContributions;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -44,7 +45,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VTrimContributionsEditor extends AbstractComponentEditor {
+public class VTrimContributionsEditor extends AbstractComponentEditor<MTrimContributions> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
@@ -87,13 +88,15 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<MTrimContributions, ?> o = (VirtualEntry<MTrimContributions, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MTrimContributions> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -126,7 +129,7 @@ protected List<?> getContainerChildren(Object container) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index f8d6556ad6..3291d1e111 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -31,6 +31,8 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -50,7 +52,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VWindowControlEditor extends AbstractComponentEditor {
+public class VWindowControlEditor extends AbstractComponentEditor<MElementContainer<MUIElement>> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private final List<Action> actions = new ArrayList<>();
@@ -130,13 +132,15 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<MElementContainer<MUIElement>, ?> o = (VirtualEntry<MElementContainer<MUIElement>, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MElementContainer<MUIElement>> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -179,7 +183,7 @@ public String getText(Object element) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index d7d3faef20..5bb6817903 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -47,7 +47,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public abstract class VWindowEditor extends AbstractComponentEditor {
+public abstract class VWindowEditor<M> extends AbstractComponentEditor<M> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
@@ -96,13 +96,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<M, ?> o = (VirtualEntry<M, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue<M> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -137,7 +138,7 @@ protected List<?> getContainerChildren(Object container) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 05ac6e56de..1fa0071dbf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -26,6 +26,7 @@
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
@@ -40,8 +41,6 @@
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -57,7 +56,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VWindowSharedElementsEditor extends AbstractComponentEditor {
+public class VWindowSharedElementsEditor extends AbstractComponentEditor<MWindow> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private StructuredViewer viewer;
@@ -146,13 +145,14 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<MWindow, ?> o = (VirtualEntry<MWindow, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue<MWindow> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -178,9 +178,7 @@ protected List<?> getContainerChildren(Object container) {
 			};
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 			viewer = pickList.getList();
-
-			final IEMFEditListProperty prop = EMFEditProperties.list(getEditingDomain(), BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
-			viewer.setInput(prop.observeDetail(getMaster()));
+			viewer.setInput(E4Properties.sharedElements(getEditingDomain()).observeDetail(getMaster()));
 
 			pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
 			pickList.setInput(
@@ -195,7 +193,7 @@ protected List<?> getContainerChildren(Object container) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index 32426e9bdf..2b1994b248 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -44,7 +44,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
-public class VWindowTrimEditor extends AbstractComponentEditor {
+public class VWindowTrimEditor extends AbstractComponentEditor<MTrimmedWindow> {
 	private Composite composite;
 	private EMFDataBindingContext context;
 	private TableViewer viewer;
@@ -87,13 +87,15 @@ public Composite doGetEditor(Composite parent, Object object) {
 			context = new EMFDataBindingContext();
 			composite = createForm(parent, context, getMaster());
 		}
-		final VirtualEntry<?> o = (VirtualEntry<?>) object;
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<MTrimmedWindow, ?> o = (VirtualEntry<MTrimmedWindow, ?>) object;
 		viewer.setInput(o.getList());
 		getMaster().setValue(o.getOriginalParent());
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master) {
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MTrimmedWindow> master) {
 		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
@@ -129,7 +131,7 @@ protected List<?> getContainerChildren(Object master) {
 	}
 
 	@Override
-	public IObservableList getChildList(Object element) {
+	public IObservableList<?> getChildList(Object element) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java
index 7e1dd2df67..945811f865 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java
@@ -1,9 +1,11 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
 import javax.inject.Inject;
+
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 
-public class VWindowWindowsEditor extends VWindowEditor {
+public class VWindowWindowsEditor extends VWindowEditor<MWindow> {
 
 	@Inject
 	public VWindowWindowsEditor() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
index ad08b954cf..b2498381f7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
@@ -4,6 +4,7 @@
 import java.util.Collections;
 
 import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionPoint;
@@ -17,7 +18,6 @@
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.internal.ModelUtils;
 import org.eclipse.emf.databinding.EMFProperties;
-import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.MenuManager;
@@ -40,14 +40,15 @@
 import org.eclipse.swt.widgets.Label;
 
 public class ObjectViewer {
-	public TreeViewer createViewer(Composite parent, EStructuralFeature feature, final IObservableValue master,
+	public TreeViewer createViewer(Composite parent, EStructuralFeature feature, final IObservableValue<?> master,
 			IResourcePool resourcePool, final Messages messages) {
 		final TreeViewer viewer = new TreeViewer(parent);
 		viewer.setContentProvider(new ContentProviderImpl());
 		viewer.setLabelProvider(new LabelProviderImpl(resourcePool));
 		viewer.setComparator(new ViewerComparatorImpl());
-		final IEMFValueProperty property = EMFProperties.value(feature);
-		final IObservableValue value = property.observeDetail(master);
+		@SuppressWarnings("unchecked")
+		final IValueProperty<Object, Object> property = EMFProperties.value(feature);
+		final IObservableValue<Object> value = property.observeDetail(master);
 		value.addValueChangeListener(event -> {
 			if (event.diff.getNewValue() != null) {
 				viewer.setInput(Collections.singleton(new JavaObject(event.diff.getNewValue())));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
index 5a6c978a60..b136e79bee 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
@@ -81,13 +81,14 @@ public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell, @Transla
 
 	static class ExportIdDialog extends TitleAreaDialog {
 		private Messages messages;
-		private IObservableList list;
+		private IObservableList<?> list;
 		private IResourcePool pool;
 		private JavaClass clazz;
 		private CheckboxTableViewer viewer;
 		private Text textClassName;
 
-		public ExportIdDialog(Shell parentShell, Messages messages, IObservableList list, IResourcePool pool, IProject project) {
+		public ExportIdDialog(Shell parentShell, Messages messages, IObservableList<?> list, IResourcePool pool,
+				IProject project) {
 			super(parentShell);
 			this.messages = messages;
 			this.list = list;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
index d1c28b2b5c..d28eccc24e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
@@ -58,13 +58,14 @@ public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell, @Transla
 
 	static class ExtractionDialog extends TitleAreaDialog {
 		private Messages messages;
-		private IObservableList list;
+		private IObservableList<? extends EObject> list;
 		private IResourcePool pool;
 		private IProject project;
 		private CheckboxTableViewer viewer;
 		private IModelResource resource;
 
-		public ExtractionDialog(Shell parentShell, Messages messages, IModelResource resource, IObservableList list, IResourcePool pool, IProject project) {
+		public ExtractionDialog(Shell parentShell, Messages messages, IModelResource resource,
+				IObservableList<? extends EObject> list, IResourcePool pool, IProject project) {
 			super(parentShell);
 			this.messages = messages;
 			this.list = list;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
index 8881fc81e0..f47950b877 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
@@ -136,7 +136,7 @@ protected Control createDialogArea(Composite parent) {
 		viewer = new TableViewer(container, SWT.FULL_SELECTION | SWT.BORDER);
 		GridData gd = new GridData(GridData.FILL_BOTH);
 		viewer.getControl().setLayoutData(gd);
-		viewer.setContentProvider(new ObservableListContentProvider());
+		viewer.setContentProvider(new ObservableListContentProvider<>());
 		viewer.setLabelProvider(new StyledCellLabelProvider() {
 			@Override
 			public void update(ViewerCell cell) {
@@ -191,7 +191,7 @@ public void update(ViewerCell cell) {
 		});
 		viewer.addDoubleClickListener(event -> okPressed());
 
-		final WritableList list = new WritableList();
+		final WritableList<ContributionData> list = new WritableList<>();
 		viewer.setInput(list);
 
 		final ClassContributionCollector collector = getCollector();
@@ -393,9 +393,9 @@ public void setBundleclassUri(String bundleclass) {
 
 	private static class ContributionResultHandlerImpl implements ContributionResultHandler {
 		private boolean cancled = false;
-		private IObservableList list;
+		private IObservableList<ContributionData> list;
 
-		public ContributionResultHandlerImpl(IObservableList list) {
+		public ContributionResultHandlerImpl(IObservableList<ContributionData> list) {
 			this.list = list;
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
index b5cddd88f5..a30decc08f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
@@ -38,12 +38,14 @@
 import org.eclipse.swt.widgets.Control;
 
 public class UIViewer {
-	public TreeViewer createViewer(Composite parent, EStructuralFeature feature, final IObservableValue master, IResourcePool resourcePool, final Messages messages) {
+	public TreeViewer createViewer(Composite parent, EStructuralFeature feature, final IObservableValue<?> master,
+			IResourcePool resourcePool, final Messages messages) {
 		final TreeViewer viewer = new TreeViewer(parent);
 		viewer.setContentProvider(new WidgetContentProvider());
 		viewer.setLabelProvider(new WidgetLabelProvider(resourcePool));
 		IEMFValueProperty property = EMFProperties.value(feature);
-		IObservableValue value = property.observeDetail(master);
+		@SuppressWarnings("unchecked")
+		IObservableValue<?> value = property.observeDetail(master);
 		value.addValueChangeListener(event -> {
 			if (event.diff.getNewValue() != null) {
 				viewer.setInput(Collections.singleton(event.diff.getNewValue()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
index 11221cb2fe..143bc4211c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
@@ -42,7 +42,7 @@
 public class ViewerElement {
 
 	private StructuredViewer viewer;
-	private final AbstractComponentEditor editor;
+	private final AbstractComponentEditor<?> editor;
 	private ComboViewer dropDown;
 	private Button addButton;
 	private final Composite parent;
@@ -58,7 +58,7 @@ public class ViewerElement {
 	 * @param editor
 	 */
 	@Inject
-	public ViewerElement(Composite parent, AbstractComponentEditor editor) {
+	public ViewerElement(Composite parent, AbstractComponentEditor<?> editor) {
 		this.parent = parent;
 		this.editor = editor;
 		createControl();
@@ -182,7 +182,8 @@ public ComboViewer getDropDown() {
 	 * @param editor
 	 * @return a new {@link ViewerElement}
 	 */
-	public static ViewerElement create(IEclipseContext parentContext, Composite parent, AbstractComponentEditor editor) {
+	public static ViewerElement create(IEclipseContext parentContext, Composite parent,
+			AbstractComponentEditor<?> editor) {
 		final IEclipseContext mycontext = parentContext.createChild();
 		mycontext.set(Composite.class, parent);
 		mycontext.set(AbstractComponentEditor.class, editor);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
index 4751f43aa8..68256a3a63 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
@@ -80,7 +80,7 @@ public List<Diagnostic> getErrorList() {
 	public void updateFromEMF() {
 		try {
 			updateFromEMF = true;
-			document.set(toXMI((EObject) modelResource.getRoot().get(0)));
+			document.set(toXMI(modelResource.getRoot().get(0)));
 		} finally {
 			updateFromEMF = false;
 		}
@@ -112,7 +112,7 @@ public IRegion findStartTag(EObject object) {
 		if (object == null) {
 			return null;
 		}
-		final E4XMIResource root = (E4XMIResource) ((EObject) modelResource.getRoot().get(0)).eResource();
+		final E4XMIResource root = (E4XMIResource) modelResource.getRoot().get(0).eResource();
 		final String xmiId = root.getID(object);
 
 		final FindReplaceDocumentAdapter find = new FindReplaceDocumentAdapter(document);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
index ba28bab2bb..203f6cf79f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
@@ -33,17 +33,17 @@ public class ModelImportWizard extends Wizard {
 
 	private final MApplication application;
 
-	private final AbstractComponentEditor editor;
+	private final AbstractComponentEditor<?> editor;
 
 	private final String hint;
 
-	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, AbstractComponentEditor editor,
-		IResourcePool resourcePool) {
+	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, AbstractComponentEditor<?> editor,
+			IResourcePool resourcePool) {
 		this(applicationElement, editor, "", resourcePool); //$NON-NLS-1$
 	}
 
-	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, AbstractComponentEditor editor,
-		String hint, IResourcePool resourcePool) {
+	public ModelImportWizard(Class<? extends MApplicationElement> applicationElement, AbstractComponentEditor<?> editor,
+			String hint, IResourcePool resourcePool) {
 		this.applicationElement = applicationElement;
 		this.editor = editor;
 		this.hint = hint;
@@ -124,7 +124,7 @@ public MApplicationElement[] getElements(Class<? extends MApplicationElement> ty
 		return RegistryUtil.getModelElements(type, getHint(), application, page1.getConfigurationElements());
 	}
 
-	public AbstractComponentEditor getEditor() {
+	public AbstractComponentEditor<?> getEditor() {
 		return editor;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index 710afc711a..d5e855cc8a 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -21,7 +21,7 @@
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.UpdateValueStrategy;
-import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.beans.typed.BeanProperties;
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.validation.IValidator;
@@ -54,7 +54,7 @@
 import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
 import org.eclipse.jface.databinding.swt.ISWTObservableValue;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.databinding.wizard.WizardPageSupport;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -215,7 +215,6 @@ protected IDialogSettings getDialogSettings() {
 		return settingsSection;
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public void createControl(Composite parent) {
 		final Image img = new Image(parent.getDisplay(), getClass().getClassLoader().getResourceAsStream(
@@ -251,10 +250,11 @@ public void createControl(Composite parent) {
 			t.setEditable(false);
 
 			final Binding bd = dbc.bindValue(
-					WidgetProperties.text().observe(t), BeanProperties.value(FRAGMENT_ROOT).observe(clazz),
-					new UpdateValueStrategy<>().setBeforeSetValidator(new PFRootValidator()),
-					new UpdateValueStrategy<>().setConverter(new PackageFragmentRootToStringConverter())
-					);
+					WidgetProperties.text().observe(t),
+					BeanProperties.value(FRAGMENT_ROOT, IPackageFragmentRoot.class).observe(clazz),
+					new UpdateValueStrategy<String, IPackageFragmentRoot>()
+					.setBeforeSetValidator(new PFRootValidator()),
+					UpdateValueStrategy.create(new PackageFragmentRootToStringConverter()));
 
 			final Button b = new Button(parent, SWT.PUSH);
 			b.setText(Messages.AbstractNewClassPage_Browse);
@@ -280,9 +280,9 @@ public void widgetSelected(SelectionEvent e) {
 			tClassPackage.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			final Binding bd = dbc.bindValue(
 					WidgetProperties.text(SWT.Modify).observe(tClassPackage),
-					BeanProperties.value(PACKAGE_FRAGMENT).observe(clazz),
-					new UpdateValueStrategy<>().setConverter(new StringToPackageFragmentConverter(clazz)),
-					new UpdateValueStrategy<>().setConverter(new PackageFragmentToStringConverter()));
+					BeanProperties.value(PACKAGE_FRAGMENT, IPackageFragment.class).observe(clazz),
+					UpdateValueStrategy.create(new StringToPackageFragmentConverter(clazz)),
+					UpdateValueStrategy.create(new PackageFragmentToStringConverter()));
 
 			final Button b = new Button(parent, SWT.PUSH);
 			b.setText(Messages.AbstractNewClassPage_Browse);
@@ -300,7 +300,7 @@ public void widgetSelected(SelectionEvent e) {
 
 		final Text tClassName;
 		{
-			final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+			final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.AbstractNewClassPage_Name);
@@ -309,7 +309,7 @@ public void widgetSelected(SelectionEvent e) {
 			tClassName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			dbc.bindValue(textProp.observe(tClassName),
 					BeanProperties.value(PROPERTY_NAME, String.class).observe(clazz),
-					new UpdateValueStrategy<>().setBeforeSetValidator(new ClassnameValidator()), null);
+					new UpdateValueStrategy<String, String>().setBeforeSetValidator(new ClassnameValidator()), null);
 
 			new Label(parent, SWT.NONE);
 		}
@@ -319,8 +319,8 @@ public void widgetSelected(SelectionEvent e) {
 			l.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 3, 1));
 		}
 
-		final ISWTObservableValue obsPackage = WidgetProperties.text(SWT.Modify).observe(tClassPackage);
-		final ISWTObservableValue obsClass = WidgetProperties.text(SWT.Modify).observe(tClassName);
+		final ISWTObservableValue<String> obsPackage = WidgetProperties.text(SWT.Modify).observe(tClassPackage);
+		final ISWTObservableValue<String> obsClass = WidgetProperties.text(SWT.Modify).observe(tClassName);
 		final ClassMultiValidator multiValidator = new ClassMultiValidator(clazz, obsPackage, obsClass);
 		dbc.addValidationStatusProvider(multiValidator);
 
@@ -506,11 +506,10 @@ protected IStatus validate() {
 
 	}
 
-	static class ClassnameValidator implements IValidator<Object> {
+	static class ClassnameValidator implements IValidator<String> {
 
 		@Override
-		public IStatus validate(Object value) {
-			final String name = value.toString();
+		public IStatus validate(String name) {
 			if (name.length() == 0) {
 				return new Status(IStatus.ERROR, ToolsPlugin.PLUGIN_ID, Messages.AbstractNewClassPage_NameNotEmpty);
 			}
@@ -537,39 +536,37 @@ public IStatus validate(Object value) {
 		}
 	}
 
-	static class PackageFragmentRootToStringConverter extends Converter<Object, Object> {
+	static class PackageFragmentRootToStringConverter extends Converter<IPackageFragmentRoot, String> {
 
 		public PackageFragmentRootToStringConverter() {
 			super(IPackageFragmentRoot.class, String.class);
 		}
 
 		@Override
-		public Object convert(Object fromObject) {
-			final IPackageFragmentRoot f = (IPackageFragmentRoot) fromObject;
-			if (f == null) {
+		public String convert(IPackageFragmentRoot fromObject) {
+			if (fromObject == null) {
 				return ""; //$NON-NLS-1$
 			}
-			return f.getPath().makeRelative().toString();
+			return fromObject.getPath().makeRelative().toString();
 		}
 	}
 
-	static class PackageFragmentToStringConverter extends Converter<Object, Object> {
+	static class PackageFragmentToStringConverter extends Converter<IPackageFragment, String> {
 
 		public PackageFragmentToStringConverter() {
 			super(IPackageFragment.class, String.class);
 		}
 
 		@Override
-		public Object convert(Object fromObject) {
+		public String convert(IPackageFragment fromObject) {
 			if (fromObject == null) {
 				return ""; //$NON-NLS-1$
 			}
-			final IPackageFragment f = (IPackageFragment) fromObject;
-			return f.getElementName();
+			return fromObject.getElementName();
 		}
 	}
 
-	static class StringToPackageFragmentConverter extends Converter<Object, Object> {
+	static class StringToPackageFragmentConverter extends Converter<String, IPackageFragment> {
 
 		private final JavaClass clazz;
 
@@ -579,7 +576,7 @@ public StringToPackageFragmentConverter(JavaClass clazz) {
 		}
 
 		@Override
-		public Object convert(Object fromObject) {
+		public IPackageFragment convert(String fromObject) {
 			if (clazz.getFragmentRoot() == null) {
 				return null;
 			}
@@ -587,7 +584,7 @@ public Object convert(Object fromObject) {
 				return clazz.getFragmentRoot().getPackageFragment(""); //$NON-NLS-1$
 			}
 
-			return clazz.getFragmentRoot().getPackageFragment((String) fromObject);
+			return clazz.getFragmentRoot().getPackageFragment(fromObject);
 
 		}
 	}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
index cd7d76f8ef..7829ffe73e 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
@@ -16,14 +16,14 @@
 import java.util.Set;
 
 import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.beans.typed.BeanProperties;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
 import org.eclipse.e4.internal.tools.wizards.classes.templates.DynamicMenuContributionTemplate;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
@@ -61,11 +61,9 @@ protected JavaClass createInstance() {
 				return new DynamicMenuContributionClass(root);
 			}
 
-			@SuppressWarnings("unchecked")
 			@Override
 			protected void createFields(Composite parent, DataBindingContext dbc) {
-				final IWidgetValueProperty textProp = WidgetProperties
-					.text(SWT.Modify);
+				final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 				{
 					Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
index 20537b2d7c..31dfe3183d 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
@@ -17,14 +17,14 @@
 import java.util.Set;
 
 import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.beans.typed.BeanProperties;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
 import org.eclipse.e4.internal.tools.wizards.classes.templates.HandlerTemplate;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
@@ -65,11 +65,9 @@ protected JavaClass createInstance() {
 				return new HandlerClass(root);
 			}
 
-			@SuppressWarnings("unchecked")
 			@Override
 			protected void createFields(Composite parent, DataBindingContext dbc) {
-				final IWidgetValueProperty textProp = WidgetProperties
-					.text(SWT.Modify);
+				final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 				{
 					Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java
index 597bc90d93..3232a02a94 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java
@@ -16,14 +16,14 @@
 import java.util.Set;
 
 import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.beans.typed.BeanProperties;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
 import org.eclipse.e4.internal.tools.wizards.classes.templates.ImperativeExpressionTemplate;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
@@ -63,11 +63,9 @@ protected JavaClass createInstance() {
 				return new ImperativeExpressionClass(root);
 			}
 
-			@SuppressWarnings("unchecked")
 			@Override
 			protected void createFields(Composite parent, DataBindingContext dbc) {
-				final IWidgetValueProperty textProp = WidgetProperties
-						.text(SWT.Modify);
+				final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 
 				{
 					Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
index 1b3200de1b..963f358a73 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
@@ -19,14 +19,14 @@
 import java.util.Set;
 
 import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.beans.typed.BeanProperties;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
 import org.eclipse.e4.internal.tools.wizards.classes.templates.PartTemplate;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
@@ -60,12 +60,11 @@ public void addPages() {
 			Messages.NewPartClassWizard_CreateNewPart, root, ResourcesPlugin.getWorkspace()
 			.getRoot(), initialString) {
 
-			@SuppressWarnings("unchecked")
 			@Override
 			protected void createFields(Composite parent, DataBindingContext dbc) {
-				final IWidgetValueProperty textProp = WidgetProperties
+				final IWidgetValueProperty<Text, String> textProp = WidgetProperties
 					.text(SWT.Modify);
-				final IWidgetValueProperty enabledProp = WidgetProperties.enabled();
+				final IWidgetValueProperty<Text, Boolean> enabledProp = WidgetProperties.enabled();
 
 				{
 					final Label l = new Label(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
index e62fc66105..8486b51aa1 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
@@ -16,14 +16,14 @@
 import java.util.Set;
 
 import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.beans.typed.BeanProperties;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
 import org.eclipse.e4.internal.tools.wizards.classes.templates.ToolControlTemplate;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
@@ -61,10 +61,9 @@ protected JavaClass createInstance() {
 				return new ToolControlClass(root);
 			}
 
-			@SuppressWarnings("unchecked")
 			@Override
 			protected void createFields(Composite parent, DataBindingContext dbc) {
-				final IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
+				final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
 				{
 					Label l = new Label(parent, SWT.NONE);
 					l.setText(Messages.NewToolControlClassWizard_CreateGUIMethod);

From ee403cb7ae9a406c7dbf81f5290f7de68cc4edd6 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 22 Nov 2018 10:27:08 +0100
Subject: [PATCH 1088/1286] Bug 509581 - [Model] Application model not
 refreshed after refactoring

Change-Id: Id7e74ff7600bc63eb678930ef19b8c2a361fc551
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java  | 4 ++++
 .../e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java  | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 8370451db4..35fab8f407 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -2116,6 +2116,10 @@ private Object getFirstMatchingItem(EObject target, ObservableListTreeContentPro
 		return null;
 	}
 
+	public void refreshViewer() {
+		viewer.refresh(true);
+	}
+
 	@Inject
 	@Optional
 	public void refreshOnSave(@UIEventTopic(UIEvents.Dirtyable.TOPIC_DIRTY) org.osgi.service.event.Event event,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index 78451c2719..fd966dfa2c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -1,7 +1,5 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 BestSolution.at and others.
-
-
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -164,6 +162,7 @@ protected void reloadModel() {
 				resource.load(null);
 				getModelProvider().replaceRoot(resource.getContents().get(0));
 				doSave(new NullProgressMonitor());
+				refreshViewer();
 			} catch (IOException e) {
 				statusDialog(e);
 			}

From 44ddb0edf9eb9d113540bfeda573e7a35516b713 Mon Sep 17 00:00:00 2001
From: Jens Lidestrom <jens.lidestrom@rt-labs.com>
Date: Sun, 5 May 2019 10:14:48 +0200
Subject: [PATCH 1089/1286] Bug 546975 - Don't use WidgetProperties.selection

Instead use control specific selection methods, such
as buttonSelection.

Change-Id: I69b17bf5f8dbfec0c949592f000bf61a9df33798
Signed-off-by: Jens Lidestrom <jens@lidestrom.se>
---
 .../emf/ui/internal/common/component/AreaEditor.java      | 4 ++--
 .../emf/ui/internal/common/component/MenuEditor.java      | 4 ++--
 .../emf/ui/internal/common/component/MenuItemEditor.java  | 4 ++--
 .../emf/ui/internal/common/component/ToolItemEditor.java  | 6 +++---
 .../classes/NewDynamicMenuContributionClassWizard.java    | 2 +-
 .../tools/wizards/classes/NewHandlerClassWizard.java      | 2 +-
 .../tools/wizards/classes/NewPartClassWizard.java         | 8 ++++----
 .../tools/wizards/classes/NewToolControlClassWizard.java  | 2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 72548b3339..5b1ec8e93e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -297,9 +297,9 @@ protected void addPressed() {
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(), E4Properties.toBeRendered(getEditingDomain()));
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(), E4Properties.visible(getEditingDomain()));
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 2af0531c78..137023060b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -322,9 +322,9 @@ public String getText(Object element) {
 		}
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(), E4Properties.toBeRendered(getEditingDomain()));
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(), E4Properties.visible(getEditingDomain()));
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index dc065d594e..de0aeecfbe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -311,9 +311,9 @@ public String getText(Object element) {
 		createFormSubTypeForm(parent, context, master);
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(), E4Properties.toBeRendered(getEditingDomain()));
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(), E4Properties.visible(getEditingDomain()));
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index cd9546599c..8890830ec6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -185,7 +185,7 @@ private void createUITreeInspection(CTabFolder folder) {
 	protected void createFormSubTypeForm(Composite parent, CTabFolder folder, EMFDataBindingContext context,
 			final WritableValue<M> master) {
 		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
-		final IWidgetValueProperty<Button, Boolean> checkProp = WidgetProperties.selection();
+		final IWidgetValueProperty<Button, Boolean> checkProp = WidgetProperties.buttonSelection();
 		final IWidgetValueProperty<Button, Boolean> enabled = WidgetProperties.enabled();
 
 		// ------------------------------------------------------------
@@ -331,9 +331,9 @@ public String getText(Object element) {
 		createSubTypeFormElements(parent, context, master);
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.selection(), E4Properties.toBeRendered(getEditingDomain()));
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.selection(), E4Properties.visible(getEditingDomain()));
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
 		final CTabItem item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
index 7829ffe73e..16f97fd989 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
@@ -95,7 +95,7 @@ protected void createFields(Composite parent, DataBindingContext dbc) {
 
 					final Button b = new Button(parent, SWT.CHECK);
 					dbc.bindValue(
-						WidgetProperties.selection().observe(b),
+						WidgetProperties.buttonSelection().observe(b),
 						BeanProperties.value(USE_ABOUT_TO_HIDE).observe(
 							getClazz()));
 				}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
index 31dfe3183d..812c5dfad6 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
@@ -99,7 +99,7 @@ protected void createFields(Composite parent, DataBindingContext dbc) {
 
 					final Button b = new Button(parent, SWT.CHECK);
 					dbc.bindValue(
-						WidgetProperties.selection().observe(b),
+						WidgetProperties.buttonSelection().observe(b),
 						BeanProperties.value(USE_CAN_EXECUTE).observe(
 							getClazz()));
 				}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
index 963f358a73..279d5bf5b7 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
@@ -82,7 +82,7 @@ protected void createFields(Composite parent, DataBindingContext dbc) {
 
 					final Button b = new Button(parent, SWT.CHECK);
 					dbc.bindValue(
-						WidgetProperties.selection().observe(b),
+						WidgetProperties.buttonSelection().observe(b),
 						BeanProperties.value(USE_POST_CONSTRUCT).observe(
 							getClazz()));
 				}
@@ -103,7 +103,7 @@ protected void createFields(Composite parent, DataBindingContext dbc) {
 
 					final Button b = new Button(parent, SWT.CHECK);
 					dbc.bindValue(
-						WidgetProperties.selection().observe(b),
+						WidgetProperties.buttonSelection().observe(b),
 						BeanProperties.value(USE_PREDESTROY).observe(
 							getClazz()));
 				}
@@ -124,7 +124,7 @@ protected void createFields(Composite parent, DataBindingContext dbc) {
 
 					final Button b = new Button(parent, SWT.CHECK);
 					dbc.bindValue(
-						WidgetProperties.selection().observe(b),
+						WidgetProperties.buttonSelection().observe(b),
 						BeanProperties.value(USE_FOCUS).observe(
 							getClazz()));
 				}
@@ -145,7 +145,7 @@ protected void createFields(Composite parent, DataBindingContext dbc) {
 
 					final Button b = new Button(parent, SWT.CHECK);
 					dbc.bindValue(
-						WidgetProperties.selection().observe(b),
+						WidgetProperties.buttonSelection().observe(b),
 						BeanProperties.value(USE_PERSIST).observe(
 							getClazz()));
 				}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
index 8486b51aa1..4aa6afcdc4 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
@@ -93,7 +93,7 @@ protected void createFields(Composite parent, DataBindingContext dbc) {
 
 					final Button b = new Button(parent, SWT.CHECK);
 					dbc.bindValue(
-						WidgetProperties.selection().observe(b),
+						WidgetProperties.buttonSelection().observe(b),
 						BeanProperties.value(CREATE_DEFAULT_CONSTRUCTOR).observe(
 							getClazz()));
 				}

From 951a765dd6f9c098946095b9f90893ee7d0a5285 Mon Sep 17 00:00:00 2001
From: Niraj Modi <niraj.modi@in.ibm.com>
Date: Fri, 7 Jun 2019 13:55:41 +0530
Subject: [PATCH 1090/1286] Bug 547907 - POM and product version change for
 4.13 release

Change-Id: I2568d9994d3ee9659c4a7b04f9f09ee3c9511f75
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
---
 bundles/org.eclipse.e4.tools.compat/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml     | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml          | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                   | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 4 ++--
 tests/org.eclipse.e4.tools.test/pom.xml                | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 2fbd56933a..5f11168656 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.12.0-SNAPSHOT</version>
+    <version>4.13.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 6bc43bac5d..b94622cbaf 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.12.0-SNAPSHOT</version>
+    <version>4.13.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index e6576edf50..a5829212dc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.12.0-SNAPSHOT</version>
+    <version>4.13.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 1ec20efa55..a81d9b9de6 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.12.0-SNAPSHOT</version>
+    <version>4.13.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index dbb3c95e25..d0d8b98fb2 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.12.0-SNAPSHOT</version>
+    <version>4.13.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index c92007efd3..9c04ce8c56 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.12.0-SNAPSHOT</version>
+    <version>4.13.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 72e772c730..bb683ee314 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.12.0.qualifier"
+      version="4.13.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index c870f1da88..13f2524561 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.12.0-SNAPSHOT</version>
+    <version>4.13.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>4.12.0-SNAPSHOT</version>
+  <version>4.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index 577e6038f1..f9246eeeac 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.12.0-SNAPSHOT</version>
+		<version>4.13.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From 29c10454fbcf69c39cd51d64276feef29057968b Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 13 Jun 2019 21:18:24 +0200
Subject: [PATCH 1091/1286] 4.13 version update for org.eclipse.e4.tools.emf.ui

Required for Bug 548202

Change-Id: I3b56afb2500499fc5406caf2f73d3ed3cf17b87e
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 8eb94961f5..31edc8f314 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.6.400.qualifier
+Bundle-Version: 4.6.500.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index a5829212dc..f802c341d9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.6.400-SNAPSHOT</version>
+  <version>4.6.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>

From 0a54dfee44c90754d4c32a92995d41ff8199923b Mon Sep 17 00:00:00 2001
From: Shawn Kleese <Shawn.Kleese@ituv-software.de>
Date: Wed, 12 Jun 2019 19:32:42 +0200
Subject: [PATCH 1092/1286] Removed unexpected Code-Templates. For Example
 Catch-Exceptions adds a Multiline-Comment

Change-Id: I5ce79a3467e8a12d9fa6d18cff7b35db4f6451f2
Signed-off-by: Shawn Kleese <Shawn.Kleese@ituv-software.de>
---
 .../.settings/org.eclipse.jdt.core.prefs      | 54 +++++++++++++++++++
 .../.settings/org.eclipse.jdt.ui.prefs        |  6 +--
 2 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
index c9e7031d42..55a19fa17a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -144,8 +144,12 @@ org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
+org.eclipse.jdt.core.formatter.align_with_spaces=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -154,19 +158,27 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_assignment=0
 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -211,6 +223,7 @@ org.eclipse.jdt.core.formatter.comment.format_line_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
+org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
 org.eclipse.jdt.core.formatter.comment.line_length=80
@@ -258,11 +271,15 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
 org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -289,10 +306,13 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declar
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
 org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -317,13 +337,20 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
+org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
 org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
 org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -367,10 +394,13 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_decla
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -407,9 +437,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser
 org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -421,10 +454,24 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_decla
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
 org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
@@ -445,10 +492,17 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
index 74dc76f295..09aff09b4b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -60,13 +60,12 @@ cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
-formatter_settings_version=14
+formatter_settings_version=16
 org.eclipse.jdt.ui.exception.name=ex
 org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n *\n * This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License 2.0\r\n * which accompanies this distribution, and is available at\r\n * https://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
@@ -102,6 +101,7 @@ sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
+sp_cleanup.remove_redundant_semicolons=false
 sp_cleanup.remove_redundant_type_arguments=false
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true

From 4e42e9db1792499fc4741d7d28292af2a888c9b2 Mon Sep 17 00:00:00 2001
From: Shawn Kleese <Shawn.Kleese@ituv-software.de>
Date: Wed, 12 Jun 2019 21:07:31 +0200
Subject: [PATCH 1093/1286] Bug 548202 - [WindowIconDialogEditor] should never
 include Icons from "bin"-Folder

Change-Id: I103dc85176b22fcd5d4f472a5375d9f9b1263dc9
Signed-off-by: Shawn Kleese <Shawn.Kleese@ituv-software.de>
---
 .../dialogs/AbstractIconDialogWithScopeAndFilter.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
index e8e01e255a..2310b646b0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
@@ -342,13 +342,16 @@ private static class SearchThread extends TimerTask {
 		private final StringMatcher matcherGif;
 		private final StringMatcher matcherJpg;
 		private final StringMatcher matcherPng;
+		private final StringMatcher matcherBinFolder;
 		private final Filter filter;
 		private boolean includeNonBundles;
 
+
 		public SearchThread(IconMatchCallback callback, Filter filter) {
 			matcherGif = new StringMatcher("*" + filter.namePattern + "*.gif", true, false); //$NON-NLS-1$//$NON-NLS-2$
 			matcherJpg = new StringMatcher("*" + filter.namePattern + "*.jpg", true, false); //$NON-NLS-1$//$NON-NLS-2$
 			matcherPng = new StringMatcher("*" + filter.namePattern + "*.png", true, false); //$NON-NLS-1$//$NON-NLS-2$
+			matcherBinFolder = new StringMatcher("bin/*", true, false); //$NON-NLS-1$
 			this.callback = callback;
 			this.filter = filter;
 		}
@@ -395,7 +398,8 @@ public void run() {
 							return true;
 						} else if (resource.getType() == IResource.FILE && !resource.isLinked()) {
 							final String path = resource.getProjectRelativePath().toString();
-							if (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path)) {
+							if (!matcherBinFolder.match(path)
+									&& (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path))) {
 								if (E.notEmpty(filter.getPackages())) {
 									if (!filter.getPackages().contains(
 											resource.getProjectRelativePath().removeLastSegments(1).toOSString())) {

From 83fcabe83a293a9011e9e3bfbe555f5478a6fff6 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 13 Jun 2019 23:50:39 +0200
Subject: [PATCH 1094/1286] Version 4.13 update for org.eclipse.e4.tools

Require for an upcoming StringBuffer to StringBuilder change

Change-Id: Ie481d8c43a694699f498efe9c824830c07e765da
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index ad836fa6ad..0f22b002de 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 4.8.300.qualifier
+Bundle-Version: 4.8.400.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 9c04ce8c56..c92dc421eb 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tool</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>4.8.300-SNAPSHOT</version>
+  <version>4.8.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From ce169528a96f9d62db82f4f3a0863ebc5a0fb425 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 13 Jun 2019 23:52:15 +0200
Subject: [PATCH 1095/1286] Replaces StringBuffer with StringBuilder in
 org.eclipse.e4.tools.emf.ui

Change-Id: I492c65e0be70b546a0b0df3dff8323b102eda44a
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
index fa01213200..36ba4f4f4c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
@@ -306,7 +306,7 @@ private void parseWildCards() {
 		final Vector<String> temp = new Vector<>();
 
 		int pos = 0;
-		final StringBuffer buf = new StringBuffer();
+		final StringBuilder buf = new StringBuilder();
 		while (pos < fLength) {
 			final char c = fPattern.charAt(pos++);
 			switch (c) {

From 9ad0ee54c4605726b3d38db0dc0dad7fd00cb263 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 13 Jun 2019 23:53:26 +0200
Subject: [PATCH 1096/1286] Using StringBuilder instead of StringBuffer in
 org.eclipse.e4.tools

Change-Id: Ib2f7df610e0833833a593fe8888d3479785bd6ba
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../e4/tools/emf/editor3x/templates/HandlerTemplate.java        | 2 +-
 .../eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java   | 2 +-
 .../e4/tools/internal/classes/templates/HandlerTemplate.java    | 2 +-
 .../e4/tools/internal/classes/templates/PartTemplate.java       | 2 +-
 .../internal/tools/wizards/classes/templates/AddonTemplate.java | 2 +-
 .../classes/templates/DynamicMenuContributionTemplate.java      | 2 +-
 .../tools/wizards/classes/templates/HandlerTemplate.java        | 2 +-
 .../wizards/classes/templates/ImperativeExpressionTemplate.java | 2 +-
 .../internal/tools/wizards/classes/templates/PartTemplate.java  | 2 +-
 .../tools/wizards/classes/templates/ToolControlTemplate.java    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/HandlerTemplate.java b/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/HandlerTemplate.java
index e969a0930a..bf31409e45 100644
--- a/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/HandlerTemplate.java
+++ b/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/HandlerTemplate.java
@@ -26,7 +26,7 @@ public static synchronized HandlerTemplate create(String lineSeparator)
 
   public String generate(Object argument)
   {
-    final StringBuffer stringBuffer = new StringBuffer();
+    final StringBuilder stringBuffer = new StringBuilder();
      HandlerClass domainClass = (HandlerClass)argument; 
     stringBuffer.append(TEXT_1);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
diff --git a/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java b/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java
index 3bcf847594..cbe566c1a2 100644
--- a/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java
+++ b/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java
@@ -38,7 +38,7 @@ public static synchronized PartTemplate create(String lineSeparator)
 
   public String generate(Object argument)
   {
-    final StringBuffer stringBuffer = new StringBuffer();
+    final StringBuilder stringBuffer = new StringBuilder();
      PartClass domainClass = (PartClass)argument; 
     stringBuffer.append(TEXT_1);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
diff --git a/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/HandlerTemplate.java b/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/HandlerTemplate.java
index 711cdd745c..d2ede489d7 100644
--- a/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/HandlerTemplate.java
+++ b/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/HandlerTemplate.java
@@ -26,7 +26,7 @@ public static synchronized HandlerTemplate create(String lineSeparator)
 
   public String generate(Object argument)
   {
-    final StringBuffer stringBuffer = new StringBuffer();
+    final StringBuilder stringBuffer = new StringBuilder();
      HandlerClass domainClass = (HandlerClass)argument; 
     stringBuffer.append(TEXT_1);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
diff --git a/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java b/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java
index d10a26816e..9693af3a74 100644
--- a/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java
+++ b/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java
@@ -38,7 +38,7 @@ public static synchronized PartTemplate create(String lineSeparator)
 
   public String generate(Object argument)
   {
-    final StringBuffer stringBuffer = new StringBuffer();
+    final StringBuilder stringBuffer = new StringBuilder();
      PartClass domainClass = (PartClass)argument; 
     stringBuffer.append(TEXT_1);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
index 0f1e1f6436..31ec684c6e 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
@@ -23,7 +23,7 @@ public static synchronized AddonTemplate create(String lineSeparator)
 
   public String generate(Object argument)
   {
-    final StringBuffer stringBuffer = new StringBuffer();
+    final StringBuilder stringBuffer = new StringBuilder();
      JavaClass domainClass = (JavaClass)argument; 
     stringBuffer.append(TEXT_1);
      if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
index 20a79b84f7..29e0a3c3f7 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
@@ -28,7 +28,7 @@ public static synchronized DynamicMenuContributionTemplate create(String lineSep
 
   public String generate(Object argument)
   {
-    final StringBuffer stringBuffer = new StringBuffer();
+    final StringBuilder stringBuffer = new StringBuilder();
      DynamicMenuContributionClass domainClass = (DynamicMenuContributionClass)argument; 
     stringBuffer.append(TEXT_1);
      if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
index f9cfd2ceea..ddfa4cc5ad 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
@@ -28,7 +28,7 @@ public static synchronized HandlerTemplate create(String lineSeparator)
 
   public String generate(Object argument)
   {
-    final StringBuffer stringBuffer = new StringBuffer();
+    final StringBuilder stringBuffer = new StringBuilder();
      HandlerClass domainClass = (HandlerClass)argument; 
     stringBuffer.append(TEXT_1);
      if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java
index 4e8de8c880..b86273d29b 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java
@@ -37,7 +37,7 @@ public static synchronized ImperativeExpressionTemplate create(String lineSepara
 
 	public String generate(Object argument)
 	{
-		final StringBuffer stringBuffer = new StringBuffer();
+		final StringBuilder stringBuffer = new StringBuilder();
 		ImperativeExpressionClass domainClass = (ImperativeExpressionClass) argument;
 		stringBuffer.append(TEXT_1);
 		if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
index 20843b9887..19abbb6180 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
@@ -40,7 +40,7 @@ public static synchronized PartTemplate create(String lineSeparator)
 
   public String generate(Object argument)
   {
-    final StringBuffer stringBuffer = new StringBuffer();
+    final StringBuilder stringBuffer = new StringBuilder();
      PartClass domainClass = (PartClass)argument; 
     stringBuffer.append(TEXT_1);
      if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
index 5a0405f536..8e484fd39d 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
@@ -27,7 +27,7 @@ public static synchronized ToolControlTemplate create(String lineSeparator)
 
   public String generate(Object argument)
   {
-    final StringBuffer stringBuffer = new StringBuffer();
+    final StringBuilder stringBuffer = new StringBuilder();
      ToolControlClass domainClass = (ToolControlClass)argument; 
      if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
     stringBuffer.append(TEXT_1);

From 9d2b5e42246de85a6a9d786d75646c5234fd855b Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 14 Jun 2019 00:04:01 +0200
Subject: [PATCH 1097/1286] Bug 548257 - Retire Jet templates from
 org.eclipse.e4.tools

Change-Id: I1728602a8df300b5150dd00a6fe67e3828a1234d
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools/.jetproperties   |  4 --
 bundles/org.eclipse.e4.tools/.project         |  6 ---
 .../templates/addon.txtjet                    | 25 ---------
 .../templates/dynamicMenuContribution.txtjet  | 28 ----------
 .../templates/handler.txtjet                  | 25 ---------
 .../templates/part.txtjet                     | 51 -------------------
 .../templates/toolControl.txtjet              | 23 ---------
 7 files changed, 162 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools/.jetproperties
 delete mode 100644 bundles/org.eclipse.e4.tools/templates/addon.txtjet
 delete mode 100644 bundles/org.eclipse.e4.tools/templates/dynamicMenuContribution.txtjet
 delete mode 100644 bundles/org.eclipse.e4.tools/templates/handler.txtjet
 delete mode 100644 bundles/org.eclipse.e4.tools/templates/part.txtjet
 delete mode 100644 bundles/org.eclipse.e4.tools/templates/toolControl.txtjet

diff --git a/bundles/org.eclipse.e4.tools/.jetproperties b/bundles/org.eclipse.e4.tools/.jetproperties
deleted file mode 100644
index 2907c83a43..0000000000
--- a/bundles/org.eclipse.e4.tools/.jetproperties
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<jet-settings>
-	<template-container>templates</template-container>	<source-container>src</source-container>
-</jet-settings>
diff --git a/bundles/org.eclipse.e4.tools/.project b/bundles/org.eclipse.e4.tools/.project
index 62db1d2d84..f67161ba84 100644
--- a/bundles/org.eclipse.e4.tools/.project
+++ b/bundles/org.eclipse.e4.tools/.project
@@ -5,11 +5,6 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.emf.codegen.JETBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -27,7 +22,6 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.emf.codegen.jet.IJETNature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/bundles/org.eclipse.e4.tools/templates/addon.txtjet b/bundles/org.eclipse.e4.tools/templates/addon.txtjet
deleted file mode 100644
index 7404b0a00d..0000000000
--- a/bundles/org.eclipse.e4.tools/templates/addon.txtjet
+++ /dev/null
@@ -1,25 +0,0 @@
-<%@ jet package="org.eclipse.e4.internal.tools.wizards.classes.templates" class="AddonTemplate" imports="org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass" %>
-<% JavaClass domainClass = (JavaClass)argument; %> 
-<% if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { %>
-package <%= domainClass.getPackageFragment().getElementName() %>;
-<% } %>
-
-import javax.inject.Inject;
-
-import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.core.di.extensions.EventTopic;
-import org.eclipse.e4.ui.workbench.UIEvents;
-import org.osgi.service.event.Event;
-
-import org.eclipse.e4.core.services.events.IEventBroker;
-
-public class <%= domainClass.getName() %> {
-
-	@Inject
-	@Optional
-	public void applicationStarted(
-			@EventTopic(UIEvents.UILifeCycle.APP_STARTUP_COMPLETE) Event event) {
-		// TODO Modify the UIEvents.UILifeCycle.APP_STARTUP_COMPLETE EventTopic to a certain event you want to listen to.
-	}
-
-}
diff --git a/bundles/org.eclipse.e4.tools/templates/dynamicMenuContribution.txtjet b/bundles/org.eclipse.e4.tools/templates/dynamicMenuContribution.txtjet
deleted file mode 100644
index 3567f49c87..0000000000
--- a/bundles/org.eclipse.e4.tools/templates/dynamicMenuContribution.txtjet
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ jet package="org.eclipse.e4.internal.tools.wizards.classes.templates" class="DynamicMenuContributionTemplate" imports="org.eclipse.e4.internal.tools.wizards.classes.NewDynamicMenuContributionClassWizard.DynamicMenuContributionClass" %>
-<% DynamicMenuContributionClass domainClass = (DynamicMenuContributionClass)argument; %> 
-<% if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { %>
-package <%= domainClass.getPackageFragment().getElementName() %>;
-<% } %>
-
-import java.util.List;
-
-import org.eclipse.e4.ui.di.AboutToShow;
-<% if( domainClass.isUseAboutToHide() )  { %>
-import org.eclipse.e4.ui.di.AboutToHide;
-<% } %>
-
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
-
-public class <%= domainClass.getName() %> {
-	@AboutToShow
-	public void <%= domainClass.getAboutToShowMethodName() %>(List<MMenuElement> items) {
-		
-	}
-	<% if( domainClass.isUseAboutToHide() )  { %>
-	
-	@AboutToHide
-	public void <%= domainClass.getAboutToHideMethodName() %>(List<MMenuElement> items) {
-		
-	}
-	<% } %>	
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/templates/handler.txtjet b/bundles/org.eclipse.e4.tools/templates/handler.txtjet
deleted file mode 100644
index cd2f820814..0000000000
--- a/bundles/org.eclipse.e4.tools/templates/handler.txtjet
+++ /dev/null
@@ -1,25 +0,0 @@
-<%@ jet package="org.eclipse.e4.internal.tools.wizards.classes.templates" class="HandlerTemplate" imports="org.eclipse.e4.internal.tools.wizards.classes.NewHandlerClassWizard.HandlerClass" %>
-<% HandlerClass domainClass = (HandlerClass)argument; %> 
-<% if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { %>
-package <%= domainClass.getPackageFragment().getElementName() %>;
-<% } %>
-
-import org.eclipse.e4.core.di.annotations.Execute;
-<% if( domainClass.isUseCanExecute() )  { %>
-import org.eclipse.e4.core.di.annotations.CanExecute;
-<% } %>
-
-public class <%= domainClass.getName() %> {
-	@Execute
-	public void <%= domainClass.getExecuteMethodName() %>() {
-		
-	}
-	<% if( domainClass.isUseCanExecute() )  { %>
-	
-	@CanExecute
-	public boolean <%= domainClass.getCanExecuteMethodName() %>() {
-		
-		return true;
-	}
-	<% } %>	
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/templates/part.txtjet b/bundles/org.eclipse.e4.tools/templates/part.txtjet
deleted file mode 100644
index a51b59d58f..0000000000
--- a/bundles/org.eclipse.e4.tools/templates/part.txtjet
+++ /dev/null
@@ -1,51 +0,0 @@
-<%@ jet package="org.eclipse.e4.internal.tools.wizards.classes.templates" class="PartTemplate" imports="org.eclipse.e4.internal.tools.wizards.classes.NewPartClassWizard.PartClass" %>
-<% PartClass domainClass = (PartClass)argument; %> 
-<% if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { %>
-package <%= domainClass.getPackageFragment().getElementName() %>;
-<% } %>
-
-import javax.inject.Inject;
-<% if( domainClass.isUsePostConstruct() ) { %>
-import javax.annotation.PostConstruct;
-import org.eclipse.swt.widgets.Composite;
-<% } %>
-<% if( domainClass.isUsePredestroy() ) { %>
-import javax.annotation.PreDestroy;
-<% } %>
-<% if( domainClass.isUseFocus() ) { %>
-import org.eclipse.e4.ui.di.Focus;
-<% } %>
-<% if( domainClass.isUsePersist() ) { %>
-import org.eclipse.e4.ui.di.Persist;
-<% } %>
-
-public class <%= domainClass.getName() %> {
-	@Inject
-	public <%= domainClass.getName() %>() {
-		
-	}
-	<% if( domainClass.isUsePostConstruct() ) { %>
-	@PostConstruct
-	public void <%= domainClass.getPostConstructMethodName()  %>(Composite parent) {
-		
-	}
-	<% } %>
-	<% if( domainClass.isUsePredestroy() ) { %>
-	@PreDestroy
-	public void <%= domainClass.getPreDestroyMethodName()  %>() {
-		
-	}
-	<% } %>
-	<% if( domainClass.isUseFocus() ) { %>
-	@Focus
-	public void <%= domainClass.getFocusMethodName() %>() {
-		
-	}
-	<% } %>
-	<% if( domainClass.isUsePersist() ) { %>
-	@Persist
-	public void <%= domainClass.getPersistMethodName() %>() {
-		
-	}
-	<% } %>
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/templates/toolControl.txtjet b/bundles/org.eclipse.e4.tools/templates/toolControl.txtjet
deleted file mode 100644
index 524631cd6a..0000000000
--- a/bundles/org.eclipse.e4.tools/templates/toolControl.txtjet
+++ /dev/null
@@ -1,23 +0,0 @@
-<%@ jet package="org.eclipse.e4.internal.tools.wizards.classes.templates" class="ToolControlTemplate" imports="org.eclipse.e4.internal.tools.wizards.classes.NewToolControlClassWizard.ToolControlClass" %>
-<% ToolControlClass domainClass = (ToolControlClass)argument; %>
-<% if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { %>
-package <%= domainClass.getPackageFragment().getElementName() %>;
-<% } %>
-
-import javax.annotation.PostConstruct;
-<% if( domainClass.isCreateDefaultConstructor() )  { %>
-import javax.inject.Inject;
-<% } %>
-
-public class <%= domainClass.getName() %> {
-	<% if( domainClass.isCreateDefaultConstructor() )  { %>
-	@Inject
-	public <%= domainClass.getName() %>() {
-		
-	}
-	<% } %>
-	@PostConstruct
-	public void <%= domainClass.getCreateGuiMethodName() %>() {
-		
-	}
-}
\ No newline at end of file

From f41ff22a7ad08ede9aaff25d49beb46c82116eda Mon Sep 17 00:00:00 2001
From: Mickael Istria <mistria@redhat.com>
Date: Mon, 24 Jun 2019 10:44:21 +0200
Subject: [PATCH 1098/1286] Bug 474156 - Make API Tools able to run during
 Tycho build

Signed-off-by: Mickael Istria <mistria@redhat.com>
---
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml | 3 +++
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml       | 4 ++++
 tests/org.eclipse.e4.tools.test/pom.xml           | 3 +++
 3 files changed, 10 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index b94622cbaf..2d8ddcb993 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -13,4 +13,7 @@
   <version>4.7.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
+  <properties>
+    <skipAPIAnalysis>true</skipAPIAnalysis> <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=548572 -->
+  </properties>
 </project>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index f802c341d9..94e70a122c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -24,6 +24,10 @@
   <version>4.6.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
+  <properties>
+    <skipAPIAnalysis>true</skipAPIAnalysis> <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=548572 -->
+  </properties>
+
   <build>
     <plugins>
       <plugin>
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index f9246eeeac..c932176989 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -15,4 +15,7 @@
 
 	<packaging>eclipse-test-plugin</packaging>
 
+	<properties>
+		<skipAPIAnalysis>true</skipAPIAnalysis> <!-- Not in baseline -->
+	</properties>
 </project>

From ace0425c0584affa7b81acc20d06007abbb2d906 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mon, 8 Jul 2019 10:56:56 +0300
Subject: [PATCH 1099/1286] Remove unused code.

Change-Id: Ia1c0af91677a0c5b30b0ae5574bf7f2ca16d344e
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../emf/ui/internal/common/component/PartStackEditor.java    | 3 +--
 .../ui/internal/common/component/StringModelFragment.java    | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index 73274e4e86..e752fd39da 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2019 BestSolution.at and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -66,7 +66,6 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Text;
 
-@SuppressWarnings("deprecation")
 public class PartStackEditor extends AbstractComponentEditor<MPartStack> {
 
 	private Composite composite;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 8afc6f7223..0c720bd025 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2017 BestSolution.at and others.
+ * Copyright (c) 2010, 2019 BestSolution.at and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -132,9 +132,8 @@ public String getLabel(Object element) {
 
 		if (selectedContainer == null) {
 			return Messages.StringModelFragment_Label;
-		} else {
-			return Messages.StringModelFragment_LabelFor + selectedContainer.getName();
 		}
+		return Messages.StringModelFragment_LabelFor + selectedContainer.getName();
 	}
 
 	@Override

From 59c40f9e3a1bc14882e0431c6990904befa3afdc Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mon, 8 Jul 2019 11:19:55 +0300
Subject: [PATCH 1100/1286] Enable API tooling.

Change-Id: I2b60cc10bfeee970e8a58151d3bdf6ce313b8de6
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 bundles/org.eclipse.e4.tools.compat/.project             | 6 ++++++
 .../.settings/org.eclipse.pde.api.tools.prefs            | 9 ++++++++-
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.compat/pom.xml              | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/.project       | 6 ++++++
 .../META-INF/MANIFEST.MF                                 | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml        | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/.project             | 6 ++++++
 bundles/org.eclipse.e4.tools.jdt.templates/.project      | 6 ++++++
 .../.settings/org.eclipse.pde.api.tools.prefs            | 9 ++++++++-
 .../META-INF/MANIFEST.MF                                 | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml       | 2 +-
 bundles/org.eclipse.e4.tools.services/.project           | 6 ++++++
 .../.settings/org.eclipse.pde.api.tools.prefs            | 9 ++++++++-
 .../org.eclipse.e4.tools.services/META-INF/MANIFEST.MF   | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools/.project                    | 6 ++++++
 .../.settings/org.eclipse.jdt.core.prefs                 | 3 +++
 .../.settings/org.eclipse.pde.api.tools.prefs            | 9 ++++++++-
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF        | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                     | 2 +-
 21 files changed, 81 insertions(+), 14 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/.project b/bundles/org.eclipse.e4.tools.compat/.project
index e5e9a15272..8111d8c2f8 100644
--- a/bundles/org.eclipse.e4.tools.compat/.project
+++ b/bundles/org.eclipse.e4.tools.compat/.project
@@ -25,9 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs
index e4e3c0071e..bc13911c57 100644
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,3 +1,4 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
@@ -10,6 +11,7 @@ API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
 API_USE_SCAN_FIELD_SEVERITY=Error
 API_USE_SCAN_METHOD_SEVERITY=Error
 API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_FIELD=Error
 CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
 CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
 CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
@@ -49,6 +51,7 @@ ILLEGAL_IMPLEMENT=Warning
 ILLEGAL_INSTANTIATE=Warning
 ILLEGAL_OVERRIDE=Warning
 ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
@@ -60,6 +63,7 @@ INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_ANNOTATION=Ignore
 INVALID_JAVADOC_TAG=Warning
 INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
 LEAK_EXTEND=Warning
@@ -77,7 +81,7 @@ METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
 METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
 METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
 METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
+MISSING_EE_DESCRIPTIONS=Warning
 TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
 TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
 TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
@@ -86,10 +90,13 @@ TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
 TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
 UNUSED_PROBLEM_FILTERS=Ignore
 automatically_removed_unused_problem_filters=Disabled
+changed_execution_env=Error
 eclipse.preferences.version=1
 incompatible_api_component_version=Error
 incompatible_api_component_version_include_major_without_breaking_change=Disabled
 incompatible_api_component_version_include_minor_without_api_change=Disabled
+incompatible_api_component_version_report_major_without_breaking_change=Warning
+incompatible_api_component_version_report_minor_without_api_change=Warning
 invalid_since_tag_version=Error
 malformed_since_tag=Error
 missing_since_tag=Error
diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 8fc5685fb3..aabbe317d9 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 4.7.400.qualifier
+Bundle-Version: 4.7.500.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 5f11168656..cecfd763d9 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.compat</artifactId>
-  <version>4.7.400-SNAPSHOT</version>
+  <version>4.7.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.project b/bundles/org.eclipse.e4.tools.emf.editor3x/.project
index 6682b79ae1..c9d1c1fb8b 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.project
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.project
@@ -25,9 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index df6bf35cc3..90b52ca59c 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 4.7.200.qualifier
+Bundle-Version: 4.7.300.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 2d8ddcb993..b23d4ef292 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.editor3x</artifactId>
-  <version>4.7.200-SNAPSHOT</version>
+  <version>4.7.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.project b/bundles/org.eclipse.e4.tools.emf.ui/.project
index b7697e08f4..3abd68fc02 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.project
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.project
@@ -25,9 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.project b/bundles/org.eclipse.e4.tools.jdt.templates/.project
index e0303cd31a..7df5862ed2 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.project
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.api.tools.prefs
index e4e3c0071e..bc13911c57 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.api.tools.prefs
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,3 +1,4 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
@@ -10,6 +11,7 @@ API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
 API_USE_SCAN_FIELD_SEVERITY=Error
 API_USE_SCAN_METHOD_SEVERITY=Error
 API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_FIELD=Error
 CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
 CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
 CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
@@ -49,6 +51,7 @@ ILLEGAL_IMPLEMENT=Warning
 ILLEGAL_INSTANTIATE=Warning
 ILLEGAL_OVERRIDE=Warning
 ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
@@ -60,6 +63,7 @@ INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_ANNOTATION=Ignore
 INVALID_JAVADOC_TAG=Warning
 INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
 LEAK_EXTEND=Warning
@@ -77,7 +81,7 @@ METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
 METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
 METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
 METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
+MISSING_EE_DESCRIPTIONS=Warning
 TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
 TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
 TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
@@ -86,10 +90,13 @@ TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
 TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
 UNUSED_PROBLEM_FILTERS=Ignore
 automatically_removed_unused_problem_filters=Disabled
+changed_execution_env=Error
 eclipse.preferences.version=1
 incompatible_api_component_version=Error
 incompatible_api_component_version_include_major_without_breaking_change=Disabled
 incompatible_api_component_version_include_minor_without_api_change=Disabled
+incompatible_api_component_version_report_major_without_breaking_change=Warning
+incompatible_api_component_version_report_minor_without_api_change=Warning
 invalid_since_tag_version=Error
 malformed_since_tag=Error
 missing_since_tag=Error
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index e680c73d05..e6814ea943 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
-Bundle-Version: 4.8.200.qualifier
+Bundle-Version: 4.8.300.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index a81d9b9de6..1ca7bea171 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.jdt.templates</artifactId>
-  <version>4.8.200-SNAPSHOT</version>
+  <version>4.8.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.services/.project b/bundles/org.eclipse.e4.tools.services/.project
index d8bd3a0180..c5473d21d5 100644
--- a/bundles/org.eclipse.e4.tools.services/.project
+++ b/bundles/org.eclipse.e4.tools.services/.project
@@ -25,9 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.api.tools.prefs
index e4e3c0071e..bc13911c57 100644
--- a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.api.tools.prefs
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,3 +1,4 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
@@ -10,6 +11,7 @@ API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
 API_USE_SCAN_FIELD_SEVERITY=Error
 API_USE_SCAN_METHOD_SEVERITY=Error
 API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_FIELD=Error
 CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
 CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
 CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
@@ -49,6 +51,7 @@ ILLEGAL_IMPLEMENT=Warning
 ILLEGAL_INSTANTIATE=Warning
 ILLEGAL_OVERRIDE=Warning
 ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
@@ -60,6 +63,7 @@ INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_ANNOTATION=Ignore
 INVALID_JAVADOC_TAG=Warning
 INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
 LEAK_EXTEND=Warning
@@ -77,7 +81,7 @@ METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
 METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
 METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
 METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
+MISSING_EE_DESCRIPTIONS=Warning
 TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
 TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
 TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
@@ -86,10 +90,13 @@ TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
 TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
 UNUSED_PROBLEM_FILTERS=Ignore
 automatically_removed_unused_problem_filters=Disabled
+changed_execution_env=Error
 eclipse.preferences.version=1
 incompatible_api_component_version=Error
 incompatible_api_component_version_include_major_without_breaking_change=Disabled
 incompatible_api_component_version_include_minor_without_api_change=Disabled
+incompatible_api_component_version_report_major_without_breaking_change=Warning
+incompatible_api_component_version_report_minor_without_api_change=Warning
 invalid_since_tag_version=Error
 malformed_since_tag=Error
 missing_since_tag=Error
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 1428b4742d..040d39222d 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
-Bundle-Version: 4.8.200.qualifier
+Bundle-Version: 4.8.300.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.emf.ui",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index d0d8b98fb2..8cc9057ed1 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.services</artifactId>
-  <version>4.8.200-SNAPSHOT</version>
+  <version>4.8.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools/.project b/bundles/org.eclipse.e4.tools/.project
index f67161ba84..b2c0152a05 100644
--- a/bundles/org.eclipse.e4.tools/.project
+++ b/bundles/org.eclipse.e4.tools/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
index 520cf7018e..9750dac2bd 100644
--- a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
@@ -37,6 +37,7 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -111,6 +112,7 @@ org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
@@ -123,6 +125,7 @@ org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.api.tools.prefs
index e4e3c0071e..bc13911c57 100644
--- a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.api.tools.prefs
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,3 +1,4 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
@@ -10,6 +11,7 @@ API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
 API_USE_SCAN_FIELD_SEVERITY=Error
 API_USE_SCAN_METHOD_SEVERITY=Error
 API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_FIELD=Error
 CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
 CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
 CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
@@ -49,6 +51,7 @@ ILLEGAL_IMPLEMENT=Warning
 ILLEGAL_INSTANTIATE=Warning
 ILLEGAL_OVERRIDE=Warning
 ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
@@ -60,6 +63,7 @@ INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_ANNOTATION=Ignore
 INVALID_JAVADOC_TAG=Warning
 INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
 LEAK_EXTEND=Warning
@@ -77,7 +81,7 @@ METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
 METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
 METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
 METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
+MISSING_EE_DESCRIPTIONS=Warning
 TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
 TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
 TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
@@ -86,10 +90,13 @@ TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
 TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
 UNUSED_PROBLEM_FILTERS=Ignore
 automatically_removed_unused_problem_filters=Disabled
+changed_execution_env=Error
 eclipse.preferences.version=1
 incompatible_api_component_version=Error
 incompatible_api_component_version_include_major_without_breaking_change=Disabled
 incompatible_api_component_version_include_minor_without_api_change=Disabled
+incompatible_api_component_version_report_major_without_breaking_change=Warning
+incompatible_api_component_version_report_minor_without_api_change=Warning
 invalid_since_tag_version=Error
 malformed_since_tag=Error
 missing_since_tag=Error
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 0f22b002de..a8e7695718 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 4.8.400.qualifier
+Bundle-Version: 4.8.500.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index c92dc421eb..5a3b9d7069 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tool</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>4.8.400-SNAPSHOT</version>
+  <version>4.8.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From ecc3a1db67c23c17d42ca862a68a543c0068ce09 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mon, 8 Jul 2019 14:29:03 +0300
Subject: [PATCH 1101/1286] Do not use deprecated ViewerSorter.

Change-Id: I679f1704d4f74d9fa020043d0f56078b5020b8e0
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../common/component/tabs/TableViewerUtil.java         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
index efc635276c..fcb1832a48 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2017 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2019 TwelveTone LLC and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -23,7 +23,7 @@
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.SelectionEvent;
@@ -50,7 +50,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 		}
 	}
 
-	static abstract class InvertableSorter extends ViewerSorter {
+	static abstract class InvertableSorter extends ViewerComparator {
 		@Override
 		public abstract int compare(Viewer viewer, Object e1, Object e2);
 
@@ -132,14 +132,14 @@ public TableSortSelectionListener(TableViewer viewer, TableColumn column, Abstra
 		public void chooseColumnForSorting() {
 			viewer.getTable().setSortColumn(column);
 			viewer.getTable().setSortDirection(currentSorter.getSortDirection());
-			viewer.setSorter(currentSorter);
+			viewer.setComparator(currentSorter);
 		}
 
 		@Override
 		public void widgetSelected(SelectionEvent e) {
 			InvertableSorter newSorter;
 			if (viewer.getTable().getSortColumn() == column) {
-				newSorter = ((InvertableSorter) viewer.getSorter()).getInverseSorter();
+				newSorter = ((InvertableSorter) viewer.getComparator()).getInverseSorter();
 			} else {
 				if (keepDirection) {
 					newSorter = currentSorter;

From c10fe9412e7718a863adedbb96e167f751a0e214 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mon, 8 Jul 2019 14:32:16 +0300
Subject: [PATCH 1102/1286] Use try-with-resources.

Change-Id: I0f86b3a1a80adf6e00c6542633ac1fa929702eb6
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../dialogs/NonReferencedActionPage.java               | 10 +++++-----
 .../dialogs/NonReferencedResourceDialog.java           | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
index b5d2dc6d5f..7cd19db2cf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2017 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2019 TwelveTone LLC and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -413,10 +413,10 @@ public void doRequireBundle(String bundle, String installLocation) {
 		try {
 			Manifest manifestSource;
 			if (installLocation.endsWith(".jar")) { //$NON-NLS-1$
-				final ZipFile zip = new ZipFile(installLocation);
-				srcStream = zip.getInputStream(zip.getEntry("META-INF/MANIFEST.MF")); //$NON-NLS-1$
-				manifestSource = new Manifest(srcStream);
-				zip.close();
+				try (ZipFile zip = new ZipFile(installLocation)) {
+					srcStream = zip.getInputStream(zip.getEntry("META-INF/MANIFEST.MF")); //$NON-NLS-1$
+					manifestSource = new Manifest(srcStream);
+				}
 			} else {
 				srcStream = new BufferedInputStream(new FileInputStream(installLocation + "/META-INF/MANIFEST.MF")); //$NON-NLS-1$
 				manifestSource = new Manifest(srcStream);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
index 64e9308b21..3b78579546 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2017 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2019 TwelveTone LLC and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -451,10 +451,10 @@ public void doRequireBundle(String bundle, String installLocation) {
 		try {
 			Manifest manifestSource;
 			if (installLocation.endsWith(".jar")) { //$NON-NLS-1$
-				final ZipFile zip = new ZipFile(installLocation);
-				srcStream = zip.getInputStream(zip.getEntry("META-INF/MANIFEST.MF")); //$NON-NLS-1$
-				manifestSource = new Manifest(srcStream);
-				zip.close();
+				try (ZipFile zip = new ZipFile(installLocation)) {
+					srcStream = zip.getInputStream(zip.getEntry("META-INF/MANIFEST.MF")); //$NON-NLS-1$
+					manifestSource = new Manifest(srcStream);
+				}
 			} else {
 				srcStream = new BufferedInputStream(new FileInputStream(installLocation + "/META-INF/MANIFEST.MF")); //$NON-NLS-1$
 				manifestSource = new Manifest(srcStream);

From 3a9186df207441a5a899bdfae31f13e007317eae Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mon, 8 Jul 2019 14:34:57 +0300
Subject: [PATCH 1103/1286] Javadoc warning fixes.

Change-Id: I5ae9f9576d8314e5d80f84abfe749555f9e246b3
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../eclipse/e4/tools/emf/ui/common/Util.java  |  8 +++----
 .../common/component/StringModelFragment.java |  1 -
 .../component/tabs/TableViewerUtil.java       | 24 ++++++++-----------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index 5e42071e65..7a88cfc450 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2017 BestSolution.at and others.
+ * Copyright (c) 2010, 2019 BestSolution.at and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -384,10 +384,10 @@ public static boolean canBeExtendedInAFragment(EClass c) {
 	}
 
 	/**
-	 * This method checks if an EReference can be considered in a model fragment
-	 * ie : it must be containment EReference to a model object.
+	 * This method checks if an EReference can be considered in a model fragment ie
+	 * : it must be containment EReference to a model object.
 	 *
-	 * @param c
+	 * @param r
 	 * @return true if the reference is containment and type is not a
 	 *         StringStringToMap or other no editable type
 	 */
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 0c720bd025..5129805d17 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -203,7 +203,6 @@ private EClass getSelectedContainer() {
 	 * Element ID. It can be known thanks to the dialog or must be computed from the
 	 * ID value
 	 *
-	 * @return
 	 */
 	public static EClass findContainerType(MStringModelFragment modelFragment) {
 		// we get the StringModelFragment. If not initialized, no search...
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
index fcb1832a48..7b9d61d2ae 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
@@ -99,20 +99,16 @@ static public class TableSortSelectionListener implements SelectionListener {
 		/**
 		 * The constructor of this listener.
 		 *
-		 * @param viewer
-		 *            the tableviewer this listener belongs to
-		 * @param column
-		 *            the column this listener is responsible for
-		 * @param sorter
-		 *            the sorter this listener uses
-		 * @param defaultDirection
-		 *            the default sorting direction of this Listener. Possible
-		 *            values are {@link SWT.UP} and {@link SWT.DOWN}
-		 * @param keepDirection
-		 *            if true, the listener will remember the last sorting
-		 *            direction of the associated column and restore it when the
-		 *            column is reselected. If false, the listener will use the
-		 *            default sorting direction
+		 * @param viewer           the tableviewer this listener belongs to
+		 * @param column           the column this listener is responsible for
+		 * @param sorter           the sorter this listener uses
+		 * @param defaultDirection the default sorting direction of this Listener.
+		 *                         Possible values are {@link SWT#UP} and
+		 *                         {@link SWT#DOWN}
+		 * @param keepDirection    if true, the listener will remember the last sorting
+		 *                         direction of the associated column and restore it
+		 *                         when the column is reselected. If false, the listener
+		 *                         will use the default sorting direction
 		 */
 		public TableSortSelectionListener(TableViewer viewer, TableColumn column, AbstractInvertableTableSorter sorter,
 				int defaultDirection, boolean keepDirection) {

From a9fa09bb375b4e775c12ce18ff2e5dc03a376b7a Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mon, 8 Jul 2019 14:58:53 +0300
Subject: [PATCH 1104/1286] Remove templates folder from bin.includes in
 edito3x.

It doesn't exist.

Change-Id: I27ca8739fe9e1e336065952f8bbfd8cda61ea0cc
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 bundles/org.eclipse.e4.tools/build.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/build.properties b/bundles/org.eclipse.e4.tools/build.properties
index 53379cd9aa..7cae118f73 100644
--- a/bundles/org.eclipse.e4.tools/build.properties
+++ b/bundles/org.eclipse.e4.tools/build.properties
@@ -3,7 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               templates/,\
                about.html,\
                OSGI-INF/,\
                icons/

From 9ca1cd943ae5269dd54bca4a0d0076ee208242ad Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mon, 8 Jul 2019 14:59:37 +0300
Subject: [PATCH 1105/1286] Downgrade not exporting all packages from warning
 to ignore.

Change-Id: Ibeb10477be058df12ba0997a99b87ce3e6849f68
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../.settings/org.eclipse.pde.prefs                           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.prefs
index 0bbee3c4b8..3256a10a1a 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.prefs
@@ -13,12 +13,14 @@ compilers.p.build.src.includes=1
 compilers.p.deprecated=1
 compilers.p.discouraged-class=1
 compilers.p.internal=1
-compilers.p.missing-packages=1
+compilers.p.missing-packages=2
 compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=1
 compilers.p.no-required-att=0
+compilers.p.no.automatic.module=1
 compilers.p.not-externalized-att=2
+compilers.p.service.component.without.lazyactivation=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1

From 3ff14b92bb000d001cbc10af3fc2fc59142b789b Mon Sep 17 00:00:00 2001
From: bkuntz <benedikt.kuntz@airbus.com>
Date: Tue, 9 Jul 2019 12:40:36 +0200
Subject: [PATCH 1106/1286] Bug 484969: Find contribution class dialog errors
 on *

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

Use PatternConstructor.createPattern instead of Pattern.compile to avoid
PatternSyntaxException

Change-Id: Ib960a1b2150b5159ef7c3f4adf3771fe067629c7
Signed-off-by: bkuntz <benedikt.kuntz@airbus.com>
---
 .../common/component/dialogs/FilteredContributionDialog.java  | 4 +++-
 .../resourcelocator/TargetPlatformContributionCollector.java  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index b4337ac1be..665b349002 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -999,7 +999,9 @@ public void stopSearchThread(boolean bJoin) {
 			currentSearchThread.cancel();
 			if (bJoin) {
 				try {
-					currentSearchThread.join();
+					if (currentSearchThread != null) {
+						currentSearchThread.join();
+					}
 				} catch (final InterruptedException e) {
 				} finally {
 					currentSearchThread = null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
index 6cb9d88cfd..fbd81df54c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
@@ -64,6 +64,7 @@
 import org.eclipse.pde.core.plugin.IPluginModelBase;
 import org.eclipse.pde.internal.core.PDECore;
 import org.eclipse.pde.internal.core.TargetPlatformHelper;
+import org.eclipse.pde.internal.core.util.PatternConstructor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -118,7 +119,7 @@ protected TargetPlatformContributionCollector(String cacheName) {
 			@Override
 			public void findContribution(Filter filter, ContributionResultHandler handler) {
 
-				final Pattern patternName = Pattern.compile(filter.namePattern, Pattern.CASE_INSENSITIVE);
+				final Pattern patternName = PatternConstructor.createPattern(filter.namePattern, false);
 
 				reloadCache(false, filter.getProviderStatusCallback());
 
@@ -211,6 +212,7 @@ public void findContribution(Filter filter, ContributionResultHandler handler) {
 					}
 				}
 			}
+
 		});
 
 		addModelElementContributor(new IModelElementProvider() {

From f158e37e118be838265fcd645094de8d21c1a1f8 Mon Sep 17 00:00:00 2001
From: bkuntz <benedikt.kuntz@airbus.com>
Date: Tue, 9 Jul 2019 16:59:27 +0200
Subject: [PATCH 1107/1286] Bug 539188 - E4 model editor - Allow multi deletion
 in the fragment editor

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

Add delete menu entry when >1 item selected

Change-Id: I4af57e3245815c1f054bbc5f826711af759b5821
Signed-off-by: bkuntz <benedikt.kuntz@airbus.com>
---
 .../emf/ui/internal/common/ModelEditor.java   | 42 ++++++++++++-------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 35fab8f407..cb6254263b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -28,6 +28,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
@@ -627,6 +628,7 @@ public void keyReleased(final KeyEvent e) {
 			final int noSelected = listOfSelections.size();
 
 			boolean addSeparator = false;
+			// single selection
 			if (!s.isEmpty() && noSelected == 1) {
 				List<Action> actions;
 				if (s.getFirstElement() instanceof VirtualEntry) {
@@ -694,23 +696,32 @@ public void keyReleased(final KeyEvent e) {
 						manager.add(menu2);
 					}
 
-					if (o.eContainer() != null) {
-						addSeparator = true;
-						manager.add(new Action(messages.ModelEditor_Delete, ImageDescriptor
-								.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
-							@Override
-							public void run() {
-								final Command cmd = DeleteCommand.create(modelProvider.getEditingDomain(), o);
-								if (cmd.canExecute()) {
-									modelProvider.getEditingDomain().getCommandStack().execute(cmd);
-								}
-							}
-						});
-					}
 				}
 			}
-			// multi selection
+
+			// single & multi selection
 			if (noSelected > 0) {
+
+				// add delete entry if there are no virtual entries in selection all selected
+				// elements have a container
+				if (listOfSelections.stream().noneMatch(VirtualEntry.class::isInstance)
+						&& listOfSelections.stream().filter(EObject.class::isInstance).map(EObject.class::cast)
+						.map(EObject::eContainer).allMatch(Objects::nonNull)) {
+					addSeparator = true;
+					manager.add(new Action(messages.ModelEditor_Delete, ImageDescriptor
+							.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
+						@Override
+						public void run() {
+							final CompoundCommand cmd = new CompoundCommand();
+							EditingDomain editingDomain = modelProvider.getEditingDomain();
+							listOfSelections.forEach(o -> cmd.append(DeleteCommand.create(editingDomain, o)));
+							if (cmd.canExecute() && !cmd.isEmpty()) {
+								editingDomain.getCommandStack().execute(cmd);
+							}
+						}
+					});
+				}
+
 				if (!isModelFragment() && modelExtractor != null) {
 					manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor
 							.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) {
@@ -763,6 +774,7 @@ public void run() {
 					});
 				}
 
+
 			}
 
 			final IExtensionRegistry registry = RegistryFactory.getRegistry();
@@ -2070,7 +2082,7 @@ public void gotoEObject(int targetHint, EObject object) {
 			case TAB_FORM:
 				// make sure tree node has been instantiated
 				final ObservableListTreeContentProvider<?> provider = (ObservableListTreeContentProvider<?>) viewer
-						.getContentProvider();
+				.getContentProvider();
 				getFirstMatchingItem(object, provider, provider.getChildren(viewer.getInput()));
 
 				viewer.reveal(object);

From 4811406cf52ddd9a8657aa978ba4d8abc0667606 Mon Sep 17 00:00:00 2001
From: Benedikt Kuntz <benedikt.kuntz@airbus.com>
Date: Wed, 10 Jul 2019 16:53:53 +0200
Subject: [PATCH 1108/1286] Bug 540155 - [Model Fragment Editor] Labels for all
 Model Fragments are set using the last one

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=540155

don't use cached container for labels

Change-Id: I6ca8ed1db4a6ceac2a7d71ed92c5975ee01c51ec
Signed-off-by: Benedikt Kuntz <benedikt.kuntz@airbus.com>
---
 .../common/component/StringModelFragment.java  | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 5129805d17..6b44c88b3d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -130,10 +130,22 @@ public Image getImage(Object element) {
 	@Override
 	public String getLabel(Object element) {
 
-		if (selectedContainer == null) {
-			return Messages.StringModelFragment_Label;
+		MStringModelFragment modelFragment;
+		if (element instanceof MStringModelFragment) {
+			modelFragment = (MStringModelFragment) element;
+		} else {
+			modelFragment = getStringModelFragment();
 		}
-		return Messages.StringModelFragment_LabelFor + selectedContainer.getName();
+
+		EClass container = findContainerType(modelFragment);
+		String result;
+		if (container == null) {
+			result = Messages.StringModelFragment_Label;
+		} else {
+			result = Messages.StringModelFragment_LabelFor + container.getName();
+		}
+
+		return result;
 	}
 
 	@Override

From 3c63e691b1b1bcc75000945018a8d058e78af7e2 Mon Sep 17 00:00:00 2001
From: Niraj Modi <niraj.modi@in.ibm.com>
Date: Fri, 6 Sep 2019 19:44:16 +0530
Subject: [PATCH 1109/1286] Bug 550767 - POM and product version change for
 4.14 release

Change-Id: Icddb259752386adae32e94cb2c9a59868a6a83b5
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
---
 bundles/org.eclipse.e4.tools.compat/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml     | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml          | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                   | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 4 ++--
 tests/org.eclipse.e4.tools.test/pom.xml                | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index cecfd763d9..82ade80ded 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.13.0-SNAPSHOT</version>
+    <version>4.14.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index b23d4ef292..1e778156c1 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.13.0-SNAPSHOT</version>
+    <version>4.14.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 94e70a122c..15baed9be4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.13.0-SNAPSHOT</version>
+    <version>4.14.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 1ca7bea171..e90d5b888d 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.13.0-SNAPSHOT</version>
+    <version>4.14.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 8cc9057ed1..381018d8dd 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.13.0-SNAPSHOT</version>
+    <version>4.14.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 5a3b9d7069..a4f3675686 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.13.0-SNAPSHOT</version>
+    <version>4.14.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index bb683ee314..b7c64f9bd7 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.13.0.qualifier"
+      version="4.14.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 13f2524561..5f051e6816 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.13.0-SNAPSHOT</version>
+    <version>4.14.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>4.13.0-SNAPSHOT</version>
+  <version>4.14.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index c932176989..44455ddecf 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.13.0-SNAPSHOT</version>
+		<version>4.14.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From 4a72d731d4c077bd1f2beaf9d70d1a8bb7cf706a Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 2 Sep 2019 11:51:29 +0200
Subject: [PATCH 1110/1286] Set missing execution environment to warning
 instead of error

This is the standard setting for platform projects
Includes 4.14 version updates

Change-Id: I33dbfbe1799731f0cf75ea6d0690465e7e9bda15
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../.settings/org.eclipse.pde.api.tools.prefs            | 9 ++++++++-
 .../META-INF/MANIFEST.MF                                 | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml        | 2 +-
 .../.settings/org.eclipse.pde.api.tools.prefs            | 9 ++++++++-
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml              | 2 +-
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.api.tools.prefs
index e4e3c0071e..bc13911c57 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.api.tools.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,3 +1,4 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
@@ -10,6 +11,7 @@ API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
 API_USE_SCAN_FIELD_SEVERITY=Error
 API_USE_SCAN_METHOD_SEVERITY=Error
 API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_FIELD=Error
 CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
 CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
 CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
@@ -49,6 +51,7 @@ ILLEGAL_IMPLEMENT=Warning
 ILLEGAL_INSTANTIATE=Warning
 ILLEGAL_OVERRIDE=Warning
 ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
@@ -60,6 +63,7 @@ INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_ANNOTATION=Ignore
 INVALID_JAVADOC_TAG=Warning
 INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
 LEAK_EXTEND=Warning
@@ -77,7 +81,7 @@ METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
 METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
 METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
 METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
+MISSING_EE_DESCRIPTIONS=Warning
 TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
 TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
 TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
@@ -86,10 +90,13 @@ TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
 TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
 UNUSED_PROBLEM_FILTERS=Ignore
 automatically_removed_unused_problem_filters=Disabled
+changed_execution_env=Error
 eclipse.preferences.version=1
 incompatible_api_component_version=Error
 incompatible_api_component_version_include_major_without_breaking_change=Disabled
 incompatible_api_component_version_include_minor_without_api_change=Disabled
+incompatible_api_component_version_report_major_without_breaking_change=Warning
+incompatible_api_component_version_report_minor_without_api_change=Warning
 invalid_since_tag_version=Error
 malformed_since_tag=Error
 missing_since_tag=Error
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 90b52ca59c..e69f166eb2 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 4.7.300.qualifier
+Bundle-Version: 4.7.400.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 1e778156c1..ffbccee533 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.editor3x</artifactId>
-  <version>4.7.300-SNAPSHOT</version>
+  <version>4.7.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.api.tools.prefs
index e4e3c0071e..bc13911c57 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.api.tools.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,3 +1,4 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
 ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
@@ -10,6 +11,7 @@ API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
 API_USE_SCAN_FIELD_SEVERITY=Error
 API_USE_SCAN_METHOD_SEVERITY=Error
 API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_FIELD=Error
 CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
 CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
 CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
@@ -49,6 +51,7 @@ ILLEGAL_IMPLEMENT=Warning
 ILLEGAL_INSTANTIATE=Warning
 ILLEGAL_OVERRIDE=Warning
 ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
@@ -60,6 +63,7 @@ INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_ANNOTATION=Ignore
 INVALID_JAVADOC_TAG=Warning
 INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
 LEAK_EXTEND=Warning
@@ -77,7 +81,7 @@ METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
 METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
 METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
 METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
+MISSING_EE_DESCRIPTIONS=Warning
 TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
 TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
 TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
@@ -86,10 +90,13 @@ TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
 TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
 UNUSED_PROBLEM_FILTERS=Ignore
 automatically_removed_unused_problem_filters=Disabled
+changed_execution_env=Error
 eclipse.preferences.version=1
 incompatible_api_component_version=Error
 incompatible_api_component_version_include_major_without_breaking_change=Disabled
 incompatible_api_component_version_include_minor_without_api_change=Disabled
+incompatible_api_component_version_report_major_without_breaking_change=Warning
+incompatible_api_component_version_report_minor_without_api_change=Warning
 invalid_since_tag_version=Error
 malformed_since_tag=Error
 missing_since_tag=Error
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 31edc8f314..0f1c7d1407 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.6.500.qualifier
+Bundle-Version: 4.6.600.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 15baed9be4..5049fc2a2e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.6.500-SNAPSHOT</version>
+  <version>4.6.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>

From 94468d83e119fbd537724980230afc23c639afc6 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Wed, 18 Sep 2019 08:19:00 +0300
Subject: [PATCH 1111/1286] Bug 551174 - Comparator errors in 4.14 I build -
 I20190917-1800

Change-Id: I8c48a242e91206299cc4aa4536f555149207991f
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt b/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt
index 79b8bae102..ae61594772 100644
--- a/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt
+++ b/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt
@@ -2,3 +2,4 @@
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
 Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
 Bug 540097 - Comparator Errors in I20181012-1800 Build
+Bug 551174 - Comparator errors in 4.14 I build - I20190917-1800

From f4efb91ef0350d814790de84d16dcf3642513240 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 17 Sep 2019 15:38:17 +0200
Subject: [PATCH 1112/1286] Bug 551167 - Mark commands and handlers from e4
 model editor as persistState false in its "Persisted State"

Without that flag the command and handlers will remain in the IDE, even
if the user removes the plug-in.

Change-Id: Icc06a129bfdb6e22ce8b785bba7f658224da1193
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../fragment.e4xmi                            | 56 ++++++++++++++-----
 1 file changed, 42 insertions(+), 14 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi b/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
index edea1fe2d1..79832f4c79 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
+++ b/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
@@ -1,21 +1,49 @@
 <?xml version="1.0" encoding="ASCII"?>
 <fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_GxnD8Ly2EeOxWJvPH-7sUQ">
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_Kmj8QLy2EeOxWJvPH-7sUQ" featurename="commands" parentElementId="xpath:/">
-    <elements xsi:type="commands:Command" xmi:id="_RRp7QLy2EeOxWJvPH-7sUQ" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_ids" commandName="Mark Duplicate Model Element Ids" description="Marks Duplicate Model Element Ids"/>
-    <elements xsi:type="commands:Command" xmi:id="_9ITpgL2IEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_labels" commandName="Mark Duplicate Model Labels" description="Marks Duplicate Model Labels"/>
-    <elements xsi:type="commands:Command" xmi:id="_RObi4L2MEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_attributes" commandName="Mark Duplicate Model Attributes..." description="Marks Duplicate Model Attributes"/>
-    <elements xsi:type="commands:Command" xmi:id="_dySeYLzDEeO8eO1Rpb-rFA" elementId="org.eclipse.e4.tools.emf.ui.command.repair_duplicate_ids" commandName="Repair Duplicate Model Element IDs" description="Repairs Duplicate Model Element IDs"/>
-    <elements xsi:type="commands:Command" xmi:id="_CFlw8L2LEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.unmark" commandName="Unmark Model Items" description="Unmarks All Model Items"/>
-    <elements xsi:type="commands:Command" xmi:id="_jd7xgO5mEeOQXaYP-M2JBA" elementId="org.eclipse.e4.tools.emf.ui.command.autosizeColumns" commandName="Autosize Columns" description="Autosizes all columns to their content"/>
-    <elements xsi:type="commands:Command" xmi:id="_vsQXAPFwEeOSJuCPb-hb7A" elementId="org.eclipse.e4.tools.emf.ui.command.resetToDefault" commandName="Reset To Default" description="Resets the table to default values"/>
+    <elements xsi:type="commands:Command" xmi:id="_RRp7QLy2EeOxWJvPH-7sUQ" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_ids" commandName="Mark Duplicate Model Element Ids" description="Marks Duplicate Model Element Ids">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_9ITpgL2IEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_labels" commandName="Mark Duplicate Model Labels" description="Marks Duplicate Model Labels">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_RObi4L2MEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_attributes" commandName="Mark Duplicate Model Attributes..." description="Marks Duplicate Model Attributes">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_dySeYLzDEeO8eO1Rpb-rFA" elementId="org.eclipse.e4.tools.emf.ui.command.repair_duplicate_ids" commandName="Repair Duplicate Model Element IDs" description="Repairs Duplicate Model Element IDs">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_CFlw8L2LEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.unmark" commandName="Unmark Model Items" description="Unmarks All Model Items">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_jd7xgO5mEeOQXaYP-M2JBA" elementId="org.eclipse.e4.tools.emf.ui.command.autosizeColumns" commandName="Autosize Columns" description="Autosizes all columns to their content">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_vsQXAPFwEeOSJuCPb-hb7A" elementId="org.eclipse.e4.tools.emf.ui.command.resetToDefault" commandName="Reset To Default" description="Resets the table to default values">
+      <persistedState key="persistState" value="false"/>
+    </elements>
   </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_jtmcsLy3EeOxWJvPH-7sUQ" featurename="handlers" parentElementId="xpath:/">
-    <elements xsi:type="commands:Handler" xmi:id="_p45hULy3EeOxWJvPH-7sUQ" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateElementIdsHandler" command="_RRp7QLy2EeOxWJvPH-7sUQ"/>
-    <elements xsi:type="commands:Handler" xmi:id="_AOEgkL2JEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_labels" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateLabelsHandler" command="_9ITpgL2IEeOqSr2XZwfnmA"/>
-    <elements xsi:type="commands:Handler" xmi:id="_TgJt4L2MEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_attributes" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateAttributesHandler" command="_RObi4L2MEeOqSr2XZwfnmA"/>
-    <elements xsi:type="commands:Handler" xmi:id="_smaaALzDEeO8eO1Rpb-rFA" elementId="org.eclipse.e4.tools.emf.ui.handler.repair_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.RepairDuplicateItemsHandler" command="_dySeYLzDEeO8eO1Rpb-rFA"/>
-    <elements xsi:type="commands:Handler" xmi:id="_Fin4gL2LEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.unmark" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.UnmarkItemsHandler" command="_CFlw8L2LEeOqSr2XZwfnmA"/>
-    <elements xsi:type="commands:Handler" xmi:id="_hZcKMO5mEeOQXaYP-M2JBA" elementId="org.eclipse.e4.tools.emf.ui.handler.autosizeColumns" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.AutosizeColumnsHandler" command="_jd7xgO5mEeOQXaYP-M2JBA"/>
-    <elements xsi:type="commands:Handler" xmi:id="_8AHVUPFwEeOSJuCPb-hb7A" elementId="org.eclipse.e4.tools.emf.ui.handler.resetToDefault" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.ResetToDefaultHandler" command="_vsQXAPFwEeOSJuCPb-hb7A"/>
+    <elements xsi:type="commands:Handler" xmi:id="_p45hULy3EeOxWJvPH-7sUQ" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateElementIdsHandler" command="_RRp7QLy2EeOxWJvPH-7sUQ">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Handler" xmi:id="_AOEgkL2JEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_labels" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateLabelsHandler" command="_9ITpgL2IEeOqSr2XZwfnmA">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Handler" xmi:id="_TgJt4L2MEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_attributes" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateAttributesHandler" command="_RObi4L2MEeOqSr2XZwfnmA">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Handler" xmi:id="_smaaALzDEeO8eO1Rpb-rFA" elementId="org.eclipse.e4.tools.emf.ui.handler.repair_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.RepairDuplicateItemsHandler" command="_dySeYLzDEeO8eO1Rpb-rFA">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Handler" xmi:id="_Fin4gL2LEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.unmark" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.UnmarkItemsHandler" command="_CFlw8L2LEeOqSr2XZwfnmA">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Handler" xmi:id="_hZcKMO5mEeOQXaYP-M2JBA" elementId="org.eclipse.e4.tools.emf.ui.handler.autosizeColumns" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.AutosizeColumnsHandler" command="_jd7xgO5mEeOQXaYP-M2JBA">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Handler" xmi:id="_8AHVUPFwEeOSJuCPb-hb7A" elementId="org.eclipse.e4.tools.emf.ui.handler.resetToDefault" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.ResetToDefaultHandler" command="_vsQXAPFwEeOSJuCPb-hb7A">
+      <persistedState key="persistState" value="false"/>
+    </elements>
   </fragments>
 </fragment:ModelFragments>

From f378dc4da10bb9da7a0390b4bfef608f5a856bb1 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Sat, 28 Sep 2019 06:49:47 +0300
Subject: [PATCH 1113/1286] Bug 551580 - Build I20190927-1800 failed

The method initializeContext(JavaContext) of type E4ContextType must
override or implement a supertype method.

Fixed parameter type to be IJavaContext and not JavaContext.

Change-Id: I6d5af322bc7b0b7a5b1d325d80afc3b6965b12a6
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../e4/internal/tools/jdt/templates/E4ContextType.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
index 3ce63ee56a..4017ab0852 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
+ * Copyright (c) 2007, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -14,7 +14,7 @@
 package org.eclipse.e4.internal.tools.jdt.templates;
 
 import org.eclipse.jdt.internal.corext.template.java.AbstractJavaContextType;
-import org.eclipse.jdt.internal.corext.template.java.JavaContext;
+import org.eclipse.jdt.internal.corext.template.java.IJavaContext;
 
 /**
  * The context type for templates inside e4 code.
@@ -44,7 +44,7 @@ public class E4ContextType extends AbstractJavaContextType {
 	public static final String ID_STATEMENTS = "e4-statements"; //$NON-NLS-1$
 
 	@Override
-	protected void initializeContext(JavaContext context) {
+	protected void initializeContext(IJavaContext context) {
 		if (!getId().equals(E4ContextType.ID_ALL)) { // a specific context must also allow the templates that work
 			// everywhere
 			context.addCompatibleContextType(E4ContextType.ID_ALL);

From b724b8144ccca9e85e55b84bde58a07e8c12759a Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Tue, 1 Oct 2019 07:38:01 +0300
Subject: [PATCH 1114/1286] Bug 551580 - Build I20190927-1800 failed

Set min jdt.ui bundle version to reflect the change.

Change-Id: I51934e2ad23ef4616533c0262185f257228f59f2
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF   | 4 ++--
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index e6814ea943..8f75dfd8dd 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
-Bundle-Version: 4.8.300.qualifier
+Bundle-Version: 4.8.400.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0",
+Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.20.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
  org.eclipse.jface.text;bundle-version="3.6.0",
  org.eclipse.jdt.core;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index e90d5b888d..2b9e0cae0c 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.jdt.templates</artifactId>
-  <version>4.8.300-SNAPSHOT</version>
+  <version>4.8.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From 40ec612ae5a01db7c02d2fa28e8525c7e200cd12 Mon Sep 17 00:00:00 2001
From: Benedikt Kuntz <benedikt.kuntz@airbus.com>
Date: Fri, 12 Jul 2019 09:26:51 +0200
Subject: [PATCH 1115/1286] Bug 538922 - Model fragment editor should set the
 property apply to always

Set default value for apply property of extension point to "always"

Change-Id: I23abdef317e36e9331241320e996b9369f538c2b
Signed-off-by: Benedikt Kuntz <benedikt.kuntz@airbus.com>
---
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF               | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                            | 2 +-
 .../tools/wizards/model/BaseApplicationModelWizard.java         | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index a8e7695718..ff443a1014 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 4.8.500.qualifier
+Bundle-Version: 4.8.600.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index a4f3675686..40b1d50ff8 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tool</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>4.8.500-SNAPSHOT</version>
+  <version>4.8.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index 955bf01c19..70bc88be49 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -364,6 +364,8 @@ private void registerWithExtensionPointIfRequired(IProject project, WorkspaceBun
 				.createElement(extPointFragmentRegister);
 		element.setName(FRAGMENT);
 		element.setAttribute("uri", file.getName()); //$NON-NLS-1$
+		// Bug 538922 set default value of apply to always
+		element.setAttribute("apply", "always"); //$NON-NLS-1$ //$NON-NLS-2$
 		extPointFragmentRegister.setId(project.getName() + "." + FRAGMENT); //$NON-NLS-1$
 		extPointFragmentRegister.setPoint(WORKBENCH_MODEL_EP_ID);
 		extPointFragmentRegister.add(element);

From c8972473eea2f9f5bbeb59877a9a06febe2542eb Mon Sep 17 00:00:00 2001
From: Benedikt Kuntz <benedikt.kuntz@airbus.com>
Date: Mon, 14 Oct 2019 08:44:46 +0200
Subject: [PATCH 1116/1286] Bug 551750 - [Tools] Application model editor,
 adding a PartSash to a composite part creates another CompositePart

Fixed wrong feature in action definition

Change-Id: Ieefa2d141e43f567d55510310a975b5b4fb00baf
Signed-off-by: Benedikt Kuntz <benedikt.kuntz@airbus.com>
---
 .../emf/ui/internal/common/component/CompositePartEditor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index 9b3a75dffc..11c8edbfda 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -102,7 +102,7 @@ void init() {
 				createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
 			@Override
 			public void run() {
-				handleAddChild(BasicPackageImpl.Literals.COMPOSITE_PART);
+				handleAddChild(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
 			}
 		});
 		actions.add(new Action(Messages.CompositePartEditor_AddPartStack,

From 554503c561587f5a87375e16cd1e6dc607bc6ac1 Mon Sep 17 00:00:00 2001
From: Benedikt Kuntz <benedikt.kuntz@airbus.com>
Date: Wed, 16 Oct 2019 11:04:35 +0200
Subject: [PATCH 1117/1286] Bug 551553 - Model editor - cannot select Imports
 in fragments via keyboard

add listeners for arrow up/down to set focus to viewer/search text box
and to select the first element when table viewer gains focus

Change-Id: Iabb914f4a161fd0e8b2b0bcaa6a49b9b71e2e3a8
Signed-off-by: Benedikt Kuntz <benedikt.kuntz@airbus.com>
---
 .../FindParentReferenceElementDialog.java     | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index 72275d7bc8..ab8aeb9fc6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -53,6 +53,10 @@
 import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.FocusAdapter;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -226,6 +230,33 @@ public void update(ViewerCell cell) {
 
 		list = new WritableList<>();
 		viewer.setInput(list);
+		viewer.getControl().addFocusListener(new FocusAdapter() {
+			@Override
+			public void focusGained(FocusEvent e) {
+				if (viewer.getTable().getItemCount() > 0) {
+					viewer.getTable().select(0);
+				}
+			}
+		});
+
+		viewer.getTable().addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyPressed(KeyEvent e) {
+				super.keyPressed(e);
+				if (e.keyCode == SWT.ARROW_UP && viewer.getTable().getSelectionIndex() == 0) {
+					searchText.setFocus();
+				}
+			}
+		});
+
+		searchText.addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyPressed(KeyEvent e) {
+				if (e.keyCode == SWT.ARROW_DOWN) {
+					viewer.getTable().setFocus();
+				}
+			}
+		});
 
 		searchText.addModifyListener(e -> updateSearch());
 

From a354f31b030c4837af278c19bd90939a7e726a49 Mon Sep 17 00:00:00 2001
From: Benedikt Kuntz <benedikt.kuntz@airbus.com>
Date: Thu, 17 Oct 2019 14:20:36 +0200
Subject: [PATCH 1118/1286] Bug 552176 - [Tools] Application model editor: Jump
 to list entries

add IOpenListener for E4PickList, CompositePartEditor list

Change-Id: Ibaf311eb001c81ad00a93dd3c3cf6b829e362be7
Signed-off-by: Benedikt Kuntz <benedikt.kuntz@airbus.com>
---
 .../e4/tools/emf/ui/internal/common/E4PickList.java   | 11 +++++++++++
 .../common/component/CompositePartEditor.java         | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
index f9200e10c1..cdf5173f61 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
@@ -113,6 +113,17 @@ public String getText(Object element) {
 		final ObservableListContentProvider<?> cp = new ObservableListContentProvider<>();
 		viewer.setContentProvider(cp);
 
+		viewer.addOpenListener(event -> {
+			if (event.getSelection() instanceof IStructuredSelection) {
+				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+				ModelEditor editor = componentEditor.getEditor();
+				if (selection.getFirstElement() instanceof EObject && editor != null) {
+					EObject selected = (EObject) selection.getFirstElement();
+					editor.gotoEObject(ModelEditor.TAB_FORM, selected);
+				}
+			}
+		});
+
 		// enable tabbing and keyboard activation
 		this.focusCellMgr = new TableViewerFocusCellManager(viewer, new FocusCellOwnerDrawHighlighter(viewer),
 				new CellNavigationStrategy());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index 11c8edbfda..02a03f2906 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -19,6 +19,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.FeatureClassLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
@@ -356,6 +357,16 @@ public void widgetSelected(SelectionEvent e) {
 
 			viewer.setInput(E4Properties.<MPartSashContainerElement>children().observeDetail(getMaster()));
 
+			viewer.addOpenListener(event -> {
+				if (event.getSelection() instanceof IStructuredSelection) {
+					IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+					if (selection.getFirstElement() instanceof EObject && getEditor() != null) {
+						EObject selected = (EObject) selection.getFirstElement();
+						getEditor().gotoEObject(ModelEditor.TAB_FORM, selected);
+					}
+				}
+			});
+
 			new Label(parent, SWT.NONE);
 
 			final Composite buttonCompBot = new Composite(parent, SWT.NONE);

From 7ef926a4d2c97868bce74e51eaca9a8d3229dbb6 Mon Sep 17 00:00:00 2001
From: Benedikt Kuntz <benedikt.kuntz@airbus.com>
Date: Thu, 17 Oct 2019 12:51:38 +0200
Subject: [PATCH 1119/1286] Fix spacing in E4PickList Layout

Change-Id: I275504dd97f1ffad650595f39fe89bd9c1866b12
Signed-off-by: Benedikt Kuntz <benedikt.kuntz@airbus.com>
---
 .../ui/internal/common/AbstractPickList.java  | 26 ++++---------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index 8c227c5024..ac0de6aa40 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -20,6 +20,7 @@
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.ILabelProvider;
@@ -82,29 +83,14 @@ public AbstractPickList(Composite parent, int style, List<PickListFeatures> list
 
 		if (listFeatures != null && listFeatures.contains(PickListFeatures.NO_GROUP)) {
 			composite = new Composite(this, SWT.NONE);
+			composite.setLayout(GridLayoutFactory.fillDefaults().create());
 		} else {
 			composite = new Group(this, SWT.NONE);
+			composite.setLayout(GridLayoutFactory.swtDefaults().create());
 		}
 
-		GridLayout layout = new GridLayout(1, false);
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		layout.marginRight = 0;
-		layout.marginLeft = 0;
-		layout.horizontalSpacing = 0;
-		layout.verticalSpacing = 0;
-		composite.setLayout(layout);
-
 		Composite comp = new Composite(composite, SWT.NONE);
-
-		layout = new GridLayout(2, false);
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		layout.marginRight = 0;
-		layout.marginLeft = 0;
-		layout.horizontalSpacing = 0;
-		layout.verticalSpacing = 0;
-		comp.setLayout(layout);
+		comp.setLayout(GridLayoutFactory.fillDefaults().numColumns(2).create());
 		comp.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
 
 		picker = new ComboViewer(comp, SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
@@ -115,15 +101,13 @@ public AbstractPickList(Composite parent, int style, List<PickListFeatures> list
 		control.setLayoutData(gdpicker);
 
 		toolBar = new Composite(comp, SWT.NONE);
-		layout = new GridLayout(5, true);
+		GridLayout layout = GridLayoutFactory.swtDefaults().numColumns(5).spacing(2, 0).equalWidth(true).create();
 		if (listFeatures != null && listFeatures.contains(PickListFeatures.NO_PICKER)) {
 			layout.marginHeight = 0;
 			layout.marginWidth = 0;
 			layout.marginRight = 0;
 			layout.marginLeft = 0;
 		}
-		layout.horizontalSpacing = 2;
-		layout.verticalSpacing = 0;
 		toolBar.setLayout(layout);
 		toolBar.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
 		toolBar.setFont(composite.getFont());

From 7f77e29c06f5a64b937319ea306e41493bc180da Mon Sep 17 00:00:00 2001
From: Benedikt Kuntz <benedikt.kuntz@airbus.com>
Date: Fri, 18 Oct 2019 10:49:33 +0200
Subject: [PATCH 1120/1286] Bug 551551 - Icons should be scaled in the model
 editor

Scale images in AbstractComponentEditor#getImage, add new scaleImage
function in Util class. Use this class also in
AbstractIconDialogWithScopeAndFilter

Change-Id: I6d7f67316b7ab76f77bbfd3112d65ad3707f626c
Signed-off-by: Benedikt Kuntz <benedikt.kuntz@airbus.com>
---
 .../eclipse/e4/tools/emf/ui/common/Util.java  | 35 +++++++++++++++++++
 .../component/AbstractComponentEditor.java    | 18 +++++++++-
 .../AbstractIconDialogWithScopeAndFilter.java | 34 +++++-------------
 3 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index 7a88cfc450..d6e6151707 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -58,6 +58,7 @@
 import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
 import org.eclipse.pde.internal.core.PDEExtensionRegistry;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Control;
 
 public class Util {
@@ -364,6 +365,40 @@ private static void setUpResourceSet(ResourceSet resourceSet, IWorkspaceRoot roo
 		}
 	}
 
+	/**
+	 * Scales an {@link Image} to the the given size preserving the original aspect
+	 * ratio. If a new Image is created, the given Image is disposed.
+	 *
+	 * @param img     Original Image
+	 * @param maxSize Maximum size of the resulting image (maximum width if the
+	 *                original image has landscape format and vice versa)
+	 * @return Scaled Image or the original image if it is already smaller than
+	 *         maxSize x maxSize
+	 */
+	public static Image scaleImage(Image img, int maxSize) {
+		Image result = img;
+
+		double scale1 = (double) maxSize / img.getImageData().height;
+		final double scale2 = (double) maxSize / img.getImageData().width;
+		if (scale2 < scale1) {
+			scale1 = scale2;
+		}
+		if (scale1 < 1) {
+			int width = (int) (img.getImageData().width * scale1);
+			if (width == 0) {
+				width = 1;
+			}
+			int height = (int) (img.getImageData().height * scale1);
+			if (height == 0) {
+				height = 1;
+			}
+			Image img2 = new Image(img.getDevice(), img.getImageData().scaledTo(width, height));
+			img.dispose();
+			result = img2;
+		}
+		return result;
+	}
+
 	/**
 	 * This method checks if an EClass can be extended using a fragment. ie : it
 	 * must have containment EReference to a model object.
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index bc2d6ce734..f9bd017265 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -19,9 +19,12 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
+import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -74,6 +77,8 @@ public abstract class AbstractComponentEditor<M> {
 
 	private static final String CSS_CLASS_KEY = "org.eclipse.e4.ui.css.CssClassName"; //$NON-NLS-1$
 
+	private static final int MAX_IMG_SIZE = 16;
+
 	private final WritableValue<M> master = new WritableValue<>();
 
 	public static final int SEARCH_IMAGE = 0;
@@ -84,6 +89,8 @@ public abstract class AbstractComponentEditor<M> {
 
 	protected static final int VERTICAL_LIST_WIDGET_INDENT = 10;
 
+	private final List<Image> createdImages = new ArrayList<>();
+
 	@Inject
 	private EditingDomain editingDomain;
 	@Inject
@@ -307,7 +314,10 @@ private ImageDescriptor getImageDescriptorFromUri(String uri) {
 		}
 
 		if (url != null) {
-			result = ImageDescriptor.createFromURL(url);
+			ImageDescriptor imageDesc = ImageDescriptor.createFromURL(url);
+			Image scaled = Util.scaleImage(imageDesc.createImage(), MAX_IMG_SIZE);
+			createdImages.add(scaled);
+			result = ImageDescriptor.createFromImage(scaled);
 		}
 
 		return result;
@@ -317,6 +327,7 @@ public Image getImage(Object element) {
 		return null;
 	}
 
+
 	public abstract String getLabel(Object element);
 
 	public abstract String getDetailLabel(Object element);
@@ -477,4 +488,9 @@ protected void enableIdGenerator(EAttribute attSource, EAttribute attId, Control
 		}
 	}
 
+	@PreDestroy
+	public void dispose() {
+		createdImages.stream().filter(Objects::nonNull).filter(i -> !i.isDisposed()).forEach(Image::dispose);
+	}
+
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
index 2310b646b0..84b3ed56bb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
@@ -34,6 +34,7 @@
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
 import org.eclipse.e4.tools.emf.ui.common.ResourceSearchScope;
+import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.tools.emf.ui.internal.StringMatcher;
 import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
@@ -170,41 +171,24 @@ public void update(ViewerCell cell) {
 					}
 				}
 
-				// scale image if larger then max height
-				// also remember max width for column resizing
-
-				double scale1 = (double) maxDisplayedImageSize / img.getImageData().height;
-				final double scale2 = (double) maxDisplayedImageSize / img.getImageData().width;
-				if (scale2 < scale1) {
-					scale1 = scale2;
-				}
-				if (scale1 < 1) {
-					int width = (int) (img.getImageData().width * scale1);
-					if (width == 0) {
-						width = 1;
-					}
-					int height = (int) (img.getImageData().height * scale1);
-					if (height == 0) {
-						height = 1;
-					}
-					final Image img2 = new Image(img.getDevice(), img.getImageData().scaledTo(width, height));
-					img.dispose();
-					img = img2;
-					icons.put(file, img);
+				Image scaled = Util.scaleImage(img, maxDisplayedImageSize);
+				if (!scaled.equals(img)) {
+					icons.put(file, scaled);
 				}
 				final int width = AbstractIconDialogWithScopeAndFilter.this.getViewer().getTable().getColumn(0)
 						.getWidth();
-				if (img.getImageData().width > width) {
+				if (scaled.getImageData().width > width) {
 					AbstractIconDialogWithScopeAndFilter.this.getViewer().getTable().getColumn(0)
-					.setWidth(img.getImageData().width);
+							.setWidth(scaled.getImageData().width);
 				}
-				final int height = img.getImageData().height;
+				final int height = scaled.getImageData().height;
 				if (height > maxImageHeight) {
 					maxImageHeight = height;
 				}
 
-				cell.setImage(img);
+				cell.setImage(scaled);
 			}
+
 		});
 		colIcon.getColumn().setWidth(30);
 

From 322f26948b92cc0b0724a2a740267ce17566f748 Mon Sep 17 00:00:00 2001
From: Benedikt Kuntz <benedikt.kuntz@airbus.com>
Date: Mon, 14 Oct 2019 13:13:47 +0200
Subject: [PATCH 1121/1286] =?UTF-8?q?Bug=20496835=20-=20[Tools]=20Applicat?=
 =?UTF-8?q?ion=20model=20editor=20doesn=E2=80=99t=20allow=20the=20manageme?=
 =?UTF-8?q?nt=20of=20=E2=80=9CVariables=E2=80=9D=20for=20a=20CompositePart?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

add Context Properties and Variables Group for CompositePartEditor

Change-Id: Ib329caa2fd490566e4ec135b786c452157ce35ec
Signed-off-by: Benedikt Kuntz <benedikt.kuntz@airbus.com>
---
 .../common/component/CompositePartEditor.java         | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index 02a03f2906..97595e7969 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -47,6 +47,7 @@
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
+import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.resource.FontDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
@@ -443,6 +444,16 @@ public void widgetSelected(SelectionEvent e) {
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
 				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
+		Composite propComposite = ControlFactory.createMapProperties(parent, Messages, this,
+				Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES,
+				VERTICAL_LIST_WIDGET_INDENT);
+		propComposite.setLayoutData(GridDataFactory.fillDefaults().grab(true, true).span(3, 1).create());
+
+		Composite variablesComposite = ControlFactory.createStringListWidget(parent, Messages, this,
+				Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES,
+				VERTICAL_LIST_WIDGET_INDENT);
+		variablesComposite.setLayoutData(GridDataFactory.fillDefaults().grab(true, true).span(3, 1).create());
+
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);
 

From c50053a805f666e5d8853b19bb1a65a55e869584 Mon Sep 17 00:00:00 2001
From: Benedikt Kuntz <benedikt.kuntz@airbus.com>
Date: Tue, 29 Oct 2019 13:58:03 +0100
Subject: [PATCH 1122/1286] =?UTF-8?q?Bug=20496833=20-=20[Tools]=20Applicat?=
 =?UTF-8?q?ion=20model=20editor=20doesn=E2=80=99t=20allow=20to=20create=20?=
 =?UTF-8?q?a=20ToolBar=20for=20a=20CompositePart?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Create abstract superclass for Part Editors, extend GUI for
CompositePart-Editors. Add VControlsEditor to configure sub-parts of
CompositeParts

Change-Id: Iefae092e39791c4a0cc3050cbbb6d3e8023a6606
Signed-off-by: Benedikt Kuntz <benedikt.kuntz@airbus.com>
---
 .../e4/tools/emf/ui/internal/Messages.java    |   9 +-
 .../tools/emf/ui/internal/Messages.properties |  11 +-
 .../emf/ui/internal/common/ModelEditor.java   |   4 +
 .../common/component/AbstractPartEditor.java  | 363 ++++++++++++++
 .../common/component/CompositePartEditor.java | 458 ++++++------------
 .../internal/common/component/PartEditor.java | 308 +-----------
 .../component/virtual/VControlsEditor.java    | 253 ++++++++++
 7 files changed, 774 insertions(+), 632 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlsEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index efdcdbf870..5190449348 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -277,6 +277,7 @@ public class Messages {
 	public String PartEditor_ContainerData;
 	public String PartEditor_ToolBar;
 	public String PartEditor_BindingContexts;
+	public String PartEditor_Controls;
 
 	public String PartSashContainerEditor_Label;
 	public String PartSashContainerEditor_Description;
@@ -509,6 +510,9 @@ public class Messages {
 	public String VHandlerEditor_Handlers;
 	public String VHandlerEditor_AddHandler;
 
+	public String VControlsEditor_TreeLabel;
+	public String VControlsEditor_TreeLabelDescription;
+
 	public String VMenuContributionsEditor_TreeLabel;
 	public String VMenuContributionsEditor_TreeLabelDescription;
 	public String VMenuContributionsEditor_MenuContributions;
@@ -799,11 +803,6 @@ public class Messages {
 	public String CompositePartEditor_Horizontal;
 	public String CompositePartEditor_Vertical;
 	public String CompositePartEditor_SelectedElement;
-	public String CompositePartEditor_ContainerData;
 	public String CompositePartEditor_Controls;
-	public String CompositePartEditor_LabelLabel;
-	public String CompositePartEditor_Tooltip;
-	public String CompositePartEditor_IconURI;
-	public String CompositePartEditor_IconURI_Tooltip;
 
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 11afd83a04..d0c865008b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -238,6 +238,7 @@ PartEditor_Handlers=Handlers
 PartEditor_ContainerData=Container &Data\:
 PartEditor_ToolBar=ToolBar
 PartEditor_BindingContexts=Binding Contexts
+PartEditor_Controls=Controls
 
 PartSashContainerEditor_Label=Part Sash Container
 PartSashContainerEditor_Description=Sash
@@ -484,6 +485,9 @@ VHandlerEditor_TreeLabelDescription=Handlers
 VHandlerEditor_Handlers=Handlers
 VHandlerEditor_AddHandler=Handler
 
+VControlsEditor_TreeLabel=Controls
+VControlsEditor_TreeLabelDescription=Controls
+
 VMenuContributionsEditor_TreeLabel=Menu Contributions
 VMenuContributionsEditor_TreeLabelDescription=Menu Contributions
 VMenuContributionsEditor_MenuContributions=Menu Contributions
@@ -806,9 +810,4 @@ CompositePartEditor_Orientation=&Orientation\:
 CompositePartEditor_Horizontal=Horizontal
 CompositePartEditor_Vertical=Vertical
 CompositePartEditor_SelectedElement=&Selected Element\:
-CompositePartEditor_ContainerData=Container &Data\:
-CompositePartEditor_Controls=&Controls\:
-CompositePartEditor_LabelLabel=L&abel\:
-CompositePartEditor_Tooltip=T&ooltip\:
-CompositePartEditor_IconURI=&Icon URI\:
-CompositePartEditor_IconURI_Tooltip=Choose the icon of your part here
\ No newline at end of file
+CompositePartEditor_Controls=&Controls\:
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index cb6254263b..053c33d7ff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -124,6 +124,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VApplicationWindowEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VBindingTableEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VCommandEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VControlsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VHandlerEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VItemParametersEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VMenuContributionsEditor;
@@ -251,6 +252,7 @@ public class ModelEditor implements IGotoObject {
 
 	public static final String VIRTUAL_PART_MENU = "org.eclipse.e4.tools.emf.ui.VIRTUAL_PART_MENU"; //$NON-NLS-1$
 	public static final String VIRTUAL_HANDLER = "org.eclipse.e4.tools.emf.ui.VIRTUAL_HANDLER"; //$NON-NLS-1$
+	public static final String VIRTUAL_CONTROLS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_CONTROLS"; //$NON-NLS-1$
 	public static final String VIRTUAL_BINDING_TABLE = "org.eclipse.e4.tools.emf.ui.VIRTUAL_BINDING_TABLE"; //$NON-NLS-1$
 	public static final String VIRTUAL_COMMAND = "org.eclipse.e4.tools.emf.ui.VIRTUAL_COMMAND"; //$NON-NLS-1$
 	public static final String VIRTUAL_APPLICATION_WINDOWS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_APPLICATION_WINDOWS"; //$NON-NLS-1$
@@ -280,6 +282,7 @@ public class ModelEditor implements IGotoObject {
 	public static final int TAB_XMI = 1;
 	public static final int TAB_LIST = 2;
 
+
 	/**
 	 * A map with key = eClass name or virtual key, value is an
 	 * AbstractComponentEditor instance This map is filled on the fly when getting
@@ -1140,6 +1143,7 @@ private void registerContributedVirtualEditors() {
 	private void registerVirtualEditors() {
 		registerEditor(VIRTUAL_PART_MENU, VPartMenuEditor.class);
 		registerEditor(VIRTUAL_HANDLER, VHandlerEditor.class);
+		registerEditor(VIRTUAL_CONTROLS, VControlsEditor.class);
 		registerEditor(VIRTUAL_BINDING_TABLE, VBindingTableEditor.class);
 		registerEditor(VIRTUAL_COMMAND, VCommandEditor.class);
 		registerEditor(VIRTUAL_APPLICATION_WINDOWS, VApplicationWindowEditor.class);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java
new file mode 100644
index 0000000000..67e42cc88d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java
@@ -0,0 +1,363 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Airbus Defence and Space GmbH and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Benedikt Kuntz <benedikt.kuntz@airbus.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component;
+
+import javax.inject.Inject;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
+import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
+import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
+import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public abstract class AbstractPartEditor<M extends MPart> extends AbstractComponentEditor<M> {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private Button createRemoveToolBarButton;
+	private StackLayout stackLayout;
+
+	@Inject
+	@Optional
+	private IProject project;
+
+	@Inject
+	private IEclipseContext eclipseContext;
+
+	@Inject
+	public AbstractPartEditor() {
+		super();
+	}
+
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL),
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public Composite doGetEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			if (getEditor().isModelFragment()) {
+				composite = new Composite(parent, SWT.NONE);
+				stackLayout = new StackLayout();
+				composite.setLayout(stackLayout);
+				createForm(composite, context, getMaster(), false);
+				createForm(composite, context, getMaster(), true);
+			} else {
+				composite = createForm(parent, context, getMaster(), false);
+			}
+		}
+
+		if (getEditor().isModelFragment()) {
+			Control topControl;
+			if (Util.isImport((EObject) object)) {
+				topControl = composite.getChildren()[1];
+			} else {
+				topControl = composite.getChildren()[0];
+			}
+
+			if (stackLayout.topControl != topControl) {
+				stackLayout.topControl = topControl;
+				composite.layout(true, true);
+			}
+		}
+
+		if (createRemoveToolBarButton != null) {
+			createRemoveToolBarButton.setSelection(((MPart) object).getToolbar() != null);
+		}
+
+		return composite;
+	}
+
+	protected Composite createForm(Composite parent, final EMFDataBindingContext context,
+			WritableValue<M> master, boolean isImport) {
+
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		CTabItem item = new CTabItem(folder, SWT.BORDER);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
+			ControlFactory.createXMIId(parent, this);
+		}
+
+		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
+
+		if (isImport) {
+			ControlFactory.createFindImport(parent, Messages, this, context);
+			folder.setSelection(0);
+			return folder;
+		}
+
+		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
+				E4Properties.elementId(getEditingDomain()));
+		ControlFactory.createTextField(parent, Messages.PartEditor_LabelLabel, master, context, textProp,
+				E4Properties.label(getEditingDomain()));
+		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, master, context,
+				textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
+		ControlFactory.createTextField(parent, Messages.PartEditor_Tooltip, master, context, textProp,
+				E4Properties.tooltip(getEditingDomain()));
+
+		// ------------------------------------------------------------
+		{
+			final Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.PartEditor_IconURI);
+			l.setLayoutData(new GridData());
+			l.setToolTipText(Messages.PartEditor_IconURI_Tooltip);
+
+			final Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(
+					textProp.observeDelayed(200, t),
+					E4Properties.iconUri(getEditingDomain()).observeDetail(master));
+
+			new ImageTooltip(t, Messages, this);
+
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					final PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), eclipseContext, project,
+							getEditingDomain(), getMaster().getValue(), Messages);
+					dialog.open();
+				}
+			});
+		}
+
+
+		ControlFactory.createClassURIField(parent, Messages, this, Messages.PartEditor_ClassURI,
+				ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
+				getEditor().getContributionCreator(BasicPackageImpl.Literals.PART), project, context, eclipseContext);
+
+		// ------------------------------------------------------------
+		ControlFactory.createTextField(parent, Messages.PartEditor_ContainerData, master, context, textProp,
+				E4Properties.containerData(getEditingDomain()));
+
+		createSubformElements(parent, context, master);
+
+		{
+			final Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.PartEditor_ToolBar);
+			l.setLayoutData(new GridData());
+
+			createRemoveToolBarButton = new Button(parent, SWT.CHECK);
+			createRemoveToolBarButton.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					final MPart window = getMaster().getValue();
+					if (window.getToolbar() == null) {
+						addToolBar();
+					} else {
+						removeToolBar();
+					}
+				}
+			});
+			createRemoveToolBarButton
+			.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
+		}
+
+		ControlFactory.createCheckBox(parent, Messages.PartEditor_Closeable, Messages.PartEditor_Closeable_Tooltip,
+				getMaster(), context, WidgetProperties.buttonSelection(),
+				E4Properties.partClosable(getEditingDomain()));
+
+		// ------------------------------------------------------------
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
+				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
+
+		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.PartEditor_BindingContexts);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties,
+				UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+
+		item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabSupplementary);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables,
+				Messages.ModelTooling_Context_Variables_Tooltip, UiPackageImpl.Literals.CONTEXT__VARIABLES,
+				VERTICAL_LIST_WIDGET_INDENT);
+		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
+				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+
+		if (project == null) {
+			createInstanceInspection(folder);
+			createUITreeInspection(folder);
+		}
+
+		createContributedEditorTabs(folder, context, getMaster(), MPart.class);
+
+		folder.setSelection(0);
+
+		return folder;
+	}
+
+	protected void createSubformElements(Composite parent, EMFDataBindingContext context,
+			IObservableValue<M> master) {
+		// add nothing as default, allow to be overwritten
+	}
+
+	protected void addToolBar() {
+		final MToolBar menu = MMenuFactory.INSTANCE.createToolBar();
+		setElementId(menu);
+
+		final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(),
+				BasicPackageImpl.Literals.PART__TOOLBAR, menu);
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+		}
+	}
+
+	protected void removeToolBar() {
+		final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(),
+				BasicPackageImpl.Literals.PART__TOOLBAR, null);
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+		}
+	}
+
+	private void createInstanceInspection(CTabFolder folder) {
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeContributionInstance);
+		final Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		final ObjectViewer objectViewer = new ObjectViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container,
+				ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
+	private void createUITreeInspection(CTabFolder folder) {
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
+		final Composite container = new Composite(folder, SWT.NONE);
+		container.setLayout(new GridLayout());
+		item.setControl(container);
+
+		final UIViewer objectViewer = new UIViewer();
+		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
+				getMaster(), resourcePool, Messages);
+		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
+	@Override
+	public IObservableList<?> getChildList(Object element) {
+		final WritableList<Object> list = new WritableList<>();
+		final MPart part = (MPart) element;
+
+		if (getEditor().isModelFragment() && Util.isImport((EObject) element)) {
+			return list;
+		}
+
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_PART_MENU, E4Properties.partMenus(), part,
+				Messages.PartEditor_Menus));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_HANDLER, E4Properties.handlers(), part,
+				Messages.PartEditor_Handlers));
+
+		if (part.getToolbar() != null) {
+			list.add(0, part.getToolbar());
+		}
+
+		E4Properties.partToolbar().observe(part).addValueChangeListener(event -> {
+			if (event.diff.getOldValue() != null) {
+				list.remove(event.diff.getOldValue());
+				if (getMaster().getValue() == element && !createRemoveToolBarButton.isDisposed()) {
+					createRemoveToolBarButton.setSelection(false);
+				}
+
+			}
+
+			if (event.diff.getNewValue() != null) {
+				list.add(0, event.diff.getNewValue());
+				if (getMaster().getValue() == element && !createRemoveToolBarButton.isDisposed()) {
+					createRemoveToolBarButton.setSelection(true);
+				}
+			}
+		});
+
+		addChildListEntries(part, list);
+
+		return list;
+	}
+
+
+	protected void addChildListEntries(MPart part, IObservableList<Object> list) {
+		// add nothing by default, allow to be overwritten
+	}
+
+
+	@Override
+	public void dispose() {
+		super.dispose();
+		if (context != null) {
+			context.dispose();
+		}
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index 97595e7969..bf583e3a3b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -7,25 +7,18 @@
 import javax.inject.Inject;
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
-import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.FeatureClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
 import org.eclipse.e4.tools.emf.ui.internal.imp.RegistryUtil;
-import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MCompositePart;
@@ -42,12 +35,10 @@
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
-import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.jface.resource.FontDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
@@ -56,50 +47,28 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 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;
 
-public class CompositePartEditor extends AbstractComponentEditor<MCompositePart> {
-	private Composite composite;
-	private EMFDataBindingContext context;
-	private StackLayout stackLayout;
+public class CompositePartEditor extends AbstractPartEditor<MCompositePart> {
 	private final List<Action> actions = new ArrayList<>();
 	private final List<Action> actionsImport = new ArrayList<>();
 
-	@Inject
-	@Optional
-	private IProject project;
-
 	@Inject
 	private Shell shell;
 
-	@Inject
-	IEclipseContext eclipseContext;
-
-	@Inject
-	public CompositePartEditor() {
-		super();
-	}
-
 	@PostConstruct
-	void init() {
+	protected void init() {
 		actions.add(new Action(Messages.CompositePartEditor_AddPartSashContainer,
 				createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
 			@Override
@@ -167,7 +136,6 @@ public Image getImage(Object element) {
 
 		return horizontal ? getImage(element, ResourceProvider.IMG_PartSashContainer)
 				: getImage(element, ResourceProvider.IMG_PartSashContainer_vertical);
-
 	}
 
 	@Override
@@ -175,6 +143,12 @@ public String getLabel(Object element) {
 		return Messages.CompositePartEditor_Label;
 	}
 
+	@Override
+	public FeaturePath[] getLabelProperties() {
+		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL),
+				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+	}
+
 	@Override
 	public String getDescription(Object element) {
 		return Messages.CompositePartEditor_Description;
@@ -182,95 +156,15 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite doGetEditor(Composite parent, Object object) {
-		if (composite == null) {
-			context = new EMFDataBindingContext();
-			if (getEditor().isModelFragment()) {
-				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
-				composite.setLayout(stackLayout);
-				createForm(composite, context, getMaster(), false);
-				createForm(composite, context, getMaster(), true);
-			} else {
-				composite = createForm(parent, context, getMaster(), false);
-			}
-		}
-
-		if (getEditor().isModelFragment()) {
-			Control topControl;
-			if (Util.isImport((EObject) object)) {
-				topControl = composite.getChildren()[1];
-			} else {
-				topControl = composite.getChildren()[0];
-			}
-
-			if (stackLayout.topControl != topControl) {
-				stackLayout.topControl = topControl;
-				composite.layout(true, true);
-			}
-		}
-
+		Composite composite = super.doGetEditor(parent, object);
 		getMaster().setValue((MCompositePart) object);
 		return composite;
 	}
 
-	private Composite createForm(Composite parent, final EMFDataBindingContext context,
-			WritableValue<MCompositePart> master, boolean isImport) {
-		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
-
-		CTabItem item = new CTabItem(folder, SWT.NONE);
-		item.setText(Messages.ModelTooling_Common_TabDefault);
-
-		parent = createScrollableContainer(folder);
-		item.setControl(parent.getParent());
-
-		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
-			ControlFactory.createXMIId(parent, this);
-		}
-
-		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
-
-		if (isImport) {
-			ControlFactory.createFindImport(parent, Messages, this, context);
-			folder.setSelection(0);
-			return folder;
-		}
-
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				E4Properties.elementId(getEditingDomain()));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(),
-				context, textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
-		ControlFactory.createTextField(parent, Messages.CompositePartEditor_LabelLabel, master, context, textProp,
-				E4Properties.label(getEditingDomain()));
-		ControlFactory.createTextField(parent, Messages.CompositePartEditor_Tooltip, master, context, textProp,
-				E4Properties.tooltip(getEditingDomain()));
-
-		// ------------------------------------------------------------
-		{
-			final Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.CompositePartEditor_IconURI);
-			l.setLayoutData(new GridData());
-			l.setToolTipText(Messages.CompositePartEditor_IconURI_Tooltip);
-
-			final Text t = new Text(parent, SWT.BORDER);
-			TextPasteHandler.createFor(t);
-			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(textProp.observeDelayed(200, t),
-					E4Properties.iconUri(getEditingDomain()).observeDetail(master));
-
-			new ImageTooltip(t, Messages, this);
-
-			Button b = ControlFactory.createFindButton(parent, resourcePool);
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					final PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), eclipseContext, project,
-							getEditingDomain(), getMaster().getValue(), Messages);
-					dialog.open();
-				}
-			});
-		}
+	@Override
+	protected void createSubformElements(Composite parent, EMFDataBindingContext context,
+			IObservableValue<MCompositePart> master) {
 
-		// ------------------------------------------------------------
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CompositePartEditor_Orientation);
@@ -295,214 +189,146 @@ public String getText(Object element) {
 		}
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.CompositePartEditor_SelectedElement);
-		ControlFactory.createTextField(parent, Messages.CompositePartEditor_ContainerData, master, context, textProp,
-				E4Properties.containerData(getEditingDomain()));
-
-		{
 
-			final Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.CompositePartEditor_Controls);
-			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
-
-			final Composite buttonCompTop = new Composite(parent, SWT.NONE);
-			final GridData span2 = new GridData(GridData.FILL, GridData.BEGINNING, false, false, 2, 1);
-			buttonCompTop.setLayoutData(span2);
-			final GridLayout gl = new GridLayout(2, false);
-			gl.marginLeft = 0;
-			gl.marginRight = 0;
-			gl.marginWidth = 0;
-			gl.marginHeight = 0;
-			buttonCompTop.setLayout(gl);
-
-			final ComboViewer childrenDropDown = new ComboViewer(buttonCompTop);
-			childrenDropDown.setLabelProvider(new FeatureClassLabelProvider(getEditor()));
-			childrenDropDown.setContentProvider(ArrayContentProvider.getInstance());
-
-			final List<FeatureClass> eClassList = new ArrayList<>();
-			eClassList.add(new FeatureClass("PartSashContainer", BasicPackageImpl.Literals.PART_SASH_CONTAINER)); //$NON-NLS-1$
-			eClassList.add(new FeatureClass("PartStack", BasicPackageImpl.Literals.PART_STACK)); //$NON-NLS-1$
-			eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART)); //$NON-NLS-1$
-			eClassList.add(new FeatureClass("Area", AdvancedPackageImpl.Literals.AREA)); //$NON-NLS-1$
-			eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER)); //$NON-NLS-1$
-			eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.COMPOSITE_PART,
-					UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
-			childrenDropDown.setInput(eClassList);
-			childrenDropDown.setSelection(new StructuredSelection(eClassList.get(0)));
-
-			Button b = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);
-			b.setText(org.eclipse.e4.tools.emf.ui.internal.Messages.ModelTooling_Common_AddEllipsis);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
-			b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!childrenDropDown.getSelection().isEmpty()) {
-						final EClass eClass = ((FeatureClass) ((IStructuredSelection) childrenDropDown.getSelection())
-								.getFirstElement()).eClass;
-						handleAddChild(eClass);
-					}
+		final Label l = new Label(parent, SWT.NONE);
+		l.setText(Messages.CompositePartEditor_Controls);
+		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+
+		final Composite buttonCompTop = new Composite(parent, SWT.NONE);
+		final GridData span2 = new GridData(GridData.FILL, GridData.BEGINNING, false, false, 2, 1);
+		buttonCompTop.setLayoutData(span2);
+		buttonCompTop.setLayout(GridLayoutFactory.fillDefaults().numColumns(2).create());
+
+		final ComboViewer childrenDropDown = new ComboViewer(buttonCompTop);
+		childrenDropDown.setLabelProvider(new FeatureClassLabelProvider(getEditor()));
+		childrenDropDown.setContentProvider(ArrayContentProvider.getInstance());
+
+		final List<FeatureClass> eClassList = new ArrayList<>();
+		eClassList.add(new FeatureClass("PartSashContainer", BasicPackageImpl.Literals.PART_SASH_CONTAINER)); //$NON-NLS-1$
+		eClassList.add(new FeatureClass("PartStack", BasicPackageImpl.Literals.PART_STACK)); //$NON-NLS-1$
+		eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART)); //$NON-NLS-1$
+		eClassList.add(new FeatureClass("Area", AdvancedPackageImpl.Literals.AREA)); //$NON-NLS-1$
+		eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER)); //$NON-NLS-1$
+		eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.COMPOSITE_PART,
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
+		childrenDropDown.setInput(eClassList);
+		childrenDropDown.setSelection(new StructuredSelection(eClassList.get(0)));
+
+		Button b = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);
+		b.setText(org.eclipse.e4.tools.emf.ui.internal.Messages.ModelTooling_Common_AddEllipsis);
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_add));
+		b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!childrenDropDown.getSelection().isEmpty()) {
+					final EClass eClass = ((FeatureClass) ((IStructuredSelection) childrenDropDown.getSelection())
+							.getFirstElement()).eClass;
+					handleAddChild(eClass);
 				}
-			});
+			}
+		});
 
-			new Label(parent, SWT.NONE);
+		new Label(parent, SWT.NONE);
 
-			final TableViewer viewer = new TableViewer(parent);
-			final GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1);
-			viewer.getControl().setLayoutData(gd);
-			viewer.setContentProvider(new ObservableListContentProvider<>());
+		final TableViewer viewer = new TableViewer(parent);
+		final GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1);
+		viewer.getControl().setLayoutData(gd);
+		viewer.setContentProvider(new ObservableListContentProvider<>());
 
-			final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont())
-					.setStyle(SWT.ITALIC);
-			viewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
-					new ComponentLabelProvider(getEditor(), Messages, italicFontDescriptor)));
+		final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont())
+				.setStyle(SWT.ITALIC);
+		viewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
+				new ComponentLabelProvider(getEditor(), Messages, italicFontDescriptor)));
 
-			viewer.setInput(E4Properties.<MPartSashContainerElement>children().observeDetail(getMaster()));
+		viewer.setInput(E4Properties.<MPartSashContainerElement>children().observeDetail(getMaster()));
 
-			viewer.addOpenListener(event -> {
-				if (event.getSelection() instanceof IStructuredSelection) {
-					IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-					if (selection.getFirstElement() instanceof EObject && getEditor() != null) {
-						EObject selected = (EObject) selection.getFirstElement();
-						getEditor().gotoEObject(ModelEditor.TAB_FORM, selected);
-					}
+		viewer.addOpenListener(event -> {
+			if (event.getSelection() instanceof IStructuredSelection) {
+				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+				if (selection.getFirstElement() instanceof EObject && getEditor() != null) {
+					EObject selected = (EObject) selection.getFirstElement();
+					getEditor().gotoEObject(ModelEditor.TAB_FORM, selected);
 				}
-			});
+			}
+		});
 
-			new Label(parent, SWT.NONE);
+		new Label(parent, SWT.NONE);
 
-			final Composite buttonCompBot = new Composite(parent, SWT.NONE);
-			buttonCompBot.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 2, 1));
-			buttonCompBot.setLayout(new FillLayout());
+		final Composite buttonCompBot = new Composite(parent, SWT.NONE);
+		buttonCompBot.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false, 2, 1));
+		buttonCompBot.setLayout(new FillLayout());
 
-			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-			b.setText(org.eclipse.e4.tools.emf.ui.internal.Messages.ModelTooling_Common_Up);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							final Object obj = s.getFirstElement();
-							final int idx = getMaster().getValue().getChildren().indexOf(obj) - 1;
-							if (idx >= 0) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor()
-										.isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
+		b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
+		b.setText(org.eclipse.e4.tools.emf.ui.internal.Messages.ModelTooling_Common_Up);
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_up));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						final Object obj = s.getFirstElement();
+						final int idx = getMaster().getValue().getChildren().indexOf(obj) - 1;
+						if (idx >= 0) {
+							if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(),
+									idx)) {
+								viewer.setSelection(new StructuredSelection(obj));
 							}
-
 						}
+
 					}
 				}
-			});
+			}
+		});
 
-			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-			b.setText(org.eclipse.e4.tools.emf.ui.internal.Messages.ModelTooling_Common_Down);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
-						if (s.size() == 1) {
-							final Object obj = s.getFirstElement();
-							final int idx = getMaster().getValue().getChildren().indexOf(obj) + 1;
-							if (idx < getMaster().getValue().getChildren().size()) {
-								if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor()
-										.isLiveModel(), idx)) {
-									viewer.setSelection(new StructuredSelection(obj));
-								}
+		b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
+		b.setText(org.eclipse.e4.tools.emf.ui.internal.Messages.ModelTooling_Common_Down);
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_arrow_down));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+					if (s.size() == 1) {
+						final Object obj = s.getFirstElement();
+						final int idx = getMaster().getValue().getChildren().indexOf(obj) + 1;
+						if (idx < getMaster().getValue().getChildren().size()) {
+							if (Util.moveElementByIndex(getEditingDomain(), (MUIElement) obj, getEditor().isLiveModel(),
+									idx)) {
+								viewer.setSelection(new StructuredSelection(obj));
 							}
-
 						}
+
 					}
 				}
-			});
+			}
+		});
 
-			b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
-			b.setText(org.eclipse.e4.tools.emf.ui.internal.Messages.ModelTooling_Common_Remove);
-			b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					if (!viewer.getSelection().isEmpty()) {
-						final List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
-
-						final Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(),
-								UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
-						if (cmd.canExecute()) {
-							getEditingDomain().getCommandStack().execute(cmd);
-						}
+		b = new Button(buttonCompBot, SWT.PUSH | SWT.FLAT);
+		b.setText(org.eclipse.e4.tools.emf.ui.internal.Messages.ModelTooling_Common_Remove);
+		b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
+		b.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!viewer.getSelection().isEmpty()) {
+					final List<?> elements = ((IStructuredSelection) viewer.getSelection()).toList();
+
+					final Command cmd = RemoveCommand.create(getEditingDomain(), getMaster().getValue(),
+							UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, elements);
+					if (cmd.canExecute()) {
+						getEditingDomain().getCommandStack().execute(cmd);
 					}
 				}
-			});
-		}
-
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
-
-		Composite propComposite = ControlFactory.createMapProperties(parent, Messages, this,
-				Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES,
-				VERTICAL_LIST_WIDGET_INDENT);
-		propComposite.setLayoutData(GridDataFactory.fillDefaults().grab(true, true).span(3, 1).create());
-
-		Composite variablesComposite = ControlFactory.createStringListWidget(parent, Messages, this,
-				Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES,
-				VERTICAL_LIST_WIDGET_INDENT);
-		variablesComposite.setLayoutData(GridDataFactory.fillDefaults().grab(true, true).span(3, 1).create());
-
-		item = new CTabItem(folder, SWT.NONE);
-		item.setText(Messages.ModelTooling_Common_TabSupplementary);
-
-		parent = createScrollableContainer(folder);
-		item.setControl(parent.getParent());
-
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
-
-		if (project == null) {
-			createUITreeInspection(folder);
-		}
-
-		createContributedEditorTabs(folder, context, getMaster(), MCompositePart.class);
-
-		folder.setSelection(0);
-
-		return folder;
-	}
-
-	private void createUITreeInspection(CTabFolder folder) {
-		final CTabItem item = new CTabItem(folder, SWT.NONE);
-		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		final Composite container = new Composite(folder, SWT.NONE);
-		container.setLayout(new GridLayout());
-		item.setControl(container);
-
-		final UIViewer objectViewer = new UIViewer();
-		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
-				getMaster(), resourcePool, Messages);
-		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-	}
-
-	@Override
-	public IObservableList<?> getChildList(Object element) {
-		return E4Properties.<MPartSashContainerElement>children().observe((MCompositePart) element);
-	}
-
-	@Override
-	public String getDetailLabel(Object element) {
-		return null;
+			}
+		});
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
-	public FeaturePath[] getLabelProperties() {
-		return new FeaturePath[] { FeaturePath.fromList(UiPackageImpl.Literals.GENERIC_TILE__HORIZONTAL),
-				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
+	protected void addChildListEntries(MPart part, IObservableList<Object> list) {
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_CONTROLS, E4Properties.<MPartSashContainerElement>children(),
+				(MElementContainer<MPartSashContainerElement>) part, Messages.PartEditor_Controls));
 	}
 
 	protected void handleAddChild(EClass eClass) {
@@ -510,18 +336,6 @@ protected void handleAddChild(EClass eClass) {
 		addToModel(eObject);
 	}
 
-	private void addToModel(EObject eObject) {
-		setElementId(eObject);
-
-		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
-
-		if (cmd.canExecute()) {
-			getEditingDomain().getCommandStack().execute(cmd);
-			getEditor().setSelection(eObject);
-		}
-	}
-
 	protected void handleImportChild(EClass eClass, String hint) {
 
 		if (eClass == BasicPackageImpl.Literals.PART) {
@@ -536,6 +350,18 @@ protected void handleImportChild(EClass eClass, String hint) {
 		}
 	}
 
+	private void addToModel(EObject eObject) {
+		setElementId(eObject);
+
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(eObject);
+		}
+	}
+
 	@Override
 	public List<Action> getActions(Object element) {
 		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 94c9b98c97..11d7359a16 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -15,73 +15,17 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
-import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PartIconDialogEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.objectdata.ObjectViewer;
-import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.MUILabel;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-public class PartEditor extends AbstractComponentEditor<MPart> {
-
-	private Composite composite;
-	private EMFDataBindingContext context;
-	private Button createRemoveToolBar;
-	private StackLayout stackLayout;
-
-	@Inject
-	@Optional
-	private IProject project;
-
-	@Inject
-	IEclipseContext eclipseContext;
 
-	@Inject
-	public PartEditor() {
-		super();
-	}
+public class PartEditor extends AbstractPartEditor<MPart> {
 
 	@Override
 	public Image getImage(Object element) {
@@ -103,36 +47,7 @@ public String getDescription(Object element) {
 
 	@Override
 	public Composite doGetEditor(Composite parent, Object object) {
-		if (composite == null) {
-			context = new EMFDataBindingContext();
-			if (getEditor().isModelFragment()) {
-				composite = new Composite(parent, SWT.NONE);
-				stackLayout = new StackLayout();
-				composite.setLayout(stackLayout);
-				createForm(composite, context, getMaster(), false);
-				createForm(composite, context, getMaster(), true);
-			} else {
-				composite = createForm(parent, context, getMaster(), false);
-			}
-		}
-
-		if (getEditor().isModelFragment()) {
-			Control topControl;
-			if (Util.isImport((EObject) object)) {
-				topControl = composite.getChildren()[1];
-			} else {
-				topControl = composite.getChildren()[0];
-			}
-
-			if (stackLayout.topControl != topControl) {
-				stackLayout.topControl = topControl;
-				composite.layout(true, true);
-			}
-		}
-
-		if (createRemoveToolBar != null) {
-			createRemoveToolBar.setSelection(((MPart) object).getToolbar() != null);
-		}
+		Composite composite = super.doGetEditor(parent, object);
 
 		getMaster().setValue((MPart) object);
 		enableIdGenerator(UiPackageImpl.Literals.UI_LABEL__LABEL,
@@ -141,223 +56,6 @@ public Composite doGetEditor(Composite parent, Object object) {
 		return composite;
 	}
 
-	protected Composite createForm(Composite parent, EMFDataBindingContext context, IObservableValue<MPart> master,
-			boolean isImport) {
-		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
-
-		CTabItem item = new CTabItem(folder, SWT.BORDER);
-		item.setText(Messages.ModelTooling_Common_TabDefault);
-
-		parent = createScrollableContainer(folder);
-		item.setControl(parent.getParent());
-
-		if (getEditor().isShowXMIId() || getEditor().isLiveModel()) {
-			ControlFactory.createXMIId(parent, this);
-		}
-
-		final IWidgetValueProperty<Text, String> textProp = WidgetProperties.text(SWT.Modify);
-
-		if (isImport) {
-			ControlFactory.createFindImport(parent, Messages, this, context);
-			folder.setSelection(0);
-			return folder;
-		}
-
-		ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp,
-				E4Properties.elementId(getEditingDomain()));
-		ControlFactory.createTextField(parent, Messages.PartEditor_LabelLabel, master, context, textProp,
-				E4Properties.label(getEditingDomain()));
-		ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, master, context,
-				textProp, E4Properties.accessibilityPhrase(getEditingDomain()));
-		ControlFactory.createTextField(parent, Messages.PartEditor_Tooltip, master, context, textProp,
-				E4Properties.tooltip(getEditingDomain()));
-
-		// ------------------------------------------------------------
-		{
-			final Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartEditor_IconURI);
-			l.setLayoutData(new GridData());
-			l.setToolTipText(Messages.PartEditor_IconURI_Tooltip);
-
-			final Text t = new Text(parent, SWT.BORDER);
-			TextPasteHandler.createFor(t);
-			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			context.bindValue(
-					textProp.observeDelayed(200, t),
-					E4Properties.iconUri(getEditingDomain()).observeDetail(master));
-
-			new ImageTooltip(t, Messages, this);
-
-			Button b = ControlFactory.createFindButton(parent, resourcePool);
-			b.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					final PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), eclipseContext, project,
-							getEditingDomain(), getMaster().getValue(), Messages);
-					dialog.open();
-				}
-			});
-		}
-
-
-		ControlFactory.createClassURIField(parent, Messages, this, Messages.PartEditor_ClassURI,
-				ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI,
-				getEditor().getContributionCreator(BasicPackageImpl.Literals.PART), project, context, eclipseContext);
-
-		// ------------------------------------------------------------
-		ControlFactory.createTextField(parent, Messages.PartEditor_ContainerData, master, context, textProp,
-				E4Properties.containerData(getEditingDomain()));
-
-		createSubformElements(parent, context, master);
-
-		{
-			final Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.PartEditor_ToolBar);
-			l.setLayoutData(new GridData());
-
-			createRemoveToolBar = new Button(parent, SWT.CHECK);
-			createRemoveToolBar.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					final MPart window = getMaster().getValue();
-					if (window.getToolbar() == null) {
-						addToolBar();
-					} else {
-						removeToolBar();
-					}
-				}
-			});
-			createRemoveToolBar.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
-		}
-
-		ControlFactory.createCheckBox(parent, Messages.PartEditor_Closeable, Messages.PartEditor_Closeable_Tooltip,
-				getMaster(), context, WidgetProperties.buttonSelection(),
-				E4Properties.partClosable(getEditingDomain()));
-
-		// ------------------------------------------------------------
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
-				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
-		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
-				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
-
-		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.PartEditor_BindingContexts);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState,
-				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties,
-				UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
-
-		item = new CTabItem(folder, SWT.NONE);
-		item.setText(Messages.ModelTooling_Common_TabSupplementary);
-
-		parent = createScrollableContainer(folder);
-		item.setControl(parent.getParent());
-
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables,
-				Messages.ModelTooling_Context_Variables_Tooltip, UiPackageImpl.Literals.CONTEXT__VARIABLES,
-				VERTICAL_LIST_WIDGET_INDENT);
-		ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags,
-				ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
-
-		if (project == null) {
-			createInstanceInspection(folder);
-			createUITreeInspection(folder);
-		}
-
-		createContributedEditorTabs(folder, context, getMaster(), MPart.class);
-
-		folder.setSelection(0);
-
-		return folder;
-	}
-
-	private void createInstanceInspection(CTabFolder folder) {
-		final CTabItem item = new CTabItem(folder, SWT.NONE);
-		item.setText(Messages.ModelTooling_Common_RuntimeContributionInstance);
-		final Composite container = new Composite(folder, SWT.NONE);
-		container.setLayout(new GridLayout());
-		item.setControl(container);
-
-		final ObjectViewer objectViewer = new ObjectViewer();
-		final TreeViewer viewer = objectViewer.createViewer(container,
-				ApplicationPackageImpl.Literals.CONTRIBUTION__OBJECT, getMaster(), resourcePool, Messages);
-		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-	}
-
-	private void createUITreeInspection(CTabFolder folder) {
-		final CTabItem item = new CTabItem(folder, SWT.NONE);
-		item.setText(Messages.ModelTooling_Common_RuntimeWidgetTree);
-		final Composite container = new Composite(folder, SWT.NONE);
-		container.setLayout(new GridLayout());
-		item.setControl(container);
-
-		final UIViewer objectViewer = new UIViewer();
-		final TreeViewer viewer = objectViewer.createViewer(container, UiPackageImpl.Literals.UI_ELEMENT__WIDGET,
-				getMaster(), resourcePool, Messages);
-		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-	}
-
-	private void addToolBar() {
-		final MToolBar menu = MMenuFactory.INSTANCE.createToolBar();
-		setElementId(menu);
-
-		final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(),
-				BasicPackageImpl.Literals.PART__TOOLBAR, menu);
-		if (cmd.canExecute()) {
-			getEditingDomain().getCommandStack().execute(cmd);
-		}
-	}
-
-	private void removeToolBar() {
-		final Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(),
-				BasicPackageImpl.Literals.PART__TOOLBAR, null);
-		if (cmd.canExecute()) {
-			getEditingDomain().getCommandStack().execute(cmd);
-		}
-	}
-
-	protected void createSubformElements(Composite parent, EMFDataBindingContext context,
-			IObservableValue<MPart> master) {
-
-	}
-
-	@Override
-	public IObservableList<?> getChildList(final Object element) {
-		final WritableList<Object> list = new WritableList<>();
-		final MPart window = (MPart) element;
-
-		if (getEditor().isModelFragment() && Util.isImport((EObject) element)) {
-			return list;
-		}
-
-		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_PART_MENU, E4Properties.partMenus(), window,
-				Messages.PartEditor_Menus));
-		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_HANDLER, E4Properties.handlers(), window,
-				Messages.PartEditor_Handlers));
-
-		if (window.getToolbar() != null) {
-			list.add(0, window.getToolbar());
-		}
-
-		E4Properties.partToolbar().observe(window).addValueChangeListener(event -> {
-			if (event.diff.getOldValue() != null) {
-				list.remove(event.diff.getOldValue());
-				if (getMaster().getValue() == element && !createRemoveToolBar.isDisposed()) {
-					createRemoveToolBar.setSelection(false);
-				}
-
-			}
-
-			if (event.diff.getNewValue() != null) {
-				list.add(0, event.diff.getNewValue());
-				if (getMaster().getValue() == element && !createRemoveToolBar.isDisposed()) {
-					createRemoveToolBar.setSelection(true);
-				}
-			}
-		});
-
-		return list;
-	}
-
 	@Override
 	public String getDetailLabel(Object element) {
 		return getLocalizedLabel((MUILabel) element);
@@ -369,4 +67,4 @@ public FeaturePath[] getLabelProperties() {
 				FeaturePath.fromList(UiPackageImpl.Literals.UI_LABEL__ICON_URI),
 				FeaturePath.fromList(UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED) };
 	}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlsEditor.java
new file mode 100644
index 0000000000..b5253ef81e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlsEditor.java
@@ -0,0 +1,253 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Airbus Defence and Space GmbH and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Benedikt Kuntz <benedikt.kuntz@airbus.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
+import org.eclipse.e4.tools.emf.ui.internal.imp.RegistryUtil;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainerElement;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
+
+public class VControlsEditor extends AbstractComponentEditor<MElementContainer<MPartSashContainerElement>> {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private TableViewer viewer;
+	private final List<Action> actions = new ArrayList<>();
+	private final List<Action> actionsImport = new ArrayList<>();
+
+	@Inject
+	private Shell shell;
+
+	@Inject
+	public VControlsEditor() {
+		super();
+	}
+
+	@PostConstruct
+	void init() {
+		actions.add(new Action(Messages.CompositePartEditor_AddPartSashContainer,
+				createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.PART_SASH_CONTAINER);
+			}
+		});
+		actions.add(new Action(Messages.CompositePartEditor_AddPartStack,
+				createImageDescriptor(ResourceProvider.IMG_PartStack)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.PART_STACK);
+			}
+		});
+		actions.add(new Action(Messages.CompositePartEditor_AddPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
+			@Override
+			public void run() {
+				handleAddChild(BasicPackageImpl.Literals.PART);
+			}
+		});
+
+		actions.add(new Action(Messages.CompositePartEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area)) {
+			@Override
+			public void run() {
+				handleAddChild(AdvancedPackageImpl.Literals.AREA);
+			}
+		});
+		actions.add(new Action(Messages.CompositePartEditor_AddPlaceholder,
+				createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
+			@Override
+			public void run() {
+				handleAddChild(AdvancedPackageImpl.Literals.PLACEHOLDER);
+			}
+		});
+		for (final FeatureClass c : getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK,
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN)) {
+			final EClass ec = c.eClass;
+			actions.add(new Action(c.label, createImageDescriptor(c.iconId)) {
+				@Override
+				public void run() {
+					handleAddChild(ec);
+				}
+			});
+		}
+
+		// --- Import Actions ---
+		actionsImport.add(new Action("Views", createImageDescriptor(ResourceProvider.IMG_Part)) { //$NON-NLS-1$
+			@Override
+			public void run() {
+				handleImportChild(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_VIEW);
+			}
+		});
+		actionsImport.add(new Action("Editors", createImageDescriptor(ResourceProvider.IMG_Part)) { //$NON-NLS-1$
+			@Override
+			public void run() {
+				handleImportChild(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_EDITOR);
+			}
+		});
+
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.VControlsEditor_TreeLabel;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return Messages.VControlsEditor_TreeLabelDescription;
+	}
+
+	@Override
+	public Composite doGetEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent, context, getMaster());
+		}
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<MElementContainer<MPartSashContainerElement>, ?> o = (VirtualEntry<MElementContainer<MPartSashContainerElement>, ?>) object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<MElementContainer<MPartSashContainerElement>> master) {
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		final AbstractPickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_GROUP),
+				this, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) {
+			@Override
+			protected void addPressed() {
+				final EClass eClass = (EClass) getSelection().getFirstElement();
+				handleAddChild(eClass);
+			}
+
+			@Override
+			protected List<?> getContainerChildren(Object container) {
+				return ((MApplication) container).getChildren();
+			}
+		};
+		pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+		viewer = pickList.getList();
+
+		pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
+		pickList.setInput(
+				new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK,
+						BasicPackageImpl.Literals.PART, AdvancedPackageImpl.Literals.AREA,
+						AdvancedPackageImpl.Literals.PLACEHOLDER });
+		pickList.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
+
+		folder.setSelection(0);
+
+		return folder;
+	}
+
+	@Override
+	public IObservableList<?> getChildList(Object element) {
+		return null;
+	}
+
+	protected void handleAddChild(EClass eClass) {
+		final EObject eObject = EcoreUtil.create(eClass);
+		addToModel(eObject);
+	}
+
+	private void addToModel(EObject eObject) {
+		setElementId(eObject);
+
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+				UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN, eObject);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(eObject);
+		}
+	}
+
+	protected void handleImportChild(EClass eClass, String hint) {
+
+		if (eClass == BasicPackageImpl.Literals.PART) {
+			final ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, hint, resourcePool);
+			final WizardDialog wizardDialog = new WizardDialog(shell, wizard);
+			if (wizardDialog.open() == Window.OK) {
+				final MPart[] parts = (MPart[]) wizard.getElements(MPart.class);
+				for (final MPart part : parts) {
+					addToModel((EObject) part);
+				}
+			}
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
+
+	@Override
+	public List<Action> getActionsImport(Object element) {
+		final ArrayList<Action> l = new ArrayList<>(super.getActionsImport(element));
+		l.addAll(actionsImport);
+		return l;
+	}
+}
\ No newline at end of file

From eb2924be41796d231a6df33821917bd6156e340a Mon Sep 17 00:00:00 2001
From: Jens Lidestrom <jens@lidestrom.se>
Date: Sun, 3 Nov 2019 11:31:37 +0100
Subject: [PATCH 1123/1286] Fix ModelEditor pref color loading

ModelEditor did not load color preferences properly.

Change-Id: Iea4f3d1fde0c5889ff5b438e7dd20ef4dd28fbbc
Signed-off-by: Jens Lidestrom <jens@lidestrom.se>
---
 .../emf/ui/internal/common/ModelEditor.java   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 053c33d7ff..2a7a2d73f9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1312,12 +1312,12 @@ public void tabListShow(Boolean show) {
 	}
 
 	@Inject
-	public void setNotVisibleColor(@Preference(ModelEditorPreferences.NOT_VISIBLE_COLOR) String color) {
+	public void setNotVisibleColor(@Preference(ModelEditorPreferences.NOT_VISIBLE_COLOR) String prefColorText) {
 		final RGB current = JFaceResources.getColorRegistry().getRGB(ComponentLabelProvider.NOT_VISIBLE_KEY);
+		RGB prefColor = StringConverter.asRGB(prefColorText, new RGB(200, 200, 200));
 
-		if (current == null || !current.equals(color)) {
-			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_VISIBLE_KEY,
-					StringConverter.asRGB(color, new RGB(200, 200, 200)));
+		if (current == null || !current.equals(prefColor)) {
+			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_VISIBLE_KEY, prefColor);
 		}
 
 		if (viewer != null) {
@@ -1327,12 +1327,12 @@ public void setNotVisibleColor(@Preference(ModelEditorPreferences.NOT_VISIBLE_CO
 	}
 
 	@Inject
-	public void setNotRenderedColor(@Preference(ModelEditorPreferences.NOT_RENDERED_COLOR) String color) {
+	public void setNotRenderedColor(@Preference(ModelEditorPreferences.NOT_RENDERED_COLOR) String prefColorText) {
+		RGB prefColor = StringConverter.asRGB(prefColorText, new RGB(200, 200, 200));
 		final RGB current = JFaceResources.getColorRegistry().getRGB(ComponentLabelProvider.NOT_RENDERED_KEY);
 
-		if (current == null || !current.equals(color)) {
-			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_RENDERED_KEY,
-					StringConverter.asRGB(color, new RGB(200, 200, 200)));
+		if (current == null || !current.equals(prefColor)) {
+			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_RENDERED_KEY, prefColor);
 		}
 
 		if (viewer != null) {
@@ -1343,13 +1343,13 @@ public void setNotRenderedColor(@Preference(ModelEditorPreferences.NOT_RENDERED_
 
 	@Inject
 	public void setNotVisibleRenderedColor(
-			@Preference(ModelEditorPreferences.NOT_VISIBLE_AND_RENDERED_COLOR) String color) {
+			@Preference(ModelEditorPreferences.NOT_VISIBLE_AND_RENDERED_COLOR) String prefColorText) {
+		RGB prefColor = StringConverter.asRGB(prefColorText, new RGB(200, 200, 200));
 		final RGB current = JFaceResources.getColorRegistry()
 				.getRGB(ComponentLabelProvider.NOT_VISIBLE_AND_RENDERED_KEY);
 
-		if (current == null || !current.equals(color)) {
-			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_VISIBLE_AND_RENDERED_KEY,
-					StringConverter.asRGB(color, new RGB(200, 200, 200)));
+		if (current == null || !current.equals(prefColor)) {
+			JFaceResources.getColorRegistry().put(ComponentLabelProvider.NOT_VISIBLE_AND_RENDERED_KEY, prefColor);
 		}
 
 		if (viewer != null) {

From 8db623accc2643db59b0f4768e6dd7d1c20c7266 Mon Sep 17 00:00:00 2001
From: Jens Lidestrom <jens@lidestrom.se>
Date: Sun, 3 Nov 2019 11:35:54 +0100
Subject: [PATCH 1124/1286] Cleanup in ModelEditor

Remove warnings etc.

Change-Id: Ib8a627b0659006a82a80581dfd5e8ae83836fb98
Signed-off-by: Jens Lidestrom <jens@lidestrom.se>
---
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 2a7a2d73f9..65dd624eb2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1970,7 +1970,7 @@ public boolean performSingleDrop(Object data) {
 		 * @param destFeature the target feature in the model where data must be dropped
 		 * @param parent      the destination parent
 		 * @param index       the index in the parent list
-		 * @see bug #429684
+		 * @see bug 429684
 		 * @return the compound command
 		 */
 		private Command createRemoveAddCommand(Object data, EStructuralFeature destFeature, EObject parent, int index) {
@@ -2119,7 +2119,8 @@ public void gotoEObject(int targetHint, EObject object) {
 
 	// This will ensure the provider has created the tree node (so we can reveal
 	// it).
-	private Object getFirstMatchingItem(EObject target, ObservableListTreeContentProvider<?> provider, Object[] items) {
+	private static Object getFirstMatchingItem(EObject target, ObservableListTreeContentProvider<?> provider,
+			Object[] items) {
 		for (int i = 0; i < items.length; i++) {
 			if (items[i] == target) {
 				return items[i];

From a8276adebade6db1928b99f6fdd14622307ee38e Mon Sep 17 00:00:00 2001
From: Jens Lidestrom <jens@lidestrom.se>
Date: Sun, 3 Nov 2019 11:37:17 +0100
Subject: [PATCH 1125/1286] Use Logger in ModelEditor

Instead of logging with System.err.

Change-Id: I965d88ce0fd891f663892677ecb79e3446ba3610
Signed-off-by: Jens Lidestrom <jens@lidestrom.se>
---
 .../tools/emf/ui/internal/common/ModelEditor.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 65dd624eb2..5e97863ace 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -56,6 +56,7 @@
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.Preference;
 import org.eclipse.e4.core.services.contributions.IContributionFactory;
+import org.eclipse.e4.core.services.log.Logger;
 import org.eclipse.e4.core.services.nls.Translation;
 import org.eclipse.e4.core.services.translation.TranslationService;
 import org.eclipse.e4.tools.emf.ui.common.AbstractElementEditorContribution;
@@ -350,6 +351,9 @@ public class ModelEditor implements IGotoObject {
 	@Optional
 	MPart currentPart;
 
+	@Inject
+	private Logger logger;
+
 	private final ObservablesManager obsManager;
 
 	private final IResourcePool resourcePool;
@@ -813,9 +817,8 @@ public void run() {
 								}
 
 								support.openEditor(viewer.getControl().getShell(), s.getFirstElement(), ctx);
-							} catch (final CoreException e) {
-								// TODO Auto-generated catch block
-								e.printStackTrace();
+							} catch (CoreException e) {
+								logger.warn(e);
 							}
 						}
 					});
@@ -986,8 +989,7 @@ private void loadContributionCreators() {
 			try {
 				contributionCreator.add((IContributionClassCreator) el.createExecutableExtension("class")); //$NON-NLS-1$
 			} catch (final CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+				logger.warn(e);
 			}
 		}
 	}
@@ -1013,8 +1015,7 @@ private void loadEditorFeatures() {
 			try {
 				editorFeatures.add((IEditorFeature) el.createExecutableExtension("class")); //$NON-NLS-1$
 			} catch (final CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+				logger.warn(e);
 			}
 		}
 	}

From be8b979119919a836c2db02153b57829b02ebb1e Mon Sep 17 00:00:00 2001
From: Benedikt Kuntz <benedikt.kuntz@airbus.com>
Date: Sat, 2 Nov 2019 16:50:30 +0100
Subject: [PATCH 1126/1286] =?UTF-8?q?Bug=20551749=20-=20[Tools]=20Applicat?=
 =?UTF-8?q?ion=20model=20editor=20doesn=E2=80=99t=20allow=20to=20create=20?=
 =?UTF-8?q?CompositePart=20inside=20snippets=20in=20Application.xmi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add Action for adding CompositePart in context menu and overview

Change-Id: I867295d554f5e5bc94085cd380c2e4f58d4cc3ac
Signed-off-by: Benedikt Kuntz <benedikt.kuntz@airbus.com>
---
 .../eclipse/e4/tools/emf/ui/internal/Messages.java   |  1 +
 .../e4/tools/emf/ui/internal/Messages.properties     |  1 +
 .../common/component/virtual/VSnippetsEditor.java    | 12 ++++++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 5190449348..33ff515701 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -557,6 +557,7 @@ public class Messages {
 	public String VWindowControlEditor_AddPartSashContainer;
 	public String VWindowControlEditor_AddPartStack;
 	public String VWindowControlEditor_AddPart;
+	public String VWindowControlEditor_AddCompositePart;
 	public String VWindowControlEditor_AddArea;
 
 	public String VWindowEditor_TreeLabel;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index d0c865008b..6b6f14505e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -532,6 +532,7 @@ VWindowControlEditor_AddPerspectiveStack=Perspective Stack
 VWindowControlEditor_AddPartSashContainer=Part Sash Container
 VWindowControlEditor_AddPartStack=Part Stack
 VWindowControlEditor_AddPart=Part
+VWindowControlEditor_AddCompositePart=Composite Part
 VWindowControlEditor_AddArea=Area
 
 VWindowEditor_TreeLabel=Windows
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index 32d68aa886..eb5b43b3ab 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -46,8 +46,8 @@ public class VSnippetsEditor extends AbstractComponentEditor<MSnippetContainer>
 	/** Define the classes available to create snippets */
 	public static final EClass[] SNIPPET_CHILDREN = new EClass[] { AdvancedPackageImpl.Literals.AREA, BasicPackageImpl.Literals.PART,
 			BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK,
-			AdvancedPackageImpl.Literals.PERSPECTIVE, AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
-			MenuPackageImpl.Literals.TRIM_CONTRIBUTION,
+			BasicPackageImpl.Literals.COMPOSITE_PART, AdvancedPackageImpl.Literals.PERSPECTIVE,
+			AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, MenuPackageImpl.Literals.TRIM_CONTRIBUTION,
 			BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW,
 			BasicPackageImpl.Literals.TRIM_BAR };
 
@@ -82,6 +82,14 @@ public void run() {
 			}
 		});
 
+		actions.add(new Action(Messages.VWindowControlEditor_AddCompositePart,
+				createImageDescriptor(ResourceProvider.IMG_PartSashContainer)) {
+			@Override
+			public void run() {
+				handleAdd(BasicPackageImpl.Literals.COMPOSITE_PART);
+			}
+		});
+
 		actions.add(new Action(Messages.VWindowControlEditor_AddPartSashContainer,
 				createImageDescriptor(ResourceProvider.IMG_PartSashContainer_vertical)) {
 			@Override

From 60f88c2978dddab2e05674ed32d0dd524a568a10 Mon Sep 17 00:00:00 2001
From: Mickael Istria <mistria@redhat.com>
Date: Tue, 22 Oct 2019 11:13:41 +0200
Subject: [PATCH 1127/1286] Declare E4TemplateCompletionProposalComputer as
 usable in non-UI Thread

Change-Id: I52d4ec04877b58924f5ca22cf5665140f7df7456
Signed-off-by: Mickael Istria <mistria@redhat.com>
---
 bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml b/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
index 30b8ff7fca..f0f7a13679 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
@@ -14,8 +14,8 @@
       <javaCompletionProposalComputer
             activate="true"
             categoryId="org.eclipse.e4.tools.jdt.templates.e4ProposalCategory"
-            class="org.eclipse.e4.internal.tools.jdt.templates.E4TemplateCompletionProposalComputer">
-      </javaCompletionProposalComputer>
+            class="org.eclipse.e4.internal.tools.jdt.templates.E4TemplateCompletionProposalComputer"
+            requiresUIThread="false"/>
     </extension>
    <extension
          point="org.eclipse.ui.editors.templates">

From e15986daa62a0399f6668386d23945b8bf43bc6e Mon Sep 17 00:00:00 2001
From: Niraj Modi <niraj.modi@in.ibm.com>
Date: Fri, 6 Dec 2019 18:53:38 +0530
Subject: [PATCH 1128/1286] Bug 553742 - POM and product version change for
 4.15 release

Change-Id: I5f6e9d4577761c981aa02d9078344eff9248c781
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
---
 bundles/org.eclipse.e4.tools.compat/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml     | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml          | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                   | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 4 ++--
 tests/org.eclipse.e4.tools.test/pom.xml                | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 82ade80ded..34543be91d 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.14.0-SNAPSHOT</version>
+    <version>4.15.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index ffbccee533..96a597263a 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.14.0-SNAPSHOT</version>
+    <version>4.15.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 5049fc2a2e..e473ef4518 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.14.0-SNAPSHOT</version>
+    <version>4.15.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 2b9e0cae0c..34ac6c12ab 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.14.0-SNAPSHOT</version>
+    <version>4.15.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 381018d8dd..69a591f1b2 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.14.0-SNAPSHOT</version>
+    <version>4.15.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 40b1d50ff8..37ffc2eeaf 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.14.0-SNAPSHOT</version>
+    <version>4.15.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index b7c64f9bd7..96d73c4abf 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.14.0.qualifier"
+      version="4.15.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 5f051e6816..054410dd32 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.14.0-SNAPSHOT</version>
+    <version>4.15.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>4.14.0-SNAPSHOT</version>
+  <version>4.15.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index 44455ddecf..43b75772b6 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.14.0-SNAPSHOT</version>
+		<version>4.15.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From 4910b0101f1cd036792f1cbfc60a4a40c67424ad Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Sun, 15 Dec 2019 23:38:47 +0100
Subject: [PATCH 1129/1286] 4.15 update for org.eclipse.e4.tools.emf.ui

Required for https://git.eclipse.org/r/c/153973/

Change-Id: I09f686d733aa94bf695a22ce9b23e7b50e2be9fc
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 0f1c7d1407..d79f44e4ff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.6.600.qualifier
+Bundle-Version: 4.6.700.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index e473ef4518..98162f7a24 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.6.600-SNAPSHOT</version>
+  <version>4.6.700-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>

From 9b17fafbc295aaf200711448543971b961ee0b0c Mon Sep 17 00:00:00 2001
From: Benedikt Kuntz <benedikt.kuntz@airbus.com>
Date: Fri, 6 Dec 2019 08:42:22 +0100
Subject: [PATCH 1130/1286] Bug 553663 - Icon selection dialog of the e4
 application model editor resizes badly

Set a minimum shell size in SaveDialogBoundsSettingsDialog and enable
dialog resizing. Set a separate minimum size for
FilteredContributionDialog(s).
Let FindParentReferenceElementDialog inherit from
SaveDialogBoundsSettingsDialog to make look and feel of the e4 tools
dialogs consistent

Change-Id: Ic38eafe46f8db6e2b8e349468478470a4cad57cd
Signed-off-by: Benedikt Kuntz <benedikt.kuntz@airbus.com>
---
 .../dialogs/AbstractCommandSelectionDialog.java  |  5 -----
 .../AbstractIconDialogWithHardcodedScope.java    |  5 -----
 .../component/dialogs/AbstractIdDialog.java      |  5 -----
 .../dialogs/FeatureSelectionDialog.java          |  5 -----
 .../dialogs/FilteredContributionDialog.java      | 14 +++++++++-----
 .../FindParentReferenceElementDialog.java        |  8 +-------
 .../dialogs/SaveDialogBoundsSettingsDialog.java  | 16 ++++++++++++++--
 7 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index 2efc12db06..f7e17c9c42 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -128,11 +128,6 @@ protected void okPressed() {
 		}
 	}
 
-	@Override
-	protected boolean isResizable() {
-		return true;
-	}
-
 	protected abstract Command createStoreCommand(EditingDomain editingDomain, MCommand command);
 
 	private static class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
index 532d740138..c38e5e0160 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
@@ -227,11 +227,6 @@ private void clearImages() {
 		icons.clear();
 	}
 
-	@Override
-	protected boolean isResizable() {
-		return true;
-	}
-
 	@Override
 	protected void okPressed() {
 		value = null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
index 4e2fc39847..9b768d0a35 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
@@ -83,11 +83,6 @@ public AbstractIdDialog(Shell parentShell, IModelResource resource, Contribution
 
 	protected abstract String getListItemInformation(ElementClass listItem);
 
-	@Override
-	protected boolean isResizable() {
-		return true;
-	}
-
 	protected IBaseLabelProvider getLabelProvider() {
 		return new DelegatingStyledCellLabelProvider(new DefaultStyledLabelProvider());
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index 61f16c273f..04d6f8c9f8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -75,11 +75,6 @@ public FeatureSelectionDialog(Shell parentShell, EditingDomain editingDomain, MS
 		this.userSelectedContainer = userSelectedContainer;
 	}
 
-	@Override
-	protected boolean isResizable() {
-		return true;
-	}
-
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		getShell().setText(Messages.FeatureSelectionDialog_ShellTitle);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index 665b349002..d884ba6648 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -100,6 +100,9 @@
 public abstract class FilteredContributionDialog extends SaveDialogBoundsSettingsDialog {
 
 	private static final int MAX_RESULTS = 500;
+	private static final int DIALOG_MINIMUM_WIDTH = 600;
+	private static final int DIALOG_MINIMUM_HEIGHT = 350;
+
 	private Image contributionTypeImage;
 	private TableViewer viewer;
 	private static final String PREF_SEARCHSCOPE = "searchScope"; //$NON-NLS-1$
@@ -247,6 +250,12 @@ public void setStatus(final String message) {
 		getShell().getDisplay().asyncExec(() -> lblStatus.setText(message));
 	}
 
+	@Override
+	protected void configureShell(Shell newShell) {
+		super.configureShell(newShell);
+		newShell.setMinimumSize(DIALOG_MINIMUM_WIDTH, DIALOG_MINIMUM_HEIGHT);
+	}
+
 	@Override
 	protected void createButtonsForButtonBar(Composite parent) {
 
@@ -620,11 +629,6 @@ protected void removeFilters() {
 		updateUiState();
 	}
 
-	@Override
-	protected boolean isResizable() {
-		return true;
-	}
-
 	public List<String> getFilterPackages() {
 		return filterPackages;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index ab8aeb9fc6..78a8dfc1b9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -38,7 +38,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.fieldassist.AutoCompleteField;
 import org.eclipse.jface.fieldassist.ComboContentAdapter;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -74,7 +73,7 @@
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
 
-public class FindParentReferenceElementDialog extends TitleAreaDialog {
+public class FindParentReferenceElementDialog extends SaveDialogBoundsSettingsDialog {
 
 	private static final String XPATH_URI = "xpath:/"; //$NON-NLS-1$
 
@@ -112,11 +111,6 @@ private ClassContributionCollector getCollector() {
 		return null;
 	}
 
-	@Override
-	protected boolean isResizable() {
-		return true;
-	}
-
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		final Composite comp = (Composite) super.createDialogArea(parent);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
index e48e845019..39e29cbcdc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
@@ -14,9 +14,8 @@
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
-import org.eclipse.e4.tools.emf.ui.common.Plugin;
-
 import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.e4.tools.emf.ui.common.Plugin;
 import org.eclipse.jface.dialogs.DialogSettings;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
@@ -30,6 +29,8 @@ public abstract class SaveDialogBoundsSettingsDialog extends TitleAreaDialog {
 	private static final String DIALOG_ORIGIN_Y = "DIALOG_Y_ORIGIN"; //$NON-NLS-1$
 	private static final String DIALOG_WIDTH = "DIALOG_WIDTH"; //$NON-NLS-1$
 	private static final String DIALOG_HEIGHT = "DIALOG_HEIGHT"; //$NON-NLS-1$
+	private static final int DIALOG_MINIMUM_HEIGHT = 300;
+	private static final int DIALOG_MINIMUM_WIDTH = 400;
 
 	private IDialogSettings dialogSettings = new DialogSettings(Plugin.ID);
 
@@ -56,6 +57,17 @@ private void saveDialogSettings() {
 		}
 	}
 
+	@Override
+	protected void configureShell(Shell newShell) {
+		super.configureShell(newShell);
+		newShell.setMinimumSize(DIALOG_MINIMUM_WIDTH, DIALOG_MINIMUM_HEIGHT);
+	}
+
+	@Override
+	protected boolean isResizable() {
+		return true;
+	}
+
 	@Override
 	public boolean close() {
 		boolean returnValue = super.close();

From 7ff244b9176e0160d0595a0acfddde1efeedf2e9 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 17 Dec 2019 18:52:39 +0100
Subject: [PATCH 1131/1286] Bug 558403 - Use lambda as label provider in
 FindParentReferenceElementDialog

Change-Id: Ie18790fcbae74dbe0cdea43612756c003ea4872a
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../dialogs/FindParentReferenceElementDialog.java         | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index 78a8dfc1b9..a261b17461 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -138,12 +138,8 @@ protected Control createDialogArea(Composite parent) {
 		final Combo combo = new Combo(parentForCombo, SWT.NONE);
 		eClassViewer = new ComboViewer(combo);
 		combo.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-		eClassViewer.setLabelProvider(new LabelProvider() {
-			@Override
-			public String getText(Object element) {
-				return ((EClass) element).getName();
-			}
-		});
+		eClassViewer.setLabelProvider(LabelProvider.createTextProvider(element -> ((EClass) element).getName()));
+
 		eClassViewer.setContentProvider(new ArrayContentProvider());
 		final List<EClass> eClassList = getExtendableClasses();
 		eClassViewer.setComparator(new ViewerComparator() {

From 6f25df26f124d55f24791e16de411772172b13dd Mon Sep 17 00:00:00 2001
From: Jens Lidestrom <jens@lidestrom.se>
Date: Wed, 25 Dec 2019 16:49:20 +0100
Subject: [PATCH 1132/1286] Warning cleanup in org.eclipse.e4.tools.emf.ui

* Mostly non-localised strings (some of them should be localised)
* Resource warning (now ignored)

API and illegal access problems are not touched.

Change-Id: Ic6f95a15d5f227568b7f1ec7633e5773eb2df0fc
Signed-off-by: Jens Lidestrom <jens@lidestrom.se>
---
 .../tools/emf/ui/common/IEditorFeature.java   |  2 +-
 .../eclipse/e4/tools/emf/ui/common/Util.java  |  4 +--
 .../component/AbstractComponentEditor.java    | 26 +++++++++------
 .../common/component/StringModelFragment.java | 17 +++++-----
 .../common/component/ToolBarEditor.java       |  5 +--
 .../UnsettableUpdateValueStrategy.java        | 33 +++++++++++--------
 .../common/component/WindowEditor.java        |  2 +-
 .../dialogs/ContributionDataFile.java         |  3 +-
 .../common/properties/ExportIdsHandler.java   |  2 +-
 .../ProjectOSGiTranslationProvider.java       |  1 +
 .../dialogs/NonReferencedActionPage.java      |  3 +-
 .../dialogs/NonReferencedResourceDialog.java  |  1 +
 12 files changed, 59 insertions(+), 40 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
index f018aba267..db805238ca 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
@@ -42,7 +42,7 @@ public FeatureClass(String label, String iconId, EClass eClass) {
 
 		@Override
 		public String toString() {
-			return "FeatureClass : " + label;
+			return "FeatureClass : " + label; //$NON-NLS-1$
 		}
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index d6e6151707..aee76a9563 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -327,7 +327,7 @@ private void checkDeltaContainsE4xmi(IResourceDelta delta) {
 						IResource r = rd.getResource();
 						if (r instanceof IFile)
 						{
-							if ("e4xmi".equals(((IFile) r).getFileExtension())) {
+							if ("e4xmi".equals(((IFile) r).getFileExtension())) { //$NON-NLS-1$
 								modelResourceSet = null;
 								break;
 							}
@@ -428,7 +428,7 @@ public static boolean canBeExtendedInAFragment(EClass c) {
 	 */
 	public static boolean referenceIsModelFragmentCompliant(EReference r) {
 		String t = r.getEReferenceType().getName();
-		return (r.isContainment() && !t.equals("StringToStringMap") && !t.equals("StringToObjectMap"));
+		return (r.isContainment() && !t.equals("StringToStringMap") && !t.equals("StringToObjectMap")); //$NON-NLS-1$ //$NON-NLS-2$
 
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index f9bd017265..b216293ed2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -257,7 +257,22 @@ public Image getImage(Object element, String key) {
 	 * @return
 	 */
 	private ImageDescriptor getImageDescriptorFromUri(String uri) {
+		ImageDescriptor result = null;
+
+		URL url = findPlatformImage(uri);
+
+		if (url != null) {
+			ImageDescriptor imageDesc = ImageDescriptor.createFromURL(url);
+			Image scaled = Util.scaleImage(imageDesc.createImage(), MAX_IMG_SIZE);
+			createdImages.add(scaled);
+			result = ImageDescriptor.createFromImage(scaled);
+		}
+
+		return result;
+	}
 
+	@SuppressWarnings("resource")
+	private static URL findPlatformImage(String uri) {
 		// SEVERAL CASES are possible here :
 		// * uri = platform:/plugin/myplugin/icons/image.gif
 		// * uri = platform:/resource/myplugin/icons/image.gif
@@ -270,7 +285,6 @@ private ImageDescriptor getImageDescriptorFromUri(String uri) {
 		// case, we must rather use platform:/resource/.
 		// Used ideas from the ImageTooltip code around line 70 to fix this
 
-		ImageDescriptor result = null;
 		InputStream stream = null;
 		URL url = null;
 
@@ -312,15 +326,7 @@ private ImageDescriptor getImageDescriptorFromUri(String uri) {
 			} catch (final IOException ex) {
 			}
 		}
-
-		if (url != null) {
-			ImageDescriptor imageDesc = ImageDescriptor.createFromURL(url);
-			Image scaled = Util.scaleImage(imageDesc.createImage(), MAX_IMG_SIZE);
-			createdImages.add(scaled);
-			result = ImageDescriptor.createFromImage(scaled);
-		}
-
-		return result;
+		return url;
 	}
 
 	public Image getImage(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 6b44c88b3d..b5d33b7eed 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -229,7 +229,7 @@ public static EClass findContainerType(MStringModelFragment modelFragment) {
 		}
 
 		// known ID for application are directly filtered.
-		if ("xpath:/".equals(parentElementId) || "org.eclipse.e4.legacy.ide.application".equals(parentElementId)) {
+		if ("xpath:/".equals(parentElementId) || "org.eclipse.e4.legacy.ide.application".equals(parentElementId)) { //$NON-NLS-1$//$NON-NLS-2$
 			return ApplicationPackageImpl.eINSTANCE.getApplication();
 		}
 
@@ -237,7 +237,7 @@ public static EClass findContainerType(MStringModelFragment modelFragment) {
 		// set... this resource set is cached by Util...
 		ResourceSet resourceSet = Util.getModelElementResources();
 
-		String xpath = parentElementId.startsWith("xpath:") ? parentElementId.substring(6) : null;
+		String xpath = parentElementId.startsWith("xpath:") ? parentElementId.substring(6) : null; //$NON-NLS-1$
 
 		for (final Resource res : resourceSet.getResources()) {
 			final TreeIterator<EObject> it = EcoreUtil.getAllContents(res, true);
@@ -382,8 +382,8 @@ StringModelFragment.this, getMaster().getValue(), Messages,
 
 			KeyStroke keyStroke;
 			try {
-				char[] autoactivationChar = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.".toCharArray();
-				keyStroke = KeyStroke.getInstance("Ctrl+Space");
+				char[] autoactivationChar = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.".toCharArray(); //$NON-NLS-1$
+				keyStroke = KeyStroke.getInstance("Ctrl+Space"); //$NON-NLS-1$
 				ContentProposalAdapter adapter = new ContentProposalAdapter(featureText, new TextContentAdapter(),
 						new StringModelFragmentProposalProvider(this, featureText), keyStroke, autoactivationChar);
 				adapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE);
@@ -479,12 +479,12 @@ public IContentProposal[] getProposals(String cont, int position) {
 					if (Util.referenceIsModelFragmentCompliant(r) && r.getName().startsWith(text.getText())) {
 						String content = r.getName();
 						sb.setLength(0);
-						sb.append(content).append(": ");
+						sb.append(content).append(": "); //$NON-NLS-1$
 						final EClassifier type = ModelUtils.getTypeArgument(this.fragment.getSelectedContainer(),
 								r.getEGenericType());
 						if (r.isMany()) {
 							// List<Container>
-							sb.append("List<").append(type.getName()).append(">");
+							sb.append("List<").append(type.getName()).append(">"); //$NON-NLS-1$ //$NON-NLS-2$
 						} else {
 							// TypeOfTheClass
 							sb.append(type.getName());
@@ -505,6 +505,7 @@ public IContentProposal[] getProposals(String cont, int position) {
 
 	}
 
+	@Override
 	public void dispose() {
 		if (composite != null) {
 			composite.dispose();
@@ -642,7 +643,7 @@ public static List<FeatureClass> getTargetChildrenClasses(EClass targetClass, St
 			// bound to feature name
 
 			// We must manage especially snippets (see bug 531219) No other solution ...
-			if ("snippets".equals(featurename)) {
+			if ("snippets".equals(featurename)) { //$NON-NLS-1$
 				result = new ArrayList<>();
 				for (EClass c : VSnippetsEditor.SNIPPET_CHILDREN) {
 					result.add(new FeatureClass(c.getName(), c));
@@ -688,7 +689,7 @@ public static List<FeatureClass> getTargetChildrenClasses(EClass targetClass, St
 
 	// Fix bug 531054 -> This code could be removed when Dialog and WizardDialog
 	// will disappear from model !
-	static private final List<String> excludeNames = Arrays.asList("Dialog", "WizardDialog");
+	static private final List<String> excludeNames = Arrays.asList("Dialog", "WizardDialog"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	// Fix bug 531054 -> This code could be removed when DIalog and WizardDialog
 	// will be definitively removed from code (after 2020).
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index c665102a59..51a431f505 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -201,9 +201,10 @@ protected void addPressed() {
 			pickList.setSelection(new StructuredSelection(defaultStruct));
 		}
 
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context,
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
 				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.buttonSelection(),
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+				WidgetProperties.buttonSelection(),
 				E4Properties.visible(getEditingDomain()));
 
 		item = new CTabItem(folder, SWT.NONE);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
index 366a512570..50087a0541 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
@@ -13,32 +13,39 @@
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.databinding.EMFUpdateValueStrategy;
-import org.eclipse.emf.databinding.internal.EMFValueProperty;
+import org.eclipse.emf.databinding.IEMFValueProperty;
+import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EFactory;
 import org.eclipse.emf.edit.command.SetCommand;
 
 /**
- * An updater to deal with unsettable primitive attributes on EMF objects. EMF's {@link EMFEditValueProperty}/
- * {@link EMFValueProperty} does an eGet to
+ * An updater to deal with unsettable primitive attributes on EMF objects. EMF's
+ * {@link IEMFEditValueProperty}/ {@link IEMFValueProperty} does an eGet to
  * retrieve the attribute value, with no regard as to whether the attribute is
  * unset. If the attribute is unset, then eGet() will return the default value.
  *
  * This implementation makes several assumptions:
  * <ul>
- * <li>Assumes that these unsettable attributes have a nonsensical default value that can be used to detect an eGet of
- * an unset attribute.</li>
- * <li>Assumes that we are using EMFEditObservables so that changes are described using {@link SetCommand}, such that we
- * can provide {@link SetCommand#UNSET_VALUE} to remove a value.</li>
+ * <li>Assumes that these unsettable attributes have a nonsensical default value
+ * that can be used to detect an eGet of an unset attribute.</li>
+ * <li>Assumes that we are using EMFEditObservables so that changes are
+ * described using {@link SetCommand}, such that we can provide
+ * {@link SetCommand#UNSET_VALUE} to remove a value.</li>
  * </ul>
  * See the following discussions for background details:
  * <ul>
- * <li><a href="http://www.eclipse.org/forums/index.php?t=msg&th=165026/">Dynamic eGet for unsettable attributes</a></li>
- * <li><a href="http://www.eclipsezone.com/eclipse/forums/t114431.html?start=15"> Creating a ComboViewer for an
- * EReference</a> particularly the later postings from Tom Schindl on handling null values</li>
- * <li><a href="http://www.eclipse.org/forums/index.php?t=msg&th=174967/"> ObservableMapCellLabelProvider doesn't work
- * well with unsettable features</a></li>
+ * <li><a href=
+ * "http://www.eclipse.org/forums/index.php?t=msg&th=165026/">Dynamic eGet for
+ * unsettable attributes</a></li>
+ * <li><a href=
+ * "http://www.eclipsezone.com/eclipse/forums/t114431.html?start=15"> Creating a
+ * ComboViewer for an EReference</a> particularly the later postings from Tom
+ * Schindl on handling null values</li>
+ * <li><a href="http://www.eclipse.org/forums/index.php?t=msg&th=174967/">
+ * ObservableMapCellLabelProvider doesn't work well with unsettable
+ * features</a></li>
  * </ul>
  */
 public class UnsettableUpdateValueStrategy extends EMFUpdateValueStrategy {
@@ -90,7 +97,7 @@ public Object convert(Object fromObject) {
 						}
 						// If the value
 						if (fromObject == SetCommand.UNSET_VALUE || fromObject == null
-							|| fromObject.equals(eAttribute.getDefaultValue())) {
+								|| fromObject.equals(eAttribute.getDefaultValue())) {
 							return ""; //$NON-NLS-1$
 						}
 						return eFactory.convertToString(eDataType, fromObject);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index da63fc7bd2..a9d113e676 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -272,7 +272,7 @@ public void widgetSelected(SelectionEvent e) {
 			createRemoveMainMenu.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
 		}
 
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context,
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
 				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
 		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.buttonSelection(), //$NON-NLS-1$
 				E4Properties.visible(getEditingDomain()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
index 3f070ac90e..474bbe9290 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
@@ -577,6 +577,7 @@ public IContentDescription getContentDescription() throws CoreException {
 	@Override
 	public InputStream getContents() throws CoreException {
 		URL url;
+		@SuppressWarnings("resource")
 		ZipFile zip = null;
 		try {
 			if (path.getFileExtension().equals("jar")) { //$NON-NLS-1$
@@ -595,7 +596,7 @@ public InputStream getContents() throws CoreException {
 				ret = url.openStream();
 			} catch (final Exception e) {
 				return new BufferedInputStream(new FileInputStream(data.installLocation
-					+ "/" + data.resourceRelativePath)); //$NON-NLS-1$
+						+ "/" + data.resourceRelativePath)); //$NON-NLS-1$
 			}
 			return ret;
 		} catch (final MalformedURLException e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
index b136e79bee..4e69a018de 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
@@ -71,7 +71,7 @@
  * <code>AppModelId.java</code>.
  */
 public class ExportIdsHandler {
-	public static final String DEFAULT_APPMODELID_CLASSNAME = "AppModelId";
+	public static final String DEFAULT_APPMODELID_CLASSNAME = "AppModelId"; //$NON-NLS-1$
 
 	@Execute
 	public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell, @Translation Messages messages, IModelResource resource, IResourcePool pool, IProject project) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
index 7c6a7e593d..afc4b2854e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
@@ -260,6 +260,7 @@ class ProjectResourceBundleControl extends ResourceBundle.Control {
 			this.useFallback = useFallback;
 		}
 
+		@SuppressWarnings("resource")
 		@Override
 		public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader,
 				boolean reload) throws IllegalAccessException, InstantiationException, IOException {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
index 7cd19db2cf..a72479e290 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
@@ -281,7 +281,7 @@ public void widgetSelected(SelectionEvent e) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (btnUseAnyway.getSelection()) {
-						setAction(NonReferencedAction.USE_ANYWAY, () -> context.set("resolvedFile", file));
+						setAction(NonReferencedAction.USE_ANYWAY, () -> context.set("resolvedFile", file)); //$NON-NLS-1$
 					}
 				}
 			});
@@ -409,6 +409,7 @@ public void doRequireBundle(String bundle, String installLocation) {
 
 		// Get source bundle version from manifest
 		String version = null;
+		@SuppressWarnings("resource")
 		InputStream srcStream = null;
 		try {
 			Manifest manifestSource;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
index 3b78579546..5b9e78a29d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
@@ -447,6 +447,7 @@ public void doRequireBundle(String bundle, String installLocation) {
 
 		// Get source bundle version from manifest
 		String version = null;
+		@SuppressWarnings("resource")
 		InputStream srcStream = null;
 		try {
 			Manifest manifestSource;

From 716965d612611249ebc4c4a4df0c3a6054e5adbf Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 6 Jan 2020 10:35:36 +0100
Subject: [PATCH 1133/1286] Bug 558815 - Fix license headers corrupted by Bug
 535802

Change-Id: I202c63a1d8366ff72a2959c59a0789c761c34ee7
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../component/tabs/ContributionUriCellEditor.java | 15 ++++++++-------
 .../TitleAreaFilterDialogWithEmptyOptions.java    | 15 ++++++++-------
 .../dialogs/BundleClassDialog.java                | 15 ++++++++-------
 .../resourcelocator/dialogs/IconDialog.java       | 15 ++++++++-------
 4 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
index b2598ded52..9d2930d3f0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
@@ -1,11 +1,12 @@
 /*******************************************************************************
-.
-. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License 2.0 which accompanies this distribution, and is
-t https://www.eclipse.org/legal/epl-2.0/
-t
-t SPDX-License-Identifier: EPL-2.0
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors: Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
  *******************************************************************************/
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
index d0b629bfe3..88a2480e87 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
@@ -1,11 +1,12 @@
 /*******************************************************************************
-.
-. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License 2.0 which accompanies this distribution, and is
-t https://www.eclipse.org/legal/epl-2.0/
-t
-t SPDX-License-Identifier: EPL-2.0
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors: Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 432555
  *******************************************************************************/
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
index a6357163af..a70625489b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
@@ -1,11 +1,12 @@
 /*******************************************************************************
-.
-. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License 2.0 which accompanies this distribution, and is
-t https://www.eclipse.org/legal/epl-2.0/
-t
-t SPDX-License-Identifier: EPL-2.0
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors: Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730, Ongoing Maintenance
  *******************************************************************************/
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
index 64f1aa09c5..dfec05e740 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
@@ -1,11 +1,12 @@
 /*******************************************************************************
-.
-. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License 2.0 which accompanies this distribution, and is
-t https://www.eclipse.org/legal/epl-2.0/
-t
-t SPDX-License-Identifier: EPL-2.0
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors: Steven Spungin <steven@spungin.tv> - initial API and implementation, Bug 424730
  *******************************************************************************/

From 948d0d2f137c3101927644de9637f43f85c78f96 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 9 Jan 2020 17:30:22 +0100
Subject: [PATCH 1134/1286] 4.15 update for org.eclipse.e4.tools

Change-Id: I11dd84b9072eecb9a6f7fbf2235be035ab2bd978
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index ff443a1014..027f751cb9 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 4.8.600.qualifier
+Bundle-Version: 4.8.700.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 37ffc2eeaf..c8fe67784a 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tool</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>4.8.600-SNAPSHOT</version>
+  <version>4.8.700-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From a075e2169479f5a1cb78502c13789a6243d00e3e Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 6 Jan 2020 18:10:28 +0100
Subject: [PATCH 1135/1286] Removes unnecessary whitespace from e4 tools

Change-Id: Ia972ab4719c41e562cfc5ebf594c1338fe251368
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../classes/templates/AddonTemplate.java      |  6 +--
 .../DynamicMenuContributionTemplate.java      | 14 +++----
 .../classes/templates/HandlerTemplate.java    | 14 +++----
 .../classes/templates/PartTemplate.java       | 38 +++++++++----------
 .../templates/ToolControlTemplate.java        | 14 +++----
 5 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
index 31ec684c6e..15cfd1aef8 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
@@ -24,13 +24,13 @@ public static synchronized AddonTemplate create(String lineSeparator)
   public String generate(Object argument)
   {
     final StringBuilder stringBuffer = new StringBuilder();
-     JavaClass domainClass = (JavaClass)argument; 
+     JavaClass domainClass = (JavaClass)argument;
     stringBuffer.append(TEXT_1);
-     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
     stringBuffer.append(TEXT_2);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
     stringBuffer.append(TEXT_3);
-     } 
+     }
     stringBuffer.append(TEXT_4);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_5);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
index 29e0a3c3f7..3e1851c458 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
@@ -29,27 +29,27 @@ public static synchronized DynamicMenuContributionTemplate create(String lineSep
   public String generate(Object argument)
   {
     final StringBuilder stringBuffer = new StringBuilder();
-     DynamicMenuContributionClass domainClass = (DynamicMenuContributionClass)argument; 
+     DynamicMenuContributionClass domainClass = (DynamicMenuContributionClass)argument;
     stringBuffer.append(TEXT_1);
-     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
     stringBuffer.append(TEXT_2);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
     stringBuffer.append(TEXT_3);
-     } 
+     }
     stringBuffer.append(TEXT_4);
-     if( domainClass.isUseAboutToHide() )  { 
+     if( domainClass.isUseAboutToHide() )  {
     stringBuffer.append(TEXT_5);
-     } 
+     }
     stringBuffer.append(TEXT_6);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_7);
     stringBuffer.append( domainClass.getAboutToShowMethodName() );
     stringBuffer.append(TEXT_8);
-     if( domainClass.isUseAboutToHide() )  { 
+     if( domainClass.isUseAboutToHide() )  {
     stringBuffer.append(TEXT_9);
     stringBuffer.append( domainClass.getAboutToHideMethodName() );
     stringBuffer.append(TEXT_10);
-     } 
+     }
     stringBuffer.append(TEXT_11);
     return stringBuffer.toString();
   }
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
index ddfa4cc5ad..97ba3918fd 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
@@ -29,27 +29,27 @@ public static synchronized HandlerTemplate create(String lineSeparator)
   public String generate(Object argument)
   {
     final StringBuilder stringBuffer = new StringBuilder();
-     HandlerClass domainClass = (HandlerClass)argument; 
+     HandlerClass domainClass = (HandlerClass)argument;
     stringBuffer.append(TEXT_1);
-     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
     stringBuffer.append(TEXT_2);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
     stringBuffer.append(TEXT_3);
-     } 
+     }
     stringBuffer.append(TEXT_4);
-     if( domainClass.isUseCanExecute() )  { 
+     if( domainClass.isUseCanExecute() )  {
     stringBuffer.append(TEXT_5);
-     } 
+     }
     stringBuffer.append(TEXT_6);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_7);
     stringBuffer.append( domainClass.getExecuteMethodName() );
     stringBuffer.append(TEXT_8);
-     if( domainClass.isUseCanExecute() )  { 
+     if( domainClass.isUseCanExecute() )  {
     stringBuffer.append(TEXT_9);
     stringBuffer.append( domainClass.getCanExecuteMethodName() );
     stringBuffer.append(TEXT_10);
-     } 
+     }
     stringBuffer.append(TEXT_11);
     return stringBuffer.toString();
   }
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
index 19abbb6180..0ae7b7cd34 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
@@ -41,54 +41,54 @@ public static synchronized PartTemplate create(String lineSeparator)
   public String generate(Object argument)
   {
     final StringBuilder stringBuffer = new StringBuilder();
-     PartClass domainClass = (PartClass)argument; 
+     PartClass domainClass = (PartClass)argument;
     stringBuffer.append(TEXT_1);
-     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
     stringBuffer.append(TEXT_2);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
     stringBuffer.append(TEXT_3);
-     } 
+     }
     stringBuffer.append(TEXT_4);
-     if( domainClass.isUsePostConstruct() ) { 
+     if( domainClass.isUsePostConstruct() ) {
     stringBuffer.append(TEXT_5);
-     } 
-     if( domainClass.isUsePredestroy() ) { 
+     }
+     if( domainClass.isUsePredestroy() ) {
     stringBuffer.append(TEXT_6);
-     } 
-     if( domainClass.isUseFocus() ) { 
+     }
+     if( domainClass.isUseFocus() ) {
     stringBuffer.append(TEXT_7);
-     } 
-     if( domainClass.isUsePersist() ) { 
+     }
+     if( domainClass.isUsePersist() ) {
     stringBuffer.append(TEXT_8);
-     } 
+     }
     stringBuffer.append(TEXT_9);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_10);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_11);
-     if( domainClass.isUsePostConstruct() ) { 
+     if( domainClass.isUsePostConstruct() ) {
     stringBuffer.append(TEXT_12);
     stringBuffer.append( domainClass.getPostConstructMethodName()  );
     stringBuffer.append(TEXT_13);
-     } 
+     }
     stringBuffer.append(TEXT_14);
-     if( domainClass.isUsePredestroy() ) { 
+     if( domainClass.isUsePredestroy() ) {
     stringBuffer.append(TEXT_15);
     stringBuffer.append( domainClass.getPreDestroyMethodName()  );
     stringBuffer.append(TEXT_16);
-     } 
+     }
     stringBuffer.append(TEXT_17);
-     if( domainClass.isUseFocus() ) { 
+     if( domainClass.isUseFocus() ) {
     stringBuffer.append(TEXT_18);
     stringBuffer.append( domainClass.getFocusMethodName() );
     stringBuffer.append(TEXT_19);
-     } 
+     }
     stringBuffer.append(TEXT_20);
-     if( domainClass.isUsePersist() ) { 
+     if( domainClass.isUsePersist() ) {
     stringBuffer.append(TEXT_21);
     stringBuffer.append( domainClass.getPersistMethodName() );
     stringBuffer.append(TEXT_22);
-     } 
+     }
     stringBuffer.append(TEXT_23);
     return stringBuffer.toString();
   }
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
index 8e484fd39d..d1a97c4503 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
@@ -28,24 +28,24 @@ public static synchronized ToolControlTemplate create(String lineSeparator)
   public String generate(Object argument)
   {
     final StringBuilder stringBuffer = new StringBuilder();
-     ToolControlClass domainClass = (ToolControlClass)argument; 
-     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) { 
+     ToolControlClass domainClass = (ToolControlClass)argument;
+     if( domainClass.getPackageFragment() != null && domainClass.getPackageFragment().getElementName().trim().length() > 0 ) {
     stringBuffer.append(TEXT_1);
     stringBuffer.append( domainClass.getPackageFragment().getElementName() );
     stringBuffer.append(TEXT_2);
-     } 
+     }
     stringBuffer.append(TEXT_3);
-     if( domainClass.isCreateDefaultConstructor() )  { 
+     if( domainClass.isCreateDefaultConstructor() )  {
     stringBuffer.append(TEXT_4);
-     } 
+     }
     stringBuffer.append(TEXT_5);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_6);
-     if( domainClass.isCreateDefaultConstructor() )  { 
+     if( domainClass.isCreateDefaultConstructor() )  {
     stringBuffer.append(TEXT_7);
     stringBuffer.append( domainClass.getName() );
     stringBuffer.append(TEXT_8);
-     } 
+     }
     stringBuffer.append(TEXT_9);
     stringBuffer.append( domainClass.getCreateGuiMethodName() );
     stringBuffer.append(TEXT_10);

From a81d2fe6e97fc6e39c03800b55457d13d3ea4a95 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 9 Jan 2020 17:33:18 +0100
Subject: [PATCH 1136/1286] 4.15 update of org.eclipse.e4.tools.compat

Change-Id: I14ba56bc687334126a5acd183a2d71c20b3f2e52
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.compat/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index aabbe317d9..5e96976389 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 4.7.500.qualifier
+Bundle-Version: 4.7.600.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 34543be91d..f77ad986fa 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.compat</artifactId>
-  <version>4.7.500-SNAPSHOT</version>
+  <version>4.7.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From 0ddb5c046478cb5b0e2c48587346cc17dff9013f Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 19 Dec 2019 19:12:38 +0100
Subject: [PATCH 1137/1286] Remove unnecessary array creation for varargs

Using the batch cleanup operation via Source -> Cleanup -> "Remove
unnecessary array creation for varargs " from standard JDT.

Change-Id: I272ad537b0e196020095c516bd7dc205160f0bce
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../e4/tools/compat/internal/PartHelper.java  |  2 +-
 .../common/component/tabs/ListTab.java        |  6 ++---
 .../tabs/empty/TitleAreaFilterDialog.java     |  5 ++--
 .../dialogs/FindContributionDialog.java       | 26 ++++++++-----------
 .../wizards/classes/AbstractNewClassPage.java |  2 +-
 5 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
index 3f6c071f77..f6abaff230 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
@@ -47,7 +47,7 @@ public static IEclipseContext createPartContext(WorkbenchPart part) throws PartI
 				final Class<?> clazz = Platform.getBundle("org.eclipse.e4.ui.model.workbench").loadClass( //$NON-NLS-1$
 						"org.eclipse.e4.ui.model.application.ui.basic.MPart"); //$NON-NLS-1$
 				final Object instance = site.getService(clazz);
-				final Method m = clazz.getMethod("getContext", new Class[0]); //$NON-NLS-1$
+				final Method m = clazz.getMethod("getContext"); //$NON-NLS-1$
 				IEclipseContext ctx = (IEclipseContext) m.invoke(instance);
 				final IEclipseContext rv = ctx;
 				while (ctx.getParent() != null) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index dddd16aa12..0f499ffa18 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -466,7 +466,7 @@ public void widgetSelected(SelectionEvent e) {
 				public void widgetSelected(SelectionEvent e) {
 					filterByItemName = null;
 					filterByAttrName = null;
-					tvResults.setFilters(new ViewerFilter[0]);
+					tvResults.setFilters();
 					filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS);
 					filterByAttribute.setText(Messages.ListTab_markAttribute + ELIPSIS);
 				}
@@ -896,7 +896,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 				}
 
 			};
-			tvResults.setFilters(new ViewerFilter[] { viewerFilter });
+			tvResults.setFilters(viewerFilter);
 			filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS + "(" + filterByItemName + ")"); //$NON-NLS-1$//$NON-NLS-2$
 			filterByAttribute.setText(Messages.ListTab_filterByAttribute + ELIPSIS);
 		}
@@ -941,7 +941,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 						}
 					}
 				};
-				tvResults.setFilters(new ViewerFilter[] { viewerFilter });
+				tvResults.setFilters(viewerFilter);
 				filterByAttribute.setText(Messages.ListTab_filterByAttribute + ELIPSIS + "(" + filterByAttrName + ")"); //$NON-NLS-1$//$NON-NLS-2$
 				filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
index 9ca937e627..94e21432e8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
@@ -71,13 +71,12 @@ protected Control createDialogArea(Composite parent) {
 		viewer.setLabelProvider(labelProvider);
 		viewer.setContentProvider(ArrayContentProvider.getInstance());
 
-		viewer.setFilters(new ViewerFilter[] { new ViewerFilter() {
-
+		viewer.setFilters(new ViewerFilter() {
 			@Override
 			public boolean select(Viewer viewer, Object parentElement, Object element) {
 				return isFiltered(element, text.getText());
 			}
-		} });
+		});
 
 		text.addModifyListener(e -> viewer.refresh());
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
index f47950b877..c6659b8504 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
@@ -231,13 +231,11 @@ public void keyPressed(KeyEvent e) {
 			}
 		});
 
-		viewer.setFilters(new ViewerFilter[] { new ViewerFilter() {
-
+		viewer.setFilters(new ViewerFilter() {
 			@Override
 			public boolean select(Viewer viewer, Object parentElement, Object element) {
 				ContributionData cd = (ContributionData) element;
-				if ("show-bundles".equals(mode)) { //$NON-NLS-1$
-					// only add first item from each bundle
+				if ("show-bundles".equals(mode)) {
 					boolean found = false;
 					for (Iterator<?> it = list.iterator(); it.hasNext();) {
 						ContributionData cd2 = (ContributionData) it.next();
@@ -250,27 +248,26 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 						}
 					}
 					return true;
-				} else if ("show-packages".equals(mode)) { //$NON-NLS-1$
+				} else if ("show-packages".equals(mode)) {
 					if (bundleFilter != null && bundleFilter.isEmpty() == false) {
 						if (!bundleFilter.equals(cd.bundleName)) {
 							return false;
 						}
 					}
 					String packageName;
-					int last = cd.className.lastIndexOf("."); //$NON-NLS-1$
+					int last = cd.className.lastIndexOf(".");
 					if (last >= 0) {
 						packageName = cd.className.substring(0, last);
 					} else {
-						packageName = ""; //$NON-NLS-1$
+						packageName = "";
 					}
-					// only add first item from each package
 					boolean found = false;
 					for (Iterator<?> it = list.iterator(); it.hasNext();) {
 						boolean matches = false;
 						ContributionData cd2 = (ContributionData) it.next();
-						if (packageName.isEmpty() && cd2.className.contains(".") == false) { //$NON-NLS-1$
+						if (packageName.isEmpty() && cd2.className.contains(".") == false) {
 							matches = true;
-						} else if (cd2.className.startsWith(packageName + ".")) { //$NON-NLS-1$
+						} else if (cd2.className.startsWith(packageName + ".")) {
 							matches = true;
 						}
 						if (matches) {
@@ -282,7 +279,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 						}
 					}
 					return true;
-				} else if ("show-icons".equals(mode)) { //$NON-NLS-1$
+				} else if ("show-icons".equals(mode)) {
 					if (cd.iconPath == null) {
 						return false;
 					}
@@ -292,7 +289,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 						}
 					}
 					if (packageFilter != null && packageFilter.isEmpty() == false) {
-						if (!cd.className.startsWith(packageFilter + ".")) { //$NON-NLS-1$
+						if (!cd.className.startsWith(packageFilter + ".")) {
 							return false;
 						}
 					}
@@ -304,15 +301,14 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 						}
 					}
 					if (packageFilter != null && packageFilter.isEmpty() == false) {
-						if (!cd.className.startsWith(packageFilter + ".")) { //$NON-NLS-1$
+						if (!cd.className.startsWith(packageFilter + ".")) {
 							return false;
 						}
 					}
-
 					return true;
 				}
 			}
-		} });
+		});
 
 		StringBuilder sbFind = new StringBuilder();
 
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index d5e855cc8a..56132a3c25 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -457,7 +457,7 @@ private IPackageFragment choosePackage() {
 		dialog.setHelpAvailable(false);
 		final IPackageFragment pack = clazz.getPackageFragment();
 		if (pack != null) {
-			dialog.setInitialSelections(new Object[] { pack });
+			dialog.setInitialSelections(pack);
 		}
 
 		if (dialog.open() == Window.OK) {

From 2b9f3b4424a75cd0acd4fa3950d47bfeeace1c02 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mon, 13 Jan 2020 13:00:02 +0200
Subject: [PATCH 1138/1286] Bug 559097 - Compile warnings in I20200113-0130

Fix warnings in platform.ui.tools.

Change-Id: Iebaef968ed1f76792a40cd4fa0a6405bf1366434
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../dialogs/ProjectFolderPickerDialog.java                | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
index 8f44f6fd43..85408bbbc1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2017 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2020 TwelveTone LLC and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -13,6 +13,7 @@
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.dialogs;
 
+import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
 
@@ -146,7 +147,10 @@ public Image getImage(Object element) {
 				if (element instanceof String) {
 					return new Image(Display.getDefault(), new URL(Messages.ProjectFolderPickerDialog_0).openStream());
 				}
-				return new Image(Display.getDefault(), new URL("platform:/plugin/org.eclipse.ui.ide/icons/full/obj16/folder.png").openStream()); //$NON-NLS-1$
+				try (InputStream is = new URL("platform:/plugin/org.eclipse.ui.ide/icons/full/obj16/folder.png") //$NON-NLS-1$
+						.openStream()) {
+					return new Image(Display.getDefault(), is);
+				}
 			} catch (Exception e) {
 				return super.getImage(element);
 			}

From c048148e4aec295858f655b277c9967822d1f549 Mon Sep 17 00:00:00 2001
From: Benedikt Kuntz <benedikt.kuntz@airbus.com>
Date: Fri, 6 Dec 2019 08:54:21 +0100
Subject: [PATCH 1139/1286] [minor] Title for Window Icon dialog was "Menu Icon
 Search"

Change-Id: I1352c27624fa7ca429621fda3b5ab4d524ae2536
Signed-off-by: Benedikt Kuntz <benedikt.kuntz@airbus.com>
---
 .../org/eclipse/e4/tools/emf/ui/internal/Messages.properties  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 6b6f14505e..6ea3761a8f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -668,8 +668,8 @@ ToolItemIconDialogEditor_ShellTitle=ToolItem Icon Search
 ToolItemIconDialogEditor_DialogTitle=ToolItem Icon Search
 ToolItemIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
 
-WindowIconDialogEditor_ShellTitle=Menu Icon Search
-WindowIconDialogEditor_DialogTitle=Menu Icon Search
+WindowIconDialogEditor_ShellTitle=Window Icon Search
+WindowIconDialogEditor_DialogTitle=Window Icon Search
 WindowIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
 
 ImageTooltip_UnknownError=Unknown Error

From ef60751d594906b1ffcbbed71ade7cbdc4d695c5 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 13 Jan 2020 16:49:29 +0100
Subject: [PATCH 1140/1286] Iterate over Map.entrySet instead of Map.keySet and
 value search

Faster than first getting the keys and afterwards reading the value.

Done with Autorefactor https://github.com/JnRouvignac/AutoRefactor/
batch conversion using the iterate over
Map.entrySet instead of Map.keySet and value search

Change-Id: Ie4cb988e2d6df11ad3739fa1f4d735e60aa96826
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java | 5 +++--
 .../emf/ui/internal/handlers/MarkDuplicateItemsBase.java     | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 5e97863ace..bdea5b438c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1227,9 +1227,10 @@ private void registerContributedEditorTabs() {
 
 	public List<AbstractElementEditorContribution> getTabContributionsForClass(Class<?> clazz) {
 		final List<AbstractElementEditorContribution> ret = new ArrayList<>();
-		for (final Class<?> clasz : tabContributions.keySet()) {
+		for (Map.Entry<Class<?>, List<AbstractElementEditorContribution>> entry : tabContributions.entrySet()) {
+			Class<?> clasz = entry.getKey();
 			if (clasz.isAssignableFrom(clazz)) {
-				ret.addAll(tabContributions.get(clasz));
+				ret.addAll(entry.getValue());
 			}
 		}
 		return ret;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java
index 36903e4a08..310dca709d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java
@@ -44,8 +44,8 @@ public void execute(IEclipseContext context) {
 	static Collection<EObject> getDuplicateList(String attName, Collection<EObject> all) {
 		Map<String, List<EObject>> map = getDuplicateMap(attName, all);
 		List<EObject> duplicates = new ArrayList<>();
-		for (String key : map.keySet()) {
-			List<EObject> list = map.get(key);
+		for (Map.Entry<String, List<EObject>> entry : map.entrySet()) {
+			List<EObject> list = entry.getValue();
 			if (list.size() > 1) {
 				duplicates.addAll(list);
 			}

From fee4ad50fc1ab3e123edb63853421b80defcaca7 Mon Sep 17 00:00:00 2001
From: Benedikt Kuntz <benedikt.kuntz@airbus.com>
Date: Tue, 14 Jan 2020 09:09:32 +0100
Subject: [PATCH 1141/1286] Bug 559117 - Add ToolbarItem command dialog should
 be centered

Don't persist dialog origin, set dialog bounds strategy to
DIALOG_PERSISTSIZE only for all SaveDialogBoundsSettingsDialogs

Change-Id: I92af7c37c47a3fff070c34fe5cd42c0a78738507
Signed-off-by: Benedikt Kuntz <benedikt.kuntz@airbus.com>
---
 .../dialogs/SaveDialogBoundsSettingsDialog.java       | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
index 39e29cbcdc..3299b14e16 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
@@ -25,8 +25,6 @@
 
 public abstract class SaveDialogBoundsSettingsDialog extends TitleAreaDialog {
 
-	private static final String DIALOG_ORIGIN_X = "DIALOG_X_ORIGIN"; //$NON-NLS-1$
-	private static final String DIALOG_ORIGIN_Y = "DIALOG_Y_ORIGIN"; //$NON-NLS-1$
 	private static final String DIALOG_WIDTH = "DIALOG_WIDTH"; //$NON-NLS-1$
 	private static final String DIALOG_HEIGHT = "DIALOG_HEIGHT"; //$NON-NLS-1$
 	private static final int DIALOG_MINIMUM_HEIGHT = 300;
@@ -41,15 +39,11 @@ public SaveDialogBoundsSettingsDialog(Shell parentShell) {
 
 		dialogSettings.put(DIALOG_HEIGHT, preferences.getInt(DIALOG_HEIGHT, -1));
 		dialogSettings.put(DIALOG_WIDTH, preferences.getInt(DIALOG_WIDTH, -1));
-		dialogSettings.put(DIALOG_ORIGIN_X, preferences.getInt(DIALOG_ORIGIN_X, -1));
-		dialogSettings.put(DIALOG_ORIGIN_Y, preferences.getInt(DIALOG_ORIGIN_Y, -1));
 	}
 
 	private void saveDialogSettings() {
 		preferences.put(DIALOG_HEIGHT, dialogSettings.get(DIALOG_HEIGHT));
 		preferences.put(DIALOG_WIDTH, dialogSettings.get(DIALOG_WIDTH));
-		preferences.put(DIALOG_ORIGIN_X, dialogSettings.get(DIALOG_ORIGIN_X));
-		preferences.put(DIALOG_ORIGIN_Y, dialogSettings.get(DIALOG_ORIGIN_Y));
 		try {
 			preferences.flush();
 		} catch (BackingStoreException e) {
@@ -80,6 +74,11 @@ protected IDialogSettings getDialogBoundsSettings() {
 		return dialogSettings;
 	}
 
+	@Override
+	protected int getDialogBoundsStrategy() {
+		return DIALOG_PERSISTSIZE;
+	}
+
 	public Preferences getPreferences() {
 		return preferences;
 	}

From ee5b217b38668b5332b6ed4eedc4a9e1477d353a Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 13 Jan 2020 10:05:32 +0100
Subject: [PATCH 1142/1286] Use System.lineSeparator()

Benefit of this way rather than System.getProperty("line.separator") is
that there are no security checks.

Change-Id: I4ca3bae0c8c1b109fb1bdd037f4e893470b2d322
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../ui/internal/common/properties/ExportIdsHandler.java   | 8 ++++----
 .../common/properties/ExternalizeStringHandler.java       | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
index 4e69a018de..f0cf13074c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
@@ -284,13 +284,13 @@ protected void okPressed() { // See AbstractNewClassWizard
 
 		private String compileFileContent(Object[] els) {
 			StringBuilder b = new StringBuilder();
-			b.append("package " + clazz.packageFragment.getElementName() + ";" + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			b.append(System.getProperty("line.separator")); //$NON-NLS-1$
-			b.append("public class " + clazz.name + " {" + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			b.append("package " + clazz.packageFragment.getElementName() + ";" + System.lineSeparator()); //$NON-NLS-1$ //$NON-NLS-2$
+			b.append(System.lineSeparator());
+			b.append("public class " + clazz.name + " {" + System.lineSeparator()); //$NON-NLS-1$ //$NON-NLS-2$
 
 			for (Object o : els) {
 				Entry e = (Entry) o;
-				b.append("\tpublic static final String " + e.idFieldKey + " = \"" + e.elementId + "\";" + System.getProperty("line.separator")); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+				b.append("\tpublic static final String " + e.idFieldKey + " = \"" + e.elementId + "\";" + System.lineSeparator()); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
 			}
 
 			b.append("}"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
index d28eccc24e..d07628cd73 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
@@ -223,10 +223,10 @@ protected void okPressed() {
 				try {
 					IFile f = getBasePropertyFile();
 
-					StringBuilder b = new StringBuilder(System.getProperty("line.separator")); //$NON-NLS-1$
+					StringBuilder b = new StringBuilder(System.lineSeparator());
 					for (Object o : els) {
 						Entry e = (Entry) o;
-						b.append(e.key + " = " + e.value + System.getProperty("line.separator")); //$NON-NLS-1$//$NON-NLS-2$
+						b.append(e.key + " = " + e.value + System.lineSeparator()); //$NON-NLS-1$
 					}
 
 					try (ByteArrayInputStream stream = new ByteArrayInputStream(b.toString().getBytes())) {

From 74d0f928b44a04b55efe2ab093b487c9208d3d5e Mon Sep 17 00:00:00 2001
From: Jens Lidestrom <jens@lidestrom.se>
Date: Wed, 25 Dec 2019 16:44:41 +0100
Subject: [PATCH 1143/1286] Bug 558411 - Guard against disposed master in
 WindowEditor

For some reason sometimes the master object is disposed when
the main menu changes. This change prevents a crash in this weird
case, but doesn't solve the root problem.

After this change also the virtual entry list is not updated when
createRemoveMainMenu is disposed. This should be okay, because in
that case the GUI is not functional and it doesn't matter if the
update is not performed, as long as we don't crash.


Change-Id: I072bc49f50062d884c7d00e44b4d1e03a93e8001
Signed-off-by: Jens Lidestrom <jens@lidestrom.se>
---
 .../emf/ui/internal/common/component/WindowEditor.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index a9d113e676..36a76d7080 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -366,16 +366,20 @@ public IObservableList<Object> getChildList(final Object element) {
 		}
 
 		E4Properties.mainMenu().observe(window).addValueChangeListener(event -> {
+			if (createRemoveMainMenu.isDisposed() || getMaster().isDisposed()) {
+				return;
+			}
+
 			if (event.diff.getOldValue() != null) {
 				list.remove(event.diff.getOldValue());
-				if (getMaster().getValue() == element && !createRemoveMainMenu.isDisposed()) {
+				if (getMaster().getValue() == element) {
 					createRemoveMainMenu.setSelection(false);
 				}
 			}
 
 			if (event.diff.getNewValue() != null) {
 				list.add(0, event.diff.getNewValue());
-				if (getMaster().getValue() == element && !createRemoveMainMenu.isDisposed()) {
+				if (getMaster().getValue() == element) {
 					createRemoveMainMenu.setSelection(true);
 				}
 			}

From 11f3fa31500d489e58dc1cf45f51bc92025b9fdd Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 16 Jan 2020 19:06:35 +0100
Subject: [PATCH 1144/1286] 4.15 update for org.eclipse.e4.tools.services

Change-Id: I33e6b97c0533e9af99898ebf0b2158a5400fd196
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 040d39222d..628c5eb5fd 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
-Bundle-Version: 4.8.300.qualifier
+Bundle-Version: 4.8.400.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.emf.ui",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 69a591f1b2..e0c173e11c 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.services</artifactId>
-  <version>4.8.300-SNAPSHOT</version>
+  <version>4.8.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From 2c5e29b00eca75e9fccb471e5f2690f35b69aee2 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 19 Dec 2019 21:09:27 +0100
Subject: [PATCH 1145/1286] Use lambdas where possible

Using the batch cleanup operation via Source -> Cleanup -> "Use lambdas
where possible" from standard JDT.

Change-Id: I92a8c1dd1aefb7ae63b6453c2edebd09891daeba
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../internal/ContextServiceFactory.java       | 25 +++++---------
 .../tools/emf/ui/common/XMIModelResource.java | 12 ++-----
 .../ObservableColumnLabelProvider.java        | 12 +++----
 .../ProjectOSGiTranslationProvider.java       | 33 +++++--------------
 .../services/impl/ResourceBundleHelper.java   | 25 +++++++-------
 5 files changed, 35 insertions(+), 72 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index a35860bca8..8594181e7c 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -26,13 +26,10 @@
 import org.eclipse.e4.ui.di.UISynchronize;
 import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.e4.ui.services.IStylingEngine;
-import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.ISelectionListener;
 import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchPartSite;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.internal.services.IWorkbenchLocationService;
@@ -135,21 +132,17 @@ public void setClassnameAndId(Object widget, String classname,
 			windowContext.set(ISelectionService.class, window.getSelectionService());
 
 			windowContext.declareModifiable(IServiceConstants.ACTIVE_SELECTION);
-			window.getSelectionService().addSelectionListener(new ISelectionListener() {
-
-				@Override
-				public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-					if (!selection.isEmpty()) {
-						if (selection instanceof IStructuredSelection) {
-							final IStructuredSelection s = (IStructuredSelection) selection;
-							if (s.size() == 1) {
-								windowContext.set(IServiceConstants.ACTIVE_SELECTION, s.getFirstElement());
-							} else {
-								windowContext.set(IServiceConstants.ACTIVE_SELECTION, s.toList());
-							}
+			window.getSelectionService().addSelectionListener((part, selection) -> {
+				if (!selection.isEmpty()) {
+					if (selection instanceof IStructuredSelection) {
+						final IStructuredSelection s = (IStructuredSelection) selection;
+						if (s.size() == 1) {
+							windowContext.set(IServiceConstants.ACTIVE_SELECTION, s.getFirstElement());
 						} else {
-							windowContext.set(IServiceConstants.ACTIVE_SELECTION, selection);
+							windowContext.set(IServiceConstants.ACTIVE_SELECTION, s.toList());
 						}
+					} else {
+						windowContext.set(IServiceConstants.ACTIVE_SELECTION, selection);
 					}
 				}
 			});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
index dfa59f27aa..baf3f27fba 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
@@ -15,7 +15,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.EventObject;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -29,7 +28,6 @@
 import org.eclipse.e4.ui.internal.workbench.E4XMIResourceFactory;
 import org.eclipse.emf.common.command.BasicCommandStack;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStackListener;
 import org.eclipse.emf.common.command.CompoundCommand;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.common.util.URI;
@@ -59,13 +57,9 @@ public XMIModelResource(URI uri) {
 
 		final ResourceSet resourceSet = new ResourceSetImpl();
 		final BasicCommandStack commandStack = new BasicCommandStack();
-		commandStack.addCommandStackListener(new CommandStackListener() {
-
-			@Override
-			public void commandStackChanged(EventObject event) {
-				fireDirtyChanged();
-				fireCommandStackChanged();
-			}
+		commandStack.addCommandStackListener(event -> {
+			fireDirtyChanged();
+			fireCommandStackChanged();
 		});
 		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, resourceSet);
 		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
index 6283bbc21c..18fc7b2a02 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
@@ -17,7 +17,6 @@
 
 import org.eclipse.core.databinding.observable.map.IMapChangeListener;
 import org.eclipse.core.databinding.observable.map.IObservableMap;
-import org.eclipse.core.databinding.observable.map.MapChangeEvent;
 import org.eclipse.jface.viewers.CellLabelProvider;
 import org.eclipse.jface.viewers.LabelProviderChangedEvent;
 import org.eclipse.jface.viewers.ViewerCell;
@@ -28,13 +27,10 @@
 public class ObservableColumnLabelProvider<M> extends CellLabelProvider {
 	private IObservableMap<M, ?>[] attributeMaps;
 
-	private IMapChangeListener<M, Object> mapChangeListener = new IMapChangeListener<M, Object>() {
-		@Override
-		public void handleMapChange(MapChangeEvent<? extends M, ?> event) {
-			Set<? extends M> affectedElements = event.diff.getChangedKeys();
-			LabelProviderChangedEvent newEvent = new LabelProviderChangedEvent(ObservableColumnLabelProvider.this, affectedElements.toArray());
-			fireLabelProviderChanged(newEvent);
-		}
+	private IMapChangeListener<M, Object> mapChangeListener = event -> {
+		Set<? extends M> affectedElements = event.diff.getChangedKeys();
+		LabelProviderChangedEvent newEvent = new LabelProviderChangedEvent(ObservableColumnLabelProvider.this, affectedElements.toArray());
+		fireLabelProviderChanged(newEvent);
 	};
 
 	/**
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
index afc4b2854e..c82b2b1f43 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
@@ -19,9 +19,7 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.e4.core.di.annotations.Optional;
@@ -65,23 +63,13 @@ public ProjectOSGiTranslationProvider(IProject project, String locale) {
 		super(null);
 
 		this.project = project;
-		this.project.getWorkspace().addResourceChangeListener(new IResourceChangeListener() {
-
-			@Override
-			public void resourceChanged(IResourceChangeEvent event) {
-				if (event.getType() == IResourceChangeEvent.POST_CHANGE) {
-					try {
-						event.getDelta().accept(new IResourceDeltaVisitor() {
-
-							@Override
-							public boolean visit(IResourceDelta delta) throws CoreException {
-								return ProjectOSGiTranslationProvider.this.visit(delta);
-							}
-						});
-					} catch (final CoreException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+		this.project.getWorkspace().addResourceChangeListener(event -> {
+			if (event.getType() == IResourceChangeEvent.POST_CHANGE) {
+				try {
+					event.getDelta().accept(delta -> ProjectOSGiTranslationProvider.this.visit(delta));
+				} catch (final CoreException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
 			}
 		});
@@ -271,12 +259,7 @@ public ResourceBundle newBundle(String baseName, Locale locale, String format, C
 				final String resourceName = toResourceName(bundleName, "properties"); //$NON-NLS-1$
 				InputStream stream = null;
 				try {
-					stream = AccessController.doPrivileged(new PrivilegedExceptionAction<InputStream>() {
-						@Override
-						public InputStream run() throws IOException {
-							return getResourceAsStream(resourceName);
-						}
-					});
+					stream = AccessController.doPrivileged((PrivilegedExceptionAction<InputStream>) () -> getResourceAsStream(resourceName));
 				} catch (final PrivilegedActionException e) {
 					throw (IOException) e.getException();
 				}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
index 5521b927ab..daca617d88 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
@@ -560,22 +560,19 @@ public ResourceBundle newBundle(String baseName, Locale locale,
 				InputStream stream = null;
 				try {
 					stream = AccessController.doPrivileged(
-							new PrivilegedExceptionAction<InputStream>() {
-								@Override
-								public InputStream run() throws IOException {
-									InputStream is = null;
-									final URL url = osgiBundle.getEntry(resourceName);
-									if (url != null) {
-										final URLConnection connection = url.openConnection();
-										if (connection != null) {
-											// Disable caches to get fresh data for
-											// reloading.
-											connection.setUseCaches(false);
-											is = connection.getInputStream();
-										}
+							(PrivilegedExceptionAction<InputStream>) () -> {
+								InputStream is = null;
+								final URL url = osgiBundle.getEntry(resourceName);
+								if (url != null) {
+									final URLConnection connection = url.openConnection();
+									if (connection != null) {
+										// Disable caches to get fresh data for
+										// reloading.
+										connection.setUseCaches(false);
+										is = connection.getInputStream();
 									}
-									return is;
 								}
+								return is;
 							});
 				} catch (final PrivilegedActionException e) {
 					throw (IOException) e.getException();

From 773b6456d1e199da54d7b575b7c5c7e69a22aff7 Mon Sep 17 00:00:00 2001
From: Benedikt Kuntz <benedikt.kuntz@airbus.com>
Date: Fri, 24 Jan 2020 09:39:13 +0100
Subject: [PATCH 1146/1286] Bug 559470 - Remove unused
 ToolsServicesActivator#getPackageAdmin from org.eclipse.e4.tools.services

removed methods and resulting unused constants and comments

Change-Id: I7cee212db46e6dad56e84edc3332291f3ca04710
Signed-off-by: Benedikt Kuntz <benedikt.kuntz@airbus.com>
---
 .../services/ToolsServicesActivator.java      |  18 --
 .../services/impl/ResourceBundleHelper.java   | 162 ------------------
 2 files changed, 180 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java
index 10a2ed2265..706d15d700 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java
@@ -3,15 +3,12 @@
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.log.LogService;
-import org.osgi.service.packageadmin.PackageAdmin;
 import org.osgi.util.tracker.ServiceTracker;
 
-@SuppressWarnings("deprecation")
 public class ToolsServicesActivator implements BundleActivator {
 
 	static private ToolsServicesActivator defaultInstance;
 	private BundleContext bundleContext;
-	private ServiceTracker<PackageAdmin, PackageAdmin> pkgAdminTracker;
 	private ServiceTracker<LogService, LogService> logTracker;
 	public static final String PLUGIN_ID = "org.eclipse.e4.tools.services"; //$NON-NLS-1$
 
@@ -30,10 +27,6 @@ public void start(BundleContext context) throws Exception {
 
 	@Override
 	public void stop(BundleContext context) throws Exception {
-		if (pkgAdminTracker != null) {
-			pkgAdminTracker.close();
-			pkgAdminTracker = null;
-		}
 		if (logTracker != null) {
 			logTracker.close();
 			logTracker = null;
@@ -41,17 +34,6 @@ public void stop(BundleContext context) throws Exception {
 		bundleContext = null;
 	}
 
-	public PackageAdmin getPackageAdmin() {
-		if (pkgAdminTracker == null) {
-			if (bundleContext == null) {
-				return null;
-			}
-			pkgAdminTracker = new ServiceTracker<>(bundleContext,
-				PackageAdmin.class, null);
-			pkgAdminTracker.open();
-		}
-		return pkgAdminTracker.getService();
-	}
 
 	public LogService getLogService() {
 		if (logTracker == null) {
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
index daca617d88..df38aa8e72 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
@@ -15,8 +15,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.security.AccessController;
@@ -29,152 +27,15 @@
 import java.util.ResourceBundle;
 import java.util.ResourceBundle.Control;
 
-import org.eclipse.e4.tools.services.ToolsServicesActivator;
-import org.eclipse.osgi.service.localization.BundleLocalization;
 import org.osgi.framework.Bundle;
-import org.osgi.service.log.LogService;
-import org.osgi.service.packageadmin.PackageAdmin;
 
 /**
  * Helper class for retrieving {@link ResourceBundle}s out of OSGi {@link Bundle}s.
  *
  * @author Dirk Fauth
  */
-// There is no replacement for PackageAdmin#getBundles()
-@SuppressWarnings("deprecation")
 public class ResourceBundleHelper {
 
-	/**
-	 * The schema identifier used for Eclipse platform references
-	 */
-	private static final String PLATFORM_SCHEMA = "platform"; //$NON-NLS-1$
-	/**
-	 * The schema identifier used for Eclipse bundle class references
-	 */
-	private static final String BUNDLECLASS_SCHEMA = "bundleclass"; //$NON-NLS-1$
-	/**
-	 * Identifier part of the Eclipse platform schema to point to a plugin
-	 */
-	private static final String PLUGIN_SEGMENT = "/plugin/"; //$NON-NLS-1$
-	/**
-	 * Identifier part of the Eclipse platform schema to point to a fragment
-	 */
-	private static final String FRAGMENT_SEGMENT = "/fragment/"; //$NON-NLS-1$
-	/**
-	 * The separator character for paths in the platform schema
-	 */
-	private static final String PATH_SEPARATOR = "/"; //$NON-NLS-1$
-
-	/**
-	 * Parses the specified contributor URI and loads the {@link ResourceBundle} for the specified {@link Locale} out of
-	 * an OSGi {@link Bundle}.
-	 * <p>
-	 * Following URIs are supported:
-	 * <ul>
-	 * <li>platform:/[plugin|fragment]/[Bundle-SymbolicName]<br>
-	 * Load the OSGi resource bundle out of the bundle/fragment named [Bundle-SymbolicName]</li>
-	 * <li>platform:/[plugin|fragment]/[Bundle-SymbolicName]/[Path]/[Basename]<br>
-	 * Load the resource bundle specified by [Path] and [Basename] out of the bundle/fragment named
-	 * [Bundle-SymbolicName].</li>
-	 * <li>bundleclass://[plugin|fragment]/[Full-Qualified-Classname]<br>
-	 * Instantiate the class specified by [Full-Qualified-Classname] out of the bundle/fragment named
-	 * [Bundle-SymbolicName]. Note that the class needs to be a subtype of {@link ResourceBundle}.</li>
-	 * </ul>
-	 * </p>
-	 *
-	 * @param contributorURI The URI that points to a {@link ResourceBundle}
-	 * @param locale The {@link Locale} to use for loading the {@link ResourceBundle}
-	 * @param localization The service for retrieving a {@link ResourceBundle} for a given {@link Locale} out of
-	 *            the given {@link Bundle} which is specified by URI.
-	 * @return the resource bundle
-	 */
-	public static ResourceBundle getResourceBundleForUri(String contributorURI, Locale locale,
-			BundleLocalization localization) {
-		if (contributorURI == null) {
-			return null;
-		}
-
-		final LogService logService = ToolsServicesActivator.getDefault().getLogService();
-
-		URI uri;
-		try {
-			uri = new URI(contributorURI);
-		} catch (final URISyntaxException e) {
-			if (logService != null)
-			{
-				logService.log(LogService.LOG_ERROR, "Invalid contributor URI: " + contributorURI); //$NON-NLS-1$
-			}
-			return null;
-		}
-
-		String bundleName = null;
-		Bundle bundle = null;
-		String resourcePath = null;
-		String classPath = null;
-
-		// the uri follows the platform schema, so we search for .properties files in the bundle
-		if (PLATFORM_SCHEMA.equals(uri.getScheme())) {
-			bundleName = uri.getPath();
-			if (bundleName.startsWith(PLUGIN_SEGMENT)) {
-				bundleName = bundleName.substring(PLUGIN_SEGMENT.length());
-			} else if (bundleName.startsWith(FRAGMENT_SEGMENT)) {
-				bundleName = bundleName.substring(FRAGMENT_SEGMENT.length());
-			}
-
-			resourcePath = ""; //$NON-NLS-1$
-			if (bundleName.contains(PATH_SEPARATOR)) {
-				resourcePath = bundleName.substring(bundleName.indexOf(PATH_SEPARATOR) + 1);
-				bundleName = bundleName.substring(0, bundleName.indexOf(PATH_SEPARATOR));
-			}
-		} else if (BUNDLECLASS_SCHEMA.equals(uri.getScheme())) {
-			if (uri.getAuthority() == null) {
-				if (logService != null)
-				{
-					logService.log(LogService.LOG_ERROR, "Failed to get bundle for: " + contributorURI); //$NON-NLS-1$
-				}
-			}
-			bundleName = uri.getAuthority();
-			// remove the leading /
-			classPath = uri.getPath().substring(1);
-		}
-
-		ResourceBundle result = null;
-
-		if (bundleName != null) {
-			bundle = getBundleForName(bundleName);
-
-			if (bundle != null) {
-				if (resourcePath == null && classPath != null) {
-					// the URI points to a class within the bundle classpath
-					// therefore we are trying to instantiate the class
-					try {
-						final Class<?> resourceBundleClass = bundle.loadClass(classPath);
-						result = getEquinoxResourceBundle(classPath, locale, resourceBundleClass.getClassLoader());
-					} catch (final Exception e) {
-						if (logService != null)
-						{
-							logService.log(LogService.LOG_ERROR,
-									"Failed to load specified ResourceBundle: " + contributorURI, e); //$NON-NLS-1$
-						}
-					}
-				}
-				else if (resourcePath.length() > 0) {
-					// the specified URI points to a resource
-					// therefore we try to load the .properties files into a ResourceBundle
-					result = getEquinoxResourceBundle(resourcePath.replace('.', '/'), locale, bundle);
-				}
-				else {
-					// there is no class and no special resource specified within the URI
-					// therefore we load the OSGi resource bundle out of the specified Bundle
-					// for the current Locale
-					result = localization.getLocalization(bundle, locale.toString());
-				}
-			}
-		}
-
-		return result;
-	}
-
 	/**
 	 * This method searches for the {@link ResourceBundle} in a modified way by inspecting the configuration option
 	 * <code>equinox.root.locale</code>.
@@ -407,29 +268,6 @@ private static String getEquinoxRootLocale() {
 		return root;
 	}
 
-	/**
-	 * This method is copied out of org.eclipse.e4.ui.internal.workbench.Activator
-	 * because as it is a internal resource, it is not accessible for us.
-	 *
-	 * @param bundleName
-	 *            the bundle id
-	 * @return A bundle if found, or <code>null</code>
-	 */
-	public static Bundle getBundleForName(String bundleName) {
-		final PackageAdmin packageAdmin = ToolsServicesActivator.getDefault().getPackageAdmin();
-		final Bundle[] bundles = packageAdmin.getBundles(bundleName, null);
-		if (bundles == null) {
-			return null;
-		}
-		// Return the first bundle that is not installed or uninstalled
-		for (int i = 0; i < bundles.length; i++) {
-			if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
-				return bundles[i];
-			}
-		}
-		return null;
-	}
-
 	/**
 	 * <p>
 	 * Converts a String to a Locale.

From 1139ae164a1f9e25056b119edef5e8fd4b1019ab Mon Sep 17 00:00:00 2001
From: Benedikt Kuntz <benedikt.kuntz@airbus.com>
Date: Fri, 6 Dec 2019 10:21:31 +0100
Subject: [PATCH 1147/1286] Bug 501597 - [Model] Support new trimbars for Part
 and Perspective in e4 model editor

Add virtual editor tree elements for Part(Descriptor)Editor and
PerspectiveEditor. Add an abstract superclass for VWindowTrimEditor and
add inheriting classes for MPart's, MPartDescriptor's and MPerspective's
TrimBars

Change-Id: I71ca4708a70e56ce06bae2c2fc9c4083812ac271
Signed-off-by: Benedikt Kuntz <benedikt.kuntz@airbus.com>
---
 .../tools/emf/ui/internal/E4Properties.java   |  18 ++-
 .../e4/tools/emf/ui/internal/Messages.java    |  18 ++-
 .../tools/emf/ui/internal/Messages.properties |  25 +++-
 .../emf/ui/internal/common/ModelEditor.java   |  10 ++
 .../common/component/AbstractPartEditor.java  |   2 +
 .../component/PartDescriptorEditor.java       |  14 +-
 .../common/component/PerspectiveEditor.java   |   2 +
 .../common/component/TrimmedWindowEditor.java |   2 +-
 .../virtual/AbstractVTrimEditor.java          | 136 ++++++++++++++++++
 .../virtual/VPartDescriptorTrimEditor.java    |  57 ++++++++
 .../component/virtual/VPartTrimEditor.java    |  57 ++++++++
 .../virtual/VPerspectiveTrimEditor.java       |  57 ++++++++
 .../component/virtual/VSnippetsEditor.java    |   4 +-
 .../component/virtual/VWindowTrimEditor.java  | 131 +++--------------
 14 files changed, 401 insertions(+), 132 deletions(-)
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/AbstractVTrimEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorTrimEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartTrimEditor.java
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveTrimEditor.java

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java
index f412a6026d..339238076f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java
@@ -424,11 +424,27 @@ public static IValueProperty<MTrimContribution, String> trimPositionInParent(Edi
 	}
 
 	@SuppressWarnings("unchecked")
-	public static IListProperty<MTrimmedWindow, MTrimBar> trimBars() {
+	public static IListProperty<MTrimmedWindow, MTrimBar> windowTrimBars() {
 		return EMFProperties.list(
 				org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS);
 	}
 
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MPart, MTrimBar> partTrimBars() {
+		return EMFProperties
+				.list(org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.PART__TRIM_BARS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MPartDescriptor, MTrimBar> partDescriptorTrimBars() {
+		return EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR__TRIM_BARS);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static IListProperty<MPerspective, MTrimBar> perspectiveTrimBars() {
+		return EMFProperties.list(AdvancedPackageImpl.Literals.PERSPECTIVE__TRIM_BARS);
+	}
+
 	@SuppressWarnings("unchecked")
 	public static IListProperty<MWindow, MWindow> windowWindows() {
 		return EMFProperties
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 33ff515701..35e94fbc29 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -262,6 +262,7 @@ public class Messages {
 	public String PartDescriptorEditor_Menus;
 	public String PartDescriptorEditor_Handlers;
 	public String PartDescriptorEditor_ContainerData;
+	public String PartDescriptorEditor_TrimBars;
 
 	public String PartEditor_Label;
 	public String PartEditor_Description;
@@ -278,6 +279,7 @@ public class Messages {
 	public String PartEditor_ToolBar;
 	public String PartEditor_BindingContexts;
 	public String PartEditor_Controls;
+	public String PartEditor_TrimBars;
 
 	public String PartSashContainerEditor_Label;
 	public String PartSashContainerEditor_Description;
@@ -309,6 +311,7 @@ public class Messages {
 	public String PerspectiveEditor_Tooltip;
 	public String PerspectiveEditor_IconURI;
 	public String PerspectiveEditor_Controls;
+	public String PerspectiveEditor_TrimBars;
 	public String PerspectiveEditor_AddPartSashContainer;
 	public String PerspectiveEditor_AddPartStack;
 	public String PerspectiveEditor_AddPart;
@@ -574,8 +577,19 @@ public class Messages {
 
 	public String VWindowTrimEditor_TreeLabel;
 	public String VWindowTrimEditor_TreeLabelDescription;
-	public String VWindowTrimEditor_Controls;
-	public String VWindowTrimEditor_AddWindowTrim;
+	public String VWindowTrimEditor_AddTrim;
+
+	public String VPartTrimEditor_TreeLabel;
+	public String VPartTrimEditor_TreeLabelDescription;
+	public String VPartTrimEditor_AddTrim;
+
+	public String VPartDescriptorTrimEditor_TreeLabel;
+	public String VPartDescriptorTrimEditor_TreeLabelDescription;
+	public String VPartDescriptorTrimEditor_AddTrim;
+
+	public String VPerspectiveTrimEditor_TreeLabel;
+	public String VPerspectiveTrimEditor_TreeLabelDescription;
+	public String VPerspectiveTrimEditor_AddTrim;
 
 	public String AbstractIconDialog_IconName;
 	public String AbstractIconDialog_all_workspace_bundles;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 6ea3761a8f..d3b235a3b0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -223,6 +223,7 @@ PartDescriptorEditor_Properties=Properties
 PartDescriptorEditor_Menus=Menus
 PartDescriptorEditor_Handlers=Handlers
 PartDescriptorEditor_ContainerData=Container &Data\:
+PartDescriptorEditor_TrimBars=Trim Bars
 
 PartEditor_Label=Part
 PartEditor_Description=Part 
@@ -239,6 +240,7 @@ PartEditor_ContainerData=Container &Data\:
 PartEditor_ToolBar=ToolBar
 PartEditor_BindingContexts=Binding Contexts
 PartEditor_Controls=Controls
+PartEditor_TrimBars=Trim Bars
 
 PartSashContainerEditor_Label=Part Sash Container
 PartSashContainerEditor_Description=Sash
@@ -275,6 +277,7 @@ PerspectiveEditor_SelectedElement=&Selected Element\:
 PerspectiveEditor_Tooltip=T&ooltip\:
 PerspectiveEditor_IconURI=&Icon URI\:
 PerspectiveEditor_Controls=Controls
+PerspectiveEditor_TrimBars=Trim Bars
 PerspectiveEditor_AddPartSashContainer=Part Sash Container
 PerspectiveEditor_AddPartStack=Part Stack
 PerspectiveEditor_AddPart=Part
@@ -433,8 +436,8 @@ ToolItemEditor_Selected=Selected
 ToolItemEditor_NoExpression=<None>
 ToolItemEditor_Menu=Menu
 
-TrimBarEditor_TreeLabel=Window Trim
-TrimBarEditor_TreeLabelDescription=Window Trim
+TrimBarEditor_TreeLabel=Trim Bar
+TrimBarEditor_TreeLabelDescription=Trim Bar
 TrimBarEditor_Side=Side
 TrimBarEditor_Controls=Controls
 TrimBarEditor_AddToolBar=Toolbar
@@ -446,7 +449,7 @@ TrimContributionEditor_ParentId=Parent-ID
 TrimContributionEditor_Position=&Position\:
 TrimContributionEditor_Controls=Controls
 
-TrimmedWindowEditor_TrimBars=TrimBars
+TrimmedWindowEditor_TrimBars=Trim Bars
 TrimmedWindowEditor_TreeLabel=Trimmed Window
 
 WindowEditor_AddMainMenu=Main Menu
@@ -550,8 +553,20 @@ VWindowSharedElementsEditor_AddPartStack=Part Stack
 
 VWindowTrimEditor_TreeLabel=Window Trims
 VWindowTrimEditor_TreeLabelDescription=Window Trims
-VWindowTrimEditor_Controls=Controls
-VWindowTrimEditor_AddWindowTrim=Window Trim
+VWindowTrimEditor_AddTrim=Window Trim
+
+VPartTrimEditor_TreeLabel=Part Trims
+VPartTrimEditor_TreeLabelDescription=Part Trims
+VPartTrimEditor_AddTrim=Part Trim
+
+VPartDescriptorTrimEditor_TreeLabel=Part Trims
+VPartDescriptorTrimEditor_TreeLabelDescription=Part Trims
+VPartDescriptorTrimEditor_AddTrim=Part Trim
+
+VPerspectiveTrimEditor_TreeLabel=Perspective Trims
+VPerspectiveTrimEditor_TreeLabelDescription=Perspective Trims
+VPerspectiveTrimEditor_Controls=Controls
+VPerspectiveTrimEditor_AddTrim=Perspective Trim
 
 AbstractIconDialog_IconName=IconName
 AbstractIconDialog_Type_To_Start_Search=Type to start search
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index bdea5b438c..d9691443b1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -133,8 +133,11 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VModelImportsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartDescriptor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartDescriptorMenuEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartDescriptorTrimEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartMenuEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPartTrimEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPerspectiveControlEditor;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPerspectiveTrimEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VPerspectiveWindowsEditor;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VRootBindingContexts;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.virtual.VSnippetsEditor;
@@ -260,8 +263,10 @@ public class ModelEditor implements IGotoObject {
 	public static final String VIRTUAL_PERSPECTIVE_WINDOWS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_PERSPECTIVE_WINDOWS"; //$NON-NLS-1$
 	public static final String VIRTUAL_WINDOW_WINDOWS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_WINDOW_WINDOWS"; //$NON-NLS-1$
 	public static final String VIRTUAL_WINDOW_CONTROLS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_WINDOW_CONTROLS"; //$NON-NLS-1$
+	public static final String VIRTUAL_PART_TRIMS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_PART_TRIMS"; //$NON-NLS-1$
 	public static final String VIRTUAL_PART_DESCRIPTORS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_PART_DESCRIPTORS"; //$NON-NLS-1$
 	public static final String VIRTUAL_PARTDESCRIPTOR_MENU = "org.eclipse.e4.tools.emf.ui.VIRTUAL_PARTDESCRIPTOR_MENU"; //$NON-NLS-1$
+	public static final String VIRTUAL_PARTDESCRIPTOR_TRIMS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_PART_DESCRIPTOR_TRIMS"; //$NON-NLS-1$
 	public static final String VIRTUAL_TRIMMED_WINDOW_TRIMS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_TRIMMED_WINDOW_TRIMS"; //$NON-NLS-1$
 	public static final String VIRTUAL_ADDONS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_ADDONS"; //$NON-NLS-1$
 	public static final String VIRTUAL_MENU_CONTRIBUTIONS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_MENU_CONTRIBUTIONS"; //$NON-NLS-1$
@@ -277,6 +282,7 @@ public class ModelEditor implements IGotoObject {
 	public static final String VIRTUAL_MENUELEMENTS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_MENUELEMENTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_ROOT_CONTEXTS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_ROOT_CONTEXTS"; //$NON-NLS-1$
 	public static final String VIRTUAL_PERSPECTIVE_CONTROLS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_PERSPECTIVE_CONTROLS"; //$NON-NLS-1$
+	public static final String VIRTUAL_PERSPECTIVE_TRIMS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_PERSPECTIVE_TRIMS"; //$NON-NLS-1$
 	public static final String VIRTUAL_SNIPPETS = "org.eclipse.e4.tools.emf.ui.VIRTUAL_SNIPPETS"; //$NON-NLS-1$
 
 	public static final int TAB_FORM = 0;
@@ -284,6 +290,7 @@ public class ModelEditor implements IGotoObject {
 	public static final int TAB_LIST = 2;
 
 
+
 	/**
 	 * A map with key = eClass name or virtual key, value is an
 	 * AbstractComponentEditor instance This map is filled on the fly when getting
@@ -1143,6 +1150,7 @@ private void registerContributedVirtualEditors() {
 
 	private void registerVirtualEditors() {
 		registerEditor(VIRTUAL_PART_MENU, VPartMenuEditor.class);
+		registerEditor(VIRTUAL_PART_TRIMS, VPartTrimEditor.class);
 		registerEditor(VIRTUAL_HANDLER, VHandlerEditor.class);
 		registerEditor(VIRTUAL_CONTROLS, VControlsEditor.class);
 		registerEditor(VIRTUAL_BINDING_TABLE, VBindingTableEditor.class);
@@ -1154,6 +1162,7 @@ private void registerVirtualEditors() {
 		registerEditor(VIRTUAL_WINDOW_SNIPPETS, VSnippetsEditor.class);
 		registerEditor(VIRTUAL_PART_DESCRIPTORS, VPartDescriptor.class);
 		registerEditor(VIRTUAL_PARTDESCRIPTOR_MENU, VPartDescriptorMenuEditor.class);
+		registerEditor(VIRTUAL_PARTDESCRIPTOR_TRIMS, VPartDescriptorTrimEditor.class);
 		registerEditor(VIRTUAL_TRIMMED_WINDOW_TRIMS, VWindowTrimEditor.class);
 		registerEditor(VIRTUAL_ADDONS, VApplicationAddons.class);
 		registerEditor(VIRTUAL_MENU_CONTRIBUTIONS, VMenuContributionsEditor.class);
@@ -1166,6 +1175,7 @@ private void registerVirtualEditors() {
 		registerEditor(VIRTUAL_PARAMETERS, VItemParametersEditor.class);
 		registerEditor(VIRTUAL_ROOT_CONTEXTS, VRootBindingContexts.class);
 		registerEditor(VIRTUAL_PERSPECTIVE_CONTROLS, VPerspectiveControlEditor.class);
+		registerEditor(VIRTUAL_PERSPECTIVE_TRIMS, VPerspectiveTrimEditor.class);
 		registerEditor(VIRTUAL_SNIPPETS, VSnippetsEditor.class);
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java
index 67e42cc88d..810f62c557 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java
@@ -319,6 +319,8 @@ public IObservableList<?> getChildList(Object element) {
 				Messages.PartEditor_Menus));
 		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_HANDLER, E4Properties.handlers(), part,
 				Messages.PartEditor_Handlers));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_PART_TRIMS, E4Properties.partTrimBars(), part,
+				Messages.PartEditor_TrimBars));
 
 		if (part.getToolbar() != null) {
 			list.add(0, part.getToolbar());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index f63f1b66b7..5087884cc2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -341,22 +341,24 @@ private void removeToolBar() {
 	@Override
 	public IObservableList<?> getChildList(final Object element) {
 		final WritableList<Object> list = new WritableList<>();
-		final MPartDescriptor window = (MPartDescriptor) element;
+		final MPartDescriptor partDescriptor = (MPartDescriptor) element;
 
 		if (getEditor().isModelFragment() && Util.isImport((EObject) element)) {
 			return list;
 		}
 
-		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_PARTDESCRIPTOR_MENU, E4Properties.partDescriptorMenus(), window,
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_PARTDESCRIPTOR_MENU, E4Properties.partDescriptorMenus(), partDescriptor,
 				Messages.PartDescriptorEditor_Menus));
-		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_HANDLER, E4Properties.handlers(), window,
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_HANDLER, E4Properties.handlers(), partDescriptor,
 				Messages.PartDescriptorEditor_Handlers));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_PARTDESCRIPTOR_TRIMS, E4Properties.partDescriptorTrimBars(),
+				partDescriptor, Messages.PartDescriptorEditor_TrimBars));
 
-		if (window.getToolbar() != null) {
-			list.add(0, window.getToolbar());
+		if (partDescriptor.getToolbar() != null) {
+			list.add(0, partDescriptor.getToolbar());
 		}
 
-		E4Properties.partDescriptorToolbar().observe(window).addValueChangeListener(event -> {
+		E4Properties.partDescriptorToolbar().observe(partDescriptor).addValueChangeListener(event -> {
 			if (event.diff.getOldValue() != null) {
 				list.remove(event.diff.getOldValue());
 				if (getMaster().getValue() == element && !createRemoveToolBar.isDisposed()) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index b86c2b6f3c..e873730e14 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -305,6 +305,8 @@ public IObservableList<?> getChildList(Object element) {
 				Messages.WindowEditor_Windows));
 		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_PERSPECTIVE_CONTROLS, E4Properties.children(), perspective,
 				Messages.PerspectiveEditor_Controls));
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_PERSPECTIVE_TRIMS, E4Properties.perspectiveTrimBars(),
+				perspective, Messages.PerspectiveEditor_TrimBars));
 
 		return list;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
index 65b3bb98f2..29e898f12e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
@@ -37,7 +37,7 @@ public IObservableList<Object> getChildList(Object element) {
 			return list;
 		}
 
-		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_TRIMMED_WINDOW_TRIMS, E4Properties.trimBars(),
+		list.add(new VirtualEntry<>(ModelEditor.VIRTUAL_TRIMMED_WINDOW_TRIMS, E4Properties.windowTrimBars(),
 				(MTrimmedWindow) element, Messages.TrimmedWindowEditor_TrimBars));
 		return list;
 	}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/AbstractVTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/AbstractVTrimEditor.java
new file mode 100644
index 0000000000..e1e63f45dc
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/AbstractVTrimEditor.java
@@ -0,0 +1,136 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Airbus Defence and Space GmbH and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Benedikt Kuntz <benedikt.kuntz@airbus.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
+import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
+import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+
+public abstract class AbstractVTrimEditor<M> extends AbstractComponentEditor<M> {
+	private Composite composite;
+	private EMFDataBindingContext context;
+	private TableViewer viewer;
+	private final List<Action> actions = new ArrayList<>();
+
+	protected abstract String getActionLabel();
+
+	protected abstract List<?> getTrimBars(Object master);
+
+	protected abstract EReference getTrimBarFeature();
+
+	@PostConstruct
+	void init() {
+		actions.add(new Action(getActionLabel(), createImageDescriptor(ResourceProvider.IMG_WindowTrim)) {
+			@Override
+			public void run() {
+				handleAdd();
+			}
+		});
+	}
+
+	@Override
+	public Composite doGetEditor(Composite parent, Object object) {
+		if (composite == null) {
+			context = new EMFDataBindingContext();
+			composite = createForm(parent, context, getMaster());
+		}
+		@SuppressWarnings("unchecked")
+		final VirtualEntry<M, ?> o = (VirtualEntry<M, ?>) object;
+		viewer.setInput(o.getList());
+		getMaster().setValue(o.getOriginalParent());
+		return composite;
+	}
+
+	private Composite createForm(Composite parent, EMFDataBindingContext context,
+			WritableValue<M> master) {
+		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
+
+		final CTabItem item = new CTabItem(folder, SWT.NONE);
+		item.setText(Messages.ModelTooling_Common_TabDefault);
+
+		parent = createScrollableContainer(folder);
+		item.setControl(parent.getParent());
+
+		{
+			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
+					Arrays.asList(PickListFeatures.NO_PICKER, PickListFeatures.NO_GROUP), this,
+					getTrimBarFeature()) {
+				@Override
+				protected void addPressed() {
+					handleAdd();
+				}
+
+				@Override
+				protected List<?> getContainerChildren(Object master) {
+					return getTrimBars(master);
+				}
+			};
+			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+			viewer = pickList.getList();
+		}
+
+		folder.setSelection(0);
+
+		return folder;
+	}
+
+	@Override
+	public IObservableList<?> getChildList(Object element) {
+		return null;
+	}
+
+	protected void handleAdd() {
+		final MTrimBar handler = MBasicFactory.INSTANCE.createTrimBar();
+		setElementId(handler);
+
+		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
+				getTrimBarFeature(), handler);
+
+		if (cmd.canExecute()) {
+			getEditingDomain().getCommandStack().execute(cmd);
+			getEditor().setSelection(handler);
+		}
+	}
+
+	@Override
+	public List<Action> getActions(Object element) {
+		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
+		l.addAll(actions);
+		return l;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorTrimEditor.java
new file mode 100644
index 0000000000..d2b42e30cd
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorTrimEditor.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Airbus Defence and Space GmbH and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Benedikt Kuntz <benedikt.kuntz@airbus.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import java.util.List;
+
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
+import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.Literals;
+import org.eclipse.emf.ecore.EReference;
+
+public class VPartDescriptorTrimEditor extends AbstractVTrimEditor<MPartDescriptor> {
+
+	@Override
+	protected String getActionLabel() {
+		return Messages.VPartDescriptorTrimEditor_AddTrim;
+	}
+
+	@Override
+	protected List<?> getTrimBars(Object master) {
+		if (master instanceof MPartDescriptor) {
+			return ((MPartDescriptor) master).getTrimBars();
+		}
+		return null;
+	}
+
+	@Override
+	protected EReference getTrimBarFeature() {
+		return Literals.PART_DESCRIPTOR__TRIM_BARS;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.VPartDescriptorTrimEditor_TreeLabel;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return Messages.VPartDescriptorTrimEditor_TreeLabelDescription;
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartTrimEditor.java
new file mode 100644
index 0000000000..8dc6f2d61e
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartTrimEditor.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Airbus Defence and Space GmbH and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Benedikt Kuntz <benedikt.kuntz@airbus.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import java.util.List;
+
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals;
+import org.eclipse.emf.ecore.EReference;
+
+public class VPartTrimEditor extends AbstractVTrimEditor<MPart> {
+
+	@Override
+	protected String getActionLabel() {
+		return Messages.VPartTrimEditor_AddTrim;
+	}
+
+	@Override
+	protected List<?> getTrimBars(Object master) {
+		if (master instanceof MPart) {
+			return ((MPart) master).getTrimBars();
+		}
+		return null;
+	}
+
+	@Override
+	protected EReference getTrimBarFeature() {
+		return Literals.PART__TRIM_BARS;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.VPartTrimEditor_TreeLabel;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return Messages.VPartTrimEditor_TreeLabelDescription;
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveTrimEditor.java
new file mode 100644
index 0000000000..4d32c292bc
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveTrimEditor.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Airbus Defence and Space GmbH and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Benedikt Kuntz <benedikt.kuntz@airbus.com> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
+
+import java.util.List;
+
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl.Literals;
+import org.eclipse.emf.ecore.EReference;
+
+public class VPerspectiveTrimEditor extends AbstractVTrimEditor<MPerspective> {
+
+	@Override
+	protected String getActionLabel() {
+		return Messages.VPerspectiveTrimEditor_AddTrim;
+	}
+
+	@Override
+	protected List<?> getTrimBars(Object master) {
+		if (master instanceof MPerspective) {
+			return ((MPerspective) master).getTrimBars();
+		}
+		return null;
+	}
+
+	@Override
+	protected EReference getTrimBarFeature() {
+		return Literals.PERSPECTIVE__TRIM_BARS;
+	}
+
+	@Override
+	public String getLabel(Object element) {
+		return Messages.VPerspectiveTrimEditor_TreeLabel;
+	}
+
+	@Override
+	public String getDetailLabel(Object element) {
+		return null;
+	}
+
+	@Override
+	public String getDescription(Object element) {
+		return Messages.VPerspectiveTrimEditor_TreeLabelDescription;
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index eb5b43b3ab..bead05066e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -142,8 +142,8 @@ public void run() {
 				handleAdd(BasicPackageImpl.Literals.WINDOW);
 			}
 		});
-		actions.add(new Action(Messages.VWindowTrimEditor_AddWindowTrim,
-				createImageDescriptor(ResourceProvider.IMG_WindowTrim)) {
+		actions.add(new Action(Messages.VWindowTrimEditor_AddTrim,
+		    createImageDescriptor(ResourceProvider.IMG_WindowTrim)) {
 			@Override
 			public void run() {
 				handleAdd(BasicPackageImpl.Literals.TRIM_BAR);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
index 2b1994b248..0435f1fd69 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
@@ -14,144 +14,45 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
-import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
-import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
-import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
-import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
-import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
-import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
 import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-
-public class VWindowTrimEditor extends AbstractComponentEditor<MTrimmedWindow> {
-	private Composite composite;
-	private EMFDataBindingContext context;
-	private TableViewer viewer;
-	private final List<Action> actions = new ArrayList<>();
-
-	@Inject
-	public VWindowTrimEditor() {
-		super();
-	}
+import org.eclipse.emf.ecore.EReference;
 
-	@PostConstruct
-	void init() {
-		actions.add(new Action(Messages.VWindowTrimEditor_AddWindowTrim,
-				createImageDescriptor(ResourceProvider.IMG_WindowTrim)) {
-			@Override
-			public void run() {
-				handleAdd();
-			}
-		});
-	}
+public class VWindowTrimEditor extends AbstractVTrimEditor<MTrimmedWindow> {
 
 	@Override
-	public String getLabel(Object element) {
-		return Messages.VWindowTrimEditor_TreeLabel;
+	protected String getActionLabel() {
+		return Messages.VWindowTrimEditor_AddTrim;
 	}
 
 	@Override
-	public String getDetailLabel(Object element) {
+	protected List<?> getTrimBars(Object master) {
+		if (master instanceof MTrimmedWindow) {
+			return ((MTrimmedWindow) master).getTrimBars();
+		}
 		return null;
 	}
 
 	@Override
-	public String getDescription(Object element) {
-		return Messages.VWindowTrimEditor_TreeLabelDescription;
+	protected EReference getTrimBarFeature() {
+		return BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS;
 	}
 
 	@Override
-	public Composite doGetEditor(Composite parent, Object object) {
-		if (composite == null) {
-			context = new EMFDataBindingContext();
-			composite = createForm(parent, context, getMaster());
-		}
-		@SuppressWarnings("unchecked")
-		final VirtualEntry<MTrimmedWindow, ?> o = (VirtualEntry<MTrimmedWindow, ?>) object;
-		viewer.setInput(o.getList());
-		getMaster().setValue(o.getOriginalParent());
-		return composite;
-	}
-
-	private Composite createForm(Composite parent, EMFDataBindingContext context,
-			WritableValue<MTrimmedWindow> master) {
-		final CTabFolder folder = new CTabFolder(parent, SWT.BOTTOM);
-
-		final CTabItem item = new CTabItem(folder, SWT.NONE);
-		item.setText(Messages.ModelTooling_Common_TabDefault);
-
-		parent = createScrollableContainer(folder);
-		item.setControl(parent.getParent());
-
-		{
-			final AbstractPickList pickList = new E4PickList(parent, SWT.NONE,
-					Arrays.asList(PickListFeatures.NO_PICKER, PickListFeatures.NO_GROUP), this,
-					BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS) {
-				@Override
-				protected void addPressed() {
-					handleAdd();
-				}
-
-				@Override
-				protected List<?> getContainerChildren(Object master) {
-					if (master instanceof MTrimmedWindow) {
-						return ((MTrimmedWindow) master).getTrimBars();
-					}
-					return null;
-				}
-			};
-			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
-			viewer = pickList.getList();
-		}
-
-		folder.setSelection(0);
-
-		return folder;
+	public String getLabel(Object element) {
+		return Messages.VWindowTrimEditor_TreeLabel;
 	}
 
 	@Override
-	public IObservableList<?> getChildList(Object element) {
+	public String getDetailLabel(Object element) {
 		return null;
 	}
 
-	protected void handleAdd() {
-		final MTrimBar handler = MBasicFactory.INSTANCE.createTrimBar();
-		setElementId(handler);
-
-		final Command cmd = AddCommand.create(getEditingDomain(), getMaster().getValue(),
-				BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS, handler);
-
-		if (cmd.canExecute()) {
-			getEditingDomain().getCommandStack().execute(cmd);
-			getEditor().setSelection(handler);
-		}
-	}
-
 	@Override
-	public List<Action> getActions(Object element) {
-		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
-		l.addAll(actions);
-		return l;
+	public String getDescription(Object element) {
+		return Messages.VWindowTrimEditor_TreeLabelDescription;
 	}
+
 }
\ No newline at end of file

From e625ef6eda8d96fd7ec5ac584830a0d38cf3dfee Mon Sep 17 00:00:00 2001
From: Carsten Hammer <carsten.hammer@t-online.de>
Date: Tue, 26 Nov 2019 23:27:12 +0100
Subject: [PATCH 1148/1286] Use .isEmpty() instead of .size()==0 or .equals("")

Change-Id: If25d5f5809ad754e7609d8efc34ba6e6a4dea0b4
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
---
 .../org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
index ebbc4e3064..b3aa5422cd 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
@@ -70,7 +70,7 @@ private static FrameworkLogEntry getLog(IStatus status) {
 			}
 		}
 
-		final FrameworkLogEntry[] children = childlist.size() == 0 ? null
+		final FrameworkLogEntry[] children = childlist.isEmpty() ? null
 			: childlist.toArray(new FrameworkLogEntry[childlist.size()]);
 
 		return new FrameworkLogEntry(status.getPlugin(), status.getSeverity(), status.getCode(),

From 4c2d2ae93d327de9d5563081f17d6e263e190309 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 11 Feb 2020 17:19:14 +0100
Subject: [PATCH 1149/1286] Use method references in ui.tools

Change-Id: I8adce73863fdfdb0ee9e9d42e528f4ea8238b9e1
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../common/properties/ProjectOSGiTranslationProvider.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
index c82b2b1f43..0648dbb990 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
@@ -66,7 +66,7 @@ public ProjectOSGiTranslationProvider(IProject project, String locale) {
 		this.project.getWorkspace().addResourceChangeListener(event -> {
 			if (event.getType() == IResourceChangeEvent.POST_CHANGE) {
 				try {
-					event.getDelta().accept(delta -> ProjectOSGiTranslationProvider.this.visit(delta));
+					event.getDelta().accept(ProjectOSGiTranslationProvider.this::visit);
 				} catch (final CoreException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();

From 910e79ed243ed3784dbddc5f0892196f08097bd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Sat, 15 Feb 2020 06:09:40 +0100
Subject: [PATCH 1150/1286] Bug 559584 - Replace logging via
 ToolsServicesActivator with other means +add missing header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I215a02c76ed26cdb9cdbf9291610ed73910b7284
Signed-off-by: Christoph Läubrich <laeubi@laeubi-soft.de>
---
 .../META-INF/MANIFEST.MF                      |  1 -
 .../services/ToolsServicesActivator.java      | 50 -------------------
 .../services/ToolsServicesConstants.java      | 18 +++++++
 .../tools/services/impl/ResourceService.java  |  8 +--
 4 files changed, 22 insertions(+), 55 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java
 create mode 100644 bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesConstants.java

diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 628c5eb5fd..69f41a830d 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -16,5 +16,4 @@ Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.x
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.2.0",
  javax.inject;version="1.0.0"
-Bundle-Activator: org.eclipse.e4.tools.services.ToolsServicesActivator
 Automatic-Module-Name: org.eclipse.e4.tools.services
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java
deleted file mode 100644
index 706d15d700..0000000000
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.e4.tools.services;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.log.LogService;
-import org.osgi.util.tracker.ServiceTracker;
-
-public class ToolsServicesActivator implements BundleActivator {
-
-	static private ToolsServicesActivator defaultInstance;
-	private BundleContext bundleContext;
-	private ServiceTracker<LogService, LogService> logTracker;
-	public static final String PLUGIN_ID = "org.eclipse.e4.tools.services"; //$NON-NLS-1$
-
-	public ToolsServicesActivator() {
-		defaultInstance = this;
-	}
-
-	public static ToolsServicesActivator getDefault() {
-		return defaultInstance;
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		bundleContext = context;
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		if (logTracker != null) {
-			logTracker.close();
-			logTracker = null;
-		}
-		bundleContext = null;
-	}
-
-
-	public LogService getLogService() {
-		if (logTracker == null) {
-			if (bundleContext == null) {
-				return null;
-			}
-			logTracker = new ServiceTracker<>(bundleContext,
-				LogService.class, null);
-			logTracker.open();
-		}
-		return logTracker.getService();
-	}
-
-}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesConstants.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesConstants.java
new file mode 100644
index 0000000000..14ee671d30
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesConstants.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2020 Dirk Fauth and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the 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:
+ *     Dirk Fauth <dirk.fauth@gmail.com> - initial API and implementation
+ *     Christoph Läubrich - remove unused code
+ ******************************************************************************/
+package org.eclipse.e4.tools.services;
+
+public interface ToolsServicesConstants {
+
+	public static final String PLUGIN_ID = "org.eclipse.e4.tools.services"; //$NON-NLS-1$
+
+}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
index b5dc3e4906..81f9f777eb 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
@@ -28,7 +28,7 @@
 import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.tools.services.IResourceProviderService;
 import org.eclipse.e4.tools.services.IResourceService;
-import org.eclipse.e4.tools.services.ToolsServicesActivator;
+import org.eclipse.e4.tools.services.ToolsServicesConstants;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
@@ -107,7 +107,7 @@ public Image getImage(String key) throws CoreException {
 			if (resourceService == null) {
 				throw new CoreException(
 						new Status(IStatus.ERROR,
-								ToolsServicesActivator.PLUGIN_ID,
+								ToolsServicesConstants.PLUGIN_ID,
 								Messages.ResourceService_PoolDisposed));
 			}
 			IPooledResource<Image> image = null;
@@ -130,7 +130,7 @@ public Font getFont(String key) throws CoreException {
 			if (resourceService == null) {
 				throw new CoreException(
 						new Status(IStatus.ERROR,
-								ToolsServicesActivator.PLUGIN_ID,
+								ToolsServicesConstants.PLUGIN_ID,
 								Messages.ResourceService_PoolDisposed));
 			}
 
@@ -152,7 +152,7 @@ public Color getColor(String key) throws CoreException {
 			if (resourceService == null) {
 				throw new CoreException(
 						new Status(IStatus.ERROR,
-								ToolsServicesActivator.PLUGIN_ID,
+								ToolsServicesConstants.PLUGIN_ID,
 								Messages.ResourceService_PoolDisposed));
 			}
 			IPooledResource<Color> color = null;

From f2880385b3aa23951f07088431c00de87d3d22a3 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 17 Feb 2020 12:53:14 +0100
Subject: [PATCH 1151/1286] 4.15 update of org.eclipse.e4.tools.emf.editor3x

Required for https://git.eclipse.org/r/157816

Change-Id: I77342a64e8ea0339706c134b1c85cc47b91855eb
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index e69f166eb2..304306f9f6 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 4.7.400.qualifier
+Bundle-Version: 4.7.500.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 96a597263a..6a006f27f7 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.editor3x</artifactId>
-  <version>4.7.400-SNAPSHOT</version>
+  <version>4.7.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>

From ddf50be4ea3dcddad69658869fb9d0e344cd1d6f Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 17 Feb 2020 12:41:10 +0100
Subject: [PATCH 1152/1286] Remove unnecessary override and use super directly

Avoid overriding and implementing the same method as super as this blows
up the code.

Change-Id: I4953bed1e4ca0344ea52a9abe0066b49c3866a98
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../e4/tools/emf/editor3x/ModelEditorPreferencePage.java     | 5 -----
 .../src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
index 4512b79ecd..f8e0a3ae34 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
@@ -176,9 +176,4 @@ protected void performDefaults() {
 		fRememberFilters.loadDefault();
 		super.performDefaults();
 	}
-
-	@Override
-	public void dispose() {
-		super.dispose();
-	}
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
index 836b0a5627..62ccfad4ac 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
@@ -103,11 +103,6 @@ protected Composite createToolTipContentArea(Event event, Composite parent) {
 
 		return parent;}
 
-	@Override
-	protected void afterHideToolTip(Event event) {
-		super.afterHideToolTip(event);
-	}
-
 	private String getImageURI() {
 		final MUILabel part = (MUILabel) editor.getMaster().getValue();
 		return part.getIconURI();

From 0ea1785eb10c62c79b2423d10daee14e1108a25f Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Fri, 6 Mar 2020 19:41:06 +0000
Subject: [PATCH 1153/1286] Bug 560872 - POM and product version change for
 4.16 release

Change-Id: Ic5c6c65a0bad6dbf2805de8672e0df81f2b88cfa
Signed-off-by: Mat Booth <mat.booth@redhat.com>
---
 bundles/org.eclipse.e4.tools.compat/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml     | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml          | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                   | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 4 ++--
 tests/org.eclipse.e4.tools.test/pom.xml                | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index f77ad986fa..7f45516952 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.15.0-SNAPSHOT</version>
+    <version>4.16.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 6a006f27f7..9881d95c7b 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.15.0-SNAPSHOT</version>
+    <version>4.16.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 98162f7a24..b1bc999563 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.15.0-SNAPSHOT</version>
+    <version>4.16.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 34ac6c12ab..1cfb7873a9 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.15.0-SNAPSHOT</version>
+    <version>4.16.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index e0c173e11c..d2da9100f9 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.15.0-SNAPSHOT</version>
+    <version>4.16.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index c8fe67784a..33919d8987 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.15.0-SNAPSHOT</version>
+    <version>4.16.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 96d73c4abf..ca788e1faa 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.15.0.qualifier"
+      version="4.16.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 054410dd32..3f8decebbd 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.15.0-SNAPSHOT</version>
+    <version>4.16.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>4.15.0-SNAPSHOT</version>
+  <version>4.16.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index 43b75772b6..ca58796e93 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.15.0-SNAPSHOT</version>
+		<version>4.16.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From 44b4ac09eed0c6bea4a05a7d229b7d172758e10a Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Thu, 16 Apr 2020 09:39:26 +0300
Subject: [PATCH 1154/1286] Bug 562167 - Comparator errors in I20200415-0620

Change-Id: Ie99321af055862cd37d7ffc33429fecef4b130d4
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF     | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt | 3 ++-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml                  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index d79f44e4ff..0948fd3422 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.6.700.qualifier
+Bundle-Version: 4.6.800.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
index d973feee32..34a6f3e1e8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
+++ b/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
@@ -2,4 +2,5 @@
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
 Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
 Bug 491534 - comparator error in org.eclipse.e4.tools.emf.ui
-Bug 534597 - Unanticipated comparator errors in I20180511-2000
\ No newline at end of file
+Bug 534597 - Unanticipated comparator errors in I20180511-2000
+Bug 562167 - Comparator errors in I20200415-0620
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index b1bc999563..f675100f6b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.6.700-SNAPSHOT</version>
+  <version>4.6.800-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>

From 74772eb5635ca8c3e0fb0bb33845a815a4c42a48 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Tue, 12 May 2020 16:31:40 +0300
Subject: [PATCH 1155/1286] Use List.sort directly.

Rather than Collections.sort(List)

Change-Id: I466142d98e161e5d5fe776cbbec92309b1d070c8
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../.settings/org.eclipse.jdt.ui.prefs               | 12 +++++++++++-
 .../common/component/StringModelFragment.java        |  4 ++--
 .../dialogs/FilteredContributionDialog.java          |  9 ++++-----
 .../ui/internal/common/component/tabs/ListTab.java   |  5 ++---
 .../common/component/tabs/TableViewerUtil.java       |  3 +--
 .../common/component/virtual/VSnippetsEditor.java    |  5 ++---
 .../component/virtual/VWindowControlEditor.java      |  3 +--
 .../internal/common/properties/ExportIdsHandler.java |  3 +--
 8 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
index 09aff09b4b..f05611fe18 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -85,15 +85,19 @@ sp_cleanup.correct_indentation=true
 sp_cleanup.format_source_code=true
 sp_cleanup.format_source_code_changes_only=true
 sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.lazy_logical_operator=false
 sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
 sp_cleanup.make_type_abstract_if_missing_method=false
 sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.merge_conditional_blocks=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.number_suffix=false
 sp_cleanup.on_save_use_additional_actions=true
 sp_cleanup.organize_imports=true
+sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
@@ -101,11 +105,12 @@ sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
-sp_cleanup.remove_redundant_semicolons=false
+sp_cleanup.remove_redundant_semicolons=true
 sp_cleanup.remove_redundant_type_arguments=false
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_array_creation=true
 sp_cleanup.remove_unnecessary_casts=false
 sp_cleanup.remove_unnecessary_nls_tags=true
 sp_cleanup.remove_unused_imports=true
@@ -114,11 +119,14 @@ sp_cleanup.remove_unused_private_fields=true
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.simplify_lambda_expression_and_method_ref=false
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
 sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_autoboxing=false
 sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
 sp_cleanup.use_this_for_non_static_field_access=false
@@ -126,3 +134,5 @@ sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
 sp_cleanup.use_this_for_non_static_method_access=false
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
 sp_cleanup.use_type_arguments=false
+sp_cleanup.use_unboxing=false
+sp_cleanup.use_var=false
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index b5d33b7eed..a807e846a7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -494,7 +494,7 @@ public IContentProposal[] getProposals(String cont, int position) {
 				}
 			}
 
-			Collections.sort(contents, (o1, o2) -> o1[0].compareTo(o2[0]));
+			contents.sort((o1, o2) -> o1[0].compareTo(o2[0]));
 
 			IContentProposal[] contentProposals = new IContentProposal[contents.size()];
 			for (int i = 0; i < contents.size(); i++) {
@@ -570,7 +570,7 @@ protected void handleAdd(EClass eClass, boolean separator) {
 	public List<Action> getActions(Object element) {
 		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
-		Collections.sort(l, (o1, o2) -> o1.getText().compareTo(o2.getText()));
+		l.sort((o1, o2) -> o1.getText().compareTo(o2.getText()));
 		return l;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index d884ba6648..82ff505e69 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2017 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2020 TwelveTone LLC and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -24,7 +24,6 @@
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
@@ -670,7 +669,7 @@ protected void showBundleFilter() {
 		}
 
 		final ArrayList<String> sorted = new ArrayList<>(bundleIds);
-		Collections.sort(sorted);
+		sorted.sort(null);
 
 		final TitleAreaFilterDialog dlg = new TitleAreaFilterDialog(getShell(), new ColumnLabelProvider()) {
 			@Override
@@ -710,7 +709,7 @@ protected void showPackageFilter() {
 		}
 
 		final ArrayList<String> sorted = new ArrayList<>(packages);
-		Collections.sort(sorted);
+		sorted.sort(null);
 
 		final TitleAreaFilterDialog dlg = new TitleAreaFilterDialog(getShell(), new ColumnLabelProvider()) {
 			@Override
@@ -772,7 +771,7 @@ protected void showLocationFilter() {
 		}
 
 		final ArrayList<String> sorted = new ArrayList<>(parentLocations);
-		Collections.sort(sorted);
+		sorted.sort(null);
 
 		final TitleAreaFilterDialog dlg = new TitleAreaFilterDialog(getShell(), new ColumnLabelProvider()) {
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index 0f499ffa18..1fd2ebd253 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -19,7 +19,6 @@
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -725,7 +724,7 @@ private TitleAreaFilterDialogWithEmptyOptions createEObjectAttributePicker(final
 			}
 		}
 		final ArrayList<String> sorted = new ArrayList<>(set);
-		Collections.sort(sorted);
+		sorted.sort(null);
 
 		// Select Attribute
 		final ILabelProvider renderer = new LabelProvider() {
@@ -762,7 +761,7 @@ private TitleAreaFilterDialog createElementTypePicker(final String title) {
 		}
 
 		final ArrayList<String> sorted = new ArrayList<>(set);
-		Collections.sort(sorted);
+		sorted.sort(null);
 
 		final ILabelProvider renderer = new LabelProvider() {
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
index 7b9d61d2ae..32b93d5cad 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
@@ -16,7 +16,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
@@ -205,7 +204,7 @@ static public void resetColumnOrder(TableViewer tvResults) {
 	static public ArrayList<TableColumn> getColumnsInDisplayOrder(TableViewer viewer) {
 		final ArrayList<TableColumn> allCols = new ArrayList<>(Arrays.asList(viewer.getTable().getColumns()));
 		final int[] order = viewer.getTable().getColumnOrder();
-		Collections.sort(allCols, (o1, o2) -> order[allCols.indexOf(o1)] - order[allCols.indexOf(o2)]);
+		allCols.sort((o1, o2) -> order[allCols.indexOf(o1)] - order[allCols.indexOf(o2)]);
 		return allCols;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index bead05066e..261ea59fed 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -5,7 +5,6 @@
  */
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import javax.annotation.PostConstruct;
@@ -143,14 +142,14 @@ public void run() {
 			}
 		});
 		actions.add(new Action(Messages.VWindowTrimEditor_AddTrim,
-		    createImageDescriptor(ResourceProvider.IMG_WindowTrim)) {
+				createImageDescriptor(ResourceProvider.IMG_WindowTrim)) {
 			@Override
 			public void run() {
 				handleAdd(BasicPackageImpl.Literals.TRIM_BAR);
 			}
 		});
 
-		Collections.sort(actions, (o1, o2) -> o1.getText().compareTo(o2.getText()));
+		actions.sort((o1, o2) -> o1.getText().compareTo(o2.getText()));
 
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 3291d1e111..cba34f2568 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -16,7 +16,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import javax.annotation.PostConstruct;
@@ -108,7 +107,7 @@ public void run() {
 			}
 		});
 
-		Collections.sort(actions, (o1, o2) -> o1.getText().compareTo(o2.getText()));
+		actions.sort((o1, o2) -> o1.getText().compareTo(o2.getText()));
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
index f0cf13074c..7dc09a4371 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
@@ -16,7 +16,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import javax.inject.Named;
@@ -231,7 +230,7 @@ public String getText(Object element) {
 				}
 			}
 
-			Collections.sort(entries);
+			entries.sort(null);
 
 			viewer.setContentProvider(new ArrayContentProvider());
 			viewer.setInput(entries);

From 0db259895140c3dee27ea2f7987ef8e69f0befae Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 22 May 2020 16:02:13 +0200
Subject: [PATCH 1156/1286] Bug 562966 - Part Icon Search Icon still has white
 background

Change-Id: I3e88d978c63824865aa39600016c4368b95d549c
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../icons/full/wizban/newsearch_wiz.gif          | Bin 3122 -> 0 bytes
 .../icons/full/wizban/newsearch_wiz.png          | Bin 0 -> 4121 bytes
 .../icons/full/wizban/newsearch_wiz@2x.png       | Bin 0 -> 8301 bytes
 .../dialogs/FilteredContributionDialog.java      |   2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.gif
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.png
 create mode 100644 bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz@2x.png

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.gif b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.gif
deleted file mode 100644
index a585f2941a23c08a50879c03012cbd2977951d2a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3122
zcmV-249)XLNk%w1VM_o)0QUd@<)J$D>B_33so?1N@$~%r{LaS0#p~$U_W1qz`kLXD
zGWq4S`un=%>iO8)<#3U)*|Ko7shRAySj^1S`}xtDhH*)ApZfc*`~3dFyus=2`u5tT
z-i|EnxncO?ul)S9lZ%r2{H5dI*qV}>{Pfb2g@*Y0{n4OOq@1J2zPbAR{^+Vg;_CVE
z#(34y((c1^{{H{`^~$@py7~M4^2>wG$;&lfgR-r%{r&llg^cv<)x>fw^!D__sfD$6
zMa^p!>8ne`i%Q4C!}s8;ySc;Kg(mCp`ttJO)OZ>D>$3dv#^$YCy=p7*@#*87H|p>D
z>aj`L*3{<h`lFqY`TF_$?7H~+dzpM{^!NPp(~<S`+R)6-`TE4IthL(M#Psvk`sbX=
z#>o5Vto!Gq`T6$!{PE@E;O_GK`}ErT`tpHyfBpUS<>SWr?vviz)|If%{rc(s`r*pU
zy7&2Z?!0@!!Oga>v+e8S{P@|-#-#cB<@x#V^7NAI>9qX$=KK8i`|O+a^P;%2xA^*x
z`|!W@*`56S==0Ey^V_`9&(ZYsv;6t(qJd`l`r7>Y$Nl^9_0^gD{lUJuz5D$6`1*I-
z;OzMNg!%1@@4#&R{r~gz`1baO`|PLh^7Q-s<%xiY{Pv^d*tGZfg6YwmpO~Qa@Vb$K
zfAsOk{QcYe{P6nx=<V_Q_xX9_<9z!1-242%_UX6$`oQR<MEw2y#K6P%`TgSO^Noay
z!?dRM_w@Sw+~4Q;<?Q+3=lJ^j{^9BP=Ir_P`2G9*+wb%H)PN|*$I<7eKKbXj{{8Rz
z`{?`o#rfu#*nl6)fj9B;%ipR`_vf<j;kWne!T08)_V1$j=d9Az;@j8P=AJp{>h!35
zUjP65uc@#0@T|tdg8254`uBnR_KEQE?!CFS+=?mZr$T^zT;0Qo`1R$-!^hd+@$$`>
z`S^P8?&zwPTa1H=jf0He-rnHk?f2!L{PnTX&$8CjsM^@P#>m#2k&W%~`ptkQ?(+HQ
z?)u*5`2YX^A^8LV00000EC2ui080Qu06+-;0RIUbNU)&6g9sBUTu2axFD$G2F`P(o
zB8*xH5CjW`<;<!|M2bBbsX;@(lPD{yR0zX_iCQpYA{aIyhkyef7AzQ2=n#z;9e@CE
z!c1F^5h+(vbU4F=uUamnn%I&f#gZ2bJQT`8qXmR#vW6<)zyZk*A2~o+^T)QW(t{XO
z_|ilQ#g=Pcq9ocPM2LYD&szMH0A<ArV`9mYE3yM#jxM%-^%~G?*RHmhm1e@g8N(zr
z(v-v~P!Ghd5rSMqSslg2mN4mJr!zoHkdG^mf$`!6j70+$EFw>?d>J#_g)lN@n&bzM
zqYD>4yec5fP^w9(JT+>>g@K|F2?lNdYLynn4Q>Ls36g;#$0rn0bo2HNTsURR#*Yi!
z_HSF6IC0>C2MH9!Kmi`E_>qhrs8FB`10P%v!XSfKVg)4_Qewq7fqbEZI7X~ugc1Eb
z(T_>}ND<#|z5N!PWcL+k+&?fRr(7l~Y{r>fzWCBqR4`@45f)ewU?c&<AUVt#9*HO-
zi6)|`qI@mZ2P1L$`SaG6Tf%?=0z?u(5{f8E#O0X+wG>k@8FeHNDI**pjR%KFAi+8L
zq-9N+W}=ClFH*S_6BaeuvCakyc=5mkHrU{f1mz?~j#;=(kd&Wk_UPjbO+8ghE>z(n
z3lKwi0LdXOU{V-jPK?Dt5kD~h@lFnPV3{A6I_{W*Ac>f9#~x|qa)$`lM6pE;e$fJ0
zVjL{iOa+h8_u_E)-D**e7|gN=2}(Eu;dHvFLIxFk=+THX5#+#42D4@0uDi6*Vn7D%
z)j_4S_SrfkLYb@)2L<$m5M3k%pkf_%o(NMwcM^tYAtiG}9C5mzz@x?|AXu8>iu1Xc
zZ?*f<XyYui{E@~UexN}@0EEDj#4$-gBStkeS2ImD(Bv#l06H8YPAB~6<K&1Xo_Nxf
zEaH15$eCg4G(#-~LqJ4)K5g|s7;MB50V9s|L`i)1dG$(}n80R6V6L)C7a&Ly0SGy$
zYYUl|j=c~DF|CQkFqMG+Foh1s<jfPQ9jtId36GU&H$oUlm3J)!)Fc2RLqHSCIHPa{
zlu)g5zzh<&)p63|Y5o}KOTiRM$05)x5Xu`CSYXZxth#EJQKZPI<<(4adO8A$<bcZ(
z9YCX17A?F$SnXsnb5`8==<XJ#UiPSo03bvlh#+>L0Cx}A$TGwbTw&6|s?1Kx1mZ*t
z5M!2TcBX;@AfzKgJ82-3#vN|xRl{rsfIwjmlfEJ}194pd&M$u9K7BQ9C0^<bXBH8G
zcYMMQiC}{n4j=*%^lvY-iB}3}ae`(Qff&%b!EPGhq6IdPY15+!j%L9bGLS$Tj&Q^)
zrsIlakRb{n0D&O?YOn>@{11Qz2%!veKnjlWf`tlX;QOq#kWA2U7AcECETS`=>il66
zd(h6pyc38#p+E+bkiqr@A&Css25u9O&l6iHMF+<4Ajz2o9Pq$^5QN|Z1gp+<vZJu>
ze8*v|kk}M%0jIi*00e5tK{1fFLOQ-sdip6yCLR%o0yrWT40wey3TB8u;DC??cu>PC
zbRi5yj1_z+MF0*!1R_izN=I`d6j|WHDTZtfYe0q}&@rGG5P}d@s6rB!nFLO70uayy
z#3kBriE37}4b<pHDNdn-CUim{A?g|~Hzvnj_R@~}v5^%qkSiYf$Z;6a2$+ggBqS+`
zNootH5k_MFG;;1{j#0cM{76T-S(pGKiX-UL@J6InfURl@J(DlMgn+5>^Pvfis7f+X
z3$00QMEe|5*fdHJyrGRF9w`Rgj$$c{){UeF!CR2pbcSpQU<4vq2M{pP1GtUA0V9QJ
zK@7U4c%GqeagxR{j<JC(VB$`B8i6e`3R4)&;Bi432K`VVr={{F3x@zoq=FDPjfpLy
zWfRonBBw5#1n#Rp3Cd82vX4(la&#JP96Vt{s2oH95%V~P9Aak!Z)|R^3YgRmOaX$a
zp4DzWI$e-d2Z>`u;|;L0!R#XCgwC0T5s3rFZ%F45KmjUHwWvu7R(FgAY+w{`ct8bC
zz**1#{s4FC2$|J-XWBpo&ng`_#_{3`1y*&A7|&D7K%Z9H8ThETCLlxbL`4VT_9Ruy
zL+q=bmxJhGa(C2oXFLQUfb!D93{>gCsKy70pQws}ogIt%5Qh(6KJZM{n+pn15C(hH
zAPhoC2Q36}0&GBH2tIi#`r_LxW~}cqE<`7IxwIo+NP-kwIKUAaF)aUu!2m*l0AU7b
zT=^Ohfxh`g1MGW8&B*Tt0=UNk^st6gYJm-Ga6uwIOp8270KT1D3^DT51t>Nk!Z6Gv
z1SJ@k9H77e*O12%(9sSK_Rj_Xi&wmQ5abi4umJ!)@`@#_6d2G@f_|t%G}`kCQsg23
z3U2V=m5&vhB*yCmUe19EpBQE&e|IIbP!4B4Lx>nSLK&m{!Z=PNgCe%ZHL#J50shjS
zE^rLYMpiM4m5iKB*eDI$qChMn0j^|xaSvZ0g%Hz0L>|X$(jgo{4y+*`O#kM{3?%bJ
ztY}3zkRS%i;39QO2}W~`@ofTdV+JIV#x}+)19>7st@}LYBu^M2Ho`%391$Vu4Eu}O
zX~e>~(6CM90|WwC&kb&{9(SR@u9cW}rgLrWPUB#YvG5}xzl|_gjB%BsNMtKcLyGcp
z;|AV~qysKZ?M+|1AuzzfB2dxCKN8Gff4~4L83vvTK}=%gVdMx#V6pBVP2RWv_VaQJ
z0s~G`ppOG1<r)xHNCvFZ5*d=%95&I1bj6Jn4j>c5GhOXJ8w43~Xb=UKP61RHYz?zW
zg&`ECj7Z$Pm97*;Ah_9tCxuk#C{HoHjozPN!l5|@ih<fi!}eIv<L#h``!~V?4tCg`
z9isRKC=~GpbaW!0ASDS(hMw}GuY49bc!VJW#4ThVLky4~gBZp@`7wY249m!T=I1dD
zYQTb<U+|_rJQDb?4L<C+cKATl8EE-wY6eso7a7Qqi#_Bb7d*(lCNxpcBn@LpO#<oH
zPrt&3>$*laYJG)!<Xj-db4X#Tr;&b-PtuDM?8TqA>TAUMcE0|!GSLVRk)l8Sdj`Ms
M*yl6R9Uc$>J2zoW_5c6?

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.png
new file mode 100644
index 0000000000000000000000000000000000000000..9aae570133943badca77fc12cf26f92d368013df
GIT binary patch
literal 4121
zcmV+!5a#cRP)<h;3K|Lk000e1NJLTq002t>002S=1^@s6A3-Z3000l*Nkl<Zc-rmR
z2~=C>l?U*)lcdw6X_|DhII-Jgl9@~scbdhGGi_Ek$&543(#CP>y0OzZ<DQJuaniU>
zyajnnYy%Q#L3)4|7D-4T34sujScKS&ZHzHC7#m}DNg(ze4BWZz>FI%F2@AJHI4<Yh
zqhlYC_<r2)e*gF0H@@-ruNhzPO_mjI*hJWG-bB>jwwd4hgKcqji+3g3f4n!j=@-{M
z4~qrg+M4LR<&*f9J2r6|7k$KQzL%_BiH#2&P<K3bK;HV|q2$(IekE^u>H6#+fNy@H
zZut%gw1a3|v`yT6FIgng=hBAz4=L@-B2}#~hAUcEge#mYu1l;<1l;Hg<f;7{`;QJM
z*`Hu*Tb?JOu1_rNA{Ne|?UK4XeSyf@nb2}yxVCvIU(@^?SL=A5qjS7)-C?m<tZ%Ud
z)!#i3ck%8pKS*SSCpsVCW;mY~>Fv+OU`JhdSR~RRvFlcrwBsHU$y2^i5$TRci0qDM
z;!O5uuS+cKlv`M8ZzNwVR&wj&ID`F35-P@EfA+e=VrANI-l4$lrbHO!<xn21aJBOR
zo<Oyi8_pf$g>!))A#m`cB$+~K&ih|`ECNqAmcsr|4ALxEhtzEk3xp~A`4PMc66&(z
z5T()5qIbV`SmazfsP4Y)kS|gIEQ!(ah(M@jplr$mFi;f%ZKq^VYLP=cUqGYrhIvBG
z-meW-c;cyB4&z)Rp@P98vYbB=&giHD#XcCQJPgD2G8lIm;Zjc?^wq{ecH%*%%c6NI
z_BD+~UbB6vuDjEN6bx3p*|~J)*0U-1K>x|FVEBR<#@aJsqR$4y7p2g5Y&W=!>!2w1
z1K@{8Q(zpCVe2)C<=aicV8t7pOJhW;eN0Csv!MUP0T?<T3uBISm>4XDk;WwGE8hd1
zrVZdwtbkV8vrxca@9wY&UN=W_eDyVh#bQ}+h`<5v4{0{6ctf)nluaH6eaH90&^Zx|
z+O;q-Pz<9jDbQbW0J?HEf<w6i+7h0F=D7cW2L3Y8MQnC&M|OPvHG##(3*A87G#i#I
z-|;9xq=qpamGlK}voIJuD}d3~RJep&Z?r8922LG@uDm~hQ}r^mCDKrWpFut6F{nQH
zBnS^5roh-l&PNLti#+LK3{AHm($9|M4@;cydRR!P_IjYKiMye%Y!?hxb77=81&4V)
zj5*U`@C+Ne3qFGO)RhSJJha6B92#TXQ0EUVh1z`&gK^(G6c(2w$yktB1W|rtl>Xw~
zJQ8Y-SX^WKgQ8gVp6QO-3B5;lAPfgan&dFvode??1{kd2LQmnx(5`(Q>`4eE{slA&
zpMv_R$D!`98>)KugK%v7Qg8>?7{`Lc3O74%AvBGPNT|7D39}vd6GA16=_uI_=q>pS
zvs5IEG$cWGZaQq|D50%F2tCDHp+o;`uqVF&EfP1>#poxXF8n7@yZ_&y`ilqQ^k+YW
z6Pxd3qQrv1B5%ZTbPeD4Ak7skGQDjHL8!u}p|(R$(N=esx+sIZ0v)W{k^n3Jm;h_H
ziJ?ii4(#$5pjGk=G>MkOMXnp_+<_lMP1r+l`tu(_<)7|_?9X1JJBv55Ah6VG_y?}h
zai=fTT(CqjNr#!OC)<Ww>=PzS<ytlH>rWFYD6$d+J1`==2(40tBA!O5C*eZGzr(pN
zX{hb@!>Ld2qoDZVQSO<=S4D&zORcWHNuX}H#~)O%SR#Hh6A!G?KjYBe!el9<IhE-s
zved*5CQCKPJ`D{#go^wrocrn#sA2sJoY{d;TNi_2`>WGXJXHcm*}9seXj^+&+5BE;
z26?9a=9%;9YOn;+QkG|?*rcCAxAh|onA2HGZ8R`gaw3e*QY4f+OI=|96wV{m***UX
zXLde7LCx$azECgYYFgimPHp==N7ej3TiLjA-l4e0uJ6r;6bzPtBW8wqk#q}m=Y8lm
zOJ$~VK^-6FH%pyA_$Zv+>xQcO^AhZ+RSXo5NSE-_92-K0MGo?KQ_CH}K+T55<HRw;
zyh!qYn7}t-mfC$;mKr#XS<1S3)+|-M>z|=&+Y&HsTQS{HgkH?oIyQt1i+naG!HZyV
zkWhiJxKYy2m|-qPD9Z<QmWskGrNAte>yxEkn>9;SVMNH-@g@T$Aar7Z*0DZhSXL|C
zAk<#Ci-h`1u%bC}JNXe@3aT)EGhY1u-YZLucbcghs*Q1Hsq`ynDH6&v_XLDi9ILax
z8!{}S9B!0mb=>2Dx>_u9>*0bZsABQ|LZ@-PSC;bJml~>z#ZLPiT$yXGn5AaSs7aC3
z#EI3lz8f+u3d%}Cx$gZ-u*i<`Kv5l)wGOw~pD;@u^u8}uFNMCNyTFz8+ZkDEx!)|6
z5%#vHqb3Q7B|>7b|1M-$7&dRBpe!U*V613$^$!Kyq;)*DNXUy66mlcD4g3gxGcS@~
z$&C=?U=@)IqGnY5AF*TB&d5@6Fy_$1#9+yc`%>$fEY%bsOBr{+?gb??x33EsmKW44
zSctTq#PR#^fG*EnOLFVEGS*y{rKtN-%}V!uDa*zyW~mI;+srT*%CgxqWBa<0VHu6^
zZNlVQ#6ShW;&Q|vdrq}Dek^EGQX$8f4f&QF$TM3Y&twKurV%m~QYeva!D0PYz$`Uz
z>X85YQf%)mrQfrT`6I-N^|4Zu^S2?x;u`BNhw_KTQ@lk&VS!GS2Bn3CRF&9lP+U*|
zMb-i+%(sFqHy;Xe@}St94vw5pyt7oVmAW<T$x_Y$S?VmEr7~D+87M-cCz33#wIRb|
zhPf}4KP;R_<S(sJsNqOa(X3EbOD^P_bD+qQ0bP|bSIAN%)a6+!bI%$EDh{C%b6vj)
z85Rkp4g}?cB@(G$rvAFoLMXM(>?m76s63Mea<k1~vlyYjZEjggv+w<BD6yW9Bh+kI
z0&VO1zZn*Ji$#&!ez!6Zln<7GEs7$4aaD2(4OQq3mFFKS$7ljeRyGuvvZ3RQG^i}4
z-}^iIDGhgAEHgzYb35J%85Vg7lW2C{MM4FO#f#vVk_#|rWci264Gd+*fp5Z}%gfY3
zli@>f$OC7ow0)ZxC`qE_OEp4;6ib`i{{s(HuvnrfzKdK$9%9T1%HW2|)@Ok+-2fI{
z3e+X7o{^<UD0h}h-?xE*k|yOIP~~^62`QG&+VlOHP{CmJI%EGw5b2&D6xLNjW$7}(
zpv{2nR5{d&R(fSA&HjxHlq@-Ce`-PR+ablmVg6lTs4HQ0x5s@r(H}Xel+rneD*`LR
z1O<iL&lf6Fqlb*NbjVUB!x{GTRF+ELzkx~SvSjmqO<~vSkYY)#@Q?nWX2a@p#eF<A
z7<mZ`M!F+GmB3@bOol8R=z*ZJXNA(I>L6XE1-(2O3<ozdr=CQX8LcVoSRFK$@o#`d
zo_u7MnhVxImoRK{Aaa6)qH2hMv3><)rp3E2Iig}H5N{|`&``P*4QQ2VkSdenWef-K
zx^hHkbF2wDR>Dyn=*9k_lmVa^Bnm1Prbbd=YBUSR25q>=1PUyMEkFqURYPeMsgNdD
z13!{ay`S1py(y$v;$qjW6jYE{gFPaSH&h%AWrV4*Vt`AhU}Cf$0n!*SJwh;08FPb5
zO;&@D6GOdMVoJdmA;VHv!%YlS5LiP!!nkQDHbTWClnSA;X{aiIi3WhlE|{DgMG%Ag
z4nri50-&Ju0ie{rP^lD@I!Og0yebGO78yLXB?ET_gO!lidEZbEA(@8az|^o9q0|Uv
zLZ}jiI*m|`6cqjgYl<pUrilR~JH;3XO67q{^MX<(rhq6ac&r43`m19Zikfcsf(n3@
zZtGey)Fn)vhKi!0QYk1HFQuWH5ULx2CKxDB<(cw4kIQlK$~i%$$dn*tySHJo+O~7v
zv5a-_ZM`p)A1v#Mj)z8jMOtqt2@PeYq0YFWrh5EBdCF?ZXCi=Hn(PgQ+s`jlf)W%`
zIi7~@NTRWve{Wu~$Y*?dyg<GZR&izBqvQQCh0{>cG*lW5b%cg$rlBSSLV2pVppXGe
zmLwsRc2+2*OaTc5eX?>yO&KL!Z_O)~I;Z|N5^6TA%Idnuy`i`WB}FI=LRk>1456wK
zss#;tuZZL>oMThnaJ1OWfF;CAXN6Ko<jhGZmgtCi#Uh{cX$oD7X2Ytetz9-gz%QSU
z1|*b>hRUI#YG|mwAfd+brOSN);Cwq)oCbnO_tugLB@~iBs8}xHe(uK>wx-!y*UT%H
zy0qmE50o#Ky0r7Yvu98L{8E2(%`_B`hSK7Rmy2sYii<sqi*Cim_Xi0zhA*A&NI^!6
zaXdN4Oi)=SV>&FJA4eg1W|T}M#cd~`4+Z|9TwlILSJM7gAS}7r`J2BgR(UzxI1_3n
zmZq$0admz5Gvi)Re1u9sC>;%T%ndc!HV3Ft8tNhyR$&~o*jP3IMh?IewW5SG#*c76
z4x=uSaLajyxo1wP4W~ZLJlg-OdBrjm_1^9m%htApgqj$LzAz0XK&V87N=K+XT;y?F
zY%N0Baq$ClfO2_5Vaf*#u`nDD_<7E=7fSz-kf4wBeM}Y;Mbt^98C-o)$J@rE{cp}I
zmhY_c6xmT1+sa;<9E@uAhDxHL@@c4Z2<5=V4+aS}g5TePQ1$q;mG~Y-2$e-c#ld(V
zud$}C{Db^**MH}p=w78tKfYO&TCiP{UA4(*Yk0?0*7=6Hv<H!T-kf(VV_Dbte4+6F
z7Pr_-|H~UH2BDG>N{>)hTx2;e_B;(W6eQFzet$bcUBI6`iSJQJL#0rkG1eb*s;ahn
zo$X}bs~)V}6aA~KmHn&CC;DH@DRaINQmia%$2~KlGI5x<HCtZyh7!7=Ml)!r6S!a!
z%6XMg75E-DgfbwMlKPC1UQy}s>b5s*C%a!=kXU#Ee#f_~+S`q9B2?Qnln9~Z2$hLY
z1vFG04K*Aj)R6o8$)6*k#yn68>N5tr;<8FlJ69d4>RY*Bv3v)+%V}OUIl$@hhEmW_
zxWMrWcW00tGBpw$6gkVttx9&{C4?ry@%=ndy{;5daaG64;;QbI3l@vKw3)dDolfIx
z-cSS$WuT!>(oh|9gtF66IOE7Ij9VE-<m7Ffi7uClQ+lTFKNma}dB4g7)!DB8)zlDs
z$P0>`B@|R44TY!IBp&xuqd`Iq&`{@SsC*g<XWtNexZPpcU3Rwjm1_bEk#6;zd?(NM
zJXX^<^n|CXntGo+F{3K#dzT%p?Oj$;>v<i**P&&{&h-7PWJVQMc0T2<zNZS0_dS(=
z#JQZRa_4e0zM9KBmlvJvd7-SP_vMnxu2-%ZEYG~EtQ&Z=rm^>l`NAqW)w$xD!_t;G
z@4{d7Ave_gVU<>N{?ad2^#aDS;`Te=I{w&vV;!mLed(IRs%RQ`q`GbV@xNnT8SDQ6
X4~3%vM1H_i00000NkvXXu0mjfFq*wC

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz@2x.png b/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3d1b47e8d6ac36c15d4d42b4627d6b181b84062
GIT binary patch
literal 8301
zcmW++c|26__qQ|FEQ73BV~m}W-PlJl!(0tXmPATOmMB|>4Dm_Enq>&rC4>^mGD3}A
zhEfqyw(La0cYeP=?!Et<^E%J-KJVxKI?p*b8DnqF!zsqez`(#`Yh&R^|7Ovj1P(U(
z`?mDxZ3c!@I<^*OxQNN$-`FEA%{Q~JyWhIL__{1p;M&LA>Se>DXBepqWy6k>?wqQU
zslsBMLKHtH*ubd=Ju)&f5%0(AU$!c^)T>^~`je3@VGum~_*0s<LE&ScOH)zuYlm%e
zAF|R0M-0Pk?hJ0VI!J8FzaL+_+rD<NY&81IxYvDUz8n55X(;gLtLP0$v$>0BLz3EF
z0h3#g2EMk5PjQ)q&mF{XO;3skwjPwet2y?Gaa^&CGO9>CzNY}r<vl9dy}@5D{_3HA
z;MBY2w(ho9R=Z!tguL69ZM@dZli=mO=}H&c4Uub+@rR2qCT^eQjIVl?xO4Bi-TB^$
zV0Kx#`r1FTlM`&+;nN{DBU^Y4HqxhqJ~^}-61iI+Ru-^PUb`~;$Gu%V^qFM+>ZPEO
zxJhNL8Y79bbw@$BhlU=&-==%x=(e(I414LP9&hx$nT@P%GLscKImWIjIc?^#%H_`F
zqay6w;XMhh?h8!a{1UDhUKf<~SEn-~FzEL5kU8+Sy`!7rRXY?Q)Jc=(cvJI5N;~L@
z!TH^nxnH8boVGnQ;kDH@_GhNsoSnHib6*hBo${!s@ju#F<rwIYlW1HC9?dd<bE$Z|
zaT=iQSu}M&C`*HO6}G>2j%*tv$F_}nEW0V3+r03P!52<U8vNd36s$2C37DP*qb4?9
z_E;103VZQ*BzPmtvS}*T>@)QeE-52&?Z@(8=`>dqJ*?U1xJ}{l!M)v=k0;}HGTi2d
zG!Vkh3|Bmt3e`vAHra$%9kJ&Q`RG7Yo33JH=d%Bh1q)R$Qk@ywQ;BafH9qcXyQOwI
zHq@zAak1we=x}6?8YzX>#m`-6+G>cD5}M~Wq)<4AZ-j&`i-cE>WF*noz=xMn{`uzJ
zU2~Ie5RYe!sHCkIE!Z{>GG?084Ue846vK-sqo;cL;IFn&5rVBAYC#X0Ls~JOA|`IG
z??n`Y_h8mVzMhxkM4}}FD_RaGzrhO5I+biPj+^Z_2lmyc{t*OG5h<dXeVi!}oY?r~
z?$WDX7yQNdwrk$q&EnV1_8FGz>gNnHZhkapO1{Q7Qt*{rUpxHXnQYTkKnTrsm&Fdy
zlIXb(=c3x-i^{j}UCjD;T&IC<m@c)qbaG3pRx*6CdR=&YUO<wC_3}<~<ldwlM<2ff
z_AZCrGwo>w6^TeaboKorPLj;LlV}wmW5|8^I|UEpsI7P#BL7EbF8=M?f@y8<C@tKZ
zO06rOF`6*Dyz4F2X2sM`Rxkh2u1X{(|MkexmrGa-3D$@*X8p+?;^EoKovNxojIhw@
zi1;XB=6`}~xq$=yZI58S)F!@SrpbE4;p)(H&FgQMg$RdyDe{YND)oU2Ju*4qfskT8
ztHw7eu7<ZCIDj+AR1$?^!yk9E1z;K=kWbCs2D7cA9XYs`weL(GuoUcqrkad>QY2hn
z8>!yux+Wy2@%f!OSmOE0nl*$uw@$+~9?chG#dE&tgGY%Bi&fQbhv|&s`;3*ccRtH*
z$ZETY;D$@>qSczug9%h={6cc;g<PY0V_verN7b0g2O92CqKe|pEQPtN@;S>BWHo?0
z1-vwnJ33M?%KW6F%VXtJl7?G7jIH5H{88pKs(CN;M1qCh9Fh99hti@GKn=*=6cM%}
z{bvvnC}DhP>lp4-g0=?jrBHsd9uUB(eHqQ7%q*Ok;t^cJ#Ml>`o2HkbCef3&_F!f-
zyz^-T<6ozuMB{Gtj+}K-(ULQ<r#|tEoJ~0U?y=aJx;kfFRBY9Qxi8}pM5+khq5>i6
zQiRvo#ypdsyS#nX!Jt&1VeYiC6{x2X>YR%C;8~+C`7?>jBe-7RCwsj|xi+I}x|?X#
zXFfTfOC3)S!WSm~Ns%L;n$pA%v=<&9s*CQ$gi^Y>_zSu0{UV8kos-LsZIpV|m}J)S
zq>`(-`SgqdoG2iKLD8PjiA&*NL?^g-i}mx(m)iTBvX9rk%$ei=Q|=zS$FqO;HGaM2
zWWF8~Ypj4G?QJRGzRe~TYi}~XpKo1ll($OgEvN5Bf8p7=4NaKJLsMPT;tU(DR~WUJ
z>jxwCyZn<6lVovNze+n(P)8$hP%f)|pKRE8*8vqHoSgL`-Se53I5+$sGh1VfD=O4@
z6}ymZ1<LaYg8F-Zx|$zGnZfG^W{wFCMH1K<E8%g@JC()n#%qHG^aFR{q>8%TcRODZ
zL((o4$TKE3DQLk24C}}>fXnaX)89a888*Q_xv0Z$o>vrckC{!Yu*`x6-}x>8?bb<~
zJFVY81v5U6{-wZ*L|T0eIs9cV)D!rZnJSKVe7h*+^J38q+jvV54tXnsPLf}mo&p7>
zLy+Q<31Ou4jR&}JL3GTBPmxyJp=1rtN)x6Qth2DNXr^DUIpDsMjcms!2BSBbl??u6
zhD>BQ2Y7gD2EoRduN;0FQk&<g{xsVrt<-mc4_!9-2gFD^d}H^f9V_|({yFC2cUr3b
zU++nZ_W$F`8EcO--d9J0UMCQX4rIISQ+EWw)rMlueg3CLo6LUud$;_K7NY*!`@q|K
zD12H!n=s!?@GaZRn_5oy%VnI0RWDH5)~fpY`5w-K2DFW_m@YiceYzg{aXJ}4bMK!w
z3naw^pRDHMM-;LG;&Dq-e&_C-eR^))$Zs;7J(JaF=CwpgFTC3DK!~d^yG*@&PRwk)
z<APzTKgnaGA#x3uy<-$>00*808P1zGKKo4`gsg&`fz>lr`hh9%6-=lHZf2RRI+nO}
zAdEAcCiL(fi`%aq@!F(G+%c5dbmDta*Lu&^D(7>kB%4naEf!w>yIJmo$5FCP#wMdr
z1^ROe=6Bd*;G{?NsgHBjRACil>0iypXd*`PmGzDZ3zS%J!>r*LZjJZUbU`8=-egJ{
zOIKdM<el!XOJCpMeS<PeM7vG-XZvKtT|WJh``;C-sEWmRp8ziQv1f25jm7#AB06hL
z<Q7SL8Qjj7TMsh$q{0&50-;30d?%qoKfrF<pF$kwsRgpd*95IA0!#B8^=hm@ZUZcP
z$spu9B;1)Lht|7)-pqpcRs-UNw=+$6*SilE1fvxU?*%6K4{1Ry&znql-rTTts)%P4
z&dTRHy?`rr7IVh<uLbxYzSp<C^Y_gd7}n|69oBep(jgZp2vCj{2~+HNl0Wx-G2EMM
zBfc8y?2`f?ym!-#w!LP61daF3j0IYQQ|+ww|F+ml-lwM%=6{a;;-sM|j+r~hN{%H*
zvC{qd^)VC{@(d=sg;~}2i(dmG3b(5uvi3*6s{S2kxWH*saVYWkv@C|!7A_cv@ckwD
zY=U=R5Q!vmrN8DFlRVpO{?f5-mMb+prR;;jhbTlUBok^d8FAdFRyEsoC#v7knHHTT
zMk)*GHVs$_QLBfdlpE+q!D}&Hm6y-pn)Hij*^>;|%E%OBVPVVfi!hKBuV8xGv=V22
z&H>18<sna^^MRL5KRQ*Usmj>H;41FT(j&7XAb7C>!G*ZP^mRiOJQhK{oWJIZv&d4w
z5bEl(+_PXUL<xoJGf4i)>J)FC%(KQ4cBsB9i^9LEp)VP9@CM1haqZIr%-y3C|EQ2y
zSoID!{0f|+xOS@~ftEn9FKj|v<b^L{c(Plqp8(g%Wgm1Q)Z%iqFYpdFOhknD&JFfS
zM}8HBThop$a;|+pj-UTkw69aS+>9w(Bw#EjrkO%aECm&+6_GMm?C;KXY0ig<jt7<x
zK(1m9e)MhJ&=LA@CNc;3Hm6kueQ8NWN65dcblPA&$<OaU$5zv_Mtb;TtM)eTTdfOq
z+cl?tOPY~@&>Px@WBq>(w3T>qX2puMKS<>a9CLtP$>Q?et^r93m6_ntzcy}2(7hoA
z9{uy8v*jDCb$Y(~hq)l9s4K}fOVRLBPCvZX@9#1D%tU4U*Y!^^Sh9Xuv`AvgF{~7B
zK+pddHxf=Q-1P|UJ$+TDs>HlIg(~DpuR4hn2WoJnn)NG!b+W%8x5(SyT2=K$ReApK
z2Wq)oLpPHZ^Z}Qzmr}0*cfi-O1qnr?fBwWKu`*mFETm3f<s_NZao{@TaWWhvx;MOy
zfEn=x219^O4cC|A2%N!8&c6#w&5+V`Jz{d+!C90tv3+Rt-E(o|gF}f?xZD%)9-*7Z
zAtG0VQV?pj!^;i7*?0|*rbPTced`yrel5B>QhhSzP>`*`{aJ2R<Zwkbl~zbJg)h{N
zE%m6syBhjc-dmKUUMH)kncr*=>IETSWNJ*8W|e<x?DaR*#ONA-?VOM!w!=z?{X*dP
z?S4op1UfO*ddf8>2nL+$q7L3Vlr`S>#AS<R`RvcB{fDKgXhIXVE`Z+o0@8`5YctjU
z(XWTQ-DrKowfhCfE^rj^i<6|IjxSz}I``eP`_deXIAjM?F*N+igT@h?JeAgTe^oD4
zD^%qzHw*$7TJowQdqSPzt9P9(lh8^7d~m<WE4&eSJ^MQLP-RaS>;?VONUqTQi{GvR
z?~Gy>CR`fj^#_2m<K!3BL}B30hD>l?uz5!p(N=t49}d|urrg@EdLoBASNr-s<j7y{
zh8I<Ddc&^4*|W@B``!&cZ)KEYB4^PjZ3SPiLxOC9`^XN8c&IOqpMz$l;oH6v>a2^6
zVfo!@yuK)9deH^`ZE+|b3O6_HqMX&Y3F&R~Gz(qyoUw^p+P?TCRv*}9D{6pdW}6n*
z81Li)-)wV%`PIL=J{83CN<8(&oE~^Pa5Df@Q$@D^!;<}N?(y`ysFUB0<S*#_X*;Nf
z)C)R(20GKuKcTxF@xUQvtlLKKNN!I%s}AztB6;NV{j(=PW9GVrT^tXrmTbQ@d)pb9
zSFA!^nR_doCh06&Rbr+q=Pb7Cg=6IDgTWuv$^HPQ=V9=e@4@m15uR8tcTj^MLaA+3
zkH$YErW_&T<vu@fi2kav=q_bh0Xam#e<vTc$hrU`Y4C(8AK<P|0a~EeL^OZm*wM7B
z#A5z5GEOf>GJcyM<#b_HzfC9(aRe9bkLc8_(hnXEaMt}0<m@9pZa4ksBGul<96nsP
zp7P=G-Ev)fI&;gw))W!N*~blv#~8~~xEO1&@Q->G)mN<w&HFcLD^_X==hf^Pc=Hu2
z&_SUz`C!8k(w?x_F!c>o#NqikSEA4?CVRw~u0)n4hfb}_)zmuXfX!*s<3u`i0}rZ+
zQoz3ZNh|pKx}XZ;P(I!~g?b4eact4>W5Yb+gbFe7>Rkapr_oaem)Y;O+<Z^-F}r0Y
z{P#YaA5F~089Zesz%EcID%8r{2aX=M>bn3r2i1tXCPq+>+s70-oB<V^!ot?~9&%<T
zs3&r>RF*trLG)1{YGr1{lb>bo1;YOdC`~MrTk(88uZcu*<B5y>nL<KlWr`AiKNk8R
ztF$6BfcvN-Kw&MWVD>>ai<|(#(?J47$H;IAH`PI@FmkM*NFpwfP^S8>?yF1yOclzA
zM-BfHK?T%s^s@#wzlXG7n3{To;2`wl$OpiIK@}Mg6fXaR??|`UbENR-UILta%PqzJ
z{`0H2eV21AN-@~QEv{m{T81UgQcsp?JUSbAq)h_8UC0GS$QjBiVc!2olp8pyj@jEK
zs1GLV$meNTTzB(6CSl3qv6$leqq1lpz+^|i>NWw<7PPL;$fr^h^e?g&(;TOeT-z>L
z!0>3-BnXHfWrZAzu<-dGW-`!|vg;b(UPQXURS}^(VdqfuDo8G<PeM5Qw|Y(8L=^6p
z$42u=;FseLxpSxzxpQR1jtF2J2Wc4aan^^-T(uPL=T-9sv{f>Jk$^Gp%)|mwprb1z
zJKeovo0VjMC&zmoNJkP;mMGw-81VQH$XS0o`S4OeC}Tg5O9PapG<(4)ryt5NDY1e-
z2fr!|X&)+l_pIbftnCJK5)~c|y-B(!@D3wtMxer>fBh1&%vHKqJLET}mI|){f1>D7
z$!MF(FVBz?5i;LBXM(-N5#|3+!!O6*%TUU?PzK4&GNJ0EOHj22tU&mWMizi2&nCeJ
zHk5mtAbuz|Nn!M4`^|J>Fg|O7DLdP&nQDL|9F<Z?r2`32wV&ww$?xILmdS_&lk4Vm
z*%|ZSL!nl`52(OWTHC4UkAELR!~8%^I2hzp;Y-0@U=fA4-!1?M!@j@=>9=OzDs^_&
z%7yrhq}S^#bc0^Hngj`+gwNHX_6Bwxn5^nbK&=m8eHO;2V)4XHNzn}RVwK(Cyy_+E
zEd0!WA<kv{3jiATf>>&R<DkPzQKt=)y`-|{4&*c8a8)w&ngy)aIr(2Qq@yfBj(j&)
zP2>f<CMyS^c=9i1Dd9nAj4ncS7Xjx>`LoCG9TI&(VvZ$g^&vtV;L^uMva%0uNZ-x}
z$|Q>2j@Se~E>GL4oxGn$AT&VzHOp>fFHUC%-`OXnR)ZY-uugToFBp>cBPwT~Anv5{
zq6PePB1+{~+kEv>v1--rN9da8Uozdawk5c@0>^iluY@KMVR+_WbMCJ-`1Q{O@UqJE
z?hAf$5?Z2Jl72o!`&yD7KV@?b6%*=a?aFnSFz^9tFlAXhMtu~@+03OGF$c^(7guSE
z9$f!!u$E9z=ox~UQ19I%#5v6mL}+i6Tu(t?ynf0=QB;iYUW~GHv6X^G-^<g}J)me3
z>HbLyWeq#;-!Ldt9k-RN?)H>B|0UVAr`xii?_{>VdvgNymCGLqfY%!w4N@pW#mRF7
zjIS{a#7%%$A1@s9P<>ssoW=%S3kyp&;aSZlyFLh<NX2W=VwfgN0D}rY3YI@433i@V
zg(S+cWd_CQrV>gSwmjB3f`g^g(>`!mW&#&@LDz#`h4gWp-`U%lD&Axr|McHgE>z?9
zRHAipi=HHxh;OFG@Dmn+!VcKQ5@ccQ4>4esNT(iT!xs8pYWub9N(=Bzxl3c)S2*kN
z+FObN4sC@^&c<ARI?~bo87aCjz>;gakf35FW@lPoRM{c~22~CV{JxW?`a7zSK)~u!
zL<Fd8f$p~WRcyBm#?}s08-$l2l9Fd`KNL(ZC~RE-{gf;o(&=}Qf?n2zgqp=9kz*Zv
z^9F`zNHx1fjC@?Dmo+0A(y-4@AR}@21Rx!DoJI_{2bp&UBIv!yWXevB{UHGKP)jIq
zxYYdm>si4qK2}4dA!|#5KdZ-uN1U?i=M&T%OEXU4Hp0Mqeoz(%cgF32gAB;9j!)|@
zjqSwH9=Ni?iMx;J<re5z4Q2@9-W?Ko)0Lf7xc%^U2M|17SDX68ATE#FyqF~n#DSx>
zV46X3JeL*jT28@9*`Lz|YuZ9)X=*n}7zKl3dMucHTDo;Lj(+(yd{Ng}>&l4N_GV%=
zLMX!kUKqd(qn+sJhBf*Rb*-#$Q%FA&?5NqMXX1avqL&pAFaLmJ8@AvLs)VPd@)KqO
z;ppIVQy#8!2}DNx5^?vXc4@r)1Sntw5^X_O8&DC3Ti_~L2ui*y%k-Z%qCgJ9{lrvi
zAjxw_4)PCGcx~|4|30pz_tgZQtwIlfZ_OFL)kdVT(i;1T=m1O74NIT85`7;_TC(ZR
zXR<3E<&$prfI)9&)=Kqly7{Xn5O)=)d<$DSo2kM^KMFTJx)%&;$d>c$$bk7pgP*+-
z@G&sK8JFygb5%jSg#(Y^G#3M0*ZUzM1;iy)HDoMroXnhnrG<cpsJTLgHA!fhJEgL0
zy*>`k5=1J2j;+c)b#*5God|^xzPK5A+y{;^EksVOJb6i$?E1{oCtXEF^&?EAO`5;G
zrfC$+@PdPO`h}d`UL>tzk7hTf`w2i$$<`_%*qvDyvJrr|1t39TT*?`oVlC$LMeMD|
zf@+>Q46516h4j<9DGEGgC26sB5`+3*l*~1lGqDLDwTeAAz`1ugisS|c+%n$zxF5W#
z9Elr|$KB-sk|m*!?;V!4pcFZ<{H+yXnL@Cn`e08`Psi@1B1Uu(ZcL7wg*i7r@t>$$
zSH^hf;Jbv7p`GiKJy}`S!aZ_%PqCJt$Qg1tWqF*nE!biUszp4aN?r7{XH-zrWuhn{
zRFKWcIGt}D1rtjbVqhHj&w%-rE-)vy%tU{);MHKMgPOh79ZV@vmOT0xQ$UBsmxVM}
zk2eigmll!1>i6UJQ_%dX?71Dmb80^xUdqY4wGMNRoL=gnnECmC{yuQNgL)?Q$YEmN
zyZw#E$*BwJh{Oa$Q35nVgnEhoW5gv{bArQTCycY3>Hc_z?FQNeqb!M;A^za7seFUb
zJms<I-_w5Ge4ej*cJ9G+7btvM&&n6)wv2>Zm6?K${NQ;N$dLu&1fIizd^o+!K;v!z
zgH}U>bM!7dU;J^d{R-2P8&&k29OxzI{nYr2Rl(=F4PsJRO@jL8(oMMYVrBB1p?u<%
zR*lZZ3TwC>3NS^{EKs^V8qi%8NalvuwC&R~HxLa<1{Y-~#rGd@9^d!OnJd5io-}?{
z^zZRK%Pxv{k4rDxtxa}e<9%R^=dgq5pKvQP;;!kC6mSv-7{F-AE>JNGJM&-Yi|)L1
znyJ%ew#kmIr$IB}j^)-Qixjk)T>`jnbGmM0K_{ZS%Tc89ik%g`kAyoM4ggLk##p2i
ztx;t%WJr;`Wa;qtJ7<a36O8T&&|`{0<0AKkm;R^SUeCS@b|<4V6;I&?ou12jdWDI_
zEpaB6O)Q%@5U5V{`-sL^TDADfP{bC+;`Qepr59Ucr{ny|ynr^0rq>1jv;p;3Fp^hL
ztRc+|4X%EH=;Bspr89`U*m+*y{MAOMYnI5knUYuAqj4hl2$sby5*|KT>F&Q&s^jx=
zU-pVujOPzr&!-FBz`p*@b+b@jqnTg7F$0>Z{$Ghpt#I1OJ_(U%v#2%-5s_rds_l<U
z9-dON(t9n${6Gth+sKHJb?i_!o=*}@fc4wD@C5p&r~O+bCKA@To|(_{I-AL%X!`9_
zUyC*dyDRII|5gs^jgD0qL6HK8237`*WdE#$rKeoDMQ0q0;iFcpvW!mA56rA=tc-<M
zp=gP0$@&4l`RG$-kgb!W)o+8Ar41AJjk@*axV8?2zu11*<zN5)zL1$u+Ag4OVP}1C
zg1im5ezI7jIqf_OxSE8XkEQM&KCOY%W;4H549%LwI3UsJKBRP{{l#;ey(&^!Z*Ez#
ztCUXOIoKGi+!2(c@~PV=s%q(?TeZNRYA}+n)~cnb^Z|a-7$XflXMfq%WG|{&D^S`b
z=j@!a(!Y^gSjy{?XZ?wf?$YLB-dn*>)O`(AQN2(BU6*_t?j^s$V1$^qPR_N~^{}Mf
zvIKlB30Yo^@|Q4WF4*o%SXfru>5z6r{p)M%m9vvCDmWduO`eb9Zq5@pdlob|u33Eb
zGf&mAELXi5qx>fF2cJHUk(n#TQ~<a&&zZ$T+s0Q9>mnSilMj@vlMic8av`3^U0$Hm
z?Ugyn5~bi`r3*h3ptHn#0$lN!L5~#Nvr}|NToovjRn)f>7OddPR!K2AZ*S0YuHxCB
z=C6n??YkrnK`8bCVfbIR0nSwb(fZE?qp6EFJa2$rxpcX%L`;F~UvCarp-2g)pD`QB
zYres<_g<G){d+q)`C{6!6Je-npV`KH=z4bN&Q$Wo^t`n6{(UpjVlGnx!ozdsg{VUd
zX<Q0e9{XE4;y2=-CJ>eGKS_k9iO>KM8s`NVVSq#&J!44w^_HP9T);c}bjY1DN)v5g
zfg#*l@@8JXl-ydrW^H*r`jLS8-!teHNr>MXw`X~i2_9Vuj`5P%$d0b`Dx<AvU(-Fx
z$?gkR*~_kWAJ2UTJ13*)x7Hvc^+tL@f!kRF`y~GztK`KSj}xFTyfj+@=)3{$1uyus
zC*kz+&>f?wM$Z*n;Viy7!(`DQpNl--#z#N?=~zk7SZmNgpHKIv5~)`$X-iB1LIGOD
z+K#+%Du|)bS8Gh!y!tT>Td=s=7UPNXSPxhV@v%y-WZTZdhPq%2UX`HInbT+b=f990
z^~hr4L?@t7%joim#y@$kK50DR@NA3Q5n`Ze{AJ;lb`3S9t(c{Te4U*SI*_LU&es-1
zSA%yz#}!O+R$Gy0LmqvWMsJDAAq~S;YA)^M<w?2be5bWom7O9Z=$VpxBvAWxtU?YF
z3<Ec9K(7@HVSp!Rl+Rg*+wcR$iy`aqf&h*-^=<PBm*Cf)p(CY@|KLCcoTjV-p$%{+
zIWmnPuq+ko1!HPAw?75q@#i}c%WvX%0lNcDf1Fd%Z>-msu?kjFVFG$Jc8MbI+xT*8
zVObQ;l_G<$v43#+GHW_!%69If(#CfvUEmVi_VzfVQ7Ymy5fRz!^eBlh?2p(~jiJ%D
zxUlepx&_q8?yAICC1ohe5PiPi@pHPs6>8;>7+o!RfD%@Cnnlq1xxpLfzPKEC0b2{T
zE_m*)l01Rmi}c~MC!)2l9XlH$k5kdzx!#!n_nDM}yOqKvl&-cg5Y|eb%Y~fG+pl>(
zXFvv!Li&e?HKQ*&{Th3Fhc>JmISsq?^7H+G=TCl@{<&D>QuD<3eS48CH0j!FpMLnx
z<GH|_+JJWTDs7YRc<(IzTa~k=<?NDB&*qK7=l=Z`z}O>`+l`*v$x!*ol^Lxu8G6n9
z({rXtPPP>BT>9<X7a`GyB#yqI+dr_v<A@GQVBxiNsQ6k$fOqeYmh!=os9FpB-?;}S
zzMjvSkehvaJOfYY{qGhnPe~))PKqlJekpIJEFY_~#NOVNx<pOz0neJO!mF)>vmEMf
zdTYTSY2Oexs2IPpSO<w)yWp#s`aEQ(ES{6UMZ;Qedjf?z#~Fl|Vo}wUBk`*I-nE;C
zChf*2Jm~$!Y9N;25a%29YvM&69-m6l|E#-lKb1(JPlN@=kD2%J4b@CRQ=0VO2pDWF
L?Ja6h9`XMJyYa7k

literal 0
HcmV?d00001

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index 82ff505e69..73f0ac5e75 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -430,7 +430,7 @@ protected IStatus run(IProgressMonitor monitor) {
 	}
 
 	protected Image getTitleImage() {
-		return imageCache.create("/icons/full/wizban/newsearch_wiz.gif"); //$NON-NLS-1$
+		return imageCache.create("/icons/full/wizban/newsearch_wiz.png"); //$NON-NLS-1$
 	}
 
 	protected void createOptions(Composite compOptions) {

From 17e9c4a28e93eb79eab773ecd37d890bff965dd8 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Date: Thu, 4 Jun 2020 14:18:18 +0530
Subject: [PATCH 1157/1286] Bug 563840 - POM and product version change for
 4.17 release

Change-Id: Ie597950c60b92fca5ca3afa26644d9ba86a5a6e7
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
---
 bundles/org.eclipse.e4.tools.compat/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml     | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml          | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                   | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 4 ++--
 tests/org.eclipse.e4.tools.test/pom.xml                | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 7f45516952..7a8649bbe9 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.16.0-SNAPSHOT</version>
+    <version>4.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 9881d95c7b..ad0105c2f9 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.16.0-SNAPSHOT</version>
+    <version>4.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index f675100f6b..230623cc24 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.16.0-SNAPSHOT</version>
+    <version>4.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 1cfb7873a9..3431bb333d 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.16.0-SNAPSHOT</version>
+    <version>4.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index d2da9100f9..d6ef7750b5 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.16.0-SNAPSHOT</version>
+    <version>4.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 33919d8987..a7f7f7070c 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.16.0-SNAPSHOT</version>
+    <version>4.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index ca788e1faa..de00561a67 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.16.0.qualifier"
+      version="4.17.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 3f8decebbd..c71c3bc7f0 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.16.0-SNAPSHOT</version>
+    <version>4.17.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>4.16.0-SNAPSHOT</version>
+  <version>4.17.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index ca58796e93..056c579e93 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.16.0-SNAPSHOT</version>
+		<version>4.17.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From 9f7d23bc6f70a5b2363f114e2abd5565848862c5 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 8 Jun 2020 16:18:33 +0200
Subject: [PATCH 1158/1286] 4.17 update of org.eclipse.e4.tools.emf.ui

Change-Id: If9c5be202dc8e33a25f94d48c0334d5ed9ff4dbf
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 0948fd3422..24e1212270 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.6.800.qualifier
+Bundle-Version: 4.6.900.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 230623cc24..0c29dba572 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.6.800-SNAPSHOT</version>
+  <version>4.6.900-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>

From 9adac52b2b8c6ff33e07abccdc6d9d743c61c8b7 Mon Sep 17 00:00:00 2001
From: Kenneth Styrberg <kenneth@kean.nu>
Date: Wed, 3 Jun 2020 19:47:35 +0200
Subject: [PATCH 1159/1286] Bug 563872 - NPE in checkDeltaContainsE4xmi

- Add check if resource delta is null

Change-Id: Ib1656c29084bc9ec6be20e7a77f6537d8a35db8d
Signed-off-by: Kenneth Styrberg <kenneth@kean.nu>
---
 .../src/org/eclipse/e4/tools/emf/ui/common/Util.java        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index aee76a9563..458d893f44 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -310,11 +310,11 @@ private static void registerE4XmiListener() {
 			ResourcesPlugin.getWorkspace().addResourceChangeListener(new IResourceChangeListener() {
 				@Override
 				public void resourceChanged(IResourceChangeEvent event) {
-					// Nothing to do if resource set not yet used !
-					if (modelResourceSet == null) {
+					IResourceDelta delta = event.getDelta();
+					// Nothing to do if resource set not yet used or no resource change recorded!
+					if (modelResourceSet == null || delta == null) {
 						return;
 					}
-					IResourceDelta delta = event.getDelta();
 					checkDeltaContainsE4xmi(delta);
 				}
 

From e535f861f1f9731e544d82c13bbdbda380eb1a86 Mon Sep 17 00:00:00 2001
From: Karsten Thoms <karsten.thoms@karakun.com>
Date: Fri, 29 May 2020 10:47:30 +0200
Subject: [PATCH 1160/1286] Bug 563701 - Use camel case in editor.name

Includes 4.17 version update for org.eclipse.e4.tools.emf.editor3x

Change-Id: Ia7f61ad543a5eddd647b7d3401082785b2a50ae3
Signed-off-by: Karsten Thoms <karsten.thoms@karakun.com>
---
 bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF  | 2 +-
 .../OSGI-INF/l10n/bundle.properties                             | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 304306f9f6..2cc43a2fd8 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 4.7.500.qualifier
+Bundle-Version: 4.7.600.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
index 482fea1f55..1e2453258b 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
@@ -1,5 +1,5 @@
 #Properties file for org.eclipse.e4.tools.emf.editor3x
-editor.name = Eclipse 4 model editor
+editor.name = Eclipse 4 Model Editor
 page.name = Model Editor
 Bundle-Name = Editor3x
 Bundle-Vendor = Eclipse.org
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index ad0105c2f9..cfd99ddbbb 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.editor3x</artifactId>
-  <version>4.7.500-SNAPSHOT</version>
+  <version>4.7.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>

From da5db8882840461bfbcc1d61e4d8119fc3b889dd Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 5 Jun 2020 18:22:25 +0200
Subject: [PATCH 1161/1286] Bug 564063 - Using
 ArrayContentProvider.getInstance() instead of new instance

ArrayContentProvider does not hold any data, hence it can be shared
across instances.

Change-Id: Ide0af06215772db04db598f634af9ab64526512c
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../e4/tools/emf/ui/internal/common/E4PickList.java    |  2 +-
 .../internal/common/component/ApplicationEditor.java   | 10 +++++-----
 .../emf/ui/internal/common/component/AreaEditor.java   |  2 +-
 .../internal/common/component/CompositePartEditor.java |  2 +-
 .../emf/ui/internal/common/component/MenuEditor.java   |  2 +-
 .../ui/internal/common/component/MenuItemEditor.java   |  4 ++--
 .../common/component/PartSashContainerEditor.java      |  2 +-
 .../ui/internal/common/component/ToolItemEditor.java   |  4 ++--
 .../ui/internal/common/component/TrimBarEditor.java    |  2 +-
 .../common/component/TrimContributionEditor.java       |  2 +-
 .../dialogs/AbstractCommandSelectionDialog.java        |  2 +-
 .../common/component/dialogs/AbstractIdDialog.java     |  2 +-
 .../dialogs/BindingContextSelectionDialog.java         |  2 +-
 .../dialogs/CommandCategorySelectionDialog.java        |  2 +-
 .../common/component/dialogs/ExpressionIdDialog.java   |  2 +-
 .../dialogs/FindParentReferenceElementDialog.java      |  2 +-
 .../common/component/dialogs/SharedElementsDialog.java |  2 +-
 .../component/virtual/VPerspectiveControlEditor.java   |  2 +-
 .../internal/common/properties/ExportIdsHandler.java   |  2 +-
 .../common/properties/ExternalizeStringHandler.java    |  2 +-
 20 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
index cdf5173f61..8b75059430 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
@@ -97,7 +97,7 @@ public E4PickList(Composite parent, int style, List<PickListFeatures> listFeatur
 		this.componentEditor = componentEditor;
 		this.feature = feature;
 
-		picker.setContentProvider(new ArrayContentProvider());
+		picker.setContentProvider(ArrayContentProvider.getInstance());
 		picker.setLabelProvider(new LabelProvider() {
 			@Override
 			public String getText(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 1fefd724eb..3e8b913121 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -448,7 +448,7 @@ public void createControl(Composite parent) {
 						.setStyle(SWT.ITALIC);
 				bindtableViewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
 						new ComponentLabelProvider(getEditor(), Messages, italicFontDescriptor)));
-				bindtableViewer.setContentProvider(new ArrayContentProvider());
+				bindtableViewer.setContentProvider(ArrayContentProvider.getInstance());
 				bindtableViewer.setInput(application.getBindingTables());
 				bindtableViewer.addSelectionChangedListener(event -> setPageComplete(isPageComplete()));
 				bindtableViewer.setSelection(new StructuredSelection(application.getBindingTables().get(0)));
@@ -512,7 +512,7 @@ public void createControl(Composite parent) {
 				l.setText(Messages.ApplicationEditor_Type);
 
 				typeViewer = new ComboViewer(group, SWT.READ_ONLY);
-				typeViewer.setContentProvider(new ArrayContentProvider());
+				typeViewer.setContentProvider(ArrayContentProvider.getInstance());
 				typeViewer.setInput(ItemType.values());
 				typeViewer.setSelection(new StructuredSelection(ItemType.PUSH));
 			}
@@ -524,7 +524,7 @@ public void createControl(Composite parent) {
 
 				menuViewer = new TableViewer(group);
 				menuViewer.setLabelProvider(new HiearchyLabelProvider());
-				menuViewer.setContentProvider(new ArrayContentProvider());
+				menuViewer.setContentProvider(ArrayContentProvider.getInstance());
 
 				final List<MMenu> menuList = new ArrayList<>();
 				final Iterator<EObject> it = EcoreUtil.getAllContents(Collections.singleton(application));
@@ -597,7 +597,7 @@ public void createControl(Composite parent) {
 
 				typeViewer = new ComboViewer(group, SWT.READ_ONLY);
 				// viewer.setLabelProvider(labelProvider)
-				typeViewer.setContentProvider(new ArrayContentProvider());
+				typeViewer.setContentProvider(ArrayContentProvider.getInstance());
 				typeViewer.setInput(ItemType.values());
 			}
 
@@ -608,7 +608,7 @@ public void createControl(Composite parent) {
 
 				toolbarViewer = new TableViewer(group);
 				toolbarViewer.setLabelProvider(new HiearchyLabelProvider());
-				toolbarViewer.setContentProvider(new ArrayContentProvider());
+				toolbarViewer.setContentProvider(ArrayContentProvider.getInstance());
 
 				final List<MToolBar> toolbarList = new ArrayList<>();
 				final Iterator<EObject> it = EcoreUtil.getAllContents(Collections.singleton(application));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 5b1ec8e93e..46a7dc6e76 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -252,7 +252,7 @@ public void widgetSelected(SelectionEvent e) {
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setContentProvider(ArrayContentProvider.getInstance());
 			viewer.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index bf583e3a3b..2f3938f444 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -174,7 +174,7 @@ protected void createSubformElements(Composite parent, EMFDataBindingContext con
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setContentProvider(ArrayContentProvider.getInstance());
 			viewer.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 137023060b..102277742e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -296,7 +296,7 @@ public void widgetSelected(SelectionEvent e) {
 
 			final ComboViewer combo = new ComboViewer(parent);
 			combo.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			combo.setContentProvider(new ArrayContentProvider());
+			combo.setContentProvider(ArrayContentProvider.getInstance());
 			combo.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index de0aeecfbe..be57ad2c48 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -188,7 +188,7 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 				l.setLayoutData(new GridData());
 
 				final ComboViewer viewer = new ComboViewer(parent);
-				viewer.setContentProvider(new ArrayContentProvider());
+				viewer.setContentProvider(ArrayContentProvider.getInstance());
 				viewer.setInput(new ItemType[] { ItemType.CHECK, ItemType.PUSH, ItemType.RADIO });
 				final GridData gd = new GridData();
 				gd.horizontalSpan = 2;
@@ -283,7 +283,7 @@ public Boolean convert(ItemType fromObject) {
 
 			final ComboViewer combo = new ComboViewer(parent);
 			combo.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			combo.setContentProvider(new ArrayContentProvider());
+			combo.setContentProvider(ArrayContentProvider.getInstance());
 			combo.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 093a083aee..4843ef619b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -248,7 +248,7 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setContentProvider(ArrayContentProvider.getInstance());
 			viewer.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 8890830ec6..fcbbba7c8e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -195,7 +195,7 @@ protected void createFormSubTypeForm(Composite parent, CTabFolder folder, EMFDat
 			l.setLayoutData(new GridData());
 
 			final ComboViewer viewer = new ComboViewer(parent);
-			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setContentProvider(ArrayContentProvider.getInstance());
 			viewer.setInput(new ItemType[] { ItemType.CHECK, ItemType.PUSH, ItemType.RADIO });
 			final GridData gd = new GridData();
 			gd.horizontalSpan = 2;
@@ -303,7 +303,7 @@ public Boolean convert(ItemType fromObject) {
 
 			final ComboViewer combo = new ComboViewer(parent);
 			combo.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			combo.setContentProvider(new ArrayContentProvider());
+			combo.setContentProvider(ArrayContentProvider.getInstance());
 			combo.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 0ab5d0b393..8efaaf82c7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -194,7 +194,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 			l.setLayoutData(new GridData());
 
 			final ComboViewer viewer = new ComboViewer(parent);
-			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setContentProvider(ArrayContentProvider.getInstance());
 			viewer.setInput(SideValue.values());
 			final GridData gd = new GridData();
 			gd.horizontalSpan = 2;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 205741b3b2..eeeabfbcf3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -243,7 +243,7 @@ protected void addPressed() {
 			viewer.setContentProvider(new ObservableListContentProvider<>());
 			viewer.setInput(E4Properties.<MTrimElement>children().observeDetail(getMaster()));
 
-			pickList.setContentProvider(new ArrayContentProvider());
+			pickList.setContentProvider(ArrayContentProvider.getInstance());
 			pickList.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index f7e17c9c42..09dc03c1fd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -88,7 +88,7 @@ protected Control createDialogArea(Composite parent) {
 
 		new Label(container, SWT.NONE);
 		viewer = new TableViewer(container);
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setLabelProvider(new LabelProviderImpl());
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 		viewer.addDoubleClickListener(event -> okPressed());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
index 9b768d0a35..09227a36f6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
@@ -113,7 +113,7 @@ protected boolean isParentMatch(Viewer viewer, Object element) {
 		l = new Label(container, SWT.NONE);
 		viewer = new TableViewer(container);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setLabelProvider(getLabelProvider());
 		viewer.addFilter(filter);
 		viewer.addDoubleClickListener(event -> okPressed());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
index c5b4594419..db01936160 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
@@ -85,7 +85,7 @@ protected Control createDialogArea(Composite parent) {
 
 		new Label(container, SWT.NONE);
 		viewer = new TableViewer(container);
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setLabelProvider(new LabelProviderImpl());
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 		viewer.addDoubleClickListener(event -> okPressed());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
index 2101df8504..a2fee8cc65 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -86,7 +86,7 @@ protected Control createDialogArea(Composite parent) {
 
 		new Label(container, SWT.NONE);
 		viewer = new TableViewer(container);
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setLabelProvider(new LabelProviderImpl());
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 		viewer.addDoubleClickListener(event -> okPressed());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
index 03b714e9a7..12ea87dac5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
@@ -91,7 +91,7 @@ protected boolean isParentMatch(Viewer viewer, Object element) {
 		l = new Label(container, SWT.NONE);
 		viewer = new TableViewer(container);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setLabelProvider(new LabelProviderImpl());
 		viewer.addFilter(filter);
 		viewer.setInput(getElements(lookup));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index a261b17461..79dd02d501 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -140,7 +140,7 @@ protected Control createDialogArea(Composite parent) {
 		combo.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
 		eClassViewer.setLabelProvider(LabelProvider.createTextProvider(element -> ((EClass) element).getName()));
 
-		eClassViewer.setContentProvider(new ArrayContentProvider());
+		eClassViewer.setContentProvider(ArrayContentProvider.getInstance());
 		final List<EClass> eClassList = getExtendableClasses();
 		eClassViewer.setComparator(new ViewerComparator() {
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index 71b8e673eb..0d29ea0be0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -97,7 +97,7 @@ protected Control createDialogArea(Composite parent) {
 		l = new Label(container, SWT.NONE);
 
 		viewer = new TableViewer(container);
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setLabelProvider(new LabelProviderImpl());
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index b366bf9c0c..404399fee5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -150,7 +150,7 @@ protected void addPressed() {
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 			viewer = pickList.getList();
 
-			pickList.setContentProvider(new ArrayContentProvider());
+			pickList.setContentProvider(ArrayContentProvider.getInstance());
 			pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
 			pickList.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER,
 					BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
index 7dc09a4371..a5b5730326 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
@@ -232,7 +232,7 @@ public String getText(Object element) {
 
 			entries.sort(null);
 
-			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setContentProvider(ArrayContentProvider.getInstance());
 			viewer.setInput(entries);
 			viewer.setAllChecked(true);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
index d07628cd73..32116da68b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
@@ -201,7 +201,7 @@ public String getText(Object element) {
 					}
 				}
 			}
-			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setContentProvider(ArrayContentProvider.getInstance());
 			viewer.setInput(entries);
 			viewer.setAllChecked(true);
 

From e2320ee3775a67074a4ed47121d04a3dce012c29 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 25 May 2020 12:18:40 +0200
Subject: [PATCH 1162/1286] Bug 563544 - Use requestLayout instead of
 layout(true,true) in model editor

If a fragment is edited, the model editor performs a forced synchron
layout which seems unnecessary. I suggest to switch to asynchronous
layouting.

Change-Id: Iccc1f4efd9db7307b0bc9bc797df788a744f9662
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../emf/ui/internal/common/component/AbstractPartEditor.java    | 2 +-
 .../e4/tools/emf/ui/internal/common/component/AddonsEditor.java | 2 +-
 .../e4/tools/emf/ui/internal/common/component/AreaEditor.java   | 2 +-
 .../emf/ui/internal/common/component/BindingContextEditor.java  | 2 +-
 .../emf/ui/internal/common/component/BindingTableEditor.java    | 2 +-
 .../tools/emf/ui/internal/common/component/CategoryEditor.java  | 2 +-
 .../tools/emf/ui/internal/common/component/CommandEditor.java   | 2 +-
 .../ui/internal/common/component/CommandParameterEditor.java    | 2 +-
 .../common/component/DynamicMenuContributionEditor.java         | 2 +-
 .../tools/emf/ui/internal/common/component/HandlerEditor.java   | 2 +-
 .../emf/ui/internal/common/component/KeyBindingEditor.java      | 2 +-
 .../ui/internal/common/component/MenuContributionEditor.java    | 2 +-
 .../e4/tools/emf/ui/internal/common/component/MenuEditor.java   | 2 +-
 .../tools/emf/ui/internal/common/component/MenuItemEditor.java  | 2 +-
 .../emf/ui/internal/common/component/MenuSeparatorEditor.java   | 2 +-
 .../tools/emf/ui/internal/common/component/ParameterEditor.java | 2 +-
 .../emf/ui/internal/common/component/PartDescriptorEditor.java  | 2 +-
 .../ui/internal/common/component/PartSashContainerEditor.java   | 2 +-
 .../tools/emf/ui/internal/common/component/PartStackEditor.java | 2 +-
 .../emf/ui/internal/common/component/PerspectiveEditor.java     | 2 +-
 .../ui/internal/common/component/PerspectiveStackEditor.java    | 2 +-
 .../emf/ui/internal/common/component/PlaceholderEditor.java     | 2 +-
 .../ui/internal/common/component/ToolBarContributionEditor.java | 2 +-
 .../tools/emf/ui/internal/common/component/ToolBarEditor.java   | 2 +-
 .../ui/internal/common/component/ToolBarSeparatorEditor.java    | 2 +-
 .../emf/ui/internal/common/component/ToolControlEditor.java     | 2 +-
 .../tools/emf/ui/internal/common/component/ToolItemEditor.java  | 2 +-
 .../tools/emf/ui/internal/common/component/TrimBarEditor.java   | 2 +-
 .../ui/internal/common/component/TrimContributionEditor.java    | 2 +-
 .../e4/tools/emf/ui/internal/common/component/WindowEditor.java | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java
index 810f62c557..e0ee6d8989 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java
@@ -114,7 +114,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 172c5559c4..dc674be083 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -115,7 +115,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 46a7dc6e76..e409773e94 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -180,7 +180,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index cfb1ed7f31..1cf58bec54 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -135,7 +135,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index ce69275cfc..ba449194ff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -124,7 +124,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index 9df337562c..9ea755767b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -95,7 +95,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index a453701911..4ebeda8e15 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -127,7 +127,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 6463825fff..9a73c36a4c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -110,7 +110,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
index e6d75284e4..43f263321d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
@@ -107,7 +107,7 @@ protected Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 6e97cbe6e3..b630ff5c15 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -117,7 +117,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 471a3dfe18..84f4e1dc56 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -135,7 +135,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 638c2b1399..ca02b73d8a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -166,7 +166,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 102277742e..d28d5c13bf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -193,7 +193,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 		if (stackLayout.topControl != topControl) {
 			stackLayout.topControl = topControl;
-			composite.layout(true, true);
+			composite.requestLayout();
 		}
 
 		getMaster().setValue((MMenu) object);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index be57ad2c48..c4ee6e45cb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -142,7 +142,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index f9220d6948..0691dbcc09 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -103,7 +103,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index 542f61ec4b..352364adb7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -112,7 +112,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 5087884cc2..1f44826cec 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -124,7 +124,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 4843ef619b..913d1e0532 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -202,7 +202,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index e752fd39da..f74ac95a77 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -180,7 +180,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 		viewer.setInput(E4Properties.<MStackElement>children().observeDetail(getMaster()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index e873730e14..bfd0896b7a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -176,7 +176,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index f13b3ec63f..0bd9de2b03 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -151,7 +151,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 7ff2b25e94..1a34f4ff44 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -149,7 +149,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 4fa620db5d..5bacfde343 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -169,7 +169,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 51a431f505..cd8f72bef4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -140,7 +140,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 529be7ac94..5514dd9847 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -104,7 +104,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 06764f7a71..d959957161 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -121,7 +121,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index fcbbba7c8e..9963d96737 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -118,7 +118,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 8efaaf82c7..381a58e261 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -152,7 +152,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index eeeabfbcf3..911c897dd0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -161,7 +161,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 36a76d7080..df8b1fa2c6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -138,7 +138,7 @@ public Composite doGetEditor(Composite parent, Object object) {
 
 			if (stackLayout.topControl != topControl) {
 				stackLayout.topControl = topControl;
-				composite.layout(true, true);
+				composite.requestLayout();
 			}
 		}
 

From 12d30e504e94b1941aff83dfa7f532b6579a0ebb Mon Sep 17 00:00:00 2001
From: Karsten Thoms <karsten.thoms@karakun.com>
Date: Wed, 20 May 2020 16:42:06 +0200
Subject: [PATCH 1163/1286] Bug 563386 - UISynchronize: Add disposal check

This aligns the implementation to the one used in
E4Application#createE4Workbench.

Change-Id: I48c013f4825f2ed97f3f881ff1fb4e1fe9d71c86
Signed-off-by: Karsten Thoms <karsten.thoms@karakun.com>
---
 .../META-INF/MANIFEST.MF                         |  2 +-
 bundles/org.eclipse.e4.tools.compat/pom.xml      |  2 +-
 .../compat/internal/ContextServiceFactory.java   | 16 ++++++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 5e96976389..8d2ebf8243 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 4.7.600.qualifier
+Bundle-Version: 4.7.700.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 7a8649bbe9..9f463e23e7 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.compat</artifactId>
-  <version>4.7.600-SNAPSHOT</version>
+  <version>4.7.700-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index 8594181e7c..525a700229 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -45,7 +45,7 @@ public class ContextServiceFactory extends AbstractServiceFactory {
 
 	@Override
 	public Object create(Class serviceInterface, IServiceLocator parentLocator,
-		IServiceLocator locator) {
+			IServiceLocator locator) {
 		if (!IEclipseContext.class.equals(serviceInterface)) {
 			return null;
 		}
@@ -70,17 +70,21 @@ public Object create(Class serviceInterface, IServiceLocator parentLocator,
 			appContext.set(IClipboardService.class, new ClipboardServiceImpl());
 			appContext.set(Realm.class, Realm.getDefault());
 
-			final Display d = Display.getCurrent();
+			final Display display = Display.getCurrent();
 			appContext.set(UISynchronize.class, new UISynchronize() {
 
 				@Override
 				public void syncExec(Runnable runnable) {
-					d.syncExec(runnable);
+					if (display != null && !display.isDisposed()) {
+						display.syncExec(runnable);
+					}
 				}
 
 				@Override
 				public void asyncExec(Runnable runnable) {
-					d.asyncExec(runnable);
+					if (display != null && !display.isDisposed()) {
+						display.asyncExec(runnable);
+					}
 				}
 			});
 
@@ -114,7 +118,7 @@ public CSSStyleDeclaration getStyle(Object widget) {
 
 				@Override
 				public void setClassnameAndId(Object widget, String classname,
-					String id) {
+						String id) {
 					((Widget) widget).setData("org.eclipse.e4.ui.css.CssClassName", classname); //$NON-NLS-1$
 					((Widget) widget).setData("org.eclipse.e4.ui.css.id", id); //$NON-NLS-1$
 					engine.applyStyles(widget, true);
@@ -123,7 +127,7 @@ public void setClassnameAndId(Object widget, String classname,
 
 			if (appContext.get(ILoggerProvider.class) == null) {
 				appContext.set(ILoggerProvider.class,
-					ContextInjectionFactory.make(DefaultLoggerProvider.class, appContext));
+						ContextInjectionFactory.make(DefaultLoggerProvider.class, appContext));
 			}
 
 			return appContext;

From f9107a4afbcd4eb791e42b6d77d950985ec30b5a Mon Sep 17 00:00:00 2001
From: Ed Merks <ed.merks@gmail.com>
Date: Thu, 25 Jun 2020 11:02:33 +0200
Subject: [PATCH 1164/1286] Bug 562813 - Delete Mark MInput and MInputPart

Change-Id: I23877262e715e833afd7e50bc984a3d44edb07cd
Signed-off-by: Ed Merks <ed.merks@gmail.com>
---
 .../component/dialogs/FindParentReferenceElementDialog.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index 79dd02d501..81095d433c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -286,7 +286,7 @@ private List<EClass> getExtendableClasses() {
 				for (EClass c : p.getAllClasses()) {
 					// Fix 530772 : as far as MInput is still in Application meta model, it should
 					// removed manually ! (see also 509868)
-					if (Util.canBeExtendedInAFragment(c) && !"InputPart".equals(c.getName())) { //$NON-NLS-1$
+					if (Util.canBeExtendedInAFragment(c)) {
 						extendableClasses.add(c);
 					}
 				}

From ac0aa4c721252d5d1c4ecc67fc5dcc98b45e4e76 Mon Sep 17 00:00:00 2001
From: Rolf Theunissen <rolf.theunissen@gmail.com>
Date: Thu, 11 Jun 2020 22:16:24 +0200
Subject: [PATCH 1165/1286] Bug 473980 - Label of Handled Menu Item not updated
 in Menu's overview

Change-Id: I5436397b00f3d490cb91626905ffcb5106d8ffe4
Signed-off-by: Rolf Theunissen <rolf.theunissen@gmail.com>
---
 .../emf/ui/internal/common/E4PickList.java    | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
index 8b75059430..d73df89cd5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
@@ -17,8 +17,11 @@
 
 import java.util.List;
 
+import org.eclipse.core.databinding.observable.map.IObservableMap;
+import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
+import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
 import org.eclipse.e4.ui.model.application.MApplicationElement;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -35,6 +38,7 @@
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.databinding.viewers.ObservableMapCellLabelProvider;
 import org.eclipse.jface.resource.FontDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.CellNavigationStrategy;
@@ -49,6 +53,7 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewerEditor;
 import org.eclipse.jface.viewers.TableViewerFocusCellManager;
+import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.widgets.Composite;
@@ -106,13 +111,28 @@ public String getText(Object element) {
 			}
 		});
 
-		final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont())
-				.setStyle(SWT.ITALIC);
-		viewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
-				new ComponentLabelProvider(componentEditor.getEditor(), new Messages(), italicFontDescriptor)));
 		final ObservableListContentProvider<?> cp = new ObservableListContentProvider<>();
 		viewer.setContentProvider(cp);
 
+		final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont())
+				.setStyle(SWT.ITALIC);
+		DelegatingStyledCellLabelProvider labelprovider = new DelegatingStyledCellLabelProvider(
+				new ComponentLabelProvider(componentEditor.getEditor(), new Messages(), italicFontDescriptor));
+
+		@SuppressWarnings({ "unchecked", "rawtypes" })
+		// Cast, because MUILabel is not part of E's type
+		final IObservableMap<?, ?> attributeMap = ((IValueProperty) E4Properties
+				.label(componentEditor.getEditingDomain())).observeDetail(cp.getKnownElements());
+
+		ObservableMapCellLabelProvider observableLabelProvider = new ObservableMapCellLabelProvider(attributeMap) {
+			@Override
+			public void update(ViewerCell cell) {
+				labelprovider.update(cell);
+			}
+		};
+
+		viewer.setLabelProvider(observableLabelProvider);
+
 		viewer.addOpenListener(event -> {
 			if (event.getSelection() instanceof IStructuredSelection) {
 				IStructuredSelection selection = (IStructuredSelection) event.getSelection();

From d266b5f4ff55b122338cf1a63b59f343b3a2b318 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Tue, 14 Jul 2020 16:56:45 +0200
Subject: [PATCH 1166/1286] Bug 565213 - e4 Model Editor should display
 detailed Label for Menu,Trim and Toolbar contributions

Change-Id: I6256aa7be1f93a793afdb0dc7dfff3345072c547
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
---
 .../common/component/MenuContributionEditor.java      | 11 ++++++++++-
 .../common/component/ToolBarContributionEditor.java   |  9 +++++++++
 .../common/component/TrimContributionEditor.java      |  9 +++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index ca02b73d8a..d6e9c5f8d7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -34,10 +34,12 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList.Struct;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.MenuIdDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuContributionImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
 import org.eclipse.e4.ui.workbench.modeling.EModelService;
 import org.eclipse.emf.common.command.Command;
@@ -133,7 +135,14 @@ public String getLabel(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
-		return null;
+
+		if (element instanceof MenuContributionImpl) {
+			String pid = ((MenuContributionImpl) element).getParentId();
+			if (E.notEmpty(pid)) {
+				return pid;
+			}
+		}
+	return null;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 5bacfde343..8721e134cc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -36,12 +36,14 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList.Struct;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ToolBarIdDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.ToolBarContributionImpl;
 import org.eclipse.e4.ui.workbench.modeling.EModelService;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -136,6 +138,13 @@ public String getLabel(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
+
+		if (element instanceof ToolBarContributionImpl) {
+			String pid = ((ToolBarContributionImpl) element).getParentId();
+			if (E.notEmpty(pid)) {
+				return pid;
+			}
+		}
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 911c897dd0..6190d03e90 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -38,12 +38,14 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.TrimIdDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
 import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.basic.MTrimElement;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.TrimContributionImpl;
 import org.eclipse.e4.ui.workbench.modeling.EModelService;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
@@ -128,6 +130,13 @@ public String getLabel(Object element) {
 
 	@Override
 	public String getDetailLabel(Object element) {
+
+		if (element instanceof TrimContributionImpl) {
+			String pid = ((TrimContributionImpl) element).getParentId();
+			if (E.notEmpty(pid)) {
+				return pid;
+			}
+		}
 		return null;
 	}
 

From 516fe7848929f1942ad1f69285921c436c447581 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 23 Jul 2020 16:29:59 +0200
Subject: [PATCH 1167/1286] Bug 563701 - Rename Eclipse 4 model editor

Change-Id: Iad0bcf761bf787a06a6bd5a0a0a1d1e7828bb509
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../OSGI-INF/l10n/bundle.properties                             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
index 1e2453258b..291f564f1c 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
@@ -1,5 +1,5 @@
 #Properties file for org.eclipse.e4.tools.emf.editor3x
-editor.name = Eclipse 4 Model Editor
+editor.name = Eclipse Model Editor
 page.name = Model Editor
 Bundle-Name = Editor3x
 Bundle-Vendor = Eclipse.org
\ No newline at end of file

From e1b41aaa128b424e968c9315749706450f62ee51 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Date: Fri, 28 Aug 2020 14:39:54 +0530
Subject: [PATCH 1168/1286] Bug 566471 - I20200828-0150 - Comparator Errors
 Found

Change-Id: I5b64da0d093c603f8c2ab6f440fdaecf096d4740
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
index 34a6f3e1e8..818aedda92 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
+++ b/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
@@ -3,4 +3,5 @@ Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
 Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
 Bug 491534 - comparator error in org.eclipse.e4.tools.emf.ui
 Bug 534597 - Unanticipated comparator errors in I20180511-2000
-Bug 562167 - Comparator errors in I20200415-0620
\ No newline at end of file
+Bug 562167 - Comparator errors in I20200415-0620
+Bug 566471 - I20200828-0150 - Comparator Errors Found
\ No newline at end of file

From 6bdebbb3e1fd219aceef19d82944355a96fc454b Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Thu, 3 Sep 2020 15:12:23 +0300
Subject: [PATCH 1169/1286] Bug 566356 - POM and product version change for
 4.18 release

Change-Id: I4fdb98a3997636890e9829b5c85718e5b75376ce
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 bundles/org.eclipse.e4.tools.compat/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml     | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml          | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                   | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 3 +--
 tests/org.eclipse.e4.tools.test/pom.xml                | 2 +-
 9 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 9f463e23e7..02decef11b 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.17.0-SNAPSHOT</version>
+    <version>4.18.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index cfd99ddbbb..084d5a20e5 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.17.0-SNAPSHOT</version>
+    <version>4.18.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 0c29dba572..9df33dc033 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.17.0-SNAPSHOT</version>
+    <version>4.18.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 3431bb333d..ac2e35110c 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.17.0-SNAPSHOT</version>
+    <version>4.18.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index d6ef7750b5..a9aee056a0 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.17.0-SNAPSHOT</version>
+    <version>4.18.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index a7f7f7070c..858bf6888c 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.17.0-SNAPSHOT</version>
+    <version>4.18.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index de00561a67..c46b1eea72 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index c71c3bc7f0..385e1c81db 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,13 +4,12 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.17.0-SNAPSHOT</version>
+    <version>4.18.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <version>4.17.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index 056c579e93..d06910c187 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From 3f2ccc74babd31612c22025f5aa5bd06d8f9982f Mon Sep 17 00:00:00 2001
From: Vikas Chandra <Vikas.Chandra@in.ibm.com>
Date: Fri, 18 Sep 2020 12:08:44 +0530
Subject: [PATCH 1170/1286] Bug 567095 - Comparator errors in I20200917-1800

Change-Id: I912b6f8f642eb81d4a4ebfb01f1e7e28c26157d6
Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>
---
 bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt b/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
index 93c4fe3980..738f004f8e 100644
--- a/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
+++ b/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
@@ -1,3 +1,4 @@
 # To force a version qualifier update add the bug here
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
-Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
\ No newline at end of file
+Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
+Bug 567095 - Comparator errors in I20200917-1800
\ No newline at end of file

From f631e1034012ff1722c9229d9b2b09ceb785c056 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Wed, 23 Sep 2020 14:23:21 +0300
Subject: [PATCH 1171/1286] Version bumps for 4.18

Bundle e4.tools has been touched without bumping the version.
Move to Java 11 as Java 1.8 while on it.

Change-Id: I279b1d2ec07d2c5ef0be2e9ab70cb792935b2261
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 bundles/org.eclipse.e4.tools/.classpath       |  6 ++-
 .../.settings/org.eclipse.jdt.core.prefs      | 37 +++++++++++++++----
 .../org.eclipse.e4.tools/META-INF/MANIFEST.MF |  4 +-
 bundles/org.eclipse.e4.tools/pom.xml          |  2 +-
 4 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/.classpath b/bundles/org.eclipse.e4.tools/.classpath
index eca7bdba8f..4a00becd81 100644
--- a/bundles/org.eclipse.e4.tools/.classpath
+++ b/bundles/org.eclipse.e4.tools/.classpath
@@ -1,6 +1,10 @@
 <?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/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
index 9750dac2bd..89405d9655 100644
--- a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
@@ -29,9 +29,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -48,6 +48,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
@@ -106,6 +107,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=erro
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -143,11 +145,13 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -155,17 +159,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -251,11 +258,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
 org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -286,6 +294,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
 org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -310,13 +320,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
 org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -364,6 +378,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -400,9 +416,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser
 org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -428,8 +447,12 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 027f751cb9..cc9b644864 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 4.8.700.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 4.9.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 858bf6888c..05141db833 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tool</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>4.8.700-SNAPSHOT</version>
+  <version>4.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From 49bf39dfc3028b75dfdb1902e607619a8e82d324 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Fri, 9 Oct 2020 16:18:39 +0200
Subject: [PATCH 1172/1286] Bug 567761 - Model Editor sometimes shows blank
 labels

Fixed

Change-Id: I94b28d37960b2f2e30592656838a98febb270601
Signed-off-by: Wim Jongman <wim.jongman@remainsoftware.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml              | 2 +-
 .../emf/ui/internal/common/component/CommandEditor.java  | 2 +-
 .../emf/ui/internal/common/component/HandlerEditor.java  | 9 ++++++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 24e1212270..328090152d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.6.900.qualifier
+Bundle-Version: 4.6.1000.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 9df33dc033..6fc828774e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.6.900-SNAPSHOT</version>
+  <version>4.6.1000-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 4ebeda8e15..caf06d1cd8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -245,7 +245,7 @@ public String getDetailLabel(Object element) {
 		if (cmd.getCommandName() != null && cmd.getCommandName().trim().length() > 0) {
 			return translate(cmd.getCommandName());
 		}
-		return null;
+		return cmd.getElementId();
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index b630ff5c15..5b83a4bd26 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -16,6 +16,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.text.MessageFormat;
+
 import javax.inject.Inject;
 
 import org.eclipse.core.databinding.UpdateValueStrategy;
@@ -222,10 +224,11 @@ public IObservableList<?> getChildList(Object element) {
 	public String getDetailLabel(Object element) {
 		final MHandler handler = (MHandler) element;
 		if (handler.getCommand() != null && handler.getCommand().getCommandName() != null && handler.getCommand().getCommandName().trim().length() > 0) {
-			return handler.getCommand().getCommandName();
+			return MessageFormat.format("{0} -> {1}", handler.getElementId(), //$NON-NLS-1$
+					translate(handler.getCommand().getCommandName()));
 		}
-
-		return null;
+		return MessageFormat.format("{0} -> {1}", handler.getElementId(), //$NON-NLS-1$
+				(handler.getCommand() != null ? handler.getCommand().getElementId() : handler.getCommand()));
 	}
 
 	@Override

From b011bd55b1cdbde7b5afc3b3587b273b7dfc5687 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mon, 26 Oct 2020 11:36:11 +0200
Subject: [PATCH 1173/1286] Bug 567305 - Create a Java16 SE profile in Tycho

Bump o.e.e4.tools.compat to Java 11 to allow compiling with --release
flag set.

Change-Id: I0aa0b73672b5f70f990385b1de5a2e32c00bfc4e
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../org.eclipse.e4.tools.compat/.classpath    |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs      | 37 +++++++++++++++----
 .../META-INF/MANIFEST.MF                      |  4 +-
 bundles/org.eclipse.e4.tools.compat/pom.xml   |  2 +-
 .../compat/parts/DIMultiPageEditorPart.java   |  7 ++--
 5 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/.classpath b/bundles/org.eclipse.e4.tools.compat/.classpath
index 4f83b2397e..e801ebfb46 100644
--- a/bundles/org.eclipse.e4.tools.compat/.classpath
+++ b/bundles/org.eclipse.e4.tools.compat/.classpath
@@ -1,7 +1,7 @@
 <?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/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
index 68d9f84612..07cc8c6187 100644
--- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
@@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -44,6 +44,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
@@ -100,6 +101,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=erro
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -132,11 +134,13 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -144,17 +148,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -240,11 +247,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
 org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -275,6 +283,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
 org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -299,13 +309,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
 org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -353,6 +367,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -389,9 +405,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser
 org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -417,8 +436,12 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 8d2ebf8243..5c8429350f 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 4.7.700.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 4.8.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 02decef11b..e35f751014 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.compat</artifactId>
-  <version>4.7.700-SNAPSHOT</version>
+  <version>4.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
index cfcfdb4f5b..a5799c93a8 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013 EclipseSource and others.
+ * Copyright (c) 2013, 2020 EclipseSource and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -21,10 +21,11 @@
 import org.eclipse.ui.part.MultiPageEditorPart;
 
 public abstract class DIMultiPageEditorPart extends MultiPageEditorPart
-		implements IDirtyProviderService {
+implements IDirtyProviderService {
 
 	public <T> int addPage(Class<T> clazz) throws PartInitException {
-		DIEditorPart<T> part = new DIEditorPart<T>(clazz) {};
+		DIEditorPart<T> part = new DIEditorPart<>(clazz) {
+		};
 		return addPage(part, getEditorInput());
 
 	}

From 2332f32e331114f0f496d70f47633dc5661306d6 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Date: Wed, 2 Dec 2020 00:14:47 +0530
Subject: [PATCH 1174/1286] Bug 569318 - POM and product version change for
 4.19 release

Change-Id: I5a0b907bcde0e5fa5033c31505d981180fd59313
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
---
 bundles/org.eclipse.e4.tools.compat/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml     | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml          | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                   | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 2 +-
 tests/org.eclipse.e4.tools.test/pom.xml                | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index e35f751014..30cdc00b70 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.18.0-SNAPSHOT</version>
+    <version>4.19.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 084d5a20e5..1d6c467444 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.18.0-SNAPSHOT</version>
+    <version>4.19.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 6fc828774e..cf1d82555f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.18.0-SNAPSHOT</version>
+    <version>4.19.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index ac2e35110c..abc7288fe3 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.18.0-SNAPSHOT</version>
+    <version>4.19.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index a9aee056a0..ea5f599c1f 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.18.0-SNAPSHOT</version>
+    <version>4.19.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 05141db833..b00d642d95 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.18.0-SNAPSHOT</version>
+    <version>4.19.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index c46b1eea72..7d88c2baef 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.18.0.qualifier"
+      version="4.19.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 385e1c81db..5a0fbd34ed 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.18.0-SNAPSHOT</version>
+    <version>4.19.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index d06910c187..aea5a7f2b0 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.18.0-SNAPSHOT</version>
+		<version>4.19.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From fe74be9e869fc6c6be74c79457e28bd6787d9565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Wed, 30 Dec 2020 17:13:51 +0100
Subject: [PATCH 1175/1286] Bug 563459 - Enhance UISynchronize to make it more
 useful
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

upgrade to DisplayUISynchronize

Change-Id: I49128dd9ba4f072aea294dc164c81521746e6be4
Signed-off-by: Christoph Läubrich <laeubi@laeubi-soft.de>
---
 .../META-INF/MANIFEST.MF                       |  3 ++-
 .../compat/internal/ContextServiceFactory.java | 18 ++----------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 5c8429350f..860638af7d 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -18,5 +18,6 @@ Export-Package: org.eclipse.e4.tools.compat.internal;version="0.12.0.qualifier";
  org.eclipse.e4.tools.compat.parts;version="0.12.0.qualifier";x-internal:=true
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
-Import-Package: javax.inject;version="1.0.0"
+Import-Package: javax.inject;version="1.0.0",
+ org.eclipse.e4.ui.workbench.swt
 Automatic-Module-Name: org.eclipse.e4.tools.compat
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
index 525a700229..75561cf10e 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
@@ -26,6 +26,7 @@
 import org.eclipse.e4.ui.di.UISynchronize;
 import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.e4.ui.services.IStylingEngine;
+import org.eclipse.e4.ui.workbench.swt.DisplayUISynchronize;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Widget;
@@ -71,22 +72,7 @@ public Object create(Class serviceInterface, IServiceLocator parentLocator,
 			appContext.set(Realm.class, Realm.getDefault());
 
 			final Display display = Display.getCurrent();
-			appContext.set(UISynchronize.class, new UISynchronize() {
-
-				@Override
-				public void syncExec(Runnable runnable) {
-					if (display != null && !display.isDisposed()) {
-						display.syncExec(runnable);
-					}
-				}
-
-				@Override
-				public void asyncExec(Runnable runnable) {
-					if (display != null && !display.isDisposed()) {
-						display.asyncExec(runnable);
-					}
-				}
-			});
+			appContext.set(UISynchronize.class, new DisplayUISynchronize(display));
 
 			final IThemeManager manager = serviceContext.get(IThemeManager.class);
 			final IThemeEngine engine = manager.getEngineForDisplay(Display.getCurrent());

From 96048f8ae36eef52ec001574e8429d8d28d623de Mon Sep 17 00:00:00 2001
From: Andrey Loskutov <loskutov@gmx.de>
Date: Sat, 2 Jan 2021 10:21:38 +0100
Subject: [PATCH 1176/1286] Bug 570003 - Version issues in Platform UI

Change-Id: I7de5972805b888329b363a0ea2ff9d43e28e2c55
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
---
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.compat/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 860638af7d..9e3d206360 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 4.8.0.qualifier
+Bundle-Version: 4.8.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 30cdc00b70..1a5350290f 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.compat</artifactId>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>4.8.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From 90ce1afbae13afe40d2cf7ae4c8b3c7ff3ed216b Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Tue, 19 Jan 2021 10:27:43 +0200
Subject: [PATCH 1177/1286] Bug 570441 - Move to Tycho 2.2.0

Migrate platform.ui.tools git repo features to the new feature-source.

Change-Id: I7839d5ca34167824e5ba098e86574233bffb1204
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 features/org.eclipse.e4.core.tools.feature/pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 5a0fbd34ed..f900bbfedf 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -15,14 +15,14 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-source-feature-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
         <executions>
           <execution>
             <phase>package</phase>
-            <id>source-feature</id>
+            <id>feature-source</id>
             <goals>
-              <goal>source-feature</goal>
+              <goal>feature-source</goal>
             </goals>
           </execution>
         </executions>
@@ -33,7 +33,7 @@
         <version>${tycho.version}</version>
         <executions>
           <execution>
-            <id>attached-p2-metadata</id>
+            <id>attach-p2-metadata</id>
             <phase>package</phase>
             <goals>
               <goal>p2-metadata</goal>

From 8403228cd24cdad5a976f77359dc6ae77952bf60 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Wed, 3 Feb 2021 16:36:50 +0100
Subject: [PATCH 1178/1286] 4.19 update of org.eclipse.e4.tools.emf.ui

Required for
https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/175702

Change-Id: Ida00f9ca09c6c35d31ab406b53b393d89c1b2ea8
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 328090152d..74134eaa12 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.6.1000.qualifier
+Bundle-Version: 4.6.1100.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index cf1d82555f..8d93c831e6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.6.1000-SNAPSHOT</version>
+  <version>4.6.1100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>

From 919c6de2743bd3f5b25589f24e48e8686acdff8a Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 4 Feb 2021 09:36:12 +0100
Subject: [PATCH 1179/1286] Using Primitve comparison in ObjectViewer

Discovered by testing
https://git.eclipse.org/r/c/jdt/eclipse.jdt.ui/+/175253 a new JDT
cleanup

Change-Id: Icb269c3cbb09d1e02d9134f316e63b1221c8f2bf
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../tools/emf/ui/internal/common/objectdata/ObjectViewer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
index b2498381f7..49f829811c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
@@ -180,7 +180,7 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 						return 1;
 					}
 
-					final int rv = Integer.valueOf(a1.getAccessLevel().value).compareTo(a2.getAccessLevel().value);
+					final int rv = Integer.compare(a1.getAccessLevel().value, a2.getAccessLevel().value);
 					if (rv == 0) {
 						return a1.getName().compareTo(a2.getName());
 					}

From d6c43dc9e46f075378c78a90538b14f5a168e90a Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Wed, 3 Feb 2021 11:42:15 +0100
Subject: [PATCH 1180/1286] Removes unreachable code from RegistryUtil

The same condition is in line 41.

Found during testing of
https://git.eclipse.org/r/c/jdt/eclipse.jdt.ui/+/174008

Change-Id: I040e1943a25eccb7d575f23e8682b1d77b1e66a0
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../internal/common/uistructure/WidgetContentProvider.java  | 3 ---
 .../eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java  | 6 +-----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
index d6da259309..0fe570ad45 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
@@ -77,9 +77,6 @@ public Object[] getChildren(Object parentElement) {
 		} else if (parentElement instanceof Tree) {
 			// No children
 
-		} else if (parentElement instanceof Tree) {
-			// No children
-
 		} else if (parentElement instanceof List) {
 			// No children
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
index f51bc055e1..aa924ce5a1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
@@ -411,11 +411,7 @@ public static RegistryStruct getStruct(Class<? extends MApplicationElement> appl
 			return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.views", "view", NAME); //$NON-NLS-1$ //$NON-NLS-2$
 		} else if (applicationElement == MHandler.class) {
 			return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.handlers", "handler", COMMAND_ID); //$NON-NLS-1$ //$NON-NLS-2$
-		} else if (applicationElement == MPart.class) {
-			return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.views", "view", NAME); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		else if (applicationElement == MPartDescriptor.class) {
+		} else if (applicationElement == MPartDescriptor.class) {
 			if (hint == HINT_EDITOR)
 			{
 				return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.editors", EDITOR, NAME); //$NON-NLS-1$

From 5e656f6b0e1929c1bcbb6f52125fc3d064aa92bd Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Sat, 6 Feb 2021 11:36:39 +0100
Subject: [PATCH 1181/1286] Bug 570914 - Fix for ContributionDataFile for e4
 tools

This class should be refactored / removed at some point in the future.

Change-Id: I6f180274044057eb77c123a83b9ef3b84aeabf05
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 .../common/component/dialogs/ContributionDataFile.java       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
index 474bbe9290..66112df816 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
@@ -697,4 +697,9 @@ public void setContents(IFileState source, int updateFlags, IProgressMonitor mon
 		// TODO Auto-generated method stub
 
 	}
+
+	public IMarker createMarker(String type, Map<String, Object> attributes) throws CoreException {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

From 352ce2afb02cc06087d2bb21bbb288f8cc358508 Mon Sep 17 00:00:00 2001
From: Andrey Loskutov <loskutov@gmx.de>
Date: Wed, 10 Feb 2021 19:28:06 +0100
Subject: [PATCH 1182/1286] Bug 570914 - use fixed API

Change-Id: I47820f225956c357940c5d89de2bb32407e72ee0
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
---
 .../component/dialogs/ContributionDataFile.java     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
index 66112df816..22732c4dba 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
@@ -397,7 +397,7 @@ public void move(IPath destination, int updateFlags, IProgressMonitor monitor) t
 
 	@Override
 	public void move(IProjectDescription description, boolean force, boolean keepHistory, IProgressMonitor monitor)
-		throws CoreException {
+			throws CoreException {
 		// TODO Auto-generated method stub
 
 	}
@@ -509,7 +509,7 @@ public boolean isConflicting(ISchedulingRule rule) {
 
 	@Override
 	public void appendContents(InputStream source, boolean force, boolean keepHistory, IProgressMonitor monitor)
-		throws CoreException {
+			throws CoreException {
 		// TODO Auto-generated method stub
 
 	}
@@ -654,7 +654,7 @@ public boolean isReadOnly() {
 
 	@Override
 	public void move(IPath destination, boolean force, boolean keepHistory, IProgressMonitor monitor)
-		throws CoreException {
+			throws CoreException {
 		// TODO Auto-generated method stub
 
 	}
@@ -674,14 +674,14 @@ public void setCharset(String newCharset, IProgressMonitor monitor) throws CoreE
 
 	@Override
 	public void setContents(InputStream source, boolean force, boolean keepHistory, IProgressMonitor monitor)
-		throws CoreException {
+			throws CoreException {
 		// TODO Auto-generated method stub
 
 	}
 
 	@Override
 	public void setContents(IFileState source, boolean force, boolean keepHistory, IProgressMonitor monitor)
-		throws CoreException {
+			throws CoreException {
 		// TODO Auto-generated method stub
 
 	}
@@ -698,7 +698,8 @@ public void setContents(IFileState source, int updateFlags, IProgressMonitor mon
 
 	}
 
-	public IMarker createMarker(String type, Map<String, Object> attributes) throws CoreException {
+	@Override
+	public IMarker createMarker(String type, Map<String, ? extends Object> attributes) throws CoreException {
 		// TODO Auto-generated method stub
 		return null;
 	}

From 6a857382c3b8784eee71aee4cd378953542a1a27 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Fri, 5 Mar 2021 11:07:17 +0200
Subject: [PATCH 1183/1286] Bug 571689 - POM and product version change for
 4.20 release

Change-Id: I7ec9a3b64b44facc9176b32ff9569cd1fa089de6
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 bundles/org.eclipse.e4.tools.compat/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml     | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml          | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                   | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 2 +-
 tests/org.eclipse.e4.tools.test/pom.xml                | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 1a5350290f..209d6cae98 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.19.0-SNAPSHOT</version>
+    <version>4.20.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 1d6c467444..4ac8c9f9f1 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.19.0-SNAPSHOT</version>
+    <version>4.20.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 8d93c831e6..516f063597 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.19.0-SNAPSHOT</version>
+    <version>4.20.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index abc7288fe3..8dbbae8ec2 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.19.0-SNAPSHOT</version>
+    <version>4.20.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index ea5f599c1f..f250275f80 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.19.0-SNAPSHOT</version>
+    <version>4.20.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index b00d642d95..6ea4dbc6a8 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.19.0-SNAPSHOT</version>
+    <version>4.20.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 7d88c2baef..a2072b9810 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.19.0.qualifier"
+      version="4.20.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index f900bbfedf..c4b91aecbd 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.19.0-SNAPSHOT</version>
+    <version>4.20.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index aea5a7f2b0..b529cec4e8 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.19.0-SNAPSHOT</version>
+		<version>4.20.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From cfc3655a471a19a1191906f195cf9163d0227ae2 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Tue, 27 Apr 2021 20:53:42 +0300
Subject: [PATCH 1184/1286] Bump bundles to Java 11 where there deps already
 moved.

Change-Id: I8191feccb08e06c2f105c0b488a81514c4061c63
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/179892
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../.classpath                                |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs      | 37 +++++++++++++++----
 .../META-INF/MANIFEST.MF                      |  4 +-
 .../org.eclipse.e4.tools.emf.editor3x/pom.xml |  2 +-
 .../org.eclipse.e4.tools.emf.ui/.classpath    |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs      | 13 +++----
 .../META-INF/MANIFEST.MF                      |  4 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml   |  2 +-
 .../emf/ui/internal/common/ModelEditor.java   |  4 +-
 .../.classpath                                |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs      | 37 +++++++++++++++----
 .../META-INF/MANIFEST.MF                      |  4 +-
 .../pom.xml                                   |  2 +-
 .../org.eclipse.e4.tools.services/.classpath  |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs      | 37 +++++++++++++++----
 .../META-INF/MANIFEST.MF                      |  4 +-
 bundles/org.eclipse.e4.tools.services/pom.xml |  2 +-
 17 files changed, 114 insertions(+), 46 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath b/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
index 4f83b2397e..e801ebfb46 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
@@ -1,7 +1,7 @@
 <?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/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
index cab2bbe0e6..b8859ca021 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
@@ -25,9 +25,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -43,6 +43,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
@@ -99,6 +100,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=erro
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -131,11 +133,13 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -143,17 +147,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -239,11 +246,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
 org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -274,6 +282,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
 org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -298,13 +308,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
 org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -352,6 +366,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -388,9 +404,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser
 org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -416,8 +435,12 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 2cc43a2fd8..81cdf2e552 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 4.7.600.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 4.8.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.emf.common;bundle-version="2.6.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 4ac8c9f9f1..4393cd9e79 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.editor3x</artifactId>
-  <version>4.7.600-SNAPSHOT</version>
+  <version>4.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.classpath b/bundles/org.eclipse.e4.tools.emf.ui/.classpath
index d3f10d84ab..db15c83a56 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.classpath
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.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/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
 			<accessrule kind="accessible" pattern="org/eclipse/e4/**"/>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
index 55a19fa17a..691700bc47 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -29,9 +29,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -47,6 +47,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
@@ -105,6 +106,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=erro
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -140,7 +142,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
@@ -157,7 +160,6 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16
@@ -278,7 +280,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
 org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
@@ -349,7 +350,6 @@ org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
 org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
 org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
@@ -494,7 +494,6 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
 org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 74134eaa12..6b17bc67ca 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.6.1100.qualifier
+Bundle-Version: 4.7.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.core.databinding.property;bundle-version="1.2.100",
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 516f063597..e696628bf9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.6.1100-SNAPSHOT</version>
+  <version>4.7.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index d9691443b1..88395f20a2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -577,7 +577,7 @@ private Composite createFormTab(Composite composite) {
 		StackLayout layout = new StackLayout();
 		contentContainer.setLayout(layout);
 
-		form.setWeights(new int[] { 2, 5 });
+		form.setWeights(2, 5);
 
 		viewer.getTree().addKeyListener(new KeyAdapter() {
 			@Override
@@ -1071,7 +1071,7 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		viewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
 				new ComponentLabelProvider(this, messages, italicFontDescriptor)));
 		final ObservableListTreeContentProvider<Object> contentProvider = new ObservableListTreeContentProvider<>(
-				new ObservableFactoryImpl(), new TreeStructureAdvisor<Object>() {
+				new ObservableFactoryImpl(), new TreeStructureAdvisor<>() {
 				});
 		viewer.setContentProvider(contentProvider);
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.classpath b/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
index eca7bdba8f..e801ebfb46 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.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/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
index 433e2551fe..d4b0b74ab9 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
@@ -29,9 +29,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -47,6 +47,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
@@ -105,6 +106,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=erro
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -140,11 +142,13 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -152,17 +156,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -248,11 +255,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
 org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -283,6 +291,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
 org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -307,13 +317,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
 org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -361,6 +375,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -397,9 +413,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser
 org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -425,8 +444,12 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index 8f75dfd8dd..f827cf374d 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
-Bundle-Version: 4.8.400.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 4.9.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.20.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
  org.eclipse.jface.text;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 8dbbae8ec2..f04969d4dc 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.jdt.templates</artifactId>
-  <version>4.8.400-SNAPSHOT</version>
+  <version>4.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools.services/.classpath b/bundles/org.eclipse.e4.tools.services/.classpath
index eca7bdba8f..e801ebfb46 100644
--- a/bundles/org.eclipse.e4.tools.services/.classpath
+++ b/bundles/org.eclipse.e4.tools.services/.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/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
index 57fcaa32f5..feea330fcf 100644
--- a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
@@ -28,9 +28,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -46,6 +46,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
@@ -104,6 +105,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=erro
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -139,11 +141,13 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -151,17 +155,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -247,11 +254,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
 org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -282,6 +290,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
 org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -306,13 +316,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
 org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -360,6 +374,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -396,9 +412,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser
 org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -424,8 +443,12 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 69f41a830d..522e7e6ebf 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
-Bundle-Version: 4.8.400.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Version: 4.9.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.emf.ui",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
 Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index f250275f80..19e576c72d 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.services</artifactId>
-  <version>4.8.400-SNAPSHOT</version>
+  <version>4.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From fb795e58aa7306b7e0069fe256d15f1a5de4d00a Mon Sep 17 00:00:00 2001
From: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Date: Thu, 3 Jun 2021 20:44:47 +0530
Subject: [PATCH 1185/1286] Bug 573960 - POM and product version change for
 4.21 release

Change-Id: I7bc7819bf41d1888683a4132bd8668e123e39da6
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/181366
---
 bundles/org.eclipse.e4.tools.compat/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml     | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml          | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                   | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 2 +-
 tests/org.eclipse.e4.tools.test/pom.xml                | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 209d6cae98..d68b8e7e8d 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.20.0-SNAPSHOT</version>
+    <version>4.21.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 4393cd9e79..acebe89bd5 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.20.0-SNAPSHOT</version>
+    <version>4.21.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index e696628bf9..24b2f965f5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.20.0-SNAPSHOT</version>
+    <version>4.21.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index f04969d4dc..3b8e66d66f 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.20.0-SNAPSHOT</version>
+    <version>4.21.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 19e576c72d..1954bae45b 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.20.0-SNAPSHOT</version>
+    <version>4.21.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 6ea4dbc6a8..b016f3bee5 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.20.0-SNAPSHOT</version>
+    <version>4.21.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index a2072b9810..799f1c838c 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.20.0.qualifier"
+      version="4.21.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index c4b91aecbd..fdc8174cf3 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.20.0-SNAPSHOT</version>
+    <version>4.21.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index b529cec4e8..aaf3330547 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.20.0-SNAPSHOT</version>
+		<version>4.21.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From 3b08ff58a9d5112a9aeb04349dd24504a610b702 Mon Sep 17 00:00:00 2001
From: Kit Lo <kitlo@us.ibm.com>
Date: Sun, 5 Sep 2021 19:42:33 -0400
Subject: [PATCH 1186/1286] Bug 575782 - POM and product version change for
 4.22 release

Change-Id: I1a5f376cd46c8f26d431a4cea5145961ea1cf38a
Signed-off-by: Kit Lo <kitlo@us.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/185019
Tested-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Reviewed-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
---
 bundles/org.eclipse.e4.tools.compat/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml     | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml          | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                   | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 2 +-
 tests/org.eclipse.e4.tools.test/pom.xml                | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index d68b8e7e8d..f1a9db6f29 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.21.0-SNAPSHOT</version>
+    <version>4.22.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index acebe89bd5..99d7e47d47 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.21.0-SNAPSHOT</version>
+    <version>4.22.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 24b2f965f5..f2b8256e3e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.21.0-SNAPSHOT</version>
+    <version>4.22.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 3b8e66d66f..c3f0448e3f 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.21.0-SNAPSHOT</version>
+    <version>4.22.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 1954bae45b..5df3c14844 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.21.0-SNAPSHOT</version>
+    <version>4.22.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index b016f3bee5..12000696ba 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.21.0-SNAPSHOT</version>
+    <version>4.22.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 799f1c838c..6cfed53ce5 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.21.0.qualifier"
+      version="4.22.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index fdc8174cf3..588c2ad0a3 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.21.0-SNAPSHOT</version>
+    <version>4.22.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index aaf3330547..6f22fe8da4 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.21.0-SNAPSHOT</version>
+		<version>4.22.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From b39c5bc2eff9f5f9703edd4836ce04ad1f2abc2b Mon Sep 17 00:00:00 2001
From: Kit Lo <kitlo@us.ibm.com>
Date: Sat, 16 Oct 2021 00:26:56 -0400
Subject: [PATCH 1187/1286] Bug 576658 - "Visible" checkbox label on
 WindowEditor not externalized

Change-Id: I849e5790cfff85e79328dd99440f03f011e5a943
Signed-off-by: Kit Lo <kitlo@us.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/186563
Tested-by: Niraj Modi <niraj.modi@in.ibm.com>
Reviewed-by: Niraj Modi <niraj.modi@in.ibm.com>
---
 .../tools/emf/ui/internal/common/component/WindowEditor.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index df8b1fa2c6..ca37680655 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -274,8 +274,8 @@ public void widgetSelected(SelectionEvent e) {
 
 		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
 				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.buttonSelection(), //$NON-NLS-1$
-				E4Properties.visible(getEditingDomain()));
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
+				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 
 		ControlFactory.createSelectedElement(parent, this, context, Messages.WindowEditor_SelectedElement);
 		ControlFactory.createBindingContextWiget(parent, Messages, this, Messages.WindowEditor_BindingContexts);

From 8b0bb8f7d02d6460693251ae297ebda170a879bd Mon Sep 17 00:00:00 2001
From: Kit Lo <kitlo@us.ibm.com>
Date: Sat, 16 Oct 2021 01:31:47 -0400
Subject: [PATCH 1188/1286] Bug 576659 - Checkbox labels on
 MenuContributionEditor not externalized

Change-Id: I62f70fef2df85e381792ea3775b86f4cb01e2553
Signed-off-by: Kit Lo <kitlo@us.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/186564
Tested-by: Niraj Modi <niraj.modi@in.ibm.com>
Reviewed-by: Niraj Modi <niraj.modi@in.ibm.com>
---
 .../ui/internal/common/component/MenuContributionEditor.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index d6e9c5f8d7..c9d62cbd15 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -280,9 +280,9 @@ protected void addPressed() {
 
 		}
 
-		ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context,
 				WidgetProperties.buttonSelection(), E4Properties.toBeRendered(getEditingDomain()));
-		ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, //$NON-NLS-1$
+		ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context,
 				WidgetProperties.buttonSelection(), E4Properties.visible(getEditingDomain()));
 		item = new CTabItem(folder, SWT.NONE);
 		item.setText(Messages.ModelTooling_Common_TabSupplementary);

From af869b17e62a733ea2f1fdf38cddcacdfa2630b0 Mon Sep 17 00:00:00 2001
From: Kit Lo <kitlo@us.ibm.com>
Date: Tue, 19 Oct 2021 14:44:02 +0530
Subject: [PATCH 1189/1286] Bug 576710 - TrimContributionEditor displays
 unexternalized element names

Change-Id: I8303cf7edd58a3911fdba14178d3f31ed222d1bf
Signed-off-by: Kit Lo <kitlo@us.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/186622
Tested-by: Niraj Modi <niraj.modi@in.ibm.com>
Reviewed-by: Niraj Modi <niraj.modi@in.ibm.com>
---
 .../common/component/TrimContributionEditor.java  | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 6190d03e90..e7907a3653 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 BestSolution.at and others.
+ * Copyright (c) 2010, 2021 BestSolution.at and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -36,6 +36,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.TrimIdDialog;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.empty.E;
@@ -61,7 +62,6 @@
 import org.eclipse.jface.resource.FontDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -253,14 +253,9 @@ protected void addPressed() {
 			viewer.setInput(E4Properties.<MTrimElement>children().observeDetail(getMaster()));
 
 			pickList.setContentProvider(ArrayContentProvider.getInstance());
-			pickList.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					return ((EClass) element).getName();
-				}
-			});
-			pickList
-			.setInput(new Object[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
+			pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
+			pickList.setInput(
+					new EClass[] { MenuPackageImpl.Literals.TOOL_BAR, MenuPackageImpl.Literals.TOOL_CONTROL });
 			pickList.setSelection(new StructuredSelection(MenuPackageImpl.Literals.TOOL_BAR));
 		}
 

From 102c978985b75fb14964b2b85c6ce5189d47c22c Mon Sep 17 00:00:00 2001
From: Kit Lo <kitlo@us.ibm.com>
Date: Tue, 19 Oct 2021 14:55:49 +0530
Subject: [PATCH 1190/1286] Bug 576711 - VWindowControlEditor displays
 unexternalized element names

Change-Id: Ib72c14a06ae8284d1e0e25eb2120c3dd5c669818
Signed-off-by: Kit Lo <kitlo@us.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/186623
Tested-by: Niraj Modi <niraj.modi@in.ibm.com>
Reviewed-by: Niraj Modi <niraj.modi@in.ibm.com>
---
 .../component/virtual/VWindowControlEditor.java  | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index cba34f2568..bb5c1f6dc3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2017 BestSolution.at and others.
+ * Copyright (c) 2010, 2021 BestSolution.at and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -29,6 +29,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.AbstractPickList.PickListFeatures;
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
+import org.eclipse.e4.tools.emf.ui.internal.common.EClassLabelProvider;
 import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -42,7 +43,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
@@ -160,16 +160,8 @@ protected void addPressed() {
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 			viewer = pickList.getList();
 
-			pickList.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					final EClass eclass = (EClass) element;
-					return eclass.getName();
-				}
-			});
-
-			pickList
-			.setInput(new EClass[] { AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
+			pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
+			pickList.setInput(new EClass[] { AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
 					BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK,
 					BasicPackageImpl.Literals.PART,
 					AdvancedPackageImpl.Literals.AREA });

From 348bc5015025b0ef53063e56bce8dc86b1fdaf1b Mon Sep 17 00:00:00 2001
From: Kit Lo <kitlo@us.ibm.com>
Date: Tue, 19 Oct 2021 01:07:37 -0400
Subject: [PATCH 1191/1286] Bug 576668 - SideValue labels in TrimBarEditor not
 externalized

Change-Id: I96cb2cc993634ddbc3e4d33e87f182f76eb250a3
Signed-off-by: Kit Lo <kitlo@us.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/186631
Tested-by: Niraj Modi <niraj.modi@in.ibm.com>
Reviewed-by: Niraj Modi <niraj.modi@in.ibm.com>
---
 .../eclipse/e4/tools/emf/ui/internal/Messages.java |  4 ++++
 .../e4/tools/emf/ui/internal/Messages.properties   |  7 ++++++-
 .../internal/common/component/TrimBarEditor.java   | 14 ++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 35e94fbc29..03254898f6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -820,4 +820,8 @@ public class Messages {
 	public String CompositePartEditor_SelectedElement;
 	public String CompositePartEditor_Controls;
 
+	public String SideValue_Bottom;
+	public String SideValue_Left;
+	public String SideValue_Right;
+	public String SideValue_Top;
 }
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index d3b235a3b0..efbd25755a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -826,4 +826,9 @@ CompositePartEditor_Orientation=&Orientation\:
 CompositePartEditor_Horizontal=Horizontal
 CompositePartEditor_Vertical=Vertical
 CompositePartEditor_SelectedElement=&Selected Element\:
-CompositePartEditor_Controls=&Controls\:
\ No newline at end of file
+CompositePartEditor_Controls=&Controls\:
+
+SideValue_Bottom=Bottom
+SideValue_Left=Left
+SideValue_Right=Right
+SideValue_Top=Top
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 381a58e261..cf8dd88354 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -57,6 +57,7 @@
 import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -195,6 +196,19 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, Wr
 
 			final ComboViewer viewer = new ComboViewer(parent);
 			viewer.setContentProvider(ArrayContentProvider.getInstance());
+			viewer.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					if ((SideValue) element == SideValue.BOTTOM) {
+						return Messages.SideValue_Bottom;
+					} else if ((SideValue) element == SideValue.LEFT) {
+						return Messages.SideValue_Left;
+					} else if ((SideValue) element == SideValue.RIGHT) {
+						return Messages.SideValue_Right;
+					}
+					return Messages.SideValue_Top;
+				}
+			});
 			viewer.setInput(SideValue.values());
 			final GridData gd = new GridData();
 			gd.horizontalSpan = 2;

From 167cb9b7daa6c42bad548a01705f15f345ddd801 Mon Sep 17 00:00:00 2001
From: Kit Lo <kitlo@us.ibm.com>
Date: Tue, 19 Oct 2021 01:42:31 -0400
Subject: [PATCH 1192/1286] Bug 576669 - ItemType labels in ToolItemEditor not
 externalized

Change-Id: I29ded6f15383d479da9992a3bf99f9370b6056e0
Signed-off-by: Kit Lo <kitlo@us.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/186635
Tested-by: Niraj Modi <niraj.modi@in.ibm.com>
Reviewed-by: Niraj Modi <niraj.modi@in.ibm.com>
---
 .../eclipse/e4/tools/emf/ui/internal/Messages.java    |  4 ++++
 .../e4/tools/emf/ui/internal/Messages.properties      |  4 ++++
 .../ui/internal/common/component/MenuItemEditor.java  | 11 +++++++++++
 .../ui/internal/common/component/ToolItemEditor.java  | 11 +++++++++++
 4 files changed, 30 insertions(+)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 03254898f6..b2b9a04ade 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -820,6 +820,10 @@ public class Messages {
 	public String CompositePartEditor_SelectedElement;
 	public String CompositePartEditor_Controls;
 
+	public String ItemType_Push;
+	public String ItemType_Check;
+	public String ItemType_Radio;
+
 	public String SideValue_Bottom;
 	public String SideValue_Left;
 	public String SideValue_Right;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index efbd25755a..e47aac7a17 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -828,6 +828,10 @@ CompositePartEditor_Vertical=Vertical
 CompositePartEditor_SelectedElement=&Selected Element\:
 CompositePartEditor_Controls=&Controls\:
 
+ItemType_Push=Push
+ItemType_Check=Check
+ItemType_Radio=Radio
+
 SideValue_Bottom=Bottom
 SideValue_Left=Left
 SideValue_Right=Right
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index c4ee6e45cb..f05e0bcaf2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -189,6 +189,17 @@ protected CTabFolder createForm(Composite parent, EMFDataBindingContext context,
 
 				final ComboViewer viewer = new ComboViewer(parent);
 				viewer.setContentProvider(ArrayContentProvider.getInstance());
+				viewer.setLabelProvider(new LabelProvider() {
+					@Override
+					public String getText(Object element) {
+						if ((ItemType) element == ItemType.CHECK) {
+							return Messages.ItemType_Check;
+						} else if ((ItemType) element == ItemType.PUSH) {
+							return Messages.ItemType_Push;
+						}
+						return Messages.ItemType_Radio;
+					}
+				});
 				viewer.setInput(new ItemType[] { ItemType.CHECK, ItemType.PUSH, ItemType.RADIO });
 				final GridData gd = new GridData();
 				gd.horizontalSpan = 2;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 9963d96737..7e843e2a4b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -196,6 +196,17 @@ protected void createFormSubTypeForm(Composite parent, CTabFolder folder, EMFDat
 
 			final ComboViewer viewer = new ComboViewer(parent);
 			viewer.setContentProvider(ArrayContentProvider.getInstance());
+			viewer.setLabelProvider(new LabelProvider() {
+				@Override
+				public String getText(Object element) {
+					if ((ItemType) element == ItemType.CHECK) {
+						return Messages.ItemType_Check;
+					} else if ((ItemType) element == ItemType.PUSH) {
+						return Messages.ItemType_Push;
+					}
+					return Messages.ItemType_Radio;
+				}
+			});
 			viewer.setInput(new ItemType[] { ItemType.CHECK, ItemType.PUSH, ItemType.RADIO });
 			final GridData gd = new GridData();
 			gd.horizontalSpan = 2;

From 46042090adba06dca989d2cc6d1931e628e9d64f Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Wed, 20 Oct 2021 11:08:47 +0300
Subject: [PATCH 1193/1286] Version bump for 4.22 stream.

Change-Id: I009f19ce8dece70bd27872bb6200b82deb3cb074
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/186712
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 6b17bc67ca..c589c94b0c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.7.0.qualifier
+Bundle-Version: 4.7.100.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index f2b8256e3e..3ffda2f893 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.7.0-SNAPSHOT</version>
+  <version>4.7.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>

From 153de86137f4de28d0834d1ce8b56cf9bcfd09ed Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Wed, 20 Oct 2021 11:21:51 +0300
Subject: [PATCH 1194/1286] Various warning fixes

Change-Id: I0984e9b77cdf6d220ed767e7f505dd7de9404d9b
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/186713
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../emf/ui/internal/common/ModelEditor.java   | 24 +++++++++----------
 .../org.eclipse.e4.tools/META-INF/MANIFEST.MF |  2 +-
 bundles/org.eclipse.e4.tools/pom.xml          |  2 +-
 .../wizards/classes/AbstractNewClassPage.java |  3 +--
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 88395f20a2..7f65c7cdc0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -246,6 +246,7 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.TreeItem;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Section;
 
@@ -513,7 +514,7 @@ public void widgetSelected(SelectionEvent e) {
 	 * @param tabItem
 	 * @return The index of the tab item. Should never return -1.
 	 */
-	static public int getTabIndex(CTabItem tabItem) {
+	public static int getTabIndex(CTabItem tabItem) {
 		return Arrays.asList(tabItem.getParent().getItems()).indexOf(tabItem);
 	}
 
@@ -556,8 +557,7 @@ private XmiTab createXMITab(Composite composite) {
 		childContext.set(EMFDocumentResourceMediator.class, emfDocumentProvider);
 		childContext.set(IEclipsePreferences.class, preferences);
 		childContext.set(IResourcePool.class, resourcePool);
-		final XmiTab ret = ContextInjectionFactory.make(XmiTab.class, childContext);
-		return ret;
+		return ContextInjectionFactory.make(XmiTab.class, childContext);
 	}
 
 	private Composite createFormTab(Composite composite) {
@@ -567,7 +567,7 @@ private Composite createFormTab(Composite composite) {
 
 		FormToolkit toolkit = new FormToolkit(form.getDisplay());
 
-		headerContainer = toolkit.createSection(form, Section.TITLE_BAR);
+		headerContainer = toolkit.createSection(form, ExpandableComposite.TITLE_BAR);
 		headerContainer.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
 
 		// Composite for storing the data
@@ -590,7 +590,7 @@ public void keyReleased(final KeyEvent e) {
 							list.add((EObject) o);
 						}
 					}
-					if (list.isEmpty() == false) {
+					if (!list.isEmpty()) {
 						final Command cmd = DeleteCommand.create(modelProvider.getEditingDomain(), list);
 						if (cmd.canExecute()) {
 							modelProvider.getEditingDomain().getCommandStack().execute(cmd);
@@ -648,7 +648,7 @@ public void keyReleased(final KeyEvent e) {
 				if (s.getFirstElement() instanceof VirtualEntry) {
 					actions = getEditor(((VirtualEntry<?, ?>) s.getFirstElement()).getId())
 							.getActions(s.getFirstElement());
-					if (actions.size() > 0) {
+					if (!actions.isEmpty()) {
 						final MenuManager addMenu1 = new MenuManager(messages.ModelEditor_AddChild);
 						for (final Action a1 : actions) {
 							addSeparator = true;
@@ -659,7 +659,7 @@ public void keyReleased(final KeyEvent e) {
 
 					actions = getEditor(((VirtualEntry<?, ?>) s.getFirstElement()).getId())
 							.getActionsImport(s.getFirstElement());
-					if (actions.size() > 0) {
+					if (!actions.isEmpty()) {
 						final MenuManager menu1 = new MenuManager(messages.ModelEditor_Import3x);
 						for (final Action a2 : actions) {
 							addSeparator = true;
@@ -684,7 +684,7 @@ public void keyReleased(final KeyEvent e) {
 						actions = new ArrayList<>();
 					}
 
-					if (actions.size() > 0) {
+					if (!actions.isEmpty()) {
 						final MenuManager addMenu2 = new MenuManager(messages.ModelEditor_AddChild);
 						for (final Action a3 : actions) {
 							addSeparator = true;
@@ -700,7 +700,7 @@ public void keyReleased(final KeyEvent e) {
 						actions = new ArrayList<>();
 					}
 
-					if (actions.size() > 0) {
+					if (!actions.isEmpty()) {
 						// TODO WIM - extract nls
 						final MenuManager menu2 = new MenuManager(messages.ModelEditor_Import3x);
 						for (final Action a4 : actions) {
@@ -1224,7 +1224,7 @@ private void registerContributedEditorTabs() {
 						continue;
 					}
 					if (!tabContributions.containsKey(contribElem)) {
-						tabContributions.put(contribElem, new ArrayList<AbstractElementEditorContribution>());
+						tabContributions.put(contribElem, new ArrayList<>());
 					}
 					final List<AbstractElementEditorContribution> res = tabContributions.get(contribElem);
 					res.add(contribution);
@@ -1722,7 +1722,7 @@ private void handleStructureCopy() {
 			IStructuredSelection structuredSelection = (IStructuredSelection) viewer.getSelection();
 			List<EObject> toCopy = new ArrayList<>();
 			for (Object obj : structuredSelection.toList()) {
-				if (obj != null && obj instanceof EObject) {
+				if (obj instanceof EObject) {
 					EObject copy = EcoreUtil.copy((EObject) obj);
 					toCopy.add(copy);
 				}
@@ -1754,7 +1754,7 @@ private void handleStructureCut() {
 			Collection<EObject> objectsToCut = new ArrayList<>();
 			final Clipboard clip = new Clipboard(viewer.getControl().getDisplay());
 			for (Object o : ((IStructuredSelection) viewer.getSelection()).toList()) {
-				if (o != null && o instanceof EObject) {
+				if (o instanceof EObject) {
 					objectsToCut.add((EObject) o);
 				}
 			}
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index cc9b644864..c0d2915875 100644
--- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 4.9.0.qualifier
+Bundle-Version: 4.9.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 12000696ba..d6c93351a4 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tool</groupId>
   <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>4.9.0-SNAPSHOT</version>
+  <version>4.9.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index 56132a3c25..54bd1d53a4 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -345,8 +345,7 @@ private String parseInitialStringForPackage(String initialString2) {
 		}
 
 		final int lastDot = initialString2.lastIndexOf('.');
-		final String packageString = initialString2.substring(iSecondSlash + 1, lastDot);
-		return packageString;
+		return initialString2.substring(iSecondSlash + 1, lastDot);
 	}
 
 	private String parseInitialStringForClassName(String initialString) {

From 827d9ef37a74a2efc7a0be7409c22d719002a573 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Wed, 20 Oct 2021 11:26:24 +0300
Subject: [PATCH 1195/1286] Move o.e.e4.tools.tests to Java 11

Change-Id: Id02d2aea1431bf76ed256f29e7bbf4d62fa1776a
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/186714
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
---
 tests/org.eclipse.e4.tools.test/.classpath    |  8 +++-
 .../.settings/org.eclipse.jdt.core.prefs      | 37 +++++++++++++++----
 .../META-INF/MANIFEST.MF                      |  4 +-
 tests/org.eclipse.e4.tools.test/pom.xml       |  2 +-
 4 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/tests/org.eclipse.e4.tools.test/.classpath b/tests/org.eclipse.e4.tools.test/.classpath
index eca7bdba8f..a42a828e04 100644
--- a/tests/org.eclipse.e4.tools.test/.classpath
+++ b/tests/org.eclipse.e4.tools.test/.classpath
@@ -1,7 +1,11 @@
 <?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/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs
index 544ddacfdf..2c930dbc5c 100644
--- a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs
@@ -29,9 +29,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -47,6 +47,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
@@ -105,6 +106,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -140,11 +142,13 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -152,17 +156,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -248,11 +255,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
 org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -283,6 +291,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
 org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -307,13 +317,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
 org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -361,6 +375,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -397,9 +413,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser
 org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -425,8 +444,12 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
index 6efa303042..6c2212930e 100644
--- a/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.e4.tools.test
-Bundle-Version: 1.1.100.qualifier
+Bundle-Version: 1.2.0.qualifier
 Fragment-Host: org.eclipse.e4.tools;bundle-version="4.7.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.e4.core.contexts;bundle-version="1.3.100"
 Export-Package: org.eclipse.e4.tools.test;version="1.0.0";x-internal:=true
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index 6f22fe8da4..289f52350d 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>eclipse.platform.ui.tool</groupId>
 	<artifactId>org.eclipse.e4.tools.test</artifactId>
-	<version>1.1.100-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 
 	<packaging>eclipse-test-plugin</packaging>
 

From 4560ea500da02dc51f2ab29230c3cf4f48bfde08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Mon, 19 Apr 2021 10:50:37 +0200
Subject: [PATCH 1196/1286] Bug 572946 - [e4][Tooling] support new
 model-fragment header in the wizard
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I9f511568c1cf964036b16523fcd2db65e71151d4
Signed-off-by: Christoph Läubrich <laeubi@laeubi-soft.de>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/179492
Tested-by: Platform Bot <platform-bot@eclipse.org>
---
 .../eclipse/e4/internal/tools/Messages.java   |   5 +
 .../e4/internal/tools/messages.properties     |   7 ++
 .../model/BaseApplicationModelWizard.java     |   2 +-
 .../model/NewContributionModelWizard.java     | 112 +++++++++++++++++-
 .../tools/wizards/model/NewModelFilePage.java |   4 +-
 5 files changed, 126 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
index bc1b40befe..d33ff60b6e 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
@@ -22,6 +22,11 @@
  */
 public class Messages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.e4.internal.tools.messages"; //$NON-NLS-1$
+	public static String ContributionMode;
+	public static String ContributionMode_Static;
+	public static String ContributionMode_Dynamic;
+	public static String ContributionMode_Static_Info;
+	public static String ContributionMode_Dynamic_Info;
 	public static String AbstractNewClassPage_Browse;
 	public static String AbstractNewClassPage_ChooseAPackage;
 	public static String AbstractNewClassPage_ChoosePackage;
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
index 33c49ca075..f39fdcb398 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
@@ -78,3 +78,10 @@ NewToolControlClassWizard_CreateDefaultConstructor=Create Default Constructor
 NewToolControlClassWizard_CreateGUIMethod=Create GUI Method
 NewToolControlClassWizard_CreateNewToolControl=Create a new tool control class
 NewToolControlClassWizard_NewToolControl=New Tool Control
+ContributionMode=Contribution Mode
+ContributionMode_Static=Static
+ContributionMode_Static_Info=The model fragment will be registered in plugin.xml.\n\
+It will be applied only once in the life-time of the application
+ContributionMode_Dynamic=Dynamic (Eclipse 4.20 or later)
+ContributionMode_Dynamic_Info=The model fragment will be registered via a MANIFEST.MF header.\n\
+it will be refreshed whenever your bundle is updated.
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index 70bc88be49..6b96776214 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -320,7 +320,7 @@ private void addWorkbenchDependencyIfRequired(WorkspaceBundlePluginModel fModel)
 	 * Register the fragment.e4xmi with the org.eclipse.e4.workbench.model
 	 * extension point, if there is not already a fragment registered.
 	 */
-	private void registerWithExtensionPointIfRequired(IProject project, WorkspaceBundlePluginModel fModel, IFile file)
+	protected void registerWithExtensionPointIfRequired(IProject project, WorkspaceBundlePluginModel fModel, IFile file)
 			throws CoreException {
 
 		final String WORKBENCH_MODEL_EP_ID = "org.eclipse.e4.workbench.model"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
index b995d2d3d2..ec13d87930 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2014 BestSolution.at and others.
+ * Copyright (c) 2010-2021 BestSolution.at and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -11,16 +11,58 @@
  * Contributors:
  * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  * Marco Descher <marco@descher.at> - Bug 392907, Bug 434371
+ * Christoph Läubrich - Bug 572946 - [e4][Tooling] support new model-fragment header in the wizard
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.model;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.ui.model.fragment.MFragmentFactory;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.pde.internal.core.bundle.WorkspaceBundlePluginModel;
+import org.eclipse.pde.internal.core.ibundle.IBundle;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
 
+@SuppressWarnings("restriction")
 public class NewContributionModelWizard extends BaseApplicationModelWizard {
 
+	private static final String MODEL_FRAGMENT_HEADER = "Model-Fragment"; //$NON-NLS-1$
+
+	private enum ContributionMode {
+		STATIC(Messages.ContributionMode_Static, Messages.ContributionMode_Static_Info), DYNAMIC(
+				Messages.ContributionMode_Dynamic, Messages.ContributionMode_Dynamic_Info);
+
+		private String label;
+		private String description;
+
+		ContributionMode(String label, String description) {
+			this.label = label;
+			this.description = description;
+		}
+
+		@Override
+		public String toString() {
+			return label;
+		}
+
+		/**
+		 * @return the description
+		 */
+		String getDescription() {
+			return description;
+		}
+	}
+
 	@Override
 	public String getDefaultFileName() {
 		return "fragment.e4xmi"; //$NON-NLS-1$
@@ -33,11 +75,77 @@ protected EObject createInitialModel() {
 
 	@Override
 	protected NewModelFilePage createWizardPage(ISelection selection) {
-		return new NewModelFilePage(selection, getDefaultFileName());
+		return new NewContributionModelFilePage(selection, getDefaultFileName());
 	}
 
 	@Override
 	protected void adjustDependencies(IFile file) {
 		super.adjustFragmentDependencies(file);
 	}
+
+	@Override
+	protected void registerWithExtensionPointIfRequired(IProject project, WorkspaceBundlePluginModel fModel, IFile file)
+			throws CoreException {
+		NewContributionModelFilePage page = (NewContributionModelFilePage) getPage(
+				NewContributionModelFilePage.PAGE_NAME);
+		if (page.mode == ContributionMode.DYNAMIC) {
+			IBundle bundle = fModel.getBundleModel().getBundle();
+			bundle.setHeader(MODEL_FRAGMENT_HEADER, file.getName());
+			fModel.save();
+		} else {
+			super.registerWithExtensionPointIfRequired(project, fModel, file);
+		}
+	}
+
+	private static final class NewContributionModelFilePage extends NewModelFilePage {
+
+		ContributionMode mode = ContributionMode.STATIC;
+
+		public NewContributionModelFilePage(ISelection selection, String defaultFilename) {
+			super(selection, defaultFilename);
+		}
+
+		@Override
+		protected void createAdditionalControls(Composite parent) {
+			Label label = new Label(parent, SWT.NULL);
+			label.setText(Messages.ContributionMode);
+			ContributionMode[] values = ContributionMode.values();
+			Button[] buttons = new Button[values.length];
+			Composite buttonParent = new Composite(parent, SWT.NULL);
+			buttonParent.setLayout(new GridLayout(values.length, false));
+			for (int i = 0; i < values.length; i++) {
+				ContributionMode mode = values[i];
+				Button button = buttons[i] = new Button(buttonParent, SWT.RADIO);
+				button.setSelection(this.mode == mode);
+				button.setData(mode);
+				button.setText(mode.toString());
+			}
+			new Label(parent, SWT.NULL);
+			new Label(parent, SWT.NULL);
+			Label modeDescriptionLabel = new Label(parent, SWT.NONE);
+			modeDescriptionLabel.setText(mode.getDescription());
+			GridData modeDescriptionLabelLayoutData = new GridData(GridData.FILL_BOTH);
+			modeDescriptionLabelLayoutData.horizontalSpan = 2;
+			modeDescriptionLabel.setLayoutData(modeDescriptionLabelLayoutData);
+			for (Button button : buttons) {
+				button.addSelectionListener(new SelectionListener() {
+
+					@Override
+					public void widgetSelected(SelectionEvent e) {
+						if (button.getSelection()) {
+							ContributionMode mode = (ContributionMode) button.getData();
+							NewContributionModelFilePage.this.mode = mode;
+							modeDescriptionLabel.setText(mode.getDescription());
+						}
+					}
+
+					@Override
+					public void widgetDefaultSelected(SelectionEvent e) {
+
+					}
+				});
+			}
+		}
+	}
+
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
index 0b151338d1..8255196519 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
@@ -43,6 +43,8 @@
  */
 
 public class NewModelFilePage extends WizardPage {
+	public static final String PAGE_NAME = "wizardPage"; //$NON-NLS-1$
+
 	private Text containerText;
 
 	private Text fileText;
@@ -56,7 +58,7 @@ public class NewModelFilePage extends WizardPage {
 	 *
 	 */
 	public NewModelFilePage(ISelection selection, String defaultFilename) {
-		super("wizardPage"); //$NON-NLS-1$
+		super(PAGE_NAME);
 		setTitle(Messages.NewModelFilePage_NewApplicationModel);
 		setDescription(Messages.NewModelFilePage_TheWizardCreates);
 		this.selection = selection;

From a54727e5720ce2277fc5aea3a085e860aa1dd049 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Date: Thu, 25 Nov 2021 15:32:53 +0530
Subject: [PATCH 1197/1286] Bug 577442 - POM and product version change for
 4.23 release

Change-Id: Ic5c203a35a42c2d4ce923623df0852e9c1d47671
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/188128
---
 bundles/org.eclipse.e4.tools.compat/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml     | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml          | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                   | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 2 +-
 tests/org.eclipse.e4.tools.test/pom.xml                | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index f1a9db6f29..2127880d23 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.22.0-SNAPSHOT</version>
+    <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 99d7e47d47..f2132173d1 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.22.0-SNAPSHOT</version>
+    <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 3ffda2f893..63d2419159 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.22.0-SNAPSHOT</version>
+    <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index c3f0448e3f..dc60fe08d2 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.22.0-SNAPSHOT</version>
+    <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 5df3c14844..4a69713108 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.22.0-SNAPSHOT</version>
+    <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index d6c93351a4..b10c35f204 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.22.0-SNAPSHOT</version>
+    <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 6cfed53ce5..1e3a5ad211 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.22.0.qualifier"
+      version="4.23.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 588c2ad0a3..c9df4ecf45 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.22.0-SNAPSHOT</version>
+    <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index 289f52350d..d6a39e14d2 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.22.0-SNAPSHOT</version>
+		<version>4.23.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From b4f2e2ce4cb22f1b5ffac5af15e4673cf65656f8 Mon Sep 17 00:00:00 2001
From: Kit Lo <kitlo@us.ibm.com>
Date: Mon, 10 Jan 2022 11:17:44 -0500
Subject: [PATCH 1198/1286] Bug 577960 - Model Spy command names and
 descriptions are not externalized

Change-Id: If13fa303f20b4a437a717da28f0cb7d6ef7b0411
Signed-off-by: Kit Lo <kitlo@us.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/189440
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Karsten Thoms <karsten.thoms@karakun.com>
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index c589c94b0c..144702f6ae 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.7.100.qualifier
+Bundle-Version: 4.7.200.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 63d2419159..e8dc7e72bc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.7.100-SNAPSHOT</version>
+  <version>4.7.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>

From 38c86fe8cbf00ff17d8990c239a35a6d30bdb4ff Mon Sep 17 00:00:00 2001
From: Kit Lo <kitlo@us.ibm.com>
Date: Sat, 25 Dec 2021 20:53:05 -0500
Subject: [PATCH 1199/1286] Bug 577960 - Model Spy command names and
 descriptions are not externalized

Change-Id: Ia44793d566095270b8d5df504ed4f52de30cabfc
Signed-off-by: Kit Lo <kitlo@us.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/189130
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Karsten Thoms <karsten.thoms@karakun.com>
---
 .../fragment.e4xmi                            | 98 +++++++++----------
 .../plugin.properties                         | 17 +++-
 2 files changed, 65 insertions(+), 50 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi b/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
index 79832f4c79..618c7bdfc1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
+++ b/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="ASCII"?>
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_GxnD8Ly2EeOxWJvPH-7sUQ">
-  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_Kmj8QLy2EeOxWJvPH-7sUQ" featurename="commands" parentElementId="xpath:/">
-    <elements xsi:type="commands:Command" xmi:id="_RRp7QLy2EeOxWJvPH-7sUQ" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_ids" commandName="Mark Duplicate Model Element Ids" description="Marks Duplicate Model Element Ids">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Command" xmi:id="_9ITpgL2IEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_labels" commandName="Mark Duplicate Model Labels" description="Marks Duplicate Model Labels">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Command" xmi:id="_RObi4L2MEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_attributes" commandName="Mark Duplicate Model Attributes..." description="Marks Duplicate Model Attributes">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Command" xmi:id="_dySeYLzDEeO8eO1Rpb-rFA" elementId="org.eclipse.e4.tools.emf.ui.command.repair_duplicate_ids" commandName="Repair Duplicate Model Element IDs" description="Repairs Duplicate Model Element IDs">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Command" xmi:id="_CFlw8L2LEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.unmark" commandName="Unmark Model Items" description="Unmarks All Model Items">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Command" xmi:id="_jd7xgO5mEeOQXaYP-M2JBA" elementId="org.eclipse.e4.tools.emf.ui.command.autosizeColumns" commandName="Autosize Columns" description="Autosizes all columns to their content">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Command" xmi:id="_vsQXAPFwEeOSJuCPb-hb7A" elementId="org.eclipse.e4.tools.emf.ui.command.resetToDefault" commandName="Reset To Default" description="Resets the table to default values">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-  </fragments>
-  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_jtmcsLy3EeOxWJvPH-7sUQ" featurename="handlers" parentElementId="xpath:/">
-    <elements xsi:type="commands:Handler" xmi:id="_p45hULy3EeOxWJvPH-7sUQ" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateElementIdsHandler" command="_RRp7QLy2EeOxWJvPH-7sUQ">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Handler" xmi:id="_AOEgkL2JEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_labels" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateLabelsHandler" command="_9ITpgL2IEeOqSr2XZwfnmA">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Handler" xmi:id="_TgJt4L2MEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_attributes" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateAttributesHandler" command="_RObi4L2MEeOqSr2XZwfnmA">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Handler" xmi:id="_smaaALzDEeO8eO1Rpb-rFA" elementId="org.eclipse.e4.tools.emf.ui.handler.repair_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.RepairDuplicateItemsHandler" command="_dySeYLzDEeO8eO1Rpb-rFA">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Handler" xmi:id="_Fin4gL2LEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.unmark" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.UnmarkItemsHandler" command="_CFlw8L2LEeOqSr2XZwfnmA">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Handler" xmi:id="_hZcKMO5mEeOQXaYP-M2JBA" elementId="org.eclipse.e4.tools.emf.ui.handler.autosizeColumns" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.AutosizeColumnsHandler" command="_jd7xgO5mEeOQXaYP-M2JBA">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Handler" xmi:id="_8AHVUPFwEeOSJuCPb-hb7A" elementId="org.eclipse.e4.tools.emf.ui.handler.resetToDefault" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.ResetToDefaultHandler" command="_vsQXAPFwEeOSJuCPb-hb7A">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-  </fragments>
-</fragment:ModelFragments>
+<?xml version="1.0" encoding="ASCII"?>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_GxnD8Ly2EeOxWJvPH-7sUQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_Kmj8QLy2EeOxWJvPH-7sUQ" featurename="commands" parentElementId="xpath:/">
+    <elements xsi:type="commands:Command" xmi:id="_RRp7QLy2EeOxWJvPH-7sUQ" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_ids" commandName="%mark_duplicate_ids_commandName" description="%mark_duplicate_ids_description">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_9ITpgL2IEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_labels" commandName="%mark_duplicate_labels_commandName" description="%mark_duplicate_labels_description">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_RObi4L2MEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_attributes" commandName="%mark_duplicate_attributes_commandName" description="%mark_duplicate_attributes_description">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_dySeYLzDEeO8eO1Rpb-rFA" elementId="org.eclipse.e4.tools.emf.ui.command.repair_duplicate_ids" commandName="%repair_duplicate_ids_commandName" description="%repair_duplicate_ids_description">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_CFlw8L2LEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.unmark" commandName="%unmark_commandName" description="%unmark_description">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_jd7xgO5mEeOQXaYP-M2JBA" elementId="org.eclipse.e4.tools.emf.ui.command.autosizeColumns" commandName="%autosizeColumns_commandName" description="%autosizeColumns_description">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_vsQXAPFwEeOSJuCPb-hb7A" elementId="org.eclipse.e4.tools.emf.ui.command.resetToDefault" commandName="%resetToDefault_commandName" description="%resetToDefault_description">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_jtmcsLy3EeOxWJvPH-7sUQ" featurename="handlers" parentElementId="xpath:/">
+    <elements xsi:type="commands:Handler" xmi:id="_p45hULy3EeOxWJvPH-7sUQ" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateElementIdsHandler" command="_RRp7QLy2EeOxWJvPH-7sUQ">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Handler" xmi:id="_AOEgkL2JEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_labels" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateLabelsHandler" command="_9ITpgL2IEeOqSr2XZwfnmA">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Handler" xmi:id="_TgJt4L2MEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_attributes" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateAttributesHandler" command="_RObi4L2MEeOqSr2XZwfnmA">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Handler" xmi:id="_smaaALzDEeO8eO1Rpb-rFA" elementId="org.eclipse.e4.tools.emf.ui.handler.repair_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.RepairDuplicateItemsHandler" command="_dySeYLzDEeO8eO1Rpb-rFA">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Handler" xmi:id="_Fin4gL2LEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.unmark" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.UnmarkItemsHandler" command="_CFlw8L2LEeOqSr2XZwfnmA">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Handler" xmi:id="_hZcKMO5mEeOQXaYP-M2JBA" elementId="org.eclipse.e4.tools.emf.ui.handler.autosizeColumns" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.AutosizeColumnsHandler" command="_jd7xgO5mEeOQXaYP-M2JBA">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Handler" xmi:id="_8AHVUPFwEeOSJuCPb-hb7A" elementId="org.eclipse.e4.tools.emf.ui.handler.resetToDefault" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.ResetToDefaultHandler" command="_vsQXAPFwEeOSJuCPb-hb7A">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+  </fragments>
+</fragment:ModelFragments>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties b/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties
index a43449c01e..588b2efccc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties
@@ -7,4 +7,19 @@
 pluginName = EMF ModelTooling UI
 providerName = Eclipse.org
 
-extension-point.name = Editors
\ No newline at end of file
+extension-point.name = Editors
+
+mark_duplicate_ids_commandName=Mark Duplicate Model Element IDs
+mark_duplicate_ids_description=Marks Duplicate Model Element IDs
+mark_duplicate_labels_commandName=Mark Duplicate Model Labels
+mark_duplicate_labels_description=Marks Duplicate Model Labels
+mark_duplicate_attributes_commandName=Mark Duplicate Model Attributes...
+mark_duplicate_attributes_description=Marks Duplicate Model Attributes
+repair_duplicate_ids_commandName=Repair Duplicate Model Element IDs
+repair_duplicate_ids_description=Repairs Duplicate Model Element IDs
+unmark_commandName=Unmark Model Items
+unmark_description=Unmarks All Model Items
+autosizeColumns_commandName=Autosize Columns
+autosizeColumns_description=Autosizes all columns to their content
+resetToDefault_commandName=Reset To Default
+resetToDefault_description=Resets the table to default values

From 99f20b5f780bf74d93aa9bedf49f04dd2ea88148 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Date: Fri, 4 Mar 2022 19:00:34 +0530
Subject: [PATCH 1200/1286] Bug 579073 - POM and product version change for
 4.24 release

Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Change-Id: I990cbe7ee397d87c9a02efb6c03f04368fda5e8b
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/191469
---
 bundles/org.eclipse.e4.tools.compat/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml     | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml          | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                   | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 2 +-
 tests/org.eclipse.e4.tools.test/pom.xml                | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 2127880d23..a9a6b0420a 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.23.0-SNAPSHOT</version>
+    <version>4.24.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index f2132173d1..605a37912d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.23.0-SNAPSHOT</version>
+    <version>4.24.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index e8dc7e72bc..563a8a5efc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.23.0-SNAPSHOT</version>
+    <version>4.24.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index dc60fe08d2..55869d0a3d 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.23.0-SNAPSHOT</version>
+    <version>4.24.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 4a69713108..beaa32cb04 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.23.0-SNAPSHOT</version>
+    <version>4.24.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index b10c35f204..af520447cb 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.23.0-SNAPSHOT</version>
+    <version>4.24.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 1e3a5ad211..711df4c878 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.23.0.qualifier"
+      version="4.24.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index c9df4ecf45..af1ac9e799 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.23.0-SNAPSHOT</version>
+    <version>4.24.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index d6a39e14d2..24533977a9 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.23.0-SNAPSHOT</version>
+		<version>4.24.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From 2398764f48bc881d1a1dd8594e067e89c55ef8d6 Mon Sep 17 00:00:00 2001
From: Niraj Modi <niraj.modi@in.ibm.com>
Date: Thu, 10 Mar 2022 14:44:58 +0530
Subject: [PATCH 1201/1286] Bug 578629 - [Accessibility] Model Spy Form tab has
 text labels which JAWS doesn't read - checkbox button with associated text is
 such that now readable by JAW.

Change-Id: I0fdfcab6e988897ca7afb50b5e0422a97f183bfa
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/191215
Tested-by: Platform Bot <platform-bot@eclipse.org>
---
 .../META-INF/MANIFEST.MF                         |  2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml      |  2 +-
 .../common/component/ControlFactory.java         | 16 ++++++----------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 144702f6ae..336ddf5d66 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.7.200.qualifier
+Bundle-Version: 4.7.300.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 563a8a5efc..b9824bf46f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.7.200-SNAPSHOT</version>
+  <version>4.7.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 9e53bef960..ef8926e443 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2017 BestSolution.at and others.
+ * Copyright (c) 2010, 2022 BestSolution.at and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -759,17 +759,13 @@ public static <M> void createCheckBox(Composite parent, String label, IObservabl
 	public static <M> void createCheckBox(Composite parent, String label, String tooltip, IObservableValue<M> master,
 			EMFDataBindingContext context, IWidgetValueProperty<Button, Boolean> selectionProp,
 			IValueProperty<? super M, Boolean> modelProp) {
-		final Label l = new Label(parent, SWT.NONE);
-		l.setText(label);
+		final Button checkBox = new Button(parent, SWT.CHECK);
+		checkBox.setText(label);
 		if (tooltip != null) {
-			l.setToolTipText(tooltip);
+			checkBox.setToolTipText(tooltip);
 		}
-		l.setLayoutData(new GridData());
-
-		final Button t = new Button(parent, SWT.CHECK);
-		t.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1));
-		context.bindValue(selectionProp.observe(t), modelProp.observeDetail(master));
-
+		checkBox.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 3, 1));
+		context.bindValue(selectionProp.observe(checkBox), modelProp.observeDetail(master));
 	}
 
 	public static String getLocalizedLabel(ProjectOSGiTranslationProvider translationProvider, MUILabel element) {

From 0aebdc96dc64367a55169cba70f73b836d556c79 Mon Sep 17 00:00:00 2001
From: Vikas Chandra <Vikas.Chandra@in.ibm.com>
Date: Tue, 15 Mar 2022 18:26:03 +0530
Subject: [PATCH 1202/1286] Bug 577961 - Model Spy List tab not accessible with
 keyboard only

Change-Id: I59dda99acf03a7c4abacb221cbd8a41cf58ba19a
Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/191910
Tested-by: Platform Bot <platform-bot@eclipse.org>
---
 .../e4/tools/emf/ui/internal/Messages.java        |  3 ++-
 .../e4/tools/emf/ui/internal/Messages.properties  | 15 ++++++++-------
 .../internal/common/component/tabs/ListTab.java   |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index b2b9a04ade..f441cb1eb3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2016 BestSolution.at and others.
+ * Copyright (c) 2010-2022 BestSolution.at and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -803,6 +803,7 @@ public class Messages {
 	public String ListTab_mark;
 	public String ListTab_markAttribute;
 	public String ListTab_removeFilter;
+	public String ListTab_more;
 	public String ListTab_resetColumns;
 	public String ListTab_selectAnAttribute;
 	public String ListTab_selectAType;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index e47aac7a17..d692591457 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -1,5 +1,5 @@
 # ******************************************************************************
-# * Copyright (c) 2010-2016 BestSolution.at and others.
+# * Copyright (c) 2010-2022 BestSolution.at and others.
 # *
 # * This program and the accompanying materials
 # * are made available under the terms of the Eclipse Public License 2.0
@@ -751,8 +751,8 @@ AreaIconDialogEditor_Icon=&Icon\:
 
 ModelEditor_Delete=Remove
 ModelEditor_ExpandSubtree=Expand/Collapse (CTRL + Mouse)
-ModelEditor_Form=Form
-ModelEditor_XMI=XMI
+ModelEditor_Form=&Form
+ModelEditor_XMI=&XMI
 ModelEditor_ExternalizeStrings=Externalize Strings
 ModelEditor_ExportIds=Export Element Ids
 ModelEditor_Script=Execute Script
@@ -790,7 +790,7 @@ ModelEditor_goto_xmi=Goto XMI
 KeyBindingEditor_SequenceLowercase=Key sequences should be specified in uppercase characters
 ModelTooling_CommandId_tooltip=Command identifier. Must be defined for a command to work properly.
 
-ListTab_0=List
+ListTab_0=&List
 ListTab_1=Mark Duplicate IDs
 ListTab_2=Duplicate IDs will be highlighted
 ListTab_3=Repair Duplicate IDs
@@ -806,12 +806,13 @@ ListTab_col_label=Label
 ListTab_col_go=Go
 
 ListTab_addColumn=Add &Column
-ListTab_filterByAttribute=Filter By &Attribute
+ListTab_filterByAttribute=Filter By Attri&bute
 ListTab_filterByItem=Filter By &Item
 ListTab_mark=Mark
 ListTab_markAttribute=&Filter By Attribute
-ListTab_removeFilter=&Remove Filter
-ListTab_resetColumns=R&eset Columns
+ListTab_removeFilter=Rem&ove Filter
+ListTab_more=&More
+ListTab_resetColumns=Rese&t Columns
 ListTab_selectAnAttribute=Select an attribute
 ListTab_selectAType=Select a type
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index 1fd2ebd253..f05f16aa8d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2017 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2022 TwelveTone LLC and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -477,7 +477,7 @@ public void widgetSelected(SelectionEvent e) {
 		{
 			final E4ToolItemMenu tiCommands = new E4ToolItemMenu(toolBar, context);
 			tiCommands.getToolItem().setImage(imageCache.create("/icons/full/obj16/command.gif")); //$NON-NLS-1$
-
+			tiCommands.getToolItem().setText(Messages.ListTab_more + ELIPSIS);
 			final ArrayList<String> commandIds = new ArrayList<>();
 			commandIds.add("org.eclipse.e4.tools.emf.ui.command.mark_duplicate_attributes"); //$NON-NLS-1$
 			commandIds.add("org.eclipse.e4.tools.emf.ui.command.mark_duplicate_ids"); //$NON-NLS-1$

From d7b4ba719336c7f6cb161d42a984710a703dd5d8 Mon Sep 17 00:00:00 2001
From: Vikas Chandra <99390647+vik-chand@users.noreply.github.com>
Date: Fri, 18 Mar 2022 14:28:20 +0530
Subject: [PATCH 1203/1286] Model Spy List tab not accessible with keyboard
 only #2 (#3)

Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>
---
 .../eclipse/e4/tools/emf/ui/internal/Messages.java   |  2 ++
 .../e4/tools/emf/ui/internal/Messages.properties     | 12 +++++++-----
 .../ui/internal/common/component/tabs/ListTab.java   |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index f441cb1eb3..d556c35d00 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -796,6 +796,8 @@ public class Messages {
 	public String ListTab_col_item;
 	public String ListTab_col_label;
 	public String ListTab_col_go;
+	public String ListTab_col_go2;
+	public String ListTab_elementId;
 
 	public String ListTab_addColumn;
 	public String ListTab_filterByAttribute;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index d692591457..8151dbfda0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -801,16 +801,18 @@ ListTab_7=Showing items with attribute:
 ListTab_8=xmi
 ListTab_9=form
 ListTab_col_id=ID
-ListTab_col_item=Item
+ListTab_col_item=&Item
 ListTab_col_label=Label
-ListTab_col_go=Go
+ListTab_col_go=&Go
+ListTab_col_go2=G&o
 
 ListTab_addColumn=Add &Column
 ListTab_filterByAttribute=Filter By Attri&bute
-ListTab_filterByItem=Filter By &Item
-ListTab_mark=Mark
+ListTab_filterByItem=Filter B&y Item
+ListTab_mark=Mar&k
+ListTab_elementId=Eleme&nt ID
 ListTab_markAttribute=&Filter By Attribute
-ListTab_removeFilter=Rem&ove Filter
+ListTab_removeFilter=Remo&ve Filter
 ListTab_more=&More
 ListTab_resetColumns=Rese&t Columns
 ListTab_selectAnAttribute=Select an attribute
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index f05f16aa8d..e8eda9022d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -520,7 +520,7 @@ public String getText(Object element) {
 		});
 
 		colGoXmi = new TableViewerColumn(tvResults, SWT.NONE);
-		colGoXmi.getColumn().setText(Messages.ListTab_col_go);
+		colGoXmi.getColumn().setText(Messages.ListTab_col_go2);
 		requiredColumns.put("GoXmi", colGoXmi.getColumn()); //$NON-NLS-1$
 		colGoXmi.setLabelProvider(new ColumnLabelProvider() {
 			@Override
@@ -582,7 +582,7 @@ public String getText(Object element) {
 		app.getContext().set("org.eclipse.e4.tools.active-object-viewer", this); //$NON-NLS-1$
 
 		final EAttributeTableViewerColumn colId = new EAttributeTableViewerColumn(tvResults,
-				"elementId", "elementId", context); //$NON-NLS-1$//$NON-NLS-2$
+				Messages.ListTab_elementId, "elementId", context); //$NON-NLS-1$
 		defaultColumns.put("elementId", colId); //$NON-NLS-1$
 
 		final EAttributeTableViewerColumn colLabel = new EAttributeTableViewerColumn_Markable(tvResults,

From aa8d6f52b81f367b789c8f37c0ac8877e1554802 Mon Sep 17 00:00:00 2001
From: Niraj Modi <niraj.modi@in.ibm.com>
Date: Tue, 22 Mar 2022 20:14:31 +0530
Subject: [PATCH 1204/1286] Bug 577961 - Model Spy List tab not accessible with
 keyboard only - Fixed the mnemonics & no tab focus part on Windows(which
 seems to be missed in the original design.)

Change-Id: Ica4e7d5abb4e48f97d18304e20d24afedcea7f4b
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
---
 .../e4/tools/emf/ui/internal/common/component/tabs/ListTab.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index e8eda9022d..fa388e47d1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -378,7 +378,7 @@ public void documentAboutToBeChanged(DocumentEvent event) {
 
 		tabItem.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_table_obj));
 
-		final ToolBar toolBar = new ToolBar(composite, SWT.FLAT | SWT.NO_FOCUS);
+		final ToolBar toolBar = new ToolBar(composite, SWT.FLAT);
 		toolBar.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
 
 		{

From 3c9dadfe40a73fd09dc9a1df404ae00882d3fd86 Mon Sep 17 00:00:00 2001
From: Vikas Chandra <Vikas.Chandra@in.ibm.com>
Date: Tue, 22 Mar 2022 21:48:58 +0530
Subject: [PATCH 1205/1286] Bug 577961 - Model Spy List tab not accessible with
 keyboard only

Change-Id: If2ac742ecc181ea3f5ed3d768d485eeb75fa37b1
Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>
---
 .../eclipse/e4/tools/emf/ui/internal/Messages.java    |  1 +
 .../e4/tools/emf/ui/internal/Messages.properties      | 11 ++++++-----
 .../ui/internal/common/component/ControlFactory.java  |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index d556c35d00..39b600a877 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -112,6 +112,7 @@ public class Messages {
 	public static String ModelTooling_Common_FindEllipsis;
 	public String ModelTooling_Common_TabDefault;
 	public String ModelTooling_Common_TabSupplementary;
+	public static String ModelTooling_XMIID;
 	public String ModelEditor_AddChild;
 	public String ModelEditor_Move;
 	public String ModelEditor_Cut;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 8151dbfda0..bf6a1ab243 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -47,8 +47,9 @@ ModelTooling_Common_Replace=Replace
 ModelTooling_Common_Id=&ID\:
 ModelTooling_Common_RefId=&Reference-ID\:
 ModelTooling_Common_FindEllipsis=Find ...
-ModelTooling_Common_TabDefault=Default
-ModelTooling_Common_TabSupplementary=Supplementary
+ModelTooling_Common_TabDefault=&Default
+ModelTooling_Common_TabSupplementary=&Supplementary
+ModelTooling_XMIID=X&MI:ID
 
 ModelEditor_AddChild=Add child
 ModelEditor_Move=Move
@@ -58,10 +59,10 @@ ModelEditor_Paste=Paste
 ModelEditor_PasteObjects=Paste Objects
 
 ModelTooling_Common_RuntimeContributionInstance=Contrib. Instance
-ModelTooling_Common_RuntimeWidgetTree=Widget Tree
+ModelTooling_Common_RuntimeWidgetTree=&Widget Tree
 
-ModelTooling_UIElement_ToBeRendered=To Be Rendered
-ModelTooling_UIElement_Visible=Visible
+ModelTooling_UIElement_ToBeRendered=&To Be Rendered
+ModelTooling_UIElement_Visible=&Visible
 ModelTooling_UIElement_VisibleWhen=&Visible-When Expression\:
 ModelTooling_UIElement_AccessibilityPhrase=&Accessibility Phrase\:
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index ef8926e443..81aa0e9a74 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -165,7 +165,7 @@ public boolean validate(String text) {
 
 	public static <M> void createXMIId(Composite parent, AbstractComponentEditor<M> editor) {
 		final Label l = new Label(parent, SWT.NONE);
-		l.setText("XMI:ID"); //$NON-NLS-1$
+		l.setText(Messages.ModelTooling_XMIID);
 		l.setLayoutData(new GridData());
 
 		final Text t = new Text(parent, SWT.BORDER);

From a095c0e781a9cf1fd5e8d6241f0abe0279fdb947 Mon Sep 17 00:00:00 2001
From: Niraj Modi <niraj.modi@in.ibm.com>
Date: Fri, 25 Mar 2022 16:49:03 +0530
Subject: [PATCH 1206/1286] Bug 579418 - Model Spy > Form/List/XMI tabs >
 selection state lost when switching.

Change-Id: I7c227e6513a12e11600c2d856ebfe52910a9dfcf
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
---
 .../emf/ui/internal/common/ModelEditor.java   | 53 +++++++++++++++----
 1 file changed, 42 insertions(+), 11 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 7f65c7cdc0..a5b71dfb09 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2018 BestSolution.at and others.
+ * Copyright (c) 2010, 2022 BestSolution.at and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -289,6 +289,7 @@ public class ModelEditor implements IGotoObject {
 	public static final int TAB_FORM = 0;
 	public static final int TAB_XMI = 1;
 	public static final int TAB_LIST = 2;
+	final String key = "org.eclipse.e4.tools.active-object-viewer"; //$NON-NLS-1$
 
 
 
@@ -486,22 +487,18 @@ void postCreate(Composite composite) {
 			public void widgetSelected(SelectionEvent e) {
 				if (editorTabFolder.getSelectionIndex() == getTabIndex(tabItemXmi)) {
 					emfDocumentProvider.updateFromEMF();
+					gotoEObject(TAB_XMI, null);
 				}
-			}
-		});
-
-		editorTabFolder.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
 				// When the list tab is visible, register the IViewEObjects
 				// interface
 				// This allows external commands to interact with the view.
 				// Eventually, all 3 tabs, or even the ModelEditor itself, could
 				// implement the interface.
-				final String key = "org.eclipse.e4.tools.active-object-viewer"; //$NON-NLS-1$
-				if (listTab != null && editorTabFolder.getSelectionIndex() == getTabIndex(listTab.getTabItem())) {
+				else if (listTab != null && editorTabFolder.getSelectionIndex() == getTabIndex(listTab.getTabItem())) {
+					gotoEObject(TAB_LIST, null);
 					app.getContext().set(key, listTab);
 				} else {
+					gotoEObject(TAB_FORM, null);
 					app.getContext().set(key, null);
 				}
 			}
@@ -2091,9 +2088,43 @@ private String getObjectNameForCommand(Object data) {
 
 	@Override
 	public void gotoEObject(int targetHint, EObject object) {
+		// Try to find current selection if any
 		if (object == null) {
-			// do nothing
-		} else {
+			switch (targetHint) {
+			case TAB_FORM:
+				if (app.getContext().get(key) == listTab) {
+					Iterator<EObject> it = listTab.getSelectedEObjects().iterator();
+					if (it.hasNext()) {
+						object = it.next();
+					}
+				}
+				break;
+			case TAB_XMI:
+				if (app.getContext().get(key) == listTab) {
+					Iterator<EObject> it = listTab.getSelectedEObjects().iterator();
+					if (it.hasNext()) {
+						object = it.next();
+					}
+				} else if (app.getContext().get(key) == null) {
+					final Object parent = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+					if (parent instanceof EObject) {
+						object = (EObject) parent;
+					}
+				}
+				break;
+			case TAB_LIST:
+				if (app.getContext().get(key) == null) {
+					final Object parent = ((IStructuredSelection) viewer.getSelection()).getFirstElement();
+					if (parent instanceof EObject) {
+						object = (EObject) parent;
+					}
+				}
+				break;
+			default:
+				break;
+			}
+		}
+		if (object != null) {
 			switch (targetHint) {
 			case TAB_FORM:
 				// make sure tree node has been instantiated

From 16b71134fabed85548c35f63f9961b537d95caef Mon Sep 17 00:00:00 2001
From: Niraj Modi <92304759+niraj-modi@users.noreply.github.com>
Date: Thu, 31 Mar 2022 15:37:12 +0530
Subject: [PATCH 1207/1286] Bug 579509 - IES423:(ICT) Missing space between two
 strings (#14)

* Bug 579509 - IES423:(ICT) Missing space between two strings
- Fixed missing space between strings
- Added missing Eclipse Copy right note

Change-Id: Ie3bbd2ff42172d1cd5beb0269900cda1039e07d4
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>

* Bug 579509 - IES423:(ICT) Missing space between two strings
- Fixed missing space between strings
- Added missing Eclipse Copy right note

Change-Id: Ie3bbd2ff42172d1cd5beb0269900cda1039e07d4
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
---
 .../META-INF/MANIFEST.MF                       |  2 +-
 .../org.eclipse.e4.tools.emf.editor3x/pom.xml  |  2 +-
 .../editor3x/ModelEditorPreferencePage.java    | 18 +++++++++++++++---
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 81cdf2e552..fd70161e8a 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 4.8.0.qualifier
+Bundle-Version: 4.8.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 605a37912d..fcb25da4d6 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.editor3x</artifactId>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>4.8.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
index f8e0a3ae34..cc8b7debcc 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
@@ -1,4 +1,12 @@
 /*******************************************************************************
+ * Copyright (c) 2022 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * Steven Spungin <steven@spungin.tv> - Bug 431735, Bug 437890, Bug 440469
@@ -114,9 +122,13 @@ protected Control createContents(Composite parent) {
 			{
 				final Composite container = new Composite(group, SWT.NONE);
 				container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
-				fShowSearch = new BooleanFieldEditor(ModelEditorPreferences.TAB_FORM_SEARCH_SHOW,
-					Messages.ModelEditorPreferencePage_SearchableTree
-						+ Messages.ModelEditorPreferencePage_ForcesReadOnlyXMITab + Messages.ModelEditorPreferencePage_RequiresReopeningModel, container);
+				StringBuilder buffer = new StringBuilder(Messages.ModelEditorPreferencePage_SearchableTree);
+				buffer.append(" "); //$NON-NLS-1$
+				buffer.append(Messages.ModelEditorPreferencePage_ForcesReadOnlyXMITab);
+				buffer.append(" "); //$NON-NLS-1$
+				buffer.append(Messages.ModelEditorPreferencePage_RequiresReopeningModel);
+				fShowSearch = new BooleanFieldEditor(ModelEditorPreferences.TAB_FORM_SEARCH_SHOW, buffer.toString(),
+						container);
 				fShowSearch.setPage(this);
 				fShowSearch.setPreferenceStore(getPreferenceStore());
 				fShowSearch.load();

From 34d7ef49fe07aab46a19de0eaadc8f6f6388418f Mon Sep 17 00:00:00 2001
From: Niraj Modi <92304759+niraj-modi@users.noreply.github.com>
Date: Thu, 31 Mar 2022 21:28:44 +0530
Subject: [PATCH 1208/1286] Bug 579509 (#17)

* Bug 579509 - IES423:(ICT) Missing space between two strings
- Fixed missing space between strings
- Added missing Eclipse Copy right note

Change-Id: Ie3bbd2ff42172d1cd5beb0269900cda1039e07d4
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>

* Bug 579509 - IES423:(ICT) Missing space between two strings
- Fixed missing space between strings
- Added missing Eclipse Copy right note

Change-Id: Ie3bbd2ff42172d1cd5beb0269900cda1039e07d4
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>

* Bug 579509 part2 - IES423:(ICT) Missing space between two strings
- Fixed bundle version for master.

Change-Id: I61b855818fc2937325899cb687aa38bb25554868
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
---
 bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index fd70161e8a..79a49c7a4c 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 4.8.1.qualifier
+Bundle-Version: 4.8.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index fcb25da4d6..dc5453f127 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.editor3x</artifactId>
-  <version>4.8.1-SNAPSHOT</version>
+  <version>4.8.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>

From ee73a4cffdfcbc87a8b0cf2314611ab16ba4d88e Mon Sep 17 00:00:00 2001
From: Niraj Modi <niraj.modi@in.ibm.com>
Date: Wed, 20 Apr 2022 13:47:01 +0530
Subject: [PATCH 1209/1286] Bug 579683 - IES423: The 1st character of each
 topic is truncated in navigation tree of 'Model Spy' in Arabic - Change
 'Italic' font to 'Normal'

Change-Id: I329df6fbb33ff182950c94cb99c09ff9d18b32b9
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
---
 .../e4/tools/emf/ui/internal/common/ModelEditor.java        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index a5b71dfb09..60cbd8f45f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -1063,10 +1063,10 @@ private TreeViewer createTreeViewerArea(Composite parent) {
 		}
 		final TreeViewer viewer = tempViewer;
 
-		final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont())
-				.setStyle(SWT.ITALIC);
+		final FontDescriptor fontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont())
+				.setStyle(SWT.NORMAL);
 		viewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
-				new ComponentLabelProvider(this, messages, italicFontDescriptor)));
+				new ComponentLabelProvider(this, messages, fontDescriptor)));
 		final ObservableListTreeContentProvider<Object> contentProvider = new ObservableListTreeContentProvider<>(
 				new ObservableFactoryImpl(), new TreeStructureAdvisor<>() {
 				});

From 8ccd1a6f955bcd6bc85825d68bf075b8889daae5 Mon Sep 17 00:00:00 2001
From: SDawley <sdawley@redhat.com>
Date: Fri, 3 Jun 2022 10:06:30 -0700
Subject: [PATCH 1210/1286] POM and product version changes for 4.25 release
 (#22)

---
 bundles/org.eclipse.e4.tools.compat/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml     | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml          | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                   | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 2 +-
 tests/org.eclipse.e4.tools.test/pom.xml                | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index a9a6b0420a..33c6b1747d 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.24.0-SNAPSHOT</version>
+    <version>4.25.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index dc5453f127..aac6346cbd 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.24.0-SNAPSHOT</version>
+    <version>4.25.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index b9824bf46f..044f4ade8e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.24.0-SNAPSHOT</version>
+    <version>4.25.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 55869d0a3d..9e934efc92 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.24.0-SNAPSHOT</version>
+    <version>4.25.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index beaa32cb04..79a5d42aeb 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.24.0-SNAPSHOT</version>
+    <version>4.25.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index af520447cb..11babc2ffc 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.24.0-SNAPSHOT</version>
+    <version>4.25.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 711df4c878..651ee42a63 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.24.0.qualifier"
+      version="4.25.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index af1ac9e799..43ec1e9394 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.24.0-SNAPSHOT</version>
+    <version>4.25.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index 24533977a9..cb3d765d3a 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.24.0-SNAPSHOT</version>
+		<version>4.25.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From fb6385b4b88b05f839fad2ce3c2b81eb96a5d4ff Mon Sep 17 00:00:00 2001
From: Sravan Kumar Lakkimsetti
 <77106773+sravanlakkimsetti@users.noreply.github.com>
Date: Fri, 2 Sep 2022 19:39:21 +0530
Subject: [PATCH 1211/1286] POM and product version changes for 4.26 release
 (#25)

Tracked in
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/514
---
 bundles/org.eclipse.e4.tools.compat/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml     | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml          | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                   | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 2 +-
 tests/org.eclipse.e4.tools.test/pom.xml                | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 33c6b1747d..71b4999087 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.25.0-SNAPSHOT</version>
+    <version>4.26.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index aac6346cbd..81badeec9d 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.25.0-SNAPSHOT</version>
+    <version>4.26.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 044f4ade8e..e287a09dd8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.25.0-SNAPSHOT</version>
+    <version>4.26.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 9e934efc92..0594e327d8 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.25.0-SNAPSHOT</version>
+    <version>4.26.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 79a5d42aeb..8182fbed28 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.25.0-SNAPSHOT</version>
+    <version>4.26.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index 11babc2ffc..ad7d512af7 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.25.0-SNAPSHOT</version>
+    <version>4.26.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 651ee42a63..e7fb241b71 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.25.0.qualifier"
+      version="4.26.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 43ec1e9394..1a7f9af2e2 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.25.0-SNAPSHOT</version>
+    <version>4.26.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index cb3d765d3a..ada81cc8d5 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.25.0-SNAPSHOT</version>
+		<version>4.26.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From f330b186caa28314a263b2b195466b38a444f088 Mon Sep 17 00:00:00 2001
From: Ed Merks <Ed.Merks@gmail.com>
Date: Thu, 15 Sep 2022 12:41:26 +0200
Subject: [PATCH 1212/1286] JavaAttribute.getAttributes() should catch
 InaccessibleObjectException (#27)

It should handle this the same way as IllegalArgumentException and
IllegalAccessException.

https://github.com/eclipse-platform/eclipse.platform.ui/pull/257
---
 bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF    | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml                 | 2 +-
 .../emf/ui/internal/common/objectdata/JavaAttribute.java    | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 336ddf5d66..993df8e816 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.7.300.qualifier
+Bundle-Version: 4.7.400.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index e287a09dd8..81d59513e3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.7.300-SNAPSHOT</version>
+  <version>4.7.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
index da701e26f3..03a47e5975 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
@@ -1,6 +1,7 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.objectdata;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.InaccessibleObjectException;
 import java.lang.reflect.Modifier;
 import java.util.Collections;
 import java.util.List;
@@ -61,10 +62,7 @@ public List<JavaAttribute> getAttributes() {
 			}
 			return new JavaObject(field.get(object.getInstance())).getAttributes();
 
-		} catch (final IllegalArgumentException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (final IllegalAccessException e) {
+		} catch (final IllegalArgumentException | IllegalAccessException | InaccessibleObjectException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}

From 19af32267d755e0a44d9a74042bf3e760724376d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?=
 =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?=
 <akurtakov@gmail.com>
Date: Fri, 11 Nov 2022 13:31:21 +0200
Subject: [PATCH 1213/1286] Version bump for 4.26 stream

Needed to get the bundle resigned for
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/661
---
 bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF | 2 +-
 bundles/org.eclipse.e4.tools.compat/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 9e3d206360..4696cf7003 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 4.8.100.qualifier
+Bundle-Version: 4.8.200.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index 71b4999087..deb49575d7 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.compat</artifactId>
-  <version>4.8.100-SNAPSHOT</version>
+  <version>4.8.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>

From 32accd6933a14cde4fbbd0f9787747c7b8b3ff51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?=
 =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?=
 <akurtakov@gmail.com>
Date: Wed, 30 Nov 2022 22:32:14 +0200
Subject: [PATCH 1214/1286] POM and product version changes for 4.27 release

Tracked in
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/712
---
 bundles/org.eclipse.e4.tools.compat/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml      | 2 +-
 bundles/org.eclipse.e4.tools.emf.ui/pom.xml            | 2 +-
 bundles/org.eclipse.e4.tools.jdt.templates/pom.xml     | 2 +-
 bundles/org.eclipse.e4.tools.services/pom.xml          | 2 +-
 bundles/org.eclipse.e4.tools/pom.xml                   | 2 +-
 features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 features/org.eclipse.e4.core.tools.feature/pom.xml     | 2 +-
 tests/org.eclipse.e4.tools.test/pom.xml                | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/bundles/org.eclipse.e4.tools.compat/pom.xml
index deb49575d7..cacf15d197 100644
--- a/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ b/bundles/org.eclipse.e4.tools.compat/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.26.0-SNAPSHOT</version>
+    <version>4.27.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
index 81badeec9d..558bbc1690 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
@@ -4,7 +4,7 @@
    <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.26.0-SNAPSHOT</version>
+    <version>4.27.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 81d59513e3..73b4d80bf0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.26.0-SNAPSHOT</version>
+    <version>4.27.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
index 0594e327d8..b146164595 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.26.0-SNAPSHOT</version>
+    <version>4.27.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/bundles/org.eclipse.e4.tools.services/pom.xml
index 8182fbed28..68ad1587b4 100644
--- a/bundles/org.eclipse.e4.tools.services/pom.xml
+++ b/bundles/org.eclipse.e4.tools.services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.26.0-SNAPSHOT</version>
+    <version>4.27.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/bundles/org.eclipse.e4.tools/pom.xml
index ad7d512af7..d0ec07e6ea 100644
--- a/bundles/org.eclipse.e4.tools/pom.xml
+++ b/bundles/org.eclipse.e4.tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.26.0-SNAPSHOT</version>
+    <version>4.27.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index e7fb241b71..a73e50d0bf 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.26.0.qualifier"
+      version="4.27.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/features/org.eclipse.e4.core.tools.feature/pom.xml
index 1a7f9af2e2..f95f193831 100644
--- a/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ b/features/org.eclipse.e4.core.tools.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.26.0-SNAPSHOT</version>
+    <version>4.27.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tests/org.eclipse.e4.tools.test/pom.xml
index ada81cc8d5..d92597caa0 100644
--- a/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.26.0-SNAPSHOT</version>
+		<version>4.27.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From c7960accc17799c35d08ac6d6f5aad40f49e7c8a Mon Sep 17 00:00:00 2001
From: Eugen Neufeld <neufeld.eugen@googlemail.com>
Date: Tue, 20 Dec 2022 09:25:35 +0100
Subject: [PATCH 1215/1286] Bug 570471 - Add utilities for perspectives
 persistence and migration (#21)

Add new utilities which allow to

persist and restore perspectives in e4 applications including the
part's states
migrate 3.x perspectives to e4 applications
The code is split in two bundles, one contributing the persist and
restore functionality, the other contributing the 3.x to e4 perspective
migration.

Signed-off-by: Eugen Neufeld <eneufeld@eclipsesource.com>
---
 .../.classpath                                |  11 +
 .../.project                                  |  28 +
 .../org.eclipse.core.resources.prefs          |   2 +
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +
 .../META-INF/MANIFEST.MF                      |  16 +
 .../OSGI-INF/l10n/bundle.properties           |  16 +
 .../build.properties                          |   5 +
 .../pom.xml                                   |  19 +
 .../migration/PerspectiveMigrator.java        | 106 ++
 .../migration/E4MigrationTool.java            | 937 ++++++++++++++++++
 .../compatibiliy/migration/WorkbenchUtil.java |  58 ++
 .../.classpath                                |   7 +
 .../org.eclipse.e4.tools.persistence/.project |  39 +
 .../org.eclipse.core.resources.prefs          |   2 +
 .../.settings/org.eclipse.core.runtime.prefs  |   2 +
 .../.settings/org.eclipse.jdt.core.prefs      | 431 ++++++++
 .../.settings/org.eclipse.jdt.ui.prefs        |  66 ++
 .../.settings/org.eclipse.pde.api.tools.prefs | 104 ++
 .../.settings/org.eclipse.pde.prefs           |  32 +
 .../META-INF/MANIFEST.MF                      |  21 +
 .../OSGI-INF/l10n/bundle.properties           |  16 +
 .../about.html                                |  36 +
 .../build.properties                          |  22 +
 .../model/persistence.ecore                   |  20 +
 .../model/persistence.genmodel                |  36 +
 .../plugin.xml                                |  16 +
 .../org.eclipse.e4.tools.persistence/pom.xml  |  19 +
 .../internal/persistence/IPartMemento.java    |  90 ++
 .../persistence/IPersistenceFactory.java      |  62 ++
 .../persistence/IPersistencePackage.java      | 359 +++++++
 .../internal/persistence/IWorkbenchState.java | 129 +++
 .../persistence/impl/PartMemento.java         | 232 +++++
 .../persistence/impl/PersistenceFactory.java  | 122 +++
 .../persistence/impl/PersistencePackage.java  | 301 ++++++
 .../persistence/impl/WorkbenchState.java      | 352 +++++++
 .../internal/persistence/util/CommonUtil.java | 287 ++++++
 .../util/PersistenceAdapterFactory.java       | 145 +++
 .../persistence/util/PersistenceSwitch.java   | 141 +++
 .../persistence/PerspectivePersister.java     | 502 ++++++++++
 .../.project                                  |  17 +
 .../org.eclipse.core.resources.prefs          |   2 +
 .../build.properties                          |   2 +
 .../feature.properties                        |  49 +
 .../feature.xml                               |  36 +
 .../forceQualifierUpdate.txt                  |   1 +
 .../pom.xml                                   |  58 ++
 .../.classpath                                |  11 +
 .../.project                                  |  28 +
 .../org.eclipse.core.resources.prefs          |   2 +
 .../.settings/org.eclipse.core.runtime.prefs  |   2 +
 .../.settings/org.eclipse.jdt.core.prefs      | 468 +++++++++
 .../.settings/org.eclipse.jdt.ui.prefs        |  64 ++
 .../.settings/org.eclipse.pde.prefs           |  17 +
 .../META-INF/MANIFEST.MF                      |  16 +
 .../build.properties                          |   4 +
 .../pom.xml                                   |  46 +
 .../resources/e4_test.xml                     | 161 +++
 .../resources/perspective_3x.xml              | 342 +++++++
 .../migration/tests/E4MigrationToolTest.java  | 127 +++
 .../tests/util/TestWorkbenchAdvisor.java      |  24 +
 .../.classpath                                |  11 +
 .../.project                                  |  28 +
 .../org.eclipse.core.resources.prefs          |   2 +
 .../.settings/org.eclipse.core.runtime.prefs  |   2 +
 .../.settings/org.eclipse.jdt.core.prefs      | 468 +++++++++
 .../.settings/org.eclipse.jdt.ui.prefs        |  64 ++
 .../.settings/org.eclipse.pde.prefs           |  17 +
 .../META-INF/MANIFEST.MF                      |  17 +
 .../build.properties                          |   5 +
 .../plugin.xml                                |  22 +
 .../pom.xml                                   |  46 +
 .../resources/workbench_restore.persistence   |  24 +
 .../tests/PerspectivePersisterTest.java       |  89 ++
 .../tests/util/TestPerspective.java           |  15 +
 .../persistence/tests/util/TestViewPart.java  |  52 +
 .../tests/util/TestWorkbenchAdvisor.java      |  22 +
 76 files changed, 7165 insertions(+)
 create mode 100644 bundles/org.eclipse.e4.tools.compatibility.migration/.classpath
 create mode 100644 bundles/org.eclipse.e4.tools.compatibility.migration/.project
 create mode 100644 bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.core.resources.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
 create mode 100644 bundles/org.eclipse.e4.tools.compatibility.migration/OSGI-INF/l10n/bundle.properties
 create mode 100644 bundles/org.eclipse.e4.tools.compatibility.migration/build.properties
 create mode 100644 bundles/org.eclipse.e4.tools.compatibility.migration/pom.xml
 create mode 100644 bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java
 create mode 100644 bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
 create mode 100644 bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/WorkbenchUtil.java
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/.classpath
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/.project
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.resources.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.ui.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.api.tools.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.prefs
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/OSGI-INF/l10n/bundle.properties
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/about.html
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/build.properties
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/model/persistence.ecore
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/plugin.xml
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/pom.xml
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPartMemento.java
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistenceFactory.java
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistencePackage.java
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IWorkbenchState.java
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PartMemento.java
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistenceFactory.java
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistencePackage.java
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/WorkbenchState.java
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceAdapterFactory.java
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java
 create mode 100644 bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java
 create mode 100644 features/org.eclipse.e4.tools.persistence.feature/.project
 create mode 100644 features/org.eclipse.e4.tools.persistence.feature/.settings/org.eclipse.core.resources.prefs
 create mode 100644 features/org.eclipse.e4.tools.persistence.feature/build.properties
 create mode 100644 features/org.eclipse.e4.tools.persistence.feature/feature.properties
 create mode 100644 features/org.eclipse.e4.tools.persistence.feature/feature.xml
 create mode 100644 features/org.eclipse.e4.tools.persistence.feature/forceQualifierUpdate.txt
 create mode 100644 features/org.eclipse.e4.tools.persistence.feature/pom.xml
 create mode 100644 tests/org.eclipse.e4.tools.compatibility.migration.tests/.classpath
 create mode 100644 tests/org.eclipse.e4.tools.compatibility.migration.tests/.project
 create mode 100644 tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.resources.prefs
 create mode 100644 tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.ui.prefs
 create mode 100644 tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.pde.prefs
 create mode 100644 tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF
 create mode 100644 tests/org.eclipse.e4.tools.compatibility.migration.tests/build.properties
 create mode 100644 tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
 create mode 100644 tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/e4_test.xml
 create mode 100644 tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/perspective_3x.xml
 create mode 100644 tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java
 create mode 100644 tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/util/TestWorkbenchAdvisor.java
 create mode 100644 tests/org.eclipse.e4.tools.persistence.tests/.classpath
 create mode 100644 tests/org.eclipse.e4.tools.persistence.tests/.project
 create mode 100644 tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.resources.prefs
 create mode 100644 tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.runtime.prefs
 create mode 100644 tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.ui.prefs
 create mode 100644 tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.pde.prefs
 create mode 100644 tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF
 create mode 100644 tests/org.eclipse.e4.tools.persistence.tests/build.properties
 create mode 100644 tests/org.eclipse.e4.tools.persistence.tests/plugin.xml
 create mode 100644 tests/org.eclipse.e4.tools.persistence.tests/pom.xml
 create mode 100644 tests/org.eclipse.e4.tools.persistence.tests/resources/workbench_restore.persistence
 create mode 100644 tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java
 create mode 100644 tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestPerspective.java
 create mode 100644 tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestViewPart.java
 create mode 100644 tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestWorkbenchAdvisor.java

diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/.classpath b/bundles/org.eclipse.e4.tools.compatibility.migration/.classpath
new file mode 100644
index 0000000000..4a00becd81
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compatibility.migration/.classpath
@@ -0,0 +1,11 @@
+<?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/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/.project b/bundles/org.eclipse.e4.tools.compatibility.migration/.project
new file mode 100644
index 0000000000..d282bdb0b9
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compatibility.migration/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.compatibility.migration</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..a58ebdcad3
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,15 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..e9b3bfd6ce
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-Vendor: %Bundle-Vendor
+Bundle-SymbolicName: org.eclipse.e4.tools.compatibility.migration
+Bundle-Version: 1.0.0.qualifier
+Automatic-Module-Name: org.eclipse.e4.tools.compatibiliy.migration
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Require-Bundle: org.eclipse.e4.tools.persistence;bundle-version="1.0.0",
+ org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)",
+ org.eclipse.e4.ui.workbench;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.ui;bundle-version="[3.110.0,4.0.0)",
+ org.eclipse.e4.core.contexts
+Export-Package: org.eclipse.e4.tools.compatibiliy.migration,
+ org.eclipse.e4.tools.internal.compatibiliy.migration;x-internal:=true
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools.compatibility.migration/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000000..2856f5fd50
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compatibility.migration/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,16 @@
+###############################################################################
+# Copyright (c) 2022 EclipseSource GmbH and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     EclipseSource GmbH - initial API and implementation
+###############################################################################
+#Properties file for org.eclipse.ui.persistence
+Bundle-Name = Perspective migrate compatibility Util 
+Bundle-Vendor = Eclipse.org
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/build.properties b/bundles/org.eclipse.e4.tools.compatibility.migration/build.properties
new file mode 100644
index 0000000000..c58ea2178c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compatibility.migration/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/pom.xml b/bundles/org.eclipse.e4.tools.compatibility.migration/pom.xml
new file mode 100644
index 0000000000..3fec1612df
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compatibility.migration/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse</groupId>
+		<artifactId>eclipse.platform.ui.tools</artifactId>
+		<version>4.27.0-SNAPSHOT</version>
+		<relativePath>../../</relativePath>
+	</parent>
+	<groupId>eclipse.platform.ui.tool</groupId>
+	<artifactId>org.eclipse.e4.tools.compatibility.migration</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+
+	<properties>
+		<skipAPIAnalysis>true</skipAPIAnalysis> <!-- Not in baseline -->
+	</properties>
+
+</project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java b/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java
new file mode 100644
index 0000000000..0f9fe685bf
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java
@@ -0,0 +1,106 @@
+/*******************************************************************************
+ * Copyright (c) 2022 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compatibiliy.migration;
+
+import java.util.List;
+
+import org.eclipse.e4.tools.internal.compatibiliy.migration.E4MigrationTool;
+import org.eclipse.e4.tools.internal.compatibiliy.migration.WorkbenchUtil;
+import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
+import org.eclipse.e4.tools.persistence.PerspectivePersister;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.internal.IWorkbenchConstants;
+
+/**
+ * The PerspectiveMigrator utility allows to convert 
+ * and apply 3.x and e4 perspectives.
+ *
+ * @since 1.0
+ *
+ */
+@SuppressWarnings("restriction")
+public final class PerspectiveMigrator{
+
+	private PerspectiveMigrator() {}
+	
+	/**
+	 * Apply a 3.x workbench state to the running 4.x application.
+	 *
+	 * @param iMemento The 3.x workbench state to apply
+	 */
+	public static void apply3xWorkbenchState(final IMemento iMemento) {
+		MApplication application = convertToMApplication(iMemento);
+		IWorkbenchState workbenchState = convertToWorkbenchState(application);
+		PerspectivePersister.restoreWorkbenchState(workbenchState);
+	}
+
+	/**
+	 * Convert a serialized 3.x workbench to an e4 MApplication.
+	 *
+	 * @param iMemento The 3.x workbench memento
+	 * @return The resulting MApplication
+	 */
+	public static MApplication convertToMApplication(final IMemento iMemento) {
+		return E4MigrationTool.convert(iMemento);
+	}
+
+	/**
+	 * Extract the WorkbenchState from the MApplication. This state can be used to
+	 * restore the workbench.
+	 *
+	 * @param application The MApplication to extract the state from
+	 * @return The extracted WorkbenchState
+	 */
+	public static IWorkbenchState convertToWorkbenchState(final MApplication application) {
+		EModelService modelService = WorkbenchUtil.getEModelService();
+		MPerspective activePerspective = modelService.getActivePerspective(WorkbenchUtil.getCurrentMainWindow());
+		List<MPerspective> findElements = modelService.findElements(application, null, MPerspective.class, null);
+
+		MPerspective mPerspective = null;
+		String elementId = activePerspective.getElementId();
+		for (MPerspective perspective : findElements) {
+			if (elementId.equals(perspective.getElementId())) {
+				mPerspective = perspective;
+			}
+		}
+
+		if (mPerspective == null) {
+			System.err
+					.println("No perspective with id " + elementId + " was found. Using first perspective to restore"); //$NON-NLS-1$ //$NON-NLS-2$
+			mPerspective = findElements.get(0);
+			mPerspective.setElementId(elementId);
+		}
+
+		return PerspectivePersister.convertPerspective(mPerspective);
+	}
+	/**
+	 * Check whether the provided memento contains a legacy (3.x) workbench.
+	 *
+	 * @param iMemento The serialized IMemento
+	 * @return true if the memento contains a legacy workbench.
+	 */
+	public static boolean isLegacyWorkbench(IMemento iMemento) {
+		try {
+			return IWorkbenchConstants.TAG_WORKBENCH.equals(iMemento.getType());
+		} catch (Exception ex) {
+			ex.printStackTrace();
+		}
+
+		return false;
+	}
+
+}
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java b/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
new file mode 100644
index 0000000000..17368eb120
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
@@ -0,0 +1,937 @@
+/*******************************************************************************
+ * Copyright (c) 2022 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.internal.compatibiliy.migration;
+
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_ACTIVE_PAGE_ID;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_ACTIVE_PART;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_ACTIVE_PERSPECTIVE;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_ALWAYS_ON_ACTION_SET;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_AREA;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_AREA_TRIM_STATE;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_AREA_VISIBLE;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_CONTENT;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_DESCRIPTOR;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_DETACHED_WINDOW;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_EDITOR;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_EDITORS;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_EXPANDED;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_FAST_VIEWS;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_FAST_VIEW_BAR;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_FAST_VIEW_BARS;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_FILE;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_FOCUS;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_FOLDER;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_HEIGHT;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_HIDDEN_WINDOW;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_HIDE_MENU;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_HIDE_TOOLBAR;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_ID;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_INFO;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_LABEL;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_LAYOUT;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_MAIN_WINDOW;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_MAXIMIZED;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_MINIMIZED;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_MRU_LIST;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_NEW_WIZARD_ACTION;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PAGE;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PART;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PART_NAME;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PERSPECTIVE;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PERSPECTIVES;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PERSPECTIVE_ACTION;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PERSPECTIVE_BAR;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PRESENTATION;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PROPERTIES;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PROPERTY;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_RATIO;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_RATIO_LEFT;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_RATIO_RIGHT;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_RELATIONSHIP;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_RELATIVE;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_SHOW_IN_TIME;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_SHOW_VIEW_ACTION;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_TITLE;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_TOOLTIP;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_VIEW;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_VIEWS;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_VIEW_STATE;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_WIDTH;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_WINDOW;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_WORKBOOK;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_WORKING_SET;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_WORKING_SETS;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_X;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_Y;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.StringWriter;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.eclipse.e4.ui.model.application.MAddon;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory;
+import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
+import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainerElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
+import org.eclipse.e4.ui.model.application.ui.basic.MStackElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.e4.ui.workbench.IPresentationEngine;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+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.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.WorkbenchException;
+import org.eclipse.ui.XMLMemento;
+import org.eclipse.ui.internal.e4.compatibility.ModeledPageLayoutUtils;
+
+/**
+ * This utility class allows to migrate existing 3.x perspectives to 
+ * an e4 application models.
+ *  
+ *
+ * @since 1.0
+ *
+ */
+@SuppressWarnings("restriction")
+public final class E4MigrationTool {
+
+	/** Element id for the primary editor stack in an e4 application. */
+	private static final String PRIMARY_EDITOR_PART_STACK_ID = "org.eclipse.e4.primaryDataStack"; //$NON-NLS-1$
+
+	private static final String EDITOR_AREA_ID = "org.eclipse.ui.editorss"; //$NON-NLS-1$
+
+	private final Map<Object, Set<String>> visited = new LinkedHashMap<>();
+
+	private E4MigrationTool() {
+	}
+
+	/**
+	 * Allows to convert an 3.x perspective to a serialized e4 application.
+	 *
+	 * @param sourceMementoFile The file to the 3.x serialized perspective.
+	 * @param targetMApplicationFile The file to serialize the e4 application to.
+	 * @throws IOException           When reading/writing the files fails.
+	 * @throws FileNotFoundException When the files do not exist.
+	 * @throws WorkbenchException    When reading the 3.x perspective fails
+	 */
+	public static void convert(final File sourceMementoFile, final File targetMApplicationFile)
+			throws FileNotFoundException, IOException, WorkbenchException {
+		E4MigrationTool converter = new E4MigrationTool();
+		IMemento memento;
+		try (FileInputStream input = new FileInputStream(sourceMementoFile)) {
+			BufferedReader reader = new BufferedReader(new InputStreamReader(input, "utf-8")); //$NON-NLS-1$
+			memento = XMLMemento.createReadRoot(reader);
+		}
+
+		ResourceSet resourceSet = new ResourceSetImpl();
+
+		Resource resource = resourceSet.createResource(URI.createURI("sample.e4xmi")); //$NON-NLS-1$
+		resource.getContents().add((EObject) converter.internalConvert(memento));
+
+		try (FileOutputStream output = new FileOutputStream(targetMApplicationFile)) {
+			resource.save(output, null);
+		}
+
+	}
+
+	/**
+	 * Convert the IMemento of the workbench state of an 3.x application to a MApplication.
+	 *
+	 * @param memento The IMemento to convert
+	 * @return The resulting MApplication
+	 * @throws WorkbenchException Thrown when the xml cannot be parsed
+	 */
+	public static MApplication convert(final IMemento memento) {
+		E4MigrationTool converter = new E4MigrationTool();
+		return converter.internalConvert(memento);
+	}
+
+	private MApplication internalConvert(final IMemento memento) {
+		MApplication application = MApplicationFactory.INSTANCE.createApplication();
+
+		// Initialize the add ons.
+		{
+			List<MAddon> addons = application.getAddons();
+			String[][] addonValues = new String[][] { new String[] { "org.eclipse.e4.core.commands.service", //$NON-NLS-1$
+					"platform:/plugin/org.eclipse.platform", //$NON-NLS-1$
+					"bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon" }, //$NON-NLS-1$
+					new String[] { "org.eclipse.e4.ui.contexts.service", "platform:/plugin/org.eclipse.platform", //$NON-NLS-1$ //$NON-NLS-2$
+							"bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon" }, //$NON-NLS-1$
+					new String[] { "org.eclipse.e4.ui.bindings.service", "platform:/plugin/org.eclipse.platform", //$NON-NLS-1$ //$NON-NLS-2$
+							"bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon" }, //$NON-NLS-1$
+					new String[] { "org.eclipse.e4.ui.workbench.commands.model", //$NON-NLS-1$
+							"platform:/plugin/org.eclipse.platform", //$NON-NLS-1$
+							"bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon" }, //$NON-NLS-1$
+					new String[] { "org.eclipse.e4.ui.workbench.contexts.model", //$NON-NLS-1$
+							"platform:/plugin/org.eclipse.platform", //$NON-NLS-1$
+							"bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon" }, //$NON-NLS-1$
+					new String[] { "org.eclipse.e4.ui.workbench.bindings.model", //$NON-NLS-1$
+							"platform:/plugin/org.eclipse.platform", //$NON-NLS-1$
+							"bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon" }, //$NON-NLS-1$
+					new String[] { "Cleanup Addon", "platform:/plugin/org.eclipse.platform", //$NON-NLS-1$ //$NON-NLS-2$
+							"bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.cleanupaddon.CleanupAddon" }, //$NON-NLS-1$
+					new String[] { "DnD Addon", "platform:/plugin/org.eclipse.platform", //$NON-NLS-1$ //$NON-NLS-2$
+							"bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.dndaddon.DnDAddon" }, //$NON-NLS-1$
+					new String[] { "MinMax Addon", "platform:/plugin/org.eclipse.platform", //$NON-NLS-1$ //$NON-NLS-2$
+							"bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.MinMaxAddon" }, //$NON-NLS-1$
+					new String[] { "org.eclipse.ui.workbench.addon.0", "platform:/plugin/org.eclipse.platform", //$NON-NLS-1$ //$NON-NLS-2$
+							"bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon" }, //$NON-NLS-1$
+					new String[] { "SplitterAddon", null, //$NON-NLS-1$
+							"bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.splitteraddon.SplitterAddon" }, //$NON-NLS-1$
+					new String[] { "org.eclipse.ui.ide.addon.0", null, //$NON-NLS-1$
+							"bundleclass://org.eclipse.ui.ide/org.eclipse.ui.internal.ide.addons.SaveAllDirtyPartsAddon" }, //$NON-NLS-1$
+					new String[] { "org.eclipse.ui.ide.application.addon.0", //$NON-NLS-1$
+							"platform:/plugin/org.eclipse.ui.ide.application", //$NON-NLS-1$
+							"bundleclass://org.eclipse.ui.ide.application/org.eclipse.ui.internal.ide.application.addons.ModelCleanupAddon" }, }; //$NON-NLS-1$
+			for (String[] addonValue : addonValues) {
+				MAddon addon = MApplicationFactory.INSTANCE.createAddon();
+				addon.setElementId(addonValue[0]);
+				addon.setContributorURI(addonValue[1]);
+				addon.setContributionURI(addonValue[2]);
+				addons.add(addon);
+			}
+		}
+
+		IMemento mruMemento = memento.getChild(TAG_MRU_LIST);
+		if (mruMemento != null) {
+			for (IMemento fileMemento : mruMemento.getChildren(TAG_FILE)) {
+				// Ignored.
+				fileMemento.toString();
+			}
+		}
+
+		final IMemento[] windowMementos = memento.getChildren(TAG_WINDOW);
+		if (windowMementos == null || windowMementos.length == 0) {
+			// no <window> memento available - try memento instead
+			visitWindow(application, memento);
+		} else {
+			for (IMemento windowMemento : windowMementos) {
+				visitWindow(application, windowMemento);
+			}
+		}
+
+		return application;
+	}
+
+	private void visitWindow(final MApplication application, final IMemento memento) {
+		MTrimmedWindow window = MBasicFactory.INSTANCE.createTrimmedWindow();
+		window.setContributorURI("platform:/plugin/org.eclipse.platform"); //$NON-NLS-1$
+		application.getChildren().add(window);
+
+		Rectangle shellBounds = new Rectangle(getInteger(memento, TAG_X), getInteger(memento, TAG_Y),
+				getInteger(memento, TAG_WIDTH), getInteger(memento, TAG_HEIGHT));
+		if (!shellBounds.isEmpty()) {
+			window.setX(shellBounds.x);
+			window.setY(shellBounds.y);
+			window.setWidth(shellBounds.width);
+			window.setHeight(shellBounds.height);
+		}
+
+		if (getBoolean(memento, TAG_MAXIMIZED)) {
+			// Ignored.
+		}
+
+		if (getBoolean(memento, TAG_MINIMIZED)) {
+			// Ignored.
+		}
+
+		IMemento perspectiveBarMemento = memento.getChild(TAG_PERSPECTIVE_BAR);
+		visitPerspectiveBar(perspectiveBarMemento);
+
+		for (IMemento pageMemento : memento.getChildren(TAG_PAGE)) {
+			visitPage(window, pageMemento);
+		}
+
+	}
+
+	private void visitPage(final MWindow window, final IMemento memento) {
+		String focus = getString(memento, TAG_FOCUS);
+		if (focus != null && !focus.isEmpty()) {
+			String pageName = getString(memento, TAG_LABEL);
+			if (pageName != null) {
+				// Ignore.
+			}
+
+			String workingSetName = getString(memento, TAG_WORKING_SET);
+			if (workingSetName != null) {
+				// Ignore.
+			}
+
+			IMemento workingSetsMemento = memento.getChild(TAG_WORKING_SETS);
+			if (workingSetsMemento != null) {
+				for (IMemento workingSetMemento : workingSetsMemento.getChildren(TAG_WORKING_SET)) {
+					String id = getID(workingSetMemento);
+					if (id != null) {
+						// Ignore.
+					}
+				}
+			}
+
+			// org.eclipse.ui.internal.WorkbenchPage.ATT_AGGREGATE_WORKING_SET_ID
+			String aggregateWorkingSetId = getString(memento, "aggregateWorkingSetId"); //$NON-NLS-1$
+			if (aggregateWorkingSetId != null) {
+				// Ignore.
+			}
+
+			IMemento editorsMemento = memento.getChild(TAG_EDITORS);
+			if (editorsMemento != null) {
+				visitEditors(window, editorsMemento);
+			}
+
+			IMemento viewsMemento = memento.getChild(TAG_VIEWS);
+			if (viewsMemento != null) {
+				visitViews(window, viewsMemento);
+			}
+
+			IMemento perspectivesMemento = memento.getChild(TAG_PERSPECTIVES);
+			if (perspectivesMemento != null) {
+				visitPerspectives(window, perspectivesMemento);
+			}
+		}
+	}
+
+	private void visitPerspectives(final MWindow window, final IMemento memento) {
+		String activePartID = getString(memento, TAG_ACTIVE_PART);
+		String activePerspectiveID = getString(memento, TAG_ACTIVE_PERSPECTIVE);
+
+		if (activePartID != null) {
+			// Ignore.
+		}
+
+		MPartSashContainer partSashContainer = MBasicFactory.INSTANCE.createPartSashContainer();
+		partSashContainer.setHorizontal(true);
+		window.getChildren().add(partSashContainer);
+
+		MPerspectiveStack perspectiveStack = MAdvancedFactory.INSTANCE.createPerspectiveStack();
+		partSashContainer.getChildren().add(perspectiveStack);
+
+		List<MPerspective> perspectiveStackChildren = perspectiveStack.getChildren();
+		for (IMemento perspectiveMemento : memento.getChildren(TAG_PERSPECTIVE)) {
+			MPerspective perspective = MAdvancedFactory.INSTANCE.createPerspective();
+			perspectiveStackChildren.add(0, perspective);
+
+			int areaVisible = getInteger(perspectiveMemento, TAG_AREA_VISIBLE);
+
+			int trimAreaState = getInteger(perspectiveMemento, TAG_AREA_TRIM_STATE);
+			if (trimAreaState != 0) {
+				// Ignore.
+			}
+
+			Set<String> visibleViews = new LinkedHashSet<>();
+			for (IMemento viewMemento : perspectiveMemento.getChildren(TAG_VIEW)) {
+				String id = getID(viewMemento);
+				visibleViews.add(id);
+			}
+
+			Set<String> minimizedViews = getMinimizedViews(perspectiveMemento);
+
+			IMemento fastViewsMemento = perspectiveMemento.getChild(TAG_FAST_VIEWS);
+			if (fastViewsMemento != null) {
+				for (IMemento viewMemento : fastViewsMemento.getChildren(TAG_VIEW)) {
+					String id = getID(viewMemento);
+					if (id != null) {
+						// Ignore.
+					}
+				}
+			}
+
+			IMemento descriptorMemento = perspectiveMemento.getChild(TAG_DESCRIPTOR);
+			if (descriptorMemento != null) {
+				String id = getString(descriptorMemento, TAG_ID);
+				String label = getString(descriptorMemento, TAG_LABEL);
+
+				perspective.setElementId(id);
+				perspective.setLabel(label);
+
+				if (id.equals(activePerspectiveID)) {
+					perspectiveStack.setSelectedElement(perspective);
+				}
+			}
+
+			IMemento boundsMemento = perspectiveMemento.getChild(TAG_WINDOW);
+			if (boundsMemento != null) {
+				Rectangle bounds = new Rectangle(getInteger(boundsMemento, TAG_X), getInteger(boundsMemento, TAG_Y),
+						getInteger(boundsMemento, TAG_WIDTH), getInteger(boundsMemento, TAG_HEIGHT));
+				if (!bounds.isEmpty()) {
+					// Ignore.
+				}
+			}
+
+			IMemento layoutMemento = perspectiveMemento.getChild(TAG_LAYOUT);
+			if (layoutMemento != null) {
+				IMemento mainWindowMemento = layoutMemento.getChild(TAG_MAIN_WINDOW);
+				if (mainWindowMemento != null) {
+					MPartSashContainer perspectivePartSashContainer = MBasicFactory.INSTANCE.createPartSashContainer();
+					perspectivePartSashContainer.setHorizontal(true);
+					perspective.getChildren().add(perspectivePartSashContainer);
+
+					if (areaVisible != 0) {
+						// Ignore.
+					}
+
+					Map<String, Info> infos = new LinkedHashMap<>();
+					for (IMemento infoMemento : mainWindowMemento.getChildren(TAG_INFO)) {
+						Info info = new Info();
+						info.partID = getString(infoMemento, TAG_PART);
+						info.relativeID = getString(infoMemento, TAG_RELATIVE);
+						if (info.relativeID != null) {
+							info.relationship = getInteger(infoMemento, TAG_RELATIONSHIP);
+							info.ratio = getFloat(infoMemento, TAG_RATIO, 0.5f);
+							info.left = getInteger(infoMemento, TAG_RATIO_LEFT);
+							info.right = getInteger(infoMemento, TAG_RATIO_RIGHT);
+						}
+
+						String folder = getString(infoMemento, TAG_FOLDER);
+						if (folder != null) {
+							IMemento folderMemento = infoMemento.getChild(TAG_FOLDER);
+							if (folderMemento != null) {
+								MPartStack partStack = MBasicFactory.INSTANCE.createPartStack();
+								partStack.setElementId(info.partID);
+								perspectivePartSashContainer.getChildren().add(partStack);
+
+								info.part = partStack;
+
+								String activePageID = getString(folderMemento, TAG_ACTIVE_PAGE_ID);
+
+								List<MStackElement> partStackChildren = partStack.getChildren();
+								for (IMemento pageMemento : folderMemento.getChildren(TAG_PAGE)) {
+									String pagePartID = getString(pageMemento, TAG_CONTENT);
+									if (pagePartID != null) {
+										MPlaceholder placeHolder = MAdvancedFactory.INSTANCE.createPlaceholder();
+										partStackChildren.add(placeHolder);
+										placeHolder.setElementId(pagePartID);
+										// A placeholder is rendered if it's visible or minimized.
+										// In case of minimization it is minimized through its parent part stack
+										boolean visibleOrMinimized = visibleViews.contains(pagePartID)
+												|| minimizedViews.contains(pagePartID);
+										placeHolder.setToBeRendered(visibleOrMinimized);
+
+										for (MUIElement element : window.getSharedElements()) {
+											if (pagePartID.equals(element.getElementId())) {
+												placeHolder.setRef(element);
+												break;
+											}
+										}
+
+										if (placeHolder.getRef() == null) {
+											MPart part = MBasicFactory.INSTANCE.createPart();
+											part.setElementId(pagePartID);
+											part.setLabel("fake" + pagePartID); //$NON-NLS-1$
+											part.setContributionURI(
+													"bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView"); //$NON-NLS-1$
+											window.getSharedElements().add(part);
+											placeHolder.setRef(part);
+										}
+
+										if (pagePartID.equals(activePageID)) {
+											partStack.setSelectedElement(placeHolder);
+											if (placeHolder.getRef() == null) {
+												System.err.print(""); //$NON-NLS-1$
+
+											}
+										}
+									}
+								}
+
+								int state = getInteger(folderMemento, TAG_EXPANDED);
+								if (state != 0) {
+									// Ignore.
+								}
+
+								for (IMemento presentationMemento : folderMemento.getChildren(TAG_PRESENTATION)) {
+									String id = getString(presentationMemento, TAG_ID);
+									if (id != null) {
+										// Ignore.
+									}
+								}
+
+								Map<String, String> properties = new LinkedHashMap<>();
+								IMemento propertiesMemento = folderMemento.getChild(TAG_PROPERTIES);
+								if (propertiesMemento != null) {
+									for (IMemento propertyMemento : propertiesMemento.getChildren(TAG_PROPERTY)) {
+										properties.put(getID(propertiesMemento), propertyMemento.getTextData());
+									}
+								}
+							}
+						} else if (EDITOR_AREA_ID.equals(info.partID)) {
+							// Assume that the editor area is at the root level of the main window
+							MPlaceholder areaPlaceholder = MAdvancedFactory.INSTANCE.createPlaceholder();
+							perspectivePartSashContainer.getChildren().add(areaPlaceholder);
+							areaPlaceholder.setElementId(EDITOR_AREA_ID);
+							info.part = areaPlaceholder;
+
+							// Find editor area and reference it in the placeholder
+							window.getSharedElements().stream().filter(e -> EDITOR_AREA_ID.equals(e.getElementId()))
+									.findFirst().ifPresent(e -> areaPlaceholder.setRef(e));
+						} else {
+							continue;
+						}
+
+						infos.put(info.partID, info);
+					}
+
+					ModeledPageLayoutUtils modeledPageLayoutUtils = new org.eclipse.ui.internal.e4.compatibility.ModeledPageLayoutUtils(
+							WorkbenchUtil.getEModelService());
+					System.out.println("Perspective: " + perspective.getLabel()); //$NON-NLS-1$
+					for (Info info : infos.values()) {
+						System.out.println("  " + info); //$NON-NLS-1$
+
+						Info relativePart = infos.get(info.relativeID);
+						if (relativePart != null) {
+							modeledPageLayoutUtils.insert(info.part, relativePart.part,
+									modeledPageLayoutUtils.plRelToSwt(info.relationship), info.ratio);
+						}
+					}
+
+					for (Iterator<EObject> i = ((EObject) perspectivePartSashContainer).eAllContents(); i.hasNext();) {
+						EObject eObject = i.next();
+						if (eObject instanceof MPartStack) {
+							MPartStack partStack = (MPartStack) eObject;
+							boolean toBeRendered = false;
+							boolean minimized = false;
+							// If non of the stack's children are rendered, do not render the stack either
+							for (MStackElement stackElement : partStack.getChildren()) {
+								if (stackElement.isToBeRendered()) {
+									toBeRendered = true;
+								}
+								if (minimizedViews.contains(stackElement.getElementId())) {
+									minimized = true;
+									toBeRendered = true;
+									break;
+								}
+							}
+
+							// If the stack's children are minimized, minimize the part stack
+							if (minimized) {
+								// If the part stack is minimized, select the first child that is rendered.
+								// Otherwise no child is selected on restore.
+								for (MStackElement stackElement : partStack.getChildren()) {
+									if (stackElement.isToBeRendered()) {
+										partStack.setSelectedElement(stackElement);
+										break;
+									}
+								}
+								partStack.setToBeRendered(true);
+								partStack.setVisible(false);
+								partStack.getTags().add(IPresentationEngine.MINIMIZED);
+							} else {
+								partStack.setToBeRendered(toBeRendered);
+								partStack.setVisible(toBeRendered);
+							}
+						}
+					}
+
+					for (Iterator<EObject> i = ((EObject) perspectivePartSashContainer).eAllContents(); i.hasNext();) {
+						EObject eObject = i.next();
+						if (eObject instanceof MPartSashContainer) {
+							MPartSashContainer otherPartSashContainer = (MPartSashContainer) eObject;
+							boolean toBeRendered = false;
+							boolean visible = false;
+							for (MPartSashContainerElement sashContainerElement : otherPartSashContainer
+									.getChildren()) {
+								if (sashContainerElement.isVisible()) {
+									visible = true;
+								}
+								if (sashContainerElement.isToBeRendered()) {
+									toBeRendered = true;
+								}
+								if (visible && toBeRendered) {
+									break;
+								}
+							}
+
+							otherPartSashContainer.setToBeRendered(toBeRendered);
+							// A part sash container can only be visible if it is rendered.
+							// A container can be rendered but not visible if all child part stacks are
+							// minimized.
+							otherPartSashContainer.setVisible(visible && toBeRendered);
+						}
+					}
+
+					for (IMemento detachedWindowMemento : mainWindowMemento.getChildren(TAG_DETACHED_WINDOW)) {
+						if (detachedWindowMemento != null) {
+							// Ignore.
+						}
+					}
+
+					for (IMemento hiddenWindowMemento : mainWindowMemento.getChildren(TAG_HIDDEN_WINDOW)) {
+						if (hiddenWindowMemento != null) {
+							// Ignore.
+						}
+					}
+
+					String maximizedStackID = getString(mainWindowMemento, TAG_MAXIMIZED);
+					if (maximizedStackID != null) {
+						// Ignore.
+					}
+				}
+			}
+
+			for (IMemento viewMemento : perspectiveMemento.getChildren(TAG_VIEW)) {
+				String id = getString(viewMemento, TAG_ID);
+				if (id != null) {
+					// Ignore.
+				}
+			}
+
+			for (IMemento alwaysOnActionMemento : perspectiveMemento.getChildren(TAG_ALWAYS_ON_ACTION_SET)) {
+				String id = getString(alwaysOnActionMemento, TAG_ID);
+				if (id != null) {
+					// Ignore.
+				}
+			}
+
+			for (IMemento toggleViewActionMemento : perspectiveMemento.getChildren(TAG_SHOW_VIEW_ACTION)) {
+				String id = getString(toggleViewActionMemento, TAG_ID);
+				if (id != null) {
+					// Ignore.
+				}
+			}
+
+			for (IMemento showInTimeMemento : perspectiveMemento.getChildren(TAG_SHOW_IN_TIME)) {
+				String id = getString(showInTimeMemento, TAG_ID);
+				if (id != null) {
+					// Ignore.
+				}
+			}
+
+			for (IMemento newWizardActionMemento : perspectiveMemento.getChildren(TAG_NEW_WIZARD_ACTION)) {
+				String id = getString(newWizardActionMemento, TAG_ID);
+				if (id != null) {
+					// Ignore.
+				}
+			}
+
+			for (IMemento perspectiveActionMemento : perspectiveMemento.getChildren(TAG_PERSPECTIVE_ACTION)) {
+				String id = getString(perspectiveActionMemento, TAG_ID);
+				if (id != null) {
+					// Ignore.
+				}
+			}
+
+			for (IMemento hideMenuMemento : perspectiveMemento.getChildren(TAG_HIDE_MENU)) {
+				String id = getString(hideMenuMemento, TAG_ID);
+				if (id != null) {
+					// Ignore.
+				}
+			}
+
+			for (IMemento hideToolbarMemento : perspectiveMemento.getChildren(TAG_HIDE_TOOLBAR)) {
+				String id = getString(hideToolbarMemento, TAG_ID);
+				if (id != null) {
+					// Ignore.
+				}
+			}
+		}
+	}
+
+	/** Get minimized view ids from a perspective's fast view bars. */
+	private Set<String> getMinimizedViews(IMemento perspectiveMemento) {
+		IMemento fastViewBarsMemento = perspectiveMemento.getChild(TAG_FAST_VIEW_BARS);
+		if (fastViewBarsMemento != null) {
+			// 1. Get all fast views in fast view bars
+			// 2. get all views in fast views
+			// 3. collect view ids
+			Set<String> result = Arrays.stream(fastViewBarsMemento.getChildren(TAG_FAST_VIEW_BAR))
+					.map(fVB -> fVB.getChild(TAG_FAST_VIEWS)).filter(Objects::nonNull)
+					.flatMap(fV -> Arrays.stream(fV.getChildren(TAG_VIEW))).map(v -> v.getString(TAG_ID))
+					.filter(Objects::nonNull).collect(Collectors.toSet());
+			return result;
+		}
+		return new HashSet<String>();
+	}
+
+	private void visitViews(final MWindow window, final IMemento memento) {
+		List<MUIElement> sharedElements = window.getSharedElements();
+		for (IMemento viewMemento : memento.getChildren(TAG_VIEW)) {
+			String id = getString(viewMemento, TAG_ID);
+			IMemento viewStateMemento = viewMemento.getChild(TAG_VIEW_STATE);
+
+			// org.eclipse.ui.internal.ViewReference.ViewReference(ViewFactory,
+			// String, String, IMemento)
+			String name = getString(viewMemento, TAG_PART_NAME);
+
+			MPart part = MBasicFactory.INSTANCE.createPart();
+			part.setElementId(id);
+			part.setLabel(name);
+			part.setContributionURI(
+					"bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView"); //$NON-NLS-1$
+			sharedElements.add(part);
+			if (viewStateMemento instanceof XMLMemento) {
+				part.getPersistedState().put("memento", toXML(viewStateMemento)); //$NON-NLS-1$
+			}
+
+			Map<String, String> properties = part.getProperties();
+			IMemento propertiesMemento = viewMemento.getChild(TAG_PROPERTIES);
+			if (propertiesMemento != null) {
+				for (IMemento propertyMemento : propertiesMemento.getChildren(TAG_PROPERTY)) {
+					properties.put(getID(propertiesMemento), propertyMemento.getTextData());
+				}
+			}
+		}
+	}
+
+	private String toXML(final IMemento memento) {
+		try {
+			StringWriter writer = new StringWriter();
+			((XMLMemento) memento).save(writer);
+			writer.flush();
+			return writer.toString();
+		} catch (Throwable ex) {
+			return null;
+		}
+	}
+
+	private void visitEditors(final MWindow window, final IMemento memento) {
+		IMemento areaMemento = memento.getChild(TAG_AREA);
+		if (areaMemento != null) {
+			MArea area = MAdvancedFactory.INSTANCE.createArea();
+			area.setElementId(EDITOR_AREA_ID);
+			window.getSharedElements().add(area);
+
+			// Iterate over info elements in the editor area and create a part stack for
+			// each one.
+			// Afterwards, map editors to the part stacks and create a part for each editor
+			Map<String, Info> partStackInfos = new LinkedHashMap<>();
+			IMemento[] infoMementos = areaMemento.getChildren(TAG_INFO);
+			for (int infoIndex = 0; infoIndex < infoMementos.length; infoIndex++) {
+				IMemento infoMemento = infoMementos[infoIndex];
+
+				Info info = new Info();
+				info.partID = getString(infoMemento, TAG_PART);
+				info.relativeID = getString(infoMemento, TAG_RELATIVE);
+				if (info.relativeID != null) {
+					info.relationship = getInteger(infoMemento, TAG_RELATIONSHIP);
+					info.ratio = getFloat(infoMemento, TAG_RATIO, 0.5f);
+					info.left = getInteger(infoMemento, TAG_RATIO_LEFT);
+					info.right = getInteger(infoMemento, TAG_RATIO_RIGHT);
+				}
+				// Use original part attribute as key (instead of part stack id) because this
+				// will be needed later to find relative positioned part stacks.
+				partStackInfos.put(info.partID, info);
+
+				// Create part stack. First one has the primary id. Further ids are extended
+				// with the index.
+				String partStackId = PRIMARY_EDITOR_PART_STACK_ID;
+				if (infoIndex > 0) {
+					partStackId += "." + infoIndex; //$NON-NLS-1$
+				}
+				MPartStack partStack = MBasicFactory.INSTANCE.createPartStack();
+				partStack.setElementId(partStackId);
+				area.getChildren().add(partStack);
+				info.part = partStack;
+				if (infoIndex == 0) {
+					// The primary editor part stack has the following tags.
+					partStack.getTags().add(PRIMARY_EDITOR_PART_STACK_ID);
+					partStack.getTags().add("EditorStack"); //$NON-NLS-1$
+				}
+
+				IMemento folderMemento = infoMemento.getChild(TAG_FOLDER);
+				if (folderMemento != null) {
+					int state = getInteger(folderMemento, TAG_EXPANDED);
+					if (state != 0) {
+						// Ignore.
+					}
+
+					for (IMemento presentationMemento : folderMemento.getChildren(TAG_PRESENTATION)) {
+						String id = getString(presentationMemento, TAG_ID);
+						if (id != null) {
+							// Ignore.
+						}
+					}
+				}
+				// End of info sub elements
+
+				// Add all matching editors as parts to the part stack
+				// An e3 editor belongs to a stack if the editor's workbook attribute equals the
+				// stack info's "part" attribute
+				List<IMemento> relevantEditorMementos = Stream.of(memento.getChildren(TAG_EDITOR))
+						.filter(e -> info.partID.equals(e.getString(TAG_WORKBOOK))).collect(Collectors.toList());
+				for (IMemento editorMemento : relevantEditorMementos) {
+					// Create part using the compatibility editor to render legacy editor
+					MPart editorPart = MBasicFactory.INSTANCE.createPart();
+					partStack.getChildren().add(editorPart);
+					editorPart.setElementId("org.eclipse.e4.ui.compatibility.editor"); //$NON-NLS-1$
+					editorPart.setContributionURI(
+							"bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor"); //$NON-NLS-1$
+					editorPart.setCloseable(true);
+					// Add editor memento to the parts persisted state. The compatibility editor
+					// uses this to create the correct editor.
+					editorPart.getPersistedState().put("memento", editorMemento.toString()); //$NON-NLS-1$
+					// Add tags marking as an editor, remove on hide, and the editor id
+					editorPart.getTags().add("Editor"); //$NON-NLS-1$
+					editorPart.getTags().add(EPartService.REMOVE_ON_HIDE_TAG);
+					editorPart.getTags().add(editorMemento.getString(TAG_ID));
+
+					// Set name and tooltip (both are allowed to be null)
+					String partName = getString(editorMemento, TAG_PART_NAME);
+					if (partName != null) {
+						editorPart.setLabel(partName);
+					} else {
+						editorPart.setLabel(getString(editorMemento, TAG_TITLE));
+					}
+					editorPart.setTooltip(getString(editorMemento, TAG_TOOLTIP));
+
+					if (getBoolean(editorMemento, TAG_ACTIVE_PART)) {
+						editorPart.getTags().add(IPresentationEngine.ACTIVE);
+					}
+
+					// Focused in e3 means the editor is the selected element in its parent stack
+					if (getBoolean(editorMemento, TAG_FOCUS)) {
+						partStack.setSelectedElement(editorPart);
+					}
+				}
+			}
+
+			// (Re-)insert part stacks into editor area to layout them properly
+			ModeledPageLayoutUtils modeledPageLayoutUtils = new org.eclipse.ui.internal.e4.compatibility.ModeledPageLayoutUtils(
+					WorkbenchUtil.getEModelService());
+			for (Info info : partStackInfos.values()) {
+				Info relativePart = partStackInfos.get(info.relativeID);
+				if (relativePart != null) {
+					modeledPageLayoutUtils.insert(info.part, relativePart.part,
+							modeledPageLayoutUtils.plRelToSwt(info.relationship), info.ratio);
+				}
+			}
+		}
+	}
+
+	@SuppressWarnings("unused")
+	private void visitPerspectiveBar(final IMemento memento) {
+		// Ignore.
+	}
+
+	private void visited(final IMemento memento, final String tag) {
+		Object key = key(memento);
+		Set<String> set = visited.get(key);
+		if (set == null) {
+			set = new LinkedHashSet<>();
+			visited.put(key, set);
+		}
+
+		if (tag != null) {
+			set.add(tag);
+		}
+	}
+
+	private static Object key(final IMemento memento) {
+		try {
+			Field field = memento.getClass().getDeclaredField("element"); //$NON-NLS-1$
+			field.setAccessible(true);
+			return field.get(memento);
+		} catch (Exception ex) {
+			return null;
+		}
+	}
+
+	private float getFloat(final IMemento memento, final String tag, final float defaultValue) {
+		visited(memento, tag);
+		Float value = memento.getFloat(tag);
+		return value == null ? defaultValue : value.floatValue();
+	}
+
+	private int getInteger(final IMemento memento, final String tag) {
+		return getInteger(memento, tag, 0);
+	}
+
+	private int getInteger(final IMemento memento, final String tag, final int defaultValue) {
+		visited(memento, tag);
+		Integer value = memento.getInteger(tag);
+		return value == null ? defaultValue : value.intValue();
+	}
+
+	private boolean getBoolean(final IMemento memento, final String tag) {
+		visited(memento, tag);
+		Boolean value = memento.getBoolean(tag);
+		return value != null && value.booleanValue();
+	}
+
+	private String getString(final IMemento memento, final String tag) {
+		return getString(memento, tag, null);
+	}
+
+	private String getString(final IMemento memento, final String tag, final String defaultValue) {
+		visited(memento, tag);
+		String value = memento.getString(tag);
+		return value == null ? defaultValue : value;
+	}
+
+	private String getID(final IMemento memento) {
+		return getString(memento, TAG_ID);
+	}
+
+	private static class Info {
+
+		public String partID;
+
+		public String relativeID;
+
+		public int relationship;
+
+		public int left;
+
+		public int right;
+
+		public float ratio = 0.5f;
+
+		public MPartSashContainerElement part;
+
+		@Override
+		public String toString() {
+			StringBuilder result = new StringBuilder();
+			result.append("Info [partID=").append(partID); //$NON-NLS-1$
+			if (relativeID != null) {
+				result.append(", relativeID=").append(relativeID); //$NON-NLS-1$
+				result.append(", relationship=").append(relationship); //$NON-NLS-1$
+				result.append(", left=").append(left); //$NON-NLS-1$
+				result.append(", right=").append(right); //$NON-NLS-1$
+				result.append(", ratio=").append(ratio); //$NON-NLS-1$
+			}
+			result.append(']');
+
+			return result.toString();
+		}
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/WorkbenchUtil.java b/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/WorkbenchUtil.java
new file mode 100644
index 0000000000..b57bfbd392
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/WorkbenchUtil.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2022 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.internal.compatibiliy.migration;
+
+import java.util.List;
+
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.ui.internal.Workbench;
+
+@SuppressWarnings("restriction")
+public final class WorkbenchUtil {
+	
+	private WorkbenchUtil() {}
+
+	/**
+	 * Retrieve the IEclipseContext from the Workbench.
+	 *
+	 * @return The IEclipseContext
+	 */
+	private static IEclipseContext getEclipseContext() {
+		return Workbench.getInstance().getContext();
+	}
+
+	/**
+	 * Retrieve the EModelService from the EclipseContext.
+	 *
+	 * @return The EModelService
+	 */
+	public static EModelService getEModelService() {
+		return getEclipseContext().get(EModelService.class);
+	}
+	
+	/**
+	 * Retrieve the first MWindow from the MApplication from the EclipseContext.
+	 *
+	 * @return The MWindow
+	 */
+	public static MWindow getCurrentMainWindow() {
+		MApplication mApplication = getEclipseContext().get(MApplication.class);
+		List<MWindow> children = mApplication.getChildren();
+		MWindow mWindow = children.get(0);
+		return mWindow;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.persistence/.classpath b/bundles/org.eclipse.e4.tools.persistence/.classpath
new file mode 100644
index 0000000000..e801ebfb46
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/.classpath
@@ -0,0 +1,7 @@
+<?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/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.e4.tools.persistence/.project b/bundles/org.eclipse.e4.tools.persistence/.project
new file mode 100644
index 0000000000..68f366696b
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/.project
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.persistence</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..3c416caddb
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,431 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true
+org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..57540496ab
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,66 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
+formatter_settings_version=14
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=;
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+sp_cleanup.add_default_serial_version_id=false
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=false
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=false
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=false
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=false
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=false
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=false
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=false
+sp_cleanup.remove_unused_private_types=false
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=false
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000000..14da48bc6a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,104 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_FIELD=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_ANNOTATION=Ignore
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Warning
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Warning
+automatically_removed_unused_problem_filters=false
+changed_execution_env=Error
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+incompatible_api_component_version_report_major_without_breaking_change=Error
+incompatible_api_component_version_report_minor_without_api_change=Error
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..2ce50474bb
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=1
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=1
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..aba3df8980
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.e4.tools.persistence;singleton:=true
+Automatic-Module-Name: org.eclipse.e4.tools.persistence
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
+ org.eclipse.e4.ui.model.workbench;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
+ org.eclipse.e4.core.contexts;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.e4.ui.workbench;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.e4.ui.workbench.addons.swt;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ui;bundle-version="[3.110.0,4.0.0)"
+Export-Package: org.eclipse.e4.tools.internal.persistence,
+ org.eclipse.e4.tools.internal.persistence.impl;x-internal:=true,
+ org.eclipse.e4.tools.internal.persistence.util;x-internal:=true,
+ org.eclipse.e4.tools.persistence
diff --git a/bundles/org.eclipse.e4.tools.persistence/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.e4.tools.persistence/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000000..262cbc4ab2
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,16 @@
+###############################################################################
+# Copyright (c) 2021 EclipseSource GmbH and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     EclipseSource GmbH - initial API and implementation
+###############################################################################
+#Properties file for org.eclipse.ui.persistence
+Bundle-Name = Persistence Model
+Bundle-Vendor = Eclipse.org
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.persistence/about.html b/bundles/org.eclipse.e4.tools.persistence/about.html
new file mode 100644
index 0000000000..164f781a8f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/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/bundles/org.eclipse.e4.tools.persistence/build.properties b/bundles/org.eclipse.e4.tools.persistence/build.properties
new file mode 100644
index 0000000000..354f9ebe27
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/build.properties
@@ -0,0 +1,22 @@
+###############################################################################
+# Copyright (c) 2021 EclipseSource GmbH and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     EclipseSource GmbH - initial API and implementation
+###############################################################################
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               OSGI-INF/
+jars.compile.order = .
+source.. = src/
+output.. = bin/
+               
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.persistence/model/persistence.ecore b/bundles/org.eclipse.e4.tools.persistence/model/persistence.ecore
new file mode 100644
index 0000000000..6b9fa4114d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/model/persistence.ecore
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="persistence" nsURI="http://www.eclipse.org/e4/tools/persistence"
+    nsPrefix="org.eclipse.e4.tools.persistence">
+  <eClassifiers xsi:type="ecore:EClass" name="WorkbenchState">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="perspective" eType="ecore:EClass ../../org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//ui/advanced/Perspective"
+        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="viewSettings" upperBound="-1"
+        eType="#//PartMemento" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="editorArea" eType="ecore:EClass ../../org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//ui/advanced/Area"
+        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="trimBars" upperBound="-1"
+        eType="ecore:EClass ../../org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//ui/basic/TrimBar"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="PartMemento">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="partId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="memento" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel b/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel
new file mode 100644
index 0000000000..57e176cd26
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2022 EclipseSource GmbH and others.&#xA; &#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License 2.0&#xA;which accompanies this distribution, and is available at&#xA;https://www.eclipse.org/legal/epl-2.0/&#xA; &#xA;SPDX-License-Identifier: EPL-2.0&#xA;&#xA;Contributors:   &#xA;    EclipseSource GmbH - initial API and implementation"
+    modelDirectory="/org.eclipse.e4.tools.persistence/src" editDirectory="" editorDirectory=""
+    modelPluginID="org.eclipse.e4.tools.persistence" modelName="Persistence" editPluginClass="org.eclipse.e4.tools.persistence.provider.PersistenceEditPlugin"
+    editorPluginClass="org.eclipse.e4.tools.persistence.presentation.PersistenceEditorPlugin"
+    updateClasspath="false" nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    codeFormatting="true" testsDirectory="" testSuiteClass="org.eclipse.e4.tools.internal.persistence.tests.PersistenceAllTests"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" copyrightFields="false"
+    editPluginID="org.eclipse.e4.tools.persistence.edit" editorPluginID="org.eclipse.e4.tools.persistence.edit"
+    usedGenPackages="../../org.eclipse.e4.ui.model.workbench/model/UIElements.genmodel#//application"
+    interfaceNamePattern="I{0}" classNamePattern="{0}" operationReflection="true"
+    importOrganizing="true" cleanup="true">
+  <foreignModel>persistence.ecore</foreignModel>
+  <genPackages prefix="Persistence" basePackage="org.eclipse.e4.tools.internal" disposableProviderFactory="true"
+      ecorePackage="persistence.ecore#/">
+    <genClasses documentation="A container for the relevant parts of a workbench state."
+        ecoreClass="persistence.ecore#//WorkbenchState">
+      <genFeatures documentation="The active perspective of the workbench." property="None"
+          children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//WorkbenchState/perspective"/>
+      <genFeatures documentation="Store view settings with part id and its stringified memento."
+          property="None" children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//WorkbenchState/viewSettings"/>
+      <genFeatures documentation="The editor area of the workbench." property="None"
+          children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//WorkbenchState/editorArea"/>
+      <genFeatures documentation="All trimbars of the workbench." property="None"
+          children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//WorkbenchState/trimBars"/>
+    </genClasses>
+    <genClasses documentation="Container to easily store and restore part settings. To do so the id of the part as well as the stringified memento is stored."
+        ecoreClass="persistence.ecore#//PartMemento">
+      <genFeatures documentation="The id of the part the memento is stored for." createChild="false"
+          ecoreFeature="ecore:EAttribute persistence.ecore#//PartMemento/partId"/>
+      <genFeatures documentation="The stringified memento. This way it can be directly set into the persisted state and thus used by the workbench to pass into the ViewPart#init method."
+          createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//PartMemento/memento"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.persistence/plugin.xml b/bundles/org.eclipse.e4.tools.persistence/plugin.xml
new file mode 100644
index 0000000000..77e25b1744
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/plugin.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+-->
+
+<plugin>
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated persistence -->
+      <package
+            uri="http://www.eclipse.org/e4/tools/persistence"
+            class="org.eclipse.e4.tools.internal.persistence.IPersistencePackage"
+            genModel="model/persistence.genmodel"/>
+   </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.e4.tools.persistence/pom.xml b/bundles/org.eclipse.e4.tools.persistence/pom.xml
new file mode 100644
index 0000000000..7e2390c916
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse</groupId>
+		<artifactId>eclipse.platform.ui.tools</artifactId>
+		<version>4.27.0-SNAPSHOT</version>
+		<relativePath>../../</relativePath>
+	</parent>
+	<groupId>eclipse.platform.ui.tool</groupId>
+	<artifactId>org.eclipse.e4.tools.persistence</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+
+	<properties>
+		<skipAPIAnalysis>true</skipAPIAnalysis> <!-- Not in baseline -->
+	</properties>
+
+</project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPartMemento.java b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPartMemento.java
new file mode 100644
index 0000000000..caa517f7c0
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPartMemento.java
@@ -0,0 +1,90 @@
+/**
+ * Copyright (c) 2021 EclipseSource GmbH and others.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ * Contributors:   
+ *     EclipseSource GmbH - initial API and implementation
+ */
+package org.eclipse.e4.tools.internal.persistence;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Part Memento</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Container to easily store and restore part settings. To do so the id of the part as well as the stringified memento is stored.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.e4.tools.internal.persistence.IPartMemento#getPartId <em>Part Id</em>}</li>
+ *   <li>{@link org.eclipse.e4.tools.internal.persistence.IPartMemento#getMemento <em>Memento</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.e4.tools.internal.persistence.IPersistencePackage#getPartMemento()
+ * @model
+ * @generated
+ */
+public interface IPartMemento extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Part Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The id of the part the memento is stored for.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Part Id</em>' attribute.
+	 * @see #setPartId(String)
+	 * @see org.eclipse.e4.tools.internal.persistence.IPersistencePackage#getPartMemento_PartId()
+	 * @model
+	 * @generated
+	 */
+	String getPartId();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.e4.tools.internal.persistence.IPartMemento#getPartId <em>Part Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Part Id</em>' attribute.
+	 * @see #getPartId()
+	 * @generated
+	 */
+	void setPartId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Memento</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The stringified memento. This way it can be directly set into the persisted state and thus used by the workbench to pass into the ViewPart#init method.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Memento</em>' attribute.
+	 * @see #setMemento(String)
+	 * @see org.eclipse.e4.tools.internal.persistence.IPersistencePackage#getPartMemento_Memento()
+	 * @model
+	 * @generated
+	 */
+	String getMemento();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.e4.tools.internal.persistence.IPartMemento#getMemento <em>Memento</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Memento</em>' attribute.
+	 * @see #getMemento()
+	 * @generated
+	 */
+	void setMemento(String value);
+
+} // IPartMemento
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistenceFactory.java b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistenceFactory.java
new file mode 100644
index 0000000000..09ff312efa
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistenceFactory.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2021 EclipseSource GmbH and others.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ * Contributors:   
+ *     EclipseSource GmbH - initial API and implementation
+ */
+package org.eclipse.e4.tools.internal.persistence;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.e4.tools.internal.persistence.IPersistencePackage
+ * @generated
+ */
+public interface IPersistenceFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	IPersistenceFactory eINSTANCE = org.eclipse.e4.tools.internal.persistence.impl.PersistenceFactory.init();
+
+	/**
+	 * Returns a new object of class '<em>Workbench State</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Workbench State</em>'.
+	 * @generated
+	 */
+	IWorkbenchState createWorkbenchState();
+
+	/**
+	 * Returns a new object of class '<em>Part Memento</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Part Memento</em>'.
+	 * @generated
+	 */
+	IPartMemento createPartMemento();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	IPersistencePackage getPersistencePackage();
+
+} // IPersistenceFactory
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistencePackage.java b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistencePackage.java
new file mode 100644
index 0000000000..a32b0e9499
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistencePackage.java
@@ -0,0 +1,359 @@
+/**
+ * Copyright (c) 2021 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ */
+package org.eclipse.e4.tools.internal.persistence;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.e4.tools.internal.persistence.IPersistenceFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface IPersistencePackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "persistence"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/e4/tools/persistence"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "org.eclipse.e4.tools.persistence"; //$NON-NLS-1$
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	IPersistencePackage eINSTANCE = org.eclipse.e4.tools.internal.persistence.impl.PersistencePackage.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.e4.tools.internal.persistence.impl.WorkbenchState <em>Workbench State</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.e4.tools.internal.persistence.impl.WorkbenchState
+	 * @see org.eclipse.e4.tools.internal.persistence.impl.PersistencePackage#getWorkbenchState()
+	 * @generated
+	 */
+	int WORKBENCH_STATE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Perspective</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int WORKBENCH_STATE__PERSPECTIVE = 0;
+
+	/**
+	 * The feature id for the '<em><b>View Settings</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int WORKBENCH_STATE__VIEW_SETTINGS = 1;
+
+	/**
+	 * The feature id for the '<em><b>Editor Area</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int WORKBENCH_STATE__EDITOR_AREA = 2;
+
+	/**
+	 * The feature id for the '<em><b>Trim Bars</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int WORKBENCH_STATE__TRIM_BARS = 3;
+
+	/**
+	 * The number of structural features of the '<em>Workbench State</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int WORKBENCH_STATE_FEATURE_COUNT = 4;
+
+	/**
+	 * The number of operations of the '<em>Workbench State</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int WORKBENCH_STATE_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.e4.tools.internal.persistence.impl.PartMemento <em>Part Memento</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.e4.tools.internal.persistence.impl.PartMemento
+	 * @see org.eclipse.e4.tools.internal.persistence.impl.PersistencePackage#getPartMemento()
+	 * @generated
+	 */
+	int PART_MEMENTO = 1;
+
+	/**
+	 * The feature id for the '<em><b>Part Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PART_MEMENTO__PART_ID = 0;
+
+	/**
+	 * The feature id for the '<em><b>Memento</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PART_MEMENTO__MEMENTO = 1;
+
+	/**
+	 * The number of structural features of the '<em>Part Memento</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PART_MEMENTO_FEATURE_COUNT = 2;
+
+	/**
+	 * The number of operations of the '<em>Part Memento</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PART_MEMENTO_OPERATION_COUNT = 0;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.e4.tools.internal.persistence.IWorkbenchState <em>Workbench State</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Workbench State</em>'.
+	 * @see org.eclipse.e4.tools.internal.persistence.IWorkbenchState
+	 * @generated
+	 */
+	EClass getWorkbenchState();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.e4.tools.internal.persistence.IWorkbenchState#getPerspective <em>Perspective</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Perspective</em>'.
+	 * @see org.eclipse.e4.tools.internal.persistence.IWorkbenchState#getPerspective()
+	 * @see #getWorkbenchState()
+	 * @generated
+	 */
+	EReference getWorkbenchState_Perspective();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.e4.tools.internal.persistence.IWorkbenchState#getViewSettings <em>View Settings</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>View Settings</em>'.
+	 * @see org.eclipse.e4.tools.internal.persistence.IWorkbenchState#getViewSettings()
+	 * @see #getWorkbenchState()
+	 * @generated
+	 */
+	EReference getWorkbenchState_ViewSettings();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.e4.tools.internal.persistence.IWorkbenchState#getEditorArea <em>Editor Area</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Editor Area</em>'.
+	 * @see org.eclipse.e4.tools.internal.persistence.IWorkbenchState#getEditorArea()
+	 * @see #getWorkbenchState()
+	 * @generated
+	 */
+	EReference getWorkbenchState_EditorArea();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.e4.tools.internal.persistence.IWorkbenchState#getTrimBars <em>Trim Bars</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Trim Bars</em>'.
+	 * @see org.eclipse.e4.tools.internal.persistence.IWorkbenchState#getTrimBars()
+	 * @see #getWorkbenchState()
+	 * @generated
+	 */
+	EReference getWorkbenchState_TrimBars();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.e4.tools.internal.persistence.IPartMemento <em>Part Memento</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Part Memento</em>'.
+	 * @see org.eclipse.e4.tools.internal.persistence.IPartMemento
+	 * @generated
+	 */
+	EClass getPartMemento();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.e4.tools.internal.persistence.IPartMemento#getPartId <em>Part Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Part Id</em>'.
+	 * @see org.eclipse.e4.tools.internal.persistence.IPartMemento#getPartId()
+	 * @see #getPartMemento()
+	 * @generated
+	 */
+	EAttribute getPartMemento_PartId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.e4.tools.internal.persistence.IPartMemento#getMemento <em>Memento</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Memento</em>'.
+	 * @see org.eclipse.e4.tools.internal.persistence.IPartMemento#getMemento()
+	 * @see #getPartMemento()
+	 * @generated
+	 */
+	EAttribute getPartMemento_Memento();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	IPersistenceFactory getPersistenceFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.e4.tools.internal.persistence.impl.WorkbenchState <em>Workbench State</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.e4.tools.internal.persistence.impl.WorkbenchState
+		 * @see org.eclipse.e4.tools.internal.persistence.impl.PersistencePackage#getWorkbenchState()
+		 * @generated
+		 */
+		EClass WORKBENCH_STATE = eINSTANCE.getWorkbenchState();
+
+		/**
+		 * The meta object literal for the '<em><b>Perspective</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference WORKBENCH_STATE__PERSPECTIVE = eINSTANCE.getWorkbenchState_Perspective();
+
+		/**
+		 * The meta object literal for the '<em><b>View Settings</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference WORKBENCH_STATE__VIEW_SETTINGS = eINSTANCE.getWorkbenchState_ViewSettings();
+
+		/**
+		 * The meta object literal for the '<em><b>Editor Area</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference WORKBENCH_STATE__EDITOR_AREA = eINSTANCE.getWorkbenchState_EditorArea();
+
+		/**
+		 * The meta object literal for the '<em><b>Trim Bars</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference WORKBENCH_STATE__TRIM_BARS = eINSTANCE.getWorkbenchState_TrimBars();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.e4.tools.internal.persistence.impl.PartMemento <em>Part Memento</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.e4.tools.internal.persistence.impl.PartMemento
+		 * @see org.eclipse.e4.tools.internal.persistence.impl.PersistencePackage#getPartMemento()
+		 * @generated
+		 */
+		EClass PART_MEMENTO = eINSTANCE.getPartMemento();
+
+		/**
+		 * The meta object literal for the '<em><b>Part Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PART_MEMENTO__PART_ID = eINSTANCE.getPartMemento_PartId();
+
+		/**
+		 * The meta object literal for the '<em><b>Memento</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PART_MEMENTO__MEMENTO = eINSTANCE.getPartMemento_Memento();
+
+	}
+
+} // IPersistencePackage
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IWorkbenchState.java b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IWorkbenchState.java
new file mode 100644
index 0000000000..ef8c5e208f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IWorkbenchState.java
@@ -0,0 +1,129 @@
+/**
+ * Copyright (c) 2021 EclipseSource GmbH and others.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ * Contributors:   
+ *     EclipseSource GmbH - initial API and implementation
+ */
+package org.eclipse.e4.tools.internal.persistence;
+
+import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Workbench State</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * A container for the relevant parts of a workbench state.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.e4.tools.internal.persistence.IWorkbenchState#getPerspective <em>Perspective</em>}</li>
+ *   <li>{@link org.eclipse.e4.tools.internal.persistence.IWorkbenchState#getViewSettings <em>View Settings</em>}</li>
+ *   <li>{@link org.eclipse.e4.tools.internal.persistence.IWorkbenchState#getEditorArea <em>Editor Area</em>}</li>
+ *   <li>{@link org.eclipse.e4.tools.internal.persistence.IWorkbenchState#getTrimBars <em>Trim Bars</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.e4.tools.internal.persistence.IPersistencePackage#getWorkbenchState()
+ * @model
+ * @generated
+ */
+public interface IWorkbenchState extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Perspective</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The active perspective of the workbench.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Perspective</em>' containment reference.
+	 * @see #setPerspective(MPerspective)
+	 * @see org.eclipse.e4.tools.internal.persistence.IPersistencePackage#getWorkbenchState_Perspective()
+	 * @model containment="true"
+	 * @generated
+	 */
+	MPerspective getPerspective();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.e4.tools.internal.persistence.IWorkbenchState#getPerspective <em>Perspective</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Perspective</em>' containment reference.
+	 * @see #getPerspective()
+	 * @generated
+	 */
+	void setPerspective(MPerspective value);
+
+	/**
+	 * Returns the value of the '<em><b>View Settings</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.e4.tools.internal.persistence.IPartMemento}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Store view settings with part id and its stringified memento.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>View Settings</em>' containment reference list.
+	 * @see org.eclipse.e4.tools.internal.persistence.IPersistencePackage#getWorkbenchState_ViewSettings()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<IPartMemento> getViewSettings();
+
+	/**
+	 * Returns the value of the '<em><b>Editor Area</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The editor area of the workbench.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Editor Area</em>' containment reference.
+	 * @see #setEditorArea(MArea)
+	 * @see org.eclipse.e4.tools.internal.persistence.IPersistencePackage#getWorkbenchState_EditorArea()
+	 * @model containment="true"
+	 * @generated
+	 */
+	MArea getEditorArea();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.e4.tools.internal.persistence.IWorkbenchState#getEditorArea <em>Editor Area</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Editor Area</em>' containment reference.
+	 * @see #getEditorArea()
+	 * @generated
+	 */
+	void setEditorArea(MArea value);
+
+	/**
+	 * Returns the value of the '<em><b>Trim Bars</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.e4.ui.model.application.ui.basic.MTrimBar}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * All trimbars of the workbench.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Trim Bars</em>' containment reference list.
+	 * @see org.eclipse.e4.tools.internal.persistence.IPersistencePackage#getWorkbenchState_TrimBars()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<MTrimBar> getTrimBars();
+
+} // IWorkbenchState
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PartMemento.java b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PartMemento.java
new file mode 100644
index 0000000000..2b5699f69c
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PartMemento.java
@@ -0,0 +1,232 @@
+/**
+ * Copyright (c) 2021 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ */
+package org.eclipse.e4.tools.internal.persistence.impl;
+
+import org.eclipse.e4.tools.internal.persistence.IPartMemento;
+import org.eclipse.e4.tools.internal.persistence.IPersistencePackage;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Part Memento</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.e4.tools.internal.persistence.impl.PartMemento#getPartId <em>Part Id</em>}</li>
+ *   <li>{@link org.eclipse.e4.tools.internal.persistence.impl.PartMemento#getMemento <em>Memento</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class PartMemento extends MinimalEObjectImpl.Container implements IPartMemento {
+	/**
+	 * The default value of the '{@link #getPartId() <em>Part Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPartId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String PART_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getPartId() <em>Part Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPartId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String partId = PART_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMemento() <em>Memento</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMemento()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String MEMENTO_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getMemento() <em>Memento</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMemento()
+	 * @generated
+	 * @ordered
+	 */
+	protected String memento = MEMENTO_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PartMemento() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return IPersistencePackage.Literals.PART_MEMENTO;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getPartId() {
+		return partId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setPartId(String newPartId) {
+		String oldPartId = partId;
+		partId = newPartId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, IPersistencePackage.PART_MEMENTO__PART_ID, oldPartId,
+					partId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getMemento() {
+		return memento;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setMemento(String newMemento) {
+		String oldMemento = memento;
+		memento = newMemento;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, IPersistencePackage.PART_MEMENTO__MEMENTO, oldMemento,
+					memento));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case IPersistencePackage.PART_MEMENTO__PART_ID:
+			return getPartId();
+		case IPersistencePackage.PART_MEMENTO__MEMENTO:
+			return getMemento();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case IPersistencePackage.PART_MEMENTO__PART_ID:
+			setPartId((String) newValue);
+			return;
+		case IPersistencePackage.PART_MEMENTO__MEMENTO:
+			setMemento((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case IPersistencePackage.PART_MEMENTO__PART_ID:
+			setPartId(PART_ID_EDEFAULT);
+			return;
+		case IPersistencePackage.PART_MEMENTO__MEMENTO:
+			setMemento(MEMENTO_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case IPersistencePackage.PART_MEMENTO__PART_ID:
+			return PART_ID_EDEFAULT == null ? partId != null : !PART_ID_EDEFAULT.equals(partId);
+		case IPersistencePackage.PART_MEMENTO__MEMENTO:
+			return MEMENTO_EDEFAULT == null ? memento != null : !MEMENTO_EDEFAULT.equals(memento);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy())
+			return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (partId: "); //$NON-NLS-1$
+		result.append(partId);
+		result.append(", memento: "); //$NON-NLS-1$
+		result.append(memento);
+		result.append(')');
+		return result.toString();
+	}
+
+} // PartMemento
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistenceFactory.java b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistenceFactory.java
new file mode 100644
index 0000000000..c689434db1
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistenceFactory.java
@@ -0,0 +1,122 @@
+/**
+ * Copyright (c) 2021 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ */
+package org.eclipse.e4.tools.internal.persistence.impl;
+
+import org.eclipse.e4.tools.internal.persistence.IPartMemento;
+import org.eclipse.e4.tools.internal.persistence.IPersistenceFactory;
+import org.eclipse.e4.tools.internal.persistence.IPersistencePackage;
+import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class PersistenceFactory extends EFactoryImpl implements IPersistenceFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static IPersistenceFactory init() {
+		try {
+			IPersistenceFactory thePersistenceFactory = (IPersistenceFactory) EPackage.Registry.INSTANCE
+					.getEFactory(IPersistencePackage.eNS_URI);
+			if (thePersistenceFactory != null) {
+				return thePersistenceFactory;
+			}
+		} catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new PersistenceFactory();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PersistenceFactory() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+		case IPersistencePackage.WORKBENCH_STATE:
+			return createWorkbenchState();
+		case IPersistencePackage.PART_MEMENTO:
+			return createPartMemento();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public IWorkbenchState createWorkbenchState() {
+		WorkbenchState workbenchState = new WorkbenchState();
+		return workbenchState;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public IPartMemento createPartMemento() {
+		PartMemento partMemento = new PartMemento();
+		return partMemento;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public IPersistencePackage getPersistencePackage() {
+		return (IPersistencePackage) getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static IPersistencePackage getPackage() {
+		return IPersistencePackage.eINSTANCE;
+	}
+
+} // PersistenceFactory
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistencePackage.java b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistencePackage.java
new file mode 100644
index 0000000000..41cbb25b3d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistencePackage.java
@@ -0,0 +1,301 @@
+/**
+ * Copyright (c) 2021 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ */
+package org.eclipse.e4.tools.internal.persistence.impl;
+
+import org.eclipse.e4.tools.internal.persistence.IPartMemento;
+import org.eclipse.e4.tools.internal.persistence.IPersistenceFactory;
+import org.eclipse.e4.tools.internal.persistence.IPersistencePackage;
+import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class PersistencePackage extends EPackageImpl implements IPersistencePackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass workbenchStateEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass partMementoEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.e4.tools.internal.persistence.IPersistencePackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private PersistencePackage() {
+		super(eNS_URI, IPersistenceFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 *
+	 * <p>This method is used to initialize {@link IPersistencePackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static IPersistencePackage init() {
+		if (isInited)
+			return (IPersistencePackage) EPackage.Registry.INSTANCE.getEPackage(IPersistencePackage.eNS_URI);
+
+		// Obtain or create and register package
+		Object registeredPersistencePackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		PersistencePackage thePersistencePackage = registeredPersistencePackage instanceof PersistencePackage
+				? (PersistencePackage) registeredPersistencePackage
+				: new PersistencePackage();
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		ApplicationPackageImpl.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		thePersistencePackage.createPackageContents();
+
+		// Initialize created meta-data
+		thePersistencePackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		thePersistencePackage.freeze();
+
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(IPersistencePackage.eNS_URI, thePersistencePackage);
+		return thePersistencePackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getWorkbenchState() {
+		return workbenchStateEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getWorkbenchState_Perspective() {
+		return (EReference) workbenchStateEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getWorkbenchState_ViewSettings() {
+		return (EReference) workbenchStateEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getWorkbenchState_EditorArea() {
+		return (EReference) workbenchStateEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getWorkbenchState_TrimBars() {
+		return (EReference) workbenchStateEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getPartMemento() {
+		return partMementoEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPartMemento_PartId() {
+		return (EAttribute) partMementoEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPartMemento_Memento() {
+		return (EAttribute) partMementoEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public IPersistenceFactory getPersistenceFactory() {
+		return (IPersistenceFactory) getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated)
+			return;
+		isCreated = true;
+
+		// Create classes and their features
+		workbenchStateEClass = createEClass(WORKBENCH_STATE);
+		createEReference(workbenchStateEClass, WORKBENCH_STATE__PERSPECTIVE);
+		createEReference(workbenchStateEClass, WORKBENCH_STATE__VIEW_SETTINGS);
+		createEReference(workbenchStateEClass, WORKBENCH_STATE__EDITOR_AREA);
+		createEReference(workbenchStateEClass, WORKBENCH_STATE__TRIM_BARS);
+
+		partMementoEClass = createEClass(PART_MEMENTO);
+		createEAttribute(partMementoEClass, PART_MEMENTO__PART_ID);
+		createEAttribute(partMementoEClass, PART_MEMENTO__MEMENTO);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized)
+			return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		AdvancedPackageImpl theAdvancedPackage = (AdvancedPackageImpl) EPackage.Registry.INSTANCE
+				.getEPackage(AdvancedPackageImpl.eNS_URI);
+		BasicPackageImpl theBasicPackage = (BasicPackageImpl) EPackage.Registry.INSTANCE
+				.getEPackage(BasicPackageImpl.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(workbenchStateEClass, IWorkbenchState.class, "WorkbenchState", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getWorkbenchState_Perspective(), theAdvancedPackage.getPerspective(), null, "perspective", null, //$NON-NLS-1$
+				0, 1, IWorkbenchState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getWorkbenchState_ViewSettings(), this.getPartMemento(), null, "viewSettings", null, 0, -1, //$NON-NLS-1$
+				IWorkbenchState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getWorkbenchState_EditorArea(), theAdvancedPackage.getArea(), null, "editorArea", null, 0, 1, //$NON-NLS-1$
+				IWorkbenchState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getWorkbenchState_TrimBars(), theBasicPackage.getTrimBar(), null, "trimBars", null, 0, -1, //$NON-NLS-1$
+				IWorkbenchState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(partMementoEClass, IPartMemento.class, "PartMemento", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getPartMemento_PartId(), ecorePackage.getEString(), "partId", null, 0, 1, IPartMemento.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPartMemento_Memento(), ecorePackage.getEString(), "memento", null, 0, 1, IPartMemento.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} // PersistencePackage
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/WorkbenchState.java b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/WorkbenchState.java
new file mode 100644
index 0000000000..ec51601ad9
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/WorkbenchState.java
@@ -0,0 +1,352 @@
+/**
+ * Copyright (c) 2021 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ */
+package org.eclipse.e4.tools.internal.persistence.impl;
+
+import java.util.Collection;
+import org.eclipse.e4.tools.internal.persistence.IPartMemento;
+import org.eclipse.e4.tools.internal.persistence.IPersistencePackage;
+import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
+import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Workbench State</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.e4.tools.internal.persistence.impl.WorkbenchState#getPerspective <em>Perspective</em>}</li>
+ *   <li>{@link org.eclipse.e4.tools.internal.persistence.impl.WorkbenchState#getViewSettings <em>View Settings</em>}</li>
+ *   <li>{@link org.eclipse.e4.tools.internal.persistence.impl.WorkbenchState#getEditorArea <em>Editor Area</em>}</li>
+ *   <li>{@link org.eclipse.e4.tools.internal.persistence.impl.WorkbenchState#getTrimBars <em>Trim Bars</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class WorkbenchState extends MinimalEObjectImpl.Container implements IWorkbenchState {
+	/**
+	 * The cached value of the '{@link #getPerspective() <em>Perspective</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPerspective()
+	 * @generated
+	 * @ordered
+	 */
+	protected MPerspective perspective;
+
+	/**
+	 * The cached value of the '{@link #getViewSettings() <em>View Settings</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getViewSettings()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<IPartMemento> viewSettings;
+
+	/**
+	 * The cached value of the '{@link #getEditorArea() <em>Editor Area</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEditorArea()
+	 * @generated
+	 * @ordered
+	 */
+	protected MArea editorArea;
+
+	/**
+	 * The cached value of the '{@link #getTrimBars() <em>Trim Bars</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTrimBars()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<MTrimBar> trimBars;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected WorkbenchState() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return IPersistencePackage.Literals.WORKBENCH_STATE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public MPerspective getPerspective() {
+		return perspective;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetPerspective(MPerspective newPerspective, NotificationChain msgs) {
+		MPerspective oldPerspective = perspective;
+		perspective = newPerspective;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					IPersistencePackage.WORKBENCH_STATE__PERSPECTIVE, oldPerspective, newPerspective);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setPerspective(MPerspective newPerspective) {
+		if (newPerspective != perspective) {
+			NotificationChain msgs = null;
+			if (perspective != null)
+				msgs = ((InternalEObject) perspective).eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE - IPersistencePackage.WORKBENCH_STATE__PERSPECTIVE, null, msgs);
+			if (newPerspective != null)
+				msgs = ((InternalEObject) newPerspective).eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - IPersistencePackage.WORKBENCH_STATE__PERSPECTIVE, null, msgs);
+			msgs = basicSetPerspective(newPerspective, msgs);
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, IPersistencePackage.WORKBENCH_STATE__PERSPECTIVE,
+					newPerspective, newPerspective));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<IPartMemento> getViewSettings() {
+		if (viewSettings == null) {
+			viewSettings = new EObjectContainmentEList<>(IPartMemento.class, this,
+					IPersistencePackage.WORKBENCH_STATE__VIEW_SETTINGS);
+		}
+		return viewSettings;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public MArea getEditorArea() {
+		return editorArea;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetEditorArea(MArea newEditorArea, NotificationChain msgs) {
+		MArea oldEditorArea = editorArea;
+		editorArea = newEditorArea;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					IPersistencePackage.WORKBENCH_STATE__EDITOR_AREA, oldEditorArea, newEditorArea);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setEditorArea(MArea newEditorArea) {
+		if (newEditorArea != editorArea) {
+			NotificationChain msgs = null;
+			if (editorArea != null)
+				msgs = ((InternalEObject) editorArea).eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE - IPersistencePackage.WORKBENCH_STATE__EDITOR_AREA, null, msgs);
+			if (newEditorArea != null)
+				msgs = ((InternalEObject) newEditorArea).eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - IPersistencePackage.WORKBENCH_STATE__EDITOR_AREA, null, msgs);
+			msgs = basicSetEditorArea(newEditorArea, msgs);
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, IPersistencePackage.WORKBENCH_STATE__EDITOR_AREA,
+					newEditorArea, newEditorArea));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<MTrimBar> getTrimBars() {
+		if (trimBars == null) {
+			trimBars = new EObjectContainmentEList<>(MTrimBar.class, this,
+					IPersistencePackage.WORKBENCH_STATE__TRIM_BARS);
+		}
+		return trimBars;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case IPersistencePackage.WORKBENCH_STATE__PERSPECTIVE:
+			return basicSetPerspective(null, msgs);
+		case IPersistencePackage.WORKBENCH_STATE__VIEW_SETTINGS:
+			return ((InternalEList<?>) getViewSettings()).basicRemove(otherEnd, msgs);
+		case IPersistencePackage.WORKBENCH_STATE__EDITOR_AREA:
+			return basicSetEditorArea(null, msgs);
+		case IPersistencePackage.WORKBENCH_STATE__TRIM_BARS:
+			return ((InternalEList<?>) getTrimBars()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case IPersistencePackage.WORKBENCH_STATE__PERSPECTIVE:
+			return getPerspective();
+		case IPersistencePackage.WORKBENCH_STATE__VIEW_SETTINGS:
+			return getViewSettings();
+		case IPersistencePackage.WORKBENCH_STATE__EDITOR_AREA:
+			return getEditorArea();
+		case IPersistencePackage.WORKBENCH_STATE__TRIM_BARS:
+			return getTrimBars();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case IPersistencePackage.WORKBENCH_STATE__PERSPECTIVE:
+			setPerspective((MPerspective) newValue);
+			return;
+		case IPersistencePackage.WORKBENCH_STATE__VIEW_SETTINGS:
+			getViewSettings().clear();
+			getViewSettings().addAll((Collection<? extends IPartMemento>) newValue);
+			return;
+		case IPersistencePackage.WORKBENCH_STATE__EDITOR_AREA:
+			setEditorArea((MArea) newValue);
+			return;
+		case IPersistencePackage.WORKBENCH_STATE__TRIM_BARS:
+			getTrimBars().clear();
+			getTrimBars().addAll((Collection<? extends MTrimBar>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case IPersistencePackage.WORKBENCH_STATE__PERSPECTIVE:
+			setPerspective((MPerspective) null);
+			return;
+		case IPersistencePackage.WORKBENCH_STATE__VIEW_SETTINGS:
+			getViewSettings().clear();
+			return;
+		case IPersistencePackage.WORKBENCH_STATE__EDITOR_AREA:
+			setEditorArea((MArea) null);
+			return;
+		case IPersistencePackage.WORKBENCH_STATE__TRIM_BARS:
+			getTrimBars().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case IPersistencePackage.WORKBENCH_STATE__PERSPECTIVE:
+			return perspective != null;
+		case IPersistencePackage.WORKBENCH_STATE__VIEW_SETTINGS:
+			return viewSettings != null && !viewSettings.isEmpty();
+		case IPersistencePackage.WORKBENCH_STATE__EDITOR_AREA:
+			return editorArea != null;
+		case IPersistencePackage.WORKBENCH_STATE__TRIM_BARS:
+			return trimBars != null && !trimBars.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // WorkbenchState
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java
new file mode 100644
index 0000000000..bb38e59b0a
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java
@@ -0,0 +1,287 @@
+/*******************************************************************************
+ * Copyright (c) 2021 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.internal.persistence.util;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
+import org.eclipse.e4.tools.internal.persistence.impl.WorkbenchState;
+import org.eclipse.e4.tools.persistence.PerspectivePersister;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.ui.MSnippetContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.SideValue;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.e4.ui.workbench.Selector;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.XMLMemento;
+import org.eclipse.ui.internal.EditorReference;
+import org.eclipse.ui.internal.Workbench;
+import org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor;
+import org.eclipse.ui.internal.e4.compatibility.CompatibilityView;
+
+/**
+ * A Util for the workbench conversion.
+ *
+ * @since 3.3
+ *
+ */
+@SuppressWarnings({ "restriction" })
+public final class CommonUtil {
+
+	private CommonUtil() {
+	}
+
+	/**
+	 * The key to use for storing the memento.
+	 */
+	public static String MEMENTO_KEY = "memento"; //$NON-NLS-1$
+	/**
+	 * Constant for the EDITOR_AREA.
+	 */
+	public static String EDITOR_AREA = "org.eclipse.ui.editorss"; //$NON-NLS-1$
+
+	/**
+	 * Retrieve the IEclipseContext from the Workbench.
+	 *
+	 * @return The IEclipseContext
+	 */
+	public static IEclipseContext getEclipseContext() {
+		return Workbench.getInstance().getContext();
+	}
+
+	/**
+	 * Retrieve the EModelService from the EclipseContext.
+	 *
+	 * @return The EModelService
+	 */
+	public static EModelService getEModelService() {
+		return getEclipseContext().get(EModelService.class);
+	}
+
+	/**
+	 * Retrieve the first MWindow from the MApplication from the EclipseContext.
+	 *
+	 * @return The MWindow
+	 */
+	public static MWindow getCurrentMainWindow() {
+		MApplication mApplication = getEclipseContext().get(MApplication.class);
+		List<MWindow> children = mApplication.getChildren();
+		MWindow mWindow = children.get(0);
+		return mWindow;
+	}
+
+	public static void persistCompatibilityEditors(MUIElement root) {
+		CommonUtil.getEModelService().findElements(root, CompatibilityEditor.MODEL_ELEMENT_ID, MPart.class)
+				.forEach(CommonUtil::persistCompatibilityEditor);
+	}
+
+	/**
+	 * If the part represents a CompatibilityEditor, writes the editor's state to
+	 * the MPart's persisted state.
+	 */
+	private static void persistCompatibilityEditor(MPart part) {
+		if (part.getObject() instanceof CompatibilityEditor) {
+			// Use reflection to call EditorReference's persist method.
+			// It writes all relevant information of the editor (id, editor input, etc.) to
+			// the MPart's persisted state
+			// With this, the editor can be restored.
+			// Reflection is necessary because EditorReference#persist is package protected.
+			CompatibilityEditor editor = (CompatibilityEditor) part.getObject();
+			EditorReference reference = (EditorReference) editor.getReference();
+			try {
+				Method persistMethod = reference.getClass().getDeclaredMethod("persist"); //$NON-NLS-1$
+				persistMethod.setAccessible(true);
+				persistMethod.invoke(reference);
+			} catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException
+					| InvocationTargetException e) {
+				throw new IllegalStateException("Cannot call EditorReference's persist method", e); //$NON-NLS-1$
+			}
+		}
+	}
+
+	public static List<MPart> getPerspectivePartsWithState(final MPerspective perspective) {
+		List<MPlaceholder> phList = CommonUtil.getEModelService().findElements(perspective, null, MPlaceholder.class,
+				null);
+		List<MPart> result = new ArrayList<MPart>();
+		for (MPlaceholder ph : phList) {
+			MUIElement element = ph.getRef();
+			if (!MPart.class.isInstance(element)) {
+				continue;
+			}
+			MPart part = MPart.class.cast(element);
+
+			persist(part);
+			result.add(part);
+		}
+		return result;
+	}
+
+	private static void persist(final MPart part) {
+		Optional<IViewPart> viewPart = getOptionalViewPart(part);
+		if (viewPart.isPresent()) {
+			XMLMemento root = XMLMemento.createWriteRoot("view"); //$NON-NLS-1$
+			viewPart.get().saveState(root);
+			StringWriter writer = new StringWriter();
+			try {
+				root.save(writer);
+				part.getPersistedState().put(MEMENTO_KEY, writer.toString());
+			} catch (IOException e) {
+				throw new IllegalStateException(e);
+			}
+		}
+	}
+
+	/**
+	 * Retrieve the IViewPart from a MPart wrapped in an Optional.
+	 *
+	 * @param part The MPart to get the IViewPart from
+	 * @return The optional IViewPart
+	 */
+	public static Optional<IViewPart> getOptionalViewPart(final MPart part) {
+		if (!CompatibilityView.class.isInstance(part.getObject())) {
+			return Optional.empty();
+		}
+		CompatibilityView cv = CompatibilityView.class.cast(part.getObject());
+		if (cv == null) {
+			return Optional.empty();
+		}
+		IViewPart viewPart = cv.getView();
+		return Optional.ofNullable(viewPart);
+	}
+
+	/**
+	 * Create a new MSnippetContainer.
+	 *
+	 * @return The MSnippetContainer
+	 */
+	public static MSnippetContainer createSnippetContainer() {
+		return new MSnippetContainer() {
+
+			private final List<MUIElement> list = new ArrayList<>();
+
+			@Override
+			public List<MUIElement> getSnippets() {
+				return list;
+			}
+		};
+	}
+
+	/**
+	 * Retrieve the EPartService from the EclipseContext.
+	 *
+	 * @return The EPartService
+	 */
+	public static EPartService getEPartService() {
+		return CommonUtil.getEclipseContext().get(EPartService.class);
+	}
+
+	/**
+	 * Retrieve the MPerspective from a MWindow based on the perspectiveId.
+	 *
+	 * @param window        The MWindow to search
+	 * @param perspectiveId The perspective id to search for
+	 *
+	 * @return The MPerspective
+	 */
+	public static MPerspective getMainPerspectiveFromWindow(final MWindow window, final String perspectiveId) {
+
+		final List<MPerspective> findElements = CommonUtil.getEModelService().findElements(window, MPerspective.class,
+				EModelService.ANYWHERE, new Selector() {
+
+					@Override
+					public boolean select(final MApplicationElement element) {
+						return Objects.equals(element.getElementId(), perspectiveId);
+					}
+				});
+
+		if (findElements == null || findElements.isEmpty()) {
+			throw new IllegalStateException("No perspective found with id " + perspectiveId); //$NON-NLS-1$
+		} else if (findElements.size() > 1) {
+			throw new IllegalStateException("Too many perspectives found"); //$NON-NLS-1$
+		}
+		return findElements.get(0);
+	}
+
+	/**
+	 * Creates the persistable workbench state for an e4 perspective.
+	 *
+	 * @param window      the current application window. This is used to persist
+	 *                    the current trim bars
+	 * @param perspective The perspective to persist
+	 * @return The created {@link WorkbenchState}
+	 */
+	public static IWorkbenchState createWorkbenchState(final MWindow window, final MPerspective perspective) {
+		if (window == null) {
+			throw new NullPointerException("Window must not be null"); //$NON-NLS-1$
+		}
+		IWorkbenchState workbenchState = PerspectivePersister.convertPerspective(perspective);
+
+		// Add left and right trimbars that might contain MinMax controls
+		if (window instanceof MTrimmedWindow) {
+			MTrimmedWindow tw = (MTrimmedWindow) window;
+
+			// Get side trim bars, clone them, and add them to the workbench state
+			tw.getTrimBars().stream().filter(CommonUtil::isSideBar)
+					.map(t -> (MTrimBar) CommonUtil.getEModelService().cloneElement(t, null))
+					.forEach(workbenchState.getTrimBars()::add);
+		}
+
+		return workbenchState;
+	}
+
+	/**
+	 * Retrieve the IEditorPart from a MPart wrapped in an Optional.
+	 *
+	 * @param part The MPart to get the IEditorPart from
+	 * @return The optional IEditorPart
+	 */
+	public static Optional<IEditorPart> getOptionalEditorPart(final MPart part) {
+		if (!CompatibilityEditor.class.isInstance(part.getObject())) {
+			return Optional.empty();
+		}
+		CompatibilityEditor ce = CompatibilityEditor.class.cast(part.getObject());
+		if (ce == null) {
+			return Optional.empty();
+		}
+		IEditorPart editorPart = ce.getEditor();
+		return Optional.ofNullable(editorPart);
+	}
+
+	/**
+	 * Returns whether the given {@link MTrimBar} is a side trim bar.
+	 *
+	 * @param trimBar The MTrimBar to check
+	 * @return true if the {@link MTrimBar} is a side trim bar (left or right).
+	 */
+	public static boolean isSideBar(MTrimBar trimBar) {
+		return trimBar.getSide() == SideValue.LEFT || trimBar.getSide() == SideValue.RIGHT;
+	}
+}
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceAdapterFactory.java b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceAdapterFactory.java
new file mode 100644
index 0000000000..d79ac01e48
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceAdapterFactory.java
@@ -0,0 +1,145 @@
+/*******************************************************************************
+ * Copyright (c) 2021 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.internal.persistence.util;
+
+import org.eclipse.e4.tools.internal.persistence.IPartMemento;
+import org.eclipse.e4.tools.internal.persistence.IPersistencePackage;
+import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
+ * an adapter <code>createXXX</code> method for each class of the model. <!--
+ * end-user-doc -->
+ * @see org.eclipse.e4.tools.internal.persistence.IPersistencePackage
+ * @generated
+ */
+public class PersistenceAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static IPersistencePackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	public PersistenceAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = IPersistencePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object. <!--
+	 * begin-user-doc --> This implementation returns <code>true</code> if the
+	 * object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject) object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected PersistenceSwitch<Adapter> modelSwitch = new PersistenceSwitch<>() {
+		@Override
+		public Adapter caseWorkbenchState(IWorkbenchState object) {
+			return createWorkbenchStateAdapter();
+		}
+
+		@Override
+		public Adapter casePartMemento(IPartMemento object) {
+			return createPartMementoAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject) target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.e4.tools.internal.persistence.IWorkbenchState <em>Workbench State</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.e4.tools.internal.persistence.IWorkbenchState
+	 * @generated
+	 */
+	public Adapter createWorkbenchStateAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.e4.tools.internal.persistence.IPartMemento <em>Part Memento</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.e4.tools.internal.persistence.IPartMemento
+	 * @generated
+	 */
+	public Adapter createPartMementoAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc --> This
+	 * default implementation returns null. <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} // PersistenceAdapterFactory
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java
new file mode 100644
index 0000000000..19c1144536
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java
@@ -0,0 +1,141 @@
+/*******************************************************************************
+ * Copyright (c) 2021 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.internal.persistence.util;
+
+import org.eclipse.e4.tools.internal.persistence.IPartMemento;
+import org.eclipse.e4.tools.internal.persistence.IPersistencePackage;
+import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+
+/**
+ * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
+ * hierarchy. It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object and proceeding up the
+ * inheritance hierarchy until a non-null result is returned, which is the
+ * result of the switch. <!-- end-user-doc -->
+ * @see org.eclipse.e4.tools.internal.persistence.IPersistencePackage
+ * @generated
+ */
+public class PersistenceSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static IPersistencePackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 *
+	 * @generated
+	 */
+	public PersistenceSwitch() {
+		if (modelPackage == null) {
+			modelPackage = IPersistencePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+		case IPersistencePackage.WORKBENCH_STATE: {
+			IWorkbenchState workbenchState = (IWorkbenchState) theEObject;
+			T result = caseWorkbenchState(workbenchState);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case IPersistencePackage.PART_MEMENTO: {
+			IPartMemento partMemento = (IPartMemento) theEObject;
+			T result = casePartMemento(partMemento);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Workbench State</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Workbench State</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseWorkbenchState(IWorkbenchState object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Part Memento</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Part Memento</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePartMemento(IPartMemento object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last
+	 * case anyway. <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} // PersistenceSwitch
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java
new file mode 100644
index 0000000000..b85954e189
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java
@@ -0,0 +1,502 @@
+/*******************************************************************************
+ * Copyright (c) 2021 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.persistence;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import org.eclipse.e4.tools.internal.persistence.IPartMemento;
+import org.eclipse.e4.tools.internal.persistence.IPersistenceFactory;
+import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
+import org.eclipse.e4.tools.internal.persistence.util.CommonUtil;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MSnippetContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.SideValue;
+import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
+import org.eclipse.e4.ui.model.application.ui.basic.MStackElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.e4.ui.workbench.IPresentationEngine;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+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.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.URIConverter;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IViewReference;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPartReference;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * Persists and restores perspectives from a {@link IWorkbenchWindow}.
+ */
+public final class PerspectivePersister {
+
+	private PerspectivePersister() {
+	}
+
+	/**
+	 * Serialize a specific perspective from the running application.
+	 *
+	 * @param perspectiveId The id of the perspective to extract and serialize
+	 * @return the serialized WorkbenchState
+	 */
+	public static String serializePerspectiveAndPartStates(final String perspectiveId) {
+		final MWindow mWindow = CommonUtil.getCurrentMainWindow();
+		final MPerspective perspective = CommonUtil.getMainPerspectiveFromWindow(mWindow, perspectiveId);
+		final IWorkbenchState workbenchState = CommonUtil.createWorkbenchState(mWindow, perspective);
+		final String xml = serialize(workbenchState);
+		return xml;
+	}
+
+	private static String serialize(final EObject eObject) {
+		final EObject copy = EcoreUtil.copy(eObject);
+		final ResourceSet resourceSet = new ResourceSetImpl();
+		final Resource resource = resourceSet.createResource(URI.createURI("virtualUri")); //$NON-NLS-1$
+		// changes containment, therefore we use a copy
+		resource.getContents().add(copy);
+		try (Writer writer = new StringWriter()) {
+			final URIConverter.WriteableOutputStream uws = new URIConverter.WriteableOutputStream(writer, "UTF-8"); //$NON-NLS-1$
+			resource.save(uws, null);
+			final String xml = writer.toString().trim();
+			writer.close();
+			return xml;
+
+		} catch (final IOException e) {
+			throw new IllegalStateException(e);
+		}
+	}
+
+	/**
+	 * Deserialize and restore the WorkbenchState.
+	 *
+	 * @param serializedState The serialized WorkbenchState
+	 */
+	public static void restoreWorkbenchState(final String serializedState) {
+		final IWorkbenchState toBeMerged = deserialize(serializedState);
+		restoreWorkbenchState(toBeMerged);
+	}
+
+	/**
+	 * Restore the WorkbenchState.
+	 *
+	 * @param workbenchState The WorkbenchState to restore
+	 */
+	public static void restoreWorkbenchState(final IWorkbenchState workbenchState) {
+		final MWindow currentWindow = CommonUtil.getCurrentMainWindow();
+		final EPartService ePartService = CommonUtil.getEPartService();
+		disposeCurrentParts(ePartService.getParts());
+		MPerspective perspective = workbenchState.getPerspective();
+		ePartService.switchPerspective(perspective.getElementId());
+
+		Shell widget = (Shell) currentWindow.getWidget();
+		// Turn of redrawing while we update the complete layout
+		widget.setRedraw(false);
+
+		try {
+			IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+
+			List<IViewPart> viewPartsToHide = new ArrayList<>();
+			List<IViewReference> viewReferencesToHide = new ArrayList<>();
+			List<MPart> parts = new ArrayList<>();
+
+			for (final IPartMemento viewSetting : workbenchState.getViewSettings()) {
+				final List<MPart> elements = CommonUtil.getEModelService().findElements(currentWindow,
+						viewSetting.getPartId(), MPart.class, null);
+				if (elements.size() < 1) {
+					System.err.println("Part ID has not been found. View Settings cannot be restored for part: " //$NON-NLS-1$
+							+ viewSetting.getPartId());
+					continue;
+				}
+
+				final MPart part = elements.get(0);
+				parts.add(part);
+
+				final Optional<IViewPart> viewPart = CommonUtil.getOptionalViewPart(part);
+				if (viewPart.isPresent()) {
+					viewPartsToHide.add(viewPart.get());
+				} else {
+					// If we get no part this might mean the view has not been activated yet
+					IViewReference viewRef = (IViewReference) part.getTransientData()
+							.get(IWorkbenchPartReference.class.getName());
+					if (viewRef != null) {
+						// Make sure we use not an old reference object
+						IViewReference resolved = activePage.findViewReference(viewRef.getId());
+						// Activate forcefully otherwise we are unable to close the view and have to
+						// deal with
+						// WidgetDisposedExceptions
+						if (resolved == null) {
+							try {
+								IViewPart view = activePage.showView(viewRef.getId());
+								if (view != null) {
+									viewPartsToHide.add(view);
+								}
+							} catch (PartInitException e) {
+								System.err.println("Failed to initialize part"); //$NON-NLS-1$
+								e.printStackTrace();
+							}
+						} else {
+							viewReferencesToHide.add(resolved);
+						}
+					}
+				}
+			}
+
+			// First hide references to not forcefully activate them
+			viewReferencesToHide.forEach(activePage::hideView);
+			viewPartsToHide.forEach(activePage::hideView);
+
+			// Bug in e4/JFace/Compat-Layer disposing Images in
+			// org.eclipse.ui.part.WorkbenchPart but they are kept in
+			// JFaceResources.getImageRegistry().get(String)
+			for (MPart p : parts) {
+				if (p.getIconURI() != null) {
+					Image image = JFaceResources.getImageRegistry().get(p.getIconURI());
+					if (image != null && image.isDisposed()) {
+						JFaceResources.getImageRegistry().remove(p.getIconURI());
+					}
+				}
+			}
+
+			for (final IPartMemento viewSetting : workbenchState.getViewSettings()) {
+				final List<MPart> elements = CommonUtil.getEModelService().findElements(currentWindow,
+						viewSetting.getPartId(), MPart.class, null);
+				if (elements.size() < 1) {
+					System.err.println("Part ID has not been found. View Settings cannot be restored for part: " //$NON-NLS-1$
+							+ viewSetting.getPartId());
+					continue;
+				}
+
+				final MPart part = elements.get(0);
+				parts.add(part);
+
+				part.getPersistedState().put(CommonUtil.MEMENTO_KEY, viewSetting.getMemento());
+			}
+
+			replaceExistingPerspective(currentWindow, workbenchState.getPerspective(),
+					workbenchState.getPerspective().getElementId());
+
+			if (workbenchState.getEditorArea() != null) {
+				replaceEditorAreaContents(currentWindow, workbenchState.getEditorArea());
+			}
+
+			// Replace side trim bars to ensure persisted minimized part stacks don't get
+			// lost.
+			// This is necessary because a MToolControl to restore a part stack (and its
+			// child parts) is only created the first time a part stack is minimized.
+			// If a part stack was never minimized in the current workspace but is minimized
+			// in the persisted workbench, there are no min max controls without restoring
+			// the side bars.
+			if (currentWindow instanceof MTrimmedWindow) {
+				replaceSideTrimBars((MTrimmedWindow) currentWindow, workbenchState.getTrimBars());
+			}
+
+			// Re-minimize part stacks to trigger min-max addon
+			MPerspective appliedPerspective = CommonUtil.getMainPerspectiveFromWindow(currentWindow,
+					workbenchState.getPerspective().getElementId());
+			List<MPartStack> stacks = CommonUtil.getEModelService().findElements(appliedPerspective, null,
+					MPartStack.class);
+			stacks.stream().filter(s -> s.getTags().contains(IPresentationEngine.MINIMIZED)).forEach(s -> {
+				s.getTags().remove(IPresentationEngine.MINIMIZED);
+				s.getTags().add(IPresentationEngine.MINIMIZED);
+			});
+		} finally {
+			widget.setRedraw(true);
+		}
+	}
+
+	private static void disposeCurrentParts(Collection<MPart> parts) {
+		IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+		List<IViewPart> viewPartsToHide = new LinkedList<>();
+		List<IEditorPart> editorsToHide = new LinkedList<>();
+		parts.forEach(part -> {
+			Optional<IViewPart> viewPart = CommonUtil.getOptionalViewPart(part);
+			if (viewPart.isPresent()) {
+				viewPartsToHide.add(viewPart.get());
+				return;
+			}
+			Optional<IEditorPart> editorPart = CommonUtil.getOptionalEditorPart(part);
+			if (editorPart.isPresent()) {
+				editorsToHide.add(editorPart.get());
+				return;
+			}
+
+			// the editor/view was not activated yet
+			// we need to be careful that this does not get activated by a neighbor being
+			// disposed and this is getting focus -> hide it now
+			CommonUtil.getEPartService().hidePart(part);
+		});
+		viewPartsToHide.forEach(activePage::hideView);
+		editorsToHide.forEach(e -> activePage.closeEditor(e, true));
+	}
+
+	/**
+	 * Replaces side trim bars (left and right) in the given window. If a trim bar
+	 * of a side is given, add it to the window. If a trim bar of the same side
+	 * already exists in the window, replace its children with the persisted one's
+	 * children.
+	 *
+	 * @param window   The window whose side trim bars to replace
+	 * @param trimBars The list of replacement trim bars.
+	 */
+	private static void replaceSideTrimBars(MTrimmedWindow window, List<MTrimBar> trimBars) {
+		for (MTrimBar trimBar : trimBars) {
+			if (!CommonUtil.isSideBar(trimBar)) {
+				continue;
+			}
+			MTrimBar clonedTrimBar = (MTrimBar) CommonUtil.getEModelService().cloneElement(trimBar, null);
+			SideValue side = trimBar.getSide();
+
+			// If a trim bar of the current side exists, replace its children with the
+			// persisted trim bar's children. This is done because deleting a trim bar logs
+			// a NPE in the error log.
+			// If no trim bar of the current side exists, insert the persisted one.
+			Optional<MTrimBar> existingTrimOptional = window.getTrimBars().stream().filter(t -> t.getSide() == side)
+					.findFirst();
+			if (existingTrimOptional.isPresent()) {
+				final MTrimBar existingTrim = existingTrimOptional.get();
+				List<MTrimElement> children = new LinkedList<>(existingTrim.getChildren());
+				children.forEach(CommonUtil.getEModelService()::deleteModelElement);
+
+				// remove trim elements that are not part of current perspective anymore
+				// leads to a NPE otherwise
+				List<MTrimElement> trimElementsToAdd = clonedTrimBar.getChildren().stream()//
+						.filter(te -> isTrimPartOfPerspective(te, window))//
+						.collect(Collectors.toList());
+				existingTrim.getChildren().addAll(trimElementsToAdd);
+				existingTrim.getTags().clear();
+				existingTrim.getTags().addAll(trimBar.getTags());
+				existingTrim.setVisible(trimBar.isVisible());
+				existingTrim.setToBeRendered(trimBar.isToBeRendered());
+			} else {
+				window.getTrimBars().add(clonedTrimBar);
+			}
+		}
+	}
+
+	@SuppressWarnings("restriction")
+	private static boolean isTrimPartOfPerspective(MTrimElement te, MTrimmedWindow window) {
+		EModelService eModelService = CommonUtil.getEModelService();
+		MPerspective activePerspective = eModelService.getActivePerspective(window);
+		Map<org.eclipse.e4.ui.workbench.addons.minmax.TrimStackIdHelper.TrimStackIdPart, String> parsedIds = org.eclipse.e4.ui.workbench.addons.minmax.TrimStackIdHelper
+				.parseTrimStackId(te.getElementId());
+		String stackId = parsedIds
+				.get(org.eclipse.e4.ui.workbench.addons.minmax.TrimStackIdHelper.TrimStackIdPart.ELEMENT_ID);
+		MUIElement foundElement = eModelService.find(stackId, activePerspective);
+		return foundElement != null;
+	}
+
+	private static IWorkbenchState deserialize(final String serializedState) {
+		final ResourceSet resourceSet = new ResourceSetImpl();
+		final Resource resource = resourceSet.createResource(URI.createURI("virtualUri")); //$NON-NLS-1$
+
+		try (Reader reader = new StringReader(serializedState)) {
+			final URIConverter.ReadableInputStream is = new URIConverter.ReadableInputStream(reader, "UTF-8"); //$NON-NLS-1$
+			resource.load(is, null);
+			final EObject eObject = resource.getContents().get(0);
+			if (!(eObject instanceof IWorkbenchState)) {
+				throw new IllegalStateException("Corrupted Perspective File"); //$NON-NLS-1$
+			}
+			return (IWorkbenchState) eObject;
+		} catch (final IOException e) {
+			throw new IllegalStateException(e);
+		}
+	}
+
+	private static void replaceExistingPerspective(final MWindow currentWindow, final MPerspective toBeMerged,
+			final String perspectiveName) {
+		final MPerspective currentPerspective = CommonUtil.getMainPerspectiveFromWindow(currentWindow, perspectiveName);
+		final Control control = (Control) currentPerspective.getWidget();
+
+		// If it exists, don't render editor area before removing the old perspective
+		// because otherwise the AreaRenderer throws an exception if the editor area was
+		// split.
+		MUIElement editorArea = CommonUtil.getEModelService().find(CommonUtil.EDITOR_AREA, currentPerspective);
+		if (editorArea != null) {
+			editorArea.setToBeRendered(false);
+		}
+
+		final MPerspectiveStack mPerspectiveStack = (MPerspectiveStack) deletePerspective(currentPerspective);
+		control.dispose();
+		final MPerspective clonedPerspective = addPerspective(toBeMerged, mPerspectiveStack, currentWindow);
+
+		// Remember the active element
+		final MUIElement activeElement = getActiveElement(clonedPerspective);
+
+		// Show the UI
+		final EPartService ePartService = CommonUtil.getEPartService();
+		ePartService.switchPerspective(clonedPerspective);
+
+		// Reset the activation, which might be adjusted by the part activation history
+		if (activeElement instanceof MPart) {
+			ePartService.activate((MPart) activeElement, true);
+		}
+	}
+
+	private static void replaceEditorAreaContents(final MWindow currentWindow, final MArea toBeMerged) {
+		List<MArea> editorAreaList = CommonUtil.getEModelService().findElements(currentWindow, CommonUtil.EDITOR_AREA,
+				MArea.class, null, EModelService.OUTSIDE_PERSPECTIVE | EModelService.IN_SHARED_AREA);
+		final MSnippetContainer snippetContainer = CommonUtil.createSnippetContainer();
+		snippetContainer.getSnippets().add(toBeMerged);
+		final MArea cloneSnippet = (MArea) CommonUtil.getEModelService().cloneSnippet(snippetContainer,
+				toBeMerged.getElementId(), currentWindow);
+
+		// Replace children of existing editor area: If there is a placeholder for an
+		// editor area, there is also a shared element.
+		MArea editorArea = editorAreaList.get(0);
+
+		while (editorArea.getChildren().size() > 0) {
+			Object widget = editorArea.getChildren().get(0).getWidget();
+			EcoreUtil.delete((EObject) editorArea.getChildren().get(0));
+			// Dispose widgets of removed children to avoid lingering "zombie" widgets
+			if (widget instanceof Control) {
+				((Control) widget).dispose();
+			}
+		}
+		editorArea.getChildren().addAll(cloneSnippet.getChildren());
+
+		// Activate all editors once to avoid problems with closing uninitialized
+		// editors later on.
+		activateEditors(editorArea);
+	}
+
+	/**
+	 * Activates all editors in the given editor area once to initialize them.
+	 *
+	 * @param editorArea
+	 */
+	private static void activateEditors(MArea editorArea) {
+		final EPartService partService = CommonUtil.getEPartService();
+
+		// Remember selection of all part stacks because activating a part selects it in
+		// the part stack.
+		// We want to restore the original selection after the activations are
+		// completed.
+		final List<MPartStack> partStacks = CommonUtil.getEModelService().findElements(editorArea, null,
+				MPartStack.class);
+		final Map<MPartStack, MStackElement> stackSelections = new LinkedHashMap<>();
+		for (MPartStack partStack : partStacks) {
+			stackSelections.put(partStack, partStack.getSelectedElement());
+		}
+
+		// Activate parts without the need to get focus
+		final List<MPart> editorParts = CommonUtil.getEModelService().findElements(editorArea, null, MPart.class);
+		for (MPart editor : editorParts) {
+			partService.activate(editor, false);
+		}
+
+		// Restore original part stack selections
+		for (MPartStack partStack : stackSelections.keySet()) {
+			partStack.setSelectedElement(stackSelections.get(partStack));
+		}
+	}
+
+	private static MUIElement getActiveElement(final MPerspective clonedPerspective) {
+		MUIElement activeElement = clonedPerspective;
+		// search the active Element
+		while (activeElement instanceof MElementContainer<?>) {
+			final MUIElement selectedElement = ((MElementContainer<?>) activeElement).getSelectedElement();
+			if (selectedElement == null) {
+				break;
+			}
+			activeElement = selectedElement;
+		}
+
+		if (activeElement instanceof MPlaceholder) {
+			activeElement = ((MPlaceholder) activeElement).getRef();
+		}
+		return activeElement;
+	}
+
+	private static EObject deletePerspective(final MPerspective currentPerspective) {
+		final EObject eContainer = ((EObject) currentPerspective).eContainer();
+		EcoreUtil.delete((EObject) currentPerspective);
+		return eContainer;
+	}
+
+	private static MPerspective addPerspective(final MPerspective perspective2BeMerged,
+			final MPerspectiveStack mPerspectiveStack, final MWindow currentWindow) {
+		final MSnippetContainer snippetContainer = CommonUtil.createSnippetContainer();
+		snippetContainer.getSnippets().add(perspective2BeMerged);
+		final MUIElement cloneSnippet = CommonUtil.getEModelService().cloneSnippet(snippetContainer,
+				perspective2BeMerged.getElementId(), currentWindow);
+		mPerspectiveStack.getChildren().add((MPerspective) cloneSnippet);
+		return (MPerspective) cloneSnippet;
+	}
+
+	/**
+	 * Convert the {@link MPerspective} to a {@link IWorkbenchState}.
+	 *
+	 * @param perspective The perspective to persist
+	 * @return The created WorkbenchState
+	 */
+	public static IWorkbenchState convertPerspective(final MPerspective perspective) {
+		MSnippetContainer snippetContainer = CommonUtil.createSnippetContainer();
+		CommonUtil.persistCompatibilityEditors(perspective);
+		CommonUtil.getEModelService().cloneElement(perspective, snippetContainer);
+		IWorkbenchState workbenchState = IPersistenceFactory.eINSTANCE.createWorkbenchState();
+		workbenchState.setPerspective((MPerspective) snippetContainer.getSnippets().get(0));
+		List<MPart> parts = CommonUtil.getPerspectivePartsWithState(perspective);
+		for (MPart part : parts) {
+			IPartMemento partMemento = IPersistenceFactory.eINSTANCE.createPartMemento();
+			partMemento.setPartId(part.getElementId());
+			partMemento.setMemento(part.getPersistedState().get(CommonUtil.MEMENTO_KEY));
+			workbenchState.getViewSettings().add(partMemento);
+		}
+
+		// Editor area
+		MPlaceholder editorAreaPlaceholder = (MPlaceholder) CommonUtil.getEModelService().find(CommonUtil.EDITOR_AREA,
+				perspective);
+		if (editorAreaPlaceholder != null) {
+			MArea editorArea = (MArea) editorAreaPlaceholder.getRef();
+			CommonUtil.persistCompatibilityEditors(editorArea);
+			MArea clonedEditorArea = (MArea) CommonUtil.getEModelService().cloneElement(editorArea, null);
+			workbenchState.setEditorArea(clonedEditorArea);
+			// TODO copy editor area view state of non editors
+		}
+
+		return workbenchState;
+	}
+
+}
diff --git a/features/org.eclipse.e4.tools.persistence.feature/.project b/features/org.eclipse.e4.tools.persistence.feature/.project
new file mode 100644
index 0000000000..c94c351fa4
--- /dev/null
+++ b/features/org.eclipse.e4.tools.persistence.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.persistence.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/org.eclipse.e4.tools.persistence.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.e4.tools.persistence.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.e4.tools.persistence.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.e4.tools.persistence.feature/build.properties b/features/org.eclipse.e4.tools.persistence.feature/build.properties
new file mode 100644
index 0000000000..b3a611b5c9
--- /dev/null
+++ b/features/org.eclipse.e4.tools.persistence.feature/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/org.eclipse.e4.tools.persistence.feature/feature.properties b/features/org.eclipse.e4.tools.persistence.feature/feature.properties
new file mode 100644
index 0000000000..7bea4bf222
--- /dev/null
+++ b/features/org.eclipse.e4.tools.persistence.feature/feature.properties
@@ -0,0 +1,49 @@
+###############################################################################
+# Copyright (c) 2021 EclipseSource GmbH and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     EclipseSource GmbH - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Persistence
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+updateSiteName=The Eclipse Project Updates
+
+# "secondarySiteName" property - label for the update site
+secondaryUpdateSiteName=
+
+# "description" property - description of the feature
+description=Eclipse Persistence
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2021 EclipseSource GmbH and others.\n\
+
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n\
+\n\
+Contributors:\n\
+    EclipseSource GmbH - initial API and implementation\n
+################ end of copyright property ####################################
+
diff --git a/features/org.eclipse.e4.tools.persistence.feature/feature.xml b/features/org.eclipse.e4.tools.persistence.feature/feature.xml
new file mode 100644
index 0000000000..aa0f8c6e62
--- /dev/null
+++ b/features/org.eclipse.e4.tools.persistence.feature/feature.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.e4.tools.persistence.feature"
+      label="%featureName"
+      version="1.0.0.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.e4.tools.persistence"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.e4.tools.compatibility.migration"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.e4.tools.persistence.feature/forceQualifierUpdate.txt b/features/org.eclipse.e4.tools.persistence.feature/forceQualifierUpdate.txt
new file mode 100644
index 0000000000..9d4f218a38
--- /dev/null
+++ b/features/org.eclipse.e4.tools.persistence.feature/forceQualifierUpdate.txt
@@ -0,0 +1 @@
+# To force a version qualifier update add the bug here
diff --git a/features/org.eclipse.e4.tools.persistence.feature/pom.xml b/features/org.eclipse.e4.tools.persistence.feature/pom.xml
new file mode 100644
index 0000000000..9af583c8a8
--- /dev/null
+++ b/features/org.eclipse.e4.tools.persistence.feature/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2022 EclipseSource GmbH and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+
+  Contributors:
+     EclipseSource GmbH - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.eclipse</groupId>
+		<artifactId>eclipse.platform.ui.tools</artifactId>
+		<version>4.27.0-SNAPSHOT</version>
+		<relativePath>../../</relativePath>
+	</parent>
+
+	<groupId>eclipse.platform.ui.tools</groupId>
+	<artifactId>org.eclipse.e4.tools.persistence.feature</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<id>feature-source</id>
+						<goals>
+							<goal>feature-source</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<executions>
+					<execution>
+						<id>attach-p2-metadata</id>
+						<phase>package</phase>
+						<goals>
+							<goal>p2-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/.classpath b/tests/org.eclipse.e4.tools.compatibility.migration.tests/.classpath
new file mode 100644
index 0000000000..a42a828e04
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.compatibility.migration.tests/.classpath
@@ -0,0 +1,11 @@
+<?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/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/.project b/tests/org.eclipse.e4.tools.compatibility.migration.tests/.project
new file mode 100644
index 0000000000..509256eb47
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.compatibility.migration.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.compatibility.migration.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..737d67c4d4
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,468 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=ignore
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=private
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=no_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecInsufficientInfo=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true
+org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..fd9ef68096
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,64 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
+formatter_settings_version=14
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return Returns the ${bare_field_name}.\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} The ${bare_field_name} to set.\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @since 3.5\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=true
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..e7eee2dd04
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,17 @@
+#Wed Oct 17 16:19:53 EDT 2007
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.deprecated=2
+compilers.p.illegal-att-value=0
+compilers.p.missing-packages=2
+compilers.p.no-required-att=1
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=1
+compilers.p.unresolved-import=0
+compilers.p.unused-element-or-attribute=1
+compilers.use-project=true
+eclipse.preferences.version=1
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..d975b5193d
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests
+Bundle-SymbolicName: org.eclipse.e4.tools.compatibility.migration.tests;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Automatic-Module-Name: org.eclipse.e4.tools.compatibility.migration.tests
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Require-Bundle: org.eclipse.swt;bundle-version="[3.110.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.100.0,4.0.0)",
+ org.eclipse.e4.tools.compatibility.migration;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.e4.ui.model.workbench;bundle-version="[2.1.0,3.0.0)",
+ org.junit;bundle-version="[4.12.0,5.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)",
+ org.eclipse.ui.tests.harness;bundle-version="[1.8.100,2.0.0)"
+Bundle-ActivationPolicy: lazy
+Import-Package: org.junit.jupiter.api;version="[5.8.1,6.0.0)"
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/build.properties b/tests/org.eclipse.e4.tools.compatibility.migration.tests/build.properties
new file mode 100644
index 0000000000..34d2e4d2da
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.compatibility.migration.tests/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml b/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
new file mode 100644
index 0000000000..5027103204
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2022 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+
+  Contributors:
+     Eugen Nefueld - initial implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse</groupId>
+		<artifactId>eclipse.platform.ui.tools</artifactId>
+		<version>4.27.0-SNAPSHOT</version>
+		<relativePath>../../</relativePath>
+	</parent>
+	<groupId>eclipse.platform.ui.tool</groupId>
+	<artifactId>org.eclipse.e4.tools.compatibility.migration.tests</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-test-plugin</packaging>
+
+	<properties>
+		<skipAPIAnalysis>true</skipAPIAnalysis> <!-- Not in baseline -->
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<includes>
+						<include>**/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java</include>
+					</includes>
+					<useUIHarness>false</useUIHarness>
+					<useUIThread>false</useUIThread>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/e4_test.xml b/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/e4_test.xml
new file mode 100644
index 0000000000..5e4e74f4c8
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/e4_test.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="ASCII"?>
+<application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:advanced="http://www.eclipse.org/ui/2010/UIModel/application/ui/advanced" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmi:id="_DMol4JaZEeyiTd_tdcLiRw">
+  <children xsi:type="basic:TrimmedWindow" xmi:id="_DMpM8JaZEeyiTd_tdcLiRw" contributorURI="platform:/plugin/org.eclipse.platform">
+    <children xsi:type="basic:PartSashContainer" xmi:id="_DMpM8ZaZEeyiTd_tdcLiRw" horizontal="true">
+      <children xsi:type="advanced:PerspectiveStack" xmi:id="_DMpM8paZEeyiTd_tdcLiRw" selectedElement="_DMpM85aZEeyiTd_tdcLiRw">
+        <children xsi:type="advanced:Perspective" xmi:id="_DMpM85aZEeyiTd_tdcLiRw" elementId="ResourceExport" label="ResourceExport">
+          <children xsi:type="basic:PartSashContainer" xmi:id="_DMpM9JaZEeyiTd_tdcLiRw" horizontal="true">
+            <children xsi:type="basic:PartSashContainer" xmi:id="_DMpM9ZaZEeyiTd_tdcLiRw" horizontal="true">
+              <children xsi:type="basic:PartSashContainer" xmi:id="_DMpM9paZEeyiTd_tdcLiRw" containerData="7497">
+                <children xsi:type="basic:PartStack" xmi:id="_DMpM95aZEeyiTd_tdcLiRw" elementId="topLeft" containerData="5000" selectedElement="_DMpM-JaZEeyiTd_tdcLiRw">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_DMpM-JaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.navigator.ProjectExplorer" ref="_DMpNQpaZEeyiTd_tdcLiRw"/>
+                  <children xsi:type="advanced:Placeholder" xmi:id="_DMpM-ZaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.BookmarkView" toBeRendered="false" ref="_DMpNUZaZEeyiTd_tdcLiRw"/>
+                  <children xsi:type="advanced:Placeholder" xmi:id="_DMpM-paZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.ResourceNavigator" toBeRendered="false" ref="_DMpNSJaZEeyiTd_tdcLiRw"/>
+                  <children xsi:type="advanced:Placeholder" xmi:id="_DMpM-5aZEeyiTd_tdcLiRw" elementId="org.eclipse.team.ccvs.ui.RepositoriesView" toBeRendered="false" ref="_DMpNWpaZEeyiTd_tdcLiRw"/>
+                </children>
+                <children xsi:type="basic:PartStack" xmi:id="_DMpM_JaZEeyiTd_tdcLiRw" elementId="bottomLeft" containerData="5000" selectedElement="_DMpM_ZaZEeyiTd_tdcLiRw">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_DMpM_ZaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.ContentOutline" ref="_DMpNQ5aZEeyiTd_tdcLiRw"/>
+                  <children xsi:type="advanced:Placeholder" xmi:id="_DMpM_paZEeyiTd_tdcLiRw" elementId="org.eclipse.mylyn.tasks.ui.views.tasks" ref="_DMpNRJaZEeyiTd_tdcLiRw"/>
+                  <children xsi:type="advanced:Placeholder" xmi:id="_DMpM_5aZEeyiTd_tdcLiRw" elementId="org.eclipse.ant.ui.views.AntView" toBeRendered="false" ref="_DMpNVZaZEeyiTd_tdcLiRw"/>
+                </children>
+              </children>
+              <children xsi:type="basic:PartStack" xmi:id="_DMpNAJaZEeyiTd_tdcLiRw" elementId="stickyFolderRight" toBeRendered="false" visible="false" containerData="2503">
+                <children xsi:type="advanced:Placeholder" xmi:id="_DMpNAZaZEeyiTd_tdcLiRw" elementId="org.eclipse.help.ui.HelpView" toBeRendered="false" ref="_DMpNSpaZEeyiTd_tdcLiRw"/>
+                <children xsi:type="advanced:Placeholder" xmi:id="_DMpNApaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.internal.introview" toBeRendered="false" ref="_DMpNS5aZEeyiTd_tdcLiRw"/>
+                <children xsi:type="advanced:Placeholder" xmi:id="_DMpNA5aZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.cheatsheets.views.CheatSheetView" toBeRendered="false" ref="_DMpNTJaZEeyiTd_tdcLiRw"/>
+              </children>
+            </children>
+            <children xsi:type="basic:PartStack" xmi:id="_DMpNBJaZEeyiTd_tdcLiRw" elementId="bottomRight" selectedElement="_DMpNBZaZEeyiTd_tdcLiRw">
+              <children xsi:type="advanced:Placeholder" xmi:id="_DMpNBZaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.TaskList" ref="_DMpNRZaZEeyiTd_tdcLiRw"/>
+              <children xsi:type="advanced:Placeholder" xmi:id="_DMpNBpaZEeyiTd_tdcLiRw" elementId="org.eclipse.team.ui.GenericHistoryView" toBeRendered="false" ref="_DMpNW5aZEeyiTd_tdcLiRw"/>
+            </children>
+            <children xsi:type="advanced:Placeholder" xmi:id="_DMpNB5aZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.editorss" ref="_DMpNQJaZEeyiTd_tdcLiRw"/>
+          </children>
+        </children>
+        <children xsi:type="advanced:Perspective" xmi:id="_DMpNCJaZEeyiTd_tdcLiRw" elementId="org.eclipse.debug.ui.DebugPerspective" label="Debug">
+          <children xsi:type="basic:PartSashContainer" xmi:id="_DMpNCZaZEeyiTd_tdcLiRw" horizontal="true">
+            <children xsi:type="basic:PartSashContainer" xmi:id="_DMpNCpaZEeyiTd_tdcLiRw" horizontal="true">
+              <children xsi:type="basic:PartSashContainer" xmi:id="_DMpNC5aZEeyiTd_tdcLiRw" containerData="7498">
+                <children xsi:type="basic:PartSashContainer" xmi:id="_DMpNDJaZEeyiTd_tdcLiRw" containerData="7492">
+                  <children xsi:type="basic:PartSashContainer" xmi:id="_DMpNDZaZEeyiTd_tdcLiRw" containerData="4489" horizontal="true">
+                    <children xsi:type="basic:PartStack" xmi:id="_DMpNDpaZEeyiTd_tdcLiRw" elementId="org.eclipse.debug.internal.ui.NavigatorFolderView" containerData="4997" selectedElement="_DMpND5aZEeyiTd_tdcLiRw">
+                      <children xsi:type="advanced:Placeholder" xmi:id="_DMpND5aZEeyiTd_tdcLiRw" elementId="org.eclipse.debug.ui.DebugView" ref="_DMpNUJaZEeyiTd_tdcLiRw"/>
+                      <children xsi:type="advanced:Placeholder" xmi:id="_DMpNEJaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.ResourceNavigator" toBeRendered="false" ref="_DMpNSJaZEeyiTd_tdcLiRw"/>
+                      <children xsi:type="advanced:Placeholder" xmi:id="_DMpNEZaZEeyiTd_tdcLiRw" elementId="org.eclipse.jdt.ui.PackageExplorer" toBeRendered="false" ref="_DMpNRpaZEeyiTd_tdcLiRw"/>
+                      <children xsi:type="advanced:Placeholder" xmi:id="_DMpNEpaZEeyiTd_tdcLiRw" elementId="org.eclipse.jdt.ui.TypeHierarchy" toBeRendered="false" ref="_DMpNSZaZEeyiTd_tdcLiRw"/>
+                    </children>
+                    <children xsi:type="basic:PartStack" xmi:id="_DMpNE5aZEeyiTd_tdcLiRw" elementId="org.eclipse.debug.internal.ui.ToolsFolderView" containerData="5003" selectedElement="_DMpNFZaZEeyiTd_tdcLiRw">
+                      <children xsi:type="advanced:Placeholder" xmi:id="_DMpNFJaZEeyiTd_tdcLiRw" elementId="org.eclipse.debug.ui.VariableView" ref="_DMpNVpaZEeyiTd_tdcLiRw"/>
+                      <children xsi:type="advanced:Placeholder" xmi:id="_DMpNFZaZEeyiTd_tdcLiRw" elementId="org.eclipse.debug.ui.BreakpointView" ref="_DMpNV5aZEeyiTd_tdcLiRw"/>
+                      <children xsi:type="advanced:Placeholder" xmi:id="_DMpNFpaZEeyiTd_tdcLiRw" elementId="org.eclipse.debug.ui.ExpressionView" toBeRendered="false" ref="_DMpNWJaZEeyiTd_tdcLiRw"/>
+                      <children xsi:type="advanced:Placeholder" xmi:id="_DMpNF5aZEeyiTd_tdcLiRw" elementId="org.eclipse.debug.ui.RegisterView" toBeRendered="false" ref="_DMpNWZaZEeyiTd_tdcLiRw"/>
+                    </children>
+                  </children>
+                  <children xsi:type="basic:PartSashContainer" xmi:id="_DMpNGJaZEeyiTd_tdcLiRw" containerData="5511" horizontal="true">
+                    <children xsi:type="advanced:Placeholder" xmi:id="_DMpNGZaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.editorss" containerData="7498" ref="_DMpNQJaZEeyiTd_tdcLiRw"/>
+                    <children xsi:type="basic:PartStack" xmi:id="_DMpNGpaZEeyiTd_tdcLiRw" elementId="org.eclipse.debug.internal.ui.OutlineFolderView" containerData="2502" selectedElement="_DMpNG5aZEeyiTd_tdcLiRw">
+                      <children xsi:type="advanced:Placeholder" xmi:id="_DMpNG5aZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.ContentOutline" ref="_DMpNQ5aZEeyiTd_tdcLiRw"/>
+                      <children xsi:type="advanced:Placeholder" xmi:id="_DMpNHJaZEeyiTd_tdcLiRw" elementId="org.eclipse.ant.ui.views.AntView" toBeRendered="false" ref="_DMpNVZaZEeyiTd_tdcLiRw"/>
+                    </children>
+                  </children>
+                </children>
+                <children xsi:type="basic:PartStack" xmi:id="_DMpNHZaZEeyiTd_tdcLiRw" elementId="org.eclipse.debug.internal.ui.ConsoleFolderView" containerData="2508" selectedElement="_DMpNHpaZEeyiTd_tdcLiRw">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_DMpNHpaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.console.ConsoleView" ref="_DMpNT5aZEeyiTd_tdcLiRw"/>
+                  <children xsi:type="advanced:Placeholder" xmi:id="_DMpNH5aZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.TaskList" ref="_DMpNRZaZEeyiTd_tdcLiRw"/>
+                  <children xsi:type="advanced:Placeholder" xmi:id="_DMpNIJaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.BookmarkView" toBeRendered="false" ref="_DMpNUZaZEeyiTd_tdcLiRw"/>
+                  <children xsi:type="advanced:Placeholder" xmi:id="_DMpNIZaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.PropertySheet" toBeRendered="false" ref="_DMpNUpaZEeyiTd_tdcLiRw"/>
+                  <children xsi:type="advanced:Placeholder" xmi:id="_DMpNIpaZEeyiTd_tdcLiRw" elementId="org.eclipse.jdt.debug.ui.DisplayView" toBeRendered="false" ref="_DMpNU5aZEeyiTd_tdcLiRw"/>
+                  <children xsi:type="advanced:Placeholder" xmi:id="_DMpNI5aZEeyiTd_tdcLiRw" elementId="org.eclipse.search.SearchResultView" toBeRendered="false" ref="_DMpNVJaZEeyiTd_tdcLiRw"/>
+                </children>
+              </children>
+              <children xsi:type="basic:PartStack" xmi:id="_DMpNJJaZEeyiTd_tdcLiRw" elementId="stickyFolderRight" toBeRendered="false" visible="false" containerData="2502">
+                <children xsi:type="advanced:Placeholder" xmi:id="_DMpNJZaZEeyiTd_tdcLiRw" elementId="org.eclipse.help.ui.HelpView" toBeRendered="false" ref="_DMpNSpaZEeyiTd_tdcLiRw"/>
+                <children xsi:type="advanced:Placeholder" xmi:id="_DMpNJpaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.internal.introview" toBeRendered="false" ref="_DMpNS5aZEeyiTd_tdcLiRw"/>
+                <children xsi:type="advanced:Placeholder" xmi:id="_DMpNJ5aZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.cheatsheets.views.CheatSheetView" toBeRendered="false" ref="_DMpNTJaZEeyiTd_tdcLiRw"/>
+              </children>
+            </children>
+          </children>
+        </children>
+        <children xsi:type="advanced:Perspective" xmi:id="_DMpNKJaZEeyiTd_tdcLiRw" elementId="org.eclipse.pde.ui.PDEPerspective" label="Plug-in Development">
+          <children xsi:type="basic:PartSashContainer" xmi:id="_DMpNKZaZEeyiTd_tdcLiRw" horizontal="true">
+            <children xsi:type="basic:PartSashContainer" xmi:id="_DMpNKpaZEeyiTd_tdcLiRw" horizontal="true">
+              <children xsi:type="basic:PartSashContainer" xmi:id="_DMpNK5aZEeyiTd_tdcLiRw" containerData="7495" horizontal="true">
+                <children xsi:type="basic:PartStack" xmi:id="_DMpNLJaZEeyiTd_tdcLiRw" elementId="topLeft" containerData="2235" selectedElement="_DMpNLZaZEeyiTd_tdcLiRw">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_DMpNLZaZEeyiTd_tdcLiRw" elementId="org.eclipse.jdt.ui.PackageExplorer" ref="_DMpNRpaZEeyiTd_tdcLiRw"/>
+                  <children xsi:type="advanced:Placeholder" xmi:id="_DMpNLpaZEeyiTd_tdcLiRw" elementId="org.eclipse.pde.ui.PluginsView" ref="_DMpNR5aZEeyiTd_tdcLiRw"/>
+                  <children xsi:type="advanced:Placeholder" xmi:id="_DMpNL5aZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.ResourceNavigator" toBeRendered="false" ref="_DMpNSJaZEeyiTd_tdcLiRw"/>
+                  <children xsi:type="advanced:Placeholder" xmi:id="_DMpNMJaZEeyiTd_tdcLiRw" elementId="org.eclipse.jdt.ui.TypeHierarchy" toBeRendered="false" ref="_DMpNSZaZEeyiTd_tdcLiRw"/>
+                </children>
+                <children xsi:type="basic:PartSashContainer" xmi:id="_DMpNMZaZEeyiTd_tdcLiRw" containerData="7765">
+                  <children xsi:type="basic:PartSashContainer" xmi:id="_DMpNMpaZEeyiTd_tdcLiRw" containerData="6666" horizontal="true">
+                    <children xsi:type="advanced:Placeholder" xmi:id="_DMpNM5aZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.editorss" containerData="7493" ref="_DMpNQJaZEeyiTd_tdcLiRw"/>
+                    <children xsi:type="basic:PartStack" xmi:id="_DMpNNJaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.internal.ViewStack@4441d567" containerData="2507" selectedElement="_DMpNNpaZEeyiTd_tdcLiRw">
+                      <children xsi:type="advanced:Placeholder" xmi:id="_DMpNNZaZEeyiTd_tdcLiRw" elementId="org.eclipse.mylyn.tasks.ui.views.tasks" ref="_DMpNRJaZEeyiTd_tdcLiRw"/>
+                      <children xsi:type="advanced:Placeholder" xmi:id="_DMpNNpaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.ContentOutline" ref="_DMpNQ5aZEeyiTd_tdcLiRw"/>
+                    </children>
+                  </children>
+                  <children xsi:type="basic:PartStack" xmi:id="_DMpNN5aZEeyiTd_tdcLiRw" elementId="bottomRight" containerData="3334" selectedElement="_DMpNO5aZEeyiTd_tdcLiRw">
+                    <children xsi:type="advanced:Placeholder" xmi:id="_DMpNOJaZEeyiTd_tdcLiRw" elementId="org.eclipse.pde.runtime.LogView" ref="_DMpNTZaZEeyiTd_tdcLiRw"/>
+                    <children xsi:type="advanced:Placeholder" xmi:id="_DMpNOZaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.TaskList" ref="_DMpNRZaZEeyiTd_tdcLiRw"/>
+                    <children xsi:type="advanced:Placeholder" xmi:id="_DMpNOpaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.ProblemView" ref="_DMpNTpaZEeyiTd_tdcLiRw"/>
+                    <children xsi:type="advanced:Placeholder" xmi:id="_DMpNO5aZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.console.ConsoleView" ref="_DMpNT5aZEeyiTd_tdcLiRw"/>
+                  </children>
+                </children>
+              </children>
+              <children xsi:type="basic:PartStack" xmi:id="_DMpNPJaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.internal.ViewStack@3e4f80cb" toBeRendered="false" visible="false" containerData="2505">
+                <children xsi:type="advanced:Placeholder" xmi:id="_DMpNPZaZEeyiTd_tdcLiRw" elementId="org.eclipse.help.ui.HelpView" toBeRendered="false" ref="_DMpNSpaZEeyiTd_tdcLiRw"/>
+                <children xsi:type="advanced:Placeholder" xmi:id="_DMpNPpaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.internal.introview" toBeRendered="false" ref="_DMpNS5aZEeyiTd_tdcLiRw"/>
+                <children xsi:type="advanced:Placeholder" xmi:id="_DMpNP5aZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.cheatsheets.views.CheatSheetView" toBeRendered="false" ref="_DMpNTJaZEeyiTd_tdcLiRw"/>
+              </children>
+            </children>
+          </children>
+        </children>
+      </children>
+    </children>
+    <sharedElements xsi:type="advanced:Area" xmi:id="_DMpNQJaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.editorss">
+      <children xsi:type="basic:PartStack" xmi:id="_DMpNQZaZEeyiTd_tdcLiRw" elementId="org.eclipse.e4.primaryDataStack">
+        <tags>org.eclipse.e4.primaryDataStack</tags>
+        <tags>EditorStack</tags>
+      </children>
+    </sharedElements>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNQpaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.navigator.ProjectExplorer" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Project Explorer"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNQ5aZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.ContentOutline" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Outline"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNRJaZEeyiTd_tdcLiRw" elementId="org.eclipse.mylyn.tasks.ui.views.tasks" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Task List"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNRZaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.TaskList" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Tasks"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNRpaZEeyiTd_tdcLiRw" elementId="org.eclipse.jdt.ui.PackageExplorer" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.jdt.ui.PackageExplorer"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNR5aZEeyiTd_tdcLiRw" elementId="org.eclipse.pde.ui.PluginsView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.pde.ui.PluginsView"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNSJaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.ResourceNavigator" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.ui.views.ResourceNavigator"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNSZaZEeyiTd_tdcLiRw" elementId="org.eclipse.jdt.ui.TypeHierarchy" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.jdt.ui.TypeHierarchy"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNSpaZEeyiTd_tdcLiRw" elementId="org.eclipse.help.ui.HelpView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.help.ui.HelpView"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNS5aZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.internal.introview" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.ui.internal.introview"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNTJaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.cheatsheets.views.CheatSheetView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.ui.cheatsheets.views.CheatSheetView"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNTZaZEeyiTd_tdcLiRw" elementId="org.eclipse.pde.runtime.LogView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.pde.runtime.LogView"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNTpaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.ProblemView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.ui.views.ProblemView"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNT5aZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.console.ConsoleView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.ui.console.ConsoleView"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNUJaZEeyiTd_tdcLiRw" elementId="org.eclipse.debug.ui.DebugView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.debug.ui.DebugView"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNUZaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.BookmarkView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.ui.views.BookmarkView"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNUpaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.views.PropertySheet" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.ui.views.PropertySheet"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNU5aZEeyiTd_tdcLiRw" elementId="org.eclipse.jdt.debug.ui.DisplayView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.jdt.debug.ui.DisplayView"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNVJaZEeyiTd_tdcLiRw" elementId="org.eclipse.search.SearchResultView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.search.SearchResultView"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNVZaZEeyiTd_tdcLiRw" elementId="org.eclipse.ant.ui.views.AntView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.ant.ui.views.AntView"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNVpaZEeyiTd_tdcLiRw" elementId="org.eclipse.debug.ui.VariableView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.debug.ui.VariableView"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNV5aZEeyiTd_tdcLiRw" elementId="org.eclipse.debug.ui.BreakpointView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.debug.ui.BreakpointView"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNWJaZEeyiTd_tdcLiRw" elementId="org.eclipse.debug.ui.ExpressionView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.debug.ui.ExpressionView"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNWZaZEeyiTd_tdcLiRw" elementId="org.eclipse.debug.ui.RegisterView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.debug.ui.RegisterView"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNWpaZEeyiTd_tdcLiRw" elementId="org.eclipse.team.ccvs.ui.RepositoriesView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.team.ccvs.ui.RepositoriesView"/>
+    <sharedElements xsi:type="basic:Part" xmi:id="_DMpNW5aZEeyiTd_tdcLiRw" elementId="org.eclipse.team.ui.GenericHistoryView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="fakeorg.eclipse.team.ui.GenericHistoryView"/>
+  </children>
+  <addons xmi:id="_DMpNXJaZEeyiTd_tdcLiRw" elementId="org.eclipse.e4.core.commands.service" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"/>
+  <addons xmi:id="_DMpNXZaZEeyiTd_tdcLiRw" elementId="org.eclipse.e4.ui.contexts.service" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"/>
+  <addons xmi:id="_DMp0AJaZEeyiTd_tdcLiRw" elementId="org.eclipse.e4.ui.bindings.service" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon"/>
+  <addons xmi:id="_DMp0AZaZEeyiTd_tdcLiRw" elementId="org.eclipse.e4.ui.workbench.commands.model" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon"/>
+  <addons xmi:id="_DMp0ApaZEeyiTd_tdcLiRw" elementId="org.eclipse.e4.ui.workbench.contexts.model" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon"/>
+  <addons xmi:id="_DMp0A5aZEeyiTd_tdcLiRw" elementId="org.eclipse.e4.ui.workbench.bindings.model" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon"/>
+  <addons xmi:id="_DMp0BJaZEeyiTd_tdcLiRw" elementId="Cleanup Addon" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.cleanupaddon.CleanupAddon"/>
+  <addons xmi:id="_DMp0BZaZEeyiTd_tdcLiRw" elementId="DnD Addon" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.dndaddon.DnDAddon"/>
+  <addons xmi:id="_DMp0BpaZEeyiTd_tdcLiRw" elementId="MinMax Addon" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.MinMaxAddon"/>
+  <addons xmi:id="_DMp0B5aZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.workbench.addon.0" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"/>
+  <addons xmi:id="_DMp0CJaZEeyiTd_tdcLiRw" elementId="SplitterAddon" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.splitteraddon.SplitterAddon"/>
+  <addons xmi:id="_DMp0CZaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.ide.addon.0" contributionURI="bundleclass://org.eclipse.ui.ide/org.eclipse.ui.internal.ide.addons.SaveAllDirtyPartsAddon"/>
+  <addons xmi:id="_DMp0CpaZEeyiTd_tdcLiRw" elementId="org.eclipse.ui.ide.application.addon.0" contributorURI="platform:/plugin/org.eclipse.ui.ide.application" contributionURI="bundleclass://org.eclipse.ui.ide.application/org.eclipse.ui.internal.ide.application.addons.ModelCleanupAddon"/>
+</application:Application>
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/perspective_3x.xml b/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/perspective_3x.xml
new file mode 100644
index 0000000000..1dd204ca15
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/perspective_3x.xml
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workbench version="2.0">
+    <window>
+        <page focus="true" label="Workspace - ResourceExport">
+            <editors>
+                <editorArea activeWorkbook="DefaultEditorWorkbook">
+                    <info part="DefaultEditorWorkbook">
+                        <folder appearance="1" expanded="2">
+                            <presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory" />
+                        </folder>
+                    </info>
+                </editorArea>
+            </editors>
+            <views>
+                <view id="org.eclipse.ui.navigator.ProjectExplorer" partName="Project Explorer" />
+                <view id="org.eclipse.ui.views.ContentOutline" partName="Outline" />
+                <view id="org.eclipse.mylyn.tasks.ui.views.tasks" partName="Task List" />
+                <view id="org.eclipse.ui.views.TaskList" partName="Tasks" />
+            </views>
+            <perspectives activePart="org.eclipse.ui.views.TaskList" activePerspective="ResourceExport">
+                <perspective editorAreaTrimState="2" editorAreaVisible="1" fixed="0" version="0.016">
+                    <descriptor class="org.eclipse.pde.internal.ui.PDEPerspective" id="org.eclipse.pde.ui.PDEPerspective" label="Plug-in Development" />
+                    <alwaysOnActionSet id="org.eclipse.mylyn.context.ui.actionSet" />
+                    <alwaysOnActionSet id="org.eclipse.mylyn.doc.actionSet" />
+                    <alwaysOnActionSet id="org.eclipse.mylyn.tasks.ui.navigation" />
+                    <alwaysOnActionSet id="org.eclipse.ui.cheatsheets.actionSet" />
+                    <alwaysOnActionSet id="org.eclipse.search.searchActionSet" />
+                    <alwaysOnActionSet id="org.eclipse.ui.edit.text.actionSet.annotationNavigation" />
+                    <alwaysOnActionSet id="org.eclipse.ui.edit.text.actionSet.navigation" />
+                    <alwaysOnActionSet id="org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo" />
+                    <alwaysOnActionSet id="org.eclipse.ui.externaltools.ExternalToolsSet" />
+                    <alwaysOnActionSet id="org.eclipse.ui.actionSet.keyBindings" />
+                    <alwaysOnActionSet id="org.eclipse.ui.actionSet.openFiles" />
+                    <alwaysOnActionSet id="org.eclipse.debug.ui.breakpointActionSet" />
+                    <alwaysOnActionSet id="org.eclipse.jdt.ui.JavaElementCreationActionSet" />
+                    <alwaysOnActionSet id="org.eclipse.debug.ui.launchActionSet" />
+                    <alwaysOnActionSet id="org.eclipse.debug.ui.debugActionSet" />
+                    <alwaysOnActionSet id="org.eclipse.jdt.ui.JavaActionSet" />
+                    <show_view_action id="org.eclipse.mylyn.tasks.ui.views.tasks" />
+                    <show_view_action id="org.eclipse.jdt.ui.PackagesView" />
+                    <show_view_action id="org.eclipse.pde.ui.PluginsView" />
+                    <show_view_action id="org.eclipse.ui.navigator.ProjectExplorer" />
+                    <show_view_action id="org.eclipse.ui.views.ProblemView" />
+                    <show_view_action id="org.eclipse.ui.views.TaskList" />
+                    <show_view_action id="org.eclipse.ui.views.ContentOutline" />
+                    <show_view_action id="org.eclipse.pde.runtime.LogView" />
+                    <new_wizard_action id="org.eclipse.pde.ui.NewProjectWizard" />
+                    <new_wizard_action id="org.eclipse.pde.ui.NewFeatureProjectWizard" />
+                    <new_wizard_action id="org.eclipse.mylyn.tasks.ui.wizards.new.repository.task" />
+                    <new_wizard_action id="org.eclipse.pde.ds.ui.wizard" />
+                    <new_wizard_action id="org.eclipse.pde.ui.NewProductConfigurationWizard" />
+                    <new_wizard_action id="org.eclipse.pde.ui.NewProfileWizard" />
+                    <new_wizard_action id="org.eclipse.jdt.ui.wizards.NewPackageCreationWizard" />
+                    <new_wizard_action id="org.eclipse.jdt.ui.wizards.NewClassCreationWizard" />
+                    <new_wizard_action id="org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard" />
+                    <new_wizard_action id="org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard" />
+                    <new_wizard_action id="org.eclipse.ui.wizards.new.file" />
+                    <new_wizard_action id="org.eclipse.ui.wizards.new.folder" />
+                    <perspective_action id="org.eclipse.ui.resourcePerspective" />
+                    <perspective_action id="org.eclipse.jdt.ui.JavaPerspective" />
+                    <perspective_action id="org.eclipse.debug.ui.DebugPerspective" />
+                    <hide_toolbar_item_id id="org.eclipse.jdt.ui.actions.OpenProjectWizard" />
+                    <hide_toolbar_item_id id="org.eclipse.ui.edit.text.toggleShowSelectedElementOnly" />
+                    <view id="org.eclipse.jdt.ui.PackageExplorer" />
+                    <view id="org.eclipse.pde.ui.PluginsView" />
+                    <view id="org.eclipse.pde.runtime.LogView" />
+                    <view id="org.eclipse.ui.views.TaskList" />
+                    <view id="org.eclipse.ui.views.ProblemView" />
+                    <view id="org.eclipse.ui.console.ConsoleView" />
+                    <view id="org.eclipse.mylyn.tasks.ui.views.tasks" />
+                    <view id="org.eclipse.ui.views.ContentOutline" />
+                    <fastViewBars />
+                    <layout>
+                        &#x0A;
+                        <mainWindow>
+                            &#x0A;
+                            <info folder="true" part="topLeft">
+                                &#x0A;
+                                <folder activePageID="org.eclipse.jdt.ui.PackageExplorer" appearance="2" expanded="2">
+                                    &#x0A;
+                                    <page content="org.eclipse.jdt.ui.PackageExplorer" label="Package Explorer" />
+                                    <page content="org.eclipse.pde.ui.PluginsView" label="Plug-ins" />
+                                    <page content="org.eclipse.ui.views.ResourceNavigator" label="LabelNotFound" />
+                                    <page content="org.eclipse.jdt.ui.TypeHierarchy" label="LabelNotFound" />
+                                    <presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory">
+                                        &#x0A;
+                                        <part id="0" />
+                                        <part id="1" />
+                                    </presentation>
+                                </folder>
+                            </info>
+                            <info folder="true" part="org.eclipse.ui.internal.ViewStack@3e4f80cb" ratio="0.7495049" ratioLeft="757" ratioRight="253" relationship="2" relative="topLeft">
+                                &#x0A;
+                                <folder appearance="2" expanded="2">
+                                    &#x0A;
+                                    <page content="org.eclipse.help.ui.HelpView" label="LabelNotFound" />
+                                    <page content="org.eclipse.ui.internal.introview" label="LabelNotFound" />
+                                    <page content="org.eclipse.ui.cheatsheets.views.CheatSheetView" label="LabelNotFound" />
+                                    <presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory" />
+                                </folder>
+                            </info>
+                            <info part="org.eclipse.ui.editorss" ratio="0.22354212" ratioLeft="414" ratioRight="1438" relationship="2" relative="topLeft" />
+                            <info folder="true" part="bottomRight" ratio="0.6666667" ratioLeft="632" ratioRight="316" relationship="4" relative="org.eclipse.ui.editorss">
+                                &#x0A;
+                                <folder activePageID="org.eclipse.ui.console.ConsoleView" appearance="2" expanded="2">
+                                    &#x0A;
+                                    <page content="org.eclipse.pde.runtime.LogView" label="Error Log" />
+                                    <page content="org.eclipse.ui.views.TaskList" label="Tasks" />
+                                    <page content="org.eclipse.ui.views.ProblemView" label="Problems" />
+                                    <page content="org.eclipse.ui.console.ConsoleView" label="Console" />
+                                    <presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory">
+                                        &#x0A;
+                                        <part id="0" />
+                                        <part id="1" />
+                                        <part id="2" />
+                                        <part id="3" />
+                                    </presentation>
+                                </folder>
+                            </info>
+                            <info folder="true" part="org.eclipse.ui.internal.ViewStack@4441d567" ratio="0.74934036" ratioLeft="568" ratioRight="190" relationship="2" relative="org.eclipse.ui.editorss">
+                                &#x0A;
+                                <folder activePageID="org.eclipse.ui.views.ContentOutline" appearance="2" expanded="2">
+                                    &#x0A;
+                                    <page content="org.eclipse.mylyn.tasks.ui.views.tasks" label="Task List" />
+                                    <page content="org.eclipse.ui.views.ContentOutline" label="Outline" />
+                                    <presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory">
+                                        &#x0A;
+                                        <part id="1" />
+                                        <part id="0" />
+                                    </presentation>
+                                </folder>
+                            </info>
+                            <info part="org.eclipse.egit.ui.RepositoriesView" ratio="0.5993976" ratioLeft="398" ratioRight="266" relationship="4" relative="topLeft" />
+                        </mainWindow>
+                    </layout>
+                </perspective>
+                <perspective editorAreaTrimState="2" editorAreaVisible="1" fixed="0" version="0.016">
+                    <descriptor class="org.eclipse.debug.internal.ui.DebugPerspectiveFactory" id="org.eclipse.debug.ui.DebugPerspective" label="Debug" />
+                    <alwaysOnActionSet id="org.eclipse.mylyn.context.ui.actionSet" />
+                    <alwaysOnActionSet id="org.eclipse.mylyn.doc.actionSet" />
+                    <alwaysOnActionSet id="org.eclipse.mylyn.tasks.ui.navigation" />
+                    <alwaysOnActionSet id="org.eclipse.ui.cheatsheets.actionSet" />
+                    <alwaysOnActionSet id="org.eclipse.search.searchActionSet" />
+                    <alwaysOnActionSet id="org.eclipse.ui.edit.text.actionSet.annotationNavigation" />
+                    <alwaysOnActionSet id="org.eclipse.ui.edit.text.actionSet.navigation" />
+                    <alwaysOnActionSet id="org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo" />
+                    <alwaysOnActionSet id="org.eclipse.ui.externaltools.ExternalToolsSet" />
+                    <alwaysOnActionSet id="org.eclipse.ui.actionSet.keyBindings" />
+                    <alwaysOnActionSet id="org.eclipse.ui.actionSet.openFiles" />
+                    <alwaysOnActionSet id="org.eclipse.debug.ui.launchActionSet" />
+                    <alwaysOnActionSet id="org.eclipse.ui.NavigateActionSet" />
+                    <alwaysOnActionSet id="org.eclipse.debug.ui.breakpointActionSet" />
+                    <alwaysOnActionSet id="org.eclipse.jdt.debug.ui.JDTDebugActionSet" />
+                    <alwaysOnActionSet id="org.eclipse.jdt.ui.JavaActionSet" />
+                    <alwaysOnActionSet id="org.eclipse.debug.ui.debugActionSet" />
+                    <show_view_action id="org.eclipse.debug.ui.DebugView" />
+                    <show_view_action id="org.eclipse.debug.ui.VariableView" />
+                    <show_view_action id="org.eclipse.debug.ui.BreakpointView" />
+                    <show_view_action id="org.eclipse.debug.ui.ExpressionView" />
+                    <show_view_action id="org.eclipse.ui.views.ContentOutline" />
+                    <show_view_action id="org.eclipse.ui.console.ConsoleView" />
+                    <show_view_action id="org.eclipse.ui.views.TaskList" />
+                    <show_view_action id="org.eclipse.ant.ui.views.AntView" />
+                    <show_view_action id="org.eclipse.pde.runtime.LogView" />
+                    <show_view_action id="org.eclipse.jdt.debug.ui.DisplayView" />
+                    <perspective_action id="org.eclipse.jdt.ui.JavaPerspective" />
+                    <perspective_action id="org.eclipse.jdt.ui.JavaBrowsingPerspective" />
+                    <perspective_action id="org.eclipse.wst.xml.ui.perspective" />
+                    <hide_toolbar_item_id id="org.eclipse.ui.edit.text.toggleShowSelectedElementOnly" />
+                    <hide_toolbar_item_id id="org.eclipse.jdt.ui.actions.OpenProjectWizard" />
+                    <view id="org.eclipse.ui.console.ConsoleView" />
+                    <view id="org.eclipse.ui.views.TaskList" />
+                    <view id="org.eclipse.debug.ui.DebugView" />
+                    <view id="org.eclipse.debug.ui.VariableView" />
+                    <view id="org.eclipse.debug.ui.BreakpointView" />
+                    <view id="org.eclipse.ui.views.ContentOutline" />
+                    <fastViewBars />
+                    <layout>
+                        &#x0A;
+                        <mainWindow>
+                            &#x0A;
+                            <info folder="true" part="org.eclipse.debug.internal.ui.NavigatorFolderView">
+                                &#x0A;
+                                <folder activePageID="org.eclipse.debug.ui.DebugView" appearance="2" expanded="2">
+                                    &#x0A;
+                                    <page content="org.eclipse.debug.ui.DebugView" label="Debug" />
+                                    <page content="org.eclipse.ui.views.ResourceNavigator" label="LabelNotFound" />
+                                    <page content="org.eclipse.jdt.ui.PackageExplorer" label="LabelNotFound" />
+                                    <page content="org.eclipse.jdt.ui.TypeHierarchy" label="LabelNotFound" />
+                                    <presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory">
+                                        &#x0A;
+                                        <part id="0" />
+                                    </presentation>
+                                </folder>
+                            </info>
+                            <info folder="true" part="stickyFolderRight" ratio="0.74986523" ratioLeft="1391" ratioRight="464" relationship="2" relative="org.eclipse.debug.internal.ui.NavigatorFolderView">
+                                &#x0A;
+                                <folder appearance="2" expanded="2">
+                                    &#x0A;
+                                    <page content="org.eclipse.help.ui.HelpView" label="LabelNotFound" />
+                                    <page content="org.eclipse.ui.internal.introview" label="LabelNotFound" />
+                                    <page content="org.eclipse.ui.cheatsheets.views.CheatSheetView" label="LabelNotFound" />
+                                </folder>
+                            </info>
+                            <info folder="true" part="org.eclipse.debug.internal.ui.ConsoleFolderView" ratio="0.74923545" ratioLeft="735" ratioRight="246" relationship="4" relative="org.eclipse.debug.internal.ui.NavigatorFolderView">
+                                &#x0A;
+                                <folder activePageID="org.eclipse.ui.console.ConsoleView" appearance="2" expanded="2">
+                                    &#x0A;
+                                    <page content="org.eclipse.ui.console.ConsoleView" label="Console" />
+                                    <page content="org.eclipse.ui.views.TaskList" label="Tasks" />
+                                    <page content="org.eclipse.ui.views.BookmarkView" label="LabelNotFound" />
+                                    <page content="org.eclipse.ui.views.PropertySheet" label="LabelNotFound" />
+                                    <page content="org.eclipse.jdt.debug.ui.DisplayView" label="LabelNotFound" />
+                                    <page content="org.eclipse.search.SearchResultView" label="LabelNotFound" />
+                                    <presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory">
+                                        &#x0A;
+                                        <part id="0" />
+                                        <part id="1" />
+                                    </presentation>
+                                </folder>
+                            </info>
+                            <info part="org.eclipse.ui.editorss" ratio="0.4489796" ratioLeft="330" ratioRight="405" relationship="4" relative="org.eclipse.debug.internal.ui.NavigatorFolderView" />
+                            <info folder="true" part="org.eclipse.debug.internal.ui.OutlineFolderView" ratio="0.74986523" ratioLeft="1391" ratioRight="464" relationship="2" relative="org.eclipse.ui.editorss">
+                                &#x0A;
+                                <folder activePageID="org.eclipse.ui.views.ContentOutline" appearance="2" expanded="2">
+                                    &#x0A;
+                                    <page content="org.eclipse.ui.views.ContentOutline" label="Outline" />
+                                    <page content="org.eclipse.ant.ui.views.AntView" label="LabelNotFound" />
+                                    <presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory">
+                                        &#x0A;
+                                        <part id="0" />
+                                    </presentation>
+                                </folder>
+                            </info>
+                            <info folder="true" part="org.eclipse.debug.internal.ui.ToolsFolderView" ratio="0.49973047" ratioLeft="927" ratioRight="928" relationship="2" relative="org.eclipse.debug.internal.ui.NavigatorFolderView">
+                                &#x0A;
+                                <folder activePageID="org.eclipse.debug.ui.BreakpointView" appearance="2" expanded="2">
+                                    &#x0A;
+                                    <page content="org.eclipse.debug.ui.VariableView" label="Variables" />
+                                    <page content="org.eclipse.debug.ui.BreakpointView" label="Breakpoints" />
+                                    <page content="org.eclipse.debug.ui.ExpressionView" label="LabelNotFound" />
+                                    <page content="org.eclipse.debug.ui.RegisterView" label="LabelNotFound" />
+                                    <presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory">
+                                        &#x0A;
+                                        <part id="0" />
+                                        <part id="1" />
+                                    </presentation>
+                                </folder>
+                            </info>
+                        </mainWindow>
+                    </layout>
+                </perspective>
+                <perspective editorAreaTrimState="2" editorAreaVisible="1" fixed="0" version="0.016">
+                    <descriptor descriptor="org.eclipse.ui.resourcePerspective" id="ResourceExport" label="ResourceExport" />
+                    <alwaysOnActionSet id="org.eclipse.mylyn.context.ui.actionSet" />
+                    <alwaysOnActionSet id="org.eclipse.mylyn.doc.actionSet" />
+                    <alwaysOnActionSet id="org.eclipse.mylyn.tasks.ui.navigation" />
+                    <alwaysOnActionSet id="org.eclipse.ui.cheatsheets.actionSet" />
+                    <alwaysOnActionSet id="org.eclipse.search.searchActionSet" />
+                    <alwaysOnActionSet id="org.eclipse.ui.edit.text.actionSet.annotationNavigation" />
+                    <alwaysOnActionSet id="org.eclipse.ui.edit.text.actionSet.navigation" />
+                    <alwaysOnActionSet id="org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo" />
+                    <alwaysOnActionSet id="org.eclipse.ui.externaltools.ExternalToolsSet" />
+                    <alwaysOnActionSet id="org.eclipse.ui.actionSet.keyBindings" />
+                    <alwaysOnActionSet id="org.eclipse.ui.actionSet.openFiles" />
+                    <alwaysOnActionSet id="org.eclipse.ui.NavigateActionSet" />
+                    <show_view_action id="org.eclipse.ui.navigator.ProjectExplorer" />
+                    <show_view_action id="org.eclipse.ui.views.BookmarkView" />
+                    <show_view_action id="org.eclipse.ui.views.ContentOutline" />
+                    <show_view_action id="org.eclipse.ui.views.PropertySheet" />
+                    <show_view_action id="org.eclipse.ui.views.ProblemView" />
+                    <show_view_action id="org.eclipse.ui.views.ProgressView" />
+                    <show_view_action id="org.eclipse.ui.views.TaskList" />
+                    <show_view_action id="org.eclipse.ant.ui.views.AntView" />
+                    <show_view_action id="org.eclipse.mylyn.tasks.ui.views.tasks" />
+                    <show_view_action id="org.eclipse.pde.runtime.LogView" />
+                    <new_wizard_action id="org.eclipse.ui.wizards.new.folder" />
+                    <new_wizard_action id="org.eclipse.ui.wizards.new.file" />
+                    <new_wizard_action id="org.eclipse.mylyn.tasks.ui.wizards.new.repository.task" />
+                    <new_wizard_action id="org.eclipse.ui.editors.wizards.UntitledTextFileWizard" />
+                    <perspective_action id="org.eclipse.jdt.ui.JavaPerspective" />
+                    <perspective_action id="org.eclipse.jdt.ui.JavaBrowsingPerspective" />
+                    <perspective_action id="org.eclipse.team.cvs.ui.cvsPerspective" />
+                    <perspective_action id="org.eclipse.team.ui.TeamSynchronizingPerspective" />
+                    <perspective_action id="org.eclipse.wst.xml.ui.perspective" />
+                    <hide_toolbar_item_id id="org.eclipse.jdt.ui.actions.OpenProjectWizard" />
+                    <hide_toolbar_item_id id="org.eclipse.ui.edit.text.toggleShowSelectedElementOnly" />
+                    <view id="org.eclipse.ui.navigator.ProjectExplorer" />
+                    <view id="org.eclipse.ui.views.ContentOutline" />
+                    <view id="org.eclipse.mylyn.tasks.ui.views.tasks" />
+                    <view id="org.eclipse.ui.views.TaskList" />
+                    <fastViewBars />
+                    <layout>
+                        <mainWindow>
+                            <info folder="true" part="topLeft">
+                                <folder activePageID="org.eclipse.ui.navigator.ProjectExplorer" appearance="2" expanded="2">
+                                    <page content="org.eclipse.ui.navigator.ProjectExplorer" label="Project Explorer" />
+                                    <page content="org.eclipse.ui.views.BookmarkView" label="LabelNotFound" />
+                                    <page content="org.eclipse.ui.views.ResourceNavigator" label="LabelNotFound" />
+                                    <page content="org.eclipse.team.ccvs.ui.RepositoriesView" label="LabelNotFound" />
+                                    <presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory">
+                                        <part id="0" />
+                                    </presentation>
+                                </folder>
+                            </info>
+                            <info folder="true" part="stickyFolderRight" ratio="0.74979985" ratioLeft="1873" ratioRight="625" relationship="2" relative="topLeft">
+                                <folder appearance="2" expanded="2">
+                                    <page content="org.eclipse.help.ui.HelpView" label="LabelNotFound" />
+                                    <page content="org.eclipse.ui.internal.introview" label="LabelNotFound" />
+                                    <page content="org.eclipse.ui.cheatsheets.views.CheatSheetView" label="LabelNotFound" />
+                                </folder>
+                            </info>
+                            <info part="org.eclipse.gef.ui.palette_view" ratio="0.25980785" ratioLeft="649" ratioRight="1849" relationship="2" relative="topLeft" />
+                            <info folder="true" part="bottomRight" ratio="0.6598101" ratioLeft="834" ratioRight="430" relationship="4" relative="org.eclipse.gef.ui.palette_view">
+                                <folder activePageID="org.eclipse.ui.views.TaskList" appearance="2" expanded="2">
+                                    <page content="org.eclipse.ui.views.TaskList" label="Tasks" />
+                                    <page content="org.eclipse.team.ui.GenericHistoryView" label="LabelNotFound" />
+                                    <presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory">
+                                        <part id="0" />
+                                    </presentation>
+                                </folder>
+                            </info>
+                            <info part="org.eclipse.ui.editorss" ratio="0.1595457" ratioLeft="295" ratioRight="1554" relationship="2" relative="org.eclipse.gef.ui.palette_view" />
+                            <info folder="true" part="bottomLeft" ratio="0.5" ratioLeft="632" ratioRight="632" relationship="4" relative="topLeft">
+                                <folder activePageID="org.eclipse.ui.views.ContentOutline" appearance="2" expanded="2">
+                                    <page content="org.eclipse.ui.views.ContentOutline" label="Outline" />
+                                    <page content="org.eclipse.mylyn.tasks.ui.views.tasks" label="Task List" />
+                                    <page content="org.eclipse.ant.ui.views.AntView" label="LabelNotFound" />
+                                    <presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory">
+                                        <part id="0" />
+                                        <part id="1" />
+                                    </presentation>
+                                </folder>
+                            </info>
+                        </mainWindow>
+                    </layout>
+                </perspective>
+            </perspectives>
+            <input factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/" type="8" />
+        </page>
+    </window>
+</workbench>
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java b/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java
new file mode 100644
index 0000000000..201edb7fc5
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java
@@ -0,0 +1,127 @@
+/*******************************************************************************
+ * Copyright (c) 2022 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compatibility.migration.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Paths;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import org.eclipse.e4.tools.compatibility.migration.tests.util.TestWorkbenchAdvisor;
+import org.eclipse.e4.tools.internal.compatibiliy.migration.E4MigrationTool;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindowElement;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.WorkbenchException;
+import org.eclipse.ui.XMLMemento;
+import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+
+class E4MigrationToolTest {
+
+	private Display display = null;
+
+	@BeforeEach
+	void setUp() throws Exception {
+		display = PlatformUI.createDisplay();
+
+	}
+
+	@AfterEach
+	void tearDown() throws Exception {
+		display.dispose();
+	}
+
+
+	@Test
+	void testConvert() throws FileNotFoundException, IOException, WorkbenchException, InterruptedException, ExecutionException {
+
+		IMemento memento;
+		try (FileInputStream input = new FileInputStream(
+				Paths.get("resources/perspective_3x.xml").toAbsolutePath().toString())) {
+			BufferedReader reader = new BufferedReader(new InputStreamReader(input, "utf-8")); //$NON-NLS-1$
+			memento = XMLMemento.createReadRoot(reader);
+		}
+
+		CompletableFuture<MApplication> future = new CompletableFuture<>();
+		TestWorkbenchAdvisor testWorkbenchAdvisor = new TestWorkbenchAdvisor() {
+
+			@Override
+			public void postWindowOpen(IWorkbenchWindowConfigurer configurer) {
+				super.createWorkbenchWindowAdvisor(configurer);
+				MApplication mApplication = E4MigrationTool.convert(memento);
+				future.complete(mApplication);
+				PlatformUI.getWorkbench().close();
+			}
+
+		};
+		PlatformUI.createAndRunWorkbench(display, testWorkbenchAdvisor);
+		MApplication mApplication = future.get();
+
+		assertEquals(1, mApplication.getChildren().size());
+
+		MWindowElement mWindowElement = mApplication.getChildren().get(0).getChildren().get(0);
+		MElementContainer<MPerspectiveStack> windowContainer = (MElementContainer<MPerspectiveStack>)mWindowElement;
+		assertEquals(3, windowContainer.getChildren().get(0).getChildren().size());
+		MPerspective resourceExportPerspective = windowContainer.getChildren().get(0).getChildren().get(0);
+		assertEquals("ResourceExport", resourceExportPerspective.getElementId());
+
+	}
+
+	@Test
+	void testFromSource() throws InterruptedException, ExecutionException {
+
+		CompletableFuture<Boolean> future = new CompletableFuture<>();
+		TestWorkbenchAdvisor testWorkbenchAdvisor = new TestWorkbenchAdvisor() {
+
+			@Override
+			public void postWindowOpen(IWorkbenchWindowConfigurer configurer) {
+				super.createWorkbenchWindowAdvisor(configurer);
+				try {
+					E4MigrationTool.convert(Paths.get("resources/perspective_3x.xml").toFile(),
+							Paths.get("resources/e4_test.xml").toFile());
+				} catch (WorkbenchException | IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+					future.complete(false);
+					PlatformUI.getWorkbench().close();
+				}
+				future.complete(true);
+				PlatformUI.getWorkbench().close();
+			}
+
+		};
+		PlatformUI.createAndRunWorkbench(display, testWorkbenchAdvisor);
+		Boolean result = future.get();
+		if(!result) {
+			fail();
+		}
+	}
+
+}
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/util/TestWorkbenchAdvisor.java b/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/util/TestWorkbenchAdvisor.java
new file mode 100644
index 0000000000..dadd9f5557
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/util/TestWorkbenchAdvisor.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2022 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compatibility.migration.tests.util;
+
+import org.eclipse.ui.tests.harness.util.RCPTestWorkbenchAdvisor;
+
+public class TestWorkbenchAdvisor extends RCPTestWorkbenchAdvisor{
+
+	public TestWorkbenchAdvisor() {
+		super();
+	}
+
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/.classpath b/tests/org.eclipse.e4.tools.persistence.tests/.classpath
new file mode 100644
index 0000000000..a42a828e04
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.persistence.tests/.classpath
@@ -0,0 +1,11 @@
+<?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/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/.project b/tests/org.eclipse.e4.tools.persistence.tests/.project
new file mode 100644
index 0000000000..92bcd35f66
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.persistence.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.persistence.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..737d67c4d4
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,468 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=ignore
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=private
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=no_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecInsufficientInfo=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true
+org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..fd9ef68096
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,64 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
+formatter_settings_version=14
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return Returns the ${bare_field_name}.\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} The ${bare_field_name} to set.\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @since 3.5\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=true
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..e7eee2dd04
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,17 @@
+#Wed Oct 17 16:19:53 EDT 2007
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.deprecated=2
+compilers.p.illegal-att-value=0
+compilers.p.missing-packages=2
+compilers.p.no-required-att=1
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=1
+compilers.p.unresolved-import=0
+compilers.p.unused-element-or-attribute=1
+compilers.use-project=true
+eclipse.preferences.version=1
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..ebdc9f4a49
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests
+Bundle-SymbolicName: org.eclipse.e4.tools.persistence.tests;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Automatic-Module-Name: org.eclipse.e4.tools.persistence.tests
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.0",
+ org.eclipse.ui;bundle-version="3.201.0",
+ org.junit;bundle-version="4.13.2",
+ org.eclipse.swt,
+ org.eclipse.ui.tests.harness,
+ org.eclipse.e4.tools.persistence,
+ org.eclipse.e4.core.contexts,
+ org.eclipse.e4.ui.workbench
+Bundle-ActivationPolicy: lazy
+Import-Package: org.junit.jupiter.api;version="[5.8.1,6.0.0)"
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/build.properties b/tests/org.eclipse.e4.tools.persistence.tests/build.properties
new file mode 100644
index 0000000000..e9863e281e
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.persistence.tests/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/plugin.xml b/tests/org.eclipse.e4.tools.persistence.tests/plugin.xml
new file mode 100644
index 0000000000..f659bb5d82
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.persistence.tests/plugin.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.perspectives">
+      <perspective
+            class="org.eclipse.e4.tools.persistence.tests.util.TestPerspective"
+            id="org.eclipse.e4.ui.workbench.persistence.tests.TestPerspective"
+            name="Test Perspective">
+      </perspective>
+   </extension>
+    <extension
+       point="org.eclipse.ui.views">
+    <view
+          class="org.eclipse.e4.tools.persistence.tests.util.TestViewPart"
+          id="org.eclipse.ui.tests.harness.TestView"
+          name="TestView"
+          restorable="true">
+    </view>
+ </extension>
+
+</plugin>
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/pom.xml b/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
new file mode 100644
index 0000000000..bfcd391f88
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2022 EclipseSource GmbH and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+
+  Contributors:
+     EclipseSource GmbH - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse</groupId>
+		<artifactId>eclipse.platform.ui.tools</artifactId>
+		<version>4.27.0-SNAPSHOT</version>
+		<relativePath>../../</relativePath>
+	</parent>
+	<groupId>eclipse.platform.ui.tool</groupId>
+	<artifactId>org.eclipse.e4.tools.persistence.tests</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-test-plugin</packaging>
+
+	<properties>
+		<skipAPIAnalysis>true</skipAPIAnalysis> <!-- Not in baseline -->
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<includes>
+						<include>**/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java</include>
+					</includes>
+					<useUIHarness>false</useUIHarness>
+					<useUIThread>false</useUIThread>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/resources/workbench_restore.persistence b/tests/org.eclipse.e4.tools.persistence.tests/resources/workbench_restore.persistence
new file mode 100644
index 0000000000..45b50975c2
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.persistence.tests/resources/workbench_restore.persistence
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.ui.persistence:WorkbenchState xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:advanced="http://www.eclipse.org/ui/2010/UIModel/application/ui/advanced" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:org.eclipse.ui.persistence="http://www.eclipse.org/e4/tools/persistence">
+  <perspective elementId="org.eclipse.e4.ui.workbench.persistence.tests.TestPerspective" selectedElement="//@perspective/@children.0" label="Test Perspective" iconURI="platform:/plugin/org.eclipse.ui/icons/full/eview16/default_persp.png">
+    <children xsi:type="basic:PartSashContainer" selectedElement="//@perspective/@children.0/@children.0" horizontal="true">
+      <children xsi:type="basic:PartStack" elementId="org.eclipse.ui.tests.harness.TestViewMStack" containerData="0" selectedElement="//@perspective/@children.0/@children.0/@children.0">
+        <tags>active</tags>
+        <children xsi:type="advanced:Placeholder" elementId="org.eclipse.ui.tests.harness.TestView" closeable="true">
+          <tags>View</tags>
+          <tags>categoryTag:Other</tags>
+        </children>
+      </children>
+      <children xsi:type="advanced:Placeholder" elementId="org.eclipse.ui.editorss" containerData="10000"/>
+    </children>
+  </perspective>
+  <viewSettings partId="org.eclipse.ui.tests.harness.TestView" memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xA;&lt;view MyText=&quot;RESTORED TEXT!&quot;/>"/>
+  <editorArea elementId="org.eclipse.ui.editorss">
+    <children xsi:type="basic:PartStack" elementId="org.eclipse.e4.primaryDataStack">
+      <tags>org.eclipse.e4.primaryDataStack</tags>
+      <tags>EditorStack</tags>
+    </children>
+  </editorArea>
+  <trimBars elementId="org.eclipse.ui.trim.vertical1" contributorURI="platform:/plugin/org.eclipse.ui.workbench" side="Left"/>
+  <trimBars elementId="org.eclipse.ui.trim.vertical2" contributorURI="platform:/plugin/org.eclipse.ui.workbench" side="Right"/>
+</org.eclipse.ui.persistence:WorkbenchState>
\ No newline at end of file
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java b/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java
new file mode 100644
index 0000000000..64206015a1
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java
@@ -0,0 +1,89 @@
+package org.eclipse.e4.tools.persistence.tests;
+
+import static org.junit.Assert.assertTrue;
+
+import java.nio.file.Paths;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
+import org.eclipse.e4.tools.internal.persistence.util.CommonUtil;
+import org.eclipse.e4.tools.persistence.PerspectivePersister;
+import org.eclipse.e4.tools.persistence.tests.util.TestPerspective;
+import org.eclipse.e4.tools.persistence.tests.util.TestWorkbenchAdvisor;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+@SuppressWarnings("restriction")
+class PerspectivePersisterTest {
+	
+	private Display display = null;
+	
+	@BeforeEach
+	void setUp() throws Exception {
+		display = PlatformUI.createDisplay();
+		
+	}
+
+	@AfterEach
+	void tearDown() throws Exception {
+		display.dispose();
+	}
+
+	@Test
+	void testSave() throws InterruptedException, ExecutionException {
+		CompletableFuture<String> future = new CompletableFuture<>();
+		TestWorkbenchAdvisor testWorkbenchAdvisor = new TestWorkbenchAdvisor() {
+
+			@Override
+			public void postWindowOpen(IWorkbenchWindowConfigurer configurer) {
+				super.createWorkbenchWindowAdvisor(configurer);
+				String serializedPerspective = PerspectivePersister.serializePerspectiveAndPartStates(TestPerspective.ID);
+				future.complete(serializedPerspective);
+				PlatformUI.getWorkbench().close();			
+			}
+			
+		};
+		PlatformUI.createAndRunWorkbench(display, testWorkbenchAdvisor);
+		String serializedPerspective = future.get();
+		assertTrue(serializedPerspective.contains("<perspective elementId=\""+TestPerspective.ID+"\""));
+		assertTrue(serializedPerspective.contains("MyText=&quot;INITIAL TEXT!&quot;"));
+		
+	}
+	
+	@Test
+	void testRestore() throws InterruptedException, ExecutionException  {
+		final ResourceSet resourceSet = new ResourceSetImpl();
+		final Resource resource = resourceSet.getResource(URI.createURI(Paths.get("resources/workbench_restore.persistence").toUri().toString()), true); //$NON-NLS-1$
+		IWorkbenchState state = (IWorkbenchState) resource.getContents().get(0);
+
+		CompletableFuture<String> future = new CompletableFuture<>();
+		TestWorkbenchAdvisor testWorkbenchAdvisor = new TestWorkbenchAdvisor() {
+
+			@Override
+			public void postWindowOpen(IWorkbenchWindowConfigurer configurer) {
+				super.createWorkbenchWindowAdvisor(configurer);
+				CommonUtil.getCurrentMainWindow().getContext().activate();
+				PerspectivePersister.restoreWorkbenchState(state);
+				String serializedPerspective = PerspectivePersister.serializePerspectiveAndPartStates(TestPerspective.ID);
+				future.complete(serializedPerspective);
+				PlatformUI.getWorkbench().close();
+			}
+			
+		};
+		PlatformUI.createAndRunWorkbench(display, testWorkbenchAdvisor);
+		String serializedPerspective = future.get();
+		assertTrue(serializedPerspective.contains("<perspective elementId=\""+TestPerspective.ID+"\""));
+		assertTrue(serializedPerspective.contains("MyText=&quot;RESTORED TEXT!&quot;"));
+		
+	}
+
+}
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestPerspective.java b/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestPerspective.java
new file mode 100644
index 0000000000..c4a3eebb86
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestPerspective.java
@@ -0,0 +1,15 @@
+package org.eclipse.e4.tools.persistence.tests.util;
+
+import org.eclipse.ui.IPageLayout;
+import org.eclipse.ui.IPerspectiveFactory;
+
+public class TestPerspective implements IPerspectiveFactory {
+
+	public static final String ID = "org.eclipse.e4.ui.workbench.persistence.tests.TestPerspective";
+	
+	@Override
+	public void createInitialLayout(IPageLayout layout) {
+		layout.addView(TestViewPart.ID, IPageLayout.LEFT, 1, IPageLayout.ID_EDITOR_AREA);
+	}
+
+}
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestViewPart.java b/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestViewPart.java
new file mode 100644
index 0000000000..80dc937a2f
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestViewPart.java
@@ -0,0 +1,52 @@
+package org.eclipse.e4.tools.persistence.tests.util;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.IViewSite;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.ViewPart;
+
+public class TestViewPart extends ViewPart {
+
+	public static final String ID = "org.eclipse.ui.tests.harness.TestView";
+	
+	private static final String MEMENTO_TEXT_KEY = "MyText";
+
+	private IMemento memento;
+
+	private Text myText;
+
+	public TestViewPart() {
+	}
+
+	@Override
+	public void createPartControl(Composite parent) {
+		myText = new Text(parent, SWT.NONE);
+		if (this.memento != null) {
+			myText.setText(this.memento.getString(MEMENTO_TEXT_KEY));
+		} else {
+			myText.setText("INITIAL TEXT!");
+		}
+	}
+
+	@Override
+	public void setFocus() {
+		// Do nothing
+	}
+
+	@Override
+	public void init(IViewSite site, IMemento memento) throws PartInitException {
+		this.memento = memento;
+		super.init(site, memento);
+	}
+
+	@Override
+	public void saveState(IMemento memento) {
+		super.saveState(memento);
+		memento.putString(MEMENTO_TEXT_KEY, myText.getText());
+	}
+
+
+}
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestWorkbenchAdvisor.java b/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestWorkbenchAdvisor.java
new file mode 100644
index 0000000000..410863205a
--- /dev/null
+++ b/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestWorkbenchAdvisor.java
@@ -0,0 +1,22 @@
+package org.eclipse.e4.tools.persistence.tests.util;
+
+import org.eclipse.ui.application.IWorkbenchConfigurer;
+import org.eclipse.ui.tests.harness.util.RCPTestWorkbenchAdvisor;
+
+public class TestWorkbenchAdvisor extends RCPTestWorkbenchAdvisor{
+
+	public TestWorkbenchAdvisor() {
+		super();
+	}
+
+	@Override
+	public String getInitialWindowPerspectiveId() {
+		return TestPerspective.ID;
+	}
+	
+	@Override
+	public void initialize(IWorkbenchConfigurer configurer) {
+		super.initialize(configurer);
+		
+	}
+}
\ No newline at end of file

From 2440562744f39a8f55443026dd30d53490c49048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?=
 =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?=
 <akurtakov@gmail.com>
Date: Wed, 4 Jan 2023 09:13:24 +0200
Subject: [PATCH 1216/1286] Fix warning in I-build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It can be seen at
https://download.eclipse.org/eclipse/downloads/drops4/I20230103-1800/compilelogs/plugins/org.eclipse.e4.tools.compatibility.migration.tests_1.0.0.v20221220-0825/@dot.html#OTHER_WARNINGS
:
1. WARNING in /src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java
 (at line 90)
MElementContainer<MPerspectiveStack> windowContainer =
(MElementContainer<MPerspectiveStack>)mWindowElement;
Type safety: Unchecked cast from MWindowElement to
MElementContainer<MPerspectiveStack>

As it's test code it's fine to cast thus suppress warning.
Some other minor code improvements done too.
---
 .../.settings/org.eclipse.jdt.core.prefs                   | 6 +++++-
 .../compatibility/migration/tests/E4MigrationToolTest.java | 7 ++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs
index 737d67c4d4..a3b3fe89dc 100644
--- a/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled
 org.eclipse.jdt.core.builder.cleanOutputFolder=clean
 org.eclipse.jdt.core.builder.duplicateResourceTask=warning
 org.eclipse.jdt.core.builder.invalidClasspath=abort
@@ -27,6 +28,7 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
 org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -102,12 +104,13 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
@@ -118,6 +121,7 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
 org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java b/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java
index 201edb7fc5..8c1b4b6fec 100644
--- a/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java
+++ b/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022 EclipseSource GmbH and others.
+ * Copyright (c) 2022, 2023 EclipseSource GmbH and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -21,6 +21,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -65,7 +66,7 @@ void testConvert() throws FileNotFoundException, IOException, WorkbenchException
 		IMemento memento;
 		try (FileInputStream input = new FileInputStream(
 				Paths.get("resources/perspective_3x.xml").toAbsolutePath().toString())) {
-			BufferedReader reader = new BufferedReader(new InputStreamReader(input, "utf-8")); //$NON-NLS-1$
+			BufferedReader reader = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));
 			memento = XMLMemento.createReadRoot(reader);
 		}
 
@@ -87,6 +88,7 @@ public void postWindowOpen(IWorkbenchWindowConfigurer configurer) {
 		assertEquals(1, mApplication.getChildren().size());
 
 		MWindowElement mWindowElement = mApplication.getChildren().get(0).getChildren().get(0);
+		@SuppressWarnings("unchecked")
 		MElementContainer<MPerspectiveStack> windowContainer = (MElementContainer<MPerspectiveStack>)mWindowElement;
 		assertEquals(3, windowContainer.getChildren().get(0).getChildren().size());
 		MPerspective resourceExportPerspective = windowContainer.getChildren().get(0).getChildren().get(0);
@@ -107,7 +109,6 @@ public void postWindowOpen(IWorkbenchWindowConfigurer configurer) {
 					E4MigrationTool.convert(Paths.get("resources/perspective_3x.xml").toFile(),
 							Paths.get("resources/e4_test.xml").toFile());
 				} catch (WorkbenchException | IOException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 					future.complete(false);
 					PlatformUI.getWorkbench().close();

From e25b69309c18275a8001849136f35119e38ad338 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 14 Feb 2023 12:16:43 +0100
Subject: [PATCH 1217/1286] Moving tools projects into a tools subfolder

---
 bundles/org.eclipse.e4.tools.compat/.project  |  39 ------------------
 .../.project                                  |  28 -------------
 .../.project                                  |  39 ------------------
 bundles/org.eclipse.e4.tools.emf.ui/.project  |  39 ------------------
 .../.project                                  |  34 ---------------
 .../org.eclipse.e4.tools.persistence/.project |  39 ------------------
 .../org.eclipse.e4.tools.services/.project    |  39 ------------------
 bundles/org.eclipse.e4.tools/.project         |  34 ---------------
 .../.project                                  |  17 --------
 .../.project                                  |  17 --------
 .../.project                                  |  28 -------------
 .../.project                                  |  28 -------------
 tests/org.eclipse.e4.tools.test/.project      |  28 -------------
 .../org.eclipse.e4.tools.compat/.classpath    |   0
 .../org.eclipse.core.resources.prefs          |   0
 .../.settings/org.eclipse.core.runtime.prefs  |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.jdt.ui.prefs        |   0
 .../.settings/org.eclipse.pde.api.tools.prefs |   0
 .../.settings/org.eclipse.pde.prefs           |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../OSGI-INF/l10n/bundle.properties           |   0
 .../org.eclipse.e4.tools.compat/about.html    |   0
 .../build.properties                          |   0
 .../forceQualifierUpdate.txt                  |   0
 .../org.eclipse.e4.tools.compat/plugin.xml    |   0
 .../org.eclipse.e4.tools.compat/pom.xml       |   0
 .../compat/internal/ClipboardServiceImpl.java |   0
 .../internal/ContextServiceFactory.java       |   0
 .../e4/tools/compat/internal/CopyAction.java  |   0
 .../e4/tools/compat/internal/CutAction.java   |   0
 .../internal/DefaultLoggerProvider.java       |   0
 .../e4/tools/compat/internal/Messages.java    |   0
 .../e4/tools/compat/internal/PartHelper.java  |   0
 .../e4/tools/compat/internal/PasteAction.java |   0
 .../compat/internal/WorkbenchLogger.java      |   0
 .../tools/compat/internal/messages.properties |   0
 .../e4/tools/compat/parts/DIEditorPart.java   |   0
 .../e4/tools/compat/parts/DIHandler.java      |   0
 .../compat/parts/DIMultiPageEditorPart.java   |   0
 .../compat/parts/DISaveableViewPart.java      |   0
 .../e4/tools/compat/parts/DIViewPart.java     |   0
 .../.classpath                                |   0
 .../org.eclipse.core.resources.prefs          |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../OSGI-INF/l10n/bundle.properties           |   0
 .../build.properties                          |   0
 .../pom.xml                                   |   0
 .../migration/PerspectiveMigrator.java        |   0
 .../migration/E4MigrationTool.java            |   0
 .../compatibiliy/migration/WorkbenchUtil.java |   0
 .../.classpath                                |   0
 .../org.eclipse.core.resources.prefs          |   0
 .../.settings/org.eclipse.core.runtime.prefs  |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.jdt.ui.prefs        |   0
 .../.settings/org.eclipse.pde.api.tools.prefs |   0
 .../.settings/org.eclipse.pde.prefs           |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../OSGI-INF/l10n/bundle.properties           |   0
 .../OSGI-INF/modelextractor.xml               |   0
 .../OSGI-INF/pdecontributionprovider.xml      |   0
 .../OSGI-INF/pdee4xmiprovider.xml             |   0
 .../OSGI-INF/pdeextensionlookup.xml           |   0
 .../OSGI-INF/projectfunction.xml              |   0
 .../OSGI-INF/xmiresourcecontextfunction.xml   |   0
 .../about.html                                |   0
 .../build.properties                          |   0
 .../forceQualifierUpdate.txt                  |   0
 .../full/obj16/application_view_tile.png      | Bin
 .../plugin.xml                                |   0
 .../org.eclipse.e4.tools.emf.editor3x/pom.xml |   0
 .../emf/editor3x/E4WorkbenchModelEditor.java  |   0
 .../emf/editor3x/EditorProjectFunction.java   |   0
 .../e4/tools/emf/editor3x/Messages.java       |   0
 .../editor3x/ModelEditorPreferencePage.java   |   0
 .../e4/tools/emf/editor3x/ModelExtractor.java |   0
 .../PDEClassContributionProvider.java         |   0
 .../emf/editor3x/PDEExtensionLookup.java      |   0
 .../e4/tools/emf/editor3x/RedoAction.java     |   0
 .../e4/tools/emf/editor3x/RefactorModel.java  |   0
 .../emf/editor3x/TargetElementProviders.java  |   0
 .../e4/tools/emf/editor3x/UndoAction.java     |   0
 .../emf/editor3x/XMIResourceFunction.java     |   0
 .../e4/tools/emf/editor3x/emf/EditUIUtil.java |   0
 .../extension/AddonContributionEditor.java    |   0
 ...micMenuContributionContributionEditor.java |   0
 .../extension/HandlerContributionEditor.java  |   0
 ...mperativeExpressionContributionEditor.java |   0
 .../extension/PartContributionEditor.java     |   0
 .../ToolControlContributionEditor.java        |   0
 .../e4/tools/emf/editor3x/extension/Util.java |   0
 .../e4/tools/emf/editor3x/messages.properties |   0
 .../ModelMoveParticipant.java                 |   0
 .../ModelRenameParticipant.java               |   0
 .../RefactorParticipantDelegate.java          |   0
 .../org.eclipse.e4.tools.emf.ui/.classpath    |   0
 .../org.eclipse.core.resources.prefs          |   0
 .../.settings/org.eclipse.core.runtime.prefs  |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.jdt.ui.prefs        |   0
 .../.settings/org.eclipse.pde.api.tools.prefs |   0
 .../.settings/org.eclipse.pde.core.prefs      |   0
 .../.settings/org.eclipse.pde.prefs           |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../OSGI-INF/contributioncollector.xml        |   0
 .../OSGI-INF/resourceprovider.xml             |   0
 .../OSGI-INF/resources.properties             |   0
 .../org.eclipse.e4.tools.emf.ui/README.md     |   0
 .../org.eclipse.e4.tools.emf.ui/about.html    |   0
 .../build.properties                          |   0
 .../css/default.css                           |   0
 .../forceQualifierUpdate.txt                  |   0
 .../fragment.e4xmi                            |   0
 .../icons/full/modelelements/Addons.png       | Bin
 .../icons/full/modelelements/Application.png  | Bin
 .../icons/full/modelelements/Area.gif         | Bin
 .../full/modelelements/Area_vertical.gif      | Bin
 .../full/modelelements/BindingContext.gif     | Bin
 .../icons/full/modelelements/BindingTable.png | Bin
 .../icons/full/modelelements/Category.png     | Bin
 .../icons/full/modelelements/Command.png      | Bin
 .../full/modelelements/CommandParameter.png   | Bin
 .../full/modelelements/CoreExpression.png     | Bin
 .../full/modelelements/DirectMenuItem.gif     | Bin
 .../full/modelelements/DirectToolItem.gif     | Bin
 .../modelelements/DynamicMenuContribution.gif | Bin
 .../full/modelelements/HandledMenuItem.gif    | Bin
 .../full/modelelements/HandledToolItem.gif    | Bin
 .../icons/full/modelelements/Handler.png      | Bin
 .../icons/full/modelelements/KeyBinding.png   | Bin
 .../icons/full/modelelements/Menu.gif         | Bin
 .../full/modelelements/MenuContribution.gif   | Bin
 .../icons/full/modelelements/MenuItem.gif     | Bin
 .../full/modelelements/MenuSeparator.gif      | Bin
 .../full/modelelements/ModelFragments.png     | Bin
 .../icons/full/modelelements/Parameter.png    | Bin
 .../icons/full/modelelements/Part.gif         | Bin
 .../full/modelelements/PartDescriptor.gif     | Bin
 .../full/modelelements/PartSashContainer.gif  | Bin
 .../PartSashContainer_vertical.gif            | Bin
 .../icons/full/modelelements/PartStack.gif    | Bin
 .../icons/full/modelelements/Perspective.gif  | Bin
 .../full/modelelements/PerspectiveStack.gif   | Bin
 .../icons/full/modelelements/Placeholder.gif  | Bin
 .../modelelements/StringModelFragment.png     | Bin
 .../icons/full/modelelements/ToolBar.gif      | Bin
 .../modelelements/ToolBarContribution.gif     | Bin
 .../full/modelelements/ToolBarSeparator.gif   | Bin
 .../icons/full/modelelements/ToolControl.gif  | Bin
 .../full/modelelements/TrimContribution.gif   | Bin
 .../icons/full/modelelements/Window.gif       | Bin
 .../icons/full/modelelements/WindowTrim.gif   | Bin
 .../icons/full/obj16/EPackage.gif             | Bin
 .../icons/full/obj16/add_column.gif           | Bin
 .../icons/full/obj16/application_form.png     | Bin
 .../icons/full/obj16/arrow_down.png           | Bin
 .../icons/full/obj16/arrow_up.png             | Bin
 .../icons/full/obj16/bullet_go.png            | Bin
 .../icons/full/obj16/bundle.png               | Bin
 .../icons/full/obj16/chart_organisation.png   | Bin
 .../icons/full/obj16/class_default_obj.gif    | Bin
 .../icons/full/obj16/class_obj.png            | Bin
 .../icons/full/obj16/class_obj@2x.png         | Bin
 .../icons/full/obj16/command.gif              | Bin
 .../icons/full/obj16/copy_to_project.png      | Bin
 .../icons/full/obj16/cross.png                | Bin
 .../icons/full/obj16/error_obj.gif            | Bin
 .../icons/full/obj16/field_default_obj.gif    | Bin
 .../icons/full/obj16/field_private_obj.gif    | Bin
 .../icons/full/obj16/field_protected_obj.gif  | Bin
 .../icons/full/obj16/field_public_obj.gif     | Bin
 .../icons/full/obj16/filter_by_attribute.gif  | Bin
 .../icons/full/obj16/filter_by_item.gif       | Bin
 .../icons/full/obj16/find.png                 | Bin
 .../icons/full/obj16/headermenu.png           | Bin
 .../icons/full/obj16/mark_occurrences.png     | Bin
 .../full/obj16/missing_image_placeholder.png  | Bin
 .../icons/full/obj16/package_obj.gif          | Bin
 .../icons/full/obj16/package_obj.png          | Bin
 .../icons/full/obj16/package_obj@2x.png       | Bin
 .../icons/full/obj16/projects.png             | Bin
 .../icons/full/obj16/remove_filter.png        | Bin
 .../icons/full/obj16/reset_columns.gif        | Bin
 .../icons/full/obj16/table_add.png            | Bin
 .../icons/full/obj16/table_delete.png         | Bin
 .../icons/full/obj16/use_anyway.gif           | Bin
 .../icons/full/obj16/world_edit.png           | Bin
 .../icons/full/obj16/zoom.png                 | Bin
 .../icons/full/widgets/button_obj.gif         | Bin
 .../icons/full/widgets/ccombo_obj.gif         | Bin
 .../icons/full/widgets/checkbox_obj.gif       | Bin
 .../icons/full/widgets/clabel_obj.gif         | Bin
 .../icons/full/widgets/comboviewer_obj.gif    | Bin
 .../icons/full/widgets/composite_obj.gif      | Bin
 .../icons/full/widgets/coolbar_obj.gif        | Bin
 .../icons/full/widgets/ctabfolder_obj.gif     | Bin
 .../icons/full/widgets/group_obj.gif          | Bin
 .../icons/full/widgets/label_obj.gif          | Bin
 .../icons/full/widgets/menu_obj.gif           | Bin
 .../icons/full/widgets/menubar_obj.gif        | Bin
 .../icons/full/widgets/menuitem_obj.gif       | Bin
 .../icons/full/widgets/menuseparator_obj.gif  | Bin
 .../icons/full/widgets/progressbar_obj.gif    | Bin
 .../icons/full/widgets/radiobutton_obj.gif    | Bin
 .../icons/full/widgets/sashform_obj.gif       | Bin
 .../icons/full/widgets/separator_obj.gif      | Bin
 .../icons/full/widgets/shell_obj.gif          | Bin
 .../icons/full/widgets/tabfolder_obj.gif      | Bin
 .../icons/full/widgets/table_obj.gif          | Bin
 .../icons/full/widgets/text_obj.gif           | Bin
 .../icons/full/widgets/toolbar_obj.gif        | Bin
 .../icons/full/widgets/toolitemcheck_obj.gif  | Bin
 .../icons/full/widgets/toolitemdrop_obj.gif   | Bin
 .../icons/full/widgets/toolitempush_obj.gif   | Bin
 .../icons/full/widgets/toolitemradio_obj.gif  | Bin
 .../full/widgets/toolitemseparator_obj.gif    | Bin
 .../icons/full/widgets/tree_obj.gif           | Bin
 .../icons/full/wizban/add_to_dir_wiz.png      | Bin
 .../icons/full/wizban/attribute_wiz.gif       | Bin
 .../icons/full/wizban/error_wiz.gif           | Bin
 .../icons/full/wizban/extstr_wiz.png          | Bin
 .../icons/full/wizban/fieldrefact_wiz.png     | Bin
 .../icons/full/wizban/imp3x_wiz.png           | Bin
 .../icons/full/wizban/import_wiz.png          | Bin
 .../icons/full/wizban/location_wiz.png        | Bin
 .../icons/full/wizban/newclass_wiz.png        | Bin
 .../icons/full/wizban/newefix_wizban.png      | Bin
 .../icons/full/wizban/newexp_wiz.png          | Bin
 .../icons/full/wizban/newfolder_wiz.png       | Bin
 .../icons/full/wizban/newsearch_wiz.png       | Bin
 .../icons/full/wizban/newsearch_wiz@2x.png    | Bin
 .../icons/full/wizban/package_wiz.png         | Bin
 .../icons/full/wizban/plugin_wiz.gif          | Bin
 .../icons/full/wizban/typerefact_wiz.png      | Bin
 .../plugin.properties                         |   0
 .../org.eclipse.e4.tools.emf.ui/plugin.xml    |   0
 .../org.eclipse.e4.tools.emf.ui/pom.xml       |   0
 .../org.eclipse.e4.tools.emf.ui.editors.exsd  |   0
 ...org.eclipse.e4.tools.emf.ui.scripting.exsd |   0
 .../AbstractElementEditorContribution.java    |   0
 .../ui/common/ComboViewerAutoComplete.java    |   0
 .../ui/common/CommandToStringConverter.java   |   0
 .../ui/common/ContributionURIValidator.java   |   0
 .../ui/common/IClassContributionProvider.java |   0
 .../ui/common/IContributionClassCreator.java  |   0
 .../emf/ui/common/IEditorDescriptor.java      |   0
 .../tools/emf/ui/common/IEditorFeature.java   |   0
 .../tools/emf/ui/common/IExtensionLookup.java |   0
 .../emf/ui/common/IModelElementProvider.java  |   0
 .../tools/emf/ui/common/IModelExtractor.java  |   0
 .../tools/emf/ui/common/IModelResource.java   |   0
 .../ui/common/IProviderStatusCallback.java    |   0
 .../emf/ui/common/IScriptingSupport.java      |   0
 .../ui/common/ISelectionProviderService.java  |   0
 .../e4/tools/emf/ui/common/ImageTooltip.java  |   0
 .../tools/emf/ui/common/MemoryTransfer.java   |   0
 .../emf/ui/common/ModelEditorPreferences.java |   0
 .../e4/tools/emf/ui/common/Plugin.java        |   0
 .../tools/emf/ui/common/ProviderStatus.java   |   0
 .../emf/ui/common/ResourceSearchScope.java    |   0
 .../eclipse/e4/tools/emf/ui/common/Util.java  |   0
 .../tools/emf/ui/common/XMIModelResource.java |   0
 .../component/AbstractComponentEditor.java    |   0
 .../emf/ui/common/component/IdGenerator.java  |   0
 .../tools/emf/ui/internal/E4Properties.java   |   0
 .../e4/tools/emf/ui/internal/Messages.java    |   0
 .../tools/emf/ui/internal/Messages.properties |   0
 .../ObservableColumnLabelProvider.java        |   0
 .../ui/internal/PreferenceInitializer.java    |   0
 .../emf/ui/internal/ResourceProvider.java     |   0
 .../tools/emf/ui/internal/StringMatcher.java  |   0
 .../ui/internal/common/AbstractPickList.java  |   0
 .../emf/ui/internal/common/Autocomplete.java  |   0
 .../common/ClassContributionCollector.java    |   0
 .../common/ComponentLabelProvider.java        |   0
 .../internal/common/ControlHighlighter.java   |   0
 .../emf/ui/internal/common/E4PickList.java    |   0
 .../ui/internal/common/E4StringPickList.java  |   0
 .../internal/common/EClassLabelProvider.java  |   0
 .../common/FeatureClassLabelProvider.java     |   0
 .../emf/ui/internal/common/ModelEditor.java   |   0
 .../emf/ui/internal/common/TreeViewerEx.java  |   0
 .../emf/ui/internal/common/VirtualEntry.java  |   0
 .../common/component/AbstractPartEditor.java  |   0
 .../common/component/AddonsEditor.java        |   0
 .../common/component/ApplicationEditor.java   |   0
 .../internal/common/component/AreaEditor.java |   0
 .../component/BindingContextEditor.java       |   0
 .../common/component/BindingTableEditor.java  |   0
 .../common/component/CategoryEditor.java      |   0
 .../common/component/CommandEditor.java       |   0
 .../component/CommandParameterEditor.java     |   0
 .../common/component/CompositePartEditor.java |   0
 .../common/component/ControlFactory.java      |   0
 .../component/CoreExpressionEditor.java       |   0
 .../common/component/DefaultEditor.java       |   0
 .../component/DirectMenuItemEditor.java       |   0
 .../component/DirectToolItemEditor.java       |   0
 .../DynamicMenuContributionEditor.java        |   0
 .../component/HandledMenuItemEditor.java      |   0
 .../component/HandledToolItemEditor.java      |   0
 .../common/component/HandlerEditor.java       |   0
 .../component/ImperativeExpressionEditor.java |   0
 .../common/component/KeyBindingEditor.java    |   0
 .../component/MenuContributionEditor.java     |   0
 .../internal/common/component/MenuEditor.java |   0
 .../common/component/MenuItemEditor.java      |   0
 .../common/component/MenuSeparatorEditor.java |   0
 .../component/ModelFragmentsEditor.java       |   0
 .../common/component/ParameterEditor.java     |   0
 .../component/PartDescriptorEditor.java       |   0
 .../internal/common/component/PartEditor.java |   0
 .../component/PartSashContainerEditor.java    |   0
 .../common/component/PartStackEditor.java     |   0
 .../common/component/PerspectiveEditor.java   |   0
 .../component/PerspectiveStackEditor.java     |   0
 .../common/component/PlaceholderEditor.java   |   0
 .../common/component/PopupMenuEditor.java     |   0
 .../common/component/StringModelFragment.java |   0
 .../component/ToolBarContributionEditor.java  |   0
 .../common/component/ToolBarEditor.java       |   0
 .../component/ToolBarSeparatorEditor.java     |   0
 .../common/component/ToolControlEditor.java   |   0
 .../common/component/ToolItemEditor.java      |   0
 .../common/component/TrimBarEditor.java       |   0
 .../component/TrimContributionEditor.java     |   0
 .../common/component/TrimmedWindowEditor.java |   0
 .../UnsettableUpdateValueStrategy.java        |   0
 .../common/component/WindowEditor.java        |   0
 .../AbstractCommandSelectionDialog.java       |   0
 .../component/dialogs/AbstractIconDialog.java |   0
 .../AbstractIconDialogWithHardcodedScope.java |   0
 .../AbstractIconDialogWithScopeAndFilter.java |   0
 .../component/dialogs/AbstractIdDialog.java   |   0
 .../dialogs/AreaIconDialogEditor.java         |   0
 .../BindingContextSelectionDialog.java        |   0
 .../component/dialogs/BundleImageCache.java   |   0
 .../CommandCategorySelectionDialog.java       |   0
 .../dialogs/ContributionClassDialog.java      |   0
 .../dialogs/ContributionDataFile.java         |   0
 .../component/dialogs/ExpressionIdDialog.java |   0
 .../dialogs/FeatureSelectionDialog.java       |   0
 .../dialogs/FilteredContributionDialog.java   |   0
 .../dialogs/FindImportElementDialog.java      |   0
 .../FindParentReferenceElementDialog.java     |   0
 ...HandledMenuItemCommandSelectionDialog.java |   0
 ...HandledToolItemCommandSelectionDialog.java |   0
 .../HandlerCommandSelectionDialog.java        |   0
 .../KeyBindingCommandSelectionDialog.java     |   0
 .../dialogs/MenuIconDialogEditor.java         |   0
 .../component/dialogs/MenuIdDialog.java       |   0
 .../dialogs/MenuItemIconDialogEditor.java     |   0
 .../dialogs/ModelResultHandlerImpl.java       |   0
 .../dialogs/ParameterIdSelectionDialog.java   |   0
 .../PartDescriptorIconDialogEditor.java       |   0
 .../dialogs/PartIconDialogEditor.java         |   0
 .../dialogs/PerspectiveIconDialogEditor.java  |   0
 .../SaveDialogBoundsSettingsDialog.java       |   0
 .../dialogs/SharedElementsDialog.java         |   0
 .../component/dialogs/ToolBarIdDialog.java    |   0
 .../dialogs/ToolItemIconDialogEditor.java     |   0
 .../component/dialogs/TrimIdDialog.java       |   0
 .../dialogs/WindowIconDialogEditor.java       |   0
 .../tabs/ContributionUriCellEditor.java       |   0
 .../common/component/tabs/DocUtil.java        |   0
 .../common/component/tabs/E4ToolItemMenu.java |   0
 .../tabs/EAttributeEditingSupport.java        |   0
 .../tabs/EAttributeTableViewerColumn.java     |   0
 .../common/component/tabs/EmfUtil.java        |   0
 .../common/component/tabs/IGotoObject.java    |   0
 .../common/component/tabs/IViewEObjects.java  |   0
 .../common/component/tabs/ListTab.java        |   0
 .../common/component/tabs/Messages.java       |   0
 .../tabs/ModelResourceContentProvider.java    |   0
 .../component/tabs/TableViewerUtil.java       |   0
 .../common/component/tabs/XmiTab.java         |   0
 .../common/component/tabs/empty/E.java        |   0
 .../tabs/empty/EmptyFilterOption.java         |   0
 .../tabs/empty/TitleAreaFilterDialog.java     |   0
 ...TitleAreaFilterDialogWithEmptyOptions.java |   0
 .../common/component/tabs/messages.properties |   0
 .../virtual/AbstractVTrimEditor.java          |   0
 .../component/virtual/VApplicationAddons.java |   0
 .../virtual/VApplicationCategoriesEditor.java |   0
 .../virtual/VApplicationWindowEditor.java     |   0
 .../virtual/VBindingTableEditor.java          |   0
 .../component/virtual/VCommandEditor.java     |   0
 .../component/virtual/VControlsEditor.java    |   0
 .../component/virtual/VHandlerEditor.java     |   0
 .../virtual/VItemParametersEditor.java        |   0
 .../virtual/VMenuContributionsEditor.java     |   0
 .../common/component/virtual/VMenuEditor.java |   0
 .../virtual/VModelFragmentsEditor.java        |   0
 .../virtual/VModelImportsEditor.java          |   0
 .../component/virtual/VPartDescriptor.java    |   0
 .../virtual/VPartDescriptorMenuEditor.java    |   0
 .../virtual/VPartDescriptorTrimEditor.java    |   0
 .../component/virtual/VPartMenuEditor.java    |   0
 .../component/virtual/VPartTrimEditor.java    |   0
 .../virtual/VPerspectiveControlEditor.java    |   0
 .../virtual/VPerspectiveTrimEditor.java       |   0
 .../virtual/VPerspectiveWindowsEditor.java    |   0
 .../virtual/VRootBindingContexts.java         |   0
 .../component/virtual/VSnippetsEditor.java    |   0
 .../virtual/VToolBarContributionsEditor.java  |   0
 .../virtual/VTrimContributionsEditor.java     |   0
 .../virtual/VWindowControlEditor.java         |   0
 .../component/virtual/VWindowEditor.java      |   0
 .../virtual/VWindowSharedElementsEditor.java  |   0
 .../component/virtual/VWindowTrimEditor.java  |   0
 .../virtual/VWindowWindowsEditor.java         |   0
 .../common/objectdata/AccessLevel.java        |   0
 .../common/objectdata/JavaAttribute.java      |   0
 .../common/objectdata/JavaMethod.java         |   0
 .../common/objectdata/JavaObject.java         |   0
 .../common/objectdata/ObjectViewer.java       |   0
 .../common/properties/ExportIdsHandler.java   |   0
 .../properties/ExternalizeStringHandler.java  |   0
 .../ProjectOSGiTranslationProvider.java       |   0
 .../resourcelocator/BundleConverter.java      |   0
 .../common/resourcelocator/Messages.java      |   0
 ...getPlatformClassContributionCollector.java |   0
 .../TargetPlatformContributionCollector.java  |   0
 ...rgetPlatformIconContributionCollector.java |   0
 .../dialogs/BundleClassDialog.java            |   0
 .../dialogs/DynamicWizard.java                |   0
 .../dialogs/FindContributionDialog.java       |   0
 .../dialogs/FindIconDialog.java               |   0
 .../resourcelocator/dialogs/IconDialog.java   |   0
 .../dialogs/NonReferencedAction.java          |   0
 .../dialogs/NonReferencedActionPage.java      |   0
 .../dialogs/NonReferencedResourceDialog.java  |   0
 .../dialogs/NonReferencedResourceWizard.java  |   0
 .../dialogs/PickProjectFolderPage.java        |   0
 .../dialogs/PickProjectPage.java              |   0
 .../dialogs/ProjectFolderPickerDialog.java    |   0
 .../ReferencedProjectPickerDialog.java        |   0
 .../resourcelocator/dialogs/UriDialog.java    |   0
 .../dialogs/UriDialogType.java                |   0
 .../resourcelocator/messages.properties       |   0
 .../internal/common/uistructure/UIViewer.java |   0
 .../common/uistructure/ViewerElement.java     |   0
 .../uistructure/WidgetContentProvider.java    |   0
 .../uistructure/WidgetLabelProvider.java      |   0
 .../internal/common/xml/AnnotationAccess.java |   0
 .../xml/EMFDocumentResourceMediator.java      |   0
 .../common/xml/IXMLColorConstants.java        |   0
 .../xml/NonRuleBasedDamagerRepairer.java      |   0
 .../emf/ui/internal/common/xml/TagRule.java   |   0
 .../internal/common/xml/XMLConfiguration.java |   0
 .../common/xml/XMLDoubleClickStrategy.java    |   0
 .../common/xml/XMLPartitionScanner.java       |   0
 .../ui/internal/common/xml/XMLScanner.java    |   0
 .../ui/internal/common/xml/XMLTagScanner.java |   0
 .../common/xml/XMLWhitespaceDetector.java     |   0
 .../ui/internal/handlers/AbstractHandler.java |   0
 .../handlers/AutosizeColumnsHandler.java      |   0
 .../MarkDuplicateAttributesHandler.java       |   0
 .../MarkDuplicateElementIdsHandler.java       |   0
 .../handlers/MarkDuplicateItemsBase.java      |   0
 .../handlers/MarkDuplicateLabelsHandler.java  |   0
 .../handlers/RepairDuplicateItemsHandler.java |   0
 .../handlers/ResetToDefaultHandler.java       |   0
 .../internal/handlers/UnmarkItemsHandler.java |   0
 .../tools/emf/ui/internal/imp/Messages.java   |   0
 .../emf/ui/internal/imp/ModelImportPage1.java |   0
 .../ui/internal/imp/ModelImportWizard.java    |   0
 .../emf/ui/internal/imp/RegistryStruct.java   |   0
 .../emf/ui/internal/imp/RegistryUtil.java     |   0
 .../emf/ui/internal/imp/messages.properties   |   0
 .../internal/wbm/ApplicationModelEditor.java  |   0
 .../.classpath                                |   0
 .../org.eclipse.core.resources.prefs          |   0
 .../.settings/org.eclipse.core.runtime.prefs  |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.jdt.ui.prefs        |   0
 .../.settings/org.eclipse.pde.api.tools.prefs |   0
 .../.settings/org.eclipse.pde.prefs           |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../about.html                                |   0
 .../build.properties                          |   0
 .../forceQualifierUpdate.txt                  |   0
 .../icons/full/elcl16/e4assist_co.gif         | Bin
 .../plugin.properties                         |   0
 .../plugin.xml                                |   0
 .../pom.xml                                   |   0
 .../tools/jdt/templates/E4ContextType.java    |   0
 .../E4TemplateCompletionProposalComputer.java |   0
 .../templates/default-e4templates.xml         |   0
 .../.classpath                                |   0
 .../org.eclipse.core.resources.prefs          |   0
 .../.settings/org.eclipse.core.runtime.prefs  |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.jdt.ui.prefs        |   0
 .../.settings/org.eclipse.pde.api.tools.prefs |   0
 .../.settings/org.eclipse.pde.prefs           |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../OSGI-INF/l10n/bundle.properties           |   0
 .../about.html                                |   0
 .../build.properties                          |   0
 .../model/persistence.ecore                   |   0
 .../model/persistence.genmodel                |   0
 .../plugin.xml                                |   0
 .../org.eclipse.e4.tools.persistence/pom.xml  |   0
 .../internal/persistence/IPartMemento.java    |   0
 .../persistence/IPersistenceFactory.java      |   0
 .../persistence/IPersistencePackage.java      |   0
 .../internal/persistence/IWorkbenchState.java |   0
 .../persistence/impl/PartMemento.java         |   0
 .../persistence/impl/PersistenceFactory.java  |   0
 .../persistence/impl/PersistencePackage.java  |   0
 .../persistence/impl/WorkbenchState.java      |   0
 .../internal/persistence/util/CommonUtil.java |   0
 .../util/PersistenceAdapterFactory.java       |   0
 .../persistence/util/PersistenceSwitch.java   |   0
 .../persistence/PerspectivePersister.java     |   0
 .../org.eclipse.e4.tools.services/.classpath  |   0
 .../org.eclipse.core.resources.prefs          |   0
 .../.settings/org.eclipse.core.runtime.prefs  |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.jdt.ui.prefs        |   0
 .../.settings/org.eclipse.pde.api.tools.prefs |   0
 .../.settings/org.eclipse.pde.prefs           |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../OSGI-INF/l10n/bundle.properties           |   0
 .../OSGI-INF/resourcepoolfunction.xml         |   0
 .../OSGI-INF/resourceservice.xml              |   0
 .../org.eclipse.e4.tools.services/about.html  |   0
 .../build.properties                          |   0
 .../forceQualifierUpdate.txt                  |   0
 .../org.eclipse.e4.tools.services/pom.xml     |   0
 .../tools/services/BasicResourceProvider.java |   0
 .../e4/tools/services/IClipboardService.java  |   0
 .../tools/services/IDirtyProviderService.java |   0
 .../e4/tools/services/IResourcePool.java      |   0
 .../services/IResourceProviderService.java    |   0
 .../e4/tools/services/IResourceService.java   |   0
 .../services/ToolsServicesConstants.java      |   0
 .../e4/tools/services/impl/Messages.java      |   0
 .../services/impl/ResourceBundleHelper.java   |   0
 .../ResourceBundleTranslationProvider.java    |   0
 .../services/impl/ResourcePoolFactory.java    |   0
 .../tools/services/impl/ResourceService.java  |   0
 .../tools/services/impl/messages.properties   |   0
 .../bundles}/org.eclipse.e4.tools/.classpath  |   0
 .../org.eclipse.core.resources.prefs          |   0
 .../.settings/org.eclipse.core.runtime.prefs  |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.jdt.ui.prefs        |   0
 .../.settings/org.eclipse.pde.api.tools.prefs |   0
 .../.settings/org.eclipse.pde.prefs           |   0
 .../org.eclipse.e4.tools/META-INF/MANIFEST.MF |   0
 .../OSGI-INF/l10n/bundle.properties           |   0
 .../bundles}/org.eclipse.e4.tools/README.md   |   0
 .../bundles}/org.eclipse.e4.tools/about.html  |   0
 .../org.eclipse.e4.tools/build.properties     |   0
 .../forceQualifierUpdate.txt                  |   0
 .../icons/full/obj16/Addons.png               | Bin
 .../icons/full/obj16/Part.gif                 | Bin
 .../icons/full/obj16/ToolControl.gif          | Bin
 .../full/obj16/application_view_tile.png      | Bin
 .../icons/full/obj16/class_obj.png            | Bin
 .../icons/full/obj16/class_obj@2x.png         | Bin
 .../icons/full/obj16/plugin.png               | Bin
 .../icons/full/wizban/newclass_wiz.png        | Bin
 .../editor3x/templates/HandlerTemplate.java   |   0
 .../emf/editor3x/templates/PartTemplate.java  |   0
 .../classes/templates/HandlerTemplate.java    |   0
 .../classes/templates/PartTemplate.java       |   0
 .../bundles}/org.eclipse.e4.tools/plugin.xml  |   0
 .../bundles}/org.eclipse.e4.tools/pom.xml     |   0
 .../eclipse/e4/internal/tools/Messages.java   |   0
 .../e4/internal/tools/ToolsPlugin.java        |   0
 .../e4/internal/tools/messages.properties     |   0
 .../wizards/classes/AbstractNewClassPage.java |   0
 .../classes/AbstractNewClassWizard.java       |   0
 .../wizards/classes/NewAddonClassWizard.java  |   0
 ...NewDynamicMenuContributionClassWizard.java |   0
 .../classes/NewHandlerClassWizard.java        |   0
 .../NewImperativeExpressionClassWizard.java   |   0
 .../wizards/classes/NewPartClassWizard.java   |   0
 .../classes/NewToolControlClassWizard.java    |   0
 .../classes/templates/AddonTemplate.java      |   0
 .../DynamicMenuContributionTemplate.java      |   0
 .../classes/templates/HandlerTemplate.java    |   0
 .../ImperativeExpressionTemplate.java         |   0
 .../classes/templates/PartTemplate.java       |   0
 .../templates/ToolControlTemplate.java        |   0
 .../model/BaseApplicationModelWizard.java     |   0
 .../model/ExtractContributionModelWizard.java |   0
 .../wizards/model/FragmentExtractHelper.java  |   0
 .../wizards/model/FragmentMergeHelper.java    |   0
 .../model/NewApplicationModelWizard.java      |   0
 .../model/NewContributionModelWizard.java     |   0
 .../tools/wizards/model/NewModelFilePage.java |   0
 .../.settings/org.eclipse.core.runtime.prefs  |   0
 .../build.properties                          |   0
 .../feature.properties                        |   0
 .../feature.xml                               |   0
 .../forceQualifierUpdate.txt                  |   0
 .../org.eclipse.e4.core.tools.feature/pom.xml |   0
 .../org.eclipse.core.resources.prefs          |   0
 .../build.properties                          |   0
 .../feature.properties                        |   0
 .../feature.xml                               |   0
 .../forceQualifierUpdate.txt                  |   0
 .../pom.xml                                   |   0
 .../.classpath                                |   0
 .../org.eclipse.core.resources.prefs          |   0
 .../.settings/org.eclipse.core.runtime.prefs  |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.jdt.ui.prefs        |   0
 .../.settings/org.eclipse.pde.prefs           |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../build.properties                          |   0
 .../pom.xml                                   |   0
 .../resources/e4_test.xml                     |   0
 .../resources/perspective_3x.xml              |   0
 .../migration/tests/E4MigrationToolTest.java  |   0
 .../tests/util/TestWorkbenchAdvisor.java      |   0
 .../.classpath                                |   0
 .../org.eclipse.core.resources.prefs          |   0
 .../.settings/org.eclipse.core.runtime.prefs  |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.jdt.ui.prefs        |   0
 .../.settings/org.eclipse.pde.prefs           |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../build.properties                          |   0
 .../plugin.xml                                |   0
 .../pom.xml                                   |   0
 .../resources/workbench_restore.persistence   |   0
 .../tests/PerspectivePersisterTest.java       |   0
 .../tests/util/TestPerspective.java           |   0
 .../persistence/tests/util/TestViewPart.java  |   0
 .../tests/util/TestWorkbenchAdvisor.java      |   0
 .../org.eclipse.e4.tools.test/.classpath      |   0
 .../org.eclipse.core.resources.prefs          |   0
 .../.settings/org.eclipse.core.runtime.prefs  |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.jdt.ui.prefs        |   0
 .../.settings/org.eclipse.pde.api.tools.prefs |   0
 .../.settings/org.eclipse.pde.core.prefs      |   0
 .../.settings/org.eclipse.pde.prefs           |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../build.properties                          |   0
 .../tests}/org.eclipse.e4.tools.test/pom.xml  |   0
 .../tools/test/FragmentExtractHelperTest.java |   0
 .../tools/test/FragmentMergeHelperTest.java   |   0
 650 files changed, 409 deletions(-)
 delete mode 100644 bundles/org.eclipse.e4.tools.compat/.project
 delete mode 100644 bundles/org.eclipse.e4.tools.compatibility.migration/.project
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.editor3x/.project
 delete mode 100644 bundles/org.eclipse.e4.tools.emf.ui/.project
 delete mode 100644 bundles/org.eclipse.e4.tools.jdt.templates/.project
 delete mode 100644 bundles/org.eclipse.e4.tools.persistence/.project
 delete mode 100644 bundles/org.eclipse.e4.tools.services/.project
 delete mode 100644 bundles/org.eclipse.e4.tools/.project
 delete mode 100644 features/org.eclipse.e4.core.tools.feature/.project
 delete mode 100644 features/org.eclipse.e4.tools.persistence.feature/.project
 delete mode 100644 tests/org.eclipse.e4.tools.compatibility.migration.tests/.project
 delete mode 100644 tests/org.eclipse.e4.tools.persistence.tests/.project
 delete mode 100644 tests/org.eclipse.e4.tools.test/.project
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/.classpath (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/about.html (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/build.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/plugin.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/pom.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compatibility.migration/.classpath (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.core.resources.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compatibility.migration/OSGI-INF/l10n/bundle.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compatibility.migration/build.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compatibility.migration/pom.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/WorkbenchUtil.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/.classpath (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.resources.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.api.tools.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/modelextractor.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdee4xmiprovider.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdeextensionlookup.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/projectfunction.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/xmiresourcecontextfunction.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/about.html (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/build.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/application_view_tile.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/plugin.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/pom.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ImperativeExpressionContributionEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/messages.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelMoveParticipant.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelRenameParticipant.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/.classpath (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.resources.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.api.tools.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.core.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/OSGI-INF/resourceprovider.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/README.md (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/about.html (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/build.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/css/default.css (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/fragment.e4xmi (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area_vertical.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingTable.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Category.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CoreExpression.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DynamicMenuContribution.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelFragments.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartDescriptor.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/StringModelFragment.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/EPackage.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/add_column.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/application_form.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_down.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_up.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bullet_go.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bundle.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/chart_organisation.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_default_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj@2x.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/command.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/copy_to_project.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/cross.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/error_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_default_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_private_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_protected_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_public_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_attribute.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_item.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/find.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/headermenu.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/mark_occurrences.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/missing_image_placeholder.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj@2x.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/projects.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/remove_filter.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/reset_columns.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_add.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_delete.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/use_anyway.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/world_edit.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/obj16/zoom.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/button_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ccombo_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/checkbox_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/clabel_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/comboviewer_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/composite_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/coolbar_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ctabfolder_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/group_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/label_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menu_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menubar_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuitem_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuseparator_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/progressbar_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/radiobutton_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/sashform_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/separator_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/shell_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tabfolder_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/table_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/text_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolbar_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemcheck_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemdrop_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitempush_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemradio_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemseparator_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tree_obj.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/wizban/add_to_dir_wiz.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/wizban/attribute_wiz.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/wizban/error_wiz.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/wizban/extstr_wiz.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/wizban/fieldrefact_wiz.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/wizban/imp3x_wiz.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/wizban/import_wiz.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/wizban/location_wiz.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newclass_wiz.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newefix_wizban.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newexp_wiz.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newfolder_wiz.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz@2x.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/wizban/package_wiz.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/wizban/plugin_wiz.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/icons/full/wizban/typerefact_wiz.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/plugin.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/plugin.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/pom.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.scripting.exsd (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelExtractor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IScriptingSupport.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ModelEditorPreferences.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Plugin.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ModelResultHandlerImpl.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/Messages.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/AbstractVTrimEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlsEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorTrimEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartTrimEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveTrimEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/AccessLevel.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaMethod.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/Messages.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/messages.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/IXMLColorConstants.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLPartitionScanner.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateElementIdsHandler.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateLabelsHandler.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/Messages.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryStruct.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/messages.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.jdt.templates/.classpath (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.resources.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.api.tools.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.jdt.templates/about.html (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.jdt.templates/build.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.jdt.templates/icons/full/elcl16/e4assist_co.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.jdt.templates/plugin.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.jdt.templates/plugin.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.jdt.templates/pom.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/.classpath (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.resources.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.api.tools.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/OSGI-INF/l10n/bundle.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/about.html (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/build.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/model/persistence.ecore (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/model/persistence.genmodel (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/plugin.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/pom.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPartMemento.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistenceFactory.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistencePackage.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IWorkbenchState.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PartMemento.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistenceFactory.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistencePackage.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/WorkbenchState.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceAdapterFactory.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/.classpath (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/.settings/org.eclipse.core.resources.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.api.tools.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/OSGI-INF/l10n/bundle.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/OSGI-INF/resourcepoolfunction.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/OSGI-INF/resourceservice.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/about.html (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/build.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/forceQualifierUpdate.txt (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/pom.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourcePool.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceProviderService.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesConstants.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/messages.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/.classpath (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/.settings/org.eclipse.core.resources.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/.settings/org.eclipse.pde.api.tools.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/.settings/org.eclipse.pde.prefs (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/META-INF/MANIFEST.MF (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/README.md (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/about.html (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/build.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/forceQualifierUpdate.txt (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/icons/full/obj16/Addons.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/icons/full/obj16/Part.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/icons/full/obj16/ToolControl.gif (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/icons/full/obj16/application_view_tile.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/icons/full/obj16/class_obj.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/icons/full/obj16/class_obj@2x.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/icons/full/obj16/plugin.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/icons/full/wizban/newclass_wiz.png (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/HandlerTemplate.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/HandlerTemplate.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/plugin.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/pom.xml (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java (100%)
 rename {bundles => tools/bundles}/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java (100%)
 rename {features => tools/features}/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {features => tools/features}/org.eclipse.e4.core.tools.feature/build.properties (100%)
 rename {features => tools/features}/org.eclipse.e4.core.tools.feature/feature.properties (100%)
 rename {features => tools/features}/org.eclipse.e4.core.tools.feature/feature.xml (100%)
 rename {features => tools/features}/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt (100%)
 rename {features => tools/features}/org.eclipse.e4.core.tools.feature/pom.xml (100%)
 rename {features => tools/features}/org.eclipse.e4.tools.persistence.feature/.settings/org.eclipse.core.resources.prefs (100%)
 rename {features => tools/features}/org.eclipse.e4.tools.persistence.feature/build.properties (100%)
 rename {features => tools/features}/org.eclipse.e4.tools.persistence.feature/feature.properties (100%)
 rename {features => tools/features}/org.eclipse.e4.tools.persistence.feature/feature.xml (100%)
 rename {features => tools/features}/org.eclipse.e4.tools.persistence.feature/forceQualifierUpdate.txt (100%)
 rename {features => tools/features}/org.eclipse.e4.tools.persistence.feature/pom.xml (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.compatibility.migration.tests/.classpath (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.resources.prefs (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.pde.prefs (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.compatibility.migration.tests/build.properties (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.compatibility.migration.tests/resources/e4_test.xml (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.compatibility.migration.tests/resources/perspective_3x.xml (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/util/TestWorkbenchAdvisor.java (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.persistence.tests/.classpath (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.resources.prefs (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.pde.prefs (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.persistence.tests/build.properties (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.persistence.tests/plugin.xml (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.persistence.tests/pom.xml (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.persistence.tests/resources/workbench_restore.persistence (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestPerspective.java (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestViewPart.java (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestWorkbenchAdvisor.java (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.test/.classpath (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.test/.settings/org.eclipse.core.resources.prefs (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.test/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.api.tools.prefs (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.core.prefs (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.prefs (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.test/build.properties (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.test/pom.xml (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java (100%)
 rename {tests => tools/tests}/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java (100%)

diff --git a/bundles/org.eclipse.e4.tools.compat/.project b/bundles/org.eclipse.e4.tools.compat/.project
deleted file mode 100644
index 8111d8c2f8..0000000000
--- a/bundles/org.eclipse.e4.tools.compat/.project
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.e4.tools.compat</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/.project b/bundles/org.eclipse.e4.tools.compatibility.migration/.project
deleted file mode 100644
index d282bdb0b9..0000000000
--- a/bundles/org.eclipse.e4.tools.compatibility.migration/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.e4.tools.compatibility.migration</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.project b/bundles/org.eclipse.e4.tools.emf.editor3x/.project
deleted file mode 100644
index c9d1c1fb8b..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/.project
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.e4.tools.emf.editor3x</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.project b/bundles/org.eclipse.e4.tools.emf.ui/.project
deleted file mode 100644
index 3abd68fc02..0000000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/.project
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.e4.tools.emf.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.project b/bundles/org.eclipse.e4.tools.jdt.templates/.project
deleted file mode 100644
index 7df5862ed2..0000000000
--- a/bundles/org.eclipse.e4.tools.jdt.templates/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.e4.tools.jdt.templates</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.persistence/.project b/bundles/org.eclipse.e4.tools.persistence/.project
deleted file mode 100644
index 68f366696b..0000000000
--- a/bundles/org.eclipse.e4.tools.persistence/.project
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.e4.tools.persistence</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.services/.project b/bundles/org.eclipse.e4.tools.services/.project
deleted file mode 100644
index c5473d21d5..0000000000
--- a/bundles/org.eclipse.e4.tools.services/.project
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.e4.tools.services</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.e4.tools/.project b/bundles/org.eclipse.e4.tools/.project
deleted file mode 100644
index b2c0152a05..0000000000
--- a/bundles/org.eclipse.e4.tools/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.e4.tools</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.e4.core.tools.feature/.project b/features/org.eclipse.e4.core.tools.feature/.project
deleted file mode 100644
index d0fa7e4498..0000000000
--- a/features/org.eclipse.e4.core.tools.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.e4.core.tools.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.e4.tools.persistence.feature/.project b/features/org.eclipse.e4.tools.persistence.feature/.project
deleted file mode 100644
index c94c351fa4..0000000000
--- a/features/org.eclipse.e4.tools.persistence.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.e4.tools.persistence.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/.project b/tests/org.eclipse.e4.tools.compatibility.migration.tests/.project
deleted file mode 100644
index 509256eb47..0000000000
--- a/tests/org.eclipse.e4.tools.compatibility.migration.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.e4.tools.compatibility.migration.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/.project b/tests/org.eclipse.e4.tools.persistence.tests/.project
deleted file mode 100644
index 92bcd35f66..0000000000
--- a/tests/org.eclipse.e4.tools.persistence.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.e4.tools.persistence.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.e4.tools.test/.project b/tests/org.eclipse.e4.tools.test/.project
deleted file mode 100644
index 907fbfb398..0000000000
--- a/tests/org.eclipse.e4.tools.test/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.e4.tools.test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.e4.tools.compat/.classpath b/tools/bundles/org.eclipse.e4.tools.compat/.classpath
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/.classpath
rename to tools/bundles/org.eclipse.e4.tools.compat/.classpath
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs b/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs
rename to tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs b/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs
rename to tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
rename to tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs b/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
rename to tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs b/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs
rename to tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs b/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs
rename to tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs
diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
rename to tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
diff --git a/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties b/tools/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties
rename to tools/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties
diff --git a/bundles/org.eclipse.e4.tools.compat/about.html b/tools/bundles/org.eclipse.e4.tools.compat/about.html
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/about.html
rename to tools/bundles/org.eclipse.e4.tools.compat/about.html
diff --git a/bundles/org.eclipse.e4.tools.compat/build.properties b/tools/bundles/org.eclipse.e4.tools.compat/build.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/build.properties
rename to tools/bundles/org.eclipse.e4.tools.compat/build.properties
diff --git a/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
rename to tools/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
diff --git a/bundles/org.eclipse.e4.tools.compat/plugin.xml b/tools/bundles/org.eclipse.e4.tools.compat/plugin.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/plugin.xml
rename to tools/bundles/org.eclipse.e4.tools.compat/plugin.xml
diff --git a/bundles/org.eclipse.e4.tools.compat/pom.xml b/tools/bundles/org.eclipse.e4.tools.compat/pom.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/pom.xml
rename to tools/bundles/org.eclipse.e4.tools.compat/pom.xml
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
rename to tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
rename to tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
rename to tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
rename to tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
rename to tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
rename to tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
rename to tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
rename to tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
rename to tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties
rename to tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
rename to tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
rename to tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
rename to tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
rename to tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
rename to tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/.classpath b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/.classpath
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compatibility.migration/.classpath
rename to tools/bundles/org.eclipse.e4.tools.compatibility.migration/.classpath
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.core.resources.prefs b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.core.resources.prefs
rename to tools/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.core.resources.prefs
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.jdt.core.prefs
rename to tools/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.jdt.core.prefs
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
rename to tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/OSGI-INF/l10n/bundle.properties b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compatibility.migration/OSGI-INF/l10n/bundle.properties
rename to tools/bundles/org.eclipse.e4.tools.compatibility.migration/OSGI-INF/l10n/bundle.properties
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/build.properties b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/build.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compatibility.migration/build.properties
rename to tools/bundles/org.eclipse.e4.tools.compatibility.migration/build.properties
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/pom.xml b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/pom.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compatibility.migration/pom.xml
rename to tools/bundles/org.eclipse.e4.tools.compatibility.migration/pom.xml
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java
rename to tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
rename to tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
diff --git a/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/WorkbenchUtil.java b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/WorkbenchUtil.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/WorkbenchUtil.java
rename to tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/WorkbenchUtil.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.resources.prefs b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.resources.prefs
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.resources.prefs
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.runtime.prefs b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.runtime.prefs
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.runtime.prefs
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.api.tools.prefs b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.api.tools.prefs
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.prefs b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.prefs
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.prefs
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/modelextractor.xml b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/modelextractor.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/modelextractor.xml
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/modelextractor.xml
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdee4xmiprovider.xml b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdee4xmiprovider.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdee4xmiprovider.xml
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdee4xmiprovider.xml
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdeextensionlookup.xml b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdeextensionlookup.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdeextensionlookup.xml
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdeextensionlookup.xml
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/projectfunction.xml b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/projectfunction.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/projectfunction.xml
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/projectfunction.xml
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/xmiresourcecontextfunction.xml b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/xmiresourcecontextfunction.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/xmiresourcecontextfunction.xml
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/xmiresourcecontextfunction.xml
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/about.html b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/about.html
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/about.html
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/about.html
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/application_view_tile.png b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/application_view_tile.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/application_view_tile.png
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/application_view_tile.png
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ImperativeExpressionContributionEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ImperativeExpressionContributionEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ImperativeExpressionContributionEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ImperativeExpressionContributionEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/messages.properties b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/messages.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/messages.properties
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/messages.properties
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelMoveParticipant.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelMoveParticipant.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelMoveParticipant.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelMoveParticipant.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelRenameParticipant.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelRenameParticipant.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelRenameParticipant.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelRenameParticipant.java
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java
rename to tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.classpath b/tools/bundles/org.eclipse.e4.tools.emf.ui/.classpath
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/.classpath
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/.classpath
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.resources.prefs b/tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.resources.prefs
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.runtime.prefs b/tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.runtime.prefs
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.runtime.prefs
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs b/tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.api.tools.prefs b/tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.api.tools.prefs
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.core.prefs b/tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.core.prefs
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.core.prefs
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.prefs b/tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.prefs
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.prefs
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml b/tools/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resourceprovider.xml b/tools/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resourceprovider.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resourceprovider.xml
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resourceprovider.xml
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties b/tools/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/README.md b/tools/bundles/org.eclipse.e4.tools.emf.ui/README.md
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/README.md
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/README.md
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/about.html b/tools/bundles/org.eclipse.e4.tools.emf.ui/about.html
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/about.html
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/about.html
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/build.properties b/tools/bundles/org.eclipse.e4.tools.emf.ui/build.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/build.properties
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/build.properties
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/css/default.css b/tools/bundles/org.eclipse.e4.tools.emf.ui/css/default.css
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/css/default.css
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/css/default.css
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi b/tools/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area_vertical.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area_vertical.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area_vertical.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area_vertical.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingTable.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingTable.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingTable.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingTable.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Category.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Category.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Category.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Category.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CoreExpression.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CoreExpression.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CoreExpression.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CoreExpression.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DynamicMenuContribution.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DynamicMenuContribution.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DynamicMenuContribution.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DynamicMenuContribution.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelFragments.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelFragments.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelFragments.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelFragments.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartDescriptor.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartDescriptor.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartDescriptor.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartDescriptor.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/StringModelFragment.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/StringModelFragment.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/StringModelFragment.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/StringModelFragment.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/EPackage.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/EPackage.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/EPackage.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/EPackage.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/add_column.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/add_column.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/add_column.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/add_column.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/application_form.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/application_form.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/application_form.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/application_form.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_down.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_down.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_down.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_down.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_up.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_up.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_up.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_up.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bullet_go.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bullet_go.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bullet_go.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bullet_go.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bundle.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bundle.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bundle.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bundle.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/chart_organisation.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/chart_organisation.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/chart_organisation.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/chart_organisation.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_default_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_default_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_default_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_default_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj@2x.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj@2x.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj@2x.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj@2x.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/command.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/command.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/command.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/command.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/copy_to_project.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/copy_to_project.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/copy_to_project.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/copy_to_project.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/cross.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/cross.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/cross.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/cross.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/error_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/error_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/error_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/error_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_default_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_default_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_default_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_default_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_private_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_private_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_private_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_private_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_protected_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_protected_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_protected_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_protected_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_public_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_public_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_public_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_public_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_attribute.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_attribute.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_attribute.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_attribute.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_item.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_item.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_item.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_item.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/find.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/find.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/find.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/find.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/headermenu.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/headermenu.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/headermenu.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/headermenu.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/mark_occurrences.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/mark_occurrences.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/mark_occurrences.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/mark_occurrences.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/missing_image_placeholder.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/missing_image_placeholder.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/missing_image_placeholder.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/missing_image_placeholder.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj@2x.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj@2x.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj@2x.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj@2x.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/projects.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/projects.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/projects.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/projects.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/remove_filter.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/remove_filter.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/remove_filter.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/remove_filter.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/reset_columns.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/reset_columns.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/reset_columns.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/reset_columns.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_add.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_add.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_add.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_add.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_delete.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_delete.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_delete.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_delete.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/use_anyway.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/use_anyway.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/use_anyway.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/use_anyway.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/world_edit.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/world_edit.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/world_edit.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/world_edit.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/zoom.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/zoom.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/zoom.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/zoom.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/button_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/button_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/button_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/button_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ccombo_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ccombo_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ccombo_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ccombo_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/checkbox_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/checkbox_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/checkbox_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/checkbox_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/clabel_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/clabel_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/clabel_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/clabel_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/comboviewer_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/comboviewer_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/comboviewer_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/comboviewer_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/composite_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/composite_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/composite_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/composite_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/coolbar_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/coolbar_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/coolbar_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/coolbar_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ctabfolder_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ctabfolder_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ctabfolder_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ctabfolder_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/group_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/group_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/group_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/group_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/label_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/label_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/label_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/label_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menu_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menu_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menu_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menu_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menubar_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menubar_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menubar_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menubar_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuitem_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuitem_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuitem_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuitem_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuseparator_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuseparator_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuseparator_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuseparator_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/progressbar_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/progressbar_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/progressbar_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/progressbar_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/radiobutton_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/radiobutton_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/radiobutton_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/radiobutton_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/sashform_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/sashform_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/sashform_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/sashform_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/separator_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/separator_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/separator_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/separator_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/shell_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/shell_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/shell_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/shell_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tabfolder_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tabfolder_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tabfolder_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tabfolder_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/table_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/table_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/table_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/table_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/text_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/text_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/text_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/text_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolbar_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolbar_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolbar_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolbar_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemcheck_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemcheck_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemcheck_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemcheck_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemdrop_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemdrop_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemdrop_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemdrop_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitempush_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitempush_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitempush_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitempush_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemradio_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemradio_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemradio_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemradio_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemseparator_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemseparator_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemseparator_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemseparator_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tree_obj.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tree_obj.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tree_obj.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tree_obj.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/add_to_dir_wiz.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/add_to_dir_wiz.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/add_to_dir_wiz.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/add_to_dir_wiz.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/attribute_wiz.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/attribute_wiz.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/attribute_wiz.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/attribute_wiz.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/error_wiz.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/error_wiz.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/error_wiz.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/error_wiz.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/extstr_wiz.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/extstr_wiz.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/extstr_wiz.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/extstr_wiz.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/fieldrefact_wiz.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/fieldrefact_wiz.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/fieldrefact_wiz.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/fieldrefact_wiz.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/imp3x_wiz.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/imp3x_wiz.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/imp3x_wiz.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/imp3x_wiz.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/import_wiz.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/import_wiz.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/import_wiz.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/import_wiz.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/location_wiz.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/location_wiz.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/location_wiz.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/location_wiz.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newclass_wiz.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newclass_wiz.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newclass_wiz.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newclass_wiz.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newefix_wizban.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newefix_wizban.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newefix_wizban.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newefix_wizban.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newexp_wiz.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newexp_wiz.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newexp_wiz.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newexp_wiz.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newfolder_wiz.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newfolder_wiz.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newfolder_wiz.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newfolder_wiz.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz@2x.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz@2x.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz@2x.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz@2x.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/package_wiz.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/package_wiz.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/package_wiz.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/package_wiz.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/plugin_wiz.gif b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/plugin_wiz.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/plugin_wiz.gif
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/plugin_wiz.gif
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/typerefact_wiz.png b/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/typerefact_wiz.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/typerefact_wiz.png
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/typerefact_wiz.png
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties b/tools/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/plugin.properties
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml b/tools/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/pom.xml
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd b/tools/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.scripting.exsd b/tools/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.scripting.exsd
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.scripting.exsd
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.scripting.exsd
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelExtractor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelExtractor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelExtractor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelExtractor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IScriptingSupport.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IScriptingSupport.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IScriptingSupport.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IScriptingSupport.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ModelEditorPreferences.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ModelEditorPreferences.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ModelEditorPreferences.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ModelEditorPreferences.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Plugin.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Plugin.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Plugin.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Plugin.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ModelResultHandlerImpl.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ModelResultHandlerImpl.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ModelResultHandlerImpl.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ModelResultHandlerImpl.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/Messages.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/Messages.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/Messages.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/Messages.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/AbstractVTrimEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/AbstractVTrimEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/AbstractVTrimEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/AbstractVTrimEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlsEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlsEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlsEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorTrimEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorTrimEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorTrimEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorTrimEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartTrimEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartTrimEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartTrimEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartTrimEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveTrimEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveTrimEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveTrimEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveTrimEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/AccessLevel.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/AccessLevel.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/AccessLevel.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/AccessLevel.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaMethod.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaMethod.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaMethod.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaMethod.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/Messages.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/Messages.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/Messages.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/Messages.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/messages.properties b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/messages.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/messages.properties
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/messages.properties
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/IXMLColorConstants.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/IXMLColorConstants.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/IXMLColorConstants.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/IXMLColorConstants.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLPartitionScanner.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLPartitionScanner.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLPartitionScanner.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLPartitionScanner.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateElementIdsHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateElementIdsHandler.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateElementIdsHandler.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateElementIdsHandler.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateLabelsHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateLabelsHandler.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateLabelsHandler.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateLabelsHandler.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/Messages.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/Messages.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/Messages.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/Messages.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryStruct.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryStruct.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryStruct.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryStruct.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/messages.properties b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/messages.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/messages.properties
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/messages.properties
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
rename to tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.classpath b/tools/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
similarity index 100%
rename from bundles/org.eclipse.e4.tools.jdt.templates/.classpath
rename to tools/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.resources.prefs b/tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.resources.prefs
rename to tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.resources.prefs
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.runtime.prefs b/tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.runtime.prefs
rename to tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.runtime.prefs
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
rename to tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs b/tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
rename to tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.api.tools.prefs b/tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.api.tools.prefs
rename to tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.prefs b/tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.prefs
rename to tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.prefs
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
rename to tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/about.html b/tools/bundles/org.eclipse.e4.tools.jdt.templates/about.html
similarity index 100%
rename from bundles/org.eclipse.e4.tools.jdt.templates/about.html
rename to tools/bundles/org.eclipse.e4.tools.jdt.templates/about.html
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/build.properties b/tools/bundles/org.eclipse.e4.tools.jdt.templates/build.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.jdt.templates/build.properties
rename to tools/bundles/org.eclipse.e4.tools.jdt.templates/build.properties
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt
similarity index 100%
rename from bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt
rename to tools/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/icons/full/elcl16/e4assist_co.gif b/tools/bundles/org.eclipse.e4.tools.jdt.templates/icons/full/elcl16/e4assist_co.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools.jdt.templates/icons/full/elcl16/e4assist_co.gif
rename to tools/bundles/org.eclipse.e4.tools.jdt.templates/icons/full/elcl16/e4assist_co.gif
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties b/tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties
rename to tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml b/tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
rename to tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/tools/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
rename to tools/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java b/tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
rename to tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java b/tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
rename to tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml b/tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
rename to tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
diff --git a/bundles/org.eclipse.e4.tools.persistence/.classpath b/tools/bundles/org.eclipse.e4.tools.persistence/.classpath
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/.classpath
rename to tools/bundles/org.eclipse.e4.tools.persistence/.classpath
diff --git a/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.resources.prefs b/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.resources.prefs
rename to tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.resources.prefs
diff --git a/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.runtime.prefs b/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.runtime.prefs
rename to tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.runtime.prefs
diff --git a/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs
rename to tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs
diff --git a/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.ui.prefs b/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.ui.prefs
rename to tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.ui.prefs
diff --git a/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.api.tools.prefs b/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.api.tools.prefs
rename to tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.prefs b/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.prefs
rename to tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.prefs
diff --git a/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
rename to tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
diff --git a/bundles/org.eclipse.e4.tools.persistence/OSGI-INF/l10n/bundle.properties b/tools/bundles/org.eclipse.e4.tools.persistence/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/OSGI-INF/l10n/bundle.properties
rename to tools/bundles/org.eclipse.e4.tools.persistence/OSGI-INF/l10n/bundle.properties
diff --git a/bundles/org.eclipse.e4.tools.persistence/about.html b/tools/bundles/org.eclipse.e4.tools.persistence/about.html
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/about.html
rename to tools/bundles/org.eclipse.e4.tools.persistence/about.html
diff --git a/bundles/org.eclipse.e4.tools.persistence/build.properties b/tools/bundles/org.eclipse.e4.tools.persistence/build.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/build.properties
rename to tools/bundles/org.eclipse.e4.tools.persistence/build.properties
diff --git a/bundles/org.eclipse.e4.tools.persistence/model/persistence.ecore b/tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.ecore
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/model/persistence.ecore
rename to tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.ecore
diff --git a/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel b/tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel
rename to tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel
diff --git a/bundles/org.eclipse.e4.tools.persistence/plugin.xml b/tools/bundles/org.eclipse.e4.tools.persistence/plugin.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/plugin.xml
rename to tools/bundles/org.eclipse.e4.tools.persistence/plugin.xml
diff --git a/bundles/org.eclipse.e4.tools.persistence/pom.xml b/tools/bundles/org.eclipse.e4.tools.persistence/pom.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/pom.xml
rename to tools/bundles/org.eclipse.e4.tools.persistence/pom.xml
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPartMemento.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPartMemento.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPartMemento.java
rename to tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPartMemento.java
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistenceFactory.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistenceFactory.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistenceFactory.java
rename to tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistenceFactory.java
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistencePackage.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistencePackage.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistencePackage.java
rename to tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistencePackage.java
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IWorkbenchState.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IWorkbenchState.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IWorkbenchState.java
rename to tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IWorkbenchState.java
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PartMemento.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PartMemento.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PartMemento.java
rename to tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PartMemento.java
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistenceFactory.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistenceFactory.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistenceFactory.java
rename to tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistenceFactory.java
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistencePackage.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistencePackage.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistencePackage.java
rename to tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistencePackage.java
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/WorkbenchState.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/WorkbenchState.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/WorkbenchState.java
rename to tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/WorkbenchState.java
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java
rename to tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceAdapterFactory.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceAdapterFactory.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceAdapterFactory.java
rename to tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceAdapterFactory.java
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java
rename to tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java
diff --git a/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java
rename to tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java
diff --git a/bundles/org.eclipse.e4.tools.services/.classpath b/tools/bundles/org.eclipse.e4.tools.services/.classpath
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/.classpath
rename to tools/bundles/org.eclipse.e4.tools.services/.classpath
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.resources.prefs b/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.resources.prefs
rename to tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.resources.prefs
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.runtime.prefs b/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.runtime.prefs
rename to tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.runtime.prefs
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
rename to tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs b/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
rename to tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.api.tools.prefs b/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.api.tools.prefs
rename to tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.prefs b/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.prefs
rename to tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.prefs
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
rename to tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
diff --git a/bundles/org.eclipse.e4.tools.services/OSGI-INF/l10n/bundle.properties b/tools/bundles/org.eclipse.e4.tools.services/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/OSGI-INF/l10n/bundle.properties
rename to tools/bundles/org.eclipse.e4.tools.services/OSGI-INF/l10n/bundle.properties
diff --git a/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourcepoolfunction.xml b/tools/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourcepoolfunction.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/OSGI-INF/resourcepoolfunction.xml
rename to tools/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourcepoolfunction.xml
diff --git a/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourceservice.xml b/tools/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourceservice.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/OSGI-INF/resourceservice.xml
rename to tools/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourceservice.xml
diff --git a/bundles/org.eclipse.e4.tools.services/about.html b/tools/bundles/org.eclipse.e4.tools.services/about.html
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/about.html
rename to tools/bundles/org.eclipse.e4.tools.services/about.html
diff --git a/bundles/org.eclipse.e4.tools.services/build.properties b/tools/bundles/org.eclipse.e4.tools.services/build.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/build.properties
rename to tools/bundles/org.eclipse.e4.tools.services/build.properties
diff --git a/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
rename to tools/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
diff --git a/bundles/org.eclipse.e4.tools.services/pom.xml b/tools/bundles/org.eclipse.e4.tools.services/pom.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/pom.xml
rename to tools/bundles/org.eclipse.e4.tools.services/pom.xml
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java
rename to tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java
rename to tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java
rename to tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourcePool.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourcePool.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourcePool.java
rename to tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourcePool.java
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceProviderService.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceProviderService.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceProviderService.java
rename to tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceProviderService.java
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java
rename to tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesConstants.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesConstants.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesConstants.java
rename to tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesConstants.java
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java
rename to tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
rename to tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
rename to tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java
rename to tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
rename to tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/messages.properties b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/messages.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/messages.properties
rename to tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/messages.properties
diff --git a/bundles/org.eclipse.e4.tools/.classpath b/tools/bundles/org.eclipse.e4.tools/.classpath
similarity index 100%
rename from bundles/org.eclipse.e4.tools/.classpath
rename to tools/bundles/org.eclipse.e4.tools/.classpath
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.resources.prefs b/tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.resources.prefs
rename to tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.resources.prefs
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.runtime.prefs b/tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.runtime.prefs
rename to tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.runtime.prefs
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
rename to tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs b/tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
rename to tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.api.tools.prefs b/tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.api.tools.prefs
rename to tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.prefs b/tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.prefs
rename to tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.prefs
diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
rename to tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
diff --git a/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties b/tools/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
rename to tools/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
diff --git a/bundles/org.eclipse.e4.tools/README.md b/tools/bundles/org.eclipse.e4.tools/README.md
similarity index 100%
rename from bundles/org.eclipse.e4.tools/README.md
rename to tools/bundles/org.eclipse.e4.tools/README.md
diff --git a/bundles/org.eclipse.e4.tools/about.html b/tools/bundles/org.eclipse.e4.tools/about.html
similarity index 100%
rename from bundles/org.eclipse.e4.tools/about.html
rename to tools/bundles/org.eclipse.e4.tools/about.html
diff --git a/bundles/org.eclipse.e4.tools/build.properties b/tools/bundles/org.eclipse.e4.tools/build.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools/build.properties
rename to tools/bundles/org.eclipse.e4.tools/build.properties
diff --git a/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
similarity index 100%
rename from bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
rename to tools/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
diff --git a/bundles/org.eclipse.e4.tools/icons/full/obj16/Addons.png b/tools/bundles/org.eclipse.e4.tools/icons/full/obj16/Addons.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools/icons/full/obj16/Addons.png
rename to tools/bundles/org.eclipse.e4.tools/icons/full/obj16/Addons.png
diff --git a/bundles/org.eclipse.e4.tools/icons/full/obj16/Part.gif b/tools/bundles/org.eclipse.e4.tools/icons/full/obj16/Part.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools/icons/full/obj16/Part.gif
rename to tools/bundles/org.eclipse.e4.tools/icons/full/obj16/Part.gif
diff --git a/bundles/org.eclipse.e4.tools/icons/full/obj16/ToolControl.gif b/tools/bundles/org.eclipse.e4.tools/icons/full/obj16/ToolControl.gif
similarity index 100%
rename from bundles/org.eclipse.e4.tools/icons/full/obj16/ToolControl.gif
rename to tools/bundles/org.eclipse.e4.tools/icons/full/obj16/ToolControl.gif
diff --git a/bundles/org.eclipse.e4.tools/icons/full/obj16/application_view_tile.png b/tools/bundles/org.eclipse.e4.tools/icons/full/obj16/application_view_tile.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools/icons/full/obj16/application_view_tile.png
rename to tools/bundles/org.eclipse.e4.tools/icons/full/obj16/application_view_tile.png
diff --git a/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.png b/tools/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.png
rename to tools/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.png
diff --git a/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj@2x.png b/tools/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj@2x.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj@2x.png
rename to tools/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj@2x.png
diff --git a/bundles/org.eclipse.e4.tools/icons/full/obj16/plugin.png b/tools/bundles/org.eclipse.e4.tools/icons/full/obj16/plugin.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools/icons/full/obj16/plugin.png
rename to tools/bundles/org.eclipse.e4.tools/icons/full/obj16/plugin.png
diff --git a/bundles/org.eclipse.e4.tools/icons/full/wizban/newclass_wiz.png b/tools/bundles/org.eclipse.e4.tools/icons/full/wizban/newclass_wiz.png
similarity index 100%
rename from bundles/org.eclipse.e4.tools/icons/full/wizban/newclass_wiz.png
rename to tools/bundles/org.eclipse.e4.tools/icons/full/wizban/newclass_wiz.png
diff --git a/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/HandlerTemplate.java b/tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/HandlerTemplate.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/HandlerTemplate.java
rename to tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/HandlerTemplate.java
diff --git a/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java b/tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java
rename to tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java
diff --git a/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/HandlerTemplate.java b/tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/HandlerTemplate.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/HandlerTemplate.java
rename to tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/HandlerTemplate.java
diff --git a/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java b/tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java
rename to tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java
diff --git a/bundles/org.eclipse.e4.tools/plugin.xml b/tools/bundles/org.eclipse.e4.tools/plugin.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools/plugin.xml
rename to tools/bundles/org.eclipse.e4.tools/plugin.xml
diff --git a/bundles/org.eclipse.e4.tools/pom.xml b/tools/bundles/org.eclipse.e4.tools/pom.xml
similarity index 100%
rename from bundles/org.eclipse.e4.tools/pom.xml
rename to tools/bundles/org.eclipse.e4.tools/pom.xml
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
similarity index 100%
rename from bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
rename to tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
diff --git a/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.runtime.prefs b/tools/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.runtime.prefs
rename to tools/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.runtime.prefs
diff --git a/features/org.eclipse.e4.core.tools.feature/build.properties b/tools/features/org.eclipse.e4.core.tools.feature/build.properties
similarity index 100%
rename from features/org.eclipse.e4.core.tools.feature/build.properties
rename to tools/features/org.eclipse.e4.core.tools.feature/build.properties
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.properties b/tools/features/org.eclipse.e4.core.tools.feature/feature.properties
similarity index 100%
rename from features/org.eclipse.e4.core.tools.feature/feature.properties
rename to tools/features/org.eclipse.e4.core.tools.feature/feature.properties
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
similarity index 100%
rename from features/org.eclipse.e4.core.tools.feature/feature.xml
rename to tools/features/org.eclipse.e4.core.tools.feature/feature.xml
diff --git a/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt b/tools/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt
similarity index 100%
rename from features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt
rename to tools/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt
diff --git a/features/org.eclipse.e4.core.tools.feature/pom.xml b/tools/features/org.eclipse.e4.core.tools.feature/pom.xml
similarity index 100%
rename from features/org.eclipse.e4.core.tools.feature/pom.xml
rename to tools/features/org.eclipse.e4.core.tools.feature/pom.xml
diff --git a/features/org.eclipse.e4.tools.persistence.feature/.settings/org.eclipse.core.resources.prefs b/tools/features/org.eclipse.e4.tools.persistence.feature/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from features/org.eclipse.e4.tools.persistence.feature/.settings/org.eclipse.core.resources.prefs
rename to tools/features/org.eclipse.e4.tools.persistence.feature/.settings/org.eclipse.core.resources.prefs
diff --git a/features/org.eclipse.e4.tools.persistence.feature/build.properties b/tools/features/org.eclipse.e4.tools.persistence.feature/build.properties
similarity index 100%
rename from features/org.eclipse.e4.tools.persistence.feature/build.properties
rename to tools/features/org.eclipse.e4.tools.persistence.feature/build.properties
diff --git a/features/org.eclipse.e4.tools.persistence.feature/feature.properties b/tools/features/org.eclipse.e4.tools.persistence.feature/feature.properties
similarity index 100%
rename from features/org.eclipse.e4.tools.persistence.feature/feature.properties
rename to tools/features/org.eclipse.e4.tools.persistence.feature/feature.properties
diff --git a/features/org.eclipse.e4.tools.persistence.feature/feature.xml b/tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml
similarity index 100%
rename from features/org.eclipse.e4.tools.persistence.feature/feature.xml
rename to tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml
diff --git a/features/org.eclipse.e4.tools.persistence.feature/forceQualifierUpdate.txt b/tools/features/org.eclipse.e4.tools.persistence.feature/forceQualifierUpdate.txt
similarity index 100%
rename from features/org.eclipse.e4.tools.persistence.feature/forceQualifierUpdate.txt
rename to tools/features/org.eclipse.e4.tools.persistence.feature/forceQualifierUpdate.txt
diff --git a/features/org.eclipse.e4.tools.persistence.feature/pom.xml b/tools/features/org.eclipse.e4.tools.persistence.feature/pom.xml
similarity index 100%
rename from features/org.eclipse.e4.tools.persistence.feature/pom.xml
rename to tools/features/org.eclipse.e4.tools.persistence.feature/pom.xml
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/.classpath b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.classpath
similarity index 100%
rename from tests/org.eclipse.e4.tools.compatibility.migration.tests/.classpath
rename to tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.classpath
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.resources.prefs b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.resources.prefs
rename to tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.runtime.prefs b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.runtime.prefs
rename to tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.runtime.prefs
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs
rename to tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.ui.prefs b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.ui.prefs
rename to tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.pde.prefs b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.pde.prefs
rename to tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.pde.prefs
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF
rename to tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/build.properties b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/build.properties
similarity index 100%
rename from tests/org.eclipse.e4.tools.compatibility.migration.tests/build.properties
rename to tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/build.properties
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
similarity index 100%
rename from tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
rename to tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/e4_test.xml b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/e4_test.xml
similarity index 100%
rename from tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/e4_test.xml
rename to tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/e4_test.xml
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/perspective_3x.xml b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/perspective_3x.xml
similarity index 100%
rename from tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/perspective_3x.xml
rename to tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/perspective_3x.xml
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java
similarity index 100%
rename from tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java
rename to tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java
diff --git a/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/util/TestWorkbenchAdvisor.java b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/util/TestWorkbenchAdvisor.java
similarity index 100%
rename from tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/util/TestWorkbenchAdvisor.java
rename to tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/util/TestWorkbenchAdvisor.java
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/.classpath b/tools/tests/org.eclipse.e4.tools.persistence.tests/.classpath
similarity index 100%
rename from tests/org.eclipse.e4.tools.persistence.tests/.classpath
rename to tools/tests/org.eclipse.e4.tools.persistence.tests/.classpath
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.resources.prefs b/tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.resources.prefs
rename to tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.runtime.prefs b/tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.runtime.prefs
rename to tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.runtime.prefs
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs b/tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs
rename to tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.ui.prefs b/tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.ui.prefs
rename to tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.pde.prefs b/tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.pde.prefs
rename to tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.pde.prefs
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF b/tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF
rename to tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/build.properties b/tools/tests/org.eclipse.e4.tools.persistence.tests/build.properties
similarity index 100%
rename from tests/org.eclipse.e4.tools.persistence.tests/build.properties
rename to tools/tests/org.eclipse.e4.tools.persistence.tests/build.properties
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/plugin.xml b/tools/tests/org.eclipse.e4.tools.persistence.tests/plugin.xml
similarity index 100%
rename from tests/org.eclipse.e4.tools.persistence.tests/plugin.xml
rename to tools/tests/org.eclipse.e4.tools.persistence.tests/plugin.xml
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/pom.xml b/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
similarity index 100%
rename from tests/org.eclipse.e4.tools.persistence.tests/pom.xml
rename to tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/resources/workbench_restore.persistence b/tools/tests/org.eclipse.e4.tools.persistence.tests/resources/workbench_restore.persistence
similarity index 100%
rename from tests/org.eclipse.e4.tools.persistence.tests/resources/workbench_restore.persistence
rename to tools/tests/org.eclipse.e4.tools.persistence.tests/resources/workbench_restore.persistence
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java b/tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java
similarity index 100%
rename from tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java
rename to tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestPerspective.java b/tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestPerspective.java
similarity index 100%
rename from tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestPerspective.java
rename to tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestPerspective.java
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestViewPart.java b/tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestViewPart.java
similarity index 100%
rename from tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestViewPart.java
rename to tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestViewPart.java
diff --git a/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestWorkbenchAdvisor.java b/tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestWorkbenchAdvisor.java
similarity index 100%
rename from tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestWorkbenchAdvisor.java
rename to tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestWorkbenchAdvisor.java
diff --git a/tests/org.eclipse.e4.tools.test/.classpath b/tools/tests/org.eclipse.e4.tools.test/.classpath
similarity index 100%
rename from tests/org.eclipse.e4.tools.test/.classpath
rename to tools/tests/org.eclipse.e4.tools.test/.classpath
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.resources.prefs b/tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.resources.prefs
rename to tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.resources.prefs
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.runtime.prefs b/tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.runtime.prefs
rename to tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.runtime.prefs
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs b/tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs
rename to tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs b/tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs
rename to tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.api.tools.prefs b/tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.api.tools.prefs
rename to tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.core.prefs b/tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.core.prefs
rename to tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.core.prefs
diff --git a/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.prefs b/tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.prefs
rename to tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.prefs
diff --git a/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF b/tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
similarity index 100%
rename from tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
rename to tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
diff --git a/tests/org.eclipse.e4.tools.test/build.properties b/tools/tests/org.eclipse.e4.tools.test/build.properties
similarity index 100%
rename from tests/org.eclipse.e4.tools.test/build.properties
rename to tools/tests/org.eclipse.e4.tools.test/build.properties
diff --git a/tests/org.eclipse.e4.tools.test/pom.xml b/tools/tests/org.eclipse.e4.tools.test/pom.xml
similarity index 100%
rename from tests/org.eclipse.e4.tools.test/pom.xml
rename to tools/tests/org.eclipse.e4.tools.test/pom.xml
diff --git a/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java b/tools/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
similarity index 100%
rename from tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
rename to tools/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
diff --git a/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java b/tools/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java
similarity index 100%
rename from tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java
rename to tools/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java

From aa541498909f9ae2cb83ddeb79261de1cb6f74b3 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 14 Feb 2023 15:01:33 +0100
Subject: [PATCH 1218/1286] Migrierte Tools auch Teil des Builds

---
 .../org.eclipse.e4.tools.compat/pom.xml       | 16 -----
 .../build.properties                          |  1 +
 .../pom.xml                                   | 19 ------
 .../build.properties                          |  1 +
 .../org.eclipse.e4.tools.emf.editor3x/pom.xml | 19 ------
 .../org.eclipse.e4.tools.emf.ui/pom.xml       |  4 +-
 .../pom.xml                                   | 16 -----
 .../build.properties                          |  2 +-
 .../org.eclipse.e4.tools.persistence/pom.xml  | 19 ------
 .../org.eclipse.e4.tools.services/pom.xml     | 16 -----
 tools/bundles/org.eclipse.e4.tools/pom.xml    | 16 -----
 .../org.eclipse.e4.core.tools.feature/pom.xml | 46 ---------------
 .../pom.xml                                   | 58 -------------------
 .../pom.xml                                   |  3 +-
 .../pom.xml                                   |  5 +-
 tools/tests/org.eclipse.e4.tools.test/pom.xml |  3 +-
 16 files changed, 9 insertions(+), 235 deletions(-)
 delete mode 100644 tools/bundles/org.eclipse.e4.tools.compat/pom.xml
 delete mode 100644 tools/bundles/org.eclipse.e4.tools.compatibility.migration/pom.xml
 delete mode 100644 tools/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
 delete mode 100644 tools/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
 delete mode 100644 tools/bundles/org.eclipse.e4.tools.persistence/pom.xml
 delete mode 100644 tools/bundles/org.eclipse.e4.tools.services/pom.xml
 delete mode 100644 tools/bundles/org.eclipse.e4.tools/pom.xml
 delete mode 100644 tools/features/org.eclipse.e4.core.tools.feature/pom.xml
 delete mode 100644 tools/features/org.eclipse.e4.tools.persistence.feature/pom.xml

diff --git a/tools/bundles/org.eclipse.e4.tools.compat/pom.xml b/tools/bundles/org.eclipse.e4.tools.compat/pom.xml
deleted file mode 100644
index cacf15d197..0000000000
--- a/tools/bundles/org.eclipse.e4.tools.compat/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse</groupId>
-    <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.27.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-
-  <groupId>eclipse.platform.ui.tools</groupId>
-  <artifactId>org.eclipse.e4.tools.compat</artifactId>
-  <version>4.8.200-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-
-</project>
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/build.properties b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/build.properties
index c58ea2178c..8eca2d2dce 100644
--- a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/build.properties
+++ b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/build.properties
@@ -3,3 +3,4 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                OSGI-INF/
+pom.model.property.skipAPIAnalysis = true
\ No newline at end of file
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/pom.xml b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/pom.xml
deleted file mode 100644
index 3fec1612df..0000000000
--- a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse</groupId>
-		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.27.0-SNAPSHOT</version>
-		<relativePath>../../</relativePath>
-	</parent>
-	<groupId>eclipse.platform.ui.tool</groupId>
-	<artifactId>org.eclipse.e4.tools.compatibility.migration</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-
-	<properties>
-		<skipAPIAnalysis>true</skipAPIAnalysis> <!-- Not in baseline -->
-	</properties>
-
-</project>
\ No newline at end of file
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
index ca221eb8c7..bf76a8815b 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
@@ -7,3 +7,4 @@ bin.includes = META-INF/,\
                about.html,\
                OSGI-INF/
 src.includes = about.html
+pom.model.property.skipAPIAnalysis = true
\ No newline at end of file
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
deleted file mode 100644
index 558bbc1690..0000000000
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-   <parent>
-    <groupId>org.eclipse</groupId>
-    <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.27.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-
-  <groupId>eclipse.platform.ui.tools</groupId>
-  <artifactId>org.eclipse.e4.tools.emf.editor3x</artifactId>
-  <version>4.8.100-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-
-  <properties>
-    <skipAPIAnalysis>true</skipAPIAnalysis> <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=548572 -->
-  </properties>
-</project>
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 73b4d80bf0..37bd460fd9 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -13,13 +13,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse</groupId>
+  	<groupId>org.eclipse.platform</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
     <version>4.27.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
-  <groupId>eclipse.platform.ui.tools</groupId>
+  <groupId>eclipse.platform.ui</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
   <version>4.7.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml b/tools/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
deleted file mode 100644
index b146164595..0000000000
--- a/tools/bundles/org.eclipse.e4.tools.jdt.templates/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse</groupId>
-    <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.27.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-
-  <groupId>eclipse.platform.ui.tools</groupId>
-  <artifactId>org.eclipse.e4.tools.jdt.templates</artifactId>
-  <version>4.9.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-
-</project>
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/build.properties b/tools/bundles/org.eclipse.e4.tools.persistence/build.properties
index 354f9ebe27..16b2674dc2 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/build.properties
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/build.properties
@@ -19,4 +19,4 @@ bin.includes = .,\
 jars.compile.order = .
 source.. = src/
 output.. = bin/
-               
\ No newline at end of file
+pom.model.property.skipAPIAnalysis = true
\ No newline at end of file
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/pom.xml b/tools/bundles/org.eclipse.e4.tools.persistence/pom.xml
deleted file mode 100644
index 7e2390c916..0000000000
--- a/tools/bundles/org.eclipse.e4.tools.persistence/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse</groupId>
-		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.27.0-SNAPSHOT</version>
-		<relativePath>../../</relativePath>
-	</parent>
-	<groupId>eclipse.platform.ui.tool</groupId>
-	<artifactId>org.eclipse.e4.tools.persistence</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-
-	<properties>
-		<skipAPIAnalysis>true</skipAPIAnalysis> <!-- Not in baseline -->
-	</properties>
-
-</project>
\ No newline at end of file
diff --git a/tools/bundles/org.eclipse.e4.tools.services/pom.xml b/tools/bundles/org.eclipse.e4.tools.services/pom.xml
deleted file mode 100644
index 68ad1587b4..0000000000
--- a/tools/bundles/org.eclipse.e4.tools.services/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse</groupId>
-    <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.27.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-
-  <groupId>eclipse.platform.ui.tools</groupId>
-  <artifactId>org.eclipse.e4.tools.services</artifactId>
-  <version>4.9.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-
-</project>
diff --git a/tools/bundles/org.eclipse.e4.tools/pom.xml b/tools/bundles/org.eclipse.e4.tools/pom.xml
deleted file mode 100644
index d0ec07e6ea..0000000000
--- a/tools/bundles/org.eclipse.e4.tools/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse</groupId>
-    <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.27.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-
-  <groupId>eclipse.platform.ui.tool</groupId>
-  <artifactId>org.eclipse.e4.tools</artifactId>
-  <version>4.9.100-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-
-</project>
diff --git a/tools/features/org.eclipse.e4.core.tools.feature/pom.xml b/tools/features/org.eclipse.e4.core.tools.feature/pom.xml
deleted file mode 100644
index f95f193831..0000000000
--- a/tools/features/org.eclipse.e4.core.tools.feature/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse</groupId>
-    <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.27.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-
-  <groupId>eclipse.platform.ui.tools</groupId>
-  <artifactId>org.eclipse.e4.core.tools.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <id>feature-source</id>
-            <goals>
-              <goal>feature-source</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-p2-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <executions>
-          <execution>
-            <id>attach-p2-metadata</id>
-            <phase>package</phase>
-            <goals>
-              <goal>p2-metadata</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/tools/features/org.eclipse.e4.tools.persistence.feature/pom.xml b/tools/features/org.eclipse.e4.tools.persistence.feature/pom.xml
deleted file mode 100644
index 9af583c8a8..0000000000
--- a/tools/features/org.eclipse.e4.tools.persistence.feature/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2022 EclipseSource GmbH and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
-
-  Contributors:
-     EclipseSource GmbH - initial API and implementation
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse</groupId>
-		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.27.0-SNAPSHOT</version>
-		<relativePath>../../</relativePath>
-	</parent>
-
-	<groupId>eclipse.platform.ui.tools</groupId>
-	<artifactId>org.eclipse.e4.tools.persistence.feature</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho.version}</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<id>feature-source</id>
-						<goals>
-							<goal>feature-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-plugin</artifactId>
-				<version>${tycho.version}</version>
-				<executions>
-					<execution>
-						<id>attach-p2-metadata</id>
-						<phase>package</phase>
-						<goals>
-							<goal>p2-metadata</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
\ No newline at end of file
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
index 5027103204..0ac3b2d3d0 100644
--- a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
+++ b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
@@ -12,12 +12,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.eclipse</groupId>
+		<groupId>org.eclipse.platform</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
 		<version>4.27.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
-	<groupId>eclipse.platform.ui.tool</groupId>
 	<artifactId>org.eclipse.e4.tools.compatibility.migration.tests</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml b/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
index bfcd391f88..9c941e2c7c 100644
--- a/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
+++ b/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
@@ -12,12 +12,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.eclipse</groupId>
-		<artifactId>eclipse.platform.ui.tools</artifactId>
+		<groupId>org.eclipse.platform</groupId>
+  		<artifactId>eclipse.platform.ui.tools</artifactId>
 		<version>4.27.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
-	<groupId>eclipse.platform.ui.tool</groupId>
 	<artifactId>org.eclipse.e4.tools.persistence.tests</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/tools/tests/org.eclipse.e4.tools.test/pom.xml b/tools/tests/org.eclipse.e4.tools.test/pom.xml
index d92597caa0..2e5839aa1d 100644
--- a/tools/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tools/tests/org.eclipse.e4.tools.test/pom.xml
@@ -3,13 +3,12 @@
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.eclipse</groupId>
+	<groupId>org.eclipse.platform</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
 		<version>4.27.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 
-	<groupId>eclipse.platform.ui.tool</groupId>
 	<artifactId>org.eclipse.e4.tools.test</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
 

From 08a935234e96e18f3e5694f691b69fa0ca366518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Fri, 17 Feb 2023 13:18:31 +0100
Subject: [PATCH 1219/1286] Version bumps

---
 tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF  | 2 +-
 .../org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF      | 2 +-
 tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF  | 2 +-
 tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml               | 2 +-
 .../org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF     | 2 +-
 .../bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF  | 2 +-
 tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF         | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 4696cf7003..08eef64b19 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 4.8.200.qualifier
+Bundle-Version: 4.8.300.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 79a49c7a4c..490085ea52 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 4.8.100.qualifier
+Bundle-Version: 4.8.200.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 993df8e816..82c4dc9065 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.7.400.qualifier
+Bundle-Version: 4.7.500.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 37bd460fd9..3856e8d2e8 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.7.400-SNAPSHOT</version>
+  <version>4.7.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index f827cf374d..97157e519a 100644
--- a/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
-Bundle-Version: 4.9.0.qualifier
+Bundle-Version: 4.9.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.20.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
diff --git a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 522e7e6ebf..ed703422e7 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
-Bundle-Version: 4.9.0.qualifier
+Bundle-Version: 4.9.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.emf.ui",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
diff --git a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index c0d2915875..c7fbbaa4b9 100644
--- a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 4.9.100.qualifier
+Bundle-Version: 4.9.200.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",

From 990d864974c2c1caa5349ba57c7816a212413c49 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 20 Feb 2023 12:41:29 +0100
Subject: [PATCH 1220/1286] Removes .project filter from Gitigore

Also adds the missing .project files for the migrated projects.
---
 .../org.eclipse.e4.tools.compat/.project      | 39 +++++++++++++++++++
 .../.project                                  | 28 +++++++++++++
 .../.project                                  | 39 +++++++++++++++++++
 .../org.eclipse.e4.tools.emf.ui/.project      | 39 +++++++++++++++++++
 .../.project                                  | 34 ++++++++++++++++
 .../org.eclipse.e4.tools.persistence/.project | 39 +++++++++++++++++++
 .../org.eclipse.e4.tools.services/.project    | 39 +++++++++++++++++++
 tools/bundles/org.eclipse.e4.tools/.project   | 34 ++++++++++++++++
 .../.project                                  | 17 ++++++++
 .../.project                                  | 17 ++++++++
 .../.project                                  | 28 +++++++++++++
 .../.project                                  | 28 +++++++++++++
 .../tests/org.eclipse.e4.tools.test/.project  | 28 +++++++++++++
 13 files changed, 409 insertions(+)
 create mode 100644 tools/bundles/org.eclipse.e4.tools.compat/.project
 create mode 100644 tools/bundles/org.eclipse.e4.tools.compatibility.migration/.project
 create mode 100644 tools/bundles/org.eclipse.e4.tools.emf.editor3x/.project
 create mode 100644 tools/bundles/org.eclipse.e4.tools.emf.ui/.project
 create mode 100644 tools/bundles/org.eclipse.e4.tools.jdt.templates/.project
 create mode 100644 tools/bundles/org.eclipse.e4.tools.persistence/.project
 create mode 100644 tools/bundles/org.eclipse.e4.tools.services/.project
 create mode 100644 tools/bundles/org.eclipse.e4.tools/.project
 create mode 100644 tools/features/org.eclipse.e4.core.tools.feature/.project
 create mode 100644 tools/features/org.eclipse.e4.tools.persistence.feature/.project
 create mode 100644 tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.project
 create mode 100644 tools/tests/org.eclipse.e4.tools.persistence.tests/.project
 create mode 100644 tools/tests/org.eclipse.e4.tools.test/.project

diff --git a/tools/bundles/org.eclipse.e4.tools.compat/.project b/tools/bundles/org.eclipse.e4.tools.compat/.project
new file mode 100644
index 0000000000..8111d8c2f8
--- /dev/null
+++ b/tools/bundles/org.eclipse.e4.tools.compat/.project
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.compat</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/.project b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/.project
new file mode 100644
index 0000000000..d282bdb0b9
--- /dev/null
+++ b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.compatibility.migration</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.project b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.project
new file mode 100644
index 0000000000..c9d1c1fb8b
--- /dev/null
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.project
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.emf.editor3x</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/.project b/tools/bundles/org.eclipse.e4.tools.emf.ui/.project
new file mode 100644
index 0000000000..3abd68fc02
--- /dev/null
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/.project
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.emf.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/.project b/tools/bundles/org.eclipse.e4.tools.jdt.templates/.project
new file mode 100644
index 0000000000..7df5862ed2
--- /dev/null
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.jdt.templates</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/.project b/tools/bundles/org.eclipse.e4.tools.persistence/.project
new file mode 100644
index 0000000000..68f366696b
--- /dev/null
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/.project
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.persistence</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/tools/bundles/org.eclipse.e4.tools.services/.project b/tools/bundles/org.eclipse.e4.tools.services/.project
new file mode 100644
index 0000000000..c5473d21d5
--- /dev/null
+++ b/tools/bundles/org.eclipse.e4.tools.services/.project
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.services</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/tools/bundles/org.eclipse.e4.tools/.project b/tools/bundles/org.eclipse.e4.tools/.project
new file mode 100644
index 0000000000..b2c0152a05
--- /dev/null
+++ b/tools/bundles/org.eclipse.e4.tools/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/tools/features/org.eclipse.e4.core.tools.feature/.project b/tools/features/org.eclipse.e4.core.tools.feature/.project
new file mode 100644
index 0000000000..d0fa7e4498
--- /dev/null
+++ b/tools/features/org.eclipse.e4.core.tools.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.core.tools.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/tools/features/org.eclipse.e4.tools.persistence.feature/.project b/tools/features/org.eclipse.e4.tools.persistence.feature/.project
new file mode 100644
index 0000000000..c94c351fa4
--- /dev/null
+++ b/tools/features/org.eclipse.e4.tools.persistence.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.persistence.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.project b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.project
new file mode 100644
index 0000000000..509256eb47
--- /dev/null
+++ b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.compatibility.migration.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/.project b/tools/tests/org.eclipse.e4.tools.persistence.tests/.project
new file mode 100644
index 0000000000..92bcd35f66
--- /dev/null
+++ b/tools/tests/org.eclipse.e4.tools.persistence.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.persistence.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tools/tests/org.eclipse.e4.tools.test/.project b/tools/tests/org.eclipse.e4.tools.test/.project
new file mode 100644
index 0000000000..907fbfb398
--- /dev/null
+++ b/tools/tests/org.eclipse.e4.tools.test/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.tools.test</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

From 67e46cacdc40728f352b11af168dffe0240f3e6c Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 20 Feb 2023 13:24:52 +0100
Subject: [PATCH 1221/1286] Removes org.eclipse.e4.tools.jdt.templates from
 build due to failing aggregator build

org.eclipse.e4.tools.jdt.templates has a dependency to JDT which fails
the build after the repo merge. So removing the plug-in from the build
for now to make the aggregator build work again.
---
 .../features/org.eclipse.e4.core.tools.feature/feature.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/tools/features/org.eclipse.e4.core.tools.feature/feature.xml b/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
index a73e50d0bf..327ac3adc0 100644
--- a/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -54,11 +54,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.e4.tools.jdt.templates"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>

From 3ea5930d9c74e00659899fe3fb08dbc2d92873c1 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 21 Feb 2023 09:54:26 +0100
Subject: [PATCH 1222/1286] Revert "Removes org.eclipse.e4.tools.jdt.templates
 from build due to failing aggregator build"

This reverts commit 67e46cacdc40728f352b11af168dffe0240f3e6c.
---
 .../features/org.eclipse.e4.core.tools.feature/feature.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/features/org.eclipse.e4.core.tools.feature/feature.xml b/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
index 327ac3adc0..a73e50d0bf 100644
--- a/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -54,4 +54,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.e4.tools.jdt.templates"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

From c4de03c9430bef9bf4d7610c1a60c34e0cbe8b0f Mon Sep 17 00:00:00 2001
From: eclipse-releng-bot <eclipse-releng-bot@users.noreply.github.com>
Date: Tue, 28 Feb 2023 08:58:18 +0000
Subject: [PATCH 1223/1286] Update for release 4.28

---
 tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml               | 2 +-
 .../org.eclipse.e4.tools.compatibility.migration.tests/pom.xml  | 2 +-
 tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml      | 2 +-
 tools/tests/org.eclipse.e4.tools.test/pom.xml                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 3856e8d2e8..74e5955235 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
   	<groupId>org.eclipse.platform</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.27.0-SNAPSHOT</version>
+    <version>4.28.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
index 0ac3b2d3d0..bbd0ddbadd 100644
--- a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
+++ b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.eclipse.platform</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.27.0-SNAPSHOT</version>
+		<version>4.28.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.e4.tools.compatibility.migration.tests</artifactId>
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml b/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
index 9c941e2c7c..896be6c0ef 100644
--- a/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
+++ b/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.eclipse.platform</groupId>
   		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.27.0-SNAPSHOT</version>
+		<version>4.28.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.e4.tools.persistence.tests</artifactId>
diff --git a/tools/tests/org.eclipse.e4.tools.test/pom.xml b/tools/tests/org.eclipse.e4.tools.test/pom.xml
index 2e5839aa1d..534b2a2528 100644
--- a/tools/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tools/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 	<groupId>org.eclipse.platform</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.27.0-SNAPSHOT</version>
+		<version>4.28.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From 95d65b81edc345140cb3f80fc3c1b69a3464b253 Mon Sep 17 00:00:00 2001
From: Rahul Mohanan <rahul.mohanan@ibm.com>
Date: Tue, 7 Mar 2023 16:02:29 +0530
Subject: [PATCH 1224/1286] POM and product version changes for 4.28 release

Fixes https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/916
---
 tools/features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/features/org.eclipse.e4.core.tools.feature/feature.xml b/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
index a73e50d0bf..d49ff1a150 100644
--- a/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.27.0.qualifier"
+      version="4.28.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

From ad31f4b3db4b9a58d144921d245ac892acfd36aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?=
 <51790620+jukzi@users.noreply.github.com>
Date: Fri, 17 Mar 2023 09:02:06 +0100
Subject: [PATCH 1225/1286] JavaSE-17 bulk update (#643)

.classpath:
 JRE_CONTAINER
*.launch:
 JRE_CONTAINER
org.eclipse.jdt.core.prefs:
 compiler.compliance
 codegen.targetPlatform
 compiler.source
MANIFEST.MF:
 Bundle-RequiredExecutionEnvironment
 Bundle-Version (minor version update)
pom.xml
 (minor version update)
---
 tools/bundles/org.eclipse.e4.tools.compat/.classpath        | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                    | 6 +++---
 .../org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF        | 4 ++--
 .../org.eclipse.e4.tools.compatibility.migration/.classpath | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                    | 6 +++---
 .../META-INF/MANIFEST.MF                                    | 4 ++--
 tools/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath  | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                    | 6 +++---
 .../org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF  | 4 ++--
 tools/bundles/org.eclipse.e4.tools.emf.ui/.classpath        | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                    | 6 +++---
 .../org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF        | 4 ++--
 tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml           | 2 +-
 tools/bundles/org.eclipse.e4.tools.jdt.templates/.classpath | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                    | 6 +++---
 .../org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF | 4 ++--
 tools/bundles/org.eclipse.e4.tools.persistence/.classpath   | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                    | 6 +++---
 .../org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF   | 4 ++--
 tools/bundles/org.eclipse.e4.tools.services/.classpath      | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                    | 6 +++---
 .../org.eclipse.e4.tools.services/META-INF/MANIFEST.MF      | 4 ++--
 tools/bundles/org.eclipse.e4.tools/.classpath               | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                    | 6 +++---
 tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF     | 4 ++--
 .../org.eclipse.e4.tools.persistence.feature/feature.xml    | 2 +-
 .../.classpath                                              | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                    | 6 +++---
 .../META-INF/MANIFEST.MF                                    | 4 ++--
 .../pom.xml                                                 | 2 +-
 .../tests/org.eclipse.e4.tools.persistence.tests/.classpath | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                    | 6 +++---
 .../META-INF/MANIFEST.MF                                    | 4 ++--
 tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml  | 2 +-
 tools/tests/org.eclipse.e4.tools.test/.classpath            | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                    | 6 +++---
 tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF  | 4 ++--
 tools/tests/org.eclipse.e4.tools.test/pom.xml               | 2 +-
 38 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.compat/.classpath b/tools/bundles/org.eclipse.e4.tools.compat/.classpath
index e801ebfb46..81fe078c20 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/.classpath
+++ b/tools/bundles/org.eclipse.e4.tools.compat/.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/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
index 07cc8c6187..453d3b36b8 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
+++ b/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
@@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -135,7 +135,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 08eef64b19..84ba060673 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 4.8.300.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-Version: 4.9.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/.classpath b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/.classpath
index 4a00becd81..3628e33687 100644
--- a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/.classpath
+++ b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/.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/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.jdt.core.prefs
index a58ebdcad3..9478cb1653 100644
--- a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.jdt.core.prefs
+++ b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
index e9b3bfd6ce..9aa1fb17a5 100644
--- a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
@@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.e4.tools.compatibility.migration
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
 Automatic-Module-Name: org.eclipse.e4.tools.compatibiliy.migration
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.e4.tools.persistence;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)",
  org.eclipse.e4.ui.workbench;bundle-version="[1.10.0,2.0.0)",
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
index e801ebfb46..81fe078c20 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.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/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
index b8859ca021..13da295242 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
@@ -25,9 +25,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -134,7 +134,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 490085ea52..f4a33a3f78 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 4.8.200.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-Version: 4.9.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.emf.common;bundle-version="2.6.0",
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/.classpath b/tools/bundles/org.eclipse.e4.tools.emf.ui/.classpath
index db15c83a56..974bccbc10 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/.classpath
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/.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/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
 			<accessrule kind="accessible" pattern="org/eclipse/e4/**"/>
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
index 691700bc47..b14d6fc4bd 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -29,9 +29,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -143,7 +143,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 82c4dc9065..0f0eebf133 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.7.500.qualifier
+Bundle-Version: 4.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.core.databinding.property;bundle-version="1.2.100",
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 74e5955235..bf7f32794b 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.7.500-SNAPSHOT</version>
+  <version>4.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/.classpath b/tools/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
index e801ebfb46..81fe078c20 100644
--- a/tools/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/.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/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
index d4b0b74ab9..85f3e70ffc 100644
--- a/tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
@@ -29,9 +29,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -143,7 +143,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index 97157e519a..c1983c17bc 100644
--- a/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
-Bundle-Version: 4.9.100.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-Version: 4.10.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.20.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
  org.eclipse.jface.text;bundle-version="3.6.0",
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/.classpath b/tools/bundles/org.eclipse.e4.tools.persistence/.classpath
index e801ebfb46..81fe078c20 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/.classpath
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/.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/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs
index 3c416caddb..ed46289372 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -101,7 +101,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
index aba3df8980..eb931d173e 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.persistence;singleton:=true
 Automatic-Module-Name: org.eclipse.e4.tools.persistence
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
diff --git a/tools/bundles/org.eclipse.e4.tools.services/.classpath b/tools/bundles/org.eclipse.e4.tools.services/.classpath
index e801ebfb46..81fe078c20 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/.classpath
+++ b/tools/bundles/org.eclipse.e4.tools.services/.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/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
index feea330fcf..ecdd88b4da 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
+++ b/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
@@ -28,9 +28,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -142,7 +142,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index ed703422e7..f23c77b3db 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
-Bundle-Version: 4.9.100.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-Version: 4.10.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.emf.ui",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
 Bundle-Vendor: %Bundle-Vendor
diff --git a/tools/bundles/org.eclipse.e4.tools/.classpath b/tools/bundles/org.eclipse.e4.tools/.classpath
index 4a00becd81..3628e33687 100644
--- a/tools/bundles/org.eclipse.e4.tools/.classpath
+++ b/tools/bundles/org.eclipse.e4.tools/.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/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
index 89405d9655..8f900695ca 100644
--- a/tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
+++ b/tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
@@ -29,9 +29,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -146,7 +146,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index c7fbbaa4b9..1055668dc1 100644
--- a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 4.9.200.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-Version: 4.10.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
diff --git a/tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml b/tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml
index aa0f8c6e62..947f9e4ba6 100644
--- a/tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml
+++ b/tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.tools.persistence.feature"
       label="%featureName"
-      version="1.0.0.qualifier"
+      version="1.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.classpath b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.classpath
index a42a828e04..675a5e2962 100644
--- a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.classpath
+++ b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.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/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src">
 		<attributes>
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs
index a3b3fe89dc..4d6b857ee0 100644
--- a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs
@@ -19,9 +19,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -140,7 +140,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF
index d975b5193d..b781425eb0 100644
--- a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF
+++ b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: org.eclipse.e4.tools.compatibility.migration.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
 Automatic-Module-Name: org.eclipse.e4.tools.compatibility.migration.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.swt;bundle-version="[3.110.0,4.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.100.0,4.0.0)",
  org.eclipse.e4.tools.compatibility.migration;bundle-version="[1.0.0,2.0.0)",
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
index bbd0ddbadd..6b0ce7ec78 100644
--- a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
+++ b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
@@ -18,7 +18,7 @@
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.e4.tools.compatibility.migration.tests</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/.classpath b/tools/tests/org.eclipse.e4.tools.persistence.tests/.classpath
index a42a828e04..675a5e2962 100644
--- a/tools/tests/org.eclipse.e4.tools.persistence.tests/.classpath
+++ b/tools/tests/org.eclipse.e4.tools.persistence.tests/.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/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src">
 		<attributes>
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs b/tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs
index 737d67c4d4..66a5d7d299 100644
--- a/tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs
@@ -18,9 +18,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -136,7 +136,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF b/tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF
index ebdc9f4a49..9426441414 100644
--- a/tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF
+++ b/tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: org.eclipse.e4.tools.persistence.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
 Automatic-Module-Name: org.eclipse.e4.tools.persistence.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.0",
  org.eclipse.ui;bundle-version="3.201.0",
  org.junit;bundle-version="4.13.2",
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml b/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
index 896be6c0ef..5899fc670e 100644
--- a/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
+++ b/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
@@ -18,7 +18,7 @@
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.e4.tools.persistence.tests</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
diff --git a/tools/tests/org.eclipse.e4.tools.test/.classpath b/tools/tests/org.eclipse.e4.tools.test/.classpath
index a42a828e04..675a5e2962 100644
--- a/tools/tests/org.eclipse.e4.tools.test/.classpath
+++ b/tools/tests/org.eclipse.e4.tools.test/.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/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src">
 		<attributes>
diff --git a/tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs b/tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs
index 2c930dbc5c..59ed8fe573 100644
--- a/tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs
@@ -29,9 +29,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -143,7 +143,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF b/tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
index 6c2212930e..a363fbba5b 100644
--- a/tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
+++ b/tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.e4.tools.test
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.3.0.qualifier
 Fragment-Host: org.eclipse.e4.tools;bundle-version="4.7.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.e4.core.contexts;bundle-version="1.3.100"
 Export-Package: org.eclipse.e4.tools.test;version="1.0.0";x-internal:=true
diff --git a/tools/tests/org.eclipse.e4.tools.test/pom.xml b/tools/tests/org.eclipse.e4.tools.test/pom.xml
index 534b2a2528..0b7df3ade8 100644
--- a/tools/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tools/tests/org.eclipse.e4.tools.test/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>org.eclipse.e4.tools.test</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 
 	<packaging>eclipse-test-plugin</packaging>
 

From 2f34f8cfd234e02e13d6ca5f3d4e9815f9249d4b Mon Sep 17 00:00:00 2001
From: "Kellner, Niklas" <mail@niklaskellner.de>
Date: Thu, 9 Mar 2023 13:35:35 +0100
Subject: [PATCH 1226/1286] Enable the setting of command icons for e4 commands
 Previously it was only possible to define command icons using the extensions
 point org.eclipse.ui.commandImages It was not possible to define images for
 e4 commands without creating a warning in the plugin.xml. Now it is possible
 to define a command icon in the e4 application model.

Regenerated E4 Application Model
---
 .../tools/emf/ui/internal/E4Properties.java   |  5 ++
 .../e4/tools/emf/ui/internal/Messages.java    |  6 +++
 .../tools/emf/ui/internal/Messages.properties |  6 +++
 .../common/component/CommandEditor.java       | 35 ++++++++++++-
 .../dialogs/CommandIconDialogEditor.java      | 49 +++++++++++++++++++
 5 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandIconDialogEditor.java

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java
index 339238076f..8091bb7641 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java
@@ -548,6 +548,11 @@ public static IValueProperty<MCommand, String> commandDescription(EditingDomain
 		return EMFEditProperties.value(editingDomain, CommandsPackageImpl.Literals.COMMAND__DESCRIPTION);
 	}
 
+	@SuppressWarnings("unchecked")
+	public static IValueProperty<MCommand, String> commandIcon(EditingDomain editingDomain) {
+		return EMFEditProperties.value(editingDomain, CommandsPackageImpl.Literals.COMMAND__COMMAND_ICON_URI);
+	}
+
 	@SuppressWarnings("unchecked")
 	public static IValueProperty<MCommand, MCategory> category() {
 		return EMFProperties.value(CommandsPackageImpl.Literals.COMMAND__CATEGORY);
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 39b600a877..b5fe6ce6a2 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -166,6 +166,8 @@ public class Messages {
 	public String CommandEditor_LabelDescription;
 	public String CommandEditor_Parameters;
 	public String CommandEditor_Category;
+	public String CommandEditor_IconURI;
+	public String CommandEditor_IconURI_Tooltip;
 	public String CommandEditor_AddCommandParameter;
 	public String CommandEditor_NewCommandParameter;
 
@@ -647,6 +649,10 @@ public class Messages {
 	public String KeyBindingCommandSelectionDialog_DialogTitle;
 	public String KeyBindingCommandSelectionDialog_DialogMessage;
 
+	public String CommandIconDialogEditor_ShellTitle;
+	public String CommandIconDialogEditor_DialogTitle;
+	public String CommandIconDialogEditor_DialogMessage;
+
 	public String MenuIconDialogEditor_ShellTitle;
 	public String MenuIconDialogEditor_DialogTitle;
 	public String MenuIconDialogEditor_DialogMessage;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index bf6a1ab243..89c17e2eea 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -127,6 +127,8 @@ CommandEditor_Name=&Name\:
 CommandEditor_LabelDescription=&Description\:
 CommandEditor_Parameters=Parameters
 CommandEditor_Category=C&ategory\:
+CommandEditor_IconURI=&Icon URI\:
+CommandEditor_IconURI_Tooltip=Choose the icon of your command here
 CommandEditor_AddCommandParameter=Command Parameter
 CommandEditor_NewCommandParameter=Command Parameter {0}
 
@@ -655,6 +657,10 @@ KeyBindingCommandSelectionDialog_ShellTitle=Keybinding Command
 KeyBindingCommandSelectionDialog_DialogTitle=Keybinding-Command
 KeyBindingCommandSelectionDialog_DialogMessage=Connect the keybinding to a command
 
+CommandIconDialogEditor_ShellTitle=Command Icon Search
+CommandIconDialogEditor_DialogTitle=Command Icon Search
+CommandIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
+
 MenuIconDialogEditor_ShellTitle=Menu Icon Search
 MenuIconDialogEditor_DialogTitle=Menu Icon Search
 MenuIconDialogEditor_DialogMessage=Search for GIF, PNG and JPG icons in the current project
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index caf06d1cd8..5721765ff8 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -25,6 +25,8 @@
 
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
 import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
@@ -33,6 +35,7 @@
 import org.eclipse.e4.tools.emf.ui.internal.common.E4PickList;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory.TextPasteHandler;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.CommandCategorySelectionDialog;
+import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.CommandIconDialogEditor;
 import org.eclipse.e4.ui.model.application.commands.MCommand;
 import org.eclipse.e4.ui.model.application.commands.MCommandParameter;
 import org.eclipse.e4.ui.model.application.commands.MCommandsFactory;
@@ -69,6 +72,9 @@ public class CommandEditor extends AbstractComponentEditor<MCommand> {
 	private final List<Action> actions = new ArrayList<>();
 	private MessageFormat newCommandParameterName;
 
+	@Inject
+	private IEclipseContext eclipseContext;
+
 	@Inject
 	public CommandEditor() {
 		super();
@@ -171,7 +177,7 @@ private Composite createForm(Composite parent, EMFDataBindingContext context, IO
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.CommandEditor_Category);
-			l.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+			l.setLayoutData(new GridData());
 
 			final Text t = new Text(parent, SWT.BORDER);
 			TextPasteHandler.createFor(t);
@@ -193,6 +199,33 @@ public void widgetSelected(SelectionEvent e) {
 			});
 		}
 
+		// ------------------------------------------------------------
+		{
+			final Label l = new Label(parent, SWT.NONE);
+			l.setText(Messages.CommandEditor_IconURI);
+			l.setLayoutData(new GridData());
+			l.setToolTipText(Messages.CommandEditor_IconURI_Tooltip);
+
+			final Text t = new Text(parent, SWT.BORDER);
+			TextPasteHandler.createFor(t);
+			t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+			context.bindValue(textProp.observeDelayed(200, t),
+					E4Properties.commandIcon(getEditingDomain()).observeDetail(getMaster()));
+
+			new ImageTooltip(t, Messages, this);
+
+			Button b = ControlFactory.createFindButton(parent, resourcePool);
+			b.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					final CommandIconDialogEditor dialog = new CommandIconDialogEditor(b.getShell(), eclipseContext,
+							project,
+							getEditingDomain(), getMaster().getValue(), Messages);
+					dialog.open();
+				}
+			});
+		}
+
 		// ------------------------------------------------------------
 		{
 			final E4PickList pickList = new E4PickList(parent, SWT.NONE, Arrays.asList(PickListFeatures.NO_PICKER),
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandIconDialogEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandIconDialogEditor.java
new file mode 100644
index 0000000000..899c4a8b25
--- /dev/null
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandIconDialogEditor.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2010 BestSolution.at and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ *     Steven Spungin <steven@spungin.tv> - Bug 424730
+ ******************************************************************************/
+package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
+import org.eclipse.e4.ui.model.application.commands.MCommand;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.widgets.Shell;
+
+public class CommandIconDialogEditor extends AbstractIconDialog {
+
+	public CommandIconDialogEditor(Shell parentShell, IEclipseContext context, IProject project,
+			EditingDomain editingDomain, MCommand element, Messages Messages) {
+		super(parentShell, context, project, editingDomain, element,
+				CommandsPackageImpl.Literals.COMMAND__COMMAND_ICON_URI,
+				Messages);
+	}
+
+	@Override
+	protected String getShellTitle() {
+		return Messages.CommandIconDialogEditor_ShellTitle;
+	}
+
+	@Override
+	protected String getDialogTitle() {
+		return Messages.CommandIconDialogEditor_DialogTitle;
+	}
+
+	@Override
+	protected String getDialogMessage() {
+		return Messages.CommandIconDialogEditor_DialogMessage;
+	}
+
+}

From 91f2afbadda3589186c4ab802b2fe4d3a1129e73 Mon Sep 17 00:00:00 2001
From: Sheena <122248524+Shee43@users.noreply.github.com>
Date: Thu, 13 Apr 2023 21:27:51 -0700
Subject: [PATCH 1227/1286] Strings in org.eclipse.e4.tools.jdt.templates
 needed translation support (#717)

Some strings in the plugin org.eclipse.e4.tools.jdt.templates need to be
externalized for translation support
These files are changed:
1.default-e4templates.xml
2.plugin.properties
3.plugin.xml

And one file is added:
1.default-e4templates.properties

Fixes: https://github.com/eclipse-platform/eclipse.platform.ui/issues/638
---
 .../plugin.properties                         |  5 ++++
 .../plugin.xml                                |  9 ++++---
 .../templates/default-e4templates.properties  | 26 +++++++++++++++++++
 .../templates/default-e4templates.xml         | 24 ++++++++---------
 4 files changed, 48 insertions(+), 16 deletions(-)
 create mode 100644 tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.properties

diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties b/tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties
index a9112acfc2..712370dca6 100644
--- a/tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties
@@ -14,3 +14,8 @@
 
 pluginName = e4 JDT code templates
 providerName = Eclipse.org
+
+#--- templates
+templates.e4.contextType.name= e4
+templates.e4.statements.contextType.name= e4 statements
+templates.e4.members.contextType.name= e4 members
\ No newline at end of file
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml b/tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
index f0f7a13679..9638f13962 100644
--- a/tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
@@ -20,25 +20,26 @@
    <extension
          point="org.eclipse.ui.editors.templates">
       <contextType
-            name="e4"
+            name="%templates.e4.contextType.name"
             class="org.eclipse.e4.internal.tools.jdt.templates.E4ContextType"
             id="e4"
             registryId="org.eclipse.jdt.ui.CompilationUnitEditor">
       </contextType>
       <contextType
-            name="e4 statements"
+            name="%templates.e4.statements.contextType.name"
             class="org.eclipse.e4.internal.tools.jdt.templates.E4ContextType"
             id="e4-statements"
             registryId="org.eclipse.jdt.ui.CompilationUnitEditor">
       </contextType>
       <contextType
-            name="e4 members"
+            name="%templates.e4.members.contextType.name"
             class="org.eclipse.e4.internal.tools.jdt.templates.E4ContextType"
             id="e4-members"
             registryId="org.eclipse.jdt.ui.CompilationUnitEditor">
       </contextType>
       <include
-            file="templates/default-e4templates.xml">
+            file="templates/default-e4templates.xml"
+            translations="templates/default-e4templates.properties">
       </include>
             <resolver
             class="org.eclipse.jdt.internal.corext.template.java.FieldResolver"
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.properties b/tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.properties
new file mode 100644
index 0000000000..e7b5013c86
--- /dev/null
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.properties
@@ -0,0 +1,26 @@
+###############################################################################
+# Copyright (c) 2010, 2023 IBM Corporation and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#       Sheena, IBM Corporation 
+################################################################################
+
+Templates.injected_preference_value=Injected Preference Value
+Templates.injected_preference_field=Injected Preferences Service
+Templates.injected_logger=Injected Logger
+Templates.injected_eventbroker=Injected Event Broker
+Templates.injected_eselectionservice=Injected ESEectionService
+Templates.injected_eventhandler_method=Event Handler Method
+Templates.injected_stylingengine=Injected Styling Engine
+Templates.postconstruct_method=Creates @PostConstruct method
+Templates.focus_method=Creates @Focus method 
+Templates.predestroy_method=Creates @PreDestroy method
+Templates.execute_method=Creates Execute method
+Templates.canexecute_method=Creates CanExecute method 
\ No newline at end of file
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml b/tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
index 7a3f52a954..d87fa0f4d0 100644
--- a/tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
@@ -19,28 +19,28 @@
 
 <templates>
 
-<template name="Inject -  Preference value as method injection" description="Injected Preference Value" id="org.eclipse.e4.tools.jdt.templates.preference" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="Inject -  Preference value as method injection" description="%Templates.injected_preference_value" id="org.eclipse.e4.tools.jdt.templates.preference" context="e4-members" enabled="true" autoinsert="false">@Inject
 void setPreferenceValue(@Named("preference-PREFERENCE_KEY") String preferenceValue) {
 	${cursor}
 }</template>
 
-<template name="Inject - Preferences service as field" description="Injected Preferences Service" id="org.eclipse.e4.tools.jdt.templates.preferences" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="Inject - Preferences service as field" description="%Templates.injected_preference_field" id="org.eclipse.e4.tools.jdt.templates.preferences" context="e4-members" enabled="true" autoinsert="false">@Inject
 IEclipsePreferences preferences;</template>
 
-<template name="Inject - Logger service as field" description="Injected Logger" id="org.eclipse.e4.tools.jdt.templates.logger" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="Inject - Logger service as field" description="%Templates.injected_logger" id="org.eclipse.e4.tools.jdt.templates.logger" context="e4-members" enabled="true" autoinsert="false">@Inject
 Logger logger;</template>
 
-<template name="Inject - Eventbroker service as field" description="Injected Event Broker" id="org.eclipse.e4.tools.jdt.templates.eventbroker" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="Inject - Eventbroker service as field" description="%Templates.injected_eventbroker" id="org.eclipse.e4.tools.jdt.templates.eventbroker" context="e4-members" enabled="true" autoinsert="false">@Inject
 IEventBroker eventBroker;
 ${imp:import(org.eclipse.e4.core.services.events.IEventBroker)}
 </template>
 
-<template name="Inject - ESelection service as field" description="Injected ESEectionService" id="org.eclipse.e4.tools.jdt.templates.selectionservice" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="Inject - ESelection service as field" description="%Templates.injected_eselectionservice" id="org.eclipse.e4.tools.jdt.templates.selectionservice" context="e4-members" enabled="true" autoinsert="false">@Inject
 ESelectionService selectionService;
 ${imp:import(org.eclipse.e4.ui.workbench.modeling.ESelectionService)}
 </template>
 
-<template name="Inject -  Subscribe to event topic via method" description="Event Handler Method" id="org.eclipse.e4.tools.jdt.templates.eventhandler" context="e4-members" enabled="true" autoinsert="false"> @Inject
+<template name="Inject -  Subscribe to event topic via method" description="%Templates.injected_eventhandler_method" id="org.eclipse.e4.tools.jdt.templates.eventhandler" context="e4-members" enabled="true" autoinsert="false"> @Inject
     @Optional
     private void subscribeApplicationCompleted
             (@UIEventTopic(UIEvents.UILifeCycle.APP_STARTUP_COMPLETE)
@@ -49,39 +49,39 @@ ${imp:import(org.eclipse.e4.ui.workbench.modeling.ESelectionService)}
 	${cursor}
 }</template>
 
-<template name="Inject - IStylingEngine service as field" description="Injected Styling Engine" id="org.eclipse.e4.tools.jdt.templates.stylingengine" context="e4-members" enabled="true" autoinsert="false">@Inject
+<template name="Inject - IStylingEngine service as field" description="%Templates.injected_stylingengine" id="org.eclipse.e4.tools.jdt.templates.stylingengine" context="e4-members" enabled="true" autoinsert="false">@Inject
 IStylingEngine stylingEngine;</template>
 
 
-<template name="PostConstruct" description="Creates @PostConstruct method" id="org.eclipse.e4.tools.jdt.templates.init" context="e4-members" enabled="true" autoinsert="false">@PostConstruct
+<template name="PostConstruct" description="%Templates.postconstruct_method" id="org.eclipse.e4.tools.jdt.templates.init" context="e4-members" enabled="true" autoinsert="false">@PostConstruct
 public void postConstruct(${type:newType(org.eclipse.swt.widgets.Composite)} parent) { 
 	${cursor}
 }
 ${imp:import(javax.annotation.PostConstruct)}
 </template>
 
-<template name="Focus" description="Creates @Focus method" id="org.eclipse.e4.tools.jdt.templates.focus" context="e4-members" enabled="true" autoinsert="false">@Focus
+<template name="Focus" description="%Templates.focus_method" id="org.eclipse.e4.tools.jdt.templates.focus" context="e4-members" enabled="true" autoinsert="false">@Focus
 public void onFocus() {
 	${cursor}
 }
 ${imp:import(org.eclipse.e4.ui.di.Focus)}
 </template>
 
-<template name="PreDestroy" description="Creates @PreDestroy method" id="org.eclipse.e4.tools.jdt.templates.dispose" context="e4-members" enabled="true" autoinsert="false">@PreDestroy
+<template name="PreDestroy" description="%Templates.predestroy_method" id="org.eclipse.e4.tools.jdt.templates.dispose" context="e4-members" enabled="true" autoinsert="false">@PreDestroy
 public void preDestroy() {
 	${cursor}
 }
 ${imp:import(javax.annotation.PreDestroy)}
 </template>
 
-<template name="Execute" description="Creates Execute method" id="org.eclipse.e4.tools.jdt.templates.execute" context="e4-members" enabled="true" autoinsert="false">@Execute
+<template name="Execute" description="%Templates.execute_method" id="org.eclipse.e4.tools.jdt.templates.execute" context="e4-members" enabled="true" autoinsert="false">@Execute
 public void execute() {
 	${cursor}
 }
 ${imp:import(org.eclipse.e4.core.di.annotations.Execute)}
 </template>
 
-<template name="CanExecute" description="Creates CanExecute method" id="org.eclipse.e4.tools.jdt.templates.canexecute" context="e4-members" enabled="true" autoinsert="false">@CanExecute
+<template name="CanExecute" description="%Templates.canexecute_method" id="org.eclipse.e4.tools.jdt.templates.canexecute" context="e4-members" enabled="true" autoinsert="false">@CanExecute
 public boolean canExecute() {
 	return true;
 }

From a5f90044665852251d7d70dc323d5be33996f343 Mon Sep 17 00:00:00 2001
From: Michael Keppler <Michael.Keppler@gmx.de>
Date: Wed, 26 Apr 2023 17:58:29 +0200
Subject: [PATCH 1228/1286] avoid source bundle warning

Fix a certain warning that appears during the Maven build:
Warning:  Bundle-Vendor header not found in
somepath\META-INF\MANIFEST.MF, fallback to 'unknown' for source bundle
---
 .../META-INF/MANIFEST.MF                                         | 1 +
 .../org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF  | 1 +
 tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF       | 1 +
 3 files changed, 3 insertions(+)

diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF
index b781425eb0..c4edd6744d 100644
--- a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF
+++ b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF
@@ -2,6 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: org.eclipse.e4.tools.compatibility.migration.tests;singleton:=true
+Bundle-Vendor: Eclipse.org
 Bundle-Version: 1.1.0.qualifier
 Automatic-Module-Name: org.eclipse.e4.tools.compatibility.migration.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF b/tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF
index 9426441414..81639c9433 100644
--- a/tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF
+++ b/tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF
@@ -2,6 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: org.eclipse.e4.tools.persistence.tests;singleton:=true
+Bundle-Vendor: Eclipse.org
 Bundle-Version: 1.1.0.qualifier
 Automatic-Module-Name: org.eclipse.e4.tools.persistence.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF b/tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
index a363fbba5b..ae80a32576 100644
--- a/tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
+++ b/tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
@@ -2,6 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.e4.tools.test
+Bundle-Vendor: Eclipse.org
 Bundle-Version: 1.3.0.qualifier
 Fragment-Host: org.eclipse.e4.tools;bundle-version="4.7.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-17

From cf2db34a317a1a3f062f7a8b15df99b66828d834 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Sat, 29 Apr 2023 18:21:36 +0200
Subject: [PATCH 1229/1286] Clean-up OSGi package imports and remove unused
 dependencies

- Use properly closed version range
- Remove unused packages
- Mark optional package-imports that are definitely not optional as such
- Replace requirements to org.eclipse.osgi by corresponding
package-imports for the general osgi packages

- Remove unused dependencies
---
 .../META-INF/MANIFEST.MF                        | 17 ++++-------------
 .../META-INF/MANIFEST.MF                        |  5 +++--
 .../org.eclipse.e4.tools/META-INF/MANIFEST.MF   |  3 ---
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 0f0eebf133..3e3fa0cd08 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -8,33 +8,24 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
- org.eclipse.core.databinding;bundle-version="1.3.0",
  org.eclipse.core.databinding.property;bundle-version="1.2.100",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
- org.eclipse.emf.databinding;bundle-version="1.2.0",
  org.eclipse.jface.databinding;bundle-version="1.4.0",
  org.eclipse.jface;bundle-version="3.14.0",
- org.eclipse.emf.edit;bundle-version="2.6.0",
- org.eclipse.equinox.common;bundle-version="3.6.0",
  org.eclipse.emf.databinding.edit;bundle-version="1.2.0",
  org.eclipse.core.resources;bundle-version="3.6.0",
  org.eclipse.e4.core.services;bundle-version="0.9.1",
- org.eclipse.osgi;bundle-version="3.6.0",
- org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0",
  org.eclipse.e4.ui.workbench;bundle-version="0.9.1",
  org.eclipse.e4.ui.services;bundle-version="0.9.1",
- org.eclipse.equinox.registry;bundle-version="3.5.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",
  org.eclipse.e4.ui.di;bundle-version="0.9.0",
  org.eclipse.e4.tools.services;bundle-version="0.11.0",
  org.eclipse.e4.core.di.extensions;bundle-version="0.9.0",
  org.eclipse.jface.text;bundle-version="3.7.0",
- org.eclipse.e4.ui.widgets;bundle-version="0.11.0",
- org.eclipse.equinox.preferences;bundle-version="3.4.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.9.0",
- org.eclipse.jdt.core;resolution:=optional,
- org.eclipse.pde.core;resolution:=optional,
+ org.eclipse.jdt.core,
+ org.eclipse.pde.core,
  org.eclipse.e4.core.commands;bundle-version="0.10.0",
  org.eclipse.e4.ui.dialogs;bundle-version="1.0.0",
  org.eclipse.e4.emf.xpath,
@@ -42,8 +33,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.2.0",
  javax.inject;version="1.0.0",
- org.osgi.framework;version="1.5.0",
- org.osgi.service.event;version="1.3.1"
+ org.osgi.framework;version="[1.5.0,2.0.0)",
+ org.osgi.service.event;version="[1.3.0,2.0.0)"
 Export-Package: org.eclipse.e4.tools.emf.ui.common;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.model.spy",
  org.eclipse.e4.tools.emf.ui.common.component;version="0.12.0.qualifier";x-internal:=true,
  org.eclipse.e4.tools.emf.ui.internal;version="0.12.0.qualifier";x-internal:=true,
diff --git a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index f23c77b3db..3f7eb0aa30 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -10,10 +10,11 @@ Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
  org.eclipse.equinox.common;bundle-version="3.6.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",
- org.eclipse.osgi;bundle-version="3.7.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0"
 Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.2.0",
- javax.inject;version="1.0.0"
+ javax.inject;version="1.0.0",
+ org.eclipse.osgi.util;version="[1.1.0,2.0.0)",
+ org.osgi.framework;version="[1.10.0,2.0.0)"
 Automatic-Module-Name: org.eclipse.e4.tools.services
diff --git a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 1055668dc1..dd0396267d 100644
--- a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -9,16 +9,13 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
  org.eclipse.core.resources;bundle-version="3.6.0",
  org.eclipse.jdt.core;bundle-version="3.6.0",
- org.eclipse.jdt.launching;bundle-version="3.5.100",
  org.eclipse.ui.ide;bundle-version="3.6.0",
  org.eclipse.core.databinding;bundle-version="1.3.100",
  org.eclipse.core.databinding.beans;bundle-version="1.2.100",
  org.eclipse.jface.databinding;bundle-version="1.4.0",
  org.eclipse.core.databinding.property;bundle-version="1.3.0",
  org.eclipse.jdt.ui;bundle-version="3.6.0",
- org.eclipse.emf.ecore;bundle-version="2.9.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.9.0",
- org.eclipse.pde.core;bundle-version="3.9.0",
  org.eclipse.pde.ui;bundle-version="3.8.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.e4.internal.tools.ToolsPlugin

From 21be16c56151abb127c4a9fa6d3f9d249f21b730 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Sat, 29 Apr 2023 18:32:49 +0200
Subject: [PATCH 1230/1286] Improve OSGi metadata about dependency to
 javax.inject/annotations

- Always use closed version ranges [1.X,2) with a minor lower bound

Part of https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1056
---
 .../bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF  | 2 +-
 .../bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF  | 4 ++--
 .../org.eclipse.e4.tools.services/META-INF/MANIFEST.MF        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 84ba060673..8a0c227aa2 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -18,6 +18,6 @@ Export-Package: org.eclipse.e4.tools.compat.internal;version="0.12.0.qualifier";
  org.eclipse.e4.tools.compat.parts;version="0.12.0.qualifier";x-internal:=true
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
-Import-Package: javax.inject;version="1.0.0",
+Import-Package: javax.inject;version="[1.0.0,2.0.0)",
  org.eclipse.e4.ui.workbench.swt
 Automatic-Module-Name: org.eclipse.e4.tools.compat
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 3e3fa0cd08..7902987001 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -31,8 +31,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.e4.emf.xpath,
  org.eclipse.ui.forms;bundle-version="3.7.200"
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation;version="1.2.0",
- javax.inject;version="1.0.0",
+Import-Package: javax.annotation;version="[1.2.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)",
  org.osgi.framework;version="[1.5.0,2.0.0)",
  org.osgi.service.event;version="[1.3.0,2.0.0)"
 Export-Package: org.eclipse.e4.tools.emf.ui.common;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.model.spy",
diff --git a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 3f7eb0aa30..5fe81ed2d4 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0"
 Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation;version="1.2.0",
- javax.inject;version="1.0.0",
+Import-Package: javax.annotation;version="[1.2.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)",
  org.eclipse.osgi.util;version="[1.1.0,2.0.0)",
  org.osgi.framework;version="[1.10.0,2.0.0)"
 Automatic-Module-Name: org.eclipse.e4.tools.services

From 23b59adb6aca87c11b30e7d0c5ced72c95a0be46 Mon Sep 17 00:00:00 2001
From: Andrey Loskutov <loskutov@gmx.de>
Date: Wed, 10 May 2023 13:30:39 +0200
Subject: [PATCH 1231/1286] Fix for "Redundant specification of type arguments"
 error

See https://github.com/eclipse-platform/eclipse.platform/issues/444
---
 .../component/dialogs/AbstractIconDialogWithHardcodedScope.java | 2 +-
 .../component/dialogs/AbstractIconDialogWithScopeAndFilter.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
index c38e5e0160..de7653363b 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
@@ -72,7 +72,7 @@
 public abstract class AbstractIconDialogWithHardcodedScope extends SaveDialogBoundsSettingsDialog {
 	private TableViewer viewer;
 	private IProject project;
-	private Map<IFile, Image> icons = Collections.synchronizedMap(new HashMap<IFile, Image>());
+	private Map<IFile, Image> icons = Collections.synchronizedMap(new HashMap<>());
 	private ResourceSearchScope searchScope = ResourceSearchScope.PROJECT;
 
 	protected Messages Messages;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
index 84b3ed56bb..4309b6f94a 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
@@ -70,7 +70,7 @@
  */
 public abstract class AbstractIconDialogWithScopeAndFilter extends FilteredContributionDialog {
 	private final IProject project;
-	private final Map<IFile, Image> icons = Collections.synchronizedMap(new HashMap<IFile, Image>());
+	private final Map<IFile, Image> icons = Collections.synchronizedMap(new HashMap<>());
 
 	static public class Entry {
 		IFile file;

From 18db982e5bfad07c7f979214b542602ff6971c3f Mon Sep 17 00:00:00 2001
From: Deepika Udayagiri <deepika.udayagiri@in.ibm.com>
Date: Tue, 6 Jun 2023 14:59:19 +0530
Subject: [PATCH 1232/1286] POM and product version changes for 4.29 release

Tracked by
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1100
---
 tools/features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/features/org.eclipse.e4.core.tools.feature/feature.xml b/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
index d49ff1a150..c009d5d9f3 100644
--- a/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.28.0.qualifier"
+      version="4.29.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

From 7af3bc649e1742e604c9b1b32177ad491239e516 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Date: Wed, 7 Jun 2023 14:17:11 +0530
Subject: [PATCH 1233/1286] POM and product version changes for 4.29 release

fixes: https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1100
---
 tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml               | 2 +-
 .../org.eclipse.e4.tools.compatibility.migration.tests/pom.xml  | 2 +-
 tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml      | 2 +-
 tools/tests/org.eclipse.e4.tools.test/pom.xml                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index bf7f32794b..e4fd53f007 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
   	<groupId>org.eclipse.platform</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.28.0-SNAPSHOT</version>
+    <version>4.29.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
index 6b0ce7ec78..d33cf1d2ee 100644
--- a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
+++ b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.eclipse.platform</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.28.0-SNAPSHOT</version>
+		<version>4.29.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.e4.tools.compatibility.migration.tests</artifactId>
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml b/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
index 5899fc670e..b9af5c530e 100644
--- a/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
+++ b/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.eclipse.platform</groupId>
   		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.28.0-SNAPSHOT</version>
+		<version>4.29.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.e4.tools.persistence.tests</artifactId>
diff --git a/tools/tests/org.eclipse.e4.tools.test/pom.xml b/tools/tests/org.eclipse.e4.tools.test/pom.xml
index 0b7df3ade8..88fa87e157 100644
--- a/tools/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tools/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 	<groupId>org.eclipse.platform</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.28.0-SNAPSHOT</version>
+		<version>4.29.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From b6c9d93ea666a6c62145ff4412960a2846b35d77 Mon Sep 17 00:00:00 2001
From: Joerg Kubitz <jkubitz-eclipse@gmx.de>
Date: Mon, 22 May 2023 14:38:04 +0200
Subject: [PATCH 1234/1286] fix leaked resources

---
 .../META-INF/MANIFEST.MF                           |  2 +-
 tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml  |  2 +-
 .../dialogs/AbstractCommandSelectionDialog.java    | 14 ++++++++++----
 .../common/component/dialogs/BundleImageCache.java | 11 +++++++++--
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 7902987001..72f4592480 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.8.0.qualifier
+Bundle-Version: 4.8.100.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index e4fd53f007..d163314602 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>4.8.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index 09dc03c1fd..fdd8a7e62b 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -14,6 +14,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -71,10 +73,14 @@ protected Control createDialogArea(Composite parent) {
 		setTitle(getDialogTitle());
 		setMessage(getDialogMessage());
 
-		final Image titleImage = new Image(composite.getDisplay(), getClass().getClassLoader().getResourceAsStream(
-				"/icons/full/wizban/newexp_wiz.png")); //$NON-NLS-1$
-		setTitleImage(titleImage);
-		getShell().addDisposeListener(e -> titleImage.dispose());
+		try (InputStream resourceStream = getClass().getClassLoader()
+				.getResourceAsStream("/icons/full/wizban/newexp_wiz.png")) { //$NON-NLS-1$
+			final Image titleImage = new Image(composite.getDisplay(), resourceStream);
+			setTitleImage(titleImage);
+			getShell().addDisposeListener(e -> titleImage.dispose());
+		} catch (IOException ex) {
+			throw new RuntimeException(ex);
+		}
 
 		final Composite container = new Composite(composite, SWT.NONE);
 		container.setLayoutData(new GridData(GridData.FILL_BOTH));
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
index 2b6de00861..ee9b893465 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
@@ -13,6 +13,8 @@
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -94,8 +96,13 @@ public Image loadFromKey(String key) {
 
 	protected Image getPlaceholder() {
 		if (imgPlaceholder == null) {
-			imgPlaceholder = new Image(Display.getDefault(),
-				classloader.getResourceAsStream("/icons/full/obj16/missing_image_placeholder.png")); //$NON-NLS-1$
+			try (InputStream resourceStream = classloader
+					.getResourceAsStream("/icons/full/obj16/missing_image_placeholder.png")) { //$NON-NLS-1$
+				imgPlaceholder = new Image(Display.getDefault(),
+						resourceStream);
+			} catch (IOException ex) {
+				throw new RuntimeException(ex);
+			}
 		}
 		return imgPlaceholder;
 	}

From 28e6aea3a948cba0256ae4026efae5cf4bd7d8bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= <jkubitz-eclipse@gmx.de>
Date: Tue, 6 Jun 2023 09:38:04 +0200
Subject: [PATCH 1235/1286] use try-with-resource

---
 .../TargetPlatformContributionCollector.java  | 75 +++++++++----------
 1 file changed, 35 insertions(+), 40 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
index fbd81df54c..f601870346 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2017 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2023 TwelveTone LLC and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -335,48 +335,43 @@ protected IStatus run(IProgressMonitor monitor) {
 							final String installLocation = pluginModelBase.getInstallLocation();
 							if (installLocation.endsWith(".jar")) { //$NON-NLS-1$
 								url = new URL("file:///" + installLocation); //$NON-NLS-1$
-								final ZipInputStream zis = new ZipInputStream(url.openStream());
-								while (true) {
-									final ZipEntry entry = zis.getNextEntry();
-									if (entry == null) {
-										break;
-									}
-									final String name2 = entry.getName();
-									if (shouldIgnore(name2)) {
-										continue;
-									}
-									final Matcher m = patternFile.matcher(name2);
-									if (m.matches()) {
-										final Entry e = new Entry();
-										e.installLocation = installLocation;
-										cacheLocation.add(installLocation);
-										e.name = m.group(2);
-										e.path = m.group(1);
-										if (e.path != null) {
-											e.pakage = e.path.replace("/", "."); //$NON-NLS-1$ //$NON-NLS-2$
-											if (e.pakage.startsWith(".")) { //$NON-NLS-1$
-												e.pakage = e.pakage.substring(1);
-											}
-											if (e.pakage.endsWith(".")) { //$NON-NLS-1$
-												e.pakage = e.pakage.substring(0, e.pakage.length() - 1);
-											}
-										} else {
-											e.pakage = ""; //$NON-NLS-1$
+								try (final ZipInputStream zis = new ZipInputStream(url.openStream())) {
+									while (true) {
+										final ZipEntry entry = zis.getNextEntry();
+										if (entry == null) {
+											break;
 										}
-										cachePackage.add(e.pakage);
+										final String name2 = entry.getName();
+										if (shouldIgnore(name2)) {
+											continue;
+										}
+										final Matcher m = patternFile.matcher(name2);
+										if (m.matches()) {
+											final Entry e = new Entry();
+											e.installLocation = installLocation;
+											cacheLocation.add(installLocation);
+											e.name = m.group(2);
+											e.path = m.group(1);
+											if (e.path != null) {
+												e.pakage = e.path.replace("/", "."); //$NON-NLS-1$ //$NON-NLS-2$
+												if (e.pakage.startsWith(".")) { //$NON-NLS-1$
+													e.pakage = e.pakage.substring(1);
+												}
+												if (e.pakage.endsWith(".")) { //$NON-NLS-1$
+													e.pakage = e.pakage.substring(0, e.pakage.length() - 1);
+												}
+											} else {
+												e.pakage = ""; //$NON-NLS-1$
+											}
+											cachePackage.add(e.pakage);
 
-										e.bundleSymName = pluginBase.getId();
-										if (e.path == null) {
-											e.path = ""; //$NON-NLS-1$
+											e.bundleSymName = pluginBase.getId();
+											if (e.path == null) {
+												e.path = ""; //$NON-NLS-1$
+											}
+											cacheEntry.add(e);
+											cacheBundleId.add(pluginBase.getId());
 										}
-										cacheEntry.add(e);
-										cacheBundleId.add(pluginBase.getId());
-
-										//
-										// System.out.println(group
-										// + " -> "
-										// +
-										// m.group(2));
 									}
 								}
 							} else {

From 019874b75472bcd9a7a72f1c5c13ad93e11cc3f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= <jkubitz-eclipse@gmx.de>
Date: Wed, 7 Jun 2023 15:46:48 +0200
Subject: [PATCH 1236/1286] Add missing "static" modifier for constants

To reduce memory per instance
---
 .../eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 60cbd8f45f..a6e599104e 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -289,7 +289,7 @@ public class ModelEditor implements IGotoObject {
 	public static final int TAB_FORM = 0;
 	public static final int TAB_XMI = 1;
 	public static final int TAB_LIST = 2;
-	final String key = "org.eclipse.e4.tools.active-object-viewer"; //$NON-NLS-1$
+	static final String key = "org.eclipse.e4.tools.active-object-viewer"; //$NON-NLS-1$
 
 
 

From 3c528a5e1cfbac3c6201d61e3c0ecfc4ddc3a155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= <jkubitz-eclipse@gmx.de>
Date: Mon, 12 Jun 2023 14:11:46 +0200
Subject: [PATCH 1237/1286] Use try-with-resource and java.io.InputStream
 convenience methods

Doesn't try to fix anything. Just code and warnings reduced.
---
 .../PDEClassContributionProvider.java         | 14 +---------
 .../dialogs/NonReferencedActionPage.java      | 27 +++++--------------
 .../dialogs/NonReferencedResourceDialog.java  | 23 ++++------------
 3 files changed, 12 insertions(+), 52 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index 1e50fead81..ea70640091 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -128,10 +128,7 @@ public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
 					final IFile f = project.getFile("/META-INF/MANIFEST.MF"); //$NON-NLS-1$
 
 					if (f != null && f.exists()) {
-						BufferedReader r = null;
-						try {
-							final InputStream s = f.getContents();
-							r = new BufferedReader(new InputStreamReader(s));
+						try (BufferedReader r = new BufferedReader(new InputStreamReader(f.getContents()))) {
 							String line;
 							while ((line = r.readLine()) != null) {
 								if (line.startsWith("Bundle-SymbolicName:")) { //$NON-NLS-1$
@@ -153,15 +150,6 @@ public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
 						} catch (final IOException e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
-						} finally {
-							if (r != null) {
-								try {
-									r.close();
-								} catch (final IOException e) {
-									// TODO Auto-generated catch block
-									e.printStackTrace();
-								}
-							}
 						}
 					}
 				}
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
index a72479e290..42da490469 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
@@ -406,22 +406,13 @@ public void copyResourceToProject() {
 	}
 
 	public void doRequireBundle(String bundle, String installLocation) {
-
 		// Get source bundle version from manifest
 		String version = null;
-		@SuppressWarnings("resource")
-		InputStream srcStream = null;
-		try {
-			Manifest manifestSource;
-			if (installLocation.endsWith(".jar")) { //$NON-NLS-1$
-				try (ZipFile zip = new ZipFile(installLocation)) {
-					srcStream = zip.getInputStream(zip.getEntry("META-INF/MANIFEST.MF")); //$NON-NLS-1$
-					manifestSource = new Manifest(srcStream);
-				}
-			} else {
-				srcStream = new BufferedInputStream(new FileInputStream(installLocation + "/META-INF/MANIFEST.MF")); //$NON-NLS-1$
-				manifestSource = new Manifest(srcStream);
-			}
+		try (ZipFile zip = installLocation.endsWith(".jar") ? new ZipFile(installLocation) : null; //$NON-NLS-1$
+				InputStream srcStream = zip != null ? zip.getInputStream(zip.getEntry("META-INF/MANIFEST.MF")) //$NON-NLS-1$
+						: new BufferedInputStream(new FileInputStream(installLocation + "/META-INF/MANIFEST.MF")) //$NON-NLS-1$
+				) {
+			Manifest manifestSource = new Manifest(srcStream);
 			version = manifestSource.getMainAttributes().getValue("Bundle-Version"); //$NON-NLS-1$
 			if (version != null) {
 				version = version.replaceFirst("\\.qualifier", ""); //$NON-NLS-1$ //$NON-NLS-2$
@@ -429,17 +420,11 @@ public void doRequireBundle(String bundle, String installLocation) {
 		} catch (final Exception e) {
 			e.printStackTrace();
 			return;
-		} finally {
-			try {
-				srcStream.close();
-			} catch (final Exception e) {
-			}
 		}
 
 		final IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
-		Manifest manifest;
 		try {
-			manifest = new Manifest(fileManifest.getContents());
+			Manifest manifest = new Manifest(fileManifest.getContents());
 			String value = manifest.getMainAttributes().getValue("Require-Bundle"); //$NON-NLS-1$
 			if (value == null) {
 				manifest.getMainAttributes().putValue("Require-Bundle", bundle); //$NON-NLS-1$
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
index 5b9e78a29d..3a3c00a3d5 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
@@ -447,19 +447,11 @@ public void doRequireBundle(String bundle, String installLocation) {
 
 		// Get source bundle version from manifest
 		String version = null;
-		@SuppressWarnings("resource")
-		InputStream srcStream = null;
-		try {
-			Manifest manifestSource;
-			if (installLocation.endsWith(".jar")) { //$NON-NLS-1$
-				try (ZipFile zip = new ZipFile(installLocation)) {
-					srcStream = zip.getInputStream(zip.getEntry("META-INF/MANIFEST.MF")); //$NON-NLS-1$
-					manifestSource = new Manifest(srcStream);
-				}
-			} else {
-				srcStream = new BufferedInputStream(new FileInputStream(installLocation + "/META-INF/MANIFEST.MF")); //$NON-NLS-1$
-				manifestSource = new Manifest(srcStream);
-			}
+		try (ZipFile zip = installLocation.endsWith(".jar") ? new ZipFile(installLocation) : null; //$NON-NLS-1$
+				InputStream srcStream = zip != null ? zip.getInputStream(zip.getEntry("META-INF/MANIFEST.MF")) //$NON-NLS-1$
+						: new BufferedInputStream(new FileInputStream(installLocation + "/META-INF/MANIFEST.MF")) //$NON-NLS-1$
+		) {
+			Manifest manifestSource = new Manifest(srcStream);
 			version = manifestSource.getMainAttributes().getValue("Bundle-Version"); //$NON-NLS-1$
 			if (version != null) {
 				version = version.replaceFirst("\\.qualifier", ""); //$NON-NLS-1$ //$NON-NLS-2$
@@ -467,11 +459,6 @@ public void doRequireBundle(String bundle, String installLocation) {
 		} catch (final Exception e) {
 			e.printStackTrace();
 			return;
-		} finally {
-			try {
-				srcStream.close();
-			} catch (final Exception e) {
-			}
 		}
 
 		final IFile fileManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$

From 4d18b5a42a317a50e83340d752c175280f702da8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= <jkubitz-eclipse@gmx.de>
Date: Tue, 13 Jun 2023 10:03:55 +0200
Subject: [PATCH 1238/1286] version bump org.eclipse.e4.tools.emf.editor3x

---
 .../org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index f4a33a3f78..2b57c71265 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 4.9.0.qualifier
+Bundle-Version: 4.9.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",

From d204c62a73de3addd2f67aafbdd67e380f25ee8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?=
 =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?=
 <akurtakov@gmail.com>
Date: Wed, 14 Jun 2023 13:53:27 +0300
Subject: [PATCH 1239/1286] Remove unused import

To get cleaner I-build
(https://download.eclipse.org/eclipse/downloads/drops4/I20230613-1800/compilelogs/plugins/org.eclipse.e4.tools.emf.editor3x_4.9.100.v20230613-1102/@dot.html
)
---
 .../PDEClassContributionProvider.java         | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index ea70640091..bb9316032c 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -16,7 +16,6 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 
 import org.eclipse.core.resources.IFile;
@@ -26,6 +25,8 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider;
 import org.eclipse.e4.tools.emf.ui.common.ResourceSearchScope;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
+import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionResultHandler;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jdt.core.JavaCore;
@@ -49,7 +50,7 @@ public PDEClassContributionProvider() {
 	public void findContribution(final Filter filter, final ContributionResultHandler handler) {
 		boolean followReferences = true;
 		if (filter.getSearchScope().contains(ResourceSearchScope.PROJECT)
-			&& !filter.getSearchScope().contains(ResourceSearchScope.REFERENCES)) {
+				&& !filter.getSearchScope().contains(ResourceSearchScope.REFERENCES)) {
 			followReferences = false;
 		}
 
@@ -66,8 +67,8 @@ public void findContribution(final Filter filter, final ContributionResultHandle
 		} else {
 			// filter.project may be null in the live editor
 			scope = filter.project != null ? PDEJavaHelper
-				.getSearchScope(filter.project) : SearchEngine
-				.createWorkspaceScope();
+					.getSearchScope(filter.project) : SearchEngine
+					.createWorkspaceScope();
 		}
 		char[] packageName = null;
 		char[] typeName = null;
@@ -138,7 +139,7 @@ public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
 										end = line.length();
 									}
 									final ContributionData data = new ContributionData(line.substring(start + 1, end)
-										.trim(), content, "Java", null); //$NON-NLS-1$
+											.trim(), content, "Java", null); //$NON-NLS-1$
 									handler.result(data);
 									break;
 								}
@@ -163,14 +164,14 @@ public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName,
 
 		try {
 			searchEngine.searchAllTypeNames(
-				packageName,
-				SearchPattern.R_PATTERN_MATCH,
-				typeName,
-				SearchPattern.R_PATTERN_MATCH | SearchPattern.R_CAMELCASE_MATCH,
-				IJavaSearchConstants.CLASS,
-				scope,
-				req,
-				IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, null);
+					packageName,
+					SearchPattern.R_PATTERN_MATCH,
+					typeName,
+					SearchPattern.R_PATTERN_MATCH | SearchPattern.R_CAMELCASE_MATCH,
+					IJavaSearchConstants.CLASS,
+					scope,
+					req,
+					IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, null);
 		} catch (final JavaModelException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();

From 268d43b350643db61b3aaffb037b9309ec3e06bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= <jkubitz-eclipse@gmx.de>
Date: Wed, 14 Jun 2023 08:53:00 +0200
Subject: [PATCH 1240/1286] e4 BundleImageCache: avoid deprecated finalize()

https://openjdk.org/jeps/421 Deprecate Finalization for Removal
---
 .../component/dialogs/BundleImageCache.java   | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
index ee9b893465..856063e99f 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2023 TwelveTone LLC and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -42,8 +42,8 @@ public class BundleImageCache {
 
 	private final Display display;
 	private final ClassLoader classloader;
-	ArrayList<Image> images;
-	static private Image imgPlaceholder;
+	private final ArrayList<Image> images;
+	private static Image imgPlaceholder;
 	private final IEclipseContext context;
 
 	public BundleImageCache(Display display, ClassLoader classloader) {
@@ -107,21 +107,18 @@ protected Image getPlaceholder() {
 		return imgPlaceholder;
 	}
 
-	@Override
-	protected void finalize() throws Throwable {
-		if (imgPlaceholder != null && imgPlaceholder.isDisposed() == false) {
-			imgPlaceholder.dispose();
-		}
-	}
-
 	public void dispose() {
 		for (final Iterator<Image> it = images.iterator(); it.hasNext();) {
 			final Image image = it.next();
-			if (image.isDisposed() == false) {
+			if (!image.isDisposed()) {
 				image.dispose();
 			}
 			it.remove();
 		}
+		if (imgPlaceholder != null && !imgPlaceholder.isDisposed()) {
+			imgPlaceholder.dispose();
+			imgPlaceholder = null;
+		}
 	}
 
 	public Image create(String bundleId, String path) {

From 3c7c9e87d97b6b719c5c09afe695b73aa9e8a9b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?=
 =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?=
 <akurtakov@gmail.com>
Date: Fri, 16 Jun 2023 10:58:43 +0300
Subject: [PATCH 1241/1286] Remove unused imports

Fixes warnings in I-build
https://download.eclipse.org/eclipse/downloads/drops4/I20230615-0550/compilelogs/plugins/org.eclipse.e4.tools.emf.editor3x_4.9.100.v20230614-1302/@dot.html#OTHER_WARNINGS
---
 .../e4/tools/emf/editor3x/PDEClassContributionProvider.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
index bb9316032c..273cc3a791 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
+ * Copyright (c) 2010, 2023 BestSolution.at and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -25,8 +25,6 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider;
 import org.eclipse.e4.tools.emf.ui.common.ResourceSearchScope;
-import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
-import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionResultHandler;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jdt.core.JavaCore;

From 4fc106b06d1354868e6a02aa51ab8c48f4210055 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Sun, 25 Jun 2023 11:52:44 +0200
Subject: [PATCH 1242/1286] Re-normalize line-endings in git of all files to
 Linux style ("\n")

Some ASCII-files were checked-in into git having windows style line
endings (\r\n). This is in general not wanted because it can cause
modified files without any difference in git-staging.

To re-normalize line endings of all files use the following command
(including dot):

git add --renormalize .
---
 .../migration/PerspectiveMigrator.java        |  212 +-
 .../migration/E4MigrationTool.java            | 1874 ++++++++---------
 .../fragment.e4xmi                            |   98 +-
 .../build.properties                          |   42 +-
 .../model/persistence.ecore                   |   40 +-
 .../model/persistence.genmodel                |   70 +-
 .../plugin.xml                                |   32 +-
 .../internal/persistence/util/CommonUtil.java |  574 ++---
 .../util/PersistenceAdapterFactory.java       |  290 +--
 .../persistence/util/PersistenceSwitch.java   |  282 +--
 .../persistence/PerspectivePersister.java     | 1004 ++++-----
 11 files changed, 2259 insertions(+), 2259 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java
index 0f9fe685bf..001ae65adb 100644
--- a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java
+++ b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java
@@ -1,106 +1,106 @@
-/*******************************************************************************
- * Copyright (c) 2022 EclipseSource GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     EclipseSource GmbH - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.compatibiliy.migration;
-
-import java.util.List;
-
-import org.eclipse.e4.tools.internal.compatibiliy.migration.E4MigrationTool;
-import org.eclipse.e4.tools.internal.compatibiliy.migration.WorkbenchUtil;
-import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
-import org.eclipse.e4.tools.persistence.PerspectivePersister;
-import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
-import org.eclipse.e4.ui.workbench.modeling.EModelService;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.internal.IWorkbenchConstants;
-
-/**
- * The PerspectiveMigrator utility allows to convert 
- * and apply 3.x and e4 perspectives.
- *
- * @since 1.0
- *
- */
-@SuppressWarnings("restriction")
-public final class PerspectiveMigrator{
-
-	private PerspectiveMigrator() {}
-	
-	/**
-	 * Apply a 3.x workbench state to the running 4.x application.
-	 *
-	 * @param iMemento The 3.x workbench state to apply
-	 */
-	public static void apply3xWorkbenchState(final IMemento iMemento) {
-		MApplication application = convertToMApplication(iMemento);
-		IWorkbenchState workbenchState = convertToWorkbenchState(application);
-		PerspectivePersister.restoreWorkbenchState(workbenchState);
-	}
-
-	/**
-	 * Convert a serialized 3.x workbench to an e4 MApplication.
-	 *
-	 * @param iMemento The 3.x workbench memento
-	 * @return The resulting MApplication
-	 */
-	public static MApplication convertToMApplication(final IMemento iMemento) {
-		return E4MigrationTool.convert(iMemento);
-	}
-
-	/**
-	 * Extract the WorkbenchState from the MApplication. This state can be used to
-	 * restore the workbench.
-	 *
-	 * @param application The MApplication to extract the state from
-	 * @return The extracted WorkbenchState
-	 */
-	public static IWorkbenchState convertToWorkbenchState(final MApplication application) {
-		EModelService modelService = WorkbenchUtil.getEModelService();
-		MPerspective activePerspective = modelService.getActivePerspective(WorkbenchUtil.getCurrentMainWindow());
-		List<MPerspective> findElements = modelService.findElements(application, null, MPerspective.class, null);
-
-		MPerspective mPerspective = null;
-		String elementId = activePerspective.getElementId();
-		for (MPerspective perspective : findElements) {
-			if (elementId.equals(perspective.getElementId())) {
-				mPerspective = perspective;
-			}
-		}
-
-		if (mPerspective == null) {
-			System.err
-					.println("No perspective with id " + elementId + " was found. Using first perspective to restore"); //$NON-NLS-1$ //$NON-NLS-2$
-			mPerspective = findElements.get(0);
-			mPerspective.setElementId(elementId);
-		}
-
-		return PerspectivePersister.convertPerspective(mPerspective);
-	}
-	/**
-	 * Check whether the provided memento contains a legacy (3.x) workbench.
-	 *
-	 * @param iMemento The serialized IMemento
-	 * @return true if the memento contains a legacy workbench.
-	 */
-	public static boolean isLegacyWorkbench(IMemento iMemento) {
-		try {
-			return IWorkbenchConstants.TAG_WORKBENCH.equals(iMemento.getType());
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-
-		return false;
-	}
-
-}
+/*******************************************************************************
+ * Copyright (c) 2022 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.compatibiliy.migration;
+
+import java.util.List;
+
+import org.eclipse.e4.tools.internal.compatibiliy.migration.E4MigrationTool;
+import org.eclipse.e4.tools.internal.compatibiliy.migration.WorkbenchUtil;
+import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
+import org.eclipse.e4.tools.persistence.PerspectivePersister;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.internal.IWorkbenchConstants;
+
+/**
+ * The PerspectiveMigrator utility allows to convert 
+ * and apply 3.x and e4 perspectives.
+ *
+ * @since 1.0
+ *
+ */
+@SuppressWarnings("restriction")
+public final class PerspectiveMigrator{
+
+	private PerspectiveMigrator() {}
+	
+	/**
+	 * Apply a 3.x workbench state to the running 4.x application.
+	 *
+	 * @param iMemento The 3.x workbench state to apply
+	 */
+	public static void apply3xWorkbenchState(final IMemento iMemento) {
+		MApplication application = convertToMApplication(iMemento);
+		IWorkbenchState workbenchState = convertToWorkbenchState(application);
+		PerspectivePersister.restoreWorkbenchState(workbenchState);
+	}
+
+	/**
+	 * Convert a serialized 3.x workbench to an e4 MApplication.
+	 *
+	 * @param iMemento The 3.x workbench memento
+	 * @return The resulting MApplication
+	 */
+	public static MApplication convertToMApplication(final IMemento iMemento) {
+		return E4MigrationTool.convert(iMemento);
+	}
+
+	/**
+	 * Extract the WorkbenchState from the MApplication. This state can be used to
+	 * restore the workbench.
+	 *
+	 * @param application The MApplication to extract the state from
+	 * @return The extracted WorkbenchState
+	 */
+	public static IWorkbenchState convertToWorkbenchState(final MApplication application) {
+		EModelService modelService = WorkbenchUtil.getEModelService();
+		MPerspective activePerspective = modelService.getActivePerspective(WorkbenchUtil.getCurrentMainWindow());
+		List<MPerspective> findElements = modelService.findElements(application, null, MPerspective.class, null);
+
+		MPerspective mPerspective = null;
+		String elementId = activePerspective.getElementId();
+		for (MPerspective perspective : findElements) {
+			if (elementId.equals(perspective.getElementId())) {
+				mPerspective = perspective;
+			}
+		}
+
+		if (mPerspective == null) {
+			System.err
+					.println("No perspective with id " + elementId + " was found. Using first perspective to restore"); //$NON-NLS-1$ //$NON-NLS-2$
+			mPerspective = findElements.get(0);
+			mPerspective.setElementId(elementId);
+		}
+
+		return PerspectivePersister.convertPerspective(mPerspective);
+	}
+	/**
+	 * Check whether the provided memento contains a legacy (3.x) workbench.
+	 *
+	 * @param iMemento The serialized IMemento
+	 * @return true if the memento contains a legacy workbench.
+	 */
+	public static boolean isLegacyWorkbench(IMemento iMemento) {
+		try {
+			return IWorkbenchConstants.TAG_WORKBENCH.equals(iMemento.getType());
+		} catch (Exception ex) {
+			ex.printStackTrace();
+		}
+
+		return false;
+	}
+
+}
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
index 17368eb120..fca4f796fa 100644
--- a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
+++ b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
@@ -1,937 +1,937 @@
-/*******************************************************************************
- * Copyright (c) 2022 EclipseSource GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     EclipseSource GmbH - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.internal.compatibiliy.migration;
-
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_ACTIVE_PAGE_ID;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_ACTIVE_PART;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_ACTIVE_PERSPECTIVE;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_ALWAYS_ON_ACTION_SET;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_AREA;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_AREA_TRIM_STATE;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_AREA_VISIBLE;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_CONTENT;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_DESCRIPTOR;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_DETACHED_WINDOW;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_EDITOR;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_EDITORS;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_EXPANDED;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_FAST_VIEWS;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_FAST_VIEW_BAR;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_FAST_VIEW_BARS;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_FILE;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_FOCUS;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_FOLDER;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_HEIGHT;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_HIDDEN_WINDOW;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_HIDE_MENU;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_HIDE_TOOLBAR;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_ID;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_INFO;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_LABEL;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_LAYOUT;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_MAIN_WINDOW;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_MAXIMIZED;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_MINIMIZED;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_MRU_LIST;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_NEW_WIZARD_ACTION;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PAGE;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PART;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PART_NAME;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PERSPECTIVE;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PERSPECTIVES;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PERSPECTIVE_ACTION;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PERSPECTIVE_BAR;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PRESENTATION;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PROPERTIES;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PROPERTY;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_RATIO;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_RATIO_LEFT;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_RATIO_RIGHT;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_RELATIONSHIP;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_RELATIVE;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_SHOW_IN_TIME;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_SHOW_VIEW_ACTION;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_TITLE;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_TOOLTIP;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_VIEW;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_VIEWS;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_VIEW_STATE;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_WIDTH;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_WINDOW;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_WORKBOOK;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_WORKING_SET;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_WORKING_SETS;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_X;
-import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_Y;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.eclipse.e4.ui.model.application.MAddon;
-import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.MApplicationFactory;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
-import org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory;
-import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
-import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
-import org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack;
-import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
-import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
-import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainerElement;
-import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
-import org.eclipse.e4.ui.model.application.ui.basic.MStackElement;
-import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
-import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
-import org.eclipse.e4.ui.workbench.IPresentationEngine;
-import org.eclipse.e4.ui.workbench.modeling.EPartService;
-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.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.WorkbenchException;
-import org.eclipse.ui.XMLMemento;
-import org.eclipse.ui.internal.e4.compatibility.ModeledPageLayoutUtils;
-
-/**
- * This utility class allows to migrate existing 3.x perspectives to 
- * an e4 application models.
- *  
- *
- * @since 1.0
- *
- */
-@SuppressWarnings("restriction")
-public final class E4MigrationTool {
-
-	/** Element id for the primary editor stack in an e4 application. */
-	private static final String PRIMARY_EDITOR_PART_STACK_ID = "org.eclipse.e4.primaryDataStack"; //$NON-NLS-1$
-
-	private static final String EDITOR_AREA_ID = "org.eclipse.ui.editorss"; //$NON-NLS-1$
-
-	private final Map<Object, Set<String>> visited = new LinkedHashMap<>();
-
-	private E4MigrationTool() {
-	}
-
-	/**
-	 * Allows to convert an 3.x perspective to a serialized e4 application.
-	 *
-	 * @param sourceMementoFile The file to the 3.x serialized perspective.
-	 * @param targetMApplicationFile The file to serialize the e4 application to.
-	 * @throws IOException           When reading/writing the files fails.
-	 * @throws FileNotFoundException When the files do not exist.
-	 * @throws WorkbenchException    When reading the 3.x perspective fails
-	 */
-	public static void convert(final File sourceMementoFile, final File targetMApplicationFile)
-			throws FileNotFoundException, IOException, WorkbenchException {
-		E4MigrationTool converter = new E4MigrationTool();
-		IMemento memento;
-		try (FileInputStream input = new FileInputStream(sourceMementoFile)) {
-			BufferedReader reader = new BufferedReader(new InputStreamReader(input, "utf-8")); //$NON-NLS-1$
-			memento = XMLMemento.createReadRoot(reader);
-		}
-
-		ResourceSet resourceSet = new ResourceSetImpl();
-
-		Resource resource = resourceSet.createResource(URI.createURI("sample.e4xmi")); //$NON-NLS-1$
-		resource.getContents().add((EObject) converter.internalConvert(memento));
-
-		try (FileOutputStream output = new FileOutputStream(targetMApplicationFile)) {
-			resource.save(output, null);
-		}
-
-	}
-
-	/**
-	 * Convert the IMemento of the workbench state of an 3.x application to a MApplication.
-	 *
-	 * @param memento The IMemento to convert
-	 * @return The resulting MApplication
-	 * @throws WorkbenchException Thrown when the xml cannot be parsed
-	 */
-	public static MApplication convert(final IMemento memento) {
-		E4MigrationTool converter = new E4MigrationTool();
-		return converter.internalConvert(memento);
-	}
-
-	private MApplication internalConvert(final IMemento memento) {
-		MApplication application = MApplicationFactory.INSTANCE.createApplication();
-
-		// Initialize the add ons.
-		{
-			List<MAddon> addons = application.getAddons();
-			String[][] addonValues = new String[][] { new String[] { "org.eclipse.e4.core.commands.service", //$NON-NLS-1$
-					"platform:/plugin/org.eclipse.platform", //$NON-NLS-1$
-					"bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon" }, //$NON-NLS-1$
-					new String[] { "org.eclipse.e4.ui.contexts.service", "platform:/plugin/org.eclipse.platform", //$NON-NLS-1$ //$NON-NLS-2$
-							"bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon" }, //$NON-NLS-1$
-					new String[] { "org.eclipse.e4.ui.bindings.service", "platform:/plugin/org.eclipse.platform", //$NON-NLS-1$ //$NON-NLS-2$
-							"bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon" }, //$NON-NLS-1$
-					new String[] { "org.eclipse.e4.ui.workbench.commands.model", //$NON-NLS-1$
-							"platform:/plugin/org.eclipse.platform", //$NON-NLS-1$
-							"bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon" }, //$NON-NLS-1$
-					new String[] { "org.eclipse.e4.ui.workbench.contexts.model", //$NON-NLS-1$
-							"platform:/plugin/org.eclipse.platform", //$NON-NLS-1$
-							"bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon" }, //$NON-NLS-1$
-					new String[] { "org.eclipse.e4.ui.workbench.bindings.model", //$NON-NLS-1$
-							"platform:/plugin/org.eclipse.platform", //$NON-NLS-1$
-							"bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon" }, //$NON-NLS-1$
-					new String[] { "Cleanup Addon", "platform:/plugin/org.eclipse.platform", //$NON-NLS-1$ //$NON-NLS-2$
-							"bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.cleanupaddon.CleanupAddon" }, //$NON-NLS-1$
-					new String[] { "DnD Addon", "platform:/plugin/org.eclipse.platform", //$NON-NLS-1$ //$NON-NLS-2$
-							"bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.dndaddon.DnDAddon" }, //$NON-NLS-1$
-					new String[] { "MinMax Addon", "platform:/plugin/org.eclipse.platform", //$NON-NLS-1$ //$NON-NLS-2$
-							"bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.MinMaxAddon" }, //$NON-NLS-1$
-					new String[] { "org.eclipse.ui.workbench.addon.0", "platform:/plugin/org.eclipse.platform", //$NON-NLS-1$ //$NON-NLS-2$
-							"bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon" }, //$NON-NLS-1$
-					new String[] { "SplitterAddon", null, //$NON-NLS-1$
-							"bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.splitteraddon.SplitterAddon" }, //$NON-NLS-1$
-					new String[] { "org.eclipse.ui.ide.addon.0", null, //$NON-NLS-1$
-							"bundleclass://org.eclipse.ui.ide/org.eclipse.ui.internal.ide.addons.SaveAllDirtyPartsAddon" }, //$NON-NLS-1$
-					new String[] { "org.eclipse.ui.ide.application.addon.0", //$NON-NLS-1$
-							"platform:/plugin/org.eclipse.ui.ide.application", //$NON-NLS-1$
-							"bundleclass://org.eclipse.ui.ide.application/org.eclipse.ui.internal.ide.application.addons.ModelCleanupAddon" }, }; //$NON-NLS-1$
-			for (String[] addonValue : addonValues) {
-				MAddon addon = MApplicationFactory.INSTANCE.createAddon();
-				addon.setElementId(addonValue[0]);
-				addon.setContributorURI(addonValue[1]);
-				addon.setContributionURI(addonValue[2]);
-				addons.add(addon);
-			}
-		}
-
-		IMemento mruMemento = memento.getChild(TAG_MRU_LIST);
-		if (mruMemento != null) {
-			for (IMemento fileMemento : mruMemento.getChildren(TAG_FILE)) {
-				// Ignored.
-				fileMemento.toString();
-			}
-		}
-
-		final IMemento[] windowMementos = memento.getChildren(TAG_WINDOW);
-		if (windowMementos == null || windowMementos.length == 0) {
-			// no <window> memento available - try memento instead
-			visitWindow(application, memento);
-		} else {
-			for (IMemento windowMemento : windowMementos) {
-				visitWindow(application, windowMemento);
-			}
-		}
-
-		return application;
-	}
-
-	private void visitWindow(final MApplication application, final IMemento memento) {
-		MTrimmedWindow window = MBasicFactory.INSTANCE.createTrimmedWindow();
-		window.setContributorURI("platform:/plugin/org.eclipse.platform"); //$NON-NLS-1$
-		application.getChildren().add(window);
-
-		Rectangle shellBounds = new Rectangle(getInteger(memento, TAG_X), getInteger(memento, TAG_Y),
-				getInteger(memento, TAG_WIDTH), getInteger(memento, TAG_HEIGHT));
-		if (!shellBounds.isEmpty()) {
-			window.setX(shellBounds.x);
-			window.setY(shellBounds.y);
-			window.setWidth(shellBounds.width);
-			window.setHeight(shellBounds.height);
-		}
-
-		if (getBoolean(memento, TAG_MAXIMIZED)) {
-			// Ignored.
-		}
-
-		if (getBoolean(memento, TAG_MINIMIZED)) {
-			// Ignored.
-		}
-
-		IMemento perspectiveBarMemento = memento.getChild(TAG_PERSPECTIVE_BAR);
-		visitPerspectiveBar(perspectiveBarMemento);
-
-		for (IMemento pageMemento : memento.getChildren(TAG_PAGE)) {
-			visitPage(window, pageMemento);
-		}
-
-	}
-
-	private void visitPage(final MWindow window, final IMemento memento) {
-		String focus = getString(memento, TAG_FOCUS);
-		if (focus != null && !focus.isEmpty()) {
-			String pageName = getString(memento, TAG_LABEL);
-			if (pageName != null) {
-				// Ignore.
-			}
-
-			String workingSetName = getString(memento, TAG_WORKING_SET);
-			if (workingSetName != null) {
-				// Ignore.
-			}
-
-			IMemento workingSetsMemento = memento.getChild(TAG_WORKING_SETS);
-			if (workingSetsMemento != null) {
-				for (IMemento workingSetMemento : workingSetsMemento.getChildren(TAG_WORKING_SET)) {
-					String id = getID(workingSetMemento);
-					if (id != null) {
-						// Ignore.
-					}
-				}
-			}
-
-			// org.eclipse.ui.internal.WorkbenchPage.ATT_AGGREGATE_WORKING_SET_ID
-			String aggregateWorkingSetId = getString(memento, "aggregateWorkingSetId"); //$NON-NLS-1$
-			if (aggregateWorkingSetId != null) {
-				// Ignore.
-			}
-
-			IMemento editorsMemento = memento.getChild(TAG_EDITORS);
-			if (editorsMemento != null) {
-				visitEditors(window, editorsMemento);
-			}
-
-			IMemento viewsMemento = memento.getChild(TAG_VIEWS);
-			if (viewsMemento != null) {
-				visitViews(window, viewsMemento);
-			}
-
-			IMemento perspectivesMemento = memento.getChild(TAG_PERSPECTIVES);
-			if (perspectivesMemento != null) {
-				visitPerspectives(window, perspectivesMemento);
-			}
-		}
-	}
-
-	private void visitPerspectives(final MWindow window, final IMemento memento) {
-		String activePartID = getString(memento, TAG_ACTIVE_PART);
-		String activePerspectiveID = getString(memento, TAG_ACTIVE_PERSPECTIVE);
-
-		if (activePartID != null) {
-			// Ignore.
-		}
-
-		MPartSashContainer partSashContainer = MBasicFactory.INSTANCE.createPartSashContainer();
-		partSashContainer.setHorizontal(true);
-		window.getChildren().add(partSashContainer);
-
-		MPerspectiveStack perspectiveStack = MAdvancedFactory.INSTANCE.createPerspectiveStack();
-		partSashContainer.getChildren().add(perspectiveStack);
-
-		List<MPerspective> perspectiveStackChildren = perspectiveStack.getChildren();
-		for (IMemento perspectiveMemento : memento.getChildren(TAG_PERSPECTIVE)) {
-			MPerspective perspective = MAdvancedFactory.INSTANCE.createPerspective();
-			perspectiveStackChildren.add(0, perspective);
-
-			int areaVisible = getInteger(perspectiveMemento, TAG_AREA_VISIBLE);
-
-			int trimAreaState = getInteger(perspectiveMemento, TAG_AREA_TRIM_STATE);
-			if (trimAreaState != 0) {
-				// Ignore.
-			}
-
-			Set<String> visibleViews = new LinkedHashSet<>();
-			for (IMemento viewMemento : perspectiveMemento.getChildren(TAG_VIEW)) {
-				String id = getID(viewMemento);
-				visibleViews.add(id);
-			}
-
-			Set<String> minimizedViews = getMinimizedViews(perspectiveMemento);
-
-			IMemento fastViewsMemento = perspectiveMemento.getChild(TAG_FAST_VIEWS);
-			if (fastViewsMemento != null) {
-				for (IMemento viewMemento : fastViewsMemento.getChildren(TAG_VIEW)) {
-					String id = getID(viewMemento);
-					if (id != null) {
-						// Ignore.
-					}
-				}
-			}
-
-			IMemento descriptorMemento = perspectiveMemento.getChild(TAG_DESCRIPTOR);
-			if (descriptorMemento != null) {
-				String id = getString(descriptorMemento, TAG_ID);
-				String label = getString(descriptorMemento, TAG_LABEL);
-
-				perspective.setElementId(id);
-				perspective.setLabel(label);
-
-				if (id.equals(activePerspectiveID)) {
-					perspectiveStack.setSelectedElement(perspective);
-				}
-			}
-
-			IMemento boundsMemento = perspectiveMemento.getChild(TAG_WINDOW);
-			if (boundsMemento != null) {
-				Rectangle bounds = new Rectangle(getInteger(boundsMemento, TAG_X), getInteger(boundsMemento, TAG_Y),
-						getInteger(boundsMemento, TAG_WIDTH), getInteger(boundsMemento, TAG_HEIGHT));
-				if (!bounds.isEmpty()) {
-					// Ignore.
-				}
-			}
-
-			IMemento layoutMemento = perspectiveMemento.getChild(TAG_LAYOUT);
-			if (layoutMemento != null) {
-				IMemento mainWindowMemento = layoutMemento.getChild(TAG_MAIN_WINDOW);
-				if (mainWindowMemento != null) {
-					MPartSashContainer perspectivePartSashContainer = MBasicFactory.INSTANCE.createPartSashContainer();
-					perspectivePartSashContainer.setHorizontal(true);
-					perspective.getChildren().add(perspectivePartSashContainer);
-
-					if (areaVisible != 0) {
-						// Ignore.
-					}
-
-					Map<String, Info> infos = new LinkedHashMap<>();
-					for (IMemento infoMemento : mainWindowMemento.getChildren(TAG_INFO)) {
-						Info info = new Info();
-						info.partID = getString(infoMemento, TAG_PART);
-						info.relativeID = getString(infoMemento, TAG_RELATIVE);
-						if (info.relativeID != null) {
-							info.relationship = getInteger(infoMemento, TAG_RELATIONSHIP);
-							info.ratio = getFloat(infoMemento, TAG_RATIO, 0.5f);
-							info.left = getInteger(infoMemento, TAG_RATIO_LEFT);
-							info.right = getInteger(infoMemento, TAG_RATIO_RIGHT);
-						}
-
-						String folder = getString(infoMemento, TAG_FOLDER);
-						if (folder != null) {
-							IMemento folderMemento = infoMemento.getChild(TAG_FOLDER);
-							if (folderMemento != null) {
-								MPartStack partStack = MBasicFactory.INSTANCE.createPartStack();
-								partStack.setElementId(info.partID);
-								perspectivePartSashContainer.getChildren().add(partStack);
-
-								info.part = partStack;
-
-								String activePageID = getString(folderMemento, TAG_ACTIVE_PAGE_ID);
-
-								List<MStackElement> partStackChildren = partStack.getChildren();
-								for (IMemento pageMemento : folderMemento.getChildren(TAG_PAGE)) {
-									String pagePartID = getString(pageMemento, TAG_CONTENT);
-									if (pagePartID != null) {
-										MPlaceholder placeHolder = MAdvancedFactory.INSTANCE.createPlaceholder();
-										partStackChildren.add(placeHolder);
-										placeHolder.setElementId(pagePartID);
-										// A placeholder is rendered if it's visible or minimized.
-										// In case of minimization it is minimized through its parent part stack
-										boolean visibleOrMinimized = visibleViews.contains(pagePartID)
-												|| minimizedViews.contains(pagePartID);
-										placeHolder.setToBeRendered(visibleOrMinimized);
-
-										for (MUIElement element : window.getSharedElements()) {
-											if (pagePartID.equals(element.getElementId())) {
-												placeHolder.setRef(element);
-												break;
-											}
-										}
-
-										if (placeHolder.getRef() == null) {
-											MPart part = MBasicFactory.INSTANCE.createPart();
-											part.setElementId(pagePartID);
-											part.setLabel("fake" + pagePartID); //$NON-NLS-1$
-											part.setContributionURI(
-													"bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView"); //$NON-NLS-1$
-											window.getSharedElements().add(part);
-											placeHolder.setRef(part);
-										}
-
-										if (pagePartID.equals(activePageID)) {
-											partStack.setSelectedElement(placeHolder);
-											if (placeHolder.getRef() == null) {
-												System.err.print(""); //$NON-NLS-1$
-
-											}
-										}
-									}
-								}
-
-								int state = getInteger(folderMemento, TAG_EXPANDED);
-								if (state != 0) {
-									// Ignore.
-								}
-
-								for (IMemento presentationMemento : folderMemento.getChildren(TAG_PRESENTATION)) {
-									String id = getString(presentationMemento, TAG_ID);
-									if (id != null) {
-										// Ignore.
-									}
-								}
-
-								Map<String, String> properties = new LinkedHashMap<>();
-								IMemento propertiesMemento = folderMemento.getChild(TAG_PROPERTIES);
-								if (propertiesMemento != null) {
-									for (IMemento propertyMemento : propertiesMemento.getChildren(TAG_PROPERTY)) {
-										properties.put(getID(propertiesMemento), propertyMemento.getTextData());
-									}
-								}
-							}
-						} else if (EDITOR_AREA_ID.equals(info.partID)) {
-							// Assume that the editor area is at the root level of the main window
-							MPlaceholder areaPlaceholder = MAdvancedFactory.INSTANCE.createPlaceholder();
-							perspectivePartSashContainer.getChildren().add(areaPlaceholder);
-							areaPlaceholder.setElementId(EDITOR_AREA_ID);
-							info.part = areaPlaceholder;
-
-							// Find editor area and reference it in the placeholder
-							window.getSharedElements().stream().filter(e -> EDITOR_AREA_ID.equals(e.getElementId()))
-									.findFirst().ifPresent(e -> areaPlaceholder.setRef(e));
-						} else {
-							continue;
-						}
-
-						infos.put(info.partID, info);
-					}
-
-					ModeledPageLayoutUtils modeledPageLayoutUtils = new org.eclipse.ui.internal.e4.compatibility.ModeledPageLayoutUtils(
-							WorkbenchUtil.getEModelService());
-					System.out.println("Perspective: " + perspective.getLabel()); //$NON-NLS-1$
-					for (Info info : infos.values()) {
-						System.out.println("  " + info); //$NON-NLS-1$
-
-						Info relativePart = infos.get(info.relativeID);
-						if (relativePart != null) {
-							modeledPageLayoutUtils.insert(info.part, relativePart.part,
-									modeledPageLayoutUtils.plRelToSwt(info.relationship), info.ratio);
-						}
-					}
-
-					for (Iterator<EObject> i = ((EObject) perspectivePartSashContainer).eAllContents(); i.hasNext();) {
-						EObject eObject = i.next();
-						if (eObject instanceof MPartStack) {
-							MPartStack partStack = (MPartStack) eObject;
-							boolean toBeRendered = false;
-							boolean minimized = false;
-							// If non of the stack's children are rendered, do not render the stack either
-							for (MStackElement stackElement : partStack.getChildren()) {
-								if (stackElement.isToBeRendered()) {
-									toBeRendered = true;
-								}
-								if (minimizedViews.contains(stackElement.getElementId())) {
-									minimized = true;
-									toBeRendered = true;
-									break;
-								}
-							}
-
-							// If the stack's children are minimized, minimize the part stack
-							if (minimized) {
-								// If the part stack is minimized, select the first child that is rendered.
-								// Otherwise no child is selected on restore.
-								for (MStackElement stackElement : partStack.getChildren()) {
-									if (stackElement.isToBeRendered()) {
-										partStack.setSelectedElement(stackElement);
-										break;
-									}
-								}
-								partStack.setToBeRendered(true);
-								partStack.setVisible(false);
-								partStack.getTags().add(IPresentationEngine.MINIMIZED);
-							} else {
-								partStack.setToBeRendered(toBeRendered);
-								partStack.setVisible(toBeRendered);
-							}
-						}
-					}
-
-					for (Iterator<EObject> i = ((EObject) perspectivePartSashContainer).eAllContents(); i.hasNext();) {
-						EObject eObject = i.next();
-						if (eObject instanceof MPartSashContainer) {
-							MPartSashContainer otherPartSashContainer = (MPartSashContainer) eObject;
-							boolean toBeRendered = false;
-							boolean visible = false;
-							for (MPartSashContainerElement sashContainerElement : otherPartSashContainer
-									.getChildren()) {
-								if (sashContainerElement.isVisible()) {
-									visible = true;
-								}
-								if (sashContainerElement.isToBeRendered()) {
-									toBeRendered = true;
-								}
-								if (visible && toBeRendered) {
-									break;
-								}
-							}
-
-							otherPartSashContainer.setToBeRendered(toBeRendered);
-							// A part sash container can only be visible if it is rendered.
-							// A container can be rendered but not visible if all child part stacks are
-							// minimized.
-							otherPartSashContainer.setVisible(visible && toBeRendered);
-						}
-					}
-
-					for (IMemento detachedWindowMemento : mainWindowMemento.getChildren(TAG_DETACHED_WINDOW)) {
-						if (detachedWindowMemento != null) {
-							// Ignore.
-						}
-					}
-
-					for (IMemento hiddenWindowMemento : mainWindowMemento.getChildren(TAG_HIDDEN_WINDOW)) {
-						if (hiddenWindowMemento != null) {
-							// Ignore.
-						}
-					}
-
-					String maximizedStackID = getString(mainWindowMemento, TAG_MAXIMIZED);
-					if (maximizedStackID != null) {
-						// Ignore.
-					}
-				}
-			}
-
-			for (IMemento viewMemento : perspectiveMemento.getChildren(TAG_VIEW)) {
-				String id = getString(viewMemento, TAG_ID);
-				if (id != null) {
-					// Ignore.
-				}
-			}
-
-			for (IMemento alwaysOnActionMemento : perspectiveMemento.getChildren(TAG_ALWAYS_ON_ACTION_SET)) {
-				String id = getString(alwaysOnActionMemento, TAG_ID);
-				if (id != null) {
-					// Ignore.
-				}
-			}
-
-			for (IMemento toggleViewActionMemento : perspectiveMemento.getChildren(TAG_SHOW_VIEW_ACTION)) {
-				String id = getString(toggleViewActionMemento, TAG_ID);
-				if (id != null) {
-					// Ignore.
-				}
-			}
-
-			for (IMemento showInTimeMemento : perspectiveMemento.getChildren(TAG_SHOW_IN_TIME)) {
-				String id = getString(showInTimeMemento, TAG_ID);
-				if (id != null) {
-					// Ignore.
-				}
-			}
-
-			for (IMemento newWizardActionMemento : perspectiveMemento.getChildren(TAG_NEW_WIZARD_ACTION)) {
-				String id = getString(newWizardActionMemento, TAG_ID);
-				if (id != null) {
-					// Ignore.
-				}
-			}
-
-			for (IMemento perspectiveActionMemento : perspectiveMemento.getChildren(TAG_PERSPECTIVE_ACTION)) {
-				String id = getString(perspectiveActionMemento, TAG_ID);
-				if (id != null) {
-					// Ignore.
-				}
-			}
-
-			for (IMemento hideMenuMemento : perspectiveMemento.getChildren(TAG_HIDE_MENU)) {
-				String id = getString(hideMenuMemento, TAG_ID);
-				if (id != null) {
-					// Ignore.
-				}
-			}
-
-			for (IMemento hideToolbarMemento : perspectiveMemento.getChildren(TAG_HIDE_TOOLBAR)) {
-				String id = getString(hideToolbarMemento, TAG_ID);
-				if (id != null) {
-					// Ignore.
-				}
-			}
-		}
-	}
-
-	/** Get minimized view ids from a perspective's fast view bars. */
-	private Set<String> getMinimizedViews(IMemento perspectiveMemento) {
-		IMemento fastViewBarsMemento = perspectiveMemento.getChild(TAG_FAST_VIEW_BARS);
-		if (fastViewBarsMemento != null) {
-			// 1. Get all fast views in fast view bars
-			// 2. get all views in fast views
-			// 3. collect view ids
-			Set<String> result = Arrays.stream(fastViewBarsMemento.getChildren(TAG_FAST_VIEW_BAR))
-					.map(fVB -> fVB.getChild(TAG_FAST_VIEWS)).filter(Objects::nonNull)
-					.flatMap(fV -> Arrays.stream(fV.getChildren(TAG_VIEW))).map(v -> v.getString(TAG_ID))
-					.filter(Objects::nonNull).collect(Collectors.toSet());
-			return result;
-		}
-		return new HashSet<String>();
-	}
-
-	private void visitViews(final MWindow window, final IMemento memento) {
-		List<MUIElement> sharedElements = window.getSharedElements();
-		for (IMemento viewMemento : memento.getChildren(TAG_VIEW)) {
-			String id = getString(viewMemento, TAG_ID);
-			IMemento viewStateMemento = viewMemento.getChild(TAG_VIEW_STATE);
-
-			// org.eclipse.ui.internal.ViewReference.ViewReference(ViewFactory,
-			// String, String, IMemento)
-			String name = getString(viewMemento, TAG_PART_NAME);
-
-			MPart part = MBasicFactory.INSTANCE.createPart();
-			part.setElementId(id);
-			part.setLabel(name);
-			part.setContributionURI(
-					"bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView"); //$NON-NLS-1$
-			sharedElements.add(part);
-			if (viewStateMemento instanceof XMLMemento) {
-				part.getPersistedState().put("memento", toXML(viewStateMemento)); //$NON-NLS-1$
-			}
-
-			Map<String, String> properties = part.getProperties();
-			IMemento propertiesMemento = viewMemento.getChild(TAG_PROPERTIES);
-			if (propertiesMemento != null) {
-				for (IMemento propertyMemento : propertiesMemento.getChildren(TAG_PROPERTY)) {
-					properties.put(getID(propertiesMemento), propertyMemento.getTextData());
-				}
-			}
-		}
-	}
-
-	private String toXML(final IMemento memento) {
-		try {
-			StringWriter writer = new StringWriter();
-			((XMLMemento) memento).save(writer);
-			writer.flush();
-			return writer.toString();
-		} catch (Throwable ex) {
-			return null;
-		}
-	}
-
-	private void visitEditors(final MWindow window, final IMemento memento) {
-		IMemento areaMemento = memento.getChild(TAG_AREA);
-		if (areaMemento != null) {
-			MArea area = MAdvancedFactory.INSTANCE.createArea();
-			area.setElementId(EDITOR_AREA_ID);
-			window.getSharedElements().add(area);
-
-			// Iterate over info elements in the editor area and create a part stack for
-			// each one.
-			// Afterwards, map editors to the part stacks and create a part for each editor
-			Map<String, Info> partStackInfos = new LinkedHashMap<>();
-			IMemento[] infoMementos = areaMemento.getChildren(TAG_INFO);
-			for (int infoIndex = 0; infoIndex < infoMementos.length; infoIndex++) {
-				IMemento infoMemento = infoMementos[infoIndex];
-
-				Info info = new Info();
-				info.partID = getString(infoMemento, TAG_PART);
-				info.relativeID = getString(infoMemento, TAG_RELATIVE);
-				if (info.relativeID != null) {
-					info.relationship = getInteger(infoMemento, TAG_RELATIONSHIP);
-					info.ratio = getFloat(infoMemento, TAG_RATIO, 0.5f);
-					info.left = getInteger(infoMemento, TAG_RATIO_LEFT);
-					info.right = getInteger(infoMemento, TAG_RATIO_RIGHT);
-				}
-				// Use original part attribute as key (instead of part stack id) because this
-				// will be needed later to find relative positioned part stacks.
-				partStackInfos.put(info.partID, info);
-
-				// Create part stack. First one has the primary id. Further ids are extended
-				// with the index.
-				String partStackId = PRIMARY_EDITOR_PART_STACK_ID;
-				if (infoIndex > 0) {
-					partStackId += "." + infoIndex; //$NON-NLS-1$
-				}
-				MPartStack partStack = MBasicFactory.INSTANCE.createPartStack();
-				partStack.setElementId(partStackId);
-				area.getChildren().add(partStack);
-				info.part = partStack;
-				if (infoIndex == 0) {
-					// The primary editor part stack has the following tags.
-					partStack.getTags().add(PRIMARY_EDITOR_PART_STACK_ID);
-					partStack.getTags().add("EditorStack"); //$NON-NLS-1$
-				}
-
-				IMemento folderMemento = infoMemento.getChild(TAG_FOLDER);
-				if (folderMemento != null) {
-					int state = getInteger(folderMemento, TAG_EXPANDED);
-					if (state != 0) {
-						// Ignore.
-					}
-
-					for (IMemento presentationMemento : folderMemento.getChildren(TAG_PRESENTATION)) {
-						String id = getString(presentationMemento, TAG_ID);
-						if (id != null) {
-							// Ignore.
-						}
-					}
-				}
-				// End of info sub elements
-
-				// Add all matching editors as parts to the part stack
-				// An e3 editor belongs to a stack if the editor's workbook attribute equals the
-				// stack info's "part" attribute
-				List<IMemento> relevantEditorMementos = Stream.of(memento.getChildren(TAG_EDITOR))
-						.filter(e -> info.partID.equals(e.getString(TAG_WORKBOOK))).collect(Collectors.toList());
-				for (IMemento editorMemento : relevantEditorMementos) {
-					// Create part using the compatibility editor to render legacy editor
-					MPart editorPart = MBasicFactory.INSTANCE.createPart();
-					partStack.getChildren().add(editorPart);
-					editorPart.setElementId("org.eclipse.e4.ui.compatibility.editor"); //$NON-NLS-1$
-					editorPart.setContributionURI(
-							"bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor"); //$NON-NLS-1$
-					editorPart.setCloseable(true);
-					// Add editor memento to the parts persisted state. The compatibility editor
-					// uses this to create the correct editor.
-					editorPart.getPersistedState().put("memento", editorMemento.toString()); //$NON-NLS-1$
-					// Add tags marking as an editor, remove on hide, and the editor id
-					editorPart.getTags().add("Editor"); //$NON-NLS-1$
-					editorPart.getTags().add(EPartService.REMOVE_ON_HIDE_TAG);
-					editorPart.getTags().add(editorMemento.getString(TAG_ID));
-
-					// Set name and tooltip (both are allowed to be null)
-					String partName = getString(editorMemento, TAG_PART_NAME);
-					if (partName != null) {
-						editorPart.setLabel(partName);
-					} else {
-						editorPart.setLabel(getString(editorMemento, TAG_TITLE));
-					}
-					editorPart.setTooltip(getString(editorMemento, TAG_TOOLTIP));
-
-					if (getBoolean(editorMemento, TAG_ACTIVE_PART)) {
-						editorPart.getTags().add(IPresentationEngine.ACTIVE);
-					}
-
-					// Focused in e3 means the editor is the selected element in its parent stack
-					if (getBoolean(editorMemento, TAG_FOCUS)) {
-						partStack.setSelectedElement(editorPart);
-					}
-				}
-			}
-
-			// (Re-)insert part stacks into editor area to layout them properly
-			ModeledPageLayoutUtils modeledPageLayoutUtils = new org.eclipse.ui.internal.e4.compatibility.ModeledPageLayoutUtils(
-					WorkbenchUtil.getEModelService());
-			for (Info info : partStackInfos.values()) {
-				Info relativePart = partStackInfos.get(info.relativeID);
-				if (relativePart != null) {
-					modeledPageLayoutUtils.insert(info.part, relativePart.part,
-							modeledPageLayoutUtils.plRelToSwt(info.relationship), info.ratio);
-				}
-			}
-		}
-	}
-
-	@SuppressWarnings("unused")
-	private void visitPerspectiveBar(final IMemento memento) {
-		// Ignore.
-	}
-
-	private void visited(final IMemento memento, final String tag) {
-		Object key = key(memento);
-		Set<String> set = visited.get(key);
-		if (set == null) {
-			set = new LinkedHashSet<>();
-			visited.put(key, set);
-		}
-
-		if (tag != null) {
-			set.add(tag);
-		}
-	}
-
-	private static Object key(final IMemento memento) {
-		try {
-			Field field = memento.getClass().getDeclaredField("element"); //$NON-NLS-1$
-			field.setAccessible(true);
-			return field.get(memento);
-		} catch (Exception ex) {
-			return null;
-		}
-	}
-
-	private float getFloat(final IMemento memento, final String tag, final float defaultValue) {
-		visited(memento, tag);
-		Float value = memento.getFloat(tag);
-		return value == null ? defaultValue : value.floatValue();
-	}
-
-	private int getInteger(final IMemento memento, final String tag) {
-		return getInteger(memento, tag, 0);
-	}
-
-	private int getInteger(final IMemento memento, final String tag, final int defaultValue) {
-		visited(memento, tag);
-		Integer value = memento.getInteger(tag);
-		return value == null ? defaultValue : value.intValue();
-	}
-
-	private boolean getBoolean(final IMemento memento, final String tag) {
-		visited(memento, tag);
-		Boolean value = memento.getBoolean(tag);
-		return value != null && value.booleanValue();
-	}
-
-	private String getString(final IMemento memento, final String tag) {
-		return getString(memento, tag, null);
-	}
-
-	private String getString(final IMemento memento, final String tag, final String defaultValue) {
-		visited(memento, tag);
-		String value = memento.getString(tag);
-		return value == null ? defaultValue : value;
-	}
-
-	private String getID(final IMemento memento) {
-		return getString(memento, TAG_ID);
-	}
-
-	private static class Info {
-
-		public String partID;
-
-		public String relativeID;
-
-		public int relationship;
-
-		public int left;
-
-		public int right;
-
-		public float ratio = 0.5f;
-
-		public MPartSashContainerElement part;
-
-		@Override
-		public String toString() {
-			StringBuilder result = new StringBuilder();
-			result.append("Info [partID=").append(partID); //$NON-NLS-1$
-			if (relativeID != null) {
-				result.append(", relativeID=").append(relativeID); //$NON-NLS-1$
-				result.append(", relationship=").append(relationship); //$NON-NLS-1$
-				result.append(", left=").append(left); //$NON-NLS-1$
-				result.append(", right=").append(right); //$NON-NLS-1$
-				result.append(", ratio=").append(ratio); //$NON-NLS-1$
-			}
-			result.append(']');
-
-			return result.toString();
-		}
-	}
-}
+/*******************************************************************************
+ * Copyright (c) 2022 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.internal.compatibiliy.migration;
+
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_ACTIVE_PAGE_ID;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_ACTIVE_PART;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_ACTIVE_PERSPECTIVE;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_ALWAYS_ON_ACTION_SET;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_AREA;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_AREA_TRIM_STATE;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_AREA_VISIBLE;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_CONTENT;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_DESCRIPTOR;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_DETACHED_WINDOW;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_EDITOR;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_EDITORS;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_EXPANDED;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_FAST_VIEWS;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_FAST_VIEW_BAR;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_FAST_VIEW_BARS;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_FILE;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_FOCUS;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_FOLDER;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_HEIGHT;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_HIDDEN_WINDOW;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_HIDE_MENU;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_HIDE_TOOLBAR;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_ID;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_INFO;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_LABEL;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_LAYOUT;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_MAIN_WINDOW;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_MAXIMIZED;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_MINIMIZED;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_MRU_LIST;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_NEW_WIZARD_ACTION;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PAGE;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PART;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PART_NAME;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PERSPECTIVE;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PERSPECTIVES;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PERSPECTIVE_ACTION;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PERSPECTIVE_BAR;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PRESENTATION;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PROPERTIES;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_PROPERTY;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_RATIO;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_RATIO_LEFT;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_RATIO_RIGHT;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_RELATIONSHIP;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_RELATIVE;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_SHOW_IN_TIME;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_SHOW_VIEW_ACTION;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_TITLE;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_TOOLTIP;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_VIEW;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_VIEWS;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_VIEW_STATE;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_WIDTH;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_WINDOW;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_WORKBOOK;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_WORKING_SET;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_WORKING_SETS;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_X;
+import static org.eclipse.ui.internal.IWorkbenchConstants.TAG_Y;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.StringWriter;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.eclipse.e4.ui.model.application.MAddon;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory;
+import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
+import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainerElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
+import org.eclipse.e4.ui.model.application.ui.basic.MStackElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.e4.ui.workbench.IPresentationEngine;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+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.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.WorkbenchException;
+import org.eclipse.ui.XMLMemento;
+import org.eclipse.ui.internal.e4.compatibility.ModeledPageLayoutUtils;
+
+/**
+ * This utility class allows to migrate existing 3.x perspectives to 
+ * an e4 application models.
+ *  
+ *
+ * @since 1.0
+ *
+ */
+@SuppressWarnings("restriction")
+public final class E4MigrationTool {
+
+	/** Element id for the primary editor stack in an e4 application. */
+	private static final String PRIMARY_EDITOR_PART_STACK_ID = "org.eclipse.e4.primaryDataStack"; //$NON-NLS-1$
+
+	private static final String EDITOR_AREA_ID = "org.eclipse.ui.editorss"; //$NON-NLS-1$
+
+	private final Map<Object, Set<String>> visited = new LinkedHashMap<>();
+
+	private E4MigrationTool() {
+	}
+
+	/**
+	 * Allows to convert an 3.x perspective to a serialized e4 application.
+	 *
+	 * @param sourceMementoFile The file to the 3.x serialized perspective.
+	 * @param targetMApplicationFile The file to serialize the e4 application to.
+	 * @throws IOException           When reading/writing the files fails.
+	 * @throws FileNotFoundException When the files do not exist.
+	 * @throws WorkbenchException    When reading the 3.x perspective fails
+	 */
+	public static void convert(final File sourceMementoFile, final File targetMApplicationFile)
+			throws FileNotFoundException, IOException, WorkbenchException {
+		E4MigrationTool converter = new E4MigrationTool();
+		IMemento memento;
+		try (FileInputStream input = new FileInputStream(sourceMementoFile)) {
+			BufferedReader reader = new BufferedReader(new InputStreamReader(input, "utf-8")); //$NON-NLS-1$
+			memento = XMLMemento.createReadRoot(reader);
+		}
+
+		ResourceSet resourceSet = new ResourceSetImpl();
+
+		Resource resource = resourceSet.createResource(URI.createURI("sample.e4xmi")); //$NON-NLS-1$
+		resource.getContents().add((EObject) converter.internalConvert(memento));
+
+		try (FileOutputStream output = new FileOutputStream(targetMApplicationFile)) {
+			resource.save(output, null);
+		}
+
+	}
+
+	/**
+	 * Convert the IMemento of the workbench state of an 3.x application to a MApplication.
+	 *
+	 * @param memento The IMemento to convert
+	 * @return The resulting MApplication
+	 * @throws WorkbenchException Thrown when the xml cannot be parsed
+	 */
+	public static MApplication convert(final IMemento memento) {
+		E4MigrationTool converter = new E4MigrationTool();
+		return converter.internalConvert(memento);
+	}
+
+	private MApplication internalConvert(final IMemento memento) {
+		MApplication application = MApplicationFactory.INSTANCE.createApplication();
+
+		// Initialize the add ons.
+		{
+			List<MAddon> addons = application.getAddons();
+			String[][] addonValues = new String[][] { new String[] { "org.eclipse.e4.core.commands.service", //$NON-NLS-1$
+					"platform:/plugin/org.eclipse.platform", //$NON-NLS-1$
+					"bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon" }, //$NON-NLS-1$
+					new String[] { "org.eclipse.e4.ui.contexts.service", "platform:/plugin/org.eclipse.platform", //$NON-NLS-1$ //$NON-NLS-2$
+							"bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon" }, //$NON-NLS-1$
+					new String[] { "org.eclipse.e4.ui.bindings.service", "platform:/plugin/org.eclipse.platform", //$NON-NLS-1$ //$NON-NLS-2$
+							"bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon" }, //$NON-NLS-1$
+					new String[] { "org.eclipse.e4.ui.workbench.commands.model", //$NON-NLS-1$
+							"platform:/plugin/org.eclipse.platform", //$NON-NLS-1$
+							"bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon" }, //$NON-NLS-1$
+					new String[] { "org.eclipse.e4.ui.workbench.contexts.model", //$NON-NLS-1$
+							"platform:/plugin/org.eclipse.platform", //$NON-NLS-1$
+							"bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon" }, //$NON-NLS-1$
+					new String[] { "org.eclipse.e4.ui.workbench.bindings.model", //$NON-NLS-1$
+							"platform:/plugin/org.eclipse.platform", //$NON-NLS-1$
+							"bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon" }, //$NON-NLS-1$
+					new String[] { "Cleanup Addon", "platform:/plugin/org.eclipse.platform", //$NON-NLS-1$ //$NON-NLS-2$
+							"bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.cleanupaddon.CleanupAddon" }, //$NON-NLS-1$
+					new String[] { "DnD Addon", "platform:/plugin/org.eclipse.platform", //$NON-NLS-1$ //$NON-NLS-2$
+							"bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.dndaddon.DnDAddon" }, //$NON-NLS-1$
+					new String[] { "MinMax Addon", "platform:/plugin/org.eclipse.platform", //$NON-NLS-1$ //$NON-NLS-2$
+							"bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.MinMaxAddon" }, //$NON-NLS-1$
+					new String[] { "org.eclipse.ui.workbench.addon.0", "platform:/plugin/org.eclipse.platform", //$NON-NLS-1$ //$NON-NLS-2$
+							"bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon" }, //$NON-NLS-1$
+					new String[] { "SplitterAddon", null, //$NON-NLS-1$
+							"bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.splitteraddon.SplitterAddon" }, //$NON-NLS-1$
+					new String[] { "org.eclipse.ui.ide.addon.0", null, //$NON-NLS-1$
+							"bundleclass://org.eclipse.ui.ide/org.eclipse.ui.internal.ide.addons.SaveAllDirtyPartsAddon" }, //$NON-NLS-1$
+					new String[] { "org.eclipse.ui.ide.application.addon.0", //$NON-NLS-1$
+							"platform:/plugin/org.eclipse.ui.ide.application", //$NON-NLS-1$
+							"bundleclass://org.eclipse.ui.ide.application/org.eclipse.ui.internal.ide.application.addons.ModelCleanupAddon" }, }; //$NON-NLS-1$
+			for (String[] addonValue : addonValues) {
+				MAddon addon = MApplicationFactory.INSTANCE.createAddon();
+				addon.setElementId(addonValue[0]);
+				addon.setContributorURI(addonValue[1]);
+				addon.setContributionURI(addonValue[2]);
+				addons.add(addon);
+			}
+		}
+
+		IMemento mruMemento = memento.getChild(TAG_MRU_LIST);
+		if (mruMemento != null) {
+			for (IMemento fileMemento : mruMemento.getChildren(TAG_FILE)) {
+				// Ignored.
+				fileMemento.toString();
+			}
+		}
+
+		final IMemento[] windowMementos = memento.getChildren(TAG_WINDOW);
+		if (windowMementos == null || windowMementos.length == 0) {
+			// no <window> memento available - try memento instead
+			visitWindow(application, memento);
+		} else {
+			for (IMemento windowMemento : windowMementos) {
+				visitWindow(application, windowMemento);
+			}
+		}
+
+		return application;
+	}
+
+	private void visitWindow(final MApplication application, final IMemento memento) {
+		MTrimmedWindow window = MBasicFactory.INSTANCE.createTrimmedWindow();
+		window.setContributorURI("platform:/plugin/org.eclipse.platform"); //$NON-NLS-1$
+		application.getChildren().add(window);
+
+		Rectangle shellBounds = new Rectangle(getInteger(memento, TAG_X), getInteger(memento, TAG_Y),
+				getInteger(memento, TAG_WIDTH), getInteger(memento, TAG_HEIGHT));
+		if (!shellBounds.isEmpty()) {
+			window.setX(shellBounds.x);
+			window.setY(shellBounds.y);
+			window.setWidth(shellBounds.width);
+			window.setHeight(shellBounds.height);
+		}
+
+		if (getBoolean(memento, TAG_MAXIMIZED)) {
+			// Ignored.
+		}
+
+		if (getBoolean(memento, TAG_MINIMIZED)) {
+			// Ignored.
+		}
+
+		IMemento perspectiveBarMemento = memento.getChild(TAG_PERSPECTIVE_BAR);
+		visitPerspectiveBar(perspectiveBarMemento);
+
+		for (IMemento pageMemento : memento.getChildren(TAG_PAGE)) {
+			visitPage(window, pageMemento);
+		}
+
+	}
+
+	private void visitPage(final MWindow window, final IMemento memento) {
+		String focus = getString(memento, TAG_FOCUS);
+		if (focus != null && !focus.isEmpty()) {
+			String pageName = getString(memento, TAG_LABEL);
+			if (pageName != null) {
+				// Ignore.
+			}
+
+			String workingSetName = getString(memento, TAG_WORKING_SET);
+			if (workingSetName != null) {
+				// Ignore.
+			}
+
+			IMemento workingSetsMemento = memento.getChild(TAG_WORKING_SETS);
+			if (workingSetsMemento != null) {
+				for (IMemento workingSetMemento : workingSetsMemento.getChildren(TAG_WORKING_SET)) {
+					String id = getID(workingSetMemento);
+					if (id != null) {
+						// Ignore.
+					}
+				}
+			}
+
+			// org.eclipse.ui.internal.WorkbenchPage.ATT_AGGREGATE_WORKING_SET_ID
+			String aggregateWorkingSetId = getString(memento, "aggregateWorkingSetId"); //$NON-NLS-1$
+			if (aggregateWorkingSetId != null) {
+				// Ignore.
+			}
+
+			IMemento editorsMemento = memento.getChild(TAG_EDITORS);
+			if (editorsMemento != null) {
+				visitEditors(window, editorsMemento);
+			}
+
+			IMemento viewsMemento = memento.getChild(TAG_VIEWS);
+			if (viewsMemento != null) {
+				visitViews(window, viewsMemento);
+			}
+
+			IMemento perspectivesMemento = memento.getChild(TAG_PERSPECTIVES);
+			if (perspectivesMemento != null) {
+				visitPerspectives(window, perspectivesMemento);
+			}
+		}
+	}
+
+	private void visitPerspectives(final MWindow window, final IMemento memento) {
+		String activePartID = getString(memento, TAG_ACTIVE_PART);
+		String activePerspectiveID = getString(memento, TAG_ACTIVE_PERSPECTIVE);
+
+		if (activePartID != null) {
+			// Ignore.
+		}
+
+		MPartSashContainer partSashContainer = MBasicFactory.INSTANCE.createPartSashContainer();
+		partSashContainer.setHorizontal(true);
+		window.getChildren().add(partSashContainer);
+
+		MPerspectiveStack perspectiveStack = MAdvancedFactory.INSTANCE.createPerspectiveStack();
+		partSashContainer.getChildren().add(perspectiveStack);
+
+		List<MPerspective> perspectiveStackChildren = perspectiveStack.getChildren();
+		for (IMemento perspectiveMemento : memento.getChildren(TAG_PERSPECTIVE)) {
+			MPerspective perspective = MAdvancedFactory.INSTANCE.createPerspective();
+			perspectiveStackChildren.add(0, perspective);
+
+			int areaVisible = getInteger(perspectiveMemento, TAG_AREA_VISIBLE);
+
+			int trimAreaState = getInteger(perspectiveMemento, TAG_AREA_TRIM_STATE);
+			if (trimAreaState != 0) {
+				// Ignore.
+			}
+
+			Set<String> visibleViews = new LinkedHashSet<>();
+			for (IMemento viewMemento : perspectiveMemento.getChildren(TAG_VIEW)) {
+				String id = getID(viewMemento);
+				visibleViews.add(id);
+			}
+
+			Set<String> minimizedViews = getMinimizedViews(perspectiveMemento);
+
+			IMemento fastViewsMemento = perspectiveMemento.getChild(TAG_FAST_VIEWS);
+			if (fastViewsMemento != null) {
+				for (IMemento viewMemento : fastViewsMemento.getChildren(TAG_VIEW)) {
+					String id = getID(viewMemento);
+					if (id != null) {
+						// Ignore.
+					}
+				}
+			}
+
+			IMemento descriptorMemento = perspectiveMemento.getChild(TAG_DESCRIPTOR);
+			if (descriptorMemento != null) {
+				String id = getString(descriptorMemento, TAG_ID);
+				String label = getString(descriptorMemento, TAG_LABEL);
+
+				perspective.setElementId(id);
+				perspective.setLabel(label);
+
+				if (id.equals(activePerspectiveID)) {
+					perspectiveStack.setSelectedElement(perspective);
+				}
+			}
+
+			IMemento boundsMemento = perspectiveMemento.getChild(TAG_WINDOW);
+			if (boundsMemento != null) {
+				Rectangle bounds = new Rectangle(getInteger(boundsMemento, TAG_X), getInteger(boundsMemento, TAG_Y),
+						getInteger(boundsMemento, TAG_WIDTH), getInteger(boundsMemento, TAG_HEIGHT));
+				if (!bounds.isEmpty()) {
+					// Ignore.
+				}
+			}
+
+			IMemento layoutMemento = perspectiveMemento.getChild(TAG_LAYOUT);
+			if (layoutMemento != null) {
+				IMemento mainWindowMemento = layoutMemento.getChild(TAG_MAIN_WINDOW);
+				if (mainWindowMemento != null) {
+					MPartSashContainer perspectivePartSashContainer = MBasicFactory.INSTANCE.createPartSashContainer();
+					perspectivePartSashContainer.setHorizontal(true);
+					perspective.getChildren().add(perspectivePartSashContainer);
+
+					if (areaVisible != 0) {
+						// Ignore.
+					}
+
+					Map<String, Info> infos = new LinkedHashMap<>();
+					for (IMemento infoMemento : mainWindowMemento.getChildren(TAG_INFO)) {
+						Info info = new Info();
+						info.partID = getString(infoMemento, TAG_PART);
+						info.relativeID = getString(infoMemento, TAG_RELATIVE);
+						if (info.relativeID != null) {
+							info.relationship = getInteger(infoMemento, TAG_RELATIONSHIP);
+							info.ratio = getFloat(infoMemento, TAG_RATIO, 0.5f);
+							info.left = getInteger(infoMemento, TAG_RATIO_LEFT);
+							info.right = getInteger(infoMemento, TAG_RATIO_RIGHT);
+						}
+
+						String folder = getString(infoMemento, TAG_FOLDER);
+						if (folder != null) {
+							IMemento folderMemento = infoMemento.getChild(TAG_FOLDER);
+							if (folderMemento != null) {
+								MPartStack partStack = MBasicFactory.INSTANCE.createPartStack();
+								partStack.setElementId(info.partID);
+								perspectivePartSashContainer.getChildren().add(partStack);
+
+								info.part = partStack;
+
+								String activePageID = getString(folderMemento, TAG_ACTIVE_PAGE_ID);
+
+								List<MStackElement> partStackChildren = partStack.getChildren();
+								for (IMemento pageMemento : folderMemento.getChildren(TAG_PAGE)) {
+									String pagePartID = getString(pageMemento, TAG_CONTENT);
+									if (pagePartID != null) {
+										MPlaceholder placeHolder = MAdvancedFactory.INSTANCE.createPlaceholder();
+										partStackChildren.add(placeHolder);
+										placeHolder.setElementId(pagePartID);
+										// A placeholder is rendered if it's visible or minimized.
+										// In case of minimization it is minimized through its parent part stack
+										boolean visibleOrMinimized = visibleViews.contains(pagePartID)
+												|| minimizedViews.contains(pagePartID);
+										placeHolder.setToBeRendered(visibleOrMinimized);
+
+										for (MUIElement element : window.getSharedElements()) {
+											if (pagePartID.equals(element.getElementId())) {
+												placeHolder.setRef(element);
+												break;
+											}
+										}
+
+										if (placeHolder.getRef() == null) {
+											MPart part = MBasicFactory.INSTANCE.createPart();
+											part.setElementId(pagePartID);
+											part.setLabel("fake" + pagePartID); //$NON-NLS-1$
+											part.setContributionURI(
+													"bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView"); //$NON-NLS-1$
+											window.getSharedElements().add(part);
+											placeHolder.setRef(part);
+										}
+
+										if (pagePartID.equals(activePageID)) {
+											partStack.setSelectedElement(placeHolder);
+											if (placeHolder.getRef() == null) {
+												System.err.print(""); //$NON-NLS-1$
+
+											}
+										}
+									}
+								}
+
+								int state = getInteger(folderMemento, TAG_EXPANDED);
+								if (state != 0) {
+									// Ignore.
+								}
+
+								for (IMemento presentationMemento : folderMemento.getChildren(TAG_PRESENTATION)) {
+									String id = getString(presentationMemento, TAG_ID);
+									if (id != null) {
+										// Ignore.
+									}
+								}
+
+								Map<String, String> properties = new LinkedHashMap<>();
+								IMemento propertiesMemento = folderMemento.getChild(TAG_PROPERTIES);
+								if (propertiesMemento != null) {
+									for (IMemento propertyMemento : propertiesMemento.getChildren(TAG_PROPERTY)) {
+										properties.put(getID(propertiesMemento), propertyMemento.getTextData());
+									}
+								}
+							}
+						} else if (EDITOR_AREA_ID.equals(info.partID)) {
+							// Assume that the editor area is at the root level of the main window
+							MPlaceholder areaPlaceholder = MAdvancedFactory.INSTANCE.createPlaceholder();
+							perspectivePartSashContainer.getChildren().add(areaPlaceholder);
+							areaPlaceholder.setElementId(EDITOR_AREA_ID);
+							info.part = areaPlaceholder;
+
+							// Find editor area and reference it in the placeholder
+							window.getSharedElements().stream().filter(e -> EDITOR_AREA_ID.equals(e.getElementId()))
+									.findFirst().ifPresent(e -> areaPlaceholder.setRef(e));
+						} else {
+							continue;
+						}
+
+						infos.put(info.partID, info);
+					}
+
+					ModeledPageLayoutUtils modeledPageLayoutUtils = new org.eclipse.ui.internal.e4.compatibility.ModeledPageLayoutUtils(
+							WorkbenchUtil.getEModelService());
+					System.out.println("Perspective: " + perspective.getLabel()); //$NON-NLS-1$
+					for (Info info : infos.values()) {
+						System.out.println("  " + info); //$NON-NLS-1$
+
+						Info relativePart = infos.get(info.relativeID);
+						if (relativePart != null) {
+							modeledPageLayoutUtils.insert(info.part, relativePart.part,
+									modeledPageLayoutUtils.plRelToSwt(info.relationship), info.ratio);
+						}
+					}
+
+					for (Iterator<EObject> i = ((EObject) perspectivePartSashContainer).eAllContents(); i.hasNext();) {
+						EObject eObject = i.next();
+						if (eObject instanceof MPartStack) {
+							MPartStack partStack = (MPartStack) eObject;
+							boolean toBeRendered = false;
+							boolean minimized = false;
+							// If non of the stack's children are rendered, do not render the stack either
+							for (MStackElement stackElement : partStack.getChildren()) {
+								if (stackElement.isToBeRendered()) {
+									toBeRendered = true;
+								}
+								if (minimizedViews.contains(stackElement.getElementId())) {
+									minimized = true;
+									toBeRendered = true;
+									break;
+								}
+							}
+
+							// If the stack's children are minimized, minimize the part stack
+							if (minimized) {
+								// If the part stack is minimized, select the first child that is rendered.
+								// Otherwise no child is selected on restore.
+								for (MStackElement stackElement : partStack.getChildren()) {
+									if (stackElement.isToBeRendered()) {
+										partStack.setSelectedElement(stackElement);
+										break;
+									}
+								}
+								partStack.setToBeRendered(true);
+								partStack.setVisible(false);
+								partStack.getTags().add(IPresentationEngine.MINIMIZED);
+							} else {
+								partStack.setToBeRendered(toBeRendered);
+								partStack.setVisible(toBeRendered);
+							}
+						}
+					}
+
+					for (Iterator<EObject> i = ((EObject) perspectivePartSashContainer).eAllContents(); i.hasNext();) {
+						EObject eObject = i.next();
+						if (eObject instanceof MPartSashContainer) {
+							MPartSashContainer otherPartSashContainer = (MPartSashContainer) eObject;
+							boolean toBeRendered = false;
+							boolean visible = false;
+							for (MPartSashContainerElement sashContainerElement : otherPartSashContainer
+									.getChildren()) {
+								if (sashContainerElement.isVisible()) {
+									visible = true;
+								}
+								if (sashContainerElement.isToBeRendered()) {
+									toBeRendered = true;
+								}
+								if (visible && toBeRendered) {
+									break;
+								}
+							}
+
+							otherPartSashContainer.setToBeRendered(toBeRendered);
+							// A part sash container can only be visible if it is rendered.
+							// A container can be rendered but not visible if all child part stacks are
+							// minimized.
+							otherPartSashContainer.setVisible(visible && toBeRendered);
+						}
+					}
+
+					for (IMemento detachedWindowMemento : mainWindowMemento.getChildren(TAG_DETACHED_WINDOW)) {
+						if (detachedWindowMemento != null) {
+							// Ignore.
+						}
+					}
+
+					for (IMemento hiddenWindowMemento : mainWindowMemento.getChildren(TAG_HIDDEN_WINDOW)) {
+						if (hiddenWindowMemento != null) {
+							// Ignore.
+						}
+					}
+
+					String maximizedStackID = getString(mainWindowMemento, TAG_MAXIMIZED);
+					if (maximizedStackID != null) {
+						// Ignore.
+					}
+				}
+			}
+
+			for (IMemento viewMemento : perspectiveMemento.getChildren(TAG_VIEW)) {
+				String id = getString(viewMemento, TAG_ID);
+				if (id != null) {
+					// Ignore.
+				}
+			}
+
+			for (IMemento alwaysOnActionMemento : perspectiveMemento.getChildren(TAG_ALWAYS_ON_ACTION_SET)) {
+				String id = getString(alwaysOnActionMemento, TAG_ID);
+				if (id != null) {
+					// Ignore.
+				}
+			}
+
+			for (IMemento toggleViewActionMemento : perspectiveMemento.getChildren(TAG_SHOW_VIEW_ACTION)) {
+				String id = getString(toggleViewActionMemento, TAG_ID);
+				if (id != null) {
+					// Ignore.
+				}
+			}
+
+			for (IMemento showInTimeMemento : perspectiveMemento.getChildren(TAG_SHOW_IN_TIME)) {
+				String id = getString(showInTimeMemento, TAG_ID);
+				if (id != null) {
+					// Ignore.
+				}
+			}
+
+			for (IMemento newWizardActionMemento : perspectiveMemento.getChildren(TAG_NEW_WIZARD_ACTION)) {
+				String id = getString(newWizardActionMemento, TAG_ID);
+				if (id != null) {
+					// Ignore.
+				}
+			}
+
+			for (IMemento perspectiveActionMemento : perspectiveMemento.getChildren(TAG_PERSPECTIVE_ACTION)) {
+				String id = getString(perspectiveActionMemento, TAG_ID);
+				if (id != null) {
+					// Ignore.
+				}
+			}
+
+			for (IMemento hideMenuMemento : perspectiveMemento.getChildren(TAG_HIDE_MENU)) {
+				String id = getString(hideMenuMemento, TAG_ID);
+				if (id != null) {
+					// Ignore.
+				}
+			}
+
+			for (IMemento hideToolbarMemento : perspectiveMemento.getChildren(TAG_HIDE_TOOLBAR)) {
+				String id = getString(hideToolbarMemento, TAG_ID);
+				if (id != null) {
+					// Ignore.
+				}
+			}
+		}
+	}
+
+	/** Get minimized view ids from a perspective's fast view bars. */
+	private Set<String> getMinimizedViews(IMemento perspectiveMemento) {
+		IMemento fastViewBarsMemento = perspectiveMemento.getChild(TAG_FAST_VIEW_BARS);
+		if (fastViewBarsMemento != null) {
+			// 1. Get all fast views in fast view bars
+			// 2. get all views in fast views
+			// 3. collect view ids
+			Set<String> result = Arrays.stream(fastViewBarsMemento.getChildren(TAG_FAST_VIEW_BAR))
+					.map(fVB -> fVB.getChild(TAG_FAST_VIEWS)).filter(Objects::nonNull)
+					.flatMap(fV -> Arrays.stream(fV.getChildren(TAG_VIEW))).map(v -> v.getString(TAG_ID))
+					.filter(Objects::nonNull).collect(Collectors.toSet());
+			return result;
+		}
+		return new HashSet<String>();
+	}
+
+	private void visitViews(final MWindow window, final IMemento memento) {
+		List<MUIElement> sharedElements = window.getSharedElements();
+		for (IMemento viewMemento : memento.getChildren(TAG_VIEW)) {
+			String id = getString(viewMemento, TAG_ID);
+			IMemento viewStateMemento = viewMemento.getChild(TAG_VIEW_STATE);
+
+			// org.eclipse.ui.internal.ViewReference.ViewReference(ViewFactory,
+			// String, String, IMemento)
+			String name = getString(viewMemento, TAG_PART_NAME);
+
+			MPart part = MBasicFactory.INSTANCE.createPart();
+			part.setElementId(id);
+			part.setLabel(name);
+			part.setContributionURI(
+					"bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView"); //$NON-NLS-1$
+			sharedElements.add(part);
+			if (viewStateMemento instanceof XMLMemento) {
+				part.getPersistedState().put("memento", toXML(viewStateMemento)); //$NON-NLS-1$
+			}
+
+			Map<String, String> properties = part.getProperties();
+			IMemento propertiesMemento = viewMemento.getChild(TAG_PROPERTIES);
+			if (propertiesMemento != null) {
+				for (IMemento propertyMemento : propertiesMemento.getChildren(TAG_PROPERTY)) {
+					properties.put(getID(propertiesMemento), propertyMemento.getTextData());
+				}
+			}
+		}
+	}
+
+	private String toXML(final IMemento memento) {
+		try {
+			StringWriter writer = new StringWriter();
+			((XMLMemento) memento).save(writer);
+			writer.flush();
+			return writer.toString();
+		} catch (Throwable ex) {
+			return null;
+		}
+	}
+
+	private void visitEditors(final MWindow window, final IMemento memento) {
+		IMemento areaMemento = memento.getChild(TAG_AREA);
+		if (areaMemento != null) {
+			MArea area = MAdvancedFactory.INSTANCE.createArea();
+			area.setElementId(EDITOR_AREA_ID);
+			window.getSharedElements().add(area);
+
+			// Iterate over info elements in the editor area and create a part stack for
+			// each one.
+			// Afterwards, map editors to the part stacks and create a part for each editor
+			Map<String, Info> partStackInfos = new LinkedHashMap<>();
+			IMemento[] infoMementos = areaMemento.getChildren(TAG_INFO);
+			for (int infoIndex = 0; infoIndex < infoMementos.length; infoIndex++) {
+				IMemento infoMemento = infoMementos[infoIndex];
+
+				Info info = new Info();
+				info.partID = getString(infoMemento, TAG_PART);
+				info.relativeID = getString(infoMemento, TAG_RELATIVE);
+				if (info.relativeID != null) {
+					info.relationship = getInteger(infoMemento, TAG_RELATIONSHIP);
+					info.ratio = getFloat(infoMemento, TAG_RATIO, 0.5f);
+					info.left = getInteger(infoMemento, TAG_RATIO_LEFT);
+					info.right = getInteger(infoMemento, TAG_RATIO_RIGHT);
+				}
+				// Use original part attribute as key (instead of part stack id) because this
+				// will be needed later to find relative positioned part stacks.
+				partStackInfos.put(info.partID, info);
+
+				// Create part stack. First one has the primary id. Further ids are extended
+				// with the index.
+				String partStackId = PRIMARY_EDITOR_PART_STACK_ID;
+				if (infoIndex > 0) {
+					partStackId += "." + infoIndex; //$NON-NLS-1$
+				}
+				MPartStack partStack = MBasicFactory.INSTANCE.createPartStack();
+				partStack.setElementId(partStackId);
+				area.getChildren().add(partStack);
+				info.part = partStack;
+				if (infoIndex == 0) {
+					// The primary editor part stack has the following tags.
+					partStack.getTags().add(PRIMARY_EDITOR_PART_STACK_ID);
+					partStack.getTags().add("EditorStack"); //$NON-NLS-1$
+				}
+
+				IMemento folderMemento = infoMemento.getChild(TAG_FOLDER);
+				if (folderMemento != null) {
+					int state = getInteger(folderMemento, TAG_EXPANDED);
+					if (state != 0) {
+						// Ignore.
+					}
+
+					for (IMemento presentationMemento : folderMemento.getChildren(TAG_PRESENTATION)) {
+						String id = getString(presentationMemento, TAG_ID);
+						if (id != null) {
+							// Ignore.
+						}
+					}
+				}
+				// End of info sub elements
+
+				// Add all matching editors as parts to the part stack
+				// An e3 editor belongs to a stack if the editor's workbook attribute equals the
+				// stack info's "part" attribute
+				List<IMemento> relevantEditorMementos = Stream.of(memento.getChildren(TAG_EDITOR))
+						.filter(e -> info.partID.equals(e.getString(TAG_WORKBOOK))).collect(Collectors.toList());
+				for (IMemento editorMemento : relevantEditorMementos) {
+					// Create part using the compatibility editor to render legacy editor
+					MPart editorPart = MBasicFactory.INSTANCE.createPart();
+					partStack.getChildren().add(editorPart);
+					editorPart.setElementId("org.eclipse.e4.ui.compatibility.editor"); //$NON-NLS-1$
+					editorPart.setContributionURI(
+							"bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor"); //$NON-NLS-1$
+					editorPart.setCloseable(true);
+					// Add editor memento to the parts persisted state. The compatibility editor
+					// uses this to create the correct editor.
+					editorPart.getPersistedState().put("memento", editorMemento.toString()); //$NON-NLS-1$
+					// Add tags marking as an editor, remove on hide, and the editor id
+					editorPart.getTags().add("Editor"); //$NON-NLS-1$
+					editorPart.getTags().add(EPartService.REMOVE_ON_HIDE_TAG);
+					editorPart.getTags().add(editorMemento.getString(TAG_ID));
+
+					// Set name and tooltip (both are allowed to be null)
+					String partName = getString(editorMemento, TAG_PART_NAME);
+					if (partName != null) {
+						editorPart.setLabel(partName);
+					} else {
+						editorPart.setLabel(getString(editorMemento, TAG_TITLE));
+					}
+					editorPart.setTooltip(getString(editorMemento, TAG_TOOLTIP));
+
+					if (getBoolean(editorMemento, TAG_ACTIVE_PART)) {
+						editorPart.getTags().add(IPresentationEngine.ACTIVE);
+					}
+
+					// Focused in e3 means the editor is the selected element in its parent stack
+					if (getBoolean(editorMemento, TAG_FOCUS)) {
+						partStack.setSelectedElement(editorPart);
+					}
+				}
+			}
+
+			// (Re-)insert part stacks into editor area to layout them properly
+			ModeledPageLayoutUtils modeledPageLayoutUtils = new org.eclipse.ui.internal.e4.compatibility.ModeledPageLayoutUtils(
+					WorkbenchUtil.getEModelService());
+			for (Info info : partStackInfos.values()) {
+				Info relativePart = partStackInfos.get(info.relativeID);
+				if (relativePart != null) {
+					modeledPageLayoutUtils.insert(info.part, relativePart.part,
+							modeledPageLayoutUtils.plRelToSwt(info.relationship), info.ratio);
+				}
+			}
+		}
+	}
+
+	@SuppressWarnings("unused")
+	private void visitPerspectiveBar(final IMemento memento) {
+		// Ignore.
+	}
+
+	private void visited(final IMemento memento, final String tag) {
+		Object key = key(memento);
+		Set<String> set = visited.get(key);
+		if (set == null) {
+			set = new LinkedHashSet<>();
+			visited.put(key, set);
+		}
+
+		if (tag != null) {
+			set.add(tag);
+		}
+	}
+
+	private static Object key(final IMemento memento) {
+		try {
+			Field field = memento.getClass().getDeclaredField("element"); //$NON-NLS-1$
+			field.setAccessible(true);
+			return field.get(memento);
+		} catch (Exception ex) {
+			return null;
+		}
+	}
+
+	private float getFloat(final IMemento memento, final String tag, final float defaultValue) {
+		visited(memento, tag);
+		Float value = memento.getFloat(tag);
+		return value == null ? defaultValue : value.floatValue();
+	}
+
+	private int getInteger(final IMemento memento, final String tag) {
+		return getInteger(memento, tag, 0);
+	}
+
+	private int getInteger(final IMemento memento, final String tag, final int defaultValue) {
+		visited(memento, tag);
+		Integer value = memento.getInteger(tag);
+		return value == null ? defaultValue : value.intValue();
+	}
+
+	private boolean getBoolean(final IMemento memento, final String tag) {
+		visited(memento, tag);
+		Boolean value = memento.getBoolean(tag);
+		return value != null && value.booleanValue();
+	}
+
+	private String getString(final IMemento memento, final String tag) {
+		return getString(memento, tag, null);
+	}
+
+	private String getString(final IMemento memento, final String tag, final String defaultValue) {
+		visited(memento, tag);
+		String value = memento.getString(tag);
+		return value == null ? defaultValue : value;
+	}
+
+	private String getID(final IMemento memento) {
+		return getString(memento, TAG_ID);
+	}
+
+	private static class Info {
+
+		public String partID;
+
+		public String relativeID;
+
+		public int relationship;
+
+		public int left;
+
+		public int right;
+
+		public float ratio = 0.5f;
+
+		public MPartSashContainerElement part;
+
+		@Override
+		public String toString() {
+			StringBuilder result = new StringBuilder();
+			result.append("Info [partID=").append(partID); //$NON-NLS-1$
+			if (relativeID != null) {
+				result.append(", relativeID=").append(relativeID); //$NON-NLS-1$
+				result.append(", relationship=").append(relationship); //$NON-NLS-1$
+				result.append(", left=").append(left); //$NON-NLS-1$
+				result.append(", right=").append(right); //$NON-NLS-1$
+				result.append(", ratio=").append(ratio); //$NON-NLS-1$
+			}
+			result.append(']');
+
+			return result.toString();
+		}
+	}
+}
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi b/tools/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
index 618c7bdfc1..cee8b4d4d7 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="ASCII"?>
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_GxnD8Ly2EeOxWJvPH-7sUQ">
-  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_Kmj8QLy2EeOxWJvPH-7sUQ" featurename="commands" parentElementId="xpath:/">
-    <elements xsi:type="commands:Command" xmi:id="_RRp7QLy2EeOxWJvPH-7sUQ" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_ids" commandName="%mark_duplicate_ids_commandName" description="%mark_duplicate_ids_description">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Command" xmi:id="_9ITpgL2IEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_labels" commandName="%mark_duplicate_labels_commandName" description="%mark_duplicate_labels_description">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Command" xmi:id="_RObi4L2MEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_attributes" commandName="%mark_duplicate_attributes_commandName" description="%mark_duplicate_attributes_description">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Command" xmi:id="_dySeYLzDEeO8eO1Rpb-rFA" elementId="org.eclipse.e4.tools.emf.ui.command.repair_duplicate_ids" commandName="%repair_duplicate_ids_commandName" description="%repair_duplicate_ids_description">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Command" xmi:id="_CFlw8L2LEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.unmark" commandName="%unmark_commandName" description="%unmark_description">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Command" xmi:id="_jd7xgO5mEeOQXaYP-M2JBA" elementId="org.eclipse.e4.tools.emf.ui.command.autosizeColumns" commandName="%autosizeColumns_commandName" description="%autosizeColumns_description">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Command" xmi:id="_vsQXAPFwEeOSJuCPb-hb7A" elementId="org.eclipse.e4.tools.emf.ui.command.resetToDefault" commandName="%resetToDefault_commandName" description="%resetToDefault_description">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-  </fragments>
-  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_jtmcsLy3EeOxWJvPH-7sUQ" featurename="handlers" parentElementId="xpath:/">
-    <elements xsi:type="commands:Handler" xmi:id="_p45hULy3EeOxWJvPH-7sUQ" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateElementIdsHandler" command="_RRp7QLy2EeOxWJvPH-7sUQ">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Handler" xmi:id="_AOEgkL2JEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_labels" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateLabelsHandler" command="_9ITpgL2IEeOqSr2XZwfnmA">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Handler" xmi:id="_TgJt4L2MEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_attributes" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateAttributesHandler" command="_RObi4L2MEeOqSr2XZwfnmA">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Handler" xmi:id="_smaaALzDEeO8eO1Rpb-rFA" elementId="org.eclipse.e4.tools.emf.ui.handler.repair_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.RepairDuplicateItemsHandler" command="_dySeYLzDEeO8eO1Rpb-rFA">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Handler" xmi:id="_Fin4gL2LEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.unmark" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.UnmarkItemsHandler" command="_CFlw8L2LEeOqSr2XZwfnmA">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Handler" xmi:id="_hZcKMO5mEeOQXaYP-M2JBA" elementId="org.eclipse.e4.tools.emf.ui.handler.autosizeColumns" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.AutosizeColumnsHandler" command="_jd7xgO5mEeOQXaYP-M2JBA">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-    <elements xsi:type="commands:Handler" xmi:id="_8AHVUPFwEeOSJuCPb-hb7A" elementId="org.eclipse.e4.tools.emf.ui.handler.resetToDefault" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.ResetToDefaultHandler" command="_vsQXAPFwEeOSJuCPb-hb7A">
-      <persistedState key="persistState" value="false"/>
-    </elements>
-  </fragments>
-</fragment:ModelFragments>
+<?xml version="1.0" encoding="ASCII"?>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_GxnD8Ly2EeOxWJvPH-7sUQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_Kmj8QLy2EeOxWJvPH-7sUQ" featurename="commands" parentElementId="xpath:/">
+    <elements xsi:type="commands:Command" xmi:id="_RRp7QLy2EeOxWJvPH-7sUQ" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_ids" commandName="%mark_duplicate_ids_commandName" description="%mark_duplicate_ids_description">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_9ITpgL2IEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_labels" commandName="%mark_duplicate_labels_commandName" description="%mark_duplicate_labels_description">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_RObi4L2MEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.mark_duplicate_attributes" commandName="%mark_duplicate_attributes_commandName" description="%mark_duplicate_attributes_description">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_dySeYLzDEeO8eO1Rpb-rFA" elementId="org.eclipse.e4.tools.emf.ui.command.repair_duplicate_ids" commandName="%repair_duplicate_ids_commandName" description="%repair_duplicate_ids_description">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_CFlw8L2LEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.command.unmark" commandName="%unmark_commandName" description="%unmark_description">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_jd7xgO5mEeOQXaYP-M2JBA" elementId="org.eclipse.e4.tools.emf.ui.command.autosizeColumns" commandName="%autosizeColumns_commandName" description="%autosizeColumns_description">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_vsQXAPFwEeOSJuCPb-hb7A" elementId="org.eclipse.e4.tools.emf.ui.command.resetToDefault" commandName="%resetToDefault_commandName" description="%resetToDefault_description">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_jtmcsLy3EeOxWJvPH-7sUQ" featurename="handlers" parentElementId="xpath:/">
+    <elements xsi:type="commands:Handler" xmi:id="_p45hULy3EeOxWJvPH-7sUQ" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateElementIdsHandler" command="_RRp7QLy2EeOxWJvPH-7sUQ">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Handler" xmi:id="_AOEgkL2JEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_labels" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateLabelsHandler" command="_9ITpgL2IEeOqSr2XZwfnmA">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Handler" xmi:id="_TgJt4L2MEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.mark_duplicate_attributes" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.MarkDuplicateAttributesHandler" command="_RObi4L2MEeOqSr2XZwfnmA">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Handler" xmi:id="_smaaALzDEeO8eO1Rpb-rFA" elementId="org.eclipse.e4.tools.emf.ui.handler.repair_duplicate_ids" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.RepairDuplicateItemsHandler" command="_dySeYLzDEeO8eO1Rpb-rFA">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Handler" xmi:id="_Fin4gL2LEeOqSr2XZwfnmA" elementId="org.eclipse.e4.tools.emf.ui.handler.unmark" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.UnmarkItemsHandler" command="_CFlw8L2LEeOqSr2XZwfnmA">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Handler" xmi:id="_hZcKMO5mEeOQXaYP-M2JBA" elementId="org.eclipse.e4.tools.emf.ui.handler.autosizeColumns" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.AutosizeColumnsHandler" command="_jd7xgO5mEeOQXaYP-M2JBA">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+    <elements xsi:type="commands:Handler" xmi:id="_8AHVUPFwEeOSJuCPb-hb7A" elementId="org.eclipse.e4.tools.emf.ui.handler.resetToDefault" contributionURI="bundleclass://org.eclipse.e4.tools.emf.ui/org.eclipse.e4.tools.emf.ui.internal.handlers.ResetToDefaultHandler" command="_vsQXAPFwEeOSJuCPb-hb7A">
+      <persistedState key="persistState" value="false"/>
+    </elements>
+  </fragments>
+</fragment:ModelFragments>
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/build.properties b/tools/bundles/org.eclipse.e4.tools.persistence/build.properties
index 16b2674dc2..d042692eb4 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/build.properties
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/build.properties
@@ -1,22 +1,22 @@
-###############################################################################
-# Copyright (c) 2021 EclipseSource GmbH and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     EclipseSource GmbH - initial API and implementation
-###############################################################################
-bin.includes = .,\
-               model/,\
-               META-INF/,\
-               plugin.xml,\
-               OSGI-INF/
-jars.compile.order = .
-source.. = src/
-output.. = bin/
+###############################################################################
+# Copyright (c) 2021 EclipseSource GmbH and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     EclipseSource GmbH - initial API and implementation
+###############################################################################
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               OSGI-INF/
+jars.compile.order = .
+source.. = src/
+output.. = bin/
 pom.model.property.skipAPIAnalysis = true
\ No newline at end of file
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.ecore b/tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.ecore
index 6b9fa4114d..458b4d2daf 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.ecore
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.ecore
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="persistence" nsURI="http://www.eclipse.org/e4/tools/persistence"
-    nsPrefix="org.eclipse.e4.tools.persistence">
-  <eClassifiers xsi:type="ecore:EClass" name="WorkbenchState">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="perspective" eType="ecore:EClass ../../org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//ui/advanced/Perspective"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="viewSettings" upperBound="-1"
-        eType="#//PartMemento" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="editorArea" eType="ecore:EClass ../../org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//ui/advanced/Area"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="trimBars" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//ui/basic/TrimBar"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PartMemento">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="partId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="memento" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="persistence" nsURI="http://www.eclipse.org/e4/tools/persistence"
+    nsPrefix="org.eclipse.e4.tools.persistence">
+  <eClassifiers xsi:type="ecore:EClass" name="WorkbenchState">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="perspective" eType="ecore:EClass ../../org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//ui/advanced/Perspective"
+        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="viewSettings" upperBound="-1"
+        eType="#//PartMemento" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="editorArea" eType="ecore:EClass ../../org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//ui/advanced/Area"
+        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="trimBars" upperBound="-1"
+        eType="ecore:EClass ../../org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//ui/basic/TrimBar"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="PartMemento">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="partId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="memento" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel b/tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel
index 57e176cd26..fb38a9cd5d 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2022 EclipseSource GmbH and others.&#xA; &#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License 2.0&#xA;which accompanies this distribution, and is available at&#xA;https://www.eclipse.org/legal/epl-2.0/&#xA; &#xA;SPDX-License-Identifier: EPL-2.0&#xA;&#xA;Contributors:   &#xA;    EclipseSource GmbH - initial API and implementation"
-    modelDirectory="/org.eclipse.e4.tools.persistence/src" editDirectory="" editorDirectory=""
-    modelPluginID="org.eclipse.e4.tools.persistence" modelName="Persistence" editPluginClass="org.eclipse.e4.tools.persistence.provider.PersistenceEditPlugin"
-    editorPluginClass="org.eclipse.e4.tools.persistence.presentation.PersistenceEditorPlugin"
-    updateClasspath="false" nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    codeFormatting="true" testsDirectory="" testSuiteClass="org.eclipse.e4.tools.internal.persistence.tests.PersistenceAllTests"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" copyrightFields="false"
-    editPluginID="org.eclipse.e4.tools.persistence.edit" editorPluginID="org.eclipse.e4.tools.persistence.edit"
-    usedGenPackages="../../org.eclipse.e4.ui.model.workbench/model/UIElements.genmodel#//application"
-    interfaceNamePattern="I{0}" classNamePattern="{0}" operationReflection="true"
-    importOrganizing="true" cleanup="true">
-  <foreignModel>persistence.ecore</foreignModel>
-  <genPackages prefix="Persistence" basePackage="org.eclipse.e4.tools.internal" disposableProviderFactory="true"
-      ecorePackage="persistence.ecore#/">
-    <genClasses documentation="A container for the relevant parts of a workbench state."
-        ecoreClass="persistence.ecore#//WorkbenchState">
-      <genFeatures documentation="The active perspective of the workbench." property="None"
-          children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//WorkbenchState/perspective"/>
-      <genFeatures documentation="Store view settings with part id and its stringified memento."
-          property="None" children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//WorkbenchState/viewSettings"/>
-      <genFeatures documentation="The editor area of the workbench." property="None"
-          children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//WorkbenchState/editorArea"/>
-      <genFeatures documentation="All trimbars of the workbench." property="None"
-          children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//WorkbenchState/trimBars"/>
-    </genClasses>
-    <genClasses documentation="Container to easily store and restore part settings. To do so the id of the part as well as the stringified memento is stored."
-        ecoreClass="persistence.ecore#//PartMemento">
-      <genFeatures documentation="The id of the part the memento is stored for." createChild="false"
-          ecoreFeature="ecore:EAttribute persistence.ecore#//PartMemento/partId"/>
-      <genFeatures documentation="The stringified memento. This way it can be directly set into the persisted state and thus used by the workbench to pass into the ViewPart#init method."
-          createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//PartMemento/memento"/>
-    </genClasses>
-  </genPackages>
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2022 EclipseSource GmbH and others.&#xA; &#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License 2.0&#xA;which accompanies this distribution, and is available at&#xA;https://www.eclipse.org/legal/epl-2.0/&#xA; &#xA;SPDX-License-Identifier: EPL-2.0&#xA;&#xA;Contributors:   &#xA;    EclipseSource GmbH - initial API and implementation"
+    modelDirectory="/org.eclipse.e4.tools.persistence/src" editDirectory="" editorDirectory=""
+    modelPluginID="org.eclipse.e4.tools.persistence" modelName="Persistence" editPluginClass="org.eclipse.e4.tools.persistence.provider.PersistenceEditPlugin"
+    editorPluginClass="org.eclipse.e4.tools.persistence.presentation.PersistenceEditorPlugin"
+    updateClasspath="false" nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    codeFormatting="true" testsDirectory="" testSuiteClass="org.eclipse.e4.tools.internal.persistence.tests.PersistenceAllTests"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" copyrightFields="false"
+    editPluginID="org.eclipse.e4.tools.persistence.edit" editorPluginID="org.eclipse.e4.tools.persistence.edit"
+    usedGenPackages="../../org.eclipse.e4.ui.model.workbench/model/UIElements.genmodel#//application"
+    interfaceNamePattern="I{0}" classNamePattern="{0}" operationReflection="true"
+    importOrganizing="true" cleanup="true">
+  <foreignModel>persistence.ecore</foreignModel>
+  <genPackages prefix="Persistence" basePackage="org.eclipse.e4.tools.internal" disposableProviderFactory="true"
+      ecorePackage="persistence.ecore#/">
+    <genClasses documentation="A container for the relevant parts of a workbench state."
+        ecoreClass="persistence.ecore#//WorkbenchState">
+      <genFeatures documentation="The active perspective of the workbench." property="None"
+          children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//WorkbenchState/perspective"/>
+      <genFeatures documentation="Store view settings with part id and its stringified memento."
+          property="None" children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//WorkbenchState/viewSettings"/>
+      <genFeatures documentation="The editor area of the workbench." property="None"
+          children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//WorkbenchState/editorArea"/>
+      <genFeatures documentation="All trimbars of the workbench." property="None"
+          children="true" createChild="true" ecoreFeature="ecore:EReference persistence.ecore#//WorkbenchState/trimBars"/>
+    </genClasses>
+    <genClasses documentation="Container to easily store and restore part settings. To do so the id of the part as well as the stringified memento is stored."
+        ecoreClass="persistence.ecore#//PartMemento">
+      <genFeatures documentation="The id of the part the memento is stored for." createChild="false"
+          ecoreFeature="ecore:EAttribute persistence.ecore#//PartMemento/partId"/>
+      <genFeatures documentation="The stringified memento. This way it can be directly set into the persisted state and thus used by the workbench to pass into the ViewPart#init method."
+          createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//PartMemento/memento"/>
+    </genClasses>
+  </genPackages>
 </genmodel:GenModel>
\ No newline at end of file
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/plugin.xml b/tools/bundles/org.eclipse.e4.tools.persistence/plugin.xml
index 77e25b1744..34d8416caa 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/plugin.xml
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/plugin.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
--->
-
-<plugin>
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated persistence -->
-      <package
-            uri="http://www.eclipse.org/e4/tools/persistence"
-            class="org.eclipse.e4.tools.internal.persistence.IPersistencePackage"
-            genModel="model/persistence.genmodel"/>
-   </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+-->
+
+<plugin>
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated persistence -->
+      <package
+            uri="http://www.eclipse.org/e4/tools/persistence"
+            class="org.eclipse.e4.tools.internal.persistence.IPersistencePackage"
+            genModel="model/persistence.genmodel"/>
+   </extension>
+
+</plugin>
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java
index bb38e59b0a..20ea1643ae 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java
@@ -1,287 +1,287 @@
-/*******************************************************************************
- * Copyright (c) 2021 EclipseSource GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     EclipseSource GmbH - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.internal.persistence.util;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
-import org.eclipse.e4.tools.internal.persistence.impl.WorkbenchState;
-import org.eclipse.e4.tools.persistence.PerspectivePersister;
-import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.MApplicationElement;
-import org.eclipse.e4.ui.model.application.ui.MSnippetContainer;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
-import org.eclipse.e4.ui.model.application.ui.SideValue;
-import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
-import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
-import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
-import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
-import org.eclipse.e4.ui.workbench.Selector;
-import org.eclipse.e4.ui.workbench.modeling.EModelService;
-import org.eclipse.e4.ui.workbench.modeling.EPartService;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.XMLMemento;
-import org.eclipse.ui.internal.EditorReference;
-import org.eclipse.ui.internal.Workbench;
-import org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor;
-import org.eclipse.ui.internal.e4.compatibility.CompatibilityView;
-
-/**
- * A Util for the workbench conversion.
- *
- * @since 3.3
- *
- */
-@SuppressWarnings({ "restriction" })
-public final class CommonUtil {
-
-	private CommonUtil() {
-	}
-
-	/**
-	 * The key to use for storing the memento.
-	 */
-	public static String MEMENTO_KEY = "memento"; //$NON-NLS-1$
-	/**
-	 * Constant for the EDITOR_AREA.
-	 */
-	public static String EDITOR_AREA = "org.eclipse.ui.editorss"; //$NON-NLS-1$
-
-	/**
-	 * Retrieve the IEclipseContext from the Workbench.
-	 *
-	 * @return The IEclipseContext
-	 */
-	public static IEclipseContext getEclipseContext() {
-		return Workbench.getInstance().getContext();
-	}
-
-	/**
-	 * Retrieve the EModelService from the EclipseContext.
-	 *
-	 * @return The EModelService
-	 */
-	public static EModelService getEModelService() {
-		return getEclipseContext().get(EModelService.class);
-	}
-
-	/**
-	 * Retrieve the first MWindow from the MApplication from the EclipseContext.
-	 *
-	 * @return The MWindow
-	 */
-	public static MWindow getCurrentMainWindow() {
-		MApplication mApplication = getEclipseContext().get(MApplication.class);
-		List<MWindow> children = mApplication.getChildren();
-		MWindow mWindow = children.get(0);
-		return mWindow;
-	}
-
-	public static void persistCompatibilityEditors(MUIElement root) {
-		CommonUtil.getEModelService().findElements(root, CompatibilityEditor.MODEL_ELEMENT_ID, MPart.class)
-				.forEach(CommonUtil::persistCompatibilityEditor);
-	}
-
-	/**
-	 * If the part represents a CompatibilityEditor, writes the editor's state to
-	 * the MPart's persisted state.
-	 */
-	private static void persistCompatibilityEditor(MPart part) {
-		if (part.getObject() instanceof CompatibilityEditor) {
-			// Use reflection to call EditorReference's persist method.
-			// It writes all relevant information of the editor (id, editor input, etc.) to
-			// the MPart's persisted state
-			// With this, the editor can be restored.
-			// Reflection is necessary because EditorReference#persist is package protected.
-			CompatibilityEditor editor = (CompatibilityEditor) part.getObject();
-			EditorReference reference = (EditorReference) editor.getReference();
-			try {
-				Method persistMethod = reference.getClass().getDeclaredMethod("persist"); //$NON-NLS-1$
-				persistMethod.setAccessible(true);
-				persistMethod.invoke(reference);
-			} catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException
-					| InvocationTargetException e) {
-				throw new IllegalStateException("Cannot call EditorReference's persist method", e); //$NON-NLS-1$
-			}
-		}
-	}
-
-	public static List<MPart> getPerspectivePartsWithState(final MPerspective perspective) {
-		List<MPlaceholder> phList = CommonUtil.getEModelService().findElements(perspective, null, MPlaceholder.class,
-				null);
-		List<MPart> result = new ArrayList<MPart>();
-		for (MPlaceholder ph : phList) {
-			MUIElement element = ph.getRef();
-			if (!MPart.class.isInstance(element)) {
-				continue;
-			}
-			MPart part = MPart.class.cast(element);
-
-			persist(part);
-			result.add(part);
-		}
-		return result;
-	}
-
-	private static void persist(final MPart part) {
-		Optional<IViewPart> viewPart = getOptionalViewPart(part);
-		if (viewPart.isPresent()) {
-			XMLMemento root = XMLMemento.createWriteRoot("view"); //$NON-NLS-1$
-			viewPart.get().saveState(root);
-			StringWriter writer = new StringWriter();
-			try {
-				root.save(writer);
-				part.getPersistedState().put(MEMENTO_KEY, writer.toString());
-			} catch (IOException e) {
-				throw new IllegalStateException(e);
-			}
-		}
-	}
-
-	/**
-	 * Retrieve the IViewPart from a MPart wrapped in an Optional.
-	 *
-	 * @param part The MPart to get the IViewPart from
-	 * @return The optional IViewPart
-	 */
-	public static Optional<IViewPart> getOptionalViewPart(final MPart part) {
-		if (!CompatibilityView.class.isInstance(part.getObject())) {
-			return Optional.empty();
-		}
-		CompatibilityView cv = CompatibilityView.class.cast(part.getObject());
-		if (cv == null) {
-			return Optional.empty();
-		}
-		IViewPart viewPart = cv.getView();
-		return Optional.ofNullable(viewPart);
-	}
-
-	/**
-	 * Create a new MSnippetContainer.
-	 *
-	 * @return The MSnippetContainer
-	 */
-	public static MSnippetContainer createSnippetContainer() {
-		return new MSnippetContainer() {
-
-			private final List<MUIElement> list = new ArrayList<>();
-
-			@Override
-			public List<MUIElement> getSnippets() {
-				return list;
-			}
-		};
-	}
-
-	/**
-	 * Retrieve the EPartService from the EclipseContext.
-	 *
-	 * @return The EPartService
-	 */
-	public static EPartService getEPartService() {
-		return CommonUtil.getEclipseContext().get(EPartService.class);
-	}
-
-	/**
-	 * Retrieve the MPerspective from a MWindow based on the perspectiveId.
-	 *
-	 * @param window        The MWindow to search
-	 * @param perspectiveId The perspective id to search for
-	 *
-	 * @return The MPerspective
-	 */
-	public static MPerspective getMainPerspectiveFromWindow(final MWindow window, final String perspectiveId) {
-
-		final List<MPerspective> findElements = CommonUtil.getEModelService().findElements(window, MPerspective.class,
-				EModelService.ANYWHERE, new Selector() {
-
-					@Override
-					public boolean select(final MApplicationElement element) {
-						return Objects.equals(element.getElementId(), perspectiveId);
-					}
-				});
-
-		if (findElements == null || findElements.isEmpty()) {
-			throw new IllegalStateException("No perspective found with id " + perspectiveId); //$NON-NLS-1$
-		} else if (findElements.size() > 1) {
-			throw new IllegalStateException("Too many perspectives found"); //$NON-NLS-1$
-		}
-		return findElements.get(0);
-	}
-
-	/**
-	 * Creates the persistable workbench state for an e4 perspective.
-	 *
-	 * @param window      the current application window. This is used to persist
-	 *                    the current trim bars
-	 * @param perspective The perspective to persist
-	 * @return The created {@link WorkbenchState}
-	 */
-	public static IWorkbenchState createWorkbenchState(final MWindow window, final MPerspective perspective) {
-		if (window == null) {
-			throw new NullPointerException("Window must not be null"); //$NON-NLS-1$
-		}
-		IWorkbenchState workbenchState = PerspectivePersister.convertPerspective(perspective);
-
-		// Add left and right trimbars that might contain MinMax controls
-		if (window instanceof MTrimmedWindow) {
-			MTrimmedWindow tw = (MTrimmedWindow) window;
-
-			// Get side trim bars, clone them, and add them to the workbench state
-			tw.getTrimBars().stream().filter(CommonUtil::isSideBar)
-					.map(t -> (MTrimBar) CommonUtil.getEModelService().cloneElement(t, null))
-					.forEach(workbenchState.getTrimBars()::add);
-		}
-
-		return workbenchState;
-	}
-
-	/**
-	 * Retrieve the IEditorPart from a MPart wrapped in an Optional.
-	 *
-	 * @param part The MPart to get the IEditorPart from
-	 * @return The optional IEditorPart
-	 */
-	public static Optional<IEditorPart> getOptionalEditorPart(final MPart part) {
-		if (!CompatibilityEditor.class.isInstance(part.getObject())) {
-			return Optional.empty();
-		}
-		CompatibilityEditor ce = CompatibilityEditor.class.cast(part.getObject());
-		if (ce == null) {
-			return Optional.empty();
-		}
-		IEditorPart editorPart = ce.getEditor();
-		return Optional.ofNullable(editorPart);
-	}
-
-	/**
-	 * Returns whether the given {@link MTrimBar} is a side trim bar.
-	 *
-	 * @param trimBar The MTrimBar to check
-	 * @return true if the {@link MTrimBar} is a side trim bar (left or right).
-	 */
-	public static boolean isSideBar(MTrimBar trimBar) {
-		return trimBar.getSide() == SideValue.LEFT || trimBar.getSide() == SideValue.RIGHT;
-	}
-}
+/*******************************************************************************
+ * Copyright (c) 2021 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.internal.persistence.util;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
+import org.eclipse.e4.tools.internal.persistence.impl.WorkbenchState;
+import org.eclipse.e4.tools.persistence.PerspectivePersister;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.ui.MSnippetContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.SideValue;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.e4.ui.workbench.Selector;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.XMLMemento;
+import org.eclipse.ui.internal.EditorReference;
+import org.eclipse.ui.internal.Workbench;
+import org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor;
+import org.eclipse.ui.internal.e4.compatibility.CompatibilityView;
+
+/**
+ * A Util for the workbench conversion.
+ *
+ * @since 3.3
+ *
+ */
+@SuppressWarnings({ "restriction" })
+public final class CommonUtil {
+
+	private CommonUtil() {
+	}
+
+	/**
+	 * The key to use for storing the memento.
+	 */
+	public static String MEMENTO_KEY = "memento"; //$NON-NLS-1$
+	/**
+	 * Constant for the EDITOR_AREA.
+	 */
+	public static String EDITOR_AREA = "org.eclipse.ui.editorss"; //$NON-NLS-1$
+
+	/**
+	 * Retrieve the IEclipseContext from the Workbench.
+	 *
+	 * @return The IEclipseContext
+	 */
+	public static IEclipseContext getEclipseContext() {
+		return Workbench.getInstance().getContext();
+	}
+
+	/**
+	 * Retrieve the EModelService from the EclipseContext.
+	 *
+	 * @return The EModelService
+	 */
+	public static EModelService getEModelService() {
+		return getEclipseContext().get(EModelService.class);
+	}
+
+	/**
+	 * Retrieve the first MWindow from the MApplication from the EclipseContext.
+	 *
+	 * @return The MWindow
+	 */
+	public static MWindow getCurrentMainWindow() {
+		MApplication mApplication = getEclipseContext().get(MApplication.class);
+		List<MWindow> children = mApplication.getChildren();
+		MWindow mWindow = children.get(0);
+		return mWindow;
+	}
+
+	public static void persistCompatibilityEditors(MUIElement root) {
+		CommonUtil.getEModelService().findElements(root, CompatibilityEditor.MODEL_ELEMENT_ID, MPart.class)
+				.forEach(CommonUtil::persistCompatibilityEditor);
+	}
+
+	/**
+	 * If the part represents a CompatibilityEditor, writes the editor's state to
+	 * the MPart's persisted state.
+	 */
+	private static void persistCompatibilityEditor(MPart part) {
+		if (part.getObject() instanceof CompatibilityEditor) {
+			// Use reflection to call EditorReference's persist method.
+			// It writes all relevant information of the editor (id, editor input, etc.) to
+			// the MPart's persisted state
+			// With this, the editor can be restored.
+			// Reflection is necessary because EditorReference#persist is package protected.
+			CompatibilityEditor editor = (CompatibilityEditor) part.getObject();
+			EditorReference reference = (EditorReference) editor.getReference();
+			try {
+				Method persistMethod = reference.getClass().getDeclaredMethod("persist"); //$NON-NLS-1$
+				persistMethod.setAccessible(true);
+				persistMethod.invoke(reference);
+			} catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException
+					| InvocationTargetException e) {
+				throw new IllegalStateException("Cannot call EditorReference's persist method", e); //$NON-NLS-1$
+			}
+		}
+	}
+
+	public static List<MPart> getPerspectivePartsWithState(final MPerspective perspective) {
+		List<MPlaceholder> phList = CommonUtil.getEModelService().findElements(perspective, null, MPlaceholder.class,
+				null);
+		List<MPart> result = new ArrayList<MPart>();
+		for (MPlaceholder ph : phList) {
+			MUIElement element = ph.getRef();
+			if (!MPart.class.isInstance(element)) {
+				continue;
+			}
+			MPart part = MPart.class.cast(element);
+
+			persist(part);
+			result.add(part);
+		}
+		return result;
+	}
+
+	private static void persist(final MPart part) {
+		Optional<IViewPart> viewPart = getOptionalViewPart(part);
+		if (viewPart.isPresent()) {
+			XMLMemento root = XMLMemento.createWriteRoot("view"); //$NON-NLS-1$
+			viewPart.get().saveState(root);
+			StringWriter writer = new StringWriter();
+			try {
+				root.save(writer);
+				part.getPersistedState().put(MEMENTO_KEY, writer.toString());
+			} catch (IOException e) {
+				throw new IllegalStateException(e);
+			}
+		}
+	}
+
+	/**
+	 * Retrieve the IViewPart from a MPart wrapped in an Optional.
+	 *
+	 * @param part The MPart to get the IViewPart from
+	 * @return The optional IViewPart
+	 */
+	public static Optional<IViewPart> getOptionalViewPart(final MPart part) {
+		if (!CompatibilityView.class.isInstance(part.getObject())) {
+			return Optional.empty();
+		}
+		CompatibilityView cv = CompatibilityView.class.cast(part.getObject());
+		if (cv == null) {
+			return Optional.empty();
+		}
+		IViewPart viewPart = cv.getView();
+		return Optional.ofNullable(viewPart);
+	}
+
+	/**
+	 * Create a new MSnippetContainer.
+	 *
+	 * @return The MSnippetContainer
+	 */
+	public static MSnippetContainer createSnippetContainer() {
+		return new MSnippetContainer() {
+
+			private final List<MUIElement> list = new ArrayList<>();
+
+			@Override
+			public List<MUIElement> getSnippets() {
+				return list;
+			}
+		};
+	}
+
+	/**
+	 * Retrieve the EPartService from the EclipseContext.
+	 *
+	 * @return The EPartService
+	 */
+	public static EPartService getEPartService() {
+		return CommonUtil.getEclipseContext().get(EPartService.class);
+	}
+
+	/**
+	 * Retrieve the MPerspective from a MWindow based on the perspectiveId.
+	 *
+	 * @param window        The MWindow to search
+	 * @param perspectiveId The perspective id to search for
+	 *
+	 * @return The MPerspective
+	 */
+	public static MPerspective getMainPerspectiveFromWindow(final MWindow window, final String perspectiveId) {
+
+		final List<MPerspective> findElements = CommonUtil.getEModelService().findElements(window, MPerspective.class,
+				EModelService.ANYWHERE, new Selector() {
+
+					@Override
+					public boolean select(final MApplicationElement element) {
+						return Objects.equals(element.getElementId(), perspectiveId);
+					}
+				});
+
+		if (findElements == null || findElements.isEmpty()) {
+			throw new IllegalStateException("No perspective found with id " + perspectiveId); //$NON-NLS-1$
+		} else if (findElements.size() > 1) {
+			throw new IllegalStateException("Too many perspectives found"); //$NON-NLS-1$
+		}
+		return findElements.get(0);
+	}
+
+	/**
+	 * Creates the persistable workbench state for an e4 perspective.
+	 *
+	 * @param window      the current application window. This is used to persist
+	 *                    the current trim bars
+	 * @param perspective The perspective to persist
+	 * @return The created {@link WorkbenchState}
+	 */
+	public static IWorkbenchState createWorkbenchState(final MWindow window, final MPerspective perspective) {
+		if (window == null) {
+			throw new NullPointerException("Window must not be null"); //$NON-NLS-1$
+		}
+		IWorkbenchState workbenchState = PerspectivePersister.convertPerspective(perspective);
+
+		// Add left and right trimbars that might contain MinMax controls
+		if (window instanceof MTrimmedWindow) {
+			MTrimmedWindow tw = (MTrimmedWindow) window;
+
+			// Get side trim bars, clone them, and add them to the workbench state
+			tw.getTrimBars().stream().filter(CommonUtil::isSideBar)
+					.map(t -> (MTrimBar) CommonUtil.getEModelService().cloneElement(t, null))
+					.forEach(workbenchState.getTrimBars()::add);
+		}
+
+		return workbenchState;
+	}
+
+	/**
+	 * Retrieve the IEditorPart from a MPart wrapped in an Optional.
+	 *
+	 * @param part The MPart to get the IEditorPart from
+	 * @return The optional IEditorPart
+	 */
+	public static Optional<IEditorPart> getOptionalEditorPart(final MPart part) {
+		if (!CompatibilityEditor.class.isInstance(part.getObject())) {
+			return Optional.empty();
+		}
+		CompatibilityEditor ce = CompatibilityEditor.class.cast(part.getObject());
+		if (ce == null) {
+			return Optional.empty();
+		}
+		IEditorPart editorPart = ce.getEditor();
+		return Optional.ofNullable(editorPart);
+	}
+
+	/**
+	 * Returns whether the given {@link MTrimBar} is a side trim bar.
+	 *
+	 * @param trimBar The MTrimBar to check
+	 * @return true if the {@link MTrimBar} is a side trim bar (left or right).
+	 */
+	public static boolean isSideBar(MTrimBar trimBar) {
+		return trimBar.getSide() == SideValue.LEFT || trimBar.getSide() == SideValue.RIGHT;
+	}
+}
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceAdapterFactory.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceAdapterFactory.java
index d79ac01e48..d850d2d44d 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceAdapterFactory.java
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceAdapterFactory.java
@@ -1,145 +1,145 @@
-/*******************************************************************************
- * Copyright (c) 2021 EclipseSource GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     EclipseSource GmbH - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.internal.persistence.util;
-
-import org.eclipse.e4.tools.internal.persistence.IPartMemento;
-import org.eclipse.e4.tools.internal.persistence.IPersistencePackage;
-import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
- * an adapter <code>createXXX</code> method for each class of the model. <!--
- * end-user-doc -->
- * @see org.eclipse.e4.tools.internal.persistence.IPersistencePackage
- * @generated
- */
-public class PersistenceAdapterFactory extends AdapterFactoryImpl {
-
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static IPersistencePackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 */
-	public PersistenceAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = IPersistencePackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object. <!--
-	 * begin-user-doc --> This implementation returns <code>true</code> if the
-	 * object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected PersistenceSwitch<Adapter> modelSwitch = new PersistenceSwitch<>() {
-		@Override
-		public Adapter caseWorkbenchState(IWorkbenchState object) {
-			return createWorkbenchStateAdapter();
-		}
-
-		@Override
-		public Adapter casePartMemento(IPartMemento object) {
-			return createPartMementoAdapter();
-		}
-
-		@Override
-		public Adapter defaultCase(EObject object) {
-			return createEObjectAdapter();
-		}
-	};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject) target);
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.e4.tools.internal.persistence.IWorkbenchState <em>Workbench State</em>}'.
-	 * <!-- begin-user-doc --> This default implementation returns
-	 * null so that we can easily ignore cases; it's useful to ignore a case when
-	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.e4.tools.internal.persistence.IWorkbenchState
-	 * @generated
-	 */
-	public Adapter createWorkbenchStateAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.e4.tools.internal.persistence.IPartMemento <em>Part Memento</em>}'.
-	 * <!-- begin-user-doc --> This default implementation returns
-	 * null so that we can easily ignore cases; it's useful to ignore a case when
-	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.e4.tools.internal.persistence.IPartMemento
-	 * @generated
-	 */
-	public Adapter createPartMementoAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc --> This
-	 * default implementation returns null. <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} // PersistenceAdapterFactory
+/*******************************************************************************
+ * Copyright (c) 2021 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.internal.persistence.util;
+
+import org.eclipse.e4.tools.internal.persistence.IPartMemento;
+import org.eclipse.e4.tools.internal.persistence.IPersistencePackage;
+import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
+ * an adapter <code>createXXX</code> method for each class of the model. <!--
+ * end-user-doc -->
+ * @see org.eclipse.e4.tools.internal.persistence.IPersistencePackage
+ * @generated
+ */
+public class PersistenceAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static IPersistencePackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	public PersistenceAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = IPersistencePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object. <!--
+	 * begin-user-doc --> This implementation returns <code>true</code> if the
+	 * object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject) object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected PersistenceSwitch<Adapter> modelSwitch = new PersistenceSwitch<>() {
+		@Override
+		public Adapter caseWorkbenchState(IWorkbenchState object) {
+			return createWorkbenchStateAdapter();
+		}
+
+		@Override
+		public Adapter casePartMemento(IPartMemento object) {
+			return createPartMementoAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject) target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.e4.tools.internal.persistence.IWorkbenchState <em>Workbench State</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.e4.tools.internal.persistence.IWorkbenchState
+	 * @generated
+	 */
+	public Adapter createWorkbenchStateAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.e4.tools.internal.persistence.IPartMemento <em>Part Memento</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.e4.tools.internal.persistence.IPartMemento
+	 * @generated
+	 */
+	public Adapter createPartMementoAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc --> This
+	 * default implementation returns null. <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} // PersistenceAdapterFactory
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java
index 19c1144536..cbbc24c234 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java
@@ -1,141 +1,141 @@
-/*******************************************************************************
- * Copyright (c) 2021 EclipseSource GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     EclipseSource GmbH - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.internal.persistence.util;
-
-import org.eclipse.e4.tools.internal.persistence.IPartMemento;
-import org.eclipse.e4.tools.internal.persistence.IPersistencePackage;
-import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
-
-/**
- * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
- * hierarchy. It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object and proceeding up the
- * inheritance hierarchy until a non-null result is returned, which is the
- * result of the switch. <!-- end-user-doc -->
- * @see org.eclipse.e4.tools.internal.persistence.IPersistencePackage
- * @generated
- */
-public class PersistenceSwitch<T> extends Switch<T> {
-
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static IPersistencePackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 *
-	 * @generated
-	 */
-	public PersistenceSwitch() {
-		if (modelPackage == null) {
-			modelPackage = IPersistencePackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @param ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-		case IPersistencePackage.WORKBENCH_STATE: {
-			IWorkbenchState workbenchState = (IWorkbenchState) theEObject;
-			T result = caseWorkbenchState(workbenchState);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case IPersistencePackage.PART_MEMENTO: {
-			IPartMemento partMemento = (IPartMemento) theEObject;
-			T result = casePartMemento(partMemento);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		default:
-			return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Workbench State</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Workbench State</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseWorkbenchState(IWorkbenchState object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Part Memento</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Part Memento</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePartMemento(IPartMemento object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc --> This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last
-	 * case anyway. <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} // PersistenceSwitch
+/*******************************************************************************
+ * Copyright (c) 2021 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.internal.persistence.util;
+
+import org.eclipse.e4.tools.internal.persistence.IPartMemento;
+import org.eclipse.e4.tools.internal.persistence.IPersistencePackage;
+import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+
+/**
+ * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
+ * hierarchy. It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object and proceeding up the
+ * inheritance hierarchy until a non-null result is returned, which is the
+ * result of the switch. <!-- end-user-doc -->
+ * @see org.eclipse.e4.tools.internal.persistence.IPersistencePackage
+ * @generated
+ */
+public class PersistenceSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static IPersistencePackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 *
+	 * @generated
+	 */
+	public PersistenceSwitch() {
+		if (modelPackage == null) {
+			modelPackage = IPersistencePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+		case IPersistencePackage.WORKBENCH_STATE: {
+			IWorkbenchState workbenchState = (IWorkbenchState) theEObject;
+			T result = caseWorkbenchState(workbenchState);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case IPersistencePackage.PART_MEMENTO: {
+			IPartMemento partMemento = (IPartMemento) theEObject;
+			T result = casePartMemento(partMemento);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Workbench State</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Workbench State</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseWorkbenchState(IWorkbenchState object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Part Memento</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Part Memento</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePartMemento(IPartMemento object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last
+	 * case anyway. <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} // PersistenceSwitch
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java
index b85954e189..3c73aeab2a 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java
@@ -1,502 +1,502 @@
-/*******************************************************************************
- * Copyright (c) 2021 EclipseSource GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     EclipseSource GmbH - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.persistence;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import org.eclipse.e4.tools.internal.persistence.IPartMemento;
-import org.eclipse.e4.tools.internal.persistence.IPersistenceFactory;
-import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
-import org.eclipse.e4.tools.internal.persistence.util.CommonUtil;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
-import org.eclipse.e4.ui.model.application.ui.MSnippetContainer;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
-import org.eclipse.e4.ui.model.application.ui.SideValue;
-import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
-import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
-import org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack;
-import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
-import org.eclipse.e4.ui.model.application.ui.basic.MStackElement;
-import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
-import org.eclipse.e4.ui.model.application.ui.basic.MTrimElement;
-import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
-import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
-import org.eclipse.e4.ui.workbench.IPresentationEngine;
-import org.eclipse.e4.ui.workbench.modeling.EModelService;
-import org.eclipse.e4.ui.workbench.modeling.EPartService;
-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.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IViewReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Persists and restores perspectives from a {@link IWorkbenchWindow}.
- */
-public final class PerspectivePersister {
-
-	private PerspectivePersister() {
-	}
-
-	/**
-	 * Serialize a specific perspective from the running application.
-	 *
-	 * @param perspectiveId The id of the perspective to extract and serialize
-	 * @return the serialized WorkbenchState
-	 */
-	public static String serializePerspectiveAndPartStates(final String perspectiveId) {
-		final MWindow mWindow = CommonUtil.getCurrentMainWindow();
-		final MPerspective perspective = CommonUtil.getMainPerspectiveFromWindow(mWindow, perspectiveId);
-		final IWorkbenchState workbenchState = CommonUtil.createWorkbenchState(mWindow, perspective);
-		final String xml = serialize(workbenchState);
-		return xml;
-	}
-
-	private static String serialize(final EObject eObject) {
-		final EObject copy = EcoreUtil.copy(eObject);
-		final ResourceSet resourceSet = new ResourceSetImpl();
-		final Resource resource = resourceSet.createResource(URI.createURI("virtualUri")); //$NON-NLS-1$
-		// changes containment, therefore we use a copy
-		resource.getContents().add(copy);
-		try (Writer writer = new StringWriter()) {
-			final URIConverter.WriteableOutputStream uws = new URIConverter.WriteableOutputStream(writer, "UTF-8"); //$NON-NLS-1$
-			resource.save(uws, null);
-			final String xml = writer.toString().trim();
-			writer.close();
-			return xml;
-
-		} catch (final IOException e) {
-			throw new IllegalStateException(e);
-		}
-	}
-
-	/**
-	 * Deserialize and restore the WorkbenchState.
-	 *
-	 * @param serializedState The serialized WorkbenchState
-	 */
-	public static void restoreWorkbenchState(final String serializedState) {
-		final IWorkbenchState toBeMerged = deserialize(serializedState);
-		restoreWorkbenchState(toBeMerged);
-	}
-
-	/**
-	 * Restore the WorkbenchState.
-	 *
-	 * @param workbenchState The WorkbenchState to restore
-	 */
-	public static void restoreWorkbenchState(final IWorkbenchState workbenchState) {
-		final MWindow currentWindow = CommonUtil.getCurrentMainWindow();
-		final EPartService ePartService = CommonUtil.getEPartService();
-		disposeCurrentParts(ePartService.getParts());
-		MPerspective perspective = workbenchState.getPerspective();
-		ePartService.switchPerspective(perspective.getElementId());
-
-		Shell widget = (Shell) currentWindow.getWidget();
-		// Turn of redrawing while we update the complete layout
-		widget.setRedraw(false);
-
-		try {
-			IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-
-			List<IViewPart> viewPartsToHide = new ArrayList<>();
-			List<IViewReference> viewReferencesToHide = new ArrayList<>();
-			List<MPart> parts = new ArrayList<>();
-
-			for (final IPartMemento viewSetting : workbenchState.getViewSettings()) {
-				final List<MPart> elements = CommonUtil.getEModelService().findElements(currentWindow,
-						viewSetting.getPartId(), MPart.class, null);
-				if (elements.size() < 1) {
-					System.err.println("Part ID has not been found. View Settings cannot be restored for part: " //$NON-NLS-1$
-							+ viewSetting.getPartId());
-					continue;
-				}
-
-				final MPart part = elements.get(0);
-				parts.add(part);
-
-				final Optional<IViewPart> viewPart = CommonUtil.getOptionalViewPart(part);
-				if (viewPart.isPresent()) {
-					viewPartsToHide.add(viewPart.get());
-				} else {
-					// If we get no part this might mean the view has not been activated yet
-					IViewReference viewRef = (IViewReference) part.getTransientData()
-							.get(IWorkbenchPartReference.class.getName());
-					if (viewRef != null) {
-						// Make sure we use not an old reference object
-						IViewReference resolved = activePage.findViewReference(viewRef.getId());
-						// Activate forcefully otherwise we are unable to close the view and have to
-						// deal with
-						// WidgetDisposedExceptions
-						if (resolved == null) {
-							try {
-								IViewPart view = activePage.showView(viewRef.getId());
-								if (view != null) {
-									viewPartsToHide.add(view);
-								}
-							} catch (PartInitException e) {
-								System.err.println("Failed to initialize part"); //$NON-NLS-1$
-								e.printStackTrace();
-							}
-						} else {
-							viewReferencesToHide.add(resolved);
-						}
-					}
-				}
-			}
-
-			// First hide references to not forcefully activate them
-			viewReferencesToHide.forEach(activePage::hideView);
-			viewPartsToHide.forEach(activePage::hideView);
-
-			// Bug in e4/JFace/Compat-Layer disposing Images in
-			// org.eclipse.ui.part.WorkbenchPart but they are kept in
-			// JFaceResources.getImageRegistry().get(String)
-			for (MPart p : parts) {
-				if (p.getIconURI() != null) {
-					Image image = JFaceResources.getImageRegistry().get(p.getIconURI());
-					if (image != null && image.isDisposed()) {
-						JFaceResources.getImageRegistry().remove(p.getIconURI());
-					}
-				}
-			}
-
-			for (final IPartMemento viewSetting : workbenchState.getViewSettings()) {
-				final List<MPart> elements = CommonUtil.getEModelService().findElements(currentWindow,
-						viewSetting.getPartId(), MPart.class, null);
-				if (elements.size() < 1) {
-					System.err.println("Part ID has not been found. View Settings cannot be restored for part: " //$NON-NLS-1$
-							+ viewSetting.getPartId());
-					continue;
-				}
-
-				final MPart part = elements.get(0);
-				parts.add(part);
-
-				part.getPersistedState().put(CommonUtil.MEMENTO_KEY, viewSetting.getMemento());
-			}
-
-			replaceExistingPerspective(currentWindow, workbenchState.getPerspective(),
-					workbenchState.getPerspective().getElementId());
-
-			if (workbenchState.getEditorArea() != null) {
-				replaceEditorAreaContents(currentWindow, workbenchState.getEditorArea());
-			}
-
-			// Replace side trim bars to ensure persisted minimized part stacks don't get
-			// lost.
-			// This is necessary because a MToolControl to restore a part stack (and its
-			// child parts) is only created the first time a part stack is minimized.
-			// If a part stack was never minimized in the current workspace but is minimized
-			// in the persisted workbench, there are no min max controls without restoring
-			// the side bars.
-			if (currentWindow instanceof MTrimmedWindow) {
-				replaceSideTrimBars((MTrimmedWindow) currentWindow, workbenchState.getTrimBars());
-			}
-
-			// Re-minimize part stacks to trigger min-max addon
-			MPerspective appliedPerspective = CommonUtil.getMainPerspectiveFromWindow(currentWindow,
-					workbenchState.getPerspective().getElementId());
-			List<MPartStack> stacks = CommonUtil.getEModelService().findElements(appliedPerspective, null,
-					MPartStack.class);
-			stacks.stream().filter(s -> s.getTags().contains(IPresentationEngine.MINIMIZED)).forEach(s -> {
-				s.getTags().remove(IPresentationEngine.MINIMIZED);
-				s.getTags().add(IPresentationEngine.MINIMIZED);
-			});
-		} finally {
-			widget.setRedraw(true);
-		}
-	}
-
-	private static void disposeCurrentParts(Collection<MPart> parts) {
-		IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		List<IViewPart> viewPartsToHide = new LinkedList<>();
-		List<IEditorPart> editorsToHide = new LinkedList<>();
-		parts.forEach(part -> {
-			Optional<IViewPart> viewPart = CommonUtil.getOptionalViewPart(part);
-			if (viewPart.isPresent()) {
-				viewPartsToHide.add(viewPart.get());
-				return;
-			}
-			Optional<IEditorPart> editorPart = CommonUtil.getOptionalEditorPart(part);
-			if (editorPart.isPresent()) {
-				editorsToHide.add(editorPart.get());
-				return;
-			}
-
-			// the editor/view was not activated yet
-			// we need to be careful that this does not get activated by a neighbor being
-			// disposed and this is getting focus -> hide it now
-			CommonUtil.getEPartService().hidePart(part);
-		});
-		viewPartsToHide.forEach(activePage::hideView);
-		editorsToHide.forEach(e -> activePage.closeEditor(e, true));
-	}
-
-	/**
-	 * Replaces side trim bars (left and right) in the given window. If a trim bar
-	 * of a side is given, add it to the window. If a trim bar of the same side
-	 * already exists in the window, replace its children with the persisted one's
-	 * children.
-	 *
-	 * @param window   The window whose side trim bars to replace
-	 * @param trimBars The list of replacement trim bars.
-	 */
-	private static void replaceSideTrimBars(MTrimmedWindow window, List<MTrimBar> trimBars) {
-		for (MTrimBar trimBar : trimBars) {
-			if (!CommonUtil.isSideBar(trimBar)) {
-				continue;
-			}
-			MTrimBar clonedTrimBar = (MTrimBar) CommonUtil.getEModelService().cloneElement(trimBar, null);
-			SideValue side = trimBar.getSide();
-
-			// If a trim bar of the current side exists, replace its children with the
-			// persisted trim bar's children. This is done because deleting a trim bar logs
-			// a NPE in the error log.
-			// If no trim bar of the current side exists, insert the persisted one.
-			Optional<MTrimBar> existingTrimOptional = window.getTrimBars().stream().filter(t -> t.getSide() == side)
-					.findFirst();
-			if (existingTrimOptional.isPresent()) {
-				final MTrimBar existingTrim = existingTrimOptional.get();
-				List<MTrimElement> children = new LinkedList<>(existingTrim.getChildren());
-				children.forEach(CommonUtil.getEModelService()::deleteModelElement);
-
-				// remove trim elements that are not part of current perspective anymore
-				// leads to a NPE otherwise
-				List<MTrimElement> trimElementsToAdd = clonedTrimBar.getChildren().stream()//
-						.filter(te -> isTrimPartOfPerspective(te, window))//
-						.collect(Collectors.toList());
-				existingTrim.getChildren().addAll(trimElementsToAdd);
-				existingTrim.getTags().clear();
-				existingTrim.getTags().addAll(trimBar.getTags());
-				existingTrim.setVisible(trimBar.isVisible());
-				existingTrim.setToBeRendered(trimBar.isToBeRendered());
-			} else {
-				window.getTrimBars().add(clonedTrimBar);
-			}
-		}
-	}
-
-	@SuppressWarnings("restriction")
-	private static boolean isTrimPartOfPerspective(MTrimElement te, MTrimmedWindow window) {
-		EModelService eModelService = CommonUtil.getEModelService();
-		MPerspective activePerspective = eModelService.getActivePerspective(window);
-		Map<org.eclipse.e4.ui.workbench.addons.minmax.TrimStackIdHelper.TrimStackIdPart, String> parsedIds = org.eclipse.e4.ui.workbench.addons.minmax.TrimStackIdHelper
-				.parseTrimStackId(te.getElementId());
-		String stackId = parsedIds
-				.get(org.eclipse.e4.ui.workbench.addons.minmax.TrimStackIdHelper.TrimStackIdPart.ELEMENT_ID);
-		MUIElement foundElement = eModelService.find(stackId, activePerspective);
-		return foundElement != null;
-	}
-
-	private static IWorkbenchState deserialize(final String serializedState) {
-		final ResourceSet resourceSet = new ResourceSetImpl();
-		final Resource resource = resourceSet.createResource(URI.createURI("virtualUri")); //$NON-NLS-1$
-
-		try (Reader reader = new StringReader(serializedState)) {
-			final URIConverter.ReadableInputStream is = new URIConverter.ReadableInputStream(reader, "UTF-8"); //$NON-NLS-1$
-			resource.load(is, null);
-			final EObject eObject = resource.getContents().get(0);
-			if (!(eObject instanceof IWorkbenchState)) {
-				throw new IllegalStateException("Corrupted Perspective File"); //$NON-NLS-1$
-			}
-			return (IWorkbenchState) eObject;
-		} catch (final IOException e) {
-			throw new IllegalStateException(e);
-		}
-	}
-
-	private static void replaceExistingPerspective(final MWindow currentWindow, final MPerspective toBeMerged,
-			final String perspectiveName) {
-		final MPerspective currentPerspective = CommonUtil.getMainPerspectiveFromWindow(currentWindow, perspectiveName);
-		final Control control = (Control) currentPerspective.getWidget();
-
-		// If it exists, don't render editor area before removing the old perspective
-		// because otherwise the AreaRenderer throws an exception if the editor area was
-		// split.
-		MUIElement editorArea = CommonUtil.getEModelService().find(CommonUtil.EDITOR_AREA, currentPerspective);
-		if (editorArea != null) {
-			editorArea.setToBeRendered(false);
-		}
-
-		final MPerspectiveStack mPerspectiveStack = (MPerspectiveStack) deletePerspective(currentPerspective);
-		control.dispose();
-		final MPerspective clonedPerspective = addPerspective(toBeMerged, mPerspectiveStack, currentWindow);
-
-		// Remember the active element
-		final MUIElement activeElement = getActiveElement(clonedPerspective);
-
-		// Show the UI
-		final EPartService ePartService = CommonUtil.getEPartService();
-		ePartService.switchPerspective(clonedPerspective);
-
-		// Reset the activation, which might be adjusted by the part activation history
-		if (activeElement instanceof MPart) {
-			ePartService.activate((MPart) activeElement, true);
-		}
-	}
-
-	private static void replaceEditorAreaContents(final MWindow currentWindow, final MArea toBeMerged) {
-		List<MArea> editorAreaList = CommonUtil.getEModelService().findElements(currentWindow, CommonUtil.EDITOR_AREA,
-				MArea.class, null, EModelService.OUTSIDE_PERSPECTIVE | EModelService.IN_SHARED_AREA);
-		final MSnippetContainer snippetContainer = CommonUtil.createSnippetContainer();
-		snippetContainer.getSnippets().add(toBeMerged);
-		final MArea cloneSnippet = (MArea) CommonUtil.getEModelService().cloneSnippet(snippetContainer,
-				toBeMerged.getElementId(), currentWindow);
-
-		// Replace children of existing editor area: If there is a placeholder for an
-		// editor area, there is also a shared element.
-		MArea editorArea = editorAreaList.get(0);
-
-		while (editorArea.getChildren().size() > 0) {
-			Object widget = editorArea.getChildren().get(0).getWidget();
-			EcoreUtil.delete((EObject) editorArea.getChildren().get(0));
-			// Dispose widgets of removed children to avoid lingering "zombie" widgets
-			if (widget instanceof Control) {
-				((Control) widget).dispose();
-			}
-		}
-		editorArea.getChildren().addAll(cloneSnippet.getChildren());
-
-		// Activate all editors once to avoid problems with closing uninitialized
-		// editors later on.
-		activateEditors(editorArea);
-	}
-
-	/**
-	 * Activates all editors in the given editor area once to initialize them.
-	 *
-	 * @param editorArea
-	 */
-	private static void activateEditors(MArea editorArea) {
-		final EPartService partService = CommonUtil.getEPartService();
-
-		// Remember selection of all part stacks because activating a part selects it in
-		// the part stack.
-		// We want to restore the original selection after the activations are
-		// completed.
-		final List<MPartStack> partStacks = CommonUtil.getEModelService().findElements(editorArea, null,
-				MPartStack.class);
-		final Map<MPartStack, MStackElement> stackSelections = new LinkedHashMap<>();
-		for (MPartStack partStack : partStacks) {
-			stackSelections.put(partStack, partStack.getSelectedElement());
-		}
-
-		// Activate parts without the need to get focus
-		final List<MPart> editorParts = CommonUtil.getEModelService().findElements(editorArea, null, MPart.class);
-		for (MPart editor : editorParts) {
-			partService.activate(editor, false);
-		}
-
-		// Restore original part stack selections
-		for (MPartStack partStack : stackSelections.keySet()) {
-			partStack.setSelectedElement(stackSelections.get(partStack));
-		}
-	}
-
-	private static MUIElement getActiveElement(final MPerspective clonedPerspective) {
-		MUIElement activeElement = clonedPerspective;
-		// search the active Element
-		while (activeElement instanceof MElementContainer<?>) {
-			final MUIElement selectedElement = ((MElementContainer<?>) activeElement).getSelectedElement();
-			if (selectedElement == null) {
-				break;
-			}
-			activeElement = selectedElement;
-		}
-
-		if (activeElement instanceof MPlaceholder) {
-			activeElement = ((MPlaceholder) activeElement).getRef();
-		}
-		return activeElement;
-	}
-
-	private static EObject deletePerspective(final MPerspective currentPerspective) {
-		final EObject eContainer = ((EObject) currentPerspective).eContainer();
-		EcoreUtil.delete((EObject) currentPerspective);
-		return eContainer;
-	}
-
-	private static MPerspective addPerspective(final MPerspective perspective2BeMerged,
-			final MPerspectiveStack mPerspectiveStack, final MWindow currentWindow) {
-		final MSnippetContainer snippetContainer = CommonUtil.createSnippetContainer();
-		snippetContainer.getSnippets().add(perspective2BeMerged);
-		final MUIElement cloneSnippet = CommonUtil.getEModelService().cloneSnippet(snippetContainer,
-				perspective2BeMerged.getElementId(), currentWindow);
-		mPerspectiveStack.getChildren().add((MPerspective) cloneSnippet);
-		return (MPerspective) cloneSnippet;
-	}
-
-	/**
-	 * Convert the {@link MPerspective} to a {@link IWorkbenchState}.
-	 *
-	 * @param perspective The perspective to persist
-	 * @return The created WorkbenchState
-	 */
-	public static IWorkbenchState convertPerspective(final MPerspective perspective) {
-		MSnippetContainer snippetContainer = CommonUtil.createSnippetContainer();
-		CommonUtil.persistCompatibilityEditors(perspective);
-		CommonUtil.getEModelService().cloneElement(perspective, snippetContainer);
-		IWorkbenchState workbenchState = IPersistenceFactory.eINSTANCE.createWorkbenchState();
-		workbenchState.setPerspective((MPerspective) snippetContainer.getSnippets().get(0));
-		List<MPart> parts = CommonUtil.getPerspectivePartsWithState(perspective);
-		for (MPart part : parts) {
-			IPartMemento partMemento = IPersistenceFactory.eINSTANCE.createPartMemento();
-			partMemento.setPartId(part.getElementId());
-			partMemento.setMemento(part.getPersistedState().get(CommonUtil.MEMENTO_KEY));
-			workbenchState.getViewSettings().add(partMemento);
-		}
-
-		// Editor area
-		MPlaceholder editorAreaPlaceholder = (MPlaceholder) CommonUtil.getEModelService().find(CommonUtil.EDITOR_AREA,
-				perspective);
-		if (editorAreaPlaceholder != null) {
-			MArea editorArea = (MArea) editorAreaPlaceholder.getRef();
-			CommonUtil.persistCompatibilityEditors(editorArea);
-			MArea clonedEditorArea = (MArea) CommonUtil.getEModelService().cloneElement(editorArea, null);
-			workbenchState.setEditorArea(clonedEditorArea);
-			// TODO copy editor area view state of non editors
-		}
-
-		return workbenchState;
-	}
-
-}
+/*******************************************************************************
+ * Copyright (c) 2021 EclipseSource GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     EclipseSource GmbH - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.e4.tools.persistence;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import org.eclipse.e4.tools.internal.persistence.IPartMemento;
+import org.eclipse.e4.tools.internal.persistence.IPersistenceFactory;
+import org.eclipse.e4.tools.internal.persistence.IWorkbenchState;
+import org.eclipse.e4.tools.internal.persistence.util.CommonUtil;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MSnippetContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.SideValue;
+import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
+import org.eclipse.e4.ui.model.application.ui.basic.MStackElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.e4.ui.workbench.IPresentationEngine;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+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.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.URIConverter;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IViewReference;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPartReference;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * Persists and restores perspectives from a {@link IWorkbenchWindow}.
+ */
+public final class PerspectivePersister {
+
+	private PerspectivePersister() {
+	}
+
+	/**
+	 * Serialize a specific perspective from the running application.
+	 *
+	 * @param perspectiveId The id of the perspective to extract and serialize
+	 * @return the serialized WorkbenchState
+	 */
+	public static String serializePerspectiveAndPartStates(final String perspectiveId) {
+		final MWindow mWindow = CommonUtil.getCurrentMainWindow();
+		final MPerspective perspective = CommonUtil.getMainPerspectiveFromWindow(mWindow, perspectiveId);
+		final IWorkbenchState workbenchState = CommonUtil.createWorkbenchState(mWindow, perspective);
+		final String xml = serialize(workbenchState);
+		return xml;
+	}
+
+	private static String serialize(final EObject eObject) {
+		final EObject copy = EcoreUtil.copy(eObject);
+		final ResourceSet resourceSet = new ResourceSetImpl();
+		final Resource resource = resourceSet.createResource(URI.createURI("virtualUri")); //$NON-NLS-1$
+		// changes containment, therefore we use a copy
+		resource.getContents().add(copy);
+		try (Writer writer = new StringWriter()) {
+			final URIConverter.WriteableOutputStream uws = new URIConverter.WriteableOutputStream(writer, "UTF-8"); //$NON-NLS-1$
+			resource.save(uws, null);
+			final String xml = writer.toString().trim();
+			writer.close();
+			return xml;
+
+		} catch (final IOException e) {
+			throw new IllegalStateException(e);
+		}
+	}
+
+	/**
+	 * Deserialize and restore the WorkbenchState.
+	 *
+	 * @param serializedState The serialized WorkbenchState
+	 */
+	public static void restoreWorkbenchState(final String serializedState) {
+		final IWorkbenchState toBeMerged = deserialize(serializedState);
+		restoreWorkbenchState(toBeMerged);
+	}
+
+	/**
+	 * Restore the WorkbenchState.
+	 *
+	 * @param workbenchState The WorkbenchState to restore
+	 */
+	public static void restoreWorkbenchState(final IWorkbenchState workbenchState) {
+		final MWindow currentWindow = CommonUtil.getCurrentMainWindow();
+		final EPartService ePartService = CommonUtil.getEPartService();
+		disposeCurrentParts(ePartService.getParts());
+		MPerspective perspective = workbenchState.getPerspective();
+		ePartService.switchPerspective(perspective.getElementId());
+
+		Shell widget = (Shell) currentWindow.getWidget();
+		// Turn of redrawing while we update the complete layout
+		widget.setRedraw(false);
+
+		try {
+			IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+
+			List<IViewPart> viewPartsToHide = new ArrayList<>();
+			List<IViewReference> viewReferencesToHide = new ArrayList<>();
+			List<MPart> parts = new ArrayList<>();
+
+			for (final IPartMemento viewSetting : workbenchState.getViewSettings()) {
+				final List<MPart> elements = CommonUtil.getEModelService().findElements(currentWindow,
+						viewSetting.getPartId(), MPart.class, null);
+				if (elements.size() < 1) {
+					System.err.println("Part ID has not been found. View Settings cannot be restored for part: " //$NON-NLS-1$
+							+ viewSetting.getPartId());
+					continue;
+				}
+
+				final MPart part = elements.get(0);
+				parts.add(part);
+
+				final Optional<IViewPart> viewPart = CommonUtil.getOptionalViewPart(part);
+				if (viewPart.isPresent()) {
+					viewPartsToHide.add(viewPart.get());
+				} else {
+					// If we get no part this might mean the view has not been activated yet
+					IViewReference viewRef = (IViewReference) part.getTransientData()
+							.get(IWorkbenchPartReference.class.getName());
+					if (viewRef != null) {
+						// Make sure we use not an old reference object
+						IViewReference resolved = activePage.findViewReference(viewRef.getId());
+						// Activate forcefully otherwise we are unable to close the view and have to
+						// deal with
+						// WidgetDisposedExceptions
+						if (resolved == null) {
+							try {
+								IViewPart view = activePage.showView(viewRef.getId());
+								if (view != null) {
+									viewPartsToHide.add(view);
+								}
+							} catch (PartInitException e) {
+								System.err.println("Failed to initialize part"); //$NON-NLS-1$
+								e.printStackTrace();
+							}
+						} else {
+							viewReferencesToHide.add(resolved);
+						}
+					}
+				}
+			}
+
+			// First hide references to not forcefully activate them
+			viewReferencesToHide.forEach(activePage::hideView);
+			viewPartsToHide.forEach(activePage::hideView);
+
+			// Bug in e4/JFace/Compat-Layer disposing Images in
+			// org.eclipse.ui.part.WorkbenchPart but they are kept in
+			// JFaceResources.getImageRegistry().get(String)
+			for (MPart p : parts) {
+				if (p.getIconURI() != null) {
+					Image image = JFaceResources.getImageRegistry().get(p.getIconURI());
+					if (image != null && image.isDisposed()) {
+						JFaceResources.getImageRegistry().remove(p.getIconURI());
+					}
+				}
+			}
+
+			for (final IPartMemento viewSetting : workbenchState.getViewSettings()) {
+				final List<MPart> elements = CommonUtil.getEModelService().findElements(currentWindow,
+						viewSetting.getPartId(), MPart.class, null);
+				if (elements.size() < 1) {
+					System.err.println("Part ID has not been found. View Settings cannot be restored for part: " //$NON-NLS-1$
+							+ viewSetting.getPartId());
+					continue;
+				}
+
+				final MPart part = elements.get(0);
+				parts.add(part);
+
+				part.getPersistedState().put(CommonUtil.MEMENTO_KEY, viewSetting.getMemento());
+			}
+
+			replaceExistingPerspective(currentWindow, workbenchState.getPerspective(),
+					workbenchState.getPerspective().getElementId());
+
+			if (workbenchState.getEditorArea() != null) {
+				replaceEditorAreaContents(currentWindow, workbenchState.getEditorArea());
+			}
+
+			// Replace side trim bars to ensure persisted minimized part stacks don't get
+			// lost.
+			// This is necessary because a MToolControl to restore a part stack (and its
+			// child parts) is only created the first time a part stack is minimized.
+			// If a part stack was never minimized in the current workspace but is minimized
+			// in the persisted workbench, there are no min max controls without restoring
+			// the side bars.
+			if (currentWindow instanceof MTrimmedWindow) {
+				replaceSideTrimBars((MTrimmedWindow) currentWindow, workbenchState.getTrimBars());
+			}
+
+			// Re-minimize part stacks to trigger min-max addon
+			MPerspective appliedPerspective = CommonUtil.getMainPerspectiveFromWindow(currentWindow,
+					workbenchState.getPerspective().getElementId());
+			List<MPartStack> stacks = CommonUtil.getEModelService().findElements(appliedPerspective, null,
+					MPartStack.class);
+			stacks.stream().filter(s -> s.getTags().contains(IPresentationEngine.MINIMIZED)).forEach(s -> {
+				s.getTags().remove(IPresentationEngine.MINIMIZED);
+				s.getTags().add(IPresentationEngine.MINIMIZED);
+			});
+		} finally {
+			widget.setRedraw(true);
+		}
+	}
+
+	private static void disposeCurrentParts(Collection<MPart> parts) {
+		IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+		List<IViewPart> viewPartsToHide = new LinkedList<>();
+		List<IEditorPart> editorsToHide = new LinkedList<>();
+		parts.forEach(part -> {
+			Optional<IViewPart> viewPart = CommonUtil.getOptionalViewPart(part);
+			if (viewPart.isPresent()) {
+				viewPartsToHide.add(viewPart.get());
+				return;
+			}
+			Optional<IEditorPart> editorPart = CommonUtil.getOptionalEditorPart(part);
+			if (editorPart.isPresent()) {
+				editorsToHide.add(editorPart.get());
+				return;
+			}
+
+			// the editor/view was not activated yet
+			// we need to be careful that this does not get activated by a neighbor being
+			// disposed and this is getting focus -> hide it now
+			CommonUtil.getEPartService().hidePart(part);
+		});
+		viewPartsToHide.forEach(activePage::hideView);
+		editorsToHide.forEach(e -> activePage.closeEditor(e, true));
+	}
+
+	/**
+	 * Replaces side trim bars (left and right) in the given window. If a trim bar
+	 * of a side is given, add it to the window. If a trim bar of the same side
+	 * already exists in the window, replace its children with the persisted one's
+	 * children.
+	 *
+	 * @param window   The window whose side trim bars to replace
+	 * @param trimBars The list of replacement trim bars.
+	 */
+	private static void replaceSideTrimBars(MTrimmedWindow window, List<MTrimBar> trimBars) {
+		for (MTrimBar trimBar : trimBars) {
+			if (!CommonUtil.isSideBar(trimBar)) {
+				continue;
+			}
+			MTrimBar clonedTrimBar = (MTrimBar) CommonUtil.getEModelService().cloneElement(trimBar, null);
+			SideValue side = trimBar.getSide();
+
+			// If a trim bar of the current side exists, replace its children with the
+			// persisted trim bar's children. This is done because deleting a trim bar logs
+			// a NPE in the error log.
+			// If no trim bar of the current side exists, insert the persisted one.
+			Optional<MTrimBar> existingTrimOptional = window.getTrimBars().stream().filter(t -> t.getSide() == side)
+					.findFirst();
+			if (existingTrimOptional.isPresent()) {
+				final MTrimBar existingTrim = existingTrimOptional.get();
+				List<MTrimElement> children = new LinkedList<>(existingTrim.getChildren());
+				children.forEach(CommonUtil.getEModelService()::deleteModelElement);
+
+				// remove trim elements that are not part of current perspective anymore
+				// leads to a NPE otherwise
+				List<MTrimElement> trimElementsToAdd = clonedTrimBar.getChildren().stream()//
+						.filter(te -> isTrimPartOfPerspective(te, window))//
+						.collect(Collectors.toList());
+				existingTrim.getChildren().addAll(trimElementsToAdd);
+				existingTrim.getTags().clear();
+				existingTrim.getTags().addAll(trimBar.getTags());
+				existingTrim.setVisible(trimBar.isVisible());
+				existingTrim.setToBeRendered(trimBar.isToBeRendered());
+			} else {
+				window.getTrimBars().add(clonedTrimBar);
+			}
+		}
+	}
+
+	@SuppressWarnings("restriction")
+	private static boolean isTrimPartOfPerspective(MTrimElement te, MTrimmedWindow window) {
+		EModelService eModelService = CommonUtil.getEModelService();
+		MPerspective activePerspective = eModelService.getActivePerspective(window);
+		Map<org.eclipse.e4.ui.workbench.addons.minmax.TrimStackIdHelper.TrimStackIdPart, String> parsedIds = org.eclipse.e4.ui.workbench.addons.minmax.TrimStackIdHelper
+				.parseTrimStackId(te.getElementId());
+		String stackId = parsedIds
+				.get(org.eclipse.e4.ui.workbench.addons.minmax.TrimStackIdHelper.TrimStackIdPart.ELEMENT_ID);
+		MUIElement foundElement = eModelService.find(stackId, activePerspective);
+		return foundElement != null;
+	}
+
+	private static IWorkbenchState deserialize(final String serializedState) {
+		final ResourceSet resourceSet = new ResourceSetImpl();
+		final Resource resource = resourceSet.createResource(URI.createURI("virtualUri")); //$NON-NLS-1$
+
+		try (Reader reader = new StringReader(serializedState)) {
+			final URIConverter.ReadableInputStream is = new URIConverter.ReadableInputStream(reader, "UTF-8"); //$NON-NLS-1$
+			resource.load(is, null);
+			final EObject eObject = resource.getContents().get(0);
+			if (!(eObject instanceof IWorkbenchState)) {
+				throw new IllegalStateException("Corrupted Perspective File"); //$NON-NLS-1$
+			}
+			return (IWorkbenchState) eObject;
+		} catch (final IOException e) {
+			throw new IllegalStateException(e);
+		}
+	}
+
+	private static void replaceExistingPerspective(final MWindow currentWindow, final MPerspective toBeMerged,
+			final String perspectiveName) {
+		final MPerspective currentPerspective = CommonUtil.getMainPerspectiveFromWindow(currentWindow, perspectiveName);
+		final Control control = (Control) currentPerspective.getWidget();
+
+		// If it exists, don't render editor area before removing the old perspective
+		// because otherwise the AreaRenderer throws an exception if the editor area was
+		// split.
+		MUIElement editorArea = CommonUtil.getEModelService().find(CommonUtil.EDITOR_AREA, currentPerspective);
+		if (editorArea != null) {
+			editorArea.setToBeRendered(false);
+		}
+
+		final MPerspectiveStack mPerspectiveStack = (MPerspectiveStack) deletePerspective(currentPerspective);
+		control.dispose();
+		final MPerspective clonedPerspective = addPerspective(toBeMerged, mPerspectiveStack, currentWindow);
+
+		// Remember the active element
+		final MUIElement activeElement = getActiveElement(clonedPerspective);
+
+		// Show the UI
+		final EPartService ePartService = CommonUtil.getEPartService();
+		ePartService.switchPerspective(clonedPerspective);
+
+		// Reset the activation, which might be adjusted by the part activation history
+		if (activeElement instanceof MPart) {
+			ePartService.activate((MPart) activeElement, true);
+		}
+	}
+
+	private static void replaceEditorAreaContents(final MWindow currentWindow, final MArea toBeMerged) {
+		List<MArea> editorAreaList = CommonUtil.getEModelService().findElements(currentWindow, CommonUtil.EDITOR_AREA,
+				MArea.class, null, EModelService.OUTSIDE_PERSPECTIVE | EModelService.IN_SHARED_AREA);
+		final MSnippetContainer snippetContainer = CommonUtil.createSnippetContainer();
+		snippetContainer.getSnippets().add(toBeMerged);
+		final MArea cloneSnippet = (MArea) CommonUtil.getEModelService().cloneSnippet(snippetContainer,
+				toBeMerged.getElementId(), currentWindow);
+
+		// Replace children of existing editor area: If there is a placeholder for an
+		// editor area, there is also a shared element.
+		MArea editorArea = editorAreaList.get(0);
+
+		while (editorArea.getChildren().size() > 0) {
+			Object widget = editorArea.getChildren().get(0).getWidget();
+			EcoreUtil.delete((EObject) editorArea.getChildren().get(0));
+			// Dispose widgets of removed children to avoid lingering "zombie" widgets
+			if (widget instanceof Control) {
+				((Control) widget).dispose();
+			}
+		}
+		editorArea.getChildren().addAll(cloneSnippet.getChildren());
+
+		// Activate all editors once to avoid problems with closing uninitialized
+		// editors later on.
+		activateEditors(editorArea);
+	}
+
+	/**
+	 * Activates all editors in the given editor area once to initialize them.
+	 *
+	 * @param editorArea
+	 */
+	private static void activateEditors(MArea editorArea) {
+		final EPartService partService = CommonUtil.getEPartService();
+
+		// Remember selection of all part stacks because activating a part selects it in
+		// the part stack.
+		// We want to restore the original selection after the activations are
+		// completed.
+		final List<MPartStack> partStacks = CommonUtil.getEModelService().findElements(editorArea, null,
+				MPartStack.class);
+		final Map<MPartStack, MStackElement> stackSelections = new LinkedHashMap<>();
+		for (MPartStack partStack : partStacks) {
+			stackSelections.put(partStack, partStack.getSelectedElement());
+		}
+
+		// Activate parts without the need to get focus
+		final List<MPart> editorParts = CommonUtil.getEModelService().findElements(editorArea, null, MPart.class);
+		for (MPart editor : editorParts) {
+			partService.activate(editor, false);
+		}
+
+		// Restore original part stack selections
+		for (MPartStack partStack : stackSelections.keySet()) {
+			partStack.setSelectedElement(stackSelections.get(partStack));
+		}
+	}
+
+	private static MUIElement getActiveElement(final MPerspective clonedPerspective) {
+		MUIElement activeElement = clonedPerspective;
+		// search the active Element
+		while (activeElement instanceof MElementContainer<?>) {
+			final MUIElement selectedElement = ((MElementContainer<?>) activeElement).getSelectedElement();
+			if (selectedElement == null) {
+				break;
+			}
+			activeElement = selectedElement;
+		}
+
+		if (activeElement instanceof MPlaceholder) {
+			activeElement = ((MPlaceholder) activeElement).getRef();
+		}
+		return activeElement;
+	}
+
+	private static EObject deletePerspective(final MPerspective currentPerspective) {
+		final EObject eContainer = ((EObject) currentPerspective).eContainer();
+		EcoreUtil.delete((EObject) currentPerspective);
+		return eContainer;
+	}
+
+	private static MPerspective addPerspective(final MPerspective perspective2BeMerged,
+			final MPerspectiveStack mPerspectiveStack, final MWindow currentWindow) {
+		final MSnippetContainer snippetContainer = CommonUtil.createSnippetContainer();
+		snippetContainer.getSnippets().add(perspective2BeMerged);
+		final MUIElement cloneSnippet = CommonUtil.getEModelService().cloneSnippet(snippetContainer,
+				perspective2BeMerged.getElementId(), currentWindow);
+		mPerspectiveStack.getChildren().add((MPerspective) cloneSnippet);
+		return (MPerspective) cloneSnippet;
+	}
+
+	/**
+	 * Convert the {@link MPerspective} to a {@link IWorkbenchState}.
+	 *
+	 * @param perspective The perspective to persist
+	 * @return The created WorkbenchState
+	 */
+	public static IWorkbenchState convertPerspective(final MPerspective perspective) {
+		MSnippetContainer snippetContainer = CommonUtil.createSnippetContainer();
+		CommonUtil.persistCompatibilityEditors(perspective);
+		CommonUtil.getEModelService().cloneElement(perspective, snippetContainer);
+		IWorkbenchState workbenchState = IPersistenceFactory.eINSTANCE.createWorkbenchState();
+		workbenchState.setPerspective((MPerspective) snippetContainer.getSnippets().get(0));
+		List<MPart> parts = CommonUtil.getPerspectivePartsWithState(perspective);
+		for (MPart part : parts) {
+			IPartMemento partMemento = IPersistenceFactory.eINSTANCE.createPartMemento();
+			partMemento.setPartId(part.getElementId());
+			partMemento.setMemento(part.getPersistedState().get(CommonUtil.MEMENTO_KEY));
+			workbenchState.getViewSettings().add(partMemento);
+		}
+
+		// Editor area
+		MPlaceholder editorAreaPlaceholder = (MPlaceholder) CommonUtil.getEModelService().find(CommonUtil.EDITOR_AREA,
+				perspective);
+		if (editorAreaPlaceholder != null) {
+			MArea editorArea = (MArea) editorAreaPlaceholder.getRef();
+			CommonUtil.persistCompatibilityEditors(editorArea);
+			MArea clonedEditorArea = (MArea) CommonUtil.getEModelService().cloneElement(editorArea, null);
+			workbenchState.setEditorArea(clonedEditorArea);
+			// TODO copy editor area view state of non editors
+		}
+
+		return workbenchState;
+	}
+
+}

From 28f8d171adf9de8b39e3612387663c246b35e2b0 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Sun, 25 Jun 2023 12:30:38 +0200
Subject: [PATCH 1243/1286] Version bumps for 4.29 stream

---
 .../META-INF/MANIFEST.MF                                        | 2 +-
 .../org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF       | 2 +-
 .../org.eclipse.e4.tools.persistence.feature/feature.xml        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
index 9aa1fb17a5..edd25d5abe 100644
--- a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.e4.tools.compatibility.migration
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
 Automatic-Module-Name: org.eclipse.e4.tools.compatibiliy.migration
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.e4.tools.persistence;bundle-version="1.0.0",
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
index eb931d173e..412d36b42b 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.persistence;singleton:=true
 Automatic-Module-Name: org.eclipse.e4.tools.persistence
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
 Bundle-ClassPath: .
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
diff --git a/tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml b/tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml
index 947f9e4ba6..defed5c9bf 100644
--- a/tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml
+++ b/tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.tools.persistence.feature"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.1.100.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

From 538f0ce68714ff6e920f7b85581e191250e4d17e Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Sat, 24 Jun 2023 21:27:11 +0200
Subject: [PATCH 1244/1286] Use new static IPath factories and constants and
 only the IPath type

---
 .../org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF       | 2 +-
 .../common/component/dialogs/ContributionDataFile.java     | 7 +++----
 .../internal/common/resourcelocator/BundleConverter.java   | 6 +++---
 .../TargetPlatformContributionCollector.java               | 5 ++---
 .../resourcelocator/dialogs/NonReferencedActionPage.java   | 5 ++---
 .../dialogs/NonReferencedResourceDialog.java               | 5 ++---
 .../resourcelocator/dialogs/PickProjectFolderPage.java     | 3 +--
 .../resourcelocator/dialogs/ProjectFolderPickerDialog.java | 5 ++---
 .../tools/emf/ui/internal/wbm/ApplicationModelEditor.java  | 5 +++--
 .../org.eclipse.e4.tools.services/META-INF/MANIFEST.MF     | 2 +-
 .../eclipse/e4/tools/services/BasicResourceProvider.java   | 4 ++--
 tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF    | 2 +-
 .../tools/wizards/model/BaseApplicationModelWizard.java    | 6 +++---
 .../e4/internal/tools/wizards/model/NewModelFilePage.java  | 6 +++---
 14 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 72f4592480..cb1b9f5f80 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.27.0",
  org.eclipse.core.databinding.property;bundle-version="1.2.100",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
  org.eclipse.jface.databinding;bundle-version="1.4.0",
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
index 22732c4dba..da92628489 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
@@ -41,7 +41,6 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.content.IContentDescription;
@@ -63,7 +62,7 @@ public class ContributionDataFile implements IFile {
 	public ContributionDataFile(ContributionData data) {
 		this.data = data;
 		if (data.iconPath != null) {
-			path = Path.fromOSString(data.iconPath);
+			path = IPath.fromOSString(data.iconPath);
 		}
 	}
 
@@ -78,9 +77,9 @@ public ContributionData getContributionData() {
 	@Override
 	public IPath getProjectRelativePath() {
 		if (getContributionData().installLocation != null) {
-			return new Path(data.resourceRelativePath);
+			return IPath.fromOSString(data.resourceRelativePath);
 		}
-		return new Path(data.iconPath);
+		return IPath.fromOSString(data.iconPath);
 	}
 
 	@Override
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java
index d78e89d903..61ed33986d 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java
@@ -16,10 +16,10 @@
 
 import java.io.FileOutputStream;
 import java.util.jar.Manifest;
+
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
 
 /**
  * Converts the given install location into a bundle.
@@ -36,7 +36,7 @@ public class BundleConverter {
 	 * @throws Exception
 	 */
 	public static String convertProjectToBundle(String installLocation, IWorkspace workspace) throws Exception {
-		IPath project = Path.fromOSString(installLocation);
+		IPath project = IPath.fromOSString(installLocation);
 		if (project.toFile().isDirectory() == false) {
 			throw new Exception(Messages.BundleConverter_installLocationNotADirectory);
 		}
@@ -52,7 +52,7 @@ public static String convertProjectToBundle(String installLocation, IWorkspace w
 		}
 		Manifest manifest = new Manifest();
 		// TODO prompt for names
-		IPath path = Path.fromOSString(installLocation);
+		IPath path = IPath.fromOSString(installLocation);
 		String bundleId = path.lastSegment();
 		String bundleName = path.lastSegment();
 		manifest.getMainAttributes().putValue("Manifest-Version", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
index f601870346..7fc73baa9c 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
@@ -46,7 +46,6 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider;
@@ -238,7 +237,7 @@ protected ContributionData makeData(Entry e) {
 		// If class is in a java project, strip the source directory
 		// String path = e.path;// .replace("/", ".") + e.name;
 		// path = stripSourceDirectory(path, e.installLocation);
-		IPath ip = Path.fromOSString(e.path);
+		IPath ip = IPath.fromOSString(e.path);
 		ip = ip.addTrailingSeparator().makeRelative();
 		ip = ip.append(e.name);
 		final String className = ip.toOSString().replace(File.separatorChar, '.');
@@ -544,7 +543,7 @@ protected void visit(IProgressMonitor monitor, String bundleName, String install
 					if (e.path == null) {
 						e.path = ""; //$NON-NLS-1$
 					}
-					e.relativePath = Path
+					e.relativePath = IPath
 							.fromOSString(file.getAbsolutePath().replace(e.installLocation, "")).makeRelative().toOSString(); //$NON-NLS-1$
 
 					e.bundleSymName = bundleName;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
index 42da490469..c296a3c4f3 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
@@ -27,7 +27,6 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
 import org.eclipse.e4.tools.emf.ui.common.Plugin;
@@ -310,7 +309,7 @@ public void widgetSelected(SelectionEvent e) {
 												contributionData.className, contributionData.sourceType,
 												contributionData.iconPath);
 										cdConverted.installLocation = installLocation;
-										cdConverted.resourceRelativePath = Path.fromOSString(contributionData.iconPath)
+										cdConverted.resourceRelativePath = IPath.fromOSString(contributionData.iconPath)
 												.removeFirstSegments(1).toOSString();
 										doRequireBundle(bundleId, installLocation);
 										context.set("resolvedFile", new ContributionDataFile(cdConverted)); //$NON-NLS-1$
@@ -386,7 +385,7 @@ public void copyResourceToProject() {
 		try {
 			// String filename = ((ContributionDataFile)
 			// file).getContributionData().className + ".class";
-			IPath newPath = Path.fromOSString(path);
+			IPath newPath = IPath.fromOSString(path);
 			if (newPath.isEmpty() == false) {
 				CoreUtility.createFolder(project.getFolder(newPath));
 			}
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
index 3a3c00a3d5..e57f9c2a88 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
@@ -27,7 +27,6 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionData;
 import org.eclipse.e4.tools.emf.ui.common.Plugin;
@@ -304,7 +303,7 @@ public void widgetSelected(SelectionEvent e) {
 												contributionData.className, contributionData.sourceType,
 												contributionData.iconPath);
 										cdConverted.installLocation = installLocation;
-										cdConverted.resourceRelativePath = Path.fromOSString(contributionData.iconPath)
+										cdConverted.resourceRelativePath = IPath.fromOSString(contributionData.iconPath)
 												.removeFirstSegments(1).toOSString();
 										doRequireBundle(bundleId, installLocation);
 										result = new ContributionDataFile(cdConverted);
@@ -422,7 +421,7 @@ protected Control createContents(Composite parent) {
 			if (dlg.open() == IDialogConstants.OK_ID) {
 				// String filename = ((ContributionDataFile)
 				// file).getContributionData().className + ".class";
-				IPath newPath = Path.fromOSString(dlg.getValue());
+				IPath newPath = IPath.fromOSString(dlg.getValue());
 				if (newPath.isEmpty() == false) {
 					CoreUtility.createFolder(project.getFolder(newPath));
 				}
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
index fa5624d32b..75e01f0057 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
@@ -17,7 +17,6 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BundleImageCache;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
@@ -120,7 +119,7 @@ public void setVisible(boolean visible) {
 			}
 			setPageComplete(viewer.getSelection().isEmpty() == false);
 
-			path = new Path((String) context.get("srcPath")); //$NON-NLS-1$
+			path = IPath.fromOSString((String) context.get("srcPath")); //$NON-NLS-1$
 			label2.setText(path.lastSegment());
 			label3.setText(Messages.ProjectFolderPickerDialog_sourceResourceDirectory);
 			lblResourcePath.setText(path.removeLastSegments(1).toOSString());
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
index 85408bbbc1..1b82f723ee 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
@@ -22,7 +22,6 @@
 import org.eclipse.core.resources.IResourceProxyVisitor;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.e4.tools.emf.ui.internal.common.resourcelocator.Messages;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
@@ -172,7 +171,7 @@ protected void createButtonsForButtonBar(Composite parent) {
 		button.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				value = Path.fromOSString(srcPath).removeLastSegments(1).toOSString();
+				value = IPath.fromOSString(srcPath).removeLastSegments(1).toOSString();
 				ProjectFolderPickerDialog.super.okPressed();
 			}
 		});
@@ -210,7 +209,7 @@ protected Control createDialogArea(Composite parent) {
 
 		if (srcPath != null) {
 
-			IPath path = Path.fromOSString(srcPath);
+			IPath path = IPath.fromOSString(srcPath);
 
 			Composite compPath = new Composite(ret, SWT.NONE);
 			compPath.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index fd966dfa2c..96cf24d11d 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -25,9 +25,9 @@
 import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
@@ -108,7 +108,8 @@ public void resourceChanged(IResourceChangeEvent event) {
 				return;
 			}
 
-			IResourceDelta delta = event.getDelta().findMember(new Path(resource.getURI().toPlatformString(false)));
+			IResourceDelta delta = event.getDelta()
+					.findMember(IPath.fromOSString(resource.getURI().toPlatformString(false)));
 			if (delta == null) {
 				return;
 			}
diff --git a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 5fe81ed2d4..b3b3fbb4a5 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-frien
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
- org.eclipse.equinox.common;bundle-version="3.6.0",
+ org.eclipse.equinox.common;bundle-version="3.18.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0"
 Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml
diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java
index c7e23f29bc..8e4935249d 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java
+++ b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java
@@ -5,7 +5,7 @@
 import java.util.Map;
 
 import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
@@ -24,7 +24,7 @@ public void activate(BundleContext context, Map<String, String> properties) {
 
 	@Override
 	public Image getImage(Display display, String key) {
-		final URL url = FileLocator.find(context.getBundle(), new Path(properties.get(key)), null);
+		final URL url = FileLocator.find(context.getBundle(), IPath.fromOSString(properties.get(key)), null);
 
 		if (url != null) {
 			try (InputStream stream = url.openStream()) {
diff --git a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index dd0396267d..ea35540221 100644
--- a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
 Bundle-Version: 4.10.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
- org.eclipse.core.runtime;bundle-version="3.6.0",
+ org.eclipse.core.runtime;bundle-version="3.27.0",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
  org.eclipse.core.resources;bundle-version="3.6.0",
  org.eclipse.jdt.core;bundle-version="3.6.0",
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index 6b96776214..919227713e 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -26,9 +26,9 @@
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.emf.common.util.URI;
@@ -214,13 +214,13 @@ protected IFile getModelFile() throws CoreException {
 		final String containerName = page.getContainerName();
 		final String fileName = page.getFileName();
 		final IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		final IResource resource = root.findMember(new Path(containerName));
+		final IResource resource = root.findMember(IPath.fromOSString(containerName));
 		if (!resource.exists() || !(resource instanceof IContainer)) {
 			throwCoreException("Container \"" + containerName //$NON-NLS-1$
 					+ "\" does not exist."); //$NON-NLS-1$
 		}
 		final IContainer container = (IContainer) resource;
-		return container.getFile(new Path(fileName));
+		return container.getFile(IPath.fromOSString(fileName));
 	}
 
 	private void throwCoreException(String message) throws CoreException {
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
index 8255196519..6bc481435a 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
@@ -16,7 +16,7 @@
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaModelException;
@@ -156,7 +156,7 @@ private void handleBrowse() {
 		if (dialog.open() == Window.OK) {
 			final Object[] result = dialog.getResult();
 			if (result.length == 1) {
-				containerText.setText(((Path) result[0]).toString());
+				containerText.setText(((IPath) result[0]).toString());
 			}
 		}
 	}
@@ -167,7 +167,7 @@ private void handleBrowse() {
 
 	private void dialogChanged() {
 		final IResource container = ResourcesPlugin.getWorkspace().getRoot()
-				.findMember(new Path(getContainerName()));
+				.findMember(IPath.fromOSString(getContainerName()));
 		final String fileName = getFileName();
 
 		if (getContainerName().length() == 0) {

From 4859cfab9ba232469a2437adf4fcd0320883fc42 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Sun, 25 Jun 2023 15:34:22 +0200
Subject: [PATCH 1245/1286] Version bumps for 4.29 stream

---
 .../bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF  | 2 +-
 tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index b3b3fbb4a5..71d3629992 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
-Bundle-Version: 4.10.0.qualifier
+Bundle-Version: 4.10.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.emf.ui",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
diff --git a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index ea35540221..e53f0c17d8 100644
--- a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 4.10.0.qualifier
+Bundle-Version: 4.10.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.27.0",

From e2c5e7d8a22b9f90517eccc575902e5eef9694f9 Mon Sep 17 00:00:00 2001
From: Andrey Loskutov <loskutov@gmx.de>
Date: Fri, 30 Jun 2023 16:07:26 +0200
Subject: [PATCH 1246/1286] Touch bundles affected by the new ecj version

See https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
---
 tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF | 2 +-
 .../org.eclipse.e4.tools.compat/forceQualifierUpdate.txt       | 3 ++-
 .../forceQualifierUpdate.txt                                   | 2 ++
 .../org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt | 1 +
 .../org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt       | 3 ++-
 .../org.eclipse.e4.tools.persistence/forceQualifierUpdate.txt  | 2 ++
 .../org.eclipse.e4.tools.services/forceQualifierUpdate.txt     | 3 ++-
 tools/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt    | 3 ++-
 8 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 tools/bundles/org.eclipse.e4.tools.compatibility.migration/forceQualifierUpdate.txt
 create mode 100644 tools/bundles/org.eclipse.e4.tools.persistence/forceQualifierUpdate.txt

diff --git a/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 8a0c227aa2..7f88f87ce7 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 4.9.0.qualifier
+Bundle-Version: 4.9.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
index 342969748c..b860691270 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
+++ b/tools/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
@@ -1,4 +1,5 @@
 # To force a version qualifier update add the bug here
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
 Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
-Bug 539713 - Comparator Error in I20181001-1800 Build
\ No newline at end of file
+Bug 539713 - Comparator Error in I20181001-1800 Build
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/forceQualifierUpdate.txt
new file mode 100644
index 0000000000..eb8a04008a
--- /dev/null
+++ b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt
index 14243173d2..6aec2518a4 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt
@@ -1,3 +1,4 @@
 # To force a version qualifier update add the bug here
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
 Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
index 818aedda92..eea4f766dd 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
@@ -4,4 +4,5 @@ Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
 Bug 491534 - comparator error in org.eclipse.e4.tools.emf.ui
 Bug 534597 - Unanticipated comparator errors in I20180511-2000
 Bug 562167 - Comparator errors in I20200415-0620
-Bug 566471 - I20200828-0150 - Comparator Errors Found
\ No newline at end of file
+Bug 566471 - I20200828-0150 - Comparator Errors Found
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools.persistence/forceQualifierUpdate.txt
new file mode 100644
index 0000000000..eb8a04008a
--- /dev/null
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
diff --git a/tools/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
index eff8570a29..c8b95be656 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
+++ b/tools/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
@@ -2,4 +2,5 @@
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
 Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
 Bug 509973 - Comparator errors in I20170105-0320
-Bug 534597 - Unanticipated comparator errors in I20180511-2000
\ No newline at end of file
+Bug 534597 - Unanticipated comparator errors in I20180511-2000
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
diff --git a/tools/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
index 738f004f8e..5a9a61516d 100644
--- a/tools/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
+++ b/tools/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
@@ -1,4 +1,5 @@
 # To force a version qualifier update add the bug here
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
 Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
-Bug 567095 - Comparator errors in I20200917-1800
\ No newline at end of file
+Bug 567095 - Comparator errors in I20200917-1800
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184

From fe1f7036e3edf92cca6586fa48f785e22376e6b1 Mon Sep 17 00:00:00 2001
From: Andrey Loskutov <loskutov@gmx.de>
Date: Fri, 30 Jun 2023 16:41:50 +0200
Subject: [PATCH 1247/1286] Fixed javadoc errors reported by Java 17

Caused by
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/1189
---
 .../e4/tools/services/impl/ResourceBundleHelper.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
index df38aa8e72..2f66179b19 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
+++ b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
@@ -42,6 +42,7 @@ public class ResourceBundleHelper {
 	 * <p>
 	 * If the value for this system property is set to an empty String the default search order for ResourceBundles is
 	 * used:
+	 * </p>
 	 * <ul>
 	 * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
 	 * <li>bn + Ls + "_" + Cs</li>
@@ -51,11 +52,13 @@ public class ResourceBundleHelper {
 	 * <li>bn + Ld</li>
 	 * <li>bn</li>
 	 * </ul>
+	 * <p>
 	 * Where bn is this bundle's localization basename, Ls, Cs and Vs are the specified locale (language, country,
 	 * variant) and Ld, Cd and Vd are the default locale (language, country, variant).
 	 * </p>
 	 * <p>
 	 * If Ls equals the value of <code>equinox.root.locale</code> then the following search order is used:
+	 * </p>
 	 * <ul>
 	 * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
 	 * <li>bn + Ls + "_" + Cs</li>
@@ -66,7 +69,6 @@ public class ResourceBundleHelper {
 	 * <li>bn + Ld</li>
 	 * <li>bn</li>
 	 * </ul>
-	 * </p>
 	 * If <code>equinox.root.locale=en</code> and en_XX or en is asked for then this allows the root file to be used
 	 * instead of
 	 * falling back to the default locale.
@@ -128,6 +130,7 @@ public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale lo
 	 * <p>
 	 * If the value for this system property is set to an empty String the default search order for ResourceBundles is
 	 * used:
+	 * </p>
 	 * <ul>
 	 * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
 	 * <li>bn + Ls + "_" + Cs</li>
@@ -139,9 +142,9 @@ public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale lo
 	 * </ul>
 	 * Where bn is this bundle's localization basename, Ls, Cs and Vs are the specified locale (language, country,
 	 * variant) and Ld, Cd and Vd are the default locale (language, country, variant).
-	 * </p>
 	 * <p>
 	 * If Ls equals the value of <code>equinox.root.locale</code> then the following search order is used:
+	 * </p>
 	 * <ul>
 	 * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
 	 * <li>bn + Ls + "_" + Cs</li>
@@ -152,7 +155,6 @@ public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale lo
 	 * <li>bn + Ld</li>
 	 * <li>bn</li>
 	 * </ul>
-	 * </p>
 	 * If <code>equinox.root.locale=en</code> and en_XX or en is asked for then this allows the root file to be used
 	 * instead of
 	 * falling back to the default locale.
@@ -178,6 +180,7 @@ public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale lo
 	 * <p>
 	 * If the value for this system property is set to an empty String the default search order for ResourceBundles is
 	 * used:
+	 * </p>
 	 * <ul>
 	 * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
 	 * <li>bn + Ls + "_" + Cs</li>
@@ -189,9 +192,9 @@ public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale lo
 	 * </ul>
 	 * Where bn is this bundle's localization basename, Ls, Cs and Vs are the specified locale (language, country,
 	 * variant) and Ld, Cd and Vd are the default locale (language, country, variant).
-	 * </p>
 	 * <p>
 	 * If Ls equals the value of <code>equinox.root.locale</code> then the following search order is used:
+	 * </p>
 	 * <ul>
 	 * <li>bn + Ls + "_" + Cs + "_" + Vs</li>
 	 * <li>bn + Ls + "_" + Cs</li>
@@ -202,7 +205,6 @@ public static ResourceBundle getEquinoxResourceBundle(String baseName, Locale lo
 	 * <li>bn + Ld</li>
 	 * <li>bn</li>
 	 * </ul>
-	 * </p>
 	 * If <code>equinox.root.locale=en</code> and en_XX or en is asked for then this allows the root file to be used
 	 * instead of
 	 * falling back to the default locale.

From 32ad093b0fc055845a60290ec0ec9dcef709c847 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Fri, 23 Jun 2023 22:47:27 +0200
Subject: [PATCH 1248/1286] Replace usages of deprecated ResourceManager
 methods

and specify the type-parameter for DeviceResourceDescriptor in tests.
---
 .../e4/tools/emf/ui/internal/common/ComponentLabelProvider.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index b374b800bd..bc0781fbc7 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -137,7 +137,7 @@ public Image getImage(Object element) {
 	@Override
 	public Font getFont(Object element) {
 		if (element instanceof VirtualEntry) {
-			return resourceManager.createFont(italicFontDescriptor);
+			return resourceManager.create(italicFontDescriptor);
 		}
 		return null;
 	}

From 476512b68b342605bffff778e5934f54a1ca4538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?=
 =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?=
 <akurtakov@gmail.com>
Date: Mon, 3 Jul 2023 18:30:01 +0300
Subject: [PATCH 1249/1286] Javadoc fixes

While editing the files some other minor modifications like pattern
matching and using APIs that reduce type casting.
---
 .../tools/emf/ui/internal/StringMatcher.java  |  8 +-----
 .../emf/ui/internal/common/E4PickList.java    | 27 +++++++------------
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
index 36ba4f4f4c..e92da31790 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
@@ -409,19 +409,13 @@ protected int regExpPosIn(String text, int start, int end, String p) {
 
 	/**
 	 *
-	 * @return boolean
 	 * @param text
 	 *            a String to match
-	 * @param start
+	 * @param tStart
 	 *            int that indicates the starting index of match, inclusive
-	 * @param end
-	 *            </code> int that indicates the ending index of match,
-	 *            exclusive
 	 * @param p
 	 *            String, String, a simple regular expression that may contain
 	 *            '?'
-	 * @param ignoreCase
-	 *            boolean indicating wether code>p</code> is case sensitive
 	 */
 	protected boolean regExpRegionMatches(String text, int tStart, String p, int pStart, int plen) {
 		while (plen-- > 0) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
index d73df89cd5..b402ad2c19 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2015 TwelveTone LLC and others.
+ * Copyright (c) 2014, 2023 TwelveTone LLC and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -78,9 +78,9 @@ public class E4PickList extends AbstractPickList {
 	TableViewerFocusCellManager focusCellMgr;
 
 	public static class Struct {
-		final public String label;
-		final public EClass eClass;
-		final public boolean separator;
+		public final String label;
+		public final EClass eClass;
+		public final boolean separator;
 
 		public Struct(String label, EClass eClass, boolean separator) {
 			this.label = label;
@@ -134,11 +134,9 @@ public void update(ViewerCell cell) {
 		viewer.setLabelProvider(observableLabelProvider);
 
 		viewer.addOpenListener(event -> {
-			if (event.getSelection() instanceof IStructuredSelection) {
-				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+			if (event.getSelection() instanceof IStructuredSelection selection) {
 				ModelEditor editor = componentEditor.getEditor();
-				if (selection.getFirstElement() instanceof EObject && editor != null) {
-					EObject selected = (EObject) selection.getFirstElement();
+				if (selection.getFirstElement() instanceof EObject selected && editor != null) {
 					editor.gotoEObject(ModelEditor.TAB_FORM, selected);
 				}
 			}
@@ -155,10 +153,6 @@ public void update(ViewerCell cell) {
 
 	/**
 	 * Used for StringToString maps
-	 *
-	 * @param obj
-	 * @param container
-	 * @param i
 	 */
 	protected void tryEObjectMove(Object obj, EObject container, int delta) {
 		final List<?> l = (List<?>) container.eGet(feature);
@@ -177,7 +171,7 @@ protected void tryEObjectMove(Object obj, EObject container, int delta) {
 	@Override
 	protected void addPressed() {
 		if (!picker.getSelection().isEmpty()) {
-			final Struct struct = (Struct) ((IStructuredSelection) picker.getSelection()).getFirstElement();
+			final Struct struct = (Struct) picker.getStructuredSelection().getFirstElement();
 			final EClass eClass = struct.eClass;
 			_handleAdd(eClass, struct.separator);
 		}
@@ -198,8 +192,7 @@ protected void _handleAdd(EClass eClass, boolean separator) {
 	}
 
 	protected void setElementId(Object element) {
-		if (componentEditor.getEditor().isAutoCreateElementId() && element instanceof MApplicationElement) {
-			final MApplicationElement el = (MApplicationElement) element;
+		if (componentEditor.getEditor().isAutoCreateElementId() && element instanceof MApplicationElement el) {
 			if (el.getElementId() == null || el.getElementId().trim().length() == 0) {
 				el.setElementId(Util.getDefaultElementId(
 						((EObject) componentEditor.getMaster().getValue()).eResource(), el, componentEditor.getEditor()
@@ -254,7 +247,7 @@ protected void moveUpPressed() {
 	@Override
 	protected void moveDownPressed() {
 		if (!viewer.getSelection().isEmpty()) {
-			final IStructuredSelection s = (IStructuredSelection) viewer.getSelection();
+			final IStructuredSelection s = viewer.getStructuredSelection();
 			if (s.size() == 1) {
 				final Object obj = s.getFirstElement();
 				final Object container = componentEditor.getMaster().getValue();
@@ -290,7 +283,7 @@ protected void moveDownPressed() {
 	@Override
 	protected void removePressed() {
 		if (!viewer.getSelection().isEmpty()) {
-			final List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList();
+			final List<?> keybinding = viewer.getStructuredSelection().toList();
 			final Command cmd = RemoveCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster()
 					.getValue(), feature, keybinding);
 			if (cmd.canExecute()) {

From 3fa775185bb9470c2f146da3de9c0befff37a2cf Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Sat, 8 Jul 2023 08:59:06 +0200
Subject: [PATCH 1250/1286] Remove unnecessary 'Bundle-ClassPath: .'
 MANIFEST.MF entries

The default value of 'Bundle-ClassPath' is the dot which is used when
the header is not specified. Therefore there is no need to specify it
with that value.
---
 tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF   | 1 -
 .../org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF        | 1 -
 2 files changed, 2 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index cb1b9f5f80..a5901d3d8c 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
 Bundle-Version: 4.8.100.qualifier
-Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
index 412d36b42b..e9a64a5937 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.persistence;singleton:=true
 Automatic-Module-Name: org.eclipse.e4.tools.persistence
 Bundle-Version: 1.1.100.qualifier
-Bundle-ClassPath: .
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)",

From 62be2bbba311c61cc8f1c77c06c8a55aae096e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= <jkubitz-eclipse@gmx.de>
Date: Thu, 20 Jul 2023 15:48:42 +0200
Subject: [PATCH 1251/1286] Refactor XML handling

---
 .../org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF   |  2 +-
 .../META-INF/MANIFEST.MF                               |  2 +-
 .../META-INF/MANIFEST.MF                               |  2 +-
 .../org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF   |  2 +-
 .../emf/ui/internal/common/component/tabs/DocUtil.java |  5 +++--
 .../emf/ui/internal/common/component/tabs/ListTab.java | 10 ++++++----
 .../TargetPlatformContributionCollector.java           |  7 ++++---
 .../META-INF/MANIFEST.MF                               |  2 +-
 .../META-INF/MANIFEST.MF                               |  2 +-
 .../bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF  |  2 +-
 .../META-INF/MANIFEST.MF                               |  2 +-
 .../META-INF/MANIFEST.MF                               |  2 +-
 12 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 7f88f87ce7..f964cdade1 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
 Bundle-Version: 4.9.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
- org.eclipse.core.runtime;bundle-version="3.6.0",
+ org.eclipse.core.runtime;bundle-version="3.29.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",
  org.eclipse.e4.core.services;bundle-version="0.9.1",
  org.eclipse.e4.ui.services;bundle-version="0.9.1",
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
index edd25d5abe..6cab2c14c9 100644
--- a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Version: 1.1.100.qualifier
 Automatic-Module-Name: org.eclipse.e4.tools.compatibiliy.migration
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.e4.tools.persistence;bundle-version="1.0.0",
- org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.e4.ui.workbench;bundle-version="[1.10.0,2.0.0)",
  org.eclipse.ui;bundle-version="[3.110.0,4.0.0)",
  org.eclipse.e4.core.contexts
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 2b57c71265..6c316eab05 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
 Bundle-Version: 4.9.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
- org.eclipse.core.runtime;bundle-version="3.6.0",
+ org.eclipse.core.runtime;bundle-version="3.29.0",
  org.eclipse.emf.common;bundle-version="2.6.0",
  org.eclipse.core.databinding.observable;bundle-version="1.3.0",
  org.eclipse.e4.tools.emf.ui;bundle-version="0.9.0",
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index a5901d3d8c..e44355994e 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 4.8.100.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.27.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0",
  org.eclipse.core.databinding.property;bundle-version="1.2.100",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
  org.eclipse.jface.databinding;bundle-version="1.4.0",
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
index 45d7a567cc..ea2257626d 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
 
-import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -25,6 +25,7 @@
  * @author Steven Spungin
  *
  */
+@SuppressWarnings("restriction")
 public class DocUtil {
 
 	public static Element createChild(Element parent, String name) {
@@ -34,7 +35,7 @@ public static Element createChild(Element parent, String name) {
 	}
 
 	public static Document createDocument(String name) throws ParserConfigurationException {
-		Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+		Document doc = org.eclipse.core.internal.runtime.XmlProcessorFactory.newDocumentWithErrorOnDOCTYPE();
 		doc.appendChild(doc.createElement(name));
 		return doc;
 	}
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index fa388e47d1..3c9e0bd9ab 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -29,7 +29,6 @@
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
-import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
@@ -250,8 +249,9 @@ private void loadSettings() {
 		final String xml = pref.get("list-tab-xml", ""); //$NON-NLS-1$ //$NON-NLS-2$
 		if (E.notEmpty(xml)) {
 			try {
-				final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder()
-						.parse(new InputSource(new StringReader(xml)));
+				@SuppressWarnings("restriction")
+				final Document doc = org.eclipse.core.internal.runtime.XmlProcessorFactory
+						.parseWithErrorOnDOCTYPE(new InputSource(new StringReader(xml)));
 				final XPath xpath = XPathFactory.newInstance().newXPath();
 				NodeList list;
 				if (restoreColumns) {
@@ -323,7 +323,9 @@ private void loadSettings() {
 
 	// @Refactor
 	static private String docToString(Document doc) throws TransformerException {
-		final TransformerFactory tf = TransformerFactory.newInstance();
+		@SuppressWarnings("restriction")
+		final TransformerFactory tf = org.eclipse.core.internal.runtime.XmlProcessorFactory
+				.createTransformerFactoryWithErrorOnDOCTYPE();
 		final Transformer transformer = tf.newTransformer();
 		transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); //$NON-NLS-1$
 		final StringWriter writer = new StringWriter();
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
index 7fc73baa9c..358d008773 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
@@ -36,11 +36,11 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathFactory;
 
+import org.eclipse.core.internal.runtime.XmlProcessorFactory;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.runtime.IPath;
@@ -85,6 +85,7 @@
  * @author Steven Spungin
  *
  */
+@SuppressWarnings("restriction")
 public abstract class TargetPlatformContributionCollector extends ClassContributionCollector {
 
 	CopyOnWriteArrayList<Entry> cacheEntry = new CopyOnWriteArrayList<>();
@@ -588,8 +589,8 @@ static private List<String> getOutputDirectories(String installLocation) {
 			ret = new ArrayList<>();
 			outputDirectories.put(installLocation, ret);
 			try {
-				final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder()
-						.parse(new File(installLocation + File.separator + ".classpath")); //$NON-NLS-1$
+				File file = new File(installLocation + File.separator + ".classpath"); //$NON-NLS-1$
+				final Document doc = XmlProcessorFactory.parseWithErrorOnDOCTYPE(file);
 				final XPath xp = XPathFactory.newInstance().newXPath();
 				final NodeList list = (NodeList) xp.evaluate(
 						"//classpathentry[@kind='output']/@path", doc, XPathConstants.NODESET); //$NON-NLS-1$
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index c1983c17bc..6d3d440b98 100644
--- a/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.20.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
  org.eclipse.jface.text;bundle-version="3.6.0",
  org.eclipse.jdt.core;bundle-version="3.6.0",
- org.eclipse.core.runtime;bundle-version="3.6.0"
+ org.eclipse.core.runtime;bundle-version="3.29.0"
 Export-Package: org.eclipse.e4.internal.tools.jdt.templates;version="0.12.0.qualifier";x-internal:=true
 Bundle-Vendor: %providerName
 Automatic-Module-Name: org.eclipse.e4.tools.jdt.templates
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
index e9a64a5937..ed85e7c877 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Automatic-Module-Name: org.eclipse.e4.tools.persistence
 Bundle-Version: 1.1.100.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.e4.ui.model.workbench;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
  org.eclipse.e4.core.contexts;bundle-version="[1.8.0,2.0.0)",
diff --git a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index e53f0c17d8..e2b4dd2492 100644
--- a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
 Bundle-Version: 4.10.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
- org.eclipse.core.runtime;bundle-version="3.27.0",
+ org.eclipse.core.runtime;bundle-version="3.29.0",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
  org.eclipse.core.resources;bundle-version="3.6.0",
  org.eclipse.jdt.core;bundle-version="3.6.0",
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF
index c4edd6744d..c33550059a 100644
--- a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF
+++ b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.swt;bundle-version="[3.110.0,4.0.0)",
  org.eclipse.e4.tools.compatibility.migration;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.e4.ui.model.workbench;bundle-version="[2.1.0,3.0.0)",
  org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.ui.tests.harness;bundle-version="[1.8.100,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Import-Package: org.junit.jupiter.api;version="[5.8.1,6.0.0)"
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF b/tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF
index 81639c9433..415329bc19 100644
--- a/tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF
+++ b/tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Vendor: Eclipse.org
 Bundle-Version: 1.1.0.qualifier
 Automatic-Module-Name: org.eclipse.e4.tools.persistence.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0",
  org.eclipse.ui;bundle-version="3.201.0",
  org.junit;bundle-version="4.13.2",
  org.eclipse.swt,

From 105488c2af0abd86c315fc657b412aba3c95894b Mon Sep 17 00:00:00 2001
From: Andrey Loskutov <loskutov@gmx.de>
Date: Tue, 1 Aug 2023 11:22:43 +0200
Subject: [PATCH 1252/1286] Fixed version of org.eclipse.e4.tools.jdt.templates

Only qualifier changed for
(org.eclipse.e4.tools.jdt.templates/4.10.0.v20230727-0604). Expected to
have bigger x.y.z than what is available in baseline
(4.10.0.v20230414-0427)

Regression from 62be2bbba311c61cc8f1c77c06c8a55aae096e9d

Fixes https://github.com/eclipse-platform/eclipse.platform.ui/issues/981
---
 .../org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index 6d3d440b98..1223fc000c 100644
--- a/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
-Bundle-Version: 4.10.0.qualifier
+Bundle-Version: 4.10.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.20.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",

From 0b88afa07f1f8ca82e82c857708b4e913bf4a61e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= <jkubitz-eclipse@gmx.de>
Date: Tue, 1 Aug 2023 13:55:36 +0200
Subject: [PATCH 1253/1286] update to org.eclipse.emf.ecore 2.35.0

---
 .../org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
index ed85e7c877..05f50a6fb1 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Version: 1.1.100.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.35.0,3.0.0)";visibility:=reexport,
  org.eclipse.e4.ui.model.workbench;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
  org.eclipse.e4.core.contexts;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.e4.ui.workbench;bundle-version="[1.10.0,2.0.0)",

From 70d7d440f013894ed9d9c1f45b0648a32f8e828e Mon Sep 17 00:00:00 2001
From: Rahul Mohanan <121536011+MohananRahul@users.noreply.github.com>
Date: Mon, 4 Sep 2023 18:33:42 +0530
Subject: [PATCH 1254/1286] POM and product version changes for 4.30 release
 (#1081)

Tracked in
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1289
---
 tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml               | 2 +-
 tools/features/org.eclipse.e4.core.tools.feature/feature.xml    | 2 +-
 .../org.eclipse.e4.tools.compatibility.migration.tests/pom.xml  | 2 +-
 tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml      | 2 +-
 tools/tests/org.eclipse.e4.tools.test/pom.xml                   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index d163314602..d2167fe7b6 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
   	<groupId>org.eclipse.platform</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.29.0-SNAPSHOT</version>
+    <version>4.30.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/tools/features/org.eclipse.e4.core.tools.feature/feature.xml b/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
index c009d5d9f3..949e437cdf 100644
--- a/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.29.0.qualifier"
+      version="4.30.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
index d33cf1d2ee..1951037237 100644
--- a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
+++ b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.eclipse.platform</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.29.0-SNAPSHOT</version>
+		<version>4.30.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.e4.tools.compatibility.migration.tests</artifactId>
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml b/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
index b9af5c530e..83f4de969b 100644
--- a/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
+++ b/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.eclipse.platform</groupId>
   		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.29.0-SNAPSHOT</version>
+		<version>4.30.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.e4.tools.persistence.tests</artifactId>
diff --git a/tools/tests/org.eclipse.e4.tools.test/pom.xml b/tools/tests/org.eclipse.e4.tools.test/pom.xml
index 88fa87e157..7344362750 100644
--- a/tools/tests/org.eclipse.e4.tools.test/pom.xml
+++ b/tools/tests/org.eclipse.e4.tools.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 	<groupId>org.eclipse.platform</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.29.0-SNAPSHOT</version>
+		<version>4.30.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

From 04c55aca40b71bfbe5b15a718a52c4caa32bdf1e Mon Sep 17 00:00:00 2001
From: Ed Merks <Ed.Merks@gmail.com>
Date: Wed, 13 Sep 2023 19:24:15 +0200
Subject: [PATCH 1255/1286] Remove bundle org.w3c.css.sac require (#1113)

Replace with org.w3c.css.sac package import where needed

https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1349
---
 .../org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 6c316eab05..f475e537b4 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 4.9.100.qualifier
+Bundle-Version: 4.9.200.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.29.0",
@@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.ui.workbench;bundle-version="0.9.1",
  org.eclipse.e4.ui.css.core;bundle-version="0.9.0",
  org.eclipse.e4.ui.css.swt;bundle-version="0.9.1",
- org.w3c.css.sac;bundle-version="1.3.0",
  org.eclipse.pde.core;bundle-version="3.6.0",
  org.eclipse.core.resources;bundle-version="3.6.0",
  org.eclipse.jdt.core;bundle-version="3.6.0",

From 9fd2b625e730a74e8101889e07073c619fa02f39 Mon Sep 17 00:00:00 2001
From: Andrey Loskutov <loskutov@gmx.de>
Date: Thu, 21 Sep 2023 10:28:01 +0200
Subject: [PATCH 1256/1286] Touch bundles affected by changed bytecode
 generation

See https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1378
---
 tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF  | 2 +-
 .../org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt        | 1 +
 tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml               | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index e44355994e..6fbda01b8e 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.8.100.qualifier
+Bundle-Version: 4.8.200.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
index eea4f766dd..ac6e423562 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
@@ -6,3 +6,4 @@ Bug 534597 - Unanticipated comparator errors in I20180511-2000
 Bug 562167 - Comparator errors in I20200415-0620
 Bug 566471 - I20200828-0150 - Comparator Errors Found
 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1378
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index d2167fe7b6..8b6c556b09 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.8.100-SNAPSHOT</version>
+  <version>4.8.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>

From c03c21c65d0ca9b2cf75b3bb313c4e0f9f31606c Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 6 Oct 2023 13:03:33 +0200
Subject: [PATCH 1257/1286] Use pomless build for org.eclipse.e4.tools.test

---
 .../META-INF/MANIFEST.MF                      |  2 +-
 tools/tests/org.eclipse.e4.tools.test/pom.xml | 20 -------------------
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 tools/tests/org.eclipse.e4.tools.test/pom.xml

diff --git a/tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF b/tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
index ae80a32576..a1d43fe9bf 100644
--- a/tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
+++ b/tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.e4.tools.test
 Bundle-Vendor: Eclipse.org
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.100.qualifier
 Fragment-Host: org.eclipse.e4.tools;bundle-version="4.7.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.junit;bundle-version="4.0.0",
diff --git a/tools/tests/org.eclipse.e4.tools.test/pom.xml b/tools/tests/org.eclipse.e4.tools.test/pom.xml
deleted file mode 100644
index 7344362750..0000000000
--- a/tools/tests/org.eclipse.e4.tools.test/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	<groupId>org.eclipse.platform</groupId>
-		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.30.0-SNAPSHOT</version>
-		<relativePath>../../</relativePath>
-	</parent>
-
-	<artifactId>org.eclipse.e4.tools.test</artifactId>
-	<version>1.3.0-SNAPSHOT</version>
-
-	<packaging>eclipse-test-plugin</packaging>
-
-	<properties>
-		<skipAPIAnalysis>true</skipAPIAnalysis> <!-- Not in baseline -->
-	</properties>
-</project>

From cdcd9a5c5e5c917ff35fec89267175fad9f2ac08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Fri, 20 Oct 2023 19:34:37 +0200
Subject: [PATCH 1258/1286] Use PDEProject.getManifest(project) instead of hard
 coded location

Currently a hardcoded location is used but PDE can configure the
location of the manifest.

This replace the hardcoded string by the appropriate method from PDE to
determine the real location

Fix https://github.com/eclipse-platform/eclipse.platform.ui/issues/1236
---
 .../common/component/dialogs/FilteredContributionDialog.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index 73f0ac5e75..840d94e61f 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -1034,8 +1034,7 @@ static public String getBundle(IFile file) {
 	}
 
 	static String getBundle(IProject project) {
-		final IFile f = project.getFile("/META-INF/MANIFEST.MF"); //$NON-NLS-1$
-
+		final IFile f = PDEProject.getManifest(project);
 		if (f != null && f.exists()) {
 			try (final InputStream s = f.getContents();
 					BufferedReader r = new BufferedReader(new InputStreamReader(s));) {

From 6fa77f63cbfac0f6178a293fc8852cb3a5d5dbc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= <jkubitz-eclipse@gmx.de>
Date: Fri, 29 Sep 2023 10:01:36 +0200
Subject: [PATCH 1259/1286] Clean Up: Add final modifier to private fields

---
 .../e4/tools/compat/internal/CutAction.java    |  2 +-
 .../e4/tools/compat/internal/PasteAction.java  |  2 +-
 .../e4/tools/compat/parts/DIViewPart.java      |  2 +-
 .../common/ClassContributionCollector.java     |  4 ++--
 .../ui/internal/common/E4StringPickList.java   |  8 ++++----
 .../emf/ui/internal/common/VirtualEntry.java   | 10 +++++-----
 .../common/component/StringModelFragment.java  |  4 ++--
 .../component/dialogs/AbstractIconDialog.java  |  6 +++---
 .../AbstractIconDialogWithHardcodedScope.java  | 14 +++++++-------
 .../dialogs/ContributionClassDialog.java       |  8 ++++----
 .../FindParentReferenceElementDialog.java      |  2 +-
 .../KeyBindingCommandSelectionDialog.java      |  2 +-
 .../SaveDialogBoundsSettingsDialog.java        |  4 ++--
 .../tabs/empty/TitleAreaFilterDialog.java      |  2 +-
 .../internal/common/objectdata/JavaObject.java |  2 +-
 .../common/properties/ExportIdsHandler.java    | 14 +++++++-------
 .../properties/ExternalizeStringHandler.java   | 18 +++++++++---------
 .../ProjectOSGiTranslationProvider.java        |  2 +-
 .../dialogs/BundleClassDialog.java             |  2 +-
 .../dialogs/FindContributionDialog.java        | 16 ++++++++--------
 .../resourcelocator/dialogs/IconDialog.java    |  2 +-
 .../dialogs/PickProjectFolderPage.java         |  2 +-
 .../dialogs/ProjectFolderPickerDialog.java     |  4 ++--
 .../uistructure/WidgetLabelProvider.java       |  2 +-
 .../internal/common/xml/XMLConfiguration.java  |  2 +-
 .../internal/wbm/ApplicationModelEditor.java   |  2 +-
 .../model/NewContributionModelWizard.java      |  4 ++--
 27 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
index 8315494d58..9180461b6e 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
+++ b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
@@ -17,7 +17,7 @@
 import org.eclipse.jface.action.Action;
 
 public class CutAction extends Action {
-	private IClipboardService service;
+	private final IClipboardService service;
 
 	public CutAction(IClipboardService service) {
 		super(Messages.CutAction);
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
index 2496fe221a..220fe7fd52 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
+++ b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
@@ -17,7 +17,7 @@
 import org.eclipse.jface.action.Action;
 
 public class PasteAction extends Action {
-	private IClipboardService service;
+	private final IClipboardService service;
 	public PasteAction(IClipboardService service) {
 		super(Messages.PasteAction);
 		this.service = service;
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
index 771cf21f42..7421fc66ba 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
+++ b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
@@ -25,7 +25,7 @@
 
 public abstract class DIViewPart<C> extends ViewPart {
 	private IEclipseContext context;
-	private Class<C> clazz;
+	private final Class<C> clazz;
 	private C component;
 
 	public DIViewPart(Class<C> clazz) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
index f004380bde..a78f8defd4 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
@@ -22,8 +22,8 @@
 import org.eclipse.e4.tools.emf.ui.common.IModelElementProvider.ModelResultHandler;
 
 public class ClassContributionCollector {
-	private CopyOnWriteArrayList<IClassContributionProvider> providers = new CopyOnWriteArrayList<>();
-	private CopyOnWriteArrayList<IModelElementProvider> modelElementProviders = new CopyOnWriteArrayList<>();
+	private final CopyOnWriteArrayList<IClassContributionProvider> providers = new CopyOnWriteArrayList<>();
+	private final CopyOnWriteArrayList<IModelElementProvider> modelElementProviders = new CopyOnWriteArrayList<>();
 
 	public void addContributor(IClassContributionProvider contributor) {
 		providers.add(contributor);
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
index 23536a758c..a230da5047 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
@@ -52,10 +52,10 @@
  */
 public class E4StringPickList extends AbstractPickList {
 
-	private Text text;
-	private Button tiReplace;
-	private AbstractComponentEditor<?> editor;
-	private EStructuralFeature feature;
+	private final Text text;
+	private final Button tiReplace;
+	private final AbstractComponentEditor<?> editor;
+	private final EStructuralFeature feature;
 
 	@Deprecated
 	public E4StringPickList(Composite parent, int flags, List<PickListFeatures> list, Messages messages,
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
index 7c26874865..66c14387cc 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
@@ -28,11 +28,11 @@
  * @param <E> type of the child elements of the parent
  */
 public class VirtualEntry<P, E> {
-	private String id;
-	private P originalParent;
-	private String label;
-	private IObservableList<E> list;
-	private IListProperty<? super P, E> property;
+	private final String id;
+	private final P originalParent;
+	private final String label;
+	private final IObservableList<E> list;
+	private final IListProperty<? super P, E> property;
 
 	public VirtualEntry(String id, IListProperty<? super P, E> property, P originalParent, String label) {
 		this.id = id;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index a807e846a7..4d0814291b 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -459,8 +459,8 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 
 	static class StringModelFragmentProposalProvider implements IContentProposalProvider {
 
-		private StringModelFragment fragment;
-		private Text text;
+		private final StringModelFragment fragment;
+		private final Text text;
 
 		/**
 		 * Initialize the class passing the current instance.
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
index 1de80dff31..2fb1aa7183 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
@@ -25,9 +25,9 @@
 import org.eclipse.swt.widgets.Shell;
 
 public abstract class AbstractIconDialog extends AbstractIconDialogWithScopeAndFilter {
-	private MApplicationElement element;
-	private EStructuralFeature feature;
-	private EditingDomain editingDomain;
+	private final MApplicationElement element;
+	private final EStructuralFeature feature;
+	private final EditingDomain editingDomain;
 	// private Map<IFile, Image> icons = Collections.synchronizedMap(new
 	// HashMap<IFile, Image>());
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
index de7653363b..852597bea9 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
@@ -71,14 +71,14 @@
  */
 public abstract class AbstractIconDialogWithHardcodedScope extends SaveDialogBoundsSettingsDialog {
 	private TableViewer viewer;
-	private IProject project;
-	private Map<IFile, Image> icons = Collections.synchronizedMap(new HashMap<>());
+	private final IProject project;
+	private final Map<IFile, Image> icons = Collections.synchronizedMap(new HashMap<>());
 	private ResourceSearchScope searchScope = ResourceSearchScope.PROJECT;
 
 	protected Messages Messages;
 	private Text textSearch;
 	private String value;
-	private IEclipseContext context;
+	private final IEclipseContext context;
 
 	public AbstractIconDialogWithHardcodedScope(Shell parentShell, IEclipseContext context) {
 		super(parentShell);
@@ -192,7 +192,7 @@ public void update(ViewerCell cell) {
 
 		textSearch.addModifyListener(new ModifyListener() {
 			private IconMatchCallback callback;
-			private Timer timer = new Timer(true);
+			private final Timer timer = new Timer(true);
 			private TimerTask task;
 
 			@Override
@@ -274,7 +274,7 @@ public String getValue() {
 
 	private class IconMatchCallback {
 		private volatile boolean cancel;
-		private IObservableList<IFile> list;
+		private final IObservableList<IFile> list;
 
 		private IconMatchCallback(IObservableList<IFile> list) {
 			this.list = list;
@@ -293,8 +293,8 @@ private static class SearchThread extends TimerTask {
 		private final StringMatcher matcherGif;
 		private final StringMatcher matcherJpg;
 		private final StringMatcher matcherPng;
-		private IEclipseContext context;
-		private ResourceSearchScope searchScope;
+		private final IEclipseContext context;
+		private final ResourceSearchScope searchScope;
 
 		public SearchThread(IconMatchCallback callback, String pattern, IProject project, IEclipseContext context, ResourceSearchScope searchScope) {
 			this.context = context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index f96292f408..ec2fecaa79 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -37,10 +37,10 @@
 
 public class ContributionClassDialog extends FilteredContributionDialog {
 
-	private MApplicationElement contribution;
-	private EditingDomain editingDomain;
-	private EStructuralFeature feature;
-	private Messages Messages;
+	private final MApplicationElement contribution;
+	private final EditingDomain editingDomain;
+	private final EStructuralFeature feature;
+	private final Messages Messages;
 
 	public ContributionClassDialog(Shell parentShell, IEclipseContext context, EditingDomain editingDomain, MApplicationElement contribution, EStructuralFeature feature, Messages Messages) {
 		super(parentShell, context);
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index 81095d433c..d124e217ae 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -86,7 +86,7 @@ public class FindParentReferenceElementDialog extends SaveDialogBoundsSettingsDi
 	private ComboViewer eClassViewer;
 	private Text searchText;
 	private EClass selectedContainer;
-	private ClassContributionCollector collector;
+	private final ClassContributionCollector collector;
 
 	/** Remember of classes that can be used for a fragment definition. */
 	private static List<EClass> extendableClasses = null;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
index ecafda9f22..764ab227db 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
@@ -24,7 +24,7 @@
 import org.eclipse.swt.widgets.Shell;
 
 public class KeyBindingCommandSelectionDialog extends AbstractCommandSelectionDialog {
-	private MKeyBinding binding;
+	private final MKeyBinding binding;
 
 	public KeyBindingCommandSelectionDialog(Shell parentShell, MKeyBinding binding, IModelResource resource, Messages Messages) {
 		super(parentShell, resource, Messages);
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
index 3299b14e16..f9c220cc66 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
@@ -30,9 +30,9 @@ public abstract class SaveDialogBoundsSettingsDialog extends TitleAreaDialog {
 	private static final int DIALOG_MINIMUM_HEIGHT = 300;
 	private static final int DIALOG_MINIMUM_WIDTH = 400;
 
-	private IDialogSettings dialogSettings = new DialogSettings(Plugin.ID);
+	private final IDialogSettings dialogSettings = new DialogSettings(Plugin.ID);
 
-	private Preferences preferences = InstanceScope.INSTANCE.getNode(Plugin.ID);
+	private final Preferences preferences = InstanceScope.INSTANCE.getNode(Plugin.ID);
 
 	public SaveDialogBoundsSettingsDialog(Shell parentShell) {
 		super(parentShell);
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
index 94e21432e8..4787e1da16 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
@@ -40,7 +40,7 @@
  */
 public class TitleAreaFilterDialog extends TitleAreaDialog {
 
-	private ILabelProvider labelProvider;
+	private final ILabelProvider labelProvider;
 	private TableViewer viewer;
 	private Object result;
 	private Text text;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java
index a06040cb2a..754f556ef4 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java
@@ -5,7 +5,7 @@
 import java.util.List;
 
 public class JavaObject {
-	private Object instance;
+	private final Object instance;
 	private List<JavaAttribute> attributes;
 
 	public JavaObject(Object instance) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
index a5b5730326..e74fb80ada 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
@@ -79,10 +79,10 @@ public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell, @Transla
 	}
 
 	static class ExportIdDialog extends TitleAreaDialog {
-		private Messages messages;
-		private IObservableList<?> list;
-		private IResourcePool pool;
-		private JavaClass clazz;
+		private final Messages messages;
+		private final IObservableList<?> list;
+		private final IResourcePool pool;
+		private final JavaClass clazz;
 		private CheckboxTableViewer viewer;
 		private Text textClassName;
 
@@ -322,9 +322,9 @@ private static String replaceInvalidChar(String elementId) {
 	}
 
 	private static class Entry implements Comparable<Entry> {
-		private MApplicationElement object;
-		private String idFieldKey;
-		private String elementId;
+		private final MApplicationElement object;
+		private final String idFieldKey;
+		private final String elementId;
 
 		public Entry(MApplicationElement object, String idFieldKey, String elementId) {
 			this.object = object;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
index 32116da68b..cba89a92eb 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
@@ -57,12 +57,12 @@ public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell, @Transla
 	}
 
 	static class ExtractionDialog extends TitleAreaDialog {
-		private Messages messages;
-		private IObservableList<? extends EObject> list;
-		private IResourcePool pool;
-		private IProject project;
+		private final Messages messages;
+		private final IObservableList<? extends EObject> list;
+		private final IResourcePool pool;
+		private final IProject project;
 		private CheckboxTableViewer viewer;
-		private IModelResource resource;
+		private final IModelResource resource;
 
 		public ExtractionDialog(Shell parentShell, Messages messages, IModelResource resource,
 				IObservableList<? extends EObject> list, IResourcePool pool, IProject project) {
@@ -308,10 +308,10 @@ private static String findId(List<String> ids, String prefix) {
 	}
 
 	static class Entry {
-		private EObject object;
-		private EStructuralFeature feature;
-		private String key;
-		private String value;
+		private final EObject object;
+		private final EStructuralFeature feature;
+		private final String key;
+		private final String value;
 
 		public Entry(EObject object, EStructuralFeature feature, String key, String value) {
 			this.object = object;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
index 0648dbb990..edca51afb8 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
@@ -36,7 +36,7 @@ public class ProjectOSGiTranslationProvider extends ResourceBundleTranslationPro
 	/**
 	 * The {@link IProject} this translation provider is connected to
 	 */
-	private IProject project;
+	private final IProject project;
 	/**
 	 * The manifest header identifying the base name of the bundle's
 	 * localization entries.
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
index a70625489b..6bb7db853b 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
@@ -59,7 +59,7 @@ public class BundleClassDialog extends Dialog implements UriDialog {
 	private String clazz = ""; //$NON-NLS-1$
 	private String pakage = ""; //$NON-NLS-1$
 	protected boolean ignoreModify;
-	private IEclipseContext context;
+	private final IEclipseContext context;
 
 	static Pattern patternBundleClass = Pattern.compile("bundleclass:/*([^/]+)/((.*)\\.)?([^\\.]+)"); //$NON-NLS-1$
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
index c6659b8504..7a1defbf71 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
@@ -61,17 +61,17 @@
  *
  */
 public class FindContributionDialog extends TitleAreaDialog {
-	private IProject project;
+	private final IProject project;
 	private Image javaClassImage;
 	private TableViewer viewer;
-	private Messages Messages;
+	private final Messages Messages;
 	private String bundleclassUri;
 	@SuppressWarnings("unused")
-	private IEclipseContext context;
-	private String packageFilter;
-	private String bundleFilter;
-	private Bundle bundle;
-	private String mode;
+	private final IEclipseContext context;
+	private final String packageFilter;
+	private final String bundleFilter;
+	private final Bundle bundle;
+	private final String mode;
 	private Image titleImage;
 	private String platformUri;
 
@@ -389,7 +389,7 @@ public void setBundleclassUri(String bundleclass) {
 
 	private static class ContributionResultHandlerImpl implements ContributionResultHandler {
 		private boolean cancled = false;
-		private IObservableList<ContributionData> list;
+		private final IObservableList<ContributionData> list;
 
 		public ContributionResultHandlerImpl(IObservableList<ContributionData> list) {
 			this.list = list;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
index dfec05e740..7164a34ef2 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
@@ -55,7 +55,7 @@ public class IconDialog extends Dialog implements UriDialog {
 	private String icon = ""; //$NON-NLS-1$
 	private String path = ""; //$NON-NLS-1$
 	protected boolean ignoreModify;
-	private IEclipseContext context;
+	private final IEclipseContext context;
 
 	static Pattern patternIcon = Pattern.compile("platform:/plugin/*([^/]+)/((.*)/)?([^/]+)"); //$NON-NLS-1$
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
index 75e01f0057..3219f3f6ec 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
@@ -44,7 +44,7 @@ public class PickProjectFolderPage extends WizardPage {
 
 	private TreeViewer viewer;
 	private String value;
-	private IEclipseContext context;
+	private final IEclipseContext context;
 	private IPath path;
 
 	private Label label2;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
index 1b82f723ee..5fb1de2a54 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
@@ -46,8 +46,8 @@
 public class ProjectFolderPickerDialog extends TitleAreaDialog {
 
 	private TreeViewer viewer;
-	private IProject project;
-	private String srcPath;
+	private final IProject project;
+	private final String srcPath;
 	private String value;
 
 	protected ProjectFolderPickerDialog(Shell parentShell, IProject project, String srcPath) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
index b1811dca41..8a0cd1ca6a 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
@@ -32,7 +32,7 @@
 import org.eclipse.swt.widgets.Tree;
 
 public class WidgetLabelProvider extends StyledCellLabelProvider {
-	private IResourcePool resourcePool;
+	private final IResourcePool resourcePool;
 
 	public WidgetLabelProvider(IResourcePool resourcePool) {
 		this.resourcePool = resourcePool;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
index 4c82ebd882..3689a9e331 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
@@ -29,7 +29,7 @@ public class XMLConfiguration extends SourceViewerConfiguration {
 	private XMLDoubleClickStrategy doubleClickStrategy;
 	private XMLTagScanner tagScanner;
 	private XMLScanner scanner;
-	private IResourcePool pool;
+	private final IResourcePool pool;
 
 	public XMLConfiguration(IResourcePool pool) {
 		this.pool = pool;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index 96cf24d11d..acfca8ad3e 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -93,7 +93,7 @@ private void removeResourceListener() {
 	 * Listen for changes on the resource being edited. Will close the part if
 	 * the resource was deleted or the containing project was closed.
 	 */
-	private IResourceChangeListener listener = new IResourceChangeListener() {
+	private final IResourceChangeListener listener = new IResourceChangeListener() {
 		@Override
 		public void resourceChanged(IResourceChangeEvent event) {
 
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
index ec13d87930..e7312d6d5e 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
@@ -42,8 +42,8 @@ private enum ContributionMode {
 		STATIC(Messages.ContributionMode_Static, Messages.ContributionMode_Static_Info), DYNAMIC(
 				Messages.ContributionMode_Dynamic, Messages.ContributionMode_Dynamic_Info);
 
-		private String label;
-		private String description;
+		private final String label;
+		private final String description;
 
 		ContributionMode(String label, String description) {
 			this.label = label;

From 537f110b1522b5d6424b9ac0ee6debd6f28faabd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= <jkubitz-eclipse@gmx.de>
Date: Mon, 23 Oct 2023 11:28:17 +0200
Subject: [PATCH 1260/1286] version bumps

---
 tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF | 2 +-
 tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index f964cdade1..4607428a45 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 4.9.100.qualifier
+Bundle-Version: 4.9.200.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.29.0",
diff --git a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index e2b4dd2492..7c3043c492 100644
--- a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 4.10.100.qualifier
+Bundle-Version: 4.10.200.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.29.0",

From 53c70772578a3d5edcbebc7adfc6bcf319ccab74 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Sat, 28 Oct 2023 18:33:08 +0200
Subject: [PATCH 1261/1286] Migrate from javax.inject/annotation to
 jakarta.inject/annotation

Part of https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1056
---
 .../org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF   |  2 +-
 .../tools/compat/internal/DefaultLoggerProvider.java   |  4 ++--
 .../e4/tools/compat/internal/WorkbenchLogger.java      |  4 ++--
 .../org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF   |  4 ++--
 .../ui/common/component/AbstractComponentEditor.java   |  6 +++---
 .../e4/tools/emf/ui/internal/common/ModelEditor.java   | 10 +++++-----
 .../internal/common/component/AbstractPartEditor.java  |  4 ++--
 .../emf/ui/internal/common/component/AddonsEditor.java |  4 ++--
 .../internal/common/component/ApplicationEditor.java   |  6 +++---
 .../emf/ui/internal/common/component/AreaEditor.java   |  6 +++---
 .../common/component/BindingContextEditor.java         |  6 +++---
 .../internal/common/component/BindingTableEditor.java  |  6 +++---
 .../ui/internal/common/component/CategoryEditor.java   |  4 ++--
 .../ui/internal/common/component/CommandEditor.java    |  6 +++---
 .../common/component/CommandParameterEditor.java       |  4 ++--
 .../internal/common/component/CompositePartEditor.java |  6 +++---
 .../common/component/CoreExpressionEditor.java         |  4 ++--
 .../common/component/DirectMenuItemEditor.java         |  4 ++--
 .../common/component/DirectToolItemEditor.java         |  4 ++--
 .../component/DynamicMenuContributionEditor.java       |  4 ++--
 .../common/component/HandledMenuItemEditor.java        |  4 ++--
 .../common/component/HandledToolItemEditor.java        |  4 ++--
 .../ui/internal/common/component/HandlerEditor.java    |  4 ++--
 .../common/component/ImperativeExpressionEditor.java   |  4 ++--
 .../ui/internal/common/component/KeyBindingEditor.java |  6 +++---
 .../common/component/MenuContributionEditor.java       |  6 +++---
 .../emf/ui/internal/common/component/MenuEditor.java   |  6 +++---
 .../ui/internal/common/component/MenuItemEditor.java   |  6 +++---
 .../internal/common/component/MenuSeparatorEditor.java |  4 ++--
 .../common/component/ModelFragmentsEditor.java         |  4 ++--
 .../ui/internal/common/component/ParameterEditor.java  |  4 ++--
 .../common/component/PartDescriptorEditor.java         |  4 ++--
 .../common/component/PartSashContainerEditor.java      |  6 +++---
 .../ui/internal/common/component/PartStackEditor.java  |  6 +++---
 .../internal/common/component/PerspectiveEditor.java   |  6 +++---
 .../common/component/PerspectiveStackEditor.java       |  6 +++---
 .../internal/common/component/PlaceholderEditor.java   |  4 ++--
 .../ui/internal/common/component/PopupMenuEditor.java  |  4 ++--
 .../internal/common/component/StringModelFragment.java |  6 +++---
 .../common/component/ToolBarContributionEditor.java    |  6 +++---
 .../ui/internal/common/component/ToolBarEditor.java    |  6 +++---
 .../common/component/ToolBarSeparatorEditor.java       |  4 ++--
 .../internal/common/component/ToolControlEditor.java   |  4 ++--
 .../ui/internal/common/component/ToolItemEditor.java   |  4 ++--
 .../ui/internal/common/component/TrimBarEditor.java    |  6 +++---
 .../common/component/TrimContributionEditor.java       |  6 +++---
 .../internal/common/component/TrimmedWindowEditor.java |  4 ++--
 .../emf/ui/internal/common/component/WindowEditor.java |  6 +++---
 .../component/dialogs/ParameterIdSelectionDialog.java  |  4 ++--
 .../emf/ui/internal/common/component/tabs/ListTab.java |  7 ++++---
 .../emf/ui/internal/common/component/tabs/XmiTab.java  |  6 +++---
 .../common/component/virtual/AbstractVTrimEditor.java  |  4 ++--
 .../common/component/virtual/VApplicationAddons.java   |  6 +++---
 .../virtual/VApplicationCategoriesEditor.java          |  6 +++---
 .../component/virtual/VApplicationWindowEditor.java    |  4 ++--
 .../common/component/virtual/VBindingTableEditor.java  |  6 +++---
 .../common/component/virtual/VCommandEditor.java       |  6 +++---
 .../common/component/virtual/VControlsEditor.java      |  6 +++---
 .../common/component/virtual/VHandlerEditor.java       |  6 +++---
 .../component/virtual/VItemParametersEditor.java       |  6 +++---
 .../component/virtual/VMenuContributionsEditor.java    |  6 +++---
 .../internal/common/component/virtual/VMenuEditor.java |  6 +++---
 .../component/virtual/VModelFragmentsEditor.java       |  6 +++---
 .../common/component/virtual/VModelImportsEditor.java  |  4 ++--
 .../common/component/virtual/VPartDescriptor.java      |  6 +++---
 .../component/virtual/VPartDescriptorMenuEditor.java   |  4 ++--
 .../common/component/virtual/VPartMenuEditor.java      |  4 ++--
 .../component/virtual/VPerspectiveControlEditor.java   |  6 +++---
 .../component/virtual/VPerspectiveWindowsEditor.java   |  4 ++--
 .../common/component/virtual/VRootBindingContexts.java |  6 +++---
 .../common/component/virtual/VSnippetsEditor.java      |  4 ++--
 .../component/virtual/VToolBarContributionsEditor.java |  6 +++---
 .../component/virtual/VTrimContributionsEditor.java    |  6 +++---
 .../common/component/virtual/VWindowControlEditor.java |  6 +++---
 .../common/component/virtual/VWindowEditor.java        |  4 ++--
 .../component/virtual/VWindowSharedElementsEditor.java |  6 +++---
 .../common/component/virtual/VWindowWindowsEditor.java |  4 ++--
 .../ui/internal/common/objectdata/JavaAttribute.java   |  6 +++---
 .../internal/common/properties/ExportIdsHandler.java   |  4 ++--
 .../common/properties/ExternalizeStringHandler.java    |  4 ++--
 .../properties/ProjectOSGiTranslationProvider.java     |  6 +++---
 .../ui/internal/common/uistructure/ViewerElement.java  |  4 ++--
 .../emf/ui/internal/handlers/AbstractHandler.java      |  3 ++-
 .../ui/internal/handlers/AutosizeColumnsHandler.java   |  3 ++-
 .../handlers/MarkDuplicateAttributesHandler.java       |  4 +++-
 .../ui/internal/handlers/ResetToDefaultHandler.java    |  3 ++-
 .../emf/ui/internal/handlers/UnmarkItemsHandler.java   |  4 +++-
 .../emf/ui/internal/wbm/ApplicationModelEditor.java    |  8 ++++----
 .../META-INF/MANIFEST.MF                               |  2 +-
 .../E4TemplateCompletionProposalComputer.java          |  2 +-
 .../templates/default-e4templates.xml                  |  4 ++--
 .../org.eclipse.e4.tools.services/META-INF/MANIFEST.MF |  6 +++---
 .../e4/tools/services/impl/ResourceService.java        |  6 +++---
 .../e4/tools/emf/editor3x/templates/PartTemplate.java  |  6 +++---
 .../tools/internal/classes/templates/PartTemplate.java |  6 +++---
 .../tools/wizards/classes/AbstractNewClassWizard.java  |  8 ++++----
 .../tools/wizards/classes/NewAddonClassWizard.java     |  2 +-
 .../tools/wizards/classes/NewPartClassWizard.java      |  2 +-
 .../tools/wizards/classes/templates/AddonTemplate.java |  2 +-
 .../tools/wizards/classes/templates/PartTemplate.java  |  6 +++---
 .../wizards/classes/templates/ToolControlTemplate.java |  4 ++--
 101 files changed, 253 insertions(+), 245 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 4607428a45..98941c8ecd 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -18,6 +18,6 @@ Export-Package: org.eclipse.e4.tools.compat.internal;version="0.12.0.qualifier";
  org.eclipse.e4.tools.compat.parts;version="0.12.0.qualifier";x-internal:=true
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
-Import-Package: javax.inject;version="[1.0.0,2.0.0)",
+Import-Package: jakarta.inject;version="[2.0.0,3.0.0)",
  org.eclipse.e4.ui.workbench.swt
 Automatic-Module-Name: org.eclipse.e4.tools.compat
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
index cfa745ba2e..5a8483ac1b 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
+++ b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
@@ -1,13 +1,13 @@
 package org.eclipse.e4.tools.compat.internal;
 
-import javax.inject.Inject;
-
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.services.log.ILoggerProvider;
 import org.eclipse.e4.core.services.log.Logger;
 import org.osgi.framework.FrameworkUtil;
 
+import jakarta.inject.Inject;
+
 @SuppressWarnings("restriction")
 public class DefaultLoggerProvider implements ILoggerProvider {
 	@Inject
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
index b3aa5422cd..c6659ab2a2 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
+++ b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
@@ -2,8 +2,6 @@
 
 import java.util.ArrayList;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -15,6 +13,8 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
 
+import jakarta.inject.Inject;
+
 /**
  * The workbench implementation of the logger service.
  */
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 6fbda01b8e..979bf6d768 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -30,8 +30,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0",
  org.eclipse.e4.emf.xpath,
  org.eclipse.ui.forms;bundle-version="3.7.200"
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation;version="[1.2.0,2.0.0)",
- javax.inject;version="[1.0.0,2.0.0)",
+Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
+ jakarta.inject;version="[2.0.0,3.0.0)",
  org.osgi.framework;version="[1.5.0,2.0.0)",
  org.osgi.service.event;version="[1.3.0,2.0.0)"
 Export-Package: org.eclipse.e4.tools.emf.ui.common;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.model.spy",
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index b216293ed2..431a527a99 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -24,9 +24,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.property.value.IValueProperty;
@@ -69,6 +66,9 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
+import jakarta.annotation.PreDestroy;
+import jakarta.inject.Inject;
+
 /**
  * @param <M> type of the master object
  */
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index a6e599104e..73ecc0d83c 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -30,11 +30,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import org.eclipse.core.databinding.ObservablesManager;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
@@ -250,6 +245,11 @@
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Section;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
 public class ModelEditor implements IGotoObject {
 	private static final String ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED = "org.eclipse.e4.tools.modeleditor.filteredtree.enabled.xmitab.disabled";//$NON-NLS-1$
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java
index e0ee6d8989..d434370b72 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java
@@ -13,8 +13,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -60,6 +58,8 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.inject.Inject;
+
 public abstract class AbstractPartEditor<M extends MPart> extends AbstractComponentEditor<M> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index dc674be083..e8368dad97 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -16,8 +16,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.resources.IProject;
@@ -48,6 +46,8 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.inject.Inject;
+
 public class AddonsEditor extends AbstractComponentEditor<MAddon> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 3e8b913121..67bcb5b291 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -20,9 +20,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.resources.IProject;
@@ -80,6 +77,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class ApplicationEditor extends AbstractComponentEditor<MApplication> {
 
 	private Composite composite;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index e409773e94..a8c9a14905 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -19,9 +19,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
@@ -78,6 +75,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class AreaEditor extends AbstractComponentEditor<MArea> {
 
 	private Composite composite;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 1cf58bec54..f25fa5017c 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -19,9 +19,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -54,6 +51,9 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class BindingContextEditor extends AbstractComponentEditor<MBindingContext> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index ba449194ff..3098bfaf6e 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -19,9 +19,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -61,6 +58,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class BindingTableEditor extends AbstractComponentEditor<MBindingTable> {
 
 	private Composite composite;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index 9ea755767b..4bdd8a4925 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -15,8 +15,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -39,6 +37,8 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.inject.Inject;
+
 public class CategoryEditor extends AbstractComponentEditor<MCategory> {
 
 	private Composite composite;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 5721765ff8..f7ac5b9bba 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -20,9 +20,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -64,6 +61,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class CommandEditor extends AbstractComponentEditor<MCommand> {
 
 	private Composite composite;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 9a73c36a4c..74e0838bd0 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -14,8 +14,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -42,6 +40,8 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.inject.Inject;
+
 public class CommandParameterEditor extends AbstractComponentEditor<MCommandParameter> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index 2f3938f444..2f4d7e12f6 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -3,9 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
@@ -60,6 +57,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class CompositePartEditor extends AbstractPartEditor<MCompositePart> {
 	private final List<Action> actions = new ArrayList<>();
 	private final List<Action> actionsImport = new ArrayList<>();
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index f077a30616..0b3d374513 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -13,8 +13,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -40,6 +38,8 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.inject.Inject;
+
 public class CoreExpressionEditor extends AbstractComponentEditor<MCoreExpression> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 3f65beec81..7575041ff8 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -15,8 +15,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -39,6 +37,8 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.inject.Inject;
+
 public class DirectMenuItemEditor extends MenuItemEditor<MDirectMenuItem> {
 	@Inject
 	IEclipseContext eclipseContext;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index d3e76a10ff..85487c5c52 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -15,8 +15,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -36,6 +34,8 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.inject.Inject;
+
 public class DirectToolItemEditor extends ToolItemEditor<MDirectToolItem> {
 	@Inject
 	IEclipseContext eclipseContext;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
index 43f263321d..881287488d 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
@@ -16,8 +16,6 @@
  *******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
@@ -44,6 +42,8 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.inject.Inject;
+
 public class DynamicMenuContributionEditor extends AbstractComponentEditor<MDynamicMenuContribution> {
 
 	private Composite composite;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index 4568c0ed95..96f2ebe809 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -13,8 +13,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
@@ -41,6 +39,8 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.inject.Inject;
+
 public class HandledMenuItemEditor extends MenuItemEditor<MHandledMenuItem> {
 	@Inject
 	private IModelResource resource;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index b7706a9843..17d5f0de89 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -13,8 +13,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -40,6 +38,8 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.inject.Inject;
+
 public class HandledToolItemEditor extends ToolItemEditor<MHandledToolItem> {
 	@Inject
 	private IModelResource resource;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 5b83a4bd26..42914f52a8 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -18,8 +18,6 @@
 
 import java.text.MessageFormat;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -59,6 +57,8 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.inject.Inject;
+
 public class HandlerEditor extends AbstractComponentEditor<MHandler> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
index 4a43262f79..9cf87a6bce 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
@@ -14,8 +14,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -32,6 +30,8 @@
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.inject.Inject;
+
 public class ImperativeExpressionEditor extends AbstractComponentEditor<MImperativeExpression> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 84f4e1dc56..ef05cd0422 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -19,9 +19,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -71,6 +68,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class KeyBindingEditor extends AbstractComponentEditor<MKeyBinding> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index c9d62cbd15..7844d086d8 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -20,9 +20,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
@@ -68,6 +65,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class MenuContributionEditor extends AbstractComponentEditor<MMenuContribution> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index d28d5c13bf..63ef464328 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -20,9 +20,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.ListDiffVisitor;
@@ -87,6 +84,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class MenuEditor extends AbstractComponentEditor<MMenu> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index f05e0bcaf2..02185221f0 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -19,9 +19,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -75,6 +72,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public abstract class MenuItemEditor<M extends MMenuItem> extends AbstractComponentEditor<M> {
 
 	private Composite composite;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index 0691dbcc09..d59e423e0a 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -14,8 +14,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
@@ -44,6 +42,8 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.inject.Inject;
+
 public class MenuSeparatorEditor extends AbstractComponentEditor<MMenuSeparator> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index e0696f9668..8fb47b18dc 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -18,8 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -57,6 +55,8 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.inject.Inject;
+
 public class ModelFragmentsEditor extends AbstractComponentEditor<MModelFragments> {
 	private Composite composite;
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index 352364adb7..21e29c5d49 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -14,8 +14,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
@@ -47,6 +45,8 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.inject.Inject;
+
 public class ParameterEditor extends AbstractComponentEditor<MParameter> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index 1f44826cec..9e36c9881a 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -15,8 +15,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -64,6 +62,8 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.inject.Inject;
+
 public class PartDescriptorEditor extends AbstractComponentEditor<MPartDescriptor> {
 
 	private Composite composite;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 913d1e0532..9a098fa30b 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -17,9 +17,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
@@ -74,6 +71,9 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class PartSashContainerEditor extends AbstractComponentEditor<MPartSashContainer> {
 
 	private Composite composite;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index f74ac95a77..5e1545bc9d 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -17,9 +17,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
@@ -66,6 +63,9 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class PartStackEditor extends AbstractComponentEditor<MPartStack> {
 
 	private Composite composite;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index bfd0896b7a..bd6aafb09e 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -18,9 +18,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -69,6 +66,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class PerspectiveEditor extends AbstractComponentEditor<MPerspective> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 0bd9de2b03..360462842e 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -19,9 +19,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
@@ -67,6 +64,9 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class PerspectiveStackEditor extends AbstractComponentEditor<MPerspectiveStack> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index 1a34f4ff44..a11cdbdd3e 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -14,8 +14,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -60,6 +58,8 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.inject.Inject;
+
 public class PlaceholderEditor extends AbstractComponentEditor<MPlaceholder> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
index 2b15b41064..6ba9810b34 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
@@ -13,14 +13,14 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.inject.Inject;
+
 public class PopupMenuEditor extends MenuEditor {
 
 	@Inject
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 4d0814291b..5ab5d8fa72 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -23,9 +23,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.emf.xpath.EcoreXPathContextFactory;
@@ -94,6 +91,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class StringModelFragment extends AbstractComponentEditor<MStringModelFragment> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 8721e134cc..b34e4474ed 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -20,9 +20,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
@@ -73,6 +70,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class ToolBarContributionEditor extends AbstractComponentEditor<MToolBarContribution> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index cd8f72bef4..2912479152 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -18,9 +18,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.Util;
@@ -56,6 +53,9 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class ToolBarEditor extends AbstractComponentEditor<MToolBar> {
 
 	private Composite composite;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 5514dd9847..87711ed38c 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -14,8 +14,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
@@ -45,6 +43,8 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.inject.Inject;
+
 public class ToolBarSeparatorEditor extends AbstractComponentEditor<MToolBarSeparator> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index d959957161..885b0a46ae 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -16,8 +16,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
@@ -58,6 +56,8 @@
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.inject.Inject;
+
 public class ToolControlEditor extends AbstractComponentEditor<MToolControl> {
 	private EMFDataBindingContext context;
 	private Composite composite;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 7e843e2a4b..a0c9b4cfed 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -19,8 +19,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -73,6 +71,8 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.inject.Inject;
+
 public abstract class ToolItemEditor<M extends MToolItem> extends AbstractComponentEditor<M> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index cf8dd88354..81c50028f5 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -19,9 +19,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
@@ -73,6 +70,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class TrimBarEditor extends AbstractComponentEditor<MTrimBar> {
 
 	private Composite composite;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index e7907a3653..3652aab652 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -22,9 +22,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.resources.IProject;
@@ -80,6 +77,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class TrimContributionEditor extends AbstractComponentEditor<MTrimContribution> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
index 29e898f12e..47b2cadaf3 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
@@ -13,8 +13,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.e4.tools.emf.ui.common.Util;
 import org.eclipse.e4.tools.emf.ui.internal.E4Properties;
@@ -23,6 +21,8 @@
 import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
 import org.eclipse.emf.ecore.EObject;
 
+import jakarta.inject.Inject;
+
 public class TrimmedWindowEditor extends WindowEditor {
 	@Inject
 	public TrimmedWindowEditor() {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index ca37680655..c64cccc665 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -19,9 +19,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -68,6 +65,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class WindowEditor extends AbstractComponentEditor<MWindow> {
 
 	private Composite composite;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
index 33a1876ed9..40f7488f2b 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
@@ -21,8 +21,6 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.inject.Inject;
-
 import org.eclipse.e4.core.services.nls.Translation;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -48,6 +46,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Shell;
 
+import jakarta.inject.Inject;
+
 /**
  * This dialog presents to the user in a table the available {@link MCommandParameter}s that
  * may be referenced by the specified {@link MParameter}.
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index 3c9e0bd9ab..0a2bf6ec23 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -26,9 +26,6 @@
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
@@ -105,6 +102,10 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.inject.Inject;
+
 /**
  * A tab that contains a list EObjects, and provides editable columns for
  * EObject features.
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
index ce7c85c6bb..7be2d4ee43 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
@@ -15,9 +15,6 @@
 
 package org.eclipse.e4.tools.emf.ui.internal.common.component.tabs;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -51,6 +48,9 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class XmiTab extends Composite {
 
 	private static final String ORG_ECLIPSE_E4_TOOLS_MODELEDITOR_FILTEREDTREE_ENABLED_XMITAB_DISABLED = "org.eclipse.e4.tools.modeleditor.filteredtree.enabled.xmitab.disabled";//$NON-NLS-1$
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/AbstractVTrimEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/AbstractVTrimEditor.java
index e1e63f45dc..f7f6bd5086 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/AbstractVTrimEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/AbstractVTrimEditor.java
@@ -17,8 +17,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -41,6 +39,8 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+
 public abstract class AbstractVTrimEditor<M> extends AbstractComponentEditor<M> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
index cddd46fb92..4127222c70 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
@@ -19,9 +19,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -45,6 +42,9 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class VApplicationAddons extends AbstractComponentEditor<MApplication> {
 	private Composite composite;
 	private TableViewer viewer;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
index 17591c19bd..84c2f2266a 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
@@ -18,9 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -47,6 +44,9 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class VApplicationCategoriesEditor extends AbstractComponentEditor<MApplication> {
 	private Composite composite;
 	private TableViewer viewer;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java
index 379fea564c..5b97b3d268 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java
@@ -1,10 +1,10 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import javax.inject.Inject;
-
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 
+import jakarta.inject.Inject;
+
 public class VApplicationWindowEditor extends VWindowEditor<MApplication> {
 
 	@Inject
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
index a8679ed7dc..05ff4958d1 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
@@ -18,9 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -45,6 +42,9 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class VBindingTableEditor extends AbstractComponentEditor<MBindingTableContainer> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
index c8cb636db7..cce5b15b76 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
@@ -18,9 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.services.nls.Translation;
@@ -50,6 +47,9 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class VCommandEditor extends AbstractComponentEditor<MApplication> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlsEditor.java
index b5253ef81e..bd8e7c4fe0 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlsEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlsEditor.java
@@ -17,9 +17,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
@@ -57,6 +54,9 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class VControlsEditor extends AbstractComponentEditor<MElementContainer<MPartSashContainerElement>> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
index 7ed0e46d62..81ede85ab9 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
@@ -18,9 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -47,6 +44,9 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class VHandlerEditor extends AbstractComponentEditor<MHandlerContainer> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
index d7a777c6f1..5bc661de3f 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
@@ -18,9 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -45,6 +42,9 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class VItemParametersEditor extends AbstractComponentEditor<MHandledItem> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
index 255acd9f6f..9445379e34 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
@@ -18,9 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -45,6 +42,9 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class VMenuContributionsEditor extends AbstractComponentEditor<MMenuContributions> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
index fb34529b12..5edff167c8 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
@@ -18,9 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -53,6 +50,9 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class VMenuEditor<M> extends AbstractComponentEditor<M> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
index d0b2cf366b..c967a7d2bb 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
@@ -18,9 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -44,6 +41,9 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class VModelFragmentsEditor extends AbstractComponentEditor<MModelFragments> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
index 13bff5fb78..699f455120 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
@@ -18,8 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -50,6 +48,8 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.inject.Inject;
+
 public class VModelImportsEditor extends AbstractComponentEditor<MModelFragments> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
index 609b9f69f8..419d1e4dda 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
@@ -18,9 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -49,6 +46,9 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class VPartDescriptor extends AbstractComponentEditor<MPartDescriptorContainer> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java
index a66c1ea614..4aa0e1e136 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java
@@ -1,9 +1,9 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import javax.inject.Inject;
-
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 
+import jakarta.inject.Inject;
+
 public class VPartDescriptorMenuEditor extends VMenuEditor<MPartDescriptor> {
 	@Inject
 	public VPartDescriptorMenuEditor() {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java
index 1db8853f15..cf0095fb7d 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java
@@ -1,10 +1,10 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import javax.inject.Inject;
-
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 
+import jakarta.inject.Inject;
+
 public class VPartMenuEditor extends VMenuEditor<MPart> {
 	@Inject
 	public VPartMenuEditor() {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index 404399fee5..114db3f878 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -18,9 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -51,6 +48,9 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class VPerspectiveControlEditor extends AbstractComponentEditor<MElementContainer<MUIElement>> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java
index d9b8a1d058..2b4ba27bab 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java
@@ -1,10 +1,10 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import javax.inject.Inject;
-
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
 import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
 
+import jakarta.inject.Inject;
+
 public class VPerspectiveWindowsEditor extends VWindowEditor<MPerspective> {
 
 	@Inject
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
index 6026d0ff1e..60c2e684b9 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
@@ -18,9 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -45,6 +42,9 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class VRootBindingContexts extends AbstractComponentEditor<MBindingTableContainer> {
 	private Composite composite;
 	private TableViewer viewer;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index 261ea59fed..7e5fe368aa 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -7,8 +7,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -40,6 +38,8 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+
 public class VSnippetsEditor extends AbstractComponentEditor<MSnippetContainer> {
 
 	/** Define the classes available to create snippets */
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
index 9d1f85867c..34547fae89 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
@@ -18,9 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -45,6 +42,9 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class VToolBarContributionsEditor extends AbstractComponentEditor<MToolBarContributions> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
index cc8ca323cb..adde5ac8c9 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
@@ -18,9 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -45,6 +42,9 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class VTrimContributionsEditor extends AbstractComponentEditor<MTrimContributions> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index bb5c1f6dc3..119bed2346 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -18,9 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -51,6 +48,9 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class VWindowControlEditor extends AbstractComponentEditor<MElementContainer<MUIElement>> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
index 5bb6817903..3ffe50ccbc 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
@@ -18,8 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -47,6 +45,8 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+
 public abstract class VWindowEditor<M> extends AbstractComponentEditor<M> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index 1fa0071dbf..83f9cf746b 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -19,9 +19,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -56,6 +53,9 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class VWindowSharedElementsEditor extends AbstractComponentEditor<MWindow> {
 	private Composite composite;
 	private EMFDataBindingContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java
index 945811f865..42e33ce6df 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java
@@ -1,10 +1,10 @@
 package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual;
 
-import javax.inject.Inject;
-
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
 
+import jakarta.inject.Inject;
+
 public class VWindowWindowsEditor extends VWindowEditor<MWindow> {
 
 	@Inject
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
index 03a47e5975..e8e0c7c612 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
@@ -6,15 +6,15 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import org.eclipse.e4.core.di.extensions.EventTopic;
 import org.eclipse.e4.core.di.extensions.Preference;
 import org.eclipse.e4.core.services.nls.Translation;
 import org.eclipse.e4.ui.di.UIEventTopic;
 import org.osgi.framework.FrameworkUtil;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
 public class JavaAttribute {
 	private final JavaObject object;
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
index e74fb80ada..66edba160b 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
@@ -18,8 +18,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Named;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
@@ -63,6 +61,8 @@
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.inject.Named;
+
 /**
  * This handler exports all Id values within the application model to a file for
  * static reference. Currently the location of this file is fixed to be in the
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
index cba89a92eb..b66985d0f9 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
@@ -7,8 +7,6 @@
 import java.util.List;
 import java.util.Properties;
 
-import javax.inject.Named;
-
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
@@ -48,6 +46,8 @@
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 
+import jakarta.inject.Named;
+
 public class ExternalizeStringHandler {
 
 	@Execute
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
index edca51afb8..49d336a480 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
@@ -13,9 +13,6 @@
 import java.util.ResourceBundle;
 import java.util.ResourceBundle.Control;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResourceChangeEvent;
@@ -28,6 +25,9 @@
 import org.eclipse.e4.tools.services.impl.ResourceBundleTranslationProvider;
 import org.osgi.framework.Constants;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
 public class ProjectOSGiTranslationProvider extends ResourceBundleTranslationProvider {
 
 	public static final String META_INF_DIRECTORY_NAME = "META-INF"; //$NON-NLS-1$
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
index 143bc4211c..55cfb989c2 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
@@ -16,8 +16,6 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.uistructure;
 
-import javax.inject.Inject;
-
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
@@ -33,6 +31,8 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.inject.Inject;
+
 /**
  * A viewer with buttons.
  *
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java
index 2a3af868bf..7a7a53b37f 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java
@@ -14,11 +14,12 @@
 
 package org.eclipse.e4.tools.emf.ui.internal.handlers;
 
-import javax.inject.Named;
 import org.eclipse.e4.core.di.annotations.CanExecute;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.IViewEObjects;
 
+import jakarta.inject.Named;
+
 public class AbstractHandler {
 
 	static final public String VIEWER_KEY = "org.eclipse.e4.tools.active-object-viewer"; //$NON-NLS-1$
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java
index ac1fdb4904..73a9841ab5 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java
@@ -14,11 +14,12 @@
 
 package org.eclipse.e4.tools.emf.ui.internal.handlers;
 
-import javax.inject.Named;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.IViewEObjects;
 
+import jakarta.inject.Named;
+
 public class AutosizeColumnsHandler extends MarkDuplicateItemsBase {
 	@Execute
 	public void execute(@Named(VIEWER_KEY) IViewEObjects viewer, IEclipseContext context) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
index d23e0218e2..7b1373bf8a 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
@@ -16,7 +16,7 @@
 
 import java.util.Collection;
 import java.util.HashSet;
-import javax.inject.Named;
+
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.tools.emf.ui.internal.Messages;
@@ -31,6 +31,8 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 
+import jakarta.inject.Named;
+
 public class MarkDuplicateAttributesHandler extends MarkDuplicateItemsBase {
 
 	@Execute
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java
index 6ed99f5c25..453717d061 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java
@@ -14,10 +14,11 @@
 
 package org.eclipse.e4.tools.emf.ui.internal.handlers;
 
-import javax.inject.Named;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.IViewEObjects;
 
+import jakarta.inject.Named;
+
 public class ResetToDefaultHandler extends AbstractHandler {
 
 	@Execute
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java
index 0f2002b8e1..c1809486ff 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java
@@ -15,11 +15,13 @@
 package org.eclipse.e4.tools.emf.ui.internal.handlers;
 
 import java.util.Collections;
-import javax.inject.Named;
+
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.tools.emf.ui.internal.common.component.tabs.IViewEObjects;
 import org.eclipse.emf.ecore.EObject;
 
+import jakarta.inject.Named;
+
 public class UnmarkItemsHandler extends AbstractHandler {
 
 	@Execute
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index acfca8ad3e..5e85eed4ea 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -17,10 +17,6 @@
 
 import java.io.IOException;
 
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceChangeListener;
@@ -44,6 +40,10 @@
 import org.eclipse.swt.widgets.Shell;
 import org.osgi.framework.FrameworkUtil;
 
+import jakarta.annotation.PreDestroy;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
 public class ApplicationModelEditor extends ModelEditor {
 
 	private static final String EDITORPROJECT = "org.eclipse.e4.tools.emf.ui.editorproject"; //$NON-NLS-1$
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index 1223fc000c..e51cf10400 100644
--- a/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
-Bundle-Version: 4.10.100.qualifier
+Bundle-Version: 4.10.200.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.20.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java b/tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
index 450178ac0a..f7b24faeb3 100644
--- a/tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
@@ -42,7 +42,7 @@ public class E4TemplateCompletionProposalComputer extends AbstractTemplateComple
 	 * The following annotations are used to detect if an if a project uses e4.
 	 */
 	private static final String E4_ANNOTATION_FOCUS = "org.eclipse.e4.ui.di.Focus"; //$NON-NLS-1$
-	private static final String E4_ANNOTATION_POSTCONSTRUCT = "javax.annotation.PostConstruct"; //$NON-NLS-1$
+	private static final String E4_ANNOTATION_POSTCONSTRUCT = "jakarta.annotation.PostConstruct"; //$NON-NLS-1$
 
 	/**
 	 * Listener that resets the cached java project if its build path changes.
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml b/tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
index d87fa0f4d0..7376d08dee 100644
--- a/tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
@@ -57,7 +57,7 @@ IStylingEngine stylingEngine;</template>
 public void postConstruct(${type:newType(org.eclipse.swt.widgets.Composite)} parent) { 
 	${cursor}
 }
-${imp:import(javax.annotation.PostConstruct)}
+${imp:import(jakarta.annotation.PostConstruct)}
 </template>
 
 <template name="Focus" description="%Templates.focus_method" id="org.eclipse.e4.tools.jdt.templates.focus" context="e4-members" enabled="true" autoinsert="false">@Focus
@@ -71,7 +71,7 @@ ${imp:import(org.eclipse.e4.ui.di.Focus)}
 public void preDestroy() {
 	${cursor}
 }
-${imp:import(javax.annotation.PreDestroy)}
+${imp:import(jakarta.annotation.PreDestroy)}
 </template>
 
 <template name="Execute" description="%Templates.execute_method" id="org.eclipse.e4.tools.jdt.templates.execute" context="e4-members" enabled="true" autoinsert="false">@Execute
diff --git a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 71d3629992..ccf7dea7be 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
-Bundle-Version: 4.10.100.qualifier
+Bundle-Version: 4.10.300.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.emf.ui",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0"
 Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation;version="[1.2.0,2.0.0)",
- javax.inject;version="[1.0.0,2.0.0)",
+Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
+ jakarta.inject;version="[2.0.0,3.0.0)",
  org.eclipse.osgi.util;version="[1.1.0,2.0.0)",
  org.osgi.framework;version="[1.10.0,2.0.0)"
 Automatic-Module-Name: org.eclipse.e4.tools.services
diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
index 81f9f777eb..bc5af3bc72 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
+++ b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
@@ -19,9 +19,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -41,6 +38,9 @@
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 
+import jakarta.annotation.PreDestroy;
+import jakarta.inject.Inject;
+
 public class ResourceService implements IResourceService {
 	private enum Type {
 		IMAGE, FONT, COLOR
diff --git a/tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java b/tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java
index cbe566c1a2..ace31c2f27 100644
--- a/tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java
+++ b/tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java
@@ -15,9 +15,9 @@ public static synchronized PartTemplate create(String lineSeparator)
 
   public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
   protected final String TEXT_1 = " " + NL + "package ";
-  protected final String TEXT_2 = ";" + NL + "" + NL + "import javax.inject.Inject;";
-  protected final String TEXT_3 = NL + "import javax.annotation.PostConstruct;";
-  protected final String TEXT_4 = NL + "import javax.annotation.PreDestroy;";
+  protected final String TEXT_2 = ";" + NL + "" + NL + "import jakarta.inject.Inject;";
+  protected final String TEXT_3 = NL + "import jakarta.annotation.PostConstruct;";
+  protected final String TEXT_4 = NL + "import jakarta.annotation.PreDestroy;";
   protected final String TEXT_5 = NL + "import org.eclipse.e4.ui.di.Focus;";
   protected final String TEXT_6 = NL + "import org.eclipse.e4.ui.di.Persist;";
   protected final String TEXT_7 = NL + NL + "public class ";
diff --git a/tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java b/tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java
index 9693af3a74..8a9a332692 100644
--- a/tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java
+++ b/tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java
@@ -15,9 +15,9 @@ public static synchronized PartTemplate create(String lineSeparator)
 
   public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
   protected final String TEXT_1 = " " + NL + "package ";
-  protected final String TEXT_2 = ";" + NL + "" + NL + "import javax.inject.Inject;";
-  protected final String TEXT_3 = NL + "import javax.annotation.PostConstruct;";
-  protected final String TEXT_4 = NL + "import javax.annotation.PreDestroy;";
+  protected final String TEXT_2 = ";" + NL + "" + NL + "import jakarta.inject.Inject;";
+  protected final String TEXT_3 = NL + "import jakarta.annotation.PostConstruct;";
+  protected final String TEXT_4 = NL + "import jakarta.annotation.PreDestroy;";
   protected final String TEXT_5 = NL + "import org.eclipse.e4.ui.di.Focus;";
   protected final String TEXT_6 = NL + "import org.eclipse.e4.ui.di.Persist;";
   protected final String TEXT_7 = NL + NL + "public class ";
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
index 954ea0163f..7679683226 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
@@ -192,7 +192,7 @@ protected void checkRequiredBundles() {
 			}
 			if (!requiredImportPacks.isEmpty()) {
 				for (final String i : requiredImportPacks) {
-					// javax.annotation;version="1.0.0";resolution:=optional
+					// jakarta.annotation;version="[2.1.0,3.0.0)";resolution:=optional
 					final String[] parts = i.split(";"); //$NON-NLS-1$
 					final VersionRange r = findVersionRange(parts);
 					final boolean optional = isOptional(parts);
@@ -228,18 +228,18 @@ private static boolean isOptional(String[] parts) {
 	}
 
 	// public static void main(String[] args) {
-	// findVersionRange("javax.annotation;version=\"1.0.0\";resolution:=optional".split(";"));
+	// findVersionRange("jakarta.annotation;version=\"[2.1.0,3.0.0)\";resolution:=optional".split(";"));
 	// }
 
 	protected Set<String> getRequiredBundles() {
 		final Set<String> rv = new HashSet<>();
-		//		rv.add("javax.inject"); //$NON-NLS-1$
+		//		rv.add("jakarta.inject"); //$NON-NLS-1$
 		return rv;
 	}
 
 	protected Set<String> getImportedPackages() {
 		final Set<String> rv = new HashSet<>();
-		rv.add("javax.inject;version=\"1.0.0\""); //$NON-NLS-1$
+		rv.add("jakarta.inject;version=\"[2.0.0,3.0.0)\""); //$NON-NLS-1$
 		return rv;
 	}
 
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
index 55a19be0b8..614c776aac 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
@@ -68,7 +68,7 @@ protected Set<String> getRequiredBundles() {
 	@Override
 	protected Set<String> getImportedPackages() {
 		final Set<String> rv = super.getImportedPackages();
-		rv.add("javax.annotation;version=\"1.0.0\";resolution:=optional"); //$NON-NLS-1$
+		rv.add("jakarta.annotation;version=\"[2.1.0,3.0.0)\";resolution:=optional"); //$NON-NLS-1$
 		return super.getImportedPackages();
 	}
 }
\ No newline at end of file
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
index 279d5bf5b7..4091976520 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
@@ -175,7 +175,7 @@ protected Set<String> getImportedPackages() {
 		final Set<String> rv = super.getImportedPackages();
 		final PartClass cl = (PartClass) getDomainClass();
 		if (cl.usePostConstruct || cl.usePredestroy) {
-			rv.add("javax.annotation;version=\"1.0.0\";resolution:=optional"); //$NON-NLS-1$
+			rv.add("jakarta.annotation;version=\"[2.1.0,3.0.0)\";resolution:=optional"); //$NON-NLS-1$
 		}
 		return rv;
 	}
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
index 15cfd1aef8..13d8fedb60 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
@@ -17,7 +17,7 @@ public static synchronized AddonTemplate create(String lineSeparator)
   protected final String TEXT_1 = " ";
   protected final String TEXT_2 = NL + "package ";
   protected final String TEXT_3 = ";";
-  protected final String TEXT_4 = NL + NL + "import javax.inject.Inject;" + NL + "" + NL + "import org.eclipse.e4.core.di.annotations.Optional;" + NL + "import org.eclipse.e4.core.di.extensions.EventTopic;" + NL + "import org.eclipse.e4.ui.workbench.UIEvents;" + NL + "import org.osgi.service.event.Event;" + NL + "" + NL + "import org.eclipse.e4.core.services.events.IEventBroker;" + NL + "" + NL + "public class ";
+  protected final String TEXT_4 = NL + NL + "import jakarta.inject.Inject;" + NL + "" + NL + "import org.eclipse.e4.core.di.annotations.Optional;" + NL + "import org.eclipse.e4.core.di.extensions.EventTopic;" + NL + "import org.eclipse.e4.ui.workbench.UIEvents;" + NL + "import org.osgi.service.event.Event;" + NL + "" + NL + "import org.eclipse.e4.core.services.events.IEventBroker;" + NL + "" + NL + "public class ";
   protected final String TEXT_5 = " {" + NL + "" + NL + "\t@Inject" + NL + "\t@Optional" + NL + "\tpublic void applicationStarted(" + NL + "\t\t\t@EventTopic(UIEvents.UILifeCycle.APP_STARTUP_COMPLETE) Event event) {" + NL + "\t\t// TODO Modify the UIEvents.UILifeCycle.APP_STARTUP_COMPLETE EventTopic to a certain event you want to listen to." + NL + "\t}" + NL + "" + NL + "}";
   protected final String TEXT_6 = NL;
 
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
index 0ae7b7cd34..b3e2f5fcc9 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
@@ -17,9 +17,9 @@ public static synchronized PartTemplate create(String lineSeparator)
   protected final String TEXT_1 = " ";
   protected final String TEXT_2 = NL + "package ";
   protected final String TEXT_3 = ";";
-  protected final String TEXT_4 = NL + NL + "import javax.inject.Inject;";
-  protected final String TEXT_5 = NL + "import javax.annotation.PostConstruct;" + NL + "import org.eclipse.swt.widgets.Composite;";
-  protected final String TEXT_6 = NL + "import javax.annotation.PreDestroy;";
+  protected final String TEXT_4 = NL + NL + "import jakarta.inject.Inject;";
+  protected final String TEXT_5 = NL + "import jakarta.annotation.PostConstruct;" + NL + "import org.eclipse.swt.widgets.Composite;";
+  protected final String TEXT_6 = NL + "import jakarta.annotation.PreDestroy;";
   protected final String TEXT_7 = NL + "import org.eclipse.e4.ui.di.Focus;";
   protected final String TEXT_8 = NL + "import org.eclipse.e4.ui.di.Persist;";
   protected final String TEXT_9 = NL + NL + "public class ";
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
index d1a97c4503..93ac4fc1a6 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
@@ -16,8 +16,8 @@ public static synchronized ToolControlTemplate create(String lineSeparator)
   public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
   protected final String TEXT_1 = "package ";
   protected final String TEXT_2 = ";";
-  protected final String TEXT_3 = NL + NL + "import javax.annotation.PostConstruct;";
-  protected final String TEXT_4 = NL + "import javax.inject.Inject;";
+  protected final String TEXT_3 = NL + NL + "import jakarta.annotation.PostConstruct;";
+  protected final String TEXT_4 = NL + "import jakarta.inject.Inject;";
   protected final String TEXT_5 = NL + NL + "public class ";
   protected final String TEXT_6 = " {" + NL + "\t";
   protected final String TEXT_7 = NL + "\t@Inject" + NL + "\tpublic ";

From 684af42c13a28d9f9192cfe178591534bbf7b7ed Mon Sep 17 00:00:00 2001
From: Andrey Loskutov <loskutov@gmx.de>
Date: Fri, 3 Nov 2023 11:05:35 +0100
Subject: [PATCH 1262/1286] Fixing "Redundant specification of type arguments
 errors"

See https://github.com/eclipse-platform/eclipse.platform.ui/issues/1267
---
 .../emf/ui/internal/common/component/MenuItemEditor.java      | 4 ++--
 .../emf/ui/internal/common/component/PlaceholderEditor.java   | 4 ++--
 .../emf/ui/internal/common/component/ToolItemEditor.java      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 02185221f0..894ca89457 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -265,7 +265,7 @@ public void widgetSelected(SelectionEvent e) {
 					E4Properties.selected(getEditingDomain()).observeDetail(getMaster()));
 
 			final UpdateValueStrategy<Boolean, ItemType> t2m = new UpdateValueStrategy<>();
-			t2m.setConverter(new Converter<Boolean, ItemType>(boolean.class, ItemType.class) {
+			t2m.setConverter(new Converter<>(boolean.class, ItemType.class) {
 
 				@Override
 				public ItemType convert(Boolean fromObject) {
@@ -273,7 +273,7 @@ public ItemType convert(Boolean fromObject) {
 				}
 			});
 			final UpdateValueStrategy<ItemType, Boolean> m2t = new UpdateValueStrategy<>();
-			m2t.setConverter(new Converter<ItemType, Boolean>(ItemType.class, boolean.class) {
+			m2t.setConverter(new Converter<>(ItemType.class, boolean.class) {
 
 				@Override
 				public Boolean convert(ItemType fromObject) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index a11cdbdd3e..6f135643cd 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -198,14 +198,14 @@ private Composite createForm(Composite parent, final EMFDataBindingContext conte
 			t.setLayoutData(gd);
 
 			final UpdateValueStrategy<String, MUIElement> t2m = new UpdateValueStrategy<>();
-			t2m.setConverter(new Converter<String, MUIElement>(String.class, MUIElement.class) {
+			t2m.setConverter(new Converter<>(String.class, MUIElement.class) {
 				@Override
 				public MUIElement convert(String fromObject) {
 					return null;
 				}
 			});
 			final UpdateValueStrategy<MUIElement, String> m2t = new UpdateValueStrategy<>();
-			m2t.setConverter(new Converter<MUIElement, String>(MUIElement.class, String.class) {
+			m2t.setConverter(new Converter<>(MUIElement.class, String.class) {
 
 				@Override
 				public String convert(MUIElement fromObject) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index a0c9b4cfed..6247d4b2ed 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -287,14 +287,14 @@ public void widgetSelected(SelectionEvent e) {
 					E4Properties.selected(getEditingDomain()).observeDetail(getMaster()));
 
 			final UpdateValueStrategy<Boolean, ItemType> t2m = new UpdateValueStrategy<>();
-			t2m.setConverter(new Converter<Boolean, ItemType>(boolean.class, ItemType.class) {
+			t2m.setConverter(new Converter<>(boolean.class, ItemType.class) {
 				@Override
 				public ItemType convert(Boolean fromObject) {
 					return null;
 				}
 			});
 			final UpdateValueStrategy<ItemType, Boolean> m2t = new UpdateValueStrategy<>();
-			m2t.setConverter(new Converter<ItemType, Boolean>(ItemType.class, boolean.class) {
+			m2t.setConverter(new Converter<>(ItemType.class, boolean.class) {
 
 				@Override
 				public Boolean convert(ItemType fromObject) {

From 5e3c3704abc6736ec5853917adeed66d99133c40 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Sat, 4 Nov 2023 14:13:00 +0100
Subject: [PATCH 1263/1286] Remove unnecessary attributes from feature.xml
 files

Apply the result of
https://github.com/eclipse-pde/eclipse.pde/issues/730
---
 .../feature.xml                               | 30 ++++---------------
 .../feature.xml                               | 12 ++------
 2 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/tools/features/org.eclipse.e4.core.tools.feature/feature.xml b/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
index 949e437cdf..ff0634f3a2 100644
--- a/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -21,44 +21,26 @@
 
    <plugin
          id="org.eclipse.e4.tools.emf.editor3x"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.e4.tools.emf.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.e4.tools.compat"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.e4.tools.services"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.e4.tools"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.e4.tools.jdt.templates"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>
diff --git a/tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml b/tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml
index defed5c9bf..e49baded01 100644
--- a/tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml
+++ b/tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.tools.persistence.feature"
       label="%featureName"
-      version="1.1.100.qualifier"
+      version="1.1.200.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -21,16 +21,10 @@
 
    <plugin
          id="org.eclipse.e4.tools.persistence"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.e4.tools.compatibility.migration"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>

From 41d9e4a76ce54c8335b9da4ed6a291a5d903fed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= <jkubitz-eclipse@gmx.de>
Date: Mon, 6 Nov 2023 10:09:36 +0100
Subject: [PATCH 1264/1286] LTK Refactoring: fix progress report

Error was 'beginTask may only be called once'

tested with
org.eclipse.jdt.ui.tests.refactoring.RenamePackageTests.test2(),
org.eclipse.ltk.core.refactoring.tests.participants.FailingParticipantTests
---
 .../org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF      | 2 +-
 .../org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF     | 2 +-
 tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index f475e537b4..80b8137f3f 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.e4.ui.css.swt;bundle-version="0.9.1",
  org.eclipse.pde.core;bundle-version="3.6.0",
  org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.jdt.core;bundle-version="3.6.0",
+ org.eclipse.jdt.core;bundle-version="3.36.0",
  org.eclipse.ui.ide;bundle-version="3.6.0",
  org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
  org.eclipse.e4.core.contexts;bundle-version="0.9.0",
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index e51cf10400..d43c775e53 100644
--- a/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.20.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
  org.eclipse.jface.text;bundle-version="3.6.0",
- org.eclipse.jdt.core;bundle-version="3.6.0",
+ org.eclipse.jdt.core;bundle-version="3.36.0",
  org.eclipse.core.runtime;bundle-version="3.29.0"
 Export-Package: org.eclipse.e4.internal.tools.jdt.templates;version="0.12.0.qualifier";x-internal:=true
 Bundle-Vendor: %providerName
diff --git a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index 7c3043c492..e6172f2ce8 100644
--- a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.29.0",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
  org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.jdt.core;bundle-version="3.6.0",
+ org.eclipse.jdt.core;bundle-version="3.36.0",
  org.eclipse.ui.ide;bundle-version="3.6.0",
  org.eclipse.core.databinding;bundle-version="1.3.100",
  org.eclipse.core.databinding.beans;bundle-version="1.2.100",

From 9329423f2eab0f59e035575624d0143922709583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= <jkubitz-eclipse@gmx.de>
Date: Mon, 6 Nov 2023 15:26:59 +0100
Subject: [PATCH 1265/1286] fix NON-NLS warnings

---
 .../dialogs/FindContributionDialog.java        | 18 +++++++++---------
 .../classes/templates/AddonTemplate.java       |  1 +
 .../DynamicMenuContributionTemplate.java       |  1 +
 .../classes/templates/HandlerTemplate.java     |  1 +
 .../ImperativeExpressionTemplate.java          |  1 +
 .../classes/templates/PartTemplate.java        |  1 +
 .../classes/templates/ToolControlTemplate.java |  1 +
 7 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
index 7a1defbf71..b46c5b1636 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
@@ -235,7 +235,7 @@ public void keyPressed(KeyEvent e) {
 			@Override
 			public boolean select(Viewer viewer, Object parentElement, Object element) {
 				ContributionData cd = (ContributionData) element;
-				if ("show-bundles".equals(mode)) {
+				if ("show-bundles".equals(mode)) { //$NON-NLS-1$
 					boolean found = false;
 					for (Iterator<?> it = list.iterator(); it.hasNext();) {
 						ContributionData cd2 = (ContributionData) it.next();
@@ -248,26 +248,26 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 						}
 					}
 					return true;
-				} else if ("show-packages".equals(mode)) {
+				} else if ("show-packages".equals(mode)) { //$NON-NLS-1$
 					if (bundleFilter != null && bundleFilter.isEmpty() == false) {
 						if (!bundleFilter.equals(cd.bundleName)) {
 							return false;
 						}
 					}
 					String packageName;
-					int last = cd.className.lastIndexOf(".");
+					int last = cd.className.lastIndexOf("."); //$NON-NLS-1$
 					if (last >= 0) {
 						packageName = cd.className.substring(0, last);
 					} else {
-						packageName = "";
+						packageName = ""; //$NON-NLS-1$
 					}
 					boolean found = false;
 					for (Iterator<?> it = list.iterator(); it.hasNext();) {
 						boolean matches = false;
 						ContributionData cd2 = (ContributionData) it.next();
-						if (packageName.isEmpty() && cd2.className.contains(".") == false) {
+						if (packageName.isEmpty() && cd2.className.contains(".") == false) { //$NON-NLS-1$
 							matches = true;
-						} else if (cd2.className.startsWith(packageName + ".")) {
+						} else if (cd2.className.startsWith(packageName + ".")) { //$NON-NLS-1$
 							matches = true;
 						}
 						if (matches) {
@@ -279,7 +279,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 						}
 					}
 					return true;
-				} else if ("show-icons".equals(mode)) {
+				} else if ("show-icons".equals(mode)) { //$NON-NLS-1$
 					if (cd.iconPath == null) {
 						return false;
 					}
@@ -289,7 +289,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 						}
 					}
 					if (packageFilter != null && packageFilter.isEmpty() == false) {
-						if (!cd.className.startsWith(packageFilter + ".")) {
+						if (!cd.className.startsWith(packageFilter + ".")) { //$NON-NLS-1$
 							return false;
 						}
 					}
@@ -301,7 +301,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 						}
 					}
 					if (packageFilter != null && packageFilter.isEmpty() == false) {
-						if (!cd.className.startsWith(packageFilter + ".")) {
+						if (!cd.className.startsWith(packageFilter + ".")) { //$NON-NLS-1$
 							return false;
 						}
 					}
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
index 13d8fedb60..3304ea3c7f 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
@@ -2,6 +2,7 @@
 
 import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
 
+@SuppressWarnings("nls")
 public class AddonTemplate
 {
   protected static String nl;
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
index 3e1851c458..a96e6e4dd0 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
@@ -2,6 +2,7 @@
 
 import org.eclipse.e4.internal.tools.wizards.classes.NewDynamicMenuContributionClassWizard.DynamicMenuContributionClass;
 
+@SuppressWarnings("nls")
 public class DynamicMenuContributionTemplate
 {
   protected static String nl;
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
index 97ba3918fd..fb47d050ee 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
@@ -2,6 +2,7 @@
 
 import org.eclipse.e4.internal.tools.wizards.classes.NewHandlerClassWizard.HandlerClass;
 
+@SuppressWarnings("nls")
 public class HandlerTemplate
 {
   protected static String nl;
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java
index b86273d29b..1d613c659c 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java
@@ -15,6 +15,7 @@
 
 import org.eclipse.e4.internal.tools.wizards.classes.NewImperativeExpressionClassWizard.ImperativeExpressionClass;
 
+@SuppressWarnings("nls")
 public class ImperativeExpressionTemplate
 {
 	protected static String nl;
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
index b3e2f5fcc9..342708881f 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
@@ -2,6 +2,7 @@
 
 import org.eclipse.e4.internal.tools.wizards.classes.NewPartClassWizard.PartClass;
 
+@SuppressWarnings("nls")
 public class PartTemplate
 {
   protected static String nl;
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
index 93ac4fc1a6..3f2805ea3b 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
@@ -2,6 +2,7 @@
 
 import org.eclipse.e4.internal.tools.wizards.classes.NewToolControlClassWizard.ToolControlClass;
 
+@SuppressWarnings("nls")
 public class ToolControlTemplate
 {
   protected static String nl;

From fe6267ba5cb999d17573ea9a9815dbb58c578442 Mon Sep 17 00:00:00 2001
From: laeubi <laeubi@users.noreply.github.com>
Date: Sun, 26 Nov 2023 06:15:29 +0000
Subject: [PATCH 1266/1286] Update for release 4.31

---
 tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml               | 2 +-
 .../org.eclipse.e4.tools.compatibility.migration.tests/pom.xml  | 2 +-
 tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 8b6c556b09..101fad2f51 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
   	<groupId>org.eclipse.platform</groupId>
     <artifactId>eclipse.platform.ui.tools</artifactId>
-    <version>4.30.0-SNAPSHOT</version>
+    <version>4.31.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
index 1951037237..24ae2a86ba 100644
--- a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
+++ b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.eclipse.platform</groupId>
 		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.30.0-SNAPSHOT</version>
+		<version>4.31.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.e4.tools.compatibility.migration.tests</artifactId>
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml b/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
index 83f4de969b..b07df9e402 100644
--- a/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
+++ b/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.eclipse.platform</groupId>
   		<artifactId>eclipse.platform.ui.tools</artifactId>
-		<version>4.30.0-SNAPSHOT</version>
+		<version>4.31.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.e4.tools.persistence.tests</artifactId>

From dffc604be22a54f7e323dd1990451e15a2d2b0c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= <jkubitz-eclipse@gmx.de>
Date: Thu, 30 Nov 2023 07:23:50 +0100
Subject: [PATCH 1267/1286] Remove blank Javadoc 1

This commit cleans up Javadoc that does not add information.
It resolves ecj warnings:
 `Javadoc: Description expected after ...`
It helps to prevent future empty javadoc by disabling
missingJavaDoc warnings. This resolves
 `Javadoc: Missing ...`

The modification is a result of regular expression search&replace:

in files `*.java`
 `^[\s]*\*[\s]*(@return|@param[\s]*[^\s]+|@throws[\s]*[^\s]+)\R([\s]*\*[\s]*@|[\s]*\*/\R)`
 ->`$2`
 `^([\s]*\*[\s]*\R)([\s]*\*/\R)`
 ->`$2`
 `^[\S\t ]*/\*\*\R[\s]*\*/\R`
 ->``

in files `org.eclipse.jdt.core.prefs`
 `org\.eclipse\.jdt\.core\.compiler\.problem\.missingJavadoc(Comments|Tags)\=[^\s]*`
 ->`org\.eclipse\.jdt\.core\.compiler\.problem\.missingJavadoc$1\=ignore`
---
 .../META-INF/MANIFEST.MF                        |  2 +-
 .../e4/tools/compat/internal/Messages.java      |  1 -
 .../tools/compat/internal/WorkbenchLogger.java  |  3 ---
 .../e4/tools/compat/parts/DIEditorPart.java     |  2 --
 .../e4/tools/compat/parts/DIHandler.java        |  2 --
 .../META-INF/MANIFEST.MF                        |  2 +-
 .../migration/PerspectiveMigrator.java          |  1 -
 .../compatibiliy/migration/E4MigrationTool.java |  1 -
 .../META-INF/MANIFEST.MF                        |  2 +-
 .../eclipse/e4/tools/emf/editor3x/Messages.java |  1 -
 .../e4/tools/emf/editor3x/RefactorModel.java    | 17 -----------------
 .../e4/tools/emf/editor3x/UndoAction.java       |  2 --
 .../RefactorParticipantDelegate.java            |  3 ---
 .../META-INF/MANIFEST.MF                        |  2 +-
 .../bundles/org.eclipse.e4.tools.emf.ui/pom.xml |  2 +-
 .../AbstractElementEditorContribution.java      |  3 ---
 .../emf/ui/common/ComboViewerAutoComplete.java  |  1 -
 .../ui/common/IClassContributionProvider.java   |  8 --------
 .../ui/common/IContributionClassCreator.java    |  4 ----
 .../emf/ui/common/IProviderStatusCallback.java  |  1 -
 .../e4/tools/emf/ui/common/ProviderStatus.java  |  1 -
 .../emf/ui/common/ResourceSearchScope.java      |  1 -
 .../eclipse/e4/tools/emf/ui/common/Util.java    |  3 ---
 .../component/AbstractComponentEditor.java      |  4 ----
 .../emf/ui/common/component/IdGenerator.java    |  7 -------
 .../internal/ObservableColumnLabelProvider.java |  4 ----
 .../ui/internal/common/AbstractPickList.java    |  1 -
 .../emf/ui/internal/common/Autocomplete.java    |  1 -
 .../emf/ui/internal/common/E4PickList.java      |  1 -
 .../ui/internal/common/E4StringPickList.java    |  1 -
 .../ui/internal/common/EClassLabelProvider.java |  1 -
 .../common/FeatureClassLabelProvider.java       |  1 -
 .../emf/ui/internal/common/ModelEditor.java     |  8 --------
 .../emf/ui/internal/common/TreeViewerEx.java    |  1 -
 .../common/component/ControlFactory.java        | 14 --------------
 .../common/component/StringModelFragment.java   |  4 ----
 .../AbstractIconDialogWithHardcodedScope.java   |  1 -
 .../component/dialogs/BundleImageCache.java     |  3 ---
 .../component/dialogs/ContributionDataFile.java |  1 -
 .../dialogs/FeatureSelectionDialog.java         |  3 ---
 .../dialogs/FilteredContributionDialog.java     |  4 ----
 .../FindParentReferenceElementDialog.java       |  2 --
 .../common/component/dialogs/MenuIdDialog.java  |  3 ---
 .../component/dialogs/ToolBarIdDialog.java      |  1 -
 .../tabs/ContributionUriCellEditor.java         |  1 -
 .../internal/common/component/tabs/DocUtil.java |  1 -
 .../common/component/tabs/E4ToolItemMenu.java   |  1 -
 .../tabs/EAttributeTableViewerColumn.java       |  1 -
 .../internal/common/component/tabs/EmfUtil.java |  9 ---------
 .../common/component/tabs/IGotoObject.java      |  1 -
 .../common/component/tabs/IViewEObjects.java    |  1 -
 .../internal/common/component/tabs/ListTab.java |  2 --
 .../internal/common/component/tabs/XmiTab.java  |  2 --
 .../internal/common/component/tabs/empty/E.java |  5 -----
 .../component/tabs/empty/EmptyFilterOption.java |  1 -
 .../tabs/empty/TitleAreaFilterDialog.java       |  5 -----
 .../TitleAreaFilterDialogWithEmptyOptions.java  |  1 -
 .../ProjectOSGiTranslationProvider.java         |  1 -
 .../common/resourcelocator/BundleConverter.java |  3 ---
 ...argetPlatformClassContributionCollector.java |  1 -
 .../TargetPlatformContributionCollector.java    |  2 --
 ...TargetPlatformIconContributionCollector.java |  1 -
 .../dialogs/BundleClassDialog.java              |  1 -
 .../resourcelocator/dialogs/DynamicWizard.java  |  5 -----
 .../dialogs/FindContributionDialog.java         |  1 -
 .../resourcelocator/dialogs/IconDialog.java     |  1 -
 .../dialogs/NonReferencedAction.java            |  1 -
 .../dialogs/NonReferencedActionPage.java        |  1 -
 .../dialogs/NonReferencedResourceWizard.java    |  1 -
 .../dialogs/PickProjectFolderPage.java          |  1 -
 .../dialogs/PickProjectPage.java                |  1 -
 .../resourcelocator/dialogs/UriDialog.java      |  1 -
 .../resourcelocator/dialogs/UriDialogType.java  |  1 -
 .../common/uistructure/ViewerElement.java       |  8 --------
 .../common/xml/EMFDocumentResourceMediator.java |  1 -
 .../emf/ui/internal/imp/ModelImportPage1.java   |  2 --
 .../tools/emf/ui/internal/imp/RegistryUtil.java | 11 -----------
 .../ui/internal/wbm/ApplicationModelEditor.java |  2 --
 .../META-INF/MANIFEST.MF                        |  2 +-
 .../E4TemplateCompletionProposalComputer.java   |  1 -
 .../META-INF/MANIFEST.MF                        |  2 +-
 .../internal/persistence/util/CommonUtil.java   |  1 -
 .../tools/persistence/PerspectivePersister.java |  2 --
 .../META-INF/MANIFEST.MF                        |  2 +-
 .../e4/tools/services/impl/Messages.java        |  1 -
 .../services/impl/ResourceBundleHelper.java     |  1 -
 .../impl/ResourceBundleTranslationProvider.java |  1 -
 .../org.eclipse.e4.tools/META-INF/MANIFEST.MF   |  2 +-
 .../org/eclipse/e4/internal/tools/Messages.java |  1 -
 .../model/BaseApplicationModelWizard.java       |  4 ----
 .../wizards/model/FragmentExtractHelper.java    |  1 -
 .../wizards/model/FragmentMergeHelper.java      |  3 ---
 .../tools/wizards/model/NewModelFilePage.java   |  1 -
 .../feature.xml                                 |  2 +-
 .../feature.xml                                 |  2 +-
 .../tools/test/FragmentExtractHelperTest.java   |  5 -----
 96 files changed, 11 insertions(+), 232 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 98941c8ecd..2b2500024b 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true
-Bundle-Version: 4.9.200.qualifier
+Bundle-Version: 4.9.300.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.29.0",
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
index d77f12ef4f..645c77c32d 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
+++ b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
@@ -18,7 +18,6 @@
 
 /**
  * @author Jonas
- *
  */
 public class Messages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.e4.tools.compat.internal.messages"; //$NON-NLS-1$
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
index c6659ab2a2..cce002edb2 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
+++ b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
@@ -132,9 +132,6 @@ public void setDebugOptions(DebugOptions options) {
 		}
 	}
 
-	/**
-	 * @param log
-	 */
 	@Inject
 	public void setFrameworkLog(FrameworkLog log) {
 		this.log = log;
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
index 51dfe8441d..b580ed0a41 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
+++ b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
@@ -43,8 +43,6 @@
  * class is supposed to be sub classed by clients.
  *
  * @author Jonas
- *
- * @param <C>
  */
 public abstract class DIEditorPart<C> extends EditorPart implements IDirtyProviderService {
 	private IEclipseContext context;
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
index 5626b68511..1e96080c7b 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
+++ b/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
@@ -26,8 +26,6 @@
  * This is a preliminary implementation of a Handler wrapper. It does not support @CanExecute yet
  *
  * @author Jonas
- *
- * @param <C>
  */
 public class DIHandler<C> extends AbstractHandler {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
index 6cab2c14c9..10bef69ee5 100644
--- a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.e4.tools.compatibility.migration
-Bundle-Version: 1.1.100.qualifier
+Bundle-Version: 1.1.200.qualifier
 Automatic-Module-Name: org.eclipse.e4.tools.compatibiliy.migration
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.e4.tools.persistence;bundle-version="1.0.0",
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java
index 001ae65adb..7c42315fa2 100644
--- a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java
+++ b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java
@@ -30,7 +30,6 @@
  * and apply 3.x and e4 perspectives.
  *
  * @since 1.0
- *
  */
 @SuppressWarnings("restriction")
 public final class PerspectiveMigrator{
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
index fca4f796fa..7bd05944d1 100644
--- a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
+++ b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
@@ -132,7 +132,6 @@
  *  
  *
  * @since 1.0
- *
  */
 @SuppressWarnings("restriction")
 public final class E4MigrationTool {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
index 80b8137f3f..6780f77151 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
-Bundle-Version: 4.9.200.qualifier
+Bundle-Version: 4.9.300.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.29.0",
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
index 7023215ecb..413b159d92 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
@@ -18,7 +18,6 @@
 
 /**
  * @author Jonas
- *
  */
 public class Messages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.e4.tools.emf.editor3x.messages"; //$NON-NLS-1$
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
index a44bdfdb36..cf7890a579 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
@@ -28,7 +28,6 @@
  * methods to get hold of an instance.
  *
  * @author Remain Software - Wim Jongman
- *
  */
 public class RefactorModel {
 
@@ -46,7 +45,6 @@ public class RefactorModel {
 	 * Factory for an empty model. Use the {@link #addTextRename(String, String)} method to add one or more text
 	 * renames.
 	 *
-	 * @param pParticipant
 	 * @return the model
 	 */
 	public static RefactorModel getModel(RefactoringParticipant pParticipant) {
@@ -58,9 +56,6 @@ public static RefactorModel getModel(RefactoringParticipant pParticipant) {
 	 * text
 	 * renames.
 	 *
-	 * @param pParticipant
-	 * @param pOldText
-	 * @param pNewText
 	 * @return the model.
 	 */
 	public static RefactorModel getModel(RefactoringParticipant pParticipant,
@@ -75,11 +70,6 @@ public static RefactorModel getModel(RefactoringParticipant pParticipant,
 	 * text
 	 * renames and the old and the new project.
 	 *
-	 * @param pParticipant
-	 * @param pOldText
-	 * @param pNewText
-	 * @param pOldProject
-	 * @param pNewProject
 	 * @return the model.
 	 */
 	public static RefactorModel getModel(RefactoringParticipant pParticipant,
@@ -94,8 +84,6 @@ public static RefactorModel getModel(RefactoringParticipant pParticipant,
 	 * Adds a text rename to be processed later. For example, if the project
 	 * name changes there can be <code>bundlclass://</code> and <code>platform:/plugin</code> changes.
 	 *
-	 * @param oldText
-	 * @param newText
 	 * @return the model
 	 */
 	public RefactorModel addTextRename(String oldText, String newText) {
@@ -159,7 +147,6 @@ public int getRenameCount() {
 	/**
 	 * Delegates to the same method of the embedded RefactoringParticipant.
 	 *
-	 * @param file
 	 * @return a TextChange object
 	 * @see RefactoringParticipant#getTextChange(Object)
 	 */
@@ -177,7 +164,6 @@ public boolean isProjectRename() {
 	/**
 	 * Sets the current 0-based index. May not be out of bounds.
 	 *
-	 * @param index
 	 * @return the model
 	 */
 	public RefactorModel setIndex(int index) {
@@ -190,8 +176,6 @@ public RefactorModel setIndex(int index) {
 	/**
 	 * Sets the old and the new project in case of project renaming.
 	 *
-	 * @param oldProject
-	 * @param newProject
 	 * @return the model
 	 */
 	public RefactorModel setProjectRename(IProject oldProject,
@@ -206,7 +190,6 @@ public RefactorModel setProjectRename(IProject oldProject,
 	/**
 	 * Sets the RefactoringParticipant.
 	 *
-	 * @param pParticipant
 	 * @return the model
 	 * @see RefactoringParticipant
 	 */
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
index 1fdf4d134a..4d910ec3eb 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
@@ -71,7 +71,6 @@ private void update() {
 	 *
 	 * For instance : Add Trimmedwindow or Delete 5 objects
 	 *
-	 * @param cmd
 	 * @return a description string for the command
 	 */
 	public static String getCommandLabel(Command cmd) {
@@ -96,7 +95,6 @@ public static String getCommandLabel(Command cmd) {
 	/**
 	 * Get the eClassname or empty string of the first element in the collection
 	 *
-	 * @param c
 	 * @return name of classname if object is an EObject else an empty string
 	 */
 	private static String getFirstClassName(Collection<?> c)
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java
index 3b167b9059..f5e9cd58e3 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java
@@ -46,12 +46,9 @@ class RefactorParticipantDelegate {
 	 * Creates a set of changes and returns a new {@link CompositeChange} or
 	 * adds the changes to the passed {@link CompositeChange}.
 	 *
-	 * @param pProgressMonitor
 	 * @param pModel
 	 *
 	 * @return a set of changes in a {@link CompositeChange}
-	 * @throws CoreException
-	 * @throws OperationCanceledException
 	 */
 	public static CompositeChange createChange(IProgressMonitor pProgressMonitor, final RefactorModel pModel)
 			throws CoreException, OperationCanceledException {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 979bf6d768..ddab7687c6 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.8.200.qualifier
+Bundle-Version: 4.8.300.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 101fad2f51..19217c5a3f 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.8.200-SNAPSHOT</version>
+  <version>4.8.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java
index 86690cff60..94b35198dd 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java
@@ -52,9 +52,6 @@ public abstract class AbstractElementEditorContribution {
 	 *            this contribution, added to the elements {@link CTabFolder}
 	 * @param context
 	 *            the data-binding context of the enclosing editor
-	 * @param master
-	 * @param editingDomain
-	 * @param project
 	 */
 	public abstract void createContributedEditorTab(Composite parent, EMFDataBindingContext context,
 			WritableValue<?> master, EditingDomain editingDomain, IProject project);
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
index 2f7a46b16d..4cb5f723ff 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
@@ -36,7 +36,6 @@
  * be dynamically generated from the viewers current contents.
  *
  * @author Steven Spungin
- *
  */
 public class ComboViewerAutoComplete {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
index ca83df70e8..5d7084c82c 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
@@ -71,8 +71,6 @@ public Filter(IProject project, String namePattern) {
 
 		/**
 		 * Sets the bundles to filter on
-		 *
-		 * @param filterBundles
 		 */
 		public void setBundles(List<String> filterBundles) {
 			bundles = filterBundles;
@@ -96,8 +94,6 @@ public List<String> getLocations() {
 
 		/**
 		 * Sets the installed project locations to filter on
-		 *
-		 * @param locations
 		 */
 		public void setLocations(List<String> locations) {
 			this.locations = locations;
@@ -109,8 +105,6 @@ public EnumSet<ResourceSearchScope> getSearchScope() {
 
 		/**
 		 * Sets the scope for the search.
-		 *
-		 * @param searchScope
 		 */
 		public void setSearchScope(EnumSet<ResourceSearchScope> searchScope) {
 			this.searchScope = searchScope;
@@ -119,8 +113,6 @@ public void setSearchScope(EnumSet<ResourceSearchScope> searchScope) {
 		/**
 		 * Include plain old java projects, resource projects, and others in
 		 * searches. No manifest required.
-		 *
-		 * @param includeNonBundles
 		 */
 		public void setIncludeNonBundles(boolean includeNonBundles) {
 			this.includeNonBundles = includeNonBundles;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
index 7f9d1b227d..bccd77b464 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
@@ -29,7 +29,6 @@ public interface IContributionClassCreator {
 	/**
 	 * Called to determine if the EClass is supported by the contribution
 	 *
-	 * @param element
 	 * @return <code>true</code> if supported
 	 */
 	public boolean isSupported(EClass element);
@@ -41,9 +40,6 @@ public interface IContributionClassCreator {
 	 * @param contribution
 	 *            the {@link MContribution} element to be created and
 	 *            subsequently opened in the editor
-	 * @param domain
-	 * @param project
-	 * @param shell
 	 */
 	public void createOpen(MContribution contribution, EditingDomain domain, IProject project, Shell shell);
 }
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java
index be3e50d779..de7ad51a53 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java
@@ -17,7 +17,6 @@
  * A callback used for a provider to notify a client of status changes
  *
  * @author Steven Spungin
- *
  */
 public interface IProviderStatusCallback {
 	void onStatusChanged(ProviderStatus status);
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java
index d0ad4aa532..8a4fd417d1 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java
@@ -18,7 +18,6 @@
  * Provider status used in IProviderStatusCallback
  *
  * @author Steven Spungin
- *
  */
 public enum ProviderStatus {
 	INITIALIZING, READY, CANCELLED
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java
index 5d034e7341..63ccf5b1dc 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java
@@ -21,7 +21,6 @@
  * projects, and target platform.
  *
  * @author Steven Spungin
- *
  */
 public enum ResourceSearchScope {
 	/**
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index 458d893f44..2f217420a6 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -300,7 +300,6 @@ public static ResourceSet getModelElementResources() {
 
 	/**
 	 * A listener to reset the cache of e4Xmi resource for the index research
-	 *
 	 */
 	private static void registerE4XmiListener() {
 		// Register once on the workspace.
@@ -403,7 +402,6 @@ public static Image scaleImage(Image img, int maxSize) {
 	 * This method checks if an EClass can be extended using a fragment. ie : it
 	 * must have containment EReference to a model object.
 	 *
-	 * @param c
 	 * @return true if at least one reference type is not a StringStringToMap or
 	 *         other no editable type
 	 */
@@ -422,7 +420,6 @@ public static boolean canBeExtendedInAFragment(EClass c) {
 	 * This method checks if an EReference can be considered in a model fragment ie
 	 * : it must be containment EReference to a model object.
 	 *
-	 * @param r
 	 * @return true if the reference is containment and type is not a
 	 *         StringStringToMap or other no editable type
 	 */
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 431a527a99..fbf7773df9 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -252,9 +252,6 @@ public Image getImage(Object element, String key) {
 
 	/**
 	 * Create a readable ImageDescriptor behind URI.
-	 *
-	 * @param uri
-	 * @return
 	 */
 	private ImageDescriptor getImageDescriptorFromUri(String uri) {
 		ImageDescriptor result = null;
@@ -375,7 +372,6 @@ public String translate(String string) {
 	}
 
 	/**
-	 * @param element
 	 * @return the list of actions that are populated in the import menu. Can be
 	 *         empty but is never null.
 	 */
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
index 99d45a07ec..b8908b2d0f 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
@@ -29,7 +29,6 @@
  * Auto generates an id based on another field's current value.
  *
  * @author Steven Spungin
- *
  */
 public class IdGenerator {
 
@@ -44,9 +43,6 @@ public class IdGenerator {
 	 * Bind must be called AFTER the master observable value is set in order to
 	 * properly initialize.
 	 *
-	 * @param master
-	 * @param ebpLabel
-	 * @param evpId
 	 * @param control
 	 *            Optional control.
 	 */
@@ -110,9 +106,6 @@ public void focusLost(org.eclipse.swt.events.FocusEvent e) {
 
 	/**
 	 * Strips all illegal id characters, and lower cases each word.
-	 *
-	 * @param value
-	 * @return
 	 */
 	protected static String trimToLowercase(String value) {
 		final String[] parts = value.split("\\s+"); //$NON-NLS-1$
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
index 18fc7b2a02..e0fd07f403 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
@@ -35,8 +35,6 @@ public class ObservableColumnLabelProvider<M> extends CellLabelProvider {
 
 	/**
 	 * Creates a new label provider that tracks changes to one attribute.
-	 *
-	 * @param attributeMap
 	 */
 	@SuppressWarnings("unchecked")
 	public ObservableColumnLabelProvider(IObservableMap<?, ?> attributeMap) {
@@ -47,8 +45,6 @@ public ObservableColumnLabelProvider(IObservableMap<?, ?> attributeMap) {
 	 * Creates a new label provider that tracks changes to more than one
 	 * attribute. This constructor should be used by subclasses that override
 	 * {@link #update(ViewerCell)} and make use of more than one attribute.
-	 *
-	 * @param attributeMaps
 	 */
 	@SuppressWarnings("unchecked")
 	protected ObservableColumnLabelProvider(IObservableMap<M, ?>[] attributeMaps) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
index ac0de6aa40..2e83a8b7e5 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
@@ -46,7 +46,6 @@
  * A composite widget containing a combo for picking items, a list with
  * selectable items, and action buttons for modifying the list.
  * </p>
- *
  */
 public abstract class AbstractPickList extends Composite {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java
index 7171e04400..c8fd01c01b 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java
@@ -30,7 +30,6 @@
 /**
  *
  * @author Steven Spungin
- *
  */
 public class Autocomplete {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
index b402ad2c19..a0199a6b9d 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
@@ -69,7 +69,6 @@
  * </p>
  *
  * @author Steven Spungin
- *
  */
 public class E4PickList extends AbstractPickList {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
index a230da5047..a38d471849 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
@@ -48,7 +48,6 @@
  * removing, and replacing.
  *
  * @author Steven Spungin
- *
  */
 public class E4StringPickList extends AbstractPickList {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
index 28eb671a07..5c587d32d9 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
@@ -22,7 +22,6 @@
  * Uses the default editor for the EClass to calculate the label
  *
  * @author Steven Spungin
- *
  */
 public class EClassLabelProvider extends LabelProvider {
 	private final ModelEditor editor;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
index 74c39eaa8d..9b3a072920 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
@@ -23,7 +23,6 @@
  * Uses the default editor for the FeatureClass EClass to calculate the label
  *
  * @author Steven Spungin
- *
  */
 public class FeatureClassLabelProvider extends LabelProvider {
 	private final ModelEditor editor;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 73ecc0d83c..863f1e650f 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -508,7 +508,6 @@ else if (listTab != null && editorTabFolder.getSelectionIndex() == getTabIndex(l
 	}
 
 	/**
-	 * @param tabItem
 	 * @return The index of the tab item. Should never return -1.
 	 */
 	public static int getTabIndex(CTabItem tabItem) {
@@ -1373,9 +1372,6 @@ private void registerEditor(EClass eClass, Class<? extends AbstractComponentEdit
 
 	/**
 	 * Register a class to use to create an editor for a given key
-	 *
-	 * @param ley
-	 * @param clazz
 	 */
 	private void registerEditor(String key, Class<? extends AbstractComponentEditor<?>> clazz) {
 		editorsClasses.put(key, clazz);
@@ -1383,9 +1379,6 @@ private void registerEditor(String key, Class<? extends AbstractComponentEditor<
 
 	/**
 	 * Register directly a created editor for a given key
-	 *
-	 * @param instanceClassName
-	 * @param clazz
 	 */
 	private void registerEditor(String key, AbstractComponentEditor<?> editor) {
 		editors.put(key, editor);
@@ -2035,7 +2028,6 @@ public boolean validateDrop(Object target, int operation, TransferData transferT
 	 * @param target   the target object where instance should be pasted of dropped
 	 * @param instance the instance of object to be pasted or dropped
 	 * @param isIndex  if true, means that target is an object in a container
-	 * @return
 	 */
 	private boolean isValidTarget(Object target, Object instance, boolean isIndex) {
 		if (target instanceof MElementContainer<?>) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
index 5990e7b5cd..c717742278 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
@@ -33,7 +33,6 @@
  * Adds additional functionality to TreeViewer
  *
  * @author Steven Spungin
- *
  */
 public class TreeViewerEx extends TreeViewer {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 81aa0e9a74..5e9352d2f5 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -118,7 +118,6 @@
  * moved in AbstractComponentEditor and the code would be really simplified
  * because all parameters in static functions are already defined in
  * AbstractComponentEditor
- *
  */
 public class ControlFactory {
 	public static final String COPY_HANDLER = ControlFactory.class.getName() + ".COPY_HANDLER"; //$NON-NLS-1$
@@ -389,12 +388,6 @@ public static <M> void createTextField(Composite parent, String label, IObservab
 
 	/**
 	 *
-	 * @param parent
-	 * @param label
-	 * @param master
-	 * @param context
-	 * @param textProp
-	 * @param modelProp
 	 * @param warningText
 	 *            Non null warningText means that a warning with this non-null text
 	 *            will be shown when the field is left empty
@@ -409,12 +402,6 @@ public static <M> void createTextField(Composite parent, String label, String to
 
 	/**
 	 *
-	 * @param parent
-	 * @param label
-	 * @param master
-	 * @param context
-	 * @param textProp
-	 * @param modelProp
 	 * @param decorationText
 	 *            Non null decorationText means that a message with this non-null
 	 *            text will be shown when the field is left empty
@@ -423,7 +410,6 @@ public static <M> void createTextField(Composite parent, String label, String to
 	 *            Supported types: FieldDecorationRegistry.DEC_ERROR,
 	 *            FieldDecorationRegistry.DEC_WARNING,
 	 *            FieldDecorationRegistry.DEC_INFORMATION
-	 *
 	 */
 	public static <M> void createTextField(Composite parent, String label, String tooltip, IObservableValue<M> master,
 			EMFDataBindingContext context, IWidgetValueProperty<Text, String> textProp,
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index 5ab5d8fa72..a83bb03644 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -193,8 +193,6 @@ public Composite doGetEditor(Composite parent, Object object) {
 	 * Returns the selectedContainer, which is the EClass behind the Extended
 	 * Element ID. It can be known thanks to the dialog or must be computed from
 	 * the ID value
-	 *
-	 * @return
 	 */
 	private EClass getSelectedContainer() {
 		if (selectedContainer != null) {
@@ -214,7 +212,6 @@ private EClass getSelectedContainer() {
 	 * Returns the selectedContainer, which is the EClass behind the Extended
 	 * Element ID. It can be known thanks to the dialog or must be computed from the
 	 * ID value
-	 *
 	 */
 	public static EClass findContainerType(MStringModelFragment modelFragment) {
 		// we get the StringModelFragment. If not initialized, no search...
@@ -521,7 +518,6 @@ public void dispose() {
 	/**
 	 * This method will update the picklist containing the list of possible
 	 * children classes
-	 *
 	 */
 	private void updateChildrenChoice() {
 		selectedContainer = getSelectedContainer();
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
index 852597bea9..9ec9c4d0e9 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
@@ -67,7 +67,6 @@
  * modifying model.
  *
  * @author Steven Spungin
- *
  */
 public abstract class AbstractIconDialogWithHardcodedScope extends SaveDialogBoundsSettingsDialog {
 	private TableViewer viewer;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
index 856063e99f..f8afe329e9 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
@@ -36,7 +36,6 @@
  * class, as placeholders are used.
  *
  * @author "Steven Spungin"
- *
  */
 public class BundleImageCache {
 
@@ -60,7 +59,6 @@ public BundleImageCache(Display display, ClassLoader classloader, IEclipseContex
 	/**
 	 * Creates the image, and tracks it for a bulk dispose operation.
 	 *
-	 * @param path
 	 * @return the {@link Image}
 	 */
 	public Image create(String path) {
@@ -78,7 +76,6 @@ public Image create(String path) {
 	/**
 	 * Uses IResourcePool to obtain image. Does not track object.
 	 *
-	 * @param key
 	 * @return The {@link Image}
 	 */
 	public Image loadFromKey(String key) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
index da92628489..4f8ffcf2da 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
@@ -52,7 +52,6 @@
  * the icon search dialog.
  *
  * @author Steven Spungin
- *
  */
 public class ContributionDataFile implements IFile {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index 04d6f8c9f8..880036b73e 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -409,8 +409,6 @@ private boolean match(String string) {
 		/**
 		 * The pattern string for which this filter should select elements in
 		 * the viewer.
-		 *
-		 * @param patternString
 		 */
 		public void setPattern(String patternString) {
 
@@ -429,7 +427,6 @@ public void setPattern(String patternString) {
 		 * Take the given filter text and break it down into words using a
 		 * BreakIterator.
 		 *
-		 * @param text
 		 * @return an array of words
 		 */
 		private String[] getWords(String text) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index 840d94e61f..bdf79341c9 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -94,7 +94,6 @@
  * Includes a filter text box, scope options, and filter options.
  *
  * @author Steven Spungin
- *
  */
 public abstract class FilteredContributionDialog extends SaveDialogBoundsSettingsDialog {
 
@@ -898,8 +897,6 @@ protected IFile getSelectedIfile() {
 	 * The function, through user intervention, may find a way to resolve the
 	 * file and return a resolution.
 	 *
-	 * @param file
-	 * @param installLocation
 	 * @return The original file, a fixed-up (copied or referred) file, or null.
 	 */
 	protected IFile checkResourceAccessible(final IFile file, String installLocation) {
@@ -1061,7 +1058,6 @@ static String getBundle(IProject project) {
 	/**
 	 * Searches the directory for a manifest and parses the symbolic name.
 	 *
-	 * @param rootDirectory
 	 * @return the id of the bundle if existing
 	 */
 	public static String getBundle(String rootDirectory) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index d124e217ae..31e9d8c229 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -276,8 +276,6 @@ public void widgetSelected(SelectionEvent e) {
 	 * This method returns classes that have extensible fields It rejects
 	 * eClasses having only transientData and persistedState for instance Result
 	 * is cached in a singleton for each dialog instances...
-	 *
-	 * @return
 	 */
 	private List<EClass> getExtendableClasses() {
 		if (extendableClasses == null) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
index 91fd10b122..9d66757236 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
@@ -104,9 +104,6 @@ protected List<MMenu> getViewerInput() {
 	/**
 	 * A menu may contain another {@link MMenu} as a child; we want them to be
 	 * shown as an additional entry, so we recursively dive into these elements
-	 *
-	 * @param mMenu
-	 * @param list
 	 */
 	private void performRecursiveCheck(MMenu mMenu, List<MMenu> list) {
 		List<MMenuElement> children = mMenu.getChildren();
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java
index 9cd371dd48..ac507ce61d 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java
@@ -96,7 +96,6 @@ protected String getListItemInformation(MToolBar listItem) {
 	 *
 	 * TODO Check which information is most relevant for the user
 	 *
-	 * @param toolBar
 	 * @return String
 	 */
 	private String getAdditionalInfoForToolBar(MToolBar toolBar) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
index 9d2930d3f0..08779b08a1 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
@@ -28,7 +28,6 @@
  * item.
  *
  * @author Steven Spungin
- *
  */
 public class ContributionUriCellEditor extends DialogCellEditor {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
index ea2257626d..14171863f6 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
@@ -23,7 +23,6 @@
  * Helper functions for working with documents.
  *
  * @author Steven Spungin
- *
  */
 @SuppressWarnings("restriction")
 public class DocUtil {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
index 08a4aad09e..b51a1672f5 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
@@ -37,7 +37,6 @@
  * set by querying the handler when the menu is opened.
  *
  * @author Steven Spungin
- *
  */
 public class E4ToolItemMenu {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
index 5dbbd61ee6..845088569f 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
@@ -31,7 +31,6 @@
  * have an attribute with the given ID, the field is disabled.
  *
  * @author Steven Spungin
- *
  */
 public class EAttributeTableViewerColumn {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
index 4f7274f477..56bc553fb1 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
@@ -21,15 +21,12 @@
  * Convenience methods for accessing EMF Objects
  *
  * @author Steven Spungin
- *
  */
 public class EmfUtil {
 	/**
 	 * Returns the EAttribute with the given name for the specified object, or
 	 * null if non-existent
 	 *
-	 * @param eObject
-	 * @param attName
 	 * @return the EAttribute with the given name for the specified object, or
 	 *         null if non-existent
 	 */
@@ -52,8 +49,6 @@ static public EAttribute getAttribute(EObject eObject, String attName) {
 	 * specified object. Returns null if the attribute is not define, or has
 	 * null as the value.
 	 *
-	 * @param eObject
-	 * @param attName
 	 * @return the EAttribute value with the given attribute name for the
 	 *         specified object, Returns null if the attribute is not defined,
 	 *         or has null as the value.
@@ -69,10 +64,6 @@ static public Object getAttributeValue(EObject eObject, String attName) {
 	/**
 	 * Returns the EAttribute value with the given attribute name for the
 	 * specified object. Throws if the attribute is not defined.
-	 *
-	 * @param eObject
-	 * @param attName
-	 * @throws Exception
 	 */
 	static public Object getAttributeValueThrows(EObject eObject, String attName) throws Exception {
 		final EAttribute att = getAttribute(eObject, attName);
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java
index adf54eebcd..a5f1c79964 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java
@@ -20,7 +20,6 @@
  * This interface allows a UI object to reveal and select an EMF object.
  *
  * @author Steven Spungin
- *
  */
 public interface IGotoObject {
 	/**
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
index 1cb496c647..2e10cb46a2 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
@@ -23,7 +23,6 @@
  * editors that display EObjects.
  *
  * @author Steven Spungin
- *
  */
 public interface IViewEObjects {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index 0a2bf6ec23..6f83639421 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -111,7 +111,6 @@
  * EObject features.
  *
  * @author Steven Spungin
- *
  */
 public class ListTab implements IViewEObjects {
 
@@ -789,7 +788,6 @@ protected Control createContents(Composite parent) {
 	/**
 	 * Adds a column if it does not already exist
 	 *
-	 * @param attName
 	 * @return The existing or newly created column
 	 */
 	private EAttributeTableViewerColumn addColumn(String attName) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
index 7be2d4ee43..9d2fbf5643 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
@@ -142,8 +142,6 @@ public void keyPressed(KeyEvent e) {
 
 	/**
 	 *
-	 * @param text
-	 * @param startOffset
 	 * @return The endOFfset, or -1 if not found
 	 */
 	protected int searchAndHighlight(String text, int startOffset) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java
index 0c49fc2b06..a10bfa7d3b 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java
@@ -21,7 +21,6 @@
  * An object is empty if it is null, an empty string, or an empty collection
  *
  * @author Steven Spungin
- *
  */
 public class E {
 
@@ -59,8 +58,6 @@ public static boolean isEmpty(Object object) {
 
 	/**
 	 *
-	 * @param obj1
-	 * @param obj2
 	 * @return true if (both objects are null) or (both objects are not null and
 	 *         equal)
 	 */
@@ -80,8 +77,6 @@ static public boolean equals(Object obj1, Object obj2) {
 	/**
 	 * Compares 2 objects.
 	 *
-	 * @param obj1
-	 * @param obj2
 	 * @return If both objects are null, returns 0. If only 1 object is null, it
 	 *         will return 1 or -1. Otherwise call compareTo on the first
 	 *         object.
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java
index ab64a45f2a..6289ff630d 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java
@@ -19,7 +19,6 @@
  * An empty value is a null object, empty string, or empty collection.
  *
  * @author Steven Spungin
- *
  */
 public enum EmptyFilterOption {
 	/**
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
index 4787e1da16..052c98c706 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
@@ -36,7 +36,6 @@
  * pressed. A result of Dialog.Ok is ensured to have at least 1 selected item.
  *
  * @author Steven Spungin
- *
  */
 public class TitleAreaFilterDialog extends TitleAreaDialog {
 
@@ -93,10 +92,6 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 	/**
 	 * Default returns true if string value contains the filterText, and it is
 	 * case insensitive.
-	 *
-	 * @param element
-	 * @param filterText
-	 * @return
 	 */
 	protected boolean isFiltered(Object element, String filterText) {
 		filterText = filterText.toLowerCase();
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
index 88a2480e87..eeca2144d2 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
@@ -28,7 +28,6 @@
  * excluding, and selecting empty values.
  *
  * @author Steven Spungin
- *
  */
 public class TitleAreaFilterDialogWithEmptyOptions extends TitleAreaFilterDialog {
 	private Button btnExcludeEmptyValues;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
index 49d336a480..b983cd49ba 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
@@ -279,7 +279,6 @@ public ResourceBundle newBundle(String baseName, Locale locale, String format, C
 		/**
 		 * Loads the properties file by using the {@link IProject} of the {@link ProjectOSGiTranslationProvider}.
 		 *
-		 * @param name
 		 * @return The {@link InputStream} to the properties file to load
 		 */
 		protected InputStream getResourceAsStream(String name) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java
index 61ed33986d..80890f19a5 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java
@@ -25,15 +25,12 @@
  * Converts the given install location into a bundle.
  *
  * @author Steven Spungin
- *
  */
 public class BundleConverter {
 
 	/**
 	 *
-	 * @param installLocation
 	 * @return The bundleId of the bundle, or null if not converted
-	 * @throws Exception
 	 */
 	public static String convertProjectToBundle(String installLocation, IWorkspace workspace) throws Exception {
 		IPath project = IPath.fromOSString(installLocation);
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java
index cb59615d91..844d31c42b 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java
@@ -21,7 +21,6 @@
  * Uses FilterEx for bundle, package, and location filtering
  *
  * @author Steven Spungin
- *
  */
 public class TargetPlatformClassContributionCollector extends TargetPlatformContributionCollector {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
index 358d008773..9812e72a8a 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
@@ -83,7 +83,6 @@
  * contents.
  *
  * @author Steven Spungin
- *
  */
 @SuppressWarnings("restriction")
 public abstract class TargetPlatformContributionCollector extends ClassContributionCollector {
@@ -281,7 +280,6 @@ public Collection<String> getLocations() {
 	 *
 	 * @param force
 	 *            true to force reload the cache
-	 * @param providerStatusCallback
 	 */
 	private void reloadCache(boolean force, final IProviderStatusCallback providerStatusCallback) {
 		if (cacheEntry.isEmpty() || force) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java
index a9d9f97b1b..0793cfeb23 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java
@@ -23,7 +23,6 @@
  * Uses FilterEx for bundle, package, and location filtering
  *
  * @author Steven Spungin
- *
  */
 public class TargetPlatformIconContributionCollector extends TargetPlatformContributionCollector {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
index 6bb7db853b..8ae4d5cf4f 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
@@ -47,7 +47,6 @@
  * A dialog for creating, editing, replacing, or removing a bundleclass.
  *
  * @author Steven Spungin
- *
  */
 public class BundleClassDialog extends Dialog implements UriDialog {
 	private Text txtUri;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
index b3b7fb6ee8..e1871c5d0e 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
@@ -26,7 +26,6 @@
  * private in the base class...
  *
  * @author Steven Spungin
- *
  */
 public class DynamicWizard extends Wizard {
 
@@ -72,8 +71,6 @@ public void addPage(IWizardPage page) {
 
 	/**
 	 * Override the message on the first page if specified
-	 *
-	 * @param page
 	 */
 	private void updateMessage() {
 		if (E.notEmpty(message) && pages.size() > 0) {
@@ -114,8 +111,6 @@ public void clearDynamicPages() {
 
 	/**
 	 * Overrides the message of the first page if not <em>empty</em>
-	 *
-	 * @param message
 	 */
 	public void setMessage(String message) {
 		this.message = message;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
index b46c5b1636..b1213cfdfb 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
@@ -58,7 +58,6 @@
  * package
  *
  * @author Steven Spungin
- *
  */
 public class FindContributionDialog extends TitleAreaDialog {
 	private final IProject project;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
index 7164a34ef2..4abd392ba0 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
@@ -43,7 +43,6 @@
  * A dialog for creating, editing, replacing, or removing a bundleclass.
  *
  * @author Steven Spungin
- *
  */
 public class IconDialog extends Dialog implements UriDialog {
 	private Text txtUri;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java
index 43fec42ddc..edbd20814a 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java
@@ -18,7 +18,6 @@
  * Actions used to resolve non referenced resource issues.
  *
  * @author Steven Spungin
- *
  */
 public enum NonReferencedAction {
 	REQUIRE, IMPORT, COPY, COPY_TO_OTHER, USE_ANYWAY, CONVERT_AND_REQUIRE
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
index c296a3c4f3..65d4d5d6e9 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
@@ -57,7 +57,6 @@
  * actions to resolve issues.
  *
  * @author Steven Spungin
- *
  */
 public class NonReferencedActionPage extends WizardPage {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
index 051d8a2205..6f0ce41f5d 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
@@ -25,7 +25,6 @@
  * A Wizard for resolving unreferenced resources
  *
  * @author Steven Spungin
- *
  */
 public class NonReferencedResourceWizard extends DynamicWizard {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
index 3219f3f6ec..50203ea686 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
@@ -38,7 +38,6 @@
  * Wizard page to select a project folder
  *
  * @author Steven Spungin
- *
  */
 public class PickProjectFolderPage extends WizardPage {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
index b55a4b1650..efee9aea29 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
@@ -35,7 +35,6 @@
  * Wizard page to select a referenced project
  *
  * @author Steven Spungin
- *
  */
 public class PickProjectPage extends WizardPage {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java
index ee320ae6ad..df528271f7 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java
@@ -18,7 +18,6 @@
  * An interface for a URI Dialog
  *
  * @author Steven Spungin
- *
  */
 public interface UriDialog {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java
index c97daa986f..d1e052b2c8 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java
@@ -18,7 +18,6 @@
  * Enum of various URI Dialog Types
  *
  * @author Steven Spungin
- *
  */
 public enum UriDialogType {
 	BUNDLECLASS, ICON
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
index 55cfb989c2..7299d9e78e 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
@@ -37,7 +37,6 @@
  * A viewer with buttons.
  *
  * @author wim.jongman@remainsoftware.com
- *
  */
 public class ViewerElement {
 
@@ -53,10 +52,6 @@ public class ViewerElement {
 
 	private Button upButton;
 
-	/**
-	 * @param parent
-	 * @param editor
-	 */
 	@Inject
 	public ViewerElement(Composite parent, AbstractComponentEditor<?> editor) {
 		this.parent = parent;
@@ -177,9 +172,6 @@ public ComboViewer getDropDown() {
 	 * Creates and returns a new instance of this class based on the supplied
 	 * context.
 	 *
-	 * @param parentContext
-	 * @param parent
-	 * @param editor
 	 * @return a new {@link ViewerElement}
 	 */
 	public static ViewerElement create(IEclipseContext parentContext, Composite parent,
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
index 68256a3a63..399d639cd1 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
@@ -104,7 +104,6 @@ private String toXMI(EObject root) {
 	}
 
 	/**
-	 * @param object
 	 * @return The region for the start tag of the EObject, or null if not
 	 *         found.
 	 */
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
index f4bf6472bf..bf6d44724b 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
@@ -111,8 +111,6 @@ public ModelImportPage1() {
 
 	/**
 	 * Create contents of the wizard.
-	 *
-	 * @param parent
 	 */
 	@Override
 	public void createControl(Composite parent) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
index aa924ce5a1..e0732335d9 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
@@ -69,12 +69,6 @@ public class RegistryUtil {
 	public final static String HINT_EDITOR = EDITOR;
 	public final static String HINT_COMPAT_VIEW = "compatibilityView"; //$NON-NLS-1$
 
-	/**
-	 *
-	 * @param t
-	 * @param application
-	 * @param elements
-	 */
 	public static MApplicationElement[] getModelElements(Class<? extends MApplicationElement> t, String hint,
 			MApplication application, IConfigurationElement... elements) {
 
@@ -331,8 +325,6 @@ private static String getContributionURI(IConfigurationElement element, String a
 	 * Returns a list of bundle id's that have extension to the passed extension
 	 * point.
 	 *
-	 * @param registry
-	 * @param extensionPoint
 	 * @return the bundle ids as an array of Strings
 	 */
 	public static String[] getProvidingBundles(IExtensionRegistry registry, String extensionPoint, boolean isLive) {
@@ -362,8 +354,6 @@ public static String[] getProvidingBundles(IExtensionRegistry registry, String e
 
 	/**
 	 *
-	 * @param registry
-	 * @param struct
 	 * @return the array of {@link IConfigurationElement} objects that meets the
 	 *         passed criteria.
 	 */
@@ -396,7 +386,6 @@ public static IConfigurationElement[] getExtensions(IExtensionRegistry registry,
 	 * This will return a structure that contains the registry information we
 	 * are looking for.
 	 *
-	 * @param applicationElement
 	 * @return the structure that matches the extension registry to the passed {@link ApplicationElement}
 	 */
 	public static RegistryStruct getStruct(Class<? extends MApplicationElement> applicationElement, String hint) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index 5e85eed4ea..d924e11965 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -138,8 +138,6 @@ private void hidePart(final boolean force) {
 	/**
 	 * Shows an error dialog based on the passed exception. It should never
 	 * occur but if it does, the user can report a problem.
-	 *
-	 * @param exc
 	 */
 	protected void statusDialog(final Exception exc) {
 		try {
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
index d43c775e53..f23be8da69 100644
--- a/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true
-Bundle-Version: 4.10.200.qualifier
+Bundle-Version: 4.10.300.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.20.0",
  org.eclipse.ui.editors;bundle-version="3.6.0",
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java b/tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
index f7b24faeb3..3b0618acc5 100644
--- a/tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
@@ -33,7 +33,6 @@
 
 /**
  * Computer that computes the template proposals for the E4 context type.
- *
  */
 @SuppressWarnings("restriction")
 public class E4TemplateCompletionProposalComputer extends AbstractTemplateCompletionProposalComputer {
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
index 05f50a6fb1..7c81bdca64 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.persistence;singleton:=true
 Automatic-Module-Name: org.eclipse.e4.tools.persistence
-Bundle-Version: 1.1.100.qualifier
+Bundle-Version: 1.1.200.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java
index 20ea1643ae..127f757955 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java
@@ -51,7 +51,6 @@
  * A Util for the workbench conversion.
  *
  * @since 3.3
- *
  */
 @SuppressWarnings({ "restriction" })
 public final class CommonUtil {
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java
index 3c73aeab2a..1d46ed3dc4 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java
@@ -403,8 +403,6 @@ private static void replaceEditorAreaContents(final MWindow currentWindow, final
 
 	/**
 	 * Activates all editors in the given editor area once to initialize them.
-	 *
-	 * @param editorArea
 	 */
 	private static void activateEditors(MArea editorArea) {
 		final EPartService partService = CommonUtil.getEPartService();
diff --git a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index ccf7dea7be..dbb24ef888 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools.services
-Bundle-Version: 4.10.300.qualifier
+Bundle-Version: 4.10.400.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: org.eclipse.e4.tools.services;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.compat,org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.emf.ui",
  org.eclipse.e4.tools.services.impl;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.ui"
diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java
index 9a7c2f7a0d..0261c0fbf5 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java
+++ b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java
@@ -18,7 +18,6 @@
 
 /**
  * @author Jonas
- *
  */
 public class Messages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.e4.tools.services.impl.messages"; //$NON-NLS-1$
diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
index 2f66179b19..3c019b9689 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
+++ b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
@@ -362,7 +362,6 @@ else if (localeParts[1].length() == 2) {
 	 * s you have to use the bundleclass URI with the Message annotation.
 	 *
 	 * @author Dirk Fauth
-	 *
 	 */
 	static class BundleResourceBundleControl extends ResourceBundle.Control {
 
diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
index b619c1bb5a..bcd1af5464 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
+++ b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
@@ -20,7 +20,6 @@
  * Wrapper class for accessing translations out of a {@link ResourceBundle}.
  *
  * @author Dirk Fauth
- *
  */
 public class ResourceBundleTranslationProvider {
 
diff --git a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
index e6172f2ce8..5173aec2a9 100644
--- a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
+++ b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true
-Bundle-Version: 4.10.200.qualifier
+Bundle-Version: 4.10.300.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.29.0",
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
index d33ff60b6e..fd4ca480ae 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
@@ -18,7 +18,6 @@
 
 /**
  * @author Jonas
- *
  */
 public class Messages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.e4.internal.tools.messages"; //$NON-NLS-1$
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
index 919227713e..efcdc17d7c 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
@@ -434,10 +434,6 @@ private IPluginElement copyExtensionElement(IExtensionsModelFactory factory, fin
 
 	}
 
-	/**
-	 * @param resource
-	 * @param rootObject
-	 */
 	protected void mergeWithExistingFile(Resource resource, EObject rootObject) {
 		// do nothing
 
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
index c63376c7b9..508a13a0de 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
@@ -32,7 +32,6 @@
 
 /**
  * @author Jonas Helming
- *
  */
 public class FragmentExtractHelper {
 
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java
index a6efba50fa..b682d01dc4 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java
@@ -29,7 +29,6 @@
  * Helper to merge two Fragments Files into one.
  *
  * @author Jonas
- *
  */
 public class FragmentMergeHelper {
 
@@ -70,8 +69,6 @@ public static void merge(MModelFragments sourceFragments, MModelFragments target
 
 	/**
 	 * Replaces imports by elements which got imported.
-	 *
-	 * @param targetFragments
 	 */
 	private static void consolidateImports(MModelFragments targetFragments) {
 		final List<MModelFragment> fragments = targetFragments.getFragments();
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
index 6bc481435a..af64191b9e 100644
--- a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
+++ b/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
@@ -55,7 +55,6 @@ public class NewModelFilePage extends WizardPage {
 
 	/**
 	 * Constructor for SampleNewWizardPage.
-	 *
 	 */
 	public NewModelFilePage(ISelection selection, String defaultFilename) {
 		super(PAGE_NAME);
diff --git a/tools/features/org.eclipse.e4.core.tools.feature/feature.xml b/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
index ff0634f3a2..57ffae4d0e 100644
--- a/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/tools/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.30.0.qualifier"
+      version="4.30.100.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml b/tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml
index e49baded01..819e0ba342 100644
--- a/tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml
+++ b/tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.tools.persistence.feature"
       label="%featureName"
-      version="1.1.200.qualifier"
+      version="1.1.300.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/tools/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java b/tools/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
index ebe6a1b488..c39d0e8504 100644
--- a/tools/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
+++ b/tools/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
@@ -50,7 +50,6 @@
 
 /**
  * @author Jonas
- *
  */
 public class FragmentExtractHelperTest {
 
@@ -361,10 +360,6 @@ public void testExtractTwoPartsWithTwoBindingContexts() {
 		assertEquals(1, part2.getBindingContexts().size());
 	}
 
-	/**
-	 * @return
-	 *
-	 */
 	private MHandledItem createHandledItem() {
 		final MHandledItem handledItem = MMenuFactory.INSTANCE.createHandledMenuItem();
 		handledItem.setElementId(HANDLER1ID);

From ec4ac37dff92d5dd4b512e36e3284eda8c3aaf64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= <jkubitz-eclipse@gmx.de>
Date: Mon, 20 Nov 2023 13:55:13 +0100
Subject: [PATCH 1268/1286] enable explicitlyClosedAutoCloseable=warning

---
 .../.settings/org.eclipse.jdt.core.prefs                        | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                        | 2 +-
 .../tools/emf/ui/common/component/AbstractComponentEditor.java  | 1 -
 .../.settings/org.eclipse.jdt.core.prefs                        | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                        | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                        | 2 +-
 .../.settings/org.eclipse.jdt.core.prefs                        | 2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
index 453d3b36b8..9e8304a085 100644
--- a/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
+++ b/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
@@ -46,7 +46,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
index 13da295242..590e2b3098 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
@@ -45,7 +45,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index fbf7773df9..9819252f11 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -268,7 +268,6 @@ private ImageDescriptor getImageDescriptorFromUri(String uri) {
 		return result;
 	}
 
-	@SuppressWarnings("resource")
 	private static URL findPlatformImage(String uri) {
 		// SEVERAL CASES are possible here :
 		// * uri = platform:/plugin/myplugin/icons/image.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs
index ed46289372..3c34d2de6b 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs
@@ -25,7 +25,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
diff --git a/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs b/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
index ecdd88b4da..2414581257 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
+++ b/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
@@ -48,7 +48,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs
index 4d6b857ee0..7c9f05462a 100644
--- a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs
@@ -41,7 +41,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs b/tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs
index 66a5d7d299..8c5280d139 100644
--- a/tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs
@@ -39,7 +39,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning

From 21921eb9f8a06f99121e83f96f1109f5f8ae8c6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= <jkubitz-eclipse@gmx.de>
Date: Fri, 10 Nov 2023 10:40:13 +0100
Subject: [PATCH 1269/1286] Disable some org.eclipse.jdt.core.compiler.problem

To reduce problem markers in workspace.

autoboxing=ignore
missingDefaultCase=ignore
rawTypeReference=ignore
undocumentedEmptyBlock=ignore
uncheckedTypeOperation=ignore

Those are no real problems and ignored by developers for years.

Only for projects that actually have shown many of those markers. For
projects with few markers "@SuppressWarnings" was added instead.
---
 .../tools/internal/compatibiliy/migration/E4MigrationTool.java   | 1 -
 .../e4/tools/persistence/tests/PerspectivePersisterTest.java     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
index 7bd05944d1..e4976683a3 100644
--- a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
+++ b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
@@ -837,7 +837,6 @@ private void visitEditors(final MWindow window, final IMemento memento) {
 		}
 	}
 
-	@SuppressWarnings("unused")
 	private void visitPerspectiveBar(final IMemento memento) {
 		// Ignore.
 	}
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java b/tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java
index 64206015a1..a1f8bf966d 100644
--- a/tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java
+++ b/tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java
@@ -22,7 +22,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-@SuppressWarnings("restriction")
 class PerspectivePersisterTest {
 	
 	private Display display = null;

From 635f89a7568fcab0f9471e12e10b5454272308be Mon Sep 17 00:00:00 2001
From: Heiko Klare <heiko.klare@vector.com>
Date: Thu, 23 Nov 2023 11:52:25 +0100
Subject: [PATCH 1270/1286] Set encoding for projects missing explicit encoding
 to UTF-8

Also removes an obsolete ISO-8859-1 encoding specification for a single
NLS file.
---
 .../.settings/org.eclipse.core.resources.prefs                  | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 tools/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.resources.prefs

diff --git a/tools/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.resources.prefs b/tools/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/tools/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

From 44c4646fb76a463839c74cb1e3cca1b07e91eae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= <jkubitz-eclipse@gmx.de>
Date: Wed, 6 Dec 2023 14:08:07 +0100
Subject: [PATCH 1271/1286] Solve some "Discouraged access" by using API

---
 .../dialogs/NonReferencedActionPage.java          |  3 +--
 .../dialogs/NonReferencedResourceDialog.java      | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
index 65d4d5d6e9..f2a56a5f75 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
@@ -39,7 +39,6 @@
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.internal.core.util.CoreUtility;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -386,7 +385,7 @@ public void copyResourceToProject() {
 			// file).getContributionData().className + ".class";
 			IPath newPath = IPath.fromOSString(path);
 			if (newPath.isEmpty() == false) {
-				CoreUtility.createFolder(project.getFolder(newPath));
+				NonReferencedResourceDialog.createFolder(project.getFolder(newPath));
 			}
 			if (className != null) {
 				newPath.append(className + ".class"); //$NON-NLS-1$
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
index e57f9c2a88..5e7d060f5a 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
@@ -23,7 +23,9 @@
 import java.util.jar.Manifest;
 import java.util.zip.ZipFile;
 
+import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
@@ -39,7 +41,6 @@
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.pde.internal.core.util.CoreUtility;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -404,6 +405,16 @@ public IFile getResult() {
 		return result;
 	}
 
+	public static void createFolder(IFolder folder) throws CoreException {
+		if (!folder.exists()) {
+			IContainer parent = folder.getParent();
+			if (parent instanceof IFolder) {
+				createFolder((IFolder) parent);
+			}
+			folder.create(true, true, null);
+		}
+	}
+
 	public void copyResourceToProject(IProject project) {
 		try {
 			final ProjectFolderPickerDialog dlg = new ProjectFolderPickerDialog(getShell(), project, file.getFullPath()
@@ -423,7 +434,7 @@ protected Control createContents(Composite parent) {
 				// file).getContributionData().className + ".class";
 				IPath newPath = IPath.fromOSString(dlg.getValue());
 				if (newPath.isEmpty() == false) {
-					CoreUtility.createFolder(project.getFolder(newPath));
+					createFolder(project.getFolder(newPath));
 				}
 				if (className != null) {
 					newPath.append(className + ".class"); //$NON-NLS-1$

From 3db817e9b65c2d514c9e1a3c7f2d93b8dc46bf65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= <jkubitz-eclipse@gmx.de>
Date: Wed, 6 Dec 2023 14:11:38 +0100
Subject: [PATCH 1272/1286] some @SuppressWarnings("restriction") on PDE/JDT
 internals

To get rid of all "Discouraged access" warnings
---
 .../src/org/eclipse/e4/tools/emf/ui/common/Util.java        | 4 ++--
 .../component/dialogs/FilteredContributionDialog.java       | 1 +
 .../emf/ui/internal/common/properties/ExportIdsHandler.java | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
index 2f217420a6..d2b7280888 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
@@ -56,7 +56,6 @@
 import org.eclipse.jface.fieldassist.ControlDecoration;
 import org.eclipse.jface.fieldassist.FieldDecoration;
 import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
-import org.eclipse.pde.internal.core.PDEExtensionRegistry;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Control;
@@ -234,6 +233,7 @@ public static boolean moveElementByIndex(EditingDomain editingDomain, MUIElement
 	 * resources. It is updated when the workspace changes.. else it returns the
 	 * cached values.
 	 */
+	@SuppressWarnings("restriction") // uses org.eclipse.pde.internal.core.PDEExtensionRegistry
 	public static ResourceSet getModelElementResources() {
 
 		// Return previous computed result while workspace did not change...
@@ -244,7 +244,7 @@ public static ResourceSet getModelElementResources() {
 		registerE4XmiListener(); // Done only once.
 
 		modelResourceSet = new ResourceSetImpl();
-		final PDEExtensionRegistry reg = new PDEExtensionRegistry();
+		final org.eclipse.pde.internal.core.PDEExtensionRegistry reg = new org.eclipse.pde.internal.core.PDEExtensionRegistry();
 		IExtension[] extensions = reg.findExtensions("org.eclipse.e4.workbench.model", true); //$NON-NLS-1$
 		final IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index bdf79341c9..122399df93 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -95,6 +95,7 @@
  *
  * @author Steven Spungin
  */
+@SuppressWarnings("restriction") // uses org.eclipse.pde.internal
 public abstract class FilteredContributionDialog extends SaveDialogBoundsSettingsDialog {
 
 	private static final int MAX_RESULTS = 500;
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
index 66edba160b..08b304a0ad 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
@@ -43,7 +43,6 @@
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.core.JavaProject;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -94,8 +93,9 @@ public ExportIdDialog(Shell parentShell, Messages messages, IObservableList<?> l
 			this.pool = pool;
 
 			clazz = new JavaClass();
-
-			if (JavaProject.hasJavaNature(project)) {
+			@SuppressWarnings("restriction")
+			boolean hasJavaNature = org.eclipse.jdt.internal.core.JavaProject.hasJavaNature(project);
+			if (hasJavaNature) {
 				try {
 					IJavaProject javaProject = JavaCore.create(project);
 					for (IPackageFragmentRoot iPackageFragmentRoot : javaProject.getAllPackageFragmentRoots()) {

From ce894fd44d85659e19357d12e82144c56b5fa072 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Mon, 4 Dec 2023 15:17:37 +0100
Subject: [PATCH 1273/1286] Apply Make inner classes static where possible
 clean-up

Using "Make inner classes static where possible" JDT UI clean-up on
platform UI
---
 .../org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java | 2 +-
 .../component/dialogs/AbstractIconDialogWithHardcodedScope.java | 2 +-
 .../component/dialogs/AbstractIconDialogWithScopeAndFilter.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
index a0199a6b9d..77b43619d3 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
@@ -299,7 +299,7 @@ protected int getItemCount() {
 		return ((ObservableListContentProvider<?>) viewer.getContentProvider()).getElements(viewer.getInput()).length;
 	}
 
-	private class TableViewerEditorActivationStrategy extends ColumnViewerEditorActivationStrategy {
+	private static class TableViewerEditorActivationStrategy extends ColumnViewerEditorActivationStrategy {
 
 		public TableViewerEditorActivationStrategy(ColumnViewer viewer) {
 			super(viewer);
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
index 9ec9c4d0e9..807c318cfa 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
@@ -271,7 +271,7 @@ public String getValue() {
 		return value;
 	}
 
-	private class IconMatchCallback {
+	private static class IconMatchCallback {
 		private volatile boolean cancel;
 		private final IObservableList<IFile> list;
 
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
index 4309b6f94a..9fa56f548c 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
@@ -301,7 +301,7 @@ protected void okPressed() {
 		}
 	}
 
-	private class IconMatchCallback {
+	private static class IconMatchCallback {
 		private volatile boolean cancel;
 		private final IObservableList<Entry> list;
 

From b07c6ab7304ec3b04ee1a568849dd22b5d571659 Mon Sep 17 00:00:00 2001
From: Andrey Loskutov <loskutov@gmx.de>
Date: Thu, 14 Dec 2023 14:59:18 +0100
Subject: [PATCH 1274/1286] Touch bundles affected by the changed ecj version

See https://github.com/eclipse-jdt/eclipse.jdt.core/issues/1394
See https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659
---
 .../org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt   | 1 +
 .../bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt | 1 +
 .../org.eclipse.e4.tools.services/forceQualifierUpdate.txt       | 1 +
 tools/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt      | 1 +
 4 files changed, 4 insertions(+)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt
index 6aec2518a4..e69b5933c0 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt
+++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt
@@ -2,3 +2,4 @@
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
 Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659
\ No newline at end of file
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
index ac6e423562..060cfa9d4d 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
@@ -7,3 +7,4 @@ Bug 562167 - Comparator errors in I20200415-0620
 Bug 566471 - I20200828-0150 - Comparator Errors Found
 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1378
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659
\ No newline at end of file
diff --git a/tools/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
index c8b95be656..36afaa623a 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
+++ b/tools/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
@@ -4,3 +4,4 @@ Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
 Bug 509973 - Comparator errors in I20170105-0320
 Bug 534597 - Unanticipated comparator errors in I20180511-2000
 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659
\ No newline at end of file
diff --git a/tools/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
index 5a9a61516d..a6346c592f 100644
--- a/tools/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
+++ b/tools/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
@@ -3,3 +3,4 @@ Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
 Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
 Bug 567095 - Comparator errors in I20200917-1800
 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659
\ No newline at end of file

From ddbc47bb7012f667542a7495f72c487bbb28395b Mon Sep 17 00:00:00 2001
From: Andrey Loskutov <loskutov@gmx.de>
Date: Thu, 14 Dec 2023 20:10:53 +0100
Subject: [PATCH 1275/1286] Touch bundles affected by the changed compilation
 settings

See https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/1661
See https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659
---
 .../forceQualifierUpdate.txt                                     | 1 +
 .../org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/forceQualifierUpdate.txt
index eb8a04008a..017bc991db 100644
--- a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/forceQualifierUpdate.txt
+++ b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/forceQualifierUpdate.txt
@@ -1,2 +1,3 @@
 # To force a version qualifier update add the bug here
 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659
\ No newline at end of file
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt b/tools/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt
index 14243173d2..25b0ce536d 100644
--- a/tools/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt
@@ -1,3 +1,4 @@
 # To force a version qualifier update add the bug here
 Bug 403237 - o.e.e4.tools cannot be build with "mvn clean install"
 Bug 463856 - Trouble doing an I-build of org.eclipse.e4.core.tools.feature
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659
\ No newline at end of file

From 2dbe03428ba52a4eb5b7f752504d9c4096661d4a Mon Sep 17 00:00:00 2001
From: "Kellner, Niklas" <mail@niklaskellner.de>
Date: Thu, 16 Nov 2023 08:34:15 +0100
Subject: [PATCH 1276/1286] Adding Command Icon To Application Model Editor
 Tree #1308

Currently, Command Icons are not visible in the Tree of the Application Model Editor.
Icons of other Elements, like Parts, are visible in the Tree. This aligns this behavior.

Fixes https://github.com/eclipse-platform/eclipse.platform.ui/issues/1308
---
 .../component/AbstractComponentEditor.java    | 28 +++++++++++++------
 .../common/component/CommandEditor.java       | 11 +++++++-
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index 9819252f11..9dbc8f428a 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -128,8 +128,7 @@ public WritableValue<M> getMaster() {
 	}
 
 	protected void setElementId(Object element) {
-		if (getEditor().isAutoCreateElementId() && element instanceof MApplicationElement) {
-			final MApplicationElement el = (MApplicationElement) element;
+		if (getEditor().isAutoCreateElementId() && element instanceof MApplicationElement el) {
 			if (el.getElementId() == null || el.getElementId().trim().length() == 0) {
 				el.setElementId(Util.getDefaultElementId(((EObject) getMaster().getValue()).eResource(), el,
 						getEditor().getProject()));
@@ -161,11 +160,22 @@ private ImageRegistry getComponentImages() {
 	 */
 	public Image getImageFromIconURI(MUILabel element) {
 
+		return getImageFromIconURI(element.getIconURI(), shouldBeGrey(element));
+	}
+
+	/**
+	 * Get the image described in element if this is a MUILabel
+	 *
+	 * @param iconUri     of the element in tree to be displayed
+	 * @param greyVersion if the icon should be grayed out
+	 * @return image of element if iconUri is not empty (returns bad image if bad
+	 *         URI), else returns null
+	 */
+	protected Image getImageFromIconURI(String iconUri, boolean greyVersion) {
+
 		Image img = null;
 		// Returns only an image if there is a non empty Icon URI
-		final String iconUri = element.getIconURI();
 		if (iconUri != null && iconUri.trim().length() > 0) {
-			final boolean greyVersion = shouldBeGrey(element);
 			// Is this image already loaded ?
 			img = getImage(iconUri, greyVersion);
 			if (img == null) {
@@ -182,12 +192,12 @@ public Image getImageFromIconURI(MUILabel element) {
 	}
 
 	/** @return true if the image of this element should be displayed in grey */
-	private boolean shouldBeGrey(Object element) {
+	protected boolean shouldBeGrey(Object element) {
 		// It is grey if a MUIElement is not visible or not rendered
 		// It is not grey if this is not a MUIElement or if it is rendered and
 		// visible.
-		return element instanceof MUIElement
-				&& !(((MUIElement) element).isToBeRendered() && ((MUIElement) element).isVisible());
+		return element instanceof MUIElement uiElement
+				&& !(uiElement.isToBeRendered() && (uiElement.isVisible()));
 	}
 
 	/**
@@ -236,8 +246,8 @@ private Image getImage(String key, boolean grey) {
 	public Image getImage(Object element, String key) {
 		Image result = null;
 
-		if (element instanceof MUILabel) {
-			result = getImageFromIconURI((MUILabel) element);
+		if (element instanceof MUILabel label) {
+			result = getImageFromIconURI(label);
 		}
 
 		if (result == null) {
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index f7ac5b9bba..7ef1e607a6 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -95,7 +95,16 @@ public void run() {
 
 	@Override
 	public Image getImage(Object element) {
-		return getImage(element, ResourceProvider.IMG_Command);
+		Image result = null;
+
+		if (element instanceof MCommand command) {
+			result = getImageFromIconURI(command.getCommandIconURI(), shouldBeGrey(command));
+		}
+
+		if (result == null) {
+			result = getImage(element, ResourceProvider.IMG_Command);
+		}
+		return result;
 	}
 
 	@Override

From e98362a50947cd8a6184be8361328a84e085cf4f Mon Sep 17 00:00:00 2001
From: Ed Merks <ed.merks@gmail.com>
Date: Thu, 4 Jan 2024 09:24:33 +0100
Subject: [PATCH 1277/1286] Cleanup all model-containing projects and generate
 their models

---
 .../model/persistence.genmodel                |  4 +--
 .../internal/persistence/IPartMemento.java    |  8 ++---
 .../persistence/IPersistenceFactory.java      |  8 ++---
 .../internal/persistence/IWorkbenchState.java | 11 +++---
 .../persistence/impl/PartMemento.java         |  9 +++--
 .../persistence/impl/PersistencePackage.java  |  9 +++--
 .../persistence/impl/WorkbenchState.java      | 34 ++++++++++++-------
 .../internal/persistence/util/CommonUtil.java |  2 +-
 .../persistence/util/PersistenceSwitch.java   |  6 ++--
 9 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel b/tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel
index fb38a9cd5d..4eb15e2509 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel
@@ -5,7 +5,7 @@
     modelPluginID="org.eclipse.e4.tools.persistence" modelName="Persistence" editPluginClass="org.eclipse.e4.tools.persistence.provider.PersistenceEditPlugin"
     editorPluginClass="org.eclipse.e4.tools.persistence.presentation.PersistenceEditorPlugin"
     updateClasspath="false" nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    codeFormatting="true" testsDirectory="" testSuiteClass="org.eclipse.e4.tools.internal.persistence.tests.PersistenceAllTests"
+    codeFormatting="true" commentFormatting="true" testsDirectory="" testSuiteClass="org.eclipse.e4.tools.internal.persistence.tests.PersistenceAllTests"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" copyrightFields="false"
     editPluginID="org.eclipse.e4.tools.persistence.edit" editorPluginID="org.eclipse.e4.tools.persistence.edit"
     usedGenPackages="../../org.eclipse.e4.ui.model.workbench/model/UIElements.genmodel#//application"
@@ -33,4 +33,4 @@
           createChild="false" ecoreFeature="ecore:EAttribute persistence.ecore#//PartMemento/memento"/>
     </genClasses>
   </genPackages>
-</genmodel:GenModel>
\ No newline at end of file
+</genmodel:GenModel>
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPartMemento.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPartMemento.java
index caa517f7c0..21ba8ac325 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPartMemento.java
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPartMemento.java
@@ -1,14 +1,14 @@
 /**
  * Copyright (c) 2021 EclipseSource GmbH and others.
- *  
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
- *  
+ *
  * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors:   
+ *
+ * Contributors:
  *     EclipseSource GmbH - initial API and implementation
  */
 package org.eclipse.e4.tools.internal.persistence;
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistenceFactory.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistenceFactory.java
index 09ff312efa..b91ec49d9a 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistenceFactory.java
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistenceFactory.java
@@ -1,14 +1,14 @@
 /**
  * Copyright (c) 2021 EclipseSource GmbH and others.
- *  
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
- *  
+ *
  * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors:   
+ *
+ * Contributors:
  *     EclipseSource GmbH - initial API and implementation
  */
 package org.eclipse.e4.tools.internal.persistence;
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IWorkbenchState.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IWorkbenchState.java
index ef8c5e208f..9f2503371a 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IWorkbenchState.java
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IWorkbenchState.java
@@ -1,25 +1,22 @@
 /**
  * Copyright (c) 2021 EclipseSource GmbH and others.
- *  
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
- *  
+ *
  * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors:   
+ *
+ * Contributors:
  *     EclipseSource GmbH - initial API and implementation
  */
 package org.eclipse.e4.tools.internal.persistence;
 
 import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
 import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
-
 import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
 
 /**
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PartMemento.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PartMemento.java
index 2b5699f69c..2cd17c350c 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PartMemento.java
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PartMemento.java
@@ -113,9 +113,10 @@ public String getPartId() {
 	public void setPartId(String newPartId) {
 		String oldPartId = partId;
 		partId = newPartId;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, IPersistencePackage.PART_MEMENTO__PART_ID, oldPartId,
 					partId));
+		}
 	}
 
 	/**
@@ -137,9 +138,10 @@ public String getMemento() {
 	public void setMemento(String newMemento) {
 		String oldMemento = memento;
 		memento = newMemento;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, IPersistencePackage.PART_MEMENTO__MEMENTO, oldMemento,
 					memento));
+		}
 	}
 
 	/**
@@ -217,8 +219,9 @@ public boolean eIsSet(int featureID) {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
+		if (eIsProxy()) {
 			return super.toString();
+		}
 
 		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (partId: "); //$NON-NLS-1$
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistencePackage.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistencePackage.java
index 41cbb25b3d..87b4f658cd 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistencePackage.java
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistencePackage.java
@@ -86,8 +86,9 @@ private PersistencePackage() {
 	 * @generated
 	 */
 	public static IPersistencePackage init() {
-		if (isInited)
+		if (isInited) {
 			return (IPersistencePackage) EPackage.Registry.INSTANCE.getEPackage(IPersistencePackage.eNS_URI);
+		}
 
 		// Obtain or create and register package
 		Object registeredPersistencePackage = EPackage.Registry.INSTANCE.get(eNS_URI);
@@ -219,8 +220,9 @@ public IPersistenceFactory getPersistenceFactory() {
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated)
+		if (isCreated) {
 			return;
+		}
 		isCreated = true;
 
 		// Create classes and their features
@@ -250,8 +252,9 @@ public void createPackageContents() {
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized)
+		if (isInitialized) {
 			return;
+		}
 		isInitialized = true;
 
 		// Initialize package
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/WorkbenchState.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/WorkbenchState.java
index ec51601ad9..6ebca5f408 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/WorkbenchState.java
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/WorkbenchState.java
@@ -127,10 +127,11 @@ public NotificationChain basicSetPerspective(MPerspective newPerspective, Notifi
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 					IPersistencePackage.WORKBENCH_STATE__PERSPECTIVE, oldPerspective, newPerspective);
-			if (msgs == null)
+			if (msgs == null) {
 				msgs = notification;
-			else
+			} else {
 				msgs.add(notification);
+			}
 		}
 		return msgs;
 	}
@@ -144,18 +145,22 @@ public NotificationChain basicSetPerspective(MPerspective newPerspective, Notifi
 	public void setPerspective(MPerspective newPerspective) {
 		if (newPerspective != perspective) {
 			NotificationChain msgs = null;
-			if (perspective != null)
+			if (perspective != null) {
 				msgs = ((InternalEObject) perspective).eInverseRemove(this,
 						EOPPOSITE_FEATURE_BASE - IPersistencePackage.WORKBENCH_STATE__PERSPECTIVE, null, msgs);
-			if (newPerspective != null)
+			}
+			if (newPerspective != null) {
 				msgs = ((InternalEObject) newPerspective).eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE - IPersistencePackage.WORKBENCH_STATE__PERSPECTIVE, null, msgs);
+			}
 			msgs = basicSetPerspective(newPerspective, msgs);
-			if (msgs != null)
+			if (msgs != null) {
 				msgs.dispatch();
-		} else if (eNotificationRequired())
+			}
+		} else if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, IPersistencePackage.WORKBENCH_STATE__PERSPECTIVE,
 					newPerspective, newPerspective));
+		}
 	}
 
 	/**
@@ -193,10 +198,11 @@ public NotificationChain basicSetEditorArea(MArea newEditorArea, NotificationCha
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 					IPersistencePackage.WORKBENCH_STATE__EDITOR_AREA, oldEditorArea, newEditorArea);
-			if (msgs == null)
+			if (msgs == null) {
 				msgs = notification;
-			else
+			} else {
 				msgs.add(notification);
+			}
 		}
 		return msgs;
 	}
@@ -210,18 +216,22 @@ public NotificationChain basicSetEditorArea(MArea newEditorArea, NotificationCha
 	public void setEditorArea(MArea newEditorArea) {
 		if (newEditorArea != editorArea) {
 			NotificationChain msgs = null;
-			if (editorArea != null)
+			if (editorArea != null) {
 				msgs = ((InternalEObject) editorArea).eInverseRemove(this,
 						EOPPOSITE_FEATURE_BASE - IPersistencePackage.WORKBENCH_STATE__EDITOR_AREA, null, msgs);
-			if (newEditorArea != null)
+			}
+			if (newEditorArea != null) {
 				msgs = ((InternalEObject) newEditorArea).eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE - IPersistencePackage.WORKBENCH_STATE__EDITOR_AREA, null, msgs);
+			}
 			msgs = basicSetEditorArea(newEditorArea, msgs);
-			if (msgs != null)
+			if (msgs != null) {
 				msgs.dispatch();
-		} else if (eNotificationRequired())
+			}
+		} else if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, IPersistencePackage.WORKBENCH_STATE__EDITOR_AREA,
 					newEditorArea, newEditorArea));
+		}
 	}
 
 	/**
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java
index 127f757955..f661573f24 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java
@@ -129,7 +129,7 @@ private static void persistCompatibilityEditor(MPart part) {
 	public static List<MPart> getPerspectivePartsWithState(final MPerspective perspective) {
 		List<MPlaceholder> phList = CommonUtil.getEModelService().findElements(perspective, null, MPlaceholder.class,
 				null);
-		List<MPart> result = new ArrayList<MPart>();
+		List<MPart> result = new ArrayList<>();
 		for (MPlaceholder ph : phList) {
 			MUIElement element = ph.getRef();
 			if (!MPart.class.isInstance(element)) {
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java
index cbbc24c234..019293ebf5 100644
--- a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java
+++ b/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java
@@ -77,15 +77,17 @@ protected T doSwitch(int classifierID, EObject theEObject) {
 		case IPersistencePackage.WORKBENCH_STATE: {
 			IWorkbenchState workbenchState = (IWorkbenchState) theEObject;
 			T result = caseWorkbenchState(workbenchState);
-			if (result == null)
+			if (result == null) {
 				result = defaultCase(theEObject);
+			}
 			return result;
 		}
 		case IPersistencePackage.PART_MEMENTO: {
 			IPartMemento partMemento = (IPartMemento) theEObject;
 			T result = casePartMemento(partMemento);
-			if (result == null)
+			if (result == null) {
 				result = defaultCase(theEObject);
+			}
 			return result;
 		}
 		default:

From 38e4dd1a6c63eb858851f56fdd8764fdb5242c55 Mon Sep 17 00:00:00 2001
From: Heiko Klare <heiko.klare@vector.com>
Date: Tue, 9 Jan 2024 09:22:26 +0100
Subject: [PATCH 1278/1286] Fix faulty <li> tags in javadoc

Fixes: `tag not allowed here: <li>`
---
 .../e4/tools/emf/ui/common/ResourceSearchScope.java       | 6 +++---
 .../e4/internal/tools/jdt/templates/E4ContextType.java    | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java
index 63ccf5b1dc..569baebe36 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java
@@ -16,9 +16,9 @@
 
 /**
  * Specifies the scope when searching for a resource. This differs from the PDE
- * search functions in that <li>more than just java objects can be queried. <li>
- * Searches can specify the current project only, current workspace, non bundle
- * projects, and target platform.
+ * search functions in that more than just java objects can be queried. Searches
+ * can specify the current project only, current workspace, non bundle projects,
+ * and target platform.
  *
  * @author Steven Spungin
  */
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java b/tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
index 4017ab0852..4271cdb7d5 100644
--- a/tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
+++ b/tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
@@ -17,13 +17,13 @@
 import org.eclipse.jdt.internal.corext.template.java.IJavaContext;
 
 /**
- * The context type for templates inside e4 code.
- * The same class is used for several context types:
- * <dl>
+ * The context type for templates inside e4 code. The same class is used for
+ * several context types:
+ * <ul>
  * <li>templates for all Java code locations</li>
  * <li>templates for member locations</li>
  * <li>templates for statement locations</li>
- * </dl>
+ * </ul>
  */
 @SuppressWarnings("restriction")
 public class E4ContextType extends AbstractJavaContextType {

From ee211d27ae0dafb421160ea2d1fd26616113d76c Mon Sep 17 00:00:00 2001
From: Heiko Klare <heiko.klare@vector.com>
Date: Tue, 9 Jan 2024 09:24:14 +0100
Subject: [PATCH 1279/1286] Fix malformed HTML in javadoc

Fixes javadoc errors: malformed HTML
---
 .../org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
index e92da31790..0ef974a61a 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
@@ -98,7 +98,8 @@ public StringMatcher(String pattern, boolean ignoreCase, boolean ignoreWildCards
 	}
 
 	/**
-	 * Find the first occurrence of the pattern between <code>start</code )(inclusive) and <code>end</code>(exclusive).
+	 * Find the first occurrence of the pattern between
+	 * <code>start</code> (inclusive) and <code>end</code> (exclusive).
 	 *
 	 * @param text
 	 *            the String object to search in

From 32e452d577dea78d80eae22b6d4aacc024b16b15 Mon Sep 17 00:00:00 2001
From: Heiko Klare <heiko.klare@vector.com>
Date: Tue, 9 Jan 2024 19:23:45 +0100
Subject: [PATCH 1280/1286] Fix faulty javadoc references

Fixes all logged javadoc errors of type "reference not found":
* Remove faulty or outdated javadoc containing faulty reference
* Remove obsolete "@see SUPERCLASS_DOCUMENTATION" javadoc for
overwritten methods
* Correct faulty references to types and types if they are accessible
* Replace type links with code tags in case a references type is
accessible (i.e., not on the bundle's classpath)
---
 .../e4/tools/emf/ui/internal/imp/ModelImportWizard.java      | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
index 203f6cf79f..d3db339842 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
@@ -85,7 +85,6 @@ public Class<? extends MApplicationElement> getApplicationElement() {
 	 * @return the extension point name associated with the {@link MApplicationElement} that is passed in the
 	 *         constructor of
 	 *         this wizard.
-	 * @see #MAPPING_EXTENSION
 	 * @see #getApplicationElement()
 	 */
 	protected String getExtensionPointName() {
@@ -96,7 +95,6 @@ protected String getExtensionPointName() {
 	 * @return the extension point id associated with the {@link MApplicationElement} that is passed in the constructor
 	 *         of
 	 *         this wizard.
-	 * @see #MAPPING_EXTENSION
 	 * @see #getApplicationElement()
 	 */
 	protected String getExtensionPoint() {
@@ -106,7 +104,6 @@ protected String getExtensionPoint() {
 	/**
 	 * @return the attribute name of the {@link IConfigurationElement} that
 	 *         contains the description that you want to see in the wizard page.
-	 * @see #MAPPING_NAME
 	 */
 	protected String getMappingName() {
 		return RegistryUtil.getStruct(applicationElement, getHint()).getMappingName();
@@ -116,8 +113,6 @@ protected String getMappingName() {
 	 * Returns the list of {@link MApplicationElement}s of the type passed in
 	 * the constructor of the wizard.
 	 *
-	 *
-	 *
 	 * @return an array of {@link MApplicationElement}
 	 */
 	public MApplicationElement[] getElements(Class<? extends MApplicationElement> type) {

From 84e4a4525a4758ee16dbcb38f5f508f18ae170e2 Mon Sep 17 00:00:00 2001
From: Heiko Klare <heiko.klare@vector.com>
Date: Thu, 18 Jan 2024 13:29:53 +0100
Subject: [PATCH 1281/1286] Fix remaining javadoc errors

* Replace `<tt>...</tt>` with `{@code ...}`
* Remove documentation of exception that are actually not thrown
* Replace `@parameter` with `@param`
* Correct faulty URL
---
 .../internal/compatibiliy/migration/E4MigrationTool.java      | 1 -
 .../emf/ui/internal/common/component/ControlFactory.java      | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
index e4976683a3..8b9f9871e8 100644
--- a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
+++ b/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
@@ -180,7 +180,6 @@ public static void convert(final File sourceMementoFile, final File targetMAppli
 	 *
 	 * @param memento The IMemento to convert
 	 * @return The resulting MApplication
-	 * @throws WorkbenchException Thrown when the xml cannot be parsed
 	 */
 	public static MApplication convert(final IMemento memento) {
 		E4MigrationTool converter = new E4MigrationTool();
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 5e9352d2f5..2ef98c72e4 100644
--- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -809,8 +809,8 @@ public static void attachFiltering(Text searchText, final TableViewer viewer, fi
 	 * a validator to check if the value exists (OK), or if it is null or empty
 	 * (WARNING), or if the class does not exists (ERROR)
 	 *
-	 * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id= 412567">Bug
-	 *      412567 </a> *
+	 * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=412567">Bug
+	 *      412567</a>
 	 * @param parent
 	 *            the parent composite
 	 * @param Messages

From c566ef311f22f9d9d9e7073fb5c86390f7ebd806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= <jkubitz-eclipse@gmx.de>
Date: Mon, 22 Jan 2024 12:14:25 +0100
Subject: [PATCH 1282/1286] use try-with-resource where hinted

---
 .../services/impl/ResourceBundleHelper.java   | 41 ++++++++-----------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
index 3c019b9689..0c1992afdc 100644
--- a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
+++ b/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
@@ -396,32 +396,25 @@ public ResourceBundle newBundle(String baseName, Locale locale,
 			ResourceBundle bundle = null;
 			if (format.equals("java.properties")) { //$NON-NLS-1$
 				final String resourceName = toResourceName(bundleName, "properties"); //$NON-NLS-1$
-				InputStream stream = null;
-				try {
-					stream = AccessController.doPrivileged(
-							(PrivilegedExceptionAction<InputStream>) () -> {
-								InputStream is = null;
-								final URL url = osgiBundle.getEntry(resourceName);
-								if (url != null) {
-									final URLConnection connection = url.openConnection();
-									if (connection != null) {
-										// Disable caches to get fresh data for
-										// reloading.
-										connection.setUseCaches(false);
-										is = connection.getInputStream();
-									}
-								}
-								return is;
-							});
-				} catch (final PrivilegedActionException e) {
-					throw (IOException) e.getException();
-				}
-				if (stream != null) {
-					try {
+				PrivilegedExceptionAction<InputStream> action = (PrivilegedExceptionAction<InputStream>) () -> {
+					URL url = osgiBundle.getEntry(resourceName);
+					if (url != null) {
+						URLConnection connection = url.openConnection();
+						if (connection != null) {
+							// Disable caches to get fresh data for
+							// reloading.
+							connection.setUseCaches(false);
+							return connection.getInputStream();
+						}
+					}
+					return null;
+				};
+				try (InputStream stream = AccessController.doPrivileged(action)) {
+					if (stream != null) {
 						bundle = new PropertyResourceBundle(stream);
-					} finally {
-						stream.close();
 					}
+				} catch (final PrivilegedActionException e) {
+					throw (IOException) e.getException();
 				}
 			}
 			else {

From 13b9e5b3e2cab3904e08eb900365855297d076bf Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Sun, 28 Jan 2024 11:51:21 +0100
Subject: [PATCH 1283/1286] Move e4.tools from 'tools' to 'e4tools'
 sub-directory

---
 .../bundles/org.eclipse.e4.tools.compat/.classpath  |   0
 .../bundles/org.eclipse.e4.tools.compat/.project    |   0
 .../.settings/org.eclipse.core.resources.prefs      |   0
 .../.settings/org.eclipse.core.runtime.prefs        |   0
 .../.settings/org.eclipse.jdt.core.prefs            |   0
 .../.settings/org.eclipse.jdt.ui.prefs              |   0
 .../.settings/org.eclipse.pde.api.tools.prefs       |   0
 .../.settings/org.eclipse.pde.prefs                 |   0
 .../META-INF/MANIFEST.MF                            |   0
 .../OSGI-INF/l10n/bundle.properties                 |   0
 .../bundles/org.eclipse.e4.tools.compat/about.html  |   0
 .../org.eclipse.e4.tools.compat/build.properties    |   0
 .../forceQualifierUpdate.txt                        |   0
 .../bundles/org.eclipse.e4.tools.compat/plugin.xml  |   0
 .../tools/compat/internal/ClipboardServiceImpl.java |   0
 .../compat/internal/ContextServiceFactory.java      |   0
 .../e4/tools/compat/internal/CopyAction.java        |   0
 .../eclipse/e4/tools/compat/internal/CutAction.java |   0
 .../compat/internal/DefaultLoggerProvider.java      |   0
 .../eclipse/e4/tools/compat/internal/Messages.java  |   0
 .../e4/tools/compat/internal/PartHelper.java        |   0
 .../e4/tools/compat/internal/PasteAction.java       |   0
 .../e4/tools/compat/internal/WorkbenchLogger.java   |   0
 .../e4/tools/compat/internal/messages.properties    |   0
 .../eclipse/e4/tools/compat/parts/DIEditorPart.java |   0
 .../eclipse/e4/tools/compat/parts/DIHandler.java    |   0
 .../tools/compat/parts/DIMultiPageEditorPart.java   |   0
 .../e4/tools/compat/parts/DISaveableViewPart.java   |   0
 .../eclipse/e4/tools/compat/parts/DIViewPart.java   |   0
 .../.classpath                                      |   0
 .../.project                                        |   0
 .../.settings/org.eclipse.core.resources.prefs      |   0
 .../.settings/org.eclipse.jdt.core.prefs            |   0
 .../META-INF/MANIFEST.MF                            |   0
 .../OSGI-INF/l10n/bundle.properties                 |   0
 .../build.properties                                |   0
 .../forceQualifierUpdate.txt                        |   0
 .../compatibiliy/migration/PerspectiveMigrator.java |   0
 .../compatibiliy/migration/E4MigrationTool.java     |   0
 .../compatibiliy/migration/WorkbenchUtil.java       |   0
 .../org.eclipse.e4.tools.emf.editor3x/.classpath    |   0
 .../org.eclipse.e4.tools.emf.editor3x/.project      |   0
 .../.settings/org.eclipse.core.resources.prefs      |   0
 .../.settings/org.eclipse.core.runtime.prefs        |   0
 .../.settings/org.eclipse.jdt.core.prefs            |   0
 .../.settings/org.eclipse.jdt.ui.prefs              |   0
 .../.settings/org.eclipse.pde.api.tools.prefs       |   0
 .../.settings/org.eclipse.pde.prefs                 |   0
 .../META-INF/MANIFEST.MF                            |   0
 .../OSGI-INF/l10n/bundle.properties                 |   0
 .../OSGI-INF/modelextractor.xml                     |   0
 .../OSGI-INF/pdecontributionprovider.xml            |   0
 .../OSGI-INF/pdee4xmiprovider.xml                   |   0
 .../OSGI-INF/pdeextensionlookup.xml                 |   0
 .../OSGI-INF/projectfunction.xml                    |   0
 .../OSGI-INF/xmiresourcecontextfunction.xml         |   0
 .../org.eclipse.e4.tools.emf.editor3x/about.html    |   0
 .../build.properties                                |   0
 .../forceQualifierUpdate.txt                        |   0
 .../icons/full/obj16/application_view_tile.png      | Bin
 .../org.eclipse.e4.tools.emf.editor3x/plugin.xml    |   0
 .../tools/emf/editor3x/E4WorkbenchModelEditor.java  |   0
 .../tools/emf/editor3x/EditorProjectFunction.java   |   0
 .../org/eclipse/e4/tools/emf/editor3x/Messages.java |   0
 .../emf/editor3x/ModelEditorPreferencePage.java     |   0
 .../e4/tools/emf/editor3x/ModelExtractor.java       |   0
 .../emf/editor3x/PDEClassContributionProvider.java  |   0
 .../e4/tools/emf/editor3x/PDEExtensionLookup.java   |   0
 .../eclipse/e4/tools/emf/editor3x/RedoAction.java   |   0
 .../e4/tools/emf/editor3x/RefactorModel.java        |   0
 .../tools/emf/editor3x/TargetElementProviders.java  |   0
 .../eclipse/e4/tools/emf/editor3x/UndoAction.java   |   0
 .../e4/tools/emf/editor3x/XMIResourceFunction.java  |   0
 .../e4/tools/emf/editor3x/emf/EditUIUtil.java       |   0
 .../editor3x/extension/AddonContributionEditor.java |   0
 .../DynamicMenuContributionContributionEditor.java  |   0
 .../extension/HandlerContributionEditor.java        |   0
 .../ImperativeExpressionContributionEditor.java     |   0
 .../editor3x/extension/PartContributionEditor.java  |   0
 .../extension/ToolControlContributionEditor.java    |   0
 .../e4/tools/emf/editor3x/extension/Util.java       |   0
 .../e4/tools/emf/editor3x/messages.properties       |   0
 .../refactorparticipants/ModelMoveParticipant.java  |   0
 .../ModelRenameParticipant.java                     |   0
 .../RefactorParticipantDelegate.java                |   0
 .../bundles/org.eclipse.e4.tools.emf.ui/.classpath  |   0
 .../bundles/org.eclipse.e4.tools.emf.ui/.project    |   0
 .../.settings/org.eclipse.core.resources.prefs      |   0
 .../.settings/org.eclipse.core.runtime.prefs        |   0
 .../.settings/org.eclipse.jdt.core.prefs            |   0
 .../.settings/org.eclipse.jdt.ui.prefs              |   0
 .../.settings/org.eclipse.pde.api.tools.prefs       |   0
 .../.settings/org.eclipse.pde.core.prefs            |   0
 .../.settings/org.eclipse.pde.prefs                 |   0
 .../META-INF/MANIFEST.MF                            |   0
 .../OSGI-INF/contributioncollector.xml              |   0
 .../OSGI-INF/resourceprovider.xml                   |   0
 .../OSGI-INF/resources.properties                   |   0
 .../bundles/org.eclipse.e4.tools.emf.ui/README.md   |   0
 .../bundles/org.eclipse.e4.tools.emf.ui/about.html  |   0
 .../org.eclipse.e4.tools.emf.ui/build.properties    |   0
 .../org.eclipse.e4.tools.emf.ui/css/default.css     |   0
 .../forceQualifierUpdate.txt                        |   0
 .../org.eclipse.e4.tools.emf.ui/fragment.e4xmi      |   0
 .../icons/full/modelelements/Addons.png             | Bin
 .../icons/full/modelelements/Application.png        | Bin
 .../icons/full/modelelements/Area.gif               | Bin
 .../icons/full/modelelements/Area_vertical.gif      | Bin
 .../icons/full/modelelements/BindingContext.gif     | Bin
 .../icons/full/modelelements/BindingTable.png       | Bin
 .../icons/full/modelelements/Category.png           | Bin
 .../icons/full/modelelements/Command.png            | Bin
 .../icons/full/modelelements/CommandParameter.png   | Bin
 .../icons/full/modelelements/CoreExpression.png     | Bin
 .../icons/full/modelelements/DirectMenuItem.gif     | Bin
 .../icons/full/modelelements/DirectToolItem.gif     | Bin
 .../full/modelelements/DynamicMenuContribution.gif  | Bin
 .../icons/full/modelelements/HandledMenuItem.gif    | Bin
 .../icons/full/modelelements/HandledToolItem.gif    | Bin
 .../icons/full/modelelements/Handler.png            | Bin
 .../icons/full/modelelements/KeyBinding.png         | Bin
 .../icons/full/modelelements/Menu.gif               | Bin
 .../icons/full/modelelements/MenuContribution.gif   | Bin
 .../icons/full/modelelements/MenuItem.gif           | Bin
 .../icons/full/modelelements/MenuSeparator.gif      | Bin
 .../icons/full/modelelements/ModelFragments.png     | Bin
 .../icons/full/modelelements/Parameter.png          | Bin
 .../icons/full/modelelements/Part.gif               | Bin
 .../icons/full/modelelements/PartDescriptor.gif     | Bin
 .../icons/full/modelelements/PartSashContainer.gif  | Bin
 .../modelelements/PartSashContainer_vertical.gif    | Bin
 .../icons/full/modelelements/PartStack.gif          | Bin
 .../icons/full/modelelements/Perspective.gif        | Bin
 .../icons/full/modelelements/PerspectiveStack.gif   | Bin
 .../icons/full/modelelements/Placeholder.gif        | Bin
 .../full/modelelements/StringModelFragment.png      | Bin
 .../icons/full/modelelements/ToolBar.gif            | Bin
 .../full/modelelements/ToolBarContribution.gif      | Bin
 .../icons/full/modelelements/ToolBarSeparator.gif   | Bin
 .../icons/full/modelelements/ToolControl.gif        | Bin
 .../icons/full/modelelements/TrimContribution.gif   | Bin
 .../icons/full/modelelements/Window.gif             | Bin
 .../icons/full/modelelements/WindowTrim.gif         | Bin
 .../icons/full/obj16/EPackage.gif                   | Bin
 .../icons/full/obj16/add_column.gif                 | Bin
 .../icons/full/obj16/application_form.png           | Bin
 .../icons/full/obj16/arrow_down.png                 | Bin
 .../icons/full/obj16/arrow_up.png                   | Bin
 .../icons/full/obj16/bullet_go.png                  | Bin
 .../icons/full/obj16/bundle.png                     | Bin
 .../icons/full/obj16/chart_organisation.png         | Bin
 .../icons/full/obj16/class_default_obj.gif          | Bin
 .../icons/full/obj16/class_obj.png                  | Bin
 .../icons/full/obj16/class_obj@2x.png               | Bin
 .../icons/full/obj16/command.gif                    | Bin
 .../icons/full/obj16/copy_to_project.png            | Bin
 .../icons/full/obj16/cross.png                      | Bin
 .../icons/full/obj16/error_obj.gif                  | Bin
 .../icons/full/obj16/field_default_obj.gif          | Bin
 .../icons/full/obj16/field_private_obj.gif          | Bin
 .../icons/full/obj16/field_protected_obj.gif        | Bin
 .../icons/full/obj16/field_public_obj.gif           | Bin
 .../icons/full/obj16/filter_by_attribute.gif        | Bin
 .../icons/full/obj16/filter_by_item.gif             | Bin
 .../icons/full/obj16/find.png                       | Bin
 .../icons/full/obj16/headermenu.png                 | Bin
 .../icons/full/obj16/mark_occurrences.png           | Bin
 .../icons/full/obj16/missing_image_placeholder.png  | Bin
 .../icons/full/obj16/package_obj.gif                | Bin
 .../icons/full/obj16/package_obj.png                | Bin
 .../icons/full/obj16/package_obj@2x.png             | Bin
 .../icons/full/obj16/projects.png                   | Bin
 .../icons/full/obj16/remove_filter.png              | Bin
 .../icons/full/obj16/reset_columns.gif              | Bin
 .../icons/full/obj16/table_add.png                  | Bin
 .../icons/full/obj16/table_delete.png               | Bin
 .../icons/full/obj16/use_anyway.gif                 | Bin
 .../icons/full/obj16/world_edit.png                 | Bin
 .../icons/full/obj16/zoom.png                       | Bin
 .../icons/full/widgets/button_obj.gif               | Bin
 .../icons/full/widgets/ccombo_obj.gif               | Bin
 .../icons/full/widgets/checkbox_obj.gif             | Bin
 .../icons/full/widgets/clabel_obj.gif               | Bin
 .../icons/full/widgets/comboviewer_obj.gif          | Bin
 .../icons/full/widgets/composite_obj.gif            | Bin
 .../icons/full/widgets/coolbar_obj.gif              | Bin
 .../icons/full/widgets/ctabfolder_obj.gif           | Bin
 .../icons/full/widgets/group_obj.gif                | Bin
 .../icons/full/widgets/label_obj.gif                | Bin
 .../icons/full/widgets/menu_obj.gif                 | Bin
 .../icons/full/widgets/menubar_obj.gif              | Bin
 .../icons/full/widgets/menuitem_obj.gif             | Bin
 .../icons/full/widgets/menuseparator_obj.gif        | Bin
 .../icons/full/widgets/progressbar_obj.gif          | Bin
 .../icons/full/widgets/radiobutton_obj.gif          | Bin
 .../icons/full/widgets/sashform_obj.gif             | Bin
 .../icons/full/widgets/separator_obj.gif            | Bin
 .../icons/full/widgets/shell_obj.gif                | Bin
 .../icons/full/widgets/tabfolder_obj.gif            | Bin
 .../icons/full/widgets/table_obj.gif                | Bin
 .../icons/full/widgets/text_obj.gif                 | Bin
 .../icons/full/widgets/toolbar_obj.gif              | Bin
 .../icons/full/widgets/toolitemcheck_obj.gif        | Bin
 .../icons/full/widgets/toolitemdrop_obj.gif         | Bin
 .../icons/full/widgets/toolitempush_obj.gif         | Bin
 .../icons/full/widgets/toolitemradio_obj.gif        | Bin
 .../icons/full/widgets/toolitemseparator_obj.gif    | Bin
 .../icons/full/widgets/tree_obj.gif                 | Bin
 .../icons/full/wizban/add_to_dir_wiz.png            | Bin
 .../icons/full/wizban/attribute_wiz.gif             | Bin
 .../icons/full/wizban/error_wiz.gif                 | Bin
 .../icons/full/wizban/extstr_wiz.png                | Bin
 .../icons/full/wizban/fieldrefact_wiz.png           | Bin
 .../icons/full/wizban/imp3x_wiz.png                 | Bin
 .../icons/full/wizban/import_wiz.png                | Bin
 .../icons/full/wizban/location_wiz.png              | Bin
 .../icons/full/wizban/newclass_wiz.png              | Bin
 .../icons/full/wizban/newefix_wizban.png            | Bin
 .../icons/full/wizban/newexp_wiz.png                | Bin
 .../icons/full/wizban/newfolder_wiz.png             | Bin
 .../icons/full/wizban/newsearch_wiz.png             | Bin
 .../icons/full/wizban/newsearch_wiz@2x.png          | Bin
 .../icons/full/wizban/package_wiz.png               | Bin
 .../icons/full/wizban/plugin_wiz.gif                | Bin
 .../icons/full/wizban/typerefact_wiz.png            | Bin
 .../org.eclipse.e4.tools.emf.ui/plugin.properties   |   0
 .../bundles/org.eclipse.e4.tools.emf.ui/plugin.xml  |   0
 .../bundles/org.eclipse.e4.tools.emf.ui/pom.xml     |   0
 .../schema/org.eclipse.e4.tools.emf.ui.editors.exsd |   0
 .../org.eclipse.e4.tools.emf.ui.scripting.exsd      |   0
 .../common/AbstractElementEditorContribution.java   |   0
 .../emf/ui/common/ComboViewerAutoComplete.java      |   0
 .../emf/ui/common/CommandToStringConverter.java     |   0
 .../emf/ui/common/ContributionURIValidator.java     |   0
 .../emf/ui/common/IClassContributionProvider.java   |   0
 .../emf/ui/common/IContributionClassCreator.java    |   0
 .../e4/tools/emf/ui/common/IEditorDescriptor.java   |   0
 .../e4/tools/emf/ui/common/IEditorFeature.java      |   0
 .../e4/tools/emf/ui/common/IExtensionLookup.java    |   0
 .../tools/emf/ui/common/IModelElementProvider.java  |   0
 .../e4/tools/emf/ui/common/IModelExtractor.java     |   0
 .../e4/tools/emf/ui/common/IModelResource.java      |   0
 .../emf/ui/common/IProviderStatusCallback.java      |   0
 .../e4/tools/emf/ui/common/IScriptingSupport.java   |   0
 .../emf/ui/common/ISelectionProviderService.java    |   0
 .../e4/tools/emf/ui/common/ImageTooltip.java        |   0
 .../e4/tools/emf/ui/common/MemoryTransfer.java      |   0
 .../tools/emf/ui/common/ModelEditorPreferences.java |   0
 .../org/eclipse/e4/tools/emf/ui/common/Plugin.java  |   0
 .../e4/tools/emf/ui/common/ProviderStatus.java      |   0
 .../e4/tools/emf/ui/common/ResourceSearchScope.java |   0
 .../org/eclipse/e4/tools/emf/ui/common/Util.java    |   0
 .../e4/tools/emf/ui/common/XMIModelResource.java    |   0
 .../common/component/AbstractComponentEditor.java   |   0
 .../tools/emf/ui/common/component/IdGenerator.java  |   0
 .../e4/tools/emf/ui/internal/E4Properties.java      |   0
 .../eclipse/e4/tools/emf/ui/internal/Messages.java  |   0
 .../e4/tools/emf/ui/internal/Messages.properties    |   0
 .../ui/internal/ObservableColumnLabelProvider.java  |   0
 .../emf/ui/internal/PreferenceInitializer.java      |   0
 .../e4/tools/emf/ui/internal/ResourceProvider.java  |   0
 .../e4/tools/emf/ui/internal/StringMatcher.java     |   0
 .../emf/ui/internal/common/AbstractPickList.java    |   0
 .../tools/emf/ui/internal/common/Autocomplete.java  |   0
 .../internal/common/ClassContributionCollector.java |   0
 .../ui/internal/common/ComponentLabelProvider.java  |   0
 .../emf/ui/internal/common/ControlHighlighter.java  |   0
 .../e4/tools/emf/ui/internal/common/E4PickList.java |   0
 .../emf/ui/internal/common/E4StringPickList.java    |   0
 .../emf/ui/internal/common/EClassLabelProvider.java |   0
 .../internal/common/FeatureClassLabelProvider.java  |   0
 .../tools/emf/ui/internal/common/ModelEditor.java   |   0
 .../tools/emf/ui/internal/common/TreeViewerEx.java  |   0
 .../tools/emf/ui/internal/common/VirtualEntry.java  |   0
 .../common/component/AbstractPartEditor.java        |   0
 .../ui/internal/common/component/AddonsEditor.java  |   0
 .../common/component/ApplicationEditor.java         |   0
 .../ui/internal/common/component/AreaEditor.java    |   0
 .../common/component/BindingContextEditor.java      |   0
 .../common/component/BindingTableEditor.java        |   0
 .../internal/common/component/CategoryEditor.java   |   0
 .../ui/internal/common/component/CommandEditor.java |   0
 .../common/component/CommandParameterEditor.java    |   0
 .../common/component/CompositePartEditor.java       |   0
 .../internal/common/component/ControlFactory.java   |   0
 .../common/component/CoreExpressionEditor.java      |   0
 .../ui/internal/common/component/DefaultEditor.java |   0
 .../common/component/DirectMenuItemEditor.java      |   0
 .../common/component/DirectToolItemEditor.java      |   0
 .../component/DynamicMenuContributionEditor.java    |   0
 .../common/component/HandledMenuItemEditor.java     |   0
 .../common/component/HandledToolItemEditor.java     |   0
 .../ui/internal/common/component/HandlerEditor.java |   0
 .../component/ImperativeExpressionEditor.java       |   0
 .../internal/common/component/KeyBindingEditor.java |   0
 .../common/component/MenuContributionEditor.java    |   0
 .../ui/internal/common/component/MenuEditor.java    |   0
 .../internal/common/component/MenuItemEditor.java   |   0
 .../common/component/MenuSeparatorEditor.java       |   0
 .../common/component/ModelFragmentsEditor.java      |   0
 .../internal/common/component/ParameterEditor.java  |   0
 .../common/component/PartDescriptorEditor.java      |   0
 .../ui/internal/common/component/PartEditor.java    |   0
 .../common/component/PartSashContainerEditor.java   |   0
 .../internal/common/component/PartStackEditor.java  |   0
 .../common/component/PerspectiveEditor.java         |   0
 .../common/component/PerspectiveStackEditor.java    |   0
 .../common/component/PlaceholderEditor.java         |   0
 .../internal/common/component/PopupMenuEditor.java  |   0
 .../common/component/StringModelFragment.java       |   0
 .../common/component/ToolBarContributionEditor.java |   0
 .../ui/internal/common/component/ToolBarEditor.java |   0
 .../common/component/ToolBarSeparatorEditor.java    |   0
 .../common/component/ToolControlEditor.java         |   0
 .../internal/common/component/ToolItemEditor.java   |   0
 .../ui/internal/common/component/TrimBarEditor.java |   0
 .../common/component/TrimContributionEditor.java    |   0
 .../common/component/TrimmedWindowEditor.java       |   0
 .../component/UnsettableUpdateValueStrategy.java    |   0
 .../ui/internal/common/component/WindowEditor.java  |   0
 .../dialogs/AbstractCommandSelectionDialog.java     |   0
 .../component/dialogs/AbstractIconDialog.java       |   0
 .../AbstractIconDialogWithHardcodedScope.java       |   0
 .../AbstractIconDialogWithScopeAndFilter.java       |   0
 .../common/component/dialogs/AbstractIdDialog.java  |   0
 .../component/dialogs/AreaIconDialogEditor.java     |   0
 .../dialogs/BindingContextSelectionDialog.java      |   0
 .../common/component/dialogs/BundleImageCache.java  |   0
 .../dialogs/CommandCategorySelectionDialog.java     |   0
 .../component/dialogs/CommandIconDialogEditor.java  |   0
 .../component/dialogs/ContributionClassDialog.java  |   0
 .../component/dialogs/ContributionDataFile.java     |   0
 .../component/dialogs/ExpressionIdDialog.java       |   0
 .../component/dialogs/FeatureSelectionDialog.java   |   0
 .../dialogs/FilteredContributionDialog.java         |   0
 .../component/dialogs/FindImportElementDialog.java  |   0
 .../dialogs/FindParentReferenceElementDialog.java   |   0
 .../HandledMenuItemCommandSelectionDialog.java      |   0
 .../HandledToolItemCommandSelectionDialog.java      |   0
 .../dialogs/HandlerCommandSelectionDialog.java      |   0
 .../dialogs/KeyBindingCommandSelectionDialog.java   |   0
 .../component/dialogs/MenuIconDialogEditor.java     |   0
 .../common/component/dialogs/MenuIdDialog.java      |   0
 .../component/dialogs/MenuItemIconDialogEditor.java |   0
 .../component/dialogs/ModelResultHandlerImpl.java   |   0
 .../dialogs/ParameterIdSelectionDialog.java         |   0
 .../dialogs/PartDescriptorIconDialogEditor.java     |   0
 .../component/dialogs/PartIconDialogEditor.java     |   0
 .../dialogs/PerspectiveIconDialogEditor.java        |   0
 .../dialogs/SaveDialogBoundsSettingsDialog.java     |   0
 .../component/dialogs/SharedElementsDialog.java     |   0
 .../common/component/dialogs/ToolBarIdDialog.java   |   0
 .../component/dialogs/ToolItemIconDialogEditor.java |   0
 .../common/component/dialogs/TrimIdDialog.java      |   0
 .../component/dialogs/WindowIconDialogEditor.java   |   0
 .../component/tabs/ContributionUriCellEditor.java   |   0
 .../ui/internal/common/component/tabs/DocUtil.java  |   0
 .../common/component/tabs/E4ToolItemMenu.java       |   0
 .../component/tabs/EAttributeEditingSupport.java    |   0
 .../component/tabs/EAttributeTableViewerColumn.java |   0
 .../ui/internal/common/component/tabs/EmfUtil.java  |   0
 .../internal/common/component/tabs/IGotoObject.java |   0
 .../common/component/tabs/IViewEObjects.java        |   0
 .../ui/internal/common/component/tabs/ListTab.java  |   0
 .../ui/internal/common/component/tabs/Messages.java |   0
 .../tabs/ModelResourceContentProvider.java          |   0
 .../common/component/tabs/TableViewerUtil.java      |   0
 .../ui/internal/common/component/tabs/XmiTab.java   |   0
 .../ui/internal/common/component/tabs/empty/E.java  |   0
 .../component/tabs/empty/EmptyFilterOption.java     |   0
 .../component/tabs/empty/TitleAreaFilterDialog.java |   0
 .../TitleAreaFilterDialogWithEmptyOptions.java      |   0
 .../common/component/tabs/messages.properties       |   0
 .../component/virtual/AbstractVTrimEditor.java      |   0
 .../component/virtual/VApplicationAddons.java       |   0
 .../virtual/VApplicationCategoriesEditor.java       |   0
 .../component/virtual/VApplicationWindowEditor.java |   0
 .../component/virtual/VBindingTableEditor.java      |   0
 .../common/component/virtual/VCommandEditor.java    |   0
 .../common/component/virtual/VControlsEditor.java   |   0
 .../common/component/virtual/VHandlerEditor.java    |   0
 .../component/virtual/VItemParametersEditor.java    |   0
 .../component/virtual/VMenuContributionsEditor.java |   0
 .../common/component/virtual/VMenuEditor.java       |   0
 .../component/virtual/VModelFragmentsEditor.java    |   0
 .../component/virtual/VModelImportsEditor.java      |   0
 .../common/component/virtual/VPartDescriptor.java   |   0
 .../virtual/VPartDescriptorMenuEditor.java          |   0
 .../virtual/VPartDescriptorTrimEditor.java          |   0
 .../common/component/virtual/VPartMenuEditor.java   |   0
 .../common/component/virtual/VPartTrimEditor.java   |   0
 .../virtual/VPerspectiveControlEditor.java          |   0
 .../component/virtual/VPerspectiveTrimEditor.java   |   0
 .../virtual/VPerspectiveWindowsEditor.java          |   0
 .../component/virtual/VRootBindingContexts.java     |   0
 .../common/component/virtual/VSnippetsEditor.java   |   0
 .../virtual/VToolBarContributionsEditor.java        |   0
 .../component/virtual/VTrimContributionsEditor.java |   0
 .../component/virtual/VWindowControlEditor.java     |   0
 .../common/component/virtual/VWindowEditor.java     |   0
 .../virtual/VWindowSharedElementsEditor.java        |   0
 .../common/component/virtual/VWindowTrimEditor.java |   0
 .../component/virtual/VWindowWindowsEditor.java     |   0
 .../ui/internal/common/objectdata/AccessLevel.java  |   0
 .../internal/common/objectdata/JavaAttribute.java   |   0
 .../ui/internal/common/objectdata/JavaMethod.java   |   0
 .../ui/internal/common/objectdata/JavaObject.java   |   0
 .../ui/internal/common/objectdata/ObjectViewer.java |   0
 .../common/properties/ExportIdsHandler.java         |   0
 .../common/properties/ExternalizeStringHandler.java |   0
 .../properties/ProjectOSGiTranslationProvider.java  |   0
 .../common/resourcelocator/BundleConverter.java     |   0
 .../internal/common/resourcelocator/Messages.java   |   0
 .../TargetPlatformClassContributionCollector.java   |   0
 .../TargetPlatformContributionCollector.java        |   0
 .../TargetPlatformIconContributionCollector.java    |   0
 .../resourcelocator/dialogs/BundleClassDialog.java  |   0
 .../resourcelocator/dialogs/DynamicWizard.java      |   0
 .../dialogs/FindContributionDialog.java             |   0
 .../resourcelocator/dialogs/FindIconDialog.java     |   0
 .../common/resourcelocator/dialogs/IconDialog.java  |   0
 .../dialogs/NonReferencedAction.java                |   0
 .../dialogs/NonReferencedActionPage.java            |   0
 .../dialogs/NonReferencedResourceDialog.java        |   0
 .../dialogs/NonReferencedResourceWizard.java        |   0
 .../dialogs/PickProjectFolderPage.java              |   0
 .../resourcelocator/dialogs/PickProjectPage.java    |   0
 .../dialogs/ProjectFolderPickerDialog.java          |   0
 .../dialogs/ReferencedProjectPickerDialog.java      |   0
 .../common/resourcelocator/dialogs/UriDialog.java   |   0
 .../resourcelocator/dialogs/UriDialogType.java      |   0
 .../common/resourcelocator/messages.properties      |   0
 .../ui/internal/common/uistructure/UIViewer.java    |   0
 .../internal/common/uistructure/ViewerElement.java  |   0
 .../common/uistructure/WidgetContentProvider.java   |   0
 .../common/uistructure/WidgetLabelProvider.java     |   0
 .../ui/internal/common/xml/AnnotationAccess.java    |   0
 .../common/xml/EMFDocumentResourceMediator.java     |   0
 .../ui/internal/common/xml/IXMLColorConstants.java  |   0
 .../common/xml/NonRuleBasedDamagerRepairer.java     |   0
 .../tools/emf/ui/internal/common/xml/TagRule.java   |   0
 .../ui/internal/common/xml/XMLConfiguration.java    |   0
 .../internal/common/xml/XMLDoubleClickStrategy.java |   0
 .../ui/internal/common/xml/XMLPartitionScanner.java |   0
 .../emf/ui/internal/common/xml/XMLScanner.java      |   0
 .../emf/ui/internal/common/xml/XMLTagScanner.java   |   0
 .../internal/common/xml/XMLWhitespaceDetector.java  |   0
 .../emf/ui/internal/handlers/AbstractHandler.java   |   0
 .../internal/handlers/AutosizeColumnsHandler.java   |   0
 .../handlers/MarkDuplicateAttributesHandler.java    |   0
 .../handlers/MarkDuplicateElementIdsHandler.java    |   0
 .../internal/handlers/MarkDuplicateItemsBase.java   |   0
 .../handlers/MarkDuplicateLabelsHandler.java        |   0
 .../handlers/RepairDuplicateItemsHandler.java       |   0
 .../ui/internal/handlers/ResetToDefaultHandler.java |   0
 .../ui/internal/handlers/UnmarkItemsHandler.java    |   0
 .../e4/tools/emf/ui/internal/imp/Messages.java      |   0
 .../tools/emf/ui/internal/imp/ModelImportPage1.java |   0
 .../emf/ui/internal/imp/ModelImportWizard.java      |   0
 .../tools/emf/ui/internal/imp/RegistryStruct.java   |   0
 .../e4/tools/emf/ui/internal/imp/RegistryUtil.java  |   0
 .../tools/emf/ui/internal/imp/messages.properties   |   0
 .../emf/ui/internal/wbm/ApplicationModelEditor.java |   0
 .../org.eclipse.e4.tools.jdt.templates/.classpath   |   0
 .../org.eclipse.e4.tools.jdt.templates/.project     |   0
 .../.settings/org.eclipse.core.resources.prefs      |   0
 .../.settings/org.eclipse.core.runtime.prefs        |   0
 .../.settings/org.eclipse.jdt.core.prefs            |   0
 .../.settings/org.eclipse.jdt.ui.prefs              |   0
 .../.settings/org.eclipse.pde.api.tools.prefs       |   0
 .../.settings/org.eclipse.pde.prefs                 |   0
 .../META-INF/MANIFEST.MF                            |   0
 .../org.eclipse.e4.tools.jdt.templates/about.html   |   0
 .../build.properties                                |   0
 .../forceQualifierUpdate.txt                        |   0
 .../icons/full/elcl16/e4assist_co.gif               | Bin
 .../plugin.properties                               |   0
 .../org.eclipse.e4.tools.jdt.templates/plugin.xml   |   0
 .../internal/tools/jdt/templates/E4ContextType.java |   0
 .../E4TemplateCompletionProposalComputer.java       |   0
 .../templates/default-e4templates.properties        |   0
 .../templates/default-e4templates.xml               |   0
 .../org.eclipse.e4.tools.persistence/.classpath     |   0
 .../org.eclipse.e4.tools.persistence/.project       |   0
 .../.settings/org.eclipse.core.resources.prefs      |   0
 .../.settings/org.eclipse.core.runtime.prefs        |   0
 .../.settings/org.eclipse.jdt.core.prefs            |   0
 .../.settings/org.eclipse.jdt.ui.prefs              |   0
 .../.settings/org.eclipse.pde.api.tools.prefs       |   0
 .../.settings/org.eclipse.pde.prefs                 |   0
 .../META-INF/MANIFEST.MF                            |   0
 .../OSGI-INF/l10n/bundle.properties                 |   0
 .../org.eclipse.e4.tools.persistence/about.html     |   0
 .../build.properties                                |   0
 .../forceQualifierUpdate.txt                        |   0
 .../model/persistence.ecore                         |   0
 .../model/persistence.genmodel                      |   0
 .../org.eclipse.e4.tools.persistence/plugin.xml     |   0
 .../e4/tools/internal/persistence/IPartMemento.java |   0
 .../internal/persistence/IPersistenceFactory.java   |   0
 .../internal/persistence/IPersistencePackage.java   |   0
 .../tools/internal/persistence/IWorkbenchState.java |   0
 .../internal/persistence/impl/PartMemento.java      |   0
 .../persistence/impl/PersistenceFactory.java        |   0
 .../persistence/impl/PersistencePackage.java        |   0
 .../internal/persistence/impl/WorkbenchState.java   |   0
 .../tools/internal/persistence/util/CommonUtil.java |   0
 .../persistence/util/PersistenceAdapterFactory.java |   0
 .../persistence/util/PersistenceSwitch.java         |   0
 .../e4/tools/persistence/PerspectivePersister.java  |   0
 .../org.eclipse.e4.tools.services/.classpath        |   0
 .../bundles/org.eclipse.e4.tools.services/.project  |   0
 .../.settings/org.eclipse.core.resources.prefs      |   0
 .../.settings/org.eclipse.core.runtime.prefs        |   0
 .../.settings/org.eclipse.jdt.core.prefs            |   0
 .../.settings/org.eclipse.jdt.ui.prefs              |   0
 .../.settings/org.eclipse.pde.api.tools.prefs       |   0
 .../.settings/org.eclipse.pde.prefs                 |   0
 .../META-INF/MANIFEST.MF                            |   0
 .../OSGI-INF/l10n/bundle.properties                 |   0
 .../OSGI-INF/resourcepoolfunction.xml               |   0
 .../OSGI-INF/resourceservice.xml                    |   0
 .../org.eclipse.e4.tools.services/about.html        |   0
 .../org.eclipse.e4.tools.services/build.properties  |   0
 .../forceQualifierUpdate.txt                        |   0
 .../e4/tools/services/BasicResourceProvider.java    |   0
 .../e4/tools/services/IClipboardService.java        |   0
 .../e4/tools/services/IDirtyProviderService.java    |   0
 .../eclipse/e4/tools/services/IResourcePool.java    |   0
 .../e4/tools/services/IResourceProviderService.java |   0
 .../eclipse/e4/tools/services/IResourceService.java |   0
 .../e4/tools/services/ToolsServicesConstants.java   |   0
 .../eclipse/e4/tools/services/impl/Messages.java    |   0
 .../tools/services/impl/ResourceBundleHelper.java   |   0
 .../impl/ResourceBundleTranslationProvider.java     |   0
 .../e4/tools/services/impl/ResourcePoolFactory.java |   0
 .../e4/tools/services/impl/ResourceService.java     |   0
 .../e4/tools/services/impl/messages.properties      |   0
 .../bundles/org.eclipse.e4.tools/.classpath         |   0
 .../bundles/org.eclipse.e4.tools/.project           |   0
 .../.settings/org.eclipse.core.resources.prefs      |   0
 .../.settings/org.eclipse.core.runtime.prefs        |   0
 .../.settings/org.eclipse.jdt.core.prefs            |   0
 .../.settings/org.eclipse.jdt.ui.prefs              |   0
 .../.settings/org.eclipse.pde.api.tools.prefs       |   0
 .../.settings/org.eclipse.pde.prefs                 |   0
 .../org.eclipse.e4.tools/META-INF/MANIFEST.MF       |   0
 .../OSGI-INF/l10n/bundle.properties                 |   0
 .../bundles/org.eclipse.e4.tools/README.md          |   0
 .../bundles/org.eclipse.e4.tools/about.html         |   0
 .../bundles/org.eclipse.e4.tools/build.properties   |   0
 .../org.eclipse.e4.tools/forceQualifierUpdate.txt   |   0
 .../icons/full/obj16/Addons.png                     | Bin
 .../org.eclipse.e4.tools/icons/full/obj16/Part.gif  | Bin
 .../icons/full/obj16/ToolControl.gif                | Bin
 .../icons/full/obj16/application_view_tile.png      | Bin
 .../icons/full/obj16/class_obj.png                  | Bin
 .../icons/full/obj16/class_obj@2x.png               | Bin
 .../icons/full/obj16/plugin.png                     | Bin
 .../icons/full/wizban/newclass_wiz.png              | Bin
 .../emf/editor3x/templates/HandlerTemplate.java     |   0
 .../tools/emf/editor3x/templates/PartTemplate.java  |   0
 .../internal/classes/templates/HandlerTemplate.java |   0
 .../internal/classes/templates/PartTemplate.java    |   0
 .../bundles/org.eclipse.e4.tools/plugin.xml         |   0
 .../src/org/eclipse/e4/internal/tools/Messages.java |   0
 .../org/eclipse/e4/internal/tools/ToolsPlugin.java  |   0
 .../eclipse/e4/internal/tools/messages.properties   |   0
 .../tools/wizards/classes/AbstractNewClassPage.java |   0
 .../wizards/classes/AbstractNewClassWizard.java     |   0
 .../tools/wizards/classes/NewAddonClassWizard.java  |   0
 .../NewDynamicMenuContributionClassWizard.java      |   0
 .../wizards/classes/NewHandlerClassWizard.java      |   0
 .../classes/NewImperativeExpressionClassWizard.java |   0
 .../tools/wizards/classes/NewPartClassWizard.java   |   0
 .../wizards/classes/NewToolControlClassWizard.java  |   0
 .../wizards/classes/templates/AddonTemplate.java    |   0
 .../templates/DynamicMenuContributionTemplate.java  |   0
 .../wizards/classes/templates/HandlerTemplate.java  |   0
 .../templates/ImperativeExpressionTemplate.java     |   0
 .../wizards/classes/templates/PartTemplate.java     |   0
 .../classes/templates/ToolControlTemplate.java      |   0
 .../wizards/model/BaseApplicationModelWizard.java   |   0
 .../model/ExtractContributionModelWizard.java       |   0
 .../tools/wizards/model/FragmentExtractHelper.java  |   0
 .../tools/wizards/model/FragmentMergeHelper.java    |   0
 .../wizards/model/NewApplicationModelWizard.java    |   0
 .../wizards/model/NewContributionModelWizard.java   |   0
 .../tools/wizards/model/NewModelFilePage.java       |   0
 .../org.eclipse.e4.core.tools.feature/.project      |   0
 .../.settings/org.eclipse.core.resources.prefs      |   0
 .../.settings/org.eclipse.core.runtime.prefs        |   0
 .../build.properties                                |   0
 .../feature.properties                              |   0
 .../org.eclipse.e4.core.tools.feature/feature.xml   |   0
 .../forceQualifierUpdate.txt                        |   0
 .../.project                                        |   0
 .../.settings/org.eclipse.core.resources.prefs      |   0
 .../build.properties                                |   0
 .../feature.properties                              |   0
 .../feature.xml                                     |   0
 .../forceQualifierUpdate.txt                        |   0
 .../.classpath                                      |   0
 .../.project                                        |   0
 .../.settings/org.eclipse.core.resources.prefs      |   0
 .../.settings/org.eclipse.core.runtime.prefs        |   0
 .../.settings/org.eclipse.jdt.core.prefs            |   0
 .../.settings/org.eclipse.jdt.ui.prefs              |   0
 .../.settings/org.eclipse.pde.prefs                 |   0
 .../META-INF/MANIFEST.MF                            |   0
 .../build.properties                                |   0
 .../pom.xml                                         |   0
 .../resources/e4_test.xml                           |   0
 .../resources/perspective_3x.xml                    |   0
 .../migration/tests/E4MigrationToolTest.java        |   0
 .../migration/tests/util/TestWorkbenchAdvisor.java  |   0
 .../.classpath                                      |   0
 .../org.eclipse.e4.tools.persistence.tests/.project |   0
 .../.settings/org.eclipse.core.resources.prefs      |   0
 .../.settings/org.eclipse.core.runtime.prefs        |   0
 .../.settings/org.eclipse.jdt.core.prefs            |   0
 .../.settings/org.eclipse.jdt.ui.prefs              |   0
 .../.settings/org.eclipse.pde.prefs                 |   0
 .../META-INF/MANIFEST.MF                            |   0
 .../build.properties                                |   0
 .../plugin.xml                                      |   0
 .../org.eclipse.e4.tools.persistence.tests/pom.xml  |   0
 .../resources/workbench_restore.persistence         |   0
 .../persistence/tests/PerspectivePersisterTest.java |   0
 .../persistence/tests/util/TestPerspective.java     |   0
 .../tools/persistence/tests/util/TestViewPart.java  |   0
 .../tests/util/TestWorkbenchAdvisor.java            |   0
 .../tests/org.eclipse.e4.tools.test/.classpath      |   0
 .../tests/org.eclipse.e4.tools.test/.project        |   0
 .../.settings/org.eclipse.core.resources.prefs      |   0
 .../.settings/org.eclipse.core.runtime.prefs        |   0
 .../.settings/org.eclipse.jdt.core.prefs            |   0
 .../.settings/org.eclipse.jdt.ui.prefs              |   0
 .../.settings/org.eclipse.pde.api.tools.prefs       |   0
 .../.settings/org.eclipse.pde.core.prefs            |   0
 .../.settings/org.eclipse.pde.prefs                 |   0
 .../org.eclipse.e4.tools.test/META-INF/MANIFEST.MF  |   0
 .../org.eclipse.e4.tools.test/build.properties      |   0
 .../e4/tools/test/FragmentExtractHelperTest.java    |   0
 .../e4/tools/test/FragmentMergeHelperTest.java      |   0
 645 files changed, 0 insertions(+), 0 deletions(-)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/.classpath (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/.project (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/about.html (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/build.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/plugin.xml (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compatibility.migration/.classpath (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compatibility.migration/.project (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.core.resources.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compatibility.migration/OSGI-INF/l10n/bundle.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compatibility.migration/build.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compatibility.migration/forceQualifierUpdate.txt (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/WorkbenchUtil.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/.project (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.resources.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.api.tools.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/modelextractor.xml (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdee4xmiprovider.xml (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdeextensionlookup.xml (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/projectfunction.xml (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/xmiresourcecontextfunction.xml (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/about.html (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/application_view_tile.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ImperativeExpressionContributionEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/messages.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelMoveParticipant.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelRenameParticipant.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/.classpath (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/.project (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.resources.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.api.tools.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.core.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resourceprovider.xml (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/README.md (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/about.html (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/build.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/css/default.css (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area_vertical.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingTable.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Category.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CoreExpression.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DynamicMenuContribution.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelFragments.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartDescriptor.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/StringModelFragment.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/EPackage.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/add_column.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/application_form.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_down.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_up.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bullet_go.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bundle.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/chart_organisation.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_default_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj@2x.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/command.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/copy_to_project.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/cross.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/error_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_default_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_private_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_protected_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_public_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_attribute.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_item.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/find.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/headermenu.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/mark_occurrences.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/missing_image_placeholder.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj@2x.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/projects.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/remove_filter.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/reset_columns.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_add.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_delete.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/use_anyway.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/world_edit.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/zoom.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/button_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ccombo_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/checkbox_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/clabel_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/comboviewer_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/composite_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/coolbar_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ctabfolder_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/group_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/label_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menu_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menubar_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuitem_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuseparator_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/progressbar_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/radiobutton_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/sashform_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/separator_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/shell_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tabfolder_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/table_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/text_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolbar_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemcheck_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemdrop_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitempush_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemradio_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemseparator_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tree_obj.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/add_to_dir_wiz.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/attribute_wiz.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/error_wiz.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/extstr_wiz.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/fieldrefact_wiz.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/imp3x_wiz.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/import_wiz.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/location_wiz.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newclass_wiz.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newefix_wizban.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newexp_wiz.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newfolder_wiz.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz@2x.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/package_wiz.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/plugin_wiz.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/typerefact_wiz.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/pom.xml (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.scripting.exsd (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelExtractor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IScriptingSupport.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ModelEditorPreferences.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Plugin.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandIconDialogEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ModelResultHandlerImpl.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/Messages.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/AbstractVTrimEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlsEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorTrimEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartTrimEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveTrimEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/AccessLevel.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaMethod.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/Messages.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/messages.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/IXMLColorConstants.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLPartitionScanner.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateElementIdsHandler.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateLabelsHandler.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/Messages.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryStruct.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/messages.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/.classpath (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/.project (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.resources.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.api.tools.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/about.html (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/build.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/icons/full/elcl16/e4assist_co.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/.classpath (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/.project (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.resources.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.api.tools.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/OSGI-INF/l10n/bundle.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/about.html (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/build.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/forceQualifierUpdate.txt (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/model/persistence.ecore (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/plugin.xml (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPartMemento.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistenceFactory.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistencePackage.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IWorkbenchState.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PartMemento.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistenceFactory.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistencePackage.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/WorkbenchState.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceAdapterFactory.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/.classpath (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/.project (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.resources.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.api.tools.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/OSGI-INF/l10n/bundle.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourcepoolfunction.xml (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourceservice.xml (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/about.html (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/build.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourcePool.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceProviderService.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesConstants.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/messages.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/.classpath (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/.project (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.resources.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.api.tools.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.prefs (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/README.md (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/about.html (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/build.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/icons/full/obj16/Addons.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/icons/full/obj16/Part.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/icons/full/obj16/ToolControl.gif (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/icons/full/obj16/application_view_tile.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj@2x.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/icons/full/obj16/plugin.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/icons/full/wizban/newclass_wiz.png (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/HandlerTemplate.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/HandlerTemplate.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/plugin.xml (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java (100%)
 rename {tools => e4tools}/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java (100%)
 rename {tools => e4tools}/features/org.eclipse.e4.core.tools.feature/.project (100%)
 rename {tools => e4tools}/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.resources.prefs (100%)
 rename {tools => e4tools}/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {tools => e4tools}/features/org.eclipse.e4.core.tools.feature/build.properties (100%)
 rename {tools => e4tools}/features/org.eclipse.e4.core.tools.feature/feature.properties (100%)
 rename {tools => e4tools}/features/org.eclipse.e4.core.tools.feature/feature.xml (100%)
 rename {tools => e4tools}/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt (100%)
 rename {tools => e4tools}/features/org.eclipse.e4.tools.persistence.feature/.project (100%)
 rename {tools => e4tools}/features/org.eclipse.e4.tools.persistence.feature/.settings/org.eclipse.core.resources.prefs (100%)
 rename {tools => e4tools}/features/org.eclipse.e4.tools.persistence.feature/build.properties (100%)
 rename {tools => e4tools}/features/org.eclipse.e4.tools.persistence.feature/feature.properties (100%)
 rename {tools => e4tools}/features/org.eclipse.e4.tools.persistence.feature/feature.xml (100%)
 rename {tools => e4tools}/features/org.eclipse.e4.tools.persistence.feature/forceQualifierUpdate.txt (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.compatibility.migration.tests/.classpath (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.compatibility.migration.tests/.project (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.resources.prefs (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.pde.prefs (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.compatibility.migration.tests/build.properties (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/e4_test.xml (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/perspective_3x.xml (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/util/TestWorkbenchAdvisor.java (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.persistence.tests/.classpath (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.persistence.tests/.project (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.resources.prefs (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.pde.prefs (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.persistence.tests/build.properties (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.persistence.tests/plugin.xml (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.persistence.tests/pom.xml (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.persistence.tests/resources/workbench_restore.persistence (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestPerspective.java (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestViewPart.java (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestWorkbenchAdvisor.java (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.test/.classpath (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.test/.project (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.resources.prefs (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.api.tools.prefs (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.core.prefs (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.prefs (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.test/build.properties (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java (100%)
 rename {tools => e4tools}/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java (100%)

diff --git a/tools/bundles/org.eclipse.e4.tools.compat/.classpath b/e4tools/bundles/org.eclipse.e4.tools.compat/.classpath
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/.classpath
rename to e4tools/bundles/org.eclipse.e4.tools.compat/.classpath
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/.project b/e4tools/bundles/org.eclipse.e4.tools.compat/.project
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/.project
rename to e4tools/bundles/org.eclipse.e4.tools.compat/.project
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs b/e4tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.resources.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs b/e4tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.core.runtime.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs b/e4tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs b/e4tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs b/e4tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs b/e4tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.pde.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/e4tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
rename to e4tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties b/e4tools/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties
rename to e4tools/bundles/org.eclipse.e4.tools.compat/OSGI-INF/l10n/bundle.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/about.html b/e4tools/bundles/org.eclipse.e4.tools.compat/about.html
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/about.html
rename to e4tools/bundles/org.eclipse.e4.tools.compat/about.html
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/build.properties b/e4tools/bundles/org.eclipse.e4.tools.compat/build.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/build.properties
rename to e4tools/bundles/org.eclipse.e4.tools.compat/build.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt b/e4tools/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
rename to e4tools/bundles/org.eclipse.e4.tools.compat/forceQualifierUpdate.txt
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/plugin.xml b/e4tools/bundles/org.eclipse.e4.tools.compat/plugin.xml
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/plugin.xml
rename to e4tools/bundles/org.eclipse.e4.tools.compat/plugin.xml
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java b/e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
rename to e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ClipboardServiceImpl.java
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
rename to e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java b/e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
rename to e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java b/e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
rename to e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CutAction.java
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java b/e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
rename to e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java b/e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
rename to e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/Messages.java
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
rename to e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java b/e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
rename to e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PasteAction.java
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java b/e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
rename to e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties b/e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties
rename to e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/messages.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java b/e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
rename to e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIEditorPart.java
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java b/e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
rename to e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIHandler.java
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java b/e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
rename to e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIMultiPageEditorPart.java
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java b/e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
rename to e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java
diff --git a/tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java b/e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
rename to e4tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DIViewPart.java
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/.classpath b/e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/.classpath
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compatibility.migration/.classpath
rename to e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/.classpath
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/.project b/e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/.project
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compatibility.migration/.project
rename to e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/.project
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.core.resources.prefs b/e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.core.resources.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.core.resources.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.jdt.core.prefs b/e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.jdt.core.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/.settings/org.eclipse.jdt.core.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF b/e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
rename to e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/META-INF/MANIFEST.MF
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/OSGI-INF/l10n/bundle.properties b/e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compatibility.migration/OSGI-INF/l10n/bundle.properties
rename to e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/OSGI-INF/l10n/bundle.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/build.properties b/e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/build.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compatibility.migration/build.properties
rename to e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/build.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/forceQualifierUpdate.txt b/e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/forceQualifierUpdate.txt
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compatibility.migration/forceQualifierUpdate.txt
rename to e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/forceQualifierUpdate.txt
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java b/e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java
rename to e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/compatibiliy/migration/PerspectiveMigrator.java
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java b/e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
rename to e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/E4MigrationTool.java
diff --git a/tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/WorkbenchUtil.java b/e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/WorkbenchUtil.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/WorkbenchUtil.java
rename to e4tools/bundles/org.eclipse.e4.tools.compatibility.migration/src/org/eclipse/e4/tools/internal/compatibiliy/migration/WorkbenchUtil.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.project b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/.project
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/.project
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/.project
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.resources.prefs b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.resources.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.resources.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.runtime.prefs b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.runtime.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.core.runtime.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.api.tools.prefs b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.api.tools.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.prefs b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.pde.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/l10n/bundle.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/modelextractor.xml b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/modelextractor.xml
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/modelextractor.xml
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/modelextractor.xml
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdecontributionprovider.xml
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdee4xmiprovider.xml b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdee4xmiprovider.xml
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdee4xmiprovider.xml
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdee4xmiprovider.xml
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdeextensionlookup.xml b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdeextensionlookup.xml
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdeextensionlookup.xml
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/pdeextensionlookup.xml
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/projectfunction.xml b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/projectfunction.xml
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/projectfunction.xml
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/projectfunction.xml
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/xmiresourcecontextfunction.xml b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/xmiresourcecontextfunction.xml
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/xmiresourcecontextfunction.xml
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/OSGI-INF/xmiresourcecontextfunction.xml
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/about.html b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/about.html
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/about.html
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/about.html
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/build.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/forceQualifierUpdate.txt
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/application_view_tile.png b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/application_view_tile.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/application_view_tile.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/icons/full/obj16/application_view_tile.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/plugin.xml
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/EditorProjectFunction.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/Messages.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEExtensionLookup.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RedoAction.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorModel.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/TargetElementProviders.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/UndoAction.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/emf/EditUIUtil.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ImperativeExpressionContributionEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ImperativeExpressionContributionEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ImperativeExpressionContributionEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ImperativeExpressionContributionEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/ToolControlContributionEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/Util.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/messages.properties b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/messages.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/messages.properties
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/messages.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelMoveParticipant.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelMoveParticipant.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelMoveParticipant.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelMoveParticipant.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelRenameParticipant.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelRenameParticipant.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelRenameParticipant.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/ModelRenameParticipant.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java b/e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/refactorparticipants/RefactorParticipantDelegate.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/.classpath b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/.classpath
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/.classpath
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/.classpath
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/.project b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/.project
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/.project
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/.project
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.resources.prefs b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.resources.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.runtime.prefs b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.runtime.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.core.runtime.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.api.tools.prefs b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.api.tools.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.core.prefs b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.core.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.core.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.prefs b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/.settings/org.eclipse.pde.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/contributioncollector.xml
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resourceprovider.xml b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resourceprovider.xml
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resourceprovider.xml
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resourceprovider.xml
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/OSGI-INF/resources.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/README.md b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/README.md
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/README.md
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/README.md
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/about.html b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/about.html
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/about.html
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/about.html
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/build.properties b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/build.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/build.properties
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/build.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/css/default.css b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/css/default.css
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/css/default.css
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/css/default.css
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/forceQualifierUpdate.txt
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/fragment.e4xmi
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Addons.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Application.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area_vertical.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area_vertical.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area_vertical.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Area_vertical.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingContext.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingTable.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingTable.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingTable.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/BindingTable.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Category.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Category.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Category.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Category.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Command.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CommandParameter.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CoreExpression.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CoreExpression.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CoreExpression.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/CoreExpression.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectMenuItem.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DirectToolItem.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DynamicMenuContribution.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DynamicMenuContribution.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DynamicMenuContribution.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/DynamicMenuContribution.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledMenuItem.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/HandledToolItem.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Handler.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/KeyBinding.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Menu.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuContribution.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuItem.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/MenuSeparator.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelFragments.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelFragments.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelFragments.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ModelFragments.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Parameter.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Part.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartDescriptor.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartDescriptor.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartDescriptor.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartDescriptor.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartSashContainer_vertical.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PartStack.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Perspective.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/PerspectiveStack.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Placeholder.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/StringModelFragment.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/StringModelFragment.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/StringModelFragment.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/StringModelFragment.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBar.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarContribution.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolBarSeparator.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/ToolControl.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/TrimContribution.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/Window.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/modelelements/WindowTrim.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/EPackage.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/EPackage.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/EPackage.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/EPackage.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/add_column.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/add_column.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/add_column.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/add_column.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/application_form.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/application_form.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/application_form.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/application_form.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_down.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_down.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_down.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_down.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_up.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_up.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_up.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/arrow_up.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bullet_go.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bullet_go.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bullet_go.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bullet_go.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bundle.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bundle.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bundle.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/bundle.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/chart_organisation.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/chart_organisation.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/chart_organisation.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/chart_organisation.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_default_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_default_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_default_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_default_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj@2x.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj@2x.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj@2x.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/class_obj@2x.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/command.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/command.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/command.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/command.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/copy_to_project.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/copy_to_project.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/copy_to_project.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/copy_to_project.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/cross.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/cross.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/cross.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/cross.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/error_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/error_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/error_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/error_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_default_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_default_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_default_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_default_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_private_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_private_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_private_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_private_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_protected_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_protected_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_protected_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_protected_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_public_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_public_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_public_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/field_public_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_attribute.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_attribute.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_attribute.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_attribute.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_item.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_item.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_item.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/filter_by_item.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/find.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/find.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/find.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/find.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/headermenu.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/headermenu.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/headermenu.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/headermenu.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/mark_occurrences.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/mark_occurrences.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/mark_occurrences.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/mark_occurrences.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/missing_image_placeholder.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/missing_image_placeholder.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/missing_image_placeholder.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/missing_image_placeholder.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj@2x.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj@2x.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj@2x.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/package_obj@2x.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/projects.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/projects.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/projects.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/projects.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/remove_filter.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/remove_filter.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/remove_filter.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/remove_filter.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/reset_columns.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/reset_columns.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/reset_columns.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/reset_columns.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_add.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_add.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_add.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_add.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_delete.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_delete.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_delete.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/table_delete.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/use_anyway.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/use_anyway.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/use_anyway.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/use_anyway.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/world_edit.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/world_edit.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/world_edit.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/world_edit.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/zoom.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/zoom.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/zoom.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/obj16/zoom.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/button_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/button_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/button_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/button_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ccombo_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ccombo_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ccombo_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ccombo_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/checkbox_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/checkbox_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/checkbox_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/checkbox_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/clabel_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/clabel_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/clabel_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/clabel_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/comboviewer_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/comboviewer_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/comboviewer_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/comboviewer_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/composite_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/composite_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/composite_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/composite_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/coolbar_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/coolbar_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/coolbar_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/coolbar_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ctabfolder_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ctabfolder_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ctabfolder_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/ctabfolder_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/group_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/group_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/group_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/group_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/label_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/label_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/label_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/label_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menu_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menu_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menu_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menu_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menubar_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menubar_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menubar_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menubar_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuitem_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuitem_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuitem_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuitem_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuseparator_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuseparator_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuseparator_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/menuseparator_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/progressbar_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/progressbar_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/progressbar_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/progressbar_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/radiobutton_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/radiobutton_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/radiobutton_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/radiobutton_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/sashform_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/sashform_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/sashform_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/sashform_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/separator_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/separator_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/separator_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/separator_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/shell_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/shell_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/shell_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/shell_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tabfolder_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tabfolder_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tabfolder_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tabfolder_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/table_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/table_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/table_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/table_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/text_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/text_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/text_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/text_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolbar_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolbar_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolbar_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolbar_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemcheck_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemcheck_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemcheck_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemcheck_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemdrop_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemdrop_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemdrop_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemdrop_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitempush_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitempush_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitempush_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitempush_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemradio_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemradio_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemradio_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemradio_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemseparator_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemseparator_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemseparator_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/toolitemseparator_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tree_obj.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tree_obj.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tree_obj.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/widgets/tree_obj.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/add_to_dir_wiz.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/add_to_dir_wiz.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/add_to_dir_wiz.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/add_to_dir_wiz.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/attribute_wiz.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/attribute_wiz.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/attribute_wiz.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/attribute_wiz.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/error_wiz.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/error_wiz.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/error_wiz.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/error_wiz.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/extstr_wiz.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/extstr_wiz.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/extstr_wiz.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/extstr_wiz.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/fieldrefact_wiz.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/fieldrefact_wiz.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/fieldrefact_wiz.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/fieldrefact_wiz.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/imp3x_wiz.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/imp3x_wiz.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/imp3x_wiz.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/imp3x_wiz.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/import_wiz.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/import_wiz.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/import_wiz.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/import_wiz.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/location_wiz.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/location_wiz.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/location_wiz.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/location_wiz.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newclass_wiz.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newclass_wiz.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newclass_wiz.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newclass_wiz.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newefix_wizban.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newefix_wizban.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newefix_wizban.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newefix_wizban.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newexp_wiz.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newexp_wiz.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newexp_wiz.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newexp_wiz.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newfolder_wiz.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newfolder_wiz.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newfolder_wiz.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newfolder_wiz.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz@2x.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz@2x.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz@2x.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/newsearch_wiz@2x.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/package_wiz.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/package_wiz.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/package_wiz.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/package_wiz.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/plugin_wiz.gif b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/plugin_wiz.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/plugin_wiz.gif
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/plugin_wiz.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/typerefact_wiz.png b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/typerefact_wiz.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/typerefact_wiz.png
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/icons/full/wizban/typerefact_wiz.png
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/plugin.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/plugin.xml
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.editors.exsd
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.scripting.exsd b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.scripting.exsd
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.scripting.exsd
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/schema/org.eclipse.e4.tools.emf.ui.scripting.exsd
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IClassContributionProvider.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IContributionClassCreator.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorDescriptor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IEditorFeature.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IExtensionLookup.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelElementProvider.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelExtractor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelExtractor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelExtractor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelExtractor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IModelResource.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IProviderStatusCallback.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IScriptingSupport.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IScriptingSupport.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IScriptingSupport.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/IScriptingSupport.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ISelectionProviderService.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ModelEditorPreferences.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ModelEditorPreferences.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ModelEditorPreferences.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ModelEditorPreferences.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Plugin.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Plugin.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Plugin.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Plugin.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ProviderStatus.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ResourceSearchScope.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/IdGenerator.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/E4Properties.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ResourceProvider.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/StringMatcher.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/Autocomplete.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ClassContributionCollector.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4StringPickList.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/EClassLabelProvider.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/FeatureClassLabelProvider.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/TreeViewerEx.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AbstractPartEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DefaultEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ImperativeExpressionEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/UnsettableUpdateValueStrategy.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithHardcodedScope.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BundleImageCache.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandIconDialogEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandIconDialogEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandIconDialogEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandIconDialogEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionDataFile.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ModelResultHandlerImpl.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ModelResultHandlerImpl.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ModelResultHandlerImpl.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ModelResultHandlerImpl.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SaveDialogBoundsSettingsDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolBarIdDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/TrimIdDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ContributionUriCellEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/DocUtil.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/E4ToolItemMenu.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeEditingSupport.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EAttributeTableViewerColumn.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/EmfUtil.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IGotoObject.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/IViewEObjects.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/Messages.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/Messages.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/Messages.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/Messages.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ModelResourceContentProvider.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/TableViewerUtil.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/XmiTab.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/E.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/EmptyFilterOption.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialogWithEmptyOptions.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/messages.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/AbstractVTrimEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/AbstractVTrimEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/AbstractVTrimEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/AbstractVTrimEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationWindowEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlsEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlsEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlsEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VControlsEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorMenuEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorTrimEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorTrimEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorTrimEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptorTrimEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartMenuEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartTrimEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartTrimEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartTrimEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartTrimEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveTrimEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveTrimEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveTrimEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveTrimEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveWindowsEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowWindowsEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/AccessLevel.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/AccessLevel.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/AccessLevel.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/AccessLevel.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaAttribute.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaMethod.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaMethod.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaMethod.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaMethod.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/JavaObject.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/BundleConverter.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/Messages.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/Messages.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/Messages.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/Messages.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformClassContributionCollector.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformIconContributionCollector.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/BundleClassDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindIconDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/IconDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedAction.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedActionPage.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/NonReferencedResourceWizard.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectFolderPage.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/PickProjectPage.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ProjectFolderPickerDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/ReferencedProjectPickerDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialog.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/UriDialogType.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/messages.properties b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/messages.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/messages.properties
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/messages.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/IXMLColorConstants.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/IXMLColorConstants.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/IXMLColorConstants.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/IXMLColorConstants.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLPartitionScanner.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLPartitionScanner.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLPartitionScanner.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLPartitionScanner.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLScanner.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLTagScanner.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AbstractHandler.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/AutosizeColumnsHandler.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateAttributesHandler.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateElementIdsHandler.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateElementIdsHandler.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateElementIdsHandler.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateElementIdsHandler.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateItemsBase.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateLabelsHandler.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateLabelsHandler.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateLabelsHandler.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/MarkDuplicateLabelsHandler.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/RepairDuplicateItemsHandler.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/ResetToDefaultHandler.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/handlers/UnmarkItemsHandler.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/Messages.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/Messages.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/Messages.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/Messages.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportWizard.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryStruct.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryStruct.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryStruct.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryStruct.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/messages.properties b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/messages.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/messages.properties
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/messages.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
rename to e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/.classpath b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/.classpath
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/.project b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/.project
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/.project
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/.project
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.resources.prefs b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.resources.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.resources.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.runtime.prefs b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.runtime.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.core.runtime.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.api.tools.prefs b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.api.tools.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.prefs b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.pde.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/about.html b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/about.html
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/about.html
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/about.html
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/build.properties b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/build.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/build.properties
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/build.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/forceQualifierUpdate.txt
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/icons/full/elcl16/e4assist_co.gif b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/icons/full/elcl16/e4assist_co.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/icons/full/elcl16/e4assist_co.gif
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/icons/full/elcl16/e4assist_co.gif
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.properties b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.properties
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
rename to e4tools/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/.classpath b/e4tools/bundles/org.eclipse.e4.tools.persistence/.classpath
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/.classpath
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/.classpath
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/.project b/e4tools/bundles/org.eclipse.e4.tools.persistence/.project
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/.project
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/.project
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.resources.prefs b/e4tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.resources.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.resources.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.runtime.prefs b/e4tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.runtime.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.core.runtime.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs b/e4tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.core.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.ui.prefs b/e4tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.ui.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.api.tools.prefs b/e4tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.api.tools.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.prefs b/e4tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/.settings/org.eclipse.pde.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF b/e4tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/META-INF/MANIFEST.MF
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/OSGI-INF/l10n/bundle.properties b/e4tools/bundles/org.eclipse.e4.tools.persistence/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/OSGI-INF/l10n/bundle.properties
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/OSGI-INF/l10n/bundle.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/about.html b/e4tools/bundles/org.eclipse.e4.tools.persistence/about.html
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/about.html
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/about.html
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/build.properties b/e4tools/bundles/org.eclipse.e4.tools.persistence/build.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/build.properties
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/build.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/forceQualifierUpdate.txt b/e4tools/bundles/org.eclipse.e4.tools.persistence/forceQualifierUpdate.txt
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/forceQualifierUpdate.txt
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/forceQualifierUpdate.txt
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.ecore b/e4tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.ecore
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.ecore
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.ecore
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel b/e4tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/model/persistence.genmodel
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/plugin.xml b/e4tools/bundles/org.eclipse.e4.tools.persistence/plugin.xml
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/plugin.xml
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/plugin.xml
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPartMemento.java b/e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPartMemento.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPartMemento.java
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPartMemento.java
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistenceFactory.java b/e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistenceFactory.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistenceFactory.java
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistenceFactory.java
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistencePackage.java b/e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistencePackage.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistencePackage.java
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IPersistencePackage.java
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IWorkbenchState.java b/e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IWorkbenchState.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IWorkbenchState.java
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/IWorkbenchState.java
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PartMemento.java b/e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PartMemento.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PartMemento.java
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PartMemento.java
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistenceFactory.java b/e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistenceFactory.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistenceFactory.java
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistenceFactory.java
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistencePackage.java b/e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistencePackage.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistencePackage.java
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/PersistencePackage.java
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/WorkbenchState.java b/e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/WorkbenchState.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/WorkbenchState.java
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/impl/WorkbenchState.java
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java b/e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/CommonUtil.java
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceAdapterFactory.java b/e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceAdapterFactory.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceAdapterFactory.java
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceAdapterFactory.java
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java b/e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/internal/persistence/util/PersistenceSwitch.java
diff --git a/tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java b/e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java
rename to e4tools/bundles/org.eclipse.e4.tools.persistence/src/org/eclipse/e4/tools/persistence/PerspectivePersister.java
diff --git a/tools/bundles/org.eclipse.e4.tools.services/.classpath b/e4tools/bundles/org.eclipse.e4.tools.services/.classpath
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/.classpath
rename to e4tools/bundles/org.eclipse.e4.tools.services/.classpath
diff --git a/tools/bundles/org.eclipse.e4.tools.services/.project b/e4tools/bundles/org.eclipse.e4.tools.services/.project
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/.project
rename to e4tools/bundles/org.eclipse.e4.tools.services/.project
diff --git a/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.resources.prefs b/e4tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.resources.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.resources.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.runtime.prefs b/e4tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.runtime.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.core.runtime.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs b/e4tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.core.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs b/e4tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.api.tools.prefs b/e4tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.api.tools.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.prefs b/e4tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.prefs
rename to e4tools/bundles/org.eclipse.e4.tools.services/.settings/org.eclipse.pde.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/e4tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
rename to e4tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
diff --git a/tools/bundles/org.eclipse.e4.tools.services/OSGI-INF/l10n/bundle.properties b/e4tools/bundles/org.eclipse.e4.tools.services/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/OSGI-INF/l10n/bundle.properties
rename to e4tools/bundles/org.eclipse.e4.tools.services/OSGI-INF/l10n/bundle.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourcepoolfunction.xml b/e4tools/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourcepoolfunction.xml
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourcepoolfunction.xml
rename to e4tools/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourcepoolfunction.xml
diff --git a/tools/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourceservice.xml b/e4tools/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourceservice.xml
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourceservice.xml
rename to e4tools/bundles/org.eclipse.e4.tools.services/OSGI-INF/resourceservice.xml
diff --git a/tools/bundles/org.eclipse.e4.tools.services/about.html b/e4tools/bundles/org.eclipse.e4.tools.services/about.html
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/about.html
rename to e4tools/bundles/org.eclipse.e4.tools.services/about.html
diff --git a/tools/bundles/org.eclipse.e4.tools.services/build.properties b/e4tools/bundles/org.eclipse.e4.tools.services/build.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/build.properties
rename to e4tools/bundles/org.eclipse.e4.tools.services/build.properties
diff --git a/tools/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt b/e4tools/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
rename to e4tools/bundles/org.eclipse.e4.tools.services/forceQualifierUpdate.txt
diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java b/e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java
rename to e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/BasicResourceProvider.java
diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java b/e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java
rename to e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IClipboardService.java
diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java b/e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java
rename to e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IDirtyProviderService.java
diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourcePool.java b/e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourcePool.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourcePool.java
rename to e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourcePool.java
diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceProviderService.java b/e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceProviderService.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceProviderService.java
rename to e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceProviderService.java
diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java b/e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java
rename to e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/IResourceService.java
diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesConstants.java b/e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesConstants.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesConstants.java
rename to e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesConstants.java
diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java b/e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java
rename to e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/Messages.java
diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java b/e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
rename to e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java b/e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
rename to e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleTranslationProvider.java
diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java b/e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java
rename to e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourcePoolFactory.java
diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java b/e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
rename to e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
diff --git a/tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/messages.properties b/e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/messages.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/messages.properties
rename to e4tools/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/messages.properties
diff --git a/tools/bundles/org.eclipse.e4.tools/.classpath b/e4tools/bundles/org.eclipse.e4.tools/.classpath
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/.classpath
rename to e4tools/bundles/org.eclipse.e4.tools/.classpath
diff --git a/tools/bundles/org.eclipse.e4.tools/.project b/e4tools/bundles/org.eclipse.e4.tools/.project
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/.project
rename to e4tools/bundles/org.eclipse.e4.tools/.project
diff --git a/tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.resources.prefs b/e4tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.resources.prefs
rename to e4tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.resources.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.runtime.prefs b/e4tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.runtime.prefs
rename to e4tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.core.runtime.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs b/e4tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
rename to e4tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs b/e4tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
rename to e4tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.api.tools.prefs b/e4tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.api.tools.prefs
rename to e4tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.prefs b/e4tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.prefs
rename to e4tools/bundles/org.eclipse.e4.tools/.settings/org.eclipse.pde.prefs
diff --git a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/e4tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
rename to e4tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF
diff --git a/tools/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties b/e4tools/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
rename to e4tools/bundles/org.eclipse.e4.tools/OSGI-INF/l10n/bundle.properties
diff --git a/tools/bundles/org.eclipse.e4.tools/README.md b/e4tools/bundles/org.eclipse.e4.tools/README.md
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/README.md
rename to e4tools/bundles/org.eclipse.e4.tools/README.md
diff --git a/tools/bundles/org.eclipse.e4.tools/about.html b/e4tools/bundles/org.eclipse.e4.tools/about.html
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/about.html
rename to e4tools/bundles/org.eclipse.e4.tools/about.html
diff --git a/tools/bundles/org.eclipse.e4.tools/build.properties b/e4tools/bundles/org.eclipse.e4.tools/build.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/build.properties
rename to e4tools/bundles/org.eclipse.e4.tools/build.properties
diff --git a/tools/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt b/e4tools/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
rename to e4tools/bundles/org.eclipse.e4.tools/forceQualifierUpdate.txt
diff --git a/tools/bundles/org.eclipse.e4.tools/icons/full/obj16/Addons.png b/e4tools/bundles/org.eclipse.e4.tools/icons/full/obj16/Addons.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/icons/full/obj16/Addons.png
rename to e4tools/bundles/org.eclipse.e4.tools/icons/full/obj16/Addons.png
diff --git a/tools/bundles/org.eclipse.e4.tools/icons/full/obj16/Part.gif b/e4tools/bundles/org.eclipse.e4.tools/icons/full/obj16/Part.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/icons/full/obj16/Part.gif
rename to e4tools/bundles/org.eclipse.e4.tools/icons/full/obj16/Part.gif
diff --git a/tools/bundles/org.eclipse.e4.tools/icons/full/obj16/ToolControl.gif b/e4tools/bundles/org.eclipse.e4.tools/icons/full/obj16/ToolControl.gif
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/icons/full/obj16/ToolControl.gif
rename to e4tools/bundles/org.eclipse.e4.tools/icons/full/obj16/ToolControl.gif
diff --git a/tools/bundles/org.eclipse.e4.tools/icons/full/obj16/application_view_tile.png b/e4tools/bundles/org.eclipse.e4.tools/icons/full/obj16/application_view_tile.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/icons/full/obj16/application_view_tile.png
rename to e4tools/bundles/org.eclipse.e4.tools/icons/full/obj16/application_view_tile.png
diff --git a/tools/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.png b/e4tools/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.png
rename to e4tools/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj.png
diff --git a/tools/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj@2x.png b/e4tools/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj@2x.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj@2x.png
rename to e4tools/bundles/org.eclipse.e4.tools/icons/full/obj16/class_obj@2x.png
diff --git a/tools/bundles/org.eclipse.e4.tools/icons/full/obj16/plugin.png b/e4tools/bundles/org.eclipse.e4.tools/icons/full/obj16/plugin.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/icons/full/obj16/plugin.png
rename to e4tools/bundles/org.eclipse.e4.tools/icons/full/obj16/plugin.png
diff --git a/tools/bundles/org.eclipse.e4.tools/icons/full/wizban/newclass_wiz.png b/e4tools/bundles/org.eclipse.e4.tools/icons/full/wizban/newclass_wiz.png
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/icons/full/wizban/newclass_wiz.png
rename to e4tools/bundles/org.eclipse.e4.tools/icons/full/wizban/newclass_wiz.png
diff --git a/tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/HandlerTemplate.java b/e4tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/HandlerTemplate.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/HandlerTemplate.java
rename to e4tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/HandlerTemplate.java
diff --git a/tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java b/e4tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java
rename to e4tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/emf/editor3x/templates/PartTemplate.java
diff --git a/tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/HandlerTemplate.java b/e4tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/HandlerTemplate.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/HandlerTemplate.java
rename to e4tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/HandlerTemplate.java
diff --git a/tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java b/e4tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java
rename to e4tools/bundles/org.eclipse.e4.tools/org/eclipse/e4/tools/internal/classes/templates/PartTemplate.java
diff --git a/tools/bundles/org.eclipse.e4.tools/plugin.xml b/e4tools/bundles/org.eclipse.e4.tools/plugin.xml
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/plugin.xml
rename to e4tools/bundles/org.eclipse.e4.tools/plugin.xml
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewHandlerClassWizard.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewImperativeExpressionClassWizard.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewPartClassWizard.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewToolControlClassWizard.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/AddonTemplate.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/DynamicMenuContributionTemplate.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/HandlerTemplate.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ImperativeExpressionTemplate.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/PartTemplate.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/templates/ToolControlTemplate.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/BaseApplicationModelWizard.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/ExtractContributionModelWizard.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentExtractHelper.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/FragmentMergeHelper.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewApplicationModelWizard.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewContributionModelWizard.java
diff --git a/tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java b/e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
similarity index 100%
rename from tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
rename to e4tools/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/model/NewModelFilePage.java
diff --git a/tools/features/org.eclipse.e4.core.tools.feature/.project b/e4tools/features/org.eclipse.e4.core.tools.feature/.project
similarity index 100%
rename from tools/features/org.eclipse.e4.core.tools.feature/.project
rename to e4tools/features/org.eclipse.e4.core.tools.feature/.project
diff --git a/tools/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.resources.prefs b/e4tools/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from tools/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.resources.prefs
rename to e4tools/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.resources.prefs
diff --git a/tools/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.runtime.prefs b/e4tools/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from tools/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.runtime.prefs
rename to e4tools/features/org.eclipse.e4.core.tools.feature/.settings/org.eclipse.core.runtime.prefs
diff --git a/tools/features/org.eclipse.e4.core.tools.feature/build.properties b/e4tools/features/org.eclipse.e4.core.tools.feature/build.properties
similarity index 100%
rename from tools/features/org.eclipse.e4.core.tools.feature/build.properties
rename to e4tools/features/org.eclipse.e4.core.tools.feature/build.properties
diff --git a/tools/features/org.eclipse.e4.core.tools.feature/feature.properties b/e4tools/features/org.eclipse.e4.core.tools.feature/feature.properties
similarity index 100%
rename from tools/features/org.eclipse.e4.core.tools.feature/feature.properties
rename to e4tools/features/org.eclipse.e4.core.tools.feature/feature.properties
diff --git a/tools/features/org.eclipse.e4.core.tools.feature/feature.xml b/e4tools/features/org.eclipse.e4.core.tools.feature/feature.xml
similarity index 100%
rename from tools/features/org.eclipse.e4.core.tools.feature/feature.xml
rename to e4tools/features/org.eclipse.e4.core.tools.feature/feature.xml
diff --git a/tools/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt b/e4tools/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt
similarity index 100%
rename from tools/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt
rename to e4tools/features/org.eclipse.e4.core.tools.feature/forceQualifierUpdate.txt
diff --git a/tools/features/org.eclipse.e4.tools.persistence.feature/.project b/e4tools/features/org.eclipse.e4.tools.persistence.feature/.project
similarity index 100%
rename from tools/features/org.eclipse.e4.tools.persistence.feature/.project
rename to e4tools/features/org.eclipse.e4.tools.persistence.feature/.project
diff --git a/tools/features/org.eclipse.e4.tools.persistence.feature/.settings/org.eclipse.core.resources.prefs b/e4tools/features/org.eclipse.e4.tools.persistence.feature/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from tools/features/org.eclipse.e4.tools.persistence.feature/.settings/org.eclipse.core.resources.prefs
rename to e4tools/features/org.eclipse.e4.tools.persistence.feature/.settings/org.eclipse.core.resources.prefs
diff --git a/tools/features/org.eclipse.e4.tools.persistence.feature/build.properties b/e4tools/features/org.eclipse.e4.tools.persistence.feature/build.properties
similarity index 100%
rename from tools/features/org.eclipse.e4.tools.persistence.feature/build.properties
rename to e4tools/features/org.eclipse.e4.tools.persistence.feature/build.properties
diff --git a/tools/features/org.eclipse.e4.tools.persistence.feature/feature.properties b/e4tools/features/org.eclipse.e4.tools.persistence.feature/feature.properties
similarity index 100%
rename from tools/features/org.eclipse.e4.tools.persistence.feature/feature.properties
rename to e4tools/features/org.eclipse.e4.tools.persistence.feature/feature.properties
diff --git a/tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml b/e4tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml
similarity index 100%
rename from tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml
rename to e4tools/features/org.eclipse.e4.tools.persistence.feature/feature.xml
diff --git a/tools/features/org.eclipse.e4.tools.persistence.feature/forceQualifierUpdate.txt b/e4tools/features/org.eclipse.e4.tools.persistence.feature/forceQualifierUpdate.txt
similarity index 100%
rename from tools/features/org.eclipse.e4.tools.persistence.feature/forceQualifierUpdate.txt
rename to e4tools/features/org.eclipse.e4.tools.persistence.feature/forceQualifierUpdate.txt
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.classpath b/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.classpath
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.classpath
rename to e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.classpath
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.project b/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.project
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.project
rename to e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.project
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.resources.prefs b/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.resources.prefs
rename to e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.runtime.prefs b/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.runtime.prefs
rename to e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.core.runtime.prefs
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs b/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs
rename to e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.ui.prefs b/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.ui.prefs
rename to e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.pde.prefs b/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.pde.prefs
rename to e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/.settings/org.eclipse.pde.prefs
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF b/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF
rename to e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/build.properties b/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/build.properties
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/build.properties
rename to e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/build.properties
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml b/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
rename to e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/e4_test.xml b/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/e4_test.xml
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/e4_test.xml
rename to e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/e4_test.xml
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/perspective_3x.xml b/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/perspective_3x.xml
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/perspective_3x.xml
rename to e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/resources/perspective_3x.xml
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java b/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java
rename to e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java
diff --git a/tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/util/TestWorkbenchAdvisor.java b/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/util/TestWorkbenchAdvisor.java
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/util/TestWorkbenchAdvisor.java
rename to e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/src/org/eclipse/e4/tools/compatibility/migration/tests/util/TestWorkbenchAdvisor.java
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/.classpath b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/.classpath
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.persistence.tests/.classpath
rename to e4tools/tests/org.eclipse.e4.tools.persistence.tests/.classpath
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/.project b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/.project
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.persistence.tests/.project
rename to e4tools/tests/org.eclipse.e4.tools.persistence.tests/.project
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.resources.prefs b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.resources.prefs
rename to e4tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.runtime.prefs b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.runtime.prefs
rename to e4tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.core.runtime.prefs
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs
rename to e4tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.ui.prefs b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.ui.prefs
rename to e4tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.pde.prefs b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.pde.prefs
rename to e4tools/tests/org.eclipse.e4.tools.persistence.tests/.settings/org.eclipse.pde.prefs
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF
rename to e4tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/build.properties b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/build.properties
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.persistence.tests/build.properties
rename to e4tools/tests/org.eclipse.e4.tools.persistence.tests/build.properties
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/plugin.xml b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/plugin.xml
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.persistence.tests/plugin.xml
rename to e4tools/tests/org.eclipse.e4.tools.persistence.tests/plugin.xml
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
rename to e4tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/resources/workbench_restore.persistence b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/resources/workbench_restore.persistence
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.persistence.tests/resources/workbench_restore.persistence
rename to e4tools/tests/org.eclipse.e4.tools.persistence.tests/resources/workbench_restore.persistence
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java
rename to e4tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestPerspective.java b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestPerspective.java
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestPerspective.java
rename to e4tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestPerspective.java
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestViewPart.java b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestViewPart.java
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestViewPart.java
rename to e4tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestViewPart.java
diff --git a/tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestWorkbenchAdvisor.java b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestWorkbenchAdvisor.java
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestWorkbenchAdvisor.java
rename to e4tools/tests/org.eclipse.e4.tools.persistence.tests/src/org/eclipse/e4/tools/persistence/tests/util/TestWorkbenchAdvisor.java
diff --git a/tools/tests/org.eclipse.e4.tools.test/.classpath b/e4tools/tests/org.eclipse.e4.tools.test/.classpath
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.test/.classpath
rename to e4tools/tests/org.eclipse.e4.tools.test/.classpath
diff --git a/tools/tests/org.eclipse.e4.tools.test/.project b/e4tools/tests/org.eclipse.e4.tools.test/.project
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.test/.project
rename to e4tools/tests/org.eclipse.e4.tools.test/.project
diff --git a/tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.resources.prefs b/e4tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.resources.prefs
rename to e4tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.resources.prefs
diff --git a/tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.runtime.prefs b/e4tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.runtime.prefs
rename to e4tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.core.runtime.prefs
diff --git a/tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs b/e4tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs
rename to e4tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.core.prefs
diff --git a/tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs b/e4tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs
rename to e4tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.api.tools.prefs b/e4tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.api.tools.prefs
rename to e4tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.core.prefs b/e4tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.core.prefs
rename to e4tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.core.prefs
diff --git a/tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.prefs b/e4tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.prefs
rename to e4tools/tests/org.eclipse.e4.tools.test/.settings/org.eclipse.pde.prefs
diff --git a/tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF b/e4tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
rename to e4tools/tests/org.eclipse.e4.tools.test/META-INF/MANIFEST.MF
diff --git a/tools/tests/org.eclipse.e4.tools.test/build.properties b/e4tools/tests/org.eclipse.e4.tools.test/build.properties
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.test/build.properties
rename to e4tools/tests/org.eclipse.e4.tools.test/build.properties
diff --git a/tools/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java b/e4tools/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
rename to e4tools/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentExtractHelperTest.java
diff --git a/tools/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java b/e4tools/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java
similarity index 100%
rename from tools/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java
rename to e4tools/tests/org.eclipse.e4.tools.test/src/org/eclipse/e4/tools/test/FragmentMergeHelperTest.java

From 7363edcb8871ac38715ce2a829c7c9f72f36f911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Sun, 28 Jan 2024 06:56:14 +0100
Subject: [PATCH 1284/1286] Adapt the build to e4.tools merge

---
 .gitignore                                    |  4 +--
 .../org.eclipse.e4.tools.emf.ui/pom.xml       |  5 ++--
 e4tools/features/build.properties             |  1 +
 e4tools/pom.xml                               | 28 +++++++++++++++++++
 .../pom.xml                                   |  5 ++--
 .../pom.xml                                   |  5 ++--
 pom.xml                                       |  1 +
 7 files changed, 38 insertions(+), 11 deletions(-)
 create mode 100644 e4tools/features/build.properties
 create mode 100644 e4tools/pom.xml

diff --git a/.gitignore b/.gitignore
index 11caa005ae..0eba26c9e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-/*/*/bin/
-/*/*/bin_ant/
+bin/
+bin_ant/
 *~
 *.rej
 *.bak
diff --git a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 19217c5a3f..7078f67c5b 100644
--- a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -13,8 +13,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-  	<groupId>org.eclipse.platform</groupId>
-    <artifactId>eclipse.platform.ui.tools</artifactId>
+    <groupId>org.eclipse.pde</groupId>
+    <artifactId>eclipse.pde.e4tools</artifactId>
     <version>4.31.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
@@ -33,7 +33,6 @@
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-compiler-plugin</artifactId>
-        <version>${tycho.version}</version>
         <configuration>
           <compilerArgs>
             <arg>-warn:-raw,unchecked</arg>
diff --git a/e4tools/features/build.properties b/e4tools/features/build.properties
new file mode 100644
index 0000000000..cfac3d0195
--- /dev/null
+++ b/e4tools/features/build.properties
@@ -0,0 +1 @@
+pom.model.artifactId=pde-e4tools-features
diff --git a/e4tools/pom.xml b/e4tools/pom.xml
new file mode 100644
index 0000000000..7ccce0ec97
--- /dev/null
+++ b/e4tools/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2017 vogella GmbH and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+
+  Contributors:
+     Lars Vogel <Lars.Vogel@vogella.com>  - initial implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.pde</groupId>
+    <artifactId>eclipse.pde</artifactId>
+    <version>4.31.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>eclipse.pde.e4tools</artifactId>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>bundles</module>
+    <module>features</module>
+    <module>tests</module>
+  </modules>
+</project>
+
diff --git a/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml b/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
index 24ae2a86ba..86a0494313 100644
--- a/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
+++ b/e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/pom.xml
@@ -12,8 +12,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.eclipse.platform</groupId>
-		<artifactId>eclipse.platform.ui.tools</artifactId>
+		<groupId>org.eclipse.pde</groupId>
+		<artifactId>eclipse.pde.e4tools</artifactId>
 		<version>4.31.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
@@ -30,7 +30,6 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho.version}</version>
 				<configuration>
 					<includes>
 						<include>**/org/eclipse/e4/tools/compatibility/migration/tests/E4MigrationToolTest.java</include>
diff --git a/e4tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
index b07df9e402..0c0cb6077f 100644
--- a/e4tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
+++ b/e4tools/tests/org.eclipse.e4.tools.persistence.tests/pom.xml
@@ -12,8 +12,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.eclipse.platform</groupId>
-  		<artifactId>eclipse.platform.ui.tools</artifactId>
+		<groupId>org.eclipse.pde</groupId>
+		<artifactId>eclipse.pde.e4tools</artifactId>
 		<version>4.31.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
@@ -30,7 +30,6 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho.version}</version>
 				<configuration>
 					<includes>
 						<include>**/org/eclipse/e4/tools/persistence/tests/PerspectivePersisterTest.java</include>
diff --git a/pom.xml b/pom.xml
index c4c90bb515..d8f7f653d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
     <module>ds</module>
     <module>ua</module>
     <module>ui</module>
+    <module>e4tools</module>
     <module>build</module>
     <module>features</module>
     <module>org.eclipse.pde.doc.user</module>

From 8c0d7e28f5e3c5bfd7775f4460e619998cd7e6c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Sun, 28 Jan 2024 07:29:57 +0100
Subject: [PATCH 1285/1286] Don't use local build artifacts

---
 .mvn/maven.config | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mvn/maven.config b/.mvn/maven.config
index 2ba5c28497..e49acb33e8 100644
--- a/.mvn/maven.config
+++ b/.mvn/maven.config
@@ -2,4 +2,5 @@
 -Ptck
 -Dcompare-version-with-baselines.skip=false
 -DtrimStackTrace=false
---fail-at-end
\ No newline at end of file
+--fail-at-end
+-Dtycho.localArtifacts=ignore

From 3d0cbb83b870d8e155926f905c414b6bd35845dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Sun, 28 Jan 2024 07:47:05 +0100
Subject: [PATCH 1286/1286] Fix API tool warnings in e4.tools.compat

---
 .../.settings/.api_filters                    | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 e4tools/bundles/org.eclipse.e4.tools.compat/.settings/.api_filters

diff --git a/e4tools/bundles/org.eclipse.e4.tools.compat/.settings/.api_filters b/e4tools/bundles/org.eclipse.e4.tools.compat/.settings/.api_filters
new file mode 100644
index 0000000000..499a598289
--- /dev/null
+++ b/e4tools/bundles/org.eclipse.e4.tools.compat/.settings/.api_filters
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.e4.tools.compat" version="2">
+    <resource path="src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java" type="org.eclipse.e4.tools.compat.internal.ContextServiceFactory">
+        <filter id="574664731">
+            <message_arguments>
+                <message_argument value="org.eclipse.e4.tools.compat.internal.ContextServiceFactory.create(Class, IServiceLocator, IServiceLocator)"/>
+                <message_argument value="IStylingEngine"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/e4/tools/compat/internal/PartHelper.java" type="org.eclipse.e4.tools.compat.internal.PartHelper">
+        <filter id="640712815">
+            <message_arguments>
+                <message_argument value="IStylingEngine"/>
+                <message_argument value="PartHelper"/>
+                <message_argument value="setClassname(Object, String)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>